diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index b6524c2c49caf..0000000000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "name": "Playwright",
-    "image": "mcr.microsoft.com/playwright:next",
-    "postCreateCommand": "npm install && npm run build && apt-get update && apt-get install -y software-properties-common && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && add-apt-repository \"deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\" && apt-get install -y docker-ce-cli",
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
-    },
-    "runArgs": [
-        "-v", "/var/run/docker.sock:/var/run/docker.sock"
-    ]
-}
\ No newline at end of file
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 60b8fd360fcb9..0000000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,21 +0,0 @@
-test/assets/modernizr.js
-/tests/third_party/
-/packages/*/lib/
-*.js
-/packages/playwright-core/src/generated/*
-/packages/playwright-core/src/third_party/
-/packages/playwright-core/types/*
-/packages/playwright-ct-core/src/generated/*
-/index.d.ts
-node_modules/
-browser_patches/*/checkout/
-browser_patches/chromium/output/
-**/*.d.ts
-output/
-test-results/
-tests/components/
-tests/installation/fixture-scripts/
-examples/
-DEPS
-.cache/
-utils/
diff --git a/.eslintrc-with-ts-config.js b/.eslintrc-with-ts-config.js
deleted file mode 100644
index b06ec001951bc..0000000000000
--- a/.eslintrc-with-ts-config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = {
-  extends: "./.eslintrc.js",
-  parserOptions: {
-    ecmaVersion: 9,
-    sourceType: "module",
-    project: "./tsconfig.json",
-  },
-  rules: {
-    "@typescript-eslint/no-base-to-string": "error",
-    "@typescript-eslint/no-unnecessary-boolean-literal-compare": 2,
-  },
-  parserOptions: {
-    project: "./tsconfig.json"
-  },
-};
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index bb351a8c5640d..0000000000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,128 +0,0 @@
-module.exports = {
-    parser: "@typescript-eslint/parser",
-    plugins: ["@typescript-eslint", "notice"],
-    parserOptions: {
-      ecmaVersion: 9,
-      sourceType: "module",
-    },
-    extends: [
-      "plugin:react-hooks/recommended"
-    ],
-
-    /**
-     * ESLint rules
-     *
-     * All available rules: http://eslint.org/docs/rules/
-     *
-     * Rules take the following form:
-     *   "rule-name", [severity, { opts }]
-     * Severity: 2 == error, 1 == warning, 0 == off.
-     */
-    rules: {
-        "@typescript-eslint/no-unused-vars": [2, {args: "none"}],
-        "@typescript-eslint/consistent-type-imports": [2, {disallowTypeAnnotations: false}],
-        /**
-         * 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,
-        "@typescript-eslint/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
-        }],
-        "@typescript-eslint/func-call-spacing": 2,
-        "@typescript-eslint/type-annotation-spacing": 2,
-
-        // file whitespace
-        "no-multiple-empty-lines": [2, {"max": 2}],
-        "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
-        }],
-
-        // copyright
-        "notice/notice": [2, {
-            "mustMatch": "Copyright",
-            "templateFile": require("path").join(__dirname, "utils", "copyright.js"),
-        }],
-    }
-};
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 062d7c7e742d1..60fea176c8f0c 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -24,6 +24,7 @@ body:
         ## Make a minimal reproduction
         To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the bug.
         The simpler you can make it, the more likely we are to successfully verify and fix the bug. You can create a new project with `npm init playwright@latest new-project` and then add the test code there.
+        Please make sure you only include the code and the dependencies absolutely necessary for your repro. Due to the security considerations, we can only run the code we trust. Major web frameworks are Ok to use, but smaller convenience libraries are not. 
   - type: markdown
     attributes:
       value: |
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
index 9615afdc8a2ec..b64936798031e 100644
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -23,5 +23,5 @@ body:
         > [!IMPORTANT]
         > This issue will be closed.
       options:
-        - label: I understand
+        - label: I understand that this issue will be closed
           required: true
diff --git a/.github/ISSUE_TEMPLATE/regression.yml b/.github/ISSUE_TEMPLATE/regression.yml
index bc0a101502a6f..632c67104b19b 100644
--- a/.github/ISSUE_TEMPLATE/regression.yml
+++ b/.github/ISSUE_TEMPLATE/regression.yml
@@ -1,7 +1,6 @@
 name: Report regression
 description: Functionality that used to work and does not any more
 title: "[Regression]: "
-
 body:
   - type: markdown
     attributes:
diff --git a/.github/actions/enable-microphone-access/action.yml b/.github/actions/enable-microphone-access/action.yml
index b94f48064711f..76ca24eebfc6d 100644
--- a/.github/actions/enable-microphone-access/action.yml
+++ b/.github/actions/enable-microphone-access/action.yml
@@ -14,12 +14,12 @@ runs:
         fi
         echo "Allowing microphone access to all apps"
         version=$(sw_vers -productVersion | cut -d. -f1)
-        if [[ "$version" == "14" ]]; then
+        if [[ "$version" == "14" || "$version" == "15" ]]; then
           sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR IGNORE INTO access VALUES ('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159,NULL,NULL,'UNUSED',1687786159);"
         elif [[ "$version" == "12" || "$version" == "13" ]]; then
           sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT OR REPLACE INTO access VALUES('kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159);"
         else
-          echo "macOS version is unsupported. Version is $version, exiting"
-          exit 1
+          echo "Skipping unsupported macOS version $version"
+          exit 0
         fi
         echo "Successfully allowed microphone access"
diff --git a/.github/actions/run-test/action.yml b/.github/actions/run-test/action.yml
index c193515c4501d..3f458b8b6247f 100644
--- a/.github/actions/run-test/action.yml
+++ b/.github/actions/run-test/action.yml
@@ -41,9 +41,6 @@ runs:
         npm ci
         echo "::endgroup::"
       shell: bash
-      env:
-        DEBUG: pw:install
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1'
     - run: |
         echo "::group::npm run build"
         npm run build
diff --git a/.github/actions/upload-blob-report/action.yml b/.github/actions/upload-blob-report/action.yml
index 72a084142a77f..e407e67573928 100644
--- a/.github/actions/upload-blob-report/action.yml
+++ b/.github/actions/upload-blob-report/action.yml
@@ -22,13 +22,3 @@ runs:
         name: blob-report-${{ inputs.job_name }}
         path: ${{ inputs.report_dir }}/**
         retention-days: 7
-    - name: Write triggering pull request number in a file
-      if: ${{ !cancelled() && github.event_name == 'pull_request' }}
-      shell: bash
-      run: echo '${{ github.event.number }}' > pull_request_number.txt;
-    - name: Upload artifact with the pull request number
-      if: ${{ !cancelled() && github.event_name == 'pull_request' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: pull-request-${{ inputs.job_name }}
-        path: pull_request_number.txt
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000000..84a45f6df4322
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      actions:
+        patterns:
+          - "*" 
diff --git a/.github/workflows/cherry_pick_into_release_branch.yml b/.github/workflows/cherry_pick_into_release_branch.yml
index 08c5562f35f03..b0f635a69b199 100644
--- a/.github/workflows/cherry_pick_into_release_branch.yml
+++ b/.github/workflows/cherry_pick_into_release_branch.yml
@@ -33,8 +33,8 @@ jobs:
     - name: Cherry-pick commits
       id: cherry-pick
       run: |
-        git config --global user.name github-actions
-        git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
+        git config --global user.name microsoft-playwright-automation[bot]
+        git config --global user.email 203992400+microsoft-playwright-automation[bot]@users.noreply.github.com
         for COMMIT_HASH in $(echo "${{ github.event.inputs.commit_hashes }}" | tr "," "\n"); do
           git cherry-pick --no-commit "$COMMIT_HASH"
 
@@ -59,10 +59,15 @@ jobs:
         echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
         git checkout -b "$BRANCH_NAME"
         git push origin $BRANCH_NAME
+    - uses: actions/create-github-app-token@v2
+      id: app-token
+      with:
+        app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+        private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
     - name: Create Pull Request
       uses: actions/github-script@v7
       with:
-        github-token: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+        github-token: ${{ steps.app-token.outputs.token }}
         script: |
           const readableCommitHashesList = '${{ github.event.inputs.commit_hashes }}'.split(',').map(hash => `- ${hash}`).join('\n');
           const response = await github.rest.pulls.create({
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
new file mode 100644
index 0000000000000..54cf652ae21b6
--- /dev/null
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -0,0 +1,17 @@
+name: "Copilot Setup Steps"
+on: workflow_dispatch
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - run: npm ci
+      - run: npm run build
+      - run: npx playwright install --with-deps
diff --git a/.github/workflows/create_test_report.yml b/.github/workflows/create_test_report.yml
index 9d382f1ee632e..6758556deff7e 100644
--- a/.github/workflows/create_test_report.yml
+++ b/.github/workflows/create_test_report.yml
@@ -20,8 +20,7 @@ jobs:
         node-version: 18
     - run: npm ci
       env:
-        DEBUG: pw:install
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+        ELECTRON_SKIP_BINARY_DOWNLOAD: 1
     - run: npm run build
 
     - name: Download blob report artifact
@@ -34,7 +33,9 @@ jobs:
       run: |
         npx playwright merge-reports --config .github/workflows/merge.config.ts ./all-blob-reports
       env:
-        NODE_OPTIONS: --max-old-space-size=4096
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        NODE_OPTIONS: --max-old-space-size=8192
+        HTML_REPORT_URL: 'https://mspwblobreport.z1.web.core.windows.net/run-${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}-${{ github.sha }}/index.html'
 
     - name: Azure Login
       uses: azure/login@v2
@@ -50,91 +51,3 @@ jobs:
         echo "Report url: https://mspwblobreport.z1.web.core.windows.net/$REPORT_DIR/index.html"
       env:
         AZCOPY_AUTO_LOGIN_TYPE: AZCLI
-
-    - name: Read pull request number
-      uses: ./.github/actions/download-artifact
-      with:
-        namePrefix: 'pull-request'
-        path: '.'
-
-    - name: Comment on PR
-      uses: actions/github-script@v7
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        script: |
-          const fs = require('fs');
-          let prNumber;
-          if (context.payload.workflow_run.event === 'pull_request') {
-            const prs = context.payload.workflow_run.pull_requests;
-            if (prs.length) {
-              prNumber = prs[0].number;
-            } else {
-              prNumber = parseInt(fs.readFileSync('pull_request_number.txt').toString());
-              console.log('Read pull request number from file: ' + prNumber);
-            }
-          } else {
-            core.error('Unsupported workflow trigger event: ' + context.payload.workflow_run.event);
-            return;
-          }
-          if (!prNumber) {
-            core.error('No pull request found for commit ' + context.sha + ' and workflow triggered by: ' + context.payload.workflow_run.event);
-            return;
-          }
-          {
-            // Mark previous comments as outdated by minimizing them.
-            const { data: comments } = await github.rest.issues.listComments({
-              ...context.repo,
-              issue_number: prNumber,
-            });
-            for (const comment of comments) {
-              if (comment.user.login === 'github-actions[bot]' && /\[Test results\]\(https:\/\/.+?\) for "${{ github.event.workflow_run.name }}"/.test(comment.body)) {
-                await github.graphql(`
-                  mutation {
-                    minimizeComment(input: {subjectId: "${comment.node_id}", classifier: OUTDATED}) {
-                      clientMutationId
-                    }
-                  }
-                `);
-              }
-            }
-          }
-          const reportDir = 'run-${{ github.event.workflow_run.id }}-${{ github.event.workflow_run.run_attempt }}-${{ github.sha }}';
-          const reportUrl = `https://mspwblobreport.z1.web.core.windows.net/${reportDir}/index.html#?q=s%3Afailed%20s%3Aflaky`;
-          core.notice('Report url: ' + reportUrl);
-          const mergeWorkflowUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
-          const reportMd = await fs.promises.readFile('report.md', 'utf8');
-          function formatComment(lines) {
-            let body = lines.join('\n');
-            if (body.length > 65535)
-              body = body.substring(0, 65000) + `... ${body.length - 65000} more characters`;
-            return body;
-          }
-          const { data: response } = await github.rest.issues.createComment({
-            ...context.repo,
-            issue_number: prNumber,
-            body: formatComment([
-              `### [Test results](${reportUrl}) for "${{ github.event.workflow_run.name }}"`,
-              reportMd,
-              '',
-              `Merge [workflow run](${mergeWorkflowUrl}).`
-            ]),
-          });
-          core.info('Posted comment: ' + response.html_url);
-
-          const check = await github.rest.checks.create({
-            ...context.repo,
-            name: 'Merge report (${{ github.event.workflow_run.name }})',
-            head_sha: '${{ github.event.workflow_run.head_sha }}',
-            status: 'completed',
-            conclusion: 'success',
-            details_url: reportUrl,
-            output: {
-              title: 'Test results for "${{ github.event.workflow_run.name }}"',
-              summary: [
-                reportMd,
-                '',
-                '---',
-                `Full [HTML report](${reportUrl}). Merge [workflow run](${mergeWorkflowUrl}).`
-              ].join('\n'),
-            }
-          });
diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml
index 3580ecc97ad8d..0a03f10f1338a 100644
--- a/.github/workflows/infra.yml
+++ b/.github/workflows/infra.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   doc-and-lint:
     name: "docs & lint"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -24,8 +24,7 @@ jobs:
         node-version: 18
     - run: npm ci
     - run: npm run build
-    - run: npx playwright install-deps
-    - run: npx playwright install
+    - run: npx playwright install --with-deps
     - run: npm run lint
     - name: Verify clean tree
       run: |
@@ -35,21 +34,28 @@ jobs:
           exit 1
         fi
     - name: Audit prod NPM dependencies
-      run: npm audit --omit dev
+      run: node utils/check_audit.js
+      continue-on-error: true
   lint-snippets:
     name: "Lint snippets"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
         node-version: 18
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.11'
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'zulu'
+        java-version: '21'
     - run: npm ci
     - run: pip install -r utils/doclint/linting-code-snippets/python/requirements.txt
+    - run: mvn package
+      working-directory: utils/doclint/linting-code-snippets/java
     - run: node utils/doclint/linting-code-snippets/cli.js
diff --git a/.github/workflows/merge.config.ts b/.github/workflows/merge.config.ts
index b39944bc809c1..222b728f7c134 100644
--- a/.github/workflows/merge.config.ts
+++ b/.github/workflows/merge.config.ts
@@ -1,4 +1,4 @@
 export default {
   testDir: '../../tests',
-  reporter: [['markdown'], ['html']]
+  reporter: [[require.resolve('../../tests/config/ghaMarkdownReporter')], ['html']]
 };
\ No newline at end of file
diff --git a/.github/workflows/pr_check_client_side_changes.yml b/.github/workflows/pr_check_client_side_changes.yml
index 7748b5d514af3..12b7e5dff9131 100644
--- a/.github/workflows/pr_check_client_side_changes.yml
+++ b/.github/workflows/pr_check_client_side_changes.yml
@@ -12,14 +12,24 @@ on:
 jobs:
   check:
     name: Check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'microsoft/playwright'
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+          private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
+          repositories: |
+            playwright
+            playwright-python
+            playwright-java
+            playwright-dotnet
       - name: Create GitHub issue
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+          github-token: ${{ steps.app-token.outputs.token }}
           script: |
             const currentPlaywrightVersion = require('./package.json').version.match(/\d+\.\d+/)[0];
             const { data } = await github.rest.git.getCommit({
@@ -28,11 +38,15 @@ jobs:
               commit_sha: context.sha,
             });
             const commitHeader = data.message.split('\n')[0];
+            const prMatch = commitHeader.match(/#(\d+)/);
+            const formattedCommit = prMatch 
+              ? `https://github.com/microsoft/playwright/pull/${prMatch[1]}`
+              : `https://github.com/${context.repo.owner}/${context.repo.repo}/commit/${context.sha} (${commitHeader})`;
 
             const title = '[Ports]: Backport client side changes for ' + currentPlaywrightVersion;
             for (const repo of ['playwright-python', 'playwright-java', 'playwright-dotnet']) {
               const { data: issuesData } = await github.rest.search.issuesAndPullRequests({
-                q: `is:issue is:open repo:microsoft/${repo} in:title "${title}" author:playwrightmachine`
+                q: `is:issue is:open repo:microsoft/${repo} in:title "${title}"`
               })
               let issueNumber = null;
               let issueBody = '';
@@ -50,7 +64,7 @@ jobs:
                 issueBody = issueCreateData.body;
               }
               const newBody = issueBody.trimEnd() + `
-              - [ ] https://github.com/${context.repo.owner}/${context.repo.repo}/commit/${context.sha} (${commitHeader})`;
+              - [ ] ${formattedCommit}`;
               const data = await github.rest.issues.update({
                 owner: context.repo.owner,
                 repo: repo,
diff --git a/.github/workflows/publish_canary.yml b/.github/workflows/publish_canary.yml
index 50a156475529a..87ebcf27b3a5e 100644
--- a/.github/workflows/publish_canary.yml
+++ b/.github/workflows/publish_canary.yml
@@ -3,7 +3,7 @@ name: "publish canary"
 on:
   workflow_dispatch:
   schedule:
-    - cron: "10 0 * * *"
+    - cron: "10 5 * * *"
   push:
     branches:
       - release-*
@@ -14,7 +14,7 @@ env:
 jobs:
   publish-canary:
     name: "publish canary NPM"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'microsoft/playwright'
     permissions:
       id-token: write  # This is required for OIDC login (azure/login) to succeed
@@ -28,7 +28,6 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - run: npm run build
-    - run: npx playwright install-deps
     - name: "@next: publish with commit timestamp (triggered manually)"
       if: contains(github.ref, 'main') && github.event_name == 'workflow_dispatch'
       run: |
@@ -65,20 +64,26 @@ jobs:
 
   publish-trace-viewer:
     name: "publish Trace Viewer to trace.playwright.dev"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'microsoft/playwright'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
         node-version: 18
+    - uses: actions/create-github-app-token@v2
+      id: app-token
+      with:
+        app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+        private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
+        repositories: trace.playwright.dev
     - name: Deploy Canary
       run: bash utils/build/deploy-trace-viewer.sh --canary
       if: contains(github.ref, 'main')
       env:
-        GH_SERVICE_ACCOUNT_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+        GH_SERVICE_ACCOUNT_TOKEN: ${{ steps.app-token.outputs.token }}
     - name: Deploy BETA
       run: bash utils/build/deploy-trace-viewer.sh --beta
       if: contains(github.ref, 'release')
       env:
-        GH_SERVICE_ACCOUNT_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+        GH_SERVICE_ACCOUNT_TOKEN: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/publish_release_docker.yml b/.github/workflows/publish_release_docker.yml
index 6a9e6d85ae05e..c9603bffcdf21 100644
--- a/.github/workflows/publish_release_docker.yml
+++ b/.github/workflows/publish_release_docker.yml
@@ -2,12 +2,6 @@ name: "publish release - Docker"
 
 on:
   workflow_dispatch:
-    inputs:
-      is_release:
-        required: true
-        type: boolean
-        description: "Is this a release image?"
-
   release:
     types: [published]
 
@@ -35,7 +29,6 @@ jobs:
         platforms: arm64
     - run: npm ci
     - run: npm run build
-    - run: npx playwright install-deps
     - name: Azure Login
       uses: azure/login@v2
       with:
@@ -45,6 +38,3 @@ jobs:
     - name: Login to ACR via OIDC
       run: az acr login --name playwright
     - run: ./utils/docker/publish_docker.sh stable
-      if: (github.event_name != 'workflow_dispatch' && !github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release == 'true')
-    - run: ./utils/docker/publish_docker.sh canary
-      if: (github.event_name != 'workflow_dispatch' && github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release != 'true')
diff --git a/.github/workflows/publish_release_driver.yml b/.github/workflows/publish_release_driver.yml
index 8ad1a4184a185..328deaf01cb7a 100644
--- a/.github/workflows/publish_release_driver.yml
+++ b/.github/workflows/publish_release_driver.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   publish-driver-release:
     name: "publish playwright driver to CDN"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'microsoft/playwright'
     permissions:
       id-token: write  # This is required for OIDC login (azure/login) to succeed
@@ -24,7 +24,6 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - run: npm run build
-    - run: npx playwright install-deps
     - run: utils/build/build-playwright-driver.sh
     - name: Azure Login
       uses: azure/login@v2
diff --git a/.github/workflows/publish_release_npm.yml b/.github/workflows/publish_release_npm.yml
index 46b58168345dc..cab5e13596467 100644
--- a/.github/workflows/publish_release_npm.yml
+++ b/.github/workflows/publish_release_npm.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   publish-npm-release:
     name: "publish to NPM"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'microsoft/playwright'
     permissions:
       contents: read
@@ -23,7 +23,6 @@ jobs:
         registry-url: 'https://registry.npmjs.org'
     - run: npm ci
     - run: npm run build
-    - run: npx playwright install-deps
     - run: utils/publish_all_packages.sh --release-candidate
       if: ${{ github.event.release.prerelease }}
       env:
diff --git a/.github/workflows/publish_release_traceviewer.yml b/.github/workflows/publish_release_traceviewer.yml
index 60af5442e95b2..b497f5290cdcc 100644
--- a/.github/workflows/publish_release_traceviewer.yml
+++ b/.github/workflows/publish_release_traceviewer.yml
@@ -7,14 +7,20 @@ on:
 jobs:
   publish-trace-viewer:
     name: "publish Trace Viewer to trace.playwright.dev"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'microsoft/playwright'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
         node-version: 18
+    - uses: actions/create-github-app-token@v2
+      id: app-token
+      with:
+        app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+        private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
+        repositories: trace.playwright.dev
     - name: Deploy Stable
       run: bash utils/build/deploy-trace-viewer.sh --stable
       env:
-        GH_SERVICE_ACCOUNT_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+        GH_SERVICE_ACCOUNT_TOKEN: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/roll_browser_into_playwright.yml b/.github/workflows/roll_browser_into_playwright.yml
index da905131603e6..3dc822638e361 100644
--- a/.github/workflows/roll_browser_into_playwright.yml
+++ b/.github/workflows/roll_browser_into_playwright.yml
@@ -6,13 +6,18 @@ on:
 
 env:
   ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+  BROWSER: ${{ github.event.client_payload.browser }}
+  REVISION: ${{ github.event.client_payload.revision }}
 
 permissions:
   contents: write
 
+concurrency: 
+  group: 'roll-browser-into-playwright-${{ github.event.client_payload.browser }}-${{ github.event.client_payload.revision }}'
+
 jobs:
   roll:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -24,30 +29,45 @@ jobs:
       run: npx playwright install-deps
     - name: Roll to new revision
       run: |
-        ./utils/roll_browser.js ${{ github.event.client_payload.browser }} ${{ github.event.client_payload.revision }}
+        ./utils/roll_browser.js $BROWSER $REVISION
         npm run build
     - name: Prepare branch
       id: prepare-branch
       run: |
-        BRANCH_NAME="roll-into-pw-${{ github.event.client_payload.browser }}/${{ github.event.client_payload.revision }}"
+        BRANCH_NAME="roll-into-pw-${BROWSER}/${REVISION}"
         echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-        git config --global user.name github-actions
-        git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
+
+        git fetch origin $BRANCH_NAME:$BRANCH_NAME || true
+        if git show-ref --verify --quiet refs/heads/$BRANCH_NAME; then
+          echo "exists=1" >> $GITHUB_OUTPUT
+          echo "branch $BRANCH_NAME already exists, exiting"
+          exit 0
+        fi
+        echo "exists=0" >> $GITHUB_OUTPUT
+
+        git config --global user.name microsoft-playwright-automation[bot]
+        git config --global user.email 203992400+microsoft-playwright-automation[bot]@users.noreply.github.com
         git checkout -b "$BRANCH_NAME"
         git add .
-        git commit -m "feat(${{ github.event.client_payload.browser }}): roll to r${{ github.event.client_payload.revision }}"
-        git push origin $BRANCH_NAME
+        git commit -m "feat(${BROWSER}): roll to r${REVISION}"
+        git push origin $BRANCH_NAME --force
+    - uses: actions/create-github-app-token@v2
+      id: app-token
+      with:
+        app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+        private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
     - name: Create Pull Request
       uses: actions/github-script@v7
+      if: ${{ steps.prepare-branch.outputs.exists == '0' }}
       with:
-        github-token: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+        github-token: ${{ steps.app-token.outputs.token }}
         script: |
           const response = await github.rest.pulls.create({
             owner: 'microsoft',
             repo: 'playwright',
             head: 'microsoft:${{ steps.prepare-branch.outputs.BRANCH_NAME }}',
             base: 'main',
-            title: 'feat(${{ github.event.client_payload.browser }}): roll to r${{ github.event.client_payload.revision }}',
+            title: 'feat(${{ env.BROWSER }}): roll to r${{ env.REVISION }}',
           });
           await github.rest.issues.addLabels({
             owner: 'microsoft',
diff --git a/.github/workflows/roll_driver_nodejs.yml b/.github/workflows/roll_driver_nodejs.yml
index ee0d3d262ce36..ee993f980f12d 100644
--- a/.github/workflows/roll_driver_nodejs.yml
+++ b/.github/workflows/roll_driver_nodejs.yml
@@ -27,17 +27,22 @@ jobs:
           echo "HAS_CHANGES=1" >> $GITHUB_OUTPUT
           BRANCH_NAME="roll-driver-nodejs/$(date +%Y-%b-%d)"
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-          git config --global user.name github-actions
-          git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
+          git config --global user.name microsoft-playwright-automation[bot]
+          git config --global user.email 203992400+microsoft-playwright-automation[bot]@users.noreply.github.com
           git checkout -b "$BRANCH_NAME"
           git add .
           git commit -m "chore(driver): roll driver to recent Node.js LTS version"
           git push origin $BRANCH_NAME
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+          private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
       - name: Create Pull Request
         if: ${{ steps.prepare-branch.outputs.HAS_CHANGES == '1' }}
         uses: actions/github-script@v7
         with:
-          github-token: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+          github-token: ${{ steps.app-token.outputs.token }}
           script: |
             await github.rest.pulls.create({
               owner: 'microsoft',
diff --git a/.github/workflows/roll_stable_test_runner.yml b/.github/workflows/roll_stable_test_runner.yml
new file mode 100644
index 0000000000000..2c908520444d8
--- /dev/null
+++ b/.github/workflows/roll_stable_test_runner.yml
@@ -0,0 +1,58 @@
+name: "PR: bump stable-test-runner"
+on:
+  workflow_dispatch:
+  schedule:
+    # At 10:00am UTC  (3AM PST) every Monday
+    - cron: "0 10 * * 1"
+jobs:
+  trigger-roll:
+    name: Trigger Roll
+    runs-on: ubuntu-24.04
+    if: github.repository == 'microsoft/playwright'
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - run: |
+          npm install @playwright/test@next
+          VERSION=$(node -e "console.log(require('./package.json').dependencies['@playwright/test'].replace('^', ''))")
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+        working-directory: tests/playwright-test/stable-test-runner/
+        id: bump
+      - name: Prepare branch
+        id: prepare-branch
+        run: |
+          if [[ "$(git status --porcelain)" == "" ]]; then
+              echo "there are no changes";
+              exit 0;
+          fi
+          echo "HAS_CHANGES=1" >> $GITHUB_OUTPUT
+          BRANCH_NAME="roll-stable-test-runner/$(date +%Y-%b-%d)"
+          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
+          git config --global user.name microsoft-playwright-automation[bot]
+          git config --global user.email 203992400+microsoft-playwright-automation[bot]@users.noreply.github.com
+          git checkout -b "$BRANCH_NAME"
+          git add .
+          git commit -m "test: roll stable-test-runner to ${{ steps.bump.outputs.VERSION }}"
+          git push origin $BRANCH_NAME
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+          private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
+      - name: Create Pull Request
+        if: ${{ steps.prepare-branch.outputs.HAS_CHANGES == '1' }}
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            await github.rest.pulls.create({
+              owner: 'microsoft',
+              repo: 'playwright',
+              head: 'microsoft:${{ steps.prepare-branch.outputs.BRANCH_NAME }}',
+              base: 'main',
+              title: 'test: roll stable-test-runner to ${{ steps.bump.outputs.VERSION }}',
+            });
diff --git a/.github/workflows/tests_bidi.yml b/.github/workflows/tests_bidi.yml
new file mode 100644
index 0000000000000..4d6dc437325ce
--- /dev/null
+++ b/.github/workflows/tests_bidi.yml
@@ -0,0 +1,80 @@
+name: tests BiDi
+
+on:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: Playwright SHA / ref to test. Use 'refs/pull/PULL_REQUEST_ID/head' to test a PR. Defaults to the current branch.
+        required: false
+        default: ''
+  pull_request:
+    branches:
+      - main
+    paths:
+      - .github/workflows/tests_bidi.yml
+      - packages/playwright-core/src/server/bidi/**
+      - tests/bidi/**
+  schedule:
+    # Run every day at midnight
+    - cron: '0 0 * * *'
+
+env:
+  FORCE_COLOR: 1
+
+jobs:
+  test_bidi:
+    name: BiDi
+    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
+    runs-on: ubuntu-24.04
+    permissions:
+      id-token: write   # This is required for OIDC login (azure/login) to succeed
+      contents: read    # This is required for actions/checkout to succeed
+    strategy:
+      fail-fast: false
+      matrix:
+        channel: [bidi-chromium, moz-firefox-nightly]
+    steps:
+    - uses: actions/checkout@v4
+      if: github.event_name != 'workflow_dispatch'
+    - uses: actions/checkout@v4
+      if: github.event_name == 'workflow_dispatch'
+      with:
+        ref: ${{ github.event.inputs.ref }}
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+    - run: npm ci
+    - run: npm run build
+    - run: npx playwright install --with-deps chromium
+      if: matrix.channel == 'bidi-chromium'
+    - if: matrix.channel == 'moz-firefox-nightly'
+      run: |
+        echo "BIDI_FFPATH=$(npx -y @puppeteer/browsers install firefox@nightly | tail -n1 | sed 's/^[^ ]* *//')" >> "$GITHUB_ENV"
+    - name: Run tests
+      run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run biditest -- --project=${{ matrix.channel }}*
+      env:
+        PWTEST_USE_BIDI_EXPECTATIONS: '1'
+    - name: Upload csv report to GitHub
+      if: ${{ !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: csv-report-${{ matrix.channel }}
+        path: test-results/report.csv
+        retention-days: 7
+
+    - name: Azure Login
+      if: ${{ !cancelled() && github.ref == 'refs/heads/main' }}
+      uses: azure/login@v2
+      with:
+        client-id: ${{ secrets.AZURE_BLOB_REPORTS_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_BLOB_REPORTS_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_BLOB_REPORTS_SUBSCRIPTION_ID }}
+
+    - name: Upload report.csv to Azure
+      if: ${{ !cancelled() && github.ref == 'refs/heads/main' }}
+      run: |
+        REPORT_DIR='bidi-reports'
+        azcopy cp "./test-results/report.csv" "https://mspwblobreport.blob.core.windows.net/\$web/$REPORT_DIR/${{ matrix.channel }}.csv"
+        echo "Report url: https://mspwblobreport.z1.web.core.windows.net/$REPORT_DIR/${{ matrix.channel }}.csv"
+      env:
+        AZCOPY_AUTO_LOGIN_TYPE: AZCLI
diff --git a/.github/workflows/tests_others.yml b/.github/workflows/tests_others.yml
index 783f3fe2ff800..ed18e1541c635 100644
--- a/.github/workflows/tests_others.yml
+++ b/.github/workflows/tests_others.yml
@@ -24,9 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Stick with macos-latest-large for now which is Intel-based until
-        # https://github.com/microsoft/playwright/issues/30705 is fixed.
-        os: [ubuntu-latest, macos-latest-large, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -66,7 +64,7 @@ jobs:
       contents: read    # This is required for actions/checkout to succeed
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0.x'
     - run: dotnet build
@@ -149,6 +147,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
+    - name: Setup Ubuntu Binary Installation # TODO: Remove when https://github.com/electron/electron/issues/42510 is fixed
+      if: ${{ runner.os == 'Linux' }}
+      run: |
+        if grep -q "Ubuntu 24" /etc/os-release; then
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+        fi
+      shell: bash
     - uses: ./.github/actions/run-test
       with:
         browsers-to-install: chromium
diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml
index 02847957c4fd7..ec575d808e798 100644
--- a/.github/workflows/tests_primary.yml
+++ b/.github/workflows/tests_primary.yml
@@ -23,6 +23,7 @@ env:
   # Force terminal colors. @see https://www.npmjs.com/package/colors
   FORCE_COLOR: 1
   ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+  DEBUG_GIT_COMMIT_INFO: 1
 
 jobs:
   test_linux:
@@ -41,6 +42,9 @@ jobs:
           - os: ubuntu-22.04
             node-version: 22
             browser: chromium
+          - os: ubuntu-22.04
+            node-version: 24
+            browser: chromium
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write   # This is required for OIDC login (azure/login) to succeed
@@ -63,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write   # This is required for OIDC login (azure/login) to succeed
@@ -108,6 +112,14 @@ jobs:
             node-version: 22
             shardIndex: 2
             shardTotal: 2
+          - os: ubuntu-latest
+            node-version: 24
+            shardIndex: 1
+            shardTotal: 2
+          - os: ubuntu-latest
+            node-version: 24
+            shardIndex: 2
+            shardTotal: 2
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write   # This is required for OIDC login (azure/login) to succeed
@@ -134,8 +146,6 @@ jobs:
       with:
         node-version: 18
     - run: npm ci
-      env:
-        DEBUG: pw:install
     - run: npm run build
 
     - run: npx playwright install --with-deps
@@ -165,6 +175,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       PWTEST_BOT_NAME: "vscode-extension"
+      DEBUG_GIT_COMMIT_INFO: ""
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -184,7 +195,7 @@ jobs:
       run: node -e "const p = require('./package.json'); delete p.devDependencies['@playwright/test']; fs.writeFileSync('./package.json', JSON.stringify(p, null, 2));"
       working-directory: ./playwright-vscode
     - name: Build extension
-      run: npm install && npm run build
+      run: npm ci && npm run build
       working-directory: ./playwright-vscode
     - name: Run extension tests
       run: npm run test -- --workers=1
@@ -215,6 +226,13 @@ jobs:
     - uses: actions/checkout@v4
     - run: npm install -g yarn@1
     - run: npm install -g pnpm@8
+    - name: Setup Ubuntu Binary Installation # TODO: Remove when https://github.com/electron/electron/issues/42510 is fixed
+      if: ${{ runner.os == 'Linux' }}
+      run: |
+        if grep -q "Ubuntu 24" /etc/os-release; then
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+        fi
+      shell: bash
     - uses: ./.github/actions/run-test
       with:
         command: npm run itest
diff --git a/.github/workflows/tests_secondary.yml b/.github/workflows/tests_secondary.yml
index fd5458fb89f04..eafe68cd60f3e 100644
--- a/.github/workflows/tests_secondary.yml
+++ b/.github/workflows/tests_secondary.yml
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         browser: [chromium, firefox, webkit]
-        os: [ubuntu-20.04, ubuntu-24.04]
+        os: [ubuntu-24.04]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -50,8 +50,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-13, macos-14]
+        # Intel: *-large
+        # Arm64: *-xlarge
+        os: [macos-13-large, macos-13-xlarge, macos-14-large, macos-14-xlarge]
         browser: [chromium, firefox, webkit]
+        include:
+          - os: macos-15-large
+            browser: webkit
+          - os: macos-15-xlarge
+            browser: webkit
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -95,11 +102,20 @@ jobs:
           node_version: 20
         - os: ubuntu-latest
           node_version: 22
+        - os: ubuntu-latest
+          node_version: 24
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
     - run: npm install -g yarn@1
     - run: npm install -g pnpm@8
+    - name: Setup Ubuntu Binary Installation # TODO: Remove when https://github.com/electron/electron/issues/42510 is fixed
+      if: ${{ runner.os == 'Linux' }}
+      run: |
+        if grep -q "Ubuntu 24" /etc/os-release; then
+          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
+        fi
+      shell: bash
     - uses: ./.github/actions/run-test
       with:
         node-version: ${{ matrix.node_version }}
@@ -116,7 +132,11 @@ jobs:
       fail-fast: false
       matrix:
         browser: [chromium, firefox, webkit]
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-14, windows-latest]
+        os: [ubuntu-24.04, macos-14-xlarge, windows-latest]
+        include:
+          # We have different binaries per Ubuntu version for WebKit.
+          - browser: webkit
+            os: ubuntu-22.04
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -136,7 +156,7 @@ jobs:
       fail-fast: false
       matrix:
         mode: [driver, service]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
@@ -158,11 +178,16 @@ jobs:
       matrix:
         include:
           - browser: chromium
+            runs-on: ubuntu-22.04
           - browser: firefox
+            runs-on: ubuntu-22.04
+          # See https://github.com/microsoft/playwright/issues/35586
           - browser: webkit
+            runs-on: ubuntu-24.04
           - browser: chromium
+            runs-on: ubuntu-22.04
             channel: chromium-tip-of-tree
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
@@ -177,359 +202,99 @@ jobs:
         PWTEST_TRACE: 1
         PWTEST_CHANNEL: ${{ matrix.channel }}
 
-  chrome_stable_linux:
-    name: "Chrome Stable (Linux)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: chrome
-        command: npm run ctest
-        bot-name: "chrome-stable-linux"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: chrome
-
-  chrome_stable_win:
-    name: "Chrome Stable (Win)"
+  test_chromium_channels:
+    name: Test ${{ matrix.channel }} on ${{ matrix.runs-on }}
     environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: chrome
-        command: npm run ctest
-        bot-name: "chrome-stable-windows"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: chrome
-
-  chrome_stable_mac:
-    name: "Chrome Stable (Mac)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: macos-latest
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        channel: [chrome, chrome-beta, msedge, msedge-beta, msedge-dev]
+        runs-on: [ubuntu-22.04, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
       with:
-        browsers-to-install: chrome
+        browsers-to-install: ${{ matrix.channel }}
         command: npm run ctest
-        bot-name: "chrome-stable-mac"
+        bot-name: ${{ matrix.channel }}-${{ matrix.runs-on }}
         flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
         flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
         flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
       env:
-        PWTEST_CHANNEL: chrome
+        PWTEST_CHANNEL: ${{ matrix.channel }}
 
   chromium_tot:
-    name: Chromium tip-of-tree ${{ matrix.os }}
+    name: Chromium tip-of-tree ${{ matrix.os }}${{ matrix.headed }}
     environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
     runs-on: ${{ matrix.os  }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-latest]
+        os: [ubuntu-22.04, macos-13, windows-latest]
+        headed: ['--headed', '']
+        exclude:
+          # Tested in tests_primary.yml already
+          - os: ubuntu-22.04
+            headed: ''
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
       with:
         browsers-to-install: chromium-tip-of-tree
-        command: npm run ctest
-        bot-name: "tip-of-tree-${{ matrix.os }}"
+        command: npm run ctest -- ${{ matrix.headed }}
+        bot-name: "chromium-tip-of-tree-${{ matrix.os }}${{ matrix.headed }}"
         flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
         flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
         flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
       env:
         PWTEST_CHANNEL: chromium-tip-of-tree
 
-  chromium_tot_headed:
-    name: Chromium tip-of-tree headed ${{ matrix.os }}
+  chromium_tot_headless_shell:
+    name: Chromium tip-of-tree headless-shell-${{ matrix.os }}
     environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
     runs-on: ${{ matrix.os  }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: chromium-tip-of-tree
-        command: npm run ctest -- --headed
-        bot-name: "tip-of-tree-headed-${{ matrix.os }}"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: chromium-tip-of-tree
-
-  firefox_beta_linux:
-    name: "Firefox Beta (Linux)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: firefox-beta chromium
-        command: npm run ftest
-        bot-name: "firefox-beta-linux"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: firefox-beta
-
-  firefox_beta_win:
-    name: "Firefox Beta (Win)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: windows-latest
+        os: [ubuntu-22.04]
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
       with:
-        browsers-to-install: firefox-beta chromium
-        command: npm run ftest -- --workers=1
-        bot-name: "firefox-beta-windows"
+        browsers-to-install: chromium-tip-of-tree-headless-shell
+        command: npm run ctest
+        bot-name: "chromium-tip-of-tree-headless-shell-${{ matrix.os }}"
         flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
         flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
         flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
       env:
-        PWTEST_CHANNEL: firefox-beta
+        PWTEST_CHANNEL: chromium-tip-of-tree-headless-shell
 
-  firefox_beta_mac:
-    name: "Firefox Beta (Mac)"
+  firefox_beta:
+    name: Firefox Beta ${{ matrix.os }}
     environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    # Stick with macos-latest-large for now which is Intel-based until
-    # https://github.com/microsoft/playwright/issues/30705 is fixed.
-    runs-on: macos-latest-large
+    runs-on: ${{ matrix.os  }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-22.04, windows-latest, macos-latest]
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
       with:
         browsers-to-install: firefox-beta chromium
         command: npm run ftest
-        bot-name: "firefox-beta-mac"
+        bot-name: "firefox-beta-${{ matrix.os }}"
         flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
         flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
         flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
       env:
         PWTEST_CHANNEL: firefox-beta
 
-  edge_stable_mac:
-    name: "Edge Stable (Mac)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge
-        command: npm run ctest
-        bot-name: "edge-stable-mac"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge
-
-  edge_stable_win:
-    name: "Edge Stable (Win)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge
-        command: npm run ctest
-        bot-name: "edge-stable-windows"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge
-
-  edge_stable_linux:
-    name: "Edge Stable (Linux)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge
-        command: npm run ctest
-        bot-name: "edge-stable-linux"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge
-
-  edge_beta_mac:
-    name: "Edge Beta (Mac)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge-beta
-        command: npm run ctest
-        bot-name: "edge-beta-mac"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge-beta
-
-  edge_beta_win:
-    name: "Edge Beta (Win)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge-beta
-        command: npm run ctest
-        bot-name: "edge-beta-windows"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge-beta
-
-  edge_beta_linux:
-    name: "Edge Beta (Linux)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge-beta
-        command: npm run ctest
-        bot-name: "edge-beta-linux"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge-beta
-
-  edge_dev_mac:
-    name: "Edge Dev (Mac)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge-dev
-        command: npm run ctest
-        bot-name: "edge-dev-mac"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge-dev
-
-  edge_dev_win:
-    name: "Edge Dev (Win)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge-dev
-        command: npm run ctest
-        bot-name: "edge-dev-windows"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge-dev
-
-  edge_dev_linux:
-    name: "Edge Dev (Linux)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: msedge-dev
-        command: npm run ctest
-        bot-name: "edge-dev-linux"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: msedge-dev
-
-  chrome_beta_linux:
-    name: "Chrome Beta (Linux)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: chrome-beta
-        command: npm run ctest
-        bot-name: "chrome-beta-linux"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: chrome-beta
-
-  chrome_beta_win:
-    name: "Chrome Beta (Win)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: chrome-beta
-        command: npm run ctest
-        bot-name: "chrome-beta-windows"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: chrome-beta
-
-  chrome_beta_mac:
-    name: "Chrome Beta (Mac)"
-    environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/run-test
-      with:
-        browsers-to-install: chrome-beta
-        command: npm run ctest
-        bot-name: "chrome-beta-mac"
-        flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
-        flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
-        flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
-      env:
-        PWTEST_CHANNEL: chrome-beta
-
   build-playwright-driver:
     name: "build-playwright-driver"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -537,22 +302,27 @@ jobs:
         node-version: 18
     - run: npm ci
     - run: npm run build
-    - run: npx playwright install-deps
     - run: utils/build/build-playwright-driver.sh
 
-  test_linux_chromium_headless_new:
-    name: Linux Chromium Headless New
+  test_channel_chromium:
+    name: Test channel=chromium
     environment: ${{ github.event_name == 'push' && 'allow-uploading-flakiness-results' || null }}
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.runs-on }}
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/run-test
       with:
+        # TODO: this should pass --no-shell.
+        # However, codegen tests do not inherit the channel and try to launch headless shell.
         browsers-to-install: chromium
         command: npm run ctest
-        bot-name: "headless-new"
+        bot-name: "channel-chromium-${{ matrix.runs-on }}"
         flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
         flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
         flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}
       env:
-        PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW: 1
+        PWTEST_CHANNEL: chromium
diff --git a/.github/workflows/tests_service.yml b/.github/workflows/tests_service.yml
deleted file mode 100644
index 2739680712d66..0000000000000
--- a/.github/workflows/tests_service.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: "tests service"
-
-on:
-  workflow_dispatch:
-
-env:
-  FORCE_COLOR: 1
-  ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-
-jobs:
-  test:
-    name: "Service"
-    strategy:
-      fail-fast: false
-      matrix:
-        service-os: [linux, windows]
-        browser: [chromium, firefox, webkit]
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-    - run: npm ci
-      env:
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    - run: npm run build
-    - run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test -- --project=${{ matrix.browser }}-* --workers=10 --retries=0
-      env:
-        PWTEST_MODE: service2
-        PWTEST_TRACE: 1
-        PWTEST_BOT_NAME: "${{ matrix.browser }}-${{ matrix.service-os }}-service"
-        PLAYWRIGHT_SERVICE_ACCESS_KEY: ${{ secrets.PLAYWRIGHT_SERVICE_ACCESS_KEY }}
-        PLAYWRIGHT_SERVICE_URL: ${{ secrets.PLAYWRIGHT_SERVICE_URL }}
-        PLAYWRIGHT_SERVICE_OS: ${{ matrix.service-os }}
-        PLAYWRIGHT_SERVICE_RUN_ID: ${{ github.run_id }}-${{ github.run_attempt }}-${{ github.sha }}
-    - name: Upload blob report to GitHub
-      if: ${{ !cancelled() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: all-blob-reports
-        path: blob-report
-        retention-days: 2
-
-  merge_reports:
-    name: "Merge reports"
-    needs: [test]
-    if: ${{ !cancelled() }}
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-    - run: npm ci
-      env:
-        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    - run: npm run build
-    - name: Download blob report artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: all-blob-reports
-        path: all-blob-reports
-    - run: npx playwright merge-reports --reporter markdown,html ./all-blob-reports
-    - name: Upload HTML report to Azure
-      run: |
-        REPORT_DIR='run-service-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.sha }}'
-        azcopy cp --recursive "./playwright-report/*" "https://mspwblobreport.blob.core.windows.net/\$web/$REPORT_DIR"
-        echo "Report url: https://mspwblobreport.z1.web.core.windows.net/$REPORT_DIR/index.html#?q=s:failed"
-      env:
-        AZCOPY_AUTO_LOGIN_TYPE: SPN
-        AZCOPY_SPA_APPLICATION_ID: '${{ secrets.AZCOPY_SPA_APPLICATION_ID }}'
-        AZCOPY_SPA_CLIENT_SECRET: '${{ secrets.AZCOPY_SPA_CLIENT_SECRET }}'
-        AZCOPY_TENANT_ID: '${{ secrets.AZCOPY_TENANT_ID }}'
diff --git a/.github/workflows/tests_video.yml b/.github/workflows/tests_video.yml
index 0733b082a0818..cc303d79c5aae 100644
--- a/.github/workflows/tests_video.yml
+++ b/.github/workflows/tests_video.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         browser: [chromium, firefox, webkit]
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-22.04, ubuntu-24.04]
     permissions:
       id-token: write   # This is required for OIDC login (azure/login) to succeed
       contents: read    # This is required for actions/checkout to succeed
diff --git a/.github/workflows/trigger_tests.yml b/.github/workflows/trigger_tests.yml
index dcd68dca37440..69a3d5f21b4e7 100644
--- a/.github/workflows/trigger_tests.yml
+++ b/.github/workflows/trigger_tests.yml
@@ -9,8 +9,14 @@ on:
 jobs:
   trigger:
     name: "trigger"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
+    - uses: actions/create-github-app-token@v2
+      id: app-token
+      with:
+        app-id: ${{ vars.PLAYWRIGHT_APP_ID }}
+        private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }}
+        repositories: playwright-browsers
     - run: |
         curl -X POST \
           -H "Accept: application/vnd.github.v3+json" \
@@ -18,4 +24,4 @@ jobs:
           --data "{\"event_type\": \"playwright_tests\", \"client_payload\": {\"ref\": \"${GITHUB_SHA}\"}}" \
           https://api.github.com/repos/microsoft/playwright-browsers/dispatches
       env:
-        GH_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
+        GH_TOKEN: ${{ steps.app-token.outputs.token }}
diff --git a/.gitignore b/.gitignore
index 69d85e4975adc..8e41e318108ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,6 @@ test-results
 /tests/installation/output/
 /tests/installation/.registry.json
 .cache/
-.eslintcache
\ No newline at end of file
+.eslintcache
+playwright.env
+/firefox/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 30e89e6beef6f..a945d57263589 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,92 +1,92 @@
 # Contributing
 
-- [How to Contribute](#how-to-contribute)
-  * [Getting Code](#getting-code)
-  * [Code reviews](#code-reviews)
-  * [Code Style](#code-style)
-  * [API guidelines](#api-guidelines)
-  * [Commit Messages](#commit-messages)
-  * [Writing Documentation](#writing-documentation)
-  * [Adding New Dependencies](#adding-new-dependencies)
-  * [Running & Writing Tests](#running--writing-tests)
-  * [Public API Coverage](#public-api-coverage)
-- [Contributor License Agreement](#contributor-license-agreement)
-  * [Code of Conduct](#code-of-conduct)
+## Choose an issue
 
-## How to Contribute
+Playwright **requires an issue** for every contribution, except for minor documentation updates. We strongly recommend
+to pick an issue
+labeled [open-to-a-pull-request](https://github.com/microsoft/playwright/issues?q=is%3Aissue%20state%3Aopen%20label%3Aopen-to-a-pull-request)
+for your first contribution to the project.
 
-We strongly recommend that you open an issue before beginning any code modifications. This is particularly important if the changes involve complex logic or if the existing code isn't immediately clear. By doing so, we can discuss and agree upon the best approach to address a bug or implement a feature, ensuring that our efforts are aligned.
+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.
 
-### Getting Code
-
-Make sure you're running Node.js 20 to verify and upgrade NPM do:
+## Make a change
 
+Make sure you're running Node.js 20 or later.
 ```bash
 node --version
-npm --version
-npm i -g npm@latest
 ```
 
-1. Clone this repository
-
+Clone the 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
 ```
 
-2. Install dependencies
-
+Install dependencies and run the build in watch mode.
 ```bash
 npm ci
+npm run watch
+npx playwright install
 ```
 
-3. Build Playwright
+**Experimental dev mode with Hot Module Replacement for recorder/trace-viewer/UI Mode**
 
-```bash
-npm run build
+```
+PW_HMR=1 npm run watch
+PW_HMR=1 npx playwright show-trace
+PW_HMR=1 npm run ctest -- --ui
+PW_HMR=1 npx playwright codegen
+PW_HMR=1 npx playwright show-report
 ```
 
-4. Run tests
+Playwright is a multi-package repository that uses npm workspaces. For browser APIs, look at [`packages/playwright-core`](https://github.com/microsoft/playwright/blob/main/packages/playwright-core). For test runner, see [`packages/playwright`](https://github.com/microsoft/playwright/blob/main/packages/playwright).
 
-This will run a test on line `23` in `page-fill.spec.ts`:
+Note that some files are generated by the build, so the watch process might override your changes if done in the wrong file. For example, TypeScript types for the API are generated from the [`docs/src`](https://github.com/microsoft/playwright/blob/main/docs/src).
 
-```bash
-npm run ctest -- page-fill:23
-```
+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
+  npm run lint
+  ```
 
-See [here](#running--writing-tests) for more information about running and writing tests.
+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.
 
-### Code reviews
+### Write documentation
 
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult
-[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
+Every part of the public API should be documented in [`docs/src`](https://github.com/microsoft/playwright/blob/main/docs/src), in the same change that adds/changes the API. We use markdown files with custom structure to specify the API. Take a look around for an example.
 
-### Code Style
+Various other files are generated from the API specification. If you are running `npm run watch`, these will be re-generated automatically.
 
-- Coding style is fully defined in [.eslintrc](https://github.com/microsoft/playwright/blob/main/.eslintrc.js)
-- Comments should be generally avoided. If the code would not be understood without comments, consider re-writing the code to make it self-explanatory.
+Larger changes will require updates to the documentation guides as well. This will be made clear during the code review.
 
-To run code linter, use:
+## Add a test
 
-```bash
-npm run eslint
-```
+Playwright requires a test for almost any 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. The two most important that you need to run locally are:
 
-### API guidelines
+- Library tests cover APIs not related to the test runner.
+  ```bash
+  # fast path runs all tests in Chromium
+  npm run ctest
 
-When authoring new API methods, consider the following:
+  # slow path runs all tests in three browsers
+  npm run test
+  ```
 
-- Expose as little information as needed. When in doubt, don’t expose new information.
-- Methods are used in favor of getters/setters.
-  - The only exception is namespaces, e.g. `page.keyboard` and `page.coverage`
-- All string literals must be lowercase. This includes event names and option values.
-- Avoid adding "sugar" API (API that is trivially implementable in user-space) unless they're **very** common.
+- Test runner tests.
+  ```bash
+  npm run ttest
+  ```
 
-### Commit Messages
+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).
 
-Commit messages should follow the Semantic Commit Messages format:
+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
@@ -97,129 +97,59 @@ footer
 ```
 
 1. *label* is one of the following:
-    - `fix` - playwright bug fixes.
-    - `feat` - playwright features.
-    - `docs` - changes to docs, e.g. `docs(api): ..` to change documentation.
-    - `test` - changes to playwright tests infrastructure.
-    - `devops` - build-related work, e.g. CI related patches and general changes to the browser build infrastructure
+    - `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 parenthesis after label and is optional. Must be lowercase.
+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.
+5. *footer* is **optional**, new-line separated from *description* and contains "fixes" / "references" attribution to GitHub issues.
 
 Example:
 
 ```
-fix(firefox): make sure session cookies work
-
-This patch fixes session cookies in the firefox browser.
-
-Fixes #123, fixes #234
-```
-
-### Writing Documentation
-
-All API classes, methods, and events should have a description in [`docs/src`](https://github.com/microsoft/playwright/blob/main/docs/src). There's a [documentation linter](https://github.com/microsoft/playwright/tree/main/utils/doclint) which makes sure documentation is aligned with the codebase.
-
-To run the documentation linter, use:
-
-```bash
-npm run doc
-```
-
-To build the documentation site locally and test how your changes will look in practice:
-
-1. Clone the [microsoft/playwright.dev](https://github.com/microsoft/playwright.dev) repo
-1. Follow [the playwright.dev README instructions to "roll docs"](https://github.com/microsoft/playwright.dev/#roll-docs) against your local `playwright` repo with your changes in progress
-1. Follow [the playwright.dev README instructions to "run dev server"](https://github.com/microsoft/playwright.dev/#run-dev-server) to view your changes
-
-### Adding New Dependencies
-
-For all dependencies (both installation and development):
-- **Do not add** a dependency if the desired functionality is easily implementable.
-- If adding a dependency, it should be well-maintained and trustworthy.
-
-A barrier for introducing new installation dependencies is especially high:
-- **Do not add** installation dependency unless it's critical to project success.
-
-### Running & Writing Tests
-
-- Every feature should be accompanied by a test.
-- Every public api event/method should be accompanied by a test.
-- Tests should be *hermetic*. Tests should not depend on external services.
-- Tests should work on all three platforms: Mac, Linux and Win. This is especially important for screenshot tests.
-
-Playwright tests are located in [`tests`](https://github.com/microsoft/playwright/blob/main/tests) and use `@playwright/test` test runner.
-These are integration tests, making sure public API methods and events work as expected.
-
-- To run all tests:
-
-```bash
-npx playwright install
-npm run test
-```
+feat(trace viewer): network panel filtering
 
-Be sure to run `npm run build` or let `npm run watch` run before you re-run the
-tests after making your changes to check them.
+This patch adds a filtering toolbar to the network panel.
+<link to a screenshot>
 
-- To run tests in Chromium
-```bash
-npm run ctest # also `ftest` for firefox and `wtest` for WebKit
-npm run ctest -- page-fill:23 # runs line 23 of page-fill.spec.ts
+Fixes #123, references #234.
 ```
 
-To run tests in WebKit / Firefox, use `wtest` or `ftest`.
+## Send a pull request
 
-- To run the Playwright test runner tests
-```bash
-npm run ttest
-npm run ttest -- --grep "specific test"
-```
+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.
 
-- To run a specific test, substitute `it` with `it.only`, or use the `--grep 'My test'` CLI parameter:
-
-```js
-...
-// Using "it.only" to run a specific test
-it.only('should work', async ({server, page}) => {
-  const response = await page.goto(server.EMPTY_PAGE);
-  expect(response.ok).toBe(true);
-});
-// or
-playwright test --config=xxx --grep 'should work'
-```
+After a successful code review, one of the maintainers will merge your pull request. Congratulations!
 
-- To disable a specific test, substitute `it` with `it.skip`:
+## More details
 
-```js
-...
-// Using "it.skip" to skip a specific test
-it.skip('should work', async ({server, page}) => {
-  const response = await page.goto(server.EMPTY_PAGE);
-  expect(response.ok).toBe(true);
-});
-```
+**No new dependencies**
 
-- To run tests in non-headless (headed) mode:
+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.
 
-```bash
-npm run ctest -- --headed
-```
-
-- To run tests with custom browser executable, specify `CRPATH`, `WKPATH` or `FFPATH` env variable that points to browser executable:
+**Custom browser build**
 
+To run tests with custom browser executable, specify `CRPATH`, `WKPATH` or `FFPATH` env variable that points to browser executable:
 ```bash
 CRPATH=<path-to-executable> npm run ctest
 ```
 
-- When should a test be marked with `skip` or `fixme`?
+You will also find `DEBUG=pw:browser` useful for debugging custom-builds.
+
+**Building documentation site**
 
-  - **`skip(condition)`**: This test *should ***never*** work* for `condition`
-    where `condition` is usually something like: `test.skip(browserName === 'chromium', 'This does not work because of ...')`.
+The [playwright.dev](https://playwright.dev/) documentation site lives in a separate repository, and documentation from [`docs/src`](https://github.com/microsoft/playwright/blob/main/docs/src) is frequently rolled there.
 
-  - **`fixme(condition)`**: This test *should ***eventually*** work* for `condition`
-    where `condition` is usually something like: `test.fixme(browserName === 'chromium', 'We are waiting for version x')`.
+Most of the time this should not concern you. However, if you are doing something unusual in the docs, you can build locally and test how your changes will look in practice:
+1. Clone the [microsoft/playwright.dev](https://github.com/microsoft/playwright.dev) repo.
+1. Follow [the playwright.dev README instructions to "roll docs"](https://github.com/microsoft/playwright.dev/#roll-docs) against your local `playwright` repo with your changes in progress.
+1. Follow [the playwright.dev README instructions to "run dev server"](https://github.com/microsoft/playwright.dev/#run-dev-server) to view your changes.
 
 ## Contributor License Agreement
 
diff --git a/FILING_ISSUES.md b/FILING_ISSUES.md
new file mode 100644
index 0000000000000..b699cd2e50440
--- /dev/null
+++ b/FILING_ISSUES.md
@@ -0,0 +1,35 @@
+# How to File a Bug Report That Actually Gets Resolved
+
+Make sure you’re on the latest Playwright release before filing. Check existing GitHub issues to avoid duplicates.
+
+## Use the Template
+
+Follow the **Bug Report** template. It guides you step-by-step:
+
+- Fill it out thoroughly.
+- Clearly list the steps needed to reproduce the bug.
+- Provide what you expected to see versus what happened in reality.
+- Include system info from `npx envinfo --preset playwright`.
+
+## Keep Your Repro Minimal
+
+We can't parse your entire code base. Reduce it down to the absolute essentials:
+
+- Start a fresh project (`npm init playwright@latest new-project`).
+- Add only the code/DOM needed to show the problem.
+- Only use major frameworks if necessary (React, Angular, static HTTP server, etc.). 
+- Avoid adding extra libraries unless absolutely necessary. Note that we won't install any suspect dependencies.
+
+## Why This Matters
+- Most issues that lack a repro turn out to be misconfigurations or usage errors.
+- We can't fix problems if we can’t reproduce them ourselves.
+- We can’t debug entire private projects or handle sensitive credentials.
+- Each confirmed bug will have a test in our repo, so your repro must be as clean as possible.
+
+## More Help
+
+- [Stack Overflow’s Minimal Reproducible Example Guide](https://stackoverflow.com/help/minimal-reproducible-example)
+- [Playwright Debugging Tools](https://playwright.dev/docs/debug)
+
+## Bottom Line
+A well-isolated bug speeds up verification and resolution. Minimal, public repro or it’s unlikely we can assist.
diff --git a/README.md b/README.md
index 3e2add10dcaeb..445b4613e4944 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 🎭 Playwright
 
-[![npm version](https://img.shields.io/npm/v/playwright.svg)](https://www.npmjs.com/package/playwright) <!-- GEN:chromium-version-badge -->[![Chromium version](https://img.shields.io/badge/chromium-128.0.6613.7-blue.svg?logo=google-chrome)](https://www.chromium.org/Home)<!-- GEN:stop --> <!-- GEN:firefox-version-badge -->[![Firefox version](https://img.shields.io/badge/firefox-128.0-blue.svg?logo=firefoxbrowser)](https://www.mozilla.org/en-US/firefox/new/)<!-- GEN:stop --> <!-- GEN:webkit-version-badge -->[![WebKit version](https://img.shields.io/badge/webkit-18.0-blue.svg?logo=safari)](https://webkit.org/)<!-- GEN:stop -->
+[![npm version](https://img.shields.io/npm/v/playwright.svg)](https://www.npmjs.com/package/playwright) <!-- GEN:chromium-version-badge -->[![Chromium version](https://img.shields.io/badge/chromium-140.0.7339.186-blue.svg?logo=google-chrome)](https://www.chromium.org/Home)<!-- GEN:stop --> <!-- GEN:firefox-version-badge -->[![Firefox version](https://img.shields.io/badge/firefox-141.0-blue.svg?logo=firefoxbrowser)](https://www.mozilla.org/en-US/firefox/new/)<!-- GEN:stop --> <!-- GEN:webkit-version-badge -->[![WebKit version](https://img.shields.io/badge/webkit-26.0-blue.svg?logo=safari)](https://webkit.org/)<!-- GEN:stop --> [![Join Discord](https://img.shields.io/badge/join-discord-informational)](https://aka.ms/playwright/discord)
 
 ## [Documentation](https://playwright.dev) | [API reference](https://playwright.dev/docs/api/class-playwright)
 
@@ -8,9 +8,9 @@ Playwright is a framework for Web Testing and Automation. It allows testing [Chr
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->128.0.6613.7<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->18.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| Firefox <!-- GEN:firefox-version -->128.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->140.0.7339.186<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->26.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Firefox <!-- GEN:firefox-version -->141.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 Headless execution is supported for all browsers on all platforms. Check out [system requirements](https://playwright.dev/docs/intro#system-requirements) for details.
 
@@ -46,7 +46,6 @@ npx playwright install
 You can optionally install only selected browsers, see [install browsers](https://playwright.dev/docs/cli#install-browsers) for more details. Or you can install no browsers at all and use existing [browser channels](https://playwright.dev/docs/browsers).
 
 * [Getting started](https://playwright.dev/docs/intro)
-* [Installation configuration](https://playwright.dev/docs/installation)
 * [API reference](https://playwright.dev/docs/api/class-playwright)
 
 ## Capabilities
@@ -163,7 +162,7 @@ test('Intercept network requests', async ({ page }) => {
 
 ## Resources
 
-* [Documentation](https://playwright.dev/docs/intro)
+* [Documentation](https://playwright.dev)
 * [API reference](https://playwright.dev/docs/api/class-playwright/)
 * [Contribution guide](CONTRIBUTING.md)
 * [Changelog](https://github.com/microsoft/playwright/releases)
diff --git a/SUPPORT.md b/SUPPORT.md
new file mode 100644
index 0000000000000..78cb929fb1bd4
--- /dev/null
+++ b/SUPPORT.md
@@ -0,0 +1,17 @@
+# Support
+
+## How to file issues and get help  
+
+This project uses GitHub issues to track bugs and feature requests. Please search the [existing issues][gh-issues] before filing new ones to avoid duplicates. For new issues, file your bug or feature request as a new issue using corresponding template.
+
+For help and questions about using this project, please see the [docs site for Playwright][docs].
+
+Join our community [Discord Server][discord-server] to connect with other developers using Playwright and ask questions in our 'help-playwright' forum.
+
+## Microsoft Support Policy  
+
+Support for Playwright is limited to the resources listed above.
+
+[gh-issues]: https://github.com/microsoft/playwright/issues/
+[docs]: https://playwright.dev/
+[discord-server]: https://aka.ms/playwright/discord
diff --git a/babel.config.json b/babel.config.json
deleted file mode 100644
index 3e345f427474a..0000000000000
--- a/babel.config.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "assumptions": {
-    "setPublicClassFields": true
-  },
-  "plugins": [
-    ["@babel/plugin-transform-typescript", { "allowDeclareFields": true } ],
-    "@babel/plugin-transform-export-namespace-from",
-    "@babel/plugin-transform-class-properties",
-    "@babel/plugin-transform-logical-assignment-operators",
-    "@babel/plugin-transform-nullish-coalescing-operator",
-    "@babel/plugin-transform-optional-chaining",
-    "@babel/plugin-transform-modules-commonjs"
-  ],
-  "ignore": [
-    "**/*.d.ts"
-  ]
-}
diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh
index 10889141a731d..0513b8920832a 100644
--- a/browser_patches/firefox/UPSTREAM_CONFIG.sh
+++ b/browser_patches/firefox/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
-REMOTE_URL="https://github.com/mozilla/gecko-dev"
+REMOTE_URL="https://github.com/mozilla-firefox/firefox"
 BASE_BRANCH="release"
-BASE_REVISION="bd7e0ac24a6fb1cddde3e45ea191b7abcc90cf56"
+BASE_REVISION="00656c9425c51ee035578ca6ebebe13c755b0375"
diff --git a/browser_patches/firefox/juggler/Helper.js b/browser_patches/firefox/juggler/Helper.js
index f5a64d6c8bc33..875dd5ac2e8b3 100644
--- a/browser_patches/firefox/juggler/Helper.js
+++ b/browser_patches/firefox/juggler/Helper.js
@@ -4,9 +4,9 @@
 
 const uuidGen = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
 
-class Helper {
+export class Helper {
   decorateAsEventEmitter(objectToDecorate) {
-    const { EventEmitter } = ChromeUtils.import('resource://gre/modules/EventEmitter.jsm');
+    const { EventEmitter } = ChromeUtils.importESModule('resource://gre/modules/EventEmitter.sys.mjs');
     const emitter = new EventEmitter();
     objectToDecorate.on = emitter.on.bind(emitter);
     objectToDecorate.addEventListener = emitter.on.bind(emitter);
@@ -172,7 +172,7 @@ class Helper {
 
 const helper = new Helper();
 
-class EventWatcher {
+export class EventWatcher {
   constructor(receiver, eventNames, pendingEventWatchers = new Set()) {
     this._pendingEventWatchers = pendingEventWatchers;
     this._pendingEventWatchers.add(this);
@@ -233,7 +233,3 @@ class EventWatcher {
   }
 }
 
-var EXPORTED_SYMBOLS = [ "Helper", "EventWatcher" ];
-this.Helper = Helper;
-this.EventWatcher = EventWatcher;
-
diff --git a/browser_patches/firefox/juggler/JugglerFrameParent.jsm b/browser_patches/firefox/juggler/JugglerFrameParent.jsm
index e621fab240680..9c3b58898955e 100644
--- a/browser_patches/firefox/juggler/JugglerFrameParent.jsm
+++ b/browser_patches/firefox/juggler/JugglerFrameParent.jsm
@@ -1,13 +1,11 @@
 "use strict";
 
-const { TargetRegistry } = ChromeUtils.import('chrome://juggler/content/TargetRegistry.js');
-const { Helper } = ChromeUtils.import('chrome://juggler/content/Helper.js');
+const { TargetRegistry } = ChromeUtils.importESModule('chrome://juggler/content/TargetRegistry.js');
+const { Helper } = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
 
 const helper = new Helper();
 
-var EXPORTED_SYMBOLS = ['JugglerFrameParent'];
-
-class JugglerFrameParent extends JSWindowActorParent {
+export class JugglerFrameParent extends JSWindowActorParent {
   constructor() {
     super();
   }
diff --git a/browser_patches/firefox/juggler/NetworkObserver.js b/browser_patches/firefox/juggler/NetworkObserver.js
index 8eb69d813360e..c063e0484d71b 100644
--- a/browser_patches/firefox/juggler/NetworkObserver.js
+++ b/browser_patches/firefox/juggler/NetworkObserver.js
@@ -4,9 +4,9 @@
 
 "use strict";
 
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {NetUtil} = ChromeUtils.import('resource://gre/modules/NetUtil.jsm');
-const { ChannelEventSinkFactory } = ChromeUtils.import("chrome://remote/content/cdp/observers/ChannelEventSink.jsm");
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {NetUtil} = ChromeUtils.importESModule('resource://gre/modules/NetUtil.sys.mjs');
+const { ChannelEventSinkFactory } = ChromeUtils.importESModule("chrome://remote/content/cdp/observers/ChannelEventSink.sys.mjs");
 
 
 const Cc = Components.classes;
@@ -28,7 +28,7 @@ const MAX_RESPONSE_STORAGE_SIZE = 100 * 1024 * 1024;
 
 const pageNetworkSymbol = Symbol('PageNetwork');
 
-class PageNetwork {
+export class PageNetwork {
   static forPageTarget(target) {
     if (!target)
       return undefined;
@@ -143,12 +143,16 @@ class NetworkRequest {
       const target = this._networkObserver._targetRegistry.targetForBrowserId(browsingContext.browserId);
       this._pageNetwork = PageNetwork.forPageTarget(target);
     }
-    this._expectingInterception = false;
+    this._shouldYieldInterceptionToServiceWorker = false;
     this._expectingResumedRequest = undefined;  // { method, headers, postData }
+    this._overriddenHeadersForRedirect = redirectedFrom?._overriddenHeadersForRedirect;
+    this._sentOnRequest = false;
     this._sentOnResponse = false;
     this._fulfilled = false;
 
-    if (this._pageNetwork)
+    if (this._overriddenHeadersForRedirect)
+      overrideRequestHeaders(httpChannel, this._overriddenHeadersForRedirect);
+    else if (this._pageNetwork)
       appendExtraHTTPHeaders(httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
 
     this._responseBodyChunks = [];
@@ -201,11 +205,13 @@ class NetworkRequest {
       this._interceptedChannel.synthesizeHeader(header.name, header.value);
       if (header.name.toLowerCase() === 'set-cookie') {
         Services.cookies.QueryInterface(Ci.nsICookieService);
-        Services.cookies.setCookieStringFromHttp(this.httpChannel.URI, header.value, this.httpChannel);
+        for (const cookieString of header.value.split('\n'))
+          Services.cookies.setCookieStringFromHttp(this.httpChannel.URI, cookieString, this.httpChannel);
       }
     }
     const synthesized = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
-    synthesized.data = base64body ? atob(base64body) : '';
+    if (base64body)
+      synthesized.setByteStringData(atob(base64body));
     this._interceptedChannel.startSynthesizedResponse(synthesized, null, null, '', false);
     this._interceptedChannel.finishSynthesizedResponse();
     this._interceptedChannel = undefined;
@@ -230,20 +236,13 @@ class NetworkRequest {
     if (!this._expectingResumedRequest)
       return;
     const { method, headers, postData } = this._expectingResumedRequest;
+    this._overriddenHeadersForRedirect = headers;
     this._expectingResumedRequest = undefined;
 
-    if (headers) {
-      for (const header of requestHeaders(this.httpChannel)) {
-        // We cannot remove the "host" header.
-        if (header.name.toLowerCase() === 'host')
-          continue;
-        this.httpChannel.setRequestHeader(header.name, '', false /* merge */);
-      }
-      for (const header of headers)
-        this.httpChannel.setRequestHeader(header.name, header.value, false /* merge */);
-    } else if (this._pageNetwork) {
+    if (headers)
+      overrideRequestHeaders(this.httpChannel, headers);
+    else if (this._pageNetwork)
       appendExtraHTTPHeaders(this.httpChannel, this._pageNetwork.combinedExtraHTTPHeaders());
-    }
     if (method)
       this.httpChannel.requestMethod = method;
     if (postData !== undefined)
@@ -320,9 +319,8 @@ class NetworkRequest {
     const interceptController = this._fallThroughInterceptController();
     if (interceptController && interceptController.shouldPrepareForIntercept(aURI, channel)) {
       // We assume that interceptController is a service worker if there is one,
-      // and yield interception to it. We are not going to intercept ourselves,
-      // so we send onRequest now.
-      this._sendOnRequest(false);
+      // and yield interception to it.
+      this._shouldYieldInterceptionToServiceWorker = true;
       return true;
     }
 
@@ -331,12 +329,6 @@ class NetworkRequest {
       return false;
     }
 
-    // We do not want to intercept any redirects, because we are not able
-    // to intercept subresource redirects, and it's unreliable for main requests.
-    // We do not sendOnRequest here, because redirects do that in constructor.
-    if (this.redirectedFromId)
-      return false;
-
     const shouldIntercept = this._shouldIntercept();
     if (!shouldIntercept) {
       // We are not intercepting - ready to issue onRequest.
@@ -344,21 +336,24 @@ class NetworkRequest {
       return false;
     }
 
-    this._expectingInterception = true;
     return true;
   }
 
   // nsINetworkInterceptController
   channelIntercepted(intercepted) {
-    if (!this._expectingInterception) {
-      // We are not intercepting, fall-through.
-      const interceptController = this._fallThroughInterceptController();
-      if (interceptController)
-        interceptController.channelIntercepted(intercepted);
+    // Yield to a service worker if determined so in shouldPrepareForIntercept().
+    const serviceWorker = this._shouldYieldInterceptionToServiceWorker ? this._fallThroughInterceptController() : undefined;
+    // Clear the flag to avoid an infinite loop. After service worker, we should intercept ourselves.
+    this._shouldYieldInterceptionToServiceWorker = false;
+
+    if (serviceWorker) {
+      const interceptedChannel = intercepted.QueryInterface(Ci.nsIInterceptedChannel);
+      // If service worker will not actually intercept the request, we want to be called again.
+      interceptedChannel.interceptAfterServiceWorkerResets();
+      serviceWorker.channelIntercepted(intercepted);
       return;
     }
 
-    this._expectingInterception = false;
     this._interceptedChannel = intercepted.QueryInterface(Ci.nsIInterceptedChannel);
 
     const pageNetwork = this._pageNetwork;
@@ -412,6 +407,7 @@ class NetworkRequest {
     // See https://github.com/microsoft/playwright/issues/9418#issuecomment-944836244
     if (aRequest !== this.httpChannel)
       return;
+    this._sendOnRequest(false);
     try {
       this._originalListener.onStartRequest(aRequest);
     } catch (e) {
@@ -449,6 +445,10 @@ class NetworkRequest {
   }
 
   _shouldIntercept() {
+    // We do not want to intercept any redirects, because we are not able
+    // to intercept subresource redirects, and it's unreliable for main requests.
+    if (this.redirectedFromId)
+      return false;
     const pageNetwork = this._pageNetwork;
     if (!pageNetwork)
       return false;
@@ -469,8 +469,15 @@ class NetworkRequest {
   }
 
   _sendOnRequest(isIntercepted) {
-    // Note: we call _sendOnRequest either after we intercepted the request,
-    // or at the first moment we know that we are not going to intercept.
+    if (this._sentOnRequest) {
+      // We can come here twice because:
+      // - Redirects call _sendOnRequest in the constructor and from inside interception.
+      // - All other requests might call _sendOnRequest from onStartRequest and from inside interception.
+      // - All requests call _sendOnRequest from _sendOnResponse to avoid responses without requests.
+      return;
+    }
+    this._sentOnRequest = true;
+
     const pageNetwork = this._pageNetwork;
     if (!pageNetwork)
       return;
@@ -493,11 +500,21 @@ class NetworkRequest {
   }
 
   _sendOnResponse(fromCache, opt_statusCode, opt_statusText) {
+    // For internal redirects, and perhaps something else that we lack test coverage for,
+    // we can arrive here before onStartRequest has fired. Make sure we
+    // notify about the request first.
+    this._sendOnRequest(false);
+
     if (this._sentOnResponse) {
-      // We can come here twice because of internal redirects, e.g. service workers.
+      // We can come here twice because of an internal redirect, for example:
+      // - request was intercepted by a service worker;
+      // - HSTS redirect;
+      // - CORS preflight;
+      // - who knows what else?
       return;
     }
     this._sentOnResponse = true;
+
     const pageNetwork = this._pageNetwork;
     if (!pageNetwork)
       return;
@@ -516,6 +533,8 @@ class NetworkRequest {
     };
 
     const { status, statusText, headers } = responseHead(this.httpChannel, opt_statusCode, opt_statusText);
+    if (redirectStatus.includes(status) && this._overriddenHeadersForRedirect)
+      this._overriddenHeadersForRedirect = filterHeadersForRedirect(this._overriddenHeadersForRedirect, this.httpChannel.requestMethod, status);
     let remoteIPAddress = undefined;
     let remotePort = undefined;
     try {
@@ -578,7 +597,7 @@ class NetworkRequest {
   }
 }
 
-class NetworkObserver {
+export class NetworkObserver {
   static instance() {
     return NetworkObserver._instance || null;
   }
@@ -602,6 +621,8 @@ class NetworkObserver {
           proxyFilter.onProxyFilterResult(defaultProxyInfo);
           return;
         }
+        if (this._targetRegistry.shouldBustHTTPAuthCacheForProxy(proxy))
+          Services.obs.notifyObservers(null, "net:clear-active-logins");
         proxyFilter.onProxyFilterResult(protocolProxyService.newProxyInfo(
             proxy.type,
             proxy.host,
@@ -771,6 +792,36 @@ function requestHeaders(httpChannel) {
   return headers;
 }
 
+function clearRequestHeaders(httpChannel) {
+  for (const header of requestHeaders(httpChannel)) {
+    // We cannot remove the "host" header.
+    if (header.name.toLowerCase() === 'host')
+      continue;
+    // Keep the "cookie" header. If there is an override, it will be set anyway.
+    // Otherwise, we may delete a cookie that was set for a redirect.
+    if (header.name.toLowerCase() === 'cookie')
+      continue;
+    httpChannel.setRequestHeader(header.name, '', false /* merge */);
+  }
+}
+
+function overrideRequestHeaders(httpChannel, headers) {
+  clearRequestHeaders(httpChannel);
+  appendExtraHTTPHeaders(httpChannel, headers);
+}
+
+const redirectStatus = [301, 302, 303, 307, 308];
+
+function filterHeadersForRedirect(headers, requestMethod, status) {
+    // HTTP-redirect fetch step 13 (https://fetch.spec.whatwg.org/#http-redirect-fetch)
+  if ((status === 301 || status === 302) && requestMethod === 'POST' ||
+      status === 303 && !['GET', 'HEAD'].includes(requestMethod)) {
+    const requestBodyHeaders = ['content-encoding', 'content-language', 'content-length', 'content-location', 'content-type'];
+    return headers.filter(header => !requestBodyHeaders.includes(header.name.toLowerCase()));
+  }
+  return headers;
+}
+
 function causeTypeToString(causeType) {
   for (let key in Ci.nsIContentPolicy) {
     if (Ci.nsIContentPolicy[key] === causeType)
@@ -858,7 +909,7 @@ function setPostData(httpChannel, postData, headers) {
     return;
   const synthesized = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
   const body = atob(postData);
-  synthesized.setData(body, body.length);
+  synthesized.setByteStringData(body);
 
   const overriddenHeader = (lowerCaseName) => {
     if (headers) {
@@ -890,7 +941,7 @@ function convertString(s, source, dest) {
   const is = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(
     Ci.nsIStringInputStream
   );
-  is.setData(s, s.length);
+  is.setByteStringData(s);
   const listener = Cc["@mozilla.org/network/stream-loader;1"].createInstance(
     Ci.nsIStreamLoader
   );
@@ -950,6 +1001,3 @@ PageNetwork.Events = {
   RequestFailed: Symbol('PageNetwork.Events.RequestFailed'),
 };
 
-var EXPORTED_SYMBOLS = ['NetworkObserver', 'PageNetwork'];
-this.NetworkObserver = NetworkObserver;
-this.PageNetwork = PageNetwork;
diff --git a/browser_patches/firefox/juggler/SimpleChannel.js b/browser_patches/firefox/juggler/SimpleChannel.js
index a4e1b19df4c6d..cc555451cdd49 100644
--- a/browser_patches/firefox/juggler/SimpleChannel.js
+++ b/browser_patches/firefox/juggler/SimpleChannel.js
@@ -79,7 +79,7 @@ class SimpleChannel {
 
   _setTimeout(cb, timeout) {
     // Lazy load on first call.
-    this._setTimeout = ChromeUtils.import('resource://gre/modules/Timer.jsm').setTimeout;
+    this._setTimeout = ChromeUtils.importESModule('resource://gre/modules/Timer.sys.mjs').setTimeout;
     this._setTimeout(cb, timeout);
   }
 
@@ -251,6 +251,3 @@ class SimpleChannel {
     }
   }
 }
-
-var EXPORTED_SYMBOLS = ['SimpleChannel'];
-this.SimpleChannel = SimpleChannel;
diff --git a/browser_patches/firefox/juggler/TargetRegistry.js b/browser_patches/firefox/juggler/TargetRegistry.js
index ea7b2afa4d734..4bdf162ab64f7 100644
--- a/browser_patches/firefox/juggler/TargetRegistry.js
+++ b/browser_patches/firefox/juggler/TargetRegistry.js
@@ -2,12 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {SimpleChannel} = ChromeUtils.import('chrome://juggler/content/SimpleChannel.js');
-const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-const {ContextualIdentityService} = ChromeUtils.import("resource://gre/modules/ContextualIdentityService.jsm");
-const {NetUtil} = ChromeUtils.import('resource://gre/modules/NetUtil.jsm');
-const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {Preferences} = ChromeUtils.importESModule("resource://gre/modules/Preferences.sys.mjs");
+const {ContextualIdentityService} = ChromeUtils.importESModule("resource://gre/modules/ContextualIdentityService.sys.mjs");
+const {NetUtil} = ChromeUtils.importESModule('resource://gre/modules/NetUtil.sys.mjs');
+const {AppConstants} = ChromeUtils.importESModule("resource://gre/modules/AppConstants.sys.mjs");
 
 const Cr = Components.results;
 
@@ -22,6 +21,9 @@ const ALL_PERMISSIONS = [
 ];
 
 let globalTabAndWindowActivationChain = Promise.resolve();
+// This is a workaround for https://github.com/microsoft/playwright/issues/34586
+let didCreateFirstPage = false;
+let globalNewPageChain = Promise.resolve();
 
 class DownloadInterceptor {
   constructor(registry) {
@@ -102,7 +104,7 @@ class DownloadInterceptor {
 
 const screencastService = Cc['@mozilla.org/juggler/screencast;1'].getService(Ci.nsIScreencastService);
 
-class TargetRegistry {
+export class TargetRegistry {
   static instance() {
     return TargetRegistry._instance || null;
   }
@@ -116,6 +118,7 @@ class TargetRegistry {
     this._browserToTarget = new Map();
     this._browserIdToTarget = new Map();
 
+    this._proxiesWithClashingAuthCacheKeys = new Set();
     this._browserProxy = null;
 
     // Cleanup containers from previous runs (if any)
@@ -234,12 +237,50 @@ class TargetRegistry {
       onOpenWindow(win);
   }
 
+  // Firefox uses nsHttpAuthCache to cache authentication to the proxy.
+  // If we're provided with a single proxy with a multiple different authentications, then
+  // we should clear the nsHttpAuthCache on every request.
+  shouldBustHTTPAuthCacheForProxy(proxy) {
+    return this._proxiesWithClashingAuthCacheKeys.has(proxy);
+  }
+
+  _updateProxiesWithSameAuthCacheAndDifferentCredentials() {
+    const proxyIdToCredentials = new Map();
+    const allProxies = [...this._browserContextIdToBrowserContext.values()].map(bc => bc._proxy).filter(Boolean);
+    if (this._browserProxy)
+      allProxies.push(this._browserProxy);
+    const proxyAuthCacheKeyAndProxy = allProxies.map(proxy => [
+      JSON.stringify({
+        type: proxy.type,
+        host: proxy.host,
+        port: proxy.port,
+      }),
+      proxy,
+    ]);
+    this._proxiesWithClashingAuthCacheKeys.clear();
+
+    proxyAuthCacheKeyAndProxy.sort(([cacheKey1], [cacheKey2]) => cacheKey1 < cacheKey2 ? -1 : 1);
+    for (let i = 0; i < proxyAuthCacheKeyAndProxy.length - 1; ++i) {
+      const [cacheKey1, proxy1] = proxyAuthCacheKeyAndProxy[i];
+      const [cacheKey2, proxy2] = proxyAuthCacheKeyAndProxy[i + 1];
+      if (cacheKey1 !== cacheKey2)
+        continue;
+      if (proxy1.username === proxy2.username && proxy1.password === proxy2.password)
+        continue;
+      // `proxy1` and `proxy2` have the same caching key, but serve different credentials.
+      // We have to bust HTTP Auth Cache everytime there's a request that will use either of the proxies.
+      this._proxiesWithClashingAuthCacheKeys.add(proxy1);
+      this._proxiesWithClashingAuthCacheKeys.add(proxy2);
+    }
+  }
+
   async cancelDownload(options) {
     this._downloadInterceptor.cancelDownload(options.uuid);
   }
 
   setBrowserProxy(proxy) {
     this._browserProxy = proxy;
+    this._updateProxiesWithSameAuthCacheAndDifferentCredentials();
   }
 
   getProxyInfo(channel) {
@@ -269,6 +310,16 @@ class TargetRegistry {
   }
 
   async newPage({browserContextId}) {
+    // When creating the very first page, we cannot create multiple in parallel.
+    // See https://github.com/microsoft/playwright/issues/34586.
+    if (didCreateFirstPage)
+      return this._newPageInternal({browserContextId});
+    const result = globalNewPageChain.then(() => this._newPageInternal({browserContextId}));
+    globalNewPageChain = result.catch(error => { /* swallow errors to keep chain running */ });
+    return result;
+  }
+
+  async _newPageInternal({browserContextId}) {
     const browserContext = this.browserContextForId(browserContextId);
     const features = "chrome,dialog=no,all";
     // See _callWithURIToLoad in browser.js for the structure of window.arguments
@@ -317,6 +368,7 @@ class TargetRegistry {
       if (await target.hasFailedToOverrideTimezone())
         throw new Error('Failed to override timezone');
     }
+    didCreateFirstPage = true;
     return target.id();
   }
 
@@ -333,7 +385,7 @@ class TargetRegistry {
   }
 }
 
-class PageTarget {
+export class PageTarget {
   constructor(registry, win, tab, browserContext, opener) {
     helper.decorateAsEventEmitter(this);
 
@@ -345,6 +397,7 @@ class PageTarget {
     this._linkedBrowser = tab.linkedBrowser;
     this._browserContext = browserContext;
     this._viewportSize = undefined;
+    this._zoom = 1;
     this._initialDPPX = this._linkedBrowser.browsingContext.overrideDPPX;
     this._url = 'about:blank';
     this._openerId = opener ? opener.id() : undefined;
@@ -354,7 +407,7 @@ class PageTarget {
     this._videoRecordingInfo = undefined;
     this._screencastRecordingInfo = undefined;
     this._dialogs = new Map();
-    this.forcedColors = 'no-override';
+    this.forcedColors = 'none';
     this.disableCache = false;
     this.mediumOverride = '';
     this.crossProcessCookie = {
@@ -368,7 +421,7 @@ class PageTarget {
       onLocationChange: (aWebProgress, aRequest, aLocation) => this._onNavigated(aLocation),
     };
     this._eventListeners = [
-      helper.addObserver(this._updateModalDialogs.bind(this), 'tabmodal-dialog-loaded'),
+      helper.addObserver(this._updateModalDialogs.bind(this), 'common-dialog-loaded'),
       helper.addProgressListener(tab.linkedBrowser, navigationListener, Ci.nsIWebProgress.NOTIFY_LOCATION),
       helper.addEventListener(this._linkedBrowser, 'DOMModalDialogClosed', event => this._updateModalDialogs()),
       helper.addEventListener(this._linkedBrowser, 'WillChangeBrowserRemoteness', event => this._willChangeBrowserRemoteness()),
@@ -457,9 +510,11 @@ class PageTarget {
     this.updateUserAgent(browsingContext);
     this.updatePlatform(browsingContext);
     this.updateDPPXOverride(browsingContext);
+    this.updateZoom(browsingContext);
     this.updateEmulatedMedia(browsingContext);
     this.updateColorSchemeOverride(browsingContext);
     this.updateReducedMotionOverride(browsingContext);
+    this.updateContrastOverride(browsingContext);
     this.updateForcedColorsOverride(browsingContext);
     this.updateForceOffline(browsingContext);
     this.updateCacheDisabled(browsingContext);
@@ -495,11 +550,20 @@ class PageTarget {
   }
 
   updateDPPXOverride(browsingContext = undefined) {
-    (browsingContext || this._linkedBrowser.browsingContext).overrideDPPX = this._browserContext.deviceScaleFactor || this._initialDPPX;
+    browsingContext ||= this._linkedBrowser.browsingContext;
+    const dppx = this._zoom * (this._browserContext.deviceScaleFactor || this._initialDPPX);
+    browsingContext.overrideDPPX = dppx;
+  }
+
+  async updateZoom(browsingContext = undefined) {
+    browsingContext ||= this._linkedBrowser.browsingContext;
+    // Update dpr first, and then UI zoom.
+    this.updateDPPXOverride(browsingContext);
+    browsingContext.fullZoom = this._zoom;
   }
 
   _updateModalDialogs() {
-    const prompts = new Set(this._linkedBrowser.tabModalPromptBox ? this._linkedBrowser.tabModalPromptBox.listPrompts() : []);
+    const prompts = new Set(this._linkedBrowser.tabDialogBox.getContentDialogManager().dialogs.map(dialog => dialog.frameContentWindow.Dialog));
     for (const dialog of this._dialogs.values()) {
       if (!prompts.has(dialog.prompt())) {
         this._dialogs.delete(dialog.id());
@@ -545,7 +609,7 @@ class PageTarget {
       const toolbarTop = stackRect.y;
       this._window.resizeBy(width - this._window.innerWidth, height + toolbarTop - this._window.innerHeight);
 
-      await this._channel.connect('').send('awaitViewportDimensions', { width, height });
+      await this._channel.connect('').send('awaitViewportDimensions', { width: width / this._zoom, height: height / this._zoom });
     } else {
       this._linkedBrowser.style.removeProperty('width');
       this._linkedBrowser.style.removeProperty('height');
@@ -557,8 +621,8 @@ class PageTarget {
 
       const actualSize = this._linkedBrowser.getBoundingClientRect();
       await this._channel.connect('').send('awaitViewportDimensions', {
-        width: actualSize.width,
-        height: actualSize.height,
+        width: actualSize.width / this._zoom,
+        height: actualSize.height / this._zoom,
       });
     }
   }
@@ -590,13 +654,23 @@ class PageTarget {
     (browsingContext || this._linkedBrowser.browsingContext).prefersReducedMotionOverride = this.reducedMotion || this._browserContext.reducedMotion || 'none';
   }
 
+  setContrast(contrast) {
+    this.contrast = fromProtocolContrast(contrast);
+    this.updateContrastOverride();
+  }
+
+  updateContrastOverride(browsingContext = undefined) {
+    (browsingContext || this._linkedBrowser.browsingContext).prefersContrastOverride = this.contrast || this._browserContext.contrast || 'none';
+  }
+
   setForcedColors(forcedColors) {
     this.forcedColors = fromProtocolForcedColors(forcedColors);
     this.updateForcedColorsOverride();
   }
 
   updateForcedColorsOverride(browsingContext = undefined) {
-    (browsingContext || this._linkedBrowser.browsingContext).forcedColorsOverride = (this.forcedColors !== 'no-override' ? this.forcedColors : this._browserContext.forcedColors) || 'no-override';
+    const isActive = this.forcedColors === 'active' || this._browserContext.forcedColors === 'active';
+    (browsingContext || this._linkedBrowser.browsingContext).forcedColorsOverride = isActive ? 'active' : 'none';
   }
 
   async setInterceptFileChooserDialog(enabled) {
@@ -610,6 +684,14 @@ class PageTarget {
     await this.updateViewportSize();
   }
 
+  async setZoom(zoom) {
+    // This is default range from the ZoomManager.
+    if (zoom < 0.3 || zoom > 5)
+      throw new Error('Invalid zoom value, must be between 0.3 and 5');
+    this._zoom = zoom;
+    await this.updateZoom();
+  }
+
   close(runBeforeUnload = false) {
     this._gBrowser.removeTab(this._tab, {
       skipPermitUnload: !runBeforeUnload,
@@ -816,11 +898,19 @@ function fromProtocolReducedMotion(reducedMotion) {
   throw new Error('Unknown reduced motion: ' + reducedMotion);
 }
 
+function fromProtocolContrast(contrast) {
+  if (contrast === 'more' || contrast === 'less' || contrast === 'custom' || contrast === 'no-preference')
+    return contrast;
+  if (contrast === null)
+    return undefined;
+  throw new Error('Unknown contrast: ' + contrast);
+}
+
 function fromProtocolForcedColors(forcedColors) {
   if (forcedColors === 'active' || forcedColors === 'none')
     return forcedColors;
-  if (forcedColors === null)
-    return undefined;
+  if (!forcedColors)
+    return 'none';
   throw new Error('Unknown forced colors: ' + forcedColors);
 }
 
@@ -854,8 +944,9 @@ class BrowserContext {
     this.forceOffline = false;
     this.disableCache = false;
     this.colorScheme = 'none';
-    this.forcedColors = 'no-override';
+    this.forcedColors = 'none';
     this.reducedMotion = 'none';
+    this.contrast = 'none';
     this.videoRecordingOptions = undefined;
     this.crossProcessCookie = {
       initScripts: [],
@@ -882,6 +973,12 @@ class BrowserContext {
       page.updateReducedMotionOverride();
   }
 
+  setContrast(contrast) {
+    this.contrast = fromProtocolContrast(contrast);
+    for (const page of this.pages)
+      page.updateContrastOverride();
+  }
+
   setForcedColors(forcedColors) {
     this.forcedColors = fromProtocolForcedColors(forcedColors);
     for (const page of this.pages)
@@ -906,12 +1003,14 @@ class BrowserContext {
     }
     this._registry._browserContextIdToBrowserContext.delete(this.browserContextId);
     this._registry._userContextIdToBrowserContext.delete(this.userContextId);
+    this._registry._updateProxiesWithSameAuthCacheAndDifferentCredentials();
   }
 
   setProxy(proxy) {
     // Clear AuthCache.
     Services.obs.notifyObservers(null, "net:clear-active-logins");
     this._proxy = proxy;
+    this._registry._updateProxiesWithSameAuthCacheAndDifferentCredentials();
   }
 
   setIgnoreHTTPSErrors(ignoreHTTPSErrors) {
@@ -1194,7 +1293,3 @@ TargetRegistry.Events = {
   DownloadFinished: Symbol('TargetRegistry.Events.DownloadFinished'),
   ScreencastStopped: Symbol('TargetRegistry.ScreencastStopped'),
 };
-
-var EXPORTED_SYMBOLS = ['TargetRegistry', 'PageTarget'];
-this.TargetRegistry = TargetRegistry;
-this.PageTarget = PageTarget;
diff --git a/browser_patches/firefox/juggler/components/Juggler.js b/browser_patches/firefox/juggler/components/Juggler.js
index d919935fb50ac..6121c4d3928bc 100644
--- a/browser_patches/firefox/juggler/components/Juggler.js
+++ b/browser_patches/firefox/juggler/components/Juggler.js
@@ -2,16 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var EXPORTED_SYMBOLS = ["Juggler", "JugglerFactory"];
-
-const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-const {ComponentUtils} = ChromeUtils.import("resource://gre/modules/ComponentUtils.jsm");
-const {Dispatcher} = ChromeUtils.import("chrome://juggler/content/protocol/Dispatcher.js");
-const {BrowserHandler} = ChromeUtils.import("chrome://juggler/content/protocol/BrowserHandler.js");
-const {NetworkObserver} = ChromeUtils.import("chrome://juggler/content/NetworkObserver.js");
-const {TargetRegistry} = ChromeUtils.import("chrome://juggler/content/TargetRegistry.js");
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {ActorManagerParent} = ChromeUtils.import('resource://gre/modules/ActorManagerParent.jsm');
+// Load SimpleChannel in browser-process global.
+Services.scriptloader.loadSubScript('chrome://juggler/content/SimpleChannel.js');
+
+const {XPCOMUtils} = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
+const {ComponentUtils} = ChromeUtils.importESModule("resource://gre/modules/ComponentUtils.sys.mjs");
+const {Dispatcher} = ChromeUtils.importESModule("chrome://juggler/content/protocol/Dispatcher.js");
+const {BrowserHandler} = ChromeUtils.importESModule("chrome://juggler/content/protocol/BrowserHandler.js");
+const {NetworkObserver} = ChromeUtils.importESModule("chrome://juggler/content/NetworkObserver.js");
+const {TargetRegistry} = ChromeUtils.importESModule("chrome://juggler/content/TargetRegistry.js");
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {ActorManagerParent} = ChromeUtils.importESModule('resource://gre/modules/ActorManagerParent.sys.mjs');
 const helper = new Helper();
 
 const Cc = Components.classes;
@@ -21,10 +22,10 @@ const Ci = Components.interfaces;
 ActorManagerParent.addJSWindowActors({
   JugglerFrame: {
     parent: {
-      moduleURI: 'chrome://juggler/content/JugglerFrameParent.jsm',
+      esModuleURI: 'chrome://juggler/content/JugglerFrameParent.jsm',
     },
     child: {
-      moduleURI: 'chrome://juggler/content/content/JugglerFrameChild.jsm',
+      esModuleURI: 'chrome://juggler/content/content/JugglerFrameChild.jsm',
       events: {
         // Normally, we instantiate an actor when a new window is created.
         DOMWindowCreated: {},
@@ -45,7 +46,7 @@ ActorManagerParent.addJSWindowActors({
 let browserStartupFinishedCallback;
 let browserStartupFinishedPromise = new Promise(x => browserStartupFinishedCallback = x);
 
-class Juggler {
+export class Juggler {
   get classDescription() { return "Sample command-line handler"; }
   get classID() { return Components.ID('{f7a74a33-e2ab-422d-b022-4fb213dd2639}'); }
   get contractID() { return "@mozilla.org/remote/juggler;1" }
@@ -105,7 +106,10 @@ class Juggler {
         };
 
         // Force create hidden window here, otherwise its creation later closes the web socket!
-        Services.appShell.hiddenDOMWindow;
+        // Since https://phabricator.services.mozilla.com/D219834, hiddenDOMWindow is only available on MacOS.
+        if (Services.appShell.hasHiddenWindow) {
+          Services.appShell.hiddenDOMWindow;
+        }
 
         let pipeStopped = false;
         let browserHandler;
@@ -151,7 +155,7 @@ class Juggler {
 const jugglerInstance = new Juggler();
 
 // This is used by the XPCOM codepath which expects a constructor
-var JugglerFactory = function() {
+export var JugglerFactory = function() {
   return jugglerInstance;
 };
 
diff --git a/browser_patches/firefox/juggler/components/components.conf b/browser_patches/firefox/juggler/components/components.conf
index e5bc6523b10cd..955b38ab9ccec 100644
--- a/browser_patches/firefox/juggler/components/components.conf
+++ b/browser_patches/firefox/juggler/components/components.conf
@@ -11,7 +11,7 @@ Classes = [
             "command-line-handler": "m-remote",
             "profile-after-change": "Juggler",
         },
-        "jsm": "chrome://juggler/content/components/Juggler.js",
+        "esModule": "chrome://juggler/content/components/Juggler.js",
         "constructor": "JugglerFactory",
     },
 ]
diff --git a/browser_patches/firefox/juggler/content/FrameTree.js b/browser_patches/firefox/juggler/content/FrameTree.js
index 2d59b3c43aa23..09a95b3548df9 100644
--- a/browser_patches/firefox/juggler/content/FrameTree.js
+++ b/browser_patches/firefox/juggler/content/FrameTree.js
@@ -7,13 +7,11 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {SimpleChannel} = ChromeUtils.import('chrome://juggler/content/SimpleChannel.js');
-const {Runtime} = ChromeUtils.import('chrome://juggler/content/content/Runtime.js');
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
 
 const helper = new Helper();
 
-class FrameTree {
+export class FrameTree {
   constructor(rootBrowsingContext) {
     helper.decorateAsEventEmitter(this);
 
@@ -46,8 +44,6 @@ class FrameTree {
       Ci.nsISupportsWeakReference,
     ]);
 
-    this._addedScrollbarsStylesheetSymbol = Symbol('_addedScrollbarsStylesheetSymbol');
-
     this._wdm = Cc["@mozilla.org/dom/workers/workerdebuggermanager;1"].createInstance(Ci.nsIWorkerDebuggerManager);
     this._wdmListener = {
       QueryInterface: ChromeUtils.generateQI([Ci.nsIWorkerDebuggerManagerListener]),
@@ -130,24 +126,12 @@ class FrameTree {
   }
 
   _onDOMWindowCreated(window) {
-    if (!window[this._addedScrollbarsStylesheetSymbol] && this.scrollbarsHidden) {
-      const styleSheetService = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Components.interfaces.nsIStyleSheetService);
-      const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
-      const uri = ioService.newURI('chrome://juggler/content/content/hidden-scrollbars.css', null, null);
-      const sheet = styleSheetService.preloadSheet(uri, styleSheetService.AGENT_SHEET);
-      window.windowUtils.addSheet(sheet, styleSheetService.AGENT_SHEET);
-      window[this._addedScrollbarsStylesheetSymbol] = true;
-    }
     const frame = this.frameForDocShell(window.docShell);
     if (!frame)
       return;
     frame._onGlobalObjectCleared();
   }
 
-  setScrollbarsHidden(hidden) {
-    this.scrollbarsHidden = hidden;
-  }
-
   setJavaScriptDisabled(javaScriptDisabled) {
     this._javaScriptDisabled = javaScriptDisabled;
     for (const frame of this.frames())
@@ -704,6 +688,3 @@ function channelId(channel) {
 }
 
 
-var EXPORTED_SYMBOLS = ['FrameTree'];
-this.FrameTree = FrameTree;
-
diff --git a/browser_patches/firefox/juggler/content/JugglerFrameChild.jsm b/browser_patches/firefox/juggler/content/JugglerFrameChild.jsm
index 529f6d3b5898e..af060c57aac90 100644
--- a/browser_patches/firefox/juggler/content/JugglerFrameChild.jsm
+++ b/browser_patches/firefox/juggler/content/JugglerFrameChild.jsm
@@ -1,14 +1,16 @@
 "use strict";
 
-const { Helper } = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const { initialize } = ChromeUtils.import('chrome://juggler/content/content/main.js');
+const { Helper } = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const { initialize } = ChromeUtils.importESModule('chrome://juggler/content/content/main.js');
 
 const Ci = Components.interfaces;
 const helper = new Helper();
 
 let sameProcessInstanceNumber = 0;
 
-class JugglerFrameChild extends JSWindowActorChild {
+const topBrowingContextToAgents = new Map();
+
+export class JugglerFrameChild extends JSWindowActorChild {
   constructor() {
     super();
 
@@ -16,49 +18,68 @@ class JugglerFrameChild extends JSWindowActorChild {
   }
 
   handleEvent(aEvent) {
-    if (this._agents && aEvent.type === 'DOMWillOpenModalDialog') {
-      this._agents.channel.pause();
+    const agents = this._agents();
+    if (!agents)
+      return;
+    if (aEvent.type === 'DOMWillOpenModalDialog') {
+      agents.channel.pause();
       return;
     }
-    if (this._agents && aEvent.type === 'DOMModalDialogClosed') {
-      this._agents.channel.resumeSoon();
+    if (aEvent.type === 'DOMModalDialogClosed') {
+      agents.channel.resumeSoon();
       return;
     }
-    if (this._agents && aEvent.target === this.document)
-      this._agents.pageAgent.onWindowEvent(aEvent);
-    if (this._agents && aEvent.target === this.document)
-      this._agents.frameTree.onWindowEvent(aEvent);
+    if (aEvent.target === this.document) {
+      agents.pageAgent.onWindowEvent(aEvent);
+      agents.frameTree.onWindowEvent(aEvent);
+    }
+  }
+
+  _agents() {
+    return topBrowingContextToAgents.get(this.browsingContext.top);
   }
 
   actorCreated() {
     this.actorName = `content::${this.browsingContext.browserId}/${this.browsingContext.id}/${++sameProcessInstanceNumber}`;
 
     this._eventListeners.push(helper.addEventListener(this.contentWindow, 'load', event => {
-      this._agents?.pageAgent.onWindowEvent(event);
+      this._agents()?.pageAgent.onWindowEvent(event);
     }));
 
     if (this.document.documentURI.startsWith('moz-extension://'))
       return;
-    this._agents = initialize(this.browsingContext, this.docShell, this);
-  }
 
-  _dispose() {
-    helper.removeListeners(this._eventListeners);
-    // We do not cleanup since agents are shared for all frames in the process.
-
-    // TODO: restore the cleanup.
-    // Reset transport so that all messages will be pending and will not throw any errors.
-    // this._channel.resetTransport();
-    // this._agents.pageAgent.dispose();
-    // this._agents.frameTree.dispose();
-    // this._agents = undefined;
+    // Child frame events will be forwarded to related top-level agents.
+    if (this.browsingContext.parent)
+      return;
+
+    let agents = topBrowingContextToAgents.get(this.browsingContext);
+    if (!agents) {
+      agents = initialize(this.browsingContext, this.docShell);
+      topBrowingContextToAgents.set(this.browsingContext, agents);
+    }
+    agents.channel.bindToActor(this);
+    agents.actor = this;
   }
 
   didDestroy() {
-    this._dispose();
+    helper.removeListeners(this._eventListeners);
+
+    if (this.browsingContext.parent)
+      return;
+
+    const agents = topBrowingContextToAgents.get(this.browsingContext);
+    // The agents are already re-bound to a new actor.
+    if (agents?.actor !== this)
+      return;
+
+    topBrowingContextToAgents.delete(this.browsingContext);
+
+    agents.channel.resetTransport();
+    agents.pageAgent.dispose();
+    agents.frameTree.dispose();
   }
 
   receiveMessage() { }
 }
 
-var EXPORTED_SYMBOLS = ['JugglerFrameChild'];
diff --git a/browser_patches/firefox/juggler/content/PageAgent.js b/browser_patches/firefox/juggler/content/PageAgent.js
index 6aee921e87779..2ff5e6b922b55 100644
--- a/browser_patches/firefox/juggler/content/PageAgent.js
+++ b/browser_patches/firefox/juggler/content/PageAgent.js
@@ -8,9 +8,9 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 const Cu = Components.utils;
 
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {NetUtil} = ChromeUtils.import('resource://gre/modules/NetUtil.jsm');
-const {setTimeout} = ChromeUtils.import('resource://gre/modules/Timer.jsm');
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {NetUtil} = ChromeUtils.importESModule('resource://gre/modules/NetUtil.sys.mjs');
+const {setTimeout} = ChromeUtils.importESModule('resource://gre/modules/Timer.sys.mjs');
 
 const dragService = Cc["@mozilla.org/widget/dragservice;1"].getService(
   Ci.nsIDragService
@@ -51,7 +51,7 @@ class WorkerData {
   }
 }
 
-class PageAgent {
+export class PageAgent {
   constructor(browserChannel, frameTree) {
     this._browserChannel = browserChannel;
     this._browserPage = browserChannel.connect('page');
@@ -120,7 +120,8 @@ class PageAgent {
           // After the dragStart event is dispatched and handled by Web,
           // it might or might not create a new drag session, depending on its preventing default.
           setTimeout(() => {
-            this._browserPage.emit('pageInputEvent', { type: 'juggler-drag-finalized', dragSessionStarted: !!dragService.getCurrentSession() });
+            const session = this._getCurrentDragSession();
+            this._browserPage.emit('pageInputEvent', { type: 'juggler-drag-finalized', dragSessionStarted: !!session });
           }, 0);
         }
       }),
@@ -370,7 +371,12 @@ class PageAgent {
     const unsafeObject = frame.unsafeObject(objectId);
     if (!unsafeObject)
       throw new Error('Object is not input!');
-    const nsFiles = await Promise.all(files.map(filePath => File.createFromFileName(filePath)));
+    let nsFiles;
+    if (unsafeObject.webkitdirectory) {
+      nsFiles = await new Directory(files[0]).getFiles(true);
+    } else {
+      nsFiles = await Promise.all(files.map(filePath => File.createFromFileName(filePath)));
+    }
     unsafeObject.mozSetFileArray(nsFiles);
     const events = [
       new (frame.domWindow().Event)('input', { bubbles: true, cancelable: true, composed: true }),
@@ -521,8 +527,14 @@ class PageAgent {
     });
   }
 
+  _getCurrentDragSession() {
+    const frame = this._frameTree.mainFrame();
+    const domWindow = frame?.domWindow();
+    return domWindow ? dragService.getCurrentSession(domWindow) : undefined;
+  }
+
   async _dispatchDragEvent({type, x, y, modifiers}) {
-    const session = dragService.getCurrentSession();
+    const session = this._getCurrentDragSession();
     const dropEffect = session.dataTransfer.dropEffect;
 
     if ((type === 'drop' && dropEffect !== 'none') || type ===  'dragover') {
@@ -546,9 +558,8 @@ class PageAgent {
       return;
     }
     if (type === 'dragend') {
-      const session = dragService.getCurrentSession();
-      if (session)
-        dragService.endDragSession(true);
+      const session = this._getCurrentDragSession();
+      session?.endDragSession(true);
       return;
     }
   }
@@ -564,7 +575,7 @@ class PageAgent {
     // We crash by using js-ctypes and dereferencing
     // a bad pointer. The crash should happen immediately
     // upon loading this frame script.
-    const { ctypes } = ChromeUtils.import('resource://gre/modules/ctypes.jsm');
+    const { ctypes } = ChromeUtils.importESModule('resource://gre/modules/ctypes.sys.mjs');
     ChromeUtils.privateNoteIntentionalCrash();
     const zero = new ctypes.intptr_t(8);
     const badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
@@ -698,6 +709,3 @@ class PageAgent {
   }
 }
 
-var EXPORTED_SYMBOLS = ['PageAgent'];
-this.PageAgent = PageAgent;
-
diff --git a/browser_patches/firefox/juggler/content/Runtime.js b/browser_patches/firefox/juggler/content/Runtime.js
index a5fa7a03dd343..ad8720a1d3e36 100644
--- a/browser_patches/firefox/juggler/content/Runtime.js
+++ b/browser_patches/firefox/juggler/content/Runtime.js
@@ -8,8 +8,8 @@
 
 if (!this.Debugger) {
   // Worker has a Debugger defined already.
-  const {addDebuggerToGlobal} = ChromeUtils.import("resource://gre/modules/jsdebugger.jsm", {});
-  addDebuggerToGlobal(Components.utils.getGlobalForObject(this));
+  const {addDebuggerToGlobal} = ChromeUtils.importESModule("resource://gre/modules/jsdebugger.sys.mjs");
+  addDebuggerToGlobal(Components.utils.getGlobalForObject(globalThis));
 }
 
 let lastId = 0;
@@ -596,5 +596,5 @@ function emitEvent(event, ...args) {
     listener.call(null, ...args);
 }
 
-var EXPORTED_SYMBOLS = ['Runtime'];
-this.Runtime = Runtime;
+// Export Runtime to global.
+globalThis.Runtime = Runtime;
diff --git a/browser_patches/firefox/juggler/content/main.js b/browser_patches/firefox/juggler/content/main.js
index 022b1e3a5e87c..68fb364eadb4e 100644
--- a/browser_patches/firefox/juggler/content/main.js
+++ b/browser_patches/firefox/juggler/content/main.js
@@ -2,29 +2,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {FrameTree} = ChromeUtils.import('chrome://juggler/content/content/FrameTree.js');
-const {SimpleChannel} = ChromeUtils.import('chrome://juggler/content/SimpleChannel.js');
-const {PageAgent} = ChromeUtils.import('chrome://juggler/content/content/PageAgent.js');
+// Load SimpleChannel and Runtime in content process's global.
+// NOTE: since these have to exist in both Worker and main threads, and we do
+// not know a way to load ES Modules in worker threads, we have to use the loadSubScript
+// utility instead.
+Services.scriptloader.loadSubScript('chrome://juggler/content/SimpleChannel.js');
+Services.scriptloader.loadSubScript('chrome://juggler/content/content/Runtime.js');
 
-const browsingContextToAgents = new Map();
-const helper = new Helper();
-
-function initialize(browsingContext, docShell, actor) {
-  if (browsingContext.parent) {
-    // For child frames, return agents from the main frame.
-    return browsingContextToAgents.get(browsingContext.top);
-  }
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {FrameTree} = ChromeUtils.importESModule('chrome://juggler/content/content/FrameTree.js');
+const {PageAgent} = ChromeUtils.importESModule('chrome://juggler/content/content/PageAgent.js');
 
-  let data = browsingContextToAgents.get(browsingContext);
-  if (data) {
-    // Rebind from one main frame actor to another one.
-    data.channel.bindToActor(actor);
-    return data;
-  }
+const helper = new Helper();
 
-  data = { channel: undefined, pageAgent: undefined, frameTree: undefined, failedToOverrideTimezone: false };
-  browsingContextToAgents.set(browsingContext, data);
+export function initialize(browsingContext, docShell) {
+  const data = { channel: undefined, pageAgent: undefined, frameTree: undefined, failedToOverrideTimezone: false };
 
   const applySetting = {
     geolocation: (geolocation) => {
@@ -59,10 +51,6 @@ function initialize(browsingContext, docShell, actor) {
       docShell.languageOverride = locale;
     },
 
-    scrollbarsHidden: (hidden) => {
-      data.frameTree.setScrollbarsHidden(hidden);
-    },
-
     javaScriptDisabled: (javaScriptDisabled) => {
       data.frameTree.setJavaScriptDisabled(javaScriptDisabled);
     },
@@ -84,7 +72,6 @@ function initialize(browsingContext, docShell, actor) {
     data.frameTree.addBinding(worldName, name, script);
   data.frameTree.setInitScripts([...contextCrossProcessCookie.initScripts, ...pageCrossProcessCookie.initScripts]);
   data.channel = new SimpleChannel('', 'process-' + Services.appinfo.processID);
-  data.channel.bindToActor(actor);
   data.pageAgent = new PageAgent(data.channel, data.frameTree);
   docShell.fileInputInterceptionEnabled = !!pageCrossProcessCookie.interceptFileChooserDialog;
 
@@ -133,6 +120,3 @@ function initialize(browsingContext, docShell, actor) {
 
   return data;
 }
-
-var EXPORTED_SYMBOLS = ['initialize'];
-this.initialize = initialize;
diff --git a/browser_patches/firefox/juggler/protocol/BrowserHandler.js b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
index 7de276d017b26..035a53bb688c9 100644
--- a/browser_patches/firefox/juggler/protocol/BrowserHandler.js
+++ b/browser_patches/firefox/juggler/protocol/BrowserHandler.js
@@ -4,15 +4,15 @@
 
 "use strict";
 
-const {AddonManager} = ChromeUtils.import("resource://gre/modules/AddonManager.jsm");
-const {TargetRegistry} = ChromeUtils.import("chrome://juggler/content/TargetRegistry.js");
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {PageHandler} = ChromeUtils.import("chrome://juggler/content/protocol/PageHandler.js");
-const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
+const {AddonManager} = ChromeUtils.importESModule("resource://gre/modules/AddonManager.sys.mjs");
+const {TargetRegistry} = ChromeUtils.importESModule("chrome://juggler/content/TargetRegistry.js");
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {PageHandler} = ChromeUtils.importESModule("chrome://juggler/content/protocol/PageHandler.js");
+const {AppConstants} = ChromeUtils.importESModule("resource://gre/modules/AppConstants.sys.mjs");
 
 const helper = new Helper();
 
-class BrowserHandler {
+export class BrowserHandler {
   constructor(session, dispatcher, targetRegistry, startCompletePromise, onclose) {
     this._session = session;
     this._dispatcher = dispatcher;
@@ -219,6 +219,10 @@ class BrowserHandler {
     await this._targetRegistry.browserContextForId(browserContextId).setForcedColors(nullToUndefined(forcedColors));
   }
 
+  async ['Browser.setContrast']({browserContextId, contrast}) {
+    await this._targetRegistry.browserContextForId(browserContextId).setContrast(nullToUndefined(contrast));
+  }
+
   async ['Browser.setVideoRecordingOptions']({browserContextId, options}) {
     await this._targetRegistry.browserContextForId(browserContextId).setVideoRecordingOptions(options);
   }
@@ -255,10 +259,6 @@ class BrowserHandler {
     await this._targetRegistry.browserContextForId(browserContextId).setDefaultViewport(nullToUndefined(viewport));
   }
 
-  async ['Browser.setScrollbarsHidden']({browserContextId, hidden}) {
-    await this._targetRegistry.browserContextForId(browserContextId).applySetting('scrollbarsHidden', nullToUndefined(hidden));
-  }
-
   async ['Browser.setInitScripts']({browserContextId, scripts}) {
     await this._targetRegistry.browserContextForId(browserContextId).setInitScripts(scripts);
   }
@@ -313,6 +313,3 @@ async function waitForWindowClosed(browserWindow) {
 function nullToUndefined(value) {
   return value === null ? undefined : value;
 }
-
-var EXPORTED_SYMBOLS = ['BrowserHandler'];
-this.BrowserHandler = BrowserHandler;
diff --git a/browser_patches/firefox/juggler/protocol/Dispatcher.js b/browser_patches/firefox/juggler/protocol/Dispatcher.js
index 8542461d529eb..7a65d0a1170c1 100644
--- a/browser_patches/firefox/juggler/protocol/Dispatcher.js
+++ b/browser_patches/firefox/juggler/protocol/Dispatcher.js
@@ -2,12 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {protocol, checkScheme} = ChromeUtils.import("chrome://juggler/content/protocol/Protocol.js");
-const {Helper} = ChromeUtils.import('chrome://juggler/content/Helper.js');
+const {protocol} = ChromeUtils.importESModule("chrome://juggler/content/protocol/Protocol.js");
+const {checkScheme} = ChromeUtils.importESModule("chrome://juggler/content/protocol/PrimitiveTypes.js");
+const {Helper} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
 
 const helper = new Helper();
 
-class Dispatcher {
+export class Dispatcher {
   /**
    * @param {Connection} connection
    */
@@ -132,7 +133,3 @@ class ProtocolSession {
     return await this._handler[method](params);
   }
 }
-
-this.EXPORTED_SYMBOLS = ['Dispatcher'];
-this.Dispatcher = Dispatcher;
-
diff --git a/browser_patches/firefox/juggler/protocol/PageHandler.js b/browser_patches/firefox/juggler/protocol/PageHandler.js
index 8fa9a06361b71..1dab7d8803782 100644
--- a/browser_patches/firefox/juggler/protocol/PageHandler.js
+++ b/browser_patches/firefox/juggler/protocol/PageHandler.js
@@ -4,11 +4,11 @@
 
 "use strict";
 
-const {Helper, EventWatcher} = ChromeUtils.import('chrome://juggler/content/Helper.js');
-const {NetUtil} = ChromeUtils.import('resource://gre/modules/NetUtil.jsm');
-const {NetworkObserver, PageNetwork} = ChromeUtils.import('chrome://juggler/content/NetworkObserver.js');
-const {PageTarget} = ChromeUtils.import('chrome://juggler/content/TargetRegistry.js');
-const {setTimeout} = ChromeUtils.import('resource://gre/modules/Timer.jsm');
+const {Helper, EventWatcher} = ChromeUtils.importESModule('chrome://juggler/content/Helper.js');
+const {NetUtil} = ChromeUtils.importESModule('resource://gre/modules/NetUtil.sys.mjs');
+const {NetworkObserver, PageNetwork} = ChromeUtils.importESModule('chrome://juggler/content/NetworkObserver.js');
+const {PageTarget} = ChromeUtils.importESModule('chrome://juggler/content/TargetRegistry.js');
+const {setTimeout} = ChromeUtils.importESModule('resource://gre/modules/Timer.sys.mjs');
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
@@ -65,7 +65,7 @@ class WorkerHandler {
   }
 }
 
-class PageHandler {
+export class PageHandler {
   constructor(target, session, contentChannel) {
     this._session = session;
     this._contentChannel = contentChannel;
@@ -240,6 +240,10 @@ class PageHandler {
     await this._pageTarget.setViewportSize(viewportSize === null ? undefined : viewportSize);
   }
 
+  async ['Page.setZoom']({zoom}) {
+    await this._pageTarget.setZoom(zoom);
+  }
+
   async ['Runtime.evaluate'](options) {
     return await this._contentPage.send('evaluate', options);
   }
@@ -256,6 +260,13 @@ class PageHandler {
     return await this._contentPage.send('disposeObject', options);
   }
 
+  async ['Heap.collectGarbage']() {
+    Services.obs.notifyObservers(null, "child-gc-request");
+    Cu.forceGC();
+    Services.obs.notifyObservers(null, "child-cc-request");
+    Cu.forceCC();
+  }
+
   async ['Network.getResponseBody']({requestId}) {
     return this._pageNetwork.getResponseBody(requestId);
   }
@@ -291,10 +302,11 @@ class PageHandler {
     return await this._contentPage.send('setFileInputFiles', options);
   }
 
-  async ['Page.setEmulatedMedia']({colorScheme, type, reducedMotion, forcedColors}) {
+  async ['Page.setEmulatedMedia']({colorScheme, type, reducedMotion, forcedColors, contrast}) {
     this._pageTarget.setColorScheme(colorScheme || null);
     this._pageTarget.setReducedMotion(reducedMotion || null);
     this._pageTarget.setForcedColors(forcedColors || null);
+    this._pageTarget.setContrast(contrast || null);
     this._pageTarget.setEmulatedMedia(type);
   }
 
@@ -679,6 +691,3 @@ class PageHandler {
     return await worker.sendMessage(JSON.parse(message));
   }
 }
-
-var EXPORTED_SYMBOLS = ['PageHandler'];
-this.PageHandler = PageHandler;
diff --git a/browser_patches/firefox/juggler/protocol/PrimitiveTypes.js b/browser_patches/firefox/juggler/protocol/PrimitiveTypes.js
index 5799038f19cbc..ca6d1ec4f60f2 100644
--- a/browser_patches/firefox/juggler/protocol/PrimitiveTypes.js
+++ b/browser_patches/firefox/juggler/protocol/PrimitiveTypes.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const t = {};
+export const t = {};
 
 t.String = function(x, details = {}, path = ['<root>']) {
   if (typeof x === 'string' || typeof x === 'String')
@@ -96,7 +96,7 @@ function beauty(path, obj) {
   return `property "${path.join('.')}" - ${JSON.stringify(obj, null, 2)}`;
 }
 
-function checkScheme(scheme, x, details = {}, path = ['<root>']) {
+export function checkScheme(scheme, x, details = {}, path = ['<root>']) {
   if (!scheme)
     throw new Error(`ILLDEFINED SCHEME: ${path.join('.')}`);
   if (typeof scheme === 'object') {
@@ -142,6 +142,3 @@ test(t.Either(t.String, t.Number), {});
 
 */
 
-this.t = t;
-this.checkScheme = checkScheme;
-this.EXPORTED_SYMBOLS = ['t', 'checkScheme'];
diff --git a/browser_patches/firefox/juggler/protocol/Protocol.js b/browser_patches/firefox/juggler/protocol/Protocol.js
index 6c9b700f05fec..4cb44d679ce0b 100644
--- a/browser_patches/firefox/juggler/protocol/Protocol.js
+++ b/browser_patches/firefox/juggler/protocol/Protocol.js
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {t, checkScheme} = ChromeUtils.import('chrome://juggler/content/protocol/PrimitiveTypes.js');
+const {t} = ChromeUtils.importESModule('chrome://juggler/content/protocol/PrimitiveTypes.js');
 
 // Protocol-specific types.
 const browserTypes = {};
@@ -394,12 +394,6 @@ const Browser = {
         viewport: t.Nullable(pageTypes.Viewport),
       }
     },
-    'setScrollbarsHidden': {
-      params: {
-        browserContextId: t.Optional(t.String),
-        hidden: t.Boolean,
-      }
-    },
     'setInitScripts': {
       params: {
         browserContextId: t.Optional(t.String),
@@ -469,6 +463,12 @@ const Browser = {
         forcedColors: t.Nullable(t.Enum(['active', 'none'])),
       },
     },
+    'setContrast': {
+      params: {
+        browserContextId: t.Optional(t.String),
+        contrast: t.Nullable(t.Enum(['less', 'more', 'custom', 'no-preference'])),
+      },
+    },
     'setVideoRecordingOptions': {
       params: {
         browserContextId: t.Optional(t.String),
@@ -487,6 +487,17 @@ const Browser = {
   },
 };
 
+const Heap = {
+  targets: ['page'],
+  types: {},
+  events: {},
+  methods: {
+    'collectGarbage': {
+      params: {},
+    },
+  },
+};
+
 const Network = {
   targets: ['page'],
   types: networkTypes,
@@ -789,6 +800,11 @@ const Page = {
         viewportSize: t.Nullable(pageTypes.Size),
       },
     },
+    'setZoom': {
+      params: {
+        zoom: t.Number,
+      },
+    },
     'bringToFront': {
       params: {
       },
@@ -799,6 +815,7 @@ const Page = {
         colorScheme: t.Optional(t.Enum(['dark', 'light', 'no-preference'])),
         reducedMotion: t.Optional(t.Enum(['reduce', 'no-preference'])),
         forcedColors: t.Optional(t.Enum(['active', 'none'])),
+        contrast: t.Optional(t.Enum(['less', 'more', 'custom', 'no-preference'])),
       },
     },
     'setCacheDisabled': {
@@ -1001,8 +1018,6 @@ const Accessibility = {
   }
 }
 
-this.protocol = {
-  domains: {Browser, Page, Runtime, Network, Accessibility},
+export const protocol = {
+  domains: {Browser, Heap, Page, Runtime, Network, Accessibility},
 };
-this.checkScheme = checkScheme;
-this.EXPORTED_SYMBOLS = ['protocol', 'checkScheme'];
diff --git a/browser_patches/firefox/juggler/screencast/moz.build b/browser_patches/firefox/juggler/screencast/moz.build
index e21b177c3965c..f89c54e037e39 100644
--- a/browser_patches/firefox/juggler/screencast/moz.build
+++ b/browser_patches/firefox/juggler/screencast/moz.build
@@ -23,8 +23,8 @@ XPCOM_MANIFESTS += [
 LOCAL_INCLUDES += [
     '/dom/media/systemservices',
     '/media/libyuv/libyuv/include',
+    '/third_party/abseil-cpp',
     '/third_party/libwebrtc',
-    '/third_party/libwebrtc/third_party/abseil-cpp',
 ]
 
 LOCAL_INCLUDES += [
diff --git a/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp b/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp
index 25f6171801414..7256c8c8ea416 100644
--- a/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp
+++ b/browser_patches/firefox/juggler/screencast/nsScreencastService.cpp
@@ -129,7 +129,7 @@ class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::Vide
     capability.height = 960;
     capability.maxFPS = ScreencastEncoder::fps;
     capability.videoType = webrtc::VideoType::kI420;
-    int error = mCaptureModule->StartCapture(capability);
+    int error = mCaptureModule->StartCaptureCounted(capability);
     if (error) {
       fprintf(stderr, "StartCapture error %d\n", error);
       return false;
@@ -152,7 +152,7 @@ class nsScreencastService::Session : public rtc::VideoSinkInterface<webrtc::Vide
       mCaptureModule->DeRegisterCaptureDataCallback(this);
     else
       mCaptureModule->DeRegisterRawFrameCallback(this);
-    mCaptureModule->StopCapture();
+    mCaptureModule->StopCaptureCounted();
     if (mEncoder) {
       mEncoder->finish([this, protect = RefPtr{this}] {
         NS_DispatchToMainThread(NS_NewRunnableFunction(
@@ -343,10 +343,17 @@ nsresult nsScreencastService::StartVideoRecording(nsIScreencastServiceClient* aC
     return NS_ERROR_FAILURE;
 
   gfx::IntMargin margin;
-  auto bounds = widget->GetScreenBounds().ToUnknownRect();
+  // Screen bounds is the widget location on screen.
+  auto screenBounds = widget->GetScreenBounds().ToUnknownRect();
+  // Client bounds is the content location, in terms of parent widget.
+  // To use it, we need to translate it to screen coordinates first.
   auto clientBounds = widget->GetClientBounds().ToUnknownRect();
+  for (auto parent = widget->GetParent(); parent != nullptr; parent = parent->GetParent()) {
+    auto pb = parent->GetClientBounds().ToUnknownRect();
+    clientBounds.MoveBy(pb.X(), pb.Y());
+  }
   // Crop the image to exclude frame (if any).
-  margin = bounds - clientBounds;
+  margin = screenBounds - clientBounds;
   // Crop the image to exclude controls.
   margin.top += offsetTop;
 
diff --git a/browser_patches/firefox/patches/bootstrap.diff b/browser_patches/firefox/patches/bootstrap.diff
index 6291e775e6a7f..6f70b0342c8ec 100644
--- a/browser_patches/firefox/patches/bootstrap.diff
+++ b/browser_patches/firefox/patches/bootstrap.diff
@@ -1,5 +1,5 @@
 diff --git a/accessible/base/NotificationController.h b/accessible/base/NotificationController.h
-index 137963f1170927ae0262e0dc26ef721d496376f4..41fa27bc4a3da41814a7f326792990df3424e81f 100644
+index 1bcd464d3bd6b8465f78c62b074b0d57dbc6a082..f878ac9db2d800542dabcc2f48e8ae4727ec4b9a 100644
 --- a/accessible/base/NotificationController.h
 +++ b/accessible/base/NotificationController.h
 @@ -244,6 +244,8 @@ class NotificationController final : public EventQueue,
@@ -57,10 +57,10 @@ index 8e9bf2b413585b5a3db9370eee5d57fb6c6716ed..5a3b194b54e3813c89989f13a214c989
     * Return XPCOM wrapper for the internal accessible.
     */
 diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
-index 81d4ee91e9383693d794dbf68184a80b49b582c6..1a07e3511f73199fe0b248412d01d7b8a3744a66 100644
+index 8167d2b81c918e02ce757f7f448f22e07c29d140..3ae798880acfd8aa965ae08051f2f81855133711 100644
 --- a/browser/app/winlauncher/LauncherProcessWin.cpp
 +++ b/browser/app/winlauncher/LauncherProcessWin.cpp
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
  #include "mozilla/WinHeaderOnlyUtils.h"
  #include "nsWindowsHelpers.h"
  
@@ -68,7 +68,7 @@ index 81d4ee91e9383693d794dbf68184a80b49b582c6..1a07e3511f73199fe0b248412d01d7b8
  #include <windows.h>
  #include <processthreadsapi.h>
  
-@@ -425,8 +426,18 @@ Maybe<int> LauncherMain(int& argc, wchar_t* argv[],
+@@ -422,8 +423,18 @@ Maybe<int> LauncherMain(int& argc, wchar_t* argv[],
    HANDLE stdHandles[] = {::GetStdHandle(STD_INPUT_HANDLE),
                           ::GetStdHandle(STD_OUTPUT_HANDLE),
                           ::GetStdHandle(STD_ERROR_HANDLE)};
@@ -89,10 +89,10 @@ index 81d4ee91e9383693d794dbf68184a80b49b582c6..1a07e3511f73199fe0b248412d01d7b8
    DWORD creationFlags = CREATE_SUSPENDED | CREATE_UNICODE_ENVIRONMENT;
  
 diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
-index f6d425f36a965f03ac82dbe3ab6cde06f12751ac..d60999ab2658b1e1e5f07a8aee530451c44f2957 100644
+index a097c2c56a665204ff7b5593c7faf836366801cf..235a4e224e08c22870c6913e335f0b6020b3e7da 100644
 --- a/browser/installer/allowed-dupes.mn
 +++ b/browser/installer/allowed-dupes.mn
-@@ -73,6 +73,12 @@ browser/features/webcompat@mozilla.org/shims/empty-shim.txt
+@@ -67,6 +67,12 @@ browser/features/webcompat@mozilla.org/shims/empty-shim.txt
  removed-files
  #endif
  
@@ -102,14 +102,14 @@ index f6d425f36a965f03ac82dbe3ab6cde06f12751ac..d60999ab2658b1e1e5f07a8aee530451
 +chrome/juggler/content/server/stream-utils.js
 +chrome/marionette/content/stream-utils.js
 +
- # Bug 1496075 - Switch searchplugins to Web Extensions
- browser/chrome/browser/search-extensions/amazon/favicon.ico
- browser/chrome/browser/search-extensions/amazondotcn/favicon.ico
+ # Bug 1606928 - There's no reliable way to connect Top Sites favicons with the favicons in the Search Service
+ browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/allegro-pl.ico
+ browser/defaults/settings/main/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..a638dbe8e2f260d8be550fa8eb5bf6f6c2c31080 100644
+index 89cff6b562a82bd3a9a5d268abd4373199b31fac..e58dbf0ab0b06e84f6dac64698d11c6268091204 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -185,6 +185,9 @@
+@@ -196,6 +196,9 @@
  @RESPATH@/chrome/remote.manifest
  #endif
  
@@ -167,10 +167,10 @@ index d49c6fbf1bf83b832795fa674f6b41f223eef812..7ea3540947ff5f61b15f27fbf4b95564
    const transportProvider = {
      setListener(upgradeListener) {
 diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
-index 6e1a1b689398fa6c3c73f2f243ae02c67a4476c8..9dcf71ce753cf11f295d83eb7653e940065c8e2c 100644
+index 2425779a7767e9350ee2afc4aea111a090c7f909..393eb86bf2d9a8f778bfce560a9fb3bf528ba558 100644
 --- a/docshell/base/BrowsingContext.cpp
 +++ b/docshell/base/BrowsingContext.cpp
-@@ -106,8 +106,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
+@@ -108,8 +108,15 @@ struct ParamTraits<mozilla::dom::DisplayMode>
  
  template <>
  struct ParamTraits<mozilla::dom::PrefersColorSchemeOverride>
@@ -183,36 +183,28 @@ index 6e1a1b689398fa6c3c73f2f243ae02c67a4476c8..9dcf71ce753cf11f295d83eb7653e940
 +    : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::PrefersReducedMotionOverride> {};
 +
 +template <>
-+struct ParamTraits<mozilla::dom::ForcedColorsOverride>
-+    : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::ForcedColorsOverride> {};
++struct ParamTraits<mozilla::dom::PrefersContrastOverride>
++    : public mozilla::dom::WebIDLEnumSerializer<mozilla::dom::PrefersContrastOverride> {};
  
  template <>
- struct ParamTraits<mozilla::dom::ExplicitActiveStatus>
-@@ -2804,6 +2811,40 @@ void BrowsingContext::DidSet(FieldIndex<IDX_PrefersColorSchemeOverride>,
+ struct ParamTraits<mozilla::dom::ForcedColorsOverride>
+@@ -2891,6 +2898,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_ForcedColorsOverride>,
    PresContextAffectingFieldChanged();
  }
  
-+void BrowsingContext::DidSet(FieldIndex<IDX_PrefersReducedMotionOverride>,
-+                             dom::PrefersReducedMotionOverride aOldValue) {
++void BrowsingContext::DidSet(FieldIndex<IDX_PrefersContrastOverride>,
++                             dom::PrefersContrastOverride aOldValue) {
 +  MOZ_ASSERT(IsTop());
-+  if (PrefersReducedMotionOverride() == aOldValue) {
++  if (PrefersContrastOverride() == aOldValue) {
 +    return;
 +  }
-+  PreOrderWalk([&](BrowsingContext* aContext) {
-+    if (nsIDocShell* shell = aContext->GetDocShell()) {
-+      if (nsPresContext* pc = shell->GetPresContext()) {
-+        pc->MediaFeatureValuesChanged(
-+            {MediaFeatureChangeReason::SystemMetricsChange},
-+            MediaFeatureChangePropagation::JustThisDocument);
-+      }
-+    }
-+  });
++  PresContextAffectingFieldChanged();
 +}
 +
-+void BrowsingContext::DidSet(FieldIndex<IDX_ForcedColorsOverride>,
-+                             dom::ForcedColorsOverride aOldValue) {
++void BrowsingContext::DidSet(FieldIndex<IDX_PrefersReducedMotionOverride>,
++                             dom::PrefersReducedMotionOverride aOldValue) {
 +  MOZ_ASSERT(IsTop());
-+  if (ForcedColorsOverride() == aOldValue) {
++  if (PrefersReducedMotionOverride() == aOldValue) {
 +    return;
 +  }
 +  PreOrderWalk([&](BrowsingContext* aContext) {
@@ -230,10 +222,10 @@ index 6e1a1b689398fa6c3c73f2f243ae02c67a4476c8..9dcf71ce753cf11f295d83eb7653e940
                               nsString&& aOldValue) {
    MOZ_ASSERT(IsTop());
 diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index 5ec95a61e4d3af265cbe7dd9d83f6535da1d103e..f8acafe6d58c429af27a38363e06ad546dfbfddd 100644
+index eb183cb5c0751e43ea674f9e52441a5a82f186e0..79c5d8110faa89779dd0c16ba00620e7e65d06f5 100644
 --- a/docshell/base/BrowsingContext.h
 +++ b/docshell/base/BrowsingContext.h
-@@ -199,10 +199,10 @@ struct EmbedderColorSchemes {
+@@ -203,10 +203,10 @@ struct EmbedderColorSchemes {
    FIELD(GVInaudibleAutoplayRequestStatus, GVAutoplayRequestStatus)            \
    /* ScreenOrientation-related APIs */                                        \
    FIELD(CurrentOrientationAngle, float)                                       \
@@ -246,33 +238,51 @@ index 5ec95a61e4d3af265cbe7dd9d83f6535da1d103e..f8acafe6d58c429af27a38363e06ad54
    FIELD(EmbedderElementType, Maybe<nsString>)                                 \
    FIELD(MessageManagerGroup, nsString)                                        \
    FIELD(MaxTouchPointsOverride, uint8_t)                                      \
-@@ -240,6 +240,10 @@ struct EmbedderColorSchemes {
+@@ -246,6 +246,9 @@ struct EmbedderColorSchemes {
     * <browser> embedder element. */                                           \
    FIELD(EmbedderColorSchemes, EmbedderColorSchemes)                           \
    FIELD(DisplayMode, dom::DisplayMode)                                        \
 +  /* playwright addition */                                                   \
 +  FIELD(PrefersReducedMotionOverride, dom::PrefersReducedMotionOverride)      \
-+  /* playwright addition */                                                   \
-+  FIELD(ForcedColorsOverride, dom::ForcedColorsOverride)                      \
++  FIELD(PrefersContrastOverride, dom::PrefersContrastOverride)                \
    /* The number of entries added to the session history because of this       \
     * browsing context. */                                                     \
    FIELD(HistoryEntryCount, uint32_t)                                          \
-@@ -926,6 +930,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
-     return GetPrefersColorSchemeOverride();
+@@ -950,6 +953,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+     return GetForcedColorsOverride();
    }
  
 +  dom::PrefersReducedMotionOverride PrefersReducedMotionOverride() const {
 +    return GetPrefersReducedMotionOverride();
 +  }
 +
-+  dom::ForcedColorsOverride ForcedColorsOverride() const {
-+    return GetForcedColorsOverride();
++  dom::PrefersContrastOverride PrefersContrastOverride() const {
++    return GetPrefersContrastOverride();
 +  }
 +
    bool IsInBFCache() const;
  
    bool AllowJavascript() const { return GetAllowJavascript(); }
-@@ -1090,6 +1102,23 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1112,6 +1123,11 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+     return IsTop();
+   }
+ 
++  bool CanSet(FieldIndex<IDX_PrefersContrastOverride>,
++              dom::PrefersContrastOverride, ContentParent*) {
++    return IsTop();
++  }
++
+   bool CanSet(FieldIndex<IDX_ForcedColorsOverride>, dom::ForcedColorsOverride,
+               ContentParent*) {
+     return IsTop();
+@@ -1130,10 +1146,22 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+   void DidSet(FieldIndex<IDX_ForcedColorsOverride>,
+               dom::ForcedColorsOverride aOldValue);
+ 
++  void DidSet(FieldIndex<IDX_PrefersContrastOverride>,
++              dom::PrefersContrastOverride aOldValue);
++
+   template <typename Callback>
    void WalkPresContexts(Callback&&);
    void PresContextAffectingFieldChanged();
  
@@ -284,23 +294,24 @@ index 5ec95a61e4d3af265cbe7dd9d83f6535da1d103e..f8acafe6d58c429af27a38363e06ad54
 +  void DidSet(FieldIndex<IDX_PrefersReducedMotionOverride>,
 +              dom::PrefersReducedMotionOverride aOldValue);
 +
-+
-+  bool CanSet(FieldIndex<IDX_ForcedColorsOverride>,
-+              dom::ForcedColorsOverride, ContentParent*) {
-+    return IsTop();
-+  }
-+
-+  void DidSet(FieldIndex<IDX_ForcedColorsOverride>,
-+              dom::ForcedColorsOverride aOldValue);
 +
    void DidSet(FieldIndex<IDX_MediumOverride>, nsString&& aOldValue);
  
    bool CanSet(FieldIndex<IDX_SuspendMediaWhenInactive>, bool, ContentParent*) {
 diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
-index 84f2d2960a3fa642754e0c909f92d96865e39984..e91fc85fc7a7966d2d536839fab823ae88d1b4bd 100644
+index bef42c91d6f88922c8c101f3675325d828872aaf..8eb68c441fbef8ecbe5e90c118ccc00813564577 100644
 --- a/docshell/base/CanonicalBrowsingContext.cpp
 +++ b/docshell/base/CanonicalBrowsingContext.cpp
-@@ -1477,6 +1477,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
+@@ -324,6 +324,8 @@ void CanonicalBrowsingContext::ReplacedBy(
+   txn.SetShouldDelayMediaFromStart(GetShouldDelayMediaFromStart());
+   txn.SetForceOffline(GetForceOffline());
+   txn.SetTopInnerSizeForRFP(GetTopInnerSizeForRFP());
++  txn.SetPrefersReducedMotionOverride(GetPrefersReducedMotionOverride());
++  txn.SetForcedColorsOverride(GetForcedColorsOverride());
+ 
+   // Propagate some settings on BrowsingContext replacement so they're not lost
+   // on bfcached navigations. These are important for GeckoView (see bug
+@@ -1635,6 +1637,12 @@ void CanonicalBrowsingContext::LoadURI(nsIURI* aURI,
      return;
    }
  
@@ -314,7 +325,7 @@ index 84f2d2960a3fa642754e0c909f92d96865e39984..e91fc85fc7a7966d2d536839fab823ae
  }
  
 diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
-index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d878d33643d 100644
+index 32c537d6be90247af8d778048c6d27f3800d4b02..b72196b0694828489f8ad27c209f49f0d41c43cb 100644
 --- a/docshell/base/nsDocShell.cpp
 +++ b/docshell/base/nsDocShell.cpp
 @@ -15,6 +15,12 @@
@@ -330,23 +341,23 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
  #include "mozilla/ArrayUtils.h"
  #include "mozilla/Attributes.h"
  #include "mozilla/AutoRestore.h"
-@@ -64,6 +70,7 @@
- #include "mozilla/dom/ContentFrameMessageManager.h"
+@@ -66,6 +72,7 @@
  #include "mozilla/dom/DocGroup.h"
  #include "mozilla/dom/Element.h"
+ #include "mozilla/dom/FragmentDirective.h"
 +#include "mozilla/dom/Geolocation.h"
  #include "mozilla/dom/HTMLAnchorElement.h"
  #include "mozilla/dom/HTMLIFrameElement.h"
- #include "mozilla/dom/PerformanceNavigation.h"
-@@ -88,6 +95,7 @@
- #include "mozilla/dom/JSWindowActorChild.h"
+ #include "mozilla/dom/Navigation.h"
+@@ -94,6 +101,7 @@
  #include "mozilla/dom/DocumentBinding.h"
+ #include "mozilla/glean/DocshellMetrics.h"
  #include "mozilla/ipc/ProtocolUtils.h"
 +#include "mozilla/dom/WorkerCommon.h"
  #include "mozilla/net/DocumentChannel.h"
  #include "mozilla/net/DocumentChannelChild.h"
  #include "mozilla/net/ParentChannelWrapper.h"
-@@ -111,6 +119,7 @@
+@@ -117,6 +125,7 @@
  #include "nsIDocumentViewer.h"
  #include "mozilla/dom/Document.h"
  #include "nsHTMLDocument.h"
@@ -354,7 +365,7 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
  #include "nsIDocumentLoaderFactory.h"
  #include "nsIDOMWindow.h"
  #include "nsIEditingSession.h"
-@@ -206,6 +215,7 @@
+@@ -211,6 +220,7 @@
  #include "nsGlobalWindowInner.h"
  #include "nsGlobalWindowOuter.h"
  #include "nsJSEnvironment.h"
@@ -362,7 +373,7 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
  #include "nsNetCID.h"
  #include "nsNetUtil.h"
  #include "nsObjectLoadingContent.h"
-@@ -346,6 +356,13 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
+@@ -352,6 +362,14 @@ nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext,
        mAllowDNSPrefetch(true),
        mAllowWindowControl(true),
        mCSSErrorReportingEnabled(false),
@@ -373,10 +384,11 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
 +      mDisallowBFCache(false),
 +      mReducedMotionOverride(REDUCED_MOTION_OVERRIDE_NONE),
 +      mForcedColorsOverride(FORCED_COLORS_OVERRIDE_NO_OVERRIDE),
++      mContrastOverride(CONTRAST_OVERRIDE_NONE),
        mAllowAuth(mItemType == typeContent),
        mAllowKeywordFixup(false),
        mDisableMetaRefreshWhenInactive(false),
-@@ -3101,6 +3118,214 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
+@@ -3024,6 +3042,232 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) {
    return NS_OK;
  }
  
@@ -586,12 +598,30 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
 +  return NS_OK;
 +}
 +
++NS_IMETHODIMP
++nsDocShell::GetContrastOverride(ContrastOverride* aContrastOverride) {
++  *aContrastOverride = GetRootDocShell()->mContrastOverride;
++  return NS_OK;
++}
++
++NS_IMETHODIMP
++nsDocShell::SetContrastOverride(ContrastOverride aContrastOverride) {
++  mContrastOverride = aContrastOverride;
++  RefPtr<nsPresContext> presContext = GetPresContext();
++  if (presContext) {
++    presContext->MediaFeatureValuesChanged(
++        {MediaFeatureChangeReason::SystemMetricsChange},
++        MediaFeatureChangePropagation::JustThisDocument);
++  }
++  return NS_OK;
++}
++
 +// =============== Juggler End =======================
 +
  NS_IMETHODIMP
  nsDocShell::GetIsNavigating(bool* aOut) {
    *aOut = mIsNavigating;
-@@ -4789,7 +5014,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
+@@ -4731,7 +4975,7 @@ nsDocShell::GetVisibility(bool* aVisibility) {
  }
  
  void nsDocShell::ActivenessMaybeChanged() {
@@ -600,7 +630,7 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
    if (RefPtr<PresShell> presShell = GetPresShell()) {
      presShell->ActivenessMaybeChanged();
    }
-@@ -6711,6 +6936,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
+@@ -6658,6 +6902,10 @@ bool nsDocShell::CanSavePresentation(uint32_t aLoadType,
      return false;  // no entry to save into
    }
  
@@ -611,7 +641,7 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
    MOZ_ASSERT(!mozilla::SessionHistoryInParent(),
               "mOSHE cannot be non-null with SHIP");
    nsCOMPtr<nsIDocumentViewer> viewer = mOSHE->GetDocumentViewer();
-@@ -8443,6 +8672,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
+@@ -8399,6 +8647,12 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
                       true,  // aForceNoOpener
                       getter_AddRefs(newBC));
        MOZ_ASSERT(!newBC);
@@ -624,7 +654,7 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
        return rv;
      }
  
-@@ -9569,6 +9804,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
+@@ -9572,6 +9826,16 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
                     nsINetworkPredictor::PREDICT_LOAD, attrs, nullptr);
  
    nsCOMPtr<nsIRequest> req;
@@ -641,7 +671,7 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
    rv = DoURILoad(aLoadState, aCacheKey, getter_AddRefs(req));
  
    if (NS_SUCCEEDED(rv)) {
-@@ -12732,6 +12977,9 @@ class OnLinkClickEvent : public Runnable {
+@@ -12791,6 +13055,9 @@ class OnLinkClickEvent : public Runnable {
        mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied,
                                  mTriggeringPrincipal);
      }
@@ -651,17 +681,17 @@ index 3404597343e0d21c42c5adc2f2849888869cf75a..558f03f30672b9f0fdb68ba8d23a0d87
      return NS_OK;
    }
  
-@@ -12816,6 +13064,8 @@ nsresult nsDocShell::OnLinkClick(
-   nsCOMPtr<nsIRunnable> ev =
-       new OnLinkClickEvent(this, aContent, loadState, noOpenerImplied,
-                            aIsTrusted, aTriggeringPrincipal);
+@@ -12877,6 +13144,8 @@ nsresult nsDocShell::OnLinkClick(
+ 
+   nsCOMPtr<nsIRunnable> ev = new OnLinkClickEvent(
+       this, aContent, loadState, noOpenerImplied, aTriggeringPrincipal);
 +  nsCOMPtr<nsIObserverService> observerService = mozilla::services::GetObserverService();
 +  observerService->NotifyObservers(ToSupports(aContent), "juggler-link-click", nullptr);
    return Dispatch(ev.forget());
  }
  
 diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
-index 82ac6c9ab9dbc102a429ab0fe6cb24b8fcdf477f..f6328c25349cf39fcce973adcf908782e8721447 100644
+index f22a333733322ad17f097d7edd46af21a687906c..6bcf8ca9f9cd64dc9f5695d00e0a3e6a97978f02 100644
 --- a/docshell/base/nsDocShell.h
 +++ b/docshell/base/nsDocShell.h
 @@ -15,6 +15,7 @@
@@ -672,7 +702,7 @@ index 82ac6c9ab9dbc102a429ab0fe6cb24b8fcdf477f..f6328c25349cf39fcce973adcf908782
  #include "mozilla/dom/WindowProxyHolder.h"
  #include "nsCOMPtr.h"
  #include "nsCharsetSource.h"
-@@ -76,6 +77,7 @@ class nsCommandManager;
+@@ -77,6 +78,7 @@ class nsCommandManager;
  class nsDocShellEditorData;
  class nsDOMNavigationTiming;
  class nsDSURIContentListener;
@@ -680,7 +710,7 @@ index 82ac6c9ab9dbc102a429ab0fe6cb24b8fcdf477f..f6328c25349cf39fcce973adcf908782
  class nsGlobalWindowOuter;
  
  class FramingChecker;
-@@ -401,6 +403,15 @@ class nsDocShell final : public nsDocLoader,
+@@ -403,6 +405,15 @@ class nsDocShell final : public nsDocLoader,
    void SetWillChangeProcess() { mWillChangeProcess = true; }
    bool WillChangeProcess() { return mWillChangeProcess; }
  
@@ -696,7 +726,7 @@ index 82ac6c9ab9dbc102a429ab0fe6cb24b8fcdf477f..f6328c25349cf39fcce973adcf908782
    // Create a content viewer within this nsDocShell for the given
    // `WindowGlobalChild` actor.
    nsresult CreateDocumentViewerForActor(
-@@ -1004,6 +1015,8 @@ class nsDocShell final : public nsDocLoader,
+@@ -1006,6 +1017,8 @@ class nsDocShell final : public nsDocLoader,
  
    bool CSSErrorReportingEnabled() const { return mCSSErrorReportingEnabled; }
  
@@ -705,7 +735,7 @@ index 82ac6c9ab9dbc102a429ab0fe6cb24b8fcdf477f..f6328c25349cf39fcce973adcf908782
    // Handles retrieval of subframe session history for nsDocShell::LoadURI. If a
    // load is requested in a subframe of the current DocShell, the subframe
    // loadType may need to reflect the loadType of the parent document, or in
-@@ -1295,6 +1308,16 @@ class nsDocShell final : public nsDocLoader,
+@@ -1285,6 +1298,17 @@ class nsDocShell final : public nsDocLoader,
    bool mAllowDNSPrefetch : 1;
    bool mAllowWindowControl : 1;
    bool mCSSErrorReportingEnabled : 1;
@@ -718,12 +748,13 @@ index 82ac6c9ab9dbc102a429ab0fe6cb24b8fcdf477f..f6328c25349cf39fcce973adcf908782
 +  RefPtr<nsGeolocationService> mGeolocationServiceOverride;
 +  ReducedMotionOverride mReducedMotionOverride;
 +  ForcedColorsOverride mForcedColorsOverride;
++  ContrastOverride mContrastOverride;
 +
    bool mAllowAuth : 1;
    bool mAllowKeywordFixup : 1;
    bool mDisableMetaRefreshWhenInactive : 1;
 diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
-index 21f09a517e91644f81f5bb823f556c15cd06e51f..a68d30e0a60f03a0942ac1cd8a1f83804fdfd3e0 100644
+index 84e821e33e8164829dfee4f05340784e189b90ee..aa690eb747cb73bc6bff40a62546037c2e64c485 100644
 --- a/docshell/base/nsIDocShell.idl
 +++ b/docshell/base/nsIDocShell.idl
 @@ -44,6 +44,7 @@ interface nsIURI;
@@ -734,7 +765,7 @@ index 21f09a517e91644f81f5bb823f556c15cd06e51f..a68d30e0a60f03a0942ac1cd8a1f8380
  interface nsIEditor;
  interface nsIEditingSession;
  interface nsIInputStream;
-@@ -754,6 +755,36 @@ interface nsIDocShell : nsIDocShellTreeItem
+@@ -719,6 +720,45 @@ interface nsIDocShell : nsIDocShellTreeItem
     */
    void synchronizeLayoutHistoryState();
  
@@ -766,16 +797,25 @@ index 21f09a517e91644f81f5bb823f556c15cd06e51f..a68d30e0a60f03a0942ac1cd8a1f8380
 +  };
 +  [infallible] attribute nsIDocShell_ForcedColorsOverride forcedColorsOverride;
 +
++  cenum ContrastOverride : 8 {
++    CONTRAST_OVERRIDE_LESS,
++    CONTRAST_OVERRIDE_MORE,
++    CONTRAST_OVERRIDE_CUSTOM,
++    CONTRAST_OVERRIDE_NO_PREFERENCE,
++    CONTRAST_OVERRIDE_NONE, /* This clears the override. */
++  };
++  [infallible] attribute nsIDocShell_ContrastOverride contrastOverride;
++
 +  void setGeolocationOverride(in nsIDOMGeoPosition position);
 +
    /**
     * This attempts to save any applicable layout history state (like
     * scroll position) in the nsISHEntry. This is normally done
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 4e9286a91e3b0f1114aa0a7aa6ff81dde615a73d..941a0c3dac71008ca760024a1e828f75f6af5182 100644
+index fd2d0be5f7755e64fc134515ea138c4ed0d28daf..ae48159ddbfb98d03e538d077a33260c639a74ac 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -3676,6 +3676,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
+@@ -3752,6 +3752,9 @@ void Document::SendToConsole(nsCOMArray<nsISecurityConsoleMessage>& aMessages) {
  }
  
  void Document::ApplySettingsFromCSP(bool aSpeculative) {
@@ -785,7 +825,7 @@ index 4e9286a91e3b0f1114aa0a7aa6ff81dde615a73d..941a0c3dac71008ca760024a1e828f75
    nsresult rv = NS_OK;
    if (!aSpeculative) {
      // 1) apply settings from regular CSP
-@@ -3733,6 +3736,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
+@@ -3809,6 +3812,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) {
    MOZ_ASSERT(!mScriptGlobalObject,
               "CSP must be initialized before mScriptGlobalObject is set!");
  
@@ -797,7 +837,7 @@ index 4e9286a91e3b0f1114aa0a7aa6ff81dde615a73d..941a0c3dac71008ca760024a1e828f75
    // If this is a data document - no need to set CSP.
    if (mLoadedAsData) {
      return NS_OK;
-@@ -4500,6 +4508,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
+@@ -4617,6 +4625,10 @@ bool Document::HasFocus(ErrorResult& rv) const {
      return false;
    }
  
@@ -808,7 +848,7 @@ index 4e9286a91e3b0f1114aa0a7aa6ff81dde615a73d..941a0c3dac71008ca760024a1e828f75
    if (!fm->IsInActiveWindow(bc)) {
      return false;
    }
-@@ -18849,6 +18861,66 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
+@@ -19688,6 +19700,35 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
    return PreferenceSheet::PrefsFor(*this).mColorScheme;
  }
  
@@ -840,60 +880,28 @@ index 4e9286a91e3b0f1114aa0a7aa6ff81dde615a73d..941a0c3dac71008ca760024a1e828f75
 +
 +  return LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0) == 1;
 +}
-+
-+bool Document::ForcedColors() const {
-+  auto* docShell = static_cast<nsDocShell*>(GetDocShell());
-+  nsIDocShell::ForcedColorsOverride forcedColors;
-+  if (docShell && docShell->GetForcedColorsOverride(&forcedColors) == NS_OK) {
-+    switch (forcedColors) {
-+      case nsIDocShell::FORCED_COLORS_OVERRIDE_ACTIVE:
-+        return true;
-+      case nsIDocShell::FORCED_COLORS_OVERRIDE_NONE:
-+        return false;
-+      case nsIDocShell::FORCED_COLORS_OVERRIDE_NO_OVERRIDE:
-+        break;
-+    };
-+  }
-+
-+  if (auto* bc = GetBrowsingContext()) {
-+    switch (bc->Top()->ForcedColorsOverride()) {
-+      case dom::ForcedColorsOverride::Active:
-+        return true;
-+      case dom::ForcedColorsOverride::None:
-+        return false;
-+      case dom::ForcedColorsOverride::No_override:
-+        break;
-+    }
-+  }
-+
-+  if (mIsBeingUsedAsImage) {
-+    return false;
-+  }
-+  return !PreferenceSheet::PrefsFor(*this).mUseDocumentColors;
-+}
 +
  bool Document::HasRecentlyStartedForegroundLoads() {
    if (!sLoadingForegroundTopLevelContentDocument) {
      return false;
 diff --git a/dom/base/Document.h b/dom/base/Document.h
-index a52c61addffc4a2344fa06cb0bceebe6a7ca9075..b0f8d65e5341bf277e48bef3b88cb4cc384fbc49 100644
+index 622f54e369d324a4cc2800dd4b331bd628339bed..2ef6ed20cf35febeff75b22dfa5bb2fbb4e295fe 100644
 --- a/dom/base/Document.h
 +++ b/dom/base/Document.h
-@@ -4044,6 +4044,9 @@ class Document : public nsINode,
+@@ -4140,6 +4140,8 @@ class Document : public nsINode,
    // color-scheme meta tag.
    ColorScheme DefaultColorScheme() const;
  
 +  bool PrefersReducedMotion() const;
-+  bool ForcedColors() const;
 +
    static bool HasRecentlyStartedForegroundLoads();
  
    static bool AutomaticStorageAccessPermissionCanBeGranted(
 diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
-index 14a00b8ed85f69312a89990acbb5e0f9755bd832..4b07c28615920a95a2ba59247f8575515cac4235 100644
+index a13cae5b990fb2f750e62f5117ad63aa981d787f..bc0f2d674aadd8eba867f56e873595a8885d1798 100644
 --- a/dom/base/Navigator.cpp
 +++ b/dom/base/Navigator.cpp
-@@ -338,14 +338,18 @@ void Navigator::GetAppName(nsAString& aAppName) const {
+@@ -344,14 +344,18 @@ void Navigator::GetAppName(nsAString& aAppName) const {
   * for more detail.
   */
  /* static */
@@ -914,7 +922,7 @@ index 14a00b8ed85f69312a89990acbb5e0f9755bd832..4b07c28615920a95a2ba59247f857551
  
    // Split values on commas.
    for (nsDependentSubstring lang :
-@@ -397,7 +401,13 @@ void Navigator::GetLanguage(nsAString& aLanguage) {
+@@ -403,7 +407,13 @@ void Navigator::GetLanguage(nsAString& aLanguage) {
  }
  
  void Navigator::GetLanguages(nsTArray<nsString>& aLanguages) {
@@ -929,11 +937,21 @@ index 14a00b8ed85f69312a89990acbb5e0f9755bd832..4b07c28615920a95a2ba59247f857551
  
    // The returned value is cached by the binding code. The window listens to the
    // accept languages change and will clear the cache when needed. It has to
+@@ -2298,7 +2308,8 @@ bool Navigator::Webdriver() {
+   }
+ #endif
+ 
+-  return false;
++  // Playwright is automating the browser, so we should pretend to be a webdriver
++  return true;
+ }
+ 
+ AutoplayPolicy Navigator::GetAutoplayPolicy(AutoplayPolicyMediaType aType) {
 diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
-index e559dc4d6aef61b7012a27f3d6c3186a12a15319..9798a50789ce972c4d9e94419e20a5cde4cd552a 100644
+index 6abf6cef230c97815f17f6b7abf9f1b1de274a6f..46ead1f32e0d710b5b32e61dff72a4f772d5421e 100644
 --- a/dom/base/Navigator.h
 +++ b/dom/base/Navigator.h
-@@ -215,7 +215,7 @@ class Navigator final : public nsISupports, public nsWrapperCache {
+@@ -218,7 +218,7 @@ class Navigator final : public nsISupports, public nsWrapperCache {
  
    StorageManager* Storage();
  
@@ -943,94 +961,95 @@ index e559dc4d6aef61b7012a27f3d6c3186a12a15319..9798a50789ce972c4d9e94419e20a5cd
    dom::MediaCapabilities* MediaCapabilities();
    dom::MediaSession* MediaSession();
 diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
-index c6f1687f73df6b1849a191ff8722dc9fc26fc3eb..9fdface27d5c9bd0c61b8af229a31be2356c46b5 100644
+index f362a444a0f5ed247582646754dffd54d0b4540a..bbd72dab7ff4fbac8c247961e530764cb5c68d11 100644
 --- a/dom/base/nsContentUtils.cpp
 +++ b/dom/base/nsContentUtils.cpp
-@@ -8711,7 +8711,8 @@ nsresult nsContentUtils::SendMouseEvent(
-     bool aIgnoreRootScrollFrame, float aPressure,
-     unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow,
-     PreventDefaultResult* aPreventDefault, bool aIsDOMEventSynthesized,
+@@ -9151,11 +9151,13 @@ nsresult nsContentUtils::SendMouseEvent(
+     int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
+     float aPressure, unsigned short aInputSourceArg, uint32_t aIdentifier,
+     bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
 -    bool aIsWidgetEventSynthesized) {
 +    bool aIsWidgetEventSynthesized,
 +    bool convertToPointer, uint32_t aJugglerEventId) {
-   nsPoint offset;
-   nsCOMPtr<nsIWidget> widget = GetWidget(aPresShell, &offset);
-   if (!widget) return NS_ERROR_FAILURE;
-@@ -8719,6 +8720,7 @@ nsresult nsContentUtils::SendMouseEvent(
+   MOZ_ASSERT(aWidget);
    EventMessage msg;
    Maybe<WidgetMouseEvent::ExitFrom> exitFrom;
    bool contextMenuKey = false;
-+  bool isDragEvent = false;
++  bool isPWDragEventMessage = false;
    if (aType.EqualsLiteral("mousedown")) {
      msg = eMouseDown;
    } else if (aType.EqualsLiteral("mouseup")) {
-@@ -8743,6 +8745,12 @@ nsresult nsContentUtils::SendMouseEvent(
+@@ -9181,6 +9183,12 @@ nsresult nsContentUtils::SendMouseEvent(
      msg = eMouseHitTest;
    } else if (aType.EqualsLiteral("MozMouseExploreByTouch")) {
      msg = eMouseExploreByTouch;
 +  } else if (aType.EqualsLiteral("dragover")) {
 +    msg = eDragOver;
-+    isDragEvent = true;
++    isPWDragEventMessage = true;
 +  } else if (aType.EqualsLiteral("drop")) {
 +    msg = eDrop;
-+    isDragEvent = true;
++    isPWDragEventMessage = true;
    } else {
      return NS_ERROR_FAILURE;
    }
-@@ -8751,12 +8759,21 @@ nsresult nsContentUtils::SendMouseEvent(
-     aInputSourceArg = MouseEvent_Binding::MOZ_SOURCE_MOUSE;
-   }
+@@ -9191,7 +9199,14 @@ nsresult nsContentUtils::SendMouseEvent(
  
--  WidgetMouseEvent event(true, msg, widget,
-+  std::unique_ptr<WidgetMouseEvent> eventOwner;
-+  if (isDragEvent) {
-+    eventOwner.reset(new WidgetDragEvent(true, msg, widget));
-+    eventOwner->mReason = aIsWidgetEventSynthesized
+   Maybe<WidgetPointerEvent> pointerEvent;
+   Maybe<WidgetMouseEvent> mouseEvent;
+-  if (IsPointerEventMessage(msg)) {
++  Maybe<WidgetDragEvent> pwDragEvent;
++
++  if (isPWDragEventMessage) {
++    pwDragEvent.emplace(true, msg, aWidget);
++    pwDragEvent->mReason = aIsWidgetEventSynthesized
 +                             ? WidgetMouseEvent::eSynthesized
 +                             : WidgetMouseEvent::eReal;
-+  } else {
-+    eventOwner.reset(new WidgetMouseEvent(true, msg, widget,
-                          aIsWidgetEventSynthesized
-                              ? WidgetMouseEvent::eSynthesized
-                              : WidgetMouseEvent::eReal,
-                          contextMenuKey ? WidgetMouseEvent::eContextMenuKey
--                                        : WidgetMouseEvent::eNormal);
-+                                        : WidgetMouseEvent::eNormal));
-+  }
-+  WidgetMouseEvent& event = *eventOwner.get();
-   event.pointerId = aIdentifier;
-   event.mModifiers = GetWidgetModifiers(aModifiers);
-   event.mButton = aButton;
-@@ -8767,8 +8784,10 @@ nsresult nsContentUtils::SendMouseEvent(
-   event.mPressure = aPressure;
-   event.mInputSource = aInputSourceArg;
-   event.mClickCount = aClickCount;
-+  event.mJugglerEventId = aJugglerEventId;
-   event.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized;
-   event.mExitFrom = exitFrom;
-+  event.convertToPointer = convertToPointer;
++  } else if (IsPointerEventMessage(msg)) {
+     MOZ_ASSERT(!aIsWidgetEventSynthesized,
+                "The event shouldn't be dispatched as a synthesized event");
+     if (MOZ_UNLIKELY(aIsWidgetEventSynthesized)) {
+@@ -9210,8 +9225,11 @@ nsresult nsContentUtils::SendMouseEvent(
+                        contextMenuKey ? WidgetMouseEvent::eContextMenuKey
+                                       : WidgetMouseEvent::eNormal);
+   }
++
+   WidgetMouseEvent& mouseOrPointerEvent =
++      pwDragEvent.isSome() ? pwDragEvent.ref() :
+       pointerEvent.isSome() ? pointerEvent.ref() : mouseEvent.ref();
++
+   mouseOrPointerEvent.pointerId = aIdentifier;
+   mouseOrPointerEvent.mModifiers = GetWidgetModifiers(aModifiers);
+   mouseOrPointerEvent.mButton = aButton;
+@@ -9224,6 +9242,8 @@ nsresult nsContentUtils::SendMouseEvent(
+   mouseOrPointerEvent.mClickCount = aClickCount;
+   mouseOrPointerEvent.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized;
+   mouseOrPointerEvent.mExitFrom = exitFrom;
++  mouseOrPointerEvent.mJugglerEventId = aJugglerEventId;
++  mouseOrPointerEvent.convertToPointer = convertToPointer;
  
    nsPresContext* presContext = aPresShell->GetPresContext();
    if (!presContext) return NS_ERROR_FAILURE;
 diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
-index 338fc097dede02a538f240ba4cc66307086c7f56..8345e47237bc40490bd17019a053cce4c3d74a91 100644
+index 779cd9e544bfb2d135f12c3558c0ca8164b37029..041eba4bcbf40f51fc40ce7609ea81408e6a788d 100644
 --- a/dom/base/nsContentUtils.h
 +++ b/dom/base/nsContentUtils.h
-@@ -3055,7 +3055,8 @@ class nsContentUtils {
+@@ -3015,8 +3015,9 @@ class nsContentUtils {
+       int32_t aButton, int32_t aButtons, int32_t aClickCount,
        int32_t aModifiers, bool aIgnoreRootScrollFrame, float aPressure,
        unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow,
-       mozilla::PreventDefaultResult* aPreventDefault,
--      bool aIsDOMEventSynthesized, bool aIsWidgetEventSynthesized);
+-      bool* aPreventDefault, bool aIsDOMEventSynthesized,
+-      bool aIsWidgetEventSynthesized);
++      bool* aPreventDefault,
 +      bool aIsDOMEventSynthesized, bool aIsWidgetEventSynthesized,
 +      bool convertToPointer = true, uint32_t aJugglerEventId = 0);
  
    static void FirePageShowEventForFrameLoaderSwap(
        nsIDocShellTreeItem* aItem,
 diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
-index 9bc8340b9009717e0feecd5c14ff02be07a03daf..70ea04c7f11e6ccfadf72a82ec1741fac10ef5fd 100644
+index 15fe1db8a28ed2592b61aaf2006ddaa656f12389..2642c18bebcdfdd467be557171ba4ee204fcabde 100644
 --- a/dom/base/nsDOMWindowUtils.cpp
 +++ b/dom/base/nsDOMWindowUtils.cpp
-@@ -685,6 +685,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
+@@ -710,6 +710,26 @@ nsDOMWindowUtils::GetPresShellId(uint32_t* aPresShellId) {
    return NS_ERROR_FAILURE;
  }
  
@@ -1057,7 +1076,7 @@ index 9bc8340b9009717e0feecd5c14ff02be07a03daf..70ea04c7f11e6ccfadf72a82ec1741fa
  NS_IMETHODIMP
  nsDOMWindowUtils::SendMouseEvent(
      const nsAString& aType, float aX, float aY, int32_t aButton,
-@@ -699,7 +719,7 @@ nsDOMWindowUtils::SendMouseEvent(
+@@ -724,7 +744,7 @@ nsDOMWindowUtils::SendMouseEvent(
        aOptionalArgCount >= 7 ? aIdentifier : DEFAULT_MOUSE_POINTER_ID, false,
        aPreventDefault, aOptionalArgCount >= 4 ? aIsDOMEventSynthesized : true,
        aOptionalArgCount >= 5 ? aIsWidgetEventSynthesized : false,
@@ -1066,7 +1085,7 @@ index 9bc8340b9009717e0feecd5c14ff02be07a03daf..70ea04c7f11e6ccfadf72a82ec1741fa
  }
  
  NS_IMETHODIMP
-@@ -717,7 +737,7 @@ nsDOMWindowUtils::SendMouseEventToWindow(
+@@ -742,7 +762,7 @@ nsDOMWindowUtils::SendMouseEventToWindow(
        aOptionalArgCount >= 7 ? aIdentifier : DEFAULT_MOUSE_POINTER_ID, true,
        nullptr, aOptionalArgCount >= 4 ? aIsDOMEventSynthesized : true,
        aOptionalArgCount >= 5 ? aIsWidgetEventSynthesized : false,
@@ -1075,27 +1094,29 @@ index 9bc8340b9009717e0feecd5c14ff02be07a03daf..70ea04c7f11e6ccfadf72a82ec1741fa
  }
  
  NS_IMETHODIMP
-@@ -726,13 +746,13 @@ nsDOMWindowUtils::SendMouseEventCommon(
+@@ -751,7 +771,7 @@ nsDOMWindowUtils::SendMouseEventCommon(
      int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
      float aPressure, unsigned short aInputSourceArg, uint32_t aPointerId,
      bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
 -    bool aIsWidgetEventSynthesized, int32_t aButtons) {
 +    bool aIsWidgetEventSynthesized, int32_t aButtons, bool aConvertToPointer, uint32_t aJugglerEventId) {
    RefPtr<PresShell> presShell = GetPresShell();
-   PreventDefaultResult preventDefaultResult;
-   nsresult rv = nsContentUtils::SendMouseEvent(
-       presShell, aType, aX, aY, aButton, aButtons, aClickCount, aModifiers,
-       aIgnoreRootScrollFrame, aPressure, aInputSourceArg, aPointerId, aToWindow,
--      &preventDefaultResult, aIsDOMEventSynthesized, aIsWidgetEventSynthesized);
-+      &preventDefaultResult, aIsDOMEventSynthesized, aIsWidgetEventSynthesized, aConvertToPointer, aJugglerEventId);
- 
-   if (aPreventDefault) {
-     *aPreventDefault = preventDefaultResult != PreventDefaultResult::No;
+   if (!presShell) {
+     return NS_ERROR_FAILURE;
+@@ -768,7 +788,7 @@ nsDOMWindowUtils::SendMouseEventCommon(
+       presShell, widget, aType, refPoint, aButton, aButtons, aClickCount,
+       aModifiers, aIgnoreRootScrollFrame, aPressure, aInputSourceArg,
+       aPointerId, aToWindow, aPreventDefault, aIsDOMEventSynthesized,
+-      aIsWidgetEventSynthesized);
++      aIsWidgetEventSynthesized, aConvertToPointer, aJugglerEventId);
+ }
+ 
+ NS_IMETHODIMP
 diff --git a/dom/base/nsDOMWindowUtils.h b/dom/base/nsDOMWindowUtils.h
-index 63968c9b7a4e418e4c0de6e7a75fa215a36a9105..decf3ea3833ccdffd49a7aded2d600f9416e8306 100644
+index a8a48d28fc4ef612f8234bc2490a41672f1704f5..f702b0c9a0783ec547a41bbefd68e18a27a239fe 100644
 --- a/dom/base/nsDOMWindowUtils.h
 +++ b/dom/base/nsDOMWindowUtils.h
-@@ -93,7 +93,7 @@ class nsDOMWindowUtils final : public nsIDOMWindowUtils,
+@@ -94,7 +94,7 @@ class nsDOMWindowUtils final : public nsIDOMWindowUtils,
        int32_t aClickCount, int32_t aModifiers, bool aIgnoreRootScrollFrame,
        float aPressure, unsigned short aInputSourceArg, uint32_t aIdentifier,
        bool aToWindow, bool* aPreventDefault, bool aIsDOMEventSynthesized,
@@ -1105,10 +1126,10 @@ index 63968c9b7a4e418e4c0de6e7a75fa215a36a9105..decf3ea3833ccdffd49a7aded2d600f9
    MOZ_CAN_RUN_SCRIPT
    nsresult SendTouchEventCommon(
 diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
-index 5a4cf78d65eee0adcbeca33787706113eca19de7..7c8016e422ccc9e86563eaa83c9acc1dad0e5967 100644
+index 555a08b4b3fcd0d0c7986014d2e3516c6e5991c0..74a39e000b0e68042f1f51f6fafbc39ac9b42e51 100644
 --- a/dom/base/nsFocusManager.cpp
 +++ b/dom/base/nsFocusManager.cpp
-@@ -1675,6 +1675,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
+@@ -1720,6 +1720,10 @@ Maybe<uint64_t> nsFocusManager::SetFocusInner(Element* aNewContent,
          (GetActiveBrowsingContext() == newRootBrowsingContext);
    }
  
@@ -1119,7 +1140,7 @@ index 5a4cf78d65eee0adcbeca33787706113eca19de7..7c8016e422ccc9e86563eaa83c9acc1d
    // Exit fullscreen if a website focuses another window
    if (StaticPrefs::full_screen_api_exit_on_windowRaise() &&
        !isElementInActiveWindow && (aFlags & FLAG_RAISE)) {
-@@ -2242,6 +2246,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2306,6 +2310,7 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
                                bool aIsLeavingDocument, bool aAdjustWidget,
                                bool aRemainActive, Element* aElementToFocus,
                                uint64_t aActionId) {
@@ -1127,7 +1148,7 @@ index 5a4cf78d65eee0adcbeca33787706113eca19de7..7c8016e422ccc9e86563eaa83c9acc1d
    LOGFOCUS(("<<Blur begin actionid: %" PRIu64 ">>", aActionId));
  
    // hold a reference to the focused content, which may be null
-@@ -2288,6 +2293,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
+@@ -2352,6 +2357,11 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
      return true;
    }
  
@@ -1139,7 +1160,7 @@ index 5a4cf78d65eee0adcbeca33787706113eca19de7..7c8016e422ccc9e86563eaa83c9acc1d
    // Keep a ref to presShell since dispatching the DOM event may cause
    // the document to be destroyed.
    RefPtr<PresShell> presShell = docShell->GetPresShell();
-@@ -2947,7 +2957,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
+@@ -3066,7 +3076,9 @@ void nsFocusManager::RaiseWindow(nsPIDOMWindowOuter* aWindow,
      }
    }
  
@@ -1151,10 +1172,10 @@ index 5a4cf78d65eee0adcbeca33787706113eca19de7..7c8016e422ccc9e86563eaa83c9acc1d
      // care of lowering the present active window. This happens in
      // a separate runnable to avoid touching multiple windows in
 diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
-index e28dcdb092b23558702377af32eece5d273d4cf3..a37ae9d6ccd978d5e84562450e7039d6a75d517b 100644
+index 99a5049a3aff2efb208895d60622fd9c8d7f337a..9a9b039a46f1294a8b4af0613fb4f4173ac6a8a0 100644
 --- a/dom/base/nsGlobalWindowOuter.cpp
 +++ b/dom/base/nsGlobalWindowOuter.cpp
-@@ -2509,10 +2509,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
+@@ -2512,10 +2512,16 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument,
      }();
  
      if (!isContentAboutBlankInChromeDocshell) {
@@ -1175,7 +1196,7 @@ index e28dcdb092b23558702377af32eece5d273d4cf3..a37ae9d6ccd978d5e84562450e7039d6
      }
    }
  
-@@ -2632,6 +2638,19 @@ void nsGlobalWindowOuter::DispatchDOMWindowCreated() {
+@@ -2635,6 +2641,19 @@ void nsGlobalWindowOuter::DispatchDOMWindowCreated() {
    }
  }
  
@@ -1196,10 +1217,10 @@ index e28dcdb092b23558702377af32eece5d273d4cf3..a37ae9d6ccd978d5e84562450e7039d6
  
  void nsGlobalWindowOuter::SetDocShell(nsDocShell* aDocShell) {
 diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h
-index 8337a7353fb8e97372f0b57bd0fd867506a9129f..e7dedd6d26125e481e1145337a0be6ab864c1e1b 100644
+index 0453a18ec10c1434d1692f10b1b4acee754e6b7e..ee7bad691515bb51f6b4345e88944b02ad173180 100644
 --- a/dom/base/nsGlobalWindowOuter.h
 +++ b/dom/base/nsGlobalWindowOuter.h
-@@ -315,6 +315,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
+@@ -320,6 +320,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
  
    // Outer windows only.
    void DispatchDOMWindowCreated();
@@ -1208,10 +1229,10 @@ index 8337a7353fb8e97372f0b57bd0fd867506a9129f..e7dedd6d26125e481e1145337a0be6ab
    // Outer windows only.
    virtual void EnsureSizeAndPositionUpToDate() override;
 diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
-index d5455e559639aee9328905b50f02c52e94db950b..3fbd1e0459e5391066fc6b3a4e30a841594b31bf 100644
+index 8e2bbed21c13f23745e2eaad4ded831106ebd930..a17b0c7b9730737f178c05703b08d0f5f6d9ecd1 100644
 --- a/dom/base/nsINode.cpp
 +++ b/dom/base/nsINode.cpp
-@@ -1365,6 +1365,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
+@@ -1449,6 +1449,61 @@ void nsINode::GetBoxQuadsFromWindowOrigin(const BoxQuadOptions& aOptions,
    mozilla::GetBoxQuadsFromWindowOrigin(this, aOptions, aResult, aRv);
  }
  
@@ -1274,10 +1295,10 @@ index d5455e559639aee9328905b50f02c52e94db950b..3fbd1e0459e5391066fc6b3a4e30a841
      DOMQuad& aQuad, const GeometryNode& aFrom,
      const ConvertCoordinateOptions& aOptions, CallerType aCallerType,
 diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h
-index 3a47992cc89176fe9500f7b1d5b74e4422cb9625..27e6da8498af5e4a3c37407a3a8ab592e28dc372 100644
+index eb75f281630f8ca1b901686207c9fc97336d675f..e607f0ae454d52fc2bfe19046b492352a84b4ebd 100644
 --- a/dom/base/nsINode.h
 +++ b/dom/base/nsINode.h
-@@ -2248,6 +2248,10 @@ class nsINode : public mozilla::dom::EventTarget {
+@@ -2397,6 +2397,10 @@ class nsINode : public mozilla::dom::EventTarget {
                                     nsTArray<RefPtr<DOMQuad>>& aResult,
                                     ErrorResult& aRv);
  
@@ -1289,10 +1310,10 @@ index 3a47992cc89176fe9500f7b1d5b74e4422cb9625..27e6da8498af5e4a3c37407a3a8ab592
        DOMQuad& aQuad, const TextOrElementOrDocument& aFrom,
        const ConvertCoordinateOptions& aOptions, CallerType aCallerType,
 diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
-index cf8037cd580013efe5eb578c43f45c0d21946c6a..583460796fdef633e8075013597f7c315ce4ab06 100644
+index bf7eb34da03c0958de688deecb53b407d430f645..a2ec3b1b7e86f72bee38d890c0834abfe4be8637 100644
 --- a/dom/base/nsJSUtils.cpp
 +++ b/dom/base/nsJSUtils.cpp
-@@ -177,6 +177,11 @@ bool nsJSUtils::GetScopeChainForElement(
+@@ -149,6 +149,11 @@ bool nsJSUtils::GetEnvironmentChainForElement(JSContext* aCx, Element* aElement,
    return true;
  }
  
@@ -1305,23 +1326,23 @@ index cf8037cd580013efe5eb578c43f45c0d21946c6a..583460796fdef633e8075013597f7c31
  void nsJSUtils::ResetTimeZone() { JS::ResetTimeZone(); }
  
 diff --git a/dom/base/nsJSUtils.h b/dom/base/nsJSUtils.h
-index cceb725d393d5e5f83c8f87491089c3fa1d57cc3..e906a7fb7c3fd72554613f640dcc272e6984d929 100644
+index f32e21752d5013bf143eb45391ab9218debab08e..83763d2354dade2f8d2b7930ba18ae91c55133ad 100644
 --- a/dom/base/nsJSUtils.h
 +++ b/dom/base/nsJSUtils.h
-@@ -79,6 +79,7 @@ class nsJSUtils {
-       JSContext* aCx, mozilla::dom::Element* aElement,
-       JS::MutableHandleVector<JSObject*> aScopeChain);
+@@ -75,6 +75,7 @@ class nsJSUtils {
+                                             mozilla::dom::Element* aElement,
+                                             JS::EnvironmentChain& aEnvChain);
  
 +  static bool SetTimeZoneOverride(const char* timezoneId);
    static void ResetTimeZone();
  
    static bool DumpEnabled();
 diff --git a/dom/chrome-webidl/BrowsingContext.webidl b/dom/chrome-webidl/BrowsingContext.webidl
-index d70f3e18cc8e8f749e5057297161206129871453..2f2be2a6539203d1957bfe580a06ab70a512c053 100644
+index 6ec88536141126c97c9b599e3237bb5670d42ce8..41c6cc56738bdaf711adf2cf5b00c7fad5d71ba8 100644
 --- a/dom/chrome-webidl/BrowsingContext.webidl
 +++ b/dom/chrome-webidl/BrowsingContext.webidl
-@@ -53,6 +53,24 @@ enum PrefersColorSchemeOverride {
-   "dark",
+@@ -61,6 +61,26 @@ enum ForcedColorsOverride {
+   "active",
  };
  
 +/**
@@ -1334,35 +1355,73 @@ index d70f3e18cc8e8f749e5057297161206129871453..2f2be2a6539203d1957bfe580a06ab70
 +};
 +
 +/**
-+ * CSS forced-colors values.
++ * CSS prefers-contrast values.
 + */
-+enum ForcedColorsOverride {
++enum PrefersContrastOverride {
 +  "none",
-+  "active",
-+  "no-override",  /* This clears the override. */
++  "no-preference",
++  "more",
++  "less",
++  "custom",
 +};
 +
  /**
   * Allowed overrides of platform/pref default behaviour for touch events.
   */
-@@ -209,6 +227,12 @@ interface BrowsingContext {
-   // Color-scheme simulation, for DevTools.
-   [SetterThrows] attribute PrefersColorSchemeOverride prefersColorSchemeOverride;
+@@ -220,6 +240,12 @@ interface BrowsingContext {
+   // Forced-colors simulation, for DevTools
+   [SetterThrows] attribute ForcedColorsOverride forcedColorsOverride;
  
 +  // Reduced-Motion simulation, for DevTools.
 +  [SetterThrows] attribute PrefersReducedMotionOverride prefersReducedMotionOverride;
 +
-+  // Forced-Colors simulation, for DevTools.
-+  [SetterThrows] attribute ForcedColorsOverride forcedColorsOverride;
++  // Contrast simulation, for DevTools.
++  [SetterThrows] attribute PrefersContrastOverride prefersContrastOverride;
 +
    /**
     * A unique identifier for the browser element that is hosting this
     * BrowsingContext tree. Every BrowsingContext in the element's tree will
+diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
+index 0bd219694282347309680fc9b53b945e1fd0ad92..c5c2e2d32a380ec72379b05a8b84f187431f7309 100644
+--- a/dom/fetch/Fetch.cpp
++++ b/dom/fetch/Fetch.cpp
+@@ -701,6 +701,12 @@ already_AddRefed<Promise> FetchRequest(nsIGlobalObject* aGlobal,
+     ipcArgs.hasCSPEventListener() = false;
+     ipcArgs.isWorkerRequest() = false;
+ 
++    /* --> Playwright: associate keep-alive fetch with the window */
++    BrowsingContext* bc = window ? window->GetBrowsingContext() : nullptr;
++    if (bc)
++      ipcArgs.associatedBrowsingContextID() = bc->Id();
++    /* <-- Playwright */
++
+     actor->DoFetchOp(ipcArgs);
+ 
+     mozilla::glean::networking::fetch_keepalive_request_count.Get("main"_ns)
+diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp
+index b5e60bbd27fbb2f033d233e9ae2ebc728f442512..0adc568ece34d2c0f35eeacd81e2db9125b7c327 100644
+--- a/dom/fetch/FetchService.cpp
++++ b/dom/fetch/FetchService.cpp
+@@ -268,6 +268,14 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
+       false  // IsTrackingFetch
+   );
+ 
++  /* --> Playwright: associate keep-alive fetch with the window */
++  if (mArgsType == FetchArgsType::MainThreadFetch) {
++    auto& args = mArgs.as<MainThreadFetchArgs>();
++    mFetchDriver->SetAssociatedBrowsingContextID(
++        args.mAssociatedBrowsingContextID);
++  }
++  /* <-- Playwright */
++
+   if (mArgsType == FetchArgsType::WorkerFetch) {
+     auto& args = mArgs.as<WorkerFetchArgs>();
+     mFetchDriver->SetWorkerScript(args.mWorkerScript);
 diff --git a/dom/geolocation/Geolocation.cpp b/dom/geolocation/Geolocation.cpp
-index cb9107deb1acfc6f9f3efe87144fcd9bbccd9231..5034c066db8e13dbd01b9bbe79ac2447135f3360 100644
+index 7c653fe131dc34d35ffdc030950071adb31a9fc9..b23442a42ba8ee270e8e38930e59ae15c2a29039 100644
 --- a/dom/geolocation/Geolocation.cpp
 +++ b/dom/geolocation/Geolocation.cpp
-@@ -23,6 +23,7 @@
+@@ -28,6 +28,7 @@
  #include "nsComponentManagerUtils.h"
  #include "nsContentPermissionHelper.h"
  #include "nsContentUtils.h"
@@ -1370,7 +1429,7 @@ index cb9107deb1acfc6f9f3efe87144fcd9bbccd9231..5034c066db8e13dbd01b9bbe79ac2447
  #include "nsGlobalWindowInner.h"
  #include "mozilla/dom/Document.h"
  #include "nsINamed.h"
-@@ -256,10 +257,8 @@ nsGeolocationRequest::Allow(JS::Handle<JS::Value> aChoices) {
+@@ -428,10 +429,8 @@ nsGeolocationRequest::Allow(JS::Handle<JS::Value> aChoices) {
      return NS_OK;
    }
  
@@ -1383,7 +1442,7 @@ index cb9107deb1acfc6f9f3efe87144fcd9bbccd9231..5034c066db8e13dbd01b9bbe79ac2447
    CachedPositionAndAccuracy lastPosition = gs->GetCachedPosition();
    if (lastPosition.position) {
      EpochTimeStamp cachedPositionTime_ms;
-@@ -437,8 +436,7 @@ void nsGeolocationRequest::Shutdown() {
+@@ -639,8 +638,7 @@ void nsGeolocationRequest::Shutdown() {
    // If there are no other high accuracy requests, the geolocation service will
    // notify the provider to switch to the default accuracy.
    if (mOptions && mOptions->mEnableHighAccuracy) {
@@ -1393,7 +1452,7 @@ index cb9107deb1acfc6f9f3efe87144fcd9bbccd9231..5034c066db8e13dbd01b9bbe79ac2447
      if (gs) {
        gs->UpdateAccuracy();
      }
-@@ -727,8 +725,14 @@ void nsGeolocationService::StopDevice() {
+@@ -957,8 +955,14 @@ void nsGeolocationService::StopDevice() {
  StaticRefPtr<nsGeolocationService> nsGeolocationService::sService;
  
  already_AddRefed<nsGeolocationService>
@@ -1409,7 +1468,7 @@ index cb9107deb1acfc6f9f3efe87144fcd9bbccd9231..5034c066db8e13dbd01b9bbe79ac2447
    if (nsGeolocationService::sService) {
      result = nsGeolocationService::sService;
  
-@@ -820,7 +824,9 @@ nsresult Geolocation::Init(nsPIDOMWindowInner* aContentDom) {
+@@ -1050,7 +1054,9 @@ nsresult Geolocation::Init(nsPIDOMWindowInner* aContentDom) {
    // If no aContentDom was passed into us, we are being used
    // by chrome/c++ and have no mOwner, no mPrincipal, and no need
    // to prompt.
@@ -1421,7 +1480,7 @@ index cb9107deb1acfc6f9f3efe87144fcd9bbccd9231..5034c066db8e13dbd01b9bbe79ac2447
      mService->AddLocator(this);
    }
 diff --git a/dom/geolocation/Geolocation.h b/dom/geolocation/Geolocation.h
-index 7e1af00d05fbafa2d828e2c7e4dcc5c82d115f5b..e85af9718d064e4d2865bc944e9d4ba1efb9a5d7 100644
+index 992de29b5d2d09c19e55ebb2502215ec9d05a171..cdc20567b693283b0fd5a5923f7ea54210bd1712 100644
 --- a/dom/geolocation/Geolocation.h
 +++ b/dom/geolocation/Geolocation.h
 @@ -31,6 +31,7 @@
@@ -1432,7 +1491,7 @@ index 7e1af00d05fbafa2d828e2c7e4dcc5c82d115f5b..e85af9718d064e4d2865bc944e9d4ba1
  
  class nsGeolocationService;
  class nsGeolocationRequest;
-@@ -48,13 +49,14 @@ struct CachedPositionAndAccuracy {
+@@ -51,13 +52,14 @@ struct CachedPositionAndAccuracy {
    bool isHighAccuracy;
  };
  
@@ -1448,9 +1507,9 @@ index 7e1af00d05fbafa2d828e2c7e4dcc5c82d115f5b..e85af9718d064e4d2865bc944e9d4ba1
    static mozilla::StaticRefPtr<nsGeolocationService> sService;
  
    NS_DECL_THREADSAFE_ISUPPORTS
-@@ -179,6 +181,8 @@ class Geolocation final : public nsIGeolocationUpdate, public nsWrapperCache {
-   // null.
-   static already_AddRefed<Geolocation> NonWindowSingleton();
+@@ -189,6 +191,8 @@ class Geolocation final : public nsIGeolocationUpdate, public nsWrapperCache {
+       BrowsingContext* aBrowsingContext,
+       geolocation::ParentRequestResolver&& aResolver);
  
 +  nsGeolocationService* GetGeolocationService() { return mService; };
 +
@@ -1458,18 +1517,18 @@ index 7e1af00d05fbafa2d828e2c7e4dcc5c82d115f5b..e85af9718d064e4d2865bc944e9d4ba1
    ~Geolocation();
  
 diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
-index d5a65a17555b7764611803f7fb298712b2c60fd7..fdee7deaf0b14e01702b902f8b73256c281e76b8 100644
+index c3e7de8f41e06e11155620b75c4d8a830d908b37..39eb9d31258693dce3a26c3227f28d92bccdb019 100644
 --- a/dom/html/HTMLInputElement.cpp
 +++ b/dom/html/HTMLInputElement.cpp
-@@ -57,6 +57,7 @@
+@@ -64,6 +64,7 @@
  #include "mozilla/dom/Document.h"
  #include "mozilla/dom/HTMLDataListElement.h"
  #include "mozilla/dom/HTMLOptionElement.h"
 +#include "nsDocShell.h"
- #include "nsIFormControlFrame.h"
- #include "nsITextControlFrame.h"
  #include "nsIFrame.h"
-@@ -783,6 +784,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) {
+ #include "nsRangeFrame.h"
+ #include "nsError.h"
+@@ -790,6 +791,13 @@ nsresult HTMLInputElement::InitFilePicker(FilePickerType aType) {
      return NS_ERROR_FAILURE;
    }
  
@@ -1480,14 +1539,14 @@ index d5a65a17555b7764611803f7fb298712b2c60fd7..fdee7deaf0b14e01702b902f8b73256c
 +    return NS_OK;
 +  }
 +
-   if (IsPopupBlocked(doc)) {
+   if (IsPickerBlocked(doc)) {
      return NS_OK;
    }
 diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl
-index 6a0df1b435cee9cea3b7d7ca30d0aff0e31f8ac0..c17b24823dd873c025e407fcc635b7c678dfd8ed 100644
+index 5e417145c4f21d8f2aa65088611477b681c9c327..bc84c509659c7556077e69c652e5b19639eb88bb 100644
 --- a/dom/interfaces/base/nsIDOMWindowUtils.idl
 +++ b/dom/interfaces/base/nsIDOMWindowUtils.idl
-@@ -373,6 +373,26 @@ interface nsIDOMWindowUtils : nsISupports {
+@@ -374,6 +374,26 @@ interface nsIDOMWindowUtils : nsISupports {
                           [optional] in long aButtons,
                           [optional] in unsigned long aIdentifier);
  
@@ -1515,10 +1574,10 @@ index 6a0df1b435cee9cea3b7d7ca30d0aff0e31f8ac0..c17b24823dd873c025e407fcc635b7c6
     *    touchstart, touchend, touchmove, and touchcancel
     *
 diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
-index bdd10fdcb285e43778b55907ac05bfa973207e5e..d98808918ff8eccd6c51b4fbce1cce5e3745206a 100644
+index 93f20a36acef74947d5377df5ff916546218d8b8..22b706b985d22a8c0c278a12ab4944e26ded51a4 100644
 --- a/dom/ipc/BrowserChild.cpp
 +++ b/dom/ipc/BrowserChild.cpp
-@@ -1652,6 +1652,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
+@@ -1676,6 +1676,21 @@ void BrowserChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
    if (postLayerization) {
      postLayerization->Register();
    }
@@ -1555,15 +1614,12 @@ index 5aa445d2e0a6169e57c44569974d557b3baf7064..671f71979b407f0ca17c66f13805e851
  }
  
 diff --git a/dom/media/systemservices/video_engine/desktop_capture_impl.cc b/dom/media/systemservices/video_engine/desktop_capture_impl.cc
-index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d15e8431f 100644
+index c43a1b3b245101c974742c5e50f54857e538bbfb..c07a568da3342cbf2af07471fa6959cb242b9a4e 100644
 --- a/dom/media/systemservices/video_engine/desktop_capture_impl.cc
 +++ b/dom/media/systemservices/video_engine/desktop_capture_impl.cc
-@@ -135,11 +135,12 @@ int32_t ScreenDeviceInfoImpl::GetOrientation(const char* aDeviceUniqueIdUTF8,
-   return 0;
- }
+@@ -52,9 +52,10 @@ namespace webrtc {
  
--VideoCaptureModule* DesktopCaptureImpl::Create(const int32_t aModuleId,
-+VideoCaptureModuleEx* DesktopCaptureImpl::Create(const int32_t aModuleId,
+ DesktopCaptureImpl* DesktopCaptureImpl::Create(const int32_t aModuleId,
                                                 const char* aUniqueId,
 -                                               const CaptureDeviceType aType) {
 +                                               const CaptureDeviceType aType,
@@ -1573,30 +1629,20 @@ index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d
 +                                                       aType, aCaptureCursor);
  }
  
- int32_t WindowDeviceInfoImpl::Init() {
-@@ -412,7 +413,7 @@ static bool UsePipewire() {
+ static DesktopCaptureOptions CreateDesktopCaptureOptions() {
+@@ -155,8 +156,10 @@ static std::unique_ptr<DesktopCapturer> CreateTabCapturer(
  
  static std::unique_ptr<DesktopCapturer> CreateDesktopCapturerAndThread(
      CaptureDeviceType aDeviceType, DesktopCapturer::SourceId aSourceId,
 -    nsIThread** aOutThread) {
 +    nsIThread** aOutThread, bool aCaptureCursor) {
    DesktopCaptureOptions options = CreateDesktopCaptureOptions();
-   std::unique_ptr<DesktopCapturer> capturer;
- 
-@@ -462,8 +463,10 @@ static std::unique_ptr<DesktopCapturer> CreateDesktopCapturerAndThread(
- 
-     capturer->SelectSource(aSourceId);
- 
--    capturer = std::make_unique<DesktopAndCursorComposer>(std::move(capturer),
--                                                          options);
-+    if (aCaptureCursor) {
-+      capturer = std::make_unique<DesktopAndCursorComposer>(
-+          std::move(capturer), options);
-+    }
-   } else if (aDeviceType == CaptureDeviceType::Browser) {
-     // XXX We don't capture cursors, so avoid the extra indirection layer. We
-     // could also pass null for the pMouseCursorMonitor.
-@@ -480,7 +483,8 @@ static std::unique_ptr<DesktopCapturer> CreateDesktopCapturerAndThread(
++  if (aCaptureCursor)
++    options.set_prefer_cursor_embedded(aCaptureCursor);
+   auto ensureThread = [&]() {
+     if (*aOutThread) {
+       return *aOutThread;
+@@ -253,7 +256,8 @@ static std::unique_ptr<DesktopCapturer> CreateDesktopCapturerAndThread(
  }
  
  DesktopCaptureImpl::DesktopCaptureImpl(const int32_t aId, const char* aUniqueId,
@@ -1606,7 +1652,7 @@ index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d
      : mModuleId(aId),
        mTrackingId(mozilla::TrackingId(CaptureEngineToTrackingSourceStr([&] {
                                          switch (aType) {
-@@ -497,6 +501,7 @@ DesktopCaptureImpl::DesktopCaptureImpl(const int32_t aId, const char* aUniqueId,
+@@ -270,6 +274,7 @@ DesktopCaptureImpl::DesktopCaptureImpl(const int32_t aId, const char* aUniqueId,
                                        aId)),
        mDeviceUniqueId(aUniqueId),
        mDeviceType(aType),
@@ -1614,7 +1660,7 @@ index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d
        mControlThread(mozilla::GetCurrentSerialEventTarget()),
        mNextFrameMinimumTime(Timestamp::Zero()),
        mCallbacks("DesktopCaptureImpl::mCallbacks") {}
-@@ -521,6 +526,19 @@ void DesktopCaptureImpl::DeRegisterCaptureDataCallback(
+@@ -294,6 +299,19 @@ void DesktopCaptureImpl::DeRegisterCaptureDataCallback(
    }
  }
  
@@ -1634,7 +1680,7 @@ index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d
  int32_t DesktopCaptureImpl::StopCaptureIfAllClientsClose() {
    {
      auto callbacks = mCallbacks.Lock();
-@@ -553,7 +571,7 @@ int32_t DesktopCaptureImpl::StartCapture(
+@@ -333,7 +351,7 @@ int32_t DesktopCaptureImpl::StartCapture(
  
    DesktopCapturer::SourceId sourceId = std::stoi(mDeviceUniqueId);
    std::unique_ptr capturer = CreateDesktopCapturerAndThread(
@@ -1643,7 +1689,7 @@ index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d
  
    MOZ_ASSERT(!capturer == !mCaptureThread);
    if (!capturer) {
-@@ -654,6 +672,15 @@ void DesktopCaptureImpl::OnCaptureResult(DesktopCapturer::Result aResult,
+@@ -441,6 +459,15 @@ void DesktopCaptureImpl::OnCaptureResult(DesktopCapturer::Result aResult,
    frameInfo.height = aFrame->size().height();
    frameInfo.videoType = VideoType::kARGB;
  
@@ -1660,18 +1706,18 @@ index a966ff06d4a52e2ff70ce71df3a6a607a67e3eda..eb6bb16413df43217ddd85048c02d41d
        frameInfo.width * frameInfo.height * DesktopFrame::kBytesPerPixel;
  
 diff --git a/dom/media/systemservices/video_engine/desktop_capture_impl.h b/dom/media/systemservices/video_engine/desktop_capture_impl.h
-index 7292f6c8a70298d4bf103080804843fa9bba1d15..7a50fee0d2fcaad475302d010892800a6e3c4e75 100644
+index a76b7de569db1cb42728a5514fb80e5c46e0344e..3d61ad8d3aa4a7eaf96957dcd680e1e1ee8abdf4 100644
 --- a/dom/media/systemservices/video_engine/desktop_capture_impl.h
 +++ b/dom/media/systemservices/video_engine/desktop_capture_impl.h
-@@ -24,6 +24,7 @@
+@@ -26,6 +26,7 @@
  #include "api/video/video_sink_interface.h"
  #include "modules/desktop_capture/desktop_capturer.h"
  #include "modules/video_capture/video_capture.h"
 +#include "rtc_base/deprecated/recursive_critical_section.h"
- 
- #include "desktop_device_info.h"
  #include "mozilla/DataMutex.h"
-@@ -43,6 +44,21 @@ namespace webrtc {
+ #include "mozilla/Maybe.h"
+ #include "mozilla/TimeStamp.h"
+@@ -42,17 +43,44 @@ namespace webrtc {
  
  class VideoCaptureEncodeInterface;
  
@@ -1688,12 +1734,21 @@ index 7292f6c8a70298d4bf103080804843fa9bba1d15..7a50fee0d2fcaad475302d010892800a
 +
 +  virtual void RegisterRawFrameCallback(RawFrameCallback* rawFrameCallback) = 0;
 +  virtual void DeRegisterRawFrameCallback(RawFrameCallback* rawFrameCallback) = 0;
++  int32_t StartCaptureCounted(const VideoCaptureCapability& aCapability) {
++    ++capture_counter_;
++    return capture_counter_ == 1 ? StartCapture(aCapability) : 0;
++  }
++
++  int32_t StopCaptureCounted() {
++    --capture_counter_;
++    return capture_counter_ == 0 ? StopCapture() : 0;
++  }
++
++ private:
++  int32_t capture_counter_ = 0;
 +};
 +
- // simulate deviceInfo interface for video engine, bridge screen/application and
- // real screen/application device info
- 
-@@ -158,13 +174,13 @@ class BrowserDeviceInfoImpl : public VideoCaptureModule::DeviceInfo {
+ // Reuses the video engine pipeline for screen sharing.
  // As with video, DesktopCaptureImpl is a proxy for screen sharing
  // and follows the video pipeline design
  class DesktopCaptureImpl : public DesktopCapturer::Callback,
@@ -1702,15 +1757,14 @@ index 7292f6c8a70298d4bf103080804843fa9bba1d15..7a50fee0d2fcaad475302d010892800a
   public:
    /* Create a screen capture modules object
     */
--  static VideoCaptureModule* Create(
-+  static VideoCaptureModuleEx* Create(
+   static DesktopCaptureImpl* Create(
        const int32_t aModuleId, const char* aUniqueId,
 -      const mozilla::camera::CaptureDeviceType aType);
 +      const mozilla::camera::CaptureDeviceType aType, bool aCaptureCursor = true);
  
    [[nodiscard]] static std::shared_ptr<VideoCaptureModule::DeviceInfo>
    CreateDeviceInfo(const int32_t aId,
-@@ -178,6 +194,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
+@@ -66,6 +94,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
    void DeRegisterCaptureDataCallback(
        rtc::VideoSinkInterface<VideoFrame>* aCallback) override;
    int32_t StopCaptureIfAllClientsClose() override;
@@ -1719,7 +1773,7 @@ index 7292f6c8a70298d4bf103080804843fa9bba1d15..7a50fee0d2fcaad475302d010892800a
  
    int32_t SetCaptureRotation(VideoRotation aRotation) override;
    bool SetApplyRotation(bool aEnable) override;
-@@ -200,7 +218,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
+@@ -89,7 +119,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
  
   protected:
    DesktopCaptureImpl(const int32_t aId, const char* aUniqueId,
@@ -1729,9 +1783,9 @@ index 7292f6c8a70298d4bf103080804843fa9bba1d15..7a50fee0d2fcaad475302d010892800a
    virtual ~DesktopCaptureImpl();
  
   private:
-@@ -208,6 +227,9 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
-   static constexpr uint32_t kMaxDesktopCaptureCpuUsage = 50;
+@@ -98,6 +129,9 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
    void InitOnThread(std::unique_ptr<DesktopCapturer> aCapturer, int aFramerate);
+   void UpdateOnThread(int aFramerate);
    void ShutdownOnThread();
 +
 +  rtc::RecursiveCriticalSection mApiCs;
@@ -1739,7 +1793,7 @@ index 7292f6c8a70298d4bf103080804843fa9bba1d15..7a50fee0d2fcaad475302d010892800a
    // DesktopCapturer::Callback interface.
    void OnCaptureResult(DesktopCapturer::Result aResult,
                         std::unique_ptr<DesktopFrame> aFrame) override;
-@@ -215,6 +237,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
+@@ -105,6 +139,8 @@ class DesktopCaptureImpl : public DesktopCapturer::Callback,
    // Notifies all mCallbacks of OnFrame(). mCaptureThread only.
    void NotifyOnFrame(const VideoFrame& aFrame);
  
@@ -1793,18 +1847,18 @@ index 3b39538e51840cd9b1685b2efd2ff2e9ec83608a..c7bf4f2d53b58bbacb22b3ebebf6f3fc
  
    return aGlobalOrNull;
 diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp
-index 11d09909f73fee425fd0f50b384c396a52e02a36..b0e668881bcd3b850de709ebf2557ae8391b8fe8 100644
+index 5ec21c1c7f975a372399748e8bab2b21ce347f20..ed16831e549afa3d6623398d35eb61e26ab5f2b0 100644
 --- a/dom/security/nsCSPUtils.cpp
 +++ b/dom/security/nsCSPUtils.cpp
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
  #include "nsSandboxFlags.h"
  #include "nsServiceManagerUtils.h"
  #include "nsWhitespaceTokenizer.h"
 +#include "nsDocShell.h"
  
+ #include "mozilla/Assertions.h"
  #include "mozilla/Components.h"
- #include "mozilla/dom/CSPDictionariesBinding.h"
-@@ -132,6 +133,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc,
+@@ -135,6 +136,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc,
      return;
    }
  
@@ -1817,19 +1871,19 @@ index 11d09909f73fee425fd0f50b384c396a52e02a36..b0e668881bcd3b850de709ebf2557ae8
        nsContentUtils::TrimWhitespace<nsContentUtils::IsHTMLWhitespace>(
            aPolicyStr));
 diff --git a/dom/webidl/GeometryUtils.webidl b/dom/webidl/GeometryUtils.webidl
-index 2f71b284ee5f7e11f117c447834b48355784448c..2640bd57123c2b03bf4b06a2419cd020ba95f155 100644
+index aee376e971ae01ac1e512c3920b115bfaf06afa8..1701311534bf77e6cd9bafc0e3a283610476aa8f 100644
 --- a/dom/webidl/GeometryUtils.webidl
 +++ b/dom/webidl/GeometryUtils.webidl
-@@ -16,6 +16,8 @@ dictionary BoxQuadOptions {
-   GeometryNode relativeTo;
-   [ChromeOnly]
+@@ -17,6 +17,8 @@ dictionary GeometryUtilsOptions {
    boolean createFramesForSuppressedWhitespace = true;
+   [ChromeOnly]
+   boolean flush = true;
 +  [ChromeOnly]
 +  boolean recurseWhenNoFrame = false;
  };
  
- dictionary ConvertCoordinateOptions {
-@@ -27,6 +29,9 @@ interface mixin GeometryUtils {
+ dictionary BoxQuadOptions : GeometryUtilsOptions {
+@@ -35,6 +37,9 @@ interface mixin GeometryUtils {
    [Throws, Func="nsINode::HasBoxQuadsSupport", NeedsCallerType]
    sequence<DOMQuad> getBoxQuads(optional BoxQuadOptions options = {});
  
@@ -1840,10 +1894,10 @@ index 2f71b284ee5f7e11f117c447834b48355784448c..2640bd57123c2b03bf4b06a2419cd020
     * returned quads are further translated relative to the window
     * origin -- which is not the layout origin. Further translation
 diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
-index 02efb1205382850b41c38d5f6ee47092adcdc63e..28c8d05d0b5cc415f3d13a4588248f3844faf4f2 100644
+index a23637c4a887b66a1b4c709a648762b84151bf01..d8da9063261482f1da3257e3f95a8a49d94325f8 100644
 --- a/dom/workers/RuntimeService.cpp
 +++ b/dom/workers/RuntimeService.cpp
-@@ -995,7 +995,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
+@@ -1026,7 +1026,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
    AssertIsOnMainThread();
  
    nsTArray<nsString> languages;
@@ -1852,7 +1906,7 @@ index 02efb1205382850b41c38d5f6ee47092adcdc63e..28c8d05d0b5cc415f3d13a4588248f38
  
    RuntimeService* runtime = RuntimeService::GetService();
    if (runtime) {
-@@ -1182,8 +1182,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
+@@ -1214,8 +1214,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
        }
  
        // The navigator overridden properties should have already been read.
@@ -1862,7 +1916,7 @@ index 02efb1205382850b41c38d5f6ee47092adcdc63e..28c8d05d0b5cc415f3d13a4588248f38
        mNavigatorPropertiesLoaded = true;
      }
  
-@@ -1789,6 +1788,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
+@@ -1836,6 +1835,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted(
    }
  }
  
@@ -1876,7 +1930,7 @@ index 02efb1205382850b41c38d5f6ee47092adcdc63e..28c8d05d0b5cc415f3d13a4588248f38
  template <typename Func>
  void RuntimeService::BroadcastAllWorkers(const Func& aFunc) {
    AssertIsOnMainThread();
-@@ -2304,6 +2310,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
+@@ -2361,6 +2367,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers(
    }
  }
  
@@ -1892,10 +1946,10 @@ index 02efb1205382850b41c38d5f6ee47092adcdc63e..28c8d05d0b5cc415f3d13a4588248f38
    MOZ_ASSERT(!NS_IsMainThread());
    MOZ_ASSERT(aCx);
 diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h
-index f51076ac1480794989999d00577bc9cf1566d5f9..fe15b2e00dc8f0bf203f2af9aad86e16c996d43d 100644
+index 534bbe9ec4f0261189eb3322c1229c1eb5d8802e..6aa99b64fdbbff3704602e944b129879fbdf8c15 100644
 --- a/dom/workers/RuntimeService.h
 +++ b/dom/workers/RuntimeService.h
-@@ -109,6 +109,8 @@ class RuntimeService final : public nsIObserver {
+@@ -112,6 +112,8 @@ class RuntimeService final : public nsIObserver {
    void PropagateStorageAccessPermissionGranted(
        const nsPIDOMWindowInner& aWindow);
  
@@ -1905,10 +1959,10 @@ index f51076ac1480794989999d00577bc9cf1566d5f9..fe15b2e00dc8f0bf203f2af9aad86e16
      return mNavigatorProperties;
    }
 diff --git a/dom/workers/WorkerCommon.h b/dom/workers/WorkerCommon.h
-index d10dabb5c5ff8e17851edf2bd2efc08e74584d8e..53c4070c5fde43b27fb8fbfdcf4c23d8af57fba3 100644
+index 58894a8361c7ef1dddd481ca5877a209a8b8ff5c..c481d40d79b6397b7f1d571bd9f6ae5c0a946217 100644
 --- a/dom/workers/WorkerCommon.h
 +++ b/dom/workers/WorkerCommon.h
-@@ -44,6 +44,8 @@ void ResumeWorkersForWindow(const nsPIDOMWindowInner& aWindow);
+@@ -47,6 +47,8 @@ void ResumeWorkersForWindow(const nsPIDOMWindowInner& aWindow);
  void PropagateStorageAccessPermissionGrantedToWorkers(
      const nsPIDOMWindowInner& aWindow);
  
@@ -1918,17 +1972,17 @@ index d10dabb5c5ff8e17851edf2bd2efc08e74584d8e..53c4070c5fde43b27fb8fbfdcf4c23d8
  
  bool IsWorkerGlobal(JSObject* global);
 diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
-index a8643981aa966e9324a5dbdb09b4fe57210dc581..5120df2607584a7cd50ea03aa997ef5ade5c8ee2 100644
+index 5d918a82708a26125f7322e43f6436d7eafaa812..b230baead02e05d87a211c276066ec7939ea8251 100644
 --- a/dom/workers/WorkerPrivate.cpp
 +++ b/dom/workers/WorkerPrivate.cpp
-@@ -682,6 +682,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable {
+@@ -736,6 +736,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable {
    }
  };
  
 +class ResetDefaultLocaleRunnable final : public WorkerControlRunnable {
 + public:
 +  explicit ResetDefaultLocaleRunnable(WorkerPrivate* aWorkerPrivate)
-+      : WorkerControlRunnable(aWorkerPrivate, "ResetDefaultLocaleRunnable", WorkerThread) {}
++      : WorkerControlRunnable("ResetDefaultLocaleRunnable") {}
 +
 +  virtual bool WorkerRun(JSContext* aCx,
 +                         WorkerPrivate* aWorkerPrivate) override {
@@ -1937,10 +1991,10 @@ index a8643981aa966e9324a5dbdb09b4fe57210dc581..5120df2607584a7cd50ea03aa997ef5a
 +  }
 +};
 +
- class UpdateLanguagesRunnable final : public WorkerRunnable {
+ class UpdateLanguagesRunnable final : public WorkerThreadRunnable {
    nsTArray<nsString> mLanguages;
  
-@@ -1993,6 +2005,16 @@ void WorkerPrivate::UpdateContextOptions(
+@@ -2159,6 +2171,16 @@ void WorkerPrivate::UpdateContextOptions(
    }
  }
  
@@ -1949,7 +2003,7 @@ index a8643981aa966e9324a5dbdb09b4fe57210dc581..5120df2607584a7cd50ea03aa997ef5a
 +
 +  RefPtr<ResetDefaultLocaleRunnable> runnable =
 +      new ResetDefaultLocaleRunnable(this);
-+  if (!runnable->Dispatch()) {
++  if (!runnable->Dispatch(this)) {
 +    NS_WARNING("Failed to reset default locale in worker!");
 +  }
 +}
@@ -1957,7 +2011,7 @@ index a8643981aa966e9324a5dbdb09b4fe57210dc581..5120df2607584a7cd50ea03aa997ef5a
  void WorkerPrivate::UpdateLanguages(const nsTArray<nsString>& aLanguages) {
    AssertIsOnParentThread();
  
-@@ -5489,6 +5511,15 @@ void WorkerPrivate::UpdateContextOptionsInternal(
+@@ -5946,6 +5968,15 @@ void WorkerPrivate::UpdateContextOptionsInternal(
    }
  }
  
@@ -1974,10 +2028,10 @@ index a8643981aa966e9324a5dbdb09b4fe57210dc581..5120df2607584a7cd50ea03aa997ef5a
      const nsTArray<nsString>& aLanguages) {
    WorkerGlobalScope* globalScope = GlobalScope();
 diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
-index a670d009759d101cf9574cde3c2481b8aa2737f6..ac87b7f27dfcc060adb52387b146c45eed996fa7 100644
+index 7bccdc8c0c2cd53f7aa7a6d9a74435344dd27980..86bba2128a7c0f4e5efa4bfbc939937aec146695 100644
 --- a/dom/workers/WorkerPrivate.h
 +++ b/dom/workers/WorkerPrivate.h
-@@ -417,6 +417,8 @@ class WorkerPrivate final
+@@ -443,6 +443,8 @@ class WorkerPrivate final
    void UpdateContextOptionsInternal(JSContext* aCx,
                                      const JS::ContextOptions& aContextOptions);
  
@@ -1986,7 +2040,7 @@ index a670d009759d101cf9574cde3c2481b8aa2737f6..ac87b7f27dfcc060adb52387b146c45e
    void UpdateLanguagesInternal(const nsTArray<nsString>& aLanguages);
  
    void UpdateJSWorkerMemoryParameterInternal(JSContext* aCx, JSGCParamKey key,
-@@ -1036,6 +1038,8 @@ class WorkerPrivate final
+@@ -1091,6 +1093,8 @@ class WorkerPrivate final
  
    void UpdateContextOptions(const JS::ContextOptions& aContextOptions);
  
@@ -2022,10 +2076,10 @@ index 7a069ef0c59895cf1f8dc35d612f1494c9c9f1ef..5b09dfdcc5323def65c35b0696141b44
      Span<const char> aTimeZone) {
  #if MOZ_INTL_USE_ICU_CPP_TIMEZONE
 diff --git a/intl/components/src/TimeZone.h b/intl/components/src/TimeZone.h
-index 9d0423ef13958d5c443cc3531269603c4801c338..f0c4ba7c528d2be466e0f7669a1e37e876f9091e 100644
+index 89770839ae108b5f3462a7f20684fdb72c4ab2fb..a7e40d6b7c33c234b41e586eac573ba4ce3a7d18 100644
 --- a/intl/components/src/TimeZone.h
 +++ b/intl/components/src/TimeZone.h
-@@ -190,6 +190,8 @@ class TimeZone final {
+@@ -191,6 +191,8 @@ class TimeZone final {
      return FillBufferWithICUCall(aBuffer, ucal_getHostTimeZone);
    }
  
@@ -2048,10 +2102,10 @@ index 523e84c8c93f4221701f90f2e8ee146ec8e1adbd..98d5b1176e5378431b859a2dbd4d4e77
  inline ClippedTime TimeClip(double time);
  
 diff --git a/js/src/debugger/Object.cpp b/js/src/debugger/Object.cpp
-index 17528b0fd99ce8274e702746ff5674de4c3d4f2d..37fa52ae07381bec3504136b9bec0aa1ca110d6b 100644
+index b7ea4b6f66d14db0324397cdc1b0ed8c5ea167e2..1c59e328079e7e43b65f7cb7bc31636a48a93263 100644
 --- a/js/src/debugger/Object.cpp
 +++ b/js/src/debugger/Object.cpp
-@@ -2468,7 +2468,11 @@ Maybe<Completion> DebuggerObject::call(JSContext* cx,
+@@ -2484,7 +2484,11 @@ Maybe<Completion> DebuggerObject::call(JSContext* cx,
          invokeArgs[i].set(args2[i]);
        }
  
@@ -2064,10 +2118,10 @@ index 17528b0fd99ce8274e702746ff5674de4c3d4f2d..37fa52ae07381bec3504136b9bec0aa1
    }
  
 diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
-index 21ecc2e9f50a16357ace3320335d31a4929fc146..c4b1444ce53b20a700d2ff9f18521bd67623e7d2 100644
+index a57b8fefa104f966393a99f5a81876b9a95f9743..adc42dd227e52643b06fb101170aeafb490c0acc 100644
 --- a/js/src/vm/DateTime.cpp
 +++ b/js/src/vm/DateTime.cpp
-@@ -186,6 +186,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) {
+@@ -185,6 +185,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) {
    }
  }
  
@@ -2079,7 +2133,7 @@ index 21ecc2e9f50a16357ace3320335d31a4929fc146..c4b1444ce53b20a700d2ff9f18521bd6
  void js::DateTimeInfo::updateTimeZone() {
    MOZ_ASSERT(timeZoneStatus_ != TimeZoneStatus::Valid);
  
-@@ -527,10 +532,24 @@ void js::ResetTimeZoneInternal(ResetTimeZoneMode mode) {
+@@ -528,10 +533,24 @@ void js::ResetTimeZoneInternal(ResetTimeZoneMode mode) {
    js::DateTimeInfo::resetTimeZone(mode);
  }
  
@@ -2104,7 +2158,7 @@ index 21ecc2e9f50a16357ace3320335d31a4929fc146..c4b1444ce53b20a700d2ff9f18521bd6
  #if JS_HAS_INTL_API
  #  if defined(XP_WIN)
  static bool IsOlsonCompatibleWindowsTimeZoneId(std::string_view tz) {
-@@ -748,6 +767,15 @@ static bool ReadTimeZoneLink(std::string_view tz,
+@@ -749,6 +768,15 @@ static bool ReadTimeZoneLink(std::string_view tz,
  
  void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
  #if JS_HAS_INTL_API
@@ -2120,7 +2174,7 @@ index 21ecc2e9f50a16357ace3320335d31a4929fc146..c4b1444ce53b20a700d2ff9f18521bd6
    // In the future we should not be setting a default ICU time zone at all,
    // instead all accesses should go through the appropriate DateTimeInfo
    // instance depending on the resist fingerprinting status. For now we return
-@@ -759,7 +787,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
+@@ -760,7 +788,6 @@ void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
  
    if (const char* tzenv = std::getenv("TZ")) {
      std::string_view tz(tzenv);
@@ -2129,7 +2183,7 @@ index 21ecc2e9f50a16357ace3320335d31a4929fc146..c4b1444ce53b20a700d2ff9f18521bd6
  
  #  if defined(XP_WIN)
 diff --git a/js/src/vm/DateTime.h b/js/src/vm/DateTime.h
-index fd6d7ae078b8f6b3cc46a4a993a1e044a7128c90..4743094e489122dd9ee8ab9a7a175dd7e928859d 100644
+index e3cf82daa3749664aa8ced7e6553b8c6434dfec8..b45b49c4f3bbf12853c4afb12de21d99ac88d77b 100644
 --- a/js/src/vm/DateTime.h
 +++ b/js/src/vm/DateTime.h
 @@ -65,6 +65,8 @@ enum class ResetTimeZoneMode : bool {
@@ -2141,7 +2195,7 @@ index fd6d7ae078b8f6b3cc46a4a993a1e044a7128c90..4743094e489122dd9ee8ab9a7a175dd7
  /**
   * Stores date/time information, particularly concerning the current local
   * time zone, and implements a small cache for daylight saving time offset
-@@ -225,6 +227,7 @@ class DateTimeInfo {
+@@ -253,6 +255,7 @@ class DateTimeInfo {
   private:
    // The method below should only be called via js::ResetTimeZoneInternal().
    friend void js::ResetTimeZoneInternal(ResetTimeZoneMode);
@@ -2149,7 +2203,7 @@ index fd6d7ae078b8f6b3cc46a4a993a1e044a7128c90..4743094e489122dd9ee8ab9a7a175dd7
  
    static void resetTimeZone(ResetTimeZoneMode mode) {
      {
-@@ -321,6 +324,8 @@ class DateTimeInfo {
+@@ -352,6 +355,8 @@ class DateTimeInfo {
    JS::UniqueChars locale_;
    JS::UniqueTwoByteChars standardName_;
    JS::UniqueTwoByteChars daylightSavingsName_;
@@ -2158,7 +2212,7 @@ index fd6d7ae078b8f6b3cc46a4a993a1e044a7128c90..4743094e489122dd9ee8ab9a7a175dd7
  #else
    // Restrict the data-time range to the minimum required time_t range as
    // specified in POSIX. Most operating systems support 64-bit time_t
-@@ -336,6 +341,8 @@ class DateTimeInfo {
+@@ -367,6 +372,8 @@ class DateTimeInfo {
  
    void internalResetTimeZone(ResetTimeZoneMode mode);
  
@@ -2168,7 +2222,7 @@ index fd6d7ae078b8f6b3cc46a4a993a1e044a7128c90..4743094e489122dd9ee8ab9a7a175dd7
  
    void internalResyncICUDefaultTimeZone();
 diff --git a/layout/base/GeometryUtils.cpp b/layout/base/GeometryUtils.cpp
-index dac899f7558b26d6848da8b98ed8a93555c8751a..2a07d67fa1c2840b25085566e84dc3b2d9b789cf 100644
+index 4bfd336ddcbee8004ac538ca7b7d8216d04a61c3..cd22351c4aeacea8afc9828972222aca1b3063bf 100644
 --- a/layout/base/GeometryUtils.cpp
 +++ b/layout/base/GeometryUtils.cpp
 @@ -23,6 +23,7 @@
@@ -2179,18 +2233,18 @@ index dac899f7558b26d6848da8b98ed8a93555c8751a..2a07d67fa1c2840b25085566e84dc3b2
  
  using namespace mozilla;
  using namespace mozilla::dom;
-@@ -261,11 +262,27 @@ static bool CheckFramesInSameTopLevelBrowsingContext(nsIFrame* aFrame1,
+@@ -265,10 +266,27 @@ static bool CheckFramesInSameTopLevelBrowsingContext(nsIFrame* aFrame1,
    return false;
  }
  
-+static nsIFrame* GetFrameForNode(nsINode* aNode,
-+                                 bool aCreateFramesForSuppressedWhitespace,
++static nsIFrame* GetFrameForNodeRecursive(nsINode* aNode,
++                                 const GeometryUtilsOptions& aOptions,
 +                                 bool aRecurseWhenNoFrame) {
-+  nsIFrame* frame = GetFrameForNode(aNode, aCreateFramesForSuppressedWhitespace);
++  nsIFrame* frame = GetFrameForNode(aNode, aOptions);
 +  if (!frame && aRecurseWhenNoFrame && aNode->IsContent()) {
 +    dom::FlattenedChildIterator iter(aNode->AsContent());
 +    for (nsIContent* child = iter.GetNextChild(); child; child = iter.GetNextChild()) {
-+      frame = GetFrameForNode(child, aCreateFramesForSuppressedWhitespace, aRecurseWhenNoFrame);
++      frame = GetFrameForNodeRecursive(child, aOptions, aRecurseWhenNoFrame);
 +      if (frame) {
 +        break;
 +      }
@@ -2200,28 +2254,29 @@ index dac899f7558b26d6848da8b98ed8a93555c8751a..2a07d67fa1c2840b25085566e84dc3b2
 +}
 +
  void GetBoxQuads(nsINode* aNode, const dom::BoxQuadOptions& aOptions,
-                  nsTArray<RefPtr<DOMQuad> >& aResult, CallerType aCallerType,
+                  nsTArray<RefPtr<DOMQuad>>& aResult, CallerType aCallerType,
                   ErrorResult& aRv) {
-   nsIFrame* frame =
--      GetFrameForNode(aNode, aOptions.mCreateFramesForSuppressedWhitespace);
-+      GetFrameForNode(aNode, aOptions.mCreateFramesForSuppressedWhitespace, aOptions.mRecurseWhenNoFrame);
+-  nsIFrame* frame = GetFrameForNode(aNode, aOptions);
++  nsIFrame* frame =
++      GetFrameForNodeRecursive(aNode, aOptions, aOptions.mRecurseWhenNoFrame);
    if (!frame) {
      // No boxes to return
      return;
-@@ -280,7 +297,7 @@ void GetBoxQuads(nsINode* aNode, const dom::BoxQuadOptions& aOptions,
+@@ -281,7 +299,8 @@ void GetBoxQuads(nsINode* aNode, const dom::BoxQuadOptions& aOptions,
+   // EnsureFrameForTextNode call.  We need to get the first frame again
    // when that happens and re-check it.
    if (!weakFrame.IsAlive()) {
-     frame =
--        GetFrameForNode(aNode, aOptions.mCreateFramesForSuppressedWhitespace);
-+        GetFrameForNode(aNode, aOptions.mCreateFramesForSuppressedWhitespace, aOptions.mRecurseWhenNoFrame);
+-    frame = GetFrameForNode(aNode, aOptions);
++    frame =
++        GetFrameForNodeRecursive(aNode, aOptions, aOptions.mRecurseWhenNoFrame);
      if (!frame) {
        // No boxes to return
        return;
 diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
-index 31c21c337786b76306029149a925293a44c45c28..7aa4eb0b4980bb8ecdc4e10c91b1cd70e5d0ad08 100644
+index e8fb3a8304b27814e6e84355f24410c820667f9d..211c86fe55b8b650e40275a427b30a1ee8a9a3d7 100644
 --- a/layout/base/PresShell.cpp
 +++ b/layout/base/PresShell.cpp
-@@ -11127,7 +11127,9 @@ bool PresShell::ComputeActiveness() const {
+@@ -11512,7 +11512,9 @@ bool PresShell::ComputeActiveness() const {
      if (!browserChild->IsVisible()) {
        MOZ_LOG(gLog, LogLevel::Debug,
                (" > BrowserChild %p is not visible", browserChild));
@@ -2232,11 +2287,36 @@ index 31c21c337786b76306029149a925293a44c45c28..7aa4eb0b4980bb8ecdc4e10c91b1cd70
      }
  
      // If the browser is visible but just due to be preserving layers
+diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
+index 315d532eab56dab13b6c8bc2380a5cda2a17ffc1..7c4552137149e8c7fc9ac08a09bd4242952b53b6 100644
+--- a/layout/base/nsLayoutUtils.cpp
++++ b/layout/base/nsLayoutUtils.cpp
+@@ -708,6 +708,10 @@ bool nsLayoutUtils::AllowZoomingForDocument(
+       !aDocument->GetPresShell()->AsyncPanZoomEnabled()) {
+     return false;
+   }
++
++  /* Playwright: disable zooming as we don't support meta viewport tag */
++  if (1 == 1) return false;
++
+   // True if we allow zooming for all documents on this platform, or if we are
+   // in RDM.
+   BrowsingContext* bc = aDocument->GetBrowsingContext();
+@@ -9770,6 +9774,9 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont,
+ 
+ /* static */
+ bool nsLayoutUtils::ShouldHandleMetaViewport(const Document* aDocument) {
++  /* Playwright: disable meta viewport handling since we don't require one */
++  if (1 == 1) return false;
++
+   BrowsingContext* bc = aDocument->GetBrowsingContext();
+   return StaticPrefs::dom_meta_viewport_enabled() || (bc && bc->InRDMPane());
+ }
 diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h
-index 7bb839ae18835d128dc9285b7f9dc5b5e06335af..09e3979d07447522ace740daf2b818a6c551ceba 100644
+index c7cf59c2661c7e203384c9b82789879f756b44b7..21e32dab4e60112c073bdd5070a308da2b4e0373 100644
 --- a/layout/style/GeckoBindings.h
 +++ b/layout/style/GeckoBindings.h
-@@ -625,6 +625,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
+@@ -596,6 +596,7 @@ float Gecko_MediaFeatures_GetResolution(const mozilla::dom::Document*);
  bool Gecko_MediaFeatures_PrefersReducedMotion(const mozilla::dom::Document*);
  bool Gecko_MediaFeatures_PrefersReducedTransparency(
      const mozilla::dom::Document*);
@@ -2245,10 +2325,10 @@ index 7bb839ae18835d128dc9285b7f9dc5b5e06335af..09e3979d07447522ace740daf2b818a6
      const mozilla::dom::Document*);
  mozilla::StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
 diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
-index f888c127d4423336a8f51e2011fc42eaf6c33f11..51d6e069f4a81c42b4bf270ba44ae4f82b8df592 100644
+index ca382a3cfba8ce5839890d6e4cb3cf9789287e3b..5800fc23dc77ee5764beddd6fa48a7fd701d2939 100644
 --- a/layout/style/nsMediaFeatures.cpp
 +++ b/layout/style/nsMediaFeatures.cpp
-@@ -260,11 +260,11 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
+@@ -264,11 +264,7 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) {
  }
  
  bool Gecko_MediaFeatures_PrefersReducedMotion(const Document* aDocument) {
@@ -2258,28 +2338,45 @@ index f888c127d4423336a8f51e2011fc42eaf6c33f11..51d6e069f4a81c42b4bf270ba44ae4f8
 -  }
 -  return LookAndFeel::GetInt(LookAndFeel::IntID::PrefersReducedMotion, 0) == 1;
 +  return aDocument->PrefersReducedMotion();
-+}
-+
-+bool Gecko_MediaFeatures_ForcedColors(const Document* aDocument) {
-+  return aDocument->ForcedColors();
  }
  
  bool Gecko_MediaFeatures_PrefersReducedTransparency(const Document* aDocument) {
+@@ -293,6 +289,20 @@ StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme(
+ // as a signal.
+ StylePrefersContrast Gecko_MediaFeatures_PrefersContrast(
+     const Document* aDocument) {
++  if (auto* bc = aDocument->GetBrowsingContext()) {
++    switch (bc->Top()->PrefersContrastOverride()) {
++      case dom::PrefersContrastOverride::No_preference:
++        return StylePrefersContrast::NoPreference;
++      case dom::PrefersContrastOverride::Less:
++        return StylePrefersContrast::Less;
++      case dom::PrefersContrastOverride::More:
++        return StylePrefersContrast::More;
++      case dom::PrefersContrastOverride::Custom:
++        return StylePrefersContrast::Custom;
++    }
++  }
++  
++  
+   if (aDocument->ShouldResistFingerprinting(RFPTarget::CSSPrefersContrast)) {
+     return StylePrefersContrast::NoPreference;
+   }
 diff --git a/netwerk/base/LoadInfo.cpp b/netwerk/base/LoadInfo.cpp
-index eb90324c37ce515e5a0fcf75412605ae57ead9ee..6733dd6c99d77399529945386caa3926960e4176 100644
+index 1ec2c64193206d31702e22e5c4783f084b1cff31..fb463eb12ee39cd1e448369f3b47fbcfbb2473b9 100644
 --- a/netwerk/base/LoadInfo.cpp
 +++ b/netwerk/base/LoadInfo.cpp
-@@ -653,7 +653,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
-       mInterceptionInfo(rhs.mInterceptionInfo),
-       mHasInjectedCookieForCookieBannerHandling(
+@@ -696,7 +696,8 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
            rhs.mHasInjectedCookieForCookieBannerHandling),
--      mWasSchemelessInput(rhs.mWasSchemelessInput) {
-+      mWasSchemelessInput(rhs.mWasSchemelessInput),
+       mSchemelessInput(rhs.mSchemelessInput),
+       mHttpsUpgradeTelemetry(rhs.mHttpsUpgradeTelemetry),
+-      mIsNewWindowTarget(rhs.mIsNewWindowTarget) {
++      mIsNewWindowTarget(rhs.mIsNewWindowTarget),
 +      mJugglerLoadIdentifier(rhs.mJugglerLoadIdentifier) {
  }
  
  LoadInfo::LoadInfo(
-@@ -2369,4 +2370,16 @@ LoadInfo::SetWasSchemelessInput(bool aWasSchemelessInput) {
+@@ -2534,4 +2535,16 @@ LoadInfo::SetSkipHTTPSUpgrade(bool aSkipHTTPSUpgrade) {
    return NS_OK;
  }
  
@@ -2297,23 +2394,23 @@ index eb90324c37ce515e5a0fcf75412605ae57ead9ee..6733dd6c99d77399529945386caa3926
 +
  }  // namespace mozilla::net
 diff --git a/netwerk/base/LoadInfo.h b/netwerk/base/LoadInfo.h
-index a8631b09b26708ca10f683f1a9dd6b8467d3fe8e..a0bd72113e3539d815d32382946581ee62f39b6c 100644
+index 93cc8d3630f7029303240555ae72d41b68047375..8a09863af399e25ba3f01caff2f6b3af1260e8b8 100644
 --- a/netwerk/base/LoadInfo.h
 +++ b/netwerk/base/LoadInfo.h
-@@ -401,6 +401,8 @@ class LoadInfo final : public nsILoadInfo {
+@@ -426,6 +426,8 @@ class LoadInfo final : public nsILoadInfo {
  
-   bool mHasInjectedCookieForCookieBannerHandling = false;
-   bool mWasSchemelessInput = false;
+   bool mIsNewWindowTarget = false;
+   bool mSkipHTTPSUpgrade = false;
 +
 +  uint64_t mJugglerLoadIdentifier = 0;
  };
  
  // This is exposed solely for testing purposes and should not be used outside of
 diff --git a/netwerk/base/TRRLoadInfo.cpp b/netwerk/base/TRRLoadInfo.cpp
-index 920e7623a7f912296fc23361f66ab35a30c35f1e..dfea0d0f7a72da9699615d7ff778e429e7ae40fb 100644
+index d1650595f8cf28a704f94a99c1f6bfe1deb9cc77..2072a3990ff6f4496626dcebb277291ad845cac3 100644
 --- a/netwerk/base/TRRLoadInfo.cpp
 +++ b/netwerk/base/TRRLoadInfo.cpp
-@@ -861,5 +861,15 @@ TRRLoadInfo::SetWasSchemelessInput(bool aWasSchemelessInput) {
+@@ -950,5 +950,15 @@ TRRLoadInfo::GetFetchDestination(nsACString& aDestination) {
    return NS_ERROR_NOT_IMPLEMENTED;
  }
  
@@ -2330,48 +2427,63 @@ index 920e7623a7f912296fc23361f66ab35a30c35f1e..dfea0d0f7a72da9699615d7ff778e429
  }  // namespace net
  }  // namespace mozilla
 diff --git a/netwerk/base/nsILoadInfo.idl b/netwerk/base/nsILoadInfo.idl
-index ddfcb223e6126c943b58e9d198f0e2fa767c3de1..4280b836c55e5778ad4c94226ea537facb19c436 100644
+index 774ec045c0b18310e8cb86e8a9d6b1788d028435..cbf303a0ed872c27d580b4b6615f3dd9c76a8a19 100644
 --- a/netwerk/base/nsILoadInfo.idl
 +++ b/netwerk/base/nsILoadInfo.idl
-@@ -1532,4 +1532,6 @@ interface nsILoadInfo : nsISupports
-    * Whether the load has gone through the URL bar, where the fixup had to add * the protocol scheme.
-    */
-    [infallible] attribute boolean wasSchemelessInput;
+@@ -1626,4 +1626,6 @@ interface nsILoadInfo : nsISupports
+       return static_cast<mozilla::dom::UserNavigationInvolvement>(userNavigationInvolvement);
+     }
+ %}
 +
 +  [infallible] attribute unsigned long long jugglerLoadIdentifier;
  };
 diff --git a/netwerk/base/nsINetworkInterceptController.idl b/netwerk/base/nsINetworkInterceptController.idl
-index 155daa5cd52c4e93e1cc4559875868f4faf2c37e..02e8a2614a27a4cc9e1de760d4c48617eba25d4d 100644
+index 7f91d2df6f8bb4020c75c132dc8f6bf26625fa1e..aaa5541a17039d6b13ad83ab176fdaaf79edb2a0 100644
 --- a/netwerk/base/nsINetworkInterceptController.idl
 +++ b/netwerk/base/nsINetworkInterceptController.idl
-@@ -59,6 +59,7 @@ interface nsIInterceptedChannel : nsISupports
-      * results in the resulting client not being controlled.
+@@ -60,6 +60,16 @@ interface nsIInterceptedChannel : nsISupports
       */
      void resetInterception(in boolean bypass);
-+    void resetInterceptionWithURI(in nsIURI aURI);
  
++    // ----- Playwright begin -----
++
++    // Same as resetInterception, but updates the URI.
++    void resetInterceptionWithURI(in nsIURI aURI);
++
++    // After resetInterception is called, this request will be intercepted again.
++    void interceptAfterServiceWorkerResets();
++
++    // ----- Playwright end -------
++
      /**
       * Set the status and reason for the forthcoming synthesized response.
+      * Multiple calls overwrite existing values.
 diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp
-index d849eab7507f0665a8a79a1b11759afa3481f1ad..3a95d5201a1c1f2161a95e15beae86f2833a875f 100644
+index 771ae1fbe3d54aa25443eea675cf3abd26a21ce9..a916cb49c16dc6c7809ccbb7c8d4172446a5ac07 100644
 --- a/netwerk/ipc/DocumentLoadListener.cpp
 +++ b/netwerk/ipc/DocumentLoadListener.cpp
-@@ -167,6 +167,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
-   loadInfo->SetHasValidUserGestureActivation(
-       aLoadState->HasValidUserGestureActivation());
+@@ -177,6 +177,7 @@ static auto CreateDocumentLoadInfo(CanonicalBrowsingContext* aBrowsingContext,
+   loadInfo->SetTextDirectiveUserActivation(
+       aLoadState->GetTextDirectiveUserActivation());
    loadInfo->SetIsMetaRefresh(aLoadState->IsMetaRefresh());
 +  loadInfo->SetJugglerLoadIdentifier(aLoadState->GetLoadIdentifier());
  
    return loadInfo.forget();
  }
 diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-index c58fbc96391f8dcb585bd00b5ae8cba9088abd82..c121c891b61c9d60df770020c4ad09521d2bbfe6 100644
+index fbf4bdf1e24d1102df113984be6c8dc3a7d0d810..787bf014d3bf0b8537f99bf5eb4074e100c78c18 100644
 --- a/netwerk/protocol/http/InterceptedHttpChannel.cpp
 +++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp
-@@ -727,6 +727,14 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
+@@ -728,10 +728,33 @@ NS_IMPL_ISUPPORTS(ResetInterceptionHeaderVisitor, nsIHttpHeaderVisitor)
  
  }  // anonymous namespace
  
++NS_IMETHODIMP
++InterceptedHttpChannel::InterceptAfterServiceWorkerResets() {
++  mInterceptAfterServiceWorkerResets = true;
++  return NS_OK;
++}
++
 +NS_IMETHODIMP
 +InterceptedHttpChannel::ResetInterceptionWithURI(nsIURI* aURI) {
 +  if (aURI) {
@@ -2383,7 +2495,20 @@ index c58fbc96391f8dcb585bd00b5ae8cba9088abd82..c121c891b61c9d60df770020c4ad0952
  NS_IMETHODIMP
  InterceptedHttpChannel::ResetInterception(bool aBypass) {
    INTERCEPTED_LOG(("InterceptedHttpChannel::ResetInterception [%p] bypass: %s",
-@@ -1140,11 +1148,18 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
+                    this, aBypass ? "true" : "false"));
++  if (mInterceptAfterServiceWorkerResets) {
++    mInterceptAfterServiceWorkerResets = false;
++    nsCOMPtr<nsINetworkInterceptController> controller;
++    GetCallback(controller);
++    if (!controller)
++      return NS_ERROR_DOM_INVALID_STATE_ERR;
++    return controller->ChannelIntercepted(this);
++  }
++
+   if (mCanceled) {
+     return mStatus;
+   }
+@@ -1146,11 +1169,18 @@ InterceptedHttpChannel::OnStartRequest(nsIRequest* aRequest) {
      GetCallback(mProgressSink);
    }
  
@@ -2402,11 +2527,151 @@ index c58fbc96391f8dcb585bd00b5ae8cba9088abd82..c121c891b61c9d60df770020c4ad0952
  
    if (mPump && mLoadFlags & LOAD_CALL_CONTENT_SNIFFERS) {
      mPump->PeekStream(CallTypeSniffers, static_cast<nsIChannel*>(this));
+diff --git a/netwerk/protocol/http/InterceptedHttpChannel.h b/netwerk/protocol/http/InterceptedHttpChannel.h
+index 704404c9f094640ad63b685d64bd5a396e733e4b..92bdc21b4d6a015cc2f2bb22781ec6750c7789ec 100644
+--- a/netwerk/protocol/http/InterceptedHttpChannel.h
++++ b/netwerk/protocol/http/InterceptedHttpChannel.h
+@@ -90,6 +90,11 @@ class InterceptedHttpChannel final
+   Atomic<bool> mCallingStatusAndProgress;
+   bool mInterceptionReset{false};
+ 
++  // ----- Playwright begin -----
++  // After resetInterception is called, this request will call into interceptors again.
++  bool mInterceptAfterServiceWorkerResets{false};
++  // ----- Playwright end -------
++
+   /**
+    *  InterceptionTimeStamps is used to record the time stamps of the
+    *  interception.
+diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
+index e4479400a4c574f652befbee7d83bd664aa2b840..2761dce9477f7f1622a82fe1da6472597ae82534 100644
+--- a/netwerk/protocol/http/nsHttpChannel.cpp
++++ b/netwerk/protocol/http/nsHttpChannel.cpp
+@@ -688,11 +688,9 @@ nsresult nsHttpChannel::OnBeforeConnect() {
+   // SecurityInfo.sys.mjs
+   mLoadInfo->SetHstsStatus(isSecureURI);
+ 
+-  RefPtr<mozilla::dom::BrowsingContext> bc;
+-  mLoadInfo->GetBrowsingContext(getter_AddRefs(bc));
+   // If bypassing the cache and we're forced offline
+   // we can just return the error here.
+-  if (bc && bc->Top()->GetForceOffline() &&
++  if (IsForcedOffline() &&
+       BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) {
+     return NS_ERROR_OFFLINE;
+   }
+@@ -805,9 +803,7 @@ nsresult nsHttpChannel::MaybeUseHTTPSRRForUpgrade(bool aShouldUpgrade,
+     return aStatus;
+   }
+ 
+-  RefPtr<mozilla::dom::BrowsingContext> bc;
+-  mLoadInfo->GetBrowsingContext(getter_AddRefs(bc));
+-  bool forceOffline = bc && bc->Top()->GetForceOffline();
++  bool forceOffline = IsForcedOffline();
+ 
+   if (mURI->SchemeIs("https") || aShouldUpgrade || !LoadUseHTTPSSVC() ||
+       forceOffline) {
+@@ -1266,15 +1262,14 @@ nsresult nsHttpChannel::ContinueConnect() {
+                      "CORS preflight must have been finished by the time we "
+                      "do the rest of ContinueConnect");
+ 
+-  RefPtr<mozilla::dom::BrowsingContext> bc;
+-  mLoadInfo->GetBrowsingContext(getter_AddRefs(bc));
++  bool isForcedOffline = IsForcedOffline();
+ 
+   // we may or may not have a cache entry at this point
+   if (mCacheEntry) {
+     // read straight from the cache if possible...
+     if (CachedContentIsValid()) {
+       // If we're forced offline, and set to bypass the cache, return offline.
+-      if (bc && bc->Top()->GetForceOffline() &&
++      if (isForcedOffline &&
+           BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass())) {
+         return NS_ERROR_OFFLINE;
+       }
+@@ -1316,7 +1311,7 @@ nsresult nsHttpChannel::ContinueConnect() {
+   }
+ 
+   // We're about to hit the network. Don't if we're forced offline.
+-  if (bc && bc->Top()->GetForceOffline()) {
++  if (isForcedOffline) {
+     return NS_ERROR_OFFLINE;
+   }
+ 
+@@ -1421,12 +1416,9 @@ void nsHttpChannel::SpeculativeConnect() {
+   // don't speculate if we are offline, when doing http upgrade (i.e.
+   // websockets bootstrap), or if we can't do keep-alive (because then we
+   // couldn't reuse the speculative connection anyhow).
+-  RefPtr<mozilla::dom::BrowsingContext> bc;
+-  mLoadInfo->GetBrowsingContext(getter_AddRefs(bc));
+-
+   if (gIOService->IsOffline() || mUpgradeProtocolCallback ||
+       !(mCaps & NS_HTTP_ALLOW_KEEPALIVE) ||
+-      (bc && bc->Top()->GetForceOffline())) {
++      IsForcedOffline()) {
+     return;
+   }
+ 
+@@ -4214,9 +4206,6 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+   uint32_t cacheEntryOpenFlags;
+   bool offline = gIOService->IsOffline();
+ 
+-  RefPtr<mozilla::dom::BrowsingContext> bc;
+-  mLoadInfo->GetBrowsingContext(getter_AddRefs(bc));
+-
+   bool maybeRCWN = false;
+ 
+   nsAutoCString cacheControlRequestHeader;
+@@ -4227,7 +4216,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(bool isHttps) {
+     return NS_OK;
+   }
+ 
+-  bool forceOffline = bc && bc->Top()->GetForceOffline();
++  bool forceOffline = IsForcedOffline();
+   if (offline || (mLoadFlags & INHIBIT_CACHING) || forceOffline) {
+     if (BYPASS_LOCAL_CACHE(mLoadFlags, LoadPreferCacheLoadOverBypass()) &&
+         !offline && !forceOffline) {
+@@ -7300,6 +7289,20 @@ void nsHttpChannel::MaybeStartDNSPrefetch() {
+   }
+ }
+ 
++bool nsHttpChannel::IsForcedOffline() {
++  RefPtr<mozilla::dom::BrowsingContext> bc;
++  mLoadInfo->GetBrowsingContext(getter_AddRefs(bc));
++  if (bc && bc->Top()->GetForceOffline())
++    return true;
++
++  RefPtr<mozilla::dom::BrowsingContext> wbc;
++  mLoadInfo->GetWorkerAssociatedBrowsingContext(getter_AddRefs(wbc));
++  if (wbc && wbc->Top()->GetForceOffline())
++    return true;
++
++  return false;
++}
++
+ NS_IMETHODIMP
+ nsHttpChannel::GetEncodedBodySize(uint64_t* aEncodedBodySize) {
+   if (mCacheEntry && !LoadCacheEntryIsWriteOnly()) {
+diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
+index cb8b8b7406411edceb30aa53c9b9007a38058f84..ebdc5384ca20feda399b70532a3036174f1a7431 100644
+--- a/netwerk/protocol/http/nsHttpChannel.h
++++ b/netwerk/protocol/http/nsHttpChannel.h
+@@ -307,6 +307,10 @@ class nsHttpChannel final : public HttpBaseChannel,
+   void MaybeResolveProxyAndBeginConnect();
+   void MaybeStartDNSPrefetch();
+ 
++  // ---- Playwright begin
++  bool IsForcedOffline();
++  // ---- Playwright end
++
+   // Based on the proxy configuration determine the strategy for resolving the
+   // end server host name.
+   ProxyDNSStrategy GetProxyDNSStrategy();
 diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp
-index f2c47c42a6b6448ede3a6fef1510a3982336d5af..9e35df57102c93238de2e4d548bbe1205d227f3b 100644
+index d3b44cc62d3df49bbf842356cbdb153c82c3163c..23cf9bc83fb1faaf1c7406331b78e522b307cbf0 100644
 --- a/parser/html/nsHtml5TreeOpExecutor.cpp
 +++ b/parser/html/nsHtml5TreeOpExecutor.cpp
-@@ -1382,6 +1382,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta(
+@@ -1349,6 +1349,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta(
  void nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP) {
    NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
  
@@ -2418,10 +2683,10 @@ index f2c47c42a6b6448ede3a6fef1510a3982336d5af..9e35df57102c93238de2e4d548bbe120
    nsCOMPtr<nsIContentSecurityPolicy> preloadCsp = mDocument->GetPreloadCsp();
    if (!preloadCsp) {
 diff --git a/security/manager/ssl/nsCertOverrideService.cpp b/security/manager/ssl/nsCertOverrideService.cpp
-index b8d0bbc3a12f74c19284b26eadada361abeb7946..a50379c57158748684e2ea5065550af81c1e9b86 100644
+index 8413eb5916f1f857e18972a14292d14f32684aee..66a3c7b01fdc56c29d789ff786aa91d8b0f02cd6 100644
 --- a/security/manager/ssl/nsCertOverrideService.cpp
 +++ b/security/manager/ssl/nsCertOverrideService.cpp
-@@ -438,7 +438,12 @@ nsCertOverrideService::HasMatchingOverride(
+@@ -433,7 +433,12 @@ nsCertOverrideService::HasMatchingOverride(
    bool disableAllSecurityCheck = false;
    {
      MutexAutoLock lock(mMutex);
@@ -2435,7 +2700,7 @@ index b8d0bbc3a12f74c19284b26eadada361abeb7946..a50379c57158748684e2ea5065550af8
    }
    if (disableAllSecurityCheck) {
      *aIsTemporary = false;
-@@ -650,14 +655,24 @@ static bool IsDebugger() {
+@@ -645,14 +650,24 @@ static bool IsDebugger() {
  
  NS_IMETHODIMP
  nsCertOverrideService::
@@ -2491,10 +2756,10 @@ index 6dfd07d6b676a99993408921de8dea9d561f201d..e3c6794363cd6336effbeac83a179f37
    readonly attribute boolean securityCheckDisabled;
  };
 diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs
-index 73c83e526be1a3a252f995d0718e3975d50bffa7..db5977c54221e19e107a8325a0834302c2e84546 100644
+index d3643aedf21a26594268a47bc0f6ac53e3977f75..795c6f3b28278b9f65a596799d4e424880fcffa7 100644
 --- a/services/settings/Utils.sys.mjs
 +++ b/services/settings/Utils.sys.mjs
-@@ -95,7 +95,7 @@ function _isUndefined(value) {
+@@ -97,7 +97,7 @@ const _cdnURLs = {};
  
  export var Utils = {
    get SERVER_URL() {
@@ -2503,7 +2768,7 @@ index 73c83e526be1a3a252f995d0718e3975d50bffa7..db5977c54221e19e107a8325a0834302
        ? lazy.gServerURL
        : AppConstants.REMOTE_SETTINGS_SERVER_URL;
    },
-@@ -108,6 +108,9 @@ export var Utils = {
+@@ -110,6 +110,9 @@ export var Utils = {
    log,
  
    get shouldSkipRemoteActivityDueToTests() {
@@ -2513,31 +2778,8 @@ index 73c83e526be1a3a252f995d0718e3975d50bffa7..db5977c54221e19e107a8325a0834302
      return (
        (lazy.isRunningTests || Cu.isInAutomation) &&
        this.SERVER_URL == "data:,#remote-settings-dummy/v1"
-diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
-index 8de45d95c2b942f069c898c93702bc7db2219369..be72e9678c3de31b1eaa72cfcb2c8be886f4a80f 100644
---- a/servo/components/style/gecko/media_features.rs
-+++ b/servo/components/style/gecko/media_features.rs
-@@ -292,10 +292,15 @@ pub enum ForcedColors {
- 
- /// https://drafts.csswg.org/mediaqueries-5/#forced-colors
- fn eval_forced_colors(context: &Context, query_value: Option<ForcedColors>) -> bool {
--    let forced = !context.device().use_document_colors();
-+    let prefers_forced_colors =
-+        unsafe { bindings::Gecko_MediaFeatures_ForcedColors(context.device().document()) };
-+    let query_value = match query_value {
-+        Some(v) => v,
-+        None => return prefers_forced_colors,
-+    };
-     match query_value {
--        Some(query_value) => forced == (query_value == ForcedColors::Active),
--        None => forced,
-+        ForcedColors::Active => prefers_forced_colors,
-+        ForcedColors::None => !prefers_forced_colors,
-     }
- }
- 
 diff --git a/toolkit/components/browser/nsIWebBrowserChrome.idl b/toolkit/components/browser/nsIWebBrowserChrome.idl
-index 517c87a285dd93220cb2654d6ba7bb05c66cdeb7..e3010421d8dbe5ed5ed72feedb9f15805b32503e 100644
+index 75555352b8a15a50e4a21e34fc8ede4e9246c7cc..72855a404effa42b6c55cd0c2fcb8bdd6c2b3f9f 100644
 --- a/toolkit/components/browser/nsIWebBrowserChrome.idl
 +++ b/toolkit/components/browser/nsIWebBrowserChrome.idl
 @@ -74,6 +74,9 @@ interface nsIWebBrowserChrome : nsISupports
@@ -2551,27 +2793,58 @@ index 517c87a285dd93220cb2654d6ba7bb05c66cdeb7..e3010421d8dbe5ed5ed72feedb9f1580
      // ignored for Linux.
      const unsigned long CHROME_SUPPRESS_ANIMATION     = 1 << 24;
 diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
-index 15fa2193c6116b5bd0cf2ee608eb5971f3d24370..aa92eb63b8f907e0df9ef8df60fd076aa3d6a472 100644
+index 76fb919603e8d2b7864d351eb47be2a38e40e31e..9f1e880fe9027d1a2540ffeaa11fc0c4e1a36133 100644
 --- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
 +++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs
-@@ -108,6 +108,12 @@ EnterprisePoliciesManager.prototype = {
+@@ -108,7 +108,9 @@ EnterprisePoliciesManager.prototype = {
        Services.prefs.clearUserPref(PREF_POLICIES_APPLIED);
      }
  
-+    // Playwright: Disable enterprise policies
-+    if (true) {
-+      this.status = Ci.nsIEnterprisePolicies.INACTIVE;
-+      return;
-+    }
-+
-     let provider = this._chooseProvider();
+-    let provider = this._chooseProvider();
++    // --- Playwright begin ---
++    let provider = new PlaywrightPoliciesProvider();
++    // --- Playwright end ---
  
      if (provider.failed) {
+       this.status = Ci.nsIEnterprisePolicies.FAILED;
+@@ -631,6 +633,19 @@ class JSONPoliciesProvider {
+   }
+ }
+ 
++class PlaywrightPoliciesProvider extends JSONPoliciesProvider {
++  _getConfigurationFile() {
++    let prefPath = Services.prefs.getStringPref(PREF_ALTERNATE_PATH, "");
++    if (!prefPath)
++      return null;
++
++    dump(`Playwright: loading enterprise policies from ${prefPath}\n`);
++    let configFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
++    configFile.initWithPath(prefPath);
++    return configFile;
++  }
++}
++
+ class WindowsGPOPoliciesProvider {
+   constructor() {
+     this._policies = null;
+diff --git a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
+index 253171bed4dea54fc28bb4ddc9920823dbd9351c..6dc0e620b399ed9ee6b53f97bc080ec17ee4e1b5 100644
+--- a/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
++++ b/toolkit/components/resistfingerprinting/nsUserCharacteristics.cpp
+@@ -490,7 +490,7 @@ void PopulateLanguages() {
+   // sufficient to only collect this information as the other properties are
+   // just reformats of Navigator::GetAcceptLanguages.
+   nsTArray<nsString> languages;
+-  dom::Navigator::GetAcceptLanguages(languages);
++  dom::Navigator::GetAcceptLanguages(nullptr, languages);
+   nsCString output = "["_ns;
+ 
+   for (const auto& language : languages) {
 diff --git a/toolkit/components/startup/nsAppStartup.cpp b/toolkit/components/startup/nsAppStartup.cpp
-index 3314cb813f6ceb67096eeda0864ad3b16c0616cb..5aac63649e186d624a9905a5d16513f8353f5515 100644
+index dc0826f72134b91482e30d183ddf52e95146e12f..119a324e162b6965ddd3d6b2d53bd2856a174452 100644
 --- a/toolkit/components/startup/nsAppStartup.cpp
 +++ b/toolkit/components/startup/nsAppStartup.cpp
-@@ -371,7 +371,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
+@@ -361,7 +361,7 @@ nsAppStartup::Quit(uint32_t aMode, int aExitCode, bool* aUserAllowedQuit) {
      nsCOMPtr<nsISimpleEnumerator> windowEnumerator;
      nsCOMPtr<nsIWindowMediator> mediator(
          do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
@@ -2596,10 +2869,10 @@ index 654903fadb709be976b72f36f155e23bc0622152..815b3dc24c9fda6b1db6c4666ac68904
                                          int32_t aMaxSelfProgress,
                                          int32_t aCurTotalProgress,
 diff --git a/toolkit/components/windowwatcher/nsWindowWatcher.cpp b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-index 209af157a35cf9c4586424421ee19b3f680796b6..1feb61e2f18e9a13631addc935f00da07739291e 100644
+index 811fb16410e8cf900ad873797269e5fe715579a5..821f5b0c2af8e1dc8754cd023571d1d0ff09eeb6 100644
 --- a/toolkit/components/windowwatcher/nsWindowWatcher.cpp
 +++ b/toolkit/components/windowwatcher/nsWindowWatcher.cpp
-@@ -1853,7 +1853,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
+@@ -1880,7 +1880,11 @@ uint32_t nsWindowWatcher::CalculateChromeFlagsForContent(
  
    // Open a minimal popup.
    *aIsPopupRequested = true;
@@ -2613,23 +2886,23 @@ index 209af157a35cf9c4586424421ee19b3f680796b6..1feb61e2f18e9a13631addc935f00da0
  
  /**
 diff --git a/toolkit/mozapps/update/UpdateService.sys.mjs b/toolkit/mozapps/update/UpdateService.sys.mjs
-index 34bf1b9e19ae54f78d134b023af96820bc13a905..b85793edcd1996833420a026cb08706d648ece14 100644
+index 40f04aeace0efd701e9454bb8dc6260dec90807e..5b70f65f3e78fc0889b15651ff203bb82e79d202 100644
 --- a/toolkit/mozapps/update/UpdateService.sys.mjs
 +++ b/toolkit/mozapps/update/UpdateService.sys.mjs
-@@ -3852,6 +3852,8 @@ UpdateService.prototype = {
-   },
+@@ -3814,6 +3814,8 @@ export class UpdateService {
+   }
  
    get disabledForTesting() {
 +    /* playwright */
 +    return true;
-     return (
-       (Cu.isInAutomation ||
-         lazy.Marionette.running ||
+     return lazy.UpdateServiceStub.updateDisabledForTesting;
+   }
+ 
 diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
-index b697eb1e3b02b0ffcc95a6e492dc23eb888488cc..0f4059341dbb3c2ecb2c46be0850e0d56e2a7453 100644
+index c50b7f3932e18da9fad4b673e353974a001e78c4..708e0d75594ddcd62276d4e08c4bd5c64d7f0698 100644
 --- a/toolkit/toolkit.mozbuild
 +++ b/toolkit/toolkit.mozbuild
-@@ -155,6 +155,7 @@ if CONFIG["ENABLE_WEBDRIVER"]:
+@@ -152,6 +152,7 @@ if CONFIG["ENABLE_WEBDRIVER"]:
          "/remote",
          "/testing/firefox-ui",
          "/testing/marionette",
@@ -2638,7 +2911,7 @@ index b697eb1e3b02b0ffcc95a6e492dc23eb888488cc..0f4059341dbb3c2ecb2c46be0850e0d5
      ]
  
 diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
-index 2a91deec5c10f87ed09f99b659baab77b2b638f2..78f4f30a0efe314563c6405f7b0848d2c3ca0551 100644
+index 7eb9e1104682d4eb47060654f43a1efa8b2a6bb2..a8315d6decf654b5302bea5beeea34140c300ded 100644
 --- a/toolkit/xre/nsWindowsWMain.cpp
 +++ b/toolkit/xre/nsWindowsWMain.cpp
 @@ -14,8 +14,10 @@
@@ -2652,10 +2925,10 @@ index 2a91deec5c10f87ed09f99b659baab77b2b638f2..78f4f30a0efe314563c6405f7b0848d2
  #include <windows.h>
  
  #ifdef __MINGW32__
-@@ -137,6 +139,19 @@ int wmain(int argc, WCHAR** argv) {
+@@ -114,6 +116,19 @@ static void FreeAllocStrings(int argc, char** argv) {
+ int wmain(int argc, WCHAR** argv) {
    SanitizeEnvironmentVariables();
    SetDllDirectoryW(L"");
-   RemovePrefetchArguments(argc, argv);
 +  bool hasJugglerPipe =
 +      mozilla::CheckArg(argc, argv, "juggler-pipe", nullptr,
 +                        mozilla::CheckArgFlag::None) == mozilla::ARG_FOUND;
@@ -2673,10 +2946,10 @@ index 2a91deec5c10f87ed09f99b659baab77b2b638f2..78f4f30a0efe314563c6405f7b0848d2
    // Only run this code if LauncherProcessWin.h was included beforehand, thus
    // signalling that the hosting process should support launcher mode.
 diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp
-index fe72a2715da8846146377e719559c16e6ef1f7ff..a5959143bac8f62ee359fa3883a844f3fe541685 100644
+index e5cc386651e192710b61858ab5625c97a02b92da..e560ad4fef232a26ce1e1b244f4ccea05f4aea71 100644
 --- a/uriloader/base/nsDocLoader.cpp
 +++ b/uriloader/base/nsDocLoader.cpp
-@@ -813,6 +813,12 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout,
+@@ -812,6 +812,12 @@ void nsDocLoader::DocLoaderIsEmpty(bool aFlushLayout,
                        ("DocLoader:%p: Firing load event for document.open\n",
                         this));
  
@@ -2690,7 +2963,7 @@ index fe72a2715da8846146377e719559c16e6ef1f7ff..a5959143bac8f62ee359fa3883a844f3
                // nsDocumentViewer::LoadComplete that doesn't do various things
                // that are not relevant here because this wasn't an actual
 diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
-index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295ea050b878 100644
+index e23df8e6f982ea71eb1f07dd677ed13109d2831b..d98f49d34a346113fd0ed5c242d5ef228ea0e0cd 100644
 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp
 +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
 @@ -112,6 +112,7 @@
@@ -2701,7 +2974,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
  #include "mozilla/Preferences.h"
  #include "mozilla/ipc/URIUtils.h"
  
-@@ -831,6 +832,12 @@ NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(
+@@ -865,6 +866,12 @@ NS_IMETHODIMP nsExternalHelperAppService::ApplyDecodingForExtension(
    return NS_OK;
  }
  
@@ -2714,9 +2987,9 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
  nsresult nsExternalHelperAppService::GetFileTokenForPath(
      const char16_t* aPlatformAppPath, nsIFile** aFile) {
    nsDependentString platformAppPath(aPlatformAppPath);
-@@ -1442,7 +1449,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
+@@ -1486,7 +1493,12 @@ nsresult nsExternalAppHandler::SetUpTempFile(nsIChannel* aChannel) {
    // Strip off the ".part" from mTempLeafName
-   mTempLeafName.Truncate(mTempLeafName.Length() - ArrayLength(".part") + 1);
+   mTempLeafName.Truncate(mTempLeafName.Length() - std::size(".part") + 1);
  
 +  return CreateSaverForTempFile();
 +}
@@ -2727,7 +3000,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
    mSaver =
        do_CreateInstance(NS_BACKGROUNDFILESAVERSTREAMLISTENER_CONTRACTID, &rv);
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1631,7 +1643,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1672,7 +1684,36 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
      return NS_OK;
    }
  
@@ -2765,7 +3038,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
    if (NS_FAILED(rv)) {
      nsresult transferError = rv;
  
-@@ -1683,6 +1724,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
+@@ -1733,6 +1774,9 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest* request) {
  
    bool alwaysAsk = true;
    mMimeInfo->GetAlwaysAskBeforeHandling(&alwaysAsk);
@@ -2775,7 +3048,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
    if (alwaysAsk) {
      // But we *don't* ask if this mimeInfo didn't come from
      // our user configuration datastore and the user has said
-@@ -2199,6 +2243,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
+@@ -2249,6 +2293,16 @@ nsExternalAppHandler::OnSaveComplete(nsIBackgroundFileSaver* aSaver,
      NotifyTransfer(aStatus);
    }
  
@@ -2792,7 +3065,7 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
    return NS_OK;
  }
  
-@@ -2680,6 +2734,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
+@@ -2732,6 +2786,15 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) {
      }
    }
  
@@ -2809,10 +3082,10 @@ index 4573e28470c5112f5ac2c5dd53e7a9d1ceedb943..b53b86d8e39f1de4b0d0f1a8d5d7295e
    // OnStartRequest)
    mDialog = nullptr;
 diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h
-index 1f77e095dbfa3acc046779114007d83fc1cfa087..2354abbab7af6f6bdc3bd628722f03ea401d236a 100644
+index 2dd4ff87bda3e0ba395cca168c42b37db1713ddf..83e8a3d328e325b3f50f593c9ea71692f9c7d401 100644
 --- a/uriloader/exthandler/nsExternalHelperAppService.h
 +++ b/uriloader/exthandler/nsExternalHelperAppService.h
-@@ -257,6 +257,8 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService,
+@@ -258,6 +258,8 @@ class nsExternalHelperAppService : public nsIExternalHelperAppService,
        mozilla::dom::BrowsingContext* aContentContext, bool aForceSave,
        nsIInterfaceRequestor* aWindowContext,
        nsIStreamListener** aStreamListener);
@@ -2821,7 +3094,7 @@ index 1f77e095dbfa3acc046779114007d83fc1cfa087..2354abbab7af6f6bdc3bd628722f03ea
  };
  
  /**
-@@ -462,6 +464,9 @@ class nsExternalAppHandler final : public nsIStreamListener,
+@@ -455,6 +457,9 @@ class nsExternalAppHandler final : public nsIStreamListener,
     * Upon successful return, both mTempFile and mSaver will be valid.
     */
    nsresult SetUpTempFile(nsIChannel* aChannel);
@@ -2832,7 +3105,7 @@ index 1f77e095dbfa3acc046779114007d83fc1cfa087..2354abbab7af6f6bdc3bd628722f03ea
     * When we download a helper app, we are going to retarget all load
     * notifications into our own docloader and load group instead of
 diff --git a/uriloader/exthandler/nsIExternalHelperAppService.idl b/uriloader/exthandler/nsIExternalHelperAppService.idl
-index 4a399acb72d4fd475c9ae43e9eadbc32f261e290..31e9490a7dfd7d7eff69ad23c9ce277f367d1524 100644
+index 53ea934dd4876e4b491b724385c8fbf7d00ee6cd..0b7b88c853b21ce778d8e87fea0a2bfe839ad412 100644
 --- a/uriloader/exthandler/nsIExternalHelperAppService.idl
 +++ b/uriloader/exthandler/nsIExternalHelperAppService.idl
 @@ -6,8 +6,11 @@
@@ -2857,7 +3130,7 @@ index 4a399acb72d4fd475c9ae43e9eadbc32f261e290..31e9490a7dfd7d7eff69ad23c9ce277f
 +[scriptable, uuid(9a20e9b0-75d0-11ea-bc55-0242ac130003)]
 +interface nsIDownloadInterceptor : nsISupports
 +{
-+  bool interceptDownloadRequest(in nsIHelperAppLauncher aHandler, in nsIRequest aRequest, in BrowsingContext aBrowsingContext, out nsIFile file);
++  boolean interceptDownloadRequest(in nsIHelperAppLauncher aHandler, in nsIRequest aRequest, in BrowsingContext aBrowsingContext, out nsIFile file);
 +
 +  void onDownloadComplete(in nsIHelperAppLauncher aHandler, in ACString aErrorName);
 +};
@@ -2865,10 +3138,11 @@ index 4a399acb72d4fd475c9ae43e9eadbc32f261e290..31e9490a7dfd7d7eff69ad23c9ce277f
  /**
   * The external helper app service is used for finding and launching
   * platform specific external applications for a given mime content type.
-@@ -76,6 +90,7 @@ interface nsIExternalHelperAppService : nsISupports
-   boolean applyDecodingForExtension(in AUTF8String aExtension,
-                                     in ACString aEncodingType);
- 
+@@ -87,6 +101,8 @@ interface nsIExternalHelperAppService : nsISupports
+    * `DownloadIntegration.sys.mjs`, which is implemented on all platforms.
+    */
+   nsIFile getPreferredDownloadsDirectory();
++
 +  void setDownloadInterceptor(in nsIDownloadInterceptor interceptor);
  };
  
@@ -2902,56 +3176,32 @@ index 1c25e9d9a101233f71e92288a0f93125b81ac1c5..22cf67b0f6e3ddd2b3ed725a314ba6a9
  }
  #endif
 diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
-index d29b406524c8b4afe437b559e33b4b2b5824ee58..6bef9c1657f93f90f96735d76fedb6ba3888b5c1 100644
+index 5ca1a6fa13233b1bd00ee0467732c5875c51d343..0d3b8ebe127e59516802e8819f4bbed961f0992b 100644
 --- a/widget/MouseEvents.h
 +++ b/widget/MouseEvents.h
-@@ -258,6 +258,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
-       : mReason(eReal),
-         mContextMenuTrigger(eNormal),
-         mClickCount(0),
-+        mJugglerEventId(0),
-         mIgnoreRootScrollFrame(false),
-         mClickEventPrevented(false) {}
- 
-@@ -269,6 +270,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
-         mReason(aReason),
-         mContextMenuTrigger(eNormal),
-         mClickCount(0),
-+        mJugglerEventId(0),
-         mIgnoreRootScrollFrame(false),
-         mClickEventPrevented(false) {}
- 
-@@ -288,6 +290,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
-         mReason(aReason),
-         mContextMenuTrigger(aContextMenuTrigger),
-         mClickCount(0),
-+        mJugglerEventId(0),
-         mIgnoreRootScrollFrame(false),
-         mClickEventPrevented(false) {
-     if (aMessage == eContextMenu) {
-@@ -336,6 +339,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+@@ -368,6 +368,9 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
    // Otherwise, this must be 0.
-   uint32_t mClickCount;
+   uint32_t mClickCount = 0;
  
 +  // Unique event ID
-+  uint32_t mJugglerEventId;
++  uint32_t mJugglerEventId = 0;
 +
    // Whether the event should ignore scroll frame bounds during dispatch.
-   bool mIgnoreRootScrollFrame;
- 
-@@ -348,6 +354,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+   bool mIgnoreRootScrollFrame = false;
  
+@@ -391,6 +394,7 @@ class WidgetMouseEvent : public WidgetMouseEventBase,
+     mContextMenuTrigger = aEvent.mContextMenuTrigger;
      mExitFrom = aEvent.mExitFrom;
      mClickCount = aEvent.mClickCount;
 +    mJugglerEventId = aEvent.mJugglerEventId;
      mIgnoreRootScrollFrame = aEvent.mIgnoreRootScrollFrame;
+     mIgnoreCapturingContent = aEvent.mIgnoreCapturingContent;
      mClickEventPrevented = aEvent.mClickEventPrevented;
-   }
 diff --git a/widget/cocoa/NativeKeyBindings.mm b/widget/cocoa/NativeKeyBindings.mm
-index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce8050630a1aa 100644
+index 24b70173c2e8bb9be9fd6255984a70efe3b14099..75ac367a1c4bb44d4b68b5f4ecc6adf56dbd408e 100644
 --- a/widget/cocoa/NativeKeyBindings.mm
 +++ b/widget/cocoa/NativeKeyBindings.mm
-@@ -528,6 +528,13 @@
+@@ -549,6 +549,13 @@
        break;
      case KEY_NAME_INDEX_ArrowLeft:
        if (aEvent.IsAlt()) {
@@ -2965,7 +3215,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
          break;
        }
        if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) {
-@@ -550,6 +557,13 @@
+@@ -571,6 +578,13 @@
        break;
      case KEY_NAME_INDEX_ArrowRight:
        if (aEvent.IsAlt()) {
@@ -2979,7 +3229,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
          break;
        }
        if (aEvent.IsMeta() || (aEvent.IsControl() && aEvent.IsShift())) {
-@@ -572,6 +586,10 @@
+@@ -593,6 +607,10 @@
        break;
      case KEY_NAME_INDEX_ArrowUp:
        if (aEvent.IsControl()) {
@@ -2990,7 +3240,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
          break;
        }
        if (aEvent.IsMeta()) {
-@@ -582,7 +600,7 @@
+@@ -603,7 +621,7 @@
              !aEvent.IsShift()
                  ? ToObjcSelectorPtr(@selector(moveToBeginningOfDocument:))
                  : ToObjcSelectorPtr(
@@ -2999,7 +3249,7 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
              aCommands);
          break;
        }
-@@ -609,6 +627,10 @@
+@@ -630,6 +648,10 @@
        break;
      case KEY_NAME_INDEX_ArrowDown:
        if (aEvent.IsControl()) {
@@ -3010,6 +3260,18 @@ index e4bdf715e2fb899e97a5bfeb2e147127460d6047..3554f919480278b7353617481c7ce805
          break;
        }
        if (aEvent.IsMeta()) {
+diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
+index f4bded345e95674c66e4d4ad56b50844fce0871b..321e22d334a8bbc6057ee78e77e139a2804b2403 100644
+--- a/widget/gtk/nsFilePicker.cpp
++++ b/widget/gtk/nsFilePicker.cpp
+@@ -21,6 +21,7 @@
+ #include "mozilla/Components.h"
+ #include "mozilla/Preferences.h"
+ #include "mozilla/dom/Promise.h"
++#include "gfxPlatform.h"
+ 
+ #include "nsArrayEnumerator.h"
+ #include "nsEnumeratorUtils.h"
 diff --git a/widget/headless/HeadlessCompositorWidget.cpp b/widget/headless/HeadlessCompositorWidget.cpp
 index bb4ee9175e66dc40de1871a7f91368fe309494a3..747625e3869882300bfbc18b184db5151dd90c1a 100644
 --- a/widget/headless/HeadlessCompositorWidget.cpp
@@ -3160,7 +3422,7 @@ index facd2bc65afab8ec1aa322faa20a67464964dfb9..d6dea95472bec6006411753c3dfdab2e
  
  }  // namespace widget
 diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp
-index 083d026d3c019cb76fff2b8f605f3d6ef8dd578f..84c049709ead92c980b86230513a634bf6337085 100644
+index daa2d455374fd9f75a5c6ac9f7b91696d88b065c..f45184137b52db0a5774bf3365b15f784532fbdf 100644
 --- a/widget/headless/HeadlessWidget.cpp
 +++ b/widget/headless/HeadlessWidget.cpp
 @@ -111,6 +111,8 @@ void HeadlessWidget::Destroy() {
@@ -3172,7 +3434,7 @@ index 083d026d3c019cb76fff2b8f605f3d6ef8dd578f..84c049709ead92c980b86230513a634b
    nsBaseWidget::OnDestroy();
  
    nsBaseWidget::Destroy();
-@@ -621,5 +623,14 @@ nsresult HeadlessWidget::SynthesizeNativeTouchpadPan(
+@@ -593,5 +595,14 @@ nsresult HeadlessWidget::SynthesizeNativeTouchpadPan(
    return NS_OK;
  }
  
@@ -3188,12 +3450,12 @@ index 083d026d3c019cb76fff2b8f605f3d6ef8dd578f..84c049709ead92c980b86230513a634b
  }  // namespace widget
  }  // namespace mozilla
 diff --git a/widget/headless/HeadlessWidget.h b/widget/headless/HeadlessWidget.h
-index 9856991ef32f25f51942f8cd664a09bec2192c70..948947a421179e91c51005aeb83ed0d18cfc84ce 100644
+index 39833c28e40c61e354119cde429b8389056bafac..a638fb7520b857219ce58fcbf9ca0ed939528924 100644
 --- a/widget/headless/HeadlessWidget.h
 +++ b/widget/headless/HeadlessWidget.h
-@@ -141,6 +141,9 @@ class HeadlessWidget : public nsBaseWidget {
-                                                int32_t aModifierFlags,
-                                                nsIObserver* aObserver) override;
+@@ -132,6 +132,9 @@ class HeadlessWidget final : public nsBaseWidget {
+                                        int32_t aModifierFlags,
+                                        nsIObserver* aObserver) override;
  
 +  using SnapshotListener = std::function<void(RefPtr<gfx::DataSourceSurface>&&)>;
 +  void SetSnapshotListener(SnapshotListener&& listener);
@@ -3202,10 +3464,10 @@ index 9856991ef32f25f51942f8cd664a09bec2192c70..948947a421179e91c51005aeb83ed0d1
    ~HeadlessWidget();
    bool mEnabled;
 diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
-index 8ba46829357fc4acc47bf20842fd869902efa000..a1b5b2c5230d90981bd563d4df2d2bf1c2e05cef 100644
+index f7262978239665cbe20470da0790d4d177d4c501..70d11aca3d5b509cf5b37d626299a23fede73ba3 100644
 --- a/widget/nsGUIEventIPC.h
 +++ b/widget/nsGUIEventIPC.h
-@@ -234,6 +234,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
+@@ -244,6 +244,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
                                aParam.mExitFrom.value()));
      }
      WriteParam(aWriter, aParam.mClickCount);
@@ -3213,7 +3475,7 @@ index 8ba46829357fc4acc47bf20842fd869902efa000..a1b5b2c5230d90981bd563d4df2d2bf1
    }
  
    static bool Read(MessageReader* aReader, paramType* aResult) {
-@@ -258,6 +259,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
+@@ -268,6 +269,7 @@ struct ParamTraits<mozilla::WidgetMouseEvent> {
        aResult->mExitFrom = Some(static_cast<paramType::ExitFrom>(exitFrom));
      }
      rv = rv && ReadParam(aReader, &aResult->mClickCount);
@@ -3222,10 +3484,10 @@ index 8ba46829357fc4acc47bf20842fd869902efa000..a1b5b2c5230d90981bd563d4df2d2bf1
    }
  };
 diff --git a/xpcom/reflect/xptinfo/xptinfo.h b/xpcom/reflect/xptinfo/xptinfo.h
-index 2456c2c2b58b27cd595880b547ed20fb687a1835..e967c089b2331c7cd36d34e511543fbc84320b7d 100644
+index 787d30d881adedd57d2025ca57bff4bc6c57e803..ae1a0172c960ab16919133485722d2ae0cdbcbd4 100644
 --- a/xpcom/reflect/xptinfo/xptinfo.h
 +++ b/xpcom/reflect/xptinfo/xptinfo.h
-@@ -514,7 +514,7 @@ static_assert(sizeof(nsXPTMethodInfo) == 8, "wrong size");
+@@ -505,7 +505,7 @@ static_assert(sizeof(nsXPTMethodInfo) == 8, "wrong size");
  #if defined(MOZ_THUNDERBIRD) || defined(MOZ_SUITE)
  #  define PARAM_BUFFER_COUNT 18
  #else
diff --git a/browser_patches/firefox/preferences/playwright.cfg b/browser_patches/firefox/preferences/playwright.cfg
index 99fbf39420999..5dc8986c19c4d 100644
--- a/browser_patches/firefox/preferences/playwright.cfg
+++ b/browser_patches/firefox/preferences/playwright.cfg
@@ -8,6 +8,13 @@ pref("dom.input_events.security.minTimeElapsedInMS", 0);
 
 pref("dom.iframe_lazy_loading.enabled", false);
 
+// Allows a custom "policies.json" file.
+pref("browser.policies.alternatePath", getenv("PLAYWRIGHT_FIREFOX_POLICIES_JSON") || "");
+
+// This setting is experimental and is only enabled on early betas.
+// Disable it unconditionally since it breaks proxy tests.
+pref("dom.security.https_first", false);
+
 pref("datareporting.policy.dataSubmissionEnabled", false);
 pref("datareporting.policy.dataSubmissionPolicyAccepted", false);
 pref("datareporting.policy.dataSubmissionPolicyBypassNotification", true);
@@ -47,6 +54,9 @@ pref("permissions.isolateBy.userContext", true);
 // |Page.setFileInputFiles| protocol method.
 pref("dom.file.createInChild", true);
 
+// Allow uploading directorys in content process.
+pref("dom.filesystem.pathcheck.disabled", true);
+
 // Do not warn when closing all open tabs
 pref("browser.tabs.warnOnClose", false);
 
@@ -85,6 +95,18 @@ pref("geo.provider.testing", true);
 // THESE ARE NICHE PROPERTIES THAT ARE NICE TO HAVE
 // =================================================================
 
+// We never want to have interactive screen capture picker enabled in FF build.
+pref("media.getdisplaymedia.screencapturekit.enabled", false);
+pref("media.getdisplaymedia.screencapturekit.picker.enabled", false);
+
+// Allow proxying loopback URLs; see https://phabricator.services.mozilla.com/D237187
+pref("network.proxy.allow_hijacking_localhost", true);
+pref("network.proxy.testing_localhost_is_secure_when_hijacked", true);
+
+// Disable double-dispatching of "input" event for the text composition.
+// See https://phabricator.services.mozilla.com/D234620 for details.
+pref("dom.input_events.dispatch_before_compositionend", false);
+
 // Enable software-backed webgl. See https://phabricator.services.mozilla.com/D164016
 pref("webgl.forbid-software", false);
 
@@ -97,6 +119,11 @@ pref("extensions.formautofill.addresses.supported", "off");
 // firefox behavior with other browser defaults.
 pref("security.enterprise_roots.enabled", true);
 
+// There's a security features warning that might be shown on certain Linux distributions & configurations:
+// https://support.mozilla.org/en-US/kb/install-firefox-linux#w_security-features-warning
+// This notification should never be shown in automation scenarios.
+pref("security.sandbox.warn_unprivileged_namespaces", false);
+
 // Avoid stalling on shutdown, after "xpcom-will-shutdown" phase.
 // This at least happens when shutting down soon after launching.
 // See AppShutdown.cpp for more details on shutdown phases.
diff --git a/browser_patches/webkit/UPSTREAM_CONFIG.sh b/browser_patches/webkit/UPSTREAM_CONFIG.sh
index 069f24571c3c3..574e1f310aa7f 100644
--- a/browser_patches/webkit/UPSTREAM_CONFIG.sh
+++ b/browser_patches/webkit/UPSTREAM_CONFIG.sh
@@ -1,3 +1,3 @@
 REMOTE_URL="https://github.com/WebKit/WebKit.git"
 BASE_BRANCH="main"
-BASE_REVISION="b2ca06dc3d84b356d01cdf09a82049f80515fbfe"
+BASE_REVISION="153da00a252619799ba4b32cd0ac6c5b8faf6a35"
diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
index a6c7be8ae48a9..b4d08b700ac91 100644
--- a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
+++ b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m
@@ -33,6 +33,7 @@
 #import <WebKit/WKUserContentControllerPrivate.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
+#import <WebKit/WKWebpagePreferencesPrivate.h>
 #import <WebKit/WKWebsiteDataStorePrivate.h>
 #import <WebKit/WebNSURLExtras.h>
 #import <WebKit/WebKit.h>
@@ -97,7 +98,7 @@ - (id)init
 
     for (NSString *argument in subArray) {
         if (![argument hasPrefix:@"--"])
-            _initialURL = argument;
+            _initialURL = [argument copy];
         if ([argument hasPrefix:@"--user-data-dir="]) {
             NSRange range = NSMakeRange(16, [argument length] - 16);
             _userDataDir = [[argument substringWithRange:range] copy];
@@ -230,7 +231,7 @@ - (WKWebViewConfiguration *)defaultConfiguration
         configuration = [[WKWebViewConfiguration alloc] init];
         configuration.websiteDataStore = [self persistentDataStore];
         configuration._controlledByAutomation = true;
-        configuration.preferences._fullScreenEnabled = YES;
+        configuration.preferences.elementFullscreenEnabled = YES;
         configuration.preferences._developerExtrasEnabled = YES;
         configuration.preferences._mediaDevicesEnabled = YES;
         configuration.preferences._mockCaptureDevicesEnabled = YES;
@@ -240,6 +241,8 @@ - (WKWebViewConfiguration *)defaultConfiguration
         configuration.preferences._hiddenPageDOMTimerThrottlingAutoIncreases = NO;
         configuration.preferences._pageVisibilityBasedProcessSuppressionEnabled = NO;
         configuration.preferences._domTimersThrottlingEnabled = NO;
+        // Do not auto play audio and video with sound.
+        configuration.defaultWebpagePreferences._autoplayPolicy = _WKWebsiteAutoplayPolicyAllowWithoutSound;
         _WKProcessPoolConfiguration *processConfiguration = [[[_WKProcessPoolConfiguration alloc] init] autorelease];
         processConfiguration.forceOverlayScrollbars = YES;
         configuration.processPool = [[[WKProcessPool alloc] _initWithConfiguration:processConfiguration] autorelease];
diff --git a/browser_patches/webkit/embedder/Playwright/win/Common.cpp b/browser_patches/webkit/embedder/Playwright/win/Common.cpp
index 66dee5b68ba49..01a10f7be9ced 100644
--- a/browser_patches/webkit/embedder/Playwright/win/Common.cpp
+++ b/browser_patches/webkit/embedder/Playwright/win/Common.cpp
@@ -44,6 +44,8 @@ HINSTANCE hInst;
 POINT s_windowPosition = { 100, 100 };
 SIZE s_windowSize = { 500, 200 };
 
+bool s_headless;
+
 namespace WebCore {
 float deviceScaleFactorForWindow(HWND);
 }
diff --git a/browser_patches/webkit/embedder/Playwright/win/Common.h b/browser_patches/webkit/embedder/Playwright/win/Common.h
index 3c534fd3701c3..29edbe39dad34 100644
--- a/browser_patches/webkit/embedder/Playwright/win/Common.h
+++ b/browser_patches/webkit/embedder/Playwright/win/Common.h
@@ -64,6 +64,7 @@ std::wstring replaceString(std::wstring src, const std::wstring& oldValue, const
 extern HINSTANCE hInst;
 extern POINT s_windowPosition;
 extern SIZE s_windowSize;
+extern bool s_headless;
 
 std::wstring createString(WKStringRef wkString);
 std::wstring createString(WKURLRef wkURL);
diff --git a/browser_patches/webkit/embedder/Playwright/win/MainWindow.cpp b/browser_patches/webkit/embedder/Playwright/win/MainWindow.cpp
index e74590c491860..ca65ccb0221fc 100644
--- a/browser_patches/webkit/embedder/Playwright/win/MainWindow.cpp
+++ b/browser_patches/webkit/embedder/Playwright/win/MainWindow.cpp
@@ -48,12 +48,10 @@ static INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM);
 std::wstring MainWindow::s_windowClass;
 size_t MainWindow::s_numInstances;
 
-bool MainWindow::s_headless = false;
 bool MainWindow::s_controlledRemotely = false;
 bool MainWindow::s_disableAcceleratedCompositing = false;
 
-void MainWindow::configure(bool headless, bool controlledRemotely, bool disableAcceleratedCompositing) {
-    s_headless = headless;
+void MainWindow::configure(bool controlledRemotely, bool disableAcceleratedCompositing) {
     s_controlledRemotely = controlledRemotely;
     s_disableAcceleratedCompositing = disableAcceleratedCompositing;
 }
@@ -140,7 +138,7 @@ void MainWindow::createToolbar(HINSTANCE hInstance)
     SendMessage(m_hToolbarWnd, TB_ADDBUTTONS, _countof(tbButtons), reinterpret_cast<LPARAM>(&tbButtons));
     ShowWindow(m_hToolbarWnd, true);
 
-    m_hURLBarWnd = CreateWindow(L"EDIT", 0, WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT | ES_AUTOVSCROLL, 0, 0, 0, 0, m_hToolbarWnd, 0, hInstance, 0);
+    m_hURLBarWnd = CreateWindow(L"EDIT", 0, WS_CHILD | WS_VISIBLE | WS_BORDER | ES_LEFT | ES_AUTOHSCROLL, 0, 0, 0, 0, m_hToolbarWnd, 0, hInstance, 0);
 
     DefEditProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(m_hURLBarWnd, GWLP_WNDPROC));
     SetWindowLongPtr(m_hURLBarWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(EditProc));
@@ -210,7 +208,9 @@ bool MainWindow::init(HINSTANCE hInstance, WKPageConfigurationRef conf)
     resizeSubViews();
 
     if (s_headless) {
+        auto menu = GetMenu(m_hMainWnd);
         SetMenu(m_hMainWnd, NULL);
+        DestroyMenu(menu);
     } else {
         SetFocus(m_hURLBarWnd);
         ShowWindow(m_hMainWnd, SW_SHOW);
diff --git a/browser_patches/webkit/embedder/Playwright/win/MainWindow.h b/browser_patches/webkit/embedder/Playwright/win/MainWindow.h
index c34241fb1df15..e0af565f4b98b 100644
--- a/browser_patches/webkit/embedder/Playwright/win/MainWindow.h
+++ b/browser_patches/webkit/embedder/Playwright/win/MainWindow.h
@@ -35,7 +35,7 @@
 
 class MainWindow : public BrowserWindowClient {
 public:
-    static void configure(bool headless, bool controlledRemotely, bool disableAcceleratedCompositing);
+    static void configure(bool controlledRemotely, bool disableAcceleratedCompositing);
 
     MainWindow();
 
@@ -55,7 +55,6 @@ class MainWindow : public BrowserWindowClient {
     static void registerClass(HINSTANCE hInstance);
     static std::wstring s_windowClass;
     static size_t s_numInstances;
-    static bool s_headless;
     static bool s_controlledRemotely;
     static bool s_disableAcceleratedCompositing;
 
diff --git a/browser_patches/webkit/embedder/Playwright/win/Playwright.ico b/browser_patches/webkit/embedder/Playwright/win/Playwright.ico
index 0137fe83a54dd..cea0bdebc38b2 100644
Binary files a/browser_patches/webkit/embedder/Playwright/win/Playwright.ico and b/browser_patches/webkit/embedder/Playwright/win/Playwright.ico differ
diff --git a/browser_patches/webkit/embedder/Playwright/win/WebKitBrowserWindow.cpp b/browser_patches/webkit/embedder/Playwright/win/WebKitBrowserWindow.cpp
index ee4ea065a71b2..c850d820763a5 100644
--- a/browser_patches/webkit/embedder/Playwright/win/WebKitBrowserWindow.cpp
+++ b/browser_patches/webkit/embedder/Playwright/win/WebKitBrowserWindow.cpp
@@ -41,16 +41,18 @@
 #include <WebKit/WKWebsiteDataStoreRefCurl.h>
 #include <vector>
 
-std::wstring createPEMString(WKCertificateInfoRef certificateInfo)
+std::wstring createPEMString(WKProtectionSpaceRef protectionSpace)
 {
-    auto chainSize = WKCertificateInfoGetCertificateChainSize(certificateInfo);
+    auto chain = adoptWK(WKProtectionSpaceCopyCertificateChain(protectionSpace));
 
     std::wstring pems;
 
-    for (auto i = 0; i < chainSize; i++) {
-        auto certificate = adoptWK(WKCertificateInfoCopyCertificateAtIndex(certificateInfo, i));
-        auto size = WKDataGetSize(certificate.get());
-        auto data = WKDataGetBytes(certificate.get());
+    for (size_t i = 0; i < WKArrayGetSize(chain.get()); i++) {
+        auto item = WKArrayGetItemAtIndex(chain.get(), i);
+        assert(WKGetTypeID(item) == WKDataGetTypeID());
+        auto certificate = static_cast<WKDataRef>(item);
+        auto size = WKDataGetSize(certificate);
+        auto data = WKDataGetBytes(certificate);
 
         for (size_t i = 0; i < size; i++)
             pems.push_back(data[i]);
@@ -241,7 +243,7 @@ void WebKitBrowserWindow::didReceiveAuthenticationChallenge(WKPageRef page, WKAu
             WKAuthenticationDecisionListenerUseCredential(decisionListener, wkCredential.get());
             return;
         }
-    } else {
+    } else if (!s_headless) {
         WKRetainPtr<WKStringRef> realm(WKProtectionSpaceCopyRealm(protectionSpace));
 
         if (auto credential = askCredential(thisWindow.hwnd(), createString(realm.get()))) {
@@ -259,10 +261,9 @@ void WebKitBrowserWindow::didReceiveAuthenticationChallenge(WKPageRef page, WKAu
 bool WebKitBrowserWindow::canTrustServerCertificate(WKProtectionSpaceRef protectionSpace)
 {
     auto host = createString(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
-    auto certificateInfo = adoptWK(WKProtectionSpaceCopyCertificateInfo(protectionSpace));
-    auto verificationError = WKCertificateInfoGetVerificationError(certificateInfo.get());
-    auto description = createString(adoptWK(WKCertificateInfoCopyVerificationErrorDescription(certificateInfo.get())).get());
-    auto pem = createPEMString(certificateInfo.get());
+    auto verificationError = WKProtectionSpaceGetCertificateVerificationError(protectionSpace);
+    auto description = createString(adoptWK(WKProtectionSpaceCopyCertificateVerificationErrorDescription(protectionSpace)).get());
+    auto pem = createPEMString(protectionSpace);
 
     auto it = m_acceptedServerTrustCerts.find(host);
     if (it != m_acceptedServerTrustCerts.end() && it->second == pem)
@@ -273,6 +274,9 @@ bool WebKitBrowserWindow::canTrustServerCertificate(WKProtectionSpaceRef protect
     textString.append(L"[DESCRIPTION] " + description + L"\r\n");
     textString.append(pem);
 
+    if (s_headless)
+        return false;
+
     if (askServerTrustEvaluation(hwnd(), textString)) {
         m_acceptedServerTrustCerts.emplace(host, pem);
         return true;
diff --git a/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp b/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp
index d80ba9f7bd28c..2261c2b810d2e 100644
--- a/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp
+++ b/browser_patches/webkit/embedder/Playwright/win/WinMain.cpp
@@ -102,7 +102,8 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
     if (SetProcessDpiAwarenessContextPtr())
         SetProcessDpiAwarenessContextPtr()(DPI_AWARENESS_CONTEXT_UNAWARE);
 
-    MainWindow::configure(g_options.headless, g_options.inspectorPipe, g_options.disableAcceleratedCompositing);
+    s_headless = g_options.headless;
+    MainWindow::configure(g_options.inspectorPipe, g_options.disableAcceleratedCompositing);
 
     if (!g_options.noStartupWindow) {
         auto configuration = adoptWK(WKWebsiteDataStoreConfigurationCreate());
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index 5df5d455da9cc..9d644885f063b 100644
--- a/browser_patches/webkit/patches/bootstrap.diff
+++ b/browser_patches/webkit/patches/bootstrap.diff
@@ -1,8 +1,8 @@
 diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
-index dcd4c26b1cd99333e9498a483ff4139a8d42d14b..f041439eff7f2649b1560faf18661165b1fd7771 100644
+index 458e1d4118805169ee6f9139af942cc5c3f88f8e..238f2a33ba150fae735915244910eaa66f5fd267 100644
 --- a/Source/JavaScriptCore/CMakeLists.txt
 +++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1400,22 +1400,27 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
+@@ -1411,21 +1411,26 @@ set(JavaScriptCore_INSPECTOR_DOMAINS
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
@@ -10,7 +10,6 @@ index dcd4c26b1cd99333e9498a483ff4139a8d42d14b..f041439eff7f2649b1560faf18661165
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMDebugger.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMStorage.json
-     ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
 +    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Emulation.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
@@ -31,10 +30,10 @@ index dcd4c26b1cd99333e9498a483ff4139a8d42d14b..f041439eff7f2649b1560faf18661165
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/ServiceWorker.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Target.json
 diff --git a/Source/JavaScriptCore/DerivedSources-input.xcfilelist b/Source/JavaScriptCore/DerivedSources-input.xcfilelist
-index b26ef7b2b8f732160ddee36697a61ca7776fc2c3..9a442a4cda7efd7f2bd4e225d8bcbfedf8c4a0c5 100644
+index 9fd3a4e6a53eb3339ced1e87f0b4cacd16f73167..a77d72ab052625c7b5a4d7c56a71befbad884871 100644
 --- a/Source/JavaScriptCore/DerivedSources-input.xcfilelist
 +++ b/Source/JavaScriptCore/DerivedSources-input.xcfilelist
-@@ -98,21 +98,26 @@ $(PROJECT_DIR)/inspector/protocol/CPUProfiler.json
+@@ -98,20 +98,25 @@ $(PROJECT_DIR)/inspector/protocol/CPUProfiler.json
  $(PROJECT_DIR)/inspector/protocol/CSS.json
  $(PROJECT_DIR)/inspector/protocol/Canvas.json
  $(PROJECT_DIR)/inspector/protocol/Console.json
@@ -42,7 +41,6 @@ index b26ef7b2b8f732160ddee36697a61ca7776fc2c3..9a442a4cda7efd7f2bd4e225d8bcbfed
  $(PROJECT_DIR)/inspector/protocol/DOM.json
  $(PROJECT_DIR)/inspector/protocol/DOMDebugger.json
  $(PROJECT_DIR)/inspector/protocol/DOMStorage.json
- $(PROJECT_DIR)/inspector/protocol/Database.json
  $(PROJECT_DIR)/inspector/protocol/Debugger.json
 +$(PROJECT_DIR)/inspector/protocol/Emulation.json
  $(PROJECT_DIR)/inspector/protocol/GenericTypes.json
@@ -62,10 +60,10 @@ index b26ef7b2b8f732160ddee36697a61ca7776fc2c3..9a442a4cda7efd7f2bd4e225d8bcbfed
  $(PROJECT_DIR)/inspector/protocol/Security.json
  $(PROJECT_DIR)/inspector/protocol/ServiceWorker.json
 diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
-index 15d6e32cd525905b116f25a5bdd50bd1ef390cee..74b1415d21dcddc49e842e077e87e06724af8365 100644
+index 3db6c2e250371dedc6a9f88bf1688112d467434a..a3832759ea36fb50bdbea6809b9fd13e6f66e46b 100644
 --- a/Source/JavaScriptCore/DerivedSources.make
 +++ b/Source/JavaScriptCore/DerivedSources.make
-@@ -298,22 +298,27 @@ INSPECTOR_DOMAINS := \
+@@ -301,21 +301,26 @@ INSPECTOR_DOMAINS := \
      $(JavaScriptCore)/inspector/protocol/CSS.json \
      $(JavaScriptCore)/inspector/protocol/Canvas.json \
      $(JavaScriptCore)/inspector/protocol/Console.json \
@@ -73,7 +71,6 @@ index 15d6e32cd525905b116f25a5bdd50bd1ef390cee..74b1415d21dcddc49e842e077e87e067
      $(JavaScriptCore)/inspector/protocol/DOM.json \
      $(JavaScriptCore)/inspector/protocol/DOMDebugger.json \
      $(JavaScriptCore)/inspector/protocol/DOMStorage.json \
-     $(JavaScriptCore)/inspector/protocol/Database.json \
      $(JavaScriptCore)/inspector/protocol/Debugger.json \
 +    $(JavaScriptCore)/inspector/protocol/Emulation.json \
      $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
@@ -94,7 +91,7 @@ index 15d6e32cd525905b116f25a5bdd50bd1ef390cee..74b1415d21dcddc49e842e077e87e067
      $(JavaScriptCore)/inspector/protocol/ServiceWorker.json \
      $(JavaScriptCore)/inspector/protocol/Target.json \
 diff --git a/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp b/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp
-index 528cceee66a1b1c91a0d0e59d5f1a1770a050c17..0f3a341056f429ff282abcab22be4843c60f546c 100644
+index 9bc5d1fd8e2a7e576be046b3c6ae1266696cf552..610f810db1dd6865c500c0796386a8284f4178e9 100644
 --- a/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp
 +++ b/Source/JavaScriptCore/inspector/IdentifiersFactory.cpp
 @@ -32,14 +32,21 @@
@@ -108,7 +105,7 @@ index 528cceee66a1b1c91a0d0e59d5f1a1770a050c17..0f3a341056f429ff282abcab22be4843
  static String addPrefixToIdentifier(unsigned long identifier)
  {
 -    return makeString("0."_s, identifier);
-+    return makeString(s_processID, ".", identifier);
++    return makeString(s_processID, '.', identifier);
  }
  
 +void IdentifiersFactory::initializeWithProcessID(uint64_t processID) {
@@ -121,22 +118,22 @@ index 528cceee66a1b1c91a0d0e59d5f1a1770a050c17..0f3a341056f429ff282abcab22be4843
  {
      return addPrefixToIdentifier(++s_lastUsedIdentifier);
 diff --git a/Source/JavaScriptCore/inspector/IdentifiersFactory.h b/Source/JavaScriptCore/inspector/IdentifiersFactory.h
-index eb25aedee4cd9ebe007e06c2515b37ee095b06f4..badf6559595c8377db1089ca3c25008e1be2c8f1 100644
+index 4113ddb45d4a8d08379d4dc56c44cde56162accf..e00cb9cb01a7a241f3f25b1e4cdc2fcaee92b3ac 100644
 --- a/Source/JavaScriptCore/inspector/IdentifiersFactory.h
 +++ b/Source/JavaScriptCore/inspector/IdentifiersFactory.h
 @@ -31,6 +31,7 @@ namespace Inspector {
  
- class JS_EXPORT_PRIVATE IdentifiersFactory {
+ class IdentifiersFactory {
  public:
-+    static void initializeWithProcessID(uint64_t);
-     static String createIdentifier();
-     static String requestId(unsigned long identifier);
++    JS_EXPORT_PRIVATE static void initializeWithProcessID(uint64_t);
+     JS_EXPORT_PRIVATE static String createIdentifier();
+     JS_EXPORT_PRIVATE static String requestId(unsigned long identifier);
  };
 diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp b/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
-index 731a91727561c1507d074ad27f592d274dfeb324..9320b24579466bb1baa8b68430fe9cbb6c152770 100644
+index 8b39848154ecab9f7daa2d21c85562a319cd06d7..c8a1f44cb4516993899ffe1404b6c3865d42433a 100644
 --- a/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
 +++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.cpp
-@@ -84,7 +84,10 @@ static RefPtr<JSON::Value> jsToInspectorValue(JSC::JSGlobalObject* globalObject,
+@@ -85,7 +85,10 @@ static RefPtr<JSON::Value> jsToInspectorValue(JSC::JSGlobalObject* globalObject,
          JSC::PropertyNameArray propertyNames(vm, JSC::PropertyNameMode::Strings, JSC::PrivateSymbolMode::Exclude);
          object.methodTable()->getOwnPropertyNames(&object, globalObject, propertyNames, JSC::DontEnumPropertiesMode::Exclude);
          for (auto& name : propertyNames) {
@@ -149,10 +146,10 @@ index 731a91727561c1507d074ad27f592d274dfeb324..9320b24579466bb1baa8b68430fe9cbb
                  return nullptr;
              inspectorObject->setValue(name.string(), inspectorValue.releaseNonNull());
 diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp
-index 820a08fc660633e09675d0e647bd0c50d2fa905a..5ca5ee5a6897b7ef332d906018b457122096df98 100644
+index 1f5d0adbf624bd24ef1e525967e6e82e8c37b4e5..4fe0f364b4ccd11774bf29f772e0a568549a4322 100644
 --- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp
 +++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.cpp
-@@ -101,7 +101,7 @@ void BackendDispatcher::registerDispatcherForDomain(const String& domain, Supple
+@@ -102,7 +102,7 @@ void BackendDispatcher::registerDispatcherForDomain(const String& domain, Supple
      m_dispatchers.set(domain, dispatcher);
  }
  
@@ -161,7 +158,7 @@ index 820a08fc660633e09675d0e647bd0c50d2fa905a..5ca5ee5a6897b7ef332d906018b45712
  {
      Ref<BackendDispatcher> protect(*this);
  
-@@ -146,6 +146,9 @@ void BackendDispatcher::dispatch(const String& message)
+@@ -147,6 +147,9 @@ void BackendDispatcher::dispatch(const String& message)
          requestId = *requestIdInt;
      }
  
@@ -172,18 +169,19 @@ index 820a08fc660633e09675d0e647bd0c50d2fa905a..5ca5ee5a6897b7ef332d906018b45712
          // We could be called re-entrantly from a nested run loop, so restore the previous id.
          SetForScope scopedRequestId(m_currentRequestId, requestId);
 diff --git a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-index 31957be19b946aa90d316dc978a301f80956dd9c..d1a01e7546996535eb3884524c251c50a998eb33 100644
+index 28f4cdacf6ebd7037a42a75872618436332d90ec..463f014be2bd29a75bee7b2113b6f929da13aca5 100644
 --- a/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
 +++ b/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-@@ -83,7 +83,10 @@ public:
+@@ -95,8 +95,11 @@ public:
+         ServerError
      };
  
-     void registerDispatcherForDomain(const String& domain, SupplementalBackendDispatcher*);
--    void dispatch(const String& message);
-+
 +    enum class InterceptionResult { Intercepted, Continue };
 +    using Interceptor = WTF::Function<InterceptionResult(const RefPtr<JSON::Object>&)>;
-+    void dispatch(const String& message, Interceptor&& interceptor = Interceptor());
++
+     JS_EXPORT_PRIVATE void registerDispatcherForDomain(const String& domain, SupplementalBackendDispatcher*);
+-    JS_EXPORT_PRIVATE void dispatch(const String& message);
++    JS_EXPORT_PRIVATE void dispatch(const String& message, Interceptor&& interceptor = Interceptor());
  
      // Note that 'unused' is a workaround so the compiler can pick the right sendResponse based on arity.
      // When <http://webkit.org/b/179847> is fixed or this class is renamed for the JSON::Object case,
@@ -222,10 +220,10 @@ index 0cc2127c9c12c2d82dea9550bad73f4ffb99ba24..8ca65cc042d435cbc0e05dcc5c5dfc95
  }
  
 diff --git a/Source/JavaScriptCore/inspector/InspectorTarget.h b/Source/JavaScriptCore/inspector/InspectorTarget.h
-index 88b72e94c4e8636de88419733b0a63ad4e0b9a73..153ee84f2c7ef86c548c62a65d6ad99214090230 100644
+index b555c2e5a071d0a6a016061cc60755449557556d..d019346f0932296d15212c76a4a9b56beb565ff4 100644
 --- a/Source/JavaScriptCore/inspector/InspectorTarget.h
 +++ b/Source/JavaScriptCore/inspector/InspectorTarget.h
-@@ -57,8 +57,12 @@ public:
+@@ -66,8 +66,12 @@ public:
      virtual void connect(FrontendChannel::ConnectionType) = 0;
      virtual void disconnect() = 0;
      virtual void sendMessageToTargetBackend(const String&) = 0;
@@ -239,16 +237,16 @@ index 88b72e94c4e8636de88419733b0a63ad4e0b9a73..153ee84f2c7ef86c548c62a65d6ad992
      bool m_isPaused { false };
  };
 diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp b/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp
-index 15d2592d36b402bf2210dc4970ff40957022e84a..99ac14dc75ff5296e1f6c42bdbf8c128f2d82254 100644
+index 13eb84b3cba851e14eae8894f8f7aeb242b6f9d4..30bfdf65a7b891420a25bbc54bfe7f03db694273 100644
 --- a/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp
 +++ b/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp
-@@ -221,6 +221,14 @@ void JSGlobalObjectConsoleClient::screenshot(JSGlobalObject*, Ref<ScriptArgument
+@@ -222,6 +222,14 @@ void JSGlobalObjectConsoleClient::screenshot(JSGlobalObject*, Ref<ScriptArgument
      warnUnimplemented("console.screenshot"_s);
  }
  
 +void JSGlobalObjectConsoleClient::bindingCalled(JSGlobalObject*, const String&, const String&)
 +{
-+    if (LIKELY(!m_consoleAgent->developerExtrasEnabled()))
++    if (!m_consoleAgent->developerExtrasEnabled())
 +        return;
 +
 +    warnUnimplemented("console.bindingCalled"_s);
@@ -256,7 +254,7 @@ index 15d2592d36b402bf2210dc4970ff40957022e84a..99ac14dc75ff5296e1f6c42bdbf8c128
 +
  void JSGlobalObjectConsoleClient::warnUnimplemented(const String& method)
  {
-     String message = method + " is currently ignored in JavaScript context inspection."_s;
+     auto message = makeString(method, " is currently ignored in JavaScript context inspection."_s);
 diff --git a/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h b/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h
 index 6bbd0729a65b4a901e7da4dc50cc47c669bd9897..452b25d0e8eba3df1d5f6623dc222048bef120cd 100644
 --- a/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h
@@ -270,7 +268,7 @@ index 6bbd0729a65b4a901e7da4dc50cc47c669bd9897..452b25d0e8eba3df1d5f6623dc222048
      void warnUnimplemented(const String& method);
      void internalAddMessage(MessageType, MessageLevel, JSC::JSGlobalObject*, Ref<ScriptArguments>&&);
 diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
-index 594584db96a3de67b92910f472f1403bc9b26ce2..8ba453f9ae8726ccfb26c55180371c20bed6962e 100644
+index 0cb6efeef2430faa5dbd812f71d4abfd5f6eb9df..787ec6a5f8413c0a9dc133cb0e51ccdab58d40d0 100644
 --- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
 +++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp
 @@ -194,9 +194,8 @@ void InspectorRuntimeAgent::callFunctionOn(const Protocol::Runtime::RemoteObject
@@ -367,10 +365,10 @@ index e47c6ca59f37fbf18ca8a393df72e0472363fabd..b393465540595220561ae00afb854082
  
  void InspectorTargetAgent::didCommitProvisionalTarget(const String& oldTargetID, const String& committedTargetID)
 diff --git a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
-index 4edcbf5f4aee2eb8e5675a23b9db67e9d640ef7f..a32b0f3a5de49e58b8a35cec9202b7880e91a2f0 100644
+index 04377b714a6ccb5294c65d592e74350621d470ba..b6de937bfa3e6185ce29f4e432d327a3cedee6df 100644
 --- a/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
 +++ b/Source/JavaScriptCore/inspector/agents/InspectorTargetAgent.h
-@@ -51,15 +51,20 @@ public:
+@@ -53,8 +53,11 @@ public:
      Protocol::ErrorStringOr<void> setPauseOnStart(bool) final;
      Protocol::ErrorStringOr<void> resume(const String& targetId) final;
      Protocol::ErrorStringOr<void> sendMessageToTarget(const String& targetId, const String& message) final;
@@ -378,21 +376,22 @@ index 4edcbf5f4aee2eb8e5675a23b9db67e9d640ef7f..a32b0f3a5de49e58b8a35cec9202b788
 +    Protocol::ErrorStringOr<void> close(const String& targetId, std::optional<bool>&& runBeforeUnload) override;
  
      // Target lifecycle.
++    void targetCrashed(InspectorTarget&);
      void targetCreated(InspectorTarget&);
      void targetDestroyed(InspectorTarget&);
-+    void targetCrashed(InspectorTarget&);
      void didCommitProvisionalTarget(const String& oldTargetID, const String& committedTargetID);
- 
+@@ -62,6 +65,9 @@ public:
      // Target messages.
      void sendMessageFromTargetToFrontend(const String& targetId, const String& message);
  
++    bool shouldPauseOnStart() const { return m_shouldPauseOnStart; }
 +    bool isConnected() { return m_isConnected; }
 +
  private:
      // FrontendChannel
      FrontendChannel::ConnectionType connectionType() const;
 diff --git a/Source/JavaScriptCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json
-index fc7612613d09e03f481c567a8a4a121884e2cb6c..b0a7b284684bccaa7dfb0892a64d4a803357ccc1 100644
+index 25711ac1aa269d7e0231a6169be1bc495f2c8dc0..bcb4d83e58a51458de6e070ef7cb859ee333bdbc 100644
 --- a/Source/JavaScriptCore/inspector/protocol/DOM.json
 +++ b/Source/JavaScriptCore/inspector/protocol/DOM.json
 @@ -80,6 +80,16 @@
@@ -412,24 +411,7 @@ index fc7612613d09e03f481c567a8a4a121884e2cb6c..b0a7b284684bccaa7dfb0892a64d4a80
          {
              "id": "EventListener",
              "type": "object",
-@@ -267,6 +277,16 @@
-                 { "name": "width", "type": "number" },
-                 { "name": "height", "type": "number" }
-             ]
-+        },
-+        {
-+            "id": "FilePayload",
-+            "type": "object",
-+            "description": "Data to construct File object.",
-+            "properties": [
-+                { "name": "name", "type": "string", "description": "File name." },
-+                { "name": "type", "type": "string", "description": "File type." },
-+                { "name": "data", "type": "string", "description": "Base64-encoded file data." }
-+            ]
-         }
-     ],
-     "commands": [
-@@ -696,7 +716,10 @@
+@@ -745,7 +755,10 @@
              "description": "Resolves JavaScript node object for given node id.",
              "targetTypes": ["page"],
              "parameters": [
@@ -441,7 +423,7 @@ index fc7612613d09e03f481c567a8a4a121884e2cb6c..b0a7b284684bccaa7dfb0892a64d4a80
                  { "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." }
              ],
              "returns": [
-@@ -773,6 +796,46 @@
+@@ -822,6 +835,46 @@
              "returns": [
                  { "name": "mediaStats", "$ref": "MediaStats", "description": "An interleaved array of node attribute names and values." }
              ]
@@ -482,9 +464,9 @@ index fc7612613d09e03f481c567a8a4a121884e2cb6c..b0a7b284684bccaa7dfb0892a64d4a80
 +            "description": "Sets input files for given <input type=file>",
 +            "parameters": [
 +                { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "description": "Input element handle." },
-+                { "name": "files", "type": "array", "items": { "$ref": "FilePayload" }, "optional": true, "description": "Files to set" },
-+                { "name": "paths", "type": "array", "items": { "type": "string" }, "optional": true, "description": "File paths to set" }
-+            ]
++                { "name": "paths", "type": "array", "items": { "type": "string" }, "description": "File paths to set" }
++            ],
++            "async": true
          }
      ],
      "events": [
@@ -532,10 +514,10 @@ index 0000000000000000000000000000000000000000..79edea03fed4e9be5da96e1275e182a4
 +}
 diff --git a/Source/JavaScriptCore/inspector/protocol/Emulation.json b/Source/JavaScriptCore/inspector/protocol/Emulation.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..2a49dd417360da37c83c4d375de468f949dce5db
+index 0000000000000000000000000000000000000000..8377901cb3ad75c29532a1f0f547efb53558a327
 --- /dev/null
 +++ b/Source/JavaScriptCore/inspector/protocol/Emulation.json
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,59 @@
 +{
 +    "domain": "Emulation",
 +    "availability": ["web"],
@@ -585,15 +567,22 @@ index 0000000000000000000000000000000000000000..2a49dd417360da37c83c4d375de468f9
 +        {
 +            "name": "resetPermissions",
 +            "description": "Clears permission overrides."
++        },
++        {
++            "name": "setOrientationOverride",
++            "description": "Overrides window.orientation with provided value.",
++            "parameters": [
++                { "name": "angle", "type": "integer", "optional": true }
++            ]
 +        }
 +    ]
 +}
 diff --git a/Source/JavaScriptCore/inspector/protocol/Input.json b/Source/JavaScriptCore/inspector/protocol/Input.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..b9ab57a2b5739ed997231399b4bd4042a0cb0935
+index 0000000000000000000000000000000000000000..1c43b476603325fa412bcfded9163e7a00aebbfa
 --- /dev/null
 +++ b/Source/JavaScriptCore/inspector/protocol/Input.json
-@@ -0,0 +1,223 @@
+@@ -0,0 +1,264 @@
 +{
 +    "domain": "Input",
 +    "availability": ["web"],
@@ -602,6 +591,16 @@ index 0000000000000000000000000000000000000000..b9ab57a2b5739ed997231399b4bd4042
 +            "id": "TimeSinceEpoch",
 +            "description": "UTC time in seconds, counted from January 1, 1970.",
 +            "type": "number"
++        },
++        {
++            "id": "TouchPoint",
++            "type": "object",
++            "description": "Touch point.",
++            "properties": [
++                { "name": "x", "type": "integer", "description": "X coordinate of the event relative to the main frame's viewport in CSS pixels." },
++                { "name": "y", "type": "integer", "description": "Y coordinate of the event relative to the main frame's viewport in CSS pixels." },
++                { "name": "id", "type": "integer", "description": "Identifier used to track touch sources between events, must be unique within an event." }
++            ]
 +        }
 +    ],
 +    "commands": [
@@ -814,6 +813,37 @@ index 0000000000000000000000000000000000000000..b9ab57a2b5739ed997231399b4bd4042
 +                    "type": "integer"
 +                }
 +            ]
++        },
++        {
++            "name": "dispatchTouchEvent",
++            "description": "Dispatches a touch event to the page.",
++            "async": true,
++            "parameters": [
++                {
++                    "name": "type",
++                    "description": "Type of the touch event.",
++                    "type": "string",
++                    "enum": [
++                        "touchStart",
++                        "touchMove",
++                        "touchEnd",
++                        "touchCancel"
++                    ]
++                },
++                {
++                    "name": "modifiers",
++                    "description": "Bit field representing pressed modifier keys. Alt=1, Ctrl=2, Meta/Command=4, Shift=8\n(default: 0).",
++                    "optional": true,
++                    "type": "integer"
++                },
++                {
++                    "name": "touchPoints",
++                    "description": "List of touch points",
++                    "type": "array",
++                    "optional": true,
++                    "items": { "$ref": "TouchPoint" }
++                }
++            ]
 +        }
 +    ]
 +}
@@ -836,10 +866,10 @@ index 96af27ece2ac200e11c4311b3ca0d9d3b5a048da..3168f7806fcbdabec07acc5e304bae1e
      ],
      "events": [
 diff --git a/Source/JavaScriptCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json
-index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c56a7a5fc 100644
+index 3d032713a7f3bb9645bfc7d42455a0494b5376c0..913dda5e90b86cc5f8e4ca6881f6db57520a7f66 100644
 --- a/Source/JavaScriptCore/inspector/protocol/Page.json
 +++ b/Source/JavaScriptCore/inspector/protocol/Page.json
-@@ -20,7 +20,14 @@
+@@ -20,7 +20,15 @@
                  "ScriptEnabled",
                  "ShowDebugBorders",
                  "ShowRepaintCounter",
@@ -851,11 +881,12 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
 +                "NotificationsEnabled",
 +                "FullScreenEnabled",
 +                "InputTypeMonthEnabled",
-+                "InputTypeWeekEnabled"
++                "InputTypeWeekEnabled",
++                "FixedBackgroundsPaintRelativeToDocument"
              ]
          },
          {
-@@ -62,6 +69,12 @@
+@@ -62,6 +70,12 @@
              "enum": ["None", "Lax", "Strict"],
              "description": "Same-Site policy of a cookie."
          },
@@ -868,9 +899,9 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          {
              "id": "Frame",
              "type": "object",
-@@ -125,6 +138,50 @@
-                 { "name": "secure", "type": "boolean", "description": "True if cookie is secure." },
-                 { "name": "sameSite", "$ref": "CookieSameSitePolicy", "description": "Cookie Same-Site policy." }
+@@ -126,6 +140,50 @@
+                 { "name": "sameSite", "$ref": "CookieSameSitePolicy", "description": "Cookie Same-Site policy." },
+                 { "name": "partitionKey", "type": "string", "optional": true, "description": "Cookie partition key. If null and partitioned property is true, then key must be computed." }
              ]
 +        },
 +        {
@@ -919,7 +950,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          }
      ],
      "commands": [
-@@ -144,6 +201,14 @@
+@@ -145,6 +203,14 @@
                  { "name": "revalidateAllResources", "type": "boolean", "optional": true, "description": "If true, all cached subresources will be revalidated when the main resource loads. Otherwise, only expired cached subresources will be revalidated (the default behavior for most WebKit clients)." }
              ]
          },
@@ -934,7 +965,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          {
              "name": "navigate",
              "description": "Navigates current page to the given URL.",
-@@ -160,6 +225,14 @@
+@@ -161,6 +227,14 @@
                  { "name": "value", "type": "string", "optional": true, "description": "Value to override the user agent with. If this value is not provided, the override is removed. Overrides are removed when Web Inspector closes/disconnects." }
              ]
          },
@@ -949,7 +980,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          {
              "name": "overrideSetting",
              "description": "Allows the frontend to override the inspected page's settings.",
-@@ -283,6 +356,28 @@
+@@ -285,6 +359,28 @@
                  { "name": "media", "type": "string", "description": "Media type to emulate. Empty string disables the override." }
              ]
          },
@@ -978,7 +1009,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          {
              "name": "snapshotNode",
              "description": "Capture a snapshot of the specified node that does not include unrelated layers.",
-@@ -303,7 +398,8 @@
+@@ -305,7 +401,8 @@
                  { "name": "y", "type": "integer", "description": "Y coordinate" },
                  { "name": "width", "type": "integer", "description": "Rectangle width" },
                  { "name": "height", "type": "integer", "description": "Rectangle height" },
@@ -988,7 +1019,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
              ],
              "returns": [
                  { "name": "dataURL", "type": "string", "description": "Base64-encoded image data (PNG)." }
-@@ -321,12 +417,71 @@
+@@ -323,12 +420,64 @@
          {
              "name": "setScreenSizeOverride",
              "description": "Overrides screen size exposed to DOM and used in media queries for testing with provided values.",
@@ -1049,19 +1080,12 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
 +            "description": "Crashes the page process"
 +        },
 +        {
-+            "name": "setOrientationOverride",
-+            "description": "Overrides window.orientation with provided value.",
-+            "parameters": [
-+                { "name": "angle", "type": "integer", "optional": true }
-+            ]
-+        },
-+        {
 +            "name": "updateScrollingState",
 +            "description": "Ensures that the scroll regions are up to date."
          }
      ],
      "events": [
-@@ -334,14 +489,16 @@
+@@ -336,14 +485,16 @@
              "name": "domContentEventFired",
              "targetTypes": ["page"],
              "parameters": [
@@ -1080,7 +1104,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
              ]
          },
          {
-@@ -351,6 +508,14 @@
+@@ -353,6 +504,14 @@
                  { "name": "frame", "$ref": "Frame", "description": "Frame object." }
              ]
          },
@@ -1095,7 +1119,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          {
              "name": "frameDetached",
              "description": "Fired when frame has been detached from its parent.",
-@@ -379,7 +544,8 @@
+@@ -381,7 +540,8 @@
              "targetTypes": ["page"],
              "parameters": [
                  { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has scheduled a navigation." },
@@ -1105,7 +1129,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
              ]
          },
          {
-@@ -390,6 +556,22 @@
+@@ -392,6 +552,22 @@
                  { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has cleared its scheduled navigation." }
              ]
          },
@@ -1128,7 +1152,7 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
          {
              "name": "defaultUserPreferencesDidChange",
              "description": "Fired when the default value of a user preference changes at the system level.",
-@@ -397,6 +579,42 @@
+@@ -399,6 +575,42 @@
              "parameters": [
                  { "name": "preferences", "type": "array", "items": { "$ref": "UserPreference" }, "description": "List of user preferences that can be overriden and their new system (default) values." }
              ]
@@ -1173,10 +1197,10 @@ index b5e2bb2eb58765ec20392b36bf5ef1ac35857a69..7e6c8b8954ed3d5d4ac77dfe51d0e08c
  }
 diff --git a/Source/JavaScriptCore/inspector/protocol/Playwright.json b/Source/JavaScriptCore/inspector/protocol/Playwright.json
 new file mode 100644
-index 0000000000000000000000000000000000000000..978d6f92b18498633c982969299f068332eb2884
+index 0000000000000000000000000000000000000000..440dd95173e066a886de120fb3dab7597d85feb6
 --- /dev/null
 +++ b/Source/JavaScriptCore/inspector/protocol/Playwright.json
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,315 @@
 +{
 +    "domain": "Playwright",
 +    "availability": ["web"],
@@ -1352,6 +1376,14 @@ index 0000000000000000000000000000000000000000..978d6f92b18498633c982969299f0683
 +            ]
 +        },
 +        {
++            "name": "setPageZoomFactor",
++            "description": "Changes page zoom factor.",
++            "parameters": [
++                { "name": "pageProxyId", "$ref": "PageProxyID", "description": "Unique identifier of the page proxy." },
++                { "name": "zoomFactor", "type": "number" }
++            ]
++        },
++        {
 +            "name": "getAllCookies",
 +            "description": "Returns all cookies in the given browser context.",
 +            "async": true,
@@ -1634,23 +1666,11 @@ index 52920cded24a9c6b0ef6fb4e518664955db4f9fa..bbbabc4e7259088b9404e8cc07eecd6f
              ]
          },
          {
-diff --git a/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp b/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp
-index dd1286cec6e77895f519911c89719b6064db6949..b732e0eab0fd29e1a1c9a2179cc86a951768c062 100644
---- a/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp
-+++ b/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp
-@@ -28,7 +28,6 @@
- 
- #include "CodeBlock.h"
- #include "JSCInlines.h"
--#include "ProfilerDumper.h"
- #include <wtf/StringPrintStream.h>
- 
- namespace JSC { namespace Profiler {
 diff --git a/Source/JavaScriptCore/runtime/ConsoleClient.h b/Source/JavaScriptCore/runtime/ConsoleClient.h
-index 72c81757450ad5ebacd5fd20d2a16095514802ec..b7d8ab1e04d3850180079870468b28eff504626a 100644
+index 24891ad836086fd23024fcb4d08ca63f6974c812..29f4b6b1923383fec7a99d28a4e815dc4536d160 100644
 --- a/Source/JavaScriptCore/runtime/ConsoleClient.h
 +++ b/Source/JavaScriptCore/runtime/ConsoleClient.h
-@@ -69,6 +69,7 @@ public:
+@@ -78,6 +78,7 @@ public:
      virtual void record(JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) = 0;
      virtual void recordEnd(JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) = 0;
      virtual void screenshot(JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) = 0;
@@ -1659,18 +1679,10 @@ index 72c81757450ad5ebacd5fd20d2a16095514802ec..b7d8ab1e04d3850180079870468b28ef
  private:
      enum ArgumentRequirement { ArgumentRequired, ArgumentNotRequired };
 diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-index d6b1e73b1268a1224c2d77b936ce46347be62dac..acd1950327608988059a7e972fb4d40f9efc0c68 100644
+index ca4f3508a44e3c6677a72fbe3d7c853714b4f2c6..ae117f5f402a7eb259e376ca9440e00062e22d9f 100644
 --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt
 +++ b/Source/ThirdParty/libwebrtc/CMakeLists.txt
-@@ -452,6 +452,7 @@ set(webrtc_SOURCES
-     Source/third_party/boringssl/src/crypto/x509/x_val.c
-     Source/third_party/boringssl/src/crypto/x509/x_x509a.c
-     Source/third_party/boringssl/src/crypto/x509/x_x509.c
-+
-     Source/third_party/boringssl/src/decrepit/bio/base64_bio.c
-     Source/third_party/boringssl/src/decrepit/blowfish/blowfish.c
-     Source/third_party/boringssl/src/decrepit/cast/cast.c
-@@ -530,6 +531,11 @@ set(webrtc_SOURCES
+@@ -532,6 +532,11 @@ set(webrtc_SOURCES
      Source/third_party/crc32c/src/src/crc32c.cc
      Source/third_party/crc32c/src/src/crc32c_portable.cc
      Source/third_party/crc32c/src/src/crc32c_sse42.cc
@@ -1682,47 +1694,40 @@ index d6b1e73b1268a1224c2d77b936ce46347be62dac..acd1950327608988059a7e972fb4d40f
      Source/third_party/libyuv/source/compare.cc
      Source/third_party/libyuv/source/compare_common.cc
      Source/third_party/libyuv/source/compare_gcc.cc
-@@ -2270,6 +2276,10 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
+@@ -2348,6 +2353,11 @@ set(webrtc_INCLUDE_DIRECTORIES PRIVATE
      Source/third_party/libsrtp/config
      Source/third_party/libsrtp/crypto/include
      Source/third_party/libsrtp/include
 +# Playwright begin
 +    Source/third_party/libwebm
 +    Source/third_party/libvpx/source/libvpx
++    Source/third_party/libvpx/source/libvpx/third_party/googletest/src/include
 +# Playwright end
      Source/third_party/libyuv/include
      Source/third_party/opus/src/celt
      Source/third_party/opus/src/include
 diff --git a/Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig
-index 94f6675a8b7ca64e12aaf1c3b01848f0a6b737a8..20660f511914ebb7877e050bb5bc232c3df2daa5 100644
+index 0c5c8e689bdddec766f9de5bffd4444a5e068d77..330dd1f585e530722178c65c883641a2b8c0f1bd 100644
 --- a/Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig
 +++ b/Source/ThirdParty/libwebrtc/Configurations/Base-libwebrtc.xcconfig
-@@ -21,7 +21,7 @@
- // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
--HEADER_SEARCH_PATHS = Source Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/webrtc/modules/audio_device/ios Source/webrtc Source/webrtc/sdk/objc Source/webrtc/sdk/objc/base Source/webrtc/sdk/objc/Framework/Classes Source/third_party/libsrtp/config Source/webrtc/sdk/objc/Framework/Classes/Common Source/webrtc/sdk/objc/Framework/Classes/Video Source/webrtc/sdk/objc/Framework/Classes/PeerConnection Source/third_party/abseil-cpp Source/third_party/libvpx/source/libvpx Source/third_party/libwebm/webm_parser/include Source/third_party/crc32c/config Source/third_party/crc32c/include Source/third_party/crc32c/src/include Source/third_party/libaom/source/libaom;
-+HEADER_SEARCH_PATHS = Source Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/webrtc/modules/audio_device/ios Source/webrtc Source/webrtc/sdk/objc Source/webrtc/sdk/objc/base Source/webrtc/sdk/objc/Framework/Classes Source/third_party/libsrtp/config Source/webrtc/sdk/objc/Framework/Classes/Common Source/webrtc/sdk/objc/Framework/Classes/Video Source/webrtc/sdk/objc/Framework/Classes/PeerConnection Source/third_party/abseil-cpp Source/third_party/libvpx/source/libvpx Source/third_party/libwebm/webm_parser/include Source/third_party/crc32c/config Source/third_party/crc32c/include Source/third_party/crc32c/src/include Source/third_party/libaom/source/libaom Source/third_party/libwebm/mkvmuxer Source/third_party/libvpx/source/libvpx/third_party/libwebm;
+@@ -24,6 +24,8 @@
+ HEADER_SEARCH_PATHS = Source Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/webrtc/webkit_sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/webrtc/modules/audio_device/ios Source/webrtc Source/webrtc/webkit_sdk/objc Source/webrtc/webkit_sdk/objc/base Source/webrtc/webkit_sdk/objc/Framework/Classes Source/third_party/libsrtp/config Source/webrtc/webkit_sdk/objc/Framework/Classes/Common Source/webrtc/webkit_sdk/objc/Framework/Classes/Video Source/webrtc/webkit_sdk/objc/Framework/Classes/PeerConnection Source/third_party/abseil-cpp Source/third_party/libvpx/source/libvpx Source/third_party/libwebm/webm_parser/include Source/third_party/crc32c/config Source/third_party/crc32c/include Source/third_party/crc32c/src/include Source/third_party/libaom/source/libaom;
  USE_HEADERMAP = NO;
  
++HEADER_SEARCH_PATHS = ${HEADER_SEARCH_PATHS} Source/third_party/libwebm/mkvmuxer Source/third_party/libvpx/source/libvpx/third_party/libwebm;
++
  WARNING_CFLAGS = -Wno-deprecated-declarations $(inherited);
+ 
+ // FIXME: Set WEBRTC_USE_BUILTIN_ISAC_FIX and WEBRTC_USE_BUILTIN_ISAC_FLOAT for iOS and Mac
 diff --git a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
-index a01284369bedab3d44e7a3c2671590b3ca2b18fc..6a75fd2d366386e12dc612bdcfb914613c636478 100644
+index 13c5b5ea562fe808a3251c3ae789f8106632cd25..36b77e7d6bc78ba2e982cad5a2b4792775d3280d 100644
 --- a/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
 +++ b/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.exp
-@@ -402,3 +402,24 @@ __ZN3rtc7LogSink12OnLogMessageENSt3__117basic_string_viewIcNS1_11char_traitsIcEE
- __ZN3rtc7LogSink12OnLogMessageERKNS_10LogLineRefE
- __ZN3rtc7LogSink12OnLogMessageERKNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS_15LoggingSeverityEPKc
- __ZTVN3rtc7LogSinkE
-+__ZN8mkvmuxer11SegmentInfo15set_writing_appEPKc
+@@ -434,3 +434,16 @@ __ZN6webrtc18VideoFrameMetadata7SetSsrcEj
+ __ZN6webrtc18VideoFrameMetadata8SetCsrcsENSt3__16vectorIjNS1_9allocatorIjEEEE
+ __ZN6webrtc18VideoFrameMetadata8SetWidthEt
+ __ZN6webrtc18VideoFrameMetadata9SetHeightEt
 +__ZN8mkvmuxer11SegmentInfo4InitEv
-+__ZN8mkvmuxer7Segment10OutputCuesEb
-+__ZN8mkvmuxer7Segment13AddVideoTrackEiii
-+__ZN8mkvmuxer7Segment4InitEPNS_10IMkvWriterE
-+__ZN8mkvmuxer7Segment8AddFrameEPKhyyyb
-+__ZN8mkvmuxer7Segment8FinalizeEv
-+__ZN8mkvmuxer7SegmentC1Ev
-+__ZN8mkvmuxer7SegmentD1Ev
 +__ZN8mkvmuxer9MkvWriterC1EP7__sFILE
 +_ARGBToI420
 +_vpx_codec_destroy
@@ -1735,35 +1740,11 @@ index a01284369bedab3d44e7a3c2671590b3ca2b18fc..6a75fd2d366386e12dc612bdcfb91461
 +_vpx_codec_iface_name
 +_vpx_codec_version_str
 +_vpx_codec_vp8_cx
-diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
-index 625cb7fefc6a699d9e2f28c6acc1bc7681ea3984..cd6677a7ffd3321978427a9fc6fbed5179aebb60 100644
---- a/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
-+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
-@@ -16,6 +16,7 @@
- #include "absl/algorithm/container.h"
- #include "absl/memory/memory.h"
- #include "absl/types/optional.h"
-+#include "api/call/transport.h"
- #include "api/video/video_bitrate_allocation.h"
- #include "modules/rtp_rtcp/include/receive_statistics.h"
- #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h b/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
-index f95c3b6c6b73a01974f26d88bcc533e5032ddb66..6a9368c60824cd32649c93286522d779cac59bd2 100644
---- a/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
-+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtp_format_h264.h
-@@ -16,6 +16,7 @@
- 
- #include <deque>
- #include <memory>
-+#include <optional>
- #include <queue>
- 
- #include "api/array_view.h"
 diff --git a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
-index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e143329e31ee0 100644
+index 7585b2e5e9bffdc8cabd888dd822313d53b30141..5909d33b9726cdc7d2d53b538f7da18bc221e30b 100644
 --- a/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
 +++ b/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj
-@@ -35,6 +35,20 @@
+@@ -56,6 +56,20 @@
  		};
  /* End PBXAggregateTarget section */
  
@@ -1784,17 +1765,7 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  /* Begin PBXBuildFile section */
  		2D6BFF60280A93DF00A1A74F /* video_coding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4131C45B234C81710028A615 /* video_coding.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		2D6BFF61280A93EC00A1A74F /* video_codec_initializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4131C45E234C81720028A615 /* video_codec_initializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
-@@ -5118,6 +5132,9 @@
- 		DDF30D9127C5C725006A526F /* receive_side_congestion_controller.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9027C5C725006A526F /* receive_side_congestion_controller.h */; };
- 		DDF30D9527C5C756006A526F /* bwe_defines.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9327C5C756006A526F /* bwe_defines.h */; };
- 		DDF30D9627C5C756006A526F /* remote_bitrate_estimator.h in Headers */ = {isa = PBXBuildFile; fileRef = DDF30D9427C5C756006A526F /* remote_bitrate_estimator.h */; };
-+		F3B7819924C7CC5200FCB122 /* mkvmuxerutil.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819624C7CC5100FCB122 /* mkvmuxerutil.cc */; };
-+		F3B7819A24C7CC5200FCB122 /* mkvmuxer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819724C7CC5200FCB122 /* mkvmuxer.cc */; };
-+		F3B7819B24C7CC5200FCB122 /* mkvwriter.cc in Sources */ = {isa = PBXBuildFile; fileRef = F3B7819824C7CC5200FCB122 /* mkvwriter.cc */; };
- /* End PBXBuildFile section */
- 
- /* Begin PBXBuildRule section */
-@@ -5606,6 +5623,13 @@
+@@ -5786,6 +5800,13 @@
  			remoteGlobalIDString = DDF30D0527C5C003006A526F;
  			remoteInfo = absl;
  		};
@@ -1808,42 +1779,7 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  /* End PBXContainerItemProxy section */
  
  /* Begin PBXCopyFilesBuildPhase section */
-@@ -11165,6 +11189,9 @@
- 		DDF30D9027C5C725006A526F /* receive_side_congestion_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = receive_side_congestion_controller.h; sourceTree = "<group>"; };
- 		DDF30D9327C5C756006A526F /* bwe_defines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bwe_defines.h; sourceTree = "<group>"; };
- 		DDF30D9427C5C756006A526F /* remote_bitrate_estimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = remote_bitrate_estimator.h; sourceTree = "<group>"; };
-+		F3B7819624C7CC5100FCB122 /* mkvmuxerutil.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mkvmuxerutil.cc; path = mkvmuxer/mkvmuxerutil.cc; sourceTree = "<group>"; };
-+		F3B7819724C7CC5200FCB122 /* mkvmuxer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mkvmuxer.cc; path = mkvmuxer/mkvmuxer.cc; sourceTree = "<group>"; };
-+		F3B7819824C7CC5200FCB122 /* mkvwriter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mkvwriter.cc; path = mkvmuxer/mkvwriter.cc; sourceTree = "<group>"; };
- 		FB39D0D11200F0E300088E69 /* libwebrtc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libwebrtc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
- /* End PBXFileReference section */
- 
-@@ -19991,6 +20018,7 @@
- 			isa = PBXGroup;
- 			children = (
- 				CDFD2F9224C4B2F90048DAC3 /* common */,
-+				F3B7819524C7CC1300FCB122 /* mkvmuxer */,
- 				CDEBB19224C0191800ADBD44 /* webm_parser */,
- 			);
- 			path = libwebm;
-@@ -20418,6 +20446,16 @@
- 			path = include;
- 			sourceTree = "<group>";
- 		};
-+		F3B7819524C7CC1300FCB122 /* mkvmuxer */ = {
-+			isa = PBXGroup;
-+			children = (
-+				F3B7819724C7CC5200FCB122 /* mkvmuxer.cc */,
-+				F3B7819624C7CC5100FCB122 /* mkvmuxerutil.cc */,
-+				F3B7819824C7CC5200FCB122 /* mkvwriter.cc */,
-+			);
-+			name = mkvmuxer;
-+			sourceTree = "<group>";
-+		};
- 		FB39D06E1200ED9200088E69 = {
- 			isa = PBXGroup;
- 			children = (
-@@ -23693,6 +23731,7 @@
+@@ -24271,6 +24292,7 @@
  			);
  			dependencies = (
  				410B3827292B73E90003E515 /* PBXTargetDependency */,
@@ -1851,7 +1787,7 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  				DD2E76E827C6B69A00F2A74C /* PBXTargetDependency */,
  				CDEBB4CC24C01AB400ADBD44 /* PBXTargetDependency */,
  				411ED040212E0811004320BA /* PBXTargetDependency */,
-@@ -23775,6 +23814,7 @@
+@@ -24364,6 +24386,7 @@
  				4460B8B92B155B6A00392062 /* vp9_qp_parser_fuzzer */,
  				444A6EF02AEADFC9005FE121 /* vp9_replay_fuzzer */,
  				44945C512B9BA1C300447FFD /* webm_fuzzer */,
@@ -1859,9 +1795,9 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  			);
  		};
  /* End PBXProject section */
-@@ -23858,6 +23898,23 @@
+@@ -24467,6 +24490,23 @@
  			shellPath = /bin/sh;
- 			shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
+ 			shellScript = "[ -z \"${WK_DERIVED_SDK_HEADERS_DIR}\" -o -d \"${WK_DERIVED_SDK_HEADERS_DIR}\" ] && touch \"${SCRIPT_OUTPUT_FILE_0}\"\n";
  		};
 +		F31720B127FE216400EEE407 /* ShellScript */ = {
 +			isa = PBXShellScriptBuildPhase;
@@ -1883,17 +1819,7 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  /* End PBXShellScriptBuildPhase section */
  
  /* Begin PBXSourcesBuildPhase section */
-@@ -25831,6 +25888,9 @@
- 				5CDD865E1E43B8B500621E92 /* min_max_operations.c in Sources */,
- 				4189395B242A71F5007FDC41 /* min_video_bitrate_experiment.cc in Sources */,
- 				41B8D8FB28CB85CB00E5FA37 /* missing_mandatory_parameter_cause.cc in Sources */,
-+				F3B7819A24C7CC5200FCB122 /* mkvmuxer.cc in Sources */,
-+				F3B7819924C7CC5200FCB122 /* mkvmuxerutil.cc in Sources */,
-+				F3B7819B24C7CC5200FCB122 /* mkvwriter.cc in Sources */,
- 				4131C387234B957D0028A615 /* moving_average.cc in Sources */,
- 				41FCBB1521B1F7AA00A5DF27 /* moving_average.cc in Sources */,
- 				5CD286101E6A64C90094FDC8 /* moving_max.cc in Sources */,
-@@ -26708,6 +26768,11 @@
+@@ -27437,6 +27477,11 @@
  			target = DDF30D0527C5C003006A526F /* absl */;
  			targetProxy = DD2E76E727C6B69A00F2A74C /* PBXContainerItemProxy */;
  		};
@@ -1905,7 +1831,7 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  /* End PBXTargetDependency section */
  
  /* Begin XCBuildConfiguration section */
-@@ -27283,6 +27348,27 @@
+@@ -28204,6 +28249,27 @@
  			};
  			name = Production;
  		};
@@ -1933,7 +1859,7 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  		FB39D0711200ED9200088E69 /* Debug */ = {
  			isa = XCBuildConfiguration;
  			baseConfigurationReference = 5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */;
-@@ -27585,6 +27671,16 @@
+@@ -28586,6 +28652,16 @@
  			defaultConfigurationIsVisible = 0;
  			defaultConfigurationName = Production;
  		};
@@ -1950,116 +1876,206 @@ index f5f1d0ef71f7fcf175b016ddaefd99f18d96c1c3..5632dcb4919eb22133a62810b91e1433
  		FB39D0731200ED9200088E69 /* Build configuration list for PBXProject "libwebrtc" */ = {
  			isa = XCConfigurationList;
  			buildConfigurations = (
+diff --git a/Source/ThirdParty/skia/CMakeLists.txt b/Source/ThirdParty/skia/CMakeLists.txt
+index 6bfc5cba986488f3d808ebd0583c476cd93da70e..f4c4222d17bce640355ba52e00152069d5b14432 100644
+--- a/Source/ThirdParty/skia/CMakeLists.txt
++++ b/Source/ThirdParty/skia/CMakeLists.txt
+@@ -10,6 +10,8 @@ if (USE_SKIA_ENCODERS)
+     find_package(WebP REQUIRED COMPONENTS mux)
+ endif ()
+ 
++find_package(Threads REQUIRED)
++
+ if (ANDROID)
+     find_package(EXPAT REQUIRED)
+ endif ()
+@@ -948,6 +950,7 @@ endif ()
+ target_link_libraries(Skia PRIVATE
+     JPEG::JPEG
+     PNG::PNG
++    Threads::Threads
+ )
+ 
+ WEBKIT_ADD_TARGET_CXX_FLAGS(Skia
+diff --git a/Source/ThirdParty/skia/src/opts/SkOpts_SetTarget.h b/Source/ThirdParty/skia/src/opts/SkOpts_SetTarget.h
+index 525cfcb862ae96bf8573d00b67dc9e5e23c10d22..f2debc0444cb8f5b80a0e99a2214bceaab3960c1 100644
+--- a/Source/ThirdParty/skia/src/opts/SkOpts_SetTarget.h
++++ b/Source/ThirdParty/skia/src/opts/SkOpts_SetTarget.h
+@@ -65,6 +65,7 @@
+     // Each of the specific intrinsic headers also checks to ensure that immintrin.h has been
+     // included, so do that here, first.
+     #if defined(__clang__) && defined(_MSC_VER)
++        #define __RTMINTRIN_H  // Workaround for https://github.com/llvm/llvm-project/issues/95133
+         #include <immintrin.h>
+     #endif
+ 
 diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-index 110e762586d9dc98b3a11a5cf5d1501334b2463f..870e1950740d745588cbfdc8abd3f3709867ab8f 100644
+index 3437d1ccf6e9a78bb9a42158e54ba99f4d9d25f9..b67f7d77bdf4090ec9c29abd221562cd7bf5a80f 100644
 --- a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
 +++ b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
-@@ -562,6 +562,7 @@ ApplePayEnabled:
-       default: false
+@@ -588,6 +588,7 @@ ApplePayEnabled:
+   richJavaScript: true
  
  # FIXME: This is on by default in WebKit2 PLATFORM(COCOA). Perhaps we should consider turning it on for WebKitLegacy as well.
 +# Playwright: enable on all platforms to align with Safari.
  AsyncClipboardAPIEnabled:
    type: bool
    status: mature
-@@ -572,7 +573,7 @@ AsyncClipboardAPIEnabled:
+@@ -598,7 +599,7 @@ AsyncClipboardAPIEnabled:
        default: false
      WebKit:
-       "PLATFORM(COCOA) || PLATFORM(GTK)" : true
+       "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)" : true
 -      default: false
 +      default: true
      WebCore:
        default: false
  
-@@ -1739,9 +1740,10 @@ CrossOriginEmbedderPolicyEnabled:
+@@ -857,13 +858,10 @@ BlobFileAccessEnforcementEnabled:
+   sharedPreferenceForWebProcess: true
+   defaultValue:
+     WebKitLegacy:
+-      "PLATFORM(COCOA)": true
+       default: false
+     WebKit:
+-      "PLATFORM(COCOA)": true
+       default: false
+     WebCore:
+-      "PLATFORM(COCOA)": true
+       default: false
+ 
+ BlockFontServiceInWebContentSandbox:
+@@ -2143,6 +2141,7 @@ CrossOriginEmbedderPolicyEnabled:
      WebCore:
        default: false
  
 +# Playwright: disable setting.
  CrossOriginOpenerPolicyEnabled:
    type: bool
--  status: stable
-+  status: preview
-   category: security
-   humanReadableName: "Cross-Origin-Opener-Policy (COOP) header"
-   humanReadableDescription: "Support for Cross-Origin-Opener-Policy (COOP) header"
-@@ -1749,7 +1751,7 @@ CrossOriginOpenerPolicyEnabled:
+   status: stable
+@@ -2216,6 +2215,7 @@ DOMAudioSessionFullEnabled:
+     WebCore:
+       default: false
+ 
++# Playwright: enable on all platforms to align with Safari.
+ DOMPasteAccessRequestsEnabled:
+   type: bool
+   status: internal
+@@ -2227,7 +2227,7 @@ DOMPasteAccessRequestsEnabled:
+       default: false
+     WebKit:
+       "PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(VISION)": true
+-      default: false
++      default: true
+     WebCore:
+       default: false
+ 
+@@ -2293,10 +2293,10 @@ DataListElementEnabled:
      WebKitLegacy:
        default: false
      WebKit:
--      default: true
-+      default: false
+-      "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK)": true
++      "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
+       default: false
      WebCore:
+-      "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK)": true
++      "(PLATFORM(COCOA) && !PLATFORM(WATCHOS)) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
        default: false
+   sharedPreferenceForWebProcess: true
  
-@@ -1793,7 +1795,7 @@ CustomPasteboardDataEnabled:
+@@ -2309,7 +2309,7 @@ DataTransferItemsEnabled:
+     WebKitLegacy:
+       default: true
+     WebKit:
+-      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
++      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
+       default: false
+     WebCore:
+       default: false
+@@ -2537,7 +2537,7 @@ DirectoryUploadEnabled:
      WebKitLegacy:
        default: false
      WebKit:
--      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WIN)": true
+-      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
 +      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)": true
        default: false
- 
- CustomStateSetEnabled:
-@@ -1852,6 +1854,7 @@ DOMAudioSessionFullEnabled:
      WebCore:
        default: false
- 
-+# Playwright: enable on all platforms to align with Safari.
- DOMPasteAccessRequestsEnabled:
-   type: bool
-   status: internal
-@@ -1863,7 +1866,7 @@ DOMPasteAccessRequestsEnabled:
+@@ -3020,10 +3020,10 @@ FullScreenEnabled:
+     WebKitLegacy:
        default: false
      WebKit:
-       "PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(VISION)": true
--      default: false
-+      default: true
+-      "PLATFORM(GTK) || PLATFORM(WPE)": true
++      "PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(WPE)": true
+       default: false
      WebCore:
+-      "PLATFORM(GTK) || PLATFORM(WPE)": true
++      "PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(WPE)": true
        default: false
+   sharedPreferenceForWebProcess: true
  
-@@ -3232,6 +3235,7 @@ InspectorAttachmentSide:
+@@ -3614,7 +3614,7 @@ InputTypeColorEnabled:
+     WebKitLegacy:
+       default: false
      WebKit:
-       default: 0
+-      "PLATFORM(COCOA) && !PLATFORM(WATCHOS) || PLATFORM(GTK)": true
++      "PLATFORM(COCOA) && !PLATFORM(WATCHOS) || PLATFORM(GTK) || PLATFORM(WPE)": true
+       default: false
+     WebCore:
+       default: false
+@@ -3647,7 +3647,7 @@ InputTypeDateEnabled:
+       "PLATFORM(IOS_FAMILY)": true
+       default: false
+     WebKit:
+-      "PLATFORM(COCOA) || PLATFORM(GTK)": true
++      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+       default: false
+     WebCore:
+       default: false
+@@ -3663,7 +3663,7 @@ InputTypeDateTimeLocalEnabled:
+       "PLATFORM(IOS_FAMILY)": true
+       default: false
+     WebKit:
+-      "PLATFORM(COCOA) || PLATFORM(GTK)": true
++      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+       default: false
+     WebCore:
+       default: false
+@@ -3695,7 +3695,7 @@ InputTypeTimeEnabled:
+       "PLATFORM(IOS_FAMILY)": true
+       default: false
+     WebKit:
+-      "PLATFORM(COCOA) || PLATFORM(GTK)": true
++      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)": true
+       default: false
+     WebCore:
+       default: false
+@@ -3756,6 +3756,7 @@ InspectorMaximumResourcesContentSize:
+       "PLATFORM(WPE)": 50
+       default: 200
  
 +# Playwright: disable setting.
  InspectorStartsAttached:
    type: bool
    status: embedder
-@@ -3239,7 +3243,7 @@ InspectorStartsAttached:
+@@ -3763,7 +3764,7 @@ InspectorStartsAttached:
    exposed: [ WebKit ]
    defaultValue:
      WebKit:
 -      default: true
 +      default: false
  
- InspectorWindowFrame:
-   type: String
-@@ -3593,9 +3597,10 @@ LayoutViewportHeightExpansionFactor:
-     WebCore:
-       default: 0
- 
-+# Playwright: disable setting.
- LazyIframeLoadingEnabled:
+ InspectorSupportsShowingCertificate:
    type: bool
--  status: stable
-+  status: preview
-   category: html
-   humanReadableName: "Lazy iframe loading"
-   humanReadableDescription: "Enable lazy iframe loading support"
-@@ -3603,9 +3608,9 @@ LazyIframeLoadingEnabled:
+@@ -5683,7 +5684,7 @@ PermissionsAPIEnabled:
      WebKitLegacy:
-       default: true
+       default: false
      WebKit:
--      default: true
-+      default: false
+-      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)" : true
++      "PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)" : true
+       default: false
      WebCore:
--      default: true
-+      default: false
- 
- LazyImageLoadingEnabled:
-   type: bool
-@@ -5028,6 +5033,19 @@ PitchCorrectionAlgorithm:
+       default: false
+@@ -5762,6 +5763,19 @@ PitchCorrectionAlgorithm:
      WebCore:
        default: MediaPlayerEnums::PitchCorrectionAlgorithm::BestAllAround
  
@@ -2078,16 +2094,25 @@ index 110e762586d9dc98b3a11a5cf5d1501334b2463f..870e1950740d745588cbfdc8abd3f370
 +
  PointerLockOptionsEnabled:
    type: bool
-   status: testable
-@@ -6778,6 +6796,7 @@ UseCGDisplayListsForDOMRendering:
+   status: stable
+@@ -6344,7 +6358,7 @@ ScreenOrientationAPIEnabled:
+     WebKitLegacy:
+       default: false
      WebKit:
+-      default: WebKit::defaultShouldEnableScreenOrientationAPI()
++      default: true
+     WebCore:
+       default: false
+   sharedPreferenceForWebProcess: true
+@@ -7806,6 +7820,7 @@ UseCGDisplayListsForDOMRendering:
        default: true
+   sharedPreferenceForWebProcess: true
  
 +# Playwright: force-disable on Windows.
  UseGPUProcessForCanvasRenderingEnabled:
    type: bool
    status: stable
-@@ -6790,7 +6809,7 @@ UseGPUProcessForCanvasRenderingEnabled:
+@@ -7818,7 +7833,7 @@ UseGPUProcessForCanvasRenderingEnabled:
    defaultValue:
      WebKit:
        "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
@@ -2096,24 +2121,15 @@ index 110e762586d9dc98b3a11a5cf5d1501334b2463f..870e1950740d745588cbfdc8abd3f370
        default: false
  
  UseGPUProcessForDOMRenderingEnabled:
-@@ -6800,7 +6819,7 @@ UseGPUProcessForDOMRenderingEnabled:
-   humanReadableName: "GPU Process: DOM Rendering"
-   humanReadableDescription: "Enable DOM rendering in GPU Process"
-   webcoreBinding: none
--  condition: ENABLE(GPU_PROCESS)
-+  condition: ENABLE(GPU_PROCESS) && !PLATFORM(WIN)
-   exposed: [ WebKit ]
-   defaultValue:
-     WebKit:
-@@ -6832,6 +6851,7 @@ UseGPUProcessForMediaEnabled:
-       "ENABLE(GPU_PROCESS_BY_DEFAULT)": true
-       default: false
+@@ -7863,6 +7878,7 @@ UseGPUProcessForMediaEnabled:
+   sharedPreferenceForWebProcess: true
+   mediaPlaybackRelated: true
  
 +# Playwright: force-disable on Windows.
  UseGPUProcessForWebGLEnabled:
    type: bool
    status: internal
-@@ -6843,7 +6863,7 @@ UseGPUProcessForWebGLEnabled:
+@@ -7874,7 +7890,7 @@ UseGPUProcessForWebGLEnabled:
        default: false
      WebKit:
        "ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true
@@ -2123,10 +2139,10 @@ index 110e762586d9dc98b3a11a5cf5d1501334b2463f..870e1950740d745588cbfdc8abd3f370
      WebCore:
        "ENABLE(GPU_PROCESS_BY_DEFAULT) && ENABLE(GPU_PROCESS_WEBGL_BY_DEFAULT)": true
 diff --git a/Source/WTF/wtf/PlatformEnable.h b/Source/WTF/wtf/PlatformEnable.h
-index 6f547f01a22d1aba86b813fc77679124a643ef72..34fbae99c2e64f2a34a83d878da76f9c75d0bea5 100644
+index a36395e83c53617c2f894695846f8798fc277624..f0b8dd0fd12b4cde24975c20015cee30292abf9d 100644
 --- a/Source/WTF/wtf/PlatformEnable.h
 +++ b/Source/WTF/wtf/PlatformEnable.h
-@@ -401,7 +401,7 @@
+@@ -385,7 +385,7 @@
  
  // ORIENTATION_EVENTS should never get enabled on Desktop, only Mobile.
  #if !defined(ENABLE_ORIENTATION_EVENTS)
@@ -2135,7 +2151,7 @@ index 6f547f01a22d1aba86b813fc77679124a643ef72..34fbae99c2e64f2a34a83d878da76f9c
  #endif
  
  #if !defined(ENABLE_OVERFLOW_SCROLLING_TOUCH)
-@@ -506,7 +506,7 @@
+@@ -502,7 +502,7 @@
  #endif
  
  #if !defined(ENABLE_TOUCH_EVENTS)
@@ -2145,10 +2161,10 @@ index 6f547f01a22d1aba86b813fc77679124a643ef72..34fbae99c2e64f2a34a83d878da76f9c
  
  #if !defined(ENABLE_TOUCH_ACTION_REGIONS)
 diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
-index d797c28eccac0578c7c504fa0c7b34d517746b17..32e815241e2513c979d1af01ef88b494851a2409 100644
+index 8304147ff102789180b2682eb64d599791528c93..af8cb85981bda7b91edfa21b6cc321849d93b909 100644
 --- a/Source/WTF/wtf/PlatformEnableCocoa.h
 +++ b/Source/WTF/wtf/PlatformEnableCocoa.h
-@@ -775,7 +775,7 @@
+@@ -808,7 +808,7 @@
  #endif
  
  #if !defined(ENABLE_SEC_ITEM_SHIM)
@@ -2158,19 +2174,10 @@ index d797c28eccac0578c7c504fa0c7b34d517746b17..32e815241e2513c979d1af01ef88b494
  
  #if !defined(ENABLE_SERVER_PRECONNECT)
 diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
-index cb5e806040f4e6e2bf94a4c27b05892af7e4301d..81fd915ce2643522b225139661da9f7dedf32469 100644
+index 9e91a26aac61faea9634328f9a46421a4b4b7c38..b70776d97be4025435dc3c0364105cb17c429f6a 100644
 --- a/Source/WTF/wtf/PlatformHave.h
 +++ b/Source/WTF/wtf/PlatformHave.h
-@@ -419,7 +419,7 @@
- #define HAVE_FOUNDATION_WITH_SAME_SITE_COOKIE_SUPPORT 1
- #endif
- 
--#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(VISION) || PLATFORM(GTK) || PLATFORM(WPE)
-+#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(MACCATALYST) || PLATFORM(VISION) || PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN)
- #define HAVE_OS_DARK_MODE_SUPPORT 1
- #endif
- 
-@@ -1274,7 +1274,8 @@
+@@ -1189,7 +1189,8 @@
  #endif
  
  #if PLATFORM(MAC)
@@ -2181,13 +2188,14 @@ index cb5e806040f4e6e2bf94a4c27b05892af7e4301d..81fd915ce2643522b225139661da9f7d
  
  #if !defined(HAVE_LOCKDOWN_MODE_PDF_ADDITIONS) && \
 diff --git a/Source/WTF/wtf/unicode/UTF8Conversion.h b/Source/WTF/wtf/unicode/UTF8Conversion.h
-index f45ef73d81bd02c0b542e98ff01f59d88f57b8a0..0fb91174b8e6641d20b4ee084ec48910cdf7b836 100644
+index 007b8fe3292f326504013be8198ae020f7aacf35..1c722c473732ffe05fdb61010fa4417e3e399d1f 100644
 --- a/Source/WTF/wtf/unicode/UTF8Conversion.h
 +++ b/Source/WTF/wtf/unicode/UTF8Conversion.h
-@@ -28,6 +28,10 @@
- #include <unicode/utypes.h>
+@@ -27,6 +27,11 @@
+ 
  #include <wtf/text/LChar.h>
  
++// Can be probably removed when we drop Debian 11.
 +#ifdef Success
 +#undef Success
 +#endif
@@ -2196,13 +2204,13 @@ index f45ef73d81bd02c0b542e98ff01f59d88f57b8a0..0fb91174b8e6641d20b4ee084ec48910
  namespace Unicode {
  
 diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
-index 9dd05dd4e7ad824cae7c47d61117a2bbde10c3e5..015b2ce422f594860a77b0382e9a3857f2db4ff6 100644
+index 0f0341624503ae9744b71d3675dc96545371456a..cc73c79374f07fbf1f83e7075e53a3d99da0705c 100644
 --- a/Source/WebCore/DerivedSources.make
 +++ b/Source/WebCore/DerivedSources.make
-@@ -1149,6 +1149,10 @@ JS_BINDING_IDLS := \
-     $(WebCore)/dom/Slotable.idl \
-     $(WebCore)/dom/StaticRange.idl \
-     $(WebCore)/dom/StringCallback.idl \
+@@ -1229,6 +1229,10 @@ JS_BINDING_IDLS := \
+     $(WebCore)/dom/SubscriberCallback.idl \
+     $(WebCore)/dom/SubscriptionObserver.idl \
+     $(WebCore)/dom/SubscriptionObserverCallback.idl \
 +    $(WebCore)/dom/Document+Touch.idl \
 +    $(WebCore)/dom/Touch.idl \
 +    $(WebCore)/dom/TouchEvent.idl \
@@ -2210,7 +2218,7 @@ index 9dd05dd4e7ad824cae7c47d61117a2bbde10c3e5..015b2ce422f594860a77b0382e9a3857
      $(WebCore)/dom/Text.idl \
      $(WebCore)/dom/TextDecoder.idl \
      $(WebCore)/dom/TextDecoderStream.idl \
-@@ -1735,9 +1739,6 @@ JS_BINDING_IDLS := \
+@@ -1829,9 +1833,6 @@ JS_BINDING_IDLS := \
  ADDITIONAL_BINDING_IDLS = \
      DocumentTouch.idl \
      GestureEvent.idl \
@@ -2221,22 +2229,22 @@ index 9dd05dd4e7ad824cae7c47d61117a2bbde10c3e5..015b2ce422f594860a77b0382e9a3857
  
  vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
 diff --git a/Source/WebCore/Modules/geolocation/Geolocation.cpp b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-index 32fde85425cbb82eb30bcc7aef58155026d2b7b7..a35495d97fcf0346e4696e26df80cf4a8fb890d6 100644
+index 7d0ca9a308e7aeaf132dccfddeae129fc8c9e093..0eeac0eec23fbc8c3df6c56d63603acc46e8590c 100644
 --- a/Source/WebCore/Modules/geolocation/Geolocation.cpp
 +++ b/Source/WebCore/Modules/geolocation/Geolocation.cpp
-@@ -357,8 +357,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
-     bool isSecure = SecurityOrigin::isSecure(document()->url()) || document()->isSecureContext();
-     bool hasMixedContent = !document()->foundMixedContent().isEmpty();
+@@ -362,8 +362,9 @@ bool Geolocation::shouldBlockGeolocationRequests()
+     bool isSecure = SecurityOrigin::isSecure(document->url()) || document->isSecureContext();
+     bool hasMixedContent = !document->foundMixedContent().isEmpty();
      bool isLocalOrigin = securityOrigin()->isLocal();
 +    bool isPotentiallyTrustworthy = securityOrigin()->isPotentiallyTrustworthy();
-     if (document()->canAccessResource(ScriptExecutionContext::ResourceType::Geolocation) != ScriptExecutionContext::HasResourceAccess::No) {
+     if (document->canAccessResource(ScriptExecutionContext::ResourceType::Geolocation) != ScriptExecutionContext::HasResourceAccess::No) {
 -        if (isLocalOrigin || (isSecure && !hasMixedContent))
-+        if (isLocalOrigin || isPotentiallyTrustworthy || (isSecure && !hasMixedContent))
++        if (isLocalOrigin || (isSecure && !hasMixedContent) || isPotentiallyTrustworthy)
              return false;
      }
  
 diff --git a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm
-index 506ebb25fa290f27a75674a6fe5506fc311910d6..07d34c567b42aca08b188243c3f036f64a8da0c4 100644
+index b2b0391c120d527a9ab4bc6daf8bff7ea5d03cf7..d490a95f89f21536fce4f403b86399160abefc23 100644
 --- a/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm
 +++ b/Source/WebCore/Modules/speech/cocoa/WebSpeechRecognizerTask.mm
 @@ -195,6 +195,7 @@ - (void)sendEndIfNeeded
@@ -2271,26 +2279,14 @@ index 506ebb25fa290f27a75674a6fe5506fc311910d6..07d34c567b42aca08b188243c3f036f6
      ASSERT(isMainThread());
  
      [self sendSpeechEndIfNeeded];
-diff --git a/Source/WebCore/PlatformWPE.cmake b/Source/WebCore/PlatformWPE.cmake
-index c6a03b56d8358316c9ce422c1a11438bd216f80f..69fbd319b7cd084ca125a8db1b5d92ef6a4dc10f 100644
---- a/Source/WebCore/PlatformWPE.cmake
-+++ b/Source/WebCore/PlatformWPE.cmake
-@@ -60,6 +60,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
-     platform/graphics/libwpe/PlatformDisplayLibWPE.h
- 
-     platform/graphics/wayland/PlatformDisplayWayland.h
-+    platform/wpe/SelectionData.h
- )
- 
- set(CSS_VALUE_PLATFORM_DEFINES "HAVE_OS_DARK_MODE_SUPPORT=1")
 diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
-index eece14fded1942140af81dede0861fb5f79fb532..cd3c5ebaccd268695d9e7bc0b96f30522c42e43e 100644
+index 06a9accfc8e6c46493733663b5d76b07fc80db22..4946d012d166c84b25d4d954266c4dc528f7d8ad 100644
 --- a/Source/WebCore/SourcesCocoa.txt
 +++ b/Source/WebCore/SourcesCocoa.txt
-@@ -713,3 +713,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
+@@ -734,3 +734,9 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
  platform/graphics/angle/GraphicsContextGLANGLE.cpp @no-unify
  platform/graphics/cocoa/GraphicsContextGLCocoa.mm @no-unify
- platform/graphics/cv/GraphicsContextGLCVCocoa.cpp @no-unify
+ platform/graphics/cv/GraphicsContextGLCVCocoa.mm @no-unify
 +
 +// Playwright begin
 +JSTouch.cpp
@@ -2298,10 +2294,10 @@ index eece14fded1942140af81dede0861fb5f79fb532..cd3c5ebaccd268695d9e7bc0b96f3052
 +JSTouchList.cpp
 +// Playwright end
 diff --git a/Source/WebCore/SourcesGTK.txt b/Source/WebCore/SourcesGTK.txt
-index af2081f34b9d8d97864a6e9507805abc9e8eb6d7..06ed467b2c6e529baba22a04e03a4858f8552e19 100644
+index 2b22eb2071e32741cb1383601466e537dca917f2..4da3cb8c1f1247bbc9886b060cd2d53047ca6572 100644
 --- a/Source/WebCore/SourcesGTK.txt
 +++ b/Source/WebCore/SourcesGTK.txt
-@@ -110,3 +110,10 @@ platform/unix/LoggingUnix.cpp
+@@ -112,3 +112,10 @@ platform/unix/LoggingUnix.cpp
  platform/unix/SharedMemoryUnix.cpp
  
  platform/xdg/MIMETypeRegistryXdg.cpp
@@ -2313,10 +2309,10 @@ index af2081f34b9d8d97864a6e9507805abc9e8eb6d7..06ed467b2c6e529baba22a04e03a4858
 +JSSpeechSynthesisEventInit.cpp
 +// Playwright: end.
 diff --git a/Source/WebCore/SourcesWPE.txt b/Source/WebCore/SourcesWPE.txt
-index 92f1879df295fc63a9194dc54d3f7499c5fe3041..67c40d056aee6a8149ed1ff16ce4c835e19f7f6c 100644
+index ce3cf51287e5891289bd23580084b8137ee4276b..c46e4e0c6faaca888e3ea62afd0e16d6f4cfda35 100644
 --- a/Source/WebCore/SourcesWPE.txt
 +++ b/Source/WebCore/SourcesWPE.txt
-@@ -46,6 +46,8 @@ editing/libwpe/EditorLibWPE.cpp
+@@ -48,6 +48,8 @@ editing/glib/WebContentReaderGLib.cpp
  
  loader/soup/ResourceLoaderSoup.cpp
  
@@ -2325,18 +2321,14 @@ index 92f1879df295fc63a9194dc54d3f7499c5fe3041..67c40d056aee6a8149ed1ff16ce4c835
  page/linux/ResourceUsageOverlayLinux.cpp
  page/linux/ResourceUsageThreadLinux.cpp
  
-@@ -87,6 +89,17 @@ platform/text/LocaleICU.cpp
- platform/unix/LoggingUnix.cpp
- platform/unix/SharedMemoryUnix.cpp
- 
-+platform/wpe/DragDataWPE.cpp
-+platform/wpe/DragImageWPE.cpp
+@@ -97,3 +99,13 @@ platform/wpe/PasteboardWPE.cpp
  platform/wpe/PlatformScreenWPE.cpp
  
  platform/xdg/MIMETypeRegistryXdg.cpp
 +
 +// Playwright: begin.
-+platform/wpe/SelectionData.cpp
++platform/wpe/DragDataWPE.cpp
++platform/wpe/DragImageWPE.cpp
 +
 +JSSpeechSynthesisErrorCode.cpp
 +JSSpeechSynthesisErrorEvent.cpp
@@ -2344,12 +2336,12 @@ index 92f1879df295fc63a9194dc54d3f7499c5fe3041..67c40d056aee6a8149ed1ff16ce4c835
 +JSSpeechSynthesisEventInit.cpp
 +// Playwright: end.
 diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf284999d5d763 100644
+index e522afd2d6f038d2a2c9804313d1d8e75c63e914..03f521d898bd7d80a94e7e3c0fc4c904d279a0ba 100644
 --- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
 +++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
-@@ -6216,6 +6216,13 @@
- 		EDE3A5000C7A430600956A37 /* ColorMac.h in Headers */ = {isa = PBXBuildFile; fileRef = EDE3A4FF0C7A430600956A37 /* ColorMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 		EDEC98030AED7E170059137F /* WebCorePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEC98020AED7E170059137F /* WebCorePrefix.h */; };
+@@ -6452,6 +6452,13 @@
+ 		EE0C7E042CE845CB0043DAF8 /* CSSPositionTryRule.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0C7E002CE845CB0043DAF8 /* CSSPositionTryRule.h */; };
+ 		EE0D3C492D2F4B4C00072978 /* StageModeOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0D3C482D2F4AE600072978 /* StageModeOperations.h */; settings = {ATTRIBUTES = (Private, ); }; };
  		EFCC6C8F20FE914400A2321B /* CanvasActivityRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */; settings = {ATTRIBUTES = (Private, ); }; };
 +		F050E16823AC9C080011CE47 /* PlatformTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F050E16623AC9C070011CE47 /* PlatformTouchEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
 +		F050E16A23AD660C0011CE47 /* Touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F050E16923AD660C0011CE47 /* Touch.cpp */; };
@@ -2361,8 +2353,8 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  		F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
  		F32BDCD92363AACA0073B6AE /* UserGestureEmulationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = F32BDCD72363AACA0073B6AE /* UserGestureEmulationScope.h */; };
  		F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-@@ -20126,6 +20133,14 @@
- 		EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
+@@ -21141,6 +21148,14 @@
+ 		EE7A169F2C607BFA0057B563 /* StartViewTransitionOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartViewTransitionOptions.h; sourceTree = "<group>"; };
  		EFB7287B2124C73D005C2558 /* CanvasActivityRecord.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CanvasActivityRecord.cpp; sourceTree = "<group>"; };
  		EFCC6C8D20FE914000A2321B /* CanvasActivityRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CanvasActivityRecord.h; sourceTree = "<group>"; };
 +		F050E16623AC9C070011CE47 /* PlatformTouchEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformTouchEvent.h; sourceTree = "<group>"; };
@@ -2376,7 +2368,7 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  		F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
  		F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
  		F32BDCD52363AAC90073B6AE /* UserGestureEmulationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserGestureEmulationScope.cpp; sourceTree = "<group>"; };
-@@ -27745,6 +27760,11 @@
+@@ -28928,6 +28943,11 @@
  				BC4A5324256055590028C592 /* TextDirectionSubmenuInclusionBehavior.h */,
  				2D4F96F11A1ECC240098BF88 /* TextIndicator.cpp */,
  				2D4F96F21A1ECC240098BF88 /* TextIndicator.h */,
@@ -2388,16 +2380,16 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  				F48570A42644C76D00C05F71 /* TranslationContextMenuInfo.h */,
  				F4E1965F21F26E4E00285078 /* UndoItem.cpp */,
  				2ECDBAD521D8906300F00ECD /* UndoItem.h */,
-@@ -34075,6 +34095,8 @@
+@@ -35916,6 +35936,8 @@
  				29E4D8DF16B0940F00C84704 /* PlatformSpeechSynthesizer.h */,
  				1AD8F81A11CAB9E900E93E54 /* PlatformStrategies.cpp */,
  				1AD8F81911CAB9E900E93E54 /* PlatformStrategies.h */,
 +				F050E16623AC9C070011CE47 /* PlatformTouchEvent.h */,
 +				F050E17623AD70C40011CE47 /* PlatformTouchPoint.h */,
+ 				FE3DC9932D0C063C0021B6FC /* PlatformTZoneImpls.cpp */,
  				0FD7C21D23CE41E30096D102 /* PlatformWheelEvent.cpp */,
  				935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */,
- 				F491A66A2A9FEFA300F96146 /* PlatformWheelEvent.serialization.in */,
-@@ -36745,6 +36767,7 @@
+@@ -38777,6 +38799,7 @@
  				AD6E71AB1668899D00320C13 /* DocumentSharedObjectPool.h */,
  				6BDB5DC1227BD3B800919770 /* DocumentStorageAccess.cpp */,
  				6BDB5DC0227BD3B800919770 /* DocumentStorageAccess.h */,
@@ -2405,7 +2397,7 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  				7CE7FA5B1EF882300060C9D6 /* DocumentTouch.cpp */,
  				7CE7FA591EF882300060C9D6 /* DocumentTouch.h */,
  				A8185F3209765765005826D9 /* DocumentType.cpp */,
-@@ -41482,6 +41505,8 @@
+@@ -43729,6 +43752,8 @@
  				F4E90A3C2B52038E002DA469 /* PlatformTextAlternatives.h in Headers */,
  				0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */,
  				074E82BB18A69F0E007EF54C /* PlatformTimeRanges.h in Headers */,
@@ -2414,7 +2406,7 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  				CDD08ABD277E542600EA3755 /* PlatformTrackConfiguration.h in Headers */,
  				CD1F9B022700323D00617EB6 /* PlatformVideoColorPrimaries.h in Headers */,
  				CD1F9B01270020B700617EB6 /* PlatformVideoColorSpace.h in Headers */,
-@@ -42762,6 +42787,7 @@
+@@ -45097,6 +45122,7 @@
  				0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
  				71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */,
  				0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
@@ -2422,7 +2414,7 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  				0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
  				070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
  				BE88E0C21715CE2600658D98 /* TrackListBase.h in Headers */,
-@@ -43910,6 +43936,8 @@
+@@ -46300,6 +46326,8 @@
  				2D22830323A8470700364B7E /* CursorMac.mm in Sources */,
  				5CBD59592280E926002B22AA /* CustomHeaderFields.cpp in Sources */,
  				07E4BDBF2A3A5FAB000D5509 /* DictationCaretAnimator.cpp in Sources */,
@@ -2431,7 +2423,7 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  				7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */,
  				4667EA3E2968D9DA00BAB1E2 /* GameControllerHapticEffect.mm in Sources */,
  				46FE73D32968E52000B8064C /* GameControllerHapticEngines.mm in Sources */,
-@@ -43997,6 +44025,9 @@
+@@ -46390,6 +46418,9 @@
  				CE88EE262414467B007F29C2 /* TextAlternativeWithRange.mm in Sources */,
  				BE39137129B267F500FA5D4F /* TextTransformCocoa.cpp in Sources */,
  				51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
@@ -2442,18 +2434,18 @@ index 8807578bc8e503fce83e9acc30029cef75b7f071..7fffb6499c200dca0c3ee777feaf2849
  				538EC8021F96AF81004D22A8 /* UnifiedSource1.cpp in Sources */,
  				538EC8051F96AF81004D22A8 /* UnifiedSource2-mm.mm in Sources */,
 diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
-index 9253fbb9de00b2768dd67c6efa20a2242e2e6621..c758a4e9b6f779458a611b6458ba89de1c17e4c8 100644
+index 3f19caf891dfa1cc70aa630f4e82c405825ab40c..62b2978c8d5e8af5e337d8b27c1d2ad938b773fe 100644
 --- a/Source/WebCore/accessibility/AccessibilityObject.cpp
 +++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
-@@ -66,6 +66,7 @@
- #include "HTMLSlotElement.h"
+@@ -72,6 +72,7 @@
+ #include "HTMLTableSectionElement.h"
  #include "HTMLTextAreaElement.h"
  #include "HitTestResult.h"
 +#include "InspectorInstrumentation.h"
  #include "LocalFrame.h"
  #include "LocalizedStrings.h"
  #include "MathMLNames.h"
-@@ -4075,9 +4076,14 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
+@@ -3931,7 +3932,12 @@ AccessibilityObjectInclusion AccessibilityObject::defaultObjectInclusion() const
      if (roleValue() == AccessibilityRole::ApplicationDialog)
          return AccessibilityObjectInclusion::IncludeObject;
  
@@ -2465,16 +2457,13 @@ index 9253fbb9de00b2768dd67c6efa20a2242e2e6621..c758a4e9b6f779458a611b6458ba89de
 +    }
 +    return platformBehavior;
  }
--    
-+
- bool AccessibilityObject::accessibilityIsIgnored() const
- {
-     AXComputedObjectAttributeCache* attributeCache = nullptr;
+ 
+ bool AccessibilityObject::isWithinHiddenWebArea() const
 diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-index f20ac9d4d61a6f396e9ed796c8e6c5b8a7ea0577..3151b5e54ea17c0d979d22a0cc43c5ce0688c183 100644
+index 158dc6af1464896ac4c4727c52581729ac132352..b8bd22a7d80d08d6dd56ea1bc10addbe3f839b6d 100644
 --- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
 +++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
-@@ -183,6 +183,8 @@ namespace WebCore {
+@@ -190,6 +190,8 @@ namespace WebCore {
      macro(DelayNode) \
      macro(DeprecationReportBody) \
      macro(DigitalCredential) \
@@ -2484,13 +2473,13 @@ index f20ac9d4d61a6f396e9ed796c8e6c5b8a7ea0577..3151b5e54ea17c0d979d22a0cc43c5ce
      macro(DynamicsCompressorNode) \
      macro(ElementInternals) \
 diff --git a/Source/WebCore/css/query/MediaQueryFeatures.cpp b/Source/WebCore/css/query/MediaQueryFeatures.cpp
-index 9892fda4291cae0e0d338fac8b0f98cd0126807d..7ecfd659809ab30e82a9c00ec7710292a1bd5611 100644
+index aec43490053f95341ef979385b5e6c1daf03a090..4e44b7e341c8247f916f8597092248d8ec884518 100644
 --- a/Source/WebCore/css/query/MediaQueryFeatures.cpp
 +++ b/Source/WebCore/css/query/MediaQueryFeatures.cpp
-@@ -368,7 +368,11 @@ const FeatureSchema& forcedColors()
-     static MainThreadNeverDestroyed<IdentifierSchema> schema {
+@@ -498,7 +498,11 @@ static const IdentifierSchema& forcedColorsFeatureSchema()
          "forced-colors"_s,
          FixedVector { CSSValueNone, CSSValueActive },
+         OptionSet<MediaQueryDynamicDependency>(),
 -        [](auto&) {
 +        [](auto& context) {
 +            auto* page = context.document->frame()->page();
@@ -2500,7 +2489,7 @@ index 9892fda4291cae0e0d338fac8b0f98cd0126807d..7ecfd659809ab30e82a9c00ec7710292
              return MatchingIdentifiers { CSSValueNone };
          }
      };
-@@ -547,6 +551,9 @@ const FeatureSchema& prefersReducedMotion()
+@@ -686,6 +690,9 @@ static const IdentifierSchema& prefersReducedMotionFeatureSchema()
          [](auto& context) {
              bool userPrefersReducedMotion = [&] {
                  Ref frame = *context.document->frame();
@@ -2511,10 +2500,10 @@ index 9892fda4291cae0e0d338fac8b0f98cd0126807d..7ecfd659809ab30e82a9c00ec7710292
                  case ForcedAccessibilityValue::On:
                      return true;
 diff --git a/Source/WebCore/dom/DataTransfer.cpp b/Source/WebCore/dom/DataTransfer.cpp
-index b56c600b6159973dc8a33db1deba0cfbb77abf48..a347a85381888e2f6423393552d619938ad34f21 100644
+index c6f2dca0d4aede2bea015d1cca45dff434425938..e6f41af39befe69f47d0e0953f7d689c338ca184 100644
 --- a/Source/WebCore/dom/DataTransfer.cpp
 +++ b/Source/WebCore/dom/DataTransfer.cpp
-@@ -510,6 +510,14 @@ Ref<DataTransfer> DataTransfer::createForDrag(const Document& document)
+@@ -523,6 +523,14 @@ Ref<DataTransfer> DataTransfer::createForDrag(const Document& document)
      return adoptRef(*new DataTransfer(StoreMode::ReadWrite, Pasteboard::createForDragAndDrop(PagePasteboardContext::create(document.pageID())), Type::DragAndDropData));
  }
  
@@ -2530,10 +2519,10 @@ index b56c600b6159973dc8a33db1deba0cfbb77abf48..a347a85381888e2f6423393552d61993
  {
      auto dataTransfer = adoptRef(*new DataTransfer(StoreMode::ReadWrite, makeUnique<StaticPasteboard>(), Type::DragAndDropData));
 diff --git a/Source/WebCore/dom/DataTransfer.h b/Source/WebCore/dom/DataTransfer.h
-index 6ca2550bf509381165e5da22cc894ccf6378f45c..535bd1b05e8d90b291235cfc3cb425084455ff26 100644
+index 34ef2f454a732d39acae04987584cab5638b8c60..5e7b788612718dffe3423c89d96141b5b53621fb 100644
 --- a/Source/WebCore/dom/DataTransfer.h
 +++ b/Source/WebCore/dom/DataTransfer.h
-@@ -91,6 +91,9 @@ public:
+@@ -92,6 +92,9 @@ public:
  
  #if ENABLE(DRAG_SUPPORT)
      static Ref<DataTransfer> createForDrag(const Document&);
@@ -2544,7 +2533,7 @@ index 6ca2550bf509381165e5da22cc894ccf6378f45c..535bd1b05e8d90b291235cfc3cb42508
      static Ref<DataTransfer> createForDrop(const Document&, std::unique_ptr<Pasteboard>&&, OptionSet<DragOperation>, bool draggingFiles);
      static Ref<DataTransfer> createForUpdatingDropTarget(const Document&, std::unique_ptr<Pasteboard>&&, OptionSet<DragOperation>, bool draggingFiles);
 diff --git a/Source/WebCore/dom/DeviceMotionEvent.idl b/Source/WebCore/dom/DeviceMotionEvent.idl
-index ea39a33a6250b4d10b20802f98aa9a5d57e63a7b..300a763508d311fd7b34cb3df3cc93080bb52930 100644
+index d59cba0b1c3e1876614476cd887fa1b2a9619d0c..565987a3f9ef7dc29edf8315cebe51b00953dc84 100644
 --- a/Source/WebCore/dom/DeviceMotionEvent.idl
 +++ b/Source/WebCore/dom/DeviceMotionEvent.idl
 @@ -25,6 +25,7 @@
@@ -2604,24 +2593,26 @@ index 9b344003de17b96d8b9ca8c7f32143a27543b1ea..2208a3f2b7d930bcd291e65b474d4c30
  ] partial interface Element {
      // Returns Promise<undefined> if PointerLockOptionsEnabled Runtime Flag is set, otherwise returns undefined.
 diff --git a/Source/WebCore/dom/PointerEvent.cpp b/Source/WebCore/dom/PointerEvent.cpp
-index c35c7851f168954a0c5265ea218a2173b7b079a8..500b267351d2e4ac9864129650b6c00627a8ea6f 100644
+index 6b0390aba75731707ce48ea206b87974ffb15857..8c634c0748f0d447476d460ee2800f82d232d7ff 100644
 --- a/Source/WebCore/dom/PointerEvent.cpp
 +++ b/Source/WebCore/dom/PointerEvent.cpp
-@@ -27,9 +27,11 @@
- #include "PointerEvent.h"
+@@ -28,10 +28,13 @@
  
  #include "EventNames.h"
+ #include "MouseEventTypes.h"
 +#include "MouseEvent.h"
  #include "Node.h"
- #include "PlatformMouseEvent.h"
- #include "PointerEventTypeNames.h"
 +#include "PlatformTouchEvent.h"
- #include <wtf/IsoMallocInlines.h>
+ #include "PointerEventTypeNames.h"
+ #include <numbers>
+ #include <wtf/TZoneMallocInlines.h>
++#include <wtf/IsoMallocInlines.h>
  
  namespace WebCore {
-@@ -122,4 +124,51 @@ PointerEvent::PointerEvent(const AtomString& type, PointerID pointerId, const St
  
- PointerEvent::~PointerEvent() = default;
+@@ -293,4 +296,59 @@ void PointerEvent::receivedTarget()
+         predictedEvent->setTarget(this->target());
+ }
  
 +#if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS_FAMILY) && !PLATFORM(WPE)
 +
@@ -2645,26 +2636,34 @@ index c35c7851f168954a0c5265ea218a2173b7b079a8..500b267351d2e4ac9864129650b6c006
 +    return nullAtom();
 +}
 +
-+Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, unsigned index, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++{
++    const auto& type = pointerEventType(event.touchPoints().at(touchIndex).state());
++    return adoptRef(*new PointerEvent(type, event, coalescedEvents, predictedEvents, typeCanBubble(type), typeIsCancelable(type), touchIndex, isPrimary, WTFMove(view), touchDelta));
++}
++
++Ref<PointerEvent> PointerEvent::create(const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
 +{
-+    const auto& type = pointerEventType(event.touchPoints().at(index).state());
-+    return adoptRef(*new PointerEvent(type, event, typeIsCancelable(type), index, isPrimary, WTFMove(view), touchDelta));
++    const auto& type = pointerEventType(event.touchPoints().at(touchIndex).state());
++    return adoptRef(*new PointerEvent(type, event, coalescedEvents, predictedEvents, canBubble, isCancelable, touchIndex, isPrimary, WTFMove(view), touchDelta));
 +}
 +
-+Ref<PointerEvent> PointerEvent::create(const AtomString& type, const PlatformTouchEvent& event, unsigned index, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++Ref<PointerEvent> PointerEvent::create(const AtomString& type, const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
 +{
-+    return adoptRef(*new PointerEvent(type, event, typeIsCancelable(type), index, isPrimary, WTFMove(view), touchDelta));
++    return adoptRef(*new PointerEvent(type, event, coalescedEvents, predictedEvents, typeCanBubble(type), typeIsCancelable(type), touchIndex, isPrimary, WTFMove(view), touchDelta));
 +}
 +
-+PointerEvent::PointerEvent(const AtomString& type, const PlatformTouchEvent& event, IsCancelable isCancelable, unsigned index, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
-+    : MouseEvent(EventInterfaceType::PointerEvent, type, typeCanBubble(type), isCancelable, typeIsComposed(type), event.timestamp().approximateMonotonicTime(), WTFMove(view), 0,
-+        event.touchPoints().at(index).pos(), event.touchPoints().at(index).pos(), touchDelta.x(), touchDelta.y(), event.modifiers(), buttonForType(type), buttonsForType(type), nullptr, 0, SyntheticClickType::NoTap, IsSimulated::No, IsTrusted::Yes)
-+    , m_pointerId(event.touchPoints().at(index).id())
-+    , m_width(2 * event.touchPoints().at(index).radiusX())
-+    , m_height(2 * event.touchPoints().at(index).radiusY())
-+    , m_pressure(event.touchPoints().at(index).force())
++PointerEvent::PointerEvent(const AtomString& type, const PlatformTouchEvent& event, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta)
++    : MouseEvent(EventInterfaceType::PointerEvent, type, canBubble, isCancelable, typeIsComposed(type), event.timestamp().approximateMonotonicTime(), WTFMove(view), 0,
++        event.touchPoints().at(touchIndex).pos(), event.touchPoints().at(touchIndex).pos(), touchDelta.x(), touchDelta.y(), event.modifiers(), buttonForType(type), buttonsForType(type), nullptr, 0, SyntheticClickType::NoTap, { }, { }, IsSimulated::No, IsTrusted::Yes)
++    , m_pointerId(event.touchPoints().at(touchIndex).id())
++    , m_width(2 * event.touchPoints().at(touchIndex).radiusX())
++    , m_height(2 * event.touchPoints().at(touchIndex).radiusY())
++    , m_pressure(event.touchPoints().at(touchIndex).force())
 +    , m_pointerType(touchPointerEventType())
 +    , m_isPrimary(isPrimary)
++    , m_coalescedEvents(coalescedEvents)
++    , m_predictedEvents(predictedEvents)
 +{
 +}
 +
@@ -2672,7 +2671,7 @@ index c35c7851f168954a0c5265ea218a2173b7b079a8..500b267351d2e4ac9864129650b6c006
 +
  } // namespace WebCore
 diff --git a/Source/WebCore/dom/PointerEvent.h b/Source/WebCore/dom/PointerEvent.h
-index 261a8c7e8946cac87b9ebc5fc5e3b697f326b7f4..02645d3bdce44f40a648e720e99a6b296f371fb2 100644
+index b034595d01bb63f3d72183c427fcc14695339ae2..1886e4bbba04c6177fad1562c891f2aeff0a8247 100644
 --- a/Source/WebCore/dom/PointerEvent.h
 +++ b/Source/WebCore/dom/PointerEvent.h
 @@ -34,6 +34,8 @@
@@ -2684,37 +2683,37 @@ index 261a8c7e8946cac87b9ebc5fc5e3b697f326b7f4..02645d3bdce44f40a648e720e99a6b29
  #endif
  
  #if ENABLE(TOUCH_EVENTS) && PLATFORM(WPE)
-@@ -86,7 +88,7 @@ public:
-     static Ref<PointerEvent> create(const AtomString& type, MouseButton, const MouseEvent&, PointerID, const String& pointerType);
+@@ -94,7 +96,7 @@ public:
+     static Ref<PointerEvent> create(const AtomString& type, MouseButton, const MouseEvent&, PointerID, const String& pointerType, CanBubble, IsCancelable);
      static Ref<PointerEvent> create(const AtomString& type, PointerID, const String& pointerType, IsPrimary = IsPrimary::No);
  
 -#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
 +#if ENABLE(TOUCH_EVENTS)
-     static Ref<PointerEvent> create(const PlatformTouchEvent&, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
-     static Ref<PointerEvent> create(const AtomString& type, const PlatformTouchEvent&, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
- #endif
-@@ -140,7 +142,7 @@ private:
-     PointerEvent(const AtomString&, Init&&);
-     PointerEvent(const AtomString& type, MouseButton, const MouseEvent&, PointerID, const String& pointerType);
+     static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
+     static Ref<PointerEvent> create(const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble, IsCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&& view, const IntPoint& touchDelta = { });
+     static Ref<PointerEvent> create(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
+@@ -173,7 +175,7 @@ private:
+     PointerEvent();
+     PointerEvent(const AtomString&, Init&&, IsTrusted);
      PointerEvent(const AtomString& type, PointerID, const String& pointerType, IsPrimary);
 -#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
 +#if ENABLE(TOUCH_EVENTS)
-     PointerEvent(const AtomString& type, const PlatformTouchEvent&, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
+     PointerEvent(const AtomString& type, const PlatformTouchEvent&, const Vector<Ref<PointerEvent>>& coalescedEvents, const Vector<Ref<PointerEvent>>& predictedEvents, CanBubble canBubble, IsCancelable isCancelable, unsigned touchIndex, bool isPrimary, Ref<WindowProxy>&&, const IntPoint& touchDelta = { });
  #endif
  
 diff --git a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp
-index 7813532cc52d582c42aebc979a1ecd1137765f08..c01cbd53ad2430a6ffab9a80fc73e74a8523800a 100644
+index d0a3d5c048647b07772e1581c76c4eb60ecf41b0..bec324636991079264e620c0dfdaf9842ff585cd 100644
 --- a/Source/WebCore/editing/libwpe/EditorLibWPE.cpp
 +++ b/Source/WebCore/editing/libwpe/EditorLibWPE.cpp
-@@ -34,6 +34,7 @@
- #include "NotImplemented.h"
+@@ -35,6 +35,7 @@
  #include "Pasteboard.h"
  #include "Settings.h"
+ #include "SimpleRange.h"
 +#include "WebContentReader.h"
  #include "markup.h"
  
  namespace WebCore {
-@@ -99,6 +100,14 @@ void Editor::platformPasteFont()
+@@ -100,6 +101,14 @@ void Editor::platformPasteFont()
  {
  }
  
@@ -2730,10 +2729,10 @@ index 7813532cc52d582c42aebc979a1ecd1137765f08..c01cbd53ad2430a6ffab9a80fc73e74a
  
  #endif // USE(LIBWPE)
 diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp
-index dde92a4942d3f6679b6ef2455fa15d023544dfbc..c6ed18b40209195d1cf5c7785091d37fd40dad80 100644
+index d5234a678a77e24ce0a95fe08740416ab8acbadb..c9a42fd354e88c5a8c3ee53974442ec9d4cb1224 100644
 --- a/Source/WebCore/html/FileInputType.cpp
 +++ b/Source/WebCore/html/FileInputType.cpp
-@@ -37,6 +37,7 @@
+@@ -38,6 +38,7 @@
  #include "HTMLNames.h"
  #include "Icon.h"
  #include "InputTypeNames.h"
@@ -2741,52 +2740,41 @@ index dde92a4942d3f6679b6ef2455fa15d023544dfbc..c6ed18b40209195d1cf5c7785091d37f
  #include "LocalFrame.h"
  #include "LocalizedStrings.h"
  #include "MIMETypeRegistry.h"
-@@ -157,6 +158,11 @@ void FileInputType::handleDOMActivateEvent(Event& event)
-     if (input.isDisabledFormControl())
+@@ -161,6 +162,11 @@ void FileInputType::handleDOMActivateEvent(Event& event)
+     if (protectedElement()->isDisabledFormControl())
          return;
  
 +    bool intercept = false;
-+    InspectorInstrumentation::runOpenPanel(input.document().frame(), element(), &intercept);
++    InspectorInstrumentation::runOpenPanel(element()->document().frame(), element(), &intercept);
 +    if (intercept)
 +        return;
 +
      if (!UserGestureIndicator::processingUserGesture())
          return;
  
-@@ -345,7 +351,9 @@ void FileInputType::setFiles(RefPtr<FileList>&& files, RequestIcon shouldRequest
-         pathsChanged = true;
-     else {
-         for (unsigned i = 0; i < length; ++i) {
--            if (files->file(i).path() != m_fileList->file(i).path() || !FileSystem::fileIDsAreEqual(files->file(i).fileID(), m_fileList->file(i).fileID())) {
-+            if (files->file(i).path() != m_fileList->file(i).path() || !FileSystem::fileIDsAreEqual(files->file(i).fileID(), m_fileList->file(i).fileID()) ||
-+                // Files created from Blob have empty path.
-+                (files->file(i).path().isEmpty() && files->file(i).name() != m_fileList->file(i).name())) {
-                 pathsChanged = true;
-                 break;
-             }
 diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
-index 3844ae7bab48f46b77cfd85530e4ab19392a71dd..8d705215457f89711e78e3bee9c983d131b08245 100644
+index 48efc5356601313e907846283f753e44d6a0f983..f153fd7da52da98d033e4070d79c64d4a38ff197 100644
 --- a/Source/WebCore/inspector/InspectorController.cpp
 +++ b/Source/WebCore/inspector/InspectorController.cpp
-@@ -287,6 +287,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
+@@ -296,6 +296,8 @@ void InspectorController::disconnectFrontend(FrontendChannel& frontendChannel)
  
          // Unplug all instrumentations since they aren't needed now.
          InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
 +
-+        m_pauseWhenShown = false;
++        m_pauseOnStart = PauseCondition::DONT_PAUSE;
      }
  
      m_inspectorClient->frontendCountChanged(m_frontendRouter->frontendCount());
-@@ -306,6 +308,8 @@ void InspectorController::disconnectAllFrontends()
+@@ -315,6 +317,8 @@ void InspectorController::disconnectAllFrontends()
      // The frontend should call setInspectorFrontendClient(nullptr) under closeWindow().
      ASSERT(!m_inspectorFrontendClient);
  
-+    m_pauseWhenShown = false;
++    m_pauseOnStart = PauseCondition::DONT_PAUSE;
 +
      if (!m_frontendRouter->hasFrontends())
          return;
  
-@@ -394,8 +398,8 @@ void InspectorController::inspect(Node* node)
+@@ -398,8 +402,8 @@ void InspectorController::inspect(Node* node)
      if (!enabled())
          return;
  
@@ -2797,25 +2785,35 @@ index 3844ae7bab48f46b77cfd85530e4ab19392a71dd..8d705215457f89711e78e3bee9c983d1
  
      ensureDOMAgent().inspect(node);
  }
-@@ -538,4 +542,24 @@ void InspectorController::didComposite(LocalFrame& frame)
+@@ -542,4 +546,34 @@ void InspectorController::didComposite(LocalFrame& frame)
      InspectorInstrumentation::didComposite(frame);
  }
  
-+void InspectorController::pauseWhenShown()
++void InspectorController::pauseOnStart(PauseCondition condition)
 +{
-+    m_pauseWhenShown = true;
++    m_pauseOnStart = condition;
 +}
 +
 +void InspectorController::resumeIfPausedInNewWindow()
 +{
-+    m_pauseWhenShown = false;
++    m_pauseOnStart = PauseCondition::DONT_PAUSE;
 +}
 +
-+void InspectorController::didShowNewWindow()
++void InspectorController::didFinishPageCreation()
 +{
-+    if (!m_pauseWhenShown)
-+        return;
-+    while (m_pauseWhenShown) {
++    if (m_pauseOnStart == PauseCondition::WHEN_CREATION_FINISHED)
++        runLoopWhilePaused();
++}
++
++void InspectorController::didShowPage()
++{
++    if (m_pauseOnStart == PauseCondition::WHEN_SHOWN)
++        runLoopWhilePaused();
++}
++
++void InspectorController::runLoopWhilePaused()
++{
++    while (m_pauseOnStart != PauseCondition::DONT_PAUSE) {
 +        if (RunLoop::cycle() == RunLoop::CycleResult::Stop)
 +            break;
 +    }
@@ -2823,33 +2821,43 @@ index 3844ae7bab48f46b77cfd85530e4ab19392a71dd..8d705215457f89711e78e3bee9c983d1
 +
  } // namespace WebCore
 diff --git a/Source/WebCore/inspector/InspectorController.h b/Source/WebCore/inspector/InspectorController.h
-index 3a981b5bf5ca0bbf4d1c9f0b125564742cd8cad9..f8fc2ca6700461627933f149c5837075226a51a9 100644
+index 4f5c1e836876710a554455ec53733f72db63de58..774c4a66af84664a7a83ba0790d147f7bbb4236a 100644
 --- a/Source/WebCore/inspector/InspectorController.h
 +++ b/Source/WebCore/inspector/InspectorController.h
-@@ -101,6 +101,10 @@ public:
+@@ -106,6 +106,12 @@ public:
      WEBCORE_EXPORT void willComposite(LocalFrame&);
      WEBCORE_EXPORT void didComposite(LocalFrame&);
  
-+    WEBCORE_EXPORT void pauseWhenShown();
++    enum class PauseCondition { DONT_PAUSE, WHEN_SHOWN, WHEN_CREATION_FINISHED };
++    WEBCORE_EXPORT void pauseOnStart(PauseCondition);
 +    WEBCORE_EXPORT void resumeIfPausedInNewWindow();
-+    WEBCORE_EXPORT void didShowNewWindow();
++    WEBCORE_EXPORT void didShowPage();
++    WEBCORE_EXPORT void didFinishPageCreation();
 +
      // Testing support.
-     WEBCORE_EXPORT bool isUnderTest() const;
+     bool isUnderTest() const { return m_isUnderTest; }
      void setIsUnderTest(bool isUnderTest) { m_isUnderTest = isUnderTest; }
-@@ -154,6 +158,7 @@ private:
+@@ -136,6 +142,7 @@ private:
+ 
+     PageAgentContext pageAgentContext();
+     void createLazyAgents();
++    void runLoopWhilePaused();
+ 
+     WeakRef<Page> m_page;
+     Ref<InstrumentingAgents> m_instrumentingAgents;
+@@ -159,6 +166,7 @@ private:
      bool m_isAutomaticInspection { false };
      bool m_pauseAfterInitialization = { false };
      bool m_didCreateLazyAgents { false };
-+    bool m_pauseWhenShown { false };
++    PauseCondition m_pauseOnStart { PauseCondition::DONT_PAUSE };
  };
  
  } // namespace WebCore
 diff --git a/Source/WebCore/inspector/InspectorInstrumentation.cpp b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3ca973aaea 100644
+index 1c660f381ad7e9a9201aeced2906f39135e810f6..6c47abc2f32b39fd5c0bf9048b9c1224959ba08c 100644
 --- a/Source/WebCore/inspector/InspectorInstrumentation.cpp
 +++ b/Source/WebCore/inspector/InspectorInstrumentation.cpp
-@@ -597,6 +597,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
+@@ -595,6 +595,12 @@ void InspectorInstrumentation::applyUserAgentOverrideImpl(InstrumentingAgents& i
          pageAgent->applyUserAgentOverride(userAgent);
  }
  
@@ -2862,7 +2870,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  void InspectorInstrumentation::applyEmulatedMediaImpl(InstrumentingAgents& instrumentingAgents, AtomString& media)
  {
      if (auto* pageAgent = instrumentingAgents.enabledPageAgent())
-@@ -680,6 +686,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
+@@ -678,6 +684,12 @@ void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumen
          consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
  }
  
@@ -2875,7 +2883,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  void InspectorInstrumentation::willLoadXHRSynchronouslyImpl(InstrumentingAgents& instrumentingAgents)
  {
      if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent())
-@@ -712,20 +724,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
+@@ -710,20 +722,17 @@ void InspectorInstrumentation::didReceiveScriptResponseImpl(InstrumentingAgents&
  
  void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
  {
@@ -2899,7 +2907,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  }
  
  void InspectorInstrumentation::frameDetachedFromParentImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
-@@ -808,12 +817,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
+@@ -803,12 +812,6 @@ void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents& ins
          pageDOMDebuggerAgent->frameDocumentUpdated(frame);
  }
  
@@ -2912,7 +2920,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, LocalFrame& frame)
  {
      if (frame.isMainFrame()) {
-@@ -844,10 +847,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
+@@ -839,10 +842,10 @@ void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& inst
          inspectorPageAgent->frameStoppedLoading(frame);
  }
  
@@ -2925,7 +2933,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  }
  
  void InspectorInstrumentation::frameClearedScheduledNavigationImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
-@@ -862,6 +865,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
+@@ -857,6 +860,12 @@ void InspectorInstrumentation::accessibilitySettingsDidChangeImpl(InstrumentingA
          inspectorPageAgent->accessibilitySettingsDidChange();
  }
  
@@ -2935,10 +2943,23 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
 +        inspectorPageAgent->didNavigateWithinPage(frame);
 +}
 +
- #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT)
+ #if ENABLE(DARK_MODE_CSS)
  void InspectorInstrumentation::defaultAppearanceDidChangeImpl(InstrumentingAgents& instrumentingAgents)
  {
-@@ -1050,6 +1059,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
+@@ -909,6 +918,12 @@ void InspectorInstrumentation::interceptResponseImpl(InstrumentingAgents& instru
+         networkAgent->interceptResponse(response, identifier, WTFMove(handler));
+ }
+ 
++void InspectorInstrumentation::setStoppingLoadingDueToProcessSwapImpl(InstrumentingAgents& instrumentingAgents, bool value)
++{
++    if (auto* networkAgent = instrumentingAgents.enabledNetworkAgent())
++        networkAgent->setStoppingLoadingDueToProcessSwap(value);
++}
++
+ // JavaScriptCore InspectorDebuggerAgent should know Console MessageTypes.
+ static bool isConsoleAssertMessage(MessageSource source, MessageType type)
+ {
+@@ -1027,6 +1042,12 @@ void InspectorInstrumentation::consoleStopRecordingCanvasImpl(InstrumentingAgent
          canvasAgent->consoleStopRecordingCanvas(context);
  }
  
@@ -2948,10 +2969,10 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
 +        pageRuntimeAgent->bindingCalled(globalObject, name, arg);
 +}
 +
- void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents& instrumentingAgents, Database& database)
+ void InspectorInstrumentation::didDispatchDOMStorageEventImpl(InstrumentingAgents& instrumentingAgents, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
  {
-     if (auto* databaseAgent = instrumentingAgents.enabledDatabaseAgent())
-@@ -1356,6 +1371,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
+     if (auto* domStorageAgent = instrumentingAgents.enabledDOMStorageAgent())
+@@ -1317,6 +1338,36 @@ void InspectorInstrumentation::renderLayerDestroyedImpl(InstrumentingAgents& ins
          layerTreeAgent->renderLayerDestroyed(renderLayer);
  }
  
@@ -2988,7 +3009,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(WorkerOrWorkletGlobalScope& globalScope)
  {
      return globalScope.inspectorController().m_instrumentingAgents;
-@@ -1367,6 +1412,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
+@@ -1333,6 +1384,13 @@ InstrumentingAgents& InspectorInstrumentation::instrumentingAgents(Page& page)
      return page.inspectorController().m_instrumentingAgents.get();
  }
  
@@ -3003,7 +3024,7 @@ index 8c7b186092793bf301511be969030c92674ce211..bcad9353cd568ed435b42d5b9d505b3c
  {
      // Using RefPtr makes us hit the m_inRemovedLastRefFunction assert.
 diff --git a/Source/WebCore/inspector/InspectorInstrumentation.h b/Source/WebCore/inspector/InspectorInstrumentation.h
-index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114fca4d82a 100644
+index ed15dcc0dd1eb8d22dc48d8c6515b2258db574c5..c297c2d0e61b8ca1f881bb7942c463626bf0118f 100644
 --- a/Source/WebCore/inspector/InspectorInstrumentation.h
 +++ b/Source/WebCore/inspector/InspectorInstrumentation.h
 @@ -31,6 +31,7 @@
@@ -3030,7 +3051,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  class HTTPHeaderMap;
  class InspectorTimelineAgent;
  class InstrumentingAgents;
-@@ -192,6 +195,7 @@ public:
+@@ -197,6 +200,7 @@ public:
      static void didRecalculateStyle(Document&);
      static void didScheduleStyleRecalculation(Document&);
      static void applyUserAgentOverride(LocalFrame&, String&);
@@ -3038,39 +3059,47 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
      static void applyEmulatedMedia(LocalFrame&, AtomString&);
  
      static void flexibleBoxRendererBeganLayout(const RenderObject&);
-@@ -204,6 +208,7 @@ public:
+@@ -209,6 +213,7 @@ public:
      static void didReceiveData(LocalFrame*, ResourceLoaderIdentifier, const SharedBuffer*, int encodedDataLength);
      static void didFinishLoading(LocalFrame*, DocumentLoader*, ResourceLoaderIdentifier, const NetworkLoadMetrics&, ResourceLoader*);
      static void didFailLoading(LocalFrame*, DocumentLoader*, ResourceLoaderIdentifier, const ResourceError&);
 +    static void didReceiveMainResourceError(LocalFrame&, const ResourceError&);
  
-     static void willSendRequest(WorkerOrWorkletGlobalScope&, ResourceLoaderIdentifier, ResourceRequest&);
-     static void didReceiveResourceResponse(WorkerOrWorkletGlobalScope&, ResourceLoaderIdentifier, const ResourceResponse&);
-@@ -230,13 +235,13 @@ public:
+     static void willSendRequest(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, ResourceRequest&);
+     static void didReceiveResourceResponse(ServiceWorkerGlobalScope&, ResourceLoaderIdentifier, const ResourceResponse&);
+@@ -235,13 +240,13 @@ public:
      static void frameDetachedFromParent(LocalFrame&);
      static void didCommitLoad(LocalFrame&, DocumentLoader*);
      static void frameDocumentUpdated(LocalFrame&);
 -    static void loaderDetachedFromFrame(LocalFrame&, DocumentLoader&);
      static void frameStartedLoading(LocalFrame&);
      static void frameStoppedLoading(LocalFrame&);
-     static void didCompleteRenderingFrame(LocalFrame&);
+     static void didCompleteRenderingFrame(Frame&);
 -    static void frameScheduledNavigation(Frame&, Seconds delay);
 +    static void frameScheduledNavigation(Frame&, Seconds delay, bool targetIsCurrentFrame);
      static void frameClearedScheduledNavigation(Frame&);
      static void accessibilitySettingsDidChange(Page&);
 +    static void didNavigateWithinPage(LocalFrame&);
- #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT)
+ #if ENABLE(DARK_MODE_CSS)
      static void defaultAppearanceDidChange(Page&);
  #endif
-@@ -268,6 +273,7 @@ public:
-     static void stopProfiling(Page&, JSC::JSGlobalObject*, const String& title);
+@@ -252,6 +257,7 @@ public:
+     static bool shouldInterceptResponse(const LocalFrame&, const ResourceResponse&);
+     static void interceptRequest(ResourceLoader&, Function<void(const ResourceRequest&)>&&);
+     static void interceptResponse(const LocalFrame&, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
++    static void setStoppingLoadingDueToProcessSwap(Page*, bool);
+ 
+     static void addMessageToConsole(Page&, std::unique_ptr<Inspector::ConsoleMessage>);
+     static void addMessageToConsole(WorkerOrWorkletGlobalScope&, std::unique_ptr<Inspector::ConsoleMessage>);
+@@ -277,6 +283,7 @@ public:
+     static void stopProfiling(WorkerOrWorkletGlobalScope&, const String& title);
      static void consoleStartRecordingCanvas(CanvasRenderingContext&, JSC::JSGlobalObject&, JSC::JSObject* options);
      static void consoleStopRecordingCanvas(CanvasRenderingContext&);
 +    static void bindingCalled(Page& , JSC::JSGlobalObject*, const String& name, const String& arg);
  
-     static void performanceMark(ScriptExecutionContext&, const String&, std::optional<MonotonicTime>, LocalFrame*);
+     static void performanceMark(ScriptExecutionContext&, const String&, std::optional<MonotonicTime>);
  
-@@ -326,6 +332,12 @@ public:
+@@ -330,6 +337,12 @@ public:
      static void layerTreeDidChange(Page*);
      static void renderLayerDestroyed(Page*, const RenderLayer&);
  
@@ -3083,7 +3112,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
      static void frontendCreated();
      static void frontendDeleted();
      static bool hasFrontends() { return InspectorInstrumentationPublic::hasFrontends(); }
-@@ -342,6 +354,8 @@ public:
+@@ -346,6 +359,8 @@ public:
      static void registerInstrumentingAgents(InstrumentingAgents&);
      static void unregisterInstrumentingAgents(InstrumentingAgents&);
  
@@ -3092,7 +3121,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  private:
      static void didClearWindowObjectInWorldImpl(InstrumentingAgents&, LocalFrame&, DOMWrapperWorld&);
      static bool isDebuggerPausedImpl(InstrumentingAgents&);
-@@ -421,6 +435,7 @@ private:
+@@ -427,6 +442,7 @@ private:
      static void didRecalculateStyleImpl(InstrumentingAgents&);
      static void didScheduleStyleRecalculationImpl(InstrumentingAgents&, Document&);
      static void applyUserAgentOverrideImpl(InstrumentingAgents&, String&);
@@ -3100,7 +3129,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
      static void applyEmulatedMediaImpl(InstrumentingAgents&, AtomString&);
  
      static void flexibleBoxRendererBeganLayoutImpl(InstrumentingAgents&, const RenderObject&);
-@@ -435,6 +450,7 @@ private:
+@@ -441,6 +457,7 @@ private:
      static void didReceiveDataImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const SharedBuffer*, int encodedDataLength);
      static void didFinishLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*);
      static void didFailLoadingImpl(InstrumentingAgents&, ResourceLoaderIdentifier, DocumentLoader*, const ResourceError&);
@@ -3108,7 +3137,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
      static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
      static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&);
      static void scriptImportedImpl(InstrumentingAgents&, ResourceLoaderIdentifier, const String& sourceString);
-@@ -445,13 +461,13 @@ private:
+@@ -451,13 +468,13 @@ private:
      static void frameDetachedFromParentImpl(InstrumentingAgents&, LocalFrame&);
      static void didCommitLoadImpl(InstrumentingAgents&, LocalFrame&, DocumentLoader*);
      static void frameDocumentUpdatedImpl(InstrumentingAgents&, LocalFrame&);
@@ -3121,18 +3150,26 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
      static void frameClearedScheduledNavigationImpl(InstrumentingAgents&, Frame&);
      static void accessibilitySettingsDidChangeImpl(InstrumentingAgents&);
 +    static void didNavigateWithinPageImpl(InstrumentingAgents&, LocalFrame&);
- #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT)
+ #if ENABLE(DARK_MODE_CSS)
      static void defaultAppearanceDidChangeImpl(InstrumentingAgents&);
  #endif
-@@ -478,6 +494,7 @@ private:
-     static void stopProfilingImpl(InstrumentingAgents&, JSC::JSGlobalObject*, const String& title);
+@@ -468,6 +485,7 @@ private:
+     static bool shouldInterceptResponseImpl(InstrumentingAgents&, const ResourceResponse&);
+     static void interceptRequestImpl(InstrumentingAgents&, ResourceLoader&, Function<void(const ResourceRequest&)>&&);
+     static void interceptResponseImpl(InstrumentingAgents&, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
++    static void setStoppingLoadingDueToProcessSwapImpl(InstrumentingAgents&, bool);
+ 
+     static void addMessageToConsoleImpl(InstrumentingAgents&, std::unique_ptr<Inspector::ConsoleMessage>);
+ 
+@@ -482,6 +500,7 @@ private:
+     static void stopProfilingImpl(InstrumentingAgents&, const String& title);
      static void consoleStartRecordingCanvasImpl(InstrumentingAgents&, CanvasRenderingContext&, JSC::JSGlobalObject&, JSC::JSObject* options);
      static void consoleStopRecordingCanvasImpl(InstrumentingAgents&, CanvasRenderingContext&);
 +    static void bindingCalledImpl(InstrumentingAgents&, JSC::JSGlobalObject*, const String& name, const String& arg);
  
-     static void performanceMarkImpl(InstrumentingAgents&, const String& label, std::optional<MonotonicTime>, LocalFrame*);
+     static void performanceMarkImpl(InstrumentingAgents&, const String& label, std::optional<MonotonicTime>);
  
-@@ -536,6 +553,12 @@ private:
+@@ -535,6 +554,12 @@ private:
      static void layerTreeDidChangeImpl(InstrumentingAgents&);
      static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
  
@@ -3144,8 +3181,8 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
 +
      static InstrumentingAgents& instrumentingAgents(Page&);
      static InstrumentingAgents& instrumentingAgents(WorkerOrWorkletGlobalScope&);
- 
-@@ -1068,6 +1091,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
+     static InstrumentingAgents& instrumentingAgents(ServiceWorkerGlobalScope&);
+@@ -1094,6 +1119,13 @@ inline void InspectorInstrumentation::applyUserAgentOverride(LocalFrame& frame,
          applyUserAgentOverrideImpl(*agents, userAgent);
  }
  
@@ -3159,7 +3196,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  inline void InspectorInstrumentation::applyEmulatedMedia(LocalFrame& frame, AtomString& media)
  {
      FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1170,6 +1200,13 @@ inline void InspectorInstrumentation::didFailLoading(WorkerOrWorkletGlobalScope&
+@@ -1196,6 +1228,13 @@ inline void InspectorInstrumentation::didFailLoading(ServiceWorkerGlobalScope& g
      didFailLoadingImpl(instrumentingAgents(globalScope), identifier, nullptr, error);
  }
  
@@ -3173,7 +3210,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  inline void InspectorInstrumentation::continueAfterXFrameOptionsDenied(LocalFrame& frame, ResourceLoaderIdentifier identifier, DocumentLoader& loader, const ResourceResponse& response)
  {
      // Treat the same as didReceiveResponse.
-@@ -1260,13 +1297,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
+@@ -1286,13 +1325,6 @@ inline void InspectorInstrumentation::frameDocumentUpdated(LocalFrame& frame)
          frameDocumentUpdatedImpl(*agents, frame);
  }
  
@@ -3187,7 +3224,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  inline void InspectorInstrumentation::frameStartedLoading(LocalFrame& frame)
  {
      FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1288,11 +1318,11 @@ inline void InspectorInstrumentation::frameStoppedLoading(LocalFrame& frame)
+@@ -1314,11 +1346,11 @@ inline void InspectorInstrumentation::frameStoppedLoading(LocalFrame& frame)
          frameStoppedLoadingImpl(*agents, frame);
  }
  
@@ -3201,7 +3238,7 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  }
  
  inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame& frame)
-@@ -1308,6 +1338,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
+@@ -1334,6 +1366,13 @@ inline void InspectorInstrumentation::accessibilitySettingsDidChange(Page& page)
      accessibilitySettingsDidChangeImpl(instrumentingAgents(page));
  }
  
@@ -3212,11 +3249,25 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
 +        didNavigateWithinPageImpl(*agents, frame);
 +}
 +
- #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT)
+ #if ENABLE(DARK_MODE_CSS)
  inline void InspectorInstrumentation::defaultAppearanceDidChange(Page& page)
  {
-@@ -1696,6 +1733,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
-         performanceMarkImpl(*agents, label, WTFMove(startTime), frame);
+@@ -1386,6 +1425,13 @@ inline void InspectorInstrumentation::interceptResponse(const LocalFrame& frame,
+         interceptResponseImpl(*agents, response, identifier, WTFMove(handler));
+ }
+ 
++inline void InspectorInstrumentation::setStoppingLoadingDueToProcessSwap(Page* page, bool value)
++{
++    ASSERT(InspectorInstrumentationPublic::hasFrontends());
++    if (auto* agents = instrumentingAgents(page))
++        setStoppingLoadingDueToProcessSwapImpl(*agents, value);
++}
++
+ inline void InspectorInstrumentation::didDispatchDOMStorageEvent(Page& page, const String& key, const String& oldValue, const String& newValue, StorageType storageType, const SecurityOrigin& securityOrigin)
+ {
+     FAST_RETURN_IF_NO_FRONTENDS(void());
+@@ -1726,6 +1772,11 @@ inline void InspectorInstrumentation::performanceMark(ScriptExecutionContext& co
+         performanceMarkImpl(*agents, label, WTFMove(startTime));
  }
  
 +inline void InspectorInstrumentation::bindingCalled(Page& page, JSC::JSGlobalObject* globalObject, const String& name, const String& arg)
@@ -3224,10 +3275,10 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
 +    bindingCalledImpl(instrumentingAgents(page), globalObject, name, arg);
 +}
 +
- inline void InspectorInstrumentation::didRequestAnimationFrame(Document& document, int callbackId)
+ inline void InspectorInstrumentation::didRequestAnimationFrame(ScriptExecutionContext& scriptExecutionContext, int callbackId)
  {
      FAST_RETURN_IF_NO_FRONTENDS(void());
-@@ -1752,6 +1794,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
+@@ -1782,6 +1833,42 @@ inline void InspectorInstrumentation::renderLayerDestroyed(Page* page, const Ren
          renderLayerDestroyedImpl(*agents, renderLayer);
  }
  
@@ -3270,26 +3321,86 @@ index 7aa2d9e599359d9302cbdde8a7a0b9399e37d313..7b4ec6ee9adb5687e16eb0fe746a3114
  inline InstrumentingAgents* InspectorInstrumentation::instrumentingAgents(ScriptExecutionContext* context)
  {
      return context ? instrumentingAgents(*context) : nullptr;
+diff --git a/Source/WebCore/inspector/InspectorInstrumentationWebKit.cpp b/Source/WebCore/inspector/InspectorInstrumentationWebKit.cpp
+index a67a1244fa526ad5759068e97e0d220f59565d6e..0048589109fccb9472fe35a410337771b1063d72 100644
+--- a/Source/WebCore/inspector/InspectorInstrumentationWebKit.cpp
++++ b/Source/WebCore/inspector/InspectorInstrumentationWebKit.cpp
+@@ -50,4 +50,9 @@ void InspectorInstrumentationWebKit::interceptResponseInternal(const LocalFrame&
+     InspectorInstrumentation::interceptResponse(frame, response, identifier, WTFMove(handler));
+ }
+ 
++void InspectorInstrumentationWebKit::setStoppingLoadingDueToProcessSwapInternal(Page* page, bool value)
++{
++    InspectorInstrumentation::setStoppingLoadingDueToProcessSwap(page, value);
++}
++
+ } // namespace WebCore
+diff --git a/Source/WebCore/inspector/InspectorInstrumentationWebKit.h b/Source/WebCore/inspector/InspectorInstrumentationWebKit.h
+index c028341e84e59a6b1b16107fd74feb21f70b12ab..d385418ac34e8f315f201801a2c65226c8f6fee2 100644
+--- a/Source/WebCore/inspector/InspectorInstrumentationWebKit.h
++++ b/Source/WebCore/inspector/InspectorInstrumentationWebKit.h
+@@ -33,6 +33,7 @@
+ namespace WebCore {
+ 
+ class LocalFrame;
++class Page;
+ class ResourceLoader;
+ class ResourceRequest;
+ class ResourceResponse;
+@@ -44,12 +45,14 @@ public:
+     static bool shouldInterceptResponse(const LocalFrame*, const ResourceResponse&);
+     static void interceptRequest(ResourceLoader&, Function<void(const ResourceRequest&)>&&);
+     static void interceptResponse(const LocalFrame*, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
++    static void setStoppingLoadingDueToProcessSwap(Page*, bool);
+ 
+ private:
+     static bool shouldInterceptRequestInternal(const ResourceLoader&);
+     static bool shouldInterceptResponseInternal(const LocalFrame&, const ResourceResponse&);
+     static void interceptRequestInternal(ResourceLoader&, Function<void(const ResourceRequest&)>&&);
+     static void interceptResponseInternal(const LocalFrame&, const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
++    static void setStoppingLoadingDueToProcessSwapInternal(Page*, bool);
+ };
+ 
+ inline bool InspectorInstrumentationWebKit::shouldInterceptRequest(const ResourceLoader& loader)
+@@ -79,4 +82,10 @@ inline void InspectorInstrumentationWebKit::interceptResponse(const LocalFrame*
+     interceptResponseInternal(*frame, response, identifier, WTFMove(handler));
+ }
+ 
++inline void InspectorInstrumentationWebKit::setStoppingLoadingDueToProcessSwap(Page* page, bool value)
++{
++    FAST_RETURN_IF_NO_FRONTENDS(void());
++    setStoppingLoadingDueToProcessSwapInternal(page, value);
++}
++
+ }
 diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140efd1d31b 100644
+index 94492280fc724f299655a5df34492f929d82c57c..af0aafa701a9c697650aad2d86ddcf6b3022dcc5 100644
 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
 +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
-@@ -65,10 +65,14 @@
+@@ -54,6 +54,7 @@
+ #include "Cookie.h"
+ #include "CookieJar.h"
+ #include "CustomElementRegistry.h"
++#include "DirectoryFileListCreator.h"
+ #include "DOMEditor.h"
+ #include "DOMException.h"
+ #include "DOMPatchSupport.h"
+@@ -65,9 +66,14 @@
  #include "Event.h"
  #include "EventListener.h"
  #include "EventNames.h"
 +#include "File.h"
++#include <FileChooser.h>
 +#include "FileList.h"
- #include "FrameTree.h"
- #include "FullscreenManager.h"
 +#include "FloatQuad.h"
+ #include "FrameTree.h"
  #include "HTMLElement.h"
  #include "HTMLFrameOwnerElement.h"
 +#include "HTMLInputElement.h"
  #include "HTMLMediaElement.h"
  #include "HTMLNames.h"
  #include "HTMLScriptElement.h"
-@@ -102,12 +106,14 @@
+@@ -102,12 +108,14 @@
  #include "Pasteboard.h"
  #include "PseudoElement.h"
  #include "RenderGrid.h"
@@ -3304,7 +3415,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
  #include "StaticNodeList.h"
  #include "StyleProperties.h"
  #include "StyleResolver.h"
-@@ -145,7 +151,8 @@ using namespace HTMLNames;
+@@ -149,7 +157,8 @@ using namespace HTMLNames;
  static const size_t maxTextSize = 10000;
  static const UChar horizontalEllipsisUChar[] = { horizontalEllipsis, 0 };
  
@@ -3314,7 +3425,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
  {
      if (!colorObject)
          return std::nullopt;
-@@ -164,7 +171,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
+@@ -168,7 +177,7 @@ static std::optional<Color> parseColor(RefPtr<JSON::Object>&& colorObject)
  
  static std::optional<Color> parseRequiredConfigColor(const String& fieldName, JSON::Object& configObject)
  {
@@ -3323,7 +3434,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
  }
  
  static Color parseOptionalConfigColor(const String& fieldName, JSON::Object& configObject)
-@@ -192,6 +199,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
+@@ -195,6 +204,20 @@ static bool parseQuad(Ref<JSON::Array>&& quadArray, FloatQuad* quad)
      return true;
  }
  
@@ -3341,10 +3452,10 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
 +        renderer->absoluteQuads(quads);
 +}
 +
- class RevalidateStyleAttributeTask {
-     WTF_MAKE_FAST_ALLOCATED;
- public:
-@@ -466,6 +487,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
+ class RevalidateStyleAttributeTask final : public CanMakeCheckedPtr<RevalidateStyleAttributeTask> {
+     WTF_MAKE_TZONE_ALLOCATED(RevalidateStyleAttributeTask);
+     WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RevalidateStyleAttributeTask);
+@@ -475,6 +498,20 @@ Node* InspectorDOMAgent::assertNode(Inspector::Protocol::ErrorString& errorStrin
      return node.get();
  }
  
@@ -3365,7 +3476,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
  Document* InspectorDOMAgent::assertDocument(Inspector::Protocol::ErrorString& errorString, Inspector::Protocol::DOM::NodeId nodeId)
  {
      RefPtr node = assertNode(errorString, nodeId);
-@@ -1540,16 +1575,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
+@@ -1593,16 +1630,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::o
  Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::highlightNode(std::optional<Inspector::Protocol::DOM::NodeId>&& nodeId, const Inspector::Protocol::Runtime::RemoteObjectId& objectId, Ref<JSON::Object>&& highlightInspectorObject, RefPtr<JSON::Object>&& gridOverlayInspectorObject, RefPtr<JSON::Object>&& flexOverlayInspectorObject, std::optional<bool>&& showRulers)
  {
      Inspector::Protocol::ErrorString errorString;
@@ -3383,7 +3494,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
      if (!node)
          return makeUnexpected(errorString);
  
-@@ -1804,15 +1830,155 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
+@@ -1857,15 +1885,159 @@ Inspector::Protocol::ErrorStringOr<void> InspectorDOMAgent::setInspectedNode(Ins
      return { };
  }
  
@@ -3393,13 +3504,17 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
 +    return containingView.convertToRootView(point - toFloatSize(containingView.documentScrollPositionRelativeToViewOrigin()));
 +}
 +
-+static void frameQuadToViewport(LocalFrameView& containingView, FloatQuad& quad, float pageScaleFactor)
++static void frameQuadToViewport(LocalFrameView& containingView, FloatQuad& quad, Page& inspectedPage)
 +{
++    float pageScaleFactor = inspectedPage.pageScaleFactor();
++    auto mainFrame = inspectedPage.localMainFrame();
++    float scale = pageScaleFactor * mainFrame->pageZoomFactor();
++
 +    // Return css (not dip) coordinates by scaling back.
-+    quad.setP1(contentsToRootView(containingView, quad.p1()).scaled(1 / pageScaleFactor));
-+    quad.setP2(contentsToRootView(containingView, quad.p2()).scaled(1 / pageScaleFactor));
-+    quad.setP3(contentsToRootView(containingView, quad.p3()).scaled(1 / pageScaleFactor));
-+    quad.setP4(contentsToRootView(containingView, quad.p4()).scaled(1 / pageScaleFactor));
++    quad.setP1(contentsToRootView(containingView, quad.p1()).scaled(1 / scale));
++    quad.setP2(contentsToRootView(containingView, quad.p2()).scaled(1 / scale));
++    quad.setP3(contentsToRootView(containingView, quad.p3()).scaled(1 / scale));
++    quad.setP4(contentsToRootView(containingView, quad.p4()).scaled(1 / scale));
 +}
 +
 +static Ref<Inspector::Protocol::DOM::Quad> buildObjectForQuad(const FloatQuad& quad)
@@ -3457,7 +3572,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
 +    if (!node)
 +        return makeUnexpected("Node not found"_s);
 +
-+    m_inspectedPage.isolatedUpdateRendering();
++    m_inspectedPage->isolatedUpdateRendering();
 +    if (!node->isConnected())
 +        return makeUnexpected("Node is detached from document"_s);
 +
@@ -3503,7 +3618,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
 +        return makeUnexpected("Node not found"_s);
 +
 +    // Ensure quads are up to date.
-+    m_inspectedPage.isolatedUpdateRendering();
++    m_inspectedPage->isolatedUpdateRendering();
 +
 +    LocalFrameView* containingView = node->document().view();
 +    if (!containingView)
@@ -3512,7 +3627,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
 +    Vector<FloatQuad> quads;
 +    CollectQuads(node, quads);
 +    for (auto& quad : quads)
-+        frameQuadToViewport(*containingView, quad, m_inspectedPage.pageScaleFactor());
++        frameQuadToViewport(*containingView, quad, m_inspectedPage.get());
 +    return buildArrayOfQuads(quads);
 +}
 +
@@ -3542,7 +3657,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
      if (!object)
          return makeUnexpected("Missing injected script for given nodeId"_s);
  
-@@ -3061,7 +3227,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
+@@ -3131,7 +3303,7 @@ Inspector::Protocol::ErrorStringOr<Inspector::Protocol::DOM::NodeId> InspectorDO
      return makeUnexpected("Missing node for given path"_s);
  }
  
@@ -3551,7 +3666,7 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
  {
      Document* document = &node->document();
      if (auto* templateHost = document->templateDocumentHost())
-@@ -3070,12 +3236,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
+@@ -3140,12 +3312,18 @@ RefPtr<Inspector::Protocol::Runtime::RemoteObject> InspectorDOMAgent::resolveNod
      if (!frame)
          return nullptr;
  
@@ -3573,69 +3688,65 @@ index a5167242b6b1ee9d6ccfcd81ef86a5729882d3a4..d64c560f86db46786ba47fe55654c140
  }
  
  Node* InspectorDOMAgent::scriptValueAsNode(JSC::JSValue value)
-@@ -3183,4 +3355,57 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
+@@ -3291,4 +3469,53 @@ Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> In
  #endif
  }
  
-+Protocol::ErrorStringOr<void> InspectorDOMAgent::setInputFiles(const String& objectId, RefPtr<JSON::Array>&& files, RefPtr<JSON::Array>&& paths) {
++void InspectorDOMAgent::setInputFiles(const String& objectId, Ref<JSON::Array>&& paths, Ref<SetInputFilesCallback>&& callback) {
 +    InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
-+    if (injectedScript.hasNoValue())
-+        return makeUnexpected("Can not find element's context for given id"_s);
++    if (injectedScript.hasNoValue()) {
++        callback->sendFailure("Can not find element's context for given id"_s);
++        return;
++    }
 +
 +    Node* node = scriptValueAsNode(injectedScript.findObjectById(objectId));
-+    if (!node)
-+        return makeUnexpected("Can not find element for given id"_s);
++    if (!node) {
++        callback->sendFailure("Can not find element for given id"_s);
++        return;
++    }
 +
-+    if (node->nodeType() != Node::ELEMENT_NODE || node->nodeName() != "INPUT"_s)
-+        return makeUnexpected("Not an input node"_s);
-+
-+    if (!(bool(files) ^ bool(paths)))
-+        return makeUnexpected("Exactly one of files and paths should be specified"_s);
++    if (node->nodeType() != Node::ELEMENT_NODE || node->nodeName() != "INPUT"_s) {
++        callback->sendFailure("Not an input node"_s);
++        return;
++    }
 +
 +    HTMLInputElement* element = static_cast<HTMLInputElement*>(node);
 +    Vector<Ref<File>> fileObjects;
-+    if (files) {
-+        for (unsigned i = 0; i < files->length(); ++i) {
-+            RefPtr<JSON::Value> item = files->get(i);
-+            RefPtr<JSON::Object> obj = item->asObject();
-+            if (!obj)
-+                return makeUnexpected("Invalid file payload format"_s);
-+
-+            String name;
-+            String type;
-+            String data;
-+            if (!obj->getString("name"_s, name) || !obj->getString("type"_s, type) || !obj->getString("data"_s, data))
-+                return makeUnexpected("Invalid file payload format"_s);
-+
-+            std::optional<Vector<uint8_t>> buffer = base64Decode(data);
-+            if (!buffer)
-+                return makeUnexpected("Unable to decode given content"_s);
-+
-+            ScriptExecutionContext* context = element->scriptExecutionContext();
-+            fileObjects.append(File::create(context, Blob::create(context, WTFMove(*buffer), type), name));
++    if (element->hasAttributeWithoutSynchronization(webkitdirectoryAttr)) {
++        auto directoryFileListCreator = DirectoryFileListCreator::create([element = RefPtr { element }, callback = WTFMove(callback)](Ref<FileList>&& fileList) mutable {
++            ASSERT(isMainThread());
++            element->setFiles(WTFMove(fileList));
++            callback->sendSuccess();
++        });
++        Vector<FileChooserFileInfo> fileChooserFiles;
++        for (size_t i = 0; i < paths->length(); ++i) {
++            fileChooserFiles.append(FileChooserFileInfo { paths->get(i)->asString(), nullString(), { } });
 +        }
++        directoryFileListCreator->start(m_document.get(), fileChooserFiles);
 +    } else {
 +        for (unsigned i = 0; i < paths->length(); ++i) {
 +            RefPtr<JSON::Value> item = paths->get(i);
 +            String path = item->asString();
-+            if (path.isEmpty())
-+                return makeUnexpected("Invalid file path"_s);
++            if (path.isEmpty()) {
++                callback->sendFailure("Invalid file path"_s);
++                return;
++            }
 +
 +            ScriptExecutionContext* context = element->scriptExecutionContext();
 +            fileObjects.append(File::create(context, path));
 +        }
++        RefPtr<FileList> fileList = FileList::create(WTFMove(fileObjects));
++        element->setFiles(WTFMove(fileList));
++        callback->sendSuccess();
 +    }
-+    RefPtr<FileList> fileList = FileList::create(WTFMove(fileObjects));
-+    element->setFiles(WTFMove(fileList));
-+    return { };
 +}
 +
  } // namespace WebCore
 diff --git a/Source/WebCore/inspector/agents/InspectorDOMAgent.h b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
-index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e91799ac12b1 100644
+index 3496e0037572430b993ea91704501a742dd15627..9eb0ce0094fdb2ab9ca94bb5cddb082f201bf4cf 100644
 --- a/Source/WebCore/inspector/agents/InspectorDOMAgent.h
 +++ b/Source/WebCore/inspector/agents/InspectorDOMAgent.h
-@@ -57,6 +57,7 @@ namespace WebCore {
+@@ -59,6 +59,7 @@ namespace WebCore {
  
  class AXCoreObject;
  class CharacterData;
@@ -3643,7 +3754,7 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917
  class DOMEditor;
  class Document;
  class Element;
-@@ -91,6 +92,7 @@ public:
+@@ -95,6 +96,7 @@ public:
      static String toErrorString(Exception&&);
  
      static String documentURLString(Document*);
@@ -3651,7 +3762,7 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917
  
      // We represent embedded doms as a part of the same hierarchy. Hence we treat children of frame owners differently.
      // We also skip whitespace text nodes conditionally. Following methods encapsulate these specifics.
-@@ -134,7 +136,7 @@ public:
+@@ -140,7 +142,7 @@ public:
      Inspector::Protocol::ErrorStringOr<std::tuple<String /* searchId */, int /* resultCount */>> performSearch(const String& query, RefPtr<JSON::Array>&& nodeIds, std::optional<bool>&& caseSensitive);
      Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<Inspector::Protocol::DOM::NodeId>>> getSearchResults(const String& searchId, int fromIndex, int toIndex);
      Inspector::Protocol::ErrorStringOr<void> discardSearchResults(const String& searchId);
@@ -3660,18 +3771,18 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917
      Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<String>>> getAttributes(Inspector::Protocol::DOM::NodeId);
  #if PLATFORM(IOS_FAMILY)
      Inspector::Protocol::ErrorStringOr<void> setInspectModeEnabled(bool, RefPtr<JSON::Object>&& highlightConfig, RefPtr<JSON::Object>&& gridOverlayConfig, RefPtr<JSON::Object>&& flexOverlayConfig);
-@@ -171,6 +173,10 @@ public:
+@@ -177,6 +179,10 @@ public:
      Inspector::Protocol::ErrorStringOr<void> setInspectedNode(Inspector::Protocol::DOM::NodeId);
      Inspector::Protocol::ErrorStringOr<void> setAllowEditingUserAgentShadowTrees(bool);
      Inspector::Protocol::ErrorStringOr<Ref<Inspector::Protocol::DOM::MediaStats>> getMediaStats(Inspector::Protocol::DOM::NodeId);
 +    Inspector::Protocol::ErrorStringOr<std::tuple<String /* contentFrameId */, String /* ownerFrameId */>> describeNode(const String& objectId);
 +    Inspector::Protocol::ErrorStringOr<void> scrollIntoViewIfNeeded(const String& objectId, RefPtr<JSON::Object>&& rect);
 +    Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<Inspector::Protocol::DOM::Quad>>> getContentQuads(const String& objectId);
-+    Inspector::Protocol::ErrorStringOr<void> setInputFiles(const String& objectId, RefPtr<JSON::Array>&& files, RefPtr<JSON::Array>&& paths);
++    void setInputFiles(const String& objectId, Ref<JSON::Array>&& paths, Ref<SetInputFilesCallback>&& callback);
  
      // InspectorInstrumentation
      Inspector::Protocol::DOM::NodeId identifierForNode(Node&);
-@@ -212,7 +218,7 @@ public:
+@@ -218,7 +224,7 @@ public:
      Node* nodeForId(Inspector::Protocol::DOM::NodeId);
      Inspector::Protocol::DOM::NodeId boundNodeId(const Node*);
  
@@ -3680,7 +3791,7 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917
      bool handleMousePress();
      void mouseDidMoveOverElement(const HitTestResult&, OptionSet<PlatformEventModifier>);
      void inspect(Node*);
-@@ -224,12 +230,15 @@ public:
+@@ -230,12 +236,15 @@ public:
      void reset();
  
      Node* assertNode(Inspector::Protocol::ErrorString&, Inspector::Protocol::DOM::NodeId);
@@ -3696,7 +3807,7 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917
  private:
  #if ENABLE(VIDEO)
      void mediaMetricsTimerFired();
-@@ -259,7 +268,6 @@ private:
+@@ -265,7 +274,6 @@ private:
      void processAccessibilityChildren(AXCoreObject&, JSON::ArrayOf<Inspector::Protocol::DOM::NodeId>&);
      
      Node* nodeForPath(const String& path);
@@ -3705,18 +3816,18 @@ index 5f1dba2bc4d5c2f113a88dcc9ba479679cb79233..5616c853a99b5fdb38306a804cc0e917
      void discardBindings();
  
 diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df8065d50419 100644
+index f3a0bdf189aed455ceb84f4023c2dbfda8e5dc16..25d54fc33be2ccd42565cb7ddf879344ab8aa3f2 100644
 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
 +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
-@@ -59,6 +59,7 @@
+@@ -58,6 +58,7 @@
+ #include "LocalFrame.h"
  #include "MIMETypeRegistry.h"
  #include "MemoryCache.h"
- #include "NetworkResourcesData.h"
 +#include "NetworkStateNotifier.h"
  #include "Page.h"
  #include "PlatformStrategies.h"
  #include "ProgressTracker.h"
-@@ -339,8 +340,8 @@ static Ref<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(
+@@ -344,8 +345,8 @@ static Ref<Inspector::Protocol::Network::Request> buildObjectForResourceRequest(
          .release();
  
      if (request.httpBody() && !request.httpBody()->isEmpty()) {
@@ -3727,7 +3838,7 @@ index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df80
      }
  
      if (resourceLoader) {
-@@ -393,6 +394,8 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
+@@ -398,6 +399,8 @@ RefPtr<Inspector::Protocol::Network::Response> InspectorNetworkAgent::buildObjec
          .setSource(responseSource(response.source()))
          .release();
  
@@ -3736,7 +3847,25 @@ index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df80
      if (resourceLoader) {
          auto* metrics = response.deprecatedNetworkLoadMetricsOrNull();
          responseObject->setTiming(buildObjectForTiming(metrics ? *metrics : NetworkLoadMetrics::emptyMetrics(), *resourceLoader));
-@@ -960,6 +963,7 @@ void InspectorNetworkAgent::continuePendingResponses()
+@@ -684,6 +687,9 @@ void InspectorNetworkAgent::didFailLoading(ResourceLoaderIdentifier identifier,
+     String requestId = IdentifiersFactory::requestId(identifier.toUInt64());
+ 
+     if (loader && m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource) {
++        if (m_stoppingLoadingDueToProcessSwap)
++            return;
++
+         auto* frame = loader->frame();
+         if (frame && frame->loader().documentLoader() && frame->document()) {
+             m_resourcesData->addResourceSharedBuffer(requestId,
+@@ -913,6 +919,7 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::disable()
+     m_instrumentingAgents.setEnabledNetworkAgent(nullptr);
+     m_resourcesData->clear();
+     m_extraRequestHeaders.clear();
++    m_stoppingLoadingDueToProcessSwap = false;
+ 
+     continuePendingRequests();
+     continuePendingResponses();
+@@ -958,6 +965,7 @@ void InspectorNetworkAgent::continuePendingResponses()
  
  Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setExtraHTTPHeaders(Ref<JSON::Object>&& headers)
  {
@@ -3744,7 +3873,19 @@ index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df80
      for (auto& entry : headers.get()) {
          auto stringValue = entry.value->asString();
          if (!!stringValue)
-@@ -1238,6 +1242,9 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithReq
+@@ -1207,6 +1215,11 @@ void InspectorNetworkAgent::interceptResponse(const ResourceResponse& response,
+     m_frontendDispatcher->responseIntercepted(requestId, resourceResponse.releaseNonNull());
+ }
+ 
++void InspectorNetworkAgent::setStoppingLoadingDueToProcessSwap(bool stopping)
++{
++    m_stoppingLoadingDueToProcessSwap = stopping;
++}
++
+ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptContinue(const Inspector::Protocol::Network::RequestId& requestId, Inspector::Protocol::Network::NetworkStage networkStage)
+ {
+     switch (networkStage) {
+@@ -1236,6 +1249,9 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptWithReq
          return makeUnexpected("Missing pending intercept request for given requestId"_s);
  
      auto& loader = *pendingRequest->m_loader;
@@ -3754,7 +3895,7 @@ index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df80
      ResourceRequest request = loader.request();
      if (!!url)
          request.setURL(URL({ }, url));
-@@ -1333,14 +1340,23 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequest
+@@ -1331,13 +1347,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::interceptRequest
      response.setHTTPStatusCode(status);
      response.setHTTPStatusText(String { statusText });
      HTTPHeaderMap explicitHeaders;
@@ -3770,17 +3911,15 @@ index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df80
      }
      response.setHTTPHeaderFields(WTFMove(explicitHeaders));
      response.setHTTPHeaderField(HTTPHeaderName::ContentType, response.mimeType());
--    loader->didReceiveResponse(response, [loader, buffer = data.releaseNonNull()]() {
 +
 +    auto* frame = loader->frame();
 +    if (!setCookieValue.isEmpty() && frame && frame->page())
 +        frame->page()->cookieJar().setCookieFromResponse(*loader.get(), setCookieValue);
 +
-+    loader->didReceiveResponse(response, [loader, buffer = data.releaseNonNull()]() mutable {
+     loader->didReceiveResponse(WTFMove(response), [loader, buffer = data.releaseNonNull()]() {
          if (loader->reachedTerminalState())
              return;
- 
-@@ -1403,6 +1419,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setEmulatedCondi
+@@ -1401,6 +1426,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorNetworkAgent::setEmulatedCondi
  
  #endif // ENABLE(INSPECTOR_NETWORK_THROTTLING)
  
@@ -3794,19 +3933,19 @@ index 00dba5735f2f682d00f7e17ef2abddf85a4c7f90..4c2ca023d6ad04a3ccda68d5f707df80
  {
      return startsWithLettersIgnoringASCIICase(mimeType, "text/"_s)
 diff --git a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
-index dc7e574ee6e9256a1f75ea838d20ca7f5e9190de..5dd4464256e0f5d652fa51fd611286ddc1da6f5c 100644
+index de6b2dd844943074c5a383c7b9b8ccba1c96419a..7a3404f2380b5e62f1c0523a70f8ef442014759d 100644
 --- a/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
 +++ b/Source/WebCore/inspector/agents/InspectorNetworkAgent.h
-@@ -34,6 +34,8 @@
- #include "InspectorInstrumentation.h"
+@@ -35,6 +35,8 @@
  #include "InspectorPageAgent.h"
  #include "InspectorWebAgentBase.h"
+ #include "NetworkResourcesData.h"
 +#include "ResourceError.h"
 +#include "SharedBuffer.h"
  #include "WebSocket.h"
+ #include <JavaScriptCore/ContentSearchUtilities.h>
  #include <JavaScriptCore/InspectorBackendDispatchers.h>
- #include <JavaScriptCore/InspectorFrontendDispatchers.h>
-@@ -101,6 +103,7 @@ public:
+@@ -104,6 +106,7 @@ public:
  #if ENABLE(INSPECTOR_NETWORK_THROTTLING)
      Inspector::Protocol::ErrorStringOr<void> setEmulatedConditions(std::optional<int>&& bytesPerSecondLimit) final;
  #endif
@@ -3814,14 +3953,31 @@ index dc7e574ee6e9256a1f75ea838d20ca7f5e9190de..5dd4464256e0f5d652fa51fd611286dd
  
      // InspectorInstrumentation
      void willRecalculateStyle();
+@@ -135,6 +138,7 @@ public:
+     bool shouldInterceptResponse(const ResourceResponse&);
+     void interceptResponse(const ResourceResponse&, ResourceLoaderIdentifier, CompletionHandler<void(const ResourceResponse&, RefPtr<FragmentedSharedBuffer>)>&&);
+     void interceptRequest(ResourceLoader&, Function<void(const ResourceRequest&)>&&);
++    void setStoppingLoadingDueToProcessSwap(bool);
+ 
+     void searchOtherRequests(const JSC::Yarr::RegularExpression&, Ref<JSON::ArrayOf<Inspector::Protocol::Page::SearchResult>>&);
+     void searchInRequest(Inspector::Protocol::ErrorString&, const Inspector::Protocol::Network::RequestId&, const String& query, bool caseSensitive, bool isRegex, RefPtr<JSON::ArrayOf<Inspector::Protocol::GenericTypes::SearchMatch>>&);
+@@ -275,6 +279,7 @@ private:
+     bool m_enabled { false };
+     bool m_loadingXHRSynchronously { false };
+     bool m_interceptionEnabled { false };
++    bool m_stoppingLoadingDueToProcessSwap { false };
+ };
+ 
+ } // namespace WebCore
 diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8dea87401 100644
+index cc649f41559f905102d7a8785190f3157d3e6dea..ee7fee8a4ac224d27dd40d04be0803ff89720232 100644
 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
 +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp
-@@ -32,19 +32,26 @@
+@@ -32,19 +32,27 @@
  #include "config.h"
  #include "InspectorPageAgent.h"
  
++#include "AXCoreObject.h"
 +#include "AXObjectCache.h"
 +#include "BackForwardController.h"
  #include "CachedResource.h"
@@ -3845,22 +4001,22 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  #include "HTMLNames.h"
  #include "ImageBuffer.h"
  #include "InspectorClient.h"
-@@ -55,10 +62,13 @@
- #include "LocalFrame.h"
- #include "LocalFrameView.h"
+@@ -57,24 +65,38 @@
  #include "MIMETypeRegistry.h"
--#include "MemoryCache.h"
+ #include "MemoryCache.h"
  #include "Page.h"
 +#include "PageRuntimeAgent.h"
 +#include "PlatformScreen.h"
- #include "RenderObject.h"
+ #include "RenderObjectInlines.h"
  #include "RenderTheme.h"
 +#include "DeprecatedGlobalSettings.h"
 +#include "SimpleRange.h"
  #include "ScriptController.h"
  #include "ScriptSourceCode.h"
++#include "ScrollingCoordinator.h"
  #include "SecurityOrigin.h"
-@@ -66,11 +76,18 @@
+ #include "Settings.h"
+ #include "ShouldPartitionCookie.h"
  #include "StyleScope.h"
  #include "Theme.h"
  #include <pal/text/TextEncoding.h>
@@ -3874,29 +4030,29 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +#include <wtf/DateMath.h>
  #include <wtf/ListHashSet.h>
 +#include <wtf/NeverDestroyed.h>
++#include <wtf/ObjectIdentifier.h>
 +#include <wtf/Ref.h>
 +#include <wtf/RefPtr.h>
  #include <wtf/Stopwatch.h>
+ #include <wtf/TZoneMallocInlines.h>
  #include <wtf/text/Base64.h>
++#include <wtf/text/MakeString.h>
  #include <wtf/text/StringBuilder.h>
-@@ -83,11 +100,15 @@
- #include "LegacyWebArchive.h"
- #endif
  
--
- namespace WebCore {
+ #if ENABLE(APPLICATION_MANIFEST)
+@@ -96,6 +118,11 @@ using namespace Inspector;
  
- using namespace Inspector;
+ WTF_MAKE_TZONE_ALLOCATED_IMPL(InspectorPageAgent);
  
-+static HashMap<String, Ref<DOMWrapperWorld>>& createdUserWorlds() {
-+    static NeverDestroyed<HashMap<String, Ref<DOMWrapperWorld>>> nameToWorld;
++static UncheckedKeyHashMap<String, Ref<DOMWrapperWorld>>& createdUserWorlds() {
++    static NeverDestroyed<UncheckedKeyHashMap<String, Ref<DOMWrapperWorld>>> nameToWorld;
 +    return nameToWorld;
 +}
 +
  static bool decodeBuffer(std::span<const uint8_t> buffer, const String& textEncodingName, String* result)
  {
      if (buffer.data()) {
-@@ -334,6 +355,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien
+@@ -348,6 +375,7 @@ InspectorPageAgent::InspectorPageAgent(PageAgentContext& context, InspectorClien
      , m_frontendDispatcher(makeUnique<Inspector::PageFrontendDispatcher>(context.frontendRouter))
      , m_backendDispatcher(Inspector::PageBackendDispatcher::create(context.backendDispatcher, this))
      , m_inspectedPage(context.inspectedPage)
@@ -3904,7 +4060,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
      , m_client(client)
      , m_overlay(overlay)
  {
-@@ -363,12 +385,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
+@@ -377,12 +405,20 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::enable()
  
      defaultUserPreferencesDidChange();
  
@@ -3925,13 +4081,13 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  
      setShowPaintRects(false);
  #if !PLATFORM(IOS_FAMILY)
-@@ -420,6 +450,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
+@@ -435,6 +471,22 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::reload(std::optiona
      return { };
  }
  
 +Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::goBack()
 +{
-+    if (!m_inspectedPage.backForward().goBack())
++    if (!m_inspectedPage->backForward().goBack())
 +        return makeUnexpected("Failed to go back"_s);
 +
 +    return { };
@@ -3939,7 +4095,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +
 +Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::goForward()
 +{
-+    if (!m_inspectedPage.backForward().goForward())
++    if (!m_inspectedPage->backForward().goForward())
 +        return makeUnexpected("Failed to go forward"_s);
 +
 +    return { };
@@ -3947,8 +4103,8 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +
  Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::navigate(const String& url)
  {
-     auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage.mainFrame());
-@@ -443,6 +489,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
+     RefPtr localMainFrame = m_inspectedPage->localMainFrame();
+@@ -461,6 +513,13 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideUserAgent(c
      return { };
  }
  
@@ -3961,8 +4117,8 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +
  Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Inspector::Protocol::Page::Setting setting, std::optional<bool>&& value)
  {
-     auto& inspectedPageSettings = m_inspectedPage.settings();
-@@ -456,6 +509,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+     auto& inspectedPageSettings = m_inspectedPage->settings();
+@@ -474,6 +533,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
          inspectedPageSettings.setAuthorAndUserStylesEnabledInspectorOverride(value);
          return { };
  
@@ -3975,8 +4131,8 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
      case Inspector::Protocol::Page::Setting::ICECandidateFilteringEnabled:
          inspectedPageSettings.setICECandidateFilteringEnabledInspectorOverride(value);
          return { };
-@@ -481,6 +540,38 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
-         inspectedPageSettings.setNeedsSiteSpecificQuirksInspectorOverride(value);
+@@ -500,6 +565,39 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+         m_client->setDeveloperPreferenceOverride(InspectorClient::DeveloperPreference::NeedsSiteSpecificQuirks, value);
          return { };
  
 +#if ENABLE(NOTIFICATIONS)
@@ -3992,17 +4148,18 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +#endif
 +
 +    case Protocol::Page::Setting::InputTypeMonthEnabled:
-+// Playwright client sends it even if it's not supported.
-+#if ENABLE(INPUT_TYPE_MONTH)
 +        inspectedPageSettings.setInputTypeMonthEnabled(value.value_or(false));
-+#endif
 +        return { };
 +
 +    case Protocol::Page::Setting::InputTypeWeekEnabled:
-+// Playwright client sends it even if it's not supported.
-+#if ENABLE(INPUT_TYPE_WEEK)
 +        inspectedPageSettings.setInputTypeWeekEnabled(value.value_or(false));
-+#endif
++        return { };
++
++    case Protocol::Page::Setting::FixedBackgroundsPaintRelativeToDocument:
++        // Enable this setting similar to iOS to ensure scrolling works with
++        // `background-attachment: fixed`.
++        // See https://github.com/microsoft/playwright/issues/31551.
++        inspectedPageSettings.setFixedBackgroundsPaintRelativeToDocument(value.value_or(false));
 +        return { };
 +
 +#if ENABLE(POINTER_LOCK)
@@ -4014,7 +4171,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
      case Inspector::Protocol::Page::Setting::ScriptEnabled:
          inspectedPageSettings.setScriptEnabledInspectorOverride(value);
          return { };
-@@ -493,6 +584,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
+@@ -512,6 +610,12 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::overrideSetting(Ins
          inspectedPageSettings.setShowRepaintCounterInspectorOverride(value);
          return { };
  
@@ -4027,7 +4184,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
      case Inspector::Protocol::Page::Setting::WebSecurityEnabled:
          inspectedPageSettings.setWebSecurityEnabledInspectorOverride(value);
          return { };
-@@ -893,15 +990,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
+@@ -920,15 +1024,16 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setShowPaintRects(b
      return { };
  }
  
@@ -4049,27 +4206,31 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  }
  
  void InspectorPageAgent::frameNavigated(LocalFrame& frame)
-@@ -909,13 +1007,25 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
+@@ -936,13 +1041,29 @@ void InspectorPageAgent::frameNavigated(LocalFrame& frame)
      m_frontendDispatcher->frameNavigated(buildObjectForFrame(&frame));
  }
  
-+String InspectorPageAgent::makeFrameID(ProcessIdentifier processID,  FrameIdentifier frameID)
++String InspectorPageAgent::serializeFrameID(FrameIdentifier frameID)
 +{
-+    return makeString(processID.toUInt64(), ".", frameID.object().toUInt64());
++    return makeString(frameID.toUInt64());
 +}
 +
-+static String globalIDForFrame(Frame& frame)
++std::optional<FrameIdentifier> InspectorPageAgent::parseFrameID(String frameID)
 +{
-+    // TODO(playwright): for OOPIF we have to use id of the web process where the frame is hosted.
-+    // Working at the moment because OOPIF is diabled.
-+    return InspectorPageAgent::makeFrameID(Process::identifier(), frame.frameID());
++    if (!frameID.containsOnlyASCII())
++        return std::nullopt;
++
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
++    uint64_t frameIDNumber = strtoull(frameID.ascii().data(), 0, 10);
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
++    return WebCore::FrameIdentifier(frameIDNumber);
 +}
 +
  void InspectorPageAgent::frameDetached(LocalFrame& frame)
  {
 -    auto identifier = m_frameToIdentifier.take(frame);
 -    if (identifier.isNull())
-+    String identifier = globalIDForFrame(frame);
++    String identifier = serializeFrameID(frame.frameID());
 +    if (!m_identifierToFrame.take(identifier))
          return;
 +
@@ -4078,7 +4239,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  }
  
  Frame* InspectorPageAgent::frameForId(const Inspector::Protocol::Network::FrameId& frameId)
-@@ -927,20 +1037,17 @@ String InspectorPageAgent::frameId(Frame* frame)
+@@ -954,20 +1075,21 @@ String InspectorPageAgent::frameId(Frame* frame)
  {
      if (!frame)
          return emptyString();
@@ -4087,7 +4248,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 -        m_identifierToFrame.set(identifier, frame);
 -        return identifier;
 -    }).iterator->value;
-+    String identifier = globalIDForFrame(*frame);
++    String identifier = serializeFrameID(frame->frameID());
 +    m_identifierToFrame.set(identifier, frame);
 +    return identifier;
  }
@@ -4100,11 +4261,15 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 -        return IdentifiersFactory::createIdentifier();
 -    }).iterator->value;
 +
-+    return String::number(loader->navigationID());
++    auto navigationID = loader->navigationID();
++    if (!navigationID)
++        return emptyString();
++
++    return String::number(navigationID->toUInt64());
  }
  
  LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& errorString, const Inspector::Protocol::Network::FrameId& frameId)
-@@ -951,11 +1058,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
+@@ -978,11 +1100,6 @@ LocalFrame* InspectorPageAgent::assertFrame(Inspector::Protocol::ErrorString& er
      return frame;
  }
  
@@ -4116,7 +4281,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  void InspectorPageAgent::frameStartedLoading(LocalFrame& frame)
  {
      m_frontendDispatcher->frameStartedLoading(frameId(&frame));
-@@ -966,9 +1068,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
+@@ -993,9 +1110,9 @@ void InspectorPageAgent::frameStoppedLoading(LocalFrame& frame)
      m_frontendDispatcher->frameStoppedLoading(frameId(&frame));
  }
  
@@ -4128,7 +4293,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  }
  
  void InspectorPageAgent::frameClearedScheduledNavigation(Frame& frame)
-@@ -1015,6 +1117,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
+@@ -1042,6 +1159,12 @@ void InspectorPageAgent::defaultUserPreferencesDidChange()
      m_frontendDispatcher->defaultUserPreferencesDidChange(WTFMove(defaultUserPreferences));
  }
  
@@ -4138,10 +4303,10 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +    m_frontendDispatcher->navigatedWithinDocument(frameId(&frame), url);
 +}
 +
- #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT)
+ #if ENABLE(DARK_MODE_CSS)
  void InspectorPageAgent::defaultAppearanceDidChange()
  {
-@@ -1028,6 +1136,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
+@@ -1055,6 +1178,9 @@ void InspectorPageAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapp
          return;
  
      if (m_bootstrapScript.isEmpty())
@@ -4151,8 +4316,8 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
          return;
  
      frame.script().evaluateIgnoringException(ScriptSourceCode(m_bootstrapScript, JSC::SourceTaintedOrigin::Untainted, URL { "web-inspector://bootstrap.js"_str }));
-@@ -1075,6 +1186,51 @@ void InspectorPageAgent::didRecalculateStyle()
-     m_overlay->update();
+@@ -1102,6 +1228,51 @@ void InspectorPageAgent::didRecalculateStyle()
+     protectedOverlay()->update();
  }
  
 +void InspectorPageAgent::runOpenPanel(HTMLInputElement* element, bool* intercept)
@@ -4203,7 +4368,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  Ref<Inspector::Protocol::Page::Frame> InspectorPageAgent::buildObjectForFrame(LocalFrame* frame)
  {
      ASSERT_ARG(frame, frame);
-@@ -1172,6 +1328,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
+@@ -1195,6 +1366,12 @@ void InspectorPageAgent::applyUserAgentOverride(String& userAgent)
          userAgent = m_userAgentOverride;
  }
  
@@ -4216,38 +4381,38 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  void InspectorPageAgent::applyEmulatedMedia(AtomString& media)
  {
      if (!m_emulatedMedia.isEmpty())
-@@ -1199,11 +1361,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
+@@ -1222,11 +1399,13 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotNode(Insp
      return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
  }
  
 -Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int x, int y, int width, int height, Inspector::Protocol::Page::CoordinateSystem coordinateSystem)
 +Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int x, int y, int width, int height, Inspector::Protocol::Page::CoordinateSystem coordinateSystem, std::optional<bool>&& omitDeviceScaleFactor)
  {
-     SnapshotOptions options { { }, PixelFormat::BGRA8, DestinationColorSpace::SRGB() };
+     SnapshotOptions options { { }, ImageBufferPixelFormat::BGRA8, DestinationColorSpace::SRGB() };
      if (coordinateSystem == Inspector::Protocol::Page::CoordinateSystem::Viewport)
          options.flags.add(SnapshotFlags::InViewCoordinates);
 +    if (omitDeviceScaleFactor.has_value() && *omitDeviceScaleFactor)
 +        options.flags.add(SnapshotFlags::OmitDeviceScaleFactor);
  
      IntRect rectangle(x, y, width, height);
-     auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage.mainFrame());
-@@ -1217,6 +1381,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
+     RefPtr localMainFrame = m_inspectedPage->localMainFrame();
+@@ -1240,6 +1419,43 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::snapshotRect(int
      return snapshot->toDataURL("image/png"_s, std::nullopt, PreserveResolution::Yes);
  }
  
 +Protocol::ErrorStringOr<void> InspectorPageAgent::setForcedColors(std::optional<Protocol::Page::ForcedColors>&& forcedColors)
 +{
 +    if (!forcedColors) {
-+        m_inspectedPage.setUseForcedColorsOverride(std::nullopt);
++        m_inspectedPage->setUseForcedColorsOverride(std::nullopt);
 +        return { };
 +    }
 +
 +    switch (*forcedColors) {
 +        case Protocol::Page::ForcedColors::Active:
-+            m_inspectedPage.setUseForcedColorsOverride(true);
++            m_inspectedPage->setUseForcedColorsOverride(true);
 +            return { };
 +        case Protocol::Page::ForcedColors::None:
-+            m_inspectedPage.setUseForcedColorsOverride(false);
++            m_inspectedPage->setUseForcedColorsOverride(false);
 +            return { };
 +    }
 +
@@ -4259,7 +4424,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +{
 +    bool success = WTF::setTimeZoneOverride(timeZone);
 +    if (!success)
-+        return makeUnexpected("Invalid time zone " + timeZone);
++        return makeUnexpected(makeString("Invalid time zone "_s, timeZone));
 +
 +    return { };
 +}
@@ -4267,7 +4432,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +Protocol::ErrorStringOr<void> InspectorPageAgent::setTouchEmulationEnabled(bool enabled)
 +{
 +  setScreenHasTouchDeviceOverride(enabled);
-+  m_inspectedPage.settings().setTouchEventsEnabled(enabled);
++  m_inspectedPage->settings().setTouchEventDOMAttributesEnabled(enabled);
 +  return { };
 +}
 +
@@ -4275,7 +4440,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  #if ENABLE(WEB_ARCHIVE) && USE(CF)
  Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
  {
-@@ -1233,7 +1434,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
+@@ -1256,7 +1472,6 @@ Inspector::Protocol::ErrorStringOr<String> InspectorPageAgent::archive()
  }
  #endif
  
@@ -4283,15 +4448,16 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverride(std::optional<int>&& width, std::optional<int>&& height)
  {
      if (width.has_value() != height.has_value())
-@@ -1251,6 +1451,519 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
+@@ -1274,6 +1489,496 @@ Inspector::Protocol::ErrorStringOr<void> InspectorPageAgent::setScreenSizeOverri
      localMainFrame->setOverrideScreenSize(FloatSize(width.value_or(0), height.value_or(0)));
      return { };
  }
+-#endif
 +
 +Protocol::ErrorStringOr<void> InspectorPageAgent::insertText(const String& text)
 +{
 +    UserGestureIndicator indicator { IsProcessingUserGesture::Yes };
-+    RefPtr frame = m_inspectedPage.checkedFocusController()->focusedOrMainFrame();
++    RefPtr frame = m_inspectedPage->checkedFocusController()->focusedOrMainFrame();
 +    if (!frame)
 +        return { };
 +
@@ -4299,7 +4465,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +        frame->editor().confirmComposition(text);
 +    } else {
 +        Document* focusedDocument = frame->document();
-+        TypingCommand::insertText(*focusedDocument, text, { });
++        TypingCommand::insertText(*focusedDocument, text, nullptr, { });
 +    }
 +    return { };
 +}
@@ -4413,10 +4579,6 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +            return "Image"_s;
 +        case AccessibilityRole::ImageMap:
 +            return "ImageMap"_s;
-+        case AccessibilityRole::ImageMapLink:
-+            return "ImageMapLink"_s;
-+        case AccessibilityRole::Incrementor:
-+            return "Incrementor"_s;
 +        case AccessibilityRole::Insertion:
 +            return "Insertion"_s;
 +        case AccessibilityRole::Label:
@@ -4461,8 +4623,6 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +            return "Menu"_s;
 +        case AccessibilityRole::MenuBar:
 +            return "MenuBar"_s;
-+        case AccessibilityRole::MenuButton:
-+            return "MenuButton"_s;
 +        case AccessibilityRole::MenuItem:
 +            return "MenuItem"_s;
 +        case AccessibilityRole::MenuItemCheckbox:
@@ -4499,14 +4659,8 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +            return "Row"_s;
 +        case AccessibilityRole::RowGroup:
 +            return "RowGroup"_s;
-+        case AccessibilityRole::RubyBase:
-+            return "RubyBase"_s;
-+        case AccessibilityRole::RubyBlock:
-+            return "RubyBlock"_s;
 +        case AccessibilityRole::RubyInline:
 +            return "RubyInline"_s;
-+        case AccessibilityRole::RubyRun:
-+            return "RubyRun"_s;
 +        case AccessibilityRole::RubyText:
 +            return "RubyText"_s;
 +        case AccessibilityRole::ScrollArea:
@@ -4595,7 +4749,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +    return "Unknown"_s;
 +}
 +
-+static Ref<Inspector::Protocol::Page::AXNode> snapshotForAXObject(RefPtr<AXCoreObject> axObject, Node* nodeToFind)
++static Ref<Inspector::Protocol::Page::AXNode> snapshotForAXObject(WTF::RefPtr<WebCore::AXCoreObject> axObject, Node* nodeToFind)
 +{
 +    auto axNode = Inspector::Protocol::Page::AXNode::create()
 +        .setRole(roleFromObject(axObject))
@@ -4685,7 +4839,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +    if (!axObject->children().isEmpty()) {
 +        Ref<JSON::ArrayOf<Inspector::Protocol::Page::AXNode>> children = JSON::ArrayOf<Inspector::Protocol::Page::AXNode>::create();
 +        for (auto& childObject : axObject->children())
-+            children->addItem(snapshotForAXObject(childObject, nodeToFind));
++            children->addItem(snapshotForAXObject(childObject.ptr(), nodeToFind));
 +        axNode->setChildren(WTFMove(children));
 +    }
 +    return axNode;
@@ -4697,7 +4851,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +    if (!WebCore::AXObjectCache::accessibilityEnabled())
 +        WebCore::AXObjectCache::enableAccessibility();
 +
-+    auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage.mainFrame());
++    auto* localMainFrame = dynamicDowncast<LocalFrame>(m_inspectedPage->mainFrame());
 +    if (!localMainFrame)
 +        return makeUnexpected("No local main frame"_s);
 +
@@ -4709,7 +4863,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +    if (!axObjectCache)
 +        return makeUnexpected("No AXObjectCache for main document"_s);
 +
-+    AXCoreObject* axObject = axObjectCache->rootObject();
++    AXCoreObject* axObject = axObjectCache->rootObjectForFrame(*localMainFrame);
 +    if (!axObject)
 +        return makeUnexpected("No AXObject for main document"_s);
 +
@@ -4736,7 +4890,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +
 +Protocol::ErrorStringOr<void> InspectorPageAgent::setDefaultBackgroundColorOverride(RefPtr<JSON::Object>&& color)
 +{
-+    auto* localFrame = dynamicDowncast<LocalFrame>(m_inspectedPage.mainFrame());
++    auto* localFrame = dynamicDowncast<LocalFrame>(m_inspectedPage->mainFrame());
 +    LocalFrameView* view = localFrame ? localFrame->view() : nullptr;
 +    if (!view)
 +        return makeUnexpected("Internal error: No frame view to set color two"_s);
@@ -4763,7 +4917,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +
 +void InspectorPageAgent::ensureUserWorldsExistInAllFrames(const Vector<DOMWrapperWorld*>& worlds)
 +{
-+    for (Frame* frame = &m_inspectedPage.mainFrame(); frame; frame = frame->tree().traverseNext()) {
++    for (Frame* frame = &m_inspectedPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
 +        auto* localFrame = dynamicDowncast<LocalFrame>(frame);
 +        for (auto* world : worlds)
 +            localFrame->windowProxy().jsWindowProxy(*world)->window();
@@ -4778,24 +4932,13 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
 +
 +Protocol::ErrorStringOr<void> InspectorPageAgent::crash()
 +{
-+    CRASH();
-+    return { };
-+}
-+
-+Protocol::ErrorStringOr<void> InspectorPageAgent::setOrientationOverride(std::optional<int>&& angle)
-+{
-+#if ENABLE(ORIENTATION_EVENTS)
-+    m_inspectedPage.setOverrideOrientation(WTFMove(angle));
++    WTFCrash();
 +    return { };
-+#else
-+    UNUSED_PARAM(angle);
-+    return makeUnexpected("Orientation events are disabled in this build");
- #endif
 +}
 +
 +Protocol::ErrorStringOr<void> InspectorPageAgent::updateScrollingState()
 +{
-+    auto* scrollingCoordinator = m_inspectedPage.scrollingCoordinator();
++    auto* scrollingCoordinator = m_inspectedPage->scrollingCoordinator();
 +    if (!scrollingCoordinator)
 +        return {};
 +    scrollingCoordinator->commitTreeStateIfNeeded();
@@ -4804,7 +4947,7 @@ index 5329fd0a2c24031a74d05d7c6c342a5f8398eaae..a64e486220e4fc8e37c34856fce8c3d8
  
  } // namespace WebCore
 diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.h b/Source/WebCore/inspector/agents/InspectorPageAgent.h
-index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e058d32cd21 100644
+index 7daa8d1d5c96afe1829aa21ccb8ed1b8ebcc3861..da57245795d7cb287daaaaf5d09a523c0f88fcc7 100644
 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.h
 +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.h
 @@ -32,8 +32,10 @@
@@ -4818,8 +4961,8 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
  #include <JavaScriptCore/InspectorBackendDispatchers.h>
  #include <JavaScriptCore/InspectorFrontendDispatchers.h>
  #include <JavaScriptCore/InspectorProtocolObjects.h>
-@@ -41,11 +43,16 @@
- #include <wtf/Seconds.h>
+@@ -43,11 +45,16 @@
+ #include <wtf/WeakRef.h>
  #include <wtf/text/WTFString.h>
  
 +namespace Inspector {
@@ -4835,15 +4978,16 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
  class InspectorClient;
  class InspectorOverlay;
  class LocalFrame;
-@@ -78,6 +85,7 @@ public:
+@@ -80,6 +87,8 @@ public:
          OtherResource,
      };
  
-+    WEBCORE_EXPORT static String makeFrameID(ProcessIdentifier processID,  FrameIdentifier frameID);
++    WEBCORE_EXPORT static String serializeFrameID(FrameIdentifier frameID);
++    WEBCORE_EXPORT static std::optional<FrameIdentifier> parseFrameID(String frameID);
      static bool sharedBufferContent(RefPtr<FragmentedSharedBuffer>&&, const String& textEncodingName, bool withBase64Encode, String* result);
      static Vector<CachedResource*> cachedResourcesForFrame(LocalFrame*);
      static void resourceContent(Inspector::Protocol::ErrorString&, LocalFrame*, const URL&, String* result, bool* base64Encoded);
-@@ -98,8 +106,11 @@ public:
+@@ -100,8 +109,11 @@ public:
      Inspector::Protocol::ErrorStringOr<void> enable();
      Inspector::Protocol::ErrorStringOr<void> disable();
      Inspector::Protocol::ErrorStringOr<void> reload(std::optional<bool>&& ignoreCache, std::optional<bool>&& revalidateAllResources);
@@ -4855,7 +4999,7 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
      Inspector::Protocol::ErrorStringOr<void> overrideSetting(Inspector::Protocol::Page::Setting, std::optional<bool>&& value);
      Inspector::Protocol::ErrorStringOr<void> overrideUserPreference(Inspector::Protocol::Page::UserPreferenceName, std::optional<Inspector::Protocol::Page::UserPreferenceValue>&&);
      Inspector::Protocol::ErrorStringOr<Ref<JSON::ArrayOf<Inspector::Protocol::Page::Cookie>>> getCookies();
-@@ -115,45 +126,66 @@ public:
+@@ -117,45 +129,65 @@ public:
  #endif
      Inspector::Protocol::ErrorStringOr<void> setShowPaintRects(bool);
      Inspector::Protocol::ErrorStringOr<void> setEmulatedMedia(const String&);
@@ -4879,7 +5023,6 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
 +    Inspector::Protocol::ErrorStringOr<void> createUserWorld(const String&);
 +    Inspector::Protocol::ErrorStringOr<void> setBypassCSP(bool);
 +    Inspector::Protocol::ErrorStringOr<void> crash();
-+    Inspector::Protocol::ErrorStringOr<void> setOrientationOverride(std::optional<int>&& angle);
 +    Inspector::Protocol::ErrorStringOr<void> updateScrollingState();
  
      // InspectorInstrumentation
@@ -4898,7 +5041,7 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
      void accessibilitySettingsDidChange();
      void defaultUserPreferencesDidChange();
 +    void didNavigateWithinPage(LocalFrame&);
- #if ENABLE(DARK_MODE_CSS) || HAVE(OS_DARK_MODE_SUPPORT)
+ #if ENABLE(DARK_MODE_CSS)
      void defaultAppearanceDidChange();
  #endif
      void applyUserAgentOverride(String&);
@@ -4927,19 +5070,19 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
      double timestamp();
 +    void ensureUserWorldsExistInAllFrames(const Vector<DOMWrapperWorld*>&);
  
-     static bool mainResourceContent(LocalFrame*, bool withBase64Encode, String* result);
-     static bool dataContent(std::span<const uint8_t> data, const String& textEncodingName, bool withBase64Encode, String* result);
-@@ -169,17 +201,21 @@ private:
+     Ref<InspectorOverlay> protectedOverlay() const;
+ 
+@@ -173,17 +205,22 @@ private:
      RefPtr<Inspector::PageBackendDispatcher> m_backendDispatcher;
  
-     Page& m_inspectedPage;
+     WeakRef<Page> m_inspectedPage;
 +    Inspector::InjectedScriptManager& m_injectedScriptManager;
      InspectorClient* m_client { nullptr };
-     InspectorOverlay* m_overlay { nullptr };
+     WeakRef<InspectorOverlay> m_overlay;
  
 -    WeakHashMap<Frame, String> m_frameToIdentifier;
      MemoryCompactRobinHoodHashMap<String, WeakPtr<Frame>> m_identifierToFrame;
--    HashMap<DocumentLoader*, String> m_loaderToIdentifier;
+     HashMap<DocumentLoader*, String> m_loaderToIdentifier;
      String m_userAgentOverride;
 +    String m_platformOverride;
      AtomString m_emulatedMedia;
@@ -4954,7 +5097,7 @@ index 371bcfcf1d0ae17471f8e69706d2f12356793418..6bc660d683a639f1d6f6a0dca8db5e05
  
  } // namespace WebCore
 diff --git a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
-index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361deea84e4c 100644
+index 0cc351959aaa96bd427ecbf75dd2ba51e730fc30..fb2b6c842a2e2b819ce746403e33550c0d4e2440 100644
 --- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
 +++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
 @@ -34,6 +34,7 @@
@@ -4973,7 +5116,7 @@ index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361d
  #include "SecurityOrigin.h"
  #include "UserGestureEmulationScope.h"
  #include <JavaScriptCore/InjectedScript.h>
-@@ -85,13 +87,73 @@ Inspector::Protocol::ErrorStringOr<void> PageRuntimeAgent::disable()
+@@ -88,13 +90,74 @@ Inspector::Protocol::ErrorStringOr<void> PageRuntimeAgent::disable()
  {
      m_instrumentingAgents.setEnabledPageRuntimeAgent(nullptr);
  
@@ -5018,8 +5161,9 @@ index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361d
 +
 +static void addBindingToFrame(LocalFrame& frame, const String& name)
 +{
-+    JSC::JSGlobalObject* globalObject = frame.script().globalObject(mainThreadNormalWorld());
++    JSC::JSGlobalObject* globalObject = frame.script().globalObject(mainThreadNormalWorldSingleton());
 +    auto& vm = globalObject->vm();
++    JSC::JSLockHolder lock(vm);
 +    globalObject->putDirectNativeFunction(vm, globalObject, JSC::Identifier::fromString(vm, name), 1, bindingCallback, JSC::ImplementationVisibility::Public, JSC::NoIntrinsic, JSC::attributesForStructure(static_cast<unsigned>(JSC::PropertyAttribute::Function)));
 +}
 +
@@ -5028,7 +5172,7 @@ index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361d
 +    if (!m_bindingNames.add(name).isNewEntry)
 +        return {};
 +
-+    m_inspectedPage.forEachLocalFrame([&](LocalFrame& frame) {
++    m_inspectedPage->forEachLocalFrame([&](LocalFrame& frame) {
 +        if (!frame.script().canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript))
 +            return;
 +
@@ -5047,7 +5191,7 @@ index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361d
  }
  
  void PageRuntimeAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapperWorld& world)
-@@ -100,7 +162,26 @@ void PageRuntimeAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapper
+@@ -103,7 +166,26 @@ void PageRuntimeAgent::didClearWindowObjectInWorld(LocalFrame& frame, DOMWrapper
      if (!pageAgent)
          return;
  
@@ -5074,10 +5218,10 @@ index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361d
  }
  
  InjectedScript PageRuntimeAgent::injectedScriptForEval(Inspector::Protocol::ErrorString& errorString, std::optional<Inspector::Protocol::Runtime::ExecutionContextId>&& executionContextId)
-@@ -139,9 +220,6 @@ void PageRuntimeAgent::reportExecutionContextCreation()
+@@ -142,9 +224,6 @@ void PageRuntimeAgent::reportExecutionContextCreation()
          return;
  
-     m_inspectedPage.forEachLocalFrame([&](LocalFrame& frame) {
+     m_inspectedPage->forEachLocalFrame([&](LocalFrame& frame) {
 -        if (!frame.script().canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript))
 -            return;
 -
@@ -5085,10 +5229,10 @@ index 61b797e08f5e6d90cc2724dd7a3b45c0f45af4f8..919a8b963d93742cc99c2739e472361d
  
          // Always send the main world first.
 diff --git a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
-index 9501fc840e35f3badc701e7622555dba394cae9b..1391c73d9b3ba250ad3a831bfe7c92c98de0c93c 100644
+index ab49ddd13fc6e1ed967cf501afb0230c1e795159..5ea038212cedc1a7b250588b616225edad6f643c 100644
 --- a/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
 +++ b/Source/WebCore/inspector/agents/page/PageRuntimeAgent.h
-@@ -37,6 +37,7 @@
+@@ -38,6 +38,7 @@
  
  namespace JSC {
  class CallFrame;
@@ -5096,7 +5240,7 @@ index 9501fc840e35f3badc701e7622555dba394cae9b..1391c73d9b3ba250ad3a831bfe7c92c9
  }
  
  namespace WebCore {
-@@ -58,10 +59,13 @@ public:
+@@ -59,10 +60,13 @@ public:
      Inspector::Protocol::ErrorStringOr<void> disable();
      Inspector::Protocol::ErrorStringOr<std::tuple<Ref<Inspector::Protocol::Runtime::RemoteObject>, std::optional<bool> /* wasThrown */, std::optional<int> /* savedResultIndex */>> evaluate(const String& expression, const String& objectGroup, std::optional<bool>&& includeCommandLineAPI, std::optional<bool>&& doNotPauseOnExceptionsAndMuteConsole, std::optional<Inspector::Protocol::Runtime::ExecutionContextId>&&, std::optional<bool>&& returnByValue, std::optional<bool>&& generatePreview, std::optional<bool>&& saveResult, std::optional<bool>&& emulateUserGesture);
      void callFunctionOn(const Inspector::Protocol::Runtime::RemoteObjectId&, const String& functionDeclaration, RefPtr<JSON::Array>&& arguments, std::optional<bool>&& doNotPauseOnExceptionsAndMuteConsole, std::optional<bool>&& returnByValue, std::optional<bool>&& generatePreview, std::optional<bool>&& emulateUserGesture, std::optional<bool>&& awaitPromise, Ref<CallFunctionOnCallback>&&);
@@ -5110,27 +5254,27 @@ index 9501fc840e35f3badc701e7622555dba394cae9b..1391c73d9b3ba250ad3a831bfe7c92c9
  
  private:
      Inspector::InjectedScript injectedScriptForEval(Inspector::Protocol::ErrorString&, std::optional<Inspector::Protocol::Runtime::ExecutionContextId>&&);
-@@ -76,6 +80,7 @@ private:
+@@ -77,6 +81,7 @@ private:
      InstrumentingAgents& m_instrumentingAgents;
  
-     Page& m_inspectedPage;
+     WeakRef<Page> m_inspectedPage;
 +    HashSet<String> m_bindingNames;
  };
  
  } // namespace WebCore
 diff --git a/Source/WebCore/loader/CookieJar.h b/Source/WebCore/loader/CookieJar.h
-index edfc601a36f006122f26946de5b3a60573a07968..794a6c389be8af23989a54696d57312340ddcd37 100644
+index 8fb27c1045b8073d1487d5b61ccdec23a395bfd1..5008052f587ca4ba90da973c539188deb9551621 100644
 --- a/Source/WebCore/loader/CookieJar.h
 +++ b/Source/WebCore/loader/CookieJar.h
-@@ -46,6 +46,7 @@ struct CookieStoreGetOptions;
- class NetworkStorageSession;
+@@ -48,6 +48,7 @@ class NetworkStorageSession;
  class StorageSessionProvider;
  struct SameSiteInfo;
+ enum class ShouldPartitionCookie : bool;
 +class ResourceLoader;
  
- class WEBCORE_EXPORT CookieJar : public RefCounted<CookieJar>, public CanMakeWeakPtr<CookieJar> {
+ class WEBCORE_EXPORT CookieJar : public RefCountedAndCanMakeWeakPtr<CookieJar> {
  public:
-@@ -78,6 +79,9 @@ public:
+@@ -80,6 +81,9 @@ public:
      virtual void clearCache() { }
      virtual void clearCacheForHost(const String&) { }
  
@@ -5141,25 +5285,25 @@ index edfc601a36f006122f26946de5b3a60573a07968..794a6c389be8af23989a54696d573123
  protected:
      static SameSiteInfo sameSiteInfo(const Document&, IsForDOMCookieAccess = IsForDOMCookieAccess::No);
 diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
-index 90023ca4ebad0d8608b74434ca5d870ffeb00871..7360ea6857f98e60bdfa74ad4a0d595958cfc11f 100644
+index 541963eb00a1e5700da683be152543ac57f177a1..bd0debb9cdf2fac02bcf0243571a4a668be9decc 100644
 --- a/Source/WebCore/loader/DocumentLoader.cpp
 +++ b/Source/WebCore/loader/DocumentLoader.cpp
-@@ -763,8 +763,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
+@@ -774,8 +774,10 @@ void DocumentLoader::willSendRequest(ResourceRequest&& newRequest, const Resourc
      if (!didReceiveRedirectResponse)
          return completionHandler(WTFMove(newRequest));
  
-+    InspectorInstrumentation::willCheckNavigationPolicy(*m_frame);
-     auto navigationPolicyCompletionHandler = [this, protectedThis = Ref { *this }, protectedFrame = Ref { *m_frame }, completionHandler = WTFMove(completionHandler)] (ResourceRequest&& request, WeakPtr<FormState>&&, NavigationPolicyDecision navigationPolicyDecision) mutable {
++    InspectorInstrumentation::willCheckNavigationPolicy(*frame);
+     auto navigationPolicyCompletionHandler = [this, protectedThis = Ref { *this }, frame, completionHandler = WTFMove(completionHandler)] (ResourceRequest&& request, WeakPtr<FormState>&&, NavigationPolicyDecision navigationPolicyDecision) mutable {
          m_waitingForNavigationPolicy = false;
-+        InspectorInstrumentation::didCheckNavigationPolicy(protectedFrame.get(), navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
++        InspectorInstrumentation::didCheckNavigationPolicy(*frame, navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
          switch (navigationPolicyDecision) {
          case NavigationPolicyDecision::IgnoreLoad:
          case NavigationPolicyDecision::LoadWillContinueInAnotherProcess:
-@@ -1532,11 +1534,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
-     if (auto navigationID = std::exchange(m_navigationID, 0))
-         m_frame->loader().client().documentLoaderDetached(navigationID, loadWillContinueInAnotherProcess);
+@@ -1572,11 +1574,17 @@ void DocumentLoader::detachFromFrame(LoadWillContinueInAnotherProcess loadWillCo
+     if (auto navigationID = std::exchange(m_navigationID, { }))
+         frame->loader().client().documentLoaderDetached(*navigationID, loadWillContinueInAnotherProcess);
  
--    InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
+-    InspectorInstrumentation::loaderDetachedFromFrame(*frame, *this);
 -
      observeFrame(nullptr);
  }
@@ -5168,31 +5312,31 @@ index 90023ca4ebad0d8608b74434ca5d870ffeb00871..7360ea6857f98e60bdfa74ad4a0d5959
 +{
 +    ASSERT(!this->frame());
 +    // Notify WebPageProxy that the navigation has been converted into same page navigation.
-+    if (auto navigationID = std::exchange(m_navigationID, 0))
-+        frame.loader().client().documentLoaderDetached(navigationID, LoadWillContinueInAnotherProcess::No);
++    if (auto navigationID = std::exchange(m_navigationID, { }))
++        frame.loader().client().documentLoaderDetached(*navigationID, LoadWillContinueInAnotherProcess::No);
 +}
 +
- void DocumentLoader::setNavigationID(uint64_t navigationID)
+ void DocumentLoader::setNavigationID(NavigationIdentifier navigationID)
  {
-     ASSERT(navigationID);
+     m_navigationID = navigationID;
 diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
-index aa98ba7e3eb896b65a156fe8f75ae3c0bc99f246..00531c35e1d5041d3bcc13c54308eb7eff387baf 100644
+index a3e5891cc44903ec74da16164904c12673498d97..9f8566a8c1cc20c1d2a495c9765f1c522890e993 100644
 --- a/Source/WebCore/loader/DocumentLoader.h
 +++ b/Source/WebCore/loader/DocumentLoader.h
-@@ -191,6 +191,8 @@ public:
+@@ -218,6 +218,8 @@ public:
  
      WEBCORE_EXPORT virtual void detachFromFrame(LoadWillContinueInAnotherProcess);
  
 +    void replacedByFragmentNavigation(LocalFrame&);
 +
      WEBCORE_EXPORT FrameLoader* frameLoader() const;
-     CheckedPtr<FrameLoader> checkedFrameLoader() const;
+     WEBCORE_EXPORT RefPtr<FrameLoader> protectedFrameLoader() const;
      WEBCORE_EXPORT SubresourceLoader* mainResourceLoader() const;
 diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
-index 4882d1ded68a2e88595c1ce7e2a6891f066b3457..e630a3cd7022449e6eec9516f7bb5e63f3085b0e 100644
+index 0974e98f02b59150df7054af753a3c3bb1d3b0e9..559a8532162d4c9e106c1059dfbf50fc63ee9326 100644
 --- a/Source/WebCore/loader/FrameLoader.cpp
 +++ b/Source/WebCore/loader/FrameLoader.cpp
-@@ -1355,6 +1355,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
+@@ -1325,6 +1325,7 @@ void FrameLoader::loadInSameDocument(URL url, RefPtr<SerializedScriptValue> stat
      }
  
      m_client->dispatchDidNavigateWithinPage();
@@ -5200,40 +5344,35 @@ index 4882d1ded68a2e88595c1ce7e2a6891f066b3457..e630a3cd7022449e6eec9516f7bb5e63
  
      document->statePopped(stateObject ? stateObject.releaseNonNull() : SerializedScriptValue::nullValue());
      m_client->dispatchDidPopStateWithinPage();
-@@ -1820,6 +1821,8 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
+@@ -1867,6 +1868,7 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
      const String& httpMethod = loader->request().httpMethod();
  
      if (shouldPerformFragmentNavigation(isFormSubmission, httpMethod, policyChecker().loadType(), newURL)) {
 +        loader->replacedByFragmentNavigation(m_frame);
-+
+ 
          RefPtr oldDocumentLoader = m_documentLoader;
          NavigationAction action { frame->protectedDocument().releaseNonNull(), loader->request(), InitiatedByMainFrame::Unknown, loader->isRequestFromClientOrUserInput(), policyChecker().loadType(), isFormSubmission };
-         oldDocumentLoader->setTriggeringAction(WTFMove(action));
-@@ -1853,7 +1856,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
-     }
+@@ -1905,7 +1907,9 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
  
+     auto policyDecisionMode = loader->triggeringAction().isFromNavigationAPI() ? PolicyDecisionMode::Synchronous : PolicyDecisionMode::Asynchronous;
      RELEASE_ASSERT(!isBackForwardLoadType(policyChecker().loadType()) || history().provisionalItem());
 +    InspectorInstrumentation::willCheckNavigationPolicy(m_frame);
-     policyChecker().checkNavigationPolicy(ResourceRequest(loader->request()), ResourceResponse { } /* redirectResponse */, loader, WTFMove(formState), [this, frame, allowNavigationToInvalidURL, completionHandler = completionHandlerCaller.release()] (const ResourceRequest& request, WeakPtr<FormState>&& weakFormState, NavigationPolicyDecision navigationPolicyDecision) mutable {
+     policyChecker().checkNavigationPolicy(ResourceRequest(loader->request()), ResourceResponse { } /* redirectResponse */, loader, WTFMove(formState), [this, protectedThis = Ref { *this }, allowNavigationToInvalidURL, completionHandler = completionHandlerCaller.release()] (const ResourceRequest& request, WeakPtr<FormState>&& weakFormState, NavigationPolicyDecision navigationPolicyDecision) mutable {
 +        InspectorInstrumentation::didCheckNavigationPolicy(m_frame, navigationPolicyDecision != NavigationPolicyDecision::ContinueLoad);
          continueLoadAfterNavigationPolicy(request, RefPtr { weakFormState.get() }.get(), navigationPolicyDecision, allowNavigationToInvalidURL);
          completionHandler();
-     }, PolicyDecisionMode::Asynchronous);
-@@ -3115,14 +3120,19 @@ String FrameLoader::userAgent(const URL& url) const
+     }, policyDecisionMode);
+@@ -3219,10 +3223,15 @@ String FrameLoader::userAgent(const URL& url) const
  
  String FrameLoader::navigatorPlatform() const
  {
 +    String platform;
 +
-     if (RefPtr localFrame = dynamicDowncast<LocalFrame>(m_frame->mainFrame())) {
-         if (RefPtr documentLoader = localFrame->loader().activeDocumentLoader()) {
-             auto& customNavigatorPlatform = documentLoader->customNavigatorPlatform();
-             if (!customNavigatorPlatform.isEmpty())
--                return customNavigatorPlatform;
-+                platform = customNavigatorPlatform;
-         }
-     }
+     auto customNavigatorPlatform = m_frame->protectedMainFrame()->customNavigatorPlatform();
+     if (!customNavigatorPlatform.isEmpty())
+-        return customNavigatorPlatform;
 -    return String();
++        platform = customNavigatorPlatform;
 +
 +    InspectorInstrumentation::applyPlatformOverride(m_frame, platform);
 +
@@ -5241,16 +5380,16 @@ index 4882d1ded68a2e88595c1ce7e2a6891f066b3457..e630a3cd7022449e6eec9516f7bb5e63
  }
  
  void FrameLoader::dispatchOnloadEvents()
-@@ -3572,6 +3582,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error)
+@@ -3682,6 +3691,8 @@ void FrameLoader::receivedMainResourceError(const ResourceError& error, LoadWill
      checkCompleted();
      if (frame->page())
-         checkLoadComplete();
+         checkLoadComplete(loadWillContinueInAnotherProcess);
 +
 +    InspectorInstrumentation::didReceiveMainResourceError(m_frame, error);
  }
  
- void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue)
-@@ -4425,9 +4437,6 @@ String FrameLoader::referrer() const
+ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequest& request, const SecurityOrigin* requesterOrigin, bool shouldContinue, NavigationHistoryBehavior historyHandling)
+@@ -4576,9 +4587,6 @@ String FrameLoader::referrer() const
  
  void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
  {
@@ -5260,11 +5399,11 @@ index 4882d1ded68a2e88595c1ce7e2a6891f066b3457..e630a3cd7022449e6eec9516f7bb5e63
      Vector<Ref<DOMWrapperWorld>> worlds;
      ScriptController::getAllWorlds(worlds);
      for (auto& world : worlds)
-@@ -4437,13 +4446,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
+@@ -4588,13 +4596,12 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
  void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld& world)
  {
      Ref frame = m_frame.get();
--    if (!frame->checkedScript()->canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript) || !frame->windowProxy().existingJSWindowProxy(world))
+-    if (!frame->checkedScript()->canExecuteScripts(ReasonForCallingCanExecuteScripts::NotAboutToExecuteScript) || !frame->protectedWindowProxy()->existingJSWindowProxy(world))
 -        return;
 -
 -    m_client->dispatchDidClearWindowObjectInWorld(world);
@@ -5281,7 +5420,7 @@ index 4882d1ded68a2e88595c1ce7e2a6891f066b3457..e630a3cd7022449e6eec9516f7bb5e63
      InspectorInstrumentation::didClearWindowObjectInWorld(frame, world);
  }
 diff --git a/Source/WebCore/loader/LoaderStrategy.h b/Source/WebCore/loader/LoaderStrategy.h
-index 91340dc21042f545592b442bc42dbceed06219b2..f3591fe333761b10a25ddaf4a4f8d72170dfe336 100644
+index 1b34dfdd2a8e56beab49591a3517aba02c510ee6..768b895c132b73d935198cbfc2126a227a656b46 100644
 --- a/Source/WebCore/loader/LoaderStrategy.h
 +++ b/Source/WebCore/loader/LoaderStrategy.h
 @@ -86,6 +86,7 @@ public:
@@ -5293,10 +5432,10 @@ index 91340dc21042f545592b442bc42dbceed06219b2..f3591fe333761b10a25ddaf4a4f8d721
      virtual bool shouldPerformSecurityChecks() const { return false; }
      virtual bool havePerformedSecurityChecks(const ResourceResponse&) const { return false; }
 diff --git a/Source/WebCore/loader/NavigationScheduler.cpp b/Source/WebCore/loader/NavigationScheduler.cpp
-index a6270e0e1ceb02fee0a3c91a0cc755351908c5e5..f5e7330fa741eff7917adf227760161c5ba1e5f8 100644
+index d1d57f421c8570468b8c1ad2dc3c081b50cc4f0a..17a75616518d81eb3ce1e8107ee1f3546b477e30 100644
 --- a/Source/WebCore/loader/NavigationScheduler.cpp
 +++ b/Source/WebCore/loader/NavigationScheduler.cpp
-@@ -690,7 +690,7 @@ void NavigationScheduler::startTimer()
+@@ -806,7 +806,7 @@ void NavigationScheduler::startTimer()
  
      Seconds delay = 1_s * m_redirect->delay();
      m_timer.startOneShot(delay);
@@ -5305,24 +5444,12 @@ index a6270e0e1ceb02fee0a3c91a0cc755351908c5e5..f5e7330fa741eff7917adf227760161c
      m_redirect->didStartTimer(frame, m_timer); // m_redirect may be null on return (e.g. the client canceled the load)
  }
  
-diff --git a/Source/WebCore/loader/PolicyChecker.cpp b/Source/WebCore/loader/PolicyChecker.cpp
-index ca3dc2575f3c9cb87ac902d79610f0738b09fdff..2ddbbfed658961e8231f641a889508aa4869070d 100644
---- a/Source/WebCore/loader/PolicyChecker.cpp
-+++ b/Source/WebCore/loader/PolicyChecker.cpp
-@@ -46,6 +46,7 @@
- #include "HTMLFrameOwnerElement.h"
- #include "HTMLPlugInElement.h"
- #include "HitTestResult.h"
-+#include "InspectorInstrumentation.h"
- #include "LocalDOMWindow.h"
- #include "LocalFrame.h"
- #include "LocalFrameLoaderClient.h"
 diff --git a/Source/WebCore/loader/ProgressTracker.cpp b/Source/WebCore/loader/ProgressTracker.cpp
-index b74c5258454b0df9f74aa8a5297674b733925685..b6c3999745368c7f7e2e6176bfca6dc09c49f539 100644
+index a1554c16a0b836bcf87fea0f4e7831d9e0d7baf0..354e4fef6de9c77b7cad96cc428056ae4e2ff067 100644
 --- a/Source/WebCore/loader/ProgressTracker.cpp
 +++ b/Source/WebCore/loader/ProgressTracker.cpp
-@@ -161,6 +161,8 @@ void ProgressTracker::progressCompleted(LocalFrame& frame)
-     if (!m_numProgressTrackedFrames || m_originatingProgressFrame == &frame)
+@@ -163,6 +163,8 @@ void ProgressTracker::progressCompleted(LocalFrame& frame)
+     if (!m_numProgressTrackedFrames || originatingProgressFrame == &frame)
          finalProgressComplete();
  
 +    InspectorInstrumentation::frameStoppedLoading(frame);
@@ -5330,22 +5457,22 @@ index b74c5258454b0df9f74aa8a5297674b733925685..b6c3999745368c7f7e2e6176bfca6dc0
      m_client->didChangeEstimatedProgress();
  }
  
-@@ -187,8 +189,6 @@ void ProgressTracker::finalProgressComplete()
-     m_client->progressFinished(*frame);
-     protectedPage()->progressFinished(*frame);
-     frame->checkedLoader()->loadProgressingStatusChanged();
+@@ -189,8 +191,6 @@ void ProgressTracker::finalProgressComplete()
+         m_client->progressFinished(*frame);
+         protectedPage()->progressFinished(*frame);
+         frame->protectedLoader()->loadProgressingStatusChanged();
 -
--    InspectorInstrumentation::frameStoppedLoading(*frame);
+-        InspectorInstrumentation::frameStoppedLoading(*frame);
+     }
  }
  
- void ProgressTracker::incrementProgress(ResourceLoaderIdentifier identifier, const ResourceResponse& response)
 diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-index f0d0aeb93ca42f7178a9dc07beeba911a38c32fe..1f82595cbbbc4f32b5cc4330b4d71e05d51b27a0 100644
+index c6a8c86e12ba98ad8b9aab74430523c3dd8cb42e..61c73db33d4c629803d14f243862acea15e762cb 100644
 --- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
 +++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
-@@ -1054,8 +1054,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
+@@ -1173,8 +1173,11 @@ ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::requ
  
-     request.updateReferrerPolicy(document() ? document()->referrerPolicy() : ReferrerPolicy::Default);
+     request.updateReferrerPolicy(document ? document->referrerPolicy() : ReferrerPolicy::Default);
  
 -    if (InspectorInstrumentation::willIntercept(frame.ptr(), request.resourceRequest()))
 -        request.setCachingPolicy(CachingPolicy::DisallowCaching);
@@ -5355,9 +5482,9 @@ index f0d0aeb93ca42f7178a9dc07beeba911a38c32fe..1f82595cbbbc4f32b5cc4330b4d71e05
 +        // request.setCachingPolicy(CachingPolicy::DisallowCaching);
 +    }
  
-     Ref page = *frame->page();
- 
-@@ -1663,8 +1666,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
+     if (RefPtr documentLoader = m_documentLoader.get()) {
+         bool madeHTTPS { request.resourceRequest().wasSchemeOptimisticallyUpgraded() };
+@@ -1810,8 +1813,9 @@ Vector<Ref<SVGImage>> CachedResourceLoader::allCachedSVGImages() const
  
  ResourceErrorOr<CachedResourceHandle<CachedResource>> CachedResourceLoader::preload(CachedResource::Type type, CachedResourceRequest&& request)
  {
@@ -5367,13 +5494,13 @@ index f0d0aeb93ca42f7178a9dc07beeba911a38c32fe..1f82595cbbbc4f32b5cc4330b4d71e05
 +    // if (InspectorInstrumentation::willIntercept(protectedFrame().get(), request.resourceRequest()))
 +    //     return makeUnexpected(ResourceError { errorDomainWebKitInternal, 0, request.resourceRequest().url(), "Inspector intercept"_s });
  
-     ASSERT(m_document);
-     if (request.charset().isEmpty() && m_document && (type == CachedResource::Type::Script || type == CachedResource::Type::CSSStyleSheet))
+     RefPtr document = m_document.get();
+     ASSERT(document);
 diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
-index 20666cc080e04b0fa12e654ac357531f18c7c1df..3cf1823363aacdc014326957f98f3435cf505beb 100644
+index 60ba4d0aaa365301aa80d144f2d07e842a71a6b8..a962ce78e3ad912886a9d3328d64cf0faec3177d 100644
 --- a/Source/WebCore/page/ChromeClient.h
 +++ b/Source/WebCore/page/ChromeClient.h
-@@ -335,7 +335,7 @@ public:
+@@ -379,7 +379,7 @@ public:
  #endif
  
  #if ENABLE(ORIENTATION_EVENTS)
@@ -5381,12 +5508,12 @@ index 20666cc080e04b0fa12e654ac357531f18c7c1df..3cf1823363aacdc014326957f98f3435
 +    virtual IntDegrees deviceOrientation() const { return 0; }
  #endif
  
- #if ENABLE(INPUT_TYPE_COLOR)
+     virtual RefPtr<ColorChooser> createColorChooser(ColorChooserClient&, const Color&) = 0;
 diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
-index 1171407b2f308431ba948ec477a56c90e66911e8..a96feb7fe5a299adaeb950a11512bdf26b1f2836 100644
+index 04fce4219bdfc1c4a78eb2d849045280416b6f2d..9e44a302b10ba3bc18496f5678262171e8b30b2c 100644
 --- a/Source/WebCore/page/EventHandler.cpp
 +++ b/Source/WebCore/page/EventHandler.cpp
-@@ -4325,6 +4325,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
+@@ -4483,6 +4483,12 @@ bool EventHandler::handleDrag(const MouseEventWithHitTestResults& event, CheckDr
      if (!document)
          return false;
  
@@ -5399,7 +5526,15 @@ index 1171407b2f308431ba948ec477a56c90e66911e8..a96feb7fe5a299adaeb950a11512bdf2
      dragState().dataTransfer = DataTransfer::createForDrag(*document);
      auto hasNonDefaultPasteboardData = HasNonDefaultPasteboardData::No;
      
-@@ -4951,7 +4957,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5077,6 +5083,7 @@ static HitTestResult hitTestResultInFrame(LocalFrame* frame, const LayoutPoint&
+     return result;
+ }
+ 
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
+ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
+ {
+     Ref frame = m_frame.get();
+@@ -5150,7 +5157,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
  
          // Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
          unsigned touchPointTargetKey = point.id() + 1;
@@ -5408,7 +5543,7 @@ index 1171407b2f308431ba948ec477a56c90e66911e8..a96feb7fe5a299adaeb950a11512bdf2
          bool pointerCancelled = false;
  #endif
          RefPtr<EventTarget> touchTarget;
-@@ -4998,7 +5004,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5197,7 +5204,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
              // we also remove it from the map.
              touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
  
@@ -5417,7 +5552,7 @@ index 1171407b2f308431ba948ec477a56c90e66911e8..a96feb7fe5a299adaeb950a11512bdf2
              HitTestResult result = hitTestResultAtPoint(pagePoint, hitType | HitTestRequest::Type::AllowChildFrameContent);
              pointerTarget = result.targetElement();
              pointerCancelled = (pointerTarget != touchTarget);
-@@ -5021,7 +5027,7 @@ HandleUserInputEventResult EventHandler::handleTouchEvent(const PlatformTouchEve
+@@ -5220,7 +5227,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
          if (!targetFrame)
              continue;
  
@@ -5426,34 +5561,58 @@ index 1171407b2f308431ba948ec477a56c90e66911e8..a96feb7fe5a299adaeb950a11512bdf2
          // FIXME: WPE currently does not send touch stationary events, so create a naive TouchReleased PlatformTouchPoint
          // on release if the hit test result changed since the previous TouchPressed or TouchMoved
          if (pointState == PlatformTouchPoint::TouchReleased && pointerCancelled) {
+@@ -5310,6 +5317,7 @@ Expected<bool, RemoteFrameGeometryTransformer> EventHandler::handleTouchEvent(co
+ 
+     return swallowedEvent;
+ }
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
+ #endif // ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
+ 
+ #if ENABLE(TOUCH_EVENTS)
+diff --git a/Source/WebCore/page/FocusController.cpp b/Source/WebCore/page/FocusController.cpp
+index 1b183750e1c51e96fcca727bed3c2eb1d30e77e9..e1d00211b5051387bd4495d88cef637704cf1704 100644
+--- a/Source/WebCore/page/FocusController.cpp
++++ b/Source/WebCore/page/FocusController.cpp
+@@ -580,13 +580,14 @@ bool FocusController::relinquishFocusToChrome(FocusDirection direction)
+         return false;
+ 
+     Ref page = m_page.get();
+-    if (!page->chrome().canTakeFocus(direction) || page->isControlledByAutomation())
++    if (!page->chrome().canTakeFocus(direction))
+         return false;
+ 
+     clearSelectionIfNeeded(frame.get(), nullptr, nullptr);
+     document->setFocusedElement(nullptr);
+     setFocusedFrame(nullptr);
+-    page->chrome().takeFocus(direction);
++    if (!page->isControlledByAutomation())
++      page->chrome().takeFocus(direction);
+     return true;
+ }
+ 
 diff --git a/Source/WebCore/page/FrameSnapshotting.cpp b/Source/WebCore/page/FrameSnapshotting.cpp
-index 36ff7673bffcfea97e705d03f31459c36dc46164..1a65fcc874877b8b54e4e6aebb56b66294ef1ceb 100644
+index 3474800864049dcbe6c84746c4216e72a68fa48f..8f5d536921eeb41c77fe689c036dcb77e625e431 100644
 --- a/Source/WebCore/page/FrameSnapshotting.cpp
 +++ b/Source/WebCore/page/FrameSnapshotting.cpp
-@@ -113,7 +113,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -115,7 +115,7 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
      // Other paint behaviors are set by paintContentsForSnapshot.
      frame.view()->setPaintBehavior(paintBehavior);
  
 -    float scaleFactor = frame.page()->deviceScaleFactor();
 +    float scaleFactor = options.flags.contains(SnapshotFlags::OmitDeviceScaleFactor) ? 1 : frame.page()->deviceScaleFactor();
+     if (options.flags.contains(SnapshotFlags::PaintWith3xBaseScale))
+         scaleFactor = 3;
  
-     if (frame.page()->delegatesScaling())
-         scaleFactor *= frame.page()->pageScaleFactor();
-@@ -128,7 +128,13 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
-     if (!buffer)
+@@ -134,6 +134,8 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
          return nullptr;
  
-+#if !PLATFORM(MAC)
-+    buffer->context().scale(scaleFactor);
-+#endif
-+
      buffer->context().translate(-imageRect.location());
 +    if (coordinateSpace != LocalFrameView::ViewCoordinates)
 +        buffer->context().scale(1 / frame.page()->pageScaleFactor());
  
      if (!clipRects.isEmpty()) {
          Path clipPath;
-@@ -137,7 +143,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
+@@ -142,7 +144,10 @@ RefPtr<ImageBuffer> snapshotFrameRectWithClip(LocalFrame& frame, const IntRect&
          buffer->context().clipPath(clipPath);
      }
  
@@ -5466,19 +5625,19 @@ index 36ff7673bffcfea97e705d03f31459c36dc46164..1a65fcc874877b8b54e4e6aebb56b662
  }
  
 diff --git a/Source/WebCore/page/FrameSnapshotting.h b/Source/WebCore/page/FrameSnapshotting.h
-index e4f52ca1cb3228868bc77a5498c87e1f2af59ce4..9ce6b102570cdcd2775ebf5adcd1650db837f311 100644
+index 713cb9c3c59bbad23ef0b821ab27b3d669a7dea8..12077ebf0978b6b52e6af4602767c09d9f3cd9de 100644
 --- a/Source/WebCore/page/FrameSnapshotting.h
 +++ b/Source/WebCore/page/FrameSnapshotting.h
-@@ -54,6 +54,7 @@ enum class SnapshotFlags : uint16_t {
-     PaintWithIntegralScaleFactor = 1 << 6,
-     Shareable = 1 << 7,
-     Accelerated = 1 << 8,
-+    OmitDeviceScaleFactor = 1 << 9,
+@@ -58,6 +58,7 @@ enum class SnapshotFlags : uint16_t {
+     PaintWith3xBaseScale                    = 1 << 10,
+     ExcludeText                             = 1 << 11,
+     FixedAndStickyLayersOnly                = 1 << 12,
++    OmitDeviceScaleFactor                   = 1 << 13,
  };
  
  struct SnapshotOptions {
 diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
-index 28dacedeebc77b2da6428cdbe166581c96348dfa..9c5bfaf9c81c2e5904f69071ee674363ee9decf8 100644
+index adc6185687b6fcee3a49819d0149cde24a4485bf..a33e5db46933c514abce86e3f264de9b7e7c20d9 100644
 --- a/Source/WebCore/page/History.cpp
 +++ b/Source/WebCore/page/History.cpp
 @@ -32,6 +32,7 @@
@@ -5489,27 +5648,28 @@ index 28dacedeebc77b2da6428cdbe166581c96348dfa..9c5bfaf9c81c2e5904f69071ee674363
  #include "LocalFrame.h"
  #include "LocalFrameLoaderClient.h"
  #include "Logging.h"
-@@ -298,6 +299,7 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
+@@ -309,6 +310,8 @@ ExceptionOr<void> History::stateObjectAdded(RefPtr<SerializedScriptValue>&& data
+     }
  
-     if (!urlString.isEmpty())
-         frame->protectedDocument()->updateURLForPushOrReplaceState(fullURL);
+     frame->loader().updateURLAndHistory(fullURL, WTFMove(data), historyBehavior);
 +    InspectorInstrumentation::didNavigateWithinPage(*frame);
++
+     return { };
+ }
  
-     if (stateObjectType == StateObjectType::Push) {
-         frame->loader().history().pushState(WTFMove(data), fullURL.string());
 diff --git a/Source/WebCore/page/LocalFrame.cpp b/Source/WebCore/page/LocalFrame.cpp
-index 9f480cb9a6000333711f0e9630522ddc77534015..f2d62e42e926b0d1d53f3a9feb3ce4ea93507ca3 100644
+index f6e26519619d560b5edddb30170f166ac76bd57f..51019ccda3f5953c4a154c271690f3923c1a530a 100644
 --- a/Source/WebCore/page/LocalFrame.cpp
 +++ b/Source/WebCore/page/LocalFrame.cpp
-@@ -40,6 +40,7 @@
+@@ -42,6 +42,7 @@
  #include "CachedResourceLoader.h"
  #include "Chrome.h"
  #include "ChromeClient.h"
 +#include "ComposedTreeIterator.h"
+ #include "DiagnosticLoggingClient.h"
+ #include "DiagnosticLoggingKeys.h"
  #include "DocumentLoader.h"
- #include "DocumentTimelinesController.h"
- #include "DocumentType.h"
-@@ -57,6 +58,7 @@
+@@ -60,6 +61,7 @@
  #include "FrameSelection.h"
  #include "GraphicsContext.h"
  #include "GraphicsLayer.h"
@@ -5517,23 +5677,23 @@ index 9f480cb9a6000333711f0e9630522ddc77534015..f2d62e42e926b0d1d53f3a9feb3ce4ea
  #include "HTMLAttachmentElement.h"
  #include "HTMLFormControlElement.h"
  #include "HTMLFormElement.h"
-@@ -77,6 +79,7 @@
+@@ -82,6 +84,7 @@
  #include "Logging.h"
  #include "Navigator.h"
  #include "NodeList.h"
 +#include "NodeRenderStyle.h"
  #include "NodeTraversal.h"
  #include "Page.h"
- #include "ProcessWarming.h"
-@@ -187,6 +190,7 @@ LocalFrame::LocalFrame(Page& page, UniqueRef<LocalFrameLoaderClient>&& frameLoad
+ #include "PaymentSession.h"
+@@ -217,6 +220,7 @@ LocalFrame::LocalFrame(Page& page, ClientCreator&& clientCreator, FrameIdentifie
  
  void LocalFrame::init()
  {
 +    InspectorInstrumentation::frameAttached(this);
-     checkedLoader()->init();
+     protectedLoader()->init();
  }
  
-@@ -411,7 +415,7 @@ void LocalFrame::orientationChanged()
+@@ -444,7 +448,7 @@ void LocalFrame::orientationChanged()
  IntDegrees LocalFrame::orientation() const
  {
      if (RefPtr page = this->page())
@@ -5542,8 +5702,8 @@ index 9f480cb9a6000333711f0e9630522ddc77534015..f2d62e42e926b0d1d53f3a9feb3ce4ea
      return 0;
  }
  #endif // ENABLE(ORIENTATION_EVENTS)
-@@ -1340,6 +1344,362 @@ String LocalFrame::customUserAgentAsSiteSpecificQuirks() const
-     return { };
+@@ -1599,6 +1603,364 @@ RefPtr<SecurityOrigin> LocalFrame::frameDocumentSecurityOrigin() const
+     return nullptr;
  }
  
 +#if !PLATFORM(IOS_FAMILY)
@@ -5592,6 +5752,7 @@ index 9f480cb9a6000333711f0e9630522ddc77534015..f2d62e42e926b0d1d53f3a9feb3ce4ea
 +    return true;
 +}
 +
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
 +Node* LocalFrame::qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier& nodeQualifierFunction, ShouldApproximate shouldApproximate, ShouldFindRootEditableElement shouldFindRootEditableElement)
 +{
 +    adjustedViewportLocation = viewportLocation;
@@ -5703,6 +5864,7 @@ index 9f480cb9a6000333711f0e9630522ddc77534015..f2d62e42e926b0d1d53f3a9feb3ce4ea
 +
 +    return approximateNode;
 +}
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
 +
 +Node* LocalFrame::deepestNodeAtLocation(const FloatPoint& viewportLocation)
 +{
@@ -5906,29 +6068,18 @@ index 9f480cb9a6000333711f0e9630522ddc77534015..f2d62e42e926b0d1d53f3a9feb3ce4ea
  
  #undef FRAME_RELEASE_LOG_ERROR
 diff --git a/Source/WebCore/page/LocalFrame.h b/Source/WebCore/page/LocalFrame.h
-index 976a7e01a1a83902d2eddcdbe044c1ec1cd9a7b8..d548c31e6beffe704b8093669ee07d576941a50a 100644
+index 7e8505e025af3f52a0adbd5e6b98d6a22f449d9c..667a9578f073c216231ca8834354c1d5ce49370d 100644
 --- a/Source/WebCore/page/LocalFrame.h
 +++ b/Source/WebCore/page/LocalFrame.h
-@@ -28,8 +28,10 @@
- #pragma once
+@@ -29,6 +29,7 @@
  
- #include "AdjustViewSizeOrNot.h"
-+#include "DOMPasteAccess.h"
- #include "Document.h"
+ #include "DOMPasteAccess.h"
  #include "Frame.h"
 +#include "IntDegrees.h"
- #include "ScrollTypes.h"
- #include "UserScriptTypes.h"
+ #include "ScrollbarMode.h"
  #include <wtf/CheckedRef.h>
-@@ -70,7 +72,6 @@ namespace WebCore {
- class Color;
- class LocalDOMWindow;
- class DataDetectionResultsStorage;
--class Document;
- class Editor;
- class Element;
- class EventHandler;
-@@ -111,8 +112,8 @@ enum {
+ #include <wtf/HashSet.h>
+@@ -122,8 +123,8 @@ enum {
  };
  
  enum OverflowScrollAction { DoNotPerformOverflowScroll, PerformOverflowScroll };
@@ -5938,7 +6089,7 @@ index 976a7e01a1a83902d2eddcdbe044c1ec1cd9a7b8..d548c31e6beffe704b8093669ee07d57
  
  class LocalFrame final : public Frame {
  public:
-@@ -219,10 +220,6 @@ public:
+@@ -233,10 +234,6 @@ public:
      WEBCORE_EXPORT DataDetectionResultsStorage& dataDetectionResults();
  #endif
  
@@ -5949,7 +6100,7 @@ index 976a7e01a1a83902d2eddcdbe044c1ec1cd9a7b8..d548c31e6beffe704b8093669ee07d57
      WEBCORE_EXPORT Node* deepestNodeAtLocation(const FloatPoint& viewportLocation);
      WEBCORE_EXPORT Node* nodeRespondingToClickEvents(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, SecurityOrigin* = nullptr);
      WEBCORE_EXPORT Node* nodeRespondingToDoubleClickEvent(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
-@@ -230,6 +227,10 @@ public:
+@@ -244,6 +241,10 @@ public:
      WEBCORE_EXPORT Node* nodeRespondingToScrollWheelEvents(const FloatPoint& viewportLocation);
      WEBCORE_EXPORT Node* approximateNodeAtViewportLocationLegacy(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation);
  
@@ -5960,15 +6111,15 @@ index 976a7e01a1a83902d2eddcdbe044c1ec1cd9a7b8..d548c31e6beffe704b8093669ee07d57
      WEBCORE_EXPORT NSArray *wordsInCurrentParagraph() const;
      WEBCORE_EXPORT CGRect renderRectForPoint(CGPoint, bool* isReplaced, float* fontSize) const;
  
-@@ -297,6 +298,7 @@ public:
+@@ -311,6 +312,7 @@ public:
  
      WEBCORE_EXPORT FloatSize screenSize() const;
      void setOverrideScreenSize(FloatSize&&);
-+    bool hasScreenSizeOverride() const { return !m_overrideScreenSize.isEmpty(); }
++    bool hasScreenSizeOverride() const { return !!m_overrideScreenSize; }
  
      void selfOnlyRef();
      void selfOnlyDeref();
-@@ -352,7 +354,6 @@ private:
+@@ -382,7 +384,6 @@ private:
  #if ENABLE(DATA_DETECTION)
      std::unique_ptr<DataDetectionResultsStorage> m_dataDetectionResults;
  #endif
@@ -5976,20 +6127,20 @@ index 976a7e01a1a83902d2eddcdbe044c1ec1cd9a7b8..d548c31e6beffe704b8093669ee07d57
      void betterApproximateNode(const IntPoint& testPoint, const NodeQualifier&, Node*& best, Node* failedNode, IntPoint& bestPoint, IntRect& bestRect, const IntRect& testRect);
      bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center);
  
-@@ -360,6 +361,7 @@ private:
+@@ -390,6 +391,7 @@ private:
      enum class ShouldFindRootEditableElement : bool { No, Yes };
      Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, const NodeQualifier&, ShouldApproximate, ShouldFindRootEditableElement = ShouldFindRootEditableElement::Yes);
  
 +#if PLATFORM(IOS_FAMILY)
      void setTimersPausedInternal(bool);
  
-     ViewportArguments m_viewportArguments;
+     UniqueRef<ViewportArguments> m_viewportArguments;
 diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
-index 2da22620311314dc67bec3563c7f1b6525bd7b28..e7c530d193fe0c318dfa89f5ae72e3598bdf44bd 100644
+index 08315ed1fb551d8ad9f9a7dcdc4fea487cd9a8fb..44cf9866c35e309cb90138b73c3d35e5409aa7eb 100644
 --- a/Source/WebCore/page/Page.cpp
 +++ b/Source/WebCore/page/Page.cpp
-@@ -569,6 +569,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
-         document->updateViewportArguments();
+@@ -663,6 +663,45 @@ void Page::setOverrideViewportArguments(const std::optional<ViewportArguments>&
+         localTopDocument->updateViewportArguments();
  }
  
 +FloatSize Page::screenSize()
@@ -6034,8 +6185,8 @@ index 2da22620311314dc67bec3563c7f1b6525bd7b28..e7c530d193fe0c318dfa89f5ae72e359
  ScrollingCoordinator* Page::scrollingCoordinator()
  {
      if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) {
-@@ -3870,6 +3909,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
- #endif
+@@ -4242,6 +4281,26 @@ void Page::setUseDarkAppearanceOverride(std::optional<bool> valueOverride)
+     appearanceDidChange();
  }
  
 +void Page::setUseReducedMotionOverride(std::optional<bool> valueOverride)
@@ -6062,11 +6213,11 @@ index 2da22620311314dc67bec3563c7f1b6525bd7b28..e7c530d193fe0c318dfa89f5ae72e359
  {
      if (insets == m_fullscreenInsets)
 diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
-index 551ffa245a63f05cd7d58a86048ed22c1feb6205..cd1ce84ec63f5ed8ae75178f79c35b9fd91b37f7 100644
+index 9f107570fbb2195211ad46358369acb791e0376b..8c753ef756e9fe64ffdca36683ec486edb758f6b 100644
 --- a/Source/WebCore/page/Page.h
 +++ b/Source/WebCore/page/Page.h
-@@ -316,6 +316,9 @@ public:
-     const std::optional<ViewportArguments>& overrideViewportArguments() const { return m_overrideViewportArguments; }
+@@ -389,6 +389,9 @@ public:
+     const ViewportArguments* overrideViewportArguments() const { return m_overrideViewportArguments.get(); }
      WEBCORE_EXPORT void setOverrideViewportArguments(const std::optional<ViewportArguments>&);
  
 +    WEBCORE_EXPORT FloatSize screenSize();
@@ -6074,8 +6225,8 @@ index 551ffa245a63f05cd7d58a86048ed22c1feb6205..cd1ce84ec63f5ed8ae75178f79c35b9f
 +
      static void refreshPlugins(bool reload);
      WEBCORE_EXPORT PluginData& pluginData();
-     void clearPluginData();
-@@ -380,6 +383,10 @@ public:
+     WEBCORE_EXPORT Ref<PluginData> protectedPluginData();
+@@ -486,6 +489,10 @@ public:
  #if ENABLE(DRAG_SUPPORT)
      DragController& dragController() { return m_dragController.get(); }
      const DragController& dragController() const { return m_dragController.get(); }
@@ -6086,8 +6237,8 @@ index 551ffa245a63f05cd7d58a86048ed22c1feb6205..cd1ce84ec63f5ed8ae75178f79c35b9f
  #endif
      FocusController& focusController() const { return *m_focusController; }
      WEBCORE_EXPORT CheckedRef<FocusController> checkedFocusController() const;
-@@ -563,6 +570,10 @@ public:
-     WEBCORE_EXPORT void effectiveAppearanceDidChange(bool useDarkAppearance, bool useElevatedUserInterfaceLevel);
+@@ -671,6 +678,10 @@ public:
+     WEBCORE_EXPORT void setUseColorAppearance(bool useDarkAppearance, bool useElevatedUserInterfaceLevel);
      bool defaultUseDarkAppearance() const { return m_useDarkAppearance; }
      void setUseDarkAppearanceOverride(std::optional<bool>);
 +    std::optional<bool> useReducedMotionOverride() const { return m_useReducedMotionOverride; }
@@ -6097,29 +6248,29 @@ index 551ffa245a63f05cd7d58a86048ed22c1feb6205..cd1ce84ec63f5ed8ae75178f79c35b9f
  
  #if ENABLE(TEXT_AUTOSIZING)
      float textAutosizingWidth() const { return m_textAutosizingWidth; }
-@@ -1011,6 +1022,11 @@ public:
+@@ -1143,6 +1154,11 @@ public:
      WEBCORE_EXPORT void setInteractionRegionsEnabled(bool);
  #endif
  
 +#if ENABLE(ORIENTATION_EVENTS)
 +    int orientation() const;
-+    void setOverrideOrientation(std::optional<int>);
++    WEBCORE_EXPORT void setOverrideOrientation(std::optional<int>);
 +#endif
 +
  #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
      DeviceOrientationUpdateProvider* deviceOrientationUpdateProvider() const { return m_deviceOrientationUpdateProvider.get(); }
  #endif
-@@ -1181,6 +1197,9 @@ private:
+@@ -1424,6 +1440,9 @@ private:
  
  #if ENABLE(DRAG_SUPPORT)
-     UniqueRef<DragController> m_dragController;
+     const UniqueRef<DragController> m_dragController;
 +#if PLATFORM(MAC)
 +    String m_overrideDragPasteboardName;
 +#endif
  #endif
      std::unique_ptr<FocusController> m_focusController;
  #if ENABLE(CONTEXT_MENUS)
-@@ -1259,6 +1278,8 @@ private:
+@@ -1502,6 +1521,8 @@ private:
      bool m_useElevatedUserInterfaceLevel { false };
      bool m_useDarkAppearance { false };
      std::optional<bool> m_useDarkAppearanceOverride;
@@ -6128,10 +6279,10 @@ index 551ffa245a63f05cd7d58a86048ed22c1feb6205..cd1ce84ec63f5ed8ae75178f79c35b9f
  
  #if ENABLE(TEXT_AUTOSIZING)
      float m_textAutosizingWidth { 0 };
-@@ -1437,6 +1458,11 @@ private:
+@@ -1683,6 +1704,11 @@ private:
  #endif
  
-     std::optional<ViewportArguments> m_overrideViewportArguments;
+     std::unique_ptr<ViewportArguments> m_overrideViewportArguments;
 +    std::optional<FloatSize> m_overrideScreenSize;
 +
 +#if ENABLE(ORIENTATION_EVENTS)
@@ -6141,10 +6292,10 @@ index 551ffa245a63f05cd7d58a86048ed22c1feb6205..cd1ce84ec63f5ed8ae75178f79c35b9f
  #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS_FAMILY)
      RefPtr<DeviceOrientationUpdateProvider> m_deviceOrientationUpdateProvider;
 diff --git a/Source/WebCore/page/PageConsoleClient.cpp b/Source/WebCore/page/PageConsoleClient.cpp
-index 18e3cde7b9ae368de4b87c88c2f8324b77cbd7c8..1ebc51b6d81fc6ae17124e7be7da039609df03d0 100644
+index e3f5517e30956f17aea53324fc3c5ce11238254c..278ddea00b98d979797e1e82a5cb3f97239b63bc 100644
 --- a/Source/WebCore/page/PageConsoleClient.cpp
 +++ b/Source/WebCore/page/PageConsoleClient.cpp
-@@ -439,4 +439,9 @@ Ref<Page> PageConsoleClient::protectedPage() const
+@@ -456,4 +456,9 @@ Ref<Page> PageConsoleClient::protectedPage() const
      return m_page.get();
  }
  
@@ -6155,10 +6306,10 @@ index 18e3cde7b9ae368de4b87c88c2f8324b77cbd7c8..1ebc51b6d81fc6ae17124e7be7da0396
 +
  } // namespace WebCore
 diff --git a/Source/WebCore/page/PageConsoleClient.h b/Source/WebCore/page/PageConsoleClient.h
-index 6ee10d6ca68ad8ea93ae45adb0876c80953d3278..d4e14d54af6cd21fc5649d18dbc6af2020fae4a2 100644
+index 153fc36199f26adbfb61cbef6744ffe31a68b951..cc667e06700013fd5e994467e19536d2e4cab189 100644
 --- a/Source/WebCore/page/PageConsoleClient.h
 +++ b/Source/WebCore/page/PageConsoleClient.h
-@@ -85,6 +85,7 @@ private:
+@@ -86,6 +86,7 @@ private:
      void record(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
      void recordEnd(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
      void screenshot(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
@@ -6167,10 +6318,10 @@ index 6ee10d6ca68ad8ea93ae45adb0876c80953d3278..d4e14d54af6cd21fc5649d18dbc6af20
      Ref<Page> protectedPage() const;
  
 diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp
-index 315c1bbcff9bdacc7e25eb91d8d4d2ede4d61a9a..8e918fe4a64a425814fd8d4b951bf48dda74fde8 100644
+index 7f0fe2766310d43552d12b85d1484cc095a752a4..1ab97c02215826ad9210489b64573145755a1b4f 100644
 --- a/Source/WebCore/page/PointerCaptureController.cpp
 +++ b/Source/WebCore/page/PointerCaptureController.cpp
-@@ -195,7 +195,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
+@@ -207,7 +207,7 @@ bool PointerCaptureController::preventsCompatibilityMouseEventsForIdentifier(Poi
      return capturingData && capturingData->preventsCompatibilityMouseEvents;
  }
  
@@ -6179,7 +6330,7 @@ index 315c1bbcff9bdacc7e25eb91d8d4d2ede4d61a9a..8e918fe4a64a425814fd8d4b951bf48d
  static bool hierarchyHasCapturingEventListeners(Element* target, const AtomString& eventName)
  {
      for (RefPtr<ContainerNode> currentNode = target; currentNode; currentNode = currentNode->parentInComposedTree()) {
-@@ -501,7 +501,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint
+@@ -557,7 +557,7 @@ void PointerCaptureController::cancelPointer(PointerID pointerId, const IntPoint
      capturingData->pendingTargetOverride = nullptr;
      capturingData->state = CapturingData::State::Cancelled;
  
@@ -6189,10 +6340,10 @@ index 315c1bbcff9bdacc7e25eb91d8d4d2ede4d61a9a..8e918fe4a64a425814fd8d4b951bf48d
  #endif
  
 diff --git a/Source/WebCore/page/PointerCaptureController.h b/Source/WebCore/page/PointerCaptureController.h
-index 91a9847a4083393e225f42e71c2dd590a88c0289..b0838c84e4ba24378db42f40a68856afe95fb9a7 100644
+index e50f38c2c45f665b4b88fe1aa4f99d1a51328d63..8144be1724ef71a93b8870f64ec5abcb98eaa27f 100644
 --- a/Source/WebCore/page/PointerCaptureController.h
 +++ b/Source/WebCore/page/PointerCaptureController.h
-@@ -58,7 +58,7 @@ public:
+@@ -60,7 +60,7 @@ public:
  
      RefPtr<PointerEvent> pointerEventForMouseEvent(const MouseEvent&, PointerID, const String& pointerType);
  
@@ -6201,8 +6352,8 @@ index 91a9847a4083393e225f42e71c2dd590a88c0289..b0838c84e4ba24378db42f40a68856af
      void dispatchEventForTouchAtIndex(EventTarget&, const PlatformTouchEvent&, unsigned, bool isPrimary, WindowProxy&, const IntPoint&);
  #endif
  
-@@ -78,12 +78,12 @@ private:
- 
+@@ -81,12 +81,12 @@ private:
+         WeakPtr<Document, WeakPtrImplWithEventTargetData> activeDocument;
          RefPtr<Element> pendingTargetOverride;
          RefPtr<Element> targetOverride;
 -#if ENABLE(TOUCH_EVENTS) && (PLATFORM(IOS_FAMILY) || PLATFORM(WPE))
@@ -6217,11 +6368,11 @@ index 91a9847a4083393e225f42e71c2dd590a88c0289..b0838c84e4ba24378db42f40a68856af
  #endif
                  ;
 diff --git a/Source/WebCore/page/Screen.cpp b/Source/WebCore/page/Screen.cpp
-index 4e4dfdebe954bf3f047d3a86a758dfd0913f732e..da2bcd0256cdfc2ba28fb07094abd0b6f9c5f754 100644
+index 24ed7c019bea4df52f2883db0e40bdbc2dc74ebd..a788f534d9e0e8124153c7f380b4fdb232c51a1a 100644
 --- a/Source/WebCore/page/Screen.cpp
 +++ b/Source/WebCore/page/Screen.cpp
-@@ -111,6 +111,9 @@ int Screen::availLeft() const
-     if (fingerprintingProtectionsEnabled(*frame))
+@@ -124,6 +124,9 @@ int Screen::availLeft() const
+     if (shouldApplyScreenFingerprintingProtections(*frame))
          return 0;
  
 +    if (frame->hasScreenSizeOverride())
@@ -6230,8 +6381,8 @@ index 4e4dfdebe954bf3f047d3a86a758dfd0913f732e..da2bcd0256cdfc2ba28fb07094abd0b6
      return static_cast<int>(screenAvailableRect(frame->protectedView().get()).x());
  }
  
-@@ -126,6 +129,9 @@ int Screen::availTop() const
-     if (fingerprintingProtectionsEnabled(*frame))
+@@ -139,6 +142,9 @@ int Screen::availTop() const
+     if (shouldApplyScreenFingerprintingProtections(*frame))
          return 0;
  
 +    if (frame->hasScreenSizeOverride())
@@ -6240,8 +6391,8 @@ index 4e4dfdebe954bf3f047d3a86a758dfd0913f732e..da2bcd0256cdfc2ba28fb07094abd0b6
      return static_cast<int>(screenAvailableRect(frame->protectedView().get()).y());
  }
  
-@@ -141,6 +147,9 @@ int Screen::availHeight() const
-     if (fingerprintingProtectionsEnabled(*frame))
+@@ -154,6 +160,9 @@ int Screen::availHeight() const
+     if (shouldApplyScreenFingerprintingProtections(*frame))
          return static_cast<int>(frame->screenSize().height());
  
 +    if (frame->hasScreenSizeOverride())
@@ -6250,8 +6401,8 @@ index 4e4dfdebe954bf3f047d3a86a758dfd0913f732e..da2bcd0256cdfc2ba28fb07094abd0b6
      return static_cast<int>(screenAvailableRect(frame->protectedView().get()).height());
  }
  
-@@ -156,6 +165,9 @@ int Screen::availWidth() const
-     if (fingerprintingProtectionsEnabled(*frame))
+@@ -169,6 +178,9 @@ int Screen::availWidth() const
+     if (shouldApplyScreenFingerprintingProtections(*frame))
          return static_cast<int>(frame->screenSize().width());
  
 +    if (frame->hasScreenSizeOverride())
@@ -6261,19 +6412,19 @@ index 4e4dfdebe954bf3f047d3a86a758dfd0913f732e..da2bcd0256cdfc2ba28fb07094abd0b6
  }
  
 diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-index a35951b3150fe859450c5f781e44032078ca5f74..7fd0c71777a3fb451f3bd97b16911c01e5aa2203 100644
+index e8cf919fd1d0147fce390aa5750843a6bce40190..fb2d56e3a3b6901f993544e297ad678c469a9cc1 100644
 --- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
 +++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
-@@ -336,6 +336,8 @@ bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtoc
- template<typename Predicate, typename... Args>
- typename std::enable_if<!std::is_convertible<Predicate, ContentSecurityPolicy::ViolatedDirectiveCallback>::value, bool>::type ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const
+@@ -374,6 +374,8 @@ template<typename Predicate, typename... Args>
+ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, Predicate&& predicate, Args&&... args) const
+     requires (!std::is_convertible_v<Predicate, ContentSecurityPolicy::ViolatedDirectiveCallback>)
  {
 +    if (InspectorInstrumentation::shouldBypassCSP(m_scriptExecutionContext.get()))
 +        return true;
      bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
      for (auto& policy : m_policies) {
          if (policy->isReportOnly() != isReportOnly)
-@@ -349,6 +351,8 @@ typename std::enable_if<!std::is_convertible<Predicate, ContentSecurityPolicy::V
+@@ -387,6 +389,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
  template<typename Predicate, typename... Args>
  bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposition, ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
  {
@@ -6282,9 +6433,9 @@ index a35951b3150fe859450c5f781e44032078ca5f74..7fd0c71777a3fb451f3bd97b16911c01
      bool isReportOnly = disposition == ContentSecurityPolicy::Disposition::ReportOnly;
      bool isAllowed = true;
      for (auto& policy : m_policies) {
-@@ -365,6 +369,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
+@@ -403,6 +407,8 @@ bool ContentSecurityPolicy::allPoliciesWithDispositionAllow(Disposition disposit
  template<typename Predicate, typename... Args>
- bool ContentSecurityPolicy::allPoliciesAllow(ViolatedDirectiveCallback&& callback, Predicate&& predicate, Args&&... args) const
+ bool ContentSecurityPolicy::allPoliciesAllow(NOESCAPE const ViolatedDirectiveCallback& callback, Predicate&& predicate, Args&&... args) const
  {
 +    if (InspectorInstrumentation::shouldBypassCSP(m_scriptExecutionContext.get()))
 +        return true;
@@ -6377,20 +6528,8 @@ index 0000000000000000000000000000000000000000..803239911006cfb3b03ea911c003f2d2
 +}
 +
 +}
-diff --git a/Source/WebCore/platform/Cairo.cmake b/Source/WebCore/platform/Cairo.cmake
-index 29492dd39b08db28aad2bf2439eb3e2bbcf25ad7..2b603cb8440b1b5057c87fcbd6909c61bae4ceb8 100644
---- a/Source/WebCore/platform/Cairo.cmake
-+++ b/Source/WebCore/platform/Cairo.cmake
-@@ -14,6 +14,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
-     platform/graphics/cairo/ImageBufferCairoBackend.h
-     platform/graphics/cairo/ImageBufferCairoImageSurfaceBackend.h
-     platform/graphics/cairo/ImageBufferCairoSurfaceBackend.h
-+    platform/graphics/cairo/ImageBufferUtilitiesCairo.h
-     platform/graphics/cairo/RefPtrCairo.h
- )
- 
 diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h
-index 35cce31f0f77478754a7859c16f42b6a7ec6edda..03660bd492fad8863aeb21d73a54e7b914147f09 100644
+index 2ebb3221cb3818f20abc7b7c3307ea7644f49d49..e0bffb6f5adee0b0a202340f633c2def1955b384 100644
 --- a/Source/WebCore/platform/DragData.h
 +++ b/Source/WebCore/platform/DragData.h
 @@ -47,7 +47,7 @@ typedef void* DragDataRef;
@@ -6413,7 +6552,7 @@ index 35cce31f0f77478754a7859c16f42b6a7ec6edda..03660bd492fad8863aeb21d73a54e7b9
      void getDragFileDescriptorData(int& size, String& pathname);
      void getDragFileContentData(int size, void* dataBlob);
  #endif
-@@ -141,7 +141,7 @@ private:
+@@ -143,7 +143,7 @@ private:
      String m_pasteboardName;
  #endif
  #if PLATFORM(WIN)
@@ -6423,7 +6562,7 @@ index 35cce31f0f77478754a7859c16f42b6a7ec6edda..03660bd492fad8863aeb21d73a54e7b9
      bool m_disallowFileAccess { false };
  };
 diff --git a/Source/WebCore/platform/DragImage.cpp b/Source/WebCore/platform/DragImage.cpp
-index dc894343a5d9ce0e45a370a83bebf97fdcbeccc5..00003bd9bada8f134b6cc49f47c8c5cb459d1ebd 100644
+index 41b4b3ca89d0df2ccba562d83c33097539b5ae1c..071bee507b730b89796420222b9787bd411a19ad 100644
 --- a/Source/WebCore/platform/DragImage.cpp
 +++ b/Source/WebCore/platform/DragImage.cpp
 @@ -280,7 +280,7 @@ DragImage::~DragImage()
@@ -6435,11 +6574,24 @@ index dc894343a5d9ce0e45a370a83bebf97fdcbeccc5..00003bd9bada8f134b6cc49f47c8c5cb
  
  IntSize dragImageSize(DragImageRef)
  {
+diff --git a/Source/WebCore/platform/DragImage.h b/Source/WebCore/platform/DragImage.h
+index 77286d8e715825c9c7c0d329480fc0fc497fe561..5ea53eb8b7e53dd5a5950c65a38c1d23bfe46681 100644
+--- a/Source/WebCore/platform/DragImage.h
++++ b/Source/WebCore/platform/DragImage.h
+@@ -60,7 +60,7 @@ class Node;
+ typedef RetainPtr<CGImageRef> DragImageRef;
+ #elif PLATFORM(MAC)
+ typedef RetainPtr<NSImage> DragImageRef;
+-#elif PLATFORM(WIN)
++#elif PLATFORM(WIN) && USE(CAIRO)
+ typedef HBITMAP DragImageRef;
+ #elif USE(CAIRO)
+ typedef RefPtr<cairo_surface_t> DragImageRef;
 diff --git a/Source/WebCore/platform/Pasteboard.h b/Source/WebCore/platform/Pasteboard.h
-index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d819c40da 100644
+index f8de8815d483bd3ac684c018159c593798c0495a..e84ce8eec7424fbc3456623289588b1832d9fb7f 100644
 --- a/Source/WebCore/platform/Pasteboard.h
 +++ b/Source/WebCore/platform/Pasteboard.h
-@@ -45,7 +45,7 @@ OBJC_CLASS NSString;
+@@ -46,7 +46,7 @@ OBJC_CLASS NSString;
  OBJC_CLASS NSArray;
  #endif
  
@@ -6448,17 +6600,8 @@ index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d
  #include "SelectionData.h"
  #endif
  
-@@ -108,7 +108,7 @@ struct PasteboardURL {
- #if PLATFORM(MAC)
-     String userVisibleForm;
- #endif
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) || PLATFORM(WPE)
-     String markup;
- #endif
- };
-@@ -197,6 +197,11 @@ public:
- #endif
+@@ -200,6 +200,11 @@ public:
+     explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, const String& name);
  #endif
  
 +#if PLATFORM(WPE) && ENABLE(DRAG_SUPPORT)
@@ -6469,8 +6612,8 @@ index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d
  #if PLATFORM(WIN)
      explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, IDataObject*);
      explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, WCDataObject*);
-@@ -264,6 +269,12 @@ public:
-     int64_t changeCount() const;
+@@ -266,6 +271,12 @@ public:
+     static std::unique_ptr<Pasteboard> createForGlobalSelection(std::unique_ptr<PasteboardContext>&&);
  #endif
  
 +#if PLATFORM(WPE)
@@ -6482,7 +6625,7 @@ index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d
  #if PLATFORM(IOS_FAMILY)
      explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, int64_t changeCount);
      explicit Pasteboard(std::unique_ptr<PasteboardContext>&&, const String& pasteboardName);
-@@ -306,6 +317,7 @@ public:
+@@ -311,6 +322,7 @@ public:
      COMPtr<IDataObject> dataObject() const { return m_dataObject; }
      WEBCORE_EXPORT void setExternalDataObject(IDataObject*);
      const DragDataMap& dragDataMap() const { return m_dragDataMap; }
@@ -6490,7 +6633,7 @@ index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d
      void writeURLToWritableDataObject(const URL&, const String&);
      COMPtr<WCDataObject> writableDataObject() const { return m_writableDataObject; }
      void writeImageToDataObject(Element&, const URL&); // FIXME: Layering violation.
-@@ -358,6 +370,10 @@ private:
+@@ -366,6 +378,10 @@ private:
      int64_t m_changeCount { 0 };
  #endif
  
@@ -6501,7 +6644,7 @@ index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d
  #if PLATFORM(COCOA)
      String m_pasteboardName;
      int64_t m_changeCount;
-@@ -373,6 +389,7 @@ private:
+@@ -381,6 +397,7 @@ private:
      COMPtr<IDataObject> m_dataObject;
      COMPtr<WCDataObject> m_writableDataObject;
      DragDataMap m_dragDataMap;
@@ -6510,10 +6653,10 @@ index 2203effb3a0a745170680a23d0ff07f3a1a1cd1b..11c0fe944d603349087c942caff9081d
  };
  
 diff --git a/Source/WebCore/platform/PlatformKeyboardEvent.h b/Source/WebCore/platform/PlatformKeyboardEvent.h
-index 4aa768e1c2a8da63004f34ccbf0d347b2484c37b..515c99ed21cde6c157bb9a1378a783727cffc6e7 100644
+index 63ffd6ca32c3baee03db2a9419c4f7e9de45388a..c60c7a8d1f110472117c8c4e969fd05fef71f908 100644
 --- a/Source/WebCore/platform/PlatformKeyboardEvent.h
 +++ b/Source/WebCore/platform/PlatformKeyboardEvent.h
-@@ -134,6 +134,7 @@ namespace WebCore {
+@@ -135,6 +135,7 @@ namespace WebCore {
          static String keyCodeForHardwareKeyCode(unsigned);
          static String keyIdentifierForGdkKeyCode(unsigned);
          static int windowsKeyCodeForGdkKeyCode(unsigned);
@@ -6521,7 +6664,7 @@ index 4aa768e1c2a8da63004f34ccbf0d347b2484c37b..515c99ed21cde6c157bb9a1378a78372
          static String singleCharacterString(unsigned);
  #endif
  
-@@ -142,6 +143,7 @@ namespace WebCore {
+@@ -143,6 +144,7 @@ namespace WebCore {
          static String keyCodeForHardwareKeyCode(unsigned);
          static String keyIdentifierForWPEKeyCode(unsigned);
          static int windowsKeyCodeForWPEKeyCode(unsigned);
@@ -6530,18 +6673,10 @@ index 4aa768e1c2a8da63004f34ccbf0d347b2484c37b..515c99ed21cde6c157bb9a1378a78372
  #endif
  
 diff --git a/Source/WebCore/platform/PlatformScreen.cpp b/Source/WebCore/platform/PlatformScreen.cpp
-index ae46341ba71c7f6df7c607bd852338cdb7f83fe1..b318c0771192344a6891c1f097cb0b93dabe8237 100644
+index ef0abc9a93e878897ffc9d2497a3da0fca5b37b7..abd96c6d1a6c3ab9e0121c1e78f2f75a5f805b32 100644
 --- a/Source/WebCore/platform/PlatformScreen.cpp
 +++ b/Source/WebCore/platform/PlatformScreen.cpp
-@@ -25,6 +25,7 @@
- 
- #include "config.h"
- #include "PlatformScreen.h"
-+#include "DeprecatedGlobalSettings.h"
- 
- #if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
- 
-@@ -73,3 +74,25 @@ const ScreenData* screenData(PlatformDisplayID screenDisplayID)
+@@ -85,3 +85,24 @@ OptionSet<ContentsFormat> screenContentsFormatsForTesting()
  } // namespace WebCore
  
  #endif // PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WPE) && ENABLE(WPE_PLATFORM))
@@ -6549,57 +6684,51 @@ index ae46341ba71c7f6df7c607bd852338cdb7f83fe1..b318c0771192344a6891c1f097cb0b93
 +#if ENABLE(TOUCH_EVENTS)
 +namespace WebCore {
 +
-+static std::optional<bool> screenHasTouchDeviceOverride = std::nullopt;
++static std::optional<bool> _screenHasTouchDeviceOverride = std::nullopt;
++
 +void setScreenHasTouchDeviceOverride(bool value) {
-+  screenHasTouchDeviceOverride = value;
++  _screenHasTouchDeviceOverride = value;
++}
++std::optional<bool> screenHasTouchDeviceOverride() {
++    return _screenHasTouchDeviceOverride;
 +}
 +
 +bool screenHasTouchDevice() {
-+    if (screenHasTouchDeviceOverride)
-+        return screenHasTouchDeviceOverride.value();
++    if (screenHasTouchDeviceOverride())
++        return screenHasTouchDeviceOverride().value();
 +    return platformScreenHasTouchDevice();
 +}
-+bool screenIsTouchPrimaryInputDevice() {
-+    if (screenHasTouchDeviceOverride)
-+        return screenHasTouchDeviceOverride.value();
-+    return platformScreenIsTouchPrimaryInputDevice();
-+}
 +
 +} // namespace WebCore
 +#endif
 diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
-index 6c64c7040eb190c3d67380070e884a8230029c26..d0f8341c538cbc2323ac0074a5ef3226d00a5fd6 100644
+index 82a54ac2de2ddf4650e4b48db129fe25f6562264..d144ba15d18d2e892c25988dab27636135353a99 100644
 --- a/Source/WebCore/platform/PlatformScreen.h
 +++ b/Source/WebCore/platform/PlatformScreen.h
-@@ -151,13 +151,18 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
+@@ -160,10 +160,14 @@ WEBCORE_EXPORT float screenScaleFactor(UIScreen * = nullptr);
  #endif
  
  #if ENABLE(TOUCH_EVENTS)
--#if PLATFORM(GTK) || PLATFORM(WPE)
+-#if PLATFORM(GTK)
 +WEBCORE_EXPORT void setScreenHasTouchDeviceOverride(bool);
++WEBCORE_EXPORT std::optional<bool> screenHasTouchDeviceOverride();
 +
  WEBCORE_EXPORT bool screenHasTouchDevice();
- WEBCORE_EXPORT bool screenIsTouchPrimaryInputDevice();
-+#if PLATFORM(GTK) || PLATFORM(WPE)
++#if PLATFORM(GTK)
 +bool platformScreenHasTouchDevice();
-+bool platformScreenIsTouchPrimaryInputDevice();
  #else
 -constexpr bool screenHasTouchDevice() { return true; }
--constexpr bool screenIsTouchPrimaryInputDevice() { return true; }
 +constexpr bool platformScreenHasTouchDevice() { return true; }
-+constexpr bool platformScreenIsTouchPrimaryInputDevice() { return true; }
  #endif
  #endif
  
-+
- } // namespace WebCore
 diff --git a/Source/WebCore/platform/PlatformTouchEvent.h b/Source/WebCore/platform/PlatformTouchEvent.h
-index 27b46407faf6ae9d245856fd0ed664984e8729f8..2b8912789dcda373ceffa8f23996566ff07df2dd 100644
+index 23f011953c66f401553bedfaef3485af215ae083..a73da2ebe47f0d8dc57f3d0159e8f299abb61c96 100644
 --- a/Source/WebCore/platform/PlatformTouchEvent.h
 +++ b/Source/WebCore/platform/PlatformTouchEvent.h
-@@ -38,7 +38,7 @@ public:
+@@ -42,7 +42,7 @@ public:
  
-     const Vector<PlatformTouchPoint>& touchPoints() const { return m_touchPoints; }
+     const Vector<PlatformTouchEvent>& predictedEvents() const { return m_predictedEvents; }
  
 -#if PLATFORM(WPE)
 +#if !ENABLE(IOS_TOUCH_EVENTS)
@@ -6619,11 +6748,23 @@ index 34715d27b529750fc866db87cd330b5184286771..3eefa218af075f76d98012cdeae7e4b3
      // FIXME: since WPE currently does not send touch stationary events, we need to be able to
      // create a PlatformTouchPoint of type TouchCancelled artificially
      PlatformTouchPoint(unsigned id, State state, IntPoint screenPos, IntPoint pos)
+diff --git a/Source/WebCore/platform/Skia.cmake b/Source/WebCore/platform/Skia.cmake
+index c39b57e01190b833be46452c3d964fe243c216d3..6e4af1509037697421cf0c80e2459da0bad79ba8 100644
+--- a/Source/WebCore/platform/Skia.cmake
++++ b/Source/WebCore/platform/Skia.cmake
+@@ -14,6 +14,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
+     platform/graphics/skia/FontCascadeSkiaInlines.h
+     platform/graphics/skia/GraphicsContextSkia.h
+     platform/graphics/skia/ImageBufferSkiaBackend.h
++    platform/graphics/skia/ImageBufferUtilitiesSkia.h
+     platform/graphics/skia/SkiaHarfBuzzFont.h
+     platform/graphics/skia/SkiaHarfBuzzFontCache.h
+     platform/graphics/skia/SkiaPaintingEngine.h
 diff --git a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
-index e280025043b3c03c3974289e62ef7cc88ebfa2c7..077a4ab4aa5b688937ed4d5018745aa6f6af7442 100644
+index 492c5e76290c2379cda40b9663f5f67ff8f66360..096752985edf39960eb4be6eb733ebe3713313cb 100644
 --- a/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
 +++ b/Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp
-@@ -43,7 +43,7 @@
+@@ -46,7 +46,7 @@
  
  namespace WebCore {
  
@@ -6632,106 +6773,11 @@ index e280025043b3c03c3974289e62ef7cc88ebfa2c7..077a4ab4aa5b688937ed4d5018745aa6
  static const unsigned scrollbarBorderSize = 1;
  static const unsigned thumbBorderSize = 1;
  static const unsigned overlayThumbSize = 3;
-diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
-index d137ffd1a8ed0b788bd28197c6d7e9f7d14e852f..dcf8bf3f7ee6b037a370712e2ac36b6e2e4bbebc 100644
---- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
-+++ b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
-@@ -48,6 +48,13 @@
- #include <wtf/glib/GUniquePtr.h>
- #endif
- 
-+#if PLATFORM(WPE) || PLATFORM(WIN)
-+#include <stdio.h> // Needed by jpeglib.h for FILE.
-+extern "C" {
-+#include "jpeglib.h"
-+}
-+#endif
-+
- namespace WebCore {
- 
- #if !PLATFORM(GTK)
-@@ -65,8 +72,75 @@ static bool encodeImage(cairo_surface_t* image, const String& mimeType, Vector<u
-     return cairo_surface_write_to_png_stream(image, writeFunction, output) == CAIRO_STATUS_SUCCESS;
- }
- 
--Vector<uint8_t> encodeData(cairo_surface_t* image, const String& mimeType, std::optional<double>)
-+static Vector<uint8_t> encodeJpeg(cairo_surface_t* image, int quality)
-+{
-+    if (cairo_surface_get_type(image) != CAIRO_SURFACE_TYPE_IMAGE) {
-+        fprintf(stderr, "Unexpected cairo surface type: %d\n", cairo_surface_get_type(image));
-+        return { };
-+    }
-+
-+    if (cairo_image_surface_get_format(image) != CAIRO_FORMAT_ARGB32) {
-+        fprintf(stderr, "Unexpected surface image format: %d\n", cairo_image_surface_get_format(image));
-+        return { };
-+    }
-+
-+    struct jpeg_compress_struct info;
-+    struct jpeg_error_mgr error;
-+    info.err = jpeg_std_error(&error);
-+    jpeg_create_compress(&info);
-+
-+    unsigned char* bufferPtr = nullptr;
-+    unsigned long bufferSize;
-+    jpeg_mem_dest(&info, &bufferPtr, &bufferSize);
-+    info.image_width = cairo_image_surface_get_width(image);
-+    info.image_height = cairo_image_surface_get_height(image);
-+
-+#ifndef LIBJPEG_TURBO_VERSION
-+    COMPILE_ASSERT(false, only_libjpeg_turbo_is_supported);
-+#endif
-+
-+#if CPU(LITTLE_ENDIAN)
-+    info.in_color_space = JCS_EXT_BGRA;
-+#else
-+    info.in_color_space = JCS_EXT_ARGB;
-+#endif
-+    // # of color components in input image
-+    info.input_components = 4;
-+
-+    jpeg_set_defaults(&info);
-+    jpeg_set_quality(&info, quality, true);
-+
-+    jpeg_start_compress(&info, true);
-+
-+    while (info.next_scanline < info.image_height)
-+    {
-+        JSAMPROW row = cairo_image_surface_get_data(image) + (info.next_scanline * cairo_image_surface_get_stride(image));
-+        if (jpeg_write_scanlines(&info, &row, 1) != 1) {
-+            fprintf(stderr, "JPEG library failed to encode line\n");
-+            break;
-+        }
-+    }
-+
-+    jpeg_finish_compress(&info);
-+    jpeg_destroy_compress(&info);
-+
-+    Vector<uint8_t> output;
-+    output.append(std::span { bufferPtr, bufferSize });
-+    // Cannot use unique_ptr as bufferPtr changes during compression. GUniquePtr would work
-+    // but it's under GLib and won't work on Windows.
-+    free(bufferPtr);
-+    return output;
-+}
-+
-+Vector<uint8_t> encodeData(cairo_surface_t* image, const String& mimeType, std::optional<double> quality)
- {
-+    if (mimeType == "image/jpeg"_s) {
-+        int qualityPercent = 100;
-+        if (quality)
-+            qualityPercent = static_cast<int>(*quality * 100.0 + 0.5);
-+        return encodeJpeg(image, qualityPercent);
-+    }
-+
-     Vector<uint8_t> encodedImage;
-     if (!image || !encodeImage(image, mimeType, &encodedImage))
-         return { };
 diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
-index a82b748682f984fcdd4f5413d0254e0f5573f043..2c3d4bba92c63235c124a400d89455499aa3a189 100644
+index 5b659c763b9754b025a63f89522954cc39915b9a..448b50a2b131361a75d3f816cdcbb6a102551280 100644
 --- a/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
 +++ b/Source/WebCore/platform/graphics/cg/ImageBufferUtilitiesCG.h
-@@ -38,7 +38,7 @@ WEBCORE_EXPORT uint8_t verifyImageBufferIsBigEnough(const void* buffer, size_t b
+@@ -38,7 +38,7 @@ WEBCORE_EXPORT uint8_t verifyImageBufferIsBigEnough(std::span<const uint8_t> buf
  
  RetainPtr<CFStringRef> utiFromImageBufferMIMEType(const String& mimeType);
  CFStringRef jpegUTI();
@@ -6741,7 +6787,7 @@ index a82b748682f984fcdd4f5413d0254e0f5573f043..2c3d4bba92c63235c124a400d8945549
  Vector<uint8_t> encodeData(std::span<const uint8_t>, const String& mimeType, std::optional<double> quality);
  
 diff --git a/Source/WebCore/platform/graphics/filters/software/FEComponentTransferSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FEComponentTransferSoftwareApplier.h
-index b60f9a64bacc8282860da6de299b75aeb295b9b5..55bd017c03c6478ca334bd5ef164160fef5d5302 100644
+index c7542b821af8c87660e10b0c07b360cfcc8e28a2..a3cc131ff0410ae31df30c115dd9fd26aec5adf8 100644
 --- a/Source/WebCore/platform/graphics/filters/software/FEComponentTransferSoftwareApplier.h
 +++ b/Source/WebCore/platform/graphics/filters/software/FEComponentTransferSoftwareApplier.h
 @@ -23,6 +23,7 @@
@@ -6749,18 +6795,18 @@ index b60f9a64bacc8282860da6de299b75aeb295b9b5..55bd017c03c6478ca334bd5ef164160f
  
  #include "FilterEffectApplier.h"
 +#include "PixelBuffer.h"
+ #include <wtf/TZoneMalloc.h>
  
  namespace WebCore {
- 
 diff --git a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp
-index 3f96ccee98a29188e4af376484ab6514b319ddf8..20d9ba661aa10adada5ef5688854b4bc3c0f0702 100644
+index 78ea08023ebd5f1b41b06cd843b6dce4ee80dd50..55fed94b774f033b4f75e2dee85dc27cf2e2689e 100644
 --- a/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp
 +++ b/Source/WebCore/platform/graphics/win/ComplexTextControllerUniscribe.cpp
-@@ -169,6 +169,33 @@ static Vector<unsigned> stringIndicesFromClusters(const Vector<WORD>& clusters,
+@@ -168,6 +168,33 @@ static Vector<unsigned> stringIndicesFromClusters(const Vector<WORD>& clusters,
      return stringIndices;
  }
  
-+static int compactScriptItemsIfNeeded(const UChar* cp, unsigned stringLength, Vector<SCRIPT_ITEM>& items, int numItems, const Font* font)
++static int compactScriptItemsIfNeeded(std::span<const UChar> cp, Vector<SCRIPT_ITEM>& items, int numItems, const Font* font)
 +{
 +    // https://bugs.webkit.org/show_bug.cgi?id=201214
 +    // Uniscribe is overly aggressive in separating the runs. It'll split "3d_rotation" into "3", "d", "_" and "rotation" and we
@@ -6771,11 +6817,11 @@ index 3f96ccee98a29188e4af376484ab6514b319ddf8..20d9ba661aa10adada5ef5688854b4bc
 +    if (!numItems)
 +        return numItems;
 +
-+    if (font->platformData().isSystemFont() || font->platformData().hasVariations())
++    if (font->platformData().hasVariations())
 +        return numItems;
 +
 +    bool allGoodCharacters = true;
-+    for (unsigned i = 0; allGoodCharacters && i < stringLength; ++i) {
++    for (unsigned i = 0; allGoodCharacters && i < cp.size(); ++i) {
 +        const UChar c = cp[i];
 +        allGoodCharacters = (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_';
 +    }
@@ -6787,39 +6833,40 @@ index 3f96ccee98a29188e4af376484ab6514b319ddf8..20d9ba661aa10adada5ef5688854b4bc
 +    return 1;
 +}
 +
- void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, unsigned stringLength, unsigned stringLocation, const Font* font)
+ void ComplexTextController::collectComplexTextRunsForCharacters(std::span<const UChar> cp, unsigned stringLocation, const Font* font)
  {
      if (!font) {
-@@ -198,6 +225,8 @@ void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp,
+@@ -197,6 +224,8 @@ void ComplexTextController::collectComplexTextRunsForCharacters(std::span<const
      }
      items.resize(numItems + 1);
  
-+    numItems = compactScriptItemsIfNeeded(cp, stringLength, items, numItems, font);
++    numItems = compactScriptItemsIfNeeded(cp, items, numItems, font);
 +
      for (int i = 0; i < numItems; i++) {
          // Determine the string for this item.
-         const UChar* str = cp + items[i].iCharPos;
+         const UChar* str = cp.data() + items[i].iCharPos;
 diff --git a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-index 58f2ac6c28396289c55493c7a78b2b4709e5f129..cf9687900fdeeebe9d829907d121da2495722bae 100644
+index 2b7d3dc70fdfec767d8caa13966c4051ee73aead..7fa8e155bef817c837042c8d6c4dcb84864232bc 100644
 --- a/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
 +++ b/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp
-@@ -37,7 +37,9 @@
+@@ -37,8 +37,10 @@
  #include <gdk/gdk.h>
  #include <gdk/gdkkeysyms.h>
  #include <pal/text/TextEncoding.h>
 +#include <wtf/HashMap.h>
  #include <wtf/HexNumber.h>
+ #include <wtf/text/MakeString.h>
 +#include <mutex>
  
  namespace WebCore {
  
-@@ -1301,6 +1303,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForGdkKeyCode(unsigned keycode)
+@@ -1302,6 +1304,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForGdkKeyCode(unsigned keycode)
  
  }
  
-+static const HashMap<int, unsigned>& gdkToWindowsKeyCodeMap()
++static const UncheckedKeyHashMap<int, unsigned>& gdkToWindowsKeyCodeMap()
 +{
-+    static HashMap<int, unsigned>* result;
++    static UncheckedKeyHashMap<int, unsigned>* result;
 +    static std::once_flag once;
 +    std::call_once(
 +        once,
@@ -7042,7 +7089,7 @@ index 58f2ac6c28396289c55493c7a78b2b4709e5f129..cf9687900fdeeebe9d829907d121da24
 +                GDK_KEY_Subtitle,
 +                GDK_KEY_Video
 +            };
-+            result = new HashMap<int, unsigned>();
++            result = new UncheckedKeyHashMap<int, unsigned>();
 +            for (unsigned gdkKeyCode : gdkKeyCodes) {
 +                int winKeyCode = PlatformKeyboardEvent::windowsKeyCodeForGdkKeyCode(gdkKeyCode);
 +                // If several gdk key codes map to the same win key code first one is used.
@@ -7061,256 +7108,41 @@ index 58f2ac6c28396289c55493c7a78b2b4709e5f129..cf9687900fdeeebe9d829907d121da24
  {
      switch (val) {
 diff --git a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
-index ae1da37330aa06a8f660876ba415ff2821f59813..c358a925347187181fbe1b381428c7bd0018455c 100644
+index 1339241aae69b657ffa40b603eea992c45db0e65..9194ff5f8308e5cf22fb250723ae4161142da45f 100644
 --- a/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
 +++ b/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp
-@@ -124,7 +124,7 @@ bool screenSupportsExtendedColor(Widget*)
+@@ -121,7 +121,7 @@ bool screenSupportsExtendedColor(Widget*)
  }
  
  #if ENABLE(TOUCH_EVENTS)
 -bool screenHasTouchDevice()
 +bool platformScreenHasTouchDevice()
  {
-     auto* display = gdk_display_get_default();
-     if (!display)
-@@ -134,7 +134,7 @@ bool screenHasTouchDevice()
-     return seat ? gdk_seat_get_capabilities(seat) & GDK_SEAT_CAPABILITY_TOUCH : true;
+     return getScreenProperties().screenHasTouchDevice;
  }
+diff --git a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
+index a8674916429908cabb86bd95dc5b3da217e1556b..6a464e2b0c1c45cd4e8effba678b8dde9dd870da 100644
+--- a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
++++ b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
+@@ -30,9 +30,11 @@
  
--bool screenIsTouchPrimaryInputDevice()
-+bool platformScreenIsTouchPrimaryInputDevice()
- {
-     auto* display = gdk_display_get_default();
-     if (!display)
-diff --git a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp
-index ae439e30f1fb239d18e1164e8896dfb272c75673..eddcb9bda783fcdcbf9f924d4eaa6cc78dd54395 100644
---- a/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp
-+++ b/Source/WebCore/platform/libwpe/PasteboardLibWPE.cpp
-@@ -32,6 +32,10 @@
- #include "PasteboardStrategy.h"
- #include "PlatformStrategies.h"
+ #include "WindowsKeyboardCodes.h"
+ #include <wpe/wpe.h>
++#include <wtf/HashMap.h>
+ #include <wtf/HexNumber.h>
+ #include <wtf/text/MakeString.h>
+ #include <wtf/text/StringBuilder.h>
++#include <mutex>
  
-+#if ENABLE(DRAG_SUPPORT)
-+#include "DragData.h"
-+#endif
-+
  namespace WebCore {
  
- std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste(std::unique_ptr<PasteboardContext>&& context)
-@@ -52,9 +56,28 @@ bool Pasteboard::hasData()
-     return !types.isEmpty();
- }
- 
--Vector<String> Pasteboard::typesSafeForBindings(const String&)
-+Vector<String> Pasteboard::typesSafeForBindings(const String& origin)
- {
--    notImplemented();
-+    if (m_selectionData) {
-+        ListHashSet<String> types;
-+        if (auto* buffer = m_selectionData->customData()) {
-+            auto customData = PasteboardCustomData::fromSharedBuffer(*buffer);
-+            if (customData.origin() == origin) {
-+                for (auto& type : customData.orderedTypes())
-+                    types.add(type);
-+            }
-+        }
-+
-+        if (m_selectionData->hasText())
-+            types.add("text/plain"_s);
-+        if (m_selectionData->hasMarkup())
-+            types.add("text/html"_s);
-+        if (m_selectionData->hasURIList())
-+            types.add("text/uri-list"_s);
-+
-+        return copyToVector(types);
-+    }
-+
-     return { };
- }
- 
-@@ -67,23 +90,55 @@ Vector<String> Pasteboard::typesForLegacyUnsafeBindings()
- 
- String Pasteboard::readOrigin()
- {
--    notImplemented(); // webkit.org/b/177633: [GTK] Move to new Pasteboard API
-+    if (m_selectionData) {
-+        if (auto* buffer = m_selectionData->customData())
-+            return PasteboardCustomData::fromSharedBuffer(*buffer).origin();
-+
-+        return { };
-+    }
-+
-     return { };
- }
- 
- String Pasteboard::readString(const String& type)
- {
-+    if (m_selectionData) {
-+        if (type == "text/plain"_s)
-+            return m_selectionData->text();;
-+        if (type == "text/html"_s)
-+            return m_selectionData->markup();
-+        if (type == "Files"_s || type == "text/uri-list"_s)
-+            return m_selectionData->uriList();
-+        return { };
-+    }
-+
-     return platformStrategies()->pasteboardStrategy()->readStringFromPasteboard(0, type, name(), context());
- }
- 
--String Pasteboard::readStringInCustomData(const String&)
-+String Pasteboard::readStringInCustomData(const String& type)
- {
-+    if (m_selectionData) {
-+        if (auto* buffer = m_selectionData->customData())
-+            return PasteboardCustomData::fromSharedBuffer(*buffer).readStringInCustomData(type);
-+
-+        return { };
-+    }
-+
-     notImplemented();
-     return { };
- }
- 
- void Pasteboard::writeString(const String& type, const String& text)
- {
-+   if (m_selectionData) {
-+        if (type == "Files"_s || type == "text/uri-list"_s)
-+            m_selectionData->setURIList(text);
-+        else if (type == "text/html"_s)
-+            m_selectionData->setMarkup(text);
-+        else if (type == "text/plain"_s)
-+            m_selectionData->setText(text);
-+        return;
-+    }
-     platformStrategies()->pasteboardStrategy()->writeToPasteboard(type, text);
+@@ -1303,6 +1305,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(unsigned keycode)
+     return 0;
  }
  
-@@ -111,7 +166,12 @@ void Pasteboard::read(PasteboardFileReader&, std::optional<size_t>)
- 
- void Pasteboard::write(const PasteboardURL& url)
- {
--    platformStrategies()->pasteboardStrategy()->writeToPasteboard("text/plain;charset=utf-8"_s, url.url.string());
-+    if (m_selectionData) {
-+        m_selectionData->clearAll();
-+        m_selectionData->setURL(url.url, url.title);
-+    } else {
-+        platformStrategies()->pasteboardStrategy()->writeToPasteboard("text/plain;charset=utf-8"_s, url.url.string());
-+    }
- }
- 
- void Pasteboard::writeTrustworthyWebURLsPboardType(const PasteboardURL&)
-@@ -119,8 +179,16 @@ void Pasteboard::writeTrustworthyWebURLsPboardType(const PasteboardURL&)
-     notImplemented();
- }
- 
--void Pasteboard::write(const PasteboardImage&)
-+void Pasteboard::write(const PasteboardImage& pasteboardImage)
- {
-+    if (m_selectionData) {
-+        m_selectionData->clearAll();
-+        if (!pasteboardImage.url.url.isEmpty()) {
-+            m_selectionData->setURL(pasteboardImage.url.url, pasteboardImage.url.title);
-+            m_selectionData->setMarkup(pasteboardImage.url.markup);
-+        }
-+        m_selectionData->setImage(pasteboardImage.image.get());
-+    }
- }
- 
- void Pasteboard::write(const PasteboardBuffer&)
-@@ -129,7 +197,13 @@ void Pasteboard::write(const PasteboardBuffer&)
- 
- void Pasteboard::write(const PasteboardWebContent& content)
- {
--    platformStrategies()->pasteboardStrategy()->writeToPasteboard(content);
-+    if (m_selectionData) {
-+        m_selectionData->clearAll();
-+        m_selectionData->setText(content.text);
-+        m_selectionData->setMarkup(content.markup);
-+    } else {
-+        platformStrategies()->pasteboardStrategy()->writeToPasteboard(content);
-+    }
- }
- 
- Pasteboard::FileContentState Pasteboard::fileContentState()
-@@ -152,14 +226,54 @@ void Pasteboard::writePlainText(const String& text, SmartReplaceOption)
-     writeString("text/plain;charset=utf-8"_s, text);
- }
- 
--void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>&)
-+void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
- {
-+    if (m_selectionData) {
-+        if (!data.isEmpty()) {
-+            const auto& customData = data[0];
-+            customData.forEachPlatformString([this] (auto& type, auto& string) {
-+                writeString(type, string);
-+            });
-+            if (customData.hasSameOriginCustomData() || !customData.origin().isEmpty())
-+                m_selectionData->setCustomData(customData.createSharedBuffer());
-+        }
-+        return;
-+    }
- }
- 
- void Pasteboard::write(const Color&)
- {
- }
- 
-+#if ENABLE(DRAG_SUPPORT)
-+
-+Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context, SelectionData&& selectionData)
-+    : m_context(WTFMove(context))
-+    , m_selectionData(WTFMove(selectionData))
-+{
-+}
-+
-+Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context, SelectionData& selectionData)
-+    : m_context(WTFMove(context))
-+    , m_selectionData(selectionData)
-+{
-+}
-+
-+std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(std::unique_ptr<PasteboardContext>&& context)
++static const UncheckedKeyHashMap<int, unsigned>& WPEToWindowsKeyCodeMap()
 +{
-+    return makeUnique<Pasteboard>(WTFMove(context), SelectionData());
-+}
-+
-+std::unique_ptr<Pasteboard> Pasteboard::create(const DragData& dragData)
-+{
-+    RELEASE_ASSERT(dragData.platformData());
-+    return makeUnique<Pasteboard>(dragData.createPasteboardContext(), *dragData.platformData());
-+}
-+void Pasteboard::setDragImage(DragImage, const IntPoint&)
-+{
-+}
-+#endif
-+
- } // namespace WebCore
- 
- #endif // USE(LIBWPE)
-diff --git a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-index e187936cbef017c080d1dfa14de439b3f5bc2cf8..270c237c8db2f6809719ecfd54a95306728676bc 100644
---- a/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-+++ b/Source/WebCore/platform/libwpe/PlatformKeyboardEventLibWPE.cpp
-@@ -30,8 +30,10 @@
- 
- #include "WindowsKeyboardCodes.h"
- #include <wpe/wpe.h>
-+#include <wtf/HashMap.h>
- #include <wtf/HexNumber.h>
- #include <wtf/text/StringBuilder.h>
-+#include <mutex>
- 
- namespace WebCore {
- 
-@@ -1302,6 +1304,246 @@ int PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(unsigned keycode)
-     return 0;
- }
- 
-+static const HashMap<int, unsigned>& WPEToWindowsKeyCodeMap()
-+{
-+    static HashMap<int, unsigned>* result;
++    static UncheckedKeyHashMap<int, unsigned>* result;
 +    static std::once_flag once;
 +    std::call_once(
 +        once,
@@ -7533,7 +7365,7 @@ index e187936cbef017c080d1dfa14de439b3f5bc2cf8..270c237c8db2f6809719ecfd54a95306
 +                WPE_KEY_Subtitle,
 +                WPE_KEY_Video
 +            };
-+            result = new HashMap<int, unsigned>();
++            result = new UncheckedKeyHashMap<int, unsigned>();
 +            for (unsigned WPEKeyCode : WPEKeyCodes) {
 +                int winKeyCode = PlatformKeyboardEvent::windowsKeyCodeForWPEKeyCode(WPEKeyCode);
 +                // If several gdk key codes map to the same win key code first one is used.
@@ -7552,7 +7384,7 @@ index e187936cbef017c080d1dfa14de439b3f5bc2cf8..270c237c8db2f6809719ecfd54a95306
  {
      switch (val) {
 diff --git a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
-index c62e88f8c3aa40f01618cdaf0c0e22a2404b17ad..02411ac6bb361c2677c269945f665e0a92ccb902 100644
+index f21f7d66c5dd661c289a453994597ae166c8f3d0..c293b72154e2cb8f4f1ad3cc222a05f29888891d 100644
 --- a/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
 +++ b/Source/WebCore/platform/libwpe/PlatformPasteboardLibWPE.cpp
 @@ -31,10 +31,18 @@
@@ -7565,25 +7397,24 @@ index c62e88f8c3aa40f01618cdaf0c0e22a2404b17ad..02411ac6bb361c2677c269945f665e0a
  
  namespace WebCore {
  
-+static HashMap<String, String>& sharedPasteboard()
++static UncheckedKeyHashMap<String, String>& sharedPasteboard()
 +{
-+    static NeverDestroyed<HashMap<String, String>> pasteboard;
++    static NeverDestroyed<UncheckedKeyHashMap<String, String>> pasteboard;
 +    return pasteboard.get();
 +}
 +
  PlatformPasteboard::PlatformPasteboard(const String&)
      : m_pasteboard(wpe_pasteboard_get_singleton())
  {
-@@ -54,72 +62,26 @@ void PlatformPasteboard::performAsDataOwner(DataOwnerType, Function<void()>&& ac
+@@ -59,74 +67,26 @@ int64_t PlatformPasteboard::changeCount() const
  
  void PlatformPasteboard::getTypes(Vector<String>& types) const
  {
 -    struct wpe_pasteboard_string_vector pasteboardTypes = { nullptr, 0 };
 -    wpe_pasteboard_get_types(m_pasteboard, &pasteboardTypes);
--
--    for (unsigned i = 0; i < pasteboardTypes.length; ++i) {
--        auto& typeString = pasteboardTypes.strings[i];
--        types.append(String({ typeString.data, typeString.length }));
+-    for (auto& typeString : unsafeMakeSpan(pasteboardTypes.strings, pasteboardTypes.length)) {
+-        const auto length = std::min(static_cast<size_t>(typeString.length), std::numeric_limits<size_t>::max());
+-        types.append(String(unsafeMakeSpan(typeString.data, length)));
 -    }
 -
 -    wpe_pasteboard_string_vector_free(&pasteboardTypes);
@@ -7598,7 +7429,8 @@ index c62e88f8c3aa40f01618cdaf0c0e22a2404b17ad..02411ac6bb361c2677c269945f665e0a
 -    if (!string.length)
 -        return String();
 -
--    String returnValue({ string.data, string.length });
+-    const auto length = std::min(static_cast<size_t>(string.length), std::numeric_limits<size_t>::max());
+-    String returnValue(unsafeMakeSpan(string.data, length));
 -
 -    wpe_pasteboard_string_free(&string);
 -    return returnValue;
@@ -7607,23 +7439,24 @@ index c62e88f8c3aa40f01618cdaf0c0e22a2404b17ad..02411ac6bb361c2677c269945f665e0a
  
  void PlatformPasteboard::write(const PasteboardWebContent& content)
  {
--    static const char plainText[] = "text/plain;charset=utf-8";
--    static const char htmlText[] = "text/html;charset=utf-8";
+-    static constexpr auto plainText = "text/plain;charset=utf-8"_s;
+-    static constexpr auto htmlText = "text/html"_s;
 -
 -    CString textString = content.text.utf8();
 -    CString markupString = content.markup.utf8();
 -
--    struct wpe_pasteboard_string_pair pairs[] = {
+-    std::array<struct wpe_pasteboard_string_pair, 2> pairs = { {
 -        { { nullptr, 0 }, { nullptr, 0 } },
 -        { { nullptr, 0 }, { nullptr, 0 } },
--    };
+-    } };
 -    wpe_pasteboard_string_initialize(&pairs[0].type, plainText, strlen(plainText));
 -    wpe_pasteboard_string_initialize(&pairs[0].string, textString.data(), textString.length());
 -    wpe_pasteboard_string_initialize(&pairs[1].type, htmlText, strlen(htmlText));
 -    wpe_pasteboard_string_initialize(&pairs[1].string, markupString.data(), markupString.length());
--    struct wpe_pasteboard_string_map map = { pairs, 2 };
+-    struct wpe_pasteboard_string_map map = { pairs.data(), pairs.size() };
 -
 -    wpe_pasteboard_write(m_pasteboard, &map);
+-    m_changeCount++;
 -
 -    wpe_pasteboard_string_free(&pairs[0].type);
 -    wpe_pasteboard_string_free(&pairs[0].string);
@@ -7648,6 +7481,7 @@ index c62e88f8c3aa40f01618cdaf0c0e22a2404b17ad..02411ac6bb361c2677c269945f665e0a
 -    struct wpe_pasteboard_string_map map = { pairs, 1 };
 -
 -    wpe_pasteboard_write(m_pasteboard, &map);
+-    m_changeCount++;
 -
 -    wpe_pasteboard_string_free(&pairs[0].type);
 -    wpe_pasteboard_string_free(&pairs[0].string);
@@ -7655,62 +7489,61 @@ index c62e88f8c3aa40f01618cdaf0c0e22a2404b17ad..02411ac6bb361c2677c269945f665e0a
  }
  
  Vector<String> PlatformPasteboard::typesSafeForDOMToReadAndWrite(const String&) const
-diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/LibWebRTCProviderGStreamer.h b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/LibWebRTCProviderGStreamer.h
-index 0552842dbe3f3a2c12a504178f5a8ca977e1c4db..2ef3b1b459d8a9b4e86b4556feeb4f0737f05c54 100644
---- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/LibWebRTCProviderGStreamer.h
-+++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/LibWebRTCProviderGStreamer.h
-@@ -31,6 +31,8 @@
- #include "GStreamerVideoEncoderFactory.h"
- #include "LibWebRTCProvider.h"
- 
-+#include "LibWebRTCProvider.h"
-+
- namespace WebCore {
- 
- class WEBCORE_EXPORT LibWebRTCProviderGStreamer : public LibWebRTCProvider {
+diff --git a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
+index 80c20938d5ec8282485fb0152b96304c83124354..22975b7c1b99357a7689747251410f306bfb3dcc 100644
+--- a/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
++++ b/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoFrameLibWebRTC.cpp
+@@ -23,6 +23,8 @@
+ 
+ #include <gst/video/video-format.h>
+ #include <gst/video/video-info.h>
++#include <wtf/glib/GUniquePtr.h>
++#include <wtf/MediaTime.h>
+ #include <thread>
+ #include <wtf/MediaTime.h>
+ #include <wtf/glib/GUniquePtr.h>
 diff --git a/Source/WebCore/platform/network/HTTPHeaderMap.cpp b/Source/WebCore/platform/network/HTTPHeaderMap.cpp
-index 34caadc74c1ad6b411e9043289fece53b9757f17..1e8ec2fe9f16ddd0a33e261172689a9d35ec5194 100644
+index 1178c8fb001994bc9e6166376a367d9bc148913c..fcc6534568cad6b42a819a435f84ba2b9baae6f8 100644
 --- a/Source/WebCore/platform/network/HTTPHeaderMap.cpp
 +++ b/Source/WebCore/platform/network/HTTPHeaderMap.cpp
-@@ -235,8 +235,11 @@ void HTTPHeaderMap::add(HTTPHeaderName name, const String& value)
+@@ -237,8 +237,11 @@ void HTTPHeaderMap::add(HTTPHeaderName name, const String& value)
      auto index = m_commonHeaders.findIf([&](auto& header) {
          return header.key == name;
      });
 +    // Align with Chromium and Firefox, but just for SetCookies where it is critical:
 +    // https://bit.ly/2HCa0iq
-+    String separator = name == HTTPHeaderName::SetCookie ? "\n "_s : ", "_s;
++    String separator = name == HTTPHeaderName::SetCookie ? "playwright-set-cookie-separator"_s : ", "_s;
      if (index != notFound)
--        m_commonHeaders[index].value = makeString(m_commonHeaders[index].value, ", ", value);
+-        m_commonHeaders[index].value = makeString(m_commonHeaders[index].value, ", "_s, value);
 +        m_commonHeaders[index].value = makeString(m_commonHeaders[index].value, separator, value);
      else
          m_commonHeaders.append(CommonHeader { name, value });
  }
 diff --git a/Source/WebCore/platform/network/NetworkStorageSession.h b/Source/WebCore/platform/network/NetworkStorageSession.h
-index e745131ddc12d23cd5e2429f565f910ad3520e82..dd23b06a3ceab1675e7e59d8642abc589c360d2a 100644
+index c1e50549e674e1620ad0515a061376ba728e75df..7e6e323436d9b1a87dbf4d6fa275629f531e3ce8 100644
 --- a/Source/WebCore/platform/network/NetworkStorageSession.h
 +++ b/Source/WebCore/platform/network/NetworkStorageSession.h
-@@ -167,6 +167,8 @@ public:
+@@ -198,6 +198,7 @@ public:
+ 
      NetworkingContext* context() const;
  #endif
- 
 +    WEBCORE_EXPORT void setCookiesFromResponse(const URL& firstParty, const SameSiteInfo&, const URL&, const String& setCookieValue);
-+
+ 
      WEBCORE_EXPORT HTTPCookieAcceptPolicy cookieAcceptPolicy() const;
      WEBCORE_EXPORT void setCookie(const Cookie&);
-     WEBCORE_EXPORT void setCookies(const Vector<Cookie>&, const URL&, const URL& mainDocumentURL);
 diff --git a/Source/WebCore/platform/network/ResourceResponseBase.cpp b/Source/WebCore/platform/network/ResourceResponseBase.cpp
-index d47b089014717dc98928aa597ff881f3909559e1..3ab3262fd35c1ae740b6b8c01b6ce950fee0c224 100644
+index a4ed6a5f1182b43432f6082ffc10b62473c248e5..05113dbf615171a0b18f8998411e603076bdc15b 100644
 --- a/Source/WebCore/platform/network/ResourceResponseBase.cpp
 +++ b/Source/WebCore/platform/network/ResourceResponseBase.cpp
-@@ -74,6 +74,7 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData> d
-     , m_httpStatusText(data ? data->httpStatusText : String { })
-     , m_httpVersion(data ? data->httpVersion : String { })
-     , m_httpHeaderFields(data ? data->httpHeaderFields : HTTPHeaderMap { })
+@@ -78,6 +78,7 @@ ResourceResponseBase::ResourceResponseBase(std::optional<ResourceResponseData>&&
+     , m_httpStatusText(data ? WTFMove(data->httpStatusText) : String { })
+     , m_httpVersion(data ? WTFMove(data->httpVersion) : String { })
+     , m_httpHeaderFields(data ? WTFMove(data->httpHeaderFields) : HTTPHeaderMap { })
 +    , m_httpRequestHeaderFields(data ? data->httpRequestHeaderFields : HTTPHeaderMap { })
-     , m_networkLoadMetrics(data && data->networkLoadMetrics ? Box<NetworkLoadMetrics>::create(*data->networkLoadMetrics) : Box<NetworkLoadMetrics> { })
-     , m_certificateInfo(data ? data->certificateInfo : std::nullopt)
+     , m_networkLoadMetrics(data && data->networkLoadMetrics ? Box<NetworkLoadMetrics>::create(WTFMove(*data->networkLoadMetrics)) : Box<NetworkLoadMetrics> { })
+     , m_certificateInfo(data ? WTFMove(data->certificateInfo) : std::nullopt)
      , m_httpStatusCode(data ? data->httpStatusCode : 0)
-@@ -892,6 +893,7 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons
+@@ -904,6 +905,7 @@ std::optional<ResourceResponseData> ResourceResponseBase::getResponseData() cons
          String { m_httpStatusText },
          String { m_httpVersion },
          HTTPHeaderMap { m_httpHeaderFields },
@@ -7718,7 +7551,7 @@ index d47b089014717dc98928aa597ff881f3909559e1..3ab3262fd35c1ae740b6b8c01b6ce950
          m_networkLoadMetrics ? std::optional(*m_networkLoadMetrics) : std::nullopt,
          m_source,
          m_type,
-@@ -965,6 +967,11 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
+@@ -979,6 +981,11 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
      if (!httpHeaderFields)
          return std::nullopt;
  
@@ -7730,7 +7563,7 @@ index d47b089014717dc98928aa597ff881f3909559e1..3ab3262fd35c1ae740b6b8c01b6ce950
      std::optional<short> httpStatusCode;
      decoder >> httpStatusCode;
      if (!httpStatusCode)
-@@ -1019,6 +1026,7 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
+@@ -1038,6 +1045,7 @@ std::optional<WebCore::ResourceResponseData> Coder<WebCore::ResourceResponseData
          WTFMove(*httpStatusText),
          WTFMove(*httpVersion),
          WTFMove(*httpHeaderFields),
@@ -7739,10 +7572,10 @@ index d47b089014717dc98928aa597ff881f3909559e1..3ab3262fd35c1ae740b6b8c01b6ce950
          *source,
          *type,
 diff --git a/Source/WebCore/platform/network/ResourceResponseBase.h b/Source/WebCore/platform/network/ResourceResponseBase.h
-index 203c591edc985e99ec7dc7a2bfaf69c92d3de99c..461b774d446528b7259ffc6ea3982d172a4c9f9f 100644
+index 9e2bc7f05c5700c5f86bfaf03f13e2308ed097ed..01bae357d25b8dfef4c0d2cdb87cbc7a3895b416 100644
 --- a/Source/WebCore/platform/network/ResourceResponseBase.h
 +++ b/Source/WebCore/platform/network/ResourceResponseBase.h
-@@ -251,6 +251,11 @@ protected:
+@@ -256,6 +256,11 @@ protected:
      String m_httpStatusText;
      String m_httpVersion;
      HTTPHeaderMap m_httpHeaderFields;
@@ -7754,16 +7587,16 @@ index 203c591edc985e99ec7dc7a2bfaf69c92d3de99c..461b774d446528b7259ffc6ea3982d17
      Box<NetworkLoadMetrics> m_networkLoadMetrics;
  
      mutable std::optional<CertificateInfo> m_certificateInfo;
-@@ -291,7 +296,7 @@ struct ResourceResponseData {
+@@ -297,7 +302,7 @@ struct ResourceResponseData {
      ResourceResponseData() = default;
      ResourceResponseData(ResourceResponseData&&) = default;
      ResourceResponseData& operator=(ResourceResponseData&&) = default;
--    ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseBaseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo)
-+    ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, HTTPHeaderMap&& httpRequestHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseBaseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo)
+-    ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, String&& proxyName, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo)
++    ResourceResponseData(URL&& url, String&& mimeType, long long expectedContentLength, String&& textEncodingName, int httpStatusCode, String&& httpStatusText, String&& httpVersion, HTTPHeaderMap&& httpHeaderFields, HTTPHeaderMap&& httpRequestHeaderFields, std::optional<NetworkLoadMetrics>&& networkLoadMetrics, ResourceResponseSource source, ResourceResponseBaseType type, ResourceResponseBaseTainting tainting, bool isRedirected, UsedLegacyTLS usedLegacyTLS, WasPrivateRelayed wasPrivateRelayed, String&& proxyName, bool isRangeRequested, std::optional<CertificateInfo> certificateInfo)
          : url(WTFMove(url))
          , mimeType(WTFMove(mimeType))
          , expectedContentLength(expectedContentLength)
-@@ -300,6 +305,7 @@ struct ResourceResponseData {
+@@ -306,6 +311,7 @@ struct ResourceResponseData {
          , httpStatusText(WTFMove(httpStatusText))
          , httpVersion(WTFMove(httpVersion))
          , httpHeaderFields(WTFMove(httpHeaderFields))
@@ -7771,7 +7604,7 @@ index 203c591edc985e99ec7dc7a2bfaf69c92d3de99c..461b774d446528b7259ffc6ea3982d17
          , networkLoadMetrics(WTFMove(networkLoadMetrics))
          , source(source)
          , type(type)
-@@ -322,6 +328,7 @@ struct ResourceResponseData {
+@@ -329,6 +335,7 @@ struct ResourceResponseData {
      String httpStatusText;
      String httpVersion;
      HTTPHeaderMap httpHeaderFields;
@@ -7780,10 +7613,10 @@ index 203c591edc985e99ec7dc7a2bfaf69c92d3de99c..461b774d446528b7259ffc6ea3982d17
      ResourceResponseBase::Source source;
      ResourceResponseBase::Type type;
 diff --git a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-index 305080a5c298eaa1ef4644bdc6d90e243bcd061d..e3cbec55b164a49b9ed92b66ff70134618ab53f5 100644
+index 4a6533db6aff0620e7122e684f1ef6c723bf7942..395f275722b93a7ab08429588fbc1fdc1ebac4f3 100644
 --- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
 +++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
-@@ -518,6 +518,22 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
+@@ -553,6 +553,22 @@ bool NetworkStorageSession::setCookieFromDOM(const URL& firstParty, const SameSi
      return false;
  }
  
@@ -7793,24 +7626,24 @@ index 305080a5c298eaa1ef4644bdc6d90e243bcd061d..e3cbec55b164a49b9ed92b66ff701346
 +    size_t count = cookieValues.size();
 +    auto* cookies = [NSMutableArray arrayWithCapacity:count];
 +    for (const auto& cookieValue : cookieValues) {
-+        NSString* cookieString = (NSString *)cookieValue;
++        NSString* cookieString = cookieValue.createNSString().autorelease();
 +        NSString* cookieKey = @"Set-Cookie";
 +        NSDictionary* headers = [NSDictionary dictionaryWithObjects:[NSArray arrayWithObject:cookieString] forKeys:[NSArray arrayWithObject:cookieKey]];
-+        NSArray<NSHTTPCookie*>* parsedCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:(NSURL *)url];
++        NSArray<NSHTTPCookie*>* parsedCookies = [NSHTTPCookie cookiesWithResponseHeaderFields:headers forURL:url.createNSURL().get()];
 +        [cookies addObject:parsedCookies[0]];
 +    }
-+    NSURL *cookieURL = url;
-+    setHTTPCookiesForURL(cookieStorage().get(), cookies, cookieURL, firstParty, sameSiteInfo);
++    NSURL *cookieURL = url.createNSURL().get();
++    setHTTPCookiesForURL(cookieStorage().get(), cookies, cookieURL, firstParty.createNSURL().get(), sameSiteInfo);
 +}
 +
  static NSHTTPCookieAcceptPolicy httpCookieAcceptPolicy(CFHTTPCookieStorageRef cookieStorage)
  {
      ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
 diff --git a/Source/WebCore/platform/network/curl/CookieJarDB.h b/Source/WebCore/platform/network/curl/CookieJarDB.h
-index 7788bfea8bb631c51fe858b29cc33e43347cbfab..ad9f347ce55cbea4374a45d3c65f8e11bd7a00f4 100644
+index 37e129136c69b27d509acc01f10be42a8a1fe35a..9df0babc8f82372925fddf2211a7c8c908f3bb18 100644
 --- a/Source/WebCore/platform/network/curl/CookieJarDB.h
 +++ b/Source/WebCore/platform/network/curl/CookieJarDB.h
-@@ -72,7 +72,7 @@ public:
+@@ -73,7 +73,7 @@ public:
      WEBCORE_EXPORT ~CookieJarDB();
  
  private:
@@ -7819,88 +7652,8 @@ index 7788bfea8bb631c51fe858b29cc33e43347cbfab..ad9f347ce55cbea4374a45d3c65f8e11
      String m_databasePath;
  
      bool m_detectedDatabaseCorruption { false };
-diff --git a/Source/WebCore/platform/network/curl/CurlStream.cpp b/Source/WebCore/platform/network/curl/CurlStream.cpp
-index 4b01a35fa4bff5e1ccc7fed23940345c9c6fbd15..5e2c2f7f92c5edf4b075670a2a02da65d97c4f45 100644
---- a/Source/WebCore/platform/network/curl/CurlStream.cpp
-+++ b/Source/WebCore/platform/network/curl/CurlStream.cpp
-@@ -34,7 +34,7 @@
- 
- namespace WebCore {
- 
--CurlStream::CurlStream(CurlStreamScheduler& scheduler, CurlStreamID streamID, URL&& url, ServerTrustEvaluation serverTrustEvaluation, LocalhostAlias localhostAlias)
-+CurlStream::CurlStream(CurlStreamScheduler& scheduler, CurlStreamID streamID, bool ignoreCertificateErrors, URL&& url, ServerTrustEvaluation serverTrustEvaluation, LocalhostAlias localhostAlias)
-     : m_scheduler(scheduler)
-     , m_streamID(streamID)
- {
-@@ -49,6 +49,9 @@ CurlStream::CurlStream(CurlStreamScheduler& scheduler, CurlStreamID streamID, UR
-         m_curlHandle->disableServerTrustEvaluation();
- 
-     m_curlHandle->enableConnectionOnly();
-+    if (ignoreCertificateErrors)
-+        m_curlHandle->disableServerTrustEvaluation();
-+
- 
-     auto errorCode = m_curlHandle->perform();
-     if (errorCode != CURLE_OK) {
-diff --git a/Source/WebCore/platform/network/curl/CurlStream.h b/Source/WebCore/platform/network/curl/CurlStream.h
-index bc9c731a0e69c4923bb8b4bdda088c2be30b3f1c..2088662fb2ce29b7ed843586460630fbf82c0856 100644
---- a/Source/WebCore/platform/network/curl/CurlStream.h
-+++ b/Source/WebCore/platform/network/curl/CurlStream.h
-@@ -55,12 +55,12 @@ public:
-         virtual void didFail(CurlStreamID, CURLcode, CertificateInfo&&) = 0;
-     };
- 
--    static std::unique_ptr<CurlStream> create(CurlStreamScheduler& scheduler, CurlStreamID streamID, URL&& url, ServerTrustEvaluation serverTrustEvaluation, LocalhostAlias localhostAlias)
-+    static std::unique_ptr<CurlStream> create(CurlStreamScheduler& scheduler, CurlStreamID streamID, bool ignoreCertificateErrors, URL&& url, ServerTrustEvaluation serverTrustEvaluation, LocalhostAlias localhostAlias)
-     {
--        return makeUnique<CurlStream>(scheduler, streamID, WTFMove(url), serverTrustEvaluation, localhostAlias);
-+        return makeUnique<CurlStream>(scheduler, streamID, ignoreCertificateErrors, WTFMove(url), serverTrustEvaluation, localhostAlias);
-     }
- 
--    CurlStream(CurlStreamScheduler&, CurlStreamID, URL&&, ServerTrustEvaluation, LocalhostAlias);
-+    CurlStream(CurlStreamScheduler&, CurlStreamID, bool ignoreCertificateErrors, URL&&, ServerTrustEvaluation, LocalhostAlias);
-     virtual ~CurlStream();
- 
-     void send(UniqueArray<uint8_t>&&, size_t);
-diff --git a/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp b/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp
-index 048cd352dd9b4cc952337308337a4bd9c31f00f1..de54623b601aea9fbd6a88f5c646b20524b8ee2b 100644
---- a/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp
-+++ b/Source/WebCore/platform/network/curl/CurlStreamScheduler.cpp
-@@ -40,7 +40,7 @@ CurlStreamScheduler::~CurlStreamScheduler()
-     ASSERT(isMainThread());
- }
- 
--CurlStreamID CurlStreamScheduler::createStream(const URL& url, CurlStream::Client& client, CurlStream::ServerTrustEvaluation serverTrustEvaluation, CurlStream::LocalhostAlias localhostAlias)
-+CurlStreamID CurlStreamScheduler::createStream(const URL& url, bool ignoreCertificateErrors, CurlStream::Client& client, CurlStream::ServerTrustEvaluation serverTrustEvaluation, CurlStream::LocalhostAlias localhostAlias)
- {
-     ASSERT(isMainThread());
- 
-@@ -51,8 +51,8 @@ CurlStreamID CurlStreamScheduler::createStream(const URL& url, CurlStream::Clien
-     auto streamID = m_currentStreamID;
-     m_clientList.add(streamID, &client);
- 
--    callOnWorkerThread([this, streamID, url = url.isolatedCopy(), serverTrustEvaluation, localhostAlias]() mutable {
--        m_streamList.add(streamID, CurlStream::create(*this, streamID, WTFMove(url), serverTrustEvaluation, localhostAlias));
-+    callOnWorkerThread([this, streamID, ignoreCertificateErrors, url = url.isolatedCopy(), serverTrustEvaluation, localhostAlias]() mutable {
-+        m_streamList.add(streamID, CurlStream::create(*this, streamID, ignoreCertificateErrors, WTFMove(url), serverTrustEvaluation, localhostAlias));
-     });
- 
-     return streamID;
-diff --git a/Source/WebCore/platform/network/curl/CurlStreamScheduler.h b/Source/WebCore/platform/network/curl/CurlStreamScheduler.h
-index 41af70e9bddcb507bf7e57841e4051bc99a78410..87899280f985ca5f0cb135fb9ba53cde822a3b84 100644
---- a/Source/WebCore/platform/network/curl/CurlStreamScheduler.h
-+++ b/Source/WebCore/platform/network/curl/CurlStreamScheduler.h
-@@ -38,7 +38,7 @@ public:
-     CurlStreamScheduler();
-     virtual ~CurlStreamScheduler();
- 
--    WEBCORE_EXPORT CurlStreamID createStream(const URL&, CurlStream::Client&, CurlStream::ServerTrustEvaluation, CurlStream::LocalhostAlias);
-+    WEBCORE_EXPORT CurlStreamID createStream(const URL&, bool ignoreCertificateErrors, CurlStream::Client&, CurlStream::ServerTrustEvaluation, CurlStream::LocalhostAlias);
-     WEBCORE_EXPORT void destroyStream(CurlStreamID);
-     WEBCORE_EXPORT void send(CurlStreamID, UniqueArray<uint8_t>&&, size_t);
- 
 diff --git a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
-index f46f26a553e0634fd6a4d383c0821aadd504a399..738327163771952be91bc024e92070c015de2dd3 100644
+index 96289d8ae2e4feb60a91fab3f5cf1fc27b9e7c87..8c0b62c44a18571d1f3ea1ed81d59a0aae28d3f1 100644
 --- a/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
 +++ b/Source/WebCore/platform/network/curl/NetworkStorageSessionCurl.cpp
 @@ -136,6 +136,12 @@ void NetworkStorageSession::setCookieAcceptPolicy(CookieAcceptPolicy policy) con
@@ -7917,11 +7670,11 @@ index f46f26a553e0634fd6a4d383c0821aadd504a399..738327163771952be91bc024e92070c0
  {
      switch (cookieDatabase().acceptPolicy()) {
 diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-index 09ab1320beacc41ae92399f3320aaf805d9d81d1..4c63cb2a3f6fbf277227a88b92f206402bc12cd7 100644
+index 274d671614fdca8f425adecb405d5f2402e92f8b..1b19e79e10f0768cfdd66b0fc1b1855388c9f559 100644
 --- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
 +++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
-@@ -424,6 +424,30 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
-     g_signal_emit(jar, signalId, 0);
+@@ -551,6 +551,26 @@ void NetworkStorageSession::replaceCookies(const Vector<Cookie>& cookies)
+     g_signal_emit(jar, signalId, 0, nullptr, nullptr);
  }
  
 +void  NetworkStorageSession::setCookiesFromResponse(const URL& firstParty, const SameSiteInfo&, const URL& url, const String& setCookieValue)
@@ -7940,11 +7693,7 @@ index 09ab1320beacc41ae92399f3320aaf805d9d81d1..4c63cb2a3f6fbf277227a88b92f20640
 +        if (!cookie)
 +            continue;
 +
-+#if SOUP_CHECK_VERSION(2, 67, 1)
 +        soup_cookie_jar_add_cookie_full(cookieStorage(), cookie.release(), origin.get(), firstPartyURI.get());
-+#else
-+        soup_cookie_jar_add_cookie_with_first_party(cookieStorage(), firstPartyURI.get(), cookie.release());
-+#endif
 +    }
 +}
 +
@@ -7952,10 +7701,10 @@ index 09ab1320beacc41ae92399f3320aaf805d9d81d1..4c63cb2a3f6fbf277227a88b92f20640
  {
      GUniquePtr<SoupCookie> targetCookie(cookie.toSoupCookie());
 diff --git a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
-index 15f47d0d2a99bcb1a7b9dd9764a9766a20e97692..f623d165826485f58cef60c4b3551055f4352de6 100644
+index bbcc12d58f7b5df3462c93617f6ef19eef403cf2..b255b05da89248a99ff11965ceae840ef45b9fab 100644
 --- a/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
 +++ b/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
-@@ -39,6 +39,7 @@
+@@ -40,6 +40,7 @@
  #include <wtf/text/StringBuilder.h>
  #include <wtf/text/win/WCharStringExtras.h>
  #include <wtf/unicode/CharacterNames.h>
@@ -7963,7 +7712,7 @@ index 15f47d0d2a99bcb1a7b9dd9764a9766a20e97692..f623d165826485f58cef60c4b3551055
  
  namespace WebCore {
  
-@@ -689,7 +690,10 @@ template<typename T> void getStringData(IDataObject* data, FORMATETC* format, Ve
+@@ -691,7 +692,10 @@ template<typename T> void getStringData(IDataObject* data, FORMATETC* format, Ve
      STGMEDIUM store;
      if (FAILED(data->GetData(format, &store)))
          return;
@@ -7988,10 +7737,10 @@ index c3ffc7392c0b7fa099a7dd4e4be977cdee1c803c..9570dbb0f2c42ca38598a8898183c9b3
  HGLOBAL createGlobalData(const String&);
  HGLOBAL createGlobalData(const Vector<char>&);
 diff --git a/Source/WebCore/platform/win/DragDataWin.cpp b/Source/WebCore/platform/win/DragDataWin.cpp
-index 7bdb180c89bf3fe9d48098318d3b7503b8fd6279..296a3b2b82733b27272acb51ab4f883decfbaf14 100644
+index 0379437d84807e4a8d3846afac5ec8a70e743e70..5b0461bf12535d4900ffaddc2a87826280505233 100644
 --- a/Source/WebCore/platform/win/DragDataWin.cpp
 +++ b/Source/WebCore/platform/win/DragDataWin.cpp
-@@ -40,7 +40,7 @@
+@@ -40,12 +40,13 @@
  
  namespace WebCore {
  
@@ -8000,14 +7749,12 @@ index 7bdb180c89bf3fe9d48098318d3b7503b8fd6279..296a3b2b82733b27272acb51ab4f883d
      : m_clientPosition(clientPosition)
      , m_globalPosition(globalPosition)
      , m_platformDragData(0)
-@@ -48,6 +48,7 @@ DragData::DragData(const DragDataMap& data, const IntPoint& clientPosition, cons
+     , m_draggingSourceOperationMask(sourceOperationMask)
      , m_applicationFlags(flags)
++    , m_dragDestinationActionMask(dragDestinationAction)
      , m_pageID(pageID)
      , m_dragDataMap(data)
-+    , m_dragDestinationActionMask(dragDestinationAction)
  {
- }
- 
 @@ -63,7 +64,7 @@ bool DragData::containsURL(FilenameConversionPolicy filenamePolicy) const
          || (filenamePolicy == ConvertFilenames && (m_dragDataMap.contains(filenameWFormat()->cfFormat) || m_dragDataMap.contains(filenameFormat()->cfFormat)));
  }
@@ -8017,11 +7764,74 @@ index 7bdb180c89bf3fe9d48098318d3b7503b8fd6279..296a3b2b82733b27272acb51ab4f883d
  {
      if (!m_dragDataMap.isEmpty() || !m_platformDragData)
          return m_dragDataMap;
+diff --git a/Source/WebCore/platform/win/DragImageWin.cpp b/Source/WebCore/platform/win/DragImageWin.cpp
+index dd24e15115aeff41f0f4452a9cac292d75bc0d5d..8df467c008bdb3de59d301b14c1c20b8bb0b6a41 100644
+--- a/Source/WebCore/platform/win/DragImageWin.cpp
++++ b/Source/WebCore/platform/win/DragImageWin.cpp
+@@ -62,16 +62,22 @@ IntSize dragImageSize(DragImageRef image)
+ {
+     if (!image)
+         return IntSize();
+-    BITMAP b;
+-    GetObject(image, sizeof(BITMAP), &b);
+-    return IntSize(b.bmWidth, b.bmHeight);
++    return { image->width(), image->height() };
+ }
+ 
++#if USE(CAIRO)
+ void deleteDragImage(DragImageRef image)
+ {
+     if (image)
+         ::DeleteObject(image);
+ }
++#else
++void deleteDragImage(DragImageRef)
++{
++    // Since this is a RefPtr, there's nothing additional we need to do to
++    // delete it. It will be released when it falls out of scope.
++}
++#endif
+ 
+ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
+ {
+@@ -79,8 +85,9 @@ DragImageRef dissolveDragImageToFraction(DragImageRef image, float)
+     return image;
+ }
+         
+-DragImageRef createDragImageIconForCachedImageFilename(const String& filename)
++DragImageRef createDragImageIconForCachedImageFilename(const String&)
+ {
++#if USE(CAIRO)
+     SHFILEINFO shfi { };
+     auto fname = filename.wideCharacters();
+     if (FAILED(SHGetFileInfo(fname.data(), FILE_ATTRIBUTE_NORMAL, &shfi, sizeof(shfi), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES)))
+@@ -96,6 +103,9 @@ DragImageRef createDragImageIconForCachedImageFilename(const String& filename)
+     DeleteObject(iconInfo.hbmMask);
+ 
+     return iconInfo.hbmColor;
++#else
++    return nullptr;
++#endif
+ }
+ 
+ #if USE(CAIRO)
+@@ -221,9 +231,9 @@ DragImageRef createDragImageForColor(const Color&, const FloatRect&, float, Path
+ }
+ 
+ #if USE(SKIA)
+-DragImageRef createDragImageFromImage(Image*, ImageOrientation, GraphicsClient*, float)
++DragImageRef createDragImageFromImage(Image* image, ImageOrientation, GraphicsClient*, float)
+ {
+-    return nullptr;
++    return image->currentNativeImage()->platformImage();
+ }
+ 
+ DragImageRef scaleDragImage(DragImageRef, FloatSize)
 diff --git a/Source/WebCore/platform/win/KeyEventWin.cpp b/Source/WebCore/platform/win/KeyEventWin.cpp
-index b9f728911d34163c1ca14d359741d44cc05ab755..1609197044eaa8e9036e6dae23d1c5270b53e08b 100644
+index d450bf9d0fd1f0bf8f28db483ac9d3d60fa9d114..72a59403a0b5493aea4a8e28eb15eac24b652b09 100644
 --- a/Source/WebCore/platform/win/KeyEventWin.cpp
 +++ b/Source/WebCore/platform/win/KeyEventWin.cpp
-@@ -242,10 +242,16 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(HWND, WPARAM code, LPARAM keyData,
+@@ -243,10 +243,16 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(HWND, WPARAM code, LPARAM keyData,
  {
  }
  
@@ -8042,10 +7852,10 @@ index b9f728911d34163c1ca14d359741d44cc05ab755..1609197044eaa8e9036e6dae23d1c527
  
  OptionSet<PlatformEvent::Modifier> PlatformKeyboardEvent::currentStateOfModifierKeys()
 diff --git a/Source/WebCore/platform/win/PasteboardWin.cpp b/Source/WebCore/platform/win/PasteboardWin.cpp
-index 5728033e25919cef5b81d08516964aa5445c5d6e..0e588ebd34299d56ace86806bdec6e9ce337b053 100644
+index 7987d1cd71b05ba4cf09eaf0a8b0d55da6bcffb0..5edaa06c1a648402dc0c3224e69c4721a234aa06 100644
 --- a/Source/WebCore/platform/win/PasteboardWin.cpp
 +++ b/Source/WebCore/platform/win/PasteboardWin.cpp
-@@ -1130,7 +1130,21 @@ void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
+@@ -1144,7 +1144,21 @@ void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
      }
  
      clear();
@@ -8067,7 +7877,7 @@ index 5728033e25919cef5b81d08516964aa5445c5d6e..0e588ebd34299d56ace86806bdec6e9c
      if (::OpenClipboard(m_owner)) {
          const auto& customData = data.first();
          customData.forEachPlatformStringOrBuffer([](auto& type, auto& stringOrBuffer) {
-@@ -1169,4 +1183,25 @@ void Pasteboard::write(const Color&)
+@@ -1183,4 +1197,25 @@ void Pasteboard::write(const Color&)
  {
  }
  
@@ -8095,10 +7905,10 @@ index 5728033e25919cef5b81d08516964aa5445c5d6e..0e588ebd34299d56ace86806bdec6e9c
  } // namespace WebCore
 diff --git a/Source/WebCore/platform/wpe/DragDataWPE.cpp b/Source/WebCore/platform/wpe/DragDataWPE.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..f8fc3fa43bfe62a1c066689f48ddabaaa357a437
+index 0000000000000000000000000000000000000000..fbd32d390129129fd5b213f7f9c3e96bdca9355b
 --- /dev/null
 +++ b/Source/WebCore/platform/wpe/DragDataWPE.cpp
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,92 @@
 +/*
 + *  This library is free software; you can redistribute it and/or
 + *  modify it under the terms of the GNU Lesser General Public
@@ -8185,13 +7995,18 @@ index 0000000000000000000000000000000000000000..f8fc3fa43bfe62a1c066689f48ddabaa
 +    return m_platformDragData->url().string();
 +}
 +
++bool DragData::shouldMatchStyleOnDrop() const
++{
++    return false;
++}
++
 +}
 diff --git a/Source/WebCore/platform/wpe/DragImageWPE.cpp b/Source/WebCore/platform/wpe/DragImageWPE.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..a2454253889d4c7d5129c2d7895c089f54bc2e3d
+index 0000000000000000000000000000000000000000..4383ede4974fb2b938aa01f2f19eb5e0c47f208c
 --- /dev/null
 +++ b/Source/WebCore/platform/wpe/DragImageWPE.cpp
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,74 @@
 +/*
 + *  Copyright (C) 2010,2017 Igalia S.L.
 + *
@@ -8212,6 +8027,7 @@ index 0000000000000000000000000000000000000000..a2454253889d4c7d5129c2d7895c089f
 +
 +#include "config.h"
 +#include "DragImage.h"
++#include "NativeImage.h"
 +#include "NotImplemented.h"
 +
 +#include "Image.h"
@@ -8241,7 +8057,7 @@ index 0000000000000000000000000000000000000000..a2454253889d4c7d5129c2d7895c089f
 +    return image;
 +}
 +
-+DragImageRef createDragImageFromImage(Image* image, ImageOrientation)
++DragImageRef createDragImageFromImage(Image* image, ImageOrientation, GraphicsClient*, float)
 +{
 +    return image->currentNativeImage()->platformImage();
 +}
@@ -8265,258 +8081,209 @@ index 0000000000000000000000000000000000000000..a2454253889d4c7d5129c2d7895c089f
 +}
 +
 +}
-diff --git a/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp b/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp
-index 77bdff686770e56f5445fa12216c6bff93bb5cfb..e16583ea6298864df9c8b82cb0686b2afb18ce95 100644
---- a/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp
-+++ b/Source/WebCore/platform/wpe/PlatformScreenWPE.cpp
-@@ -151,12 +151,12 @@ bool screenSupportsExtendedColor(Widget*)
- }
+diff --git a/Source/WebCore/platform/wpe/PasteboardWPE.cpp b/Source/WebCore/platform/wpe/PasteboardWPE.cpp
+index c0847a84e4aeba3dac78a8ffe9826d906d33a387..c1c60572473dad33e436ab4f52e5cac5bc2d2f76 100644
+--- a/Source/WebCore/platform/wpe/PasteboardWPE.cpp
++++ b/Source/WebCore/platform/wpe/PasteboardWPE.cpp
+@@ -36,6 +36,10 @@
+ #include "SharedBuffer.h"
+ #include <wtf/URL.h>
  
- #if ENABLE(TOUCH_EVENTS)
--bool screenHasTouchDevice()
-+bool platformScreenHasTouchDevice()
++#if ENABLE(DRAG_SUPPORT)
++#include "DragData.h"
++#endif
++
+ namespace WebCore {
+ 
+ std::unique_ptr<Pasteboard> Pasteboard::createForCopyAndPaste(std::unique_ptr<PasteboardContext>&& context)
+@@ -55,8 +59,17 @@ Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context)
  {
-     return true;
  }
  
--bool screenIsTouchPrimaryInputDevice()
-+bool platformScreenIsTouchPrimaryInputDevice()
+-void Pasteboard::writeString(const String&, const String&)
++void Pasteboard::writeString(const String& type, const String& text)
  {
-     return true;
++   if (m_selectionData) {
++        if (type == "Files"_s || type == "text/uri-list"_s)
++            m_selectionData->setURIList(text);
++        else if (type == "text/html"_s)
++            m_selectionData->setMarkup(text);
++        else if (type == "text/plain"_s)
++            m_selectionData->setText(text);
++        return;
++    }
+     notImplemented();
  }
-diff --git a/Source/WebCore/platform/wpe/SelectionData.cpp b/Source/WebCore/platform/wpe/SelectionData.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..39756417d475f3aae77c2f3d7772a71a6e1bec57
---- /dev/null
-+++ b/Source/WebCore/platform/wpe/SelectionData.cpp
-@@ -0,0 +1,134 @@
-+/*
-+ * Copyright (C) 2009, Martin Robinson
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+
-+#include "config.h"
-+#include "SelectionData.h"
-+
-+#include <wtf/glib/GUniquePtr.h>
-+#include <wtf/text/CString.h>
-+#include <wtf/text/StringBuilder.h>
-+
-+namespace WebCore {
-+
-+static void replaceNonBreakingSpaceWithSpace(String& str)
-+{
-+    static const UChar NonBreakingSpaceCharacter = 0xA0;
-+    static const UChar SpaceCharacter = ' ';
-+    str = makeStringByReplacingAll(str, NonBreakingSpaceCharacter, SpaceCharacter);
-+}
-+
-+void SelectionData::setText(const String& newText)
-+{
-+    m_text = newText;
-+    replaceNonBreakingSpaceWithSpace(m_text);
-+}
-+
-+void SelectionData::setURIList(const String& uriListString)
-+{
-+    m_uriList = uriListString;
-+
-+    // This code is originally from: platform/chromium/ChromiumDataObject.cpp.
-+    // FIXME: We should make this code cross-platform eventually.
-+
-+    // Line separator is \r\n per RFC 2483 - however, for compatibility
-+    // reasons we also allow just \n here.
-+
-+    // Process the input and copy the first valid URL into the url member.
-+    // In case no URLs can be found, subsequent calls to getData("URL")
-+    // will get an empty string. This is in line with the HTML5 spec (see
-+    // "The DragEvent and DataTransfer interfaces"). Also extract all filenames
-+    // from the URI list.
-+    bool setURL = hasURL();
-+    for (auto& line : uriListString.split('\n')) {
-+        line = line.trim(deprecatedIsSpaceOrNewline);
-+        if (line.isEmpty())
-+            continue;
-+        if (line[0] == '#')
-+            continue;
-+
-+        URL url = URL(URL(), line);
-+        if (url.isValid()) {
-+            if (!setURL) {
-+                m_url = url;
-+                setURL = true;
-+            }
-+
-+            GUniqueOutPtr<GError> error;
-+            GUniquePtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
-+            if (!error && filename)
-+                m_filenames.append(String::fromUTF8(filename.get()));
+ 
+@@ -69,6 +82,11 @@ void Pasteboard::writePlainText(const String& text, SmartReplaceOption)
+ 
+ void Pasteboard::write(const PasteboardURL& pasteboardURL)
+ {
++    if (m_selectionData) {
++        m_selectionData->clearAll();
++        m_selectionData->setURL(pasteboardURL.url, pasteboardURL.title);
++        return;
++    }
+     ASSERT(!pasteboardURL.url.isEmpty());
+     SelectionData data;
+     data.setURL(pasteboardURL.url, pasteboardURL.title);
+@@ -82,6 +100,15 @@ void Pasteboard::writeTrustworthyWebURLsPboardType(const PasteboardURL&)
+ 
+ void Pasteboard::write(const PasteboardImage& pasteboardImage)
+ {
++    if (m_selectionData) {
++        m_selectionData->clearAll();
++        if (!pasteboardImage.url.url.isEmpty()) {
++            m_selectionData->setURL(pasteboardImage.url.url, pasteboardImage.url.title);
++            m_selectionData->setMarkup(pasteboardImage.url.markup);
 +        }
++        m_selectionData->setImage(pasteboardImage.image.get());
++        return;
 +    }
-+}
-+
-+void SelectionData::setURL(const URL& url, const String& label)
-+{
-+    m_url = url;
-+    if (m_uriList.isEmpty())
-+        m_uriList = url.string();
+     SelectionData data;
+     if (!pasteboardImage.url.url.isEmpty()) {
+         data.setURL(pasteboardImage.url.url, pasteboardImage.url.title);
+@@ -98,6 +125,12 @@ void Pasteboard::write(const PasteboardBuffer&)
+ 
+ void Pasteboard::write(const PasteboardWebContent& pasteboardContent)
+ {
++    if (m_selectionData) {
++        m_selectionData->clearAll();
++        m_selectionData->setText(pasteboardContent.text);
++        m_selectionData->setMarkup(pasteboardContent.markup);
++        return;
++    }
+     SelectionData data;
+     data.setText(pasteboardContent.text);
+     data.setMarkup(pasteboardContent.markup);
+@@ -191,6 +224,26 @@ bool Pasteboard::hasData()
+ 
+ Vector<String> Pasteboard::typesSafeForBindings(const String& origin)
+ {
++    if (m_selectionData) {
++        ListHashSet<String> types;
++        if (auto& buffer = m_selectionData->customData()) {
++            auto customData = PasteboardCustomData::fromSharedBuffer(*buffer);
++            if (customData.origin() == origin) {
++                for (auto& type : customData.orderedTypes())
++                    types.add(type);
++            }
++        }
 +
-+    if (!hasText())
-+        setText(url.string());
++        if (m_selectionData->hasText())
++            types.add("text/plain"_s);
++        if (m_selectionData->hasMarkup())
++            types.add("text/html"_s);
++        if (m_selectionData->hasURIList())
++            types.add("text/uri-list"_s);
 +
-+    if (hasMarkup())
-+        return;
++        return copyToVector(types);
++    }
 +
-+    String actualLabel(label);
-+    if (actualLabel.isEmpty())
-+        actualLabel = url.string();
+     return platformStrategies()->pasteboardStrategy()->typesSafeForDOMToReadAndWrite(m_name, origin, context());
+ }
+ 
+@@ -201,6 +254,13 @@ Vector<String> Pasteboard::typesForLegacyUnsafeBindings()
+ 
+ String Pasteboard::readOrigin()
+ {
++    if (m_selectionData) {
++        if (auto& buffer = m_selectionData->customData())
++            return PasteboardCustomData::fromSharedBuffer(*buffer).origin();
 +
-+    StringBuilder markup;
-+    markup.append("<a href=\"");
-+    markup.append(url.string());
-+    markup.append("\">");
-+    GUniquePtr<gchar> escaped(g_markup_escape_text(actualLabel.utf8().data(), -1));
-+    markup.append(String::fromUTF8(escaped.get()));
-+    markup.append("</a>");
-+    setMarkup(markup.toString());
-+}
++        return { };
++    }
 +
-+const String& SelectionData::urlLabel() const
-+{
-+    if (hasText())
-+        return text();
+     // FIXME: cache custom data?
+     if (auto buffer = platformStrategies()->pasteboardStrategy()->readBufferFromClipboard(m_name, PasteboardCustomData::wpeType()))
+         return PasteboardCustomData::fromSharedBuffer(*buffer).origin();
+@@ -210,11 +270,27 @@ String Pasteboard::readOrigin()
+ 
+ String Pasteboard::readString(const String& type)
+ {
++    if (m_selectionData) {
++        if (type == "text/plain"_s)
++            return m_selectionData->text();;
++        if (type == "text/html"_s)
++            return m_selectionData->markup();
++        if (type == "Files"_s || type == "text/uri-list"_s)
++            return m_selectionData->uriList();
++        return { };
++    }
 +
-+    if (hasURL())
-+        return url().string();
+     return platformStrategies()->pasteboardStrategy()->readTextFromClipboard(m_name, type);
+ }
+ 
+ String Pasteboard::readStringInCustomData(const String& type)
+ {
++    if (m_selectionData) {
++        if (auto& buffer = m_selectionData->customData())
++            return PasteboardCustomData::fromSharedBuffer(*buffer).readStringInCustomData(type);
 +
-+    return emptyString();
++        return { };
++    }
+     // FIXME: cache custom data?
+     if (auto buffer = platformStrategies()->pasteboardStrategy()->readBufferFromClipboard(m_name, PasteboardCustomData::wpeType()))
+         return PasteboardCustomData::fromSharedBuffer(*buffer).readStringInCustomData(type);
+@@ -244,6 +320,17 @@ void Pasteboard::writeMarkup(const String&)
+ 
+ void Pasteboard::writeCustomData(const Vector<PasteboardCustomData>& data)
+ {
++    if (m_selectionData) {
++        if (!data.isEmpty()) {
++            const auto& customData = data[0];
++            customData.forEachPlatformString([this] (auto& type, auto& string) {
++                    writeString(type, string);
++                    });
++            if (customData.hasSameOriginCustomData() || !customData.origin().isEmpty())
++                m_selectionData->setCustomData(customData.createSharedBuffer());
++        }
++        return;
++    }
+     m_changeCount = platformStrategies()->pasteboardStrategy()->writeCustomData(data, m_name, context());
+ }
+ 
+@@ -257,6 +344,35 @@ int64_t Pasteboard::changeCount() const
+     return platformStrategies()->pasteboardStrategy()->changeCount(m_name);
+ }
+ 
++#if ENABLE(DRAG_SUPPORT)
++Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context, SelectionData&& selectionData)
++    : m_context(WTFMove(context))
++    , m_selectionData(WTFMove(selectionData))
++{
 +}
 +
-+void SelectionData::clearAllExceptFilenames()
++Pasteboard::Pasteboard(std::unique_ptr<PasteboardContext>&& context, SelectionData& selectionData)
++    : m_context(WTFMove(context))
++    , m_selectionData(selectionData)
 +{
-+    clearText();
-+    clearMarkup();
-+    clearURIList();
-+    clearURL();
-+    clearImage();
-+    clearCustomData();
-+
-+    m_canSmartReplace = false;
 +}
 +
-+void SelectionData::clearAll()
++std::unique_ptr<Pasteboard> Pasteboard::createForDragAndDrop(std::unique_ptr<PasteboardContext>&& context)
 +{
-+    clearAllExceptFilenames();
-+    m_filenames.clear();
++    return makeUnique<Pasteboard>(WTFMove(context), SelectionData());
 +}
 +
-+} // namespace WebCore
-diff --git a/Source/WebCore/platform/wpe/SelectionData.h b/Source/WebCore/platform/wpe/SelectionData.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..cf2b51f6f02837a1106f4d999f2f130e2580986a
---- /dev/null
-+++ b/Source/WebCore/platform/wpe/SelectionData.h
-@@ -0,0 +1,82 @@
-+/*
-+ * Copyright (C) 2009, Martin Robinson
-+ *
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+
-+#pragma once
-+
-+#include "Image.h"
-+#include "SharedBuffer.h"
-+#include <wtf/HashMap.h>
-+#include <wtf/URL.h>
-+#include <wtf/text/StringHash.h>
-+
-+namespace WebCore {
-+
-+class SelectionData {
-+    WTF_MAKE_FAST_ALLOCATED;
-+public:
-+    void setText(const String&);
-+    const String& text() const { return m_text; }
-+    bool hasText() const { return !m_text.isEmpty(); }
-+    void clearText() { m_text = emptyString(); }
-+
-+    void setMarkup(const String& newMarkup) { m_markup = newMarkup; }
-+    const String& markup() const { return m_markup; }
-+    bool hasMarkup() const { return !m_markup.isEmpty(); }
-+    void clearMarkup() { m_markup = emptyString(); }
-+
-+    void setURL(const URL&, const String&);
-+    const URL& url() const { return m_url; }
-+    const String& urlLabel() const;
-+    bool hasURL() const { return !m_url.isEmpty() && m_url.isValid(); }
-+    void clearURL() { m_url = URL(); }
-+
-+    void setURIList(const String&);
-+    const String& uriList() const { return m_uriList; }
-+    const Vector<String>& filenames() const { return m_filenames; }
-+    bool hasURIList() const { return !m_uriList.isEmpty(); }
-+    bool hasFilenames() const { return !m_filenames.isEmpty(); }
-+    void clearURIList() { m_uriList = emptyString(); }
-+
-+    void setImage(Image* newImage) { m_image = newImage; }
-+    Image* image() const { return m_image.get(); }
-+    bool hasImage() const { return m_image; }
-+    void clearImage() { m_image = nullptr; }
-+
-+    void setCanSmartReplace(bool canSmartReplace) { m_canSmartReplace = canSmartReplace; }
-+    bool canSmartReplace() const { return m_canSmartReplace; }
-+
-+    void setCustomData(Ref<SharedBuffer>&& buffer) { m_customData = WTFMove(buffer); }
-+    SharedBuffer* customData() const { return m_customData.get(); }
-+    bool hasCustomData() const { return !!m_customData; }
-+    void clearCustomData() { m_customData = nullptr; }
-+
-+    void clearAll();
-+    void clearAllExceptFilenames();
++std::unique_ptr<Pasteboard> Pasteboard::create(const DragData& dragData)
++{
++    RELEASE_ASSERT(dragData.platformData());
++    return makeUnique<Pasteboard>(dragData.createPasteboardContext(), *dragData.platformData());
++}
 +
-+private:
-+    String m_text;
-+    String m_markup;
-+    URL m_url;
-+    String m_uriList;
-+    Vector<String> m_filenames;
-+    RefPtr<Image> m_image;
-+    bool m_canSmartReplace { false };
-+    RefPtr<SharedBuffer> m_customData;
-+};
++void Pasteboard::setDragImage(DragImage, const IntPoint&)
++{
++}
++#endif
 +
-+} // namespace WebCore
+ } // namespace WebCore
+ 
+ #endif // PLATFORM(WPE)
 diff --git a/Source/WebCore/rendering/RenderTextControl.cpp b/Source/WebCore/rendering/RenderTextControl.cpp
-index 58574b4d9fb503918e2cac0993ffe778f256a953..23de6aecb4ea7f7a1a36af6a93611559f19cfc11 100644
+index f8240cb9f855d0c35268d8c0c8fc2a0b985f4be0..3586db4ccf16a4a6bd174c09fc75915730c45ae2 100644
 --- a/Source/WebCore/rendering/RenderTextControl.cpp
 +++ b/Source/WebCore/rendering/RenderTextControl.cpp
-@@ -222,13 +222,13 @@ void RenderTextControl::layoutExcludedChildren(bool relayoutChildren)
+@@ -230,13 +230,13 @@ void RenderTextControl::layoutExcludedChildren(RelayoutChildren relayoutChildren
      }
  }
  
@@ -8532,12 +8299,12 @@ index 58574b4d9fb503918e2cac0993ffe778f256a953..23de6aecb4ea7f7a1a36af6a93611559
  {
      auto innerText = innerTextElement();
 diff --git a/Source/WebCore/rendering/RenderTextControl.h b/Source/WebCore/rendering/RenderTextControl.h
-index 0c3b0f009ba9fca604f9bea904aae15142ee600e..b55788795cb550764d3de2e4dd0368773a14f290 100644
+index faf34133df0bf205072145ffbab8163b93d3c874..fdc4554952e0e33f8827bb3d00c827dec966ad15 100644
 --- a/Source/WebCore/rendering/RenderTextControl.h
 +++ b/Source/WebCore/rendering/RenderTextControl.h
-@@ -37,9 +37,9 @@ public:
- 
+@@ -38,9 +38,9 @@ public:
      WEBCORE_EXPORT HTMLTextFormControlElement& textFormControlElement() const;
+     WEBCORE_EXPORT Ref<HTMLTextFormControlElement> protectedTextFormControlElement() const;
  
 -#if PLATFORM(IOS_FAMILY)
      bool canScroll() const;
@@ -8547,10 +8314,10 @@ index 0c3b0f009ba9fca604f9bea904aae15142ee600e..b55788795cb550764d3de2e4dd036877
      int innerLineHeight() const override;
  #endif
 diff --git a/Source/WebCore/workers/WorkerConsoleClient.cpp b/Source/WebCore/workers/WorkerConsoleClient.cpp
-index 2cd5580e166c7eb03d7813fba647cb9748ee72ab..8d897cd56b35301031626bc4160fac907677f9f6 100644
+index 7546c0266801803c9f73179e7a370a4f42a4f05e..05bb106972e648f6fe98aaa1f471390e3a98c674 100644
 --- a/Source/WebCore/workers/WorkerConsoleClient.cpp
 +++ b/Source/WebCore/workers/WorkerConsoleClient.cpp
-@@ -101,4 +101,6 @@ void WorkerConsoleClient::recordEnd(JSC::JSGlobalObject*, Ref<ScriptArguments>&&
+@@ -124,4 +124,6 @@ void WorkerConsoleClient::recordEnd(JSC::JSGlobalObject*, Ref<ScriptArguments>&&
  // FIXME: <https://webkit.org/b/243361> Web Inspector: support console screenshots in a Worker
  void WorkerConsoleClient::screenshot(JSC::JSGlobalObject*, Ref<ScriptArguments>&&) { }
  
@@ -8558,10 +8325,10 @@ index 2cd5580e166c7eb03d7813fba647cb9748ee72ab..8d897cd56b35301031626bc4160fac90
 +
  } // namespace WebCore
 diff --git a/Source/WebCore/workers/WorkerConsoleClient.h b/Source/WebCore/workers/WorkerConsoleClient.h
-index 1d8488e0d36288e09cd5662bd7f770ade95dfee3..dee07f87b47d62d4ef8ede45824bdb2f6a39ad0a 100644
+index db95c8273bd0deb3f903a45d02fc07bbbd8ab305..bf88228b4c838b90d11d430cc9429d5130631afa 100644
 --- a/Source/WebCore/workers/WorkerConsoleClient.h
 +++ b/Source/WebCore/workers/WorkerConsoleClient.h
-@@ -57,6 +57,7 @@ private:
+@@ -58,6 +58,7 @@ private:
      void record(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
      void recordEnd(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
      void screenshot(JSC::JSGlobalObject*, Ref<Inspector::ScriptArguments>&&) override;
@@ -8570,10 +8337,10 @@ index 1d8488e0d36288e09cd5662bd7f770ade95dfee3..dee07f87b47d62d4ef8ede45824bdb2f
      WorkerOrWorkletGlobalScope& m_globalScope;
  };
 diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-index caf9b8fe4c94e56154fa70b4b09391dc1db5b4b6..e9c038a464ac0e30bce7c1e162911d12086c1082 100644
+index 23a9f5b5afdb7aba0efdc6a1db7898abc641b0fa..220ed1f59582562268f02262ea2f7ed3388aab1f 100644
 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
 +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
-@@ -96,6 +96,8 @@
+@@ -97,6 +97,8 @@
  
  #if PLATFORM(COCOA)
  #include <wtf/OSObjectPtr.h>
@@ -8582,7 +8349,7 @@ index caf9b8fe4c94e56154fa70b4b09391dc1db5b4b6..e9c038a464ac0e30bce7c1e162911d12
  #endif
  
  #if ENABLE(APPLE_PAY_REMOTE_UI)
-@@ -1093,6 +1095,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
+@@ -1237,6 +1239,14 @@ void NetworkConnectionToWebProcess::clearPageSpecificData(PageIdentifier pageID)
          storageSession->clearPageSpecificDataForResourceLoadStatistics(pageID);
  }
  
@@ -8596,12 +8363,12 @@ index caf9b8fe4c94e56154fa70b4b09391dc1db5b4b6..e9c038a464ac0e30bce7c1e162911d12
 +
  void NetworkConnectionToWebProcess::removeStorageAccessForFrame(FrameIdentifier frameID, PageIdentifier pageID)
  {
-     if (auto* storageSession = networkProcess().storageSession(m_sessionID))
+     if (auto* storageSession = protectedNetworkProcess()->storageSession(m_sessionID))
 diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-index a9fd7f7625ca67043c8ed0dcd7979df49cd65266..8e7903e0c5acefb8c5381f8297b52d610b8e4a29 100644
+index 3f1539237c6c8d1cd832cd3ece2ba20939e01a41..1259c36e38d46c0ebfdf98be20f217433f831ca5 100644
 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
 +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
-@@ -343,6 +343,8 @@ private:
+@@ -388,6 +388,8 @@ private:
  
      void clearPageSpecificData(WebCore::PageIdentifier);
  
@@ -8611,10 +8378,10 @@ index a9fd7f7625ca67043c8ed0dcd7979df49cd65266..8e7903e0c5acefb8c5381f8297b52d61
  
      void logUserInteraction(RegistrableDomain&&);
 diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-index b90021dcc3e4d70cb7b42b538050c5a37653b3cd..acc42255c8d3fb08971f62e6771f022f544199b7 100644
+index b10706aafd037a2b92a68b0d2c474ec2e42cd2fe..f80792c02d880dbd61849233fdbc348f1eeffb33 100644
 --- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
 +++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in
-@@ -74,6 +74,8 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver {
+@@ -80,6 +80,8 @@ messages -> NetworkConnectionToWebProcess WantsDispatchMessage {
  
      ClearPageSpecificData(WebCore::PageIdentifier pageID);
  
@@ -8623,105 +8390,15 @@ index b90021dcc3e4d70cb7b42b538050c5a37653b3cd..acc42255c8d3fb08971f62e6771f022f
      RemoveStorageAccessForFrame(WebCore::FrameIdentifier frameID, WebCore::PageIdentifier pageID);
      LogUserInteraction(WebCore::RegistrableDomain domain)
      ResourceLoadStatisticsUpdated(Vector<WebCore::ResourceLoadStatistics> statistics) -> ()
-diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
-index cd174626a10faea7348b568bcfc384d9aaa86f5a..72e66509f540301cedc64ac9ea69f50fb1044245 100644
---- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
-+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
-@@ -658,6 +658,12 @@ void NetworkProcess::registrableDomainsExemptFromWebsiteDataDeletion(PAL::Sessio
-     completionHandler({ });
- }
- 
-+void NetworkProcess::setIgnoreCertificateErrors(PAL::SessionID sessionID, bool ignore)
-+{
-+    if (auto* networkSession = this->networkSession(sessionID))
-+        networkSession->setIgnoreCertificateErrors(ignore);
-+}
-+
- void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler<void(String)>&& completionHandler)
- {
-     if (auto* session = networkSession(sessionID)) {
-diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
-index 6d41842684f3e0e8b1190359f87105b747cf9da9..279d5c033397afb120a082953c0112f34bf2878a 100644
---- a/Source/WebKit/NetworkProcess/NetworkProcess.h
-+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
-@@ -33,6 +33,7 @@
- #include "DownloadManager.h"
- #include "NetworkContentRuleListManager.h"
- #include "QuotaIncreaseRequestIdentifier.h"
-+#include "StorageNamespaceIdentifier.h"
- #include "WebPageProxyIdentifier.h"
- #include "WebResourceLoadStatisticsStore.h"
- #include "WebsiteData.h"
-@@ -82,6 +83,7 @@ class SessionID;
- 
- namespace WebCore {
- class CertificateInfo;
-+struct Cookie;
- class CurlProxySettings;
- class ProtectionSpace;
- class NetworkStorageSession;
-@@ -212,6 +214,9 @@ public:
- 
-     void registrableDomainsWithLastAccessedTime(PAL::SessionID, CompletionHandler<void(std::optional<HashMap<RegistrableDomain, WallTime>>)>&&);
-     void registrableDomainsExemptFromWebsiteDataDeletion(PAL::SessionID, CompletionHandler<void(HashSet<RegistrableDomain>)>&&);
-+
-+    void setIgnoreCertificateErrors(PAL::SessionID, bool);
-+
-     void clearPrevalentResource(PAL::SessionID, RegistrableDomain&&, CompletionHandler<void()>&&);
-     void clearUserInteraction(PAL::SessionID, RegistrableDomain&&, CompletionHandler<void()>&&);
-     void deleteAndRestrictWebsiteDataForRegistrableDomains(PAL::SessionID, OptionSet<WebsiteDataType>, RegistrableDomainsToDeleteOrRestrictWebsiteDataFor&&, bool shouldNotifyPage, CompletionHandler<void(HashSet<RegistrableDomain>&&)>&&);
-diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
-index 5e590b5a09f8bd5d040e2e68d54c545c52d4b179..c58bb6270ab75026187fdda6c94822f6aa47a35a 100644
---- a/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
-+++ b/Source/WebKit/NetworkProcess/NetworkProcess.messages.in
-@@ -79,6 +79,8 @@ messages -> NetworkProcess LegacyReceiver {
- 
-     SetInspectionForServiceWorkersAllowed(PAL::SessionID sessionID, bool inspectable)
- 
-+    SetIgnoreCertificateErrors(PAL::SessionID sessionID, bool ignoreTLSErrors)
-+
-     ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> ()
-     ClearUserInteraction(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> ()
-     DumpResourceLoadStatistics(PAL::SessionID sessionID) -> (String dumpedStatistics)
-diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h
-index b22ff912dba5b116a979119af6721bcfcc72ec5d..deb9a0b67adb51b190833354e7ea5d8e46aea56c 100644
---- a/Source/WebKit/NetworkProcess/NetworkSession.h
-+++ b/Source/WebKit/NetworkProcess/NetworkSession.h
-@@ -200,6 +200,9 @@ public:
- 
-     void lowMemoryHandler(WTF::Critical);
- 
-+    void setIgnoreCertificateErrors(bool ignore) { m_ignoreCertificateErrors = ignore; }
-+    bool ignoreCertificateErrors() { return m_ignoreCertificateErrors; }
-+
-     void removeSoftUpdateLoader(ServiceWorkerSoftUpdateLoader* loader) { m_softUpdateLoaders.remove(loader); }
-     void addNavigationPreloaderTask(ServiceWorkerFetchTask&);
-     ServiceWorkerFetchTask* navigationPreloaderTaskFromFetchIdentifier(WebCore::FetchIdentifier);
-@@ -309,6 +312,7 @@ protected:
-     bool m_privateClickMeasurementDebugModeEnabled { false };
-     std::optional<WebCore::PrivateClickMeasurement> m_ephemeralMeasurement;
-     bool m_isRunningEphemeralMeasurementTest { false };
-+    bool m_ignoreCertificateErrors { false };
- 
-     HashSet<Ref<NetworkResourceLoader>> m_keptAliveLoads;
- 
 diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-index 95d84783fe56cc381e67113924780bf1e2d9320e..129e7ada7fa90665a80ccf79641d7fcaf9f085a0 100644
+index 00a6ce04cae578c8ac9d934e6c4e38041e4a4aee..ab587ef45e27bddf3e31d28882794f7fb11dea0d 100644
 --- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
 +++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
-@@ -761,6 +761,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece
- 
-     if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) {
-         sessionCocoa->setClientAuditToken(challenge);
-+        if (sessionCocoa->ignoreCertificateErrors())
-+            return completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
- 
-         NSURLSessionTaskTransactionMetrics *metrics = task._incompleteTaskMetrics.transactionMetrics.lastObject;
-         auto tlsVersion = (tls_protocol_version_t)metrics.negotiatedTLSProtocolVersion.unsignedShortValue;
-@@ -1100,6 +1102,13 @@ ALLOW_DEPRECATED_DECLARATIONS_END
- 
-         resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics, networkDataTask->networkLoadMetrics()));
+@@ -1148,6 +1148,14 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
  
+         resourceResponse.setDeprecatedNetworkLoadMetrics(WebCore::copyTimingData(taskMetrics.get(), networkDataTask->networkLoadMetrics()));
+         resourceResponse.setProxyName(WTFMove(proxyName));
++
 +        __block WebCore::HTTPHeaderMap requestHeaders;
 +        NSURLSessionTaskTransactionMetrics *m = dataTask._incompleteTaskMetrics.transactionMetrics.lastObject;
 +        [m.request.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSString *value, BOOL *) {
@@ -8731,35 +8408,12 @@ index 95d84783fe56cc381e67113924780bf1e2d9320e..129e7ada7fa90665a80ccf79641d7fca
 +
          networkDataTask->didReceiveResponse(WTFMove(resourceResponse), negotiatedLegacyTLS, privateRelayed, [completionHandler = makeBlockPtr(completionHandler), taskIdentifier](WebCore::PolicyAction policyAction) {
  #if !LOG_DISABLED
-             LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%d)", taskIdentifier, policyAction);
+             LOG(NetworkSession, "%llu didReceiveResponse completionHandler (%s)", taskIdentifier, toString(policyAction).characters());
 diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
-index 383b0c08feda5c59455407093f656311c0a0c3fc..4522f3a562e67f41f29ee699ab9ed9dad999d90e 100644
+index 975e4097fb5b9cb610ce67c70ea85e6434ec7a9d..6e2676cd751883e2eae26e38ffaefa873857b604 100644
 --- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
 +++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
-@@ -80,10 +80,18 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas
-         blockCookies();
-     restrictRequestReferrerToOriginIfNeeded(request);
- 
--    m_curlRequest = createCurlRequest(WTFMove(request));
--    if (!m_initialCredential.isEmpty()) {
--        m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
--        m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic);
-+    if (request.url().protocolIsData()) {
-+        DataURLDecoder::decode(request.url(), { }, DataURLDecoder::ShouldValidatePadding::Yes, [this, protectedThis = Ref { *this }](auto decodeResult) mutable {
-+            didReadDataURL(WTFMove(decodeResult));
-+        });
-+    } else {
-+        m_curlRequest = createCurlRequest(WTFMove(request));
-+        if (!m_initialCredential.isEmpty()) {
-+            m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
-+            m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic);
-+        }
-+        if (m_session->ignoreCertificateErrors())
-+            m_curlRequest->disableServerTrustEvaluation();
-     }
- }
- 
-@@ -166,6 +174,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo
+@@ -166,6 +166,7 @@ void NetworkDataTaskCurl::curlDidReceiveResponse(CurlRequest& request, CurlRespo
  
      updateNetworkLoadMetrics(receivedResponse.networkLoadMetrics);
      m_response.setDeprecatedNetworkLoadMetrics(Box<NetworkLoadMetrics>::create(WTFMove(receivedResponse.networkLoadMetrics)));
@@ -8767,177 +8421,11 @@ index 383b0c08feda5c59455407093f656311c0a0c3fc..4522f3a562e67f41f29ee699ab9ed9da
  
      handleCookieHeaders(request.resourceRequest(), receivedResponse);
  
-@@ -290,6 +299,36 @@ bool NetworkDataTaskCurl::shouldRedirectAsGET(const ResourceRequest& request, bo
-     return false;
- }
- 
-+void NetworkDataTaskCurl::didReadDataURL(std::optional<DataURLDecoder::Result>&& result)
-+{
-+    if (state() == State::Canceling || state() == State::Completed)
-+        return;
-+
-+    m_dataURLResult = WTFMove(result);
-+    m_response = ResourceResponse::dataURLResponse(firstRequest().url(), m_dataURLResult.value());
-+    invokeDidReceiveResponse();
-+}
-+
-+void NetworkDataTaskCurl::downloadDataURL(Download& download)
-+{
-+    if (!m_dataURLResult) {
-+        deleteDownloadFile();
-+        download.didFail(internalError(firstRequest().url()), std::span<const uint8_t>());
-+        return;
-+    }
-+
-+    if (-1 == FileSystem::writeToFile(m_downloadDestinationFile, static_cast<void*>(m_dataURLResult.value().data.data()), m_dataURLResult.value().data.size())) {
-+        deleteDownloadFile();
-+        download.didFail(ResourceError(CURLE_WRITE_ERROR, m_response.url()), std::span<const uint8_t>());
-+        return;
-+    }
-+
-+    download.didReceiveData(m_dataURLResult.value().data.size(), 0, 0);
-+    FileSystem::closeFile(m_downloadDestinationFile);
-+    m_downloadDestinationFile = FileSystem::invalidPlatformFileHandle;
-+    download.didFinish();
-+}
-+
- void NetworkDataTaskCurl::invokeDidReceiveResponse()
- {
-     didReceiveResponse(ResourceResponse(m_response), NegotiatedLegacyTLS::No, PrivateRelayed::No, [this, protectedThis = Ref { *this }](PolicyAction policyAction) {
-@@ -320,6 +359,8 @@ void NetworkDataTaskCurl::invokeDidReceiveResponse()
-             downloadPtr->didCreateDestination(m_pendingDownloadLocation);
-             if (m_curlRequest)
-                 m_curlRequest->completeDidReceiveResponse();
-+            else if (firstRequest().url().protocolIsData())
-+                downloadDataURL(*downloadPtr);
-             break;
-         }
-         default:
-@@ -408,6 +449,8 @@ void NetworkDataTaskCurl::willPerformHTTPRedirection()
-             m_curlRequest->setUserPass(m_initialCredential.user(), m_initialCredential.password());
-             m_curlRequest->setAuthenticationScheme(ProtectionSpace::AuthenticationScheme::HTTPBasic);
-         }
-+        if (m_session->ignoreCertificateErrors())
-+            m_curlRequest->disableServerTrustEvaluation();
- 
-         if (m_state != State::Suspended) {
-             m_state = State::Suspended;
-diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
-index bfff08efb10d4d6cd1a27755403ed53ed58ce919..1a59755f684229bd47fd70369e4a9d4282950ef7 100644
---- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
-+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.h
-@@ -28,6 +28,7 @@
- #include "NetworkDataTask.h"
- #include "NetworkLoadParameters.h"
- #include <WebCore/CurlRequestClient.h>
-+#include <WebCore/DataURLDecoder.h>
- #include <WebCore/FrameIdentifier.h>
- #include <WebCore/PageIdentifier.h>
- #include <WebCore/ProtectionSpace.h>
-@@ -43,6 +44,8 @@ class SharedBuffer;
- 
- namespace WebKit {
- 
-+class Download;
-+
- class NetworkDataTaskCurl final : public NetworkDataTask, public WebCore::CurlRequestClient {
- public:
-     static Ref<NetworkDataTask> create(NetworkSession& session, NetworkDataTaskClient& client, const NetworkLoadParameters& parameters)
-@@ -75,6 +78,9 @@ private:
-     void curlDidComplete(WebCore::CurlRequest&, WebCore::NetworkLoadMetrics&&) override;
-     void curlDidFailWithError(WebCore::CurlRequest&, WebCore::ResourceError&&, WebCore::CertificateInfo&&) override;
- 
-+    void didReadDataURL(std::optional<WebCore::DataURLDecoder::Result>&&);
-+    void downloadDataURL(Download&);
-+
-     void invokeDidReceiveResponse();
- 
-     bool shouldStartHTTPRedirection();
-@@ -113,6 +119,9 @@ private:
-     unsigned m_authFailureCount { 0 };
- 
-     bool m_allowOverwriteDownload { false };
-+
-+    std::optional<WebCore::DataURLDecoder::Result> m_dataURLResult;
-+
-     FileSystem::PlatformFileHandle m_downloadDestinationFile { FileSystem::invalidPlatformFileHandle };
- 
-     bool m_blockingCookies { false };
-diff --git a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
-index 486849ef6f550a0f3caab311abf5743c6d38e5af..afeaac63a18d9e71d3afead23b7da4fecfc27544 100644
---- a/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
-+++ b/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp
-@@ -68,7 +68,7 @@ void NetworkSessionCurl::clearAlternativeServices(WallTime)
- 
- std::unique_ptr<WebSocketTask> NetworkSessionCurl::createWebSocketTask(WebPageProxyIdentifier webPageProxyID, std::optional<FrameIdentifier>, std::optional<PageIdentifier>, NetworkSocketChannel& channel, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin& clientOrigin, bool, bool, OptionSet<WebCore::AdvancedPrivacyProtections>, ShouldRelaxThirdPartyCookieBlocking, StoredCredentialsPolicy)
- {
--    return makeUnique<WebSocketTask>(channel, webPageProxyID, request, protocol, clientOrigin);
-+    return makeUnique<WebSocketTask>(channel, webPageProxyID, request, protocol, ignoreCertificateErrors(), clientOrigin);
- }
- 
- void NetworkSessionCurl::didReceiveChallenge(WebSocketTask& webSocketTask, WebCore::AuthenticationChallenge&& challenge, CompletionHandler<void(WebKit::AuthenticationChallengeDisposition, const WebCore::Credential&)>&& challengeCompletionHandler)
-diff --git a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp
-index 60106d6125f85d0cf848e828fd4ed7a50005f105..021d7b6d12baf4671a2968753969ca4675044313 100644
---- a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp
-+++ b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.cpp
-@@ -36,11 +36,12 @@
- 
- namespace WebKit {
- 
--WebSocketTask::WebSocketTask(NetworkSocketChannel& channel, WebPageProxyIdentifier webProxyPageID, const WebCore::ResourceRequest& request, const String& protocol, const WebCore::ClientOrigin& clientOrigin)
-+WebSocketTask::WebSocketTask(NetworkSocketChannel& channel, WebPageProxyIdentifier webProxyPageID, const WebCore::ResourceRequest& request, const String& protocol, bool ignoreCertificateErrors, const WebCore::ClientOrigin& clientOrigin)
-     : m_channel(channel)
-     , m_webProxyPageID(webProxyPageID)
-     , m_request(request.isolatedCopy())
-     , m_protocol(protocol)
-+    , m_ignoreCertificateErrors(ignoreCertificateErrors)
-     , m_scheduler(WebCore::CurlContext::singleton().streamScheduler())
- {
-     // We use topOrigin in case of service worker websocket connections, for which pageID does not link to a real page.
-@@ -52,7 +53,7 @@ WebSocketTask::WebSocketTask(NetworkSocketChannel& channel, WebPageProxyIdentifi
-     if (networkSession() && networkSession()->networkProcess().localhostAliasesForTesting().contains<StringViewHashTranslator>(m_request.url().host()))
-         localhostAlias = WebCore::CurlStream::LocalhostAlias::Enable;
- 
--    m_streamID = m_scheduler.createStream(request.url(), *this, WebCore::CurlStream::ServerTrustEvaluation::Enable, localhostAlias);
-+    m_streamID = m_scheduler.createStream(request.url(), ignoreCertificateErrors, *this, WebCore::CurlStream::ServerTrustEvaluation::Enable, localhostAlias);
-     m_channel.didSendHandshakeRequest(WebCore::ResourceRequest(m_request));
- }
- 
-@@ -257,7 +258,7 @@ void WebSocketTask::tryServerTrustEvaluation(WebCore::AuthenticationChallenge&&
-             if (networkSession() && networkSession()->networkProcess().localhostAliasesForTesting().contains<StringViewHashTranslator>(m_request.url().host()))
-                 localhostAlias = WebCore::CurlStream::LocalhostAlias::Enable;
- 
--            m_streamID = m_scheduler.createStream(m_request.url(), *this, WebCore::CurlStream::ServerTrustEvaluation::Disable, localhostAlias);
-+            m_streamID = m_scheduler.createStream(m_request.url(), m_ignoreCertificateErrors, *this, WebCore::CurlStream::ServerTrustEvaluation::Disable, localhostAlias);
-         } else
-             didFail(WTFMove(errorReason));
-     });
-diff --git a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h
-index 5023a9be6554abc9ffe8fb37968978cb28c5b9a1..9cfdedd0411bf32843c2c9a7d7d722c5ee4f6e46 100644
---- a/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h
-+++ b/Source/WebKit/NetworkProcess/curl/WebSocketTaskCurl.h
-@@ -49,7 +49,7 @@ struct SessionSet;
- class WebSocketTask : public CanMakeWeakPtr<WebSocketTask>, public WebCore::CurlStream::Client {
-     WTF_MAKE_FAST_ALLOCATED;
- public:
--    WebSocketTask(NetworkSocketChannel&, WebPageProxyIdentifier, const WebCore::ResourceRequest&, const String& protocol, const WebCore::ClientOrigin&);
-+    WebSocketTask(NetworkSocketChannel&, WebPageProxyIdentifier, const WebCore::ResourceRequest&, const String& protocol,  bool ignoreCertificateErrors, const WebCore::ClientOrigin&);
-     virtual ~WebSocketTask();
- 
-     void sendString(std::span<const uint8_t>, CompletionHandler<void()>&&);
-@@ -102,6 +102,7 @@ private:
-     WebPageProxyIdentifier m_webProxyPageID;
-     WebCore::ResourceRequest m_request;
-     String m_protocol;
-+    bool m_ignoreCertificateErrors { false };
-     WebCore::SecurityOriginData m_topOrigin;
- 
-     WebCore::CurlStreamScheduler& m_scheduler;
 diff --git a/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in b/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
-index 51f3fb7ae9a4e208bc11ac583b72e772eac5e4dc..386ec972eba86763b83407c322a971a30286f40f 100644
+index aebce13abcf8f93c8fa48936120c2065f0a664b1..7b003cf0d65d0179b165fcbce775cfd5b6a19374 100644
 --- a/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
 +++ b/Source/WebKit/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
-@@ -448,9 +448,11 @@
+@@ -451,9 +451,11 @@
  
  ;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
  ;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
@@ -8953,93 +8441,23 @@ index 51f3fb7ae9a4e208bc11ac583b72e772eac5e4dc..386ec972eba86763b83407c322a971a3
  ;; Except deny access to new-style iOS Keychain folders which are UUIDs.
  (deny file-read* file-write*
 diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
-index 4295b59484942084404ff7b03669aba249667e97..73dea05ac933938a19bbd6ec5bbcbd6139f98c25 100644
+index 983947a9ad3abf138c1a6052807c4e86beb5c1d1..c5de2e1f1c74317ee00b9558e0e5c3093496c386 100644
 --- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
 +++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
-@@ -466,6 +466,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr<GInputStream>&& inputStream)
-             m_networkLoadMetrics.failsTAOCheck = !passesTimingAllowOriginCheck(m_response, *origin);
-     }
+@@ -461,6 +461,8 @@ void NetworkDataTaskSoup::didSendRequest(GRefPtr<GInputStream>&& inputStream)
+     m_networkLoadMetrics.responseStart = MonotonicTime::now();
+ #endif
  
 +    auto& additionalMetrics = additionalNetworkLoadMetricsForWebInspector();
 +    m_response.m_httpRequestHeaderFields = additionalMetrics.requestHeaders;
      dispatchDidReceiveResponse();
  }
  
-@@ -563,6 +565,8 @@ bool NetworkDataTaskSoup::acceptCertificate(GTlsCertificate* certificate, GTlsCe
- {
-     ASSERT(m_soupMessage);
-     URL url = soupURIToURL(soup_message_get_uri(m_soupMessage.get()));
-+    if (m_session->ignoreCertificateErrors())
-+        return true;
-     auto error = static_cast<NetworkSessionSoup&>(*m_session).soupNetworkSession().checkTLSErrors(url, certificate, tlsErrors);
-     if (!error)
-         return true;
-diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
-index 60e79ff683e280591d686468c42decf1ac109ed2..ef74cb09e75c3e6f57d180487fa266b7a0f09af5 100644
---- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
-+++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
-@@ -97,6 +97,11 @@ void NetworkSessionSoup::clearCredentials(WallTime)
- #endif
- }
- 
-+static gboolean webSocketAcceptCertificateCallbackIgnoreTLSErrors(GTlsConnection* connection, GTlsCertificate* certificate, GTlsCertificateFlags errors, NetworkSessionSoup* session)
-+{
-+    return TRUE;
-+}
-+
- #if USE(SOUP2)
- static gboolean webSocketAcceptCertificateCallback(GTlsConnection* connection, GTlsCertificate* certificate, GTlsCertificateFlags errors, NetworkSessionSoup* session)
- {
-@@ -117,6 +122,15 @@ static void webSocketMessageNetworkEventCallback(SoupMessage* soupMessage, GSock
- }
- #endif
- 
-+static void webSocketMessageNetworkEventCallbackIgnoreTLSErrors(SoupMessage* soupMessage, GSocketClientEvent event, GIOStream* connection)
-+{
-+    if (event != G_SOCKET_CLIENT_TLS_HANDSHAKING)
-+        return;
-+
-+    g_object_set_data(G_OBJECT(connection), "wk-soup-message", soupMessage);
-+    g_signal_connect(connection, "accept-certificate", G_CALLBACK(webSocketAcceptCertificateCallbackIgnoreTLSErrors), soupMessage);
-+}
-+
- std::unique_ptr<WebSocketTask> NetworkSessionSoup::createWebSocketTask(WebPageProxyIdentifier, std::optional<FrameIdentifier> frameID, std::optional<PageIdentifier> pageID, NetworkSocketChannel& channel, const ResourceRequest& request, const String& protocol, const ClientOrigin&, bool, bool, OptionSet<WebCore::AdvancedPrivacyProtections>, ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking, StoredCredentialsPolicy)
- {
-     GRefPtr<SoupMessage> soupMessage = request.createSoupMessage(blobRegistry());
-@@ -125,14 +139,21 @@ std::unique_ptr<WebSocketTask> NetworkSessionSoup::createWebSocketTask(WebPagePr
- 
-     if (request.url().protocolIs("wss"_s)) {
- #if USE(SOUP2)
--        g_signal_connect(soupMessage.get(), "network-event", G_CALLBACK(webSocketMessageNetworkEventCallback), this);
-+        if (ignoreCertificateErrors())
-+          g_signal_connect(soupMessage.get(), "network-event", G_CALLBACK(webSocketMessageNetworkEventCallbackIgnoreTLSErrors), this);
-+        else
-+          g_signal_connect(soupMessage.get(), "network-event", G_CALLBACK(webSocketMessageNetworkEventCallback), this);
- #else
--        g_signal_connect(soupMessage.get(), "accept-certificate", G_CALLBACK(+[](SoupMessage* message, GTlsCertificate* certificate, GTlsCertificateFlags errors,  NetworkSessionSoup* session) -> gboolean {
--            if (DeprecatedGlobalSettings::allowsAnySSLCertificate())
--                return TRUE;
--
--            return !session->soupNetworkSession().checkTLSErrors(soup_message_get_uri(message), certificate, errors);
--        }), this);
-+        if (ignoreCertificateErrors()) {
-+            g_signal_connect(soupMessage.get(), "accept-certificate", G_CALLBACK(webSocketAcceptCertificateCallbackIgnoreTLSErrors), this);
-+        } else {
-+            g_signal_connect(soupMessage.get(), "accept-certificate", G_CALLBACK(+[](SoupMessage* message, GTlsCertificate* certificate, GTlsCertificateFlags errors,  NetworkSessionSoup* session) -> gboolean {
-+                if (DeprecatedGlobalSettings::allowsAnySSLCertificate())
-+                    return TRUE;
-+
-+                return !session->soupNetworkSession().checkTLSErrors(soup_message_get_uri(message), certificate, errors);
-+            }), this);
-+        }
- #endif
-     }
- 
 diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
-index bd8dab990c4c034059d21588921784f047bb6d6a..46a61dcef89e94a9a1a25e6ae352ec88f0aec5e7 100644
+index 1f0116517d88a3a0fffade7288a4909bd848df88..83b9598353ad6dd9192b0c8827bba25d1cb069ad 100644
 --- a/Source/WebKit/PlatformGTK.cmake
 +++ b/Source/WebKit/PlatformGTK.cmake
-@@ -321,6 +321,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -320,6 +320,9 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
      ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
      ${GTK_INCLUDE_DIRS}
      ${LIBSOUP_INCLUDE_DIRS}
@@ -9049,7 +8467,7 @@ index bd8dab990c4c034059d21588921784f047bb6d6a..46a61dcef89e94a9a1a25e6ae352ec88
  )
  
  list(APPEND WebKit_INTERFACE_INCLUDE_DIRECTORIES
-@@ -351,6 +354,9 @@ if (USE_LIBWEBRTC)
+@@ -359,6 +362,9 @@ if (USE_LIBWEBRTC)
      list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
          "${THIRDPARTY_DIR}/libwebrtc/Source/"
          "${THIRDPARTY_DIR}/libwebrtc/Source/webrtc"
@@ -9059,7 +8477,7 @@ index bd8dab990c4c034059d21588921784f047bb6d6a..46a61dcef89e94a9a1a25e6ae352ec88
      )
  endif ()
  
-@@ -402,6 +408,12 @@ else ()
+@@ -410,6 +416,12 @@ else ()
      set(WebKitGTK_ENUM_HEADER_TEMPLATE ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitEnumTypesGtk3.h.in)
  endif ()
  
@@ -9073,10 +8491,10 @@ index bd8dab990c4c034059d21588921784f047bb6d6a..46a61dcef89e94a9a1a25e6ae352ec88
  set(WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_INSTALLED_HEADERS})
  list(REMOVE_ITEM WebKitGTK_ENUM_GENERATION_HEADERS ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h)
 diff --git a/Source/WebKit/PlatformWPE.cmake b/Source/WebKit/PlatformWPE.cmake
-index 8f27536b690e863fcaf086c04d1b0fb21356a622..a0207624821b4179d7adc646adf06aae65f0ca33 100644
+index 56b8ece0181ad1dacd3e33ee1463ac1cc4b2ac20..fb0b4169f860e9064397216b176024760a3503cd 100644
 --- a/Source/WebKit/PlatformWPE.cmake
 +++ b/Source/WebKit/PlatformWPE.cmake
-@@ -212,6 +212,7 @@ set(WPE_API_HEADER_TEMPLATES
+@@ -221,6 +221,7 @@ set(WPE_API_HEADER_TEMPLATES
      ${WEBKIT_DIR}/UIProcess/API/glib/WebKitWindowProperties.h.in
      ${WEBKIT_DIR}/UIProcess/API/glib/WebKitWebsitePolicies.h.in
      ${WEBKIT_DIR}/UIProcess/API/glib/webkit.h.in
@@ -9084,7 +8502,7 @@ index 8f27536b690e863fcaf086c04d1b0fb21356a622..a0207624821b4179d7adc646adf06aae
  )
  
  if (ENABLE_2022_GLIB_API)
-@@ -423,8 +424,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
+@@ -432,8 +433,17 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
      ${GIO_UNIX_INCLUDE_DIRS}
      ${GLIB_INCLUDE_DIRS}
      ${LIBSOUP_INCLUDE_DIRS}
@@ -9103,13 +8521,13 @@ index 8f27536b690e863fcaf086c04d1b0fb21356a622..a0207624821b4179d7adc646adf06aae
      WPE::libwpe
      ${GLIB_LIBRARIES}
 diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
-index 06a86d0cfd1ca90f383af2b079f60ce220f8eb02..9e21935463bf964ecb090be48e68b50ef29c049b 100644
+index 8429fc8b2e3721830edf197b3369f4f21bb70a9a..35e99519b9a23ac19757a8b67fe477ce26c06cd0 100644
 --- a/Source/WebKit/PlatformWin.cmake
 +++ b/Source/WebKit/PlatformWin.cmake
-@@ -56,8 +56,13 @@ list(APPEND WebKit_SOURCES
-     UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
+@@ -54,8 +54,13 @@ list(APPEND WebKit_SOURCES
  
      UIProcess/win/AutomationClientWin.cpp
+     UIProcess/win/AutomationSessionClientWin.cpp
 +
 +    UIProcess/win/InspectorTargetProxyWin.cpp
 +    UIProcess/win/InspectorPlaywrightAgentClientWin.cpp
@@ -9120,7 +8538,7 @@ index 06a86d0cfd1ca90f383af2b079f60ce220f8eb02..9e21935463bf964ecb090be48e68b50e
      UIProcess/win/WebPageProxyWin.cpp
      UIProcess/win/WebPopupMenuProxyWin.cpp
      UIProcess/win/WebProcessPoolWin.cpp
-@@ -73,6 +78,7 @@ list(APPEND WebKit_SOURCES
+@@ -71,6 +76,7 @@ list(APPEND WebKit_SOURCES
      WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
  
      WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp
@@ -9128,13 +8546,10 @@ index 06a86d0cfd1ca90f383af2b079f60ce220f8eb02..9e21935463bf964ecb090be48e68b50e
  
      WebProcess/WebPage/AcceleratedSurface.cpp
  
-@@ -121,8 +127,81 @@ list(APPEND WebKit_PUBLIC_FRAMEWORK_HEADERS
- 
- list(APPEND WebKit_PRIVATE_LIBRARIES
+@@ -121,6 +127,36 @@ list(APPEND WebKit_PRIVATE_LIBRARIES
      comctl32
-+    ${LIBVPX_CUSTOM_LIBRARY}
-+)
-+
+ )
+ 
 +# Playwright begin
 +list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
 +    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/include"
@@ -9143,99 +8558,49 @@ index 06a86d0cfd1ca90f383af2b079f60ce220f8eb02..9e21935463bf964ecb090be48e68b50e
 +
 +list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
 +    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libwebm"
- )
- 
-+set(vpxutils_SOURCES
++)
++
++add_library(mkvmuxer STATIC
 +    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libwebm/mkvmuxer/mkvmuxer.cc"
 +    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc"
 +    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libwebm/mkvmuxer/mkvwriter.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare_common.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare_gcc.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare_msa.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare_neon64.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare_neon.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/compare_win.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert_argb.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert_from_argb.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert_from.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert_jpeg.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert_to_argb.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/convert_to_i420.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/cpu_id.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/mjpeg_decoder.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/mjpeg_validate.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/planar_functions.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_any.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_argb.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_common.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_gcc.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_msa.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_neon64.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_neon.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/rotate_win.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_any.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_common.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_gcc.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_msa.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_neon64.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_neon.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/row_win.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_any.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_argb.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_common.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_gcc.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_msa.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_neon64.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_neon.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_rvv.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_uv.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/scale_win.cc"
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/source/video_common.cc"
 +)
-+
-+add_library(vpxutils STATIC ${vpxutils_SOURCES})
-+
-+target_include_directories(vpxutils PRIVATE
-+    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv/include"
++target_include_directories(mkvmuxer PRIVATE
 +    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libwebm"
 +)
++target_link_libraries(WebKit PRIVATE mkvmuxer)
++
++add_subdirectory(
++    "${THIRDPARTY_DIR}/libwebrtc/Source/third_party/libyuv"
++    "${CMAKE_BINARY_DIR}/libyuv"
++    EXCLUDE_FROM_ALL
++)
++target_link_libraries(WebKit PRIVATE yuv)
++target_link_libraries(WebKit PRIVATE ${LIBVPX_LIBRARIES})
 +
-+target_link_libraries(WebKit PRIVATE vpxutils)
 +# Playwright end
 +
  list(APPEND WebProcess_SOURCES
      WebProcess/EntryPoint/win/WebProcessMain.cpp
- )
-diff --git a/Source/WebKit/Shared/API/c/wpe/WebKit.h b/Source/WebKit/Shared/API/c/wpe/WebKit.h
-index a9aa21f5589dec453db1713c8846e0d2e687f552..9b94469d078d92e4b9e0c8149122b19a4d3b5307 100644
---- a/Source/WebKit/Shared/API/c/wpe/WebKit.h
-+++ b/Source/WebKit/Shared/API/c/wpe/WebKit.h
-@@ -76,6 +76,7 @@
- // From Source/WebKit/UIProcess/API/C
- #include <WebKit/WKBackForwardListItemRef.h>
- #include <WebKit/WKBackForwardListRef.h>
-+#include <WebKit/WKBrowserInspector.h>
- #include <WebKit/WKContext.h>
- #include <WebKit/WKContextConfigurationRef.h>
- #include <WebKit/WKCredential.h>
-diff --git a/Source/WebKit/Shared/Cocoa/CompletionHandlerCallChecker.h b/Source/WebKit/Shared/Cocoa/CompletionHandlerCallChecker.h
-index b09b17a5bff38e3ba8d6bb53da9ef09d229bdb61..46aa1caa93402711a08f5980387a957f783038e5 100644
---- a/Source/WebKit/Shared/Cocoa/CompletionHandlerCallChecker.h
-+++ b/Source/WebKit/Shared/Cocoa/CompletionHandlerCallChecker.h
-@@ -27,6 +27,7 @@
  
- #import <wtf/Forward.h>
- #import <wtf/ThreadSafeRefCounted.h>
-+#import <WebCore/LocalFrame.h>
- 
- namespace WebKit {
+diff --git a/Source/WebKit/Shared/AuxiliaryProcess.h b/Source/WebKit/Shared/AuxiliaryProcess.h
+index 35fd0f0397cd92c5bf025d89d7f7c8139c03c69d..b1559f1bb2d2d7a74d0b534f81352e366498bfc8 100644
+--- a/Source/WebKit/Shared/AuxiliaryProcess.h
++++ b/Source/WebKit/Shared/AuxiliaryProcess.h
+@@ -216,6 +216,11 @@ struct AuxiliaryProcessInitializationParameters {
+     IPC::Connection::Identifier connectionIdentifier;
+     HashMap<String, String> extraInitializationData;
+     WTF::AuxiliaryProcessType processType;
++// Playwright begin
++#if !PLATFORM(COCOA)
++    bool shouldEnableSharedArrayBuffer { false };
++#endif
++// Playwright end
+ };
  
+ } // namespace WebKit
 diff --git a/Source/WebKit/Shared/NativeWebKeyboardEvent.h b/Source/WebKit/Shared/NativeWebKeyboardEvent.h
-index 17cb42104f3fe7e78388cdb1acd78efb34022f8d..c824a8c7ab5c4717773bff23c03156e744d192c0 100644
+index c72c9733800b6f836c4d3ccb0b50d40c3ee83067..e2955ddebe388d886ca43d733dce0eb58256ce8b 100644
 --- a/Source/WebKit/Shared/NativeWebKeyboardEvent.h
 +++ b/Source/WebKit/Shared/NativeWebKeyboardEvent.h
 @@ -33,6 +33,7 @@
@@ -9246,7 +8611,7 @@ index 17cb42104f3fe7e78388cdb1acd78efb34022f8d..c824a8c7ab5c4717773bff23c03156e7
  #endif
  
  #if PLATFORM(GTK)
-@@ -70,22 +71,38 @@ public:
+@@ -70,23 +71,39 @@ public:
  #if USE(APPKIT)
      // FIXME: Share iOS's HandledByInputMethod enum here instead of passing a boolean.
      NativeWebKeyboardEvent(NSEvent *, bool handledByInputMethod, bool replacesSoftSpace, const Vector<WebCore::KeypressCommand>&);
@@ -9275,6 +8640,7 @@ index 17cb42104f3fe7e78388cdb1acd78efb34022f8d..c824a8c7ab5c4717773bff23c03156e7
 +    }
  #if PLATFORM(WPE) && ENABLE(WPE_PLATFORM)
      NativeWebKeyboardEvent(WPEEvent*, const String&, bool isAutoRepeat);
+     NativeWebKeyboardEvent(const String&, std::optional<Vector<WebCore::CompositionUnderline>>&&, std::optional<EditingRange>&&);
  #endif
  #elif PLATFORM(WIN)
      NativeWebKeyboardEvent(HWND, UINT message, WPARAM, LPARAM, Vector<MSG>&& pendingCharEvents);
@@ -9286,19 +8652,11 @@ index 17cb42104f3fe7e78388cdb1acd78efb34022f8d..c824a8c7ab5c4717773bff23c03156e7
  
  #if USE(APPKIT)
 diff --git a/Source/WebKit/Shared/NativeWebMouseEvent.h b/Source/WebKit/Shared/NativeWebMouseEvent.h
-index d51a12fba25ccd4b8bdd2e4a37bf9f1268034617..e36921913825f18522551c7847efae89d0679cc6 100644
+index a39b6dd673e1639f9fe64c23dd054f0ff57f7464..4026f6244889e5a0ee85edb72696d0be20ba531d 100644
 --- a/Source/WebKit/Shared/NativeWebMouseEvent.h
 +++ b/Source/WebKit/Shared/NativeWebMouseEvent.h
-@@ -31,6 +31,7 @@
- #if USE(APPKIT)
- #include <wtf/RetainPtr.h>
- OBJC_CLASS NSView;
-+OBJC_CLASS NSEvent;
- #endif
- 
- #if PLATFORM(GTK)
-@@ -86,6 +87,11 @@ public:
-     NativeWebMouseEvent(HWND, UINT message, WPARAM, LPARAM, bool);
+@@ -87,6 +87,11 @@ public:
+     NativeWebMouseEvent(HWND, UINT message, WPARAM, LPARAM, bool, float deviceScaleFactor);
  #endif
  
 +#if PLATFORM(GTK) || USE(LIBWPE) || PLATFORM(WIN)
@@ -9310,12 +8668,12 @@ index d51a12fba25ccd4b8bdd2e4a37bf9f1268034617..e36921913825f18522551c7847efae89
      NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
  #elif PLATFORM(GTK)
 diff --git a/Source/WebKit/Shared/NativeWebWheelEvent.h b/Source/WebKit/Shared/NativeWebWheelEvent.h
-index bd941fd1cc5ddbae5d9fbe59976defd8fac3550b..b707e8e1739d95573270848d4e7f7719f4663c41 100644
+index f8e96218fd2671d1c0aca5e549efe0d8b94ef0f9..6cebd61bceb39c08e916fe991e4c3fc6f34b4704 100644
 --- a/Source/WebKit/Shared/NativeWebWheelEvent.h
 +++ b/Source/WebKit/Shared/NativeWebWheelEvent.h
-@@ -73,7 +73,8 @@ public:
+@@ -74,7 +74,8 @@ public:
  #elif PLATFORM(WIN)
-     NativeWebWheelEvent(HWND, UINT message, WPARAM, LPARAM);
+     NativeWebWheelEvent(HWND, UINT message, WPARAM, LPARAM, float deviceScaleFactor);
  #endif
 -
 +    NativeWebWheelEvent(const WebWheelEvent & webWheelEvent)
@@ -9323,24 +8681,11 @@ index bd941fd1cc5ddbae5d9fbe59976defd8fac3550b..b707e8e1739d95573270848d4e7f7719
  #if USE(APPKIT)
      NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
  #elif PLATFORM(GTK)
-diff --git a/Source/WebKit/Shared/Pasteboard.serialization.in b/Source/WebKit/Shared/Pasteboard.serialization.in
-index 72ad2880160a374e8fa663e561d59becf9d2f36d..372ae6953199245fe4fc55a49813c7cae868f8b3 100644
---- a/Source/WebKit/Shared/Pasteboard.serialization.in
-+++ b/Source/WebKit/Shared/Pasteboard.serialization.in
-@@ -75,7 +75,7 @@ header: <WebCore/Pasteboard.h>
- #if PLATFORM(MAC)
-     String userVisibleForm
- #endif
--#if PLATFORM(GTK)
-+#if PLATFORM(GTK) || PLATFORM(WPE)
-     String markup
- #endif
- };
 diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-index 2a11967151ca0bebd14b6a64482a793e2a536333..f4fc1b8eab49eba96badf4151358325a0bb7072c 100644
+index e59ca0120c0a684ea1fbdb2262a6a89ccc848828..4fcb529af731becaf446538be42075bfc19bbf90 100644
 --- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
 +++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
-@@ -2658,6 +2658,9 @@ class WebCore::AuthenticationChallenge {
+@@ -2827,6 +2827,9 @@ class WebCore::AuthenticationChallenge {
  class WebCore::DragData {
  #if PLATFORM(COCOA)
      String pasteboardName();
@@ -9350,7 +8695,7 @@ index 2a11967151ca0bebd14b6a64482a793e2a536333..f4fc1b8eab49eba96badf4151358325a
  #endif
      WebCore::IntPoint clientPosition();
      WebCore::IntPoint globalPosition();
-@@ -3221,6 +3224,7 @@ enum class WebCore::WasPrivateRelayed : bool;
+@@ -3625,6 +3628,7 @@ enum class WebCore::WasPrivateRelayed : bool;
      String httpStatusText;
      String httpVersion;
      WebCore::HTTPHeaderMap httpHeaderFields;
@@ -9359,10 +8704,10 @@ index 2a11967151ca0bebd14b6a64482a793e2a536333..f4fc1b8eab49eba96badf4151358325a
      WebCore::ResourceResponseBase::Source source;
      WebCore::ResourceResponseBase::Type type;
 diff --git a/Source/WebKit/Shared/WebKeyboardEvent.cpp b/Source/WebKit/Shared/WebKeyboardEvent.cpp
-index b80bcb39473ecec86be5671f38698130bd9acbf3..d886cbac5f4c073e14e12f257fa920419ea0cf39 100644
+index 8040819bba9dcde87311aaafe7d8177d0e07281d..24972c0a357324d27910ae6ff1979d1c6b8bc758 100644
 --- a/Source/WebKit/Shared/WebKeyboardEvent.cpp
 +++ b/Source/WebKit/Shared/WebKeyboardEvent.cpp
-@@ -52,6 +52,24 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
+@@ -51,6 +51,24 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
      ASSERT(isKeyboardEventType(type()));
  }
  
@@ -9387,7 +8732,7 @@ index b80bcb39473ecec86be5671f38698130bd9acbf3..d886cbac5f4c073e14e12f257fa92041
  #elif PLATFORM(GTK)
  
  WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, bool handledByInputMethod, std::optional<Vector<WebCore::CompositionUnderline>>&& preeditUnderlines, std::optional<EditingRange>&& preeditSelectionRange, Vector<String>&& commands, bool isAutoRepeat, bool isKeypad)
-@@ -75,6 +93,24 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
+@@ -74,6 +92,24 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
      ASSERT(isKeyboardEventType(type()));
  }
  
@@ -9412,7 +8757,7 @@ index b80bcb39473ecec86be5671f38698130bd9acbf3..d886cbac5f4c073e14e12f257fa92041
  #elif PLATFORM(IOS_FAMILY)
  
  WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const String& unmodifiedText, const String& key, const String& code, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool handledByInputMethod, bool isAutoRepeat, bool isKeypad, bool isSystemKey)
-@@ -138,6 +174,27 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
+@@ -137,6 +173,27 @@ WebKeyboardEvent::WebKeyboardEvent(WebEvent&& event, const String& text, const S
  
  #endif
  
@@ -9464,7 +8809,7 @@ index 8e4e2d6d5ebb08fba210fe0a328d45290348dd11..32a43192ec1e918c33b1b046b71d2ec5
  
      const String& text() const { return m_text; }
 diff --git a/Source/WebKit/Shared/WebMouseEvent.h b/Source/WebKit/Shared/WebMouseEvent.h
-index 5da1ed78e5a55bf63e9e52e33dfa9e704922589a..6630725885bbfe6123537ea799bf5b6885ea977f 100644
+index 20a6e465457151b02daa22e6bc059cf0e117ece5..ef4b1f737aaa683bc13c447aa4ca77e5cf0d64d7 100644
 --- a/Source/WebKit/Shared/WebMouseEvent.h
 +++ b/Source/WebKit/Shared/WebMouseEvent.h
 @@ -70,6 +70,7 @@ public:
@@ -9476,31 +8821,53 @@ index 5da1ed78e5a55bf63e9e52e33dfa9e704922589a..6630725885bbfe6123537ea799bf5b68
      void setPosition(const WebCore::IntPoint& position) { m_position = position; }
      const WebCore::IntPoint& globalPosition() const { return m_globalPosition; }
 diff --git a/Source/WebKit/Shared/WebPageCreationParameters.h b/Source/WebKit/Shared/WebPageCreationParameters.h
-index e0f2fcf54bf77b41619a9b76a3f42cc17303029f..4f79a4a9e081bfbb6a05c2c8afcbdaae060f2229 100644
+index 36e44162c6f211876bf86b20e186f3da7e895536..68fe668470fef43c7a3af7a5c45ca4bac1fbbb28 100644
 --- a/Source/WebKit/Shared/WebPageCreationParameters.h
 +++ b/Source/WebKit/Shared/WebPageCreationParameters.h
-@@ -300,6 +300,8 @@ struct WebPageCreationParameters {
+@@ -301,6 +301,8 @@ struct WebPageCreationParameters {
+     WebCore::ShouldRelaxThirdPartyCookieBlocking shouldRelaxThirdPartyCookieBlocking { WebCore::ShouldRelaxThirdPartyCookieBlocking::No };
      
      bool httpsUpgradeEnabled { true };
- 
-+    bool shouldPauseInInspectorWhenShown { false };
 +
- #if PLATFORM(IOS) || PLATFORM(VISION)
-     bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload { false };
- #endif
++    bool shouldPauseInInspectorWhenShown { false };
+     
+ #if ENABLE(APP_HIGHLIGHTS)
+     WebCore::HighlightVisibility appHighlightsVisible { WebCore::HighlightVisibility::Hidden };
 diff --git a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-index c7c3aac107d2b528d63a31645d84573ba4115a89..4e6932d22e24e2df15e045c0cbb177e8e0a8e880 100644
+index 6df2cea7d9ba7328456822475ed765e33966d4b8..39c08e228a2346b18915bc90e76965e0586d006b 100644
 --- a/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
 +++ b/Source/WebKit/Shared/WebPageCreationParameters.serialization.in
-@@ -228,6 +228,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
+@@ -223,6 +223,8 @@ enum class WebCore::UserInterfaceLayoutDirection : bool;
  
      bool httpsUpgradeEnabled;
  
 +    bool shouldPauseInInspectorWhenShown;
 +
- #if PLATFORM(IOS) || PLATFORM(VISION)
-     bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload;
+ #if ENABLE(APP_HIGHLIGHTS)
+     WebCore::HighlightVisibility appHighlightsVisible;
  #endif
+diff --git a/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp b/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
+index 9899d60864664d1abff2b71c1c01e564e5dfb08c..391e0e42ca6a39f82b5a12c6aede069d61095ee2 100644
+--- a/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
++++ b/Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp
+@@ -32,7 +32,7 @@
+ 
+ namespace WebKit {
+ 
+-#if ENABLE(DEVELOPER_MODE)
++#if TRUE
+ static String getExecutablePath()
+ {
+     CString executablePath = FileSystem::currentExecutablePath();
+@@ -44,7 +44,7 @@ static String getExecutablePath()
+ 
+ static String findWebKitProcess(const char* processName)
+ {
+-#if ENABLE(DEVELOPER_MODE)
++#if TRUE
+     static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
+     if (execDirectory) {
+         String processPath = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(execDirectory), StringView::fromLatin1(processName));
 diff --git a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp b/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
 index 8d33ceb065fb3e90372b0c696779189d07838da0..6e3194c3e96e46bfa09f8d706324e6515df1e7f4 100644
 --- a/Source/WebKit/Shared/gtk/NativeWebKeyboardEventGtk.cpp
@@ -9533,247 +8900,57 @@ index 9a1c3f09c756ea368ac2d68e183a13e2eb47ead7..01c738376230f83376d80d6d225543a3
      , m_nativeEvent(event.nativeEvent() ? constructNativeEvent(const_cast<GdkEvent*>(event.nativeEvent())) : nullptr)
  {
  }
-diff --git a/Source/WebKit/Shared/libwpe/ArgumentCodersWPE.cpp b/Source/WebKit/Shared/libwpe/ArgumentCodersWPE.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..c837e53b425d8f647a96398962f23a37fb2cfde5
---- /dev/null
-+++ b/Source/WebKit/Shared/libwpe/ArgumentCodersWPE.cpp
-@@ -0,0 +1,170 @@
-+/*
-+ * Copyright (C) 2011 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "config.h"
-+#include "ArgumentCodersWPE.h"
-+
-+#include "WebCoreArgumentCoders.h"
-+#include <WebCore/GraphicsContext.h>
-+#include <WebCore/Image.h>
-+#include <WebCore/SelectionData.h>
-+#include <WebCore/ShareableBitmap.h>
-+
-+namespace IPC {
-+using namespace WebCore;
-+using namespace WebKit;
-+
-+static void encodeImage(Encoder& encoder, Image& image)
-+{
-+    RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create({ IntSize(image.size()) });
-+    bitmap->createGraphicsContext()->drawImage(image, IntPoint());
-+
-+    encoder << bitmap->createHandle();
-+}
-+
-+static WARN_UNUSED_RETURN bool decodeImage(Decoder& decoder, RefPtr<Image>& image)
-+{
-+    std::optional<std::optional<ShareableBitmapHandle>> handle;
-+    decoder >> handle;
-+    if (!handle || !*handle)
-+        return false;
-+
-+    RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(WTFMove(**handle));
-+    if (!bitmap)
-+        return false;
-+    image = bitmap->createImage();
-+    if (!image)
-+        return false;
-+    return true;
-+}
-+
-+void ArgumentCoder<SelectionData>::encode(Encoder& encoder, const SelectionData& selection)
-+{
-+    bool hasText = selection.hasText();
-+    encoder << hasText;
-+    if (hasText)
-+        encoder << selection.text();
-+    bool hasMarkup = selection.hasMarkup();
-+    encoder << hasMarkup;
-+    if (hasMarkup)
-+        encoder << selection.markup();
-+
-+    bool hasURL = selection.hasURL();
-+    encoder << hasURL;
-+    if (hasURL)
-+        encoder << selection.url().string();
-+
-+    bool hasURIList = selection.hasURIList();
-+    encoder << hasURIList;
-+    if (hasURIList)
-+        encoder << selection.uriList();
-+
-+    bool hasImage = selection.hasImage();
-+    encoder << hasImage;
-+    if (hasImage)
-+        encodeImage(encoder, *selection.image());
-+
-+    bool hasCustomData = selection.hasCustomData();
-+    encoder << hasCustomData;
-+    if (hasCustomData)
-+        encoder << RefPtr<SharedBuffer>(selection.customData());
-+
-+    bool canSmartReplace = selection.canSmartReplace();
-+    encoder << canSmartReplace;
-+}
-+
-+std::optional<SelectionData> ArgumentCoder<SelectionData>::decode(Decoder& decoder)
+diff --git a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
+index 7fcd22cd2172cd7fa77aee12ad5cfcf7a435abba..bc822b40eea889fb0499dd4e78f89f04d87c64a1 100644
+--- a/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
++++ b/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp
+@@ -40,6 +40,15 @@
+ 
+ namespace WebKit {
+ 
++static bool hasArgument(const char* argument, int argc, char** argv)
 +{
-+    SelectionData selection;
-+
-+    bool hasText;
-+    if (!decoder.decode(hasText))
-+        return std::nullopt;
-+    if (hasText) {
-+        String text;
-+        if (!decoder.decode(text))
-+            return std::nullopt;
-+        selection.setText(text);
-+    }
-+
-+    bool hasMarkup;
-+    if (!decoder.decode(hasMarkup))
-+        return std::nullopt;
-+    if (hasMarkup) {
-+        String markup;
-+        if (!decoder.decode(markup))
-+            return std::nullopt;
-+        selection.setMarkup(markup);
++    for (int i = 0; i < argc; ++i) {
++        if (!strcmp(argument, argv[i]))
++            return true;
 +    }
-+
-+    bool hasURL;
-+    if (!decoder.decode(hasURL))
-+        return std::nullopt;
-+    if (hasURL) {
-+        String url;
-+        if (!decoder.decode(url))
-+            return std::nullopt;
-+        selection.setURL(URL(URL(), url), String());
-+    }
-+
-+    bool hasURIList;
-+    if (!decoder.decode(hasURIList))
-+        return std::nullopt;
-+    if (hasURIList) {
-+        String uriList;
-+        if (!decoder.decode(uriList))
-+            return std::nullopt;
-+        selection.setURIList(uriList);
-+    }
-+
-+    bool hasImage;
-+    if (!decoder.decode(hasImage))
-+        return std::nullopt;
-+    if (hasImage) {
-+        RefPtr<Image> image;
-+        if (!decodeImage(decoder, image))
-+            return std::nullopt;
-+        selection.setImage(image.get());
-+    }
-+
-+    bool hasCustomData;
-+    if (!decoder.decode(hasCustomData))
-+        return std::nullopt;
-+    if (hasCustomData) {
-+        RefPtr<SharedBuffer> buffer;
-+        if (!decoder.decode(buffer))
-+            return std::nullopt;
-+        selection.setCustomData(Ref<SharedBuffer>(*buffer));
-+    }
-+
-+    bool canSmartReplace;
-+    if (!decoder.decode(canSmartReplace))
-+        return std::nullopt;
-+    selection.setCanSmartReplace(canSmartReplace);
-+
-+    return selection;
-+}
-+
-+}
-diff --git a/Source/WebKit/Shared/libwpe/ArgumentCodersWPE.h b/Source/WebKit/Shared/libwpe/ArgumentCodersWPE.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..789a0d7cf69704c8f665a9ed79348fbcbc1301c4
---- /dev/null
-+++ b/Source/WebKit/Shared/libwpe/ArgumentCodersWPE.h
-@@ -0,0 +1,41 @@
-+/*
-+ * Copyright (C) 2011 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#pragma once
-+
-+#include "ArgumentCoders.h"
-+
-+namespace WebCore {
-+class SelectionData;
++    return false;
 +}
 +
-+namespace IPC {
-+
-+template<> struct ArgumentCoder<WebCore::SelectionData> {
-+    static void encode(Encoder&, const WebCore::SelectionData&);
-+    static std::optional<WebCore::SelectionData> decode(Decoder&);
-+};
-+
-+} // namespace IPC
-diff --git a/Source/WebKit/Shared/win/WebEventFactory.cpp b/Source/WebKit/Shared/win/WebEventFactory.cpp
-index eae9e21a437c04cec91d1a4848038e11f4ee3e07..4fe63a9042d875555d9d1b934a9f53ea352e47aa 100644
---- a/Source/WebKit/Shared/win/WebEventFactory.cpp
-+++ b/Source/WebKit/Shared/win/WebEventFactory.cpp
-@@ -476,7 +476,7 @@ WebKeyboardEvent WebEventFactory::createWebKeyboardEvent(HWND hwnd, UINT message
- #if ENABLE(TOUCH_EVENTS)
- WebTouchEvent WebEventFactory::createWebTouchEvent()
+ AuxiliaryProcessMainCommon::AuxiliaryProcessMainCommon()
  {
--    return WebTouchEvent();
-+    return WebTouchEvent({ WebEventType::TouchMove, OptionSet<WebEventModifier> { }, WallTime::now()}, { });
+ #if ENABLE(BREAKPAD)
+@@ -94,6 +103,10 @@ WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
+     }
+ #endif
+ 
++// Playwright begin
++    if (hasArgument("--enable-shared-array-buffer", argc, argv))
++        m_parameters.shouldEnableSharedArrayBuffer = true;
++// Playwright end
+     return true;
  }
- #endif // ENABLE(TOUCH_EVENTS)
  
+diff --git a/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp b/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp
+index 053e9336017d8818b3cbea79ce7c145fd5c46274..5632498d6ef875df80fc68ec206a9d08e5d05a6f 100644
+--- a/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp
++++ b/Source/WebKit/Shared/win/AuxiliaryProcessMainWin.cpp
+@@ -47,6 +47,10 @@ bool AuxiliaryProcessMainCommon::parseCommandLine(int argc, char** argv)
+             m_parameters.connectionIdentifier = IPC::Connection::Identifier { reinterpret_cast<HANDLE>(parseIntegerAllowingTrailingJunk<uint64_t>(StringView::fromLatin1(argv[++i])).value_or(0)) };
+         else if (!strcmp(argv[i], "-processIdentifier") && i + 1 < argc)
+             m_parameters.processIdentifier = ObjectIdentifier<WebCore::ProcessIdentifierType>(parseIntegerAllowingTrailingJunk<uint64_t>(StringView::fromLatin1(argv[++i])).value_or(0));
++// Playwright begin
++        else if (!strcmp(argv[i], "-enable-shared-array-buffer"))
++            m_parameters.shouldEnableSharedArrayBuffer = true;
++// Playwright end
+         else if (!strcmp(argv[i], "-configure-jsc-for-testing"))
+             JSC::Config::configureForTesting();
+         else if (!strcmp(argv[i], "-disable-jit"))
 diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
-index d3b9afee939c3ec362f48851865da60251a5700f..fe0c3cc89c0823ed145eb1c374edd13239f48ee7 100644
+index bd7ec1f455c83cb4d24185099b6c7f569e612a33..cf4183ca9b2bb85b00bb58a4bc0c4d6b6f44af76 100644
 --- a/Source/WebKit/Sources.txt
 +++ b/Source/WebKit/Sources.txt
-@@ -379,6 +379,7 @@ Shared/XR/XRDeviceProxy.cpp
+@@ -392,6 +392,7 @@ UIProcess/AboutSchemeHandler.cpp
  UIProcess/AuxiliaryProcessProxy.cpp
  UIProcess/BackgroundProcessResponsivenessTimer.cpp
  UIProcess/BrowsingContextGroup.cpp
@@ -9781,7 +8958,7 @@ index d3b9afee939c3ec362f48851865da60251a5700f..fe0c3cc89c0823ed145eb1c374edd132
  UIProcess/DeviceIdHashSaltStorage.cpp
  UIProcess/DisplayLink.cpp
  UIProcess/DisplayLinkProcessProxyClient.cpp
-@@ -388,16 +389,20 @@ UIProcess/FrameLoadState.cpp
+@@ -401,16 +402,20 @@ UIProcess/FrameLoadState.cpp
  UIProcess/FrameProcess.cpp
  UIProcess/GeolocationPermissionRequestManagerProxy.cpp
  UIProcess/GeolocationPermissionRequestProxy.cpp
@@ -9800,9 +8977,9 @@ index d3b9afee939c3ec362f48851865da60251a5700f..fe0c3cc89c0823ed145eb1c374edd132
  UIProcess/ProvisionalPageProxy.cpp
 +UIProcess/RemoteInspectorPipe.cpp
  UIProcess/RemotePageDrawingAreaProxy.cpp
+ UIProcess/RemotePageFullscreenManagerProxy.cpp
  UIProcess/RemotePageProxy.cpp
- UIProcess/ResponsivenessTimer.cpp
-@@ -441,6 +446,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
+@@ -453,6 +458,8 @@ UIProcess/WebOpenPanelResultListenerProxy.cpp
  UIProcess/WebPageDiagnosticLoggingClient.cpp
  UIProcess/WebPageGroup.cpp
  UIProcess/WebPageInjectedBundleClient.cpp
@@ -9810,12 +8987,10 @@ index d3b9afee939c3ec362f48851865da60251a5700f..fe0c3cc89c0823ed145eb1c374edd132
 +UIProcess/WebPageInspectorInputAgent.cpp
  UIProcess/WebPageProxy.cpp
  UIProcess/WebPageProxyMessageReceiverRegistration.cpp
- UIProcess/WebPasteboardProxy.cpp
-@@ -576,7 +583,11 @@ UIProcess/Inspector/WebInspectorUtilities.cpp
- UIProcess/Inspector/WebPageDebuggable.cpp
+ UIProcess/WebPageProxyTesting.cpp
+@@ -604,6 +611,9 @@ UIProcess/Inspector/WebPageDebuggable.cpp
  UIProcess/Inspector/WebPageInspectorController.cpp
  
-+UIProcess/Inspector/Agents/CairoJpegEncoder.cpp
  UIProcess/Inspector/Agents/InspectorBrowserAgent.cpp
 +UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
 +UIProcess/Inspector/Agents/ScreencastEncoder.cpp
@@ -9824,10 +8999,10 @@ index d3b9afee939c3ec362f48851865da60251a5700f..fe0c3cc89c0823ed145eb1c374edd132
  UIProcess/Media/AudioSessionRoutingArbitratorProxy.cpp
  UIProcess/Media/MediaUsageManager.cpp
 diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
-index 8dc390feda97fbe8e80e0bdfd62b682be36c81e5..9dee9867202c5e63e81dec992fa348fd16a557d8 100644
+index c146d8baabb0bc80396dc07d7cde88207ef02efa..b13cb0a6e8e10dcf3a068a4bde97536d490f3b52 100644
 --- a/Source/WebKit/SourcesCocoa.txt
 +++ b/Source/WebKit/SourcesCocoa.txt
-@@ -271,6 +271,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm
+@@ -272,6 +272,7 @@ UIProcess/API/Cocoa/_WKArchiveExclusionRule.mm
  UIProcess/API/Cocoa/_WKAttachment.mm
  UIProcess/API/Cocoa/_WKAutomationSession.mm
  UIProcess/API/Cocoa/_WKAutomationSessionConfiguration.mm
@@ -9835,7 +9010,7 @@ index 8dc390feda97fbe8e80e0bdfd62b682be36c81e5..9dee9867202c5e63e81dec992fa348fd
  UIProcess/API/Cocoa/_WKContentRuleListAction.mm
  UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
  UIProcess/API/Cocoa/_WKCustomHeaderFields.mm @no-unify
-@@ -455,6 +456,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
+@@ -469,6 +470,7 @@ UIProcess/Inspector/ios/WKInspectorHighlightView.mm
  UIProcess/Inspector/ios/WKInspectorNodeSearchGestureRecognizer.mm
  
  UIProcess/Inspector/mac/RemoteWebInspectorUIProxyMac.mm
@@ -9844,10 +9019,10 @@ index 8dc390feda97fbe8e80e0bdfd62b682be36c81e5..9dee9867202c5e63e81dec992fa348fd
  UIProcess/Inspector/mac/WKInspectorResourceURLSchemeHandler.mm
  UIProcess/Inspector/mac/WKInspectorViewController.mm
 diff --git a/Source/WebKit/SourcesGTK.txt b/Source/WebKit/SourcesGTK.txt
-index bec1e568f9ad00bfff883318692d9c404e012e2c..de45461d0851248f44973780b07d0ba7692fd578 100644
+index 5bf7f2a0c8d6e6d32a2845885b943064618fe951..9d8bfa3d2cf0920dcfdae5b95563c5cab5e755f4 100644
 --- a/Source/WebKit/SourcesGTK.txt
 +++ b/Source/WebKit/SourcesGTK.txt
-@@ -134,6 +134,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
+@@ -122,6 +122,7 @@ UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
  UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify
  UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify
  UIProcess/API/glib/WebKitClipboardPermissionRequest.cpp @no-unify
@@ -9855,23 +9030,23 @@ index bec1e568f9ad00bfff883318692d9c404e012e2c..de45461d0851248f44973780b07d0ba7
  UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
  UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
  UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -262,6 +263,7 @@ UIProcess/glib/DisplayLinkGLib.cpp
- UIProcess/glib/DisplayVBlankMonitor.cpp
+@@ -253,6 +254,7 @@ UIProcess/glib/DisplayVBlankMonitor.cpp
  UIProcess/glib/DisplayVBlankMonitorDRM.cpp
  UIProcess/glib/DisplayVBlankMonitorTimer.cpp
+ UIProcess/glib/FenceMonitor.cpp
 +UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp
  UIProcess/glib/ScreenManager.cpp
+ UIProcess/glib/SystemSettingsManagerProxy.cpp
  UIProcess/glib/WebPageProxyGLib.cpp
- UIProcess/glib/WebProcessPoolGLib.cpp
-@@ -277,6 +279,7 @@ UIProcess/gtk/ClipboardGtk4.cpp @no-unify
+@@ -271,6 +273,7 @@ UIProcess/gtk/DisplayX11.cpp @no-unify
+ UIProcess/gtk/DisplayWayland.cpp @no-unify
  UIProcess/gtk/WebDateTimePickerGtk.cpp
- UIProcess/gtk/GtkSettingsManager.cpp
  UIProcess/gtk/HardwareAccelerationManager.cpp
 +UIProcess/gtk/InspectorTargetProxyGtk.cpp
  UIProcess/gtk/KeyBindingTranslator.cpp
  UIProcess/gtk/PointerLockManager.cpp @no-unify
  UIProcess/gtk/PointerLockManagerWayland.cpp @no-unify
-@@ -289,6 +292,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
+@@ -284,6 +287,8 @@ UIProcess/gtk/ViewGestureControllerGtk.cpp
  UIProcess/gtk/WebColorPickerGtk.cpp
  UIProcess/gtk/WebContextMenuProxyGtk.cpp
  UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp
@@ -9881,18 +9056,10 @@ index bec1e568f9ad00bfff883318692d9c404e012e2c..de45461d0851248f44973780b07d0ba7
  UIProcess/gtk/WebPasteboardProxyGtk.cpp
  UIProcess/gtk/WebPopupMenuProxyGtk.cpp
 diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
-index 3eefd6cc3eb22329583901518442756d728378a1..45f2092be52d2d347660972a6723741176ff4b42 100644
+index 8569ab98ebf37a8e25c9e79f99a26c76b175d2c8..48c634968f8dcf42ca2690c07aa1b2c4c83d5884 100644
 --- a/Source/WebKit/SourcesWPE.txt
 +++ b/Source/WebKit/SourcesWPE.txt
-@@ -86,6 +86,7 @@ Shared/glib/ProcessExecutablePathGLib.cpp
- Shared/glib/UserMessage.cpp
- Shared/glib/WebContextMenuItemGlib.cpp
- 
-+Shared/libwpe/ArgumentCodersWPE.cpp
- Shared/libwpe/NativeWebKeyboardEventLibWPE.cpp
- Shared/libwpe/NativeWebMouseEventLibWPE.cpp
- Shared/libwpe/NativeWebTouchEventLibWPE.cpp
-@@ -136,6 +137,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
+@@ -124,6 +124,7 @@ UIProcess/API/glib/WebKitAuthenticationRequest.cpp @no-unify
  UIProcess/API/glib/WebKitAutomationSession.cpp @no-unify
  UIProcess/API/glib/WebKitBackForwardList.cpp @no-unify
  UIProcess/API/glib/WebKitBackForwardListItem.cpp @no-unify
@@ -9900,7 +9067,7 @@ index 3eefd6cc3eb22329583901518442756d728378a1..45f2092be52d2d347660972a67237411
  UIProcess/API/glib/WebKitContextMenuClient.cpp @no-unify
  UIProcess/API/glib/WebKitCookieManager.cpp @no-unify
  UIProcess/API/glib/WebKitCredential.cpp @no-unify
-@@ -169,6 +171,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
+@@ -157,6 +158,7 @@ UIProcess/API/glib/WebKitOptionMenu.cpp @no-unify
  UIProcess/API/glib/WebKitOptionMenuItem.cpp @no-unify
  UIProcess/API/glib/WebKitPermissionRequest.cpp @no-unify
  UIProcess/API/glib/WebKitPermissionStateQuery.cpp @no-unify
@@ -9908,36 +9075,30 @@ index 3eefd6cc3eb22329583901518442756d728378a1..45f2092be52d2d347660972a67237411
  UIProcess/API/glib/WebKitPolicyDecision.cpp @no-unify
  UIProcess/API/glib/WebKitPrivate.cpp @no-unify
  UIProcess/API/glib/WebKitProtocolHandler.cpp @no-unify
-@@ -205,6 +208,7 @@ UIProcess/API/soup/HTTPCookieStoreSoup.cpp
- UIProcess/API/wpe/InputMethodFilterWPE.cpp @no-unify
- UIProcess/API/wpe/PageClientImpl.cpp @no-unify
- UIProcess/API/wpe/WebKitColor.cpp @no-unify
-+UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp @no-unify
- UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp @no-unify
- UIProcess/API/wpe/WebKitPopupMenu.cpp @no-unify
- UIProcess/API/wpe/WebKitRectangle.cpp @no-unify
-@@ -228,6 +232,7 @@ UIProcess/glib/DisplayLinkGLib.cpp
- UIProcess/glib/DisplayVBlankMonitor.cpp
+@@ -225,6 +227,7 @@ UIProcess/glib/DisplayVBlankMonitor.cpp
  UIProcess/glib/DisplayVBlankMonitorDRM.cpp
  UIProcess/glib/DisplayVBlankMonitorTimer.cpp
+ UIProcess/glib/FenceMonitor.cpp
 +UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp
  UIProcess/glib/ScreenManager.cpp
+ UIProcess/glib/SystemSettingsManagerProxy.cpp
  UIProcess/glib/WebPageProxyGLib.cpp
- UIProcess/glib/WebProcessPoolGLib.cpp
-@@ -258,7 +263,12 @@ UIProcess/linux/MemoryPressureMonitor.cpp
+@@ -256,8 +259,14 @@ UIProcess/linux/MemoryPressureMonitor.cpp
  UIProcess/soup/WebProcessPoolSoup.cpp
  
  UIProcess/wpe/AcceleratedBackingStoreDMABuf.cpp
 +UIProcess/wpe/InspectorTargetProxyWPE.cpp
  UIProcess/wpe/ScreenManagerWPE.cpp
+ UIProcess/wpe/SystemSettingsManagerProxyWPE.cpp
 +UIProcess/wpe/WebColorPickerWPE.cpp
++UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp
 +UIProcess/wpe/WebDateTimePickerWPE.cpp
 +UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
 +UIProcess/wpe/WebPageInspectorInputAgentWPE.cpp
  UIProcess/wpe/WebPageProxyWPE.cpp
+ UIProcess/wpe/WebPasteboardProxyWPE.cpp
  UIProcess/wpe/WebPreferencesWPE.cpp
- 
-@@ -282,6 +292,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp
+@@ -285,6 +294,8 @@ WebProcess/WebCoreSupport/glib/WebEditorClientGLib.cpp
  
  WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
  
@@ -9946,8 +9107,47 @@ index 3eefd6cc3eb22329583901518442756d728378a1..45f2092be52d2d347660972a67237411
  WebProcess/WebCoreSupport/wpe/WebEditorClientWPE.cpp
  
  WebProcess/WebPage/AcceleratedSurface.cpp
+diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
+index 64952ccd02d9db28c2e1388ce7713703430c8212..c616408e2d09f6d5d98dfd609a51ad080ebb990c 100644
+--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
++++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
+@@ -268,6 +268,11 @@ WebPageProxy* PageConfiguration::relatedPage() const
+     return m_data.relatedPage.get();
+ }
+ 
++WebKit::WebPageProxy* PageConfiguration::openerPageForInspector() const
++{
++    return m_data.openerPageForInspector.get();
++}
++
+ WebPageProxy* PageConfiguration::pageToCloneSessionStorageFrom() const
+ {
+     return m_data.pageToCloneSessionStorageFrom.get();
+diff --git a/Source/WebKit/UIProcess/API/APIPageConfiguration.h b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
+index ade928c03e6e504dc485e75427c56edfb0b1a4a4..1eef15db8aaecea65be8ec3be5d9be903055e840 100644
+--- a/Source/WebKit/UIProcess/API/APIPageConfiguration.h
++++ b/Source/WebKit/UIProcess/API/APIPageConfiguration.h
+@@ -159,6 +159,10 @@ public:
+     WebKit::WebPageProxy* relatedPage() const;
+     void setRelatedPage(WeakPtr<WebKit::WebPageProxy>&& relatedPage) { m_data.relatedPage = WTFMove(relatedPage); }
+ 
++    // This is similar to relatedPage(), but it is also set for noopener links.
++    WebKit::WebPageProxy* openerPageForInspector() const;
++    void setOpenerPageForInspector(WeakPtr<WebKit::WebPageProxy>&& openerPageForInspector) { m_data.openerPageForInspector = WTFMove(openerPageForInspector); }
++
+     WebKit::WebPageProxy* pageToCloneSessionStorageFrom() const;
+     void setPageToCloneSessionStorageFrom(WeakPtr<WebKit::WebPageProxy>&&);
+ 
+@@ -515,6 +519,7 @@ private:
+ #endif
+         RefPtr<WebKit::WebPageGroup> pageGroup;
+         WeakPtr<WebKit::WebPageProxy> relatedPage;
++        WeakPtr<WebKit::WebPageProxy> openerPageForInspector;
+         Box<std::optional<OpenerInfo>> openerInfo;
+         WebCore::Site openedSite;
+         WTF::String openedMainFrameName;
 diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
-index d561c07ae53a60c6503a355ed620bc289a2220ae..b950ac5190d8d05c66718c545c76d53d45cfff9d 100644
+index e256b905bf9727aa7c8a48012237a6a6bc9acdbc..4e855c441af6f235f0fd8dfdd57b9bd6e4646492 100644
 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
 +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
 @@ -52,6 +52,10 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
@@ -9962,7 +9162,7 @@ index d561c07ae53a60c6503a355ed620bc289a2220ae..b950ac5190d8d05c66718c545c76d53d
      copy->m_shouldTakeUIBackgroundAssertion = this->m_shouldTakeUIBackgroundAssertion;
      copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess;
 diff --git a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
-index 32ef9bd308e520f5ac7173639c8b23ea91cde037..7a80553c2d91b9236f563fa1b76aa8a50b8545ba 100644
+index af4944e5a5d373bc51995b50d1ea7c70f64ef1b3..403cfdeda26db2b648e32aa0e5f3ef6e076634f6 100644
 --- a/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
 +++ b/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
 @@ -96,6 +96,16 @@ public:
@@ -9982,7 +9182,7 @@ index 32ef9bd308e520f5ac7173639c8b23ea91cde037..7a80553c2d91b9236f563fa1b76aa8a5
      bool alwaysRunsAtBackgroundPriority() const { return m_alwaysRunsAtBackgroundPriority; }
      void setAlwaysRunsAtBackgroundPriority(bool alwaysRunsAtBackgroundPriority) { m_alwaysRunsAtBackgroundPriority = alwaysRunsAtBackgroundPriority; }
  
-@@ -173,6 +183,10 @@ private:
+@@ -178,6 +188,10 @@ private:
      bool m_ignoreSynchronousMessagingTimeoutsForTesting { false };
      bool m_attrStyleEnabled { false };
      bool m_shouldThrowExceptionForGlobalConstantRedeclaration { true };
@@ -9994,7 +9194,7 @@ index 32ef9bd308e520f5ac7173639c8b23ea91cde037..7a80553c2d91b9236f563fa1b76aa8a5
      bool m_shouldTakeUIBackgroundAssertion { true };
      bool m_shouldCaptureDisplayInUIProcess { DEFAULT_CAPTURE_DISPLAY_IN_UI_PROCESS };
 diff --git a/Source/WebKit/UIProcess/API/APIUIClient.h b/Source/WebKit/UIProcess/API/APIUIClient.h
-index f8baf3b5cbd1613da54c001cbff573125742358d..be628650e5562978187f8cc1d0afed8849a083b2 100644
+index b0450278b8949985df9f39c7d7a5adbaecb55afe..ac80a31058249d467d21e64f5a053cf0f0012fe1 100644
 --- a/Source/WebKit/UIProcess/API/APIUIClient.h
 +++ b/Source/WebKit/UIProcess/API/APIUIClient.h
 @@ -114,6 +114,7 @@ public:
@@ -10006,7 +9206,7 @@ index f8baf3b5cbd1613da54c001cbff573125742358d..be628650e5562978187f8cc1d0afed88
      virtual void setStatusText(WebKit::WebPageProxy*, const WTF::String&) { }
      virtual void mouseDidMoveOverElement(WebKit::WebPageProxy&, const WebKit::WebHitTestResultData&, OptionSet<WebKit::WebEventModifier>, Object*) { }
 diff --git a/Source/WebKit/UIProcess/API/C/WKInspector.cpp b/Source/WebKit/UIProcess/API/C/WKInspector.cpp
-index 990b0e5ebad19fdaf1b0036585be2ed88bc125d2..9f1931dbdd8c70d3637a2d71406b5968896037f2 100644
+index bba39f6228ae9cc67c68526c75676648cf3917ef..f1c6f6f14ef0d599bd05410edbe9360e75d6d77a 100644
 --- a/Source/WebKit/UIProcess/API/C/WKInspector.cpp
 +++ b/Source/WebKit/UIProcess/API/C/WKInspector.cpp
 @@ -28,6 +28,11 @@
@@ -10049,11 +9249,11 @@ index 026121d114c5fcad84c1396be8d692625beaa3bd..edd6e5cae033124c589959a42522fde0
  }
  #endif
 diff --git a/Source/WebKit/UIProcess/API/C/WKPage.cpp b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-index 81d4f44bd1f4201cb0ddd9d4b8ef210862551cdb..6e750c6e1f4624b5cf54a642b831ab10d4448649 100644
+index 908163888f737cb72569f6ff36dae276a51118eb..636ccf3834aaa47328388a008dbc2bf755ecdf70 100644
 --- a/Source/WebKit/UIProcess/API/C/WKPage.cpp
 +++ b/Source/WebKit/UIProcess/API/C/WKPage.cpp
-@@ -1780,6 +1780,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
-             completionHandler(String());
+@@ -1935,6 +1935,13 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+             m_client.addMessageToConsole(toAPI(&page), toAPI(message.impl()), m_client.base.clientInfo);
          }
  
 +        void handleJavaScriptDialog(WebPageProxy& page, bool accept, const String& value) final {
@@ -10066,7 +9266,7 @@ index 81d4f44bd1f4201cb0ddd9d4b8ef210862551cdb..6e750c6e1f4624b5cf54a642b831ab10
          void setStatusText(WebPageProxy* page, const String& text) final
          {
              if (!m_client.setStatusText)
-@@ -1809,6 +1816,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
+@@ -1964,6 +1971,8 @@ void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient
          {
              if (!m_client.didNotHandleKeyEvent)
                  return;
@@ -10076,7 +9276,7 @@ index 81d4f44bd1f4201cb0ddd9d4b8ef210862551cdb..6e750c6e1f4624b5cf54a642b831ab10
          }
  
 diff --git a/Source/WebKit/UIProcess/API/C/WKPageUIClient.h b/Source/WebKit/UIProcess/API/C/WKPageUIClient.h
-index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4ae00b7497 100644
+index fc43c44a85a0fc6bf5f8c643bd120a16ce762914..ee86fd213d25682f9b6553ec7da99bc8a812212b 100644
 --- a/Source/WebKit/UIProcess/API/C/WKPageUIClient.h
 +++ b/Source/WebKit/UIProcess/API/C/WKPageUIClient.h
 @@ -98,6 +98,7 @@ typedef void (*WKPageRunBeforeUnloadConfirmPanelCallback)(WKPageRef page, WKStri
@@ -10087,7 +9287,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
  typedef void (*WKPageRequestStorageAccessConfirmCallback)(WKPageRef page, WKFrameRef frame, WKStringRef requestingDomain, WKStringRef currentDomain, WKPageRequestStorageAccessConfirmResultListenerRef listener, const void *clientInfo);
  typedef void (*WKPageTakeFocusCallback)(WKPageRef page, WKFocusDirection direction, const void *clientInfo);
  typedef void (*WKPageFocusCallback)(WKPageRef page, const void *clientInfo);
-@@ -1364,6 +1365,7 @@ typedef struct WKPageUIClientV14 {
+@@ -1365,6 +1366,7 @@ typedef struct WKPageUIClientV14 {
  
      // Version 14.
      WKPageRunWebAuthenticationPanelCallback                             runWebAuthenticationPanel;
@@ -10095,7 +9295,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
  } WKPageUIClientV14;
  
  typedef struct WKPageUIClientV15 {
-@@ -1471,6 +1473,7 @@ typedef struct WKPageUIClientV15 {
+@@ -1472,6 +1474,7 @@ typedef struct WKPageUIClientV15 {
  
      // Version 14.
      WKPageRunWebAuthenticationPanelCallback                             runWebAuthenticationPanel;
@@ -10103,7 +9303,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
  
      // Version 15.
      WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback     decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1582,6 +1585,7 @@ typedef struct WKPageUIClientV16 {
+@@ -1583,6 +1586,7 @@ typedef struct WKPageUIClientV16 {
  
      // Version 14.
      WKPageRunWebAuthenticationPanelCallback                             runWebAuthenticationPanel;
@@ -10111,7 +9311,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
  
      // Version 15.
      WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback     decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1696,6 +1700,7 @@ typedef struct WKPageUIClientV17 {
+@@ -1697,6 +1701,7 @@ typedef struct WKPageUIClientV17 {
  
      // Version 14.
      WKPageRunWebAuthenticationPanelCallback                             runWebAuthenticationPanel;
@@ -10119,7 +9319,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
  
      // Version 15.
      WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback     decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1810,6 +1815,7 @@ typedef struct WKPageUIClientV18 {
+@@ -1811,6 +1816,7 @@ typedef struct WKPageUIClientV18 {
  
      // Version 14.
      WKPageRunWebAuthenticationPanelCallback                             runWebAuthenticationPanel;
@@ -10127,7 +9327,7 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
  
      // Version 15.
      WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback     decidePolicyForSpeechRecognitionPermissionRequest;
-@@ -1926,6 +1932,7 @@ typedef struct WKPageUIClientV19 {
+@@ -1927,6 +1933,7 @@ typedef struct WKPageUIClientV19 {
  
      // Version 14.
      WKPageRunWebAuthenticationPanelCallback                             runWebAuthenticationPanel;
@@ -10136,10 +9336,10 @@ index 1484f064ec89ee8c25c35df9f0a4462896699415..0622f4d5fc9144b9059395d9d0730a4a
      // Version 15.
      WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback     decidePolicyForSpeechRecognitionPermissionRequest;
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
-index 857afb1b892c2ee7327808f3dab0cff441c92c52..332bb2e687d6b97fd11f1366ade5b17841bcae58 100644
+index f2ee51f3f5dc9c55bcfe96d5bd52268957cc5e1a..472eb2530e812d50ecc38d9bfaa5bbe9948bad68 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm
-@@ -702,6 +702,16 @@ - (void)_setMediaCaptureRequiresSecureConnection:(BOOL)requiresSecureConnection
+@@ -712,6 +712,16 @@ - (void)_setMediaCaptureRequiresSecureConnection:(BOOL)requiresSecureConnection
      _preferences->setMediaCaptureRequiresSecureConnection(requiresSecureConnection);
  }
  
@@ -10153,11 +9353,11 @@ index 857afb1b892c2ee7327808f3dab0cff441c92c52..332bb2e687d6b97fd11f1366ade5b178
 +    _preferences->setAlternateWebMPlayerEnabled(enabled);
 +}
 +
- - (double)_inactiveMediaCaptureSteamRepromptIntervalInMinutes
+ - (double)_inactiveMediaCaptureStreamRepromptIntervalInMinutes
  {
-     return _preferences->inactiveMediaCaptureSteamRepromptIntervalInMinutes();
+     return _preferences->inactiveMediaCaptureStreamRepromptIntervalInMinutes();
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
-index 48e4b28374b93173df1be63444aa5ca3abd626d6..194b2099be032c800a463891976364ab7cd74890 100644
+index 41525c8980f698aa4326e7d4d232311cee2c43d5..1f1745431c6cc7af66b47dd5d015c52389626e6f 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h
 @@ -119,6 +119,7 @@ typedef NS_ENUM(NSInteger, _WKPitchCorrectionAlgorithm) {
@@ -10167,14 +9367,14 @@ index 48e4b28374b93173df1be63444aa5ca3abd626d6..194b2099be032c800a463891976364ab
 +@property (nonatomic, setter=_setAlternateWebMPlayerEnabled:) BOOL _alternateWebMPlayerEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
  @property (nonatomic, setter=_setEnumeratingAllNetworkInterfacesEnabled:) BOOL _enumeratingAllNetworkInterfacesEnabled WK_API_AVAILABLE(macos(10.13), ios(11.0));
  @property (nonatomic, setter=_setICECandidateFilteringEnabled:) BOOL _iceCandidateFilteringEnabled WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
- @property (nonatomic, setter=_setInactiveMediaCaptureSteamRepromptIntervalInMinutes:) double _inactiveMediaCaptureSteamRepromptIntervalInMinutes WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
+ @property (nonatomic, setter=_setInactiveMediaCaptureStreamRepromptIntervalInMinutes:) double _inactiveMediaCaptureStreamRepromptIntervalInMinutes WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
-index 24b33cf16d46efce11a30032925600b97e64c65d..422355368191b9189b6283338bea2244b2fddd9e 100644
+index 2ce017d213d7875eee965e554af6befb5a3c3908..79b11310d358d3edc49e30420728e1eb905309cb 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegate.h
-@@ -148,6 +148,12 @@ typedef NS_ENUM(NSInteger, WKDialogResult) {
+@@ -153,6 +153,12 @@ WK_SWIFT_UI_ACTOR
   */
- - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * _Nullable result))completionHandler;
+ - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(WK_SWIFT_UI_ACTOR void (^)(NSString * _Nullable result))completionHandler;
  
 +/*! @abstract Handle a JavaScript dialog.
 + @param webView The web view invoking the delegate method.
@@ -10186,18 +9386,10 @@ index 24b33cf16d46efce11a30032925600b97e64c65d..422355368191b9189b6283338bea2244
  /*! @abstract A delegate to request permission for microphone audio and camera video access.
   @param webView The web view invoking the delegate method.
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h
-index 4f5956098f0e83c2e9c421c97056b6718b124a3c..1eb51dd70dc6ef1b7e95a09118aa816b4f77e2d7 100644
+index 930357ac3469195e9f33d5ffce92777018bb0b13..f62555ec562f8416976d31692e8fb1751a04d458 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.h
-@@ -24,7 +24,6 @@
-  */
- 
- #import <WebKit/WKFoundation.h>
--
- #import <WebKit/WKWebsiteDataRecord.h>
- 
- #if __has_include(<Network/proxy_config.h>)
-@@ -124,6 +123,8 @@ WK_CLASS_AVAILABLE(macos(10.11), ios(9.0))
+@@ -138,6 +138,8 @@ WK_CLASS_AVAILABLE(macos(10.11), ios(9.0))
  #endif
  #endif
  
@@ -10207,18 +9399,18 @@ index 4f5956098f0e83c2e9c421c97056b6718b124a3c..1eb51dd70dc6ef1b7e95a09118aa816b
  
  NS_ASSUME_NONNULL_END
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
-index 350914dd5352683024925bb820148ba2582cd0c7..ac9767ff4920e066b11da4556b2df77debd18a1f 100644
+index 7e793fe01f479b9135c54253af2114ce61924fa0..d22dc512f73af0e4152b4503866ba2a4cf5c3e5e 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
 +++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm
-@@ -51,6 +51,7 @@
- #import "_WKResourceLoadStatisticsThirdPartyInternal.h"
+@@ -55,6 +55,7 @@
+ #import "_WKWebPushActionInternal.h"
  #import "_WKWebsiteDataStoreConfigurationInternal.h"
  #import "_WKWebsiteDataStoreDelegate.h"
 +#import <pal/SessionID.h>
  #import <WebCore/Credential.h>
  #import <WebCore/RegistrableDomain.h>
  #import <WebCore/ResourceResponse.h>
-@@ -446,6 +447,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple
+@@ -523,6 +524,11 @@ - (void)removeDataOfTypes:(NSSet *)dataTypes modifiedSince:(NSDate *)date comple
      });
  }
  
@@ -10358,7 +9550,7 @@ index 0000000000000000000000000000000000000000..69eb9c6aa30beb8ea21a0ef647e46304
 +}
 +@end
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
-index da0374cf56919b7324a90586d0a7009bfe895be1..1a6f5ff024592a6c3a5c7018045e0a5015aac2c0 100644
+index 426c7cbc897e22fd2e962dd3744959975d6ae6a0..f7a52359d7d42f970ef424b6c702b0ec1121a902 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
 +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
 @@ -67,6 +67,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
@@ -10370,7 +9562,7 @@ index da0374cf56919b7324a90586d0a7009bfe895be1..1a6f5ff024592a6c3a5c7018045e0a50
  @property (nonatomic) BOOL processSwapsOnNavigationWithinSameNonHTTPFamilyProtocol WK_API_AVAILABLE(macos(12.0), ios(15.0));
  @property (nonatomic) BOOL prewarmsProcessesAutomatically WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
-index df71be1e30c4a13fe9565d309c7bbfb82e049d06..8424a471e7841d300174aa54143578f8d18ad15f 100644
+index 7ccfd9a46cd024c8f6644594b9d0cde8ae7e60db..921ec683dce77583f24d27a0b1b6f478242dfb42 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
 +++ b/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
 @@ -241,6 +241,16 @@ - (BOOL)processSwapsOnNavigation
@@ -10390,18 +9582,6 @@ index df71be1e30c4a13fe9565d309c7bbfb82e049d06..8424a471e7841d300174aa54143578f8
  - (void)setPrewarmsProcessesAutomatically:(BOOL)prewarms
  {
      _processPoolConfiguration->setIsAutomaticProcessWarmingEnabled(prewarms);
-diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
-index 500a748e78bdcd418b18fb4de416b95e9042d2c4..63d4ea68cbc711ba8f12e126d0f6b78aad5f5155 100644
---- a/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
-+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.mm
-@@ -24,6 +24,7 @@
-  */
- 
- #import "config.h"
-+#import "WKWebViewPrivate.h"
- #import "_WKRemoteWebInspectorViewControllerInternal.h"
- 
- #if PLATFORM(MAC)
 diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h
 index 4974e14214e2bb3e982325b885bab33e54f83998..cacdf8c71fab248d38d2faf03f7affdcfed1ef62 100644
 --- a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h
@@ -10414,18 +9594,20 @@ index 4974e14214e2bb3e982325b885bab33e54f83998..cacdf8c71fab248d38d2faf03f7affdc
  
  typedef NS_ENUM(NSInteger, _WKUserStyleLevel) {
      _WKUserStyleUserLevel,
-diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm
-index 383bd33cc0b53ea049d2e6fb1bf338d584caeb18..e29ba10dceced9d115b09e014cc086c5453e33fe 100644
---- a/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm
-+++ b/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm
-@@ -35,6 +35,7 @@
- #import "WebPageProxy.h"
- #import "_WKUserContentWorldInternal.h"
+diff --git a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
+index d139d35f09a999e2c85f48799a399d791d421ffd..f79c073291c6071c566220a40f7dd4bbc57192a1 100644
+--- a/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
++++ b/Source/WebKit/UIProcess/API/Cocoa/_WKWebPushSubscriptionData.mm
+@@ -28,6 +28,9 @@
  #import <WebCore/WebCoreObjCExtras.h>
-+#import <WebKit/WKContentWorldInternal.h>
- #import <wtf/cocoa/VectorCocoa.h>
+ #import <wtf/cocoa/SpanCocoa.h>
+ 
++#import <WebCore/WebCoreObjCExtras.h>
++#import <wtf/cocoa/SpanCocoa.h>
++
+ @implementation _WKWebPushSubscriptionData
  
- @implementation _WKUserStyleSheet
+ - (void)dealloc
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspector.cpp b/Source/WebKit/UIProcess/API/glib/WebKitBrowserInspector.cpp
 new file mode 100644
 index 0000000000000000000000000000000000000000..575245fc1f279a75f7e74c26652cf772a2fc95b7
@@ -10629,10 +9811,10 @@ index 0000000000000000000000000000000000000000..e0b1da48465c850f541532ed961d1b77
 +WebKit::WebPageProxy* webkitBrowserInspectorCreateNewPageInContext(WebKitWebContext*);
 +void webkitBrowserInspectorQuitApplication();
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
-index d6b7f61b141870b4af00fdd0a104dc6cf382fc36..bacc29f875ec5dccb65f7653a772bb99ceee2129 100644
+index ef24e41f2c62e77e701a6e2b698c60004eaf0789..fd332a5b07f1dea7792eeee3bd9b5efb48afc0c5 100644
 --- a/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
 +++ b/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp
-@@ -95,6 +95,10 @@ private:
+@@ -101,6 +101,10 @@ private:
          page.makeViewBlankIfUnpaintedSinceLastLoadCommit();
          webkitWebViewRunJavaScriptPrompt(m_webView, message.utf8(), defaultValue.utf8(), WTFMove(completionHandler));
      }
@@ -10644,10 +9826,10 @@ index d6b7f61b141870b4af00fdd0a104dc6cf382fc36..bacc29f875ec5dccb65f7653a772bb99
      bool canRunBeforeUnloadConfirmPanel() const final { return true; }
  
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-index 14c655bdd47bfb87d548e8c4ddd826e6bbb5d7c5..05440a65021ff70887fc88dc5fbfff71f4990957 100644
+index 5479cf466e1ba77ede37ff980e78bee85bbb094c..224c04a4bd9de6ad5661b15071c1267a57430547 100644
 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
 +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-@@ -415,10 +415,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
+@@ -423,10 +423,19 @@ static void webkitWebContextSetProperty(GObject* object, guint propID, const GVa
      }
  }
  
@@ -10667,7 +9849,7 @@ index 14c655bdd47bfb87d548e8c4ddd826e6bbb5d7c5..05440a65021ff70887fc88dc5fbfff71
      GUniquePtr<char> bundleFilename(g_build_filename(injectedBundleDirectory(), INJECTED_BUNDLE_FILENAME, nullptr));
  
      WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
-@@ -475,6 +484,8 @@ static void webkitWebContextConstructed(GObject* object)
+@@ -485,6 +494,8 @@ static void webkitWebContextConstructed(GObject* object)
  
  static void webkitWebContextDispose(GObject* object)
  {
@@ -10676,7 +9858,7 @@ index 14c655bdd47bfb87d548e8c4ddd826e6bbb5d7c5..05440a65021ff70887fc88dc5fbfff71
      WebKitWebContextPrivate* priv = WEBKIT_WEB_CONTEXT(object)->priv;
      if (!priv->clientsDetached) {
          priv->clientsDetached = true;
-@@ -934,6 +945,11 @@ WebKitNetworkSession* webkit_web_context_get_network_session_for_automation(WebK
+@@ -946,6 +957,11 @@ WebKitNetworkSession* webkit_web_context_get_network_session_for_automation(WebK
      return nullptr;
  #endif
  }
@@ -10689,7 +9871,7 @@ index 14c655bdd47bfb87d548e8c4ddd826e6bbb5d7c5..05440a65021ff70887fc88dc5fbfff71
  /**
   * webkit_web_context_set_cache_model:
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.h.in b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.h.in
-index fa559936ba819425cfca7ad0f26e9d373690180a..112eb9f64b9c08385eb9a7ac4d6815f574efed0e 100644
+index 15fe3e8e5652147ba54af266eda66b3962c074b9..d463fa78af375badb239c890da50ba1125e19de8 100644
 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.h.in
 +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.h.in
 @@ -161,6 +161,10 @@ webkit_web_context_set_automation_allowed           (WebKitWebContext
@@ -10704,7 +9886,7 @@ index fa559936ba819425cfca7ad0f26e9d373690180a..112eb9f64b9c08385eb9a7ac4d6815f5
  
  WEBKIT_API void
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h
-index e994309b097c1b140abfa4373fd2fafee46c05ec..6e0cc677a3bf33683ae8c89d12a4819144b3df89 100644
+index c1945fbe717a42afc1f51d64a80c7de3fa9009ba..ab63fe19b00ecbd64c9421e6eecad3e25cbb2361 100644
 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h
 +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h
 @@ -43,3 +43,4 @@ void webkitWebContextInitializeNotificationPermissions(WebKitWebContext*);
@@ -10713,10 +9895,10 @@ index e994309b097c1b140abfa4373fd2fafee46c05ec..6e0cc677a3bf33683ae8c89d12a48191
  #endif
 +int webkitWebContextExistingCount();
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-index 1e389f70c7b4722458cffbf4ac34b1d67efa4ba8..b9f5f22c8e866de1909240b72d23c06d7525d863 100644
+index df1381b577be94114401e1faaf1979183d82614f..fb8bb4c7676154bb284a06fc3f05d3b45805e938 100644
 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
 +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
-@@ -33,6 +33,7 @@
+@@ -39,6 +39,7 @@
  #include "WebContextMenuItem.h"
  #include "WebContextMenuItemData.h"
  #include "WebFrameProxy.h"
@@ -10724,23 +9906,7 @@ index 1e389f70c7b4722458cffbf4ac34b1d67efa4ba8..b9f5f22c8e866de1909240b72d23c06d
  #include "WebKitAuthenticationRequestPrivate.h"
  #include "WebKitBackForwardListPrivate.h"
  #include "WebKitContextMenuClient.h"
-@@ -50,6 +51,7 @@
- #include "WebKitNavigationClient.h"
- #include "WebKitNotificationPrivate.h"
- #include "WebKitPermissionStateQueryPrivate.h"
-+#include "WebKitPointerLockPermissionRequest.h"
- #include "WebKitPrivate.h"
- #include "WebKitResponsePolicyDecision.h"
- #include "WebKitScriptDialogPrivate.h"
-@@ -89,7 +91,6 @@
- #include "GtkSettingsManager.h"
- #include "WebKitFaviconDatabasePrivate.h"
- #include "WebKitInputMethodContextImplGtk.h"
--#include "WebKitPointerLockPermissionRequest.h"
- #include "WebKitPrintOperationPrivate.h"
- #include "WebKitWebInspectorPrivate.h"
- #include "WebKitWebViewBasePrivate.h"
-@@ -141,6 +142,7 @@ enum {
+@@ -152,6 +153,7 @@ enum {
      CLOSE,
  
      SCRIPT_DIALOG,
@@ -10748,29 +9914,35 @@ index 1e389f70c7b4722458cffbf4ac34b1d67efa4ba8..b9f5f22c8e866de1909240b72d23c06d
  
      DECIDE_POLICY,
      PERMISSION_REQUEST,
-@@ -494,6 +496,9 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
+@@ -520,6 +522,13 @@ GRefPtr<WebKitOptionMenu> WebKitWebViewClient::showOptionMenu(WebKitPopupMenu& p
  
  void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
  {
-+    if (RefPtr<cairo_surface_t> surface = adoptRef(webkitWebViewBackendTakeScreenshot(m_webView->priv->backend.get())))
-+        getPage(m_webView).inspectorController().didPaint(surface.get());
++
++#if USE(SKIA)
++    sk_sp<SkImage> surface(webkitWebViewBackendTakeScreenshot(m_webView->priv->backend.get()));
++    if (surface)
++        getPage(m_webView).inspectorController().didPaint(WTFMove(surface));
++#endif
 +
      {
          SetForScope inFrameDisplayedGuard(m_webView->priv->inFrameDisplayed, true);
          for (const auto& callback : m_webView->priv->frameDisplayedCallbacks) {
-@@ -510,6 +515,11 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
+@@ -536,6 +545,13 @@ void WebKitWebViewClient::frameDisplayed(WKWPE::View&)
      }
  }
  
-+cairo_surface_t* WebKitWebViewClient::takeViewScreenshot()
++#if USE(SKIA)
++sk_sp<SkImage> WebKitWebViewClient::takeViewScreenshot()
 +{
-+    return webkitWebViewBackendTakeScreenshot(m_webView->priv->backend.get());
++    return sk_sp<SkImage>(webkitWebViewBackendTakeScreenshot(m_webView->priv->backend.get()));
 +}
++#endif
 +
  void WebKitWebViewClient::willStartLoad(WKWPE::View&)
  {
      webkitWebViewWillStartLoad(m_webView);
-@@ -596,7 +606,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
+@@ -622,7 +638,7 @@ static gboolean webkitWebViewDecidePolicy(WebKitWebView*, WebKitPolicyDecision*
  
  static gboolean webkitWebViewPermissionRequest(WebKitWebView*, WebKitPermissionRequest* request)
  {
@@ -10779,7 +9951,18 @@ index 1e389f70c7b4722458cffbf4ac34b1d67efa4ba8..b9f5f22c8e866de1909240b72d23c06d
      if (WEBKIT_IS_POINTER_LOCK_PERMISSION_REQUEST(request)) {
          webkit_permission_request_allow(request);
          return TRUE;
-@@ -1903,6 +1913,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
+@@ -945,6 +961,10 @@ static void webkitWebViewConstructed(GObject* object)
+         priv->websitePolicies = adoptGRef(webkit_website_policies_new());
+ 
+     Ref configuration = priv->relatedView && priv->relatedView->priv->configurationForNextRelatedView ? priv->relatedView->priv->configurationForNextRelatedView.releaseNonNull() : webkitWebViewCreatePageConfiguration(webView);
++
++    // Playwright: REGRESSION(278896@main): Need to preserve configuration's preferences.
++    configuration->setPreferences(webkitSettingsGetPreferences(priv->settings.get()));
++
+     webkitWebViewCreatePage(webView, WTFMove(configuration));
+     webkitWebContextWebViewCreated(priv->context.get(), webView);
+ 
+@@ -1984,6 +2004,15 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
          G_TYPE_BOOLEAN, 1,
          WEBKIT_TYPE_SCRIPT_DIALOG);
  
@@ -10795,7 +9978,7 @@ index 1e389f70c7b4722458cffbf4ac34b1d67efa4ba8..b9f5f22c8e866de1909240b72d23c06d
      /**
       * WebKitWebView::decide-policy:
       * @web_view: the #WebKitWebView on which the signal is emitted
-@@ -2702,6 +2721,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
+@@ -2769,6 +2798,23 @@ void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView* webView, const
      webkit_script_dialog_unref(webView->priv->currentScriptDialog);
  }
  
@@ -10820,10 +10003,10 @@ index 1e389f70c7b4722458cffbf4ac34b1d67efa4ba8..b9f5f22c8e866de1909240b72d23c06d
  {
      if (!webView->priv->currentScriptDialog)
 diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h b/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h
-index 1a04ee05c3ddec0628ef5b8b8c181cbcc2b7d622..2a24f8f3fdc3f0eed13f8a79050258a4e4a489f0 100644
+index bf5b4c2bcca722e4d008f12194344c29c0db8824..ee6ee6b476ac28dee3a5983d03ba89ad0c9eb9ff 100644
 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h
 +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebViewPrivate.h
-@@ -66,6 +66,7 @@ void webkitWebViewRunJavaScriptAlert(WebKitWebView*, const CString& message, Fun
+@@ -64,6 +64,7 @@ void webkitWebViewRunJavaScriptAlert(WebKitWebView*, const CString& message, Fun
  void webkitWebViewRunJavaScriptConfirm(WebKitWebView*, const CString& message, Function<void(bool)>&& completionHandler);
  void webkitWebViewRunJavaScriptPrompt(WebKitWebView*, const CString& message, const CString& defaultText, Function<void(const String&)>&& completionHandler);
  void webkitWebViewRunJavaScriptBeforeUnloadConfirm(WebKitWebView*, const CString& message, Function<void(bool)>&& completionHandler);
@@ -10832,7 +10015,7 @@ index 1a04ee05c3ddec0628ef5b8b8c181cbcc2b7d622..2a24f8f3fdc3f0eed13f8a79050258a4
  bool webkitWebViewIsScriptDialogRunning(WebKitWebView*, WebKitScriptDialog*);
  String webkitWebViewGetCurrentScriptDialogMessage(WebKitWebView*);
 diff --git a/Source/WebKit/UIProcess/API/glib/webkit.h.in b/Source/WebKit/UIProcess/API/glib/webkit.h.in
-index 805f9f638c1630b5e9310494ae2970262de001cc..add3e80896c2e82bdd12cee15c8014bf88391ee0 100644
+index 763cd55f7abca011ac8bc4fef7f233bf52854cda..bd43917b274bf19ff9f3d96b7e80e20710372cba 100644
 --- a/Source/WebKit/UIProcess/API/glib/webkit.h.in
 +++ b/Source/WebKit/UIProcess/API/glib/webkit.h.in
 @@ -45,6 +45,7 @@
@@ -10844,10 +10027,10 @@ index 805f9f638c1630b5e9310494ae2970262de001cc..add3e80896c2e82bdd12cee15c8014bf
  #include <@API_INCLUDE_PREFIX@/WebKitClipboardPermissionRequest.h>
  #include <@API_INCLUDE_PREFIX@/WebKitColorChooserRequest.h>
 diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
-index cea5882f6c455898e1b5a231e1213e6b71ff21b6..d82b93d3c759b1184869b3504e1c3c07f53cc8ce 100644
+index 12efcb801d9d63d159a7f7d2e733cda141dc4e55..54f6703d64d5bcfd1d0f42be444492f9cd923bb0 100644
 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
 +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp
-@@ -269,6 +269,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
+@@ -270,6 +270,8 @@ void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool
  {
      if (wasEventHandled || event.type() != WebEventType::KeyDown || !event.nativeEvent())
          return;
@@ -10856,7 +10039,7 @@ index cea5882f6c455898e1b5a231e1213e6b71ff21b6..d82b93d3c759b1184869b3504e1c3c07
  
      // Always consider arrow keys as handled, otherwise the GtkWindow key bindings will move the focus.
      guint keyval;
-@@ -371,9 +373,9 @@ void PageClientImpl::selectionDidChange()
+@@ -362,9 +364,9 @@ void PageClientImpl::selectionDidChange()
          webkitWebViewSelectionDidChange(WEBKIT_WEB_VIEW(m_viewWidget));
  }
  
@@ -10869,12 +10052,12 @@ index cea5882f6c455898e1b5a231e1213e6b71ff21b6..d82b93d3c759b1184869b3504e1c3c07
  
  void PageClientImpl::didChangeContentSize(const IntSize& size)
 diff --git a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
-index 0445554dc296421d56237b07ea8d09b6e5e533b5..d7d91b30309e7106ae801aaad8162277ed636d1b 100644
+index c20bdf245d4e6d2a215615cf573cbbdefdb574c0..8c9f3f8e2e111bd3d19314e33a394c371944d358 100644
 --- a/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
 +++ b/Source/WebKit/UIProcess/API/gtk/PageClientImpl.h
-@@ -105,7 +105,7 @@ private:
- #endif
-     Ref<WebCore::ValidationBubble> createValidationBubble(const String& message, const WebCore::ValidationBubble::Settings&) final;
+@@ -104,7 +104,7 @@ private:
+     RefPtr<WebDataListSuggestionsDropdown> createDataListSuggestionsDropdown(WebPageProxy&) override;
+     Ref<WebCore::ValidationBubble> createValidationBubble(String&& message, const WebCore::ValidationBubble::Settings&) final;
      void selectionDidChange() override;
 -    RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) override;
 +    RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution = false) override;
@@ -10982,10 +10165,10 @@ index 496079da90993ac37689b060b69ecd4a67c2b6a8..af30181ca922f16c0f6e245c70e5ce7d
  G_BEGIN_DECLS
  
 diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
-index 9ce95b0e5ec142f4067c99d4aeb388fa08ae3f89..0718c8d9764d100fc8f41348a9273020645f0825 100644
+index 3bbacbe1dbe27e9743f608322f06abb1adc75173..be721a26127ffff7904072aa2d9e7d72050ca514 100644
 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
 +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
-@@ -2908,6 +2908,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
+@@ -2875,6 +2875,11 @@ void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
  #endif
  }
  
@@ -10997,7 +10180,7 @@ index 9ce95b0e5ec142f4067c99d4aeb388fa08ae3f89..0718c8d9764d100fc8f41348a9273020
  void webkitWebViewBaseEnterAcceleratedCompositingMode(WebKitWebViewBase* webkitWebViewBase, const LayerTreeContext& layerTreeContext)
  {
      ASSERT(webkitWebViewBase->priv->acceleratedBackingStore);
-@@ -2964,12 +2969,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
+@@ -2931,12 +2936,12 @@ void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
          webkitWebViewBase->priv->acceleratedBackingStore->update({ });
  }
  
@@ -11013,7 +10196,7 @@ index 9ce95b0e5ec142f4067c99d4aeb388fa08ae3f89..0718c8d9764d100fc8f41348a9273020
  
  #if !USE(GTK4)
 diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
-index a227380c1171e1e5824370b21c66440bb744c7f7..9b7bc68d01ef5d7c5d34720a6ab7c27f9e8c2156 100644
+index 3b8ca9470bab69dc26313111a79f954b10b30bf4..5c056dd6734f42d24bc168b4f5ba436584b3f7a8 100644
 --- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
 +++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
 @@ -27,6 +27,7 @@
@@ -11024,7 +10207,7 @@ index a227380c1171e1e5824370b21c66440bb744c7f7..9b7bc68d01ef5d7c5d34720a6ab7c27f
  #include "APIPageConfiguration.h"
  #include "InputMethodState.h"
  #include "RendererBufferFormat.h"
-@@ -107,7 +108,7 @@ void webkitWebViewBaseStartDrag(WebKitWebViewBase*, WebCore::SelectionData&&, Op
+@@ -104,7 +105,7 @@ void webkitWebViewBaseStartDrag(WebKitWebViewBase*, WebCore::SelectionData&&, Op
  void webkitWebViewBaseDidPerformDragControllerAction(WebKitWebViewBase*);
  #endif
  
@@ -11033,68 +10216,95 @@ index a227380c1171e1e5824370b21c66440bb744c7f7..9b7bc68d01ef5d7c5d34720a6ab7c27f
  void webkitWebViewBaseSetEnableBackForwardNavigationGesture(WebKitWebViewBase*, bool enabled);
  WebKit::ViewGestureController* webkitWebViewBaseViewGestureController(WebKitWebViewBase*);
  
-@@ -148,3 +149,5 @@ void webkitWebViewBaseSetPlugID(WebKitWebViewBase*, const String&);
+@@ -145,3 +146,5 @@ void webkitWebViewBaseSetPlugID(WebKitWebViewBase*, const String&);
  #endif
  
  WebKit::RendererBufferFormat webkitWebViewBaseGetRendererBufferFormat(WebKitWebViewBase*);
 +
 +WebKit::AcceleratedBackingStore* webkitWebViewBaseGetAcceleratedBackingStore(WebKitWebViewBase*);
 diff --git a/Source/WebKit/UIProcess/API/wpe/APIViewClient.h b/Source/WebKit/UIProcess/API/wpe/APIViewClient.h
-index 26d1790017e528f26ae04dac635678d5494bfd04..48dbe50eb05628307264a350350ac19f0acb3ae3 100644
+index 7636ad733e7be66a74f8fede966b0acb905a5842..777d86d6e160a7cfba6dd50d416ed1881f448de4 100644
 --- a/Source/WebKit/UIProcess/API/wpe/APIViewClient.h
 +++ b/Source/WebKit/UIProcess/API/wpe/APIViewClient.h
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,9 @@
  #pragma once
  
  #include "UserMessage.h"
-+#include <cairo.h>
++#if USE(SKIA)
++#include <skia/core/SkImage.h>
++#endif
  #include <wtf/CompletionHandler.h>
+ #include <wtf/TZoneMallocInlines.h>
  
- typedef struct OpaqueJSContext* JSGlobalContextRef;
-@@ -49,6 +50,9 @@ public:
+@@ -50,6 +53,11 @@ public:
      virtual bool isGLibBasedAPI() { return false; }
  
      virtual void frameDisplayed(WKWPE::View&) { }
 +// Playwright begin
-+    virtual cairo_surface_t* takeViewScreenshot() { return nullptr; }
++#if USE(SKIA)
++    virtual sk_sp<SkImage> takeViewScreenshot() { return nullptr; }
++#endif
 +// Playwright end
      virtual void willStartLoad(WKWPE::View&) { }
      virtual void didChangePageID(WKWPE::View&) { }
      virtual void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler<void(WebKit::UserMessage&&)>&& completionHandler) { completionHandler(WebKit::UserMessage()); }
 diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-index f498562d70a4652f6831ac6bc12ef86e537d3930..503a8875fed34fd7925646b61a1eed11d7c866b7 100644
+index bbbdaf4b823048adcb1e77756560b3dfd525297d..d4f873d6778bae8150817968b992d91dd2428518 100644
 --- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
 +++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.cpp
-@@ -33,9 +33,13 @@
- #include "NativeWebWheelEvent.h"
- #include "TouchGestureController.h"
- #include "WPEWebView.h"
+@@ -35,9 +35,12 @@
+ #include "WPEWebViewLegacy.h"
+ #include "WPEWebViewPlatform.h"
+ #include "WebColorPicker.h"
 +#include "WebColorPickerWPE.h"
 +#include "WebDateTimePickerWPE.h"
  #include "WebContextMenuProxy.h"
  #include "WebContextMenuProxyWPE.h"
-+#include "WebKitDataListSuggestionsDropdown.h"
+ #include "WebDataListSuggestionsDropdown.h"
++#include "WebDataListSuggestionsDropdownWPE.h"
+ #include "WebDateTimePicker.h"
  #include "WebKitPopupMenu.h"
-+#include "WebColorPicker.h"
  #include <WebCore/ActivityState.h>
- #include <WebCore/Cursor.h>
- #include <WebCore/DOMPasteAccess.h>
-@@ -203,7 +207,7 @@ WebCore::IntPoint PageClientImpl::accessibilityScreenToRootView(const WebCore::I
+@@ -58,6 +61,12 @@
+ #include <wpe/wpe-platform.h>
+ #endif
+ 
++#if USE(SKIA)
++#include <skia/core/SkBitmap.h>
++#include <skia/core/SkCanvas.h>
++#include <skia/core/SkImage.h>
++#endif
++
+ namespace WebKit {
+ 
+ WTF_MAKE_TZONE_ALLOCATED_IMPL(PageClientImpl);
+@@ -302,14 +311,14 @@ Ref<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& pa
+ }
+ #endif
+ 
+-RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy&, const WebCore::Color& intialColor, const WebCore::IntRect&, ColorControlSupportsAlpha supportsAlpha, Vector<WebCore::Color>&&)
++RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy& page, const WebCore::Color& intialColor, const WebCore::IntRect& rect, ColorControlSupportsAlpha supportsAlpha, Vector<WebCore::Color>&&)
+ {
+-    return nullptr;
++    return WebColorPickerWPE::create(page, intialColor, rect);
+ }
  
- WebCore::IntRect PageClientImpl::rootViewToAccessibilityScreen(const WebCore::IntRect& rect)
+-RefPtr<WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebPageProxy&)
++RefPtr<WebKit::WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebKit::WebPageProxy& page)
  {
--    return rootViewToScreen(rect);    
-+    return rootViewToScreen(rect);
+-    return nullptr;
++    return WebDataListSuggestionsDropdownWPE::create(page);
  }
  
- void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool)
-@@ -465,6 +469,33 @@ void PageClientImpl::selectionDidChange()
+ RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
+@@ -546,6 +555,37 @@ void PageClientImpl::selectionDidChange()
      m_view.selectionDidChange();
  }
  
-+RefPtr<cairo_surface_t> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
++#if USE(SKIA)
++sk_sp<SkImage> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&& clipRect, bool nominalResolution)
 +{
-+    RefPtr<cairo_surface_t> fullScreenshot = adoptRef(m_view.client().takeViewScreenshot());
++    sk_sp<SkImage> fullScreenshot = m_view.client().takeViewScreenshot();
 +    float deviceScale = m_view.page().deviceScaleFactor();
 +    if (!clipRect && (!nominalResolution || deviceScale == 1))
 +        return fullScreenshot;
@@ -11105,39 +10315,30 @@ index f498562d70a4652f6831ac6bc12ef86e537d3930..503a8875fed34fd7925646b61a1eed11
 +        if (clipRect)
 +            clipRect->scale(deviceScale);
 +    }
-+    RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_RGB24, size.width(), size.height()));
-+    RefPtr<cairo_t> cr = adoptRef(cairo_create(surface.get()));
++
++    SkBitmap bitmap;
++    bitmap.allocPixels(SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType));
++    SkCanvas canvas(bitmap);
 +    if (clipRect) {
-+        cairo_translate(cr.get(), -clipRect->x(), -clipRect->y());
-+        cairo_rectangle(cr.get(), clipRect->x(), clipRect->y(), clipRect->width(), clipRect->height());
-+        cairo_clip(cr.get());
++        canvas.translate(-clipRect->x(), -clipRect->y());
++        SkRect rect = SkRect::MakeXYWH(clipRect->x(), clipRect->y(), clipRect->width(), clipRect->height());
++        canvas.clipRect(rect);
 +    }
 +    if (nominalResolution)
-+        cairo_scale(cr.get(), 1/deviceScale, 1/deviceScale);
-+    cairo_set_source_surface(cr.get(), fullScreenshot.get(), 0, 0);
-+    cairo_paint(cr.get());
-+    return surface;
++        canvas.scale(1/deviceScale, 1/deviceScale);
++    canvas.drawImage(fullScreenshot, 0, 0);
++    return bitmap.asImage();
 +}
++#endif
++
 +
  WebKitWebResourceLoadManager* PageClientImpl::webResourceLoadManager()
  {
      return m_view.webResourceLoadManager();
-@@ -475,4 +506,23 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
+@@ -556,4 +596,11 @@ void PageClientImpl::callAfterNextPresentationUpdate(CompletionHandler<void()>&&
      m_view.callAfterNextPresentationUpdate(WTFMove(callback));
  }
  
-+#if ENABLE(DATALIST_ELEMENT)
-+RefPtr<WebKit::WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebKit::WebPageProxy& page)
-+{
-+    return WebKitDataListSuggestionsDropdown::create(page);
-+}
-+#endif
-+
-+RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& color, const WebCore::IntRect& rect, Vector<WebCore::Color>&&)
-+{
-+    return WebColorPickerWPE::create(*page, color, rect);
-+}
-+
 +#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
 +RefPtr<WebDateTimePicker> PageClientImpl::createDateTimePicker(WebPageProxy& page)
 +{
@@ -11147,46 +10348,26 @@ index f498562d70a4652f6831ac6bc12ef86e537d3930..503a8875fed34fd7925646b61a1eed11
 +
  } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-index a7ece2c8dc3fd30bfb850de04c4fc10004444d5a..b5ee1a1877b3e748dea3ce195cd75cb0701a7034 100644
+index 8809d3fbeeae0387bf683f6154e6db741c3ecc4a..4f1671804b06c82ba221ad74b2b30d0f47ee8718 100644
 --- a/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
 +++ b/Source/WebKit/UIProcess/API/wpe/PageClientImpl.h
-@@ -166,9 +166,21 @@ private:
+@@ -183,9 +183,15 @@ private:
      void didChangeWebPageID() const override;
  
      void selectionDidChange() override;
-+    RefPtr<cairo_surface_t> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution) override;
- 
+-
++#if USE(SKIA)
++    sk_sp<SkImage> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution) override;
++#endif
      WebKitWebResourceLoadManager* webResourceLoadManager() override;
  
-+#if ENABLE(DATALIST_ELEMENT)
-+    RefPtr<WebKit::WebDataListSuggestionsDropdown> createDataListSuggestionsDropdown(WebKit::WebPageProxy& page) override;
-+#endif
-+
-+#if ENABLE(INPUT_TYPE_COLOR)
-+    RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&, Vector<WebCore::Color>&&) override;
-+#endif
 +#if ENABLE(DATE_AND_TIME_INPUT_TYPES)
 +    RefPtr<WebDateTimePicker> createDateTimePicker(WebPageProxy&) override;
 +#endif
 +
      WKWPE::View& m_view;
- };
- 
-diff --git a/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp
-index 8a9b8a7a853f2bdb6ae0b8bb389d3db1e1a53ac4..c22553b96c3e9afc126ce93c4e45e3af0fbd38f0 100644
---- a/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp
-+++ b/Source/WebKit/UIProcess/API/wpe/WPEWebView.cpp
-@@ -98,7 +98,9 @@ View::View(struct wpe_view_backend* backend, WPEDisplay* display, const API::Pag
-     auto& preferences = configuration->preferences();
-     preferences.setAcceleratedCompositingEnabled(true);
-     preferences.setForceCompositingMode(true);
--    preferences.setThreadedScrollingEnabled(true);
-+    // Playwright override begin
-+    preferences.setThreadedScrollingEnabled(false);
-+    // Playwright override end
- 
-     auto& pool = configuration->processPool();
-     m_pageProxy = pool.createWebPage(*m_pageClient, WTFMove(configuration));
+ #if ENABLE(FULLSCREEN_API)
+     std::unique_ptr<WebFullScreenManagerProxyClient> m_fullscreenClientForTesting;
 diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitBrowserInspector.h b/Source/WebKit/UIProcess/API/wpe/WebKitBrowserInspector.h
 new file mode 100644
 index 0000000000000000000000000000000000000000..273c5105cdf1638955cea01128c9bbab3e64436c
@@ -11274,133 +10455,8 @@ index 0000000000000000000000000000000000000000..273c5105cdf1638955cea01128c9bbab
 +G_END_DECLS
 +
 +#endif
-diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..afafef2b7fb433e006b1763e653e200bc80edcbd
---- /dev/null
-+++ b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.cpp
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (C) 2019 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include "config.h"
-+#include "WebKitDataListSuggestionsDropdown.h"
-+
-+#if ENABLE(DATALIST_ELEMENT)
-+
-+#include "WebPageProxy.h"
-+
-+namespace WebKit {
-+
-+WebKitDataListSuggestionsDropdown::WebKitDataListSuggestionsDropdown(WebPageProxy& page)
-+    : WebDataListSuggestionsDropdown(page)
-+{
-+}
-+
-+WebKitDataListSuggestionsDropdown::~WebKitDataListSuggestionsDropdown()
-+{
-+}
-+
-+void WebKitDataListSuggestionsDropdown::show(WebCore::DataListSuggestionInformation&& information)
-+{
-+}
-+
-+void WebKitDataListSuggestionsDropdown::handleKeydownWithIdentifier(const String& key)
-+{
-+}
-+
-+void WebKitDataListSuggestionsDropdown::close()
-+{
-+}
-+
-+} // namespace WebKit
-+
-+#endif // ENABLE(DATALIST_ELEMENT)
-diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.h b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..0a099832c3dd959f456fcae49a1d62a9477d2758
---- /dev/null
-+++ b/Source/WebKit/UIProcess/API/wpe/WebKitDataListSuggestionsDropdown.h
-@@ -0,0 +1,55 @@
-+/*
-+ * Copyright (C) 2019 Igalia S.L.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#pragma once
-+
-+#if ENABLE(DATALIST_ELEMENT)
-+
-+#include "WebDataListSuggestionsDropdown.h"
-+
-+namespace WebKit {
-+
-+class WebPageProxy;
-+
-+class WebKitDataListSuggestionsDropdown final : public WebDataListSuggestionsDropdown {
-+public:
-+    static Ref<WebKitDataListSuggestionsDropdown> create(WebPageProxy& page)
-+    {
-+        return adoptRef(*new WebKitDataListSuggestionsDropdown(page));
-+    }
-+
-+    ~WebKitDataListSuggestionsDropdown();
-+
-+private:
-+    WebKitDataListSuggestionsDropdown(WebPageProxy&);
-+
-+    void show(WebCore::DataListSuggestionInformation&&) final;
-+    void handleKeydownWithIdentifier(const String&) final;
-+    void close() final;
-+};
-+
-+} // namespace WebKit
-+
-+#endif // ENABLE(DATALIST_ELEMENT)
 diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
-index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..ff5d01438e44ce6785a2aa70fc5423ba74e7101c 100644
+index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..8ed962e8c1af62b9b73a68348d0d88765429861d 100644
 --- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
 +++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.cpp
 @@ -54,6 +54,7 @@ struct _WebKitWebViewBackend {
@@ -11420,7 +10476,7 @@ index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..ff5d01438e44ce6785a2aa70fc5423ba
 +    view_backend->screenshotCallback = callback;
 +}
 +
-+cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend* view_backend)
++PlatformImage webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend* view_backend)
 +{
 +    if (!view_backend->screenshotCallback)
 +        return nullptr;
@@ -11432,22 +10488,26 @@ index 763bda5b29304f7ed7133c0a8158e6c8b94c5ea1..ff5d01438e44ce6785a2aa70fc5423ba
  
  template <> WebKitWebViewBackend* refGPtr(WebKitWebViewBackend* ptr)
 diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
-index 16dcc1f69c38cd8ad630bc49d6d69feaa3aa811e..ddbd14645944fdb02925c381f06721d368a434f8 100644
+index 16dcc1f69c38cd8ad630bc49d6d69feaa3aa811e..98677028c19c12c3b6d513bb5e45375a1528fe8a 100644
 --- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
 +++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
-@@ -27,6 +27,7 @@
- #include <glib-object.h>
+@@ -28,6 +28,11 @@
  #include <wpe/WebKitDefines.h>
  #include <wpe/wpe.h>
-+#include <cairo.h>
  
++#if defined(USE_SKIA) && USE_SKIA
++#include <skia/core/SkImage.h>
++using PlatformImage = SkImage*;
++#endif
++
  G_BEGIN_DECLS
  
-@@ -44,6 +45,12 @@ webkit_web_view_backend_new             (struct wpe_view_backend *backend,
+ #define WEBKIT_TYPE_WEB_VIEW_BACKEND (webkit_web_view_backend_get_type())
+@@ -44,6 +49,12 @@ webkit_web_view_backend_new             (struct wpe_view_backend *backend,
  WEBKIT_API struct wpe_view_backend *
  webkit_web_view_backend_get_wpe_backend (WebKitWebViewBackend    *view_backend);
  
-+typedef cairo_surface_t* (*take_screenshot_callback)(gpointer              user_data);
++typedef PlatformImage (*take_screenshot_callback)(gpointer              user_data);
 +
 +WEBKIT_API void
 +webkit_web_view_backend_set_screenshot_callback   (WebKitWebViewBackend      *view_backend,
@@ -11457,7 +10517,7 @@ index 16dcc1f69c38cd8ad630bc49d6d69feaa3aa811e..ddbd14645944fdb02925c381f06721d3
  
  #endif /* WebKitWebViewBackend_h */
 diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h
-index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a77fd5df49 100644
+index e4b92ace1531090ae38a7aec3d3d4febf19aee84..b66b573f9148c39c5ce2738add6cd01a9a352be8 100644
 --- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h
 +++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackendPrivate.h
 @@ -31,3 +31,5 @@ template <> void derefGPtr(WebKitWebViewBackend* ptr);
@@ -11465,26 +10525,49 @@ index e4b92ace1531090ae38a7aec3d3d4febf19aee84..43690f9ef4969a39084501613bfc00a7
  
  void webkitWebViewBackendUnref(WebKitWebViewBackend*);
 +
-+cairo_surface_t* webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*);
++PlatformImage webkitWebViewBackendTakeScreenshot(WebKitWebViewBackend*);
 diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h
-index 720c88818bdb4cde3cb58e95785454754f6c1396..7f702c0b922e13128522d2bb1ace6a233812a7d4 100644
+index 2f1182cb91a00353eace0b71612df096391c2450..f2d09ba39f7d3c1b76ed705a0d945b869823c03e 100644
 --- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h
 +++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewClient.h
-@@ -50,6 +50,9 @@ private:
+@@ -51,6 +51,11 @@ private:
      bool isGLibBasedAPI() override { return true; }
  
      void frameDisplayed(WKWPE::View&) override;
 +// Playwright begin
-+    cairo_surface_t* takeViewScreenshot() override;
++#if USE(SKIA)
++    sk_sp<SkImage> takeViewScreenshot() override;
++#endif
 +// Playwright end
      void willStartLoad(WKWPE::View&) override;
      void didChangePageID(WKWPE::View&) override;
      void didReceiveUserMessage(WKWPE::View&, WebKit::UserMessage&&, CompletionHandler<void(WebKit::UserMessage&&)>&&) override;
+diff --git a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+index b351f11524a994ac6136daf9c277419fce44df0f..31679e63462cfaceeac00ebf31985c118ff1e4e4 100644
+--- a/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
++++ b/Source/WebKit/UIProcess/Automation/WebAutomationSession.h
+@@ -287,6 +287,8 @@ public:
+ 
+     void didDestroyFrame(WebCore::FrameIdentifier);
+ 
++    static std::optional<String> platformGetBase64EncodedPNGData(const ViewSnapshot&);
++
+     RefPtr<WebPageProxy> webPageProxyForHandle(const String&);
+     String handleForWebPageProxy(const WebPageProxy&);
+ 
+@@ -338,7 +340,6 @@ private:
+ 
+     // Get base64-encoded PNG data from a bitmap.
+     static std::optional<String> platformGetBase64EncodedPNGData(WebCore::ShareableBitmap::Handle&&);
+-    static std::optional<String> platformGetBase64EncodedPNGData(const ViewSnapshot&);
+ 
+     // Save base64-encoded file contents to a local file path and return the path.
+     // This reuses the basename of the remote file path so that the filename exposed to DOM API remains the same.
 diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
-index 6f69cd9d4db8544a2c0c8b11fb557697f9b6a183..750a565d8a0c1208cd6950740b2beffa8c1d69d9 100644
+index d5186484fee73b83dbcd611a9695d92a0a6f9579..e26cea229aeb1f6aad23f1265baccfe67e508a13 100644
 --- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
 +++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp
-@@ -158,7 +158,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
+@@ -173,7 +173,11 @@ void AuxiliaryProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& lau
          launchOptions.processCmdPrefix = String::fromUTF8(processCmdPrefix);
  #endif // ENABLE(DEVELOPER_MODE) && (PLATFORM(GTK) || PLATFORM(WPE))
  
@@ -11497,12 +10580,12 @@ index 6f69cd9d4db8544a2c0c8b11fb557697f9b6a183..750a565d8a0c1208cd6950740b2beffa
      platformGetLaunchOptions(launchOptions);
  }
 diff --git a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
-index e2d1e9dfbc77e3d520ce8d31c812a8482facae10..28238da43a4fc45466b43753bc5ad8aa07963f94 100644
+index 53b4c647c013643d45d845154dd640e8c21c3fd4..d7cc83ec06678945d6e71cdebf3227f86f7661e6 100644
 --- a/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
 +++ b/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h
-@@ -264,13 +264,16 @@ protected:
-     static RefPtr<WebCore::SharedBuffer> fetchAudioComponentServerRegistrations();
- #endif
+@@ -298,13 +298,16 @@ protected:
+ 
+     InitializationActivityAndGrant initializationActivityAndGrant();
  
 +    /* playwright revert 50f8fee - make protected to allow use from WebProcessProxy */
 +    Vector<String> platformOverrideLanguages() const;
@@ -11517,16 +10600,20 @@ index e2d1e9dfbc77e3d520ce8d31c812a8482facae10..28238da43a4fc45466b43753bc5ad8aa
 -    Vector<String> platformOverrideLanguages() const;
      void platformStartConnectionTerminationWatchdog();
  
-     ResponsivenessTimer m_responsivenessTimer;
+     // Connection::Client
 diff --git a/Source/WebKit/UIProcess/BackingStore.h b/Source/WebKit/UIProcess/BackingStore.h
-index f9b557ae57a25f53f6d17aab23a256e3cc7d1e66..cced83f477cb1344dd079b9c3523b109ee5cfd89 100644
+index 945c62704e0b25f04e9ee4be88b21f88aeda8bd9..b57ea0f359ab586c88a7d463f2be437b780c267c 100644
 --- a/Source/WebKit/UIProcess/BackingStore.h
 +++ b/Source/WebKit/UIProcess/BackingStore.h
-@@ -61,6 +61,7 @@ public:
+@@ -67,6 +67,11 @@ public:
      float deviceScaleFactor() const { return m_deviceScaleFactor; }
  
      void paint(PlatformPaintContextPtr, const WebCore::IntRect&);
++#if PLATFORM(GTK)
 +    RefPtr<cairo_surface_t> surface() const { return m_surface; }
++#elif USE(SKIA)
++    sk_sp<SkSurface> surface() const { return m_surface; }
++#endif
      void incorporateUpdate(UpdateInfo&&);
  
  private:
@@ -11641,32 +10728,23 @@ index 0000000000000000000000000000000000000000..cd66887de171cda7d15a8e4dc6dbff63
 +} // namespace WebKit
 +
 +#endif // ENABLE(REMOTE_INSPECTOR)
-diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h
-index 957f7f088087169668a9b4f1ba65d9f206a2a836..15e44c8d5b6a3eafb7f1148707366b0cddcd119f 100644
---- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h
-+++ b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.h
-@@ -29,6 +29,7 @@
+diff --git a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h
+index 89d125f7742f81ead8c50f218ecb1771b8000636..baa6cf58ad502c6c033ee6293a6cc8d4ce608e7b 100644
+--- a/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h
++++ b/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.h
+@@ -25,6 +25,7 @@
  
- #include "SOAuthorizationSession.h"
- #include <wtf/CompletionHandler.h>
-+#include <wtf/Forward.h>
+ #if HAVE(APP_SSO)
  
- OBJC_CLASS WKSOSecretDelegate;
- OBJC_CLASS WKWebView;
-@@ -39,6 +40,8 @@ class NavigationAction;
++#import "SOAuthorizationSession.h"
+ #import <pal/cocoa/AppSSOSoftLink.h>
  
  namespace WebKit {
- 
-+class WebPageProxy;
-+
- // FSM: Idle => Active => Completed
- class PopUpSOAuthorizationSession final : public SOAuthorizationSession {
- public:
 diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-index 20af8a02d6dee5af7328accca7cd88a06995c4bb..16e8fc676e4bd70f3f35414434963ccb9f277311 100644
+index 554009ae0e083f7721f97a3952f0f17b7d8d7d9d..fbf643cc61caab6389e4bc727adb897ebbb6a109 100644
 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
 +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.h
-@@ -96,6 +96,7 @@ private:
+@@ -103,6 +103,7 @@ private:
          void runJavaScriptAlert(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function<void()>&& completionHandler) final;
          void runJavaScriptConfirm(WebPageProxy&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function<void(bool)>&& completionHandler) final;
          void runJavaScriptPrompt(WebPageProxy&, const WTF::String&, const WTF::String&, WebFrameProxy*, FrameInfoData&&, Function<void(const WTF::String&)>&&) final;
@@ -11674,7 +10752,7 @@ index 20af8a02d6dee5af7328accca7cd88a06995c4bb..16e8fc676e4bd70f3f35414434963ccb
          void presentStorageAccessConfirmDialog(const WTF::String& requestingDomain, const WTF::String& currentDomain, CompletionHandler<void(bool)>&&);
          void requestStorageAccessConfirm(WebPageProxy&, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, std::optional<WebCore::OrganizationStorageAccessPromptQuirk>&&, CompletionHandler<void(bool)>&&) final;
          void decidePolicyForGeolocationPermissionRequest(WebPageProxy&, WebFrameProxy&, const FrameInfoData&, Function<void(bool)>&) final;
-@@ -207,6 +208,7 @@ private:
+@@ -221,6 +222,7 @@ private:
          bool webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler : 1;
          bool webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
          bool webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler : 1;
@@ -11683,10 +10761,10 @@ index 20af8a02d6dee5af7328accca7cd88a06995c4bb..16e8fc676e4bd70f3f35414434963ccb
          bool webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler : 1;
          bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
 diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-index db0e7523899917cc9055ced3127a1e4eb493313d..c5a8a5a7da934deda55313465c26a38b1b33d2ac 100644
+index 30de92c390b49a383369fb59397810187f752c8a..0752cc7cefcc4c3579eafca4fa1cc6e4045d5d84 100644
 --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
 +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
-@@ -118,6 +118,7 @@ void UIDelegate::setDelegate(id <WKUIDelegate> delegate)
+@@ -135,6 +135,7 @@ void UIDelegate::setDelegate(id<WKUIDelegate> delegate)
      m_delegateMethods.webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:)];
      m_delegateMethods.webViewRunJavaScriptConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
      m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:)];
@@ -11694,7 +10772,7 @@ index db0e7523899917cc9055ced3127a1e4eb493313d..c5a8a5a7da934deda55313465c26a38b
      m_delegateMethods.webViewRequestStorageAccessPanelUnderFirstPartyCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:completionHandler:)];
      m_delegateMethods.webViewRequestStorageAccessPanelForDomainUnderCurrentDomainForQuirkDomainsCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestStorageAccessPanelForDomain:underCurrentDomain:forQuirkDomains:completionHandler:)];
      m_delegateMethods.webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler = [delegate respondsToSelector:@selector(_webView:runBeforeUnloadConfirmPanelWithMessage:initiatedByFrame:completionHandler:)];
-@@ -442,6 +443,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
+@@ -495,6 +496,15 @@ void UIDelegate::UIClient::runJavaScriptPrompt(WebPageProxy& page, const WTF::St
      }).get()];
  }
  
@@ -11704,33 +10782,36 @@ index db0e7523899917cc9055ced3127a1e4eb493313d..c5a8a5a7da934deda55313465c26a38b
 +    auto delegate = m_uiDelegate->m_delegate.get();
 +    if (!delegate)
 +        return;
-+    [delegate webView:m_uiDelegate->m_webView.get().get() handleJavaScriptDialog:accept value:value];
++    [delegate webView:m_uiDelegate->m_webView.get().get() handleJavaScriptDialog:accept value:value.createNSString().get()];
 +}
 +
  void UIDelegate::UIClient::requestStorageAccessConfirm(WebPageProxy& webPageProxy, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, std::optional<WebCore::OrganizationStorageAccessPromptQuirk>&& organizationStorageAccessPromptQuirk, CompletionHandler<void(bool)>&& completionHandler)
  {
-     if (!m_uiDelegate)
+     RefPtr uiDelegate = m_uiDelegate.get();
 diff --git a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-index b77d46b64193c5cf2017da8d81623e54d5f6f7a8..61a08b78ff3829995b54ce14c1752d4e073d5796 100644
+index 0eaba44d278da255e3035a4f71ddffb276ad2164..23838dad0c6f4a150ec99ecc1105163db1140a0a 100644
 --- a/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
 +++ b/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm
-@@ -38,6 +38,7 @@
- #import "LoadParameters.h"
- #import "MessageSenderInlines.h"
+@@ -43,7 +43,9 @@
+ #import "NativeWebKeyboardEvent.h"
+ #import "NativeWebMouseEvent.h"
+ #import "NavigationState.h"
++#import "NetworkProcessMessages.h"
  #import "PageClient.h"
 +#import "PasteboardTypes.h"
+ #import "PlatformXRSystem.h"
  #import "PlaybackSessionManagerProxy.h"
- #import "QuickLookThumbnailLoader.h"
  #import "RemoteLayerTreeTransaction.h"
-@@ -283,10 +284,87 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
+@@ -347,11 +349,86 @@ bool WebPageProxy::scrollingUpdatesDisabledForTesting()
  
- void WebPageProxy::startDrag(const DragItem& dragItem, ShareableBitmap::Handle&& dragImageHandle)
+ void WebPageProxy::startDrag(const DragItem& dragItem, ShareableBitmap::Handle&& dragImageHandle, const std::optional<ElementIdentifier>& elementID)
  {
 +    if (m_interceptDrags) {
-+        NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName: m_overrideDragPasteboardName];
++        NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName: m_overrideDragPasteboardName.createNSString().get()];
 +
 +        m_dragSelectionData = String([pasteboard name]);
-+        grantAccessToCurrentPasteboardData(String([pasteboard name]));
++        if (auto replyID = grantAccessToCurrentPasteboardData(String([pasteboard name]), [] () { }))
++            websiteDataStore().protectedNetworkProcess()->connection().waitForAsyncReplyAndDispatchImmediately<Messages::NetworkProcess::AllowFilesAccessFromWebProcess>(*replyID, 100_ms);
 +        m_dragSourceOperationMask = WebCore::anyDragOperation();
 +
 +        if (auto& info = dragItem.promisedAttachmentInfo) {
@@ -11739,18 +10820,15 @@ index b77d46b64193c5cf2017da8d81623e54d5f6f7a8..61a08b78ff3829995b54ce14c1752d4e
 +                dragCancelled();
 +                return;
 +            }
-+            NSString *utiType = attachment->utiType();
++            NSString *utiType = attachment->utiType().createNSString().get();
 +            if (!utiType.length) {
 +                dragCancelled();
 +                return;
 +            }
 +
-+            ASSERT(info.additionalTypes.size() == info.additionalData.size());
-+            if (info.additionalTypes.size() == info.additionalData.size()) {
-+                for (size_t index = 0; index < info.additionalTypes.size(); ++index) {
-+                    auto nsData = info.additionalData[index]->createNSData();
-+                    [pasteboard setData:nsData.get() forType:info.additionalTypes[index]];
-+                }
++            for (size_t index = 0; index < info.additionalTypesAndData.size(); ++index) {
++                auto nsData = info.additionalTypesAndData[index].second->createNSData();
++                [pasteboard setData:nsData.get() forType:info.additionalTypesAndData[index].first.createNSString().get()];
 +            }
 +        } else {
 +            [pasteboard setString:@"" forType:PasteboardTypes::WebDummyPboardType];
@@ -11759,7 +10837,8 @@ index b77d46b64193c5cf2017da8d81623e54d5f6f7a8..61a08b78ff3829995b54ce14c1752d4e
 +        return;
 +    }
 +
-     protectedPageClient()->startDrag(dragItem, WTFMove(dragImageHandle));
+     if (RefPtr pageClient = this->pageClient())
+         pageClient->startDrag(dragItem, WTFMove(dragImageHandle), elementID);
  }
  
 -#endif
@@ -11781,9 +10860,9 @@ index b77d46b64193c5cf2017da8d81623e54d5f6f7a8..61a08b78ff3829995b54ce14c1752d4e
 +            NSPasteboard *pasteboard = [NSPasteboard pasteboardWithUniqueName];
 +            m_overrideDragPasteboardName = String([pasteboard name]);
 +        }
-+        send(Messages::WebPage::SetDragPasteboardName(m_overrideDragPasteboardName));
++        legacyMainFrameProcess().send(Messages::WebPage::SetDragPasteboardName(m_overrideDragPasteboardName), webPageIDInMainFrameProcess());
 +    } else {
-+        send(Messages::WebPage::SetDragPasteboardName(""_s));
++        legacyMainFrameProcess().send(Messages::WebPage::SetDragPasteboardName(""_s), webPageIDInMainFrameProcess());
 +    }
 +}
 +
@@ -11802,29 +10881,29 @@ index b77d46b64193c5cf2017da8d81623e54d5f6f7a8..61a08b78ff3829995b54ce14c1752d4e
 +
 +    auto previousRect = m_currentDragCaretRect;
 +    m_currentDragCaretRect = dragCaretRect;
-+    pageClient().didChangeDragCaretRect(previousRect, dragCaretRect);
++    pageClient()->didChangeDragCaretRect(previousRect, dragCaretRect);
 +}
 +
 +#endif // PLATFORM(IOS_FAMILY)
 +
 +#endif // ENABLE(DRAG_SUPPORT)
  
- #if ENABLE(UNIFIED_TEXT_REPLACEMENT)
+ #if ENABLE(ATTACHMENT_ELEMENT)
  
 diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-index ba0c5fe1678dc1055c7f495f5ff421438db7e082..bdf2dd23de87c114db52603b919f29188a2c4bed 100644
+index 7f9f0ecf631ab772460603adb4d0426e1d468085..a98a1388e589d5f079fe29f5b6091aa022b6ecfc 100644
 --- a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
 +++ b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
-@@ -434,7 +434,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -436,7 +436,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
      auto screenProperties = WebCore::collectScreenProperties();
      parameters.screenProperties = WTFMove(screenProperties);
  #if PLATFORM(MAC)
 -    parameters.useOverlayScrollbars = ([NSScroller preferredScrollerStyle] == NSScrollerStyleOverlay);
 +    parameters.useOverlayScrollbars = m_configuration->forceOverlayScrollbars() || ([NSScroller preferredScrollerStyle] == NSScrollerStyleOverlay);
  #endif
-     
- #if (PLATFORM(IOS) || PLATFORM(VISION)) && HAVE(AGX_COMPILER_SERVICE)
-@@ -803,8 +803,8 @@ void WebProcessPool::registerNotificationObservers()
+ 
+ #if PLATFORM(VISION)
+@@ -835,8 +835,8 @@ void WebProcessPool::registerNotificationObservers()
      }];
  
      m_scrollerStyleNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSPreferredScrollerStyleDidChangeNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
@@ -11836,10 +10915,10 @@ index ba0c5fe1678dc1055c7f495f5ff421438db7e082..bdf2dd23de87c114db52603b919f2918
  
      m_activationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
 diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-index 3796110b3f6ffb29bc1eae80505017dee9e779d1..1a181f4ac8ce8d15d5e65a9df6afc8fe5695e85c 100644
+index 183a2dc44f4d2921e68a6ff5fd2fb0fb815753af..f9e80d965f5b7cd64049d85e57e668d6f2a73d87 100644
 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
 +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
-@@ -33,14 +33,17 @@
+@@ -33,6 +33,7 @@
  #include "LayerTreeContext.h"
  #include "MessageSenderInlines.h"
  #include "UpdateInfo.h"
@@ -11847,35 +10926,38 @@ index 3796110b3f6ffb29bc1eae80505017dee9e779d1..1a181f4ac8ce8d15d5e65a9df6afc8fe
  #include "WebPageProxy.h"
  #include "WebPreferences.h"
  #include "WebProcessPool.h"
- #include "WebProcessProxy.h"
+@@ -40,15 +41,26 @@
  #include <WebCore/Region.h>
  #include <optional>
+ #include <wtf/TZoneMallocInlines.h>
 +#include <wtf/Vector.h>
  
  #if PLATFORM(GTK)
 +#include "WebKitWebViewBasePrivate.h"
  #include <gtk/gtk.h>
++#include <cairo.h>
++#include <skia/core/SkImage.h>
++#include <skia/core/SkSurface.h>
++#include <skia/core/SkCanvas.h>
  #endif
  
-@@ -48,6 +51,13 @@
+ #if USE(GLIB_EVENT_LOOP)
  #include <wtf/glib/RunLoopSourcePriority.h>
  #endif
  
 +#if PLATFORM(WIN)
-+#include <cairo-win32.h>
 +#include <windows.h>
 +#include <WebCore/HWndDC.h>
-+#include <WebCore/RefPtrCairo.h>
 +#endif
 +
  namespace WebKit {
  using namespace WebCore;
  
-@@ -160,6 +170,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange()
-     send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()));
+@@ -182,6 +194,11 @@ void DrawingAreaProxyCoordinatedGraphics::deviceScaleFactorDidChange(CompletionH
+     sendWithAsyncReply(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()), WTFMove(completionHandler));
  }
  
-+void DrawingAreaProxyCoordinatedGraphics::waitForSizeUpdate(Function<void ()>&& callback)
++void DrawingAreaProxyCoordinatedGraphics::waitForSizeUpdate(Function<void (const DrawingAreaProxyCoordinatedGraphics&)>&& callback)
 +{
 +    m_callbacks.append(WTFMove(callback));
 +}
@@ -11883,38 +10965,20 @@ index 3796110b3f6ffb29bc1eae80505017dee9e779d1..1a181f4ac8ce8d15d5e65a9df6afc8fe
  void DrawingAreaProxyCoordinatedGraphics::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
  {
  #if !PLATFORM(WPE)
-@@ -221,6 +236,45 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6
+@@ -243,6 +260,59 @@ void DrawingAreaProxyCoordinatedGraphics::updateAcceleratedCompositingMode(uint6
      updateAcceleratedCompositingMode(layerTreeContext);
  }
  
-+#if PLATFORM(WIN)
-+void DrawingAreaProxyCoordinatedGraphics::didChangeAcceleratedCompositingMode(bool enabled)
-+{
-+    m_isInAcceleratedCompositingMode = enabled;
-+}
-+#endif
-+
-+#if !PLATFORM(WPE)
++#if PLATFORM(GTK)
 +void DrawingAreaProxyCoordinatedGraphics::captureFrame()
 +{
 +    RefPtr<cairo_surface_t> surface;
-+#if PLATFORM(WIN)
-+    HWndDC dc;
-+    if (m_isInAcceleratedCompositingMode) {
-+        dc.setHWnd(reinterpret_cast<HWND>(protectedWebPageProxy()->viewWidget()));
-+        surface = adoptRef(cairo_win32_surface_create(dc));
-+#else
 +    if (isInAcceleratedCompositingMode()) {
-+#  if PLATFORM(GTK)
 +        AcceleratedBackingStore* backingStore = webkitWebViewBaseGetAcceleratedBackingStore(WEBKIT_WEB_VIEW_BASE(protectedWebPageProxy()->viewWidget()));
 +        if (!backingStore)
 +            return;
 +
 +        surface = backingStore->surface();
-+#  else
-+        fprintf(stderr, "captureFrame() is not supported in accelerated compositing mode on this platform.\n");
-+#  endif
-+#endif
 +    } else if (m_backingStore) {
 +        surface = m_backingStore->surface();
 +    }
@@ -11922,27 +10986,60 @@ index 3796110b3f6ffb29bc1eae80505017dee9e779d1..1a181f4ac8ce8d15d5e65a9df6afc8fe
 +    if (!surface)
 +        return;
 +
-+    protectedWebPageProxy()->inspectorController().didPaint(surface.get());
++    if (cairo_surface_get_type(surface.get()) != CAIRO_SURFACE_TYPE_IMAGE)
++        return;
++
++    unsigned char* data   = cairo_image_surface_get_data(surface.get());
++    int width             = cairo_image_surface_get_width(surface.get());
++    int height            = cairo_image_surface_get_height(surface.get());
++    int stride            = cairo_image_surface_get_stride(surface.get());
++
++    SkImageInfo info = SkImageInfo::Make(
++        width, height,
++        kBGRA_8888_SkColorType,  // matches CAIRO_FORMAT_ARGB32 on LE
++        kPremul_SkAlphaType
++    );
++    sk_sp<SkImage> skImage = SkImages::RasterFromData(info, SkData::MakeWithCopy(data, height * stride), stride);
++    if (!skImage)
++        return;
++
++    protectedWebPageProxy()->inspectorController().didPaint(WTFMove(skImage));
 +}
-+#endif
++#endif // PLATFORM(GTK)
++
++#if PLATFORM(WIN)
++void DrawingAreaProxyCoordinatedGraphics::captureFrame()
++{
++    if (!m_backingStore)
++        return;
++    auto surface = m_backingStore->surface();
++    if (!surface)
++        return;
++    auto image = surface->makeImageSnapshot();
++    if (!image)
++        return;
++    protectedWebPageProxy()->inspectorController().didPaint(WTFMove(image));
++}
++#endif // PLATFORM(WIN)
 +
  bool DrawingAreaProxyCoordinatedGraphics::alwaysUseCompositing() const
  {
-     return m_webPageProxy->preferences().acceleratedCompositingEnabled() && m_webPageProxy->preferences().forceCompositingMode();
-@@ -275,6 +329,11 @@ void DrawingAreaProxyCoordinatedGraphics::didUpdateGeometry()
+     if (!m_webPageProxy)
+@@ -310,6 +380,12 @@ void DrawingAreaProxyCoordinatedGraphics::didUpdateGeometry()
      // we need to resend the new size here.
      if (m_lastSentSize != m_size)
          sendUpdateGeometry();
 +    else {
-+        for (auto& value : m_callbacks)
-+            value();
-+        m_callbacks.clear();
++        Vector<Function<void (const DrawingAreaProxyCoordinatedGraphics&)>> callbacks;
++        callbacks.swap(m_callbacks);
++        for (auto& cb : callbacks)
++            cb(*this);
 +    }
  }
  
  #if !PLATFORM(WPE)
 diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h
-index d2ceeda76e90ab2041f238c240f81bf9e37f6072..faa338a2b4af13663bb63efc940b7efe5544e409 100644
+index 9c2bde0db0e4032a32e6ae02dc45af335df92f7a..3f3a58ee9b0f5c0ddad84f41cf3acd6199d81c37 100644
 --- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h
 +++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.h
 @@ -29,6 +29,7 @@
@@ -11950,54 +11047,33 @@ index d2ceeda76e90ab2041f238c240f81bf9e37f6072..faa338a2b4af13663bb63efc940b7efe
  #include "DrawingAreaProxy.h"
  #include "LayerTreeContext.h"
 +#include <wtf/Function.h>
+ #include <wtf/RefCounted.h>
  #include <wtf/RunLoop.h>
- 
- #if !PLATFORM(WPE)
-@@ -52,6 +53,10 @@ public:
+ #include <wtf/TZoneMalloc.h>
+@@ -60,6 +61,10 @@ public:
  
      bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
      const LayerTreeContext& layerTreeContext() const { return m_layerTreeContext; }
-+    void waitForSizeUpdate(Function<void ()>&&);
-+#if !PLATFORM(WPE)
-+    void captureFrame();
-+#endif
- 
-     void dispatchAfterEnsuringDrawing(CompletionHandler<void()>&&);
- 
-@@ -75,6 +80,9 @@ private:
-     void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override;
-     void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, UpdateInfo&&) override;
-     void updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override;
-+#if PLATFORM(WIN)
-+    void didChangeAcceleratedCompositingMode(bool enabled) override;
++    void waitForSizeUpdate(Function<void (const DrawingAreaProxyCoordinatedGraphics&)>&&);
++#if !PLATFORM(WPE)
++    void captureFrame();
 +#endif
  
-     bool shouldSendWheelEventsToEventDispatcher() const override { return true; }
+     void dispatchAfterEnsuringDrawing(CompletionHandler<void()>&&);
  
-@@ -117,6 +125,7 @@ private:
+@@ -129,6 +134,7 @@ private:
      // The last size we sent to the web process.
      WebCore::IntSize m_lastSentSize;
  
-+    Vector<Function<void ()>> m_callbacks;
++    Vector<Function<void (const DrawingAreaProxyCoordinatedGraphics&)>> m_callbacks;
  
  #if !PLATFORM(WPE)
      bool m_isBackingStoreDiscardable { true };
-@@ -125,6 +134,10 @@ private:
-     RunLoop::Timer m_discardBackingStoreTimer;
- #endif
-     std::unique_ptr<DrawingMonitor> m_drawingMonitor;
-+
-+#if PLATFORM(WIN)
-+    bool m_isInAcceleratedCompositingMode { false };
-+#endif
- };
- 
- } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
-index 0295a560194b82bf172bfe978c711bb8f280f8e4..e8584dc0133a6a57734c63f6020f3d27dbcd04d7 100644
+index bdc3efe299296ef6ef10d32672e22fba05ca230c..a24e9c7e4b0da65099326b6921ed03b4deb4cc86 100644
 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
 +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.cpp
-@@ -40,8 +40,10 @@
+@@ -41,8 +41,10 @@
  #include <WebCore/MIMETypeRegistry.h>
  #include <WebCore/ResourceResponseBase.h>
  #include <wtf/FileSystem.h>
@@ -12008,32 +11084,35 @@ index 0295a560194b82bf172bfe978c711bb8f280f8e4..e8584dc0133a6a57734c63f6020f3d27
  
  #if PLATFORM(MAC)
  #include <pal/spi/mac/QuarantineSPI.h>
-@@ -58,7 +60,10 @@ DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebsiteDataStor
-     , m_request(resourceRequest)
-     , m_originatingPage(originatingPage)
-     , m_frameInfo(API::FrameInfo::create(FrameInfoData { frameInfoData }, originatingPage))
+@@ -66,7 +68,10 @@ DownloadProxy::DownloadProxy(DownloadProxyMap& downloadProxyMap, WebsiteDataStor
+ #if HAVE(MODERN_DOWNLOADPROGRESS)
+     , m_assertion(ProcessAssertion::create(getCurrentProcessID(), "WebKit DownloadProxy DecideDestination"_s, ProcessAssertionType::FinishTaskInterruptable))
+ #endif
 +    , m_uuid(createVersion4UUIDString())
  {
 +    if (auto* instrumentation = m_dataStore->downloadInstrumentation())
-+      instrumentation->downloadCreated(m_uuid, m_request, frameInfoData, originatingPage, this);
++      instrumentation->downloadCreated(m_uuid, m_request, m_frameInfo->frameInfoData(), originatingPage, this);
  }
  
  DownloadProxy::~DownloadProxy()
-@@ -77,9 +82,12 @@ static RefPtr<API::Data> createData(std::span<const uint8_t> data)
- void DownloadProxy::cancel(CompletionHandler<void(API::Data*)>&& completionHandler)
+@@ -86,12 +91,15 @@ void DownloadProxy::cancel(CompletionHandler<void(API::Data*)>&& completionHandl
  {
+     m_downloadIsCancelled = true;
      if (m_dataStore) {
--        m_dataStore->networkProcess().sendWithAsyncReply(Messages::NetworkProcess::CancelDownload(m_downloadID), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler)] (std::span<const uint8_t> resumeData) mutable {
+-        protectedDataStore()->protectedNetworkProcess()->sendWithAsyncReply(Messages::NetworkProcess::CancelDownload(m_downloadID), [weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] (std::span<const uint8_t> resumeData) mutable {
 +        auto* instrumentation = m_dataStore->downloadInstrumentation();
-+        m_dataStore->networkProcess().sendWithAsyncReply(Messages::NetworkProcess::CancelDownload(m_downloadID), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler), instrumentation] (std::span<const uint8_t> resumeData) mutable {
-             m_legacyResumeData = createData(resumeData);
-             completionHandler(m_legacyResumeData.get());
++        protectedDataStore()->protectedNetworkProcess()->sendWithAsyncReply(Messages::NetworkProcess::CancelDownload(m_downloadID), [weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler), instrumentation] (std::span<const uint8_t> resumeData) mutable {
+             RefPtr protectedThis = weakThis.get();
+             if (!protectedThis)
+                 return completionHandler(nullptr);
+             protectedThis->m_legacyResumeData = createData(resumeData);
+             completionHandler(protectedThis->m_legacyResumeData.get());
 +            if (instrumentation)
-+                instrumentation->downloadFinished(m_uuid, "canceled"_s);
-             m_downloadProxyMap.downloadFinished(*this);
++                instrumentation->downloadFinished(protectedThis->m_uuid, "canceled"_s);
+             if (RefPtr downloadProxyMap = protectedThis->m_downloadProxyMap.get())
+                 downloadProxyMap->downloadFinished(*protectedThis);
          });
-     } else
-@@ -164,6 +172,21 @@ void DownloadProxy::decideDestinationWithSuggestedFilename(const WebCore::Resour
+@@ -163,6 +171,33 @@ void DownloadProxy::decideDestinationWithSuggestedFilename(const WebCore::Resour
          suggestedFilename = m_suggestedFilename;
      suggestedFilename = MIMETypeRegistry::appendFileExtensionIfNecessary(suggestedFilename, response.mimeType());
  
@@ -12048,48 +11127,60 @@ index 0295a560194b82bf172bfe978c711bb8f280f8e4..e8584dc0133a6a57734c63f6020f3d27
 +            if (auto handle = SandboxExtension::createHandle(destination, SandboxExtension::Type::ReadWrite))
 +                sandboxExtensionHandle = WTFMove(*handle);
 +        }
-+        completionHandler(destination, WTFMove(sandboxExtensionHandle), AllowOverwrite::Yes);
++        m_client->decidePlaceholderPolicy(*this, [completionHandler = WTFMove(completionHandler), destination = WTFMove(destination), sandboxExtensionHandle = WTFMove(sandboxExtensionHandle)] (WebKit::UseDownloadPlaceholder usePlaceholder, const URL& url) mutable {
++            SandboxExtension::Handle placeHolderSandboxExtensionHandle;
++            Vector<uint8_t> bookmarkData;
++            Vector<uint8_t> activityTokenData;
++#if HAVE(MODERN_DOWNLOADPROGRESS)
++            bookmarkData = bookmarkDataForURL(url);
++            activityTokenData = activityAccessToken();
++#else
++            if (auto handle = SandboxExtension::createHandle(url.fileSystemPath(), SandboxExtension::Type::ReadWrite))
++                placeHolderSandboxExtensionHandle = WTFMove(*handle);
++#endif
++            completionHandler(destination, WTFMove(sandboxExtensionHandle), AllowOverwrite::Yes, WebKit::UseDownloadPlaceholder::No, url, WTFMove(placeHolderSandboxExtensionHandle), bookmarkData.span(), activityTokenData.span());
++        });
 +        return;
 +    }
 +
-     m_client->decideDestinationWithSuggestedFilename(*this, response, ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler)] (AllowOverwrite allowOverwrite, String destination) mutable {
+     protectedClient()->decideDestinationWithSuggestedFilename(*this, response, ResourceResponseBase::sanitizeSuggestedFilename(suggestedFilename), [this, protectedThis = Ref { *this }, completionHandler = WTFMove(completionHandler)] (AllowOverwrite allowOverwrite, String destination) mutable {
          SandboxExtension::Handle sandboxExtensionHandle;
          if (!destination.isNull()) {
-@@ -212,6 +235,8 @@ void DownloadProxy::didFinish()
-     updateQuarantinePropertiesIfPossible();
- #endif
-     m_client->didFinish(*this);
+@@ -227,6 +262,8 @@ void DownloadProxy::didFinish()
+     protectedClient()->didFinish(*this);
+     if (m_downloadIsCancelled)
+         return;
 +    if (auto* instrumentation = m_dataStore->downloadInstrumentation())
 +      instrumentation->downloadFinished(m_uuid, String());
  
      // This can cause the DownloadProxy object to be deleted.
-     m_downloadProxyMap.downloadFinished(*this);
-@@ -222,6 +247,8 @@ void DownloadProxy::didFail(const ResourceError& error, std::span<const uint8_t>
+     if (RefPtr downloadProxyMap = m_downloadProxyMap.get())
+@@ -241,6 +278,8 @@ void DownloadProxy::didFail(const ResourceError& error, std::span<const uint8_t>
      m_legacyResumeData = createData(resumeData);
  
-     m_client->didFail(*this, error, m_legacyResumeData.get());
+     protectedClient()->didFail(*this, error, m_legacyResumeData.get());
 +    if (auto* instrumentation = m_dataStore->downloadInstrumentation())
 +      instrumentation->downloadFinished(m_uuid, error.localizedDescription());
  
      // This can cause the DownloadProxy object to be deleted.
-     m_downloadProxyMap.downloadFinished(*this);
+     if (RefPtr downloadProxyMap = m_downloadProxyMap.get())
 diff --git a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
-index 6f0d076b1b1cb0ec3e1c7fdc5f3a6dfffe9ee63d..656d4259dbf9ab97a8b0408c061c0fd2de8beaa7 100644
+index 9a92a8cde3b5d1da0fbbf5fe7c549cebb8a7f2f7..9ce201ca2d7aa002c7bd389f1fe03edfb306df5d 100644
 --- a/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
 +++ b/Source/WebKit/UIProcess/Downloads/DownloadProxy.h
-@@ -143,6 +143,7 @@ private:
- #if PLATFORM(COCOA)
-     RetainPtr<NSProgress> m_progress;
+@@ -166,6 +166,7 @@ private:
+ #if HAVE(MODERN_DOWNLOADPROGRESS)
+     RefPtr<ProcessAssertion> m_assertion;
  #endif
 +    String m_uuid;
  };
  
  } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.h b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-index 8cfe9bf3d49afd3345209c22c59663f72791fea4..9c13c012e21b33a889eb04a3733712a66470a88e 100644
+index e1f55b4a7fbc452ca1f2eb025b0c88ec9f4b845f..beb3c7a6619b554bb3186a0de917f497ac0f47f8 100644
 --- a/Source/WebKit/UIProcess/DrawingAreaProxy.h
 +++ b/Source/WebKit/UIProcess/DrawingAreaProxy.h
-@@ -89,6 +89,7 @@ public:
+@@ -94,6 +94,7 @@ public:
  
      const WebCore::IntSize& size() const { return m_size; }
      bool setSize(const WebCore::IntSize&, const WebCore::IntSize& scrollOffset = { });
@@ -12097,323 +11188,12 @@ index 8cfe9bf3d49afd3345209c22c59663f72791fea4..9c13c012e21b33a889eb04a3733712a6
  
      virtual void minimumSizeForAutoLayoutDidChange() { }
      virtual void sizeToContentAutoSizeMaximumSizeDidChange() { }
-@@ -172,6 +173,10 @@ private:
-     virtual void update(uint64_t /* backingStoreStateID */, UpdateInfo&&) { }
-     virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, UpdateInfo&&) { }
- #endif
-+
-+#if PLATFORM(WIN)
-+    virtual void didChangeAcceleratedCompositingMode(bool) { }
-+#endif
- };
- 
- } // namespace WebKit
-diff --git a/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in b/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in
-index fc5c53f18ad2dee2c2f40cdbb86ca7f24b262d8d..d93d804d3a8ebaa30856710df544f3db5aa7ad2d 100644
---- a/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in
-+++ b/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in
-@@ -30,4 +30,7 @@ messages -> DrawingAreaProxy NotRefCounted {
-     Update(uint64_t stateID, struct WebKit::UpdateInfo updateInfo) CanDispatchOutOfOrder
-     ExitAcceleratedCompositingMode(uint64_t backingStoreStateID, struct WebKit::UpdateInfo updateInfo)
- #endif
-+#if PLATFORM(WIN)
-+    DidChangeAcceleratedCompositingMode(bool enabled)
-+#endif
- }
-diff --git a/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp
-new file mode 100644
-index 0000000000000000000000000000000000000000..f9af359a8b81babaf855132ec168feb22ef5799b
---- /dev/null
-+++ b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp
-@@ -0,0 +1,246 @@
-+/* Copyright 2018 Bernhard R. Fischer, 4096R/8E24F29D <bf@abenteuerland.at>
-+ *
-+ * This file is part of Cairo_JPG.
-+ *
-+ * Cairo_JPG is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published by
-+ * the Free Software Foundation, either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * Cairo_JPG is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with Cairo_JPG.  If not, see <https://www.gnu.org/licenses/>.
-+ */
-+
-+/*! \file cairo_jpg.c
-+ * This file contains two functions for reading and writing JPEG files from
-+ * and to Cairo image surfaces. It uses the functions from the libjpeg.
-+ * Most of the code is directly derived from the online example at
-+ * http://libjpeg-turbo.virtualgl.org/Documentation/Documentation
-+ *
-+ * All prototypes are defined in cairo_jpg.h All functions and their parameters
-+ * and return values are described below directly at the functions. You may
-+ * also have a look at the preprocessor macros defined below.
-+ *
-+ * To compile this code you need to have installed the packages libcairo2-dev
-+ * and libjpeg-dev. Compile with the following to create an object file to link
-+ * with your code:
-+ * gcc -std=c99 -Wall -c `pkg-config cairo libjpeg --cflags --libs` cairo_jpg.c
-+ * Use the following command to include the main() function and create an
-+ * executable for testing of this code:
-+ * gcc -std=c99 -Wall -o cairo_jpg -DCAIRO_JPEG_MAIN `pkg-config cairo libjpeg --cflags --libs` cairo_jpg.c
-+ *
-+ * @author Bernhard R. Fischer, 4096R/8E24F29D bf@abenteuerland.at
-+ * @version 2020/01/18
-+ * @license LGPL3.
-+ */
-+
-+#include "config.h"
-+
-+#if USE(CAIRO)
-+
-+#include "CairoJpegEncoder.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <cairo.h>
-+extern "C" {
-+#include "jpeglib.h"
-+}
-+
-+/*! Macro to activate main() function. This is only used for testing. Comment
-+ * it out (#undef) if you link this file to your own program.
-+ */
-+//#define CAIRO_JPEG_MAIN
-+//
-+/*! Define this to use an alternate implementation of
-+ * cairo_image_surface_create_from_jpeg() which fstat(3)s the file before
-+ * reading (see below). For huge files this /may/ be slightly faster.
-+ */
-+#undef CAIRO_JPEG_USE_FSTAT
-+
-+/*! This is the read block size for the stream reader
-+ * cairo_image_surface_create_from_jpeg_stream().
-+ */
-+#ifdef USE_CAIRO_READ_FUNC_LEN_T
-+#define CAIRO_JPEG_IO_BLOCK_SIZE 4096
-+#else
-+/*! Block size has to be one if cairo_read_func_t is in use because of the lack
-+ * to detect EOF (truncated reads).
-+ */
-+#define CAIRO_JPEG_IO_BLOCK_SIZE 1
-+/*! In case of original cairo_read_func_t is used fstat() should be used for
-+ * performance reasons (see CAIRO_JPEG_USE_FSTAT above).
-+ */
-+#define CAIRO_JPEG_USE_FSTAT
-+#endif
-+
-+/*! Define this to test jpeg creation with non-image surfaces. This is only for
-+ * testing and is to be used together with CAIRO_JPEG_MAIN.  
-+ */
-+#undef CAIRO_JPEG_TEST_SIMILAR
-+#if defined(CAIRO_JPEG_TEST_SIMILAR) && defined(CAIRO_JPEG_MAIN)
-+#include <cairo-pdf.h>
-+#endif
-+
-+
-+#ifndef LIBJPEG_TURBO_VERSION
-+/*! This function makes a covnersion for "odd" pixel sizes which typically is a
-+ * conversion from a 3-byte to a 4-byte (or more) pixel size or vice versa.
-+ * The conversion is done from the source buffer src to the destination buffer
-+ * dst. The caller MUST ensure that src and dst have the correct memory size.
-+ * This is dw * num for dst and sw * num for src. src and dst may point to the
-+ * same memory address.
-+ * @param dst Pointer to destination buffer.
-+ * @param dw Pixel width (in bytes) of pixels in destination buffer, dw >= 3.
-+ * @param src Pointer to source buffer.
-+ * @param sw Pixel width (in bytes) of pixels in source buffer, sw >= 3.
-+ * @param num Number of pixels to convert, num >= 1;
-+ */
-+static void pix_conv(unsigned char *dst, int dw, const unsigned char *src, int sw, int num)
-+{
-+   int si, di;
-+
-+   // safety check
-+   if (dw < 3 || sw < 3 || dst == NULL || src == NULL)
-+      return;
-+
-+   num--;
-+   for (si = num * sw, di = num * dw; si >= 0; si -= sw, di -= dw)
-+   {
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+      dst[di + 2] = src[si    ];
-+      dst[di + 1] = src[si + 1];
-+      dst[di + 0] = src[si + 2];
-+#else
-+      // FIXME: This is untested, it may be wrong.
-+      dst[di - 3] = src[si - 3];
-+      dst[di - 2] = src[si - 2];
-+      dst[di - 1] = src[si - 1];
-+#endif
-+   }
-+}
-+#endif
-+
-+
-+/*! This function creates a JPEG file in memory from a Cairo image surface.
-+ * @param sfc Pointer to a Cairo surface. It should be an image surface of
-+ * either CAIRO_FORMAT_ARGB32 or CAIRO_FORMAT_RGB24. Other formats are
-+ * converted to CAIRO_FORMAT_RGB24 before compression.
-+ * Please note that this may give unexpected results because JPEG does not
-+ * support transparency. Thus, default background color is used to replace
-+ * transparent regions. The default background color is black if not specified
-+ * explicitly. Thus converting e.g. PDF surfaces without having any specific
-+ * background color set will apear with black background and not white as you
-+ * might expect. In such cases it is suggested to manually convert the surface
-+ * to RGB24 before calling this function.
-+ * @param data Pointer to a memory pointer. This parameter receives a pointer
-+ * to the memory area where the final JPEG data is found in memory. This
-+ * function reserves the memory properly and it has to be freed by the caller
-+ * with free(3).
-+ * @param len Pointer to a variable of type size_t which will receive the final
-+ * lenght of the memory buffer.
-+ * @param quality Compression quality, 0-100.
-+ * @return On success the function returns CAIRO_STATUS_SUCCESS. In case of
-+ * error CAIRO_STATUS_INVALID_FORMAT is returned.
-+ */
-+cairo_status_t cairo_image_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality)
-+{
-+   struct jpeg_compress_struct cinfo;
-+   struct jpeg_error_mgr jerr;
-+   JSAMPROW row_pointer[1];
-+   cairo_surface_t *other = NULL;
-+
-+   // check valid input format (must be IMAGE_SURFACE && (ARGB32 || RGB24))
-+   if (cairo_surface_get_type(sfc) != CAIRO_SURFACE_TYPE_IMAGE ||
-+         (cairo_image_surface_get_format(sfc) != CAIRO_FORMAT_ARGB32 &&
-+         cairo_image_surface_get_format(sfc) != CAIRO_FORMAT_RGB24))
-+   {
-+      // create a similar surface with a proper format if supplied input format
-+      // does not fulfill the requirements
-+      double x1, y1, x2, y2;
-+      other = sfc;
-+      cairo_t *ctx = cairo_create(other);
-+      // get extents of original surface
-+      cairo_clip_extents(ctx, &x1, &y1, &x2, &y2);
-+      cairo_destroy(ctx);
-+
-+      // create new image surface
-+      sfc = cairo_surface_create_similar_image(other, CAIRO_FORMAT_RGB24, x2 - x1, y2 - y1);
-+      if (cairo_surface_status(sfc) != CAIRO_STATUS_SUCCESS)
-+         return CAIRO_STATUS_INVALID_FORMAT;
-+
-+      // paint original surface to new surface
-+      ctx = cairo_create(sfc);
-+      cairo_set_source_surface(ctx, other, 0, 0);
-+      cairo_paint(ctx);
-+      cairo_destroy(ctx);
-+   }
-+
-+   // finish queued drawing operations
-+   cairo_surface_flush(sfc);
-+
-+   // init jpeg compression structures
-+   cinfo.err = jpeg_std_error(&jerr);
-+   jpeg_create_compress(&cinfo);
-+
-+   // set compression parameters
-+   unsigned long targetSize;
-+   jpeg_mem_dest(&cinfo, data, &targetSize);
-+
-+   cinfo.image_width = cairo_image_surface_get_width(sfc);
-+   cinfo.image_height = cairo_image_surface_get_height(sfc);
-+#ifdef LIBJPEG_TURBO_VERSION
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+   //cinfo.in_color_space = JCS_EXT_BGRX;
-+   cinfo.in_color_space = cairo_image_surface_get_format(sfc) == CAIRO_FORMAT_ARGB32 ? JCS_EXT_BGRA : JCS_EXT_BGRX;
-+#else
-+   //cinfo.in_color_space = JCS_EXT_XRGB;
-+   cinfo.in_color_space = cairo_image_surface_get_format(sfc) == CAIRO_FORMAT_ARGB32 ? JCS_EXT_ARGB : JCS_EXT_XRGB;
-+#endif
-+   cinfo.input_components = 4;
-+#else
-+   cinfo.in_color_space = JCS_RGB;
-+   cinfo.input_components = 3;
-+#endif
-+   jpeg_set_defaults(&cinfo);
-+   jpeg_set_quality(&cinfo, quality, TRUE);
-+
-+   // start compressor
-+   jpeg_start_compress(&cinfo, TRUE);
-+
-+   // loop over all lines and compress
-+   while (cinfo.next_scanline < cinfo.image_height)
-+   {
-+#ifdef LIBJPEG_TURBO_VERSION
-+      row_pointer[0] = cairo_image_surface_get_data(sfc) + (cinfo.next_scanline
-+            * cairo_image_surface_get_stride(sfc));
-+#else
-+      unsigned char row_buf[3 * cinfo.image_width];
-+      pix_conv(row_buf, 3, cairo_image_surface_get_data(sfc) +
-+            (cinfo.next_scanline * cairo_image_surface_get_stride(sfc)), 4, cinfo.image_width);
-+      row_pointer[0] = row_buf;
-+#endif
-+      (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
-+   }
-+
-+   // finalize and close everything
-+   jpeg_finish_compress(&cinfo);
-+   jpeg_destroy_compress(&cinfo);
-+
-+   // destroy temporary image surface (if available)
-+   if (other != NULL)
-+      cairo_surface_destroy(sfc);
-+
-+   *len = targetSize;
-+   return CAIRO_STATUS_SUCCESS;
-+}
-+
-+#endif
-diff --git a/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.h b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..4ec8b96bbbddf8a7b042f53a8068754a384fc7ad
---- /dev/null
-+++ b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.h
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright (C) Microsoft. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-+ * THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#pragma once
-+
-+#include <cairo.h>
-+
-+cairo_status_t cairo_image_surface_write_to_jpeg_mem(cairo_surface_t *sfc, unsigned char **data, size_t *len, int quality);
 diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760acda1c14
+index 0000000000000000000000000000000000000000..0615d7de9494901c53131b45018ee48612e7cfca
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
-@@ -0,0 +1,305 @@
+@@ -0,0 +1,326 @@
 +/*
 + * Copyright (C) 2020 Microsoft Corporation.
 + *
@@ -12450,20 +11230,29 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +#include <pal/crypto/CryptoDigest.h>
 +#include <JavaScriptCore/InspectorFrontendRouter.h>
 +#include <WebCore/NotImplemented.h>
++#include <wtf/Compiler.h>
 +#include <wtf/RunLoop.h>
 +#include <wtf/UUID.h>
 +#include <wtf/text/Base64.h>
 +
-+#if USE(CAIRO)
-+#include "CairoJpegEncoder.h"
++#if USE(SKIA)
 +#include "DrawingAreaProxyCoordinatedGraphics.h"
 +#include "DrawingAreaProxy.h"
++#include <skia/core/SkBitmap.h>
++#include <skia/core/SkCanvas.h>
++#include <skia/core/SkImage.h>
++#include <skia/core/SkPixmap.h>
++#include <skia/core/SkData.h>
++#include <skia/core/SkStream.h>
++#include <skia/encode/SkJpegEncoder.h>
 +#endif
 +
 +#if PLATFORM(MAC)
 +#include <WebCore/ImageBufferUtilitiesCG.h>
 +#endif
 +
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
++
 +namespace WebKit {
 +
 +const int kMaxFramesInFlight = 1;
@@ -12500,33 +11289,36 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +    m_encoder = nullptr;
 +}
 +
-+#if USE(CAIRO)
-+void InspectorScreencastAgent::didPaint(cairo_surface_t* surface)
++#if USE(SKIA)
++void InspectorScreencastAgent::didPaint(sk_sp<SkImage>&& surface)
 +{
-+#if PLATFORM(WPE)
++    sk_sp<SkImage> image(surface);
++#if PLATFORM(WPE) || PLATFORM(WIN)
 +    // Get actual image size (in device pixels).
-+    WebCore::IntSize displaySize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
++    WebCore::IntSize displaySize(image->width(), image->height());
 +
 +    WebCore::IntSize drawingAreaSize = m_page.drawingArea()->size();
 +    drawingAreaSize.scale(m_page.deviceScaleFactor());
 +    if (drawingAreaSize != displaySize) {
 +        return;
 +    }
-+
 +#else
 +    WebCore::IntSize displaySize = m_page.drawingArea()->size();
 +#endif
++    // Do not WTFMove image here as it is used below
 +    if (m_encoder)
-+        m_encoder->encodeFrame(surface, displaySize);
++        m_encoder->encodeFrame(sk_sp<SkImage>(image), displaySize);
 +    if (m_screencast) {
-+
 +        {
++            SkPixmap pixmap;
++            if (!image->peekPixels(&pixmap)) {
++                fprintf(stderr, "Failed to peek pixels from SkImage to compute hash\n");
++                return;
++            }
 +            // Do not send the same frame over and over.
-+            unsigned char *data = cairo_image_surface_get_data(surface);
-+            int stride = cairo_image_surface_get_stride(surface);
-+            int height = cairo_image_surface_get_height(surface);
++            size_t len = pixmap.computeByteSize();
 +            auto cryptoDigest = PAL::CryptoDigest::create(PAL::CryptoDigest::Algorithm::SHA_1);
-+            cryptoDigest->addBytes(std::span(data, stride * height));
++            cryptoDigest->addBytes(std::span(reinterpret_cast<const unsigned char*>(pixmap.addr()), len));
 +            auto digest = cryptoDigest->computeHash();
 +            if (m_lastFrameDigest == digest)
 +                return;
@@ -12537,23 +11329,30 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +            return;
 +        // Scale image to fit width / height
 +        double scale = std::min(m_screencastWidth / displaySize.width(), m_screencastHeight / displaySize.height());
-+        RefPtr<cairo_surface_t> scaledSurface;
 +        if (scale < 1) {
-+            WebCore::IntSize scaledSize = displaySize;
-+            scaledSize.scale(scale);
-+            cairo_matrix_t transform;
-+            cairo_matrix_init_scale(&transform, scale, scale);
-+            scaledSurface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, scaledSize.width(), scaledSize.height()));
-+            RefPtr<cairo_t> cr = adoptRef(cairo_create(scaledSurface.get()));
-+            cairo_transform(cr.get(), &transform);
-+            cairo_set_source_surface(cr.get(), surface, 0, 0);
-+            cairo_paint(cr.get());
-+            surface = scaledSurface.get();
++            SkBitmap dstBitmap;
++            dstBitmap.allocPixels(SkImageInfo::MakeN32Premul(displaySize.width() * scale, displaySize.height() * scale));
++            SkCanvas canvas(dstBitmap);
++            canvas.scale(scale, scale);
++            canvas.drawImage(image, 0, 0);
++            image = dstBitmap.asImage();
++        }
++
++        SkPixmap pixmap;
++        if (!image->peekPixels(&pixmap)) {
++            fprintf(stderr, "Failed to peek pixels from SkImage for JPEG encoding\n");
++            return;
++        }
++
++        SkJpegEncoder::Options options;
++        options.fQuality = 90;
++        SkDynamicMemoryWStream stream;
++        if (!SkJpegEncoder::Encode(&stream, pixmap, options)) {
++            fprintf(stderr, "Failed to encode image to JPEG\n");
++            return;
 +        }
-+        unsigned char *data = nullptr;
-+        size_t len = 0;
-+        cairo_image_surface_write_to_jpeg_mem(surface, &data, &len, m_screencastQuality);
-+        String result = base64EncodeToString(data, len);
++        sk_sp<SkData> jpegData = stream.detachAsData();
++        String result = base64EncodeToString(std::span(reinterpret_cast<const unsigned char*>(jpegData->data()), jpegData->size()));
 +        ++m_screencastFramesInFlight;
 +        m_frontendDispatcher->screencastFrame(result, displaySize.width(), displaySize.height());
 +    }
@@ -12642,7 +11441,7 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +        scheduleFrameEncoding();
 +#endif
 +    }
-+    m_page.forceRepaint([] { });
++    m_page.updateRenderingWithForcedRepaint([] { });
 +}
 +
 +#if !PLATFORM(WPE)
@@ -12668,7 +11467,7 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +{
 +    if (!m_encoder && !m_screencast)
 +        return;
-+    RetainPtr<CGImageRef> imageRef = m_page.pageClient().takeSnapshotForAutomation();
++    RetainPtr<CGImageRef> imageRef = m_page.pageClient()->takeSnapshotForAutomation();
 +    if (m_screencast && m_screencastFramesInFlight <= kMaxFramesInFlight) {
 +        CGImage* imagePtr = imageRef.get();
 +        WebCore::IntSize imageSize(CGImageGetWidth(imagePtr), CGImageGetHeight(imagePtr));
@@ -12707,7 +11506,7 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +}
 +#endif
 +
-+#if USE(CAIRO) && !PLATFORM(WPE)
++#if PLATFORM(GTK) || PLATFORM(WIN)
 +void InspectorScreencastAgent::encodeFrame()
 +{
 +    if (!m_encoder && !m_screencast)
@@ -12719,12 +11518,14 @@ index 0000000000000000000000000000000000000000..91cf94cd292350afb3e3ed071ca44760
 +#endif
 +
 +} // namespace WebKit
++
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
 diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..d28dde452275f18739e3b1c8d709185c9bf0f40e
+index 0000000000000000000000000000000000000000..6e031f61b132176587643bc79b23202009c4aca4
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,102 @@
 +/*
 + * Copyright (C) 2020 Microsoft Corporation.
 + *
@@ -12756,10 +11557,6 @@ index 0000000000000000000000000000000000000000..d28dde452275f18739e3b1c8d709185c
 +#include <JavaScriptCore/InspectorBackendDispatchers.h>
 +#include <JavaScriptCore/InspectorFrontendDispatchers.h>
 +
-+#if USE(CAIRO)
-+#include <cairo.h>
-+#endif
-+
 +#include <wtf/Forward.h>
 +#include <wtf/Noncopyable.h>
 +#include <wtf/WeakPtr.h>
@@ -12772,6 +11569,15 @@ index 0000000000000000000000000000000000000000..d28dde452275f18739e3b1c8d709185c
 +}
 +
 +namespace WebKit {
++class InspectorScreencastAgent;
++}
++
++namespace WTF {
++template<typename T> struct IsDeprecatedWeakRefSmartPointerException;
++template<> struct IsDeprecatedWeakRefSmartPointerException<WebKit::InspectorScreencastAgent> : std::true_type { };
++}
++
++namespace WebKit {
 +
 +class ScreencastEncoder;
 +class WebPageProxy;
@@ -12786,8 +11592,8 @@ index 0000000000000000000000000000000000000000..d28dde452275f18739e3b1c8d709185c
 +    void didCreateFrontendAndBackend(Inspector::FrontendRouter*, Inspector::BackendDispatcher*) override;
 +    void willDestroyFrontendAndBackend(Inspector::DisconnectReason) override;
 +
-+#if USE(CAIRO)
-+    void didPaint(cairo_surface_t*);
++#if USE(SKIA)
++    void didPaint(sk_sp<SkImage>&& surface);
 +#endif
 +
 +    Inspector::Protocol::ErrorStringOr<String /* screencastID */> startVideo(const String& file, int width, int height, int toolbarHeight) override;
@@ -12824,10 +11630,10 @@ index 0000000000000000000000000000000000000000..d28dde452275f18739e3b1c8d709185c
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12f0bca9c5
+index 0000000000000000000000000000000000000000..203cedeea9cbec6964fd297884e03ef791632fe5
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
-@@ -0,0 +1,391 @@
+@@ -0,0 +1,398 @@
 +/*
 + * Copyright (c) 2010, The WebM Project authors. All rights reserved.
 + * Copyright (c) 2013 The Chromium Authors. All rights reserved.
@@ -12864,15 +11670,22 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +#include <vpx/vp8.h>
 +#include <vpx/vp8cx.h>
 +#include <vpx/vpx_encoder.h>
++#include <wtf/Compiler.h>
 +#include <wtf/RunLoop.h>
 +#include <wtf/UniqueArray.h>
 +#include <wtf/WorkQueue.h>
++#include <wtf/text/MakeString.h>
 +#include <wtf/text/StringConcatenateNumbers.h>
 +
-+#if USE(CAIRO)
-+#include <WebCore/RefPtrCairo.h>
++#if USE(SKIA)
++#include <skia/core/SkBitmap.h>
++#include <skia/core/SkCanvas.h>
++#include <skia/core/SkData.h>
++#include <skia/core/SkImage.h>
 +#endif
 +
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
++
 +using namespace WebCore;
 +
 +namespace WebKit {
@@ -12957,8 +11770,8 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +    WTF_MAKE_NONCOPYABLE(VPXFrame);
 +    WTF_MAKE_FAST_ALLOCATED;
 +public:
-+#if USE(CAIRO)
-+    explicit VPXFrame(RefPtr<cairo_surface_t>&& surface)
++#if USE(SKIA)
++    explicit VPXFrame(sk_sp<SkImage>&& surface)
 +        : m_surface(WTFMove(surface))
 +    { }
 +#elif PLATFORM(MAC)
@@ -12973,10 +11786,15 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +
 +    void convertToVpxImage(vpx_image_t* image)
 +    {
-+#if USE(CAIRO)
++#if USE(SKIA)
 +        // Convert the updated region to YUV ready for encoding.
-+        const uint8_t* argb_data = cairo_image_surface_get_data(m_surface.get());
-+        int argb_stride = cairo_image_surface_get_stride(m_surface.get());
++        SkImageInfo info = SkImageInfo::Make(m_surface->width(), m_surface->height(), kN32_SkColorType, kPremul_SkAlphaType);
++        int argb_stride = info.minRowBytes();
++        size_t bufferSize = info.computeByteSize(argb_stride);
++        UniqueArray<uint8_t> buffer = makeUniqueArray<uint8_t>(bufferSize);
++        uint8_t* argb_data = buffer.get();
++        if (!m_surface->readPixels(info, argb_data, argb_stride, 0, 0))
++            fprintf(stderr, "Read SkImage to ARGB buffer\n");
 +#elif PLATFORM(MAC)
 +        int argb_stride = image->w * 4;
 +        UniqueArray<uint8_t> buffer = makeUniqueArray<uint8_t>(argb_stride * image->h);
@@ -12999,8 +11817,8 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +    }
 +
 +private:
-+#if USE(CAIRO)
-+    RefPtr<cairo_surface_t> m_surface;
++#if USE(SKIA)
++    sk_sp<SkImage> m_surface;
 +#elif PLATFORM(MAC)
 +    RetainPtr<CGImageRef> m_windowImage;
 +    int m_offsetTop { 0 };
@@ -13121,7 +11939,7 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +    memset(&cfg, 0, sizeof(cfg));
 +    vpx_codec_err_t error = vpx_codec_enc_config_default(codec_interface, &cfg, 0);
 +    if (error) {
-+        errorString = makeString("Failed to get default codec config: "_s, vpx_codec_err_to_string(error));
++        errorString = makeString("Failed to get default codec config: "_s, unsafeSpan(vpx_codec_err_to_string(error)));
 +        return nullptr;
 +    }
 +
@@ -13133,13 +11951,13 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +
 +    ScopedVpxCodec codec(new vpx_codec_ctx_t);
 +    if (vpx_codec_enc_init(codec.get(), codec_interface, &cfg, 0)) {
-+        errorString = makeString("Failed to initialize encoder: "_s, vpx_codec_error(codec.get()));
++        errorString = makeString("Failed to initialize encoder: "_s, unsafeSpan(vpx_codec_error(codec.get())));
 +        return nullptr;
 +    }
 +
 +    FILE* file = fopen(filePath.utf8().data(), "wb");
 +    if (!file) {
-+        errorString = makeString("Failed to open file '", filePath, "' for writing: ", strerror(errno));
++        errorString = makeString("Failed to open file '"_s, filePath, "' for writing: "_s, unsafeSpan(strerror(errno)));
 +        return nullptr;
 +    }
 +
@@ -13162,8 +11980,8 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +    m_lastFrameTimestamp = now;
 +}
 +
-+#if USE(CAIRO)
-+void ScreencastEncoder::encodeFrame(cairo_surface_t* drawingAreaSurface, IntSize size)
++#if USE(SKIA)
++void ScreencastEncoder::encodeFrame(sk_sp<SkImage>&& image, IntSize size)
 +{
 +    flushLastFrame();
 +    // Note that in WPE drawing area size is updated asynchronously and may differ from acutal
@@ -13171,27 +11989,20 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +    if (size.isZero()) {
 +        return;
 +    }
-+
-+    RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, m_size.width(), m_size.height()));
-+    {
-+        RefPtr<cairo_t> cr = adoptRef(cairo_create(surface.get()));
-+
-+        cairo_matrix_t transform;
-+        if (size.width() > m_size.width() || size.height() > m_size.height()) {
-+            // If no scale is specified shrink to fit the frame.
-+            double scale = std::min(static_cast<double>(m_size.width()) / size.width(),
-+                                    static_cast<double>(m_size.height()) / size.height());
-+            cairo_matrix_init_scale(&transform, scale, scale);
-+            cairo_transform(cr.get(), &transform);
-+        }
-+
-+        // Record top left part of the drawing area that fits into the frame.
-+        cairo_set_source_surface(cr.get(), drawingAreaSurface, 0, 0);
-+        cairo_paint(cr.get());
++    SkBitmap surface;
++    surface.allocPixels(SkImageInfo::Make(m_size.width(), m_size.height(), kBGRA_8888_SkColorType, kPremul_SkAlphaType));
++    SkCanvas canvas(surface);
++    SkMatrix transform;
++    if (size.width() > m_size.width() || size.height() > m_size.height()) {
++        // If no scale is specified shrink to fit the frame.
++        double scale = std::min(static_cast<double>(m_size.width()) / size.width(),
++                                static_cast<double>(m_size.height()) / size.height());
++        transform.setScale(scale, scale);
++        canvas.setMatrix(transform);
 +    }
-+    cairo_surface_flush(surface.get());
-+
-+    m_lastFrame = makeUnique<VPXFrame>(WTFMove(surface));
++    // Record top left part of the drawing area that fits into the frame.
++    canvas.drawImage(image, 0, 0);
++    m_lastFrame = makeUnique<VPXFrame>(surface.asImage());
 +}
 +#elif PLATFORM(MAC)
 +void ScreencastEncoder::encodeFrame(RetainPtr<CGImageRef>&& windowImage)
@@ -13219,9 +12030,11 @@ index 0000000000000000000000000000000000000000..90080e92c8278e73355c1fd4c571ea12
 +
 +
 +} // namespace WebKit
++
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
 diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..36df6131950ca95f74dc191628376fc589dbcb33
+index 0000000000000000000000000000000000000000..433af017b68b71cfb68c3ebcc0bd2aeb9efc40f7
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h
 @@ -0,0 +1,80 @@
@@ -13259,8 +12072,8 @@ index 0000000000000000000000000000000000000000..36df6131950ca95f74dc191628376fc5
 +#include <wtf/ThreadSafeRefCounted.h>
 +#include <wtf/WeakPtr.h>
 +
-+#if USE(CAIRO)
-+#include <cairo.h>
++#if USE(SKIA)
++#include <skia/core/SkImage.h>
 +#endif
 +
 +namespace WebKit {
@@ -13279,8 +12092,8 @@ index 0000000000000000000000000000000000000000..36df6131950ca95f74dc191628376fc5
 +    ScreencastEncoder(std::unique_ptr<VPXCodec>&&, WebCore::IntSize);
 +    ~ScreencastEncoder();
 +
-+#if USE(CAIRO)
-+    void encodeFrame(cairo_surface_t*, WebCore::IntSize);
++#if USE(SKIA)
++    void encodeFrame(sk_sp<SkImage>&&, WebCore::IntSize);
 +#elif PLATFORM(MAC)
 +    void encodeFrame(RetainPtr<CGImageRef>&&);
 +    void setOffsetTop(int offset) { m_offsetTop = offset;}
@@ -13440,10 +12253,10 @@ index 0000000000000000000000000000000000000000..e2ce910f3fd7f587add552275b7e7176
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp
-index fedef553cec70feb6c6475a5f752fbc6833dbb38..16e73d6a724dd80487b7b140aaaccfec253eb7aa 100644
+index 76cc869ca4d5fc311040a285d50a44f00273fd63..633f8323697f0c2f30311a35ac3876bf8e03b741 100644
 --- a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp
 +++ b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.cpp
-@@ -28,11 +28,10 @@
+@@ -28,7 +28,7 @@
  
  #include "MessageSenderInlines.h"
  #include "ProvisionalPageProxy.h"
@@ -13452,43 +12265,30 @@ index fedef553cec70feb6c6475a5f752fbc6833dbb38..16e73d6a724dd80487b7b140aaaccfec
  #include "WebPageInspectorTarget.h"
  #include "WebPageMessages.h"
  #include "WebPageProxy.h"
--#include "WebProcessProxy.h"
- 
- namespace WebKit {
- 
-@@ -40,19 +39,17 @@ using namespace Inspector;
- 
- std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(WebPageProxy& page, const String& targetId, Inspector::InspectorTargetType type)
- {
--    return makeUnique<InspectorTargetProxy>(page, targetId, type);
-+    return makeUnique<InspectorTargetProxy>(page, nullptr, targetId, type);
+@@ -46,13 +46,13 @@ std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(WebPageProxy&
+     return makeUnique<InspectorTargetProxy>(page, targetId, type);
  }
  
 -std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(ProvisionalPageProxy& provisionalPage, const String& targetId, Inspector::InspectorTargetType type)
 +std::unique_ptr<InspectorTargetProxy> InspectorTargetProxy::create(ProvisionalPageProxy& provisionalPage, const String& targetId)
  {
--    Ref page = provisionalPage.page();
--    auto target = InspectorTargetProxy::create(page, targetId, type);
--    target->m_provisionalPage = provisionalPage;
--    return target;
-+    return makeUnique<InspectorTargetProxy>(provisionalPage.page(), &provisionalPage, targetId, Inspector::InspectorTargetType::Page);
- }
- 
--InspectorTargetProxy::InspectorTargetProxy(WebPageProxy& page, const String& targetId, Inspector::InspectorTargetType type)
-+InspectorTargetProxy::InspectorTargetProxy(WebPageProxy& page, ProvisionalPageProxy* provisionalPage, const String& targetId, Inspector::InspectorTargetType type)
-     : m_page(page)
-+    , m_provisionalPage(provisionalPage)
-     , m_identifier(targetId)
-     , m_type(type)
- {
-@@ -99,6 +96,31 @@ void InspectorTargetProxy::didCommitProvisionalTarget()
+     RefPtr page = provisionalPage.page();
+     if (!page)
+         return nullptr;
+ 
+-    auto target = InspectorTargetProxy::create(*page, targetId, type);
++    auto target = InspectorTargetProxy::create(*page, targetId, Inspector::InspectorTargetType::Page);
+     target->m_provisionalPage = provisionalPage;
+     return target;
+ }
+@@ -108,6 +108,31 @@ void InspectorTargetProxy::didCommitProvisionalTarget()
      m_provisionalPage = nullptr;
  }
  
 +void InspectorTargetProxy::willResume()
 +{
-+    if (m_page.hasRunningProcess())
-+        m_page.send(Messages::WebPage::ResumeInspectorIfPausedInNewWindow());
++    if (m_page->hasRunningProcess())
++        m_page->legacyMainFrameProcess().send(Messages::WebPage::ResumeInspectorIfPausedInNewWindow(), m_page->webPageIDInMainFrameProcess());
 +}
 +
 +void InspectorTargetProxy::activate(String& error)
@@ -13505,36 +12305,34 @@ index fedef553cec70feb6c6475a5f752fbc6833dbb38..16e73d6a724dd80487b7b140aaaccfec
 +        return InspectorTarget::close(error, runBeforeUnload);
 +
 +    if (runBeforeUnload)
-+        m_page.tryClose();
++        m_page->tryClose();
 +    else
-+        m_page.closePage();
++        m_page->closePage();
 +}
 +
  bool InspectorTargetProxy::isProvisional() const
  {
      return !!m_provisionalPage;
 diff --git a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h
-index a2239cec8e18850f35f7f88a9c4ebadc62bf4023..79f3ff84327dc075ec96983e04db4b10343b7fae 100644
+index edd6e7f1799279ed3d0eb81b6c2eef9f5b375134..d4231f84f3c52641f4d9e88559e8e1a4845b7163 100644
 --- a/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h
 +++ b/Source/WebKit/UIProcess/Inspector/InspectorTargetProxy.h
-@@ -37,13 +37,13 @@ class WebPageProxy;
+@@ -38,12 +38,12 @@ class WebPageProxy;
  // NOTE: This UIProcess side InspectorTarget doesn't care about the frontend channel, since
  // any target -> frontend messages will be routed to the WebPageProxy with a targetId.
  
 -class InspectorTargetProxy final : public Inspector::InspectorTarget {
 +class InspectorTargetProxy : public Inspector::InspectorTarget {
-     WTF_MAKE_FAST_ALLOCATED;
+     WTF_MAKE_TZONE_ALLOCATED(InspectorTargetProxy);
      WTF_MAKE_NONCOPYABLE(InspectorTargetProxy);
  public:
      static std::unique_ptr<InspectorTargetProxy> create(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
 -    static std::unique_ptr<InspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId, Inspector::InspectorTargetType);
--    InspectorTargetProxy(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
 +    static std::unique_ptr<InspectorTargetProxy> create(ProvisionalPageProxy&, const String& targetId);
-+    InspectorTargetProxy(WebPageProxy&, ProvisionalPageProxy*, const String& targetId, Inspector::InspectorTargetType);
+     InspectorTargetProxy(WebPageProxy&, const String& targetId, Inspector::InspectorTargetType);
      ~InspectorTargetProxy() = default;
  
-     Inspector::InspectorTargetType type() const final { return m_type; }
-@@ -55,12 +55,17 @@ public:
+@@ -56,8 +56,13 @@ public:
      void connect(Inspector::FrontendChannel::ConnectionType) override;
      void disconnect() override;
      void sendMessageToTargetBackend(const String&) override;
@@ -13545,23 +12343,19 @@ index a2239cec8e18850f35f7f88a9c4ebadc62bf4023..79f3ff84327dc075ec96983e04db4b10
 +    void willResume() override;
 +    void platformActivate(String& error) const;
 +
-     WebPageProxy& m_page;
-+    WeakPtr<ProvisionalPageProxy> m_provisionalPage;
+     WeakRef<WebPageProxy> m_page;
      String m_identifier;
      Inspector::InspectorTargetType m_type;
--    WeakPtr<ProvisionalPageProxy> m_provisionalPage;
- };
- 
- } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf140b6a8a 100644
+index 45eb87344ce4249eea90dc0a73a2c717f69f55fa..c070e869819c36e60a5c64bf4c762a50915d8a5e 100644
 --- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
 +++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.cpp
-@@ -26,13 +26,21 @@
+@@ -26,13 +26,23 @@
  #include "config.h"
  #include "WebPageInspectorController.h"
  
 +#include "APINavigation.h"
++#include "APIPageConfiguration.h"
  #include "APIUIClient.h"
  #include "InspectorBrowserAgent.h"
 +#include "InspectorDialogAgent.h"
@@ -13575,13 +12369,14 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  #include "WebPageProxy.h"
 +#include "WebPreferences.h"
 +#include <WebCore/ResourceError.h>
++#include <WebCore/StorageBlockingPolicy.h>
 +#include <WebCore/WindowFeatures.h>
  #include <JavaScriptCore/InspectorAgentBase.h>
  #include <JavaScriptCore/InspectorBackendDispatcher.h>
  #include <JavaScriptCore/InspectorBackendDispatchers.h>
-@@ -49,32 +57,119 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
-     return WebPageInspectorTarget::toTargetID(provisionalPage.webPageID());
- }
+@@ -52,34 +62,115 @@ static String getTargetID(const ProvisionalPageProxy& provisionalPage)
+ 
+ WTF_MAKE_TZONE_ALLOCATED_IMPL(WebPageInspectorController);
  
 +WebPageInspectorControllerObserver* WebPageInspectorController::s_observer = nullptr;
 +
@@ -13604,6 +12399,8 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 -    m_agents.append(WTFMove(targetAgent));
  }
  
+ WebPageInspectorController::~WebPageInspectorController() = default;
+ 
 -Ref<WebPageProxy> WebPageInspectorController::protectedInspectedPage()
 +WeakRef<WebPageProxy> WebPageInspectorController::protectedInspectedPage()
  {
@@ -13613,6 +12410,8 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  
  void WebPageInspectorController::init()
  {
+-    String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
+-    createInspectorTarget(pageTargetId, Inspector::InspectorTargetType::Page);
 +    auto targetAgent = makeUnique<InspectorTargetAgent>(m_frontendRouter.get(), m_backendDispatcher.get());
 +    m_targetAgent = targetAgent.get();
 +    m_agents.append(WTFMove(targetAgent));
@@ -13628,27 +12427,21 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +    m_agents.append(WTFMove(screencastAgent));
 +    if (s_observer)
 +        s_observer->didCreateInspectorController(m_inspectedPage);
++}
 +
-+    // window.open will create page with already running process.
-+    if (!m_inspectedPage->hasRunningProcess())
-+        return;
-     String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageID());
-     createInspectorTarget(pageTargetId, Inspector::InspectorTargetType::Page);
- }
- 
-+void WebPageInspectorController::didFinishAttachingToWebProcess()
++void WebPageInspectorController::didInitializeWebPage()
 +{
-+    String pageTargetID = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageID());
++    String pageTargetID = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
 +    // Create target only after attaching to a Web Process first time. Before that
 +    // we cannot event establish frontend connection.
 +    if (m_targets.contains(pageTargetID))
 +        return;
 +    createInspectorTarget(pageTargetID, Inspector::InspectorTargetType::Page);
-+}
-+
+ }
+ 
  void WebPageInspectorController::pageClosed()
  {
-+    String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageID());
++    String pageTargetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
 +    destroyInspectorTarget(pageTargetId);
 +
      disconnectAllFrontends();
@@ -13663,7 +12456,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +{
 +    if (reason != ProcessTerminationReason::Crash)
 +        return false;
-+    String targetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageID());
++    String targetId = WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess());
 +    auto it = m_targets.find(targetId);
 +    if (it == m_targets.end())
 +        return false;
@@ -13704,7 +12497,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  }
  
  bool WebPageInspectorController::hasLocalFrontend() const
-@@ -88,6 +183,17 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
+@@ -93,6 +184,17 @@ void WebPageInspectorController::connectFrontend(Inspector::FrontendChannel& fro
  
      bool connectingFirstFrontend = !m_frontendRouter->hasFrontends();
  
@@ -13722,7 +12515,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
      m_frontendRouter->connectFrontend(frontendChannel);
  
      if (connectingFirstFrontend)
-@@ -107,8 +213,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
+@@ -112,8 +214,10 @@ void WebPageInspectorController::disconnectFrontend(FrontendChannel& frontendCha
      m_frontendRouter->disconnectFrontend(frontendChannel);
  
      bool disconnectingLastFrontend = !m_frontendRouter->hasFrontends();
@@ -13734,7 +12527,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  
      auto inspectedPage = protectedInspectedPage();
      inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
-@@ -132,6 +240,8 @@ void WebPageInspectorController::disconnectAllFrontends()
+@@ -137,6 +241,8 @@ void WebPageInspectorController::disconnectAllFrontends()
      // Disconnect any remaining remote frontends.
      m_frontendRouter->disconnectAllFrontends();
  
@@ -13743,17 +12536,17 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
      auto inspectedPage = protectedInspectedPage();
      inspectedPage->didChangeInspectorFrontendCount(m_frontendRouter->frontendCount());
  
-@@ -160,6 +270,66 @@ void WebPageInspectorController::setIndicating(bool indicating)
+@@ -165,6 +271,66 @@ void WebPageInspectorController::setIndicating(bool indicating)
  }
  #endif
  
-+#if USE(CAIRO)
-+void WebPageInspectorController::didPaint(cairo_surface_t* surface)
++#if USE(SKIA)
++void WebPageInspectorController::didPaint(sk_sp<SkImage>&& surface)
 +{
 +    if (!m_frontendRouter->hasFrontends())
 +        return;
 +
-+    m_screecastAgent->didPaint(surface);
++    m_screecastAgent->didPaint(WTFMove(surface));
 +}
 +#endif
 +
@@ -13762,14 +12555,14 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +{
 +    auto navigation = m_inspectedPage->loadRequestForInspector(WTFMove(request), frame);
 +    if (!navigation) {
-+        completionHandler("Failed to navigate"_s, 0);
++        completionHandler("Failed to navigate"_s, { });
 +        return;
 +    }
 +
 +    m_pendingNavigations.set(navigation->navigationID(), WTFMove(completionHandler));
 +}
 +
-+void WebPageInspectorController::didReceivePolicyDecision(WebCore::PolicyAction action, uint64_t navigationID)
++void WebPageInspectorController::didReceivePolicyDecision(WebCore::PolicyAction action, std::optional<WebCore::NavigationIdentifier> navigationID)
 +{
 +    if (!m_frontendRouter->hasFrontends())
 +        return;
@@ -13777,17 +12570,17 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +    if (!navigationID)
 +        return;
 +
-+    auto completionHandler = m_pendingNavigations.take(navigationID);
++    auto completionHandler = m_pendingNavigations.take(*navigationID);
 +    if (!completionHandler)
 +        return;
 +
 +    if (action == WebCore::PolicyAction::Ignore)
-+        completionHandler("Navigation cancelled"_s, 0);
++        completionHandler("Navigation cancelled"_s, { });
 +    else
-+        completionHandler(String(), navigationID);
++        completionHandler(String(), *navigationID);
 +}
 +
-+void WebPageInspectorController::didDestroyNavigation(uint64_t navigationID)
++void WebPageInspectorController::didDestroyNavigation(WebCore::NavigationIdentifier navigationID)
 +{
 +    if (!m_frontendRouter->hasFrontends())
 +        return;
@@ -13798,10 +12591,10 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +
 +    // Inspector initiated navigation is destroyed before policy check only when it
 +    // becomes a fragment navigation (which always reuses current navigation).
-+    completionHandler(String(), 0);
++    completionHandler(String(), { });
 +}
 +
-+void WebPageInspectorController::didFailProvisionalLoadForFrame(uint64_t navigationID, const WebCore::ResourceError& error)
++void WebPageInspectorController::didFailProvisionalLoadForFrame(WebCore::NavigationIdentifier navigationID, const WebCore::ResourceError& error)
 +{
 +    if (s_observer)
 +        s_observer->didFailProvisionalLoad(m_inspectedPage, navigationID, error.localizedDescription());
@@ -13810,7 +12603,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  void WebPageInspectorController::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type)
  {
      addTarget(InspectorTargetProxy::create(protectedInspectedPage(), targetId, type));
-@@ -179,6 +349,32 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
+@@ -184,6 +350,52 @@ void WebPageInspectorController::sendMessageToInspectorFrontend(const String& ta
      m_targetAgent->sendMessageFromTargetToFrontend(targetId, message);
  }
  
@@ -13820,7 +12613,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +    m_targetAgent->setPauseOnStart(shouldPause);
 +}
 +
-+bool WebPageInspectorController::shouldPauseLoading() const
++bool WebPageInspectorController::shouldPauseLoadRequest() const
 +{
 +    if (!m_frontendRouter->hasFrontends())
 +        return false;
@@ -13828,14 +12621,34 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +    if (!m_inspectedPage->isPageOpenedByDOMShowingInitialEmptyDocument())
 +        return false;
 +
-+    auto* target = m_targets.get(WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageID()));
++    auto* target = m_targets.get(WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess()));
++    // The method is expeted to be called only when the WebPage has already been
++    // initilized, so the target must exist.
 +    ASSERT(target);
 +    return target->isPaused();
 +}
 +
++bool WebPageInspectorController::shouldPauseInInspectorWhenShown() const
++{
++    if (!m_frontendRouter->hasFrontends())
++        return false;
++
++    // Only pause if the page was opened by window.open() or new tab navigation.
++    // We cannot use isPageOpenedByDOMShowingInitialEmptyDocument() here because
++    // this method maybe called from WebPageProxy::initializeWebPage and setOpenedByDOM
++    // is called after the page is initialized.
++    if (!m_inspectedPage->configuration().windowFeatures())
++        return false;
++
++    // The method is called from WebPageProxy::initializePage and the
++    // target is not created yet (it is created after the new page is
++    //  initialized and attached to the process).
++    return m_targetAgent->shouldPauseOnStart();
++}
++
 +void WebPageInspectorController::setContinueLoadingCallback(WTF::Function<void()>&& callback)
 +{
-+    auto* target = m_targets.get(WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageID()));
++    auto* target = m_targets.get(WebPageInspectorTarget::toTargetID(m_inspectedPage->webPageIDInMainFrameProcess()));
 +    ASSERT(target);
 +    target->setResumeCallback(WTFMove(callback));
 +}
@@ -13843,7 +12656,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  bool WebPageInspectorController::shouldPauseLoading(const ProvisionalPageProxy& provisionalPage) const
  {
      if (!m_frontendRouter->hasFrontends())
-@@ -198,7 +394,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
+@@ -203,7 +415,7 @@ void WebPageInspectorController::setContinueLoadingCallback(const ProvisionalPag
  
  void WebPageInspectorController::didCreateProvisionalPage(ProvisionalPageProxy& provisionalPage)
  {
@@ -13852,7 +12665,7 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
  }
  
  void WebPageInspectorController::willDestroyProvisionalPage(const ProvisionalPageProxy& provisionalPage)
-@@ -277,4 +473,27 @@ void WebPageInspectorController::browserExtensionsDisabled(HashSet<String>&& ext
+@@ -287,4 +499,29 @@ void WebPageInspectorController::browserExtensionsDisabled(HashSet<String>&& ext
          m_enabledBrowserAgent->extensionsDisabled(WTFMove(extensionIDs));
  }
  
@@ -13872,34 +12685,39 @@ index 6d229b943fe69cd258b32b1e38c5716715a4cd4b..7294731b4ff75a0cec1dd010cc7facaf
 +    m_inspectedPage->preferences().setJavaScriptCanOpenWindowsAutomatically(true);
 +
 +    // Enable media stream.
-+    if (!m_inspectedPage->preferences().mediaStreamEnabled()) {
++    if (!m_inspectedPage->preferences().mediaDevicesEnabled()) {
 +        m_inspectedPage->preferences().setMediaDevicesEnabled(true);
-+        m_inspectedPage->preferences().setMediaStreamEnabled(true);
 +        m_inspectedPage->preferences().setPeerConnectionEnabled(true);
 +    }
++
++    // Disable local storage partitioning. See https://github.com/microsoft/playwright/issues/32230
++    m_inspectedPage->preferences().setStorageBlockingPolicy(static_cast<uint32_t>(WebCore::StorageBlockingPolicy::AllowAll));
 +}
 +
  } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
-index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c15e1112d 100644
+index c219e0a072057a8d40d8a30a1d404851d6c12d43..aff66705b9acadb9d811f2da439a59dbf5e6ea06 100644
 --- a/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
 +++ b/Source/WebKit/UIProcess/Inspector/WebPageInspectorController.h
-@@ -26,6 +26,7 @@
+@@ -26,19 +26,39 @@
  #pragma once
  
  #include "InspectorTargetProxy.h"
 +#include "ProcessTerminationReason.h"
  #include <JavaScriptCore/InspectorAgentRegistry.h>
  #include <JavaScriptCore/InspectorTargetAgent.h>
++#include <WebCore/NavigationIdentifier.h>
  #include <WebCore/PageIdentifier.h>
-@@ -33,11 +34,28 @@
+ #include <wtf/CheckedRef.h>
  #include <wtf/Forward.h>
  #include <wtf/Noncopyable.h>
+ #include <wtf/TZoneMalloc.h>
  #include <wtf/text/WTFString.h>
 +#include <wtf/URL.h>
 +
-+#if USE(CAIRO)
-+#include <cairo.h>
++#if USE(SKIA)
++#include <skia/core/SkData.h>
++#include <skia/core/SkImage.h>
 +#endif
  
  namespace Inspector {
@@ -13921,7 +12739,7 @@ index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c
  }
  
  namespace WebKit {
-@@ -45,6 +63,23 @@ namespace WebKit {
+@@ -46,6 +66,23 @@ namespace WebKit {
  class InspectorBrowserAgent;
  struct WebPageAgentContext;
  
@@ -13934,7 +12752,7 @@ index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c
 +public:
 +    virtual void didCreateInspectorController(WebPageProxy&) = 0;
 +    virtual void willDestroyInspectorController(WebPageProxy&) = 0;
-+    virtual void didFailProvisionalLoad(WebPageProxy&, uint64_t navigationID, const String& error) = 0;
++    virtual void didFailProvisionalLoad(WebPageProxy&, WebCore::NavigationIdentifier, const String& error) = 0;
 +    virtual void willCreateNewPage(WebPageProxy&, const WebCore::WindowFeatures&, const URL&) = 0;
 +    virtual void didFinishScreencast(const PAL::SessionID& sessionID, const String& screencastID) = 0;
 +
@@ -13943,13 +12761,13 @@ index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c
 +};
 +
  class WebPageInspectorController {
+     WTF_MAKE_TZONE_ALLOCATED(WebPageInspectorController);
      WTF_MAKE_NONCOPYABLE(WebPageInspectorController);
-     WTF_MAKE_FAST_ALLOCATED;
-@@ -52,7 +87,21 @@ public:
-     WebPageInspectorController(WebPageProxy&);
+@@ -54,7 +91,21 @@ public:
+     ~WebPageInspectorController();
  
      void init();
-+    void didFinishAttachingToWebProcess();
++    void didInitializeWebPage();
 +
 +    static void setObserver(WebPageInspectorControllerObserver*);
 +    static WebPageInspectorControllerObserver* observer();
@@ -13967,19 +12785,20 @@ index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c
  
      bool hasLocalFrontend() const;
  
-@@ -65,11 +114,25 @@ public:
+@@ -67,11 +118,27 @@ public:
  #if ENABLE(REMOTE_INSPECTOR)
      void setIndicating(bool);
  #endif
-+#if USE(CAIRO)
-+    void didPaint(cairo_surface_t*);
++#if USE(SKIA)
++    void didPaint(sk_sp<SkImage>&&);
 +#endif
-+    using NavigationHandler = Function<void(const String&, uint64_t)>;
++    using NavigationHandler = Function<void(const String&, Markable<WebCore::NavigationIdentifier>)>;
 +    void navigate(WebCore::ResourceRequest&&, WebFrameProxy*, NavigationHandler&&);
-+    void didReceivePolicyDecision(WebCore::PolicyAction action, uint64_t navigationID);
-+    void didDestroyNavigation(uint64_t navigationID);
++    void didReceivePolicyDecision(WebCore::PolicyAction action, std::optional<WebCore::NavigationIdentifier> navigationID);
++
++    void didDestroyNavigation(WebCore::NavigationIdentifier navigationID);
 +
-+    void didFailProvisionalLoadForFrame(uint64_t navigationID, const WebCore::ResourceError& error);
++    void didFailProvisionalLoadForFrame(WebCore::NavigationIdentifier navigationID, const WebCore::ResourceError& error);
  
      void createInspectorTarget(const String& targetId, Inspector::InspectorTargetType);
      void destroyInspectorTarget(const String& targetId);
@@ -13987,13 +12806,14 @@ index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c
  
 +    void setPauseOnStart(bool);
 +
-+    bool shouldPauseLoading() const;
++    bool shouldPauseLoadRequest() const;
++    bool shouldPauseInInspectorWhenShown() const;
 +    void setContinueLoadingCallback(WTF::Function<void()>&&);
 +
      bool shouldPauseLoading(const ProvisionalPageProxy&) const;
      void setContinueLoadingCallback(const ProvisionalPageProxy&, WTF::Function<void()>&&);
  
-@@ -84,11 +147,12 @@ public:
+@@ -86,11 +153,12 @@ public:
      void browserExtensionsDisabled(HashSet<String>&&);
  
  private:
@@ -14005,21 +12825,20 @@ index c6aafe0e9339c8ac02dc133754ddc23e1cb522ff..91473e6a0b4a37a15959f966fc75134c
      void addTarget(std::unique_ptr<InspectorTargetProxy>&&);
 +    void adjustPageSettings();
  
-     Ref<Inspector::FrontendRouter> m_frontendRouter;
-     Ref<Inspector::BackendDispatcher> m_backendDispatcher;
-@@ -97,11 +161,17 @@ private:
-     WeakRef<WebPageProxy> m_inspectedPage;
+     const Ref<Inspector::FrontendRouter> m_frontendRouter;
+     const Ref<Inspector::BackendDispatcher> m_backendDispatcher;
+@@ -101,9 +169,16 @@ private:
+     CheckedPtr<Inspector::InspectorTargetAgent> m_targetAgent;
+     HashMap<String, std::unique_ptr<InspectorTargetProxy>> m_targets;
  
-     Inspector::InspectorTargetAgent* m_targetAgent { nullptr };
 +    WebPageInspectorEmulationAgent* m_emulationAgent { nullptr };
 +    WebPageInspectorInputAgent* m_inputAgent { nullptr };
 +    InspectorScreencastAgent* m_screecastAgent { nullptr };
-     HashMap<String, std::unique_ptr<InspectorTargetProxy>> m_targets;
- 
-     InspectorBrowserAgent* m_enabledBrowserAgent { nullptr };
++
+     CheckedPtr<InspectorBrowserAgent> m_enabledBrowserAgent;
  
      bool m_didCreateLazyAgents { false };
-+    HashMap<uint64_t, NavigationHandler> m_pendingNavigations;
++    UncheckedKeyHashMap<WebCore::NavigationIdentifier, NavigationHandler> m_pendingNavigations;
 +
 +    static WebPageInspectorControllerObserver* s_observer;
  };
@@ -14258,10 +13077,10 @@ index 0000000000000000000000000000000000000000..d0e11ed81a6257c011df23d5870da740
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d434cbcd4
+index 0000000000000000000000000000000000000000..8026d3e9aaca3434fc1d7316a19cd92827566a67
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.cpp
-@@ -0,0 +1,1019 @@
+@@ -0,0 +1,1009 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -14333,6 +13152,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +#include <wtf/HashSet.h>
 +#include <wtf/HexNumber.h>
 +#include <wtf/URL.h>
++#include <wtf/text/MakeString.h>
 +
 +using namespace Inspector;
 +
@@ -14444,13 +13264,13 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +static Ref<JSON::ArrayOf<String>> getEnabledWindowFeatures(const WebCore::WindowFeatures& features) {
 +  auto result = JSON::ArrayOf<String>::create();
 +  if (features.x)
-+    result->addItem("left=" + String::number(*features.x));
++    result->addItem(makeString("left="_s, String::number(*features.x)));
 +  if (features.y)
-+    result->addItem("top=" + String::number(*features.y));
++    result->addItem(makeString("top="_s, String::number(*features.y)));
 +  if (features.width)
-+    result->addItem("width=" + String::number(*features.width));
++    result->addItem(makeString("width="_s, String::number(*features.width)));
 +  if (features.height)
-+    result->addItem("height=" + String::number(*features.height));
++    result->addItem(makeString("height="_s, String::number(*features.height)));
 +  if (features.menuBarVisible)
 +    result->addItem("menubar"_s);
 +  if (features.toolBarVisible)
@@ -14634,14 +13454,14 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +    if (!m_isEnabled)
 +        return;
 +
-+    if (isInspectorProcessPool(page.process().processPool()))
++    if (isInspectorProcessPool(page.legacyMainFrameProcess().processPool()))
 +        return;
 +
 +    ASSERT(m_frontendChannel);
 +
 +    String browserContextID = toBrowserContextIDProtocolString(page.sessionID());
 +    String pageProxyID = toPageProxyIDProtocolString(page);
-+    auto* opener = page.configuration().relatedPage();
++    auto* opener = page.configuration().openerPageForInspector();
 +    String openerId;
 +    if (opener)
 +        openerId = toPageProxyIDProtocolString(*opener);
@@ -14664,7 +13484,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +    if (!m_isEnabled)
 +        return;
 +
-+    if (isInspectorProcessPool(page.process().processPool()))
++    if (isInspectorProcessPool(page.legacyMainFrameProcess().processPool()))
 +        return;
 +
 +    String browserContextID = toBrowserContextIDProtocolString(page.sessionID());
@@ -14686,14 +13506,14 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +    m_pageProxyChannels.remove(channelIt);
 +}
 +
-+void InspectorPlaywrightAgent::didFailProvisionalLoad(WebPageProxy& page, uint64_t navigationID, const String& error)
++void InspectorPlaywrightAgent::didFailProvisionalLoad(WebPageProxy& page, WebCore::NavigationIdentifier navigationID, const String& error)
 +{
 +    if (!m_isEnabled)
 +        return;
 +
 +    m_frontendDispatcher->provisionalLoadFailed(
 +        toPageProxyIDProtocolString(page),
-+        String::number(navigationID), error);
++        String::number(navigationID.toUInt64()), error);
 +}
 +
 +void InspectorPlaywrightAgent::willCreateNewPage(WebPageProxy& page, const WebCore::WindowFeatures& features, const URL& url)
@@ -14897,33 +13717,13 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +
 +WebFrameProxy* InspectorPlaywrightAgent::frameForID(const String& frameID, String& error)
 +{
-+    size_t dotPos = frameID.find("."_s);
-+    if (dotPos == notFound) {
++    std::optional<WebCore::FrameIdentifier> frameIdentifier = WebCore::InspectorPageAgent::parseFrameID(frameID);
++    if (!frameIdentifier) {
 +        error = "Invalid frame id"_s;
 +        return nullptr;
 +    }
 +
-+    if (!frameID.containsOnlyASCII()) {
-+        error = "Invalid frame id"_s;
-+        return nullptr;
-+    }
-+
-+    String processIDString = frameID.left(dotPos);
-+    uint64_t pid = strtoull(processIDString.ascii().data(), 0, 10);
-+    auto processID = ObjectIdentifier<WebCore::ProcessIdentifierType>(pid);
-+    auto process = WebProcessProxy::processForIdentifier(processID);
-+    if (!process) {
-+        error = "Cannot find web process for the frame id"_s;
-+        return nullptr;
-+    }
-+
-+    String frameIDString = frameID.substring(dotPos + 1);
-+    uint64_t frameIDNumber = strtoull(frameIDString.ascii().data(), 0, 10);
-+    auto frameIdentifier = WebCore::FrameIdentifier {
-+       ObjectIdentifier<WebCore::FrameIdentifierType>(frameIDNumber),
-+       processID
-+    };
-+    WebFrameProxy* frame = WebFrameProxy::webFrame(frameIdentifier);
++    WebFrameProxy* frame = WebFrameProxy::webFrame(*frameIdentifier);
 +    if (!frame) {
 +        error = "Cannot find web frame for the frame id"_s;
 +        return nullptr;
@@ -14940,7 +13740,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +        return;
 +    }
 +
-+    WebCore::ResourceRequest resourceRequest { url };
++    auto resourceRequest = WebCore::ResourceRequest(URL { url });
 +
 +    if (!!referrer)
 +        resourceRequest.setHTTPReferrer(referrer);
@@ -14965,7 +13765,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +        }
 +    }
 +
-+    pageProxyChannel->page().inspectorController().navigate(WTFMove(resourceRequest), frame, [callback = WTFMove(callback)](const String& error, uint64_t navigationID) {
++    pageProxyChannel->page().inspectorController().navigate(WTFMove(resourceRequest), frame, [callback = WTFMove(callback)](const String& error, Markable<WebCore::NavigationIdentifier> navigationID) {
 +        if (!error.isEmpty()) {
 +            callback->sendFailure(error);
 +            return;
@@ -14973,7 +13773,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +
 +        String navigationIDString;
 +        if (navigationID)
-+            navigationIDString = String::number(navigationID);
++            navigationIDString = String::number(navigationID->toUInt64());
 +        callback->sendSuccess(navigationIDString);
 +    });
 +}
@@ -14995,7 +13795,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +    }
 +
 +    auto sandboxExtensionHandles = SandboxExtension::createReadOnlyHandlesForFiles("InspectorPlaywrightAgent::grantFileReadAccess"_s, files);
-+    pageProxyChannel->page().send(Messages::WebPage::ExtendSandboxForFilesFromOpenPanel(WTFMove(sandboxExtensionHandles)));
++    pageProxyChannel->page().legacyMainFrameProcess().send(Messages::WebPage::ExtendSandboxForFilesFromOpenPanel(WTFMove(sandboxExtensionHandles)), pageProxyChannel->page().webPageIDInMainFrameProcess());
 +#endif
 +    return { };
 +}
@@ -15030,9 +13830,17 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +    if (!errorString.isEmpty())
 +        return makeUnexpected(errorString);
 +
-+    PAL::SessionID sessionID = browserContext->dataStore->sessionID();
-+    NetworkProcessProxy& networkProcess = browserContext->dataStore->networkProcess();
-+    networkProcess.send(Messages::NetworkProcess::SetIgnoreCertificateErrors(sessionID, ignore), 0);
++    browserContext->dataStore->setIgnoreTLSErrors(ignore);
++    return { };
++}
++
++Inspector::Protocol::ErrorStringOr<void> InspectorPlaywrightAgent::setPageZoomFactor(const String& pageProxyID, double zoomFactor)
++{
++    auto* pageProxyChannel = m_pageProxyChannels.get(pageProxyID);
++    if (!pageProxyChannel)
++        return makeUnexpected("Unknown pageProxyID"_s);
++
++    pageProxyChannel->page().setPageZoomFactor(zoomFactor);
 +    return { };
 +}
 +
@@ -15050,12 +13858,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +                return;
 +            auto cookies = JSON::ArrayOf<Inspector::Protocol::Playwright::Cookie>::create();
 +
-+// Soup returns cookies in the reverse order.
-+#if USE(SOUP)
-+            for (const auto& cookie : makeReversedRange(allCookies))
-+#else
 +            for (const auto& cookie : allCookies)
-+#endif
 +                cookies->addItem(buildObjectForCookie(cookie));
 +            callback->sendSuccess(WTFMove(cookies));
 +        });
@@ -15105,6 +13908,12 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +                cookie.sameSite = WebCore::Cookie::SameSitePolicy::Lax;
 +            if (sameSite == "Strict"_s)
 +                cookie.sameSite = WebCore::Cookie::SameSitePolicy::Strict;
++#if USE(SOUP)
++        } else {
++            // Cookies are Lax by default in libsoup and will reject cookies with
++            // sameSite: None and secure: false (defaults in WebCore::Cookie).
++            cookie.sameSite = WebCore::Cookie::SameSitePolicy::Lax;
++#endif
 +        }
 +        cookies.append(WTFMove(cookie));
 +    }
@@ -15203,7 +14012,7 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +{
 +    if (!m_isEnabled)
 +        return;
-+    String frameID = WebCore::InspectorPageAgent::makeFrameID(page->process().coreProcessIdentifier(), frameInfoData.frameID);
++    String frameID = WebCore::InspectorPageAgent::serializeFrameID(frameInfoData.frameID);
 +    m_downloads.set(uuid, download);
 +    m_frontendDispatcher->downloadCreated(
 +        toPageProxyIDProtocolString(*page),
@@ -15283,10 +14092,10 @@ index 0000000000000000000000000000000000000000..a494ee1006f70d398149753f8953515d
 +#endif // ENABLE(REMOTE_INSPECTOR)
 diff --git a/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..36b7f12b5d9fce000715b42ee2980c20e0e91ef7
+index 0000000000000000000000000000000000000000..f9185788a118f57e98bec149909a206dc1aa5d99
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/InspectorPlaywrightAgent.h
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,141 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -15324,6 +14133,7 @@ index 0000000000000000000000000000000000000000..36b7f12b5d9fce000715b42ee2980c20
 +#include <wtf/HashMap.h>
 +#include <wtf/Forward.h>
 +#include <wtf/Noncopyable.h>
++#include <WebCore/NavigationIdentifier.h>
 +
 +namespace Inspector {
 +class BackendDispatcher;
@@ -15337,6 +14147,15 @@ index 0000000000000000000000000000000000000000..36b7f12b5d9fce000715b42ee2980c20
 +}
 +
 +namespace WebKit {
++class OverridenGeolocationProvider;
++}
++
++namespace WTF {
++template<typename T> struct IsDeprecatedWeakRefSmartPointerException;
++template<> struct IsDeprecatedWeakRefSmartPointerException<WebKit::OverridenGeolocationProvider> : std::true_type { };
++}
++
++namespace WebKit {
 +
 +class WebFrameProxy;
 +
@@ -15363,7 +14182,7 @@ index 0000000000000000000000000000000000000000..36b7f12b5d9fce000715b42ee2980c20
 +    // WebPageInspectorControllerObserver
 +    void didCreateInspectorController(WebPageProxy&) override;
 +    void willDestroyInspectorController(WebPageProxy&) override;
-+    void didFailProvisionalLoad(WebPageProxy&, uint64_t navigationID, const String& error) override;
++    void didFailProvisionalLoad(WebPageProxy&, WebCore::NavigationIdentifier navigationID, const String& error) override;
 +    void willCreateNewPage(WebPageProxy&, const WebCore::WindowFeatures&, const URL&) override;
 +    void didFinishScreencast(const PAL::SessionID& sessionID, const String& screencastID) override;
 +
@@ -15379,6 +14198,7 @@ index 0000000000000000000000000000000000000000..36b7f12b5d9fce000715b42ee2980c20
 +    Inspector::Protocol::ErrorStringOr<void> grantFileReadAccess(const String& pageProxyID, Ref<JSON::Array>&& paths) override;
 +    void takePageScreenshot(const String& pageProxyID, int x, int y, int width, int height, std::optional<bool>&& omitDeviceScaleFactor, Ref<TakePageScreenshotCallback>&&) override;
 +    Inspector::Protocol::ErrorStringOr<void> setIgnoreCertificateErrors(const String& browserContextID, bool ignore) override;
++    Inspector::Protocol::ErrorStringOr<void> setPageZoomFactor(const String& pageProxyID, double zoomFactor) override;
 +
 +    void getAllCookies(const String& browserContextID, Ref<GetAllCookiesCallback>&&) override;
 +    void setCookies(const String& browserContextID, Ref<JSON::Array>&& in_cookies, Ref<SetCookiesCallback>&&) override;
@@ -15406,11 +14226,11 @@ index 0000000000000000000000000000000000000000..36b7f12b5d9fce000715b42ee2980c20
 +    std::unique_ptr<InspectorPlaywrightAgentClient> m_client;
 +    std::unique_ptr<Inspector::PlaywrightFrontendDispatcher> m_frontendDispatcher;
 +    Ref<Inspector::PlaywrightBackendDispatcher> m_playwrightDispatcher;
-+    HashMap<String, std::unique_ptr<PageProxyChannel>> m_pageProxyChannels;
++    UncheckedKeyHashMap<String, std::unique_ptr<PageProxyChannel>> m_pageProxyChannels;
 +    BrowserContext* m_defaultContext;
-+    HashMap<String, RefPtr<DownloadProxy>> m_downloads;
-+    HashMap<String, std::unique_ptr<BrowserContext>> m_browserContexts;
-+    HashMap<String, std::unique_ptr<BrowserContextDeletion>> m_browserContextDeletions;
++    UncheckedKeyHashMap<String, RefPtr<DownloadProxy>> m_downloads;
++    UncheckedKeyHashMap<String, std::unique_ptr<BrowserContext>> m_browserContexts;
++    UncheckedKeyHashMap<String, std::unique_ptr<BrowserContextDeletion>> m_browserContextDeletions;
 +    bool m_isEnabled { false };
 +};
 +
@@ -15496,11 +14316,50 @@ index 0000000000000000000000000000000000000000..e7a3dcc533294bb6e12f65d79b5b716b
 +} // namespace WebKit
 +
 +#endif // ENABLE(REMOTE_INSPECTOR)
+diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
+index 272e0a6edea50acd35032a854d625b5af5a1472e..486c807ba879ecf534db1ffb593709d117e0c35a 100644
+--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
++++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
+@@ -168,6 +168,13 @@ void ProcessLauncher::launchProcess()
+         nargs++;
+     }
+ #endif
++// Playwright begin
++    bool enableSharedArrayBuffer = false;
++    if (m_launchOptions.processType == ProcessLauncher::ProcessType::Web && m_client && m_client->shouldEnableSharedArrayBuffer()) {
++        enableSharedArrayBuffer = true;
++        nargs++;
++    }
++// Playwright end
+ 
+     WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN // GTK/WPE port
+ 
+@@ -188,6 +195,10 @@ void ProcessLauncher::launchProcess()
+     if (configureJSCForTesting)
+         argv[i++] = const_cast<char*>("--configure-jsc-for-testing");
+ #endif
++// Playwright begin
++    if (enableSharedArrayBuffer)
++        argv[i++] = const_cast<char*>("--enable-shared-array-buffer");
++// Playwright end
+     argv[i++] = nullptr;
+ 
+     WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
 diff --git a/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp b/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
-index 1a26781907e71c9cc3e99aff38d8060c4387abd7..b4e6e7edec5a716da63c74a6be5d08b6e1981f52 100644
+index a108acd8a4503a07309fe8c54afc80b0f4175eae..1421d9a761042c31a6ecf3cc78ce3f0e96109abe 100644
 --- a/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
 +++ b/Source/WebKit/UIProcess/Launcher/win/ProcessLauncherWin.cpp
-@@ -97,8 +97,11 @@ void ProcessLauncher::launchProcess()
+@@ -91,14 +91,21 @@ void ProcessLauncher::launchProcess()
+         commandLineBuilder.append(" -configure-jsc-for-testing"_s);
+     if (!m_client->isJITEnabled())
+         commandLineBuilder.append(" -disable-jit"_s);
++// Playwright begin
++    if (m_launchOptions.processType == ProcessLauncher::ProcessType::Web && m_client->shouldEnableSharedArrayBuffer())
++        commandLineBuilder.append(" -enable-shared-array-buffer"_s);
++// Playwright end
+     commandLineBuilder.append('\0');
+ 
+     auto commandLine = commandLineBuilder.toString().wideCharacters();
  
      STARTUPINFO startupInfo { };
      startupInfo.cb = sizeof(startupInfo);
@@ -15513,34 +14372,23 @@ index 1a26781907e71c9cc3e99aff38d8060c4387abd7..b4e6e7edec5a716da63c74a6be5d08b6
      PROCESS_INFORMATION processInformation { };
      BOOL result = ::CreateProcess(0, commandLine.data(), 0, 0, true, 0, 0, 0, &startupInfo, &processInformation);
  
-diff --git a/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp b/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp
-index 3fe0abcfe36bef7ca45bed5661a737ed2bfe56d0..510656948af01ec65d4543c805e9667a307018fd 100644
---- a/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp
-+++ b/Source/WebKit/UIProcess/Media/RemoteMediaSessionCoordinatorProxy.cpp
-@@ -30,6 +30,7 @@
- 
- #include "Logging.h"
- #include "MediaSessionCoordinatorProxyPrivate.h"
-+#include "MessageSenderInlines.h"
- #include "RemoteMediaSessionCoordinatorMessages.h"
- #include "RemoteMediaSessionCoordinatorProxyMessages.h"
- #include "WebPageProxy.h"
 diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
-index 46f725b53f67ed41ff3312d106a23174d6a16363..369ee3539762a6286977d94a7958b25291f11ed6 100644
+index 1e06e94f26fc73c323605da1afb0474559b35c33..1ac2f393d3dc0a7812c1b9a1bdaa6cea4f150bf4 100644
 --- a/Source/WebKit/UIProcess/PageClient.h
 +++ b/Source/WebKit/UIProcess/PageClient.h
-@@ -92,6 +92,10 @@ OBJC_CLASS WKView;
- #endif
+@@ -74,6 +74,11 @@
+ #include <WebCore/PlatformTextAlternatives.h>
  #endif
  
-+#if PLATFORM(GTK) || PLATFORM(WPE)
-+#include <WebCore/RefPtrCairo.h>
++#if USE(SKIA)
++#include <skia/core/SkData.h>
++#include <skia/core/SkImage.h>
 +#endif
 +
- namespace API {
- class Attachment;
- class HitTestResult;
-@@ -347,7 +351,16 @@ public:
+ OBJC_CLASS AVPlayerViewController;
+ OBJC_CLASS CALayer;
+ OBJC_CLASS NSFileWrapper;
+@@ -381,7 +386,16 @@ public:
      virtual void selectionDidChange() = 0;
  #endif
  
@@ -15549,7 +14397,7 @@ index 46f725b53f67ed41ff3312d106a23174d6a16363..369ee3539762a6286977d94a7958b252
 +#if PLATFORM(COCOA)
 +    virtual RetainPtr<CGImageRef> takeSnapshotForAutomation() = 0;
 +#elif PLATFORM(WPE)
-+    virtual RefPtr<cairo_surface_t> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution = false) = 0;
++    virtual sk_sp<SkImage> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution = false) = 0;
 +#elif PLATFORM(GTK)
 +    virtual RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, bool nominalResolution = false) = 0;
 +#endif
@@ -15560,10 +14408,10 @@ index 46f725b53f67ed41ff3312d106a23174d6a16363..369ee3539762a6286977d94a7958b252
  
 diff --git a/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.cpp b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..d365dfd28dcc5d101b4d3859302b1bfe75f01a55
+index 0000000000000000000000000000000000000000..95b682567eba682f927317cd3327a531358dfebc
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.cpp
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,64 @@
 +/*
 + * Copyright (C) 2023 Microsoft Corporation.
 + *
@@ -15605,17 +14453,24 @@ index 0000000000000000000000000000000000000000..d365dfd28dcc5d101b4d3859302b1bfe
 +{
 +}
 +
-+void PlaywrightFullScreenManagerProxyClient::enterFullScreen()
++void PlaywrightFullScreenManagerProxyClient::enterFullScreen(WebCore::FloatSize, CompletionHandler<void(bool)>&& completionHandler)
 +{
-+    m_pageProxy.fullScreenManager()->willEnterFullScreen();
-+    m_pageProxy.fullScreenManager()->didEnterFullScreen();
++    completionHandler(true);
++}
++
++void PlaywrightFullScreenManagerProxyClient::exitFullScreen(CompletionHandler<void()>&& completionHandler)
++{
++    completionHandler();
 +}
 +
-+void PlaywrightFullScreenManagerProxyClient::exitFullScreen()
++void PlaywrightFullScreenManagerProxyClient::beganEnterFullScreen(const WebCore::IntRect&, const WebCore::IntRect&, CompletionHandler<void(bool)>&& completionHandler)
 +{
-+    m_pageProxy.fullScreenManager()->willExitFullScreen();
-+    m_pageProxy.fullScreenManager()->didExitFullScreen();
++    completionHandler(true);
++}
 +
++void PlaywrightFullScreenManagerProxyClient::beganExitFullScreen(const WebCore::IntRect&, const WebCore::IntRect&, CompletionHandler<void()>&& completionHandler)
++{
++    completionHandler();
 +}
 +
 +} // namespace WebKit
@@ -15623,7 +14478,7 @@ index 0000000000000000000000000000000000000000..d365dfd28dcc5d101b4d3859302b1bfe
 +#endif // ENABLE(FULLSCREEN_API)
 diff --git a/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b0602be86819
+index 0000000000000000000000000000000000000000..a8a92a6c5f4b03724decc97828291f6f27cfc6aa
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/PlaywrightFullScreenManagerProxyClient.h
 @@ -0,0 +1,56 @@
@@ -15671,10 +14526,10 @@ index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b060
 +private:
 +    void closeFullScreenManager() override { }
 +    bool isFullScreen() override { return m_isFullScreen; }
-+    void enterFullScreen() override;
-+    void exitFullScreen() override;
-+    void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override { }
-+    void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override { }
++    void enterFullScreen(WebCore::FloatSize mediaDimensions, CompletionHandler<void(bool)>&&) override;
++    void exitFullScreen(CompletionHandler<void()>&&) override;
++    void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void(bool)>&&) override;
++    void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void()>&&) override;
 +
 +    WebPageProxy& m_pageProxy;
 +    bool m_isFullScreen { false };
@@ -15684,7 +14539,7 @@ index 0000000000000000000000000000000000000000..3c8fd0549f1847515d35092f0f49b060
 +
 +#endif // ENABLE(FULLSCREEN_API)
 diff --git a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
-index b2dc99d6ca28e7f1140122a259d9fbcf3b4eeabf..4f182cd32458d19b775f79deb1f6da22a4077ba6 100644
+index 493bde430bef5c064ff6807296ad088d8dee1a72..9b6dbc259e150fba3ba5fb4b488d91e3fb16be7e 100644
 --- a/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
 +++ b/Source/WebKit/UIProcess/ProvisionalFrameProxy.cpp
 @@ -25,6 +25,7 @@
@@ -15694,13 +14549,13 @@ index b2dc99d6ca28e7f1140122a259d9fbcf3b4eeabf..4f182cd32458d19b775f79deb1f6da22
 +#include "WebFrameProxy.h"
  
  #include "FrameProcess.h"
- #include "VisitedLinkStore.h"
+ #include "ProvisionalFrameCreationParameters.h"
 diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..1a824be7d9fcb225d018b4a821fa895e844d7805
+index 0000000000000000000000000000000000000000..b1ddac8c1442cb4da17f50d92599ef9aff6d4066
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/RemoteInspectorPipe.cpp
-@@ -0,0 +1,225 @@
+@@ -0,0 +1,230 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -15733,6 +14588,7 @@ index 0000000000000000000000000000000000000000..1a824be7d9fcb225d018b4a821fa895e
 +
 +#include "InspectorPlaywrightAgent.h"
 +#include <JavaScriptCore/InspectorFrontendChannel.h>
++#include <wtf/Compiler.h>
 +#include <wtf/MainThread.h>
 +#include <wtf/RunLoop.h>
 +#include <wtf/UniqueArray.h>
@@ -15748,6 +14604,8 @@ index 0000000000000000000000000000000000000000..1a824be7d9fcb225d018b4a821fa895e
 +#include <io.h>
 +#endif
 +
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
++
 +namespace WebKit {
 +
 +namespace {
@@ -15926,6 +14784,8 @@ index 0000000000000000000000000000000000000000..1a824be7d9fcb225d018b4a821fa895e
 +} // namespace WebKit
 +
 +#endif // ENABLE(REMOTE_INSPECTOR)
++
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
 diff --git a/Source/WebKit/UIProcess/RemoteInspectorPipe.h b/Source/WebKit/UIProcess/RemoteInspectorPipe.h
 new file mode 100644
 index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf8726546482fd1dc95
@@ -15997,136 +14857,24 @@ index 0000000000000000000000000000000000000000..6d04f9290135069359ce6bf872654648
 +} // namespace WebKit
 +
 +#endif // ENABLE(REMOTE_INSPECTOR)
-diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h
-index d499ee31f32b9dcdb456ba0b476d211fba115673..43b349887d18e21162b59fa8174df32c0dd6abbd 100644
---- a/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h
-+++ b/Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h
-@@ -30,6 +30,7 @@
- #include "DisplayLinkObserverID.h"
- #include "MomentumEventDispatcher.h"
- #include "NativeWebWheelEvent.h"
-+#include "RemoteLayerTreeNode.h"
- #include <WebCore/PlatformLayerIdentifier.h>
- #include <WebCore/ProcessQualified.h>
- #include <pal/HysteresisActivity.h>
-@@ -41,6 +42,11 @@
- #include <wtf/RunLoop.h>
- #include <wtf/ThreadSafeRefCounted.h>
- #include <wtf/threads/BinarySemaphore.h>
-+#include <WebCore/PageIdentifier.h>
-+#include <WebCore/RectEdges.h>
-+
-+#include "NativeWebWheelEvent.h"
-+#include "WebPage.h"
- 
- namespace WebCore {
- class PlatformWheelEvent;
-diff --git a/Source/WebKit/UIProcess/RemotePageProxy.cpp b/Source/WebKit/UIProcess/RemotePageProxy.cpp
-index 1db0914af03203844ccbda63b50f8486dc823586..3bf331ae9866aaea83e3bea6ca5bb196d4039110 100644
---- a/Source/WebKit/UIProcess/RemotePageProxy.cpp
-+++ b/Source/WebKit/UIProcess/RemotePageProxy.cpp
-@@ -43,6 +43,7 @@
- #include "WebPageProxyMessages.h"
- #include "WebProcessMessages.h"
- #include "WebProcessProxy.h"
-+#include "WebProcessMessages.h"
- #include <WebCore/RemoteUserInputEventData.h>
- 
- namespace WebKit {
-diff --git a/Source/WebKit/UIProcess/RemotePageProxy.h b/Source/WebKit/UIProcess/RemotePageProxy.h
-index 5ecfa03204724d8e5696149dd45e4d35877993f0..fc8262fb617aef3eb68cf13117747dc48a7d843e 100644
---- a/Source/WebKit/UIProcess/RemotePageProxy.h
-+++ b/Source/WebKit/UIProcess/RemotePageProxy.h
-@@ -64,7 +64,6 @@ class WebProcessProxy;
- 
- struct FrameInfoData;
- struct FrameTreeCreationParameters;
--struct NavigationActionData;
- 
- class RemotePageProxy : public IPC::MessageReceiver {
-     WTF_MAKE_FAST_ALLOCATED;
-diff --git a/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp b/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp
-index 4d8a16e02d2d3c1d11df5df2c84197da76539324..5de382d79c2dd8f7884eb27ef454ba0b99f3fab8 100644
---- a/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp
-+++ b/Source/WebKit/UIProcess/WebAuthentication/fido/U2fAuthenticator.cpp
-@@ -37,6 +37,7 @@
- #include <WebCore/U2fResponseConverter.h>
- #include <wtf/text/Base64.h>
- #include <wtf/text/StringConcatenateNumbers.h>
-+#include <wtf/text/Base64.h>
- 
- #define U2F_RELEASE_LOG(fmt, ...) RELEASE_LOG(WebAuthn, "%p [transport=%s] - U2fAuthenticator::" fmt, this, transportForDebugging().utf8().data(), ##__VA_ARGS__)
- 
-diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.cpp b/Source/WebKit/UIProcess/WebContextMenuProxy.cpp
-index d74ec9892f9a57bd7622ff5a4e16b67262165661..e884998f2a0823c32f33fe7a8499c7b4904a2fc0 100644
---- a/Source/WebKit/UIProcess/WebContextMenuProxy.cpp
-+++ b/Source/WebKit/UIProcess/WebContextMenuProxy.cpp
-@@ -33,6 +33,7 @@
- #include "WebPageMessages.h"
- #include "WebPageProxy.h"
- #include "WebProcessProxy.h"
-+#include "MessageSenderInlines.h"
- 
- namespace WebKit {
- 
 diff --git a/Source/WebKit/UIProcess/WebContextMenuProxy.h b/Source/WebKit/UIProcess/WebContextMenuProxy.h
-index e7d6621532fcc73212cc9130a7cafbb13f458d1d..ec931c8f19d2a61c0fa7d78b52df7f3f94bdd2c5 100644
+index 697a350812e1bf73dd44cc3d723a6a291f9d59d1..a8e1edd710d88f48632d51fd05aa964732d727d3 100644
 --- a/Source/WebKit/UIProcess/WebContextMenuProxy.h
 +++ b/Source/WebKit/UIProcess/WebContextMenuProxy.h
-@@ -46,6 +46,7 @@ public:
-     virtual ~WebContextMenuProxy();
+@@ -49,6 +49,7 @@ public:
+     void deref() const final { RefCounted::deref(); }
  
      virtual void show();
 +    virtual void hide() {}
  
      WebPageProxy* page() const { return m_page.get(); }
- 
-diff --git a/Source/WebKit/UIProcess/WebFrameProxy.cpp b/Source/WebKit/UIProcess/WebFrameProxy.cpp
-index 6e6560e17721ed182ab27277759488c410ae130e..207bda7e3c53118344536568ef18ccc043104ba1 100644
---- a/Source/WebKit/UIProcess/WebFrameProxy.cpp
-+++ b/Source/WebKit/UIProcess/WebFrameProxy.cpp
-@@ -31,6 +31,7 @@
- #include "Connection.h"
- #include "DrawingAreaMessages.h"
- #include "DrawingAreaProxy.h"
-+#include "FormDataReference.h"
- #include "FrameProcess.h"
- #include "FrameTreeCreationParameters.h"
- #include "FrameTreeNodeData.h"
-@@ -43,6 +44,7 @@
- #include "RemotePageProxy.h"
- #include "WebFramePolicyListenerProxy.h"
- #include "WebNavigationState.h"
-+#include "WebPageInspectorController.h"
- #include "WebPageMessages.h"
- #include "WebPageProxy.h"
- #include "WebPageProxyMessages.h"
-diff --git a/Source/WebKit/UIProcess/WebNavigationState.h b/Source/WebKit/UIProcess/WebNavigationState.h
-index f68592e910d61293346fbc251afd9bcbd28cd3a5..2f92c407fa357031a1d054aa39a65a20cbe30751 100644
---- a/Source/WebKit/UIProcess/WebNavigationState.h
-+++ b/Source/WebKit/UIProcess/WebNavigationState.h
-@@ -29,6 +29,7 @@
- #include <wtf/HashMap.h>
- #include <wtf/Ref.h>
- #include <wtf/WeakPtr.h>
-+#include "WebPageProxy.h"
- 
- namespace API {
- class Navigation;
-@@ -43,7 +44,6 @@ enum class FrameLoadType : uint8_t;
- 
- namespace WebKit {
- 
--class WebPageProxy;
- class WebBackForwardListItem;
- 
- class WebNavigationState : public CanMakeWeakPtr<WebNavigationState> {
+     RefPtr<WebPageProxy> protectedPage() const;
 diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..fef34b5cf77742521c679a46f38111c1e198b9bf
+index 0000000000000000000000000000000000000000..653b3550dda624df82de679315711fd1dd4ed0b6
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.cpp
-@@ -0,0 +1,147 @@
+@@ -0,0 +1,159 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -16200,9 +14948,9 @@ index 0000000000000000000000000000000000000000..fef34b5cf77742521c679a46f38111c1
 +#endif
 +
 +    if (deviceScaleFactor)
-+        m_page.setCustomDeviceScaleFactor(deviceScaleFactor.value());
++        m_page.setCustomDeviceScaleFactor(deviceScaleFactor.value(), [] { });
 +    m_page.setUseFixedLayout(fixedlayout);
-+    if (!m_page.pageClient().isViewVisible() && m_page.configuration().relatedPage()) {
++    if (!m_page.pageClient()->isViewVisible() && m_page.configuration().relatedPage()) {
 +        m_commandsToRunWhenShown.append([this, width, height, callback = WTFMove(callback)]() mutable {
 +            setSize(width, height, WTFMove(callback));
 +        });
@@ -16231,10 +14979,10 @@ index 0000000000000000000000000000000000000000..fef34b5cf77742521c679a46f38111c1
 +
 +Inspector::Protocol::ErrorStringOr<void> WebPageInspectorEmulationAgent::setAuthCredentials(const String& username, const String& password, const String& origin)
 +{
-+    if (!!username && !!password)
-+        m_page.setAuthCredentialsForAutomation(WebCore::Credential(username, password, WebCore::CredentialPersistence::Permanent), URL(origin));
++    if (username.isNull() && password.isNull())
++        m_page.setAuthCredentialsForAutomation(std::nullopt, std::nullopt);
 +    else
-+        m_page.setAuthCredentialsForAutomation(std::optional<WebCore::Credential>(), std::optional<URL>());
++        m_page.setAuthCredentialsForAutomation(WebCore::Credential(username, password, WebCore::CredentialPersistence::Permanent), URL(origin));
 +    return { };
 +}
 +
@@ -16266,6 +15014,18 @@ index 0000000000000000000000000000000000000000..fef34b5cf77742521c679a46f38111c1
 +    return { };
 +}
 +
++Inspector::Protocol::ErrorStringOr<void> WebPageInspectorEmulationAgent::setOrientationOverride(std::optional<int>&& angle)
++{
++#if ENABLE(ORIENTATION_EVENTS)
++    m_page.setOrientationOverride(WTFMove(angle));
++    return { };
++#else
++    UNUSED_PARAM(angle);
++    return makeUnexpected("Orientation events are disabled in this build"_s);
++#endif
++}
++
++
 +void WebPageInspectorEmulationAgent::didShowPage()
 +{
 +    for (auto& command : m_commandsToRunWhenShown)
@@ -16276,10 +15036,10 @@ index 0000000000000000000000000000000000000000..fef34b5cf77742521c679a46f38111c1
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.h b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..12657f8e7c4b2596707680d299dc8084d48f03c2
+index 0000000000000000000000000000000000000000..d00d00ce8fd800dc1497b36b8a495c5b9aef6f58
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/WebPageInspectorEmulationAgent.h
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,76 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -16341,6 +15101,7 @@ index 0000000000000000000000000000000000000000..12657f8e7c4b2596707680d299dc8084
 +    Inspector::Protocol::ErrorStringOr<void> setActiveAndFocused(std::optional<bool>&&) override;
 +    Inspector::Protocol::ErrorStringOr<void> grantPermissions(const String& origin, Ref<JSON::Array>&& permissions) override;
 +    Inspector::Protocol::ErrorStringOr<void> resetPermissions() override;
++    Inspector::Protocol::ErrorStringOr<void> setOrientationOverride(std::optional<int>&& angle) override;
 +
 +    void didShowPage();
 +
@@ -16351,16 +15112,16 @@ index 0000000000000000000000000000000000000000..12657f8e7c4b2596707680d299dc8084
 +    Ref<Inspector::EmulationBackendDispatcher> m_backendDispatcher;
 +    WebPageProxy& m_page;
 +    Vector<Function<void()>> m_commandsToRunWhenShown;
-+    HashMap<String, HashSet<String>> m_permissions;
++    UncheckedKeyHashMap<String, HashSet<String>> m_permissions;
 +};
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0fd07ababf
+index 0000000000000000000000000000000000000000..6cb20d95c1cd8682b025cfdf4ac74f49fd8e9cda
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.cpp
-@@ -0,0 +1,334 @@
+@@ -0,0 +1,394 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -16393,8 +15154,9 @@ index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0f
 +#include "NativeWebKeyboardEvent.h"
 +#include "NativeWebMouseEvent.h"
 +#include "NativeWebWheelEvent.h"
-+#include "WebWheelEvent.h"
 +#include "WebPageProxy.h"
++#include "WebTouchEvent.h"
++#include "WebWheelEvent.h"
 +#include <wtf/MathExtras.h>
 +#include <wtf/HexNumber.h>
 +#include <WebCore/Scrollbar.h>
@@ -16486,7 +15248,7 @@ index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0f
 +static String keyIdentifierForKey(const String& key)
 +{
 +    if (key.length() == 1)
-+        return makeString("U+", hex(toASCIIUpper(key.characterAt(0)), 4));
++        return makeString("U+"_s, hex(toASCIIUpper(key.characterAt(0)), 4));
 +    if (key == "Delete"_s)
 +        return "U+007F"_s;
 +    if (key == "Backspace"_s)
@@ -16627,7 +15389,7 @@ index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0f
 +    m_mouseCallbacks->append(WTFMove(callback));
 +
 +    // Convert css coordinates to view coordinates (dip).
-+    double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor();
++    double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor() * m_page.pageZoomFactor();
 +    x = clampToInteger(roundf(x * totalScale));
 +    y = clampToInteger(roundf(y * totalScale));
 +    eventDeltaX = clampToInteger(roundf(eventDeltaX * totalScale));
@@ -16660,10 +15422,69 @@ index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0f
 +#endif
 +}
 +
-+void WebPageInspectorInputAgent::dispatchTapEvent(int x, int y, std::optional<int>&& modifiers, Ref<DispatchTapEventCallback>&& callback) {
-+    m_page.sendWithAsyncReply(Messages::WebPage::FakeTouchTap(WebCore::IntPoint(x, y), modifiers ? *modifiers : 0), [callback]() {
++void WebPageInspectorInputAgent::dispatchTapEvent(int x, int y, std::optional<int>&& modifiers, Ref<DispatchTapEventCallback>&& callback)
++{
++    m_page.legacyMainFrameProcess().sendWithAsyncReply(Messages::WebPage::FakeTouchTap(WebCore::IntPoint(x, y), modifiers ? *modifiers : 0), [callback]() {
 +        callback->sendSuccess();
-+    });
++    }, m_page.webPageIDInMainFrameProcess());
++}
++
++void WebPageInspectorInputAgent::dispatchTouchEvent(const String& type, std::optional<int>&& modifiers, RefPtr<JSON::Array>&& in_touchPoints, Ref<DispatchTouchEventCallback>&& callback)
++{
++    float rotationAngle = 0.0;
++    float force = 1.0;
++    const WebCore::IntSize radius(1, 1);
++
++    uint8_t unsignedModifiers = modifiers ? static_cast<uint8_t>(*modifiers) : 0;
++    OptionSet<WebEventModifier> eventModifiers;
++    eventModifiers = eventModifiers.fromRaw(unsignedModifiers);
++
++    WebPlatformTouchPoint::State state;
++    if (type == "touchStart"_s)
++        state = WebPlatformTouchPoint::State::Pressed;
++    else if (type == "touchMove"_s)
++        state = WebPlatformTouchPoint::State::Moved;
++    else if (type == "touchEnd"_s)
++        state = WebPlatformTouchPoint::State::Released;
++    else if (type == "touchCancel"_s)
++        state = WebPlatformTouchPoint::State::Cancelled;
++    else {
++        callback->sendFailure("Unsupported event type"_s);
++        return;
++    }
++
++    Vector<WebPlatformTouchPoint> touchPoints;
++    for (unsigned i = 0; i < in_touchPoints->length(); ++i) {
++        RefPtr<JSON::Value> item = in_touchPoints->get(i);
++        RefPtr<JSON::Object> obj = item->asObject();
++        if (!obj) {
++            callback->sendFailure("Invalid TouchPoint format"_s);
++            return;
++        }
++        std::optional<int> x = obj->getInteger("x"_s);
++        if (!x) {
++            callback->sendFailure("TouchPoint does not have x"_s);
++            return;
++        }
++        std::optional<int> y = obj->getInteger("y"_s);
++        if (!y) {
++            callback->sendFailure("TouchPoint does not have y"_s);
++            return;
++        }
++        std::optional<int> optionalId = obj->getInteger("id"_s);
++        int id = optionalId ? *optionalId : 0;
++        const WebCore::IntPoint position(*x, *y);
++        touchPoints.append(WebPlatformTouchPoint(id, state, position, position, radius, rotationAngle, force));
++    }
++
++    WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, WallTime::now()}, WTFMove(touchPoints), {}, {});
++    m_page.legacyMainFrameProcess().sendWithAsyncReply(Messages::WebPage::TouchEvent(touchEvent), [callback] (std::optional<WebEventType> eventType, bool) {
++        if (!eventType) {
++            callback->sendFailure("Failed to dispatch touch event."_s);
++            return;
++        }
++        callback->sendSuccess();
++    }, m_page.webPageIDInMainFrameProcess());
 +}
 +
 +void WebPageInspectorInputAgent::dispatchWheelEvent(int x, int y, std::optional<int>&& modifiers, std::optional<int>&& deltaX, std::optional<int>&& deltaY, Ref<DispatchWheelEventCallback>&& callback)
@@ -16681,7 +15502,7 @@ index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0f
 +    m_wheelCallbacks->append(WTFMove(callback));
 +
 +    // Convert css coordinates to view coordinates (dip).
-+    double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor();
++    double totalScale = m_page.pageScaleFactor() * m_page.viewScaleFactor() * m_page.pageZoomFactor();
 +    x = clampToInteger(roundf(x * totalScale));
 +    y = clampToInteger(roundf(y * totalScale));
 +
@@ -16697,10 +15518,10 @@ index 0000000000000000000000000000000000000000..f4519d0655e1e92e6d47a9e59cf01b0f
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..3e87bf40ced2301f4fb145c6cb31f2cf7fa15dd6
+index 0000000000000000000000000000000000000000..26a2a3c0791c334f811ec99a630314f8e8521d02
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/WebPageInspectorInputAgent.h
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,87 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -16765,6 +15586,7 @@ index 0000000000000000000000000000000000000000..3e87bf40ced2301f4fb145c6cb31f2cf
 +    void dispatchKeyEvent(const String& type, std::optional<int>&& modifiers, const String& text, const String& unmodifiedText, const String& code, const String& key, std::optional<int>&& windowsVirtualKeyCode, std::optional<int>&& nativeVirtualKeyCode, std::optional<bool>&& autoRepeat, std::optional<bool>&& isKeypad, std::optional<bool>&& isSystemKey, RefPtr<JSON::Array>&&, Ref<DispatchKeyEventCallback>&& callback) override;
 +    void dispatchMouseEvent(const String& type, int x, int y, std::optional<int>&& modifiers, const String& button, std::optional<int>&& buttons, std::optional<int>&& clickCount, std::optional<int>&& deltaX, std::optional<int>&& deltaY, Ref<DispatchMouseEventCallback>&& callback) override;
 +    void dispatchTapEvent(int x, int y, std::optional<int>&& modifiers, Ref<DispatchTapEventCallback>&& callback) override;
++    void dispatchTouchEvent(const String& type, std::optional<int>&& modifiers, RefPtr<JSON::Array>&& touchPoints, Ref<DispatchTouchEventCallback>&& callback) override;
 +    void dispatchWheelEvent(int x, int y, std::optional<int>&& modifiers, std::optional<int>&& deltaX, std::optional<int>&& deltaY, Ref<DispatchWheelEventCallback>&& callback) override;
 +
 +private:
@@ -16788,25 +15610,26 @@ index 0000000000000000000000000000000000000000..3e87bf40ced2301f4fb145c6cb31f2cf
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
-index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453d4592996 100644
+index 7c380219c6ff83938d0b7425b62932521cdb1edb..7439ed4314cd66866e0eb570e46744cad3254e10 100644
 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp
 +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
-@@ -185,12 +185,14 @@
- #include <WebCore/AppHighlight.h>
+@@ -205,6 +205,7 @@
  #include <WebCore/ArchiveError.h>
  #include <WebCore/BitmapImage.h>
+ #include <WebCore/CaptureDeviceManager.h>
 +#include <WebCore/Color.h>
  #include <WebCore/CompositionHighlight.h>
  #include <WebCore/CrossSiteNavigationDataTransfer.h>
- #include <WebCore/DOMPasteAccess.h>
- #include <WebCore/DeprecatedGlobalSettings.h>
- #include <WebCore/DiagnosticLoggingClient.h>
- #include <WebCore/DiagnosticLoggingKeys.h>
+ #include <WebCore/CryptoKey.h>
+@@ -217,6 +218,7 @@
+ #include <WebCore/DigitalCredentialsProtocols.h>
+ #include <WebCore/DigitalCredentialsRequestData.h>
+ #include <WebCore/DigitalCredentialsResponseData.h>
 +#include <WebCore/DiagnosticLoggingResultType.h>
  #include <WebCore/DragController.h>
  #include <WebCore/DragData.h>
  #include <WebCore/ElementContext.h>
-@@ -211,6 +213,7 @@
+@@ -242,6 +244,7 @@
  #include <WebCore/ModalContainerTypes.h>
  #include <WebCore/NotImplemented.h>
  #include <WebCore/OrganizationStorageAccessPromptQuirk.h>
@@ -16814,7 +15637,7 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
  #include <WebCore/PerformanceLoggingClient.h>
  #include <WebCore/PermissionDescriptor.h>
  #include <WebCore/PermissionState.h>
-@@ -218,11 +221,13 @@
+@@ -250,10 +253,13 @@
  #include <WebCore/PublicSuffixStore.h>
  #include <WebCore/Quirks.h>
  #include <WebCore/RealtimeMediaSourceCenter.h>
@@ -16823,22 +15646,22 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
  #include <WebCore/RenderEmbeddedObject.h>
  #include <WebCore/ResourceLoadStatistics.h>
  #include <WebCore/RunJavaScriptParameters.h>
- #include <WebCore/RuntimeApplicationChecks.h>
++#include <WebCore/ScreenOrientationType.h>
 +#include <WebCore/SecurityOriginData.h>
  #include <WebCore/SerializedCryptoKeyWrap.h>
+ #include <WebCore/SerializedScriptValue.h>
  #include <WebCore/ShareData.h>
- #include <WebCore/SharedBuffer.h>
-@@ -298,6 +303,9 @@
+@@ -349,6 +355,9 @@
+ #if USE(GBM)
  #include "AcceleratedBackingStoreDMABuf.h"
  #endif
- #include "GtkSettingsManager.h"
 +#endif
 +
 +#if PLATFORM(GTK) || PLATFORM(WPE)
  #include <WebCore/SelectionData.h>
  #endif
  
-@@ -419,6 +427,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
+@@ -474,6 +483,8 @@ static constexpr Seconds tryCloseTimeoutDelay = 50_ms;
  static constexpr Seconds audibleActivityClearDelay = 10_s;
  #endif
  
@@ -16847,36 +15670,36 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
  DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageProxyCounter, ("WebPageProxy"));
  
  #if PLATFORM(COCOA)
-@@ -823,6 +833,10 @@ WebPageProxy::~WebPageProxy()
-     if (preferences->mediaSessionCoordinatorEnabled())
-         GroupActivitiesSessionNotifier::sharedNotifier().removeWebPage(*this);
+@@ -1007,6 +1018,10 @@ WebPageProxy::~WebPageProxy()
  #endif
+ 
+     internals().updatePlayingMediaDidChangeTimer.stop();
 +
 +#if PLATFORM(COCOA)
 +    releaseInspectorDragPasteboard();
 +#endif
  }
  
- void WebPageProxy::addAllMessageReceivers()
-@@ -1361,6 +1375,7 @@ void WebPageProxy::finishAttachingToWebProcess(ProcessLaunchReason reason)
- 
-     protectedPageClient()->didRelaunchProcess();
-     internals().pageLoadState.didSwapWebProcesses();
-+    m_inspectorController->didFinishAttachingToWebProcess();
- }
- 
- void WebPageProxy::didAttachToRunningProcess()
-@@ -1369,7 +1384,7 @@ void WebPageProxy::didAttachToRunningProcess()
+ Ref<WebPageProxy> WebPageProxy::Internals::protectedPage() const
+@@ -1580,7 +1595,7 @@ void WebPageProxy::didAttachToRunningProcess()
  
  #if ENABLE(FULLSCREEN_API)
      ASSERT(!m_fullScreenManager);
--    m_fullScreenManager = makeUnique<WebFullScreenManagerProxy>(*this, protectedPageClient()->fullScreenManagerProxyClient());
-+    m_fullScreenManager = makeUnique<WebFullScreenManagerProxy>(*this, m_fullScreenManagerClientOverride ? *m_fullScreenManagerClientOverride : protectedPageClient()->fullScreenManagerProxyClient());
+-    m_fullScreenManager = WebFullScreenManagerProxy::create(*this, protectedPageClient()->fullScreenManagerProxyClient());
++    m_fullScreenManager = WebFullScreenManagerProxy::create(*this, m_fullScreenManagerClientOverride ? *m_fullScreenManagerClientOverride : protectedPageClient()->fullScreenManagerProxyClient());
  #endif
  #if ENABLE(VIDEO_PRESENTATION_MODE)
      ASSERT(!m_playbackSessionManager);
-@@ -1764,6 +1779,21 @@ WebProcessProxy& WebPageProxy::ensureRunningProcess()
-     return m_process;
+@@ -1739,6 +1754,7 @@ void WebPageProxy::initializeWebPage(const Site& site, WebCore::SandboxFlags eff
+     if (preferences->siteIsolationEnabled())
+         browsingContextGroup->addPage(*this);
+     process->send(Messages::WebProcess::CreateWebPage(m_webPageID, creationParameters(process, *m_drawingArea, m_mainFrame->frameID(), std::nullopt)), 0);
++    m_inspectorController->didInitializeWebPage();
+ 
+ #if ENABLE(WINDOW_PROXY_PROPERTY_ACCESS_NOTIFICATION)
+     internals().frameLoadStateObserver = makeUniqueWithoutRefCountedCheck<WebPageProxyFrameLoadStateObserver>(*this);
+@@ -2021,6 +2037,21 @@ Ref<WebProcessProxy> WebPageProxy::ensureProtectedRunningProcess()
+     return ensureRunningProcess();
  }
  
 +RefPtr<API::Navigation> WebPageProxy::loadRequestForInspector(WebCore::ResourceRequest&& request, WebFrameProxy* frame)
@@ -16884,21 +15707,55 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +    if (!frame || frame == mainFrame())
 +        return loadRequest(WTFMove(request), WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow);
 +
-+    auto navigation = m_navigationState->createLoadRequestNavigation(process().coreProcessIdentifier(), ResourceRequest(request), m_backForwardList->currentItem());
++    auto navigation = m_navigationState->createLoadRequestNavigation(legacyMainFrameProcess().coreProcessIdentifier(), ResourceRequest(request), m_backForwardList->currentItem());
 +    LoadParameters loadParameters;
 +    loadParameters.navigationID = navigation->navigationID();
 +    loadParameters.request = WTFMove(request);
 +    loadParameters.shouldOpenExternalURLsPolicy = WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow;
 +    loadParameters.shouldTreatAsContinuingLoad = ShouldTreatAsContinuingLoad::No;
-+    m_process->send(Messages::WebPage::LoadRequestInFrameForInspector(WTFMove(loadParameters), frame->frameID()), internals().webPageID);
++    m_legacyMainFrameProcess->send(Messages::WebPage::LoadRequestInFrameForInspector(WTFMove(loadParameters), frame->frameID()), m_webPageID);
 +    return navigation;
 +}
 +
- RefPtr<API::Navigation> WebPageProxy::loadRequest(ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, API::Object* userData)
+ RefPtr<API::Navigation> WebPageProxy::loadRequest(WebCore::ResourceRequest&& request, ShouldOpenExternalURLsPolicy shouldOpenExternalURLsPolicy, IsPerformingHTTPFallback isPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&& lastNavigationAction, API::Object* userData)
  {
      if (m_isClosed)
-@@ -2336,6 +2366,42 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
-     websiteDataStore().protectedNetworkProcess()->send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0);
+@@ -2136,11 +2167,29 @@ void WebPageProxy::loadRequestWithNavigationShared(Ref<WebProcessProxy>&& proces
+ 
+         navigation->setIsLoadedWithNavigationShared(true);
+         protectedProcess->markProcessAsRecentlyUsed();
+-        if (!protectedProcess->isLaunching() || !url.protocolIsFile())
+-            protectedProcess->send(Messages::WebPage::LoadRequest(WTFMove(loadParameters)), webPageID);
++
++        // Pause loading for new window navigation.
++        Function<void()> continuation = [
++            weakThis = WeakPtr { protectedThis },
++            weakProcess = WeakPtr { protectedProcess },
++            loadParameters = WTFMove(loadParameters),
++            webPageID,
++            url
++        ]() mutable {
++            RefPtr innerProtectedProcess = weakProcess.get();
++            RefPtr innerProtectedThis = weakThis.get();
++            if (!innerProtectedProcess || !innerProtectedThis)
++                return;
++            if (!innerProtectedProcess->isLaunching() || !url.protocolIsFile())
++                innerProtectedProcess->send(Messages::WebPage::LoadRequest(WTFMove(loadParameters)), webPageID);
++            else
++                innerProtectedProcess->send(Messages::WebPage::LoadRequestWaitingForProcessLaunch(WTFMove(loadParameters), innerProtectedThis->internals().pageLoadState.resourceDirectoryURL(), innerProtectedThis->identifier(), true), webPageID);
++            innerProtectedProcess->startResponsivenessTimer();
++        };
++        if (protectedThis->m_inspectorController->shouldPauseLoadRequest())
++            protectedThis->m_inspectorController->setContinueLoadingCallback(WTFMove(continuation));
+         else
+-            protectedProcess->send(Messages::WebPage::LoadRequestWaitingForProcessLaunch(WTFMove(loadParameters), protectedThis->pageLoadState().resourceDirectoryURL(), protectedThis->identifier(), true), webPageID);
+-        protectedProcess->startResponsivenessTimer();
++            continuation();
+     });
+ }
+ 
+@@ -2696,6 +2745,63 @@ void WebPageProxy::setControlledByAutomation(bool controlled)
+     protectedWebsiteDataStore()->protectedNetworkProcess()->send(Messages::NetworkProcess::SetSessionIsControlledByAutomation(m_websiteDataStore->sessionID(), m_controlledByAutomation), 0);
  }
  
 +void WebPageProxy::setAuthCredentialsForAutomation(std::optional<WebCore::Credential>&& credentials, std::optional<URL>&& origin)
@@ -16907,11 +15764,30 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +    m_authOriginForAutomation = WTFMove(origin);
 +}
 +
-+void WebPageProxy::setPermissionsForAutomation(const HashMap<String, HashSet<String>>& permissions)
++void WebPageProxy::setPermissionsForAutomation(const UncheckedKeyHashMap<String, HashSet<String>>& permissions)
 +{
 +    m_permissionsForAutomation = permissions;
 +}
 +
++static inline WebCore::ScreenOrientationType toScreenOrientationType(int angle)
++{
++    if (angle == -90)
++        return WebCore::ScreenOrientationType::LandscapeSecondary;
++    if (angle == 180)
++        return WebCore::ScreenOrientationType::PortraitSecondary;
++    if (angle == 90)
++        return WebCore::ScreenOrientationType::LandscapePrimary;
++    return WebCore::ScreenOrientationType::PortraitPrimary;
++}
++
++void WebPageProxy::setOrientationOverride(std::optional<int>&& angle)
++{
++    auto deviceOrientation = toScreenOrientationType(angle.value_or(0));
++    if (m_screenOrientationManager)
++        m_screenOrientationManager->setCurrentOrientation(deviceOrientation);
++    m_legacyMainFrameProcess->send(Messages::WebPage::SetDeviceOrientation(angle.value_or(0)), webPageIDInMainFrameProcess());
++}
++
 +std::optional<bool> WebPageProxy::permissionForAutomation(const String& origin, const String& permission) const
 +{
 +    auto permissions = m_permissionsForAutomation.find(origin);
@@ -16934,15 +15810,17 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +
 +void WebPageProxy::logToStderr(const String& str)
 +{
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_BEGIN
 +    fprintf(stderr, "RENDERER: %s\n", str.utf8().data());
++WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
 +}
 +
- void WebPageProxy::createInspectorTarget(const String& targetId, Inspector::InspectorTargetType type)
+ void WebPageProxy::createInspectorTarget(IPC::Connection& connection, const String& targetId, Inspector::InspectorTargetType type)
  {
-     MESSAGE_CHECK(m_process, !targetId.isEmpty());
-@@ -2577,6 +2643,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
+     MESSAGE_CHECK_BASE(!targetId.isEmpty(), connection);
+@@ -2955,6 +3061,24 @@ void WebPageProxy::updateActivityState(OptionSet<ActivityState> flagsToUpdate)
      bool wasVisible = isViewVisible();
-     Ref pageClient = this->pageClient();
+     RefPtr pageClient = this->pageClient();
      internals().activityState.remove(flagsToUpdate);
 +
 +    if (m_activeForAutomation) {
@@ -16965,37 +15843,37 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
      if (flagsToUpdate & ActivityState::IsFocused && pageClient->isViewFocused())
          internals().activityState.add(ActivityState::IsFocused);
      if (flagsToUpdate & ActivityState::WindowIsActive && pageClient->isViewWindowActive())
-@@ -3302,7 +3386,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
-     grantAccessToCurrentPasteboardData(dragStorageName);
- #endif
+@@ -3718,7 +3842,7 @@ void WebPageProxy::performDragOperation(DragData& dragData, const String& dragSt
+     if (!hasRunningProcess())
+         return;
  
 -#if PLATFORM(GTK)
 +#if PLATFORM(GTK) || PLATFORM(WPE)
-     performDragControllerAction(DragControllerAction::PerformDragOperation, dragData);
- #else
-     if (!hasRunningProcess())
-@@ -3319,6 +3403,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+     URL url { dragData.asURL() };
+     if (url.protocolIsFile())
+         protectedLegacyMainFrameProcess()->assumeReadAccessToBaseURL(*this, url.string(), [] { });
+@@ -3746,6 +3870,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
      if (!hasRunningProcess())
          return;
  
 +    m_dragEventsQueued++;
 +
      auto completionHandler = [this, protectedThis = Ref { *this }, action, dragData] (std::optional<WebCore::DragOperation> dragOperation, WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, const IntRect& insertionRect, const IntRect& editableElementRect, std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData) mutable {
-         if (!remoteUserInputEventData) {
-             didPerformDragControllerAction(dragOperation, dragHandlingMethod, mouseIsOverFileInput, numberOfItemsToBeAccepted, insertionRect, editableElementRect);
-@@ -3335,6 +3421,8 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
-         protectedProcess()->assumeReadAccessToBaseURL(*this, url);
- 
-     ASSERT(dragData.platformData());
-+#endif
+         if (!m_pageClient)
+             return;
+@@ -3757,7 +3883,7 @@ void WebPageProxy::performDragControllerAction(DragControllerAction action, Drag
+         dragData.setClientPosition(remoteUserInputEventData->transformedPoint);
+         performDragControllerAction(action, dragData, remoteUserInputEventData->targetFrameID);
+     };
+-#if PLATFORM(GTK)
 +#if PLATFORM(GTK) || PLATFORM(WPE)
-     sendWithAsyncReply(Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler));
+     ASSERT(dragData.platformData());
+     sendWithAsyncReplyToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(action, dragData.clientPosition(), dragData.globalPosition(), dragData.draggingSourceOperationMask(), *dragData.platformData(), dragData.flags()), WTFMove(completionHandler));
  #else
-     sendToProcessContainingFrame(frameID, Messages::WebPage::PerformDragControllerAction(frameID, action, dragData), WTFMove(completionHandler));
-@@ -3350,14 +3438,34 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
-     internals().currentDragCaretEditableElementRect = editableElementRect;
+@@ -3792,14 +3918,35 @@ void WebPageProxy::didPerformDragControllerAction(std::optional<WebCore::DragOpe
      setDragCaretRect(insertionRect);
-     protectedPageClient()->didPerformDragControllerAction();
+     if (RefPtr pageClient = this->pageClient())
+         pageClient->didPerformDragControllerAction();
 +    m_dragEventsQueued--;
 +    if (m_dragEventsQueued == 0 && internals().mouseEventQueue.isEmpty())
 +        m_inspectorController->didProcessAllPendingMouseEvents();
@@ -17005,32 +15883,34 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +#if PLATFORM(GTK) || PLATFORM(WPE)
  void WebPageProxy::startDrag(SelectionData&& selectionData, OptionSet<WebCore::DragOperation> dragOperationMask, std::optional<ShareableBitmap::Handle>&& dragImageHandle, IntPoint&& dragImageHotspot)
  {
--    RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
--    protectedPageClient()->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
+-    if (RefPtr pageClient = this->pageClient()) {
+-        RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
+-        pageClient->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
 +    if (m_interceptDrags) {
 +        m_dragSelectionData = WTFMove(selectionData);
 +        m_dragSourceOperationMask = dragOperationMask;
 +    } else {
 +#if PLATFORM(GTK)
-+        RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
-+        protectedPageClient()->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
++        if (RefPtr pageClient = this->pageClient()) {
++            RefPtr dragImage = dragImageHandle ? ShareableBitmap::create(WTFMove(*dragImageHandle)) : nullptr;
++            pageClient->startDrag(WTFMove(selectionData), dragOperationMask, WTFMove(dragImage), WTFMove(dragImageHotspot));
++        }
 +#endif
 +    }
 +    didStartDrag();
 +}
 +#endif
- 
++
 +#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT)
 +void WebPageProxy::startDrag(WebCore::DragDataMap&& dragDataMap)
 +{
 +    if (m_interceptDrags) {
 +        m_dragSelectionData = WTFMove(dragDataMap);
 +        m_dragSourceOperationMask = WebCore::anyDragOperation();
-+    }
+     }
      didStartDrag();
  }
- #endif
-@@ -3378,6 +3486,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
+@@ -3821,6 +3968,24 @@ void WebPageProxy::dragEnded(const IntPoint& clientPosition, const IntPoint& glo
      setDragCaretRect({ });
  }
  
@@ -17055,24 +15935,34 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
  void WebPageProxy::didStartDrag()
  {
      if (!hasRunningProcess())
-@@ -3385,6 +3511,16 @@ void WebPageProxy::didStartDrag()
+@@ -3828,6 +3993,26 @@ void WebPageProxy::didStartDrag()
  
      discardQueuedMouseEvents();
      send(Messages::WebPage::DidStartDrag());
 +
 +    if (m_interceptDrags) {
++        {
++#if PLATFORM(WIN) || PLATFORM(COCOA)
++            DragData dragData(*m_dragSelectionData, m_lastMousePositionForDrag, WebCore::IntPoint(), m_dragSourceOperationMask);
++#else
++            DragData dragData(&*m_dragSelectionData, m_lastMousePositionForDrag, WebCore::IntPoint(), m_dragSourceOperationMask);
++#endif
++            dragEntered(dragData);
++        }
++
++        {
 +#if PLATFORM(WIN) || PLATFORM(COCOA)
-+        DragData dragData(*m_dragSelectionData, m_lastMousePositionForDrag, WebCore::IntPoint(), m_dragSourceOperationMask);
++            DragData dragData(*m_dragSelectionData, m_lastMousePositionForDrag, WebCore::IntPoint(), m_dragSourceOperationMask);
 +#else
-+        DragData dragData(&*m_dragSelectionData, m_lastMousePositionForDrag, WebCore::IntPoint(), m_dragSourceOperationMask);
++            DragData dragData(&*m_dragSelectionData, m_lastMousePositionForDrag, WebCore::IntPoint(), m_dragSourceOperationMask);
 +#endif
-+        dragEntered(dragData);
-+        dragUpdated(dragData);
++            dragUpdated(dragData);
++        }
 +    }
  }
  
  void WebPageProxy::dragCancelled()
-@@ -3540,16 +3676,37 @@ void WebPageProxy::processNextQueuedMouseEvent()
+@@ -3999,26 +4184,47 @@ void WebPageProxy::processNextQueuedMouseEvent()
          process->startResponsivenessTimer();
      }
  
@@ -17090,10 +15980,26 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +            sandboxExtensions = SandboxExtension::createHandlesForMachLookup({ "com.apple.iconservices"_s, "com.apple.iconservices.store"_s }, process->auditToken(), SandboxExtension::MachBootstrapOptions::EnableMachBootstrap);
  #endif
  
--    LOG_WITH_STREAM(MouseHandling, stream << "UIProcess: sent mouse event " << eventType << " (queue size " << internals().mouseEventQueue.size() << ")");
--    sendMouseEvent(m_mainFrame->frameID(), event, WTFMove(sandboxExtensions));
-+        LOG_WITH_STREAM(MouseHandling, stream << "UIProcess: sent mouse event " << eventType << " (queue size " << internals().mouseEventQueue.size() << ")");
-+        sendMouseEvent(m_mainFrame->frameID(), event, WTFMove(sandboxExtensions));
+-    auto eventWithCoalescedEvents = event;
++        auto eventWithCoalescedEvents = event;
+ 
+-    if (event.type() == WebEventType::MouseMove) {
+-        internals().coalescedMouseEvents.append(event);
+-        eventWithCoalescedEvents.setCoalescedEvents(internals().coalescedMouseEvents);
+-    }
++        if (event.type() == WebEventType::MouseMove) {
++            internals().coalescedMouseEvents.append(event);
++            eventWithCoalescedEvents.setCoalescedEvents(internals().coalescedMouseEvents);
++        }
+ 
+-    LOG_WITH_STREAM(MouseHandling, stream << "UIProcess: sent mouse event " << eventType << " (queue size " << internals().mouseEventQueue.size() << ", coalesced events size " << internals().coalescedMouseEvents.size() << ")");
++        LOG_WITH_STREAM(MouseHandling, stream << "UIProcess: sent mouse event " << eventType << " (queue size " << internals().mouseEventQueue.size() << ", coalesced events size " << internals().coalescedMouseEvents.size() << ")");
+ 
+-    sendMouseEvent(m_mainFrame->frameID(), eventWithCoalescedEvents, WTFMove(sandboxExtensions));
++        sendMouseEvent(m_mainFrame->frameID(), eventWithCoalescedEvents, WTFMove(sandboxExtensions));
+ 
+-    internals().coalescedMouseEvents.clear();
++        internals().coalescedMouseEvents.clear();
 +    } else {
 +#if PLATFORM(WIN) || PLATFORM(COCOA)
 +        DragData dragData(*m_dragSelectionData, event.position(), event.globalPosition(), m_dragSourceOperationMask);
@@ -17111,91 +16017,82 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +            m_dragSelectionData = std::nullopt;
 +            dragEnded(event.position(), event.globalPosition(), m_dragSourceOperationMask);
 +        }
-+        didReceiveEvent(eventType, true);
++        didReceiveEventIPC(process->connection(), eventType, true, std::nullopt);
 +    }
  }
  
  void WebPageProxy::doAfterProcessingAllPendingMouseEvents(WTF::Function<void ()>&& action)
-@@ -3715,6 +3872,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
+@@ -4215,6 +4421,8 @@ void WebPageProxy::wheelEventHandlingCompleted(bool wasHandled)
      
-     if (RefPtr automationSession = process().processPool().automationSession())
+     if (RefPtr automationSession = m_configuration->processPool().automationSession())
          automationSession->wheelEventsFlushedForPage(*this);
 +
 +    m_inspectorController->didProcessAllPendingWheelEvents();
  }
  
  void WebPageProxy::cacheWheelEventScrollingAccelerationCurve(const NativeWebWheelEvent& nativeWheelEvent)
-@@ -3863,7 +4022,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
+@@ -4351,7 +4559,7 @@ static TrackingType mergeTrackingTypes(TrackingType a, TrackingType b)
  
  void WebPageProxy::updateTouchEventTracking(const WebTouchEvent& touchStartEvent)
  {
 -#if ENABLE(ASYNC_SCROLLING) && PLATFORM(COCOA)
 +#if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS_FAMILY)
      for (auto& touchPoint : touchStartEvent.touchPoints()) {
-         auto location = touchPoint.location();
+         auto location = touchPoint.locationInRootView();
          auto update = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) {
-@@ -4460,6 +4619,7 @@ void WebPageProxy::receivedNavigationActionPolicyDecision(WebProcessProxy& proce
+@@ -5012,6 +5220,7 @@ void WebPageProxy::receivedNavigationActionPolicyDecision(WebProcessProxy& proce
  
  void WebPageProxy::receivedPolicyDecision(PolicyAction action, API::Navigation* navigation, RefPtr<API::WebsitePolicies>&& websitePolicies, Ref<API::NavigationAction>&& navigationAction, WillContinueLoadInNewProcess willContinueLoadInNewProcess, std::optional<SandboxExtension::Handle> sandboxExtensionHandle, std::optional<PolicyDecisionConsoleMessage>&& consoleMessage, CompletionHandler<void(PolicyDecision&&)>&& completionHandler)
  {
-+    m_inspectorController->didReceivePolicyDecision(action, navigation ? navigation->navigationID() : 0);
++    m_inspectorController->didReceivePolicyDecision(action, navigation ? std::optional { navigation->navigationID() } : std::nullopt);
      if (!hasRunningProcess())
          return completionHandler(PolicyDecision { });
  
-@@ -5382,6 +5542,11 @@ void WebPageProxy::pageScaleFactorDidChange(double scaleFactor)
-     m_pageScaleFactor = scaleFactor;
- }
- 
-+void WebPageProxy::viewScaleFactorDidChange(double scaleFactor)
-+{
+@@ -6013,6 +6222,7 @@ void WebPageProxy::viewScaleFactorDidChange(IPC::Connection& connection, double
+     MESSAGE_CHECK_BASE(scaleFactorIsValid(scaleFactor), connection);
+     if (!legacyMainFrameProcess().hasConnection(connection))
+         return;
 +    m_viewScaleFactor = scaleFactor;
-+}
-+
- void WebPageProxy::pluginScaleFactorDidChange(double pluginScaleFactor)
- {
-     MESSAGE_CHECK(m_process, scaleFactorIsValid(pluginScaleFactor));
-@@ -5935,6 +6100,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, ui
-     Ref protectedPageClient { pageClient() };
  
-     m_navigationState->didDestroyNavigation(process->coreProcessIdentifier(), navigationID);
+     forEachWebContentProcess([&] (auto& process, auto pageID) {
+         if (&process == &legacyMainFrameProcess())
+@@ -6664,6 +6874,7 @@ void WebPageProxy::didDestroyNavigationShared(Ref<WebProcessProxy>&& process, We
+     RefPtr protectedPageClient { pageClient() };
+ 
+     protectedNavigationState()->didDestroyNavigation(process->coreProcessIdentifier(), navigationID);
 +    m_inspectorController->didDestroyNavigation(navigationID);
  }
  
- void WebPageProxy::didStartProvisionalLoadForFrame(FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, uint64_t navigationID, URL&& url, URL&& unreachableURL, const UserData& userData)
-@@ -6189,6 +6355,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
+ void WebPageProxy::didStartProvisionalLoadForFrame(IPC::Connection& connection, FrameIdentifier frameID, FrameInfoData&& frameInfo, ResourceRequest&& request, std::optional<WebCore::NavigationIdentifier> navigationID, URL&& url, URL&& unreachableURL, const UserData& userData, WallTime timestamp)
+@@ -7008,6 +7219,8 @@ void WebPageProxy::didFailProvisionalLoadForFrameShared(Ref<WebProcessProxy>&& p
  
      m_failingProvisionalLoadURL = { };
  
-+    m_inspectorController->didFailProvisionalLoadForFrame(navigationID, error);
++    m_inspectorController->didFailProvisionalLoadForFrame(*navigationID, error);
 +
      // If the provisional page's load fails then we destroy the provisional page.
      if (m_provisionalPage && m_provisionalPage->mainFrame() == &frame && willContinueLoading == WillContinueLoading::No)
          m_provisionalPage = nullptr;
-@@ -6834,7 +7002,14 @@ void WebPageProxy::beginSafeBrowsingCheck(const URL&, bool, WebFramePolicyListen
- 
- void WebPageProxy::decidePolicyForNavigationActionAsync(NavigationActionData&& data, CompletionHandler<void(PolicyDecision&&)>&& completionHandler)
- {
--    decidePolicyForNavigationActionAsyncShared(protectedProcess(), WTFMove(data), WTFMove(completionHandler));
-+    if (m_inspectorController->shouldPauseLoading()) {
-+        decidePolicyForNavigationActionAsyncShared(protectedProcess(), WTFMove(data), WTFMove(completionHandler));
-+        m_inspectorController->setContinueLoadingCallback([this, protectedThis = Ref { *this }, data = WTFMove(data), completionHandler = WTFMove(completionHandler)] () mutable {
-+            decidePolicyForNavigationActionAsyncShared(protectedProcess(), WTFMove(data), WTFMove(completionHandler));
-+        });
-+    } else {
-+        decidePolicyForNavigationActionAsyncShared(protectedProcess(), WTFMove(data), WTFMove(completionHandler));
-+    }
- }
- 
- void WebPageProxy::decidePolicyForNavigationActionAsyncShared(Ref<WebProcessProxy>&& process, NavigationActionData&& data, CompletionHandler<void(PolicyDecision&&)>&& completionHandler)
-@@ -7474,6 +7649,7 @@ void WebPageProxy::createNewPage(WindowFeatures&& windowFeatures, NavigationActi
+@@ -8536,8 +8749,9 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
      if (RefPtr page = originatingFrameInfo->page())
          openerAppInitiatedState = page->lastNavigationWasAppInitiated();
  
+-    auto navigationDataForNewProcess = navigationActionData.hasOpener ? nullptr : makeUnique<NavigationActionData>(navigationActionData);
 +    m_inspectorController->willCreateNewPage(windowFeatures, request.url());
+ 
++    auto navigationDataForNewProcess = navigationActionData.hasOpener ? nullptr : makeUnique<NavigationActionData>(navigationActionData);
      auto completionHandler = [
          this,
          protectedThis = Ref { *this },
-@@ -7540,6 +7716,7 @@ void WebPageProxy::createNewPage(WindowFeatures&& windowFeatures, NavigationActi
+@@ -8617,6 +8831,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
+     configuration->setOpenedMainFrameName(openedMainFrameName);
+     if (!protectedPreferences()->siteIsolationEnabled())
+         configuration->setRelatedPage(*this);
++    configuration->setOpenerPageForInspector(*this);
+ 
+     if (RefPtr openerFrame = WebFrameProxy::webFrame(originatingFrameInfoData.frameID); navigationActionData.hasOpener && openerFrame) {
+         configuration->setOpenerInfo({ {
+@@ -8644,6 +8859,7 @@ void WebPageProxy::createNewPage(IPC::Connection& connection, WindowFeatures&& w
  void WebPageProxy::showPage()
  {
      m_uiClient->showPage(this);
@@ -17203,7 +16100,7 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
  }
  
  bool WebPageProxy::hasOpenedPage() const
-@@ -7621,6 +7798,10 @@ void WebPageProxy::closePage()
+@@ -8775,6 +8991,10 @@ void WebPageProxy::closePage()
      if (isClosed())
          return;
  
@@ -17212,36 +16109,36 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +        m_activeContextMenu->hide();
 +#endif
      WEBPAGEPROXY_RELEASE_LOG(Process, "closePage:");
-     protectedPageClient()->clearAllEditCommands();
-     m_uiClient->close(this);
-@@ -7657,6 +7838,8 @@ void WebPageProxy::runJavaScriptAlert(FrameIdentifier frameID, FrameInfoData&& f
+     if (RefPtr pageClient = this->pageClient())
+         pageClient->clearAllEditCommands();
+@@ -8813,6 +9033,8 @@ void WebPageProxy::runJavaScriptAlert(IPC::Connection& connection, FrameIdentifi
      }
  
-     runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&& completion) mutable {
+     runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
 +        if (page.m_inspectorDialogAgent)
 +            page.m_inspectorDialogAgent->javascriptDialogOpening("alert"_s, message);
-         page.m_uiClient->runJavaScriptAlert(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable {
+         page.m_uiClient->runJavaScriptAlert(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)]() mutable {
              reply();
              completion();
-@@ -7678,6 +7861,8 @@ void WebPageProxy::runJavaScriptConfirm(FrameIdentifier frameID, FrameInfoData&&
-         if (RefPtr automationSession = process().processPool().automationSession())
-             automationSession->willShowJavaScriptDialog(*this);
+@@ -8835,6 +9057,8 @@ void WebPageProxy::runJavaScriptConfirm(IPC::Connection& connection, FrameIdenti
+         if (RefPtr automationSession = configuration().processPool().automationSession())
+             automationSession->willShowJavaScriptDialog(*this, message, std::nullopt);
      }
 +    if (m_inspectorDialogAgent)
 +        m_inspectorDialogAgent->javascriptDialogOpening("confirm"_s, message);
  
-     runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&& completion) mutable {
-         page.m_uiClient->runJavaScriptConfirm(page, message, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable {
-@@ -7701,6 +7886,8 @@ void WebPageProxy::runJavaScriptPrompt(FrameIdentifier frameID, FrameInfoData&&
-         if (RefPtr automationSession = process().processPool().automationSession())
-             automationSession->willShowJavaScriptDialog(*this);
+     runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
+         page.m_uiClient->runJavaScriptConfirm(page, WTFMove(message), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](bool result) mutable {
+@@ -8859,6 +9083,8 @@ void WebPageProxy::runJavaScriptPrompt(IPC::Connection& connection, FrameIdentif
+         if (RefPtr automationSession = configuration().processPool().automationSession())
+             automationSession->willShowJavaScriptDialog(*this, message, defaultValue);
      }
 +    if (m_inspectorDialogAgent)
 +        m_inspectorDialogAgent->javascriptDialogOpening("prompt"_s, message, defaultValue);
  
-     runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), message, [reply = WTFMove(reply), defaultValue](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, const String& message, CompletionHandler<void()>&& completion) mutable {
-         page.m_uiClient->runJavaScriptPrompt(page, message, defaultValue, frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable {
-@@ -7817,6 +8004,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(FrameIdentifier frameID, FrameInf
+     runModalJavaScriptDialog(WTFMove(frame), WTFMove(frameInfo), WTFMove(message), [reply = WTFMove(reply), defaultValue= WTFMove(defaultValue)](WebPageProxy& page, WebFrameProxy* frame, FrameInfoData&& frameInfo, String&& message, CompletionHandler<void()>&& completion) mutable {
+         page.m_uiClient->runJavaScriptPrompt(page, WTFMove(message), WTFMove(defaultValue), frame, WTFMove(frameInfo), [reply = WTFMove(reply), completion = WTFMove(completion)](auto& result) mutable {
+@@ -9000,6 +9226,8 @@ void WebPageProxy::runBeforeUnloadConfirmPanel(IPC::Connection& connection, Fram
              return;
          }
      }
@@ -17249,8 +16146,8 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +        m_inspectorDialogAgent->javascriptDialogOpening("beforeunload"_s, message);
  
      // Since runBeforeUnloadConfirmPanel() can spin a nested run loop we need to turn off the responsiveness timer and the tryClose timer.
-     protectedProcess()->stopResponsivenessTimer();
-@@ -8307,6 +8496,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
+     webProcess->stopResponsivenessTimer();
+@@ -9626,6 +9854,11 @@ void WebPageProxy::resourceLoadDidCompleteWithError(ResourceLoadInfo&& loadInfo,
  }
  
  #if ENABLE(FULLSCREEN_API)
@@ -17262,26 +16159,26 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
  WebFullScreenManagerProxy* WebPageProxy::fullScreenManager()
  {
      return m_fullScreenManager.get();
-@@ -8383,6 +8577,17 @@ void WebPageProxy::requestDOMPasteAccess(WebCore::DOMPasteAccessCategory pasteAc
- {
-     MESSAGE_CHECK_COMPLETION(m_process, !originIdentifier.isEmpty(), completionHandler(DOMPasteAccessResponse::DeniedForGesture));
+@@ -9753,6 +9986,17 @@ void WebPageProxy::requestDOMPasteAccess(IPC::Connection& connection, DOMPasteAc
+         }
+     }
  
 +    if (isControlledByAutomation()) {
 +        DOMPasteAccessResponse response = DOMPasteAccessResponse::DeniedForGesture;
 +        if (permissionForAutomation(originIdentifier, "clipboard-read"_s).value_or(false)) {
 +            response = DOMPasteAccessResponse::GrantedForGesture;
 +            // Grant access to general pasteboard.
-+            willPerformPasteCommand(DOMPasteAccessCategory::General);
++            willPerformPasteCommand(DOMPasteAccessCategory::General, [] () { }, frameID);
 +        }
 +        completionHandler(response);
 +        return;
 +    }
 +
-     m_pageClient->requestDOMPasteAccess(pasteAccessCategory, elementRect, originIdentifier, WTFMove(completionHandler));
+     protectedPageClient()->requestDOMPasteAccess(pasteAccessCategory, requiresInteraction, elementRect, originIdentifier, WTFMove(completionHandler));
  }
  
-@@ -9232,6 +9437,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
-         if (RefPtr automationSession = process().processPool().automationSession())
+@@ -10795,6 +11039,8 @@ void WebPageProxy::mouseEventHandlingCompleted(std::optional<WebEventType> event
+         if (RefPtr automationSession = configuration().processPool().automationSession())
              automationSession->mouseEventsFlushedForPage(*this);
          didFinishProcessingAllPendingMouseEvents();
 +        if (m_dragEventsQueued == 0)
@@ -17289,17 +16186,17 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
      }
  }
  
-@@ -9266,6 +9473,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
+@@ -10830,6 +11076,7 @@ void WebPageProxy::keyEventHandlingCompleted(std::optional<WebEventType> eventTy
      if (!canProcessMoreKeyEvents) {
-         if (RefPtr automationSession = process().processPool().automationSession())
+         if (RefPtr automationSession = configuration().processPool().automationSession())
              automationSession->keyboardEventsFlushedForPage(*this);
 +        m_inspectorController->didProcessAllPendingKeyboardEvents();
      }
  }
  
-@@ -9671,7 +9879,10 @@ void WebPageProxy::dispatchProcessDidTerminate(ProcessTerminationReason reason)
- {
-     WEBPAGEPROXY_RELEASE_LOG_ERROR(Loading, "dispatchProcessDidTerminate: reason=%" PUBLIC_LOG_STRING, processTerminationReasonToString(reason).characters());
+@@ -11262,7 +11509,10 @@ void WebPageProxy::dispatchProcessDidTerminate(WebProcessProxy& process, Process
+     if (protectedPreferences()->siteIsolationEnabled())
+         protectedBrowsingContextGroup()->processDidTerminate(*this, process);
  
 -    bool handledByClient = false;
 +    bool handledByClient = m_inspectorController->pageCrashed(reason);
@@ -17309,26 +16206,18 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
      if (m_loaderClient)
          handledByClient = reason != ProcessTerminationReason::RequestedByClient && m_loaderClient->processDidCrash(*this);
      else
-@@ -10041,6 +10252,7 @@ bool WebPageProxy::useGPUProcessForDOMRenderingEnabled() const
- 
- WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, std::optional<SubframeProcessPageParameters>&& subframeProcessPageParameters, bool isProcessSwap, RefPtr<API::WebsitePolicies>&& websitePolicies, std::optional<WebCore::FrameIdentifier>&& mainFrameIdentifier, std::optional<float> topContentInset)
- {
-+
-     WebPageCreationParameters parameters;
- 
-     parameters.processDisplayName = configuration().processDisplayName();
-@@ -10267,6 +10479,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
+@@ -11913,6 +12163,8 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
+     parameters.canUseCredentialStorage = m_canUseCredentialStorage;
  
-     parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
- 
-+    parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseLoading();
+     parameters.httpsUpgradeEnabled = preferences->upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
 +
- #if PLATFORM(IOS) || PLATFORM(VISION)
-     // FIXME: This is also being passed over the to WebProcess via the PreferencesStore.
-     parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload();
-@@ -10373,8 +10587,42 @@ void WebPageProxy::gamepadActivity(const Vector<std::optional<GamepadData>>& gam
++    parameters.shouldPauseInInspectorWhenShown = m_inspectorController->shouldPauseInInspectorWhenShown();
+     
+ #if ENABLE(APP_HIGHLIGHTS)
+     parameters.appHighlightsVisible = appHighlightsVisibility() ? HighlightVisibility::Visible : HighlightVisibility::Hidden;
+@@ -12081,8 +12333,47 @@ void WebPageProxy::allowGamepadAccess()
  
- #endif
+ #endif // ENABLE(GAMEPAD)
  
 +bool WebPageProxy::shouldSendAutomationCredentialsForProtectionSpace(const WebProtectionSpace& protectionSpace)
 +{
@@ -17357,6 +16246,11 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
 +
  void WebPageProxy::didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&& authenticationChallenge, NegotiatedLegacyTLS negotiatedLegacyTLS)
  {
++    if (authenticationChallenge->core().protectionSpace().authenticationScheme() == WebCore::ProtectionSpaceBaseAuthenticationScheme::ServerTrustEvaluationRequested && websiteDataStore().ignoreTLSErrors()) {
++        authenticationChallenge->listener().completeChallenge(AuthenticationChallengeDisposition::UseCredential, WebCore::Credential("accept server trust"_s, ""_s, WebCore::CredentialPersistence::None));
++        return;
++    }
++
 +    if (m_credentialsForAutomation.has_value()) {
 +        if (m_credentialsForAutomation->isEmpty() || authenticationChallenge->core().previousFailureCount() ||
 +            !shouldSendAutomationCredentialsForProtectionSpace(*authenticationChallenge->protectionSpace())) {
@@ -17369,7 +16263,7 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
      if (negotiatedLegacyTLS == NegotiatedLegacyTLS::Yes) {
          m_navigationClient->shouldAllowLegacyTLS(*this, authenticationChallenge.get(), [this, protectedThis = Ref { *this }, authenticationChallenge] (bool shouldAllowLegacyTLS) {
              if (shouldAllowLegacyTLS)
-@@ -10469,6 +10717,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(GeolocationIdentifier ge
+@@ -12178,6 +12469,12 @@ void WebPageProxy::requestGeolocationPermissionForFrame(IPC::Connection& connect
              request->deny();
      };
  
@@ -17382,7 +16276,7 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
      // FIXME: Once iOS migrates to the new WKUIDelegate SPI, clean this up
      // and make it one UIClient call that calls the completionHandler with false
      // if there is no delegate instead of returning the completionHandler
-@@ -10531,6 +10785,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12244,6 +12541,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
              shouldChangeDeniedToPrompt = false;
  
          if (sessionID().isEphemeral()) {
@@ -17395,7 +16289,7 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
              completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
              return;
          }
-@@ -10545,6 +10805,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
+@@ -12258,6 +12561,12 @@ void WebPageProxy::queryPermission(const ClientOrigin& clientOrigin, const Permi
          return;
      }
  
@@ -17409,7 +16303,7 @@ index 365c5e2c7925347531f2e488d720973612f25d39..585c51dd017a628f08d443c863fd1453
          completionHandler(shouldChangeDeniedToPrompt ? PermissionState::Prompt : PermissionState::Denied);
          return;
 diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
-index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8f0aa3a6c 100644
+index c220a17ba9d98b37e16bea6ef2c37ffd4599c906..d5e57548822361620b9a18c283e5e5e6821de584 100644
 --- a/Source/WebKit/UIProcess/WebPageProxy.h
 +++ b/Source/WebKit/UIProcess/WebPageProxy.h
 @@ -26,6 +26,7 @@
@@ -17418,9 +16312,9 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
  #include "APIObject.h"
 +#include "APIWebsitePolicies.h"
  #include "MessageReceiver.h"
- #include "MessageSender.h"
- #include <WebCore/FrameIdentifier.h>
-@@ -36,6 +37,24 @@
+ #include <WebCore/BoxExtents.h>
+ #include <WebCore/CryptoKeyData.h>
+@@ -46,6 +47,20 @@
  #include <wtf/ProcessID.h>
  #include <wtf/UniqueRef.h>
  #include <wtf/WeakHashSet.h>
@@ -17435,33 +16329,21 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
 +
 +OBJC_CLASS NSPasteboard;
 +
-+#if PLATFORM(WPE)
-+#include "ArgumentCodersWPE.h"
-+#endif
-+
 +#if PLATFORM(GTK) || PLATFORM(WPE)
 +#include <WebCore/SelectionData.h>
 +#endif
  
  #if USE(DICTATION_ALTERNATIVES)
  #include <WebCore/PlatformTextAlternatives.h>
-@@ -106,6 +125,7 @@ class DestinationColorSpace;
- class DragData;
+@@ -130,6 +145,7 @@ class DragData;
+ class Exception;
  class FloatPoint;
  class FloatQuad;
-+typedef HashMap<unsigned, Vector<String>> DragDataMap;
++typedef UncheckedKeyHashMap<unsigned, Vector<String>> DragDataMap;
  class FloatRect;
  class FloatSize;
  class FontAttributeChanges;
-@@ -421,6 +441,7 @@ class WebExtensionController;
- class WebFramePolicyListenerProxy;
- class WebFrameProxy;
- class WebFullScreenManagerProxy;
-+class WebFullScreenManagerProxyClient;
- class WebInspectorUIProxy;
- class WebKeyboardEvent;
- class WebMouseEvent;
-@@ -649,6 +670,8 @@ public:
+@@ -735,6 +751,8 @@ public:
      void setControlledByAutomation(bool);
  
      WebPageInspectorController& inspectorController() { return *m_inspectorController; }
@@ -17470,59 +16352,53 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
  
  #if PLATFORM(IOS_FAMILY)
      void showInspectorIndication();
-@@ -682,6 +705,7 @@ public:
+@@ -768,6 +786,7 @@ public:
      bool hasSleepDisabler() const;
  
  #if ENABLE(FULLSCREEN_API)
 +    void setFullScreenManagerClientOverride(std::unique_ptr<WebFullScreenManagerProxyClient>&&);
      WebFullScreenManagerProxy* fullScreenManager();
+     RefPtr<WebFullScreenManagerProxy> protectedFullScreenManager();
+     void setFullScreenClientForTesting(std::unique_ptr<WebKit::WebFullScreenManagerProxyClient>&&);
+@@ -859,6 +878,12 @@ public:
  
-     API::FullscreenClient& fullscreenClient() const { return *m_fullscreenClient; }
-@@ -770,6 +794,11 @@ public:
- 
-     void setPageLoadStateObserver(std::unique_ptr<PageLoadStateObserverBase>&&);
+     void setPageLoadStateObserver(RefPtr<PageLoadStateObserverBase>&&);
  
 +    void setAuthCredentialsForAutomation(std::optional<WebCore::Credential>&&, std::optional<URL>&&);
-+    void setPermissionsForAutomation(const HashMap<String, HashSet<String>>&);
++    void setPermissionsForAutomation(const UncheckedKeyHashMap<String, HashSet<String>>&);
++    void setOrientationOverride(std::optional<int>&& angle);
 +    void setActiveForAutomation(std::optional<bool> active);
 +    void logToStderr(const String& str);
 +
-     void initializeWebPage();
-     void setDrawingArea(std::unique_ptr<DrawingAreaProxy>&&);
+     void initializeWebPage(const WebCore::Site&, WebCore::SandboxFlags);
+     void setDrawingArea(RefPtr<DrawingAreaProxy>&&);
+ 
+@@ -890,6 +915,8 @@ public:
+     RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback);
+     RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, WebCore::IsPerformingHTTPFallback, std::unique_ptr<NavigationActionData>&&, API::Object* userData = nullptr);
  
-@@ -796,6 +825,7 @@ public:
-     void addPlatformLoadParameters(WebProcessProxy&, LoadParameters&);
-     RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&);
-     RefPtr<API::Navigation> loadRequest(WebCore::ResourceRequest&&, WebCore::ShouldOpenExternalURLsPolicy, API::Object* userData = nullptr);
 +    RefPtr<API::Navigation> loadRequestForInspector(WebCore::ResourceRequest&&, WebFrameProxy*);
++
      RefPtr<API::Navigation> loadFile(const String& fileURL, const String& resourceDirectoryURL, bool isAppInitiated = true, API::Object* userData = nullptr);
-     RefPtr<API::Navigation> loadData(std::span<const uint8_t>, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
-     RefPtr<API::Navigation> loadData(std::span<const uint8_t>, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, WebCore::ShouldOpenExternalURLsPolicy);
-@@ -862,6 +892,7 @@ public:
+     RefPtr<API::Navigation> loadData(Ref<WebCore::SharedBuffer>&&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
+     RefPtr<API::Navigation> loadData(Ref<WebCore::SharedBuffer>&&, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData, WebCore::ShouldOpenExternalURLsPolicy);
+@@ -978,6 +1005,7 @@ public:
  
-     PageClient& pageClient() const;
-     Ref<PageClient> protectedPageClient() const;
+     PageClient* pageClient() const;
+     RefPtr<PageClient> protectedPageClient() const;
 +    bool hasPageClient() const { return !!m_pageClient; }
  
      void setViewNeedsDisplay(const WebCore::Region&);
      void requestScroll(const WebCore::FloatPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, WebCore::ScrollIsAnimated);
-@@ -1389,6 +1420,7 @@ public:
- #endif
- 
-     void pageScaleFactorDidChange(double);
-+    void viewScaleFactorDidChange(double);
-     void pluginScaleFactorDidChange(double);
-     void pluginZoomFactorDidChange(double);
- 
-@@ -1473,14 +1505,20 @@ public:
+@@ -1620,17 +1648,23 @@ public:
      void didStartDrag();
      void dragCancelled();
      void setDragCaretRect(const WebCore::IntRect&);
 +    void setInterceptDrags(bool shouldIntercept);
 +    bool cancelDragIfNeeded();
  #if PLATFORM(COCOA)
-     void startDrag(const WebCore::DragItem&, WebCore::ShareableBitmapHandle&& dragImageHandle);
-     void setPromisedDataForImage(const String& pasteboardName, WebCore::SharedMemoryHandle&& imageHandle, const String& filename, const String& extension,
+     void startDrag(const WebCore::DragItem&, WebCore::ShareableBitmapHandle&& dragImageHandle, const std::optional<WebCore::ElementIdentifier>&);
+     void setPromisedDataForImage(IPC::Connection&, const String& pasteboardName, WebCore::SharedMemoryHandle&& imageHandle, const String& filename, const String& extension,
          const String& title, const String& url, const String& visibleURL, WebCore::SharedMemoryHandle&& archiveHandle, const String& originIdentifier);
 +    void releaseInspectorDragPasteboard();
  #endif
@@ -17530,13 +16406,16 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
 +#if PLATFORM(GTK) || PLATFORM(WPE)
      void startDrag(WebCore::SelectionData&&, OptionSet<WebCore::DragOperation>, std::optional<WebCore::ShareableBitmapHandle>&& dragImage, WebCore::IntPoint&& dragImageHotspot);
  #endif
+ #if ENABLE(MODEL_PROCESS)
+     void modelDragEnded(const WebCore::ElementIdentifier);
+ #endif
 +#if PLATFORM(WIN)
 +    void startDrag(WebCore::DragDataMap&& dragDataMap);
 +#endif
  #endif
  
      void processDidBecomeUnresponsive();
-@@ -1713,6 +1751,7 @@ public:
+@@ -1883,6 +1917,7 @@ public:
      void setViewportSizeForCSSViewportUnits(const WebCore::FloatSize&);
      WebCore::FloatSize viewportSizeForCSSViewportUnits() const;
  
@@ -17544,16 +16423,16 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
      void didReceiveAuthenticationChallengeProxy(Ref<AuthenticationChallengeProxy>&&, NegotiatedLegacyTLS);
      void negotiatedLegacyTLS();
      void didNegotiateModernTLS(const URL&);
-@@ -1747,6 +1786,8 @@ public:
- 
+@@ -1916,6 +1951,8 @@ public:
  #if PLATFORM(COCOA) || PLATFORM(GTK)
      RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&);
+     RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot);
 +#elif PLATFORM(WPE)
 +    RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) { return nullptr; }
  #endif
  
-     void wrapCryptoKey(const Vector<uint8_t>&, CompletionHandler<void(std::optional<Vector<uint8_t>>&&)>&&);
-@@ -2639,6 +2680,7 @@ private:
+     void serializeAndWrapCryptoKey(IPC::Connection&, WebCore::CryptoKeyData&&, CompletionHandler<void(std::optional<Vector<uint8_t>>&&)>&&);
+@@ -2931,6 +2968,7 @@ private:
      RefPtr<API::Navigation> launchProcessForReload();
  
      void requestNotificationPermission(const String& originString, CompletionHandler<void(bool allowed)>&&);
@@ -17561,18 +16440,18 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
  
      void didChangeContentSize(const WebCore::IntSize&);
      void didChangeIntrinsicContentSize(const WebCore::IntSize&);
-@@ -3145,8 +3187,10 @@ private:
-     String m_overrideContentSecurityPolicy;
+@@ -3450,8 +3488,10 @@ private:
+     String m_openedMainFrameName;
  
      RefPtr<WebInspectorUIProxy> m_inspector;
 +    InspectorDialogAgent* m_inspectorDialogAgent { nullptr };
  
  #if ENABLE(FULLSCREEN_API)
 +    std::unique_ptr<WebFullScreenManagerProxyClient> m_fullScreenManagerClientOverride;
-     std::unique_ptr<WebFullScreenManagerProxy> m_fullScreenManager;
+     RefPtr<WebFullScreenManagerProxy> m_fullScreenManager;
      std::unique_ptr<API::FullscreenClient> m_fullscreenClient;
  #endif
-@@ -3336,6 +3380,22 @@ private:
+@@ -3650,6 +3690,22 @@ private:
      std::optional<WebCore::DragOperation> m_currentDragOperation;
      bool m_currentDragIsOverFileInput { false };
      unsigned m_currentDragNumberOfFilesToBeAccepted { 0 };
@@ -17595,39 +16474,31 @@ index 2e40bbb43a05c10eee30296c5a7febdcdb74c157..4deb131a7c531d9035833f22062cf9e8
  #endif
  
      bool m_mainFrameHasHorizontalScrollbar { false };
-@@ -3507,6 +3567,10 @@ private:
+@@ -3821,6 +3877,10 @@ private:
          RefPtr<API::Object> messageBody;
      };
      Vector<InjectedBundleMessage> m_pendingInjectedBundleMessages;
 +    std::optional<WebCore::Credential> m_credentialsForAutomation;
 +    std::optional<URL> m_authOriginForAutomation;
-+    HashMap<String, HashSet<String>> m_permissionsForAutomation;
++    UncheckedKeyHashMap<String, HashSet<String>> m_permissionsForAutomation;
 +    std::optional<bool> m_activeForAutomation;
          
  #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION)
-     std::unique_ptr<WebDeviceOrientationUpdateProviderProxy> m_webDeviceOrientationUpdateProviderProxy;
+     RefPtr<WebDeviceOrientationUpdateProviderProxy> m_webDeviceOrientationUpdateProviderProxy;
 diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in
-index 3907e52e0136c24b8cdc24cb6e178b201e3e482a..03ef59a3032b12f91dcdd4a1160c7c8ef12cc0e3 100644
+index acdb79859685a55f3cda48014621340177f30e3d..36aca25956f9b073eefa5a68a013cde6017df39a 100644
 --- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
 +++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
-@@ -29,6 +29,7 @@ messages -> WebPageProxy {
+@@ -35,6 +35,7 @@ messages -> WebPageProxy {
      RunJavaScriptConfirm(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, String message) -> (bool result) Synchronous
      RunJavaScriptPrompt(WebCore::FrameIdentifier frameID, struct WebKit::FrameInfoData frameInfo, String message, String defaultValue) -> (String result) Synchronous
      MouseDidMoveOverElement(struct WebKit::WebHitTestResultData hitTestResultData, OptionSet<WebKit::WebEventModifier> modifiers, WebKit::UserData userData)
 +    LogToStderr(String text)
  
-     DidChangeViewportProperties(struct WebCore::ViewportAttributes attributes)
-     DidReceiveEvent(enum:uint8_t WebKit::WebEventType eventType, bool handled)
-@@ -182,6 +183,7 @@ messages -> WebPageProxy {
- #endif
- 
-     PageScaleFactorDidChange(double scaleFactor)
-+    ViewScaleFactorDidChange(double scaleFactor)
-     PluginScaleFactorDidChange(double zoomFactor)
-     PluginZoomFactorDidChange(double zoomFactor)
- 
-@@ -309,10 +311,14 @@ messages -> WebPageProxy {
-     StartDrag(struct WebCore::DragItem dragItem, WebCore::ShareableBitmapHandle dragImage)
+     DidReceiveEventIPC(enum:uint8_t WebKit::WebEventType eventType, bool handled, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
+     SetCursor(WebCore::Cursor cursor)
+@@ -333,10 +334,14 @@ messages -> WebPageProxy {
+     StartDrag(struct WebCore::DragItem dragItem, WebCore::ShareableBitmapHandle dragImage, std::optional<WebCore::ElementIdentifier> elementID)
      SetPromisedDataForImage(String pasteboardName, WebCore::SharedMemory::Handle imageHandle, String filename, String extension, String title, String url, String visibleURL, WebCore::SharedMemory::Handle archiveHandle, String originIdentifier)
  #endif
 -#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
@@ -17636,17 +16507,17 @@ index 3907e52e0136c24b8cdc24cb6e178b201e3e482a..03ef59a3032b12f91dcdd4a1160c7c8e
  #endif
  
 +#if PLATFORM(WIN) && ENABLE(DRAG_SUPPORT)
-+    StartDrag(HashMap<unsigned, Vector<String>> dragDataMap)
++    StartDrag(UncheckedKeyHashMap<unsigned, Vector<String>> dragDataMap)
 +#endif
 +
  #if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
-     DidHandleDragStartRequest(bool started)
-     DidHandleAdditionalDragItemsRequest(bool added)
+     WillReceiveEditDragSnapshot()
+     DidReceiveEditDragSnapshot(struct std::optional<WebCore::TextIndicatorData> textIndicator)
 diff --git a/Source/WebKit/UIProcess/WebProcessCache.cpp b/Source/WebKit/UIProcess/WebProcessCache.cpp
-index c909cd634d6acd72695de8372866691269ad6a04..ff5b37e3b4a17eab4bd3f8e9a2a6ef8460110052 100644
+index dc6f440403cccc5cd93f75806cffbf05cc56041c..e880beba2034cc2b87dcfb3e1e8bacf1bed78cf3 100644
 --- a/Source/WebKit/UIProcess/WebProcessCache.cpp
 +++ b/Source/WebKit/UIProcess/WebProcessCache.cpp
-@@ -88,6 +88,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
+@@ -100,6 +100,10 @@ bool WebProcessCache::canCacheProcess(WebProcessProxy& process) const
          return false;
      }
  
@@ -17658,10 +16529,10 @@ index c909cd634d6acd72695de8372866691269ad6a04..ff5b37e3b4a17eab4bd3f8e9a2a6ef84
  }
  
 diff --git a/Source/WebKit/UIProcess/WebProcessPool.cpp b/Source/WebKit/UIProcess/WebProcessPool.cpp
-index f997e69f867ecaa6ec60a94a21ac89d51de413a4..78008ea36f1d08948c671fdfeeef08b30c7fc7fa 100644
+index 794f1e40dea081e818326f1d4123ebdf33569f86..35b0c4cdda0257c4844d4390d5901e71809c23f8 100644
 --- a/Source/WebKit/UIProcess/WebProcessPool.cpp
 +++ b/Source/WebKit/UIProcess/WebProcessPool.cpp
-@@ -430,10 +430,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
+@@ -447,10 +447,10 @@ void WebProcessPool::setAutomationClient(std::unique_ptr<API::AutomationClient>&
  
  void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
  {
@@ -17674,7 +16545,7 @@ index f997e69f867ecaa6ec60a94a21ac89d51de413a4..78008ea36f1d08948c671fdfeeef08b3
  
  #if ENABLE(GPU_PROCESS)
      if (RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated())
-@@ -441,9 +441,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
+@@ -458,9 +458,10 @@ void WebProcessPool::setOverrideLanguages(Vector<String>&& languages)
  #endif
  #if USE(SOUP)
      for (Ref networkProcess : NetworkProcessProxy::allNetworkProcesses())
@@ -17686,7 +16557,7 @@ index f997e69f867ecaa6ec60a94a21ac89d51de413a4..78008ea36f1d08948c671fdfeeef08b3
  
  void WebProcessPool::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled)
  {
-@@ -936,7 +937,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
+@@ -945,7 +946,7 @@ void WebProcessPool::initializeNewWebProcess(WebProcessProxy& process, WebsiteDa
  #endif
  
      parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
@@ -17696,10 +16567,10 @@ index f997e69f867ecaa6ec60a94a21ac89d51de413a4..78008ea36f1d08948c671fdfeeef08b3
  
      parameters.urlSchemesRegisteredAsEmptyDocument = copyToVector(m_schemesToRegisterAsEmptyDocument);
 diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-index b8305771145ecb6b92e28de1bcb370dc8ccbba0d..d3b591bc81ccd07367223270c545056fbdb51f49 100644
+index f1074d1138c9e6f2a76c1ce76807c775b16c657c..b7386197a24a689a5b0cae6772abefb17819dbe9 100644
 --- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
 +++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
-@@ -188,6 +188,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
+@@ -208,6 +208,11 @@ Vector<Ref<WebProcessProxy>> WebProcessProxy::allProcesses()
      });
  }
  
@@ -17711,8 +16582,8 @@ index b8305771145ecb6b92e28de1bcb370dc8ccbba0d..d3b591bc81ccd07367223270c545056f
  RefPtr<WebProcessProxy> WebProcessProxy::processForIdentifier(ProcessIdentifier identifier)
  {
      return allProcessMap().get(identifier);
-@@ -555,6 +560,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
-     if (WebKit::isInspectorProcessPool(processPool()))
+@@ -577,6 +582,26 @@ void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOpt
+     if (WebKit::isInspectorProcessPool(protectedProcessPool()))
          launchOptions.extraInitializationData.add<HashTranslatorASCIILiteral>("inspector-process"_s, "1"_s);
  
 +    /* playwright revert fb205fb, 50f8fee */
@@ -17739,32 +16610,38 @@ index b8305771145ecb6b92e28de1bcb370dc8ccbba0d..d3b591bc81ccd07367223270c545056f
  
      if (isPrewarmed())
 diff --git a/Source/WebKit/UIProcess/WebProcessProxy.h b/Source/WebKit/UIProcess/WebProcessProxy.h
-index 92ebcbaf5abecd997e8bfd3cb5cb41b02191b7c5..bec4da91324e832f1dd027ad9e064a3336b3e047 100644
+index 4471fdf4a46180f78cea1cf035671bfe3c83b8e2..0858fe7f56eb3d8648467f5b82c2d77d6c958b77 100644
 --- a/Source/WebKit/UIProcess/WebProcessProxy.h
 +++ b/Source/WebKit/UIProcess/WebProcessProxy.h
-@@ -166,6 +166,7 @@ public:
+@@ -185,6 +185,7 @@ public:
  
-     static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, const Function<void(WebPageProxy&)>&);
+     static void forWebPagesWithOrigin(PAL::SessionID, const WebCore::SecurityOriginData&, NOESCAPE const Function<void(WebPageProxy&)>&);
      static Vector<std::pair<WebCore::ProcessIdentifier, WebCore::RegistrableDomain>> allowedFirstPartiesForCookies();
 +    static Vector<Ref<WebProcessProxy>> allProcessesForInspector();
  
-     WebConnection* webConnection() const { return m_webConnection.get(); }
-     RefPtr<WebConnection> protectedWebConnection() const { return m_webConnection; }
+     void initializeWebProcess(WebProcessCreationParameters&&);
+ 
 diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-index 9729698017cabce150921532f0dd40e10634f0ce..9bb75eda6f3e5e0633d6ef55b3980f8ce35b2f2f 100644
+index c13d50e1828843714be1f49d2b1d5ea45e9c85aa..d7c76f184e77f1d828cde263ddf01f262c6c8f3a 100644
 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
 +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
-@@ -305,7 +305,8 @@ SOAuthorizationCoordinator& WebsiteDataStore::soAuthorizationCoordinator(const W
+@@ -2061,6 +2061,15 @@ void WebsiteDataStore::setCacheModelSynchronouslyForTesting(CacheModel cacheMode
+         processPool->setCacheModelSynchronouslyForTesting(cacheModel);
+ }
  
- static Ref<NetworkProcessProxy> networkProcessForSession(PAL::SessionID sessionID)
++// Playwright begin
++#if !USE(SOUP)
++void WebsiteDataStore::setIgnoreTLSErrors(bool ignoreTLSErrors)
++{
++    m_ignoreTLSErrors = ignoreTLSErrors;
++}
++#endif
++// Playwright begin
++
+ Vector<WebsiteDataStoreParameters> WebsiteDataStore::parametersFromEachWebsiteDataStore()
  {
--#if ((PLATFORM(GTK) || PLATFORM(WPE)) && !ENABLE(2022_GLIB_API))
-+// Playwright wants to isolate per BrowserContext.
-+#if ((PLATFORM(GTK) || PLATFORM(WPE)))
-     if (sessionID.isEphemeral()) {
-         // Reuse a previous persistent session network process for ephemeral sessions.
-         for (auto& dataStore : allDataStores().values()) {
-@@ -2278,6 +2279,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
+     return WTF::map(allDataStores(), [](auto& entry) {
+@@ -2509,6 +2518,12 @@ void WebsiteDataStore::originDirectoryForTesting(WebCore::ClientOrigin&& origin,
      protectedNetworkProcess()->websiteDataOriginDirectoryForTesting(m_sessionID, WTFMove(origin), type, WTFMove(completionHandler));
  }
  
@@ -17778,10 +16655,10 @@ index 9729698017cabce150921532f0dd40e10634f0ce..9bb75eda6f3e5e0633d6ef55b3980f8c
  void WebsiteDataStore::hasAppBoundSession(CompletionHandler<void(bool)>&& completionHandler) const
  {
 diff --git a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
-index 165885137ca032390c6b55baacc30a8c4c423eb5..930ceeca56587636993f9a0c0e0a21d0ebab3835 100644
+index f1a113cc08f6543ab22be75a03823f49a3f52017..ef6dc1b450e2f4b0bcd374135a4cbc3d626a89d9 100644
 --- a/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
 +++ b/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
-@@ -97,6 +97,7 @@ class DeviceIdHashSaltStorage;
+@@ -98,6 +98,7 @@ class DeviceIdHashSaltStorage;
  class DownloadProxy;
  class NetworkProcessProxy;
  class SOAuthorizationCoordinator;
@@ -17789,7 +16666,7 @@ index 165885137ca032390c6b55baacc30a8c4c423eb5..930ceeca56587636993f9a0c0e0a21d0
  class VirtualAuthenticatorManager;
  class WebPageProxy;
  class WebProcessPool;
-@@ -112,12 +113,21 @@ enum class UnifiedOriginStorageLevel : uint8_t;
+@@ -113,6 +114,7 @@ enum class UnifiedOriginStorageLevel : uint8_t;
  enum class WebsiteDataFetchOption : uint8_t;
  enum class WebsiteDataType : uint32_t;
  
@@ -17797,8 +16674,9 @@ index 165885137ca032390c6b55baacc30a8c4c423eb5..930ceeca56587636993f9a0c0e0a21d0
  struct ITPThirdPartyData;
  struct NetworkProcessConnectionInfo;
  struct WebPushMessage;
- struct WebsiteDataRecord;
- struct WebsiteDataStoreParameters;
+@@ -122,6 +124,14 @@ struct WebsiteDataStoreParameters;
+ enum RemoveDataTaskCounterType { };
+ using RemoveDataTaskCounter = RefCounter<RemoveDataTaskCounterType>;
  
 +class DownloadInstrumentation {
 +public:
@@ -17811,22 +16689,18 @@ index 165885137ca032390c6b55baacc30a8c4c423eb5..930ceeca56587636993f9a0c0e0a21d0
  class WebsiteDataStore : public API::ObjectImpl<API::Object::Type::WebsiteDataStore>, public CanMakeWeakPtr<WebsiteDataStore> {
  public:
      static Ref<WebsiteDataStore> defaultDataStore();
-@@ -305,11 +315,13 @@ public:
-     const WebCore::CurlProxySettings& networkProxySettings() const { return m_proxySettings; }
- #endif
- 
--#if USE(SOUP)
-+#if USE(SOUP) || PLATFORM(COCOA) || PLATFORM(WIN)
+@@ -321,8 +331,10 @@ public:
+ #if USE(SOUP)
      void setPersistentCredentialStorageEnabled(bool);
      bool persistentCredentialStorageEnabled() const { return m_persistentCredentialStorageEnabled && isPersistent(); }
++#endif
      void setIgnoreTLSErrors(bool);
      bool ignoreTLSErrors() const { return m_ignoreTLSErrors; }
-+#endif
 +#if USE(SOUP)
      void setNetworkProxySettings(WebCore::SoupNetworkProxySettings&&);
      const WebCore::SoupNetworkProxySettings& networkProxySettings() const { return m_networkProxySettings; }
      void setCookiePersistentStorage(const String&, SoupCookiePersistentStorageType);
-@@ -394,6 +406,12 @@ public:
+@@ -420,6 +432,12 @@ public:
      static const String& defaultBaseDataDirectory();
  #endif
  
@@ -17839,20 +16713,18 @@ index 165885137ca032390c6b55baacc30a8c4c423eb5..930ceeca56587636993f9a0c0e0a21d0
      void resetQuota(CompletionHandler<void()>&&);
      void resetStoragePersistedState(CompletionHandler<void()>&&);
  #if PLATFORM(IOS_FAMILY)
-@@ -564,9 +582,11 @@ private:
-     WebCore::CurlProxySettings m_proxySettings;
- #endif
+@@ -618,7 +636,9 @@ private:
  
--#if USE(SOUP)
-+#if USE(SOUP) || PLATFORM(COCOA) || PLATFORM(WIN)
+ #if USE(SOUP)
      bool m_persistentCredentialStorageEnabled { true };
-     bool m_ignoreTLSErrors { true };
+-    bool m_ignoreTLSErrors { true };
 +#endif
++    bool m_ignoreTLSErrors { false };
 +#if USE(SOUP)
      WebCore::SoupNetworkProxySettings m_networkProxySettings;
      String m_cookiePersistentStoragePath;
      SoupCookiePersistentStorageType m_cookiePersistentStorageType { SoupCookiePersistentStorageType::SQLite };
-@@ -593,6 +613,10 @@ private:
+@@ -645,6 +665,10 @@ private:
      RefPtr<API::HTTPCookieStore> m_cookieStore;
      RefPtr<NetworkProcessProxy> m_networkProcess;
  
@@ -17864,10 +16736,10 @@ index 165885137ca032390c6b55baacc30a8c4c423eb5..930ceeca56587636993f9a0c0e0a21d0
      std::unique_ptr<SOAuthorizationCoordinator> m_soAuthorizationCoordinator;
  #endif
 diff --git a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
-index d02a8ad4cd66f7f277eee16d21e9ffb0e1a961db..ef35d46977b9b6a866b665e3a01eac94a648cc97 100644
+index 19934de3173ecc0507c5e59956bcf6730a8a88b4..bc0e52f6f28caeca8b9b7aab14b7ff991d7e6b41 100644
 --- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
 +++ b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.cpp
-@@ -101,6 +101,14 @@ void GeoclueGeolocationProvider::stop()
+@@ -114,6 +114,14 @@ void GeoclueGeolocationProvider::stop()
      }
  
      m_sourceType = LocationProviderSource::Unknown;
@@ -17882,7 +16754,7 @@ index d02a8ad4cd66f7f277eee16d21e9ffb0e1a961db..ef35d46977b9b6a866b665e3a01eac94
  }
  
  void GeoclueGeolocationProvider::setEnableHighAccuracy(bool enabled)
-@@ -373,6 +381,8 @@ void GeoclueGeolocationProvider::createGeoclueClient(const char* clientPath)
+@@ -386,6 +394,8 @@ void GeoclueGeolocationProvider::createGeoclueClient(const char* clientPath)
          return;
      }
  
@@ -17892,10 +16764,10 @@ index d02a8ad4cd66f7f277eee16d21e9ffb0e1a961db..ef35d46977b9b6a866b665e3a01eac94
          "org.freedesktop.GeoClue2", clientPath, "org.freedesktop.GeoClue2.Client", m_cancellable.get(),
          [](GObject*, GAsyncResult* result, gpointer userData) {
 diff --git a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h
-index 69610f8f7b81d914d74444d9c86b3b039251edb6..c234848afb5e523165bf827bac8008486d2f8e14 100644
+index 96bf77411e2e1f4c835f56b409dc179977d197ee..512af5ffce511711b502248e34e49e45e85dbc4e 100644
 --- a/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h
 +++ b/Source/WebKit/UIProcess/geoclue/GeoclueGeolocationProvider.h
-@@ -90,6 +90,9 @@ private:
+@@ -92,6 +92,9 @@ private:
          unsigned responseSignalId;
      } m_portal;
      GRefPtr<GCancellable> m_cancellable;
@@ -17907,10 +16779,10 @@ index 69610f8f7b81d914d74444d9c86b3b039251edb6..c234848afb5e523165bf827bac800848
      RunLoop::Timer m_destroyLaterTimer;
 diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..93de9be341045a616b0219a965af2447ecbfc926
+index 0000000000000000000000000000000000000000..5185677fc67a418fac7a09c69246f4406a74c706
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp
-@@ -0,0 +1,184 @@
+@@ -0,0 +1,192 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -17944,18 +16816,21 @@ index 0000000000000000000000000000000000000000..93de9be341045a616b0219a965af2447
 +#include "InspectorPlaywrightAgent.h"
 +#include "PageClient.h"
 +#include "ViewSnapshotStore.h"
++#include "WebAutomationSession.h"
 +#include "WebKitBrowserInspectorPrivate.h"
 +#include "WebKitWebContextPrivate.h"
 +#include "WebKitWebsiteDataManagerPrivate.h"
 +#include "WebKitWebViewPrivate.h"
 +#include "WebPageProxy.h"
-+#include <WebCore/ImageBufferUtilitiesCairo.h>
 +#include <wtf/HashMap.h>
 +#include <wtf/RefPtr.h>
 +#include <wtf/text/Base64.h>
 +#include <wtf/text/StringView.h>
 +#include <wtf/text/WTFString.h>
 +
++#if USE(SKIA)
++#include <WebCore/ImageBufferUtilitiesSkia.h>
++#endif
 +
 +namespace WebKit {
 +
@@ -18036,8 +16911,10 @@ index 0000000000000000000000000000000000000000..93de9be341045a616b0219a965af2447
 +#endif
 +    // WPE has PSON enabled by default and doesn't have such parameter.
 +#if PLATFORM(GTK)
++#if !ENABLE(2022_GLIB_API)
 +        "process-swap-on-cross-site-navigation-enabled", true,
 +#endif
++#endif
 +        nullptr)));
 +    if (!context) {
 +        error = "Failed to create GLib ephemeral context"_s;
@@ -18073,21 +16950,24 @@ index 0000000000000000000000000000000000000000..93de9be341045a616b0219a965af2447
 +void InspectorPlaywrightAgentClientGlib::takePageScreenshot(WebPageProxy& page, WebCore::IntRect&& clip, bool nominalResolution, CompletionHandler<void(const String&, const String&)>&& completionHandler)
 +{
 +    page.callAfterNextPresentationUpdate([protectedPage = Ref{ page }, clip = WTFMove(clip), nominalResolution, completionHandler = WTFMove(completionHandler)]() mutable {
-+        cairo_surface_t* surface = nullptr;
 +#if PLATFORM(GTK)
-+        RefPtr<ViewSnapshot> viewSnapshot = protectedPage->pageClient().takeViewSnapshot(WTFMove(clip), nominalResolution);
-+        if (viewSnapshot)
-+            surface = viewSnapshot->surface();
++        RefPtr<ViewSnapshot> viewSnapshot = protectedPage->pageClient()->takeViewSnapshot(WTFMove(clip), nominalResolution);
++        if (viewSnapshot) {
++            std::optional<String> data = WebAutomationSession::platformGetBase64EncodedPNGData(*viewSnapshot);
++            if (data) {
++                completionHandler(emptyString(), makeString("data:image/png;base64,"_s, *data));
++                return;
++            }
++        }
 +#elif PLATFORM(WPE)
-+        RefPtr<cairo_surface_t> protectPtr = protectedPage->pageClient().takeViewSnapshot(WTFMove(clip), nominalResolution);
-+        surface = protectPtr.get();
-+#endif
++        sk_sp<SkImage> protectPtr = protectedPage->pageClient()->takeViewSnapshot(WTFMove(clip), nominalResolution);
++        SkImage* surface = protectPtr.get();
 +        if (surface) {
 +            Vector<uint8_t> encodeData = WebCore::encodeData(surface, "image/png"_s, std::nullopt);
 +            completionHandler(emptyString(), makeString("data:image/png;base64,"_s, base64Encoded(encodeData)));
 +            return;
 +        }
-+
++#endif
 +        completionHandler("Failed to take screenshot"_s, emptyString());
 +    });
 +}
@@ -18097,7 +16977,7 @@ index 0000000000000000000000000000000000000000..93de9be341045a616b0219a965af2447
 +#endif // ENABLE(REMOTE_INSPECTOR)
 diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.h b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..394f07e1754be52b7d503d5720cba5d3724c5f4d
+index 0000000000000000000000000000000000000000..441442d899e4088f5c24ae9f70c3e4ffa1e6d340
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.h
 @@ -0,0 +1,61 @@
@@ -18155,26 +17035,39 @@ index 0000000000000000000000000000000000000000..394f07e1754be52b7d503d5720cba5d3
 +private:
 +    WebKitWebContext* findContext(WTF::String& error, PAL::SessionID);
 +
-+    HashMap<PAL::SessionID, GRefPtr<WebKitWebContext>> m_idToContext;
++    UncheckedKeyHashMap<PAL::SessionID, GRefPtr<WebKitWebContext>> m_idToContext;
 +    WebCore::SoupNetworkProxySettings m_proxySettings;
 +};
 +
 +} // namespace API
 +
 +#endif // ENABLE(REMOTE_INSPECTOR)
+diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+index 51ba8b585ca37a2eed54bce5218e1c92c2844cc6..dc04a2ca0b0ac2333036b897dd18d5303c5237c6 100644
+--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+@@ -124,6 +124,8 @@ static OptionSet<AvailableInputDevices> availableInputDevices()
+             return toAvailableInputDevices(gdk_seat_get_capabilities(seat));
+     }
+ #endif
++    if (!WebCore::screenHasTouchDeviceOverride() || !WebCore::screenHasTouchDeviceOverride().value())
++        return AvailableInputDevices::Mouse;
+ #if ENABLE(TOUCH_EVENTS)
+     return AvailableInputDevices::Touchscreen;
+ #else
 diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
-index b02c70d85fe1a93899640a8b909b0cf734d28b18..b1dc8e89eb265be81e083bf337109561e08cbf45 100644
+index 5529f52048b24290f424e877cd9dbfb890e02ffb..c2b76b6188dd9596c4a1f31c137daff7d7644c7f 100644
 --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
 +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStore.h
-@@ -29,6 +29,7 @@
- #include <wtf/Noncopyable.h>
+@@ -32,6 +32,7 @@
+ #include <wtf/WeakPtr.h>
  
  typedef struct _cairo cairo_t;
 +typedef struct _cairo_surface cairo_surface_t;
  
  #if USE(GTK4)
  typedef struct _GdkSnapshot GdkSnapshot;
-@@ -57,6 +58,8 @@ public:
+@@ -62,6 +63,8 @@ public:
  #else
      virtual bool paint(cairo_t*, const WebCore::IntRect&) = 0;
  #endif
@@ -18184,17 +17077,17 @@ index b02c70d85fe1a93899640a8b909b0cf734d28b18..b1dc8e89eb265be81e083bf337109561
      virtual void unrealize() { };
      virtual int renderHostFileDescriptor() { return -1; }
 diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-index bef1f57ad45eaef04640991d4afd34138b8d7b76..a37024640fbf6eb79838c039001ee1cf4907042e 100644
+index 395a409b6302d4146606fc0b45a15cff63c7f327..666d9629e0155e8c03b0672f7a9274de7f04d642 100644
 --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
 +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp
-@@ -659,4 +659,30 @@ RendererBufferFormat AcceleratedBackingStoreDMABuf::bufferFormat() const
-     return buffer ? buffer->format() : RendererBufferFormat { };
+@@ -812,4 +812,30 @@ RefPtr<WebCore::NativeImage> AcceleratedBackingStoreDMABuf::bufferAsNativeImageF
+     return m_committedBuffer->asNativeImageForTesting();
  }
  
 +// Playwright begin
 +cairo_surface_t* AcceleratedBackingStoreDMABuf::surface()
 +{
-+    RefPtr<Buffer> buffer = m_renderer.buffer();
++    RefPtr<Buffer> buffer = m_committedBuffer.get();
 +    if (!buffer)
 +        return nullptr;
 +
@@ -18219,10 +17112,10 @@ index bef1f57ad45eaef04640991d4afd34138b8d7b76..a37024640fbf6eb79838c039001ee1cf
 +
  } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
-index cd95ceb063fc776b5d68ff45262c4d84e572c509..041c562551cd467c320b8f566264885d00d1434b 100644
+index 63dfbed03bd898c822d426a5449141fec2841226..eaf141843da3f02c5ba6fd0322f3175248a7195b 100644
 --- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
 +++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.h
-@@ -88,6 +88,7 @@ private:
+@@ -98,6 +98,7 @@ private:
  #else
      bool paint(cairo_t*, const WebCore::IntRect&) override;
  #endif
@@ -18230,9 +17123,9 @@ index cd95ceb063fc776b5d68ff45262c4d84e572c509..041c562551cd467c320b8f566264885d
      void unrealize() override;
      void update(const LayerTreeContext&) override;
      RendererBufferFormat bufferFormat() const override;
-@@ -243,6 +244,9 @@ private:
-     RefPtr<Buffer> m_pendingBuffer;
+@@ -253,6 +254,9 @@ private:
      RefPtr<Buffer> m_committedBuffer;
+     Rects m_pendingDamageRects;
      HashMap<uint64_t, RefPtr<Buffer>> m_buffers;
 +// Playwright begin
 +    RefPtr<cairo_surface_t> m_flippedSurface;
@@ -18242,10 +17135,10 @@ index cd95ceb063fc776b5d68ff45262c4d84e572c509..041c562551cd467c320b8f566264885d
  } // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..f5f811ced4eafef530d101c4e397fe2780ac3071
+index 0000000000000000000000000000000000000000..bf78de1915940c2d3292514cf0fe4e682b636f70
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/gtk/InspectorTargetProxyGtk.cpp
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,48 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -18282,7 +17175,11 @@ index 0000000000000000000000000000000000000000..f5f811ced4eafef530d101c4e397fe27
 +
 +void InspectorTargetProxy::platformActivate(String& error) const
 +{
-+    GtkWidget* parent = gtk_widget_get_toplevel(m_page.viewWidget());
++#if USE(GTK4)
++    GtkWidget* parent = GTK_WIDGET(gtk_widget_get_root(m_page->viewWidget()));
++#else
++    GtkWidget* parent = gtk_widget_get_toplevel(m_page->viewWidget());
++#endif
 +    if (WebCore::widgetIsOnscreenToplevelWindow(parent))
 +        gtk_window_present(GTK_WINDOW(parent));
 +    else
@@ -18290,25 +17187,25 @@ index 0000000000000000000000000000000000000000..f5f811ced4eafef530d101c4e397fe27
 +}
 +
 +} // namespace WebKit
-diff --git a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp
-index 6029857cfcd6c4fea14de28243f1955138a62844..8a1bda8f2637670cf88baca998cbff09157d2a6f 100644
---- a/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp
-+++ b/Source/WebKit/UIProcess/gtk/WebDateTimePickerGtk.cpp
-@@ -34,6 +34,8 @@
- #include <wtf/SetForScope.h>
- #include <wtf/glib/GRefPtr.h>
- 
-+using namespace WebCore;
-+
- namespace WebKit {
+diff --git a/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp
+index 9ef483a6b0ab1558c059304d727311ea7984184d..f532d2d2dbe2d7cb66323b6ea5fe2daace15d7b8 100644
+--- a/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp
++++ b/Source/WebKit/UIProcess/gtk/SystemSettingsManagerProxyGtk.cpp
+@@ -126,6 +126,8 @@ int SystemSettingsManagerProxy::xftDPI() const
  
- Ref<WebDateTimePickerGtk> WebDateTimePickerGtk::create(WebPageProxy& page)
+ bool SystemSettingsManagerProxy::followFontSystemSettings() const
+ {
++    // Align with WPE's behavior, which always returns false.
++    return false;
+ #if USE(GTK4)
+ #if GTK_CHECK_VERSION(4, 16, 0)
+     GtkFontRendering fontRendering;
 diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..e5e25acebabb76a05a77db02a99f1267bd99a3af
+index 0000000000000000000000000000000000000000..7d9672b0f831b5b7f6acf14ede26e1e8e9a65389
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorEmulationAgentGtk.cpp
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,117 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -18342,8 +17239,22 @@ index 0000000000000000000000000000000000000000..e5e25acebabb76a05a77db02a99f1267
 +#include <gtk/gtk.h>
 +
 +namespace WebKit {
++
++#if USE(GTK4)
++bool windowHasManyTabs(GtkWidget* widget) {
++    for (GtkWidget* parent = gtk_widget_get_parent(widget); parent; parent = gtk_widget_get_parent(parent)) {
++        if (GTK_IS_NOTEBOOK(parent)) {
++            int pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(parent));
++            return pages > 1;
++        }
++    }
++    return false;
++}
++#endif
++
 +void WebPageInspectorEmulationAgent::platformSetSize(int width, int height, Function<void (const String& error)>&& callback)
 +{
++    WebCore::IntSize viewSize(width, height);
 +    GtkWidget* viewWidget = m_page.viewWidget();
 +    GtkWidget* window = gtk_widget_get_toplevel(viewWidget);
 +    if (!window) {
@@ -18356,6 +17267,14 @@ index 0000000000000000000000000000000000000000..e5e25acebabb76a05a77db02a99f1267
 +    }
 +    GtkAllocation viewAllocation;
 +    gtk_widget_get_allocation(viewWidget, &viewAllocation);
++#if USE(GTK4)
++    // In GTK4 newly added tabs will have allocation size of 0x0, before the tab is shown.
++    // This is a Ctrl+click scenario. We invoke callback righ await to not stall.
++    if (!viewAllocation.width && !viewAllocation.height && windowHasManyTabs(viewWidget)) {
++        callback(String());
++        return;
++    }
++#endif
 +    if (viewAllocation.width == width && viewAllocation.height == height) {
 +        callback(String());
 +        return;
@@ -18368,22 +17287,48 @@ index 0000000000000000000000000000000000000000..e5e25acebabb76a05a77db02a99f1267
 +    height += windowAllocation.height - viewAllocation.height;
 +
 +    if (auto* drawingArea = static_cast<DrawingAreaProxyCoordinatedGraphics*>(m_page.drawingArea())) {
-+        drawingArea->waitForSizeUpdate([callback = WTFMove(callback)]() {
++        bool didNotHaveInitialAllocation = !windowAllocation.width && !windowAllocation.height;
++        // The callback can only be called if the page is still alive, so we can safely capture `this`.
++        drawingArea->waitForSizeUpdate([this, callback = WTFMove(callback), didNotHaveInitialAllocation, viewSize](const DrawingAreaProxyCoordinatedGraphics& drawingArea) mutable {
++#if USE(GTK4)
++            if (viewSize == drawingArea.size()) {
++                callback(String());
++                return;
++            }
++            if (didNotHaveInitialAllocation) {
++                // In gtk4 resize request may be lost (overridden by default one) if the window is not yet
++                // allocated when we are changing the size, so we try again.
++                platformSetSize(viewSize.width(), viewSize.height(), WTFMove(callback));
++                return;
++            }
++            callback("Failed to resize window"_s);
++#else
++            UNUSED_PARAM(this);
++            UNUSED_PARAM(didNotHaveInitialAllocation);
++            UNUSED_PARAM(drawingArea);
 +            callback(String());
++#endif
 +        });
 +    } else {
 +        callback("No backing store for window"_s);
 +    }
++#if USE(GTK4)
++    // Depending on whether default size has been applied or not, we need to
++    // do one of the calls, so we just do both.
++    gtk_window_set_default_size(GTK_WINDOW(window), width, height);
++    gtk_widget_set_size_request(window, width, height);
++#else
 +    gtk_window_resize(GTK_WINDOW(window), width, height);
++#endif
 +}
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..6a204c5bba8fb95ddb2d1c14cae7a3a79610abc6
+index 0000000000000000000000000000000000000000..36ab6e9aec9f8d79fb13a8a49beadaafb3da58f5
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/gtk/WebPageInspectorInputAgentGtk.cpp
-@@ -0,0 +1,105 @@
+@@ -0,0 +1,76 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -18417,23 +17362,7 @@ index 0000000000000000000000000000000000000000..6a204c5bba8fb95ddb2d1c14cae7a3a7
 +#include "WebPageProxy.h"
 +#include <WebCore/PlatformKeyboardEvent.h>
 +
-+namespace WebKit {
-+
-+static Vector<String> commandsForKeyEvent(GdkEventType type, unsigned keyVal, unsigned state)
-+{
-+    ASSERT(type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE);
-+
-+    GUniquePtr<GdkEvent> event(gdk_event_new(type));
-+    event->key.keyval = keyVal;
-+    event->key.time = GDK_CURRENT_TIME;
-+    event->key.state = state;
-+    // When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
-+    GUniqueOutPtr<GdkKeymapKey> keys;
-+    int keysCount;
-+    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keyVal, &keys.outPtr(), &keysCount) && keysCount)
-+        event->key.hardware_keycode = keys.get()[0].keycode;
-+    return KeyBindingTranslator().commandsForKeyEvent(&event->key);
-+}
++namespace WebKit {
 +
 +static unsigned modifiersToEventState(OptionSet<WebEventModifier> modifiers)
 +{
@@ -18454,21 +17383,8 @@ index 0000000000000000000000000000000000000000..6a204c5bba8fb95ddb2d1c14cae7a3a7
 +    Vector<String> commands;
 +    const guint keyVal = WebCore::PlatformKeyboardEvent::gdkKeyCodeForWindowsKeyCode(windowsVirtualKeyCode);
 +    if (keyVal) {
-+        GdkEventType event = GDK_NOTHING;
-+        switch (type)
-+        {
-+        case WebEventType::KeyDown:
-+            event = GDK_KEY_PRESS;
-+            break;
-+        case WebEventType::KeyUp:
-+            event = GDK_KEY_RELEASE;
-+            break;
-+        default:
-+            fprintf(stderr, "Unsupported event type = %d\n", type);
-+            break;
-+        }
 +        unsigned state = modifiersToEventState(modifiers);
-+        commands = commandsForKeyEvent(event, keyVal, state);
++        commands = KeyBindingTranslator().commandsForKeyval(keyVal, state);
 +    }
 +    NativeWebKeyboardEvent event(
 +        type,
@@ -18490,10 +17406,10 @@ index 0000000000000000000000000000000000000000..6a204c5bba8fb95ddb2d1c14cae7a3a7
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
-index d18b3e777203ef5d0f33884f909bc598d3526831..aef80b47359d7a2e4805a006dc59cd60d499a60e 100644
+index c7db5171b505ea9656f409c95c422dce9f0fa1ae..1992a112468e03840be3696245eecd8452ca51ed 100644
 --- a/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
 +++ b/Source/WebKit/UIProcess/gtk/WebPasteboardProxyGtk.cpp
-@@ -77,8 +77,10 @@ void WebPasteboardProxy::setPrimarySelectionOwner(WebFrameProxy* frame)
+@@ -85,8 +85,10 @@ void WebPasteboardProxy::setPrimarySelectionOwner(WebFrameProxy* frame)
      if (m_primarySelectionOwner == frame)
          return;
  
@@ -18506,19 +17422,6 @@ index d18b3e777203ef5d0f33884f909bc598d3526831..aef80b47359d7a2e4805a006dc59cd60
  
      m_primarySelectionOwner = frame;
  }
-diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
-index 286877d14b4eb6ac45092fa1cce5ce530558f8af..85240554255d69a30269e764214a139743de521b 100644
---- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
-+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
-@@ -504,6 +504,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
-     
- void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
- {
-+    if (!event.nativeEvent())
-+        return;
-     [contentView() _didHandleKeyEvent:event.nativeEvent() eventWasHandled:eventWasHandled];
- }
- 
 diff --git a/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.h b/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.h
 new file mode 100644
 index 0000000000000000000000000000000000000000..2aabc02a4b5432f68a6e85fd9689775608f05a67
@@ -18580,7 +17483,7 @@ index 0000000000000000000000000000000000000000..2aabc02a4b5432f68a6e85fd96897756
 +} // namespace API
 diff --git a/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.mm b/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.mm
 new file mode 100644
-index 0000000000000000000000000000000000000000..0de68ad69c87f9d5b0a5f0d24fb358a50b59b4a2
+index 0000000000000000000000000000000000000000..a4b23bf4cf7c4cb6ef9d25d4121b20a611809479
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/mac/InspectorPlaywrightAgentClientMac.mm
 @@ -0,0 +1,96 @@
@@ -18651,7 +17554,7 @@ index 0000000000000000000000000000000000000000..0de68ad69c87f9d5b0a5f0d24fb358a5
 +
 +std::unique_ptr<BrowserContext> InspectorPlaywrightAgentClientMac::createBrowserContext(WTF::String& error, const WTF::String& proxyServer, const WTF::String& proxyBypassList)
 +{
-+    _WKBrowserContext* wkBrowserContext = [[delegate_ createBrowserContext:proxyServer WithBypassList:proxyBypassList] autorelease];
++    _WKBrowserContext* wkBrowserContext = [[delegate_ createBrowserContext:proxyServer.createNSString().get() WithBypassList:proxyBypassList.createNSString().get()] autorelease];
 +    auto browserContext = std::make_unique<BrowserContext>();
 +    browserContext->processPool = &static_cast<WebProcessPool&>([[wkBrowserContext processPool] _apiObject]);
 +    browserContext->dataStore = &static_cast<WebsiteDataStore&>([[wkBrowserContext dataStore] _apiObject]);
@@ -18667,7 +17570,7 @@ index 0000000000000000000000000000000000000000..0de68ad69c87f9d5b0a5f0d24fb358a5
 +{
 +    int toolbarHeight = headless_ ? 0 : 59;
 +    page.callAfterNextPresentationUpdate([protectedPage = Ref { page }, toolbarHeight, clipRect = WTFMove(clipRect), completionHandler = WTFMove(completionHandler)]() mutable {
-+        RetainPtr<CGImageRef> imageRef = protectedPage->pageClient().takeSnapshotForAutomation();
++        RetainPtr<CGImageRef> imageRef = protectedPage->pageClient()->takeSnapshotForAutomation();
 +        if (!imageRef) {
 +            completionHandler("Could not take view snapshot"_s, emptyString());
 +            return;
@@ -18682,7 +17585,7 @@ index 0000000000000000000000000000000000000000..0de68ad69c87f9d5b0a5f0d24fb358a5
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/mac/InspectorTargetProxyMac.mm b/Source/WebKit/UIProcess/mac/InspectorTargetProxyMac.mm
 new file mode 100644
-index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1219a7254
+index 0000000000000000000000000000000000000000..8adbd51bfecad2a273117588bf50f8f741850d14
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/mac/InspectorTargetProxyMac.mm
 @@ -0,0 +1,42 @@
@@ -18721,7 +17624,7 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1
 +
 +void InspectorTargetProxy::platformActivate(String& error) const
 +{
-+    NSWindow* window = m_page.platformWindow();
++    NSWindow* window = m_page->platformWindow();
 +    [window makeKeyAndOrderFront:nil];
 +}
 +
@@ -18729,19 +17632,19 @@ index 0000000000000000000000000000000000000000..721826c8c98fc85b68a4f45deaee69c1
 +
 +#endif
 diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.h b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
-index 1647891b55a718f66ee2f4a084439edd655c623a..2099b9166e2cac062d4161d704050a0795a26c93 100644
+index 27627ddb817e90c92ff5e533618ded9d017d36d9..9169b380a79d57201a7d3dceab04a1d16d987865 100644
 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.h
 +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.h
-@@ -54,6 +54,8 @@ class PageClientImpl final : public PageClientImplCocoa
+@@ -61,6 +61,8 @@ class PageClientImpl final : public PageClientImplCocoa
+     WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(PageClientImpl);
  #endif
-     {
  public:
 +    static void setHeadless(bool headless);
 +
      PageClientImpl(NSView *, WKWebView *);
      virtual ~PageClientImpl();
  
-@@ -170,6 +172,9 @@ private:
+@@ -176,6 +178,9 @@ private:
      void updateAcceleratedCompositingMode(const LayerTreeContext&) override;
      void didFirstLayerFlush(const LayerTreeContext&) override;
  
@@ -18749,32 +17652,24 @@ index 1647891b55a718f66ee2f4a084439edd655c623a..2099b9166e2cac062d4161d704050a07
 +    RetainPtr<CGImageRef> takeSnapshotForAutomation() override;
 +// Paywright end
      RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&) override;
+     RefPtr<ViewSnapshot> takeViewSnapshot(std::optional<WebCore::IntRect>&&, ForceSoftwareCapturingViewportSnapshot) override;
      void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) override;
- #if ENABLE(MAC_GESTURE_EVENTS)
-@@ -222,6 +227,10 @@ private:
-     void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) override;
+@@ -227,6 +232,10 @@ private:
+     void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame, CompletionHandler<void()>&&) override;
  #endif
  
 +#if ENABLE(TOUCH_EVENTS)
-+    void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
++    void doneWithTouchEvent(const WebTouchEvent&, bool wasEventHandled) override;
 +#endif
 +
      void navigationGestureDidBegin() override;
      void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override;
      void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
 diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
-index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd830855c0 100644
+index 22f6f6f08ba1601647898ca0f350672c3cac3816..6fad8bc05d1b458e25f8ddb9515ec8e1dcd896d6 100644
 --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
 +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
-@@ -80,6 +80,7 @@
- #import <WebCore/TextUndoInsertionMarkupMac.h>
- #import <WebCore/ValidationBubble.h>
- #import <WebCore/WebCoreCALayerExtras.h>
-+#import <WebCore/NotImplemented.h>
- #import <pal/spi/mac/NSApplicationSPI.h>
- #import <wtf/ProcessPrivilege.h>
- #import <wtf/RetainPtr.h>
-@@ -106,6 +107,13 @@ namespace WebKit {
+@@ -108,6 +108,13 @@ namespace WebKit {
  
  using namespace WebCore;
  
@@ -18788,7 +17683,7 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
  PageClientImpl::PageClientImpl(NSView *view, WKWebView *webView)
      : PageClientImplCocoa(webView)
      , m_view(view)
-@@ -159,6 +167,9 @@ NSWindow *PageClientImpl::activeWindow() const
+@@ -161,6 +168,9 @@ NSWindow *PageClientImpl::activeWindow() const
  
  bool PageClientImpl::isViewWindowActive()
  {
@@ -18796,9 +17691,9 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
 +        return true;
 +
      ASSERT(hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer));
-     NSWindow *activeViewWindow = activeWindow();
-     return activeViewWindow.isKeyWindow || (activeViewWindow && [NSApp keyWindow] == activeViewWindow);
-@@ -166,6 +177,9 @@ bool PageClientImpl::isViewWindowActive()
+     RetainPtr activeViewWindow = activeWindow();
+     return activeViewWindow.get().isKeyWindow || (activeViewWindow && [NSApp keyWindow] == activeViewWindow.get());
+@@ -168,6 +178,9 @@ bool PageClientImpl::isViewWindowActive()
  
  bool PageClientImpl::isViewFocused()
  {
@@ -18808,17 +17703,17 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
      // FIXME: This is called from the WebPageProxy constructor before we have a WebViewImpl.
      // Once WebViewImpl and PageClient merge, this won't be a problem.
      if (!m_impl)
-@@ -189,6 +203,9 @@ void PageClientImpl::makeFirstResponder()
+@@ -191,6 +204,9 @@ void PageClientImpl::makeFirstResponder()
      
  bool PageClientImpl::isViewVisible()
  {
 +    if (_headless)
 +        return true;
 +
-     NSView *activeView = this->activeView();
-     NSWindow *activeViewWindow = activeWindow();
+     RetainPtr activeView = this->activeView();
+     RetainPtr activeViewWindow = activeWindow();
  
-@@ -272,7 +289,8 @@ void PageClientImpl::didRelaunchProcess()
+@@ -265,7 +281,8 @@ void PageClientImpl::didRelaunchProcess()
  
  void PageClientImpl::preferencesDidChange()
  {
@@ -18828,7 +17723,7 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
  }
  
  void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
-@@ -475,6 +493,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
+@@ -474,6 +491,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
  
  void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
  {
@@ -18837,16 +17732,16 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
      m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
  }
  
-@@ -494,6 +514,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
+@@ -493,6 +512,8 @@ void PageClientImpl::computeHasVisualSearchResults(const URL& imageURL, Shareabl
  
  RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
  {
 +    if (_headless)
 +        return nullptr;
-     return WebPopupMenuProxyMac::create(m_view, page.popupMenuClient());
+     return WebPopupMenuProxyMac::create(m_view.get().get(), page.popupMenuClient());
  }
  
-@@ -635,6 +657,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
+@@ -633,6 +654,12 @@ CALayer *PageClientImpl::footerBannerLayer() const
      return m_impl->footerBannerLayer();
  }
  
@@ -18859,12 +17754,12 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
  RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(std::optional<WebCore::IntRect>&&)
  {
      return m_impl->takeViewSnapshot();
-@@ -810,6 +838,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
+@@ -844,6 +871,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
  
  #endif // ENABLE(FULLSCREEN_API)
  
 +#if ENABLE(TOUCH_EVENTS)
-+void PageClientImpl::doneWithTouchEvent(const NativeWebTouchEvent& event, bool wasEventHandled)
++void PageClientImpl::doneWithTouchEvent(const WebTouchEvent& event, bool wasEventHandled)
 +{
 +    notImplemented();
 +}
@@ -18873,7 +17768,7 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
  void PageClientImpl::navigationGestureDidBegin()
  {
      m_impl->dismissContentRelativeChildWindowsWithAnimation(true);
-@@ -997,6 +1032,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
+@@ -1024,6 +1058,9 @@ void PageClientImpl::requestScrollToRect(const WebCore::FloatRect& targetRect, c
  
  bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
  {
@@ -18884,15 +17779,20 @@ index 3fe2a9487a96b31f476bb17e45374f880e80da9a..b72433e5981f298d4d1ca93274df51cd
  }
  
 diff --git a/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in b/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
-index 21c925bafb662dbe961baaad7f25bf4296236d76..5496a33c558a00a5ba96d10223e600aa38de99c4 100644
+index f46895285dbc84c624537a194814c18f771a0c08..29ef9e5afa13b8d2b47b7f2dd4ce37846b61c35f 100644
 --- a/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
 +++ b/Source/WebKit/UIProcess/mac/SecItemShimProxy.messages.in
-@@ -20,11 +20,11 @@
+@@ -20,6 +20,7 @@
  # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
 +#if ENABLE(SEC_ITEM_SHIM)
- messages -> SecItemShimProxy NotRefCounted {
+ [
+     DispatchedFrom=Networking,
+     DispatchedTo=UI,
+@@ -27,9 +28,8 @@
+ ]
+ messages -> SecItemShimProxy {
  
 -#if ENABLE(SEC_ITEM_SHIM)
      SecItemRequestSync(WebKit::SecItemRequestData request) -> (std::optional<WebKit::SecItemResponseData> response) Synchronous
@@ -18902,10 +17802,10 @@ index 21c925bafb662dbe961baaad7f25bf4296236d76..5496a33c558a00a5ba96d10223e600aa
  }
 +#endif
 diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
-index 6ab7aacaebfda818e3010bb06db72c8552ac598a..3e19cba50d73084392f62f176ad4c3153803e579 100644
+index a3c53c0bf913385d4d2d92900360d5f7d75927f8..e5570ef599ff1b59224648c353f8ab16f8fe7f88 100644
 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
 +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h
-@@ -68,6 +68,7 @@ private:
+@@ -81,6 +81,7 @@ private:
      void show() override;
      void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
      void useContextMenuItems(Vector<Ref<WebContextMenuItem>>&&) override;
@@ -18914,10 +17814,10 @@ index 6ab7aacaebfda818e3010bb06db72c8552ac598a..3e19cba50d73084392f62f176ad4c315
      bool showAfterPostProcessingContextData();
  
 diff --git a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-index 6da27ca16f9f4d359118053049caa5033b6789d7..254e582066fbc774fc02c69dddbc1ae589efdc7a 100644
+index c8d9a4ae3fb5ef85afa837a1743c119ae34e1f7b..486a774cd1c98d9985c9d3c92418f835a9be2de1 100644
 --- a/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
 +++ b/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm
-@@ -481,6 +481,12 @@ void WebContextMenuProxyMac::getShareMenuItem(CompletionHandler<void(NSMenuItem
+@@ -530,6 +530,12 @@ RetainPtr<NSMenuItem> WebContextMenuProxyMac::createShareMenuItem(ShareMenuItemT
  }
  #endif
  
@@ -18982,10 +17882,10 @@ index 0000000000000000000000000000000000000000..6113f4cd60a5d72b8ead61176cb43200
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm b/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm
 new file mode 100644
-index 0000000000000000000000000000000000000000..4ec25daff6a0c75e378eb25b2f2638e2311a783c
+index 0000000000000000000000000000000000000000..dd52991f936aa1c046b404801ee97237d0a55748
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/mac/WebPageInspectorInputAgentMac.mm
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,135 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -19013,8 +17913,12 @@ index 0000000000000000000000000000000000000000..4ec25daff6a0c75e378eb25b2f2638e2
 +
 +#import "config.h"
 +#import "NativeWebMouseEvent.h"
++#import "NetworkProcessMessages.h"
++#import "NetworkProcessProxy.h"
 +#import "WebPageInspectorInputAgent.h"
 +#import "WebPageProxy.h"
++#import "WebPageProxyMessages.h"
++#import "WebsiteDataStore.h"
 +#import <WebCore/IntPoint.h>
 +#import <WebCore/IntSize.h>
 +#import "NativeWebKeyboardEvent.h"
@@ -19096,7 +18000,8 @@ index 0000000000000000000000000000000000000000..4ec25daff6a0c75e378eb25b2f2638e2
 +    if (text.length() > 0 && macCommands.size() == 0)
 +        macCommands.append(WebCore::KeypressCommand("insertText:"_s, text));
 +    if (!macCommands.isEmpty())
-+        m_page.grantAccessToCurrentPasteboardData(NSPasteboardNameGeneral);
++        if (auto replyID = m_page.grantAccessToCurrentPasteboardData(NSPasteboardNameGeneral, [] () { }))
++            m_page.websiteDataStore().protectedNetworkProcess()->connection().waitForAsyncReplyAndDispatchImmediately<Messages::NetworkProcess::AllowFilesAccessFromWebProcess>(*replyID, 100_ms);
 +    NativeWebKeyboardEvent event(
 +        type,
 +        text,
@@ -19117,10 +18022,18 @@ index 0000000000000000000000000000000000000000..4ec25daff6a0c75e378eb25b2f2638e2
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.h b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-index 363c8b384c7e2e2379f06903c77c7d139e1a454f..b0ca037bc8741ec245d9afefa2be734e1aa6ba32 100644
+index 85f0df23b0b5c1e76f2c9e12ad43b9802c23f579..9202e7923ded8b543dcee636166c100e739a094f 100644
 --- a/Source/WebKit/UIProcess/mac/WebViewImpl.h
 +++ b/Source/WebKit/UIProcess/mac/WebViewImpl.h
-@@ -526,6 +526,9 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -35,6 +35,7 @@
+ #include "WKLayoutMode.h"
+ #include "WKTextAnimationType.h"
+ #include <WebCore/DOMPasteAccess.h>
++#include <WebCore/FrameIdentifier.h>
+ #include <WebCore/FocusDirection.h>
+ #include <WebCore/KeypressCommand.h>
+ #include <WebCore/PlatformPlaybackSessionInterface.h>
+@@ -570,6 +571,9 @@ public:
      void provideDataForPasteboard(NSPasteboard *, NSString *type);
      NSArray *namesOfPromisedFilesDroppedAtDestination(NSURL *dropDestination);
  
@@ -19128,13 +18041,13 @@ index 363c8b384c7e2e2379f06903c77c7d139e1a454f..b0ca037bc8741ec245d9afefa2be734e
 +    RetainPtr<CGImageRef> takeSnapshotForAutomation();
 +// Paywright end
      RefPtr<ViewSnapshot> takeViewSnapshot();
+     RefPtr<ViewSnapshot> takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot);
      void saveBackForwardSnapshotForCurrentItem();
-     void saveBackForwardSnapshotForItem(WebBackForwardListItem&);
 diff --git a/Source/WebKit/UIProcess/mac/WebViewImpl.mm b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-index b12b690eff989c9f4235c874360e26543c3e95ee..e8be29392d3c1765fc977f8a0036a24e7d95c799 100644
+index fa8aba243a8808dc781d40f1daf1480e6b655656..85f02dbfa3cfe47ee2adceee2714104445cdb7ba 100644
 --- a/Source/WebKit/UIProcess/mac/WebViewImpl.mm
 +++ b/Source/WebKit/UIProcess/mac/WebViewImpl.mm
-@@ -2410,6 +2410,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
+@@ -2444,6 +2444,11 @@ WebCore::DestinationColorSpace WebViewImpl::colorSpace()
          if (!m_colorSpace)
              m_colorSpace = [NSColorSpace sRGBColorSpace];
      }
@@ -19146,8 +18059,8 @@ index b12b690eff989c9f4235c874360e26543c3e95ee..e8be29392d3c1765fc977f8a0036a24e
  
      ASSERT(m_colorSpace);
      return WebCore::DestinationColorSpace { [m_colorSpace CGColorSpace] };
-@@ -4487,6 +4492,18 @@ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -4724,6 +4729,17 @@ static RetainPtr<CGImageRef> takeWindowSnapshot(CGSWindowID windowID, bool captu
+     return WebCore::cgWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, windowID, imageOptions);
  }
  
 +// Paywright begin
@@ -19157,20 +18070,19 @@ index b12b690eff989c9f4235c874360e26543c3e95ee..e8be29392d3c1765fc977f8a0036a24e
 +    CGSWindowID windowID = (CGSWindowID)window.windowNumber;
 +    if (!windowID || !window.isVisible)
 +        return nullptr;
-+
-+    return takeWindowSnapshot(windowID, true);
++    return takeWindowSnapshot(windowID, true, ForceSoftwareCapturingViewportSnapshot::Yes);
 +}
 +// Paywright end
 +
  RefPtr<ViewSnapshot> WebViewImpl::takeViewSnapshot()
  {
-     NSWindow *window = [m_view window];
+     return takeViewSnapshot(ForceSoftwareCapturingViewportSnapshot::No);
 diff --git a/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.cpp b/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..dd7fe0604188bb025f361f1c44685e38bbf935ca
+index 0000000000000000000000000000000000000000..4f54a9445e5a7ecdb750c5c521da4f397776e633
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/win/InspectorPlaywrightAgentClientWin.cpp
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,89 @@
 +/*
 + * Copyright (C) 2020 Microsoft Corporation.
 + *
@@ -19250,7 +18162,6 @@ index 0000000000000000000000000000000000000000..dd7fe0604188bb025f361f1c44685e38
 +        WebCore::CurlProxySettings settings(WTFMove(proxyURL), String(proxyBypassList));
 +        browserContext->dataStore->setNetworkProxySettings(WTFMove(settings));
 +    }
-+    PAL::SessionID sessionID = browserContext->dataStore->sessionID();
 +    return browserContext;
 +}
 +
@@ -19370,10 +18281,10 @@ index 0000000000000000000000000000000000000000..135a60361fa8fbf907382625e7c8dd4e
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
-index da6859dcd444de953a255a5c835c659b018a08a6..95fefa995acaedf879c88130e44d9a1bbd0d107f 100644
+index bae35256ed815f7dac0b11ae439531d4ef3cb108..81e063b50a0132f8b36f3461f95d2ce1968198f5 100644
 --- a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
 +++ b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
-@@ -112,5 +112,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin()
+@@ -115,5 +115,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin()
          ::DestroyMenu(m_menu);
  }
  
@@ -19386,17 +18297,17 @@ index da6859dcd444de953a255a5c835c659b018a08a6..95fefa995acaedf879c88130e44d9a1b
  } // namespace WebKit
  #endif // ENABLE(CONTEXT_MENUS)
 diff --git a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h
-index 0c80d970c3f9a987faf620081c909f6c7021970d..1467e5481f7417913c0d12a1cb492d02b2a7d1b7 100644
+index e7f71156d7a897ab477d0d7f167b2c2992cdb161..325d8813afff13d86a4892a8e99738f19c2729ac 100644
 --- a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h
 +++ b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.h
-@@ -47,6 +47,7 @@ public:
+@@ -49,6 +49,7 @@ public:
  private:
-     WebContextMenuProxyWin(WebPageProxy&, ContextMenuContextData&&, const UserData&);
+     WebContextMenuProxyWin(WebPageProxy&, FrameInfoData&&, ContextMenuContextData&&, const UserData&);
      void showContextMenuWithItems(Vector<Ref<WebContextMenuItem>>&&) override;
 +    void hide() override;
  
      HMENU m_menu;
- };
+     FrameInfoData m_frameInfo;
 diff --git a/Source/WebKit/UIProcess/win/WebPageInspectorEmulationAgentWin.cpp b/Source/WebKit/UIProcess/win/WebPageInspectorEmulationAgentWin.cpp
 new file mode 100644
 index 0000000000000000000000000000000000000000..df55ee613ec085cb85ed12b45deff3a1b046861c
@@ -19522,9 +18433,22 @@ index 0000000000000000000000000000000000000000..8b474c730139b44a13c9d5b2d13ee204
 +}
 +
 +} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/win/WebView.cpp b/Source/WebKit/UIProcess/win/WebView.cpp
+index 5180da3ec22d56e8a9520e31cad076d86ae5be9f..f01be74573843e7b374c34035c09f114bdc7349c 100644
+--- a/Source/WebKit/UIProcess/win/WebView.cpp
++++ b/Source/WebKit/UIProcess/win/WebView.cpp
+@@ -576,7 +576,7 @@ LRESULT WebView::onSizeEvent(HWND hwnd, UINT, WPARAM, LPARAM lParam, bool& handl
+     float intrinsicDeviceScaleFactor = deviceScaleFactorForWindow(hwnd);
+     if (m_page)
+         m_page->setIntrinsicDeviceScaleFactor(intrinsicDeviceScaleFactor);
+-    m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)) / intrinsicDeviceScaleFactor);
++    m_viewSize = expandedIntSize(FloatSize(LOWORD(lParam), HIWORD(lParam)));
+ 
+     if (m_page && m_page->drawingArea()) {
+         // FIXME specify correctly layerPosition.
 diff --git a/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..7453194ca6f032ba86a4c67f5bf12688ab6ec1be
+index 0000000000000000000000000000000000000000..24da079059ed4a45131e18d7fbf56a29a54bd513
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/wpe/InspectorTargetProxyWPE.cpp
 @@ -0,0 +1,40 @@
@@ -19563,17 +18487,17 @@ index 0000000000000000000000000000000000000000..7453194ca6f032ba86a4c67f5bf12688
 +
 +void InspectorTargetProxy::platformActivate(String& error) const
 +{
-+    struct wpe_view_backend* backend = m_page.viewBackend();
++    struct wpe_view_backend* backend = m_page->viewBackend();
 +    wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
 +}
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..adec63a0a9d6d67bdbdadb4024005ff97ce79d10
+index 0000000000000000000000000000000000000000..7df77e30c2e7303dc6aaad560434e5b8e35f4f3c
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.cpp
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,57 @@
 +/*
 + * Copyright (C) 2015 Igalia S.L.
 + *
@@ -19602,8 +18526,6 @@ index 0000000000000000000000000000000000000000..adec63a0a9d6d67bdbdadb4024005ff9
 +#include "config.h"
 +#include "WebColorPickerWPE.h"
 +
-+#if ENABLE(INPUT_TYPE_COLOR)
-+
 +#include "WebPageProxy.h"
 +
 +namespace WebKit {
@@ -19633,14 +18555,12 @@ index 0000000000000000000000000000000000000000..adec63a0a9d6d67bdbdadb4024005ff9
 +}
 +
 +} // namespace WebKit
-+
-+#endif // ENABLE(INPUT_TYPE_COLOR)
 diff --git a/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.h b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.h
 new file mode 100644
-index 0000000000000000000000000000000000000000..7edc93b3873dd42a7f877626551ec994395baae9
+index 0000000000000000000000000000000000000000..da58334235809cfed62e90150784bf2506f7a8f2
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/wpe/WebColorPickerWPE.h
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,54 @@
 +/*
 + * Copyright (C) 2015 Igalia S.L.
 + *
@@ -19669,8 +18589,6 @@ index 0000000000000000000000000000000000000000..7edc93b3873dd42a7f877626551ec994
 +#ifndef WebColorPickerWPE_h
 +#define WebColorPickerWPE_h
 +
-+#if ENABLE(INPUT_TYPE_COLOR)
-+
 +#include "WebColorPicker.h"
 +
 +typedef struct _GtkColorChooser GtkColorChooser;
@@ -19696,8 +18614,125 @@ index 0000000000000000000000000000000000000000..7edc93b3873dd42a7f877626551ec994
 +
 +} // namespace WebKit
 +
-+#endif // ENABLE(INPUT_TYPE_COLOR)
 +#endif // WebColorPickerWPE_h
+diff --git a/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp
+new file mode 100644
+index 0000000000000000000000000000000000000000..694eb24db4a407553da12fb0a25d8963fd0ef6ac
+--- /dev/null
++++ b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.cpp
+@@ -0,0 +1,55 @@
++/*
++ * Copyright (C) 2019 Igalia S.L.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
++ * THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include "config.h"
++#include "WebDataListSuggestionsDropdownWPE.h"
++
++#include "WebPageProxy.h"
++#include <WebCore/DataListSuggestionInformation.h>
++
++namespace WebKit {
++
++WebDataListSuggestionsDropdownWPE::WebDataListSuggestionsDropdownWPE(WebPageProxy& page)
++    : WebDataListSuggestionsDropdown(page)
++{
++}
++
++WebDataListSuggestionsDropdownWPE::~WebDataListSuggestionsDropdownWPE()
++{
++}
++
++void WebDataListSuggestionsDropdownWPE::show(WebCore::DataListSuggestionInformation&& information)
++{
++}
++
++void WebDataListSuggestionsDropdownWPE::handleKeydownWithIdentifier(const String& key)
++{
++}
++
++void WebDataListSuggestionsDropdownWPE::close()
++{
++}
++
++} // namespace WebKit
+diff --git a/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.h b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.h
+new file mode 100644
+index 0000000000000000000000000000000000000000..5d4b0d204b7dc564564d2126e9f256fa4f4bd6f6
+--- /dev/null
++++ b/Source/WebKit/UIProcess/wpe/WebDataListSuggestionsDropdownWPE.h
+@@ -0,0 +1,51 @@
++/*
++ * Copyright (C) 2019 Igalia S.L.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS AS IS''
++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
++ * THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#pragma once
++
++#include "WebDataListSuggestionsDropdown.h"
++
++namespace WebKit {
++
++class WebPageProxy;
++
++class WebDataListSuggestionsDropdownWPE final : public WebDataListSuggestionsDropdown {
++public:
++    static Ref<WebDataListSuggestionsDropdown> create(WebPageProxy& page)
++    {
++        return adoptRef(*new WebDataListSuggestionsDropdownWPE(page));
++    }
++
++    ~WebDataListSuggestionsDropdownWPE();
++
++private:
++    WebDataListSuggestionsDropdownWPE(WebPageProxy&);
++
++    void show(WebCore::DataListSuggestionInformation&&) final;
++    void handleKeydownWithIdentifier(const String&) final;
++    void close() final;
++};
++
++} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/wpe/WebDateTimePickerWPE.cpp b/Source/WebKit/UIProcess/wpe/WebDateTimePickerWPE.cpp
 new file mode 100644
 index 0000000000000000000000000000000000000000..a44463faf011fbab08f87bb7007a5e71c2a73758
@@ -19818,10 +18853,10 @@ index 0000000000000000000000000000000000000000..0c0e3fce33b06ee72c4c29d2a4abe964
 +#endif // ENABLE(DATE_AND_TIME_INPUT_TYPES)
 diff --git a/Source/WebKit/UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..5dc76aa302cb574307059e66a1b73730efe920da
+index 0000000000000000000000000000000000000000..182398f24909cbc42cac897d66546991f46c1d5d
 --- /dev/null
 +++ b/Source/WebKit/UIProcess/wpe/WebPageInspectorEmulationAgentWPE.cpp
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2019 Microsoft Corporation.
 + *
@@ -19850,6 +18885,7 @@ index 0000000000000000000000000000000000000000..5dc76aa302cb574307059e66a1b73730
 +#include "config.h"
 +#include "WebPageInspectorEmulationAgent.h"
 +
++#include "DrawingAreaProxyCoordinatedGraphics.h"
 +#include "WebPageProxy.h"
 +#include <wpe/wpe.h>
 +
@@ -19857,9 +18893,20 @@ index 0000000000000000000000000000000000000000..5dc76aa302cb574307059e66a1b73730
 +
 +void WebPageInspectorEmulationAgent::platformSetSize(int width, int height, Function<void (const String& error)>&& callback)
 +{
++    WebCore::IntSize viewSize(width, height);
++    if (m_page.viewSize() == viewSize) {
++        callback(String());
++        return;
++    }
++
 +    struct wpe_view_backend* backend = m_page.viewBackend();
-+    wpe_view_backend_dispatch_set_size(backend, width, height);
-+    callback(String());
++    wpe_view_backend_dispatch_set_size(backend, viewSize.width(), viewSize.height());
++    if (auto* drawingArea = static_cast<DrawingAreaProxyCoordinatedGraphics*>(m_page.drawingArea())) {
++        drawingArea->waitForSizeUpdate([callback = WTFMove(callback)](const DrawingAreaProxyCoordinatedGraphics&) mutable {
++            callback(String());
++        });
++    } else
++        callback(String());
 +}
 +
 +} // namespace WebKit
@@ -19924,35 +18971,26 @@ index 0000000000000000000000000000000000000000..a7d88f8c745f95af21db71dcfce368ba
 +}
 + 
 +} // namespace WebKit
-diff --git a/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp
-index b6536b74452c26a4d661bcf6039af54824f258d0..ade7c4ad1cef7bc69c452bef404eb38437c93088 100644
---- a/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp
-+++ b/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp
-@@ -29,6 +29,7 @@
- #include "EditorState.h"
- #include "InputMethodState.h"
- #include "PageClientImpl.h"
-+#include <wpe/wpe-platform.h>
- #include <WebCore/PlatformEvent.h>
- 
- #if USE(ATK)
-diff --git a/Source/WebKit/WPEPlatform/CMakeLists.txt b/Source/WebKit/WPEPlatform/CMakeLists.txt
-index 9319cacf6dff2c3ffdd469927c91a880978a80aa..17a829b23ae6941b184d32e8701f0fd774639449 100644
---- a/Source/WebKit/WPEPlatform/CMakeLists.txt
-+++ b/Source/WebKit/WPEPlatform/CMakeLists.txt
-@@ -82,6 +82,7 @@ set(WPEPlatform_SYSTEM_INCLUDE_DIRECTORIES
- 
- set(WPEPlatform_LIBRARIES
-     Epoxy::Epoxy
-+    rt
-     WTF
-     ${GLIB_GIO_LIBRARIES}
-     ${GLIB_GOBJECT_LIBRARIES}
+diff --git a/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp b/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp
+index 9b688ad328317fea4fd96ce66e9714bad8f0f937..402a36a9c565e13ec298aa7f014f0d9208ebddb7 100644
+--- a/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp
++++ b/Source/WebKit/UIProcess/wpe/WebPreferencesWPE.cpp
+@@ -33,6 +33,10 @@ void WebPreferences::platformInitializeStore()
+     setAcceleratedCompositingEnabled(true);
+     setForceCompositingMode(true);
+     setThreadedScrollingEnabled(true);
++
++    // Playwright override begin
++    setThreadedScrollingEnabled(false);
++    // Playwright override end
+ }
+ 
+ } // namespace WebKit
 diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3ffb292f7 100644
+index 7504d2cdd6d31bdfb1892dab8e1716253ce54ccc..c1ecef732f88cbf5c6277a0aa5c0d48806565ac2 100644
 --- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
 +++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
-@@ -1542,6 +1542,7 @@
+@@ -1560,6 +1560,7 @@
  		5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; };
  		5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; };
  		5CAECB6627465AE400AB78D0 /* UnifiedSource115.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */; };
@@ -19960,7 +18998,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  		5CAF7AA726F93AB00003F19E /* adattributiond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.cpp */; };
  		5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
  		5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; };
-@@ -2381,6 +2382,18 @@
+@@ -2346,6 +2347,18 @@
  		DF0C5F28252ECB8E00D921DB /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F24252ECB8D00D921DB /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		DF0C5F2A252ECB8E00D921DB /* WKDownloadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
  		DF0C5F2B252ED44000D921DB /* WKDownloadInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */; };
@@ -19979,7 +19017,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  		DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
  		DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
  		DF7A231C291B088D00B98DF3 /* WKSnapshotConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF7A231B291B088D00B98DF3 /* WKSnapshotConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
-@@ -2468,6 +2481,8 @@
+@@ -2447,6 +2460,8 @@
  		E5BEF6822130C48000F31111 /* WebDataListSuggestionsDropdownIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = E5BEF6802130C47F00F31111 /* WebDataListSuggestionsDropdownIOS.h */; };
  		E5CB07DC20E1678F0022C183 /* WKFormColorControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E5CB07DA20E1678F0022C183 /* WKFormColorControl.h */; };
  		E5CBA76427A318E100DF7858 /* UnifiedSource120.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA75F27A3187800DF7858 /* UnifiedSource120.cpp */; };
@@ -19988,17 +19026,17 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  		E5CBA76527A318E100DF7858 /* UnifiedSource118.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */; };
  		E5CBA76627A318E100DF7858 /* UnifiedSource116.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */; };
  		E5CBA76727A318E100DF7858 /* UnifiedSource119.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5CBA76027A3187900DF7858 /* UnifiedSource119.cpp */; };
-@@ -2488,6 +2503,9 @@
- 		EBA8D3B627A5E33F00CB7900 /* MockPushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B027A5E33F00CB7900 /* MockPushServiceConnection.mm */; };
- 		EBA8D3B727A5E33F00CB7900 /* PushServiceConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = EBA8D3B127A5E33F00CB7900 /* PushServiceConnection.mm */; };
- 		ED82A7F2128C6FAF004477B3 /* WKBundlePageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A22F0FF1289FCD90085E74F /* WKBundlePageOverlay.h */; settings = {ATTRIBUTES = (Private, ); }; };
+@@ -2485,6 +2500,9 @@
+ 		F3EEEE592DB318270038CC1D /* BidiBrowserAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3EEEE572DB318270038CC1D /* BidiBrowserAgent.h */; };
+ 		F3EEEE5A2DB318270038CC1D /* BidiBrowserAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F3EEEE582DB318270038CC1D /* BidiBrowserAgent.cpp */; };
+ 		F404455C2D5CFB56000E587E /* AppKitSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = F404455A2D5CFB56000E587E /* AppKitSoftLink.h */; };
 +		F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = F303B848249A8D3A0031DE5C /* ScreencastEncoder.h */; };
 +		F33C7AC7249AD79C0018BE41 /* libwebrtc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F33C7AC6249AD79C0018BE41 /* libwebrtc.dylib */; };
 +		F3867F0A24607D4E008F0F31 /* InspectorScreencastAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = F3867F0424607D2B008F0F31 /* InspectorScreencastAgent.h */; };
  		F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
  		F40C3B712AB401C5007A3567 /* WKDatePickerPopoverController.h in Headers */ = {isa = PBXBuildFile; fileRef = F40C3B6F2AB40167007A3567 /* WKDatePickerPopoverController.h */; };
- 		F41795A62AC61B78007F5F12 /* CompactContextMenuPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = F41795A42AC619A2007F5F12 /* CompactContextMenuPresenter.h */; };
-@@ -6218,6 +6236,7 @@
+ 		F41145682CD939E0004CDBD1 /* _WKTouchEventGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F41145652CD939E0004CDBD1 /* _WKTouchEventGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
+@@ -6443,6 +6461,7 @@
  		5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = "<group>"; };
  		5CABE07A28F60E8A00D83FD9 /* WebPushMessage.serialization.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebPushMessage.serialization.in; sourceTree = "<group>"; };
  		5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = "<group>"; };
@@ -20006,7 +19044,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  		5CAECB5E27465AE300AB78D0 /* UnifiedSource115.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource115.cpp; sourceTree = "<group>"; };
  		5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; };
  		5CAF7AA526F93A950003F19E /* adattributiond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = adattributiond.cpp; sourceTree = "<group>"; };
-@@ -7930,6 +7949,19 @@
+@@ -8171,6 +8190,19 @@
  		DF0C5F24252ECB8D00D921DB /* WKDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownload.h; sourceTree = "<group>"; };
  		DF0C5F25252ECB8E00D921DB /* WKDownloadInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadInternal.h; sourceTree = "<group>"; };
  		DF0C5F26252ECB8E00D921DB /* WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDownloadDelegate.h; sourceTree = "<group>"; };
@@ -20026,19 +19064,19 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  		DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = "<group>"; };
  		DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = "<group>"; };
  		DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = "<group>"; };
-@@ -8082,6 +8114,8 @@
+@@ -8346,6 +8378,8 @@
  		E5CBA76127A3187900DF7858 /* UnifiedSource118.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource118.cpp; sourceTree = "<group>"; };
  		E5CBA76227A3187900DF7858 /* UnifiedSource117.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource117.cpp; sourceTree = "<group>"; };
  		E5CBA76327A3187B00DF7858 /* UnifiedSource116.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource116.cpp; sourceTree = "<group>"; };
 +		E5CBA76F27A3187800DF7858 /* UnifiedSource121.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource121.cpp; sourceTree = "<group>"; };
 +		E5CBA77F27A3187800DF7858 /* UnifiedSource122.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnifiedSource122.cpp; sourceTree = "<group>"; };
  		E5DEFA6726F8F42600AB68DB /* PhotosUISPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PhotosUISPI.h; sourceTree = "<group>"; };
- 		EB0D312D275AE13300863D8F /* com.apple.webkit.webpushd.mac.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.webkit.webpushd.mac.plist; sourceTree = "<group>"; };
- 		EB0D312E275AE13300863D8F /* com.apple.webkit.webpushd.ios.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = com.apple.webkit.webpushd.ios.plist; sourceTree = "<group>"; };
-@@ -8106,6 +8140,14 @@
- 		ECA680D31E6904B500731D20 /* ExtraPrivateSymbolsForTAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtraPrivateSymbolsForTAPI.h; sourceTree = "<group>"; };
- 		ECBFC1DB1E6A4D66000300C7 /* ExtraPublicSymbolsForTAPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExtraPublicSymbolsForTAPI.h; sourceTree = "<group>"; };
- 		F036978715F4BF0500C3A80E /* WebColorPicker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebColorPicker.cpp; sourceTree = "<group>"; };
+ 		E88885662DC914C400C572B8 /* WKISO18013Request.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKISO18013Request.h; sourceTree = "<group>"; };
+ 		E890313A2D96411E00AB0B09 /* DigitalCredentialsCoordinator.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = DigitalCredentialsCoordinator.messages.in; sourceTree = "<group>"; };
+@@ -8398,6 +8432,14 @@
+ 		F404455A2D5CFB56000E587E /* AppKitSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppKitSoftLink.h; sourceTree = "<group>"; };
+ 		F404455B2D5CFB56000E587E /* AppKitSoftLink.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppKitSoftLink.mm; sourceTree = "<group>"; };
+ 		F4063DDE2D71481E00F3FE6E /* LLVMProfiling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LLVMProfiling.h; sourceTree = "<group>"; };
 +		F303B847249A8D3A0031DE5C /* ScreencastEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScreencastEncoder.cpp; sourceTree = "<group>"; };
 +		F303B848249A8D3A0031DE5C /* ScreencastEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreencastEncoder.h; sourceTree = "<group>"; };
 +		F31E2DA424C76E4B004B2775 /* WebMFileWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebMFileWriter.cpp; sourceTree = "<group>"; };
@@ -20050,7 +19088,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  		F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDragDestinationAction.h; sourceTree = "<group>"; };
  		F40C3B6F2AB40167007A3567 /* WKDatePickerPopoverController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WKDatePickerPopoverController.h; path = ios/forms/WKDatePickerPopoverController.h; sourceTree = "<group>"; };
  		F40C3B702AB40167007A3567 /* WKDatePickerPopoverController.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = WKDatePickerPopoverController.mm; path = ios/forms/WKDatePickerPopoverController.mm; sourceTree = "<group>"; };
-@@ -8404,6 +8446,7 @@
+@@ -8825,6 +8867,7 @@
  				3766F9EE189A1241003CF19B /* JavaScriptCore.framework in Frameworks */,
  				3766F9F1189A1254003CF19B /* libicucore.dylib in Frameworks */,
  				7B9FC5BB28A5233B007570E7 /* libWebKitPlatform.a in Frameworks */,
@@ -20058,7 +19096,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				3766F9EF189A1244003CF19B /* QuartzCore.framework in Frameworks */,
  				37694525184FC6B600CDE21F /* Security.framework in Frameworks */,
  				37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */,
-@@ -11278,6 +11321,7 @@
+@@ -12013,6 +12056,7 @@
  				99788ACA1F421DCA00C08000 /* _WKAutomationSessionConfiguration.mm */,
  				990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */,
  				990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */,
@@ -20066,7 +19104,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				5C4609E222430E4C009943C2 /* _WKContentRuleListAction.h */,
  				5C4609E322430E4D009943C2 /* _WKContentRuleListAction.mm */,
  				5C4609E422430E4D009943C2 /* _WKContentRuleListActionInternal.h */,
-@@ -12589,6 +12633,7 @@
+@@ -13392,6 +13436,7 @@
  				E34B110C27C46BC6006D2F2E /* libWebCoreTestShim.dylib */,
  				E34B110F27C46D09006D2F2E /* libWebCoreTestSupport.dylib */,
  				DDE992F4278D06D900F60D26 /* libWebKitAdditions.a */,
@@ -20074,7 +19112,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				57A9FF15252C6AEF006A2040 /* libWTF.a */,
  				5750F32A2032D4E500389347 /* LocalAuthentication.framework */,
  				570DAAB0230273D200E8FC04 /* NearField.framework */,
-@@ -13159,6 +13204,12 @@
+@@ -13974,6 +14019,12 @@
  			children = (
  				9197940423DBC4BB00257892 /* InspectorBrowserAgent.cpp */,
  				9197940323DBC4BB00257892 /* InspectorBrowserAgent.h */,
@@ -20087,7 +19125,7 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  			);
  			path = Agents;
  			sourceTree = "<group>";
-@@ -13167,6 +13218,7 @@
+@@ -13982,6 +14033,7 @@
  			isa = PBXGroup;
  			children = (
  				A5D3504D1D78F0D2005124A9 /* RemoteWebInspectorUIProxyMac.mm */,
@@ -20095,15 +19133,15 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				1CA8B935127C774E00576C2B /* WebInspectorUIProxyMac.mm */,
  				99A7ACE326012919006D57FD /* WKInspectorResourceURLSchemeHandler.h */,
  				99A7ACE42601291A006D57FD /* WKInspectorResourceURLSchemeHandler.mm */,
-@@ -13884,6 +13936,7 @@
+@@ -14736,6 +14788,7 @@
  				E1513C65166EABB200149FCB /* AuxiliaryProcessProxy.h */,
  				46A2B6061E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.cpp */,
  				46A2B6071E5675A200C3DEDA /* BackgroundProcessResponsivenessTimer.h */,
 +				D71A944B237239FB002C4D9E /* BrowserInspectorPipe.h */,
  				5C6D69352AC3935D0099BDAF /* BrowsingContextGroup.cpp */,
  				5C6D69362AC3935D0099BDAF /* BrowsingContextGroup.h */,
- 				07297F9C1C1711EA003F0735 /* DeviceIdHashSaltStorage.cpp */,
-@@ -13907,6 +13960,8 @@
+ 				5CA98549210BEB5A0057EB6B /* BrowsingWarning.h */,
+@@ -14760,6 +14813,8 @@
  				BC06F43912DBCCFB002D78DE /* GeolocationPermissionRequestProxy.cpp */,
  				BC06F43812DBCCFB002D78DE /* GeolocationPermissionRequestProxy.h */,
  				2DD5A72A1EBF09A7009BA597 /* HiddenPageThrottlingAutoIncreasesCounter.h */,
@@ -20112,24 +19150,24 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				5CEABA2B2333251400797797 /* LegacyGlobalSettings.cpp */,
  				5CEABA2A2333247700797797 /* LegacyGlobalSettings.h */,
  				31607F3819627002009B87DA /* LegacySessionStateCoding.h */,
-@@ -13940,6 +13995,7 @@
- 				1A0C227D2451130A00ED614D /* QuickLookThumbnailingSoftLink.mm */,
- 				1AEE57232409F142002005D6 /* QuickLookThumbnailLoader.h */,
- 				1AEE57242409F142002005D6 /* QuickLookThumbnailLoader.mm */,
+@@ -14789,6 +14844,7 @@
+ 				4683569B21E81CC7006E27A3 /* ProvisionalPageProxy.cpp */,
+ 				4683569A21E81CC7006E27A3 /* ProvisionalPageProxy.h */,
+ 				411B89CB27B2B89600F9EBD3 /* QueryPermissionResultCallback.h */,
 +				D71A94392370F060002C4D9E /* RemoteInspectorPipe.h */,
  				5CCB54DC2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.cpp */,
  				5CCB54DB2A4FEA6A0005FAA8 /* RemotePageDrawingAreaProxy.h */,
- 				5C907E9A294D507100B3402D /* RemotePageProxy.cpp */,
-@@ -14045,6 +14101,8 @@
+ 				FABBBC802D35AC6800820017 /* RemotePageFullscreenManagerProxy.cpp */,
+@@ -14892,6 +14948,8 @@
  				BC7B6204129A0A6700D174A4 /* WebPageGroup.h */,
  				2D9EA3101A96D9EB002D2807 /* WebPageInjectedBundleClient.cpp */,
  				2D9EA30E1A96CBFF002D2807 /* WebPageInjectedBundleClient.h */,
 +				D71A943F2371F67E002C4D9E /* WebPageInspectorEmulationAgent.h */,
 +				D71A94402371F67E002C4D9E /* WebPageInspectorInputAgent.h */,
+ 				9B7F8A502C785725000057F3 /* WebPageLoadTiming.h */,
  				BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
  				BC032DCB10F4389F0058C15A /* WebPageProxy.h */,
- 				BCBD38FA125BAB9A00D2C29F /* WebPageProxy.messages.in */,
-@@ -14209,6 +14267,7 @@
+@@ -15070,6 +15128,7 @@
  				BC646C1911DD399F006455B0 /* WKBackForwardListItemRef.h */,
  				BC646C1611DD399F006455B0 /* WKBackForwardListRef.cpp */,
  				BC646C1711DD399F006455B0 /* WKBackForwardListRef.h */,
@@ -20137,17 +19175,17 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				BCB9E24A1120E15C00A137E0 /* WKContext.cpp */,
  				BCB9E2491120E15C00A137E0 /* WKContext.h */,
  				1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */,
-@@ -14792,6 +14851,9 @@
+@@ -15646,6 +15705,9 @@
+ 				07EF07592745A8160066EA04 /* DisplayCaptureSessionManager.h */,
+ 				07EF07582745A8160066EA04 /* DisplayCaptureSessionManager.mm */,
  				7AFA6F682A9F57C50055322A /* DisplayLinkMac.cpp */,
- 				31ABA79C215AF9E000C90E31 /* HighPerformanceGPUManager.h */,
- 				31ABA79D215AF9E000C90E31 /* HighPerformanceGPUManager.mm */,
 +				D71A94302370E025002C4D9E /* InspectorPlaywrightAgentClientMac.h */,
 +				D7EB04E62372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm */,
 +				D79902AF236E9404005D6F7E /* InspectorTargetProxyMac.mm */,
  				1AFDE65B1954E8D500C48FFA /* LegacySessionStateCoding.cpp */,
  				0FCB4E5818BBE3D9000FCFC9 /* PageClientImplMac.h */,
  				0FCB4E5918BBE3D9000FCFC9 /* PageClientImplMac.mm */,
-@@ -14815,6 +14877,8 @@
+@@ -15669,6 +15731,8 @@
  				E568B92120A3AC6A00E3C856 /* WebDataListSuggestionsDropdownMac.mm */,
  				E55CD20124D09F1F0042DB9C /* WebDateTimePickerMac.h */,
  				E55CD20224D09F1F0042DB9C /* WebDateTimePickerMac.mm */,
@@ -20156,23 +19194,23 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				BC857E8512B71EBB00EDEB2E /* WebPageProxyMac.mm */,
  				BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */,
  				BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */,
-@@ -15820,6 +15884,7 @@
+@@ -16775,6 +16839,7 @@
  				99788ACB1F421DDA00C08000 /* _WKAutomationSessionConfiguration.h in Headers */,
  				990D28AC1C6420CF00986977 /* _WKAutomationSessionDelegate.h in Headers */,
  				990D28B11C65208D00986977 /* _WKAutomationSessionInternal.h in Headers */,
 +				D71A944A2372290B002C4D9E /* _WKBrowserInspector.h in Headers */,
  				5C4609E7224317B4009943C2 /* _WKContentRuleListAction.h in Headers */,
  				5C4609E8224317BB009943C2 /* _WKContentRuleListActionInternal.h in Headers */,
- 				1A5704F81BE01FF400874AF1 /* _WKContextMenuElementInfo.h in Headers */,
-@@ -16129,6 +16194,7 @@
+ 				9B4CE9512CD99B7C00351173 /* _WKContentWorldConfiguration.h in Headers */,
+@@ -17087,6 +17152,7 @@
  				E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */,
  				4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */,
  				1A5705111BE410E600874AF1 /* BlockSPI.h in Headers */,
 +				D71A944C237239FB002C4D9E /* BrowserInspectorPipe.h in Headers */,
+ 				5CA9854A210BEB640057EB6B /* BrowsingWarning.h in Headers */,
  				A7E69BCC2B2117A100D43D3F /* BufferAndBackendInfo.h in Headers */,
  				BC3065FA1259344E00E71278 /* CacheModel.h in Headers */,
- 				935BF7FC2936BF1A00B41326 /* CacheStorageCache.h in Headers */,
-@@ -16309,7 +16375,11 @@
+@@ -17270,7 +17336,11 @@
  				BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
  				CE550E152283752200D28791 /* InsertTextOptions.h in Headers */,
  				9197940523DBC4BB00257892 /* InspectorBrowserAgent.h in Headers */,
@@ -20184,23 +19222,23 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */,
  				C5BCE5DF1C50766A00CDE3FA /* InteractionInformationAtPosition.h in Headers */,
  				2D4D2C811DF60BF3002EB10C /* InteractionInformationRequest.h in Headers */,
-@@ -16567,6 +16637,7 @@
- 				CDAC20C923FC2F750021DEE3 /* RemoteCDMInstanceSessionIdentifier.h in Headers */,
+@@ -17531,6 +17601,7 @@
+ 				0F6E7C532C4C386800F1DB85 /* RemoteDisplayListRecorderMessages.h in Headers */,
  				F451C0FE2703B263002BA03B /* RemoteDisplayListRecorderProxy.h in Headers */,
  				A78A5FE42B0EB39E005036D3 /* RemoteImageBufferSetIdentifier.h in Headers */,
 +				D71A943A2370F061002C4D9E /* RemoteInspectorPipe.h in Headers */,
  				2D47B56D1810714E003A3AEE /* RemoteLayerBackingStore.h in Headers */,
  				2DDF731518E95060004F5A66 /* RemoteLayerBackingStoreCollection.h in Headers */,
  				1AB16AEA164B3A8800290D62 /* RemoteLayerTreeContext.h in Headers */,
-@@ -16622,6 +16693,7 @@
+@@ -17588,6 +17659,7 @@
  				E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */,
  				E36FF00327F36FBD004BE21A /* SandboxStateVariables.h in Headers */,
  				7BAB111025DD02B3008FC479 /* ScopedActiveMessageReceiveQueue.h in Headers */,
 +				F303B849249A8D640031DE5C /* ScreencastEncoder.h in Headers */,
+ 				6D4DF20C2D824242001F964C /* ScreenTimeWebsiteDataSupport.h in Headers */,
  				463BB93A2B9D08D80098C5C3 /* ScriptMessageHandlerIdentifier.h in Headers */,
- 				E4D54D0421F1D72D007E3C36 /* ScrollingTreeFrameScrollingNodeRemoteIOS.h in Headers */,
- 				0F931C1C18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h in Headers */,
-@@ -16972,6 +17044,8 @@
+ 				F4E28A362C923814008120DD /* ScriptTelemetry.h in Headers */,
+@@ -17950,6 +18022,8 @@
  				939EF87029D112EE00F23AEE /* WebPageInlines.h in Headers */,
  				9197940823DBC4CB00257892 /* WebPageInspectorAgentBase.h in Headers */,
  				A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */,
@@ -20209,29 +19247,64 @@ index 5638e7e7ca660b2bb7c9b3f21dde5f5dfb68dad0..d4c7e4081d7b4c80423e2a406f8471c3
  				A543E30C215C8A8D00279CD9 /* WebPageInspectorTarget.h in Headers */,
  				A543E30D215C8A9000279CD9 /* WebPageInspectorTargetController.h in Headers */,
  				A543E307215AD13700279CD9 /* WebPageInspectorTargetFrontendChannel.h in Headers */,
-@@ -19367,6 +19441,8 @@
+@@ -20613,7 +20687,43 @@
  				522F792928D50EBB0069B45B /* HidService.mm in Sources */,
  				2749F6442146561B008380BF /* InjectedBundleNodeHandle.cpp in Sources */,
  				2749F6452146561E008380BF /* InjectedBundleRangeHandle.cpp in Sources */,
 +				D7EB04E72372A73B00F744CE /* InspectorPlaywrightAgentClientMac.mm in Sources */,
 +				D79902B2236E9404005D6F7E /* InspectorTargetProxyMac.mm in Sources */,
- 				1CC94E532AC92F190045F269 /* JSWebExtensionAPIAction.mm in Sources */,
- 				1C2B4D4B2A819D0D00C528A1 /* JSWebExtensionAPIAlarms.mm in Sources */,
- 				1C8ECFEA2AFC7DCB007BAA62 /* JSWebExtensionAPICommands.mm in Sources */,
-@@ -19807,6 +19883,8 @@
- 				E3816B3D27E2463A005EAFC0 /* WebMockContentFilterManager.cpp in Sources */,
- 				31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */,
- 				2DF6FE52212E110900469030 /* WebPage.cpp in Sources */,
++				1CC94E532AC92F190045F269 /* JSWebExtensionAPIAction.mm in Sources */,
++				1C2B4D4B2A819D0D00C528A1 /* JSWebExtensionAPIAlarms.mm in Sources */,
++				1C8ECFEA2AFC7DCB007BAA62 /* JSWebExtensionAPICommands.mm in Sources */,
++				1C40052C2B2B953D00F2D9EE /* JSWebExtensionAPICookies.mm in Sources */,
++				331102402B17B99800B21C8C /* JSWebExtensionAPIDeclarativeNetRequest.mm in Sources */,
++				1C517F452B74393C00C46EDC /* JSWebExtensionAPIDevTools.mm in Sources */,
++				1C517F432B74393C00C46EDC /* JSWebExtensionAPIDevToolsExtensionPanel.mm in Sources */,
++				1C517F472B74393C00C46EDC /* JSWebExtensionAPIDevToolsInspectedWindow.mm in Sources */,
++				1C517F462B74393C00C46EDC /* JSWebExtensionAPIDevToolsNetwork.mm in Sources */,
++				1C517F412B74393C00C46EDC /* JSWebExtensionAPIDevToolsPanels.mm in Sources */,
++				B6114A7F29394A1600380B1B /* JSWebExtensionAPIEvent.mm in Sources */,
++				1C5DC471290B33A20061EC62 /* JSWebExtensionAPIExtension.mm in Sources */,
++				B6CCAAB929A445E90092E846 /* JSWebExtensionAPILocalization.mm in Sources */,
++				1CCEE4532B0989FC0034E059 /* JSWebExtensionAPIMenus.mm in Sources */,
++				1C5DC4552908AC900061EC62 /* JSWebExtensionAPINamespace.mm in Sources */,
++				1C386F362AF409F9004108F0 /* JSWebExtensionAPINotifications.mm in Sources */,
++				B61AFA4929510D0F008220B1 /* JSWebExtensionAPIPermissions.mm in Sources */,
++				1C9A15CF2ABDF1E2002CC12A /* JSWebExtensionAPIPort.mm in Sources */,
++				1C5DC472290B33A60061EC62 /* JSWebExtensionAPIRuntime.mm in Sources */,
++				B63E9A6F2AAF2B2D005F4561 /* JSWebExtensionAPIScripting.mm in Sources */,
++				029D6BB22C407AA30068CF99 /* JSWebExtensionAPISidebarAction.mm in Sources */,
++				029D6BB12C407AA30068CF99 /* JSWebExtensionAPISidePanel.mm in Sources */,
++				B63C10342B51C0B6004A69B8 /* JSWebExtensionAPIStorage.mm in Sources */,
++				B63C10372B51C102004A69B8 /* JSWebExtensionAPIStorageArea.mm in Sources */,
++				1C5ACFAB2A96F8D500C041C0 /* JSWebExtensionAPITabs.mm in Sources */,
++				1C15497F2926C073001B9E5B /* JSWebExtensionAPITest.mm in Sources */,
+ 				1C0F05BE2CFA5D2E007D1F62 /* JSWebExtensionAPIUnified.mm in Sources */,
++				3375A3772942A19D0028536D /* JSWebExtensionAPIWebNavigation.mm in Sources */,
++				33F68338293FF6F5005C63C0 /* JSWebExtensionAPIWebNavigationEvent.mm in Sources */,
++				B63A99772B7EA002004611FD /* JSWebExtensionAPIWebPageNamespace.mm in Sources */,
++				B63A99782B7EA002004611FD /* JSWebExtensionAPIWebPageRuntime.mm in Sources */,
++				3399E1532B59EFD7008BFB60 /* JSWebExtensionAPIWebRequest.mm in Sources */,
++				337042022B58A0B70077FF78 /* JSWebExtensionAPIWebRequestEvent.mm in Sources */,
++				1C5ACFA62A96F8C400C041C0 /* JSWebExtensionAPIWindows.mm in Sources */,
++				1C5ACFA72A96F8C400C041C0 /* JSWebExtensionAPIWindowsEvent.mm in Sources */,
+ 				1C5DC45F2909B05A0061EC62 /* JSWebExtensionWrapperCocoa.mm in Sources */,
+ 				C14D37FE24ACE086007FF014 /* LaunchServicesDatabaseManager.mm in Sources */,
+ 				C1710CF724AA643200D7C112 /* LaunchServicesDatabaseObserver.mm in Sources */,
+@@ -21013,6 +21123,8 @@
+ 				074E87E12CF8EA3D0059E469 /* WebPage+NavigationDeciding.swift in Sources */,
+ 				078B04A02CF18EAB00B453A6 /* WebPage+NavigationPreferences.swift in Sources */,
+ 				07CB79962CE9435700199C49 /* WebPage.swift in Sources */,
 +				D79902B1236E9404005D6F7E /* WebPageInspectorEmulationAgentMac.mm in Sources */,
 +				D79902B3236E9404005D6F7E /* WebPageInspectorInputAgentMac.mm in Sources */,
- 				C0CE72A01247E71D00BC0EC4 /* WebPageMessageReceiver.cpp in Sources */,
- 				BCBD3914125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp in Sources */,
  				7CE9CE101FA0767A000177DE /* WebPageUpdatePreferences.cpp in Sources */,
+ 				079A4DA12D72CC0D00CA387F /* WebPageWebView.swift in Sources */,
+ 				CA2506A82DD65327001D1954 /* WebPageWebViewAdditions.swift in Sources */,
 diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450257bd2fb 100644
+index bd3aaaf9309aec01820d0950d3b6f14a23c6076c..8cdb9a0c339c0499034fa801395367dd62346268 100644
 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
 +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
-@@ -229,6 +229,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+@@ -271,6 +271,11 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
      }
  #endif
  
@@ -20243,18 +19316,44 @@ index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450
  #if ENABLE(PDFJS)
      if (tryLoadingUsingPDFJSHandler(resourceLoader, trackingParameters))
          return;
-@@ -360,7 +365,8 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
+@@ -285,12 +290,16 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
+     }
+ 
+     if (InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader)) {
+-        InspectorInstrumentationWebKit::interceptRequest(resourceLoader, [this, protectedThis = Ref { *this }, protectedResourceLoader = Ref { resourceLoader }, trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, resource](const ResourceRequest& request) {
+-            auto& resourceLoader = protectedResourceLoader.get();
+-            WEBLOADERSTRATEGY_RELEASE_LOG("scheduleLoad: intercepted URL will be scheduled with the NetworkProcess");
+-            scheduleLoadFromNetworkProcess(resourceLoader, request, *trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime(resource));
+-        });
+-        return;
++        bool isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate;
++        // Do not intercept navigation request which could already have been intercepted and resumed.
++        if (!(isMainFrameNavigation && m_existingNetworkResourceLoadIdentifierToResume)) {
++            InspectorInstrumentationWebKit::interceptRequest(resourceLoader, [this, protectedThis = Ref { *this }, protectedResourceLoader = Ref { resourceLoader }, trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, resource](const ResourceRequest& request) {
++                auto& resourceLoader = protectedResourceLoader.get();
++                WEBLOADERSTRATEGY_RELEASE_LOG("scheduleLoad: intercepted URL will be scheduled with the NetworkProcess");
++                scheduleLoadFromNetworkProcess(resourceLoader, request, *trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime(resource));
++            });
++            return;
++        }
+     }
+ 
+     WEBLOADERSTRATEGY_RELEASE_LOG_FORWARDABLE(WEBLOADERSTRATEGY_SCHEDULELOAD);
+@@ -415,7 +424,7 @@ static void addParametersShared(const LocalFrame* frame, NetworkResourceLoadPara
          parameters.linkPreconnectEarlyHintsEnabled = mainFrame->settings().linkPreconnectEarlyHintsEnabled();
  }
  
 -void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceLoader, const ResourceRequest& request, const WebResourceLoader::TrackingParameters& trackingParameters, bool shouldClearReferrerOnHTTPSToHTTPRedirect, Seconds maximumBufferingTime)
-+// static
 +bool WebLoaderStrategy::fillParametersForNetworkProcessLoad(ResourceLoader& resourceLoader, const ResourceRequest& request, const WebResourceLoader::TrackingParameters& trackingParameters, bool shouldClearReferrerOnHTTPSToHTTPRedirect, Seconds maximumBufferingTime, NetworkResourceLoadParameters& loadParameters)
  {
-     auto identifier = resourceLoader.identifier();
-     ASSERT(identifier);
-@@ -376,7 +382,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
-             RunLoop::main().dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
+     auto identifier = *resourceLoader.identifier();
+ 
+@@ -427,10 +436,10 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+             && resourceLoader.frameLoader()->notifier().isInitialRequestIdentifier(identifier)
+             ? MainFrameMainResource::Yes : MainFrameMainResource::No;
+         if (!page->allowsLoadFromURL(request.url(), mainFrameMainResource)) {
+-            RunLoop::protectedMain()->dispatch([resourceLoader = Ref { resourceLoader }, error = blockedError(request)] {
++            RunLoop::protectedMain()->dispatch([resourceLoader = Ref { resourceLoader }, error = platformStrategies()->loaderStrategy()->blockedError(request)] {
                  resourceLoader->didFail(error);
              });
 -            return;
@@ -20262,15 +19361,22 @@ index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450
          }
      }
  
-@@ -386,7 +392,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+@@ -440,14 +449,6 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
  
      LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %d, storedCredentialsPolicy %i", resourceLoader.url().string().latin1().data(), static_cast<int>(resourceLoader.request().priority()), (int)storedCredentialsPolicy);
  
--    NetworkResourceLoadParameters loadParameters;
+-    NetworkResourceLoadParameters loadParameters {
+-        trackingParameters.webPageProxyID,
+-        trackingParameters.pageID,
+-        trackingParameters.frameID,
+-        request
+-    };
+-    loadParameters.createSandboxExtensionHandlesIfNecessary();
+-
      loadParameters.identifier = identifier;
-     loadParameters.webPageProxyID = trackingParameters.webPageProxyID;
-     loadParameters.webPageID = trackingParameters.pageID;
-@@ -476,14 +481,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+     loadParameters.parentPID = legacyPresentingApplicationPID();
+     loadParameters.contentSniffingPolicy = contentSniffingPolicy;
+@@ -531,14 +532,11 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
  
      if (loadParameters.options.mode != FetchOptions::Mode::Navigate) {
          ASSERT(loadParameters.sourceOrigin);
@@ -20284,38 +19390,46 @@ index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450
      }
  
 -    loadParameters.shouldRestrictHTTPResponseAccess = shouldPerformSecurityChecks();
-+    loadParameters.shouldRestrictHTTPResponseAccess = DeprecatedGlobalSettings::restrictedHTTPResponseAccess();
++    loadParameters.shouldRestrictHTTPResponseAccess = true;
  
      loadParameters.isMainFrameNavigation = isMainFrameNavigation;
      if (loadParameters.isMainFrameNavigation && document)
-@@ -525,6 +527,17 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
-     }
+@@ -585,6 +583,25 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+     if (RefPtr frameLoader = resourceLoader.frameLoader())
+         loadParameters.requiredCookiesVersion = frameLoader->requiredCookiesVersion();
  
-     ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials);
 +    return true;
 +}
 +
 +void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceLoader, const ResourceRequest& request, const WebResourceLoader::TrackingParameters& trackingParameters, bool shouldClearReferrerOnHTTPSToHTTPRedirect, Seconds maximumBufferingTime)
 +{
-+    NetworkResourceLoadParameters loadParameters;
++    NetworkResourceLoadParameters loadParameters {
++        trackingParameters.webPageProxyID,
++        trackingParameters.pageID,
++        trackingParameters.frameID,
++        request
++    };
++    loadParameters.createSandboxExtensionHandlesIfNecessary();
++
 +    if (!fillParametersForNetworkProcessLoad(resourceLoader, request, trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime, loadParameters)) {
 +        WEBLOADERSTRATEGY_RELEASE_LOG_ERROR("scheduleLoad: no sourceOrigin (priority=%d)", static_cast<int>(resourceLoader.request().priority()));
 +        scheduleInternallyFailedLoad(resourceLoader);
 +        return;
 +    }
- 
++
      std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume;
      if (loadParameters.isMainFrameNavigation)
-@@ -540,7 +553,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
+         existingNetworkResourceLoadIdentifierToResume = std::exchange(m_existingNetworkResourceLoadIdentifierToResume, std::nullopt);
+@@ -599,7 +616,7 @@ void WebLoaderStrategy::scheduleLoadFromNetworkProcess(ResourceLoader& resourceL
      }
  
      auto loader = WebResourceLoader::create(resourceLoader, trackingParameters);
 -    m_webResourceLoaders.set(identifier, WTFMove(loader));
-+    m_webResourceLoaders.set(resourceLoader.identifier(), WTFMove(loader));
++    m_webResourceLoaders.set(*resourceLoader.identifier(), WTFMove(loader));
  }
  
  void WebLoaderStrategy::scheduleInternallyFailedLoad(WebCore::ResourceLoader& resourceLoader)
-@@ -950,7 +963,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
+@@ -1017,7 +1034,7 @@ void WebLoaderStrategy::didFinishPreconnection(WebCore::ResourceLoaderIdentifier
  
  bool WebLoaderStrategy::isOnLine() const
  {
@@ -20324,7 +19438,7 @@ index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450
  }
  
  void WebLoaderStrategy::addOnlineStateChangeListener(Function<void(bool)>&& listener)
-@@ -977,6 +990,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
+@@ -1044,6 +1061,11 @@ void WebLoaderStrategy::isResourceLoadFinished(CachedResource& resource, Complet
  
  void WebLoaderStrategy::setOnLineState(bool isOnLine)
  {
@@ -20336,7 +19450,7 @@ index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450
      if (m_isOnLine == isOnLine)
          return;
  
-@@ -985,6 +1003,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
+@@ -1052,6 +1074,12 @@ void WebLoaderStrategy::setOnLineState(bool isOnLine)
          listener(isOnLine);
  }
  
@@ -20350,28 +19464,28 @@ index 0ab7a191b4d1b35579666f381f87d8a3995e3501..bfd50e5c4f82ad02d9a96afb9a297450
  {
      WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCaptureExtraNetworkLoadMetricsEnabled(enabled), 0);
 diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
-index 3ef86cc236b8acee2fbe5d0b9c3fd755fcc9f06f..75951fc0fc5e4ef566582c0a494827933ac8bfd1 100644
+index 6492031de6ed6effab3f28e5321419f3390f7651..678139fc26f26e2224a70b0087ddb849280b8ace 100644
 --- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
 +++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h
-@@ -42,6 +42,7 @@ struct FetchOptions;
- namespace WebKit {
+@@ -26,6 +26,7 @@
+ #pragma once
  
- class NetworkProcessConnection;
-+class NetworkResourceLoadParameters;
- class WebFrame;
- class WebPage;
- class WebURLSchemeTaskProxy;
-@@ -89,6 +90,9 @@ public:
+ #include "NetworkResourceLoadIdentifier.h"
++#include "NetworkResourceLoadParameters.h"
+ #include "WebResourceLoader.h"
+ #include <WebCore/LoaderStrategy.h>
+ #include <WebCore/ResourceError.h>
+@@ -96,6 +97,9 @@ public:
      bool isOnLine() const final;
      void addOnlineStateChangeListener(Function<void(bool)>&&) final;
      void setOnLineState(bool);
 +    void setEmulateOfflineState(bool) final;
 +
-+    static bool fillParametersForNetworkProcessLoad(WebCore::ResourceLoader&, const WebCore::ResourceRequest&, const WebResourceLoader::TrackingParameters&, bool shouldClearReferrerOnHTTPSToHTTPRedirect, Seconds maximumBufferingTime, NetworkResourceLoadParameters&);
++    bool fillParametersForNetworkProcessLoad(WebCore::ResourceLoader&, const WebCore::ResourceRequest&, const WebResourceLoader::TrackingParameters&, bool shouldClearReferrerOnHTTPSToHTTPRedirect, Seconds maximumBufferingTime, NetworkResourceLoadParameters&);
  
      void setExistingNetworkResourceLoadIdentifierToResume(std::optional<NetworkResourceLoadIdentifier> existingNetworkResourceLoadIdentifierToResume) { m_existingNetworkResourceLoadIdentifierToResume = existingNetworkResourceLoadIdentifierToResume; }
  
-@@ -141,6 +145,7 @@ private:
+@@ -164,6 +168,7 @@ private:
      Vector<Function<void(bool)>> m_onlineStateChangeListeners;
      std::optional<NetworkResourceLoadIdentifier> m_existingNetworkResourceLoadIdentifierToResume;
      bool m_isOnLine { true };
@@ -20380,20 +19494,20 @@ index 3ef86cc236b8acee2fbe5d0b9c3fd755fcc9f06f..75951fc0fc5e4ef566582c0a49482793
  
  } // namespace WebKit
 diff --git a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-index ee6ed68f57ac7205087c7f0abe59fb56ee0fa012..9d81ae6dff0ab154a0665d6430be58affae6d820 100644
+index ce50de02306dfe542299fbb9e534a6db929b8052..5c0a3215a78f3fdcf19fd8bb56c2a9c5596240ed 100644
 --- a/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
 +++ b/Source/WebKit/WebProcess/Network/WebResourceLoader.cpp
-@@ -189,9 +189,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
-             }
+@@ -202,9 +202,6 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
  
-             m_coreLoader->didReceiveResponse(inspectorResponse, [this, protectedThis = WTFMove(protectedThis), interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable {
+             coreLoader->didReceiveResponse(ResourceResponse { inspectorResponse }, [this, protectedThis = Ref { *this }, interceptedRequestIdentifier, policyDecisionCompletionHandler = WTFMove(policyDecisionCompletionHandler), overrideData = WTFMove(overrideData)]() mutable {
+                 RefPtr coreLoader = m_coreLoader;
 -                if (policyDecisionCompletionHandler)
 -                    policyDecisionCompletionHandler();
 -
-                 if (!m_coreLoader || !m_coreLoader->identifier()) {
+                 if (!m_coreLoader || !coreLoader->identifier()) {
                      m_interceptController.continueResponse(interceptedRequestIdentifier);
                      return;
-@@ -209,6 +206,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
+@@ -221,6 +218,8 @@ void WebResourceLoader::didReceiveResponse(ResourceResponse&& response, PrivateR
                  }
              });
          });
@@ -20402,83 +19516,38 @@ index ee6ed68f57ac7205087c7f0abe59fb56ee0fa012..9d81ae6dff0ab154a0665d6430be58af
          return;
      }
  
-diff --git a/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp b/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
-index ee9c3c4f48c328daaa015e2122235e51349bd999..5b3a4d3e742147195e0ff9e88176759df1b799db 100644
---- a/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
-+++ b/Source/WebKit/WebProcess/Notifications/NotificationPermissionRequestManager.cpp
-@@ -85,7 +85,7 @@ void NotificationPermissionRequestManager::startRequest(const SecurityOriginData
- 
-     m_page->sendWithAsyncReply(Messages::WebPageProxy::RequestNotificationPermission(securityOrigin.toString()), [this, protectedThis = Ref { *this }, securityOrigin, permissionHandler = WTFMove(permissionHandler)](bool allowed) mutable {
- 
--        auto innerPermissionHandler = [this, protectedThis = Ref { *this }, securityOrigin, permissionHandler = WTFMove(permissionHandler)] (bool allowed) mutable {
-+        auto innerPermissionHandler = [this, protectedThis, securityOrigin, permissionHandler = WTFMove(permissionHandler)] (bool allowed) mutable {
-             WebProcess::singleton().supplement<WebNotificationManager>()->didUpdateNotificationDecision(securityOrigin.toString(), allowed);
- 
-             auto permissionHandlers = m_requestsPerOrigin.take(securityOrigin);
 diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-index 3fa53c3e4977dcc0b83d48091490c2261ed785e0..bef114c5988a88eaca305287471c55515fc22ff6 100644
+index 78e75b9ebfa13611e7f2f9df4395a586ed9db55e..ad6db691640a56bba7fb153bd4a71eb6b618bb50 100644
 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
 +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
-@@ -468,6 +468,8 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
- {
-     // Notify the bundle client.
-     auto page = protectedPage();
+@@ -532,6 +532,9 @@ void WebChromeClient::addMessageToConsole(MessageSource source, MessageLevel lev
+     if (!page)
+         return;
+ 
 +    if (level == MessageLevel::Error)
 +        page->send(Messages::WebPageProxy::LogToStderr(message));
-     page->injectedBundleUIClient().willAddMessageToConsole(page.ptr(), source, level, message, lineNumber, columnNumber, sourceID);
- }
++
+     // FIXME: Remove this after rdar://143399667 is fixed.
+     page->injectedBundleUIClient().willAddMessageToConsole(page.get(), source, level, message, lineNumber, columnNumber, sourceID);
  
 diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
-index 2eb0886f13ed035a53b8eaa60605de4dfe53fbe3..0f6a539f00a42149c0f2b2237a9cbdd8334459d6 100644
+index 2f5b6d189eae2e153847cbf8496805a2660d1105..837f71ee8d9e0b0fb8ae1841f6820431f592dfd8 100644
 --- a/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
 +++ b/Source/WebKit/WebProcess/WebCoreSupport/WebDragClient.cpp
-@@ -29,6 +29,13 @@
- #if ENABLE(DRAG_SUPPORT)
- 
- #include "WebPage.h"
-+#include <WebCore/DataTransfer.h>
-+#include <WebCore/Pasteboard.h>
-+#include <WebCore/ShareableBitmap.h>
-+
-+#if PLATFORM(WPE)
-+#include "ArgumentCodersWPE.h"
-+#endif
- 
- namespace WebKit {
- using namespace WebCore;
-@@ -50,7 +57,7 @@ OptionSet<DragSourceAction> WebDragClient::dragSourceActionMaskForPoint(const In
+@@ -53,7 +53,7 @@ OptionSet<DragSourceAction> WebDragClient::dragSourceActionMaskForPoint(const In
      return m_page->allowedDragSourceActions();
  }
  
 -#if !PLATFORM(COCOA) && !PLATFORM(GTK)
 +#if !PLATFORM(COCOA) && !PLATFORM(GTK) && !PLATFORM(WPE) && !PLATFORM(WIN)
- void WebDragClient::startDrag(DragItem, DataTransfer&, Frame&)
+ void WebDragClient::startDrag(DragItem, DataTransfer&, Frame&, const std::optional<ElementIdentifier>&)
  {
  }
-diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp
-index 7b9b0348c1a3b606ad31b3fe2df3eedcb64cf233..97a6a56cc8427bd3eadfacc8fd5c4f15d5bfcdf7 100644
---- a/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp
-+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebLocalFrameLoaderClient.cpp
-@@ -1592,14 +1592,6 @@ void WebLocalFrameLoaderClient::transitionToCommittedForNewPage(InitializingIfra
- 
-     if (initializingIframe == InitializingIframe::No)
-         webPage->scheduleFullEditorStateUpdate();
--
--#if USE(COORDINATED_GRAPHICS)
--    if (shouldUseFixedLayout) {
--        view->setDelegatedScrollingMode(shouldUseFixedLayout ? DelegatedScrollingMode::DelegatedToNativeScrollView : DelegatedScrollingMode::NotDelegated);
--        view->setPaintsEntireContents(shouldUseFixedLayout);
--        return;
--    }
--#endif
- }
- 
- void WebLocalFrameLoaderClient::didRestoreFromBackForwardCache()
 diff --git a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
-index 69b851554679018aefe2c22b79671f7796d9e8b8..50e985ded3cdc9aaa5f30f7776c29cbc23c2b2b8 100644
+index cf8aa32077a57057649722d73358ac91b7130551..b555eb998bab677a452c37e78935ea9bad2196fc 100644
 --- a/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
 +++ b/Source/WebKit/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
-@@ -129,7 +129,8 @@ static WebCore::CachedImage* cachedImage(Element& element)
+@@ -128,7 +128,8 @@ static WebCore::CachedImage* cachedImage(Element& element)
  
  void WebDragClient::declareAndWriteDragImage(const String& pasteboardName, Element& element, const URL& url, const String& label, LocalFrame*)
  {
@@ -20490,7 +19559,7 @@ index 69b851554679018aefe2c22b79671f7796d9e8b8..50e985ded3cdc9aaa5f30f7776c29cbc
  
 diff --git a/Source/WebKit/WebProcess/WebCoreSupport/win/WebDragClientWin.cpp b/Source/WebKit/WebProcess/WebCoreSupport/win/WebDragClientWin.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..66972b66094050b2429a927861ff7d0d30925ef0
+index 0000000000000000000000000000000000000000..2d2ab369bfc1b42695dbc207e1d6e05deb16990f
 --- /dev/null
 +++ b/Source/WebKit/WebProcess/WebCoreSupport/win/WebDragClientWin.cpp
 @@ -0,0 +1,58 @@
@@ -20524,17 +19593,17 @@ index 0000000000000000000000000000000000000000..66972b66094050b2429a927861ff7d0d
 +
 +#if ENABLE(DRAG_SUPPORT)
 +
-+//#include "ArgumentCodersWPE.h"
 +#include "MessageSenderInlines.h"
 +#include "WebPage.h"
 +#include "WebPageProxyMessages.h"
 +#include <WebCore/DataTransfer.h>
 +#include <WebCore/DragData.h>
++#include <WebCore/ElementIdentifier.h>
 +#include <WebCore/Pasteboard.h>
 +#include <WebCore/ShareableBitmap.h>
 +#include <wtf/win/GDIObject.h>
 +
-+//#include <WebCore/SelectionData.h>
++#include <optional>
 +
 +namespace WebKit {
 +using namespace WebCore;
@@ -20543,7 +19612,7 @@ index 0000000000000000000000000000000000000000..66972b66094050b2429a927861ff7d0d
 +{
 +}
 +
-+void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame& frame)
++void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame& frame, const std::optional<ElementIdentifier>&)
 +{
 +    m_page->willStartDrag();
 +    m_page->send(Messages::WebPageProxy::StartDrag(dataTransfer.pasteboard().createDragDataMap()));
@@ -20554,10 +19623,10 @@ index 0000000000000000000000000000000000000000..66972b66094050b2429a927861ff7d0d
 +#endif // ENABLE(DRAG_SUPPORT)
 diff --git a/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp
 new file mode 100644
-index 0000000000000000000000000000000000000000..4fa6b70b978998849950d1fe4d9f902ede155956
+index 0000000000000000000000000000000000000000..d069b5eba1a64add1a2c370f8d519826ec7be213
 --- /dev/null
 +++ b/Source/WebKit/WebProcess/WebCoreSupport/wpe/WebDragClientWPE.cpp
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2011 Igalia S.L.
 + *
@@ -20588,15 +19657,17 @@ index 0000000000000000000000000000000000000000..4fa6b70b978998849950d1fe4d9f902e
 +
 +#if ENABLE(DRAG_SUPPORT)
 +
-+#include "ArgumentCodersWPE.h"
 +#include "WebPage.h"
 +#include "WebPageProxyMessages.h"
 +#include <WebCore/DataTransfer.h>
 +#include <WebCore/DragData.h>
++#include <WebCore/ElementIdentifier.h>
 +#include <WebCore/Pasteboard.h>
 +#include <WebCore/SelectionData.h>
 +#include <WebCore/ShareableBitmap.h>
 +
++#include <optional>
++
 +namespace WebKit {
 +using namespace WebCore;
 +
@@ -20604,130 +19675,43 @@ index 0000000000000000000000000000000000000000..4fa6b70b978998849950d1fe4d9f902e
 +{
 +}
 +
-+void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame&)
++void WebDragClient::startDrag(DragItem, DataTransfer& dataTransfer, Frame&, const std::optional<ElementIdentifier>&)
 +{
 +    m_page->willStartDrag();
 +
 +    std::optional<ShareableBitmap::Handle> handle;
 +    m_page->send(Messages::WebPageProxy::StartDrag(dataTransfer.pasteboard().selectionData(), dataTransfer.sourceOperationMask(), WTFMove(handle), dataTransfer.dragLocation()));
 +}
-+
-+}; // namespace WebKit.
-+
-+#endif // ENABLE(DRAG_SUPPORT)
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-index 6780fb04b94241977df3396ffb77585f10faf035..db015c88e2b3413c9fde348779b62c90896ba09c 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
-@@ -39,6 +39,7 @@
- #include "WebPreferencesKeys.h"
- #include "WebProcess.h"
- #include <WebCore/GraphicsContext.h>
-+#include <WebCore/InspectorController.h>
- #include <WebCore/LocalFrame.h>
- #include <WebCore/LocalFrameView.h>
- #include <WebCore/Page.h>
-@@ -103,6 +104,16 @@ void DrawingAreaCoordinatedGraphics::scroll(const IntRect& scrollRect, const Int
-         ASSERT(m_scrollRect.isEmpty());
-         ASSERT(m_scrollOffset.isEmpty());
-         ASSERT(m_dirtyRegion.isEmpty());
-+// Playwright begin
-+#if !PLATFORM(WIN)
-+        if (m_webPage->mainFrameView() && m_webPage->mainFrameView()->useFixedLayout()) {
-+            IntRect visibleRect = IntRect(m_layerTreeHost->viewportController().visibleContentsRect());
-+            visibleRect.move(-scrollDelta.width(), -scrollDelta.height());
-+            m_layerTreeHost->scrollNonCompositedContents(visibleRect);
-+            return;
-+        }
-+#endif
-+// Playwright end
-         m_layerTreeHost->scrollNonCompositedContents(scrollRect);
-         return;
-     }
-@@ -562,6 +573,11 @@ void DrawingAreaCoordinatedGraphics::enterAcceleratedCompositingMode(GraphicsLay
-     m_scrollOffset = IntSize();
-     m_displayTimer.stop();
-     m_isWaitingForDidUpdate = false;
-+// Playwright begin
-+#if PLATFORM(WIN)
-+    didChangeAcceleratedCompositingMode(true);
-+#endif
-+// Playwright end
- }
- 
- void DrawingAreaCoordinatedGraphics::sendEnterAcceleratedCompositingModeIfNeeded()
-@@ -619,6 +635,11 @@ void DrawingAreaCoordinatedGraphics::exitAcceleratedCompositingMode()
-         // UI process, we still need to let it know about the new contents, so send an Update message.
-         send(Messages::DrawingAreaProxy::Update(0, WTFMove(updateInfo)));
-     }
-+// Playwright begin
-+#if PLATFORM(WIN)
-+    didChangeAcceleratedCompositingMode(false);
-+#endif
-+// Playwright end
- }
- 
- void DrawingAreaCoordinatedGraphics::scheduleDisplay()
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
-index d453fc33b2a366e4944b48c47bbe056d508124e7..4b58d67c55ebcde8598a1045cbc99202bf6f8feb 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp
-@@ -193,8 +193,16 @@ void LayerTreeHost::setViewOverlayRootLayer(GraphicsLayer* viewOverlayRootLayer)
- void LayerTreeHost::scrollNonCompositedContents(const IntRect& rect)
- {
-     auto* frameView = m_webPage.localMainFrameView();
-+
-+// Playwright begin
-+#if PLATFORM(WIN)
-     if (!frameView || !frameView->delegatesScrolling())
-+        return
-+#else
-+    if (!frameView)
-         return;
-+#endif
-+// Playwright end
- 
-     m_viewportController.didScroll(rect.location());
-     didChangeViewport();
-@@ -273,6 +281,7 @@ GraphicsLayerFactory* LayerTreeHost::graphicsLayerFactory()
- void LayerTreeHost::contentsSizeChanged(const IntSize& newSize)
- {
-     m_viewportController.didChangeContentsSize(newSize);
-+    didChangeViewport();
- }
- 
- void LayerTreeHost::didChangeViewportAttributes(ViewportAttributes&& attr)
-@@ -312,6 +321,10 @@ void LayerTreeHost::didChangeViewport()
- 
-         if (!view->useFixedLayout())
-             view->notifyScrollPositionChanged(m_lastScrollPosition);
-+// Playwright begin
-+        else
-+            m_viewportController.didScroll(m_lastScrollPosition);
-+// Playwright end
-     }
- 
-     if (m_lastPageScaleFactor != pageScale) {
++
++}; // namespace WebKit.
++
++#endif // ENABLE(DRAG_SUPPORT)
+diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
+index 5fed15fd5dbbfbaff305ce26a8bcf5ba3d0435d9..fec04b9a4d640dcf47e0a2312d8b71234bf10d09 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
+@@ -39,6 +39,7 @@
+ #include "WebPreferencesKeys.h"
+ #include "WebProcess.h"
+ #include <WebCore/GraphicsContext.h>
++#include <WebCore/InspectorController.h>
+ #include <WebCore/LocalFrame.h>
+ #include <WebCore/LocalFrameView.h>
+ #include <WebCore/Page.h>
 diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 40926ecda30b9f7cdb4d1908436b1af4353999a4..2fa2c6363cfedd3dac46692cc6c8642752ec728f 100644
+index 31af5390779e2ec5f3bc3dc0bbddf56f2617657a..df7af98f4d38f380ee5c0b607570659260a955e0 100644
 --- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
 +++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -115,6 +115,13 @@ public:
+@@ -145,6 +145,7 @@ public:
  #if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM)
      void preferredBufferFormatsDidChange();
  #endif
-+
-+// Playwright begin
-+#if USE(COORDINATED_GRAPHICS)
-+    const SimpleViewportController& viewportController() const { return m_viewportController; }
-+#endif
-+// Playwright end
 +
  private:
- #if USE(COORDINATED_GRAPHICS)
-     void layerFlushTimerFired();
+     void updateRootLayer();
+     WebCore::FloatRect visibleContentsRect() const;
 diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
-index 94bbead87936ab599f79c3c08b260cad939aea62..5099d3d7bdf220aa5c8f3729a04397ec38cfed05 100644
+index c07ca9e847d03c27877cf650b67b96b3c3f7bddb..b966edc8778d4a68c6e5bae0c0883ab3bfd0a387 100644
 --- a/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
 +++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp
 @@ -27,6 +27,7 @@
@@ -20738,36 +19722,8 @@ index 94bbead87936ab599f79c3c08b260cad939aea62..5099d3d7bdf220aa5c8f3729a04397ec
  #include "Logging.h"
  #include "WebPage.h"
  #include "WebPageCreationParameters.h"
-@@ -112,6 +113,13 @@ void DrawingArea::tryMarkLayersVolatile(CompletionHandler<void(bool)>&& completi
-     completionFunction(true);
- }
- 
-+#if PLATFORM(WIN)
-+void DrawingArea::didChangeAcceleratedCompositingMode(bool enabled)
-+{
-+    send(Messages::DrawingAreaProxy::DidChangeAcceleratedCompositingMode(enabled));
-+}
-+#endif
-+
- void DrawingArea::removeMessageReceiverIfNeeded()
- {
-     if (m_hasRemovedMessageReceiver)
-diff --git a/Source/WebKit/WebProcess/WebPage/DrawingArea.h b/Source/WebKit/WebProcess/WebPage/DrawingArea.h
-index e61851e273de92fc97b7707c4427b4d03cd2df70..d1e0850461624188febc8a477e6d3d6bc44fee50 100644
---- a/Source/WebKit/WebProcess/WebPage/DrawingArea.h
-+++ b/Source/WebKit/WebProcess/WebPage/DrawingArea.h
-@@ -164,6 +164,9 @@ public:
-     virtual bool enterAcceleratedCompositingModeIfNeeded() = 0;
-     virtual void backgroundColorDidChange() { };
- #endif
-+#if PLATFORM(WIN)
-+    void didChangeAcceleratedCompositingMode(bool enabled);
-+#endif
- 
- #if PLATFORM(WPE) && USE(GBM) && ENABLE(WPE_PLATFORM)
-     virtual void preferredBufferFormatsDidChange() { }
 diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
-index 935edefd61482ee2b268415ed24f7e2639bdbe35..8ec21eb117958c455ea4772907dd4e3afe0c1fcc 100644
+index 412dd3c46cb61ec5f3de076de61c34b6a32c6281..77c02eedfb60a7f816788452e20aaf3fbc434164 100644
 --- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
 +++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp
 @@ -44,6 +44,7 @@
@@ -20775,10 +19731,10 @@ index 935edefd61482ee2b268415ed24f7e2639bdbe35..8ec21eb117958c455ea4772907dd4e3a
  #include <WebCore/LocalFrameLoaderClient.h>
  #include <WebCore/Page.h>
 +#include <WebCore/ResourceLoader.h>
+ #include <WebCore/ScriptTelemetryCategory.h>
  #include <WebCore/Settings.h>
  #include <WebCore/StorageSessionProvider.h>
- #include <optional>
-@@ -393,6 +394,12 @@ void WebCookieJar::removeChangeListener(const String& host, const WebCore::Cooki
+@@ -447,6 +448,12 @@ void WebCookieJar::setOptInCookiePartitioningEnabled(bool enabled)
  }
  #endif
  
@@ -20792,138 +19748,100 @@ index 935edefd61482ee2b268415ed24f7e2639bdbe35..8ec21eb117958c455ea4772907dd4e3a
  
  String WebCookieJar::cookiesInPartitionedCookieStorage(const WebCore::Document&, const URL&, const WebCore::SameSiteInfo&) const
 diff --git a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
-index b6e5283f51db82b60091320df44ef0bbf20c33c6..0d82fbb98b93e760cecf5fa7a41327d0473f8a03 100644
+index d5bac4fe6d5103b4e752a7219d7870d4cddcaf27..033effbb445f5da6db5798594e2dbef34afec363 100644
 --- a/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
 +++ b/Source/WebKit/WebProcess/WebPage/WebCookieJar.h
-@@ -74,6 +74,8 @@ public:
+@@ -77,6 +77,8 @@ public:
  
      void clearCache() final;
  
 +    void setCookieFromResponse(WebCore::ResourceLoader&, const String& setCookieValue);
 +
- private:
-     WebCookieJar();
- 
+ #if HAVE(ALLOW_ONLY_PARTITIONED_COOKIES)
+     void setOptInCookiePartitioningEnabled(bool);
+ #endif
 diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-index 36ca16c66c74db2f7d4b2a4938e7714b5ef49ca1..821029c298841fc1408f80579d43ec7c8d54faad 100644
+index eebb80386522babc1ae192dbc470facea0b76e6b..02da88a1fd0d655faf69c7d3bd348009da32851c 100644
 --- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp
 +++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp
-@@ -1034,6 +1034,9 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
+@@ -244,6 +244,7 @@
+ #include <WebCore/ImageAnalysisQueue.h>
+ #include <WebCore/ImageOverlay.h>
+ #include <WebCore/InspectorController.h>
++#include <WebCore/InspectorInstrumentationWebKit.h>
+ #include <WebCore/JSDOMExceptionHandling.h>
+ #include <WebCore/KeyboardEvent.h>
+ #include <WebCore/LegacySchemeRegistry.h>
+@@ -1165,6 +1166,12 @@ WebPage::WebPage(PageIdentifier pageID, WebPageCreationParameters&& parameters)
+     setLinkDecorationFilteringData(WTFMove(parameters.linkDecorationFilteringData));
+     setAllowedQueryParametersForAdvancedPrivacyProtections(WTFMove(parameters.allowedQueryParametersForAdvancedPrivacyProtections));
  #endif
- #endif // HAVE(SANDBOX_STATE_FLAGS)
- 
++    // For popup windows WebPage::Show() maybe called in the next lines from the constructor,
++    // at which point the page is not in the WebProcess's map yet and it is not safe to
++    // dispatch nested message loop and receive IPC messages. To mitigate that, the actual
++    // pause is postponed until the page is added to the map.
 +    if (parameters.shouldPauseInInspectorWhenShown)
-+        m_page->inspectorController().pauseWhenShown();
-+
-     updateThrottleState();
- #if ENABLE(ACCESSIBILITY_ANIMATION_CONTROL)
-     updateImageAnimationEnabled();
-@@ -2007,6 +2010,22 @@ void WebPage::transitionFrameToLocal(LocalFrameCreationParameters&& creationPara
-     frame->transitionToLocal(creationParameters.layerHostingContextIdentifier);
++        m_page->inspectorController().pauseOnStart(parameters.windowFeatures ? InspectorController::PauseCondition::WHEN_CREATION_FINISHED : InspectorController::PauseCondition::WHEN_SHOWN);
+     if (parameters.windowFeatures) {
+         page->applyWindowFeatures(*parameters.windowFeatures);
+         page->chrome().show();
+@@ -2098,6 +2105,22 @@ void WebPage::loadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, st
+     frame->loadDidCommitInAnotherProcess(layerHostingContextIdentifier);
  }
  
 +void WebPage::loadRequestInFrameForInspector(LoadParameters&& loadParameters, WebCore::FrameIdentifier frameID)
 +{
 +    WebFrame* frame = WebProcess::singleton().webFrame(frameID);
 +    if (!frame) {
-+        send(Messages::WebPageProxy::DidDestroyNavigation(loadParameters.navigationID));
++        send(Messages::WebPageProxy::DidDestroyNavigation(*loadParameters.navigationID));
 +        return;
 +    }
 +
 +    // FIXME: use m_pendingNavigationID instead?
 +    m_pendingFrameNavigationID = loadParameters.navigationID;
 +
-+    FrameLoadRequest frameLoadRequest { *frame->coreLocalFrame(), loadParameters.request };
++    FrameLoadRequest frameLoadRequest { *frame->coreLocalFrame(), WTFMove(loadParameters.request) };
 +    frame->coreLocalFrame()->loader().load(WTFMove(frameLoadRequest));
 +    ASSERT(!m_pendingFrameNavigationID);
 +}
 +
  void WebPage::loadRequest(LoadParameters&& loadParameters)
  {
-     WEBPAGE_RELEASE_LOG(Loading, "loadRequest: navigationID=%" PRIu64 ", shouldTreatAsContinuingLoad=%u, lastNavigationWasAppInitiated=%d, existingNetworkResourceLoadIdentifierToResume=%" PRIu64, loadParameters.navigationID, static_cast<unsigned>(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), valueOrDefault(loadParameters.existingNetworkResourceLoadIdentifierToResume).toUInt64());
-@@ -2283,17 +2302,14 @@ void WebPage::setSize(const WebCore::IntSize& viewSize)
-     view->resize(viewSize);
-     m_drawingArea->setNeedsDisplay();
- 
--#if USE(COORDINATED_GRAPHICS)
-     if (view->useFixedLayout())
-         sendViewportAttributesChanged(m_page->viewportArguments());
--#endif
- 
- #if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-     cacheAXSize(m_viewSize);
- #endif
- }
- 
--#if USE(COORDINATED_GRAPHICS)
- void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArguments)
- {
-     RefPtr localMainFrame = dynamicDowncast<LocalFrame>(m_page->mainFrame());
-@@ -2318,20 +2334,18 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg
- 
-     ViewportAttributes attr = computeViewportAttributes(viewportArguments, minimumLayoutFallbackWidth, deviceWidth, deviceHeight, 1, m_viewSize);
- 
--    // If no layout was done yet set contentFixedOrigin to (0,0).
--    IntPoint contentFixedOrigin = view->didFirstLayout() ? view->fixedVisibleContentRect().location() : IntPoint();
--
--    // Put the width and height to the viewport width and height. In css units however.
--    // Use FloatSize to avoid truncated values during scale.
--    FloatSize contentFixedSize = m_viewSize;
--
--    contentFixedSize.scale(1 / attr.initialScale);
--    view->setFixedVisibleContentRect(IntRect(contentFixedOrigin, roundedIntSize(contentFixedSize)));
-+#if ENABLE(CSS_DEVICE_ADAPTATION)
-+    FrameView* view = m_page->mainFrame().view();
-+    // CSS viewport descriptors might be applied to already affected viewport size
-+    // if the page enables/disables stylesheets, so need to keep initial viewport size.
-+    view->setInitialViewportSize(roundedIntSize(m_viewSize));
-+#endif
- 
-     attr.initialScale = m_page->viewportArguments().zoom; // Resets auto (-1) if no value was set by user.
- 
-     // This also takes care of the relayout.
-     setFixedLayoutSize(roundedIntSize(attr.layoutSize));
-+    scaleView(deviceWidth / attr.layoutSize.width());
- 
- #if USE(COORDINATED_GRAPHICS)
-     m_drawingArea->didChangeViewportAttributes(WTFMove(attr));
-@@ -2339,7 +2353,6 @@ void WebPage::sendViewportAttributesChanged(const ViewportArguments& viewportArg
-     send(Messages::WebPageProxy::DidChangeViewportProperties(attr));
- #endif
- }
--#endif
- 
- void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffset)
+     WEBPAGE_RELEASE_LOG_FORWARDABLE(Loading, WEBPAGE_LOADREQUEST, loadParameters.navigationID ? loadParameters.navigationID->toUInt64() : 0, static_cast<unsigned>(loadParameters.shouldTreatAsContinuingLoad), loadParameters.request.isAppInitiated(), loadParameters.existingNetworkResourceLoadIdentifierToResume ? loadParameters.existingNetworkResourceLoadIdentifierToResume->toUInt64() : 0);
+@@ -2295,7 +2318,9 @@ void WebPage::stopLoading()
+ void WebPage::stopLoadingDueToProcessSwap()
  {
-@@ -2640,6 +2653,7 @@ void WebPage::scaleView(double scale)
-     }
- 
-     m_page->setViewScaleFactor(scale);
-+    send(Messages::WebPageProxy::ViewScaleFactorDidChange(scale));
-     scalePage(pageScale, scrollPositionAtNewScale);
+     SetForScope isStoppingLoadingDueToProcessSwap(m_isStoppingLoadingDueToProcessSwap, true);
++    InspectorInstrumentationWebKit::setStoppingLoadingDueToProcessSwap(m_page.get(), true);
+     stopLoading();
++    InspectorInstrumentationWebKit::setStoppingLoadingDueToProcessSwap(m_page.get(), false);
  }
  
-@@ -2819,18 +2833,14 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
+ bool WebPage::defersLoading() const
+@@ -2871,7 +2896,7 @@ void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArgum
+ #if PLATFORM(IOS_FAMILY)
+     if (m_viewportConfiguration.setViewportArguments(viewportArguments))
          viewportConfigurationChanged();
- #endif
- 
--#if USE(COORDINATED_GRAPHICS)
-     RefPtr localMainFrame = dynamicDowncast<LocalFrame>(m_page->mainFrame());
+-#elif PLATFORM(GTK) || PLATFORM(WPE)
++#elif PLATFORM(GTK) || PLATFORM(WPE) || PLATFORM(WIN) || PLATFORM(MAC)
+     // Adjust view dimensions when using fixed layout.
+     RefPtr localMainFrame = this->localMainFrame();
      RefPtr view = localMainFrame ? localMainFrame->view() : nullptr;
-     if (view && view->useFixedLayout())
-         sendViewportAttributesChanged(viewportArguments);
-+#if USE(COORDINATED_GRAPHICS)
-     else
-         m_drawingArea->didChangeViewportAttributes(ViewportAttributes());
- #endif
--
--#if !PLATFORM(IOS_FAMILY) && !USE(COORDINATED_GRAPHICS)
--    UNUSED_PARAM(viewportArguments);
--#endif
+@@ -3628,6 +3653,13 @@ void WebPage::flushDeferredScrollEvents()
+     protectedCorePage()->flushDeferredScrollEvents();
  }
  
- #if !PLATFORM(IOS_FAMILY)
-@@ -3830,6 +3840,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
++#if ENABLE(ORIENTATION_EVENTS)
++void WebPage::setDeviceOrientation(WebCore::IntDegrees deviceOrientation)
++{
++    m_page->setOverrideOrientation(deviceOrientation);
++}
++#endif
++
+ void WebPage::flushDeferredDidReceiveMouseEvent()
+ {
+     if (auto info = std::exchange(m_deferredDidReceiveMouseEvent, std::nullopt))
+@@ -3902,6 +3934,97 @@ void WebPage::touchEvent(const WebTouchEvent& touchEvent, CompletionHandler<void
  
      completionHandler(touchEvent.type(), handled);
  }
@@ -20949,20 +19867,20 @@ index 36ca16c66c74db2f7d4b2a4938e7714b5ef49ca1..821029c298841fc1408f80579d43ec7c
 +        WebPlatformTouchPoint::State state = WebPlatformTouchPoint::State::Pressed;
 +        touchPoints.append(WebPlatformTouchPoint(id, state, screenPosition, position, radius, rotationAngle, force));
 +
-+        WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, WallTime::now()}, WTFMove(touchPoints));
++        WebTouchEvent touchEvent({WebEventType::TouchStart, eventModifiers, WallTime::now()}, WTFMove(touchPoints), {}, {});
 +
 +        CurrentEvent currentEvent(touchEvent);
-+        handled = handleTouchEvent(m_page->mainFrame().frameID(), touchEvent, m_page.get()).wasHandled();
++        handled = handleTouchEvent(m_page->mainFrame().frameID(), touchEvent, m_page.get()).value_or(false);
 +    }
 +    {
 +        Vector<WebPlatformTouchPoint> touchPoints;
 +        WebPlatformTouchPoint::State state = WebPlatformTouchPoint::State::Released;
 +        touchPoints.append(WebPlatformTouchPoint(id, state, screenPosition, position, radius, rotationAngle, force));
 +
-+        WebTouchEvent touchEvent({WebEventType::TouchEnd, eventModifiers, WallTime::now()}, WTFMove(touchPoints));
++        WebTouchEvent touchEvent({WebEventType::TouchEnd, eventModifiers, WallTime::now()}, WTFMove(touchPoints), {}, {});
 +
 +        CurrentEvent currentEvent(touchEvent);
-+        handled = handleTouchEvent(m_page->mainFrame().frameID(), touchEvent, m_page.get()).wasHandled() || handled;
++        handled = handleTouchEvent(m_page->mainFrame().frameID(), touchEvent, m_page.get()).value_or(false) || handled;
 +    }
 +    if (!handled) {
 +        FloatPoint adjustedPoint;
@@ -21021,7 +19939,7 @@ index 36ca16c66c74db2f7d4b2a4938e7714b5ef49ca1..821029c298841fc1408f80579d43ec7c
  #endif
  
  void WebPage::cancelPointer(WebCore::PointerID pointerId, const WebCore::IntPoint& documentPoint)
-@@ -3915,6 +4016,11 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
+@@ -3990,6 +4113,16 @@ void WebPage::sendMessageToTargetBackend(const String& targetId, const String& m
      m_inspectorTargetController->sendMessageToTargetBackend(targetId, message);
  }
  
@@ -21029,19 +19947,24 @@ index 36ca16c66c74db2f7d4b2a4938e7714b5ef49ca1..821029c298841fc1408f80579d43ec7c
 +{
 +    m_page->inspectorController().resumeIfPausedInNewWindow();
 +}
++
++void WebPage::didAddWebPageToWebProcess()
++{
++    m_page->inspectorController().didFinishPageCreation();
++}
 +
  void WebPage::insertNewlineInQuotedContent()
  {
-     RefPtr frame = m_page->checkedFocusController()->focusedOrMainFrame();
-@@ -4150,6 +4256,7 @@ void WebPage::didCompletePageTransition()
+     RefPtr frame = protectedCorePage()->checkedFocusController()->focusedOrMainFrame();
+@@ -4233,6 +4366,7 @@ void WebPage::setMainFrameDocumentVisualUpdatesAllowed(bool allowed)
  void WebPage::show()
  {
      send(Messages::WebPageProxy::ShowPage());
-+    m_page->inspectorController().didShowNewWindow();
++    m_page->inspectorController().didShowPage();
  }
  
  void WebPage::setIsTakingSnapshotsForApplicationSuspension(bool isTakingSnapshotsForApplicationSuspension)
-@@ -5249,7 +5356,7 @@ NotificationPermissionRequestManager* WebPage::notificationPermissionRequestMana
+@@ -5448,7 +5582,7 @@ RefPtr<NotificationPermissionRequestManager> WebPage::protectedNotificationPermi
  
  #if ENABLE(DRAG_SUPPORT)
  
@@ -21050,8 +19973,8 @@ index 36ca16c66c74db2f7d4b2a4938e7714b5ef49ca1..821029c298841fc1408f80579d43ec7c
  void WebPage::performDragControllerAction(DragControllerAction action, const IntPoint& clientPosition, const IntPoint& globalPosition, OptionSet<DragOperation> draggingSourceOperationMask, SelectionData&& selectionData, OptionSet<DragApplicationFlags> flags, CompletionHandler<void(std::optional<DragOperation>, DragHandlingMethod, bool, unsigned, IntRect, IntRect, std::optional<RemoteUserInputEventData>)>&& completionHandler)
  {
      if (!m_page)
-@@ -7586,6 +7693,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
- #endif
+@@ -7961,6 +8095,10 @@ void WebPage::didCommitLoad(WebFrame* frame)
+     m_needsFixedContainerEdgesUpdate = true;
  
      flushDeferredDidReceiveMouseEvent();
 +// Playwright begin
@@ -21061,40 +19984,29 @@ index 36ca16c66c74db2f7d4b2a4938e7714b5ef49ca1..821029c298841fc1408f80579d43ec7c
  }
  
  void WebPage::didFinishDocumentLoad(WebFrame& frame)
-@@ -7850,6 +7961,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, const Resou
-             WebsitePoliciesData::applyToDocumentLoader(WTFMove(*m_pendingWebsitePolicies), documentLoader);
-             m_pendingWebsitePolicies = std::nullopt;
+@@ -8270,6 +8408,9 @@ Ref<DocumentLoader> WebPage::createDocumentLoader(LocalFrame& frame, ResourceReq
+             m_allowsContentJavaScriptFromMostRecentNavigation = m_internals->pendingWebsitePolicies->allowsContentJavaScript;
+             WebsitePoliciesData::applyToDocumentLoader(*std::exchange(m_internals->pendingWebsitePolicies, std::nullopt), documentLoader);
          }
 +    } else if (m_pendingFrameNavigationID) {
-+        documentLoader->setNavigationID(m_pendingFrameNavigationID);
-+        m_pendingFrameNavigationID = 0;
++        documentLoader->setNavigationID(*m_pendingFrameNavigationID);
++        m_pendingFrameNavigationID = std::nullopt;
      }
  
      return documentLoader;
 diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
-index a8d232fda1bf1dc7a9b3e866b3cbfb2952b26eef..b048960902cdd660209be177b4ecbe7719c74f8d 100644
+index 360c7068495346fa326a3409afe64c03ff11506e..263acb1412dd593a45a264c7fbd3fc16582db710 100644
 --- a/Source/WebKit/WebProcess/WebPage/WebPage.h
 +++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
-@@ -70,6 +70,7 @@
- #include <WebCore/MediaControlsContextMenuItem.h>
+@@ -47,6 +47,7 @@
  #include <WebCore/MediaKeySystemRequest.h>
  #include <WebCore/NowPlayingMetadataObserver.h>
+ #include <WebCore/OwnerPermissionsPolicyData.h>
 +#include <WebCore/Page.h>
  #include <WebCore/PageIdentifier.h>
  #include <WebCore/PageOverlay.h>
  #include <WebCore/PlatformLayerIdentifier.h>
-@@ -112,6 +113,10 @@
- #include "WebPrintOperationGtk.h"
- #endif
- 
-+#if PLATFORM(WPE)
-+#include "ArgumentCodersWPE.h"
-+#endif
-+
- #if PLATFORM(GTK) || PLATFORM(WPE)
- #include "InputMethodState.h"
- #endif
-@@ -1145,11 +1150,11 @@ public:
+@@ -1286,11 +1287,11 @@ public:
      void clearSelection();
      void restoreSelectionInFocusedEditableElement();
  
@@ -21106,35 +20018,49 @@ index a8d232fda1bf1dc7a9b3e866b3cbfb2952b26eef..b048960902cdd660209be177b4ecbe77
 -#if ENABLE(DRAG_SUPPORT) && !PLATFORM(GTK)
 +#if ENABLE(DRAG_SUPPORT) && !PLATFORM(GTK) && !PLATFORM(WPE)
      void performDragControllerAction(std::optional<WebCore::FrameIdentifier>, DragControllerAction, WebCore::DragData&&, CompletionHandler<void(std::optional<WebCore::DragOperation>, WebCore::DragHandlingMethod, bool, unsigned, WebCore::IntRect, WebCore::IntRect, std::optional<WebCore::RemoteUserInputEventData>)>&&);
-     void performDragOperation(WebCore::DragData&&, SandboxExtension::Handle&&, Vector<SandboxExtension::Handle>&&, CompletionHandler<void(bool)>&&);
+     void performDragOperation(WebCore::DragData&&, SandboxExtensionHandle&&, Vector<SandboxExtensionHandle>&&, CompletionHandler<void(bool)>&&);
+ #endif
+@@ -1308,6 +1309,9 @@ public:
+ #if ENABLE(MODEL_PROCESS)
+     void modelDragEnded(WebCore::ElementIdentifier);
  #endif
-@@ -1164,6 +1169,9 @@ public:
-     void didStartDrag();
-     void dragCancelled();
-     OptionSet<WebCore::DragSourceAction> allowedDragSourceActions() const { return m_allowedDragSourceActions; }
 +#if PLATFORM(MAC)
 +    void setDragPasteboardName(const String& pasteboardName) { m_page->setDragPasteboardName(pasteboardName); }
 +#endif
  #endif
  
-     void beginPrinting(WebCore::FrameIdentifier, const PrintInfo&);
-@@ -1387,6 +1395,7 @@ public:
+ #if ENABLE(MODEL_PROCESS)
+@@ -1394,8 +1398,11 @@ public:
+     void gestureEvent(WebCore::FrameIdentifier, const WebGestureEvent&, CompletionHandler<void(std::optional<WebEventType>, bool, std::optional<WebCore::RemoteUserInputEventData>)>&&);
+ #endif
+ 
+-#if PLATFORM(IOS_FAMILY)
++#if ENABLE(ORIENTATION_EVENTS)
+     void setDeviceOrientation(WebCore::IntDegrees);
++#endif
++
++#if PLATFORM(IOS_FAMILY)
+     void dynamicViewportSizeUpdate(const DynamicViewportSizeUpdate&);
+     bool scaleWasSetByUIProcess() const { return m_scaleWasSetByUIProcess; }
+     void willStartUserTriggeredZooming();
+@@ -1548,6 +1555,8 @@ public:
      void connectInspector(const String& targetId, Inspector::FrontendChannel::ConnectionType);
      void disconnectInspector(const String& targetId);
      void sendMessageToTargetBackend(const String& targetId, const String& message);
 +    void resumeInspectorIfPausedInNewWindow();
++    void didAddWebPageToWebProcess();
  
      void insertNewlineInQuotedContent();
  
-@@ -1863,6 +1872,7 @@ private:
-     void tryClose(CompletionHandler<void(bool)>&&);
-     void platformDidReceiveLoadParameters(const LoadParameters&);
-     void transitionFrameToLocal(LocalFrameCreationParameters&&, WebCore::FrameIdentifier);
-+    void loadRequestInFrameForInspector(LoadParameters&&, WebCore::FrameIdentifier);
+@@ -1969,6 +1978,7 @@ public:
+     void showContextMenuFromFrame(const FrameInfoData&, const ContextMenuContextData&, const UserData&);
+ #endif
      void loadRequest(LoadParameters&&);
-     [[noreturn]] void loadRequestWaitingForProcessLaunch(LoadParameters&&, URL&&, WebPageProxyIdentifier, bool);
-     void loadData(LoadParameters&&);
-@@ -1902,6 +1912,7 @@ private:
++    void loadRequestInFrameForInspector(LoadParameters&&, WebCore::FrameIdentifier);
+ 
+     void setObscuredContentInsets(const WebCore::FloatBoxExtent&);
+ 
+@@ -2171,6 +2181,7 @@ private:
      void updatePotentialTapSecurityOrigin(const WebTouchEvent&, bool wasHandled);
  #elif ENABLE(TOUCH_EVENTS)
      void touchEvent(const WebTouchEvent&, CompletionHandler<void(std::optional<WebEventType>, bool)>&&);
@@ -21142,29 +20068,34 @@ index a8d232fda1bf1dc7a9b3e866b3cbfb2952b26eef..b048960902cdd660209be177b4ecbe77
  #endif
  
      void cancelPointer(WebCore::PointerID, const WebCore::IntPoint&);
-@@ -2046,9 +2057,7 @@ private:
-     void addLayerForFindOverlay(CompletionHandler<void(WebCore::PlatformLayerIdentifier)>&&);
-     void removeLayerForFindOverlay(CompletionHandler<void()>&&);
- 
--#if USE(COORDINATED_GRAPHICS)
-     void sendViewportAttributesChanged(const WebCore::ViewportArguments&);
--#endif
+@@ -2941,6 +2952,7 @@ private:
+     bool m_isAppNapEnabled { true };
  
-     void didChangeSelectedIndexForActivePopupMenu(int32_t newIndex);
-     void setTextForActivePopupMenu(int32_t index);
-@@ -2649,6 +2658,7 @@ private:
-     UserActivity m_userActivity;
- 
-     uint64_t m_pendingNavigationID { 0 };
-+    uint64_t m_pendingFrameNavigationID { 0 };
-     std::optional<WebsitePoliciesData> m_pendingWebsitePolicies;
+     Markable<WebCore::NavigationIdentifier> m_pendingNavigationID;
++    Markable<WebCore::NavigationIdentifier> m_pendingFrameNavigationID;
  
      bool m_mainFrameProgressCompleted { false };
+     bool m_shouldDispatchFakeMouseMoveEvents { true };
 diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
-index b67b771976b46970925529207e0153bc5637c533..7fc087a6d9769664347d62776d744287ec39c3a3 100644
+index c4ae18f9803e00d09a3f479c03ec858dd98c9045..9b1cbcf627f104e97a7ca46b560cdb9d99dc0ffc 100644
 --- a/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
 +++ b/Source/WebKit/WebProcess/WebPage/WebPage.messages.in
-@@ -147,6 +147,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType
+@@ -58,10 +58,13 @@ messages -> WebPage WantsAsyncDispatchMessage {
+     MouseEvent(WebCore::FrameIdentifier frameID, WebKit::WebMouseEvent event, std::optional<Vector<WebKit::SandboxExtensionHandle>> sandboxExtensions)
+     SetLastKnownMousePosition(WebCore::FrameIdentifier frameID, WebCore::IntPoint eventPoint, WebCore::IntPoint globalPoint);
+ 
++#if ENABLE(ORIENTATION_EVENTS)
++    SetDeviceOrientation(WebCore::IntDegrees deviceOrientation)
++#endif
++
+ #if PLATFORM(IOS_FAMILY)
+     SetSceneIdentifier(String sceneIdentifier)
+     SetViewportConfigurationViewLayoutSize(WebCore::FloatSize size, double scaleFactor, double minimumEffectiveDeviceWidth)
+-    SetDeviceOrientation(WebCore::IntDegrees deviceOrientation)
+     SetOverrideViewportArguments(struct std::optional<WebCore::ViewportArguments> arguments)
+     DynamicViewportSizeUpdate(struct WebKit::DynamicViewportSizeUpdate target)
+     
+@@ -153,6 +156,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
      ConnectInspector(String targetId, Inspector::FrontendChannel::ConnectionType connectionType)
      DisconnectInspector(String targetId)
      SendMessageToTargetBackend(String targetId, String message)
@@ -21172,37 +20103,37 @@ index b67b771976b46970925529207e0153bc5637c533..7fc087a6d9769664347d62776d744287
  
  #if ENABLE(REMOTE_INSPECTOR)
      SetIndicating(bool indicating);
-@@ -157,6 +158,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType
+@@ -163,6 +167,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
  #endif
  #if !ENABLE(IOS_TOUCH_EVENTS) && ENABLE(TOUCH_EVENTS)
-     TouchEvent(WebKit::WebTouchEvent event) -> (std::optional<WebKit::WebEventType> eventType, bool handled)
+     TouchEvent(WebKit::WebTouchEvent event) -> (enum:uint8_t std::optional<WebKit::WebEventType> eventType, bool handled)
 +    FakeTouchTap(WebCore::IntPoint position, uint8_t modifiers) -> () Async
  #endif
  
      CancelPointer(WebCore::PointerID pointerId, WebCore::IntPoint documentPoint)
-@@ -188,6 +190,7 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType
+@@ -188,6 +193,7 @@ messages -> WebPage WantsAsyncDispatchMessage {
      LoadDataInFrame(std::span<const uint8_t> data, String MIMEType, String encodingName, URL baseURL, WebCore::FrameIdentifier frameID)
      LoadRequest(struct WebKit::LoadParameters loadParameters)
-     TransitionFrameToLocal(struct WebKit::LocalFrameCreationParameters creationParameters, WebCore::FrameIdentifier frameID)
+     LoadDidCommitInAnotherProcess(WebCore::FrameIdentifier frameID, std::optional<WebCore::LayerHostingContextIdentifier> layerHostingContextIdentifier)
 +    LoadRequestInFrameForInspector(struct WebKit::LoadParameters loadParameters, WebCore::FrameIdentifier frameID)
      LoadRequestWaitingForProcessLaunch(struct WebKit::LoadParameters loadParameters, URL resourceDirectoryURL, WebKit::WebPageProxyIdentifier pageID, bool checkAssumedReadAccessToResourceURL)
      LoadData(struct WebKit::LoadParameters loadParameters)
      LoadSimulatedRequestAndResponse(struct WebKit::LoadParameters loadParameters, WebCore::ResourceResponse simulatedResponse)
-@@ -353,10 +356,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType
+@@ -352,10 +358,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
      RemoveLayerForFindOverlay() -> ()
  
      # Drag and drop.
 -#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
 +#if (PLATFORM(GTK) || PLATFORM(WPE)) && ENABLE(DRAG_SUPPORT)
-     PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragOperation> draggingSourceOperationMask, WebCore::SelectionData selection, OptionSet<WebCore::DragApplicationFlags> flags) -> (std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
+     PerformDragControllerAction(enum:uint8_t WebKit::DragControllerAction action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragOperation> draggingSourceOperationMask, WebCore::SelectionData selection, OptionSet<WebCore::DragApplicationFlags> flags) -> (enum:uint8_t std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
  #endif
 -#if !PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
 +#if !PLATFORM(GTK) && !PLATFORM(WPE) && ENABLE(DRAG_SUPPORT)
-     PerformDragControllerAction(std::optional<WebCore::FrameIdentifier> frameID, enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData) -> (std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
+     PerformDragControllerAction(std::optional<WebCore::FrameIdentifier> frameID, enum:uint8_t WebKit::DragControllerAction action, WebCore::DragData dragData) -> (enum:uint8_t std::optional<WebCore::DragOperation> dragOperation, enum:uint8_t WebCore::DragHandlingMethod dragHandlingMethod, bool mouseIsOverFileInput, unsigned numberOfItemsToBeAccepted, WebCore::IntRect insertionRect, WebCore::IntRect editableElementRect, struct std::optional<WebCore::RemoteUserInputEventData> remoteUserInputEventData)
      PerformDragOperation(WebCore::DragData dragData, WebKit::SandboxExtensionHandle sandboxExtensionHandle, Vector<WebKit::SandboxExtensionHandle> sandboxExtensionsForUpload) -> (bool handled)
  #endif
-@@ -366,6 +369,10 @@ GenerateSyntheticEditingCommand(enum:uint8_t WebKit::SyntheticEditingCommandType
-     DragCancelled()
+@@ -375,6 +381,10 @@ messages -> WebPage WantsAsyncDispatchMessage {
+     ModelDragEnded(WebCore::ElementIdentifier elementID)
  #endif
  
 +#if PLATFORM(MAC) && ENABLE(DRAG_SUPPORT)
@@ -21210,18 +20141,56 @@ index b67b771976b46970925529207e0153bc5637c533..7fc087a6d9769664347d62776d744287
 +#endif
 +
  #if PLATFORM(IOS_FAMILY) && ENABLE(DRAG_SUPPORT)
-     RequestDragStart(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask)
-     RequestAdditionalItemsForDragSession(WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask)
+     RequestDragStart(std::optional<WebCore::FrameIdentifier> remoteFrameID, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask) -> (struct WebKit::DragInitiationResult result)
+     RequestAdditionalItemsForDragSession(std::optional<WebCore::FrameIdentifier> rootFrameID, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, OptionSet<WebCore::DragSourceAction> allowedActionsMask) -> (struct WebKit::DragInitiationResult result)
+diff --git a/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp b/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
+index 40ec42bb4f998774a2ce4a19e82f68512ad2ebb8..080794e14bfbb3a336d8a89791baee0e1aec3c75 100644
+--- a/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
++++ b/Source/WebKit/WebProcess/WebPage/glib/WebPageGLib.cpp
+@@ -210,16 +210,23 @@ String WebPage::platformUserAgent(const URL& url) const
+ 
+ bool WebPage::hoverSupportedByPrimaryPointingDevice() const
+ {
++    if (screenHasTouchDeviceOverride())
++        return !screenHasTouchDeviceOverride().value();
+     return WebProcess::singleton().primaryPointingDevice() == AvailableInputDevices::Mouse;
+ }
+ 
+ bool WebPage::hoverSupportedByAnyAvailablePointingDevice() const
+ {
++    if (screenHasTouchDeviceOverride())
++        return !screenHasTouchDeviceOverride().value();
+     return WebProcess::singleton().availableInputDevices().contains(AvailableInputDevices::Mouse);
+ }
+ 
+ std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPointingDevice() const
+ {
++    if (screenHasTouchDeviceOverride() && screenHasTouchDeviceOverride().value())
++        return PointerCharacteristics::Coarse;
++
+     const auto& primaryPointingDevice = WebProcess::singleton().primaryPointingDevice();
+     if (primaryPointingDevice == AvailableInputDevices::Mouse)
+         return PointerCharacteristics::Fine;
+@@ -230,6 +237,9 @@ std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPo
+ 
+ OptionSet<PointerCharacteristics> WebPage::pointerCharacteristicsOfAllAvailablePointingDevices() const
+ {
++    if (screenHasTouchDeviceOverride() && screenHasTouchDeviceOverride().value())
++        return PointerCharacteristics::Coarse;
++
+     OptionSet<PointerCharacteristics> pointerCharacteristics;
+     const auto& availableInputs = WebProcess::singleton().availableInputDevices();
+     if (availableInputs.contains(AvailableInputDevices::Mouse))
 diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-index 46b5327ff8777f3dce83ecf37219ad08321e8462..364d1010f0356a37d3f3b07d7fde187973028857 100644
+index e9dc2250f0f5e68db6ae61f5f734e2e2cf24cf9b..3dc31fc41d8efd990f94a713c0490abf1f1d9f60 100644
 --- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
 +++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
-@@ -800,21 +800,37 @@ String WebPage::platformUserAgent(const URL&) const
+@@ -705,21 +705,37 @@ String WebPage::platformUserAgent(const URL&) const
  
  bool WebPage::hoverSupportedByPrimaryPointingDevice() const
  {
 +#if ENABLE(TOUCH_EVENTS)
-+    return !screenIsTouchPrimaryInputDevice();
++    return !screenHasTouchDevice();
 +#else
      return true;
 +#endif
@@ -21239,7 +20208,7 @@ index 46b5327ff8777f3dce83ecf37219ad08321e8462..364d1010f0356a37d3f3b07d7fde1879
  std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPointingDevice() const
  {
 +#if ENABLE(TOUCH_EVENTS)
-+    if (screenIsTouchPrimaryInputDevice())
++    if (screenHasTouchDevice())
 +        return PointerCharacteristics::Coarse;
 +#endif
      return PointerCharacteristics::Fine;
@@ -21255,10 +20224,10 @@ index 46b5327ff8777f3dce83ecf37219ad08321e8462..364d1010f0356a37d3f3b07d7fde1879
  }
  
 diff --git a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp
-index f17f5d719d892309ed9c7093384945866b5117b9..1dba47bbf0dbd0362548423a74b380346dbea147 100644
+index ea3a03b5ee6d4ecadd771314c6059268db917087..91be6f4c687157afcfdaa431d7a1a6ff712b551c 100644
 --- a/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp
 +++ b/Source/WebKit/WebProcess/WebPage/win/WebPageWin.cpp
-@@ -43,6 +43,7 @@
+@@ -45,6 +45,7 @@
  #include <WebCore/NotImplemented.h>
  #include <WebCore/Page.h>
  #include <WebCore/PlatformKeyboardEvent.h>
@@ -21266,12 +20235,12 @@ index f17f5d719d892309ed9c7093384945866b5117b9..1dba47bbf0dbd0362548423a74b38034
  #include <WebCore/PointerCharacteristics.h>
  #include <WebCore/Settings.h>
  #include <WebCore/SharedBuffer.h>
-@@ -81,21 +82,37 @@ String WebPage::platformUserAgent(const URL&) const
+@@ -83,21 +84,37 @@ String WebPage::platformUserAgent(const URL&) const
  
  bool WebPage::hoverSupportedByPrimaryPointingDevice() const
  {
 +#if ENABLE(TOUCH_EVENTS)
-+    return !screenIsTouchPrimaryInputDevice();
++    return !screenHasTouchDevice();
 +#else
      return true;
 +#endif
@@ -21289,7 +20258,7 @@ index f17f5d719d892309ed9c7093384945866b5117b9..1dba47bbf0dbd0362548423a74b38034
  std::optional<PointerCharacteristics> WebPage::pointerCharacteristicsOfPrimaryPointingDevice() const
  {
 +#if ENABLE(TOUCH_EVENTS)
-+    if (screenIsTouchPrimaryInputDevice())
++    if (screenHasTouchDevice())
 +        return PointerCharacteristics::Coarse;
 +#endif
      return PointerCharacteristics::Fine;
@@ -21305,10 +20274,10 @@ index f17f5d719d892309ed9c7093384945866b5117b9..1dba47bbf0dbd0362548423a74b38034
  }
  
 diff --git a/Source/WebKit/WebProcess/WebProcess.cpp b/Source/WebKit/WebProcess/WebProcess.cpp
-index 4b52cd3a81eceb55531d48d4e4a54dc7d62b4d32..e3427d76d44a9bf148f4f9dca7ed7d7b58319b53 100644
+index 230b9bb1f8b1f218f94c10f18f4d672286ce5a9d..c9741c132685eb27737d21c7c840edb9447ec596 100644
 --- a/Source/WebKit/WebProcess/WebProcess.cpp
 +++ b/Source/WebKit/WebProcess/WebProcess.cpp
-@@ -88,6 +88,7 @@
+@@ -93,6 +93,7 @@
  #include "WebsiteData.h"
  #include "WebsiteDataStoreParameters.h"
  #include "WebsiteDataType.h"
@@ -21316,7 +20285,22 @@ index 4b52cd3a81eceb55531d48d4e4a54dc7d62b4d32..e3427d76d44a9bf148f4f9dca7ed7d7b
  #include <JavaScriptCore/JSLock.h>
  #include <JavaScriptCore/MemoryStatistics.h>
  #include <JavaScriptCore/WasmFaultSignalHandler.h>
-@@ -365,6 +366,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+@@ -388,6 +389,14 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
+     {
+         JSC::Options::AllowUnfinalizedAccessScope scope;
+         JSC::Options::allowNonSPTagging() = false;
++        // Playwright begin
++        // SharedBufferArray is enabled only on Mac via XPC sercvice "enable-shared-array-buffer" option.
++        // For other platforms, enable it here.
++#if !PLATFORM(COCOA)
++        if (parameters.shouldEnableSharedArrayBuffer)
++            JSC::Options::useSharedArrayBuffer() = true;
++#endif
++        // Playwright end
+         JSC::Options::notifyOptionsChanged();
+     }
+ 
+@@ -395,6 +404,8 @@ void WebProcess::initializeProcess(const AuxiliaryProcessInitializationParameter
      
      platformInitializeProcess(parameters);
      updateCPULimit();
@@ -21325,26 +20309,20 @@ index 4b52cd3a81eceb55531d48d4e4a54dc7d62b4d32..e3427d76d44a9bf148f4f9dca7ed7d7b
  }
  
  void WebProcess::initializeConnection(IPC::Connection* connection)
-diff --git a/Source/WebKit/WebProcess/win/WebProcessMainWin.cpp b/Source/WebKit/WebProcess/win/WebProcessMainWin.cpp
-index 8987c3964a9308f2454759de7f8972215a3ae416..bcac0afeb94ed8123d1f9fb0b932c8497d157b49 100644
---- a/Source/WebKit/WebProcess/win/WebProcessMainWin.cpp
-+++ b/Source/WebKit/WebProcess/win/WebProcessMainWin.cpp
-@@ -42,7 +42,9 @@ public:
-     bool platformInitialize() override
-     {
-         if (SetProcessDpiAwarenessContextPtr())
--            SetProcessDpiAwarenessContextPtr()(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
-+            // Playwright begin
-+            SetProcessDpiAwarenessContextPtr()(DPI_AWARENESS_CONTEXT_UNAWARE);
-+            // Playwright end
-         else
-             SetProcessDPIAware();
-         return true;
+@@ -975,6 +986,8 @@ void WebProcess::createWebPage(PageIdentifier pageID, WebPageCreationParameters&
+         accessibilityRelayProcessSuspended(false);
+     }
+     ASSERT(result.iterator->value);
++
++    result.iterator->value->didAddWebPageToWebProcess();
+ }
+ 
+ void WebProcess::removeWebPage(PageIdentifier pageID)
 diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-index 1ef662de86f8b92a7a5c6414df2dac6dbb3882f0..793785e12f96fe52193e8c27ec8b015521e06390 100644
+index 9dd01c8ef00f00d49d54a16996142681d1486852..51a02893b48bc930ebca7dd4b76dc874beecb157 100644
 --- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
 +++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
-@@ -4214,7 +4214,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
+@@ -4225,7 +4225,7 @@ ALLOW_DEPRECATED_DECLARATIONS_END
      _private->handlingMouseDownEvent = NO;
  }
  
@@ -21354,10 +20332,10 @@ index 1ef662de86f8b92a7a5c6414df2dac6dbb3882f0..793785e12f96fe52193e8c27ec8b0155
  - (void)touch:(WebEvent *)event
  {
 diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
-index c892fdcdb2834ab3d93a4a0575b712c848b662c0..0e817f6ac6cf4e0bc04e1acd178ef976105d9b16 100644
+index 222de8db3d8475b7a68b017dc88994d4ca7e08fd..ed3460c7b59772410af898d4fb107cc88c3b40a6 100644
 --- a/Source/WebKitLegacy/mac/WebView/WebView.mm
 +++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
-@@ -3979,7 +3979,7 @@ + (void)_doNotStartObservingNetworkReachability
+@@ -4002,7 +4002,7 @@ + (void)_doNotStartObservingNetworkReachability
  }
  #endif // PLATFORM(IOS_FAMILY)
  
@@ -21366,7 +20344,7 @@ index c892fdcdb2834ab3d93a4a0575b712c848b662c0..0e817f6ac6cf4e0bc04e1acd178ef976
  
  - (NSArray *)_touchEventRegions
  {
-@@ -4021,7 +4021,7 @@ - (NSArray *)_touchEventRegions
+@@ -4044,7 +4044,7 @@ - (NSArray *)_touchEventRegions
      }).autorelease();
  }
  
@@ -21377,14 +20355,16 @@ index c892fdcdb2834ab3d93a4a0575b712c848b662c0..0e817f6ac6cf4e0bc04e1acd178ef976
  // a per-WebView and a per-preferences setting for whether to use the back/forward cache.
 diff --git a/Source/cmake/FindLibVPX.cmake b/Source/cmake/FindLibVPX.cmake
 new file mode 100644
-index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d5d9dc387
+index 0000000000000000000000000000000000000000..a9db9ec38d05e36517414248237e885b25109647
 --- /dev/null
 +++ b/Source/cmake/FindLibVPX.cmake
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,27 @@
 +# Find LibVPX
 +
 +find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_LIBVPX REQUIRED vpx)
++if (PkgConfig_FOUND)
++    pkg_check_modules(PC_LIBVPX REQUIRED vpx)
++endif ()
 +
 +find_path(LIBVPX_INCLUDE_DIRS
 +    NAMES vpx/vp8.h
@@ -21407,24 +20387,21 @@ index 0000000000000000000000000000000000000000..dd6a53e2d57318489b7e49dd7373706d
 +    LIBVPX_LIBRARIES
 +)
 diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
-index 31085c5a7f8d4e1680887ff9f20de2d421256a62..d1374f5f68f26d166d9a6e4f1ae9a23dd9151e13 100644
+index 303550b9618e8c621e246e8c95b9e7542585f1fc..efdb66ef47e46e83287350933047295e6dc0c268 100644
 --- a/Source/cmake/OptionsGTK.cmake
 +++ b/Source/cmake/OptionsGTK.cmake
-@@ -11,8 +11,13 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni
-     message(FATAL_ERROR "Building with Makefiles requires CMake 3.20 or newer. Either enable Ninja by passing -GNinja, or upgrade CMake.")
- endif ()
+@@ -9,6 +9,10 @@ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
  
-+set(ENABLE_WEBKIT_LEGACY OFF)
+ # Update Source/WTF/wtf/Platform.h to match required GLib versions.
+ find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
 +
- set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
- 
 +set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 +set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 +
  find_package(Cairo 1.16.0 REQUIRED)
  find_package(LibGcrypt 1.7.0 REQUIRED)
  find_package(Libtasn1 REQUIRED)
-@@ -29,6 +34,10 @@ find_package(ZLIB REQUIRED)
+@@ -24,6 +28,10 @@ find_package(ZLIB REQUIRED)
  find_package(WebP REQUIRED COMPONENTS demux)
  find_package(ATSPI 2.5.3)
  
@@ -21435,71 +20412,43 @@ index 31085c5a7f8d4e1680887ff9f20de2d421256a62..d1374f5f68f26d166d9a6e4f1ae9a23d
  include(GStreamerDefinitions)
  include(FindGLibCompileResources)
  
-@@ -88,14 +97,14 @@ endif ()
- # without approval from a GTK reviewer. There must be strong reason to support
- # changing the value of the option.
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC ON)
+@@ -71,6 +79,10 @@ WEBKIT_OPTION_DEFINE(USE_SYSTEM_UNIFDEF "Whether to use a system-provided unifde
+ 
+ WEBKIT_OPTION_DEPEND(USE_SYSTEM_SYSPROF_CAPTURE USE_SYSPROF_CAPTURE)
+ 
++# Playwright begin.
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_SYSPROF_CAPTURE PRIVATE OFF)
++# Playwright end.
++
+ SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
+ if (DEVELOPER_MODE)
+     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
+@@ -147,6 +159,20 @@ endif ()
+ 
+ WEBKIT_OPTION_DEPEND(ENABLE_GPU_PROCESS USE_GBM)
+ 
++# Playwright begin.
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
- 
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_AVIF PUBLIC ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_AVIF PUBLIC OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_LCMS PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_JPEGXL PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_WOFF2 PUBLIC ON)
-@@ -119,7 +128,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON)
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON)
-@@ -131,7 +140,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION P
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_CACHE_STALE_WHILE_REVALIDATE PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE ${ENABLE_DEVELOPER_MODE})
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
-@@ -141,6 +150,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
- 
-+# Playwright
++
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
++# Playwright end.
 +
  include(GStreamerDependencies)
  
  # Finalize the value for all options. Do not attempt to use an option before
 diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
-index e0c8dc92717c31173b6848b9f04856276125fb9d..24bbbae0654cded5197e6a4ce13246f71f5d5590 100644
+index 45b4da4575d41bdf1b829ddf68947f30bc57734f..378b9114ae03c18f0caead71750c1169b2c45b27 100644
 --- a/Source/cmake/OptionsWPE.cmake
 +++ b/Source/cmake/OptionsWPE.cmake
-@@ -9,6 +9,8 @@ if (${CMAKE_VERSION} VERSION_LESS "3.20" AND NOT ${CMAKE_GENERATOR} STREQUAL "Ni
-     message(FATAL_ERROR "Building with Makefiles requires CMake 3.20 or newer. Either enable Ninja by passing -GNinja, or upgrade CMake.")
- endif ()
- 
-+set(ENABLE_WEBKIT_LEGACY OFF)
-+
- set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
- 
- find_package(HarfBuzz 1.4.2 REQUIRED COMPONENTS ICU)
-@@ -27,6 +29,9 @@ find_package(WebP REQUIRED COMPONENTS demux)
+@@ -23,6 +23,9 @@ find_package(WebP REQUIRED COMPONENTS demux)
  find_package(WPE REQUIRED)
  find_package(ZLIB REQUIRED)
  
@@ -21509,106 +20458,56 @@ index e0c8dc92717c31173b6848b9f04856276125fb9d..24bbbae0654cded5197e6a4ce13246f7
  WEBKIT_OPTION_BEGIN()
  
  SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
-@@ -38,11 +43,11 @@ include(FindGLibCompileResources)
- # without approval from a WPE reviewer. There must be strong reason to support
- # changing the value of the option.
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC ${ENABLE_EXPERIMENTAL_FEATURES})
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC ON)
+@@ -81,6 +84,21 @@ else ()
+     WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SKIA PRIVATE OFF)
+ endif ()
+ 
++# Playwright begin.
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFJS PUBLIC OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBDRIVER PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
- 
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_AVIF PUBLIC ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_AVIF PUBLIC OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_LCMS PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_JPEGXL PUBLIC ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_WOFF2 PUBLIC ON)
-@@ -58,7 +63,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GPU_PROCESS PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_CONTEXT_MENUS PRIVATE ON)
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_RECORDER PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SESSION_PLAYLIST PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_STREAM PRIVATE ON)
-@@ -72,7 +77,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_OFFSCREEN_CANVAS_IN_WORKERS PRIVATE ${EN
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PERIODIC_MEMORY_MONITOR PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
--WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE ${ENABLE_DEVELOPER_MODE})
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THUNDER PRIVATE OFF)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
- WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ON)
-@@ -83,6 +88,23 @@ if (WPE_VERSION VERSION_GREATER_EQUAL 1.13.90)
-     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD PUBLIC ON)
- endif ()
- 
-+# Playwright
++
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_APPLICATION_MANIFEST PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DARK_MODE_CSS PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE ON)
-+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATE_AND_TIME_INPUT_TYPES PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
 +WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
++# Playwright end.
 +
  # Public options specific to the WPE port. Do not add any options here unless
  # there is a strong reason we should support changing the value of the option,
  # and the option is not relevant to other WebKit ports.
-@@ -92,7 +114,7 @@ WEBKIT_OPTION_DEFINE(ENABLE_JOURNALD_LOG "Whether to enable journald logging" PU
- WEBKIT_OPTION_DEFINE(ENABLE_WPE_PLATFORM_DRM "Whether to enable support for DRM platform" PUBLIC ON)
- WEBKIT_OPTION_DEFINE(ENABLE_WPE_PLATFORM_HEADLESS "Whether to enable support for headless platform" PUBLIC ON)
- WEBKIT_OPTION_DEFINE(ENABLE_WPE_PLATFORM_WAYLAND "Whether to enable support for Wayland platform" PUBLIC ON)
--WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC ${ENABLE_DEVELOPER_MODE})
-+WEBKIT_OPTION_DEFINE(ENABLE_WPE_QT_API "Whether to enable support for the Qt5/QML plugin" PUBLIC OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_WPE_1_1_API "Whether to build WPE 1.1 instead of WPE 2.0" PUBLIC OFF)
- WEBKIT_OPTION_DEFINE(USE_ATK "Whether to enable usage of ATK." PUBLIC ON)
- WEBKIT_OPTION_DEFINE(USE_GBM "Whether to enable usage of GBM." PUBLIC ON)
+@@ -116,6 +134,11 @@ WEBKIT_OPTION_DEPEND(USE_QT6 ENABLE_WPE_PLATFORM)
+ WEBKIT_OPTION_DEPEND(USE_SKIA_OPENTYPE_SVG USE_SKIA)
+ WEBKIT_OPTION_DEPEND(USE_SYSTEM_SYSPROF_CAPTURE USE_SYSPROF_CAPTURE)
+ 
++# Playwright begin.
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WPE_QT_API PUBLIC OFF)
++WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_SYSPROF_CAPTURE PRIVATE OFF)
++# Playwright end.
++
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
+     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
 diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
-index 2ed9985c35980ba0fca09c2fc9ea5ab300b19b00..a5f773d071cb67025b16614a998bd09355061572 100644
+index 95393f0a6063615b417eb3249d3838ad0e3024d8..beedf862d572718b8f0f5e6daa0f8d029a96ea77 100644
 --- a/Source/cmake/OptionsWin.cmake
 +++ b/Source/cmake/OptionsWin.cmake
-@@ -86,6 +86,29 @@ find_package(ZLIB 1.2.11 REQUIRED)
+@@ -55,6 +55,10 @@ find_package(ZLIB 1.2.11 REQUIRED)
  find_package(LibPSL 0.20.2 REQUIRED)
  find_package(WebP REQUIRED COMPONENTS demux)
  
 +# Playwright begin
-+if (NOT LIBVPX_PACKAGE_PATH)
-+    set(LIBVPX_PACKAGE_PATH "C:\\vcpkg\\packages\\libvpx_x64-windows")
-+endif()
-+file(TO_CMAKE_PATH "${LIBVPX_PACKAGE_PATH}" LIBVPX_PACKAGE_PATH)
-+message(STATUS "Using LIBVPX_PACKAGE_PATH = ${LIBVPX_PACKAGE_PATH}")
-+
-+find_library(LIBVPX_CUSTOM_LIBRARY vpx.lib
-+    HINTS ${LIBVPX_PACKAGE_PATH}/lib
-+    REQIRED
-+    NO_DEFAULT_PATH
-+)
-+message(STATUS "Found LIBVPX_CUSTOM_LIBRARY = ${LIBVPX_CUSTOM_LIBRARY}")
-+
-+find_path(LIBVPX_CUSTOM_INCLUDE_DIR
-+    NAMES vpx/vp8.h
-+    HINTS ${LIBVPX_PACKAGE_PATH}/include
-+    REQUIRED
-+    NO_DEFAULT_PATH
-+)
-+message(STATUS "Found LIBVPX_CUSTOM_INCLUDE_DIR = ${LIBVPX_CUSTOM_INCLUDE_DIR}")
++find_package(LibVPX REQUIRED)
 +# Playwright end
 +
  WEBKIT_OPTION_BEGIN()
  
  # FIXME: Most of these options should not be public.
-@@ -159,6 +182,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
+@@ -113,6 +117,14 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)
  SET_AND_EXPOSE_TO_BUILD(ENABLE_WEBDRIVER_KEYBOARD_INTERACTIONS ON)
  SET_AND_EXPOSE_TO_BUILD(ENABLE_WEBDRIVER_MOUSE_INTERACTIONS ON)
  
@@ -21624,7 +20523,7 @@ index 2ed9985c35980ba0fca09c2fc9ea5ab300b19b00..a5f773d071cb67025b16614a998bd093
  
  set(USE_ANGLE_EGL ON)
 diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
-index 26f8c4421bf45bb2f7e5f67ebd31ecfd9c0ddd3d..52ad063be9977fbbfa17ed0ae09676fd9455aef9 100644
+index d8fe5503609122c55c2c675934b3678cfe709cf0..2e706bb436d6c01689bec8cc7b7de3c125ca258a 100644
 --- a/Source/cmake/WebKitCompilerFlags.cmake
 +++ b/Source/cmake/WebKitCompilerFlags.cmake
 @@ -122,7 +122,7 @@ macro(WEBKIT_ADD_TARGET_CXX_FLAGS _target)
@@ -21637,7 +20536,7 @@ index 26f8c4421bf45bb2f7e5f67ebd31ecfd9c0ddd3d..52ad063be9977fbbfa17ed0ae09676fd
      if (MSVC)
          set(FATAL_WARNINGS_FLAG /WX)
 diff --git a/Tools/DumpRenderTree/DerivedSources.make b/Tools/DumpRenderTree/DerivedSources.make
-index 57aae19f1a16d08ba1579562eeff264c8768af4d..6ce36f40cc954bd02b86f84bd9a0bd2928459938 100644
+index 576835410df6deac60f0158f1d2d1ef1e5f4c78d..9b492cfe5fef8de340a80f2af70a7d68672ef2e4 100644
 --- a/Tools/DumpRenderTree/DerivedSources.make
 +++ b/Tools/DumpRenderTree/DerivedSources.make
 @@ -73,8 +73,8 @@ $(IDL_FILE_NAMES_LIST) : $(UICONTEXT_INTERFACES:%=%.idl)
@@ -21651,10 +20550,33 @@ index 57aae19f1a16d08ba1579562eeff264c8768af4d..6ce36f40cc954bd02b86f84bd9a0bd29
  WEB_PREFERENCES_GENERATED_FILES = \
      TestOptionsGeneratedWebKitLegacyKeyMapping.cpp \
 diff --git a/Tools/MiniBrowser/gtk/BrowserTab.c b/Tools/MiniBrowser/gtk/BrowserTab.c
-index 61616b96e2f4e21aa6d098445e0f1a933e512a9c..33732da18013679a869ff8eb2b44543413f7cf0f 100644
+index 6d48c378699e87f55bbd2550d4971a295b831a24..efb0d8e1e0f7db5d4ce81bc58a97e6c4034ff0b3 100644
 --- a/Tools/MiniBrowser/gtk/BrowserTab.c
 +++ b/Tools/MiniBrowser/gtk/BrowserTab.c
-@@ -123,13 +123,16 @@ static gboolean decidePolicy(WebKitWebView *webView, WebKitPolicyDecision *decis
+@@ -117,19 +117,38 @@ static void isLoadingChanged(WebKitWebView *webView, GParamSpec *paramSpec, Brow
+     }
+ }
+ 
++static gboolean response_policy_decision_can_show(WebKitResponsePolicyDecision *responseDecision)
++{
++    if (webkit_response_policy_decision_is_mime_type_supported(responseDecision))
++        return TRUE;
++    WebKitURIResponse* response = webkit_response_policy_decision_get_response(responseDecision);
++    const guint statusCode = webkit_uri_response_get_status_code(response);
++    if (statusCode == 205 || statusCode == 204)
++        return TRUE;
++    const gchar* mimeType = webkit_uri_response_get_mime_type(response);
++    if (!mimeType || mimeType[0] == '\0')
++        return FALSE;
++    // https://bugs.webkit.org/show_bug.cgi?id=277204 / Ubuntu 24.04 / glib 2.76+ or higher
++    if (g_ascii_strcasecmp(mimeType, "application/x-zerosize") == 0)
++        return TRUE;
++    return FALSE;
++}
++
+ static gboolean decidePolicy(WebKitWebView *webView, WebKitPolicyDecision *decision, WebKitPolicyDecisionType decisionType, BrowserTab *tab)
+ {
+     if (decisionType != WEBKIT_POLICY_DECISION_TYPE_RESPONSE)
          return FALSE;
  
      WebKitResponsePolicyDecision *responseDecision = WEBKIT_RESPONSE_POLICY_DECISION(decision);
@@ -21665,8 +20587,7 @@ index 61616b96e2f4e21aa6d098445e0f1a933e512a9c..33732da18013679a869ff8eb2b445434
          return FALSE;
  
 -    webkit_policy_decision_download(decision);
-+    const gchar* mimeType = webkit_uri_response_get_mime_type(webkit_response_policy_decision_get_response(responseDecision));
-+    if (!webkit_response_policy_decision_is_mime_type_supported(responseDecision) && mimeType && mimeType[0] != '\0') {
++    if (!response_policy_decision_can_show(responseDecision)) {
 +        webkit_policy_decision_download(decision);
 +        return TRUE;
 +    }
@@ -21675,7 +20596,7 @@ index 61616b96e2f4e21aa6d098445e0f1a933e512a9c..33732da18013679a869ff8eb2b445434
      return TRUE;
  }
  
-@@ -159,6 +162,11 @@ static void loadChanged(WebKitWebView *webView, WebKitLoadEvent loadEvent, Brows
+@@ -180,6 +199,11 @@ static void loadChanged(WebKitWebView *webView, WebKitLoadEvent loadEvent, Brows
  #endif
  }
  
@@ -21687,7 +20608,7 @@ index 61616b96e2f4e21aa6d098445e0f1a933e512a9c..33732da18013679a869ff8eb2b445434
  static GtkWidget *createInfoBarQuestionMessage(const char *title, const char *text)
  {
      GtkWidget *dialog = gtk_info_bar_new_with_buttons("No", GTK_RESPONSE_NO, "Yes", GTK_RESPONSE_YES, NULL);
-@@ -720,6 +728,7 @@ static void browserTabConstructed(GObject *gObject)
+@@ -746,6 +770,7 @@ static void browserTabConstructed(GObject *gObject)
      g_signal_connect(tab->webView, "notify::is-loading", G_CALLBACK(isLoadingChanged), tab);
      g_signal_connect(tab->webView, "decide-policy", G_CALLBACK(decidePolicy), tab);
      g_signal_connect(tab->webView, "load-changed", G_CALLBACK(loadChanged), tab);
@@ -21695,7 +20616,7 @@ index 61616b96e2f4e21aa6d098445e0f1a933e512a9c..33732da18013679a869ff8eb2b445434
      g_signal_connect(tab->webView, "load-failed-with-tls-errors", G_CALLBACK(loadFailedWithTLSerrors), tab);
      g_signal_connect(tab->webView, "permission-request", G_CALLBACK(decidePermissionRequest), tab);
      g_signal_connect(tab->webView, "run-color-chooser", G_CALLBACK(runColorChooserCallback), tab);
-@@ -772,6 +781,9 @@ static char *getInternalURI(const char *uri)
+@@ -798,6 +823,9 @@ static char *getInternalURI(const char *uri)
      if (g_str_has_prefix(uri, "about:") && !g_str_equal(uri, "about:blank"))
          return g_strconcat(BROWSER_ABOUT_SCHEME, uri + strlen ("about"), NULL);
  
@@ -21706,7 +20627,7 @@ index 61616b96e2f4e21aa6d098445e0f1a933e512a9c..33732da18013679a869ff8eb2b445434
  }
  
 diff --git a/Tools/MiniBrowser/gtk/BrowserWindow.c b/Tools/MiniBrowser/gtk/BrowserWindow.c
-index bd00606c26b6fedb75978ed26a9b07f4b70828d8..8460a4ae5ff7461e3435fe2e704bb04e0a8bd0f8 100644
+index d39b809a879babcdbbf4b5f7687204df5ccc43f3..2862876cb515da09db653e71659d64215a636758 100644
 --- a/Tools/MiniBrowser/gtk/BrowserWindow.c
 +++ b/Tools/MiniBrowser/gtk/BrowserWindow.c
 @@ -73,7 +73,7 @@ struct _BrowserWindowClass {
@@ -21739,7 +20660,7 @@ index bd00606c26b6fedb75978ed26a9b07f4b70828d8..8460a4ae5ff7461e3435fe2e704bb04e
      gtk_window_set_title(GTK_WINDOW(window), privateTitle ? privateTitle : title);
      g_free(privateTitle);
  }
-@@ -520,8 +514,12 @@ static gboolean webViewDecidePolicy(WebKitWebView *webView, WebKitPolicyDecision
+@@ -524,8 +518,12 @@ static gboolean webViewDecidePolicy(WebKitWebView *webView, WebKitPolicyDecision
          return FALSE;
  
      WebKitNavigationAction *navigationAction = webkit_navigation_policy_decision_get_navigation_action(WEBKIT_NAVIGATION_POLICY_DECISION(decision));
@@ -21754,30 +20675,51 @@ index bd00606c26b6fedb75978ed26a9b07f4b70828d8..8460a4ae5ff7461e3435fe2e704bb04e
          return FALSE;
  
      /* Multiple tabs are not allowed in editor mode. */
-@@ -1498,6 +1496,12 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event)
+@@ -1502,6 +1500,28 @@ static gboolean browserWindowDeleteEvent(GtkWidget *widget, GdkEventAny* event)
  }
  #endif
  
++#if GTK_CHECK_VERSION(3, 98, 0)
++static void zero_widget_measure (GtkWidget      *widget,
++                    GtkOrientation  orientation,
++                    int             for_size,
++                    int            *minimum_size,
++                    int            *natural_size,
++                    int            *minimum_baseline,
++                    int            *natural_baseline)
++{
++    *minimum_size = 10;
++    *natural_size = 10;
++    // *minimum_baseline = 10;
++    // *natural_baseline = 10;
++}
++#else
 +static void zeroPreferredSize(GtkWidget* widget, gint* minimumSize, gint* naturalSize)
 +{
 +    *minimumSize = 10;
 +    *naturalSize = 10;
 +}
++#endif
 +
  static void browser_window_class_init(BrowserWindowClass *klass)
  {
      GObjectClass *gobjectClass = G_OBJECT_CLASS(klass);
-@@ -1511,6 +1515,14 @@ static void browser_window_class_init(BrowserWindowClass *klass)
+@@ -1515,6 +1535,19 @@ static void browser_window_class_init(BrowserWindowClass *klass)
      GtkWidgetClass *widgetClass = GTK_WIDGET_CLASS(klass);
      widgetClass->delete_event = browserWindowDeleteEvent;
  #endif
 +
 +// Playwrigth begin
-+    // Override preferred (which is minimum :-) size to 0 so that we can
-+    // emulate arbitrary resolution.
++// Override preferred (which is minimum :-) size to 0 so that we can
++// emulate arbitrary resolution.
++#if GTK_CHECK_VERSION(3, 98, 0)
++    GtkWidgetClass* browserWidgetClass = GTK_WIDGET_CLASS(klass);
++    browserWidgetClass->measure = zero_widget_measure;
++#else
 +    GtkWidgetClass* browserWidgetClass = GTK_WIDGET_CLASS(klass);
 +    browserWidgetClass->get_preferred_width = zeroPreferredSize;
 +    browserWidgetClass->get_preferred_height = zeroPreferredSize;
++#endif
 +// Playwrigth end
  }
  
@@ -21796,10 +20738,10 @@ index 1fd07efb828b85b6d8def6c6cd92a0c11debfe1b..da9fac7975d477857ead2adb1d67108d
  
  typedef struct _BrowserWindow        BrowserWindow;
 diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
-index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee6c664754 100644
+index d3fbb968ee463f86c64fecb855b46c8634b4b72d..01dbbfbb93f2cfa6eb6440cce9794ec99b097c30 100644
 --- a/Tools/MiniBrowser/gtk/main.c
 +++ b/Tools/MiniBrowser/gtk/main.c
-@@ -75,7 +75,12 @@ static char* timeZone;
+@@ -65,9 +65,14 @@ static char* timeZone;
  static gboolean enableITP;
  static gboolean exitAfterLoad;
  static gboolean webProcessCrashed;
@@ -21808,14 +20750,16 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
 +static gboolean noStartupWindow;
 +static const char *userDataDir;
  static gboolean printVersion;
+ static char *configFile;
+ static GSettings *interfaceSettings;
 +static GtkApplication *browserApplication = NULL;
  
  #if !GTK_CHECK_VERSION(3, 98, 0)
  static gboolean enableSandbox;
-@@ -179,6 +184,10 @@ static const GOptionEntry commandLineOptions[] =
-     { "exit-after-load", 0, 0, G_OPTION_ARG_NONE, &exitAfterLoad, "Quit the browser after the load finishes", NULL },
+@@ -172,6 +177,10 @@ static const GOptionEntry commandLineOptions[] =
      { "time-zone", 't', 0, G_OPTION_ARG_STRING, &timeZone, "Set time zone", "TIMEZONE" },
      { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WebKitGTK version", NULL },
+     { "config", 'C', 0, G_OPTION_ARG_FILENAME, &configFile, "Path to a configuration file", "PATH" },
 +    { "inspector-pipe", 0, 0, G_OPTION_ARG_NONE, &inspectorPipe, "Open pipe connection to the remote inspector", NULL },
 +    { "user-data-dir", 0, 0, G_OPTION_ARG_STRING, &userDataDir, "Default profile persistence folder location", NULL },
 +    { "headless", 0, 0, G_OPTION_ARG_NONE, &headless, "Noop headless operation", NULL },
@@ -21823,15 +20767,20 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
      { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
      { 0, 0, 0, 0, 0, 0, 0 }
  };
-@@ -736,6 +745,57 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
+@@ -729,6 +738,70 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
      g_main_loop_quit(data->mainLoop);
  }
  
 +static WebKitSettings* createPlaywrightSettings() {
 +    WebKitSettings* webkitSettings = webkit_settings_new();
++#if GTK_CHECK_VERSION(3, 98, 0)
++    // FIXME(Playwright): in GTK4, WEBKIT_HARDWARE_ACCELERATION_POLICY_ALWAYS is the default, but the page content is just black in that case.
++    webkit_settings_set_hardware_acceleration_policy(webkitSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
++#else
 +    // Playwright: revert to the default state before https://github.com/WebKit/WebKit/commit/a73a25b9ea9229987c8fa7b2e092e6324cb17913
 +    webkit_settings_set_hardware_acceleration_policy(webkitSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER);
 +    webkit_settings_set_hardware_acceleration_policy(webkitSettings, WEBKIT_HARDWARE_ACCELERATION_POLICY_ON_DEMAND);
++#endif
 +    return webkitSettings;
 +}
 +
@@ -21845,10 +20794,18 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
 +    WebKitWebView *newWebView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
 +        "web-context", context,
 +        "settings", createPlaywrightSettings(),
++#if GTK_CHECK_VERSION(3, 98, 0)
++        "network-session", webkit_web_context_get_network_session_for_automation(context),
++#else
 +        "is-ephemeral", webkit_web_context_is_ephemeral(context),
++#endif
 +        "is-controlled-by-automation", TRUE,
 +        NULL));
++#if GTK_CHECK_VERSION(3, 98, 0)
++    GtkWidget *newWindow = browser_window_new(NULL, context, webkit_web_context_get_network_session_for_automation(context));
++#else
 +    GtkWidget *newWindow = browser_window_new(NULL, context);
++#endif
 +    gtk_window_set_application(GTK_WINDOW(newWindow), browserApplication);
 +    browser_window_append_view(BROWSER_WINDOW(newWindow), newWebView);
 +    gtk_widget_grab_focus(GTK_WIDGET(newWebView));
@@ -21881,7 +20838,7 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
  static void startup(GApplication *application)
  {
      const char *actionAccels[] = {
-@@ -766,6 +826,14 @@ static void startup(GApplication *application)
+@@ -787,17 +860,30 @@ static void setupDarkMode(GtkSettings *settings)
  
  static void activate(GApplication *application, WebKitSettings *webkitSettings)
  {
@@ -21896,7 +20853,36 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
  #if GTK_CHECK_VERSION(3, 98, 0)
      WebKitWebContext *webContext = g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "time-zone-override", timeZone, NULL);
      webkit_web_context_set_automation_allowed(webContext, automationMode);
-@@ -818,9 +886,12 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+     g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), application);
+ 
+     WebKitNetworkSession *networkSession;
+-    if (automationMode)
+-        networkSession = g_object_ref(webkit_web_context_get_network_session_for_automation(webContext));
+-    else if (privateMode)
++    if (userDataDir) {
++        char *dataDirectory = g_build_filename(userDataDir, "data", NULL);
++        char *cacheDirectory = g_build_filename(userDataDir, "cache", NULL);
++        networkSession = webkit_network_session_new(dataDirectory, cacheDirectory);
++        g_free(dataDirectory);
++        g_free(cacheDirectory);
++        cookiesFile = g_build_filename(userDataDir, "cookies.txt", NULL);
++    } else if (inspectorPipe || privateMode || automationMode) {
+         networkSession = webkit_network_session_new_ephemeral();
+-    else {
++    } else {
+         char *dataDirectory = g_build_filename(g_get_user_data_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
+         char *cacheDirectory = g_build_filename(g_get_user_cache_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
+         networkSession = webkit_network_session_new(dataDirectory, cacheDirectory);
+@@ -805,6 +891,8 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+         g_free(cacheDirectory);
+     }
+ 
++    webkit_web_context_set_network_session_for_automation(webContext, networkSession);
++
+     webkit_network_session_set_itp_enabled(networkSession, enableITP);
+ 
+     if (!automationMode) {
+@@ -839,9 +927,12 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
      }
  #else
      WebKitWebsiteDataManager *manager;
@@ -21911,7 +20897,7 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
          char *dataDirectory = g_build_filename(g_get_user_data_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
          char *cacheDirectory = g_build_filename(g_get_user_cache_dir(), "webkitgtk-" WEBKITGTK_API_VERSION, "MiniBrowser", NULL);
          manager = webkit_website_data_manager_new("base-data-directory", dataDirectory, "base-cache-directory", cacheDirectory, NULL);
-@@ -871,6 +942,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+@@ -891,6 +982,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
      // Enable the favicon database.
      webkit_web_context_set_favicon_database_directory(webContext, NULL);
  #endif
@@ -21919,7 +20905,7 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
  
      webkit_web_context_register_uri_scheme(webContext, BROWSER_ABOUT_SCHEME, (WebKitURISchemeRequestCallback)aboutURISchemeRequestCallback, NULL, NULL);
  
-@@ -941,9 +1013,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
+@@ -955,9 +1047,7 @@ static void activate(GApplication *application, WebKitSettings *webkitSettings)
                  if (exitAfterLoad)
                      exitAfterWebViewLoadFinishes(webView, application);
              }
@@ -21930,7 +20916,7 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
          }
      } else {
          WebKitWebView *webView = createBrowserTab(mainWindow, webkitSettings, userContentManager, defaultWebsitePolicies);
-@@ -993,7 +1063,7 @@ int main(int argc, char *argv[])
+@@ -1007,7 +1097,7 @@ int main(int argc, char *argv[])
      g_option_context_add_group(context, gst_init_get_option_group());
  #endif
  
@@ -21939,7 +20925,7 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
      webkit_settings_set_enable_developer_extras(webkitSettings, TRUE);
      webkit_settings_set_enable_webgl(webkitSettings, TRUE);
      webkit_settings_set_enable_media_stream(webkitSettings, TRUE);
-@@ -1025,9 +1095,11 @@ int main(int argc, char *argv[])
+@@ -1059,9 +1149,11 @@ int main(int argc, char *argv[])
      }
  
      GtkApplication *application = gtk_application_new("org.webkitgtk.MiniBrowser", G_APPLICATION_NON_UNIQUE);
@@ -21950,12 +20936,12 @@ index 451e0333dd4e8f5d6313fa80c5027ef2661a61ac..7398af4772ed9a479b1632e38af2d4ee
 +    browserApplication = NULL;
      g_object_unref(application);
  
-     return exitAfterLoad && webProcessCrashed ? 1 : 0;
+     g_clear_object(&interfaceSettings);
 diff --git a/Tools/MiniBrowser/wpe/main.cpp b/Tools/MiniBrowser/wpe/main.cpp
-index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780bbc2afa3 100644
+index 6a898a5bd79a4e6f2f26be7f63347cef7a5c0ab4..d895941dab0f7a0bdfafcf60f203aa82c46874a6 100644
 --- a/Tools/MiniBrowser/wpe/main.cpp
 +++ b/Tools/MiniBrowser/wpe/main.cpp
-@@ -45,6 +45,9 @@ static gboolean headlessMode;
+@@ -52,6 +52,9 @@ static gboolean headlessMode;
  static gboolean privateMode;
  static gboolean automationMode;
  static gboolean ignoreTLSErrors;
@@ -21965,9 +20951,9 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
  static const char* contentFilter;
  static const char* cookiesFile;
  static const char* cookiesPolicy;
-@@ -78,6 +81,9 @@ static const GOptionEntry commandLineOptions[] =
-     { "use-wpe-platform-api", 0, 0, G_OPTION_ARG_NONE, &useWPEPlatformAPI, "Use the WPE platform API", nullptr },
+@@ -130,6 +133,9 @@ static const GOptionEntry commandLineOptions[] =
  #endif
+     { "size", 's', 0, G_OPTION_ARG_CALLBACK, reinterpret_cast<gpointer>(parseWindowSize), "Specify the window size to use, e.g. --size=\"800x600\"", nullptr },
      { "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WPE version", nullptr },
 +    { "inspector-pipe", 'v', 0, G_OPTION_ARG_NONE, &inspectorPipe, "Expose remote debugging protocol over pipe", nullptr },
 +    { "user-data-dir", 0, 0, G_OPTION_ARG_STRING, &userDataDir, "Default profile persistence folder location", "FILE" },
@@ -21975,7 +20961,7 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
      { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" },
      { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
  };
-@@ -220,15 +226,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
+@@ -288,15 +294,38 @@ static void filterSavedCallback(WebKitUserContentFilterStore *store, GAsyncResul
      g_main_loop_quit(data->mainLoop);
  }
  
@@ -22014,9 +21000,9 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
 +
 +static WebKitWebView* createWebViewImpl(WebKitWebView* webView, WebKitWebContext *webContext, gpointer user_data)
  {
- 
-     auto backend = createViewBackend(1280, 720);
-@@ -244,18 +273,37 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+     auto backend = createViewBackend(defaultWindowWidthLegacyAPI, defaultWindowHeightLegacyAPI);
+     WebKitWebViewBackend* viewBackend = nullptr;
+@@ -311,12 +340,27 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
              }, backend.release());
      }
  
@@ -22048,27 +21034,50 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
 +            nullptr));
 +    }
  
+ #if ENABLE_WPE_PLATFORM
+     if (auto* wpeView = webkit_web_view_get_wpe_view(newWebView)) {
+@@ -328,9 +372,13 @@ static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationActi
+ 
      g_signal_connect(newWebView, "create", G_CALLBACK(createWebView), user_data);
      g_signal_connect(newWebView, "close", G_CALLBACK(webViewClose), user_data);
- 
-     g_hash_table_add(openViews, newWebView);
- 
+-
++// Playwright begin
 +    g_signal_connect(newWebView, "load-failed", G_CALLBACK(webViewLoadFailed), nullptr);
 +    g_signal_connect(newWebView, "script-dialog", G_CALLBACK(scriptDialog), nullptr);
 +    g_signal_connect(newWebView, "script-dialog-handled", G_CALLBACK(scriptDialogHandled), nullptr);
 +    g_signal_connect(newWebView, "decide-policy", G_CALLBACK(webViewDecidePolicy), nullptr);
++// Playwright end
+     g_hash_table_add(openViews, newWebView);
+-
      return newWebView;
  }
  
-@@ -269,13 +317,89 @@ static WebKitFeature* findFeature(WebKitFeatureList* featureList, const char* id
-     return nullptr;
+@@ -418,13 +466,105 @@ void loadConfigFile(WPESettings* settings)
  }
+ #endif
  
 +static WebKitWebView* createWebView(WebKitWebView* webView, WebKitNavigationAction*, gpointer user_data)
 +{
 +    return createWebViewImpl(webView, nullptr, user_data);
 +}
 +
++inline bool response_policy_decision_can_show(WebKitResponsePolicyDecision* responseDecision)
++{
++    if (webkit_response_policy_decision_is_mime_type_supported(responseDecision))
++        return true;
++    auto response = webkit_response_policy_decision_get_response(responseDecision);
++    const auto statusCode = webkit_uri_response_get_status_code(response);
++    if (statusCode == 205 || statusCode == 204)
++        return true;
++    const gchar* mimeType = webkit_uri_response_get_mime_type(response);
++    if (!mimeType || mimeType[0] == '\0')
++        return false;
++    // https://bugs.webkit.org/show_bug.cgi?id=277204 / Ubuntu 24.04 / glib 2.76+ or higher
++    if (g_ascii_strcasecmp(mimeType, "application/x-zerosize") == 0)
++        return true;
++    return false;
++}
++
 +static gboolean webViewDecidePolicy(WebKitWebView *webView, WebKitPolicyDecision *decision, WebKitPolicyDecisionType decisionType, gpointer user_data)
 +{
 +    if (decisionType == WEBKIT_POLICY_DECISION_TYPE_RESPONSE) {
@@ -22076,8 +21085,7 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
 +        if (!webkit_response_policy_decision_is_main_frame_main_resource(responseDecision))
 +            return FALSE;
 +
-+        const gchar* mimeType = webkit_uri_response_get_mime_type(webkit_response_policy_decision_get_response(responseDecision));
-+        if (!webkit_response_policy_decision_is_mime_type_supported(responseDecision) && mimeType && mimeType[0] != '\0') {
++        if (!response_policy_decision_can_show(responseDecision)) {
 +            webkit_policy_decision_download(decision);
 +            return TRUE;
 +        }
@@ -22117,7 +21125,7 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
 +    return webView;
 +}
 +
-+static void quitBroserApplication(WebKitBrowserInspector* browser_inspector, gpointer data)
++static void quitBroserApplication(WebKitBrowserInspector*, gpointer data)
 +{
 +    GApplication* application = static_cast<GApplication*>(data);
 +    g_application_quit(application);
@@ -22151,7 +21159,7 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
          webkit_network_session_set_itp_enabled(networkSession, enableITP);
  
          if (proxy) {
-@@ -302,10 +426,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -451,10 +591,18 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
              webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesFile, storageType);
          }
      }
@@ -22172,7 +21180,7 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
      webkit_website_data_manager_set_itp_enabled(manager, enableITP);
  
      if (proxy) {
-@@ -336,6 +468,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -485,6 +633,7 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
      }
  #endif
  
@@ -22180,7 +21188,7 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
      WebKitUserContentManager* userContentManager = nullptr;
      if (contentFilter) {
          GFile* contentFilterFile = g_file_new_for_commandline_arg(contentFilter);
-@@ -408,6 +541,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+@@ -563,6 +712,15 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
          "autoplay", WEBKIT_AUTOPLAY_ALLOW,
          nullptr);
  
@@ -22196,16 +21204,26 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
      auto* webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW,
          "backend", viewBackend,
          "web-context", webContext,
-@@ -436,8 +578,6 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
-         g_signal_connect(wpeView, "event", G_CALLBACK(wpeViewEventCallback), webView);
+@@ -609,12 +767,16 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+     }
  #endif
  
 -    openViews = g_hash_table_new_full(nullptr, nullptr, g_object_unref, nullptr);
 -
-     webkit_web_context_set_automation_allowed(webContext, automationMode);
      g_signal_connect(webContext, "automation-started", G_CALLBACK(automationStartedCallback), webView);
      g_signal_connect(webView, "permission-request", G_CALLBACK(decidePermissionRequest), nullptr);
-@@ -450,16 +590,9 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
+     g_signal_connect(webView, "create", G_CALLBACK(createWebView), application);
+     g_signal_connect(webView, "close", G_CALLBACK(webViewClose), application);
++// Playwright begin
++    g_signal_connect(webView, "load-failed", G_CALLBACK(webViewLoadFailed), nullptr);
++    g_signal_connect(webView, "script-dialog", G_CALLBACK(scriptDialog), nullptr);
++    g_signal_connect(webView, "script-dialog-handled", G_CALLBACK(scriptDialogHandled), nullptr);
++    g_signal_connect(webView, "decide-policy", G_CALLBACK(webViewDecidePolicy), nullptr);
++// Playwright end
+     g_hash_table_add(openViews, webView);
+ 
+     WebKitColor color;
+@@ -622,16 +784,11 @@ static void activate(GApplication* application, WPEToolingBackends::ViewBackend*
          webkit_web_view_set_background_color(webView, &color);
  
      if (uriArguments) {
@@ -22218,14 +21236,16 @@ index 3c2476471ef67299da6312d0f995fc0738aa96c9..b13ab78bfe62c8c2cdd052e24255a780
 -        g_object_unref(file);
 -        webkit_web_view_load_uri(webView, url);
 -        g_free(url);
--    } else if (automationMode)
+-    } else if (!automationMode)
 +        // Playwright: avoid weird url transformation like http://trac.webkit.org/r240840
 +        webkit_web_view_load_uri(webView, uriArguments[0]);
 +    } else if (automationMode || inspectorPipe)
-         webkit_web_view_load_uri(webView, "about:blank");
-     else
++        webkit_web_view_load_uri(webView, "about:blank");
++    else
          webkit_web_view_load_uri(webView, "https://wpewebkit.org");
-@@ -533,8 +666,14 @@ int main(int argc, char *argv[])
+ 
+     g_object_unref(webContext);
+@@ -728,8 +885,14 @@ int main(int argc, char *argv[])
          }
      }
  
@@ -22253,10 +21273,10 @@ index 1067b31bc989748dfcc5502209d36d001b9b239e..7629263fb8bc93dca6dfc01c75eed8d2
 +    add_subdirectory(Playwright/win)
 +endif ()
 diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
-index 39c351abbdd7b1b7f7016c5fd071ec2ae59b4a42..dc804e1d5284b15da6fa0679932d6cca8ece499a 100755
+index fcbf4620e66e0a49396fb650f2da1fad43e8a6fc..7c38c04e082313cbd7513ba8b5626f377f6850d4 100755
 --- a/Tools/Scripts/build-webkit
 +++ b/Tools/Scripts/build-webkit
-@@ -273,7 +273,7 @@ if (isAppleCocoaWebKit()) {
+@@ -278,7 +278,7 @@ if (isAppleCocoaWebKit()) {
          push @projects, ("Source/WebKit");
  
          if (!isEmbeddedWebKit()) {
@@ -22281,24 +21301,32 @@ index 9e53f459e444b9c10fc5248f0e8059df6c1e0041..c17c875a7dd3ca05c4489578ab32378b
      "${WebKitTestRunner_DIR}/InjectedBundle/Bindings/AccessibilityController.idl"
      "${WebKitTestRunner_DIR}/InjectedBundle/Bindings/AccessibilityTextMarker.idl"
 diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
-index 244cfc247fa50bf073ba523913543cab0c6f1b3b..d1cd4657f513d1be167f8d1176dc1217f57acbbd 100644
+index ee6c2488fd655c40d250b405a82358e81e2661f6..5b9baf3c2ee0e9bb28fd765c7fdacb3a70f9ef36 100644
 --- a/Tools/WebKitTestRunner/TestController.cpp
 +++ b/Tools/WebKitTestRunner/TestController.cpp
-@@ -964,6 +964,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
-         0, // requestStorageAccessConfirm
+@@ -713,6 +713,7 @@ PlatformWebView* TestController::createOtherPlatformWebView(PlatformWebView* par
+         nullptr, // requestStorageAccessConfirm
+         nullptr, // shouldAllowDeviceOrientationAndMotionAccess
+         nullptr, // runWebAuthenticationPanel
++        0,       // handleJavaScriptDialog
+         nullptr, // decidePolicyForSpeechRecognitionPermissionRequest
+         nullptr, // decidePolicyForMediaKeySystemPermissionRequest
+         nullptr, // queryPermission
+@@ -1188,6 +1189,7 @@ void TestController::createWebViewWithOptions(const TestOptions& options)
+         nullptr, // requestStorageAccessConfirm
          shouldAllowDeviceOrientationAndMotionAccess,
          runWebAuthenticationPanel,
 +        0, // handleJavaScriptDialog
-         0,
+         nullptr, // decidePolicyForSpeechRecognitionPermissionRequest
          decidePolicyForMediaKeySystemPermissionRequest,
          queryPermission,
 diff --git a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-index c7c925b66ea04d8f7a44fb7410ad45acb74f022f..b4738697e5ecb5c947d2bc1864a0f3907d9a3795 100644
+index 9419696018c076d0e5b4ef04ea7c58be9504cd96..06c537e3c022517449068a11ea59400413e8f4dc 100644
 --- a/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
 +++ b/Tools/WebKitTestRunner/mac/EventSenderProxy.mm
-@@ -950,4 +950,51 @@ void EventSenderProxy::scaleGestureEnd(double scale)
- 
- #endif // ENABLE(MAC_GESTURE_EVENTS)
+@@ -961,4 +961,51 @@ void EventSenderProxy::waitForPendingMouseEvents()
+     }
+ }
  
 +#if ENABLE(TOUCH_EVENTS)
 +void EventSenderProxy::addTouchPoint(int, int)
@@ -22348,117 +21376,56 @@ index c7c925b66ea04d8f7a44fb7410ad45acb74f022f..b4738697e5ecb5c947d2bc1864a0f390
 +
 +
  } // namespace WTR
-diff --git a/Tools/glib/dependencies/apt b/Tools/glib/dependencies/apt
-index 7ae5cb94f966df2b730fc54489abf1d8174ed390..c1baaeb0a411ad80d9f6771bd8a3811c4d71d337 100644
---- a/Tools/glib/dependencies/apt
-+++ b/Tools/glib/dependencies/apt
-@@ -1,11 +1,11 @@
- #!/usr/bin/env bash
- 
--# If the package $1 is available, prints it. Otherwise prints $2.
-+# If the package $1 is available, prints it. Otherwise if package $2 is available, prints $2.
- # Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
- aptIfElse() {
-     if apt-cache show $1 &>/dev/null; then
-         echo $1
--    else
-+    elif apt-cache show $2 &>/dev/null; then
-         echo $2
-     fi
- }
-@@ -71,10 +71,12 @@ PACKAGES=(
-     $(aptIfExists libwpe-1.0-dev)
-     $(aptIfExists libwpebackend-fdo-1.0-dev)
-     libxml2-utils
-+    libxcb-glx0-dev
-     libxslt1-dev
-     mesa-common-dev
-     ninja-build
-     patch
-+    patchelf
-     ruby
- 
-     # These are dependencies necessary for running tests.
-diff --git a/Tools/gtk/dependencies/apt b/Tools/gtk/dependencies/apt
-index 1e2a9202f88c63afa6525d97d0f945438f5f2032..e6cdee08aff723eb5c6b16491051ca39dfee3f5b 100644
---- a/Tools/gtk/dependencies/apt
-+++ b/Tools/gtk/dependencies/apt
-@@ -33,6 +33,9 @@ PACKAGES+=(
-     libxtst-dev
-     unifdef
-     xfonts-utils
-+    $(aptIfElse libenchant-dev libenchant-2-dev)
-+    $(aptIfExists libwpe-1.0-dev)
-+    $(aptIfExists libwpebackend-fdo-1.0-dev)
- 
-     # These are dependencies necessary for running tests.
-     cups-daemon
-diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
-index 5453eb855928744d58e459f8a986535825dc29a0..b7d9568aef262d8e2825569b021ea0f5d0923ba0 100644
---- a/Tools/gtk/jhbuild.modules
-+++ b/Tools/gtk/jhbuild.modules
-@@ -252,10 +252,10 @@
-       <dep package="glib-networking"/>
-       <dep package="libpsl"/>
-     </dependencies>
--    <branch module="/sources/libsoup/3.0/libsoup-${version}.tar.xz"
--            version="3.0.7"
-+    <branch module="/sources/libsoup/3.2/libsoup-${version}.tar.xz"
-+            version="3.2.2"
-             repo="download.gnome.org"
--            hash="sha256:ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8">
-+            hash="sha256:83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1">
-     </branch>
-   </meson>
- 
 diff --git a/Tools/jhbuild/jhbuild-minimal.modules b/Tools/jhbuild/jhbuild-minimal.modules
-index fe58a444522de94d8f2a57c538a8e7bca93e5c74..78fd69a2a98cb0a826cba13f95c3f419b4376045 100644
+index 3a0b7425900b14ce2aa0d48aa914cd69bff1f332..0ce07cc1368c6f521b51d6300dca9c4d078beef3 100644
 --- a/Tools/jhbuild/jhbuild-minimal.modules
 +++ b/Tools/jhbuild/jhbuild-minimal.modules
-@@ -32,7 +32,6 @@
-       <dep package="libjxl"/>
-       <dep package="libsoup"/>
-       <dep package="libvpx"/>
--      <dep package="openxr"/>
-       <dep package="wayland"/>
-       <dep package="wayland-protocols"/>
-       <dep package="wpebackend-fdo"/>
-@@ -132,10 +131,10 @@
-       <dep package="glib-networking"/>
-       <dep package="libpsl"/>
+@@ -67,8 +67,8 @@
+   <cmake id="libwpe">
+     <branch repo="github-tarball"
+             module="WebPlatformForEmbedded/libwpe/releases/download/${version}/libwpe-${version}.tar.xz"
+-            version="1.14.1"
+-            hash="sha256:b1d0cdcf0f8dbb494e65b0f7913e357106da9a0d57f4fbb7b9d1238a6dbe9ade"/>
++            version="1.16.0"
++            hash="sha256:c7f3a3c6b3d006790d486dc7cceda2b6d2e329de07f33bc47dfc53f00f334b2a"/>
+   </cmake>
+ 
+   <meson id="wpebackend-fdo">
+@@ -77,8 +77,8 @@
      </dependencies>
--    <branch module="/sources/libsoup/3.0/libsoup-${version}.tar.xz"
--            version="3.0.7"
-+    <branch module="/sources/libsoup/3.2/libsoup-${version}.tar.xz"
-+            version="3.2.2"
-             repo="download.gnome.org"
--            hash="sha256:ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8">
-+            hash="sha256:83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1">
+     <branch repo="github-tarball"
+             module="Igalia/WPEBackend-fdo/releases/download/${version}/wpebackend-fdo-${version}.tar.xz"
+-            version="1.14.2"
+-            hash="sha256:93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38">
++            version="1.14.3"
++            hash="sha256:10121842595a850291db3e82f3db0b9984df079022d386ce42c2b8508159dc6c">
      </branch>
    </meson>
  
-@@ -231,6 +230,16 @@
+@@ -186,7 +186,6 @@
+   </meson>
+ 
+   <meson id="libsoup" mesonargs="-Dgssapi=disabled -Dvapi=disabled -Dntlm=disabled -Dsysprof=disabled -Dautobahn=disabled -Dpkcs11_tests=disabled">
+-    <pkg-config>libsoup-3.0.pc</pkg-config>
+     <dependencies>
+       <dep package="glib"/>
+       <dep package="glib-networking"/>
+@@ -194,8 +193,8 @@
      </dependencies>
+     <branch module="GNOME/libsoup.git"
+             repo="github.com"
+-            tag="3.6.0"
+-            version="3.6.0"
++            tag="3.6.5"
++            version="3.6.5"
+             checkoutdir="libsoup-${version}"/>
    </meson>
  
-+  <!-- libdrm required for function 'drmGetDeviceFromDevId' -->
-+  <meson id="libdrm" mesonargs="-Dtegra=enabled -Dcairo-tests=disabled -Dman-pages=disabled -Dvalgrind=disabled -Dudev=false -Dtests=false">
-+    <pkg-config>libdrm.pc</pkg-config>
-+    <branch module="mesa/drm.git"
-+            version="2.4.113"
-+            tag="libdrm-2.4.113"
-+            checkoutdir="libdrm-2.4.113"
-+            repo="git.freedesktop.org" />
-+  </meson>
-+
-   <!-- libjxl required for JPEGXL support -->
-   <cmake id="libjxl"
-          cmakeargs="-DBUILD_TESTING=OFF
 diff --git a/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp b/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp
-index 05b0196555fbc993ebff3088c1f5926c4cfe391a..dd82d6c324f158045372fb48552fa919d3f50b4f 100644
+index df22308266c6f69d24a60905f8d05e4e80f21b9b..2d0838070dc10793418cbb648b095a5ffa76f1b8 100644
 --- a/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp
 +++ b/Tools/wpe/backends/fdo/HeadlessViewBackendFdo.cpp
-@@ -180,32 +180,30 @@ void HeadlessViewBackend::updateSnapshot(PlatformBuffer exportedBuffer)
+@@ -210,32 +210,30 @@ void HeadlessViewBackend::updateSnapshot(PlatformBuffer exportedBuffer)
              return;
      }
  
@@ -22507,7 +21474,7 @@ index 05b0196555fbc993ebff3088c1f5926c4cfe391a..dd82d6c324f158045372fb48552fa919
          wl_shm_buffer_end_access(shmBuffer);
      }
  
-@@ -214,7 +212,7 @@ void HeadlessViewBackend::updateSnapshot(PlatformBuffer exportedBuffer)
+@@ -244,7 +242,7 @@ void HeadlessViewBackend::updateSnapshot(PlatformBuffer exportedBuffer)
          cairo_surface_destroy(m_snapshot);
  
      m_snapshot = cairo_image_surface_create_for_data(buffer, CAIRO_FORMAT_ARGB32,
@@ -22516,51 +21483,8 @@ index 05b0196555fbc993ebff3088c1f5926c4cfe391a..dd82d6c324f158045372fb48552fa919
  
      static cairo_user_data_key_t bufferKey;
      cairo_surface_set_user_data(m_snapshot, &bufferKey, buffer,
-diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
-index 33286bb2ee2941d430d8e49dba667f700f73edc4..77cea8a9d0e1762da2545852698fdd16dd9bab37 100644
---- a/Tools/wpe/jhbuild.modules
-+++ b/Tools/wpe/jhbuild.modules
-@@ -20,6 +20,7 @@
-       <dep package="libepoxy"/>
-       <dep package="libgcrypt"/>
-       <dep package="libgpg-error"/>
-+      <dep package="libdrm"/>
-       <dep package="libjxl"/>
-       <dep package="libsoup"/>
-       <dep package="libwpe"/>
-@@ -102,10 +103,10 @@
-       <dep package="glib-networking"/>
-       <dep package="libpsl"/>
-     </dependencies>
--    <branch module="/sources/libsoup/3.0/libsoup-${version}.tar.xz"
--            version="3.0.7"
-+    <branch module="/sources/libsoup/3.2/libsoup-${version}.tar.xz"
-+            version="3.2.2"
-             repo="download.gnome.org"
--            hash="sha256:ebdf90cf3599c11acbb6818a9d9e3fc9d2c68e56eb829b93962972683e1bf7c8">
-+            hash="sha256:83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1">
-     </branch>
-   </meson>
- 
-@@ -334,6 +335,16 @@
-             hash="sha256:c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf"/>
-   </autotools>
- 
-+  <!-- libdrm required for function 'drmGetDeviceFromDevId' -->
-+  <meson id="libdrm" mesonargs="-Dtegra=enabled -Dcairo-tests=disabled -Dman-pages=disabled -Dvalgrind=disabled -Dudev=false -Dtests=false">
-+    <pkg-config>libdrm.pc</pkg-config>
-+    <branch module="mesa/drm.git"
-+            version="2.4.113"
-+            tag="libdrm-2.4.113"
-+            checkoutdir="libdrm-2.4.113"
-+            repo="git.freedesktop.org" />
-+  </meson>
-+
-   <!-- libjxl required for JPEGXL support -->
-   <cmake id="libjxl"
-          cmakeargs="-DBUILD_TESTING=OFF
 diff --git a/WebKit.xcworkspace/contents.xcworkspacedata b/WebKit.xcworkspace/contents.xcworkspacedata
-index a0f02e61be7e667c6ba164ca578109af36ac28d9..8f5af2e82c167ba6798fb7fde24a9f641f6554a5 100644
+index 3ad442a8691847c6921c5f66a805b7b0523b1e27..95407368a95d2f7d6fb697110912014cabe29afa 100644
 --- a/WebKit.xcworkspace/contents.xcworkspacedata
 +++ b/WebKit.xcworkspace/contents.xcworkspacedata
 @@ -4,6 +4,9 @@
@@ -22598,3 +21522,32 @@ index ded307890926eaf0ca169aaef39ea08bd982a47a..2db0c0abdda702fdff9314ba341b63c5
           <BuildActionEntry
              buildForTesting = "YES"
              buildForRunning = "YES"
+diff --git a/vcpkg.json b/vcpkg.json
+index 9ffb2efbf87058a7d314a9ea4dc25f33c6acea16..a5491c8967934b85d9e866da9b0677cfac3f266f 100644
+--- a/vcpkg.json
++++ b/vcpkg.json
+@@ -1,7 +1,8 @@
+ {
+   "name": "webkit",
+   "dependencies": [
+-    "icu"
++    "icu",
++    "libvpx"
+   ],
+   "features": {
+     "avif": {
+@@ -96,5 +97,11 @@
+         "woff2"
+       ]
+     }
+-  }
+-}
++  },
++  "overrides": [
++    {
++      "name": "libvpx",
++      "version": "1.13.1#3"
++    }
++  ]
++}
+\ No newline at end of file
diff --git a/browser_patches/winldd/BUILD_NUMBER b/browser_patches/winldd/BUILD_NUMBER
index 9540e56f97ca2..fb35a14c02716 100644
--- a/browser_patches/winldd/BUILD_NUMBER
+++ b/browser_patches/winldd/BUILD_NUMBER
@@ -1 +1 @@
-1006
+1007
diff --git a/browser_patches/winldd/archive.sh b/browser_patches/winldd/archive.sh
index 02fd1ab8bb37f..898dcb825890c 100755
--- a/browser_patches/winldd/archive.sh
+++ b/browser_patches/winldd/archive.sh
@@ -39,5 +39,4 @@ fi
 
 # create a TMP directory to copy all necessary files
 cd ./x64/Release
-zip $ZIP_PATH ./PrintDeps.exe
-
+7z a "$ZIP_PATH" ./PrintDeps.exe
diff --git a/browser_patches/winldd/buildwin.bat b/browser_patches/winldd/buildwin.bat
index 51e2f839da46f..b20447214aac1 100644
--- a/browser_patches/winldd/buildwin.bat
+++ b/browser_patches/winldd/buildwin.bat
@@ -1,3 +1,5 @@
 SET /p BUILD_NUMBER=<BUILD_NUMBER
 SET CL=/DBUILD_NUMBER=%BUILD_NUMBER%
-%DEVENV% %~dp0\PrintDeps.sln /build "Release|x64"
+
+call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
+devenv %~dp0\PrintDeps.sln /build "Release|x64"
diff --git a/docs/src/accessibility-testing-java.md b/docs/src/accessibility-testing-java.md
index 9db8246bcb150..f0363672a271e 100644
--- a/docs/src/accessibility-testing-java.md
+++ b/docs/src/accessibility-testing-java.md
@@ -14,8 +14,6 @@ A few examples of problems this can catch include:
 
 The following examples rely on the [`com.deque.html.axe-core/playwright`](https://mvnrepository.com/artifact/com.deque.html.axe-core/playwright) Maven package which adds support for running the [axe accessibility testing engine](https://www.deque.com/axe/) as part of your Playwright tests.
 
-<!-- TOC -->
-
 ## Disclaimer
 
 Automated accessibility tests can detect some common accessibility problems such as missing or invalid properties. But many accessibility problems can only be discovered through manual testing. We recommend using a combination of automated testing, manual accessibility assessments, and inclusive user testing.
@@ -72,22 +70,24 @@ For example, you can use [`AxeBuilder.include()`](https://github.com/dequelabs/a
 `AxeBuilder.analyze()` will scan the page *in its current state* when you call it. To scan parts of a page that are revealed based on UI interactions, use [Locators](./locators.md) to interact with the page before invoking `analyze()`:
 
 ```java
-@Test
-void navigationMenuFlyoutShouldNotHaveAutomaticallyDetectableAccessibilityViolations() throws Exception {
-  page.navigate("https://your-site.com/");
+public class HomepageTests {
+  @Test
+  void navigationMenuFlyoutShouldNotHaveAutomaticallyDetectableAccessibilityViolations() throws Exception {
+    page.navigate("https://your-site.com/");
 
-  page.locator("button[aria-label=\"Navigation Menu\"]").click();
+    page.locator("button[aria-label=\"Navigation Menu\"]").click();
 
-  // It is important to waitFor() the page to be in the desired
-  // state *before* running analyze(). Otherwise, axe might not
-  // find all the elements your test expects it to scan.
-  page.locator("#navigation-menu-flyout").waitFor();
+    // It is important to waitFor() the page to be in the desired
+    // state *before* running analyze(). Otherwise, axe might not
+    // find all the elements your test expects it to scan.
+    page.locator("#navigation-menu-flyout").waitFor();
 
-  AxeResults accessibilityScanResults = new AxeBuilder(page)
-    .include(Arrays.asList("#navigation-menu-flyout"))
-    .analyze();
+    AxeResults accessibilityScanResults = new AxeBuilder(page)
+      .include(Arrays.asList("#navigation-menu-flyout"))
+      .analyze();
 
-  assertEquals(Collections.emptyList(), accessibilityScanResults.getViolations());
+    assertEquals(Collections.emptyList(), accessibilityScanResults.getViolations());
+  }
 }
 ```
 
@@ -107,7 +107,7 @@ AxeResults accessibilityScanResults = new AxeBuilder(page)
 assertEquals(Collections.emptyList(), accessibilityScanResults.getViolations());
 ```
 
-You can find a complete listing of the rule tags axe-core supports in [the "Axe-core Tags" section of the axe API documentation](https://www.deque.com/axe/core-documentation/api-documentation/#axe-core-tags).
+You can find a complete listing of the rule tags axe-core supports in [the "Axe-core Tags" section of the axe API documentation](https://www.deque.com/axe/core-documentation/api-documentation/#axecore-tags).
 
 ## Handling known issues
 
@@ -160,38 +160,40 @@ This approach avoids the downsides of using `AxeBuilder.exclude()` at the cost o
 Here is an example of using fingerprints based on only rule IDs and "target" selectors pointing to each violation:
 
 ```java
-@Test
-shouldOnlyHaveAccessibilityViolationsMatchingKnownFingerprints() throws Exception {
-  page.navigate("https://your-site.com/");
+public class HomepageTests {
+  @Test
+  shouldOnlyHaveAccessibilityViolationsMatchingKnownFingerprints() throws Exception {
+    page.navigate("https://your-site.com/");
 
-  AxeResults accessibilityScanResults = new AxeBuilder(page).analyze();
+    AxeResults accessibilityScanResults = new AxeBuilder(page).analyze();
 
-  List<ViolationFingerprint> violationFingerprints = fingerprintsFromScanResults(accessibilityScanResults);
+    List<ViolationFingerprint> violationFingerprints = fingerprintsFromScanResults(accessibilityScanResults);
 
-  assertEquals(Arrays.asList(
-    new ViolationFingerprint("aria-roles", "[span[role=\"invalid\"]]"),
-    new ViolationFingerprint("color-contrast", "[li:nth-child(2) > span]"),
-    new ViolationFingerprint("label", "[input]")
-  ), violationFingerprints);
-}
+    assertEquals(Arrays.asList(
+      new ViolationFingerprint("aria-roles", "[span[role=\"invalid\"]]"),
+      new ViolationFingerprint("color-contrast", "[li:nth-child(2) > span]"),
+      new ViolationFingerprint("label", "[input]")
+    ), violationFingerprints);
+  }
 
-// You can make your "fingerprint" as specific as you like. This one considers a violation to be
-// "the same" if it corresponds the same Axe rule on the same element.
-//
-// Using a record type makes it easy to compare fingerprints with assertEquals
-public record ViolationFingerprint(String ruleId, String target) { }
-
-public List<ViolationFingerprint> fingerprintsFromScanResults(AxeResults results) {
-  return results.getViolations().stream()
-    // Each violation refers to one rule and multiple "nodes" which violate it
-    .flatMap(violation -> violation.getNodes().stream()
-      .map(node -> new ViolationFingerprint(
-        violation.getId(),
-        // Each node contains a "target", which is a CSS selector that uniquely identifies it
-        // If the page involves iframes or shadow DOMs, it may be a chain of CSS selectors
-        node.getTarget().toString()
-      )))
-    .collect(Collectors.toList());
+  // You can make your "fingerprint" as specific as you like. This one considers a violation to be
+  // "the same" if it corresponds the same Axe rule on the same element.
+  //
+  // Using a record type makes it easy to compare fingerprints with assertEquals
+  public record ViolationFingerprint(String ruleId, String target) { }
+
+  public List<ViolationFingerprint> fingerprintsFromScanResults(AxeResults results) {
+    return results.getViolations().stream()
+      // Each violation refers to one rule and multiple "nodes" which violate it
+      .flatMap(violation -> violation.getNodes().stream()
+        .map(node -> new ViolationFingerprint(
+          violation.getId(),
+          // Each node contains a "target", which is a CSS selector that uniquely identifies it
+          // If the page involves iframes or shadow DOMs, it may be a chain of CSS selectors
+          node.getTarget().toString()
+        )))
+      .collect(Collectors.toList());
+  }
 }
 ```
 
@@ -210,11 +212,11 @@ This example fixture creates an `AxeBuilder` object which is pre-configured with
 
 ```java
 class AxeTestFixtures extends TestFixtures {
-  AxeBuilder makeAxeBuilder() {
-    return new AxeBuilder(page)
-      .withTags(['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa'])
-      .exclude('#commonly-reused-element-with-known-issue');
-  }
+ AxeBuilder makeAxeBuilder() {
+   return new AxeBuilder(page)
+     .withTags(new String[]{"wcag2a", "wcag2aa", "wcag21a", "wcag21aa"})
+     .exclude("#commonly-reused-element-with-known-issue");
+ }
 }
 ```
 
@@ -231,7 +233,7 @@ public class HomepageTests extends AxeTestFixtures {
     AxeResults accessibilityScanResults = makeAxeBuilder()
       // Automatically uses the shared AxeBuilder configuration,
       // but supports additional test-specific configuration too
-      .include('#specific-element-under-test')
+      .include("#specific-element-under-test")
       .analyze();
 
     assertEquals(Collections.emptyList(), accessibilityScanResults.getViolations());
diff --git a/docs/src/accessibility-testing-js.md b/docs/src/accessibility-testing-js.md
index 65db5ae55cef8..f547e8850642f 100644
--- a/docs/src/accessibility-testing-js.md
+++ b/docs/src/accessibility-testing-js.md
@@ -113,7 +113,7 @@ test('should not have any automatically detectable WCAG A or AA violations', asy
 });
 ```
 
-You can find a complete listing of the rule tags axe-core supports in [the "Axe-core Tags" section of the axe API documentation](https://www.deque.com/axe/core-documentation/api-documentation/#axe-core-tags).
+You can find a complete listing of the rule tags axe-core supports in [the "Axe-core Tags" section of the axe API documentation](https://www.deque.com/axe/core-documentation/api-documentation/#axecore-tags).
 
 ## Handling known issues
 
@@ -244,7 +244,7 @@ type AxeFixture = {
 // This new "test" can be used in multiple test files, and each of them will get
 // a consistently configured AxeBuilder instance.
 export const test = base.extend<AxeFixture>({
-  makeAxeBuilder: async ({ page }, use, testInfo) => {
+  makeAxeBuilder: async ({ page }, use) => {
     const makeAxeBuilder = () => new AxeBuilder({ page })
         .withTags(['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa'])
         .exclude('#commonly-reused-element-with-known-issue');
@@ -255,8 +255,7 @@ export const test = base.extend<AxeFixture>({
 export { expect } from '@playwright/test';
 ```
 
-```js tab=js-js
-// axe-test.js
+```js tab=js-js title="axe-test.js"
 const base = require('@playwright/test');
 const AxeBuilder = require('@axe-core/playwright').default;
 
@@ -265,7 +264,7 @@ const AxeBuilder = require('@axe-core/playwright').default;
 // This new "test" can be used in multiple test files, and each of them will get
 // a consistently configured AxeBuilder instance.
 exports.test = base.test.extend({
-  makeAxeBuilder: async ({ page }, use, testInfo) => {
+  makeAxeBuilder: async ({ page }, use) => {
     const makeAxeBuilder = () => new AxeBuilder({ page })
         .withTags(['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa'])
         .exclude('#commonly-reused-element-with-known-issue');
diff --git a/docs/src/actionability.md b/docs/src/actionability.md
index 4a84f5f5b2bbf..3510171e5c328 100644
--- a/docs/src/actionability.md
+++ b/docs/src/actionability.md
@@ -93,11 +93,20 @@ Element is considered stable when it has maintained the same bounding box for at
 
 ## Enabled
 
-Element is considered enabled unless it is a `<button>`, `<select>`, `<input>` or `<textarea>` with a `disabled` property.
+Element is considered enabled when it is **not disabled**.
+
+Element is **disabled** when:
+- it is a `<button>`, `<select>`, `<input>`, `<textarea>`, `<option>` or `<optgroup>` with a `[disabled]` attribute;
+- it is a `<button>`, `<select>`, `<input>`, `<textarea>`, `<option>` or `<optgroup>` that is a part of a `<fieldset>` with a `[disabled]` attribute;
+- it is a descendant of an element with `[aria-disabled=true]` attribute.
 
 ## Editable
 
-Element is considered editable when it is [enabled] and does not have `readonly` property set.
+Element is considered editable when it is [enabled] and is **not readonly**.
+
+Element is **readonly** when:
+- it is a `<select>`, `<input>` or `<textarea>` with a `[readonly]` attribute;
+- it has an `[aria-readonly=true]` attribute and an aria role that [supports it](https://w3c.github.io/aria/#aria-readonly).
 
 ## Receives Events
 
diff --git a/docs/src/api-testing-csharp.md b/docs/src/api-testing-csharp.md
index f68ff8a8f779d..6a8482e244b8c 100644
--- a/docs/src/api-testing-csharp.md
+++ b/docs/src/api-testing-csharp.md
@@ -18,8 +18,6 @@ All of that could be achieved via [APIRequestContext] methods.
 
 The following examples rely on the [`Microsoft.Playwright.MSTest`](./test-runners.md) package which creates a Playwright and Page instance for each test.
 
-<!-- TOC -->
-
 ## Writing API Test
 
 [APIRequestContext] can send all kinds of HTTP(S) requests over network.
diff --git a/docs/src/api-testing-java.md b/docs/src/api-testing-java.md
index 41265776a59c2..e8020e12ce4f3 100644
--- a/docs/src/api-testing-java.md
+++ b/docs/src/api-testing-java.md
@@ -16,8 +16,6 @@ A few examples where it may come in handy:
 
 All of that could be achieved via [APIRequestContext] methods.
 
-<!-- TOC -->
-
 ## Writing API Test
 
 [APIRequestContext] can send all kinds of HTTP(S) requests over network.
@@ -196,6 +194,7 @@ public class TestGitHubAPI {
 These tests assume that repository exists. You probably want to create a new one before running tests and delete it afterwards. Use `@BeforeAll` and `@AfterAll` hooks for that.
 
 ```java
+public class TestGitHubAPI {
   // ...
 
   void createTestRepository() {
@@ -225,6 +224,7 @@ These tests assume that repository exists. You probably want to create a new one
     disposeAPIRequestContext();
     closePlaywright();
   }
+}
 ```
 
 ### Complete test example
@@ -383,18 +383,20 @@ The following test creates a new issue via API and then navigates to the list of
 project to check that it appears at the top of the list. The check is performed using [LocatorAssertions].
 
 ```java
-@Test
-void lastCreatedIssueShouldBeFirstInTheList() {
-  Map<String, String> data = new HashMap<>();
-  data.put("title", "[Feature] request 1");
-  data.put("body", "Feature description");
-  APIResponse newIssue = request.post("/repos/" + USER + "/" + REPO + "/issues",
-    RequestOptions.create().setData(data));
-  assertTrue(newIssue.ok());
-
-  page.navigate("https://github.com/" + USER + "/" + REPO + "/issues");
-  Locator firstIssue = page.locator("a[data-hovercard-type='issue']").first();
-  assertThat(firstIssue).hasText("[Feature] request 1");
+public class TestGitHubAPI {
+  @Test
+  void lastCreatedIssueShouldBeFirstInTheList() {
+    Map<String, String> data = new HashMap<>();
+    data.put("title", "[Feature] request 1");
+    data.put("body", "Feature description");
+    APIResponse newIssue = request.post("/repos/" + USER + "/" + REPO + "/issues",
+      RequestOptions.create().setData(data));
+    assertTrue(newIssue.ok());
+
+    page.navigate("https://github.com/" + USER + "/" + REPO + "/issues");
+    Locator firstIssue = page.locator("a[data-hovercard-type='issue']").first();
+    assertThat(firstIssue).hasText("[Feature] request 1");
+  }
 }
 ```
 
@@ -404,18 +406,20 @@ The following test creates a new issue via user interface in the browser and the
 it was created:
 
 ```java
-@Test
-void lastCreatedIssueShouldBeOnTheServer() {
-  page.navigate("https://github.com/" + USER + "/" + REPO + "/issues");
-  page.locator("text=New Issue").click();
-  page.locator("[aria-label='Title']").fill("Bug report 1");
-  page.locator("[aria-label='Comment body']").fill("Bug description");
-  page.locator("text=Submit new issue").click();
-  String issueId = page.url().substring(page.url().lastIndexOf('/'));
-
-  APIResponse newIssue = request.get("https://github.com/" + USER + "/" + REPO + "/issues/" + issueId);
-  assertThat(newIssue).isOK();
-  assertTrue(newIssue.text().contains("Bug report 1"));
+public class TestGitHubAPI {
+  @Test
+  void lastCreatedIssueShouldBeOnTheServer() {
+    page.navigate("https://github.com/" + USER + "/" + REPO + "/issues");
+    page.locator("text=New Issue").click();
+    page.locator("[aria-label='Title']").fill("Bug report 1");
+    page.locator("[aria-label='Comment body']").fill("Bug description");
+    page.locator("text=Submit new issue").click();
+    String issueId = page.url().substring(page.url().lastIndexOf('/'));
+
+    APIResponse newIssue = request.get("https://github.com/" + USER + "/" + REPO + "/issues/" + issueId);
+    assertThat(newIssue).isOK();
+    assertTrue(newIssue.text().contains("Bug report 1"));
+  }
 }
 ```
 
diff --git a/docs/src/api-testing-js.md b/docs/src/api-testing-js.md
index 680b085a3c63e..63ac024af71bf 100644
--- a/docs/src/api-testing-js.md
+++ b/docs/src/api-testing-js.md
@@ -16,8 +16,6 @@ A few examples where it may come in handy:
 
 All of that could be achieved via [APIRequestContext] methods.
 
-<!-- TOC3 -->
-
 ## Writing API Test
 
 [APIRequestContext] can send all kinds of HTTP(S) requests over network.
@@ -260,7 +258,7 @@ test('last created issue should be on the server', async ({ page }) => {
   await page.getByRole('textbox', { name: 'Title' }).fill('Bug report 1');
   await page.getByRole('textbox', { name: 'Comment body' }).fill('Bug description');
   await page.getByText('Submit new issue').click();
-  const issueId = page.url().substr(page.url().lastIndexOf('/'));
+  const issueId = new URL(page.url()).pathname.split('/').pop();
 
   const newIssue = await apiContext.get(
       `https://api.github.com/repos/${USER}/${REPO}/issues/${issueId}`
diff --git a/docs/src/api-testing-python.md b/docs/src/api-testing-python.md
index 9930605a52a1e..ebfb5760a008a 100644
--- a/docs/src/api-testing-python.md
+++ b/docs/src/api-testing-python.md
@@ -18,8 +18,6 @@ All of that could be achieved via [APIRequestContext] methods.
 
 The following examples rely on the [`pytest-playwright`](./test-runners.md) package which add Playwright fixtures to the Pytest test-runner.
 
-<!-- TOC -->
-
 ## Writing API Test
 
 [APIRequestContext] can send all kinds of HTTP(S) requests over network.
@@ -116,7 +114,7 @@ def test_should_create_feature_request(api_request_context: APIRequestContext) -
 
 ### Setup and teardown
 
-These tests assume that repository exists. You probably want to create a new one before running tests and delete it afterwards. Use a [session fixture](https://docs.pytest.org/en/stable/fixture.html#fixture-scopes) for that. The part before `yield` is the before all and after is the after all.
+These tests assume that repository exists. You probably want to create a new one before running tests and delete it afterwards. Use a [session fixture](https://docs.pytest.org/en/stable/how-to/fixtures.html#fixture-scopes) for that. The part before `yield` is the before all and after is the after all.
 
 ```python
 # ...
diff --git a/docs/src/api/class-accessibility.md b/docs/src/api/class-accessibility.md
index 6164bb05dc153..e5efc9b21f611 100644
--- a/docs/src/api/class-accessibility.md
+++ b/docs/src/api/class-accessibility.md
@@ -22,7 +22,7 @@ assistive technologies themselves. By default, Playwright tries to approximate t
 * deprecated: This method is deprecated. Please use other libraries such as [Axe](https://www.deque.com/axe/) if you need to test page accessibility. See our Node.js [guide](https://playwright.dev/docs/accessibility-testing) for integration with Axe.
 
 - returns: <[null]|[Object]>
-  - `role` <[string]> The [role](https://www.w3.org/TR/wai-aria/#usage_intro).
+  - `role` <[string]> The [role](https://www.w3.org/TR/wai-aria/#usage).
   - `name` <[string]> A human readable name for the node.
   - `value` <[string]|[float]> The current value of the node, if applicable.
   - `description` <[string]> An additional human readable description of the node, if applicable.
diff --git a/docs/src/api/class-androiddevice.md b/docs/src/api/class-androiddevice.md
index cff6c2e5deaa6..86b003638b99e 100644
--- a/docs/src/api/class-androiddevice.md
+++ b/docs/src/api/class-androiddevice.md
@@ -136,7 +136,7 @@ Launches Chrome browser on the device, and returns its persistent context.
 
 ### option: AndroidDevice.launchBrowser.pkg
 * since: v1.9
-- `command` <[string]>
+- `pkg` <[string]>
 
 Optional package name to launch instead of default Chrome for Android.
 
@@ -177,7 +177,9 @@ Launches a process in the shell on the device and returns a socket to communicat
 
 ### param: AndroidDevice.open.command
 * since: v1.9
-- `command` <[string]> Shell command to execute.
+- `command` <[string]>
+
+Shell command to execute.
 
 ## async method: AndroidDevice.pinchClose
 * since: v1.9
@@ -445,7 +447,7 @@ Either a predicate that receives an event or an options object. Optional.
 * since: v1.9
 - returns: <[AndroidWebView]>
 
-This method waits until [AndroidWebView] matching the [`option: selector`] is opened and returns it. If there is already an open [AndroidWebView] matching the [`option: selector`], returns immediately.
+This method waits until [AndroidWebView] matching the [`param: selector`] is opened and returns it. If there is already an open [AndroidWebView] matching the [`param: selector`], returns immediately.
 
 ### param: AndroidDevice.webView.selector
 * since: v1.9
diff --git a/docs/src/api/class-apirequest.md b/docs/src/api/class-apirequest.md
index 2f832e1dd85f0..d27e22b03410a 100644
--- a/docs/src/api/class-apirequest.md
+++ b/docs/src/api/class-apirequest.md
@@ -21,6 +21,13 @@ Creates new instances of [APIRequestContext].
 ### option: APIRequest.newContext.extraHTTPHeaders = %%-context-option-extrahttpheaders-%%
 * since: v1.16
 
+### option: APIRequest.newContext.failOnStatusCode
+* since: v1.51
+- `failOnStatusCode` <[boolean]>
+
+Whether to throw on response codes other than 2xx and 3xx. By default response object is returned
+for all status codes.
+
 ### option: APIRequest.newContext.httpCredentials = %%-context-option-httpcredentials-%%
 * since: v1.16
 
@@ -30,6 +37,13 @@ Creates new instances of [APIRequestContext].
 ### option: APIRequest.newContext.ignoreHTTPSErrors = %%-context-option-ignorehttpserrors-%%
 * since: v1.16
 
+### option: APIRequest.newContext.maxRedirects
+* since: v1.52
+- `maxRedirects` <[int]>
+
+Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is exceeded.
+Defaults to `20`. Pass `0` to not follow redirects. This can be overwritten for each request individually.
+
 ### option: APIRequest.newContext.timeout
 * since: v1.16
 - `timeout` <[float]>
diff --git a/docs/src/api/class-apirequestcontext.md b/docs/src/api/class-apirequestcontext.md
index dab99bec2be6c..c96e01991ca2c 100644
--- a/docs/src/api/class-apirequestcontext.md
+++ b/docs/src/api/class-apirequestcontext.md
@@ -138,22 +138,31 @@ context cookies from the response. The method will automatically follow redirect
 ### param: APIRequestContext.delete.url = %%-fetch-param-url-%%
 * since: v1.16
 
-### param: APIRequestContext.delete.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.delete.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.delete.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.delete.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.delete.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.delete.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.delete.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.delete.headers = %%-js-python-csharp-fetch-option-headers-%%
 * since: v1.16
 
 ### option: APIRequestContext.delete.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.17
 
-### option: APIRequestContext.delete.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.delete.form = %%-js-fetch-option-form-%%
+* since: v1.17
+
+### option: APIRequestContext.delete.form = %%-python-fetch-option-form-%%
 * since: v1.17
 
 ### option: APIRequestContext.delete.form = %%-csharp-fetch-option-form-%%
@@ -180,6 +189,9 @@ context cookies from the response. The method will automatically follow redirect
 ### option: APIRequestContext.delete.maxRedirects = %%-js-python-csharp-fetch-option-maxredirects-%%
 * since: v1.26
 
+### option: APIRequestContext.delete.maxRetries = %%-js-python-csharp-fetch-option-maxretries-%%
+* since: v1.46
+
 ## async method: APIRequestContext.dispose
 * since: v1.16
 
@@ -235,7 +247,7 @@ var data = new Dictionary<string, object>() {
 await Request.FetchAsync("https://example.com/api/createBook", new() { Method = "post", DataObject = data });
 ```
 
-The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data` encoding. Use [FormData] to construct request body and pass it to the request as [`option: multipart`] parameter:
+The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data` encoding, by specifiying the `multipart` parameter:
 
 ```js
 const form = new FormData();
@@ -288,21 +300,28 @@ multipart.Set("fileField", file);
 await Request.FetchAsync("https://example.com/api/uploadScript", new() { Method = "post", Multipart = multipart });
 ```
 
+
 ### param: APIRequestContext.fetch.urlOrRequest
 * since: v1.16
 - `urlOrRequest` <[string]|[Request]>
 
 Target URL or Request to get all parameters from.
 
-### param: APIRequestContext.fetch.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.fetch.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.fetch.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.fetch.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.fetch.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.fetch.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.fetch.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.fetch.method
 * since: v1.16
 * langs: js, python, csharp
@@ -317,7 +336,10 @@ If set changes the fetch method (e.g. [PUT](https://developer.mozilla.org/en-US/
 ### option: APIRequestContext.fetch.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.16
 
-### option: APIRequestContext.fetch.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.fetch.form = %%-js-fetch-option-form-%%
+* since: v1.16
+
+### option: APIRequestContext.fetch.form = %%-python-fetch-option-form-%%
 * since: v1.16
 
 ### option: APIRequestContext.fetch.form = %%-csharp-fetch-option-form-%%
@@ -360,12 +382,24 @@ context cookies from the response. The method will automatically follow redirect
 Request parameters can be configured with `params` option, they will be serialized into the URL search parameters:
 
 ```js
+// Passing params as object
 await request.get('https://example.com/api/getText', {
   params: {
     'isbn': '1234',
     'page': 23,
   }
 });
+
+// Passing params as URLSearchParams
+const searchParams = new URLSearchParams();
+searchParams.set('isbn', '1234');
+searchParams.append('page', 23);
+searchParams.append('page', 24);
+await request.get('https://example.com/api/getText', { params: searchParams });
+
+// Passing params as string
+const queryString = 'isbn=1234&page=23&page=24';
+await request.get('https://example.com/api/getText', { params: queryString });
 ```
 
 ```java
@@ -394,22 +428,31 @@ await request.GetAsync("https://example.com/api/getText", new() { Params = query
 ### param: APIRequestContext.get.url = %%-fetch-param-url-%%
 * since: v1.16
 
-### param: APIRequestContext.get.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.get.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.get.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.get.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.get.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.get.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.get.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.get.headers = %%-js-python-csharp-fetch-option-headers-%%
 * since: v1.16
 
 ### option: APIRequestContext.get.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.26
 
-### option: APIRequestContext.get.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.get.form = %%-js-fetch-option-form-%%
+* since: v1.26
+
+### option: APIRequestContext.get.form = %%-python-fetch-option-form-%%
 * since: v1.26
 
 ### option: APIRequestContext.get.form = %%-csharp-fetch-option-form-%%
@@ -450,22 +493,31 @@ context cookies from the response. The method will automatically follow redirect
 ### param: APIRequestContext.head.url = %%-fetch-param-url-%%
 * since: v1.16
 
-### param: APIRequestContext.head.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.head.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.head.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.head.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.head.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.head.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.head.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.head.headers = %%-js-python-csharp-fetch-option-headers-%%
 * since: v1.16
 
 ### option: APIRequestContext.head.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.26
 
-### option: APIRequestContext.head.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.head.form = %%-python-fetch-option-form-%%
+* since: v1.26
+
+### option: APIRequestContext.head.form = %%-js-fetch-option-form-%%
 * since: v1.26
 
 ### option: APIRequestContext.head.form = %%-csharp-fetch-option-form-%%
@@ -506,22 +558,31 @@ context cookies from the response. The method will automatically follow redirect
 ### param: APIRequestContext.patch.url = %%-fetch-param-url-%%
 * since: v1.16
 
-### param: APIRequestContext.patch.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.patch.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.patch.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.patch.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.patch.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.patch.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.patch.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.patch.headers = %%-js-python-csharp-fetch-option-headers-%%
 * since: v1.16
 
 ### option: APIRequestContext.patch.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.16
 
-### option: APIRequestContext.patch.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.patch.form = %%-js-fetch-option-form-%%
+* since: v1.16
+
+### option: APIRequestContext.patch.form = %%-python-fetch-option-form-%%
 * since: v1.16
 
 ### option: APIRequestContext.patch.form = %%-csharp-fetch-option-form-%%
@@ -683,22 +744,31 @@ await request.PostAsync("https://example.com/api/uploadScript", new() { Multipar
 ### param: APIRequestContext.post.url = %%-fetch-param-url-%%
 * since: v1.16
 
-### param: APIRequestContext.post.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.post.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.post.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.post.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.post.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.post.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.post.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.post.headers = %%-js-python-csharp-fetch-option-headers-%%
 * since: v1.16
 
 ### option: APIRequestContext.post.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.16
 
-### option: APIRequestContext.post.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.post.form = %%-js-fetch-option-form-%%
+* since: v1.16
+
+### option: APIRequestContext.post.form = %%-python-fetch-option-form-%%
 * since: v1.16
 
 ### option: APIRequestContext.post.form = %%-csharp-fetch-option-form-%%
@@ -739,22 +809,31 @@ context cookies from the response. The method will automatically follow redirect
 ### param: APIRequestContext.put.url = %%-fetch-param-url-%%
 * since: v1.16
 
-### param: APIRequestContext.put.params = %%-java-csharp-fetch-params-%%
+### option: APIRequestContext.put.params = %%-js-fetch-option-params-%%
+* since: v1.16
+
+### param: APIRequestContext.put.params = %%-java-fetch-params-%%
 * since: v1.18
 
-### option: APIRequestContext.put.params = %%-js-python-fetch-option-params-%%
+### option: APIRequestContext.put.params = %%-python-fetch-option-params-%%
 * since: v1.16
 
 ### option: APIRequestContext.put.params = %%-csharp-fetch-option-params-%%
 * since: v1.16
 
+### option: APIRequestContext.put.paramsString = %%-csharp-fetch-option-paramsString-%%
+* since: v1.47
+
 ### option: APIRequestContext.put.headers = %%-js-python-csharp-fetch-option-headers-%%
 * since: v1.16
 
 ### option: APIRequestContext.put.data = %%-js-python-csharp-fetch-option-data-%%
 * since: v1.16
 
-### option: APIRequestContext.put.form = %%-js-python-fetch-option-form-%%
+### option: APIRequestContext.put.form = %%-python-fetch-option-form-%%
+* since: v1.16
+
+### option: APIRequestContext.put.form = %%-js-fetch-option-form-%%
 * since: v1.16
 
 ### option: APIRequestContext.put.form = %%-csharp-fetch-option-form-%%
@@ -811,3 +890,9 @@ Returns storage state for this request context, contains current cookies and loc
 
 ### option: APIRequestContext.storageState.path = %%-storagestate-option-path-%%
 * since: v1.16
+
+### option: APIRequestContext.storageState.indexedDB
+* since: v1.51
+- `indexedDB` ?<boolean>
+
+Set to `true` to include IndexedDB in the storage state snapshot.
diff --git a/docs/src/api/class-apiresponse.md b/docs/src/api/class-apiresponse.md
index 1297d2d4fa02f..468a5a830d453 100644
--- a/docs/src/api/class-apiresponse.md
+++ b/docs/src/api/class-apiresponse.md
@@ -13,7 +13,8 @@ async def run(playwright: Playwright):
     assert response.ok
     assert response.status == 200
     assert response.headers["content-type"] == "application/json; charset=utf-8"
-    assert response.json()["name"] == "foobar"
+    json_data = await response.json()
+    assert json_data["name"] == "foobar"
     assert await response.body() == '{"status": "ok"}'
 
 
@@ -60,7 +61,7 @@ An object with all the response HTTP headers associated with this response.
   - `name` <[string]> Name of the header.
   - `value` <[string]> Value of the header.
 
-An array with all the request HTTP headers associated with this response. Header names are not lower-cased.
+An array with all the response HTTP headers associated with this response. Header names are not lower-cased.
 Headers with multiple entries, such as `Set-Cookie`, appear in the array multiple times.
 
 ## async method: APIResponse.json
diff --git a/docs/src/api/class-apiresponseassertions.md b/docs/src/api/class-apiresponseassertions.md
index 6fce864d0323d..9584365d887dd 100644
--- a/docs/src/api/class-apiresponseassertions.md
+++ b/docs/src/api/class-apiresponseassertions.md
@@ -14,15 +14,15 @@ test('navigates to login', async ({ page }) => {
 ```
 
 ```java
-...
+// ...
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
 public class TestPage {
-  ...
+  // ...
   @Test
   void navigatesToLoginPage() {
-    ...
-    APIResponse response = page.request().get('https://playwright.dev');
+    // ...
+    APIResponse response = page.request().get("https://playwright.dev");
     assertThat(response).isOK();
   }
 }
diff --git a/docs/src/api/class-browser.md b/docs/src/api/class-browser.md
index 9ae59571fcc62..7867ce5c8ba71 100644
--- a/docs/src/api/class-browser.md
+++ b/docs/src/api/class-browser.md
@@ -1,6 +1,5 @@
 # class: Browser
 * since: v1.8
-* extends: [EventEmitter]
 
 A Browser is created via [`method: BrowserType.launch`]. An example of using a [Browser] to create a [Page]:
 
@@ -19,15 +18,15 @@ const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
 import com.microsoft.playwright.*;
 
 public class Example {
-  public static void main(String[] args) {
-    try (Playwright playwright = Playwright.create()) {
-      BrowserType firefox = playwright.firefox()
-      Browser browser = firefox.launch();
-      Page page = browser.newPage();
-      page.navigate('https://example.com');
-      browser.close();
-    }
-  }
+ public static void main(String[] args) {
+   try (Playwright playwright = Playwright.create()) {
+     BrowserType firefox = playwright.firefox();
+     Browser browser = firefox.launch();
+     Page page = browser.newPage();
+     page.navigate("https://example.com");
+     browser.close();
+   }
+ }
 }
 ```
 
@@ -97,7 +96,7 @@ In case this browser is connected to, clears all created contexts belonging to t
 browser server.
 
 :::note
-This is similar to force quitting the browser. Therefore, you should call [`method: BrowserContext.close`] on any [BrowserContext]'s you explicitly created earlier with [`method: Browser.newContext`] **before** calling [`method: Browser.close`].
+This is similar to force-quitting the browser. To close pages gracefully and ensure you receive page close events, call [`method: BrowserContext.close`] on any [BrowserContext] instances you explicitly created earlier using [`method: Browser.newContext`] **before** calling [`method: Browser.close`].
 :::
 
 The [Browser] object itself is considered to be disposed and cannot be used anymore.
@@ -203,7 +202,7 @@ Browser browser = playwright.firefox().launch();  // Or 'chromium' or 'webkit'.
 BrowserContext context = browser.newContext();
 // Create a new page in a pristine context.
 Page page = context.newPage();
-page.navigate('https://example.com');
+page.navigate("https://example.com");
 
 // Graceful close up everything
 context.close();
@@ -296,6 +295,20 @@ testing frameworks should explicitly create [`method: Browser.newContext`] follo
 ### option: Browser.newPage.storageStatePath = %%-csharp-java-context-option-storage-state-path-%%
 * since: v1.9
 
+## async method: Browser.removeAllListeners
+* since: v1.47
+* langs: js
+
+Removes all the listeners of the given type (or all registered listeners if no type given).
+Allows to wait for async listeners to complete or to ignore subsequent errors from these listeners.
+
+### param: Browser.removeAllListeners.type
+* since: v1.47
+- `type` ?<[string]>
+
+### option: Browser.removeAllListeners.behavior = %%-remove-all-listeners-options-behavior-%%
+* since: v1.47
+
 ## async method: Browser.startTracing
 * since: v1.11
 * langs: java, js, python
@@ -318,7 +331,7 @@ await browser.stopTracing();
 ```java
 browser.startTracing(page, new Browser.StartTracingOptions()
   .setPath(Paths.get("trace.json")));
-page.goto('https://www.google.com');
+page.navigate("https://www.google.com");
 browser.stopTracing();
 ```
 
diff --git a/docs/src/api/class-browsercontext.md b/docs/src/api/class-browsercontext.md
index 48542a260360d..c0dbcedc7a60a 100644
--- a/docs/src/api/class-browsercontext.md
+++ b/docs/src/api/class-browsercontext.md
@@ -1,13 +1,12 @@
 # class: BrowserContext
 * since: v1.8
-* extends: [EventEmitter]
 
 BrowserContexts provide a way to operate multiple independent browser sessions.
 
 If a page opens another page, e.g. with a `window.open` call, the popup will belong to the parent page's browser
 context.
 
-Playwright allows creating "incognito" browser contexts with [`method: Browser.newContext`] method. "Incognito" browser
+Playwright allows creating isolated non-persistent browser contexts with [`method: Browser.newContext`] method. Non-persistent browser
 contexts don't write any browsing data to disk.
 
 ```js
@@ -364,6 +363,7 @@ await context.AddCookiesAsync(new[] { cookie1, cookie2 });
   - `httpOnly` ?<[boolean]> Optional.
   - `secure` ?<[boolean]> Optional.
   - `sameSite` ?<[SameSiteAttribute]<"Strict"|"Lax"|"None">> Optional.
+  - `partitionKey` ?<[string]> For partitioned third-party cookies (aka [CHIPS](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies)), the partition key. Optional.
 
 ## async method: BrowserContext.addInitScript
 * since: v1.8
@@ -468,7 +468,7 @@ All existing background pages in the context.
 * since: v1.8
 - returns: <[null]|[Browser]>
 
-Returns the browser instance of the context. If it was launched as a persistent context null gets returned.
+Gets the browser instance that owns the context. Returns `null` if the context is created outside of normal browser, e.g. Android or Electron.
 
 ## async method: BrowserContext.clearCookies
 * since: v1.8
@@ -603,6 +603,7 @@ The default browser context cannot be closed.
   - `httpOnly` <[boolean]>
   - `secure` <[boolean]>
   - `sameSite` <[SameSiteAttribute]<"Strict"|"Lax"|"None">>
+  - `partitionKey` ?<[string]>
 
 If no URLs are specified, this method returns all cookies. If URLs are specified, only cookies that affect those URLs
 are returned.
@@ -656,7 +657,7 @@ import com.microsoft.playwright.*;
 public class Example {
   public static void main(String[] args) {
     try (Playwright playwright = Playwright.create()) {
-      BrowserType webkit = playwright.webkit()
+      BrowserType webkit = playwright.webkit();
       Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
       BrowserContext context = browser.newContext();
       context.exposeBinding("pageURL", (source, args) -> source.page().url());
@@ -814,8 +815,9 @@ import java.util.Base64;
 public class Example {
   public static void main(String[] args) {
     try (Playwright playwright = Playwright.create()) {
-      BrowserType webkit = playwright.webkit()
+      BrowserType webkit = playwright.webkit();
       Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
+      BrowserContext context = browser.newContext();
       context.exposeFunction("sha256", args -> {
         String text = (String) args[0];
         MessageDigest crypto;
@@ -963,9 +965,14 @@ specified.
 * since: v1.8
 - `permissions` <[Array]<[string]>>
 
-A permission or an array of permissions to grant. Permissions can be one of the following values:
+A list of permissions to grant.
+
+:::danger
+Supported permissions differ between browsers, and even between different versions of the same browser. Any permission may stop working after an update.
+:::
+
+Here are some permissions that may be supported by some browsers:
 * `'accelerometer'`
-* `'accessibility-events'`
 * `'ambient-light-sensor'`
 * `'background-sync'`
 * `'camera'`
@@ -980,6 +987,7 @@ A permission or an array of permissions to grant. Permissions can be one of the
 * `'notifications'`
 * `'payment-handler'`
 * `'storage-access'`
+* `'local-fonts'`
 
 ### option: BrowserContext.grantPermissions.origin
 * since: v1.8
@@ -1016,6 +1024,20 @@ Creates a new page in the browser context.
 
 Returns all open pages in the context.
 
+## async method: BrowserContext.removeAllListeners
+* since: v1.47
+* langs: js
+
+Removes all the listeners of the given type (or all registered listeners if no type given).
+Allows to wait for async listeners to complete or to ignore subsequent errors from these listeners.
+
+### param: BrowserContext.removeAllListeners.type
+* since: v1.47
+- `type` ?<[string]>
+
+### option: BrowserContext.removeAllListeners.behavior = %%-remove-all-listeners-options-behavior-%%
+* since: v1.47
+
 ## property: BrowserContext.request
 * since: v1.16
 * langs:
@@ -1184,9 +1206,7 @@ Enabling routing disables http cache.
 * since: v1.8
 - `url` <[string]|[RegExp]|[function]\([URL]\):[boolean]>
 
-A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
-When a [`option: baseURL`] via the context options was provided and the passed URL is a path,
-it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
+A glob pattern, regex pattern, or predicate that receives a [URL] to match during routing. If [`option: Browser.newContext.baseURL`] is set in the context options and the provided URL is a string that does not start with `*`, it is resolved using the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
 
 ### param: BrowserContext.route.handler
 * since: v1.8
@@ -1253,6 +1273,99 @@ When set to `minimal`, only record information necessary for routing from HAR. T
 
 Optional setting to control resource content management. If `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is specified, content is stored inline the HAR file.
 
+
+## async method: BrowserContext.routeWebSocket
+* since: v1.48
+
+This method allows to modify websocket connections that are made by any page in the browser context.
+
+Note that only `WebSocket`s created after this method was called will be routed. It is recommended to call this method before creating any pages.
+
+**Usage**
+
+Below is an example of a simple handler that blocks some websocket messages.
+See [WebSocketRoute] for more details and examples.
+
+```js
+await context.routeWebSocket('/ws', async ws => {
+  ws.routeSend(message => {
+    if (message === 'to-be-blocked')
+      return;
+    ws.send(message);
+  });
+  await ws.connect();
+});
+```
+
+```java
+context.routeWebSocket("/ws", ws -> {
+  ws.routeSend(message -> {
+    if ("to-be-blocked".equals(message))
+      return;
+    ws.send(message);
+  });
+  ws.connect();
+});
+```
+
+```python async
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "to-be-blocked":
+    return
+  ws.send(message)
+
+async def handler(ws: WebSocketRoute):
+  ws.route_send(lambda message: message_handler(ws, message))
+  await ws.connect()
+
+await context.route_web_socket("/ws", handler)
+```
+
+```python sync
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "to-be-blocked":
+    return
+  ws.send(message)
+
+def handler(ws: WebSocketRoute):
+  ws.route_send(lambda message: message_handler(ws, message))
+  ws.connect()
+
+context.route_web_socket("/ws", handler)
+```
+
+```csharp
+await context.RouteWebSocketAsync("/ws", async ws => {
+  ws.RouteSend(message => {
+    if (message == "to-be-blocked")
+      return;
+    ws.Send(message);
+  });
+  await ws.ConnectAsync();
+});
+```
+
+### param: BrowserContext.routeWebSocket.url
+* since: v1.48
+- `url` <[string]|[RegExp]|[function]\([URL]\):[boolean]>
+
+Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the [`option: Browser.newContext.baseURL`] context option.
+
+### param: BrowserContext.routeWebSocket.handler
+* since: v1.48
+* langs: js, python
+- `handler` <[function]\([WebSocketRoute]\): [Promise<any>|any]>
+
+Handler function to route the WebSocket.
+
+### param: BrowserContext.routeWebSocket.handler
+* since: v1.48
+* langs: csharp, java
+- `handler` <[function]\([WebSocketRoute]\)>
+
+Handler function to route the WebSocket.
+
+
 ## method: BrowserContext.serviceWorkers
 * since: v1.11
 * langs: js, python
@@ -1300,7 +1413,7 @@ This setting will change the default maximum time for all the methods accepting
 * since: v1.8
 - `timeout` <[float]>
 
-Maximum time in milliseconds
+Maximum time in milliseconds. Pass `0` to disable timeout.
 
 ## async method: BrowserContext.setExtraHTTPHeaders
 * since: v1.8
@@ -1382,6 +1495,7 @@ its geolocation.
 
 Whether to emulate network being offline for the browser context.
 
+
 ## async method: BrowserContext.storageState
 * since: v1.8
 - returns: <[Object]>
@@ -1400,7 +1514,7 @@ Whether to emulate network being offline for the browser context.
       - `name` <[string]>
       - `value` <[string]>
 
-Returns storage state for this browser context, contains current cookies and local storage snapshot.
+Returns storage state for this browser context, contains current cookies, local storage snapshot and IndexedDB snapshot.
 
 ## async method: BrowserContext.storageState
 * since: v1.8
@@ -1410,6 +1524,13 @@ Returns storage state for this browser context, contains current cookies and loc
 ### option: BrowserContext.storageState.path = %%-storagestate-option-path-%%
 * since: v1.8
 
+### option: BrowserContext.storageState.indexedDB
+* since: v1.51
+- `indexedDB` ?<boolean>
+
+Set to `true` to include [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) in the storage state snapshot.
+If your application uses IndexedDB to store authentication tokens, like Firebase Authentication, enable this.
+
 ## property: BrowserContext.tracing
 * since: v1.12
 - type: <[Tracing]>
diff --git a/docs/src/api/class-browsertype.md b/docs/src/api/class-browsertype.md
index 0d41bb1aa7a03..1d658a5b5f915 100644
--- a/docs/src/api/class-browsertype.md
+++ b/docs/src/api/class-browsertype.md
@@ -89,13 +89,17 @@ class BrowserTypeExamples
 * since: v1.8
 - returns: <[Browser]>
 
-This method attaches Playwright to an existing browser instance. When connecting to another browser launched via `BrowserType.launchServer` in Node.js, the major and minor version needs to match the client version (1.2.3 → is compatible with 1.2.x).
+This method attaches Playwright to an existing browser instance created via `BrowserType.launchServer` in Node.js.
+
+:::note
+The major and minor version of the Playwright instance that connects needs to match the version of Playwright that launches the browser (1.2.3 → is compatible with 1.2.x).
+:::
 
 ### param: BrowserType.connect.wsEndpoint
 * since: v1.10
 - `wsEndpoint` <[string]>
 
-A browser websocket endpoint to connect to.
+A Playwright browser websocket endpoint to connect to. You obtain this endpoint via `BrowserServer.wsEndpoint`.
 
 ### option: BrowserType.connect.headers
 * since: v1.11
@@ -113,6 +117,7 @@ can see what is going on. Defaults to 0.
 ### option: BrowserType.connect.logger
 * since: v1.14
 * langs: js
+* deprecated: The logs received by the logger are incomplete. Please use tracing instead.
 - `logger` <[Logger]>
 
 Logger sink for Playwright logging. Optional.
@@ -152,6 +157,10 @@ The default browser context is accessible via [`method: Browser.contexts`].
 Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
 :::
 
+:::note
+This connection is significantly lower fidelity than the Playwright protocol connection via [`method: BrowserType.connect`]. If you are experiencing issues or attempting to use advanced functionality, you probably want to use [`method: BrowserType.connect`].
+:::
+
 **Usage**
 
 ```js
@@ -193,10 +202,9 @@ A CDP websocket endpoint or http url to connect to. For example `http://localhos
 ### option: BrowserType.connectOverCDP.endpointURL
 * since: v1.14
 * langs: js
+* deprecated: Use the first argument instead.
 - `endpointURL` <[string]>
 
-Deprecated, use the first argument instead. Optional.
-
 ### option: BrowserType.connectOverCDP.headers
 * since: v1.11
 - `headers` <[Object]<[string], [string]>>
@@ -213,6 +221,7 @@ can see what is going on. Defaults to 0.
 ### option: BrowserType.connectOverCDP.logger
 * since: v1.14
 * langs: js
+* deprecated: The logs received by the logger are incomplete. Please use tracing instead.
 - `logger` <[Logger]>
 
 Logger sink for Playwright logging. Optional.
@@ -316,11 +325,17 @@ this context will automatically close the browser.
 * since: v1.8
 - `userDataDir` <[path]>
 
-Path to a User Data Directory, which stores browser session data like cookies and local storage. More details for
+Path to a User Data Directory, which stores browser session data like cookies and local storage. Pass an empty string to create a temporary directory.
+
+More details for
 [Chromium](https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction) and
-[Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options#User_Profile).
-Note that Chromium's user data directory is the **parent** directory of the "Profile Path" seen at `chrome://version`. Pass an empty string to
-use a temporary directory instead.
+[Firefox](https://wiki.mozilla.org/Firefox/CommandLineOptions#User_profile). Chromium's user data directory is the **parent** directory of the "Profile Path" seen at `chrome://version`.
+
+Note that browsers do not allow launching multiple instances with the same User Data Directory.
+
+:::warning
+Chromium/Chrome: Due to recent Chrome policy changes, automating the default Chrome user profile is not supported. Pointing `userDataDir` to Chrome's main "User Data" directory (the profile used for your regular browsing) may result in pages not loading or the browser exiting. Create and use a separate directory (for example, an empty folder) as your automation profile instead. See https://developer.chrome.com/blog/remote-debugging-port for details.
+:::
 
 ### option: BrowserType.launchPersistentContext.-inline- = %%-shared-browser-options-list-v1.8-%%
 * since: v1.8
diff --git a/docs/src/api/class-cdpsession.md b/docs/src/api/class-cdpsession.md
index 8ae780363d50c..a14dd58fb4ffc 100644
--- a/docs/src/api/class-cdpsession.md
+++ b/docs/src/api/class-cdpsession.md
@@ -1,6 +1,5 @@
 # class: CDPSession
 * since: v1.8
-* extends: [EventEmitter]
 
 The `CDPSession` instances are used to talk raw Chrome Devtools Protocol:
 * protocol methods can be called with `session.send` method.
diff --git a/docs/src/api/class-clock.md b/docs/src/api/class-clock.md
index f2ee2433b4b34..e5610b424212b 100644
--- a/docs/src/api/class-clock.md
+++ b/docs/src/api/class-clock.md
@@ -161,6 +161,41 @@ await page.Clock.PauseAtAsync(DateTime.Parse("2020-02-02"));
 await page.Clock.PauseAtAsync("2020-02-02");
 ```
 
+For best results, install the clock before navigating the page and set it to a time slightly before the intended test time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the page has fully loaded, you can safely use [`method: Clock.pauseAt`] to pause the clock.
+
+```js
+// Initialize clock with some time before the test time and let the page load
+// naturally. `Date.now` will progress as the timers fire.
+await page.clock.install({ time: new Date('2024-12-10T08:00:00') });
+await page.goto('http://localhost:3333');
+await page.clock.pauseAt(new Date('2024-12-10T10:00:00'));
+```
+
+```python async
+# Initialize clock with some time before the test time and let the page load
+# naturally. `Date.now` will progress as the timers fire.
+await page.clock.install(time=datetime.datetime(2024, 12, 10, 8, 0, 0))
+await page.goto("http://localhost:3333")
+await page.clock.pause_at(datetime.datetime(2024, 12, 10, 10, 0, 0))
+```
+
+```python sync
+# Initialize clock with some time before the test time and let the page load
+# naturally. `Date.now` will progress as the timers fire.
+page.clock.install(time=datetime.datetime(2024, 12, 10, 8, 0, 0))
+page.goto("http://localhost:3333")
+page.clock.pause_at(datetime.datetime(2024, 12, 10, 10, 0, 0))
+```
+
+```java
+// Initialize clock with some time before the test time and let the page load
+// naturally. `Date.now` will progress as the timers fire.
+SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
+page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
+page.navigate("http://localhost:3333");
+page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
+```
+
 ### param: Clock.pauseAt.time
 * langs: js, java
 * since: v1.45
@@ -193,6 +228,8 @@ Resumes timers. Once this method is called, time resumes flowing, timers are fir
 Makes `Date.now` and `new Date()` return fixed fake time at all times,
 keeps all the timers running.
 
+Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios, use [`method: Clock.install`] instead. Read docs on [clock emulation](../clock.md) to learn more.
+
 **Usage**
 
 ```js
@@ -249,7 +286,7 @@ Time to be set.
 ## async method: Clock.setSystemTime
 * since: v1.45
 
-Sets current system time but does not trigger any timers.
+Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example switching from summer to winter time, or changing time zones.
 
 **Usage**
 
diff --git a/docs/src/api/class-consolemessage.md b/docs/src/api/class-consolemessage.md
index 2268ee3ed10a8..f856dffe55968 100644
--- a/docs/src/api/class-consolemessage.md
+++ b/docs/src/api/class-consolemessage.md
@@ -44,8 +44,8 @@ ConsoleMessage msg = page.waitForConsoleMessage(() -> {
 });
 
 // Deconstruct console.log arguments
-msg.args().get(0).jsonValue() // hello
-msg.args().get(1).jsonValue() // 42
+msg.args().get(0).jsonValue(); // hello
+msg.args().get(1).jsonValue(); // 42
 ```
 
 ```python async
@@ -139,6 +139,12 @@ The text of the console message.
 
 ## method: ConsoleMessage.type
 * since: v1.8
+* langs: js, python
+- returns: <[ConsoleMessageType]<"log"|"debug"|"info"|"error"|"warning"|"dir"|"dirxml"|"table"|"trace"|"clear"|"startGroup"|"startGroupCollapsed"|"endGroup"|"assert"|"profile"|"profileEnd"|"count"|"timeEnd">>
+
+## method: ConsoleMessage.type
+* since: v1.8
+* langs: csharp, java
 - returns: <[string]>
 
 One of the following values: `'log'`, `'debug'`, `'info'`, `'error'`, `'warning'`, `'dir'`, `'dirxml'`, `'table'`,
diff --git a/docs/src/api/class-elementhandle.md b/docs/src/api/class-elementhandle.md
index 1793798c8ca33..c8f54c7380fac 100644
--- a/docs/src/api/class-elementhandle.md
+++ b/docs/src/api/class-elementhandle.md
@@ -866,7 +866,7 @@ await handle.SelectOptionAsync(new[] {
 ### option: ElementHandle.selectOption.force = %%-input-force-%%
 * since: v1.13
 
-### option: ElementHandle.selectOption.noWaitAfter = %%-input-no-wait-after-%%
+### option: ElementHandle.selectOption.noWaitAfter = %%-input-no-wait-after-removed-%%
 * since: v1.8
 
 ### option: ElementHandle.selectOption.timeout = %%-input-timeout-%%
diff --git a/docs/src/api/class-formdata.md b/docs/src/api/class-formdata.md
index 5ca85b361d00e..c5f4bcb51d14f 100644
--- a/docs/src/api/class-formdata.md
+++ b/docs/src/api/class-formdata.md
@@ -6,7 +6,7 @@ The [FormData] is used create form data that is sent via [APIRequestContext].
 
 ```java
 import com.microsoft.playwright.options.FormData;
-...
+// ...
 FormData form = FormData.create()
     .set("firstName", "John")
     .set("lastName", "Doe")
@@ -28,7 +28,7 @@ the new value onto the end of the existing set of values.
 
 ```java
 import com.microsoft.playwright.options.FormData;
-...
+// ...
 FormData form = FormData.create()
     // Only name and value are set.
     .append("firstName", "John")
@@ -100,7 +100,7 @@ Sets a field on the form. File values can be passed either as `Path` or as `File
 
 ```java
 import com.microsoft.playwright.options.FormData;
-...
+// ...
 FormData form = FormData.create()
     // Only name and value are set.
     .set("firstName", "John")
diff --git a/docs/src/api/class-frame.md b/docs/src/api/class-frame.md
index 4da22fe989a08..e286c63bfa252 100644
--- a/docs/src/api/class-frame.md
+++ b/docs/src/api/class-frame.md
@@ -280,7 +280,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Frame.click.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Frame.click.trial = %%-input-trial-%%
+### option: Frame.click.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ## async method: Frame.content
@@ -341,7 +341,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Frame.dblclick.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Frame.dblclick.trial = %%-input-trial-%%
+### option: Frame.dblclick.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ## async method: Frame.dispatchEvent
@@ -1153,7 +1153,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Frame.hover.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Frame.hover.trial = %%-input-trial-%%
+### option: Frame.hover.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ### option: Frame.hover.noWaitAfter = %%-input-no-wait-after-removed-%%
@@ -1304,7 +1304,7 @@ Returns whether the element is [enabled](../actionability.md#enabled).
 * discouraged: Use locator-based [`method: Locator.isHidden`] instead. Read more about [locators](../locators.md).
 - returns: <[boolean]>
 
-Returns whether the element is hidden, the opposite of [visible](../actionability.md#visible).  [`option: selector`] that does not match any elements is considered hidden.
+Returns whether the element is hidden, the opposite of [visible](../actionability.md#visible).  [`param: selector`] that does not match any elements is considered hidden.
 
 ### param: Frame.isHidden.selector = %%-input-selector-%%
 * since: v1.8
@@ -1322,7 +1322,7 @@ Returns whether the element is hidden, the opposite of [visible](../actionabilit
 * discouraged: Use locator-based [`method: Locator.isVisible`] instead. Read more about [locators](../locators.md).
 - returns: <[boolean]>
 
-Returns whether the element is [visible](../actionability.md#visible). [`option: selector`] that does not match any elements is considered not visible.
+Returns whether the element is [visible](../actionability.md#visible). [`param: selector`] that does not match any elements is considered not visible.
 
 ### param: Frame.isVisible.selector = %%-input-selector-%%
 * since: v1.8
@@ -1543,7 +1543,7 @@ await frame.SelectOptionAsync("select#colors", new[] { "red", "green", "blue" })
 ### option: Frame.selectOption.force = %%-input-force-%%
 * since: v1.13
 
-### option: Frame.selectOption.noWaitAfter = %%-input-no-wait-after-%%
+### option: Frame.selectOption.noWaitAfter = %%-input-no-wait-after-removed-%%
 * since: v1.8
 
 ### option: Frame.selectOption.strict = %%-input-strict-%%
@@ -1703,7 +1703,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Frame.tap.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Frame.tap.trial = %%-input-trial-%%
+### option: Frame.tap.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ## async method: Frame.textContent
diff --git a/docs/src/api/class-framelocator.md b/docs/src/api/class-framelocator.md
index 9851a35f96d34..7b6fb8f1bc298 100644
--- a/docs/src/api/class-framelocator.md
+++ b/docs/src/api/class-framelocator.md
@@ -1,30 +1,30 @@
 # class: FrameLocator
 * since: v1.17
 
-FrameLocator represents a view to the `iframe` on the page. It captures the logic sufficient to retrieve the `iframe` and locate elements in that iframe. FrameLocator can be created with either [`method: Page.frameLocator`] or [`method: Locator.frameLocator`] method.
+FrameLocator represents a view to the `iframe` on the page. It captures the logic sufficient to retrieve the `iframe` and locate elements in that iframe. FrameLocator can be created with either [`method: Locator.contentFrame`], [`method: Page.frameLocator`] or [`method: Locator.frameLocator`] method.
 
 ```js
-const locator = page.frameLocator('#my-frame').getByText('Submit');
+const locator = page.locator('#my-frame').contentFrame().getByText('Submit');
 await locator.click();
 ```
 
 ```java
-Locator locator = page.frameLocator("#my-frame").getByText("Submit");
+Locator locator = page.locator("#my-frame").contentFrame().getByText("Submit");
 locator.click();
 ```
 
 ```python async
-locator = page.frame_locator("#my-frame").get_by_text("Submit")
+locator = page.locator("#my-frame").content_frame.get_by_text("Submit")
 await locator.click()
 ```
 
 ```python sync
-locator = page.frame_locator("my-frame").get_by_text("Submit")
+locator = page.locator("my-frame").content_frame.get_by_text("Submit")
 locator.click()
 ```
 
 ```csharp
-var locator = page.FrameLocator("#my-frame").GetByText("Submit");
+var locator = page.Locator("#my-frame").ContentFrame.GetByText("Submit");
 await locator.ClickAsync();
 ```
 
@@ -34,42 +34,42 @@ Frame locators are strict. This means that all operations on frame locators will
 
 ```js
 // Throws if there are several frames in DOM:
-await page.frameLocator('.result-frame').getByRole('button').click();
+await page.locator('.result-frame').contentFrame().getByRole('button').click();
 
 // Works because we explicitly tell locator to pick the first frame:
-await page.frameLocator('.result-frame').first().getByRole('button').click();
+await page.locator('.result-frame').contentFrame().first().getByRole('button').click();
 ```
 
 ```python async
 # Throws if there are several frames in DOM:
-await page.frame_locator('.result-frame').get_by_role('button').click()
+await page.locator('.result-frame').content_frame.get_by_role('button').click()
 
 # Works because we explicitly tell locator to pick the first frame:
-await page.frame_locator('.result-frame').first.get_by_role('button').click()
+await page.locator('.result-frame').first.content_frame.get_by_role('button').click()
 ```
 
 ```python sync
 # Throws if there are several frames in DOM:
-page.frame_locator('.result-frame').get_by_role('button').click()
+page.locator('.result-frame').content_frame.get_by_role('button').click()
 
 # Works because we explicitly tell locator to pick the first frame:
-page.frame_locator('.result-frame').first.get_by_role('button').click()
+page.locator('.result-frame').first.content_frame.get_by_role('button').click()
 ```
 
 ```java
 // Throws if there are several frames in DOM:
-page.frame_locator(".result-frame").getByRole(AriaRole.BUTTON).click();
+page.locator(".result-frame").contentFrame().getByRole(AriaRole.BUTTON).click();
 
 // Works because we explicitly tell locator to pick the first frame:
-page.frame_locator(".result-frame").first().getByRole(AriaRole.BUTTON).click();
+page.locator(".result-frame").first().contentFrame().getByRole(AriaRole.BUTTON).click();
 ```
 
 ```csharp
 // Throws if there are several frames in DOM:
-await page.FrameLocator(".result-frame").GetByRole(AriaRole.Button).ClickAsync();
+await page.Locator(".result-frame").ContentFrame.GetByRole(AriaRole.Button).ClickAsync();
 
 // Works because we explicitly tell locator to pick the first frame:
-await page.FrameLocator(".result-frame").First.getByRole(AriaRole.Button).ClickAsync();
+await page.Locator(".result-frame").First.ContentFrame.getByRole(AriaRole.Button).ClickAsync();
 ```
 
 **Converting Locator to FrameLocator**
@@ -82,6 +82,7 @@ If you have a [FrameLocator] object it can be converted to [Locator] pointing to
 
 
 ## method: FrameLocator.first
+* deprecated: Use [`method: Locator.first`] followed by [`method: Locator.contentFrame`] instead.
 * since: v1.17
 - returns: <[FrameLocator]>
 
@@ -171,6 +172,7 @@ in that iframe.
 ### option: FrameLocator.getByTitle.exact = %%-locator-get-by-text-exact-%%
 
 ## method: FrameLocator.last
+* deprecated: Use [`method: Locator.last`] followed by [`method: Locator.contentFrame`] instead.
 * since: v1.17
 - returns: <[FrameLocator]>
 
@@ -195,6 +197,7 @@ Returns locator to the last matching frame.
 * since: v1.33
 
 ## method: FrameLocator.nth
+* deprecated: Use [`method: Locator.nth`] followed by [`method: Locator.contentFrame`] instead.
 * since: v1.17
 - returns: <[FrameLocator]>
 
@@ -217,37 +220,36 @@ For a reverse operation, use [`method: Locator.contentFrame`].
 **Usage**
 
 ```js
-const frameLocator = page.frameLocator('iframe[name="embedded"]');
+const frameLocator = page.locator('iframe[name="embedded"]').contentFrame();
 // ...
 const locator = frameLocator.owner();
 await expect(locator).toBeVisible();
 ```
 
 ```java
-FrameLocator frameLocator = page.frameLocator("iframe[name=\"embedded\"]");
+FrameLocator frameLocator = page.locator("iframe[name=\"embedded\"]").contentFrame();
 // ...
 Locator locator = frameLocator.owner();
 assertThat(locator).isVisible();
 ```
 
 ```python async
-frame_locator = page.frame_locator("iframe[name=\"embedded\"]")
+frame_locator = page.locator("iframe[name=\"embedded\"]").content_frame
 # ...
 locator = frame_locator.owner
 await expect(locator).to_be_visible()
 ```
 
 ```python sync
-frame_locator = page.frame_locator("iframe[name=\"embedded\"]")
+frame_locator = page.locator("iframe[name=\"embedded\"]").content_frame
 # ...
 locator = frame_locator.owner
 expect(locator).to_be_visible()
 ```
 
 ```csharp
-var frameLocator = Page.FrameLocator("iframe[name=\"embedded\"]");
+var frameLocator = Page.Locator("iframe[name=\"embedded\"]").ContentFrame;
 // ...
 var locator = frameLocator.Owner;
 await Expect(locator).ToBeVisibleAsync();
 ```
-
diff --git a/docs/src/api/class-keyboard.md b/docs/src/api/class-keyboard.md
index 64a539cfbe9f9..0bcaf6a59f96a 100644
--- a/docs/src/api/class-keyboard.md
+++ b/docs/src/api/class-keyboard.md
@@ -104,38 +104,23 @@ await page.Keyboard.PressAsync("Shift+A");
 An example to trigger select-all with the keyboard
 
 ```js
-// on Windows and Linux
-await page.keyboard.press('Control+A');
-// on macOS
-await page.keyboard.press('Meta+A');
+await page.keyboard.press('ControlOrMeta+A');
 ```
 
 ```java
-// on Windows and Linux
-page.keyboard().press("Control+A");
-// on macOS
-page.keyboard().press("Meta+A");
+page.keyboard().press("ControlOrMeta+A");
 ```
 
 ```python async
-# on windows and linux
-await page.keyboard.press("Control+A")
-# on mac_os
-await page.keyboard.press("Meta+A")
+await page.keyboard.press("ControlOrMeta+A")
 ```
 
 ```python sync
-# on windows and linux
-page.keyboard.press("Control+A")
-# on mac_os
-page.keyboard.press("Meta+A")
+page.keyboard.press("ControlOrMeta+A")
 ```
 
 ```csharp
-// on Windows and Linux
-await page.Keyboard.PressAsync("Control+A");
-// on macOS
-await page.Keyboard.PressAsync("Meta+A");
+await page.Keyboard.PressAsync("ControlOrMeta+A");
 ```
 
 ## async method: Keyboard.down
@@ -257,7 +242,7 @@ await browser.close();
 Page page = browser.newPage();
 page.navigate("https://keycode.info");
 page.keyboard().press("A");
-page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png"));
+page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png")));
 page.keyboard().press("ArrowLeft");
 page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("ArrowLeft.png")));
 page.keyboard().press("Shift+O");
diff --git a/docs/src/api/class-locator.md b/docs/src/api/class-locator.md
index 8a148ddf0b189..0859289a7fe66 100644
--- a/docs/src/api/class-locator.md
+++ b/docs/src/api/class-locator.md
@@ -38,7 +38,7 @@ for li in page.get_by_role('listitem').all():
 ```
 
 ```java
-for (Locator li : page.getByRole('listitem').all())
+for (Locator li : page.getByRole("listitem").all())
   li.click();
 ```
 
@@ -54,7 +54,7 @@ foreach (var li in await page.GetByRole("listitem").AllAsync())
 Returns an array of `node.innerText` values for all matching nodes.
 
 :::warning[Asserting text]
-If you need to assert text on the page, prefer [`method: LocatorAssertions.toHaveText`] with [`option: useInnerText`] option to avoid flakiness. See [assertions guide](../test-assertions.md) for more details.
+If you need to assert text on the page, prefer [`method: LocatorAssertions.toHaveText`] with [`option: LocatorAssertions.toHaveText.useInnerText`] option to avoid flakiness. See [assertions guide](../test-assertions.md) for more details.
 :::
 
 **Usage**
@@ -150,6 +150,67 @@ var button = page.GetByRole(AriaRole.Button).And(page.GetByTitle("Subscribe"));
 
 Additional locator to match.
 
+## async method: Locator.ariaSnapshot
+* since: v1.49
+- returns: <[string]>
+
+Captures the aria snapshot of the given element.
+Read more about [aria snapshots](../aria-snapshots.md) and [`method: LocatorAssertions.toMatchAriaSnapshot`] for the corresponding assertion.
+
+**Usage**
+
+```js
+await page.getByRole('link').ariaSnapshot();
+```
+
+```java
+page.getByRole(AriaRole.LINK).ariaSnapshot();
+```
+
+```python async
+await page.get_by_role("link").aria_snapshot()
+```
+
+```python sync
+page.get_by_role("link").aria_snapshot()
+```
+
+```csharp
+await page.GetByRole(AriaRole.Link).AriaSnapshotAsync();
+```
+
+**Details**
+
+This method captures the aria snapshot of the given element. The snapshot is a string that represents the state of the element and its children.
+The snapshot can be used to assert the state of the element in the test, or to compare it to state in the future.
+
+The ARIA snapshot is represented using [YAML](https://yaml.org/spec/1.2.2/) markup language:
+* The keys of the objects are the roles and optional accessible names of the elements.
+* The values are either text content or an array of child elements.
+* Generic static text can be represented with the `text` key.
+
+Below is the HTML markup and the respective ARIA snapshot:
+
+```html
+<ul aria-label="Links">
+  <li><a href="/">Home</a></li>
+  <li><a href="/about">About</a></li>
+<ul>
+```
+
+```yml
+- list "Links":
+  - listitem:
+    - link "Home"
+  - listitem:
+    - link "About"
+```
+
+### option: Locator.ariaSnapshot.timeout = %%-input-timeout-%%
+* since: v1.49
+
+### option: Locator.ariaSnapshot.timeout = %%-input-timeout-js-%%
+* since: v1.49
 
 ## async method: Locator.blur
 * since: v1.28
@@ -433,7 +494,7 @@ await page.Locator("canvas").ClickAsync(new() {
 ### option: Locator.click.timeout = %%-input-timeout-js-%%
 * since: v1.14
 
-### option: Locator.click.trial = %%-input-trial-%%
+### option: Locator.click.trial = %%-input-trial-with-modifiers-%%
 * since: v1.14
 
 ## async method: Locator.count
@@ -516,9 +577,49 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Locator.dblclick.timeout = %%-input-timeout-js-%%
 * since: v1.14
 
-### option: Locator.dblclick.trial = %%-input-trial-%%
+### option: Locator.dblclick.trial = %%-input-trial-with-modifiers-%%
 * since: v1.14
 
+## method: Locator.describe
+* since: v1.53
+- returns: <[Locator]>
+
+Describes the locator, description is used in the trace viewer and reports.
+Returns the locator pointing to the same element.
+
+**Usage**
+
+```js
+const button = page.getByTestId('btn-sub').describe('Subscribe button');
+await button.click();
+```
+
+```java
+Locator button = page.getByTestId("btn-sub").describe("Subscribe button");
+button.click();
+```
+
+```python async
+button = page.get_by_test_id("btn-sub").describe("Subscribe button")
+await button.click()
+```
+
+```python sync
+button = page.get_by_test_id("btn-sub").describe("Subscribe button")
+button.click()
+```
+
+```csharp
+var button = Page.GetByTestId("btn-sub").Describe("Subscribe button");
+await button.ClickAsync();
+```
+
+### param: Locator.describe.description
+* since: v1.53
+- `description` <[string]>
+
+Locator description.
+
 ## async method: Locator.dispatchEvent
 * since: v1.14
 
@@ -572,13 +673,11 @@ properties:
 You can also specify [JSHandle] as the property value if you want live objects to be passed into the event:
 
 ```js
-// Note you can only create DataTransfer in Chromium and Firefox
 const dataTransfer = await page.evaluateHandle(() => new DataTransfer());
 await locator.dispatchEvent('dragstart', { dataTransfer });
 ```
 
 ```java
-// Note you can only create DataTransfer in Chromium and Firefox
 JSHandle dataTransfer = page.evaluateHandle("() => new DataTransfer()");
 Map<String, Object> arg = new HashMap<>();
 arg.put("dataTransfer", dataTransfer);
@@ -586,13 +685,11 @@ locator.dispatchEvent("dragstart", arg);
 ```
 
 ```python async
-# note you can only create data_transfer in chromium and firefox
 data_transfer = await page.evaluate_handle("new DataTransfer()")
 await locator.dispatch_event("#source", "dragstart", {"dataTransfer": data_transfer})
 ```
 
 ```python sync
-# note you can only create data_transfer in chromium and firefox
 data_transfer = page.evaluate_handle("new DataTransfer()")
 locator.dispatch_event("#source", "dragstart", {"dataTransfer": data_transfer})
 ```
@@ -807,29 +904,35 @@ If [`param: expression`] throws or rejects, this method throws.
 
 **Usage**
 
+Passing argument to [`param: expression`]:
+
 ```js
-const tweets = page.locator('.tweet .retweets');
-expect(await tweets.evaluate(node => node.innerText)).toBe('10 retweets');
+const result = await page.getByTestId('myId').evaluate((element, [x, y]) => {
+  return element.textContent + ' ' + x * y;
+}, [7, 8]);
+console.log(result); // prints "myId text 56"
 ```
 
 ```java
-Locator tweets = page.locator(".tweet .retweets");
-assertEquals("10 retweets", tweets.evaluate("node => node.innerText"));
+Object result = page.getByTestId("myId").evaluate("(element, [x, y]) => {\n" +
+  "  return element.textContent + ' ' + x * y;\n" +
+  "}", Arrays.asList(7, 8));
+System.out.println(result); // prints "myId text 56"
 ```
 
 ```python async
-tweets = page.locator(".tweet .retweets")
-assert await tweets.evaluate("node => node.innerText") == "10 retweets"
+result = await page.get_by_testid("myId").evaluate("(element, [x, y]) => element.textContent + ' ' + x * y", [7, 8])
+print(result) # prints "myId text 56"
 ```
 
 ```python sync
-tweets = page.locator(".tweet .retweets")
-assert tweets.evaluate("node => node.innerText") == "10 retweets"
+result = page.get_by_testid("myId").evaluate("(element, [x, y]) => element.textContent + ' ' + x * y", [7, 8])
+print(result) # prints "myId text 56"
 ```
 
 ```csharp
-var tweets = page.Locator(".tweet .retweets");
-Assert.AreEqual("10 retweets", await tweets.EvaluateAsync("node => node.innerText"));
+var result = await page.GetByTestId("myId").EvaluateAsync<string>("(element, [x, y]) => element.textContent + ' ' + x * y)", new[] { 7, 8 });
+Console.WriteLine(result); // prints "myId text 56"
 ```
 
 ### param: Locator.evaluate.expression = %%-evaluate-expression-%%
@@ -844,11 +947,19 @@ Assert.AreEqual("10 retweets", await tweets.EvaluateAsync("node => node.innerTex
 
 Optional argument to pass to [`param: expression`].
 
-### option: Locator.evaluate.timeout = %%-input-timeout-%%
+### option: Locator.evaluate.timeout
 * since: v1.14
+* langs: python, java, csharp
+- `timeout` <[float]>
 
-### option: Locator.evaluate.timeout = %%-input-timeout-js-%%
+Maximum time in milliseconds to wait for the locator before evaluating. Note that after locator is resolved, evaluation itself is not limited by the timeout. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+
+### option: Locator.evaluate.timeout
 * since: v1.14
+* langs: js
+- `timeout` <[float]>
+
+Maximum time in milliseconds to wait for the locator before evaluating. Note that after locator is resolved, evaluation itself is not limited by the timeout. Defaults to `0` - no timeout.
 
 ## async method: Locator.evaluateAll
 * since: v1.14
@@ -933,11 +1044,19 @@ See [`method: Page.evaluateHandle`] for more details.
 
 Optional argument to pass to [`param: expression`].
 
-### option: Locator.evaluateHandle.timeout = %%-input-timeout-%%
+### option: Locator.evaluateHandle.timeout
 * since: v1.14
+* langs: python, java, csharp
+- `timeout` <[float]>
 
-### option: Locator.evaluateHandle.timeout = %%-input-timeout-js-%%
+Maximum time in milliseconds to wait for the locator before evaluating. Note that after locator is resolved, evaluation itself is not limited by the timeout. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+
+### option: Locator.evaluateHandle.timeout
 * since: v1.14
+* langs: js
+- `timeout` <[float]>
+
+Maximum time in milliseconds to wait for the locator before evaluating. Note that after locator is resolved, evaluation itself is not limited by the timeout. Defaults to `0` - no timeout.
 
 ## async method: Locator.fill
 * since: v1.14
@@ -1058,6 +1177,9 @@ await rowLocator
 ### option: Locator.filter.hasNotText = %%-locator-option-has-not-text-%%
 * since: v1.33
 
+### option: Locator.filter.visible = %%-locator-option-visible-%%
+* since: v1.51
+
 ## method: Locator.first
 * since: v1.14
 - returns: <[Locator]>
@@ -1266,7 +1388,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Locator.hover.timeout = %%-input-timeout-js-%%
 * since: v1.14
 
-### option: Locator.hover.trial = %%-input-trial-%%
+### option: Locator.hover.trial = %%-input-trial-with-modifiers-%%
 * since: v1.14
 
 ### option: Locator.hover.noWaitAfter = %%-input-no-wait-after-removed-%%
@@ -1291,7 +1413,7 @@ Returns the [`element.innerHTML`](https://developer.mozilla.org/en-US/docs/Web/A
 Returns the [`element.innerText`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/innerText).
 
 :::warning[Asserting text]
-If you need to assert text on the page, prefer [`method: LocatorAssertions.toHaveText`] with [`option: useInnerText`] option to avoid flakiness. See [assertions guide](../test-assertions.md) for more details.
+If you need to assert text on the page, prefer [`method: LocatorAssertions.toHaveText`] with [`option: LocatorAssertions.toHaveText.useInnerText`] option to avoid flakiness. See [assertions guide](../test-assertions.md) for more details.
 :::
 
 ### option: Locator.innerText.timeout = %%-input-timeout-%%
@@ -1422,7 +1544,7 @@ Boolean disabled = await page.GetByRole(AriaRole.Button).IsDisabledAsync();
 * since: v1.14
 - returns: <[boolean]>
 
-Returns whether the element is [editable](../actionability.md#editable).
+Returns whether the element is [editable](../actionability.md#editable). If the target element is not an `<input>`, `<textarea>`, `<select>`, `[contenteditable]` and does not have a role allowing `[aria-readonly]`, this method throws an error.
 
 :::warning[Asserting editable state]
 If you need to assert that an element is editable, prefer [`method: LocatorAssertions.toBeEditable`] to avoid flakiness. See [assertions guide](../test-assertions.md) for more details.
@@ -1654,16 +1776,23 @@ var banana = await page.GetByRole(AriaRole.Listitem).Nth(2);
   - alias-python: or_
 - returns: <[Locator]>
 
-Creates a locator that matches either of the two locators.
+Creates a locator matching all elements that match one or both of the two locators.
+
+Note that when both locators match something, the resulting locator will have multiple matches, potentially causing a [locator strictness](../locators.md#strictness) violation.
 
 **Usage**
 
 Consider a scenario where you'd like to click on a "New email" button, but sometimes a security settings dialog shows up instead. In this case, you can wait for either a "New email" button, or a dialog and act accordingly.
 
+:::note
+If both "New email" button and security dialog appear on screen, the "or" locator will match both of them,
+possibly throwing the ["strict mode violation" error](../locators.md#strictness). In this case, you can use [`method: Locator.first`] to only match one of them.
+:::
+
 ```js
 const newEmail = page.getByRole('button', { name: 'New' });
 const dialog = page.getByText('Confirm security settings');
-await expect(newEmail.or(dialog)).toBeVisible();
+await expect(newEmail.or(dialog).first()).toBeVisible();
 if (await dialog.isVisible())
   await page.getByRole('button', { name: 'Dismiss' }).click();
 await newEmail.click();
@@ -1672,7 +1801,7 @@ await newEmail.click();
 ```java
 Locator newEmail = page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("New"));
 Locator dialog = page.getByText("Confirm security settings");
-assertThat(newEmail.or(dialog)).isVisible();
+assertThat(newEmail.or(dialog).first()).isVisible();
 if (dialog.isVisible())
   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Dismiss")).click();
 newEmail.click();
@@ -1681,7 +1810,7 @@ newEmail.click();
 ```python async
 new_email = page.get_by_role("button", name="New")
 dialog = page.get_by_text("Confirm security settings")
-await expect(new_email.or_(dialog)).to_be_visible()
+await expect(new_email.or_(dialog).first).to_be_visible()
 if (await dialog.is_visible()):
   await page.get_by_role("button", name="Dismiss").click()
 await new_email.click()
@@ -1690,7 +1819,7 @@ await new_email.click()
 ```python sync
 new_email = page.get_by_role("button", name="New")
 dialog = page.get_by_text("Confirm security settings")
-expect(new_email.or_(dialog)).to_be_visible()
+expect(new_email.or_(dialog).first).to_be_visible()
 if (dialog.is_visible()):
   page.get_by_role("button", name="Dismiss").click()
 new_email.click()
@@ -1699,7 +1828,7 @@ new_email.click()
 ```csharp
 var newEmail = page.GetByRole(AriaRole.Button, new() { Name = "New" });
 var dialog = page.GetByText("Confirm security settings");
-await Expect(newEmail.Or(dialog)).ToBeVisibleAsync();
+await Expect(newEmail.Or(dialog).First).ToBeVisibleAsync();
 if (await dialog.IsVisibleAsync())
   await page.GetByRole(AriaRole.Button, new() { Name = "Dismiss" }).ClickAsync();
 await newEmail.ClickAsync();
@@ -1996,9 +2125,9 @@ Triggers a `change` and `input` event once all the provided options have been se
 
 ```html
 <select multiple>
-  <option value="red">Red</div>
-  <option value="green">Green</div>
-  <option value="blue">Blue</div>
+  <option value="red">Red</option>
+  <option value="green">Green</option>
+  <option value="blue">Blue</option>
 </select>
 ```
 
@@ -2055,7 +2184,7 @@ await element.SelectOptionAsync(new[] { "red", "green", "blue" });
 ### option: Locator.selectOption.force = %%-input-force-%%
 * since: v1.14
 
-### option: Locator.selectOption.noWaitAfter = %%-input-no-wait-after-%%
+### option: Locator.selectOption.noWaitAfter = %%-input-no-wait-after-removed-%%
 * since: v1.14
 
 ### option: Locator.selectOption.timeout = %%-input-timeout-%%
@@ -2293,7 +2422,7 @@ This method expects [Locator] to point to an
 ## async method: Locator.tap
 * since: v1.14
 
-Perform a tap gesture on the element matching the locator.
+Perform a tap gesture on the element matching the locator. For examples of emulating other gestures by manually dispatching touch events, see the [emulating legacy touch events](../touch-events.md) page.
 
 **Details**
 
@@ -2329,7 +2458,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Locator.tap.timeout = %%-input-timeout-js-%%
 * since: v1.14
 
-### option: Locator.tap.trial = %%-input-trial-%%
+### option: Locator.tap.trial = %%-input-trial-with-modifiers-%%
 * since: v1.14
 
 ## async method: Locator.textContent
diff --git a/docs/src/api/class-locatorassertions.md b/docs/src/api/class-locatorassertions.md
index 1ff5e52119b37..c2edbf7533c6c 100644
--- a/docs/src/api/class-locatorassertions.md
+++ b/docs/src/api/class-locatorassertions.md
@@ -14,14 +14,14 @@ test('status becomes submitted', async ({ page }) => {
 ```
 
 ```java
-...
+// ...
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
 public class TestLocator {
-  ...
+  // ...
   @Test
   void statusBecomesSubmitted() {
-    ...
+    // ...
     page.getByRole(AriaRole.BUTTON).click();
     assertThat(page.locator(".status")).hasText("Submitted");
   }
@@ -197,6 +197,21 @@ The opposite of [`method: LocatorAssertions.toBeVisible`].
 ### option: LocatorAssertions.NotToBeVisible.timeout = %%-csharp-java-python-assertions-timeout-%%
 * since: v1.18
 
+## async method: LocatorAssertions.NotToContainClass
+* since: v1.52
+* langs: python
+
+The opposite of [`method: LocatorAssertions.toContainClass`].
+
+### param: LocatorAssertions.NotToContainClass.expected
+* since: v1.52
+- `expected` <[string]|[Array]<[string]>>
+
+Expected class or RegExp or a list of those.
+
+### option: LocatorAssertions.NotToContainClass.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.52
+
 ## async method: LocatorAssertions.NotToContainText
 * since: v1.20
 * langs: python
@@ -240,6 +255,24 @@ Expected accessible description.
 ### option: LocatorAssertions.NotToHaveAccessibleDescription.timeout = %%-csharp-java-python-assertions-timeout-%%
 * since: v1.44
 
+## async method: LocatorAssertions.NotToHaveAccessibleErrorMessage
+* since: v1.50
+* langs: python
+
+The opposite of [`method: LocatorAssertions.toHaveAccessibleErrorMessage`].
+
+### param: LocatorAssertions.NotToHaveAccessibleErrorMessage.errorMessage
+* since: v1.50
+- `errorMessage` <[string]|[RegExp]>
+
+Expected accessible error message.
+
+### option: LocatorAssertions.NotToHaveAccessibleErrorMessage.ignoreCase = %%-assertions-ignore-case-%%
+* since: v1.50
+
+### option: LocatorAssertions.NotToHaveAccessibleErrorMessage.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.50
+
 
 ## async method: LocatorAssertions.NotToHaveAccessibleName
 * since: v1.44
@@ -442,6 +475,23 @@ Expected options currently selected.
 ### option: LocatorAssertions.NotToHaveValues.timeout = %%-csharp-java-python-assertions-timeout-%%
 * since: v1.23
 
+## async method: LocatorAssertions.NotToMatchAriaSnapshot
+* since: v1.49
+* langs: python
+
+The opposite of [`method: LocatorAssertions.toMatchAriaSnapshot`].
+
+### param: LocatorAssertions.NotToMatchAriaSnapshot.expected
+* since: v1.49
+- `expected` <string>
+
+### option: LocatorAssertions.NotToMatchAriaSnapshot.timeout = %%-js-assertions-timeout-%%
+* since: v1.49
+
+### option: LocatorAssertions.NotToMatchAriaSnapshot.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.49
+
+
 
 ## async method: LocatorAssertions.toBeAttached
 * since: v1.33
@@ -524,6 +574,16 @@ await Expect(locator).ToBeCheckedAsync();
 * since: v1.18
 - `checked` <[boolean]>
 
+Provides state to assert for. Asserts for input to be checked by default.
+This option can't be used when [`option: LocatorAssertions.toBeChecked.indeterminate`] is set to true.
+
+### option: LocatorAssertions.toBeChecked.indeterminate
+* since: v1.50
+- `indeterminate` <[boolean]>
+
+Asserts that the element is in the indeterminate (mixed) state. Only supported for checkboxes and radio buttons.
+This option can't be true when [`option: LocatorAssertions.toBeChecked.checked`] is provided.
+
 ### option: LocatorAssertions.toBeChecked.timeout = %%-js-assertions-timeout-%%
 * since: v1.18
 
@@ -701,7 +761,7 @@ expect(locator).to_be_enabled()
 
 ```csharp
 var locator = Page.Locator("button.submit");
-await Expect(locator).toBeEnabledAsync();
+await Expect(locator).ToBeEnabledAsync();
 ```
 
 ### option: LocatorAssertions.toBeEnabled.enabled
@@ -973,6 +1033,107 @@ await Expect(
 ### option: LocatorAssertions.toBeVisible.timeout = %%-csharp-java-python-assertions-timeout-%%
 * since: v1.18
 
+## async method: LocatorAssertions.toContainClass
+* since: v1.52
+* langs:
+  - alias-java: containsClass
+
+Ensures the [Locator] points to an element with given CSS classes. All classes from the asserted value, separated by spaces, must be present in the [Element.classList](https://developer.mozilla.org/en-US/docs/Web/API/Element/classList) in any order.
+
+**Usage**
+
+```html
+<div class='middle selected row' id='component'></div>
+```
+
+```js
+const locator = page.locator('#component');
+await expect(locator).toContainClass('middle selected row');
+await expect(locator).toContainClass('selected');
+await expect(locator).toContainClass('row middle');
+```
+
+```java
+assertThat(page.locator("#component")).containsClass("middle selected row");
+assertThat(page.locator("#component")).containsClass("selected");
+assertThat(page.locator("#component")).containsClass("row middle");
+```
+
+```python async
+from playwright.async_api import expect
+
+locator = page.locator("#component")
+await expect(locator).to_contain_class("middle selected row")
+await expect(locator).to_contain_class("selected")
+await expect(locator).to_contain_class("row middle")
+```
+
+```python sync
+from playwright.sync_api import expect
+
+locator = page.locator("#component")
+expect(locator).to_contain_class("middle selected row")
+expect(locator).to_contain_class("selected")
+expect(locator).to_contain_class("row middle")
+```
+
+```csharp
+var locator = Page.Locator("#component");
+await Expect(locator).ToContainClassAsync("middle selected row");
+await Expect(locator).ToContainClassAsync("selected");
+await Expect(locator).ToContainClassAsync("row middle");
+```
+
+When an array is passed, the method asserts that the list of elements located matches the corresponding list of expected class lists. Each element's class attribute is matched against the corresponding class in the array:
+
+```html
+<div class='list'>
+  <div class='component inactive'></div>
+  <div class='component active'></div>
+  <div class='component inactive'></div>
+</div>
+```
+
+```js
+const locator = page.locator('.list > .component');
+await expect(locator).toContainClass(['inactive', 'active', 'inactive']);
+```
+
+```java
+assertThat(page.locator(".list > .component")).containsClass(new String[] {"inactive", "active", "inactive"});
+```
+
+```python async
+from playwright.async_api import expect
+
+locator = page.locator(".list > .component")
+await expect(locator).to_contain_class(["inactive", "active", "inactive"])
+```
+
+```python sync
+from playwright.sync_api import expect
+
+locator = page.locator(".list > .component")
+await expect(locator).to_contain_class(["inactive", "active", "inactive"])
+```
+
+```csharp
+var locator = Page.Locator(".list > .component");
+await Expect(locator).ToContainClassAsync(new string[]{"inactive", "active", "inactive"});
+```
+
+### param: LocatorAssertions.toContainClass.expected
+* since: v1.52
+- `expected` <[string]|[Array]<[string]>>
+
+A string containing expected class names, separated by spaces, or a list of such strings to assert multiple elements.
+
+### option: LocatorAssertions.toContainClass.timeout = %%-js-assertions-timeout-%%
+* since: v1.52
+
+### option: LocatorAssertions.toContainClass.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.52
+
 ## async method: LocatorAssertions.toContainText
 * since: v1.20
 * langs:
@@ -1181,7 +1342,7 @@ expect(locator).to_have_accessible_description("Save results to disk")
 
 ```csharp
 var locator = Page.GetByTestId("save-button");
-await Expect(locator).toHaveAccessibleDescriptionAsync("Save results to disk");
+await Expect(locator).ToHaveAccessibleDescriptionAsync("Save results to disk");
 ```
 
 ### param: LocatorAssertions.toHaveAccessibleDescription.description
@@ -1200,6 +1361,56 @@ Expected accessible description.
 * since: v1.44
 
 
+## async method: LocatorAssertions.toHaveAccessibleErrorMessage
+* since: v1.50
+* langs:
+  - alias-java: hasAccessibleErrorMessage
+
+Ensures the [Locator] points to an element with a given [aria errormessage](https://w3c.github.io/aria/#aria-errormessage).
+
+**Usage**
+
+```js
+const locator = page.getByTestId('username-input');
+await expect(locator).toHaveAccessibleErrorMessage('Username is required.');
+```
+
+```java
+Locator locator = page.getByTestId("username-input");
+assertThat(locator).hasAccessibleErrorMessage("Username is required.");
+```
+
+```python async
+locator = page.get_by_test_id("username-input")
+await expect(locator).to_have_accessible_error_message("Username is required.")
+```
+
+```python sync
+locator = page.get_by_test_id("username-input")
+expect(locator).to_have_accessible_error_message("Username is required.")
+```
+
+```csharp
+var locator = Page.GetByTestId("username-input");
+await Expect(locator).ToHaveAccessibleErrorMessageAsync("Username is required.");
+```
+
+### param: LocatorAssertions.toHaveAccessibleErrorMessage.errorMessage
+* since: v1.50
+- `errorMessage` <[string]|[RegExp]>
+
+Expected accessible error message.
+
+### option: LocatorAssertions.toHaveAccessibleErrorMessage.timeout = %%-js-assertions-timeout-%%
+* since: v1.50
+
+### option: LocatorAssertions.toHaveAccessibleErrorMessage.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.50
+
+### option: LocatorAssertions.toHaveAccessibleErrorMessage.ignoreCase = %%-assertions-ignore-case-%%
+* since: v1.50
+
+
 ## async method: LocatorAssertions.toHaveAccessibleName
 * since: v1.44
 * langs:
@@ -1231,7 +1442,7 @@ expect(locator).to_have_accessible_name("Save to disk")
 
 ```csharp
 var locator = Page.GetByTestId("save-button");
-await Expect(locator).toHaveAccessibleNameAsync("Save to disk");
+await Expect(locator).ToHaveAccessibleNameAsync("Save to disk");
 ```
 
 ### param: LocatorAssertions.toHaveAccessibleName.name
@@ -1336,75 +1547,74 @@ Attribute name.
 * langs:
   - alias-java: hasClass
 
-Ensures the [Locator] points to an element with given CSS classes. This needs to be a full match
-or using a relaxed regular expression.
+Ensures the [Locator] points to an element with given CSS classes. When a string is provided, it must fully match the element's `class` attribute. To match individual classes use [`method: LocatorAssertions.toContainClass`].
 
 **Usage**
 
 ```html
-<div class='selected row' id='component'></div>
+<div class='middle selected row' id='component'></div>
 ```
 
 ```js
 const locator = page.locator('#component');
-await expect(locator).toHaveClass(/selected/);
-await expect(locator).toHaveClass('selected row');
+await expect(locator).toHaveClass('middle selected row');
+await expect(locator).toHaveClass(/(^|\s)selected(\s|$)/);
 ```
 
 ```java
-assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
-assertThat(page.locator("#component")).hasClass("selected row");
+assertThat(page.locator("#component")).hasClass("middle selected row");
+assertThat(page.locator("#component")).hasClass(Pattern.compile("(^|\\s)selected(\\s|$)"));
 ```
 
 ```python async
 from playwright.async_api import expect
 
 locator = page.locator("#component")
-await expect(locator).to_have_class(re.compile(r"selected"))
-await expect(locator).to_have_class("selected row")
+await expect(locator).to_have_class("middle selected row")
+await expect(locator).to_have_class(re.compile(r"(^|\\s)selected(\\s|$)"))
 ```
 
 ```python sync
 from playwright.sync_api import expect
 
 locator = page.locator("#component")
-expect(locator).to_have_class(re.compile(r"selected"))
-expect(locator).to_have_class("selected row")
+expect(locator).to_have_class("middle selected row")
+expect(locator).to_have_class(re.compile(r"(^|\\s)selected(\\s|$)"))
 ```
 
 ```csharp
 var locator = Page.Locator("#component");
-await Expect(locator).ToHaveClassAsync(new Regex("selected"));
-await Expect(locator).ToHaveClassAsync("selected row");
+await Expect(locator).ToHaveClassAsync("middle selected row");
+await Expect(locator).ToHaveClassAsync(new Regex("(^|\\s)selected(\\s|$)"));
 ```
 
-Note that if array is passed as an expected value, entire lists of elements can be asserted:
+When an array is passed, the method asserts that the list of elements located matches the corresponding list of expected class values. Each element's class attribute is matched against the corresponding string or regular expression in the array:
 
 ```js
-const locator = page.locator('list > .component');
+const locator = page.locator('.list > .component');
 await expect(locator).toHaveClass(['component', 'component selected', 'component']);
 ```
 
 ```java
-assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
+assertThat(page.locator(".list > .component")).hasClass(new String[] {"component", "component selected", "component"});
 ```
 
 ```python async
 from playwright.async_api import expect
 
-locator = page.locator("list > .component")
+locator = page.locator(".list > .component")
 await expect(locator).to_have_class(["component", "component selected", "component"])
 ```
 
 ```python sync
 from playwright.sync_api import expect
 
-locator = page.locator("list > .component")
+locator = page.locator(".list > .component")
 expect(locator).to_have_class(["component", "component selected", "component"])
 ```
 
 ```csharp
-var locator = Page.Locator("list > .component");
+var locator = Page.Locator(".list > .component");
 await Expect(locator).ToHaveClassAsync(new string[]{"component", "component selected", "component"});
 ```
 
@@ -2048,7 +2258,7 @@ await expect(locator).toHaveValues([/R/, /G/]);
 ```
 
 ```java
-page.locator("id=favorite-colors").selectOption(["R", "G"]);
+page.locator("id=favorite-colors").selectOption(new String[]{"R", "G"});
 assertThat(page.locator("id=favorite-colors")).hasValues(new Pattern[] { Pattern.compile("R"), Pattern.compile("G") });
 ```
 
@@ -2103,3 +2313,91 @@ Expected options currently selected.
 ### option: LocatorAssertions.toHaveValues.timeout = %%-csharp-java-python-assertions-timeout-%%
 * since: v1.23
 
+
+## async method: LocatorAssertions.toMatchAriaSnapshot
+* since: v1.49
+* langs:
+  - alias-java: matchesAriaSnapshot
+
+Asserts that the target element matches the given [accessibility snapshot](../aria-snapshots.md).
+
+**Usage**
+
+```js
+await page.goto('https://demo.playwright.dev/todomvc/');
+await expect(page.locator('body')).toMatchAriaSnapshot(`
+  - heading "todos"
+  - textbox "What needs to be done?"
+`);
+```
+
+```python async
+await page.goto("https://demo.playwright.dev/todomvc/")
+await expect(page.locator('body')).to_match_aria_snapshot('''
+  - heading "todos"
+  - textbox "What needs to be done?"
+''')
+```
+
+```python sync
+page.goto("https://demo.playwright.dev/todomvc/")
+expect(page.locator('body')).to_match_aria_snapshot('''
+  - heading "todos"
+  - textbox "What needs to be done?"
+''')
+```
+
+```csharp
+await page.GotoAsync("https://demo.playwright.dev/todomvc/");
+await Expect(page.Locator("body")).ToMatchAriaSnapshotAsync(@"
+  - heading ""todos""
+  - textbox ""What needs to be done?""
+");
+```
+
+```java
+page.navigate("https://demo.playwright.dev/todomvc/");
+assertThat(page.locator("body")).matchesAriaSnapshot("""
+  - heading "todos"
+  - textbox "What needs to be done?"
+""");
+```
+
+### param: LocatorAssertions.toMatchAriaSnapshot.expected
+* since: v1.49
+- `expected` <string>
+
+### option: LocatorAssertions.toMatchAriaSnapshot.timeout = %%-js-assertions-timeout-%%
+* since: v1.49
+
+### option: LocatorAssertions.toMatchAriaSnapshot.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.49
+
+## async method: LocatorAssertions.toMatchAriaSnapshot#2
+* since: v1.50
+* langs: js
+
+Asserts that the target element matches the given [accessibility snapshot](../aria-snapshots.md).
+
+Snapshot is stored in a separate `.aria.yml` file in a location configured by `expect.toMatchAriaSnapshot.pathTemplate` and/or `snapshotPathTemplate` properties in the configuration file.
+
+**Usage**
+
+```js
+await expect(page.locator('body')).toMatchAriaSnapshot();
+await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'body.aria.yml' });
+```
+
+### option: LocatorAssertions.toMatchAriaSnapshot#2.name
+* since: v1.50
+* langs: js
+- `name` <[string]>
+
+Name of the snapshot to store in the snapshot folder corresponding to this test.
+Generates sequential names if not specified.
+
+### option: LocatorAssertions.toMatchAriaSnapshot#2.timeout = %%-js-assertions-timeout-%%
+* since: v1.50
+
+### option: LocatorAssertions.toMatchAriaSnapshot#2.timeout = %%-csharp-java-python-assertions-timeout-%%
+* since: v1.50
diff --git a/docs/src/api/class-logger.md b/docs/src/api/class-logger.md
index 5ab4f3128a168..bd32e7065d94e 100644
--- a/docs/src/api/class-logger.md
+++ b/docs/src/api/class-logger.md
@@ -1,6 +1,7 @@
 # class: Logger
 * since: v1.8
 * langs: js
+* deprecated: This class is deprecated. The logs pumped through this class are incomplete. Please use tracing instead.
 
 Playwright generates a lot of logs and they are accessible via the pluggable logger sink.
 
diff --git a/docs/src/api/class-mouse.md b/docs/src/api/class-mouse.md
index 08eb74a072896..1897482bac506 100644
--- a/docs/src/api/class-mouse.md
+++ b/docs/src/api/class-mouse.md
@@ -3,6 +3,10 @@
 
 The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
 
+:::tip
+If you want to debug where the mouse moved, you can use the [Trace viewer](../trace-viewer-intro.md) or [Playwright Inspector](../running-tests.md). A red dot showing the location of the mouse will be shown for every mouse action.
+:::
+
 Every `page` object has its own Mouse, accessible with [`property: Page.mouse`].
 
 ```js
diff --git a/docs/src/api/class-page.md b/docs/src/api/class-page.md
index b64173affeb8e..a4bb867483eff 100644
--- a/docs/src/api/class-page.md
+++ b/docs/src/api/class-page.md
@@ -1,6 +1,5 @@
 # class: Page
 * since: v1.8
-* extends: [EventEmitter]
 
 Page provides methods to interact with a single tab in a [Browser], or an
 [extension background page](https://developer.chrome.com/extensions/background_pages) in Chromium. One [Browser]
@@ -813,7 +812,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Page.click.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Page.click.trial = %%-input-trial-%%
+### option: Page.click.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ## async method: Page.close
@@ -916,7 +915,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Page.dblclick.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Page.dblclick.trial = %%-input-trial-%%
+### option: Page.dblclick.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ## async method: Page.dispatchEvent
@@ -1042,9 +1041,9 @@ await page.dragAndDrop('#source', '#target', {
 ```
 
 ```java
-page.dragAndDrop("#source", '#target');
+page.dragAndDrop("#source", "#target");
 // or specify exact positions relative to the top-left corners of the elements:
-page.dragAndDrop("#source", '#target', new Page.DragAndDropOptions()
+page.dragAndDrop("#source", "#target", new Page.DragAndDropOptions()
   .setSourcePosition(34, 7).setTargetPosition(10, 20));
 ```
 
@@ -1218,8 +1217,6 @@ await page.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches);
 // → true
 await page.evaluate(() => matchMedia('(prefers-color-scheme: light)').matches);
 // → false
-await page.evaluate(() => matchMedia('(prefers-color-scheme: no-preference)').matches);
-// → false
 ```
 
 ```java
@@ -1228,8 +1225,6 @@ page.evaluate("() => matchMedia('(prefers-color-scheme: dark)').matches");
 // → true
 page.evaluate("() => matchMedia('(prefers-color-scheme: light)').matches");
 // → false
-page.evaluate("() => matchMedia('(prefers-color-scheme: no-preference)').matches");
-// → false
 ```
 
 ```python async
@@ -1238,8 +1233,6 @@ await page.evaluate("matchMedia('(prefers-color-scheme: dark)').matches")
 # → True
 await page.evaluate("matchMedia('(prefers-color-scheme: light)').matches")
 # → False
-await page.evaluate("matchMedia('(prefers-color-scheme: no-preference)').matches")
-# → False
 ```
 
 ```python sync
@@ -1248,7 +1241,6 @@ page.evaluate("matchMedia('(prefers-color-scheme: dark)').matches")
 # → True
 page.evaluate("matchMedia('(prefers-color-scheme: light)').matches")
 # → False
-page.evaluate("matchMedia('(prefers-color-scheme: no-preference)').matches")
 ```
 
 ```csharp
@@ -1257,8 +1249,6 @@ await page.EvaluateAsync("matchMedia('(prefers-color-scheme: dark)').matches");
 // → true
 await page.EvaluateAsync("matchMedia('(prefers-color-scheme: light)').matches");
 // → false
-await page.EvaluateAsync("matchMedia('(prefers-color-scheme: no-preference)').matches");
-// → false
 ```
 
 ### option: Page.emulateMedia.media
@@ -1282,16 +1272,16 @@ Passing `'Null'` disables CSS media emulation.
 * langs: js, java
 - `colorScheme` <null|[ColorScheme]<"light"|"dark"|"no-preference">>
 
-Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. Passing
-`null` disables color scheme emulation.
+Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) media feature, supported values are `'light'` and `'dark'`. Passing
+`null` disables color scheme emulation. `'no-preference'` is deprecated.
 
 ### option: Page.emulateMedia.colorScheme
 * since: v1.9
 * langs: csharp, python
 - `colorScheme` <[ColorScheme]<"light"|"dark"|"no-preference"|"null">>
 
-Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. Passing
-`'Null'` disables color scheme emulation.
+Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) media feature, supported values are `'light'` and `'dark'`. Passing
+`'Null'` disables color scheme emulation. `'no-preference'` is deprecated.
 
 ### option: Page.emulateMedia.reducedMotion
 * since: v1.12
@@ -1319,6 +1309,18 @@ Emulates `'forced-colors'` media feature, supported values are `'active'` and `'
 * langs: csharp, python
 - `forcedColors` <[ForcedColors]<"active"|"none"|"null">>
 
+### option: Page.emulateMedia.contrast
+* since: v1.51
+* langs: js, java
+- `contrast` <null|[Contrast]<"no-preference"|"more">>
+
+Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. Passing `null` disables contrast emulation.
+
+### option: Page.emulateMedia.contrast
+* since: v1.51
+* langs: csharp, python
+- `contrast` <[Contrast]<"no-preference"|"more"|"null">>
+
 ## async method: Page.evalOnSelector
 * since: v1.9
 * discouraged: This method does not wait for the element to pass actionability
@@ -1717,7 +1719,7 @@ public class Example {
   public static void main(String[] args) {
     try (Playwright playwright = Playwright.create()) {
       BrowserType webkit = playwright.webkit();
-      Browser browser = webkit.launch({ headless: false });
+      Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
       BrowserContext context = browser.newContext();
       Page page = context.newPage();
       page.exposeBinding("pageURL", (source, args) -> source.page().url());
@@ -1887,26 +1889,27 @@ public class Example {
   public static void main(String[] args) {
     try (Playwright playwright = Playwright.create()) {
       BrowserType webkit = playwright.webkit();
-      Browser browser = webkit.launch({ headless: false });
+      Browser browser = webkit.launch(new BrowserType.LaunchOptions().setHeadless(false));
       Page page = browser.newPage();
       page.exposeFunction("sha256", args -> {
-        String text = (String) args[0];
-        MessageDigest crypto;
         try {
-          crypto = MessageDigest.getInstance("SHA-256");
+          String text = (String) args[0];
+          MessageDigest crypto = MessageDigest.getInstance("SHA-256");
+          byte[] token = crypto.digest(text.getBytes(StandardCharsets.UTF_8));
+          return Base64.getEncoder().encodeToString(token);
         } catch (NoSuchAlgorithmException e) {
           return null;
         }
-        byte[] token = crypto.digest(text.getBytes(StandardCharsets.UTF_8));
-        return Base64.getEncoder().encodeToString(token);
       });
-      page.setContent("<script>\n" +
+      page.setContent(
+        "<script>\n" +
         "  async function onClick() {\n" +
         "    document.querySelector('div').textContent = await window.sha256('PLAYWRIGHT');\n" +
         "  }\n" +
         "</script>\n" +
         "<button onclick=\"onClick()\">Click me</button>\n" +
-        "<div></div>\n");
+        "<div></div>"
+      );
       page.click("button");
     }
   }
@@ -2107,7 +2110,7 @@ const frame = page.frame({ url: /.*domain.*/ });
 ```
 
 ```java
-Frame frame = page.frameByUrl(Pattern.compile(".*domain.*");
+Frame frame = page.frameByUrl(Pattern.compile(".*domain.*"));
 ```
 
 ```py
@@ -2334,6 +2337,58 @@ last redirect. If cannot go forward, returns `null`.
 
 Navigate to the next page in history.
 
+## async method: Page.requestGC
+* since: v1.48
+
+Request the page to perform garbage collection. Note that there is no guarantee that all unreachable objects will be collected.
+
+This is useful to help detect memory leaks. For example, if your page has a large object `'suspect'` that might be leaked, you can check that it does not leak by using a [`WeakRef`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakRef).
+
+```js
+// 1. In your page, save a WeakRef for the "suspect".
+await page.evaluate(() => globalThis.suspectWeakRef = new WeakRef(suspect));
+// 2. Request garbage collection.
+await page.requestGC();
+// 3. Check that weak ref does not deref to the original object.
+expect(await page.evaluate(() => !globalThis.suspectWeakRef.deref())).toBe(true);
+```
+
+```java
+// 1. In your page, save a WeakRef for the "suspect".
+page.evaluate("globalThis.suspectWeakRef = new WeakRef(suspect)");
+// 2. Request garbage collection.
+page.requestGC();
+// 3. Check that weak ref does not deref to the original object.
+assertTrue(page.evaluate("!globalThis.suspectWeakRef.deref()"));
+```
+
+```python async
+# 1. In your page, save a WeakRef for the "suspect".
+await page.evaluate("globalThis.suspectWeakRef = new WeakRef(suspect)")
+# 2. Request garbage collection.
+await page.request_gc()
+# 3. Check that weak ref does not deref to the original object.
+assert await page.evaluate("!globalThis.suspectWeakRef.deref()")
+```
+
+```python sync
+# 1. In your page, save a WeakRef for the "suspect".
+page.evaluate("globalThis.suspectWeakRef = new WeakRef(suspect)")
+# 2. Request garbage collection.
+page.request_gc()
+# 3. Check that weak ref does not deref to the original object.
+assert page.evaluate("!globalThis.suspectWeakRef.deref()")
+```
+
+```csharp
+// 1. In your page, save a WeakRef for the "suspect".
+await Page.EvaluateAsync("globalThis.suspectWeakRef = new WeakRef(suspect)");
+// 2. Request garbage collection.
+await Page.RequestGCAsync();
+// 3. Check that weak ref does not deref to the original object.
+Assert.True(await Page.EvaluateAsync("!globalThis.suspectWeakRef.deref()"));
+```
+
 ### option: Page.goForward.waitUntil = %%-navigation-wait-until-%%
 * since: v1.8
 
@@ -2378,7 +2433,7 @@ Headless mode doesn't support navigation to a PDF document. See the
 - `url` <[string]>
 
 URL to navigate page to. The url should include scheme, e.g. `https://`.
-When a [`option: baseURL`] via the context options was provided and the passed URL is a path,
+When a [`option: Browser.newContext.baseURL`] via the context options was provided and the passed URL is a path,
 it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
 
 ### option: Page.goto.waitUntil = %%-navigation-wait-until-%%
@@ -2433,7 +2488,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Page.hover.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Page.hover.trial = %%-input-trial-%%
+### option: Page.hover.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ### option: Page.hover.noWaitAfter = %%-input-no-wait-after-removed-%%
@@ -2585,7 +2640,7 @@ Returns whether the element is [enabled](../actionability.md#enabled).
 * discouraged: Use locator-based [`method: Locator.isHidden`] instead. Read more about [locators](../locators.md).
 - returns: <[boolean]>
 
-Returns whether the element is hidden, the opposite of [visible](../actionability.md#visible).  [`option: selector`] that does not match any elements is considered hidden.
+Returns whether the element is hidden, the opposite of [visible](../actionability.md#visible).  [`param: selector`] that does not match any elements is considered hidden.
 
 ### param: Page.isHidden.selector = %%-input-selector-%%
 * since: v1.8
@@ -2604,7 +2659,7 @@ Returns whether the element is hidden, the opposite of [visible](../actionabilit
 * discouraged: Use locator-based [`method: Locator.isVisible`] instead. Read more about [locators](../locators.md).
 - returns: <[boolean]>
 
-Returns whether the element is [visible](../actionability.md#visible). [`option: selector`] that does not match any elements is considered not visible.
+Returns whether the element is [visible](../actionability.md#visible). [`param: selector`] that does not match any elements is considered not visible.
 
 ### param: Page.isVisible.selector = %%-input-selector-%%
 * since: v1.8
@@ -2703,15 +2758,14 @@ Returns the opener for popup pages and `null` for others. If the opener has been
 ## async method: Page.pause
 * since: v1.9
 
-Pauses script execution. Playwright will stop executing the script and wait for the user to either press 'Resume'
+Pauses script execution. Playwright will stop executing the script and wait for the user to either press the 'Resume'
 button in the page overlay or to call `playwright.resume()` in the DevTools console.
 
 User can inspect selectors or perform manual steps while paused. Resume will continue running the original script from
 the place it was paused.
 
 :::note
-This method requires Playwright to be started in a headed mode, with a falsy [`option: headless`] value in
-the [`method: BrowserType.launch`].
+This method requires Playwright to be started in a headed mode, with a falsy [`option: BrowserType.launch.headless`] option.
 :::
 
 ## async method: Page.pdf
@@ -2720,10 +2774,6 @@ the [`method: BrowserType.launch`].
 
 Returns the PDF buffer.
 
-:::note
-Generating a pdf is currently only supported in Chromium headless.
-:::
-
 `page.pdf()` generates a pdf of the page with `print` css media. To generate a pdf with `screen` media, call
 [`method: Page.emulateMedia`] before calling `page.pdf()`:
 
@@ -3088,11 +3138,9 @@ Things to keep in mind:
 
 :::warning
 Running the handler will alter your page state mid-test. For example it will change the currently focused element and move the mouse. Make sure that actions that run after the handler are self-contained and do not rely on the focus and mouse state being unchanged.
-<br />
-<br />
+
 For example, consider a test that calls [`method: Locator.focus`] followed by [`method: Keyboard.press`]. If your handler clicks a button between these two actions, the focused element most likely will be wrong, and key press will happen on the unexpected element. Use [`method: Locator.press`] instead to avoid this problem.
-<br />
-<br />
+
 Another example is a series of mouse actions, where [`method: Mouse.move`] is followed by [`method: Mouse.down`]. Again, when the handler runs between these two actions, the mouse position will be wrong during the mouse down. Prefer self-contained actions like [`method: Locator.click`] that do not rely on the state being unchanged by a handler.
 :::
 
@@ -3113,12 +3161,12 @@ await page.getByRole('button', { name: 'Start here' }).click();
 
 ```java
 // Setup the handler.
-page.addLocatorHandler(page.getByText("Sign up to the newsletter"), () => {
+page.addLocatorHandler(page.getByText("Sign up to the newsletter"), () -> {
   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("No thanks")).click();
 });
 
 // Write the test as usual.
-page.goto("https://example.com");
+page.navigate("https://example.com");
 page.getByRole("button", Page.GetByRoleOptions().setName("Start here")).click();
 ```
 
@@ -3135,7 +3183,7 @@ page.get_by_role("button", name="Start here").click()
 
 ```python async
 # Setup the handler.
-def handler():
+async def handler():
   await page.get_by_role("button", name="No thanks").click()
 await page.add_locator_handler(page.get_by_text("Sign up to the newsletter"), handler)
 
@@ -3170,12 +3218,12 @@ await page.getByRole('button', { name: 'Start here' }).click();
 
 ```java
 // Setup the handler.
-page.addLocatorHandler(page.getByText("Confirm your security details")), () => {
+page.addLocatorHandler(page.getByText("Confirm your security details"), () -> {
   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Remind me later")).click();
 });
 
 // Write the test as usual.
-page.goto("https://example.com");
+page.navigate("https://example.com");
 page.getByRole("button", Page.GetByRoleOptions().setName("Start here")).click();
 ```
 
@@ -3192,7 +3240,7 @@ page.get_by_role("button", name="Start here").click()
 
 ```python async
 # Setup the handler.
-def handler():
+async def handler():
   await page.get_by_role("button", name="Remind me later").click()
 await page.add_locator_handler(page.get_by_text("Confirm your security details"), handler)
 
@@ -3227,12 +3275,12 @@ await page.getByRole('button', { name: 'Start here' }).click();
 
 ```java
 // Setup the handler.
-page.addLocatorHandler(page.locator("body")), () => {
+page.addLocatorHandler(page.locator("body"), () -> {
   page.evaluate("window.removeObstructionsForTestIfNeeded()");
-}, new Page.AddLocatorHandlerOptions.setNoWaitAfter(true));
+}, new Page.AddLocatorHandlerOptions().setNoWaitAfter(true));
 
 // Write the test as usual.
-page.goto("https://example.com");
+page.navigate("https://example.com");
 page.getByRole("button", Page.GetByRoleOptions().setName("Start here")).click();
 ```
 
@@ -3249,7 +3297,7 @@ page.get_by_role("button", name="Start here").click()
 
 ```python async
 # Setup the handler.
-def handler():
+async def handler():
   await page.evaluate("window.removeObstructionsForTestIfNeeded()")
 await page.add_locator_handler(page.locator("body"), handler, no_wait_after=True)
 
@@ -3278,7 +3326,7 @@ await page.addLocatorHandler(page.getByLabel('Close'), async locator => {
 ```
 
 ```java
-page.addLocatorHandler(page.getByLabel("Close"), locator => {
+page.addLocatorHandler(page.getByLabel("Close"), locator -> {
   locator.click();
 }, new Page.AddLocatorHandlerOptions().setTimes(1));
 ```
@@ -3290,7 +3338,7 @@ page.add_locator_handler(page.get_by_label("Close"), handler, times=1)
 ```
 
 ```python async
-def handler(locator):
+async def handler(locator):
   await locator.click()
 await page.add_locator_handler(page.get_by_label("Close"), handler, times=1)
 ```
@@ -3340,6 +3388,32 @@ Specifies the maximum number of times this handler should be called. Unlimited b
 
 By default, after calling the handler Playwright will wait until the overlay becomes hidden, and only then Playwright will continue with the action/assertion that triggered the handler. This option allows to opt-out of this behavior, so that overlay can stay visible after the handler has run.
 
+## async method: Page.removeAllListeners
+* since: v1.47
+* langs: js
+
+Removes all the listeners of the given type (or all registered listeners if no type given).
+Allows to wait for async listeners to complete or to ignore subsequent errors from these listeners.
+
+**Usage**
+
+```js
+page.on('request', async request => {
+  const response = await request.response();
+  const body = await response.body();
+  console.log(body.byteLength);
+});
+await page.goto('https://playwright.dev', { waitUntil: 'domcontentloaded' });
+// Waits for all the reported 'request' events to resolve.
+await page.removeAllListeners('request', { behavior: 'wait' });
+```
+
+### param: Page.removeAllListeners.type
+* since: v1.47
+- `type` ?<[string]>
+
+### option: Page.removeAllListeners.behavior = %%-remove-all-listeners-options-behavior-%%
+* since: v1.47
 
 ## async method: Page.removeLocatorHandler
 * since: v1.44
@@ -3533,9 +3607,7 @@ Enabling routing disables http cache.
 * since: v1.8
 - `url` <[string]|[RegExp]|[function]\([URL]\):[boolean]>
 
-A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
-When a [`option: baseURL`] via the context options was provided and the passed URL is a path,
-it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
+A glob pattern, regex pattern, or predicate that receives a [URL] to match during routing. If [`option: Browser.newContext.baseURL`] is set in the context options and the provided URL is a string that does not start with `*`, it is resolved using the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
 
 ### param: Page.route.handler
 * since: v1.8
@@ -3594,7 +3666,7 @@ A glob pattern, regular expression or predicate to match the request URL. Only r
 * since: v1.32
 - `updateMode` <[HarMode]<"full"|"minimal">>
 
-When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page, cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page, cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `minimal`.
 
 ### option: Page.routeFromHAR.updateContent
 * since: v1.32
@@ -3602,6 +3674,88 @@ When set to `minimal`, only record information necessary for routing from HAR. T
 
 Optional setting to control resource content management. If `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is specified, content is stored inline the HAR file.
 
+
+## async method: Page.routeWebSocket
+* since: v1.48
+
+This method allows to modify websocket connections that are made by the page.
+
+Note that only `WebSocket`s created after this method was called will be routed. It is recommended to call this method before navigating the page.
+
+**Usage**
+
+Below is an example of a simple mock that responds to a single message. See [WebSocketRoute] for more details and examples.
+
+```js
+await page.routeWebSocket('/ws', ws => {
+  ws.onMessage(message => {
+    if (message === 'request')
+      ws.send('response');
+  });
+});
+```
+
+```java
+page.routeWebSocket("/ws", ws -> {
+  ws.onMessage(frame -> {
+    if ("request".equals(frame.text()))
+      ws.send("response");
+  });
+});
+```
+
+```python async
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+def handler(ws: WebSocketRoute):
+  ws.on_message(lambda message: message_handler(ws, message))
+
+await page.route_web_socket("/ws", handler)
+```
+
+```python sync
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+def handler(ws: WebSocketRoute):
+  ws.on_message(lambda message: message_handler(ws, message))
+
+page.route_web_socket("/ws", handler)
+```
+
+```csharp
+await page.RouteWebSocketAsync("/ws", ws => {
+  ws.OnMessage(frame => {
+    if (frame.Text == "request")
+      ws.Send("response");
+  });
+});
+```
+
+### param: Page.routeWebSocket.url
+* since: v1.48
+- `url` <[string]|[RegExp]|[function]\([URL]\):[boolean]>
+
+Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the [`option: Browser.newContext.baseURL`] context option.
+
+### param: Page.routeWebSocket.handler
+* since: v1.48
+* langs: js, python
+- `handler` <[function]\([WebSocketRoute]\): [Promise<any>|any]>
+
+Handler function to route the WebSocket.
+
+### param: Page.routeWebSocket.handler
+* since: v1.48
+* langs: csharp, java
+- `handler` <[function]\([WebSocketRoute]\)>
+
+Handler function to route the WebSocket.
+
+
 ## async method: Page.screenshot
 * since: v1.8
 - returns: <[Buffer]>
@@ -3701,7 +3855,7 @@ await page.SelectOptionAsync("select#colors", new[] { "red", "green", "blue" });
 ### option: Page.selectOption.force = %%-input-force-%%
 * since: v1.13
 
-### option: Page.selectOption.noWaitAfter = %%-input-no-wait-after-%%
+### option: Page.selectOption.noWaitAfter = %%-input-no-wait-after-removed-%%
 * since: v1.8
 
 ### option: Page.selectOption.strict = %%-input-strict-%%
@@ -3826,7 +3980,7 @@ This setting will change the default maximum time for all the methods accepting
 * since: v1.8
 - `timeout` <[float]>
 
-Maximum time in milliseconds
+Maximum time in milliseconds. Pass `0` to disable timeout.
 
 ## async method: Page.setExtraHTTPHeaders
 * since: v1.8
@@ -3926,12 +4080,16 @@ await page.GotoAsync("https://www.microsoft.com");
 ### param: Page.setViewportSize.width
 * since: v1.10
 * langs: csharp, java
-- `width` <[int]> page width in pixels.
+- `width` <[int]>
+
+Page width in pixels.
 
 ### param: Page.setViewportSize.height
 * since: v1.10
 * langs: csharp, java
-- `height` <[int]> page height in pixels.
+- `height` <[int]>
+
+Page height in pixels.
 
 ## async method: Page.tap
 * since: v1.8
@@ -3949,7 +4107,7 @@ When all steps combined have not finished during the specified [`option: timeout
 [TimeoutError]. Passing zero timeout disables this.
 
 :::note
-[`method: Page.tap`] the method will throw if [`option: hasTouch`] option of the browser context is false.
+[`method: Page.tap`] the method will throw if [`option: Browser.newContext.hasTouch`] option of the browser context is false.
 :::
 
 ### param: Page.tap.selector = %%-input-selector-%%
@@ -3976,7 +4134,7 @@ When all steps combined have not finished during the specified [`option: timeout
 ### option: Page.tap.timeout = %%-input-timeout-js-%%
 * since: v1.8
 
-### option: Page.tap.trial = %%-input-trial-%%
+### option: Page.tap.trial = %%-input-trial-with-modifiers-%%
 * since: v1.11
 
 ## async method: Page.textContent
@@ -4736,7 +4894,7 @@ await page.RunAndWaitForRequestAsync(async () =>
 - `urlOrPredicate` <[string]|[RegExp]|[function]\([Request]\):[boolean]>
 
 Request URL string, regex or predicate receiving [Request] object.
-When a [`option: baseURL`] via the context options was provided and the passed URL is a path,
+When a [`option: Browser.newContext.baseURL`] via the context options was provided and the passed URL is a path,
 it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
 
 ### param: Page.waitForRequest.urlOrPredicate
@@ -4880,7 +5038,7 @@ await page.RunAndWaitForResponseAsync(async () =>
 - `urlOrPredicate` <[string]|[RegExp]|[function]\([Response]\):[boolean]>
 
 Request URL string, regex or predicate receiving [Response] object.
-When a [`option: baseURL`] via the context options was provided and the passed URL is a path,
+When a [`option: Browser.newContext.baseURL`] via the context options was provided and the passed URL is a path,
 it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
 
 ### param: Page.waitForResponse.urlOrPredicate
@@ -4889,7 +5047,7 @@ it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/We
 - `urlOrPredicate` <[string]|[RegExp]|[function]\([Response]\):[boolean]|[Promise]<[boolean]>>
 
 Request URL string, regex or predicate receiving [Response] object.
-When a [`option: baseURL`] via the context options was provided and the passed URL is a path,
+When a [`option: Browser.newContext.baseURL`] via the context options was provided and the passed URL is a path,
 it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
 
 ### option: Page.waitForResponse.timeout
diff --git a/docs/src/api/class-pageassertions.md b/docs/src/api/class-pageassertions.md
index 2dcd17b3ac7b5..6420735f2be59 100644
--- a/docs/src/api/class-pageassertions.md
+++ b/docs/src/api/class-pageassertions.md
@@ -14,14 +14,14 @@ test('navigates to login', async ({ page }) => {
 ```
 
 ```java
-...
+// ...
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
 public class TestPage {
-  ...
+  // ...
   @Test
   void navigatesToLoginPage() {
-    ...
+    // ...
     page.getByText("Sign in").click();
     assertThat(page).hasURL(Pattern.compile(".*/login"));
   }
@@ -83,7 +83,7 @@ assertThat(page).not().hasURL("error");
 ```
 
 ```csharp
-await Expect(Page).Not.ToHaveURL("error");
+await Expect(Page).Not.ToHaveURLAsync("error");
 ```
 
 ## async method: PageAssertions.NotToHaveTitle
@@ -271,7 +271,7 @@ expect(page).to_have_title(re.compile(r".*checkout"))
 ```
 
 ```csharp
-await Expect(Page).ToHaveTitle("Playwright");
+await Expect(Page).ToHaveTitleAsync("Playwright");
 ```
 
 ### param: PageAssertions.toHaveTitle.titleOrRegExp
@@ -296,7 +296,18 @@ Ensures the page is navigated to the given URL.
 **Usage**
 
 ```js
-await expect(page).toHaveURL(/.*checkout/);
+// Check for the page URL to be 'https://playwright.dev/docs/intro' (including query string)
+await expect(page).toHaveURL('https://playwright.dev/docs/intro');
+
+// Check for the page URL to contain 'doc', followed by an optional 's', followed by '/'
+await expect(page).toHaveURL(/docs?\//);
+
+// Check for the predicate to be satisfied
+// For example: verify query strings
+await expect(page).toHaveURL(url => {
+  const params = url.searchParams;
+  return params.has('search') && params.has('options') && params.get('id') === '5';
+});
 ```
 
 ```java
@@ -320,11 +331,20 @@ expect(page).to_have_url(re.compile(".*checkout"))
 ```
 
 ```csharp
-await Expect(Page).ToHaveURL(new Regex(".*checkout"));
+await Expect(Page).ToHaveURLAsync(new Regex(".*checkout"));
 ```
 
+### param: PageAssertions.toHaveURL.url
+* since: v1.18
+* langs: js
+- `url` <[string]|[RegExp]|[function]\([URL]\):[boolean]>
+
+Expected URL string, RegExp, or predicate receiving [URL] to match.
+When [`option: Browser.newContext.baseURL`] is provided via the context options and the `url` argument is a string, the two values are merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor and used for the comparison against the current browser URL.
+
 ### param: PageAssertions.toHaveURL.urlOrRegExp
 * since: v1.18
+* langs: csharp, python, java
 - `urlOrRegExp` <[string]|[RegExp]>
 
 Expected URL string or RegExp.
@@ -333,7 +353,7 @@ Expected URL string or RegExp.
 * since: v1.44
 - `ignoreCase` <[boolean]>
 
-Whether to perform case-insensitive match. [`option: ignoreCase`] option takes precedence over the corresponding regular expression flag if specified.
+Whether to perform case-insensitive match. [`option: ignoreCase`] option takes precedence over the corresponding regular expression parameter if specified. A provided predicate ignores this flag.
 
 ### option: PageAssertions.toHaveURL.timeout = %%-js-assertions-timeout-%%
 * since: v1.18
diff --git a/docs/src/api/class-playwrightassertions.md b/docs/src/api/class-playwrightassertions.md
index 7a960e34e1a56..aa4e0a42a4bf4 100644
--- a/docs/src/api/class-playwrightassertions.md
+++ b/docs/src/api/class-playwrightassertions.md
@@ -35,14 +35,13 @@ def test_status_becomes_submitted(page: Page) -> None:
 ```
 
 ```java
-...
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
 public class TestExample {
-  ...
+  // ...
   @Test
   void statusBecomesSubmitted() {
-    ...
+    // ...
     page.locator("#submit-button").click();
     assertThat(page.locator(".status")).hasText("Submitted");
   }
diff --git a/docs/src/api/class-route.md b/docs/src/api/class-route.md
index dcdca4705abab..dbbe12149614b 100644
--- a/docs/src/api/class-route.md
+++ b/docs/src/api/class-route.md
@@ -39,7 +39,7 @@ Optional error code. Defaults to `failed`, could be one of the following:
   - alias-java: resume
   - alias-python: continue_
 
-Continues route's request with optional overrides.
+Sends route's request to the network with optional overrides.
 
 **Usage**
 
@@ -102,7 +102,13 @@ await page.RouteAsync("**/*", async route =>
 
 **Details**
 
-Note that any overrides such as [`option: url`] or [`option: headers`] only apply to the request being routed. If this request results in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header through redirects, use the combination of [`method: Route.fetch`] and [`method: Route.fulfill`] instead.
+The [`option: headers`] option applies to both the routed request and any redirects it initiates. However, [`option: url`], [`option: method`], and [`option: postData`] only apply to the original request and are not carried over to redirected requests.
+
+[`method: Route.continue`] will immediately send the request to the network, other matching handlers won't be invoked. Use [`method: Route.fallback`] If you want next matching handler in the chain to be invoked.
+
+:::warning
+The `Cookie` header cannot be overridden using this method. If a value is provided, it will be ignored, and the cookie will be loaded from the browser's cookie store. To set custom cookies, use [`method: BrowserContext.addCookies`].
+:::
 
 ### option: Route.continue.url
 * since: v1.8
@@ -146,13 +152,15 @@ If set changes the request HTTP headers. Header values will be converted to a st
 ## async method: Route.fallback
 * since: v1.23
 
+Continues route's request with optional overrides. The method is similar to [`method: Route.continue`] with the difference that other matching handlers will be invoked before sending the request.
+
+**Usage**
+
 When several routes match the given pattern, they run in the order opposite to their registration.
 That way the last registered route can always override all the previous ones. In the example below,
 request will be handled by the bottom-most handler first, then it'll fall back to the previous one and
 in the end will be aborted by the first registered route.
 
-**Usage**
-
 ```js
 await page.route('**/*', async route => {
   // Runs last.
@@ -386,6 +394,8 @@ await page.RouteAsync("**/*", async route =>
 });
 ```
 
+Use [`method: Route.continue`] to immediately send the request to the network, other matching handlers won't be invoked in that case.
+
 ### option: Route.fallback.url
 * since: v1.23
 - `url` <[string]>
@@ -503,6 +513,12 @@ If set changes the request URL. New URL must have same protocol as original one.
 Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is exceeded.
 Defaults to `20`. Pass `0` to not follow redirects.
 
+### option: Route.fetch.maxRetries
+* since: v1.46
+- `maxRetries` <[int]>
+
+Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+
 ### option: Route.fetch.timeout
 * since: v1.33
 - `timeout` <[float]>
diff --git a/docs/src/api/class-touchscreen.md b/docs/src/api/class-touchscreen.md
index f37a12102cf9a..d7871addd7a00 100644
--- a/docs/src/api/class-touchscreen.md
+++ b/docs/src/api/class-touchscreen.md
@@ -4,13 +4,15 @@
 The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on the
 touchscreen can only be used in browser contexts that have been initialized with `hasTouch` set to true.
 
+This class is limited to emulating tap gestures. For examples of other gestures simulated by manually dispatching touch events, see the [emulating legacy touch events](../touch-events.md) page.
+
 ## async method: Touchscreen.tap
 * since: v1.8
 
 Dispatches a `touchstart` and `touchend` event with a single touch at the position ([`param: x`],[`param: y`]).
 
 :::note
-[`method: Page.tap`] the method will throw if [`option: hasTouch`] option of the browser context is false.
+[`method: Page.tap`] the method will throw if [`option: Browser.newContext.hasTouch`] option of the browser context is false.
 :::
 
 ### param: Touchscreen.tap.x
diff --git a/docs/src/api/class-tracing.md b/docs/src/api/class-tracing.md
index 6e7541e4cbfc4..0528891fdcb96 100644
--- a/docs/src/api/class-tracing.md
+++ b/docs/src/api/class-tracing.md
@@ -3,6 +3,12 @@
 
 API for collecting and saving Playwright traces. Playwright traces can be opened in [Trace Viewer](../trace-viewer.md) after Playwright script runs.
 
+:::note
+You probably want to [enable tracing in your config file](https://playwright.dev/docs/api/class-testoptions#test-options-trace) instead of using `context.tracing`.
+
+The `context.tracing` API captures browser operations and network activity, but it doesn't record test assertions (like `expect` calls). We recommend [enabling tracing through Playwright Test configuration](https://playwright.dev/docs/api/class-testoptions#test-options-trace), which includes those assertions and provides a more complete trace for debugging test failures.
+:::
+
 Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
 
 ```js
@@ -11,6 +17,7 @@ const context = await browser.newContext();
 await context.tracing.start({ screenshots: true, snapshots: true });
 const page = await context.newPage();
 await page.goto('https://playwright.dev');
+expect(page.url()).toBe('https://playwright.dev');
 await context.tracing.stop({ path: 'trace.zip' });
 ```
 
@@ -66,12 +73,19 @@ await context.Tracing.StopAsync(new()
 
 Start tracing.
 
+:::note
+You probably want to [enable tracing in your config file](https://playwright.dev/docs/api/class-testoptions#test-options-trace) instead of using `Tracing.start`.
+
+The `context.tracing` API captures browser operations and network activity, but it doesn't record test assertions (like `expect` calls). We recommend [enabling tracing through Playwright Test configuration](https://playwright.dev/docs/api/class-testoptions#test-options-trace), which includes those assertions and provides a more complete trace for debugging test failures.
+:::
+
 **Usage**
 
 ```js
 await context.tracing.start({ screenshots: true, snapshots: true });
 const page = await context.newPage();
 await page.goto('https://playwright.dev');
+expect(page.url()).toBe('https://playwright.dev');
 await context.tracing.stop({ path: 'trace.zip' });
 ```
 
@@ -121,7 +135,7 @@ await context.Tracing.StopAsync(new()
 - `name` <[string]>
 
 If specified, intermediate trace files are going to be saved into the files with the
-given name prefix inside the [`option: tracesDir`] folder specified in [`method: BrowserType.launch`].
+given name prefix inside the [`option: BrowserType.launch.tracesDir`] directory specified in [`method: BrowserType.launch`].
 To specify the final trace zip file name, you need to pass `path` option to
 [`method: Tracing.stop`] instead.
 
@@ -277,10 +291,84 @@ Trace name to be shown in the Trace Viewer.
 - `name` <[string]>
 
 If specified, intermediate trace files are going to be saved into the files with the
-given name prefix inside the [`option: tracesDir`] folder specified in [`method: BrowserType.launch`].
+given name prefix inside the [`option: BrowserType.launch.tracesDir`] directory specified in [`method: BrowserType.launch`].
 To specify the final trace zip file name, you need to pass `path` option to
 [`method: Tracing.stopChunk`] instead.
 
+## async method: Tracing.group
+* since: v1.49
+
+:::caution
+Use `test.step` instead when available.
+:::
+
+Creates a new group within the trace, assigning any subsequent API calls to this group, until [`method: Tracing.groupEnd`] is called. Groups can be nested and will be visible in the trace viewer.
+
+**Usage**
+
+```js
+// use test.step instead
+await test.step('Log in', async () => {
+  // ...
+});
+```
+
+```java
+// All actions between group and groupEnd
+// will be shown in the trace viewer as a group.
+page.context().tracing().group("Open Playwright.dev > API");
+page.navigate("https://playwright.dev/");
+page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("API")).click();
+page.context().tracing().groupEnd();
+```
+
+```python sync
+# All actions between group and group_end
+# will be shown in the trace viewer as a group.
+page.context.tracing.group("Open Playwright.dev > API")
+page.goto("https://playwright.dev/")
+page.get_by_role("link", name="API").click()
+page.context.tracing.group_end()
+```
+
+```python async
+# All actions between group and group_end
+# will be shown in the trace viewer as a group.
+await page.context.tracing.group("Open Playwright.dev > API")
+await page.goto("https://playwright.dev/")
+await page.get_by_role("link", name="API").click()
+await page.context.tracing.group_end()
+```
+
+```csharp
+// All actions between GroupAsync and GroupEndAsync
+// will be shown in the trace viewer as a group.
+await Page.Context.Tracing.GroupAsync("Open Playwright.dev > API");
+await Page.GotoAsync("https://playwright.dev/");
+await Page.GetByRole(AriaRole.Link, new() { Name = "API" }).ClickAsync();
+await Page.Context.Tracing.GroupEndAsync();
+```
+
+### param: Tracing.group.name
+* since: v1.49
+- `name` <[string]>
+
+Group name shown in the trace viewer.
+
+### option: Tracing.group.location
+* since: v1.49
+- `location` ?<[Object]>
+  - `file` <[string]>
+  - `line` ?<[int]>
+  - `column` ?<[int]>
+
+Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the [`method: Tracing.group`] call.
+
+## async method: Tracing.groupEnd
+* since: v1.49
+
+Closes the last group created by [`method: Tracing.group`].
+
 ## async method: Tracing.stop
 * since: v1.12
 
diff --git a/docs/src/api/class-websocket.md b/docs/src/api/class-websocket.md
index 3b3308b885666..e33740eacaad6 100644
--- a/docs/src/api/class-websocket.md
+++ b/docs/src/api/class-websocket.md
@@ -1,7 +1,9 @@
 # class: WebSocket
 * since: v1.8
 
-The [WebSocket] class represents websocket connections in the page.
+The [WebSocket] class represents WebSocket connections within a page. It provides the ability to inspect and manipulate the data being transmitted and received.
+
+If you want to intercept or modify WebSocket frames, consider using [WebSocketRoute].
 
 ## event: WebSocket.close
 * since: v1.8
diff --git a/docs/src/api/class-websocketroute.md b/docs/src/api/class-websocketroute.md
new file mode 100644
index 0000000000000..fcbe1b21f107a
--- /dev/null
+++ b/docs/src/api/class-websocketroute.md
@@ -0,0 +1,384 @@
+# class: WebSocketRoute
+* since: v1.48
+
+Whenever a [`WebSocket`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) route is set up with [`method: Page.routeWebSocket`] or [`method: BrowserContext.routeWebSocket`], the `WebSocketRoute` object allows to handle the WebSocket, like an actual server would do.
+
+**Mocking**
+
+By default, the routed WebSocket will not connect to the server. This way, you can mock entire communication over the WebSocket. Here is an example that responds to a `"request"` with a `"response"`.
+
+```js
+await page.routeWebSocket('wss://example.com/ws', ws => {
+  ws.onMessage(message => {
+    if (message === 'request')
+      ws.send('response');
+  });
+});
+```
+
+```java
+page.routeWebSocket("wss://example.com/ws", ws -> {
+  ws.onMessage(frame -> {
+    if ("request".equals(frame.text()))
+      ws.send("response");
+  });
+});
+```
+
+```python async
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+await page.route_web_socket("wss://example.com/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+```python sync
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+page.route_web_socket("wss://example.com/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+```csharp
+await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
+  ws.OnMessage(frame => {
+    if (frame.Text == "request")
+      ws.Send("response");
+  });
+});
+```
+
+Since we do not call [`method: WebSocketRoute.connectToServer`] inside the WebSocket route handler, Playwright assumes that WebSocket will be mocked, and opens the WebSocket inside the page automatically.
+
+Here is another example that handles JSON messages:
+
+```js
+await page.routeWebSocket('wss://example.com/ws', ws => {
+  ws.onMessage(message => {
+    const json = JSON.parse(message);
+    if (json.request === 'question')
+      ws.send(JSON.stringify({ response: 'answer' }));
+  });
+});
+```
+
+```java
+page.routeWebSocket("wss://example.com/ws", ws -> {
+  ws.onMessage(frame -> {
+    JsonObject json = new JsonParser().parse(frame.text()).getAsJsonObject();
+    if ("question".equals(json.get("request").getAsString())) {
+      Map<String, String> result = new HashMap();
+      result.put("response", "answer");
+      ws.send(gson.toJson(result));
+    }
+  });
+});
+```
+
+```python async
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  json_message = json.loads(message)
+  if json_message["request"] == "question":
+    ws.send(json.dumps({ "response": "answer" }))
+
+await page.route_web_socket("wss://example.com/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+```python sync
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  json_message = json.loads(message)
+  if json_message["request"] == "question":
+    ws.send(json.dumps({ "response": "answer" }))
+
+page.route_web_socket("wss://example.com/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+```csharp
+await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
+  ws.OnMessage(frame => {
+    using var jsonDoc = JsonDocument.Parse(frame.Text);
+    JsonElement root = jsonDoc.RootElement;
+    if (root.TryGetProperty("request", out JsonElement requestElement) && requestElement.GetString() == "question")
+    {
+      var response = new Dictionary<string, string> { ["response"] = "answer" };
+      string jsonResponse = JsonSerializer.Serialize(response);
+      ws.Send(jsonResponse);
+    }
+  });
+});
+```
+
+
+**Intercepting**
+
+Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block them. Calling [`method: WebSocketRoute.connectToServer`] returns a server-side `WebSocketRoute` instance that you can send messages to, or handle incoming messages.
+
+Below is an example that modifies some messages sent by the page to the server. Messages sent from the server to the page are left intact, relying on the default forwarding.
+
+```js
+await page.routeWebSocket('/ws', ws => {
+  const server = ws.connectToServer();
+  ws.onMessage(message => {
+    if (message === 'request')
+      server.send('request2');
+    else
+      server.send(message);
+  });
+});
+```
+
+```java
+page.routeWebSocket("/ws", ws -> {
+  WebSocketRoute server = ws.connectToServer();
+  ws.onMessage(frame -> {
+    if ("request".equals(frame.text()))
+      server.send("request2");
+    else
+      server.send(frame.text());
+  });
+});
+```
+
+```python async
+def message_handler(server: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    server.send("request2")
+  else:
+    server.send(message)
+
+def handler(ws: WebSocketRoute):
+  server = ws.connect_to_server()
+  ws.on_message(lambda message: message_handler(server, message))
+
+await page.route_web_socket("/ws", handler)
+```
+
+```python sync
+def message_handler(server: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    server.send("request2")
+  else:
+    server.send(message)
+
+def handler(ws: WebSocketRoute):
+  server = ws.connect_to_server()
+  ws.on_message(lambda message: message_handler(server, message))
+
+page.route_web_socket("/ws", handler)
+```
+
+```csharp
+await page.RouteWebSocketAsync("/ws", ws => {
+  var server = ws.ConnectToServer();
+  ws.OnMessage(frame => {
+    if (frame.Text == "request")
+      server.Send("request2");
+    else
+      server.Send(frame.Text);
+  });
+});
+```
+
+After connecting to the server, all **messages are forwarded** between the page and the server by default.
+
+However, if you call [`method: WebSocketRoute.onMessage`] on the original route, messages from the page to the server **will not be forwarded** anymore, but should instead be handled by the [`param: WebSocketRoute.onMessage.handler`].
+
+Similarly, calling [`method: WebSocketRoute.onMessage`] on the server-side WebSocket will **stop forwarding messages** from the server to the page, and [`param: WebSocketRoute.onMessage.handler`] should take care of them.
+
+
+The following example blocks some messages in both directions. Since it calls [`method: WebSocketRoute.onMessage`] in both directions, there is no automatic forwarding at all.
+
+```js
+await page.routeWebSocket('/ws', ws => {
+  const server = ws.connectToServer();
+  ws.onMessage(message => {
+    if (message !== 'blocked-from-the-page')
+      server.send(message);
+  });
+  server.onMessage(message => {
+    if (message !== 'blocked-from-the-server')
+      ws.send(message);
+  });
+});
+```
+
+```java
+page.routeWebSocket("/ws", ws -> {
+  WebSocketRoute server = ws.connectToServer();
+  ws.onMessage(frame -> {
+    if (!"blocked-from-the-page".equals(frame.text()))
+      server.send(frame.text());
+  });
+  server.onMessage(frame -> {
+    if (!"blocked-from-the-server".equals(frame.text()))
+      ws.send(frame.text());
+  });
+});
+```
+
+```python async
+def ws_message_handler(server: WebSocketRoute, message: Union[str, bytes]):
+  if message != "blocked-from-the-page":
+    server.send(message)
+
+def server_message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message != "blocked-from-the-server":
+    ws.send(message)
+
+def handler(ws: WebSocketRoute):
+  server = ws.connect_to_server()
+  ws.on_message(lambda message: ws_message_handler(server, message))
+  server.on_message(lambda message: server_message_handler(ws, message))
+
+await page.route_web_socket("/ws", handler)
+```
+
+```python sync
+def ws_message_handler(server: WebSocketRoute, message: Union[str, bytes]):
+  if message != "blocked-from-the-page":
+    server.send(message)
+
+def server_message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message != "blocked-from-the-server":
+    ws.send(message)
+
+def handler(ws: WebSocketRoute):
+  server = ws.connect_to_server()
+  ws.on_message(lambda message: ws_message_handler(server, message))
+  server.on_message(lambda message: server_message_handler(ws, message))
+
+page.route_web_socket("/ws", handler)
+```
+
+```csharp
+await page.RouteWebSocketAsync("/ws", ws => {
+  var server = ws.ConnectToServer();
+  ws.OnMessage(frame => {
+    if (frame.Text != "blocked-from-the-page")
+      server.Send(frame.Text);
+  });
+  server.OnMessage(frame => {
+    if (frame.Text != "blocked-from-the-server")
+      ws.Send(frame.Text);
+  });
+});
+```
+
+
+
+## async method: WebSocketRoute.close
+* since: v1.48
+
+Closes one side of the WebSocket connection.
+
+### option: WebSocketRoute.close.code
+* since: v1.48
+- `code` <[int]>
+
+Optional [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code).
+
+### option: WebSocketRoute.close.reason
+* since: v1.48
+- `reason` <[string]>
+
+Optional [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+
+
+
+## method: WebSocketRoute.connectToServer
+* since: v1.48
+- returns: <[WebSocketRoute]>
+
+By default, routed WebSocket does not connect to the server, so you can mock entire WebSocket communication. This method connects to the actual WebSocket server, and returns the server-side [WebSocketRoute] instance, giving the ability to send and receive messages from the server.
+
+Once connected to the server:
+* Messages received from the server will be **automatically forwarded** to the WebSocket in the page, unless [`method: WebSocketRoute.onMessage`] is called on the server-side `WebSocketRoute`.
+* Messages sent by the [`WebSocket.send()`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send) call in the page will be **automatically forwarded** to the server, unless [`method: WebSocketRoute.onMessage`] is called on the original `WebSocketRoute`.
+
+See examples at the top for more details.
+
+
+
+## method: WebSocketRoute.onClose
+* since: v1.48
+
+Allows to handle [`WebSocket.close`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close).
+
+By default, closing one side of the connection, either in the page or on the server, will close the other side. However, when [`method: WebSocketRoute.onClose`] handler is set up, the default forwarding of closure is disabled, and handler should take care of it.
+
+### param: WebSocketRoute.onClose.handler
+* since: v1.48
+* langs: js, python
+- `handler` <[function]\([int]|[undefined], [string]|[undefined]\): [Promise<any>|any]>
+
+Function that will handle WebSocket closure. Received an optional [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code) and an optional [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+
+### param: WebSocketRoute.onClose.handler
+* since: v1.48
+* langs: java
+- `handler` <[function]\([null]|[int], [null]|[string]\)>
+
+Function that will handle WebSocket closure. Received an optional [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code) and an optional [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+
+### param: WebSocketRoute.onClose.handler
+* since: v1.48
+* langs: csharp
+- `handler` <[function]\([int?], [string?]\)>
+
+Function that will handle WebSocket closure. Received an optional [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code) and an optional [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+
+## method: WebSocketRoute.onMessage
+* since: v1.48
+
+This method allows to handle messages that are sent by the WebSocket, either from the page or from the server.
+
+When called on the original WebSocket route, this method handles messages sent from the page. You can handle this messages by responding to them with [`method: WebSocketRoute.send`], forwarding them to the server-side connection returned by [`method: WebSocketRoute.connectToServer`] or do something else.
+
+Once this method is called, messages are not automatically forwarded to the server or to the page - you should do that manually by calling [`method: WebSocketRoute.send`]. See examples at the top for more details.
+
+Calling this method again will override the handler with a new one.
+
+### param: WebSocketRoute.onMessage.handler
+* since: v1.48
+* langs: js, python
+- `handler` <[function]\([string]\): [Promise<any>|any]>
+
+Function that will handle messages.
+
+### param: WebSocketRoute.onMessage.handler
+* since: v1.48
+* langs: csharp, java
+- `handler` <[function]\([WebSocketFrame]\)>
+
+Function that will handle messages.
+
+
+
+## method: WebSocketRoute.send
+* since: v1.48
+
+Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on the result of [`method: WebSocketRoute.connectToServer`], sends the message to the server. See examples at the top for more details.
+
+### param: WebSocketRoute.send.message
+* since: v1.48
+- `message` <[string]|[Buffer]>
+
+Message to send.
+
+
+
+## method: WebSocketRoute.url
+* since: v1.48
+- returns: <[string]>
+
+URL of the WebSocket created in the page.
diff --git a/docs/src/api/params.md b/docs/src/api/params.md
index 78d62060cc915..8cb60f038f65a 100644
--- a/docs/src/api/params.md
+++ b/docs/src/api/params.md
@@ -136,6 +136,11 @@ defaults to 1. See [UIEvent.detail].
 
 When set, this method only performs the [actionability](../actionability.md) checks and skips the action. Defaults to `false`. Useful to wait until the element is ready for the action without performing it.
 
+## input-trial-with-modifiers
+- `trial` <[boolean]>
+
+When set, this method only performs the [actionability](../actionability.md) checks and skips the action. Defaults to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys are pressed.
+
 ## input-source-position
 - `sourcePosition` <[Object]>
   - `x` <[float]>
@@ -254,9 +259,9 @@ Specify environment variables that will be visible to the browser. Defaults to `
     - `httpOnly` <[boolean]>
     - `secure` <[boolean]>
     - `sameSite` <[SameSiteAttribute]<"Strict"|"Lax"|"None">> sameSite flag
-  - `origins` <[Array]<[Object]>> localStorage to set for context
+  - `origins` <[Array]<[Object]>>
     - `origin` <[string]>
-    - `localStorage` <[Array]<[Object]>>
+    - `localStorage` <[Array]<[Object]>> localStorage to set for context
       - `name` <[string]>
       - `value` <[string]>
 
@@ -356,9 +361,15 @@ Emulates consistent window screen size available inside web page via `window.scr
 
 Target URL.
 
-## js-python-fetch-option-params
-* langs: js, python
-- `params` <[Object]<[string], [string]|[float]|[boolean]>>
+## js-fetch-option-params
+* langs: js
+- `params` <[Object]<[string], [string]|[float]|[boolean]>|[URLSearchParams]|[string]>
+
+Query parameters to be sent with the URL.
+
+## python-fetch-option-params
+* langs: python
+- `params` <[Object]<[string], [string]|[float]|[boolean]>|[string]>
 
 Query parameters to be sent with the URL.
 
@@ -368,7 +379,13 @@ Query parameters to be sent with the URL.
 
 Query parameters to be sent with the URL.
 
-## java-csharp-fetch-params
+## csharp-fetch-option-paramsString
+* langs: csharp
+- `paramsString` <[string]>
+
+Query parameters to be sent with the URL.
+
+## java-fetch-params
 * langs: java
 - `options` ?<[RequestOptions]>
 
@@ -393,8 +410,16 @@ Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to d
 Whether to throw on response codes other than 2xx and 3xx. By default response object is returned
 for all status codes.
 
-## js-python-fetch-option-form
-* langs: js, python
+## js-fetch-option-form
+* langs: js
+- `form` <[Object]<[string], [string]|[float]|[boolean]>|[FormData]>
+
+Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent as
+this request body. If this parameter is specified `content-type` header will be set to `application/x-www-form-urlencoded`
+unless explicitly provided.
+
+## python-fetch-option-form
+* langs: python
 - `form` <[Object]<[string], [string]|[float]|[boolean]>>
 
 Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent as
@@ -524,20 +549,21 @@ Does not enforce fixed viewport, allows resizing window in the headed mode.
 ## context-option-clientCertificates
 - `clientCertificates` <[Array]<[Object]>>
   - `origin` <[string]> Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
-  - `certPath` ?<[string]> Path to the file with the certificate in PEM format.
-  - `keyPath` ?<[string]> Path to the file with the private key in PEM format.
-  - `pfxPath` ?<[string]> Path to the PFX or PKCS12 encoded private key and certificate chain.
+  - `certPath` ?<[path]> Path to the file with the certificate in PEM format.
+  - `cert` ?<[Buffer]> Direct value of the certificate in PEM format.
+  - `keyPath` ?<[path]> Path to the file with the private key in PEM format.
+  - `key` ?<[Buffer]> Direct value of the private key in PEM format.
+  - `pfxPath` ?<[path]> Path to the PFX or PKCS12 encoded private key and certificate chain.
+  - `pfx` ?<[Buffer]> Direct value of the PFX or PKCS12 encoded private key and certificate chain.
   - `passphrase` ?<[string]> Passphrase for the private key (PEM or PFX).
 
 TLS Client Authentication allows the server to request a client certificate and verify it.
 
 **Details**
 
-An array of client certificates to be used. Each certificate object must have both `certPath` and `keyPath` or a single `pfxPath` to load the client certificate. Optionally, `passphrase` property should be provided if the certficiate is encrypted. The `origin` property should be provided with an exact match to the request origin that the certificate is valid for.
+An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`, a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally, `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided with an exact match to the request origin that the certificate is valid for.
 
-:::note
-Using Client Certificates in combination with Proxy Servers is not supported.
-:::
+Client certificate authentication is only active when at least one client certificate is provided. If you want to reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that does not match any of the domains you plan to visit.
 
 :::note
 When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it work by replacing `localhost` with `local.playwright`.
@@ -615,14 +641,14 @@ If no origin is specified, the username and password are sent to any servers upo
 * langs: js, java
 - `colorScheme` <null|[ColorScheme]<"light"|"dark"|"no-preference">>
 
-Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
+Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) media feature, supported values are `'light'` and `'dark'`. See
 [`method: Page.emulateMedia`] for more details. Passing `null` resets emulation to system defaults. Defaults to `'light'`.
 
 ## context-option-colorscheme-csharp-python
 * langs: csharp, python
 - `colorScheme` <[ColorScheme]<"light"|"dark"|"no-preference"|"null">>
 
-Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
+Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme) media feature, supported values are `'light'` and `'dark'`. See
 [`method: Page.emulateMedia`] for more details. Passing `'null'` resets emulation to system defaults. Defaults to `'light'`.
 
 ## context-option-reducedMotion
@@ -649,8 +675,21 @@ Emulates `'forced-colors'` media feature, supported values are `'active'`, `'non
 
 Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See [`method: Page.emulateMedia`] for more details. Passing `'null'` resets emulation to system defaults. Defaults to `'none'`.
 
+## context-option-contrast
+* langs: js, java
+- `contrast` <null|[Contrast]<"no-preference"|"more">>
+
+Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See [`method: Page.emulateMedia`] for more details. Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+
+## context-option-contrast-csharp-python
+* langs: csharp, python
+- `contrast` <[Contrast]<"no-preference"|"more"|"null">>
+
+Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See [`method: Page.emulateMedia`] for more details. Passing `'null'` resets emulation to system defaults. Defaults to `'no-preference'`.
+
 ## context-option-logger
 * langs: js
+* deprecated: The logs received by the logger are incomplete. Please use tracing instead.
 - `logger` <[Logger]>
 
 Logger sink for Playwright logging.
@@ -675,7 +714,7 @@ Logger sink for Playwright logging.
   - `content` ?<[HarContentPolicy]<"omit"|"embed"|"attach">> Optional setting to control resource content management. If `omit` is specified, content is not persisted. If `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output files and to `embed` for all other file extensions.
   - `path` <[path]> Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by default.
   - `mode` ?<[HarMode]<"full"|"minimal">> When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page, cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
-  - `urlFilter` ?<[string]|[RegExp]> A glob or regex pattern to filter requests that are stored in the HAR. When a [`option: baseURL`] via the context options was provided and the passed URL is a path, it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+  - `urlFilter` ?<[string]|[RegExp]> A glob or regex pattern to filter requests that are stored in the HAR. When a [`option: Browser.newContext.baseURL`] via the context options was provided and the passed URL is a path, it gets merged via the [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
 
 Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file. If not
 specified, the HAR is not recorded. Make sure to await [`method: BrowserContext.close`] for the HAR to be
@@ -741,8 +780,6 @@ not recorded. Make sure to call [`method: BrowserContext.close`] for videos to b
 * langs: csharp, java, python
   - alias-python: record_video_size
 - `recordVideoSize` <[Object]>
-  If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of each page will be
-  scaled down if necessary to fit the specified size.
   - `width` <[int]> Video frame width.
   - `height` <[int]> Video frame height.
 
@@ -760,12 +797,6 @@ Actual picture of each page will be scaled down if necessary to fit the specifie
 
 Network proxy settings to use with this context. Defaults to none.
 
-:::note
-For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all
-contexts override the proxy, global proxy will be never used and can be any string, for example
-`launch({ proxy: { server: 'http://per-context' } })`.
-:::
-
 ## context-option-strict
 - `strictSelectors` <[boolean]>
 
@@ -781,6 +812,16 @@ Whether to allow sites to register Service workers. Defaults to `'allow'`.
 * `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be registered.
 * `'block'`: Playwright will block all registration of Service Workers.
 
+## remove-all-listeners-options-behavior
+* langs: js
+* since: v1.47
+- `behavior` <[RemoveAllListenersBehavior]<"wait"|"ignoreErrors"|"default">>
+
+Specifies whether to wait for already running listeners and what to do if they throw errors:
+* `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+* `'wait'` - wait for current listener calls (if any) to finish
+* `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+
 ## unroute-all-options-behavior
 * langs: js, csharp, python
 * since: v1.41
@@ -791,6 +832,7 @@ Specifies whether to wait for already running handlers and what to do if they th
 * `'wait'` - wait for current handler calls (if any) to finish
 * `'ignoreErrors'` - do not wait for current handler calls (if any) to finish, all errors thrown by the handlers after unrouting are silently caught
 
+
 ## select-options-values
 * langs: java, js, csharp
 - `values` <[null]|[string]|[ElementHandle]|[Array]<[string]>|[Object]|[Array]<[ElementHandle]>|[Array]<[Object]>>
@@ -946,6 +988,8 @@ between the same pixel in compared images, between zero (strict) and one (lax),
 - %%-context-option-reducedMotion-csharp-python-%%
 - %%-context-option-forcedColors-%%
 - %%-context-option-forcedColors-csharp-python-%%
+- %%-context-option-contrast-%%
+- %%-context-option-contrast-csharp-python-%%
 - %%-context-option-logger-%%
 - %%-context-option-videospath-%%
 - %%-context-option-videosize-%%
@@ -974,7 +1018,11 @@ Additional arguments to pass to the browser instance. The list of Chromium flags
 ## browser-option-channel
 - `channel` <[string]>
 
-Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", "msedge-canary". Read more about using [Google Chrome and Microsoft Edge](../browsers.md#google-chrome--microsoft-edge).
+Browser distribution channel.
+
+Use "chromium" to [opt in to new headless mode](../browsers.md#chromium-new-headless-mode).
+
+Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or "msedge-canary" to use branded [Google Chrome and Microsoft Edge](../browsers.md#google-chrome--microsoft-edge).
 
 ## browser-option-chromiumsandbox
 - `chromiumSandbox` <[boolean]>
@@ -1016,8 +1064,8 @@ Close the browser process on SIGHUP. Defaults to `true`.
 
 Whether to run browser in headless mode. More details for
 [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
-[Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode). Defaults to `true` unless the
-[`option: devtools`] option is `true`.
+[Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+[`option: BrowserType.launch.devtools`] option is `true`.
 
 ## js-python-browser-option-firefoxuserprefs
 * langs: js, python
@@ -1026,6 +1074,8 @@ Whether to run browser in headless mode. More details for
 Firefox user preferences. Learn more about the Firefox user preferences at
 [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
 
+You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
+
 ## csharp-java-browser-option-firefoxuserprefs
 * langs: csharp, java
 - `firefoxUserPrefs` <[Object]<[string], [any]>>
@@ -1033,8 +1083,11 @@ Firefox user preferences. Learn more about the Firefox user preferences at
 Firefox user preferences. Learn more about the Firefox user preferences at
 [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
 
+You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
+
 ## browser-option-logger
 * langs: js
+* deprecated: The logs received by the logger are incomplete. Please use tracing instead.
 - `logger` <[Logger]>
 
 Logger sink for Playwright logging.
@@ -1109,6 +1162,11 @@ Note that outer and inner locators must belong to the same frame. Inner locator
 
 Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element. When passed a [string], matching is case-insensitive and searches for a substring.
 
+## locator-option-visible
+- `visible` <[boolean]>
+
+Only matches visible or invisible elements.
+
 ## locator-options-list-v1.14
 - %%-locator-option-has-text-%%
 - %%-locator-option-has-%%
@@ -1159,6 +1217,7 @@ Specify screenshot type, defaults to `png`.
 
 Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with
 a pink box `#FF00FF` (customized by [`option: maskColor`]) that completely covers its bounding box.
+The mask is also applied to invisible elements, see [Matching only visible elements](../locators.md#matching-only-visible-elements) to disable that.
 
 ## screenshot-option-mask-color
 * since: v1.35
@@ -1461,19 +1520,19 @@ page.get_by_text(re.compile("^hello$", re.IGNORECASE))
 
 ```java
 // Matches <span>
-page.getByText("world")
+page.getByText("world");
 
 // Matches first <div>
-page.getByText("Hello world")
+page.getByText("Hello world");
 
 // Matches second <div>
-page.getByText("Hello", new Page.GetByTextOptions().setExact(true))
+page.getByText("Hello", new Page.GetByTextOptions().setExact(true));
 
 // Matches both <div>s
-page.getByText(Pattern.compile("Hello"))
+page.getByText(Pattern.compile("Hello"));
 
 // Matches second <div>
-page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE))
+page.getByText(Pattern.compile("^hello$", Pattern.CASE_INSENSITIVE));
 ```
 
 ```csharp
@@ -1727,7 +1786,9 @@ await Expect(Page.GetByTitle("Issues count")).toHaveText("25 issues");
 - `type` ?<[string]>
 * langs: js
 
-This option configures a template controlling location of snapshots generated by [`method: PageAssertions.toHaveScreenshot#1`] and [`method: SnapshotAssertions.toMatchSnapshot#1`].
+This option configures a template controlling location of snapshots generated by [`method: PageAssertions.toHaveScreenshot#1`], [`method: LocatorAssertions.toMatchAriaSnapshot#2`] and [`method: SnapshotAssertions.toMatchSnapshot#1`].
+
+You can configure templates for each assertion separately in [`property: TestConfig.expect`].
 
 **Usage**
 
@@ -1736,7 +1797,19 @@ import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
   testDir: './tests',
+
+  // Single template for all assertions
   snapshotPathTemplate: '{testDir}/__screenshots__/{testFilePath}/{arg}{ext}',
+
+  // Assertion-specific templates
+  expect: {
+    toHaveScreenshot: {
+      pathTemplate: '{testDir}/__screenshots__{/projectName}/{testFilePath}/{arg}{ext}',
+    },
+    toMatchAriaSnapshot: {
+      pathTemplate: '{testDir}/__snapshots__/{testFilePath}/{arg}{ext}',
+    },
+  },
 });
 ```
 
@@ -1767,22 +1840,22 @@ test.describe('suite', () => {
 
 The list of supported tokens:
 
-* `{arg}` - Relative snapshot path **without extension**. These come from the arguments passed to the `toHaveScreenshot()` and `toMatchSnapshot()` calls; if called without arguments, this will be an auto-generated snapshot name.
+* `{arg}` - Relative snapshot path **without extension**. This comes from the arguments passed to `toHaveScreenshot()`, `toMatchAriaSnapshot()` or `toMatchSnapshot()`; if called without arguments, this will be an auto-generated snapshot name.
   * Value: `foo/bar/baz`
-* `{ext}` - snapshot extension (with dots)
+* `{ext}` - Snapshot extension (with the leading dot).
   * Value: `.png`
 * `{platform}` - The value of `process.platform`.
 * `{projectName}` - Project's file-system-sanitized name, if any.
   * Value: `''` (empty string).
-* `{snapshotDir}` - Project's [`property: TestConfig.snapshotDir`].
+* `{snapshotDir}` - Project's [`property: TestProject.snapshotDir`].
   * Value: `/home/playwright/tests` (since `snapshotDir` is not provided in config, it defaults to `testDir`)
-* `{testDir}` - Project's [`property: TestConfig.testDir`].
-  * Value: `/home/playwright/tests` (absolute path is since `testDir` is resolved relative to directory with config)
+* `{testDir}` - Project's [`property: TestProject.testDir`].
+  * Value: `/home/playwright/tests` (absolute path since `testDir` is resolved relative to directory with config)
 * `{testFileDir}` - Directories in relative path from `testDir` to **test file**.
   * Value: `page`
 * `{testFileName}` - Test file name with extension.
   * Value: `page-click.spec.ts`
-* `{testFilePath}` - Relative path from `testDir` to **test file**
+* `{testFilePath}` - Relative path from `testDir` to **test file**.
   * Value: `page/page-click.spec.ts`
 * `{testName}` - File-system-sanitized test title, including parent describes but excluding file name.
   * Value: `suite-test-should-work`
diff --git a/docs/src/aria-snapshots.md b/docs/src/aria-snapshots.md
new file mode 100644
index 0000000000000..a46c19198634a
--- /dev/null
+++ b/docs/src/aria-snapshots.md
@@ -0,0 +1,574 @@
+---
+id: aria-snapshots
+title: "Snapshot testing"
+---
+import LiteYouTube from '@site/src/components/LiteYouTube';
+
+## Overview
+
+With Playwright's Snapshot testing you can assert the accessibility tree of a page against a predefined snapshot template.
+
+```js
+await page.goto('https://playwright.dev/');
+await expect(page.getByRole('banner')).toMatchAriaSnapshot(`
+  - banner:
+    - heading /Playwright enables reliable end-to-end/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+    - link /[\\d]+k\\+ stargazers on GitHub/
+`);
+```
+
+```python sync
+page.goto('https://playwright.dev/')
+expect(page.query_selector('banner')).to_match_aria_snapshot("""
+  - banner:
+    - heading /Playwright enables reliable end-to-end/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+    - link /[\\d]+k\\+ stargazers on GitHub/
+""")
+```
+
+```python async
+await page.goto('https://playwright.dev/')
+await expect(page.query_selector('banner')).to_match_aria_snapshot("""
+  - banner:
+    - heading /Playwright enables reliable end-to-end/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+    - link /[\\d]+k\\+ stargazers on GitHub/
+""")
+```
+
+```java
+page.navigate("https://playwright.dev/");
+assertThat(page.locator("banner")).matchesAriaSnapshot("""
+  - banner:
+    - heading /Playwright enables reliable end-to-end/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+    - link /[\\d]+k\\+ stargazers on GitHub/
+""");
+```
+
+```csharp
+await page.GotoAsync("https://playwright.dev/");
+await Expect(page.Locator("banner")).ToMatchAriaSnapshotAsync(@"
+  - banner:
+    - heading ""Playwright enables reliable end-to-end testing for modern web apps."" [level=1]
+    - link ""Get started""
+    - link ""Star microsoft/playwright on GitHub""
+    - link /[\\d]+k\\+ stargazers on GitHub/
+");
+```
+
+<LiteYouTube
+    id="P4R6hnsE0UY"
+    title="Getting started with ARIA Snapshots"
+/>
+
+## Assertion testing vs Snapshot testing
+
+Snapshot testing and assertion testing serve different purposes in test automation:
+
+### Assertion testing
+Assertion testing is a targeted approach where you assert specific values or conditions about elements or components. For instance, with Playwright, [`method: LocatorAssertions.toHaveText`]
+verifies that an element contains the expected text, and [`method: LocatorAssertions.toHaveValue`]
+confirms that an input field has the expected value.
+Assertion tests are specific and generally check the current state of an element or property
+against an expected, predefined state.
+They work well for predictable, single-value checks but are limited in scope when testing the
+broader structure or variations.
+
+**Advantages**
+- **Clarity**: The intent of the test is explicit and easy to understand.
+- **Specificity**: Tests focus on particular aspects of functionality, making them more robust
+  against unrelated changes.
+- **Debugging**: Failures provide targeted feedback, pointing directly to the problematic aspect.
+
+**Disadvantages**
+- **Verbose for complex outputs**: Writing assertions for complex data structures or large outputs
+  can be cumbersome and error-prone.
+- **Maintenance overhead**: As code evolves, manually updating assertions can be time-consuming.
+
+### Snapshot testing
+Snapshot testing captures a “snapshot” or representation of the entire
+state of an element, component, or data at a given moment, which is then saved for future
+comparisons. When re-running tests, the current state is compared to the snapshot, and if there
+are differences, the test fails. This approach is especially useful for complex or dynamic
+structures, where manually asserting each detail would be too time-consuming. Snapshot testing
+is broader and more holistic than assertion testing, allowing you to track more complex changes over time.
+
+**Advantages**
+- **Simplifies complex outputs**: For example, testing a UI component's rendered output can be tedious with traditional assertions. Snapshots capture the entire output for easy comparison.
+- **Quick Feedback loop**: Developers can easily spot unintended changes in the output.
+- **Encourages consistency**: Helps maintain consistent output as code evolves.
+
+**Disadvantages**
+- **Over-Reliance**: It can be tempting to accept changes to snapshots without fully understanding
+  them, potentially hiding bugs.
+- **Granularity**: Large snapshots may be hard to interpret when differences arise, especially
+  if minor changes affect large portions of the output.
+- **Suitability**: Not ideal for highly dynamic content where outputs change frequently or
+  unpredictably.
+
+### When to use
+
+- **Snapshot testing** is ideal for:
+  - UI testing of whole pages and components.
+  - Broad structural checks for complex UI components.
+  - Regression testing for outputs that rarely change structure.
+
+- **Assertion testing** is ideal for:
+  - Core logic validation.
+  - Computed value testing.
+  - Fine-grained tests requiring precise conditions.
+
+By combining snapshot testing for broad, structural checks and assertion testing for specific functionality, you can achieve a well-rounded testing strategy.
+
+## Aria snapshots
+
+In Playwright, aria snapshots provide a YAML representation of the accessibility tree of a page.
+These snapshots can be stored and compared later to verify if the page structure remains consistent or meets defined
+expectations.
+
+The YAML format describes the hierarchical structure of accessible elements on the page, detailing **roles**, **attributes**, **values**, and **text content**.
+The structure follows a tree-like syntax, where each node represents an accessible element, and indentation indicates
+nested elements.
+
+Each accessible element in the tree is represented as a YAML node:
+
+```yaml
+- role "name" [attribute=value]
+```
+
+- **role**: Specifies the ARIA or HTML role of the element (e.g., `heading`, `list`, `listitem`, `button`).
+- **"name"**: Accessible name of the element. Quoted strings indicate exact values, `/patterns/` are used for regular expression.
+- **[attribute=value]**: Attributes and values, in square brackets, represent specific ARIA attributes, such
+  as `checked`, `disabled`, `expanded`, `level`, `pressed`, or `selected`.
+
+These values are derived from ARIA attributes or calculated based on HTML semantics. To inspect the accessibility tree
+structure of a page, use the [Chrome DevTools Accessibility Tab](https://developer.chrome.com/docs/devtools/accessibility/reference#tab).
+
+
+## Snapshot matching
+
+The [`method: LocatorAssertions.toMatchAriaSnapshot`] assertion method in Playwright compares the accessible
+structure of the locator scope with a predefined aria snapshot template, helping validate the page's state against
+testing requirements.
+
+For the following DOM:
+
+```html
+<h1>title</h1>
+```
+
+You can match it using the following snapshot template:
+
+```js
+await expect(page.locator('body')).toMatchAriaSnapshot(`
+  - heading "title"
+`);
+```
+
+```python sync
+expect(page.locator("body")).to_match_aria_snapshot("""
+  - heading "title"
+""")
+```
+
+```python async
+await expect(page.locator("body")).to_match_aria_snapshot("""
+  - heading "title"
+""")
+```
+
+```java
+assertThat(page.locator("body")).matchesAriaSnapshot("""
+  - heading "title"
+""");
+```
+
+```csharp
+await Expect(page.Locator("body")).ToMatchAriaSnapshotAsync(@"
+  - heading ""title""
+");
+```
+
+When matching, the snapshot template is compared to the current accessibility tree of the page:
+
+* If the tree structure matches the template, the test passes; otherwise, it fails, indicating a mismatch between
+  expected and actual accessibility states.
+* The comparison is case-sensitive and collapses whitespace, so indentation and line breaks are ignored.
+* The comparison is order-sensitive, meaning the order of elements in the snapshot template must match the order in the
+  page's accessibility tree.
+
+
+### Partial matching
+
+You can perform partial matches on nodes by omitting attributes or accessible names, enabling verification of specific
+parts of the accessibility tree without requiring exact matches. This flexibility is helpful for dynamic or irrelevant
+attributes.
+
+```html
+<button>Submit</button>
+```
+
+*aria snapshot*
+
+```yaml
+- button
+```
+
+In this example, the button role is matched, but the accessible name ("Submit") is not specified, allowing the test to
+pass regardless of the button's label.
+
+<hr/>
+
+For elements with ARIA attributes like `checked` or `disabled`, omitting these attributes allows partial matching,
+focusing solely on role and hierarchy.
+
+```html
+<input type="checkbox" checked>
+```
+
+*aria snapshot for partial match*
+
+```yaml
+- checkbox
+```
+
+In this partial match, the `checked` attribute is ignored, so the test will pass regardless of the checkbox state.
+
+<hr/>
+
+Similarly, you can partially match children in lists or groups by omitting specific list items or nested elements.
+
+```html
+<ul>
+  <li>Feature A</li>
+  <li>Feature B</li>
+  <li>Feature C</li>
+</ul>
+```
+
+*aria snapshot for partial match*
+
+```yaml
+- list
+  - listitem: Feature B
+```
+
+Partial matches let you create flexible snapshot tests that verify essential page structure without enforcing
+specific content or attributes.
+
+### Strict matching
+
+By default, a template containing the subset of children will be matched:
+
+```html
+<ul>
+  <li>Feature A</li>
+  <li>Feature B</li>
+  <li>Feature C</li>
+</ul>
+```
+
+*aria snapshot for partial match*
+
+```yaml
+- list
+  - listitem: Feature B
+```
+
+
+The `/children` property can be used to control how child elements are matched:
+- `contain` (default): Matches if all specified children are present in order
+- `equal`: Matches if the children exactly match the specified list in order
+- `deep-equal`: Matches if the children exactly match the specified list in order, including nested children
+
+```html
+<ul>
+  <li>Feature A</li>
+  <li>Feature B</li>
+  <li>Feature C</li>
+</ul>
+```
+
+*aria snapshot will fail due to Feature C not being in the template*
+
+```yaml
+- list
+  - /children: equal
+  - listitem: Feature A
+  - listitem: Feature B
+```
+
+### Matching with regular expressions
+
+Regular expressions allow flexible matching for elements with dynamic or variable text. Accessible names and text can
+support regex patterns.
+
+```html
+<h1>Issues 12</h1>
+```
+
+*aria snapshot with regular expression*
+
+```yaml
+- heading /Issues \d+/
+```
+
+## Generating snapshots
+
+Creating aria snapshots in Playwright helps ensure and maintain your application's structure.
+You can generate snapshots in various ways depending on your testing setup and workflow.
+
+### Generating snapshots with the Playwright code generator
+
+If you're using Playwright's [Code Generator](./codegen.md), generating aria snapshots is streamlined with its
+interactive interface:
+
+- **"Assert snapshot" Action**: In the code generator, you can use the "Assert snapshot" action to automatically create
+a snapshot assertion for the selected elements. This is a quick way to capture the aria snapshot as part of your
+recorded test flow.
+
+- **"Aria snapshot" Tab**: The "Aria snapshot" tab within the code generator interface visually represents the
+aria snapshot for a selected locator, letting you explore, inspect, and verify element roles, attributes, and
+accessible names to aid snapshot creation and review.
+
+### Updating snapshots with `@playwright/test` and the `--update-snapshots` flag
+* langs: js
+
+When using the Playwright test runner (`@playwright/test`), you can automatically update snapshots with the `--update-snapshots` flag, `-u` for short.
+
+Running tests with the `--update-snapshots` flag will update snapshots that did not match. Matching snapshots will not be updated.
+
+```bash
+npx playwright test --update-snapshots
+```
+
+Updating snapshots is useful when application structure changes require new snapshots as a baseline. Note that Playwright will wait for the maximum expect timeout specified in the test runner configuration to ensure the page is settled before taking the snapshot. It might be necessary to adjust the `--timeout` if the test hits the timeout while generating snapshots.
+
+#### Empty template for snapshot generation
+
+Passing an empty string as the template in an assertion generates a snapshot on-the-fly:
+
+```js
+await expect(locator).toMatchAriaSnapshot('');
+```
+
+Note that Playwright will wait for the maximum expect timeout specified in the test runner configuration to ensure the
+page is settled before taking the snapshot. It might be necessary to adjust the `--timeout` if the test hits the timeout
+while generating snapshots.
+
+#### Snapshot patch files
+
+When updating snapshots, Playwright creates patch files that capture differences. These patch files can be reviewed,
+applied, and committed to source control, allowing teams to track structural changes over time and ensure updates are
+consistent with application requirements.
+
+The way source code is updated can be changed using the `--update-source-method` flag. There are several options available:
+
+- **"patch"** (default): Generates a unified diff file that can be applied to the source code using `git apply`.
+- **"3way"**: Generates merge conflict markers in your source code, allowing you to choose whether to accept changes.
+- **"overwrite"**: Overwrites the source code with the new snapshot values.
+
+```bash
+npx playwright test --update-snapshots --update-source-method=3way
+```
+
+#### Snapshots as separate files
+
+To store your snapshots in a separate file, use the `toMatchAriaSnapshot` method with the `name` option, specifying a `.aria.yml` file extension.
+
+```js
+await expect(page.getByRole('main')).toMatchAriaSnapshot({ name: 'main.aria.yml' });
+```
+
+By default, snapshots from a test file `example.spec.ts` are placed in the `example.spec.ts-snapshots` directory. As snapshots should be the same across browsers, only one snapshot is saved even if testing with multiple browsers. Should you wish, you can customize the [snapshot path template](./api/class-testconfig#test-config-snapshot-path-template) using the following configuration:
+
+```js
+export default defineConfig({
+  expect: {
+    toMatchAriaSnapshot: {
+      pathTemplate: '__snapshots__/{testFilePath}/{arg}{ext}',
+    },
+  },
+});
+```
+
+### Using the `Locator.ariaSnapshot` method
+
+The [`method: Locator.ariaSnapshot`] method allows you to programmatically create a YAML representation of accessible
+elements within a locator's scope, especially helpful for generating snapshots dynamically during test execution.
+
+**Example**:
+
+```js
+const snapshot = await page.locator('body').ariaSnapshot();
+console.log(snapshot);
+```
+
+```python sync
+snapshot = page.locator("body").aria_snapshot()
+print(snapshot)
+```
+
+```python async
+snapshot = await page.locator("body").aria_snapshot()
+print(snapshot)
+```
+
+```java
+String snapshot = page.locator("body").ariaSnapshot();
+System.out.println(snapshot);
+```
+
+```csharp
+var snapshot = await page.Locator("body").AriaSnapshotAsync();
+Console.WriteLine(snapshot);
+```
+
+This command outputs the aria snapshot within the specified locator's scope in YAML format, which you can validate
+or store as needed.
+
+## Accessibility tree examples
+
+### Headings with level attributes
+
+Headings can include a `level` attribute indicating their heading level.
+
+```html
+<h1>Title</h1>
+<h2>Subtitle</h2>
+```
+
+*aria snapshot*
+
+```yaml
+- heading "Title" [level=1]
+- heading "Subtitle" [level=2]
+```
+
+### Text nodes
+
+Standalone or descriptive text elements appear as text nodes.
+
+```html
+<div>Sample accessible name</div>
+```
+
+*aria snapshot*
+
+```yaml
+- text: Sample accessible name
+```
+
+### Inline multiline text
+
+Multiline text, such as paragraphs, is normalized in the aria snapshot.
+
+```html
+<p>Line 1<br>Line 2</p>
+```
+
+*aria snapshot*
+
+```yaml
+- paragraph: Line 1 Line 2
+```
+
+### Links
+
+Links display their text or composed content from pseudo-elements.
+
+```html
+<a href="#more-info">Read more about Accessibility</a>
+```
+
+*aria snapshot*
+
+```yaml
+- link "Read more about Accessibility"
+```
+
+### Text boxes
+
+Input elements of type `text` show their `value` attribute content.
+
+```html
+<input type="text" value="Enter your name">
+```
+
+*aria snapshot*
+
+```yaml
+- textbox: Enter your name
+```
+
+### Lists with items
+
+Ordered and unordered lists include their list items.
+
+```html
+<ul aria-label="Main Features">
+  <li>Feature 1</li>
+  <li>Feature 2</li>
+</ul>
+```
+
+*aria snapshot*
+
+```yaml
+- list "Main Features":
+  - listitem: Feature 1
+  - listitem: Feature 2
+```
+
+### Grouped elements
+
+Groups capture nested elements, such as `<details>` elements with summary content.
+
+```html
+<details>
+  <summary>Summary</summary>
+  <p>Detail content here</p>
+</details>
+```
+
+*aria snapshot*
+
+```yaml
+- group: Summary
+```
+
+### Attributes and states
+
+Commonly used ARIA attributes, like `checked`, `disabled`, `expanded`, `level`, `pressed`, and `selected`, represent
+control states.
+
+#### Checkbox with `checked` attribute
+
+```html
+<input type="checkbox" checked>
+```
+
+*aria snapshot*
+
+```yaml
+- checkbox [checked]
+```
+
+#### Button with `pressed` attribute
+
+```html
+<button aria-pressed="true">Toggle</button>
+```
+
+*aria snapshot*
+
+```yaml
+- button "Toggle" [pressed=true]
+```
diff --git a/docs/src/auth.md b/docs/src/auth.md
index 12242927756ef..51145a79e8d68 100644
--- a/docs/src/auth.md
+++ b/docs/src/auth.md
@@ -13,6 +13,11 @@ Regardless of the authentication strategy you choose, you are likely to store au
 
 We recommend to create `playwright/.auth` directory and add it to your `.gitignore`. Your authentication routine will produce authenticated browser state and save it to a file in this `playwright/.auth` directory. Later on, tests will reuse this state and start already authenticated.
 
+:::danger
+The browser state file may contain sensitive cookies and headers that could be used to impersonate you or your test account.
+We strongly discourage checking them into private or public repositories.
+:::
+
 ```bash tab=bash-bash
 mkdir -p playwright/.auth
 echo $'\nplaywright/.auth' >> .gitignore
@@ -47,8 +52,9 @@ Create `tests/auth.setup.ts` that will prepare authenticated browser state for a
 
 ```js title="tests/auth.setup.ts"
 import { test as setup, expect } from '@playwright/test';
+import path from 'path';
 
-const authFile = 'playwright/.auth/user.json';
+const authFile = path.join(__dirname, '../playwright/.auth/user.json');
 
 setup('authenticate', async ({ page }) => {
   // Perform authentication steps. Replace these actions with your own.
@@ -113,6 +119,8 @@ test('test', async ({ page }) => {
 });
 ```
 
+Note that you need to delete the stored state when it expires. If you don't need to keep the state between test runs, write the browser state under [`property: TestProject.outputDir`], which is automatically cleaned up before every test run.
+
 ### Authenticating in UI mode
 * langs: js
 
@@ -229,7 +237,7 @@ await page.goto('https://github.com/login')
 # Interact with login form
 await page.get_by_label("Username or email address").fill("username")
 await page.get_by_label("Password").fill("password")
-await page.page.get_by_role("button", name="Sign in").click()
+await page.get_by_role("button", name="Sign in").click()
 # Continue with the test
 ```
 
@@ -263,9 +271,9 @@ existing authentication state instead.
 Playwright provides a way to reuse the signed-in state in the tests. That way you can log
 in only once and then skip the log in step for all of the tests.
 
-Web apps use cookie-based or token-based authentication, where authenticated state is stored as [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies) or in [local storage](https://developer.mozilla.org/en-US/docs/Web/API/Storage). Playwright provides [`method: BrowserContext.storageState`] method that can be used to retrieve storage state from authenticated contexts and then create new contexts with prepopulated state.
+Web apps use cookie-based or token-based authentication, where authenticated state is stored as [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies), in [local storage](https://developer.mozilla.org/en-US/docs/Web/API/Storage) or in [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API). Playwright provides [`method: BrowserContext.storageState`] method that can be used to retrieve storage state from authenticated contexts and then create new contexts with prepopulated state.
 
-Cookies and local storage state can be used across different browsers. They depend on your application's authentication model: some apps might require both cookies and local storage.
+Cookies, local storage and IndexedDB state can be used across different browsers. They depend on your application's authentication model which may require some combination of cookies, local storage or IndexedDB.
 
 The following code snippet retrieves state from an authenticated context and creates a new context with that state.
 
@@ -580,7 +588,7 @@ test('admin and user', async ({ adminPage, userPage }) => {
 
 ### Session storage
 
-Reusing authenticated state covers [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies) and [local storage](https://developer.mozilla.org/en-US/docs/Web/API/Storage) based authentication. Rarely, [session storage](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage) is used for storing information associated with the signed-in state. Session storage is specific to a particular domain and is not persisted across page loads. Playwright does not provide API to persist session storage, but the following snippet can be used to save/load session storage.
+Reusing authenticated state covers [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies), [local storage](https://developer.mozilla.org/en-US/docs/Web/API/Storage) and [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) based authentication. Rarely, [session storage](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage) is used for storing information associated with the signed-in state. Session storage is specific to a particular domain and is not persisted across page loads. Playwright does not provide API to persist session storage, but the following snippet can be used to save/load session storage.
 
 ```js
 // Get session storage and store as env variable
diff --git a/docs/src/best-practices-js.md b/docs/src/best-practices-js.md
index 1cac5477b7347..4707a13e82a72 100644
--- a/docs/src/best-practices-js.md
+++ b/docs/src/best-practices-js.md
@@ -90,7 +90,7 @@ await page
 
 #### Prefer user-facing attributes to XPath or CSS selectors
 
-Your DOM can easily change so having your tests depend on your DOM structure can lead to failing tests. For example consider selecting this button by its CSS classes. Should the designer change something then the class might change breaking your test.
+Your DOM can easily change so having your tests depend on your DOM structure can lead to failing tests. For example consider selecting this button by its CSS classes. Should the designer change something then the class might change, thus breaking your test.
 
 
 ```js
@@ -112,10 +112,41 @@ Playwright has a [test generator](./codegen.md) that can generate tests and pick
 
 To pick a locator run the `codegen` command followed by the URL that you would like to pick a locator from.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright codegen playwright.dev
 ```
 
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright codegen playwright.dev
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright codegen playwright.dev
+```
+
+</TabItem>
+
+</Tabs>
+
 This will open a new browser window as well as the Playwright inspector. To pick a locator first click on the 'Record' button to stop the recording. By default when you run the `codegen` command it will start a new recording. Once you stop the recording the 'Pick Locator' button will be available to click.
 
 You can then hover over any element on your page in the browser window and see the locator highlighted below your cursor. Clicking on an element will add the locator into the Playwright inspector. You can either copy the locator and paste into your test file or continue to explore the locator by editing it in the Playwright Inspector, for example by modifying the text, and seeing the results in the browser window.
@@ -170,10 +201,41 @@ You can live debug your test by clicking or editing the locators in your test in
 
 You can also debug your tests with the Playwright inspector by running your tests with the `--debug` flag.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright test --debug
 ```
 
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright test --debug
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright test --debug
+```
+
+</TabItem>
+
+</Tabs>
+
 You can then step through your test, view actionability logs and edit the locator live and see it highlighted in the browser window. This will show you which locators match, how many of them there are.
 
 <img width="1350" alt="debugging with the playwright inspector" loading="lazy" src="https://user-images.githubusercontent.com/13063165/212276296-4f5b18e7-2bd7-4766-9aa5-783517bd4aa2.png" />
@@ -182,9 +244,40 @@ You can then step through your test, view actionability logs and edit the locato
 
 To debug a specific test add the name of the test file and the line number of the test followed by the `--debug` flag.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright test example.spec.ts:9 --debug
 ```
+
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright test example.spec.ts:9 --debug
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright test example.spec.ts:9 --debug
+```
+
+</TabItem>
+
+</Tabs>
 #### Debugging on CI
 
 For CI failures, use the Playwright [trace viewer](./trace-viewer.md) instead of videos and screenshots. The trace viewer gives you a full trace of your tests as a local Progressive Web App (PWA) that can easily be shared. With the trace viewer you can view the timeline, inspect DOM snapshots for each action using dev tools, view network requests and more.
@@ -193,18 +286,81 @@ For CI failures, use the Playwright [trace viewer](./trace-viewer.md) instead of
 
 Traces are configured in the Playwright config file and are set to run on CI on the first retry of a failed test. We don't recommend setting this to `on` so that traces are run on every test as it's very performance heavy. However you can run a trace locally when developing with the `--trace` flag.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright test --trace on
 ```
+
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright test --trace on
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright test --trace on
+```
+
+</TabItem>
+
+</Tabs>
+
 Once you run this command your traces will be recorded for each test and can be viewed directly from the HTML report.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright show-report
-````
+```
+
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright show-report
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright show-report
+```
+
+</TabItem>
+
+</Tabs>
 
 <img width="1516" alt="Playwrights HTML report" loading="lazy" src="https://user-images.githubusercontent.com/13063165/212279022-d929d4c0-2271-486a-a75f-166ac231d25f.png" />
 
-Traces can be opened by clicking on the icon next to the test or by opening each of the test reports and scrolling down to the traces section.
+Traces can be opened by clicking on the icon next to the test file name or by opening each of the test reports and scrolling down to the traces section.
 
 <img width="1516" alt="Screenshot 2023-01-13 at 09 58 34" loading="lazy" src="https://user-images.githubusercontent.com/13063165/212279699-c9eb134f-4f4e-4f19-805c-37596d3272a6.png" />
 
@@ -246,26 +402,104 @@ export default defineConfig({
 
 By keeping your Playwright version up to date you will be able to test your app on the latest browser versions and catch failures before the latest browser version is released to the public.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npm install -D @playwright/test@latest
 ```
+
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn add --dev @playwright/test@latest
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm install --save-dev @playwright/test@latest
+```
+
+</TabItem>
+
+</Tabs>
+
 Check the [release notes](./release-notes.md) to see what the latest version is and what changes have been released.
 
 You can see what version of Playwright you have by running the following command.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright --version
 ```
 
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright --version
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright --version
+```
+
+</TabItem>
+
+</Tabs>
+
 ### Run tests on CI
 
 Setup CI/CD and run your tests frequently. The more often you run your tests the better. Ideally you should run your tests on each commit and pull request. Playwright comes with a [GitHub actions workflow](/ci-intro.md) so that tests will run on CI for you with no setup required. Playwright can also be setup on the [CI environment](/ci.md) of your choice.
 
-Use Linux when running your tests on CI as it is cheaper. Developers can use whatever environment when running locally but use linux on CI.
+Use Linux when running your tests on CI as it is cheaper. Developers can use whatever environment when running locally but use linux on CI. Consider setting up [Sharding](./test-sharding.md) to make CI faster.
+
+
+#### Optimize browser downloads on CI
+
+Only install the browsers that you actually need, especially on CI. For example, if you're only testing with Chromium, install just Chromium.
+
+```bash title=".github/workflows/playwright.yml"
+# Instead of installing all browsers
+npx playwright install --with-deps
+
+# Install only Chromium
+npx playwright install chromium --with-deps
+```
+
+This saves both download time and disk space on your CI machines.
 
 ### Lint your tests
 
-Linting the tests helps catching errors early. Use [`@typescript-eslint/no-floating-promises`](https://typescript-eslint.io/rules/no-floating-promises/) [ESLint](https://eslint.org) rule to make sure there are no missing awaits before the asynchronous calls to the Playwright API.
+We recommend TypeScript and linting with ESLint for your tests to catch errors early. Use [`@typescript-eslint/no-floating-promises`](https://typescript-eslint.io/rules/no-floating-promises/) [ESLint](https://eslint.org) rule to make sure there are no missing awaits before the asynchronous calls to the Playwright API. On your CI you can run `tsc --noEmit` to ensure that functions are called with the right signature.
 
 ### Use parallelism and sharding
 
@@ -282,10 +516,41 @@ test('runs in parallel 2', async ({ page }) => { /* ... */ });
 
 Playwright can [shard](./test-parallel.md#shard-tests-between-multiple-machines) a test suite, so that it can be executed on multiple machines.
 
+<Tabs
+  groupId="js-package-manager"
+  defaultValue="npm"
+  values={[
+    {label: 'npm', value: 'npm'},
+    {label: 'yarn', value: 'yarn'},
+    {label: 'pnpm', value: 'pnpm'}
+  ]
+}>
+<TabItem value="npm">
+
 ```bash
 npx playwright test --shard=1/3
 ```
 
+</TabItem>
+
+<TabItem value="yarn">
+
+```bash
+yarn playwright test --shard=1/3
+```
+
+</TabItem>
+
+<TabItem value="pnpm">
+
+```bash
+pnpm exec playwright test --shard=1/3
+```
+
+</TabItem>
+
+</Tabs>
+
 ## Productivity tips
 
 ### Use Soft assertions
diff --git a/docs/src/browsers.md b/docs/src/browsers.md
index c1ad722d60494..aafa274b5b725 100644
--- a/docs/src/browsers.md
+++ b/docs/src/browsers.md
@@ -232,7 +232,7 @@ Running 1 test using 1 worker
 
 With the VS Code extension you can run your tests on different browsers by checking the checkbox next to the browser name in the Playwright sidebar. These names are defined in your Playwright config file under the projects section. The default config when installing Playwright gives you 3 projects, Chromium, Firefox and WebKit. The first project is selected by default.
 
-![Projects section in VS Code extension](https://github.com/microsoft/playwright/assets/13063165/58fedea6-a2b9-4942-b2c7-2f3d482210cf)
+![Projects section in VS Code extension](./images/vscode-projects-section.png)
 
 To run tests on multiple projects(browsers), select each project by checking the checkboxes next to the project name.
 
@@ -338,16 +338,123 @@ dotnet test --settings:webkit.runsettings
 
 For Google Chrome, Microsoft Edge and other Chromium-based browsers, by default, Playwright uses open source Chromium builds. Since the Chromium project is ahead of the branded browsers, when the world is on Google Chrome N, Playwright already supports Chromium N+1 that will be released in Google Chrome and Microsoft Edge a few weeks later.
 
+### Chromium: headless shell
+
+Playwright ships a regular Chromium build for headed operations and a separate [chromium headless shell](https://developer.chrome.com/blog/chrome-headless-shell) for headless mode.
+
+If you are only running tests in headless shell (i.e. the `channel` option is **not** specified), for example on CI, you can avoid downloading the full Chromium browser by passing `--only-shell` during installation.
+
+```bash js
+# only running tests headlessly
+npx playwright install --with-deps --only-shell
+```
+
+```bash java
+# only running tests headlessly
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps --only-shell"
+```
+
+```bash python
+# only running tests headlessly
+playwright install --with-deps --only-shell
+```
+
+```bash csharp
+# only running tests headlessly
+pwsh bin/Debug/netX/playwright.ps1 install --with-deps --only-shell
+```
+
+### Chromium: new headless mode
+
+You can opt into the new headless mode by using `'chromium'` channel. As [official Chrome documentation puts it](https://developer.chrome.com/blog/chrome-headless-shell):
+
+> New Headless on the other hand is the real Chrome browser, and is thus more authentic, reliable, and offers more features. This makes it more suitable for high-accuracy end-to-end web app testing or browser extension testing.
+
+See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for details.
+
+```js
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'], channel: 'chromium' },
+    },
+  ],
+});
+```
+
+```java
+import com.microsoft.playwright.*;
+
+public class Example {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch(new BrowserType.LaunchOptions().setChannel("chromium"));
+      Page page = browser.newPage();
+      // ...
+    }
+  }
+}
+```
+
+```bash python
+pytest test_login.py --browser-channel chromium
+```
+
+```xml csharp
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <Playwright>
+    <BrowserName>chromium</BrowserName>
+    <LaunchOptions>
+      <Channel>chromium</Channel>
+    </LaunchOptions>
+  </Playwright>
+</RunSettings>
+```
+
+```bash csharp
+dotnet test -- Playwright.BrowserName=chromium Playwright.LaunchOptions.Channel=chromium
+```
+
+With the new headless mode, you can skip downloading the headless shell during browser installation by using the `--no-shell` option:
+
+```bash js
+# only running tests headlessly
+npx playwright install --with-deps --no-shell
+```
+
+```bash java
+# only running tests headlessly
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps --no-shell"
+```
+
+```bash python
+# only running tests headlessly
+playwright install --with-deps --no-shell
+```
+
+```bash csharp
+# only running tests headlessly
+pwsh bin/Debug/netX/playwright.ps1 install --with-deps --no-shell
+```
+
 ### Google Chrome & Microsoft Edge
 
 While Playwright can download and use the recent Chromium build, it can operate against the branded Google Chrome and Microsoft Edge browsers available on the machine (note that Playwright doesn't install them by default). In particular, the current Playwright version will support Stable and Beta channels of these browsers.
 
-Available channels are `chrome`, `msedge`, `chrome-beta`, `msedge-beta` or `msedge-dev`.
+Available channels are `chrome`, `msedge`, `chrome-beta`, `msedge-beta`, `chrome-dev`, `msedge-dev`, `chrome-canary`, `msedge-canary`.
 
 :::warning
 Certain Enterprise Browser Policies may impact Playwright's ability to launch and control Google Chrome and Microsoft Edge. Running in an environment with browser policies is outside of the Playwright project's scope.
 :::
 
+:::warning
+Google Chrome and Microsoft Edge have switched to a [new headless mode](https://developer.chrome.com/docs/chromium/headless) implementation that is closer to a regular headed mode. This differs from [chromium headless shell](https://developer.chrome.com/blog/chrome-headless-shell) that is used in Playwright by default when running headless, so expect different behavior in some cases. See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for details.
+:::
+
 ```js
 import { defineConfig, devices } from '@playwright/test';
 
@@ -401,6 +508,23 @@ pytest test_login.py --browser-channel msedge
 dotnet test -- Playwright.BrowserName=chromium Playwright.LaunchOptions.Channel=msedge
 ```
 
+######
+* langs: python
+
+Alternatively when using the library directly, you can specify the browser [`option: BrowserType.launch.channel`] when launching the browser:
+
+```python
+from playwright.sync_api import sync_playwright
+
+with sync_playwright() as p:
+    # Channel can be "chrome", "msedge", "chrome-beta", "msedge-beta" or "msedge-dev".
+    browser = p.chromium.launch(channel="msedge")
+    page = browser.new_page()
+    page.goto("https://playwright.dev")
+    print(page.title())
+    browser.close()
+```
+
 #### Installing Google Chrome & Microsoft Edge
 
 If Google Chrome or Microsoft Edge is not available on your machine, you can install
@@ -459,9 +583,13 @@ Google Chrome and Microsoft Edge respect enterprise policies, which include limi
 
 Playwright's Firefox version matches the recent [Firefox Stable](https://www.mozilla.org/en-US/firefox/new/) build. Playwright doesn't work with the branded version of Firefox since it relies on patches.
 
+Note that availability of certain features, which depend heavily on the underlying platform, may vary between operating systems. For example, available media codecs vary substantially between Linux, macOS and Windows.
+
 ### WebKit
 
-Playwright's WebKit is derived from the latest WebKit main branch sources, often before these updates are incorporated into Apple Safari and other WebKit-based browsers. This gives a lot of lead time to react on the potential browser update issues. Playwright doesn't work with the branded version of Safari since it relies on patches. Instead, you can test using the most recent WebKit build. Note that avialability of certain features, which depend heavily on the underlying platform, may vary between operating systems.
+Playwright's WebKit is derived from the latest WebKit main branch sources, often before these updates are incorporated into Apple Safari and other WebKit-based browsers. This gives a lot of lead time to react on the potential browser update issues. Playwright doesn't work with the branded version of Safari since it relies on patches. Instead, you can test using the most recent WebKit build.
+
+Note that availability of certain features, which depend heavily on the underlying platform, may vary between operating systems. For example, available media codecs vary substantially between Linux, macOS and Windows. While running WebKit on Linux CI is usually the most affordable option, for the closest-to-Safari experience you should run WebKit on mac, for example if you do video playback.
 
 ## Install behind a firewall or a proxy
 
@@ -758,6 +886,70 @@ $Env:PLAYWRIGHT_DOWNLOAD_HOST="http://192.0.2.1"
 $Env:PLAYWRIGHT_FIREFOX_DOWNLOAD_HOST="http://203.0.113.3"
 pwsh bin/Debug/netX/playwright.ps1 install
 ```
+
+## Using a pre-installed Node.js
+* langs: python, java, dotnet
+By default, Playwright uses its bundled Node.js runtime for operations such as browser installation and script execution. If you want Playwright to use a pre-installed Node.js binary instead of the bundled runtime, you can specify it using the `PLAYWRIGHT_NODEJS_PATH` environment variable. This can be useful in environments where you need to use a specific version of Node.js or where the bundled runtime is not compatible.
+
+```bash tab=bash-bash lang=js
+PLAYWRIGHT_NODEJS_PATH="/usr/local/bin/node" npx playwright install
+```
+
+```batch tab=bash-batch lang=js
+set PLAYWRIGHT_NODEJS_PATH=C:\Program Files\nodejs\node.exe
+npx playwright install
+```
+
+```powershell tab=bash-powershell lang=js
+$Env:PLAYWRIGHT_NODEJS_PATH="C:\Program Files\nodejs\node.exe"
+npx playwright install
+```
+
+```bash tab=bash-bash lang=python
+pip install playwright
+PLAYWRIGHT_NODEJS_PATH="/usr/local/bin/node" playwright install
+```
+
+```batch tab=bash-batch lang=python
+set PLAYWRIGHT_NODEJS_PATH=C:\Program Files\nodejs\node.exe
+pip install playwright
+playwright install
+```
+
+```powershell tab=bash-powershell lang=python
+$Env:PLAYWRIGHT_NODEJS_PATH="C:\Program Files\nodejs\node.exe"
+pip install playwright
+playwright install
+```
+
+```bash tab=bash-bash lang=java
+PLAYWRIGHT_NODEJS_PATH="/usr/local/bin/node" mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install"
+```
+
+```batch tab=bash-batch lang=java
+set PLAYWRIGHT_NODEJS_PATH=C:\Program Files\nodejs\node.exe
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install"
+```
+
+```powershell tab=bash-powershell lang=java
+$Env:PLAYWRIGHT_NODEJS_PATH="C:\Program Files\nodejs\node.exe"
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install"
+```
+
+```bash tab=bash-bash lang=csharp
+PLAYWRIGHT_NODEJS_PATH="/usr/local/bin/node" pwsh bin/Debug/netX/playwright.ps1 install
+```
+
+```batch tab=bash-batch lang=csharp
+set PLAYWRIGHT_NODEJS_PATH=C:\Program Files\nodejs\node.exe
+pwsh bin/Debug/netX/playwright.ps1 install
+```
+
+```powershell tab=bash-powershell lang=csharp
+$Env:PLAYWRIGHT_NODEJS_PATH="C:\Program Files\nodejs\node.exe"
+pwsh bin/Debug/netX/playwright.ps1 install
+```
+
 ## Managing browser binaries
 
 Playwright downloads Chromium, WebKit and Firefox browsers into the OS-specific cache folders:
@@ -956,6 +1148,26 @@ Playwright keeps track of the clients that use its browsers. When there are no m
 
 To opt-out from the unused browser removal, you can set the `PLAYWRIGHT_SKIP_BROWSER_GC=1` environment variable.
 
+### List all installed browsers:
+
+Prints list of browsers from all playwright installations on the machine.
+
+```bash js
+npx playwright install --list
+```
+
+```bash java
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --list"
+```
+
+```bash python
+playwright install --list
+```
+
+```bash csharp
+pwsh bin/Debug/netX/playwright.ps1 install --list
+```
+
 ### Uninstall browsers
 
 This will remove the browsers (chromium, firefox, webkit) of the current Playwright installation:
diff --git a/docs/src/canary-releases-js.md b/docs/src/canary-releases-js.md
index 1c22353c3651e..6ff256b85abeb 100644
--- a/docs/src/canary-releases-js.md
+++ b/docs/src/canary-releases-js.md
@@ -18,9 +18,6 @@ Using a canary release in production might seem risky, but in practice, it's not
 A canary release passes all automated tests and is used to test e.g. the HTML report, Trace Viewer, or Playwright Inspector with end-to-end tests.
 
 :::
-```txt
-npm install -D @playwright/test@next
-```
 
 ## Next npm Dist Tag
 
@@ -34,7 +31,7 @@ You can see on [npm](https://www.npmjs.com/package/@playwright/test?activeTab=ve
 
 ## Using a Canary Release
 
-```txt
+```bash
 npm install -D @playwright/test@next
 ```
 
diff --git a/docs/src/chrome-extensions-js-python.md b/docs/src/chrome-extensions-js-python.md
index e34236ab5b660..9512a0acf876c 100644
--- a/docs/src/chrome-extensions-js-python.md
+++ b/docs/src/chrome-extensions-js-python.md
@@ -6,10 +6,14 @@ title: "Chrome extensions"
 ## Introduction
 
 :::note
-Extensions only work in Chrome / Chromium launched with a persistent context. Use custom browser args at your own risk, as some of them may break Playwright functionality.
+Extensions only work in Chromium when launched with a persistent context. Use custom browser args at your own risk, as some of them may break Playwright functionality.
+
+Google Chrome and Microsoft Edge [removed the command-line flags needed to side-load extensions](https://groups.google.com/a/chromium.org/g/chromium-extensions/c/FxMU1TvxWWg/m/daZVTYNlBQAJ), so use Chromium that comes bundled with Playwright.
 :::
 
-The following is code for getting a handle to the [background page](https://developer.chrome.com/extensions/background_pages) of a [Manifest v2](https://developer.chrome.com/docs/extensions/mv2/) extension whose source is located in `./my-extension`:
+The snippet below retrieves the [service worker](https://developer.chrome.com/docs/extensions/develop/concepts/service-workers) of a [Manifest v3](https://developer.chrome.com/docs/extensions/develop/migrate) extension whose source is located in `./my-extension`.
+
+Note the use of the `chromium` channel that allows to run extensions in headless mode. Alternatively, you can launch the browser in headed mode.
 
 ```js
 const { chromium } = require('playwright');
@@ -18,17 +22,17 @@ const { chromium } = require('playwright');
   const pathToExtension = require('path').join(__dirname, 'my-extension');
   const userDataDir = '/tmp/test-user-data-dir';
   const browserContext = await chromium.launchPersistentContext(userDataDir, {
-    headless: false,
+    channel: 'chromium',
     args: [
       `--disable-extensions-except=${pathToExtension}`,
       `--load-extension=${pathToExtension}`
     ]
   });
-  let [backgroundPage] = browserContext.backgroundPages();
-  if (!backgroundPage)
-    backgroundPage = await browserContext.waitForEvent('backgroundpage');
+  let [serviceWorker] = browserContext.serviceWorkers();
+  if (!serviceWorker)
+    serviceWorker = await browserContext.waitForEvent('serviceworker');
 
-  // Test the background page as you would any other page.
+  // Test the service worker as you would any other worker.
   await browserContext.close();
 })();
 ```
@@ -44,19 +48,19 @@ user_data_dir = "/tmp/test-user-data-dir"
 async def run(playwright: Playwright):
     context = await playwright.chromium.launch_persistent_context(
         user_data_dir,
-        headless=False,
+        channel="chromium",
         args=[
             f"--disable-extensions-except={path_to_extension}",
             f"--load-extension={path_to_extension}",
         ],
     )
 
-    if len(context.background_pages) == 0:
-        background_page = await context.wait_for_event('backgroundpage')
+    if len(context.service_workers) == 0:
+        service_worker = await context.wait_for_event('serviceworker')
     else:
-        background_page = context.background_pages[0]
+        service_worker = context.service_workers[0]
 
-    # Test the background page as you would any other page.
+    # Test the service worker as you would any other worker.
     await context.close()
 
 
@@ -78,18 +82,18 @@ user_data_dir = "/tmp/test-user-data-dir"
 def run(playwright: Playwright):
     context = playwright.chromium.launch_persistent_context(
         user_data_dir,
-        headless=False,
+        channel="chromium",
         args=[
             f"--disable-extensions-except={path_to_extension}",
             f"--load-extension={path_to_extension}",
         ],
     )
-    if len(context.background_pages) == 0:
-        background_page = context.wait_for_event('backgroundpage')
+    if len(context.service_workers) == 0:
+        service_worker = context.wait_for_event('serviceworker')
     else:
-        background_page = context.background_pages[0]
+        service_worker = context.service_workers[0]
 
-    # Test the background page as you would any other page.
+    # Test the service worker as you would any other worker.
     context.close()
 
 
@@ -101,6 +105,8 @@ with sync_playwright() as playwright:
 
 To have the extension loaded when running tests you can use a test fixture to set the context. You can also dynamically retrieve the extension id and use it to load and test the popup page for example.
 
+Note the use of the `chromium` channel that allows to run extensions in headless mode. Alternatively, you can launch the browser in headed mode.
+
 First, add fixtures that will load the extension:
 
 ```js title="fixtures.ts"
@@ -114,7 +120,7 @@ export const test = base.extend<{
   context: async ({ }, use) => {
     const pathToExtension = path.join(__dirname, 'my-extension');
     const context = await chromium.launchPersistentContext('', {
-      headless: false,
+      channel: 'chromium',
       args: [
         `--disable-extensions-except=${pathToExtension}`,
         `--load-extension=${pathToExtension}`,
@@ -124,19 +130,12 @@ export const test = base.extend<{
     await context.close();
   },
   extensionId: async ({ context }, use) => {
-    /*
-    // for manifest v2:
-    let [background] = context.backgroundPages()
-    if (!background)
-      background = await context.waitForEvent('backgroundpage')
-    */
-
     // for manifest v3:
-    let [background] = context.serviceWorkers();
-    if (!background)
-      background = await context.waitForEvent('serviceworker');
+    let [serviceWorker] = context.serviceWorkers();
+    if (!serviceWorker)
+      serviceWorker = await context.waitForEvent('serviceworker');
 
-    const extensionId = background.url().split('/')[2];
+    const extensionId = serviceWorker.url().split('/')[2];
     await use(extensionId);
   },
 });
@@ -155,7 +154,7 @@ def context(playwright: Playwright) -> Generator[BrowserContext, None, None]:
     path_to_extension = Path(__file__).parent.joinpath("my-extension")
     context = playwright.chromium.launch_persistent_context(
         "",
-        headless=False,
+        channel="chromium",
         args=[
             f"--disable-extensions-except={path_to_extension}",
             f"--load-extension={path_to_extension}",
@@ -167,17 +166,12 @@ def context(playwright: Playwright) -> Generator[BrowserContext, None, None]:
 
 @pytest.fixture()
 def extension_id(context) -> Generator[str, None, None]:
-    # for manifest v2:
-    # background = context.background_pages[0]
-    # if not background:
-    #     background = context.wait_for_event("backgroundpage")
-
     # for manifest v3:
-    background = context.service_workers[0]
-    if not background:
-        background = context.wait_for_event("serviceworker")
+    service_worker = context.service_workers[0]
+    if not service_worker:
+        service_worker = context.wait_for_event("serviceworker")
 
-    extension_id = background.url.split("/")[2]
+    extension_id = service_worker.url.split("/")[2]
     yield extension_id
 
 ```
@@ -211,39 +205,3 @@ def test_popup_page(page: Page, extension_id: str) -> None:
     page.goto(f"chrome-extension://{extension_id}/popup.html")
     expect(page.locator("body")).to_have_text("my-extension popup")
 ```
-
-## Headless mode
-
-:::danger
-`headless=new` mode is not officially supported by Playwright and might result in unexpected behavior.
-:::
-
-By default, Chrome's headless mode in Playwright does not support Chrome extensions. To overcome this limitation, you can run Chrome's persistent context with a new headless mode by using the following code:
-
-```js title="fixtures.ts"
-// ...
-
-const pathToExtension = path.join(__dirname, 'my-extension');
-const context = await chromium.launchPersistentContext('', {
-  headless: false,
-  args: [
-    `--headless=new`,
-    `--disable-extensions-except=${pathToExtension}`,
-    `--load-extension=${pathToExtension}`,
-  ],
-});
-// ...
-```
-
-```python title="conftest.py"
-path_to_extension = Path(__file__).parent.joinpath("my-extension")
-context = playwright.chromium.launch_persistent_context(
-    "",
-    headless=False,
-    args=[
-        "--headless=new",
-        f"--disable-extensions-except={path_to_extension}",
-        f"--load-extension={path_to_extension}",
-    ],
-)
-```
diff --git a/docs/src/ci-intro.md b/docs/src/ci-intro.md
index bad1e358c2363..0ca8073923b00 100644
--- a/docs/src/ci-intro.md
+++ b/docs/src/ci-intro.md
@@ -1,19 +1,17 @@
 ---
 id: ci-intro
-title: "CI GitHub Actions"
+title: "Setting up CI"
 ---
 
 ## Introduction
 * langs: js
 
-Playwright tests can be run on any CI provider. In this section we will cover running tests on GitHub using GitHub actions. If you would like to see how to configure other CI providers check out our detailed [doc on Continuous Integration](./ci.md).
-
-When [installing Playwright](./intro.md) using the [VS Code extension](./getting-started-vscode.md) or with `npm init playwright@latest` you are given the option to add a [GitHub Actions](https://docs.github.com/en/actions) workflow. This creates a `playwright.yml` file inside a `.github/workflows` folder containing everything you need so that your tests run on each push and pull request into the main/master branch.
+Playwright tests can be run on any CI provider. This guide covers one way of running tests on GitHub using GitHub Actions. If you would like to learn more, or how to configure other CI providers, check out our detailed [doc on Continuous Integration](./ci.md).
 
 #### You will learn
 * langs: js
 
-- [How to run tests on push/pull_request](/ci-intro.md#on-pushpull_request)
+- [How to set up GitHub Actions](/ci-intro.md#setting-up-github-actions)
 - [How to view test logs](/ci-intro.md#viewing-test-logs)
 - [How to view the HTML report](/ci-intro.md#viewing-the-html-report)
 - [How to view the trace](/ci-intro.md#viewing-the-trace)
@@ -23,24 +21,20 @@ When [installing Playwright](./intro.md) using the [VS Code extension](./getting
 ## Introduction
 * langs: python, java, csharp
 
-Playwright tests can be ran on any CI provider. In this section we will cover running tests on GitHub using GitHub actions. If you would like to see how to configure other CI providers check out our detailed doc on Continuous Integration.
-
-To add a [GitHub Actions](https://docs.github.com/en/actions) file first create `.github/workflows` folder and inside it add a `playwright.yml` file containing the example code below so that your tests will run on each push and pull request for the main/master branch.
+Playwright tests can be run on any CI provider. In this section we cover running tests on GitHub using GitHub Actions. If you would like to see how to configure other CI providers, check out our detailed doc on Continuous Integration.
 
 #### You will learn
 * langs: python, java, csharp
-  
-- [How to run tests on push/pull_request](/ci-intro.md#on-pushpull_request)
+
+- [How to set up GitHub Actions](/ci-intro.md#setting-up-github-actions)
 - [How to view test logs](/ci-intro.md#viewing-test-logs)
 - [How to view the trace](/ci-intro.md#viewing-the-trace)
 
 
 ## Setting up GitHub Actions
-
-### On push/pull_request
 * langs: js
 
-Tests will run on push or pull request on branches main/master. The [workflow](https://docs.github.com/en/actions/using-workflows/about-workflows) will install all dependencies, install Playwright and then run the tests. It will also create the HTML report.
+When [installing Playwright](./intro.md) using the [VS Code extension](./getting-started-vscode.md) or with `npm init playwright@latest`, you are given the option to add a [GitHub Actions](https://docs.github.com/en/actions) workflow. This creates a `playwright.yml` file inside a `.github/workflows` folder containing everything you need so that your tests run on each push and pull request into the main/master branch. Here's how that file looks:
 
 ```yml js title=".github/workflows/playwright.yml"
 name: Playwright Tests
@@ -57,7 +51,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: lts/*
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright Browsers
@@ -72,10 +66,21 @@ jobs:
         retention-days: 30
 ```
 
-### On push/pull_request
+The workflow performs these steps:
+
+1. Clone your repository
+1. Install Node.js
+1. Install NPM Dependencies
+1. Install Playwright Browsers
+1. Run Playwright tests
+1. Upload HTML report to the GitHub UI
+
+To learn more about this, see ["Understanding GitHub Actions"](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions).
+
+## Setting up GitHub Actions
 * langs: python, java, csharp
 
-Tests will run on push or pull request on branches main/master. The [workflow](https://docs.github.com/en/actions/using-workflows/about-workflows) will install all dependencies, install Playwright and then run the tests.
+To add a [GitHub Actions](https://docs.github.com/en/actions) file, first create `.github/workflows` folder and inside it add a `playwright.yml` file containing the example code below so that your tests run on each push and pull request for the main/master branch.
 
 ```yml python title=".github/workflows/playwright.yml"
 name: Playwright Tests
@@ -128,7 +133,7 @@ jobs:
         java-version: '17'
     - name: Build & Install
       run: mvn -B install -D skipTests --no-transfer-progress
-    - name: Install Playwright
+    - name: Ensure browsers are installed
       run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps"
     - name: Run tests
       run: mvn test
@@ -151,279 +156,27 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
-    - run: dotnet build
-    - name: Ensure browsers are installed
-      run: pwsh bin/Debug/net8.0/playwright.ps1 install --with-deps
-    - name: Run your tests
-      run: dotnet test
-```
-
-### On push/pull_request (sharded)
-* langs: js
-
-GitHub Actions supports [sharding tests between multiple jobs](https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs). Check out our [sharding doc](./test-sharding) to learn more about sharding and to see a [GitHub actions example](./test-sharding.md#github-actions-example) of how to configure a job to run your tests on multiple machines as well as how to merge the HTML reports.
-
-### Via Containers
-
-GitHub Actions support [running jobs in a container](https://docs.github.com/en/actions/using-jobs/running-jobs-in-a-container) by using the [`jobs.<job_id>.container`](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idcontainer) option. This is useful to not pollute the host environment with dependencies and to have a consistent environment for e.g. screenshots/visual regression testing across different operating systems.
-
-```yml js title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  playwright:
-    name: 'Playwright Tests'
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-      - name: Install dependencies
-        run: npm ci
-      - name: Run your tests
-        run: npx playwright test
-        env:
-          HOME: /root
-```
-
-```yml python title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  playwright:
-    name: 'Playwright Tests'
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r local-requirements.txt
-          pip install -e .
-      - name: Run your tests
-        run: pytest
-        env:
-          HOME: /root
-```
-
-```yml java title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  playwright:
-    name: 'Playwright Tests'
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Build & Install
-        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Run tests
-        run: mvn test
-        env:
-          HOME: /root
-```
-
-```yml csharp title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  playwright:
-    name: 'Playwright Tests'
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.0.x
-      - run: dotnet build
-      - name: Run your tests
-        run: dotnet test
-        env:
-          HOME: /root
-```
-
-### On deployment
-
-This will start the tests after a [GitHub Deployment](https://developer.github.com/v3/repos/deployments/) went into the `success` state.
-Services like Vercel use this pattern so you can run your end-to-end tests on their deployed environment.
-
-```yml js title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  deployment_status:
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    if: github.event.deployment_status.state == 'success'
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-      env:
-        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
-```
-
-```yml python title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  deployment_status:
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    if: github.event.deployment_status.state == 'success'
-    steps:
-    - uses: actions/checkout@v4
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.11'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Ensure browsers are installed
-      run: python -m playwright install --with-deps
-    - name: Run tests
-      run: pytest
-      env:
-        # This might depend on your test-runner
-        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
-```
-
-```yml java title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  deployment_status:
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    if: github.event.deployment_status.state == 'success'
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
     - name: Build & Install
-      run: mvn -B install -D skipTests --no-transfer-progress
-    - name: Install Playwright
-      run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps"
-    - name: Run tests
-      run: mvn test
-      env:
-        # This might depend on your test-runner
-        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
-```
-
-```yml csharp title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  deployment_status:
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    if: github.event.deployment_status.state == 'success'
-    steps:
-    - uses: actions/checkout@v4
-    - name: Setup dotnet
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
-    - run: dotnet build
+      run: dotnet build
     - name: Ensure browsers are installed
       run: pwsh bin/Debug/net8.0/playwright.ps1 install --with-deps
-    - name: Run tests
+    - name: Run your tests
       run: dotnet test
-      env:
-        # This might depend on your test-runner
-        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
 ```
 
-### Fail-Fast
-* langs: js
+To learn more about this, see ["Understanding GitHub Actions"](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions).
 
-Even with sharding enabled, large test suites can take very long to execute. Running changed test files first on PRs will give you a faster feedback loop and use less CI resources.
+Looking at the list of steps in `jobs.test.steps`, you can see that the workflow performs these steps:
 
-```yml js title=".github/workflows/playwright.yml"
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run changed Playwright tests
-      run: npx playwright test --only-changed=$GITHUB_BASE_REF
-      if: github.event_name == 'pull_request'
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() }}
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
-```
+1. Clone your repository
+1. Install language dependencies
+1. Install project dependencies and build
+1. Install Playwright Browsers
+1. Run tests
 
 ## Create a Repo and Push to GitHub
 
-Once you have your [GitHub actions workflow](#setting-up-github-actions) setup then all you need to do is [Create a repo on GitHub](https://docs.github.com/en/get-started/quickstart/create-a-repo) or push your code to an existing repository. Follow the instructions on GitHub and don't forget to [initialize a git repository](https://github.com/git-guides/git-init) using the `git init` command so you can [add](https://github.com/git-guides/git-add), [commit](https://github.com/git-guides/git-commit) and [push](https://github.com/git-guides/git-push) your code.
+Once you have your [GitHub Actions workflow](#setting-up-github-actions) setup, then all you need to do is [Create a repo on GitHub](https://docs.github.com/en/get-started/quickstart/create-a-repo) or push your code to an existing repository. Follow the instructions on GitHub and don't forget to [initialize a git repository](https://github.com/git-guides/git-init) using the `git init` command so you can [add](https://github.com/git-guides/git-add), [commit](https://github.com/git-guides/git-commit), and [push](https://github.com/git-guides/git-push) your code.
 
 ######
 * langs: js, java, python
@@ -438,7 +191,7 @@ Once you have your [GitHub actions workflow](#setting-up-github-actions) setup t
 
 ## Opening the Workflows
 
-Click on the **Actions** tab to see the workflows. Here you will see if your tests have passed or failed.
+Click on the **Actions** tab to see the workflows. Here you see if your tests have passed or failed.
 
 ######
 * langs: js, python, java
@@ -457,7 +210,7 @@ On Pull Requests you can also click on the **Details** link in the [PR status ch
 
 ## Viewing Test Logs
 
-Clicking on the workflow run will show you the all the actions that GitHub performed and clicking on **Run Playwright tests** will show the error messages, what was expected and what was received as well as the call log.
+Clicking on the workflow run shows you all the actions that GitHub performed and clicking on **Run Playwright tests** shows the error messages, what was expected and what was received as well as the call log.
 
 ######
 * langs: js, python, java
@@ -473,19 +226,19 @@ Clicking on the workflow run will show you the all the actions that GitHub perfo
 ## HTML Report
 * langs: js
 
-The HTML Report shows you a full report of your tests. You can filter the report by browsers, passed tests, failed tests, skipped tests and flaky tests.
+The HTML Report shows you a full report of your tests. You can filter the report by browsers, passed tests, failed tests, skipped tests, and flaky tests.
 
 ### Downloading the HTML Report
 * langs: js
 
-In the Artifacts section click on the **playwright-report** to download your report in the format of a zip file.
+In the Artifacts section, click on the **playwright-report** to download your report in the format of a zip file.
 
 <img width="972" alt="Downloading the HTML Report" src="https://user-images.githubusercontent.com/13063165/183437023-524f1803-84e4-4862-9ce3-1d55af0e023e.png" />
 
 ### Viewing the HTML Report
 * langs: js
 
-Locally opening the report will not work as expected as you need a web server in order for everything to work correctly. First, extract the zip, preferably in a folder that already has Playwright installed. Using the command line change into the directory where the report is and use `npx playwright show-report` followed by the name of the extracted folder. This will serve up the report and enable you to view it in your browser.
+Locally opening the report does not work as expected as you need a web server for everything to work correctly. First, extract the zip, preferably in a folder that already has Playwright installed. Using the command line, change into the directory where the report is and use `npx playwright show-report` followed by the name of the extracted folder. This serves up the report and enables you to view it in your browser.
 
 
 ```bash
@@ -494,7 +247,7 @@ npx playwright show-report name-of-my-extracted-playwright-report
 
 ![viewing the HTML report](https://github.com/microsoft/playwright/assets/13063165/c5f60e56-fb75-4a2d-a4b6-054b8c5d69c1)
 
-To learn more about reports check out our detailed guide on [HTML Reporter](/test-reporters.md#html-reporter)
+To learn more about reports, check out our detailed guide on [HTML Reporter](/test-reporters.md#html-reporter)
 
 ## Viewing the Trace
 * langs: js
@@ -508,7 +261,7 @@ Once you have served the report using `npx playwright show-report`, click on the
 
 [trace.playwright.dev](https://trace.playwright.dev) is a statically hosted variant of the Trace Viewer. You can upload trace files using drag and drop.
 
-![playwright trace viewer](https://github.com/microsoft/playwright/assets/13063165/6d5885dc-d511-4c20-b728-040a7ef6cea4)
+![playwright trace viewer](./images/getting-started/trace-viewer-failed-test.png)
 
 ## Viewing the Trace
 * langs: csharp
@@ -518,7 +271,7 @@ You can upload Traces which get created on your CI like GitHub Actions as artifa
 ######
 * langs: csharp
 
-![playwright trace viewer](https://github.com/microsoft/playwright/assets/13063165/84150084-5019-470a-8449-b61d206bfbb0)
+![playwright trace viewer](./images/getting-started/trace-viewer-failed-test.png)
 
 ## Publishing report on the web
 * langs: js
@@ -538,7 +291,7 @@ Downloading the HTML report as a zip file is not very convenient. However, we ca
     - `AZCOPY_SPA_CLIENT_SECRET`
     - `AZCOPY_TENANT_ID`
 
-   For a detailed guide on how to authorize a service principal using a client secret, refer to [this Microsoft documentation](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-authorize-azure-active-directory#authorize-a-service-principal-by-using-a-client-secret-1).
+   For a detailed guide on how to authorize a service principal using a client secret, refer to [this Microsoft documentation](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-authorize-azure-active-directory#authorize-a-service-principal-by-using-a-client-secret).
 1. Add a step that uploads the HTML report to Azure Storage.
 
     ```yaml title=".github/workflows/playwright.yml"
@@ -559,9 +312,22 @@ Downloading the HTML report as a zip file is not very convenient. However, we ca
 The contents of the `$web` storage container can be accessed from a browser by using the [public URL](https://learn.microsoft.com/en-us/azure/storage/blobs/storage-blob-static-website-how-to?tabs=azure-portal#portal-find-url) of the website.
 
 :::note
-This step will not work for pull requests created from a forked repository because such workflow [doesn't have access to the secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow).
+This step will not work for pull requests created from a forked repository because such workflow [doesn't have access to the secrets](https://docs.github.com/en/actions/security-for-github-actions/security-guides/using-secrets-in-github-actions#using-secrets-in-a-workflow).
 :::
 
+## Properly handling Secrets
+* langs: js
+
+Artifacts like trace files, HTML reports or even the console logs contain information about your test execution.
+They can contain sensitive data like user credentials for a test user, access tokens to a staging backend, testing source code, or sometimes even your application source code. Treat these files just as carefully as you treat that sensitive data.
+If you upload reports and traces as part of your CI workflow, make sure that you only upload them to trusted artifact stores, or that you encrypt the files before upload. The same is true for sharing artifacts with team members: Use a trusted file share or encrypt the files before sharing.
+
+## Properly handling Secrets
+* langs: python, java, csharp
+
+Artifacts like trace files or console logs contain information about your test execution.
+They can contain sensitive data like user credentials for a test user, access tokens to a staging backend, testing source code, or sometimes even your application source code. Treat these files just as carefully as you treat that sensitive data.
+If you upload reports and traces as part of your CI workflow, make sure that you only upload them to trusted artifact stores, or that you encrypt the files before upload. The same is true for sharing artifacts with team members: Use a trusted file share or encrypt the files before sharing.
 
 ## What's Next
 
@@ -569,4 +335,5 @@ This step will not work for pull requests created from a forked repository becau
 - [Learn how to perform Actions](./input.md)
 - [Learn how to write Assertions](./test-assertions.md)
 - [Learn more about the Trace Viewer](/trace-viewer.md)
+- [Learn more ways of running tests on GitHub Actions](/ci.md#github-actions)
 - [Learn more about running tests on other CI providers](/ci.md)
diff --git a/docs/src/ci.md b/docs/src/ci.md
index 69a59a70dc3c4..a6fa5bc44dc04 100644
--- a/docs/src/ci.md
+++ b/docs/src/ci.md
@@ -59,30 +59,406 @@ export default defineConfig({
 });
 ```
 
-
 ## CI configurations
 
-The [Command line tools](./browsers#install-system-dependencies) can be used to install all operating system dependencies on GitHub Actions.
+The [Command line tools](./browsers#install-system-dependencies) can be used to install all operating system dependencies in CI.
 
 ### GitHub Actions
 
-Check out our [GitHub Actions](ci-intro.md) guide for more information on how to run your tests on GitHub.
+#### On push/pull_request
+* langs: js
 
-### Docker
+Tests will run on push or pull request on branches main/master. The [workflow](https://docs.github.com/en/actions/using-workflows/about-workflows) will install all dependencies, install Playwright and then run the tests. It will also create the HTML report.
+
+```yml js title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      run: npx playwright test
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30
+```
 
-We have a [pre-built Docker image](./docker.md) which can either be used directly, or as a reference to update your existing Docker definitions.
+#### On push/pull_request
+* langs: python, java, csharp
+
+Tests will run on push or pull request on branches main/master. The [workflow](https://docs.github.com/en/actions/using-workflows/about-workflows) will install all dependencies, install Playwright and then run the tests.
+
+```yml python title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Ensure browsers are installed
+      run: python -m playwright install --with-deps
+    - name: Run your tests
+      run: pytest --tracing=retain-on-failure
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-traces
+        path: test-results/
+```
+
+```yml java title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+    - name: Build & Install
+      run: mvn -B install -D skipTests --no-transfer-progress
+    - name: Ensure browsers are installed
+      run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps"
+    - name: Run tests
+      run: mvn test
+```
+
+```yml csharp title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Build & Install
+      run: dotnet build
+    - name: Ensure browsers are installed
+      run: pwsh bin/Debug/net8.0/playwright.ps1 install --with-deps
+    - name: Run your tests
+      run: dotnet test
+```
+
+#### On push/pull_request (sharded)
+* langs: js
+
+GitHub Actions supports [sharding tests between multiple jobs](https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs). Check out our [sharding doc](./test-sharding) to learn more about sharding and to see a [GitHub actions example](./test-sharding.md#github-actions-example) of how to configure a job to run your tests on multiple machines as well as how to merge the HTML reports.
+
+#### Via Containers
+
+GitHub Actions support [running jobs in a container](https://docs.github.com/en/actions/using-jobs/running-jobs-in-a-container) by using the [`jobs.<job_id>.container`](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idcontainer) option. This is useful to not pollute the host environment with dependencies and to have a consistent environment for e.g. screenshots/visual regression testing across different operating systems.
+
+```yml js title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  playwright:
+    name: 'Playwright Tests'
+    runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
+      options: --user 1001
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - name: Install dependencies
+        run: npm ci
+      - name: Run your tests
+        run: npx playwright test
+```
+
+```yml python title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  playwright:
+    name: 'Playwright Tests'
+    runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
+      options: --user 1001
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r local-requirements.txt
+          pip install -e .
+      - name: Run your tests
+        run: pytest
+```
+
+```yml java title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  playwright:
+    name: 'Playwright Tests'
+    runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
+      options: --user 1001
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Build & Install
+        run: mvn -B install -D skipTests --no-transfer-progress
+      - name: Run tests
+        run: mvn test
+```
+
+```yml csharp title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  playwright:
+    name: 'Playwright Tests'
+    runs-on: ubuntu-latest
+    container:
+      image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
+      options: --user 1001
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - run: dotnet build
+      - name: Run your tests
+        run: dotnet test
+```
+
+#### On deployment
+
+This will start the tests after a [GitHub Deployment](https://developer.github.com/v3/repos/deployments/) went into the `success` state.
+Services like Vercel use this pattern so you can run your end-to-end tests on their deployed environment.
+
+```yml js title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  deployment_status:
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    if: github.event.deployment_status.state == 'success'
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      run: npx playwright test
+      env:
+        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
+```
+
+```yml python title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  deployment_status:
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    if: github.event.deployment_status.state == 'success'
+    steps:
+    - uses: actions/checkout@v4
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Ensure browsers are installed
+      run: python -m playwright install --with-deps
+    - name: Run tests
+      run: pytest
+      env:
+        # This might depend on your test-runner
+        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
+```
+
+```yml java title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  deployment_status:
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    if: github.event.deployment_status.state == 'success'
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+    - name: Build & Install
+      run: mvn -B install -D skipTests --no-transfer-progress
+    - name: Install Playwright
+      run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps"
+    - name: Run tests
+      run: mvn test
+      env:
+        # This might depend on your test-runner
+        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
+```
+
+```yml csharp title=".github/workflows/playwright.yml"
+name: Playwright Tests
+on:
+  deployment_status:
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    if: github.event.deployment_status.state == 'success'
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - run: dotnet build
+    - name: Ensure browsers are installed
+      run: pwsh bin/Debug/net8.0/playwright.ps1 install --with-deps
+    - name: Run tests
+      run: dotnet test
+      env:
+        # This might depend on your test-runner
+        PLAYWRIGHT_TEST_BASE_URL: ${{ github.event.deployment_status.target_url }}
+```
+
+#### Fail-Fast
+* langs: js
+
+Large test suites can take very long to execute. By executing a preliminary test run with the `--only-changed` flag, you can run test files that are likely to fail first.
+This will give you a faster feedback loop and slightly lower CI consumption while working on Pull Requests.
+To detect test files affected by your changeset, `--only-changed` analyses your suites' dependency graph. This is a heuristic and might miss tests, so it's important that you always run the full test suite after the preliminary test run.
+
+```yml js title=".github/workflows/playwright.yml" {24-26}
+name: Playwright Tests
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        # Force a non-shallow checkout, so that we can reference $GITHUB_BASE_REF.
+        # See https://github.com/actions/checkout for more details.
+        fetch-depth: 0
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm ci
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run changed Playwright tests
+      run: npx playwright test --only-changed=$GITHUB_BASE_REF
+      if: github.event_name == 'pull_request'
+    - name: Run Playwright tests
+      run: npx playwright test
+    - uses: actions/upload-artifact@v4
+      if: ${{ !cancelled() }}
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30
+```
+
+### Docker
 
-Suggested configuration
-1. Using `--ipc=host` is also recommended when using Chromium. Without it Chromium can run out of memory
-   and crash. Learn more about this option in [Docker docs](https://docs.docker.com/engine/reference/run/#ipc-settings---ipc).
-1. Seeing other weird errors when launching Chromium? Try running your container
-   with `docker run --cap-add=SYS_ADMIN` when developing locally.
-1. Using `--init` Docker flag or [dumb-init](https://github.com/Yelp/dumb-init) is recommended to avoid special
-   treatment for processes with PID=1. This is a common reason for zombie processes.
+We have a [pre-built Docker image](./docker.md) which can either be used directly or as a reference to update your existing Docker definitions. Make sure to follow the [Recommended Docker Configuration](./docker.md#recommended-docker-configuration) to ensure the best performance.
 
 ### Azure Pipelines
 
-For Windows or macOS agents, no additional configuration required, just install Playwright and run your tests.
+For Windows or macOS agents, no additional configuration is required, just install Playwright and run your tests.
 
 For Linux agents, you can use [our Docker container](./docker.md) with Azure
 Pipelines support [running containerized
@@ -296,7 +672,7 @@ trigger:
 
 pool:
   vmImage: ubuntu-latest
-container: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+container: mcr.microsoft.com/playwright:v%%VERSION%%-noble
 
 steps:
 - task: NodeTool@0
@@ -318,7 +694,7 @@ trigger:
 
 pool:
   vmImage: ubuntu-latest
-container: mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy
+container: mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
 
 steps:
 - task: UsePythonVersion@0
@@ -340,7 +716,7 @@ trigger:
 
 pool:
   vmImage: ubuntu-latest
-container: mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy
+container: mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
 
 steps:
 - task: JavaToolInstaller@0
@@ -361,7 +737,7 @@ trigger:
 
 pool:
   vmImage: ubuntu-latest
-container: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy
+container: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
 
 steps:
 - task: UseDotNet@2
@@ -382,30 +758,30 @@ Running Playwright on CircleCI is very similar to running on GitHub Actions. In
 
 ```yml js
 executors:
-  pw-jammy-development:
+  pw-noble-development:
     docker:
-      - image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+      - image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
 ```
 
 ```yml python
 executors:
-  pw-jammy-development:
+  pw-noble-development:
     docker:
-      - image: mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy
+      - image: mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
 ```
 
 ```yml java
 executors:
-  pw-jammy-development:
+  pw-noble-development:
     docker:
-      - image: mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy
+      - image: mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
 ```
 
 ```yml csharp
 executors:
-  pw-jammy-development:
+  pw-noble-development:
     docker:
-      - image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy
+      - image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
 ```
 
 Note: When using the docker agent definition, you are specifying the resource class of where playwright runs to the 'medium' tier [here](https://circleci.com/docs/configuration-reference?#docker-execution-environment). The default behavior of Playwright is to set the number of workers to the detected core count (2 in the case of the medium tier). Overriding the number of workers to greater than this number will cause unnecessary timeouts and failures.
@@ -417,10 +793,10 @@ Sharding in CircleCI is indexed with 0 which means that you will need to overrid
 
   ```yml
     playwright-job-name:
-      executor: pw-jammy-development
+      executor: pw-noble-development
       parallelism: 4
       steps:
-        - run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; npx playwright test -- --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
+        - run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; npx playwright test --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
   ```
 
 ### Jenkins
@@ -430,7 +806,7 @@ to run tests on Jenkins.
 
 ```groovy js
 pipeline {
-   agent { docker { image 'mcr.microsoft.com/playwright:v%%VERSION%%-jammy' } }
+   agent { docker { image 'mcr.microsoft.com/playwright:v%%VERSION%%-noble' } }
    stages {
       stage('e2e-tests') {
          steps {
@@ -444,7 +820,7 @@ pipeline {
 
 ```groovy python
 pipeline {
-   agent { docker { image 'mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy' } }
+   agent { docker { image 'mcr.microsoft.com/playwright/python:v%%VERSION%%-noble' } }
    stages {
       stage('e2e-tests') {
          steps {
@@ -458,7 +834,7 @@ pipeline {
 
 ```groovy java
 pipeline {
-   agent { docker { image 'mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy' } }
+   agent { docker { image 'mcr.microsoft.com/playwright/java:v%%VERSION%%-noble' } }
    stages {
       stage('e2e-tests') {
          steps {
@@ -472,7 +848,7 @@ pipeline {
 
 ```groovy csharp
 pipeline {
-   agent { docker { image 'mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy' } }
+   agent { docker { image 'mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble' } }
    stages {
       stage('e2e-tests') {
          steps {
@@ -489,19 +865,19 @@ pipeline {
 Bitbucket Pipelines can use public [Docker images as build environments](https://confluence.atlassian.com/bitbucket/use-docker-images-as-build-environments-792298897.html). To run Playwright tests on Bitbucket, use our public Docker image ([see Dockerfile](./docker.md)).
 
 ```yml js
-image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
 ```
 
 ```yml python
-image: mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy
+image: mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
 ```
 
 ```yml java
-image: mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy
+image: mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
 ```
 
 ```yml csharp
-image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy
+image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
 ```
 
 ### GitLab CI
@@ -514,7 +890,7 @@ stages:
 
 tests:
   stage: test
-  image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+  image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
   script:
   ...
 ```
@@ -525,7 +901,7 @@ stages:
 
 tests:
   stage: test
-  image: mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy
+  image: mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
   script:
   ...
 ```
@@ -536,7 +912,7 @@ stages:
 
 tests:
   stage: test
-  image: mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy
+  image: mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
   script:
   ...
 ```
@@ -547,7 +923,7 @@ stages:
 
 tests:
   stage: test
-  image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy
+  image: mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
   script:
   ...
 ```
@@ -563,7 +939,7 @@ stages:
 
 tests:
   stage: test
-  image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+  image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
   parallel: 7
   script:
     - npm ci
@@ -578,7 +954,7 @@ stages:
 
 tests:
   stage: test
-  image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+  image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
   parallel:
     matrix:
       - PROJECT: ['chromium', 'webkit']
@@ -594,7 +970,7 @@ To run Playwright tests on Google Cloud Build, use our public Docker image ([see
 
 ```yml
 steps:
-- name: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+- name: mcr.microsoft.com/playwright:v%%VERSION%%-noble
   script: 
   ...
   env:
@@ -613,7 +989,7 @@ type: docker
 
 steps:
   - name: test
-    image: mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+    image: mcr.microsoft.com/playwright:v%%VERSION%%-noble
     commands:
       - npx playwright test
 ```
diff --git a/docs/src/clock.md b/docs/src/clock.md
index a515d46d5023e..e898899b18251 100644
--- a/docs/src/clock.md
+++ b/docs/src/clock.md
@@ -31,6 +31,11 @@ The recommended approach is to use `setFixedTime` to set the time to a specific
   - `requestIdleCallback`
   - `cancelIdleCallback`
   - `performance`
+  - `Event.timeStamp`
+:::
+
+:::warning
+If you call `install` at any point in your test, the call _MUST_ occur before any other clock related calls (see note above for list). Calling these methods out of order will result in undefined behavior. For example, you cannot call `setInterval`, followed by `install`, then `clearInterval`, as `install` overrides the native definition of the clock functions.
 :::
 
 ## Test with predefined time
@@ -59,6 +64,47 @@ await page.clock.setFixedTime(new Date('2024-02-02T10:30:00'));
 await expect(page.getByTestId('current-time')).toHaveText('2/2/2024, 10:30:00 AM');
 ```
 
+```python async
+await page.clock.set_fixed_time(datetime.datetime(2024, 2, 2, 10, 0, 0))
+await page.goto("http://localhost:3333")
+await expect(page.get_by_test_id("current-time")).to_have_text("2/2/2024, 10:00:00 AM")
+
+await page.clock.set_fixed_time(datetime.datetime(2024, 2, 2, 10, 30, 0))
+# We know that the page has a timer that updates the time every second.
+await expect(page.get_by_test_id("current-time")).to_have_text("2/2/2024, 10:30:00 AM")
+```
+
+```python sync
+page.clock.set_fixed_time(datetime.datetime(2024, 2, 2, 10, 0, 0))
+page.goto("http://localhost:3333")
+expect(page.get_by_test_id("current-time")).to_have_text("2/2/2024, 10:00:00 AM")
+page.clock.set_fixed_time(datetime.datetime(2024, 2, 2, 10, 30, 0))
+# We know that the page has a timer that updates the time every second.
+expect(page.get_by_test_id("current-time")).to_have_text("2/2/2024, 10:30:00 AM")
+```
+
+```java
+SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
+page.clock().setFixedTime(format.parse("2024-02-02T10:00:00"));
+page.navigate("http://localhost:3333");
+Locator locator = page.getByTestId("current-time");
+assertThat(locator).hasText("2/2/2024, 10:00:00 AM");
+page.clock().setFixedTime(format.parse("2024-02-02T10:30:00"));
+// We know that the page has a timer that updates the time every second.
+assertThat(locator).hasText("2/2/2024, 10:30:00 AM");
+```
+
+```csharp
+// Set the fixed time for the clock.
+await Page.Clock.SetFixedTimeAsync(new DateTime(2024, 2, 2, 10, 0, 0));
+await Page.GotoAsync("http://localhost:3333");
+await Expect(Page.GetByTestId("current-time")).ToHaveTextAsync("2/2/2024, 10:00:00 AM");
+// Set the fixed time for the clock.
+await Page.Clock.SetFixedTimeAsync(new DateTime(2024, 2, 2, 10, 30, 0));
+// We know that the page has a timer that updates the time every second.
+await Expect(Page.GetByTestId("current-time")).ToHaveTextAsync("2/2/2024, 10:30:00 AM");
+```
+
 ## Consistent time and timers
 
 Sometimes your timers depend on `Date.now` and are confused when the `Date.now` value does not change over time.
@@ -163,11 +209,11 @@ await Page.GotoAsync("http://localhost:3333");
 await Page.Clock.PauseAtAsync(new DateTime(2024, 2, 2, 10, 0, 0));
 
 // Assert the page state.
-await Expect(Page.GetByTestId("current-time")).ToHaveText("2/2/2024, 10:00:00 AM");
+await Expect(Page.GetByTestId("current-time")).ToHaveTextAsync("2/2/2024, 10:00:00 AM");
 
 // Close the laptop lid again and open it at 10:30am.
 await Page.Clock.FastForwardAsync("30:00");
-await Expect(Page.GetByTestId("current-time")).ToHaveText("2/2/2024, 10:30:00 AM");
+await Expect(Page.GetByTestId("current-time")).ToHaveTextAsync("2/2/2024, 10:30:00 AM");
 ```
 
 ## Test inactivity monitoring
diff --git a/docs/src/codegen-intro.md b/docs/src/codegen-intro.md
index fe5457c212b00..e3f53e1eadaf9 100644
--- a/docs/src/codegen-intro.md
+++ b/docs/src/codegen-intro.md
@@ -5,7 +5,7 @@ title: "Generating tests"
 
 ## Introduction
 
-Playwright comes with the ability to generate tests out of the box and is a great way to quickly get started with testing. It will open two windows, a browser window where you interact with the website you wish to test and the Playwright Inspector window where you can record your tests, copy the tests, clear your tests as well as change the language of your tests.
+Playwright can generate tests automatically, providing a quick way to get started with testing. Codegen opens a browser window for interaction and the Playwright Inspector for recording, copying, and managing your generated tests.
 
 **You will learn**
 
@@ -14,7 +14,7 @@ Playwright comes with the ability to generate tests out of the box and is a grea
 
 ## Running Codegen
 
-Use the `codegen` command to run the test generator followed by the URL of the website you want to generate tests for. The URL is optional and you can always run the command without it and then add the URL directly into the browser window instead.
+Use the `codegen` command to run the test generator followed by the URL of the website you want to generate tests for. The URL is optional and can be added directly in the browser window if omitted.
 
 ```bash js
 npx playwright codegen demo.playwright.dev/todomvc
@@ -34,11 +34,11 @@ pwsh bin/Debug/net8.0/playwright.ps1 codegen demo.playwright.dev/todomvc
 
 ### Recording a test
 
-Run `codegen` and perform actions in the browser. Playwright will generate the code for the user interactions. `Codegen` will look at the rendered page and figure out the recommended locator, prioritizing role, text and test id locators. If the generator identifies multiple elements matching the locator, it will improve the locator to make it resilient and uniquely identify the target element, therefore eliminating and reducing test(s) failing and flaking due to locators.
+Run `codegen` and perform actions in the browser. Playwright generates code for your interactions automatically. Codegen analyzes the rendered page and recommends the best locator, prioritizing role, text, and test id locators. When multiple elements match a locator, the generator improves it to uniquely identify the target element, reducing test failures and flakiness.
 
 With the test generator you can record:
-* Actions like click or fill by simply interacting with the page
-* Assertions by clicking on one of the icons in the toolbar and then clicking on an element on the page to assert against. You can choose:
+* Actions like click or fill by interacting with the page
+* Assertions by clicking a toolbar icon, then clicking a page element to assert against. You can choose:
   * `'assert visibility'` to assert that an element is visible
   * `'assert text'` to assert that an element contains specific text
   * `'assert value'` to assert that an element has a specific value
@@ -46,65 +46,65 @@ With the test generator you can record:
 ######
 * langs: js
 
-![Recording a test](https://github.com/microsoft/playwright/assets/13063165/34a79ea1-639e-4cb3-8115-bfdc78e3d34d)
+![Recording a test](./images/getting-started/record-test-js.png)
 
 ######
 * langs: java
 
-![recording a test](https://github.com/microsoft/playwright/assets/13063165/ec9c4071-4af8-4ae7-8b36-aebcc29bdbbb)
+![recording a test](./images/getting-started/record-test-java.png)
 
 ######
 * langs: python
 
-![recording a test](https://github.com/microsoft/playwright/assets/13063165/9751b609-6e4c-486b-a961-f86f177b1d58)
+![recording a test](./images/getting-started/record-test-python.png)
 
 ######
 * langs: csharp
 
-![recording a test](https://github.com/microsoft/playwright/assets/13063165/53bdfb6f-d462-4ce0-ab95-0619faaebf1e)
+![recording a test](./images/getting-started/record-test-csharp.png)
 
 ######
 * langs: js, java, python, csharp
 
-When you have finished interacting with the page, press the `'record'` button to stop the recording and use the `'copy'` button to copy the generated code to your editor.
+When you finish interacting with the page, press the `'record'` button to stop recording and use the `'copy'` button to copy the generated code to your editor.
 
-Use the `'clear'` button to clear the code to start recording again. Once finished close the Playwright inspector window or stop the terminal command.
+Use the `'clear'` button to clear the code and start recording again. Once finished, close the Playwright Inspector window or stop the terminal command.
 
-To learn more about generating tests check out or detailed guide on [Codegen](./codegen.md).
+To learn more about generating tests, check out our detailed guide on [Codegen](./codegen.md).
 
 ### Generating locators
 
 You can generate [locators](/locators.md) with the test generator.
 
-* Press the `'Record'` button to stop the recording and the `'Pick Locator'` button will appear.
-* Click on the `'Pick Locator'` button and then hover over elements in the browser window to see the locator highlighted underneath each element.
-* To choose a locator click on the element you would like to locate and the code for that locator will appear in the locator playground next to the Pick Locator button.
-* You can then edit the locator in the locator playground to fine tune it and see the matching element highlighted in the browser window. 
-* Use the copy button to copy the locator and paste it into your code.
+* Press the `'Record'` button to stop recording and the `'Pick Locator'` button will appear
+* Click the `'Pick Locator'` button and hover over elements in the browser window to see the locator highlighted underneath each element
+* Click the element you want to locate and the code for that locator will appear in the locator playground next to the Pick Locator button
+* Edit the locator in the locator playground to fine-tune it and see the matching element highlighted in the browser window
+* Use the copy button to copy the locator and paste it into your code
 
 ######
 * langs: js
 
-![picking a locator](https://github.com/microsoft/playwright/assets/13063165/2c8a12e2-4e98-4fdd-af92-1d73ae696d86)
+![picking a locator](./images/getting-started/pick-locator-js.png)
 
 ######
 * langs: java
 
-![picking a locator](https://github.com/microsoft/playwright/assets/13063165/733b48fd-5edf-4150-93f0-018adc52b6ff)
+![picking a locator](./images/getting-started/pick-locator-java.png)
 
 ######
 * langs: python
 
-![picking a locator](https://github.com/microsoft/playwright/assets/13063165/95d11f48-96a4-46b9-9c2a-63c3aa4fdce7)
+![picking a locator](./images/getting-started/pick-locator-python.png)
 
 ######
 * langs: csharp
 
-![picking a locator](https://github.com/microsoft/playwright/assets/13063165/1478f56f-422f-4276-9696-0674041f11dc)
+![picking a locator](./images/getting-started/pick-locator-csharp.png)
 
 ### Emulation
 
-You can also generate tests using emulation so as to generate a test for a specific viewport, device, color scheme, as well as emulate the geolocation, language or timezone. The test generator can also generate a test while preserving authenticated state. Check out the [Test Generator](./codegen.md#emulation) guide to learn more.
+You can generate tests using emulation for specific viewports, devices, color schemes, geolocation, language, or timezone. The test generator can also preserve authenticated state. Check out the [Test Generator](./codegen.md#emulation) guide to learn more.
 
 ## What's Next
 
diff --git a/docs/src/codegen.md b/docs/src/codegen.md
index 4b45f12d01887..7f2358bdaaafd 100644
--- a/docs/src/codegen.md
+++ b/docs/src/codegen.md
@@ -21,7 +21,7 @@ Install the VS Code extension and generate tests directly from VS Code. The exte
 
 ### Record a New Test
 
-To record a test click on the **Record new** button from the Testing sidebar. This will create a `test-1.spec.ts` file as well as open up a browser window. 
+To record a test click on the **Record new** button from the Testing sidebar. This will create a `test-1.spec.ts` file as well as open up a browser window.
 
 <img width="1385" alt="record new in vs code" src="https://user-images.githubusercontent.com/13063165/220961665-615d0ab8-3f0b-439c-ad0b-0424d9aa154b.png" />
 
@@ -58,16 +58,16 @@ In the test file in VS Code you will see your new generated actions added to you
 
 ### Generating locators
 
-You can generate locators with the test generator. 
-- Click on the **Pick locator** button form the testing sidebar and then hover over elements in the browser window to see the [locator](./locators.md) highlighted underneath each element. 
-- Click the element you require and it will now show up in the **Pick locator** box in VS Code. 
+You can generate locators with the test generator.
+- Click on the **Pick locator** button form the testing sidebar and then hover over elements in the browser window to see the [locator](./locators.md) highlighted underneath each element.
+- Click the element you require and it will now show up in the **Pick locator** box in VS Code.
 - Press <kbd>Enter</kbd> on your keyboard to copy the locator into the clipboard and then paste anywhere in your code. Or press 'escape' if you want to cancel.
 
 <img width="1641" alt="Pick locators in VS code" src="https://user-images.githubusercontent.com/13063165/220958368-95b03620-3c9b-40a8-be74-01c96ba03cad.png" />
 
 ## Generate tests with the Playwright Inspector
 
-When running the `codegen` command two windows will be opened, a browser window where you interact with the website you wish to test and the Playwright Inspector window where you can record your tests and then copy them into your editor. 
+When running the `codegen` command two windows will be opened, a browser window where you interact with the website you wish to test and the Playwright Inspector window where you can record your tests and then copy them into your editor.
 
 ### Running Codegen
 
@@ -128,10 +128,10 @@ When you have finished interacting with the page, press the **record** button to
 Use the **clear** button to clear the code to start recording again. Once finished, close the Playwright inspector window or stop the terminal command.
 
 ### Generating locators
-You can generate [locators](/locators.md) with the test generator. 
+You can generate [locators](/locators.md) with the test generator.
 
 * Press the `'Record'` button to stop the recording and the `'Pick Locator'` button will appear.
-* Click on the `'Pick Locator'` button and then hover over elements in the browser window to see the locator highlighted underneath each element. 
+* Click on the `'Pick Locator'` button and then hover over elements in the browser window to see the locator highlighted underneath each element.
 * To choose a locator, click on the element you would like to locate and the code for that locator will appear in the field next to the Pick Locator button.
 * You can then edit the locator in this field to fine tune it or use the copy button to copy it and paste it into your code.
 
@@ -164,19 +164,19 @@ You can use the test generator to generate tests using emulation so as to genera
 Playwright opens a browser window with its viewport set to a specific width and height and is not responsive as tests need to be run under the same conditions. Use the `--viewport` option to generate tests with a different viewport size.
 
 ```bash js
-npx playwright codegen --viewport-size=800,600 playwright.dev
+npx playwright codegen --viewport-size="800,600" playwright.dev
 ```
 
 ```bash java
-mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="codegen --viewport-size=800,600 playwright.dev"
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="codegen --viewport-size='800,600' playwright.dev"
 ```
 
 ```bash python
-playwright codegen --viewport-size=800,600 playwright.dev
+playwright codegen --viewport-size="800,600" playwright.dev
 ```
 
 ```bash csharp
-pwsh bin/Debug/netX/playwright.ps1 codegen --viewport-size=800,600 playwright.dev
+pwsh bin/Debug/netX/playwright.ps1 codegen --viewport-size="800,600" playwright.dev
 ```
 ######
 * langs: js
@@ -325,7 +325,7 @@ pwsh bin/Debug/netX/playwright.ps1 codegen --timezone="Europe/Rome" --geolocatio
 
 ### Preserve authenticated state
 
-Run `codegen` with `--save-storage` to save [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies) and [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) at the end of the session. This is useful to separately record an authentication step and reuse it later when recording more tests. 
+Run `codegen` with `--save-storage` to save [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies), [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) and [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) data at the end of the session. This is useful to separately record an authentication step and reuse it later when recording more tests.
 
 ```bash js
 npx playwright codegen github.com/microsoft/playwright --save-storage=auth.json
@@ -367,7 +367,7 @@ pwsh bin/Debug/netX/playwright.ps1 codegen github.com/microsoft/playwright --sav
 
 #### Login
 
-After performing authentication and closing the browser, `auth.json` will contain the storage state which you can then reuse in your tests. 
+After performing authentication and closing the browser, `auth.json` will contain the storage state which you can then reuse in your tests.
 
 <img width="1394" alt="login to GitHub screen" src="https://user-images.githubusercontent.com/13063165/220561688-04b2b984-4ba6-4446-8b0a-8058876e2a02.png" />
 
@@ -375,7 +375,7 @@ Make sure you only use the `auth.json` locally as it contains sensitive informat
 
 #### Load authenticated state
 
-Run with `--load-storage` to consume the previously loaded storage from the `auth.json`. This way, all [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies) and [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) will be restored, bringing most web apps to the authenticated state without the need to login again. This means you can continue generating tests from the logged in state.
+Run with `--load-storage` to consume the previously loaded storage from the `auth.json`. This way, all [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies), [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) and [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) data will be restored, bringing most web apps to the authenticated state without the need to login again. This means you can continue generating tests from the logged in state.
 
 ```bash js
 npx playwright codegen --load-storage=auth.json github.com/microsoft/playwright
@@ -414,6 +414,30 @@ pwsh bin/Debug/netX/playwright.ps1 codegen --load-storage=auth.json github.com/m
 
 <img width="1394" alt="github signed in showing use of load storage scharp" src="https://user-images.githubusercontent.com/13063165/220928354-caa0e958-fe09-4125-9b54-67483064da51.png" />
 
+#### Use existing userDataDir
+
+Run `codegen` with `--user-data-dir` to set a fixed [user data directory](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-user-data-dir) for the browser session. If you create a custom browser user data directory, codegen will use this existing browser profile and have access to any authentication state present in that profile.
+
+:::warning
+[As of Chrome 136, the default user data directory cannot be accessed via automated tooling](https://developer.chrome.com/blog/remote-debugging-port), such as Playwright. You must create a separate user data directory for use in testing.
+:::
+
+```bash js
+npx playwright codegen --user-data-dir=/path/to/your/browser/data/ github.com/microsoft/playwright
+```
+
+```bash java
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="codegen --user-data-dir=/path/to/your/browser/data/ github.com/microsoft/playwright"
+```
+
+```bash python
+playwright codegen --user-data-dir=/path/to/your/browser/data/ github.com/microsoft/playwright
+```
+
+```bash csharp
+pwsh bin/Debug/netX/playwright.ps1 codegen --user-data-dir=/path/to/your/browser/data/ github.com/microsoft/playwright
+```
+
 ## Record using custom setup
 
 If you would like to use codegen in some non-standard setup (for example, use [`method: BrowserContext.route`]), it is possible to call [`method: Page.pause`] that will open a separate window with codegen controls.
diff --git a/docs/src/debug.md b/docs/src/debug.md
index aff5077d3c496..659b0a87b7c9c 100644
--- a/docs/src/debug.md
+++ b/docs/src/debug.md
@@ -44,6 +44,10 @@ A browser window will open and the test will run and pause at where the breakpoi
 
 <img width="1269" alt="running test in debug mode" src="https://user-images.githubusercontent.com/13063165/212740233-3f278825-13e7-4a88-a118-dd4478d43a16.png" />
 
+### Debug Tests Using Chrome DevTools
+
+Instead of using `Debug Test`, choose `Run Test` in VS Code. With `Show Browser` enabled, the browser session is reused, letting you open Chrome DevTools for continuous debugging of your tests and the web application.
+
 ### Debug in different Browsers
 
 By default, debugging is done using the Chromium profile. You can debug your tests on different browsers by right clicking on the debug icon in the testing sidebar and clicking on the 'Select Default Profile' option from the dropdown.
@@ -225,7 +229,6 @@ Playwright [Trace Viewer](/trace-viewer.md) is a GUI tool that lets you explore
 
 <video width="100%" height="100%" controls muted>
   <source src="https://user-images.githubusercontent.com/13063165/219132713-17b9d75b-71e3-42c4-a43f-3f9e2e15f834.mp4" type="video/mp4" />
-  Your browser does not support the video tag.
 </video>
 
 To learn more about how to record traces and use the Trace Viewer, check out the [Trace Viewer](/trace-viewer.md) guide.
@@ -451,7 +454,7 @@ will reset pre-configured user agent and device emulation.
 Playwright runs browsers in headless mode by default. To change this behavior,
 use `headless: false` as a launch option.
 
-You can also use the [`option: slowMo`] option
+You can also use the [`option: BrowserType.launch.slowMo`] option
 to slow down execution (by N milliseconds per operation) and follow along while debugging.
 
 ```js
diff --git a/docs/src/dialogs.md b/docs/src/dialogs.md
index 20037245ee3b6..0aaa69aade6fc 100644
--- a/docs/src/dialogs.md
+++ b/docs/src/dialogs.md
@@ -80,7 +80,7 @@ If there is no listener for [`event: Page.dialog`], all dialogs are automaticall
 
 ## beforeunload dialog
 
-When [`method: Page.close`] is invoked with the truthy [`option: runBeforeUnload`] value, the page runs its unload handlers. This is the only case when [`method: Page.close`] does not wait for the page to actually close, because it might be that the page stays open in the end of the operation.
+When [`method: Page.close`] is invoked with the truthy [`option: Page.close.runBeforeUnload`] value, the page runs its unload handlers. This is the only case when [`method: Page.close`] does not wait for the page to actually close, because it might be that the page stays open in the end of the operation.
 
 You can register a dialog handler to handle the `beforeunload` dialog yourself:
 
diff --git a/docs/src/docker.md b/docs/src/docker.md
index 0946c2f68b980..a50850dc7d23d 100644
--- a/docs/src/docker.md
+++ b/docs/src/docker.md
@@ -5,7 +5,7 @@ title: "Docker"
 
 ## Introduction
 
-[Dockerfile.jammy] can be used to run Playwright scripts in Docker environment. This image includes the [Playwright browsers](./browsers.md#install-browsers) and [browser system dependencies](./browsers.md#install-system-dependencies). The Playwright package/dependency is not included in the image and should be installed separately.
+[Dockerfile.noble] can be used to run Playwright scripts in Docker environment. This image includes the [Playwright browsers](./browsers.md#install-browsers) and [browser system dependencies](./browsers.md#install-system-dependencies). The Playwright package/dependency is not included in the image and should be installed separately.
 
 ## Usage
 
@@ -18,19 +18,19 @@ This Docker image is intended to be used for testing and development purposes on
 ### Pull the image
 
 ```bash js
-docker pull mcr.microsoft.com/playwright:v%%VERSION%%-jammy
+docker pull mcr.microsoft.com/playwright:v%%VERSION%%-noble
 ```
 
 ```bash python
-docker pull mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy
+docker pull mcr.microsoft.com/playwright/python:v%%VERSION%%-noble
 ```
 
 ```bash csharp
-docker pull mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy
+docker pull mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble
 ```
 
 ```bash java
-docker pull mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy
+docker pull mcr.microsoft.com/playwright/java:v%%VERSION%%-noble
 ```
 
 ### Run the image
@@ -42,19 +42,19 @@ By default, the Docker image will use the `root` user to run the browsers. This
 On trusted websites, you can avoid creating a separate user and use root for it since you trust the code which will run on the browsers.
 
 ```bash js
-docker run -it --rm --ipc=host mcr.microsoft.com/playwright:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host mcr.microsoft.com/playwright:v%%VERSION%%-noble /bin/bash
 ```
 
 ```bash python
-docker run -it --rm --ipc=host mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host mcr.microsoft.com/playwright/python:v%%VERSION%%-noble /bin/bash
 ```
 
 ```bash csharp
-docker run -it --rm --ipc=host mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble /bin/bash
 ```
 
 ```bash java
-docker run -it --rm --ipc=host mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host mcr.microsoft.com/playwright/java:v%%VERSION%%-noble /bin/bash
 ```
 
 #### Crawling and scraping
@@ -62,19 +62,19 @@ docker run -it --rm --ipc=host mcr.microsoft.com/playwright/java:v%%VERSION%%-ja
 On untrusted websites, it's recommended to use a separate user for launching the browsers in combination with the seccomp profile. Inside the container or if you are using the Docker image as a base image you have to use `adduser` for it.
 
 ```bash js
-docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright:v%%VERSION%%-noble /bin/bash
 ```
 
 ```bash python
-docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/python:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/python:v%%VERSION%%-noble /bin/bash
 ```
 
 ```bash csharp
-docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/dotnet:v%%VERSION%%-noble /bin/bash
 ```
 
 ```bash java
-docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/java:v%%VERSION%%-jammy /bin/bash
+docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_profile.json mcr.microsoft.com/playwright/java:v%%VERSION%%-noble /bin/bash
 ```
 
 [`seccomp_profile.json`](https://github.com/microsoft/playwright/blob/main/utils/docker/seccomp_profile.json) is needed to run Chromium with sandbox. This is a [default Docker seccomp profile](https://github.com/docker/engine/blob/d0d99b04cf6e00ed3fc27e81fc3d94e7eda70af3/profiles/seccomp/default.json) with extra user namespace cloning permissions:
@@ -94,26 +94,110 @@ docker run -it --rm --ipc=host --user pwuser --security-opt seccomp=seccomp_prof
 }
 ```
 
-:::note
-Using `--ipc=host` is recommended when using Chrome ([Docker docs](https://docs.docker.com/engine/reference/run/#ipc-settings---ipc)). Chrome can run out of memory without this flag.
-:::
+### Recommended Docker Configuration
+
+When running Playwright in Docker, the following configuration is recommended:
 
+1. **Using [`--init`](https://docs.docker.com/reference/cli/docker/container/run/#init)** Docker flag is recommended to avoid special treatment for processes with PID=1. This is a common reason for zombie processes.
+
+1. **Using `--ipc=host`** is recommended when using Chromium. Without it, Chromium can run out of memory and crash. Learn more about this option in [Docker docs](https://docs.docker.com/reference/cli/docker/container/run/#ipc).
+
+1. **If seeing weird errors when launching Chromium**, try running your container with `docker run --cap-add=SYS_ADMIN` when developing locally.
 
 ### Using on CI
 
 See our [Continuous Integration guides](./ci.md) for sample configs.
 
+### Remote Connection
+
+You can run Playwright Server in Docker while keeping your tests running on the host system or another machine. This is useful for running tests on unsupported Linux distributions or remote execution scenarios.
+
+#### Running the Playwright Server
+
+Start the Playwright Server in Docker:
+
+```bash
+docker run -p 3000:3000 --rm --init -it --workdir /home/pwuser --user pwuser mcr.microsoft.com/playwright:v%%VERSION%%-noble /bin/sh -c "npx -y playwright@%%VERSION%% run-server --port 3000 --host 0.0.0.0"
+```
+
+#### Connecting to the Server
+* langs: js
+
+There are two ways to connect to the remote Playwright server:
+
+1. Using environment variable with `@playwright/test`:
+
+```bash
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:3000/ npx playwright test
+```
+
+2. Using the [`method: BrowserType.connect`] API for other applications:
+
+```js
+const browser = await playwright['chromium'].connect('ws://127.0.0.1:3000/');
+```
+
+#### Connecting to the Server
+* langs: python, csharp, java
+
+```python sync
+from playwright.sync_api import sync_playwright
+
+with sync_playwright() as p:
+    browser = p.chromium.connect("ws://127.0.0.1:3000/")
+```
+
+```python async
+from playwright.async_api import async_playwright
+
+async with async_playwright() as p:
+    browser = await p.chromium.connect("ws://127.0.0.1:3000/")
+```
+
+```csharp
+using Microsoft.Playwright;
+
+using var playwright = await Playwright.CreateAsync();
+await using var browser = await playwright.Chromium.ConnectAsync("ws://127.0.0.1:3000/");
+```
+
+```java
+package org.example;
+
+import com.microsoft.playwright.*;
+import java.nio.file.Paths;
+
+public class App {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().connect("ws://127.0.0.1:3000/");
+    }
+  }
+}
+```
+
+#### Network Configuration
+
+If you need to access local servers from within the Docker container:
+
+```bash
+docker run --add-host=hostmachine:host-gateway -p 3000:3000 --rm --init -it --workdir /home/pwuser --user pwuser mcr.microsoft.com/playwright:v%%VERSION%%-noble /bin/sh -c "npx -y playwright@%%VERSION%% run-server --port 3000 --host 0.0.0.0"
+```
+
+This makes `hostmachine` point to the host's localhost. Your tests should use `hostmachine` instead of `localhost` when accessing local servers.
+
+:::note
+When running tests remotely, ensure the Playwright version in your tests matches the version running in the Docker container.
+:::
+
 ## Image tags
 
 See [all available image tags].
 
 We currently publish images with the following tags:
-- `:next` - tip-of-tree image version based on Ubuntu 22.04 LTS (Jammy Jellyfish).
-- `:next-jammy` - tip-of-tree image version based on Ubuntu 22.04 LTS (Jammy Jellyfish).
-- `:v%%VERSION%%` - Playwright v%%VERSION%% release docker image based on Ubuntu 22.04 LTS (Jammy Jellyfish).
+- `:v%%VERSION%%` - Playwright v%%VERSION%% release docker image based on Ubuntu 24.04 LTS (Noble Numbat).
 - `:v%%VERSION%%-noble` - Playwright v%%VERSION%% release docker image based on Ubuntu 24.04 LTS (Noble Numbat).
 - `:v%%VERSION%%-jammy` - Playwright v%%VERSION%% release docker image based on Ubuntu 22.04 LTS (Jammy Jellyfish).
-- `:v%%VERSION%%-focal` - Playwright v%%VERSION%% release docker image based on Ubuntu 20.04 LTS (Focal Fossa).
 
 :::note
 It is recommended to always pin your Docker image to a specific version if possible. If the Playwright version in your Docker image does not match the version in your project/tests, Playwright will be unable to locate browser executables.
@@ -124,7 +208,6 @@ It is recommended to always pin your Docker image to a specific version if possi
 We currently publish images based on the following [Ubuntu](https://hub.docker.com/_/ubuntu) versions:
 - **Ubuntu 24.04 LTS** (Noble Numbat), image tags include `noble`
 - **Ubuntu 22.04 LTS** (Jammy Jellyfish), image tags include `jammy`
-- **Ubuntu 20.04 LTS** (Focal Fossa), image tags include `focal`
 
 #### Alpine
 
@@ -136,7 +219,7 @@ Browser builds for Firefox and WebKit are built for the [glibc](https://en.wikip
 You can use the [.NET install script](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script) in order to install different SDK versions:
 
 ```bash
-curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --install-dir /usr/share/dotnet --channel 6.0
+curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --install-dir /usr/share/dotnet --channel 9.0
 ```
 
 ## Build your own image
diff --git a/docs/src/downloads.md b/docs/src/downloads.md
index 9bce4f9d98cc9..824b714d1154a 100644
--- a/docs/src/downloads.md
+++ b/docs/src/downloads.md
@@ -7,7 +7,7 @@ title: "Downloads"
 
 For every attachment downloaded by the page, [`event: Page.download`] event is emitted. All these attachments are downloaded into a temporary folder. You can obtain the download url, file name and payload stream using the [Download] object from the event.
 
-You can specify where to persist downloaded files using the [`option: downloadsPath`] option in [`method: BrowserType.launch`].
+You can specify where to persist downloaded files using the [`option: BrowserType.launch.downloadsPath`] option in [`method: BrowserType.launch`].
 
 :::note
 Downloaded files are deleted when the browser context that produced them is closed.
diff --git a/docs/src/emulation.md b/docs/src/emulation.md
index d1f7bc3400186..df7e4e55adac4 100644
--- a/docs/src/emulation.md
+++ b/docs/src/emulation.md
@@ -188,7 +188,7 @@ page.setViewportSize(1600, 1200);
 // Emulate high-DPI
 BrowserContext context = browser.newContext(new Browser.NewContextOptions()
   .setViewportSize(2560, 1440)
-  .setDeviceScaleFactor(2);
+  .setDeviceScaleFactor(2));
 ```
 
 ```python async
@@ -270,13 +270,13 @@ BrowserContext context = browser.newContext(new Browser.NewContextOptions()
 
 ```python async
 context = await browser.new_context(
-  isMobile=false
+  is_mobile=False
 )
 ```
 
 ```python sync
 context = browser.new_context(
-  isMobile=false
+  is_mobile=False
 )
 ```
 
@@ -289,17 +289,17 @@ await using var context = await browser.NewContextAsync(new()
 
 ## Locale & Timezone
 
-Emulate the user Locale and Timezone which can be set globally for all tests in the config and then overridden for particular tests.
+Emulate the browser Locale and Timezone which can be set globally for all tests in the config and then overridden for particular tests.
 
 ```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
   use: {
-    // Emulates the user locale.
+    // Emulates the browser locale.
     locale: 'en-GB',
 
-    // Emulates the user timezone.
+    // Emulates the browser timezone.
     timezoneId: 'Europe/Paris',
   },
 });
@@ -355,6 +355,13 @@ await using var context = await browser.NewContextAsync(new()
 ```
 
 <img width="1394" alt="Bing in german lang and timezone" src="https://user-images.githubusercontent.com/13063165/220416571-ccc96ab1-44bb-4579-8430-64502fc24a15.png" />
+
+######
+* langs: js
+
+Note that this only affects the browser timezone and locale, not the test runner timezone.
+To set the test runner timezone, you can use the [`TZ` environment variable](https://nodejs.org/api/cli.html#tz).
+
 ## Permissions
 
 Allow app to show system notifications.
@@ -378,7 +385,7 @@ const context = await browser.newContext({
 
 ```java
 BrowserContext context = browser.newContext(new Browser.NewContextOptions()
-  .setPermissions(Arrays.asList("notifications"));
+  .setPermissions(Arrays.asList("notifications")));
 ```
 
 ```python async
@@ -558,7 +565,7 @@ await context.SetGeolocationAsync(new Geolocation() { Longitude = 48.858455, Lat
 **Note** you can only change geolocation for all pages in the context.
 ## Color Scheme and Media
 
-Emulate the users `"colorScheme"`. Supported values are 'light', 'dark', 'no-preference'. You can also emulate the media type with [`method: Page.emulateMedia`].
+Emulate the users `"colorScheme"`. Supported values are 'light' and 'dark'. You can also emulate the media type with [`method: Page.emulateMedia`].
 
 ```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
diff --git a/docs/src/evaluating.md b/docs/src/evaluating.md
index 50851110d0302..903aeb8a906a5 100644
--- a/docs/src/evaluating.md
+++ b/docs/src/evaluating.md
@@ -68,9 +68,95 @@ int status = await page.EvaluateAsync<int>(@"async () => {
 }");
 ```
 
+## Different environments
+
+Evaluated scripts run in the browser environment, while your test runs in a testing environments. This means you cannot use variables from your test in the page and vice versa. Instead, you should pass them explicitly as an argument.
+
+The following snippet is **WRONG** because it uses the variable directly:
+
+```js
+const data = 'some data';
+const result = await page.evaluate(() => {
+  // WRONG: there is no "data" in the web page.
+  window.myApp.use(data);
+});
+```
+
+```java
+String data = "some data";
+Object result = page.evaluate("() => {\n" +
+  "  // WRONG: there is no 'data' in the web page.\n" +
+  "  window.myApp.use(data);\n" +
+  "}");
+```
+
+```python async
+data = "some data"
+result = await page.evaluate("""() => {
+  // WRONG: there is no "data" in the web page.
+  window.myApp.use(data)
+}""")
+```
+
+```python sync
+data = "some data"
+result = page.evaluate("""() => {
+  // WRONG: there is no "data" in the web page.
+  window.myApp.use(data)
+}""")
+```
+
+```csharp
+var data = "some data";
+var result = await page.EvaluateAsync(@"() => {
+  // WRONG: there is no 'data' in the web page.
+  window.myApp.use(data);
+}");
+```
+
+The following snippet is **CORRECT** because it passes the value explicitly as an argument:
+
+```js
+const data = 'some data';
+// Pass |data| as a parameter.
+const result = await page.evaluate(data => {
+  window.myApp.use(data);
+}, data);
+```
+
+```java
+String data = "some data";
+// Pass |data| as a parameter.
+Object result = page.evaluate("data => {\n" +
+  "  window.myApp.use(data);\n" +
+  "}", data);
+```
+
+```python async
+data = "some data"
+# Pass |data| as a parameter.
+result = await page.evaluate("""data => {
+  window.myApp.use(data)
+}""", data)
+```
+
+```python sync
+data = "some data"
+# Pass |data| as a parameter.
+result = page.evaluate("""data => {
+  window.myApp.use(data)
+}""", data)
+```
+
+```csharp
+var data = "some data";
+// Pass |data| as a parameter.
+var result = await page.EvaluateAsync("data => { window.myApp.use(data); }", data);
+```
+
 ## Evaluation Argument
 
-Playwright evaluation methods like [`method: Page.evaluate`] take a single optional argument. This argument can be a mix of [Serializable] values and [JSHandle] or [ElementHandle] instances. Handles are automatically converted to the value they represent.
+Playwright evaluation methods like [`method: Page.evaluate`] take a single optional argument. This argument can be a mix of [Serializable] values and [JSHandle] instances. Handles are automatically converted to the value they represent.
 
 ```js
 // A primitive value.
@@ -86,7 +172,7 @@ await page.evaluate(object => object.foo, { foo: 'bar' });
 const button = await page.evaluateHandle('window.button');
 await page.evaluate(button => button.textContent, button);
 
-// Alternative notation using elementHandle.evaluate.
+// Alternative notation using JSHandle.evaluate.
 await button.evaluate((button, from) => button.textContent.substring(from), 5);
 
 // Object with multiple handles.
@@ -109,7 +195,7 @@ await page.evaluate(
     ([b1, b2]) => b1.textContent + b2.textContent,
     [button1, button2]);
 
-// Any non-cyclic mix of serializables and handles works.
+// Any mix of serializables and handles works.
 await page.evaluate(
     x => x.button1.textContent + x.list[0].textContent + String(x.foo),
     { button1, list: [button2], foo: null });
@@ -131,7 +217,7 @@ page.evaluate("object => object.foo", obj);
 ElementHandle button = page.evaluateHandle("window.button");
 page.evaluate("button => button.textContent", button);
 
-// Alternative notation using elementHandle.evaluate.
+// Alternative notation using JSHandle.evaluate.
 button.evaluate("(button, from) => button.textContent.substring(from)", 5);
 
 // Object with multiple handles.
@@ -156,7 +242,7 @@ page.evaluate(
   "([b1, b2]) => b1.textContent + b2.textContent",
   Arrays.asList(button1, button2));
 
-// Any non-cyclic mix of serializables and handles works.
+// Any mix of serializables and handles works.
 Map<String, Object> arg = new HashMap<>();
 arg.put("button1", button1);
 arg.put("list", Arrays.asList(button2));
@@ -180,7 +266,7 @@ await page.evaluate('object => object.foo', { 'foo': 'bar' })
 button = await page.evaluate_handle('button')
 await page.evaluate('button => button.textContent', button)
 
-# Alternative notation using elementHandle.evaluate.
+# Alternative notation using JSHandle.evaluate.
 await button.evaluate('(button, from) => button.textContent.substring(from)', 5)
 
 # Object with multiple handles.
@@ -203,7 +289,7 @@ await page.evaluate("""
     ([b1, b2]) => b1.textContent + b2.textContent""",
     [button1, button2])
 
-# Any non-cyclic mix of serializables and handles works.
+# Any mix of serializables and handles works.
 await page.evaluate("""
     x => x.button1.textContent + x.list[0].textContent + String(x.foo)""",
     { 'button1': button1, 'list': [button2], 'foo': None })
@@ -223,7 +309,7 @@ page.evaluate('object => object.foo', { 'foo': 'bar' })
 button = page.evaluate_handle('window.button')
 page.evaluate('button => button.textContent', button)
 
-# Alternative notation using elementHandle.evaluate.
+# Alternative notation using JSHandle.evaluate.
 button.evaluate('(button, from) => button.textContent.substring(from)', 5)
 
 # Object with multiple handles.
@@ -245,7 +331,7 @@ page.evaluate("""
     ([b1, b2]) => b1.textContent + b2.textContent""",
     [button1, button2])
 
-# Any non-cyclic mix of serializables and handles works.
+# Any mix of serializables and handles works.
 page.evaluate("""
     x => x.button1.textContent + x.list[0].textContent + String(x.foo)""",
     { 'button1': button1, 'list': [button2], 'foo': None })
@@ -265,7 +351,7 @@ await page.EvaluateAsync<object>("object => object.foo", new { foo = "bar" });
 var button = await page.EvaluateHandleAsync("window.button");
 await page.EvaluateAsync<IJSHandle>("button => button.textContent", button);
 
-// Alternative notation using elementHandle.EvaluateAsync.
+// Alternative notation using JSHandle.EvaluateAsync.
 await button.EvaluateAsync<string>("(button, from) => button.textContent.substring(from)", 5);
 
 // Object with multiple handles.
@@ -282,93 +368,69 @@ await page.EvaluateAsync("({ button1, button2 }) => button1.textContent + button
 // Note the required parenthesis.
 await page.EvaluateAsync("([b1, b2]) => b1.textContent + b2.textContent", new[] { button1, button2 });
 
-// Any non-cyclic mix of serializables and handles works.
+// Any mix of serializables and handles works.
 await page.EvaluateAsync("x => x.button1.textContent + x.list[0].textContent + String(x.foo)", new { button1, list = new[] { button2 }, foo = null as object });
 ```
 
-Right:
-
-```js
-const data = { text: 'some data', value: 1 };
-// Pass |data| as a parameter.
-const result = await page.evaluate(data => {
-  window.myApp.use(data);
-}, data);
-```
+## Init scripts
 
-```java
-Map<String, Object> data = new HashMap<>();
-data.put("text", "some data");
-data.put("value", 1);
-// Pass |data| as a parameter.
-Object result = page.evaluate("data => {\n" +
-  "  window.myApp.use(data);\n" +
-  "}", data);
-```
+Sometimes it is convenient to evaluate something in the page before it starts loading. For example, you might want to setup some mocks or test data.
 
-```python async
-data = { 'text': 'some data', 'value': 1 }
-# Pass |data| as a parameter.
-result = await page.evaluate("""data => {
-  window.myApp.use(data)
-}""", data)
-```
+In this case, use [`method: Page.addInitScript`] or [`method: BrowserContext.addInitScript`]. In the example below, we will replace `Math.random()` with a constant value.
 
-```python sync
-data = { 'text': 'some data', 'value': 1 }
-# Pass |data| as a parameter.
-result = page.evaluate("""data => {
-  window.myApp.use(data)
-}""", data)
-```
+First, create a `preload.js` file that contains the mock.
 
-```csharp
-var data = new { text = "some data", value = 1};
-// Pass data as a parameter
-var result = await page.EvaluateAsync("data => { window.myApp.use(data); }", data);
+```js browser
+// preload.js
+Math.random = () => 42;
 ```
 
-Wrong:
+Next, add init script to the page.
 
 ```js
-const data = { text: 'some data', value: 1 };
-const result = await page.evaluate(() => {
-  // There is no |data| in the web page.
-  window.myApp.use(data);
+import { test, expect } from '@playwright/test';
+import path from 'path';
+
+test.beforeEach(async ({ page }) => {
+  // Add script for every test in the beforeEach hook.
+  // Make sure to correctly resolve the script path.
+  await page.addInitScript({ path: path.resolve(__dirname, '../mocks/preload.js') });
 });
 ```
 
 ```java
-Map<String, Object> data = new HashMap<>();
-data.put("text", "some data");
-data.put("value", 1);
-Object result = page.evaluate("() => {\n" +
-  "  // There is no |data| in the web page.\n" +
-  "  window.myApp.use(data);\n" +
-  "}");
+// In your test, assuming the "preload.js" file is in the "mocks" directory.
+page.addInitScript(Paths.get("mocks/preload.js"));
 ```
 
 ```python async
-data = { 'text': 'some data', 'value': 1 }
-result = await page.evaluate("""() => {
-  // There is no |data| in the web page.
-  window.myApp.use(data)
-}""")
+# In your test, assuming the "preload.js" file is in the "mocks" directory.
+await page.add_init_script(path="mocks/preload.js")
 ```
 
 ```python sync
-data = { 'text': 'some data', 'value': 1 }
-result = page.evaluate("""() => {
-  // There is no |data| in the web page.
-  window.myApp.use(data)
-}""")
+# In your test, assuming the "preload.js" file is in the "mocks" directory.
+page.add_init_script(path="mocks/preload.js")
 ```
 
 ```csharp
-var data = new { text = "some data", value = 1};
-// Pass data as a parameter
-var result = await page.EvaluateAsync(@"data => {
-  // There is no |data| in the web page.
-  window.myApp.use(data);
-}");
+// In your test, assuming the "preload.js" file is in the "mocks" directory.
+await Page.AddInitScriptAsync(scriptPath: "mocks/preload.js");
+```
+
+######
+* langs: js
+
+Alternatively, you can pass a function instead of creating a preload script file. This is more convenient for short or one-off scripts. You can also pass an argument this way.
+
+```js
+import { test, expect } from '@playwright/test';
+
+// Add script for every test in the beforeEach hook.
+test.beforeEach(async ({ page }) => {
+  const value = 42;
+  await page.addInitScript(value => {
+    Math.random = () => value;
+  }, value);
+});
 ```
diff --git a/docs/src/getting-started-vscode-js.md b/docs/src/getting-started-vscode-js.md
index cf1c8f0844324..31977b32e78fe 100644
--- a/docs/src/getting-started-vscode-js.md
+++ b/docs/src/getting-started-vscode-js.md
@@ -7,229 +7,166 @@ import LiteYouTube from '@site/src/components/LiteYouTube';
 
 ## Introduction
 
-Playwright Test was created specifically to accommodate the needs of end-to-end testing. Playwright supports all modern rendering engines including Chromium, WebKit, and Firefox. Test on Windows, Linux, and macOS, locally or on CI, headless or headed with native mobile emulation of Google Chrome for Android and Mobile Safari. 
-
-Get started by installing Playwright and generating a test to see it in action. Alternatively you can also get started and run your tests using the [CLI](./intro.md).
+The Playwright VS Code extension brings the power of Playwright Test directly into your editor, allowing you to run, debug, and generate tests with a seamless UI-driven experience. This guide will walk you through setting up the extension and using its core features to supercharge your end-to-end testing workflow.
 
 <LiteYouTube
-    id="Xz6lhEzgI5I"
+    id="WvsLGZnHmzw"
     title="Getting Started with Playwright in VS Code"
 />
 
-## Installation
-
-Install the [VS Code extension from the marketplace](https://marketplace.visualstudio.com/items?itemName=ms-playwright.playwright) or from the extensions tab in VS Code.
-
-![VS Code extension for Playwright](https://github.com/microsoft/playwright/assets/13063165/cab54568-3168-4b3f-bf3d-854976594903)
-
-Once installed, open the command panel and type:
-
-```bash
-Install Playwright
-```
-
-![install playwright](https://github.com/microsoft/playwright/assets/13063165/14e91050-24ab-4ff1-a37b-57d7c15e5c35)
+## Prerequisites
 
+Before you begin, make sure you have the following installed:
+- [Node.js](https://nodejs.org/) (LTS version recommended)
+- [Visual Studio Code](https://code.visualstudio.com/)
 
-Select **Test: Install Playwright** and Choose the browsers you would like to run your tests on. These can be later configured in the [playwright.config](./test-configuration.md) file. You can also choose if you would like to have a GitHub Actions setup to [run your tests on CI](./ci-intro.md).
+## Getting Started
 
-![choose browsers](https://github.com/microsoft/playwright/assets/13063165/c9e8a25a-e9e8-4419-aeb5-1b8ba58bd71d)
+### Installation & Setup
 
-### Opening the testing sidebar
+1.  **Install the Extension**: Open the Extensions view in VS Code (`Ctrl+Shift+X` or `Cmd+Shift+X`) and search for "Playwright". [Install the official extension from Microsoft](https://marketplace.visualstudio.com/items?itemName=ms-playwright.playwright).
 
-The testing sidebar can be opened by clicking on the testing icon in the activity bar. This will give you access to the test explorer, which will show you all the tests in your project as well as the Playwright sidebar which includes projects, settings, tools and setup.
 
-![Testing Sidebar](https://github.com/microsoft/playwright/assets/13063165/d203fe83-6015-4e7a-b816-35d373906b24)
+![install playwright extension](./images/getting-started/vscode-extension.png)
 
-## Running tests
-
-You can run a single test by clicking the green triangle next to your test block to run your test. Playwright will run through each line of the test and when it finishes you will see a green tick next to your test block as well as the time it took to run the test.
-
-<LiteYouTube
-    id="mQmcIBMsc38"
-    title="Getting Started with Playwright in VS Code"
-/>
 
-![run a single test](https://github.com/microsoft/playwright/assets/13063165/69dbccfc-4e9f-40e7-bcdf-7d5c5a11f988)
+1.  **Install Playwright**: Once the extension is installed, open the Command Palette (`Ctrl+Shift+P` or `Cmd+Shift+P`) and run the **Test: Install Playwright** command.
 
+![install playwright](./images/getting-started/install-playwright.png)
 
-### Run tests and show browsers
+3.  **Select Browsers**: Choose the browsers you want for your tests (e.g., Chromium, Firefox, WebKit). You can also add a GitHub Actions workflow to run tests in CI. These settings can be changed later in your `playwright.config.ts` file.
 
-You can also run your tests and show the browsers by selecting the option **Show Browsers** in the testing sidebar. Then when you click the green triangle to run your test the browser will open and you will visually see it run through your test. Leave this selected if you want browsers open for all your tests or uncheck it if you prefer your tests to run in headless mode with no browser open.
+![install browsers](./images/getting-started/install-browsers.png)
 
-![show browsers while running tests](https://github.com/microsoft/playwright/assets/13063165/9f231530-0c43-466a-b944-8cf5102f714a)
+### Opening the Testing Sidebar
 
-Use the **Close all browsers** button to close all browsers.
+Click the **Testing icon** in the VS Code Activity Bar to open the Test Explorer. Here, you'll find your tests, as well as the Playwright sidebar for managing projects, tools, and settings.
 
-### View and run all tests
+![Testing Sidebar](./images/getting-started/testing-sidebar.png)
 
-View all tests in the testing sidebar and extend the tests by clicking on each test. Tests that have not been run will not have the green check next to them. Run all tests by clicking on the white triangle as you hover over the tests in the testing sidebar.
+## Core Features
 
-![run all tests](https://github.com/microsoft/playwright/assets/13063165/348e18ff-f819-4caa-8f7e-f16c20724f56)
+### Running Your Tests
 
-### Running tests on multiple browsers
-
-The first section in the Playwright sidebar is the projects section. Here you can see all your projects as defined in your Playwright config file. The default config when installing Playwright gives you 3 projects, Chromium, Firefox and WebKit. The first project is selected by default.
-
-![Projects section in VS Code extension](https://github.com/microsoft/playwright/assets/13063165/58fedea6-a2b9-4942-b2c7-2f3d482210cf)
-
-To run tests on multiple projects, select each project by checking the checkboxes next to the project name. Then when you run your tests from the sidebar or by pressing the play button next to the test name, the tests will run on all the selected projects.
-
-![Selecting projects to run tests on](https://github.com/microsoft/playwright/assets/13063165/6dc86ef4-6097-481c-9cab-b6e053ec7ea6)
-
-You can also individually run a test on a specific project by clicking the grey play button next to the project name of the test.
-
-![Running a test on a specific project](https://github.com/microsoft/playwright/assets/13063165/d29a27ab-07b5-4ca6-b4d7-1ad6d44bf222)
-
-### Run tests with trace viewer
+<LiteYouTube
+    id="mQmcIBMsc38"
+    title="Running Playwright Tests in VS Code"
+/>
 
-For a better developer experience you can run your tests with the **Show Trace Viewer** option.
+-   **Run a Single Test**: Click the green "play" icon next to any test to run it. The play button will change to a green checkmark if the test passes or a red X if the test fails. You'll be able to see how long the test took to run displayed next to the test name. Additionally, the Test Results panel will automatically open at the bottom of VS Code, showing a summary of the test execution including how many tests ran, how many passed, failed, or were skipped, along with the total execution time.
 
-![run tests with trace viewer](https://github.com/microsoft/playwright/assets/13063165/fab8efa6-d5ef-496d-876d-c99e94e6a6b3)
+![run a single test](./images/getting-started/run-single-test.png)
 
-This will open up a full trace of your test where you can step through each action of your tests, explore the timeline, source code and more.
+-   **Run All Tests**: You can run all tests at different levels. Click the play icon next to a specific test file to run all tests within that file, or click the play icon at the very top of the Test Explorer to run all tests across your entire project.
 
-![trace viewer](https://github.com/microsoft/playwright/assets/13063165/ee31a4fe-c786-4d4b-887e-2dcecacfba2c)
+![run all tests](./images/getting-started/run-all-tests.png)
 
-To learn more about the trace viewer see our [Trace Viewer guide](./trace-viewer.md).
+-   **Run on Multiple Browsers**: In the Playwright sidebar, check the boxes for the projects (browsers) you want to test against. Projects in Playwright represent different browser configurations - each project typically corresponds to a specific browser (like Chromium, Firefox, or WebKit) with its own settings such as viewport size, device emulation, or other browser-specific options. When you run a test, it will execute across all selected projects, allowing you to verify your application works consistently across different browsers and configurations.
 
+![Selecting projects to run tests on](./images/getting-started/select-projects.png)
 
+-   **Show Browser**: To watch your tests execute in a live browser window, enable the **Show Browser** option in the sidebar. Disable it to run in headless mode (where tests run in the background without opening a visible browser window).
 
-## Debugging tests
+![show browsers while running tests](./images/getting-started/show-browser.png)
 
-With the VS Code extension you can debug your tests right in VS Code see error messages, create breakpoints and live debug your tests.
+### Debugging Your Tests
 
 <LiteYouTube
     id="tJF7UhA59Gc"
     title="Debugging Playwright tests in VS Code"
 />
 
-### Error messages
-
-If your test fails VS Code will show you error messages right in the editor showing what was expected, what was received as well as a complete call log.
+The VS Code extension provides powerful debugging tools to help you identify and fix issues in your tests. You can set breakpoints, inspect variables, view detailed error messages, get AI-powered suggestions to resolve test failures, and use the comprehensive trace viewer to analyze test execution step-by-step.
 
-![error messaging in vs code](https://github.com/microsoft/playwright/assets/13063165/3b8af12a-4805-4573-9d38-92055a0a7e75)
+-   **Using Breakpoints**: Set a breakpoint by clicking in the gutter next to a line number. Right-click the test and select **Debug Test**. The test will pause at your breakpoint, allowing you to inspect variables and step through the code.
 
-### Live debugging
+    ![setting debug mode](./images/getting-started/debug-mode.png)
 
-You can debug your test live in VS Code. After running a test with the `Show Browser` option checked, click on any of the locators in VS Code and it will be highlighted in the Browser window. Playwright will highlight it if it exists and show you if there is more than one result
+-   **Live Debugging**: With **Show Browsers** enabled, click on a locator in your code. Playwright will highlight the corresponding element in the browser, making it easy to verify locators.
 
-![live debugging in vs code](https://github.com/microsoft/playwright/assets/13063165/7d236ebb-3d2d-4384-b73d-32a2b4e33b9e)
+ ![live debugging in vs code](./images/getting-started/live-debugging.png)
 
-You can also edit the locators in VS Code and Playwright will show you the changes live in the browser window.
+-   **Viewing Error Messages**: If a test fails, the extension displays detailed error messages, including the expected vs. received values and a full call log, directly in the editor.
 
-### Run in debug mode
+![error messaging in vs code](./images/getting-started/error-messaging.png)
 
-To set a breakpoint click next to the line number where you want the breakpoint to be until a red dot appears. Run the tests in debug mode by right clicking on the line next to the test you want to run. 
+-   **Fix with AI**: When a test fails, click the sparkle icon next to the error to get an AI-powered fix suggestion from Copilot. Copilot analyzes the error and suggests a code change to resolve the issue.
 
-![setting debug mode](https://github.com/microsoft/playwright/assets/13063165/31640629-efac-4cc7-b8b0-80ae18a3af83)
+![fix with ai in vs code](./images/getting-started/fix-with-ai.png)
 
-A browser window will open and the test will run and pause at where the breakpoint is set. You can step through the tests, pause the test and rerun the tests from the menu in VS Code.
+-   **Debugging with Trace Viewer**: For comprehensive debugging, enable the **Show Trace Viewer** option in the Playwright sidebar. When your test finishes, a detailed trace will automatically open, providing you with a complete timeline of your test execution. The trace viewer is particularly useful for:
+    - **Step-by-step analysis**: Navigate through each action your test performed with precise timestamps
+    - **DOM inspection**: View DOM snapshots at any point during test execution to see exactly what the page looked like
+    - **Network monitoring**: Examine all network requests and responses that occurred during the test
+    - **Console logs**: Access all console messages and errors from the browser
+    - **Source mapping**: Jump directly to the source code that executed each action
+    - **Visual debugging**: See screenshots and understand what the user would have seen at each step
 
-![running in debug mode](https://github.com/microsoft/playwright/assets/13063165/b96a9f50-0f4d-49f9-a3d8-f093980a5673)
+    The trace viewer is especially valuable when debugging flaky tests or understanding complex user interactions.
 
-![choosing a profile for debugging](https://github.com/microsoft/playwright/assets/13063165/48c1b428-8dd2-4229-9eb5-24f7168db834)
+![trace viewer debugging](./images/getting-started/trace-viewer-debug.png)
 
-To learn more about debugging, see [Debugging in Visual Studio Code](https://code.visualstudio.com/docs/editor/debugging).
+To learn more, see our [Trace Viewer guide](./trace-viewer.md).
 
-### Debug with trace viewer
+### Generating Tests with CodeGen
 
-For a better developer experience you can debug your tests with the **Show Trace Viewer** option.
-
-![run tests with trace viewer](https://github.com/microsoft/playwright/assets/13063165/fab8efa6-d5ef-496d-876d-c99e94e6a6b3)
-
-This will open up a full trace of your test where you can step through each action and see what happened before and after the action. You can also inspect the DOM snapshot, see console logs, network requests, the source code and more.
-
-![trace viewer](https://github.com/microsoft/playwright/assets/13063165/ee31a4fe-c786-4d4b-887e-2dcecacfba2c)
-
-To learn more about the trace viewer see our [Trace Viewer guide](./trace-viewer.md).
-
-## Generating tests
-
-CodeGen will auto generate your tests for you as you perform actions in the browser and is a great way to quickly get started. The viewport for the browser window is set to a specific width and height. See the [configuration guide](./test-configuration.md) to change the viewport or emulate different environments.
+CodeGen is Playwright's powerful test generation tool that automatically creates test code by recording your interactions with a web page. Instead of writing tests from scratch, you can simply navigate through your application while CodeGen captures your actions and converts them into reliable test code with proper locators and assertions.
 
 <LiteYouTube
     id="5XIZPqKkdBA"
     title="Generating Playwright tests in VS Code"
 />
 
-### Record a new test
-
-To record a test click on the **Record new** button from the Testing sidebar. This will create a `test-1.spec.ts` file as well as open up a browser window. In the browser go to the URL you wish to test and start clicking around. Playwright will record your actions and generate the test code directly in VS Code. You can also generate assertions by choosing one of the icons in the toolbar and then clicking on an element on the page to assert against. The following assertions can be generated:
-  * `'assert visibility'` to assert that an element is visible
-  * `'assert text'` to assert that an element contains specific text
-  * `'assert value'` to assert that an element has a specific value
-
-Once you are done recording click the **cancel** button or close the browser window. You can then inspect your `test-1.spec.ts` file and see your generated test.
-
-
-![record a new test](https://github.com/microsoft/playwright/assets/13063165/0407f112-e1cd-41e7-a05d-ae64e24d27ed)
-
-### Record at cursor
-
-To record from a specific point in your test file click the **Record at cursor** button from the Testing sidebar. This generates actions into the existing test at the current cursor position. You can run the test, position the cursor at the end of the test and continue generating the test.
-
-![record at cursor](https://github.com/microsoft/playwright/assets/13063165/96933ea1-4c84-453a-acd7-22b4d3bde185)
-
-### Picking a locator
-
-Pick a [locator](./locators.md) and copy it into your test file by clicking the **Pick locator** button form the testing sidebar. Then in the browser click the element you require and it will now show up in the **Pick locator** box in VS Code. Press 'enter' on your keyboard to copy the locator into the clipboard and then paste anywhere in your code. Or press 'escape' if you want to cancel.
-
-
-![pick locators](https://github.com/microsoft/playwright/assets/13063165/9a1b2da9-9ac7-4def-a9e0-f94770364fc2)
-
-Playwright will look at your page and figure out the best locator, prioritizing [role, text and test id locators](./locators.md). If the generator finds multiple elements matching the locator, it will improve the locator to make it resilient and uniquely identify the target element, so you don't have to worry about failing tests due to locators.
-
-## Project Dependencies
-
-You can use [project dependencies](./test-projects.md) to run tests that depend on other tests. This is useful for **setup** tests such as logging in to a website. 
-
-### Running setup tests
-
-To run your setup tests select the **setup** project, as defined in your configuration file, from the project section in the Playwright sidebar. This will give you access to the **setup** tests in the test explorer.
-
-![setup tests in vscode](https://github.com/microsoft/playwright/assets/13063165/7a9eccd5-a5b3-431f-9eff-9b2971501e07)
+-   **Record a New Test**: Click **Record new** in the sidebar. A browser window will open. As you interact with the page, Playwright will automatically generate the test code. You can also generate assertions from the recording toolbar.
 
-When you run a test that depends on the **setup** tests, the **setup** test will run first. Each time you run the test, the **setup** test will run again. 
+![record a new test](./images/getting-started/record-new-test.png)
 
-![running setup tests in vscode](https://github.com/microsoft/playwright/assets/13063165/a54b3868-3f9f-4e74-8d42-a93443f099fc)
+-   **Record at Cursor**: Place your cursor inside an existing test and click **Record at cursor** to add new actions at that specific point.
+![record at cursor](./images/getting-started/record-at-cursor.png)
 
-### Running setup tests only once
+-   **Pick a Locator**: Use the **Pick locator** tool to click on any element in the opened browser. Playwright will determine the best locator and copy it to your clipboard, ready to be pasted into your code.
 
-To run the **setup** test only once, deselect it from the projects section in the Playwright sidebar. The **setup** test is now removed from the test explorer. When you run a test that depends on the **setup** test, it will no longer run the **setup** test, making it much faster and therefore a much better developer experience.
+![pick locators](./images/getting-started/pick-locator.png)
 
-![deselecting setup tests in vscode](https://github.com/microsoft/playwright/assets/13063165/ebc50e38-c98d-4538-82fe-ec08491f8487)
+To learn more, see our [CodeGen guide](./codegen.md).
 
-## Global Setup
 
-**Global setup** tests are run when you execute your first test. This runs only once and is useful for setting up a database or starting a server. You can manually run a **global setup** test by clicking the `Run global setup` option from the **Setup** section in the Playwright sidebar. You can also run **global teardown** tests by clicking the `Run global teardown` option.
+## Advanced Features
 
-Global setup will re-run when you debug tests as this ensures an isolated environment and dedicated setup for the test.
+### Project Dependencies
 
-![running global setup](https://github.com/microsoft/playwright/assets/13063165/bcf5fec7-2d7d-4cb9-a277-5f41e19b8d52)
+Use [project dependencies](./test-projects.md) to define setup tests that run before other tests. For example, you can create a login test that runs first, then reuse that authenticated state across multiple tests without having to log in again for each test. In VS Code, you can see these setup tests in the Test Explorer and run them independently when needed.
 
-## Multiple configurations
+![setup tests in vscode](./images/getting-started/setup-tests.png)
 
-If your project contains more than one playwright configuration file, you can switch between them by first clicking on the gear icon in the top right corner of the Playwright sidebar. This will show you all the configuration files in your project. Select the configuration files you want to use by checking the checkbox next to each one and clicking on the 'ok' button.
+To learn more, see our [Project Dependencies guide](./test-projects.md).
 
-![Selecting a configuration file](https://github.com/microsoft/playwright/assets/13063165/ff9ff838-d27a-403d-b939-94e6c295e1d7)
+### Global Setup
 
-You will now have access to all your tests in the test explorer. To run a test click on the grey triangle next to the file or project name. 
+For tasks that need to run only once before all tests (like seeding a database), use **Global Setup**. You can trigger the global setup and teardown manually from the Playwright sidebar.
 
-![Switching between configuration files](https://github.com/microsoft/playwright/assets/13063165/70930de5-0a0c-45e0-a6ee-b51f727f0e35)
+![running global setup](./images/getting-started/global-setup.png)
 
-To run all tests from all configurations click on the grey triangle at the top of the test explorer.
+### Multiple Configurations
 
-![Running all tests from all configurations](https://github.com/microsoft/playwright/assets/13063165/b3de4ce1-d311-4527-b2c7-b3e2f179a685)
+If you have multiple `playwright.config.ts` files, you can switch between them using the gear icon in the Playwright sidebar. This allows you to easily work with different test suites or environments.
 
-To choose a configuration file to work with simply toggle between them by clicking on the configuration file name in the Playwright sidebar. Now when you use the tools, such as Record a test, it will record a test for the selected configuration file. 
+![Selecting a configuration file](./images/getting-started/selecting-configuration.png)
 
-![Recording a test for a specific configuration file](https://github.com/microsoft/playwright/assets/13063165/a8ecbcd1-fab8-4012-bdaa-428951f233a2)
+## Quick Reference
 
-You can easily toggle back and forth between configurations by clicking on the configuration file name in the Playwright sidebar.
+| Action                  | How to do it in VS Code                                     |
+| ----------------------- | ----------------------------------------------------------- |
+| **Install Playwright**  | Command Palette → `Test: Install Playwright`                |
+| **Run a Test**          | Click the "play" icon next to the test                      |
+| **Debug a Test**        | Set a breakpoint, right-click the test → `Debug Test`       |
+| **Show Live Browser**   | Enable `Show Browsers` in the Playwright sidebar            |
+| **Record a New Test**   | Click `Record new` in the Playwright sidebar                |
+| **Pick a Locator**      | Click `Pick locator` in the Playwright sidebar              |
+| **View Test Trace**     | Enable `Show Trace Viewer` in the Playwright sidebar        |
 
-## What's next
+## What's Next
 
-- [Write tests using web first assertions, page fixtures and locators](./writing-tests.md)
-- [Run your tests on CI](./ci-intro.md)
-- [Learn more about the Trace Viewer](./trace-viewer.md)
+-   [Write tests using web-first assertions, page fixtures, and locators](./writing-tests.md)
+-   [Run your tests on CI](./ci-intro.md)
+-   [Learn more about the Trace Viewer](./trace-viewer.md)
diff --git a/docs/src/images/getting-started/codegen-csharp.png b/docs/src/images/getting-started/codegen-csharp.png
new file mode 100644
index 0000000000000..96946f491ab2b
Binary files /dev/null and b/docs/src/images/getting-started/codegen-csharp.png differ
diff --git a/docs/src/images/getting-started/codegen-java.png b/docs/src/images/getting-started/codegen-java.png
new file mode 100644
index 0000000000000..539ba06e30a17
Binary files /dev/null and b/docs/src/images/getting-started/codegen-java.png differ
diff --git a/docs/src/images/getting-started/codgen-js.png b/docs/src/images/getting-started/codgen-js.png
new file mode 100644
index 0000000000000..e6a3938de9277
Binary files /dev/null and b/docs/src/images/getting-started/codgen-js.png differ
diff --git a/docs/src/images/getting-started/codgen-python.png b/docs/src/images/getting-started/codgen-python.png
new file mode 100644
index 0000000000000..5ecafe2b7ba65
Binary files /dev/null and b/docs/src/images/getting-started/codgen-python.png differ
diff --git a/docs/src/images/getting-started/debug-mode.png b/docs/src/images/getting-started/debug-mode.png
new file mode 100644
index 0000000000000..d2ec8a9c19c94
Binary files /dev/null and b/docs/src/images/getting-started/debug-mode.png differ
diff --git a/docs/src/images/getting-started/error-messaging.png b/docs/src/images/getting-started/error-messaging.png
new file mode 100644
index 0000000000000..7d87662142b45
Binary files /dev/null and b/docs/src/images/getting-started/error-messaging.png differ
diff --git a/docs/src/images/getting-started/fix-with-ai.png b/docs/src/images/getting-started/fix-with-ai.png
new file mode 100644
index 0000000000000..556a1ad04afd0
Binary files /dev/null and b/docs/src/images/getting-started/fix-with-ai.png differ
diff --git a/docs/src/images/getting-started/global-setup.png b/docs/src/images/getting-started/global-setup.png
new file mode 100644
index 0000000000000..34119260ed0cb
Binary files /dev/null and b/docs/src/images/getting-started/global-setup.png differ
diff --git a/docs/src/images/getting-started/html-report-basic.png b/docs/src/images/getting-started/html-report-basic.png
new file mode 100644
index 0000000000000..03d8c5e33a28d
Binary files /dev/null and b/docs/src/images/getting-started/html-report-basic.png differ
diff --git a/docs/src/images/getting-started/html-report-detail.png b/docs/src/images/getting-started/html-report-detail.png
new file mode 100644
index 0000000000000..6e75f25eb2cc4
Binary files /dev/null and b/docs/src/images/getting-started/html-report-detail.png differ
diff --git a/docs/src/images/getting-started/html-report-failed-tests.png b/docs/src/images/getting-started/html-report-failed-tests.png
new file mode 100644
index 0000000000000..572854db2047d
Binary files /dev/null and b/docs/src/images/getting-started/html-report-failed-tests.png differ
diff --git a/docs/src/images/getting-started/html-report-open.png b/docs/src/images/getting-started/html-report-open.png
new file mode 100644
index 0000000000000..6e75f25eb2cc4
Binary files /dev/null and b/docs/src/images/getting-started/html-report-open.png differ
diff --git a/docs/src/images/getting-started/html-report-trace.png b/docs/src/images/getting-started/html-report-trace.png
new file mode 100644
index 0000000000000..d3a3273ac4ad1
Binary files /dev/null and b/docs/src/images/getting-started/html-report-trace.png differ
diff --git a/docs/src/images/getting-started/html-report.png b/docs/src/images/getting-started/html-report.png
new file mode 100644
index 0000000000000..e7cac492d9686
Binary files /dev/null and b/docs/src/images/getting-started/html-report.png differ
diff --git a/docs/src/images/getting-started/install-browsers.png b/docs/src/images/getting-started/install-browsers.png
new file mode 100644
index 0000000000000..83395893d01c0
Binary files /dev/null and b/docs/src/images/getting-started/install-browsers.png differ
diff --git a/docs/src/images/getting-started/install-playwright.png b/docs/src/images/getting-started/install-playwright.png
new file mode 100644
index 0000000000000..68a7b794256b9
Binary files /dev/null and b/docs/src/images/getting-started/install-playwright.png differ
diff --git a/docs/src/images/getting-started/live-debugging.png b/docs/src/images/getting-started/live-debugging.png
new file mode 100644
index 0000000000000..89d8c0a9f9e5f
Binary files /dev/null and b/docs/src/images/getting-started/live-debugging.png differ
diff --git a/docs/src/images/getting-started/pick-locator-csharp.png b/docs/src/images/getting-started/pick-locator-csharp.png
new file mode 100644
index 0000000000000..800f3484f7799
Binary files /dev/null and b/docs/src/images/getting-started/pick-locator-csharp.png differ
diff --git a/docs/src/images/getting-started/pick-locator-java.png b/docs/src/images/getting-started/pick-locator-java.png
new file mode 100644
index 0000000000000..13810f7a1452f
Binary files /dev/null and b/docs/src/images/getting-started/pick-locator-java.png differ
diff --git a/docs/src/images/getting-started/pick-locator-js.png b/docs/src/images/getting-started/pick-locator-js.png
new file mode 100644
index 0000000000000..fbdb652c3b8f3
Binary files /dev/null and b/docs/src/images/getting-started/pick-locator-js.png differ
diff --git a/docs/src/images/getting-started/pick-locator-python.png b/docs/src/images/getting-started/pick-locator-python.png
new file mode 100644
index 0000000000000..b99697f5a3b28
Binary files /dev/null and b/docs/src/images/getting-started/pick-locator-python.png differ
diff --git a/docs/src/images/getting-started/pick-locator.png b/docs/src/images/getting-started/pick-locator.png
new file mode 100644
index 0000000000000..8ac237d42a353
Binary files /dev/null and b/docs/src/images/getting-started/pick-locator.png differ
diff --git a/docs/src/images/getting-started/record-at-cursor.png b/docs/src/images/getting-started/record-at-cursor.png
new file mode 100644
index 0000000000000..ad9e4c8322964
Binary files /dev/null and b/docs/src/images/getting-started/record-at-cursor.png differ
diff --git a/docs/src/images/getting-started/record-new-test.png b/docs/src/images/getting-started/record-new-test.png
new file mode 100644
index 0000000000000..d612fde765995
Binary files /dev/null and b/docs/src/images/getting-started/record-new-test.png differ
diff --git a/docs/src/images/getting-started/record-test-csharp.png b/docs/src/images/getting-started/record-test-csharp.png
new file mode 100644
index 0000000000000..96946f491ab2b
Binary files /dev/null and b/docs/src/images/getting-started/record-test-csharp.png differ
diff --git a/docs/src/images/getting-started/record-test-java.png b/docs/src/images/getting-started/record-test-java.png
new file mode 100644
index 0000000000000..539ba06e30a17
Binary files /dev/null and b/docs/src/images/getting-started/record-test-java.png differ
diff --git a/docs/src/images/getting-started/record-test-js.png b/docs/src/images/getting-started/record-test-js.png
new file mode 100644
index 0000000000000..e6a3938de9277
Binary files /dev/null and b/docs/src/images/getting-started/record-test-js.png differ
diff --git a/docs/src/images/getting-started/record-test-python.png b/docs/src/images/getting-started/record-test-python.png
new file mode 100644
index 0000000000000..5ecafe2b7ba65
Binary files /dev/null and b/docs/src/images/getting-started/record-test-python.png differ
diff --git a/docs/src/images/getting-started/run-all-tests.png b/docs/src/images/getting-started/run-all-tests.png
new file mode 100644
index 0000000000000..86c2dd886ba91
Binary files /dev/null and b/docs/src/images/getting-started/run-all-tests.png differ
diff --git a/docs/src/images/getting-started/run-single-test.png b/docs/src/images/getting-started/run-single-test.png
new file mode 100644
index 0000000000000..b5609c4358fcd
Binary files /dev/null and b/docs/src/images/getting-started/run-single-test.png differ
diff --git a/docs/src/images/getting-started/run-tests-cli.png b/docs/src/images/getting-started/run-tests-cli.png
new file mode 100644
index 0000000000000..d3dee686d9734
Binary files /dev/null and b/docs/src/images/getting-started/run-tests-cli.png differ
diff --git a/docs/src/images/getting-started/run-tests-debug.png b/docs/src/images/getting-started/run-tests-debug.png
new file mode 100644
index 0000000000000..75d94bee956f3
Binary files /dev/null and b/docs/src/images/getting-started/run-tests-debug.png differ
diff --git a/docs/src/images/getting-started/run-tests-pick-locator.png b/docs/src/images/getting-started/run-tests-pick-locator.png
new file mode 100644
index 0000000000000..9c9a6dc9d4a45
Binary files /dev/null and b/docs/src/images/getting-started/run-tests-pick-locator.png differ
diff --git a/docs/src/images/getting-started/select-projects.png b/docs/src/images/getting-started/select-projects.png
new file mode 100644
index 0000000000000..4a6fd6f168317
Binary files /dev/null and b/docs/src/images/getting-started/select-projects.png differ
diff --git a/docs/src/images/getting-started/selecting-configuration.png b/docs/src/images/getting-started/selecting-configuration.png
new file mode 100644
index 0000000000000..472a635964426
Binary files /dev/null and b/docs/src/images/getting-started/selecting-configuration.png differ
diff --git a/docs/src/images/getting-started/setup-tests.png b/docs/src/images/getting-started/setup-tests.png
new file mode 100644
index 0000000000000..675cc01e29c53
Binary files /dev/null and b/docs/src/images/getting-started/setup-tests.png differ
diff --git a/docs/src/images/getting-started/show-browser.png b/docs/src/images/getting-started/show-browser.png
new file mode 100644
index 0000000000000..6dee4026800d3
Binary files /dev/null and b/docs/src/images/getting-started/show-browser.png differ
diff --git a/docs/src/images/getting-started/testing-sidebar.png b/docs/src/images/getting-started/testing-sidebar.png
new file mode 100644
index 0000000000000..f817824de3099
Binary files /dev/null and b/docs/src/images/getting-started/testing-sidebar.png differ
diff --git a/docs/src/images/getting-started/trace-viewer-debug.png b/docs/src/images/getting-started/trace-viewer-debug.png
new file mode 100644
index 0000000000000..5321f8aa880af
Binary files /dev/null and b/docs/src/images/getting-started/trace-viewer-debug.png differ
diff --git a/docs/src/images/getting-started/trace-viewer-failed-test.png b/docs/src/images/getting-started/trace-viewer-failed-test.png
new file mode 100644
index 0000000000000..6c130b1f2b0de
Binary files /dev/null and b/docs/src/images/getting-started/trace-viewer-failed-test.png differ
diff --git a/docs/src/images/getting-started/trace-viewer.png b/docs/src/images/getting-started/trace-viewer.png
new file mode 100644
index 0000000000000..8781423c9cc66
Binary files /dev/null and b/docs/src/images/getting-started/trace-viewer.png differ
diff --git a/docs/src/images/getting-started/ui-mode-error.png b/docs/src/images/getting-started/ui-mode-error.png
new file mode 100644
index 0000000000000..fa293f87942d2
Binary files /dev/null and b/docs/src/images/getting-started/ui-mode-error.png differ
diff --git a/docs/src/images/getting-started/ui-mode-pick-locator.png b/docs/src/images/getting-started/ui-mode-pick-locator.png
new file mode 100644
index 0000000000000..2a4df09bcb713
Binary files /dev/null and b/docs/src/images/getting-started/ui-mode-pick-locator.png differ
diff --git a/docs/src/images/getting-started/ui-mode.png b/docs/src/images/getting-started/ui-mode.png
new file mode 100644
index 0000000000000..f9e83dbe72ad2
Binary files /dev/null and b/docs/src/images/getting-started/ui-mode.png differ
diff --git a/docs/src/images/getting-started/vscode-extension.png b/docs/src/images/getting-started/vscode-extension.png
new file mode 100644
index 0000000000000..106fb690e896e
Binary files /dev/null and b/docs/src/images/getting-started/vscode-extension.png differ
diff --git a/docs/src/images/vscode-projects-section.png b/docs/src/images/vscode-projects-section.png
new file mode 100644
index 0000000000000..cffe4ec181154
Binary files /dev/null and b/docs/src/images/vscode-projects-section.png differ
diff --git a/docs/src/input.md b/docs/src/input.md
index b6fab7d005cf6..4f71c2be67bf2 100644
--- a/docs/src/input.md
+++ b/docs/src/input.md
@@ -217,7 +217,7 @@ await page.getByText('Item').click({ button: 'right' });
 // Shift + click
 await page.getByText('Item').click({ modifiers: ['Shift'] });
 
-// Ctrl + click or Windows and Linux
+// Ctrl + click on Windows and Linux
 // Meta + click on macOS
 await page.getByText('Item').click({ modifiers: ['ControlOrMeta'] });
 
@@ -241,7 +241,7 @@ page.getByText("Item").click(new Locator.ClickOptions().setButton(MouseButton.RI
 // Shift + click
 page.getByText("Item").click(new Locator.ClickOptions().setModifiers(Arrays.asList(KeyboardModifier.SHIFT)));
 
-// Ctrl + click or Windows and Linux
+// Ctrl + click on Windows and Linux
 // Meta + click on macOS
 page.getByText("Item").click(new Locator.ClickOptions().setModifiers(Arrays.asList(KeyboardModifier.CONTROL_OR_META)));
 
@@ -265,7 +265,7 @@ await page.get_by_text("Item").click(button="right")
 # Shift + click
 await page.get_by_text("Item").click(modifiers=["Shift"])
 
-# Ctrl + click or Windows and Linux
+# Ctrl + click on Windows and Linux
 # Meta + click on macOS
 await page.get_by_text("Item").click(modifiers=["ControlOrMeta"])
 
@@ -309,7 +309,7 @@ await page.GetByText("Item").ClickAsync(new() { Button = MouseButton.Right });
 // Shift + click
 await page.GetByText("Item").ClickAsync(new() { Modifiers = new[] { KeyboardModifier.Shift } });
 
-// Ctrl + click or Windows and Linux
+// Ctrl + click on Windows and Linux
 // Meta + click on macOS
 await page.GetByText("Item").ClickAsync(new() { Modifiers = new[] { KeyboardModifier.ControlOrMeta } });
 
diff --git a/docs/src/intro-csharp.md b/docs/src/intro-csharp.md
index d26874d456dbc..f48722c0706c9 100644
--- a/docs/src/intro-csharp.md
+++ b/docs/src/intro-csharp.md
@@ -7,7 +7,7 @@ title: "Installation"
 
 Playwright was created specifically to accommodate the needs of end-to-end testing. Playwright supports all modern rendering engines including Chromium, WebKit, and Firefox. Test on Windows, Linux, and macOS, locally or on CI, headless or headed with native mobile emulation.
 
-You can choose to use [MSTest base classes](./test-runners.md#mstest) or [NUnit base classes](./test-runners.md#nunit) that Playwright provides to write end-to-end tests. These classes support running tests on multiple browser engines, parallelizing tests, adjusting launch/context options and getting a [Page]/[BrowserContext] instance per test out of the box. Alternatively you can use the [library](./library.md) to manually write the testing infrastructure.
+You can choose to use MSTest, NUnit, or xUnit [base classes](./test-runners.md) that Playwright provides to write end-to-end tests. These classes support running tests on multiple browser engines, parallelizing tests, adjusting launch/context options and getting a [Page]/[BrowserContext] instance per test out of the box. Alternatively you can use the [library](./library.md) to manually write the testing infrastructure.
 
 1. Start by creating a new project with `dotnet new`. This will create the `PlaywrightTests` directory which includes a `UnitTest1.cs` file:
 
@@ -17,6 +17,8 @@ You can choose to use [MSTest base classes](./test-runners.md#mstest) or [NUnit
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -34,6 +36,22 @@ dotnet new mstest -n PlaywrightTests
 cd PlaywrightTests
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```bash
+dotnet new xunit -n PlaywrightTests
+cd PlaywrightTests
+```
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+```bash
+dotnet new xunit -n PlaywrightTests
+cd PlaywrightTests
+```
+
 </TabItem>
 </Tabs>
 
@@ -45,6 +63,8 @@ cd PlaywrightTests
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -60,6 +80,20 @@ dotnet add package Microsoft.Playwright.NUnit
 dotnet add package Microsoft.Playwright.MSTest
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```bash
+dotnet add package Microsoft.Playwright.Xunit
+```
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+```bash
+dotnet add package Microsoft.Playwright.Xunit.v3
+```
+
 </TabItem>
 </Tabs>
 
@@ -87,6 +121,8 @@ Edit the `UnitTest1.cs` file with the code below to create an example end-to-end
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -164,6 +200,75 @@ public class ExampleTest : PageTest
 ```
 
 </TabItem>
+<TabItem value="xunit">
+
+```csharp title="UnitTest1.cs"
+using System.Text.RegularExpressions;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task HasTitle()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Expect a title "to contain" a substring.
+        await Expect(Page).ToHaveTitleAsync(new Regex("Playwright"));
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Click the get started link.
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Get started" }).ClickAsync();
+
+        // Expects page to have a heading with the name of Installation.
+        await Expect(Page.GetByRole(AriaRole.Heading, new() { Name = "Installation" })).ToBeVisibleAsync();
+    } 
+}
+```
+</TabItem>
+<TabItem value="xunit-v3">
+
+```csharp title="UnitTest1.cs"
+using System.Text.RegularExpressions;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task HasTitle()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Expect a title "to contain" a substring.
+        await Expect(Page).ToHaveTitleAsync(new Regex("Playwright"));
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Click the get started link.
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Get started" }).ClickAsync();
+
+        // Expects page to have a heading with the name of Installation.
+        await Expect(Page.GetByRole(AriaRole.Heading, new() { Name = "Installation" })).ToBeVisibleAsync();
+    } 
+}
+```
+</TabItem>
+
 </Tabs>
 
 ## Running the Example Tests
@@ -180,8 +285,8 @@ See our doc on [Running and Debugging Tests](./running-tests.md) to learn more a
 
 - Playwright is distributed as a .NET Standard 2.0 library. We recommend .NET 8.
 - Windows 10+, Windows Server 2016+ or Windows Subsystem for Linux (WSL).
-- macOS 13 Ventura, or macOS 14 Sonoma.
-- Debian 11, Debian 12, Ubuntu 20.04 or Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
+- macOS 14 Ventura, or later.
+- Debian 12, Debian 13, Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
 
 ## What's next
 
@@ -190,4 +295,4 @@ See our doc on [Running and Debugging Tests](./running-tests.md) to learn more a
 - [Generate tests with Codegen](./codegen-intro.md)
 - [See a trace of your tests](./trace-viewer-intro.md)
 - [Run tests on CI](./ci-intro.md)
-- [Learn more about the MSTest and NUnit base classes](./test-runners.md)
+- [Learn more about the MSTest, NUnit, xUnit and xUnit v3 base classes](./test-runners.md)
diff --git a/docs/src/intro-java.md b/docs/src/intro-java.md
index 424562ab837a9..35530dd3eb3f2 100644
--- a/docs/src/intro-java.md
+++ b/docs/src/intro-java.md
@@ -32,7 +32,7 @@ public class App {
         try (Playwright playwright = Playwright.create()) {
             Browser browser = playwright.chromium().launch();
             Page page = browser.newPage();
-            page.navigate("http://playwright.dev");
+            page.navigate("https://playwright.dev");
             System.out.println(page.title());
         }
     }
@@ -112,7 +112,7 @@ public class App {
 }
 ```
 
-By default, Playwright runs the browsers in headless mode. To see the browser UI, pass the `setHeadless(false)` flag while launching the browser. You can also use [`option: slowMo`] to slow down execution. Learn more in the debugging tools [section](./debug.md).
+By default, Playwright runs the browsers in headless mode. To see the browser UI, [`option: BrowserType.launch.headless`] option to `false`. You can also use [`option: BrowserType.launch.slowMo`] to slow down execution. Learn more in the debugging tools [section](./debug.md).
 
 ```java
 playwright.firefox().launch(new BrowserType.LaunchOptions().setHeadless(false).setSlowMo(50));
@@ -130,8 +130,8 @@ By default browsers launched with Playwright run headless, meaning no browser UI
 
 - Java 8 or higher.
 - Windows 10+, Windows Server 2016+ or Windows Subsystem for Linux (WSL).
-- macOS 13 Ventura, or macOS 14 Sonoma.
-- Debian 11, Debian 12, Ubuntu 20.04 or Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
+- macOS 14 Ventura, or later.
+- Debian 12, Debian 13, Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
 
 ## What's next
 
diff --git a/docs/src/intro-js.md b/docs/src/intro-js.md
index 09c070aecf4f8..a9bce9752a29a 100644
--- a/docs/src/intro-js.md
+++ b/docs/src/intro-js.md
@@ -5,21 +5,25 @@ title: "Installation"
 
 ## Introduction
 
-Playwright Test was created specifically to accommodate the needs of end-to-end testing. Playwright supports all modern rendering engines including Chromium, WebKit, and Firefox. Test on Windows, Linux, and macOS, locally or on CI, headless or headed with native mobile emulation of Google Chrome for Android and Mobile Safari.
+Playwright Test is an end-to-end test framework for modern web apps. It bundles test runner, assertions, isolation, parallelization and rich tooling. Playwright supports Chromium, WebKit and Firefox on Windows, Linux and macOS, locally or in CI, headless or headed, with native mobile emulation for Chrome (Android) and Mobile Safari.
 
 **You will learn**
 
 - [How to install Playwright](/intro.md#installing-playwright)
-- [What's Installed](/intro.md#whats-installed)
+- [What's installed](/intro.md#whats-installed)
 - [How to run the example test](/intro.md#running-the-example-test)
 - [How to open the HTML test report](/intro.md#html-test-reports)
 
-
 ## Installing Playwright
 
-Get started by installing Playwright using npm, yarn or pnpm. Alternatively you can also get started and run your tests using the [VS Code Extension](./getting-started-vscode.md).
+Get started by installing Playwright using one of the following methods.
+
+### Using npm, yarn or pnpm
+
+The command below either initializes a new project or adds Playwright to an existing one.
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -53,36 +57,42 @@ pnpm create playwright
 
 </Tabs>
 
+When prompted, choose / confirm:
+- TypeScript or JavaScript (default: TypeScript)
+- Tests folder name (default: `tests`, or `e2e` if `tests` already exists)
+- Add a GitHub Actions workflow (recommended for CI)
+- Install Playwright browsers (default: yes)
+
+You can re-run the command later; it does not overwrite existing tests.
 
-Run the install command and select the following to get started:
- - Choose between TypeScript or JavaScript (default is TypeScript)
- - Name of your Tests folder (default is tests or e2e if you already have a tests folder in your project)
- - Add a GitHub Actions workflow to easily run tests on CI
- - Install Playwright browsers (default is true)
+### Using the VS Code Extension
+
+You can also create and run tests with the [VS Code Extension](./getting-started-vscode.md).
 
 ## What's Installed
 
-Playwright will download the browsers needed as well as create the following files.
+Playwright downloads required browser binaries and creates the scaffold below.
 
 ```bash
-playwright.config.ts
+playwright.config.ts         # Test configuration
 package.json
-package-lock.json
+package-lock.json            # Or yarn.lock / pnpm-lock.yaml
 tests/
-  example.spec.ts
+  example.spec.ts            # Minimal example test
 tests-examples/
-  demo-todo-app.spec.ts
+  demo-todo-app.spec.ts      # Richer example tests
 ```
 
-The [playwright.config](./test-configuration.md) is where you can add configuration for Playwright including modifying which browsers you would like to run Playwright on. If you are running tests inside an already existing project then dependencies will be added directly to your `package.json`.
+The [playwright.config](./test-configuration.md) centralizes configuration: target browsers, timeouts, retries, projects, reporters and more. In existing projects dependencies are added to your current `package.json`.
 
-The `tests` folder contains a basic example test to help you get started with testing. For a more detailed example check out the `tests-examples` folder which contains tests written to test a todo app.
+`tests/` contains a minimal starter test. `tests-examples/` provides richer samples (e.g. a todo app) to explore patterns.
 
 ## Running the Example Test
 
-By default tests will be run on all 3 browsers, chromium, firefox and webkit using 3 workers. This can be configured in the [playwright.config file](./test-configuration.md). Tests are run in headless mode meaning no browser will open up when running the tests. Results of the tests and test logs will be shown in the terminal.
+By default tests run headless in parallel across Chromium, Firefox and WebKit (configurable in [playwright.config](./test-configuration.md)). Output and aggregated results display in the terminal.
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -116,14 +126,22 @@ pnpm exec playwright test
 
 </Tabs>
 
-![tests running in command line](https://github.com/microsoft/playwright/assets/13063165/981c1b2b-dc7e-4b85-b241-272b44da6628) 
-See our doc on [Running Tests](./running-tests.md) to learn more about running tests in headed mode, running multiple tests, running specific tests etc.
+![tests running in command line](./images/getting-started/run-tests-cli.png)
+
+Tips:
+- See the browser window: add `--headed`.
+- Run a single project/browser: `--project=chromium`.
+- Run one file: `npx playwright test tests/example.spec.ts`.
+- Open testing UI: `--ui`.
+
+See [Running Tests](./running-tests.md) for details on filtering, headed mode, sharding and retries.
 
 ## HTML Test Reports
 
-After your test completes, an [HTML Reporter](./test-reporters.md#html-reporter) will be generated, which shows you a full report of your tests allowing you to filter the report by browsers, passed tests, failed tests, skipped tests and flaky tests. You can click on each test and explore the test's errors as well as each step of the test. By default, the HTML report is opened automatically if some of the tests failed.
+After a test run, the [HTML Reporter](./test-reporters.md#html-reporter) provides a dashboard filterable by the browser, passed, failed, skipped, flaky and more. Click a test to inspect errors, attachments and steps. It auto-opens only when failures occur; open manually with the command below.
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -157,13 +175,14 @@ pnpm exec playwright show-report
 
 </Tabs>
 
-![HTML Report](https://github.com/microsoft/playwright/assets/13063165/38ec17a7-9e61-4002-b137-a93812765501)
+![HTML Report](./images/getting-started/html-report-basic.png)
 
 ## Running the Example Test in UI Mode
 
-Run your tests with [UI Mode](./test-ui-mode.md) for a better developer experience with time travel debugging, watch mode and more.
+Run tests with [UI Mode](./test-ui-mode.md) for watch mode, live step view, time travel debugging and more.
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -198,15 +217,16 @@ pnpm exec playwright test --ui
 
 </Tabs>
 
-![UI Mode](https://github.com/microsoft/playwright/assets/13063165/c5b501cc-4f5d-485a-87cc-66044c651786)
+![UI Mode](./images/getting-started/ui-mode.png)
 
-Check out or [detailed guide on UI Mode](./test-ui-mode.md) to learn more about its features.
+See the [detailed guide on UI Mode](./test-ui-mode.md) for watch filters, step details and trace integration.
 
 ## Updating Playwright
 
-To update Playwright to the latest version run the following command:
+Update Playwright and download new browser binaries and their dependencies:
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -219,7 +239,6 @@ To update Playwright to the latest version run the following command:
 
 ```bash
 npm install -D @playwright/test@latest
-# Also download new browser binaries and their dependencies:
 npx playwright install --with-deps
 ```
 
@@ -229,7 +248,6 @@ npx playwright install --with-deps
 
 ```bash
 yarn add --dev @playwright/test@latest
-# Also download new browser binaries and their dependencies:
 yarn playwright install --with-deps
 ```
 
@@ -239,7 +257,6 @@ yarn playwright install --with-deps
 
 ```bash
 pnpm install --save-dev @playwright/test@latest
-# Also download new browser binaries and their dependencies:
 pnpm exec playwright install --with-deps
 ```
 
@@ -247,9 +264,10 @@ pnpm exec playwright install --with-deps
 
 </Tabs>
 
-You can always check which version of Playwright you have by running the following command:
+Check your installed version:
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -286,14 +304,14 @@ pnpm exec playwright --version
 
 ## System requirements
 
-- Node.js 18+
+- Node.js: latest 20.x, 22.x or 24.x.
 - Windows 10+, Windows Server 2016+ or Windows Subsystem for Linux (WSL).
-- macOS 13 Ventura, or macOS 14 Sonoma.
-- Debian 11, Debian 12, Ubuntu 20.04 or Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
+- macOS 14 (Ventura) or later.
+- Debian 12 / 13, Ubuntu 22.04 / 24.04 (x86-64 or arm64).
 
 ## What's next
 
-- [Write tests using web first assertions, page fixtures and locators](./writing-tests.md)
-- [Run single test, multiple tests, headed mode](./running-tests.md)
+- [Write tests using web-first assertions, fixtures and locators](./writing-tests.md)
+- [Run single or multiple tests; headed mode](./running-tests.md)
 - [Generate tests with Codegen](./codegen-intro.md)
-- [See a trace of your tests](./trace-viewer-intro.md)
+- [View a trace of your tests](./trace-viewer-intro.md)
diff --git a/docs/src/intro-python.md b/docs/src/intro-python.md
index 3d17c2077d4c3..b85fad8361c28 100644
--- a/docs/src/intro-python.md
+++ b/docs/src/intro-python.md
@@ -101,8 +101,8 @@ pip install pytest-playwright playwright -U
 
 - Python 3.8 or higher.
 - Windows 10+, Windows Server 2016+ or Windows Subsystem for Linux (WSL).
-- macOS 13 Ventura, or macOS 14 Sonoma.
-- Debian 11, Debian 12, Ubuntu 20.04 or Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
+- macOS 14 Ventura, or later.
+- Debian 12, Debian 13, Ubuntu 22.04, Ubuntu 24.04, on x86-64 and arm64 architecture.
 
 ## What's next
 
diff --git a/docs/src/junit-java.md b/docs/src/junit-java.md
index 7ea43399ddae1..ef6afcb5fde7b 100644
--- a/docs/src/junit-java.md
+++ b/docs/src/junit-java.md
@@ -10,8 +10,6 @@ With a few lines of code, you can hook up Playwright to your favorite Java test
 In [JUnit](https://junit.org/junit5/), you can use Playwright [fixtures](./junit.md#fixtures) to automatically initialize [Playwright], [Browser], [BrowserContext] or [Page]. In the example below, all three test methods use the same
 [Browser]. Each test uses its own [BrowserContext] and [Page].
 
-<!-- TOC -->
-
 ```java
 package org.example;
 
diff --git a/docs/src/languages.md b/docs/src/languages.md
index 050c1597b3f6a..1ddc36469e99d 100644
--- a/docs/src/languages.md
+++ b/docs/src/languages.md
@@ -30,7 +30,7 @@ You can choose any testing framework such as JUnit or TestNG based on your proje
 
 ## .NET
 
-Playwright for .NET comes with [MSTest base classes](https://playwright.dev/dotnet/docs/test-runners#mstest) and [NUnit base classes](https://playwright.dev/dotnet/docs/test-runners#nunit) for writing end-to-end tests.
+Playwright for .NET comes with MSTest, NUnit, xUnit, and xUnit v3 [base classes](https://playwright.dev/dotnet/docs/test-runners) for writing end-to-end tests.
 
 * [Documentation](https://playwright.dev/dotnet/docs/intro)
 * [GitHub repo](https://github.com/microsoft/playwright-dotnet)
diff --git a/docs/src/library-csharp.md b/docs/src/library-csharp.md
index c659cbf1eea16..0efc5b7035764 100644
--- a/docs/src/library-csharp.md
+++ b/docs/src/library-csharp.md
@@ -5,7 +5,7 @@ title: "Getting started - Library"
 
 ## Introduction
 
-Playwright can either be used with the [MSTest](./test-runners.md#mstest) or [NUnit](./test-runners.md#nunit), or as a Playwright Library (this guide). If you are working on an application that utilizes Playwright capabilities or you are using Playwright with another test runner, read on.
+Playwright can either be used with the [MSTest, NUnit, xUnit, or xUnit v3 base classes](./test-runners.md) or as a Playwright Library (this guide). If you are working on an application that utilizes Playwright capabilities or you are using Playwright with another test runner, read on.
 
 ## Usage
 
@@ -48,7 +48,7 @@ Now run it.
 dotnet run
 ```
 
-By default, Playwright runs the browsers in headless mode. To see the browser UI, pass the `Headless = false` flag while launching the browser. You can also use [`option: slowMo`] to slow down execution. Learn more in the debugging tools [section](./debug.md).
+By default, Playwright runs the browsers in headless mode. To see the browser UI, set [`option: BrowserType.launch.headless`] option to `false`. You can also use [`option: BrowserType.launch.slowMo`] to slow down execution. Learn more in the debugging tools [section](./debug.md).
 
 ```csharp
 await using var browser = await playwright.Firefox.LaunchAsync(new()
diff --git a/docs/src/library-js.md b/docs/src/library-js.md
index 9085290bbab45..46eadfced4136 100644
--- a/docs/src/library-js.md
+++ b/docs/src/library-js.md
@@ -105,6 +105,7 @@ The key differences to note are as follows:
 | `import` from | `playwright` | `@playwright/test` |
 | Initialization | Explicitly need to: <ol><li>Pick a browser to use, e.g. `chromium`</li><li>Launch browser with [`method: BrowserType.launch`]</li><li>Create a context with [`method: Browser.newContext`], <em>and</em> pass any context options explicitly, e.g. `devices['iPhone 11']`</li><li>Create a page with [`method: BrowserContext.newPage`]</li></ol> | An isolated `page` and `context` are provided to each test out-of the box, along with other [built-in fixtures](./test-fixtures.md#built-in-fixtures). No explicit creation. If referenced by the test in its arguments, the Test Runner will create them for the test. (i.e. lazy-initialization) |
 | Assertions | No built-in Web-First Assertions | [Web-First assertions](./test-assertions.md) like: <ul><li>[`method: PageAssertions.toHaveTitle`]</li><li>[`method: PageAssertions.toHaveScreenshot#1`]</li></ul> which auto-wait and retry for the condition to be met.|
+| Timeouts | Defaults to 30s for most operations. | Most operations don't time out, but every test has a timeout that makes it fail (30s by default). |
 | Cleanup | Explicitly need to: <ol><li>Close context with [`method: BrowserContext.close`]</li><li>Close browser with [`method: Browser.close`]</li></ol> | No explicit close of [built-in fixtures](./test-fixtures.md#built-in-fixtures); the Test Runner will take care of it.
 | Running | When using the Library, you run the code as a node script, possibly with some compilation first. | When using the Test Runner, you use the `npx playwright test` command. Along with your [config](./test-configuration.md), the Test Runner handles any compilation and choosing what to run and how to run it. |
 
diff --git a/docs/src/library-python.md b/docs/src/library-python.md
index 8391ea92ef02d..605cb9798f76a 100644
--- a/docs/src/library-python.md
+++ b/docs/src/library-python.md
@@ -38,7 +38,7 @@ from playwright.sync_api import sync_playwright
 with sync_playwright() as p:
     browser = p.chromium.launch()
     page = browser.new_page()
-    page.goto("http://playwright.dev")
+    page.goto("https://playwright.dev")
     print(page.title())
     browser.close()
 ```
@@ -53,7 +53,7 @@ async def main():
     async with async_playwright() as p:
         browser = await p.chromium.launch()
         page = await browser.new_page()
-        await page.goto("http://playwright.dev")
+        await page.goto("https://playwright.dev")
         print(await page.title())
         await browser.close()
 
@@ -75,7 +75,7 @@ with sync_playwright() as p:
     browser.close()
 ```
 
-By default, Playwright runs the browsers in headless mode. To see the browser UI, pass the `headless=False` flag while launching the browser. You can also use [`option: slowMo`] to slow down execution. Learn more in the debugging tools [section](./debug.md).
+By default, Playwright runs the browsers in headless mode. To see the browser UI, set [`option: BrowserType.launch.headless`] option to `False`. You can also use [`option: BrowserType.launch.slowMo`] to slow down execution. Learn more in the debugging tools [section](./debug.md).
 
 ```py
 firefox.launch(headless=False, slow_mo=50)
diff --git a/docs/src/locators.md b/docs/src/locators.md
index 8ade71efb7faf..b0a1c0e8f5aac 100644
--- a/docs/src/locators.md
+++ b/docs/src/locators.md
@@ -62,11 +62,11 @@ expect(page.get_by_text("Welcome, John!")).to_be_visible()
 ```
 
 ```csharp
-await page.GetByLabel("User Name").FillAsync("John");
+await Page.GetByLabel("User Name").FillAsync("John");
 
-await page.GetByLabel("Password").FillAsync("secret-password");
+await Page.GetByLabel("Password").FillAsync("secret-password");
 
-await page.GetByRole(AriaRole.Button, new() { Name = "Sign in" }).ClickAsync();
+await Page.GetByRole(AriaRole.Button, new() { Name = "Sign in" }).ClickAsync();
 
 await Expect(Page.GetByText("Welcome, John!")).ToBeVisibleAsync();
 ```
@@ -101,7 +101,7 @@ page.get_by_role("button", name="Sign in").click()
 ```
 
 ```csharp
-await page.GetByRole(AriaRole.Button, new() { Name = "Sign in" }).ClickAsync();
+await Page.GetByRole(AriaRole.Button, new() { Name = "Sign in" }).ClickAsync();
 ```
 
 :::note
@@ -122,7 +122,7 @@ await locator.click();
 
 ```java
 Locator locator = page.getByRole(AriaRole.BUTTON,
-                                 new Page.GetByRoleOptions().setName("Sign in"))
+                                 new Page.GetByRoleOptions().setName("Sign in"));
 
 locator.hover();
 locator.click();
@@ -143,7 +143,7 @@ locator.click()
 ```
 
 ```csharp
-var locator = page.GetByRole(AriaRole.Button, new() { Name = "Sign in" });
+var locator = Page.GetByRole(AriaRole.Button, new() { Name = "Sign in" });
 
 await locator.HoverAsync();
 await locator.ClickAsync();
@@ -180,7 +180,7 @@ locator.click()
 ```
 
 ```csharp
-var locator = page
+var locator = Page
     .FrameLocator("#my-frame")
     .GetByRole(AriaRole.Button, new() { Name = "Sign in" });
 
@@ -249,11 +249,11 @@ await Expect(Page
     .GetByRole(AriaRole.Heading, new() { Name = "Sign up" }))
     .ToBeVisibleAsync();
 
-await page
+await Page
     .GetByRole(AriaRole.Checkbox, new() { Name = "Subscribe" })
     .CheckAsync();
 
-await page
+await Page
     .GetByRole(AriaRole.Button, new() {
         NameRegex = new Regex("submit", RegexOptions.IgnoreCase)
     })
@@ -298,7 +298,7 @@ page.get_by_label("Password").fill("secret")
 ```
 
 ```csharp
-await page.GetByLabel("Password").FillAsync("secret");
+await Page.GetByLabel("Password").FillAsync("secret");
 ```
 
 :::note[When to use label locators]
@@ -335,7 +335,7 @@ page.get_by_placeholder("name@example.com").fill("playwright@microsoft.com")
 ```
 
 ```csharp
-await page
+await Page
     .GetByPlaceholder("name@example.com")
     .FillAsync("playwright@microsoft.com");
 ```
@@ -468,7 +468,7 @@ page.get_by_alt_text("playwright logo").click()
 ```
 
 ```csharp
-await page.GetByAltText("playwright logo").ClickAsync();
+await Page.GetByAltText("playwright logo").ClickAsync();
 ```
 
 :::note[When to use alt locators]
@@ -540,7 +540,7 @@ page.get_by_test_id("directions").click()
 ```
 
 ```csharp
-await page.GetByTestId("directions").ClickAsync();
+await Page.GetByTestId("directions").ClickAsync();
 ```
 
 :::note[When to use testid locators]
@@ -604,7 +604,7 @@ page.get_by_test_id("directions").click()
 ```
 
 ```csharp
-await page.GetByTestId("directions").ClickAsync();
+await Page.GetByTestId("directions").ClickAsync();
 ```
 
 ### Locate by CSS or XPath
@@ -644,11 +644,11 @@ page.locator("//button").click()
 ```
 
 ```csharp
-await page.Locator("css=button").ClickAsync();
-await page.Locator("xpath=//button").ClickAsync();
+await Page.Locator("css=button").ClickAsync();
+await Page.Locator("xpath=//button").ClickAsync();
 
-await page.Locator("button").ClickAsync();
-await page.Locator("//button").ClickAsync();
+await Page.Locator("button").ClickAsync();
+await Page.Locator("//button").ClickAsync();
 ```
 
 XPath and CSS selectors can be tied to the DOM structure or implementation. These selectors can break when the DOM structure changes. Long CSS or XPath chains below are an example of a **bad practice** that leads to unstable tests:
@@ -688,9 +688,9 @@ page.locator('//*[@id="tsf"]/div[2]/div[1]/div[1]/div/div[2]/input').click()
 ```
 
 ```csharp
-await page.Locator("#tsf > div:nth-child(2) > div.A8SBwf > div.RNNXgb > div > div.a4bIc > input").ClickAsync();
+await Page.Locator("#tsf > div:nth-child(2) > div.A8SBwf > div.RNNXgb > div > div.a4bIc > input").ClickAsync();
 
-await page.Locator("//*[@id='tsf']/div[2]/div[1]/div[1]/div/div[2]/input").ClickAsync();
+await Page.Locator("//*[@id='tsf']/div[2]/div[1]/div[1]/div/div[2]/input").ClickAsync();
 ```
 
 :::note[When to use this]
@@ -751,10 +751,10 @@ page.locator("x-details", new Page.LocatorOptions().setHasText("Details"))
     .click();
 ```
 ```python async
-await page.locator("x-details", has_text="Details" ).click()
+await page.locator("x-details", has_text="Details").click()
 ```
 ```python sync
-page.locator("x-details", has_text="Details" ).click()
+page.locator("x-details", has_text="Details").click()
 ```
 ```csharp
 await page
@@ -946,7 +946,7 @@ page.getByRole(AriaRole.LISTITEM)
         .setName("Product 2"))))
     .getByRole(AriaRole.BUTTON,
                new Page.GetByRoleOptions().setName("Add to cart"))
-    .click()
+    .click();
 ```
 
 ```python async
@@ -987,7 +987,7 @@ assertThat(page
     .getByRole(AriaRole.LISTITEM)
     .filter(new Locator.FilterOptions()
         .setHas(page.GetByRole(AriaRole.HEADING,
-                               new Page.GetByRoleOptions().setName("Product 2"))))
+                               new Page.GetByRoleOptions().setName("Product 2")))))
     .hasCount(1);
 ```
 
@@ -1033,7 +1033,7 @@ assertThat(page
     .filter(new Locator.FilterOptions()
         .setHas(page.GetByRole(AriaRole.LIST)
                     .GetByRole(AriaRole.HEADING,
-                               new Page.GetByRoleOptions().setName("Product 2"))))
+                               new Page.GetByRoleOptions().setName("Product 2")))))
     .hasCount(1);
 ```
 
@@ -1079,7 +1079,7 @@ await expect(page
 ```java
 assertThat(page
     .getByRole(AriaRole.LISTITEM)
-    .filter(new Locator.FilterOptions().setHasNot(page.getByText("Product 2")))
+    .filter(new Locator.FilterOptions().setHasNot(page.getByText("Product 2"))))
     .hasCount(1);
 ```
 
@@ -1218,7 +1218,7 @@ var button = page.GetByRole(AriaRole.Button).And(page.GetByTitle("Subscribe"));
 
 ### Matching one of the two alternative locators
 
-If you'd like to target one of the two or more elements, and you don't know which one it will be, use [`method: Locator.or`] to create a locator that matches all of the alternatives.
+If you'd like to target one of the two or more elements, and you don't know which one it will be, use [`method: Locator.or`] to create a locator that matches any one or both of the alternatives.
 
 For example, consider a scenario where you'd like to click on a "New email" button, but sometimes a security settings dialog shows up instead. In this case, you can wait for either a "New email" button, or a dialog and act accordingly.
 
@@ -1310,19 +1310,19 @@ Consider a page with two buttons, the first invisible and the second [visible](.
 * This will only find a second button, because it is visible, and then click it.
 
   ```js
-  await page.locator('button').locator('visible=true').click();
+  await page.locator('button').filter({ visible: true }).click();
   ```
   ```java
-  page.locator("button").locator("visible=true").click();
+  page.locator("button").filter(new Locator.FilterOptions.setVisible(true)).click();
   ```
   ```python async
-  await page.locator("button").locator("visible=true").click()
+  await page.locator("button").filter(visible=True).click()
   ```
   ```python sync
-  page.locator("button").locator("visible=true").click()
+  page.locator("button").filter(visible=True).click()
   ```
   ```csharp
-  await page.Locator("button").Locator("visible=true").ClickAsync();
+  await page.Locator("button").Filter(new() { Visible = true }).ClickAsync();
   ```
 
 ## Lists
@@ -1356,7 +1356,7 @@ expect(page.get_by_role("listitem")).to_have_count(3)
 ```
 
 ```java
-assertThat(page.getByRole(AriaRole.LISTITEM).hasCount(3);
+assertThat(page.getByRole(AriaRole.LISTITEM)).hasCount(3);
 ```
 
 ```csharp
diff --git a/docs/src/mock-browser-js.md b/docs/src/mock-browser-js.md
index 9647e0a1511c0..4f62eb9250d98 100644
--- a/docs/src/mock-browser-js.md
+++ b/docs/src/mock-browser-js.md
@@ -9,8 +9,6 @@ Playwright provides native support for most of the browser features. However, th
 and APIs which are not (yet) fully supported by all browsers. Playwright usually doesn't provide dedicated
 automation APIs in such cases. You can use mocks to test the behavior of your application in such cases. This guide gives a few examples.
 
-## Introduction
-
 Let's consider a web app that uses [battery API](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getBattery)
 to show your device's battery status. We'll mock the battery API and check that the page correctly displays the
 battery status.
diff --git a/docs/src/mock.md b/docs/src/mock.md
index bd0c4e5c54a84..eab111fd3d91d 100644
--- a/docs/src/mock.md
+++ b/docs/src/mock.md
@@ -195,15 +195,15 @@ await Expect(page.GetByTextAsync("Loquat", new () { Exact = true })).ToBeVisible
 page.route("*/**/api/v1/fruits", route -> {
   Response response = route.fetch();
   byte[] json = response.body();
-  parsed = new Gson().fromJson(json, JsonObject.class)
+  JsonObject parsed = new Gson().fromJson(new String(json), JsonObject.class);
   parsed.add(new JsonObject().add("name", "Loquat").add("id", 100));
   // Fulfill using the original response, while patching the response body
   // with the given JSON object.
-  route.fulfill(new Route.FulfillOptions().setResponse(response).setBody(json.toString()));
+  route.fulfill(new Route.FulfillOptions().setResponse(response).setBody(parsed.toString()));
 });
 
 // Go to the page
-page.goto("https://demo.playwright.dev/api-mocking");
+page.navigate("https://demo.playwright.dev/api-mocking");
 
 // Assert that the Loquat fruit is visible
 assertThat(page.getByText("Loquat", new Page.GetByTextOptions().setExact(true))).isVisible();
@@ -232,6 +232,16 @@ The options object can contain the URL so that only requests with the URL matchi
 
 Setting `update` option to true will create or update the HAR file with the actual network information instead of serving the requests from the HAR file. Use it when creating a test to populate the HAR with real data.
 
+#### 
+* langs: js
+
+Alternatively, you can also record HAR files by using the [`option: Browser.newContext.recordHar`] option in [`method: Browser.newContext`] when creating a browser context. This allows you to capture all network traffic for the entire context until the context is closed.
+
+#### 
+* langs: csharp, java, python
+
+Alternatively, you can also record HAR files by using the [`option: Browser.newContext.recordHarPath`] option in [`method: Browser.newContext`] when creating a browser context. This allows you to capture all network traffic for the entire context until the context is closed.
+
 ```js
 test('records or updates the HAR file', async ({ page }) => {
   // Get the response from the HAR file
@@ -288,13 +298,13 @@ await Expect(page.GetByText("Strawberry")).ToBeVisibleAsync();
 
 ```java
 // Get the response from the HAR file
-page.routeFromHAR("./hars/fruit.har", new RouteFromHAROptions()
+page.routeFromHAR(Path.of("./hars/fruit.har"), new RouteFromHAROptions()
   .setUrl("*/**/api/v1/fruits")
   .setUpdate(true)
 );
 
 // Go to the page
-page.goto("https://demo.playwright.dev/api-mocking");
+page.navigate("https://demo.playwright.dev/api-mocking");
 
 // Assert that the fruit is visible
 assertThat(page.getByText("Strawberry")).isVisible();
@@ -386,16 +396,17 @@ await page.ExpectByTextAsync("Playwright", new() { Exact = true }).ToBeVisibleAs
 // Replay API requests from HAR.
 // Either use a matching response from the HAR,
 // or abort the request if nothing matches.
-page.routeFromHAR("./hars/fruit.har", new RouteFromHAROptions()
+page.routeFromHAR(Path.of("./hars/fruit.har"), new RouteFromHAROptions()
   .setUrl("*/**/api/v1/fruits")
   .setUpdate(false)
 );
 
 // Go to the page
-page.goto("https://demo.playwright.dev/api-mocking");
+page.navigate("https://demo.playwright.dev/api-mocking");
 
 // Assert that the Playwright fruit is visible
-assertThat(page.getByText("Playwright", new Page.GetByTextOptions().setExact(true))).isVisible();
+assertThat(page.getByText("Playwright", new Page.GetByTextOptions()
+  .setExact(true))).isVisible();
 ```
 In the trace of our test we can see that the route was fulfilled from the HAR file and the API was not called.
 ![trace showing the HAR file being used](https://github.com/microsoft/playwright/assets/13063165/1bd7ab66-ea4f-43c2-a4e5-ca17d4837ff1)
@@ -434,3 +445,122 @@ pwsh bin/Debug/netX/playwright.ps1 open --save-har=example.har --save-har-glob="
 ```
 
 Read more about [advanced networking](./network.md).
+
+## Mock WebSockets
+
+The following code will intercept WebSocket connections and mock entire communication over the WebSocket, instead of connecting to the server. This example responds to a `"request"` with a `"response"`.
+
+```js
+await page.routeWebSocket('wss://example.com/ws', ws => {
+  ws.onMessage(message => {
+    if (message === 'request')
+      ws.send('response');
+  });
+});
+```
+
+```java
+page.routeWebSocket("wss://example.com/ws", ws -> {
+  ws.onMessage(frame -> {
+    if ("request".equals(frame.text()))
+      ws.send("response");
+  });
+});
+```
+
+```python async
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+await page.route_web_socket("wss://example.com/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+```python sync
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+page.route_web_socket("wss://example.com/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+```csharp
+await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
+  ws.OnMessage(frame => {
+    if (frame.Text == "request")
+      ws.Send("response");
+  });
+});
+```
+
+Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block them. Here is an example that modifies some of the messages sent by the page to the server, and leaves the rest unmodified.
+
+```js
+await page.routeWebSocket('wss://example.com/ws', ws => {
+  const server = ws.connectToServer();
+  ws.onMessage(message => {
+    if (message === 'request')
+      server.send('request2');
+    else
+      server.send(message);
+  });
+});
+```
+
+```java
+page.routeWebSocket("wss://example.com/ws", ws -> {
+  WebSocketRoute server = ws.connectToServer();
+  ws.onMessage(frame -> {
+    if ("request".equals(frame.text()))
+      server.send("request2");
+    else
+      server.send(frame.text());
+  });
+});
+```
+
+```python async
+def message_handler(server: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    server.send("request2")
+  else:
+    server.send(message)
+
+def handler(ws: WebSocketRoute):
+  server = ws.connect_to_server()
+  ws.on_message(lambda message: message_handler(server, message))
+
+await page.route_web_socket("wss://example.com/ws", handler)
+```
+
+```python sync
+def message_handler(server: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    server.send("request2")
+  else:
+    server.send(message)
+
+def handler(ws: WebSocketRoute):
+  server = ws.connect_to_server()
+  ws.on_message(lambda message: message_handler(server, message))
+
+page.route_web_socket("wss://example.com/ws", handler)
+```
+
+```csharp
+await page.RouteWebSocketAsync("wss://example.com/ws", ws => {
+  var server = ws.ConnectToServer();
+  ws.OnMessage(frame => {
+    if (frame.Text == "request")
+      server.Send("request2");
+    else
+      server.Send(frame.Text);
+  });
+});
+```
+
+For more details, see [WebSocketRoute].
diff --git a/docs/src/network.md b/docs/src/network.md
index f1fbc620b3eb1..6d0c676d6eaf3 100644
--- a/docs/src/network.md
+++ b/docs/src/network.md
@@ -10,7 +10,7 @@ Playwright provides APIs to **monitor** and **modify** browser network traffic,
 
 ## Mock APIs
 
-Check out our [API mocking guide](./mock.md) to learn more on how to 
+Check out our [API mocking guide](./mock.md) to learn more on how to
 - mock API requests and never hit the API
 - perform the API request and modify the response
 - use HAR files to mock network requests.
@@ -115,8 +115,7 @@ await page.GotoAsync("https://example.com");
 You can configure pages to load over the HTTP(S) proxy or SOCKSv5. Proxy can be either set globally
 for the entire browser, or for each browser context individually.
 
-You can optionally specify username and password for HTTP(S) proxy, you can also specify hosts to
-bypass proxy for.
+You can optionally specify username and password for HTTP(S) proxy, you can also specify hosts to bypass the [`option: Browser.newContext.proxy`] for.
 
 Here is an example of a global proxy:
 
@@ -146,8 +145,8 @@ const browser = await chromium.launch({
 ```java
 Browser browser = chromium.launch(new BrowserType.LaunchOptions()
   .setProxy(new Proxy("http://myproxy.com:3128")
-  .setUsername('usr')
-  .setPassword('pwd'));
+  .setUsername("usr")
+  .setPassword("pwd")));
 ```
 
 ```python async
@@ -179,60 +178,48 @@ await using var browser = await BrowserType.LaunchAsync(new()
 });
 ```
 
-When specifying proxy for each context individually, **Chromium on Windows** needs a hint that proxy will be set. This is done via passing a non-empty proxy server to the browser itself. Here is an example of a context-specific proxy:
+Its also possible to specify it per context:
 
-```js tab=js-test title="playwright.config.ts"
-import { defineConfig } from '@playwright/test';
-export default defineConfig({
-  use: {
-    launchOptions: {
-      // Browser proxy option is required for Chromium on Windows.
-      proxy: { server: 'per-context' }
-    },
+```js tab=js-test title="example.spec.ts"
+import { test, expect } from '@playwright/test';
+
+test('should use custom proxy on a new context', async ({ browser }) => {
+  const context = await browser.newContext({
     proxy: {
       server: 'http://myproxy.com:3128',
     }
-  }
+  });
+  const page = await context.newPage();
+
+  await context.close();
 });
 ```
 
 ```js tab=js-library
-const browser = await chromium.launch({
-  // Browser proxy option is required for Chromium on Windows.
-  proxy: { server: 'per-context' }
-});
+const browser = await chromium.launch();
 const context = await browser.newContext({
   proxy: { server: 'http://myproxy.com:3128' }
 });
 ```
 
 ```java
-Browser browser = chromium.launch(new BrowserType.LaunchOptions()
-  // Browser proxy option is required for Chromium on Windows.
-  .setProxy(new Proxy("per-context"));
-BrowserContext context = chromium.launch(new Browser.NewContextOptions()
-  .setProxy(new Proxy("http://myproxy.com:3128"));
+Browser browser = chromium.launch();
+BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+  .setProxy(new Proxy("http://myproxy.com:3128")));
 ```
 
 ```python async
-# Browser proxy option is required for Chromium on Windows.
-browser = await chromium.launch(proxy={"server": "per-context"})
+browser = await chromium.launch()
 context = await browser.new_context(proxy={"server": "http://myproxy.com:3128"})
 ```
 
 ```python sync
-# Browser proxy option is required for Chromium on Windows.
-browser = chromium.launch(proxy={"server": "per-context"})
+browser = chromium.launch()
 context = browser.new_context(proxy={"server": "http://myproxy.com:3128"})
 ```
 
 ```csharp
-var proxy = new Proxy { Server = "per-context" };
-await using var browser = await BrowserType.LaunchAsync(new()
-{
-    // Browser proxy option is required for Chromium on Windows.
-    Proxy = proxy
-});
+await using var browser = await BrowserType.LaunchAsync();
 await using var context = await browser.NewContextAsync(new()
 {
     Proxy = new Proxy { Server = "http://myproxy.com:3128" },
@@ -639,7 +626,7 @@ page.route("**/title.html", route -> {
   String body = response.text();
   body = body.replace("<title>", "<title>My prefix:");
   Map<String, String> headers = response.headers();
-  headers.put("content-type": "text/html");
+  headers.put("content-type", "text/html");
   route.fulfill(new Route.FulfillOptions()
     // Pass all fields from the response.
     .setResponse(response)
@@ -712,9 +699,34 @@ await Page.RouteAsync("**/title.html", async route =>
 });
 ```
 
+## Glob URL patterns
+
+Playwright uses simplified glob patterns for URL matching in network interception methods like [`method: Page.route`] or [`method: Page.waitForResponse`]. These patterns support basic wildcards:
+
+1. Asterisks:
+  - A single `*` matches any characters except `/`
+  - A double `**` matches any characters including `/`
+1. Question mark `?` matches only question mark `?`. If you want to match any character, use `*` instead.
+1. Curly braces `{}` can be used to match a list of options separated by commas `,`
+1. Backslash `\` can be used to escape any of special characters (note to escape backslash itself as `\\`)
+
+Examples:
+- `https://example.com/*.js` matches `https://example.com/file.js` but not `https://example.com/path/file.js`
+- `https://example.com/?page=1` matches `https://example.com/?page=1` but not `https://example.com`
+- `**/*.js` matches both `https://example.com/file.js` and `https://example.com/path/file.js`
+- `**/*.{png,jpg,jpeg}` matches all image requests
+
+Important notes:
+
+- The glob pattern must match the entire URL, not just a part of it.
+- When using globs for URL matching, consider the full URL structure, including the protocol and path separators.
+- For more complex matching requirements, consider using [RegExp] instead of glob patterns.
+
 ## WebSockets
 
-Playwright supports [WebSockets](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) inspection out of the box. Every time a WebSocket is created, the [`event: Page.webSocket`] event is fired. This event contains the [WebSocket] instance for further web socket frames inspection:
+Playwright supports [WebSockets](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) inspection, mocking and modifying out of the box. See our [API mocking guide](./mock.md#mock-websockets) to learn how to mock WebSockets.
+
+Every time a WebSocket is created, the [`event: Page.webSocket`] event is fired. This event contains the [WebSocket] instance for further web socket frames inspection:
 
 ```js
 page.on('websocket', ws => {
diff --git a/docs/src/pom.md b/docs/src/pom.md
index 983598a2c2825..6dcc683802726 100644
--- a/docs/src/pom.md
+++ b/docs/src/pom.md
@@ -5,7 +5,7 @@ title: "Page object models"
 
 ## Introduction
 
-Large test suites can be structured to optimize ease of authoring and maintenance. Page object models are one such approach to structure your test suite. 
+Large test suites can be structured to optimize ease of authoring and maintenance. Page object models are one such approach to structure your test suite.
 
 A page object represents a part of your web application. An e-commerce web application might have a home page, a listings page and a checkout page. Each of them can be represented by page object models.
 
@@ -16,43 +16,7 @@ Page objects **simplify authoring** by creating a higher-level API which suits y
 
 We will create a `PlaywrightDevPage` helper class to encapsulate common operations on the `playwright.dev` page. Internally, it will use the `page` object.
 
-```js tab=js-js title="playwright-dev-page.js"
-const { expect } = require('@playwright/test');
-
-exports.PlaywrightDevPage = class PlaywrightDevPage {
-
-  /**
-   * @param {import('@playwright/test').Page} page
-   */
-  constructor(page) {
-    this.page = page;
-    this.getStartedLink = page.locator('a', { hasText: 'Get started' });
-    this.gettingStartedHeader = page.locator('h1', { hasText: 'Installation' });
-    this.pomLink = page.locator('li', {
-      hasText: 'Guides',
-    }).locator('a', {
-      hasText: 'Page Object Model',
-    });
-    this.tocList = page.locator('article div.markdown ul > li > a');
-  }
-
-  async goto() {
-    await this.page.goto('https://playwright.dev');
-  }
-
-  async getStarted() {
-    await this.getStartedLink.first().click();
-    await expect(this.gettingStartedHeader).toBeVisible();
-  }
-
-  async pageObjectModel() {
-    await this.getStarted();
-    await this.pomLink.click();
-  }
-};
-```
-
-```js tab=js-ts title="playwright-dev-page.ts"
+```js tab=js-test title="playwright-dev-page.ts"
 import { expect, type Locator, type Page } from '@playwright/test';
 
 export class PlaywrightDevPage {
@@ -121,35 +85,7 @@ module.exports = { PlaywrightDevPage };
 
 Now we can use the `PlaywrightDevPage` class in our tests.
 
-```js tab=js-js title="example.spec.js"
-const { test, expect } = require('@playwright/test');
-const { PlaywrightDevPage } = require('./playwright-dev-page');
-
-test('getting started should contain table of contents', async ({ page }) => {
-  const playwrightDev = new PlaywrightDevPage(page);
-  await playwrightDev.goto();
-  await playwrightDev.getStarted();
-  await expect(playwrightDev.tocList).toHaveText([
-    `How to install Playwright`,
-    `What's Installed`,
-    `How to run the example test`,
-    `How to open the HTML test report`,
-    `Write tests using web first assertions, page fixtures and locators`,
-    `Run single test, multiple tests, headed mode`,
-    `Generate tests with Codegen`,
-    `See a trace of your tests`
-  ]);
-});
-
-test('should show Page Object Model article', async ({ page }) => {
-  const playwrightDev = new PlaywrightDevPage(page);
-  await playwrightDev.goto();
-  await playwrightDev.pageObjectModel();
-  await expect(page.locator('article')).toContainText('Page Object Model is a common pattern');
-});
-```
-
-```js tab=js-ts title="example.spec.ts"
+```js tab=js-test title="example.spec.ts"
 import { test, expect } from '@playwright/test';
 import { PlaywrightDevPage } from './playwright-dev-page';
 
@@ -289,7 +225,7 @@ Page objects can then be used inside a test.
 ```java
 import models.SearchPage;
 import com.microsoft.playwright.*;
-...
+// ...
 
 // In the test
 Page page = browser.newPage();
diff --git a/docs/src/release-notes-csharp.md b/docs/src/release-notes-csharp.md
index df1d45cd2cd96..f954e68cffca6 100644
--- a/docs/src/release-notes-csharp.md
+++ b/docs/src/release-notes-csharp.md
@@ -4,6 +4,406 @@ title: "Release notes"
 toc_max_heading_level: 2
 ---
 
+## Version 1.55
+
+### Codegen
+
+- Automatic `ToBeVisibleAsync()` assertions: Codegen can now generate automatic `ToBeVisibleAsync()` assertions for common UI interactions. This feature can be enabled in the Codegen settings UI.
+
+### Breaking Changes
+
+- ⚠️ Dropped support for Chromium extension manifest v2.
+
+### Miscellaneous
+
+- Added support for Debian 13 "Trixie".
+- Added support for Xunit v3 as part of [`Microsoft.Playwright.Xunit.v3`](https://www.nuget.org/packages/Microsoft.Playwright.Xunit.v3)
+- Added support for MSTest v4 as part of [`Microsoft.Playwright.MSTest.v4`](https://www.nuget.org/packages/Microsoft.Playwright.MSTest.v4)
+
+### Browser Versions
+
+- Chromium 140.0.7339.16
+- Mozilla Firefox 141.0
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 139
+- Microsoft Edge 139
+
+## Version 1.54
+
+### Highlights
+
+- New cookie property `PartitionKey` in [`method: BrowserContext.cookies`] and [`method: BrowserContext.addCookies`]. This property allows to save and restore partitioned cookies. See [CHIPS MDN article](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies) for more information. Note that browsers have different support and defaults for cookie partitioning.
+
+- New option `--user-data-dir` in multiple commands. You can specify the same user data dir to reuse browsing state, like authentication, between sessions.
+  ```bash
+  pwsh bin/Debug/netX/playwright.ps1 codegen --user-data-dir=./user-data
+  ```
+
+- `pwsh bin/Debug/netX/playwright.ps1 open` does not open the test recorder anymore. Use `pwsh bin/Debug/netX/playwright.ps1 codegen` instead.
+
+### Browser Versions
+
+- Chromium 139.0.7258.5
+- Mozilla Firefox 140.0.2
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 140
+- Microsoft Edge 140
+
+## Version 1.53
+
+### Trace Viewer and HTML Reporter Updates
+
+- New Steps in Trace Viewer:
+  ![New Trace Viewer Steps](https://github.com/user-attachments/assets/1963ff7d-4070-41be-a79b-4333176921a2)
+- New method [`method: Locator.describe`] to describe a locator. Used for trace viewer.
+  ```csharp
+  var button = Page.GetByTestId("btn-sub").Describe("Subscribe button");
+  await button.ClickAsync();
+  ```
+- `pwsh bin/Debug/netX/playwright.ps1 install --list` will now list all installed browsers, versions and locations.
+
+### Browser Versions
+
+- Chromium 138.0.7204.4
+- Mozilla Firefox 139.0
+- WebKit 18.5
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 137
+- Microsoft Edge 137
+
+## Version 1.52
+
+### Highlights
+
+- New method [`method: LocatorAssertions.toContainClass`] to ergonomically assert individual class names on the element.
+
+  ```csharp
+    await Expect(Page.GetByRole(AriaRole.Listitem, new() { Name = "Ship v1.52" })).ToContainClassAsync("done");
+  ```
+
+- [Aria Snapshots](./aria-snapshots.md) got two new properties: [`/children`](./aria-snapshots.md#strict-matching) for strict matching and `/url` for links.
+
+  ```csharp
+  await Expect(locator).ToMatchAriaSnapshotAsync(@"
+    - list
+      - /children: equal
+      - listitem: Feature A
+      - listitem:
+        - link ""Feature B"":
+          - /url: ""https://playwright.dev""
+  ");
+  ```
+
+### Miscellaneous
+
+- New option [`option: APIRequest.newContext.maxRedirects`] in [`method: APIRequest.newContext`] to control the maximum number of redirects.
+
+### Breaking Changes
+
+- Glob URL patterns in methods like [`method: Page.route`] do not support `?` and `[]` anymore. We recommend using regular expressions instead.
+- Method [`method: Route.continue`] does not allow to override the `Cookie` header anymore. If a `Cookie` header is provided, it will be ignored, and the cookie will be loaded from the browser's cookie store. To set custom cookies, use [`method: BrowserContext.addCookies`].
+- macOS 13 is now deprecated and will no longer receive WebKit updates. Please upgrade to a more recent macOS version to continue benefiting from the latest WebKit improvements.
+
+### Browser Versions
+
+- Chromium 136.0.7103.25
+- Mozilla Firefox 137.0
+- WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 135
+- Microsoft Edge 135
+
+## Version 1.51
+
+### Highlights
+
+* New option [`option: BrowserContext.storageState.indexedDB`] for [`method: BrowserContext.storageState`] allows to save and restore IndexedDB contents. Useful when your application uses [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) to store authentication tokens, like Firebase Authentication.
+
+  Here is an example following the [authentication guide](./auth.md#reusing-signed-in-state):
+
+  ```csharp
+  // Save storage state into the file. Make sure to include IndexedDB.
+  await context.StorageStateAsync(new()
+  {
+      Path = "../../../playwright/.auth/state.json",
+      IndexedDB = true
+  });
+
+  // Create a new context with the saved storage state.
+  var context = await browser.NewContextAsync(new()
+  {
+      StorageStatePath = "../../../playwright/.auth/state.json"
+  });
+  ```
+
+* New option [`option: Locator.filter.visible`] for [`method: Locator.filter`] allows matching only visible elements.
+
+  ```csharp
+  // Ignore invisible todo items.
+  var todoItems = Page.GetByTestId("todo-item").Filter(new() { Visible = true });
+  // Check there are exactly 3 visible ones.
+  await Expect(todoItems).ToHaveCountAsync(3);
+  ```
+
+* New option `Contrast` for methods [`method: Page.emulateMedia`] and [`method: Browser.newContext`] allows to emulate the `prefers-contrast` media feature.
+
+* New option [`option: APIRequest.newContext.failOnStatusCode`] makes all fetch requests made through the [APIRequestContext] throw on response codes other than 2xx and 3xx.
+
+### Browser Versions
+
+* Chromium 134.0.6998.35
+* Mozilla Firefox 135.0
+* WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 133
+* Microsoft Edge 133
+
+
+## Version 1.50
+
+### Support for Xunit
+
+* Support for xUnit 2.8+ via [Microsoft.Playwright.Xunit](https://www.nuget.org/packages/Microsoft.Playwright.Xunit). Follow our [Getting Started](./intro.md) guide to learn more.
+
+### Miscellaneous
+
+* Added method [`method: LocatorAssertions.toHaveAccessibleErrorMessage`] to assert the Locator points to an element with a given [aria errormessage](https://w3c.github.io/aria/#aria-errormessage).
+
+### UI updates
+
+* New button in Codegen for picking elements to produce aria snapshots.
+* Additional details (such as keys pressed) are now displayed alongside action API calls in traces.
+* Display of `canvas` content in traces is error-prone. Display is now disabled by default, and can be enabled via the `Display canvas content` UI setting.
+* `Call` and `Network` panels now display additional time information.
+
+### Breaking
+
+* [`method: LocatorAssertions.toBeEditable`] and [`method: Locator.isEditable`] now throw if the target element is not `<input>`, `<select>`, or a number of other editable elements.
+
+### Browser Versions
+
+* Chromium 133.0.6943.16
+* Mozilla Firefox 134.0
+* WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 132
+* Microsoft Edge 132
+
+## Version 1.49
+
+### Aria snapshots
+
+New assertion [`method: LocatorAssertions.toMatchAriaSnapshot`] verifies page structure by comparing to an expected accessibility tree, represented as YAML.
+
+```csharp
+await page.GotoAsync("https://playwright.dev");
+await Expect(page.Locator("body")).ToMatchAriaSnapshotAsync(@"
+  - banner:
+    - heading /Playwright enables reliable/ [level=1]
+    - link ""Get started""
+    - link ""Star microsoft/playwright on GitHub""
+  - main:
+    - img ""Browsers (Chromium, Firefox, WebKit)""
+    - heading ""Any browser • Any platform • One API""
+");
+```
+
+You can generate this assertion with [Test Generator](./codegen) or by calling [`method: Locator.ariaSnapshot`].
+
+Learn more in the [aria snapshots guide](./aria-snapshots).
+
+### Tracing groups
+
+New method [`method: Tracing.group`] allows you to visually group actions in the trace viewer.
+
+```csharp
+// All actions between GroupAsync and GroupEndAsync
+// will be shown in the trace viewer as a group.
+await Page.Context.Tracing.GroupAsync("Open Playwright.dev > API");
+await Page.GotoAsync("https://playwright.dev/");
+await Page.GetByRole(AriaRole.Link, new() { Name = "API" }).ClickAsync();
+await Page.Context.Tracing.GroupEndAsync();
+```
+
+### Breaking: `chrome` and `msedge` channels switch to new headless mode
+
+This change affects you if you're using one of the following channels in your `playwright.config.ts`:
+- `chrome`, `chrome-dev`, `chrome-beta`, or `chrome-canary`
+- `msedge`, `msedge-dev`, `msedge-beta`, or `msedge-canary`
+
+After updating to Playwright v1.49, run your test suite. If it still passes, you're good to go. If not, you will probably need to update your snapshots, and adapt some of your test code around PDF viewers and extensions. See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for more details.
+
+### Try new Chromium headless
+
+You can opt into the new headless mode by using `'chromium'` channel. As [official Chrome documentation puts it](https://developer.chrome.com/blog/chrome-headless-shell):
+
+> New Headless on the other hand is the real Chrome browser, and is thus more authentic, reliable, and offers more features. This makes it more suitable for high-accuracy end-to-end web app testing or browser extension testing.
+
+See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for the list of possible breakages you could encounter and more details on Chromium headless. Please file an issue if you see any problems after opting in.
+
+```xml csharp title="runsettings.xml"
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <Playwright>
+    <BrowserName>chromium</BrowserName>
+    <LaunchOptions>
+      <Channel>chromium</Channel>
+    </LaunchOptions>
+  </Playwright>
+</RunSettings>
+```
+
+```bash csharp
+dotnet test -- Playwright.BrowserName=chromium Playwright.LaunchOptions.Channel=chromium
+```
+
+### Miscellaneous
+
+- There will be no more updates for WebKit on Ubuntu 20.04 and Debian 11. We recommend updating your OS to a later version.
+- `<canvas>` elements inside a snapshot now draw a preview.
+
+### Browser Versions
+
+- Chromium 131.0.6778.33
+- Mozilla Firefox 132.0
+- WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 130
+- Microsoft Edge 130
+
+
+## Version 1.48
+
+### WebSocket routing
+
+New methods [`method: Page.routeWebSocket`] and [`method: BrowserContext.routeWebSocket`] allow to intercept, modify and mock WebSocket connections initiated in the page. Below is a simple example that mocks WebSocket communication by responding to a `"request"` with a `"response"`.
+
+```csharp
+await page.RouteWebSocketAsync("/ws", ws => {
+  ws.OnMessage(frame => {
+    if (frame.Text == "request")
+      ws.Send("response");
+  });
+});
+```
+
+See [WebSocketRoute] for more details.
+
+### UI updates
+
+- New "copy" buttons for annotations and test location in the HTML report.
+- Route method calls like [`method: Route.fulfill`] are not shown in the report and trace viewer anymore. You can see which network requests were routed in the network tab instead.
+- New "Copy as cURL" and "Copy as fetch" buttons for requests in the network tab.
+
+### Miscellaneous
+
+- New method [`method: Page.requestGC`] may help detect memory leaks.
+- Requests made by [APIRequestContext] now record detailed timing and security information in the HAR.
+
+### Browser Versions
+
+- Chromium 130.0.6723.19
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 129
+- Microsoft Edge 129
+
+
+## Version 1.47
+
+### Network Tab improvements
+
+The Network tab in the trace viewer has several nice improvements:
+
+- filtering by asset type and URL
+- better display of query string parameters
+- preview of font assets
+
+![Network tab now has filters](https://github.com/user-attachments/assets/4bd1b67d-90bd-438b-a227-00b9e86872e2)
+
+### Miscellaneous
+
+- The `mcr.microsoft.com/playwright/dotnet:v1.47.0` now serves a Playwright image based on Ubuntu 24.04 Noble.
+  To use the 22.04 jammy-based image, please use `mcr.microsoft.com/playwright/dotnet:v1.47.0-jammy` instead.
+- The `:latest`/`:focal`/`:jammy` tag for Playwright Docker images is no longer being published. Pin to a specific version for better stability and reproducibility.
+- TLS client certificates can now be passed from memory by passing [`option: Browser.newContext.clientCertificates.cert`] and [`option: Browser.newContext.clientCertificates.key`] as byte arrays instead of file paths.
+- [`option: Locator.selectOption.noWaitAfter`] in [`method: Locator.selectOption`] was deprecated.
+- We've seen reports of WebGL in Webkit misbehaving on GitHub Actions `macos-13`. We recommend upgrading GitHub Actions to `macos-14`.
+
+### Browser Versions
+
+- Chromium 129.0.6668.29
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 128
+- Microsoft Edge 128
+
+## Version 1.46
+
+### TLS Client Certificates
+
+Playwright now allows to supply client-side certificates, so that server can verify them, as specified by TLS Client Authentication.
+
+You can provide client certificates as a parameter of [`method: Browser.newContext`] and [`method: APIRequest.newContext`]. The following snippet sets up a client certificate for `https://example.com`:
+
+```csharp
+var context = await Browser.NewContextAsync(new() {
+  ClientCertificates = [
+    new() {
+      Origin = "https://example.com",
+      CertPath = "client-certificates/cert.pem",
+      KeyPath = "client-certificates/key.pem",
+    }
+  ]
+});
+```
+
+### Trace Viewer Updates
+
+- Content of text attachments is now rendered inline in the attachments pane.
+- New setting to show/hide routing actions like [`method: Route.continue`].
+- Request method and status are shown in the network details tab.
+- New button to copy source file location to clipboard.
+- Metadata pane now displays the `BaseURL`.
+
+### Miscellaneous
+
+- New `maxRetries` option in [`method: APIRequestContext.fetch`] which retries on the `ECONNRESET` network error.
+
+### Browser Versions
+
+- Chromium 128.0.6613.18
+- Mozilla Firefox 128.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 127
+- Microsoft Edge 127
+
+
 ## Version 1.45
 
 ### Clock
@@ -112,7 +512,6 @@ await Page.RemoveLocatorHandlerAsync(locator);
 **Miscellaneous options**
 
 - New method [`method: FormData.append`] allows to specify repeating fields with the same name in [`Multipart`](./api/class-apirequestcontext#api-request-context-fetch-option-multipart) option in `APIRequestContext.FetchAsync()`:
-- ```
   ```csharp
   var formData = Context.APIRequest.CreateFormData();
   formData.Append("file", new FilePayload()
@@ -209,7 +608,7 @@ await Expect(Page.GetByRole(AriaRole.Heading, new() { Name = "Light and easy" })
 
 ### New APIs
 
-- [`method: Page.pdf`] accepts two new options [`option: tagged`] and [`option: outline`].
+- [`method: Page.pdf`] accepts two new options [`option: Page.pdf.tagged`] and [`option: Page.pdf.outline`].
 
 ### Announcements
 
@@ -232,7 +631,7 @@ This version was also tested against the following stable channels:
 
 - New method [`method: Page.unrouteAll`] removes all routes registered by [`method: Page.route`] and [`method: Page.routeFromHAR`]. Optionally allows to wait for ongoing routes to finish, or ignore any errors from them.
 - New method [`method: BrowserContext.unrouteAll`] removes all routes registered by [`method: BrowserContext.route`] and [`method: BrowserContext.routeFromHAR`]. Optionally allows to wait for ongoing routes to finish, or ignore any errors from them.
-- New option [`option: style`] in [`method: Page.screenshot`] and [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
+- New options [`option: Page.screenshot.style`] in [`method: Page.screenshot`] and [`option: Locator.screenshot.style`] in [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
 
 ### Browser Versions
 
@@ -270,8 +669,8 @@ await Expect(Page.GetByPlaceholder("Search docs")).ToHaveValueAsync("locator");
 
 ### New APIs
 
-- Option [`option: reason`] in [`method: Page.close`], [`method: BrowserContext.close`] and [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
-- Option [`option: firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
+- Options [`option: Page.close.reason`] in [`method: Page.close`], [`option: BrowserContext.close.reason`] in [`method: BrowserContext.close`] and [`option: Browser.close.reason`] in [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
+- Option [`option: BrowserType.launchPersistentContext.firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
 
 ### Other Changes
 
@@ -442,7 +841,7 @@ This version was also tested against the following stable channels:
       await Page.GetByRole(AriaRole.Button, new() { Name = "Dismiss" }).ClickAsync();
     await newEmail.ClickAsync();
     ```
-* Use new options [`option: hasNot`] and [`option: hasNotText`] in [`method: Locator.filter`]
+* Use new options [`option: Locator.filter.hasNot`] and [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
   to find elements that **do not match** certain conditions.
 
     ```csharp
@@ -459,10 +858,10 @@ This version was also tested against the following stable channels:
 ### New APIs
 
 - [`method: Locator.or`]
-- New option [`option: hasNot`] in [`method: Locator.filter`]
-- New option [`option: hasNotText`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNot`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
 - [`method: LocatorAssertions.toBeAttached`]
-- New option [`option: timeout`] in [`method: Route.fetch`]
+- New option [`option: Route.fetch.timeout`] in [`method: Route.fetch`]
 
 ### ⚠️ Breaking change
 
@@ -485,9 +884,9 @@ This version was also tested against the following stable channels:
 
 ### New APIs
 
-- New options [`option: updateMode`] and [`option: updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
+- New options [`option: Page.routeFromHAR.updateMode`] and [`option: Page.routeFromHAR.updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
 - Chaining existing locator objects, see [locator docs](./locators.md#matching-inside-a-locator) for details.
-- New option [`option: name`] in method [`method: Tracing.startChunk`].
+- New option [`option: Tracing.startChunk.name`] in method [`method: Tracing.startChunk`].
 
 ### Browser Versions
 
@@ -592,9 +991,9 @@ This version was also tested against the following stable channels:
 
   ```html
   <select multiple>
-    <option value="red">Red</div>
-    <option value="green">Green</div>
-    <option value="blue">Blue</div>
+    <option value="red">Red</option>
+    <option value="green">Green</option>
+    <option value="blue">Blue</option>
   </select>
   ```
 
@@ -672,7 +1071,7 @@ All the same methods are also available on [Locator], [FrameLocator] and [Frame]
 - [`method: LocatorAssertions.toHaveAttribute`] with an empty value does not match missing attribute anymore. For example, the following snippet will succeed when `button` **does not** have a `disabled` attribute.
 
    ```csharp
-   await Expect(Page.GetByRole(AriaRole.Button)).ToHaveAttribute("disabled", "");
+   await Expect(Page.GetByRole(AriaRole.Button)).ToHaveAttributeAsync("disabled", "");
    ```
 
 ### Browser Versions
diff --git a/docs/src/release-notes-java.md b/docs/src/release-notes-java.md
index 3980a1b0cf687..ed8d74746afb2 100644
--- a/docs/src/release-notes-java.md
+++ b/docs/src/release-notes-java.md
@@ -4,6 +4,380 @@ title: "Release notes"
 toc_max_heading_level: 2
 ---
 
+## Version 1.55
+
+### Codegen
+
+- Automatic `isVisible()` assertions: Codegen can now generate automatic `isVisible()` assertions for common UI interactions. This feature can be enabled in the Codegen settings UI.
+
+### Breaking Changes
+
+- ⚠️ Dropped support for Chromium extension manifest v2.
+
+### Miscellaneous
+
+- Added support for Debian 13 "Trixie".
+
+### Browser Versions
+
+- Chromium 140.0.7339.16
+- Mozilla Firefox 141.0
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 139
+- Microsoft Edge 139
+
+## Version 1.54
+
+### Highlights
+
+- New cookie property `partitionKey` in [`method: BrowserContext.cookies`] and [`method: BrowserContext.addCookies`]. This property allows to save and restore partitioned cookies. See [CHIPS MDN article](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies) for more information. Note that browsers have different support and defaults for cookie partitioning.
+
+- New option `--user-data-dir` in multiple commands. You can specify the same user data dir to reuse browsing state, like authentication, between sessions.
+  ```bash
+  mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="codegen --user-data-dir=./user-data"
+  ```
+
+- `mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args=open` command does not open the test recorder anymore. Use `mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args=codegen` instead.
+
+### Browser Versions
+
+- Chromium 139.0.7258.5
+- Mozilla Firefox 140.0.2
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 140
+- Microsoft Edge 140
+
+## Version 1.53
+
+### Trace Viewer and HTML Reporter Updates
+
+- New Steps in Trace Viewer:
+  ![New Trace Viewer Steps](https://github.com/user-attachments/assets/1963ff7d-4070-41be-a79b-4333176921a2)
+- New method [`method: Locator.describe`] to describe a locator. Used for trace viewer.
+  ```java
+  Locator button = page.getByTestId("btn-sub").describe("Subscribe button");
+  button.click();
+  ```
+- `mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --list"` will now list all installed browsers, versions and locations.
+
+### Browser Versions
+
+- Chromium 138.0.7204.4
+- Mozilla Firefox 139.0
+- WebKit 18.5
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 137
+- Microsoft Edge 137
+
+## Version 1.52
+
+### Highlights
+
+- New method [`method: LocatorAssertions.toContainClass`] to ergonomically assert individual class names on the element.
+
+  ```java
+    assertThat(page.getByRole(AriaRole.LISTITEM, new Page.GetByRoleOptions().setName("Ship v1.52"))).containsClass("done");
+  ```
+
+- [Aria Snapshots](./aria-snapshots.md) got two new properties: [`/children`](./aria-snapshots.md#strict-matching) for strict matching and `/url` for links.
+
+  ```java
+  assertThat(locator).toMatchAriaSnapshot("""
+    - list
+      - /children: equal
+      - listitem: Feature A
+      - listitem:
+        - link "Feature B":
+          - /url: "https://playwright.dev"
+  """);
+  ```
+
+### Miscellaneous
+
+- New option [`option: APIRequest.newContext.maxRedirects`] in [`method: APIRequest.newContext`] to control the maximum number of redirects.
+
+### Breaking Changes
+
+- Glob URL patterns in methods like [`method: Page.route`] do not support `?` and `[]` anymore. We recommend using regular expressions instead.
+- Method [`method: Route.continue`] does not allow to override the `Cookie` header anymore. If a `Cookie` header is provided, it will be ignored, and the cookie will be loaded from the browser's cookie store. To set custom cookies, use [`method: BrowserContext.addCookies`].
+- macOS 13 is now deprecated and will no longer receive WebKit updates. Please upgrade to a more recent macOS version to continue benefiting from the latest WebKit improvements.
+
+### Browser Versions
+
+- Chromium 136.0.7103.25
+- Mozilla Firefox 137.0
+- WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 135
+- Microsoft Edge 135
+
+## Version 1.51
+
+### Highlights
+
+* New option [`option: BrowserContext.storageState.indexedDB`] for [`method: BrowserContext.storageState`] allows to save and restore IndexedDB contents. Useful when your application uses [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) to store authentication tokens, like Firebase Authentication.
+
+  Here is an example following the [authentication guide](./auth.md#reusing-signed-in-state):
+
+  ```java
+  // Save storage state into the file. Make sure to include IndexedDB.
+  context.storageState(new BrowserContext.StorageStateOptions()
+      .setPath(Paths.get("state.json"))
+      .setIndexedDB(true));
+
+  // Create a new context with the saved storage state.
+  BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setStorageStatePath(Paths.get("state.json")));
+  ```
+
+* New option [`option: Locator.filter.visible`] for [`method: Locator.filter`] allows matching only visible elements.
+
+  ```java
+  // Ignore invisible todo items.
+  Locator todoItems = page.getByTestId("todo-item")
+      .filter(new Locator.FilterOptions().setVisible(true));
+  // Check there are exactly 3 visible ones.
+  assertThat(todoItems).hasCount(3);
+  ```
+
+* New option `setContrast` for methods [`method: Page.emulateMedia`] and [`method: Browser.newContext`] allows to emulate the `prefers-contrast` media feature.
+
+* New option [`option: APIRequest.newContext.failOnStatusCode`] makes all fetch requests made through the [APIRequestContext] throw on response codes other than 2xx and 3xx.
+
+### Browser Versions
+
+* Chromium 134.0.6998.35
+* Mozilla Firefox 135.0
+* WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 133
+* Microsoft Edge 133
+
+
+## Version 1.50
+
+### Miscellaneous
+
+* Added method [`method: LocatorAssertions.toHaveAccessibleErrorMessage`] to assert the Locator points to an element with a given [aria errormessage](https://w3c.github.io/aria/#aria-errormessage).
+
+### UI updates
+
+* New button in Codegen for picking elements to produce aria snapshots.
+* Additional details (such as keys pressed) are now displayed alongside action API calls in traces.
+* Display of `canvas` content in traces is error-prone. Display is now disabled by default, and can be enabled via the `Display canvas content` UI setting.
+* `Call` and `Network` panels now display additional time information.
+
+### Breaking
+
+* [`method: LocatorAssertions.toBeEditable`] and [`method: Locator.isEditable`] now throw if the target element is not `<input>`, `<select>`, or a number of other editable elements.
+
+### Browser Versions
+
+* Chromium 133.0.6943.16
+* Mozilla Firefox 134.0
+* WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 132
+* Microsoft Edge 132
+
+## Version 1.49
+
+### Aria snapshots
+
+New assertion [`method: LocatorAssertions.toMatchAriaSnapshot`] verifies page structure by comparing to an expected accessibility tree, represented as YAML.
+
+```java
+page.navigate("https://playwright.dev");
+assertThat(page.locator("body")).matchesAriaSnapshot("""
+  - banner:
+    - heading /Playwright enables reliable/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+  - main:
+    - img "Browsers (Chromium, Firefox, WebKit)"
+    - heading "Any browser • Any platform • One API"
+""");
+```
+
+You can generate this assertion with [Test Generator](./codegen) or by calling [`method: Locator.ariaSnapshot`].
+
+Learn more in the [aria snapshots guide](./aria-snapshots).
+
+### Tracing groups
+
+New method [`method: Tracing.group`] allows you to visually group actions in the trace viewer.
+
+```java
+// All actions between group and groupEnd
+// will be shown in the trace viewer as a group.
+page.context().tracing().group("Open Playwright.dev > API");
+page.navigate("https://playwright.dev/");
+page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("API")).click();
+page.context().tracing().groupEnd();
+```
+
+### Breaking: `chrome` and `msedge` channels switch to new headless mode
+
+This change affects you if you're using one of the following channels in your `playwright.config.ts`:
+- `chrome`, `chrome-dev`, `chrome-beta`, or `chrome-canary`
+- `msedge`, `msedge-dev`, `msedge-beta`, or `msedge-canary`
+
+After updating to Playwright v1.49, run your test suite. If it still passes, you're good to go. If not, you will probably need to update your snapshots, and adapt some of your test code around PDF viewers and extensions. See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for more details.
+
+### Try new Chromium headless
+
+You can opt into the new headless mode by using `'chromium'` channel. As [official Chrome documentation puts it](https://developer.chrome.com/blog/chrome-headless-shell):
+
+> New Headless on the other hand is the real Chrome browser, and is thus more authentic, reliable, and offers more features. This makes it more suitable for high-accuracy end-to-end web app testing or browser extension testing.
+
+See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for the list of possible breakages you could encounter and more details on Chromium headless. Please file an issue if you see any problems after opting in.
+
+```java
+Browser browser = playwright.chromium().launch(new BrowserType.LaunchOptions().setChannel("chromium"));
+```
+
+### Miscellaneous
+
+- There will be no more updates for WebKit on Ubuntu 20.04 and Debian 11. We recommend updating your OS to a later version.
+- `<canvas>` elements inside a snapshot now draw a preview.
+
+### Browser Versions
+
+- Chromium 131.0.6778.33
+- Mozilla Firefox 132.0
+- WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 130
+- Microsoft Edge 130
+
+
+## Version 1.48
+
+### WebSocket routing
+
+New methods [`method: Page.routeWebSocket`] and [`method: BrowserContext.routeWebSocket`] allow to intercept, modify and mock WebSocket connections initiated in the page. Below is a simple example that mocks WebSocket communication by responding to a `"request"` with a `"response"`.
+
+```java
+page.routeWebSocket("/ws", ws -> {
+  ws.onMessage(frame -> {
+    if ("request".equals(frame.text()))
+      ws.send("response");
+  });
+});
+```
+
+See [WebSocketRoute] for more details.
+
+### UI updates
+
+- New "copy" buttons for annotations and test location in the HTML report.
+- Route method calls like [`method: Route.fulfill`] are not shown in the report and trace viewer anymore. You can see which network requests were routed in the network tab instead.
+- New "Copy as cURL" and "Copy as fetch" buttons for requests in the network tab.
+
+### Miscellaneous
+
+- New method [`method: Page.requestGC`] may help detect memory leaks.
+- Requests made by [APIRequestContext] now record detailed timing and security information in the HAR.
+
+### Browser Versions
+
+- Chromium 130.0.6723.19
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 129
+- Microsoft Edge 129
+
+
+## Version 1.47
+
+### Network Tab improvements
+
+The Network tab in the trace viewer has several nice improvements:
+
+- filtering by asset type and URL
+- better display of query string parameters
+- preview of font assets
+
+![Network tab now has filters](https://github.com/user-attachments/assets/4bd1b67d-90bd-438b-a227-00b9e86872e2)
+
+### Miscellaneous
+
+- The `mcr.microsoft.com/playwright/java:v1.47.0` now serves a Playwright image based on Ubuntu 24.04 Noble.
+  To use the 22.02 jammy-based image, please use `mcr.microsoft.com/playwright/java:v1.47.0-jammy` instead.
+- The `:latest`/`:focal`/`:jammy` tag for Playwright Docker images is no longer being published. Pin to a specific version for better stability and reproducibility.
+- TLS client certificates can now be passed from memory by passing [`option: Browser.newContext.clientCertificates.cert`] and [`option: Browser.newContext.clientCertificates.key`] as byte arrays instead of file paths.
+- [`option: Locator.selectOption.noWaitAfter`] in [`method: Locator.selectOption`] was deprecated.
+- We've seen reports of WebGL in Webkit misbehaving on GitHub Actions `macos-13`. We recommend upgrading GitHub Actions to `macos-14`.
+
+### Browser Versions
+
+- Chromium 129.0.6668.29
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 128
+- Microsoft Edge 128
+
+## Version 1.46
+
+### TLS Client Certificates
+
+Playwright now allows to supply client-side certificates, so that server can verify them, as specified by TLS Client Authentication.
+
+You can provide client certificates as a parameter of [`method: Browser.newContext`] and [`method: APIRequest.newContext`]. The following snippet sets up a client certificate for `https://example.com`:
+
+```java
+BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+    .setClientCertificates(asList(new ClientCertificate("https://example.com")
+          .setCertPath(Paths.get("client-certificates/cert.pem"))
+          .setKeyPath(Paths.get("client-certificates/key.pem")))));
+```
+
+### Trace Viewer Updates
+
+- Content of text attachments is now rendered inline in the attachments pane.
+- New setting to show/hide routing actions like [`method: Route.continue`].
+- Request method and status are shown in the network details tab.
+- New button to copy source file location to clipboard.
+- Metadata pane now displays the `baseURL`.
+
+### Miscellaneous
+
+- New `maxRetries` option in [`method: APIRequestContext.fetch`] which retries on the `ECONNRESET` network error.
+
+### Browser Versions
+
+- Chromium 128.0.6613.18
+- Mozilla Firefox 128.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 127
+- Microsoft Edge 127
+
+
 ## Version 1.45
 
 ### Clock
@@ -267,7 +641,7 @@ New method [`method: Page.addLocatorHandler`] registers a callback that will be
 // Setup the handler.
 page.addLocatorHandler(
     page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Hej! You are in control of your cookies.")),
-    () - > {
+    () -> {
         page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Accept all")).click();
     });
 // Write the test as usual.
@@ -278,7 +652,7 @@ assertThat(page.getByRole(AriaRole.HEADING, new Page.GetByRoleOptions().setName(
 
 ### New APIs
 
-- [`method: Page.pdf`] accepts two new options [`option: tagged`] and [`option: outline`].
+- [`method: Page.pdf`] accepts two new options [`option: Page.pdf.tagged`] and [`option: Page.pdf.outline`].
 
 ### Announcements
 
@@ -301,7 +675,7 @@ This version was also tested against the following stable channels:
 
 - New method [`method: Page.unrouteAll`] removes all routes registered by [`method: Page.route`] and [`method: Page.routeFromHAR`].
 - New method [`method: BrowserContext.unrouteAll`] removes all routes registered by [`method: BrowserContext.route`] and [`method: BrowserContext.routeFromHAR`].
-- New option [`option: style`] in [`method: Page.screenshot`] and [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
+- New options [`option: Page.screenshot.style`] in [`method: Page.screenshot`] and [`option: Locator.screenshot.style`] in [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
 
 ### Browser Versions
 
@@ -339,8 +713,8 @@ assertThat(page.getByPlaceholder("Search docs")).hasValue("locator");
 
 ### New APIs
 
-- Option [`option: reason`] in [`method: Page.close`], [`method: BrowserContext.close`] and [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
-- Option [`option: firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
+- Options [`option: Page.close.reason`] in [`method: Page.close`], [`option: BrowserContext.close.reason`] in [`method: BrowserContext.close`] and [`option: Browser.close.reason`] in [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
+- Option [`option: BrowserType.launchPersistentContext.firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
 
 ### Other Changes
 
@@ -526,7 +900,7 @@ This version was also tested against the following stable channels:
       page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Dismiss")).click();
     newEmail.click();
     ```
-* Use new options [`option: hasNot`] and [`option: hasNotText`] in [`method: Locator.filter`]
+* Use new options [`option: Locator.filter.hasNot`] and [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
   to find elements that **do not match** certain conditions.
 
     ```java
@@ -545,10 +919,10 @@ This version was also tested against the following stable channels:
 ### New APIs
 
 - [`method: Locator.or`]
-- New option [`option: hasNot`] in [`method: Locator.filter`]
-- New option [`option: hasNotText`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNot`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
 - [`method: LocatorAssertions.toBeAttached`]
-- New option [`option: timeout`] in [`method: Route.fetch`]
+- New option [`option: Route.fetch.timeout`] in [`method: Route.fetch`]
 
 ### Other highlights
 
@@ -575,9 +949,9 @@ This version was also tested against the following stable channels:
 
 ### New APIs
 
-- New options [`option: updateMode`] and [`option: updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
+- New options [`option: Page.routeFromHAR.updateMode`] and [`option: Page.routeFromHAR.updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
 - Chaining existing locator objects, see [locator docs](./locators.md#matching-inside-a-locator) for details.
-- New option [`option: name`] in method [`method: Tracing.startChunk`].
+- New option [`option: Tracing.startChunk.name`] in method [`method: Tracing.startChunk`].
 
 ### Browser Versions
 
@@ -676,9 +1050,9 @@ This version was also tested against the following stable channels:
 
   ```html
   <select multiple>
-    <option value="red">Red</div>
-    <option value="green">Green</div>
-    <option value="blue">Blue</div>
+    <option value="red">Red</option>
+    <option value="green">Green</option>
+    <option value="blue">Blue</option>
   </select>
   ```
 
@@ -1076,14 +1450,12 @@ Playwright for Java 1.18 introduces [Web-First Assertions](./test-assertions).
 Consider the following example:
 
 ```java
-...
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 
 public class TestExample {
-  ...
   @Test
   void statusBecomesSubmitted() {
-    ...
+    // ...
     page.locator("#submit-button").click();
     assertThat(page.locator(".status")).hasText("Submitted");
   }
@@ -1360,19 +1732,19 @@ button.click("button >> visible=true");
 Traces are recorded using the new [`property: BrowserContext.tracing`] API:
 
 ```java
-Browser browser = chromium.launch();
+Browser browser = playwright.chromium().launch();
 BrowserContext context = browser.newContext();
 
 // Start tracing before creating / navigating a page.
-context.tracing.start(new Tracing.StartOptions()
+context.tracing().start(new Tracing.StartOptions()
   .setScreenshots(true)
-  .setSnapshots(true);
+  .setSnapshots(true));
 
 Page page = context.newPage();
-page.goto("https://playwright.dev");
+page.navigate("https://playwright.dev");
 
 // Stop tracing and export it into a zip archive.
-context.tracing.stop(new Tracing.StopOptions()
+context.tracing().stop(new Tracing.StopOptions()
   .setPath(Paths.get("trace.zip")));
 ```
 
diff --git a/docs/src/release-notes-js.md b/docs/src/release-notes-js.md
index 2b9f485eb06f3..202475742065f 100644
--- a/docs/src/release-notes-js.md
+++ b/docs/src/release-notes-js.md
@@ -6,15 +6,544 @@ toc_max_heading_level: 2
 
 import LiteYouTube from '@site/src/components/LiteYouTube';
 
+## Version 1.55
+
+### New APIs
+
+- New Property [`property: TestStepInfo.titlePath`] Returns the full title path starting from the test file, including test and step titles.
+
+### Codegen
+
+- Automatic `toBeVisible()` assertions: Codegen can now generate automatic `toBeVisible()` assertions for common UI interactions. This feature can be enabled in the Codegen settings UI.
+
+### Breaking Changes
+
+- ⚠️ Dropped support for Chromium extension manifest v2.
+
+### Miscellaneous
+
+- Added support for Debian 13 "Trixie".
+
+### Browser Versions
+
+- Chromium 140.0.7339.16
+- Mozilla Firefox 141.0
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 139
+- Microsoft Edge 139
+
+## Version 1.54
+
+### Highlights
+
+- New cookie property `partitionKey` in [`method: BrowserContext.cookies`] and [`method: BrowserContext.addCookies`]. This property allows to save and restore partitioned cookies. See [CHIPS MDN article](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies) for more information. Note that browsers have different support and defaults for cookie partitioning.
+
+- New option `noSnippets` to disable code snippets in the html report.
+  ```js
+  import { defineConfig } from '@playwright/test';
+
+  export default defineConfig({
+    reporter: [['html', { noSnippets: true }]]
+  });
+  ```
+
+- New property `location` in test annotations, for example in [`property: TestResult.annotations`] and [`property: TestInfo.annotations`]. It shows where the annotation like `test.skip` or `test.fixme` was added.
+
+### Command Line
+
+- New option `--user-data-dir` in multiple commands. You can specify the same user data dir to reuse browsing state, like authentication, between sessions.
+  ```bash
+  npx playwright codegen --user-data-dir=./user-data
+  ```
+
+- Option `-gv` has been removed from the `npx playwright test` command. Use `--grep-invert` instead.
+
+- `npx playwright open` does not open the test recorder anymore. Use `npx playwright codegen` instead.
+
+### Miscellaneous
+
+- Support for Node.js 16 has been removed.
+
+- Support for Node.js 18 has been deprecated, and will be removed in the future.
+
+### Browser Versions
+
+- Chromium 139.0.7258.5
+- Mozilla Firefox 140.0.2
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 140
+- Microsoft Edge 140
+
+## Version 1.53
+
+### Trace Viewer and HTML Reporter Updates
+
+- New Steps in Trace Viewer and HTML reporter:
+  ![New Trace Viewer Steps](https://github.com/user-attachments/assets/1963ff7d-4070-41be-a79b-4333176921a2)
+- New option in `'html'` reporter to set the title of a specific test run:
+  ```js
+  import { defineConfig } from '@playwright/test';
+
+  export default defineConfig({
+    reporter: [['html', { title: 'Custom test run #1028' }]]
+  });
+  ```
+
+### Miscellaneous
+
+- New option [`option: TestInfo.snapshotPath.kind`] in [`method: TestInfo.snapshotPath`] controls which snapshot path template is used.
+- New method [`method: Locator.describe`] to describe a locator. Used for trace viewer and reports.
+  ```js
+  const button = page.getByTestId('btn-sub').describe('Subscribe button');
+  await button.click();
+  ```
+- `npx playwright install --list` will now list all installed browsers, versions and locations.
+
+### Browser Versions
+
+- Chromium 138.0.7204.4
+- Mozilla Firefox 139.0
+- WebKit 18.5
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 137
+- Microsoft Edge 137
+
+## Version 1.52
+
+### Highlights
+
+- New method [`method: LocatorAssertions.toContainClass`] to ergonomically assert individual class names on the element.
+
+  ```ts
+  await expect(page.getByRole('listitem', { name: 'Ship v1.52' })).toContainClass('done');
+  ```
+
+- [Aria Snapshots](./aria-snapshots.md) got two new properties: [`/children`](./aria-snapshots.md#strict-matching) for strict matching and `/url` for links.
+
+  ```ts
+  await expect(locator).toMatchAriaSnapshot(`
+    - list
+      - /children: equal
+      - listitem: Feature A
+      - listitem:
+        - link "Feature B":
+          - /url: "https://playwright.dev"
+  `);
+  ```
+
+### Test Runner
+
+- New property [`property: TestProject.workers`] allows to specify the number of concurrent worker processes to use for a test project. The global limit of property [`property: TestConfig.workers`] still applies.
+- New [`property: TestConfig.failOnFlakyTests`] option to fail the test run if any flaky tests are detected, similarly to `--fail-on-flaky-tests`. This is useful for CI/CD environments where you want to ensure that all tests are stable before deploying.
+- New property [`property: TestResult.annotations`] contains annotations for each test retry.
+
+### Miscellaneous
+
+- New option [`option: APIRequest.newContext.maxRedirects`] in [`method: APIRequest.newContext`] to control the maximum number of redirects.
+- HTML reporter now supports *NOT filtering* via `!@my-tag` or `!my-file.spec.ts` or `!p:my-project`.
+
+### Breaking Changes
+
+- Glob URL patterns in methods like [`method: Page.route`] do not support `?` and `[]` anymore. We recommend using regular expressions instead.
+- Method [`method: Route.continue`] does not allow to override the `Cookie` header anymore. If a `Cookie` header is provided, it will be ignored, and the cookie will be loaded from the browser's cookie store. To set custom cookies, use [`method: BrowserContext.addCookies`].
+- macOS 13 is now deprecated and will no longer receive WebKit updates. Please upgrade to a more recent macOS version to continue benefiting from the latest WebKit improvements.
+
+### Browser Versions
+
+- Chromium 136.0.7103.25
+- Mozilla Firefox 137.0
+- WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 135
+- Microsoft Edge 135
+
+## Version 1.51
+
+### StorageState for indexedDB
+
+* New option [`option: BrowserContext.storageState.indexedDB`] for [`method: BrowserContext.storageState`] allows to save and restore IndexedDB contents. Useful when your application uses [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) to store authentication tokens, like Firebase Authentication.
+
+  Here is an example following the [authentication guide](./auth.md#basic-shared-account-in-all-tests):
+
+  ```js title="tests/auth.setup.ts"
+  import { test as setup, expect } from '@playwright/test';
+  import path from 'path';
+
+  const authFile = path.join(__dirname, '../playwright/.auth/user.json');
+
+  setup('authenticate', async ({ page }) => {
+    await page.goto('/');
+    // ... perform authentication steps ...
+
+    // make sure to save indexedDB
+    await page.context().storageState({ path: authFile, indexedDB: true });
+  });
+  ```
+
+### Copy as prompt
+
+New "Copy prompt" button on errors in the HTML report, trace viewer and UI mode. Click to copy a pre-filled LLM prompt that contains the error message and useful context for fixing the error.
+
+  ![Copy prompt](https://github.com/user-attachments/assets/f3654407-dd6d-4240-9845-0d96df2bf30a)
+
+### Filter visible elements
+
+New option [`option: Locator.filter.visible`] for [`method: Locator.filter`] allows matching only visible elements.
+
+  ```js title="example.spec.ts"
+  test('some test', async ({ page }) => {
+    // Ignore invisible todo items.
+    const todoItems = page.getByTestId('todo-item').filter({ visible: true });
+    // Check there are exactly 3 visible ones.
+    await expect(todoItems).toHaveCount(3);
+  });
+  ```
+
+### Git information in HTML report
+
+Set option [`property: TestConfig.captureGitInfo`] to capture git information into [`property: TestConfig.metadata`].
+
+  ```js title="playwright.config.ts"
+  import { defineConfig } from '@playwright/test';
+
+  export default defineConfig({
+    captureGitInfo: { commit: true, diff: true }
+  });
+  ```
+
+  HTML report will show this information when available:
+
+  ![Git information in the report](https://github.com/user-attachments/assets/f5b3f6f4-aa08-4a24-816c-7edf33ef0c37)
+
+### Test Step improvements
+
+A new [TestStepInfo] object is now available in test steps. You can add step attachments or skip the step under some conditions.
+
+  ```js
+  test('some test', async ({ page, isMobile }) => {
+    // Note the new "step" argument:
+    await test.step('here is my step', async step => {
+      step.skip(isMobile, 'not relevant on mobile layouts');
+
+      // ...
+      await step.attach('my attachment', { body: 'some text' });
+      // ...
+    });
+  });
+  ```
+
+### Miscellaneous
+
+* New option `contrast` for methods [`method: Page.emulateMedia`] and [`method: Browser.newContext`] allows to emulate the `prefers-contrast` media feature.
+* New option [`option: APIRequest.newContext.failOnStatusCode`] makes all fetch requests made through the [APIRequestContext] throw on response codes other than 2xx and 3xx.
+* Assertion [`method: PageAssertions.toHaveURL`] now supports a predicate.
+
+### Browser Versions
+
+* Chromium 134.0.6998.35
+* Mozilla Firefox 135.0
+* WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 133
+* Microsoft Edge 133
+
+
+## Version 1.50
+
+### Test runner
+
+* New option [`option: Test.step.timeout`] allows specifying a maximum run time for an individual test step. A timed-out step will fail the execution of the test.
+
+  ```js
+  test('some test', async ({ page }) => {
+    await test.step('a step', async () => {
+      // This step can time out separately from the test
+    }, { timeout: 1000 });
+  });
+  ```
+
+* New method [`method: Test.step.skip`] to disable execution of a test step.
+
+  ```js
+  test('some test', async ({ page }) => {
+    await test.step('before running step', async () => {
+      // Normal step
+    });
+
+    await test.step.skip('not yet ready', async () => {
+      // This step is skipped
+    });
+
+    await test.step('after running step', async () => {
+      // This step still runs even though the previous one was skipped
+    });
+  });
+  ```
+
+* Expanded [`method: LocatorAssertions.toMatchAriaSnapshot#2`] to allow storing of aria snapshots in separate YAML files.
+* Added method [`method: LocatorAssertions.toHaveAccessibleErrorMessage`] to assert the Locator points to an element with a given [aria errormessage](https://w3c.github.io/aria/#aria-errormessage).
+* Option [`property: TestConfig.updateSnapshots`] added the configuration enum `changed`. `changed` updates only the snapshots that have changed, whereas `all` now updates all snapshots, regardless of whether there are any differences.
+* New option [`property: TestConfig.updateSourceMethod`] defines the way source code is updated when [`property: TestConfig.updateSnapshots`] is configured. Added `overwrite` and `3-way` modes that write the changes into source code, on top of existing `patch` mode that creates a patch file.
+
+  ```bash
+  npx playwright test --update-snapshots=changed --update-source-method=3way
+  ```
+
+* Option [`property: TestConfig.webServer`] added a `gracefulShutdown` field for specifying a process kill signal other than the default `SIGKILL`.
+* Exposed [`property: TestStep.attachments`] from the reporter API to allow retrieval of all attachments created by that step.
+* New option `pathTemplate` for `toHaveScreenshot` and `toMatchAriaSnapshot` assertions in the [`property: TestConfig.expect`] configuration.
+
+### UI updates
+
+* Updated default HTML reporter to improve display of attachments.
+* New button in Codegen for picking elements to produce aria snapshots.
+* Additional details (such as keys pressed) are now displayed alongside action API calls in traces.
+* Display of `canvas` content in traces is error-prone. Display is now disabled by default, and can be enabled via the `Display canvas content` UI setting.
+* `Call` and `Network` panels now display additional time information.
+
+### Breaking
+
+* [`method: LocatorAssertions.toBeEditable`] and [`method: Locator.isEditable`] now throw if the target element is not `<input>`, `<select>`, or a number of other editable elements.
+* Option [`property: TestConfig.updateSnapshots`] now updates all snapshots when set to `all`, rather than only the failed/changed snapshots. Use the new enum `changed` to keep the old functionality of only updating the changed snapshots.
+
+### Browser Versions
+
+* Chromium 133.0.6943.16
+* Mozilla Firefox 134.0
+* WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 132
+* Microsoft Edge 132
+
+## Version 1.49
+
+<LiteYouTube
+  id="S5wCft-ImKk"
+  title="Playwright 1.49"
+/>
+
+### Aria snapshots
+
+New assertion [`method: LocatorAssertions.toMatchAriaSnapshot`] verifies page structure by comparing to an expected accessibility tree, represented as YAML.
+
+```js
+await page.goto('https://playwright.dev');
+await expect(page.locator('body')).toMatchAriaSnapshot(`
+  - banner:
+    - heading /Playwright enables reliable/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+  - main:
+    - img "Browsers (Chromium, Firefox, WebKit)"
+    - heading "Any browser • Any platform • One API"
+`);
+```
+
+You can generate this assertion with [Test Generator](./codegen) and update the expected snapshot with `--update-snapshots` command line flag.
+
+Learn more in the [aria snapshots guide](./aria-snapshots).
+
+### Test runner
+
+- New option [`property: TestConfig.tsconfig`] allows to specify a single `tsconfig` to be used for all tests.
+- New method [`method: Test.fail.only`] to focus on a failing test.
+- Options [`property: TestConfig.globalSetup`] and [`property: TestConfig.globalTeardown`] now support multiple setups/teardowns.
+- New value `'on-first-failure'` for [`property: TestOptions.screenshot`].
+- Added "previous" and "next" buttons to the HTML report to quickly switch between test cases.
+- New properties [`property: TestInfoError.cause`] and [`property: TestError.cause`] mirroring [`Error.cause`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause).
+
+### Breaking: `chrome` and `msedge` channels switch to new headless mode
+
+This change affects you if you're using one of the following channels in your `playwright.config.ts`:
+- `chrome`, `chrome-dev`, `chrome-beta`, or `chrome-canary`
+- `msedge`, `msedge-dev`, `msedge-beta`, or `msedge-canary`
+
+#### What do I need to do?
+
+After updating to Playwright v1.49, run your test suite. If it still passes, you're good to go. If not, you will probably need to update your snapshots, and adapt some of your test code around PDF viewers and extensions. See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for more details.
+
+### Other breaking changes
+
+- There will be no more updates for WebKit on Ubuntu 20.04 and Debian 11. We recommend updating your OS to a later version.
+- Package `@playwright/experimental-ct-vue2` will no longer be updated.
+- Package `@playwright/experimental-ct-solid` will no longer be updated.
+
+### Try new Chromium headless
+
+You can opt into the new headless mode by using `'chromium'` channel. As [official Chrome documentation puts it](https://developer.chrome.com/blog/chrome-headless-shell):
+
+> New Headless on the other hand is the real Chrome browser, and is thus more authentic, reliable, and offers more features. This makes it more suitable for high-accuracy end-to-end web app testing or browser extension testing.
+
+See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for the list of possible breakages you could encounter and more details on Chromium headless. Please file an issue if you see any problems after opting in.
+
+```js
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'], channel: 'chromium' },
+    },
+  ],
+});
+```
+
+### Miscellaneous
+
+- `<canvas>` elements inside a snapshot now draw a preview.
+- New method [`method: Tracing.group`] to visually group actions in the trace.
+- Playwright docker images switched from Node.js v20 to Node.js v22 LTS.
+
+### Browser Versions
+
+- Chromium 131.0.6778.33
+- Mozilla Firefox 132.0
+- WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 130
+- Microsoft Edge 130
+
+
+## Version 1.48
+
+<LiteYouTube
+  id="VGlkSBkMVCQ"
+  title="Playwright 1.48"
+/>
+
+### WebSocket routing
+
+New methods [`method: Page.routeWebSocket`] and [`method: BrowserContext.routeWebSocket`] allow to intercept, modify and mock WebSocket connections initiated in the page. Below is a simple example that mocks WebSocket communication by responding to a `"request"` with a `"response"`.
+
+```js
+await page.routeWebSocket('/ws', ws => {
+  ws.onMessage(message => {
+    if (message === 'request')
+      ws.send('response');
+  });
+});
+```
+
+See [WebSocketRoute] for more details.
+
+### UI updates
+
+- New "copy" buttons for annotations and test location in the HTML report.
+- Route method calls like [`method: Route.fulfill`] are not shown in the report and trace viewer anymore. You can see which network requests were routed in the network tab instead.
+- New "Copy as cURL" and "Copy as fetch" buttons for requests in the network tab.
+
+### Miscellaneous
+
+- Option [`option: APIRequestContext.fetch.form`] and similar ones now accept [FormData](https://developer.mozilla.org/en-US/docs/Web/API/FormData).
+- New method [`method: Page.requestGC`] may help detect memory leaks.
+- New option [`option: Test.step.location`] to pass custom step location.
+- Requests made by [APIRequestContext] now record detailed timing and security information in the HAR.
+
+### Browser Versions
+
+- Chromium 130.0.6723.19
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 129
+- Microsoft Edge 129
+
+
+## Version 1.47
+
+### Network Tab improvements
+
+The Network tab in the UI mode and trace viewer has several nice improvements:
+
+- filtering by asset type and URL
+- better display of query string parameters
+- preview of font assets
+
+![Network tab now has filters](https://github.com/user-attachments/assets/4bd1b67d-90bd-438b-a227-00b9e86872e2)
+
+
+### `--tsconfig` CLI option
+
+By default, Playwright will look up the closest tsconfig for each imported file using a heuristic. You can now specify a single tsconfig file in the command line, and Playwright will use it for all imported files, not only test files:
+
+```sh
+# Pass a specific tsconfig
+npx playwright test --tsconfig tsconfig.test.json
+```
+
+### [APIRequestContext] now accepts [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) and `string` as query parameters
+
+You can now pass [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) and `string` as query parameters to [APIRequestContext]:
+
+```js
+test('query params', async ({ request }) => {
+  const searchParams = new URLSearchParams();
+  searchParams.set('userId', 1);
+  const response = await request.get(
+      'https://jsonplaceholder.typicode.com/posts',
+      {
+        params: searchParams // or as a string: 'userId=1'
+      }
+  );
+  // ...
+});
+```
+
+### Miscellaneous
+
+- The `mcr.microsoft.com/playwright:v1.47.0` now serves a Playwright image based on Ubuntu 24.04 Noble.
+  To use the 22.04 jammy-based image, please use `mcr.microsoft.com/playwright:v1.47.0-jammy` instead.
+- New options [`option: Page.removeAllListeners.behavior`], [`option: Browser.removeAllListeners.behavior`] and [`option: BrowserContext.removeAllListeners.behavior`] to wait for ongoing listeners to complete.
+- TLS client certificates can now be passed from memory by passing [`option: Browser.newContext.clientCertificates.cert`] and [`option: Browser.newContext.clientCertificates.key`] as buffers instead of file paths.
+- Attachments with a `text/html` content type can now be opened in a new tab in the HTML report. This is useful for including third-party reports or other HTML content in the Playwright test report and distributing it to your team.
+- [`option: Locator.selectOption.noWaitAfter`] option in [`method: Locator.selectOption`] was deprecated.
+- We've seen reports of WebGL in Webkit misbehaving on GitHub Actions `macos-13`. We recommend upgrading GitHub Actions to `macos-14`.
+
+### Browser Versions
+
+- Chromium 129.0.6668.29
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 128
+- Microsoft Edge 128
+
 ## Version 1.46
 
+<LiteYouTube
+  id="tQo7w-QQBsI"
+  title="Playwright 1.46"
+/>
+
+
 ### TLS Client Certificates
 
-Playwright now allows to supply client-side certificates, so that server can verify them, as specified by TLS Client Authentication.
+Playwright now allows you to supply client-side certificates, so that server can verify them, as specified by TLS Client Authentication.
 
 The following snippet sets up a client certificate for `https://example.com`:
 
-```ts
+```js
 import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
@@ -33,6 +562,18 @@ export default defineConfig({
 
 You can also provide client certificates to a particular [test project](./api/class-testproject#test-project-use) or as a parameter of [`method: Browser.newContext`] and [`method: APIRequest.newContext`].
 
+### `--only-changed` cli option
+
+New CLI option `--only-changed` will only run test files that have been changed since the last git commit or from a specific git "ref". This will also run all test files that import any changed files.
+
+```sh
+# Only run test files with uncommitted changes
+npx playwright test --only-changed
+
+# Only run test files changed relative to the "main" branch
+npx playwright test --only-changed=main
+```
+
 ### Component Testing: New `router` fixture
 
 This release introduces an experimental `router` fixture to intercept and handle network requests in component testing.
@@ -43,7 +584,7 @@ There are two ways to use the router fixture:
 
 Here is an example of reusing your existing MSW handlers in the test.
 
-```ts
+```js
 import { handlers } from '@src/mocks/handlers';
 
 test.beforeEach(async ({ router }) => {
@@ -59,29 +600,24 @@ test('example test', async ({ mount }) => {
 
 This fixture is only available in [component tests](./test-components#handling-network-requests).
 
-### Test runner
-
-- New CLI option `--only-changed` to only run test files that have been changed since the last commit or from a specific git "ref".
-- New option to [box a fixture](./test-fixtures#box-fixtures) to minimize the fixture exposure in test reports and error messages.
-- New option to provide a [custom fixture title](./test-fixtures#custom-fixture-title) to be used in test reports and error messages.
-
 ### UI Mode / Trace Viewer Updates
 
-- New testing options pane in the UI mode to control test execution, for example "single worker" or "headed browser".
-- New setting to show/hide routing actions like `route.continue`.
+- Test annotations are now shown in UI mode.
+- Content of text attachments is now rendered inline in the attachments pane.
+- New setting to show/hide routing actions like [`method: Route.continue`].
 - Request method and status are shown in the network details tab.
 - New button to copy source file location to clipboard.
-- Content of text attachments is now rendered inline in the attachments pane.
 - Metadata pane now displays the `baseURL`.
 
 ### Miscellaneous
 
 - New `maxRetries` option in [`method: APIRequestContext.fetch`] which retries on the `ECONNRESET` network error.
-- Improved link rendering inside annotations and attachments in the html report.
+- New option to [box a fixture](./test-fixtures#box-fixtures) to minimize the fixture exposure in test reports and error messages.
+- New option to provide a [custom fixture title](./test-fixtures#custom-fixture-title) to be used in test reports and error messages.
 
 ### Browser Versions
 
-- Chromium 128.0.6613.7
+- Chromium 128.0.6613.18
 - Mozilla Firefox 128.0
 - WebKit 18.0
 
@@ -141,7 +677,7 @@ See [the clock guide](./clock.md) for more details.
 - New options [`property: TestConfig.respectGitIgnore`] and [`property: TestProject.respectGitIgnore`] control whether files matching `.gitignore` patterns are excluded when searching for tests.
 
 - New property `timeout` is now available for custom expect matchers. This property takes into account `playwright.config.ts` and `expect.configure()`.
-  ```ts
+  ```js
   import { expect as baseExpect } from '@playwright/test';
 
   export const expect = baseExpect.extend({
@@ -156,12 +692,12 @@ See [the clock guide](./clock.md) for more details.
 ### Miscellaneous
 
 - Method [`method: Locator.setInputFiles`] now supports uploading a directory for `<input type=file webkitdirectory>` elements.
-  ```ts
+  ```js
   await page.getByLabel('Upload directory').setInputFiles(path.join(__dirname, 'mydir'));
   ```
 
 - Multiple methods like [`method: Locator.click`] or [`method: Locator.press`] now support a `ControlOrMeta` modifier key. This key maps to `Meta` on macOS and maps to `Control` on Windows and Linux.
-  ```ts
+  ```js
   // Press the common keyboard shortcut Control+S or Meta+S to trigger a "Save" operation.
   await page.keyboard.press('ControlOrMeta+S');
   ```
@@ -414,7 +950,7 @@ test('test customer login', {
 npx playwright test --grep @fast
 ```
 
-- `--project` command line [flag](./test-cli#reference) now supports '*' wildcard:
+- `--project` command line [flag](./test-cli#all-options) now supports '*' wildcard:
 ```sh
 npx playwright test --project='*mobile*'
 ```
@@ -454,7 +990,7 @@ This version was also tested against the following stable channels:
 
 - New method [`method: Page.unrouteAll`] removes all routes registered by [`method: Page.route`] and [`method: Page.routeFromHAR`]. Optionally allows to wait for ongoing routes to finish, or ignore any errors from them.
 - New method [`method: BrowserContext.unrouteAll`] removes all routes registered by [`method: BrowserContext.route`] and [`method: BrowserContext.routeFromHAR`]. Optionally allows to wait for ongoing routes to finish, or ignore any errors from them.
-- New option [`option: style`] in [`method: Page.screenshot`] and [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
+- New options [`option: Page.screenshot.style`] in [`method: Page.screenshot`] and [`option: Locator.screenshot.style`] in [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
 - New option `stylePath` for methods [`method: PageAssertions.toHaveScreenshot#1`] and [`method: LocatorAssertions.toHaveScreenshot#1`] to apply a custom stylesheet while making the screenshot.
 - New `fileName` option for [Blob reporter](./test-reporters#blob-reporter), to specify the name of the report to be created.
 
@@ -503,8 +1039,8 @@ test('test', async ({ page }) => {
 
 ### New APIs
 
-- Option [`option: reason`] in [`method: Page.close`], [`method: BrowserContext.close`] and [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
-- Option [`option: firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
+- Options [`option: Page.close.reason`] in [`method: Page.close`], [`option: BrowserContext.close.reason`] in [`method: BrowserContext.close`] and [`option: Browser.close.reason`] in [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
+- Option [`option: BrowserType.launchPersistentContext.firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
 
 ### Other Changes
 
@@ -973,7 +1509,7 @@ This version was also tested against the following stable channels:
       await page.getByRole('button', { name: 'Dismiss' }).click();
     await newEmail.click();
     ```
-* Use new options [`option: hasNot`] and [`option: hasNotText`] in [`method: Locator.filter`]
+* Use new options [`option: Locator.filter.hasNot`] and [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
   to find elements that **do not match** certain conditions.
 
     ```js
@@ -990,10 +1526,10 @@ This version was also tested against the following stable channels:
 ### New APIs
 
 - [`method: Locator.or`]
-- New option [`option: hasNot`] in [`method: Locator.filter`]
-- New option [`option: hasNotText`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNot`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
 - [`method: LocatorAssertions.toBeAttached`]
-- New option [`option: timeout`] in [`method: Route.fetch`]
+- New option [`option: Route.fetch.timeout`] in [`method: Route.fetch`]
 - [`method: Reporter.onExit`]
 
 ### ⚠️ Breaking change
@@ -1033,10 +1569,10 @@ npx playwright test --ui
 
 ### New APIs
 
-- New options [`option: updateMode`] and [`option: updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
+- New options [`option: Page.routeFromHAR.updateMode`] and [`option: Page.routeFromHAR.updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
 - Chaining existing locator objects, see [locator docs](./locators.md#matching-inside-a-locator) for details.
 - New property [`property: TestInfo.testId`].
-- New option [`option: name`] in method [`method: Tracing.startChunk`].
+- New option [`option: Tracing.startChunk.name`] in method [`method: Tracing.startChunk`].
 
 
 ### ⚠️ Breaking change in component tests
@@ -1216,9 +1752,9 @@ This version was also tested against the following stable channels:
 
   ```html
   <select multiple>
-    <option value="red">Red</div>
-    <option value="green">Green</div>
-    <option value="blue">Blue</div>
+    <option value="red">Red</option>
+    <option value="green">Green</option>
+    <option value="blue">Blue</option>
   </select>
   ```
 
@@ -1470,7 +2006,7 @@ This version was also tested against the following stable channels:
 
 * [`method: Test.step`] now returns the value of the step function:
 
-    ```ts
+    ```js
     test('should work', async ({ page }) => {
       const pageTitle = await test.step('get title', async () => {
         await page.goto('https://playwright.dev');
@@ -1514,7 +2050,7 @@ This version was also tested against the following stable channels:
 
 Launch multiple web servers, databases, or other processes by passing an array of configurations:
 
-```ts title="playwright.config.ts"
+```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
 export default defineConfig({
   webServer: [
@@ -1554,7 +2090,7 @@ Linux support looks like this:
 
 It is now possible to call [`method: Test.describe`] to create suites without a title. This is useful for giving a group of tests a common option with [`method: Test.use`].
 
-```ts
+```js
 test.describe(() => {
   test.use({ colorScheme: 'dark' });
 
@@ -1645,7 +2181,7 @@ npx playwright open --save-har=github.har.zip https://github.com/microsoft
 
 Alternatively, you can record HAR programmatically:
 
-```ts
+```js
 const context = await browser.newContext({
   recordHar: { path: 'github.har.zip' }
 });
@@ -1656,7 +2192,7 @@ await context.close();
 Use the new methods [`method: Page.routeFromHAR`] or [`method: BrowserContext.routeFromHAR`] to serve matching responses from the [HAR](http://www.softwareishard.com/blog/har-12-spec/) file:
 
 
-```ts
+```js
 await context.routeFromHAR('github.har.zip');
 ```
 
@@ -1669,7 +2205,7 @@ You can now use [`method: Route.fallback`] to defer routing to other handlers.
 
 Consider the following example:
 
-```ts
+```js
 // Remove a header from all requests.
 test.beforeEach(async ({ page }) => {
   await page.route('**/*', async route => {
@@ -1706,7 +2242,7 @@ Read more about [component testing with Playwright](./test-components).
 ### Miscellaneous
 
 * If there's a service worker that's in your way, you can now easily disable it with a new context option `serviceWorkers`:
-  ```ts title="playwright.config.ts"
+  ```js title="playwright.config.ts"
   export default {
     use: {
       serviceWorkers: 'block',
@@ -1714,7 +2250,7 @@ Read more about [component testing with Playwright](./test-components).
   };
   ```
 * Using `.zip` path for `recordHar` context option automatically zips the resulting HAR:
-  ```ts
+  ```js
   const context = await browser.newContext({
     recordHar: {
       path: 'github.har.zip',
@@ -1723,7 +2259,7 @@ Read more about [component testing with Playwright](./test-components).
   ```
 * If you intend to edit HAR by hand, consider using the `"minimal"` HAR recording mode
   that only records information that is essential for replaying:
-  ```ts
+  ```js
   const context = await browser.newContext({
     recordHar: {
       path: 'github.har',
@@ -1761,7 +2297,7 @@ WebServer is now considered "ready" if request to the specified url has any of t
 
   Here is what a typical component test looks like:
 
-  ```ts title="App.spec.tsx"
+  ```js title="App.spec.tsx"
   import { test, expect } from '@playwright/experimental-ct-react';
   import App from './App';
 
@@ -1899,7 +2435,7 @@ This version was also tested against the following stable channels:
 
 - Playwright Test now adds [`property: TestConfig.fullyParallel`] mode. By default, Playwright Test parallelizes between files. In fully parallel mode, tests inside a single file are also run in parallel. You can also use `--fully-parallel` command line flag.
 
-  ```ts title="playwright.config.ts"
+  ```js title="playwright.config.ts"
   export default {
     fullyParallel: true,
   };
@@ -1907,7 +2443,7 @@ This version was also tested against the following stable channels:
 
 - [`property: TestProject.grep`] and [`property: TestProject.grepInvert`] are now configurable per project. For example, you can now
   configure smoke tests project using `grep`:
-  ```ts title="playwright.config.ts"
+  ```js title="playwright.config.ts"
   export default {
     projects: [
       {
@@ -2216,7 +2752,7 @@ Now you can:
 
 To do a request on behalf of Playwright's Page, use **new [`property: Page.request`] API**:
 
-```ts
+```js
 import { test, expect } from '@playwright/test';
 
 test('context fetch', async ({ page }) => {
@@ -2228,7 +2764,7 @@ test('context fetch', async ({ page }) => {
 
 To do a stand-alone request from node.js to an API endpoint, use **new [`request` fixture](./api/class-fixtures#fixtures-request)**:
 
-```ts
+```js
 import { test, expect } from '@playwright/test';
 
 test('context fetch', async ({ request }) => {
@@ -2246,7 +2782,7 @@ It is now possible to do response interception by combining [API Testing](./api-
 
 For example, we can blur all the images on the page:
 
-```ts
+```js
 import { test, expect } from '@playwright/test';
 import jimp from 'jimp'; // image processing library
 
@@ -2292,7 +2828,7 @@ Defaults to the `state: 'visible'`.
 
 Comes especially handy when working with lists:
 
-```ts
+```js
 import { test, expect } from '@playwright/test';
 
 test('context fetch', async ({ page }) => {
@@ -2372,7 +2908,7 @@ Its now possible to emulate the `forced-colors` CSS media feature by passing it
 
 #### 🤝 `test.parallel()` run tests in the same file in parallel
 
-```ts
+```js
 test.describe.parallel('group', () => {
   test('runs in parallel 1', async ({ page }) => {
   });
@@ -2497,7 +3033,7 @@ List of all new assertions:
 
 Declares a group of tests that should always be run serially. If one of the tests fails, all subsequent tests are skipped. All tests in a group are retried together.
 
-```ts
+```js
 test.describe.serial('group', () => {
   test('runs first', async ({ page }) => { /* ... */ });
   test('runs second', async ({ page }) => { /* ... */ });
@@ -2510,7 +3046,7 @@ Learn more in the [documentation](./api/class-test#test-describe-serial).
 
 Split long tests into multiple steps using `test.step()` API:
 
-```ts
+```js
 import { test, expect } from '@playwright/test';
 
 test('test', async ({ page }) => {
@@ -2529,7 +3065,7 @@ Step information is exposed in reporters API.
 
 To launch a server during the tests, use the [`webServer`](./test-webserver) option in the configuration file. The server will wait for a given url to be available before running the tests, and the url will be passed over to Playwright as a [`baseURL`](./api/class-testoptions#test-options-base-url) when creating a context.
 
-```ts title="playwright.config.ts"
+```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
 export default defineConfig({
   webServer: {
@@ -2613,7 +3149,7 @@ npm i -D @playwright/test
 
 Simple test `tests/foo.spec.ts`:
 
-```ts
+```js
 import { test, expect } from '@playwright/test';
 
 test('basic test', async ({ page }) => {
@@ -2640,7 +3176,7 @@ npx playwright test
 
 Traces are recorded using the new [`property: BrowserContext.tracing`] API:
 
-```ts
+```js
 const browser = await chromium.launch();
 const context = await browser.newContext();
 
diff --git a/docs/src/release-notes-python.md b/docs/src/release-notes-python.md
index 15176ca472c51..0ecd8eb89eed5 100644
--- a/docs/src/release-notes-python.md
+++ b/docs/src/release-notes-python.md
@@ -4,6 +4,387 @@ title: "Release notes"
 toc_max_heading_level: 2
 ---
 
+## Version 1.55
+
+### Codegen
+
+- Automatic `to_be_visible()` assertions: Codegen can now generate automatic `to_be_visible()` assertions for common UI interactions. This feature can be enabled in the Codegen settings UI.
+
+### Breaking Changes
+
+- ⚠️ Dropped support for Chromium extension manifest v2.
+
+### Miscellaneous
+
+- Added support for Debian 13 "Trixie".
+
+### Browser Versions
+
+- Chromium 140.0.7339.16
+- Mozilla Firefox 141.0
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 139
+- Microsoft Edge 139
+
+## Version 1.54
+
+### Highlights
+
+- New cookie property `partition_key` in [`method: BrowserContext.cookies`] and [`method: BrowserContext.addCookies`]. This property allows to save and restore partitioned cookies. See [CHIPS MDN article](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies) for more information. Note that browsers have different support and defaults for cookie partitioning.
+
+- New option `--user-data-dir` in multiple commands. You can specify the same user data dir to reuse browsing state, like authentication, between sessions.
+  ```bash
+  playwright codegen --user-data-dir=./user-data
+  ```
+
+- `playwright open` does not open the test recorder anymore. Use `playwright codegen` instead.
+
+### Browser Versions
+
+- Chromium 139.0.7258.5
+- Mozilla Firefox 140.0.2
+- WebKit 26.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 140
+- Microsoft Edge 140
+
+## Version 1.53
+
+### Trace Viewer and HTML Reporter Updates
+
+- New Steps in Trace Viewer:
+  ![New Trace Viewer Steps](https://github.com/user-attachments/assets/1963ff7d-4070-41be-a79b-4333176921a2)
+- New method [`method: Locator.describe`] to describe a locator. Used for trace viewer.
+  ```python
+  button = page.get_by_test_id("btn-sub").describe("Subscribe button")
+  button.click()
+  ```
+- `python -m playwright install --list` will now list all installed browsers, versions and locations.
+
+### Browser Versions
+
+- Chromium 138.0.7204.4
+- Mozilla Firefox 139.0
+- WebKit 18.5
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 137
+- Microsoft Edge 137
+
+## Version 1.52
+
+### Highlights
+
+- New method [`method: LocatorAssertions.toContainClass`] to ergonomically assert individual class names on the element.
+
+  ```python
+    expect(page.get_by_role('listitem', name='Ship v1.52')).to_contain_class('done')
+  ```
+
+- [Aria Snapshots](./aria-snapshots.md) got two new properties: [`/children`](./aria-snapshots.md#strict-matching) for strict matching and `/url` for links.
+
+  ```python
+  expect(locator).to_match_aria_snapshot("""
+    - list
+      - /children: equal
+      - listitem: Feature A
+      - listitem:
+        - link "Feature B":
+          - /url: "https://playwright.dev"
+  """)
+  ```
+
+### Miscellaneous
+
+- New option [`option: APIRequest.newContext.maxRedirects`] in [`method: APIRequest.newContext`] to control the maximum number of redirects.
+
+### Breaking Changes
+
+- Glob URL patterns in methods like [`method: Page.route`] do not support `?` and `[]` anymore. We recommend using regular expressions instead.
+- Method [`method: Route.continue`] does not allow to override the `Cookie` header anymore. If a `Cookie` header is provided, it will be ignored, and the cookie will be loaded from the browser's cookie store. To set custom cookies, use [`method: BrowserContext.addCookies`].
+- macOS 13 is now deprecated and will no longer receive WebKit updates. Please upgrade to a more recent macOS version to continue benefiting from the latest WebKit improvements.
+
+### Browser Versions
+
+- Chromium 136.0.7103.25
+- Mozilla Firefox 137.0
+- WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 135
+- Microsoft Edge 135
+
+## Version 1.51
+
+### Highlights
+
+* New option [`option: BrowserContext.storageState.indexedDB`] for [`method: BrowserContext.storageState`] allows to save and restore IndexedDB contents. Useful when your application uses [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) to store authentication tokens, like Firebase Authentication.
+
+  Here is an example following the [authentication guide](./auth.md#reusing-signed-in-state):
+
+  ```python
+  # Save storage state into the file. Make sure to include IndexedDB.
+  storage = await context.storage_state(path="state.json", indexed_db=True)
+
+  # Create a new context with the saved storage state.
+  context = await browser.new_context(storage_state="state.json")
+  ```
+
+* New option [`option: Locator.filter.visible`] for [`method: Locator.filter`] allows matching only visible elements.
+
+  ```python
+  # Ignore invisible todo items.
+  todo_items = page.get_by_test_id("todo-item").filter(visible=True)
+  # Check there are exactly 3 visible ones.
+  await expect(todo_items).to_have_count(3)
+  ```
+
+* New option `contrast` for methods [`method: Page.emulateMedia`] and [`method: Browser.newContext`] allows to emulate the `prefers-contrast` media feature.
+
+* New option [`option: APIRequest.newContext.failOnStatusCode`] makes all fetch requests made through the [APIRequestContext] throw on response codes other than 2xx and 3xx.
+
+### Browser Versions
+
+* Chromium 134.0.6998.35
+* Mozilla Firefox 135.0
+* WebKit 18.4
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 133
+* Microsoft Edge 133
+
+
+## Version 1.50
+
+### Async Pytest Plugin
+
+* [Playwright's Pytest plugin](./test-runners.md) now has support for [Async Fixtures](https://playwright.dev/python/docs/test-runners#async-fixtures).
+
+### Miscellaneous
+
+* Added method [`method: LocatorAssertions.toHaveAccessibleErrorMessage`] to assert the Locator points to an element with a given [aria errormessage](https://w3c.github.io/aria/#aria-errormessage).
+
+### UI updates
+
+* New button in Codegen for picking elements to produce aria snapshots.
+* Additional details (such as keys pressed) are now displayed alongside action API calls in traces.
+* Display of `canvas` content in traces is error-prone. Display is now disabled by default, and can be enabled via the `Display canvas content` UI setting.
+* `Call` and `Network` panels now display additional time information.
+
+### Breaking
+
+* [`method: LocatorAssertions.toBeEditable`] and [`method: Locator.isEditable`] now throw if the target element is not `<input>`, `<select>`, or a number of other editable elements.
+
+### Browser Versions
+
+* Chromium 133.0.6943.16
+* Mozilla Firefox 134.0
+* WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+* Google Chrome 132
+* Microsoft Edge 132
+
+## Version 1.49
+
+### Aria snapshots
+
+New assertion [`method: LocatorAssertions.toMatchAriaSnapshot`] verifies page structure by comparing to an expected accessibility tree, represented as YAML.
+
+```python
+page.goto("https://playwright.dev")
+expect(page.locator('body')).to_match_aria_snapshot('''
+  - banner:
+    - heading /Playwright enables reliable/ [level=1]
+    - link "Get started"
+    - link "Star microsoft/playwright on GitHub"
+  - main:
+    - img "Browsers (Chromium, Firefox, WebKit)"
+    - heading "Any browser • Any platform • One API"
+''')
+```
+
+You can generate this assertion with [Test Generator](./codegen) or by calling [`method: Locator.ariaSnapshot`].
+
+Learn more in the [aria snapshots guide](./aria-snapshots).
+
+### Tracing groups
+
+New method [`method: Tracing.group`] allows you to visually group actions in the trace viewer.
+
+```python
+# All actions between group and group_end
+# will be shown in the trace viewer as a group.
+page.context.tracing.group("Open Playwright.dev > API")
+page.goto("https://playwright.dev/")
+page.get_by_role("link", name="API").click()
+page.context.tracing.group_end()
+```
+
+### Breaking: `chrome` and `msedge` channels switch to new headless mode
+
+This change affects you if you're using one of the following channels in your `playwright.config.ts`:
+- `chrome`, `chrome-dev`, `chrome-beta`, or `chrome-canary`
+- `msedge`, `msedge-dev`, `msedge-beta`, or `msedge-canary`
+
+After updating to Playwright v1.49, run your test suite. If it still passes, you're good to go. If not, you will probably need to update your snapshots, and adapt some of your test code around PDF viewers and extensions. See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for more details.
+
+### Try new Chromium headless
+
+You can opt into the new headless mode by using `'chromium'` channel. As [official Chrome documentation puts it](https://developer.chrome.com/blog/chrome-headless-shell):
+
+> New Headless on the other hand is the real Chrome browser, and is thus more authentic, reliable, and offers more features. This makes it more suitable for high-accuracy end-to-end web app testing or browser extension testing.
+
+See [issue #33566](https://github.com/microsoft/playwright/issues/33566) for the list of possible breakages you could encounter and more details on Chromium headless. Please file an issue if you see any problems after opting in.
+
+```bash python
+pytest test_login.py --browser-channel chromium
+```
+
+### Miscellaneous
+
+- There will be no more updates for WebKit on Ubuntu 20.04 and Debian 11. We recommend updating your OS to a later version.
+- `<canvas>` elements inside a snapshot now draw a preview.
+- Python 3.8 is not supported anymore.
+
+### Browser Versions
+
+- Chromium 131.0.6778.33
+- Mozilla Firefox 132.0
+- WebKit 18.2
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 130
+- Microsoft Edge 130
+
+
+## Version 1.48
+
+### WebSocket routing
+
+New methods [`method: Page.routeWebSocket`] and [`method: BrowserContext.routeWebSocket`] allow to intercept, modify and mock WebSocket connections initiated in the page. Below is a simple example that mocks WebSocket communication by responding to a `"request"` with a `"response"`.
+
+```python
+def message_handler(ws: WebSocketRoute, message: Union[str, bytes]):
+  if message == "request":
+    ws.send("response")
+
+page.route_web_socket("/ws", lambda ws: ws.on_message(
+    lambda message: message_handler(ws, message)
+))
+```
+
+See [WebSocketRoute] for more details.
+
+### UI updates
+
+- New "copy" buttons for annotations and test location in the HTML report.
+- Route method calls like [`method: Route.fulfill`] are not shown in the report and trace viewer anymore. You can see which network requests were routed in the network tab instead.
+- New "Copy as cURL" and "Copy as fetch" buttons for requests in the network tab.
+
+### Miscellaneous
+
+- New method [`method: Page.requestGC`] may help detect memory leaks.
+- Requests made by [APIRequestContext] now record detailed timing and security information in the HAR.
+
+### Browser Versions
+
+- Chromium 130.0.6723.19
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 129
+- Microsoft Edge 129
+
+
+## Version 1.47
+
+### Network Tab improvements
+
+The Network tab in the trace viewer has several nice improvements:
+
+- filtering by asset type and URL
+- better display of query string parameters
+- preview of font assets
+
+![Network tab now has filters](https://github.com/user-attachments/assets/4bd1b67d-90bd-438b-a227-00b9e86872e2)
+
+### Miscellaneous
+
+- The `mcr.microsoft.com/playwright/python:v1.47.0` now serves a Playwright image based on Ubuntu 24.04 Noble.
+  To use the 22.04 jammy-based image, please use `mcr.microsoft.com/playwright/python:v1.47.0-jammy` instead.
+- The `:latest`/`:focal`/`:jammy` tag for Playwright Docker images is no longer being published. Pin to a specific version for better stability and reproducibility.
+- TLS client certificates can now be passed from memory by passing [`option: Browser.newContext.clientCertificates.cert`] and [`option: Browser.newContext.clientCertificates.key`] as bytes instead of file paths.
+- [`option: Locator.selectOption.noWaitAfter`] in [`method: Locator.selectOption`] was deprecated.
+- We've seen reports of WebGL in Webkit misbehaving on GitHub Actions `macos-13`. We recommend upgrading GitHub Actions to `macos-14`.
+
+### Browser Versions
+
+- Chromium 129.0.6668.29
+- Mozilla Firefox 130.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 128
+- Microsoft Edge 128
+
+## Version 1.46
+
+### TLS Client Certificates
+
+Playwright now allows to supply client-side certificates, so that server can verify them, as specified by TLS Client Authentication.
+
+You can provide client certificates as a parameter of [`method: Browser.newContext`] and [`method: APIRequest.newContext`]. The following snippet sets up a client certificate for `https://example.com`:
+
+```python
+context = browser.new_context(
+    client_certificates=[
+        {
+            "origin": "https://example.com",
+            "certPath": "client-certificates/cert.pem",
+            "keyPath": "client-certificates/key.pem",
+        }
+    ],
+)
+```
+
+### Trace Viewer Updates
+
+- Content of text attachments is now rendered inline in the attachments pane.
+- New setting to show/hide routing actions like [`method: Route.continue`].
+- Request method and status are shown in the network details tab.
+- New button to copy source file location to clipboard.
+- Metadata pane now displays the `base_url`.
+
+### Miscellaneous
+
+- New `maxRetries` option in [`method: APIRequestContext.fetch`] which retries on the `ECONNRESET` network error.
+
+### Browser Versions
+
+- Chromium 128.0.6613.18
+- Mozilla Firefox 128.0
+- WebKit 18.0
+
+This version was also tested against the following stable channels:
+
+- Google Chrome 127
+- Microsoft Edge 127
+
+
 ## Version 1.45
 
 ### Clock
@@ -184,7 +565,7 @@ expect(page.get_by_role("heading", name="Light and easy")).to_be_visible()
 
 ### New APIs
 
-- [`method: Page.pdf`] accepts two new options [`option: tagged`] and [`option: outline`].
+- [`method: Page.pdf`] accepts two new options [`option: Page.pdf.tagged`] and [`option: Page.pdf.outline`].
 
 ### Announcements
 
@@ -207,7 +588,7 @@ This version was also tested against the following stable channels:
 
 - New method [`method: Page.unrouteAll`] removes all routes registered by [`method: Page.route`] and [`method: Page.routeFromHAR`]. Optionally allows to wait for ongoing routes to finish, or ignore any errors from them.
 - New method [`method: BrowserContext.unrouteAll`] removes all routes registered by [`method: BrowserContext.route`] and [`method: BrowserContext.routeFromHAR`]. Optionally allows to wait for ongoing routes to finish, or ignore any errors from them.
-- New option [`option: style`] in [`method: Page.screenshot`] and [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
+- New options [`option: Page.screenshot.style`] in [`method: Page.screenshot`] and [`option: Locator.screenshot.style`] in [`method: Locator.screenshot`] to add custom CSS to the page before taking a screenshot.
 
 ### Browser Versions
 
@@ -248,8 +629,8 @@ def test_example(page: Page) -> None:
 
 ### New APIs
 
-- Option [`option: reason`] in [`method: Page.close`], [`method: BrowserContext.close`] and [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
-- Option [`option: firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
+- Options [`option: Page.close.reason`] in [`method: Page.close`], [`option: BrowserContext.close.reason`] in [`method: BrowserContext.close`] and [`option: Browser.close.reason`] in [`method: Browser.close`]. Close reason is reported for all operations interrupted by the closure.
+- Option [`option: BrowserType.launchPersistentContext.firefoxUserPrefs`] in [`method: BrowserType.launchPersistentContext`].
 
 ### Other Changes
 
@@ -428,7 +809,7 @@ This version was also tested against the following stable channels:
     page.get_by_role("button", name="Dismiss").click()
   new_email.click()
   ```
-* Use new options [`option: hasNot`] and [`option: hasNotText`] in [`method: Locator.filter`]
+* Use new options [`option: Locator.filter.hasNot`] and [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
   to find elements that **do not match** certain conditions.
 
   ```python
@@ -444,10 +825,10 @@ This version was also tested against the following stable channels:
 ### New APIs
 
 - [`method: Locator.or`]
-- New option [`option: hasNot`] in [`method: Locator.filter`]
-- New option [`option: hasNotText`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNot`] in [`method: Locator.filter`]
+- New option [`option: Locator.filter.hasNotText`] in [`method: Locator.filter`]
 - [`method: LocatorAssertions.toBeAttached`]
-- New option [`option: timeout`] in [`method: Route.fetch`]
+- New option [`option: Route.fetch.timeout`] in [`method: Route.fetch`]
 
 ### ⚠️ Breaking change
 
@@ -471,9 +852,9 @@ This version was also tested against the following stable channels:
 ### New APIs
 
 - Custom expect message, see [test assertions documentation](./test-assertions.md#custom-expect-message).
-- New options [`option: updateMode`] and [`option: updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
+- New options [`option: Page.routeFromHAR.updateMode`] and [`option: Page.routeFromHAR.updateContent`] in [`method: Page.routeFromHAR`] and [`method: BrowserContext.routeFromHAR`].
 - Chaining existing locator objects, see [locator docs](./locators.md#matching-inside-a-locator) for details.
-- New option [`option: name`] in method [`method: Tracing.startChunk`].
+- New option [`option: Tracing.startChunk.name`] in method [`method: Tracing.startChunk`].
 
 ### Browser Versions
 
@@ -577,9 +958,9 @@ This version was also tested against the following stable channels:
 
   ```html
   <select multiple>
-    <option value="red">Red</div>
-    <option value="green">Green</div>
-    <option value="blue">Blue</div>
+    <option value="red">Red</option>
+    <option value="green">Green</option>
+    <option value="blue">Blue</option>
   </select>
   ```
 
diff --git a/docs/src/running-tests-csharp.md b/docs/src/running-tests-csharp.md
index 3f6a0f23e1f4a..1711355410a36 100644
--- a/docs/src/running-tests-csharp.md
+++ b/docs/src/running-tests-csharp.md
@@ -113,6 +113,8 @@ dotnet test --filter "Name~GetStartedLink"
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -128,6 +130,32 @@ dotnet test -- NUnit.NumberOfTestWorkers=5
 dotnet test -- MSTest.Parallelize.Workers=5
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```bash
+dotnet test -- xUnit.MaxParallelThreads=5
+```
+
+See [here](https://xunit.net/docs/running-tests-in-parallel.html) for more information to run tests in parallel with xUnit.
+
+:::note
+We recommend xUnit 2.8+ which uses the [`conservative` parallelism algorithm](https://xunit.net/docs/running-tests-in-parallel.html#algorithms) by default.
+:::
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+```bash
+dotnet test -- xUnit.MaxParallelThreads=5
+```
+
+See [here](https://xunit.net/docs/running-tests-in-parallel.html) for more information to run tests in parallel with xUnit v3.
+
+:::note
+xUnit v3 uses the [`conservative` parallelism algorithm](https://xunit.net/docs/running-tests-in-parallel.html#algorithms) by default.
+:::
+
 </TabItem>
 </Tabs>
 
@@ -159,4 +187,4 @@ Check out our [debugging guide](./debug.md) to learn more about the [Playwright
 - [Generate tests with Codegen](./codegen-intro.md)
 - [See a trace of your tests](./trace-viewer-intro.md)
 - [Run tests on CI](./ci-intro.md)
-- [Learn more about the MSTest and NUnit base classes](./test-runners.md)
+- [Learn more about the MSTest, NUnit, xUnit and xUnit v3 base classes](./test-runners.md)
diff --git a/docs/src/running-tests-js.md b/docs/src/running-tests-js.md
index 71d8b8adb5a32..32223fdd0e76c 100644
--- a/docs/src/running-tests-js.md
+++ b/docs/src/running-tests-js.md
@@ -4,7 +4,7 @@ title: "Running and debugging tests"
 ---
 ## Introduction
 
-With Playwright you can run a single test, a set of tests or all tests. Tests can be run on one browser or multiple browsers by using the `--project` flag. Tests are run in parallel by default and are run in a headless manner, meaning no browser window will be opened while running the tests and results will be seen in the terminal. However, you can run tests in headed mode by using the `--headed` CLI argument, or you can run your tests in [UI mode](./test-ui-mode.md) by using the `--ui` flag. See a full trace of your tests complete with watch mode, time travel debugging and more.
+With Playwright you can run a single test, a set of tests, or all tests. Tests can be run on one browser or multiple browsers using the `--project` flag. Tests run in parallel by default and in headless mode, meaning no browser window opens while running the tests and results appear in the terminal. You can run tests in headed mode using the `--headed` CLI argument, or run your tests in [UI mode](./test-ui-mode.md) using the `--ui` flag to see a full trace of your tests.
 
 **You will learn**
 
@@ -15,13 +15,13 @@ With Playwright you can run a single test, a set of tests or all tests. Tests ca
 ## Running tests
 ### Command line
 
-You can run your tests with the `playwright test` command. This will run your tests on all browsers as configured in the `playwright.config` file. Tests run in headless mode by default meaning no browser window will be opened while running the tests and results will be seen in the terminal.
+You can run your tests with the `playwright test` command. This runs your tests on all browsers as configured in the `playwright.config` file, and results appear in the terminal. Tests run in headless mode by default, meaning no browser window opens while running the tests.
 
 ```bash
 npx playwright test
 ```
 
-![tests running in command line](https://github.com/microsoft/playwright/assets/13063165/981c1b2b-dc7e-4b85-b241-272b44da6628)
+![tests running in command line](./images/getting-started/run-tests-cli.png)
 
 ### Run tests in UI mode
 
@@ -31,13 +31,13 @@ We highly recommend running your tests with [UI Mode](./test-ui-mode.md) for a b
 npx playwright test --ui
 ```
 
-![UI Mode](https://github.com/microsoft/playwright/assets/13063165/c5b501cc-4f5d-485a-87cc-66044c651786)
+![UI Mode](./images/getting-started/ui-mode.png)
 
-Check out or [detailed guide on UI Mode](./test-ui-mode.md) to learn more about it's features.
+Check out our [detailed guide on UI Mode](./test-ui-mode.md) to learn more about its features.
 
 ### Run tests in headed mode
 
-To run your tests in headed mode, use the `--headed` flag. This will give you the ability to visually see how Playwright interacts with the website.
+To run your tests in headed mode, use the `--headed` flag. This gives you the ability to visually see how Playwright interacts with the website.
 
 ```bash
 npx playwright test --headed
@@ -45,13 +45,13 @@ npx playwright test --headed
 
 ### Run tests on different browsers
 
-To specify which browser you would like to run your tests on, use the `--project` flag followed by the name of the browser.
+To specify which browser you would like to run your tests on, use the `--project` flag followed by the browser name.
 
 ```bash
 npx playwright test --project webkit
 ```
 
-To specify multiple browsers to run your tests on, use the `--project` flag multiple times followed by the name of each browser.
+To specify multiple browsers to run your tests on, use the `--project` flag multiple times followed by each browser name.
 
 ```bash
 npx playwright test --project webkit --project firefox
@@ -59,13 +59,13 @@ npx playwright test --project webkit --project firefox
 
 ### Run specific tests
 
-To run a single test file, pass in the name of the test file that you want to run.
+To run a single test file, pass in the test file name that you want to run.
 
 ```bash
 npx playwright test landing-page.spec.ts
 ```
 
-To run a set of test files from different directories, pass in the names of the directories that you want to run the tests in.
+To run a set of test files from different directories, pass in the directory names that you want to run the tests in.
 
 ```bash
 npx playwright test tests/todo-page/ tests/landing-page/
@@ -94,29 +94,29 @@ npx playwright test --last-failed
 
 ### Run tests in VS Code
 
-Tests can be run right from VS Code using the [VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-playwright.playwright). Once installed you can simply click the green triangle next to the test you want to run or run all tests from the testing sidebar. Check out our [Getting Started with VS Code](./getting-started-vscode.md#running-tests) guide for more details.
+Tests can be run right from VS Code using the [VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-playwright.playwright). Once installed you can simply click the green triangle next to the test you want to run or run all tests from the testing sidebar. Check out our [Getting Started with VS Code](./getting-started-vscode.md) guide for more details.
 
-![Playwright VS Code extension](https://github.com/microsoft/playwright/assets/13063165/47726e70-683b-4bd5-94de-7d03dd45c30f)
+![install playwright extension](./images/getting-started/vscode-extension.png)
 
 ## Debugging tests
 
-Since Playwright runs in Node.js, you can debug it with your debugger of choice e.g. using `console.log` or inside your IDE or directly in VS Code with the [VS Code Extension](./getting-started-vscode.md). Playwright comes with [UI Mode](./test-ui-mode.md), where you can easily walk through each step of the test, see logs, errors, network requests, inspect the DOM snapshot and more. You can also use the [Playwright Inspector](./debug.md#playwright-inspector), which allows you to step through Playwright API calls, see their debug logs and explore [locators](./locators.md).
+Since Playwright runs in Node.js, you can debug it with your debugger of choice, e.g. using `console.log`, inside your IDE, or directly in VS Code with the [VS Code Extension](./getting-started-vscode.md). Playwright comes with [UI Mode](./test-ui-mode.md), where you can easily walk through each step of the test, see logs, errors, network requests, inspect the DOM snapshot, and more. You can also use the [Playwright Inspector](./debug.md#playwright-inspector), which allows you to step through Playwright API calls, see their debug logs, and explore [locators](./locators.md).
 
 ### Debug tests in UI mode
 
-We highly recommend debugging your tests with [UI Mode](./test-ui-mode.md) for a better developer experience where you can easily walk through each step of the test and visually see what was happening before, during and after each step. UI mode also comes with many other features such as the locator picker, watch mode and more.
+We highly recommend debugging your tests with [UI Mode](./test-ui-mode.md) for a better developer experience where you can easily walk through each step of the test and visually see what was happening before, during, and after each step. UI mode also comes with many other features such as the locator picker, watch mode, and more.
 
 ```bash
 npx playwright test --ui
 ```
 
-![showing errors in ui mode](https://github.com/microsoft/playwright/assets/13063165/ffca2fd1-5349-41fb-ade9-ace143bb2c58)
+![showing errors in ui mode](./images/getting-started/ui-mode-error.png)
 
-While debugging you can use the Pick Locator button to select an element on the page and see the locator that Playwright would use to find that element. You can also edit the locator in the locator playground and see it highlighting live on the Browser window. Use the Copy Locator button to copy the locator to your clipboard and then paste it into you test.
+While debugging you can use the Pick Locator button to select an element on the page and see the locator that Playwright would use to find that element. You can also edit the locator in the locator playground and see it highlighting live in the browser window. Use the Copy Locator button to copy the locator to your clipboard and then paste it into your test.
 
-![pick locator in ui mode](https://github.com/microsoft/playwright/assets/13063165/9e7eeb84-bd26-4010-8614-75e24b56c716)
+![pick locator in ui mode](./images/getting-started/ui-mode-pick-locator.png)
 
-Check out our [detailed guide on UI Mode](./test-ui-mode.md) to learn more about it's features.
+Check out our [detailed guide on UI Mode](./test-ui-mode.md) to learn more about its features.
 
 ### Debug tests with the Playwright Inspector
 
@@ -126,11 +126,11 @@ To debug all tests, run the Playwright test command followed by the `--debug` fl
 npx playwright test --debug
 ```
 
-![Debugging Tests with the Playwright inspector](https://github.com/microsoft/playwright/assets/13063165/6b3b3caa-d258-4cb8-aa05-cd407f501626)
+![Debugging Tests with the Playwright inspector](./images/getting-started/run-tests-debug.png)
 
-This command will open up a Browser window as well as the Playwright Inspector. You can use the step over button at the top of the inspector to step through your test. Or, press the play button to run your test from start to finish. Once the test has finished, the browser window will close.
+This command opens a browser window as well as the Playwright Inspector. You can use the step over button at the top of the inspector to step through your test. Or, press the play button to run your test from start to finish. Once the test finishes, the browser window closes.
 
-To debug one test file, run the Playwright test command with the name of the test file that you want to debug followed by the `--debug` flag.
+To debug one test file, run the Playwright test command with the test file name that you want to debug followed by the `--debug` flag.
 
 ```bash
 npx playwright test example.spec.ts --debug
@@ -142,27 +142,27 @@ To debug a specific test from the line number where the `test(..` is defined, ad
 npx playwright test example.spec.ts:10 --debug
 ```
 
-While debugging you can use the Pick Locator button to select an element on the page and see the locator that Playwright would use to find that element. You can also edit the locator and see it highlighting live on the Browser window. Use the Copy Locator button to copy the locator to your clipboard and then paste it into your test.
+While debugging you can use the Pick Locator button to select an element on the page and see the locator that Playwright would use to find that element. You can also edit the locator and see it highlighting live in the browser window. Use the Copy Locator button to copy the locator to your clipboard and then paste it into your test.
 
-![Locator picker in the Playwright Inspector](https://github.com/microsoft/playwright/assets/13063165/013d5edb-583e-423a-bb53-9f57bab7f3e1)
+![Locator picker in the Playwright Inspector](./images/getting-started/run-tests-pick-locator.png)
 
 
-Check out our [debugging guide](./debug.md) to learn more about debugging with the [VS Code debugger](./debug.md#vs-code-debugger), UI Mode and the [Playwright Inspector](./debug.md#playwright-inspector) as well as debugging with [Browser Developer tools](./debug.md#browser-developer-tools).
+Check out our [debugging guide](./debug.md) to learn more about debugging with the [VS Code debugger](./debug.md#vs-code-debugger), UI Mode, and the [Playwright Inspector](./debug.md#playwright-inspector) as well as debugging with [Browser Developer tools](./debug.md#browser-developer-tools).
 
 
 ## Test reports
 
-The [HTML Reporter](./test-reporters.md#html-reporter) shows you a full report of your tests allowing you to filter the report by browsers, passed tests, failed tests, skipped tests and flaky tests. By default, the HTML report is opened automatically if some of the tests failed, otherwise you can open it with the following command.
+The [HTML Reporter](./test-reporters.md#html-reporter) shows you a full report of your tests allowing you to filter the report by browsers, passed tests, failed tests, skipped tests, and flaky tests. By default, the HTML report opens automatically if some tests failed, otherwise you can open it with the following command.
 
 ```bash
 npx playwright show-report
 ```
 
-![HTML Report](https://github.com/microsoft/playwright/assets/13063165/c5f60e56-fb75-4a2d-a4b6-054b8c5d69c1)
+![HTML Report](./images/getting-started/html-report.png)
 
-You can filter and search for tests as well as click on each test to see the tests errors and explore each step of the test.
+You can filter and search for tests as well as click on each test to see the test errors and explore each step of the test.
 
-![HTML Reporter detail view](https://github.com/microsoft/playwright/assets/13063165/f36ada14-4701-4534-a3be-ed22c2b16cf5)
+![HTML Reporter detail view](./images/getting-started/html-report-detail.png)
 
 
 ## What's next
diff --git a/docs/src/screenshots.md b/docs/src/screenshots.md
index 28aca1200b349..ba50a852a45a0 100644
--- a/docs/src/screenshots.md
+++ b/docs/src/screenshots.md
@@ -21,7 +21,7 @@ page.screenshot(path="screenshot.png")
 
 ```java
 page.screenshot(new Page.ScreenshotOptions()
-      .setPath(Paths.get("screenshot.png")))
+      .setPath(Paths.get("screenshot.png")));
 ```
 
 ```csharp
@@ -33,8 +33,6 @@ await Page.ScreenshotAsync(new()
 
 [Screenshots API](./api/class-page#page-screenshot) accepts many parameters for image format, clip area, quality, etc. Make sure to check them out.
 
-<!-- TOC -->
-
 ## Full page screenshots
 
 Full page screenshot is a screenshot of a full scrollable page, as if you had a very
diff --git a/docs/src/selenium-grid.md b/docs/src/selenium-grid.md
index 636bfb6d43985..40cb010c1ea4b 100644
--- a/docs/src/selenium-grid.md
+++ b/docs/src/selenium-grid.md
@@ -10,8 +10,6 @@ Playwright can connect to [Selenium Grid Hub](https://www.selenium.dev/documenta
 :::warning
 There is a risk of Playwright integration with Selenium Grid Hub breaking in the future. Make sure you weight risks against benefits before using it.
 
-<br />
-<br />
 <details>
 <summary>
 <span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.6'}}>More details</span>
@@ -21,7 +19,7 @@ Internally, Playwright connects to the browser using [Chrome DevTools Protocol](
 </details>
 :::
 
-Before connecting Playwright to your Selenium Grid, make sure that grid works with [Selenium WebDriver](https://www.selenium.dev/documentation/webdriver/). For example, run [one of the examples](https://github.com/SeleniumHQ/selenium/tree/trunk/javascript/node/selenium-webdriver/example) and pass `SELENIUM_REMOTE_URL` environment variable. If webdriver example does not work, look for any errors at your Selenium hub/node/standalone output and search [Selenium issues](https://github.com/SeleniumHQ/selenium/issues) for a possible solution.
+Before connecting Playwright to your Selenium Grid, make sure that grid works with [Selenium WebDriver](https://www.selenium.dev/documentation/webdriver/). For example, run [one of the examples](https://github.com/SeleniumHQ/selenium/tree/trunk/javascript/selenium-webdriver/example) and pass `SELENIUM_REMOTE_URL` environment variable. If webdriver example does not work, look for any errors at your Selenium hub/node/standalone output and search [Selenium issues](https://github.com/SeleniumHQ/selenium/issues) for a possible solution.
 
 ## Starting Selenium Grid
 
@@ -79,19 +77,19 @@ SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_CAPABILITIES="
 If your grid requires additional headers to be set (for example, you should provide authorization token to use browsers in your cloud), you can set `SELENIUM_REMOTE_HEADERS` environment variable to provide JSON-serialized headers.
 
 ```bash js
-SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'OAuth 12345'}" npx playwright test
+SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'Basic b64enc'}" npx playwright test
 ```
 
 ```bash python
-SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'OAuth 12345'}" pytest --browser chromium
+SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'Basic b64enc'}" pytest --browser chromium
 ```
 
 ```bash java
-SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'OAuth 12345'}" mvn test
+SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'Basic b64enc'}" mvn test
 ```
 
 ```bash csharp
-SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'OAuth 12345'}" dotnet test
+SELENIUM_REMOTE_URL=http://<selenium-hub-ip>:4444 SELENIUM_REMOTE_HEADERS="{'Authorization':'Basic b64enc'}" dotnet test
 ```
 
 ### Detailed logs
@@ -120,7 +118,7 @@ If you file an issue, please include this log.
 
 ## Using Selenium Docker
 
-One easy way to use Selenium Grid is to run official docker containers. Read more in [selenium docker images](https://github.com/SeleniumHQ/docker-selenium) documentation. For experimental arm images, see [docker-seleniarm](https://github.com/seleniumhq-community/docker-seleniarm).
+One easy way to use Selenium Grid is to run official docker containers. Read more in [selenium docker images](https://github.com/SeleniumHQ/docker-selenium) documentation. For image tagging convention, [read more](https://github.com/SeleniumHQ/docker-selenium/wiki/Tagging-Convention#selenium-grid-4x-and-above).
 
 ### Standalone mode
 
@@ -129,10 +127,7 @@ Here is an example of running selenium standalone and connecting Playwright to i
 First start Selenium.
 
 ```bash
-docker run -d -p 4444:4444 --shm-size="2g" -e SE_NODE_GRID_URL="http://localhost:4444" selenium/standalone-chrome:4.3.0-20220726
-
-# Alternatively for arm architecture
-docker run -d -p 4444:4444 --shm-size="2g" -e SE_NODE_GRID_URL="http://localhost:4444" seleniarm/standalone-chromium:103.0
+docker run -d -p 4444:4444 --shm-size="2g" -e SE_NODE_GRID_URL="http://localhost:4444" selenium/standalone-chromium:latest
 ```
 
 Then run Playwright.
@@ -160,24 +155,14 @@ Here is an example of running selenium hub and a single selenium node, and conne
 First start the hub container and one or more node containers.
 
 ```bash
-docker run -d -p 4442-4444:4442-4444 --name selenium-hub selenium/hub:4.3.0-20220726
-docker run -d -p 5555:5555 \
-    --shm-size="2g" \
-    -e SE_EVENT_BUS_HOST=<selenium-hub-ip> \
-    -e SE_EVENT_BUS_PUBLISH_PORT=4442 \
-    -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
-    -e SE_NODE_GRID_URL="http://<selenium-hub-ip>:4444"
-    selenium/node-chrome:4.3.0-20220726
-
-# Alternatively for arm architecture
-docker run -d -p 4442-4444:4442-4444 --name selenium-hub seleniarm/hub:4.3.0-20220728
+docker run -d -p 4442-4444:4442-4444 --name selenium-hub selenium/hub:4.25.0
 docker run -d -p 5555:5555 \
     --shm-size="2g" \
     -e SE_EVENT_BUS_HOST=<selenium-hub-ip> \
     -e SE_EVENT_BUS_PUBLISH_PORT=4442 \
     -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
     -e SE_NODE_GRID_URL="http://<selenium-hub-ip>:4444"
-    seleniarm/node-chromium:103.0
+    selenium/node-chromium:4.25.0
 ```
 
 Then run Playwright.
diff --git a/docs/src/test-annotations-js.md b/docs/src/test-annotations-js.md
index 5fc2f78955b9d..8b7234473327a 100644
--- a/docs/src/test-annotations-js.md
+++ b/docs/src/test-annotations-js.md
@@ -105,7 +105,7 @@ test.describe('group', {
 });
 ```
 
-You can now run tests that have a particular tag with [`--grep`](./test-cli.md#reference) command line option.
+You can now run tests that have a particular tag with [`--grep`](./test-cli.md#all-options) command line option.
 
 ```bash tab=bash-bash
 npx playwright test --grep @fast
diff --git a/docs/src/test-api/class-fullconfig.md b/docs/src/test-api/class-fullconfig.md
index e6437ab314694..edbc991bfd7ec 100644
--- a/docs/src/test-api/class-fullconfig.md
+++ b/docs/src/test-api/class-fullconfig.md
@@ -93,8 +93,8 @@ See [`property: TestConfig.reporter`].
 ## property: FullConfig.reportSlowTests
 * since: v1.10
 - type: <[null]|[Object]>
-  - `max` <[int]> The maximum number of slow test files to report. Defaults to `5`.
-  - `threshold` <[float]> Test duration in milliseconds that is considered slow. Defaults to 15 seconds.
+  - `max` <[int]> The maximum number of slow test files to report.
+  - `threshold` <[float]> Test file duration in milliseconds that is considered slow.
 
 See [`property: TestConfig.reportSlowTests`].
 
@@ -114,10 +114,16 @@ See [`property: TestConfig.shard`].
 
 ## property: FullConfig.updateSnapshots
 * since: v1.10
-- type: <[UpdateSnapshots]<"all"|"none"|"missing">>
+- type: <[UpdateSnapshots]<"all"|"changed"|"missing"|"none">>
 
 See [`property: TestConfig.updateSnapshots`].
 
+## property: FullConfig.updateSourceMethod
+* since: v1.50
+- type: <[UpdateSourceMethod]<"overwrite"|"3way"|"patch">>
+
+See [`property: TestConfig.updateSourceMethod`].
+
 ## property: FullConfig.version
 * since: v1.20
 - type: <[string]>
diff --git a/docs/src/test-reporter-api/class-location.md b/docs/src/test-api/class-location.md
similarity index 100%
rename from docs/src/test-reporter-api/class-location.md
rename to docs/src/test-api/class-location.md
diff --git a/docs/src/test-api/class-test.md b/docs/src/test-api/class-test.md
index 9b56fbf2e6462..977c9d83e5376 100644
--- a/docs/src/test-api/class-test.md
+++ b/docs/src/test-api/class-test.md
@@ -56,7 +56,7 @@ test('another test @smoke', async ({ page }) => {
 Test tags are displayed in the test report, and are available to a custom reporter via `TestCase.tags` property.
 
 You can also filter tests by their tags during test execution:
-* in the [command line](../test-cli.md#reference);
+* in the [command line](../test-cli.md#all-options);
 * in the config with [`property: TestConfig.grep`] and [`property: TestProject.grep`];
 
 Learn more about [tagging](../test-annotations.md#tag-tests).
@@ -469,7 +469,18 @@ Learn more about the execution modes [here](../test-parallel.md).
   test('runs in parallel 2', async ({ page }) => {});
   ```
 
-* Running tests serially, retrying from the start.
+* Running tests in order, retrying each failed test independently.
+
+  This is the default mode. It can be useful to set it explicitly to override project configuration that uses `fullyParallel`.
+
+  ```js
+  // Tests in this file run in order. Retries, if any, run independently.
+  test.describe.configure({ mode: 'default' });
+  test('runs first', async ({ page }) => {});
+  test('runs second', async ({ page }) => {});
+  ```
+
+* Running tests serially, retrying from the start. If one of the serial tests fails, all subsequent tests are skipped.
 
   :::note
   Running serially is not recommended. It is usually better to make your tests isolated, so they can be run independently.
@@ -1138,6 +1149,57 @@ Optional description that will be reflected in a test report.
 
 
 
+## method: Test.fail.only
+* since: v1.49
+
+You can use `test.fail.only` to focus on a specific test that is expected to fail. This is particularly useful when debugging a failing test or working on a specific issue.
+
+To declare a focused "failing" test:
+* `test.fail.only(title, body)`
+* `test.fail.only(title, details, body)`
+
+**Usage**
+
+You can declare a focused failing test, so that Playwright runs only this test and ensures it actually fails.
+
+```js
+import { test, expect } from '@playwright/test';
+
+test.fail.only('focused failing test', async ({ page }) => {
+  // This test is expected to fail
+});
+test('not in the focused group', async ({ page }) => {
+  // This test will not run
+});
+```
+
+### param: Test.fail.only.title
+* since: v1.49
+
+- `title` ?<[string]>
+
+Test title.
+
+### param: Test.fail.only.details
+* since: v1.49
+
+- `details` ?<[Object]>
+  - `tag` ?<[string]|[Array]<[string]>>
+  - `annotation` ?<[Object]|[Array]<[Object]>>
+    - `type` <[string]>
+    - `description` ?<[string]>
+
+See [`method: Test.describe`] for test details description.
+
+### param: Test.fail.only.body
+* since: v1.49
+
+- `body` ?<[function]\([Fixtures], [TestInfo]\)>
+
+Test body that takes one or two arguments: an object with fixtures and optional [TestInfo].
+
+
+
 ## method: Test.fixme
 * since: v1.10
 
@@ -1227,13 +1289,13 @@ Test body that takes one or two arguments: an object with fixtures and optional
 * since: v1.10
 - `condition` ?<[boolean]>
 
-Test is marked as "should fail" when the condition is `true`.
+Test is marked as "fixme" when the condition is `true`.
 
 ### param: Test.fixme.callback
 * since: v1.10
 - `callback` ?<[function]\([Fixtures]\):[boolean]>
 
-A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as "should fail" when the return value is `true`.
+A function that returns whether to mark as "fixme", based on test fixtures. Test or tests are marked as "fixme" when the return value is `true`.
 
 ### param: Test.fixme.description
 * since: v1.10
@@ -1319,7 +1381,7 @@ Timeout for the currently running test is available through [`property: TestInfo
   });
   ```
 
-* Changing timeout from a slow `beforeEach` or `afterEach` hook. Note that this affects the test timeout that is shared with `beforeEach`/`afterEach` hooks.
+* Changing timeout from a slow `beforeEach` hook. Note that this affects the test timeout that is shared with `beforeEach` hooks.
 
   ```js
   test.beforeEach(async ({ page }, testInfo) => {
@@ -1363,7 +1425,7 @@ Timeout in milliseconds.
 
 Skip a test. Playwright will not run the test past the `test.skip()` call.
 
-Skipped tests are not supposed to be ever run. If you intent to fix the test, use [`method: Test.fixme`] instead.
+Skipped tests are not supposed to be ever run. If you intend to fix the test, use [`method: Test.fixme`] instead.
 
 To declare a skipped test:
 * `test.skip(title, body)`
@@ -1412,7 +1474,7 @@ test('Safari-only test 2', async ({ page }) => {
 });
 ```
 
-You can also call `test.skip()` without arguments inside the test body to always mark the test as failed. We recommend using `test.skip(title, body)` instead.
+You can also call `test.skip()` without arguments inside the test body to always skip the test. However, we recommend using `test.skip(title, body)` instead.
 
 ```js
 import { test, expect } from '@playwright/test';
@@ -1449,13 +1511,13 @@ Test body that takes one or two arguments: an object with fixtures and optional
 * since: v1.10
 - `condition` ?<[boolean]>
 
-Test is marked as "should fail" when the condition is `true`.
+Test is marked as "skipped" when the condition is `true`.
 
 ### param: Test.skip.callback
 * since: v1.10
 - `callback` ?<[function]\([Fixtures]\):[boolean]>
 
-A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as "should fail" when the return value is `true`.
+A function that returns whether to mark as "skipped", based on test fixtures. Test or tests are marked as "skipped" when the return value is `true`.
 
 ### param: Test.skip.description
 * since: v1.10
@@ -1700,7 +1762,7 @@ Step name.
 
 ### param: Test.step.body
 * since: v1.10
-- `body` <[function]\(\):[Promise]<[any]>>
+- `body` <[function]\([TestStepInfo]\):[Promise]<[any]>>
 
 Step body.
 
@@ -1710,6 +1772,71 @@ Step body.
 
 Whether to box the step in the report. Defaults to `false`. When the step is boxed, errors thrown from the step internals point to the step call site. See below for more details.
 
+### option: Test.step.location
+* since: v1.48
+- `location` <[Location]>
+
+Specifies a custom location for the step to be shown in test reports and trace viewer. By default, location of the [`method: Test.step`] call is shown.
+
+## async method: Test.step.skip
+* since: v1.50
+- returns: <[void]>
+
+Mark a test step as "skip" to temporarily disable its execution, useful for steps that are currently failing and planned for a near-term fix. Playwright will not run the step. See also [`method: TestStepInfo.skip#2`].
+
+We recommend [`method: TestStepInfo.skip#1`] instead.
+
+**Usage**
+
+You can declare a skipped step, and Playwright will not run it.
+
+```js
+import { test, expect } from '@playwright/test';
+
+test('my test', async ({ page }) => {
+  // ...
+  await test.step.skip('not yet ready', async () => {
+    // ...
+  });
+});
+```
+
+### param: Test.step.skip.title
+* since: v1.50
+- `title` <[string]>
+
+Step name.
+
+### param: Test.step.skip.body
+* since: v1.50
+- `body` <[function]\(\):[Promise]<[any]>>
+
+Step body.
+
+### option: Test.step.skip.box
+* since: v1.50
+- `box` <boolean>
+
+Whether to box the step in the report. Defaults to `false`. When the step is boxed, errors thrown from the step internals point to the step call site. See below for more details.
+
+### option: Test.step.skip.location
+* since: v1.50
+- `location` <[Location]>
+
+Specifies a custom location for the step to be shown in test reports and trace viewer. By default, location of the [`method: Test.step`] call is shown.
+
+### option: Test.step.skip.timeout
+* since: v1.50
+- `timeout` <[float]>
+
+Maximum time in milliseconds for the step to finish. Defaults to `0` (no timeout).
+
+### option: Test.step.timeout
+* since: v1.50
+- `timeout` <[float]>
+
+The maximum time, in milliseconds, allowed for the step to complete. If the step does not complete within the specified timeout, the [`method: Test.step`] method will throw a [TimeoutError]. Defaults to `0` (no timeout).
+
 ## method: Test.use
 * since: v1.10
 
diff --git a/docs/src/test-api/class-testconfig.md b/docs/src/test-api/class-testconfig.md
index 4130bdd66d8a0..b0cf02ccc2d7e 100644
--- a/docs/src/test-api/class-testconfig.md
+++ b/docs/src/test-api/class-testconfig.md
@@ -36,18 +36,53 @@ export default defineConfig({
 });
 ```
 
+## property: TestConfig.captureGitInfo
+* since: v1.51
+- type: ?<[Object]>
+  - `commit` ?<boolean> Whether to capture commit and pull request information such as hash, author, timestamp.
+  - `diff` ?<boolean> Whether to capture commit diff.
+
+These settings control whether git information is captured and stored in the config [`property: TestConfig.metadata`].
+
+**Usage**
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  captureGitInfo: { commit: true, diff: true }
+});
+```
+
+**Details**
+
+* Capturing `commit` information is useful when you'd like to see it in your HTML (or a third party) report.
+* Capturing `diff` information is useful to enrich the report with the actual source diff. This information can be used to provide intelligent advice on how to fix the test.
+
+:::note
+Default values for these settings depend on the environment. When tests run as a part of CI where it is safe to obtain git information, the default value is `true`, `false` otherwise.
+:::
+
+:::note
+The structure of the git commit metadata is subject to change.
+:::
+
+
 ## property: TestConfig.expect
 * since: v1.10
 - type: ?<[Object]>
   - `timeout` ?<[int]> Default timeout for async expect matchers in milliseconds, defaults to 5000ms.
   - `toHaveScreenshot` ?<[Object]> Configuration for the [`method: PageAssertions.toHaveScreenshot#1`] method.
-    - `animations` ?<[ScreenshotAnimations]<"allow"|"disabled">> See [`option: animations`] in [`method: Page.screenshot`]. Defaults to `"disabled"`.
-    - `caret` ?<[ScreenshotCaret]<"hide"|"initial">> See [`option: caret`] in [`method: Page.screenshot`]. Defaults to `"hide"`.
+    - `animations` ?<[ScreenshotAnimations]<"allow"|"disabled">> See [`option: Page.screenshot.animations`] in [`method: Page.screenshot`]. Defaults to `"disabled"`.
+    - `caret` ?<[ScreenshotCaret]<"hide"|"initial">> See [`option: Page.screenshot.caret`] in [`method: Page.screenshot`]. Defaults to `"hide"`.
     - `maxDiffPixels` ?<[int]> An acceptable amount of pixels that could be different, unset by default.
     - `maxDiffPixelRatio` ?<[float]> An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1` , unset by default.
-    - `scale` ?<[ScreenshotScale]<"css"|"device">> See [`option: scale`] in [`method: Page.screenshot`]. Defaults to `"css"`.
-    - `stylePath` ?<[string]|[Array]<[string]>> See [`option: style`] in [`method: Page.screenshot`].
+    - `scale` ?<[ScreenshotScale]<"css"|"device">> See [`option: Page.screenshot.scale`] in [`method: Page.screenshot`]. Defaults to `"css"`.
+    - `stylePath` ?<[string]|[Array]<[string]>> See [`option: Page.screenshot.style`] in [`method: Page.screenshot`].
     - `threshold` ?<[float]> An acceptable perceived color difference between the same pixel in compared images, ranging from `0` (strict) and `1` (lax). `"pixelmatch"` comparator computes color difference in [YIQ color space](https://en.wikipedia.org/wiki/YIQ) and defaults `threshold` value to `0.2`.
+    - `pathTemplate` ?<[string]> A template controlling location of the screenshots. See [`property: TestConfig.snapshotPathTemplate`] for details.
+  - `toMatchAriaSnapshot` ?<[Object]> Configuration for the [`method: LocatorAssertions.toMatchAriaSnapshot#2`] method.
+    - `pathTemplate` ?<[string]> A template controlling location of the aria snapshots. See [`property: TestConfig.snapshotPathTemplate`] for details.
   - `toMatchSnapshot` ?<[Object]> Configuration for the [`method: SnapshotAssertions.toMatchSnapshot#1`] method.
     - `maxDiffPixels` ?<[int]> An acceptable amount of pixels that could be different, unset by default.
     - `maxDiffPixelRatio` ?<[float]> An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1` , unset by default.
@@ -73,6 +108,24 @@ export default defineConfig({
 });
 ```
 
+## property: TestConfig.failOnFlakyTests
+* since: v1.52
+- type: ?<[boolean]>
+
+Whether to exit with an error if any tests are marked as flaky. Useful on CI.
+
+Also available in the [command line](../test-cli.md) with the `--fail-on-flaky-tests` option.
+
+**Usage**
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  failOnFlakyTests: !!process.env.CI,
+});
+```
+
 ## property: TestConfig.forbidOnly
 * since: v1.10
 - type: ?<[boolean]>
@@ -110,9 +163,9 @@ export default defineConfig({
 
 ## property: TestConfig.globalSetup
 * since: v1.10
-- type: ?<[string]>
+- type: ?<[string]|[Array]<[string]>>
 
-Path to the global setup file. This file will be required and run before all the tests. It must export a single function that takes a [FullConfig] argument.
+Path to the global setup file. This file will be required and run before all the tests. It must export a single function that takes a [FullConfig] argument. Pass an array of paths to specify multiple global setup files.
 
 Learn more about [global setup and teardown](../test-global-setup-teardown.md).
 
@@ -128,9 +181,9 @@ export default defineConfig({
 
 ## property: TestConfig.globalTeardown
 * since: v1.10
-- type: ?<[string]>
+- type: ?<[string]|[Array]<[string]>>
 
-Path to the global teardown file. This file will be required and run after all the tests. It must export a single function. See also [`property: TestConfig.globalSetup`].
+Path to the global teardown file. This file will be required and run after all the tests. It must export a single function. See also [`property: TestConfig.globalSetup`]. Pass an array of paths to specify multiple global teardown files.
 
 Learn more about [global setup and teardown](../test-global-setup-teardown.md).
 
@@ -234,7 +287,7 @@ export default defineConfig({
 * since: v1.10
 - type: ?<[Metadata]>
 
-Metadata that will be put directly to the test report serialized as JSON.
+Metadata contains key-value pairs to be included in the report. For example, HTML report will display it as key-value pairs, and JSON report will include metadata serialized as json.
 
 **Usage**
 
@@ -242,7 +295,7 @@ Metadata that will be put directly to the test report serialized as JSON.
 import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
-  metadata: 'acceptance tests',
+  metadata: { title: 'acceptance tests' },
 });
 ```
 
@@ -421,7 +474,7 @@ export default defineConfig({
 * since: v1.10
 - type: ?<[null]|[Object]>
   - `max` <[int]> The maximum number of slow test files to report. Defaults to `5`.
-  - `threshold` <[float]> Test duration in milliseconds that is considered slow. Defaults to 15 seconds.
+  - `threshold` <[float]> Test file duration in milliseconds that is considered slow. Defaults to 5 minutes.
 
 Whether to report slow test files. Pass `null` to disable this feature.
 
@@ -552,14 +605,31 @@ export default defineConfig({
 });
 ```
 
+## property: TestConfig.tsconfig
+* since: v1.49
+- type: ?<[string]>
+
+Path to a single `tsconfig` applicable to all imported files. By default, `tsconfig` for each imported file is looked up separately. Note that `tsconfig` property has no effect while the configuration file or any of its dependencies are loaded. Ignored when `--tsconfig` command line option is specified.
+
+**Usage**
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  tsconfig: './tsconfig.test.json',
+});
+```
+
 ## property: TestConfig.updateSnapshots
 * since: v1.10
-- type: ?<[UpdateSnapshots]<"all"|"none"|"missing">>
+- type: ?<[UpdateSnapshots]<"all"|"changed"|"missing"|"none">>
 
 Whether to update expected snapshots with the actual results produced by the test run. Defaults to `'missing'`.
-* `'all'` - All tests that are executed will update snapshots that did not match. Matching snapshots will not be updated.
-* `'none'` - No snapshots are updated.
+* `'all'` - All tests that are executed will update snapshots.
+* `'changed'` - All tests that are executed will update snapshots that did not match. Matching snapshots will not be updated.
 * `'missing'` - Missing snapshots are created, for example when authoring a new test and running it for the first time. This is the default.
+* `'none'` - No snapshots are updated.
 
 Learn more about [snapshots](../test-snapshots.md).
 
@@ -573,6 +643,15 @@ export default defineConfig({
 });
 ```
 
+## property: TestConfig.updateSourceMethod
+* since: v1.50
+- type: ?<[UpdateSourceMethod]<"overwrite"|"3way"|"patch">>
+
+Defines how to update snapshots in the source code.
+* `'patch'` - Create a unified diff file that can be used to update the source code later. This is the default.
+* `'3way'` - Generate merge conflict markers in source code. This allows user to manually pick relevant changes, as if they are resolving a merge conflict in the IDE.
+* `'overwrite'` - Overwrite the source code with the new snapshot values.
+
 ## property: TestConfig.use
 * since: v1.10
 - type: ?<[TestOptions]>
@@ -597,11 +676,15 @@ export default defineConfig({
   - `command` <[string]> Shell command to start. For example `npm run start`..
   - `cwd` ?<[string]> Current working directory of the spawned process, defaults to the directory of the configuration file.
   - `env` ?<[Object]<[string], [string]>> Environment variables to set for the command, `process.env` by default.
+  - `gracefulShutdown` ?<[Object]> How to shut down the process. If unspecified, the process group is forcefully `SIGKILL`ed. If set to `{ signal: 'SIGTERM', timeout: 500 }`, the process group is sent a `SIGTERM` signal, followed by `SIGKILL` if it doesn't exit within 500ms. You can also use `SIGINT` as the signal instead. A `0` timeout means no `SIGKILL` will be sent. Windows doesn't support `SIGTERM` and `SIGINT` signals, so this option is ignored on Windows. Note that shutting down a Docker container requires `SIGTERM`.
+    - `signal` <["SIGINT"|"SIGTERM"]>
+    - `timeout` <[int]>
   - `ignoreHTTPSErrors` ?<[boolean]> Whether to ignore HTTPS errors when fetching the `url`. Defaults to `false`.
+  - `name` ?<[string]> Specifies a custom name for the web server. This name will be prefixed to log messages. Defaults to `[WebServer]`.
   - `port` ?<[int]> The port that your http server is expected to appear on. It does wait until it accepts connections. Either `port` or `url` should be specified.
   - `reuseExistingServer` ?<[boolean]> If true, it will re-use an existing server on the `port` or `url` when available. If no server is running on that `port` or `url`, it will run the command to start a new server. If `false`, it will throw if an existing process is listening on the `port` or `url`. This should be commonly set to `!process.env.CI` to allow the local dev server when running tests locally.
-  - `stdout` ?<["pipe"|"ignore"]> If `"pipe"`, it will pipe the stdout of the command to the process stdout. If `"ignore"`, it will ignore the stdout of the command. Default to `"ignore"`.
   - `stderr` ?<["pipe"|"ignore"]> Whether to pipe the stderr of the command to the process stderr or ignore it. Defaults to `"pipe"`.
+  - `stdout` ?<["pipe"|"ignore"]> If `"pipe"`, it will pipe the stdout of the command to the process stdout. If `"ignore"`, it will ignore the stdout of the command. Default to `"ignore"`.
   - `timeout` ?<[int]> How long to wait for the process to start up and be available in milliseconds. Defaults to 60000.
   - `url` ?<[string]> The url on your http server that is expected to return a 2xx, 3xx, 400, 401, 402, or 403 status code when the server is ready to accept connections. Redirects (3xx status codes) are being followed and the new location is checked. Either `port` or `url` should be specified.
 
@@ -626,7 +709,7 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   webServer: {
     command: 'npm run start',
-    url: 'http://127.0.0.1:3000',
+    url: 'http://localhost:3000',
     timeout: 120 * 1000,
     reuseExistingServer: !process.env.CI,
   },
@@ -655,19 +738,21 @@ export default defineConfig({
   webServer: [
     {
       command: 'npm run start',
-      url: 'http://127.0.0.1:3000',
+      url: 'http://localhost:3000',
+      name: 'Frontend',
       timeout: 120 * 1000,
       reuseExistingServer: !process.env.CI,
     },
     {
       command: 'npm run backend',
-      url: 'http://127.0.0.1:3333',
+      url: 'http://localhost:3333',
+      name: 'Backend',
       timeout: 120 * 1000,
       reuseExistingServer: !process.env.CI,
     }
   ],
   use: {
-    baseURL: 'http://127.0.0.1:3000',
+    baseURL: 'http://localhost:3000',
   },
 });
 ```
diff --git a/docs/src/test-api/class-testinfo.md b/docs/src/test-api/class-testinfo.md
index cbc125b3bf5ae..9f577cad9caf8 100644
--- a/docs/src/test-api/class-testinfo.md
+++ b/docs/src/test-api/class-testinfo.md
@@ -19,6 +19,7 @@ test('basic test', async ({ page }, testInfo) => {
 - type: <[Array]<[Object]>>
   - `type` <[string]> Annotation type, for example `'skip'` or `'fail'`.
   - `description` ?<[string]> Optional description.
+  - `location` ?<[Location]> Optional location in the source where the annotation is added.
 
 The list of annotations applicable to the current test. Includes annotations from the test, annotations from all [`method: Test.describe`] groups the test belongs to and file-level annotations for the test file.
 
@@ -216,7 +217,9 @@ Test function as passed to `test(title, testFunction)`.
 
 Tags that apply to the test. Learn more about [tags](../test-annotations.md#tag-tests).
 
-Note that any changes made to this list while the test is running will not be visible to test reporters.
+:::note
+Any changes made to this list while the test is running will not be visible to test reporters.
+:::
 
 ## property: TestInfo.testId
 * since: v1.32
@@ -385,17 +388,45 @@ Optional description that will be reflected in a test report.
 * since: v1.10
 - returns: <[string]>
 
-Returns a path to a snapshot file with the given `pathSegments`. Learn more about [snapshots](../test-snapshots.md).
+Returns a path to a snapshot file with the given `name`. Pass [`option: kind`] to obtain a specific path:
+* `kind: 'screenshot'` for [`method: PageAssertions.toHaveScreenshot#1`];
+* `kind: 'aria'` for [`method: LocatorAssertions.toMatchAriaSnapshot`];
+* `kind: 'snapshot'` for [`method: SnapshotAssertions.toMatchSnapshot#1`].
+
+**Usage**
+
+```js
+await expect(page).toHaveScreenshot('header.png');
+// Screenshot assertion above expects screenshot at this path:
+const screenshotPath = test.info().snapshotPath('header.png', { kind: 'screenshot' });
+
+await expect(page.getByRole('main')).toMatchAriaSnapshot({ name: 'main.aria.yml' });
+// Aria snapshot assertion above expects snapshot at this path:
+const ariaSnapshotPath = test.info().snapshotPath('main.aria.yml', { kind: 'aria' });
 
-> Note that `pathSegments` accepts path segments to the snapshot file such as `testInfo.snapshotPath('relative', 'path', 'to', 'snapshot.png')`.
-> However, this path must stay within the snapshots directory for each test file (i.e. `a.spec.js-snapshots`), otherwise it will throw.
+expect('some text').toMatchSnapshot('snapshot.txt');
+// Snapshot assertion above expects snapshot at this path:
+const snapshotPath = test.info().snapshotPath('snapshot.txt');
 
-### param: TestInfo.snapshotPath.pathSegments
+expect('some text').toMatchSnapshot(['dir', 'subdir', 'snapshot.txt']);
+// Snapshot assertion above expects snapshot at this path:
+const nestedPath = test.info().snapshotPath('dir', 'subdir', 'snapshot.txt');
+```
+
+### param: TestInfo.snapshotPath.name
 * since: v1.10
-- `...pathSegments` <[Array]<[string]>>
+- `...name` <[Array]<[string]>>
 
 The name of the snapshot or the path segments to define the snapshot file path. Snapshots with the same name in the same test file are expected to be the same.
 
+When passing [`option: kind`], multiple name segments are not supported.
+
+### option: TestInfo.snapshotPath.kind
+* since: v1.53
+- `kind` <[SnapshotKind]<"snapshot"|"screenshot"|"aria">>
+
+The snapshot kind controls which snapshot path template is used. See [`property: TestConfig.snapshotPathTemplate`] for more details. Defaults to `'snapshot'`.
+
 ## property: TestInfo.snapshotSuffix
 * since: v1.10
 - type: <[string]>
@@ -451,7 +482,7 @@ The title of the currently running test as passed to `test(title, testFunction)`
 * since: v1.10
 - type: <[Array]<[string]>>
 
-The full title path starting with the project.
+The full title path starting with the test file name.
 
 ## property: TestInfo.workerIndex
 * since: v1.10
diff --git a/docs/src/test-api/class-testinfoerror.md b/docs/src/test-api/class-testinfoerror.md
index 66e78ecabdafc..eadcaff0fda85 100644
--- a/docs/src/test-api/class-testinfoerror.md
+++ b/docs/src/test-api/class-testinfoerror.md
@@ -4,6 +4,12 @@
 
 Information about an error thrown during test execution.
 
+## property: TestInfoError.cause
+* since: v1.49
+- type: ?<[TestInfoError]>
+
+Error cause. Set when there is a [cause](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause) for the error. Will be `undefined` if there is no cause or if the cause is not an instance of [Error].
+
 ## property: TestInfoError.message
 * since: v1.10
 - type: ?<[string]>
diff --git a/docs/src/test-api/class-testoptions.md b/docs/src/test-api/class-testoptions.md
index 47bfd1f377ab6..c2854306164ad 100644
--- a/docs/src/test-api/class-testoptions.md
+++ b/docs/src/test-api/class-testoptions.md
@@ -392,8 +392,11 @@ export default defineConfig({
 });
 ```
 
-## property: TestOptions.locale = %%-context-option-locale-%%
+## property: TestOptions.locale
 * since: v1.10
+- type: <[string]>
+
+Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value, `Accept-Language` request header value as well as number and date formatting rules. Defaults to `en-US`. Learn more about emulation in our [emulation guide](../emulation.md#locale--timezone).
 
 **Usage**
 
@@ -479,8 +482,8 @@ export default defineConfig({
 
 ## property: TestOptions.screenshot
 * since: v1.10
-- type: <[Object]|[ScreenshotMode]<"off"|"on"|"only-on-failure">>
-  - `mode` <[ScreenshotMode]<"off"|"on"|"only-on-failure">> Automatic screenshot mode.
+- type: <[Object]|[ScreenshotMode]<"off"|"on"|"only-on-failure"|"on-first-failure">>
+  - `mode` <[ScreenshotMode]<"off"|"on"|"only-on-failure"|"on-first-failure">> Automatic screenshot mode.
   - `fullPage` ?<[boolean]> When true, takes a screenshot of the full scrollable page, instead of the currently visible viewport. Defaults to `false`.
   - `omitBackground` ?<[boolean]> Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images. Defaults to `false`.
 
@@ -488,6 +491,7 @@ Whether to automatically capture a screenshot after each test. Defaults to `'off
 * `'off'`: Do not capture screenshots.
 * `'on'`: Capture screenshot after each test.
 * `'only-on-failure'`: Capture screenshot after each test failure.
+* `'on-first-failure'`: Capture screenshot after each test's first failure.
 
 **Usage**
 
diff --git a/docs/src/test-api/class-testproject.md b/docs/src/test-api/class-testproject.md
index 5e7c911a65bb6..30f316c82b151 100644
--- a/docs/src/test-api/class-testproject.md
+++ b/docs/src/test-api/class-testproject.md
@@ -94,10 +94,13 @@ export default defineConfig({
     - `threshold` ?<[float]> an acceptable perceived color difference between the same pixel in compared images, ranging from `0` (strict) and `1` (lax). `"pixelmatch"` comparator computes color difference in [YIQ color space](https://en.wikipedia.org/wiki/YIQ) and defaults `threshold` value to `0.2`.
     - `maxDiffPixels` ?<[int]> an acceptable amount of pixels that could be different, unset by default.
     - `maxDiffPixelRatio` ?<[float]> an acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1` , unset by default.
-    - `animations` ?<[ScreenshotAnimations]<"allow"|"disabled">> See [`option: animations`] in [`method: Page.screenshot`]. Defaults to `"disabled"`.
-    - `caret` ?<[ScreenshotCaret]<"hide"|"initial">> See [`option: caret`] in [`method: Page.screenshot`]. Defaults to `"hide"`.
-    - `scale` ?<[ScreenshotScale]<"css"|"device">> See [`option: scale`] in [`method: Page.screenshot`]. Defaults to `"css"`.
-    - `stylePath` ?<[string]|[Array]<[string]>> See [`option: style`] in [`method: Page.screenshot`].
+    - `animations` ?<[ScreenshotAnimations]<"allow"|"disabled">> See [`option: Page.screenshot.animations`] in [`method: Page.screenshot`]. Defaults to `"disabled"`.
+    - `caret` ?<[ScreenshotCaret]<"hide"|"initial">> See [`option: Page.screenshot.caret`] in [`method: Page.screenshot`]. Defaults to `"hide"`.
+    - `scale` ?<[ScreenshotScale]<"css"|"device">> See [`option: Page.screenshot.scale`] in [`method: Page.screenshot`]. Defaults to `"css"`.
+    - `stylePath` ?<[string]|[Array]<[string]>> See [`option: Page.screenshot.style`] in [`method: Page.screenshot`].
+    - `pathTemplate` ?<[string]> A template controlling location of the screenshots. See [`property: TestProject.snapshotPathTemplate`] for details.
+  - `toMatchAriaSnapshot` ?<[Object]> Configuration for the [`method: LocatorAssertions.toMatchAriaSnapshot#2`] method.
+    - `pathTemplate` ?<[string]> A template controlling location of the aria snapshots. See [`property: TestProject.snapshotPathTemplate`] for details.
   - `toMatchSnapshot` ?<[Object]> Configuration for the [`method: SnapshotAssertions.toMatchSnapshot#1`] method.
     - `threshold` ?<[float]> an acceptable perceived color difference between the same pixel in compared images, ranging from `0` (strict) and `1` (lax). `"pixelmatch"` comparator computes color difference in [YIQ color space](https://en.wikipedia.org/wiki/YIQ) and defaults `threshold` value to `0.2`.
     - `maxDiffPixels` ?<[int]> an acceptable amount of pixels that could be different, unset by default.
@@ -131,7 +134,7 @@ Filter to only run tests with a title matching one of the patterns. For example,
 * since: v1.10
 - type: ?<[RegExp]|[Array]<[RegExp]>>
 
-Filter to only run tests with a title **not** matching one of the patterns. This is the opposite of [`property: TestProject.grep`]. Also available globally and in the [command line](../test-cli.md) with the `--grep-invert` option.
+Filter to only run tests with a title **not** matching any of the patterns. This is the opposite of [`property: TestProject.grep`]. Also available globally and in the [command line](../test-cli.md) with the `--grep-invert` option.
 
 `grepInvert` option is also useful for [tagging tests](../test-annotations.md#tag-tests).
 
@@ -180,6 +183,10 @@ Metadata that will be put directly to the test report serialized as JSON.
 
 Project name is visible in the report and during test execution.
 
+:::warning
+Playwright executes the configuration file multiple times. Do not dynamically produce non-stable values in your configuration.
+:::
+
 ## property: TestProject.snapshotDir
 * since: v1.10
 - type: ?<[string]>
@@ -385,3 +392,35 @@ export default defineConfig({
 ```
 
 Use [`property: TestConfig.use`] to change this option for all projects.
+
+## property: TestProject.workers
+* since: v1.52
+- type: ?<[int]|[string]>
+
+The maximum number of concurrent worker processes to use for parallelizing tests from this project. Can also be set as percentage of logical CPU cores, e.g. `'50%'.`
+
+This could be useful, for example, when all tests from a project share a single resource like a test account, and therefore cannot be executed in parallel. Limiting workers to one for such a project will prevent simultaneous use of the shared resource.
+
+Note that the global [`property: TestConfig.workers`] limit applies to the total number of worker processes. However, Playwright will limit the number of workers used for this project by the value of [`property: TestProject.workers`].
+
+By default, there is no limit per project. See [`property: TestConfig.workers`] for the default of the total worker limit.
+
+**Usage**
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  workers: 10,  // total workers limit
+
+  projects: [
+    {
+      name: 'runs in parallel',
+    },
+    {
+      name: 'one at a time',
+      workers: 1,  // workers limit for this project
+    },
+  ],
+});
+```
diff --git a/docs/src/test-api/class-teststepinfo.md b/docs/src/test-api/class-teststepinfo.md
new file mode 100644
index 0000000000000..34abfaf0bf48e
--- /dev/null
+++ b/docs/src/test-api/class-teststepinfo.md
@@ -0,0 +1,136 @@
+# class: TestStepInfo
+* since: v1.51
+* langs: js
+
+`TestStepInfo` contains information about currently running test step. It is passed as an argument to the step function. `TestStepInfo` provides utilities to control test step execution.
+
+```js
+import { test, expect } from '@playwright/test';
+
+test('basic test', async ({ page, browserName }) => {
+  await test.step('check some behavior', async step => {
+    step.skip(browserName === 'webkit', 'The feature is not available in WebKit');
+    // ... rest of the step code
+  });
+});
+```
+
+## async method: TestStepInfo.attach
+* since: v1.51
+
+Attach a value or a file from disk to the current test step. Some reporters show test step attachments. Either [`option: path`] or [`option: body`] must be specified, but not both. Calling this method will attribute the attachment to the step, as opposed to [`method: TestInfo.attach`] which stores all attachments at the test level.
+
+For example, you can attach a screenshot to the test step:
+
+```js
+import { test, expect } from '@playwright/test';
+
+test('basic test', async ({ page }) => {
+  await page.goto('https://playwright.dev');
+  await test.step('check page rendering', async step => {
+    const screenshot = await page.screenshot();
+    await step.attach('screenshot', { body: screenshot, contentType: 'image/png' });
+  });
+});
+```
+
+Or you can attach files returned by your APIs:
+
+```js
+import { test, expect } from '@playwright/test';
+import { download } from './my-custom-helpers';
+
+test('basic test', async ({}) => {
+  await test.step('check download behavior', async step => {
+    const tmpPath = await download('a');
+    await step.attach('downloaded', { path: tmpPath });
+  });
+});
+```
+
+:::note
+[`method: TestStepInfo.attach`] automatically takes care of copying attached files to a
+location that is accessible to reporters. You can safely remove the attachment
+after awaiting the attach call.
+:::
+
+### param: TestStepInfo.attach.name
+* since: v1.51
+- `name` <[string]>
+
+Attachment name. The name will also be sanitized and used as the prefix of file name
+when saving to disk.
+
+### option: TestStepInfo.attach.body
+* since: v1.51
+- `body` <[string]|[Buffer]>
+
+Attachment body. Mutually exclusive with [`option: path`].
+
+### option: TestStepInfo.attach.contentType
+* since: v1.51
+- `contentType` <[string]>
+
+Content type of this attachment to properly present in the report, for example `'application/json'` or `'image/png'`. If omitted, content type is inferred based on the [`option: path`], or defaults to `text/plain` for [string] attachments and `application/octet-stream` for [Buffer] attachments.
+
+### option: TestStepInfo.attach.path
+* since: v1.51
+- `path` <[string]>
+
+Path on the filesystem to the attached file. Mutually exclusive with [`option: body`].
+
+## method: TestStepInfo.skip#1
+* since: v1.51
+
+Abort the currently running step and mark it as skipped. Useful for steps that are currently failing and planned for a near-term fix.
+
+**Usage**
+
+```js
+import { test, expect } from '@playwright/test';
+
+test('my test', async ({ page }) => {
+  await test.step('check expectations', async step => {
+    step.skip();
+    // step body below will not run
+    // ...
+  });
+});
+```
+
+## method: TestStepInfo.skip#2
+* since: v1.51
+
+Conditionally abort the currently running step and mark it as skipped with an optional description. Useful for steps that should not be executed in some cases.
+
+**Usage**
+
+```js
+import { test, expect } from '@playwright/test';
+
+test('my test', async ({ page, isMobile }) => {
+  await test.step('check desktop expectations', async step => {
+    step.skip(isMobile, 'not present in the mobile layout');
+    // step body below will not run
+    // ...
+  });
+});
+```
+
+### param: TestStepInfo.skip#2.condition
+* since: v1.51
+- `condition` <[boolean]>
+
+A skip condition. Test step is skipped when the condition is `true`.
+
+### param: TestStepInfo.skip#2.description
+* since: v1.51
+- `description` ?<[string]>
+
+Optional description that will be reflected in a test report.
+
+## property: TestStepInfo.titlePath
+* since: v1.55
+- type: <[Array]<[string]>>
+
+The full title path starting with the test file name, including the step titles. See also [`property: TestInfo.titlePath`].
diff --git a/docs/src/test-assertions-csharp-java-python.md b/docs/src/test-assertions-csharp-java-python.md
index 3e8e634a07c1b..114de1624a8cc 100644
--- a/docs/src/test-assertions-csharp-java-python.md
+++ b/docs/src/test-assertions-csharp-java-python.md
@@ -17,6 +17,7 @@ title: "Assertions"
 | [`method: LocatorAssertions.toBeHidden`] | Element is not visible |
 | [`method: LocatorAssertions.toBeInViewport`] | Element intersects viewport |
 | [`method: LocatorAssertions.toBeVisible`] | Element is visible |
+| [`method: LocatorAssertions.toContainClass`] | Element has specified CSS classes |
 | [`method: LocatorAssertions.toContainText`] | Element contains text |
 | [`method: LocatorAssertions.toHaveAccessibleDescription`] | Element has a matching [accessible description](https://w3c.github.io/accname/#dfn-accessible-description) |
 | [`method: LocatorAssertions.toHaveAccessibleName`] | Element has a matching [accessible name](https://w3c.github.io/accname/#dfn-accessible-name) |
@@ -30,6 +31,7 @@ title: "Assertions"
 | [`method: LocatorAssertions.toHaveText`] | Element matches text |
 | [`method: LocatorAssertions.toHaveValue`] | Input has a value |
 | [`method: LocatorAssertions.toHaveValues`] | Select has options selected |
+| [`method: LocatorAssertions.toMatchAriaSnapshot`] | Element matches provided Aria snapshot |
 | [`method: PageAssertions.toHaveTitle`] | Page has a title |
 | [`method: PageAssertions.toHaveURL`] | Page has a URL |
 | [`method: APIResponseAssertions.toBeOK`] | Response has an OK status |
@@ -81,6 +83,8 @@ expect.set_options(timeout=10_000)
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -127,6 +131,42 @@ public class UnitTest1 : PageTest
 }
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```csharp title="UnitTest1.cs"
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    UnitTest1()
+    {
+        SetDefaultExpectTimeout(10_000);
+    }
+    // ...
+}
+```
+</TabItem>
+<TabItem value="xunit-v3">
+
+```csharp title="UnitTest1.cs"
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    UnitTest1()
+    {
+        SetDefaultExpectTimeout(10_000);
+    }
+    // ...
+}
+```
 </TabItem>
 </Tabs>
 
diff --git a/docs/src/test-assertions-js.md b/docs/src/test-assertions-js.md
index defbc3a293e82..3efc0db5e5894 100644
--- a/docs/src/test-assertions-js.md
+++ b/docs/src/test-assertions-js.md
@@ -40,10 +40,11 @@ Note that retrying assertions are async, so you must `await` them.
 | [await expect(locator).toBeInViewport()](./api/class-locatorassertions.md#locator-assertions-to-be-in-viewport) | Element intersects viewport |
 | [await expect(locator).toBeVisible()](./api/class-locatorassertions.md#locator-assertions-to-be-visible) | Element is visible |
 | [await expect(locator).toContainText()](./api/class-locatorassertions.md#locator-assertions-to-contain-text) | Element contains text |
+| [await expect(locator).toContainClass()](./api/class-locatorassertions.md#locator-assertions-to-contain-class) | Element has specified CSS classes |
 | [await expect(locator).toHaveAccessibleDescription()](./api/class-locatorassertions.md#locator-assertions-to-have-accessible-description) | Element has a matching [accessible description](https://w3c.github.io/accname/#dfn-accessible-description) |
 | [await expect(locator).toHaveAccessibleName()](./api/class-locatorassertions.md#locator-assertions-to-have-accessible-name) | Element has a matching [accessible name](https://w3c.github.io/accname/#dfn-accessible-name) |
 | [await expect(locator).toHaveAttribute()](./api/class-locatorassertions.md#locator-assertions-to-have-attribute) | Element has a DOM attribute |
-| [await expect(locator).toHaveClass()](./api/class-locatorassertions.md#locator-assertions-to-have-class) | Element has a class property |
+| [await expect(locator).toHaveClass()](./api/class-locatorassertions.md#locator-assertions-to-have-class) | Element has specified CSS class property |
 | [await expect(locator).toHaveCount()](./api/class-locatorassertions.md#locator-assertions-to-have-count) | List has exact number of children |
 | [await expect(locator).toHaveCSS()](./api/class-locatorassertions.md#locator-assertions-to-have-css) | Element has CSS property |
 | [await expect(locator).toHaveId()](./api/class-locatorassertions.md#locator-assertions-to-have-id) | Element has an ID |
@@ -53,6 +54,7 @@ Note that retrying assertions are async, so you must `await` them.
 | [await expect(locator).toHaveText()](./api/class-locatorassertions.md#locator-assertions-to-have-text) | Element matches text |
 | [await expect(locator).toHaveValue()](./api/class-locatorassertions.md#locator-assertions-to-have-value) | Input has a value |
 | [await expect(locator).toHaveValues()](./api/class-locatorassertions.md#locator-assertions-to-have-values) | Select has options selected |
+| [await expect(locator).toMatchAriaSnapshot()](./api/class-locatorassertions.md#locator-assertions-to-match-aria-snapshot) | Element matches the Aria snapshot |
 | [await expect(page).toHaveScreenshot()](./api/class-pageassertions.md#page-assertions-to-have-screenshot-1) | Page has a screenshot |
 | [await expect(page).toHaveTitle()](./api/class-pageassertions.md#page-assertions-to-have-title) | Page has a title |
 | [await expect(page).toHaveURL()](./api/class-pageassertions.md#page-assertions-to-have-url) | Page has a URL |
@@ -223,6 +225,17 @@ await expect.poll(async () => {
 }).toBe(200);
 ```
 
+You can combine `expect.configure({ soft: true })` with expect.poll to perform soft assertions in polling logic.
+
+```js
+const softExpect = expect.configure({ soft: true });
+await softExpect.poll(async () => {
+  const response = await page.request.get('https://api.example.com');
+  return response.status();
+}, {}).toBe(200);
+```
+This allows the test to continue even if the assertion inside poll fails.
+
 ## expect.toPass
 
 You can retry blocks of code until they are passing successfully.
@@ -254,11 +267,11 @@ Note that by default `toPass` has timeout 0 and does not respect custom [expect
 
 You can extend Playwright assertions by providing custom matchers. These matchers will be available on the `expect` object.
 
-In this example we add a custom `toHaveAmount` function. Custom matcher should return a `message` callback and a `pass` flag indicating whether the assertion passed.
+In this example we add a custom `toHaveAmount` function. Custom matcher should return a `pass` flag indicating whether the assertion passed, and a `message` callback that's used when the assertion fails.
 
 ```js title="fixtures.ts"
 import { expect as baseExpect } from '@playwright/test';
-import type { Page, Locator } from '@playwright/test';
+import type { Locator } from '@playwright/test';
 
 export { test } from '@playwright/test';
 
@@ -268,18 +281,23 @@ export const expect = baseExpect.extend({
     let pass: boolean;
     let matcherResult: any;
     try {
-      await baseExpect(locator).toHaveAttribute('data-amount', String(expected), options);
+      const expectation = this.isNot ? baseExpect(locator).not : baseExpect(locator);
+      await expectation.toHaveAttribute('data-amount', String(expected), options);
       pass = true;
     } catch (e: any) {
       matcherResult = e.matcherResult;
       pass = false;
     }
 
+    if (this.isNot) {
+      pass =!pass;
+    }
+
     const message = pass
       ? () => this.utils.matcherHint(assertionName, undefined, undefined, { isNot: this.isNot }) +
           '\n\n' +
           `Locator: ${locator}\n` +
-          `Expected: ${this.isNot ? 'not' : ''}${this.utils.printExpected(expected)}\n` +
+          `Expected: not ${this.utils.printExpected(expected)}\n` +
           (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '')
       : () =>  this.utils.matcherHint(assertionName, undefined, undefined, { isNot: this.isNot }) +
           '\n\n' +
diff --git a/docs/src/test-cli-js.md b/docs/src/test-cli-js.md
index 346d0bc8b55dc..0688e328d767a 100644
--- a/docs/src/test-cli-js.md
+++ b/docs/src/test-cli-js.md
@@ -3,105 +3,285 @@ id: test-cli
 title: "Command line"
 ---
 
-## Introduction
-
-Here are the most common options available in the command line.
-
-- Run all the tests
-  ```bash
-  npx playwright test
-  ```
-
-- Run a single test file
-  ```bash
-  npx playwright test tests/todo-page.spec.ts
-  ```
-
-- Run a set of test files
-  ```bash
-  npx playwright test tests/todo-page/ tests/landing-page/
-  ```
-
-- Run files that have `my-spec` or `my-spec-2` in the file name
-  ```bash
-  npx playwright test my-spec my-spec-2
-  ```
-
-- Run tests that are in line 42 in my-spec.ts
-  ```bash
-  npx playwright test my-spec.ts:42
-  ```
-
-- Run the test with the title
-  ```bash
-  npx playwright test -g "add a todo item"
-  ```
-
-- Run tests in headed browsers
-  ```bash
-  npx playwright test --headed
-  ```
-
-- Run all the tests against a specific project
-  ```bash
-  npx playwright test --project=chromium
-  ```
-
-- Disable [parallelization](./test-parallel.md)
-  ```bash
-  npx playwright test --workers=1
-  ```
-
-- Choose a [reporter](./test-reporters.md)
-  ```bash
-  npx playwright test --reporter=dot
-  ```
-
-- Run in debug mode with [Playwright Inspector](./debug.md)
-  ```bash
-  npx playwright test --debug
-  ```
-
-- Run tests in interactive UI mode, with a built-in watch mode (Preview)
-  ```bash
-  npx playwright test --ui
-  ```
-
-- Ask for help
-  ```bash
-  npx playwright test --help
-  ```
-
-## Reference
-
-Complete set of Playwright Test options is available in the [configuration file](./test-use-options.md). Following options can be passed to a command line and take priority over the configuration file:
+Playwright provides a powerful command line interface for running tests, generating code, debugging, and more. The most up to date list of commands and arguments available on the CLI can always be retrieved via `npx playwright --help`.
+
+## Essential Commands
+
+### Run Tests
+
+Run your Playwright tests. [Read more about running tests](./running-tests.md).
+
+#### Syntax
+
+```bash
+npx playwright test [options] [test-filter...]
+```
+
+#### Examples
+
+```bash
+# Run all tests
+npx playwright test
+
+# Run a single test file
+npx playwright test tests/todo-page.spec.ts
+
+# Run a set of test files
+npx playwright test tests/todo-page/ tests/landing-page/
+
+# Run tests at a specific line
+npx playwright test my-spec.ts:42
+
+# Run tests by title
+npx playwright test -g "add a todo item"
+
+# Run tests in headed browsers
+npx playwright test --headed
+
+# Run tests for a specific project
+npx playwright test --project=chromium
+
+# Get help
+npx playwright test --help
+```
+
+**Disable [parallelization](./test-parallel.md)**
+
+```bash
+npx playwright test --workers=1
+```
+
+**Run in debug mode with [Playwright Inspector](./debug.md)**
+
+```bash
+npx playwright test --debug
+```
+
+**Run tests in interactive [UI mode](./test-ui-mode.md)**
+
+```bash
+npx playwright test --ui
+```
+
+#### Common Options
+
+| Option | Description |
+| :--- | :--- |
+| `--debug` | Run tests with Playwright Inspector. Shortcut for `PWDEBUG=1` environment variable and `--timeout=0 --max-failures=1 --headed --workers=1` options. |
+| `--headed` | Run tests in headed browsers (default: headless). |
+| `-g <grep>` or `--grep <grep>` | Only run tests matching this regular expression (default: ".*"). |
+| `--project <project-name...>` | Only run tests from the specified list of projects, supports '*' wildcard (default: run all projects). |
+| `--ui` | Run tests in interactive UI mode. |
+| `-j <workers>` or `--workers <workers>` | Number of concurrent workers or percentage of logical CPU cores, use 1 to run in a single worker (default: 50%). |
+
+#### All Options
+
+| Option | Description |
+| :--- | :--- |
+| Non-option arguments | Each argument is treated as a regular expression matched against the full test file path. Only tests from files matching the pattern will be executed. Special symbols like `$` or `*` should be escaped with `\`. In many shells/terminals you may need to quote the arguments. |
+| `-c <file>` or `--config <file>` | Configuration file, or a test directory with optional "playwright.config.&#123;m,c&#125;?&#123;js,ts&#125;". Defaults to `playwright.config.ts` or `playwright.config.js` in the current directory. |
+| `--debug` | Run tests with Playwright Inspector. Shortcut for `PWDEBUG=1` environment variable and `--timeout=0 --max-failures=1 --headed --workers=1` options. |
+| `--fail-on-flaky-tests` | Fail if any test is flagged as flaky (default: false). |
+| `--forbid-only` | Fail if `test.only` is called (default: false). Useful on CI. |
+| `--fully-parallel` | Run all tests in parallel (default: false). |
+| `--global-timeout <timeout>` | Maximum time this test suite can run in milliseconds (default: unlimited). |
+| `-g <grep>` or `--grep <grep>` | Only run tests matching this regular expression (default: ".*"). |
+| `--grep-invert <grep>` | Only run tests that do not match this regular expression. |
+| `--headed` | Run tests in headed browsers (default: headless). |
+| `--ignore-snapshots` | Ignore screenshot and snapshot expectations. |
+| `-j <workers>` or `--workers <workers>` | Number of concurrent workers or percentage of logical CPU cores, use 1 to run in a single worker (default: 50%). |
+| `--last-failed` | Only re-run the failures. |
+| `--list` | Collect all the tests and report them, but do not run. |
+| `--max-failures <N>` or `-x` | Stop after the first `N` failures. Passing `-x` stops after the first failure. |
+| `--no-deps` | Do not run project dependencies. |
+| `--output <dir>` | Folder for output artifacts (default: "test-results"). |
+| `--only-changed [ref]` | Only run test files that have been changed between 'HEAD' and 'ref'. Defaults to running all uncommitted changes. Only supports Git. |
+| `--pass-with-no-tests` | Makes test run succeed even if no tests were found. |
+| `--project <project-name...>` | Only run tests from the specified list of projects, supports '*' wildcard (default: run all projects). |
+| `--quiet` | Suppress stdio. |
+| `--repeat-each <N>` | Run each test `N` times (default: 1). |
+| `--reporter <reporter>` | Reporter to use, comma-separated, can be "dot", "line", "list", or others (default: "list"). You can also pass a path to a custom reporter file. |
+| `--retries <retries>` | Maximum retry count for flaky tests, zero for no retries (default: no retries). |
+| `--shard <shard>` | Shard tests and execute only the selected shard, specified in the form "current/all", 1-based, e.g., "3/5". |
+| `--timeout <timeout>` | Specify test timeout threshold in milliseconds, zero for unlimited (default: 30 seconds). |
+| `--trace <mode>` | Force tracing mode, can be `on`, `off`, `on-first-retry`, `on-all-retries`, `retain-on-failure`, `retain-on-first-failure`. |
+| `--tsconfig <path>` | Path to a single tsconfig applicable to all imported files (default: look up tsconfig for each imported file separately). |
+| `--ui` | Run tests in interactive UI mode. |
+| `--ui-host <host>` | Host to serve UI on; specifying this option opens UI in a browser tab. |
+| `--ui-port <port>` | Port to serve UI on, 0 for any free port; specifying this option opens UI in a browser tab. |
+| `-u` or `--update-snapshots [mode]` | Update snapshots with actual results. Possible values are "all", "changed", "missing", and "none". Running tests without the flag defaults to "missing"; running tests with the flag but without a value defaults to "changed". |
+| `--update-source-method [mode]` | Update snapshots with actual results. Possible values are "patch" (default), "3way" and "overwrite". "Patch" creates a unified diff file that can be used to update the source code later. "3way" generates merge conflict markers in source code. "Overwrite" overwrites the source code with the new snapshot values.|
+| `-x` | Stop after the first failure. |
+
+
+### Show Report
+
+Display HTML report from previous test run. [Read more about the HTML reporter](./test-reporters#html-reporter).
+
+#### Syntax
+
+```bash
+npx playwright show-report [report] [options]
+```
+
+#### Examples
+
+```bash
+# Show latest test report
+npx playwright show-report
+
+# Show a specific report
+npx playwright show-report playwright-report/
+
+# Show report on custom port
+npx playwright show-report --port 8080
+```
+
+#### Options
 
 | Option | Description |
-| :- | :- |
-| Non-option arguments | Each argument is treated as a regular expression matched against the full test file path. Only tests from the files matching the pattern will be executed. Special symbols like `$` or `*` should be escaped with `\`. In many shells/terminals you may need to quote the arguments. |
-| `-c <file>` or `--config <file>`| Configuration file. If not passed, defaults to `playwright.config.ts` or `playwright.config.js` in the current directory. |
-| `--debug`| Run tests with Playwright Inspector. Shortcut for `PWDEBUG=1` environment variable and `--timeout=0 --max-failures=1 --headed --workers=1` options.|
-| `--fail-on-flaky-tests` | Fails test runs that contain flaky tests. By default flaky tests count as successes. |
-| `--forbid-only` | Whether to disallow `test.only`. Useful on CI.|
-| `--global-timeout <number>` | Total timeout for the whole test run in milliseconds. By default, there is no global timeout. Learn more about [various timeouts](./test-timeouts.md).|
-| `-g <grep>` or `--grep <grep>` | Only run tests matching this regular expression. For example, this will run `'should add to cart'` when passed `-g "add to cart"`.  The regular expression will be tested against the string that consists of the project name, test file name, `test.describe` titles if any, test title and all test tags, separated by spaces, e.g. `chromium my-test.spec.ts my-suite my-test @smoke`. The filter does not apply to the tests from dependency projects, i.e. Playwright will still run all tests from [project dependencies](./test-projects.md#dependencies). |
-| `--grep-invert <grep>` | Only run tests **not** matching this regular expression. The opposite of `--grep`. The filter does not apply to the tests from dependency projects, i.e. Playwright will still run all tests from [project dependencies](./test-projects.md#dependencies).|
-| `--headed` | Run tests in headed browsers. Useful for debugging. |
-| `--ignore-snapshots` | Whether to ignore [snapshots](./test-snapshots.md). Use this when snapshot expectations are known to be different, e.g. running tests on Linux against Windows screenshots. |
-| `--last-failed` | Only re-run the failures.|
-| `--list` | list all the tests, but do not run them.|
-| `--max-failures <N>` or `-x`| Stop after the first `N` test failures. Passing `-x` stops after the first failure.|
-| `--no-deps` | Ignore the dependencies between projects and behave as if they were not specified. |
-| `--output <dir>` | Directory for artifacts produced by tests, defaults to `test-results`. |
-| `--only-changed [ref]` | Only run test files that have been changed between working tree and "ref". Defaults to running all uncommitted changes with ref=HEAD. Only supports Git. |
-| `--pass-with-no-tests` | Allows the test suite to pass when no files are found. |
-| `--project <name>` | Only run tests from the specified [projects](./test-projects.md), supports '*' wildcard. Defaults to running all projects defined in the configuration file.|
-| `--quiet` | Whether to suppress stdout and stderr from the tests. |
-| `--repeat-each <N>` | Run each test `N` times, defaults to one. |
-| `--reporter <reporter>` | Choose a reporter: minimalist `dot`, concise `line` or detailed `list`. See [reporters](./test-reporters.md) for more information. You can also pass a path to a [custom reporter](./test-reporters.md#custom-reporters) file. |
-| `--retries <number>` | The maximum number of [retries](./test-retries.md#retries) for flaky tests, defaults to zero (no retries). |
-| `--shard <shard>` | [Shard](./test-parallel.md#shard-tests-between-multiple-machines) tests and execute only selected shard, specified in the form `current/all`, 1-based, for example `3/5`.|
-| `--timeout <number>` | Maximum timeout in milliseconds for each test, defaults to 30 seconds. Learn more about [various timeouts](./test-timeouts.md).|
-| `--trace <mode>` | Force tracing mode, can be `on`, `off`, `on-first-retry`, `on-all-retries`, `retain-on-failure` |
-| `--update-snapshots` or `-u` | Whether to update [snapshots](./test-snapshots.md) with actual results instead of comparing them. Use this when snapshot expectations have changed.|
-| `--workers <number>` or `-j <number>`| The maximum number of concurrent worker processes that run in [parallel](./test-parallel.md). |
+| :--- | :--- |
+| `--host <host>` | Host to serve report on (default: localhost) |
+| `--port <port>` | Port to serve report on (default: 9323) |
+
+### Install Browsers
+
+Install browsers required by Playwright. [Read more about Playwright's browser support](./browsers.md).
+
+#### Syntax
+
+```bash
+npx playwright install [options] [browser...]
+npx playwright install-deps [options] [browser...]
+npx playwright uninstall
+```
+
+#### Examples
+
+```bash
+# Install all browsers
+npx playwright install
+
+# Install only Chromium
+npx playwright install chromium
+
+# Install specific browsers
+npx playwright install chromium webkit
+
+# Install browsers with dependencies
+npx playwright install --with-deps
+```
+
+#### Install Options
+
+| Option | Description |
+| :--- | :--- |
+| `--force` | Force reinstall of stable browser channels |
+| `--with-deps` | Install browser system dependencies |
+| `--dry-run` | Don't perform installation, just print information |
+| `--only-shell` | Only install chromium-headless-shell instead of full Chromium |
+| `--no-shell` | Don't install chromium-headless-shell |
+
+#### Install Deps Options
+
+| Option | Description |
+| :--- | :--- |
+| `--dry-run` | Don't perform installation, just print information |
+
+## Generation & Debugging Tools
+
+### Code Generation
+
+Record actions and generate tests for multiple languages. [Read more about Codegen](./codegen-intro.md).
+
+#### Syntax
+
+```bash
+npx playwright codegen [options] [url]
+```
+
+#### Examples
+
+```bash
+# Start recording with interactive UI
+npx playwright codegen
+
+# Record on specific site
+npx playwright codegen https://playwright.dev
+
+# Generate Python code
+npx playwright codegen --target=python
+```
+
+#### Options
+
+| Option | Description |
+| :--- | :--- |
+| `-b, --browser <name>` | Browser to use: chromium, firefox, or webkit (default: chromium) |
+| `-o, --output <file>` | Output file for the generated script |
+| `--target <language>` | Language to use: javascript, playwright-test, python, etc. |
+| `--test-id-attribute <attr>` | Attribute to use for test IDs |
+
+### Trace Viewer
+
+Analyze and view test traces for debugging. [Read more about Trace Viewer](./trace-viewer.md).
+
+#### Syntax
+
+```bash
+npx playwright show-trace [options] <trace>
+```
+
+#### Examples
+
+```bash
+# View a trace file
+npx playwright show-trace trace.zip
+
+# View trace from directory
+npx playwright show-trace trace/
+```
+
+#### Options
+
+| Option | Description |
+| :--- | :--- |
+| `-b, --browser <name>` | Browser to use: chromium, firefox, or webkit (default: chromium) |
+| `-h, --host <host>` | Host to serve trace on |
+| `-p, --port <port>` | Port to serve trace on |
+
+## Specialized Commands
+
+### Merge Reports
+
+Read [blob](./test-reporters#blob-reporter) reports and combine them. [Read more about merge-reports](./test-sharding.md).
+
+#### Syntax
+
+```bash
+npx playwright merge-reports [options] <blob dir>
+```
+
+#### Examples
+
+```bash
+# Combine test reports
+npx playwright merge-reports ./reports
+```
+
+#### Options
+
+| Option | Description |
+| :--- | :--- |
+| `-c, --config <file>` | Configuration file. Can be used to specify additional configuration for the output report |
+| `--reporter <reporter>` | Reporter to use, comma-separated, can be "list", "line", "dot", "json", "junit", "null", "github", "html", "blob" (default: "list") |
+
+### Clear Cache
+
+Clear all Playwright caches.
+
+#### Syntax
+
+```bash
+npx playwright clear-cache
+```
diff --git a/docs/src/test-components-js.md b/docs/src/test-components-js.md
index dc448eff005c5..73115bfad969c 100644
--- a/docs/src/test-components-js.md
+++ b/docs/src/test-components-js.md
@@ -40,11 +40,12 @@ test('event should work', async ({ mount }) => {
 
 ## How to get started
 
-Adding Playwright Test to an existing project is easy. Below are the steps to enable Playwright Test for a React, Vue, Svelte or Solid project.
+Adding Playwright Test to an existing project is easy. Below are the steps to enable Playwright Test for a React, Vue or Svelte project.
 
 ### Step 1: Install Playwright Test for components for your respective framework
 
 <Tabs
+  groupId="js-package-manager"
   defaultValue="npm"
   values={[
     {label: 'npm', value: 'npm'},
@@ -103,22 +104,20 @@ component is mounted using this script. It can be either a `.js`, `.ts`, `.jsx`
 ### Step 2. Create a test file `src/App.spec.{ts,tsx}`
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
 }>
 <TabItem value="react">
 
-```js
+```js title="app.spec.tsx"
 import { test, expect } from '@playwright/experimental-ct-react';
 import App from './App';
 
-test.use({ viewport: { width: 500, height: 500 } });
-
 test('should work', async ({ mount }) => {
   const component = await mount(<App />);
   await expect(component).toContainText('Learn React');
@@ -129,18 +128,25 @@ test('should work', async ({ mount }) => {
 
 <TabItem value="vue">
 
-```js
+```js title="app.spec.ts"
 import { test, expect } from '@playwright/experimental-ct-vue';
 import App from './App.vue';
 
-test.use({ viewport: { width: 500, height: 500 } });
-
 test('should work', async ({ mount }) => {
   const component = await mount(App);
-  await expect(component).toContainText('Vite + Vue');
+  await expect(component).toContainText('Learn Vue');
 });
 ```
 
+```js title="app.spec.tsx"
+import { test, expect } from '@playwright/experimental-ct-vue';
+import App from './App.vue';
+
+test('should work', async ({ mount }) => {
+  const component = await mount(<App />);
+  await expect(component).toContainText('Learn Vue');
+});
+```
 If using TypeScript and Vue make sure to add a `vue.d.ts` file to your project:
 
 ```js
@@ -151,31 +157,13 @@ declare module '*.vue';
 
 <TabItem value="svelte">
 
-```js
+```js title="app.spec.ts"
 import { test, expect } from '@playwright/experimental-ct-svelte';
 import App from './App.svelte';
 
-test.use({ viewport: { width: 500, height: 500 } });
-
 test('should work', async ({ mount }) => {
   const component = await mount(App);
-  await expect(component).toContainText('Vite + Svelte');
-});
-```
-
-</TabItem>
-
-<TabItem value="solid">
-
-```js
-import { test, expect } from '@playwright/experimental-ct-solid';
-import App from './App';
-
-test.use({ viewport: { width: 500, height: 500 } });
-
-test('should work', async ({ mount }) => {
-  const component = await mount(<App />);
-  await expect(component).toContainText('Learn Solid');
+  await expect(component).toContainText('Learn Svelte');
 });
 ```
 
@@ -261,7 +249,10 @@ export function InputMediaForTest(props: InputMediaForTestProps) {
 
 Then test the component via testing the story:
 
-```js title="input-media.test.spec.tsx"
+```js title="input-media.spec.tsx"
+import { test, expect } from '@playwright/experimental-ct-react';
+import { InputMediaForTest } from './input-media.story.tsx';
+
 test('changes the image', async ({ mount }) => {
   let mediaSelected: string | null = null;
 
@@ -302,10 +293,10 @@ Playwright is using [Vite](https://vitejs.dev/) to create the components bundle
 Provide props to a component when mounted.
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
@@ -313,36 +304,42 @@ Provide props to a component when mounted.
 
 <TabItem value="react">
 
-```js
+```js title="component.spec.tsx"
+import { test } from '@playwright/experimental-ct-react';
+
 test('props', async ({ mount }) => {
   const component = await mount(<Component msg="greetings" />);
 });
 ```
 
 </TabItem>
-<TabItem value="solid">
+<TabItem value="svelte">
+
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-svelte';
 
-```js
 test('props', async ({ mount }) => {
-  const component = await mount(<Component msg="greetings" />);
+  const component = await mount(Component, { props: { msg: 'greetings' } });
 });
 ```
 
 </TabItem>
-<TabItem value="svelte">
+<TabItem value="vue">
+
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-vue';
 
-```js
 test('props', async ({ mount }) => {
   const component = await mount(Component, { props: { msg: 'greetings' } });
 });
 ```
 
-</TabItem>
-<TabItem value="vue">
+```js title="component.spec.tsx"
+// Or alternatively, using the `jsx` style
+import { test } from '@playwright/experimental-ct-vue';
 
-```js
 test('props', async ({ mount }) => {
-  const component = await mount(Component, { props: { msg: 'greetings' } });
+  const component = await mount(<Component msg="greetings" />);
 });
 ```
 
@@ -355,10 +352,10 @@ test('props', async ({ mount }) => {
 Provide callbacks/events to a component when mounted.
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
@@ -366,36 +363,42 @@ Provide callbacks/events to a component when mounted.
 
 <TabItem value="react">
 
-```js
+```js title="component.spec.tsx"
+import { test } from '@playwright/experimental-ct-react';
+
 test('callback', async ({ mount }) => {
-  const component = await mount(<Component callback={() => {}} />);
+  const component = await mount(<Component onClick={() => {}} />);
 });
 ```
 
 </TabItem>
-<TabItem value="solid">
+<TabItem value="svelte">
 
-```js
-test('callback', async ({ mount }) => {
-  const component = await mount(<Component callback={() => {}} />);
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-svelte';
+
+test('event', async ({ mount }) => {
+  const component = await mount(Component, { on: { click() {} } });
 });
 ```
 
 </TabItem>
-<TabItem value="svelte">
+<TabItem value="vue">
+
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-vue';
 
-```js
 test('event', async ({ mount }) => {
-  const component = await mount(Component, { on: { callback() {} } });
+  const component = await mount(Component, { on: { click() {} } });
 });
 ```
 
-</TabItem>
-<TabItem value="vue">
+```js title="component.spec.tsx"
+// Or alternatively, using the `jsx` style
+import { test } from '@playwright/experimental-ct-vue';
 
-```js
 test('event', async ({ mount }) => {
-  const component = await mount(Component, { on: { callback() {} } });
+  const component = await mount(<Component v-on:click={() => {}} />);
 });
 ```
 
@@ -408,10 +411,10 @@ test('event', async ({ mount }) => {
 Provide children/slots to a component when mounted.
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
@@ -419,16 +422,9 @@ Provide children/slots to a component when mounted.
 
 <TabItem value="react">
 
-```js
-test('children', async ({ mount }) => {
-  const component = await mount(<Component>Child</Component>);
-});
-```
-
-</TabItem>
-<TabItem value="solid">
+```js title="component.spec.tsx"
+import { test } from '@playwright/experimental-ct-react';
 
-```js
 test('children', async ({ mount }) => {
   const component = await mount(<Component>Child</Component>);
 });
@@ -437,7 +433,9 @@ test('children', async ({ mount }) => {
 </TabItem>
 <TabItem value="svelte">
 
-```js
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-svelte';
+
 test('slot', async ({ mount }) => {
   const component = await mount(Component, { slots: { default: 'Slot' } });
 });
@@ -446,12 +444,23 @@ test('slot', async ({ mount }) => {
 </TabItem>
 <TabItem value="vue">
 
-```js
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-vue';
+
 test('slot', async ({ mount }) => {
   const component = await mount(Component, { slots: { default: 'Slot' } });
 });
 ```
 
+```js title="component.spec.tsx"
+// Or alternatively, using the `jsx` style
+import { test } from '@playwright/experimental-ct-vue';
+
+test('children', async ({ mount }) => {
+  const component = await mount(<Component>Child</Component>);
+});
+```
+
 </TabItem>
 
 </Tabs>
@@ -461,12 +470,11 @@ test('slot', async ({ mount }) => {
 You can use `beforeMount` and `afterMount` hooks to configure your app. This lets you set up things like your app router, fake server etc. giving you the flexibility you need. You can also pass custom configuration from the `mount` call from a test, which is accessible from the `hooksConfig` fixture. This includes any config that needs to be run before or after mounting the component. An example of configuring a router is provided below:
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
-    {label: 'Vue3', value: 'vue3'},
-    {label: 'Vue2', value: 'vue2'},
+    {label: 'Vue', value: 'vue'},
   ]
 }>
   <TabItem value="react">
@@ -500,38 +508,7 @@ You can use `beforeMount` and `afterMount` hooks to configure your app. This let
 
   </TabItem>
 
-  <TabItem value="solid">
-
-  ```js title="playwright/index.tsx"
-  import { beforeMount, afterMount } from '@playwright/experimental-ct-solid/hooks';
-  import { Router } from '@solidjs/router';
-
-  export type HooksConfig = {
-    enableRouting?: boolean;
-  }
-
-  beforeMount<HooksConfig>(async ({ App, hooksConfig }) => {
-    if (hooksConfig?.enableRouting)
-      return <Router><App /></Router>;
-  });
-  ```
-
-  ```js title="src/pages/ProductsPage.spec.tsx"
-  import { test, expect } from '@playwright/experimental-ct-solid';
-  import type { HooksConfig } from '../playwright';
-  import { ProductsPage } from './pages/ProductsPage';
-
-  test('configure routing through hooks config', async ({ page, mount }) => {
-    const component = await mount<HooksConfig>(<ProductsPage />, {
-      hooksConfig: { enableRouting: true },
-    });
-    await expect(component.getByRole('link')).toHaveAttribute('href', '/products/42');
-  });
-  ```
-
-  </TabItem>
-
-  <TabItem value="vue3">
+  <TabItem value="vue">
 
   ```js title="playwright/index.ts"
   import { beforeMount, afterMount } from '@playwright/experimental-ct-vue/hooks';
@@ -562,40 +539,6 @@ You can use `beforeMount` and `afterMount` hooks to configure your app. This let
 
   </TabItem>
 
-  <TabItem value="vue2">
-
-  ```js title="playwright/index.ts"
-  import { beforeMount, afterMount } from '@playwright/experimental-ct-vue2/hooks';
-  import Router from 'vue-router';
-  import { router } from '../src/router';
-
-  export type HooksConfig = {
-    enableRouting?: boolean;
-  }
-
-  beforeMount<HooksConfig>(async ({ app, hooksConfig }) => {
-    if (hooksConfig?.enableRouting) {
-      Vue.use(Router);
-      return { router }
-    }
-  });
-  ```
-
-  ```js title="src/pages/ProductsPage.spec.ts"
-  import { test, expect } from '@playwright/experimental-ct-vue2';
-  import type { HooksConfig } from '../playwright';
-  import ProductsPage from './pages/ProductsPage.vue';
-
-  test('configure routing through hooks config', async ({ page, mount }) => {
-    const component = await mount<HooksConfig>(ProductsPage, {
-      hooksConfig: { enableRouting: true },
-    });
-    await expect(component.getByRole('link')).toHaveAttribute('href', '/products/42');
-  });
-  ```
-
-  </TabItem>
-
 </Tabs>
 
 ### unmount
@@ -603,10 +546,10 @@ You can use `beforeMount` and `afterMount` hooks to configure your app. This let
 Unmount the mounted component from the DOM. This is useful for testing the component's behavior upon unmounting. Use cases include testing an "Are you sure you want to leave?" modal or ensuring proper cleanup of event handlers to prevent memory leaks.
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
@@ -614,7 +557,9 @@ Unmount the mounted component from the DOM. This is useful for testing the compo
 
 <TabItem value="react">
 
-```js
+```js title="component.spec.tsx"
+import { test } from '@playwright/experimental-ct-react';
+
 test('unmount', async ({ mount }) => {
   const component = await mount(<Component/>);
   await component.unmount();
@@ -622,35 +567,38 @@ test('unmount', async ({ mount }) => {
 ```
 
 </TabItem>
-<TabItem value="solid">
+<TabItem value="svelte">
+
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-svelte';
 
-```js
 test('unmount', async ({ mount }) => {
-  const component = await mount(<Component/>);
+  const component = await mount(Component);
   await component.unmount();
 });
 ```
 
 </TabItem>
-<TabItem value="svelte">
+<TabItem value="vue">
+
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-vue';
 
-```js
 test('unmount', async ({ mount }) => {
   const component = await mount(Component);
   await component.unmount();
 });
 ```
 
-</TabItem>
-<TabItem value="vue">
+```js title="component.spec.tsx"
+// Or alternatively, using the `jsx` style
+import { test } from '@playwright/experimental-ct-vue';
 
-```js
 test('unmount', async ({ mount }) => {
-  const component = await mount(Component);
+  const component = await mount(<Component/>);
   await component.unmount();
 });
 ```
-
 </TabItem>
 
 </Tabs>
@@ -660,10 +608,10 @@ test('unmount', async ({ mount }) => {
 Update props, slots/children, and/or events/callbacks of a mounted component. These component inputs can change at any time and are typically provided by the parent component, but sometimes it is necessary to ensure that your components behave appropriately to new inputs.
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
@@ -671,23 +619,13 @@ Update props, slots/children, and/or events/callbacks of a mounted component. Th
 
 <TabItem value="react">
 
-```js
-test('update', async ({ mount }) => {
-  const component = await mount(<Component/>);
-  await component.update(
-      <Component msg="greetings" callback={() => {}}>Child</Component>
-  );
-});
-```
+```js title="component.spec.tsx"
+import { test } from '@playwright/experimental-ct-react';
 
-</TabItem>
-<TabItem value="solid">
-
-```js
 test('update', async ({ mount }) => {
   const component = await mount(<Component/>);
   await component.update(
-      <Component msg="greetings" callback={() => {}}>Child</Component>
+      <Component msg="greetings" onClick={() => {}}>Child</Component>
   );
 });
 ```
@@ -695,12 +633,14 @@ test('update', async ({ mount }) => {
 </TabItem>
 <TabItem value="svelte">
 
-```js
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-svelte';
+
 test('update', async ({ mount }) => {
-  const component = await mount(<Component/>);
+  const component = await mount(Component);
   await component.update({
     props: { msg: 'greetings' },
-    on: { callback: () => {} },
+    on: { click() {} },
     slots: { default: 'Child' }
   });
 });
@@ -709,17 +649,31 @@ test('update', async ({ mount }) => {
 </TabItem>
 <TabItem value="vue">
 
-```js
+```js title="component.spec.ts"
+import { test } from '@playwright/experimental-ct-vue';
+
 test('update', async ({ mount }) => {
-  const component = await mount(<Component/>);
+  const component = await mount(Component);
   await component.update({
     props: { msg: 'greetings' },
-    on: { callback: () => {} },
+    on: { click() {} },
     slots: { default: 'Child' }
   });
 });
 ```
 
+```js title="component.spec.tsx"
+// Or alternatively, using the `jsx` style
+import { test } from '@playwright/experimental-ct-vue';
+
+test('update', async ({ mount }) => {
+  const component = await mount(<Component/>);
+  await component.update(
+      <Component msg="greetings" v-on:click={() => {}}>Child</Component>
+  );
+});
+```
+
 </TabItem>
 
 </Tabs>
@@ -732,7 +686,7 @@ Playwright provides an **experimental** `router` fixture to intercept and handle
 
 Here is an example of reusing your existing MSW handlers in the test.
 
-```ts
+```js
 import { handlers } from '@src/mocks/handlers';
 
 test.beforeEach(async ({ router }) => {
@@ -748,7 +702,7 @@ test('example test', async ({ mount }) => {
 
 You can also introduce a one-off handler for a specific test.
 
-```ts
+```js
 import { http, HttpResponse } from 'msw';
 
 test('example test', async ({ mount, router }) => {
@@ -763,7 +717,7 @@ test('example test', async ({ mount, router }) => {
 
 ## Frequently asked questions
 
-### What's the difference between `@playwright/test` and `@playwright/experimental-ct-{react,svelte,vue,solid}`?
+### What's the difference between `@playwright/test` and `@playwright/experimental-ct-{react,svelte,vue}`?
 
 ```js
 test('…', async ({ mount, page, context }) => {
@@ -771,13 +725,13 @@ test('…', async ({ mount, page, context }) => {
 });
 ```
 
-`@playwright/experimental-ct-{react,svelte,vue,solid}` wrap `@playwright/test` to provide an additional built-in component-testing specific fixture called `mount`:
+`@playwright/experimental-ct-{react,svelte,vue}` wrap `@playwright/test` to provide an additional built-in component-testing specific fixture called `mount`:
 
 <Tabs
+  groupId="js-framework"
   defaultValue="react"
   values={[
     {label: 'React', value: 'react'},
-    {label: 'Solid', value: 'solid'},
     {label: 'Svelte', value: 'svelte'},
     {label: 'Vue', value: 'vue'},
   ]
@@ -838,22 +792,6 @@ test('should work', async ({ mount }) => {
 
 </TabItem>
 
-<TabItem value="solid">
-
-```js
-import { test, expect } from '@playwright/experimental-ct-solid';
-import HelloWorld from './HelloWorld';
-
-test.use({ viewport: { width: 500, height: 500 } });
-
-test('should work', async ({ mount }) => {
-  const component = await mount(<HelloWorld msg="greetings" />);
-  await expect(component).toContainText('Greetings');
-});
-```
-
-</TabItem>
-
 </Tabs>
 
 Additionally, it adds some config options you can use in your `playwright-ct.config.{ts,js}`.
@@ -924,6 +862,14 @@ export default defineConfig({
 });
 ```
 
+### How do I use CSS imports?
+
+If you have a component that imports CSS, Vite will handle it automatically. You can also use CSS pre-processors such as Sass, Less, or Stylus, and Vite will handle them as well without any additional configuration. However, corresponding CSS pre-processor needs to be installed.
+
+Vite has a hard requirement that all CSS Modules are named `*.module.[css extension]`. If you have a custom build config for your project normally and have imports of the form `import styles from 'styles.css'` you must rename your files to properly indicate they are to be treated as modules. You could also write a Vite plugin to handle this for you.
+
+Check [Vite documentation](https://vite.dev/guide/features#css) for more details.
+
 ### How can I test components that uses Pinia?
 
 Pinia needs to be initialized in `playwright/index.{js,ts,jsx,tsx}`. If you do this inside a `beforeMount` hook, the `initialState` can be overwritten on a per-test basis:
diff --git a/docs/src/test-configuration-js.md b/docs/src/test-configuration-js.md
index 30bdbee8ca655..e3831c19112d6 100644
--- a/docs/src/test-configuration-js.md
+++ b/docs/src/test-configuration-js.md
@@ -35,7 +35,7 @@ export default defineConfig({
 
   use: {
     // Base URL to use in actions like `await page.goto('/')`.
-    baseURL: 'http://127.0.0.1:3000',
+    baseURL: 'http://localhost:3000',
 
     // Collect trace when retrying the failed test.
     trace: 'on-first-retry',
@@ -50,7 +50,7 @@ export default defineConfig({
   // Run your local dev server before starting the tests.
   webServer: {
     command: 'npm run start',
-    url: 'http://127.0.0.1:3000',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
   },
 });
@@ -115,7 +115,7 @@ export default defineConfig({
 | [`property: TestConfig.globalSetup`] | Path to the global setup file. This file will be required and run before all the tests. It must export a single function. |
 | [`property: TestConfig.globalTeardown`] |Path to the global teardown file. This file will be required and run after all the tests. It must export a single function. |
 | [`property: TestConfig.outputDir`] | Folder for test artifacts such as screenshots, videos, traces, etc. |
-| [`property: TestConfig.timeout`] | Playwright enforces a [timeout](./test-timeouts.md) for each test, 30 seconds by default. Time spent by the test function, fixtures, beforeEach and afterEach hooks is included in the test timeout. |
+| [`property: TestConfig.timeout`] | Playwright enforces a [timeout](./test-timeouts.md) for each test, 30 seconds by default. Time spent by the test function, test fixtures and beforeEach hooks is included in the test timeout. |
 
 ## Expect Options
 
diff --git a/docs/src/test-fixtures-js.md b/docs/src/test-fixtures-js.md
index 60c9219a95aae..19fbf687c1b30 100644
--- a/docs/src/test-fixtures-js.md
+++ b/docs/src/test-fixtures-js.md
@@ -21,7 +21,7 @@ test('basic test', async ({ page }) => {
 });
 ```
 
-The `{ page }` argument tells Playwright Test to setup the `page` fixture and provide it to your test function.
+The `{ page }` argument tells Playwright Test to set up the `page` fixture and provide it to your test function.
 
 Here is a list of the pre-defined fixtures that you are likely to use most of the time:
 
@@ -29,15 +29,15 @@ Here is a list of the pre-defined fixtures that you are likely to use most of th
 |:----------|:------------------|:--------------------------------|
 |page       |[Page]             |Isolated page for this test run. |
 |context    |[BrowserContext]   |Isolated context for this test run. The `page` fixture belongs to this context as well. Learn how to [configure context](./test-configuration.md). |
-|browser    |[Browser]          |Browsers are shared across tests to optimize resources. Learn how to [configure browser](./test-configuration.md). |
+|browser    |[Browser]          |Browsers are shared across tests to optimize resources. Learn how to [configure browsers](./test-configuration.md). |
 |browserName|[string]           |The name of the browser currently running the test. Either `chromium`, `firefox` or `webkit`.|
 |request    |[APIRequestContext]|Isolated [APIRequestContext](./api/class-apirequestcontext.md) instance for this test run.|
 
 ### Without fixtures
 
-Here is how typical test environment setup differs between traditional test style and the fixture-based one.
+Here is how a typical test environment setup differs between the traditional test style and the fixture-based one.
 
-`TodoPage` is a class that helps interacting with a "todo list" page of the web app, following the [Page Object Model](./pom.md) pattern. It uses Playwright's `page` internally.
+`TodoPage` is a class that helps us interact with a "todo list" page of the web app, following the [Page Object Model](./pom.md) pattern. It uses Playwright's `page` internally.
 
 <details>
   <summary>Click to expand the code for the <code>TodoPage</code></summary>
@@ -115,12 +115,12 @@ test.describe('todo tests', () => {
 ### With fixtures
 
 Fixtures have a number of advantages over before/after hooks:
-- Fixtures **encapsulate** setup and teardown in the same place so it is easier to write.
-- Fixtures are **reusable** between test files - you can define them once and use in all your tests. That's how Playwright's built-in `page` fixture works.
+- Fixtures **encapsulate** setup and teardown in the same place so it is easier to write. So if you have an after hook that tears down what was created in a before hook, consider turning them into a fixture.
+- Fixtures are **reusable** between test files - you can define them once and use them in all your tests. That's how Playwright's built-in `page` fixture works. So if you have a helper function that is used in multiple tests, consider turning it into a fixture.
 - Fixtures are **on-demand** - you can define as many fixtures as you'd like, and Playwright Test will setup only the ones needed by your test and nothing else.
 - Fixtures are **composable** - they can depend on each other to provide complex behaviors.
-- Fixtures are **flexible**. Tests can use any combinations of the fixtures to tailor precise environment they need, without affecting other tests.
-- Fixtures simplify **grouping**. You no longer need to wrap tests in `describe`s that set up environment, and are free to group your tests by their meaning instead.
+- Fixtures are **flexible**. Tests can use any combination of fixtures to precisely tailor the environment to their needs, without affecting other tests.
+- Fixtures simplify **grouping**. You no longer need to wrap tests in `describe`s that set up their environment, and are free to group your tests by their meaning instead.
 
 <details>
   <summary>Click to expand the code for the <code>TodoPage</code></summary>
@@ -291,14 +291,14 @@ export { expect } from '@playwright/test';
 ```
 
 :::note
-Custom fixture names should start with a letter or underscore, and can contain only letters, numbers, underscores.
+Custom fixture names should start with a letter or underscore, and can contain only letters, numbers, and underscores.
 :::
 
 ## Using a fixture
 
-Just mention fixture in your test function argument, and test runner will take care of it. Fixtures are also available in hooks and other fixtures. If you use TypeScript, fixtures will have the right type.
+Just mention a fixture in your test function argument, and the test runner will take care of it. Fixtures are also available in hooks and other fixtures. If you use TypeScript, fixtures will be type safe.
 
-Below we use the `todoPage` and `settingsPage` fixtures defined above.
+Below we use the `todoPage` and `settingsPage` fixtures that we defined above.
 
 ```js
 import { test, expect } from './my-test';
@@ -315,7 +315,7 @@ test('basic test', async ({ todoPage, page }) => {
 
 ## Overriding fixtures
 
-In addition to creating your own fixtures, you can also override existing fixtures to fit your needs. Consider the following example which overrides the `page` fixture by automatically navigating to some `baseURL`:
+In addition to creating your own fixtures, you can also override existing fixtures to fit your needs. Consider the following example which overrides the `page` fixture by automatically navigating to the `baseURL`:
 
 ```js
 import { test as base } from '@playwright/test';
@@ -335,7 +335,7 @@ Notice that in this example, the `page` fixture is able to depend on other built
 test.use({ baseURL: 'https://playwright.dev' });
 ```
 
-Fixtures can also be overridden where the base fixture is completely replaced with something different. For example, we could override the [`property: TestOptions.storageState`] fixture to provide our own data.
+Fixtures can also be overridden, causing the base fixture to be completely replaced with something different. For example, we could override the [`property: TestOptions.storageState`] fixture to provide our own data.
 
 ```js
 import { test as base } from '@playwright/test';
@@ -350,9 +350,9 @@ export const test = base.extend({
 
 ## Worker-scoped fixtures
 
-Playwright Test uses [worker processes](./test-parallel.md) to run test files. Similarly to how test fixtures are set up for individual test runs, worker fixtures are set up for each worker process. That's where you can set up services, run servers, etc. Playwright Test will reuse the worker process for as many test files as it can, provided their worker fixtures match and hence environments are identical.
+Playwright Test uses [worker processes](./test-parallel.md) to run test files. Similar to how test fixtures are set up for individual test runs, worker fixtures are set up for each worker process. That's where you can set up services, run servers, etc. Playwright Test will reuse the worker process for as many test files as it can, provided their worker fixtures match and hence environments are identical.
 
-Below we'll create an `account` fixture that will be shared by all tests in the same worker, and override the `page` fixture to login into this account for each test. To generate unique accounts, we'll use the [`property: WorkerInfo.workerIndex`] that is available to any test or fixture. Note the tuple-like syntax for the worker fixture - we have to pass `{scope: 'worker'}` so that test runner sets up this fixture once per worker.
+Below we'll create an `account` fixture that will be shared by all tests in the same worker, and override the `page` fixture to log in to this account for each test. To generate unique accounts, we'll use the [`property: WorkerInfo.workerIndex`] that is available to any test or fixture. Note the tuple-like syntax for the worker fixture - we have to pass `{scope: 'worker'}` so that test runner sets this fixture up once per worker.
 
 ```js title="my-test.ts"
 import { test as base } from '@playwright/test';
@@ -404,11 +404,11 @@ export { expect } from '@playwright/test';
 
 Automatic fixtures are set up for each test/worker, even when the test does not list them directly. To create an automatic fixture, use the tuple syntax and pass `{ auto: true }`.
 
-Here is an example fixture that automatically attaches debug logs when the test fails, so we can later review the logs in the reporter. Note how it uses [TestInfo] object that is available in each test/fixture to retrieve metadata about the test being run.
+Here is an example fixture that automatically attaches debug logs when the test fails, so we can later review the logs in the reporter. Note how it uses the [TestInfo] object that is available in each test/fixture to retrieve metadata about the test being run.
 
 ```js title="my-test.ts"
-import * as debug from 'debug';
-import * as fs from 'fs';
+import debug from 'debug';
+import fs from 'fs';
 import { test as base } from '@playwright/test';
 
 export const test = base.extend<{ saveLogs: void }>({
@@ -434,7 +434,7 @@ export { expect } from '@playwright/test';
 
 ## Fixture timeout
 
-By default, fixture shares timeout with the test. However, for slow fixtures, especially [worker-scoped](#worker-scoped-fixtures) ones, it is convenient to have a separate timeout. This way you can keep the overall test timeout small, and give the slow fixture more time.
+By default, the fixture inherits the timeout value of the test. However, for slow fixtures, especially [worker-scoped](#worker-scoped-fixtures) ones, it is convenient to have a separate timeout. This way you can keep the overall test timeout small, and give the slow fixture more time.
 
 ```js
 import { test as base, expect } from '@playwright/test';
@@ -454,13 +454,9 @@ test('example test', async ({ slowFixture }) => {
 
 ## Fixtures-options
 
-:::note
-Overriding custom fixtures in the config file has changed in version 1.18. [Learn more](./release-notes#breaking-change-custom-config-options).
-:::
-
-Playwright Test supports running multiple test projects that can be separately configured. You can use "option" fixtures to make your configuration options declarative and type-checked. Learn more about [parametrizing tests](./test-parameterize.md).
+Playwright Test supports running multiple test projects that can be configured separately. You can use "option" fixtures to make your configuration options declarative and type safe. Learn more about [parameterizing tests](./test-parameterize.md).
 
-Below we'll create a `defaultItem` option in addition to the `todoPage` fixture from other examples. This option will be set in configuration file. Note the tuple syntax and `{ option: true }` argument.
+Below we'll create a `defaultItem` option in addition to the `todoPage` fixture from other examples. This option will be set in the configuration file. Note the tuple syntax and `{ option: true }` argument.
 
 <details>
   <summary>Click to expand the code for the <code>TodoPage</code></summary>
@@ -535,7 +531,7 @@ export const test = base.extend<MyOptions & MyFixtures>({
 export { expect } from '@playwright/test';
 ```
 
-We can now use `todoPage` fixture as usual, and set the `defaultItem` option in the config file.
+We can now use the `todoPage` fixture as usual, and set the `defaultItem` option in the configuration file.
 
 ```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
@@ -555,14 +551,89 @@ export default defineConfig<MyOptions>({
 });
 ```
 
+**Array as an option value**
+
+If the value of your option is an array, for example `[{ name: 'Alice' }, { name: 'Bob' }]`, you'll need to wrap it into an extra array when providing the value. This is best illustrated with an example.
+
+```js
+type Person = { name: string };
+const test = base.extend<{ persons: Person[] }>({
+  // Declare the option, default value is an empty array.
+  persons: [[], { option: true }],
+});
+
+// Option value is an array of persons.
+const actualPersons = [{ name: 'Alice' }, { name: 'Bob' }];
+test.use({
+  // CORRECT: Wrap the value into an array and pass the scope.
+  persons: [actualPersons, { scope: 'test' }],
+});
+
+test.use({
+  // WRONG: passing an array value directly will not work.
+  persons: actualPersons,
+});
+```
+
+**Reset an option**
+
+You can reset an option to the value defined in the config file by setting it to `undefined`. Consider the following config that sets a `baseURL`:
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  use: {
+    baseURL: 'https://playwright.dev',
+  },
+});
+```
+
+You can now configure `baseURL` for a file, and also opt-out for a single test.
+
+```js title="intro.spec.ts"
+import { test } from '@playwright/test';
+
+// Configure baseURL for this file.
+test.use({ baseURL: 'https://playwright.dev/docs/intro' });
+
+test('check intro contents', async ({ page }) => {
+  // This test will use "https://playwright.dev/docs/intro" base url as defined above.
+});
+
+test.describe(() => {
+  // Reset the value to a config-defined one.
+  test.use({ baseURL: undefined });
+
+  test('can navigate to intro from the home page', async ({ page }) => {
+    // This test will use "https://playwright.dev" base url as defined in the config.
+  });
+});
+```
+
+If you would like to completely reset the value to `undefined`, use a long-form fixture notation.
+
+```js title="intro.spec.ts"
+import { test } from '@playwright/test';
+
+// Completely unset baseURL for this file.
+test.use({
+  baseURL: [async ({}, use) => use(undefined), { scope: 'test' }],
+});
+
+test('no base url', async ({ page }) => {
+  // This test will not have a base url.
+});
+```
+
 ## Execution order
 
-Each fixture has a setup and teardown phase separated by the `await use()` call in the fixture. Setup is executed before the fixture is used by the test/hook, and teardown is executed when the fixture will not be used by the test/hook anymore.
+Each fixture has a setup and teardown phase before and after the `await use()` call in the fixture. Setup is executed before the test/hook requiring it is run, and teardown is executed when the fixture is no longer being used by the test/hook.
 
 Fixtures follow these rules to determine the execution order:
 * When fixture A depends on fixture B: B is always set up before A and torn down after A.
 * Non-automatic fixtures are executed lazily, only when the test/hook needs them.
-* Test-scoped fixtures are torn down after each test, while worker-scoped fixtures are only torn down when the worker process executing tests is shutdown.
+* Test-scoped fixtures are torn down after each test, while worker-scoped fixtures are only torn down when the worker process executing tests is torn down.
 
 Consider the following example:
 
@@ -675,7 +746,7 @@ test('passes', async ({ database, page, a11y }) => {
 
 ## Box fixtures
 
-Usually, custom fixtures are reported as separate steps in in the UI mode, Trace Viewer and various test reports. They also appear in error messages from the test runner. For frequently-used fixtures, this can mean lots of noise. You can stop the fixtures steps from being shown in the UI by "boxing" it.
+Usually, custom fixtures are reported as separate steps in the UI mode, Trace Viewer and various test reports. They also appear in error messages from the test runner. For frequently used fixtures, this can mean lots of noise. You can stop the fixtures steps from being shown in the UI by "boxing" it.
 
 ```js
 import { test as base } from '@playwright/test';
@@ -702,3 +773,64 @@ export const test = base.extend({
   }, { title: 'my fixture' }],
 });
 ```
+
+## Adding global beforeEach/afterEach hooks
+
+[`method: Test.beforeEach`] and [`method: Test.afterEach`] hooks run before/after each test declared in the same file and same [`method: Test.describe`] block (if any). If you want to declare hooks that run before/after each test globally, you can declare them as auto fixtures like this:
+
+```js title="fixtures.ts"
+import { test as base } from '@playwright/test';
+
+export const test = base.extend<{ forEachTest: void }>({
+  forEachTest: [async ({ page }, use) => {
+    // This code runs before every test.
+    await page.goto('http://localhost:8000');
+    await use();
+    // This code runs after every test.
+    console.log('Last URL:', page.url());
+  }, { auto: true }],  // automatically starts for every test.
+});
+```
+
+And then import the fixtures in all your tests:
+
+```js title="mytest.spec.ts"
+import { test } from './fixtures';
+import { expect } from '@playwright/test';
+
+test('basic', async ({ page }) => {
+  expect(page).toHaveURL('http://localhost:8000');
+  await page.goto('https://playwright.dev');
+});
+```
+
+## Adding global beforeAll/afterAll hooks
+
+[`method: Test.beforeAll`] and [`method: Test.afterAll`] hooks run before/after all tests declared in the same file and same [`method: Test.describe`] block (if any), once per worker process. If you want to declare hooks
+that run before/after all tests in every file, you can declare them as auto fixtures with `scope: 'worker'` as follows:
+
+```js title="fixtures.ts"
+import { test as base } from '@playwright/test';
+
+export const test = base.extend<{}, { forEachWorker: void }>({
+  forEachWorker: [async ({}, use) => {
+    // This code runs before all the tests in the worker process.
+    console.log(`Starting test worker ${test.info().workerIndex}`);
+    await use();
+    // This code runs after all the tests in the worker process.
+    console.log(`Stopping test worker ${test.info().workerIndex}`);
+  }, { scope: 'worker', auto: true }],  // automatically starts for every worker.
+});
+```
+
+And then import the fixtures in all your tests:
+
+```js title="mytest.spec.ts"
+import { test } from './fixtures';
+import { expect } from '@playwright/test';
+
+test('basic', async ({ }) => {
+  // ...
+});
+```
+Note that the fixtures will still run once per [worker process](./test-parallel.md#worker-processes), but you don't need to redeclare them in every file.
diff --git a/docs/src/test-global-setup-teardown-js.md b/docs/src/test-global-setup-teardown-js.md
index 883bdf25d651f..c0197af111bb2 100644
--- a/docs/src/test-global-setup-teardown-js.md
+++ b/docs/src/test-global-setup-teardown-js.md
@@ -5,7 +5,18 @@ title: "Global setup and teardown"
 
 ## Introduction
 
-There are two ways to configure global setup and teardown: using a global setup file and setting it in the config under [`globalSetup`](#option-2-configure-globalsetup-and-globalteardown) or using [project dependencies](#option-1-project-dependencies). With project dependencies, you define a project that runs before all other projects. This is the recommended way to configure global setup as with Project dependencies your HTML report will show the global setup, trace viewer will record a trace of the setup and fixtures can be used.
+There are two ways to configure global setup and teardown: using a global setup file and setting it in the config under [`globalSetup`](#option-2-configure-globalsetup-and-globalteardown) or using [project dependencies](#option-1-project-dependencies). With project dependencies, you define a project that runs before all other projects. This is the recommended approach, as it integrates better with the Playwright test runner: your HTML report will include the global setup, traces will be recorded, and fixtures can be used. For a detailed comparison of the two approaches, see the table below.
+
+| Feature                          | Project Dependencies (recommended) | `globalSetup` (config option)      |
+|----------------------------------|-------------------------------------|-----------------------------------|
+| Runs before all tests            | ✅ Yes                              | ✅ Yes         |
+| HTML report visibility           | ✅ Shown as a separate project      | ❌ Not shown                       |
+| Trace recording                  | ✅ Full trace available             | ❌ Not supported                   |
+| Playwright fixtures              | ✅ Fully supported                  | ❌ Not supported                   |
+| Browser management               | ✅ Via `browser` fixture            | ❌ Fully manual via `browserType.launch()` |
+| Parallelism and retries          | ✅ Supported via standard config    | ❌ Not applicable                  |
+| Config options like `headless` or `testIdAttribute`  | ✅ Automatically applied            | ❌ Ignored                              |
+
 
 ## Option 1: Project Dependencies
 
@@ -115,6 +126,12 @@ teardown('delete database', async ({ }) => {
 });
 ```
 
+### Test filtering
+
+All test filtering options, such as `--grep`/`--grep-invert`, `--shard`, filtering directly by location in the command line, or using [`test.only()`](./api/class-test.md#test-only), directly select the primary tests to be run. If those tests belong to a project with dependencies, all tests from those dependencies will also run.
+
+You can pass `--no-deps` command line option to ignore all dependencies and teardowns. Only your directly selected projects will run.
+
 ### More examples
 
 For more detailed examples check out:
@@ -129,7 +146,7 @@ You can use the `globalSetup` option in the [configuration file](./test-configur
 Similarly, use `globalTeardown` to run something once after all the tests. Alternatively, let `globalSetup` return a function that will be used as a global teardown. You can pass data such as port number, authentication tokens, etc. from your global setup to your tests using environment variables.
 
 :::note
-Using `globalSetup` and `globalTeardown` will not produce traces or artifacts, and options like `headless` or `testIdAttribute` specified in the config file are not applied. If you want to produce traces and artifacts and respect config options, use [project dependencies](#option-1-project-dependencies).
+Beware that `globalSetup` and `globalTeardown` lack some features — see the [intro](#introduction) section for a detailed comparison. Consider using [project dependencies](#option-1-project-dependencies) instead to get full feature support.
 :::
 
 ```js title="playwright.config.ts"
diff --git a/docs/src/test-parallel-js.md b/docs/src/test-parallel-js.md
index 9643ed6f7a354..d768c748e6a9d 100644
--- a/docs/src/test-parallel-js.md
+++ b/docs/src/test-parallel-js.md
@@ -125,6 +125,17 @@ test('runs second', async () => {
 });
 ```
 
+## Opt out of fully parallel mode
+
+If your configuration applies parallel mode to all tests using [`property: TestConfig.fullyParallel`], you might still want to run some tests with default settings. You can override the mode per describe: 
+```js
+test.describe('runs in parallel with other describes', () => {
+  test.describe.configure({ mode: 'default' });
+  test('in order 1', async ({ page }) => {});
+  test('in order 2', async ({ page }) => {});
+});
+```
+
 ## Shard tests between multiple machines
 
 Playwright Test can shard a test suite, so that it can be executed on multiple machines.
diff --git a/docs/src/test-projects-js.md b/docs/src/test-projects-js.md
index d193b4bdbe1c0..12e84a7655d28 100644
--- a/docs/src/test-projects-js.md
+++ b/docs/src/test-projects-js.md
@@ -152,6 +152,7 @@ export default defineConfig({
   ],
 });
 ```
+
 ## Dependencies
 
 Dependencies are a list of projects that need to run before the tests in another project run. They can be useful for configuring the global setup actions so that one project depends on this running first. When using project dependencies, [test reporters](./test-reporters.md) will show the setup tests and the [trace viewer](/trace-viewer.md) will record traces of the setup. You can use the inspector to inspect the DOM snapshot of the trace of your setup tests and you can also use [fixtures](./test-fixtures.md) inside your setup.
@@ -159,7 +160,7 @@ Dependencies are a list of projects that need to run before the tests in another
 In this example the chromium, firefox and webkit projects depend on the setup project.
 
 ```js title="playwright.config.ts"
-import { defineConfig } from '@playwright/test';
+import { defineConfig, devices } from '@playwright/test';
 
 export default defineConfig({
   projects: [
@@ -185,6 +186,7 @@ export default defineConfig({
   ],
 });
 ```
+
 ### Running Sequence
 
 When working with tests that have a dependency, the dependency will always run first and once all tests from this project have passed, then the other projects will run in parallel.
@@ -216,7 +218,9 @@ You can also teardown your setup by adding a [`property: TestProject.teardown`]
 
 ### Test filtering
 
-If `--grep/--grep-invert` or `--shard` [option](./test-cli.md#reference) is used, test file name filter is specified in [command line](./test-cli.md) or [test.only()](./api/class-test.md#test-only) is used, it will only apply to the tests from the deepest projects in the project dependency chain. In other words, if a matching test belongs to a project that has project dependencies, Playwright will run all the tests from the project dependencies ignoring the filters.
+All test filtering options, such as `--grep`/`--grep-invert`, `--shard`, filtering directly by location in the command line, or using [`test.only()`](./api/class-test.md#test-only), directly select the primary tests to be run. If those tests belong to a project with dependencies, all tests from those dependencies will also run.
+
+You can pass `--no-deps` command line option to ignore all dependencies and teardowns. Only your directly selected projects will run.
 
 ## Custom project parameters
 
diff --git a/docs/src/test-reporter-api/class-testcase.md b/docs/src/test-reporter-api/class-testcase.md
index 82ab6ca521873..22a8588fb0934 100644
--- a/docs/src/test-reporter-api/class-testcase.md
+++ b/docs/src/test-reporter-api/class-testcase.md
@@ -9,15 +9,9 @@
 - type: <[Array]<[Object]>>
   - `type` <[string]> Annotation type, for example `'skip'` or `'fail'`.
   - `description` ?<[string]> Optional description.
+  - `location` ?<[Location]> Optional location in the source where the annotation is added.
 
-The list of annotations applicable to the current test. Includes:
-* annotations defined on the test or suite via [`method: Test.(call)`] and [`method: Test.describe`];
-* annotations implicitly added by methods [`method: Test.skip`], [`method: Test.fixme`] and [`method: Test.fail`];
-* annotations appended to [`property: TestInfo.annotations`] during the test execution.
-
-Annotations are available during test execution through [`property: TestInfo.annotations`].
-
-Learn more about [test annotations](../test-annotations.md).
+[`property: TestResult.annotations`] of the last test run.
 
 ## property: TestCase.expectedStatus
 * since: v1.10
diff --git a/docs/src/test-reporter-api/class-testerror.md b/docs/src/test-reporter-api/class-testerror.md
index 7a872c63fcb8a..10414f857471e 100644
--- a/docs/src/test-reporter-api/class-testerror.md
+++ b/docs/src/test-reporter-api/class-testerror.md
@@ -4,6 +4,12 @@
 
 Information about an error thrown during test execution.
 
+## property: TestError.cause
+* since: v1.49
+- type: ?<[TestError]>
+
+Error cause. Set when there is a [cause](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause) for the error. Will be `undefined` if there is no cause or if the cause is not an instance of [Error].
+
 ## property: TestError.message
 * since: v1.10
 - type: ?<[string]>
diff --git a/docs/src/test-reporter-api/class-testresult.md b/docs/src/test-reporter-api/class-testresult.md
index 7674ac333d1d7..ef41200b40c27 100644
--- a/docs/src/test-reporter-api/class-testresult.md
+++ b/docs/src/test-reporter-api/class-testresult.md
@@ -14,6 +14,22 @@ A result of a single [TestCase] run.
 
 The list of files or buffers attached during the test execution through [`property: TestInfo.attachments`].
 
+## property: TestResult.annotations
+* since: v1.52
+- type: <[Array]<[Object]>>
+  - `type` <[string]> Annotation type, for example `'skip'` or `'fail'`.
+  - `description` ?<[string]> Optional description.
+  - `location` ?<[Location]> Optional location in the source where the annotation is added.
+
+The list of annotations applicable to the current test. Includes:
+* annotations defined on the test or suite via [`method: Test.(call)`] and [`method: Test.describe`];
+* annotations implicitly added by methods [`method: Test.skip`], [`method: Test.fixme`] and [`method: Test.fail`];
+* annotations appended to [`property: TestInfo.annotations`] during the test execution.
+
+Annotations are available during test execution through [`property: TestInfo.annotations`].
+
+Learn more about [test annotations](../test-annotations.md).
+
 ## property: TestResult.duration
 * since: v1.10
 - type: <[float]>
@@ -37,7 +53,7 @@ Errors thrown during the test execution.
 * since: v1.10
 - type: <[int]>
 
-When test is retries multiple times, each retry attempt is given a sequential number.
+When test is retried multiple times, each retry attempt is given a sequential number.
 
 Learn more about [test retries](../test-retries.md#retries).
 
diff --git a/docs/src/test-reporter-api/class-teststep.md b/docs/src/test-reporter-api/class-teststep.md
index 43b8474abe133..84ba3abbda7f1 100644
--- a/docs/src/test-reporter-api/class-teststep.md
+++ b/docs/src/test-reporter-api/class-teststep.md
@@ -9,10 +9,13 @@ Represents a step in the [TestRun].
 - type: <[string]>
 
 Step category to differentiate steps with different origin and verbosity. Built-in categories are:
-* `hook` for fixtures and hooks initialization and teardown
 * `expect` for expect calls
+* `fixture` for fixtures setup and teardown
+* `hook` for hooks initialization and teardown
 * `pw:api` for Playwright API calls.
 * `test.step` for test.step API calls.
+* `test.attach` for test attachmen calls.
+
 
 ## property: TestStep.duration
 * since: v1.10
@@ -50,6 +53,25 @@ Start time of this particular test step.
 
 List of steps inside this step.
 
+## property: TestStep.annotations
+* since: v1.51
+- type: <[Array]<[Object]>>
+  - `type` <[string]> Annotation type, for example `'skip'`.
+  - `description` ?<[string]> Optional description.
+  - `location` ?<[Location]> Optional location in the source where the annotation is added.
+
+The list of annotations applicable to the current test step.
+
+## property: TestStep.attachments
+* since: v1.50
+- type: <[Array]<[Object]>>
+  - `name` <[string]> Attachment name.
+  - `contentType` <[string]> Content type of this attachment to properly present in the report, for example `'application/json'` or `'image/png'`.
+  - `path` ?<[string]> Optional path on the filesystem to the attached file.
+  - `body` ?<[Buffer]> Optional attachment body used instead of a file.
+
+The list of files or buffers attached in the step execution through [`method: TestInfo.attach`].
+
 ## property: TestStep.title
 * since: v1.10
 - type: <[string]>
diff --git a/docs/src/test-reporters-js.md b/docs/src/test-reporters-js.md
index 952d74b923bd2..f3393c6a25657 100644
--- a/docs/src/test-reporters-js.md
+++ b/docs/src/test-reporters-js.md
@@ -102,7 +102,7 @@ List report supports the following configuration options and environment variabl
 | Environment Variable Name | Reporter Config Option| Description | Default
 |---|---|---|---|
 | `PLAYWRIGHT_LIST_PRINT_STEPS` | `printSteps` | Whether to print each step on its own line. | `false`
-| `PLAYWRIGHT_FORCE_TTY` | | Whether to produce output suitable for a live terminal. If a number is specified, it will also be used as the terminal width.  | `true` when terminal is in TTY mode, `false` otherwise.
+| `PLAYWRIGHT_FORCE_TTY` | | Whether to produce output suitable for a live terminal. Supports `true`, `1`, `false`, `0`, `[WIDTH]`, and `[WIDTH]x[HEIGHT]`. `[WIDTH]` and `[WIDTH]x[HEIGHT]` specifies the TTY dimensions. | `true` when terminal is in TTY mode, `false` otherwise.
 | `FORCE_COLOR` | | Whether to produce colored output. | `true` when terminal is in TTY mode, `false` otherwise.
 
 
@@ -140,7 +140,7 @@ Line report supports the following configuration options and environment variabl
 
 | Environment Variable Name | Reporter Config Option| Description | Default
 |---|---|---|---|
-| `PLAYWRIGHT_FORCE_TTY` | | Whether to produce output suitable for a live terminal. If a number is specified, it will also be used as the terminal width.  | `true` when terminal is in TTY mode, `false` otherwise.
+| `PLAYWRIGHT_FORCE_TTY` | | Whether to produce output suitable for a live terminal. Supports `true`, `1`, `false`, `0`, `[WIDTH]`, and `[WIDTH]x[HEIGHT]`. `[WIDTH]` and `[WIDTH]x[HEIGHT]` specifies the TTY dimensions. | `true` when terminal is in TTY mode, `false` otherwise.
 | `FORCE_COLOR` | | Whether to produce colored output. | `true` when terminal is in TTY mode, `false` otherwise.
 
 
@@ -182,7 +182,7 @@ Dot report supports the following configuration options and environment variable
 
 | Environment Variable Name | Reporter Config Option| Description | Default
 |---|---|---|---|
-| `PLAYWRIGHT_FORCE_TTY` | | Whether to produce output suitable for a live terminal. If a number is specified, it will also be used as the terminal width.  | `true` when terminal is in TTY mode, `false` otherwise.
+| `PLAYWRIGHT_FORCE_TTY` | | Whether to produce output suitable for a live terminal. Supports `true`, `1`, `false`, `0`, `[WIDTH]`, and `[WIDTH]x[HEIGHT]`. `[WIDTH]` and `[WIDTH]x[HEIGHT]` specifies the TTY dimensions. | `true` when terminal is in TTY mode, `false` otherwise.
 | `FORCE_COLOR` | | Whether to produce colored output. | `true` when terminal is in TTY mode, `false` otherwise.
 
 ### HTML reporter
@@ -246,11 +246,13 @@ HTML report supports the following configuration options and environment variabl
 
 | Environment Variable Name | Reporter Config Option| Description | Default
 |---|---|---|---|
+| `PLAYWRIGHT_HTML_TITLE` | `title` | A title to display in the generated report. | No title is displayed by default
 | `PLAYWRIGHT_HTML_OUTPUT_DIR` | `outputFolder` | Directory to save the report to. | `playwright-report`
 | `PLAYWRIGHT_HTML_OPEN` | `open` | When to open the html report in the browser, one of `'always'`, `'never'` or `'on-failure'` | `'on-failure'`
 | `PLAYWRIGHT_HTML_HOST` | `host` | When report opens in the browser, it will be served bound to this hostname. | `localhost`
 | `PLAYWRIGHT_HTML_PORT` | `port` | When report opens in the browser, it will be served on this port. | `9323` or any available port when `9323` is not available.
 | `PLAYWRIGHT_HTML_ATTACHMENTS_BASE_URL` | `attachmentsBaseURL` | A separate location where attachments from the `data` subdirectory are uploaded. Only needed when you upload report and `data` separately to different locations. | `data/`
+| `PLAYWRIGHT_HTML_NO_SNIPPETS` | `noSnippets` | If true, disable rendering code snippets in the action log. If there is a top level error, that report section with code snippet will still render. Supports `true`, `1`, `false`, and `0`. | `false`
 
 ### Blob reporter
 
@@ -422,18 +424,10 @@ Or just pass the reporter file path as `--reporter` command line option:
 npx playwright test --reporter="./myreporter/my-awesome-reporter.ts"
 ```
 
-## Third party reporter showcase
+Here's a short list of open source reporter implementations that you can take a look at when writing your own reporter:
 
-* [Allure](https://www.npmjs.com/package/allure-playwright)
-* [Argos Visual Testing](https://argos-ci.com/docs/playwright)
-* [Currents](https://www.npmjs.com/package/@currents/playwright)
-* [GitHub Actions Reporter](https://www.npmjs.com/package/@estruyf/github-actions-reporter)
-* [GitHub Pull Request Comment](https://github.com/marketplace/actions/playwright-report-comment)
-* [Mail Reporter](https://www.npmjs.com/package/playwright-mail-reporter)
-* [Microsoft Teams Reporter](https://www.npmjs.com/package/playwright-msteams-reporter)
-* [Monocart](https://github.com/cenfun/monocart-reporter)
+* [Allure Reporter](https://github.com/allure-framework/allure-js/tree/main/packages/allure-playwright)
+* [Github Actions Reporter](https://github.com/estruyf/playwright-github-actions-reporter)
+* [Mail Reporter](https://github.com/estruyf/playwright-mail-reporter)
 * [ReportPortal](https://github.com/reportportal/agent-js-playwright)
-* [Serenity/JS](https://serenity-js.org/handbook/test-runners/playwright-test)
-* [Testmo](https://github.com/jonasclaes/playwright-testmo-reporter)
-* [Testomat.io](https://github.com/testomatio/reporter/blob/master/docs/frameworks.md#playwright)
-* [Tesults](https://www.tesults.com/docs/playwright)
+* [Monocart](https://github.com/cenfun/monocart-reporter)
diff --git a/docs/src/test-runners-csharp.md b/docs/src/test-runners-csharp.md
index 74c0f0ff0888f..f193d73619780 100644
--- a/docs/src/test-runners-csharp.md
+++ b/docs/src/test-runners-csharp.md
@@ -5,19 +5,71 @@ title: "Test Runners"
 
 ## Introduction
 
-While Playwright for .NET isn't tied to a particular test runner or testing framework, in our experience the easiest way of getting started is by using the base classes we provide for [MSTest](#mstest) and [NUnit](#nunit). These classes support running tests on multiple browser engines, adjusting launch/context options and getting a [Page]/[BrowserContext] instance per test out of the box. 
+While Playwright for .NET isn't tied to a particular test runner or testing framework, in our experience the easiest way of getting started is by using the base classes we provide for MSTest, NUnit, xUnit, or xUnit v3. These classes support running tests on multiple browser engines, adjusting launch/context options and getting a [Page]/[BrowserContext] instance per test out of the box. 
 
 Playwright and Browser instances will be reused between tests for better performance. We
 recommend running each test case in a new BrowserContext, this way browser state will be
 isolated between the tests.
 
-## MSTest
+<Tabs
+  groupId="test-runners"
+  defaultValue="mstest"
+  values={[
+    {label: 'MSTest', value: 'mstest'},
+    {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
+  ]
+}>
+<TabItem value="nunit">
+
+Playwright provides base classes to write tests with NUnit via the [`Microsoft.Playwright.NUnit`](https://www.nuget.org/packages/Microsoft.Playwright.NUnit) package.
+
+</TabItem>
+<TabItem value="mstest">
 
 Playwright provides base classes to write tests with MSTest via the [`Microsoft.Playwright.MSTest`](https://www.nuget.org/packages/Microsoft.Playwright.MSTest) package.
 
+</TabItem>
+<TabItem value="xunit">
+
+Playwright provides base classes to write tests with xUnit via the [`Microsoft.Playwright.Xunit`](https://www.nuget.org/packages/Microsoft.Playwright.Xunit) package.
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+Playwright provides base classes to write tests with xUnit v3 via the [`Microsoft.Playwright.Xunit.v3`](https://www.nuget.org/packages/Microsoft.Playwright.Xunit.v3) package.
+
+</TabItem>
+</Tabs>
+
 Check out the [installation guide](./intro.md) to get started.
 
-### Running MSTest tests in Parallel
+## Running tests in Parallel
+
+<Tabs
+  groupId="test-runners"
+  defaultValue="mstest"
+  values={[
+    {label: 'MSTest', value: 'mstest'},
+    {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
+  ]
+}>
+<TabItem value="nunit">
+
+By default NUnit will run all test files in parallel, while running tests inside each file sequentially (`ParallelScope.Self`). It will create as many processes as there are cores on the host system. You can adjust this behavior using the NUnit.NumberOfTestWorkers parameter.
+Only `ParallelScope.Self` is supported.
+
+For CPU-bound tests, we recommend using as many workers as there are cores on your system, divided by 2. For IO-bound tests you can use as many workers as you have cores.
+
+```bash
+dotnet test -- NUnit.NumberOfTestWorkers=5
+```
+
+</TabItem>
+<TabItem value="mstest">
 
 By default MSTest will run all classes in parallel, while running tests inside each class sequentially (`ExecutionScope.ClassLevel`). It will create as many processes as there are cores on the host system. You can adjust this behavior by using the following CLI parameter or using a `.runsettings` file, see below.
 Running tests in parallel at the method level (`ExecutionScope.MethodLevel`) is not supported.
@@ -26,7 +78,88 @@ Running tests in parallel at the method level (`ExecutionScope.MethodLevel`) is
 dotnet test --settings:.runsettings -- MSTest.Parallelize.Workers=4
 ```
 
-### Customizing [BrowserContext] options
+</TabItem>
+<TabItem value="xunit">
+
+By default xUnit will run all classes in parallel, while running tests inside each class sequentially.
+It will create by default as many processes as there are cores on the system. You can adjust this behavior by using the following CLI parameter or using a `.runsettings` file, see below.
+
+```bash
+dotnet test -- xUnit.MaxParallelThreads=5
+```
+
+:::note
+We recommend xUnit 2.8+ which uses the [`conservative` parallelism algorithm](https://xunit.net/docs/running-tests-in-parallel.html#algorithms) by default.
+:::
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+By default xUnit v3 will run all classes in parallel, while running tests inside each class sequentially.
+It will create by default as many processes as there are cores on the system. You can adjust this behavior by using the following CLI parameter or using a `.runsettings` file, see below.
+
+```bash
+dotnet test -- xUnit.MaxParallelThreads=5
+```
+
+:::note
+xUnit v3 uses the [`conservative` parallelism algorithm](https://xunit.net/docs/running-tests-in-parallel.html#algorithms) by default.
+:::
+
+</TabItem>
+</Tabs>
+
+
+## Customizing [BrowserContext] options
+
+<Tabs
+  groupId="test-runners"
+  defaultValue="mstest"
+  values={[
+    {label: 'MSTest', value: 'mstest'},
+    {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
+  ]
+}>
+<TabItem value="nunit">
+
+To customize context options, you can override the `ContextOptions` method of your test class derived from `Microsoft.Playwright.MSTest.PageTest` or `Microsoft.Playwright.MSTest.ContextTest`. See the following example:
+
+```csharp
+using Microsoft.Playwright.NUnit;
+
+namespace PlaywrightTests;
+
+[Parallelizable(ParallelScope.Self)]
+[TestFixture]
+public class MyTest : PageTest
+{
+    [Test]
+    public async Task TestWithCustomContextOptions()
+    {
+        // The following Page (and BrowserContext) instance has the custom colorScheme, viewport and baseURL set:
+        await Page.GotoAsync("/login");
+    }
+
+    public override BrowserNewContextOptions ContextOptions()
+    {
+        return new BrowserNewContextOptions()
+        {
+            ColorScheme = ColorScheme.Light,
+            ViewportSize = new()
+            {
+                Width = 1920,
+                Height = 1080
+            },
+            BaseURL = "https://github.com",
+        };
+    }
+}
+```
+
+</TabItem>
+<TabItem value="mstest">
 
 To customize context options, you can override the `ContextOptions` method of your test class derived from `Microsoft.Playwright.MSTest.PageTest` or `Microsoft.Playwright.MSTest.ContextTest`. See the following example:
 
@@ -65,7 +198,81 @@ public class ExampleTest : PageTest
 
 ```
 
-### Customizing [Browser]/launch options
+</TabItem>
+<TabItem value="xunit">
+
+To customize context options, you can override the `ContextOptions` method of your test class derived from `Microsoft.Playwright.Xunit.PageTest` or `Microsoft.Playwright.Xunit.ContextTest`. See the following example:
+
+```csharp
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+
+namespace PlaywrightTests;
+
+public class UnitTest1 : PageTest
+{
+    [Fact]
+    public async Task TestWithCustomContextOptions()
+    {
+        // The following Page (and BrowserContext) instance has the custom colorScheme, viewport and baseURL set:
+        await Page.GotoAsync("/login");
+    }
+    public override BrowserNewContextOptions ContextOptions()
+    {
+        return new BrowserNewContextOptions()
+        {
+            ColorScheme = ColorScheme.Light,
+            ViewportSize = new()
+            {
+                Width = 1920,
+                Height = 1080
+            },
+            BaseURL = "https://github.com",
+        };
+    }
+}
+```
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+To customize context options, you can override the `ContextOptions` method of your test class derived from `Microsoft.Playwright.Xunit.v3.PageTest` or `Microsoft.Playwright.Xunit.v3.ContextTest`. See the following example:
+
+```csharp
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+
+namespace PlaywrightTests;
+
+public class UnitTest1 : PageTest
+{
+    [Fact]
+    public async Task TestWithCustomContextOptions()
+    {
+        // The following Page (and BrowserContext) instance has the custom colorScheme, viewport and baseURL set:
+        await Page.GotoAsync("/login");
+    }
+    public override BrowserNewContextOptions ContextOptions()
+    {
+        return new BrowserNewContextOptions()
+        {
+            ColorScheme = ColorScheme.Light,
+            ViewportSize = new()
+            {
+                Width = 1920,
+                Height = 1080
+            },
+            BaseURL = "https://github.com",
+        };
+    }
+}
+```
+
+</TabItem>
+</Tabs>
+
+
+## Customizing [Browser]/launch options
 
 [Browser]/launch options can be overridden either using a run settings file or by setting the run settings options directly via the
 CLI. See the following example:
@@ -87,14 +294,57 @@ CLI. See the following example:
 dotnet test -- Playwright.BrowserName=chromium Playwright.LaunchOptions.Headless=false Playwright.LaunchOptions.Channel=msedge
 ```
 
-### Using Verbose API Logs
+## Using Verbose API Logs
 
-When you have enabled the [verbose API log](./debug.md#verbose-api-logs), via the `DEBUG` environment variable, you will see the messages in the standard error stream. In MSTest, within Visual Studio, that will be the `Tests` pane of the `Output` window. It will also be displayed in the `Test Log` for each test.
+When you have enabled the [verbose API log](./debug.md#verbose-api-logs), via the `DEBUG` environment variable, you will see the messages in the standard error stream. Within Visual Studio, that will be the `Tests` pane of the `Output` window. It will also be displayed in the `Test Log` for each test.
 
-### Using the .runsettings file
+## Using the .runsettings file
 
 When running tests from Visual Studio, you can take advantage of the `.runsettings` file. The following shows a reference of the supported values.
 
+<Tabs
+  groupId="test-runners"
+  defaultValue="mstest"
+  values={[
+    {label: 'MSTest', value: 'mstest'},
+    {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
+  ]
+}>
+<TabItem value="nunit">
+
+For example, to specify the number of workers you can use `NUnit.NumberOfTestWorkers` or to enable `DEBUG` logs `RunConfiguration.EnvironmentVariables`.
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <!-- NUnit adapter -->  
+  <NUnit>
+    <NumberOfTestWorkers>24</NumberOfTestWorkers>
+  </NUnit>
+  <!-- General run configuration -->
+  <RunConfiguration>
+    <EnvironmentVariables>
+      <!-- For debugging selectors, it's recommend to set the following environment variable -->
+      <DEBUG>pw:api</DEBUG>
+    </EnvironmentVariables>
+  </RunConfiguration>
+  <!-- Playwright -->  
+  <Playwright>
+    <BrowserName>chromium</BrowserName>
+    <ExpectTimeout>5000</ExpectTimeout>
+    <LaunchOptions>
+      <Headless>false</Headless>
+      <Channel>msedge</Channel>
+    </LaunchOptions>
+  </Playwright>
+</RunSettings>
+```
+
+</TabItem>
+<TabItem value="mstest">
+
 For example, to specify the number of workers, you can use `MSTest.Parallelize.Workers`. You can also enable `DEBUG` logs using `RunConfiguration.EnvironmentVariables`.
 
 ```xml
@@ -125,80 +375,29 @@ For example, to specify the number of workers, you can use `MSTest.Parallelize.W
 </RunSettings>
 ```
 
-### Base MSTest classes for Playwright
-
-There are a few base classes available to you in `Microsoft.Playwright.MSTest` namespace:
-
-|Test          |Description|
-|--------------|-----------|
-|PageTest      |Each test gets a fresh copy of a web [Page] created in its own unique [BrowserContext]. Extending this class is the simplest way of writing a fully-functional Playwright test.<br></br><br></br>Note: You can override the `ContextOptions` method in each test file to control context options, the ones typically passed into the [`method: Browser.newContext`] method. That way you can specify all kinds of emulation options for your test file individually.|
-|ContextTest   |Each test will get a fresh copy of a [BrowserContext]. You can create as many pages in this context as you'd like. Using this test is the easiest way to test multi-page scenarios where you need more than one tab.<br></br><br></br>Note: You can override the `ContextOptions` method in each test file to control context options, the ones typically passed into the [`method: Browser.newContext`] method. That way you can specify all kinds of emulation options for your test file individually.|
-|BrowserTest   |Each test will get a browser and can create as many contexts as it likes. Each test is responsible for cleaning up all the contexts it created.|
-|PlaywrightTest|This gives each test a Playwright object so that the test could start and stop as many browsers as it likes.|
-
-## NUnit
-
-Playwright provides base classes to write tests with NUnit via the [`Microsoft.Playwright.NUnit`](https://www.nuget.org/packages/Microsoft.Playwright.NUnit) package.
-
-Check out the [installation guide](./intro.md) to get started.
-
-### Running NUnit tests in Parallel
-
-By default NUnit will run all test files in parallel, while running tests inside each file sequentially (`ParallelScope.Self`). It will create as many processes as there are cores on the host system. You can adjust this behavior using the NUnit.NumberOfTestWorkers parameter.
-Only `ParallelScope.Self` is supported.
-
-For CPU-bound tests, we recommend using as many workers as there are cores on your system, divided by 2. For IO-bound tests you can use as many workers as you have cores.
-
-```bash
-dotnet test -- NUnit.NumberOfTestWorkers=5
-```
-
-### Customizing [BrowserContext] options
-
-To customize context options, you can override the `ContextOptions` method of your test class derived from `Microsoft.Playwright.MSTest.PageTest` or `Microsoft.Playwright.MSTest.ContextTest`. See the following example:
-
-```csharp
-using Microsoft.Playwright.NUnit;
-
-namespace PlaywrightTests;
-
-[Parallelizable(ParallelScope.Self)]
-[TestFixture]
-public class MyTest : PageTest
-{
-    [Test]
-    public async Task TestWithCustomContextOptions()
-    {
-        // The following Page (and BrowserContext) instance has the custom colorScheme, viewport and baseURL set:
-        await Page.GotoAsync("/login");
-    }
-
-    public override BrowserNewContextOptions ContextOptions()
-    {
-        return new BrowserNewContextOptions()
-        {
-            ColorScheme = ColorScheme.Light,
-            ViewportSize = new()
-            {
-                Width = 1920,
-                Height = 1080
-            },
-            BaseURL = "https://github.com",
-        };
-    }
-}
-```
-
-### Customizing [Browser]/launch options
+</TabItem>
+<TabItem value="xunit">
 
-[Browser]/launch options can be overridden either using a run settings file or by setting the run settings options directly via the
-CLI. See the following example:
+For example, to specify the number of workers, you can use `xUnit.MaxParallelThreads`. You can also enable `DEBUG` logs using `RunConfiguration.EnvironmentVariables`.
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
+  <!-- See https://xunit.net/docs/runsettings -->
+  <xUnit>
+    <MaxParallelThreads>1</MaxParallelThreads>
+  </xUnit>
+  <!-- General run configuration -->
+  <RunConfiguration>
+    <EnvironmentVariables>
+      <!-- For debugging selectors, it's recommend to set the following environment variable -->
+      <DEBUG>pw:api</DEBUG>
+    </EnvironmentVariables>
+  </RunConfiguration>
+  <!-- Playwright -->  
   <Playwright>
     <BrowserName>chromium</BrowserName>
+    <ExpectTimeout>5000</ExpectTimeout>
     <LaunchOptions>
       <Headless>false</Headless>
       <Channel>msedge</Channel>
@@ -206,28 +405,18 @@ CLI. See the following example:
   </Playwright>
 </RunSettings>
 ```
+</TabItem>
+<TabItem value="xunit-v3">
 
-```bash
-dotnet test -- Playwright.BrowserName=chromium Playwright.LaunchOptions.Headless=false Playwright.LaunchOptions.Channel=msedge
-```
-
-### Using Verbose API Logs
-
-When you have enabled the [verbose API log](./debug.md#verbose-api-logs), via the `DEBUG` environment variable, you will see the messages in the standard error stream. In NUnit, within Visual Studio, that will be the `Tests` pane of the `Output` window. It will also be displayed in the `Test Log` for each test.
-
-### Using the .runsettings file
-
-When running tests from Visual Studio, you can take advantage of the `.runsettings` file. The following shows a reference of the supported values.
-
-For example, to specify the amount of workers you can use `NUnit.NumberOfTestWorkers` or to enable `DEBUG` logs `RunConfiguration.EnvironmentVariables`.
+For example, to specify the number of workers, you can use `xUnit.MaxParallelThreads`. You can also enable `DEBUG` logs using `RunConfiguration.EnvironmentVariables`.
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <RunSettings>
-  <!-- NUnit adapter -->  
-  <NUnit>
-    <NumberOfTestWorkers>24</NumberOfTestWorkers>
-  </NUnit>
+  <!-- See https://xunit.net/docs/runsettings -->
+  <xUnit>
+    <MaxParallelThreads>1</MaxParallelThreads>
+  </xUnit>
   <!-- General run configuration -->
   <RunConfiguration>
     <EnvironmentVariables>
@@ -246,19 +435,46 @@ For example, to specify the amount of workers you can use `NUnit.NumberOfTestWor
   </Playwright>
 </RunSettings>
 ```
-
-### Base NUnit classes for Playwright
+</TabItem>
+</Tabs>
+
+## Base classes for Playwright
+
+<Tabs
+  groupId="test-runners"
+  defaultValue="mstest"
+  values={[
+    {label: 'MSTest', value: 'mstest'},
+    {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
+  ]
+}>
+<TabItem value="nunit">
 
 There are a few base classes available to you in `Microsoft.Playwright.NUnit` namespace:
 
+</TabItem>
+<TabItem value="mstest">
+
+There are a few base classes available to you in `Microsoft.Playwright.MSTest` namespace:
+
+</TabItem>
+<TabItem value="xunit">
+
+There are a few base classes available to you in `Microsoft.Playwright.Xunit` namespace:
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+There are a few base classes available to you in `Microsoft.Playwright.Xunit.v3` namespace:
+
+</TabItem>
+</Tabs>
+
 |Test          |Description|
 |--------------|-----------|
 |PageTest      |Each test gets a fresh copy of a web [Page] created in its own unique [BrowserContext]. Extending this class is the simplest way of writing a fully-functional Playwright test.<br></br><br></br>Note: You can override the `ContextOptions` method in each test file to control context options, the ones typically passed into the [`method: Browser.newContext`] method. That way you can specify all kinds of emulation options for your test file individually.|
 |ContextTest   |Each test will get a fresh copy of a [BrowserContext]. You can create as many pages in this context as you'd like. Using this test is the easiest way to test multi-page scenarios where you need more than one tab.<br></br><br></br>Note: You can override the `ContextOptions` method in each test file to control context options, the ones typically passed into the [`method: Browser.newContext`] method. That way you can specify all kinds of emulation options for your test file individually.|
 |BrowserTest   |Each test will get a browser and can create as many contexts as it likes. Each test is responsible for cleaning up all the contexts it created.|
 |PlaywrightTest|This gives each test a Playwright object so that the test could start and stop as many browsers as it likes.|
-
-## xUnit support
-
-While using xUnit is also supported, we do not support running parallel tests. This is a well known problem/design limitation
-outlined by the maintainers across [several](https://github.com/xunit/xunit/issues/2003) [issues](https://github.com/xunit/xunit/issues/2111#issuecomment-650004247).
diff --git a/docs/src/test-runners-java.md b/docs/src/test-runners-java.md
index d29da2e8ba4ae..a70331a673fec 100644
--- a/docs/src/test-runners-java.md
+++ b/docs/src/test-runners-java.md
@@ -11,8 +11,6 @@ Playwright and Browser instances can be reused between tests for better performa
 recommend running each test case in a new BrowserContext, this way browser state will be
 isolated between the tests.
 
-<!-- TOC -->
-
 ## JUnit
 
 In [JUnit](https://junit.org/junit5/) you can initialize [Playwright] and [Browser] in [@BeforeAll](https://junit.org/junit5/docs/current/api/org.junit.jupiter.api/org/junit/jupiter/api/BeforeAll.html) method and
@@ -196,15 +194,16 @@ junit.jupiter.execution.parallel.config.dynamic.factor=0.5
 You can use a Gradle build configuration script, written in Groovy or Kotlin.
 
 <Tabs
-  defaultValue="gradle"
+  groupId="jvm-language"
+  defaultValue="groovy"
   values={[
-    {label: 'build.gradle', value: 'gradle'},
-    {label: 'build.gradle.kts', value: 'gradle-kotlin'}
+    {label: 'Groovy', value: 'groovy'},
+    {label: 'Kotlin', value: 'kotlin'}
   ]
 }>
-<TabItem value="gradle">
+<TabItem value="groovy">
 
-```java
+```groovy title="build.gradle"
 plugins {
   application
   id 'java'
@@ -234,9 +233,9 @@ test {
 ```
 
 </TabItem>
-<TabItem value="gradle-kotlin">
+<TabItem value="kotlin">
 
-```java
+```groovy title="build.gradle.kts"
 plugins {
   application
   id("java")
diff --git a/docs/src/test-runners-python.md b/docs/src/test-runners-python.md
index 0ad4043066ba9..1590f863c847a 100644
--- a/docs/src/test-runners-python.md
+++ b/docs/src/test-runners-python.md
@@ -99,7 +99,7 @@ See [Running Tests](./running-tests.md) for general information on `pytest` opti
 
 ## Examples
 
-### Configure Mypy typings for auto-completion
+### Configure typings for auto-completion
 
 ```py title="test_my_application.py"
 from playwright.sync_api import Page
@@ -109,15 +109,22 @@ def test_visit_admin_dashboard(page: Page):
     # ...
 ```
 
-### Configure slow mo
+If you're using VSCode with Pylance, these types can be inferred by enabling the `python.testing.pytestEnabled` setting so you don't need the type annotation.
 
-Run tests with slow mo with the `--slowmo` argument.
+### Using multiple contexts
 
-```bash
-pytest --slowmo 100
-```
+In order to simulate multiple users, you can create multiple [`BrowserContext`](./browser-contexts) instances.
+
+```py title="test_my_application.py"
+from playwright.sync_api import Page, BrowserContext
+from pytest_playwright.pytest_playwright import CreateContextCallback
 
-Slows down Playwright operations by 100 milliseconds.
+def test_foo(page: Page, new_context: CreateContextCallback) -> None:
+    page.goto("https://example.com")
+    context = new_context()
+    page2 = context.new_page()
+    # page and page2 are in different contexts
+```
 
 ### Skip test by browser
 
@@ -196,7 +203,7 @@ def browser_context_args(browser_context_args):
     }
 ```
 
-### Device emulation
+### Device emulation / BrowserContext option overrides
 
 ```py title="conftest.py"
 import pytest
@@ -252,3 +259,20 @@ def test_bing_is_working(page):
 ## Deploy to CI
 
 See the [guides for CI providers](./ci.md) to deploy your tests to CI/CD.
+
+## Async Fixtures
+
+To use async fixtures, install [`pytest-playwright-asyncio`](https://pypi.org/project/pytest-playwright-asyncio/).
+
+Ensure you are using `pytest-asyncio>=0.26.0` and set [`asyncio_default_test_loop_scope = session`](https://pytest-asyncio.readthedocs.io/en/v0.26.0/how-to-guides/change_default_test_loop.html) in your configuration (`pytest.ini/pyproject.toml/setup.cfg`).
+
+
+```python
+import pytest
+from playwright.async_api import Page
+
+@pytest.mark.asyncio(loop_scope="session")
+async def test_foo(page: Page):
+    await page.goto("https://github.com")
+    # ...
+```
diff --git a/docs/src/test-sharding-js.md b/docs/src/test-sharding-js.md
index d0312db811c7e..3dc517366cf6c 100644
--- a/docs/src/test-sharding-js.md
+++ b/docs/src/test-sharding-js.md
@@ -26,13 +26,32 @@ Now, if you run these shards in parallel on different jobs, your test suite comp
 
 Note that Playwright can only shard tests that can be run in parallel. By default, this means Playwright will shard test files. Learn about other options in the [parallelism guide](./test-parallel.md).
 
+
+## Balancing Shards
+
+Sharding can be done at two levels of granularity depending on whether you use the [`property: TestProject.fullyParallel`] option or not. This affects how the tests are balanced across the shards.
+
+**Sharding with fullyParallel**
+
+When `fullyParallel: true` is enabled, Playwright Test runs individual tests in parallel across multiple shards, ensuring each shard receives an even distribution of tests. This allows for test-level granularity, meaning each shard will attempt to balance the number of individual tests it runs. This is the preferred mode for ensuring even load distribution when sharding, as Playwright can optimize shard execution based on the total number of tests.
+
+**Sharding without fullyParallel**
+
+Without the fullyParallel setting, Playwright Test defaults to file-level granularity, meaning entire test files are assigned to shards (note that the same file may be assigned to different shards across different projects). In this case, the number of tests per file can greatly influence shard distribution. If your test files are not evenly sized (i.e., some files contain many more tests than others), certain shards may end up running significantly more tests, while others may run fewer or even none.
+
+**Key Takeaways:**
+
+- **With** `fullyParallel: true`: Tests are split at the individual test level, leading to more balanced shard execution.
+- **Without** `fullyParallel`: Tests are split at the file level, so to balance the shards, it's important to keep your test files small and evenly sized.
+- To ensure the most effective use of sharding, especially in CI environments, it is recommended to use `fullyParallel: true` when aiming for balanced distribution across shards. Otherwise, you may need to manually organize your test files to avoid imbalances.
+
 ## Merging reports from multiple shards
 
 In the previous example, each test shard has its own test report. If you want to have a combined report showing all the test results from all the shards, you can merge them.
 
 Start with adding `blob` reporter to the config when running on CI:
 
-```ts title="playwright.config.ts"
+```js title="playwright.config.ts"
 export default defineConfig({
   testDir: './tests',
   reporter: process.env.CI ? 'blob' : 'html',
@@ -85,7 +104,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: lts/*
     - name: Install dependencies
       run: npm ci
     - name: Install Playwright browsers
@@ -118,7 +137,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: lts/*
     - name: Install dependencies
       run: npm ci
 
@@ -174,7 +193,7 @@ Supported options:
   npx playwright merge-reports --config=merge.config.ts ./blob-reports
   ```
 
-  ```ts title="merge.config.ts"
+  ```js title="merge.config.ts"
   export default {
     testDir: 'e2e',
     reporter: [['html', { open: 'never' }]],
diff --git a/docs/src/test-snapshots-js.md b/docs/src/test-snapshots-js.md
index d2c7606adf0af..5c64eccfbb762 100644
--- a/docs/src/test-snapshots-js.md
+++ b/docs/src/test-snapshots-js.md
@@ -16,6 +16,10 @@ test('example test', async ({ page }) => {
 });
 ```
 
+:::warning
+Browser rendering can vary based on the host OS, version, settings, hardware, power source (battery vs. power adapter), headless mode, and other factors. For consistent screenshots, run tests in the same environment where the baseline screenshots were generated.
+:::
+
 ## Generating screenshots
 
 When you run above for the first time, test runner will say:
@@ -44,7 +48,10 @@ The snapshot name `example-test-1-chromium-darwin.png` consists of a few parts:
 
 - `chromium-darwin` - the browser name and the platform. Screenshots differ between browsers and platforms due to different rendering, fonts and more, so you will need different snapshots for them. If you use multiple projects in your [configuration file](./test-configuration.md), project name will be used instead of `chromium`.
 
-The snapshot name and path can be configured with [`snapshotPathTemplate`](./api/class-testproject#test-project-snapshot-path-template) in the playwright config.
+The snapshot name and path can be configured with [`property: TestConfig.snapshotPathTemplate`] in the playwright config.
+
+> Note that `toHaveScreenshot()` also accepts an array of path segments to the snapshot file such as `expect().toHaveScreenshot(['relative', 'path', 'to', 'snapshot.png'])`.
+> However, this path must stay within the snapshots directory for each test file (i.e. `a.spec.js-snapshots`), otherwise it will throw.
 
 ## Updating screenshots
 
@@ -54,9 +61,6 @@ Sometimes you need to update the reference screenshot, for example when the page
 npx playwright test --update-snapshots
 ```
 
-> Note that `snapshotName` also accepts an array of path segments to the snapshot file such as `expect().toHaveScreenshot(['relative', 'path', 'to', 'snapshot.png'])`.
-> However, this path must stay within the snapshots directory for each test file (i.e. `a.spec.js-snapshots`), otherwise it will throw.
-
 ## Options
 
 ### maxDiffPixels
diff --git a/docs/src/test-timeouts-js.md b/docs/src/test-timeouts-js.md
index 02f00f0b2678e..13676991eb365 100644
--- a/docs/src/test-timeouts-js.md
+++ b/docs/src/test-timeouts-js.md
@@ -3,18 +3,16 @@ id: test-timeouts
 title: "Timeouts"
 ---
 
-## Introduction
-
 Playwright Test has multiple configurable timeouts for various tasks.
 
 |Timeout    |Default             |Description                      |
 |:----------|:----------------|:--------------------------------|
-|Test timeout|30000 ms|Timeout for each test, includes test, hooks and fixtures:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set default</span><br/><code>{`config = { timeout: 60000 }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override</span><br/>`test.setTimeout(120000)` |
-|Expect timeout|5000 ms|Timeout for each assertion:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set default</span><br/><code>{`config = { expect: { timeout: 10000 } }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override</span><br/>`expect(locator).toBeVisible({ timeout: 10000 })` |
+|Test timeout|30_000 ms|Timeout for each test<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in config</span><br/><code>{`{ timeout: 60_000 }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override in test</span><br/>`test.setTimeout(120_000)` |
+|Expect timeout|5_000 ms|Timeout for each assertion<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in config</span><br/><code>{`{ expect: { timeout: 10_000 } }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override in test</span><br/>`expect(locator).toBeVisible({ timeout: 10_000 })` |
 
 ## Test timeout
 
-Playwright Test enforces a timeout for each test, 30 seconds by default. Time spent by the test function, fixtures, `beforeEach` and `afterEach` hooks is included in the test timeout.
+Playwright Test enforces a timeout for each test, 30 seconds by default. Time spent by the test function, fixture setups, and `beforeEach` hooks is included in the test timeout.
 
 Timed out test produces the following error:
 
@@ -24,6 +22,8 @@ example.spec.ts:3:1 › basic test ===========================
 Timeout of 30000ms exceeded.
 ```
 
+Additional separate timeout, of the same value, is shared between fixture teardowns and `afterEach` hooks, after the test function has finished.
+
 The same timeout value also applies to `beforeAll` and `afterAll` hooks, but they do not share time with any test.
 
 ### Set test timeout in the config
@@ -32,7 +32,7 @@ The same timeout value also applies to `beforeAll` and `afterAll` hooks, but the
 import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
-  timeout: 5 * 60 * 1000,
+  timeout: 120_000,
 });
 ```
 
@@ -40,7 +40,7 @@ API reference: [`property: TestConfig.timeout`].
 
 ### Set timeout for a single test
 
-```js
+```js title="example.spec.ts"
 import { test, expect } from '@playwright/test';
 
 test('slow test', async ({ page }) => {
@@ -49,7 +49,7 @@ test('slow test', async ({ page }) => {
 });
 
 test('very slow test', async ({ page }) => {
-  test.setTimeout(120000);
+  test.setTimeout(120_000);
   // ...
 });
 ```
@@ -58,12 +58,12 @@ API reference: [`method: Test.setTimeout`] and [`method: Test.slow`].
 
 ### Change timeout from a `beforeEach` hook
 
-```js
+```js title="example.spec.ts"
 import { test, expect } from '@playwright/test';
 
 test.beforeEach(async ({ page }, testInfo) => {
   // Extend timeout for all tests running this hook by 30 seconds.
-  testInfo.setTimeout(testInfo.timeout + 30000);
+  testInfo.setTimeout(testInfo.timeout + 30_000);
 });
 ```
 
@@ -73,7 +73,7 @@ API reference: [`method: TestInfo.setTimeout`].
 
 `beforeAll` and `afterAll` hooks have a separate timeout, by default equal to test timeout. You can change it separately for each hook by calling [`method: TestInfo.setTimeout`] inside the hook.
 
-```js
+```js title="example.spec.ts"
 import { test, expect } from '@playwright/test';
 
 test.beforeAll(async () => {
@@ -86,7 +86,7 @@ API reference: [`method: TestInfo.setTimeout`].
 
 ## Expect timeout
 
-Web-first assertions like `expect(locator).toHaveText()` have a separate timeout, 5 seconds by default. Assertion timeout is unrelated to the test timeout. It produces the following error:
+Auto-retrying assertions like [`method: LocatorAssertions.toHaveText`] have a separate timeout, 5 seconds by default. Assertion timeout is unrelated to the test timeout. It produces the following error:
 
 ```txt
 example.spec.ts:3:1 › basic test ===========================
@@ -107,11 +107,23 @@ import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
   expect: {
-    timeout: 10 * 1000,
+    timeout: 10_000,
   },
 });
 ```
 
+API reference: [`property: TestConfig.expect`].
+
+### Specify expect timeout for a single assertion
+
+```js title="example.spec.ts"
+import { test, expect } from '@playwright/test';
+
+test('example', async ({ page }) => {
+  await expect(locator).toHaveText('hello', { timeout: 10_000 });
+});
+```
+
 ## Global timeout
 
 Playwright Test supports a timeout for the whole test run. This prevents excess resource usage when everything went wrong. There is no default global timeout, but you can set a reasonable one in the config, for example one hour. Global timeout produces the following error:
@@ -126,12 +138,11 @@ Running 1000 tests using 10 workers
 
 You can set global timeout in the config.
 
-```js
-// playwright.config.ts
+```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
 
 export default defineConfig({
-  globalTimeout: 60 * 60 * 1000,
+  globalTimeout: 3_600_000,
 });
 ```
 
@@ -144,22 +155,13 @@ If you happen to be in this section because your test are flaky, it is very like
 
 |Timeout    |Default             |Description                      |
 |:----------|:----------------|:--------------------------------|
-|Action timeout| no timeout |Timeout for each action:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set default</span><br/><code>{`config = { use: { actionTimeout: 10000 } }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override</span><br/>`locator.click({ timeout: 10000 })` |
-|Navigation timeout| no timeout |Timeout for each navigation action:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set default</span><br/><code>{`config = { use: { navigationTimeout: 30000 } }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override</span><br/>`page.goto('/', { timeout: 30000 })` |
-|Global timeout|no timeout |Global timeout for the whole test run:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in config</span><br/>`config = { globalTimeout: 60*60*1000 }`<br/> |
-|`beforeAll`/`afterAll` timeout|30000 ms|Timeout for the hook:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in hook</span><br/>`test.setTimeout(60000)`<br/> |
-|Fixture timeout|no timeout |Timeout for an individual fixture:<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in fixture</span><br/>`{ scope: 'test', timeout: 30000 }`<br/> |
-
+|Action timeout| no timeout |Timeout for each action<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in config</span><br/><code>{`{ use: { actionTimeout: 10_000 } }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override in test</span><br/>`locator.click({ timeout: 10_000 })` |
+|Navigation timeout| no timeout |Timeout for each navigation action<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in config</span><br/><code>{`{ use: { navigationTimeout: 30_000 } }`}</code><br/><span style={{textTransform: 'uppercase',fontSize: 'smaller', fontWeight: 'bold', opacity: '0.7'}}>Override in test</span><br/>`page.goto('/', { timeout: 30_000 })` |
+|Global timeout|no timeout |Global timeout for the whole test run<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in config</span><br/>`{ globalTimeout: 3_600_000 }`<br/> |
+|`beforeAll`/`afterAll` timeout|30_000 ms|Timeout for the hook<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in hook</span><br/>`test.setTimeout(60_000)`<br/> |
+|Fixture timeout|no timeout |Timeout for an individual fixture<br/><span style={{textTransform:'uppercase',fontSize:'smaller',fontWeight:'bold',opacity:'0.7'}}>Set in fixture</span><br/>`{ scope: 'test', timeout: 30_000 }`<br/> |
 
-### Set timeout for a single assertion
 
-```js
-import { test, expect } from '@playwright/test';
-
-test('basic test', async ({ page }) => {
-  await expect(page.getByRole('button')).toHaveText('Sign in', { timeout: 10000 });
-});
-```
 ### Set action and navigation timeouts in the config
 
 ```js title="playwright.config.ts"
@@ -177,7 +179,7 @@ API reference: [`property: TestOptions.actionTimeout`] and [`property: TestOptio
 
 ### Set timeout for a single action
 
-```js
+```js title="example.spec.ts"
 import { test, expect } from '@playwright/test';
 
 test('basic test', async ({ page }) => {
@@ -190,29 +192,14 @@ test('basic test', async ({ page }) => {
 
 By default, [fixture](./test-fixtures) shares timeout with the test. However, for slow fixtures, especially [worker-scoped](./test-fixtures#worker-scoped-fixtures) ones, it is convenient to have a separate timeout. This way you can keep the overall test timeout small, and give the slow fixture more time.
 
-```js tab=js-js
-const { test: base, expect } = require('@playwright/test');
-
-const test = base.extend({
-  slowFixture: [async ({}, use) => {
-    // ... perform a slow operation ...
-    await use('hello');
-  }, { timeout: 60000 }]
-});
-
-test('example test', async ({ slowFixture }) => {
-  // ...
-});
-```
-
-```js tab=js-ts
+```js title="example.spec.ts"
 import { test as base, expect } from '@playwright/test';
 
 const test = base.extend<{ slowFixture: string }>({
   slowFixture: [async ({}, use) => {
     // ... perform a slow operation ...
     await use('hello');
-  }, { timeout: 60000 }]
+  }, { timeout: 60_000 }]
 });
 
 test('example test', async ({ slowFixture }) => {
diff --git a/docs/src/test-typescript-js.md b/docs/src/test-typescript-js.md
index 09614f0306c71..538f5a137e207 100644
--- a/docs/src/test-typescript-js.md
+++ b/docs/src/test-typescript-js.md
@@ -5,9 +5,9 @@ title: "TypeScript"
 
 ## Introduction
 
-Playwright supports TypeScript out of the box. You just write tests in TypeScript, and Playwright will read them, transform to JavaScript and run. Note that Playwright does not check the types and will run tests even if there are non-critical TypeScript compilation errors.
+Playwright supports TypeScript out of the box. You just write tests in TypeScript, and Playwright will read them, transform to JavaScript and run.
 
-We recommend you run TypeScript compiler alongside Playwright. For example on GitHub actions:
+Note that Playwright does not check the types and will run tests even if there are non-critical TypeScript compilation errors. We recommend you run TypeScript compiler alongside Playwright. For example on GitHub actions:
 
 ```yaml
 jobs:
@@ -28,7 +28,7 @@ npx tsc -p tsconfig.json --noEmit -w
 
 ## tsconfig.json
 
-Playwright will pick up `tsconfig.json` for each source file it loads. Note that Playwright **only supports** the following tsconfig options: `paths` and `baseUrl`.
+Playwright will pick up `tsconfig.json` for each source file it loads. Note that Playwright **only supports** the following tsconfig options: `allowJs`, `baseUrl`, `paths` and `references`.
 
 We recommend setting up a separate `tsconfig.json` in the tests directory so that you can change some preferences specifically for the tests. Here is an example directory structure.
 
@@ -49,12 +49,12 @@ playwright.config.ts
 
 Playwright supports [path mapping](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping) declared in the `tsconfig.json`. Make sure that `baseUrl` is also set.
 
-Here is an example `tsconfig.json` that works with Playwright Test:
+Here is an example `tsconfig.json` that works with Playwright:
 
-```json
+```json title="tsconfig.json"
 {
   "compilerOptions": {
-    "baseUrl": ".", // This must be specified if "paths" is.
+    "baseUrl": ".",
     "paths": {
       "@myhelper/*": ["packages/myhelper/*"] // This mapping is relative to "baseUrl".
     }
@@ -74,6 +74,32 @@ test('example', async ({ page }) => {
 });
 ```
 
+### tsconfig resolution
+
+By default, Playwright will look up a closest tsconfig for each imported file by going up the directory structure and looking for `tsconfig.json` or `jsconfig.json`. This way, you can create a `tests/tsconfig.json` file that will be used only for your tests and Playwright will pick it up automatically.
+
+```sh
+# Playwright will choose tsconfig automatically
+npx playwright test
+```
+
+Alternatively, you can specify a single tsconfig file to use in the command line, and Playwright will use it for all imported files, not only test files.
+
+```sh
+# Pass a specific tsconfig
+npx playwright test --tsconfig=tsconfig.test.json
+```
+
+You can specify a single tsconfig file in the config file, that will be used for loading test files, reporters, etc. However, it will not be used while loading the playwright config itself or any files imported from it.
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  tsconfig: './tsconfig.test.json',
+});
+```
+
 ## Manually compile tests with TypeScript
 
 Sometimes, Playwright Test will not be able to transform your TypeScript code correctly, for example when you are using experimental or very recent features of TypeScript, usually configured in `tsconfig.json`.
diff --git a/docs/src/test-ui-mode-js.md b/docs/src/test-ui-mode-js.md
index 4fb021e6f6500..4aaeae92d63ef 100644
--- a/docs/src/test-ui-mode-js.md
+++ b/docs/src/test-ui-mode-js.md
@@ -7,7 +7,7 @@ import LiteYouTube from '@site/src/components/LiteYouTube';
 
 ## Introduction
 
-UI Mode lets you explore, run and debug tests with a time travel experience complete with watch mode. All test files are loaded into the testing sidebar where you can expand each file and describe block to individually run, view, watch and debug each test. Filter tests by **text** or **@tag** or by **passed**, **failed** and **skipped** tests as well as by [**projects**](./test-projects) as set in your `playwright.config` file. See a full trace of your tests and hover back and forward over each action to see what was happening during each step and pop out the DOM snapshot to a separate window for a better debugging experience.
+UI Mode lets you explore, run, and debug tests with a time travel experience complete with a watch mode. All test files are displayed in the testing sidebar, allowing you to expand each file and describe block to individually run, view, watch, and debug each test. Filter tests by **name**, [**projects**](./test-projects) (set in your `playwright.config` file), **@tag**, or by the execution status of **passed**, **failed**, and **skipped**. See a full trace of your tests and hover back and forward over each action to see what was happening during each step. You can also pop out the DOM snapshot of a given moment into a separate window for a better debugging experience.
 
 <LiteYouTube
     id="d0u6XhXknzU"
@@ -18,12 +18,13 @@ UI Mode lets you explore, run and debug tests with a time travel experience comp
 
 To open UI mode, run the following command in your terminal:
 
-  ```bash
-  npx playwright test --ui
-  ```
+```bash
+npx playwright test --ui
+```
+
 ## Running your tests
 
-Once you launch UI Mode you will see a list of all your test files. You can run all your tests by clicking the triangle icon in the sidebar. You can also run a single test file, a block of tests or a single test by hovering over the name and clicking on the triangle next to it. 
+Once you launch UI Mode you will see a list of all your test files. You can run all your tests by clicking the triangle icon in the sidebar. You can also run a single test file, a block of tests or a single test by hovering over the name and clicking on the triangle next to it.
 
 ![running tests in ui mode](https://github.com/microsoft/playwright/assets/13063165/6b87712f-64a5-4d73-a91d-6562b864712c)
 
@@ -33,17 +34,15 @@ Filter tests by text or `@tag` or by passed, failed or skipped tests. You can al
 
 ![filtering tests in ui mode](https://github.com/microsoft/playwright/assets/13063165/6f05e589-036d-45d5-9078-38134e1261e4)
 
-
 ## Timeline view
 
 At the top of the trace you can see a timeline view of your test with different colors to highlight navigation and actions. Hover back and forth to see an image snapshot for each action. Double click on an action to see the time range for that action. You can use the slider in the timeline to increase the actions selected and these will be shown in the Actions tab and all console logs and network logs will be filtered to only show the logs for the actions selected.
 
 ![timeline view in ui mode](https://github.com/microsoft/playwright/assets/13063165/811a9985-32aa-4a3e-9869-de32053cf468)
 
-
 ## Actions
 
-In the Actions tab you can see what locator was used for every action and how long each one took to run. Hover over each action of your test and visually see the change in the DOM snapshot. Go back and forward in time and click an action to inspect and debug. Use the Before and After tabs to visually see what happened before and after the action. 
+In the Actions tab you can see what locator was used for every action and how long each one took to run. Hover over each action of your test and visually see the change in the DOM snapshot. Go back and forward in time and click an action to inspect and debug. Use the Before and After tabs to visually see what happened before and after the action.
 ![use before and after actions in ui mode](https://github.com/microsoft/playwright/assets/13063165/7b22fab5-7346-4b98-8fdd-a78ed280647f)
 
 ## Pop out and inspect the DOM
@@ -60,7 +59,7 @@ Click on the pick locator button and hover over the DOM snapshot to see the loca
 
 ## Source
 
-As you hover over each action of your test the line of code for that action is highlighted in the source panel.
+As you hover over each action of your test the line of code for that action is highlighted in the source panel. The button "Open in VSCode" is at the top-right of this section. Upon clicking the button, it will open your test in VS Code right at the line of code that you clicked on.
 
 ![showing source code of tests in ui mode](https://github.com/microsoft/playwright/assets/13063165/49b9fa2a-8a57-4044-acaa-0a2ea4784c5c)
 
@@ -108,7 +107,7 @@ Next to the Actions tab you will find the Metadata tab which will show you more
 
 ## Watch mode
 
-Next to the name of each test in the sidebar you will find an eye icon. Clicking on the icon will activate watch mode which will re-run the test when you make changes to it. You can watch a number of tests at the same time be clicking the eye icon next to each one or all tests by clicking the eye icon at the top of the sidebar. If you are using VS Code then you can easily open your test by clicking on the file icon next to the eye icon. This will open your test in VS Code right at the line of code that you clicked on.
+Next to the name of each test in the sidebar you will find an eye icon. Clicking on the icon will activate watch mode which will re-run the test when you make changes to it. You can watch a number of tests at the same time be clicking the eye icon next to each one or all tests by clicking the eye icon at the top of the sidebar.
 
 ![watch mode in ui mode](https://github.com/microsoft/playwright/assets/13063165/20d7d44c-b52d-43ff-8871-8b828671f3da)
 
diff --git a/docs/src/test-use-options-js.md b/docs/src/test-use-options-js.md
index c8c93c7cee537..0b46393941219 100644
--- a/docs/src/test-use-options-js.md
+++ b/docs/src/test-use-options-js.md
@@ -17,7 +17,7 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   use: {
     // Base URL to use in actions like `await page.goto('/')`.
-    baseURL: 'http://127.0.0.1:3000',
+    baseURL: 'http://localhost:3000',
 
     // Populates context with given storage state.
     storageState: 'state.json',
@@ -64,7 +64,7 @@ export default defineConfig({
 
 | Option | Description |
 | :- | :- |
-| [`property: TestOptions.colorScheme`] | [Emulates](./emulation.md#color-scheme-and-media) `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'` |
+| [`property: TestOptions.colorScheme`] | [Emulates](./emulation.md#color-scheme-and-media) `'prefers-colors-scheme'` media feature, supported values are `'light'` and `'dark'` |
 | [`property: TestOptions.geolocation`] | Context [geolocation](./emulation.md#geolocation). |
 | [`property: TestOptions.locale`] | [Emulates](./emulation.md#locale--timezone) the user locale, for example `en-GB`, `de-DE`, etc. |
 | [`property: TestOptions.permissions`] | A list of [permissions](./emulation.md#permissions) to grant to all pages in the context. |
@@ -192,7 +192,7 @@ export default defineConfig({
 
 ### More browser and context options
 
-Any options accepted by [`method: BrowserType.launch`] or [`method: Browser.newContext`] can be put into `launchOptions` or `contextOptions` respectively in the `use` section.
+Any options accepted by [`method: BrowserType.launch`], [`method: Browser.newContext`] or [`method: BrowserType.connect`] can be put into `launchOptions`, `contextOptions` or `connectOptions` respectively in the `use` section.
 
 ```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
@@ -296,3 +296,54 @@ test.describe('french language block', () => {
   });
 });
 ```
+
+### Reset an option
+
+You can reset an option to the value defined in the config file. Consider the following config that sets a `baseURL`:
+
+```js title="playwright.config.ts"
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+  use: {
+    baseURL: 'https://playwright.dev',
+  },
+});
+```
+
+You can now configure `baseURL` for a file, and also opt-out for a single test.
+
+```js title="intro.spec.ts"
+import { test } from '@playwright/test';
+
+// Configure baseURL for this file.
+test.use({ baseURL: 'https://playwright.dev/docs/intro' });
+
+test('check intro contents', async ({ page }) => {
+  // This test will use "https://playwright.dev/docs/intro" base url as defined above.
+});
+
+test.describe(() => {
+  // Reset the value to a config-defined one.
+  test.use({ baseURL: undefined });
+
+  test('can navigate to intro from the home page', async ({ page }) => {
+    // This test will use "https://playwright.dev" base url as defined in the config.
+  });
+});
+```
+
+If you would like to completely reset the value to `undefined`, use a long-form fixture notation.
+
+```js title="intro.spec.ts"
+import { test } from '@playwright/test';
+
+// Completely unset baseURL for this file.
+test.use({
+  baseURL: [async ({}, use) => use(undefined), { scope: 'test' }],
+});
+
+test('no base url', async ({ page }) => {
+  // This test will not have a base url.
+});
+```
diff --git a/docs/src/test-webserver-js.md b/docs/src/test-webserver-js.md
index aba072d56a073..8c0802c450812 100644
--- a/docs/src/test-webserver-js.md
+++ b/docs/src/test-webserver-js.md
@@ -18,7 +18,7 @@ export default defineConfig({
   // Run your local dev server before starting the tests
   webServer: {
     command: 'npm run start',
-    url: 'http://127.0.0.1:3000',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     stdout: 'ignore',
     stderr: 'pipe',
@@ -30,13 +30,16 @@ export default defineConfig({
 | :- | :- |
 | [`property: TestConfig.webServer`] | Launch a development web server (or multiple) during the tests. |
 | `command`| Shell command to start the local dev server of your app. |
-| `url`| URL of your http server that is expected to return a 2xx, 3xx, 400, 401, 402, or 403 status code when the server is ready to accept connections. |
-| `reuseExistingServer`| If `true`, it will re-use an existing server on the url when available. If no server is running on that url, it will run the command to start a new server. If `false`, it will throw if an existing process is listening on the url. To see the stdout, you can set the `DEBUG=pw:webserver` environment variable. |
-| `ignoreHTTPSErrors` | Whether to ignore HTTPS errors when fetching the `url`. Defaults to `false`. |
 | `cwd` | Current working directory of the spawned process, defaults to the directory of the configuration file. |
-| `stdout` | If `"pipe"`, it will pipe the stdout of the command to the process stdout. If `"ignore"`, it will ignore the stdout of the command. Default to `"ignore"`. |
+| `env` | Environment variables to set for the command, `process.env` by default. |
+| `gracefulShutdown` | How to shut down the process. If unspecified, the process group is forcefully `SIGKILL`ed. If set to `{ signal: 'SIGTERM', timeout: 500 }`, the process group is sent a `SIGTERM` signal, followed by `SIGKILL` if it doesn't exit within 500ms. You can also use `SIGINT` as the signal instead. A `0` timeout means no `SIGKILL` will be sent. Windows doesn't support `SIGTERM` and `SIGINT` signals, so this option is ignored on Windows. Note that shutting down a Docker container requires `SIGTERM`. |
+| `ignoreHTTPSErrors` | Whether to ignore HTTPS errors when fetching the `url`. Defaults to `false`. |
+| `name` | Specifies a custom name for the web server. This name will be prefixed to log messages. Defaults to `[WebServer]`. |
+| `reuseExistingServer`| If `true`, it will re-use an existing server on the url when available. If no server is running on that url, it will run the command to start a new server. If `false`, it will throw if an existing process is listening on the url. To see the stdout, you can set the `DEBUG=pw:webserver` environment variable. |
 | `stderr` | Whether to pipe the stderr of the command to the process stderr or ignore it. Defaults to `"pipe"`. |
-| `timeout` | `How long to wait for the process to start up and be available in milliseconds. Defaults to 60000. |
+| `stdout` | If `"pipe"`, it will pipe the stdout of the command to the process stdout. If `"ignore"`, it will ignore the stdout of the command. Default to `"ignore"`. |
+| `timeout` | How long to wait for the process to start up and be available in milliseconds. Defaults to 60000. |
+| `url`| URL of your http server that is expected to return a 2xx, 3xx, 400, 401, 402, or 403 status code when the server is ready to accept connections. |
 
 ## Adding a server timeout
 
@@ -51,7 +54,7 @@ export default defineConfig({
   // Run your local dev server before starting the tests
   webServer: {
     command: 'npm run start',
-    url: 'http://127.0.0.1:3000',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     timeout: 120 * 1000,
   },
@@ -62,7 +65,7 @@ export default defineConfig({
 
 It is also recommended to specify the `baseURL` in the `use: {}` section of your config, so that tests can use relative urls and you don't have to specify the full URL over and over again. 
 
-When using [`method: Page.goto`], [`method: Page.route`], [`method: Page.waitForURL`], [`method: Page.waitForRequest`], or [`method: Page.waitForResponse`] it takes the base URL in consideration by using the [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL. For Example, by setting the baseURL to `http://127.0.0.1:3000` and navigating to `/login` in your tests, Playwright will run the test using `http://127.0.0.1:3000/login`.
+When using [`method: Page.goto`], [`method: Page.route`], [`method: Page.waitForURL`], [`method: Page.waitForRequest`], or [`method: Page.waitForResponse`] it takes the base URL in consideration by using the [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL. For Example, by setting the baseURL to `http://localhost:3000` and navigating to `/login` in your tests, Playwright will run the test using `http://localhost:3000/login`.
 
 ```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
@@ -73,11 +76,11 @@ export default defineConfig({
   // Run your local dev server before starting the tests
   webServer: {
     command: 'npm run start',
-    url: 'http://127.0.0.1:3000',
+    url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
   },
   use: {
-    baseURL: 'http://127.0.0.1:3000',
+    baseURL: 'http://localhost:3000',
   },
 });
 ```
@@ -88,7 +91,7 @@ Now you can use a relative path when navigating the page:
 import { test } from '@playwright/test';
 
 test('test', async ({ page }) => {
-  // This will navigate to http://127.0.0.1:3000/login
+  // This will navigate to http://localhost:3000/login
   await page.goto('./login');
 });
 ```
@@ -105,19 +108,21 @@ export default defineConfig({
   webServer: [
     {
       command: 'npm run start',
-      url: 'http://127.0.0.1:3000',
+      url: 'http://localhost:3000',
+      name: 'Frontend',
       timeout: 120 * 1000,
       reuseExistingServer: !process.env.CI,
     },
     {
       command: 'npm run backend',
-      url: 'http://127.0.0.1:3333',
+      url: 'http://localhost:3333',
+      name: 'Backend',
       timeout: 120 * 1000,
       reuseExistingServer: !process.env.CI,
     }
   ],
   use: {
-    baseURL: 'http://127.0.0.1:3000',
+    baseURL: 'http://localhost:3000',
   },
 });
 ```
diff --git a/docs/src/touch-events.md b/docs/src/touch-events.md
new file mode 100644
index 0000000000000..e65eab1bf35fb
--- /dev/null
+++ b/docs/src/touch-events.md
@@ -0,0 +1,662 @@
+---
+id: touch-events
+title: "Touch events (legacy)"
+---
+
+## Introduction
+
+Web applications that handle legacy [touch events](https://developer.mozilla.org/en-US/docs/Web/API/Touch_events) to respond to gestures like swipe, pinch, and tap can be tested by manually dispatching [TouchEvent](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/TouchEvent)s to the page. The examples below demonstrate how to use [`method: Locator.dispatchEvent`] and pass [Touch](https://developer.mozilla.org/en-US/docs/Web/API/Touch) points as arguments.
+
+Note that [`method: Locator.dispatchEvent`] does not set [`Event.isTrusted`](https://developer.mozilla.org/en-US/docs/Web/API/Event/isTrusted) property. If your web page relies on it, make sure to disable `isTrusted` check during the test.
+
+### Emulating pan gesture
+
+In the example below, we emulate pan gesture that is expected to move the map. The app under test only uses `clientX/clientY` coordinates of the touch point, so we initialize just that. In a more complex scenario you may need to also set `pageX/pageY/screenX/screenY`, if your app needs them.
+
+```js
+import { test, expect, devices, type Locator } from '@playwright/test';
+
+test.use({ ...devices['Pixel 7'] });
+
+async function pan(locator: Locator, deltaX?: number, deltaY?: number, steps?: number) {
+  const { centerX, centerY } = await locator.evaluate((target: HTMLElement) => {
+    const bounds = target.getBoundingClientRect();
+    const centerX = bounds.left + bounds.width / 2;
+    const centerY = bounds.top + bounds.height / 2;
+    return { centerX, centerY };
+  });
+
+  // Providing only clientX and clientY as the app only cares about those.
+  const touches = [{
+    identifier: 0,
+    clientX: centerX,
+    clientY: centerY,
+  }];
+  await locator.dispatchEvent('touchstart',
+      { touches, changedTouches: touches, targetTouches: touches });
+
+  steps = steps ?? 5;
+  deltaX = deltaX ?? 0;
+  deltaY = deltaY ?? 0;
+  for (let i = 1; i <= steps; i++) {
+    const touches = [{
+      identifier: 0,
+      clientX: centerX + deltaX * i / steps,
+      clientY: centerY + deltaY * i / steps,
+    }];
+    await locator.dispatchEvent('touchmove',
+        { touches, changedTouches: touches, targetTouches: touches });
+  }
+
+  await locator.dispatchEvent('touchend');
+}
+
+test(`pan gesture to move the map`, async ({ page }) => {
+  await page.goto('https://www.google.com/maps/place/@37.4117722,-122.0713234,15z',
+      { waitUntil: 'commit' });
+  await page.getByRole('button', { name: 'Keep using web' }).click();
+  await expect(page.getByRole('button', { name: 'Keep using web' })).not.toBeVisible();
+  // Get the map element.
+  const met = page.locator('[data-test-id="met"]');
+  for (let i = 0; i < 5; i++)
+    await pan(met, 200, 100);
+  // Ensure the map has been moved.
+  await expect(met).toHaveScreenshot();
+});
+```
+
+```csharp
+using Microsoft.Playwright;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+public class TouchEvents
+{
+    public static async Task Main(string[] args)
+    {
+        using var playwright = await Playwright.CreateAsync();
+        var browser = await playwright.Chromium.LaunchAsync();
+        var context = await browser.NewContextAsync(playwright.Devices["Pixel 7"]);
+        var page = await context.NewPageAsync();
+
+        await page.GotoAsync(
+            "https://www.google.com/maps/place/@37.4117722,-122.0713234,15z",
+            new PageGotoOptions { WaitUntil = WaitUntilState.Commit }
+        );
+        await page.GetByRole(AriaRole.Button, new PageGetByRoleOptions { Name = "Keep using web" }).ClickAsync();
+        await page.GetByRole(AriaRole.Button, new PageGetByRoleOptions { Name = "Keep using web" })
+            .WaitForAsync(new LocatorWaitForOptions { State = WaitForSelectorState.Hidden });
+
+        var met = page.Locator("[data-test-id='met']");
+        for (int i = 0; i < 5; i++)
+        {
+            await Pan(met, 200, 100);
+        }
+        await page.ScreenshotAsync(new PageScreenshotOptions { Path = "screenshot.png" });
+    }
+
+    public static async Task Pan(ILocator locator, int deltaX, int deltaY, int steps = 5)
+    {
+        var bounds = await locator.BoundingBoxAsync();
+        double centerX = bounds.X + bounds.Width / 2;
+        double centerY = bounds.Y + bounds.Height / 2;
+
+        var touches = new List<Dictionary<string, object>>
+        {
+            new Dictionary<string, object>
+            {
+                { "identifier", 0 },
+                { "clientX", centerX },
+                { "clientY", centerY }
+            }
+        };
+        await locator.DispatchEventAsync("touchstart", new { touches, changedTouches = touches, targetTouches = touches });
+
+        for (int i = 1; i <= steps; i++)
+        {
+            touches = new List<Dictionary<string, object>>
+            {
+                new Dictionary<string, object>
+                {
+                    { "identifier", 0 },
+                    { "clientX", centerX + deltaX * i / steps },
+                    { "clientY", centerY + deltaY * i / steps }
+                }
+            };
+            await locator.DispatchEventAsync("touchmove", new { touches, changedTouches = touches, targetTouches = touches });
+        }
+
+        await locator.DispatchEventAsync("touchend");
+    }
+}
+```
+
+```java
+import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
+
+public class TouchEvents {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+        .setViewportSize(412, 839)
+        .setDeviceScaleFactor(2.625)
+        .setUserAgent("Mozilla/5.0 (Linux; Android 12; Pixel 7 Build/SP1A.210812.015) AppleWebKit/537.36" +
+          " (KHTML, like Gecko) Chrome/94.0.4606.71 Mobile Safari/537.36")
+        .setHasTouch(true)
+        .setIsMobile(true)
+      );
+      Page page = context.newPage();
+
+      page.navigate("https://www.google.com/maps/place/@37.4117722,-122.0713234,15z", new Page.NavigateOptions().setWaitUntil(WaitUntilState.COMMIT));
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Keep using web")).click();
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Keep using web")).waitFor(
+        new Locator.WaitForOptions().setState(WaitForSelectorState.HIDDEN));
+
+      Locator met = page.locator("[data-test-id='met']");
+      for (int i = 0; i < 5; i++) {
+        pan(met, 200, 100);
+      }
+      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot.png")));
+    }
+  }
+
+  public static void pan(Locator locator, int deltaX, int deltaY) {
+    pan(locator, deltaX, deltaY, 5);
+  }
+
+  public static void pan(Locator locator, int deltaX, int deltaY, int steps) {
+    BoundingBox bounds = locator.boundingBox();
+    double centerX = bounds.x + bounds.width / 2;
+    double centerY = bounds.y + bounds.height / 2;
+
+    List<Map<String, Object>> touches = List.of(Map.of(
+      "identifier", 0,
+      "clientX", centerX,
+      "clientY", centerY
+    ));
+    locator.dispatchEvent("touchstart", Map.of(
+      "touches", touches,
+      "changedTouches", touches,
+      "targetTouches", touches
+    ));
+
+    for (int i = 1; i <= steps; i++) {
+      touches = List.of(Map.of(
+        "identifier", 0,
+        "clientX", centerX + deltaX * i / steps,
+        "clientY", centerY + deltaY * i / steps
+      ));
+      locator.dispatchEvent("touchmove", Map.of(
+        "touches", touches,
+        "changedTouches", touches,
+        "targetTouches", touches
+      ));
+    }
+
+    locator.dispatchEvent("touchend");
+  }
+}
+```
+
+```python sync
+from playwright.sync_api import sync_playwright, expect
+
+def pan(locator, deltaX=0, deltaY=0, steps=5):
+    bounds = locator.bounding_box()
+    centerX = bounds['x'] + bounds['width'] / 2
+    centerY = bounds['y'] + bounds['height'] / 2
+
+    touches = [{
+        'identifier': 0,
+        'clientX': centerX,
+        'clientY': centerY,
+    }]
+    locator.dispatch_event('touchstart', {
+        'touches': touches,
+        'changedTouches': touches,
+        'targetTouches': touches
+    })
+
+    for i in range(1, steps + 1):
+        touches = [{
+            'identifier': 0,
+            'clientX': centerX + deltaX * i / steps,
+            'clientY': centerY + deltaY * i / steps,
+        }]
+        locator.dispatch_event('touchmove', {
+            'touches': touches,
+            'changedTouches': touches,
+            'targetTouches': touches
+        })
+
+    locator.dispatch_event('touchend')
+
+def test_pan_gesture_to_move_the_map(page):
+    page.goto('https://www.google.com/maps/place/@37.4117722,-122.0713234,15z', wait_until='commit')
+    page.get_by_role('button', name='Keep using web').click()
+    expect(page.get_by_role('button', name='Keep using web')).not_to_be_visible()
+    met = page.locator('[data-test-id="met"]')
+    for _ in range(5):
+        pan(met, 200, 100)
+    page.screenshot(path="screenshot.png")
+
+with sync_playwright() as p:
+    browser = p.chromium.launch()
+    context = browser.new_context(**p.devices['Pixel 7'])
+    page = context.new_page()
+    test_pan_gesture_to_move_the_map(page)
+    browser.close()
+```
+
+```python async
+from playwright.async_api import async_playwright, expect
+
+async def pan(locator, deltaX=0, deltaY=0, steps=5):
+    bounds = await locator.bounding_box()
+    centerX = bounds['x'] + bounds['width'] / 2
+    centerY = bounds['y'] + bounds['height'] / 2
+
+    touches = [{
+        'identifier': 0,
+        'clientX': centerX,
+        'clientY': centerY,
+    }]
+    await locator.dispatch_event('touchstart', {
+        'touches': touches,
+        'changedTouches': touches,
+        'targetTouches': touches
+    })
+
+    for i in range(1, steps + 1):
+        touches = [{
+            'identifier': 0,
+            'clientX': centerX + deltaX * i / steps,
+            'clientY': centerY + deltaY * i / steps,
+        }]
+        await locator.dispatch_event('touchmove', {
+            'touches': touches,
+            'changedTouches': touches,
+            'targetTouches': touches
+        })
+
+    await locator.dispatch_event('touchend')
+
+async def test_pan_gesture_to_move_the_map(page):
+    await page.goto('https://www.google.com/maps/place/@37.4117722,-122.0713234,15z', wait_until='commit')
+    await page.get_by_role('button', name='Keep using web').click()
+    await expect(page.get_by_role('button', name='Keep using web')).not_to_be_visible()
+    met = page.locator('[data-test-id="met"]')
+    for _ in range(5):
+        await pan(met, 200, 100)
+    await page.screenshot(path="screenshot.png")
+
+async def main():
+    async with async_playwright() as p:
+        browser = await p.chromium.launch()
+        context = await browser.new_context(**p.devices['Pixel 7'])
+        page = await context.new_page()
+        await test_pan_gesture_to_move_the_map(page)
+        await browser.close()
+
+import asyncio
+asyncio.run(main())
+```
+
+
+### Emulating pinch gesture
+
+In the example below, we emulate pinch gesture, i.e. two touch points moving closer to each other. It is expected to zoom out the map. The app under test only uses `clientX/clientY` coordinates of touch points, so we initialize just that. In a more complex scenario you may need to also set `pageX/pageY/screenX/screenY`, if your app needs them.
+
+```js
+import { test, expect, devices, type Locator } from '@playwright/test';
+
+test.use({ ...devices['Pixel 7'] });
+
+async function pinch(locator: Locator,
+  arg: { deltaX?: number, deltaY?: number, steps?: number, direction?: 'in' | 'out' }) {
+  const { centerX, centerY } = await locator.evaluate((target: HTMLElement) => {
+    const bounds = target.getBoundingClientRect();
+    const centerX = bounds.left + bounds.width / 2;
+    const centerY = bounds.top + bounds.height / 2;
+    return { centerX, centerY };
+  });
+
+  const deltaX = arg.deltaX ?? 50;
+  const steps = arg.steps ?? 5;
+  const stepDeltaX = deltaX / (steps + 1);
+
+  // Two touch points equally distant from the center of the element.
+  const touches = [
+    {
+      identifier: 0,
+      clientX: centerX - (arg.direction === 'in' ? deltaX : stepDeltaX),
+      clientY: centerY,
+    },
+    {
+      identifier: 1,
+      clientX: centerX + (arg.direction === 'in' ? deltaX : stepDeltaX),
+      clientY: centerY,
+    },
+  ];
+  await locator.dispatchEvent('touchstart',
+      { touches, changedTouches: touches, targetTouches: touches });
+
+  // Move the touch points towards or away from each other.
+  for (let i = 1; i <= steps; i++) {
+    const offset = (arg.direction === 'in' ? (deltaX - i * stepDeltaX) : (stepDeltaX * (i + 1)));
+    const touches = [
+      {
+        identifier: 0,
+        clientX: centerX - offset,
+        clientY: centerY,
+      },
+      {
+        identifier: 0,
+        clientX: centerX + offset,
+        clientY: centerY,
+      },
+    ];
+    await locator.dispatchEvent('touchmove',
+        { touches, changedTouches: touches, targetTouches: touches });
+  }
+
+  await locator.dispatchEvent('touchend', { touches: [], changedTouches: [], targetTouches: [] });
+}
+
+test(`pinch in gesture to zoom out the map`, async ({ page }) => {
+  await page.goto('https://www.google.com/maps/place/@37.4117722,-122.0713234,15z',
+      { waitUntil: 'commit' });
+  await page.getByRole('button', { name: 'Keep using web' }).click();
+  await expect(page.getByRole('button', { name: 'Keep using web' })).not.toBeVisible();
+  // Get the map element.
+  const met = page.locator('[data-test-id="met"]');
+  for (let i = 0; i < 5; i++)
+    await pinch(met, { deltaX: 40, direction: 'in' });
+  // Ensure the map has been zoomed out.
+  await expect(met).toHaveScreenshot();
+});
+```
+
+```csharp
+using Microsoft.Playwright;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+public class TouchEvents
+{
+    public static async Task Pinch(ILocator locator, int deltaX = 50, int steps = 5, string direction = "in")
+    {
+        var bounds = await locator.BoundingBoxAsync();
+        double centerX = bounds.X + bounds.Width / 2;
+        double centerY = bounds.Y + bounds.Height / 2;
+        double stepDeltaX = deltaX / (steps + 1.0);
+
+        var touches = new List<Dictionary<string, object>>
+        {
+            new Dictionary<string, object>
+            {
+                { "identifier", 0 },
+                { "clientX", centerX - (direction == "in" ? deltaX : stepDeltaX) },
+                { "clientY", centerY }
+            },
+            new Dictionary<string, object>
+            {
+                { "identifier", 1 },
+                { "clientX", centerX + (direction == "in" ? deltaX : stepDeltaX) },
+                { "clientY", centerY }
+            }
+        };
+        await locator.DispatchEventAsync("touchstart", new { touches, changedTouches = touches, targetTouches = touches });
+
+        for (int i = 1; i <= steps; i++)
+        {
+            double offset = direction == "in" ? (deltaX - i * stepDeltaX) : (stepDeltaX * (i + 1));
+            touches = new List<Dictionary<string, object>>
+            {
+                new Dictionary<string, object>
+                {
+                    { "identifier", 0 },
+                    { "clientX", centerX - offset },
+                    { "clientY", centerY }
+                },
+                new Dictionary<string, object>
+                {
+                    { "identifier", 1 },
+                    { "clientX", centerX + offset },
+                    { "clientY", centerY }
+                }
+            };
+            await locator.DispatchEventAsync("touchmove", new { touches, changedTouches = touches, targetTouches = touches });
+        }
+
+        await locator.DispatchEventAsync("touchend", new { touches = new List<object>(), changedTouches = new List<object>(), targetTouches = new List<object>() });
+    }
+
+    public static async Task TestPinchInGestureToZoomOutTheMap(IPage page)
+    {
+        await page.GotoAsync("https://www.google.com/maps/place/@37.4117722,-122.0713234,15z", new PageGotoOptions { WaitUntil = WaitUntilState.Commit });
+        await page.GetByRole(AriaRole.Button, new PageGetByRoleOptions { Name = "Keep using web" }).ClickAsync();
+        await page.GetByRole(AriaRole.Button, new PageGetByRoleOptions { Name = "Keep using web" }).WaitForAsync(new LocatorWaitForOptions { State = WaitForSelectorState.Hidden });
+
+        var met = page.Locator("[data-test-id='met']");
+        for (int i = 0; i < 5; i++)
+        {
+            await Pinch(met, 40, 5, "in");
+        }
+        await page.ScreenshotAsync(new PageScreenshotOptions { Path = "screenshot.png" });
+    }
+}
+```
+
+```java
+import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.*;
+
+public class TouchEvents {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+        .setViewportSize(412, 839)
+        .setDeviceScaleFactor(2.625)
+        .setUserAgent("Mozilla/5.0 (Linux; Android 12; Pixel 7 Build/SP1A.210812.015) AppleWebKit/537.36" +
+          " (KHTML, like Gecko) Chrome/94.0.4606.71 Mobile Safari/537.36")
+        .setHasTouch(true)
+        .setIsMobile(true)
+      );
+      Page page = context.newPage();
+
+      page.navigate("https://www.google.com/maps/place/@37.4117722,-122.0713234,15z", new Page.NavigateOptions().setWaitUntil(WaitUntilState.COMMIT));
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Keep using web")).click();
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Keep using web")).waitFor(
+        new Locator.WaitForOptions().setState(WaitForSelectorState.HIDDEN));
+
+      Locator met = page.locator("[data-test-id='met']");
+      for (int i = 0; i < 5; i++) {
+        pinch(met, 40, "in");
+      }
+      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot.png")));
+    }
+  }
+
+  public static void pinch(Locator locator, int deltaX, String direction) {
+    pinch(locator, deltaX, direction, 5);
+  }
+
+  public static void pinch(Locator locator, int deltaX, String direction, int steps) {
+    BoundingBox bounds = locator.boundingBox();
+    double centerX = bounds.x + bounds.width / 2;
+    double centerY = bounds.y + bounds.height / 2;
+    double stepDeltaX = deltaX / (steps + 1.0);
+
+    List<Map<String, Object>> touches = List.of(
+      Map.of("identifier", 0, "clientX", centerX - (direction.equals("in") ? deltaX : stepDeltaX), "clientY", centerY),
+      Map.of("identifier", 1, "clientX", centerX + (direction.equals("in") ? deltaX : stepDeltaX), "clientY", centerY)
+    );
+    locator.dispatchEvent("touchstart", Map.of("touches", touches, "changedTouches", touches, "targetTouches", touches));
+
+    for (int i = 1; i <= steps; i++) {
+      double offset = direction.equals("in") ? (deltaX - i * stepDeltaX) : (stepDeltaX * (i + 1));
+      touches = List.of(
+        Map.of("identifier", 0, "clientX", centerX - offset, "clientY", centerY),
+        Map.of("identifier", 1, "clientX", centerX + offset, "clientY", centerY)
+      );
+      locator.dispatchEvent("touchmove", Map.of("touches", touches, "changedTouches", touches, "targetTouches", touches));
+    }
+
+    locator.dispatchEvent("touchend", Map.of("touches", List.of(), "changedTouches", List.of(), "targetTouches", List.of()));
+  }
+}
+```
+
+```python async
+from playwright.async_api import async_playwright, expect
+
+async def pinch(locator, arg):
+    bounds = await locator.bounding_box()
+    centerX = bounds['x'] + bounds['width'] / 2
+    centerY = bounds['y'] + bounds['height'] / 2
+
+    deltaX = arg.get('deltaX', 50)
+    steps = arg.get('steps', 5)
+    stepDeltaX = deltaX / (steps + 1)
+
+    touches = [
+        {
+            'identifier': 0,
+            'clientX': centerX - (deltaX if arg.get('direction') == 'in' else stepDeltaX),
+            'clientY': centerY,
+        },
+        {
+            'identifier': 1,
+            'clientX': centerX + (deltaX if arg.get('direction') == 'in' else stepDeltaX),
+            'clientY': centerY,
+        },
+    ]
+    await locator.dispatch_event('touchstart', {
+        'touches': touches,
+        'changedTouches': touches,
+        'targetTouches': touches
+    })
+
+    for i in range(1, steps + 1):
+        offset = deltaX - i * stepDeltaX if arg.get('direction') == 'in' else stepDeltaX * (i + 1)
+        touches = [
+            {
+                'identifier': 0,
+                'clientX': centerX - offset,
+                'clientY': centerY,
+            },
+            {
+                'identifier': 1,
+                'clientX': centerX + offset,
+                'clientY': centerY,
+            },
+        ]
+        await locator.dispatch_event('touchmove', {
+            'touches': touches,
+            'changedTouches': touches,
+            'targetTouches': touches
+        })
+
+    await locator.dispatch_event('touchend', {
+        'touches': [],
+        'changedTouches': [],
+        'targetTouches': []
+    })
+
+async def test_pinch_in_gesture_to_zoom_out_the_map(page):
+    await page.goto('https://www.google.com/maps/place/@37.4117722,-122.0713234,15z', wait_until='commit')
+    await page.get_by_role('button', name='Keep using web').click()
+    await expect(page.get_by_role('button', name='Keep using web')).not_to_be_visible()
+    met = page.locator('[data-test-id="met"]')
+    for _ in range(5):
+        await pinch(met, {'deltaX': 40, 'direction': 'in'})
+    await page.screenshot(path="screenshot.png")
+
+async def main():
+    async with async_playwright() as p:
+        browser = await p.chromium.launch()
+        context = await browser.new_context(**p.devices['Pixel 7'])
+        page = await context.new_page()
+        await test_pinch_in_gesture_to_zoom_out_the_map(page)
+        await browser.close()
+
+import asyncio
+asyncio.run(main())
+```
+
+```python sync
+from playwright.sync_api import sync_playwright, expect
+
+def pinch(locator, arg):
+    bounds = locator.bounding_box()
+    centerX = bounds['x'] + bounds['width'] / 2
+    centerY = bounds['y'] + bounds['height'] / 2
+
+    deltaX = arg.get('deltaX', 50)
+    steps = arg.get('steps', 5)
+    stepDeltaX = deltaX / (steps + 1)
+
+    touches = [
+        {
+            'identifier': 0,
+            'clientX': centerX - (deltaX if arg.get('direction') == 'in' else stepDeltaX),
+            'clientY': centerY,
+        },
+        {
+            'identifier': 1,
+            'clientX': centerX + (deltaX if arg.get('direction') == 'in' else stepDeltaX),
+            'clientY': centerY,
+        },
+    ]
+    locator.dispatch_event('touchstart', {
+        'touches': touches,
+        'changedTouches': touches,
+        'targetTouches': touches
+    })
+
+    for i in range(1, steps + 1):
+        offset = deltaX - i * stepDeltaX if arg.get('direction') == 'in' else stepDeltaX * (i + 1)
+        touches = [
+            {
+                'identifier': 0,
+                'clientX': centerX - offset,
+                'clientY': centerY,
+            },
+            {
+                'identifier': 1,
+                'clientX': centerX + offset,
+                'clientY': centerY,
+            },
+        ]
+        locator.dispatch_event('touchmove', {
+            'touches': touches,
+            'changedTouches': touches,
+            'targetTouches': touches
+        })
+
+    locator.dispatch_event('touchend', {
+        'touches': [],
+        'changedTouches': [],
+        'targetTouches': []
+    })
+
+def test_pinch_in_gesture_to_zoom_out_the_map(page):
+    page.goto('https://www.google.com/maps/place/@37.4117722,-122.0713234,15z', wait_until='commit')
+    page.get_by_role('button', name='Keep using web').click()
+    expect(page.get_by_role('button', name='Keep using web')).not_to_be_visible()
+    met = page.locator('[data-test-id="met"]')
+    for _ in range(5):
+        pinch(met, {'deltaX': 40, 'direction': 'in'})
+    page.screenshot(path="screenshot.png")
+
+with sync_playwright() as p:
+    browser = p.chromium.launch()
+    context = browser.new_context(**p.devices['Pixel 7'])
+    page = context.new_page()
+    test_pinch_in_gesture_to_zoom_out_the_map(page)
+    browser.close()
+```
diff --git a/docs/src/trace-viewer-intro-csharp.md b/docs/src/trace-viewer-intro-csharp.md
index 79e560862cc10..885a92eab24fb 100644
--- a/docs/src/trace-viewer-intro-csharp.md
+++ b/docs/src/trace-viewer-intro-csharp.md
@@ -22,6 +22,8 @@ Traces can be recorded using the [`property: BrowserContext.tracing`] API as fol
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -112,6 +114,132 @@ public class ExampleTest : PageTest
 }
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```csharp
+using System.Reflection;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+using Xunit.Sdk;
+
+namespace PlaywrightTests;
+
+[WithTestName]
+public class UnitTest1 : PageTest
+{
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync().ConfigureAwait(false);
+        await Context.Tracing.StartAsync(new()
+        {
+            Title = $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}",
+            Screenshots = true,
+            Snapshots = true,
+            Sources = true
+        });
+    }
+
+    public override async Task DisposeAsync()
+    {
+        await Context.Tracing.StopAsync(new()
+        {
+            Path = Path.Combine(
+                Environment.CurrentDirectory,
+                "playwright-traces",
+               $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}.zip"
+            )
+        });
+        await base.DisposeAsync().ConfigureAwait(false);
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        // ...
+        await Page.GotoAsync("https://playwright.dev/dotnet/docs/intro");
+    }
+}
+
+public class WithTestNameAttribute : BeforeAfterTestAttribute
+{
+    public static string CurrentTestName = string.Empty;
+    public static string CurrentClassName = string.Empty;
+
+    public override void Before(MethodInfo methodInfo)
+    {
+        CurrentTestName = methodInfo.Name;
+        CurrentClassName = methodInfo.DeclaringType!.Name;
+    }
+
+    public override void After(MethodInfo methodInfo)
+    {
+    }
+}
+```
+</TabItem>
+<TabItem value="xunit-v3">
+
+```csharp
+using System.Reflection;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+using Xunit.Sdk;
+
+namespace PlaywrightTests;
+
+[WithTestName]
+public class UnitTest1 : PageTest
+{
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync().ConfigureAwait(false);
+        await Context.Tracing.StartAsync(new()
+        {
+            Title = $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}",
+            Screenshots = true,
+            Snapshots = true,
+            Sources = true
+        });
+    }
+
+    public override async Task DisposeAsync()
+    {
+        await Context.Tracing.StopAsync(new()
+        {
+            Path = Path.Combine(
+                Environment.CurrentDirectory,
+                "playwright-traces",
+               $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}.zip"
+            )
+        });
+        await base.DisposeAsync().ConfigureAwait(false);
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        // ...
+        await Page.GotoAsync("https://playwright.dev/dotnet/docs/intro");
+    }
+}
+
+public class WithTestNameAttribute : BeforeAfterTestAttribute
+{
+    public static string CurrentTestName = string.Empty;
+    public static string CurrentClassName = string.Empty;
+
+    public override void Before(MethodInfo methodInfo)
+    {
+        CurrentTestName = methodInfo.Name;
+        CurrentClassName = methodInfo.DeclaringType!.Name;
+    }
+
+    public override void After(MethodInfo methodInfo)
+    {
+    }
+}
+```
 </TabItem>
 </Tabs>
 
@@ -134,4 +262,4 @@ Check out our detailed guide on [Trace Viewer](/trace-viewer.md) to learn more a
 ## What's next
 
 - [Run tests on CI with GitHub Actions](/ci-intro.md)
-- [Learn more about the MSTest and NUnit base classes](./test-runners.md)
+- [Learn more about the MSTest, NUnit, xUnit, and xUnit v3 base classes](./test-runners.md)
diff --git a/docs/src/trace-viewer-intro-js.md b/docs/src/trace-viewer-intro-js.md
index 99c4b3c7945a2..540ee7930b896 100644
--- a/docs/src/trace-viewer-intro-js.md
+++ b/docs/src/trace-viewer-intro-js.md
@@ -7,7 +7,7 @@ import LiteYouTube from '@site/src/components/LiteYouTube';
 
 ## Introduction
 
-Playwright Trace Viewer is a GUI tool that lets you explore recorded Playwright traces of your tests meaning you can go back and forward through each action of your test and visually see what was happening during each action.
+Playwright Trace Viewer is a GUI tool that lets you explore recorded Playwright traces of your tests, meaning you can go back and forward through each action of your test and visually see what was happening during each action.
 
 **You will learn**
 
@@ -16,13 +16,13 @@ Playwright Trace Viewer is a GUI tool that lets you explore recorded Playwright
 - [How to open and view the trace](/trace-viewer-intro.md#opening-the-trace)
 
 <LiteYouTube
-    id="lfxjs--9ZQs"
+    id="yP6AnTxC34s"
     title="Viewing Playwright Traces"
 />
 
 ## Recording a Trace
 
-By default the [playwright.config](./trace-viewer.md#recording-a-trace-on-ci) file will contain the configuration needed to create a `trace.zip` file for each test. Traces are setup to run `on-first-retry` meaning they will be run on the first retry of a failed test. Also `retries` are set to 2 when running on CI and 0 locally. This means the traces will be recorded on the first retry of a failed test but not on the first run and not on the second retry.
+By default the [playwright.config](./trace-viewer.md#tracing-on-ci) file contains the configuration needed to create a `trace.zip` file for each test. Traces are setup to run `on-first-retry`, meaning they run on the first retry of a failed test. Also `retries` are set to 2 when running on CI and 0 locally. This means the traces are recorded on the first retry of a failed test but not on the first run and not on the second retry.
 
 ```js title="playwright.config.ts"
 import { defineConfig } from '@playwright/test';
@@ -37,7 +37,7 @@ export default defineConfig({
 
 To learn more about available options to record a trace check out our detailed guide on [Trace Viewer](/trace-viewer.md).
 
-Traces are normally run in a Continuous Integration(CI) environment, because locally you can use [UI Mode](/test-ui-mode.md) for developing and debugging tests. However, if you want to run traces locally without using [UI Mode](/test-ui-mode.md), you can force tracing to be on with `--trace on`.
+Traces are normally run in a Continuous Integration (CI) environment, because locally you can use [UI Mode](/test-ui-mode.md) for developing and debugging tests. However, if you want to run traces locally without using [UI Mode](/test-ui-mode.md), you can force tracing to be on with `--trace on`.
 
 ```bash
 npx playwright test --trace on
@@ -45,7 +45,7 @@ npx playwright test --trace on
 
 ## Opening the HTML report
 
-The HTML report shows you a report of all your tests that have been ran and on which browsers as well as how long they took. Tests can be filtered by passed tests, failed, flakey or skipped tests. You can also search for a particular test. Clicking on a test will open the detailed view where you can see more information on your tests such as the errors, the test steps and the trace.
+The HTML report shows you a report of all your tests that have been run and on which browsers as well as how long they took. Tests can be filtered by passed tests, failed, flaky, or skipped tests. You can also search for a particular test. Clicking on a test opens the detailed view where you can see more information on your tests such as the errors, the test steps, and the trace.
 
 ```bash
 npx playwright show-report
@@ -53,25 +53,25 @@ npx playwright show-report
 
 ## Opening the trace
 
-In the HTML report click on the trace icon next to the test name file name to directly open the trace for the required test.
+In the HTML report, click on the trace icon next to the test file name to directly open the trace for the required test.
 
-![playwright html report](https://github.com/microsoft/playwright/assets/13063165/a3da1fb5-6619-4c03-98aa-adf65c376525)
+![playwright html report](./images/getting-started/html-report-failed-tests.png)
 
 
-You can also click open the detailed view of the test and scroll down to the `'Traces'` tab and open the trace by clicking on the trace screenshot.
+You can also click to open the detailed view of the test and scroll down to the `'Traces'` tab and open the trace by clicking on the trace screenshot.
 
-![playwright html report detailed view](https://github.com/microsoft/playwright/assets/13063165/2b583d6f-5241-4ecf-83a8-650072d4a201)
+![playwright html report detailed view](./images/getting-started/html-report-trace.png)
 
 
-To learn more about reporters check out our detailed guide on reporters including the [HTML Reporter](/test-reporters.md#html-reporter).
+To learn more about reporters, check out our detailed guide on reporters including the [HTML Reporter](/test-reporters.md#html-reporter).
 
 ## Viewing the trace
 
-View traces of your test by clicking through each action or hovering using the timeline and see the state of the page before and after the action. Inspect the log, source and network, errors and console during each step of the test. The trace viewer creates a DOM snapshot so you can fully interact with it and open the browser DevTools to inspect the HTML, CSS, etc.
+View traces of your test by clicking through each action or hovering using the timeline and see the state of the page before and after the action. Inspect the log, source and network, errors, and console during each step of the test. The trace viewer creates a DOM snapshot so you can fully interact with it and open the browser DevTools to inspect the HTML, CSS, etc.
 
-![playwright trace viewer](https://github.com/microsoft/playwright/assets/13063165/10fe3585-8401-4051-b1c2-b2e92ac4c274)
+![playwright trace viewer](./images/getting-started/trace-viewer-failed-test.png)
 
-To learn more about traces check out our detailed guide on [Trace Viewer](/trace-viewer.md).
+To learn more about traces, check out our detailed guide on [Trace Viewer](/trace-viewer.md).
 
 ## What's next
 
diff --git a/docs/src/trace-viewer.md b/docs/src/trace-viewer.md
index edb58f4426157..c597c16f6e1d7 100644
--- a/docs/src/trace-viewer.md
+++ b/docs/src/trace-viewer.md
@@ -13,112 +13,71 @@ Playwright Trace Viewer is a GUI tool that helps you explore recorded Playwright
 * langs: js
 
 <LiteYouTube
-    id="lfxjs--9ZQs"
+    id="yP6AnTxC34s"
     title="Viewing Playwright Traces"
 />
 
-## Trace Viewer features
-### Actions
-
-In the Actions tab you can see what locator was used for every action and how long each one took to run. Hover over each action of your test and visually see the change in the DOM snapshot. Go back and forward in time and click an action to inspect and debug. Use the Before and After tabs to visually see what happened before and after the action. 
-
-![actions tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/948b65cd-f0fd-4c7f-8e53-2c632b5a07f1)
-
-**Selecting each action reveals:**
-- action snapshots
-- action log
-- source code location
-
-### Screenshots
-
-When tracing with the [`option: screenshots`] option turned on (default), each trace records a screencast and renders it as a film strip. You can hover over the film strip to see a magnified image of for each action and state which helps you easily find the action you want to inspect. 
-
-Double click on an action to see the time range for that action. You can use the slider in the timeline to increase the actions selected and these will be shown in the Actions tab and all console logs and network logs will be filtered to only show the logs for the actions selected.
-
-![timeline view in trace viewer](https://github.com/microsoft/playwright/assets/13063165/b04a7d75-54bb-4ab2-9e30-e76f6f74a2c8)
-
-
-### Snapshots
-
-When tracing with the [`option: snapshots`] option turned on (default), Playwright captures a set of complete DOM snapshots for each action. Depending on the type of the action, it will capture:
-
-| Type | Description |
-|------|-------------|
-|Before|A snapshot at the time action is called.|
-|Action|A snapshot at the moment of the performed input. This type of snapshot is especially useful when exploring where exactly Playwright clicked.|
-|After|A snapshot after the action.|
-
-<br/>
-
-Here is what the typical Action snapshot looks like:
-
-![action tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/7168d549-eb0a-4964-9c93-483f03711fa9)
-
-Notice how it highlights both, the DOM Node as well as the exact click position.
-
-### Source
-
-When you click on an action in the sidebar, the line of code for that action is highlighted in the source panel.
-
-![showing source code tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/daa8845d-c250-4923-aa7a-5d040da9adc5)
-
-### Call
-
-The call tab shows you information about the action such as the time it took, what locator was used, if in strict mode and what key was used.
-
-![showing call tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/95498580-f9dd-4932-a123-c37fe7cfc3c2)
-
-### Log
-
-See a full log of your test to better understand what Playwright is doing behind the scenes such as scrolling into view, waiting for element to be visible, enabled and stable and performing actions such as click, fill, press etc.
-
-![showing log of tests in trace viewer](https://github.com/microsoft/playwright/assets/13063165/de621461-3bab-4140-b39d-9f02d6672dbf)
+## Opening Trace Viewer
 
-### Errors
+You can open a saved trace using either the Playwright CLI or in the browser at [trace.playwright.dev](https://trace.playwright.dev). Make sure to add the full path to where your `trace.zip` file is located.
 
-If your test fails you will see the error messages for each test in the Errors tab. The timeline will also show a red line highlighting where the error occurred. You can also click on the source tab to see on which line of the source code the error is.
+```bash js
+npx playwright show-trace path/to/trace.zip
+```
 
-![showing errors in trace viewer](https://github.com/microsoft/playwright/assets/13063165/e9ef77b3-05d1-4df2-852c-981023723d34)
+```bash java
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="show-trace trace.zip"
+```
 
-### Console
+```bash python
+playwright show-trace trace.zip
+```
 
-See console logs from the browser as well as from your test. Different icons are displayed to show you if the console log came from the browser or from the test file.
+```bash csharp
+pwsh bin/Debug/netX/playwright.ps1 show-trace trace.zip
+```
 
-![showing log of tests in trace viewer](https://github.com/microsoft/playwright/assets/13063165/4107c08d-1eaf-421c-bdd4-9dd2aa641d4a)
+### Using [trace.playwright.dev](https://trace.playwright.dev)
 
-Double click on an action from your test in the actions sidebar. This will filter the console to only show the logs that were made during that action. Click the *Show all* button to see all console logs again.
+[trace.playwright.dev](https://trace.playwright.dev) is a statically hosted variant of the Trace Viewer. You can upload trace files using drag and drop or via the `Select file(s)` button.
 
-Use the timeline to filter actions, by clicking a start point and dragging to an ending point. The console tab will also be filtered to only show the logs that were made during the actions selected.
+Trace Viewer loads the trace entirely in your browser and does not transmit any data externally.
 
+<img width="1119" alt="Drop Playwright Trace to load" src="https://user-images.githubusercontent.com/13063165/194577918-b4d45726-2692-4093-8a28-9e73552617ef.png" />
 
-### Network
+### Viewing remote traces
 
-The Network tab shows you all the network requests that were made during your test. You can sort by different types of requests, status code, method, request, content type, duration and size. Click on a request to see more information about it such as the request headers, response headers, request body and response body.
+You can open remote traces directly using its URL. This makes it easy to view the remote trace without having to manually download the file from CI runs, for example.
 
-![network requests tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/0a3d1671-8ccd-4f7a-a844-35f5eb37f236)
+```bash js
+npx playwright show-trace https://example.com/trace.zip
+```
 
-Double click on an action from your test in the actions sidebar. This will filter the network requests to only show the requests that were made during that action. Click the *Show all* button to see all network requests again.
+```bash java
+mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="show-trace https://example.com/trace.zip"
+```
 
-Use the timeline to filter actions, by clicking a start point and dragging to an ending point. The network tab will also be filtered to only show the network requests that were made during the actions selected.
+```bash python
+playwright show-trace https://example.com/trace.zip
+```
 
-### Metadata
+```bash csharp
+pwsh bin/Debug/netX/playwright.ps1 show-trace https://example.com/trace.zip
+```
 
-Next to the Actions tab you will find the Metadata tab which will show you more information on your test such as the Browser, viewport size, test duration and more.
+When using [trace.playwright.dev](https://trace.playwright.dev), you can also pass the URL of your uploaded trace at some accessible storage (e.g. inside your CI) as a query parameter. CORS (Cross-Origin Resource Sharing) rules might apply.
 
-![meta data in trace viewer](https://github.com/microsoft/playwright/assets/13063165/82ab3d33-1ec9-4b8a-9cf2-30a6e2d59091)
+```txt
+https://trace.playwright.dev/?trace=https://demo.playwright.dev/reports/todomvc/data/fa874b0d59cdedec675521c21124e93161d66533.zip
+```
 
-### Attachments
+## Recording a trace
 * langs: js
 
-The "Attachments" tab allows you to explore attachments. If you're doing [visual regression testing](./test-snapshots.md), you'll be able to compare screenshots by examining the image diff, the actual image and the expected image. When you click on the expected image you can use the slider to slide one image over the other so you can easily see the differences in your screenshots.
-
-![attachments tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/4386178a-5808-4fa8-9436-315350a23b04)
-
-
-## Recording a trace locally
+### Tracing locally
 * langs: js
 
-To record a trace during development mode set the `--trace` flag to `on` when running your tests. You can also use [UI Mode](./test-ui-mode.md) for a better developer experience.
+To record a trace during development mode set the `--trace` flag to `on` when running your tests. You can also use [UI Mode](./test-ui-mode.md) for a better developer experience, as it traces each test automatically.
 
 ```bash
 npx playwright test --trace on
@@ -128,7 +87,7 @@ You can then open the HTML report and click on the trace icon to open the trace.
 ```bash
 npx playwright show-report
 ```
-## Recording a trace on CI
+### Tracing on CI
 * langs: js
 
 Traces should be run on continuous integration on the first retry of a failed test
@@ -256,6 +215,8 @@ Traces can be recorded using the [`property: BrowserContext.tracing`] API as fol
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -350,6 +311,134 @@ public class UnitTest1 : PageTest
 }
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```csharp
+using System.Reflection;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+using Xunit.Sdk;
+
+namespace PlaywrightTests;
+
+[WithTestName]
+public class UnitTest1 : PageTest
+{
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync().ConfigureAwait(false);
+        await Context.Tracing.StartAsync(new()
+        {
+            Title = $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}",
+            Screenshots = true,
+            Snapshots = true,
+            Sources = true
+        });
+    }
+
+    public override async Task DisposeAsync()
+    {
+        await Context.Tracing.StopAsync(new()
+        {
+            Path = Path.Combine(
+                Environment.CurrentDirectory,
+                "playwright-traces",
+               $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}.zip"
+            )
+        });
+        await base.DisposeAsync().ConfigureAwait(false);
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        // ...
+        await Page.GotoAsync("https://playwright.dev/dotnet/docs/intro");
+    }
+}
+
+public class WithTestNameAttribute : BeforeAfterTestAttribute
+{
+    public static string CurrentTestName = string.Empty;
+    public static string CurrentClassName = string.Empty;
+
+    public override void Before(MethodInfo methodInfo)
+    {
+        CurrentTestName = methodInfo.Name;
+        CurrentClassName = methodInfo.DeclaringType!.Name;
+    }
+
+    public override void After(MethodInfo methodInfo)
+    {
+    }
+}
+```
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+```csharp
+using System.Reflection;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+using Xunit.Sdk;
+
+namespace PlaywrightTests;
+
+[WithTestName]
+public class UnitTest1 : PageTest
+{
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync().ConfigureAwait(false);
+        await Context.Tracing.StartAsync(new()
+        {
+            Title = $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}",
+            Screenshots = true,
+            Snapshots = true,
+            Sources = true
+        });
+    }
+
+    public override async Task DisposeAsync()
+    {
+        await Context.Tracing.StopAsync(new()
+        {
+            Path = Path.Combine(
+                Environment.CurrentDirectory,
+                "playwright-traces",
+               $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}.zip"
+            )
+        });
+        await base.DisposeAsync().ConfigureAwait(false);
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        // ...
+        await Page.GotoAsync("https://playwright.dev/dotnet/docs/intro");
+    }
+}
+
+public class WithTestNameAttribute : BeforeAfterTestAttribute
+{
+    public static string CurrentTestName = string.Empty;
+    public static string CurrentClassName = string.Empty;
+
+    public override void Before(MethodInfo methodInfo)
+    {
+        CurrentTestName = methodInfo.Name;
+        CurrentClassName = methodInfo.DeclaringType!.Name;
+    }
+
+    public override void After(MethodInfo methodInfo)
+    {
+    }
+}
+```
+
 </TabItem>
 </Tabs>
 
@@ -367,6 +456,8 @@ Setup your tests to record a trace only when the test fails:
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -393,7 +484,7 @@ public class ExampleTest : PageTest
     [TearDown]
     public async Task TearDown()
     {
-        var failed = TestContext.CurrentContext.Result.Outcome == NUnit.Framework.Interfaces.ResultState.Error 
+        var failed = TestContext.CurrentContext.Result.Outcome == NUnit.Framework.Interfaces.ResultState.Error
             || TestContext.CurrentContext.Result.Outcome == NUnit.Framework.Interfaces.ResultState.Failure;
 
         await Context.Tracing.StopAsync(new()
@@ -402,7 +493,7 @@ public class ExampleTest : PageTest
                 TestContext.CurrentContext.WorkDirectory,
                 "playwright-traces",
                 $"{TestContext.CurrentContext.Test.ClassName}.{TestContext.CurrentContext.Test.Name}.zip"
-            ) : null, 
+            ) : null,
         });
     }
 
@@ -462,59 +553,228 @@ public class ExampleTest : PageTest
 ```
 
 </TabItem>
-</Tabs>
+<TabItem value="xunit">
 
-## Opening the trace
+```csharp
+using System.Reflection;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+using Xunit.Sdk;
 
-You can open the saved trace using the Playwright CLI or in your browser on [`trace.playwright.dev`](https://trace.playwright.dev). Make sure to add the full path to where your `trace.zip` file is located.
+namespace PlaywrightTests;
 
-```bash js
-npx playwright show-trace path/to/trace.zip
-```
+[WithTestName]
+public class UnitTest1 : PageTest
+{
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync().ConfigureAwait(false);
+        await Context.Tracing.StartAsync(new()
+        {
+            Title = $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}",
+            Screenshots = true,
+            Snapshots = true,
+            Sources = true
+        });
+    }
 
-```bash java
-mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="show-trace trace.zip"
-```
+    public override async Task DisposeAsync()
+    {
+        await Context.Tracing.StopAsync(new()
+        {
+            Path = !TestOk ? Path.Combine(
+                Environment.CurrentDirectory,
+                "playwright-traces",
+               $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}.zip"
+            ) : null
+        });
+        await base.DisposeAsync().ConfigureAwait(false);
+    }
 
-```bash python
-playwright show-trace trace.zip
-```
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        // ...
+        await Page.GotoAsync("https://playwright.dev/dotnet/docs/intro");
+    }
+}
 
-```bash csharp
-pwsh bin/Debug/netX/playwright.ps1 show-trace trace.zip
+public class WithTestNameAttribute : BeforeAfterTestAttribute
+{
+    public static string CurrentTestName = string.Empty;
+    public static string CurrentClassName = string.Empty;
+
+    public override void Before(MethodInfo methodInfo)
+    {
+        CurrentTestName = methodInfo.Name;
+        CurrentClassName = methodInfo.DeclaringType!.Name;
+    }
+
+    public override void After(MethodInfo methodInfo)
+    {
+    }
+}
 ```
 
-## Using [trace.playwright.dev](https://trace.playwright.dev)
+</TabItem>
+<TabItem value="xunit-v3">
 
-[trace.playwright.dev](https://trace.playwright.dev) is a statically hosted variant of the Trace Viewer. You can upload trace files using drag and drop.
+```csharp
+using System.Reflection;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+using Xunit.Sdk;
 
+namespace PlaywrightTests;
 
-<img width="1119" alt="Drop Playwright Trace to load" src="https://user-images.githubusercontent.com/13063165/194577918-b4d45726-2692-4093-8a28-9e73552617ef.png" />
+[WithTestName]
+public class UnitTest1 : PageTest
+{
+    public override async Task InitializeAsync()
+    {
+        await base.InitializeAsync().ConfigureAwait(false);
+        await Context.Tracing.StartAsync(new()
+        {
+            Title = $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}",
+            Screenshots = true,
+            Snapshots = true,
+            Sources = true
+        });
+    }
 
-## Viewing remote traces
+    public override async Task DisposeAsync()
+    {
+        await Context.Tracing.StopAsync(new()
+        {
+            Path = !TestOk ? Path.Combine(
+                Environment.CurrentDirectory,
+                "playwright-traces",
+               $"{WithTestNameAttribute.CurrentClassName}.{WithTestNameAttribute.CurrentTestName}.zip"
+            ) : null
+        });
+        await base.DisposeAsync().ConfigureAwait(false);
+    }
 
-You can open remote traces using its URL. They could be generated on a CI run which makes it easy to view the remote trace without having to manually download the file.
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        // ...
+        await Page.GotoAsync("https://playwright.dev/dotnet/docs/intro");
+    }
+}
 
-```bash js
-npx playwright show-trace https://example.com/trace.zip
-```
+public class WithTestNameAttribute : BeforeAfterTestAttribute
+{
+    public static string CurrentTestName = string.Empty;
+    public static string CurrentClassName = string.Empty;
 
-```bash java
-mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="show-trace https://example.com/trace.zip"
-```
+    public override void Before(MethodInfo methodInfo)
+    {
+        CurrentTestName = methodInfo.Name;
+        CurrentClassName = methodInfo.DeclaringType!.Name;
+    }
 
-```bash python
-playwright show-trace https://example.com/trace.zip
+    public override void After(MethodInfo methodInfo)
+    {
+    }
+}
 ```
 
-```bash csharp
-pwsh bin/Debug/netX/playwright.ps1 show-trace https://example.com/trace.zip
-```
+</TabItem>
+</Tabs>
 
+## Trace Viewer features
+### Actions
 
-You can also pass the URL of your uploaded trace (e.g. inside your CI) from some accessible storage as a parameter. CORS (Cross-Origin Resource Sharing) rules might apply.
+In the Actions tab you can see what locator was used for every action and how long each one took to run. Hover over each action of your test and visually see the change in the DOM snapshot. Go back and forward in time and click an action to inspect and debug. Use the Before and After tabs to visually see what happened before and after the action.
 
-```txt
-https://trace.playwright.dev/?trace=https://demo.playwright.dev/reports/todomvc/data/cb0fa77ebd9487a5c899f3ae65a7ffdbac681182.zip
-```
+![actions tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/948b65cd-f0fd-4c7f-8e53-2c632b5a07f1)
+
+**Selecting each action reveals:**
+- Action snapshots
+- Action log
+- Source code location
+
+### Screenshots
+
+When tracing with the [`option: Tracing.start.screenshots`] option turned on (default), each trace records a screencast and renders it as a film strip. You can hover over the film strip to see a magnified image of for each action and state which helps you easily find the action you want to inspect.
+
+Double click on an action to see the time range for that action. You can use the slider in the timeline to increase the actions selected and these will be shown in the Actions tab and all console logs and network logs will be filtered to only show the logs for the actions selected.
+
+![timeline view in trace viewer](https://github.com/microsoft/playwright/assets/13063165/b04a7d75-54bb-4ab2-9e30-e76f6f74a2c8)
+
+
+### Snapshots
+
+When tracing with the [`option: Tracing.start.snapshots`] option turned on (default), Playwright captures a set of complete DOM snapshots for each action. Depending on the type of the action, it will capture:
+
+| Type | Description |
+|------|-------------|
+|Before|A snapshot at the time action is called.|
+|Action|A snapshot at the moment of the performed input. This type of snapshot is especially useful when exploring where exactly Playwright clicked.|
+|After|A snapshot after the action.|
+
+Here is what the typical Action snapshot looks like:
+
+![action tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/7168d549-eb0a-4964-9c93-483f03711fa9)
+
+Notice how it highlights both, the DOM Node as well as the exact click position.
+
+### Source
+
+When you click on an action in the sidebar, the line of code for that action is highlighted in the source panel.
+
+![showing source code tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/daa8845d-c250-4923-aa7a-5d040da9adc5)
+
+### Call
+
+The call tab shows you information about the action such as the time it took, what locator was used, if in strict mode and what key was used.
+
+![showing call tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/95498580-f9dd-4932-a123-c37fe7cfc3c2)
+
+### Log
+
+See a full log of your test to better understand what Playwright is doing behind the scenes such as scrolling into view, waiting for element to be visible, enabled and stable and performing actions such as click, fill, press etc.
+
+![showing log of tests in trace viewer](https://github.com/microsoft/playwright/assets/13063165/de621461-3bab-4140-b39d-9f02d6672dbf)
+
+### Errors
+
+If your test fails you will see the error messages for each test in the Errors tab. The timeline will also show a red line highlighting where the error occurred. You can also click on the source tab to see on which line of the source code the error is.
+
+![showing errors in trace viewer](https://github.com/microsoft/playwright/assets/13063165/e9ef77b3-05d1-4df2-852c-981023723d34)
+
+### Console
+
+See console logs from the browser as well as from your test. Different icons are displayed to show you if the console log came from the browser or from the test file.
+
+![showing log of tests in trace viewer](https://github.com/microsoft/playwright/assets/13063165/4107c08d-1eaf-421c-bdd4-9dd2aa641d4a)
+
+Double click on an action from your test in the actions sidebar. This will filter the console to only show the logs that were made during that action. Click the *Show all* button to see all console logs again.
+
+Use the timeline to filter actions, by clicking a start point and dragging to an ending point. The console tab will also be filtered to only show the logs that were made during the actions selected.
+
+
+### Network
+
+The Network tab shows you all the network requests that were made during your test. You can sort by different types of requests, status code, method, request, content type, duration and size. Click on a request to see more information about it such as the request headers, response headers, request body and response body.
+
+![network requests tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/0a3d1671-8ccd-4f7a-a844-35f5eb37f236)
+
+Double click on an action from your test in the actions sidebar. This will filter the network requests to only show the requests that were made during that action. Click the *Show all* button to see all network requests again.
+
+Use the timeline to filter actions, by clicking a start point and dragging to an ending point. The network tab will also be filtered to only show the network requests that were made during the actions selected.
+
+### Metadata
+
+Next to the Actions tab you will find the Metadata tab which will show you more information on your test such as the Browser, viewport size, test duration and more.
+
+![meta data in trace viewer](https://github.com/microsoft/playwright/assets/13063165/82ab3d33-1ec9-4b8a-9cf2-30a6e2d59091)
+
+### Attachments
+* langs: js
+
+The "Attachments" tab allows you to explore attachments. If you're doing [visual regression testing](./test-snapshots.md), you'll be able to compare screenshots by examining the image diff, the actual image and the expected image. When you click on the expected image you can use the slider to slide one image over the other so you can easily see the differences in your screenshots.
+
+![attachments tab in trace viewer](https://github.com/microsoft/playwright/assets/13063165/4386178a-5808-4fa8-9436-315350a23b04)
 
diff --git a/docs/src/writing-tests-csharp.md b/docs/src/writing-tests-csharp.md
index f6324be9f183a..f72d6e5a3d744 100644
--- a/docs/src/writing-tests-csharp.md
+++ b/docs/src/writing-tests-csharp.md
@@ -39,6 +39,8 @@ Take a look at the following example to see how to write a test.
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -117,6 +119,74 @@ public class ExampleTest : PageTest
 }
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```csharp title="UnitTest1.cs"
+using System.Text.RegularExpressions;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task HasTitle()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Expect a title "to contain" a substring.
+        await Expect(Page).ToHaveTitleAsync(new Regex("Playwright"));
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Click the get started link.
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Get started" }).ClickAsync();
+
+        // Expects page to have a heading with the name of Installation.
+        await Expect(Page.GetByRole(AriaRole.Heading, new() { Name = "Installation" })).ToBeVisibleAsync();
+    } 
+}
+```
+</TabItem>
+<TabItem value="xunit-v3">
+
+```csharp title="UnitTest1.cs"
+using System.Text.RegularExpressions;
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task HasTitle()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Expect a title "to contain" a substring.
+        await Expect(Page).ToHaveTitleAsync(new Regex("Playwright"));
+    }
+
+    [Fact]
+    public async Task GetStartedLink()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+
+        // Click the get started link.
+        await Page.GetByRole(AriaRole.Link, new() { Name = "Get started" }).ClickAsync();
+
+        // Expects page to have a heading with the name of Installation.
+        await Expect(Page.GetByRole(AriaRole.Heading, new() { Name = "Installation" })).ToBeVisibleAsync();
+    } 
+}
+```
 </TabItem>
 </Tabs>
 
@@ -196,7 +266,7 @@ Here is the list of the most popular async assertions. Note that there are [many
 
 ## Test Isolation
 
-The Playwright NUnit and MSTest test framework base classes will isolate each test from each other by providing a separate `Page` instance. Pages are isolated between tests due to the Browser Context, which is equivalent to a brand new browser profile, where every test gets a fresh environment, even when multiple tests run in a single Browser.
+The Playwright NUnit, MSTest, xUnit, and xUnit v3 test framework base classes will isolate each test from each other by providing a separate `Page` instance. Pages are isolated between tests due to the Browser Context, which is equivalent to a brand new browser profile, where every test gets a fresh environment, even when multiple tests run in a single Browser.
 
 <Tabs
   groupId="test-runners"
@@ -204,6 +274,8 @@ The Playwright NUnit and MSTest test framework base classes will isolate each te
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
@@ -248,23 +320,63 @@ public class ExampleTest : PageTest
 }
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+```csharp title="UnitTest1.cs"
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task BasicTest()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+    }
+}
+```
+
+</TabItem>
+<TabItem value="xunit-v3">
+
+```csharp title="UnitTest1.cs"
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task BasicTest()
+    {
+        await Page.GotoAsync("https://playwright.dev");
+    }
+}
+```
+
 </TabItem>
 </Tabs>
 
 ## Using Test Hooks
 
-You can use `SetUp`/`TearDown` in NUnit or `TestInitialize`/`TestCleanup` in MSTest to prepare and clean up your test environment:
-
 <Tabs
   groupId="test-runners"
   defaultValue="mstest"
   values={[
     {label: 'MSTest', value: 'mstest'},
     {label: 'NUnit', value: 'nunit'},
+    {label: 'xUnit', value: 'xunit'},
+    {label: 'xUnit v3', value: 'xunit-v3'},
   ]
 }>
 <TabItem value="nunit">
 
+You can use `SetUp`/`TearDown` to prepare and clean up your test environment:
+
 ```csharp title="UnitTest1.cs"
 using System.Threading.Tasks;
 using Microsoft.Playwright.NUnit;
@@ -294,6 +406,8 @@ public class ExampleTest : PageTest
 </TabItem>
 <TabItem value="mstest">
 
+You can use `TestInitialize`/`TestCleanup` to prepare and clean up your test environment:
+
 ```csharp title="UnitTest1.cs"
 using System.Threading.Tasks;
 using Microsoft.Playwright.MSTest;
@@ -319,6 +433,72 @@ public class ExampleTest : PageTest
 }
 ```
 
+</TabItem>
+<TabItem value="xunit">
+
+You can use `InitializeAsync`/`DisposeAsync` to prepare and clean up your test environment:
+
+```csharp title="UnitTest1.cs"
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task MainNavigation()
+    {
+        // Assertions use the expect API.
+        await Expect(Page).ToHaveURLAsync("https://playwright.dev/");
+    }
+
+    override public async Task InitializeAsync()
+    {
+        await base.InitializeAsync();
+        await Page.GotoAsync("https://playwright.dev");
+    }
+
+    public override async Task DisposeAsync()
+    {
+        Console.WriteLine("After each test cleanup");
+        await base.DisposeAsync();
+    }
+}
+```
+</TabItem>
+<TabItem value="xunit-v3">
+
+You can use `InitializeAsync`/`DisposeAsync` to prepare and clean up your test environment:
+
+```csharp title="UnitTest1.cs"
+using Microsoft.Playwright;
+using Microsoft.Playwright.Xunit.v3;
+
+namespace PlaywrightTests;
+
+public class UnitTest1: PageTest
+{
+    [Fact]
+    public async Task MainNavigation()
+    {
+        // Assertions use the expect API.
+        await Expect(Page).ToHaveURLAsync("https://playwright.dev/");
+    }
+
+    override public async Task InitializeAsync()
+    {
+        await base.InitializeAsync();
+        await Page.GotoAsync("https://playwright.dev");
+    }
+
+    public override async Task DisposeAsync()
+    {
+        Console.WriteLine("After each test cleanup");
+        await base.DisposeAsync();
+    }
+}
+```
 </TabItem>
 </Tabs>
 
@@ -328,4 +508,4 @@ public class ExampleTest : PageTest
 - [Generate tests with Codegen](./codegen-intro.md)
 - [See a trace of your tests](./trace-viewer-intro.md)
 - [Run tests on CI](./ci-intro.md)
-- [Learn more about the MSTest and NUnit base classes](./test-runners.md)
+- [Learn more about the MSTest, NUnit, xUnit, or xUnit v3 base classes](./test-runners.md)
diff --git a/docs/src/writing-tests-java.md b/docs/src/writing-tests-java.md
index 7a05aca292156..ed12d93915569 100644
--- a/docs/src/writing-tests-java.md
+++ b/docs/src/writing-tests-java.md
@@ -23,7 +23,7 @@ public class App {
         try (Playwright playwright = Playwright.create()) {
             Browser browser = playwright.chromium().launch();
             Page page = browser.newPage();
-            page.navigate("http://playwright.dev");
+            page.navigate("https://playwright.dev");
 
             // Expect a title "to contain" a substring.
             assertThat(page).hasTitle(Pattern.compile("Playwright"));
diff --git a/docs/src/writing-tests-js.md b/docs/src/writing-tests-js.md
index 2cabde156413e..f86d223439490 100644
--- a/docs/src/writing-tests-js.md
+++ b/docs/src/writing-tests-js.md
@@ -4,21 +4,9 @@ title: "Writing tests"
 ---
 ## Introduction
 
-Playwright tests are simple, they
+Playwright tests are simple: they **perform actions** and **assert the state** against expectations.
 
-- **perform actions**, and
-- **assert the state** against expectations.
-
-There is no need to wait for anything prior to performing an action: Playwright
-automatically waits for the wide range of [actionability](./actionability.md)
-checks to pass prior to performing each action.
-
-There is also no need to deal with the race conditions when performing the checks -
-Playwright assertions are designed in a way that they describe the expectations
-that need to be eventually met.
-
-That's it! These design choices allow Playwright users to forget about flaky
-timeouts and racy checks in their tests altogether.
+Playwright automatically waits for [actionability](./actionability.md) checks to pass before performing each action. You don't need to add manual waits or deal with race conditions. Playwright assertions are designed to describe expectations that will eventually be met, eliminating flaky timeouts and racy checks.
 
 **You will learn**
 
@@ -52,7 +40,7 @@ test('get started link', async ({ page }) => {
   await expect(page.getByRole('heading', { name: 'Installation' })).toBeVisible();
 });
 ```
-  
+
 :::note
 Add `// @ts-check` at the start of each test file when using JavaScript in VS Code to get automatic type checking.
 :::
@@ -62,8 +50,7 @@ Add `// @ts-check` at the start of each test file when using JavaScript in VS Co
 
 ### Navigation
 
-Most of the tests will start with navigating page to the URL. After that, test
-will be able to interact with the page elements.
+Most tests start by navigating to a URL. After that, the test interacts with page elements.
 
 ```js
 await page.goto('https://playwright.dev/');
@@ -73,12 +60,13 @@ await page.goto('https://playwright.dev/');
 page.goto("https://playwright.dev/")
 ```
 
-Playwright will wait for page to reach the load state prior to moving forward.
-Learn more about the [`method: Page.goto`] options.
+Playwright waits for the page to reach the load state before continuing. Learn more about [`method: Page.goto`] options.
 
 ### Interactions
 
-Performing actions starts with locating the elements. Playwright uses [Locators API](./locators.md) for that. Locators represent a way to find element(s) on the page at any moment, learn more about the [different types](./locators.md) of locators available. Playwright will wait for the element to be [actionable](./actionability.md) prior to performing the action, so there is no need to wait for it to become available.
+Performing actions starts with locating elements. Playwright uses [Locators API](./locators.md) for that. Locators represent a way to find element(s) on the page at any moment. Learn more about the [different types](./locators.md) of locators available.
+
+Playwright waits for the element to be [actionable](./actionability.md) before performing the action, so you don't need to wait for it to become available.
 
 
 ```js
@@ -97,8 +85,7 @@ await page.getByRole('link', { name: 'Get started' }).click();
 
 ### Basic actions
 
-This is the list of the most popular Playwright actions. Note that there are many more, so make sure to check the [Locator API](./api/class-locator.md) section to
-learn more about them.
+Here are the most popular Playwright actions. For the complete list, check the [Locator API](./api/class-locator.md) section.
 
 | Action | Description |
 | :- | :- |
@@ -113,22 +100,16 @@ learn more about them.
 | [`method: Locator.selectOption`] | Select option in the drop down |
 
 ## Assertions
-  
-Playwright includes [test assertions](./test-assertions.md) in the form of `expect` function. To make an assertion, call `expect(value)` and choose a matcher that reflects the expectation.
-
-There are many generic matchers like `toEqual`, `toContain`, `toBeTruthy` that can be used to assert any conditions.
 
-```js
-expect(success).toBeTruthy();
-```
+Playwright includes [test assertions](./test-assertions.md) in the form of `expect` function. To make an assertion, call `expect(value)` and choose a matcher that reflects the expectation.
 
-Playwright also includes async matchers that will wait until the expected condition is met. Using these matchers allows making the tests non-flaky and resilient. For example, this code will wait until the page gets the title containing "Playwright":
+Playwright includes async matchers that wait until the expected condition is met. Using these matchers makes tests non-flaky and resilient. For example, this code waits until the page gets the title containing "Playwright":
 
 ```js
 await expect(page).toHaveTitle(/Playwright/);
 ```
-  
-Here is the list of the most popular async assertions. Note that there are [many more](./test-assertions.md) to get familiar with:
+
+Here are the most popular async assertions. For the complete list, see [assertions guide](./test-assertions.md):
 
 | Assertion | Description |
 | :- | :- |
@@ -143,9 +124,16 @@ Here is the list of the most popular async assertions. Note that there are [many
 | [`method: PageAssertions.toHaveTitle`] | Page has title |
 | [`method: PageAssertions.toHaveURL`] | Page has URL |
 
+Playwright also includes generic matchers like `toEqual`, `toContain`, `toBeTruthy` that can be used to assert any conditions. These assertions do not use the `await` keyword as they perform immediate synchronous checks on already available values.
+
+```js
+expect(success).toBeTruthy();
+```
+
+
 ### Test Isolation
-  
-Playwright Test is based on the concept of [test fixtures](./test-fixtures.md) such as the [built in page fixture](./test-fixtures#built-in-fixtures), which is passed into your test. Pages are [isolated between tests due to the Browser Context](./browser-contexts), which is equivalent to a brand new browser profile, where every test gets a fresh environment, even when multiple tests run in a single Browser.
+
+Playwright Test is based on the concept of [test fixtures](./test-fixtures.md) such as the [built in page fixture](./test-fixtures#built-in-fixtures), which is passed into your test. Pages are [isolated between tests due to the Browser Context](./browser-contexts), which is equivalent to a brand new browser profile. Every test gets a fresh environment, even when multiple tests run in a single browser.
 
 ```js title="tests/example.spec.ts"
 import { test } from '@playwright/test';
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000000000..f11395ad00b33
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,422 @@
+/**
+ * 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";
+import { fixupConfigRules } from "@eslint/compat";
+import { FlatCompat } from "@eslint/eslintrc";
+import js from "@eslint/js";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const plugins = {
+  "@stylistic": stylistic,
+  "@typescript-eslint": typescriptEslint,
+  notice,
+  import: importRules,
+};
+
+const ignores = [
+  ".github/",
+  "*.js",
+  "**/.cache/",
+  "**/*.d.ts",
+  "index.d.ts",
+  "node_modules/",
+  "output/",
+  "**/playwright-report/",
+  "packages/*/lib/",
+  "packages/playwright-core/bundles/zip/src/third_party/",
+  "packages/playwright-core/src/generated/*",
+  "packages/playwright-core/src/third_party/",
+  "packages/playwright-core/types/*",
+  "packages/playwright-ct-core/src/generated/*",
+  "packages/html-reporter/bundle.ts",
+  "packages/html-reporter/playwright.config.ts",
+  "packages/html-reporter/playwright/*",
+  "packages/html-reporter/vite.config.ts",
+  "test-results/",
+  "tests/assets/",
+  "tests/components/",
+  "tests/installation/fixture-scripts/",
+  "tests/third_party/",
+  "utils/",
+];
+
+export const baseRules = {
+  "@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,
+};
+
+const noFloatingPromisesRules = {
+  "@typescript-eslint/no-floating-promises": "error",
+};
+
+const noBooleanCompareRules = {
+  "@typescript-eslint/no-unnecessary-boolean-literal-compare": 2,
+};
+
+const noWebGlobalsRuleList = [
+  // Keep in sync with builtins from utilityScript.ts
+  { name: "window", message: "Use InjectedScript.window instead" },
+  { name: "document", message: "Use InjectedScript.document instead" },
+  { name: "globalThis", message: "Use InjectedScript.window instead" },
+  { name: "setTimeout", message: "Use InjectedScript.utils.builtins.setTimeout instead" },
+  { name: "clearTimeout", message: "Use InjectedScript.utils.builtins.clearTimeout instead" },
+  { name: "setInterval", message: "Use InjectedScript.utils.builtins.setInterval instead" },
+  { name: "clearInterval", message: "Use InjectedScript.utils.builtins.clearInterval instead" },
+  { name: "requestAnimationFrame", message: "Use InjectedScript.utils.builtins.requestAnimationFrame instead" },
+  { name: "cancelAnimationFrame", message: "Use InjectedScript.utils.builtins.cancelAnimationFrame instead" },
+  { name: "requestIdleCallback", message: "Use InjectedScript.utils.builtins.requestIdleCallback instead" },
+  { name: "cancelIdleCallback", message: "Use InjectedScript.utils.builtins.cancelIdleCallback instead" },
+  { name: "Date", message: "Use InjectedScript.utils.builtins.Date instead" },
+  { name: "Intl", message: "Use InjectedScript.utils.builtins.Intl instead" },
+  { name: "performance", message: "Use InjectedScript.utils.builtins.performance instead" },
+];
+
+const noNodeGlobalsRuleList = [{ name: "process" }];
+
+const importOrderRules = {
+  "import/order": [
+    2,
+    {
+      groups: [
+        ["builtin", "external"],
+        "internal",
+        ["parent", "sibling"],
+        "index",
+        "type",
+      ],
+    },
+  ],
+  "import/consistent-type-specifier-style": [2, "prefer-top-level"],
+};
+
+const languageOptions = {
+  parser: tsParser,
+  ecmaVersion: 9,
+  sourceType: "module",
+};
+
+const languageOptionsWithTsConfig = {
+  parser: tsParser,
+  ecmaVersion: 9,
+  sourceType: "module",
+  parserOptions: {
+    project: path.join(__dirname, "tsconfig.json"),
+  },
+};
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+const reactBaseConfig = fixupConfigRules(
+  compat.extends("plugin:react/recommended", "plugin:react-hooks/recommended")
+);
+const reactFiles = [
+  `packages/html-reporter/src/**/*.ts`,
+  `packages/html-reporter/src/**/*.tsx`,
+  `packages/recorder/src/**/*.ts`,
+  `packages/recorder/src/**/*.tsx`,
+  `packages/trace-viewer/src/**/*.ts`,
+  `packages/trace-viewer/src/**/*.tsx`,
+  `packages/web/src/**/*.ts`,
+  `packages/web/src/**/*.tsx`,
+];
+
+function reactPackageSection(packageName) {
+  return {
+    files: [
+      `packages/${packageName}/src/**/*.ts`,
+      `packages/${packageName}/src/**/*.tsx`,
+      `packages/web/src/**/*.ts`,
+      `packages/web/src/**/*.tsx`,
+    ],
+    languageOptions: {
+      parser: tsParser,
+      ecmaVersion: 9,
+      sourceType: "module",
+      parserOptions: {
+        project: path.join(__dirname, "packages", packageName, "tsconfig.json"),
+      },
+    },
+    rules: {
+      ...baseRules,
+      "no-console": 2,
+    },
+  };
+}
+
+export default [
+  {
+    ignores,
+  },
+  {
+    files: ["**/*.ts", "**/*.tsx"],
+    plugins,
+    languageOptions,
+    rules: baseRules,
+    settings: {
+      react: { version: "detect" },
+    },
+  },
+  {
+    files: ["packages/**/*.ts"],
+    languageOptions: languageOptionsWithTsConfig,
+    rules: {
+      "no-console": 2,
+      "no-restricted-properties": [
+        2,
+        {
+          object: "process",
+          property: "exit",
+          message:
+            "Please use gracefullyProcessExitDoNotHang function to exit the process.",
+        },
+        { object: "process", property: "stdout" },
+        { object: "process", property: "stderr" },
+      ],
+    },
+  },
+  {
+    files: ["packages/**/*.ts"],
+    rules: {
+      ...importOrderRules,
+    },
+  },
+  {
+    files: ["packages/playwright/**/*.ts"],
+    rules: {
+      ...noFloatingPromisesRules,
+    },
+  },
+  {
+    files: [
+      "packages/playwright-core/src/utils/**/*.ts",
+    ],
+    languageOptions: languageOptionsWithTsConfig,
+    rules: {
+      "no-restricted-globals": [
+        "error",
+        ...noNodeGlobalsRuleList,
+        ...noWebGlobalsRuleList,
+      ],
+      ...noFloatingPromisesRules,
+      ...noBooleanCompareRules,
+    },
+  },
+  {
+    files: [
+      "packages/injected/src/**/*.ts",
+    ],
+    languageOptions: languageOptionsWithTsConfig,
+    rules: {
+      "no-restricted-globals": [
+        "error",
+        ...noWebGlobalsRuleList,
+      ],
+      ...noFloatingPromisesRules,
+      ...noBooleanCompareRules,
+    },
+  },
+  {
+    files: [
+      "packages/playwright-core/src/client/**/*.ts",
+      "packages/playwright-core/src/protocol/**/*.ts",
+    ],
+    languageOptions: languageOptionsWithTsConfig,
+    rules: {
+      "no-restricted-globals": [
+        "error",
+        ...noNodeGlobalsRuleList,
+      ],
+      ...noFloatingPromisesRules,
+      ...noBooleanCompareRules,
+    },
+  },
+  {
+    files: ["tests/**/*.spec.js", "tests/**/*.ts"],
+    languageOptions: {
+      parser: tsParser,
+      ecmaVersion: 9,
+      sourceType: "module",
+      parserOptions: {
+        project: path.join(__dirname, "tests", "tsconfig.json"),
+      },
+    },
+    rules: {
+      ...noFloatingPromisesRules,
+    },
+  },
+  ...reactBaseConfig.map((config) => ({
+    ...config,
+    files: reactFiles,
+  })),
+  reactPackageSection("html-reporter"),
+  reactPackageSection("recorder"),
+  reactPackageSection("trace-viewer"),
+];
diff --git a/examples/todomvc/playwright.config.ts b/examples/todomvc/playwright.config.ts
index 3d76370d4d30c..831aa9035595b 100644
--- a/examples/todomvc/playwright.config.ts
+++ b/examples/todomvc/playwright.config.ts
@@ -12,6 +12,8 @@ export default defineConfig({
   /* Maximum time one test can run for. */
   timeout: 15_000,
 
+  captureGitInfo: { commit: true, diff: true },
+
   expect: {
 
     /**
diff --git a/package-lock.json b/package-lock.json
index d2f47b5108202..5d5747f10bceb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,176 +1,176 @@
 {
   "name": "playwright-internal",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "playwright-internal",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "workspaces": [
         "packages/*"
       ],
       "devDependencies": {
         "@actions/core": "^1.10.0",
-        "@babel/cli": "^7.23.4",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-typescript": "^7.23.6",
-        "@babel/preset-react": "^7.23.3",
-        "@types/babel__core": "^7.20.2",
+        "@actions/github": "^6.0.0",
+        "@babel/code-frame": "^7.26.2",
+        "@eslint/compat": "^1.2.6",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.19.0",
+        "@modelcontextprotocol/sdk": "^1.17.3",
+        "@octokit/graphql-schema": "^15.26.0",
+        "@stylistic/eslint-plugin": "^3.0.1",
         "@types/codemirror": "^5.60.7",
         "@types/formidable": "^2.0.4",
-        "@types/node": "^18.19.39",
+        "@types/immutable": "^3.8.7",
+        "@types/node": "^18.19.68",
         "@types/react": "^18.0.12",
         "@types/react-dom": "^18.0.5",
         "@types/ws": "^8.5.3",
         "@types/xml2js": "^0.4.9",
-        "@typescript-eslint/eslint-plugin": "^7.15.0",
-        "@typescript-eslint/parser": "^7.15.0",
-        "@typescript-eslint/utils": "^7.15.0",
+        "@typescript-eslint/eslint-plugin": "^8.26.1",
+        "@typescript-eslint/parser": "^8.26.1",
+        "@typescript-eslint/utils": "^8.26.1",
         "@vitejs/plugin-basic-ssl": "^1.1.0",
         "@vitejs/plugin-react": "^4.2.1",
         "@zip.js/zip.js": "^2.7.29",
+        "ansi-styles": "^4.3.0",
         "chokidar": "^3.5.3",
+        "chromium-bidi": "^7.2.0",
         "colors": "^1.4.0",
         "concurrently": "^6.2.1",
         "cross-env": "^7.0.3",
-        "dotenv": "^16.0.0",
+        "dotenv": "^16.4.5",
         "electron": "^30.1.2",
-        "esbuild": "^0.18.11",
-        "eslint": "^8.55.0",
-        "eslint-plugin-internal-playwright": "file:utils/eslint-plugin-internal-playwright",
-        "eslint-plugin-notice": "^0.9.10",
-        "eslint-plugin-react": "^7.33.2",
-        "eslint-plugin-react-hooks": "^4.3.0",
+        "esbuild": "^0.25.0",
+        "eslint": "^9.19.0",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-notice": "^1.0.0",
+        "eslint-plugin-react": "^7.37.4",
+        "eslint-plugin-react-hooks": "^5.1.0",
         "formidable": "^2.1.1",
+        "immutable": "^4.3.7",
         "license-checker": "^25.0.1",
         "mime": "^3.0.0",
         "node-stream-zip": "^1.15.0",
         "react": "^18.1.0",
         "react-dom": "^18.1.0",
         "ssim.js": "^3.5.0",
-        "typescript": "^5.5.3",
-        "vite": "^5.0.13",
+        "typescript": "^5.8.2",
+        "vite": "^6.3.4",
         "ws": "^8.17.1",
         "xml2js": "^0.5.0",
-        "yaml": "^2.2.2"
+        "yaml": "2.6.0"
       },
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+    "node_modules/@actions/core": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "license": "MIT",
+      "dependencies": {
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
       }
     },
-    "node_modules/@actions/core": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "node_modules/@actions/github": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.0.tgz",
+      "integrity": "sha512-alScpSVnYmjNEXboZjarjukQEzgCRmjMv6Xj47fsdnqGS73bjJNDpiiXmp8jr0UZLdUB6d9jW63IcmddUP+l0g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
+        "@actions/http-client": "^2.2.0",
+        "@octokit/core": "^5.0.1",
+        "@octokit/plugin-paginate-rest": "^9.0.0",
+        "@octokit/plugin-rest-endpoint-methods": "^10.0.0"
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.0.tgz",
-      "integrity": "sha512-q+epW0trjVUUHboliPb4UF9g2msf+w61b32tAkFEwL/IwP0DQWgbCMM0Hbe3e3WXSKz5VcUXbzJQgy8Hkra/Lg==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "tunnel": "^0.0.6",
         "undici": "^5.25.4"
       }
     },
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/cli": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.23.4.tgz",
-      "integrity": "sha512-j3luA9xGKCXVyCa5R7lJvOMM+Kc2JEnAEIgz2ggtjQ/j5YUVgfsg/WsG95bbsgq7YLHuiCOzMnoSasuY16qiCw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "commander": "^4.0.1",
-        "convert-source-map": "^2.0.0",
-        "fs-readdir-recursive": "^1.1.0",
-        "glob": "^7.2.0",
-        "make-dir": "^2.1.0",
-        "slash": "^2.0.0"
-      },
-      "bin": {
-        "babel": "bin/babel.js",
-        "babel-external-helpers": "bin/babel-external-helpers.js"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "optionalDependencies": {
-        "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3",
-        "chokidar": "^3.4.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz",
-      "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
+      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.7",
-        "@babel/parser": "^7.23.6",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/traverse": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -186,38 +186,30 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -225,91 +217,28 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz",
-      "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.20",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
-      "dependencies": {
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -318,128 +247,63 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz",
-      "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
+      "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.23.7",
-        "@babel/types": "^7.23.6"
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
+    "node_modules/@babel/parser": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "@babel/types": "^7.26.9"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -447,24 +311,13 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
-      "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
+    "node_modules/@babel/plugin-transform-react-jsx-self": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz",
+      "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -473,48 +326,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
-      "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
+    "node_modules/@babel/plugin-transform-react-jsx-source": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz",
+      "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -523,737 +341,511 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz",
-      "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==",
+    "node_modules/@babel/runtime": {
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz",
-      "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==",
-      "dev": true,
+    "node_modules/@babel/template": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz",
-      "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+    "node_modules/@babel/traverse": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz",
-      "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==",
+    "node_modules/@babel/types": {
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
+      "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz",
-      "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==",
+    "node_modules/@electron/get": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
+      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "got": "^11.8.5",
+        "progress": "^2.0.3",
+        "semver": "^6.2.0",
+        "sumchecker": "^3.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=12"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "optionalDependencies": {
+        "global-agent": "^3.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz",
-      "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
+      "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz",
-      "integrity": "sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",
+      "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz",
-      "integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/types": "^7.23.4"
-      },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",
+      "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
-      "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.22.5"
-      },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",
+      "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz",
-      "integrity": "sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz",
-      "integrity": "sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz",
-      "integrity": "sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz",
-      "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-typescript": "^7.23.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-react": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.23.3.tgz",
-      "integrity": "sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-transform-react-display-name": "^7.23.3",
-        "@babel/plugin-transform-react-jsx": "^7.22.15",
-        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
-        "@babel/plugin-transform-react-pure-annotations": "^7.23.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz",
-      "integrity": "sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-typescript": "^7.23.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.23.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz",
-      "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.23.6",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@electron/get": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",
-      "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "env-paths": "^2.2.0",
-        "fs-extra": "^8.1.0",
-        "got": "^11.8.5",
-        "progress": "^2.0.3",
-        "semver": "^6.2.0",
-        "sumchecker": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "global-agent": "^3.0.0"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",
+      "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",
+      "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",
+      "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",
+      "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",
+      "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",
+      "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",
       "cpu": [
         "ia32"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",
+      "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",
       "cpu": [
         "loong64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",
+      "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",
       "cpu": [
         "mips64el"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",
+      "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",
+      "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",
+      "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",
       "cpu": [
         "s390x"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",
+      "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",
+      "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",
+      "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",
+      "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",
+      "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",
+      "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",
       "cpu": [
         "ia32"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",
+      "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -1261,107 +853,192 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "license": "MIT",
+      "engines": {
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+    "node_modules/@eslint/compat": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.2.6.tgz",
+      "integrity": "sha512-k7HNCqApoDHM6XzT30zGoETj+D+uUcZUb+IVAJmar3u6bvHf7hhHJcWx09QHj4/a2qrKZMWU0E16tvkiAdv06Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": "^9.10.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
+      "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "*"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "9.20.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
+      "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@fastify/busboy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.0.tgz",
-      "integrity": "sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==",
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=14"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
+      "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@eslint/core": "^0.10.0",
+        "levn": "^0.4.1"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
+      "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/@fastify/busboy": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -1369,6 +1046,7 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -1377,67 +1055,98 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
-      "dev": true
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz",
-      "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@nicolo-ribaudo/chokidar-2": {
-      "version": "2.1.8-no-fsevents.3",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
-      "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
+    "node_modules/@modelcontextprotocol/sdk": {
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.17.3.tgz",
+      "integrity": "sha512-JPwUKWSsbzx+DLFznf/QZ32Qa+ptfbUlHhRLrBQBAFu9iI1iYvizM4p+zhhRDceSsPutXp4z+R/HPVphlIiclg==",
       "dev": true,
-      "optional": true
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.6",
+        "content-type": "^1.0.5",
+        "cors": "^2.8.5",
+        "cross-spawn": "^7.0.5",
+        "eventsource": "^3.0.2",
+        "eventsource-parser": "^3.0.0",
+        "express": "^5.0.1",
+        "express-rate-limit": "^7.5.0",
+        "pkce-challenge": "^5.0.0",
+        "raw-body": "^3.0.0",
+        "zod": "^3.23.8",
+        "zod-to-json-schema": "^3.24.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -1451,6 +1160,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1460,6 +1170,7 @@
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -1468,6 +1179,189 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
+      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/graphql-schema": {
+      "version": "15.26.0",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql-schema/-/graphql-schema-15.26.0.tgz",
+      "integrity": "sha512-SoVbh+sXe9nsoweFbLT3tAk3XWYbYLs5ku05wij1zhyQ2U3lewdrhjo5Tb7lfaOGWNHSkPZT4uuPZp8neF7P7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graphql": "^16.0.0",
+        "graphql-tag": "^2.10.3"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
     "node_modules/@playwright/browser-chromium": {
       "resolved": "packages/playwright-browser-chromium",
       "link": true
@@ -1480,6 +1374,10 @@
       "resolved": "packages/playwright-browser-webkit",
       "link": true
     },
+    "node_modules/@playwright/client": {
+      "resolved": "packages/playwright-client",
+      "link": true
+    },
     "node_modules/@playwright/experimental-ct-core": {
       "resolved": "packages/playwright-ct-core",
       "link": true
@@ -1492,10 +1390,6 @@
       "resolved": "packages/playwright-ct-react17",
       "link": true
     },
-    "node_modules/@playwright/experimental-ct-solid": {
-      "resolved": "packages/playwright-ct-solid",
-      "link": true
-    },
     "node_modules/@playwright/experimental-ct-svelte": {
       "resolved": "packages/playwright-ct-svelte",
       "link": true
@@ -1504,199 +1398,287 @@
       "resolved": "packages/playwright-ct-vue",
       "link": true
     },
-    "node_modules/@playwright/experimental-ct-vue2": {
-      "resolved": "packages/playwright-ct-vue2",
-      "link": true
-    },
     "node_modules/@playwright/test": {
       "resolved": "packages/playwright-test",
       "link": true
     },
+    "node_modules/@playwright/test-runner-mcp": {
+      "resolved": "packages/playwright-test-mcp",
+      "link": true
+    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.0.tgz",
-      "integrity": "sha512-jwXtxYbRt1V+CdQSy6Z+uZti7JF5irRKF8hlKfEnF/xJpcNGuuiZMBvuoYM+x9sr9iWGnzrlM0+9hvQ1kgkf1w==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz",
+      "integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==",
       "cpu": [
         "arm"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.0.tgz",
-      "integrity": "sha512-fI9nduZhCccjzlsA/OuAwtFGWocxA4gqXGTLvOyiF8d+8o0fZUeSztixkYjcGq1fGZY3Tkq4yRvHPFxU+jdZ9Q==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz",
+      "integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.0.tgz",
-      "integrity": "sha512-BcnSPRM76/cD2gQC+rQNGBN6GStBs2pl/FpweW8JYuz5J/IEa0Fr4AtrPv766DB/6b2MZ/AfSIOSGw3nEIP8SA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz",
+      "integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.0.tgz",
-      "integrity": "sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz",
+      "integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz",
+      "integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz",
+      "integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.0.tgz",
-      "integrity": "sha512-ygrGVhQP47mRh0AAD0zl6QqCbNsf0eTo+vgwkY6LunBcg0f2Jv365GXlDUECIyoXp1kKwL5WW6rsO429DBY/bA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz",
+      "integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz",
+      "integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==",
       "cpu": [
         "arm"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.0.tgz",
-      "integrity": "sha512-x+uJ6MAYRlHGe9wi4HQjxpaKHPM3d3JjqqCkeC5gpnnI6OWovLdXTpfa8trjxPLnWKyBsSi5kne+146GAxFt4A==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz",
+      "integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.0.tgz",
-      "integrity": "sha512-nrRw8ZTQKg6+Lttwqo6a2VxR9tOroa2m91XbdQ2sUUzHoedXlsyvY1fN4xWdqz8PKmf4orDwejxXHjh7YBGUCA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz",
+      "integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz",
+      "integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.0.tgz",
-      "integrity": "sha512-xV0d5jDb4aFu84XKr+lcUJ9y3qpIWhttO3Qev97z8DKLXR62LC3cXT/bMZXrjLF9X+P5oSmJTzAhqwUbY96PnA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz",
+      "integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==",
       "cpu": [
-        "ppc64le"
+        "ppc64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.0.tgz",
-      "integrity": "sha512-SDDhBQwZX6LPRoPYjAZWyL27LbcBo7WdBFWJi5PI9RPCzU8ijzkQn7tt8NXiXRiFMJCVpkuMkBf4OxSxVMizAw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz",
+      "integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz",
+      "integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==",
       "cpu": [
         "riscv64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.0.tgz",
-      "integrity": "sha512-RxB/qez8zIDshNJDufYlTT0ZTVut5eCpAZ3bdXDU9yTxBzui3KhbGjROK2OYTTor7alM7XBhssgoO3CZ0XD3qA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz",
+      "integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==",
       "cpu": [
         "s390x"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.0.tgz",
-      "integrity": "sha512-C6y6z2eCNCfhZxT9u+jAM2Fup89ZjiG5pIzZIDycs1IwESviLxwkQcFRGLjnDrP+PT+v5i4YFvlcfAs+LnreXg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz",
+      "integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.0.tgz",
-      "integrity": "sha512-i0QwbHYfnOMYsBEyjxcwGu5SMIi9sImDVjDg087hpzXqhBSosxkE7gyIYFHgfFl4mr7RrXksIBZ4DoLoP4FhJg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz",
+      "integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.0.tgz",
-      "integrity": "sha512-Fq52EYb0riNHLBTAcL0cun+rRwyZ10S9vKzhGKKgeD+XbwunszSY0rVMco5KbOsTlwovP2rTOkiII/fQ4ih/zQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz",
+      "integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==",
       "cpu": [
         "arm64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.0.tgz",
-      "integrity": "sha512-e/PBHxPdJ00O9p5Ui43+vixSgVf4NlLsmV6QneGERJ3lnjIua/kim6PRFe3iDueT1rQcgSkYP8ZBBXa/h4iPvw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz",
+      "integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==",
       "cpu": [
         "ia32"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.0.tgz",
-      "integrity": "sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz",
+      "integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==",
       "cpu": [
         "x64"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
+    "node_modules/@rtsao/scc": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
+      "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@sindresorhus/is": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
       "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -1704,41 +1686,33 @@
         "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/@sveltejs/vite-plugin-svelte": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-3.0.1.tgz",
-      "integrity": "sha512-CGURX6Ps+TkOovK6xV+Y2rn8JKa8ZPUHPZ/NKgCxAmgBrXReavzFl8aOSCj3kQ1xqT7yGJj53hjcV/gqwDAaWA==",
+    "node_modules/@stylistic/eslint-plugin": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-3.1.0.tgz",
+      "integrity": "sha512-pA6VOrOqk0+S8toJYhQGv2MWpQQR0QpeUo9AhNkC49Y26nxBQ/nH1rta9bUU1rPw2fJ1zZEMV5oCX5AazT7J2g==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@sveltejs/vite-plugin-svelte-inspector": "^2.0.0-next.0 || ^2.0.0",
-        "debug": "^4.3.4",
-        "deepmerge": "^4.3.1",
-        "kleur": "^4.1.5",
-        "magic-string": "^0.30.5",
-        "svelte-hmr": "^0.15.3",
-        "vitefu": "^0.2.5"
+        "@typescript-eslint/utils": "^8.13.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "estraverse": "^5.3.0",
+        "picomatch": "^4.0.2"
       },
       "engines": {
-        "node": "^18.0.0 || >=20"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "peerDependencies": {
-        "svelte": "^4.0.0 || ^5.0.0-next.0",
-        "vite": "^5.0.0"
+        "eslint": ">=8.40.0"
       }
     },
-    "node_modules/@sveltejs/vite-plugin-svelte-inspector": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.0.0.tgz",
-      "integrity": "sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20"
-      },
+    "node_modules/@sveltejs/acorn-typescript": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.5.tgz",
+      "integrity": "sha512-IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ==",
+      "license": "MIT",
       "peerDependencies": {
-        "@sveltejs/vite-plugin-svelte": "^3.0.0",
-        "svelte": "^4.0.0 || ^5.0.0-next.0",
-        "vite": "^5.0.0"
+        "acorn": "^8.9.0"
       }
     },
     "node_modules/@szmarczak/http-timer": {
@@ -1746,6 +1720,7 @@
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
       "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "defer-to-connect": "^2.0.0"
       },
@@ -1757,6 +1732,7 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -1769,6 +1745,7 @@
       "version": "7.6.8",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -1777,15 +1754,17 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
-      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
@@ -1795,6 +1774,7 @@
       "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
       "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-cache-semantics": "*",
         "@types/keyv": "^3.1.4",
@@ -1807,20 +1787,23 @@
       "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.15.tgz",
       "integrity": "sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/tern": "*"
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
+      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
+      "license": "MIT"
     },
     "node_modules/@types/formidable": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/formidable/-/formidable-2.0.6.tgz",
       "integrity": "sha512-L4HcrA05IgQyNYJj6kItuIkXrInJvsXTPC5B1i64FggWKKqSL+4hgt7asiSNva75AoLQjq29oPxFfU4GAQ6Z2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -1829,50 +1812,80 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
       "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/immutable": {
+      "version": "3.8.7",
+      "resolved": "https://registry.npmjs.org/@types/immutable/-/immutable-3.8.7.tgz",
+      "integrity": "sha512-nsHFDX48Tl3RaP4BF47HHe5njx40Pcp+0a8CIqzJata80Fp7JzkcuGB7UhZBGjH9aA1fMEahIqvPQQNmro5YLg==",
+      "deprecated": "This is a stub types definition for Facebook's Immutable (https://github.com/facebook/immutable-js). Facebook's Immutable provides its own type definitions, so you don't need @types/immutable installed!",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "immutable": "*"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
       "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "18.19.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz",
-      "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==",
+      "version": "18.19.76",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.76.tgz",
+      "integrity": "sha512-yvR7Q9LdPz2vGpmpJX5LolrgRdWvB67MJKDPSgIIzpFbaf9a1j/f5DnLp5VDyHGMR0QZHlTr1afsD87QCXFHKw==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.11",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz",
-      "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==",
-      "dev": true
+      "version": "15.7.14",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.2.48",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.48.tgz",
-      "integrity": "sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==",
+      "version": "18.3.18",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
+      "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
-        "@types/scheduler": "*",
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.2.18",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",
-      "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",
+      "version": "18.3.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
+      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
       "dev": true,
-      "dependencies": {
-        "@types/react": "*"
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^18.0.0"
       }
     },
     "node_modules/@types/responselike": {
@@ -1880,30 +1893,27 @@
       "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",
       "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.8",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
-      "dev": true
-    },
     "node_modules/@types/tern": {
       "version": "0.23.9",
       "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.9.tgz",
       "integrity": "sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "version": "8.5.14",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
+      "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -1913,6 +1923,7 @@
       "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.14.tgz",
       "integrity": "sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -1922,83 +1933,79 @@
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
       "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz",
-      "integrity": "sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz",
+      "integrity": "sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/type-utils": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/scope-manager": "8.26.1",
+        "@typescript-eslint/type-utils": "8.26.1",
+        "@typescript-eslint/utils": "8.26.1",
+        "@typescript-eslint/visitor-keys": "8.26.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.15.0.tgz",
-      "integrity": "sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.1.tgz",
+      "integrity": "sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/scope-manager": "8.26.1",
+        "@typescript-eslint/types": "8.26.1",
+        "@typescript-eslint/typescript-estree": "8.26.1",
+        "@typescript-eslint/visitor-keys": "8.26.1",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz",
-      "integrity": "sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz",
+      "integrity": "sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0"
+        "@typescript-eslint/types": "8.26.1",
+        "@typescript-eslint/visitor-keys": "8.26.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -2006,39 +2013,37 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz",
-      "integrity": "sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz",
+      "integrity": "sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
+        "@typescript-eslint/typescript-estree": "8.26.1",
+        "@typescript-eslint/utils": "8.26.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.1.tgz",
+      "integrity": "sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -2046,38 +2051,64 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz",
-      "integrity": "sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz",
+      "integrity": "sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/types": "8.26.1",
+        "@typescript-eslint/visitor-keys": "8.26.1",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.9.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2086,220 +2117,221 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.15.0.tgz",
-      "integrity": "sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.1.tgz",
+      "integrity": "sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/typescript-estree": "7.15.0"
+        "@typescript-eslint/scope-manager": "8.26.1",
+        "@typescript-eslint/types": "8.26.1",
+        "@typescript-eslint/typescript-estree": "8.26.1"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.9.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz",
-      "integrity": "sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==",
+      "version": "8.26.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz",
+      "integrity": "sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.26.1",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
     "node_modules/@vitejs/plugin-basic-ssl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
-      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.2.0.tgz",
+      "integrity": "sha512-mkQnxTkcldAzIsomk1UuLfAu9n+kpQ3JbHcpCp7d2Oo6ITtji8pHS3QToOWjhPFvNQSnhlkAjmGbhv2QvwO/7Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.6.0"
+        "node": ">=14.21.3"
       },
       "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz",
-      "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
+      "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.23.5",
-        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
+        "@babel/core": "^7.26.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-source": "^7.25.9",
         "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.14.0"
+        "react-refresh": "^0.14.2"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0"
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
       }
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz",
-      "integrity": "sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.1.tgz",
+      "integrity": "sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==",
+      "license": "MIT",
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
       "peerDependencies": {
-        "vite": "^4.0.0 || ^5.0.0",
+        "vite": "^5.0.0 || ^6.0.0",
         "vue": "^3.2.25"
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
-      "integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
+      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@vue/shared": "3.4.15",
+        "@babel/parser": "^7.25.3",
+        "@vue/shared": "3.5.13",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "node_modules/@vue/compiler-core/node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-core/node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
-      "integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
+      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-core": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-core": "3.5.13",
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz",
-      "integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
+      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@vue/compiler-core": "3.4.15",
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/compiler-ssr": "3.4.15",
-        "@vue/shared": "3.4.15",
+        "@babel/parser": "^7.25.3",
+        "@vue/compiler-core": "3.5.13",
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.5",
-        "postcss": "^8.4.33",
-        "source-map-js": "^1.0.2"
+        "magic-string": "^0.30.11",
+        "postcss": "^8.4.48",
+        "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
-      "integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
+      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz",
-      "integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
+      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/shared": "3.4.15"
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz",
-      "integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
+      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/reactivity": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/reactivity": "3.5.13",
+        "@vue/shared": "3.5.13"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz",
-      "integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
+      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/runtime-core": "3.4.15",
-        "@vue/shared": "3.4.15",
+        "@vue/reactivity": "3.5.13",
+        "@vue/runtime-core": "3.5.13",
+        "@vue/shared": "3.5.13",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz",
-      "integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
+      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-ssr": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-ssr": "3.5.13",
+        "@vue/shared": "3.5.13"
       },
       "peerDependencies": {
-        "vue": "3.4.15"
+        "vue": "3.5.13"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
-      "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
+      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+      "license": "MIT",
       "peer": true
     },
     "node_modules/@zip.js/zip.js": {
-      "version": "2.7.32",
-      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.32.tgz",
-      "integrity": "sha512-9Ox1meDIvIKE23LLA7Fxd/ewJpKjj2KryH92doHRqx2406LmIzorsiMawL0qIK7dvwN9K+mfk47lauoIE0o1zQ==",
+      "version": "2.7.57",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.57.tgz",
+      "integrity": "sha512-BtonQ1/jDnGiMed6OkV6rZYW78gLmLswkHOzyMrMb+CAR7CZO8phOHO6c2qw6qb1g1betN7kwEHhhZk30dv+NA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "bun": ">=0.7.0",
         "deno": ">=1.0.0",
@@ -2310,12 +2342,28 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/accepts": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
+      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "^3.0.0",
+        "negotiator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2328,6 +2376,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -2337,6 +2386,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2353,41 +2403,25 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-to-html": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.7.2.tgz",
-      "integrity": "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g==",
-      "dependencies": {
-        "entities": "^2.2.0"
-      },
-      "bin": {
-        "ansi-to-html": "bin/ansi-to-html"
+        "node": ">=8"
       },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/ansi-to-html/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
@@ -2395,6 +2429,7 @@
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -2403,28 +2438,47 @@
         "node": ">= 8"
       }
     },
+    "node_modules/anymatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "dev": true,
+      "license": "Python-2.0"
     },
     "node_modules/aria-query": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2435,20 +2489,23 @@
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
+      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -2458,25 +2515,59 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
+      "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2486,15 +2577,16 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2504,31 +2596,36 @@
       }
     },
     "node_modules/array.prototype.tosorted": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz",
-      "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2541,22 +2638,28 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/asynciterator.prototype": {
+    "node_modules/async-function": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz",
-      "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
       "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "possible-typed-array-names": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -2565,79 +2668,80 @@
       }
     },
     "node_modules/axobject-query": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz",
-      "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==",
-      "dependencies": {
-        "dequal": "^2.0.3"
-      }
-    },
-    "node_modules/babel-plugin-jsx-dom-expressions": {
-      "version": "0.37.13",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.37.13.tgz",
-      "integrity": "sha512-oAEMMIgU0h1DmHn4ZDaBBFc08nsVJciLq9pF7g0ZdpeIDKfY4zXjXr8+/oBjKhXG8nyomhnTodPjeG+/ZXcWXQ==",
-      "dependencies": {
-        "@babel/helper-module-imports": "7.18.6",
-        "@babel/plugin-syntax-jsx": "^7.18.6",
-        "@babel/types": "^7.20.7",
-        "html-entities": "2.3.3",
-        "validate-html-nesting": "^1.2.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.20.12"
-      }
-    },
-    "node_modules/babel-plugin-jsx-dom-expressions/node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/babel-preset-solid": {
-      "version": "1.8.9",
-      "resolved": "https://registry.npmjs.org/babel-preset-solid/-/babel-preset-solid-1.8.9.tgz",
-      "integrity": "sha512-1awR1QCoryXtAdnjsrx/eVBTYz+tpHUDOdBXqG9oVV7S0ojf2MV/woR0+8BG+LMXVzIr60oKYzCZ9UZGafxmpg==",
-      "dependencies": {
-        "babel-plugin-jsx-dom-expressions": "^0.37.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
+      "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "^3.1.2",
+        "content-type": "^1.0.5",
+        "debug": "^4.4.0",
+        "http-errors": "^2.0.0",
+        "iconv-lite": "^0.6.3",
+        "on-finished": "^2.4.1",
+        "qs": "^6.14.0",
+        "raw-body": "^3.0.0",
+        "type-is": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/boolean": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
       "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
@@ -2645,6 +2749,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -2653,9 +2758,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "funding": [
         {
           "type": "opencollective",
@@ -2670,11 +2775,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001565",
-        "electron-to-chromium": "^1.4.601",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2688,15 +2794,27 @@
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/cacheable-lookup": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
       "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.6.0"
       }
@@ -2706,6 +2824,7 @@
       "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",
       "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
@@ -2720,32 +2839,69 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+      "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001579",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz",
-      "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==",
+      "version": "1.0.30001700",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
+      "integrity": "sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -2759,32 +2915,45 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -2797,15 +2966,33 @@
       "engines": {
         "node": ">= 8.10.0"
       },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/chromium-bidi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-7.2.0.tgz",
+      "integrity": "sha512-gREyhyBstermK+0RbcJLbFhcQctg92AGgDe/h/taMJEOLRdtSswBAO9KmvltFSQWgM2LrwWu5SIuEUbdm3JsyQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "mitt": "^3.0.1",
+        "zod": "^3.24.1"
+      },
+      "peerDependencies": {
+        "devtools-protocol": "*"
+      }
+    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -2817,6 +3004,7 @@
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
       "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^1.0.0"
       },
@@ -2824,65 +3012,73 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/code-red": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.4.tgz",
-      "integrity": "sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15",
-        "@types/estree": "^1.0.1",
-        "acorn": "^8.10.0",
-        "estree-walker": "^3.0.3",
-        "periscopic": "^3.1.0"
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/codemirror-shadow-1": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/codemirror-shadow-1/-/codemirror-shadow-1-0.0.1.tgz",
-      "integrity": "sha512-kD3OZpCCHr3LHRKfbGx5IogHTWq4Uo9jH2bXPVa7/n6ppkgI66rx4tniQY1BpqWp/JNhQmQsXhQoaZ1TH6t0xQ=="
+    "node_modules/codemirror": {
+      "version": "5.65.18",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.18.tgz",
+      "integrity": "sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==",
+      "license": "MIT"
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/colors": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.1.90"
       }
     },
     "node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "dev": true,
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
+      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=18"
       }
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/concurrently": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
       "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "date-fns": "^2.16.1",
@@ -2900,101 +3096,75 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/concurrently/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/content-disposition": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
+      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/concurrently/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/concurrently/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "license": "MIT"
     },
-    "node_modules/concurrently/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/concurrently/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/concurrently/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/cookie-signature": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
+      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=6.6.0"
       }
     },
-    "node_modules/concurrently/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "object-assign": "^4",
+        "vary": "^1"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-    },
     "node_modules/cross-env": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
       "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.1"
       },
@@ -3009,10 +3179,11 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -3022,28 +3193,72 @@
         "node": ">= 8"
       }
     },
-    "node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
+    },
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
+      }
+    },
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/date-fns": {
       "version": "2.30.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
       "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.21.0"
       },
@@ -3056,11 +3271,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -3077,6 +3293,7 @@
       "integrity": "sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==",
       "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -3086,6 +3303,7 @@
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
       "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-response": "^3.1.0"
       },
@@ -3101,6 +3319,7 @@
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
       "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3112,12 +3331,14 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3127,22 +3348,27 @@
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
       "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/define-properties": {
@@ -3150,6 +3376,7 @@
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
       "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -3162,73 +3389,105 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/dequal": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.8"
       }
     },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.1421213",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1421213.tgz",
+      "integrity": "sha512-E0JrRYeXiTZXJwFlJ0j8wz8TmM+VwCv128JaSyCEgTmyE54QE/GDhT4w6kS1m+nFKmulHWWrbrO2AHexZgcxFQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "peer": true
+    },
     "node_modules/dezalgo": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
       "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=0.10.0"
       }
     },
     "node_modules/dotenv": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
-      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+      "version": "16.5.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
+      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/electron": {
-      "version": "30.1.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-30.1.2.tgz",
-      "integrity": "sha512-A5CFGwbA+HSXnzwjc8fP2GIezBcAb0uN/VbNGLOW8DHOYn07rvJ/1bAJECHUUzt5zbfohveG3hpMQiYpbktuDw==",
+      "version": "30.5.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-30.5.1.tgz",
+      "integrity": "sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
         "@electron/get": "^2.0.0",
         "@types/node": "^20.9.0",
@@ -3242,88 +3501,136 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.639",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.639.tgz",
-      "integrity": "sha512-CkKf3ZUVZchr+zDpAlNLEEy2NJJ9T64ULWaDgy3THXXlPVPkLu3VOs9Bac44nebVtdwl2geSj6AxTtGDOxoXhg=="
+      "version": "1.5.102",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.102.tgz",
+      "integrity": "sha512-eHhqaja8tE/FNpIiBrvBjFV/SSKpyWHLvxuR9dPTdo+3V9ppdLmFB7ZZQ98qNovcngPLYIz0oOBF9P0FfZef5Q==",
+      "license": "ISC"
     },
     "node_modules/electron/node_modules/@types/node": {
-      "version": "20.12.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.13.tgz",
-      "integrity": "sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA==",
+      "version": "20.17.19",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.19.tgz",
+      "integrity": "sha512-LEwC7o1ifqg/6r2gn9Dns0f1rhK+fPFDoMiceTJ6kWmVk6bgXBI/9IOWfVan4WiAavK9pIVWdX0/e3J+eEUh5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.19.2"
       }
     },
+    "node_modules/electron/node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
     },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-      "dev": true,
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "license": "BSD-2-Clause",
+      "peer": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/env-paths": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz",
-      "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.5",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.2",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.13"
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3332,60 +3639,106 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-iterator-helpers": {
-      "version": "1.0.15",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz",
-      "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
+      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "asynciterator.prototype": "^1.0.0",
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.1",
-        "es-set-tostringtag": "^2.0.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
-        "globalthis": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "iterator.prototype": "^1.1.2",
-        "safe-array-concat": "^1.0.1"
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.6",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "iterator.prototype": "^1.1.4",
+        "safe-array-concat": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
-      "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "has-tostringtag": "^1.0.0",
-        "hasown": "^2.0.0"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -3399,128 +3752,241 @@
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
-      "dev": true,
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",
+      "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
+        "@esbuild/aix-ppc64": "0.25.0",
+        "@esbuild/android-arm": "0.25.0",
+        "@esbuild/android-arm64": "0.25.0",
+        "@esbuild/android-x64": "0.25.0",
+        "@esbuild/darwin-arm64": "0.25.0",
+        "@esbuild/darwin-x64": "0.25.0",
+        "@esbuild/freebsd-arm64": "0.25.0",
+        "@esbuild/freebsd-x64": "0.25.0",
+        "@esbuild/linux-arm": "0.25.0",
+        "@esbuild/linux-arm64": "0.25.0",
+        "@esbuild/linux-ia32": "0.25.0",
+        "@esbuild/linux-loong64": "0.25.0",
+        "@esbuild/linux-mips64el": "0.25.0",
+        "@esbuild/linux-ppc64": "0.25.0",
+        "@esbuild/linux-riscv64": "0.25.0",
+        "@esbuild/linux-s390x": "0.25.0",
+        "@esbuild/linux-x64": "0.25.0",
+        "@esbuild/netbsd-arm64": "0.25.0",
+        "@esbuild/netbsd-x64": "0.25.0",
+        "@esbuild/openbsd-arm64": "0.25.0",
+        "@esbuild/openbsd-x64": "0.25.0",
+        "@esbuild/sunos-x64": "0.25.0",
+        "@esbuild/win32-arm64": "0.25.0",
+        "@esbuild/win32-ia32": "0.25.0",
+        "@esbuild/win32-x64": "0.25.0"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "9.20.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
+      "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.0",
+        "@eslint/core": "^0.11.0",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "9.20.0",
+        "@eslint/plugin-kit": "^0.2.5",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
+        "@humanwhocodes/retry": "^0.4.1",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint-plugin-internal-playwright": {
-      "resolved": "utils/eslint-plugin-internal-playwright",
-      "link": true
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
+      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.31.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
+      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rtsao/scc": "^1.1.0",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlastindex": "^1.2.5",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.12.0",
+        "hasown": "^2.0.2",
+        "is-core-module": "^2.15.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.8",
+        "object.groupby": "^1.0.3",
+        "object.values": "^1.2.0",
+        "semver": "^6.3.1",
+        "string.prototype.trimend": "^1.0.8",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
     },
     "node_modules/eslint-plugin-notice": {
-      "version": "0.9.10",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-notice/-/eslint-plugin-notice-0.9.10.tgz",
-      "integrity": "sha512-rF79EuqdJKu9hhTmwUkNeSvLmmq03m/NXq/NHwUENHbdJ0wtoyOjxZBhW4QCug8v5xYE6cGe3AWkGqSIe9KUbQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-notice/-/eslint-plugin-notice-1.0.0.tgz",
+      "integrity": "sha512-M3VLQMZzZpvfTZ/vy9FmClIKq5rLBbQpM0KgfLZPJPrVXpmJYeobmmb+lfJzHWdNm8PWwvw8KlafQWo2N9xx1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-root": "^1.1.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.21",
         "metric-lcs": "^0.1.2"
       },
       "peerDependencies": {
@@ -3528,317 +3994,281 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.33.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz",
-      "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
+      "version": "7.37.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
+      "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.3",
+        "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.12",
+        "es-iterator-helpers": "^1.2.1",
         "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.1",
         "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
+        "resolve": "^2.0.0-next.5",
         "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
+        "string.prototype.matchall": "^4.0.12",
+        "string.prototype.repeat": "^1.0.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz",
+      "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "esutils": "^2.0.2"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
+      "bin": {
+        "resolve": "bin/resolve"
       },
-      "engines": {
-        "node": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
+    "node_modules/esm-env": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
+      "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",
+      "license": "MIT"
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+    "node_modules/esrap": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.1.0.tgz",
+      "integrity": "sha512-yzmPNpl7TBbMRC5Lj2JlJZNPml0tzqoqP5B1JXycNUwtqma9AKCO0M2wHrdgsHcy1WRW7S9rJknAMtByg3usgA==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      }
     },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "estraverse": "^5.2.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/eventsource": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
+      "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "eventsource-parser": "^3.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
+    "node_modules/eventsource-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.3.tgz",
+      "integrity": "sha512-nVpZkTMM9rF6AQ9gPJpFsNAMt48wIzB5TQgiTLdHiuO8XEDhUgZEhqKlZWXbIzo9VmJ/HvysHqEaVeD5v9TPvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/express": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
+      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "^2.0.0",
+        "body-parser": "^2.2.0",
+        "content-disposition": "^1.0.0",
+        "content-type": "^1.0.5",
+        "cookie": "^0.7.1",
+        "cookie-signature": "^1.2.1",
+        "debug": "^4.4.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "etag": "^1.8.1",
+        "finalhandler": "^2.1.0",
+        "fresh": "^2.0.0",
+        "http-errors": "^2.0.0",
+        "merge-descriptors": "^2.0.0",
+        "mime-types": "^3.0.0",
+        "on-finished": "^2.4.1",
+        "once": "^1.4.0",
+        "parseurl": "^1.3.3",
+        "proxy-addr": "^2.0.7",
+        "qs": "^6.14.0",
+        "range-parser": "^1.2.1",
+        "router": "^2.2.0",
+        "send": "^1.1.0",
+        "serve-static": "^2.2.0",
+        "statuses": "^2.0.1",
+        "type-is": "^2.0.1",
+        "vary": "^1.1.2"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+        "node": ">= 18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+    "node_modules/express-rate-limit": {
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz",
+      "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==",
       "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 16"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
+        "url": "https://github.com/sponsors/express-rate-limit"
       },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estree-walker": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
-      "dependencies": {
-        "@types/estree": "^1.0.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "express": ">= 4.11"
       }
     },
     "node_modules/extract-zip": {
@@ -3846,6 +4276,7 @@
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
       "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
@@ -3865,19 +4296,21 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -3887,19 +4320,22 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -3909,20 +4345,36 @@
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pend": "~1.2.0"
       }
     },
+    "node_modules/fdir": {
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/fill-range": {
@@ -3930,6 +4382,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -3937,17 +4390,37 @@
         "node": ">=8"
       }
     },
+    "node_modules/finalhandler": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
+      "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "on-finished": "^2.4.1",
+        "parseurl": "^1.3.3",
+        "statuses": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/find-root": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
       "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -3960,32 +4433,40 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/formidable": {
@@ -3993,6 +4474,7 @@
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
       "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "dezalgo": "^1.0.4",
         "hexoid": "^1.0.0",
@@ -4003,11 +4485,32 @@
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
+      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/fs-extra": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
@@ -4017,23 +4520,19 @@
         "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/fs-readdir-recursive": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
-      "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
-      "dev": true
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -4047,20 +4546,24 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4074,6 +4577,7 @@
       "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -4082,6 +4586,7 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -4091,30 +4596,56 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz",
+      "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.0",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -4126,13 +4657,15 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4145,7 +4678,9 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -4166,6 +4701,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -4173,33 +4709,12 @@
         "node": ">= 6"
       }
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/global-agent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
       "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "optional": true,
       "dependencies": {
         "boolean": "^3.0.1",
@@ -4213,28 +4728,13 @@
         "node": ">=10.0"
       }
     },
-    "node_modules/global-agent/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/global-agent/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "dev": true,
+      "license": "ISC",
       "optional": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4242,28 +4742,24 @@
         "node": ">=10"
       }
     },
-    "node_modules/global-agent/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4272,42 +4768,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globby/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4318,6 +4786,7 @@
       "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
       "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@sindresorhus/is": "^4.0.0",
         "@szmarczak/http-timer": "^4.0.5",
@@ -4342,48 +4811,55 @@
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
     },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+    "node_modules/graphql": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.10.0.tgz",
+      "integrity": "sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+    "node_modules/graphql-tag": {
+      "version": "2.12.6",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "tslib": "^2.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+    "node_modules/graphql-tag/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/has-bigints": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4391,11 +4867,51 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4404,12 +4920,13 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4419,10 +4936,11 @@
       }
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -4435,6 +4953,7 @@
       "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
       "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4443,12 +4962,8 @@
       "version": "2.8.9",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
-    },
-    "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/html-reporter": {
       "resolved": "packages/html-reporter",
@@ -4458,13 +4973,42 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
       "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/http2-wrapper": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
       "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "quick-lru": "^5.1.1",
         "resolve-alpn": "^1.0.0"
@@ -4473,20 +5017,42 @@
         "node": ">=10.19.0"
       }
     },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -4503,6 +5069,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -4511,7 +5078,9 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -4521,43 +5090,64 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/internal-slot": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz",
-      "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-async-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz",
-      "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4567,12 +5157,16 @@
       }
     },
     "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4583,6 +5177,7 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -4591,13 +5186,14 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4611,6 +5207,7 @@
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4619,24 +5216,48 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4650,17 +5271,22 @@
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-finalizationregistry": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz",
-      "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -4671,17 +5297,22 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4695,6 +5326,7 @@
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -4703,19 +5335,11 @@
       }
     },
     "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4728,17 +5352,20 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4747,31 +5374,33 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
     "node_modules/is-reference": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz",
-      "integrity": "sha512-v3rht/LgVcsdZa3O2Nqs+NMowLOxeOm7Ay9+/ARQ2F+qEoANRcqrjAZKGN0v8ymUetZGgkp26LTnGT7H0Qo9Pg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
+      "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "*"
+        "@types/estree": "^1.0.6"
       }
     },
     "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4781,33 +5410,43 @@
       }
     },
     "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4817,12 +5456,15 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4832,12 +5474,13 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4847,79 +5490,95 @@
       }
     },
     "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-what": {
-      "version": "4.1.16",
-      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
-      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
       "engines": {
-        "node": ">=12.13"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/iterator.prototype": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz",
-      "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.2.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "reflect.getprototypeof": "^1.0.4",
-        "set-function-name": "^2.0.1"
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "get-proto": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -4928,51 +5587,58 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
       "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
       "dev": true,
+      "license": "ISC",
       "optional": true
     },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -4985,6 +5651,7 @@
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
+      "license": "MIT",
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -4994,6 +5661,7 @@
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
       "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.flat": "^1.3.1",
@@ -5009,6 +5677,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -5017,6 +5686,7 @@
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz",
       "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5026,6 +5696,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -5039,6 +5710,7 @@
       "resolved": "https://registry.npmjs.org/license-checker/-/license-checker-25.0.1.tgz",
       "integrity": "sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "chalk": "^2.4.1",
         "debug": "^3.1.0",
@@ -5055,34 +5727,116 @@
         "license-checker": "bin/license-checker"
       }
     },
+    "node_modules/license-checker/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/license-checker/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/license-checker/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/license-checker/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/license-checker/node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
+    "node_modules/license-checker/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/license-checker/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/license-checker/node_modules/semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
+    "node_modules/license-checker/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/locate-character": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
-      "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA=="
+      "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
+      "license": "MIT"
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -5097,19 +5851,22 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -5122,6 +5879,7 @@
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
       "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5130,41 +5888,18 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.5",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+      "version": "0.30.17",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/matcher": {
@@ -5172,6 +5907,7 @@
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
       "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "escape-string-regexp": "^4.0.0"
@@ -5180,36 +5916,37 @@
         "node": ">=10"
       }
     },
-    "node_modules/matcher/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "dev": true,
-      "optional": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
+    "node_modules/media-typer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "node_modules/merge-anything": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-5.1.7.tgz",
-      "integrity": "sha512-eRtbOb1N5iyH0tkQDAoQ4Ipsp/5qSR79Dzrz8hEPxRX10RWWR/iQXdoKmBSRCThY1Fh5EhISDtpSc93fpxUniQ==",
-      "dependencies": {
-        "is-what": "^4.1.8"
-      },
+    "node_modules/merge-descriptors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
+      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12.13"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/merge2": {
@@ -5217,6 +5954,7 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -5225,13 +5963,15 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/metric-lcs/-/metric-lcs-0.1.2.tgz",
       "integrity": "sha512-+TZ5dUDPKPJaU/rscTzxyN8ZkX7eAVLAiQU/e+YINleXPv03SCmJShaMT1If1liTH8OcmWXZs0CmzCBRBLcMpA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -5240,11 +5980,25 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/mime": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
       "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -5252,28 +6006,50 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
       "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "*"
       }
     },
     "node_modules/minimist": {
@@ -5281,15 +6057,24 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
       "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
       "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -5298,20 +6083,22 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -5323,18 +6110,31 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "license": "MIT"
     },
     "node_modules/node-stream-zip": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
       "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       },
@@ -5348,6 +6148,7 @@
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
       "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "abbrev": "1",
         "osenv": "^0.1.4"
@@ -5361,6 +6162,7 @@
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "hosted-git-info": "^2.1.4",
         "resolve": "^1.10.0",
@@ -5368,28 +6170,12 @@
         "validate-npm-package-license": "^3.0.1"
       }
     },
-    "node_modules/normalize-package-data/node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/normalize-package-data/node_modules/semver": {
       "version": "5.7.2",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -5399,6 +6185,7 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5408,6 +6195,7 @@
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5419,22 +6207,28 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -5444,19 +6238,23 @@
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -5467,28 +6265,31 @@
       }
     },
     "node_modules/object.entries": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz",
-      "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.fromentries": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
-      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5497,28 +6298,32 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz",
-      "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==",
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/object.values": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
-      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5527,27 +6332,42 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
         "levn": "^0.4.1",
         "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -5558,6 +6378,7 @@
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5567,6 +6388,7 @@
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5575,17 +6397,38 @@
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "deprecated": "This package is no longer supported.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
       }
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-cancelable": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
       "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5595,6 +6438,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -5610,6 +6454,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -5625,6 +6470,7 @@
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -5632,11 +6478,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5646,6 +6503,7 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5655,6 +6513,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5663,57 +6522,52 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+    "node_modules/path-to-regexp": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
       }
     },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
       "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
-    },
-    "node_modules/periscopic": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz",
-      "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==",
-      "dependencies": {
-        "@types/estree": "^1.0.0",
-        "estree-walker": "^3.0.0",
-        "is-reference": "^3.0.0"
-      }
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
     },
     "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+    "node_modules/pkce-challenge": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
+      "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=16.20.0"
       }
     },
     "node_modules/playwright": {
@@ -5736,10 +6590,20 @@
       "resolved": "packages/playwright-webkit",
       "link": true
     },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -5754,10 +6618,11 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -5768,30 +6633,17 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prettier": {
-      "version": "2.8.8",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
-      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-      "optional": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -5801,17 +6653,33 @@
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
         "react-is": "^16.13.1"
       }
     },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -5822,17 +6690,19 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -5859,13 +6729,15 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/quick-lru": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
       "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5873,11 +6745,38 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.6.3",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -5886,28 +6785,31 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "^18.3.1"
       }
     },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/react-refresh": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz",
-      "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5916,7 +6818,9 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz",
       "integrity": "sha512-O03wg/IYuV/VtnK2h/KXEt9VIbMUFbk3ERG0Iu4FhLZw0EP0T9znqrYDGn6ncbEsXUFaUjiVAWXHzxwt3lhRPQ==",
+      "deprecated": "This package is no longer supported.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "debuglog": "^1.0.1",
         "read-package-json": "^2.0.0",
@@ -5934,6 +6838,7 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
       "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
@@ -5942,7 +6847,9 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz",
       "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==",
+      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.1",
         "json-parse-even-better-errors": "^2.3.0",
@@ -5956,6 +6863,7 @@
       "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
       "deprecated": "This functionality has been moved to @npmcli/fs",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "debuglog": "^1.0.1",
         "dezalgo": "^1.0.0",
@@ -5968,6 +6876,7 @@
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -5975,22 +6884,38 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/readdirp/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/recorder": {
       "resolved": "packages/recorder",
       "link": true
     },
     "node_modules/reflect.getprototypeof": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz",
-      "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "globalthis": "^1.0.3",
-        "which-builtin-type": "^1.1.3"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6003,17 +6928,22 @@
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6027,23 +6957,28 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6052,13 +6987,15 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
       "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -6068,6 +7005,7 @@
       "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
       "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "lowercase-keys": "^2.0.0"
       },
@@ -6076,35 +7014,22 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/roarr": {
       "version": "2.15.4",
       "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
       "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "optional": true,
       "dependencies": {
         "boolean": "^3.0.1",
@@ -6119,11 +7044,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.0.tgz",
-      "integrity": "sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz",
+      "integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==",
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.7"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -6133,24 +7059,46 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.14.0",
-        "@rollup/rollup-android-arm64": "4.14.0",
-        "@rollup/rollup-darwin-arm64": "4.14.0",
-        "@rollup/rollup-darwin-x64": "4.14.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.14.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.14.0",
-        "@rollup/rollup-linux-arm64-musl": "4.14.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.14.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.14.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.14.0",
-        "@rollup/rollup-linux-x64-gnu": "4.14.0",
-        "@rollup/rollup-linux-x64-musl": "4.14.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.14.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.14.0",
-        "@rollup/rollup-win32-x64-msvc": "4.14.0",
+        "@rollup/rollup-android-arm-eabi": "4.40.1",
+        "@rollup/rollup-android-arm64": "4.40.1",
+        "@rollup/rollup-darwin-arm64": "4.40.1",
+        "@rollup/rollup-darwin-x64": "4.40.1",
+        "@rollup/rollup-freebsd-arm64": "4.40.1",
+        "@rollup/rollup-freebsd-x64": "4.40.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.40.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.40.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.40.1",
+        "@rollup/rollup-linux-arm64-musl": "4.40.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.40.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.40.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-musl": "4.40.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.40.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.40.1",
+        "@rollup/rollup-win32-x64-msvc": "4.40.1",
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/router": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
+      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "depd": "^2.0.0",
+        "is-promise": "^4.0.0",
+        "parseurl": "^1.3.3",
+        "path-to-regexp": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6170,6 +7118,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -6179,6 +7128,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
       "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^1.9.0"
       },
@@ -6187,14 +7137,16 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz",
-      "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -6204,21 +7156,54 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-array-concat/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz",
-      "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==",
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "get-intrinsic": "^1.2.2",
-        "is-regex": "^1.1.4"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6227,17 +7212,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/sax": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
-      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==",
-      "dev": true
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0"
       }
@@ -6246,6 +7240,7 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -6255,13 +7250,38 @@
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
       "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
+    "node_modules/send": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
+      "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.5",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "etag": "^1.8.1",
+        "fresh": "^2.0.0",
+        "http-errors": "^2.0.0",
+        "mime-types": "^3.0.1",
+        "ms": "^2.1.3",
+        "on-finished": "^2.4.1",
+        "range-parser": "^1.2.1",
+        "statuses": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/serialize-error": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
       "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "type-fest": "^0.13.1"
@@ -6273,60 +7293,84 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/seroval": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.4.tgz",
-      "integrity": "sha512-qQs/N+KfJu83rmszFQaTxcoJoPn6KNUruX4KmnmyD0oZkUoiNvJ1rpdYKDf4YHM05k+HOgCxa3yvf15QbVijGg==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/seroval-plugins": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.0.4.tgz",
-      "integrity": "sha512-DQ2IK6oQVvy8k+c2V5x5YCtUa/GGGsUwUBNN9UqohrZ0rWdUapBFpNMYP1bCyRHoxOJjdKGl+dieacFIpU/i1A==",
-      "engines": {
-        "node": ">=10"
+    "node_modules/serve-static": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
+      "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "parseurl": "^1.3.3",
+        "send": "^1.2.0"
       },
-      "peerDependencies": {
-        "seroval": "^1.0"
+      "engines": {
+        "node": ">= 18"
       }
     },
     "node_modules/set-function-length": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
-      "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.1.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.2",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.1"
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
+      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.0.1",
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
         "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -6339,85 +7383,110 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
       "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/solid-js": {
-      "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.11.tgz",
-      "integrity": "sha512-WdwmER+TwBJiN4rVQTVBxocg+9pKlOs41KzPYntrC86xO5sek8TzBYozPEZPL1IRWDouf2lMrvSbIs3CanlPvQ==",
+      "license": "MIT",
       "dependencies": {
-        "csstype": "^3.1.0",
-        "seroval": "^1.0.3",
-        "seroval-plugins": "^1.0.3"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/solid-refresh": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/solid-refresh/-/solid-refresh-0.6.3.tgz",
-      "integrity": "sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==",
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/types": "^7.23.6"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
-      "peerDependencies": {
-        "solid-js": "^1.3"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==",
+      "dev": true,
+      "license": "ISC",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==",
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz",
+      "integrity": "sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==",
       "dev": true
     },
     "node_modules/spdx-compare": {
@@ -6425,6 +7494,7 @@
       "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz",
       "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-find-index": "^1.0.2",
         "spdx-expression-parse": "^3.0.0",
@@ -6436,44 +7506,50 @@
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
       "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true,
+      "license": "CC-BY-3.0"
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
-      "dev": true
+      "version": "3.0.21",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+      "dev": true,
+      "license": "CC0-1.0"
     },
     "node_modules/spdx-ranges": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz",
       "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==",
-      "dev": true
+      "dev": true,
+      "license": "(MIT AND CC-BY-3.0)"
     },
     "node_modules/spdx-satisfies": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz",
       "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "spdx-compare": "^1.0.0",
         "spdx-expression-parse": "^3.0.0",
@@ -6485,19 +7561,32 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "optional": true
     },
     "node_modules/ssim.js": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/ssim.js/-/ssim.js-3.5.0.tgz",
       "integrity": "sha512-Aj6Jl2z6oDmgYFFbQqK7fght19bXdOxY7Tj03nF+03M9gCBAjeIiO8/PlEGMfKDwYpw4q6iBqVq2YuREorGg/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/statuses": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -6508,34 +7597,58 @@
       }
     },
     "node_modules/string.prototype.matchall": {
-      "version": "4.0.10",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz",
-      "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==",
+      "version": "4.0.12",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
+      "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "regexp.prototype.flags": "^1.5.0",
-        "set-function-name": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "regexp.prototype.flags": "^1.5.3",
+        "set-function-name": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6545,28 +7658,37 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
+      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -6577,6 +7699,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -6584,11 +7707,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -6601,6 +7735,7 @@
       "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
       "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "debug": "^4.1.0"
       },
@@ -6609,14 +7744,19 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -6624,6 +7764,7 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6632,52 +7773,44 @@
       }
     },
     "node_modules/svelte": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.9.tgz",
-      "integrity": "sha512-hsoB/WZGEPFXeRRLPhPrbRz67PhP6sqYgvwcAs+gWdSQSvNDw+/lTeUJSWe5h2xC97Fz/8QxAOqItwBzNJPU8w==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.15",
-        "@jridgewell/trace-mapping": "^0.3.18",
-        "@types/estree": "^1.0.1",
-        "acorn": "^8.9.0",
-        "aria-query": "^5.3.0",
-        "axobject-query": "^4.0.0",
-        "code-red": "^1.0.3",
-        "css-tree": "^2.3.1",
-        "estree-walker": "^3.0.3",
-        "is-reference": "^3.0.1",
+      "version": "5.37.3",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.37.3.tgz",
+      "integrity": "sha512-7t/ejshehHd+95z3Z7ebS7wsqHDQxi/8nBTuTRwpMgNegfRBfuitCSKTUDKIBOExqfT2+DhQ2VLG8Xn+cBXoaQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.3.0",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@sveltejs/acorn-typescript": "^1.0.5",
+        "@types/estree": "^1.0.5",
+        "acorn": "^8.12.1",
+        "aria-query": "^5.3.1",
+        "axobject-query": "^4.1.0",
+        "clsx": "^2.1.1",
+        "esm-env": "^1.2.1",
+        "esrap": "^2.1.0",
+        "is-reference": "^3.0.3",
         "locate-character": "^3.0.0",
-        "magic-string": "^0.30.4",
-        "periscopic": "^3.1.0"
+        "magic-string": "^0.30.11",
+        "zimmerframe": "^1.1.2"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       }
     },
-    "node_modules/svelte-hmr": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz",
-      "integrity": "sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==",
-      "engines": {
-        "node": "^12.20 || ^14.13.1 || >= 16"
+    "node_modules/tinyglobby": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2"
       },
-      "peerDependencies": {
-        "svelte": "^3.19.0 || ^4.0.0"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "engines": {
-        "node": ">=4"
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
     "node_modules/to-regex-range": {
@@ -6685,6 +7818,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -6692,6 +7826,16 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/trace-viewer": {
       "resolved": "packages/trace-viewer",
       "link": true
@@ -6701,6 +7845,7 @@
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "tree-kill": "cli.js"
       }
@@ -6710,33 +7855,63 @@
       "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz",
       "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
+      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
+      }
+    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
     "node_modules/tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
+      "dev": true,
+      "license": "0BSD"
     },
     "node_modules/tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
       }
@@ -6746,6 +7921,7 @@
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -6758,6 +7934,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
       "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "optional": true,
       "engines": {
         "node": ">=10"
@@ -6766,30 +7943,48 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/type-is": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
+      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "content-type": "^1.0.5",
+        "media-typer": "^1.1.0",
+        "mime-types": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6799,16 +7994,19 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6818,24 +8016,32 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -6845,25 +8051,30 @@
       }
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/undici": {
-      "version": "5.28.4",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
-      "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },
@@ -6875,21 +8086,40 @@
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "devOptional": true
+      "devOptional": true,
+      "license": "MIT"
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
+      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
       "funding": [
         {
           "type": "opencollective",
@@ -6904,9 +8134,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -6917,488 +8148,128 @@
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/util-extend": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
-      "dev": true
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/validate-html-nesting": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/validate-html-nesting/-/validate-html-nesting-1.2.2.tgz",
-      "integrity": "sha512-hGdgQozCsQJMyfK5urgFcWEqsSSrK63Awe0t/IMR0bZ0QMtnuaiHzThW81guu3qx9abLi99NEuiaN6P9gVYsNg=="
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/vite": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz",
-      "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==",
-      "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite-plugin-solid": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/vite-plugin-solid/-/vite-plugin-solid-2.8.2.tgz",
-      "integrity": "sha512-HcvMs6DTxBaO4kE3psnirPQBCUUdYeQkCNKuB2TpEkJsxb6BGP6/7qkbbCSMxn25PyNdjvzVi1WXi0ou8KPgHw==",
-      "dependencies": {
-        "@babel/core": "^7.23.3",
-        "@babel/preset-typescript": "^7.23.3",
-        "@types/babel__core": "^7.20.4",
-        "babel-preset-solid": "^1.8.4",
-        "merge-anything": "^5.1.7",
-        "solid-refresh": "^0.6.3",
-        "vitefu": "^0.2.5"
-      },
-      "peerDependencies": {
-        "solid-js": "^1.7.2",
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
       }
     },
-    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/util-extend": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
+      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/vite/node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/vite/node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
-      "hasInstallScript": true,
+    "node_modules/vite": {
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+      "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
+      },
       "bin": {
-        "esbuild": "bin/esbuild"
+        "vite": "bin/vite.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
       }
     },
     "node_modules/vitefu": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz",
-      "integrity": "sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.1.tgz",
+      "integrity": "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==",
+      "license": "MIT",
+      "workspaces": [
+        "tests/deps/*",
+        "tests/projects/*",
+        "tests/projects/workspace/packages/*"
+      ],
       "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0"
       },
       "peerDependenciesMeta": {
         "vite": {
@@ -7407,16 +8278,17 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.4.15",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz",
-      "integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==",
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
+      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.4.15",
-        "@vue/compiler-sfc": "3.4.15",
-        "@vue/runtime-dom": "3.4.15",
-        "@vue/server-renderer": "3.4.15",
-        "@vue/shared": "3.4.15"
+        "@vue/compiler-dom": "3.5.13",
+        "@vue/compiler-sfc": "3.5.13",
+        "@vue/runtime-dom": "3.5.13",
+        "@vue/server-renderer": "3.5.13",
+        "@vue/shared": "3.5.13"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -7436,6 +8308,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -7447,39 +8320,45 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-builtin-type": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz",
-      "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "function.prototype.name": "^1.1.5",
-        "has-tostringtag": "^1.0.0",
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
         "is-async-function": "^2.0.0",
-        "is-date-object": "^1.0.5",
-        "is-finalizationregistry": "^1.0.2",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
         "is-generator-function": "^1.0.10",
-        "is-regex": "^1.1.4",
+        "is-regex": "^1.2.1",
         "is-weakref": "^1.0.2",
         "isarray": "^2.0.5",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.9"
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7488,38 +8367,38 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-builtin-type/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
     "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
-      "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7528,11 +8407,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -7545,50 +8435,19 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.18.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
+      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -7610,6 +8469,7 @@
       "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
       "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -7623,6 +8483,7 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       }
@@ -7630,12 +8491,16 @@
     "node_modules/xterm": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
-      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg==",
+      "deprecated": "This package is now deprecated. Move to @xterm/xterm instead.",
+      "license": "MIT"
     },
     "node_modules/xterm-addon-fit": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.7.0.tgz",
       "integrity": "sha512-tQgHGoHqRTgeROPnvmtEJywLKoC/V9eNs4bLLz7iyJr1aW/QFzRwfd3MGiJ6odJd9xEfxcW36/xRU47JkD5NKQ==",
+      "deprecated": "This package is now deprecated. Move to @xterm/addon-fit instead.",
+      "license": "MIT",
       "peerDependencies": {
         "xterm": "^5.0.0"
       }
@@ -7645,6 +8510,7 @@
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -7652,13 +8518,17 @@
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "license": "ISC"
     },
     "node_modules/yaml": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
-      "dev": true,
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }
@@ -7668,6 +8538,7 @@
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -7686,6 +8557,7 @@
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
@@ -7695,6 +8567,7 @@
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
@@ -7705,6 +8578,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7712,17 +8586,40 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "packages/html-reporter": {
-      "version": "0.0.0",
-      "dependencies": {
-        "ansi-to-html": "^0.7.2"
+    "node_modules/zimmerframe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.2.tgz",
+      "integrity": "sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==",
+      "license": "MIT"
+    },
+    "node_modules/zod": {
+      "version": "3.24.2",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.2.tgz",
+      "integrity": "sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-to-json-schema": {
+      "version": "3.24.6",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz",
+      "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==",
+      "dev": true,
+      "license": "ISC",
+      "peerDependencies": {
+        "zod": "^3.24.1"
       }
     },
+    "packages/html-reporter": {
+      "version": "0.0.0"
+    },
     "packages/playwright": {
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "playwright-core": "1.55.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -7736,11 +8633,11 @@
     },
     "packages/playwright-browser-chromium": {
       "name": "@playwright/browser-chromium",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "playwright-core": "1.55.1"
       },
       "engines": {
         "node": ">=18"
@@ -7748,11 +8645,11 @@
     },
     "packages/playwright-browser-firefox": {
       "name": "@playwright/browser-firefox",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "playwright-core": "1.55.1"
       },
       "engines": {
         "node": ">=18"
@@ -7760,22 +8657,22 @@
     },
     "packages/playwright-browser-webkit": {
       "name": "@playwright/browser-webkit",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "playwright-core": "1.55.1"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "packages/playwright-chromium": {
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "playwright-core": "1.55.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -7784,8 +8681,19 @@
         "node": ">=18"
       }
     },
+    "packages/playwright-client": {
+      "name": "@playwright/client",
+      "version": "0.0.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.55.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "packages/playwright-core": {
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
@@ -7796,12 +8704,12 @@
     },
     "packages/playwright-ct-core": {
       "name": "@playwright/experimental-ct-core",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.46.0-next",
-        "playwright-core": "1.46.0-next",
-        "vite": "^5.2.8"
+        "playwright": "1.55.1",
+        "playwright-core": "1.55.1",
+        "vite": "^6.3.4"
       },
       "engines": {
         "node": ">=18"
@@ -7809,10 +8717,10 @@
     },
     "packages/playwright-ct-react": {
       "name": "@playwright/experimental-ct-react",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.0-next",
+        "@playwright/experimental-ct-core": "1.55.1",
         "@vitejs/plugin-react": "^4.2.1"
       },
       "bin": {
@@ -7824,10 +8732,10 @@
     },
     "packages/playwright-ct-react17": {
       "name": "@playwright/experimental-ct-react17",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.0-next",
+        "@playwright/experimental-ct-core": "1.55.1",
         "@vitejs/plugin-react": "^4.2.1"
       },
       "bin": {
@@ -7837,49 +8745,69 @@
         "node": ">=18"
       }
     },
-    "packages/playwright-ct-solid": {
-      "name": "@playwright/experimental-ct-solid",
-      "version": "1.46.0-next",
+    "packages/playwright-ct-svelte": {
+      "name": "@playwright/experimental-ct-svelte",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.0-next",
-        "vite-plugin-solid": "^2.7.0"
+        "@playwright/experimental-ct-core": "1.55.1",
+        "@sveltejs/vite-plugin-svelte": "^5.1.0"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "devDependencies": {
-        "solid-js": "^1.7.0"
+        "svelte": "^5.37.3"
       },
       "engines": {
         "node": ">=18"
       }
     },
-    "packages/playwright-ct-svelte": {
-      "name": "@playwright/experimental-ct-svelte",
-      "version": "1.46.0-next",
-      "license": "Apache-2.0",
+    "packages/playwright-ct-svelte/node_modules/@sveltejs/vite-plugin-svelte": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-5.1.1.tgz",
+      "integrity": "sha512-Y1Cs7hhTc+a5E9Va/xwKlAJoariQyHY+5zBgCZg4PFWNYQ1nMN9sjK1zhw1gK69DuqVP++sht/1GZg1aRwmAXQ==",
+      "license": "MIT",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.0-next",
-        "@sveltejs/vite-plugin-svelte": "^3.0.1"
+        "@sveltejs/vite-plugin-svelte-inspector": "^4.0.1",
+        "debug": "^4.4.1",
+        "deepmerge": "^4.3.1",
+        "kleur": "^4.1.5",
+        "magic-string": "^0.30.17",
+        "vitefu": "^1.0.6"
       },
-      "bin": {
-        "playwright": "cli.js"
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22"
       },
-      "devDependencies": {
-        "svelte": "^4.2.8"
+      "peerDependencies": {
+        "svelte": "^5.0.0",
+        "vite": "^6.0.0"
+      }
+    },
+    "packages/playwright-ct-svelte/node_modules/@sveltejs/vite-plugin-svelte-inspector": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-4.0.1.tgz",
+      "integrity": "sha512-J/Nmb2Q2y7mck2hyCX4ckVHcR5tu2J+MtBEQqpDrrgELZ2uvraQcK/ioCV61AqkdXFgriksOKIceDcQmqnGhVw==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.7"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^18.0.0 || ^20.0.0 || >=22"
+      },
+      "peerDependencies": {
+        "@sveltejs/vite-plugin-svelte": "^5.0.0",
+        "svelte": "^5.0.0",
+        "vite": "^6.0.0"
       }
     },
     "packages/playwright-ct-vue": {
       "name": "@playwright/experimental-ct-vue",
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.0-next",
-        "@vitejs/plugin-vue": "^4.2.1"
+        "@playwright/experimental-ct-core": "1.55.1",
+        "@vitejs/plugin-vue": "^5.2.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -7888,93 +8816,118 @@
         "node": ">=18"
       }
     },
-    "packages/playwright-ct-vue2": {
-      "name": "@playwright/experimental-ct-vue2",
-      "version": "1.46.0-next",
+    "packages/playwright-firefox": {
+      "version": "1.55.1",
+      "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@playwright/experimental-ct-core": "1.46.0-next",
-        "@vitejs/plugin-vue2": "^2.2.0"
+        "playwright-core": "1.55.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
-      "devDependencies": {
-        "vue": "^2.7.14"
-      },
       "engines": {
         "node": ">=18"
       }
     },
-    "packages/playwright-ct-vue2/node_modules/@vitejs/plugin-vue2": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue2/-/plugin-vue2-2.3.1.tgz",
-      "integrity": "sha512-/ksaaz2SRLN11JQhLdEUhDzOn909WEk99q9t9w+N12GjQCljzv7GyvAbD/p20aBUjHkvpGOoQ+FCOkG+mjDF4A==",
-      "engines": {
-        "node": "^14.18.0 || >= 16.0.0"
+    "packages/playwright-mcp": {
+      "name": "@playwright/mcp",
+      "version": "1.52.0-next",
+      "extraneous": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@modelcontextprotocol/sdk": "^1.6.1",
+        "commander": "^13.1.0",
+        "playwright": "1.52.0-next",
+        "zod-to-json-schema": "^3.24.4"
       },
-      "peerDependencies": {
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0",
-        "vue": "^2.7.0-0"
+      "bin": {
+        "mcp": "cli.js"
+      },
+      "devDependencies": {
+        "@types/node": "^22.13.10"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "packages/playwright-ct-vue2/node_modules/@vue/compiler-sfc": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
-      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
+    "packages/playwright-mdd": {
+      "name": "@playwright/mdd",
+      "version": "0.0.1",
+      "extraneous": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@babel/parser": "^7.23.5",
-        "postcss": "^8.4.14",
-        "source-map": "^0.6.1"
+        "commander": "^13.1.0",
+        "debug": "^4.4.1",
+        "dotenv": "^16.5.0",
+        "mime": "^4.0.7",
+        "openai": "^5.7.0",
+        "playwright-core": "1.55.0-next",
+        "zod-to-json-schema": "^3.24.4"
       },
-      "optionalDependencies": {
-        "prettier": "^1.18.2 || ^2.0.0"
+      "bin": {
+        "playwright-mdd": "cli.js"
+      },
+      "devDependencies": {
+        "@types/debug": "^4.1.7"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "packages/playwright-ct-vue2/node_modules/vue": {
-      "version": "2.7.16",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
-      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
-      "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
+    "packages/playwright-test": {
+      "name": "@playwright/test",
+      "version": "1.55.1",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@vue/compiler-sfc": "2.7.16",
-        "csstype": "^3.1.0"
+        "playwright": "1.55.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "packages/playwright-firefox": {
-      "version": "1.46.0-next",
-      "hasInstallScript": true,
+    "packages/playwright-test-mcp": {
+      "name": "@playwright/test-runner-mcp",
+      "version": "0.0.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "commander": "^13.1.0",
+        "playwright": "1.55.1",
+        "playwright-core": "1.55.1"
       },
       "bin": {
-        "playwright": "cli.js"
+        "mcp-server-playwright-test": "cli.js"
       },
       "engines": {
         "node": ">=18"
       }
     },
-    "packages/playwright-test": {
-      "name": "@playwright/test",
-      "version": "1.46.0-next",
+    "packages/playwright-tools": {
+      "name": "@playwright/experimental-tools",
+      "version": "0.0.0",
+      "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.46.0-next"
+        "playwright": "1.52.0-next"
       },
-      "bin": {
-        "playwright": "cli.js"
+      "devDependencies": {
+        "@anthropic-ai/sdk": "^0.33.1",
+        "@modelcontextprotocol/sdk": "^1.6.1",
+        "openai": "^4.79.1"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "packages/playwright-webkit": {
-      "version": "1.46.0-next",
+      "version": "1.55.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.46.0-next"
+        "playwright-core": "1.55.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -7988,6 +8941,7 @@
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -7997,22 +8951,24 @@
       }
     },
     "packages/recorder": {
-      "version": "0.0.0"
+      "version": "0.0.0",
+      "dependencies": {
+        "yaml": "^2.6.0"
+      }
     },
     "packages/trace-viewer": {
-      "version": "0.0.0"
+      "version": "0.0.0",
+      "dependencies": {
+        "yaml": "^2.6.0"
+      }
     },
     "packages/web": {
       "version": "0.0.0",
       "dependencies": {
-        "codemirror-shadow-1": "0.0.1",
+        "codemirror": "5.65.18",
         "xterm": "^5.1.0",
         "xterm-addon-fit": "^0.7.0"
       }
-    },
-    "utils/eslint-plugin-internal-playwright": {
-      "version": "0.0.1",
-      "dev": true
     }
   }
 }
diff --git a/package.json b/package.json
index 71be4bf8c79b0..6f9ce696e6010 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "playwright-internal",
   "private": true,
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -24,19 +24,19 @@
     "webview2test": "playwright test --config=tests/webview2/playwright.config.ts",
     "itest": "playwright test --config=tests/installation/playwright.config.ts",
     "stest": "playwright test --config=tests/stress/playwright.config.ts",
+    "biditest": "playwright test --config=tests/bidi/playwright.config.ts",
     "test-html-reporter": "playwright test --config=packages/html-reporter",
     "test-web": "playwright test --config=packages/web",
     "ttest": "node ./tests/playwright-test/stable-test-runner/node_modules/@playwright/test/cli test --config=tests/playwright-test/playwright.config.ts",
     "ct": "playwright test tests/components/test-all.spec.js --reporter=list",
     "test": "playwright test --config=tests/library/playwright.config.ts",
-    "eslint": "eslint --cache --report-unused-disable-directives --ext ts,tsx,js,jsx,mjs .",
+    "eslint": "eslint --cache",
     "tsc": "tsc -p . && tsc -p packages/html-reporter/",
-    "build-installer": "babel -s --extensions \".ts\" --out-dir packages/playwright-core/lib/utils/ packages/playwright-core/src/utils",
     "doc": "node utils/doclint/cli.js",
     "lint": "npm run eslint && npm run tsc && npm run doc && npm run check-deps && node utils/generate_channels.js && node utils/generate_types/ && npm run lint-tests && npm run test-types && npm run lint-packages",
     "lint-packages": "node utils/workspace.js --ensure-consistent",
     "lint-tests": "node utils/lint_tests.js",
-    "flint": "concurrently \"npm run eslint\" \"npm run tsc\" \"npm run doc\" \"npm run check-deps\" \"node utils/generate_channels.js\" \"node utils/generate_types/\" \"npm run lint-tests\" \"npm run test-types\" \"npm run lint-packages\"",
+    "flint": "concurrently \"npm run eslint\" \"npm run tsc\" \"npm run doc\" \"npm run check-deps\" \"node utils/generate_channels.js\" \"node utils/generate_types/\" \"npm run lint-tests\" \"npm run test-types\" \"npm run lint-packages\" \"node utils/doclint/linting-code-snippets/cli.js --js-only\"",
     "clean": "node utils/build/clean.js",
     "build": "node utils/build/build.js",
     "watch": "node utils/build/build.js --watch --lint",
@@ -51,53 +51,54 @@
   ],
   "devDependencies": {
     "@actions/core": "^1.10.0",
-    "@babel/cli": "^7.23.4",
-    "@babel/code-frame": "^7.23.5",
-    "@babel/plugin-transform-class-properties": "^7.23.3",
-    "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-    "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-    "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-    "@babel/plugin-transform-optional-chaining": "^7.23.4",
-    "@babel/plugin-transform-typescript": "^7.23.6",
-    "@babel/preset-react": "^7.23.3",
-    "@types/babel__core": "^7.20.2",
+    "@actions/github": "^6.0.0",
+    "@babel/code-frame": "^7.26.2",
+    "@eslint/compat": "^1.2.6",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.19.0",
+    "@modelcontextprotocol/sdk": "^1.17.3",
+    "@octokit/graphql-schema": "^15.26.0",
+    "@stylistic/eslint-plugin": "^3.0.1",
     "@types/codemirror": "^5.60.7",
     "@types/formidable": "^2.0.4",
-    "@types/node": "^18.19.39",
+    "@types/immutable": "^3.8.7",
+    "@types/node": "^18.19.68",
     "@types/react": "^18.0.12",
     "@types/react-dom": "^18.0.5",
     "@types/ws": "^8.5.3",
     "@types/xml2js": "^0.4.9",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
-    "@typescript-eslint/utils": "^7.15.0",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
+    "@typescript-eslint/utils": "^8.26.1",
     "@vitejs/plugin-basic-ssl": "^1.1.0",
     "@vitejs/plugin-react": "^4.2.1",
     "@zip.js/zip.js": "^2.7.29",
+    "ansi-styles": "^4.3.0",
     "chokidar": "^3.5.3",
+    "chromium-bidi": "^7.2.0",
     "colors": "^1.4.0",
     "concurrently": "^6.2.1",
     "cross-env": "^7.0.3",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.4.5",
     "electron": "^30.1.2",
-    "esbuild": "^0.18.11",
-    "eslint": "^8.55.0",
-    "eslint-plugin-internal-playwright": "file:utils/eslint-plugin-internal-playwright",
-    "eslint-plugin-notice": "^0.9.10",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.3.0",
+    "esbuild": "^0.25.0",
+    "eslint": "^9.19.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-notice": "^1.0.0",
+    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react-hooks": "^5.1.0",
     "formidable": "^2.1.1",
+    "immutable": "^4.3.7",
     "license-checker": "^25.0.1",
     "mime": "^3.0.0",
     "node-stream-zip": "^1.15.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "ssim.js": "^3.5.0",
-    "typescript": "^5.5.3",
-    "vite": "^5.0.13",
+    "typescript": "^5.8.2",
+    "vite": "^6.3.4",
     "ws": "^8.17.1",
     "xml2js": "^0.5.0",
-    "yaml": "^2.2.2"
+    "yaml": "2.6.0"
   }
 }
diff --git a/packages/.eslintrc.js b/packages/.eslintrc.js
deleted file mode 100644
index 54c58ce323b5d..0000000000000
--- a/packages/.eslintrc.js
+++ /dev/null
@@ -1,21 +0,0 @@
-module.exports = {
-  "extends": "../.eslintrc.js",
-  /**
-   * ESLint rules
-   *
-   * All available rules: http://eslint.org/docs/rules/
-   *
-   * Rules take the following form:
-   *   "rule-name", [severity, { opts }]
-   * Severity: 2 == error, 1 == warning, 0 == off.
-   */
-  "rules": {
-    "no-console": 2,
-    "no-debugger": 2,
-    "no-restricted-properties": [2, {
-      "object": "process",
-      "property": "exit",
-      "message": "Please use gracefullyProcessExitDoNotHang function to exit the process.",
-    }],
-  }
-};
diff --git a/packages/html-reporter/bundle.ts b/packages/html-reporter/bundle.ts
index 7dd1c651e1d56..63530cfaad783 100644
--- a/packages/html-reporter/bundle.ts
+++ b/packages/html-reporter/bundle.ts
@@ -30,10 +30,10 @@ export function bundle(): Plugin {
         if (!ctx || !ctx.bundle)
           return html;
         html = html.replace(/(?=<!--)([\s\S]*?)-->/, '');
-        for (const [name, value] of Object.entries(ctx.bundle) as any) {
+        for (const [name, value] of Object.entries(ctx.bundle)) {
           if (name.endsWith('.map'))
             continue;
-          if (value.code)
+          if ('code' in value)
             html = html.replace(/<script type="module".*<\/script>/, () => `<script type="module">${value.code}</script>`);
           else
             html = html.replace(/<link rel="stylesheet"[^>]*>/, () => `<style type='text/css'>${value.source}</style>`);
@@ -51,4 +51,4 @@ export function bundle(): Plugin {
       }
     },
   };
-}
\ No newline at end of file
+}
diff --git a/packages/html-reporter/index.html b/packages/html-reporter/index.html
index 054507220c9e8..54ab833d2b4c8 100644
--- a/packages/html-reporter/index.html
+++ b/packages/html-reporter/index.html
@@ -15,7 +15,7 @@
 -->
 
 <!DOCTYPE html>
-<html>
+<html style='scrollbar-gutter: stable both-edges;'>
   <head>
     <meta charset='UTF-8'>
     <meta name='color-scheme' content='dark light'>
diff --git a/packages/html-reporter/package.json b/packages/html-reporter/package.json
index bdd0485a07524..0b5ad5fb24b7a 100644
--- a/packages/html-reporter/package.json
+++ b/packages/html-reporter/package.json
@@ -2,13 +2,5 @@
   "name": "html-reporter",
   "private": true,
   "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build && tsc",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "ansi-to-html": "^0.7.2"
-  }
+  "type": "module"
 }
diff --git a/packages/html-reporter/playwright.config.ts b/packages/html-reporter/playwright.config.ts
index 1e6cb8b8a3c74..1f849f807eae1 100644
--- a/packages/html-reporter/playwright.config.ts
+++ b/packages/html-reporter/playwright.config.ts
@@ -23,7 +23,11 @@ export default defineConfig({
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   snapshotPathTemplate: '{testDir}/__screenshots__/{projectName}/{testFilePath}/{arg}{ext}',
-  reporter: process.env.CI ? 'blob' : 'html',
+  reporter: process.env.CI ? [
+    ['blob', { fileName: `${process.env.PWTEST_BOT_NAME}.zip` }],
+  ] : [
+    ['html']
+  ],
   use: {
     ctPort: 3101,
     ctViteConfig: {
diff --git a/packages/html-reporter/src/chip.css b/packages/html-reporter/src/chip.css
index 1b40275166d7b..66d1ea3d9dae0 100644
--- a/packages/html-reporter/src/chip.css
+++ b/packages/html-reporter/src/chip.css
@@ -27,6 +27,11 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  user-select: none;
+}
+
+.chip-header-allow-selection {
+  user-select: text;
 }
 
 .chip-header.expanded-false {
diff --git a/packages/html-reporter/src/chip.spec.tsx b/packages/html-reporter/src/chip.spec.tsx
index 3a0cfe908ad41..8c88fee071c95 100644
--- a/packages/html-reporter/src/chip.spec.tsx
+++ b/packages/html-reporter/src/chip.spec.tsx
@@ -48,3 +48,14 @@ test('setExpanded is called', async ({ mount }) => {
   await component.getByText('Title').click();
   expect(expandedValues).toEqual([true]);
 });
+
+test('setExpanded should work', async ({ mount }) => {
+  const component = await mount(<AutoChip header='Title' initialExpanded={false}>
+    Body
+  </AutoChip>);
+  await component.getByText('Title').click();
+  await expect(component).toMatchAriaSnapshot(`
+    - button "Title" [expanded]
+    - region: Body
+  `);
+});
diff --git a/packages/html-reporter/src/chip.tsx b/packages/html-reporter/src/chip.tsx
index d236141475e06..cdd07777a67f7 100644
--- a/packages/html-reporter/src/chip.tsx
+++ b/packages/html-reporter/src/chip.tsx
@@ -19,6 +19,8 @@ import './chip.css';
 import './colors.css';
 import './common.css';
 import * as icons from './icons';
+import { clsx } from '@web/uiUtils';
+import { type AnchorID, useAnchor } from './links';
 
 export const Chip: React.FC<{
   header: JSX.Element | string,
@@ -27,18 +29,21 @@ export const Chip: React.FC<{
   setExpanded?: (expanded: boolean) => void,
   children?: any,
   dataTestId?: string,
-  targetRef?: React.RefObject<HTMLDivElement>,
-}> = ({ header, expanded, setExpanded, children, noInsets, dataTestId, targetRef }) => {
-  return <div className='chip' data-testid={dataTestId} ref={targetRef}>
+}> = ({ header, expanded, setExpanded, children, noInsets, dataTestId }) => {
+  const id = React.useId();
+  return <div className='chip' data-testid={dataTestId}>
     <div
-      className={'chip-header' + (setExpanded ? ' expanded-' + expanded : '')}
+      role='button'
+      aria-expanded={!!expanded}
+      aria-controls={id}
+      className={clsx('chip-header', setExpanded && ' expanded-' + expanded)}
       onClick={() => setExpanded?.(!expanded)}
       title={typeof header === 'string' ? header : undefined}>
       {setExpanded && !!expanded && icons.downArrow()}
       {setExpanded && !expanded && icons.rightArrow()}
       {header}
     </div>
-    {(!setExpanded || expanded) && <div className={'chip-body' + (noInsets ? ' chip-body-no-insets' : '')}>{children}</div>}
+    {(!setExpanded || expanded) && <div id={id} role='region' className={clsx('chip-body', noInsets && 'chip-body-no-insets')}>{children}</div>}
   </div>;
 };
 
@@ -48,16 +53,17 @@ export const AutoChip: React.FC<{
   noInsets?: boolean,
   children?: any,
   dataTestId?: string,
-  targetRef?: React.RefObject<HTMLDivElement>,
-}> = ({ header, initialExpanded, noInsets, children, dataTestId, targetRef }) => {
-  const [expanded, setExpanded] = React.useState(initialExpanded || initialExpanded === undefined);
+  revealOnAnchorId?: AnchorID,
+}> = ({ header, initialExpanded, noInsets, children, dataTestId, revealOnAnchorId }) => {
+  const [expanded, setExpanded] = React.useState(initialExpanded ?? true);
+  const onReveal = React.useCallback(() => setExpanded(true), []);
+  useAnchor(revealOnAnchorId, onReveal);
   return <Chip
     header={header}
     expanded={expanded}
     setExpanded={setExpanded}
     noInsets={noInsets}
     dataTestId={dataTestId}
-    targetRef={targetRef}
   >
     {children}
   </Chip>;
diff --git a/packages/html-reporter/src/common.css b/packages/html-reporter/src/common.css
index 02e01a103bcc2..dc3323d29ffb9 100644
--- a/packages/html-reporter/src/common.css
+++ b/packages/html-reporter/src/common.css
@@ -46,6 +46,10 @@ svg {
   position: relative;
 }
 
+.hidden {
+  visibility: hidden;
+}
+
 .d-flex {
   display: flex !important;
 }
@@ -199,11 +203,12 @@ article, aside, details, figcaption, figure, footer, header, main, menu, nav, se
   flex: none;
   position: relative;
   float: left;
-  padding: 5px 10px;
+  padding: 5px 8px;
   font-weight: 500;
   line-height: 20px;
   color: var(--color-fg-default);
   border: 1px solid var(--color-border-default);
+  user-select: none;
 }
 
 .subnav-item:hover {
@@ -224,6 +229,14 @@ article, aside, details, figcaption, figure, footer, header, main, menu, nav, se
   margin-left: -1px;
 }
 
+.subnav-item .octicon {
+  margin-right: 8px;
+}
+
+.subnav-item-label {
+  margin-right: 8px;
+}
+
 .counter {
   display: inline-block;
   min-width: 20px;
@@ -263,13 +276,32 @@ article, aside, details, figcaption, figure, footer, header, main, menu, nav, se
   flex: none;
 }
 
+.button {
+  flex: none;
+  height: 24px;
+  border: 1px solid var(--color-btn-border);
+  outline: none;
+  color: var(--color-btn-text);
+  background: var(--color-btn-bg);
+  padding: 4px;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+}
+
+.button:not(:disabled):hover {
+  border-color: var(--color-btn-hover-border);
+  background-color: var(--color-btn-hover-bg);
+}
+
 @media only screen and (max-width: 600px) {
   .subnav-item, .form-control {
     border-radius: 0 !important;
   }
 
   .subnav-item {
-    padding: 5px 3px;
     border: none;
   }
 
diff --git a/packages/html-reporter/src/copyToClipboard.css b/packages/html-reporter/src/copyToClipboard.css
index 5790b626c0388..818100fff7e67 100644
--- a/packages/html-reporter/src/copyToClipboard.css
+++ b/packages/html-reporter/src/copyToClipboard.css
@@ -20,15 +20,31 @@
   width: 24px;
   border: none;
   outline: none;
-  color: var(--color-fg-default);
+  color: var(--color-fg-muted);
   background: transparent;
   padding: 4px;
   cursor: pointer;
   display: inline-flex;
   align-items: center;
+  justify-content: center;
   border-radius: 4px;
 }
 
+.copy-icon svg {
+  margin: 0;
+}
+
 .copy-icon:not(:disabled):hover {
   background-color: var(--color-border-default);
 }
+
+.copy-button-container {
+  visibility: hidden;
+  display: inline-flex;
+  margin-left: 8px;
+  vertical-align: bottom;
+}
+
+.copy-value-container:hover .copy-button-container {
+  visibility: visible;
+}
diff --git a/packages/html-reporter/src/copyToClipboard.tsx b/packages/html-reporter/src/copyToClipboard.tsx
index a24015a67125d..8171cdd6c3205 100644
--- a/packages/html-reporter/src/copyToClipboard.tsx
+++ b/packages/html-reporter/src/copyToClipboard.tsx
@@ -18,9 +18,14 @@ import * as React from 'react';
 import * as icons from './icons';
 import './copyToClipboard.css';
 
-export const CopyToClipboard: React.FunctionComponent<{
-  value: string,
-}> = ({ value }) => {
+type CopyToClipboardProps = {
+  value: string;
+};
+
+/**
+ * A copy to clipboard button.
+ */
+export const CopyToClipboard: React.FunctionComponent<CopyToClipboardProps> = ({ value }) => {
   type IconType = 'copy' | 'check' | 'cross';
   const [icon, setIcon] = React.useState<IconType>('copy');
   const handleCopy = React.useCallback(() => {
@@ -34,5 +39,21 @@ export const CopyToClipboard: React.FunctionComponent<{
     });
   }, [value]);
   const iconElement = icon === 'check' ? icons.check() : icon === 'cross' ? icons.cross() : icons.copy();
-  return <button className='copy-icon' onClick={handleCopy}>{iconElement}</button>;
+  return <button className='copy-icon' title='Copy to clipboard' aria-label='Copy to clipboard' onClick={handleCopy}>{iconElement}</button>;
+};
+
+type CopyToClipboardContainerProps = CopyToClipboardProps & {
+  children: React.ReactNode
+};
+
+/**
+ * Container for displaying a copy to clipboard button alongside children.
+ */
+export const CopyToClipboardContainer: React.FunctionComponent<CopyToClipboardContainerProps> = ({ children, value }) => {
+  return <span className='copy-value-container'>
+    {children}
+    <span className='copy-button-container'>
+      <CopyToClipboard value={value} />
+    </span>
+  </span>;
 };
diff --git a/packages/web/index.html b/packages/html-reporter/src/expandable.css
similarity index 66%
rename from packages/web/index.html
rename to packages/html-reporter/src/expandable.css
index 03a9c0dcca212..a89d68add1fcc 100644
--- a/packages/web/index.html
+++ b/packages/html-reporter/src/expandable.css
@@ -1,4 +1,4 @@
-<!--
+/*
   Copyright (c) Microsoft Corporation.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,17 +12,11 @@
   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.
--->
+*/
 
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tests</title>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>
+.expandable-summary {
+  cursor: pointer;
+  list-style: none;
+  white-space: nowrap;
+  padding-left: 4px;
+}
diff --git a/packages/html-reporter/src/expandable.tsx b/packages/html-reporter/src/expandable.tsx
new file mode 100644
index 0000000000000..ca4f4a5d7a709
--- /dev/null
+++ b/packages/html-reporter/src/expandable.tsx
@@ -0,0 +1,46 @@
+/**
+ * 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 React from 'react';
+import * as icons from './icons';
+
+import './expandable.css';
+
+export const Expandable: React.FunctionComponent<{
+  summary: React.ReactNode,
+  children: React.ReactNode,
+  className?: string,
+  style?: React.CSSProperties,
+}> = ({ summary, children, className, style }) => {
+  const [expanded, setExpanded] = React.useState(false);
+
+  const handleToggle = (e: React.SyntheticEvent<HTMLDetailsElement>) => {
+    setExpanded(e.currentTarget.open);
+  };
+
+  return (
+    <details
+      style={style}
+      className={className}
+      onToggle={handleToggle}
+    >
+      <summary className='expandable-summary'>
+        {expanded ? icons.downArrow() : icons.rightArrow()}
+        {summary}
+      </summary>
+      {children}
+    </details>
+  );
+};
diff --git a/packages/html-reporter/src/filter.ts b/packages/html-reporter/src/filter.ts
index 9ec4ea7e59691..7e54c98d4d0dd 100644
--- a/packages/html-reporter/src/filter.ts
+++ b/packages/html-reporter/src/filter.ts
@@ -15,42 +15,55 @@
 */
 
 import type { TestCaseSummary } from './types';
+
+type FilterToken = {
+  name: string;
+  not: boolean;
+};
+
 export class Filter {
-  project: string[] = [];
-  status: string[] = [];
-  text: string[] = [];
-  labels: string[] = [];
-  annotations: string[] = [];
+  project: FilterToken[] = [];
+  status: FilterToken[] = [];
+  text: FilterToken[] = [];
+  labels: FilterToken[] = [];
+  annotations: FilterToken[] = [];
 
   empty(): boolean {
-    return this.project.length + this.status.length + this.text.length === 0;
+    return (
+      this.project.length + this.status.length + this.text.length +
+      this.labels.length + this.annotations.length
+    ) === 0;
   }
 
   static parse(expression: string): Filter {
     const tokens = Filter.tokenize(expression);
-    const project = new Set<string>();
-    const status = new Set<string>();
-    const text: string[] = [];
-    const labels = new Set<string>();
-    const annotations = new Set<string>();
-    for (const token of tokens) {
+    const project = new Set<FilterToken>();
+    const status = new Set<FilterToken>();
+    const text: FilterToken[] = [];
+    const labels = new Set<FilterToken>();
+    const annotations = new Set<FilterToken>();
+    for (let token of tokens) {
+      const not = token.startsWith('!');
+      if (not)
+        token = token.slice(1);
+
       if (token.startsWith('p:')) {
-        project.add(token.slice(2));
+        project.add({ name: token.slice(2), not });
         continue;
       }
       if (token.startsWith('s:')) {
-        status.add(token.slice(2));
+        status.add({ name: token.slice(2), not });
         continue;
       }
       if (token.startsWith('@')) {
-        labels.add(token);
+        labels.add({ name: token, not });
         continue;
       }
       if (token.startsWith('annot:')) {
-        annotations.add(token.slice('annot:'.length));
+        annotations.add({ name: token.slice('annot:'.length), not });
         continue;
       }
-      text.push(token.toLowerCase());
+      text.push({ name: token.toLowerCase(), not });
     }
 
     const filter = new Filter();
@@ -106,12 +119,18 @@ export class Filter {
   matches(test: TestCaseSummary): boolean {
     const searchValues = cacheSearchValues(test);
     if (this.project.length) {
-      const matches = !!this.project.find(p => searchValues.project.includes(p));
+      const matches = !!this.project.find(p => {
+        const match = searchValues.project.includes(p.name);
+        return p.not ? !match : match;
+      });
       if (!matches)
         return false;
     }
     if (this.status.length) {
-      const matches = !!this.status.find(s => searchValues.status.includes(s));
+      const matches = !!this.status.find(s => {
+        const match = searchValues.status.includes(s.name);
+        return s.not ? !match : match;
+      });
       if (!matches)
         return false;
     } else {
@@ -119,23 +138,32 @@ export class Filter {
         return false;
     }
     if (this.text.length) {
-      for (const text of this.text) {
-        if (searchValues.text.includes(text))
-          continue;
-        const [fileName, line, column] = text.split(':');
+      const matches = this.text.every(text => {
+        if (searchValues.text.includes(text.name))
+          return text.not ? false : true;
+
+        const [fileName, line, column] = text.name.split(':');
         if (searchValues.file.includes(fileName) && searchValues.line === line && (column === undefined || searchValues.column === column))
-          continue;
+          return text.not ? false : true;
+
+        return text.not ? true : false;
+      });
+      if (!matches)
         return false;
-      }
     }
     if (this.labels.length) {
-      const matches = this.labels.every(l => searchValues.labels.includes(l));
+      const matches = this.labels.every(l => {
+        const match = searchValues.labels.includes(l.name);
+        return l.not ? !match : match;
+      });
       if (!matches)
         return false;
     }
     if (this.annotations.length) {
-      const matches = this.annotations.every(annotation =>
-        searchValues.annotations.some(a => a.includes(annotation)));
+      const matches = this.annotations.every(annotation => {
+        const match = searchValues.annotations.some(a => a.includes(annotation.name));
+        return annotation.not ? !match : match;
+      });
       if (!matches)
         return false;
     }
@@ -156,8 +184,8 @@ type SearchValues = {
 
 const searchValuesSymbol = Symbol('searchValues');
 
-function cacheSearchValues(test: TestCaseSummary): SearchValues {
-  const cached = (test as any)[searchValuesSymbol] as SearchValues | undefined;
+function cacheSearchValues(test: TestCaseSummary & { [searchValuesSymbol]?: SearchValues }): SearchValues {
+  const cached = test[searchValuesSymbol];
   if (cached)
     return cached;
 
@@ -178,16 +206,20 @@ function cacheSearchValues(test: TestCaseSummary): SearchValues {
     labels: test.tags.map(tag => tag.toLowerCase()),
     annotations: test.annotations.map(a => a.type.toLowerCase() + '=' + a.description?.toLocaleLowerCase())
   };
-  (test as any)[searchValuesSymbol] = searchValues;
+  test[searchValuesSymbol] = searchValues;
   return searchValues;
 }
 
-export function filterWithToken(tokens: string[], token: string, append: boolean): string {
-  if (append) {
-    if (!tokens.includes(token))
-      return '#?q=' + [...tokens, token].join(' ').trim();
-    return '#?q=' + tokens.filter(t => t !== token).join(' ').trim();
-  }
+// Extract quoted groups of search params, or tokens separated by whitespace
+const SEARCH_PARAM_GROUP_REGEX = /("[^"]*"|"[^"]*$|\S+)/g;
+
+export function filterWithQuery(existingQuery: string, token: string, append: boolean): string {
+  const tokens = [...existingQuery.matchAll(SEARCH_PARAM_GROUP_REGEX)].map(m => {
+    const rawValue = m[0];
+    return rawValue.startsWith('"') && rawValue.endsWith('"') && rawValue.length > 1 ? rawValue.slice(1, rawValue.length - 1) : rawValue;
+  });
+  if (append)
+    return '#?q=' + joinTokens(!tokens.includes(token) ? [...tokens, token] : tokens.filter(t => t !== token));
 
   // if metaKey or ctrlKey is not pressed, replace existing token with new token
   let prefix: 's:' | 'p:' | '@';
@@ -200,5 +232,9 @@ export function filterWithToken(tokens: string[], token: string, append: boolean
 
   const newTokens = tokens.filter(t => !t.startsWith(prefix));
   newTokens.push(token);
-  return '#?q=' + newTokens.join(' ').trim();
+  return '#?q=' + joinTokens(newTokens);
+}
+
+function joinTokens(tokens: string[]): string {
+  return tokens.map(token => /\s/.test(token) ? `"${token}"` : token).join(' ').trim();
 }
diff --git a/packages/html-reporter/src/headerView.css b/packages/html-reporter/src/headerView.css
index ef29c442ca2bd..f8ef79e44f715 100644
--- a/packages/html-reporter/src/headerView.css
+++ b/packages/html-reporter/src/headerView.css
@@ -18,7 +18,36 @@
   float: right;
 }
 
+.header-view {
+  padding: 12px 8px 0 8px;
+}
+
+.header-view div {
+  flex-shrink: 0;
+  flex-wrap: wrap;
+}
+
+.header-superheader {
+  color: var(--color-fg-muted);
+}
+
+.header-title {
+  flex: none;
+  font-weight: 400;
+  font-size: 32px;
+  line-height: 1.25;
+}
+
 @media only screen and (max-width: 600px) {
+  .header-view {
+    padding: 0;
+  }
+
+  .header-view div {
+    /* Allow all header elements to wrap */
+    flex-shrink: 1;
+  }
+
   .header-view-status-container {
     float: none;
     margin: 0 0 10px 0 !important;
@@ -29,4 +58,8 @@
     border-left: none;
     border-right: none;
   }
+
+  .header-title, .header-superheader {
+    margin: 0 8px;
+  }
 }
diff --git a/packages/html-reporter/src/headerView.spec.tsx b/packages/html-reporter/src/headerView.spec.tsx
index 3131ae645d583..85e78758b01ee 100644
--- a/packages/html-reporter/src/headerView.spec.tsx
+++ b/packages/html-reporter/src/headerView.spec.tsx
@@ -15,41 +15,53 @@
  */
 
 import { test, expect } from '@playwright/experimental-ct-react';
-import { HeaderView } from './headerView';
+import { GlobalFilterView } from './headerView';
+import { SearchParamsProvider } from './links';
 
 test.use({ viewport: { width: 720, height: 200 } });
 
 test('should render counters', async ({ mount }) => {
-  const component = await mount(<HeaderView stats={{
-    total: 100,
-    expected: 42,
-    unexpected: 31,
-    flaky: 17,
-    skipped: 10,
-    ok: false,
-  }} filterText='' setFilterText={() => { }}></HeaderView>);
+  const component = await mount(<SearchParamsProvider>
+    <GlobalFilterView stats={{
+      total: 100,
+      expected: 42,
+      unexpected: 31,
+      flaky: 17,
+      skipped: 10,
+      ok: false,
+    }} filterText='' setFilterText={() => { }} />
+  </SearchParamsProvider>);
   await expect(component.locator('a', { hasText: 'All' }).locator('.counter')).toHaveText('90');
   await expect(component.locator('a', { hasText: 'Passed' }).locator('.counter')).toHaveText('42');
   await expect(component.locator('a', { hasText: 'Failed' }).locator('.counter')).toHaveText('31');
   await expect(component.locator('a', { hasText: 'Flaky' }).locator('.counter')).toHaveText('17');
   await expect(component.locator('a', { hasText: 'Skipped' }).locator('.counter')).toHaveText('10');
+  await expect(component).toMatchAriaSnapshot(`
+    - navigation:
+      - link "All90"
+      - link "Passed42"
+      - link "Failed31"
+      - link "Flaky17"
+      - link "Skipped10"
+  `);
 });
 
 test('should toggle filters', async ({ page, mount }) => {
   const filters: string[] = [];
-  const component = await mount(<HeaderView
-    stats={{
-      total: 100,
-      expected: 42,
-      unexpected: 31,
-      flaky: 17,
-      skipped: 10,
-      ok: false,
-    }}
-    filterText=''
-    setFilterText={(filterText: string) => filters.push(filterText)}
-  >
-  </HeaderView>);
+  const component = await mount(<SearchParamsProvider>
+    <GlobalFilterView
+      stats={{
+        total: 100,
+        expected: 42,
+        unexpected: 31,
+        flaky: 17,
+        skipped: 10,
+        ok: false,
+      }}
+      filterText=''
+      setFilterText={(filterText: string) => filters.push(filterText)}
+    />
+  </SearchParamsProvider>);
   await component.locator('a', { hasText: 'All' }).click();
   await component.locator('a', { hasText: 'Passed' }).click();
   await expect(page).toHaveURL(/#\?q=s:passed/);
@@ -59,6 +71,6 @@ test('should toggle filters', async ({ page, mount }) => {
   await expect(page).toHaveURL(/#\?q=s:flaky/);
   await component.locator('a', { hasText: 'Skipped' }).click();
   await expect(page).toHaveURL(/#\?q=s:skipped/);
-  await component.getByRole('searchbox').fill('annot:annotation type=annotation description');
-  expect(filters).toEqual(['', 's:passed', 's:failed', 's:flaky', 's:skipped', 'annot:annotation type=annotation description']);
+  await component.getByRole('textbox').fill('annot:annotation type=annotation description');
+  expect(filters).toEqual(['', '', 's:passed ', 's:failed ', 's:flaky ', 's:skipped ', 'annot:annotation type=annotation description']);
 });
diff --git a/packages/html-reporter/src/headerView.tsx b/packages/html-reporter/src/headerView.tsx
index 925bc64721ec9..d385c12992069 100644
--- a/packages/html-reporter/src/headerView.tsx
+++ b/packages/html-reporter/src/headerView.tsx
@@ -20,26 +20,37 @@ import './colors.css';
 import './common.css';
 import './headerView.css';
 import * as icons from './icons';
-import { Link, navigate } from './links';
+import { Link, navigate, SearchParamsContext } from './links';
 import { statusIcon } from './statusIcon';
-import { filterWithToken } from './filter';
+import { filterWithQuery } from './filter';
+import { linkifyText } from '@web/renderUtils';
 
-export const HeaderView: React.FC<React.PropsWithChildren<{
+export const HeaderView: React.FC<{
+  title: string | undefined,
+  leftSuperHeader?: React.ReactNode,
+  rightSuperHeader?: React.ReactNode,
+}> = ({ title, leftSuperHeader, rightSuperHeader }) => {
+  return <div className='header-view'>
+    <div className='hbox header-superheader'>
+      {leftSuperHeader}
+      <div style={{ flex: 'auto' }}></div>
+      {rightSuperHeader}
+    </div>
+    {title && <div className='header-title'>{linkifyText(title)}</div>}
+  </div>;
+};
+
+export const GlobalFilterView: React.FC<{
   stats: Stats,
   filterText: string,
   setFilterText: (filterText: string) => void,
-}>> = ({ stats, filterText, setFilterText }) => {
+}> = ({ stats, filterText, setFilterText }) => {
+  const searchParams = React.useContext(SearchParamsContext);
   React.useEffect(() => {
-    const popstateFn = () => {
-      const params = new URLSearchParams(window.location.hash.slice(1));
-      setFilterText(params.get('q') || '');
-    };
-    window.addEventListener('popstate', popstateFn);
-
-    return () => {
-      window.removeEventListener('popstate', popstateFn);
-    };
-  }, [setFilterText]);
+    // Add an extra space such that users can easily add to query
+    const query = searchParams.get('q');
+    setFilterText(query ? `${query.trim()} ` : '');
+  }, [searchParams, setFilterText]);
 
   return (<>
     <div className='pt-3'>
@@ -49,12 +60,17 @@ export const HeaderView: React.FC<React.PropsWithChildren<{
       <form className='subnav-search' onSubmit={
         event => {
           event.preventDefault();
-          navigate(`#?q=${filterText ? encodeURIComponent(filterText) : ''}`);
+          const url = new URL(window.location.href);
+          // If <form/> onSubmit happens immediately after <input/> onChange, the filterText state is not updated yet.
+          // Using FormData here is a workaround to get the latest value.
+          const q = new FormData(event.target as HTMLFormElement).get('q') as string;
+          url.hash = q ? '?' + new URLSearchParams({ q }) : '';
+          navigate(url);
         }
       }>
         {icons.search()}
         {/* Use navigationId to reset defaultValue */}
-        <input type='search' spellCheck={false} className='form-control subnav-search-input input-contrast width-full' value={filterText} onChange={e => {
+        <input name='q' spellCheck={false} className='form-control subnav-search-input input-contrast width-full' value={filterText} onChange={e => {
           setFilterText(e.target.value);
         }}></input>
       </form>
@@ -65,24 +81,34 @@ export const HeaderView: React.FC<React.PropsWithChildren<{
 const StatsNavView: React.FC<{
   stats: Stats
 }> = ({ stats }) => {
-  const searchParams = new URLSearchParams(window.location.hash.slice(1));
-  const q = searchParams.get('q')?.toString() || '';
-  const tokens = q.split(' ');
   return <nav>
     <Link className='subnav-item' href='#?'>
-      All <span className='d-inline counter'>{stats.total - stats.skipped}</span>
-    </Link>
-    <Link className='subnav-item' click={filterWithToken(tokens, 's:passed', false)} ctrlClick={filterWithToken(tokens, 's:passed', true)}>
-      Passed <span className='d-inline counter'>{stats.expected}</span>
-    </Link>
-    <Link className='subnav-item' click={filterWithToken(tokens, 's:failed', false)} ctrlClick={filterWithToken(tokens, 's:failed', true)}>
-      {!!stats.unexpected && statusIcon('unexpected')} Failed <span className='d-inline counter'>{stats.unexpected}</span>
-    </Link>
-    <Link className='subnav-item' click={filterWithToken(tokens, 's:flaky', false)} ctrlClick={filterWithToken(tokens, 's:flaky', true)}>
-      {!!stats.flaky && statusIcon('flaky')} Flaky <span className='d-inline counter'>{stats.flaky}</span>
-    </Link>
-    <Link className='subnav-item' click={filterWithToken(tokens, 's:skipped', false)} ctrlClick={filterWithToken(tokens, 's:skipped', true)}>
-      Skipped <span className='d-inline counter'>{stats.skipped}</span>
+      <span className='subnav-item-label'>All</span>
+      <span className='d-inline counter'>{stats.total - stats.skipped}</span>
     </Link>
+    <NavLink token='passed' count={stats.expected} />
+    <NavLink token='failed' count={stats.unexpected} />
+    <NavLink token='flaky' count={stats.flaky} />
+    <NavLink token='skipped' count={stats.skipped} />
   </nav>;
 };
+
+const NavLink: React.FC<{
+  token: string,
+  count: number,
+}> = ({ token, count }) => {
+  const searchParams = React.useContext(SearchParamsContext);
+  const q = searchParams.get('q')?.toString() || '';
+  const queryToken = `s:${token}`;
+
+  const clickUrl = filterWithQuery(q, queryToken, false);
+  const ctrlClickUrl = filterWithQuery(q, queryToken, true);
+
+  const label = token.charAt(0).toUpperCase() + token.slice(1);
+
+  return <Link className='subnav-item' href={clickUrl} click={clickUrl} ctrlClick={ctrlClickUrl}>
+    {count > 0 && statusIcon(token as any)}
+    <span className='subnav-item-label'>{label}</span>
+    <span className='d-inline counter'>{count}</span>
+  </Link>;
+};
diff --git a/packages/html-reporter/src/icons.tsx b/packages/html-reporter/src/icons.tsx
index 6111fac7c1b44..a7368c5f4a30a 100644
--- a/packages/html-reporter/src/icons.tsx
+++ b/packages/html-reporter/src/icons.tsx
@@ -65,24 +65,14 @@ export const clock = () => {
   </svg>;
 };
 
-export const blank = () => {
-  return <svg className='octicon' viewBox='0 0 16 16' version='1.1' width='16' height='16' aria-hidden='true'></svg>;
-};
-
-export const externalLink = () => {
-  return <svg className='octicon' viewBox='0 0 16 16' width='16' height='16'><path fill-rule='evenodd' d='M10.604 1h4.146a.25.25 0 01.25.25v4.146a.25.25 0 01-.427.177L13.03 4.03 9.28 7.78a.75.75 0 01-1.06-1.06l3.75-3.75-1.543-1.543A.25.25 0 0110.604 1zM3.75 2A1.75 1.75 0 002 3.75v8.5c0 .966.784 1.75 1.75 1.75h8.5A1.75 1.75 0 0014 12.25v-3.5a.75.75 0 00-1.5 0v3.5a.25.25 0 01-.25.25h-8.5a.25.25 0 01-.25-.25v-8.5a.25.25 0 01.25-.25h3.5a.75.75 0 000-1.5h-3.5z'></path></svg>;
-};
-
-export const calendar = () => {
-  return <svg className='octicon' viewBox='0 0 16 16' width='16' height='16'><path fill-rule='evenodd' d='M4.75 0a.75.75 0 01.75.75V2h5V.75a.75.75 0 011.5 0V2h1.25c.966 0 1.75.784 1.75 1.75v10.5A1.75 1.75 0 0113.25 16H2.75A1.75 1.75 0 011 14.25V3.75C1 2.784 1.784 2 2.75 2H4V.75A.75.75 0 014.75 0zm0 3.5h8.5a.25.25 0 01.25.25V6h-11V3.75a.25.25 0 01.25-.25h2zm-2.25 4v6.75c0 .138.112.25.25.25h10.5a.25.25 0 00.25-.25V7.5h-11z'></path></svg>;
-};
-
-export const person = () => {
-  return <svg className='octicon' viewBox='0 0 16 16' width='16' height='16'><path fill-rule='evenodd' d='M10.5 5a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm.061 3.073a4 4 0 10-5.123 0 6.004 6.004 0 00-3.431 5.142.75.75 0 001.498.07 4.5 4.5 0 018.99 0 .75.75 0 101.498-.07 6.005 6.005 0 00-3.432-5.142z'></path></svg>;
+export const skip = () => {
+  return <svg aria-hidden='true' viewBox='0 0 16 16' width='16' height='16' data-view-component='true' className='octicon color-fg-muted'>
+    <path d='M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Zm9.78-2.22-5.5 5.5a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l5.5-5.5a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042Z'></path>
+  </svg>;
 };
 
-export const commit = () => {
-  return <svg className='octicon' viewBox='0 0 16 16' width='16' height='16'><path fill-rule='evenodd' d='M10.5 7.75a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0zm1.43.75a4.002 4.002 0 01-7.86 0H.75a.75.75 0 110-1.5h3.32a4.001 4.001 0 017.86 0h3.32a.75.75 0 110 1.5h-3.32z'></path></svg>;
+export const blank = () => {
+  return <svg className='octicon' viewBox='0 0 16 16' version='1.1' width='16' height='16' aria-hidden='true'></svg>;
 };
 
 export const image = () => {
diff --git a/packages/html-reporter/src/index.tsx b/packages/html-reporter/src/index.tsx
index 683113f32abb6..89a44fe02661f 100644
--- a/packages/html-reporter/src/index.tsx
+++ b/packages/html-reporter/src/index.tsx
@@ -15,38 +15,73 @@
  */
 
 import type { HTMLReport } from './types';
-import type zip from '@zip.js/zip.js';
+import type * as zip from '@zip.js/zip.js';
 // @ts-ignore
 import * as zipImport from '@zip.js/zip.js/lib/zip-no-worker-inflate.js';
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
+import * as ReactDOM from 'react-dom/client';
 import './colors.css';
 import type { LoadedReport } from './loadedReport';
 import { ReportView } from './reportView';
 // @ts-ignore
 const zipjs = zipImport as typeof zip;
 
+import logo from '@web/assets/playwright-logo.svg';
+import { SearchParamsProvider } from './links';
+const link = document.createElement('link');
+link.rel = 'shortcut icon';
+link.href = logo;
+document.head.appendChild(link);
+
 const ReportLoader: React.FC = () => {
   const [report, setReport] = React.useState<LoadedReport | undefined>();
   React.useEffect(() => {
-    if (report)
-      return;
     const zipReport = new ZipReport();
-    zipReport.load().then(() => setReport(zipReport));
-  }, [report]);
-  return <ReportView report={report}></ReportView>;
+    zipReport.load().then(() => {
+      // Drop node after consumption
+      document.getElementById('playwrightReportBase64')?.remove();
+      setReport(zipReport);
+    });
+  }, []);
+  return <SearchParamsProvider>
+    <ReportView report={report} />
+  </SearchParamsProvider>;
 };
 
 window.onload = () => {
-  ReactDOM.render(<ReportLoader />, document.querySelector('#root'));
+  ReactDOM.createRoot(document.querySelector('#root')!).render(<ReportLoader />);
 };
 
+const kPlaywrightReportStorageForHMR = 'playwrightReportStorageForHMR';
+
 class ZipReport implements LoadedReport {
   private _entries = new Map<string, zip.Entry>();
   private _json!: HTMLReport;
 
   async load() {
-    const zipReader = new zipjs.ZipReader(new zipjs.Data64URIReader((window as any).playwrightReportBase64), { useWebWorkers: false });
+    const zipURI = await new Promise<string>(resolve => {
+      const element = document.getElementById('playwrightReportBase64');
+      if (!!element?.textContent)
+        return resolve(element.textContent);
+      if (window.opener) {
+        const listener = (event: MessageEvent) => {
+          if (event.source === window.opener) {
+            localStorage.setItem(kPlaywrightReportStorageForHMR, event.data);
+            resolve(event.data);
+            window.removeEventListener('message', listener);
+          }
+        };
+        window.addEventListener('message', listener);
+        window.opener.postMessage('ready', '*');
+      } else {
+        const oldReport = localStorage.getItem(kPlaywrightReportStorageForHMR);
+        if (oldReport)
+          return resolve(oldReport);
+        alert('couldnt find report, something with HMR is broken');
+      }
+    });
+
+    const zipReader = new zipjs.ZipReader(new zipjs.Data64URIReader(zipURI), { useWebWorkers: false });
     for (const entry of await zipReader.getEntries())
       this._entries.set(entry.filename, entry);
     this._json = await this.entry('report.json') as HTMLReport;
diff --git a/packages/html-reporter/src/labels.css b/packages/html-reporter/src/labels.css
new file mode 100644
index 0000000000000..dbb38feaa4be5
--- /dev/null
+++ b/packages/html-reporter/src/labels.css
@@ -0,0 +1,110 @@
+/**
+ * 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.
+ */
+
+.label {
+  display: inline-block;
+  padding: 0 8px;
+  font-size: 12px;
+  font-weight: 500;
+  line-height: 18px;
+  border: 1px solid transparent;
+  border-radius: 2em;
+  background-color: var(--color-scale-gray-4);
+  color: white;
+  margin: 0 10px;
+  flex: none;
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.label-anchor {
+  text-decoration: none;
+  color: var(--color-fg-default);
+}
+
+@media(prefers-color-scheme: light) {
+  .label-color-0 {
+    background-color: var(--color-scale-blue-0);
+    color: var(--color-scale-blue-6);
+    border: 1px solid var(--color-scale-blue-4);
+  }
+  .label-color-1 {
+    background-color: var(--color-scale-yellow-0);
+    color: var(--color-scale-yellow-6);
+    border: 1px solid var(--color-scale-yellow-4);
+  }
+  .label-color-2 {
+    background-color: var(--color-scale-purple-0);
+    color: var(--color-scale-purple-6);
+    border: 1px solid var(--color-scale-purple-4);
+  }
+  .label-color-3 {
+    background-color: var(--color-scale-pink-0);
+    color: var(--color-scale-pink-6);
+    border: 1px solid var(--color-scale-pink-4);
+  }
+  .label-color-4 {
+    background-color: var(--color-scale-coral-0);
+    color: var(--color-scale-coral-6);
+    border: 1px solid var(--color-scale-coral-4);
+  }
+  .label-color-5 {
+    background-color: var(--color-scale-orange-0);
+    color: var(--color-scale-orange-6);
+    border: 1px solid var(--color-scale-orange-4);
+  }
+}
+
+@media(prefers-color-scheme: dark) {
+  .label-color-0 {
+    background-color: var(--color-scale-blue-9);
+    color: var(--color-scale-blue-2);
+    border: 1px solid var(--color-scale-blue-4);
+  }
+  .label-color-1 {
+    background-color: var(--color-scale-yellow-9);
+    color: var(--color-scale-yellow-2);
+    border: 1px solid var(--color-scale-yellow-4);
+  }
+  .label-color-2 {
+    background-color: var(--color-scale-purple-9);
+    color: var(--color-scale-purple-2);
+    border: 1px solid var(--color-scale-purple-4);
+  }
+  .label-color-3 {
+    background-color: var(--color-scale-pink-9);
+    color: var(--color-scale-pink-2);
+    border: 1px solid var(--color-scale-pink-4);
+  }
+  .label-color-4 {
+    background-color: var(--color-scale-coral-9);
+    color: var(--color-scale-coral-2);
+    border: 1px solid var(--color-scale-coral-4);
+  }
+  .label-color-5 {
+    background-color: var(--color-scale-orange-9);
+    color: var(--color-scale-orange-2);
+    border: 1px solid var(--color-scale-orange-4);
+  }
+}
+
+.label-row .label {
+  margin: 0;
+}
+
+.label-row .label:not(:first-child) {
+  margin-left: 6px;
+}
\ No newline at end of file
diff --git a/packages/html-reporter/src/labels.tsx b/packages/html-reporter/src/labels.tsx
new file mode 100644
index 0000000000000..253518eaa958d
--- /dev/null
+++ b/packages/html-reporter/src/labels.tsx
@@ -0,0 +1,76 @@
+/**
+ * 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 * as React from 'react';
+import { clsx } from '@web/uiUtils';
+import { hashStringToInt } from './utils';
+import { navigate, ProjectLink, SearchParamsContext } from './links';
+import { filterWithQuery } from './filter';
+import './labels.css';
+
+export const Label: React.FC<{
+  label: string,
+  trimAtSymbolPrefix?: boolean,
+  href?: string,
+  onClick?: (e: React.MouseEvent, label: string) => void,
+  colorIndex?: number,
+}> = ({ label, href, onClick, colorIndex, trimAtSymbolPrefix }) => {
+  const baseLabel = <span className={clsx('label', 'label-color-' + (colorIndex !== undefined ? colorIndex : hashStringToInt(label)))} onClick={onClick ? e => onClick(e, label) : undefined}>
+    {trimAtSymbolPrefix && label.startsWith('@') ? label.slice(1) : label}
+  </span>;
+
+  return href
+    ? <a className='label-anchor' href={href}>{baseLabel}</a>
+    : baseLabel;
+};
+
+export const ProjectAndTagLabelsView: React.FC<{
+  projectNames: string[],
+  activeProjectName: string,
+  otherLabels: string[],
+  useLinks?: boolean,
+  style?: React.CSSProperties,
+}> = ({ projectNames, activeProjectName, otherLabels, useLinks, style }) => {
+  // We can have an empty project name if we have no projects specified in the config
+  const hasProjectNames = projectNames.length > 0 && !!activeProjectName;
+
+  return (hasProjectNames || otherLabels.length > 0) && <span className='label-row' style={style ?? {}}>
+    <ProjectLink projectNames={projectNames} projectName={activeProjectName} />
+    {!!useLinks ? <LabelsLinkView labels={otherLabels} /> : <LabelsClickView labels={otherLabels} />}
+  </span>;
+};
+
+const LabelsClickView: React.FC<{
+  labels: string[],
+}> = ({ labels }) => {
+  const searchParams = React.useContext(SearchParamsContext);
+
+  const onClickHandle = React.useCallback((e: React.MouseEvent, label: string) => {
+    e.preventDefault();
+    const q = searchParams.get('q')?.toString() || '';
+    navigate(filterWithQuery(q, label, e.metaKey || e.ctrlKey));
+  }, [searchParams]);
+
+  return <>
+    {labels.map(label => <Label key={label} label={label} trimAtSymbolPrefix={true} onClick={onClickHandle} />)}
+  </>;
+};
+
+const LabelsLinkView: React.FC<{
+  labels: string[],
+}> = ({ labels }) => <>
+  {labels.map((label, index) => <Label key={index} label={label} trimAtSymbolPrefix={true} href={`#?q=${label}`} />)}
+</>;
diff --git a/packages/html-reporter/src/links.css b/packages/html-reporter/src/links.css
index 4abe8a6caa291..4735e23da0ac2 100644
--- a/packages/html-reporter/src/links.css
+++ b/packages/html-reporter/src/links.css
@@ -14,87 +14,6 @@
   limitations under the License.
 */
 
-.label {
-  display: inline-block;
-  padding: 0 8px;
-  font-size: 12px;
-  font-weight: 500;
-  line-height: 18px;
-  border: 1px solid transparent;
-  border-radius: 2em;
-  background-color: var(--color-scale-gray-4);
-  color: white;
-  margin: 0 10px;
-  flex: none;
-  font-weight: 600;
-}
-
-@media(prefers-color-scheme: light) {
-  .label-color-0 {
-    background-color: var(--color-scale-blue-0);
-    color: var(--color-scale-blue-6);
-    border: 1px solid var(--color-scale-blue-4);
-  }
-  .label-color-1 {
-    background-color: var(--color-scale-yellow-0);
-    color: var(--color-scale-yellow-6);
-    border: 1px solid var(--color-scale-yellow-4);
-  }
-  .label-color-2 {
-    background-color: var(--color-scale-purple-0);
-    color: var(--color-scale-purple-6);
-    border: 1px solid var(--color-scale-purple-4);
-  }
-  .label-color-3 {
-    background-color: var(--color-scale-pink-0);
-    color: var(--color-scale-pink-6);
-    border: 1px solid var(--color-scale-pink-4);
-  }
-  .label-color-4 {
-    background-color: var(--color-scale-coral-0);
-    color: var(--color-scale-coral-6);
-    border: 1px solid var(--color-scale-coral-4);
-  }
-  .label-color-5 {
-    background-color: var(--color-scale-orange-0);
-    color: var(--color-scale-orange-6);
-    border: 1px solid var(--color-scale-orange-4);
-  }
-}
-
-@media(prefers-color-scheme: dark) {
-  .label-color-0 {
-    background-color: var(--color-scale-blue-9);
-    color: var(--color-scale-blue-2);
-    border: 1px solid var(--color-scale-blue-4);
-  }
-  .label-color-1 {
-    background-color: var(--color-scale-yellow-9);
-    color: var(--color-scale-yellow-2);
-    border: 1px solid var(--color-scale-yellow-4);
-  }
-  .label-color-2 {
-    background-color: var(--color-scale-purple-9);
-    color: var(--color-scale-purple-2);
-    border: 1px solid var(--color-scale-purple-4);
-  }
-  .label-color-3 {
-    background-color: var(--color-scale-pink-9);
-    color: var(--color-scale-pink-2);
-    border: 1px solid var(--color-scale-pink-4);
-  }
-  .label-color-4 {
-    background-color: var(--color-scale-coral-9);
-    color: var(--color-scale-coral-2);
-    border: 1px solid var(--color-scale-coral-4);
-  }
-  .label-color-5 {
-    background-color: var(--color-scale-orange-9);
-    color: var(--color-scale-orange-2);
-    border: 1px solid var(--color-scale-orange-4);
-  }
-}
-
 .attachment-body {
   white-space: pre-wrap;
   background-color: var(--color-canvas-subtle);
@@ -110,3 +29,40 @@
   right: 5px;
   top: 5px;
 }
+
+.link-badge {
+  flex: none;
+  background-color: transparent;
+  border-color: transparent;
+  user-select: none;
+}
+
+.link-badge-dim span {
+  color: var(--color-fg-muted);
+}
+
+.link-badge:hover {
+  cursor: pointer;
+}
+
+.link-badge svg {
+  fill: var(--color-fg-default);
+}
+
+.link-badge-dim svg {
+  fill: var(--color-fg-muted);
+}
+
+.link-badge-dim:hover svg {
+  fill: var(--color-fg-muted);
+}
+
+.trace-link {
+  /* Trace link button has 1px border and 4px padding, so we need 3px right margin to match content on the other side of divider */
+  margin-right: 3px;
+}
+
+.trace-link-separator {
+  color: var(--color-fg-muted);
+  user-select: none;
+}
diff --git a/packages/html-reporter/src/links.tsx b/packages/html-reporter/src/links.tsx
index 42b9f9b5b91e4..6e1451aded113 100644
--- a/packages/html-reporter/src/links.tsx
+++ b/packages/html-reporter/src/links.tsx
@@ -14,15 +14,18 @@
   limitations under the License.
 */
 
-import type { TestAttachment } from './types';
+import type { TestAttachment, TestCase, TestCaseSummary, TestResult, TestResultSummary } from './types';
 import * as React from 'react';
 import * as icons from './icons';
-import { TreeItem } from './treeItem';
 import { CopyToClipboard } from './copyToClipboard';
 import './links.css';
-import { linkifyText } from './renderUtils';
+import { linkifyText } from '@web/renderUtils';
+import { clsx, useFlash } from '@web/uiUtils';
+import { trace } from './icons';
+import { Expandable } from './expandable';
+import { Label } from './labels';
 
-export function navigate(href: string) {
+export function navigate(href: string | URL) {
   window.history.pushState({}, '', href);
   const navEvent = new PopStateEvent('popstate');
   window.dispatchEvent(navEvent);
@@ -32,24 +35,20 @@ export const Route: React.FunctionComponent<{
   predicate: (params: URLSearchParams) => boolean,
   children: any
 }> = ({ predicate, children }) => {
-  const [matches, setMatches] = React.useState(predicate(new URLSearchParams(window.location.hash.slice(1))));
-  React.useEffect(() => {
-    const listener = () => setMatches(predicate(new URLSearchParams(window.location.hash.slice(1))));
-    window.addEventListener('popstate', listener);
-    return () => window.removeEventListener('popstate', listener);
-  }, [predicate]);
-  return matches ? children : null;
+  const searchParams = React.useContext(SearchParamsContext);
+  return predicate(searchParams) ? children : null;
 };
 
-export const Link: React.FunctionComponent<{
+type LinkProps = React.PropsWithChildren<{
   href?: string,
   click?: string,
   ctrlClick?: string,
   className?: string,
   title?: string,
-  children: any,
-}> = ({ href, click, ctrlClick, className, children, title }) => {
-  return <a style={{ textDecoration: 'none', color: 'var(--color-fg-default)', cursor: 'pointer' }} href={href} className={`${className || ''}`} title={title} onClick={e => {
+}>;
+
+export const Link: React.FunctionComponent<LinkProps> = ({ click, ctrlClick, children, ...rest }) => {
+  return <a {...rest} style={{ textDecoration: 'none', color: 'var(--color-fg-default)', cursor: 'pointer' }} onClick={e => {
     if (click) {
       e.preventDefault();
       navigate(e.metaKey || e.ctrlKey ? ctrlClick || click : click);
@@ -57,6 +56,8 @@ export const Link: React.FunctionComponent<{
   }}>{children}</a>;
 };
 
+export const LinkBadge: React.FunctionComponent<LinkProps & { dim?: boolean }> = ({ className, ...props }) => <Link {...props} className={clsx('link-badge', props.dim && 'link-badge-dim', className)} />;
+
 export const ProjectLink: React.FunctionComponent<{
   projectNames: string[],
   projectName: string,
@@ -64,24 +65,102 @@ export const ProjectLink: React.FunctionComponent<{
   const encoded = encodeURIComponent(projectName);
   const value = projectName === encoded ? projectName : `"${encoded.replace(/%22/g, '%5C%22')}"`;
   return <Link href={`#?q=p:${value}`}>
-    <span className={'label label-color-' + (projectNames.indexOf(projectName) % 6)} style={{ margin: '6px 0 0 6px' }}>
-      {projectName}
-    </span>
+    <Label label={projectName} colorIndex={projectNames.indexOf(projectName) % 6} />
   </Link>;
 };
 
 export const AttachmentLink: React.FunctionComponent<{
   attachment: TestAttachment,
+  result: TestResult,
   href?: string,
   linkName?: string,
-}> = ({ attachment, href, linkName }) => {
-  return <TreeItem title={<span>
-    {attachment.contentType === kMissingContentType ? icons.warning() : icons.attachment()}
-    {attachment.path && <a href={href || attachment.path} download={downloadFileNameForAttachment(attachment)}>{linkName || attachment.name}</a>}
-    {!attachment.path && <span>{linkifyText(attachment.name)}</span>}
-  </span>} loadChildren={attachment.body ? () => {
-    return [<div className='attachment-body'><CopyToClipboard value={attachment.body!}/>{linkifyText(attachment.body!)}</div>];
-  } : undefined} depth={0} style={{ lineHeight: '32px' }}></TreeItem>;
+  openInNewTab?: boolean,
+}> = ({ attachment, result, href, linkName, openInNewTab }) => {
+  const [flash, triggerFlash] = useFlash();
+  useAnchor('attachment-' + result.attachments.indexOf(attachment), triggerFlash);
+
+  const summaryContent = (
+    <span>
+      {attachment.contentType === kMissingContentType ? icons.warning() : icons.attachment()}
+      {attachment.path && (
+        openInNewTab
+          ? <a href={href || attachment.path} target='_blank' rel='noreferrer'>{linkName || attachment.name}</a>
+          : <a href={href || attachment.path} download={downloadFileNameForAttachment(attachment)}>{linkName || attachment.name}</a>
+      )}
+      {!attachment.path && (
+        openInNewTab
+          ? (
+            <a
+              href={URL.createObjectURL(new Blob([attachment.body!], { type: attachment.contentType }))}
+              target='_blank' rel='noreferrer'
+              onClick={e => e.stopPropagation() /* dont expand the details */}
+            >
+              {attachment.name}
+            </a>
+          )
+          : <span>{linkifyText(attachment.name)}</span>
+      )}
+    </span>
+  );
+
+  if (!attachment.body) {
+    return (
+      <div
+        style={{ lineHeight: '32px', whiteSpace: 'nowrap', paddingLeft: 4 }}
+        className={clsx(flash && 'flash')}
+      >
+        <span style={{ visibility: 'hidden' }}>{icons.rightArrow()}</span>
+        {summaryContent}
+      </div>
+    );
+  }
+
+  return (
+    <Expandable
+      style={{ lineHeight: '32px' }}
+      className={clsx(flash && 'flash')}
+      summary={summaryContent}
+    >
+      <div className='attachment-body'>
+        <CopyToClipboard value={attachment.body!}/>
+        {linkifyText(attachment.body!)}
+      </div>
+    </Expandable>
+  );
+};
+
+export const TraceLink: React.FC<{ test: TestCaseSummary, trailingSeparator?: boolean, dim?: boolean }> = ({ test, trailingSeparator, dim }) => {
+  const firstTraces = test.results.map(result => result.attachments.filter(attachment => attachment.name === 'trace')).filter(traces => traces.length > 0)[0];
+  if (!firstTraces)
+    return undefined;
+
+  return (
+    <>
+      <LinkBadge
+        href={generateTraceUrl(firstTraces)}
+        title='View Trace'
+        className='button trace-link'
+        dim={dim}>
+        {trace()}
+        <span>View Trace</span>
+      </LinkBadge>
+      {trailingSeparator && <div className='trace-link-separator'>|</div>}
+    </>
+  );
+};
+
+export const SearchParamsContext = React.createContext<URLSearchParams>(new URLSearchParams(window.location.hash.slice(1)));
+
+export const SearchParamsProvider: React.FunctionComponent<React.PropsWithChildren> = ({ children }) => {
+  const [searchParams, setSearchParams] = React.useState<URLSearchParams>(new URLSearchParams(window.location.hash.slice(1)));
+
+  React.useEffect(() => {
+    const listener = () => setSearchParams(new URLSearchParams(window.location.hash.slice(1)));
+    window.addEventListener('popstate', listener);
+    return () => window.removeEventListener('popstate', listener);
+  }, []);
+
+  return <SearchParamsContext.Provider value={searchParams}>{children}</SearchParamsContext.Provider>;
 };
 
 function downloadFileNameForAttachment(attachment: TestAttachment): string {
@@ -98,3 +177,49 @@ export function generateTraceUrl(traces: TestAttachment[]) {
 }
 
 const kMissingContentType = 'x-playwright/missing';
+
+export type AnchorID = string | string[] | ((id: string) => boolean) | undefined;
+
+export function useAnchor(id: AnchorID, onReveal: React.EffectCallback) {
+  const searchParams = React.useContext(SearchParamsContext);
+  const isAnchored = useIsAnchored(id);
+  React.useEffect(() => {
+    if (isAnchored)
+      return onReveal();
+  }, [isAnchored, onReveal, searchParams]);
+}
+
+export function useIsAnchored(id: AnchorID) {
+  const searchParams = React.useContext(SearchParamsContext);
+  const anchor = searchParams.get('anchor');
+  if (anchor === null)
+    return false;
+  if (typeof id === 'undefined')
+    return false;
+  if (typeof id === 'string')
+    return id === anchor;
+  if (Array.isArray(id))
+    return id.includes(anchor);
+  return id(anchor);
+}
+
+export function Anchor({ id, children }: React.PropsWithChildren<{ id: AnchorID }>) {
+  const ref = React.useRef<HTMLDivElement>(null);
+  const onAnchorReveal = React.useCallback(() => {
+    ref.current?.scrollIntoView({ block: 'start', inline: 'start' });
+  }, []);
+  useAnchor(id, onAnchorReveal);
+
+  return <div ref={ref}>{children}</div>;
+}
+
+export function testResultHref({ test, result, anchor }: { test?: TestCase | TestCaseSummary, result?: TestResult | TestResultSummary, anchor?: string }) {
+  const params = new URLSearchParams();
+  if (test)
+    params.set('testId', test.testId);
+  if (test && result)
+    params.set('run', '' + test.results.indexOf(result as any));
+  if (anchor)
+    params.set('anchor', anchor);
+  return `#?` + params;
+}
diff --git a/packages/html-reporter/src/metadataView.css b/packages/html-reporter/src/metadataView.css
new file mode 100644
index 0000000000000..b91a5e830c7e3
--- /dev/null
+++ b/packages/html-reporter/src/metadataView.css
@@ -0,0 +1,71 @@
+/*
+  Copyright (c) Microsoft Corporation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+.metadata-toggle {
+  cursor: pointer;
+  user-select: none;
+  color: var(--color-fg-default);
+}
+
+.metadata-toggle-second-line {
+  margin-top: 8px;
+  margin-left: 8px;
+}
+
+.metadata-view {
+  border: 1px solid var(--color-border-default);
+  border-radius: 6px;
+  margin-top: 12px;
+}
+
+.metadata-view .metadata-section {
+  margin: 8px 10px 8px 32px;
+}
+
+.metadata-view span:not(.copy-button-container),
+.metadata-view a {
+  display: inline-block;
+  line-height: 24px;
+}
+
+.metadata-properties {
+  display: flex;
+  flex-direction: column;
+  align-items: normal;
+  gap: 8px;
+}
+
+.metadata-properties > div {
+  height: 24px;
+}
+
+.metadata-separator {
+  height: 1px;
+  border-bottom: 1px solid var(--color-border-default);
+}
+
+.metadata-view a {
+  color: var(--color-fg-default);
+}
+
+.copyable-property {
+  white-space: pre;
+}
+
+.copyable-property > span {
+  display: flex;
+  align-items: center;
+}
diff --git a/packages/html-reporter/src/metadataView.tsx b/packages/html-reporter/src/metadataView.tsx
index 0f4fe6e73c652..545eb14513a8a 100644
--- a/packages/html-reporter/src/metadataView.tsx
+++ b/packages/html-reporter/src/metadataView.tsx
@@ -17,21 +17,13 @@
 import * as React from 'react';
 import './colors.css';
 import './common.css';
-import * as icons from './icons';
-import { AutoChip } from './chip';
-import './reportView.css';
 import './theme.css';
-
-export type Metainfo = {
-  'revision.id'?: string;
-  'revision.author'?: string;
-  'revision.email'?: string;
-  'revision.subject'?: string;
-  'revision.timestamp'?: number | Date;
-  'revision.link'?: string;
-  'ci.link'?: string;
-  'timestamp'?: number
-};
+import './metadataView.css';
+import type { Metadata } from '@playwright/test';
+import type { CIInfo, GitCommitInfo, MetadataWithCommitInfo } from '@testIsomorphic/types';
+import { CopyToClipboardContainer } from './copyToClipboard';
+import { linkifyText } from '@web/renderUtils';
+import { SearchParamsContext } from './links';
 
 class ErrorBoundary extends React.Component<React.PropsWithChildren<{}>, { error: Error | null, errorInfo: React.ErrorInfo | null }> {
   override state: { error: Error | null, errorInfo: React.ErrorInfo | null } = {
@@ -46,12 +38,12 @@ class ErrorBoundary extends React.Component<React.PropsWithChildren<{}>, { error
   override render() {
     if (this.state.error || this.state.errorInfo) {
       return (
-        <AutoChip header={'Commit Metainfo Error'} dataTestId='metadata-error'>
-          <p>An error was encountered when trying to render Commit Metainfo. Please file a GitHub issue to report this error.</p>
+        <div className='metadata-view p-3'>
+          <p>An error was encountered when trying to render metadata.</p>
           <p>
             <pre style={{ overflow: 'scroll' }}>{this.state.error?.message}<br/>{this.state.error?.stack}<br/>{this.state.errorInfo?.componentStack}</pre>
           </p>
-        </AutoChip>
+        </div>
       );
     }
 
@@ -59,79 +51,71 @@ class ErrorBoundary extends React.Component<React.PropsWithChildren<{}>, { error
   }
 }
 
-export const MetadataView: React.FC<Metainfo> = metadata => <ErrorBoundary><InnerMetadataView {...metadata} /></ErrorBoundary>;
+export const MetadataView: React.FC<{ metadata: Metadata }> = params => {
+  return <ErrorBoundary><InnerMetadataView metadata={params.metadata}/></ErrorBoundary>;
+};
 
-const InnerMetadataView: React.FC<Metainfo> = metadata => {
-  if (!Object.keys(metadata).find(k => k.startsWith('revision.') || k.startsWith('ci.')))
-    return null;
+const InnerMetadataView: React.FC<{ metadata: Metadata }> = params => {
+  const searchParams = React.useContext(SearchParamsContext);
+  const commitInfo = params.metadata as MetadataWithCommitInfo;
+  const otherEntries = searchParams.has('show-metadata-other') ? Object.entries(params.metadata).filter(([key]) => !ignoreKeys.has(key)) : [];
+  const hasMetadata = commitInfo.ci || commitInfo.gitCommit || otherEntries.length > 0;
+  if (!hasMetadata)
+    return;
+  return <div className='metadata-view'>
+    {commitInfo.ci && !commitInfo.gitCommit && <CiInfoView info={commitInfo.ci}/>}
+    {commitInfo.gitCommit && <GitCommitInfoView ci={commitInfo.ci} commit={commitInfo.gitCommit}/>}
+    {otherEntries.length > 0 && (commitInfo.gitCommit || commitInfo.ci) && <div className='metadata-separator' />}
+    <div className='metadata-section metadata-properties' role='list'>
+      {otherEntries.map(([propertyName, value]) => {
+        const valueString = typeof value !== 'object' || value === null || value === undefined ? String(value) : JSON.stringify(value);
+        const trimmedValue = valueString.length > 1000 ? valueString.slice(0, 1000) + '\u2026' : valueString;
+        return (
+          <div key={propertyName} className='copyable-property' role='listitem'>
+            <CopyToClipboardContainer value={valueString}>
+              <span style={{ fontWeight: 'bold' }} title={propertyName}>{propertyName}</span>
+              : <span title={trimmedValue}>{linkifyText(trimmedValue)}</span>
+            </CopyToClipboardContainer>
+          </div>
+        );
+      })}
+    </div>
+  </div>;
+};
 
-  return (
-    <AutoChip header={
-      <span>
-        {metadata['revision.id'] && <span style={{ float: 'right' }}>
-          {metadata['revision.id'].slice(0, 7)}
-        </span>}
-        {metadata['revision.subject'] || 'Commit Metainfo'}
-      </span>} initialExpanded={false} dataTestId='metadata-chip'>
-      {metadata['revision.subject'] &&
-        <MetadataViewItem
-          testId='revision.subject'
-          content={<span>{metadata['revision.subject']}</span>}
-        />
-      }
-      {metadata['revision.id'] &&
-        <MetadataViewItem
-          testId='revision.id'
-          content={<span>{metadata['revision.id']}</span>}
-          href={metadata['revision.link']}
-          icon='commit'
-        />
-      }
-      {(metadata['revision.author'] || metadata['revision.email']) &&
-        <MetadataViewItem
-          content={`${metadata['revision.author']} ${metadata['revision.email']}`}
-          icon='person'
-        />
-      }
-      {metadata['revision.timestamp'] &&
-        <MetadataViewItem
-          testId='revision.timestamp'
-          content={
-            <>
-              {Intl.DateTimeFormat(undefined, { dateStyle: 'full' }).format(metadata['revision.timestamp'])}
-              {' '}
-              {Intl.DateTimeFormat(undefined, { timeStyle: 'long' }).format(metadata['revision.timestamp'])}
-            </>
-          }
-          icon='calendar'
-        />
-      }
-      {metadata['ci.link'] &&
-        <MetadataViewItem
-          content='CI/CD Logs'
-          href={metadata['ci.link']}
-          icon='externalLink'
-        />
-      }
-      {metadata['timestamp'] &&
-        <MetadataViewItem
-          content={<span style={{ color: 'var(--color-fg-subtle)' }}>
-            Report generated on {Intl.DateTimeFormat(undefined, { dateStyle: 'full', timeStyle: 'long' }).format(metadata['timestamp'])}
-          </span>}></MetadataViewItem>
-      }
-    </AutoChip>
-  );
+const CiInfoView: React.FC<{ info: CIInfo }> = ({ info }) => {
+  const title = info.prTitle || `Commit ${info.commitHash}`;
+  const link = info.prHref || info.commitHref;
+  return <div className='metadata-section' role='list'>
+    <div role='listitem'>
+      <a href={link} target='_blank' rel='noopener noreferrer' title={title}>{title}</a>
+    </div>
+  </div>;
 };
 
-const MetadataViewItem: React.FC<{ content: JSX.Element | string; icon?: keyof typeof icons, href?: string, testId?: string }> = ({ content, icon, href, testId }) => {
-  return (
-    <div className='my-1 hbox' data-testid={testId} >
-      <div className='mr-2'>
-        {icons[icon || 'blank']()}
-      </div>
-      <div style={{ flex: 1 }}>
-        {href ? <a href={href} target='_blank' rel='noopener noreferrer'>{content}</a> : content}
-      </div>
+const GitCommitInfoView: React.FC<{ ci?: CIInfo, commit: GitCommitInfo }> = ({ ci, commit }) => {
+  const title = ci?.prTitle || commit.subject;
+  const link = ci?.prHref || ci?.commitHref;
+  const email = ` <${commit.author.email}>`;
+  const author = `${commit.author.name}${email}`;
+  const shortTimestamp = Intl.DateTimeFormat(undefined, { dateStyle: 'medium' }).format(commit.committer.time);
+  const longTimestamp = Intl.DateTimeFormat(undefined, { dateStyle: 'full', timeStyle: 'long' }).format(commit.committer.time);
+
+  return <div className='metadata-section' role='list'>
+    <div role='listitem'>
+      {link && <a href={link} target='_blank' rel='noopener noreferrer' title={title}>{title}</a>}
+      {!link && <span title={title}>{title}</span>}
+    </div>
+    <div role='listitem' className='hbox'>
+      <span className='mr-1'>{author}</span>
+      <span title={longTimestamp}> on {shortTimestamp}</span>
     </div>
-  );
+  </div>;
+};
+
+const ignoreKeys = new Set(['ci', 'gitCommit', 'gitDiff', 'actualWorkers']);
+
+export const isMetadataEmpty = (metadata: MetadataWithCommitInfo): boolean => {
+  const otherEntries = Object.entries(metadata).filter(([key]) => !ignoreKeys.has(key));
+  return !metadata.ci && !metadata.gitCommit && !otherEntries.length;
 };
diff --git a/packages/html-reporter/src/reportView.tsx b/packages/html-reporter/src/reportView.tsx
index 796c03d6a133c..c68e130a5b533 100644
--- a/packages/html-reporter/src/reportView.tsx
+++ b/packages/html-reporter/src/reportView.tsx
@@ -14,19 +14,17 @@
   limitations under the License.
 */
 
-import type { FilteredStats, TestCase, TestFile, TestFileSummary } from './types';
+import type { FilteredStats, TestCase, TestCaseSummary, TestFile, TestFileSummary } from './types';
 import * as React from 'react';
 import './colors.css';
 import './common.css';
-import { Filter } from './filter';
-import { HeaderView } from './headerView';
-import { Route } from './links';
+import { Filter, filterWithQuery } from './filter';
+import { HeaderView, GlobalFilterView } from './headerView';
+import { navigate, Route, SearchParamsContext, testResultHref } from './links';
 import type { LoadedReport } from './loadedReport';
 import './reportView.css';
-import type { Metainfo } from './metadataView';
-import { MetadataView } from './metadataView';
 import { TestCaseView } from './testCaseView';
-import { TestFilesView } from './testFilesView';
+import { TestFilesHeader, TestFilesView } from './testFilesView';
 import './theme.css';
 
 declare global {
@@ -39,32 +37,110 @@ declare global {
 const testFilesRoutePredicate = (params: URLSearchParams) => !params.has('testId');
 const testCaseRoutePredicate = (params: URLSearchParams) => params.has('testId');
 
+type TestModelSummary = {
+  files: TestFileSummary[];
+  tests: TestCaseSummary[];
+};
+
 export const ReportView: React.FC<{
   report: LoadedReport | undefined,
 }> = ({ report }) => {
-  const searchParams = new URLSearchParams(window.location.hash.slice(1));
+  const searchParams = React.useContext(SearchParamsContext);
   const [expandedFiles, setExpandedFiles] = React.useState<Map<string, boolean>>(new Map());
   const [filterText, setFilterText] = React.useState(searchParams.get('q') || '');
+  const [metadataVisible, setMetadataVisible] = React.useState(false);
+  const testId = searchParams.get('testId');
+  const q = searchParams.get('q')?.toString() || '';
+  const filterParam = q ? '&q=' + q : '';
+  const reportTitle = report?.json()?.title;
+
+  const testIdToFileIdMap = React.useMemo(() => {
+    const map = new Map<string, string>();
+    for (const file of report?.json().files || []) {
+      for (const test of file.tests)
+        map.set(test.testId, file.fileId);
+    }
+    return map;
+  }, [report]);
 
   const filter = React.useMemo(() => Filter.parse(filterText), [filterText]);
-  const filteredStats = React.useMemo(() => computeStats(report?.json().files || [], filter), [report, filter]);
+  const filteredStats = React.useMemo(() => filter.empty() ? undefined : computeStats(report?.json().files || [], filter), [report, filter]);
+  const testModel = React.useMemo(() => {
+    const result: TestModelSummary = { files: [], tests: [] };
+    for (const file of report?.json().files || []) {
+      const tests = file.tests.filter(t => filter.matches(t));
+      if (tests.length)
+        result.files.push({ ...file, tests });
+      result.tests.push(...tests);
+    }
+    return result;
+  }, [report, filter]);
+
+  const { prev, next } = React.useMemo(() => {
+    const index = testModel.tests.findIndex(t => t.testId === testId);
+    const prev = index > 0 ? testModel.tests[index - 1] : undefined;
+    const next = index < testModel.tests.length - 1 ? testModel.tests[index + 1] : undefined;
+    return { prev, next };
+  }, [testId, testModel]);
+
+  React.useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement || event.shiftKey || event.ctrlKey || event.metaKey || event.altKey)
+        return;
+
+      switch (event.key) {
+        case 'a':
+          event.preventDefault();
+          navigate('#?');
+          break;
+        case 'p':
+          event.preventDefault();
+          navigate(filterWithQuery(q, 's:passed', false));
+          break;
+        case 'f':
+          event.preventDefault();
+          navigate(filterWithQuery(q, 's:failed', false));
+          break;
+        case 'ArrowLeft':
+          if (prev) {
+            event.preventDefault();
+            navigate(testResultHref({ test: prev }) + filterParam);
+          }
+          break;
+        case 'ArrowRight':
+          if (next) {
+            event.preventDefault();
+            navigate(testResultHref({ test: next }) + filterParam);
+          }
+          break;
+      }
+    };
+
+    document.addEventListener('keydown', handleKeyDown);
+    return () => document.removeEventListener('keydown', handleKeyDown);
+  }, [prev, next, filterParam, q]);
+
+  React.useEffect(() => {
+    if (reportTitle)
+      document.title = reportTitle;
+    else
+      document.title = 'Playwright Test Report';
+  }, [reportTitle]);
 
   return <div className='htmlreport vbox px-4 pb-4'>
     <main>
-      {report?.json() && <HeaderView stats={report.json().stats} filterText={filterText} setFilterText={setFilterText}></HeaderView>}
-      {report?.json().metadata && <MetadataView {...report?.json().metadata as Metainfo} />}
+      {report?.json() && <GlobalFilterView stats={report.json().stats} filterText={filterText} setFilterText={setFilterText} />}
       <Route predicate={testFilesRoutePredicate}>
+        <TestFilesHeader report={report?.json()} filteredStats={filteredStats} metadataVisible={metadataVisible} toggleMetadataVisible={() => setMetadataVisible(visible => !visible)}/>
         <TestFilesView
-          report={report?.json()}
-          filter={filter}
+          tests={testModel.files}
           expandedFiles={expandedFiles}
           setExpandedFiles={setExpandedFiles}
           projectNames={report?.json().projectNames || []}
-          filteredStats={filteredStats}
         />
       </Route>
       <Route predicate={testCaseRoutePredicate}>
-        {!!report && <TestCaseViewLoader report={report}></TestCaseViewLoader>}
+        {!!report && <TestCaseViewLoader report={report} next={next} prev={prev} testId={testId} testIdToFileIdMap={testIdToFileIdMap} />}
       </Route>
     </main>
   </div>;
@@ -72,39 +148,49 @@ export const ReportView: React.FC<{
 
 const TestCaseViewLoader: React.FC<{
   report: LoadedReport,
-}> = ({ report }) => {
-  const searchParams = new URLSearchParams(window.location.hash.slice(1));
-  const [test, setTest] = React.useState<TestCase | undefined>();
-  const testId = searchParams.get('testId');
-  const anchor = (searchParams.get('anchor') || '') as 'video' | 'diff' | '';
+  testId: string | null,
+  next?: TestCaseSummary,
+  prev?: TestCaseSummary,
+  testIdToFileIdMap: Map<string, string>,
+}> = ({ report, testIdToFileIdMap, next, prev, testId }) => {
+  const searchParams = React.useContext(SearchParamsContext);
+  const [test, setTest] = React.useState<TestCase | 'loading' | 'not-found'>('loading');
   const run = +(searchParams.get('run') || '0');
 
-  const testIdToFileIdMap = React.useMemo(() => {
-    const map = new Map<string, string>();
-    for (const file of report.json().files) {
-      for (const test of file.tests)
-        map.set(test.testId, file.fileId);
-    }
-    return map;
-  }, [report]);
-
   React.useEffect(() => {
     (async () => {
-      if (!testId || testId === test?.testId)
+      if (!testId || (typeof test === 'object' && testId === test.testId))
         return;
       const fileId = testIdToFileIdMap.get(testId);
-      if (!fileId)
+      if (!fileId) {
+        setTest('not-found');
         return;
-      const file = await report.entry(`${fileId}.json`) as TestFile;
-      for (const t of file.tests) {
-        if (t.testId === testId) {
-          setTest(t);
-          break;
-        }
       }
+      const file = await report.entry(`${fileId}.json`) as TestFile;
+      setTest(file?.tests.find(t => t.testId === testId) || 'not-found');
     })();
   }, [test, report, testId, testIdToFileIdMap]);
-  return <TestCaseView projectNames={report.json().projectNames} test={test} anchor={anchor} run={run}></TestCaseView>;
+
+  if (test === 'loading')
+    return <div className='test-case-column'></div>;
+
+  if (test === 'not-found') {
+    return <div className='test-case-column'>
+      <HeaderView title='Test not found' />
+      <div className='test-case-location'>Test ID: {testId}</div>
+    </div>;
+  }
+
+  return <div className='test-case-column'>
+    <TestCaseView
+      projectNames={report.json().projectNames}
+      testRunMetadata={report.json().metadata}
+      next={next}
+      prev={prev}
+      test={test}
+      run={run}
+    />
+  </div>;
 };
 
 function computeStats(files: TestFileSummary[], filter: Filter): FilteredStats {
@@ -119,4 +205,4 @@ function computeStats(files: TestFileSummary[], filter: Filter): FilteredStats {
       stats.duration += test.duration;
   }
   return stats;
-}
\ No newline at end of file
+}
diff --git a/packages/html-reporter/src/statusIcon.tsx b/packages/html-reporter/src/statusIcon.tsx
index 155f14041bcc3..39837955aecb7 100644
--- a/packages/html-reporter/src/statusIcon.tsx
+++ b/packages/html-reporter/src/statusIcon.tsx
@@ -32,6 +32,6 @@ export function statusIcon(status: 'failed' | 'timedOut' | 'skipped' | 'passed'
       return icons.warning();
     case 'skipped':
     case 'interrupted':
-      return icons.blank();
+      return icons.skip();
   }
 }
diff --git a/packages/html-reporter/src/tabbedPane.tsx b/packages/html-reporter/src/tabbedPane.tsx
index 769622137a3f9..af15b6b4fa381 100644
--- a/packages/html-reporter/src/tabbedPane.tsx
+++ b/packages/html-reporter/src/tabbedPane.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { clsx } from '@web/uiUtils';
 import './tabbedPane.css';
 import * as React from 'react';
 
@@ -29,14 +30,18 @@ export const TabbedPane: React.FunctionComponent<{
   selectedTab: string,
   setSelectedTab: (tab: string) => void
 }> = ({ tabs, selectedTab, setSelectedTab }) => {
+  const idPrefix = React.useId();
   return <div className='tabbed-pane'>
     <div className='vbox'>
       <div className='hbox' style={{ flex: 'none' }}>
-        <div className='tabbed-pane-tab-strip'>{
+        <div className='tabbed-pane-tab-strip' role='tablist'>{
           tabs.map(tab => (
-            <div className={'tabbed-pane-tab-element ' + (selectedTab === tab.id ? 'selected' : '')}
+            <div className={clsx('tabbed-pane-tab-element', selectedTab === tab.id && 'selected')}
               onClick={() => setSelectedTab(tab.id)}
-              key={tab.id}>
+              id={`${idPrefix}-${tab.id}`}
+              key={tab.id}
+              role='tab'
+              aria-selected={selectedTab === tab.id}>
               <div className='tabbed-pane-tab-label'>{tab.title}</div>
             </div>
           ))
@@ -45,7 +50,7 @@ export const TabbedPane: React.FunctionComponent<{
       {
         tabs.map(tab => {
           if (selectedTab === tab.id)
-            return <div key={tab.id} className='tab-content'>{tab.render()}</div>;
+            return <div key={tab.id} className='tab-content' role='tabpanel' aria-labelledby={`${idPrefix}-${tab.id}`}>{tab.render()}</div>;
         })
       }
     </div>
diff --git a/packages/html-reporter/src/testCaseView.css b/packages/html-reporter/src/testCaseView.css
index d87cf3aacbd97..9c8dd8f22eda1 100644
--- a/packages/html-reporter/src/testCaseView.css
+++ b/packages/html-reporter/src/testCaseView.css
@@ -16,7 +16,7 @@
 
 .test-case-column {
   border-radius: 6px;
-  margin: 24px 0;
+  margin-bottom: 24px;
 }
 
 .test-case-column .tab-element.selected {
@@ -34,14 +34,6 @@
   color: var(--color-fg-default);
 }
 
-.test-case-title {
-  flex: none;
-  padding: 8px;
-  font-weight: 400;
-  font-size: 32px !important;
-  line-height: 1.25 !important;
-}
-
 .test-case-location,
 .test-case-duration {
   flex: none;
@@ -49,10 +41,16 @@
   padding: 0 8px 8px;
 }
 
-.test-case-path {
+.test-case-run-duration {
+  color: var(--color-fg-muted);
+  padding-left: 8px;
+}
+
+.header-view .test-case-path {
   flex: none;
+  flex-shrink: 1;
   align-items: center;
-  padding: 0 8px;
+  padding-right: 8px;
 }
 
 .test-case-annotation {
@@ -60,6 +58,7 @@
   align-items: center;
   padding: 0 8px;
   line-height: 24px;
+  white-space: pre-wrap;
 }
 
 @media only screen and (max-width: 600px) {
@@ -68,9 +67,3 @@
     margin: 0 !important;
   }
 }
-
-.test-case-project-labels-row {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
\ No newline at end of file
diff --git a/packages/html-reporter/src/testCaseView.spec.tsx b/packages/html-reporter/src/testCaseView.spec.tsx
index 624a93805f913..36ceff484a366 100644
--- a/packages/html-reporter/src/testCaseView.spec.tsx
+++ b/packages/html-reporter/src/testCaseView.spec.tsx
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { test, expect } from '@playwright/experimental-ct-react';
 import { TestCaseView } from './testCaseView';
-import type { TestCase, TestResult } from './types';
+import type { TestCase, TestCaseSummary, TestResult } from './types';
 
 test.use({ viewport: { width: 800, height: 600 } });
 
@@ -38,9 +37,16 @@ const result: TestResult = {
       duration: 10,
       location: { file: 'test.spec.ts', line: 82, column: 0 },
       steps: [],
+      attachments: [],
       count: 1,
     }],
+    attachments: [],
   }],
+  annotations: [
+    { type: 'annotation', description: 'Annotation text' },
+    { type: 'annotation', description: 'Another annotation text' },
+    { type: '_annotation', description: 'Hidden annotation' },
+  ],
   attachments: [],
   status: 'passed',
 };
@@ -51,20 +57,16 @@ const testCase: TestCase = {
   path: [],
   projectName: 'chromium',
   location: { file: 'test.spec.ts', line: 42, column: 0 },
-  annotations: [
-    { type: 'annotation', description: 'Annotation text' },
-    { type: 'annotation', description: 'Another annotation text' },
-    { type: '_annotation', description: 'Hidden annotation' },
-  ],
+  annotations: result.annotations,
   tags: [],
   outcome: 'expected',
-  duration: 10,
+  duration: 200,
   ok: true,
   results: [result]
 };
 
 test('should render test case', async ({ mount }) => {
-  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} test={testCase} run={0} anchor=''></TestCaseView>);
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={testCase} prev={undefined} next={undefined} run={0}></TestCaseView>);
   await expect(component.getByText('Annotation text', { exact: false }).first()).toBeVisible();
   await expect(component.getByText('Hidden annotation')).toBeHidden();
   await component.getByText('Annotations').click();
@@ -77,26 +79,41 @@ test('should render test case', async ({ mount }) => {
   await expect(component.getByText('My test')).toBeVisible();
 });
 
+test('should render copy buttons for annotations', async ({ mount, page, context }) => {
+  await context.grantPermissions(['clipboard-read', 'clipboard-write']);
+
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={testCase} prev={undefined} next={undefined} run={0}></TestCaseView>);
+  await expect(component.getByText('Annotation text', { exact: false }).first()).toBeVisible();
+  await component.getByText('Annotation text', { exact: false }).first().hover();
+  await expect(component.locator('.test-case-annotation').getByLabel('Copy to clipboard').first()).toBeVisible();
+  await component.locator('.test-case-annotation').getByLabel('Copy to clipboard').first().click();
+  const handle = await page.evaluateHandle(() => navigator.clipboard.readText());
+  const clipboardContent = await handle.jsonValue();
+  expect(clipboardContent).toBe('Annotation text');
+});
+
 const annotationLinkRenderingTestCase: TestCase = {
   testId: 'testid',
   title: 'My test',
   path: [],
   projectName: 'chromium',
   location: { file: 'test.spec.ts', line: 42, column: 0 },
-  annotations: [
-    { type: 'more info', description: 'read https://playwright.dev/docs/intro and https://playwright.dev/docs/api/class-playwright' },
-    { type: 'related issues', description: 'https://github.com/microsoft/playwright/issues/23180, https://github.com/microsoft/playwright/issues/23181' },
-
-  ],
+  annotations: [],
   tags: [],
   outcome: 'expected',
   duration: 10,
   ok: true,
-  results: [result]
+  results: [{
+    ...result,
+    annotations: [
+      { type: 'more info', description: 'read https://playwright.dev/docs/intro and https://playwright.dev/docs/api/class-playwright' },
+      { type: 'related issues', description: 'https://github.com/microsoft/playwright/issues/23180, https://github.com/microsoft/playwright/issues/23181' },
+    ]
+  }]
 };
 
 test('should correctly render links in annotations', async ({ mount }) => {
-  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} test={annotationLinkRenderingTestCase} run={0} anchor=''></TestCaseView>);
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={annotationLinkRenderingTestCase} prev={undefined} next={undefined} run={0}></TestCaseView>);
 
   const firstLink = await component.getByText('https://playwright.dev/docs/intro').first();
   await expect(firstLink).toBeVisible();
@@ -127,6 +144,7 @@ const resultWithAttachment: TestResult = {
     location: { file: 'test.spec.ts', line: 62, column: 0 },
     count: 1,
     steps: [],
+    attachments: [1],
   }],
   attachments: [{
     name: 'first attachment',
@@ -136,12 +154,27 @@ const resultWithAttachment: TestResult = {
     name: 'attachment with inline link https://github.com/microsoft/playwright/issues/31284',
     contentType: 'text/plain'
   }],
+  annotations: [],
   status: 'passed',
 };
 
 const attachmentLinkRenderingTestCase: TestCase = {
   testId: 'testid',
   title: 'My test',
+  path: ['group'],
+  projectName: 'chromium',
+  location: { file: 'test.spec.ts', line: 42, column: 0 },
+  tags: [],
+  outcome: 'expected',
+  duration: 10,
+  ok: true,
+  annotations: [],
+  results: [resultWithAttachment]
+};
+
+const testCaseSummary: TestCaseSummary = {
+  testId: 'nextTestId',
+  title: 'next test',
   path: [],
   projectName: 'chromium',
   location: { file: 'test.spec.ts', line: 42, column: 0 },
@@ -153,18 +186,72 @@ const attachmentLinkRenderingTestCase: TestCase = {
   results: [resultWithAttachment]
 };
 
+
 test('should correctly render links in attachments', async ({ mount }) => {
-  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} test={attachmentLinkRenderingTestCase} run={0} anchor=''></TestCaseView>);
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={attachmentLinkRenderingTestCase} prev={undefined} next={undefined} run={0}></TestCaseView>);
   await component.getByText('first attachment').click();
   const body = await component.getByText('The body with https://playwright.dev/docs/intro link');
   await expect(body).toBeVisible();
   await expect(body.locator('a').filter({ hasText: 'playwright.dev' })).toHaveAttribute('href', 'https://playwright.dev/docs/intro');
   await expect(body.locator('a').filter({ hasText: 'github.com' })).toHaveAttribute('href', 'https://github.com/microsoft/playwright/issues/31284');
+  await expect(component).toMatchAriaSnapshot(`
+    - link "https://playwright.dev/docs/intro"
+    - link "https://github.com/microsoft/playwright/issues/31284"
+  `);
 });
 
 test('should correctly render links in attachment name', async ({ mount }) => {
-  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} test={attachmentLinkRenderingTestCase} run={0} anchor=''></TestCaseView>);
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={attachmentLinkRenderingTestCase} prev={undefined} next={undefined} run={0}></TestCaseView>);
   const link = component.getByText('attachment with inline link').locator('a');
   await expect(link).toHaveAttribute('href', 'https://github.com/microsoft/playwright/issues/31284');
   await expect(link).toHaveText('https://github.com/microsoft/playwright/issues/31284');
+  await expect(component).toMatchAriaSnapshot(`
+    - link /https:\\/\\/github\\.com\\/microsoft\\/playwright\\/issues\\/\\d+/
+  `);
+});
+
+test('should correctly render prev and next', async ({ mount }) => {
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={attachmentLinkRenderingTestCase} prev={testCaseSummary} next={testCaseSummary} run={0}></TestCaseView>);
+  await expect(component).toMatchAriaSnapshot(`
+    - text: group
+    - link "« previous"
+    - link "next »"
+    - text: "My test test.spec.ts:42 10ms"
+  `);
+});
+
+
+const testCaseWithTwoAttempts: TestCase = {
+  ...testCase,
+  results: [
+    {
+      ...result,
+      errors: [{ message: 'Error message' }],
+      status: 'failed',
+      duration: 50,
+    },
+    {
+      ...result,
+      duration: 150,
+      status: 'passed',
+    },
+  ],
+};
+
+test('total duration is selected run duration', async ({ mount, page }) => {
+  const component = await mount(<TestCaseView projectNames={['chromium', 'webkit']} testRunMetadata={{}} test={testCaseWithTwoAttempts} prev={undefined} next={undefined} run={0}></TestCaseView>);
+  await expect(component).toMatchAriaSnapshot(`
+    - text: "My test test.spec.ts:42 200ms"
+    - tablist:
+      - tab "Run 50ms"
+      - 'tab "Retry #1 150ms"'
+  `);
+  await page.getByRole('tab', { name: 'Run' }).click();
+  await expect(component).toMatchAriaSnapshot(`
+    - text: "My test test.spec.ts:42 200ms"
+  `);
+  await page.getByRole('tab', { name: 'Retry' }).click();
+  await expect(component).toMatchAriaSnapshot(`
+    - text: "My test test.spec.ts:42 200ms"
+  `);
 });
diff --git a/packages/html-reporter/src/testCaseView.tsx b/packages/html-reporter/src/testCaseView.tsx
index f4d76653cfcb3..c068a030b1537 100644
--- a/packages/html-reporter/src/testCaseView.tsx
+++ b/packages/html-reporter/src/testCaseView.tsx
@@ -14,65 +14,87 @@
   limitations under the License.
 */
 
-import type { TestCase, TestCaseAnnotation } from './types';
+import type { TestAnnotation } from '@playwright/test';
+import type { TestCase, TestCaseSummary } from './types';
 import * as React from 'react';
 import { TabbedPane } from './tabbedPane';
 import { AutoChip } from './chip';
 import './common.css';
-import { ProjectLink } from './links';
+import { Link, SearchParamsContext, testResultHref, TraceLink } from './links';
 import { statusIcon } from './statusIcon';
 import './testCaseView.css';
 import { TestResultView } from './testResultView';
-import { linkifyText } from './renderUtils';
-import { hashStringToInt, msToString } from './utils';
+import { linkifyText } from '@web/renderUtils';
+import { msToString } from './utils';
+import { clsx } from '@web/uiUtils';
+import { CopyToClipboardContainer } from './copyToClipboard';
+import { HeaderView } from './headerView';
+import type { MetadataWithCommitInfo } from '@playwright/isomorphic/types';
+import { ProjectAndTagLabelsView } from './labels';
 
 export const TestCaseView: React.FC<{
   projectNames: string[],
-  test: TestCase | undefined,
-  anchor: 'video' | 'diff' | '',
+  test: TestCase,
+  testRunMetadata: MetadataWithCommitInfo | undefined,
+  next: TestCaseSummary | undefined,
+  prev: TestCaseSummary | undefined,
   run: number,
-}> = ({ projectNames, test, run, anchor }) => {
+}> = ({ projectNames, test, testRunMetadata, run, next, prev }) => {
   const [selectedResultIndex, setSelectedResultIndex] = React.useState(run);
+  const searchParams = React.useContext(SearchParamsContext);
 
-  const labels = React.useMemo(() => {
-    if (!test)
-      return undefined;
-    return test.tags;
-  }, [test]);
+  const filterParam = searchParams.has('q') ? '&q=' + searchParams.get('q') : '';
+  const visibleTestAnnotations = test.annotations.filter(a => !a.type.startsWith('_')) ?? [];
 
-  const visibleAnnotations = React.useMemo(() => {
-    return test?.annotations?.filter(annotation => !annotation.type.startsWith('_')) || [];
-  }, [test?.annotations]);
-
-  return <div className='test-case-column vbox'>
-    {test && <div className='test-case-path'>{test.path.join(' › ')}</div>}
-    {test && <div className='test-case-title'>{test?.title}</div>}
-    {test && <div className='hbox'>
-      <div className='test-case-location'>{test.location.file}:{test.location.line}</div>
+  return <>
+    <HeaderView
+      title={test.title}
+      leftSuperHeader={<div className='test-case-path'>{test.path.join(' › ')}</div>}
+      rightSuperHeader={<>
+        <div className={clsx(!prev && 'hidden')}><Link href={testResultHref({ test: prev }) + filterParam}>« previous</Link></div>
+        <div style={{ width: 10 }}></div>
+        <div className={clsx(!next && 'hidden')}><Link href={testResultHref({ test: next }) + filterParam}>next »</Link></div>
+      </>}
+    />
+    <div className='hbox' style={{ lineHeight: '24px' }}>
+      <div className='test-case-location'>
+        <CopyToClipboardContainer value={`${test.location.file}:${test.location.line}`}>
+          {test.location.file}:{test.location.line}
+        </CopyToClipboardContainer>
+      </div>
       <div style={{ flex: 'auto' }}></div>
+      <TraceLink test={test} trailingSeparator={true} />
       <div className='test-case-duration'>{msToString(test.duration)}</div>
-    </div>}
-    {test && (!!test.projectName || labels) && <div className='test-case-project-labels-row'>
-      {test && !!test.projectName && <ProjectLink projectNames={projectNames} projectName={test.projectName}></ProjectLink>}
-      {labels && <LabelsLinkView labels={labels} />}
-    </div>}
-    {!!visibleAnnotations.length && <AutoChip header='Annotations'>
-      {visibleAnnotations.map(annotation => <TestCaseAnnotationView annotation={annotation} />)}
+    </div>
+    <ProjectAndTagLabelsView style={{ marginLeft: '6px' }} projectNames={projectNames} activeProjectName={test.projectName} otherLabels={test.tags} />
+    {test.results.length === 0 && visibleTestAnnotations.length !== 0 && <AutoChip header='Annotations' dataTestId='test-case-annotations'>
+      {visibleTestAnnotations.map((annotation, index) => <TestCaseAnnotationView key={index} annotation={annotation} />)}
     </AutoChip>}
-    {test && <TabbedPane tabs={
+    <TabbedPane tabs={
       test.results.map((result, index) => ({
         id: String(index),
-        title: <div style={{ display: 'flex', alignItems: 'center' }}>{statusIcon(result.status)} {retryLabel(index)}</div>,
-        render: () => <TestResultView test={test!} result={result} anchor={anchor}></TestResultView>
-      })) || []} selectedTab={String(selectedResultIndex)} setSelectedTab={id => setSelectedResultIndex(+id)} />}
-  </div>;
+        title: <div style={{ display: 'flex', alignItems: 'center' }}>
+          {statusIcon(result.status)} {retryLabel(index)}
+          {(test.results.length > 1) && <span className='test-case-run-duration'>{msToString(result.duration)}</span>}
+        </div>,
+        render: () => {
+          const visibleAnnotations = result.annotations.filter(annotation => !annotation.type.startsWith('_'));
+          return <>
+            {!!visibleAnnotations.length && <AutoChip header='Annotations' dataTestId='test-case-annotations'>
+              {visibleAnnotations.map((annotation, index) => <TestCaseAnnotationView key={index} annotation={annotation} />)}
+            </AutoChip>}
+            <TestResultView test={test!} result={result} testRunMetadata={testRunMetadata} />
+          </>;
+        },
+      })) || []} selectedTab={String(selectedResultIndex)} setSelectedTab={id => setSelectedResultIndex(+id)} />
+  </>;
 };
 
-function TestCaseAnnotationView({ annotation: { type, description } }: { annotation: TestCaseAnnotation }) {
+function TestCaseAnnotationView({ annotation: { type, description } }: { annotation: TestAnnotation }) {
   return (
     <div className='test-case-annotation'>
       <span style={{ fontWeight: 'bold' }}>{type}</span>
-      {description && <span>: {linkifyText(description)}</span>}
+      {description && <CopyToClipboardContainer value={description}>: {linkifyText(description)}</CopyToClipboardContainer>}
     </div>
   );
 }
@@ -82,19 +104,3 @@ function retryLabel(index: number) {
     return 'Run';
   return `Retry #${index}`;
 }
-
-const LabelsLinkView: React.FC<React.PropsWithChildren<{
-  labels: string[],
-}>> = ({ labels }) => {
-  return labels.length > 0 ? (
-    <>
-      {labels.map(label => (
-        <a key={label} style={{ textDecoration: 'none', color: 'var(--color-fg-default)' }} href={`#?q=${label}`} >
-          <span style={{ margin: '6px 0 0 6px', cursor: 'pointer' }} className={'label label-color-' + (hashStringToInt(label))}>
-            {label.slice(1)}
-          </span>
-        </a>
-      ))}
-    </>
-  ) : null;
-};
diff --git a/packages/html-reporter/src/testErrorView.css b/packages/html-reporter/src/testErrorView.css
index afb543a0c29b6..8e9ae4bf9738f 100644
--- a/packages/html-reporter/src/testErrorView.css
+++ b/packages/html-reporter/src/testErrorView.css
@@ -14,15 +14,24 @@
   limitations under the License.
 */
 
-.test-error-message {
+@import '@web/third_party/vscode/colors.css';
+
+.test-error-container {
+  position: relative;
   white-space: pre;
-  font-family: monospace;
-  overflow: auto;
   flex: none;
   padding: 0;
   background-color: var(--color-canvas-subtle);
   border-radius: 6px;
-  padding: 16px;
   line-height: initial;
   margin-bottom: 6px;
 }
+
+.test-error-view {
+  overflow: auto;
+  padding: 16px;
+}
+
+.test-error-text {
+  font-family: monospace;
+}
diff --git a/packages/html-reporter/src/testErrorView.tsx b/packages/html-reporter/src/testErrorView.tsx
index 5208158b1cfba..6fa7bc50ecb17 100644
--- a/packages/html-reporter/src/testErrorView.tsx
+++ b/packages/html-reporter/src/testErrorView.tsx
@@ -14,43 +14,50 @@
   limitations under the License.
 */
 
-import ansi2html from 'ansi-to-html';
+import { ansi2html } from '@web/ansi2html';
 import * as React from 'react';
 import './testErrorView.css';
+import type { ImageDiff } from '@web/shared/imageDiffView';
+import { ImageDiffView } from '@web/shared/imageDiffView';
 
-export const TestErrorView: React.FC<{
-  error: string;
-}> = ({ error }) => {
-  const html = React.useMemo(() => {
-    const config: any = {
-      bg: 'var(--color-canvas-subtle)',
-      fg: 'var(--color-fg-default)',
-    };
-    config.colors = ansiColors;
-    return new ansi2html(config).toHtml(escapeHTML(error));
-  }, [error]);
-  return <div className='test-error-message' dangerouslySetInnerHTML={{ __html: html || '' }}></div>;
+export const CodeSnippet = ({ code, children, testId }: React.PropsWithChildren<{ code: string; testId?: string; }>) => {
+  const html = React.useMemo(() => ansiErrorToHtml(code), [code]);
+  return (
+    <div className='test-error-container test-error-text' data-testid={testId}>
+      {children}
+      <div className='test-error-view' dangerouslySetInnerHTML={{ __html: html || '' }}></div>
+    </div>
+  );
 };
 
-const ansiColors = {
-  0: '#000',
-  1: '#C00',
-  2: '#0C0',
-  3: '#C50',
-  4: '#00C',
-  5: '#C0C',
-  6: '#0CC',
-  7: '#CCC',
-  8: '#555',
-  9: '#F55',
-  10: '#5F5',
-  11: '#FF5',
-  12: '#55F',
-  13: '#F5F',
-  14: '#5FF',
-  15: '#FFF'
+export const PromptButton: React.FC<{ prompt: string }> = ({ prompt }) => {
+  const [copied, setCopied] = React.useState(false);
+  return <button
+    className='button'
+    style={{ minWidth: 100 }}
+    onClick={async () => {
+      await navigator.clipboard.writeText(prompt);
+      setCopied(true);
+      setTimeout(() => {
+        setCopied(false);
+      }, 3000);
+    }}>
+    {copied ? 'Copied' : 'Copy prompt'}
+  </button>;
 };
 
-function escapeHTML(text: string): string {
-  return text.replace(/[&"<>]/g, c => ({ '&': '&amp;', '"': '&quot;', '<': '&lt;', '>': '&gt;' }[c]!));
+export const TestScreenshotErrorView: React.FC<{
+  diff: ImageDiff,
+}> = ({ diff }) => {
+  return <div data-testid='test-screenshot-error-view' className='test-error-view'>
+    <ImageDiffView key='image-diff' diff={diff} hideDetails={true}></ImageDiffView>
+  </div>;
+};
+
+function ansiErrorToHtml(text?: string): string {
+  const defaultColors = {
+    bg: 'var(--color-canvas-subtle)',
+    fg: 'var(--color-fg-default)',
+  };
+  return ansi2html(text || '', defaultColors);
 }
diff --git a/packages/html-reporter/src/testFileView.css b/packages/html-reporter/src/testFileView.css
index 72858846bb437..006dda1042968 100644
--- a/packages/html-reporter/src/testFileView.css
+++ b/packages/html-reporter/src/testFileView.css
@@ -17,7 +17,7 @@
 .test-file-test {
   line-height: 32px;
   align-items: center;
-  padding: 2px 10px;
+  padding: 2px 8px;
   overflow: hidden;
   text-overflow: ellipsis;
 }
@@ -36,31 +36,34 @@
   margin: 0 0 0 15px;
   line-height: 16px;
   font-weight: 400;
-  color: var(--color-fg-subtle);
+  color: var(--color-fg-muted);
   display: flex;
   align-items: center;
 }
 
-.test-file-path {
-  text-overflow: ellipsis;
-  overflow: hidden;
-  color: var(--color-fg-subtle);
+.test-file-details-row-items {
+  display: flex;
+  height: 16px;
 }
 
-.test-file-path-link {
-  margin-right: 10px;
+.test-file-details-row-items > .link-badge {
+  /* Align badges */
+  margin-top: -2px;
 }
 
-.test-file-badge {
-  flex: none;
+.test-file-details-row-items > .trace-link {
+  /* Center in row */
+  margin-top: -4px;
 }
 
-.test-file-badge svg {
-  fill: var(--color-fg-subtle);
+.test-file-path {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  color: var(--color-fg-muted);
 }
 
-.test-file-badge:hover svg {
-  fill: var(--color-fg-muted);
+.test-file-path-link {
+  margin-right: 10px;
 }
 
 .test-file-test-outcome-skipped {
@@ -69,4 +72,16 @@
 
 .test-file-test-status-icon {
   flex: none;
+}
+
+.test-file-header-info {
+  display: flex;
+  align-items: center;
+  gap: 4px 8px;
+  color: var(--color-fg-muted);
+}
+
+.test-file-header-br {
+  flex-basis: 100%;
+  height: 0;
 }
\ No newline at end of file
diff --git a/packages/html-reporter/src/testFileView.tsx b/packages/html-reporter/src/testFileView.tsx
index 184b2b63ba601..fa88fbb65be58 100644
--- a/packages/html-reporter/src/testFileView.tsx
+++ b/packages/html-reporter/src/testFileView.tsx
@@ -14,55 +14,57 @@
   limitations under the License.
 */
 
-import type { HTMLReport, TestCaseSummary, TestFileSummary } from './types';
+import type { TestCaseSummary, TestFileSummary } from './types';
 import * as React from 'react';
-import { hashStringToInt, msToString } from './utils';
+import { msToString } from './utils';
 import { Chip } from './chip';
-import { filterWithToken, type Filter } from './filter';
-import { generateTraceUrl, Link, navigate, ProjectLink } from './links';
+import { Link, LinkBadge, SearchParamsContext, testResultHref, TraceLink } from './links';
 import { statusIcon } from './statusIcon';
 import './testFileView.css';
-import { video, image, trace } from './icons';
+import { video, image } from './icons';
+import { clsx } from '@web/uiUtils';
+import { ProjectAndTagLabelsView } from './labels';
 
 export const TestFileView: React.FC<React.PropsWithChildren<{
-  report: HTMLReport;
   file: TestFileSummary;
+  projectNames: string[];
   isFileExpanded: (fileId: string) => boolean;
   setFileExpanded: (fileId: string, expanded: boolean) => void;
-  filter: Filter;
-}>> = ({ file, report, isFileExpanded, setFileExpanded, filter }) => {
+}>> = ({ file, projectNames, isFileExpanded, setFileExpanded }) => {
+  const searchParams = React.useContext(SearchParamsContext);
+  const filterParam = searchParams.has('q') ? '&q=' + searchParams.get('q') : '';
   return <Chip
     expanded={isFileExpanded(file.fileId)}
     noInsets={true}
     setExpanded={(expanded => setFileExpanded(file.fileId, expanded))}
-    header={<span>
+    header={<span className='chip-header-allow-selection'>
       {file.fileName}
     </span>}>
-    {file.tests.filter(t => filter.matches(t)).map(test =>
-      <div key={`test-${test.testId}`} className={'test-file-test test-file-test-outcome-' + test.outcome}>
+    {file.tests.map(test =>
+      <div key={`test-${test.testId}`} className={clsx('test-file-test', 'test-file-test-outcome-' + test.outcome)}>
         <div className='hbox' style={{ alignItems: 'flex-start' }}>
           <div className='hbox'>
             <span className='test-file-test-status-icon'>
               {statusIcon(test.outcome)}
             </span>
             <span>
-              <Link href={`#?testId=${test.testId}`} title={[...test.path, test.title].join(' › ')}>
+              <Link href={testResultHref({ test }) + filterParam} title={[...test.path, test.title].join(' › ')}>
                 <span className='test-file-title'>{[...test.path, test.title].join(' › ')}</span>
               </Link>
-              {report.projectNames.length > 1 && !!test.projectName &&
-              <ProjectLink projectNames={report.projectNames} projectName={test.projectName} />}
-              <LabelsClickView labels={test.tags} />
+              <ProjectAndTagLabelsView style={{ marginLeft: '6px' }} projectNames={projectNames} activeProjectName={test.projectName} otherLabels={test.tags} />
             </span>
           </div>
           <span data-testid='test-duration' style={{ minWidth: '50px', textAlign: 'right' }}>{msToString(test.duration)}</span>
         </div>
         <div className='test-file-details-row'>
-          <Link href={`#?testId=${test.testId}`} title={[...test.path, test.title].join(' › ')} className='test-file-path-link'>
-            <span className='test-file-path'>{test.location.file}:{test.location.line}</span>
-          </Link>
-          {imageDiffBadge(test)}
-          {videoBadge(test)}
-          {traceBadge(test)}
+          <div className='test-file-details-row-items'>
+            <Link href={testResultHref({ test })} title={[...test.path, test.title].join(' › ')} className='test-file-path-link'>
+              <span className='test-file-path'>{test.location.file}:{test.location.line}</span>
+            </Link>
+            {imageDiffBadge(test)}
+            {videoBadge(test)}
+            <TraceLink test={test} dim={true} />
+          </div>
         </div>
       </div>
     )}
@@ -70,41 +72,15 @@ export const TestFileView: React.FC<React.PropsWithChildren<{
 };
 
 function imageDiffBadge(test: TestCaseSummary): JSX.Element | undefined {
-  const resultWithImageDiff = test.results.find(result => result.attachments.some(attachment => {
-    return attachment.contentType.startsWith('image/') && !!attachment.name.match(/-(expected|actual|diff)/);
-  }));
-  return resultWithImageDiff ? <Link href={`#?testId=${test.testId}&anchor=diff&run=${test.results.indexOf(resultWithImageDiff)}`} title='View images' className='test-file-badge'>{image()}</Link> : undefined;
+  for (const result of test.results) {
+    for (const attachment of result.attachments) {
+      if (attachment.contentType.startsWith('image/') && !!attachment.name.match(/-(expected|actual|diff)/))
+        return <LinkBadge href={testResultHref({ test, result, anchor: `attachment-${result.attachments.indexOf(attachment)}` })} title='View images' dim={true}>{image()}</LinkBadge>;
+    }
+  }
 }
 
 function videoBadge(test: TestCaseSummary): JSX.Element | undefined {
   const resultWithVideo = test.results.find(result => result.attachments.some(attachment => attachment.name === 'video'));
-  return resultWithVideo ? <Link href={`#?testId=${test.testId}&anchor=video&run=${test.results.indexOf(resultWithVideo)}`} title='View video' className='test-file-badge'>{video()}</Link> : undefined;
-}
-
-function traceBadge(test: TestCaseSummary): JSX.Element | undefined {
-  const firstTraces = test.results.map(result => result.attachments.filter(attachment => attachment.name === 'trace')).filter(traces => traces.length > 0)[0];
-  return firstTraces ? <Link href={generateTraceUrl(firstTraces)} title='View trace' className='test-file-badge'>{trace()}</Link> : undefined;
+  return resultWithVideo ? <LinkBadge href={testResultHref({ test, result: resultWithVideo, anchor: 'attachment-video' })} title='View video' dim={true}>{video()}</LinkBadge> : undefined;
 }
-
-const LabelsClickView: React.FC<React.PropsWithChildren<{
-  labels: string[],
-}>> = ({ labels }) => {
-
-  const onClickHandle = (e: React.MouseEvent, label: string) => {
-    e.preventDefault();
-    const searchParams = new URLSearchParams(window.location.hash.slice(1));
-    const q = searchParams.get('q')?.toString() || '';
-    const tokens = q.split(' ');
-    navigate(filterWithToken(tokens, label, e.metaKey || e.ctrlKey));
-  };
-
-  return labels.length > 0 ? (
-    <>
-      {labels.map(label => (
-        <span key={label} style={{ margin: '6px 0 0 6px', cursor: 'pointer' }} className={'label label-color-' + (hashStringToInt(label))} onClick={e => onClickHandle(e, label)}>
-          {label.slice(1)}
-        </span>
-      ))}
-    </>
-  ) : null;
-};
diff --git a/packages/html-reporter/src/testFilesView.tsx b/packages/html-reporter/src/testFilesView.tsx
index 30c80c075ba80..efffa58a955f1 100644
--- a/packages/html-reporter/src/testFilesView.tsx
+++ b/packages/html-reporter/src/testFilesView.tsx
@@ -16,48 +16,37 @@
 
 import type { FilteredStats, HTMLReport, TestFileSummary } from './types';
 import * as React from 'react';
-import type { Filter } from './filter';
 import { TestFileView } from './testFileView';
 import './testFileView.css';
 import { msToString } from './utils';
 import { AutoChip } from './chip';
-import { TestErrorView } from './testErrorView';
+import { CodeSnippet } from './testErrorView';
+import * as icons from './icons';
+import { isMetadataEmpty, MetadataView } from './metadataView';
+import { HeaderView } from './headerView';
+import { clsx } from '@web/uiUtils';
 
 export const TestFilesView: React.FC<{
-  report?: HTMLReport,
+  tests: TestFileSummary[],
   expandedFiles: Map<string, boolean>,
   setExpandedFiles: (value: Map<string, boolean>) => void,
-  filter: Filter,
-  filteredStats: FilteredStats,
   projectNames: string[],
-}> = ({ report, filter, expandedFiles, setExpandedFiles, projectNames, filteredStats }) => {
+}> = ({ tests, expandedFiles, setExpandedFiles, projectNames }) => {
   const filteredFiles = React.useMemo(() => {
     const result: { file: TestFileSummary, defaultExpanded: boolean }[] = [];
     let visibleTests = 0;
-    for (const file of report?.files || []) {
-      const tests = file.tests.filter(t => filter.matches(t));
-      visibleTests += tests.length;
-      if (tests.length)
-        result.push({ file, defaultExpanded: visibleTests < 200 });
+    for (const file of tests) {
+      visibleTests += file.tests.length;
+      result.push({ file, defaultExpanded: visibleTests < 200 });
     }
     return result;
-  }, [report, filter]);
+  }, [tests]);
   return <>
-    <div className='mt-2 mx-1' style={{ display: 'flex' }}>
-      {projectNames.length === 1 && !!projectNames[0] && <div data-testid='project-name' style={{ color: 'var(--color-fg-subtle)' }}>Project: {projectNames[0]}</div>}
-      {!filter.empty() && <div data-testid='filtered-tests-count' style={{ color: 'var(--color-fg-subtle)', padding: '0 10px' }}>Filtered: {filteredStats.total} {!!filteredStats.total && ('(' + msToString(filteredStats.duration) + ')')}</div>}
-      <div style={{ flex: 'auto' }}></div>
-      <div data-testid='overall-time' style={{ color: 'var(--color-fg-subtle)', marginRight: '10px' }}>{report ? new Date(report.startTime).toLocaleString() : ''}</div>
-      <div data-testid='overall-duration' style={{ color: 'var(--color-fg-subtle)' }}>Total time: {msToString(report?.duration ?? 0)}</div>
-    </div>
-    {report && !!report.errors.length && <AutoChip header='Errors' dataTestId='report-errors'>
-      {report.errors.map((error, index) => <TestErrorView key={'test-report-error-message-' + index} error={error}></TestErrorView>)}
-    </AutoChip>}
-    {report && filteredFiles.map(({ file, defaultExpanded }) => {
+    {filteredFiles.map(({ file, defaultExpanded }) => {
       return <TestFileView
         key={`file-${file.fileId}`}
-        report={report}
         file={file}
+        projectNames={projectNames}
         isFileExpanded={fileId => {
           const value = expandedFiles.get(fileId);
           if (value === undefined)
@@ -68,9 +57,47 @@ export const TestFilesView: React.FC<{
           const newExpanded = new Map(expandedFiles);
           newExpanded.set(fileId, expanded);
           setExpandedFiles(newExpanded);
-        }}
-        filter={filter}>
+        }}>
       </TestFileView>;
     })}
   </>;
 };
+
+export const TestFilesHeader: React.FC<{
+  report: HTMLReport | undefined,
+  filteredStats?: FilteredStats,
+  metadataVisible: boolean,
+  toggleMetadataVisible: () => void,
+}> = ({ report, filteredStats, metadataVisible, toggleMetadataVisible }) => {
+  if (!report)
+    return null;
+
+  const showProject = report.projectNames.length === 1 && !!report.projectNames[0];
+  const isMetadataInTopLine = !showProject && !filteredStats;
+
+  const metadataToggleButton = !isMetadataEmpty(report.metadata) && (
+    <div className={clsx('metadata-toggle', !isMetadataInTopLine && 'metadata-toggle-second-line')} role='button' onClick={toggleMetadataVisible} title={metadataVisible ? 'Hide metadata' : 'Show metadata'}>
+      {metadataVisible ? icons.downArrow() : icons.rightArrow()}Metadata
+    </div>
+  );
+
+  const leftSuperHeader = <div className='test-file-header-info'>
+    {showProject && <div data-testid='project-name'>Project: {report.projectNames[0]}</div>}
+    {filteredStats && <div data-testid='filtered-tests-count'>Filtered: {filteredStats.total} {!!filteredStats.total && ('(' + msToString(filteredStats.duration) + ')')}</div>}
+    {isMetadataInTopLine && metadataToggleButton}
+  </div>;
+
+  const rightSuperHeader = <>
+    <div data-testid='overall-time' style={{ marginRight: '10px' }}>{report ? new Date(report.startTime).toLocaleString() : ''}</div>
+    <div data-testid='overall-duration'>Total time: {msToString(report.duration ?? 0)}</div>
+  </>;
+
+  return <>
+    <HeaderView title={report.title} leftSuperHeader={leftSuperHeader} rightSuperHeader={rightSuperHeader} />
+    {!isMetadataInTopLine && metadataToggleButton}
+    {metadataVisible && <MetadataView metadata={report.metadata}/>}
+    {!!report.errors.length && <AutoChip header='Errors' dataTestId='report-errors'>
+      {report.errors.map((error, index) => <CodeSnippet key={'test-report-error-message-' + index} code={error}/>)}
+    </AutoChip>}
+  </>;
+};
diff --git a/packages/html-reporter/src/testResultView.tsx b/packages/html-reporter/src/testResultView.tsx
index 1ec8c65a1ed0f..8fa4ab017d4b4 100644
--- a/packages/html-reporter/src/testResultView.tsx
+++ b/packages/html-reporter/src/testResultView.tsx
@@ -20,15 +20,23 @@ import { TreeItem } from './treeItem';
 import { msToString } from './utils';
 import { AutoChip } from './chip';
 import { traceImage } from './images';
-import { AttachmentLink, generateTraceUrl } from './links';
+import { Anchor, AttachmentLink, generateTraceUrl, testResultHref } from './links';
 import { statusIcon } from './statusIcon';
 import type { ImageDiff } from '@web/shared/imageDiffView';
 import { ImageDiffView } from '@web/shared/imageDiffView';
-import { TestErrorView } from './testErrorView';
+import { CodeSnippet, PromptButton, TestScreenshotErrorView } from './testErrorView';
+import * as icons from './icons';
 import './testResultView.css';
+import { useAsyncMemo } from '@web/uiUtils';
+import { copyPrompt } from '@web/shared/prompts';
+import type { MetadataWithCommitInfo } from '@playwright/isomorphic/types';
 
-function groupImageDiffs(screenshots: Set<TestAttachment>): ImageDiff[] {
-  const snapshotNameToImageDiff = new Map<string, ImageDiff>();
+interface ImageDiffWithAnchors extends ImageDiff {
+  anchors: string[];
+}
+
+function groupImageDiffs(screenshots: Set<TestAttachment>, result: TestResult): ImageDiffWithAnchors[] {
+  const snapshotNameToImageDiff = new Map<string, ImageDiffWithAnchors>();
   for (const attachment of screenshots) {
     const match = attachment.name.match(/^(.*)-(expected|actual|diff|previous)(\.[^.]+)?$/);
     if (!match)
@@ -37,9 +45,10 @@ function groupImageDiffs(screenshots: Set<TestAttachment>): ImageDiff[] {
     const snapshotName = name + extension;
     let imageDiff = snapshotNameToImageDiff.get(snapshotName);
     if (!imageDiff) {
-      imageDiff = { name: snapshotName };
+      imageDiff = { name: snapshotName, anchors: [`attachment-${name}`] };
       snapshotNameToImageDiff.set(snapshotName, imageDiff);
     }
+    imageDiff.anchors.push(`attachment-${result.attachments.indexOf(attachment)}`);
     if (category === 'actual')
       imageDiff.actual = { attachment };
     if (category === 'expected')
@@ -64,97 +73,132 @@ function groupImageDiffs(screenshots: Set<TestAttachment>): ImageDiff[] {
 export const TestResultView: React.FC<{
   test: TestCase,
   result: TestResult,
-  anchor: 'video' | 'diff' | '',
-}> = ({ result, anchor }) => {
-
-  const { screenshots, videos, traces, otherAttachments, diffs } = React.useMemo(() => {
-    const attachments = result?.attachments || [];
+  testRunMetadata: MetadataWithCommitInfo | undefined,
+}> = ({ test, result, testRunMetadata }) => {
+  const { screenshots, videos, traces, otherAttachments, diffs, errors, otherAttachmentAnchors, screenshotAnchors, errorContext } = React.useMemo(() => {
+    const attachments = result.attachments.filter(a => !a.name.startsWith('_'));
     const screenshots = new Set(attachments.filter(a => a.contentType.startsWith('image/')));
-    const videos = attachments.filter(a => a.name === 'video');
+    const screenshotAnchors = [...screenshots].map(a => `attachment-${attachments.indexOf(a)}`);
+    const videos = attachments.filter(a => a.contentType.startsWith('video/'));
     const traces = attachments.filter(a => a.name === 'trace');
+    const errorContext = attachments.find(a => a.name === 'error-context');
     const otherAttachments = new Set<TestAttachment>(attachments);
     [...screenshots, ...videos, ...traces].forEach(a => otherAttachments.delete(a));
-    const diffs = groupImageDiffs(screenshots);
-    return { screenshots: [...screenshots], videos, traces, otherAttachments, diffs };
+    const otherAttachmentAnchors = [...otherAttachments].map(a => `attachment-${attachments.indexOf(a)}`);
+    const diffs = groupImageDiffs(screenshots, result);
+    const errors = result.errors.map(e => e.message);
+    return { screenshots: [...screenshots], videos, traces, otherAttachments, diffs, errors, otherAttachmentAnchors, screenshotAnchors, errorContext };
   }, [result]);
 
-  const videoRef = React.useRef<HTMLDivElement>(null);
-  const imageDiffRef = React.useRef<HTMLDivElement>(null);
-
-  const [scrolled, setScrolled] = React.useState(false);
-  React.useEffect(() => {
-    if (scrolled)
-      return;
-    setScrolled(true);
-    if (anchor === 'video')
-      videoRef.current?.scrollIntoView({ block: 'start', inline: 'start' });
-    if (anchor === 'diff')
-      imageDiffRef.current?.scrollIntoView({ block: 'start', inline: 'start' });
-  }, [scrolled, anchor, setScrolled, videoRef]);
+  const prompt = useAsyncMemo(async () => {
+    const stdoutAttachment = result.attachments.find(a => a.name === 'stdout');
+    const stderrAttachment = result.attachments.find(a => a.name === 'stderr');
+    const stdout = stdoutAttachment?.body && stdoutAttachment.contentType === 'text/plain' ? stdoutAttachment.body : undefined;
+    const stderr = stderrAttachment?.body && stderrAttachment.contentType === 'text/plain' ? stderrAttachment.body : undefined;
+
+    return await copyPrompt({
+      testInfo: [
+        `- Name: ${test.path.join(' >> ')} >> ${test.title}`,
+        `- Location: ${test.location.file}:${test.location.line}:${test.location.column}`
+      ].join('\n'),
+      metadata: testRunMetadata,
+      errorContext: errorContext?.path ? await fetch(errorContext.path!).then(r => r.text()) : errorContext?.body,
+      errors: result.errors,
+      buildCodeFrame: async error => error.codeframe,
+      stdout,
+      stderr,
+    });
+  }, [test, errorContext, testRunMetadata, result], undefined);
 
   return <div className='test-result'>
-    {!!result.errors.length && <AutoChip header='Errors'>
-      {result.errors.map((error, index) => <TestErrorView key={'test-result-error-message-' + index} error={error}></TestErrorView>)}
+    {!!errors.length && <AutoChip header='Errors'>
+      {prompt && (
+        <div style={{ position: 'absolute', right: '16px', padding: '10px', zIndex: 1 }}>
+          <PromptButton prompt={prompt} />
+        </div>
+      )}
+      {errors.map((error, index) => {
+        const diff = pickDiffForError(error, diffs);
+        return <>
+          <CodeSnippet key={'test-result-error-message-' + index} code={error}/>
+          {diff && <TestScreenshotErrorView diff={diff}></TestScreenshotErrorView>}
+        </>;
+      })}
     </AutoChip>}
     {!!result.steps.length && <AutoChip header='Test Steps'>
-      {result.steps.map((step, i) => <StepTreeItem key={`step-${i}`} step={step} depth={0}></StepTreeItem>)}
+      {result.steps.map((step, i) => <StepTreeItem key={`step-${i}`} step={step} result={result} test={test} depth={0}/>)}
     </AutoChip>}
 
     {diffs.map((diff, index) =>
-      <AutoChip key={`diff-${index}`} header={`Image mismatch: ${diff.name}`} targetRef={imageDiffRef}>
-        <ImageDiffView key='image-diff' diff={diff}></ImageDiffView>
-      </AutoChip>
+      <Anchor key={`diff-${index}`} id={diff.anchors}>
+        <AutoChip dataTestId='test-results-image-diff' header={`Image mismatch: ${diff.name}`} revealOnAnchorId={diff.anchors}>
+          <ImageDiffView diff={diff}/>
+        </AutoChip>
+      </Anchor>
     )}
 
-    {!!screenshots.length && <AutoChip header='Screenshots'>
+    {!!screenshots.length && <AutoChip header='Screenshots' revealOnAnchorId={screenshotAnchors}>
       {screenshots.map((a, i) => {
-        return <div key={`screenshot-${i}`}>
+        return <Anchor key={`screenshot-${i}`} id={`attachment-${result.attachments.indexOf(a)}`}>
           <a href={a.path}>
             <img className='screenshot' src={a.path} />
           </a>
-          <AttachmentLink attachment={a}></AttachmentLink>
-        </div>;
+          <AttachmentLink attachment={a} result={result}></AttachmentLink>
+        </Anchor>;
       })}
     </AutoChip>}
 
-    {!!traces.length && <AutoChip header='Traces'>
+    {!!traces.length && <Anchor id='attachment-trace'><AutoChip header='Traces' revealOnAnchorId='attachment-trace'>
       {<div>
         <a href={generateTraceUrl(traces)}>
           <img className='screenshot' src={traceImage} style={{ width: 192, height: 117, marginLeft: 20 }} />
         </a>
-        {traces.map((a, i) => <AttachmentLink key={`trace-${i}`} attachment={a} linkName={traces.length === 1 ? 'trace' : `trace-${i + 1}`}></AttachmentLink>)}
+        {traces.map((a, i) => <AttachmentLink key={`trace-${i}`} attachment={a} result={result} linkName={traces.length === 1 ? 'trace' : `trace-${i + 1}`}></AttachmentLink>)}
       </div>}
-    </AutoChip>}
+    </AutoChip></Anchor>}
 
-    {!!videos.length && <AutoChip header='Videos' targetRef={videoRef}>
-      {videos.map((a, i) => <div key={`video-${i}`}>
+    {!!videos.length && <Anchor id='attachment-video'><AutoChip header='Videos' revealOnAnchorId='attachment-video'>
+      {videos.map(a => <div key={a.path}>
         <video controls>
           <source src={a.path} type={a.contentType}/>
         </video>
-        <AttachmentLink attachment={a}></AttachmentLink>
+        <AttachmentLink attachment={a} result={result}></AttachmentLink>
       </div>)}
-    </AutoChip>}
-
-    {!!otherAttachments.size && <AutoChip header='Attachments'>
-      {[...otherAttachments].map((a, i) => <AttachmentLink key={`attachment-link-${i}`} attachment={a}></AttachmentLink>)}
+    </AutoChip></Anchor>}
+
+    {!!otherAttachments.size && <AutoChip header='Attachments' revealOnAnchorId={otherAttachmentAnchors} dataTestId='attachments'>
+      {[...otherAttachments].map((a, i) =>
+        <Anchor key={`attachment-link-${i}`} id={`attachment-${result.attachments.indexOf(a)}`}>
+          <AttachmentLink attachment={a} result={result} openInNewTab={a.contentType.startsWith('text/html')} />
+        </Anchor>
+      )}
     </AutoChip>}
   </div>;
 };
 
+function pickDiffForError(error: string, diffs: ImageDiff[]): ImageDiff | undefined {
+  const firstLine = error.split('\n')[0];
+  if (!firstLine.includes('toHaveScreenshot') && !firstLine.includes('toMatchSnapshot'))
+    return undefined;
+  return diffs.find(diff => error.includes(diff.name));
+}
+
 const StepTreeItem: React.FC<{
+  test: TestCase;
+  result: TestResult;
   step: TestStep;
   depth: number,
-}> = ({ step, depth }) => {
-  return <TreeItem title={<span>
+}> = ({ test, step, result, depth }) => {
+  return <TreeItem title={<span aria-label={step.title}>
     <span style={{ float: 'right' }}>{msToString(step.duration)}</span>
-    {statusIcon(step.error || step.duration === -1 ? 'failed' : 'passed')}
+    {step.attachments.length > 0 && <a style={{ float: 'right' }} title={`reveal attachment`} href={testResultHref({ test, result, anchor: `attachment-${step.attachments[0]}` })} onClick={evt => { evt.stopPropagation(); }}>{icons.attachment()}</a>}
+    {statusIcon(step.error || step.duration === -1 ? 'failed' : (step.skipped ? 'skipped' : 'passed'))}
     <span>{step.title}</span>
     {step.count > 1 && <> ✕ <span className='test-result-counter'>{step.count}</span></>}
     {step.location && <span className='test-result-path'>— {step.location.file}:{step.location.line}</span>}
-  </span>} loadChildren={step.steps.length + (step.snippet ? 1 : 0) ? () => {
-    const children = step.steps.map((s, i) => <StepTreeItem key={i} step={s} depth={depth + 1}></StepTreeItem>);
-    if (step.snippet)
-      children.unshift(<TestErrorView key='line' error={step.snippet}></TestErrorView>);
-    return children;
-  } : undefined} depth={depth}></TreeItem>;
+  </span>} loadChildren={step.steps.length || step.snippet ? () => {
+    const snippet = step.snippet ? [<CodeSnippet testId='test-snippet' key='line' code={step.snippet} />] : [];
+    const steps = step.steps.map((s, i) => <StepTreeItem key={i} step={s} depth={depth + 1} result={result} test={test} />);
+    return snippet.concat(steps);
+  } : undefined} depth={depth}/>;
 };
diff --git a/packages/html-reporter/src/treeItem.css b/packages/html-reporter/src/treeItem.css
index a8cedc4f6af38..b957d1ec5c032 100644
--- a/packages/html-reporter/src/treeItem.css
+++ b/packages/html-reporter/src/treeItem.css
@@ -28,3 +28,11 @@
 .tree-item-body {
   min-height: 18px;
 }
+
+.yellow-flash {
+  animation: yellowflash-bg 2s;
+}
+@keyframes yellowflash-bg {
+  from { background: var(--color-attention-subtle); }
+  to   { background: transparent; }
+}
diff --git a/packages/html-reporter/src/treeItem.tsx b/packages/html-reporter/src/treeItem.tsx
index 507a9c0e716f5..546510afc3fad 100644
--- a/packages/html-reporter/src/treeItem.tsx
+++ b/packages/html-reporter/src/treeItem.tsx
@@ -17,6 +17,7 @@
 import * as React from 'react';
 import './treeItem.css';
 import * as icons from './icons';
+import { clsx } from '@web/uiUtils';
 
 export const TreeItem: React.FunctionComponent<{
   title: JSX.Element,
@@ -24,13 +25,12 @@ export const TreeItem: React.FunctionComponent<{
   onClick?: () => void,
   expandByDefault?: boolean,
   depth: number,
-  selected?: boolean,
   style?:  React.CSSProperties,
-}> = ({ title, loadChildren, onClick, expandByDefault, depth, selected, style }) => {
+  flash?: boolean
+}> = ({ title, loadChildren, onClick, expandByDefault, depth, style, flash }) => {
   const [expanded, setExpanded] = React.useState(expandByDefault || false);
-  const className = selected ? 'tree-item-title selected' : 'tree-item-title';
-  return <div className={'tree-item'} style={style}>
-    <span className={className} style={{ whiteSpace: 'nowrap', paddingLeft: depth * 22 + 4 }} onClick={() => { onClick?.(); setExpanded(!expanded); }} >
+  return <div role='treeitem' className={clsx('tree-item', flash && 'yellow-flash')} style={style}>
+    <span className='tree-item-title' style={{ whiteSpace: 'nowrap', paddingLeft: depth * 22 + 4 }} onClick={() => { onClick?.(); setExpanded(!expanded); }} >
       {loadChildren && !!expanded && icons.downArrow()}
       {loadChildren && !expanded && icons.rightArrow()}
       {!loadChildren && <span style={{ visibility: 'hidden' }}>{icons.rightArrow()}</span>}
diff --git a/packages/html-reporter/src/types.ts b/packages/html-reporter/src/types.d.ts
similarity index 89%
rename from packages/html-reporter/src/types.ts
rename to packages/html-reporter/src/types.d.ts
index 733e88e8b91f5..1acf73d780a2f 100644
--- a/packages/html-reporter/src/types.ts
+++ b/packages/html-reporter/src/types.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Metadata } from '@playwright/test';
+import type { TestAnnotation, Metadata } from '@playwright/test';
 
 export type Stats = {
   total: number;
@@ -38,6 +38,7 @@ export type Location = {
 
 export type HTMLReport = {
   metadata: Metadata;
+  title: string | undefined;
   files: TestFileSummary[];
   stats: Stats;
   projectNames: string[];
@@ -59,15 +60,13 @@ export type TestFileSummary = {
   stats: Stats;
 };
 
-export type TestCaseAnnotation = { type: string, description?: string };
-
 export type TestCaseSummary = {
   testId: string,
   title: string;
   path: string[];
   projectName: string;
   location: Location;
-  annotations: TestCaseAnnotation[];
+  annotations: TestAnnotation[];
   tags: string[];
   outcome: 'skipped' | 'expected' | 'unexpected' | 'flaky';
   duration: number;
@@ -95,9 +94,10 @@ export type TestResult = {
   startTime: string;
   duration: number;
   steps: TestStep[];
-  errors: string[];
+  errors: { message: string, codeframe?: string }[];
   attachments: TestAttachment[];
   status: 'passed' | 'failed' | 'timedOut' | 'skipped' | 'interrupted';
+  annotations: TestAnnotation[];
 };
 
 export type TestStep = {
@@ -108,5 +108,7 @@ export type TestStep = {
   snippet?: string;
   error?: string;
   steps: TestStep[];
+  attachments: number[];
   count: number;
+  skipped?: boolean;
 };
diff --git a/packages/html-reporter/src/utils.ts b/packages/html-reporter/src/utils.ts
index 65404b2fe73ae..eec765969b3e3 100644
--- a/packages/html-reporter/src/utils.ts
+++ b/packages/html-reporter/src/utils.ts
@@ -47,4 +47,3 @@ export function hashStringToInt(str: string) {
     hash = str.charCodeAt(i) + ((hash << 8) - hash);
   return Math.abs(hash % 6);
 }
-
diff --git a/packages/html-reporter/tsconfig.json b/packages/html-reporter/tsconfig.json
index 4fe82eab4eb1c..95a13e918d220 100644
--- a/packages/html-reporter/tsconfig.json
+++ b/packages/html-reporter/tsconfig.json
@@ -20,10 +20,12 @@
       "@protocol/*": ["../protocol/src/*"],
       "@web/*": ["../web/src/*"],
       "@playwright/*": ["../playwright/src/*"],
+      "@recorder/*": ["../recorder/src/*"],
+      "@testIsomorphic/*": ["../playwright/src/isomorphic/*"],
       "playwright-core/lib/*": ["../playwright-core/src/*"],
       "playwright/lib/*": ["../playwright/src/*"],
     }
   },
-  "include": ["src"],
+  "include": ["src", "../web/src"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/html-reporter/vite.config.ts b/packages/html-reporter/vite.config.ts
index bdde2574d59f9..f0032feb279e9 100644
--- a/packages/html-reporter/vite.config.ts
+++ b/packages/html-reporter/vite.config.ts
@@ -17,7 +17,7 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 import { bundle } from './bundle';
-import * as path from 'path';
+import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
diff --git a/packages/playwright-core/src/server/injected/DEPS.list b/packages/injected/src/DEPS.list
similarity index 72%
rename from packages/playwright-core/src/server/injected/DEPS.list
rename to packages/injected/src/DEPS.list
index 7c5f41d8c901c..2d8a11218b4cd 100644
--- a/packages/playwright-core/src/server/injected/DEPS.list
+++ b/packages/injected/src/DEPS.list
@@ -1,4 +1,3 @@
 # Files in this folder are used in browser environment, they can only depend on isomorphic files.
 [*]
-../isomorphic/
-../../utils/isomorphic
+@isomorphic/**
diff --git a/packages/injected/src/README.md b/packages/injected/src/README.md
new file mode 100644
index 0000000000000..68f722935e284
--- /dev/null
+++ b/packages/injected/src/README.md
@@ -0,0 +1,5 @@
+# Injected
+
+This directory contains helper sources which are injected into the page.
+
+These sources are bundled with the ebuild into `src/generated` as compile-time source constants. See `utils/generate_injected` for details.
diff --git a/packages/injected/src/ariaSnapshot.ts b/packages/injected/src/ariaSnapshot.ts
new file mode 100644
index 0000000000000..09c3bef843a7d
--- /dev/null
+++ b/packages/injected/src/ariaSnapshot.ts
@@ -0,0 +1,601 @@
+/**
+ * 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 { escapeRegExp, longestCommonSubstring, normalizeWhiteSpace } from '@isomorphic/stringUtils';
+
+import { box, getElementComputedStyle, isElementVisible } from './domUtils';
+import * as roleUtils from './roleUtils';
+import { yamlEscapeKeyIfNeeded, yamlEscapeValueIfNeeded } from './yaml';
+
+import type { AriaProps, AriaRegex, AriaRole, AriaTemplateNode, AriaTemplateRoleNode, AriaTemplateTextNode } from '@isomorphic/ariaSnapshot';
+import type { Box } from './domUtils';
+
+export type AriaNode = AriaProps & {
+  role: AriaRole | 'fragment' | 'iframe';
+  name: string;
+  ref?: string;
+  children: (AriaNode | string)[];
+  element: Element;
+  box: Box;
+  receivesPointerEvents: boolean;
+  props: Record<string, string>;
+};
+
+export type AriaSnapshot = {
+  root: AriaNode;
+  elements: Map<string, Element>;
+  refs: Map<Element, string>;
+};
+
+type AriaRef = {
+  role: string;
+  name: string;
+  ref: string;
+};
+
+let lastRef = 0;
+
+export type AriaTreeOptions = {
+  mode: 'ai' | 'expect' | 'codegen' | 'autoexpect';
+  refPrefix?: string;
+};
+
+type InternalOptions = {
+  visibility: 'aria' | 'ariaOrVisible' | 'ariaAndVisible',
+  refs: 'all' | 'interactable' | 'none',
+  refPrefix?: string,
+  includeGenericRole?: boolean,
+  renderCursorPointer?: boolean,
+  renderActive?: boolean,
+  renderStringsAsRegex?: boolean,
+};
+
+function toInternalOptions(options: AriaTreeOptions): InternalOptions {
+  if (options.mode === 'ai') {
+    // For AI consumption.
+    return {
+      visibility: 'ariaOrVisible',
+      refs: 'interactable',
+      refPrefix: options.refPrefix,
+      includeGenericRole: true,
+      renderActive: true,
+      renderCursorPointer: true,
+    };
+  }
+  if (options.mode === 'autoexpect') {
+    // To auto-generate assertions on visible elements.
+    return { visibility: 'ariaAndVisible', refs: 'none' };
+  }
+  if (options.mode === 'codegen') {
+    // To generate aria assertion with regex heurisitcs.
+    return { visibility: 'aria', refs: 'none', renderStringsAsRegex: true };
+  }
+  // To match aria snapshot.
+  return { visibility: 'aria', refs: 'none' };
+}
+
+export function generateAriaTree(rootElement: Element, publicOptions: AriaTreeOptions): AriaSnapshot {
+  const options = toInternalOptions(publicOptions);
+  const visited = new Set<Node>();
+
+  const snapshot: AriaSnapshot = {
+    root: { role: 'fragment', name: '', children: [], element: rootElement, props: {}, box: box(rootElement), receivesPointerEvents: true },
+    elements: new Map<string, Element>(),
+    refs: new Map<Element, string>(),
+  };
+
+  const visit = (ariaNode: AriaNode, node: Node, parentElementVisible: boolean) => {
+    if (visited.has(node))
+      return;
+    visited.add(node);
+
+    if (node.nodeType === Node.TEXT_NODE && node.nodeValue) {
+      if (!parentElementVisible)
+        return;
+
+      const text = node.nodeValue;
+      // <textarea>AAA</textarea> should not report AAA as a child of the textarea.
+      if (ariaNode.role !== 'textbox' && text)
+        ariaNode.children.push(node.nodeValue || '');
+      return;
+    }
+
+    if (node.nodeType !== Node.ELEMENT_NODE)
+      return;
+
+    const element = node as Element;
+    const isElementVisibleForAria = !roleUtils.isElementHiddenForAria(element);
+    let visible = isElementVisibleForAria;
+    if (options.visibility === 'ariaOrVisible')
+      visible = isElementVisibleForAria || isElementVisible(element);
+    if (options.visibility === 'ariaAndVisible')
+      visible = isElementVisibleForAria && isElementVisible(element);
+
+    // Optimization: if we only consider aria visibility, we can skip child elements because
+    // they will not be visible for aria as well.
+    if (options.visibility === 'aria' && !visible)
+      return;
+
+    const ariaChildren: Element[] = [];
+    if (element.hasAttribute('aria-owns')) {
+      const ids = element.getAttribute('aria-owns')!.split(/\s+/);
+      for (const id of ids) {
+        const ownedElement = rootElement.ownerDocument.getElementById(id);
+        if (ownedElement)
+          ariaChildren.push(ownedElement);
+      }
+    }
+
+    const childAriaNode = visible ? toAriaNode(element, options) : null;
+    if (childAriaNode) {
+      if (childAriaNode.ref) {
+        snapshot.elements.set(childAriaNode.ref, element);
+        snapshot.refs.set(element, childAriaNode.ref);
+      }
+      ariaNode.children.push(childAriaNode);
+    }
+    processElement(childAriaNode || ariaNode, element, ariaChildren, visible);
+  };
+
+  function processElement(ariaNode: AriaNode, element: Element, ariaChildren: Element[], parentElementVisible: boolean) {
+    // Surround every element with spaces for the sake of concatenated text nodes.
+    const display = getElementComputedStyle(element)?.display || 'inline';
+    const treatAsBlock = (display !== 'inline' || element.nodeName === 'BR') ? ' ' : '';
+    if (treatAsBlock)
+      ariaNode.children.push(treatAsBlock);
+
+    ariaNode.children.push(roleUtils.getCSSContent(element, '::before') || '');
+    const assignedNodes = element.nodeName === 'SLOT' ? (element as HTMLSlotElement).assignedNodes() : [];
+    if (assignedNodes.length) {
+      for (const child of assignedNodes)
+        visit(ariaNode, child, parentElementVisible);
+    } else {
+      for (let child = element.firstChild; child; child = child.nextSibling) {
+        if (!(child as Element | Text).assignedSlot)
+          visit(ariaNode, child, parentElementVisible);
+      }
+      if (element.shadowRoot) {
+        for (let child = element.shadowRoot.firstChild; child; child = child.nextSibling)
+          visit(ariaNode, child, parentElementVisible);
+      }
+    }
+
+    for (const child of ariaChildren)
+      visit(ariaNode, child, parentElementVisible);
+
+    ariaNode.children.push(roleUtils.getCSSContent(element, '::after') || '');
+
+    if (treatAsBlock)
+      ariaNode.children.push(treatAsBlock);
+
+    if (ariaNode.children.length === 1 && ariaNode.name === ariaNode.children[0])
+      ariaNode.children = [];
+
+    if (ariaNode.role === 'link' && element.hasAttribute('href')) {
+      const href = element.getAttribute('href')!;
+      ariaNode.props['url'] = href;
+    }
+  }
+
+  roleUtils.beginAriaCaches();
+  try {
+    visit(snapshot.root, rootElement, true);
+  } finally {
+    roleUtils.endAriaCaches();
+  }
+
+  normalizeStringChildren(snapshot.root);
+  normalizeGenericRoles(snapshot.root);
+  return snapshot;
+}
+
+function computeAriaRef(ariaNode: AriaNode, options: InternalOptions) {
+  if (options.refs === 'none')
+    return;
+  if (options.refs === 'interactable' && (!ariaNode.box.visible || !ariaNode.receivesPointerEvents))
+    return;
+
+  let ariaRef: AriaRef | undefined;
+  ariaRef = (ariaNode.element as any)._ariaRef;
+  if (!ariaRef || ariaRef.role !== ariaNode.role || ariaRef.name !== ariaNode.name) {
+    ariaRef = { role: ariaNode.role, name: ariaNode.name, ref: (options.refPrefix ?? '') + 'e' + (++lastRef) };
+    (ariaNode.element as any)._ariaRef = ariaRef;
+  }
+  ariaNode.ref = ariaRef.ref;
+}
+
+function toAriaNode(element: Element, options: InternalOptions): AriaNode | null {
+  const active = element.ownerDocument.activeElement === element;
+  if (element.nodeName === 'IFRAME') {
+    const ariaNode: AriaNode = {
+      role: 'iframe',
+      name: '',
+      children: [],
+      props: {},
+      element,
+      box: box(element),
+      receivesPointerEvents: true,
+      active
+    };
+    computeAriaRef(ariaNode, options);
+    return ariaNode;
+  }
+
+  const defaultRole = options.includeGenericRole ? 'generic' : null;
+  const role = roleUtils.getAriaRole(element) ?? defaultRole;
+  if (!role || role === 'presentation' || role === 'none')
+    return null;
+
+  const name = normalizeWhiteSpace(roleUtils.getElementAccessibleName(element, false) || '');
+  const receivesPointerEvents = roleUtils.receivesPointerEvents(element);
+
+  const result: AriaNode = {
+    role,
+    name,
+    children: [],
+    props: {},
+    element,
+    box: box(element),
+    receivesPointerEvents,
+    active
+  };
+  computeAriaRef(result, options);
+
+  if (roleUtils.kAriaCheckedRoles.includes(role))
+    result.checked = roleUtils.getAriaChecked(element);
+
+  if (roleUtils.kAriaDisabledRoles.includes(role))
+    result.disabled = roleUtils.getAriaDisabled(element);
+
+  if (roleUtils.kAriaExpandedRoles.includes(role))
+    result.expanded = roleUtils.getAriaExpanded(element);
+
+  if (roleUtils.kAriaLevelRoles.includes(role))
+    result.level = roleUtils.getAriaLevel(element);
+
+  if (roleUtils.kAriaPressedRoles.includes(role))
+    result.pressed = roleUtils.getAriaPressed(element);
+
+  if (roleUtils.kAriaSelectedRoles.includes(role))
+    result.selected = roleUtils.getAriaSelected(element);
+
+  if (element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement) {
+    if (element.type !== 'checkbox' && element.type !== 'radio' && element.type !== 'file')
+      result.children = [element.value];
+  }
+
+  return result;
+}
+
+function normalizeGenericRoles(node: AriaNode) {
+  const normalizeChildren = (node: AriaNode) => {
+    const result: (AriaNode | string)[] = [];
+    for (const child of node.children || []) {
+      if (typeof child === 'string') {
+        result.push(child);
+        continue;
+      }
+      const normalized = normalizeChildren(child);
+      result.push(...normalized);
+    }
+
+    // Only remove generic that encloses one element, logical grouping still makes sense, even if it is not ref-able.
+    const removeSelf = node.role === 'generic' && result.length <= 1 && result.every(c => typeof c !== 'string' && !!c.ref);
+    if (removeSelf)
+      return result;
+    node.children = result;
+    return [node];
+  };
+
+  normalizeChildren(node);
+}
+
+function normalizeStringChildren(rootA11yNode: AriaNode) {
+  const flushChildren = (buffer: string[], normalizedChildren: (AriaNode | string)[]) => {
+    if (!buffer.length)
+      return;
+    const text = normalizeWhiteSpace(buffer.join(''));
+    if (text)
+      normalizedChildren.push(text);
+    buffer.length = 0;
+  };
+
+  const visit = (ariaNode: AriaNode) => {
+    const normalizedChildren: (AriaNode | string)[] = [];
+    const buffer: string[] = [];
+    for (const child of ariaNode.children || []) {
+      if (typeof child === 'string') {
+        buffer.push(child);
+      } else {
+        flushChildren(buffer, normalizedChildren);
+        visit(child);
+        normalizedChildren.push(child);
+      }
+    }
+    flushChildren(buffer, normalizedChildren);
+    ariaNode.children = normalizedChildren.length ? normalizedChildren : [];
+    if (ariaNode.children.length === 1 && ariaNode.children[0] === ariaNode.name)
+      ariaNode.children = [];
+  };
+  visit(rootA11yNode);
+}
+
+function matchesText(text: string, template: AriaRegex | string | undefined): boolean {
+  if (!template)
+    return true;
+  if (!text)
+    return false;
+  if (typeof template === 'string')
+    return text === template;
+  return !!text.match(new RegExp(template.pattern));
+}
+
+function matchesTextNode(text: string, template: AriaTemplateTextNode) {
+  return matchesText(text, template.text);
+}
+
+function matchesName(text: string, template: AriaTemplateRoleNode) {
+  return matchesText(text, template.name);
+}
+
+export type MatcherReceived = {
+  raw: string;
+  regex: string;
+};
+
+export function matchesExpectAriaTemplate(rootElement: Element, template: AriaTemplateNode): { matches: AriaNode[], received: MatcherReceived } {
+  const snapshot = generateAriaTree(rootElement, { mode: 'expect' });
+  const matches = matchesNodeDeep(snapshot.root, template, false, false);
+  return {
+    matches,
+    received: {
+      raw: renderAriaTree(snapshot, { mode: 'expect' }),
+      regex: renderAriaTree(snapshot, { mode: 'codegen' }),
+    }
+  };
+}
+
+export function getAllElementsMatchingExpectAriaTemplate(rootElement: Element, template: AriaTemplateNode): Element[] {
+  const root = generateAriaTree(rootElement, { mode: 'expect' }).root;
+  const matches = matchesNodeDeep(root, template, true, false);
+  return matches.map(n => n.element);
+}
+
+function matchesNode(node: AriaNode | string, template: AriaTemplateNode, isDeepEqual: boolean): boolean {
+  if (typeof node === 'string' && template.kind === 'text')
+    return matchesTextNode(node, template);
+
+  if (node === null || typeof node !== 'object' || template.kind !== 'role')
+    return false;
+
+  if (template.role !== 'fragment' && template.role !== node.role)
+    return false;
+  if (template.checked !== undefined && template.checked !== node.checked)
+    return false;
+  if (template.disabled !== undefined && template.disabled !== node.disabled)
+    return false;
+  if (template.expanded !== undefined && template.expanded !== node.expanded)
+    return false;
+  if (template.level !== undefined && template.level !== node.level)
+    return false;
+  if (template.pressed !== undefined && template.pressed !== node.pressed)
+    return false;
+  if (template.selected !== undefined && template.selected !== node.selected)
+    return false;
+  if (!matchesName(node.name, template))
+    return false;
+  if (!matchesText(node.props.url, template.props?.url))
+    return false;
+
+  // Proceed based on the container mode.
+  if (template.containerMode === 'contain')
+    return containsList(node.children || [], template.children || []);
+  if (template.containerMode === 'equal')
+    return listEqual(node.children || [], template.children || [], false);
+  if (template.containerMode === 'deep-equal' || isDeepEqual)
+    return listEqual(node.children || [], template.children || [], true);
+  return containsList(node.children || [], template.children || []);
+}
+
+function listEqual(children: (AriaNode | string)[], template: AriaTemplateNode[], isDeepEqual: boolean): boolean {
+  if (template.length !== children.length)
+    return false;
+  for (let i = 0; i < template.length; ++i) {
+    if (!matchesNode(children[i], template[i], isDeepEqual))
+      return false;
+  }
+  return true;
+}
+
+function containsList(children: (AriaNode | string)[], template: AriaTemplateNode[]): boolean {
+  if (template.length > children.length)
+    return false;
+  const cc = children.slice();
+  const tt = template.slice();
+  for (const t of tt) {
+    let c = cc.shift();
+    while (c) {
+      if (matchesNode(c, t, false))
+        break;
+      c = cc.shift();
+    }
+    if (!c)
+      return false;
+  }
+  return true;
+}
+
+function matchesNodeDeep(root: AriaNode, template: AriaTemplateNode, collectAll: boolean, isDeepEqual: boolean): AriaNode[] {
+  const results: AriaNode[] = [];
+  const visit = (node: AriaNode | string, parent: AriaNode | null): boolean => {
+    if (matchesNode(node, template, isDeepEqual)) {
+      const result = typeof node === 'string' ? parent : node;
+      if (result)
+        results.push(result);
+      return !collectAll;
+    }
+    if (typeof node === 'string')
+      return false;
+    for (const child of node.children || []) {
+      if (visit(child, node))
+        return true;
+    }
+    return false;
+  };
+  visit(root, null);
+  return results;
+}
+
+export function renderAriaTree(ariaSnapshot: AriaSnapshot, publicOptions: AriaTreeOptions): string {
+  const options = toInternalOptions(publicOptions);
+  const lines: string[] = [];
+  const includeText = options.renderStringsAsRegex ? textContributesInfo : () => true;
+  const renderString = options.renderStringsAsRegex ? convertToBestGuessRegex : (str: string) => str;
+  const visit = (ariaNode: AriaNode | string, parentAriaNode: AriaNode | null, indent: string) => {
+    if (typeof ariaNode === 'string') {
+      if (parentAriaNode && !includeText(parentAriaNode, ariaNode))
+        return;
+      const text = yamlEscapeValueIfNeeded(renderString(ariaNode));
+      if (text)
+        lines.push(indent + '- text: ' + text);
+      return;
+    }
+
+    let key = ariaNode.role;
+    // Yaml has a limit of 1024 characters per key, and we leave some space for role and attributes.
+    if (ariaNode.name && ariaNode.name.length <= 900) {
+      const name = renderString(ariaNode.name);
+      if (name) {
+        const stringifiedName = name.startsWith('/') && name.endsWith('/') ? name : JSON.stringify(name);
+        key += ' ' + stringifiedName;
+      }
+    }
+    if (ariaNode.checked === 'mixed')
+      key += ` [checked=mixed]`;
+    if (ariaNode.checked === true)
+      key += ` [checked]`;
+    if (ariaNode.disabled)
+      key += ` [disabled]`;
+    if (ariaNode.expanded)
+      key += ` [expanded]`;
+    if (ariaNode.active && options.renderActive)
+      key += ` [active]`;
+    if (ariaNode.level)
+      key += ` [level=${ariaNode.level}]`;
+    if (ariaNode.pressed === 'mixed')
+      key += ` [pressed=mixed]`;
+    if (ariaNode.pressed === true)
+      key += ` [pressed]`;
+    if (ariaNode.selected === true)
+      key += ` [selected]`;
+
+    if (ariaNode.ref) {
+      key += ` [ref=${ariaNode.ref}]`;
+      if (options.renderCursorPointer && hasPointerCursor(ariaNode))
+        key += ' [cursor=pointer]';
+    }
+
+    const escapedKey = indent + '- ' + yamlEscapeKeyIfNeeded(key);
+    const hasProps = !!Object.keys(ariaNode.props).length;
+    if (!ariaNode.children.length && !hasProps) {
+      lines.push(escapedKey);
+    } else if (ariaNode.children.length === 1 && typeof ariaNode.children[0] === 'string' && !hasProps) {
+      const text = includeText(ariaNode, ariaNode.children[0]) ? renderString(ariaNode.children[0] as string) : null;
+      if (text)
+        lines.push(escapedKey + ': ' + yamlEscapeValueIfNeeded(text));
+      else
+        lines.push(escapedKey);
+    } else {
+      lines.push(escapedKey + ':');
+      for (const [name, value] of Object.entries(ariaNode.props))
+        lines.push(indent + '  - /' + name + ': ' + yamlEscapeValueIfNeeded(value));
+      for (const child of ariaNode.children || [])
+        visit(child, ariaNode, indent + '  ');
+    }
+  };
+
+  const ariaNode = ariaSnapshot.root;
+  if (ariaNode.role === 'fragment') {
+    // Render fragment.
+    for (const child of ariaNode.children || [])
+      visit(child, ariaNode, '');
+  } else {
+    visit(ariaNode, null, '');
+  }
+  return lines.join('\n');
+}
+
+function convertToBestGuessRegex(text: string): string {
+  const dynamicContent = [
+    // 2mb
+    { regex: /\b[\d,.]+[bkmBKM]+\b/, replacement: '[\\d,.]+[bkmBKM]+' },
+    // 2ms, 20s
+    { regex: /\b\d+[hmsp]+\b/, replacement: '\\d+[hmsp]+' },
+    { regex: /\b[\d,.]+[hmsp]+\b/, replacement: '[\\d,.]+[hmsp]+' },
+    // Do not replace single digits with regex by default.
+    // 2+ digits: [Issue 22, 22.3, 2.33, 2,333]
+    { regex: /\b\d+,\d+\b/, replacement: '\\d+,\\d+' },
+    { regex: /\b\d+\.\d{2,}\b/, replacement: '\\d+\\.\\d+' },
+    { regex: /\b\d{2,}\.\d+\b/, replacement: '\\d+\\.\\d+' },
+    { regex: /\b\d{2,}\b/, replacement: '\\d+' },
+  ];
+
+  let pattern = '';
+  let lastIndex = 0;
+
+  const combinedRegex = new RegExp(dynamicContent.map(r => '(' + r.regex.source + ')').join('|'), 'g');
+  text.replace(combinedRegex, (match, ...args) => {
+    const offset = args[args.length - 2];
+    const groups = args.slice(0, -2);
+    pattern += escapeRegExp(text.slice(lastIndex, offset));
+    for (let i = 0; i < groups.length; i++) {
+      if (groups[i]) {
+        const { replacement } = dynamicContent[i];
+        pattern += replacement;
+        break;
+      }
+    }
+    lastIndex = offset + match.length;
+    return match;
+  });
+  if (!pattern)
+    return text;
+
+  pattern += escapeRegExp(text.slice(lastIndex));
+  return String(new RegExp(pattern));
+}
+
+function textContributesInfo(node: AriaNode, text: string): boolean {
+  if (!text.length)
+    return false;
+
+  if (!node.name)
+    return true;
+
+  if (node.name.length > text.length)
+    return false;
+
+  // Figure out if text adds any value. "longestCommonSubstring" is expensive, so limit strings length.
+  const substr = (text.length <= 200 && node.name.length <= 200) ? longestCommonSubstring(text, node.name) : '';
+  let filtered = text;
+  while (substr && filtered.includes(substr))
+    filtered = filtered.replace(substr, '');
+  return filtered.trim().length / text.length > 0.1;
+}
+
+function hasPointerCursor(ariaNode: AriaNode): boolean {
+  return ariaNode.box.style?.cursor === 'pointer';
+}
diff --git a/packages/injected/src/bindingsController.ts b/packages/injected/src/bindingsController.ts
new file mode 100644
index 0000000000000..ec0ff89eee7cd
--- /dev/null
+++ b/packages/injected/src/bindingsController.ts
@@ -0,0 +1,102 @@
+/**
+ * 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 { serializeAsCallArgument } from '@isomorphic/utilityScriptSerializers';
+
+import type { SerializedValue } from '@isomorphic/utilityScriptSerializers';
+
+export type BindingPayload = {
+  name: string;
+  seq: number;
+  serializedArgs?: SerializedValue[],
+};
+
+type BindingData = {
+  callbacks: Map<number, { resolve: (value: any) => void, reject: (error: Error) => void }>;
+  lastSeq: number;
+  handles: Map<number, any>;
+  removed: boolean;
+};
+
+export class BindingsController {
+  // eslint-disable-next-line no-restricted-globals
+  private _global: typeof globalThis;
+  private _globalBindingName: string;
+  private _bindings = new Map<string, BindingData>();
+
+  // eslint-disable-next-line no-restricted-globals
+  constructor(global: typeof globalThis, globalBindingName: string) {
+    this._global = global;
+    this._globalBindingName = globalBindingName;
+  }
+
+  addBinding(bindingName: string, needsHandle: boolean) {
+    const data: BindingData = {
+      callbacks: new Map(),
+      lastSeq: 0,
+      handles: new Map(),
+      removed: false,
+    };
+    this._bindings.set(bindingName, data);
+    (this._global as any)[bindingName] = (...args: any[]) => {
+      if (data.removed)
+        throw new Error(`binding "${bindingName}" has been removed`);
+      if (needsHandle && args.slice(1).some(arg => arg !== undefined))
+        throw new Error(`exposeBindingHandle supports a single argument, ${args.length} received`);
+      const seq = ++data.lastSeq;
+      const promise = new Promise((resolve, reject) => data.callbacks.set(seq, { resolve, reject }));
+      let payload: BindingPayload;
+      if (needsHandle) {
+        data.handles.set(seq, args[0]);
+        payload = { name: bindingName, seq };
+      } else {
+        const serializedArgs = [];
+        for (let i = 0; i < args.length; i++) {
+          serializedArgs[i] = serializeAsCallArgument(args[i], v => {
+            return { fallThrough: v };
+          });
+        }
+        payload = { name: bindingName, seq, serializedArgs };
+      }
+      (this._global as any)[this._globalBindingName](JSON.stringify(payload));
+      return promise;
+    };
+  }
+
+  removeBinding(bindingName: string) {
+    const data = this._bindings.get(bindingName);
+    if (data)
+      data.removed = true;
+    this._bindings.delete(bindingName);
+    delete (this._global as any)[bindingName];
+  }
+
+  takeBindingHandle(arg: { name: string, seq: number }) {
+    const handles = this._bindings.get(arg.name)!.handles;
+    const handle = handles.get(arg.seq);
+    handles.delete(arg.seq);
+    return handle;
+  }
+
+  deliverBindingResult(arg: { name: string, seq: number, result?: any, error?: any }) {
+    const callbacks = this._bindings.get(arg.name)!.callbacks;
+    if ('error' in arg)
+      callbacks.get(arg.seq)!.reject(arg.error);
+    else
+      callbacks.get(arg.seq)!.resolve(arg.result);
+    callbacks.delete(arg.seq);
+  }
+}
diff --git a/packages/playwright-core/src/server/injected/clock.ts b/packages/injected/src/clock.ts
similarity index 89%
rename from packages/playwright-core/src/server/injected/clock.ts
rename to packages/injected/src/clock.ts
index afce525be15a3..673a2da6facf1 100644
--- a/packages/playwright-core/src/server/injected/clock.ts
+++ b/packages/injected/src/clock.ts
@@ -10,26 +10,14 @@
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-export type ClockMethods = {
-  Date: DateConstructor;
-  setTimeout: Window['setTimeout'];
-  clearTimeout: Window['clearTimeout'];
-  setInterval: Window['setInterval'];
-  clearInterval: Window['clearInterval'];
-  requestAnimationFrame?: Window['requestAnimationFrame'];
-  cancelAnimationFrame?: (id: number) => void;
-  requestIdleCallback?: Window['requestIdleCallback'];
-  cancelIdleCallback?: (id: number) => void;
-  Intl?: typeof Intl;
-  performance?: Window['performance'];
-};
+import type { Builtins } from './utilityScript';
 
 export type ClockConfig = {
-  now?: number | Date;
+  now?: number;
 };
 
 export type InstallConfig = ClockConfig & {
-  toFake?: (keyof ClockMethods)[];
+  toFake?: (keyof Builtins)[];
 };
 
 enum TimerType {
@@ -74,7 +62,7 @@ type LogEntryType = 'fastForward' |'install' | 'pauseAt' | 'resume' | 'runFor' |
 export class ClockController {
   readonly _now: Time;
   private _duringTick = false;
-  private _timers = new Map<number, Timer>();
+  private _timers: Map<number, Timer>;
   private _uniqueTimerId = idCounterStart;
   private _embedder: Embedder;
   readonly disposables: (() => void)[] = [];
@@ -83,6 +71,7 @@ export class ClockController {
   private _currentRealTimeTimer: { callAt: Ticks, dispose: () => void } | undefined;
 
   constructor(embedder: Embedder) {
+    this._timers = new Map();
     this._now = { time: asWallTime(0), isFixedTime: false, ticks: 0 as Ticks, origin: asWallTime(-1) };
     this._embedder = embedder;
   }
@@ -94,6 +83,7 @@ export class ClockController {
 
   now(): number {
     this._replayLogOnce();
+    this._syncRealTime();
     return this._now.time;
   }
 
@@ -114,9 +104,21 @@ export class ClockController {
 
   performanceNow(): DOMHighResTimeStamp {
     this._replayLogOnce();
+    this._syncRealTime();
     return this._now.ticks;
   }
 
+  private _syncRealTime() {
+    if (!this._realTime)
+      return;
+    const now = this._embedder.performanceNow();
+    const sinceLastSync = now - this._realTime.lastSyncTicks;
+    if (sinceLastSync > 0) {
+      this._advanceNow(shiftTicks(this._now.ticks, sinceLastSync));
+      this._realTime.lastSyncTicks = now;
+    }
+  }
+
   private _innerSetTime(time: WallTime) {
     this._now.time  = time;
     this._now.isFixedTime = false;
@@ -211,12 +213,10 @@ export class ClockController {
     this._currentRealTimeTimer = {
       callAt,
       dispose: this._embedder.setTimeout(() => {
-        const now = this._embedder.performanceNow();
         this._currentRealTimeTimer = undefined;
-        const sinceLastSync = now - this._realTime!.lastSyncTicks;
-        this._realTime!.lastSyncTicks = now;
+        this._syncRealTime();
         // eslint-disable-next-line no-console
-        this._runTo(shiftTicks(this._now.ticks, sinceLastSync)).catch(e => console.error(e)).then(() => this._updateRealTimeTimer());
+        void this._runTo(this._now.ticks).catch(e => console.error(e)).then(() => this._updateRealTimeTimer());
       }, callAt - this._now.ticks),
     };
   }
@@ -226,7 +226,6 @@ export class ClockController {
     await this._innerFastForwardTo(shiftTicks(this._now.ticks, ticks | 0));
   }
 
-
   private async _innerFastForwardTo(to: Ticks) {
     if (to < this._now.ticks)
       throw new Error('Cannot fast-forward to the past');
@@ -239,7 +238,12 @@ export class ClockController {
 
   addTimer(options: { func: TimerHandler, type: TimerType, delay?: number | string, args?: any[] }): number {
     this._replayLogOnce();
-    if (options.func === undefined)
+
+    if (options.type === TimerType.AnimationFrame && !options.func)
+      throw new Error('Callback must be provided to requestAnimationFrame calls');
+    if (options.type === TimerType.IdleCallback && !options.func)
+      throw new Error('Callback must be provided to requestIdleCallback calls');
+    if ([TimerType.Timeout, TimerType.Interval].includes(options.type) && !options.func && options.delay === undefined)
       throw new Error('Callback must be provided to timer calls');
 
     let delay = options.delay ? +options.delay : 0;
@@ -411,7 +415,7 @@ export class ClockController {
   }
 }
 
-function mirrorDateProperties(target: any, source: typeof Date): DateConstructor & Date {
+function mirrorDateProperties(target: any, source: Builtins['Date']): Builtins['Date'] {
   for (const prop in source) {
     if (source.hasOwnProperty(prop))
       target[prop] = (source as any)[prop];
@@ -425,7 +429,8 @@ function mirrorDateProperties(target: any, source: typeof Date): DateConstructor
   return target;
 }
 
-function createDate(clock: ClockController, NativeDate: typeof Date): DateConstructor & Date {
+function createDate(clock: ClockController, NativeDate: Builtins['Date']): Builtins['Date'] {
+  // eslint-disable-next-line no-restricted-globals
   function ClockDate(this: typeof ClockDate, year: number, month: number, date: number, hour: number, minute: number, second: number, ms: number): Date | string {
     // the Date constructor called as a function, ref Ecma-262 Edition 5.1, section 15.9.2.
     // This remains so in the 10th edition of 2019 as well.
@@ -481,17 +486,18 @@ function createDate(clock: ClockController, NativeDate: typeof Date): DateConstr
  * but we need to take control of those that have a
  * dependency on the current clock.
  */
-function createIntl(clock: ClockController, NativeIntl: typeof Intl): typeof Intl {
+function createIntl(clock: ClockController, NativeIntl: Builtins['Intl']): Builtins['Intl'] {
   const ClockIntl: any = {};
   /*
     * All properties of Intl are non-enumerable, so we need
     * to do a bit of work to get them out.
     */
-  for (const key of Object.getOwnPropertyNames(NativeIntl) as (keyof typeof Intl)[])
+  for (const key of Object.getOwnPropertyNames(NativeIntl) as (keyof Builtins['Intl'])[])
     ClockIntl[key] = NativeIntl[key];
 
   ClockIntl.DateTimeFormat = function(...args: any[]) {
     const realFormatter = new NativeIntl.DateTimeFormat(...args);
+    // eslint-disable-next-line no-restricted-globals
     const formatter: Intl.DateTimeFormat = {
       formatRange: realFormatter.formatRange.bind(realFormatter),
       formatRangeToParts: realFormatter.formatRangeToParts.bind(realFormatter),
@@ -544,8 +550,8 @@ function compareTimers(a: Timer, b: Timer) {
 const maxTimeout = Math.pow(2, 31) - 1;  // see https://heycam.github.io/webidl/#abstract-opdef-converttoint
 const idCounterStart = 1e12; // arbitrarily large number to avoid collisions with native timer IDs
 
-function platformOriginals(globalObject: WindowOrWorkerGlobalScope): { raw: ClockMethods, bound: ClockMethods } {
-  const raw: ClockMethods = {
+function platformOriginals(globalObject: WindowOrWorkerGlobalScope): { raw: Builtins, bound: Builtins } {
+  const raw: Builtins = {
     setTimeout: globalObject.setTimeout,
     clearTimeout: globalObject.clearTimeout,
     setInterval: globalObject.setInterval,
@@ -559,7 +565,7 @@ function platformOriginals(globalObject: WindowOrWorkerGlobalScope): { raw: Cloc
     Intl: (globalObject as any).Intl,
   };
   const bound = { ...raw };
-  for (const key of Object.keys(bound) as (keyof ClockMethods)[]) {
+  for (const key of Object.keys(bound) as (keyof Builtins)[]) {
     if (key !== 'Date' && typeof bound[key] === 'function')
       bound[key] = (bound[key] as any).bind(globalObject);
   }
@@ -576,7 +582,7 @@ function getScheduleHandler(type: TimerType) {
   return `set${type}`;
 }
 
-function createApi(clock: ClockController, originals: ClockMethods): ClockMethods {
+function createApi(clock: ClockController, originals: Builtins): Builtins {
   return {
     setTimeout: (func: TimerHandler, timeout?: number | undefined, ...args: any[]) => {
       const delay = timeout ? +timeout : timeout;
@@ -630,9 +636,9 @@ function createApi(clock: ClockController, originals: ClockMethods): ClockMethod
       if (timerId)
         return clock.clearTimer(timerId, TimerType.IdleCallback);
     },
-    Intl: originals.Intl ? createIntl(clock, originals.Intl) : undefined,
+    Intl: originals.Intl ? createIntl(clock, originals.Intl) : (undefined as unknown as Builtins['Intl']),
     Date: createDate(clock, originals.Date),
-    performance: originals.performance ? fakePerformance(clock, originals.performance) : undefined,
+    performance: originals.performance ? fakePerformance(clock, originals.performance) : (undefined as unknown as Builtins['performance']),
   };
 }
 
@@ -643,7 +649,7 @@ function getClearHandler(type: TimerType) {
   return `clear${type}`;
 }
 
-function fakePerformance(clock: ClockController, performance: Performance): Performance {
+function fakePerformance(clock: ClockController, performance: Builtins['performance']): Builtins['performance'] {
   const result: any = {
     now: () => clock.performanceNow(),
   };
@@ -660,7 +666,7 @@ function fakePerformance(clock: ClockController, performance: Performance): Perf
   return result;
 }
 
-export function createClock(globalObject: WindowOrWorkerGlobalScope): { clock: ClockController, api: ClockMethods, originals: ClockMethods } {
+export function createClock(globalObject: WindowOrWorkerGlobalScope): { clock: ClockController, api: Builtins, originals: Builtins } {
   const originals = platformOriginals(globalObject);
   const embedder: Embedder = {
     dateNow: () => originals.raw.Date.now(),
@@ -680,7 +686,7 @@ export function createClock(globalObject: WindowOrWorkerGlobalScope): { clock: C
   return { clock, api, originals: originals.raw };
 }
 
-export function install(globalObject: WindowOrWorkerGlobalScope, config: InstallConfig = {}): { clock: ClockController, api: ClockMethods, originals: ClockMethods } {
+export function install(globalObject: WindowOrWorkerGlobalScope, config: InstallConfig = {}): { clock: ClockController, api: Builtins, originals: Builtins } {
   if ((globalObject as any).Date?.isFake) {
     // Timers are already faked; this is a problem.
     // Make the user reset timers before continuing.
@@ -688,7 +694,7 @@ export function install(globalObject: WindowOrWorkerGlobalScope, config: Install
   }
 
   const { clock, api, originals } = createClock(globalObject);
-  const toFake = config.toFake?.length ? config.toFake : Object.keys(originals) as (keyof ClockMethods)[];
+  const toFake = config.toFake?.length ? config.toFake : Object.keys(originals) as (keyof Builtins)[];
 
   for (const method of toFake) {
     if (method === 'Date') {
@@ -697,6 +703,14 @@ export function install(globalObject: WindowOrWorkerGlobalScope, config: Install
       (globalObject as any).Intl = api[method]!;
     } else if (method === 'performance') {
       (globalObject as any).performance = api[method]!;
+      const kEventTimeStamp = Symbol('playwrightEventTimeStamp');
+      Object.defineProperty(Event.prototype, 'timeStamp', {
+        get() {
+          if (!this[kEventTimeStamp])
+            this[kEventTimeStamp] = api.performance?.now();
+          return this[kEventTimeStamp];
+        }
+      });
     } else {
       (globalObject as any)[method] = (...args: any[]) => {
         return (api[method] as any).apply(api, args);
@@ -711,12 +725,12 @@ export function install(globalObject: WindowOrWorkerGlobalScope, config: Install
 }
 
 export function inject(globalObject: WindowOrWorkerGlobalScope) {
-  const builtin = platformOriginals(globalObject).bound;
+  const builtins = platformOriginals(globalObject).bound;
   const { clock: controller } = install(globalObject);
   controller.resume();
   return {
     controller,
-    builtin,
+    builtins,
   };
 }
 
diff --git a/packages/playwright-core/src/server/injected/consoleApi.ts b/packages/injected/src/consoleApi.ts
similarity index 84%
rename from packages/playwright-core/src/server/injected/consoleApi.ts
rename to packages/injected/src/consoleApi.ts
index f0231e955102a..2f2da420b280f 100644
--- a/packages/playwright-core/src/server/injected/consoleApi.ts
+++ b/packages/injected/src/consoleApi.ts
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import type { ByRoleOptions } from '../../utils/isomorphic/locatorUtils';
-import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from '../../utils/isomorphic/locatorUtils';
-import { escapeForTextSelector } from '../../utils/isomorphic/stringUtils';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
-import type { Language } from '../../utils/isomorphic/locatorGenerators';
+import { asLocator } from '@isomorphic/locatorGenerators';
+import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from '@isomorphic/locatorUtils';
+import { escapeForTextSelector } from '@isomorphic/stringUtils';
+
 import type { InjectedScript } from './injectedScript';
+import type { Language } from '@isomorphic/locatorGenerators';
+import type { ByRoleOptions } from '@isomorphic/locatorUtils';
 
 const selectorSymbol = Symbol('selector');
 
@@ -28,7 +29,7 @@ class Locator {
   element: Element | undefined;
   elements: Element[] | undefined;
 
-  constructor(injectedScript: InjectedScript, selector: string, options?: { hasText?: string | RegExp, hasNotText?: string | RegExp, has?: Locator, hasNot?: Locator }) {
+  constructor(injectedScript: InjectedScript, selector: string, options?: { hasText?: string | RegExp, hasNotText?: string | RegExp, has?: Locator, hasNot?: Locator, visible?: boolean }) {
     if (options?.hasText)
       selector += ` >> internal:has-text=${escapeForTextSelector(options.hasText, false)}`;
     if (options?.hasNotText)
@@ -37,6 +38,8 @@ class Locator {
       selector += ` >> internal:has=` + JSON.stringify(options.has[selectorSymbol]);
     if (options?.hasNot)
       selector += ` >> internal:has-not=` + JSON.stringify(options.hasNot[selectorSymbol]);
+    if (options?.visible !== undefined)
+      selector += ` >> visible=${options.visible ? 'true' : 'false'}`;
     this[selectorSymbol] = selector;
     if (selector) {
       const parsed = injectedScript.parseSelector(selector);
@@ -45,7 +48,7 @@ class Locator {
     }
     const selectorBase = selector;
     const self = this as any;
-    self.locator = (selector: string, options?: { hasText?: string | RegExp, has?: Locator }): Locator => {
+    self.locator = (selector: string, options?: { hasText?: string | RegExp, hasNotText?: string | RegExp, has?: Locator, hasNot?: Locator }): Locator => {
       return new Locator(injectedScript, selectorBase ? selectorBase + ' >> ' + selector : selector, options);
     };
     self.getByTestId = (testId: string): Locator => self.locator(getByTestIdSelector(injectedScript.testIdAttributeNameForStrictErrorAndConsoleCodegen(), testId));
@@ -55,7 +58,7 @@ class Locator {
     self.getByText = (text: string | RegExp, options?: { exact?: boolean }): Locator => self.locator(getByTextSelector(text, options));
     self.getByTitle = (text: string | RegExp, options?: { exact?: boolean }): Locator => self.locator(getByTitleSelector(text, options));
     self.getByRole = (role: string, options: ByRoleOptions = {}): Locator => self.locator(getByRoleSelector(role, options));
-    self.filter = (options?: { hasText?: string | RegExp, has?: Locator }): Locator => new Locator(injectedScript, selector, options);
+    self.filter = (options?: { hasText?: string | RegExp, hasNotText?: string | RegExp, has?: Locator, hasNot?: Locator, visible?: boolean }): Locator => new Locator(injectedScript, selector, options);
     self.first = (): Locator => self.locator('nth=0');
     self.last = (): Locator => self.locator('nth=-1');
     self.nth = (index: number): Locator => self.locator(`nth=${index}`);
@@ -68,15 +71,18 @@ declare global {
   interface Window {
     playwright?: any;
     inspect: (element: Element | undefined) => void;
-    __pw_resume: () => Promise<void>;
+    __pw_resume?: () => Promise<void>;
   }
 }
 
-class ConsoleAPI {
+export class ConsoleAPI {
   private _injectedScript: InjectedScript;
 
   constructor(injectedScript: InjectedScript) {
     this._injectedScript = injectedScript;
+  }
+
+  install() {
     if (this._injectedScript.window.playwright)
       return;
     this._injectedScript.window.playwright = {
@@ -85,8 +91,11 @@ class ConsoleAPI {
       inspect: (selector: string) => this._inspect(selector),
       selector: (element: Element) => this._selector(element),
       generateLocator: (element: Element, language?: Language) => this._generateLocator(element, language),
+      ariaSnapshot: (element?: Element) => {
+        return this._injectedScript.ariaSnapshot(element || this._injectedScript.document.body, { mode: 'expect' });
+      },
       resume: () => this._resume(),
-      ...new Locator(injectedScript, ''),
+      ...new Locator(this._injectedScript, ''),
     };
     delete this._injectedScript.window.playwright.filter;
     delete this._injectedScript.window.playwright.first;
@@ -130,8 +139,8 @@ class ConsoleAPI {
   }
 
   private _resume() {
+    if (!this._injectedScript.window.__pw_resume)
+      return false;
     this._injectedScript.window.__pw_resume().catch(() => {});
   }
 }
-
-export default ConsoleAPI;
diff --git a/packages/playwright-core/src/server/injected/domUtils.ts b/packages/injected/src/domUtils.ts
similarity index 86%
rename from packages/playwright-core/src/server/injected/domUtils.ts
rename to packages/injected/src/domUtils.ts
index fd6915dc103e4..e11d6476949cb 100644
--- a/packages/playwright-core/src/server/injected/domUtils.ts
+++ b/packages/injected/src/domUtils.ts
@@ -14,9 +14,15 @@
  * limitations under the License.
  */
 
-let browserNameForWorkarounds = '';
-export function setBrowserName(name: string) {
-  browserNameForWorkarounds = name;
+type GlobalOptions = {
+  browserNameForWorkarounds?: string;
+};
+let globalOptions: GlobalOptions = {};
+export function setGlobalOptions(options: GlobalOptions) {
+  globalOptions = options;
+}
+export function getGlobalOptions(): GlobalOptions {
+  return globalOptions;
 }
 
 export function isInsideScope(scope: Node, element: Element | undefined): boolean {
@@ -83,7 +89,7 @@ export function isElementStyleVisibilityVisible(element: Element, style?: CSSSty
   // All the browser implement it, but WebKit has a bug which prevents us from using it:
   // https://bugs.webkit.org/show_bug.cgi?id=264733
   // @ts-ignore
-  if (Element.prototype.checkVisibility && browserNameForWorkarounds !== 'webkit') {
+  if (Element.prototype.checkVisibility && globalOptions.browserNameForWorkarounds !== 'webkit') {
     if (!element.checkVisibility())
       return false;
   } else {
@@ -97,25 +103,35 @@ export function isElementStyleVisibilityVisible(element: Element, style?: CSSSty
   return true;
 }
 
-export function isElementVisible(element: Element): boolean {
+export type Box = {
+  visible: boolean;
+  rect?: DOMRect;
+  style?: CSSStyleDeclaration;
+};
+
+export function box(element: Element): Box {
   // Note: this logic should be similar to waitForDisplayedAtStablePosition() to avoid surprises.
   const style = getElementComputedStyle(element);
   if (!style)
-    return true;
+    return { visible: true };
   if (style.display === 'contents') {
     // display:contents is not rendered itself, but its child nodes are.
     for (let child = element.firstChild; child; child = child.nextSibling) {
       if (child.nodeType === 1 /* Node.ELEMENT_NODE */ && isElementVisible(child as Element))
-        return true;
+        return { visible: true, style };
       if (child.nodeType === 3 /* Node.TEXT_NODE */ && isVisibleTextNode(child as Text))
-        return true;
+        return { visible: true, style };
     }
-    return false;
+    return { visible: false, style };
   }
   if (!isElementStyleVisibilityVisible(element, style))
-    return false;
+    return { style, visible: false };
   const rect = element.getBoundingClientRect();
-  return rect.width > 0 && rect.height > 0;
+  return { rect, style, visible: rect.width > 0 && rect.height > 0 };
+}
+
+export function isElementVisible(element: Element): boolean {
+  return box(element).visible;
 }
 
 export function isVisibleTextNode(node: Text) {
diff --git a/packages/playwright-core/src/server/injected/highlight.css b/packages/injected/src/highlight.css
similarity index 93%
rename from packages/playwright-core/src/server/injected/highlight.css
rename to packages/injected/src/highlight.css
index 83123011bc5b8..3acfd3fb1c776 100644
--- a/packages/playwright-core/src/server/injected/highlight.css
+++ b/packages/injected/src/highlight.css
@@ -149,21 +149,24 @@ x-pw-tools-list {
 
 x-pw-tool-item {
   pointer-events: auto;
-  cursor: pointer;
   height: 28px;
   width: 28px;
   border-radius: 3px;
 }
 
+x-pw-tool-item:not(.disabled) {
+  cursor: pointer;
+}
+
 x-pw-tool-item:not(.disabled):hover {
   background-color: hsl(0, 0%, 86%);
 }
 
-x-pw-tool-item.active {
+x-pw-tool-item.toggled {
   background-color: rgba(138, 202, 228, 0.5);
 }
 
-x-pw-tool-item.active:not(.disabled):hover {
+x-pw-tool-item.toggled:not(.disabled):hover {
   background-color: #8acae4c4;
 }
 
@@ -179,18 +182,22 @@ x-pw-tool-item.disabled > x-div {
   cursor: default;
 }
 
-x-pw-tool-item.record.active {
+x-pw-tool-item.record.toggled {
   background-color: transparent;
 }
 
-x-pw-tool-item.record.active:hover {
+x-pw-tool-item.record.toggled:not(.disabled):hover {
   background-color: hsl(0, 0%, 86%);
 }
 
-x-pw-tool-item.record.active > x-div {
+x-pw-tool-item.record.toggled > x-div {
   background-color: #a1260d;
 }
 
+x-pw-tool-item.record.disabled.toggled > x-div {
+  opacity: 0.8;
+}
+
 x-pw-tool-item.accept > x-div {
   background-color: #388a34;
 }
@@ -220,6 +227,11 @@ x-pw-tool-item.value > x-div {
   clip-path: url(#icon-symbol-constant);
 }
 
+x-pw-tool-item.snapshot > x-div {
+  /* codicon: eye */
+  clip-path: url(#icon-gist);
+}
+
 x-pw-tool-item.accept > x-div {
   clip-path: url(#icon-check);
 }
diff --git a/packages/playwright-core/src/server/injected/highlight.ts b/packages/injected/src/highlight.ts
similarity index 59%
rename from packages/playwright-core/src/server/injected/highlight.ts
rename to packages/injected/src/highlight.ts
index c85216e106d3f..3a442a51b5f36 100644
--- a/packages/playwright-core/src/server/injected/highlight.ts
+++ b/packages/injected/src/highlight.ts
@@ -14,15 +14,19 @@
  * limitations under the License.
  */
 
-import { stringifySelector } from '../../utils/isomorphic/selectorParser';
-import type { ParsedSelector } from '../../utils/isomorphic/selectorParser';
-import type { InjectedScript } from './injectedScript';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
-import type { Language } from '../../utils/isomorphic/locatorGenerators';
+import { asLocator } from '@isomorphic/locatorGenerators';
+import { stringifySelector } from '@isomorphic/selectorParser';
+
 import highlightCSS from './highlight.css?inline';
 
-type HighlightEntry = {
+import type { Language } from '@isomorphic/locatorGenerators';
+import type { ParsedSelector } from '@isomorphic/selectorParser';
+import type { InjectedScript } from './injectedScript';
+
+
+type RenderedHighlightEntry = {
   targetElement: Element,
+  color: string,
   highlightElement: HTMLElement,
   tooltipElement?: HTMLElement,
   box?: DOMRect,
@@ -31,19 +35,16 @@ type HighlightEntry = {
   tooltipText?: string,
 };
 
-export type HighlightOptions = {
-  tooltipText?: string;
-  tooltipList?: string[];
-  tooltipFooter?: string;
-  tooltipListItemSelected?: (index: number | undefined) => void;
-  color?: string;
+export type HighlightEntry = {
+  element: Element,
+  color: string,
+  tooltipText?: string,
 };
 
 export class Highlight {
   private _glassPaneElement: HTMLElement;
   private _glassPaneShadow: ShadowRoot;
-  private _highlightEntries: HighlightEntry[] = [];
-  private _highlightOptions: HighlightOptions = {};
+  private _renderedEntries: RenderedHighlightEntry[] = [];
   private _actionPointElement: HTMLElement;
   private _isUnderTest: boolean;
   private _injectedScript: InjectedScript;
@@ -60,7 +61,7 @@ export class Highlight {
     this._glassPaneElement.style.right = '0';
     this._glassPaneElement.style.bottom = '0';
     this._glassPaneElement.style.left = '0';
-    this._glassPaneElement.style.zIndex = '2147483646';
+    this._glassPaneElement.style.zIndex = '2147483647';
     this._glassPaneElement.style.pointerEvents = 'none';
     this._glassPaneElement.style.display = 'flex';
     this._glassPaneElement.style.backgroundColor = 'transparent';
@@ -68,8 +69,6 @@ export class Highlight {
       this._glassPaneElement.addEventListener(eventName, e => {
         e.stopPropagation();
         e.stopImmediatePropagation();
-        if (e.type === 'click' && (e as MouseEvent).button === 0 && this._highlightOptions.tooltipListItemSelected)
-          this._highlightOptions.tooltipListItemSelected(undefined);
       });
     }
     this._actionPointElement = document.createElement('x-pw-action-point');
@@ -90,7 +89,11 @@ export class Highlight {
   }
 
   install() {
-    this._injectedScript.document.documentElement.appendChild(this._glassPaneElement);
+    // NOTE: document.documentElement can be null: https://github.com/microsoft/TypeScript/issues/50078
+    if (!this._injectedScript.document.documentElement)
+      return;
+    if (!this._injectedScript.document.documentElement.contains(this._glassPaneElement) || this._glassPaneElement.nextElementSibling)
+      this._injectedScript.document.documentElement.appendChild(this._glassPaneElement);
   }
 
   setLanguage(language: Language) {
@@ -99,14 +102,20 @@ export class Highlight {
 
   runHighlightOnRaf(selector: ParsedSelector) {
     if (this._rafRequest)
-      cancelAnimationFrame(this._rafRequest);
-    this.updateHighlight(this._injectedScript.querySelectorAll(selector, this._injectedScript.document.documentElement), { tooltipText: asLocator(this._language, stringifySelector(selector)) });
-    this._rafRequest = this._injectedScript.builtinRequestAnimationFrame(() => this.runHighlightOnRaf(selector));
+      this._injectedScript.utils.builtins.cancelAnimationFrame(this._rafRequest);
+    const elements = this._injectedScript.querySelectorAll(selector, this._injectedScript.document.documentElement);
+    const locator = asLocator(this._language, stringifySelector(selector));
+    const color = elements.length > 1 ? '#f6b26b7f' : '#6fa8dc7f';
+    this.updateHighlight(elements.map((element, index) => {
+      const suffix = elements.length > 1 ? ` [${index + 1} of ${elements.length}]` : '';
+      return { element, color, tooltipText: locator + suffix };
+    }));
+    this._rafRequest = this._injectedScript.utils.builtins.requestAnimationFrame(() => this.runHighlightOnRaf(selector));
   }
 
   uninstall() {
     if (this._rafRequest)
-      cancelAnimationFrame(this._rafRequest);
+      this._injectedScript.utils.builtins.cancelAnimationFrame(this._rafRequest);
     this._glassPaneElement.remove();
   }
 
@@ -121,77 +130,47 @@ export class Highlight {
   }
 
   clearHighlight() {
-    for (const entry of this._highlightEntries) {
+    for (const entry of this._renderedEntries) {
       entry.highlightElement?.remove();
       entry.tooltipElement?.remove();
     }
-    this._highlightEntries = [];
-    this._highlightOptions = {};
-    this._glassPaneElement.style.pointerEvents = 'none';
-  }
-
-  updateHighlight(elements: Element[], options: HighlightOptions) {
-    this._innerUpdateHighlight(elements, options);
+    this._renderedEntries = [];
   }
 
   maskElements(elements: Element[], color: string) {
-    this._innerUpdateHighlight(elements, { color: color });
+    this.updateHighlight(elements.map(element => ({ element, color })));
   }
 
-  private _innerUpdateHighlight(elements: Element[], options: HighlightOptions) {
-    let color = options.color;
-    if (!color)
-      color = elements.length > 1 ? '#f6b26b7f' : '#6fa8dc7f';
-
+  updateHighlight(entries: HighlightEntry[]) {
     // Code below should trigger one layout and leave with the
     // destroyed layout.
 
-    if (this._highlightIsUpToDate(elements, options))
+    if (this._highlightIsUpToDate(entries))
       return;
 
     // 1. Destroy the layout
     this.clearHighlight();
-    this._highlightOptions = options;
-    this._glassPaneElement.style.pointerEvents = options.tooltipListItemSelected ? 'initial' : 'none';
 
-    for (let i = 0; i < elements.length; ++i) {
+    for (const entry of entries) {
       const highlightElement = this._createHighlightElement();
       this._glassPaneShadow.appendChild(highlightElement);
 
       let tooltipElement;
-      if (options.tooltipList || options.tooltipText || options.tooltipFooter) {
+      if (entry.tooltipText) {
         tooltipElement = this._injectedScript.document.createElement('x-pw-tooltip');
         this._glassPaneShadow.appendChild(tooltipElement);
         tooltipElement.style.top = '0';
         tooltipElement.style.left = '0';
         tooltipElement.style.display = 'flex';
-        let lines: string[] = [];
-        if (options.tooltipList) {
-          lines = options.tooltipList;
-        } else if (options.tooltipText) {
-          const suffix = elements.length > 1 ? ` [${i + 1} of ${elements.length}]` : '';
-          lines = [options.tooltipText + suffix];
-        }
-        for (let index = 0; index < lines.length; index++) {
-          const element = this._injectedScript.document.createElement('x-pw-tooltip-line');
-          element.textContent = lines[index];
-          tooltipElement.appendChild(element);
-          if (options.tooltipListItemSelected) {
-            element.classList.add('selectable');
-            element.addEventListener('click', () => options.tooltipListItemSelected?.(index));
-          }
-        }
-        if (options.tooltipFooter) {
-          const footer = this._injectedScript.document.createElement('x-pw-tooltip-footer');
-          footer.textContent = options.tooltipFooter;
-          tooltipElement.appendChild(footer);
-        }
+        const lineElement = this._injectedScript.document.createElement('x-pw-tooltip-line');
+        lineElement.textContent = entry.tooltipText;
+        tooltipElement.appendChild(lineElement);
       }
-      this._highlightEntries.push({ targetElement: elements[i], tooltipElement, highlightElement });
+      this._renderedEntries.push({ targetElement: entry.element, color: entry.color, tooltipElement, highlightElement });
     }
 
     // 2. Trigger layout while positioning tooltips and computing bounding boxes.
-    for (const entry of this._highlightEntries) {
+    for (const entry of this._renderedEntries) {
       entry.box = entry.targetElement.getBoundingClientRect();
       if (!entry.tooltipElement)
         continue;
@@ -203,15 +182,13 @@ export class Highlight {
     }
 
     // 3. Destroy the layout again.
-
-    // If there are more than 1 box - we are evaluating a non-unique (potentially bad) selector.
-    for (const entry of this._highlightEntries) {
+    for (const entry of this._renderedEntries) {
       if (entry.tooltipElement) {
         entry.tooltipElement.style.top = entry.tooltipTop + 'px';
         entry.tooltipElement.style.left = entry.tooltipLeft + 'px';
       }
       const box = entry.box!;
-      entry.highlightElement.style.backgroundColor = color;
+      entry.highlightElement.style.backgroundColor = entry.color;
       entry.highlightElement.style.left = box.x + 'px';
       entry.highlightElement.style.top = box.y + 'px';
       entry.highlightElement.style.width = box.width + 'px';
@@ -224,7 +201,7 @@ export class Highlight {
   }
 
   firstBox(): DOMRect | undefined {
-    return this._highlightEntries[0]?.box;
+    return this._renderedEntries[0]?.box;
   }
 
   tooltipPosition(box: DOMRect, tooltipElement: HTMLElement) {
@@ -249,36 +226,21 @@ export class Highlight {
     return { anchorLeft, anchorTop };
   }
 
-  private _highlightIsUpToDate(elements: Element[], options: HighlightOptions): boolean {
-    if (options.tooltipText !== this._highlightOptions.tooltipText)
-      return false;
-    if (options.tooltipListItemSelected !== this._highlightOptions.tooltipListItemSelected)
-      return false;
-    if (options.tooltipFooter !== this._highlightOptions.tooltipFooter)
-      return false;
-
-    if (options.tooltipList?.length !== this._highlightOptions.tooltipList?.length)
+  private _highlightIsUpToDate(entries: HighlightEntry[]): boolean {
+    if (entries.length !== this._renderedEntries.length)
       return false;
-    if (options.tooltipList && this._highlightOptions.tooltipList) {
-      for (let i = 0; i < options.tooltipList.length; i++) {
-        if (options.tooltipList[i] !== this._highlightOptions.tooltipList[i])
-          return false;
-      }
-    }
-
-    if (elements.length !== this._highlightEntries.length)
-      return false;
-    for (let i = 0; i < this._highlightEntries.length; ++i) {
-      if (elements[i] !== this._highlightEntries[i].targetElement)
+    for (let i = 0; i < this._renderedEntries.length; ++i) {
+      if (entries[i].element !== this._renderedEntries[i].targetElement)
         return false;
-      const oldBox = this._highlightEntries[i].box;
+      if (entries[i].color !== this._renderedEntries[i].color)
+        return false;
+      const oldBox = this._renderedEntries[i].box;
       if (!oldBox)
         return false;
-      const box = elements[i].getBoundingClientRect();
+      const box = entries[i].element.getBoundingClientRect();
       if (box.top !== oldBox.top || box.right !== oldBox.right || box.bottom !== oldBox.bottom || box.left !== oldBox.left)
         return false;
     }
-
     return true;
   }
 
@@ -286,7 +248,7 @@ export class Highlight {
     return this._injectedScript.document.createElement('x-pw-highlight');
   }
 
-  appendChild(element: HTMLElement) {
+  appendChild(element: Element) {
     this._glassPaneShadow.appendChild(element);
   }
 }
diff --git a/packages/playwright-core/src/server/injected/injectedScript.ts b/packages/injected/src/injectedScript.ts
similarity index 73%
rename from packages/playwright-core/src/server/injected/injectedScript.ts
rename to packages/injected/src/injectedScript.ts
index 2323648bae379..29446799cb80c 100644
--- a/packages/playwright-core/src/server/injected/injectedScript.ts
+++ b/packages/injected/src/injectedScript.ts
@@ -14,31 +14,44 @@
  * limitations under the License.
  */
 
-import type { SelectorEngine, SelectorRoot } from './selectorEngine';
-import { XPathEngine } from './xpathSelectorEngine';
-import { ReactEngine } from './reactSelectorEngine';
-import { VueEngine } from './vueSelectorEngine';
+import { parseAriaSnapshot } from '@isomorphic/ariaSnapshot';
+import { asLocator } from '@isomorphic/locatorGenerators';
+import { parseAttributeSelector, parseSelector, stringifySelector, visitAllSelectorParts } from '@isomorphic/selectorParser';
+import { cacheNormalizedWhitespaces, normalizeWhiteSpace, trimStringWithEllipsis } from '@isomorphic/stringUtils';
+
+import { generateAriaTree, getAllElementsMatchingExpectAriaTemplate, matchesExpectAriaTemplate, renderAriaTree } from './ariaSnapshot';
+import { enclosingShadowRootOrDocument, isElementVisible, isInsideScope, parentElementOrShadowHost, setGlobalOptions } from './domUtils';
+import { Highlight } from './highlight';
+import { kLayoutSelectorNames, layoutSelectorScore } from './layoutSelectorUtils';
+import { createReactEngine } from './reactSelectorEngine';
 import { createRoleEngine } from './roleSelectorEngine';
-import { parseAttributeSelector } from '../../utils/isomorphic/selectorParser';
-import type { NestedSelectorBody, ParsedSelector, ParsedSelectorPart } from '../../utils/isomorphic/selectorParser';
-import { visitAllSelectorParts, parseSelector, stringifySelector } from '../../utils/isomorphic/selectorParser';
-import { type TextMatcher, elementMatchesText, elementText, type ElementText, getElementLabels } from './selectorUtils';
+import { getAriaDisabled, getAriaRole, getCheckedAllowMixed, getCheckedWithoutMixed, getElementAccessibleDescription, getElementAccessibleErrorMessage, getElementAccessibleName, getReadonly } from './roleUtils';
 import { SelectorEvaluatorImpl, sortInDOMOrder } from './selectorEvaluator';
-import { enclosingShadowRootOrDocument, isElementVisible, isInsideScope, parentElementOrShadowHost, setBrowserName } from './domUtils';
-import type { CSSComplexSelectorList } from '../../utils/isomorphic/cssParser';
-import { generateSelector, type GenerateSelectorOptions } from './selectorGenerator';
+import { generateSelector } from './selectorGenerator';
+import { elementMatchesText, elementText, getElementLabels } from './selectorUtils';
+import { createVueEngine } from './vueSelectorEngine';
+import { XPathEngine } from './xpathSelectorEngine';
+import { ConsoleAPI } from './consoleApi';
+import { UtilityScript } from './utilityScript';
+
+import type { AriaTemplateNode } from '@isomorphic/ariaSnapshot';
+import type { CSSComplexSelectorList } from '@isomorphic/cssParser';
+import type { Language } from '@isomorphic/locatorGenerators';
+import type { NestedSelectorBody, ParsedSelector, ParsedSelectorPart } from '@isomorphic/selectorParser';
 import type * as channels from '@protocol/channels';
-import { Highlight } from './highlight';
-import { getChecked, getAriaDisabled, getAriaRole, getElementAccessibleName, getElementAccessibleDescription } from './roleUtils';
-import { kLayoutSelectorNames, type LayoutSelectorName, layoutSelectorScore } from './layoutSelectorUtils';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
-import type { Language } from '../../utils/isomorphic/locatorGenerators';
-import { cacheNormalizedWhitespaces, normalizeWhiteSpace, trimStringWithEllipsis } from '../../utils/isomorphic/stringUtils';
+import type { AriaSnapshot, AriaTreeOptions } from './ariaSnapshot';
+import type { LayoutSelectorName } from './layoutSelectorUtils';
+import type { SelectorEngine, SelectorRoot } from './selectorEngine';
+import type { GenerateSelectorOptions } from './selectorGenerator';
+import type { ElementText, TextMatcher } from './selectorUtils';
+import type { Builtins } from './utilityScript';
+
 
-export type FrameExpectParams = Omit<channels.FrameExpectParams, 'expectedValue'> & { expectedValue?: any };
+export type FrameExpectParams = Omit<channels.FrameExpectParams, 'expectedValue' | 'timeout'> & { expectedValue?: any };
 
-export type ElementStateWithoutStable = 'visible' | 'hidden' | 'enabled' | 'disabled' | 'editable' | 'checked' | 'unchecked';
-export type ElementState = ElementStateWithoutStable | 'stable';
+export type ElementState = 'visible' | 'hidden' | 'enabled' | 'disabled' | 'editable' | 'checked' | 'unchecked' | 'indeterminate' | 'stable';
+export type ElementStateWithoutStable = Exclude<ElementState, 'stable'>;
+export type ElementStateQueryResult = { matches: boolean, received?: string | 'error:notconnected' };
 
 export type HitTargetInterceptionResult = {
   stop: () => 'done' | { hitTargetDescription: string };
@@ -52,36 +65,141 @@ interface WebKitLegacyDeviceMotionEvent extends DeviceMotionEvent {
   readonly initDeviceMotionEvent: (type: string, bubbles: boolean, cancelable: boolean, acceleration: DeviceMotionEventAcceleration, accelerationIncludingGravity: DeviceMotionEventAcceleration, rotationRate: DeviceMotionEventRotationRate, interval: number) => void;
 }
 
+export type InjectedScriptOptions = {
+  isUnderTest: boolean;
+  sdkLanguage: Language;
+  // For strict error and codegen
+  testIdAttributeName: string;
+  stableRafCount: number;
+  browserName: string;
+  customEngines: { name: string, source: string }[];
+};
+
 export class InjectedScript {
   private _engines: Map<string, SelectorEngine>;
-  _evaluator: SelectorEvaluatorImpl;
+  readonly _evaluator: SelectorEvaluatorImpl;
   private _stableRafCount: number;
   private _browserName: string;
-  onGlobalListenersRemoved = new Set<() => void>();
+  readonly onGlobalListenersRemoved: Set<() => void>;
   private _hitTargetInterceptor: undefined | ((event: MouseEvent | PointerEvent | TouchEvent) => void);
   private _highlight: Highlight | undefined;
   readonly isUnderTest: boolean;
   private _sdkLanguage: Language;
   private _testIdAttributeNameForStrictErrorAndConsoleCodegen: string = 'data-testid';
+  private _markedElements?: { callId: string, elements: Set<Element> };
   // eslint-disable-next-line no-restricted-globals
   readonly window: Window & typeof globalThis;
   readonly document: Document;
-  readonly utils = { isInsideScope, elementText, asLocator, normalizeWhiteSpace, cacheNormalizedWhitespaces };
+  readonly consoleApi: ConsoleAPI;
+  private _lastAriaSnapshot: AriaSnapshot | undefined;
+
+  // Recorder must use any external dependencies through InjectedScript.
+  // Otherwise it will end up with a copy of all modules it uses, and any
+  // module-level globals will be duplicated, which leads to subtle bugs.
+  readonly utils = {
+    asLocator,
+    cacheNormalizedWhitespaces,
+    elementText,
+    getAriaRole,
+    getElementAccessibleDescription,
+    getElementAccessibleName,
+    isElementVisible,
+    isInsideScope,
+    normalizeWhiteSpace,
+    parseAriaSnapshot,
+    generateAriaTree,
+    // Builtins protect injected code from clock emulation.
+    builtins: null as unknown as Builtins,
+  };
+
+  private _autoClosingTags: Set<string>;
+  private _booleanAttributes: Set<string>;
+  private _eventTypes: Map<string, 'mouse' | 'keyboard' | 'touch' | 'pointer' | 'focus' | 'drag' | 'wheel' | 'deviceorientation' | 'devicemotion'>;
+  private _hoverHitTargetInterceptorEvents: Set<string>;
+  private _tapHitTargetInterceptorEvents: Set<string>;
+  private _mouseHitTargetInterceptorEvents: Set<string>;
+  private _allHitTargetInterceptorEvents: Set<string>;
 
   // eslint-disable-next-line no-restricted-globals
-  constructor(window: Window & typeof globalThis, isUnderTest: boolean, sdkLanguage: Language, testIdAttributeNameForStrictErrorAndConsoleCodegen: string, stableRafCount: number, browserName: string, customEngines: { name: string, engine: SelectorEngine }[]) {
+  constructor(window: Window & typeof globalThis, options: InjectedScriptOptions) {
     this.window = window;
     this.document = window.document;
-    this.isUnderTest = isUnderTest;
-    this._sdkLanguage = sdkLanguage;
-    this._testIdAttributeNameForStrictErrorAndConsoleCodegen = testIdAttributeNameForStrictErrorAndConsoleCodegen;
-    this._evaluator = new SelectorEvaluatorImpl(new Map());
+    this.isUnderTest = options.isUnderTest;
+    // Make sure builtins are created from "window". This is important for InjectedScript instantiated
+    // inside a trace viewer snapshot, where "window" differs from "globalThis".
+    this.utils.builtins = new UtilityScript(window, options.isUnderTest).builtins;
+    this._sdkLanguage = options.sdkLanguage;
+    this._testIdAttributeNameForStrictErrorAndConsoleCodegen = options.testIdAttributeName;
+    this._evaluator = new SelectorEvaluatorImpl();
+    this.consoleApi = new ConsoleAPI(this);
+
+    this.onGlobalListenersRemoved = new Set();
+    this._autoClosingTags = new Set(['AREA', 'BASE', 'BR', 'COL', 'COMMAND', 'EMBED', 'HR', 'IMG', 'INPUT', 'KEYGEN', 'LINK', 'MENUITEM', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR']);
+    this._booleanAttributes = new Set(['checked', 'selected', 'disabled', 'readonly', 'multiple']);
+    this._eventTypes = new Map([
+      ['auxclick', 'mouse'],
+      ['click', 'mouse'],
+      ['dblclick', 'mouse'],
+      ['mousedown', 'mouse'],
+      ['mouseeenter', 'mouse'],
+      ['mouseleave', 'mouse'],
+      ['mousemove', 'mouse'],
+      ['mouseout', 'mouse'],
+      ['mouseover', 'mouse'],
+      ['mouseup', 'mouse'],
+      ['mouseleave', 'mouse'],
+      ['mousewheel', 'mouse'],
+
+      ['keydown', 'keyboard'],
+      ['keyup', 'keyboard'],
+      ['keypress', 'keyboard'],
+      ['textInput', 'keyboard'],
+
+      ['touchstart', 'touch'],
+      ['touchmove', 'touch'],
+      ['touchend', 'touch'],
+      ['touchcancel', 'touch'],
+
+      ['pointerover', 'pointer'],
+      ['pointerout', 'pointer'],
+      ['pointerenter', 'pointer'],
+      ['pointerleave', 'pointer'],
+      ['pointerdown', 'pointer'],
+      ['pointerup', 'pointer'],
+      ['pointermove', 'pointer'],
+      ['pointercancel', 'pointer'],
+      ['gotpointercapture', 'pointer'],
+      ['lostpointercapture', 'pointer'],
+
+      ['focus', 'focus'],
+      ['blur', 'focus'],
+
+      ['drag', 'drag'],
+      ['dragstart', 'drag'],
+      ['dragend', 'drag'],
+      ['dragover', 'drag'],
+      ['dragenter', 'drag'],
+      ['dragleave', 'drag'],
+      ['dragexit', 'drag'],
+      ['drop', 'drag'],
+
+      ['wheel', 'wheel'],
+
+      ['deviceorientation', 'deviceorientation'],
+      ['deviceorientationabsolute', 'deviceorientation'],
+
+      ['devicemotion', 'devicemotion'],
+    ]);
+    this._hoverHitTargetInterceptorEvents = new Set(['mousemove']);
+    this._tapHitTargetInterceptorEvents = new Set(['pointerdown', 'pointerup', 'touchstart', 'touchend', 'touchcancel']);
+    this._mouseHitTargetInterceptorEvents = new Set(['mousedown', 'mouseup', 'pointerdown', 'pointerup', 'click', 'auxclick', 'dblclick', 'contextmenu']);
+    this._allHitTargetInterceptorEvents = new Set([...this._hoverHitTargetInterceptorEvents, ...this._tapHitTargetInterceptorEvents, ...this._mouseHitTargetInterceptorEvents]);
 
     this._engines = new Map();
     this._engines.set('xpath', XPathEngine);
     this._engines.set('xpath:light', XPathEngine);
-    this._engines.set('_react', ReactEngine);
-    this._engines.set('_vue', VueEngine);
+    this._engines.set('_react', createReactEngine());
+    this._engines.set('_vue', createVueEngine());
     this._engines.set('role', createRoleEngine(false));
     this._engines.set('text', this._createTextEngine(true, false));
     this._engines.set('text:light', this._createTextEngine(false, false));
@@ -109,33 +227,23 @@ export class InjectedScript {
     this._engines.set('internal:attr', this._createNamedAttributeEngine());
     this._engines.set('internal:testid', this._createNamedAttributeEngine());
     this._engines.set('internal:role', createRoleEngine(true));
+    this._engines.set('internal:describe', this._createDescribeEngine());
+    this._engines.set('aria-ref', this._createAriaRefEngine());
 
-    for (const { name, engine } of customEngines)
-      this._engines.set(name, engine);
+    for (const { name, source } of options.customEngines)
+      this._engines.set(name, this.eval(source));
 
-    this._stableRafCount = stableRafCount;
-    this._browserName = browserName;
-    setBrowserName(browserName);
+    this._stableRafCount = options.stableRafCount;
+    this._browserName = options.browserName;
+    setGlobalOptions({ browserNameForWorkarounds: options.browserName });
 
     this._setupGlobalListenersRemovalDetection();
     this._setupHitTargetInterceptors();
 
-    if (isUnderTest)
+    if (this.isUnderTest)
       (this.window as any).__injectedScript = this;
   }
 
-  builtinSetTimeout(callback: Function, timeout: number) {
-    if (this.window.__pwClock?.builtin)
-      return this.window.__pwClock.builtin.setTimeout(callback, timeout);
-    return setTimeout(callback, timeout);
-  }
-
-  builtinRequestAnimationFrame(callback: FrameRequestCallback) {
-    if (this.window.__pwClock?.builtin)
-      return this.window.__pwClock.builtin.requestAnimationFrame(callback);
-    return requestAnimationFrame(callback);
-  }
-
   eval(expression: string): any {
     return this.window.eval(expression);
   }
@@ -190,6 +298,23 @@ export class InjectedScript {
     return new Set<Element>(result.map(r => r.element));
   }
 
+  ariaSnapshot(node: Node, options: AriaTreeOptions): string {
+    if (node.nodeType !== Node.ELEMENT_NODE)
+      throw this.createStacklessError('Can only capture aria snapshot of Element nodes.');
+    this._lastAriaSnapshot = generateAriaTree(node as Element, options);
+    return renderAriaTree(this._lastAriaSnapshot, options);
+  }
+
+  ariaSnapshotForRecorder(): { ariaSnapshot: string, refs: Map<Element, string> } {
+    const tree = generateAriaTree(this.document.body, { mode: 'ai' });
+    const ariaSnapshot = renderAriaTree(tree, { mode: 'ai' });
+    return { ariaSnapshot, refs: tree.refs };
+  }
+
+  getAllElementsMatchingExpectAriaTemplate(document: Document, template: AriaTemplateNode): Element[] {
+    return getAllElementsMatchingExpectAriaTemplate(document.documentElement, template);
+  }
+
   querySelectorAll(selector: ParsedSelector, root: Node): Element[] {
     if (selector.capture !== undefined) {
       if (selector.parts.some(part => part.name === 'nth'))
@@ -361,6 +486,15 @@ export class InjectedScript {
     return { queryAll };
   }
 
+  private _createDescribeEngine(): SelectorEngine {
+    const queryAll = (root: SelectorRoot): Element[] => {
+      if (root.nodeType !== 1 /* Node.ELEMENT_NODE */)
+        return [];
+      return [root as Element];
+    };
+    return { queryAll };
+  }
+
   private _createControlEngine(): SelectorEngine {
     return {
       queryAll(root: SelectorRoot, body: any) {
@@ -404,7 +538,8 @@ export class InjectedScript {
     const queryAll = (root: SelectorRoot, body: string) => {
       if (root.nodeType !== 1 /* Node.ELEMENT_NODE */)
         return [];
-      return isElementVisible(root as Element) === Boolean(body) ? [root as Element] : [];
+      const visible = body === 'true';
+      return isElementVisible(root as Element) === visible ? [root as Element] : [];
     };
     return { queryAll };
   }
@@ -426,10 +561,6 @@ export class InjectedScript {
     return new constrFunction(this, params);
   }
 
-  isVisible(element: Element): boolean {
-    return isElementVisible(element);
-  }
-
   async viewportRatio(element: Element): Promise<number> {
     return await new Promise(resolve => {
       const observer = new IntersectionObserver(entries => {
@@ -439,7 +570,7 @@ export class InjectedScript {
       observer.observe(element);
       // Firefox doesn't call IntersectionObserver callback unless
       // there are rafs.
-      this.builtinRequestAnimationFrame(() => {});
+      this.utils.builtins.requestAnimationFrame(() => {});
     });
   }
 
@@ -481,10 +612,10 @@ export class InjectedScript {
       if (!element.matches('a, input, textarea, button, select, [role=link], [role=button], [role=checkbox], [role=radio]') &&
         !(element as any).isContentEditable) {
         // Go up to the label that might be connected to the input/textarea.
-        element = element.closest('label') || element;
+        const enclosingLabel: HTMLLabelElement | null = element.closest('label');
+        if (enclosingLabel && enclosingLabel.control)
+          element = enclosingLabel.control;
       }
-      if (element.nodeName === 'LABEL')
-        element = (element as HTMLLabelElement).control || element;
     }
     return element;
   }
@@ -495,15 +626,15 @@ export class InjectedScript {
       if (stableResult === false)
         return { missingState: 'stable' };
       if (stableResult === 'error:notconnected')
-        return stableResult;
+        return 'error:notconnected';
     }
     for (const state of states) {
       if (state !== 'stable') {
         const result = this.elementState(node, state);
-        if (result === false)
+        if (result.received === 'error:notconnected')
+          return 'error:notconnected';
+        if (!result.matches)
           return { missingState: state };
-        if (result === 'error:notconnected')
-          return result;
       }
     }
   }
@@ -520,7 +651,7 @@ export class InjectedScript {
         return 'error:notconnected';
 
       // Drop frames that are shorter than 16ms - WebKit Win bug.
-      const time = performance.now();
+      const time = this.utils.builtins.performance.now();
       if (this._stableRafCount > 1 && time - lastTime < 15)
         return continuePolling;
       lastTime = time;
@@ -548,50 +679,83 @@ export class InjectedScript {
         if (success !== continuePolling)
           fulfill(success);
         else
-          this.builtinRequestAnimationFrame(raf);
+          this.utils.builtins.requestAnimationFrame(raf);
       } catch (e) {
         reject(e);
       }
     };
-    this.builtinRequestAnimationFrame(raf);
+    this.utils.builtins.requestAnimationFrame(raf);
 
     return result;
   }
 
-  elementState(node: Node, state: ElementStateWithoutStable): boolean | 'error:notconnected' {
-    const element = this.retarget(node, ['stable', 'visible', 'hidden'].includes(state) ? 'none' : 'follow-label');
+  _createAriaRefEngine() {
+    const queryAll = (root: SelectorRoot, selector: string): Element[] => {
+      const result = this._lastAriaSnapshot?.elements?.get(selector);
+      return result && result.isConnected ? [result] : [];
+    };
+    return { queryAll };
+  }
+
+  elementState(node: Node, state: ElementStateWithoutStable): ElementStateQueryResult {
+    const element = this.retarget(node, ['visible', 'hidden'].includes(state) ? 'none' : 'follow-label');
     if (!element || !element.isConnected) {
       if (state === 'hidden')
-        return true;
-      return 'error:notconnected';
+        return { matches: true, received: 'hidden' };
+      return { matches: false, received: 'error:notconnected' };
     }
 
-    if (state === 'visible')
-      return this.isVisible(element);
-    if (state === 'hidden')
-      return !this.isVisible(element);
+    if (state === 'visible' || state === 'hidden') {
+      const visible = isElementVisible(element);
+      return {
+        matches: state === 'visible' ? visible : !visible,
+        received: visible ? 'visible' : 'hidden'
+      };
+    }
 
-    const disabled = getAriaDisabled(element);
-    if (state === 'disabled')
-      return disabled;
-    if (state === 'enabled')
-      return !disabled;
+    if (state === 'disabled' || state === 'enabled') {
+      const disabled = getAriaDisabled(element);
+      return {
+        matches: state === 'disabled' ? disabled : !disabled,
+        received: disabled ? 'disabled' : 'enabled'
+      };
+    }
 
-    const editable = !(['INPUT', 'TEXTAREA', 'SELECT'].includes(element.nodeName) && element.hasAttribute('readonly'));
-    if (state === 'editable')
-      return !disabled && editable;
+    if (state === 'editable') {
+      const disabled = getAriaDisabled(element);
+      const readonly = getReadonly(element);
+      if (readonly === 'error')
+        throw this.createStacklessError('Element is not an <input>, <textarea>, <select> or [contenteditable] and does not have a role allowing [aria-readonly]');
+      return {
+        matches: !disabled && !readonly,
+        received: disabled ? 'disabled' : readonly ? 'readOnly' : 'editable'
+      };
+    }
 
     if (state === 'checked' || state === 'unchecked') {
       const need = state === 'checked';
-      const checked = getChecked(element, false);
+      const checked = getCheckedWithoutMixed(element);
       if (checked === 'error')
         throw this.createStacklessError('Not a checkbox or radio button');
-      return need === checked;
+      return {
+        matches: need === checked,
+        received: checked ? 'checked' : 'unchecked',
+      };
+    }
+
+    if (state === 'indeterminate') {
+      const checked = getCheckedAllowMixed(element);
+      if (checked === 'error')
+        throw this.createStacklessError('Not a checkbox or radio button');
+      return {
+        matches: checked === 'mixed',
+        received: checked === true ? 'checked' : checked === false ? 'unchecked' : 'mixed',
+      };
     }
     throw this.createStacklessError(`Unexpected element state "${state}"`);
   }
 
-  selectOptions(node: Node, optionsToSelect: (Node | { valueOrLabel?: string, value?: string, label?: string, index?: number })[]): string[] | 'error:notconnected' | 'error:optionsnotfound' {
+  selectOptions(node: Node, optionsToSelect: (Node | { valueOrLabel?: string, value?: string, label?: string, index?: number })[]): string[] | 'error:notconnected' | 'error:optionsnotfound' | 'error:optionnotenabled' {
     const element = this.retarget(node, 'follow-label');
     if (!element)
       return 'error:notconnected';
@@ -619,6 +783,8 @@ export class InjectedScript {
       };
       if (!remainingOptionsToSelect.some(filter))
         continue;
+      if (!this.elementState(option, 'enabled').matches)
+        return 'error:optionnotenabled';
       selectedOptions.push(option);
       if (select.multiple) {
         remainingOptionsToSelect = remainingOptionsToSelect.filter(o => !filter(o));
@@ -896,9 +1062,9 @@ export class InjectedScript {
       return { stop: () => 'done' };
 
     const events = {
-      'hover': kHoverHitTargetInterceptorEvents,
-      'tap': kTapHitTargetInterceptorEvents,
-      'mouse': kMouseHitTargetInterceptorEvents,
+      'hover': this._hoverHitTargetInterceptorEvents,
+      'tap': this._tapHitTargetInterceptorEvents,
+      'mouse': this._mouseHitTargetInterceptorEvents,
     }[action];
     let result: 'done' | { hitTargetDescription: string } | undefined;
 
@@ -943,13 +1109,46 @@ export class InjectedScript {
     return { stop };
   }
 
-  dispatchEvent(node: Node, type: string, eventInit: Object) {
+  dispatchEvent(node: Node, type: string, eventInitObj: Object) {
     let event;
-    eventInit = { bubbles: true, cancelable: true, composed: true, ...eventInit };
-    switch (eventType.get(type)) {
+    const eventInit: any = { bubbles: true, cancelable: true, composed: true, ...eventInitObj };
+    switch (this._eventTypes.get(type)) {
       case 'mouse': event = new MouseEvent(type, eventInit); break;
       case 'keyboard': event = new KeyboardEvent(type, eventInit); break;
-      case 'touch': event = new TouchEvent(type, eventInit); break;
+      case 'touch': {
+        // WebKit does not support Touch constructor, but has deprecated createTouch and createTouchList methods.
+        if (this._browserName === 'webkit') {
+          const createTouch = (t: any) => {
+            if (t instanceof Touch)
+              return t;
+            // createTouch does not accept clientX/clientY, so we have to use pageX/pageY.
+            let pageX = t.pageX;
+            if (pageX === undefined && t.clientX !== undefined)
+              pageX = t.clientX + (this.document.scrollingElement?.scrollLeft || 0);
+            let pageY = t.pageY;
+            if (pageY === undefined && t.clientY !== undefined)
+              pageY = t.clientY + (this.document.scrollingElement?.scrollTop || 0);
+            return (this.document as any).createTouch(this.window, t.target ?? node, t.identifier, pageX, pageY, t.screenX, t.screenY, t.radiusX, t.radiusY, t.rotationAngle, t.force);
+          };
+          const createTouchList = (touches: any) => {
+            if (touches instanceof TouchList || !touches)
+              return touches;
+            return (this.document as any).createTouchList(...touches.map(createTouch));
+          };
+          eventInit.target ??= node;
+          eventInit.touches = createTouchList(eventInit.touches);
+          eventInit.targetTouches = createTouchList(eventInit.targetTouches);
+          eventInit.changedTouches = createTouchList(eventInit.changedTouches);
+          event = new TouchEvent(type, eventInit);
+        } else {
+          eventInit.target ??= node;
+          eventInit.touches = eventInit.touches?.map((t: any) => t instanceof Touch ? t : new Touch({ ...t, target: t.target ?? node }));
+          eventInit.targetTouches = eventInit.targetTouches?.map((t: any) => t instanceof Touch ? t : new Touch({ ...t, target: t.target ?? node }));
+          eventInit.changedTouches = eventInit.changedTouches?.map((t: any) => t instanceof Touch ? t : new Touch({ ...t, target: t.target ?? node }));
+          event = new TouchEvent(type, eventInit);
+        }
+        break;
+      }
       case 'pointer': event = new PointerEvent(type, eventInit); break;
       case 'focus': event = new FocusEvent(type, eventInit); break;
       case 'drag': event = new DragEvent(type, eventInit); break;
@@ -989,14 +1188,14 @@ export class InjectedScript {
       const { name, value } = element.attributes[i];
       if (name === 'style')
         continue;
-      if (!value && booleanAttributes.has(name))
+      if (!value && this._booleanAttributes.has(name))
         attrs.push(` ${name}`);
       else
         attrs.push(` ${name}="${value}"`);
     }
     attrs.sort((a, b) => a.length - b.length);
     const attrText = trimStringWithEllipsis(attrs.join(''), 500);
-    if (autoClosingTags.has(element.nodeName))
+    if (this._autoClosingTags.has(element.nodeName))
       return oneLine(`<${element.nodeName.toLowerCase()}${attrText}/>`);
 
     const children = element.childNodes;
@@ -1065,14 +1264,33 @@ export class InjectedScript {
   }
 
   markTargetElements(markedElements: Set<Element>, callId: string) {
-    const customEvent = new CustomEvent('__playwright_target__', {
+    if (this._markedElements?.callId !== callId)
+      this._markedElements = undefined;
+    const previous = this._markedElements?.elements || new Set();
+
+    const unmarkEvent = new CustomEvent('__playwright_unmark_target__', {
       bubbles: true,
       cancelable: true,
       detail: callId,
       composed: true,
     });
-    for (const element of markedElements)
-      element.dispatchEvent(customEvent);
+    for (const element of previous) {
+      if (!markedElements.has(element))
+        element.dispatchEvent(unmarkEvent);
+    }
+
+    const markEvent = new CustomEvent('__playwright_mark_target__', {
+      bubbles: true,
+      cancelable: true,
+      detail: callId,
+      composed: true,
+    });
+    for (const element of markedElements) {
+      if (!previous.has(element))
+        element.dispatchEvent(markEvent);
+    }
+
+    this._markedElements = { callId, elements: markedElements };
   }
 
   private _setupGlobalListenersRemovalDetection() {
@@ -1103,7 +1321,7 @@ export class InjectedScript {
   private _setupHitTargetInterceptors() {
     const listener = (event: PointerEvent | MouseEvent | TouchEvent) => this._hitTargetInterceptor?.(event);
     const addHitTargetInterceptorListeners = () => {
-      for (const event of kAllHitTargetInterceptorEvents)
+      for (const event of this._allHitTargetInterceptorEvents)
         this.window.addEventListener(event as any, listener, { capture: true, passive: false });
     };
     addHitTargetInterceptorListeners();
@@ -1130,6 +1348,16 @@ export class InjectedScript {
       // expect(locator).not.toBeInViewport() passes when there is no element.
       if (options.isNot && options.expression === 'to.be.in.viewport')
         return { matches: false };
+      if (options.expression === 'to.have.title' && options?.expectedText?.[0]) {
+        const matcher = new ExpectedTextMatcher(options.expectedText[0]);
+        const received = this.document.title;
+        return { received, matches: matcher.matches(received) };
+      }
+      if (options.expression === 'to.have.url' && options?.expectedText?.[0]) {
+        const matcher = new ExpectedTextMatcher(options.expectedText[0]);
+        const received = this.document.location.href;
+        return { received, matches: matcher.matches(received) };
+      }
       // When none of the above applies, expect does not match.
       return { matches: options.isNot, missingReceived: true };
     }
@@ -1141,44 +1369,65 @@ export class InjectedScript {
 
     {
       // Element state / boolean values.
-      let elementState: boolean | 'error:notconnected' | 'error:notcheckbox' | undefined;
+      let result: ElementStateQueryResult | undefined;
       if (expression === 'to.have.attribute') {
-        elementState = element.hasAttribute(options.expressionArg);
+        const hasAttribute = element.hasAttribute(options.expressionArg);
+        result = {
+          matches: hasAttribute,
+          received: hasAttribute ? 'attribute present' : 'attribute not present',
+        };
       } else if (expression === 'to.be.checked') {
-        elementState = this.elementState(element, 'checked');
-      } else if (expression === 'to.be.unchecked') {
-        elementState = this.elementState(element, 'unchecked');
+        const { checked, indeterminate } = options.expectedValue;
+        if (indeterminate) {
+          if (checked !== undefined)
+            throw this.createStacklessError('Can\'t assert indeterminate and checked at the same time');
+          result = this.elementState(element, 'indeterminate');
+        } else {
+          result = this.elementState(element, checked === false ? 'unchecked' : 'checked');
+        }
       } else if (expression === 'to.be.disabled') {
-        elementState = this.elementState(element, 'disabled');
+        result = this.elementState(element, 'disabled');
       } else if (expression === 'to.be.editable') {
-        elementState = this.elementState(element, 'editable');
+        result = this.elementState(element, 'editable');
       } else if (expression === 'to.be.readonly') {
-        elementState = !this.elementState(element, 'editable');
+        result = this.elementState(element, 'editable');
+        result.matches = !result.matches;
       } else if (expression === 'to.be.empty') {
-        if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA')
-          elementState = !(element as HTMLInputElement).value;
-        else
-          elementState = !element.textContent?.trim();
+        if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
+          const value = (element as HTMLInputElement).value;
+          result = { matches: !value, received: value ? 'notEmpty' : 'empty' };
+        } else {
+          const text = element.textContent?.trim();
+          result = { matches: !text, received: text ? 'notEmpty' : 'empty' };
+        }
       } else if (expression === 'to.be.enabled') {
-        elementState = this.elementState(element, 'enabled');
+        result = this.elementState(element, 'enabled');
       } else if (expression === 'to.be.focused') {
-        elementState = this._activelyFocused(element).isFocused;
+        const focused = this._activelyFocused(element).isFocused;
+        result = {
+          matches: focused,
+          received: focused ? 'focused' : 'inactive',
+        };
       } else if (expression === 'to.be.hidden') {
-        elementState = this.elementState(element, 'hidden');
+        result = this.elementState(element, 'hidden');
       } else if (expression === 'to.be.visible') {
-        elementState = this.elementState(element, 'visible');
+        result = this.elementState(element, 'visible');
       } else if (expression === 'to.be.attached') {
-        elementState = true;
+        result = {
+          matches: true,
+          received: 'attached',
+        };
       } else if (expression === 'to.be.detached') {
-        elementState = false;
+        result = {
+          matches: false,
+          received: 'attached',
+        };
       }
 
-      if (elementState !== undefined) {
-        if (elementState === 'error:notcheckbox')
-          throw this.createStacklessError('Element is not a checkbox');
-        if (elementState === 'error:notconnected')
+      if (result) {
+        if (result.received === 'error:notconnected')
           throw this.createStacklessError('Element is not connected');
-        return { received: elementState, matches: elementState };
+        return result;
       }
     }
 
@@ -1219,6 +1468,16 @@ export class InjectedScript {
       }
     }
 
+    {
+      if (expression === 'to.match.aria') {
+        const result = matchesExpectAriaTemplate(element, options.expectedValue);
+        return {
+          received: result.received,
+          matches: !!result.matches.length,
+        };
+      }
+    }
+
     {
       // Single text value.
       let received: string | undefined;
@@ -1227,8 +1486,13 @@ export class InjectedScript {
         if (value === null)
           return { received: null, matches: false };
         received = value;
-      } else if (expression === 'to.have.class') {
-        received = element.classList.toString();
+      } else if (['to.have.class', 'to.contain.class'].includes(expression)) {
+        if (!options.expectedText)
+          throw this.createStacklessError('Expected text is not provided for ' + expression);
+        return {
+          received: element.classList.toString(),
+          matches: new ExpectedTextMatcher(options.expectedText[0]).matchesClassList(this, element.classList, /* partial */ expression === 'to.contain.class'),
+        };
       } else if (expression === 'to.have.css') {
         received = this.window.getComputedStyle(element).getPropertyValue(options.expressionArg);
       } else if (expression === 'to.have.id') {
@@ -1239,12 +1503,10 @@ export class InjectedScript {
         received = getElementAccessibleName(element, false /* includeHidden */);
       } else if (expression === 'to.have.accessible.description') {
         received = getElementAccessibleDescription(element, false /* includeHidden */);
+      } else if (expression === 'to.have.accessible.error.message') {
+        received = getElementAccessibleErrorMessage(element);
       } else if (expression === 'to.have.role') {
         received = getAriaRole(element) || '';
-      } else if (expression === 'to.have.title') {
-        received = this.document.title;
-      } else if (expression === 'to.have.url') {
-        received = this.document.location.href;
       } else if (expression === 'to.have.value') {
         element = this.retarget(element, 'follow-label')!;
         if (element.nodeName !== 'INPUT' && element.nodeName !== 'TEXTAREA' && element.nodeName !== 'SELECT')
@@ -1270,113 +1532,59 @@ export class InjectedScript {
       return { received, matches };
     }
 
-    // List of values.
-    let received: string[] | undefined;
-    if (expression === 'to.have.text.array' || expression === 'to.contain.text.array')
-      received = elements.map(e => options.useInnerText ? (e as HTMLElement).innerText : elementText(new Map(), e).full);
-    else if (expression === 'to.have.class.array')
-      received = elements.map(e => e.classList.toString());
-
-    if (received && options.expectedText) {
-      // "To match an array" is "to contain an array" + "equal length"
-      const lengthShouldMatch = expression !== 'to.contain.text.array';
-      const matchesLength = received.length === options.expectedText.length || !lengthShouldMatch;
-      if (!matchesLength)
-        return { received, matches: false };
+    // Following matchers depend all on ExpectedTextValue.
+    if (!options.expectedText)
+      throw this.createStacklessError('Expected text is not provided for ' + expression);
 
-      // Each matcher should get a "received" that matches it, in order.
-      const matchers = options.expectedText.map(e => new ExpectedTextMatcher(e));
-      let mIndex = 0, rIndex = 0;
-      while (mIndex < matchers.length && rIndex < received.length) {
-        if (matchers[mIndex].matches(received[rIndex]))
-          ++mIndex;
-        ++rIndex;
-      }
-      return { received, matches: mIndex === matchers.length };
+    if (['to.have.class.array', 'to.contain.class.array'].includes(expression)) {
+      const receivedClassLists = elements.map(e => e.classList);
+      const received = receivedClassLists.map(String);
+      if (receivedClassLists.length !== options.expectedText.length)
+        return { received, matches: false };
+      const matches = this._matchSequentially(options.expectedText, receivedClassLists, (matcher, r) =>
+        matcher.matchesClassList(this, r, /* partial */ expression === 'to.contain.class.array')
+      );
+      return {
+        received: received,
+        matches,
+      };
     }
-    throw this.createStacklessError('Unknown expect matcher: ' + expression);
-  }
 
-  getElementAccessibleName(element: Element, includeHidden?: boolean): string {
-    return getElementAccessibleName(element, !!includeHidden);
-  }
-
-  getElementAccessibleDescription(element: Element, includeHidden?: boolean): string {
-    return getElementAccessibleDescription(element, !!includeHidden);
-  }
-
-  getAriaRole(element: Element) {
-    return getAriaRole(element);
+    if (!['to.contain.text.array', 'to.have.text.array'].includes(expression))
+      throw this.createStacklessError('Unknown expect matcher: ' + expression);
+
+    const received = elements.map(e => options.useInnerText ? (e as HTMLElement).innerText : elementText(new Map(), e).full);
+    // "To match an array" is "to contain an array" + "equal length"
+    const lengthShouldMatch = expression !== 'to.contain.text.array';
+    const matchesLength = received.length === options.expectedText.length || !lengthShouldMatch;
+    if (!matchesLength)
+      return { received, matches: false };
+
+    const matches = this._matchSequentially(options.expectedText, received, (matcher, r) => matcher.matches(r));
+    return { received, matches };
+  }
+
+  private _matchSequentially<T>(
+    expectedText: channels.ExpectedTextValue[],
+    received: T[],
+    matchFn: (matcher: ExpectedTextMatcher, received: T) => boolean
+  ): boolean {
+    const matchers = expectedText.map(e => new ExpectedTextMatcher(e));
+    let mIndex = 0;
+    let rIndex = 0;
+    while (mIndex < matchers.length && rIndex < received.length) {
+      if (matchFn(matchers[mIndex], received[rIndex]))
+        ++mIndex;
+      ++rIndex;
+    }
+    return mIndex === matchers.length;
   }
 }
 
-const autoClosingTags = new Set(['AREA', 'BASE', 'BR', 'COL', 'COMMAND', 'EMBED', 'HR', 'IMG', 'INPUT', 'KEYGEN', 'LINK', 'MENUITEM', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR']);
-const booleanAttributes = new Set(['checked', 'selected', 'disabled', 'readonly', 'multiple']);
-
 function oneLine(s: string): string {
   return s.replace(/\n/g, '↵').replace(/\t/g, '⇆');
 }
 
-const eventType = new Map<string, 'mouse' | 'keyboard' | 'touch' | 'pointer' | 'focus' | 'drag' | 'wheel' | 'deviceorientation' | 'devicemotion'>([
-  ['auxclick', 'mouse'],
-  ['click', 'mouse'],
-  ['dblclick', 'mouse'],
-  ['mousedown', 'mouse'],
-  ['mouseeenter', 'mouse'],
-  ['mouseleave', 'mouse'],
-  ['mousemove', 'mouse'],
-  ['mouseout', 'mouse'],
-  ['mouseover', 'mouse'],
-  ['mouseup', 'mouse'],
-  ['mouseleave', 'mouse'],
-  ['mousewheel', 'mouse'],
-
-  ['keydown', 'keyboard'],
-  ['keyup', 'keyboard'],
-  ['keypress', 'keyboard'],
-  ['textInput', 'keyboard'],
-
-  ['touchstart', 'touch'],
-  ['touchmove', 'touch'],
-  ['touchend', 'touch'],
-  ['touchcancel', 'touch'],
-
-  ['pointerover', 'pointer'],
-  ['pointerout', 'pointer'],
-  ['pointerenter', 'pointer'],
-  ['pointerleave', 'pointer'],
-  ['pointerdown', 'pointer'],
-  ['pointerup', 'pointer'],
-  ['pointermove', 'pointer'],
-  ['pointercancel', 'pointer'],
-  ['gotpointercapture', 'pointer'],
-  ['lostpointercapture', 'pointer'],
-
-  ['focus', 'focus'],
-  ['blur', 'focus'],
-
-  ['drag', 'drag'],
-  ['dragstart', 'drag'],
-  ['dragend', 'drag'],
-  ['dragover', 'drag'],
-  ['dragenter', 'drag'],
-  ['dragleave', 'drag'],
-  ['dragexit', 'drag'],
-  ['drop', 'drag'],
-
-  ['wheel', 'wheel'],
-
-  ['deviceorientation', 'deviceorientation'],
-  ['deviceorientationabsolute', 'deviceorientation'],
-
-  ['devicemotion', 'devicemotion'],
-]);
-
-const kHoverHitTargetInterceptorEvents = new Set(['mousemove']);
-const kTapHitTargetInterceptorEvents = new Set(['pointerdown', 'pointerup', 'touchstart', 'touchend', 'touchcancel']);
-const kMouseHitTargetInterceptorEvents = new Set(['mousedown', 'mouseup', 'pointerdown', 'pointerup', 'click', 'auxclick', 'dblclick', 'contextmenu']);
-const kAllHitTargetInterceptorEvents = new Set([...kHoverHitTargetInterceptorEvents, ...kTapHitTargetInterceptorEvents, ...kMouseHitTargetInterceptorEvents]);
-
 function cssUnquote(s: string): string {
   // Trim quotes.
   s = s.substring(1, s.length - 1);
@@ -1463,6 +1671,15 @@ class ExpectedTextMatcher {
     return false;
   }
 
+  matchesClassList(injectedScript: InjectedScript, classList: DOMTokenList, partial: boolean): boolean {
+    if (partial) {
+      if (this._regex)
+        throw injectedScript.createStacklessError('Partial matching does not support regular expressions. Please provide a string value.');
+      return this._string!.split(/\s+/g).filter(Boolean).every(className => classList.contains(className));
+    }
+    return this.matches(classList.toString());
+  }
+
   private normalize(s: string | undefined): string | undefined {
     if (!s)
       return s;
@@ -1522,14 +1739,3 @@ function deepEquals(a: any, b: any): boolean {
 
   return false;
 }
-
-declare global {
-  interface Window {
-    __pwClock?: {
-      builtin: {
-        setTimeout: Window['setTimeout'],
-        requestAnimationFrame: Window['requestAnimationFrame'],
-      }
-    }
-  }
-}
diff --git a/packages/playwright-core/src/server/injected/layoutSelectorUtils.ts b/packages/injected/src/layoutSelectorUtils.ts
similarity index 100%
rename from packages/playwright-core/src/server/injected/layoutSelectorUtils.ts
rename to packages/injected/src/layoutSelectorUtils.ts
diff --git a/packages/playwright-core/src/server/injected/reactSelectorEngine.ts b/packages/injected/src/reactSelectorEngine.ts
similarity index 98%
rename from packages/playwright-core/src/server/injected/reactSelectorEngine.ts
rename to packages/injected/src/reactSelectorEngine.ts
index 2d0e51f0b2799..a9185057c7cdc 100644
--- a/packages/playwright-core/src/server/injected/reactSelectorEngine.ts
+++ b/packages/injected/src/reactSelectorEngine.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import type { SelectorEngine, SelectorRoot } from './selectorEngine';
+import { parseAttributeSelector } from '@isomorphic/selectorParser';
+
 import { isInsideScope } from './domUtils';
 import { matchesComponentAttribute } from './selectorUtils';
-import { parseAttributeSelector } from '../../utils/isomorphic/selectorParser';
+
+import type { SelectorEngine, SelectorRoot } from './selectorEngine';
 
 type ComponentNode = {
   key?: any,
@@ -190,7 +192,7 @@ function findReactRoots(root: Document | ShadowRoot, roots: ReactVNode[] = []):
   return roots;
 }
 
-export const ReactEngine: SelectorEngine = {
+export const createReactEngine = (): SelectorEngine => ({
   queryAll(scope: SelectorRoot, selector: string): Element[] {
     const { name, attributes } = parseAttributeSelector(selector, false);
 
@@ -219,4 +221,4 @@ export const ReactEngine: SelectorEngine = {
     }
     return [...allRootElements];
   }
-};
+});
diff --git a/packages/playwright-core/src/server/injected/recorder/DEPS.list b/packages/injected/src/recorder/DEPS.list
similarity index 65%
rename from packages/playwright-core/src/server/injected/recorder/DEPS.list
rename to packages/injected/src/recorder/DEPS.list
index ee39467feafb8..1f58b3d5d0b66 100644
--- a/packages/playwright-core/src/server/injected/recorder/DEPS.list
+++ b/packages/injected/src/recorder/DEPS.list
@@ -1,4 +1,4 @@
-# Recorder must use any external dependencies through InjectedScript.
+# Recorder must use any external dependencies through injectedScript.utils.
 # Otherwise it will end up with a copy of all modules it uses, and any
 # module-level globals will be duplicated, which leads to subtle bugs.
 [*]
diff --git a/packages/playwright-core/src/server/injected/recorder/clipPaths.ts b/packages/injected/src/recorder/clipPaths.ts
similarity index 93%
rename from packages/playwright-core/src/server/injected/recorder/clipPaths.ts
rename to packages/injected/src/recorder/clipPaths.ts
index faa77a63d6779..1ac490843d292 100644
--- a/packages/playwright-core/src/server/injected/recorder/clipPaths.ts
+++ b/packages/injected/src/recorder/clipPaths.ts
@@ -27,5 +27,5 @@
 import type { SvgJson } from './recorder';
 
 // eslint-disable-next-line key-spacing, object-curly-spacing, comma-spacing, quotes
-const svgJson: SvgJson = {"tagName":"svg","children":[{"tagName":"defs","children":[{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-gripper"},"children":[{"tagName":"path","attrs":{"d":"M5 3h2v2H5zm0 4h2v2H5zm0 4h2v2H5zm4-8h2v2H9zm0 4h2v2H9zm0 4h2v2H9z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-circle-large-filled"},"children":[{"tagName":"path","attrs":{"d":"M8 1a6.8 6.8 0 0 1 1.86.253 6.899 6.899 0 0 1 3.083 1.805 6.903 6.903 0 0 1 1.804 3.083C14.916 6.738 15 7.357 15 8s-.084 1.262-.253 1.86a6.9 6.9 0 0 1-.704 1.674 7.157 7.157 0 0 1-2.516 2.509 6.966 6.966 0 0 1-1.668.71A6.984 6.984 0 0 1 8 15a6.984 6.984 0 0 1-1.86-.246 7.098 7.098 0 0 1-1.674-.711 7.3 7.3 0 0 1-1.415-1.094 7.295 7.295 0 0 1-1.094-1.415 7.098 7.098 0 0 1-.71-1.675A6.985 6.985 0 0 1 1 8c0-.643.082-1.262.246-1.86a6.968 6.968 0 0 1 .711-1.667 7.156 7.156 0 0 1 2.509-2.516 6.895 6.895 0 0 1 1.675-.704A6.808 6.808 0 0 1 8 1z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-inspect"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M1 3l1-1h12l1 1v6h-1V3H2v8h5v1H2l-1-1V3zm14.707 9.707L9 6v9.414l2.707-2.707h4zM10 13V8.414l3.293 3.293h-2L10 13z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-whole-word"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M0 11H1V13H15V11H16V14H15H1H0V11Z"}},{"tagName":"path","attrs":{"d":"M6.84048 11H5.95963V10.1406H5.93814C5.555 10.7995 4.99104 11.1289 4.24625 11.1289C3.69839 11.1289 3.26871 10.9839 2.95718 10.6938C2.64924 10.4038 2.49527 10.0189 2.49527 9.53906C2.49527 8.51139 3.10041 7.91341 4.3107 7.74512L5.95963 7.51416C5.95963 6.57959 5.58186 6.1123 4.82632 6.1123C4.16389 6.1123 3.56591 6.33789 3.03238 6.78906V5.88672C3.57307 5.54297 4.19612 5.37109 4.90152 5.37109C6.19416 5.37109 6.84048 6.05501 6.84048 7.42285V11ZM5.95963 8.21777L4.63297 8.40039C4.22476 8.45768 3.91682 8.55973 3.70914 8.70654C3.50145 8.84977 3.39761 9.10579 3.39761 9.47461C3.39761 9.74316 3.4925 9.96338 3.68228 10.1353C3.87564 10.3035 4.13166 10.3877 4.45035 10.3877C4.8872 10.3877 5.24706 10.2355 5.52994 9.93115C5.8164 9.62321 5.95963 9.2347 5.95963 8.76562V8.21777Z"}},{"tagName":"path","attrs":{"d":"M9.3475 10.2051H9.32601V11H8.44515V2.85742H9.32601V6.4668H9.3475C9.78076 5.73633 10.4146 5.37109 11.2489 5.37109C11.9543 5.37109 12.5057 5.61816 12.9032 6.1123C13.3042 6.60286 13.5047 7.26172 13.5047 8.08887C13.5047 9.00911 13.2809 9.74674 12.8333 10.3018C12.3857 10.8532 11.7734 11.1289 10.9964 11.1289C10.2695 11.1289 9.71989 10.821 9.3475 10.2051ZM9.32601 7.98682V8.75488C9.32601 9.20964 9.47282 9.59635 9.76644 9.91504C10.0636 10.2301 10.4396 10.3877 10.8944 10.3877C11.4279 10.3877 11.8451 10.1836 12.1458 9.77539C12.4502 9.36719 12.6024 8.79964 12.6024 8.07275C12.6024 7.46045 12.4609 6.98063 12.1781 6.6333C11.8952 6.28597 11.512 6.1123 11.0286 6.1123C10.5166 6.1123 10.1048 6.29134 9.7933 6.64941C9.48177 7.00391 9.32601 7.44971 9.32601 7.98682Z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-eye"},"children":[{"tagName":"path","attrs":{"d":"M7.99993 6.00316C9.47266 6.00316 10.6666 7.19708 10.6666 8.66981C10.6666 10.1426 9.47266 11.3365 7.99993 11.3365C6.52715 11.3365 5.33324 10.1426 5.33324 8.66981C5.33324 7.19708 6.52715 6.00316 7.99993 6.00316ZM7.99993 7.00315C7.07946 7.00315 6.33324 7.74935 6.33324 8.66981C6.33324 9.59028 7.07946 10.3365 7.99993 10.3365C8.9204 10.3365 9.6666 9.59028 9.6666 8.66981C9.6666 7.74935 8.9204 7.00315 7.99993 7.00315ZM7.99993 3.66675C11.0756 3.66675 13.7307 5.76675 14.4673 8.70968C14.5344 8.97755 14.3716 9.24908 14.1037 9.31615C13.8358 9.38315 13.5643 9.22041 13.4973 8.95248C12.8713 6.45205 10.6141 4.66675 7.99993 4.66675C5.38454 4.66675 3.12664 6.45359 2.50182 8.95555C2.43491 9.22341 2.16348 9.38635 1.89557 9.31948C1.62766 9.25255 1.46471 8.98115 1.53162 8.71321C2.26701 5.76856 4.9229 3.66675 7.99993 3.66675Z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-symbol-constant"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M4 6h8v1H4V6zm8 3H4v1h8V9z"}},{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M1 4l1-1h12l1 1v8l-1 1H2l-1-1V4zm1 0v8h12V4H2z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-check"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M14.431 3.323l-8.47 10-.79-.036-3.35-4.77.818-.574 2.978 4.24 8.051-9.506.764.646z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-close"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M8 8.707l3.646 3.647.708-.707L8.707 8l3.647-3.646-.707-.708L8 7.293 4.354 3.646l-.707.708L7.293 8l-3.646 3.646.707.708L8 8.707z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-pass"},"children":[{"tagName":"path","attrs":{"d":"M6.27 10.87h.71l4.56-4.56-.71-.71-4.2 4.21-1.92-1.92L4 8.6l2.27 2.27z"}},{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M8.6 1c1.6.1 3.1.9 4.2 2 1.3 1.4 2 3.1 2 5.1 0 1.6-.6 3.1-1.6 4.4-1 1.2-2.4 2.1-4 2.4-1.6.3-3.2.1-4.6-.7-1.4-.8-2.5-2-3.1-3.5C.9 9.2.8 7.5 1.3 6c.5-1.6 1.4-2.9 2.8-3.8C5.4 1.3 7 .9 8.6 1zm.5 12.9c1.3-.3 2.5-1 3.4-2.1.8-1.1 1.3-2.4 1.2-3.8 0-1.6-.6-3.2-1.7-4.3-1-1-2.2-1.6-3.6-1.7-1.3-.1-2.7.2-3.8 1-1.1.8-1.9 1.9-2.3 3.3-.4 1.3-.4 2.7.2 4 .6 1.3 1.5 2.3 2.7 3 1.2.7 2.6.9 3.9.6z"}}]}]}]};
-export default svgJson;
\ No newline at end of file
+const svgJson: SvgJson = {"tagName":"svg","children":[{"tagName":"defs","children":[{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-gripper"},"children":[{"tagName":"path","attrs":{"d":"M5 3h2v2H5zm0 4h2v2H5zm0 4h2v2H5zm4-8h2v2H9zm0 4h2v2H9zm0 4h2v2H9z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-circle-large-filled"},"children":[{"tagName":"path","attrs":{"d":"M8 1a6.8 6.8 0 0 1 1.86.253 6.899 6.899 0 0 1 3.083 1.805 6.903 6.903 0 0 1 1.804 3.083C14.916 6.738 15 7.357 15 8s-.084 1.262-.253 1.86a6.9 6.9 0 0 1-.704 1.674 7.157 7.157 0 0 1-2.516 2.509 6.966 6.966 0 0 1-1.668.71A6.984 6.984 0 0 1 8 15a6.984 6.984 0 0 1-1.86-.246 7.098 7.098 0 0 1-1.674-.711 7.3 7.3 0 0 1-1.415-1.094 7.295 7.295 0 0 1-1.094-1.415 7.098 7.098 0 0 1-.71-1.675A6.985 6.985 0 0 1 1 8c0-.643.082-1.262.246-1.86a6.968 6.968 0 0 1 .711-1.667 7.156 7.156 0 0 1 2.509-2.516 6.895 6.895 0 0 1 1.675-.704A6.808 6.808 0 0 1 8 1z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-inspect"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M1 3l1-1h12l1 1v6h-1V3H2v8h5v1H2l-1-1V3zm14.707 9.707L9 6v9.414l2.707-2.707h4zM10 13V8.414l3.293 3.293h-2L10 13z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-whole-word"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M0 11H1V13H15V11H16V14H15H1H0V11Z"}},{"tagName":"path","attrs":{"d":"M6.84048 11H5.95963V10.1406H5.93814C5.555 10.7995 4.99104 11.1289 4.24625 11.1289C3.69839 11.1289 3.26871 10.9839 2.95718 10.6938C2.64924 10.4038 2.49527 10.0189 2.49527 9.53906C2.49527 8.51139 3.10041 7.91341 4.3107 7.74512L5.95963 7.51416C5.95963 6.57959 5.58186 6.1123 4.82632 6.1123C4.16389 6.1123 3.56591 6.33789 3.03238 6.78906V5.88672C3.57307 5.54297 4.19612 5.37109 4.90152 5.37109C6.19416 5.37109 6.84048 6.05501 6.84048 7.42285V11ZM5.95963 8.21777L4.63297 8.40039C4.22476 8.45768 3.91682 8.55973 3.70914 8.70654C3.50145 8.84977 3.39761 9.10579 3.39761 9.47461C3.39761 9.74316 3.4925 9.96338 3.68228 10.1353C3.87564 10.3035 4.13166 10.3877 4.45035 10.3877C4.8872 10.3877 5.24706 10.2355 5.52994 9.93115C5.8164 9.62321 5.95963 9.2347 5.95963 8.76562V8.21777Z"}},{"tagName":"path","attrs":{"d":"M9.3475 10.2051H9.32601V11H8.44515V2.85742H9.32601V6.4668H9.3475C9.78076 5.73633 10.4146 5.37109 11.2489 5.37109C11.9543 5.37109 12.5057 5.61816 12.9032 6.1123C13.3042 6.60286 13.5047 7.26172 13.5047 8.08887C13.5047 9.00911 13.2809 9.74674 12.8333 10.3018C12.3857 10.8532 11.7734 11.1289 10.9964 11.1289C10.2695 11.1289 9.71989 10.821 9.3475 10.2051ZM9.32601 7.98682V8.75488C9.32601 9.20964 9.47282 9.59635 9.76644 9.91504C10.0636 10.2301 10.4396 10.3877 10.8944 10.3877C11.4279 10.3877 11.8451 10.1836 12.1458 9.77539C12.4502 9.36719 12.6024 8.79964 12.6024 8.07275C12.6024 7.46045 12.4609 6.98063 12.1781 6.6333C11.8952 6.28597 11.512 6.1123 11.0286 6.1123C10.5166 6.1123 10.1048 6.29134 9.7933 6.64941C9.48177 7.00391 9.32601 7.44971 9.32601 7.98682Z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-eye"},"children":[{"tagName":"path","attrs":{"d":"M7.99993 6.00316C9.47266 6.00316 10.6666 7.19708 10.6666 8.66981C10.6666 10.1426 9.47266 11.3365 7.99993 11.3365C6.52715 11.3365 5.33324 10.1426 5.33324 8.66981C5.33324 7.19708 6.52715 6.00316 7.99993 6.00316ZM7.99993 7.00315C7.07946 7.00315 6.33324 7.74935 6.33324 8.66981C6.33324 9.59028 7.07946 10.3365 7.99993 10.3365C8.9204 10.3365 9.6666 9.59028 9.6666 8.66981C9.6666 7.74935 8.9204 7.00315 7.99993 7.00315ZM7.99993 3.66675C11.0756 3.66675 13.7307 5.76675 14.4673 8.70968C14.5344 8.97755 14.3716 9.24908 14.1037 9.31615C13.8358 9.38315 13.5643 9.22041 13.4973 8.95248C12.8713 6.45205 10.6141 4.66675 7.99993 4.66675C5.38454 4.66675 3.12664 6.45359 2.50182 8.95555C2.43491 9.22341 2.16348 9.38635 1.89557 9.31948C1.62766 9.25255 1.46471 8.98115 1.53162 8.71321C2.26701 5.76856 4.9229 3.66675 7.99993 3.66675Z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-symbol-constant"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M4 6h8v1H4V6zm8 3H4v1h8V9z"}},{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M1 4l1-1h12l1 1v8l-1 1H2l-1-1V4zm1 0v8h12V4H2z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-check"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M14.431 3.323l-8.47 10-.79-.036-3.35-4.77.818-.574 2.978 4.24 8.051-9.506.764.646z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-close"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M8 8.707l3.646 3.647.708-.707L8.707 8l3.647-3.646-.707-.708L8 7.293 4.354 3.646l-.707.708L7.293 8l-3.646 3.646.707.708L8 8.707z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-pass"},"children":[{"tagName":"path","attrs":{"d":"M6.27 10.87h.71l4.56-4.56-.71-.71-4.2 4.21-1.92-1.92L4 8.6l2.27 2.27z"}},{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M8.6 1c1.6.1 3.1.9 4.2 2 1.3 1.4 2 3.1 2 5.1 0 1.6-.6 3.1-1.6 4.4-1 1.2-2.4 2.1-4 2.4-1.6.3-3.2.1-4.6-.7-1.4-.8-2.5-2-3.1-3.5C.9 9.2.8 7.5 1.3 6c.5-1.6 1.4-2.9 2.8-3.8C5.4 1.3 7 .9 8.6 1zm.5 12.9c1.3-.3 2.5-1 3.4-2.1.8-1.1 1.3-2.4 1.2-3.8 0-1.6-.6-3.2-1.7-4.3-1-1-2.2-1.6-3.6-1.7-1.3-.1-2.7.2-3.8 1-1.1.8-1.9 1.9-2.3 3.3-.4 1.3-.4 2.7.2 4 .6 1.3 1.5 2.3 2.7 3 1.2.7 2.6.9 3.9.6z"}}]},{"tagName":"clipPath","attrs":{"width":"16","height":"16","viewBox":"0 0 16 16","fill":"currentColor","id":"icon-gist"},"children":[{"tagName":"path","attrs":{"fill-rule":"evenodd","clip-rule":"evenodd","d":"M10.57 1.14l3.28 3.3.15.36v9.7l-.5.5h-11l-.5-.5v-13l.5-.5h7.72l.35.14zM10 5h3l-3-3v3zM3 2v12h10V6H9.5L9 5.5V2H3zm2.062 7.533l1.817-1.828L6.17 7 4 9.179v.707l2.171 2.174.707-.707-1.816-1.82zM8.8 7.714l.7-.709 2.189 2.175v.709L9.5 12.062l-.705-.709 1.831-1.82L8.8 7.714z"}}]}]}]};
+export default svgJson;
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/check.svg b/packages/injected/src/recorder/icons/check.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/check.svg
rename to packages/injected/src/recorder/icons/check.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/circle-large-filled.svg b/packages/injected/src/recorder/icons/circle-large-filled.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/circle-large-filled.svg
rename to packages/injected/src/recorder/icons/circle-large-filled.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/close.svg b/packages/injected/src/recorder/icons/close.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/close.svg
rename to packages/injected/src/recorder/icons/close.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/eye.svg b/packages/injected/src/recorder/icons/eye.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/eye.svg
rename to packages/injected/src/recorder/icons/eye.svg
diff --git a/packages/injected/src/recorder/icons/gist.svg b/packages/injected/src/recorder/icons/gist.svg
new file mode 100644
index 0000000000000..f6d50e43d4f1b
--- /dev/null
+++ b/packages/injected/src/recorder/icons/gist.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.57 1.14l3.28 3.3.15.36v9.7l-.5.5h-11l-.5-.5v-13l.5-.5h7.72l.35.14zM10 5h3l-3-3v3zM3 2v12h10V6H9.5L9 5.5V2H3zm2.062 7.533l1.817-1.828L6.17 7 4 9.179v.707l2.171 2.174.707-.707-1.816-1.82zM8.8 7.714l.7-.709 2.189 2.175v.709L9.5 12.062l-.705-.709 1.831-1.82L8.8 7.714z"/></svg>
\ No newline at end of file
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/gripper.svg b/packages/injected/src/recorder/icons/gripper.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/gripper.svg
rename to packages/injected/src/recorder/icons/gripper.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/inspect.svg b/packages/injected/src/recorder/icons/inspect.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/inspect.svg
rename to packages/injected/src/recorder/icons/inspect.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/pass.svg b/packages/injected/src/recorder/icons/pass.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/pass.svg
rename to packages/injected/src/recorder/icons/pass.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/symbol-constant.svg b/packages/injected/src/recorder/icons/symbol-constant.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/symbol-constant.svg
rename to packages/injected/src/recorder/icons/symbol-constant.svg
diff --git a/packages/playwright-core/src/server/injected/recorder/icons/whole-word.svg b/packages/injected/src/recorder/icons/whole-word.svg
similarity index 100%
rename from packages/playwright-core/src/server/injected/recorder/icons/whole-word.svg
rename to packages/injected/src/recorder/icons/whole-word.svg
diff --git a/packages/injected/src/recorder/pollingRecorder.ts b/packages/injected/src/recorder/pollingRecorder.ts
new file mode 100644
index 0000000000000..dc567b37c0558
--- /dev/null
+++ b/packages/injected/src/recorder/pollingRecorder.ts
@@ -0,0 +1,100 @@
+/**
+ * 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 { Recorder } from './recorder';
+
+import type { InjectedScript } from '../injectedScript';
+import type { RecorderDelegate } from './recorder';
+import type * as actions from '@recorder/actions';
+import type { ElementInfo, Mode, OverlayState, UIState } from '@recorder/recorderTypes';
+
+interface Embedder {
+  __pw_recorderPerformAction(action: actions.PerformOnRecordAction): Promise<void>;
+  __pw_recorderRecordAction(action: actions.Action): Promise<void>;
+  __pw_recorderState(): Promise<UIState>;
+  __pw_recorderElementPicked(element: { selector: string, ariaSnapshot?: string }): Promise<void>;
+  __pw_recorderSetMode(mode: Mode): Promise<void>;
+  __pw_recorderSetOverlayState(state: OverlayState): Promise<void>;
+  __pw_refreshOverlay(): void;
+}
+
+export class PollingRecorder implements RecorderDelegate {
+  private _recorder: Recorder;
+  private _embedder: Embedder;
+  private _pollRecorderModeTimer: number | undefined;
+  private _lastStateJSON: string | undefined;
+
+  constructor(injectedScript: InjectedScript, options?: { recorderMode?: 'default' | 'api' }) {
+    this._recorder = new Recorder(injectedScript, options);
+    this._embedder = injectedScript.window as any;
+
+    injectedScript.onGlobalListenersRemoved.add(() => this._recorder.installListeners());
+
+    const refreshOverlay = () => {
+      this._lastStateJSON = undefined;
+      this._pollRecorderMode().catch(e => console.log(e)); // eslint-disable-line no-console
+    };
+    this._embedder.__pw_refreshOverlay = refreshOverlay;
+    refreshOverlay();
+  }
+
+  private async _pollRecorderMode() {
+    const pollPeriod = 1000;
+    if (this._pollRecorderModeTimer)
+      this._recorder.injectedScript.utils.builtins.clearTimeout(this._pollRecorderModeTimer);
+    const state = await this._embedder.__pw_recorderState().catch(() => null);
+    if (!state) {
+      this._pollRecorderModeTimer = this._recorder.injectedScript.utils.builtins.setTimeout(() => this._pollRecorderMode(), pollPeriod);
+      return;
+    }
+
+    const stringifiedState = JSON.stringify(state);
+    if (this._lastStateJSON !== stringifiedState) {
+      this._lastStateJSON = stringifiedState;
+      const win = this._recorder.document.defaultView!;
+      if (win.top !== win) {
+        // Only show action point in the main frame, since it is relative to the page's viewport.
+        // Otherwise we'll see multiple action points at different locations.
+        state.actionPoint = undefined;
+      }
+      this._recorder.setUIState(state, this);
+    }
+
+    this._pollRecorderModeTimer = this._recorder.injectedScript.utils.builtins.setTimeout(() => this._pollRecorderMode(), pollPeriod);
+  }
+
+  async performAction(action: actions.PerformOnRecordAction) {
+    await this._embedder.__pw_recorderPerformAction(action);
+  }
+
+  async recordAction(action: actions.Action): Promise<void> {
+    await this._embedder.__pw_recorderRecordAction(action);
+  }
+
+  async elementPicked(elementInfo: ElementInfo): Promise<void> {
+    await this._embedder.__pw_recorderElementPicked(elementInfo);
+  }
+
+  async setMode(mode: Mode): Promise<void> {
+    await this._embedder.__pw_recorderSetMode(mode);
+  }
+
+  async setOverlayState(state: OverlayState): Promise<void> {
+    await this._embedder.__pw_recorderSetOverlayState(state);
+  }
+}
+
+export default PollingRecorder;
diff --git a/packages/playwright-core/src/server/injected/recorder/recorder.ts b/packages/injected/src/recorder/recorder.ts
similarity index 57%
rename from packages/playwright-core/src/server/injected/recorder/recorder.ts
rename to packages/injected/src/recorder/recorder.ts
index c9413e0a72a00..3be1809fdb4a3 100644
--- a/packages/playwright-core/src/server/injected/recorder/recorder.ts
+++ b/packages/injected/src/recorder/recorder.ts
@@ -14,27 +14,39 @@
  * limitations under the License.
  */
 
-import type * as actions from '../../recorder/recorderActions';
+import clipPaths from './clipPaths';
+
+import type { Point } from '@isomorphic/types';
+import type { Highlight, HighlightEntry } from '../highlight';
 import type { InjectedScript } from '../injectedScript';
-import type { Point } from '../../../common/types';
-import type { Mode, OverlayState, UIState } from '@recorder/recorderTypes';
 import type { ElementText } from '../selectorUtils';
-import type { Highlight, HighlightOptions } from '../highlight';
-import clipPaths from './clipPaths';
+import type * as actions from '@recorder/actions';
+import type { ElementInfo, Mode, OverlayState, UIState } from '@recorder/recorderTypes';
+import type { Language } from '@isomorphic/locatorGenerators';
+import type { AriaNode, AriaSnapshot } from '@injected/ariaSnapshot';
+
+const HighlightColors = {
+  multiple: '#f6b26b7f',
+  single: '#6fa8dc7f',
+  assert: '#8acae480',
+  action: '#dc6f6f7f',
+};
 
-interface RecorderDelegate {
-  performAction?(action: actions.Action): Promise<void>;
+export interface RecorderDelegate {
+  performAction?(action: actions.PerformOnRecordAction): Promise<void>;
   recordAction?(action: actions.Action): Promise<void>;
-  setSelector?(selector: string): Promise<void>;
+  elementPicked?(elementInfo: ElementInfo): Promise<void>;
   setMode?(mode: Mode): Promise<void>;
   setOverlayState?(state: OverlayState): Promise<void>;
   highlightUpdated?(): void;
 }
 
 interface RecorderTool {
-  cursor(): string;
-  cleanup?(): void;
+  cursor?(): string;
+  install?(): void;
+  uninstall?(): void;
   onClick?(event: MouseEvent): void;
+  onDblClick?(event: MouseEvent): void;
   onContextMenu?(event: MouseEvent): void;
   onDragStart?(event: DragEvent): void;
   onInput?(event: Event): void;
@@ -52,16 +64,12 @@ interface RecorderTool {
 }
 
 class NoneTool implements RecorderTool {
-  cursor() {
-    return 'default';
-  }
 }
 
 class InspectTool implements RecorderTool {
   private _recorder: Recorder;
   private _hoveredModel: HighlightModel | null = null;
   private _hoveredElement: HTMLElement | null = null;
-  private _hoveredSelectors: string[] | null = null;
   private _assertVisibility: boolean;
 
   constructor(recorder: Recorder, assertVisibility: boolean) {
@@ -73,10 +81,9 @@ class InspectTool implements RecorderTool {
     return 'pointer';
   }
 
-  cleanup() {
+  uninstall() {
     this._hoveredModel = null;
     this._hoveredElement = null;
-    this._hoveredSelectors = null;
   }
 
   onClick(event: MouseEvent) {
@@ -84,24 +91,7 @@ class InspectTool implements RecorderTool {
     if (event.button !== 0)
       return;
     if (this._hoveredModel?.selector)
-      this._commit(this._hoveredModel.selector);
-  }
-
-  onContextMenu(event: MouseEvent) {
-    if (this._hoveredModel && !this._hoveredModel.tooltipListItemSelected
-        && this._hoveredSelectors && this._hoveredSelectors.length > 1) {
-      consumeEvent(event);
-      const selectors = this._hoveredSelectors;
-      this._hoveredModel.tooltipFooter = undefined;
-      this._hoveredModel.tooltipList = selectors.map(selector => this._recorder.injectedScript.utils.asLocator(this._recorder.state.language, selector));
-      this._hoveredModel.tooltipListItemSelected = (index: number | undefined) => {
-        if (index === undefined)
-          this._reset(true);
-        else
-          this._commit(selectors[index]);
-      };
-      this._recorder.updateHighlight(this._hoveredModel, true);
-    }
+      this._commit(this._hoveredModel.selector, this._hoveredModel);
   }
 
   onPointerDown(event: PointerEvent) {
@@ -130,23 +120,19 @@ class InspectTool implements RecorderTool {
     this._hoveredElement = target;
 
     let model: HighlightModel | null = null;
-    let selectors: string[] = [];
     if (this._hoveredElement) {
       const generated = this._recorder.injectedScript.generateSelector(this._hoveredElement, { testIdAttributeName: this._recorder.state.testIdAttributeName, multiple: false });
-      selectors = generated.selectors;
       model = {
         selector: generated.selector,
         elements: generated.elements,
         tooltipText: this._recorder.injectedScript.utils.asLocator(this._recorder.state.language, generated.selector),
-        tooltipFooter: selectors.length > 1 ? `Click to select, right-click for more options` : undefined,
-        color: this._assertVisibility ? '#8acae480' : undefined,
+        color: this._assertVisibility ? HighlightColors.assert : HighlightColors.single,
       };
     }
 
     if (this._hoveredModel?.selector === model?.selector)
       return;
     this._hoveredModel = model;
-    this._hoveredSelectors = selectors;
     this._recorder.updateHighlight(model, true);
   }
 
@@ -165,10 +151,8 @@ class InspectTool implements RecorderTool {
   onKeyDown(event: KeyboardEvent) {
     consumeEvent(event);
     if (event.key === 'Escape') {
-      if (this._hoveredModel?.tooltipListItemSelected)
-        this._reset(true);
-      else if (this._assertVisibility)
-        this._recorder.delegate.setMode?.('recording');
+      if (this._assertVisibility)
+        this._recorder.setMode('recording');
     }
   }
 
@@ -180,45 +164,67 @@ class InspectTool implements RecorderTool {
     this._reset(false);
   }
 
-  private _commit(selector: string) {
+  private _commit(selector: string, model: HighlightModel) {
     if (this._assertVisibility) {
-      this._recorder.delegate.recordAction?.({
+      this._recorder.recordAction({
         name: 'assertVisible',
         selector,
         signals: [],
       });
-      this._recorder.delegate.setMode?.('recording');
+      this._recorder.setMode('recording');
       this._recorder.overlay?.flashToolSucceeded('assertingVisibility');
     } else {
-      this._recorder.delegate.setSelector?.(selector);
+      this._recorder.elementPicked(selector, model);
     }
   }
 
   private _reset(userGesture: boolean) {
     this._hoveredElement = null;
     this._hoveredModel = null;
-    this._hoveredSelectors = null;
     this._recorder.updateHighlight(null, userGesture);
   }
 }
 
 class RecordActionTool implements RecorderTool {
   private _recorder: Recorder;
-  private _performingAction = false;
-  private _hoveredModel: HighlightModel | null = null;
+  private _performingActions: Set<actions.PerformOnRecordAction>;
+  private _hoveredModel: HighlightModelWithSelector | null = null;
   private _hoveredElement: HTMLElement | null = null;
-  private _activeModel: HighlightModel | null = null;
+  private _activeModel: HighlightModelWithSelector | null = null;
   private _expectProgrammaticKeyUp = false;
+  private _pendingClickAction: { action: actions.ClickAction, timeout: number } | undefined;
+  private _observer: MutationObserver | null = null;
 
   constructor(recorder: Recorder) {
     this._recorder = recorder;
+    this._performingActions = new Set();
   }
 
   cursor() {
     return 'pointer';
   }
 
-  cleanup() {
+  private _installObserverIfNeeded() {
+    if (this._observer)
+      return;
+    if (!this._recorder.injectedScript.document?.body)
+      return;
+    this._observer = new MutationObserver(mutations => {
+      if (!this._hoveredElement)
+        return;
+      for (const mutation of mutations) {
+        for (const node of mutation.removedNodes) {
+          if (node === this._hoveredElement || node.contains(this._hoveredElement))
+            this._resetHoveredModel();
+        }
+      }
+    });
+    this._observer.observe(this._recorder.injectedScript.document.body, { childList: true, subtree: true });
+  }
+
+  uninstall() {
+    this._observer?.disconnect();
+    this._observer = null;
     this._hoveredModel = null;
     this._hoveredElement = null;
     this._activeModel = null;
@@ -241,7 +247,7 @@ class RecordActionTool implements RecorderTool {
       return;
 
     const checkbox = asCheckbox(this._recorder.deepEventTarget(event));
-    if (checkbox) {
+    if (checkbox && event.detail === 1) {
       // Interestingly, inputElement.checked is reversed inside this event handler.
       this._performAction({
         name: checkbox.checked ? 'check' : 'uncheck',
@@ -251,6 +257,38 @@ class RecordActionTool implements RecorderTool {
       return;
     }
 
+    this._cancelPendingClickAction();
+
+    // Stall click in case we are observing double-click.
+    if (event.detail === 1) {
+      this._pendingClickAction = {
+        action: {
+          name: 'click',
+          selector: this._hoveredModel!.selector,
+          position: positionForEvent(event),
+          signals: [],
+          button: buttonForEvent(event),
+          modifiers: modifiersForEvent(event),
+          clickCount: event.detail
+        },
+        timeout: this._recorder.injectedScript.utils.builtins.setTimeout(() => this._commitPendingClickAction(), 200)
+      };
+    }
+  }
+
+  onDblClick(event: MouseEvent) {
+    if (isRangeInput(this._hoveredElement))
+      return;
+    if (this._shouldIgnoreMouseEvent(event))
+      return;
+    // Only allow double click dispatch while action is in progress.
+    if (this._actionInProgress(event))
+      return;
+    if (this._consumedDueToNoModel(event, this._hoveredModel))
+      return;
+
+    this._cancelPendingClickAction();
+
     this._performAction({
       name: 'click',
       selector: this._hoveredModel!.selector,
@@ -262,6 +300,18 @@ class RecordActionTool implements RecorderTool {
     });
   }
 
+  private _commitPendingClickAction() {
+    if (this._pendingClickAction)
+      this._performAction(this._pendingClickAction.action);
+    this._cancelPendingClickAction();
+  }
+
+  private _cancelPendingClickAction() {
+    if (this._pendingClickAction)
+      this._recorder.injectedScript.utils.builtins.clearTimeout(this._pendingClickAction.timeout);
+    this._pendingClickAction = undefined;
+  }
+
   onContextMenu(event: MouseEvent) {
     // the 'contextmenu' event is triggered by a right-click or equivalent action,
     // and it prevents the click event from firing for that action, so we always
@@ -287,30 +337,26 @@ class RecordActionTool implements RecorderTool {
   onPointerDown(event: PointerEvent) {
     if (this._shouldIgnoreMouseEvent(event))
       return;
-    if (!this._performingAction)
-      consumeEvent(event);
+    this._consumeWhenAboutToPerform(event);
   }
 
   onPointerUp(event: PointerEvent) {
     if (this._shouldIgnoreMouseEvent(event))
       return;
-    if (!this._performingAction)
-      consumeEvent(event);
+    this._consumeWhenAboutToPerform(event);
   }
 
   onMouseDown(event: MouseEvent) {
     if (this._shouldIgnoreMouseEvent(event))
       return;
-    if (!this._performingAction)
-      consumeEvent(event);
+    this._consumeWhenAboutToPerform(event);
     this._activeModel = this._hoveredModel;
   }
 
   onMouseUp(event: MouseEvent) {
     if (this._shouldIgnoreMouseEvent(event))
       return;
-    if (!this._performingAction)
-      consumeEvent(event);
+    this._consumeWhenAboutToPerform(event);
   }
 
   onMouseMove(event: MouseEvent) {
@@ -338,7 +384,7 @@ class RecordActionTool implements RecorderTool {
     const target = this._recorder.deepEventTarget(event);
 
     if (target.nodeName === 'INPUT' && (target as HTMLInputElement).type.toLowerCase() === 'file') {
-      this._recorder.delegate.recordAction?.({
+      this._recordAction({
         name: 'setInputFiles',
         selector: this._activeModel!.selector,
         signals: [],
@@ -348,7 +394,7 @@ class RecordActionTool implements RecorderTool {
     }
 
     if (isRangeInput(target)) {
-      this._recorder.delegate.recordAction?.({
+      this._recordAction({
         name: 'fill',
         // must use hoveredModel instead of activeModel for it to work in webkit
         selector: this._hoveredModel!.selector,
@@ -367,7 +413,7 @@ class RecordActionTool implements RecorderTool {
       // Non-navigating actions are simply recorded by Playwright.
       if (this._consumedDueWrongTarget(event))
         return;
-      this._recorder.delegate.recordAction?.({
+      this._recordAction({
         name: 'fill',
         selector: this._activeModel!.selector,
         signals: [],
@@ -377,9 +423,7 @@ class RecordActionTool implements RecorderTool {
 
     if (target.nodeName === 'SELECT') {
       const selectElement = target as HTMLSelectElement;
-      if (this._actionInProgress(event))
-        return;
-      this._performAction({
+      this._recordAction({
         name: 'select',
         selector: this._activeModel!.selector,
         options: [...selectElement.selectedOptions].map(option => option.value),
@@ -400,7 +444,7 @@ class RecordActionTool implements RecorderTool {
     // Similarly to click, trigger checkbox on key event, not input.
     if (event.key === ' ') {
       const checkbox = asCheckbox(this._recorder.deepEventTarget(event));
-      if (checkbox) {
+      if (checkbox && event.detail === 0) {
         this._performAction({
           name: checkbox.checked ? 'uncheck' : 'check',
           selector: this._activeModel!.selector,
@@ -432,9 +476,13 @@ class RecordActionTool implements RecorderTool {
   }
 
   onScroll(event: Event) {
+    this._resetHoveredModel();
+  }
+
+  private _resetHoveredModel() {
     this._hoveredModel = null;
     this._hoveredElement = null;
-    this._recorder.updateHighlight(null, false);
+    this._updateHighlight(false);
   }
 
   private _onFocus(userGesture: boolean) {
@@ -444,10 +492,11 @@ class RecordActionTool implements RecorderTool {
     if (userGesture && activeElement === this._recorder.document.body)
       return;
     const result = activeElement ? this._recorder.injectedScript.generateSelector(activeElement, { testIdAttributeName: this._recorder.state.testIdAttributeName }) : null;
-    this._activeModel = result && result.selector ? result : null;
-    if (userGesture)
+    this._activeModel = result && result.selector ? { ...result, color: HighlightColors.action } : null;
+    if (userGesture) {
       this._hoveredElement = activeElement as HTMLElement | null;
-    this._updateModelForHoveredElement();
+      this._updateModelForHoveredElement();
+    }
   }
 
   private _shouldIgnoreMouseEvent(event: MouseEvent): boolean {
@@ -462,9 +511,16 @@ class RecordActionTool implements RecorderTool {
 
   private _actionInProgress(event: Event): boolean {
     // If Playwright is performing action for us, bail.
-    if (this._performingAction)
-      return true;
-    // Consume as the first thing.
+    const isKeyEvent = event instanceof KeyboardEvent;
+    const isMouseOrPointerEvent = event instanceof MouseEvent || event instanceof PointerEvent;
+    for (const action of this._performingActions) {
+      if (isKeyEvent && action.name === 'press' && event.key === action.key)
+        return true;
+      if (isMouseOrPointerEvent && (action.name === 'click' || action.name === 'check' || action.name === 'uncheck'))
+        return true;
+    }
+
+    // Consume event if action is not being executed.
     consumeEvent(event);
     return false;
   }
@@ -483,29 +539,44 @@ class RecordActionTool implements RecorderTool {
     return true;
   }
 
-  private async _performAction(action: actions.Action) {
-    this._hoveredElement = null;
-    this._hoveredModel = null;
-    this._activeModel = null;
+  private _consumeWhenAboutToPerform(event: Event) {
+    if (!this._performingActions.size)
+      consumeEvent(event);
+  }
+
+  private _recordAction(action: actions.Action) {
+    this._recorder.recordAction(action);
+  }
+
+  private _performAction(action: actions.PerformOnRecordAction) {
     this._recorder.updateHighlight(null, false);
-    this._performingAction = true;
-    await this._recorder.delegate.performAction?.(action).catch(() => {});
-    this._performingAction = false;
 
-    // If that was a keyboard action, it similarly requires new selectors for active model.
-    this._onFocus(false);
+    this._performingActions.add(action);
+
+    const promise = this._recorder.performAction(action).then(() => {
+      this._performingActions.delete(action);
+      // If that was a keyboard action, it similarly requires new selectors for active model.
+      this._onFocus(false);
+    });
+
+    if (!this._recorder.injectedScript.isUnderTest)
+      return;
 
-    if (this._recorder.injectedScript.isUnderTest) {
+    void promise.then(() => {
       // Serialize all to string as we cannot attribute console message to isolated world
       // in Firefox.
       console.error('Action performed for test: ' + JSON.stringify({ // eslint-disable-line no-console
         hovered: this._hoveredModel ? (this._hoveredModel as any).selector : null,
         active: this._activeModel ? (this._activeModel as any).selector : null,
       }));
-    }
+    });
   }
 
   private _shouldGenerateKeyPressFor(event: KeyboardEvent): boolean {
+    // IME can generate keyboard events that don't provide a value for the key property (e.g. chrome autofill)
+    if (typeof event.key !== 'string')
+      return false;
+
     // Enter aka. new line is handled in input event.
     if (event.key === 'Enter' && (this._recorder.deepEventTarget(event).nodeName === 'TEXTAREA' || this._recorder.deepEventTarget(event).isContentEditable))
       return false;
@@ -534,54 +605,258 @@ class RecordActionTool implements RecorderTool {
   }
 
   private _updateModelForHoveredElement() {
+    this._installObserverIfNeeded();
+    if (this._performingActions.size)
+      return;
     if (!this._hoveredElement || !this._hoveredElement.isConnected) {
       this._hoveredModel = null;
       this._hoveredElement = null;
-      this._recorder.updateHighlight(null, true);
+      this._updateHighlight(true);
       return;
     }
     const { selector, elements } = this._recorder.injectedScript.generateSelector(this._hoveredElement, { testIdAttributeName: this._recorder.state.testIdAttributeName });
     if (this._hoveredModel && this._hoveredModel.selector === selector)
       return;
-    this._hoveredModel = selector ? { selector, elements, color: '#dc6f6f7f' } : null;
-    this._recorder.updateHighlight(this._hoveredModel, true);
+    this._hoveredModel = selector ? { selector, elements, color: HighlightColors.action } : null;
+    this._updateHighlight(true);
+  }
+
+  private _updateHighlight(userGesture: boolean) {
+    this._recorder.updateHighlight(this._hoveredModel, userGesture);
+  }
+}
+
+class JsonRecordActionTool implements RecorderTool {
+  private _recorder: Recorder;
+
+  constructor(recorder: Recorder) {
+    this._recorder = recorder;
+  }
+
+  install() {
+    // No highlight for the lightweight recorder.
+    this._recorder.highlight.uninstall();
+  }
+
+  uninstall() {
+    this._recorder.highlight.install();
+  }
+
+  onClick(event: MouseEvent) {
+    // in webkit, sliding a range element may trigger a click event with a different target if the mouse is released outside the element bounding box.
+    // So we check the hovered element instead, and if it is a range input, we skip click handling
+    const element = this._recorder.deepEventTarget(event);
+    if (isRangeInput(element))
+      return;
+    // Right clicks are handled by 'contextmenu' event if its auxclick
+    if (event.button === 2 && event.type === 'auxclick')
+      return;
+    if (this._shouldIgnoreMouseEvent(event))
+      return;
+
+    const checkbox = asCheckbox(element);
+    const { ariaSnapshot, selector, ref } = this._ariaSnapshot(element);
+    if (checkbox && event.detail === 1) {
+      // Interestingly, inputElement.checked is reversed inside this event handler.
+      this._recorder.recordAction({
+        name: checkbox.checked ? 'check' : 'uncheck',
+        selector,
+        ref,
+        signals: [],
+        ariaSnapshot,
+      });
+      return;
+    }
+
+    this._recorder.recordAction({
+      name: 'click',
+      selector,
+      ref,
+      ariaSnapshot,
+      position: positionForEvent(event),
+      signals: [],
+      button: buttonForEvent(event),
+      modifiers: modifiersForEvent(event),
+      clickCount: event.detail,
+    });
+  }
+
+  onContextMenu(event: MouseEvent): void {
+    const element = this._recorder.deepEventTarget(event);
+    const { ariaSnapshot, selector, ref } = this._ariaSnapshot(element);
+    this._recorder.recordAction({
+      name: 'click',
+      selector,
+      ref,
+      ariaSnapshot,
+      position: positionForEvent(event),
+      signals: [],
+      button: 'right',
+      modifiers: modifiersForEvent(event),
+      clickCount: 1,
+    });
+  }
+
+  onInput(event: Event) {
+    const element = this._recorder.deepEventTarget(event);
+
+    const { ariaSnapshot, selector, ref } = this._ariaSnapshot(element);
+    if (isRangeInput(element)) {
+      this._recorder.recordAction({
+        name: 'fill',
+        selector,
+        ref,
+        ariaSnapshot,
+        signals: [],
+        text: element.value,
+      });
+      return;
+    }
+
+    if (['INPUT', 'TEXTAREA'].includes(element.nodeName) || element.isContentEditable) {
+      if (element.nodeName === 'INPUT' && ['checkbox', 'radio'].includes((element as HTMLInputElement).type.toLowerCase())) {
+        // Checkbox is handled in click, we can't let input trigger on checkbox - that would mean we dispatched click events while recording.
+        return;
+      }
+
+      this._recorder.recordAction({
+        name: 'fill',
+        ref,
+        selector,
+        ariaSnapshot,
+        signals: [],
+        text: element.isContentEditable ? element.innerText : (element as HTMLInputElement).value,
+      });
+      return;
+    }
+
+    if (element.nodeName === 'SELECT') {
+      const selectElement = element as HTMLSelectElement;
+      this._recorder.recordAction({
+        name: 'select',
+        selector,
+        ref,
+        ariaSnapshot,
+        options: [...selectElement.selectedOptions].map(option => option.value),
+        signals: []
+      });
+      return;
+    }
+  }
+
+  onKeyDown(event: KeyboardEvent) {
+    if (!this._shouldGenerateKeyPressFor(event))
+      return;
+
+    const element = this._recorder.deepEventTarget(event);
+    const { ariaSnapshot, selector, ref } = this._ariaSnapshot(element);
+
+    // Similarly to click, trigger checkbox on key event, not input.
+    if (event.key === ' ') {
+      const checkbox = asCheckbox(element);
+      if (checkbox && event.detail === 0) {
+        this._recorder.recordAction({
+          name: checkbox.checked ? 'uncheck' : 'check',
+          selector,
+          ref,
+          ariaSnapshot,
+          signals: [],
+        });
+        return;
+      }
+    }
+
+    this._recorder.recordAction({
+      name: 'press',
+      selector,
+      ref,
+      ariaSnapshot,
+      signals: [],
+      key: event.key,
+      modifiers: modifiersForEvent(event),
+    });
+  }
+
+  private _shouldIgnoreMouseEvent(event: MouseEvent): boolean {
+    const target = this._recorder.deepEventTarget(event);
+    const nodeName = target.nodeName;
+    if (nodeName === 'SELECT' || nodeName === 'OPTION')
+      return true;
+    if (nodeName === 'INPUT' && ['date', 'range'].includes((target as HTMLInputElement).type))
+      return true;
+    return false;
+  }
+
+  private _shouldGenerateKeyPressFor(event: KeyboardEvent): boolean {
+    // IME can generate keyboard events that don't provide a value for the key property (e.g. chrome autofill)
+    if (typeof event.key !== 'string')
+      return false;
+
+    // Enter aka. new line is handled in input event.
+    if (event.key === 'Enter' && (this._recorder.deepEventTarget(event).nodeName === 'TEXTAREA' || this._recorder.deepEventTarget(event).isContentEditable))
+      return false;
+    // Backspace, Delete, AltGraph are changing input, will handle it there.
+    if (['Backspace', 'Delete', 'AltGraph'].includes(event.key))
+      return false;
+    // Ignore the QWERTZ shortcut for creating a at sign on MacOS
+    if (event.key === '@' && event.code === 'KeyL')
+      return false;
+    // Allow and ignore common used shortcut for pasting.
+    if (navigator.platform.includes('Mac')) {
+      if (event.key === 'v' && event.metaKey)
+        return false;
+    } else {
+      if (event.key === 'v' && event.ctrlKey)
+        return false;
+      if (event.key === 'Insert' && event.shiftKey)
+        return false;
+    }
+    if (['Shift', 'Control', 'Meta', 'Alt', 'Process'].includes(event.key))
+      return false;
+    const hasModifier = event.ctrlKey || event.altKey || event.metaKey;
+    if (event.key.length === 1 && !hasModifier)
+      return !this._isEditable(this._recorder.deepEventTarget(event));
+    return true;
+  }
+
+  private _isEditable(element: HTMLElement) {
+    if (element.nodeName === 'TEXTAREA' || element.nodeName === 'INPUT')
+      return true;
+    if (element.isContentEditable)
+      return true;
+    return false;
+  }
+
+  private _ariaSnapshot(element: HTMLElement): { ariaSnapshot: string, selector: string, ref?: string };
+  private _ariaSnapshot(element: HTMLElement | undefined): { ariaSnapshot: string, selector?: string, ref?: string } {
+    const { ariaSnapshot, refs } = this._recorder.injectedScript.ariaSnapshotForRecorder();
+    const ref = element ? refs.get(element) : undefined;
+    const elementInfo = element ? this._recorder.injectedScript.generateSelector(element, { testIdAttributeName: this._recorder.state.testIdAttributeName }) : undefined;
+    return { ariaSnapshot, selector: elementInfo?.selector, ref };
   }
 }
 
 class TextAssertionTool implements RecorderTool {
   private _recorder: Recorder;
-  private _hoverHighlight: HighlightModel | null = null;
+  private _hoverHighlight: HighlightModelWithSelector | null = null;
   private _action: actions.AssertAction | null = null;
-  private _dialogElement: HTMLElement | null = null;
-  private _acceptButton: HTMLElement;
-  private _cancelButton: HTMLElement;
-  private _keyboardListener: ((event: KeyboardEvent) => void) | undefined;
-  private _textCache = new Map<Element | ShadowRoot, ElementText>();
-  private _kind: 'text' | 'value';
+  private _dialog: Dialog;
+  private _textCache: Map<Element | ShadowRoot, ElementText>;
+  private _kind: 'text' | 'value' | 'snapshot';
 
-  constructor(recorder: Recorder, kind: 'text' | 'value') {
+  constructor(recorder: Recorder, kind: 'text' | 'value' | 'snapshot') {
     this._recorder = recorder;
+    this._textCache = new Map();
     this._kind = kind;
-
-    this._acceptButton = this._recorder.document.createElement('x-pw-tool-item');
-    this._acceptButton.title = 'Accept';
-    this._acceptButton.classList.add('accept');
-    this._acceptButton.appendChild(this._recorder.document.createElement('x-div'));
-    this._acceptButton.addEventListener('click', () => this._commit());
-
-    this._cancelButton = this._recorder.document.createElement('x-pw-tool-item');
-    this._cancelButton.title = 'Close';
-    this._cancelButton.classList.add('cancel');
-    this._cancelButton.appendChild(this._recorder.document.createElement('x-div'));
-    this._cancelButton.addEventListener('click', () => this._closeDialog());
+    this._dialog = new Dialog(recorder);
   }
 
   cursor() {
     return 'pointer';
   }
 
-  cleanup() {
-    this._closeDialog();
+  uninstall() {
+    this._dialog.close();
     this._hoverHighlight = null;
   }
 
@@ -590,7 +865,7 @@ class TextAssertionTool implements RecorderTool {
     if (this._kind === 'value') {
       this._commitAssertValue();
     } else {
-      if (!this._dialogElement)
+      if (!this._dialog.isShowing())
         this._showDialog();
     }
   }
@@ -611,23 +886,25 @@ class TextAssertionTool implements RecorderTool {
   }
 
   onMouseMove(event: MouseEvent) {
-    if (this._dialogElement)
+    if (this._dialog.isShowing())
       return;
     const target = this._recorder.deepEventTarget(event);
     if (this._hoverHighlight?.elements[0] === target)
       return;
-    if (this._kind === 'text')
-      this._hoverHighlight = this._recorder.injectedScript.utils.elementText(this._textCache, target).full ? { elements: [target], selector: '' } : null;
-    else
-      this._hoverHighlight = this._elementHasValue(target) ? this._recorder.injectedScript.generateSelector(target, { testIdAttributeName: this._recorder.state.testIdAttributeName }) : null;
-    if (this._hoverHighlight)
-      this._hoverHighlight.color = '#8acae480';
+    if (this._kind === 'text' || this._kind === 'snapshot') {
+      this._hoverHighlight = this._recorder.injectedScript.utils.elementText(this._textCache, target).full ? { elements: [target], selector: '', color: HighlightColors.assert } : null;
+    } else if (this._elementHasValue(target)) {
+      const generated = this._recorder.injectedScript.generateSelector(target, { testIdAttributeName: this._recorder.state.testIdAttributeName });
+      this._hoverHighlight = { selector: generated.selector, elements: generated.elements, color: HighlightColors.assert };
+    } else {
+      this._hoverHighlight = null;
+    }
     this._recorder.updateHighlight(this._hoverHighlight, true);
   }
 
   onKeyDown(event: KeyboardEvent) {
     if (event.key === 'Escape')
-      this._recorder.delegate.setMode?.('recording');
+      this._recorder.setMode('recording');
     consumeEvent(event);
   }
 
@@ -664,9 +941,21 @@ class TextAssertionTool implements RecorderTool {
           value: (target as (HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement)).value,
         };
       }
+    } else if (this._kind === 'snapshot') {
+      const generated = this._recorder.injectedScript.generateSelector(target, { testIdAttributeName: this._recorder.state.testIdAttributeName, forTextExpect: true });
+      this._hoverHighlight = { selector: generated.selector, elements: generated.elements, color: HighlightColors.assert };
+      // forTextExpect can update the target, re-highlight it.
+      this._recorder.updateHighlight(this._hoverHighlight, true);
+
+      return {
+        name: 'assertSnapshot',
+        selector: this._hoverHighlight.selector,
+        signals: [],
+        ariaSnapshot: this._recorder.injectedScript.ariaSnapshot(target, { mode: 'codegen' }),
+      };
     } else {
-      this._hoverHighlight = this._recorder.injectedScript.generateSelector(target, { testIdAttributeName: this._recorder.state.testIdAttributeName, forTextExpect: true });
-      this._hoverHighlight.color = '#8acae480';
+      const generated = this._recorder.injectedScript.generateSelector(target, { testIdAttributeName: this._recorder.state.testIdAttributeName, forTextExpect: true });
+      this._hoverHighlight = { selector: generated.selector, elements: generated.elements, color: HighlightColors.assert };
       // forTextExpect can update the target, re-highlight it.
       this._recorder.updateHighlight(this._hoverHighlight, true);
 
@@ -687,53 +976,36 @@ class TextAssertionTool implements RecorderTool {
       return String(action.checked);
     if (action?.name === 'assertValue')
       return action.value;
+    if (action?.name === 'assertSnapshot')
+      return action.ariaSnapshot;
     return '';
   }
 
   private _commit() {
-    if (!this._action || !this._dialogElement)
+    if (!this._action || !this._dialog.isShowing())
       return;
-    this._closeDialog();
-    this._recorder.delegate.recordAction?.(this._action);
-    this._recorder.delegate.setMode?.('recording');
+    this._dialog.close();
+    this._recorder.recordAction(this._action);
+    this._recorder.setMode('recording');
   }
 
   private _showDialog() {
     if (!this._hoverHighlight?.elements[0])
       return;
     this._action = this._generateAction();
-    if (!this._action || this._action.name !== 'assertText')
-      return;
-
-    this._dialogElement = this._recorder.document.createElement('x-pw-dialog');
-    this._keyboardListener = (event: KeyboardEvent) => {
-      if (event.key === 'Escape') {
-        this._closeDialog();
-        return;
-      }
-      if (event.key === 'Enter' && (event.ctrlKey || event.metaKey)) {
-        if (this._dialogElement)
-          this._commit();
-        return;
-      }
-    };
-
-    this._recorder.document.addEventListener('keydown', this._keyboardListener, true);
-    const toolbarElement = this._recorder.document.createElement('x-pw-tools-list');
-    const labelElement = this._recorder.document.createElement('label');
-    labelElement.textContent = 'Assert that element contains text';
-    toolbarElement.appendChild(labelElement);
-    toolbarElement.appendChild(this._recorder.document.createElement('x-spacer'));
-    toolbarElement.appendChild(this._acceptButton);
-    toolbarElement.appendChild(this._cancelButton);
-
-    this._dialogElement.appendChild(toolbarElement);
-    const bodyElement = this._recorder.document.createElement('x-pw-dialog-body');
+    if (this._action?.name === 'assertText') {
+      this._showTextDialog(this._action);
+    } else if (this._action?.name === 'assertSnapshot') {
+      this._recorder.recordAction(this._action);
+      this._recorder.setMode('recording');
+      this._recorder.overlay?.flashToolSucceeded('assertingSnapshot');
+    }
+  }
 
-    const action = this._action;
+  private _showTextDialog(action: actions.AssertTextAction) {
     const textElement = this._recorder.document.createElement('textarea');
     textElement.setAttribute('spellcheck', 'false');
-    textElement.value = this._renderValue(this._action);
+    textElement.value = this._renderValue(action);
     textElement.classList.add('text-editor');
 
     const updateAndValidate = () => {
@@ -747,32 +1019,26 @@ class TextAssertionTool implements RecorderTool {
       textElement.classList.toggle('does-not-match', !matches);
     };
     textElement.addEventListener('input', updateAndValidate);
-    bodyElement.appendChild(textElement);
 
-    this._dialogElement.appendChild(bodyElement);
-    this._recorder.highlight.appendChild(this._dialogElement);
-    const position = this._recorder.highlight.tooltipPosition(this._recorder.highlight.firstBox()!, this._dialogElement);
-    this._dialogElement.style.top = position.anchorTop + 'px';
-    this._dialogElement.style.left = position.anchorLeft + 'px';
+    const label = 'Assert that element contains text';
+    const dialogElement = this._dialog.show({
+      label,
+      body: textElement,
+      onCommit: () => this._commit(),
+    });
+    const position = this._recorder.highlight.tooltipPosition(this._recorder.highlight.firstBox()!, dialogElement);
+    this._dialog.moveTo(position.anchorTop, position.anchorLeft);
     textElement.focus();
   }
 
-  private _closeDialog() {
-    if (!this._dialogElement)
-      return;
-    this._dialogElement.remove();
-    this._recorder.document.removeEventListener('keydown', this._keyboardListener!);
-    this._dialogElement = null;
-  }
-
   private _commitAssertValue() {
     if (this._kind !== 'value')
       return;
     const action = this._generateAction();
     if (!action)
       return;
-    this._recorder.delegate.recordAction?.(action);
-    this._recorder.delegate.setMode?.('recording');
+    this._recorder.recordAction(action);
+    this._recorder.setMode('recording');
     this._recorder.overlay?.flashToolSucceeded('assertingValue');
   }
 }
@@ -787,6 +1053,7 @@ class Overlay {
   private _assertVisibilityToggle: HTMLElement;
   private _assertTextToggle: HTMLElement;
   private _assertValuesToggle: HTMLElement;
+  private _assertSnapshotToggle: HTMLElement;
   private _offsetX = 0;
   private _dragState: { offsetX: number, dragStart: { x: number, y: number } } | undefined;
   private _measure: { width: number, height: number } = { width: 0, height: 0 };
@@ -795,7 +1062,6 @@ class Overlay {
     this._recorder = recorder;
     const document = this._recorder.document;
     this._overlayElement = document.createElement('x-pw-overlay');
-    this._overlayElement.appendChild(createSvgElement(this._recorder.document, clipPaths));
     const toolsListElement = document.createElement('x-pw-tools-list');
     this._overlayElement.appendChild(toolsListElement);
 
@@ -833,6 +1099,12 @@ class Overlay {
     this._assertValuesToggle.appendChild(this._recorder.document.createElement('x-div'));
     toolsListElement.appendChild(this._assertValuesToggle);
 
+    this._assertSnapshotToggle = this._recorder.document.createElement('x-pw-tool-item');
+    this._assertSnapshotToggle.title = 'Assert snapshot';
+    this._assertSnapshotToggle.classList.add('snapshot');
+    this._assertSnapshotToggle.appendChild(this._recorder.document.createElement('x-div'));
+    toolsListElement.appendChild(this._assertSnapshotToggle);
+
     this._updateVisualPosition();
     this._refreshListeners();
   }
@@ -844,9 +1116,13 @@ class Overlay {
         this._dragState = { offsetX: this._offsetX, dragStart: { x: (event as MouseEvent).clientX, y: 0 } };
       }),
       addEventListener(this._recordToggle, 'click', () => {
-        this._recorder.delegate.setMode?.(this._recorder.state.mode === 'none' || this._recorder.state.mode === 'standby' || this._recorder.state.mode === 'inspecting' ? 'recording' : 'standby');
+        if (this._recordToggle.classList.contains('disabled'))
+          return;
+        this._recorder.setMode(this._recorder.state.mode === 'none' || this._recorder.state.mode === 'standby' || this._recorder.state.mode === 'inspecting' ? 'recording' : 'standby');
       }),
       addEventListener(this._pickLocatorToggle, 'click', () => {
+        if (this._pickLocatorToggle.classList.contains('disabled'))
+          return;
         const newMode: Record<Mode, Mode> = {
           'inspecting': 'standby',
           'none': 'inspecting',
@@ -856,20 +1132,25 @@ class Overlay {
           'assertingText': 'recording-inspecting',
           'assertingVisibility': 'recording-inspecting',
           'assertingValue': 'recording-inspecting',
+          'assertingSnapshot': 'recording-inspecting',
         };
-        this._recorder.delegate.setMode?.(newMode[this._recorder.state.mode]);
+        this._recorder.setMode(newMode[this._recorder.state.mode]);
       }),
       addEventListener(this._assertVisibilityToggle, 'click', () => {
         if (!this._assertVisibilityToggle.classList.contains('disabled'))
-          this._recorder.delegate.setMode?.(this._recorder.state.mode === 'assertingVisibility' ? 'recording' : 'assertingVisibility');
+          this._recorder.setMode(this._recorder.state.mode === 'assertingVisibility' ? 'recording' : 'assertingVisibility');
       }),
       addEventListener(this._assertTextToggle, 'click', () => {
         if (!this._assertTextToggle.classList.contains('disabled'))
-          this._recorder.delegate.setMode?.(this._recorder.state.mode === 'assertingText' ? 'recording' : 'assertingText');
+          this._recorder.setMode(this._recorder.state.mode === 'assertingText' ? 'recording' : 'assertingText');
       }),
       addEventListener(this._assertValuesToggle, 'click', () => {
         if (!this._assertValuesToggle.classList.contains('disabled'))
-          this._recorder.delegate.setMode?.(this._recorder.state.mode === 'assertingValue' ? 'recording' : 'assertingValue');
+          this._recorder.setMode(this._recorder.state.mode === 'assertingValue' ? 'recording' : 'assertingValue');
+      }),
+      addEventListener(this._assertSnapshotToggle, 'click', () => {
+        if (!this._assertSnapshotToggle.classList.contains('disabled'))
+          this._recorder.setMode(this._recorder.state.mode === 'assertingSnapshot' ? 'recording' : 'assertingSnapshot');
       }),
     ];
   }
@@ -885,14 +1166,16 @@ class Overlay {
   }
 
   setUIState(state: UIState) {
-    this._recordToggle.classList.toggle('active', state.mode === 'recording' || state.mode === 'assertingText' || state.mode === 'assertingVisibility' || state.mode === 'assertingValue' || state.mode === 'recording-inspecting');
-    this._pickLocatorToggle.classList.toggle('active', state.mode === 'inspecting' || state.mode === 'recording-inspecting');
-    this._assertVisibilityToggle.classList.toggle('active', state.mode === 'assertingVisibility');
+    this._recordToggle.classList.toggle('toggled', state.mode === 'recording' || state.mode === 'assertingText' || state.mode === 'assertingVisibility' || state.mode === 'assertingValue' || state.mode === 'assertingSnapshot' || state.mode === 'recording-inspecting');
+    this._pickLocatorToggle.classList.toggle('toggled', state.mode === 'inspecting' || state.mode === 'recording-inspecting');
+    this._assertVisibilityToggle.classList.toggle('toggled', state.mode === 'assertingVisibility');
     this._assertVisibilityToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
-    this._assertTextToggle.classList.toggle('active', state.mode === 'assertingText');
+    this._assertTextToggle.classList.toggle('toggled', state.mode === 'assertingText');
     this._assertTextToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
-    this._assertValuesToggle.classList.toggle('active', state.mode === 'assertingValue');
+    this._assertValuesToggle.classList.toggle('toggled', state.mode === 'assertingValue');
     this._assertValuesToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
+    this._assertSnapshotToggle.classList.toggle('toggled', state.mode === 'assertingSnapshot');
+    this._assertSnapshotToggle.classList.toggle('disabled', state.mode === 'none' || state.mode === 'standby' || state.mode === 'inspecting');
     if (this._offsetX !== state.overlay.offsetX) {
       this._offsetX = state.overlay.offsetX;
       this._updateVisualPosition();
@@ -903,10 +1186,16 @@ class Overlay {
       this._showOverlay();
   }
 
-  flashToolSucceeded(tool: 'assertingVisibility' | 'assertingValue') {
-    const element = tool === 'assertingVisibility' ? this._assertVisibilityToggle : this._assertValuesToggle;
+  flashToolSucceeded(tool: 'assertingVisibility' | 'assertingSnapshot' | 'assertingValue') {
+    let element: Element;
+    if (tool === 'assertingVisibility')
+      element = this._assertVisibilityToggle;
+    else if (tool === 'assertingSnapshot')
+      element = this._assertSnapshotToggle;
+    else
+      element = this._assertValuesToggle;
     element.classList.add('succeeded');
-    this._recorder.injectedScript.builtinSetTimeout(() => element.classList.remove('succeeded'), 2000);
+    this._recorder.injectedScript.utils.builtins.setTimeout(() => element.classList.remove('succeeded'), 2000);
   }
 
   private _hideOverlay() {
@@ -935,7 +1224,7 @@ class Overlay {
       const halfGapSize = (this._recorder.injectedScript.window.innerWidth - this._measure.width) / 2 - 10;
       this._offsetX = Math.max(-halfGapSize, Math.min(halfGapSize, this._offsetX));
       this._updateVisualPosition();
-      this._recorder.delegate.setOverlayState?.({ offsetX: this._offsetX });
+      this._recorder.setOverlayState({ offsetX: this._offsetX });
       consumeEvent(event);
       return true;
     }
@@ -958,6 +1247,10 @@ class Overlay {
     }
     return false;
   }
+
+  onDblClick(event: MouseEvent) {
+    return false;
+  }
 }
 
 export class Recorder {
@@ -965,15 +1258,22 @@ export class Recorder {
   private _listeners: (() => void)[] = [];
   private _currentTool: RecorderTool;
   private _tools: Record<Mode, RecorderTool>;
-  private _actionSelectorModel: HighlightModel | null = null;
+  private _lastHighlightedSelector: string | undefined = undefined;
+  private _lastHighlightedAriaTemplateJSON: string = 'undefined';
+  private _lastActionAutoexpectSnapshot: AriaSnapshot | undefined;
   readonly highlight: Highlight;
   readonly overlay: Overlay | undefined;
   private _stylesheet: CSSStyleSheet;
-  state: UIState = { mode: 'none', testIdAttributeName: 'data-testid', language: 'javascript', overlay: { offsetX: 0 } };
+  state: UIState = {
+    mode: 'none',
+    testIdAttributeName: 'data-testid',
+    language: 'javascript',
+    overlay: { offsetX: 0 },
+  };
   readonly document: Document;
-  delegate: RecorderDelegate = {};
+  private _delegate: RecorderDelegate = {};
 
-  constructor(injectedScript: InjectedScript) {
+  constructor(injectedScript: InjectedScript, options?: { recorderMode?: 'default' | 'api' }) {
     this.document = injectedScript.document;
     this.injectedScript = injectedScript;
     this.highlight = injectedScript.createHighlight();
@@ -981,13 +1281,15 @@ export class Recorder {
       'none': new NoneTool(),
       'standby': new NoneTool(),
       'inspecting': new InspectTool(this, false),
-      'recording': new RecordActionTool(this),
+      'recording': options?.recorderMode === 'api' ? new JsonRecordActionTool(this) : new RecordActionTool(this),
       'recording-inspecting': new InspectTool(this, false),
       'assertingText': new TextAssertionTool(this, 'text'),
       'assertingVisibility': new InspectTool(this, true),
       'assertingValue': new TextAssertionTool(this, 'value'),
+      'assertingSnapshot': new TextAssertionTool(this, 'snapshot'),
     };
     this._currentTool = this._tools.none;
+    this._currentTool.install?.();
     if (injectedScript.window.top === injectedScript.window) {
       this.overlay = new Overlay(this);
       this.overlay.setUIState(this.state);
@@ -1001,6 +1303,7 @@ export class Recorder {
     injectedScript.utils.cacheNormalizedWhitespaces();
     if (injectedScript.isUnderTest)
       console.error('Recorder script ready for test'); // eslint-disable-line no-console
+    injectedScript.consoleApi.install();
   }
 
   installListeners() {
@@ -1008,6 +1311,7 @@ export class Recorder {
     this._listeners = [
       addEventListener(this.document, 'click', event => this._onClick(event as MouseEvent), true),
       addEventListener(this.document, 'auxclick', event => this._onClick(event as MouseEvent), true),
+      addEventListener(this.document, 'dblclick', event => this._onDblClick(event as MouseEvent), true),
       addEventListener(this.document, 'contextmenu', event => this._onContextMenu(event as MouseEvent), true),
       addEventListener(this.document, 'dragstart', event => this._onDragStart(event as DragEvent), true),
       addEventListener(this.document, 'input', event => this._onInput(event), true),
@@ -1023,8 +1327,20 @@ export class Recorder {
       addEventListener(this.document, 'focus', event => this._onFocus(event), true),
       addEventListener(this.document, 'scroll', event => this._onScroll(event), true),
     ];
+
     this.highlight.install();
+    // some frameworks erase the DOM on hydration, this ensures it's reattached
+    let recreationInterval: number | undefined;
+    const recreate = () => {
+      this.highlight.install();
+      recreationInterval = this.injectedScript.utils.builtins.setTimeout(recreate, 500);
+    };
+    recreationInterval = this.injectedScript.utils.builtins.setTimeout(recreate, 500);
+    this._listeners.push(() => this.injectedScript.utils.builtins.clearTimeout(recreationInterval));
+
+    this.highlight.appendChild(createSvgElement(this.document, clipPaths));
     this.overlay?.install();
+    this._currentTool?.install?.();
     this.document.adoptedStyleSheets.push(this._stylesheet);
   }
 
@@ -1032,14 +1348,17 @@ export class Recorder {
     const newTool = this._tools[this.state.mode];
     if (newTool === this._currentTool)
       return;
-    this._currentTool.cleanup?.();
+    this._currentTool.uninstall?.();
     this.clearHighlight();
     this._currentTool = newTool;
-    this.injectedScript.document.body?.setAttribute('data-pw-cursor', newTool.cursor());
+    this._currentTool.install?.();
+    const cursor = newTool.cursor?.();
+    if (cursor)
+      this.injectedScript.document.body?.setAttribute('data-pw-cursor', cursor);
   }
 
   setUIState(state: UIState, delegate: RecorderDelegate) {
-    this.delegate = delegate;
+    this._delegate = delegate;
 
     if (state.actionPoint && this.state.actionPoint && state.actionPoint.x === this.state.actionPoint.x && state.actionPoint.y === this.state.actionPoint.y) {
       // All good.
@@ -1057,17 +1376,34 @@ export class Recorder {
     this._switchCurrentTool();
     this.overlay?.setUIState(state);
 
-    // Race or scroll.
-    if (this._actionSelectorModel?.selector && !this._actionSelectorModel?.elements.length)
-      this._actionSelectorModel = null;
-    if (state.actionSelector !== this._actionSelectorModel?.selector)
-      this._actionSelectorModel = state.actionSelector ? querySelector(this.injectedScript, state.actionSelector, this.document) : null;
-    if (this.state.mode === 'none' || this.state.mode === 'standby')
-      this.updateHighlight(this._actionSelectorModel, false);
+    let highlight: HighlightEntry[] | 'clear' | 'noop' = 'noop';
+    if (state.actionSelector !== this._lastHighlightedSelector) {
+      const entries = state.actionSelector ? entriesForSelectorHighlight(this.injectedScript, state.language, state.actionSelector, this.document) : null;
+      highlight = entries?.length ? entries : 'clear';
+      this._lastHighlightedSelector = entries?.length ? state.actionSelector : undefined;
+    }
+
+    const ariaTemplateJSON = JSON.stringify(state.ariaTemplate);
+    if (this._lastHighlightedAriaTemplateJSON !== ariaTemplateJSON) {
+      const elements = state.ariaTemplate ? this.injectedScript.getAllElementsMatchingExpectAriaTemplate(this.document, state.ariaTemplate) : [];
+      if (elements.length) {
+        const color = elements.length > 1 ? HighlightColors.multiple : HighlightColors.single;
+        highlight = elements.map(element => ({ element, color }));
+        this._lastHighlightedAriaTemplateJSON = ariaTemplateJSON;
+      } else {
+        if (!this._lastHighlightedSelector)
+          highlight = 'clear';
+        this._lastHighlightedAriaTemplateJSON = 'undefined';
+      }
+    }
+
+    if (highlight === 'clear')
+      this.highlight.clearHighlight();
+    else if (highlight !== 'noop')
+      this.highlight.updateHighlight(highlight);
   }
 
   clearHighlight() {
-    this._currentTool.cleanup?.();
     this.updateHighlight(null, false);
   }
 
@@ -1081,6 +1417,16 @@ export class Recorder {
     this._currentTool.onClick?.(event);
   }
 
+  private _onDblClick(event: MouseEvent) {
+    if (!event.isTrusted)
+      return;
+    if (this.overlay?.onDblClick(event))
+      return;
+    if (this._ignoreOverlayEvent(event))
+      return;
+    this._currentTool.onDblClick?.(event);
+  }
+
   private _onContextMenu(event: MouseEvent) {
     if (!event.isTrusted)
       return;
@@ -1168,6 +1514,8 @@ export class Recorder {
   private _onScroll(event: Event) {
     if (!event.isTrusted)
       return;
+    this._lastHighlightedSelector = undefined;
+    this._lastHighlightedAriaTemplateJSON = 'undefined';
     this.highlight.hideActionPoint();
     this._currentTool.onScroll?.(event);
   }
@@ -1195,12 +1543,21 @@ export class Recorder {
   }
 
   updateHighlight(model: HighlightModel | null, userGesture: boolean) {
+    this._lastHighlightedSelector = undefined;
+    this._lastHighlightedAriaTemplateJSON = 'undefined';
+    this._updateHighlight(model, userGesture);
+  }
+
+  private _updateHighlight(model: HighlightModel | null, userGesture: boolean) {
     let tooltipText = model?.tooltipText;
-    if (tooltipText === undefined && !model?.tooltipList && model?.selector)
+    if (tooltipText === undefined && model?.selector)
       tooltipText = this.injectedScript.utils.asLocator(this.state.language, model.selector);
-    this.highlight.updateHighlight(model?.elements || [], { ...model, tooltipText });
+    if (model)
+      this.highlight.updateHighlight(model.elements.map(element => ({ element, color: model.color, tooltipText })));
+    else
+      this.highlight.clearHighlight();
     if (userGesture)
-      this.delegate.highlightUpdated?.();
+      this._delegate.highlightUpdated?.();
   }
 
   private _ignoreOverlayEvent(event: Event) {
@@ -1217,6 +1574,122 @@ export class Recorder {
     }
     return event.composedPath()[0] as HTMLElement;
   }
+
+  setMode(mode: Mode) {
+    void this._delegate.setMode?.(mode);
+  }
+
+  private _captureAutoExpectSnapshot() {
+    const documentElement = this.injectedScript.document.documentElement;
+    return documentElement ? this.injectedScript.utils.generateAriaTree(documentElement, { mode: 'autoexpect' }) : undefined;
+  }
+
+  async performAction(action: actions.PerformOnRecordAction) {
+    const previousSnapshot = this._lastActionAutoexpectSnapshot;
+    this._lastActionAutoexpectSnapshot = this._captureAutoExpectSnapshot();
+    if (!isAssertAction(action) && this._lastActionAutoexpectSnapshot) {
+      const element = findNewElement(previousSnapshot, this._lastActionAutoexpectSnapshot);
+      action.preconditionSelector = element ? this.injectedScript.generateSelector(element, { testIdAttributeName: this.state.testIdAttributeName }).selector : undefined;
+      if (action.preconditionSelector === action.selector)
+        action.preconditionSelector = undefined;
+    }
+    await this._delegate.performAction?.(action).catch(() => {});
+  }
+
+  recordAction(action: actions.Action) {
+    this._lastActionAutoexpectSnapshot = this._captureAutoExpectSnapshot();
+    void this._delegate.recordAction?.(action);
+  }
+
+  setOverlayState(state: { offsetX: number; }) {
+    void this._delegate.setOverlayState?.(state);
+  }
+
+  elementPicked(selector: string, model: HighlightModel) {
+    const ariaSnapshot = this.injectedScript.ariaSnapshot(model.elements[0], { mode: 'expect' });
+    void this._delegate.elementPicked?.({ selector, ariaSnapshot });
+  }
+}
+
+class Dialog {
+  private _recorder: Recorder;
+  private _dialogElement: HTMLElement | null = null;
+  private _keyboardListener: ((event: KeyboardEvent) => void) | undefined;
+
+  constructor(recorder: Recorder) {
+    this._recorder = recorder;
+  }
+
+  isShowing(): boolean {
+    return !!this._dialogElement;
+  }
+
+  show(options: {
+    label: string;
+    body: Element;
+    onCommit: () => void;
+    onCancel?: () => void;
+  }) {
+    const acceptButton = this._recorder.document.createElement('x-pw-tool-item');
+    acceptButton.title = 'Accept';
+    acceptButton.classList.add('accept');
+    acceptButton.appendChild(this._recorder.document.createElement('x-div'));
+    acceptButton.addEventListener('click', () => options.onCommit());
+
+    const cancelButton = this._recorder.document.createElement('x-pw-tool-item');
+    cancelButton.title = 'Close';
+    cancelButton.classList.add('cancel');
+    cancelButton.appendChild(this._recorder.document.createElement('x-div'));
+    cancelButton.addEventListener('click', () => {
+      this.close();
+      options.onCancel?.();
+    });
+
+    this._dialogElement = this._recorder.document.createElement('x-pw-dialog');
+    this._keyboardListener = (event: KeyboardEvent) => {
+      if (event.key === 'Escape') {
+        this.close();
+        options.onCancel?.();
+        return;
+      }
+      if (event.key === 'Enter' && (event.ctrlKey || event.metaKey)) {
+        if (this._dialogElement)
+          options.onCommit();
+        return;
+      }
+    };
+
+    this._recorder.document.addEventListener('keydown', this._keyboardListener, true);
+    const toolbarElement = this._recorder.document.createElement('x-pw-tools-list');
+    const labelElement = this._recorder.document.createElement('label');
+    labelElement.textContent = options.label;
+    toolbarElement.appendChild(labelElement);
+    toolbarElement.appendChild(this._recorder.document.createElement('x-spacer'));
+    toolbarElement.appendChild(acceptButton);
+    toolbarElement.appendChild(cancelButton);
+
+    this._dialogElement.appendChild(toolbarElement);
+    const bodyElement = this._recorder.document.createElement('x-pw-dialog-body');
+    bodyElement.appendChild(options.body);
+    this._dialogElement.appendChild(bodyElement);
+    this._recorder.highlight.appendChild(this._dialogElement);
+    return this._dialogElement;
+  }
+
+  moveTo(top: number, left: number) {
+    if (!this._dialogElement)
+      return;
+    this._dialogElement.style.top = top + 'px';
+    this._dialogElement.style.left = left + 'px';
+  }
+
+  close() {
+    if (!this._dialogElement)
+      return;
+    this._dialogElement.remove();
+    this._recorder.document.removeEventListener('keydown', this._keyboardListener!);
+    this._dialogElement = null;
+  }
 }
 
 function deepActiveElement(document: Document): Element | null {
@@ -1255,9 +1728,15 @@ function consumeEvent(e: Event) {
   e.stopImmediatePropagation();
 }
 
-type HighlightModel = HighlightOptions & {
-  selector: string;
+type HighlightModel = {
+  selector?: string;
   elements: Element[];
+  color: string;
+  tooltipText?: string;
+};
+
+type HighlightModelWithSelector = HighlightModel & {
+  selector: string;
 };
 
 function asCheckbox(node: Node | null): HTMLInputElement | null {
@@ -1288,18 +1767,18 @@ function removeEventListeners(listeners: (() => void)[]) {
   listeners.splice(0, listeners.length);
 }
 
-function querySelector(injectedScript: InjectedScript, selector: string, ownerDocument: Document): { selector: string, elements: Element[] } {
+function entriesForSelectorHighlight(injectedScript: InjectedScript, language: Language, selector: string, ownerDocument: Document): HighlightEntry[] {
   try {
     const parsedSelector = injectedScript.parseSelector(selector);
-    return {
-      selector,
-      elements: injectedScript.querySelectorAll(parsedSelector, ownerDocument)
-    };
+    const elements = injectedScript.querySelectorAll(parsedSelector, ownerDocument);
+    const color = elements.length > 1 ? HighlightColors.multiple : HighlightColors.single;
+    const locator = injectedScript.utils.asLocator(language, selector);
+    return elements.map((element, index) => {
+      const suffix = elements.length > 1 ? ` [${index + 1} of ${elements.length}]` : '';
+      return { element, color, tooltipText: locator + suffix };
+    });
   } catch (e) {
-    return {
-      selector,
-      elements: [],
-    };
+    return [];
   }
 }
 
@@ -1324,72 +1803,55 @@ function createSvgElement(doc: Document, { tagName, attrs, children }: SvgJson):
   return elem;
 }
 
-interface Embedder {
-  __pw_recorderPerformAction(action: actions.Action): Promise<void>;
-  __pw_recorderRecordAction(action: actions.Action): Promise<void>;
-  __pw_recorderState(): Promise<UIState>;
-  __pw_recorderSetSelector(selector: string): Promise<void>;
-  __pw_recorderSetMode(mode: Mode): Promise<void>;
-  __pw_recorderSetOverlayState(state: OverlayState): Promise<void>;
-  __pw_refreshOverlay(): void;
+function isAssertAction(action: actions.Action): action is actions.AssertAction {
+  return action.name.startsWith('assert');
 }
 
-export class PollingRecorder implements RecorderDelegate {
-  private _recorder: Recorder;
-  private _embedder: Embedder;
-  private _pollRecorderModeTimer: number | undefined;
-
-  constructor(injectedScript: InjectedScript) {
-    this._recorder = new Recorder(injectedScript);
-    this._embedder = injectedScript.window as any;
-
-    injectedScript.onGlobalListenersRemoved.add(() => this._recorder.installListeners());
-
-    const refreshOverlay = () => {
-      this._pollRecorderMode().catch(e => console.log(e)); // eslint-disable-line no-console
-    };
-    this._embedder.__pw_refreshOverlay = refreshOverlay;
-    refreshOverlay();
-  }
+function findNewElement(from: AriaSnapshot | undefined, to: AriaSnapshot): Element | undefined {
+  type ByRoleAndName = Map<string, Map<string, { node: AriaNode, sizeAndPosition: number }>>;
 
-  private async _pollRecorderMode() {
-    const pollPeriod = 1000;
-    if (this._pollRecorderModeTimer)
-      clearTimeout(this._pollRecorderModeTimer);
-    const state = await this._embedder.__pw_recorderState().catch(() => {});
-    if (!state) {
-      this._pollRecorderModeTimer = this._recorder.injectedScript.builtinSetTimeout(() => this._pollRecorderMode(), pollPeriod);
-      return;
+  function fillMap(root: AriaNode, map: ByRoleAndName, position: number) {
+    let size = 1;
+    let childPosition = position + size;
+    for (const child of root.children || []) {
+      if (typeof child === 'string') {
+        size++;
+        childPosition++;
+      } else {
+        size += fillMap(child, map, childPosition);
+        childPosition += size;
+      }
     }
-    const win = this._recorder.document.defaultView!;
-    if (win.top !== win) {
-      // Only show action point in the main frame, since it is relative to the page's viewport.
-      // Otherwise we'll see multiple action points at different locations.
-      state.actionPoint = undefined;
+    if (!['none', 'presentation', 'fragment', 'iframe', 'generic'].includes(root.role) && root.name) {
+      let byRole = map.get(root.role);
+      if (!byRole) {
+        byRole = new Map();
+        map.set(root.role, byRole);
+      }
+      const existing = byRole.get(root.name);
+      // This heuristic prioritizes elements at the top of the page, even if somewhat smaller.
+      const sizeAndPosition = size * 100 - position;
+      if (!existing || existing.sizeAndPosition < sizeAndPosition)
+        byRole.set(root.name, { node: root, sizeAndPosition });
     }
-    this._recorder.setUIState(state, this);
-    this._pollRecorderModeTimer = this._recorder.injectedScript.builtinSetTimeout(() => this._pollRecorderMode(), pollPeriod);
+    return size;
   }
 
-  async performAction(action: actions.Action) {
-    await this._embedder.__pw_recorderPerformAction(action);
-  }
+  const fromMap: ByRoleAndName = new Map();
+  if (from)
+    fillMap(from.root, fromMap, 0);
 
-  async recordAction(action: actions.Action): Promise<void> {
-    await this._embedder.__pw_recorderRecordAction(action);
-  }
+  const toMap: ByRoleAndName = new Map();
+  fillMap(to.root, toMap, 0);
 
-  async setSelector(selector: string): Promise<void> {
-    await this._embedder.__pw_recorderSetSelector(selector);
-  }
-
-  async setMode(mode: Mode): Promise<void> {
-    await this._embedder.__pw_recorderSetMode(mode);
-  }
-
-  async setOverlayState(state: OverlayState): Promise<void> {
-    await this._embedder.__pw_recorderSetOverlayState(state);
+  const result: { node: AriaNode, sizeAndPosition: number }[] = [];
+  for (const [role, byRole] of toMap) {
+    for (const [name, byName] of byRole) {
+      const inFrom = fromMap.get(role)?.get(name);
+      if (!inFrom)
+        result.push(byName);
+    }
   }
+  result.sort((a, b) => b.sizeAndPosition - a.sizeAndPosition);
+  return result[0]?.node.element;
 }
-
-export default PollingRecorder;
diff --git a/packages/playwright-core/src/server/injected/roleSelectorEngine.ts b/packages/injected/src/roleSelectorEngine.ts
similarity index 97%
rename from packages/playwright-core/src/server/injected/roleSelectorEngine.ts
rename to packages/injected/src/roleSelectorEngine.ts
index b647f81b8eb45..cbef4ed747774 100644
--- a/packages/playwright-core/src/server/injected/roleSelectorEngine.ts
+++ b/packages/injected/src/roleSelectorEngine.ts
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-import type { SelectorEngine, SelectorRoot } from './selectorEngine';
-import { matchesAttributePart } from './selectorUtils';
+import { parseAttributeSelector } from '@isomorphic/selectorParser';
+import { normalizeWhiteSpace } from '@isomorphic/stringUtils';
+
 import { beginAriaCaches, endAriaCaches, getAriaChecked, getAriaDisabled, getAriaExpanded, getAriaLevel, getAriaPressed, getAriaRole, getAriaSelected, getElementAccessibleName, isElementHiddenForAria, kAriaCheckedRoles, kAriaExpandedRoles, kAriaLevelRoles, kAriaPressedRoles, kAriaSelectedRoles } from './roleUtils';
-import { parseAttributeSelector, type AttributeSelectorPart, type AttributeSelectorOperator } from '../../utils/isomorphic/selectorParser';
-import { normalizeWhiteSpace } from '../../utils/isomorphic/stringUtils';
+import { matchesAttributePart } from './selectorUtils';
+
+import type { AttributeSelectorOperator, AttributeSelectorPart } from '@isomorphic/selectorParser';
+import type { SelectorEngine, SelectorRoot } from './selectorEngine';
 
 type RoleEngineOptions = {
   role: string;
diff --git a/packages/playwright-core/src/server/injected/roleUtils.ts b/packages/injected/src/roleUtils.ts
similarity index 71%
rename from packages/playwright-core/src/server/injected/roleUtils.ts
rename to packages/injected/src/roleUtils.ts
index 57681e0542cc8..e652ee8c1581a 100644
--- a/packages/playwright-core/src/server/injected/roleUtils.ts
+++ b/packages/injected/src/roleUtils.ts
@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
+import * as css from '@isomorphic/cssTokenizer';
+
 import { closestCrossShadow, elementSafeTagName, enclosingShadowRootOrDocument, getElementComputedStyle, isElementStyleVisibilityVisible, isVisibleTextNode, parentElementOrShadowHost } from './domUtils';
 
+import type { AriaRole } from '@isomorphic/ariaSnapshot';
+
 function hasExplicitAccessibleName(e: Element) {
   return e.hasAttribute('aria-label') || e.hasAttribute('aria-labelledby');
 }
@@ -24,7 +28,7 @@ function hasExplicitAccessibleName(e: Element) {
 const kAncestorPreventingLandmark = 'article:not([role]), aside:not([role]), main:not([role]), nav:not([role]), section:not([role]), [role=article], [role=complementary], [role=main], [role=navigation], [role=region]';
 
 // https://www.w3.org/TR/wai-aria-1.2/#global_states
-const kGlobalAriaAttributes = new Map<string, Set<string> | undefined>([
+const kGlobalAriaAttributes: [string, string[] | undefined][] = [
   ['aria-atomic', undefined],
   ['aria-busy', undefined],
   ['aria-controls', undefined],
@@ -44,17 +48,17 @@ const kGlobalAriaAttributes = new Map<string, Set<string> | undefined>([
   // Global use deprecated in ARIA 1.2
   // ['aria-invalid', undefined],
   ['aria-keyshortcuts', undefined],
-  ['aria-label', new Set(['caption', 'code', 'deletion', 'emphasis', 'generic', 'insertion', 'paragraph', 'presentation', 'strong', 'subscript', 'superscript'])],
-  ['aria-labelledby', new Set(['caption', 'code', 'deletion', 'emphasis', 'generic', 'insertion', 'paragraph', 'presentation', 'strong', 'subscript', 'superscript'])],
+  ['aria-label', ['caption', 'code', 'deletion', 'emphasis', 'generic', 'insertion', 'paragraph', 'presentation', 'strong', 'subscript', 'superscript']],
+  ['aria-labelledby', ['caption', 'code', 'deletion', 'emphasis', 'generic', 'insertion', 'paragraph', 'presentation', 'strong', 'subscript', 'superscript']],
   ['aria-live', undefined],
   ['aria-owns', undefined],
   ['aria-relevant', undefined],
-  ['aria-roledescription', new Set(['generic'])],
-]);
+  ['aria-roledescription', ['generic']],
+];
 
 function hasGlobalAriaAttribute(element: Element, forRole?: string | null) {
-  return [...kGlobalAriaAttributes].some(([attr, prohibited]) => {
-    return !prohibited?.has(forRole || '') && element.hasAttribute(attr);
+  return kGlobalAriaAttributes.some(([attr, prohibited]) => {
+    return !prohibited?.includes(forRole || '') && element.hasAttribute(attr);
   });
 }
 
@@ -82,7 +86,7 @@ function isNativelyFocusable(element: Element) {
 
 // https://w3c.github.io/html-aam/#html-element-role-mappings
 // https://www.w3.org/TR/html-aria/#docconformance
-const kImplicitRoleByTagName: { [tagName: string]: (e: Element) => string | null } = {
+const kImplicitRoleByTagName: { [tagName: string]: (e: Element) => AriaRole | null } = {
   'A': (e: Element) => {
     return e.hasAttribute('href') ? 'link' : null;
   },
@@ -127,17 +131,13 @@ const kImplicitRoleByTagName: { [tagName: string]: (e: Element) => string | null
       return (list && elementSafeTagName(list) === 'DATALIST') ? 'combobox' : 'textbox';
     }
     if (type === 'hidden')
-      return '';
-    return {
-      'button': 'button',
-      'checkbox': 'checkbox',
-      'image': 'button',
-      'number': 'spinbutton',
-      'radio': 'radio',
-      'range': 'slider',
-      'reset': 'button',
-      'submit': 'button',
-    }[type] || 'textbox';
+      return null;
+    // File inputs do not have a role by the spec: https://www.w3.org/TR/html-aam-1.0/#el-input-file.
+    // However, there are open issues about fixing it: https://github.com/w3c/aria/issues/1926.
+    // All browsers report it as a button, and it is rendered as a button, so we do "button".
+    if (type === 'file')
+      return 'button';
+    return inputTypeToRole[type] || 'textbox';
   },
   'INS': () => 'insertion',
   'LI': () => 'listitem',
@@ -153,6 +153,7 @@ const kImplicitRoleByTagName: { [tagName: string]: (e: Element) => string | null
   'OUTPUT': () => 'status',
   'P': () => 'paragraph',
   'PROGRESS': () => 'progressbar',
+  'SEARCH': () => 'search',
   'SECTION': (e: Element) => hasExplicitAccessibleName(e) ? 'region' : null,
   'SELECT': (e: Element) => e.hasAttribute('multiple') || (e as HTMLSelectElement).size > 1 ? 'listbox' : 'combobox',
   'STRONG': () => 'strong',
@@ -200,7 +201,7 @@ const kPresentationInheritanceParents: { [tagName: string]: string[] } = {
   'TR': ['THEAD', 'TBODY', 'TFOOT', 'TABLE'],
 };
 
-function getImplicitAriaRole(element: Element): string | null {
+function getImplicitAriaRole(element: Element): AriaRole | null {
   const implicitRole = kImplicitRoleByTagName[elementSafeTagName(element)]?.(element) || '';
   if (!implicitRole)
     return null;
@@ -220,24 +221,18 @@ function getImplicitAriaRole(element: Element): string | null {
   return implicitRole;
 }
 
-// https://www.w3.org/TR/wai-aria-1.2/#role_definitions
-const allRoles = [
-  'alert', 'alertdialog', 'application', 'article', 'banner', 'blockquote', 'button', 'caption', 'cell', 'checkbox', 'code', 'columnheader', 'combobox', 'command',
-  'complementary', 'composite', 'contentinfo', 'definition', 'deletion', 'dialog', 'directory', 'document', 'emphasis', 'feed', 'figure', 'form', 'generic', 'grid',
-  'gridcell', 'group', 'heading', 'img', 'input', 'insertion', 'landmark', 'link', 'list', 'listbox', 'listitem', 'log', 'main', 'marquee', 'math', 'meter', 'menu',
+const validRoles: AriaRole[] = ['alert', 'alertdialog', 'application', 'article', 'banner', 'blockquote', 'button', 'caption', 'cell', 'checkbox', 'code', 'columnheader', 'combobox',
+  'complementary', 'contentinfo', 'definition', 'deletion', 'dialog', 'directory', 'document', 'emphasis', 'feed', 'figure', 'form', 'generic', 'grid',
+  'gridcell', 'group', 'heading', 'img', 'insertion', 'link', 'list', 'listbox', 'listitem', 'log', 'main', 'mark', 'marquee', 'math', 'meter', 'menu',
   'menubar', 'menuitem', 'menuitemcheckbox', 'menuitemradio', 'navigation', 'none', 'note', 'option', 'paragraph', 'presentation', 'progressbar', 'radio', 'radiogroup',
-  'range', 'region', 'roletype', 'row', 'rowgroup', 'rowheader', 'scrollbar', 'search', 'searchbox', 'section', 'sectionhead', 'select', 'separator', 'slider',
-  'spinbutton', 'status', 'strong', 'structure', 'subscript', 'superscript', 'switch', 'tab', 'table', 'tablist', 'tabpanel', 'term', 'textbox', 'time', 'timer',
-  'toolbar', 'tooltip', 'tree', 'treegrid', 'treeitem', 'widget', 'window'
-];
-// https://www.w3.org/TR/wai-aria-1.2/#abstract_roles
-const abstractRoles = ['command', 'composite', 'input', 'landmark', 'range', 'roletype', 'section', 'sectionhead', 'select', 'structure', 'widget', 'window'];
-const validRoles = allRoles.filter(role => !abstractRoles.includes(role));
+  'region', 'row', 'rowgroup', 'rowheader', 'scrollbar', 'search', 'searchbox', 'separator', 'slider',
+  'spinbutton', 'status', 'strong', 'subscript', 'superscript', 'switch', 'tab', 'table', 'tablist', 'tabpanel', 'term', 'textbox', 'time', 'timer',
+  'toolbar', 'tooltip', 'tree', 'treegrid', 'treeitem'];
 
-function getExplicitAriaRole(element: Element): string | null {
+function getExplicitAriaRole(element: Element): AriaRole | null {
   // https://www.w3.org/TR/wai-aria-1.2/#document-handling_author-errors_roles
   const roles = (element.getAttribute('role') || '').split(' ').map(role => role.trim());
-  return roles.find(role => validRoles.includes(role)) || null;
+  return roles.find(role => validRoles.includes(role as any)) as AriaRole || null;
 }
 
 function hasPresentationConflictResolution(element: Element, role: string | null) {
@@ -245,7 +240,7 @@ function hasPresentationConflictResolution(element: Element, role: string | null
   return hasGlobalAriaAttribute(element, role) || isFocusable(element);
 }
 
-export function getAriaRole(element: Element): string | null {
+export function getAriaRole(element: Element): AriaRole | null {
   const explicitRole = getExplicitAriaRole(element);
   if (!explicitRole)
     return getImplicitAriaRole(element);
@@ -261,12 +256,16 @@ function getAriaBoolean(attr: string | null) {
   return attr === null ? undefined : attr.toLowerCase() === 'true';
 }
 
+export function isElementIgnoredForAria(element: Element) {
+  return ['STYLE', 'SCRIPT', 'NOSCRIPT', 'TEMPLATE'].includes(elementSafeTagName(element));
+}
+
 // https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion, but including "none" and "presentation" roles
 // Not implemented:
 //   `Any descendants of elements that have the characteristic "Children Presentational: True"`
 // https://www.w3.org/TR/wai-aria-1.2/#aria-hidden
 export function isElementHiddenForAria(element: Element): boolean {
-  if (['STYLE', 'SCRIPT', 'NOSCRIPT', 'TEMPLATE'].includes(elementSafeTagName(element)))
+  if (isElementIgnoredForAria(element))
     return true;
   const style = getElementComputedStyle(element);
   const isSlot = element.nodeName === 'SLOT';
@@ -324,15 +323,15 @@ function getIdRefs(element: Element, ref: string | null): Element[] {
     return [];
   try {
     const ids = ref.split(' ').filter(id => !!id);
-    const set = new Set<Element>();
+    const result: Element[] = [];
     for (const id of ids) {
       // https://www.w3.org/TR/wai-aria-1.2/#mapping_additional_relations_error_processing
       // "If more than one element has the same ID, the user agent SHOULD use the first element found with the given ID"
       const firstElement = root.querySelector('#' + CSS.escape(id));
-      if (firstElement)
-        set.add(firstElement);
+      if (firstElement && !result.includes(firstElement))
+        result.push(firstElement);
     }
-    return [...set];
+    return result;
   } catch (e) {
     return [];
   }
@@ -346,7 +345,7 @@ function trimFlatString(s: string): string {
 function asFlatString(s: string): string {
   // "Flat string" at https://w3c.github.io/accname/#terminology
   // Note that non-breaking spaces are preserved.
-  return s.split('\u00A0').map(chunk => chunk.replace(/\r\n/g, '\n').replace(/\s\s*/g, ' ')).join('\u00A0').trim();
+  return s.split('\u00A0').map(chunk => chunk.replace(/\r\n/g, '\n').replace(/[\u200b\u00ad]/g, '').replace(/\s\s*/g, ' ')).join('\u00A0').trim();
 }
 
 function queryInAriaOwned(element: Element, selector: string): Element[] {
@@ -359,40 +358,91 @@ function queryInAriaOwned(element: Element, selector: string): Element[] {
   return result;
 }
 
-function getPseudoContent(element: Element, pseudo: '::before' | '::after') {
-  const cache = pseudo === '::before' ? cachePseudoContentBefore : cachePseudoContentAfter;
+export function getCSSContent(element: Element, pseudo?: '::before' | '::after') {
+  // Relevant spec: 2.6.2 from https://w3c.github.io/accname/#computation-steps.
+  // Additional considerations: https://github.com/w3c/accname/issues/204.
+  const cache = pseudo === '::before' ? cachePseudoContentBefore : (pseudo === '::after' ? cachePseudoContentAfter : cachePseudoContent);
   if (cache?.has(element))
-    return cache?.get(element) || '';
-  const pseudoStyle = getElementComputedStyle(element, pseudo);
-  const content = getPseudoContentImpl(pseudoStyle);
-  if (cache)
-    cache.set(element, content);
-  return content;
-}
+    return cache?.get(element);
 
-function getPseudoContentImpl(pseudoStyle: CSSStyleDeclaration | undefined) {
-  if (!pseudoStyle)
-    return '';
-  const content = pseudoStyle.content;
-  if ((content[0] === '\'' && content[content.length - 1] === '\'') ||
-    (content[0] === '"' && content[content.length - 1] === '"')) {
-    const unquoted = content.substring(1, content.length - 1);
+  const style = getElementComputedStyle(element, pseudo);
+  let content: string | undefined;
+  if (style && style.display !== 'none' && style.visibility !== 'hidden') {
+    // Note: all browsers ignore display:none and visibility:hidden pseudos.
+    content = parseCSSContentPropertyAsString(element, style.content, !!pseudo);
+  }
+
+  if (pseudo && content !== undefined) {
     // SPEC DIFFERENCE.
     // Spec says "CSS textual content, without a space", but we account for display
     // to pass "name_file-label-inline-block-styles-manual.html"
-    const display = pseudoStyle.display || 'inline';
+    const display = style?.display || 'inline';
     if (display !== 'inline')
-      return ' ' + unquoted + ' ';
-    return unquoted;
+      content =  ' ' + content + ' ';
+  }
+
+  if (cache)
+    cache.set(element, content);
+  return content;
+}
+
+function parseCSSContentPropertyAsString(element: Element, content: string, isPseudo: boolean): string | undefined {
+  // Welcome to the mini CSS parser!
+  // It aims to support the following syntax and any subset of it:
+  // content: "one" attr(...) "two" "three" / "alt" attr(...) "more alt"
+  // See https://developer.mozilla.org/en-US/docs/Web/CSS/content for more details.
+
+  if (!content || content === 'none' || content === 'normal') {
+    // Common fast path.
+    return;
+  }
+
+  try {
+    let tokens = css.tokenize(content).filter(token => !(token instanceof css.WhitespaceToken));
+    const delimIndex = tokens.findIndex(token => token instanceof css.DelimToken && token.value === '/');
+    if (delimIndex !== -1) {
+      // Use the alternative text part when exists.
+      // content: ... / "alternative text"
+      tokens = tokens.slice(delimIndex + 1);
+    } else if (!isPseudo) {
+      // For non-pseudo elements, the only valid content is a url() or various gradients.
+      // Therefore, we follow Chrome and only consider the alternative text.
+      // Firefox, on the other hand, calculates accessible name to be empty.
+      return;
+    }
+
+    const accumulated: string[] = [];
+    let index = 0;
+    while (index < tokens.length) {
+      if (tokens[index] instanceof css.StringToken) {
+        // content: "some text"
+        accumulated.push(tokens[index].value as string);
+        index++;
+      } else if (index + 2 < tokens.length && tokens[index] instanceof css.FunctionToken && tokens[index].value === 'attr' && tokens[index + 1] instanceof css.IdentToken && tokens[index + 2] instanceof css.CloseParenToken) {
+        // content: attr(...)
+        // Firefox does not resolve attribute accessors in content, so we do it manually.
+        const attrName = tokens[index + 1].value as string;
+        accumulated.push(element.getAttribute(attrName) || '');
+        index += 3;
+      } else {
+        // Failed to parse the content, so ignore it.
+        return;
+      }
+    }
+    return accumulated.join('');
+  } catch {
   }
-  return '';
 }
 
 export function getAriaLabelledByElements(element: Element): Element[] | null {
   const ref = element.getAttribute('aria-labelledby');
   if (ref === null)
     return null;
-  return getIdRefs(element, ref);
+  const refs = getIdRefs(element, ref);
+  // step 2b:
+  // "if the current node has an aria-labelledby attribute that contains at least one valid IDREF"
+  // Therefore, if none of the refs match an element, we consider aria-labelledby to be missing.
+  return refs.length ? refs : null;
 }
 
 function allowsNameFromContent(role: string, targetDescendant: boolean) {
@@ -425,10 +475,6 @@ export function getElementAccessibleName(element: Element, includeHidden: boolea
       accessibleName = asFlatString(getTextAlternativeInternal(element, {
         includeHidden,
         visitedElements: new Set(),
-        embeddedInDescribedBy: undefined,
-        embeddedInLabelledBy: undefined,
-        embeddedInLabel: undefined,
-        embeddedInNativeTextAlternative: undefined,
         embeddedInTargetElement: 'self',
       }));
     }
@@ -453,10 +499,6 @@ export function getElementAccessibleDescription(element: Element, includeHidden:
       accessibleDescription = asFlatString(describedBy.map(ref => getTextAlternativeInternal(ref, {
         includeHidden,
         visitedElements: new Set(),
-        embeddedInLabelledBy: undefined,
-        embeddedInLabel: undefined,
-        embeddedInNativeTextAlternative: undefined,
-        embeddedInTargetElement: 'none',
         embeddedInDescribedBy: { element: ref, hidden: isElementHiddenForAria(ref) },
       })).join(' '));
     } else if (element.hasAttribute('aria-description')) {
@@ -474,14 +516,64 @@ export function getElementAccessibleDescription(element: Element, includeHidden:
   return accessibleDescription;
 }
 
+function getAriaInvalid(element: Element): 'false' | 'true' | 'grammar' | 'spelling' {
+  // https://www.w3.org/TR/wai-aria-1.2/#aria-invalid
+  // This state is being deprecated as a global state in ARIA 1.2.
+  // In future versions it will only be allowed on roles where it is specifically supported.
+  const ariaInvalid = element.getAttribute('aria-invalid');
+  if (!ariaInvalid || ariaInvalid.trim() === '' || ariaInvalid.toLocaleLowerCase() === 'false')
+    return 'false';
+  if (ariaInvalid === 'true' || ariaInvalid === 'grammar' || ariaInvalid === 'spelling')
+    return ariaInvalid;
+  return 'true';
+}
+
+function getValidityInvalid(element: Element) {
+  if ('validity' in element){
+    const validity = element.validity as ValidityState | undefined;
+    return validity?.valid === false;
+  }
+  return false;
+}
+
+export function getElementAccessibleErrorMessage(element: Element): string {
+  // SPEC: https://w3c.github.io/aria/#aria-errormessage
+  //
+  // TODO: support https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/validationMessage
+  const cache = cacheAccessibleErrorMessage;
+  let accessibleErrorMessage = cacheAccessibleErrorMessage?.get(element);
+
+  if (accessibleErrorMessage === undefined) {
+    accessibleErrorMessage = '';
+
+    const isAriaInvalid = getAriaInvalid(element) !== 'false';
+    const isValidityInvalid = getValidityInvalid(element);
+    if (isAriaInvalid || isValidityInvalid) {
+      const errorMessageId = element.getAttribute('aria-errormessage');
+      const errorMessages = getIdRefs(element, errorMessageId);
+      // Ideally, this should be a separate "embeddedInErrorMessage", but it would follow the exact same rules.
+      // Relevant vague spec: https://w3c.github.io/core-aam/#ariaErrorMessage.
+      const parts = errorMessages.map(errorMessage => asFlatString(
+          getTextAlternativeInternal(errorMessage, {
+            visitedElements: new Set(),
+            embeddedInDescribedBy: { element: errorMessage, hidden: isElementHiddenForAria(errorMessage) },
+          })
+      ));
+      accessibleErrorMessage = parts.join(' ').trim();
+    }
+    cache?.set(element, accessibleErrorMessage);
+  }
+  return accessibleErrorMessage;
+}
+
 type AccessibleNameOptions = {
-  includeHidden: boolean,
   visitedElements: Set<Element>,
-  embeddedInDescribedBy: { element: Element, hidden: boolean } | undefined,
-  embeddedInLabelledBy: { element: Element, hidden: boolean } | undefined,
-  embeddedInLabel: { element: Element, hidden: boolean } | undefined,
-  embeddedInNativeTextAlternative: { element: Element, hidden: boolean } | undefined,
-  embeddedInTargetElement: 'none' | 'self' | 'descendant',
+  includeHidden?: boolean,
+  embeddedInDescribedBy?: { element: Element, hidden: boolean },
+  embeddedInLabelledBy?: { element: Element, hidden: boolean },
+  embeddedInLabel?: { element: Element, hidden: boolean },
+  embeddedInNativeTextAlternative?: { element: Element, hidden: boolean },
+  embeddedInTargetElement?: 'self' | 'descendant',
 };
 
 function getTextAlternativeInternal(element: Element, options: AccessibleNameOptions): string {
@@ -496,14 +588,17 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
   // step 2a. Hidden Not Referenced: If the current node is hidden and is:
   // Not part of an aria-labelledby or aria-describedby traversal, where the node directly referenced by that relation was hidden.
   // Nor part of a native host language text alternative element (e.g. label in HTML) or attribute traversal, where the root of that traversal was hidden.
-  if (!options.includeHidden &&
-      !options.embeddedInLabelledBy?.hidden &&
-      !options.embeddedInDescribedBy?.hidden &&
-      !options?.embeddedInNativeTextAlternative?.hidden &&
-      !options?.embeddedInLabel?.hidden &&
-      isElementHiddenForAria(element)) {
-    options.visitedElements.add(element);
-    return '';
+  if (!options.includeHidden) {
+    const isEmbeddedInHiddenReferenceTraversal =
+      !!options.embeddedInLabelledBy?.hidden ||
+      !!options.embeddedInDescribedBy?.hidden ||
+      !!options.embeddedInNativeTextAlternative?.hidden ||
+      !!options.embeddedInLabel?.hidden;
+    if (isElementIgnoredForAria(element) ||
+      (!isEmbeddedInHiddenReferenceTraversal && isElementHiddenForAria(element))) {
+      options.visitedElements.add(element);
+      return '';
+    }
   }
 
   const labelledBy = getAriaLabelledByElements(element);
@@ -517,7 +612,7 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
       ...options,
       embeddedInLabelledBy: { element: ref, hidden: isElementHiddenForAria(ref) },
       embeddedInDescribedBy: undefined,
-      embeddedInTargetElement: 'none',
+      embeddedInTargetElement: undefined,
       embeddedInLabel: undefined,
       embeddedInNativeTextAlternative: undefined,
     })).join(' ');
@@ -609,6 +704,18 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
       return title;
     }
 
+    // SPEC DIFFERENCE.
+    // There is no spec for this, but Chromium/WebKit do "Choose File" so we follow that.
+    // All browsers respect labels, aria-labelledby and aria-label.
+    // No browsers respect the title attribute, although w3c accname tests disagree. We follow browsers.
+    if (tagName === 'INPUT' && (element as HTMLInputElement).type === 'file') {
+      options.visitedElements.add(element);
+      const labels = (element as HTMLInputElement).labels || [];
+      if (labels.length && !options.embeddedInLabelledBy)
+        return getAccessibleNameFromAssociatedLabels(labels, options);
+      return 'Choose File';
+    }
+
     // https://w3c.github.io/html-aam/#input-type-image-accessible-name-computation
     //
     // SPEC DIFFERENCE.
@@ -770,42 +877,7 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
       !!options.embeddedInLabelledBy || !!options.embeddedInDescribedBy ||
       !!options.embeddedInLabel || !!options.embeddedInNativeTextAlternative) {
     options.visitedElements.add(element);
-    const tokens: string[] = [];
-    const visit = (node: Node, skipSlotted: boolean) => {
-      if (skipSlotted && (node as Element | Text).assignedSlot)
-        return;
-      if (node.nodeType === 1 /* Node.ELEMENT_NODE */) {
-        const display = getElementComputedStyle(node as Element)?.display || 'inline';
-        let token = getTextAlternativeInternal(node as Element, childOptions);
-        // SPEC DIFFERENCE.
-        // Spec says "append the result to the accumulated text", assuming "with space".
-        // However, multiple tests insist that inline elements do not add a space.
-        // Additionally, <br> insists on a space anyway, see "name_file-label-inline-block-elements-manual.html"
-        if (display !== 'inline' || node.nodeName === 'BR')
-          token = ' ' + token + ' ';
-        tokens.push(token);
-      } else if (node.nodeType === 3 /* Node.TEXT_NODE */) {
-        // step 2g.
-        tokens.push(node.textContent || '');
-      }
-    };
-    tokens.push(getPseudoContent(element, '::before'));
-    const assignedNodes = element.nodeName === 'SLOT' ? (element as HTMLSlotElement).assignedNodes() : [];
-    if (assignedNodes.length) {
-      for (const child of assignedNodes)
-        visit(child, false);
-    } else {
-      for (let child = element.firstChild; child; child = child.nextSibling)
-        visit(child, true);
-      if (element.shadowRoot) {
-        for (let child = element.shadowRoot.firstChild; child; child = child.nextSibling)
-          visit(child, true);
-      }
-      for (const owned of getIdRefs(element, element.getAttribute('aria-owns')))
-        visit(owned, true);
-    }
-    tokens.push(getPseudoContent(element, '::after'));
-    const accessibleName = tokens.join('');
+    const accessibleName = innerAccumulatedElementText(element, childOptions);
     // Spec says "Return the accumulated text if it is not the empty string". However, that is not really
     // compatible with the real browser behavior and wpt tests, where an element with empty contents will fallback to the title.
     // So we follow the spec everywhere except for the target element itself. This can probably be improved.
@@ -826,6 +898,54 @@ function getTextAlternativeInternal(element: Element, options: AccessibleNameOpt
   return '';
 }
 
+function innerAccumulatedElementText(element: Element, options: AccessibleNameOptions): string {
+  const tokens: string[] = [];
+  const visit = (node: Node, skipSlotted: boolean) => {
+    if (skipSlotted && (node as Element | Text).assignedSlot)
+      return;
+    if (node.nodeType === 1 /* Node.ELEMENT_NODE */) {
+      const display = getElementComputedStyle(node as Element)?.display || 'inline';
+      let token = getTextAlternativeInternal(node as Element, options);
+      // SPEC DIFFERENCE.
+      // Spec says "append the result to the accumulated text", assuming "with space".
+      // However, multiple tests insist that inline elements do not add a space.
+      // Additionally, <br> insists on a space anyway, see "name_file-label-inline-block-elements-manual.html"
+      if (display !== 'inline' || node.nodeName === 'BR')
+        token = ' ' + token + ' ';
+      tokens.push(token);
+    } else if (node.nodeType === 3 /* Node.TEXT_NODE */) {
+      // step 2g.
+      tokens.push(node.textContent || '');
+    }
+  };
+  tokens.push(getCSSContent(element, '::before') || '');
+  const content = getCSSContent(element);
+  if (content !== undefined) {
+    // `content` CSS property replaces everything inside the element.
+    // I was not able to find any spec or description on how this interacts with accname,
+    // so this is a guess based on what browsers do.
+    tokens.push(content);
+  } else {
+    // step 2h.
+    const assignedNodes = element.nodeName === 'SLOT' ? (element as HTMLSlotElement).assignedNodes() : [];
+    if (assignedNodes.length) {
+      for (const child of assignedNodes)
+        visit(child, false);
+    } else {
+      for (let child = element.firstChild; child; child = child.nextSibling)
+        visit(child, true);
+      if (element.shadowRoot) {
+        for (let child = element.shadowRoot.firstChild; child; child = child.nextSibling)
+          visit(child, true);
+      }
+      for (const owned of getIdRefs(element, element.getAttribute('aria-owns')))
+        visit(owned, true);
+    }
+  }
+  tokens.push(getCSSContent(element, '::after') || '');
+  return tokens.join('');
+}
+
 export const kAriaSelectedRoles = ['gridcell', 'option', 'row', 'tab', 'rowheader', 'columnheader', 'treeitem'];
 export function getAriaSelected(element: Element): boolean {
   // https://www.w3.org/TR/wai-aria-1.2/#aria-selected
@@ -842,7 +962,17 @@ export function getAriaChecked(element: Element): boolean | 'mixed' {
   const result = getChecked(element, true);
   return result === 'error' ? false : result;
 }
-export function getChecked(element: Element, allowMixed: boolean): boolean | 'mixed' | 'error' {
+
+export function getCheckedAllowMixed(element: Element): boolean | 'mixed' | 'error' {
+  return getChecked(element, true);
+}
+
+export function getCheckedWithoutMixed(element: Element): boolean | 'error' {
+  const result = getChecked(element, false);
+  return result as boolean | 'error';
+}
+
+function getChecked(element: Element, allowMixed: boolean): boolean | 'mixed' | 'error' {
   const tagName = elementSafeTagName(element);
   // https://www.w3.org/TR/wai-aria-1.2/#aria-checked
   // https://www.w3.org/TR/html-aam-1.0/#html-attribute-state-and-property-mappings
@@ -861,6 +991,21 @@ export function getChecked(element: Element, allowMixed: boolean): boolean | 'mi
   return 'error';
 }
 
+// https://w3c.github.io/aria/#aria-readonly
+const kAriaReadonlyRoles = ['checkbox', 'combobox', 'grid', 'gridcell', 'listbox', 'radiogroup', 'slider', 'spinbutton', 'textbox', 'columnheader', 'rowheader', 'searchbox', 'switch', 'treegrid'];
+export function getReadonly(element: Element): boolean | 'error' {
+  const tagName = elementSafeTagName(element);
+  // https://www.w3.org/TR/wai-aria-1.2/#aria-checked
+  // https://www.w3.org/TR/html-aam-1.0/#html-attribute-state-and-property-mappings
+  if (['INPUT', 'TEXTAREA', 'SELECT'].includes(tagName))
+    return element.hasAttribute('readonly');
+  if (kAriaReadonlyRoles.includes(getAriaRole(element) || ''))
+    return element.getAttribute('aria-readonly') === 'true';
+  if ((element as HTMLElement).isContentEditable)
+    return false;
+  return 'error';
+}
+
 export const kAriaPressedRoles = ['button'];
 export function getAriaPressed(element: Element): boolean | 'mixed' {
   // https://www.w3.org/TR/wai-aria-1.2/#aria-pressed
@@ -875,7 +1020,7 @@ export function getAriaPressed(element: Element): boolean | 'mixed' {
 }
 
 export const kAriaExpandedRoles = ['application', 'button', 'checkbox', 'combobox', 'gridcell', 'link', 'listbox', 'menuitem', 'row', 'rowheader', 'tab', 'treeitem', 'columnheader', 'menuitemcheckbox', 'menuitemradio', 'rowheader', 'switch'];
-export function getAriaExpanded(element: Element): boolean | 'none' {
+export function getAriaExpanded(element: Element): boolean | undefined {
   // https://www.w3.org/TR/wai-aria-1.2/#aria-expanded
   // https://www.w3.org/TR/html-aam-1.0/#html-attribute-state-and-property-mappings
   if (elementSafeTagName(element) === 'DETAILS')
@@ -883,12 +1028,12 @@ export function getAriaExpanded(element: Element): boolean | 'none' {
   if (kAriaExpandedRoles.includes(getAriaRole(element) || '')) {
     const expanded = element.getAttribute('aria-expanded');
     if (expanded === null)
-      return 'none';
+      return undefined;
     if (expanded === 'true')
       return true;
     return false;
   }
-  return 'none';
+  return undefined;
 }
 
 export const kAriaLevelRoles = ['heading', 'listitem', 'row', 'treeitem'];
@@ -916,31 +1061,35 @@ export function getAriaDisabled(element: Element): boolean {
 
 function isNativelyDisabled(element: Element) {
   // https://www.w3.org/TR/html-aam-1.0/#html-attribute-state-and-property-mappings
-  const isNativeFormControl = ['BUTTON', 'INPUT', 'SELECT', 'TEXTAREA', 'OPTION', 'OPTGROUP'].includes(element.tagName);
-  return isNativeFormControl && (element.hasAttribute('disabled') || belongsToDisabledFieldSet(element));
+  const isNativeFormControl = ['BUTTON', 'INPUT', 'SELECT', 'TEXTAREA', 'OPTION', 'OPTGROUP'].includes(elementSafeTagName(element));
+  return isNativeFormControl && (element.hasAttribute('disabled') || belongsToDisabledOptGroup(element) || belongsToDisabledFieldSet(element));
 }
 
-function belongsToDisabledFieldSet(element: Element | null): boolean {
-  if (!element)
+function belongsToDisabledOptGroup(element: Element): boolean {
+  return elementSafeTagName(element) === 'OPTION' && !!element.closest('OPTGROUP[DISABLED]');
+}
+
+function belongsToDisabledFieldSet(element: Element): boolean {
+  const fieldSetElement = element?.closest('FIELDSET[DISABLED]');
+  if (!fieldSetElement)
     return false;
-  if (elementSafeTagName(element) === 'FIELDSET' && element.hasAttribute('disabled'))
-    return true;
-  // fieldset does not work across shadow boundaries.
-  return belongsToDisabledFieldSet(element.parentElement);
+  const legendElement = fieldSetElement.querySelector(':scope > LEGEND');
+  return !legendElement || !legendElement.contains(element);
 }
 
-function hasExplicitAriaDisabled(element: Element | undefined): boolean {
+function hasExplicitAriaDisabled(element: Element | undefined, isAncestor = false): boolean {
   if (!element)
     return false;
-  if (kAriaDisabledRoles.includes(getAriaRole(element) || '')) {
+  if (isAncestor || kAriaDisabledRoles.includes(getAriaRole(element) || '')) {
     const attribute = (element.getAttribute('aria-disabled') || '').toLowerCase();
     if (attribute === 'true')
       return true;
     if (attribute === 'false')
       return false;
+    // aria-disabled works across shadow boundaries.
+    return hasExplicitAriaDisabled(parentElementOrShadowHost(element), true);
   }
-  // aria-disabled works across shadow boundaries.
-  return hasExplicitAriaDisabled(parentElementOrShadowHost(element));
+  return false;
 }
 
 function getAccessibleNameFromAssociatedLabels(labels: Iterable<HTMLLabelElement>, options: AccessibleNameOptions) {
@@ -950,17 +1099,54 @@ function getAccessibleNameFromAssociatedLabels(labels: Iterable<HTMLLabelElement
     embeddedInNativeTextAlternative: undefined,
     embeddedInLabelledBy: undefined,
     embeddedInDescribedBy: undefined,
-    embeddedInTargetElement: 'none',
+    embeddedInTargetElement: undefined,
   })).filter(accessibleName => !!accessibleName).join(' ');
 }
 
+export function receivesPointerEvents(element: Element): boolean {
+  const cache = cachePointerEvents!;
+  let e: Element | undefined = element;
+  let result: boolean | undefined;
+  const parents: Element[] = [];
+  for (; e; e = parentElementOrShadowHost(e!)) {
+    const cached = cache.get(e);
+    if (cached !== undefined) {
+      result = cached;
+      break;
+    }
+
+    parents.push(e);
+    const style = getElementComputedStyle(e);
+    if (!style) {
+      result = true;
+      break;
+    }
+
+    const value = style.pointerEvents;
+    if (value) {
+      result = value !== 'none';
+      break;
+    }
+  }
+
+  if (result === undefined)
+    result = true;
+
+  for (const parent of parents)
+    cache.set(parent, result);
+  return result;
+}
+
 let cacheAccessibleName: Map<Element, string> | undefined;
 let cacheAccessibleNameHidden: Map<Element, string> | undefined;
 let cacheAccessibleDescription: Map<Element, string> | undefined;
 let cacheAccessibleDescriptionHidden: Map<Element, string> | undefined;
+let cacheAccessibleErrorMessage: Map<Element, string> | undefined;
 let cacheIsHidden: Map<Element, boolean> | undefined;
-let cachePseudoContentBefore: Map<Element, string> | undefined;
-let cachePseudoContentAfter: Map<Element, string> | undefined;
+let cachePseudoContent: Map<Element, string | undefined> | undefined;
+let cachePseudoContentBefore: Map<Element, string | undefined> | undefined;
+let cachePseudoContentAfter: Map<Element, string | undefined> | undefined;
+let cachePointerEvents: Map<Element, boolean> | undefined;
 let cachesCounter = 0;
 
 export function beginAriaCaches() {
@@ -969,9 +1155,12 @@ export function beginAriaCaches() {
   cacheAccessibleNameHidden ??= new Map();
   cacheAccessibleDescription ??= new Map();
   cacheAccessibleDescriptionHidden ??= new Map();
+  cacheAccessibleErrorMessage ??= new Map();
   cacheIsHidden ??= new Map();
+  cachePseudoContent ??= new Map();
   cachePseudoContentBefore ??= new Map();
   cachePseudoContentAfter ??= new Map();
+  cachePointerEvents ??= new Map();
 }
 
 export function endAriaCaches() {
@@ -980,8 +1169,22 @@ export function endAriaCaches() {
     cacheAccessibleNameHidden = undefined;
     cacheAccessibleDescription = undefined;
     cacheAccessibleDescriptionHidden = undefined;
+    cacheAccessibleErrorMessage = undefined;
     cacheIsHidden = undefined;
+    cachePseudoContent = undefined;
     cachePseudoContentBefore = undefined;
     cachePseudoContentAfter = undefined;
+    cachePointerEvents = undefined;
   }
 }
+
+const inputTypeToRole: Record<string, AriaRole> = {
+  'button': 'button',
+  'checkbox': 'checkbox',
+  'image': 'button',
+  'number': 'spinbutton',
+  'radio': 'radio',
+  'range': 'slider',
+  'reset': 'button',
+  'submit': 'button',
+};
diff --git a/packages/playwright-core/src/server/injected/selectorEngine.ts b/packages/injected/src/selectorEngine.ts
similarity index 100%
rename from packages/playwright-core/src/server/injected/selectorEngine.ts
rename to packages/injected/src/selectorEngine.ts
diff --git a/packages/playwright-core/src/server/injected/selectorEvaluator.ts b/packages/injected/src/selectorEvaluator.ts
similarity index 94%
rename from packages/playwright-core/src/server/injected/selectorEvaluator.ts
rename to packages/injected/src/selectorEvaluator.ts
index d2f481526fd95..c02aa73c147e3 100644
--- a/packages/playwright-core/src/server/injected/selectorEvaluator.ts
+++ b/packages/injected/src/selectorEvaluator.ts
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-import type { CSSComplexSelector, CSSSimpleSelector, CSSComplexSelectorList, CSSFunctionArgument } from '../../utils/isomorphic/cssParser';
-import { customCSSNames } from '../../utils/isomorphic/selectorParser';
+import { customCSSNames } from '@isomorphic/selectorParser';
+import { normalizeWhiteSpace } from '@isomorphic/stringUtils';
+
 import { isElementVisible, parentElementOrShadowHost } from './domUtils';
-import { type LayoutSelectorName, layoutSelectorScore } from './layoutSelectorUtils';
-import { elementMatchesText, elementText, shouldSkipForTextMatching, type ElementText } from './selectorUtils';
-import { normalizeWhiteSpace } from '../../utils/isomorphic/stringUtils';
+import { layoutSelectorScore } from './layoutSelectorUtils';
+import { elementMatchesText, elementText, shouldSkipForTextMatching } from './selectorUtils';
+
+import type { CSSComplexSelector, CSSComplexSelectorList, CSSFunctionArgument, CSSSimpleSelector } from '@isomorphic/cssParser';
+import type { LayoutSelectorName } from './layoutSelectorUtils';
+import type { ElementText } from './selectorUtils';
 
 type QueryContext = {
   scope: Element | Document;
@@ -39,23 +43,33 @@ export interface SelectorEngine {
 }
 
 type QueryCache = Map<any, { rest: any[], result: any }[]>;
+
 export class SelectorEvaluatorImpl implements SelectorEvaluator {
-  private _engines = new Map<string, SelectorEngine>();
-  private _cacheQueryCSS: QueryCache = new Map();
-  private _cacheMatches: QueryCache = new Map();
-  private _cacheQuery: QueryCache = new Map();
-  private _cacheMatchesSimple: QueryCache = new Map();
-  private _cacheMatchesParents: QueryCache = new Map();
-  private _cacheCallMatches: QueryCache = new Map();
-  private _cacheCallQuery: QueryCache = new Map();
-  private _cacheQuerySimple: QueryCache = new Map();
-  _cacheText = new Map<Element | ShadowRoot, ElementText>();
+  private _engines: Map<string, SelectorEngine>;
+  private _cacheQueryCSS: QueryCache;
+  private _cacheMatches: QueryCache;
+  private _cacheQuery: QueryCache;
+  private _cacheMatchesSimple: QueryCache;
+  private _cacheMatchesParents: QueryCache;
+  private _cacheCallMatches: QueryCache;
+  private _cacheCallQuery: QueryCache;
+  private _cacheQuerySimple: QueryCache;
+  _cacheText: Map<Element | ShadowRoot, ElementText>;
   private _scoreMap: Map<Element, number> | undefined;
   private _retainCacheCounter = 0;
 
-  constructor(extraEngines: Map<string, SelectorEngine>) {
-    for (const [name, engine] of extraEngines)
-      this._engines.set(name, engine);
+  constructor() {
+    this._cacheText = new Map();
+    this._cacheQueryCSS = new Map();
+    this._cacheMatches = new Map();
+    this._cacheQuery = new Map();
+    this._cacheMatchesSimple = new Map();
+    this._cacheMatchesParents = new Map();
+    this._cacheCallMatches = new Map();
+    this._cacheCallQuery = new Map();
+    this._cacheQuerySimple = new Map();
+
+    this._engines = new Map();
     this._engines.set('not', notEngine);
     this._engines.set('is', isEngine);
     this._engines.set('where', isEngine);
diff --git a/packages/playwright-core/src/server/injected/selectorGenerator.ts b/packages/injected/src/selectorGenerator.ts
similarity index 78%
rename from packages/playwright-core/src/server/injected/selectorGenerator.ts
rename to packages/injected/src/selectorGenerator.ts
index 7aa22e6f0cdb5..a7dad6644fb0b 100644
--- a/packages/playwright-core/src/server/injected/selectorGenerator.ts
+++ b/packages/injected/src/selectorGenerator.ts
@@ -14,20 +14,24 @@
  * limitations under the License.
  */
 
-import { cssEscape, escapeForAttributeSelector, escapeForTextSelector, escapeRegExp, quoteCSSAttributeValue } from '../../utils/isomorphic/stringUtils';
+import { escapeForAttributeSelector, escapeForTextSelector, escapeRegExp, quoteCSSAttributeValue } from '@isomorphic/stringUtils';
+
 import { closestCrossShadow, isElementVisible, isInsideScope, parentElementOrShadowHost } from './domUtils';
-import type { InjectedScript } from './injectedScript';
-import { getAriaRole, getElementAccessibleName, beginAriaCaches, endAriaCaches } from './roleUtils';
+import { beginAriaCaches, endAriaCaches, getAriaRole, getElementAccessibleName } from './roleUtils';
 import { elementText, getElementLabels } from './selectorUtils';
 
+import type { InjectedScript } from './injectedScript';
+
 type SelectorToken = {
   engine: string;
   selector: string;
   score: number;  // Lower is better.
 };
 
-const cacheAllowText = new Map<Element, SelectorToken[] | null>();
-const cacheDisallowText = new Map<Element, SelectorToken[] | null>();
+type Cache = {
+  allowText: Map<Element, SelectorToken[] | null>;
+  disallowText: Map<Element, SelectorToken[] | null>;
+};
 
 const kTextScoreRange = 10;
 const kExactPenalty = kTextScoreRange / 2;
@@ -38,9 +42,9 @@ const kOtherTestIdScore = 2;   // other data-test* attributes
 const kIframeByAttributeScore = 10;
 
 const kBeginPenalizedScore = 50;
-const kPlaceholderScore = 100;
-const kLabelScore = 120;
-const kRoleWithNameScore = 140;
+const kRoleWithNameScore = 100;
+const kPlaceholderScore = 120;
+const kLabelScore = 140;
 const kAltTextScore = 160;
 const kTextScore = 180;
 const kTitleScore = 200;
@@ -72,13 +76,14 @@ export type GenerateSelectorOptions = {
 
 export function generateSelector(injectedScript: InjectedScript, targetElement: Element, options: GenerateSelectorOptions): { selector: string, selectors: string[], elements: Element[] } {
   injectedScript._evaluator.begin();
+  const cache: Cache = { allowText: new Map(), disallowText: new Map() };
   beginAriaCaches();
   try {
     let selectors: string[] = [];
     if (options.forTextExpect) {
       let targetTokens = cssFallback(injectedScript, targetElement.ownerDocument.documentElement, options);
       for (let element: Element | undefined = targetElement; element; element = parentElementOrShadowHost(element)) {
-        const tokens = generateSelectorFor(injectedScript, element, { ...options, noText: true });
+        const tokens = generateSelectorFor(cache, injectedScript, element, { ...options, noText: true });
         if (!tokens)
           continue;
         const score = combineScores(tokens);
@@ -96,18 +101,18 @@ export function generateSelector(injectedScript: InjectedScript, targetElement:
           targetElement = interactiveParent;
       }
       if (options.multiple) {
-        const withText = generateSelectorFor(injectedScript, targetElement, options);
-        const withoutText = generateSelectorFor(injectedScript, targetElement, { ...options, noText: true });
+        const withText = generateSelectorFor(cache, injectedScript, targetElement, options);
+        const withoutText = generateSelectorFor(cache, injectedScript, targetElement, { ...options, noText: true });
         let tokens = [withText, withoutText];
 
         // Clear cache to re-generate without css id.
-        cacheAllowText.clear();
-        cacheDisallowText.clear();
+        cache.allowText.clear();
+        cache.disallowText.clear();
 
         if (withText && hasCSSIdToken(withText))
-          tokens.push(generateSelectorFor(injectedScript, targetElement, { ...options, noCSSId: true }));
+          tokens.push(generateSelectorFor(cache, injectedScript, targetElement, { ...options, noCSSId: true }));
         if (withoutText && hasCSSIdToken(withoutText))
-          tokens.push(generateSelectorFor(injectedScript, targetElement, { ...options, noText: true, noCSSId: true }));
+          tokens.push(generateSelectorFor(cache, injectedScript, targetElement, { ...options, noText: true, noCSSId: true }));
 
         tokens = tokens.filter(Boolean);
         if (!tokens.length) {
@@ -118,7 +123,7 @@ export function generateSelector(injectedScript: InjectedScript, targetElement:
         }
         selectors = [...new Set(tokens.map(t => joinTokens(t!)))];
       } else {
-        const targetTokens = generateSelectorFor(injectedScript, targetElement, options) || cssFallback(injectedScript, targetElement, options);
+        const targetTokens = generateSelectorFor(cache, injectedScript, targetElement, options) || cssFallback(injectedScript, targetElement, options);
         selectors = [joinTokens(targetTokens)];
       }
     }
@@ -130,8 +135,6 @@ export function generateSelector(injectedScript: InjectedScript, targetElement:
       elements: injectedScript.querySelectorAll(parsedSelector, options.root ?? targetElement.ownerDocument)
     };
   } finally {
-    cacheAllowText.clear();
-    cacheDisallowText.clear();
     endAriaCaches();
     injectedScript._evaluator.end();
   }
@@ -144,7 +147,7 @@ function filterRegexTokens(textCandidates: SelectorToken[][]): SelectorToken[][]
 
 type InternalOptions = GenerateSelectorOptions & { noText?: boolean, noCSSId?: boolean };
 
-function generateSelectorFor(injectedScript: InjectedScript, targetElement: Element, options: InternalOptions): SelectorToken[] | null {
+function generateSelectorFor(cache: Cache, injectedScript: InjectedScript, targetElement: Element, options: InternalOptions): SelectorToken[] | null {
   if (options.root && !isInsideScope(options.root, targetElement))
     throw new Error(`Target element must belong to the root's subtree`);
 
@@ -214,11 +217,11 @@ function generateSelectorFor(injectedScript: InjectedScript, targetElement: Elem
   };
 
   const calculateCached = (element: Element, allowText: boolean): SelectorToken[] | null => {
-    const cache = allowText ? cacheAllowText : cacheDisallowText;
-    let value = cache.get(element);
+    const map = allowText ? cache.allowText : cache.disallowText;
+    let value = map.get(element);
     if (value === undefined) {
       value = calculate(element, allowText);
-      cache.set(element, value);
+      map.set(element, value);
     }
     return value;
   };
@@ -242,13 +245,13 @@ function buildNoTextCandidates(injectedScript: InjectedScript, element: Element,
         candidates.push({ engine: 'css', selector: makeSelectorForId(idAttr), score: kCSSIdScore });
     }
 
-    candidates.push({ engine: 'css', selector: cssEscape(element.nodeName.toLowerCase()), score: kCSSTagNameScore });
+    candidates.push({ engine: 'css', selector: escapeNodeName(element), score: kCSSTagNameScore });
   }
 
   if (element.nodeName === 'IFRAME') {
     for (const attribute of ['name', 'title']) {
       if (element.getAttribute(attribute))
-        candidates.push({ engine: 'css', selector: `${cssEscape(element.nodeName.toLowerCase())}[${attribute}=${quoteCSSAttributeValue(element.getAttribute(attribute)!)}]`, score: kIframeByAttributeScore });
+        candidates.push({ engine: 'css', selector: `${escapeNodeName(element)}[${attribute}=${quoteCSSAttributeValue(element.getAttribute(attribute)!)}]`, score: kIframeByAttributeScore });
     }
 
     // Locate by testId via CSS selector.
@@ -268,7 +271,7 @@ function buildNoTextCandidates(injectedScript: InjectedScript, element: Element,
     if (input.placeholder) {
       candidates.push({ engine: 'internal:attr', selector: `[placeholder=${escapeForAttributeSelector(input.placeholder, true)}]`, score: kPlaceholderScoreExact });
       for (const alternative of suitableTextAlternatives(input.placeholder))
-        candidates.push({ engine: 'internal:attr', selector: `[placeholder=${escapeForAttributeSelector(alternative.text, false)}]`, score: kPlaceholderScore - alternative.scoreBouns });
+        candidates.push({ engine: 'internal:attr', selector: `[placeholder=${escapeForAttributeSelector(alternative.text, false)}]`, score: kPlaceholderScore - alternative.scoreBonus });
     }
   }
 
@@ -277,7 +280,7 @@ function buildNoTextCandidates(injectedScript: InjectedScript, element: Element,
     const labelText = label.normalized;
     candidates.push({ engine: 'internal:label', selector: escapeForTextSelector(labelText, true), score: kLabelScoreExact });
     for (const alternative of suitableTextAlternatives(labelText))
-      candidates.push({ engine: 'internal:label', selector: escapeForTextSelector(alternative.text, false), score: kLabelScore - alternative.scoreBouns });
+      candidates.push({ engine: 'internal:label', selector: escapeForTextSelector(alternative.text, false), score: kLabelScore - alternative.scoreBonus });
   }
 
   const ariaRole = getAriaRole(element);
@@ -285,15 +288,15 @@ function buildNoTextCandidates(injectedScript: InjectedScript, element: Element,
     candidates.push({ engine: 'internal:role', selector: ariaRole, score: kRoleWithoutNameScore });
 
   if (element.getAttribute('name') && ['BUTTON', 'FORM', 'FIELDSET', 'FRAME', 'IFRAME', 'INPUT', 'KEYGEN', 'OBJECT', 'OUTPUT', 'SELECT', 'TEXTAREA', 'MAP', 'META', 'PARAM'].includes(element.nodeName))
-    candidates.push({ engine: 'css', selector: `${cssEscape(element.nodeName.toLowerCase())}[name=${quoteCSSAttributeValue(element.getAttribute('name')!)}]`, score: kCSSInputTypeNameScore });
+    candidates.push({ engine: 'css', selector: `${escapeNodeName(element)}[name=${quoteCSSAttributeValue(element.getAttribute('name')!)}]`, score: kCSSInputTypeNameScore });
 
   if (['INPUT', 'TEXTAREA'].includes(element.nodeName) && element.getAttribute('type') !== 'hidden') {
     if (element.getAttribute('type'))
-      candidates.push({ engine: 'css', selector: `${cssEscape(element.nodeName.toLowerCase())}[type=${quoteCSSAttributeValue(element.getAttribute('type')!)}]`, score: kCSSInputTypeNameScore });
+      candidates.push({ engine: 'css', selector: `${escapeNodeName(element)}[type=${quoteCSSAttributeValue(element.getAttribute('type')!)}]`, score: kCSSInputTypeNameScore });
   }
 
   if (['INPUT', 'TEXTAREA', 'SELECT'].includes(element.nodeName) && element.getAttribute('type') !== 'hidden')
-    candidates.push({ engine: 'css', selector: cssEscape(element.nodeName.toLowerCase()), score: kCSSInputTypeNameScore + 1 });
+    candidates.push({ engine: 'css', selector: escapeNodeName(element), score: kCSSInputTypeNameScore + 1 });
 
   penalizeScoreForLength([candidates]);
   return candidates;
@@ -308,28 +311,28 @@ function buildTextCandidates(injectedScript: InjectedScript, element: Element, i
   if (title) {
     candidates.push([{ engine: 'internal:attr', selector: `[title=${escapeForAttributeSelector(title, true)}]`, score: kTitleScoreExact }]);
     for (const alternative of suitableTextAlternatives(title))
-      candidates.push([{ engine: 'internal:attr', selector: `[title=${escapeForAttributeSelector(alternative.text, false)}]`, score: kTitleScore - alternative.scoreBouns }]);
+      candidates.push([{ engine: 'internal:attr', selector: `[title=${escapeForAttributeSelector(alternative.text, false)}]`, score: kTitleScore - alternative.scoreBonus }]);
   }
 
   const alt = element.getAttribute('alt');
   if (alt && ['APPLET', 'AREA', 'IMG', 'INPUT'].includes(element.nodeName)) {
     candidates.push([{ engine: 'internal:attr', selector: `[alt=${escapeForAttributeSelector(alt, true)}]`, score: kAltTextScoreExact }]);
     for (const alternative of suitableTextAlternatives(alt))
-      candidates.push([{ engine: 'internal:attr', selector: `[alt=${escapeForAttributeSelector(alternative.text, false)}]`, score: kAltTextScore - alternative.scoreBouns }]);
+      candidates.push([{ engine: 'internal:attr', selector: `[alt=${escapeForAttributeSelector(alternative.text, false)}]`, score: kAltTextScore - alternative.scoreBonus }]);
   }
 
   const text = elementText(injectedScript._evaluator._cacheText, element).normalized;
+  const textAlternatives = text ? suitableTextAlternatives(text) : [];
   if (text) {
-    const alternatives = suitableTextAlternatives(text);
     if (isTargetNode) {
       if (text.length <= 80)
         candidates.push([{ engine: 'internal:text', selector: escapeForTextSelector(text, true), score: kTextScoreExact }]);
-      for (const alternative of alternatives)
-        candidates.push([{ engine: 'internal:text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBouns }]);
+      for (const alternative of textAlternatives)
+        candidates.push([{ engine: 'internal:text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBonus }]);
     }
-    const cssToken: SelectorToken = { engine: 'css', selector: cssEscape(element.nodeName.toLowerCase()), score: kCSSTagNameScore };
-    for (const alternative of alternatives)
-      candidates.push([cssToken, { engine: 'internal:has-text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBouns }]);
+    const cssToken: SelectorToken = { engine: 'css', selector: escapeNodeName(element), score: kCSSTagNameScore };
+    for (const alternative of textAlternatives)
+      candidates.push([cssToken, { engine: 'internal:has-text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBonus }]);
     if (text.length <= 80) {
       const re = new RegExp('^' + escapeRegExp(text) + '$');
       candidates.push([cssToken, { engine: 'internal:has-text', selector: escapeForTextSelector(re, false), score: kTextScoreRegex }]);
@@ -340,9 +343,18 @@ function buildTextCandidates(injectedScript: InjectedScript, element: Element, i
   if (ariaRole && !['none', 'presentation'].includes(ariaRole)) {
     const ariaName = getElementAccessibleName(element, false);
     if (ariaName) {
-      candidates.push([{ engine: 'internal:role', selector: `${ariaRole}[name=${escapeForAttributeSelector(ariaName, true)}]`, score: kRoleWithNameScoreExact }]);
+      const roleToken = { engine: 'internal:role', selector: `${ariaRole}[name=${escapeForAttributeSelector(ariaName, true)}]`, score: kRoleWithNameScoreExact };
+      candidates.push([roleToken]);
       for (const alternative of suitableTextAlternatives(ariaName))
-        candidates.push([{ engine: 'internal:role', selector: `${ariaRole}[name=${escapeForAttributeSelector(alternative.text, false)}]`, score: kRoleWithNameScore - alternative.scoreBouns }]);
+        candidates.push([{ engine: 'internal:role', selector: `${ariaRole}[name=${escapeForAttributeSelector(alternative.text, false)}]`, score: kRoleWithNameScore - alternative.scoreBonus }]);
+    } else {
+      const roleToken = { engine: 'internal:role', selector: `${ariaRole}`, score: kRoleWithoutNameScore };
+      for (const alternative of textAlternatives)
+        candidates.push([roleToken, { engine: 'internal:has-text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBonus }]);
+      if (text.length <= 80) {
+        const re = new RegExp('^' + escapeRegExp(text) + '$');
+        candidates.push([roleToken, { engine: 'internal:has-text', selector: escapeForTextSelector(re, false), score: kTextScoreRegex }]);
+      }
     }
   }
 
@@ -351,7 +363,7 @@ function buildTextCandidates(injectedScript: InjectedScript, element: Element, i
 }
 
 function makeSelectorForId(id: string) {
-  return /^[a-zA-Z][a-zA-Z0-9\-\_]+$/.test(id) ? '#' + id : `[id="${cssEscape(id)}"]`;
+  return /^[a-zA-Z][a-zA-Z0-9\-\_]+$/.test(id) ? '#' + id : `[id=${quoteCSSAttributeValue(id)}]`;
 }
 
 function hasCSSIdToken(tokens: SelectorToken[]) {
@@ -383,8 +395,6 @@ function cssFallback(injectedScript: InjectedScript, targetElement: Element, opt
   }
 
   for (let element: Element | undefined = targetElement; element && element !== root; element = parentElementOrShadowHost(element)) {
-    const nodeName = element.nodeName.toLowerCase();
-
     let bestTokenForLevel: string = '';
 
     // Element ID is the strongest signal, use it.
@@ -399,9 +409,9 @@ function cssFallback(injectedScript: InjectedScript, targetElement: Element, opt
     const parent = element.parentNode as (Element | ShadowRoot);
 
     // Combine class names until unique.
-    const classes = [...element.classList];
+    const classes = [...element.classList].map(escapeClassName);
     for (let i = 0; i < classes.length; ++i) {
-      const token = '.' + cssEscape(classes.slice(0, i + 1).join('.'));
+      const token = '.' + classes.slice(0, i + 1).join('.');
       const selector = uniqueCSSSelector(token);
       if (selector)
         return makeStrict(selector);
@@ -416,15 +426,16 @@ function cssFallback(injectedScript: InjectedScript, targetElement: Element, opt
     // Ordinal is the weakest signal.
     if (parent) {
       const siblings = [...parent.children];
-      const sameTagSiblings = siblings.filter(sibling => (sibling).nodeName.toLowerCase() === nodeName);
-      const token = sameTagSiblings.indexOf(element) === 0 ? cssEscape(nodeName) : `${cssEscape(nodeName)}:nth-child(${1 + siblings.indexOf(element)})`;
+      const nodeName = element.nodeName;
+      const sameTagSiblings = siblings.filter(sibling => sibling.nodeName === nodeName);
+      const token = sameTagSiblings.indexOf(element) === 0 ? escapeNodeName(element) : `${escapeNodeName(element)}:nth-child(${1 + siblings.indexOf(element)})`;
       const selector = uniqueCSSSelector(token);
       if (selector)
         return makeStrict(selector);
       if (!bestTokenForLevel)
         bestTokenForLevel = token;
     } else if (!bestTokenForLevel) {
-      bestTokenForLevel = cssEscape(nodeName);
+      bestTokenForLevel = escapeNodeName(element);
     }
     tokens.unshift(bestTokenForLevel);
   }
@@ -527,14 +538,14 @@ function trimWordBoundary(text: string, maxLength: number) {
 }
 
 function suitableTextAlternatives(text: string) {
-  let result: { text: string, scoreBouns: number }[] = [];
+  let result: { text: string, scoreBonus: number }[] = [];
 
   {
     const match = text.match(/^([\d.,]+)[^.,\w]/);
     const leadingNumberLength = match ? match[1].length : 0;
     if (leadingNumberLength) {
       const alt = trimWordBoundary(text.substring(leadingNumberLength).trimStart(), 80);
-      result.push({ text: alt, scoreBouns: alt.length <= 30 ? 2 : 1 });
+      result.push({ text: alt, scoreBonus: alt.length <= 30 ? 2 : 1 });
     }
   }
 
@@ -543,20 +554,49 @@ function suitableTextAlternatives(text: string) {
     const trailingNumberLength = match ? match[1].length : 0;
     if (trailingNumberLength) {
       const alt = trimWordBoundary(text.substring(0, text.length - trailingNumberLength).trimEnd(), 80);
-      result.push({ text: alt, scoreBouns: alt.length <= 30 ? 2 : 1 });
+      result.push({ text: alt, scoreBonus: alt.length <= 30 ? 2 : 1 });
     }
   }
 
   if (text.length <= 30) {
-    result.push({ text, scoreBouns: 0 });
+    result.push({ text, scoreBonus: 0 });
   } else {
-    result.push({ text: trimWordBoundary(text, 80), scoreBouns: 0 });
-    result.push({ text: trimWordBoundary(text, 30), scoreBouns: 1 });
+    result.push({ text: trimWordBoundary(text, 80), scoreBonus: 0 });
+    result.push({ text: trimWordBoundary(text, 30), scoreBonus: 1 });
   }
 
   result = result.filter(r => r.text);
   if (!result.length)
-    result.push({ text: text.substring(0, 80), scoreBouns: 0 });
+    result.push({ text: text.substring(0, 80), scoreBonus: 0 });
 
   return result;
 }
+
+function escapeNodeName(node: Node): string {
+  // We are escaping it for document.querySelectorAll, not for usage in CSS file.
+  return node.nodeName.toLocaleLowerCase().replace(/[:\.]/g, char => '\\' + char);
+}
+
+function escapeClassName(className: string): string {
+  // We are escaping class names for document.querySelectorAll by following CSS.escape() rules.
+  let result = '';
+  for (let i = 0; i < className.length; i++)
+    result += cssEscapeCharacter(className, i);
+  return result;
+}
+
+function cssEscapeCharacter(s: string, i: number): string {
+  // https://drafts.csswg.org/cssom/#serialize-an-identifier
+  const c = s.charCodeAt(i);
+  if (c === 0x0000)
+    return '\uFFFD';
+  if ((c >= 0x0001 && c <= 0x001f) ||
+      (c >= 0x0030 && c <= 0x0039 && (i === 0 || (i === 1 && s.charCodeAt(0) === 0x002d))))
+    return '\\' + c.toString(16) + ' ';
+  if (i === 0 && c === 0x002d && s.length === 1)
+    return '\\' + s.charAt(i);
+  if (c >= 0x0080 || c === 0x002d || c === 0x005f || (c >= 0x0030 && c <= 0x0039) ||
+      (c >= 0x0041 && c <= 0x005a) || (c >= 0x0061 && c <= 0x007a))
+    return s.charAt(i);
+  return '\\' + s.charAt(i);
+}
diff --git a/packages/playwright-core/src/server/injected/selectorUtils.ts b/packages/injected/src/selectorUtils.ts
similarity index 95%
rename from packages/playwright-core/src/server/injected/selectorUtils.ts
rename to packages/injected/src/selectorUtils.ts
index 746e12af9d177..6466e1b7b02a3 100644
--- a/packages/playwright-core/src/server/injected/selectorUtils.ts
+++ b/packages/injected/src/selectorUtils.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import type { AttributeSelectorPart } from '../../utils/isomorphic/selectorParser';
-import { normalizeWhiteSpace } from '../../utils/isomorphic/stringUtils';
+import { normalizeWhiteSpace } from '@isomorphic/stringUtils';
+
 import { getAriaLabelledByElements } from './roleUtils';
 
+import type { AttributeSelectorPart } from '@isomorphic/selectorParser';
+
 export function matchesComponentAttribute(obj: any, attr: AttributeSelectorPart) {
   for (const token of attr.jsonPath) {
     if (obj !== undefined && obj !== null)
@@ -73,6 +75,8 @@ export function elementText(cache: Map<Element | ShadowRoot, ElementText>, root:
           if (child.nodeType === Node.TEXT_NODE) {
             value.full += child.nodeValue || '';
             currentImmediate += child.nodeValue || '';
+          } else if (child.nodeType === Node.COMMENT_NODE) {
+            continue;
           } else {
             if (currentImmediate)
               value.immediate.push(currentImmediate);
diff --git a/packages/injected/src/storageScript.ts b/packages/injected/src/storageScript.ts
new file mode 100644
index 0000000000000..6f25ce96693ee
--- /dev/null
+++ b/packages/injected/src/storageScript.ts
@@ -0,0 +1,210 @@
+/**
+ * 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 { parseEvaluationResultValue, serializeAsCallArgument } from '@isomorphic/utilityScriptSerializers';
+
+import type * as channels from '@protocol/channels';
+
+export type SerializedStorage = Omit<channels.OriginStorage, 'origin'>;
+
+export class StorageScript {
+  private _isFirefox: boolean;
+  private _global;
+
+  constructor(isFirefox: boolean) {
+    this._isFirefox = isFirefox;
+    // eslint-disable-next-line no-restricted-globals
+    this._global = globalThis;
+  }
+
+  private _idbRequestToPromise<T extends IDBOpenDBRequest | IDBRequest>(request: T) {
+    return new Promise<T['result']>((resolve, reject) => {
+      request.addEventListener('success', () => resolve(request.result));
+      request.addEventListener('error', () => reject(request.error));
+    });
+  }
+
+  private _isPlainObject(v: any) {
+    const ctor = v?.constructor;
+    if (this._isFirefox) {
+      const constructorImpl = ctor?.toString() as string | undefined;
+      if (constructorImpl?.startsWith('function Object() {') && constructorImpl?.includes('[native code]'))
+        return true;
+    }
+    return ctor === Object;
+  }
+
+  private _trySerialize(value: any): { trivial?: any, encoded?: any } {
+    let trivial = true;
+    const encoded = serializeAsCallArgument(value, v => {
+      const isTrivial = (
+        this._isPlainObject(v)
+        || Array.isArray(v)
+        || typeof v === 'string'
+        || typeof v === 'number'
+        || typeof v === 'boolean'
+        || Object.is(v, null)
+      );
+
+      if (!isTrivial)
+        trivial = false;
+
+      return { fallThrough: v };
+    });
+    if (trivial)
+      return { trivial: value };
+    return { encoded };
+  }
+
+  private async _collectDB(dbInfo: IDBDatabaseInfo) {
+    if (!dbInfo.name)
+      throw new Error('Database name is empty');
+    if (!dbInfo.version)
+      throw new Error('Database version is unset');
+
+    const db = await this._idbRequestToPromise(indexedDB.open(dbInfo.name));
+    if (db.objectStoreNames.length === 0)
+      return { name: dbInfo.name, version: dbInfo.version, stores: [] };
+
+    const transaction = db.transaction(db.objectStoreNames, 'readonly');
+    const stores = await Promise.all([...db.objectStoreNames].map(async storeName => {
+      const objectStore = transaction.objectStore(storeName);
+
+      const keys = await this._idbRequestToPromise(objectStore.getAllKeys());
+      const records = await Promise.all(keys.map(async key => {
+        const record: channels.IndexedDBDatabase['stores'][0]['records'][0] = {};
+
+        if (objectStore.keyPath === null) {
+          const { encoded, trivial } = this._trySerialize(key);
+          if (trivial)
+            record.key = trivial;
+          else
+            record.keyEncoded = encoded;
+        }
+
+        const value = await this._idbRequestToPromise(objectStore.get(key));
+        const { encoded, trivial } = this._trySerialize(value);
+        if (trivial)
+          record.value = trivial;
+        else
+          record.valueEncoded = encoded;
+
+        return record;
+      }));
+
+      const indexes = [...objectStore.indexNames].map(indexName => {
+        const index = objectStore.index(indexName);
+        return {
+          name: index.name,
+          keyPath: typeof index.keyPath === 'string' ? index.keyPath : undefined,
+          keyPathArray: Array.isArray(index.keyPath) ? index.keyPath : undefined,
+          multiEntry: index.multiEntry,
+          unique: index.unique,
+        };
+      });
+
+      return {
+        name: storeName,
+        records: records,
+        indexes,
+        autoIncrement: objectStore.autoIncrement,
+        keyPath: typeof objectStore.keyPath === 'string' ? objectStore.keyPath : undefined,
+        keyPathArray: Array.isArray(objectStore.keyPath) ? objectStore.keyPath : undefined,
+      };
+    }));
+
+    return {
+      name: dbInfo.name,
+      version: dbInfo.version,
+      stores,
+    };
+  }
+
+  async collect(recordIndexedDB: boolean): Promise<SerializedStorage> {
+    const localStorage = Object.keys(this._global.localStorage).map(name => ({ name, value: this._global.localStorage.getItem(name)! }));
+    if (!recordIndexedDB)
+      return { localStorage };
+    try {
+      const databases = await this._global.indexedDB.databases();
+      const indexedDB = await Promise.all(databases.map(db => this._collectDB(db)));
+      return { localStorage, indexedDB };
+    } catch (e) {
+      throw new Error('Unable to serialize IndexedDB: ' + e.message);
+    }
+  }
+
+  private async _restoreDB(dbInfo: channels.IndexedDBDatabase) {
+    const openRequest = this._global.indexedDB.open(dbInfo.name, dbInfo.version);
+    openRequest.addEventListener('upgradeneeded', () => {
+      const db = openRequest.result;
+      for (const store of dbInfo.stores) {
+        const objectStore = db.createObjectStore(store.name, { autoIncrement: store.autoIncrement, keyPath: store.keyPathArray ?? store.keyPath });
+        for (const index of store.indexes)
+          objectStore.createIndex(index.name, index.keyPathArray ?? index.keyPath!, { unique: index.unique, multiEntry: index.multiEntry });
+      }
+    });
+
+    // after `upgradeneeded` finishes, `success` event is fired.
+    const db = await this._idbRequestToPromise(openRequest);
+
+    if (db.objectStoreNames.length === 0)
+      return;
+    const transaction = db.transaction(db.objectStoreNames, 'readwrite');
+    await Promise.all(dbInfo.stores.map(async store => {
+      const objectStore = transaction.objectStore(store.name);
+      await Promise.all(store.records.map(async record => {
+        await this._idbRequestToPromise(
+            objectStore.add(
+                record.value ?? parseEvaluationResultValue(record.valueEncoded),
+                record.key ?? parseEvaluationResultValue(record.keyEncoded),
+            )
+        );
+      }));
+    }));
+  }
+
+  async restore(originState: channels.SetOriginStorage | undefined) {
+    // Clean Service Workers.
+    const registrations = this._global.navigator.serviceWorker ? await this._global.navigator.serviceWorker.getRegistrations() : [];
+    await Promise.all(registrations.map(async r => {
+      // Heuristic for service workers that stalled during main script fetch or importScripts:
+      // Waiting for them to finish unregistering takes ages so we do not await.
+      // However, they will unregister immediately after fetch finishes and should not affect next page load.
+      // Unfortunately, loading next page in Chromium still takes 5 seconds waiting for
+      // some operation on this bogus service worker to finish.
+      if (!r.installing && !r.waiting && !r.active)
+        r.unregister().catch(() => {});
+      else
+        await r.unregister().catch(() => {});
+    }));
+
+    try {
+      for (const db of await this._global.indexedDB.databases?.() || []) {
+        // Do not wait for the callback - it is called on timer in Chromium (slow).
+        if (db.name)
+          this._global.indexedDB.deleteDatabase(db.name!);
+      }
+      await Promise.all((originState?.indexedDB ?? []).map(dbInfo => this._restoreDB(dbInfo)));
+    } catch (e) {
+      throw new Error('Unable to restore IndexedDB: ' + e.message);
+    }
+
+    this._global.sessionStorage.clear();
+    this._global.localStorage.clear();
+    for (const { name, value } of (originState?.localStorage || []))
+      this._global.localStorage.setItem(name, value);
+  }
+}
diff --git a/packages/playwright-core/src/server/injected/utilityScript.ts b/packages/injected/src/utilityScript.ts
similarity index 51%
rename from packages/playwright-core/src/server/injected/utilityScript.ts
rename to packages/injected/src/utilityScript.ts
index 7b046a529af8f..4bacbcdff8df6 100644
--- a/packages/playwright-core/src/server/injected/utilityScript.ts
+++ b/packages/injected/src/utilityScript.ts
@@ -14,26 +14,65 @@
  * limitations under the License.
  */
 
-import { serializeAsCallArgument, parseEvaluationResultValue } from '../isomorphic/utilityScriptSerializers';
+import { parseEvaluationResultValue, serializeAsCallArgument } from '@isomorphic/utilityScriptSerializers';
+
+// Keep in sync with eslint.config.mjs
+export type Builtins = {
+  setTimeout: Window['setTimeout'],
+  clearTimeout: Window['clearTimeout'],
+  setInterval: Window['setInterval'],
+  clearInterval: Window['clearInterval'],
+  requestAnimationFrame: Window['requestAnimationFrame'],
+  cancelAnimationFrame: Window['cancelAnimationFrame'],
+  requestIdleCallback: Window['requestIdleCallback'],
+  cancelIdleCallback: Window['cancelIdleCallback'],
+  performance: Window['performance'],
+  // eslint-disable-next-line no-restricted-globals
+  Intl: typeof window['Intl'],
+  // eslint-disable-next-line no-restricted-globals
+  Date: typeof window['Date'],
+};
 
 export class UtilityScript {
-  constructor(isUnderTest: boolean) {
-    if (isUnderTest)
-      this._setBuiltins();
-  }
+  // eslint-disable-next-line no-restricted-globals
+  readonly global: typeof globalThis;
+  // Builtins protect injected code from clock emulation.
+  readonly builtins: Builtins;
+  readonly isUnderTest: boolean;
 
-  serializeAsCallArgument = serializeAsCallArgument;
-  parseEvaluationResultValue = parseEvaluationResultValue;
+  // eslint-disable-next-line no-restricted-globals
+  constructor(global: typeof globalThis, isUnderTest: boolean) {
+    this.global = global;
+    this.isUnderTest = isUnderTest;
+    if ((global as any).__pwClock) {
+      this.builtins = (global as any).__pwClock.builtins;
+    } else {
+      this.builtins = {
+        setTimeout: global.setTimeout?.bind(global),
+        clearTimeout: global.clearTimeout?.bind(global),
+        setInterval: global.setInterval?.bind(global),
+        clearInterval: global.clearInterval?.bind(global),
+        requestAnimationFrame: global.requestAnimationFrame?.bind(global),
+        cancelAnimationFrame: global.cancelAnimationFrame?.bind(global),
+        requestIdleCallback: global.requestIdleCallback?.bind(global),
+        cancelIdleCallback: global.cancelIdleCallback?.bind(global),
+        performance: global.performance,
+        Intl: global.Intl,
+        Date: global.Date,
+      } satisfies Builtins;
+    }
+    if (this.isUnderTest)
+      (global as any).builtins = this.builtins;
+  }
 
   evaluate(isFunction: boolean | undefined, returnByValue: boolean, expression: string, argCount: number, ...argsAndHandles: any[]) {
     const args = argsAndHandles.slice(0, argCount);
     const handles = argsAndHandles.slice(argCount);
     const parameters = [];
     for (let i = 0; i < args.length; i++)
-      parameters[i] = this.parseEvaluationResultValue(args[i], handles);
+      parameters[i] = parseEvaluationResultValue(args[i], handles);
 
-    // eslint-disable-next-line no-restricted-globals
-    let result = globalThis.eval(expression);
+    let result = this.global.eval(expression);
     if (isFunction === true) {
       result = result(...parameters);
     } else if (isFunction === false) {
@@ -48,7 +87,7 @@ export class UtilityScript {
 
   jsonValue(returnByValue: true, value: any) {
     // Special handling of undefined to work-around multi-step returnByValue handling in WebKit.
-    if (Object.is(value, undefined))
+    if (value === undefined)
       return undefined;
     return serializeAsCallArgument(value, (value: any) => ({ fallThrough: value }));
   }
@@ -74,47 +113,4 @@ export class UtilityScript {
     }
     return safeJson(value);
   }
-
-  private _setBuiltins() {
-    // eslint-disable-next-line no-restricted-globals
-    const window = (globalThis as any);
-    window.builtinSetTimeout = (callback: Function, timeout: number) => {
-      if (window.__pwClock?.builtin)
-        return window.__pwClock.builtin.setTimeout(callback, timeout);
-      return setTimeout(callback, timeout);
-    };
-
-    window.builtinClearTimeout = (id: number) => {
-      if (window.__pwClock?.builtin)
-        return window.__pwClock.builtin.clearTimeout(id);
-      return clearTimeout(id);
-    };
-
-    window.builtinSetInterval = (callback: Function, timeout: number) => {
-      if (window.__pwClock?.builtin)
-        return window.__pwClock.builtin.setInterval(callback, timeout);
-      return setInterval(callback, timeout);
-    };
-
-    window.builtinClearInterval = (id: number) => {
-      if (window.__pwClock?.builtin)
-        return window.__pwClock.builtin.clearInterval(id);
-      return clearInterval(id);
-    };
-
-    window.builtinRequestAnimationFrame = (callback: FrameRequestCallback) => {
-      if (window.__pwClock?.builtin)
-        return window.__pwClock.builtin.requestAnimationFrame(callback);
-      return requestAnimationFrame(callback);
-    };
-
-    window.builtinCancelAnimationFrame = (id: number) => {
-      if (window.__pwClock?.builtin)
-        return window.__pwClock.builtin.cancelAnimationFrame(id);
-      return cancelAnimationFrame(id);
-    };
-
-    window.builtinDate = window.__pwClock?.builtin.Date || Date;
-    window.builtinPerformance = window.__pwClock?.builtin.performance || performance;
-  }
 }
diff --git a/packages/playwright-core/src/server/injected/vueSelectorEngine.ts b/packages/injected/src/vueSelectorEngine.ts
similarity index 97%
rename from packages/playwright-core/src/server/injected/vueSelectorEngine.ts
rename to packages/injected/src/vueSelectorEngine.ts
index 154f36b983071..287b04568cbc4 100644
--- a/packages/playwright-core/src/server/injected/vueSelectorEngine.ts
+++ b/packages/injected/src/vueSelectorEngine.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import type { SelectorEngine, SelectorRoot } from './selectorEngine';
+import { parseAttributeSelector } from '@isomorphic/selectorParser';
+
 import { isInsideScope } from './domUtils';
 import { matchesComponentAttribute } from './selectorUtils';
-import { parseAttributeSelector } from '../../utils/isomorphic/selectorParser';
+
+import type { SelectorEngine, SelectorRoot } from './selectorEngine';
 
 type ComponentNode = {
   name: string,
@@ -218,7 +220,7 @@ function findVueRoots(root: Document | ShadowRoot, roots: VueRoot[] = []): VueRo
   const document = root.ownerDocument || root;
   const walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
   // Vue2 roots are referred to from elements.
-  const vue2Roots: Set<VueVNode> = new Set();
+  const vue2Roots = new Set<VueVNode>();
   do {
     const node = walker.currentNode;
     if ((node as any).__vue__)
@@ -239,7 +241,7 @@ function findVueRoots(root: Document | ShadowRoot, roots: VueRoot[] = []): VueRo
   return roots;
 }
 
-export const VueEngine: SelectorEngine = {
+export const createVueEngine = (): SelectorEngine => ({
   queryAll(scope: SelectorRoot, selector: string): Element[] {
     const document = scope.ownerDocument || scope;
     const { name, attributes } = parseAttributeSelector(selector, false);
@@ -256,11 +258,11 @@ export const VueEngine: SelectorEngine = {
       }
       return true;
     })).flat();
-    const allRootElements: Set<Element> = new Set();
+    const allRootElements = new Set<Element>();
     for (const treeNode of treeNodes) {
       for (const rootElement of treeNode.rootElements)
         allRootElements.add(rootElement);
     }
     return [...allRootElements];
   }
-};
+});
diff --git a/packages/injected/src/webSocketMock.ts b/packages/injected/src/webSocketMock.ts
new file mode 100644
index 0000000000000..f45885a4e8abc
--- /dev/null
+++ b/packages/injected/src/webSocketMock.ts
@@ -0,0 +1,364 @@
+/**
+ * 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 type WebSocketMessage = string | ArrayBufferLike | Blob | ArrayBufferView;
+export type WSData = { data: string, isBase64: boolean };
+
+export type OnCreatePayload = { type: 'onCreate', id: string, url: string };
+export type OnMessageFromPagePayload = { type: 'onMessageFromPage', id: string, data: WSData };
+export type OnClosePagePayload = { type: 'onClosePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
+export type OnMessageFromServerPayload = { type: 'onMessageFromServer', id: string, data: WSData };
+export type OnCloseServerPayload = { type: 'onCloseServer', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
+export type BindingPayload = OnCreatePayload | OnMessageFromPagePayload | OnMessageFromServerPayload | OnClosePagePayload | OnCloseServerPayload;
+
+export type ConnectRequest = { type: 'connect', id: string };
+export type PassthroughRequest = { type: 'passthrough', id: string };
+export type EnsureOpenedRequest = { type: 'ensureOpened', id: string };
+export type SendToPageRequest = { type: 'sendToPage', id: string, data: WSData };
+export type SendToServerRequest = { type: 'sendToServer', id: string, data: WSData };
+export type ClosePageRequest = { type: 'closePage', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
+export type CloseServerRequest = { type: 'closeServer', id: string, code: number | undefined, reason: string | undefined, wasClean: boolean };
+export type APIRequest = ConnectRequest | PassthroughRequest | EnsureOpenedRequest | SendToPageRequest | SendToServerRequest | ClosePageRequest | CloseServerRequest;
+
+// eslint-disable-next-line no-restricted-globals
+type GlobalThis = typeof globalThis;
+
+export function inject(globalThis: GlobalThis) {
+  if ((globalThis as any).__pwWebSocketDispatch)
+    return;
+
+  function generateId() {
+    const bytes = new Uint8Array(32);
+    globalThis.crypto.getRandomValues(bytes);
+    const hex = '0123456789abcdef';
+    return [...bytes].map(value => {
+      const high = Math.floor(value / 16);
+      const low = value % 16;
+      return hex[high] + hex[low];
+    }).join('');
+  }
+
+  function bufferToData(b: Uint8Array): WSData {
+    let s = '';
+    for (let i = 0; i < b.length; i++)
+      s += String.fromCharCode(b[i]);
+    return { data: globalThis.btoa(s), isBase64: true };
+  }
+
+  function stringToBuffer(s: string): ArrayBuffer {
+    s = globalThis.atob(s);
+    const b = new Uint8Array(s.length);
+    for (let i = 0; i < s.length; i++)
+      b[i] = s.charCodeAt(i);
+    return b.buffer;
+  }
+
+  // Note: this function tries to be synchronous when it can to preserve the ability to send
+  // multiple messages synchronously in the same order and then synchronously close.
+  function messageToData(message: WebSocketMessage, cb: (data: WSData) => any) {
+    if (message instanceof globalThis.Blob)
+      return message.arrayBuffer().then(buffer => cb(bufferToData(new Uint8Array(buffer))));
+    if (typeof message === 'string')
+      return cb({ data: message, isBase64: false });
+    if (ArrayBuffer.isView(message))
+      return cb(bufferToData(new Uint8Array(message.buffer, message.byteOffset, message.byteLength)));
+    return cb(bufferToData(new Uint8Array(message)));
+  }
+
+  function dataToMessage(data: WSData, binaryType: 'blob' | 'arraybuffer'): WebSocketMessage {
+    if (!data.isBase64)
+      return data.data;
+    const buffer = stringToBuffer(data.data);
+    return binaryType === 'arraybuffer' ? buffer : new Blob([buffer]);
+  }
+
+  const binding = (globalThis as any).__pwWebSocketBinding as (message: BindingPayload) => void;
+  const NativeWebSocket: typeof WebSocket = globalThis.WebSocket;
+  const idToWebSocket = new Map<string, WebSocketMock>();
+  (globalThis as any).__pwWebSocketDispatch = (request: APIRequest) => {
+    const ws = idToWebSocket.get(request.id);
+    if (!ws)
+      return;
+    if (request.type === 'connect')
+      ws._apiConnect();
+    if (request.type === 'passthrough')
+      ws._apiPassThrough();
+    if (request.type === 'ensureOpened')
+      ws._apiEnsureOpened();
+    if (request.type === 'sendToPage')
+      ws._apiSendToPage(dataToMessage(request.data, ws.binaryType));
+    if (request.type === 'closePage')
+      ws._apiClosePage(request.code, request.reason, request.wasClean);
+    if (request.type === 'sendToServer')
+      ws._apiSendToServer(dataToMessage(request.data, ws.binaryType));
+    if (request.type === 'closeServer')
+      ws._apiCloseServer(request.code, request.reason, request.wasClean);
+  };
+
+  class WebSocketMock extends EventTarget {
+    static readonly CONNECTING: 0 = 0; // WebSocket.CONNECTING
+    static readonly OPEN: 1 = 1; // WebSocket.OPEN
+    static readonly CLOSING: 2 = 2; // WebSocket.CLOSING
+    static readonly CLOSED: 3 = 3; // WebSocket.CLOSED
+
+    CONNECTING: 0 = 0; // WebSocket.CONNECTING
+    OPEN: 1 = 1; // WebSocket.OPEN
+    CLOSING: 2 = 2; // WebSocket.CLOSING
+    CLOSED: 3 = 3; // WebSocket.CLOSED
+
+    private _oncloseListener: WebSocket['onclose'] = null;
+    private _onerrorListener: WebSocket['onerror'] = null;
+    private _onmessageListener: WebSocket['onmessage'] = null;
+    private _onopenListener: WebSocket['onopen'] = null;
+
+    bufferedAmount: number = 0;
+    extensions: string = '';
+    protocol: string = '';
+    readyState: number = 0;
+    readonly url: string;
+
+    private _id: string;
+    private _origin: string = '';
+    private _protocols?: string | string[];
+    private _ws?: WebSocket;
+    private _passthrough = false;
+    private _wsBufferedMessages: WebSocketMessage[] = [];
+    private _binaryType: BinaryType = 'blob';
+
+    constructor(url: string | URL, protocols?: string | string[]) {
+      super();
+
+      // https://github.com/whatwg/websockets/issues/20
+      this.url = new URL(url, globalThis.window.document.baseURI).href.replace(/^http/, 'ws');
+      this._origin = URL.parse(this.url)?.origin ?? '';
+      this._protocols = protocols;
+
+      this._id = generateId();
+      idToWebSocket.set(this._id, this);
+      binding({ type: 'onCreate', id: this._id, url: this.url });
+    }
+
+    // --- native WebSocket implementation ---
+
+    get binaryType() {
+      return this._binaryType;
+    }
+
+    set binaryType(type) {
+      this._binaryType = type;
+      if (this._ws)
+        this._ws.binaryType = type;
+    }
+
+    get onclose() {
+      return this._oncloseListener;
+    }
+
+    set onclose(listener) {
+      if (this._oncloseListener)
+        this.removeEventListener('close', this._oncloseListener as any);
+      this._oncloseListener = listener;
+      if (this._oncloseListener)
+        this.addEventListener('close', this._oncloseListener as any);
+    }
+
+    get onerror() {
+      return this._onerrorListener;
+    }
+
+    set onerror(listener) {
+      if (this._onerrorListener)
+        this.removeEventListener('error', this._onerrorListener);
+      this._onerrorListener = listener;
+      if (this._onerrorListener)
+        this.addEventListener('error', this._onerrorListener);
+    }
+
+    get onopen() {
+      return this._onopenListener;
+    }
+
+    set onopen(listener) {
+      if (this._onopenListener)
+        this.removeEventListener('open', this._onopenListener);
+      this._onopenListener = listener;
+      if (this._onopenListener)
+        this.addEventListener('open', this._onopenListener);
+    }
+
+    get onmessage() {
+      return this._onmessageListener;
+    }
+
+    set onmessage(listener) {
+      if (this._onmessageListener)
+        this.removeEventListener('message', this._onmessageListener as any);
+      this._onmessageListener = listener;
+      if (this._onmessageListener)
+        this.addEventListener('message', this._onmessageListener as any);
+    }
+
+    send(message: WebSocketMessage): void {
+      if (this.readyState === WebSocketMock.CONNECTING)
+        throw new DOMException(`Failed to execute 'send' on 'WebSocket': Still in CONNECTING state.`);
+      if (this.readyState !== WebSocketMock.OPEN)
+        throw new DOMException(`WebSocket is already in CLOSING or CLOSED state.`);
+      if (this._passthrough) {
+        if (this._ws)
+          this._apiSendToServer(message);
+      } else {
+        messageToData(message, data => binding({ type: 'onMessageFromPage', id: this._id, data }));
+      }
+    }
+
+    close(code?: number, reason?: string): void {
+      if (code !== undefined && code !== 1000 && (code < 3000 || code > 4999))
+        throw new DOMException(`Failed to execute 'close' on 'WebSocket': The close code must be either 1000, or between 3000 and 4999. ${code} is neither.`);
+      if (this.readyState === WebSocketMock.OPEN || this.readyState === WebSocketMock.CONNECTING)
+        this.readyState = WebSocketMock.CLOSING;
+      if (this._passthrough)
+        this._apiCloseServer(code, reason, true);
+      else
+        binding({ type: 'onClosePage', id: this._id, code, reason, wasClean: true });
+    }
+
+    // --- methods called from the routing API ---
+
+    _apiEnsureOpened() {
+      // This is called at the end of the route handler. If we did not connect to the server,
+      // assume that websocket will be fully mocked. In this case, pretend that server
+      // connection is established right away.
+      if (!this._ws)
+        this._ensureOpened();
+    }
+
+    _apiSendToPage(message: WebSocketMessage) {
+      // Calling "sendToPage()" from the route handler. Allow this for easier testing.
+      this._ensureOpened();
+      if (this.readyState !== WebSocketMock.OPEN)
+        throw new DOMException(`WebSocket is already in CLOSING or CLOSED state.`);
+      this.dispatchEvent(new MessageEvent('message', { data: message, origin: this._origin, cancelable: true }));
+    }
+
+    _apiSendToServer(message: WebSocketMessage) {
+      if (!this._ws)
+        throw new Error('Cannot send a message before connecting to the server');
+      if (this._ws.readyState === WebSocketMock.CONNECTING)
+        this._wsBufferedMessages.push(message);
+      else
+        this._ws.send(message);
+    }
+
+    _apiConnect() {
+      if (this._ws)
+        throw new Error('Can only connect to the server once');
+
+      this._ws = new NativeWebSocket(this.url, this._protocols);
+      this._ws.binaryType = this._binaryType;
+
+      this._ws.onopen = () => {
+        for (const message of this._wsBufferedMessages)
+          this._ws!.send(message);
+        this._wsBufferedMessages = [];
+        this._ensureOpened();
+      };
+
+      this._ws.onclose = event => {
+        this._onWSClose(event.code, event.reason, event.wasClean);
+      };
+
+      this._ws.onmessage = event => {
+        if (this._passthrough)
+          this._apiSendToPage(event.data);
+        else
+          messageToData(event.data, data => binding({ type: 'onMessageFromServer', id: this._id, data }));
+      };
+
+      this._ws.onerror = () => {
+        // We do not expose errors in the API, so short-curcuit the error event.
+        const event = new Event('error', { cancelable: true });
+        this.dispatchEvent(event);
+      };
+    }
+
+    // This method connects to the server, and passes all messages through,
+    // as if WebSocketMock was not engaged.
+    _apiPassThrough() {
+      this._passthrough = true;
+      this._apiConnect();
+    }
+
+    _apiCloseServer(code: number | undefined, reason: string | undefined, wasClean: boolean) {
+      if (!this._ws) {
+        // Short-curcuit when there is no server.
+        this._onWSClose(code, reason, wasClean);
+        return;
+      }
+      if (this._ws.readyState === WebSocketMock.CONNECTING || this._ws.readyState === WebSocketMock.OPEN)
+        this._ws.close(code, reason);
+    }
+
+    _apiClosePage(code: number | undefined, reason: string | undefined, wasClean: boolean) {
+      if (this.readyState === WebSocketMock.CLOSED)
+        return;
+      this.readyState = WebSocketMock.CLOSED;
+      this.dispatchEvent(new CloseEvent('close', { code, reason, wasClean, cancelable: true }));
+      this._maybeCleanup();
+      if (this._passthrough)
+        this._apiCloseServer(code, reason, wasClean);
+      else
+        binding({ type: 'onClosePage', id: this._id, code, reason, wasClean });
+    }
+
+    // --- internals ---
+
+    _ensureOpened() {
+      if (this.readyState !== WebSocketMock.CONNECTING)
+        return;
+      this.extensions = this._ws?.extensions || '';
+      if (this._ws)
+        this.protocol = this._ws.protocol;
+      else if (Array.isArray(this._protocols))
+        this.protocol = this._protocols[0] || '';
+      else
+        this.protocol = this._protocols || '';
+      this.readyState = WebSocketMock.OPEN;
+      this.dispatchEvent(new Event('open', { cancelable: true }));
+    }
+
+    private _onWSClose(code: number | undefined, reason: string | undefined, wasClean: boolean) {
+      if (this._passthrough)
+        this._apiClosePage(code, reason, wasClean);
+      else
+        binding({ type: 'onCloseServer', id: this._id, code, reason, wasClean });
+      if (this._ws) {
+        this._ws.onopen = null;
+        this._ws.onclose = null;
+        this._ws.onmessage = null;
+        this._ws.onerror = null;
+        this._ws = undefined;
+        this._wsBufferedMessages = [];
+      }
+      this._maybeCleanup();
+    }
+
+    private _maybeCleanup() {
+      if (this.readyState === WebSocketMock.CLOSED && !this._ws)
+        idToWebSocket.delete(this._id);
+    }
+  }
+  globalThis.WebSocket = class WebSocket extends WebSocketMock {};
+}
diff --git a/packages/playwright-core/src/server/injected/xpathSelectorEngine.ts b/packages/injected/src/xpathSelectorEngine.ts
similarity index 100%
rename from packages/playwright-core/src/server/injected/xpathSelectorEngine.ts
rename to packages/injected/src/xpathSelectorEngine.ts
diff --git a/packages/injected/src/yaml.ts b/packages/injected/src/yaml.ts
new file mode 100644
index 0000000000000..e79cf58474069
--- /dev/null
+++ b/packages/injected/src/yaml.ts
@@ -0,0 +1,94 @@
+/**
+ * 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 function yamlEscapeKeyIfNeeded(str: string): string {
+  if (!yamlStringNeedsQuotes(str))
+    return str;
+  return `'` + str.replace(/'/g, `''`) + `'`;
+}
+
+export function yamlEscapeValueIfNeeded(str: string): string {
+  if (!yamlStringNeedsQuotes(str))
+    return str;
+  return '"' + str.replace(/[\\"\x00-\x1f\x7f-\x9f]/g, c => {
+    switch (c) {
+      case '\\':
+        return '\\\\';
+      case '"':
+        return '\\"';
+      case '\b':
+        return '\\b';
+      case '\f':
+        return '\\f';
+      case '\n':
+        return '\\n';
+      case '\r':
+        return '\\r';
+      case '\t':
+        return '\\t';
+      default:
+        const code = c.charCodeAt(0);
+        return '\\x' + code.toString(16).padStart(2, '0');
+    }
+  }) + '"';
+}
+
+function yamlStringNeedsQuotes(str: string): boolean {
+  if (str.length === 0)
+    return true;
+
+  // Strings with leading or trailing whitespace need quotes
+  if (/^\s|\s$/.test(str))
+    return true;
+
+  // Strings containing control characters need quotes
+  if (/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\x9f]/.test(str))
+    return true;
+
+  // Strings starting with '-' need quotes
+  if (/^-/.test(str))
+    return true;
+
+  // Strings containing ':' or '\n' followed by a space or at the end need quotes
+  if (/[\n:](\s|$)/.test(str))
+    return true;
+
+  // Strings containing '#' preceded by a space need quotes (comment indicator)
+  if (/\s#/.test(str))
+    return true;
+
+  // Strings that contain line breaks need quotes
+  if (/[\n\r]/.test(str))
+    return true;
+
+  // Strings starting with indicator characters or quotes need quotes
+  if (/^[&*\],?!>|@"'#%]/.test(str))
+    return true;
+
+  // Strings containing special characters that could cause ambiguity
+  if (/[{}`]/.test(str))
+    return true;
+
+  // YAML array starts with [
+  if (/^\[/.test(str))
+    return true;
+
+  // Non-string types recognized by YAML
+  if (!isNaN(Number(str)) || ['y', 'n', 'yes', 'no', 'true', 'false', 'on', 'off', 'null'].includes(str.toLowerCase()))
+    return true;
+
+  return false;
+}
diff --git a/packages/playwright-browser-chromium/install.js b/packages/playwright-browser-chromium/install.js
index 8ceef68b95185..5f725bb2c95ba 100644
--- a/packages/playwright-browser-chromium/install.js
+++ b/packages/playwright-browser-chromium/install.js
@@ -24,4 +24,4 @@ try {
 }
 
 if (install)
-  install(['chromium', 'ffmpeg']);
+  install(['chromium', 'chromium-headless-shell', 'ffmpeg']);
diff --git a/packages/playwright-browser-chromium/package.json b/packages/playwright-browser-chromium/package.json
index c179a5684157b..a79a6ab33d0e8 100644
--- a/packages/playwright-browser-chromium/package.json
+++ b/packages/playwright-browser-chromium/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/browser-chromium",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright package that automatically installs Chromium",
   "repository": {
     "type": "git",
@@ -27,6 +27,6 @@
     "install": "node install.js"
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   }
 }
diff --git a/packages/playwright-browser-firefox/package.json b/packages/playwright-browser-firefox/package.json
index 4da69d3c80455..aae4cf2211192 100644
--- a/packages/playwright-browser-firefox/package.json
+++ b/packages/playwright-browser-firefox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/browser-firefox",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright package that automatically installs Firefox",
   "repository": {
     "type": "git",
@@ -27,6 +27,6 @@
     "install": "node install.js"
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   }
 }
diff --git a/packages/playwright-browser-webkit/package.json b/packages/playwright-browser-webkit/package.json
index 3f0bfd168bec5..86bf71ae118e1 100644
--- a/packages/playwright-browser-webkit/package.json
+++ b/packages/playwright-browser-webkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/browser-webkit",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright package that automatically installs WebKit",
   "repository": {
     "type": "git",
@@ -27,6 +27,6 @@
     "install": "node install.js"
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   }
 }
diff --git a/packages/playwright-chromium/install.js b/packages/playwright-chromium/install.js
index 8ceef68b95185..5f725bb2c95ba 100644
--- a/packages/playwright-chromium/install.js
+++ b/packages/playwright-chromium/install.js
@@ -24,4 +24,4 @@ try {
 }
 
 if (install)
-  install(['chromium', 'ffmpeg']);
+  install(['chromium', 'chromium-headless-shell', 'ffmpeg']);
diff --git a/packages/playwright-chromium/package.json b/packages/playwright-chromium/package.json
index bb2ec01efc199..9a079b1f10f73 100644
--- a/packages/playwright-chromium/package.json
+++ b/packages/playwright-chromium/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playwright-chromium",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate Chromium",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
     "install": "node install.js"
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   }
 }
diff --git a/packages/playwright-client/index.d.ts b/packages/playwright-client/index.d.ts
new file mode 100644
index 0000000000000..74906f0947068
--- /dev/null
+++ b/packages/playwright-client/index.d.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Browser } from './types/types';
+
+export * from './types/types';
+
+export type Options = {
+  headless?: boolean;
+};
+
+export const connect: (wsEndpoint: string, browserName: string, options: Options) => Promise<Browser>;
diff --git a/packages/playwright-ct-solid/register.d.ts b/packages/playwright-client/index.js
similarity index 88%
rename from packages/playwright-ct-solid/register.d.ts
rename to packages/playwright-client/index.js
index 1f44530ed625d..227eee0fde3b0 100644
--- a/packages/playwright-ct-solid/register.d.ts
+++ b/packages/playwright-client/index.js
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export default function pwRegister(components: Record<string, any>): void;
+module.exports = require('./lib/index');
diff --git a/utils/eslint-plugin-internal-playwright/index.js b/packages/playwright-client/index.mjs
similarity index 82%
rename from utils/eslint-plugin-internal-playwright/index.js
rename to packages/playwright-client/index.mjs
index 20deef8cc426e..0332e501571ce 100644
--- a/utils/eslint-plugin-internal-playwright/index.js
+++ b/packages/playwright-client/index.mjs
@@ -13,8 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-module.exports = {
-  rules: {
-    'await-promise-in-class-returns': require('./rules/await-promise-in-class-returns'),
-  }
-};
+
+export { connect } from './index.js';
diff --git a/packages/playwright-client/package.json b/packages/playwright-client/package.json
new file mode 100644
index 0000000000000..7df228501ecc6
--- /dev/null
+++ b/packages/playwright-client/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "@playwright/client",
+  "private": true,
+  "version": "0.0.0",
+  "description": "A thin client for Playwright",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/microsoft/playwright.git"
+  },
+  "homepage": "https://playwright.dev",
+  "engines": {
+    "node": ">=18"
+  },
+  "author": {
+    "name": "Microsoft Corporation"
+  },
+  "license": "Apache-2.0",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./index.mjs",
+      "require": "./index.js",
+      "default": "./index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "esbuild": "node build.js",
+    "build": "npm run esbuild",
+    "watch": "npm run esbuild -- --watch"
+  },
+  "dependencies": {
+    "playwright-core": "1.55.1"
+  }
+}
diff --git a/packages/playwright-client/src/index.ts b/packages/playwright-client/src/index.ts
new file mode 100644
index 0000000000000..48762e4e81f0d
--- /dev/null
+++ b/packages/playwright-client/src/index.ts
@@ -0,0 +1,40 @@
+/**
+ * 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 { Connection } from '../../playwright-core/src/client/connection';
+import { webPlatform } from './webPlatform';
+
+import type { Browser } from '../../playwright-core/src/client/browser';
+
+export type Options = {
+  headless?: boolean;
+};
+
+export async function connect(wsEndpoint: string, browserName: string, options: Options): Promise<Browser> {
+  const ws = new WebSocket(`${wsEndpoint}?browser=${browserName}&launch-options=${JSON.stringify(options)}`);
+  await new Promise((f, r) => {
+    ws.addEventListener('open', f);
+    ws.addEventListener('error', r);
+  });
+
+  const connection = new Connection(webPlatform);
+  connection.onmessage = message => ws.send(JSON.stringify(message));
+  ws.addEventListener('message', message => connection.dispatch(JSON.parse(message.data)));
+  ws.addEventListener('close', () => connection.close());
+
+  const playwright = await connection.initializePlaywright();
+  return playwright._preLaunchedBrowser();
+}
diff --git a/packages/playwright-client/src/webPlatform.ts b/packages/playwright-client/src/webPlatform.ts
new file mode 100644
index 0000000000000..e7d64817ecfe2
--- /dev/null
+++ b/packages/playwright-client/src/webPlatform.ts
@@ -0,0 +1,48 @@
+/* eslint-disable no-console */
+/**
+ * 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 { emptyPlatform } from '../../playwright-core/src/client/platform';
+
+import type { Platform } from '../../playwright-core/src/client/platform';
+
+export const webPlatform: Platform = {
+  ...emptyPlatform,
+
+  name: 'web',
+
+  boxedStackPrefixes: () => [],
+
+  calculateSha1: async (text: string) => {
+    const bytes = new TextEncoder().encode(text);
+    const hashBuffer = await window.crypto.subtle.digest('SHA-1', bytes);
+    return Array.from(new Uint8Array(hashBuffer), b => b.toString(16).padStart(2, '0')).join('');
+  },
+
+  createGuid: () => {
+    return Array.from(window.crypto.getRandomValues(new Uint8Array(16)), b => b.toString(16).padStart(2, '0')).join('');
+  },
+
+  isLogEnabled(name: 'api' | 'channel') {
+    return true;
+  },
+
+  log(name: 'api' | 'channel', message: string | Error | object) {
+    console.debug(name, message);
+  },
+
+  showInternalStackFrames: () => true,
+};
diff --git a/packages/playwright-client/types/types.d.ts b/packages/playwright-client/types/types.d.ts
new file mode 100644
index 0000000000000..9d759a2bc2103
--- /dev/null
+++ b/packages/playwright-client/types/types.d.ts
@@ -0,0 +1,22847 @@
+// This file is generated by /utils/generate_types/index.js
+/**
+ * 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 { ChildProcess } from 'child_process';
+import { Readable } from 'stream';
+import { ReadStream } from 'fs';
+import { Protocol } from './protocol';
+import { Serializable, EvaluationArgument, PageFunction, PageFunctionOn, SmartHandle, ElementHandleForTag, BindingSource } from './structs';
+
+type PageWaitForSelectorOptionsNotHidden = PageWaitForSelectorOptions & {
+  state?: 'visible'|'attached';
+};
+type ElementHandleWaitForSelectorOptionsNotHidden = ElementHandleWaitForSelectorOptions & {
+  state?: 'visible'|'attached';
+};
+
+/**
+ * Page provides methods to interact with a single tab in a [Browser](https://playwright.dev/docs/api/class-browser),
+ * or an [extension background page](https://developer.chrome.com/extensions/background_pages) in Chromium. One
+ * [Browser](https://playwright.dev/docs/api/class-browser) instance might have multiple
+ * [Page](https://playwright.dev/docs/api/class-page) instances.
+ *
+ * This example creates a page, navigates it to a URL, and then saves a screenshot:
+ *
+ * ```js
+ * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+ *
+ * (async () => {
+ *   const browser = await webkit.launch();
+ *   const context = await browser.newContext();
+ *   const page = await context.newPage();
+ *   await page.goto('https://example.com');
+ *   await page.screenshot({ path: 'screenshot.png' });
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ * The Page class emits various events (described below) which can be handled using any of Node's native
+ * [`EventEmitter`](https://nodejs.org/api/events.html#events_class_eventemitter) methods, such as `on`, `once` or
+ * `removeListener`.
+ *
+ * This example logs a message for a single page `load` event:
+ *
+ * ```js
+ * page.once('load', () => console.log('Page loaded!'));
+ * ```
+ *
+ * To unsubscribe from events use the `removeListener` method:
+ *
+ * ```js
+ * function logRequest(interceptedRequest) {
+ *   console.log('A request was made:', interceptedRequest.url());
+ * }
+ * page.on('request', logRequest);
+ * // Sometime later...
+ * page.removeListener('request', logRequest);
+ * ```
+ *
+ */
+export interface Page {
+  /**
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression) invocation.
+   *
+   * If the function passed to the
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) returns a [Promise],
+   * then [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) would wait for
+   * the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) returns a
+   * non-[Serializable] value, then
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) resolves to
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   *
+   * **Usage**
+   *
+   * Passing argument to [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression):
+   *
+   * ```js
+   * const result = await page.evaluate(([x, y]) => {
+   *   return Promise.resolve(x * y);
+   * }, [7, 8]);
+   * console.log(result); // prints "56"
+   * ```
+   *
+   * A string can also be passed in instead of a function:
+   *
+   * ```js
+   * console.log(await page.evaluate('1 + 2')); // prints "3"
+   * const x = 10;
+   * console.log(await page.evaluate(`1 + ${x}`)); // prints "11"
+   * ```
+   *
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate):
+   *
+   * ```js
+   * const bodyHandle = await page.evaluate('document.body');
+   * const html = await page.evaluate<string, HTMLElement>(([body, suffix]) =>
+   *   body.innerHTML + suffix, [bodyHandle, 'hello']
+   * );
+   * await bodyHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression).
+   */
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression) invocation.
+   *
+   * If the function passed to the
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) returns a [Promise],
+   * then [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) would wait for
+   * the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) returns a
+   * non-[Serializable] value, then
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) resolves to
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   *
+   * **Usage**
+   *
+   * Passing argument to [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression):
+   *
+   * ```js
+   * const result = await page.evaluate(([x, y]) => {
+   *   return Promise.resolve(x * y);
+   * }, [7, 8]);
+   * console.log(result); // prints "56"
+   * ```
+   *
+   * A string can also be passed in instead of a function:
+   *
+   * ```js
+   * console.log(await page.evaluate('1 + 2')); // prints "3"
+   * const x = 10;
+   * console.log(await page.evaluate(`1 + ${x}`)); // prints "11"
+   * ```
+   *
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate):
+   *
+   * ```js
+   * const bodyHandle = await page.evaluate('document.body');
+   * const html = await page.evaluate<string, HTMLElement>(([body, suffix]) =>
+   *   body.innerHTML + suffix, [bodyHandle, 'hello']
+   * );
+   * await bodyHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression).
+   */
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression) invocation as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) is that
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
+   * a [Promise], then
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) would
+   * wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Handle for the window object.
+   * const aWindowHandle = await page.evaluateHandle(() => Promise.resolve(window));
+   * ```
+   *
+   * A string can also be passed in instead of a function:
+   *
+   * ```js
+   * const aHandle = await page.evaluateHandle('document'); // Handle for the 'document'
+   * ```
+   *
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle):
+   *
+   * ```js
+   * const aHandle = await page.evaluateHandle(() => document.body);
+   * const resultHandle = await page.evaluateHandle(body => body.innerHTML, aHandle);
+   * console.log(await resultHandle.jsonValue());
+   * await resultHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression) invocation as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) is that
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
+   * a [Promise], then
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) would
+   * wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Handle for the window object.
+   * const aWindowHandle = await page.evaluateHandle(() => Promise.resolve(window));
+   * ```
+   *
+   * A string can also be passed in instead of a function:
+   *
+   * ```js
+   * const aHandle = await page.evaluateHandle('document'); // Handle for the 'document'
+   * ```
+   *
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
+   * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle):
+   *
+   * ```js
+   * const aHandle = await page.evaluateHandle(() => document.body);
+   * const resultHandle = await page.evaluateHandle(body => body.innerHTML, aHandle);
+   * console.log(await resultHandle.jsonValue());
+   * await resultHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+
+  /**
+   * Adds a script which would be evaluated in one of the following scenarios:
+   * - Whenever the page is navigated.
+   * - Whenever the child frame is attached or navigated. In this case, the script is evaluated in the context of the
+   *   newly attached frame.
+   *
+   * The script is evaluated after the document was created but before any of its scripts were run. This is useful to
+   * amend the JavaScript environment, e.g. to seed `Math.random`.
+   *
+   * **Usage**
+   *
+   * An example of overriding `Math.random` before the page loads:
+   *
+   * ```js
+   * // preload.js
+   * Math.random = () => 42;
+   * ```
+   *
+   * ```js
+   * // In your playwright script, assuming the preload.js file is in same directory
+   * await page.addInitScript({ path: './preload.js' });
+   * ```
+   *
+   * ```js
+   * await page.addInitScript(mock => {
+   *   window.mock = mock;
+   * }, mock);
+   * ```
+   *
+   * **NOTE** The order of evaluation of multiple scripts installed via
+   * [browserContext.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-init-script)
+   * and [page.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-page#page-add-init-script) is not
+   * defined.
+   *
+   * @param script Script to be evaluated in the page.
+   * @param arg Optional argument to pass to
+   * [`script`](https://playwright.dev/docs/api/class-page#page-add-init-script-option-script) (only supported when
+   * passing a function).
+   */
+  addInitScript<Arg>(script: PageFunction<Arg, any> | { path?: string, content?: string }, arg?: Arg): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds an element matching the specified selector within the page. If no elements match the selector, the
+   * return value resolves to `null`. To wait for an element on the page, use
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for).
+   * @param selector A selector to query for.
+   * @param options
+   */
+  $<K extends keyof HTMLElementTagNameMap>(selector: K, options?: { strict: boolean }): Promise<ElementHandleForTag<K> | null>;
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds an element matching the specified selector within the page. If no elements match the selector, the
+   * return value resolves to `null`. To wait for an element on the page, use
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for).
+   * @param selector A selector to query for.
+   * @param options
+   */
+  $(selector: string, options?: { strict: boolean }): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
+
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds all elements matching the specified selector within the page. If no elements match the selector,
+   * the return value resolves to `[]`.
+   * @param selector A selector to query for.
+   */
+  $$<K extends keyof HTMLElementTagNameMap>(selector: K): Promise<ElementHandleForTag<K>[]>;
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds all elements matching the specified selector within the page. If no elements match the selector,
+   * the return value resolves to `[]`.
+   * @param selector A selector to query for.
+   */
+  $$(selector: string): Promise<ElementHandle<SVGElement | HTMLElement>[]>;
+
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * The method finds an element matching the specified selector within the page and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await page.$eval('#search', el => el.value);
+   * const preloadHref = await page.$eval('link[rel=preload]', el => el.href);
+   * const html = await page.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * // In TypeScript, this example requires an explicit type annotation (HTMLLinkElement) on el:
+   * const preloadHrefTS = await page.$eval('link[rel=preload]', (el: HTMLLinkElement) => el.href);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * The method finds an element matching the specified selector within the page and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await page.$eval('#search', el => el.value);
+   * const preloadHref = await page.$eval('link[rel=preload]', el => el.href);
+   * const html = await page.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * // In TypeScript, this example requires an explicit type annotation (HTMLLinkElement) on el:
+   * const preloadHrefTS = await page.$eval('link[rel=preload]', (el: HTMLLinkElement) => el.href);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * The method finds an element matching the specified selector within the page and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await page.$eval('#search', el => el.value);
+   * const preloadHref = await page.$eval('link[rel=preload]', el => el.href);
+   * const html = await page.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * // In TypeScript, this example requires an explicit type annotation (HTMLLinkElement) on el:
+   * const preloadHrefTS = await page.$eval('link[rel=preload]', (el: HTMLLinkElement) => el.href);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], void, R>, arg?: any): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * The method finds an element matching the specified selector within the page and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await page.$eval('#search', el => el.value);
+   * const preloadHref = await page.$eval('link[rel=preload]', el => el.href);
+   * const html = await page.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * // In TypeScript, this example requires an explicit type annotation (HTMLLinkElement) on el:
+   * const preloadHrefTS = await page.$eval('link[rel=preload]', (el: HTMLLinkElement) => el.href);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * The method finds all elements matching the specified selector within the page and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
+   * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divCounts = await page.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
+   */
+  $$eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * The method finds all elements matching the specified selector within the page and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
+   * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divCounts = await page.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
+   */
+  $$eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * The method finds all elements matching the specified selector within the page and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
+   * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divCounts = await page.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
+   */
+  $$eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], void, R>, arg?: any): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * The method finds all elements matching the specified selector within the page and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
+   * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divCounts = await page.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
+   */
+  $$eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression) returns a
+   * truthy value. It resolves to a JSHandle of the truthy value.
+   *
+   * **Usage**
+   *
+   * The
+   * [page.waitForFunction(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-wait-for-function)
+   * can be used to observe viewport size change:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   *
+   * (async () => {
+   *   const browser = await webkit.launch();
+   *   const page = await browser.newPage();
+   *   const watchDog = page.waitForFunction(() => window.innerWidth < 100);
+   *   await page.setViewportSize({ width: 50, height: 50 });
+   *   await watchDog;
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * To pass an argument to the predicate of
+   * [page.waitForFunction(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-wait-for-function)
+   * function:
+   *
+   * ```js
+   * const selector = '.foo';
+   * await page.waitForFunction(selector => !!document.querySelector(selector), selector);
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression).
+   * @param options
+   */
+  waitForFunction<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
+  /**
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression) returns a
+   * truthy value. It resolves to a JSHandle of the truthy value.
+   *
+   * **Usage**
+   *
+   * The
+   * [page.waitForFunction(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-wait-for-function)
+   * can be used to observe viewport size change:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   *
+   * (async () => {
+   *   const browser = await webkit.launch();
+   *   const page = await browser.newPage();
+   *   const watchDog = page.waitForFunction(() => window.innerWidth < 100);
+   *   await page.setViewportSize({ width: 50, height: 50 });
+   *   await watchDog;
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * To pass an argument to the predicate of
+   * [page.waitForFunction(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-wait-for-function)
+   * function:
+   *
+   * ```js
+   * const selector = '.foo';
+   * await page.waitForFunction(selector => !!document.querySelector(selector), selector);
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression).
+   * @param options
+   */
+  waitForFunction<R>(pageFunction: PageFunction<void, R>, arg?: any, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
+
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options?: PageWaitForSelectorOptionsNotHidden): Promise<ElementHandleForTag<K>>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector(selector: string, options?: PageWaitForSelectorOptionsNotHidden): Promise<ElementHandle<SVGElement | HTMLElement>>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options: PageWaitForSelectorOptions): Promise<ElementHandleForTag<K> | null>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector(selector: string, options: PageWaitForSelectorOptions): Promise<null|ElementHandle<SVGElement | HTMLElement>>;
+
+  /**
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-name) on the `window` object of
+   * every frame in this page. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) and returns a
+   * [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback). If the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) returns a [Promise],
+   * it will be awaited.
+   *
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) function contains
+   * information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
+   *
+   * See
+   * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)
+   * for the context-wide version.
+   *
+   * **NOTE** Functions installed via
+   * [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)
+   * survive navigations.
+   *
+   * **Usage**
+   *
+   * An example of exposing page URL to all frames in a page:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   *
+   * (async () => {
+   *   const browser = await webkit.launch({ headless: false });
+   *   const context = await browser.newContext();
+   *   const page = await context.newPage();
+   *   await page.exposeBinding('pageURL', ({ page }) => page.url());
+   *   await page.setContent(`
+   *     <script>
+   *       async function onClick() {
+   *         document.querySelector('div').textContent = await window.pageURL();
+   *       }
+   *     </script>
+   *     <button onclick="onClick()">Click me</button>
+   *     <div></div>
+   *   `);
+   *   await page.click('button');
+   * })();
+   * ```
+   *
+   * @param name Name of the function on the window object.
+   * @param callback Callback function that will be called in the Playwright's context.
+   * @param options
+   */
+  exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<void>;
+  /**
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-name) on the `window` object of
+   * every frame in this page. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) and returns a
+   * [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback). If the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) returns a [Promise],
+   * it will be awaited.
+   *
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) function contains
+   * information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
+   *
+   * See
+   * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)
+   * for the context-wide version.
+   *
+   * **NOTE** Functions installed via
+   * [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)
+   * survive navigations.
+   *
+   * **Usage**
+   *
+   * An example of exposing page URL to all frames in a page:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   *
+   * (async () => {
+   *   const browser = await webkit.launch({ headless: false });
+   *   const context = await browser.newContext();
+   *   const page = await context.newPage();
+   *   await page.exposeBinding('pageURL', ({ page }) => page.url());
+   *   await page.setContent(`
+   *     <script>
+   *       async function onClick() {
+   *         document.querySelector('div').textContent = await window.pageURL();
+   *       }
+   *     </script>
+   *     <button onclick="onClick()">Click me</button>
+   *     <div></div>
+   *   `);
+   *   await page.click('button');
+   * })();
+   * ```
+   *
+   * @param name Name of the function on the window object.
+   * @param callback Callback function that will be called in the Playwright's context.
+   * @param options
+   */
+  exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<void>;
+
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('request', async request => {
+   *   const response = await request.response();
+   *   const body = await response.body();
+   *   console.log(body.byteLength);
+   * });
+   * await page.goto('https://playwright.dev', { waitUntil: 'domcontentloaded' });
+   * // Waits for all the reported 'request' events to resolve.
+   * await page.removeAllListeners('request', { behavior: 'wait' });
+   * ```
+   *
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type?: string): this;
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('request', async request => {
+   *   const response = await request.response();
+   *   const body = await response.body();
+   *   console.log(body.byteLength);
+   * });
+   * await page.goto('https://playwright.dev', { waitUntil: 'domcontentloaded' });
+   * // Waits for all the reported 'request' events to resolve.
+   * await page.removeAllListeners('request', { behavior: 'wait' });
+   * ```
+   *
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
+  /**
+   * Emitted when the page closes.
+   */
+  on(event: 'close', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  on(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Emitted when the page crashes. Browser pages might crash if they try to allocate too much memory. When the page
+   * crashes, ongoing and subsequent operations will throw.
+   *
+   * The most common way to deal with crashes is to catch an exception:
+   *
+   * ```js
+   * try {
+   *   // Crash might happen during a click.
+   *   await page.click('button');
+   *   // Or while waiting for an event.
+   *   await page.waitForEvent('popup');
+   * } catch (e) {
+   *   // When the page crashes, exception message contains 'crash'.
+   * }
+   * ```
+   *
+   */
+  on(event: 'crash', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('dialog', dialog => dialog.accept());
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  on(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Emitted when the JavaScript
+   * [`DOMContentLoaded`](https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded) event is dispatched.
+   */
+  on(event: 'domcontentloaded', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when attachment download started. User can access basic file operations on downloaded content via the
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
+   */
+  on(event: 'download', listener: (download: Download) => any): this;
+
+  /**
+   * Emitted when a file chooser is supposed to appear, such as after clicking the  `<input type=file>`. Playwright can
+   * respond to it via setting the input files using
+   * [fileChooser.setFiles(files[, options])](https://playwright.dev/docs/api/class-filechooser#file-chooser-set-files)
+   * that can be uploaded after that.
+   *
+   * ```js
+   * page.on('filechooser', async fileChooser => {
+   *   await fileChooser.setFiles(path.join(__dirname, '/tmp/myfile.pdf'));
+   * });
+   * ```
+   *
+   */
+  on(event: 'filechooser', listener: (fileChooser: FileChooser) => any): this;
+
+  /**
+   * Emitted when a frame is attached.
+   */
+  on(event: 'frameattached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when a frame is detached.
+   */
+  on(event: 'framedetached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when a frame is navigated to a new url.
+   */
+  on(event: 'framenavigated', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when the JavaScript [`load`](https://developer.mozilla.org/en-US/docs/Web/Events/load) event is dispatched.
+   */
+  on(event: 'load', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when an uncaught exception happens within the page.
+   *
+   * ```js
+   * // Log all uncaught errors to the terminal
+   * page.on('pageerror', exception => {
+   *   console.log(`Uncaught exception: "${exception}"`);
+   * });
+   *
+   * // Navigate to a page with an exception.
+   * await page.goto('data:text/html,<script>throw new Error("Test")</script>');
+   * ```
+   *
+   */
+  on(event: 'pageerror', listener: (error: Error) => any): this;
+
+  /**
+   * Emitted when the page opens a new tab or window. This event is emitted in addition to the
+   * [browserContext.on('page')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-page), but
+   * only for popups relevant to this page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * // Start waiting for popup before clicking. Note no await.
+   * const popupPromise = page.waitForEvent('popup');
+   * await page.getByText('open the popup').click();
+   * const popup = await popupPromise;
+   * console.log(await popup.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  on(event: 'popup', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a page issues a request. The [request] object is read-only. In order to intercept and mutate requests,
+   * see [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) or
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   */
+  on(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request fails, for example by timing out.
+   *
+   * ```js
+   * page.on('requestfailed', request => {
+   *   console.log(request.url() + ' ' + request.failure().errorText);
+   * });
+   * ```
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished) event and not
+   * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
+   * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
+   * error net::ERR_FAILED.
+   *
+   */
+  on(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`.
+   */
+  on(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`.
+   */
+  on(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
+   */
+  on(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is spawned
+   * by the page.
+   */
+  on(event: 'worker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'crash', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'domcontentloaded', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'download', listener: (download: Download) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'filechooser', listener: (fileChooser: FileChooser) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'frameattached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'framedetached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'framenavigated', listener: (frame: Frame) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'load', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'pageerror', listener: (error: Error) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'popup', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'worker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when the page closes.
+   */
+  addListener(event: 'close', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  addListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Emitted when the page crashes. Browser pages might crash if they try to allocate too much memory. When the page
+   * crashes, ongoing and subsequent operations will throw.
+   *
+   * The most common way to deal with crashes is to catch an exception:
+   *
+   * ```js
+   * try {
+   *   // Crash might happen during a click.
+   *   await page.click('button');
+   *   // Or while waiting for an event.
+   *   await page.waitForEvent('popup');
+   * } catch (e) {
+   *   // When the page crashes, exception message contains 'crash'.
+   * }
+   * ```
+   *
+   */
+  addListener(event: 'crash', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('dialog', dialog => dialog.accept());
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  addListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Emitted when the JavaScript
+   * [`DOMContentLoaded`](https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded) event is dispatched.
+   */
+  addListener(event: 'domcontentloaded', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when attachment download started. User can access basic file operations on downloaded content via the
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
+   */
+  addListener(event: 'download', listener: (download: Download) => any): this;
+
+  /**
+   * Emitted when a file chooser is supposed to appear, such as after clicking the  `<input type=file>`. Playwright can
+   * respond to it via setting the input files using
+   * [fileChooser.setFiles(files[, options])](https://playwright.dev/docs/api/class-filechooser#file-chooser-set-files)
+   * that can be uploaded after that.
+   *
+   * ```js
+   * page.on('filechooser', async fileChooser => {
+   *   await fileChooser.setFiles(path.join(__dirname, '/tmp/myfile.pdf'));
+   * });
+   * ```
+   *
+   */
+  addListener(event: 'filechooser', listener: (fileChooser: FileChooser) => any): this;
+
+  /**
+   * Emitted when a frame is attached.
+   */
+  addListener(event: 'frameattached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when a frame is detached.
+   */
+  addListener(event: 'framedetached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when a frame is navigated to a new url.
+   */
+  addListener(event: 'framenavigated', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when the JavaScript [`load`](https://developer.mozilla.org/en-US/docs/Web/Events/load) event is dispatched.
+   */
+  addListener(event: 'load', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when an uncaught exception happens within the page.
+   *
+   * ```js
+   * // Log all uncaught errors to the terminal
+   * page.on('pageerror', exception => {
+   *   console.log(`Uncaught exception: "${exception}"`);
+   * });
+   *
+   * // Navigate to a page with an exception.
+   * await page.goto('data:text/html,<script>throw new Error("Test")</script>');
+   * ```
+   *
+   */
+  addListener(event: 'pageerror', listener: (error: Error) => any): this;
+
+  /**
+   * Emitted when the page opens a new tab or window. This event is emitted in addition to the
+   * [browserContext.on('page')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-page), but
+   * only for popups relevant to this page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * // Start waiting for popup before clicking. Note no await.
+   * const popupPromise = page.waitForEvent('popup');
+   * await page.getByText('open the popup').click();
+   * const popup = await popupPromise;
+   * console.log(await popup.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  addListener(event: 'popup', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a page issues a request. The [request] object is read-only. In order to intercept and mutate requests,
+   * see [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) or
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   */
+  addListener(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request fails, for example by timing out.
+   *
+   * ```js
+   * page.on('requestfailed', request => {
+   *   console.log(request.url() + ' ' + request.failure().errorText);
+   * });
+   * ```
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished) event and not
+   * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
+   * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
+   * error net::ERR_FAILED.
+   *
+   */
+  addListener(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`.
+   */
+  addListener(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`.
+   */
+  addListener(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
+   */
+  addListener(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is spawned
+   * by the page.
+   */
+  addListener(event: 'worker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'crash', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'domcontentloaded', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'download', listener: (download: Download) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'filechooser', listener: (fileChooser: FileChooser) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'frameattached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'framedetached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'framenavigated', listener: (frame: Frame) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'load', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'pageerror', listener: (error: Error) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'popup', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'worker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'crash', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'domcontentloaded', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'download', listener: (download: Download) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'filechooser', listener: (fileChooser: FileChooser) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'frameattached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'framedetached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'framenavigated', listener: (frame: Frame) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'load', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'pageerror', listener: (error: Error) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'popup', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'worker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when the page closes.
+   */
+  prependListener(event: 'close', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  prependListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Emitted when the page crashes. Browser pages might crash if they try to allocate too much memory. When the page
+   * crashes, ongoing and subsequent operations will throw.
+   *
+   * The most common way to deal with crashes is to catch an exception:
+   *
+   * ```js
+   * try {
+   *   // Crash might happen during a click.
+   *   await page.click('button');
+   *   // Or while waiting for an event.
+   *   await page.waitForEvent('popup');
+   * } catch (e) {
+   *   // When the page crashes, exception message contains 'crash'.
+   * }
+   * ```
+   *
+   */
+  prependListener(event: 'crash', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('dialog', dialog => dialog.accept());
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  prependListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Emitted when the JavaScript
+   * [`DOMContentLoaded`](https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded) event is dispatched.
+   */
+  prependListener(event: 'domcontentloaded', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when attachment download started. User can access basic file operations on downloaded content via the
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
+   */
+  prependListener(event: 'download', listener: (download: Download) => any): this;
+
+  /**
+   * Emitted when a file chooser is supposed to appear, such as after clicking the  `<input type=file>`. Playwright can
+   * respond to it via setting the input files using
+   * [fileChooser.setFiles(files[, options])](https://playwright.dev/docs/api/class-filechooser#file-chooser-set-files)
+   * that can be uploaded after that.
+   *
+   * ```js
+   * page.on('filechooser', async fileChooser => {
+   *   await fileChooser.setFiles(path.join(__dirname, '/tmp/myfile.pdf'));
+   * });
+   * ```
+   *
+   */
+  prependListener(event: 'filechooser', listener: (fileChooser: FileChooser) => any): this;
+
+  /**
+   * Emitted when a frame is attached.
+   */
+  prependListener(event: 'frameattached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when a frame is detached.
+   */
+  prependListener(event: 'framedetached', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when a frame is navigated to a new url.
+   */
+  prependListener(event: 'framenavigated', listener: (frame: Frame) => any): this;
+
+  /**
+   * Emitted when the JavaScript [`load`](https://developer.mozilla.org/en-US/docs/Web/Events/load) event is dispatched.
+   */
+  prependListener(event: 'load', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when an uncaught exception happens within the page.
+   *
+   * ```js
+   * // Log all uncaught errors to the terminal
+   * page.on('pageerror', exception => {
+   *   console.log(`Uncaught exception: "${exception}"`);
+   * });
+   *
+   * // Navigate to a page with an exception.
+   * await page.goto('data:text/html,<script>throw new Error("Test")</script>');
+   * ```
+   *
+   */
+  prependListener(event: 'pageerror', listener: (error: Error) => any): this;
+
+  /**
+   * Emitted when the page opens a new tab or window. This event is emitted in addition to the
+   * [browserContext.on('page')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-page), but
+   * only for popups relevant to this page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * // Start waiting for popup before clicking. Note no await.
+   * const popupPromise = page.waitForEvent('popup');
+   * await page.getByText('open the popup').click();
+   * const popup = await popupPromise;
+   * console.log(await popup.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  prependListener(event: 'popup', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a page issues a request. The [request] object is read-only. In order to intercept and mutate requests,
+   * see [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) or
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   */
+  prependListener(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request fails, for example by timing out.
+   *
+   * ```js
+   * page.on('requestfailed', request => {
+   *   console.log(request.url() + ' ' + request.failure().errorText);
+   * });
+   * ```
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished) event and not
+   * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
+   * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
+   * error net::ERR_FAILED.
+   *
+   */
+  prependListener(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`.
+   */
+  prependListener(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`.
+   */
+  prependListener(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
+   */
+  prependListener(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is spawned
+   * by the page.
+   */
+  prependListener(event: 'worker', listener: (worker: Worker) => any): this;
+
+  /**
+   * When testing a web page, sometimes unexpected overlays like a "Sign up" dialog appear and block actions you want to
+   * automate, e.g. clicking a button. These overlays don't always show up in the same way or at the same time, making
+   * them tricky to handle in automated tests.
+   *
+   * This method lets you set up a special function, called a handler, that activates when it detects that overlay is
+   * visible. The handler's job is to remove the overlay, allowing your test to continue as if the overlay wasn't there.
+   *
+   * Things to keep in mind:
+   * - When an overlay is shown predictably, we recommend explicitly waiting for it in your test and dismissing it as
+   *   a part of your normal test flow, instead of using
+   *   [page.addLocatorHandler(locator, handler[, options])](https://playwright.dev/docs/api/class-page#page-add-locator-handler).
+   * - Playwright checks for the overlay every time before executing or retrying an action that requires an
+   *   [actionability check](https://playwright.dev/docs/actionability), or before performing an auto-waiting assertion check. When overlay
+   *   is visible, Playwright calls the handler first, and then proceeds with the action/assertion. Note that the
+   *   handler is only called when you perform an action/assertion - if the overlay becomes visible but you don't
+   *   perform any actions, the handler will not be triggered.
+   * - After executing the handler, Playwright will ensure that overlay that triggered the handler is not visible
+   *   anymore. You can opt-out of this behavior with
+   *   [`noWaitAfter`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-no-wait-after).
+   * - The execution time of the handler counts towards the timeout of the action/assertion that executed the handler.
+   *   If your handler takes too long, it might cause timeouts.
+   * - You can register multiple handlers. However, only a single handler will be running at a time. Make sure the
+   *   actions within a handler don't depend on another handler.
+   *
+   * **NOTE** Running the handler will alter your page state mid-test. For example it will change the currently focused
+   * element and move the mouse. Make sure that actions that run after the handler are self-contained and do not rely on
+   * the focus and mouse state being unchanged.
+   *
+   * For example, consider a test that calls
+   * [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) followed by
+   * [keyboard.press(key[, options])](https://playwright.dev/docs/api/class-keyboard#keyboard-press). If your handler
+   * clicks a button between these two actions, the focused element most likely will be wrong, and key press will happen
+   * on the unexpected element. Use
+   * [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press) instead to avoid this
+   * problem.
+   *
+   * Another example is a series of mouse actions, where
+   * [mouse.move(x, y[, options])](https://playwright.dev/docs/api/class-mouse#mouse-move) is followed by
+   * [mouse.down([options])](https://playwright.dev/docs/api/class-mouse#mouse-down). Again, when the handler runs
+   * between these two actions, the mouse position will be wrong during the mouse down. Prefer self-contained actions
+   * like [locator.click([options])](https://playwright.dev/docs/api/class-locator#locator-click) that do not rely on
+   * the state being unchanged by a handler.
+   *
+   * **Usage**
+   *
+   * An example that closes a "Sign up to the newsletter" dialog when it appears:
+   *
+   * ```js
+   * // Setup the handler.
+   * await page.addLocatorHandler(page.getByText('Sign up to the newsletter'), async () => {
+   *   await page.getByRole('button', { name: 'No thanks' }).click();
+   * });
+   *
+   * // Write the test as usual.
+   * await page.goto('https://example.com');
+   * await page.getByRole('button', { name: 'Start here' }).click();
+   * ```
+   *
+   * An example that skips the "Confirm your security details" page when it is shown:
+   *
+   * ```js
+   * // Setup the handler.
+   * await page.addLocatorHandler(page.getByText('Confirm your security details'), async () => {
+   *   await page.getByRole('button', { name: 'Remind me later' }).click();
+   * });
+   *
+   * // Write the test as usual.
+   * await page.goto('https://example.com');
+   * await page.getByRole('button', { name: 'Start here' }).click();
+   * ```
+   *
+   * An example with a custom callback on every actionability check. It uses a `<body>` locator that is always visible,
+   * so the handler is called before every actionability check. It is important to specify
+   * [`noWaitAfter`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-no-wait-after), because
+   * the handler does not hide the `<body>` element.
+   *
+   * ```js
+   * // Setup the handler.
+   * await page.addLocatorHandler(page.locator('body'), async () => {
+   *   await page.evaluate(() => window.removeObstructionsForTestIfNeeded());
+   * }, { noWaitAfter: true });
+   *
+   * // Write the test as usual.
+   * await page.goto('https://example.com');
+   * await page.getByRole('button', { name: 'Start here' }).click();
+   * ```
+   *
+   * Handler takes the original locator as an argument. You can also automatically remove the handler after a number of
+   * invocations by setting [`times`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-times):
+   *
+   * ```js
+   * await page.addLocatorHandler(page.getByLabel('Close'), async locator => {
+   *   await locator.click();
+   * }, { times: 1 });
+   * ```
+   *
+   * @param locator Locator that triggers the handler.
+   * @param handler Function that should be run once
+   * [`locator`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-locator) appears. This
+   * function should get rid of the element that blocks actions like click.
+   * @param options
+   */
+  addLocatorHandler(locator: Locator, handler: ((locator: Locator) => Promise<any>), options?: {
+    /**
+     * By default, after calling the handler Playwright will wait until the overlay becomes hidden, and only then
+     * Playwright will continue with the action/assertion that triggered the handler. This option allows to opt-out of
+     * this behavior, so that overlay can stay visible after the handler has run.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Specifies the maximum number of times this handler should be called. Unlimited by default.
+     */
+    times?: number;
+  }): Promise<void>;
+
+  /**
+   * Adds a `<script>` tag into the page with the desired url or content. Returns the added tag when the script's onload
+   * fires or when the script content was injected into frame.
+   * @param options
+   */
+  addScriptTag(options?: {
+    /**
+     * Raw JavaScript content to be injected into frame.
+     */
+    content?: string;
+
+    /**
+     * Path to the JavaScript file to be injected into frame. If `path` is a relative path, then it is resolved relative
+     * to the current working directory.
+     */
+    path?: string;
+
+    /**
+     * Script type. Use 'module' in order to load a JavaScript ES6 module. See
+     * [script](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script) for more details.
+     */
+    type?: string;
+
+    /**
+     * URL of a script to be added.
+     */
+    url?: string;
+  }): Promise<ElementHandle>;
+
+  /**
+   * Adds a `<link rel="stylesheet">` tag into the page with the desired url or a `<style type="text/css">` tag with the
+   * content. Returns the added tag when the stylesheet's onload fires or when the CSS content was injected into frame.
+   * @param options
+   */
+  addStyleTag(options?: {
+    /**
+     * Raw CSS content to be injected into frame.
+     */
+    content?: string;
+
+    /**
+     * Path to the CSS file to be injected into frame. If `path` is a relative path, then it is resolved relative to the
+     * current working directory.
+     */
+    path?: string;
+
+    /**
+     * URL of the `<link>` tag.
+     */
+    url?: string;
+  }): Promise<ElementHandle>;
+
+  /**
+   * Brings page to front (activates tab).
+   */
+  bringToFront(): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.check([options])](https://playwright.dev/docs/api/class-locator#locator-check) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-check-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-check-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
+   *    already checked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-check-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-check-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  check(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.click([options])](https://playwright.dev/docs/api/class-locator#locator-click) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-click-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-click-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-click-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-page#page-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-page#page-click-option-no-wait-after) option is set.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-click-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  click(selector: string, options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * If [`runBeforeUnload`](https://playwright.dev/docs/api/class-page#page-close-option-run-before-unload) is `false`,
+   * does not run any unload handlers and waits for the page to be closed. If
+   * [`runBeforeUnload`](https://playwright.dev/docs/api/class-page#page-close-option-run-before-unload) is `true` the
+   * method will run unload handlers, but will **not** wait for the page to close.
+   *
+   * By default, `page.close()` **does not** run `beforeunload` handlers.
+   *
+   * **NOTE** if [`runBeforeUnload`](https://playwright.dev/docs/api/class-page#page-close-option-run-before-unload) is
+   * passed as true, a `beforeunload` dialog might be summoned and should be handled manually via
+   * [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) event.
+   *
+   * @param options
+   */
+  close(options?: {
+    /**
+     * The reason to be reported to the operations interrupted by the page closure.
+     */
+    reason?: string;
+
+    /**
+     * Defaults to `false`. Whether to run the
+     * [before unload](https://developer.mozilla.org/en-US/docs/Web/Events/beforeunload) page handlers.
+     */
+    runBeforeUnload?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Gets the full HTML contents of the page, including the doctype.
+   */
+  content(): Promise<string>;
+
+  /**
+   * Get the browser context that the page belongs to.
+   */
+  context(): BrowserContext;
+
+  /**
+   * **NOTE** Use locator-based [locator.dblclick([options])](https://playwright.dev/docs/api/class-locator#locator-dblclick)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method double clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-dblclick-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-page#page-dblclick-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-dblclick-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-page#page-dblclick-option-position).
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-dblclick-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** `page.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  dblclick(selector: string, options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.dispatchEvent(type[, eventInit, options])](https://playwright.dev/docs/api/class-locator#locator-dispatch-event)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The snippet below dispatches the `click` event on the element. Regardless of the visibility state of the element,
+   * `click` is dispatched. This is equivalent to calling
+   * [element.click()](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/click).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.dispatchEvent('button#submit', 'click');
+   * ```
+   *
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-page#page-dispatch-event-option-type), initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-page#page-dispatch-event-option-event-init) properties and
+   * dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   *
+   * Since [`eventInit`](https://playwright.dev/docs/api/class-page#page-dispatch-event-option-event-init) is
+   * event-specific, please refer to the events documentation for the lists of initial properties:
+   * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
+   * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
+   * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
+   * - [Event](https://developer.mozilla.org/en-US/docs/Web/API/Event/Event)
+   * - [FocusEvent](https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent/FocusEvent)
+   * - [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/KeyboardEvent)
+   * - [MouseEvent](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/MouseEvent)
+   * - [PointerEvent](https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent/PointerEvent)
+   * - [TouchEvent](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/TouchEvent)
+   * - [WheelEvent](https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/WheelEvent)
+   *
+   * You can also specify `JSHandle` as the property value if you want live objects to be passed into the event:
+   *
+   * ```js
+   * // Note you can only create DataTransfer in Chromium and Firefox
+   * const dataTransfer = await page.evaluateHandle(() => new DataTransfer());
+   * await page.dispatchEvent('#source', 'dragstart', { dataTransfer });
+   * ```
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param type DOM event type: `"click"`, `"dragstart"`, etc.
+   * @param eventInit Optional event-specific initialization properties.
+   * @param options
+   */
+  dispatchEvent(selector: string, type: string, eventInit?: EvaluationArgument, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * This method drags the source element to the target element. It will first move to the source element, perform a
+   * `mousedown`, then move to the target element and perform a `mouseup`.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.dragAndDrop('#source', '#target');
+   * // or specify exact positions relative to the top-left corners of the elements:
+   * await page.dragAndDrop('#source', '#target', {
+   *   sourcePosition: { x: 34, y: 7 },
+   *   targetPosition: { x: 10, y: 20 },
+   * });
+   * ```
+   *
+   * @param source A selector to search for an element to drag. If there are multiple elements satisfying the selector, the first will
+   * be used.
+   * @param target A selector to search for an element to drop onto. If there are multiple elements satisfying the selector, the first
+   * will be used.
+   * @param options
+   */
+  dragAndDrop(source: string, target: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
+     * specified, some visible point of the element is used.
+     */
+    sourcePosition?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Drops on the target element at this point relative to the top-left corner of the element's padding box. If not
+     * specified, some visible point of the element is used.
+     */
+    targetPosition?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * This method changes the `CSS media type` through the `media` argument, and/or the `'prefers-colors-scheme'` media
+   * feature, using the `colorScheme` argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.evaluate(() => matchMedia('screen').matches);
+   * // → true
+   * await page.evaluate(() => matchMedia('print').matches);
+   * // → false
+   *
+   * await page.emulateMedia({ media: 'print' });
+   * await page.evaluate(() => matchMedia('screen').matches);
+   * // → false
+   * await page.evaluate(() => matchMedia('print').matches);
+   * // → true
+   *
+   * await page.emulateMedia({});
+   * await page.evaluate(() => matchMedia('screen').matches);
+   * // → true
+   * await page.evaluate(() => matchMedia('print').matches);
+   * // → false
+   * ```
+   *
+   * ```js
+   * await page.emulateMedia({ colorScheme: 'dark' });
+   * await page.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches);
+   * // → true
+   * await page.evaluate(() => matchMedia('(prefers-color-scheme: light)').matches);
+   * // → false
+   * ```
+   *
+   * @param options
+   */
+  emulateMedia(options?: {
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. Passing `null` disables color scheme emulation.
+     * `'no-preference'` is deprecated.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
+
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. Passing `null`
+     * disables contrast emulation.
+     */
+    contrast?: null|"no-preference"|"more";
+
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'` and `'none'`. Passing `null` disables
+     * forced colors emulation.
+     */
+    forcedColors?: null|"active"|"none";
+
+    /**
+     * Changes the CSS media type of the page. The only allowed values are `'screen'`, `'print'` and `null`. Passing
+     * `null` disables CSS media emulation.
+     */
+    media?: null|"screen"|"print";
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. Passing
+     * `null` disables reduced motion emulation.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
+  }): Promise<void>;
+
+  /**
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-page#page-expose-function-option-name) on the `window` object of
+   * every frame in the page. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-function-option-callback) and returns a
+   * [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-function-option-callback).
+   *
+   * If the [`callback`](https://playwright.dev/docs/api/class-page#page-expose-function-option-callback) returns a
+   * [Promise], it will be awaited.
+   *
+   * See
+   * [browserContext.exposeFunction(name, callback)](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function)
+   * for context-wide exposed function.
+   *
+   * **NOTE** Functions installed via
+   * [page.exposeFunction(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-function) survive
+   * navigations.
+   *
+   * **Usage**
+   *
+   * An example of adding a `sha256` function to the page:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   * const crypto = require('crypto');
+   *
+   * (async () => {
+   *   const browser = await webkit.launch({ headless: false });
+   *   const page = await browser.newPage();
+   *   await page.exposeFunction('sha256', text =>
+   *     crypto.createHash('sha256').update(text).digest('hex'),
+   *   );
+   *   await page.setContent(`
+   *     <script>
+   *       async function onClick() {
+   *         document.querySelector('div').textContent = await window.sha256('PLAYWRIGHT');
+   *       }
+   *     </script>
+   *     <button onclick="onClick()">Click me</button>
+   *     <div></div>
+   *   `);
+   *   await page.click('button');
+   * })();
+   * ```
+   *
+   * @param name Name of the function on the window object
+   * @param callback Callback function which will be called in Playwright's context.
+   */
+  exposeFunction(name: string, callback: Function): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-fill-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, fills it and triggers an `input` event after
+   * filling. Note that you can pass an empty string to clear the input field.
+   *
+   * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
+   * error. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
+   * instead.
+   *
+   * To send fine-grained keyboard events, use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param value Value to fill for the `<input>`, `<textarea>` or `[contenteditable]` element.
+   * @param options
+   */
+  fill(selector: string, value: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method fetches an element with
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-focus-option-selector) and focuses it. If there's no
+   * element matching [`selector`](https://playwright.dev/docs/api/class-page#page-focus-option-selector), the method
+   * waits until a matching element appears in the DOM.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  focus(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Returns frame matching the specified criteria. Either `name` or `url` must be specified.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const frame = page.frame('frame-name');
+   * ```
+   *
+   * ```js
+   * const frame = page.frame({ url: /.*domain.*\/ });
+   * ```
+   *
+   * @param frameSelector Frame name or other frame lookup options.
+   */
+  frame(frameSelector: string|{
+    /**
+     * Frame name specified in the `iframe`'s `name` attribute. Optional.
+     */
+    name?: string;
+
+    /**
+     * A glob pattern, regex pattern or predicate receiving frame's `url` as a [URL] object. Optional.
+     */
+    url?: string|RegExp|((url: URL) => boolean);
+  }): null|Frame;
+
+  /**
+   * When working with iframes, you can create a frame locator that will enter the iframe and allow selecting elements
+   * in that iframe.
+   *
+   * **Usage**
+   *
+   * Following snippet locates element with text "Submit" in the iframe with id `my-frame`, like `<iframe
+   * id="my-frame">`:
+   *
+   * ```js
+   * const locator = page.frameLocator('#my-iframe').getByText('Submit');
+   * await locator.click();
+   * ```
+   *
+   * @param selector A selector to use when resolving DOM element.
+   */
+  frameLocator(selector: string): FrameLocator;
+
+  /**
+   * An array of all frames attached to the page.
+   */
+  frames(): Array<Frame>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.getAttribute(name[, options])](https://playwright.dev/docs/api/class-locator#locator-get-attribute)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns element attribute value.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param name Attribute name to get the value for.
+   * @param options
+   */
+  getAttribute(selector: string, name: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|string>;
+
+  /**
+   * Allows locating elements by their alt text.
+   *
+   * **Usage**
+   *
+   * For example, this method will find the image by alt text "Playwright logo":
+   *
+   * ```html
+   * <img alt='Playwright logo'>
+   * ```
+   *
+   * ```js
+   * await page.getByAltText('Playwright logo').click();
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByAltText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the text of the associated `<label>` or `aria-labelledby` element, or by the
+   * `aria-label` attribute.
+   *
+   * **Usage**
+   *
+   * For example, this method will find inputs by label "Username" and "Password" in the following DOM:
+   *
+   * ```html
+   * <input aria-label="Username">
+   * <label for="password-input">Password:</label>
+   * <input id="password-input">
+   * ```
+   *
+   * ```js
+   * await page.getByLabel('Username').fill('john');
+   * await page.getByLabel('Password').fill('secret');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByLabel(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the placeholder text.
+   *
+   * **Usage**
+   *
+   * For example, consider the following DOM structure.
+   *
+   * ```html
+   * <input type="email" placeholder="name@example.com" />
+   * ```
+   *
+   * You can fill the input after locating it by the placeholder text:
+   *
+   * ```js
+   * await page
+   *     .getByPlaceholder('name@example.com')
+   *     .fill('playwright@microsoft.com');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByPlaceholder(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their [ARIA role](https://www.w3.org/TR/wai-aria-1.2/#roles),
+   * [ARIA attributes](https://www.w3.org/TR/wai-aria-1.2/#aria-attributes) and
+   * [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <h3>Sign up</h3>
+   * <label>
+   *   <input type="checkbox" /> Subscribe
+   * </label>
+   * <br/>
+   * <button>Submit</button>
+   * ```
+   *
+   * You can locate each element by it's implicit role:
+   *
+   * ```js
+   * await expect(page.getByRole('heading', { name: 'Sign up' })).toBeVisible();
+   *
+   * await page.getByRole('checkbox', { name: 'Subscribe' }).check();
+   *
+   * await page.getByRole('button', { name: /submit/i }).click();
+   * ```
+   *
+   * **Details**
+   *
+   * Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback
+   * about the ARIA guidelines.
+   *
+   * Many html elements have an implicitly [defined role](https://w3c.github.io/html-aam/#html-element-role-mappings)
+   * that is recognized by the role selector. You can find all the
+   * [supported roles here](https://www.w3.org/TR/wai-aria-1.2/#role_definitions). ARIA guidelines **do not recommend**
+   * duplicating implicit roles and attributes by setting `role` and/or `aria-*` attributes to default values.
+   * @param role Required aria role.
+   * @param options
+   */
+  getByRole(role: "alert"|"alertdialog"|"application"|"article"|"banner"|"blockquote"|"button"|"caption"|"cell"|"checkbox"|"code"|"columnheader"|"combobox"|"complementary"|"contentinfo"|"definition"|"deletion"|"dialog"|"directory"|"document"|"emphasis"|"feed"|"figure"|"form"|"generic"|"grid"|"gridcell"|"group"|"heading"|"img"|"insertion"|"link"|"list"|"listbox"|"listitem"|"log"|"main"|"marquee"|"math"|"meter"|"menu"|"menubar"|"menuitem"|"menuitemcheckbox"|"menuitemradio"|"navigation"|"none"|"note"|"option"|"paragraph"|"presentation"|"progressbar"|"radio"|"radiogroup"|"region"|"row"|"rowgroup"|"rowheader"|"scrollbar"|"search"|"searchbox"|"separator"|"slider"|"spinbutton"|"status"|"strong"|"subscript"|"superscript"|"switch"|"tab"|"table"|"tablist"|"tabpanel"|"term"|"textbox"|"time"|"timer"|"toolbar"|"tooltip"|"tree"|"treegrid"|"treeitem", options?: {
+    /**
+     * An attribute that is usually set by `aria-checked` or native `<input type=checkbox>` controls.
+     *
+     * Learn more about [`aria-checked`](https://www.w3.org/TR/wai-aria-1.2/#aria-checked).
+     */
+    checked?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-disabled` or `disabled`.
+     *
+     * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
+     * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
+     */
+    disabled?: boolean;
+
+    /**
+     * Whether [`name`](https://playwright.dev/docs/api/class-page#page-get-by-role-option-name) is matched exactly:
+     * case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-page#page-get-by-role-option-name) is a regular expression. Note
+     * that exact match still trims whitespace.
+     */
+    exact?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-expanded`.
+     *
+     * Learn more about [`aria-expanded`](https://www.w3.org/TR/wai-aria-1.2/#aria-expanded).
+     */
+    expanded?: boolean;
+
+    /**
+     * Option that controls whether hidden elements are matched. By default, only non-hidden elements, as
+     * [defined by ARIA](https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion), are matched by role selector.
+     *
+     * Learn more about [`aria-hidden`](https://www.w3.org/TR/wai-aria-1.2/#aria-hidden).
+     */
+    includeHidden?: boolean;
+
+    /**
+     * A number attribute that is usually present for roles `heading`, `listitem`, `row`, `treeitem`, with default values
+     * for `<h1>-<h6>` elements.
+     *
+     * Learn more about [`aria-level`](https://www.w3.org/TR/wai-aria-1.2/#aria-level).
+     */
+    level?: number;
+
+    /**
+     * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-page#page-get-by-role-option-exact) to control this behavior.
+     *
+     * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+     */
+    name?: string|RegExp;
+
+    /**
+     * An attribute that is usually set by `aria-pressed`.
+     *
+     * Learn more about [`aria-pressed`](https://www.w3.org/TR/wai-aria-1.2/#aria-pressed).
+     */
+    pressed?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-selected`.
+     *
+     * Learn more about [`aria-selected`](https://www.w3.org/TR/wai-aria-1.2/#aria-selected).
+     */
+    selected?: boolean;
+  }): Locator;
+
+  /**
+   * Locate element by the test id.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <button data-testid="directions">Itinéraire</button>
+   * ```
+   *
+   * You can locate the element by it's test id:
+   *
+   * ```js
+   * await page.getByTestId('directions').click();
+   * ```
+   *
+   * **Details**
+   *
+   * By default, the `data-testid` attribute is used as a test id. Use
+   * [selectors.setTestIdAttribute(attributeName)](https://playwright.dev/docs/api/class-selectors#selectors-set-test-id-attribute)
+   * to configure a different test id attribute if necessary.
+   *
+   * ```js
+   * // Set custom test id attribute from @playwright/test config:
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     testIdAttribute: 'data-pw'
+   *   },
+   * });
+   * ```
+   *
+   * @param testId Id to locate the element by.
+   */
+  getByTestId(testId: string|RegExp): Locator;
+
+  /**
+   * Allows locating elements that contain given text.
+   *
+   * See also [locator.filter([options])](https://playwright.dev/docs/api/class-locator#locator-filter) that allows to
+   * match by another criteria, like an accessible role, and then filter by the text content.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure:
+   *
+   * ```html
+   * <div>Hello <span>world</span></div>
+   * <div>Hello</div>
+   * ```
+   *
+   * You can locate by text substring, exact string, or a regular expression:
+   *
+   * ```js
+   * // Matches <span>
+   * page.getByText('world');
+   *
+   * // Matches first <div>
+   * page.getByText('Hello world');
+   *
+   * // Matches second <div>
+   * page.getByText('Hello', { exact: true });
+   *
+   * // Matches both <div>s
+   * page.getByText(/Hello/);
+   *
+   * // Matches second <div>
+   * page.getByText(/^hello$/i);
+   * ```
+   *
+   * **Details**
+   *
+   * Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into
+   * one, turns line breaks into spaces and ignores leading and trailing whitespace.
+   *
+   * Input elements of the type `button` and `submit` are matched by their `value` instead of the text content. For
+   * example, locating by text `"Log in"` matches `<input type=button value="Log in">`.
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their title attribute.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <span title='Issues count'>25 issues</span>
+   * ```
+   *
+   * You can check the issues count after locating it by the title text:
+   *
+   * ```js
+   * await expect(page.getByTitle('Issues count')).toHaveText('25 issues');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByTitle(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Returns the main resource response. In case of multiple redirects, the navigation will resolve with the response of
+   * the last redirect. If cannot go back, returns `null`.
+   *
+   * Navigate to the previous page in history.
+   * @param options
+   */
+  goBack(options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * Returns the main resource response. In case of multiple redirects, the navigation will resolve with the response of
+   * the last redirect. If cannot go forward, returns `null`.
+   *
+   * Navigate to the next page in history.
+   * @param options
+   */
+  goForward(options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * Returns the main resource response. In case of multiple redirects, the navigation will resolve with the first
+   * non-redirect response.
+   *
+   * The method will throw an error if:
+   * - there's an SSL error (e.g. in case of self-signed certificates).
+   * - target URL is invalid.
+   * - the [`timeout`](https://playwright.dev/docs/api/class-page#page-goto-option-timeout) is exceeded during
+   *   navigation.
+   * - the remote server does not respond or is unreachable.
+   * - the main resource failed to load.
+   *
+   * The method will not throw an error when any valid HTTP status code is returned by the remote server, including 404
+   * "Not Found" and 500 "Internal Server Error".  The status code for such responses can be retrieved by calling
+   * [response.status()](https://playwright.dev/docs/api/class-response#response-status).
+   *
+   * **NOTE** The method either throws an error or returns a main resource response. The only exceptions are navigation
+   * to `about:blank` or navigation to the same URL with a different hash, which would succeed and return `null`.
+   *
+   * **NOTE** Headless mode doesn't support navigation to a PDF document. See the
+   * [upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=761295).
+   *
+   * @param url URL to navigate page to. The url should include scheme, e.g. `https://`. When a
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+   * options was provided and the passed URL is a path, it gets merged via the
+   * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
+   * @param options
+   */
+  goto(url: string, options?: {
+    /**
+     * Referer header value. If provided it will take preference over the referer header value set by
+     * [page.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-page#page-set-extra-http-headers).
+     */
+    referer?: string;
+
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * **NOTE** Use locator-based [locator.hover([options])](https://playwright.dev/docs/api/class-locator#locator-hover) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method hovers over an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-hover-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-hover-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-hover-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-page#page-hover-option-position).
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-hover-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  hover(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.innerHTML([options])](https://playwright.dev/docs/api/class-locator#locator-inner-html)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `element.innerHTML`.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  innerHTML(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.innerText([options])](https://playwright.dev/docs/api/class-locator#locator-inner-text)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `element.innerText`.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  innerText(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.inputValue([options])](https://playwright.dev/docs/api/class-locator#locator-input-value) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `input.value` for the selected `<input>` or `<textarea>` or `<select>` element.
+   *
+   * Throws for non-input elements. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), returns the value of the
+   * control.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  inputValue(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isChecked([options])](https://playwright.dev/docs/api/class-locator#locator-is-checked)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is checked. Throws if the element is not a checkbox or radio input.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isChecked(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Indicates that the page has been closed.
+   */
+  isClosed(): boolean;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.isDisabled([options])](https://playwright.dev/docs/api/class-locator#locator-is-disabled) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is disabled, the opposite of [enabled](https://playwright.dev/docs/actionability#enabled).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isDisabled(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.isEditable([options])](https://playwright.dev/docs/api/class-locator#locator-is-editable) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [editable](https://playwright.dev/docs/actionability#editable).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isEditable(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isEnabled([options])](https://playwright.dev/docs/api/class-locator#locator-is-enabled)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [enabled](https://playwright.dev/docs/actionability#enabled).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isEnabled(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isHidden([options])](https://playwright.dev/docs/api/class-locator#locator-is-hidden)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-is-hidden-option-selector) that does not match any
+   * elements is considered hidden.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isHidden(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * @deprecated This option is ignored.
+     * [page.isHidden(selector[, options])](https://playwright.dev/docs/api/class-page#page-is-hidden) does not wait for
+     * the element to become hidden and returns immediately.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isVisible([options])](https://playwright.dev/docs/api/class-locator#locator-is-visible)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-is-visible-option-selector) that does not match any
+   * elements is considered not visible.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isVisible(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * @deprecated This option is ignored.
+     * [page.isVisible(selector[, options])](https://playwright.dev/docs/api/class-page#page-is-visible) does not wait for
+     * the element to become visible and returns immediately.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * The method returns an element locator that can be used to perform actions on this page / frame. Locator is resolved
+   * to the element immediately before performing an action, so a series of actions on the same locator can in fact be
+   * performed on different DOM elements. That would happen if the DOM structure between those actions has changed.
+   *
+   * [Learn more about locators](https://playwright.dev/docs/locators).
+   * @param selector A selector to use when resolving DOM element.
+   * @param options
+   */
+  locator(selector: string, options?: {
+    /**
+     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
+     * `article` that has `text=Playwright` matches `<article><div>Playwright</div></article>`.
+     *
+     * Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not
+     * the document root. For example, you can find `content` that has `div` in
+     * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
+     * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    has?: Locator;
+
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    hasNot?: Locator;
+
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element.
+     * When passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    hasNotText?: string|RegExp;
+
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring. For example, `"Playwright"` matches
+     * `<article><div>Playwright</div></article>`.
+     */
+    hasText?: string|RegExp;
+  }): Locator;
+
+  /**
+   * The page's main frame. Page is guaranteed to have a main frame which persists during navigations.
+   */
+  mainFrame(): Frame;
+
+  /**
+   * Returns the opener for popup pages and `null` for others. If the opener has been closed already the returns `null`.
+   */
+  opener(): Promise<null|Page>;
+
+  /**
+   * Pauses script execution. Playwright will stop executing the script and wait for the user to either press the
+   * 'Resume' button in the page overlay or to call `playwright.resume()` in the DevTools console.
+   *
+   * User can inspect selectors or perform manual steps while paused. Resume will continue running the original script
+   * from the place it was paused.
+   *
+   * **NOTE** This method requires Playwright to be started in a headed mode, with a falsy
+   * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-headless) option.
+   *
+   */
+  pause(): Promise<void>;
+
+  /**
+   * Returns the PDF buffer.
+   *
+   * `page.pdf()` generates a pdf of the page with `print` css media. To generate a pdf with `screen` media, call
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) before calling
+   * `page.pdf()`:
+   *
+   * **NOTE** By default, `page.pdf()` generates a pdf with modified colors for printing. Use the
+   * [`-webkit-print-color-adjust`](https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-print-color-adjust)
+   * property to force rendering of exact colors.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Generates a PDF with 'screen' media type.
+   * await page.emulateMedia({ media: 'screen' });
+   * await page.pdf({ path: 'page.pdf' });
+   * ```
+   *
+   * The [`width`](https://playwright.dev/docs/api/class-page#page-pdf-option-width),
+   * [`height`](https://playwright.dev/docs/api/class-page#page-pdf-option-height), and
+   * [`margin`](https://playwright.dev/docs/api/class-page#page-pdf-option-margin) options accept values labeled with
+   * units. Unlabeled values are treated as pixels.
+   *
+   * A few examples:
+   * - `page.pdf({width: 100})` - prints with width set to 100 pixels
+   * - `page.pdf({width: '100px'})` - prints with width set to 100 pixels
+   * - `page.pdf({width: '10cm'})` - prints with width set to 10 centimeters.
+   *
+   * All possible units are:
+   * - `px` - pixel
+   * - `in` - inch
+   * - `cm` - centimeter
+   * - `mm` - millimeter
+   *
+   * The [`format`](https://playwright.dev/docs/api/class-page#page-pdf-option-format) options are:
+   * - `Letter`: 8.5in x 11in
+   * - `Legal`: 8.5in x 14in
+   * - `Tabloid`: 11in x 17in
+   * - `Ledger`: 17in x 11in
+   * - `A0`: 33.1in x 46.8in
+   * - `A1`: 23.4in x 33.1in
+   * - `A2`: 16.54in x 23.4in
+   * - `A3`: 11.7in x 16.54in
+   * - `A4`: 8.27in x 11.7in
+   * - `A5`: 5.83in x 8.27in
+   * - `A6`: 4.13in x 5.83in
+   *
+   * **NOTE** [`headerTemplate`](https://playwright.dev/docs/api/class-page#page-pdf-option-header-template) and
+   * [`footerTemplate`](https://playwright.dev/docs/api/class-page#page-pdf-option-footer-template) markup have the
+   * following limitations: > 1. Script tags inside templates are not evaluated. > 2. Page styles are not visible inside
+   * templates.
+   *
+   * @param options
+   */
+  pdf(options?: {
+    /**
+     * Display header and footer. Defaults to `false`.
+     */
+    displayHeaderFooter?: boolean;
+
+    /**
+     * HTML template for the print footer. Should use the same format as the
+     * [`headerTemplate`](https://playwright.dev/docs/api/class-page#page-pdf-option-header-template).
+     */
+    footerTemplate?: string;
+
+    /**
+     * Paper format. If set, takes priority over
+     * [`width`](https://playwright.dev/docs/api/class-page#page-pdf-option-width) or
+     * [`height`](https://playwright.dev/docs/api/class-page#page-pdf-option-height) options. Defaults to 'Letter'.
+     */
+    format?: string;
+
+    /**
+     * HTML template for the print header. Should be valid HTML markup with following classes used to inject printing
+     * values into them:
+     * - `'date'` formatted print date
+     * - `'title'` document title
+     * - `'url'` document location
+     * - `'pageNumber'` current page number
+     * - `'totalPages'` total pages in the document
+     */
+    headerTemplate?: string;
+
+    /**
+     * Paper height, accepts values labeled with units.
+     */
+    height?: string|number;
+
+    /**
+     * Paper orientation. Defaults to `false`.
+     */
+    landscape?: boolean;
+
+    /**
+     * Paper margins, defaults to none.
+     */
+    margin?: {
+      /**
+       * Top margin, accepts values labeled with units. Defaults to `0`.
+       */
+      top?: string|number;
+
+      /**
+       * Right margin, accepts values labeled with units. Defaults to `0`.
+       */
+      right?: string|number;
+
+      /**
+       * Bottom margin, accepts values labeled with units. Defaults to `0`.
+       */
+      bottom?: string|number;
+
+      /**
+       * Left margin, accepts values labeled with units. Defaults to `0`.
+       */
+      left?: string|number;
+    };
+
+    /**
+     * Whether or not to embed the document outline into the PDF. Defaults to `false`.
+     */
+    outline?: boolean;
+
+    /**
+     * Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means print all pages.
+     */
+    pageRanges?: string;
+
+    /**
+     * The file path to save the PDF to. If [`path`](https://playwright.dev/docs/api/class-page#page-pdf-option-path) is a
+     * relative path, then it is resolved relative to the current working directory. If no path is provided, the PDF won't
+     * be saved to the disk.
+     */
+    path?: string;
+
+    /**
+     * Give any CSS `@page` size declared in the page priority over what is declared in
+     * [`width`](https://playwright.dev/docs/api/class-page#page-pdf-option-width) and
+     * [`height`](https://playwright.dev/docs/api/class-page#page-pdf-option-height) or
+     * [`format`](https://playwright.dev/docs/api/class-page#page-pdf-option-format) options. Defaults to `false`, which
+     * will scale the content to fit the paper size.
+     */
+    preferCSSPageSize?: boolean;
+
+    /**
+     * Print background graphics. Defaults to `false`.
+     */
+    printBackground?: boolean;
+
+    /**
+     * Scale of the webpage rendering. Defaults to `1`. Scale amount must be between 0.1 and 2.
+     */
+    scale?: number;
+
+    /**
+     * Whether or not to generate tagged (accessible) PDF. Defaults to `false`.
+     */
+    tagged?: boolean;
+
+    /**
+     * Paper width, accepts values labeled with units.
+     */
+    width?: string|number;
+  }): Promise<Buffer>;
+
+  /**
+   * **NOTE** Use locator-based [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Focuses the element, and then uses
+   * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
+   * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   *
+   * [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) can specify the intended
+   * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) values can be found
+   * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
+   *
+   * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
+   * `Delete`, `Escape`, `ArrowDown`, `End`, `Enter`, `Home`, `Insert`, `PageDown`, `PageUp`, `ArrowRight`, `ArrowUp`,
+   * etc.
+   *
+   * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
+   * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
+   *
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) in the upper case.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
+   *
+   * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
+   * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const page = await browser.newPage();
+   * await page.goto('https://keycode.info');
+   * await page.press('body', 'A');
+   * await page.screenshot({ path: 'A.png' });
+   * await page.press('body', 'ArrowLeft');
+   * await page.screenshot({ path: 'ArrowLeft.png' });
+   * await page.press('body', 'Shift+O');
+   * await page.screenshot({ path: 'O.png' });
+   * await browser.close();
+   * ```
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   * @param options
+   */
+  press(selector: string, key: string, options?: {
+    /**
+     * Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * This method reloads the current page, in the same way as if the user had triggered a browser refresh. Returns the
+   * main resource response. In case of multiple redirects, the navigation will resolve with the response of the last
+   * redirect.
+   * @param options
+   */
+  reload(options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * Removes all locator handlers added by
+   * [page.addLocatorHandler(locator, handler[, options])](https://playwright.dev/docs/api/class-page#page-add-locator-handler)
+   * for a specific locator.
+   * @param locator Locator passed to
+   * [page.addLocatorHandler(locator, handler[, options])](https://playwright.dev/docs/api/class-page#page-add-locator-handler).
+   */
+  removeLocatorHandler(locator: Locator): Promise<void>;
+
+  /**
+   * Request the page to perform garbage collection. Note that there is no guarantee that all unreachable objects will
+   * be collected.
+   *
+   * This is useful to help detect memory leaks. For example, if your page has a large object `'suspect'` that might be
+   * leaked, you can check that it does not leak by using a
+   * [`WeakRef`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakRef).
+   *
+   * ```js
+   * // 1. In your page, save a WeakRef for the "suspect".
+   * await page.evaluate(() => globalThis.suspectWeakRef = new WeakRef(suspect));
+   * // 2. Request garbage collection.
+   * await page.requestGC();
+   * // 3. Check that weak ref does not deref to the original object.
+   * expect(await page.evaluate(() => !globalThis.suspectWeakRef.deref())).toBe(true);
+   * ```
+   *
+   */
+  requestGC(): Promise<void>;
+
+  /**
+   * Routing provides the capability to modify network requests that are made by a page.
+   *
+   * Once routing is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or
+   * aborted.
+   *
+   * **NOTE** The handler will only be called for the first url if the response is a redirect.
+   *
+   * **NOTE** [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) will not
+   * intercept requests intercepted by Service Worker. See [this](https://github.com/microsoft/playwright/issues/1090)
+   * issue. We recommend disabling Service Workers when using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
+   *
+   * **NOTE** [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) will not
+   * intercept the first request of a popup page. Use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * instead.
+   *
+   * **Usage**
+   *
+   * An example of a naive handler that aborts all image requests:
+   *
+   * ```js
+   * const page = await browser.newPage();
+   * await page.route('**\/*.{png,jpg,jpeg}', route => route.abort());
+   * await page.goto('https://example.com');
+   * await browser.close();
+   * ```
+   *
+   * or the same snippet using a regex pattern instead:
+   *
+   * ```js
+   * const page = await browser.newPage();
+   * await page.route(/(\.png$)|(\.jpg$)/, route => route.abort());
+   * await page.goto('https://example.com');
+   * await browser.close();
+   * ```
+   *
+   * It is possible to examine the request to decide the route action. For example, mocking all requests that contain
+   * some post data, and leaving all other requests as is:
+   *
+   * ```js
+   * await page.route('/api/**', async route => {
+   *   if (route.request().postData().includes('my-string'))
+   *     await route.fulfill({ body: 'mocked-data' });
+   *   else
+   *     await route.continue();
+   * });
+   * ```
+   *
+   * Page routes take precedence over browser context routes (set up with
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route))
+   * when request matches both handlers.
+   *
+   * To remove a route with its handler you can use
+   * [page.unroute(url[, handler])](https://playwright.dev/docs/api/class-page#page-unroute).
+   *
+   * **NOTE** Enabling routing disables http cache.
+   *
+   * @param url A glob pattern, regex pattern, or predicate that receives a [URL] to match during routing. If
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) is set in the
+   * context options and the provided URL is a string that does not start with `*`, it is resolved using the
+   * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
+   * @param handler handler function to route the request.
+   * @param options
+   */
+  route(url: string|RegExp|((url: URL) => boolean), handler: ((route: Route, request: Request) => Promise<any>|any), options?: {
+    /**
+     * How often a route should be used. By default it will be used every time.
+     */
+    times?: number;
+  }): Promise<void>;
+
+  /**
+   * If specified the network requests that are made in the page will be served from the HAR file. Read more about
+   * [Replaying from HAR](https://playwright.dev/docs/mock#replaying-from-har).
+   *
+   * Playwright will not serve requests intercepted by Service Worker from the HAR file. See
+   * [this](https://github.com/microsoft/playwright/issues/1090) issue. We recommend disabling Service Workers when
+   * using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
+   * @param har Path to a [HAR](http://www.softwareishard.com/blog/har-12-spec) file with prerecorded network data. If `path` is a
+   * relative path, then it is resolved relative to the current working directory.
+   * @param options
+   */
+  routeFromHAR(har: string, options?: {
+    /**
+     * - If set to 'abort' any request not found in the HAR file will be aborted.
+     * - If set to 'fallback' missing requests will be sent to the network.
+     *
+     * Defaults to abort.
+     */
+    notFound?: "abort"|"fallback";
+
+    /**
+     * If specified, updates the given HAR with the actual network information instead of serving from file. The file is
+     * written to disk when
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) is
+     * called.
+     */
+    update?: boolean;
+
+    /**
+     * Optional setting to control resource content management. If `attach` is specified, resources are persisted as
+     * separate files or entries in the ZIP archive. If `embed` is specified, content is stored inline the HAR file.
+     */
+    updateContent?: "embed"|"attach";
+
+    /**
+     * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to
+     * `minimal`.
+     */
+    updateMode?: "full"|"minimal";
+
+    /**
+     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the
+     * pattern will be served from the HAR file. If not specified, all requests are served from the HAR file.
+     */
+    url?: string|RegExp;
+  }): Promise<void>;
+
+  /**
+   * This method allows to modify websocket connections that are made by the page.
+   *
+   * Note that only `WebSocket`s created after this method was called will be routed. It is recommended to call this
+   * method before navigating the page.
+   *
+   * **Usage**
+   *
+   * Below is an example of a simple mock that responds to a single message. See
+   * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute) for more details and examples.
+   *
+   * ```js
+   * await page.routeWebSocket('/ws', ws => {
+   *   ws.onMessage(message => {
+   *     if (message === 'request')
+   *       ws.send('response');
+   *   });
+   * });
+   * ```
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) context option.
+   * @param handler Handler function to route the WebSocket.
+   */
+  routeWebSocket(url: string|RegExp|((url: URL) => boolean), handler: ((websocketroute: WebSocketRoute) => Promise<any>|any)): Promise<void>;
+
+  /**
+   * Returns the buffer with the captured screenshot.
+   * @param options
+   */
+  screenshot(options?: PageScreenshotOptions): Promise<Buffer>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.selectOption(values[, options])](https://playwright.dev/docs/api/class-locator#locator-select-option)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-select-option-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, waits until all specified options are present in the `<select>`
+   * element and selects these options.
+   *
+   * If the target element is not a `<select>` element, this method throws an error. However, if the element is inside
+   * the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be used
+   * instead.
+   *
+   * Returns the array of option values that have been successfully selected.
+   *
+   * Triggers a `change` and `input` event once all the provided options have been selected.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Single selection matching the value or label
+   * page.selectOption('select#colors', 'blue');
+   *
+   * // single selection matching the label
+   * page.selectOption('select#colors', { label: 'Blue' });
+   *
+   * // multiple selection
+   * page.selectOption('select#colors', ['red', 'green', 'blue']);
+   *
+   * ```
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param values Options to select. If the `<select>` has the `multiple` attribute, all matching options are selected, otherwise
+   * only the first option matching one of the passed options is selected. String values are matching both values and
+   * labels. Option is considered matching if all specified properties match.
+   * @param options
+   */
+  selectOption(selector: string, values: null|string|ElementHandle|ReadonlyArray<string>|{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }|ReadonlyArray<ElementHandle>|ReadonlyArray<{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }>, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<Array<string>>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.setChecked(checked[, options])](https://playwright.dev/docs/api/class-locator#locator-set-checked)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks or unchecks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-set-checked-option-selector) by performing the
+   * following steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-page#page-set-checked-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws.
+   * 1. If the element already has the right checked state, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-set-checked-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-set-checked-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param checked Whether to check or uncheck the checkbox.
+   * @param options
+   */
+  setChecked(selector: string, checked: boolean, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * This method internally calls [document.write()](https://developer.mozilla.org/en-US/docs/Web/API/Document/write),
+   * inheriting all its specific characteristics and behaviors.
+   * @param html HTML markup to assign to the page.
+   * @param options
+   */
+  setContent(html: string, options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<void>;
+
+  /**
+   * This setting will change the default maximum navigation time for the following methods and related shortcuts:
+   * - [page.goBack([options])](https://playwright.dev/docs/api/class-page#page-go-back)
+   * - [page.goForward([options])](https://playwright.dev/docs/api/class-page#page-go-forward)
+   * - [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto)
+   * - [page.reload([options])](https://playwright.dev/docs/api/class-page#page-reload)
+   * - [page.setContent(html[, options])](https://playwright.dev/docs/api/class-page#page-set-content)
+   * - [page.waitForNavigation([options])](https://playwright.dev/docs/api/class-page#page-wait-for-navigation)
+   * - [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url)
+   *
+   * **NOTE**
+   * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+   * takes priority over
+   * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout),
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * and
+   * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout).
+   *
+   * @param timeout Maximum navigation time in milliseconds
+   */
+  setDefaultNavigationTimeout(timeout: number): void;
+
+  /**
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-set-default-timeout-option-timeout) option.
+   *
+   * **NOTE**
+   * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+   * takes priority over
+   * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout).
+   *
+   * @param timeout Maximum time in milliseconds. Pass `0` to disable timeout.
+   */
+  setDefaultTimeout(timeout: number): void;
+
+  /**
+   * The extra HTTP headers will be sent with every request the page initiates.
+   *
+   * **NOTE**
+   * [page.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-page#page-set-extra-http-headers) does
+   * not guarantee the order of headers in the outgoing requests.
+   *
+   * @param headers An object containing additional HTTP headers to be sent with every request. All header values must be strings.
+   */
+  setExtraHTTPHeaders(headers: { [key: string]: string; }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.setInputFiles(files[, options])](https://playwright.dev/docs/api/class-locator#locator-set-input-files)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Sets the value of the file input to these file paths or files. If some of the `filePaths` are relative paths, then
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs
+   * with a `[webkitdirectory]` attribute, only a single directory path is supported.
+   *
+   * This method expects [`selector`](https://playwright.dev/docs/api/class-page#page-set-input-files-option-selector)
+   * to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the
+   * element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param files
+   * @param options
+   */
+  setInputFiles(selector: string, files: string|ReadonlyArray<string>|{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }|ReadonlyArray<{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }>, options?: {
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * In the case of multiple pages in a single browser, each page can have its own viewport size. However,
+   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) allows to set
+   * viewport size (and more) for all pages in the context at once.
+   *
+   * [page.setViewportSize(viewportSize)](https://playwright.dev/docs/api/class-page#page-set-viewport-size) will resize
+   * the page. A lot of websites don't expect phones to change size, so you should set the viewport size before
+   * navigating to the page.
+   * [page.setViewportSize(viewportSize)](https://playwright.dev/docs/api/class-page#page-set-viewport-size) will also
+   * reset `screen` size, use
+   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) with `screen`
+   * and `viewport` parameters if you need better control of these properties.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const page = await browser.newPage();
+   * await page.setViewportSize({
+   *   width: 640,
+   *   height: 480,
+   * });
+   * await page.goto('https://example.com');
+   * ```
+   *
+   * @param viewportSize
+   */
+  setViewportSize(viewportSize: {
+    /**
+     * page width in pixels.
+     */
+    width: number;
+
+    /**
+     * page height in pixels.
+     */
+    height: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method taps an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-tap-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-tap-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-tap-option-force) option is set. If the element is
+   *    detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
+   *    element, or the specified [`position`](https://playwright.dev/docs/api/class-page#page-tap-option-position).
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-tap-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** [page.tap(selector[, options])](https://playwright.dev/docs/api/class-page#page-tap) the method will throw
+   * if [`hasTouch`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-has-touch) option of the
+   * browser context is false.
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  tap(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.textContent([options])](https://playwright.dev/docs/api/class-locator#locator-text-content) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `element.textContent`.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  textContent(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|string>;
+
+  /**
+   * Returns the page's title.
+   */
+  title(): Promise<string>;
+
+  /**
+   * Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text. `page.type` can be used to
+   * send fine-grained keyboard events. To fill values in form fields, use
+   * [page.fill(selector, value[, options])](https://playwright.dev/docs/api/class-page#page-fill).
+   *
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * [keyboard.press(key[, options])](https://playwright.dev/docs/api/class-keyboard#keyboard-press).
+   *
+   * **Usage**
+   * @deprecated In most cases, you should use
+   * [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill) instead. You only need
+   * to press keys one by one if there is special keyboard handling on the page - in this case use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param text A text to type into a focused element.
+   * @param options
+   */
+  type(selector: string, text: string, options?: {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.uncheck([options])](https://playwright.dev/docs/api/class-locator#locator-uncheck)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method unchecks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-uncheck-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-page#page-uncheck-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
+   *    already unchecked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-uncheck-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now unchecked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-uncheck-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  uncheck(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Removes a route created with
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route). When
+   * [`handler`](https://playwright.dev/docs/api/class-page#page-unroute-option-handler) is not specified, removes all
+   * routes for the [`url`](https://playwright.dev/docs/api/class-page#page-unroute-option-url).
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
+   * @param handler Optional handler function to route the request.
+   */
+  unroute(url: string|RegExp|((url: URL) => boolean), handler?: ((route: Route, request: Request) => Promise<any>|any)): Promise<void>;
+
+  /**
+   * Removes all routes created with
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) and
+   * [page.routeFromHAR(har[, options])](https://playwright.dev/docs/api/class-page#page-route-from-har).
+   * @param options
+   */
+  unrouteAll(options?: {
+    /**
+     * Specifies whether to wait for already running handlers and what to do if they throw errors:
+     * - `'default'` - do not wait for current handler calls (if any) to finish, if unrouted handler throws, it may
+     *   result in unhandled error
+     * - `'wait'` - wait for current handler calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current handler calls (if any) to finish, all errors thrown by the handlers
+     *   after unrouting are silently caught
+     */
+    behavior?: "wait"|"ignoreErrors"|"default";
+  }): Promise<void>;
+
+  url(): string;
+
+  /**
+   * Video object associated with this page.
+   */
+  video(): null|Video;
+
+  viewportSize(): null|{
+    /**
+     * page width in pixels.
+     */
+    width: number;
+
+    /**
+     * page height in pixels.
+     */
+    height: number;
+  };
+
+  /**
+   * Emitted when the page closes.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  waitForEvent(event: 'console', optionsOrPredicate?: { predicate?: (consoleMessage: ConsoleMessage) => boolean | Promise<boolean>, timeout?: number } | ((consoleMessage: ConsoleMessage) => boolean | Promise<boolean>)): Promise<ConsoleMessage>;
+
+  /**
+   * Emitted when the page crashes. Browser pages might crash if they try to allocate too much memory. When the page
+   * crashes, ongoing and subsequent operations will throw.
+   *
+   * The most common way to deal with crashes is to catch an exception:
+   *
+   * ```js
+   * try {
+   *   // Crash might happen during a click.
+   *   await page.click('button');
+   *   // Or while waiting for an event.
+   *   await page.waitForEvent('popup');
+   * } catch (e) {
+   *   // When the page crashes, exception message contains 'crash'.
+   * }
+   * ```
+   *
+   */
+  waitForEvent(event: 'crash', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('dialog', dialog => dialog.accept());
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  waitForEvent(event: 'dialog', optionsOrPredicate?: { predicate?: (dialog: Dialog) => boolean | Promise<boolean>, timeout?: number } | ((dialog: Dialog) => boolean | Promise<boolean>)): Promise<Dialog>;
+
+  /**
+   * Emitted when the JavaScript
+   * [`DOMContentLoaded`](https://developer.mozilla.org/en-US/docs/Web/Events/DOMContentLoaded) event is dispatched.
+   */
+  waitForEvent(event: 'domcontentloaded', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when attachment download started. User can access basic file operations on downloaded content via the
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
+   */
+  waitForEvent(event: 'download', optionsOrPredicate?: { predicate?: (download: Download) => boolean | Promise<boolean>, timeout?: number } | ((download: Download) => boolean | Promise<boolean>)): Promise<Download>;
+
+  /**
+   * Emitted when a file chooser is supposed to appear, such as after clicking the  `<input type=file>`. Playwright can
+   * respond to it via setting the input files using
+   * [fileChooser.setFiles(files[, options])](https://playwright.dev/docs/api/class-filechooser#file-chooser-set-files)
+   * that can be uploaded after that.
+   *
+   * ```js
+   * page.on('filechooser', async fileChooser => {
+   *   await fileChooser.setFiles(path.join(__dirname, '/tmp/myfile.pdf'));
+   * });
+   * ```
+   *
+   */
+  waitForEvent(event: 'filechooser', optionsOrPredicate?: { predicate?: (fileChooser: FileChooser) => boolean | Promise<boolean>, timeout?: number } | ((fileChooser: FileChooser) => boolean | Promise<boolean>)): Promise<FileChooser>;
+
+  /**
+   * Emitted when a frame is attached.
+   */
+  waitForEvent(event: 'frameattached', optionsOrPredicate?: { predicate?: (frame: Frame) => boolean | Promise<boolean>, timeout?: number } | ((frame: Frame) => boolean | Promise<boolean>)): Promise<Frame>;
+
+  /**
+   * Emitted when a frame is detached.
+   */
+  waitForEvent(event: 'framedetached', optionsOrPredicate?: { predicate?: (frame: Frame) => boolean | Promise<boolean>, timeout?: number } | ((frame: Frame) => boolean | Promise<boolean>)): Promise<Frame>;
+
+  /**
+   * Emitted when a frame is navigated to a new url.
+   */
+  waitForEvent(event: 'framenavigated', optionsOrPredicate?: { predicate?: (frame: Frame) => boolean | Promise<boolean>, timeout?: number } | ((frame: Frame) => boolean | Promise<boolean>)): Promise<Frame>;
+
+  /**
+   * Emitted when the JavaScript [`load`](https://developer.mozilla.org/en-US/docs/Web/Events/load) event is dispatched.
+   */
+  waitForEvent(event: 'load', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when an uncaught exception happens within the page.
+   *
+   * ```js
+   * // Log all uncaught errors to the terminal
+   * page.on('pageerror', exception => {
+   *   console.log(`Uncaught exception: "${exception}"`);
+   * });
+   *
+   * // Navigate to a page with an exception.
+   * await page.goto('data:text/html,<script>throw new Error("Test")</script>');
+   * ```
+   *
+   */
+  waitForEvent(event: 'pageerror', optionsOrPredicate?: { predicate?: (error: Error) => boolean | Promise<boolean>, timeout?: number } | ((error: Error) => boolean | Promise<boolean>)): Promise<Error>;
+
+  /**
+   * Emitted when the page opens a new tab or window. This event is emitted in addition to the
+   * [browserContext.on('page')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-page), but
+   * only for popups relevant to this page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * // Start waiting for popup before clicking. Note no await.
+   * const popupPromise = page.waitForEvent('popup');
+   * await page.getByText('open the popup').click();
+   * const popup = await popupPromise;
+   * console.log(await popup.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  waitForEvent(event: 'popup', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when a page issues a request. The [request] object is read-only. In order to intercept and mutate requests,
+   * see [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) or
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   */
+  waitForEvent(event: 'request', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
+
+  /**
+   * Emitted when a request fails, for example by timing out.
+   *
+   * ```js
+   * page.on('requestfailed', request => {
+   *   console.log(request.url() + ' ' + request.failure().errorText);
+   * });
+   * ```
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished) event and not
+   * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
+   * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
+   * error net::ERR_FAILED.
+   *
+   */
+  waitForEvent(event: 'requestfailed', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`.
+   */
+  waitForEvent(event: 'requestfinished', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`.
+   */
+  waitForEvent(event: 'response', optionsOrPredicate?: { predicate?: (response: Response) => boolean | Promise<boolean>, timeout?: number } | ((response: Response) => boolean | Promise<boolean>)): Promise<Response>;
+
+  /**
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
+   */
+  waitForEvent(event: 'websocket', optionsOrPredicate?: { predicate?: (webSocket: WebSocket) => boolean | Promise<boolean>, timeout?: number } | ((webSocket: WebSocket) => boolean | Promise<boolean>)): Promise<WebSocket>;
+
+  /**
+   * Emitted when a dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is spawned
+   * by the page.
+   */
+  waitForEvent(event: 'worker', optionsOrPredicate?: { predicate?: (worker: Worker) => boolean | Promise<boolean>, timeout?: number } | ((worker: Worker) => boolean | Promise<boolean>)): Promise<Worker>;
+
+
+  /**
+   * Returns when the required load state has been reached.
+   *
+   * This resolves when the page reaches a required load state, `load` by default. The navigation must have been
+   * committed when this method is called. If current document has already reached the required state, resolves
+   * immediately.
+   *
+   * **NOTE** Most of the time, this method is not needed because Playwright
+   * [auto-waits before every action](https://playwright.dev/docs/actionability).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('button').click(); // Click triggers navigation.
+   * await page.waitForLoadState(); // The promise resolves after 'load' event.
+   * ```
+   *
+   * ```js
+   * const popupPromise = page.waitForEvent('popup');
+   * await page.getByRole('button').click(); // Click triggers a popup.
+   * const popup = await popupPromise;
+   * await popup.waitForLoadState('domcontentloaded'); // Wait for the 'DOMContentLoaded' event.
+   * console.log(await popup.title()); // Popup is ready to use.
+   * ```
+   *
+   * @param state Optional load state to wait for, defaults to `load`. If the state has been already reached while loading current
+   * document, the method resolves immediately. Can be one of:
+   * - `'load'` - wait for the `load` event to be fired.
+   * - `'domcontentloaded'` - wait for the `DOMContentLoaded` event to be fired.
+   * - `'networkidle'` - **DISCOURAGED** wait until there are no network connections for at least `500` ms. Don't use
+   * this method for testing, rely on web assertions to assess readiness instead.
+   * @param options
+   */
+  waitForLoadState(state?: "load"|"domcontentloaded"|"networkidle", options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Waits for the main frame navigation and returns the main resource response. In case of multiple redirects, the
+   * navigation will resolve with the response of the last redirect. In case of navigation to a different anchor or
+   * navigation due to History API usage, the navigation will resolve with `null`.
+   *
+   * **Usage**
+   *
+   * This resolves when the page navigates to a new URL or reloads. It is useful for when you run code which will
+   * indirectly cause the page to navigate. e.g. The click target has an `onclick` handler that triggers navigation from
+   * a `setTimeout`. Consider this example:
+   *
+   * ```js
+   * // Start waiting for navigation before clicking. Note no await.
+   * const navigationPromise = page.waitForNavigation();
+   * await page.getByText('Navigate after timeout').click();
+   * await navigationPromise;
+   * ```
+   *
+   * **NOTE** Usage of the [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) to change the URL
+   * is considered a navigation.
+   *
+   * @deprecated This method is inherently racy, please use
+   * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url) instead.
+   * @param options
+   */
+  waitForNavigation(options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if
+     * the parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly
+     * equal to the string.
+     */
+    url?: string|RegExp|((url: URL) => boolean);
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * Waits for the matching request and returns it. See [waiting for event](https://playwright.dev/docs/events#waiting-for-event) for more
+   * details about events.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Start waiting for request before clicking. Note no await.
+   * const requestPromise = page.waitForRequest('https://example.com/resource');
+   * await page.getByText('trigger request').click();
+   * const request = await requestPromise;
+   *
+   * // Alternative way with a predicate. Note no await.
+   * const requestPromise = page.waitForRequest(request =>
+   *   request.url() === 'https://example.com' && request.method() === 'GET',
+   * );
+   * await page.getByText('trigger request').click();
+   * const request = await requestPromise;
+   * ```
+   *
+   * @param urlOrPredicate Request URL string, regex or predicate receiving [Request](https://playwright.dev/docs/api/class-request) object.
+   * @param options
+   */
+  waitForRequest(urlOrPredicate: string|RegExp|((request: Request) => boolean|Promise<boolean>), options?: {
+    /**
+     * Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can
+     * be changed by using the
+     * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) method.
+     */
+    timeout?: number;
+  }): Promise<Request>;
+
+  /**
+   * Returns the matched response. See [waiting for event](https://playwright.dev/docs/events#waiting-for-event) for more details about
+   * events.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Start waiting for response before clicking. Note no await.
+   * const responsePromise = page.waitForResponse('https://example.com/resource');
+   * await page.getByText('trigger response').click();
+   * const response = await responsePromise;
+   *
+   * // Alternative way with a predicate. Note no await.
+   * const responsePromise = page.waitForResponse(response =>
+   *   response.url() === 'https://example.com' && response.status() === 200
+   *       && response.request().method() === 'GET'
+   * );
+   * await page.getByText('trigger response').click();
+   * const response = await responsePromise;
+   * ```
+   *
+   * @param urlOrPredicate Request URL string, regex or predicate receiving [Response](https://playwright.dev/docs/api/class-response) object.
+   * When a [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the
+   * context options was provided and the passed URL is a path, it gets merged via the
+   * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
+   * @param options
+   */
+  waitForResponse(urlOrPredicate: string|RegExp|((response: Response) => boolean|Promise<boolean>), options?: {
+    /**
+     * Maximum wait time in milliseconds, defaults to 30 seconds, pass `0` to disable the timeout. The default value can
+     * be changed by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<Response>;
+
+  /**
+   * **NOTE** Never wait for timeout in production. Tests that wait for time are inherently flaky. Use
+   * [Locator](https://playwright.dev/docs/api/class-locator) actions and web assertions that wait automatically.
+   *
+   * Waits for the given [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-timeout-option-timeout) in
+   * milliseconds.
+   *
+   * Note that `page.waitForTimeout()` should only be used for debugging. Tests using the timer in production are going
+   * to be flaky. Use signals such as network events, selectors becoming visible and others instead.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // wait for 1 second
+   * await page.waitForTimeout(1000);
+   * ```
+   *
+   * @param timeout A timeout to wait for
+   */
+  waitForTimeout(timeout: number): Promise<void>;
+
+  /**
+   * Waits for the main frame to navigate to the given URL.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.click('a.delayed-navigation'); // Clicking the link will indirectly cause a navigation
+   * await page.waitForURL('**\/target.html');
+   * ```
+   *
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if
+   * the parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly
+   * equal to the string.
+   * @param options
+   */
+  waitForURL(url: string|RegExp|((url: URL) => boolean), options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<void>;
+
+  /**
+   * This method returns all of the dedicated
+   * [WebWorkers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) associated with the page.
+   *
+   * **NOTE** This does not contain ServiceWorkers
+   *
+   */
+  workers(): Array<Worker>;
+
+  /**
+   * @deprecated This property is discouraged. Please use other libraries such as [Axe](https://www.deque.com/axe/) if you need to
+   * test page accessibility. See our Node.js [guide](https://playwright.dev/docs/accessibility-testing) for integration
+   * with Axe.
+   */
+  accessibility: Accessibility;
+
+  /**
+   * Playwright has ability to mock clock and passage of time.
+   */
+  clock: Clock;
+
+  /**
+   * **NOTE** Only available for Chromium atm.
+   *
+   * Browser-specific Coverage implementation. See [Coverage](https://playwright.dev/docs/api/class-coverage) for more
+   * details.
+   */
+  coverage: Coverage;
+
+  keyboard: Keyboard;
+
+  mouse: Mouse;
+
+  /**
+   * API testing helper associated with this page. This method returns the same instance as
+   * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) on the
+   * page's context. See
+   * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) for more
+   * details.
+   */
+  request: APIRequestContext;
+
+  touchscreen: Touchscreen;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * At every point of time, page exposes its current frame tree via the
+ * [page.mainFrame()](https://playwright.dev/docs/api/class-page#page-main-frame) and
+ * [frame.childFrames()](https://playwright.dev/docs/api/class-frame#frame-child-frames) methods.
+ *
+ * [Frame](https://playwright.dev/docs/api/class-frame) object's lifecycle is controlled by three events, dispatched
+ * on the page object:
+ * - [page.on('frameattached')](https://playwright.dev/docs/api/class-page#page-event-frame-attached) - fired when
+ *   the frame gets attached to the page. A Frame can be attached to the page only once.
+ * - [page.on('framenavigated')](https://playwright.dev/docs/api/class-page#page-event-frame-navigated) - fired when
+ *   the frame commits navigation to a different URL.
+ * - [page.on('framedetached')](https://playwright.dev/docs/api/class-page#page-event-frame-detached) - fired when
+ *   the frame gets detached from the page.  A Frame can be detached from the page only once.
+ *
+ * An example of dumping frame tree:
+ *
+ * ```js
+ * const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
+ *
+ * (async () => {
+ *   const browser = await firefox.launch();
+ *   const page = await browser.newPage();
+ *   await page.goto('https://www.google.com/chrome/browser/canary.html');
+ *   dumpFrameTree(page.mainFrame(), '');
+ *   await browser.close();
+ *
+ *   function dumpFrameTree(frame, indent) {
+ *     console.log(indent + frame.url());
+ *     for (const child of frame.childFrames())
+ *       dumpFrameTree(child, indent + '  ');
+ *   }
+ * })();
+ * ```
+ *
+ */
+export interface Frame {
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns a
+   * [Promise], then [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate)
+   * would wait for the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns a
+   * non-[Serializable] value, then
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const result = await frame.evaluate(([x, y]) => {
+   *   return Promise.resolve(x * y);
+   * }, [7, 8]);
+   * console.log(result); // prints "56"
+   * ```
+   *
+   * A string can also be passed in instead of a function.
+   *
+   * ```js
+   * console.log(await frame.evaluate('1 + 2')); // prints "3"
+   * ```
+   *
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate):
+   *
+   * ```js
+   * const bodyHandle = await frame.evaluate('document.body');
+   * const html = await frame.evaluate(([body, suffix]) =>
+   *   body.innerHTML + suffix, [bodyHandle, 'hello'],
+   * );
+   * await bodyHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
+   */
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns a
+   * [Promise], then [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate)
+   * would wait for the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns a
+   * non-[Serializable] value, then
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const result = await frame.evaluate(([x, y]) => {
+   *   return Promise.resolve(x * y);
+   * }, [7, 8]);
+   * console.log(result); // prints "56"
+   * ```
+   *
+   * A string can also be passed in instead of a function.
+   *
+   * ```js
+   * console.log(await frame.evaluate('1 + 2')); // prints "3"
+   * ```
+   *
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate):
+   *
+   * ```js
+   * const bodyHandle = await frame.evaluate('document.body');
+   * const html = await frame.evaluate(([body, suffix]) =>
+   *   body.innerHTML + suffix, [bodyHandle, 'hello'],
+   * );
+   * await bodyHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
+   */
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) and
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle) is
+   * that [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function, passed to the
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle),
+   * returns a [Promise], then
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Handle for the window object
+   * const aWindowHandle = await frame.evaluateHandle(() => Promise.resolve(window));
+   * ```
+   *
+   * A string can also be passed in instead of a function.
+   *
+   * ```js
+   * const aHandle = await frame.evaluateHandle('document'); // Handle for the 'document'.
+   * ```
+   *
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle):
+   *
+   * ```js
+   * const aHandle = await frame.evaluateHandle(() => document.body);
+   * const resultHandle = await frame.evaluateHandle(([body, suffix]) =>
+   *   body.innerHTML + suffix, [aHandle, 'hello'],
+   * );
+   * console.log(await resultHandle.jsonValue());
+   * await resultHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) and
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle) is
+   * that [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function, passed to the
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle),
+   * returns a [Promise], then
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Handle for the window object
+   * const aWindowHandle = await frame.evaluateHandle(() => Promise.resolve(window));
+   * ```
+   *
+   * A string can also be passed in instead of a function.
+   *
+   * ```js
+   * const aHandle = await frame.evaluateHandle('document'); // Handle for the 'document'.
+   * ```
+   *
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
+   * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle):
+   *
+   * ```js
+   * const aHandle = await frame.evaluateHandle(() => document.body);
+   * const resultHandle = await frame.evaluateHandle(([body, suffix]) =>
+   *   body.innerHTML + suffix, [aHandle, 'hello'],
+   * );
+   * console.log(await resultHandle.jsonValue());
+   * await resultHandle.dispose();
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+
+  /**
+   * **NOTE** Use locator-based [frame.locator(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the ElementHandle pointing to the frame element.
+   *
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions instead.
+   *
+   * The method finds an element matching the specified selector within the frame. If no elements match the selector,
+   * returns `null`.
+   * @param selector A selector to query for.
+   * @param options
+   */
+  $<K extends keyof HTMLElementTagNameMap>(selector: K, options?: { strict: boolean }): Promise<ElementHandleForTag<K> | null>;
+  /**
+   * **NOTE** Use locator-based [frame.locator(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the ElementHandle pointing to the frame element.
+   *
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions instead.
+   *
+   * The method finds an element matching the specified selector within the frame. If no elements match the selector,
+   * returns `null`.
+   * @param selector A selector to query for.
+   * @param options
+   */
+  $(selector: string, options?: { strict: boolean }): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
+
+  /**
+   * **NOTE** Use locator-based [frame.locator(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the ElementHandles pointing to the frame elements.
+   *
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects instead.
+   *
+   * The method finds all elements matching the specified selector within the frame. If no elements match the selector,
+   * returns empty array.
+   * @param selector A selector to query for.
+   */
+  $$<K extends keyof HTMLElementTagNameMap>(selector: K): Promise<ElementHandleForTag<K>[]>;
+  /**
+   * **NOTE** Use locator-based [frame.locator(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the ElementHandles pointing to the frame elements.
+   *
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects instead.
+   *
+   * The method finds all elements matching the specified selector within the frame. If no elements match the selector,
+   * returns empty array.
+   * @param selector A selector to query for.
+   */
+  $$(selector: string): Promise<ElementHandle<SVGElement | HTMLElement>[]>;
+
+  /**
+   * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
+   * tests. Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector within the frame and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await frame.$eval('#search', el => el.value);
+   * const preloadHref = await frame.$eval('link[rel=preload]', el => el.href);
+   * const html = await frame.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
+   * tests. Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector within the frame and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await frame.$eval('#search', el => el.value);
+   * const preloadHref = await frame.$eval('link[rel=preload]', el => el.href);
+   * const html = await frame.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
+   * tests. Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector within the frame and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await frame.$eval('#search', el => el.value);
+   * const preloadHref = await frame.$eval('link[rel=preload]', el => el.href);
+   * const html = await frame.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], void, R>, arg?: any): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
+   * tests. Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector within the frame and passes it as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
+   * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const searchValue = await frame.$eval('#search', el => el.value);
+   * const preloadHref = await frame.$eval('link[rel=preload]', el => el.href);
+   * const html = await frame.$eval('.main-container', (e, suffix) => e.outerHTML + suffix, 'hello');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
+   * @param options
+   */
+  $eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector within the frame and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divsCounts = await frame.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   */
+  $$eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector within the frame and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divsCounts = await frame.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   */
+  $$eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector within the frame and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divsCounts = await frame.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   */
+  $$eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], void, R>, arg?: any): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector within the frame and passes an array of matched
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const divsCounts = await frame.$$eval('div', (divs, min) => divs.length >= min, 10);
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
+   */
+  $$eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression) returns a
+   * truthy value, returns that value.
+   *
+   * **Usage**
+   *
+   * The
+   * [frame.waitForFunction(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-wait-for-function)
+   * can be used to observe viewport size change:
+   *
+   * ```js
+   * const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await firefox.launch();
+   *   const page = await browser.newPage();
+   *   const watchDog = page.mainFrame().waitForFunction('window.innerWidth < 100');
+   *   await page.setViewportSize({ width: 50, height: 50 });
+   *   await watchDog;
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * To pass an argument to the predicate of `frame.waitForFunction` function:
+   *
+   * ```js
+   * const selector = '.foo';
+   * await frame.waitForFunction(selector => !!document.querySelector(selector), selector);
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression).
+   * @param options
+   */
+  waitForFunction<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
+  /**
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression) returns a
+   * truthy value, returns that value.
+   *
+   * **Usage**
+   *
+   * The
+   * [frame.waitForFunction(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-wait-for-function)
+   * can be used to observe viewport size change:
+   *
+   * ```js
+   * const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await firefox.launch();
+   *   const page = await browser.newPage();
+   *   const watchDog = page.mainFrame().waitForFunction('window.innerWidth < 100');
+   *   await page.setViewportSize({ width: 50, height: 50 });
+   *   await watchDog;
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * To pass an argument to the predicate of `frame.waitForFunction` function:
+   *
+   * ```js
+   * const selector = '.foo';
+   * await frame.waitForFunction(selector => !!document.querySelector(selector), selector);
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression).
+   * @param options
+   */
+  waitForFunction<R>(pageFunction: PageFunction<void, R>, arg?: any, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
+
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.mainFrame().waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options?: PageWaitForSelectorOptionsNotHidden): Promise<ElementHandleForTag<K>>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.mainFrame().waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector(selector: string, options?: PageWaitForSelectorOptionsNotHidden): Promise<ElementHandle<SVGElement | HTMLElement>>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.mainFrame().waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options: PageWaitForSelectorOptions): Promise<ElementHandleForTag<K> | null>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
+   * about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
+   *
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
+   *
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
+   *
+   * **Usage**
+   *
+   * This method works across navigations:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+   *
+   * (async () => {
+   *   const browser = await chromium.launch();
+   *   const page = await browser.newPage();
+   *   for (const currentURL of ['https://google.com', 'https://bbc.com']) {
+   *     await page.goto(currentURL);
+   *     const element = await page.mainFrame().waitForSelector('img');
+   *     console.log('Loaded image: ' + await element.getAttribute('src'));
+   *   }
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector(selector: string, options: PageWaitForSelectorOptions): Promise<null|ElementHandle<SVGElement | HTMLElement>>;
+  /**
+   * Returns the added tag when the script's onload fires or when the script content was injected into frame.
+   *
+   * Adds a `<script>` tag into the page with the desired url or content.
+   * @param options
+   */
+  addScriptTag(options?: {
+    /**
+     * Raw JavaScript content to be injected into frame.
+     */
+    content?: string;
+
+    /**
+     * Path to the JavaScript file to be injected into frame. If `path` is a relative path, then it is resolved relative
+     * to the current working directory.
+     */
+    path?: string;
+
+    /**
+     * Script type. Use 'module' in order to load a JavaScript ES6 module. See
+     * [script](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script) for more details.
+     */
+    type?: string;
+
+    /**
+     * URL of a script to be added.
+     */
+    url?: string;
+  }): Promise<ElementHandle>;
+
+  /**
+   * Returns the added tag when the stylesheet's onload fires or when the CSS content was injected into frame.
+   *
+   * Adds a `<link rel="stylesheet">` tag into the page with the desired url or a `<style type="text/css">` tag with the
+   * content.
+   * @param options
+   */
+  addStyleTag(options?: {
+    /**
+     * Raw CSS content to be injected into frame.
+     */
+    content?: string;
+
+    /**
+     * Path to the CSS file to be injected into frame. If `path` is a relative path, then it is resolved relative to the
+     * current working directory.
+     */
+    path?: string;
+
+    /**
+     * URL of the `<link>` tag.
+     */
+    url?: string;
+  }): Promise<ElementHandle>;
+
+  /**
+   * **NOTE** Use locator-based [locator.check([options])](https://playwright.dev/docs/api/class-locator#locator-check) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-check-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-check-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
+   *    already checked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-check-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-check-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  check(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  childFrames(): Array<Frame>;
+
+  /**
+   * **NOTE** Use locator-based [locator.click([options])](https://playwright.dev/docs/api/class-locator#locator-click) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-click-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-click-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-click-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-frame#frame-click-option-no-wait-after) option is set.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-click-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  click(selector: string, options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Gets the full HTML contents of the frame, including the doctype.
+   */
+  content(): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.dblclick([options])](https://playwright.dev/docs/api/class-locator#locator-dblclick)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method double clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-selector) by performing the
+   * following steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-position). if the first click
+   *    of the `dblclick()` triggers a navigation event, this method will throw.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** `frame.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  dblclick(selector: string, options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.dispatchEvent(type[, eventInit, options])](https://playwright.dev/docs/api/class-locator#locator-dispatch-event)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The snippet below dispatches the `click` event on the element. Regardless of the visibility state of the element,
+   * `click` is dispatched. This is equivalent to calling
+   * [element.click()](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/click).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await frame.dispatchEvent('button#submit', 'click');
+   * ```
+   *
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-frame#frame-dispatch-event-option-type), initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-frame#frame-dispatch-event-option-event-init) properties and
+   * dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   *
+   * Since [`eventInit`](https://playwright.dev/docs/api/class-frame#frame-dispatch-event-option-event-init) is
+   * event-specific, please refer to the events documentation for the lists of initial properties:
+   * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
+   * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
+   * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
+   * - [Event](https://developer.mozilla.org/en-US/docs/Web/API/Event/Event)
+   * - [FocusEvent](https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent/FocusEvent)
+   * - [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/KeyboardEvent)
+   * - [MouseEvent](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/MouseEvent)
+   * - [PointerEvent](https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent/PointerEvent)
+   * - [TouchEvent](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/TouchEvent)
+   * - [WheelEvent](https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/WheelEvent)
+   *
+   * You can also specify `JSHandle` as the property value if you want live objects to be passed into the event:
+   *
+   * ```js
+   * // Note you can only create DataTransfer in Chromium and Firefox
+   * const dataTransfer = await frame.evaluateHandle(() => new DataTransfer());
+   * await frame.dispatchEvent('#source', 'dragstart', { dataTransfer });
+   * ```
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param type DOM event type: `"click"`, `"dragstart"`, etc.
+   * @param eventInit Optional event-specific initialization properties.
+   * @param options
+   */
+  dispatchEvent(selector: string, type: string, eventInit?: EvaluationArgument, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * @param source A selector to search for an element to drag. If there are multiple elements satisfying the selector, the first will
+   * be used.
+   * @param target A selector to search for an element to drop onto. If there are multiple elements satisfying the selector, the first
+   * will be used.
+   * @param options
+   */
+  dragAndDrop(source: string, target: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
+     * specified, some visible point of the element is used.
+     */
+    sourcePosition?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Drops on the target element at this point relative to the top-left corner of the element's padding box. If not
+     * specified, some visible point of the element is used.
+     */
+    targetPosition?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-fill-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, fills it and triggers an `input` event after
+   * filling. Note that you can pass an empty string to clear the input field.
+   *
+   * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
+   * error. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
+   * instead.
+   *
+   * To send fine-grained keyboard events, use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param value Value to fill for the `<input>`, `<textarea>` or `[contenteditable]` element.
+   * @param options
+   */
+  fill(selector: string, value: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method fetches an element with
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-focus-option-selector) and focuses it. If there's no
+   * element matching [`selector`](https://playwright.dev/docs/api/class-frame#frame-focus-option-selector), the method
+   * waits until a matching element appears in the DOM.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  focus(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Returns the `frame` or `iframe` element handle which corresponds to this frame.
+   *
+   * This is an inverse of
+   * [elementHandle.contentFrame()](https://playwright.dev/docs/api/class-elementhandle#element-handle-content-frame).
+   * Note that returned handle actually belongs to the parent frame.
+   *
+   * This method throws an error if the frame has been detached before `frameElement()` returns.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const frameElement = await frame.frameElement();
+   * const contentFrame = await frameElement.contentFrame();
+   * console.log(frame === contentFrame);  // -> true
+   * ```
+   *
+   */
+  frameElement(): Promise<ElementHandle>;
+
+  /**
+   * When working with iframes, you can create a frame locator that will enter the iframe and allow selecting elements
+   * in that iframe.
+   *
+   * **Usage**
+   *
+   * Following snippet locates element with text "Submit" in the iframe with id `my-frame`, like `<iframe
+   * id="my-frame">`:
+   *
+   * ```js
+   * const locator = frame.frameLocator('#my-iframe').getByText('Submit');
+   * await locator.click();
+   * ```
+   *
+   * @param selector A selector to use when resolving DOM element.
+   */
+  frameLocator(selector: string): FrameLocator;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.getAttribute(name[, options])](https://playwright.dev/docs/api/class-locator#locator-get-attribute)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns element attribute value.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param name Attribute name to get the value for.
+   * @param options
+   */
+  getAttribute(selector: string, name: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|string>;
+
+  /**
+   * Allows locating elements by their alt text.
+   *
+   * **Usage**
+   *
+   * For example, this method will find the image by alt text "Playwright logo":
+   *
+   * ```html
+   * <img alt='Playwright logo'>
+   * ```
+   *
+   * ```js
+   * await page.getByAltText('Playwright logo').click();
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByAltText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the text of the associated `<label>` or `aria-labelledby` element, or by the
+   * `aria-label` attribute.
+   *
+   * **Usage**
+   *
+   * For example, this method will find inputs by label "Username" and "Password" in the following DOM:
+   *
+   * ```html
+   * <input aria-label="Username">
+   * <label for="password-input">Password:</label>
+   * <input id="password-input">
+   * ```
+   *
+   * ```js
+   * await page.getByLabel('Username').fill('john');
+   * await page.getByLabel('Password').fill('secret');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByLabel(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the placeholder text.
+   *
+   * **Usage**
+   *
+   * For example, consider the following DOM structure.
+   *
+   * ```html
+   * <input type="email" placeholder="name@example.com" />
+   * ```
+   *
+   * You can fill the input after locating it by the placeholder text:
+   *
+   * ```js
+   * await page
+   *     .getByPlaceholder('name@example.com')
+   *     .fill('playwright@microsoft.com');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByPlaceholder(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their [ARIA role](https://www.w3.org/TR/wai-aria-1.2/#roles),
+   * [ARIA attributes](https://www.w3.org/TR/wai-aria-1.2/#aria-attributes) and
+   * [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <h3>Sign up</h3>
+   * <label>
+   *   <input type="checkbox" /> Subscribe
+   * </label>
+   * <br/>
+   * <button>Submit</button>
+   * ```
+   *
+   * You can locate each element by it's implicit role:
+   *
+   * ```js
+   * await expect(page.getByRole('heading', { name: 'Sign up' })).toBeVisible();
+   *
+   * await page.getByRole('checkbox', { name: 'Subscribe' }).check();
+   *
+   * await page.getByRole('button', { name: /submit/i }).click();
+   * ```
+   *
+   * **Details**
+   *
+   * Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback
+   * about the ARIA guidelines.
+   *
+   * Many html elements have an implicitly [defined role](https://w3c.github.io/html-aam/#html-element-role-mappings)
+   * that is recognized by the role selector. You can find all the
+   * [supported roles here](https://www.w3.org/TR/wai-aria-1.2/#role_definitions). ARIA guidelines **do not recommend**
+   * duplicating implicit roles and attributes by setting `role` and/or `aria-*` attributes to default values.
+   * @param role Required aria role.
+   * @param options
+   */
+  getByRole(role: "alert"|"alertdialog"|"application"|"article"|"banner"|"blockquote"|"button"|"caption"|"cell"|"checkbox"|"code"|"columnheader"|"combobox"|"complementary"|"contentinfo"|"definition"|"deletion"|"dialog"|"directory"|"document"|"emphasis"|"feed"|"figure"|"form"|"generic"|"grid"|"gridcell"|"group"|"heading"|"img"|"insertion"|"link"|"list"|"listbox"|"listitem"|"log"|"main"|"marquee"|"math"|"meter"|"menu"|"menubar"|"menuitem"|"menuitemcheckbox"|"menuitemradio"|"navigation"|"none"|"note"|"option"|"paragraph"|"presentation"|"progressbar"|"radio"|"radiogroup"|"region"|"row"|"rowgroup"|"rowheader"|"scrollbar"|"search"|"searchbox"|"separator"|"slider"|"spinbutton"|"status"|"strong"|"subscript"|"superscript"|"switch"|"tab"|"table"|"tablist"|"tabpanel"|"term"|"textbox"|"time"|"timer"|"toolbar"|"tooltip"|"tree"|"treegrid"|"treeitem", options?: {
+    /**
+     * An attribute that is usually set by `aria-checked` or native `<input type=checkbox>` controls.
+     *
+     * Learn more about [`aria-checked`](https://www.w3.org/TR/wai-aria-1.2/#aria-checked).
+     */
+    checked?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-disabled` or `disabled`.
+     *
+     * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
+     * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
+     */
+    disabled?: boolean;
+
+    /**
+     * Whether [`name`](https://playwright.dev/docs/api/class-frame#frame-get-by-role-option-name) is matched exactly:
+     * case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-frame#frame-get-by-role-option-name) is a regular expression. Note
+     * that exact match still trims whitespace.
+     */
+    exact?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-expanded`.
+     *
+     * Learn more about [`aria-expanded`](https://www.w3.org/TR/wai-aria-1.2/#aria-expanded).
+     */
+    expanded?: boolean;
+
+    /**
+     * Option that controls whether hidden elements are matched. By default, only non-hidden elements, as
+     * [defined by ARIA](https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion), are matched by role selector.
+     *
+     * Learn more about [`aria-hidden`](https://www.w3.org/TR/wai-aria-1.2/#aria-hidden).
+     */
+    includeHidden?: boolean;
+
+    /**
+     * A number attribute that is usually present for roles `heading`, `listitem`, `row`, `treeitem`, with default values
+     * for `<h1>-<h6>` elements.
+     *
+     * Learn more about [`aria-level`](https://www.w3.org/TR/wai-aria-1.2/#aria-level).
+     */
+    level?: number;
+
+    /**
+     * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-frame#frame-get-by-role-option-exact) to control this behavior.
+     *
+     * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+     */
+    name?: string|RegExp;
+
+    /**
+     * An attribute that is usually set by `aria-pressed`.
+     *
+     * Learn more about [`aria-pressed`](https://www.w3.org/TR/wai-aria-1.2/#aria-pressed).
+     */
+    pressed?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-selected`.
+     *
+     * Learn more about [`aria-selected`](https://www.w3.org/TR/wai-aria-1.2/#aria-selected).
+     */
+    selected?: boolean;
+  }): Locator;
+
+  /**
+   * Locate element by the test id.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <button data-testid="directions">Itinéraire</button>
+   * ```
+   *
+   * You can locate the element by it's test id:
+   *
+   * ```js
+   * await page.getByTestId('directions').click();
+   * ```
+   *
+   * **Details**
+   *
+   * By default, the `data-testid` attribute is used as a test id. Use
+   * [selectors.setTestIdAttribute(attributeName)](https://playwright.dev/docs/api/class-selectors#selectors-set-test-id-attribute)
+   * to configure a different test id attribute if necessary.
+   *
+   * ```js
+   * // Set custom test id attribute from @playwright/test config:
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     testIdAttribute: 'data-pw'
+   *   },
+   * });
+   * ```
+   *
+   * @param testId Id to locate the element by.
+   */
+  getByTestId(testId: string|RegExp): Locator;
+
+  /**
+   * Allows locating elements that contain given text.
+   *
+   * See also [locator.filter([options])](https://playwright.dev/docs/api/class-locator#locator-filter) that allows to
+   * match by another criteria, like an accessible role, and then filter by the text content.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure:
+   *
+   * ```html
+   * <div>Hello <span>world</span></div>
+   * <div>Hello</div>
+   * ```
+   *
+   * You can locate by text substring, exact string, or a regular expression:
+   *
+   * ```js
+   * // Matches <span>
+   * page.getByText('world');
+   *
+   * // Matches first <div>
+   * page.getByText('Hello world');
+   *
+   * // Matches second <div>
+   * page.getByText('Hello', { exact: true });
+   *
+   * // Matches both <div>s
+   * page.getByText(/Hello/);
+   *
+   * // Matches second <div>
+   * page.getByText(/^hello$/i);
+   * ```
+   *
+   * **Details**
+   *
+   * Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into
+   * one, turns line breaks into spaces and ignores leading and trailing whitespace.
+   *
+   * Input elements of the type `button` and `submit` are matched by their `value` instead of the text content. For
+   * example, locating by text `"Log in"` matches `<input type=button value="Log in">`.
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their title attribute.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <span title='Issues count'>25 issues</span>
+   * ```
+   *
+   * You can check the issues count after locating it by the title text:
+   *
+   * ```js
+   * await expect(page.getByTitle('Issues count')).toHaveText('25 issues');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByTitle(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Returns the main resource response. In case of multiple redirects, the navigation will resolve with the response of
+   * the last redirect.
+   *
+   * The method will throw an error if:
+   * - there's an SSL error (e.g. in case of self-signed certificates).
+   * - target URL is invalid.
+   * - the [`timeout`](https://playwright.dev/docs/api/class-frame#frame-goto-option-timeout) is exceeded during
+   *   navigation.
+   * - the remote server does not respond or is unreachable.
+   * - the main resource failed to load.
+   *
+   * The method will not throw an error when any valid HTTP status code is returned by the remote server, including 404
+   * "Not Found" and 500 "Internal Server Error".  The status code for such responses can be retrieved by calling
+   * [response.status()](https://playwright.dev/docs/api/class-response#response-status).
+   *
+   * **NOTE** The method either throws an error or returns a main resource response. The only exceptions are navigation
+   * to `about:blank` or navigation to the same URL with a different hash, which would succeed and return `null`.
+   *
+   * **NOTE** Headless mode doesn't support navigation to a PDF document. See the
+   * [upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=761295).
+   *
+   * @param url URL to navigate frame to. The url should include scheme, e.g. `https://`.
+   * @param options
+   */
+  goto(url: string, options?: {
+    /**
+     * Referer header value. If provided it will take preference over the referer header value set by
+     * [page.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-page#page-set-extra-http-headers).
+     */
+    referer?: string;
+
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * **NOTE** Use locator-based [locator.hover([options])](https://playwright.dev/docs/api/class-locator#locator-hover) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method hovers over an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-hover-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-hover-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-hover-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-hover-option-position).
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-hover-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  hover(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.innerHTML([options])](https://playwright.dev/docs/api/class-locator#locator-inner-html)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `element.innerHTML`.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  innerHTML(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.innerText([options])](https://playwright.dev/docs/api/class-locator#locator-inner-text)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `element.innerText`.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  innerText(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.inputValue([options])](https://playwright.dev/docs/api/class-locator#locator-input-value) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `input.value` for the selected `<input>` or `<textarea>` or `<select>` element.
+   *
+   * Throws for non-input elements. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), returns the value of the
+   * control.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  inputValue(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isChecked([options])](https://playwright.dev/docs/api/class-locator#locator-is-checked)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is checked. Throws if the element is not a checkbox or radio input.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isChecked(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns `true` if the frame has been detached, or `false` otherwise.
+   */
+  isDetached(): boolean;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.isDisabled([options])](https://playwright.dev/docs/api/class-locator#locator-is-disabled) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is disabled, the opposite of [enabled](https://playwright.dev/docs/actionability#enabled).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isDisabled(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.isEditable([options])](https://playwright.dev/docs/api/class-locator#locator-is-editable) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [editable](https://playwright.dev/docs/actionability#editable).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isEditable(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns whether the element is [enabled](https://playwright.dev/docs/actionability#enabled).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isEnabled(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isHidden([options])](https://playwright.dev/docs/api/class-locator#locator-is-hidden)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-is-hidden-option-selector) that does not match any
+   * elements is considered hidden.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isHidden(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * @deprecated This option is ignored.
+     * [frame.isHidden(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-is-hidden) does not wait
+     * for the element to become hidden and returns immediately.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isVisible([options])](https://playwright.dev/docs/api/class-locator#locator-is-visible)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-is-visible-option-selector) that does not match any
+   * elements is considered not visible.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  isVisible(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * @deprecated This option is ignored.
+     * [frame.isVisible(selector[, options])](https://playwright.dev/docs/api/class-frame#frame-is-visible) does not wait
+     * for the element to become visible and returns immediately.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * The method returns an element locator that can be used to perform actions on this page / frame. Locator is resolved
+   * to the element immediately before performing an action, so a series of actions on the same locator can in fact be
+   * performed on different DOM elements. That would happen if the DOM structure between those actions has changed.
+   *
+   * [Learn more about locators](https://playwright.dev/docs/locators).
+   *
+   * [Learn more about locators](https://playwright.dev/docs/locators).
+   * @param selector A selector to use when resolving DOM element.
+   * @param options
+   */
+  locator(selector: string, options?: {
+    /**
+     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
+     * `article` that has `text=Playwright` matches `<article><div>Playwright</div></article>`.
+     *
+     * Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not
+     * the document root. For example, you can find `content` that has `div` in
+     * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
+     * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    has?: Locator;
+
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    hasNot?: Locator;
+
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element.
+     * When passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    hasNotText?: string|RegExp;
+
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring. For example, `"Playwright"` matches
+     * `<article><div>Playwright</div></article>`.
+     */
+    hasText?: string|RegExp;
+  }): Locator;
+
+  /**
+   * Returns frame's name attribute as specified in the tag.
+   *
+   * If the name is empty, returns the id attribute instead.
+   *
+   * **NOTE** This value is calculated once when the frame is created, and will not update if the attribute is changed
+   * later.
+   *
+   */
+  name(): string;
+
+  /**
+   * Returns the page containing this frame.
+   */
+  page(): Page;
+
+  /**
+   * Parent frame, if any. Detached frames and main frames return `null`.
+   */
+  parentFrame(): null|Frame;
+
+  /**
+   * **NOTE** Use locator-based [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) can specify the intended
+   * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) values can be found
+   * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
+   *
+   * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
+   * `Delete`, `Escape`, `ArrowDown`, `End`, `Enter`, `Home`, `Insert`, `PageDown`, `PageUp`, `ArrowRight`, `ArrowUp`,
+   * etc.
+   *
+   * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
+   * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
+   *
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) in the upper case.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
+   *
+   * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
+   * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   * @param options
+   */
+  press(selector: string, key: string, options?: {
+    /**
+     * Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.selectOption(values[, options])](https://playwright.dev/docs/api/class-locator#locator-select-option)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-select-option-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, waits until all specified options are present in the `<select>`
+   * element and selects these options.
+   *
+   * If the target element is not a `<select>` element, this method throws an error. However, if the element is inside
+   * the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be used
+   * instead.
+   *
+   * Returns the array of option values that have been successfully selected.
+   *
+   * Triggers a `change` and `input` event once all the provided options have been selected.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Single selection matching the value or label
+   * frame.selectOption('select#colors', 'blue');
+   *
+   * // single selection matching both the value and the label
+   * frame.selectOption('select#colors', { label: 'Blue' });
+   *
+   * // multiple selection
+   * frame.selectOption('select#colors', 'red', 'green', 'blue');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param values Options to select. If the `<select>` has the `multiple` attribute, all matching options are selected, otherwise
+   * only the first option matching one of the passed options is selected. String values are matching both values and
+   * labels. Option is considered matching if all specified properties match.
+   * @param options
+   */
+  selectOption(selector: string, values: null|string|ElementHandle|ReadonlyArray<string>|{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }|ReadonlyArray<ElementHandle>|ReadonlyArray<{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }>, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<Array<string>>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.setChecked(checked[, options])](https://playwright.dev/docs/api/class-locator#locator-set-checked)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks or unchecks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-selector) by performing the
+   * following steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-selector). If there is
+   *    none, wait until a matching element is attached to the DOM.
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws.
+   * 1. If the element already has the right checked state, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param checked Whether to check or uncheck the checkbox.
+   * @param options
+   */
+  setChecked(selector: string, checked: boolean, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * This method internally calls [document.write()](https://developer.mozilla.org/en-US/docs/Web/API/Document/write),
+   * inheriting all its specific characteristics and behaviors.
+   * @param html HTML markup to assign to the page.
+   * @param options
+   */
+  setContent(html: string, options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.setInputFiles(files[, options])](https://playwright.dev/docs/api/class-locator#locator-set-input-files)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Sets the value of the file input to these file paths or files. If some of the `filePaths` are relative paths, then
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   *
+   * This method expects [`selector`](https://playwright.dev/docs/api/class-frame#frame-set-input-files-option-selector)
+   * to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the
+   * element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param files
+   * @param options
+   */
+  setInputFiles(selector: string, files: string|ReadonlyArray<string>|{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }|ReadonlyArray<{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }>, options?: {
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method taps an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-tap-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-frame#frame-tap-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-tap-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-tap-option-position).
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-tap-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** `frame.tap()` requires that the `hasTouch` option of the browser context be set to true.
+   *
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  tap(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.textContent([options])](https://playwright.dev/docs/api/class-locator#locator-text-content) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `element.textContent`.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  textContent(selector: string, options?: {
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|string>;
+
+  /**
+   * Returns the page title.
+   */
+  title(): Promise<string>;
+
+  /**
+   * Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text. `frame.type` can be used
+   * to send fine-grained keyboard events. To fill values in form fields, use
+   * [frame.fill(selector, value[, options])](https://playwright.dev/docs/api/class-frame#frame-fill).
+   *
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * [keyboard.press(key[, options])](https://playwright.dev/docs/api/class-keyboard#keyboard-press).
+   *
+   * **Usage**
+   * @deprecated In most cases, you should use
+   * [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill) instead. You only need
+   * to press keys one by one if there is special keyboard handling on the page - in this case use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param text A text to type into a focused element.
+   * @param options
+   */
+  type(selector: string, text: string, options?: {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.uncheck([options])](https://playwright.dev/docs/api/class-locator#locator-uncheck)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
+   *    already unchecked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now unchecked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
+   * used.
+   * @param options
+   */
+  uncheck(selector: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+     * element, the call throws an exception.
+     */
+    strict?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns frame's url.
+   */
+  url(): string;
+
+  /**
+   * Waits for the required load state to be reached.
+   *
+   * This returns when the frame reaches a required load state, `load` by default. The navigation must have been
+   * committed when this method is called. If current document has already reached the required state, resolves
+   * immediately.
+   *
+   * **NOTE** Most of the time, this method is not needed because Playwright
+   * [auto-waits before every action](https://playwright.dev/docs/actionability).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await frame.click('button'); // Click triggers navigation.
+   * await frame.waitForLoadState(); // Waits for 'load' state by default.
+   * ```
+   *
+   * @param state Optional load state to wait for, defaults to `load`. If the state has been already reached while loading current
+   * document, the method resolves immediately. Can be one of:
+   * - `'load'` - wait for the `load` event to be fired.
+   * - `'domcontentloaded'` - wait for the `DOMContentLoaded` event to be fired.
+   * - `'networkidle'` - **DISCOURAGED** wait until there are no network connections for at least `500` ms. Don't use
+   * this method for testing, rely on web assertions to assess readiness instead.
+   * @param options
+   */
+  waitForLoadState(state?: "load"|"domcontentloaded"|"networkidle", options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Waits for the frame navigation and returns the main resource response. In case of multiple redirects, the
+   * navigation will resolve with the response of the last redirect. In case of navigation to a different anchor or
+   * navigation due to History API usage, the navigation will resolve with `null`.
+   *
+   * **Usage**
+   *
+   * This method waits for the frame to navigate to a new URL. It is useful for when you run code which will indirectly
+   * cause the frame to navigate. Consider this example:
+   *
+   * ```js
+   * // Start waiting for navigation before clicking. Note no await.
+   * const navigationPromise = page.waitForNavigation();
+   * await page.getByText('Navigate after timeout').click();
+   * await navigationPromise;
+   * ```
+   *
+   * **NOTE** Usage of the [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) to change the URL
+   * is considered a navigation.
+   *
+   * @deprecated This method is inherently racy, please use
+   * [frame.waitForURL(url[, options])](https://playwright.dev/docs/api/class-frame#frame-wait-for-url) instead.
+   * @param options
+   */
+  waitForNavigation(options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if
+     * the parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly
+     * equal to the string.
+     */
+    url?: string|RegExp|((url: URL) => boolean);
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<null|Response>;
+
+  /**
+   * **NOTE** Never wait for timeout in production. Tests that wait for time are inherently flaky. Use
+   * [Locator](https://playwright.dev/docs/api/class-locator) actions and web assertions that wait automatically.
+   *
+   * Waits for the given [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-timeout-option-timeout)
+   * in milliseconds.
+   *
+   * Note that `frame.waitForTimeout()` should only be used for debugging. Tests using the timer in production are going
+   * to be flaky. Use signals such as network events, selectors becoming visible and others instead.
+   * @param timeout A timeout to wait for
+   */
+  waitForTimeout(timeout: number): Promise<void>;
+
+  /**
+   * Waits for the frame to navigate to the given URL.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await frame.click('a.delayed-navigation'); // Clicking the link will indirectly cause a navigation
+   * await frame.waitForURL('**\/target.html');
+   * ```
+   *
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while waiting for the navigation. Note that if
+   * the parameter is a string without wildcard characters, the method will wait for navigation to URL that is exactly
+   * equal to the string.
+   * @param options
+   */
+  waitForURL(url: string|RegExp|((url: URL) => boolean), options?: {
+    /**
+     * Maximum operation time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+     * `navigationTimeout` option in the config, or by using the
+     * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout),
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout),
+     * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When to consider operation succeeded, defaults to `load`. Events can be either:
+     * - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
+     * - `'load'` - consider operation to be finished when the `load` event is fired.
+     * - `'networkidle'` - **DISCOURAGED** consider operation to be finished when there are no network connections for
+     *   at least `500` ms. Don't use this method for testing, rely on web assertions to assess readiness instead.
+     * - `'commit'` - consider operation to be finished when network response is received and the document started
+     *   loading.
+     */
+    waitUntil?: "load"|"domcontentloaded"|"networkidle"|"commit";
+  }): Promise<void>;
+}
+
+/**
+ * BrowserContexts provide a way to operate multiple independent browser sessions.
+ *
+ * If a page opens another page, e.g. with a `window.open` call, the popup will belong to the parent page's browser
+ * context.
+ *
+ * Playwright allows creating isolated non-persistent browser contexts with
+ * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) method.
+ * Non-persistent browser contexts don't write any browsing data to disk.
+ *
+ * ```js
+ * // Create a new incognito browser context
+ * const context = await browser.newContext();
+ * // Create a new page inside context.
+ * const page = await context.newPage();
+ * await page.goto('https://example.com');
+ * // Dispose context once it's no longer needed.
+ * await context.close();
+ * ```
+ *
+ */
+export interface BrowserContext {
+  /**
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-name) on the
+   * `window` object of every frame in every page in the context. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * and returns a [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback).
+   * If the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * returns a [Promise], it will be awaited.
+   *
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
+   *
+   * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)
+   * for page-only version.
+   *
+   * **Usage**
+   *
+   * An example of exposing page URL to all frames in all pages in the context:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   *
+   * (async () => {
+   *   const browser = await webkit.launch({ headless: false });
+   *   const context = await browser.newContext();
+   *   await context.exposeBinding('pageURL', ({ page }) => page.url());
+   *   const page = await context.newPage();
+   *   await page.setContent(`
+   *     <script>
+   *       async function onClick() {
+   *         document.querySelector('div').textContent = await window.pageURL();
+   *       }
+   *     </script>
+   *     <button onclick="onClick()">Click me</button>
+   *     <div></div>
+   *   `);
+   *   await page.getByRole('button').click();
+   * })();
+   * ```
+   *
+   * @param name Name of the function on the window object.
+   * @param callback Callback function that will be called in the Playwright's context.
+   * @param options
+   */
+  exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<void>;
+  /**
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-name) on the
+   * `window` object of every frame in every page in the context. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * and returns a [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback).
+   * If the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * returns a [Promise], it will be awaited.
+   *
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
+   *
+   * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)
+   * for page-only version.
+   *
+   * **Usage**
+   *
+   * An example of exposing page URL to all frames in all pages in the context:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   *
+   * (async () => {
+   *   const browser = await webkit.launch({ headless: false });
+   *   const context = await browser.newContext();
+   *   await context.exposeBinding('pageURL', ({ page }) => page.url());
+   *   const page = await context.newPage();
+   *   await page.setContent(`
+   *     <script>
+   *       async function onClick() {
+   *         document.querySelector('div').textContent = await window.pageURL();
+   *       }
+   *     </script>
+   *     <button onclick="onClick()">Click me</button>
+   *     <div></div>
+   *   `);
+   *   await page.getByRole('button').click();
+   * })();
+   * ```
+   *
+   * @param name Name of the function on the window object.
+   * @param callback Callback function that will be called in the Playwright's context.
+   * @param options
+   */
+  exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<void>;
+
+  /**
+   * Adds a script which would be evaluated in one of the following scenarios:
+   * - Whenever a page is created in the browser context or is navigated.
+   * - Whenever a child frame is attached or navigated in any page in the browser context. In this case, the script is
+   *   evaluated in the context of the newly attached frame.
+   *
+   * The script is evaluated after the document was created but before any of its scripts were run. This is useful to
+   * amend the JavaScript environment, e.g. to seed `Math.random`.
+   *
+   * **Usage**
+   *
+   * An example of overriding `Math.random` before the page loads:
+   *
+   * ```js
+   * // preload.js
+   * Math.random = () => 42;
+   * ```
+   *
+   * ```js
+   * // In your playwright script, assuming the preload.js file is in same directory.
+   * await browserContext.addInitScript({
+   *   path: 'preload.js'
+   * });
+   * ```
+   *
+   * **NOTE** The order of evaluation of multiple scripts installed via
+   * [browserContext.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-init-script)
+   * and [page.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-page#page-add-init-script) is not
+   * defined.
+   *
+   * @param script Script to be evaluated in all pages in the browser context.
+   * @param arg Optional argument to pass to
+   * [`script`](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-init-script-option-script)
+   * (only supported when passing a function).
+   */
+  addInitScript<Arg>(script: PageFunction<Arg, any> | { path?: string, content?: string }, arg?: Arg): Promise<void>;
+
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type?: string): this;
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
+  /**
+   * **NOTE** Only works with Chromium browser's persistent context.
+   *
+   * Emitted when new background page is created in the context.
+   *
+   * ```js
+   * const backgroundPage = await context.waitForEvent('backgroundpage');
+   * ```
+   *
+   */
+  on(event: 'backgroundpage', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when Browser context gets closed. This might happen because of one of the following:
+   * - Browser context is closed.
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  on(event: 'close', listener: (browserContext: BrowserContext) => any): this;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  on(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('dialog', dialog => {
+   *   dialog.accept();
+   * });
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  on(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event
+   * will also fire for popup pages. See also
+   * [page.on('popup')](https://playwright.dev/docs/api/class-page#page-event-popup) to receive events about popups
+   * relevant to a specific page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * const newPagePromise = context.waitForEvent('page');
+   * await page.getByText('open new page').click();
+   * const newPage = await newPagePromise;
+   * console.log(await newPage.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  on(event: 'page', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a request is issued from any pages created through this context. The [request] object is read-only. To
+   * only listen for requests from a particular page, use
+   * [page.on('request')](https://playwright.dev/docs/api/class-page#page-event-request).
+   *
+   * In order to intercept and mutate requests, see
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * or [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route).
+   */
+  on(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request fails, for example by timing out. To only listen for failed requests from a particular page,
+   * use [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed).
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
+   * event and not with
+   * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
+   */
+  on(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`. To listen for successful requests from a
+   * particular page, use
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished).
+   */
+  on(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`. To listen for response events from a particular page, use
+   * [page.on('response')](https://playwright.dev/docs/api/class-page#page-event-response).
+   */
+  on(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * **NOTE** Service workers are only supported on Chromium-based browsers.
+   *
+   * Emitted when new service worker is created in the context.
+   */
+  on(event: 'serviceworker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
+   * page, use [page.on('pageerror')](https://playwright.dev/docs/api/class-page#page-event-page-error) instead.
+   */
+  on(event: 'weberror', listener: (webError: WebError) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'backgroundpage', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: (browserContext: BrowserContext) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'page', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'serviceworker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'weberror', listener: (webError: WebError) => any): this;
+
+  /**
+   * **NOTE** Only works with Chromium browser's persistent context.
+   *
+   * Emitted when new background page is created in the context.
+   *
+   * ```js
+   * const backgroundPage = await context.waitForEvent('backgroundpage');
+   * ```
+   *
+   */
+  addListener(event: 'backgroundpage', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when Browser context gets closed. This might happen because of one of the following:
+   * - Browser context is closed.
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  addListener(event: 'close', listener: (browserContext: BrowserContext) => any): this;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  addListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('dialog', dialog => {
+   *   dialog.accept();
+   * });
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  addListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event
+   * will also fire for popup pages. See also
+   * [page.on('popup')](https://playwright.dev/docs/api/class-page#page-event-popup) to receive events about popups
+   * relevant to a specific page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * const newPagePromise = context.waitForEvent('page');
+   * await page.getByText('open new page').click();
+   * const newPage = await newPagePromise;
+   * console.log(await newPage.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  addListener(event: 'page', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a request is issued from any pages created through this context. The [request] object is read-only. To
+   * only listen for requests from a particular page, use
+   * [page.on('request')](https://playwright.dev/docs/api/class-page#page-event-request).
+   *
+   * In order to intercept and mutate requests, see
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * or [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route).
+   */
+  addListener(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request fails, for example by timing out. To only listen for failed requests from a particular page,
+   * use [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed).
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
+   * event and not with
+   * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
+   */
+  addListener(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`. To listen for successful requests from a
+   * particular page, use
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished).
+   */
+  addListener(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`. To listen for response events from a particular page, use
+   * [page.on('response')](https://playwright.dev/docs/api/class-page#page-event-response).
+   */
+  addListener(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * **NOTE** Service workers are only supported on Chromium-based browsers.
+   *
+   * Emitted when new service worker is created in the context.
+   */
+  addListener(event: 'serviceworker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
+   * page, use [page.on('pageerror')](https://playwright.dev/docs/api/class-page#page-event-page-error) instead.
+   */
+  addListener(event: 'weberror', listener: (webError: WebError) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'backgroundpage', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: (browserContext: BrowserContext) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'page', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'serviceworker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'weberror', listener: (webError: WebError) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'backgroundpage', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: (browserContext: BrowserContext) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'page', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'serviceworker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'weberror', listener: (webError: WebError) => any): this;
+
+  /**
+   * **NOTE** Only works with Chromium browser's persistent context.
+   *
+   * Emitted when new background page is created in the context.
+   *
+   * ```js
+   * const backgroundPage = await context.waitForEvent('backgroundpage');
+   * ```
+   *
+   */
+  prependListener(event: 'backgroundpage', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when Browser context gets closed. This might happen because of one of the following:
+   * - Browser context is closed.
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  prependListener(event: 'close', listener: (browserContext: BrowserContext) => any): this;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  prependListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('dialog', dialog => {
+   *   dialog.accept();
+   * });
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  prependListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
+
+  /**
+   * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event
+   * will also fire for popup pages. See also
+   * [page.on('popup')](https://playwright.dev/docs/api/class-page#page-event-popup) to receive events about popups
+   * relevant to a specific page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * const newPagePromise = context.waitForEvent('page');
+   * await page.getByText('open new page').click();
+   * const newPage = await newPagePromise;
+   * console.log(await newPage.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  prependListener(event: 'page', listener: (page: Page) => any): this;
+
+  /**
+   * Emitted when a request is issued from any pages created through this context. The [request] object is read-only. To
+   * only listen for requests from a particular page, use
+   * [page.on('request')](https://playwright.dev/docs/api/class-page#page-event-request).
+   *
+   * In order to intercept and mutate requests, see
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * or [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route).
+   */
+  prependListener(event: 'request', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request fails, for example by timing out. To only listen for failed requests from a particular page,
+   * use [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed).
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
+   * event and not with
+   * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
+   */
+  prependListener(event: 'requestfailed', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`. To listen for successful requests from a
+   * particular page, use
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished).
+   */
+  prependListener(event: 'requestfinished', listener: (request: Request) => any): this;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`. To listen for response events from a particular page, use
+   * [page.on('response')](https://playwright.dev/docs/api/class-page#page-event-response).
+   */
+  prependListener(event: 'response', listener: (response: Response) => any): this;
+
+  /**
+   * **NOTE** Service workers are only supported on Chromium-based browsers.
+   *
+   * Emitted when new service worker is created in the context.
+   */
+  prependListener(event: 'serviceworker', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
+   * page, use [page.on('pageerror')](https://playwright.dev/docs/api/class-page#page-event-page-error) instead.
+   */
+  prependListener(event: 'weberror', listener: (webError: WebError) => any): this;
+
+  /**
+   * Adds cookies into this browser context. All pages within this context will have these cookies installed. Cookies
+   * can be obtained via
+   * [browserContext.cookies([urls])](https://playwright.dev/docs/api/class-browsercontext#browser-context-cookies).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await browserContext.addCookies([cookieObject1, cookieObject2]);
+   * ```
+   *
+   * @param cookies
+   */
+  addCookies(cookies: ReadonlyArray<{
+    name: string;
+
+    value: string;
+
+    /**
+     * Either url or domain / path are required. Optional.
+     */
+    url?: string;
+
+    /**
+     * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either url
+     * or domain / path are required. Optional.
+     */
+    domain?: string;
+
+    /**
+     * Either url or domain / path are required Optional.
+     */
+    path?: string;
+
+    /**
+     * Unix time in seconds. Optional.
+     */
+    expires?: number;
+
+    /**
+     * Optional.
+     */
+    httpOnly?: boolean;
+
+    /**
+     * Optional.
+     */
+    secure?: boolean;
+
+    /**
+     * Optional.
+     */
+    sameSite?: "Strict"|"Lax"|"None";
+
+    /**
+     * For partitioned third-party cookies (aka
+     * [CHIPS](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies)), the
+     * partition key. Optional.
+     */
+    partitionKey?: string;
+  }>): Promise<void>;
+
+  /**
+   * **NOTE** Background pages are only supported on Chromium-based browsers.
+   *
+   * All existing background pages in the context.
+   */
+  backgroundPages(): Array<Page>;
+
+  /**
+   * Gets the browser instance that owns the context. Returns `null` if the context is created outside of normal
+   * browser, e.g. Android or Electron.
+   */
+  browser(): null|Browser;
+
+  /**
+   * Removes cookies from context. Accepts optional filter.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await context.clearCookies();
+   * await context.clearCookies({ name: 'session-id' });
+   * await context.clearCookies({ domain: 'my-origin.com' });
+   * await context.clearCookies({ domain: /.*my-origin\.com/ });
+   * await context.clearCookies({ path: '/api/v1' });
+   * await context.clearCookies({ name: 'session-id', domain: 'my-origin.com' });
+   * ```
+   *
+   * @param options
+   */
+  clearCookies(options?: {
+    /**
+     * Only removes cookies with the given domain.
+     */
+    domain?: string|RegExp;
+
+    /**
+     * Only removes cookies with the given name.
+     */
+    name?: string|RegExp;
+
+    /**
+     * Only removes cookies with the given path.
+     */
+    path?: string|RegExp;
+  }): Promise<void>;
+
+  /**
+   * Clears all permission overrides for the browser context.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const context = await browser.newContext();
+   * await context.grantPermissions(['clipboard-read']);
+   * // do stuff ..
+   * context.clearPermissions();
+   * ```
+   *
+   */
+  clearPermissions(): Promise<void>;
+
+  /**
+   * Closes the browser context. All the pages that belong to the browser context will be closed.
+   *
+   * **NOTE** The default browser context cannot be closed.
+   *
+   * @param options
+   */
+  close(options?: {
+    /**
+     * The reason to be reported to the operations interrupted by the context closure.
+     */
+    reason?: string;
+  }): Promise<void>;
+
+  /**
+   * If no URLs are specified, this method returns all cookies. If URLs are specified, only cookies that affect those
+   * URLs are returned.
+   * @param urls Optional list of URLs.
+   */
+  cookies(urls?: string|ReadonlyArray<string>): Promise<Array<Cookie>>;
+
+  /**
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-name) on the
+   * `window` object of every frame in every page in the context. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-callback)
+   * and returns a [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-callback).
+   *
+   * If the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-callback)
+   * returns a [Promise], it will be awaited.
+   *
+   * See [page.exposeFunction(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-function) for
+   * page-only version.
+   *
+   * **Usage**
+   *
+   * An example of adding a `sha256` function to all pages in the context:
+   *
+   * ```js
+   * const { webkit } = require('playwright');  // Or 'chromium' or 'firefox'.
+   * const crypto = require('crypto');
+   *
+   * (async () => {
+   *   const browser = await webkit.launch({ headless: false });
+   *   const context = await browser.newContext();
+   *   await context.exposeFunction('sha256', text =>
+   *     crypto.createHash('sha256').update(text).digest('hex'),
+   *   );
+   *   const page = await context.newPage();
+   *   await page.setContent(`
+   *     <script>
+   *       async function onClick() {
+   *         document.querySelector('div').textContent = await window.sha256('PLAYWRIGHT');
+   *       }
+   *     </script>
+   *     <button onclick="onClick()">Click me</button>
+   *     <div></div>
+   *   `);
+   *   await page.getByRole('button').click();
+   * })();
+   * ```
+   *
+   * @param name Name of the function on the window object.
+   * @param callback Callback function that will be called in the Playwright's context.
+   */
+  exposeFunction(name: string, callback: Function): Promise<void>;
+
+  /**
+   * Grants specified permissions to the browser context. Only grants corresponding permissions to the given origin if
+   * specified.
+   * @param permissions A list of permissions to grant.
+   *
+   * **NOTE** Supported permissions differ between browsers, and even between different versions of the same browser.
+   * Any permission may stop working after an update.
+   *
+   * Here are some permissions that may be supported by some browsers:
+   * - `'accelerometer'`
+   * - `'ambient-light-sensor'`
+   * - `'background-sync'`
+   * - `'camera'`
+   * - `'clipboard-read'`
+   * - `'clipboard-write'`
+   * - `'geolocation'`
+   * - `'gyroscope'`
+   * - `'magnetometer'`
+   * - `'microphone'`
+   * - `'midi-sysex'` (system-exclusive midi)
+   * - `'midi'`
+   * - `'notifications'`
+   * - `'payment-handler'`
+   * - `'storage-access'`
+   * - `'local-fonts'`
+   * @param options
+   */
+  grantPermissions(permissions: ReadonlyArray<string>, options?: {
+    /**
+     * The [origin] to grant permissions to, e.g. "https://example.com".
+     */
+    origin?: string;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** CDP sessions are only supported on Chromium-based browsers.
+   *
+   * Returns the newly created session.
+   * @param page Target to create new session for. For backwards-compatibility, this parameter is named `page`, but it can be a
+   * `Page` or `Frame` type.
+   */
+  newCDPSession(page: Page|Frame): Promise<CDPSession>;
+
+  /**
+   * Creates a new page in the browser context.
+   */
+  newPage(): Promise<Page>;
+
+  /**
+   * Returns all open pages in the context.
+   */
+  pages(): Array<Page>;
+
+  /**
+   * Routing provides the capability to modify network requests that are made by any page in the browser context. Once
+   * route is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
+   *
+   * **NOTE**
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * will not intercept requests intercepted by Service Worker. See
+   * [this](https://github.com/microsoft/playwright/issues/1090) issue. We recommend disabling Service Workers when
+   * using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
+   *
+   * **Usage**
+   *
+   * An example of a naive handler that aborts all image requests:
+   *
+   * ```js
+   * const context = await browser.newContext();
+   * await context.route('**\/*.{png,jpg,jpeg}', route => route.abort());
+   * const page = await context.newPage();
+   * await page.goto('https://example.com');
+   * await browser.close();
+   * ```
+   *
+   * or the same snippet using a regex pattern instead:
+   *
+   * ```js
+   * const context = await browser.newContext();
+   * await context.route(/(\.png$)|(\.jpg$)/, route => route.abort());
+   * const page = await context.newPage();
+   * await page.goto('https://example.com');
+   * await browser.close();
+   * ```
+   *
+   * It is possible to examine the request to decide the route action. For example, mocking all requests that contain
+   * some post data, and leaving all other requests as is:
+   *
+   * ```js
+   * await context.route('/api/**', async route => {
+   *   if (route.request().postData().includes('my-string'))
+   *     await route.fulfill({ body: 'mocked-data' });
+   *   else
+   *     await route.continue();
+   * });
+   * ```
+   *
+   * Page routes (set up with
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route)) take precedence over
+   * browser context routes when request matches both handlers.
+   *
+   * To remove a route with its handler you can use
+   * [browserContext.unroute(url[, handler])](https://playwright.dev/docs/api/class-browsercontext#browser-context-unroute).
+   *
+   * **NOTE** Enabling routing disables http cache.
+   *
+   * @param url A glob pattern, regex pattern, or predicate that receives a [URL] to match during routing. If
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) is set in the
+   * context options and the provided URL is a string that does not start with `*`, it is resolved using the
+   * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
+   * @param handler handler function to route the request.
+   * @param options
+   */
+  route(url: string|RegExp|((url: URL) => boolean), handler: ((route: Route, request: Request) => Promise<any>|any), options?: {
+    /**
+     * How often a route should be used. By default it will be used every time.
+     */
+    times?: number;
+  }): Promise<void>;
+
+  /**
+   * If specified the network requests that are made in the context will be served from the HAR file. Read more about
+   * [Replaying from HAR](https://playwright.dev/docs/mock#replaying-from-har).
+   *
+   * Playwright will not serve requests intercepted by Service Worker from the HAR file. See
+   * [this](https://github.com/microsoft/playwright/issues/1090) issue. We recommend disabling Service Workers when
+   * using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
+   * @param har Path to a [HAR](http://www.softwareishard.com/blog/har-12-spec) file with prerecorded network data. If `path` is a
+   * relative path, then it is resolved relative to the current working directory.
+   * @param options
+   */
+  routeFromHAR(har: string, options?: {
+    /**
+     * - If set to 'abort' any request not found in the HAR file will be aborted.
+     * - If set to 'fallback' falls through to the next route handler in the handler chain.
+     *
+     * Defaults to abort.
+     */
+    notFound?: "abort"|"fallback";
+
+    /**
+     * If specified, updates the given HAR with the actual network information instead of serving from file. The file is
+     * written to disk when
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) is
+     * called.
+     */
+    update?: boolean;
+
+    /**
+     * Optional setting to control resource content management. If `attach` is specified, resources are persisted as
+     * separate files or entries in the ZIP archive. If `embed` is specified, content is stored inline the HAR file.
+     */
+    updateContent?: "embed"|"attach";
+
+    /**
+     * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to
+     * `minimal`.
+     */
+    updateMode?: "full"|"minimal";
+
+    /**
+     * A glob pattern, regular expression or predicate to match the request URL. Only requests with URL matching the
+     * pattern will be served from the HAR file. If not specified, all requests are served from the HAR file.
+     */
+    url?: string|RegExp;
+  }): Promise<void>;
+
+  /**
+   * This method allows to modify websocket connections that are made by any page in the browser context.
+   *
+   * Note that only `WebSocket`s created after this method was called will be routed. It is recommended to call this
+   * method before creating any pages.
+   *
+   * **Usage**
+   *
+   * Below is an example of a simple handler that blocks some websocket messages. See
+   * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute) for more details and examples.
+   *
+   * ```js
+   * await context.routeWebSocket('/ws', async ws => {
+   *   ws.routeSend(message => {
+   *     if (message === 'to-be-blocked')
+   *       return;
+   *     ws.send(message);
+   *   });
+   *   await ws.connect();
+   * });
+   * ```
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) context option.
+   * @param handler Handler function to route the WebSocket.
+   */
+  routeWebSocket(url: string|RegExp|((url: URL) => boolean), handler: ((websocketroute: WebSocketRoute) => Promise<any>|any)): Promise<void>;
+
+  /**
+   * **NOTE** Service workers are only supported on Chromium-based browsers.
+   *
+   * All existing service workers in the context.
+   */
+  serviceWorkers(): Array<Worker>;
+
+  /**
+   * This setting will change the default maximum navigation time for the following methods and related shortcuts:
+   * - [page.goBack([options])](https://playwright.dev/docs/api/class-page#page-go-back)
+   * - [page.goForward([options])](https://playwright.dev/docs/api/class-page#page-go-forward)
+   * - [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto)
+   * - [page.reload([options])](https://playwright.dev/docs/api/class-page#page-reload)
+   * - [page.setContent(html[, options])](https://playwright.dev/docs/api/class-page#page-set-content)
+   * - [page.waitForNavigation([options])](https://playwright.dev/docs/api/class-page#page-wait-for-navigation)
+   *
+   * **NOTE**
+   * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
+   * and [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) take
+   * priority over
+   * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout).
+   *
+   * @param timeout Maximum navigation time in milliseconds
+   */
+  setDefaultNavigationTimeout(timeout: number): void;
+
+  /**
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout-option-timeout)
+   * option.
+   *
+   * **NOTE**
+   * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout),
+   * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) and
+   * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout)
+   * take priority over
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout).
+   *
+   * @param timeout Maximum time in milliseconds. Pass `0` to disable timeout.
+   */
+  setDefaultTimeout(timeout: number): void;
+
+  /**
+   * The extra HTTP headers will be sent with every request initiated by any page in the context. These headers are
+   * merged with page-specific extra HTTP headers set with
+   * [page.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-page#page-set-extra-http-headers). If
+   * page overrides a particular header, page-specific header value will be used instead of the browser context header
+   * value.
+   *
+   * **NOTE**
+   * [browserContext.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-extra-http-headers)
+   * does not guarantee the order of headers in the outgoing requests.
+   *
+   * @param headers An object containing additional HTTP headers to be sent with every request. All header values must be strings.
+   */
+  setExtraHTTPHeaders(headers: { [key: string]: string; }): Promise<void>;
+
+  /**
+   * Sets the context's geolocation. Passing `null` or `undefined` emulates position unavailable.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await browserContext.setGeolocation({ latitude: 59.95, longitude: 30.31667 });
+   * ```
+   *
+   * **NOTE** Consider using
+   * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+   * to grant permissions for the browser context pages to read its geolocation.
+   *
+   * @param geolocation
+   */
+  setGeolocation(geolocation: null|{
+    /**
+     * Latitude between -90 and 90.
+     */
+    latitude: number;
+
+    /**
+     * Longitude between -180 and 180.
+     */
+    longitude: number;
+
+    /**
+     * Non-negative accuracy value. Defaults to `0`.
+     */
+    accuracy?: number;
+  }): Promise<void>;
+
+  /**
+   * @deprecated Browsers may cache credentials after successful authentication. Create a new browser context instead.
+   * @param httpCredentials
+   */
+  setHTTPCredentials(httpCredentials: null|{
+    username: string;
+
+    password: string;
+  }): Promise<void>;
+
+  /**
+   * @param offline Whether to emulate network being offline for the browser context.
+   */
+  setOffline(offline: boolean): Promise<void>;
+
+  /**
+   * Returns storage state for this browser context, contains current cookies, local storage snapshot and IndexedDB
+   * snapshot.
+   * @param options
+   */
+  storageState(options?: {
+    /**
+     * Set to `true` to include [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) in the storage
+     * state snapshot. If your application uses IndexedDB to store authentication tokens, like Firebase Authentication,
+     * enable this.
+     */
+    indexedDB?: boolean;
+
+    /**
+     * The file path to save the storage state to. If
+     * [`path`](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state-option-path) is a
+     * relative path, then it is resolved relative to current working directory. If no path is provided, storage state is
+     * still returned, but won't be saved to the disk.
+     */
+    path?: string;
+  }): Promise<{
+    cookies: Array<{
+      name: string;
+
+      value: string;
+
+      domain: string;
+
+      path: string;
+
+      /**
+       * Unix time in seconds.
+       */
+      expires: number;
+
+      httpOnly: boolean;
+
+      secure: boolean;
+
+      sameSite: "Strict"|"Lax"|"None";
+    }>;
+
+    origins: Array<{
+      origin: string;
+
+      localStorage: Array<{
+        name: string;
+
+        value: string;
+      }>;
+    }>;
+  }>;
+
+  /**
+   * Removes a route created with
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   * When [`handler`](https://playwright.dev/docs/api/class-browsercontext#browser-context-unroute-option-handler) is
+   * not specified, removes all routes for the
+   * [`url`](https://playwright.dev/docs/api/class-browsercontext#browser-context-unroute-option-url).
+   * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   * @param handler Optional handler function used to register a routing with
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
+   */
+  unroute(url: string|RegExp|((url: URL) => boolean), handler?: ((route: Route, request: Request) => Promise<any>|any)): Promise<void>;
+
+  /**
+   * Removes all routes created with
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.routeFromHAR(har[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route-from-har).
+   * @param options
+   */
+  unrouteAll(options?: {
+    /**
+     * Specifies whether to wait for already running handlers and what to do if they throw errors:
+     * - `'default'` - do not wait for current handler calls (if any) to finish, if unrouted handler throws, it may
+     *   result in unhandled error
+     * - `'wait'` - wait for current handler calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current handler calls (if any) to finish, all errors thrown by the handlers
+     *   after unrouting are silently caught
+     */
+    behavior?: "wait"|"ignoreErrors"|"default";
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Only works with Chromium browser's persistent context.
+   *
+   * Emitted when new background page is created in the context.
+   *
+   * ```js
+   * const backgroundPage = await context.waitForEvent('backgroundpage');
+   * ```
+   *
+   */
+  waitForEvent(event: 'backgroundpage', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when Browser context gets closed. This might happen because of one of the following:
+   * - Browser context is closed.
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: (browserContext: BrowserContext) => boolean | Promise<boolean>, timeout?: number } | ((browserContext: BrowserContext) => boolean | Promise<boolean>)): Promise<BrowserContext>;
+
+  /**
+   * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
+   *
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await page.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  waitForEvent(event: 'console', optionsOrPredicate?: { predicate?: (consoleMessage: ConsoleMessage) => boolean | Promise<boolean>, timeout?: number } | ((consoleMessage: ConsoleMessage) => boolean | Promise<boolean>)): Promise<ConsoleMessage>;
+
+  /**
+   * Emitted when a JavaScript dialog appears, such as `alert`, `prompt`, `confirm` or `beforeunload`. Listener **must**
+   * either [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+   * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+   * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+   * dialog, and actions like click will never finish.
+   *
+   * **Usage**
+   *
+   * ```js
+   * context.on('dialog', dialog => {
+   *   dialog.accept();
+   * });
+   * ```
+   *
+   * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
+   * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
+   * listeners are present, all dialogs are automatically dismissed.
+   *
+   */
+  waitForEvent(event: 'dialog', optionsOrPredicate?: { predicate?: (dialog: Dialog) => boolean | Promise<boolean>, timeout?: number } | ((dialog: Dialog) => boolean | Promise<boolean>)): Promise<Dialog>;
+
+  /**
+   * The event is emitted when a new Page is created in the BrowserContext. The page may still be loading. The event
+   * will also fire for popup pages. See also
+   * [page.on('popup')](https://playwright.dev/docs/api/class-page#page-event-popup) to receive events about popups
+   * relevant to a specific page.
+   *
+   * The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
+   * popup with `window.open('http://example.com')`, this event will fire when the network request to
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen
+   * to this network request, use
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * and
+   * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
+   *
+   * ```js
+   * const newPagePromise = context.waitForEvent('page');
+   * await page.getByText('open new page').click();
+   * const newPage = await newPagePromise;
+   * console.log(await newPage.evaluate('location.href'));
+   * ```
+   *
+   * **NOTE** Use
+   * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
+   * wait until the page gets to a particular state (you should not need it in most cases).
+   *
+   */
+  waitForEvent(event: 'page', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+  /**
+   * Emitted when a request is issued from any pages created through this context. The [request] object is read-only. To
+   * only listen for requests from a particular page, use
+   * [page.on('request')](https://playwright.dev/docs/api/class-page#page-event-request).
+   *
+   * In order to intercept and mutate requests, see
+   * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
+   * or [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route).
+   */
+  waitForEvent(event: 'request', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
+
+  /**
+   * Emitted when a request fails, for example by timing out. To only listen for failed requests from a particular page,
+   * use [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed).
+   *
+   * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+   * will complete with
+   * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
+   * event and not with
+   * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
+   */
+  waitForEvent(event: 'requestfailed', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
+
+  /**
+   * Emitted when a request finishes successfully after downloading the response body. For a successful response, the
+   * sequence of events is `request`, `response` and `requestfinished`. To listen for successful requests from a
+   * particular page, use
+   * [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished).
+   */
+  waitForEvent(event: 'requestfinished', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
+
+  /**
+   * Emitted when [response] status and headers are received for a request. For a successful response, the sequence of
+   * events is `request`, `response` and `requestfinished`. To listen for response events from a particular page, use
+   * [page.on('response')](https://playwright.dev/docs/api/class-page#page-event-response).
+   */
+  waitForEvent(event: 'response', optionsOrPredicate?: { predicate?: (response: Response) => boolean | Promise<boolean>, timeout?: number } | ((response: Response) => boolean | Promise<boolean>)): Promise<Response>;
+
+  /**
+   * **NOTE** Service workers are only supported on Chromium-based browsers.
+   *
+   * Emitted when new service worker is created in the context.
+   */
+  waitForEvent(event: 'serviceworker', optionsOrPredicate?: { predicate?: (worker: Worker) => boolean | Promise<boolean>, timeout?: number } | ((worker: Worker) => boolean | Promise<boolean>)): Promise<Worker>;
+
+  /**
+   * Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
+   * page, use [page.on('pageerror')](https://playwright.dev/docs/api/class-page#page-event-page-error) instead.
+   */
+  waitForEvent(event: 'weberror', optionsOrPredicate?: { predicate?: (webError: WebError) => boolean | Promise<boolean>, timeout?: number } | ((webError: WebError) => boolean | Promise<boolean>)): Promise<WebError>;
+
+
+  /**
+   * Playwright has ability to mock clock and passage of time.
+   */
+  clock: Clock;
+
+  /**
+   * API testing helper associated with this context. Requests made with this API will use context cookies.
+   */
+  request: APIRequestContext;
+
+  tracing: Tracing;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * A Browser is created via
+ * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). An example
+ * of using a [Browser](https://playwright.dev/docs/api/class-browser) to create a
+ * [Page](https://playwright.dev/docs/api/class-page):
+ *
+ * ```js
+ * const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
+ *
+ * (async () => {
+ *   const browser = await firefox.launch();
+ *   const page = await browser.newPage();
+ *   await page.goto('https://example.com');
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ */
+export interface Browser {
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type?: string): this;
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
+  /**
+   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
+   * following:
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  on(event: 'disconnected', listener: (browser: Browser) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'disconnected', listener: (browser: Browser) => any): this;
+
+  /**
+   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
+   * following:
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  addListener(event: 'disconnected', listener: (browser: Browser) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'disconnected', listener: (browser: Browser) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'disconnected', listener: (browser: Browser) => any): this;
+
+  /**
+   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
+   * following:
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
+   */
+  prependListener(event: 'disconnected', listener: (browser: Browser) => any): this;
+
+  /**
+   * Get the browser type (chromium, firefox or webkit) that the browser belongs to.
+   */
+  browserType(): BrowserType;
+
+  /**
+   * In case this browser is obtained using
+   * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch), closes the
+   * browser and all of its pages (if any were opened).
+   *
+   * In case this browser is connected to, clears all created contexts belonging to this browser and disconnects from
+   * the browser server.
+   *
+   * **NOTE** This is similar to force-quitting the browser. To close pages gracefully and ensure you receive page close
+   * events, call
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) on
+   * any [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) instances you explicitly created earlier
+   * using [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) **before**
+   * calling [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close).
+   *
+   * The [Browser](https://playwright.dev/docs/api/class-browser) object itself is considered to be disposed and cannot
+   * be used anymore.
+   * @param options
+   */
+  close(options?: {
+    /**
+     * The reason to be reported to the operations interrupted by the browser closure.
+     */
+    reason?: string;
+  }): Promise<void>;
+
+  /**
+   * Returns an array of all open browser contexts. In a newly created browser, this will return zero browser contexts.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const browser = await pw.webkit.launch();
+   * console.log(browser.contexts().length); // prints `0`
+   *
+   * const context = await browser.newContext();
+   * console.log(browser.contexts().length); // prints `1`
+   * ```
+   *
+   */
+  contexts(): Array<BrowserContext>;
+
+  /**
+   * Indicates that the browser is connected.
+   */
+  isConnected(): boolean;
+
+  /**
+   * **NOTE** CDP Sessions are only supported on Chromium-based browsers.
+   *
+   * Returns the newly created browser session.
+   */
+  newBrowserCDPSession(): Promise<CDPSession>;
+
+  /**
+   * Creates a new browser context. It won't share cookies/cache with other browser contexts.
+   *
+   * **NOTE** If directly using this method to create
+   * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext)s, it is best practice to explicitly close
+   * the returned context via
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) when
+   * your code is done with the [BrowserContext](https://playwright.dev/docs/api/class-browsercontext), and before
+   * calling [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close). This will ensure
+   * the `context` is closed gracefully and any artifacts—like HARs and videos—are fully flushed and saved.
+   *
+   * **Usage**
+   *
+   * ```js
+   * (async () => {
+   *   const browser = await playwright.firefox.launch();  // Or 'chromium' or 'webkit'.
+   *   // Create a new incognito browser context.
+   *   const context = await browser.newContext();
+   *   // Create a new page in a pristine context.
+   *   const page = await context.newPage();
+   *   await page.goto('https://example.com');
+   *
+   *   // Gracefully close up everything
+   *   await context.close();
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param options
+   */
+  newContext(options?: BrowserContextOptions): Promise<BrowserContext>;
+
+  /**
+   * Creates a new page in a new browser context. Closing this page will close the context as well.
+   *
+   * This is a convenience API that should only be used for the single-page scenarios and short snippets. Production
+   * code and testing frameworks should explicitly create
+   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) followed by the
+   * [browserContext.newPage()](https://playwright.dev/docs/api/class-browsercontext#browser-context-new-page) to
+   * control their exact life times.
+   * @param options
+   */
+  newPage(options?: {
+    /**
+     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+     */
+    acceptDownloads?: boolean;
+
+    /**
+     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+     * or
+     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+     * it takes the base URL in consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Unset by default. Examples:
+     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
+     */
+    baseURL?: string;
+
+    /**
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     */
+    bypassCSP?: boolean;
+
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * **Details**
+     *
+     * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+     * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+     * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+     * with an exact match to the request origin that the certificate is valid for.
+     *
+     * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+     * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+     * does not match any of the domains you plan to visit.
+     *
+     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+     * work by replacing `localhost` with `local.playwright`.
+     *
+     */
+    clientCertificates?: Array<{
+      /**
+       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+       */
+      origin: string;
+
+      /**
+       * Path to the file with the certificate in PEM format.
+       */
+      certPath?: string;
+
+      /**
+       * Direct value of the certificate in PEM format.
+       */
+      cert?: Buffer;
+
+      /**
+       * Path to the file with the private key in PEM format.
+       */
+      keyPath?: string;
+
+      /**
+       * Direct value of the private key in PEM format.
+       */
+      key?: Buffer;
+
+      /**
+       * Path to the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfxPath?: string;
+
+      /**
+       * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfx?: Buffer;
+
+      /**
+       * Passphrase for the private key (PEM or PFX).
+       */
+      passphrase?: string;
+    }>;
+
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
+
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    contrast?: null|"no-preference"|"more";
+
+    /**
+     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+     */
+    deviceScaleFactor?: number;
+
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     */
+    forcedColors?: null|"active"|"none";
+
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
+
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
+
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
+
+    /**
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about
+     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     */
+    hasTouch?: boolean;
+
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     */
+    isMobile?: boolean;
+
+    /**
+     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     */
+    javaScriptEnabled?: boolean;
+
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
+
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
+
+    /**
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     */
+    offline?: boolean;
+
+    /**
+     * A list of permissions to grant to all pages in this context. See
+     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+     * for more details. Defaults to none.
+     */
+    permissions?: Array<string>;
+
+    /**
+     * Network proxy settings to use with this context. Defaults to none.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
+
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
+
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
+
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
+
+    /**
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
+     */
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
+
+      /**
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
+       */
+      content?: "omit"|"embed"|"attach";
+
+      /**
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
+       */
+      path: string;
+
+      /**
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       */
+      mode?: "full"|"minimal";
+
+      /**
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       */
+      urlFilter?: string|RegExp;
+    };
+
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
+      /**
+       * Path to the directory to put videos into.
+       */
+      dir: string;
+
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
+
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
+
+    /**
+     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+     * [`viewport`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-viewport) is set.
+     */
+    screen?: {
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+
+    /**
+     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+     *   registered.
+     * - `'block'`: Playwright will block all registration of Service Workers.
+     */
+    serviceWorkers?: "allow"|"block";
+
+    /**
+     * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
+     *
+     * Populates context with given storage state. This option can be used to initialize context with logged-in
+     * information obtained via
+     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
+     */
+    storageState?: string|{
+      /**
+       * Cookies to set for context
+       */
+      cookies: Array<{
+        name: string;
+
+        value: string;
+
+        /**
+         * Domain and path are required. For the cookie to apply to all subdomains as well, prefix domain with a dot, like
+         * this: ".example.com"
+         */
+        domain: string;
+
+        /**
+         * Domain and path are required
+         */
+        path: string;
+
+        /**
+         * Unix time in seconds.
+         */
+        expires: number;
+
+        httpOnly: boolean;
+
+        secure: boolean;
+
+        /**
+         * sameSite flag
+         */
+        sameSite: "Strict"|"Lax"|"None";
+      }>;
+
+      origins: Array<{
+        origin: string;
+
+        /**
+         * localStorage to set for context
+         */
+        localStorage: Array<{
+          name: string;
+
+          value: string;
+        }>;
+      }>;
+    };
+
+    /**
+     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+     * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
+     */
+    strictSelectors?: boolean;
+
+    /**
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
+     */
+    timezoneId?: string;
+
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+
+    /**
+     * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.
+     */
+    videoSize?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+
+    /**
+     * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.
+     */
+    videosPath?: string;
+
+    /**
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     *
+     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+     * by the operating system. It makes the execution of the tests non-deterministic.
+     *
+     */
+    viewport?: null|{
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+  }): Promise<Page>;
+
+  /**
+   * **NOTE** This API controls
+   * [Chromium Tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool) which is a low-level
+   * chromium-specific debugging tool. API to control [Playwright Tracing](https://playwright.dev/docs/trace-viewer) could be found
+   * [here](https://playwright.dev/docs/api/class-tracing).
+   *
+   * You can use
+   * [browser.startTracing([page, options])](https://playwright.dev/docs/api/class-browser#browser-start-tracing) and
+   * [browser.stopTracing()](https://playwright.dev/docs/api/class-browser#browser-stop-tracing) to create a trace file
+   * that can be opened in Chrome DevTools performance panel.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await browser.startTracing(page, { path: 'trace.json' });
+   * await page.goto('https://www.google.com');
+   * await browser.stopTracing();
+   * ```
+   *
+   * @param page Optional, if specified, tracing includes screenshots of the given page.
+   * @param options
+   */
+  startTracing(page?: Page, options?: {
+    /**
+     * specify custom categories to use instead of default.
+     */
+    categories?: Array<string>;
+
+    /**
+     * A path to write the trace file to.
+     */
+    path?: string;
+
+    /**
+     * captures screenshots in the trace.
+     */
+    screenshots?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** This API controls
+   * [Chromium Tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool) which is a low-level
+   * chromium-specific debugging tool. API to control [Playwright Tracing](https://playwright.dev/docs/trace-viewer) could be found
+   * [here](https://playwright.dev/docs/api/class-tracing).
+   *
+   * Returns the buffer with trace data.
+   */
+  stopTracing(): Promise<Buffer>;
+
+  /**
+   * Returns the browser version.
+   */
+  version(): string;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * The Worker class represents a [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API).
+ * `worker` event is emitted on the page object to signal a worker creation. `close` event is emitted on the worker
+ * object when the worker is gone.
+ *
+ * ```js
+ * page.on('worker', worker => {
+ *   console.log('Worker created: ' + worker.url());
+ *   worker.on('close', worker => console.log('Worker destroyed: ' + worker.url()));
+ * });
+ *
+ * console.log('Current workers:');
+ * for (const worker of page.workers())
+ *   console.log('  ' + worker.url());
+ * ```
+ *
+ */
+export interface Worker {
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * [Promise], then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) would wait for
+   * the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * non-[Serializable] value, then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   */
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * [Promise], then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) would wait for
+   * the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * non-[Serializable] value, then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   */
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) and
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * is that
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns a [Promise], then
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) and
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * is that
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns a [Promise], then
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+  /**
+   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
+   * terminated.
+   */
+  on(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
+   * terminated.
+   */
+  addListener(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
+   * terminated.
+   */
+  prependListener(event: 'close', listener: (worker: Worker) => any): this;
+
+  url(): string;
+}
+
+/**
+ * JSHandle represents an in-page JavaScript object. JSHandles can be created with the
+ * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) method.
+ *
+ * ```js
+ * const windowHandle = await page.evaluateHandle(() => window);
+ * // ...
+ * ```
+ *
+ * JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is exposed with
+ * [jsHandle.dispose()](https://playwright.dev/docs/api/class-jshandle#js-handle-dispose). JSHandles are auto-disposed
+ * when their origin frame gets navigated or the parent context gets destroyed.
+ *
+ * JSHandle instances can be used as an argument in
+ * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector),
+ * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
+ * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle)
+ * methods.
+ */
+export interface JSHandle<T = any> {
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression)
+   * returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet .retweets');
+   * expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10 retweets');
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   */
+  evaluate<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression)
+   * returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet .retweets');
+   * expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10 retweets');
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   */
+  evaluate<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   *
+   * The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle`
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would
+   * wait for the promise to resolve and return its value.
+   *
+   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
+   * more details.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   *
+   * The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle`
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would
+   * wait for the promise to resolve and return its value.
+   *
+   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
+   * more details.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<SmartHandle<R>>;
+
+  /**
+   * Returns a JSON representation of the object. If the object has a `toJSON` function, it **will not be called**.
+   *
+   * **NOTE** The method will return an empty JSON object if the referenced object is not stringifiable. It will throw
+   * an error if the object has circular references.
+   *
+   */
+  jsonValue(): Promise<T>;
+  /**
+   * Returns either `null` or the object handle itself, if the object handle is an instance of
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle).
+   */
+  asElement(): T extends Node ? ElementHandle<T> : null;
+  /**
+   * The `jsHandle.dispose` method stops referencing the element handle.
+   */
+  dispose(): Promise<void>;
+
+  /**
+   * The method returns a map with **own property names** as keys and JSHandle instances for the property values.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const handle = await page.evaluateHandle(() => ({ window, document }));
+   * const properties = await handle.getProperties();
+   * const windowHandle = properties.get('window');
+   * const documentHandle = properties.get('document');
+   * await handle.dispose();
+   * ```
+   *
+   */
+  getProperties(): Promise<Map<string, JSHandle>>;
+
+  /**
+   * Fetches a single property from the referenced object.
+   * @param propertyName property to get
+   */
+  getProperty(propertyName: string): Promise<JSHandle>;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * - extends: [JSHandle](https://playwright.dev/docs/api/class-jshandle)
+ *
+ * ElementHandle represents an in-page DOM element. ElementHandles can be created with the
+ * [page.$(selector[, options])](https://playwright.dev/docs/api/class-page#page-query-selector) method.
+ *
+ * **NOTE** The use of ElementHandle is discouraged, use [Locator](https://playwright.dev/docs/api/class-locator)
+ * objects and web-first assertions instead.
+ *
+ * ```js
+ * const hrefElement = await page.$('a');
+ * await hrefElement.click();
+ * ```
+ *
+ * ElementHandle prevents DOM element from garbage collection unless the handle is disposed with
+ * [jsHandle.dispose()](https://playwright.dev/docs/api/class-jshandle#js-handle-dispose). ElementHandles are
+ * auto-disposed when their origin frame gets navigated.
+ *
+ * ElementHandle instances can be used as an argument in
+ * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
+ * and [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) methods.
+ *
+ * The difference between the [Locator](https://playwright.dev/docs/api/class-locator) and ElementHandle is that the
+ * ElementHandle points to a particular element, while [Locator](https://playwright.dev/docs/api/class-locator)
+ * captures the logic of how to retrieve an element.
+ *
+ * In the example below, handle points to a particular DOM element on page. If that element changes text or is used by
+ * React to render an entirely different component, handle is still pointing to that very DOM element. This can lead
+ * to unexpected behaviors.
+ *
+ * ```js
+ * const handle = await page.$('text=Submit');
+ * // ...
+ * await handle.hover();
+ * await handle.click();
+ * ```
+ *
+ * With the locator, every time the `element` is used, up-to-date DOM element is located in the page using the
+ * selector. So in the snippet below, underlying DOM element is going to be located twice.
+ *
+ * ```js
+ * const locator = page.getByText('Submit');
+ * // ...
+ * await locator.hover();
+ * await locator.click();
+ * ```
+ *
+ */
+export interface ElementHandle<T=Node> extends JSHandle<T> {
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds an element matching the specified selector in the `ElementHandle`'s subtree. If no elements match
+   * the selector, returns `null`.
+   * @param selector A selector to query for.
+   */
+  $<K extends keyof HTMLElementTagNameMap>(selector: K, options?: { strict: boolean }): Promise<ElementHandleForTag<K> | null>;
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds an element matching the specified selector in the `ElementHandle`'s subtree. If no elements match
+   * the selector, returns `null`.
+   * @param selector A selector to query for.
+   */
+  $(selector: string, options?: { strict: boolean }): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
+
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds all elements matching the specified selector in the `ElementHandle`s subtree. If no elements match
+   * the selector, returns empty array.
+   * @param selector A selector to query for.
+   */
+  $$<K extends keyof HTMLElementTagNameMap>(selector: K): Promise<ElementHandleForTag<K>[]>;
+  /**
+   * **NOTE** Use locator-based [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The method finds all elements matching the specified selector in the `ElementHandle`s subtree. If no elements match
+   * the selector, returns empty array.
+   * @param selector A selector to query for.
+   */
+  $$(selector: string): Promise<ElementHandle<SVGElement | HTMLElement>[]>;
+
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet');
+   * expect(await tweetHandle.$eval('.like', node => node.innerText)).toBe('100');
+   * expect(await tweetHandle.$eval('.retweets', node => node.innerText)).toBe('10');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   */
+  $eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet');
+   * expect(await tweetHandle.$eval('.like', node => node.innerText)).toBe('100');
+   * expect(await tweetHandle.$eval('.retweets', node => node.innerText)).toBe('10');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   */
+  $eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet');
+   * expect(await tweetHandle.$eval('.like', node => node.innerText)).toBe('100');
+   * expect(await tweetHandle.$eval('.retweets', node => node.innerText)).toBe('10');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   */
+  $eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], void, R>, arg?: any): Promise<R>;
+  /**
+   * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
+   * Use
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   *
+   * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet');
+   * expect(await tweetHandle.$eval('.like', node => node.innerText)).toBe('100');
+   * expect(await tweetHandle.$eval('.retweets', node => node.innerText)).toBe('10');
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   */
+  $eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```html
+   * <div class="feed">
+   *   <div class="tweet">Hello!</div>
+   *   <div class="tweet">Hi!</div>
+   * </div>
+   * ```
+   *
+   * ```js
+   * const feedHandle = await page.$('.feed');
+   * expect(await feedHandle.$$eval('.tweet', nodes =>
+   *   nodes.map(n => n.innerText))).toEqual(['Hello!', 'Hi!'],
+   * );
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   */
+  $$eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```html
+   * <div class="feed">
+   *   <div class="tweet">Hello!</div>
+   *   <div class="tweet">Hi!</div>
+   * </div>
+   * ```
+   *
+   * ```js
+   * const feedHandle = await page.$('.feed');
+   * expect(await feedHandle.$$eval('.tweet', nodes =>
+   *   nodes.map(n => n.innerText))).toEqual(['Hello!', 'Hi!'],
+   * );
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   */
+  $$eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```html
+   * <div class="feed">
+   *   <div class="tweet">Hello!</div>
+   *   <div class="tweet">Hi!</div>
+   * </div>
+   * ```
+   *
+   * ```js
+   * const feedHandle = await page.$('.feed');
+   * expect(await feedHandle.$$eval('.tweet', nodes =>
+   *   nodes.map(n => n.innerText))).toEqual(['Hello!', 'Hi!'],
+   * );
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   */
+  $$eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], void, R>, arg?: any): Promise<R>;
+  /**
+   * **NOTE** In most cases,
+   * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   *
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
+   * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
+   * would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```html
+   * <div class="feed">
+   *   <div class="tweet">Hello!</div>
+   *   <div class="tweet">Hi!</div>
+   * </div>
+   * ```
+   *
+   * ```js
+   * const feedHandle = await page.$('.feed');
+   * expect(await feedHandle.$$eval('.tweet', nodes =>
+   *   nodes.map(n => n.innerText))).toEqual(['Hello!', 'Hi!'],
+   * );
+   * ```
+   *
+   * @param selector A selector to query for.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
+   */
+  $$eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], void, R>, arg?: any): Promise<R>;
+
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
+   *
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.setContent(`<div><span></span></div>`);
+   * const div = await page.$('div');
+   * // Waiting for the 'span' selector relative to the div.
+   * const span = await div.waitForSelector('span', { state: 'attached' });
+   * ```
+   *
+   * **NOTE** This method does not work across navigations, use
+   * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
+   * instead.
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options?: ElementHandleWaitForSelectorOptionsNotHidden): Promise<ElementHandleForTag<K>>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
+   *
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.setContent(`<div><span></span></div>`);
+   * const div = await page.$('div');
+   * // Waiting for the 'span' selector relative to the div.
+   * const span = await div.waitForSelector('span', { state: 'attached' });
+   * ```
+   *
+   * **NOTE** This method does not work across navigations, use
+   * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
+   * instead.
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector(selector: string, options?: ElementHandleWaitForSelectorOptionsNotHidden): Promise<ElementHandle<SVGElement | HTMLElement>>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
+   *
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.setContent(`<div><span></span></div>`);
+   * const div = await page.$('div');
+   * // Waiting for the 'span' selector relative to the div.
+   * const span = await div.waitForSelector('span', { state: 'attached' });
+   * ```
+   *
+   * **NOTE** This method does not work across navigations, use
+   * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
+   * instead.
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector<K extends keyof HTMLElementTagNameMap>(selector: K, options: ElementHandleWaitForSelectorOptions): Promise<ElementHandleForTag<K> | null>;
+  /**
+   * **NOTE** Use web assertions that assert visibility or a locator-based
+   * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
+   *
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.setContent(`<div><span></span></div>`);
+   * const div = await page.$('div');
+   * // Waiting for the 'span' selector relative to the div.
+   * const span = await div.waitForSelector('span', { state: 'attached' });
+   * ```
+   *
+   * **NOTE** This method does not work across navigations, use
+   * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
+   * instead.
+   *
+   * @param selector A selector to query for.
+   * @param options
+   */
+  waitForSelector(selector: string, options: ElementHandleWaitForSelectorOptions): Promise<null|ElementHandle<SVGElement | HTMLElement>>;
+  /**
+   * This method returns the bounding box of the element, or `null` if the element is not visible. The bounding box is
+   * calculated relative to the main frame viewport - which is usually the same as the browser window.
+   *
+   * Scrolling affects the returned bounding box, similarly to
+   * [Element.getBoundingClientRect](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+   * That means `x` and/or `y` may be negative.
+   *
+   * Elements from child frames return the bounding box relative to the main frame, unlike the
+   * [Element.getBoundingClientRect](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+   *
+   * Assuming the page is static, it is safe to use bounding box coordinates to perform input. For example, the
+   * following snippet should click the center of the element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const box = await elementHandle.boundingBox();
+   * await page.mouse.click(box.x + box.width / 2, box.y + box.height / 2);
+   * ```
+   *
+   */
+  boundingBox(): Promise<null|{
+    /**
+     * the x coordinate of the element in pixels.
+     */
+    x: number;
+
+    /**
+     * the y coordinate of the element in pixels.
+     */
+    y: number;
+
+    /**
+     * the width of the element in pixels.
+     */
+    width: number;
+
+    /**
+     * the height of the element in pixels.
+     */
+    height: number;
+  }>;
+
+  /**
+   * **NOTE** Use locator-based [locator.check([options])](https://playwright.dev/docs/api/class-locator#locator-check) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks the element by performing the following steps:
+   * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
+   *    checked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-check-option-force) option is
+   *    set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked. If not, this method throws.
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-check-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param options
+   */
+  check(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.click([options])](https://playwright.dev/docs/api/class-locator#locator-click) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method clicks the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-force) option is
+   *    set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-no-wait-after)
+   *    option is set.
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param options
+   */
+  click(options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns the content frame for element handles referencing iframe nodes, or `null` otherwise
+   */
+  contentFrame(): Promise<null|Frame>;
+
+  /**
+   * **NOTE** Use locator-based [locator.dblclick([options])](https://playwright.dev/docs/api/class-locator#locator-dblclick)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method double clicks the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dblclick-option-force) option is
+   *    set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dblclick-option-position).
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dblclick-option-timeout), this
+   * method throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables
+   * this.
+   *
+   * **NOTE** `elementHandle.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
+   * @param options
+   */
+  dblclick(options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.dispatchEvent(type[, eventInit, options])](https://playwright.dev/docs/api/class-locator#locator-dispatch-event)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * The snippet below dispatches the `click` event on the element. Regardless of the visibility state of the element,
+   * `click` is dispatched. This is equivalent to calling
+   * [element.click()](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/click).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await elementHandle.dispatchEvent('click');
+   * ```
+   *
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dispatch-event-option-type),
+   * initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dispatch-event-option-event-init)
+   * properties and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   *
+   * Since
+   * [`eventInit`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dispatch-event-option-event-init)
+   * is event-specific, please refer to the events documentation for the lists of initial properties:
+   * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
+   * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
+   * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
+   * - [Event](https://developer.mozilla.org/en-US/docs/Web/API/Event/Event)
+   * - [FocusEvent](https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent/FocusEvent)
+   * - [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/KeyboardEvent)
+   * - [MouseEvent](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/MouseEvent)
+   * - [PointerEvent](https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent/PointerEvent)
+   * - [TouchEvent](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/TouchEvent)
+   * - [WheelEvent](https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/WheelEvent)
+   *
+   * You can also specify `JSHandle` as the property value if you want live objects to be passed into the event:
+   *
+   * ```js
+   * // Note you can only create DataTransfer in Chromium and Firefox
+   * const dataTransfer = await page.evaluateHandle(() => new DataTransfer());
+   * await elementHandle.dispatchEvent('dragstart', { dataTransfer });
+   * ```
+   *
+   * @param type DOM event type: `"click"`, `"dragstart"`, etc.
+   * @param eventInit Optional event-specific initialization properties.
+   */
+  dispatchEvent(type: string, eventInit?: EvaluationArgument): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, fills it and triggers an
+   * `input` event after filling. Note that you can pass an empty string to clear the input field.
+   *
+   * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
+   * error. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
+   * instead.
+   *
+   * To send fine-grained keyboard events, use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param value Value to set for the `<input>`, `<textarea>` or `[contenteditable]` element.
+   * @param options
+   */
+  fill(value: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Calls [focus](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus) on the element.
+   */
+  focus(): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.getAttribute(name[, options])](https://playwright.dev/docs/api/class-locator#locator-get-attribute)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns element attribute value.
+   * @param name Attribute name to get the value for.
+   */
+  getAttribute(name: string): Promise<null|string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.hover([options])](https://playwright.dev/docs/api/class-locator#locator-hover) instead.
+   * Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method hovers over the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-hover-option-force) option is
+   *    set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-hover-option-position).
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-hover-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param options
+   */
+  hover(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.innerHTML([options])](https://playwright.dev/docs/api/class-locator#locator-inner-html)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the `element.innerHTML`.
+   */
+  innerHTML(): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.innerText([options])](https://playwright.dev/docs/api/class-locator#locator-inner-text)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the `element.innerText`.
+   */
+  innerText(): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.inputValue([options])](https://playwright.dev/docs/api/class-locator#locator-input-value) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns `input.value` for the selected `<input>` or `<textarea>` or `<select>` element.
+   *
+   * Throws for non-input elements. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), returns the value of the
+   * control.
+   * @param options
+   */
+  inputValue(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isChecked([options])](https://playwright.dev/docs/api/class-locator#locator-is-checked)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is checked. Throws if the element is not a checkbox or radio input.
+   */
+  isChecked(): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.isDisabled([options])](https://playwright.dev/docs/api/class-locator#locator-is-disabled) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is disabled, the opposite of [enabled](https://playwright.dev/docs/actionability#enabled).
+   */
+  isDisabled(): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.isEditable([options])](https://playwright.dev/docs/api/class-locator#locator-is-editable) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [editable](https://playwright.dev/docs/actionability#editable).
+   */
+  isEditable(): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isEnabled([options])](https://playwright.dev/docs/api/class-locator#locator-is-enabled)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [enabled](https://playwright.dev/docs/actionability#enabled).
+   */
+  isEnabled(): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isHidden([options])](https://playwright.dev/docs/api/class-locator#locator-is-hidden)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).
+   */
+  isHidden(): Promise<boolean>;
+
+  /**
+   * **NOTE** Use locator-based [locator.isVisible([options])](https://playwright.dev/docs/api/class-locator#locator-is-visible)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible).
+   */
+  isVisible(): Promise<boolean>;
+
+  /**
+   * Returns the frame containing the given element.
+   */
+  ownerFrame(): Promise<null|Frame>;
+
+  /**
+   * **NOTE** Use locator-based [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Focuses the element, and then uses
+   * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
+   * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   *
+   * [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) can specify the
+   * intended [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single
+   * character to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) values can be found
+   * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
+   *
+   * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
+   * `Delete`, `Escape`, `ArrowDown`, `End`, `Enter`, `Home`, `Insert`, `PageDown`, `PageUp`, `ArrowRight`, `ArrowUp`,
+   * etc.
+   *
+   * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
+   * `ControlOrMeta`.
+   *
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) in the upper case.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) is a single
+   * character, it is case-sensitive, so the values `a` and `A` will generate different respective texts.
+   *
+   * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
+   * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   * @param options
+   */
+  press(key: string, options?: {
+    /**
+     * Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.screenshot([options])](https://playwright.dev/docs/api/class-locator#locator-screenshot)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method captures a screenshot of the page, clipped to the size and position of this particular element. If the
+   * element is covered by other elements, it will not be actually visible on the screenshot. If the element is a
+   * scrollable container, only the currently scrolled content will be visible on the screenshot.
+   *
+   * This method waits for the [actionability](https://playwright.dev/docs/actionability) checks, then scrolls element into view before taking
+   * a screenshot. If the element is detached from DOM, the method throws an error.
+   *
+   * Returns the buffer with the captured screenshot.
+   * @param options
+   */
+  screenshot(options?: {
+    /**
+     * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
+     * treatment depending on their duration:
+     * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
+     * - infinite animations are canceled to initial state, and then played over after the screenshot.
+     *
+     * Defaults to `"allow"` that leaves animations untouched.
+     */
+    animations?: "disabled"|"allow";
+
+    /**
+     * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
+     * changed.  Defaults to `"hide"`.
+     */
+    caret?: "hide"|"initial";
+
+    /**
+     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
+     * box `#FF00FF` (customized by
+     * [`maskColor`](https://playwright.dev/docs/api/class-elementhandle#element-handle-screenshot-option-mask-color))
+     * that completely covers its bounding box. The mask is also applied to invisible elements, see
+     * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
+     */
+    mask?: Array<Locator>;
+
+    /**
+     * Specify the color of the overlay box for masked elements, in
+     * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
+     */
+    maskColor?: string;
+
+    /**
+     * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
+     * Defaults to `false`.
+     */
+    omitBackground?: boolean;
+
+    /**
+     * The file path to save the image to. The screenshot type will be inferred from file extension. If
+     * [`path`](https://playwright.dev/docs/api/class-elementhandle#element-handle-screenshot-option-path) is a relative
+     * path, then it is resolved relative to the current working directory. If no path is provided, the image won't be
+     * saved to the disk.
+     */
+    path?: string;
+
+    /**
+     * The quality of the image, between 0-100. Not applicable to `png` images.
+     */
+    quality?: number;
+
+    /**
+     * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
+     * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
+     * screenshots of high-dpi devices will be twice as large or even larger.
+     *
+     * Defaults to `"device"`.
+     */
+    scale?: "css"|"device";
+
+    /**
+     * Text of the stylesheet to apply while making the screenshot. This is where you can hide dynamic elements, make
+     * elements invisible or change their properties to help you creating repeatable screenshots. This stylesheet pierces
+     * the Shadow DOM and applies to the inner frames.
+     */
+    style?: string;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * Specify screenshot type, defaults to `png`.
+     */
+    type?: "png"|"jpeg";
+  }): Promise<Buffer>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.scrollIntoViewIfNeeded([options])](https://playwright.dev/docs/api/class-locator#locator-scroll-into-view-if-needed)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, then tries to scroll element into view, unless
+   * it is completely visible as defined by
+   * [IntersectionObserver](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API)'s `ratio`.
+   *
+   * Throws when `elementHandle` does not point to an element
+   * [connected](https://developer.mozilla.org/en-US/docs/Web/API/Node/isConnected) to a Document or a ShadowRoot.
+   *
+   * See [scrolling](https://playwright.dev/docs/input#scrolling) for alternative ways to scroll.
+   * @param options
+   */
+  scrollIntoViewIfNeeded(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.selectOption(values[, options])](https://playwright.dev/docs/api/class-locator#locator-select-option)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, waits until all specified options are present in
+   * the `<select>` element and selects these options.
+   *
+   * If the target element is not a `<select>` element, this method throws an error. However, if the element is inside
+   * the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be used
+   * instead.
+   *
+   * Returns the array of option values that have been successfully selected.
+   *
+   * Triggers a `change` and `input` event once all the provided options have been selected.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Single selection matching the value or label
+   * handle.selectOption('blue');
+   *
+   * // single selection matching the label
+   * handle.selectOption({ label: 'Blue' });
+   *
+   * // multiple selection
+   * handle.selectOption(['red', 'green', 'blue']);
+   * ```
+   *
+   * @param values Options to select. If the `<select>` has the `multiple` attribute, all matching options are selected, otherwise
+   * only the first option matching one of the passed options is selected. String values are matching both values and
+   * labels. Option is considered matching if all specified properties match.
+   * @param options
+   */
+  selectOption(values: null|string|ElementHandle|ReadonlyArray<string>|{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }|ReadonlyArray<ElementHandle>|ReadonlyArray<{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }>, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<Array<string>>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.selectText([options])](https://playwright.dev/docs/api/class-locator#locator-select-text) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, then focuses the element and selects all its
+   * text content.
+   *
+   * If the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), focuses and selects text in
+   * the control instead.
+   * @param options
+   */
+  selectText(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.setChecked(checked[, options])](https://playwright.dev/docs/api/class-locator#locator-set-checked)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks or unchecks an element by performing the following steps:
+   * 1. Ensure that element is a checkbox or a radio input. If not, this method throws.
+   * 1. If the element already has the right checked state, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-set-checked-option-force) option
+   *    is set. If the element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-set-checked-option-timeout), this
+   * method throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables
+   * this.
+   * @param checked Whether to check or uncheck the checkbox.
+   * @param options
+   */
+  setChecked(checked: boolean, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.setInputFiles(files[, options])](https://playwright.dev/docs/api/class-locator#locator-set-input-files)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Sets the value of the file input to these file paths or files. If some of the `filePaths` are relative paths, then
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs
+   * with a `[webkitdirectory]` attribute, only a single directory path is supported.
+   *
+   * This method expects [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) to point to an
+   * [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the element is inside
+   * the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
+   * @param files
+   * @param options
+   */
+  setInputFiles(files: string|ReadonlyArray<string>|{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }|ReadonlyArray<{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }>, options?: {
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method taps the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-tap-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-tap-option-position).
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-tap-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** `elementHandle.tap()` requires that the `hasTouch` option of the browser context be set to true.
+   *
+   * @param options
+   */
+  tap(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based
+   * [locator.textContent([options])](https://playwright.dev/docs/api/class-locator#locator-text-content) instead. Read
+   * more about [locators](https://playwright.dev/docs/locators).
+   *
+   * Returns the `node.textContent`.
+   */
+  textContent(): Promise<null|string>;
+
+  /**
+   * Focuses the element, and then sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the
+   * text.
+   *
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * [elementHandle.press(key[, options])](https://playwright.dev/docs/api/class-elementhandle#element-handle-press).
+   *
+   * **Usage**
+   * @deprecated In most cases, you should use
+   * [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill) instead. You only need
+   * to press keys one by one if there is special keyboard handling on the page - in this case use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param text A text to type into a focused element.
+   * @param options
+   */
+  type(text: string, options?: {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Use locator-based [locator.uncheck([options])](https://playwright.dev/docs/api/class-locator#locator-uncheck)
+   * instead. Read more about [locators](https://playwright.dev/docs/locators).
+   *
+   * This method checks the element by performing the following steps:
+   * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
+   *    unchecked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-uncheck-option-force) option is
+   *    set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now unchecked. If not, this method throws.
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-uncheck-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param options
+   */
+  uncheck(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns when the element satisfies the
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-element-state-option-state).
+   *
+   * Depending on the
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-element-state-option-state)
+   * parameter, this method waits for one of the [actionability](https://playwright.dev/docs/actionability) checks to pass. This method throws
+   * when the element is detached while waiting, unless waiting for the `"hidden"` state.
+   * - `"visible"` Wait until the element is [visible](https://playwright.dev/docs/actionability#visible).
+   * - `"hidden"` Wait until the element is [not visible](https://playwright.dev/docs/actionability#visible) or not attached. Note that
+   *   waiting for hidden does not throw when the element detaches.
+   * - `"stable"` Wait until the element is both [visible](https://playwright.dev/docs/actionability#visible) and
+   *   [stable](https://playwright.dev/docs/actionability#stable).
+   * - `"enabled"` Wait until the element is [enabled](https://playwright.dev/docs/actionability#enabled).
+   * - `"disabled"` Wait until the element is [not enabled](https://playwright.dev/docs/actionability#enabled).
+   * - `"editable"` Wait until the element is [editable](https://playwright.dev/docs/actionability#editable).
+   *
+   * If the element does not satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-element-state-option-timeout)
+   * milliseconds, this method will throw.
+   * @param state A state to wait for, see below for more details.
+   * @param options
+   */
+  waitForElementState(state: "visible"|"hidden"|"stable"|"enabled"|"disabled"|"editable", options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+}
+
+/**
+ * Locators are the central piece of Playwright's auto-waiting and retry-ability. In a nutshell, locators represent a
+ * way to find element(s) on the page at any moment. A locator can be created with the
+ * [page.locator(selector[, options])](https://playwright.dev/docs/api/class-page#page-locator) method.
+ *
+ * [Learn more about locators](https://playwright.dev/docs/locators).
+ */
+export interface Locator {
+  /**
+   * Execute JavaScript code in the page, taking the matching element as an argument.
+   *
+   * **Details**
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression), called with the
+   * matching element as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-arg) as a second argument.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) throws or
+   * rejects, this method throws.
+   *
+   * **Usage**
+   *
+   * Passing argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression):
+   *
+   * ```js
+   * const result = await page.getByTestId('myId').evaluate((element, [x, y]) => {
+   *   return element.textContent + ' ' + x * y;
+   * }, [7, 8]);
+   * console.log(result); // prints "myId text 56"
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression).
+   * @param options
+   */
+  evaluate<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg, options?: {
+    timeout?: number;
+  }): Promise<R>;
+  /**
+   * Execute JavaScript code in the page, taking the matching element as an argument.
+   *
+   * **Details**
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression), called with the
+   * matching element as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-arg) as a second argument.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) throws or
+   * rejects, this method throws.
+   *
+   * **Usage**
+   *
+   * Passing argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression):
+   *
+   * ```js
+   * const result = await page.getByTestId('myId').evaluate((element, [x, y]) => {
+   *   return element.textContent + ' ' + x * y;
+   * }, [7, 8]);
+   * console.log(result); // prints "myId text 56"
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression).
+   * @param options
+   */
+  evaluate<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>, options?: {
+    timeout?: number;
+  }): Promise<R>;
+  /**
+   * Execute JavaScript code in the page, taking the matching element as an argument, and return a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) with the result.
+   *
+   * **Details**
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) as
+   * a[JSHandle](https://playwright.dev/docs/api/class-jshandle), called with the matching element as a first argument,
+   * and [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-arg) as a second argument.
+   *
+   * The only difference between
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate)
+   * and
+   * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
+   * is that
+   * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression)
+   * returns a [Promise], this method will wait for the promise to resolve and return its value.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) throws
+   * or rejects, this method throws.
+   *
+   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
+   * more details.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression).
+   * @param options
+   */
+  evaluateHandle<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Execute JavaScript code in the page, taking the matching element as an argument, and return a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) with the result.
+   *
+   * **Details**
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) as
+   * a[JSHandle](https://playwright.dev/docs/api/class-jshandle), called with the matching element as a first argument,
+   * and [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-arg) as a second argument.
+   *
+   * The only difference between
+   * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate)
+   * and
+   * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
+   * is that
+   * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression)
+   * returns a [Promise], this method will wait for the promise to resolve and return its value.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) throws
+   * or rejects, this method throws.
+   *
+   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
+   * more details.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression).
+   * @param options
+   */
+  evaluateHandle<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>): Promise<SmartHandle<R>>;
+  /**
+   * Execute JavaScript code in the page, taking all matching elements as an argument.
+   *
+   * **Details**
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression), called with
+   * an array of all matching elements as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-arg) as a second argument.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) throws or
+   * rejects, this method throws.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.locator('div');
+   * const moreThanTen = await locator.evaluateAll((divs, min) => divs.length > min, 10);
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression).
+   */
+  evaluateAll<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Execute JavaScript code in the page, taking all matching elements as an argument.
+   *
+   * **Details**
+   *
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression), called with
+   * an array of all matching elements as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-arg) as a second argument.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) throws or
+   * rejects, this method throws.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.locator('div');
+   * const moreThanTen = await locator.evaluateAll((divs, min) => divs.length > min, 10);
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression).
+   */
+  evaluateAll<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E[], void, R>): Promise<R>;
+  /**
+   * **NOTE** Always prefer using [Locator](https://playwright.dev/docs/api/class-locator)s and web assertions over
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle)s because latter are inherently racy.
+   *
+   * Resolves given locator to the first matching DOM element. If there are no matching elements, waits for one. If
+   * multiple elements match the locator, throws.
+   * @param options
+   */
+  elementHandle(options?: {
+    timeout?: number;
+  }): Promise<null|ElementHandle<SVGElement | HTMLElement>>;
+  /**
+   * When the locator points to a list of elements, this returns an array of locators, pointing to their respective
+   * elements.
+   *
+   * **NOTE** [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all) does not wait for elements to
+   * match the locator, and instead immediately returns whatever is present in the page.
+   *
+   * When the list of elements changes dynamically,
+   * [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all) will produce unpredictable and flaky
+   * results.
+   *
+   * When the list of elements is stable, but loaded dynamically, wait for the full list to finish loading before
+   * calling [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all).
+   *
+   * **Usage**
+   *
+   * ```js
+   * for (const li of await page.getByRole('listitem').all())
+   *   await li.click();
+   * ```
+   *
+   */
+  all(): Promise<Array<Locator>>;
+
+  /**
+   * Returns an array of `node.innerText` values for all matching nodes.
+   *
+   * **NOTE** If you need to assert text on the page, prefer
+   * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
+   * with
+   * [`useInnerText`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text-option-use-inner-text)
+   * option to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const texts = await page.getByRole('link').allInnerTexts();
+   * ```
+   *
+   */
+  allInnerTexts(): Promise<Array<string>>;
+
+  /**
+   * Returns an array of `node.textContent` values for all matching nodes.
+   *
+   * **NOTE** If you need to assert text on the page, prefer
+   * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const texts = await page.getByRole('link').allTextContents();
+   * ```
+   *
+   */
+  allTextContents(): Promise<Array<string>>;
+
+  /**
+   * Creates a locator that matches both this locator and the argument locator.
+   *
+   * **Usage**
+   *
+   * The following example finds a button with a specific title.
+   *
+   * ```js
+   * const button = page.getByRole('button').and(page.getByTitle('Subscribe'));
+   * ```
+   *
+   * @param locator Additional locator to match.
+   */
+  and(locator: Locator): Locator;
+
+  /**
+   * Captures the aria snapshot of the given element. Read more about [aria snapshots](https://playwright.dev/docs/aria-snapshots) and
+   * [expect(locator).toMatchAriaSnapshot(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot)
+   * for the corresponding assertion.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('link').ariaSnapshot();
+   * ```
+   *
+   * **Details**
+   *
+   * This method captures the aria snapshot of the given element. The snapshot is a string that represents the state of
+   * the element and its children. The snapshot can be used to assert the state of the element in the test, or to
+   * compare it to state in the future.
+   *
+   * The ARIA snapshot is represented using [YAML](https://yaml.org/spec/1.2.2/) markup language:
+   * - The keys of the objects are the roles and optional accessible names of the elements.
+   * - The values are either text content or an array of child elements.
+   * - Generic static text can be represented with the `text` key.
+   *
+   * Below is the HTML markup and the respective ARIA snapshot:
+   *
+   * ```html
+   * <ul aria-label="Links">
+   *   <li><a href="/">Home</a></li>
+   *   <li><a href="/about">About</a></li>
+   * <ul>
+   * ```
+   *
+   * ```yml
+   * - list "Links":
+   *   - listitem:
+   *     - link "Home"
+   *   - listitem:
+   *     - link "About"
+   * ```
+   *
+   * @param options
+   */
+  ariaSnapshot(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * Calls [blur](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/blur) on the element.
+   * @param options
+   */
+  blur(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * This method returns the bounding box of the element matching the locator, or `null` if the element is not visible.
+   * The bounding box is calculated relative to the main frame viewport - which is usually the same as the browser
+   * window.
+   *
+   * **Details**
+   *
+   * Scrolling affects the returned bounding box, similarly to
+   * [Element.getBoundingClientRect](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+   * That means `x` and/or `y` may be negative.
+   *
+   * Elements from child frames return the bounding box relative to the main frame, unlike the
+   * [Element.getBoundingClientRect](https://developer.mozilla.org/en-US/docs/Web/API/Element/getBoundingClientRect).
+   *
+   * Assuming the page is static, it is safe to use bounding box coordinates to perform input. For example, the
+   * following snippet should click the center of the element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const box = await page.getByRole('button').boundingBox();
+   * await page.mouse.click(box.x + box.width / 2, box.y + box.height / 2);
+   * ```
+   *
+   * @param options
+   */
+  boundingBox(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|{
+    /**
+     * the x coordinate of the element in pixels.
+     */
+    x: number;
+
+    /**
+     * the y coordinate of the element in pixels.
+     */
+    y: number;
+
+    /**
+     * the width of the element in pixels.
+     */
+    width: number;
+
+    /**
+     * the height of the element in pixels.
+     */
+    height: number;
+  }>;
+
+  /**
+   * Ensure that checkbox or radio element is checked.
+   *
+   * **Details**
+   *
+   * Performs the following steps:
+   * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
+   *    checked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-check-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked. If not, this method throws.
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-check-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('checkbox').check();
+   * ```
+   *
+   * @param options
+   */
+  check(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Clear the input field.
+   *
+   * **Details**
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, clears it and triggers an
+   * `input` event after clearing.
+   *
+   * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
+   * error. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be cleared
+   * instead.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('textbox').clear();
+   * ```
+   *
+   * @param options
+   */
+  clear(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Click an element.
+   *
+   * **Details**
+   *
+   * This method clicks the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-click-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-locator#locator-click-option-no-wait-after) option is
+   *    set.
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-click-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **Usage**
+   *
+   * Click a button:
+   *
+   * ```js
+   * await page.getByRole('button').click();
+   * ```
+   *
+   * Shift-right-click at a specific position on a canvas:
+   *
+   * ```js
+   * await page.locator('canvas').click({
+   *   button: 'right',
+   *   modifiers: ['Shift'],
+   *   position: { x: 23, y: 32 },
+   * });
+   * ```
+   *
+   * @param options
+   */
+  click(options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns a [FrameLocator](https://playwright.dev/docs/api/class-framelocator) object pointing to the same `iframe`
+   * as this locator.
+   *
+   * Useful when you have a [Locator](https://playwright.dev/docs/api/class-locator) object obtained somewhere, and
+   * later on would like to interact with the content inside the frame.
+   *
+   * For a reverse operation, use
+   * [frameLocator.owner()](https://playwright.dev/docs/api/class-framelocator#frame-locator-owner).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.locator('iframe[name="embedded"]');
+   * // ...
+   * const frameLocator = locator.contentFrame();
+   * await frameLocator.getByRole('button').click();
+   * ```
+   *
+   */
+  contentFrame(): FrameLocator;
+
+  /**
+   * Returns the number of elements matching the locator.
+   *
+   * **NOTE** If you need to assert the number of elements on the page, prefer
+   * [expect(locator).toHaveCount(count[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-count)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const count = await page.getByRole('listitem').count();
+   * ```
+   *
+   */
+  count(): Promise<number>;
+
+  /**
+   * Double-click an element.
+   *
+   * **Details**
+   *
+   * This method double clicks the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-dblclick-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-dblclick-option-position).
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-dblclick-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** `element.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
+   * @param options
+   */
+  dblclick(options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Describes the locator, description is used in the trace viewer and reports. Returns the locator pointing to the
+   * same element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const button = page.getByTestId('btn-sub').describe('Subscribe button');
+   * await button.click();
+   * ```
+   *
+   * @param description Locator description.
+   */
+  describe(description: string): Locator;
+
+  /**
+   * Programmatically dispatch an event on the matching element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await locator.dispatchEvent('click');
+   * ```
+   *
+   * **Details**
+   *
+   * The snippet above dispatches the `click` event on the element. Regardless of the visibility state of the element,
+   * `click` is dispatched. This is equivalent to calling
+   * [element.click()](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/click).
+   *
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-locator#locator-dispatch-event-option-type), initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-locator#locator-dispatch-event-option-event-init) properties
+   * and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   *
+   * Since [`eventInit`](https://playwright.dev/docs/api/class-locator#locator-dispatch-event-option-event-init) is
+   * event-specific, please refer to the events documentation for the lists of initial properties:
+   * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
+   * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
+   * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
+   * - [Event](https://developer.mozilla.org/en-US/docs/Web/API/Event/Event)
+   * - [FocusEvent](https://developer.mozilla.org/en-US/docs/Web/API/FocusEvent/FocusEvent)
+   * - [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/KeyboardEvent)
+   * - [MouseEvent](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/MouseEvent)
+   * - [PointerEvent](https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent/PointerEvent)
+   * - [TouchEvent](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/TouchEvent)
+   * - [WheelEvent](https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/WheelEvent)
+   *
+   * You can also specify [JSHandle](https://playwright.dev/docs/api/class-jshandle) as the property value if you want
+   * live objects to be passed into the event:
+   *
+   * ```js
+   * const dataTransfer = await page.evaluateHandle(() => new DataTransfer());
+   * await locator.dispatchEvent('dragstart', { dataTransfer });
+   * ```
+   *
+   * @param type DOM event type: `"click"`, `"dragstart"`, etc.
+   * @param eventInit Optional event-specific initialization properties.
+   * @param options
+   */
+  dispatchEvent(type: string, eventInit?: EvaluationArgument, options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Drag the source element towards the target element and drop it.
+   *
+   * **Details**
+   *
+   * This method drags the locator to another target locator or target position. It will first move to the source
+   * element, perform a `mousedown`, then move to the target element or position and perform a `mouseup`.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const source = page.locator('#source');
+   * const target = page.locator('#target');
+   *
+   * await source.dragTo(target);
+   * // or specify exact positions relative to the top-left corners of the elements:
+   * await source.dragTo(target, {
+   *   sourcePosition: { x: 34, y: 7 },
+   *   targetPosition: { x: 10, y: 20 },
+   * });
+   * ```
+   *
+   * @param target Locator of the element to drag to.
+   * @param options
+   */
+  dragTo(target: Locator, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Clicks on the source element at this point relative to the top-left corner of the element's padding box. If not
+     * specified, some visible point of the element is used.
+     */
+    sourcePosition?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Drops on the target element at this point relative to the top-left corner of the element's padding box. If not
+     * specified, some visible point of the element is used.
+     */
+    targetPosition?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** Always prefer using [Locator](https://playwright.dev/docs/api/class-locator)s and web assertions over
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle)s because latter are inherently racy.
+   *
+   * Resolves given locator to all matching DOM elements. If there are no matching elements, returns an empty list.
+   */
+  elementHandles(): Promise<Array<ElementHandle>>;
+
+  /**
+   * Set a value to the input field.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('textbox').fill('example value');
+   * ```
+   *
+   * **Details**
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, fills it and triggers an
+   * `input` event after filling. Note that you can pass an empty string to clear the input field.
+   *
+   * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
+   * error. However, if the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
+   * instead.
+   *
+   * To send fine-grained keyboard events, use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param value Value to set for the `<input>`, `<textarea>` or `[contenteditable]` element.
+   * @param options
+   */
+  fill(value: string, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * This method narrows existing locator according to the options, for example filters by text. It can be chained to
+   * filter multiple times.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const rowLocator = page.locator('tr');
+   * // ...
+   * await rowLocator
+   *     .filter({ hasText: 'text in column 1' })
+   *     .filter({ has: page.getByRole('button', { name: 'column 2 button' }) })
+   *     .screenshot();
+   * ```
+   *
+   * @param options
+   */
+  filter(options?: {
+    /**
+     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
+     * `article` that has `text=Playwright` matches `<article><div>Playwright</div></article>`.
+     *
+     * Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not
+     * the document root. For example, you can find `content` that has `div` in
+     * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
+     * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    has?: Locator;
+
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    hasNot?: Locator;
+
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element.
+     * When passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    hasNotText?: string|RegExp;
+
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring. For example, `"Playwright"` matches
+     * `<article><div>Playwright</div></article>`.
+     */
+    hasText?: string|RegExp;
+
+    /**
+     * Only matches visible or invisible elements.
+     */
+    visible?: boolean;
+  }): Locator;
+
+  /**
+   * Returns locator to the first matching element.
+   */
+  first(): Locator;
+
+  /**
+   * Calls [focus](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus) on the matching element.
+   * @param options
+   */
+  focus(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * When working with iframes, you can create a frame locator that will enter the iframe and allow locating elements in
+   * that iframe:
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.frameLocator('iframe').getByText('Submit');
+   * await locator.click();
+   * ```
+   *
+   * @param selector A selector to use when resolving DOM element.
+   */
+  frameLocator(selector: string): FrameLocator;
+
+  /**
+   * Returns the matching element's attribute value.
+   *
+   * **NOTE** If you need to assert an element's attribute, prefer
+   * [expect(locator).toHaveAttribute(name, value[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-attribute)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * @param name Attribute name to get the value for.
+   * @param options
+   */
+  getAttribute(name: string, options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|string>;
+
+  /**
+   * Allows locating elements by their alt text.
+   *
+   * **Usage**
+   *
+   * For example, this method will find the image by alt text "Playwright logo":
+   *
+   * ```html
+   * <img alt='Playwright logo'>
+   * ```
+   *
+   * ```js
+   * await page.getByAltText('Playwright logo').click();
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByAltText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the text of the associated `<label>` or `aria-labelledby` element, or by the
+   * `aria-label` attribute.
+   *
+   * **Usage**
+   *
+   * For example, this method will find inputs by label "Username" and "Password" in the following DOM:
+   *
+   * ```html
+   * <input aria-label="Username">
+   * <label for="password-input">Password:</label>
+   * <input id="password-input">
+   * ```
+   *
+   * ```js
+   * await page.getByLabel('Username').fill('john');
+   * await page.getByLabel('Password').fill('secret');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByLabel(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the placeholder text.
+   *
+   * **Usage**
+   *
+   * For example, consider the following DOM structure.
+   *
+   * ```html
+   * <input type="email" placeholder="name@example.com" />
+   * ```
+   *
+   * You can fill the input after locating it by the placeholder text:
+   *
+   * ```js
+   * await page
+   *     .getByPlaceholder('name@example.com')
+   *     .fill('playwright@microsoft.com');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByPlaceholder(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their [ARIA role](https://www.w3.org/TR/wai-aria-1.2/#roles),
+   * [ARIA attributes](https://www.w3.org/TR/wai-aria-1.2/#aria-attributes) and
+   * [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <h3>Sign up</h3>
+   * <label>
+   *   <input type="checkbox" /> Subscribe
+   * </label>
+   * <br/>
+   * <button>Submit</button>
+   * ```
+   *
+   * You can locate each element by it's implicit role:
+   *
+   * ```js
+   * await expect(page.getByRole('heading', { name: 'Sign up' })).toBeVisible();
+   *
+   * await page.getByRole('checkbox', { name: 'Subscribe' }).check();
+   *
+   * await page.getByRole('button', { name: /submit/i }).click();
+   * ```
+   *
+   * **Details**
+   *
+   * Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback
+   * about the ARIA guidelines.
+   *
+   * Many html elements have an implicitly [defined role](https://w3c.github.io/html-aam/#html-element-role-mappings)
+   * that is recognized by the role selector. You can find all the
+   * [supported roles here](https://www.w3.org/TR/wai-aria-1.2/#role_definitions). ARIA guidelines **do not recommend**
+   * duplicating implicit roles and attributes by setting `role` and/or `aria-*` attributes to default values.
+   * @param role Required aria role.
+   * @param options
+   */
+  getByRole(role: "alert"|"alertdialog"|"application"|"article"|"banner"|"blockquote"|"button"|"caption"|"cell"|"checkbox"|"code"|"columnheader"|"combobox"|"complementary"|"contentinfo"|"definition"|"deletion"|"dialog"|"directory"|"document"|"emphasis"|"feed"|"figure"|"form"|"generic"|"grid"|"gridcell"|"group"|"heading"|"img"|"insertion"|"link"|"list"|"listbox"|"listitem"|"log"|"main"|"marquee"|"math"|"meter"|"menu"|"menubar"|"menuitem"|"menuitemcheckbox"|"menuitemradio"|"navigation"|"none"|"note"|"option"|"paragraph"|"presentation"|"progressbar"|"radio"|"radiogroup"|"region"|"row"|"rowgroup"|"rowheader"|"scrollbar"|"search"|"searchbox"|"separator"|"slider"|"spinbutton"|"status"|"strong"|"subscript"|"superscript"|"switch"|"tab"|"table"|"tablist"|"tabpanel"|"term"|"textbox"|"time"|"timer"|"toolbar"|"tooltip"|"tree"|"treegrid"|"treeitem", options?: {
+    /**
+     * An attribute that is usually set by `aria-checked` or native `<input type=checkbox>` controls.
+     *
+     * Learn more about [`aria-checked`](https://www.w3.org/TR/wai-aria-1.2/#aria-checked).
+     */
+    checked?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-disabled` or `disabled`.
+     *
+     * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
+     * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
+     */
+    disabled?: boolean;
+
+    /**
+     * Whether [`name`](https://playwright.dev/docs/api/class-locator#locator-get-by-role-option-name) is matched exactly:
+     * case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-locator#locator-get-by-role-option-name) is a regular expression.
+     * Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-expanded`.
+     *
+     * Learn more about [`aria-expanded`](https://www.w3.org/TR/wai-aria-1.2/#aria-expanded).
+     */
+    expanded?: boolean;
+
+    /**
+     * Option that controls whether hidden elements are matched. By default, only non-hidden elements, as
+     * [defined by ARIA](https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion), are matched by role selector.
+     *
+     * Learn more about [`aria-hidden`](https://www.w3.org/TR/wai-aria-1.2/#aria-hidden).
+     */
+    includeHidden?: boolean;
+
+    /**
+     * A number attribute that is usually present for roles `heading`, `listitem`, `row`, `treeitem`, with default values
+     * for `<h1>-<h6>` elements.
+     *
+     * Learn more about [`aria-level`](https://www.w3.org/TR/wai-aria-1.2/#aria-level).
+     */
+    level?: number;
+
+    /**
+     * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-locator#locator-get-by-role-option-exact) to control this behavior.
+     *
+     * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+     */
+    name?: string|RegExp;
+
+    /**
+     * An attribute that is usually set by `aria-pressed`.
+     *
+     * Learn more about [`aria-pressed`](https://www.w3.org/TR/wai-aria-1.2/#aria-pressed).
+     */
+    pressed?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-selected`.
+     *
+     * Learn more about [`aria-selected`](https://www.w3.org/TR/wai-aria-1.2/#aria-selected).
+     */
+    selected?: boolean;
+  }): Locator;
+
+  /**
+   * Locate element by the test id.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <button data-testid="directions">Itinéraire</button>
+   * ```
+   *
+   * You can locate the element by it's test id:
+   *
+   * ```js
+   * await page.getByTestId('directions').click();
+   * ```
+   *
+   * **Details**
+   *
+   * By default, the `data-testid` attribute is used as a test id. Use
+   * [selectors.setTestIdAttribute(attributeName)](https://playwright.dev/docs/api/class-selectors#selectors-set-test-id-attribute)
+   * to configure a different test id attribute if necessary.
+   *
+   * ```js
+   * // Set custom test id attribute from @playwright/test config:
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     testIdAttribute: 'data-pw'
+   *   },
+   * });
+   * ```
+   *
+   * @param testId Id to locate the element by.
+   */
+  getByTestId(testId: string|RegExp): Locator;
+
+  /**
+   * Allows locating elements that contain given text.
+   *
+   * See also [locator.filter([options])](https://playwright.dev/docs/api/class-locator#locator-filter) that allows to
+   * match by another criteria, like an accessible role, and then filter by the text content.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure:
+   *
+   * ```html
+   * <div>Hello <span>world</span></div>
+   * <div>Hello</div>
+   * ```
+   *
+   * You can locate by text substring, exact string, or a regular expression:
+   *
+   * ```js
+   * // Matches <span>
+   * page.getByText('world');
+   *
+   * // Matches first <div>
+   * page.getByText('Hello world');
+   *
+   * // Matches second <div>
+   * page.getByText('Hello', { exact: true });
+   *
+   * // Matches both <div>s
+   * page.getByText(/Hello/);
+   *
+   * // Matches second <div>
+   * page.getByText(/^hello$/i);
+   * ```
+   *
+   * **Details**
+   *
+   * Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into
+   * one, turns line breaks into spaces and ignores leading and trailing whitespace.
+   *
+   * Input elements of the type `button` and `submit` are matched by their `value` instead of the text content. For
+   * example, locating by text `"Log in"` matches `<input type=button value="Log in">`.
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their title attribute.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <span title='Issues count'>25 issues</span>
+   * ```
+   *
+   * You can check the issues count after locating it by the title text:
+   *
+   * ```js
+   * await expect(page.getByTitle('Issues count')).toHaveText('25 issues');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByTitle(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Highlight the corresponding element(s) on the screen. Useful for debugging, don't commit the code that uses
+   * [locator.highlight()](https://playwright.dev/docs/api/class-locator#locator-highlight).
+   */
+  highlight(): Promise<void>;
+
+  /**
+   * Hover over the matching element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('link').hover();
+   * ```
+   *
+   * **Details**
+   *
+   * This method hovers over the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-hover-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-hover-option-position).
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-hover-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param options
+   */
+  hover(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns the [`element.innerHTML`](https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML).
+   * @param options
+   */
+  innerHTML(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * Returns the [`element.innerText`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/innerText).
+   *
+   * **NOTE** If you need to assert text on the page, prefer
+   * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
+   * with
+   * [`useInnerText`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text-option-use-inner-text)
+   * option to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * @param options
+   */
+  innerText(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * Returns the value for the matching `<input>` or `<textarea>` or `<select>` element.
+   *
+   * **NOTE** If you need to assert input value, prefer
+   * [expect(locator).toHaveValue(value[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-value)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const value = await page.getByRole('textbox').inputValue();
+   * ```
+   *
+   * **Details**
+   *
+   * Throws elements that are not an input, textarea or a select. However, if the element is inside the `<label>`
+   * element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), returns the value of the
+   * control.
+   * @param options
+   */
+  inputValue(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
+  /**
+   * Returns whether the element is checked. Throws if the element is not a checkbox or radio input.
+   *
+   * **NOTE** If you need to assert that checkbox is checked, prefer
+   * [expect(locator).toBeChecked([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-checked)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const checked = await page.getByRole('checkbox').isChecked();
+   * ```
+   *
+   * @param options
+   */
+  isChecked(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns whether the element is disabled, the opposite of [enabled](https://playwright.dev/docs/actionability#enabled).
+   *
+   * **NOTE** If you need to assert that an element is disabled, prefer
+   * [expect(locator).toBeDisabled([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-disabled)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const disabled = await page.getByRole('button').isDisabled();
+   * ```
+   *
+   * @param options
+   */
+  isDisabled(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns whether the element is [editable](https://playwright.dev/docs/actionability#editable). If the target element is not an `<input>`,
+   * `<textarea>`, `<select>`, `[contenteditable]` and does not have a role allowing `[aria-readonly]`, this method
+   * throws an error.
+   *
+   * **NOTE** If you need to assert that an element is editable, prefer
+   * [expect(locator).toBeEditable([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-editable)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const editable = await page.getByRole('textbox').isEditable();
+   * ```
+   *
+   * @param options
+   */
+  isEditable(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns whether the element is [enabled](https://playwright.dev/docs/actionability#enabled).
+   *
+   * **NOTE** If you need to assert that an element is enabled, prefer
+   * [expect(locator).toBeEnabled([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-enabled)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const enabled = await page.getByRole('button').isEnabled();
+   * ```
+   *
+   * @param options
+   */
+  isEnabled(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).
+   *
+   * **NOTE** If you need to assert that element is hidden, prefer
+   * [expect(locator).toBeHidden([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-hidden)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const hidden = await page.getByRole('button').isHidden();
+   * ```
+   *
+   * @param options
+   */
+  isHidden(options?: {
+    /**
+     * @deprecated This option is ignored.
+     * [locator.isHidden([options])](https://playwright.dev/docs/api/class-locator#locator-is-hidden) does not wait for
+     * the element to become hidden and returns immediately.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible).
+   *
+   * **NOTE** If you need to assert that element is visible, prefer
+   * [expect(locator).toBeVisible([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-visible)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const visible = await page.getByRole('button').isVisible();
+   * ```
+   *
+   * @param options
+   */
+  isVisible(options?: {
+    /**
+     * @deprecated This option is ignored.
+     * [locator.isVisible([options])](https://playwright.dev/docs/api/class-locator#locator-is-visible) does not wait for
+     * the element to become visible and returns immediately.
+     */
+    timeout?: number;
+  }): Promise<boolean>;
+
+  /**
+   * Returns locator to the last matching element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const banana = await page.getByRole('listitem').last();
+   * ```
+   *
+   */
+  last(): Locator;
+
+  /**
+   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter
+   * options, similar to [locator.filter([options])](https://playwright.dev/docs/api/class-locator#locator-filter)
+   * method.
+   *
+   * [Learn more about locators](https://playwright.dev/docs/locators).
+   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
+   * @param options
+   */
+  locator(selectorOrLocator: string|Locator, options?: {
+    /**
+     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
+     * `article` that has `text=Playwright` matches `<article><div>Playwright</div></article>`.
+     *
+     * Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not
+     * the document root. For example, you can find `content` that has `div` in
+     * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
+     * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    has?: Locator;
+
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    hasNot?: Locator;
+
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element.
+     * When passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    hasNotText?: string|RegExp;
+
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring. For example, `"Playwright"` matches
+     * `<article><div>Playwright</div></article>`.
+     */
+    hasText?: string|RegExp;
+  }): Locator;
+
+  /**
+   * Returns locator to the n-th matching element. It's zero based, `nth(0)` selects the first element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const banana = await page.getByRole('listitem').nth(2);
+   * ```
+   *
+   * @param index
+   */
+  nth(index: number): Locator;
+
+  /**
+   * Creates a locator matching all elements that match one or both of the two locators.
+   *
+   * Note that when both locators match something, the resulting locator will have multiple matches, potentially causing
+   * a [locator strictness](https://playwright.dev/docs/locators#strictness) violation.
+   *
+   * **Usage**
+   *
+   * Consider a scenario where you'd like to click on a "New email" button, but sometimes a security settings dialog
+   * shows up instead. In this case, you can wait for either a "New email" button, or a dialog and act accordingly.
+   *
+   * **NOTE** If both "New email" button and security dialog appear on screen, the "or" locator will match both of them,
+   * possibly throwing the ["strict mode violation" error](https://playwright.dev/docs/locators#strictness). In this case, you can use
+   * [locator.first()](https://playwright.dev/docs/api/class-locator#locator-first) to only match one of them.
+   *
+   * ```js
+   * const newEmail = page.getByRole('button', { name: 'New' });
+   * const dialog = page.getByText('Confirm security settings');
+   * await expect(newEmail.or(dialog).first()).toBeVisible();
+   * if (await dialog.isVisible())
+   *   await page.getByRole('button', { name: 'Dismiss' }).click();
+   * await newEmail.click();
+   * ```
+   *
+   * @param locator Alternative locator to match.
+   */
+  or(locator: Locator): Locator;
+
+  /**
+   * A page this locator belongs to.
+   */
+  page(): Page;
+
+  /**
+   * Focuses the matching element and presses a combination of the keys.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('textbox').press('Backspace');
+   * ```
+   *
+   * **Details**
+   *
+   * Focuses the element, and then uses
+   * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
+   * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   *
+   * [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) can specify the intended
+   * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) values can be found
+   * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
+   *
+   * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
+   * `Delete`, `Escape`, `ArrowDown`, `End`, `Enter`, `Home`, `Insert`, `PageDown`, `PageUp`, `ArrowRight`, `ArrowUp`,
+   * etc.
+   *
+   * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
+   * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
+   *
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) in the upper case.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
+   *
+   * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
+   * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   * @param options
+   */
+  press(key: string, options?: {
+    /**
+     * Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
+     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
+     * navigating to inaccessible pages. Defaults to `false`.
+     * @deprecated This option will default to `true` in the future.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** In most cases, you should use
+   * [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill) instead. You only need
+   * to press keys one by one if there is special keyboard handling on the page.
+   *
+   * Focuses the element, and then sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the
+   * text.
+   *
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await locator.pressSequentially('Hello'); // Types instantly
+   * await locator.pressSequentially('World', { delay: 100 }); // Types slower, like a user
+   * ```
+   *
+   * An example of typing into a text field and then submitting the form:
+   *
+   * ```js
+   * const locator = page.getByLabel('Password');
+   * await locator.pressSequentially('my password');
+   * await locator.press('Enter');
+   * ```
+   *
+   * @param text String of characters to sequentially press into a focused element.
+   * @param options
+   */
+  pressSequentially(text: string, options?: {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Take a screenshot of the element matching the locator.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('link').screenshot();
+   * ```
+   *
+   * Disable animations and save screenshot to a file:
+   *
+   * ```js
+   * await page.getByRole('link').screenshot({ animations: 'disabled', path: 'link.png' });
+   * ```
+   *
+   * **Details**
+   *
+   * This method captures a screenshot of the page, clipped to the size and position of a particular element matching
+   * the locator. If the element is covered by other elements, it will not be actually visible on the screenshot. If the
+   * element is a scrollable container, only the currently scrolled content will be visible on the screenshot.
+   *
+   * This method waits for the [actionability](https://playwright.dev/docs/actionability) checks, then scrolls element into view before taking
+   * a screenshot. If the element is detached from DOM, the method throws an error.
+   *
+   * Returns the buffer with the captured screenshot.
+   * @param options
+   */
+  screenshot(options?: LocatorScreenshotOptions): Promise<Buffer>;
+
+  /**
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, then tries to scroll element into view, unless
+   * it is completely visible as defined by
+   * [IntersectionObserver](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API)'s `ratio`.
+   *
+   * See [scrolling](https://playwright.dev/docs/input#scrolling) for alternative ways to scroll.
+   * @param options
+   */
+  scrollIntoViewIfNeeded(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Selects option or options in `<select>`.
+   *
+   * **Details**
+   *
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, waits until all specified options are present in
+   * the `<select>` element and selects these options.
+   *
+   * If the target element is not a `<select>` element, this method throws an error. However, if the element is inside
+   * the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be used
+   * instead.
+   *
+   * Returns the array of option values that have been successfully selected.
+   *
+   * Triggers a `change` and `input` event once all the provided options have been selected.
+   *
+   * **Usage**
+   *
+   * ```html
+   * <select multiple>
+   *   <option value="red">Red</option>
+   *   <option value="green">Green</option>
+   *   <option value="blue">Blue</option>
+   * </select>
+   * ```
+   *
+   * ```js
+   * // single selection matching the value or label
+   * element.selectOption('blue');
+   *
+   * // single selection matching the label
+   * element.selectOption({ label: 'Blue' });
+   *
+   * // multiple selection for red, green and blue options
+   * element.selectOption(['red', 'green', 'blue']);
+   * ```
+   *
+   * @param values Options to select. If the `<select>` has the `multiple` attribute, all matching options are selected, otherwise
+   * only the first option matching one of the passed options is selected. String values are matching both values and
+   * labels. Option is considered matching if all specified properties match.
+   * @param options
+   */
+  selectOption(values: null|string|ElementHandle|ReadonlyArray<string>|{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }|ReadonlyArray<ElementHandle>|ReadonlyArray<{
+    /**
+     * Matches by `option.value`. Optional.
+     */
+    value?: string;
+
+    /**
+     * Matches by `option.label`. Optional.
+     */
+    label?: string;
+
+    /**
+     * Matches by the index. Optional.
+     */
+    index?: number;
+  }>, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<Array<string>>;
+
+  /**
+   * This method waits for [actionability](https://playwright.dev/docs/actionability) checks, then focuses the element and selects all its
+   * text content.
+   *
+   * If the element is inside the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), focuses and selects text in
+   * the control instead.
+   * @param options
+   */
+  selectText(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Set the state of a checkbox or a radio element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('checkbox').setChecked(true);
+   * ```
+   *
+   * **Details**
+   *
+   * This method checks or unchecks an element by performing the following steps:
+   * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws.
+   * 1. If the element already has the right checked state, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-set-checked-option-force) option is set. If
+   *    the element is detached during the checks, the whole action is retried.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-set-checked-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param checked Whether to check or uncheck the checkbox.
+   * @param options
+   */
+  setChecked(checked: boolean, options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Upload file or multiple files into `<input type=file>`. For inputs with a `[webkitdirectory]` attribute, only a
+   * single directory path is supported.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Select one file
+   * await page.getByLabel('Upload file').setInputFiles(path.join(__dirname, 'myfile.pdf'));
+   *
+   * // Select multiple files
+   * await page.getByLabel('Upload files').setInputFiles([
+   *   path.join(__dirname, 'file1.txt'),
+   *   path.join(__dirname, 'file2.txt'),
+   * ]);
+   *
+   * // Select a directory
+   * await page.getByLabel('Upload directory').setInputFiles(path.join(__dirname, 'mydir'));
+   *
+   * // Remove all the selected files
+   * await page.getByLabel('Upload file').setInputFiles([]);
+   *
+   * // Upload buffer from memory
+   * await page.getByLabel('Upload file').setInputFiles({
+   *   name: 'file.txt',
+   *   mimeType: 'text/plain',
+   *   buffer: Buffer.from('this is test')
+   * });
+   * ```
+   *
+   * **Details**
+   *
+   * Sets the value of the file input to these file paths or files. If some of the `filePaths` are relative paths, then
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   *
+   * This method expects [Locator](https://playwright.dev/docs/api/class-locator) to point to an
+   * [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the element is inside
+   * the `<label>` element that has an associated
+   * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
+   * @param files
+   * @param options
+   */
+  setInputFiles(files: string|ReadonlyArray<string>|{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }|ReadonlyArray<{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }>, options?: {
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Perform a tap gesture on the element matching the locator. For examples of emulating other gestures by manually
+   * dispatching touch events, see the [emulating legacy touch events](https://playwright.dev/docs/touch-events) page.
+   *
+   * **Details**
+   *
+   * This method taps the element by performing the following steps:
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-tap-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-tap-option-position).
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-tap-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   *
+   * **NOTE** `element.tap()` requires that the `hasTouch` option of the browser context be set to true.
+   *
+   * @param options
+   */
+  tap(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores
+     * current modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to
+     * "Control" on Windows and Linux and to "Meta" on macOS.
+     */
+    modifiers?: Array<"Alt"|"Control"|"ControlOrMeta"|"Meta"|"Shift">;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns the [`node.textContent`](https://developer.mozilla.org/en-US/docs/Web/API/Node/textContent).
+   *
+   * **NOTE** If you need to assert text on the page, prefer
+   * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
+   * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
+   * @param options
+   */
+  textContent(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<null|string>;
+
+  /**
+   * Focuses the element, and then sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the
+   * text.
+   *
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press).
+   *
+   * **Usage**
+   * @deprecated In most cases, you should use
+   * [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill) instead. You only need
+   * to press keys one by one if there is special keyboard handling on the page - in this case use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   * @param text A text to type into a focused element.
+   * @param options
+   */
+  type(text: string, options?: {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Ensure that checkbox or radio element is unchecked.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('checkbox').uncheck();
+   * ```
+   *
+   * **Details**
+   *
+   * This method unchecks the element by performing the following steps:
+   * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
+   *    unchecked, this method returns immediately.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-uncheck-option-force) option is set.
+   * 1. Scroll the element into view if needed.
+   * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
+   *    element.
+   * 1. Ensure that the element is now unchecked. If not, this method throws.
+   *
+   * If the element is detached from the DOM at any moment during the action, this method throws.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-uncheck-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
+   * @param options
+   */
+  uncheck(options?: {
+    /**
+     * Whether to bypass the [actionability](https://playwright.dev/docs/actionability) checks. Defaults to `false`.
+     */
+    force?: boolean;
+
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * A point to use relative to the top-left corner of element padding box. If not specified, uses some visible point of
+     * the element.
+     */
+    position?: {
+      x: number;
+
+      y: number;
+    };
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+
+    /**
+     * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
+     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     */
+    trial?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns when element specified by locator satisfies the
+   * [`state`](https://playwright.dev/docs/api/class-locator#locator-wait-for-option-state) option.
+   *
+   * If target element already satisfies the condition, the method returns immediately. Otherwise, waits for up to
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-wait-for-option-timeout) milliseconds until the
+   * condition is met.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const orderSent = page.locator('#order-sent');
+   * await orderSent.waitFor();
+   * ```
+   *
+   * @param options
+   */
+  waitFor(options?: {
+    /**
+     * Defaults to `'visible'`. Can be either:
+     * - `'attached'` - wait for element to be present in DOM.
+     * - `'detached'` - wait for element to not be present in DOM.
+     * - `'visible'` - wait for element to have non-empty bounding box and no `visibility:hidden`. Note that element
+     *   without any content or with `display:none` has an empty bounding box and is not considered visible.
+     * - `'hidden'` - wait for element to be either detached from DOM, or have an empty bounding box or
+     *   `visibility:hidden`. This is opposite to the `'visible'` option.
+     */
+    state?: "attached"|"detached"|"visible"|"hidden";
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+}
+
+/**
+ * BrowserType provides methods to launch a specific browser instance or connect to an existing one. The following is
+ * a typical example of using Playwright to drive automation:
+ *
+ * ```js
+ * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+ *
+ * (async () => {
+ *   const browser = await chromium.launch();
+ *   const page = await browser.newPage();
+ *   await page.goto('https://example.com');
+ *   // other actions...
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ */
+export interface BrowserType<Unused = {}> {
+  /**
+   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
+   *
+   * The default browser context is accessible via
+   * [browser.contexts()](https://playwright.dev/docs/api/class-browser#browser-contexts).
+   *
+   * **NOTE** Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
+   *
+   * **NOTE** This connection is significantly lower fidelity than the Playwright protocol connection via
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   * If you are experiencing issues or attempting to use advanced functionality, you probably want to use
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const browser = await playwright.chromium.connectOverCDP('http://localhost:9222');
+   * const defaultContext = browser.contexts()[0];
+   * const page = defaultContext.pages()[0];
+   * ```
+   *
+   * @param endpointURL A CDP websocket endpoint or http url to connect to. For example `http://localhost:9222/` or
+   * `ws://127.0.0.1:9222/devtools/browser/387adf4c-243f-4051-a181-46798f4a46f4`.
+   * @param options
+   */
+  connectOverCDP(endpointURL: string, options?: ConnectOverCDPOptions): Promise<Browser>;
+  /**
+   * Option `wsEndpoint` is deprecated. Instead use `endpointURL`.
+   * @deprecated
+   */
+  /**
+   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
+   *
+   * The default browser context is accessible via
+   * [browser.contexts()](https://playwright.dev/docs/api/class-browser#browser-contexts).
+   *
+   * **NOTE** Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
+   *
+   * **NOTE** This connection is significantly lower fidelity than the Playwright protocol connection via
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   * If you are experiencing issues or attempting to use advanced functionality, you probably want to use
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const browser = await playwright.chromium.connectOverCDP('http://localhost:9222');
+   * const defaultContext = browser.contexts()[0];
+   * const page = defaultContext.pages()[0];
+   * ```
+   *
+   * @param endpointURL A CDP websocket endpoint or http url to connect to. For example `http://localhost:9222/` or
+   * `ws://127.0.0.1:9222/devtools/browser/387adf4c-243f-4051-a181-46798f4a46f4`.
+   * @param options
+   */
+  connectOverCDP(options: ConnectOverCDPOptions & { wsEndpoint?: string }): Promise<Browser>;
+  /**
+   * This method attaches Playwright to an existing browser instance created via `BrowserType.launchServer` in Node.js.
+   *
+   * **NOTE** The major and minor version of the Playwright instance that connects needs to match the version of
+   * Playwright that launches the browser (1.2.3 → is compatible with 1.2.x).
+   *
+   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via `BrowserServer.wsEndpoint`.
+   * @param options
+   */
+  connect(wsEndpoint: string, options?: ConnectOptions): Promise<Browser>;
+  /**
+   * wsEndpoint in options is deprecated. Instead use `wsEndpoint`.
+   * @param wsEndpoint A browser websocket endpoint to connect to.
+   * @param options
+   * @deprecated
+   */
+  /**
+   * This method attaches Playwright to an existing browser instance created via `BrowserType.launchServer` in Node.js.
+   *
+   * **NOTE** The major and minor version of the Playwright instance that connects needs to match the version of
+   * Playwright that launches the browser (1.2.3 → is compatible with 1.2.x).
+   *
+   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via `BrowserServer.wsEndpoint`.
+   * @param options
+   */
+  connect(options: ConnectOptions & { wsEndpoint?: string }): Promise<Browser>;
+  /**
+   * A path where Playwright expects to find a bundled browser executable.
+   */
+  executablePath(): string;
+
+  /**
+   * Returns the browser instance.
+   *
+   * **Usage**
+   *
+   * You can use
+   * [`ignoreDefaultArgs`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-ignore-default-args)
+   * to filter out `--mute-audio` from default arguments:
+   *
+   * ```js
+   * const browser = await chromium.launch({  // Or 'firefox' or 'webkit'.
+   *   ignoreDefaultArgs: ['--mute-audio']
+   * });
+   * ```
+   *
+   * > **Chromium-only** Playwright can also be used to control the Google Chrome or Microsoft Edge browsers, but it
+   * works best with the version of Chromium it is bundled with. There is no guarantee it will work with any other
+   * version. Use
+   * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-executable-path)
+   * option with extreme caution.
+   * >
+   * > If Google Chrome (rather than Chromium) is preferred, a
+   * [Chrome Canary](https://www.google.com/chrome/browser/canary.html) or
+   * [Dev Channel](https://www.chromium.org/getting-involved/dev-channel) build is suggested.
+   * >
+   * > Stock browsers like Google Chrome and Microsoft Edge are suitable for tests that require proprietary media codecs
+   * for video playback. See
+   * [this article](https://www.howtogeek.com/202825/what%E2%80%99s-the-difference-between-chromium-and-chrome/) for
+   * other differences between Chromium and Chrome.
+   * [This article](https://chromium.googlesource.com/chromium/src/+/lkgr/docs/chromium_browser_vs_google_chrome.md)
+   * describes some differences for Linux users.
+   * @param options
+   */
+  launch(options?: LaunchOptions): Promise<Browser>;
+
+  /**
+   * Returns the persistent browser context instance.
+   *
+   * Launches browser that uses persistent storage located at
+   * [`userDataDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-user-data-dir)
+   * and returns the only context. Closing this context will automatically close the browser.
+   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. Pass an empty
+   * string to create a temporary directory.
+   *
+   * More details for
+   * [Chromium](https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction) and
+   * [Firefox](https://wiki.mozilla.org/Firefox/CommandLineOptions#User_profile). Chromium's user data directory is the
+   * **parent** directory of the "Profile Path" seen at `chrome://version`.
+   *
+   * Note that browsers do not allow launching multiple instances with the same User Data Directory.
+   *
+   * **NOTE** Chromium/Chrome: Due to recent Chrome policy changes, automating the default Chrome user profile is not
+   * supported. Pointing `userDataDir` to Chrome's main "User Data" directory (the profile used for your regular
+   * browsing) may result in pages not loading or the browser exiting. Create and use a separate directory (for example,
+   * an empty folder) as your automation profile instead. See https://developer.chrome.com/blog/remote-debugging-port
+   * for details.
+   *
+   * @param options
+   */
+  launchPersistentContext(userDataDir: string, options?: {
+    /**
+     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+     */
+    acceptDownloads?: boolean;
+
+    /**
+     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+     *
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
+     */
+    args?: Array<string>;
+
+    /**
+     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+     * or
+     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+     * it takes the base URL in consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Unset by default. Examples:
+     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
+     */
+    baseURL?: string;
+
+    /**
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     */
+    bypassCSP?: boolean;
+
+    /**
+     * Browser distribution channel.
+     *
+     * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
+     *
+     * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+     * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+     */
+    channel?: string;
+
+    /**
+     * Enable Chromium sandboxing. Defaults to `false`.
+     */
+    chromiumSandbox?: boolean;
+
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * **Details**
+     *
+     * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+     * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+     * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+     * with an exact match to the request origin that the certificate is valid for.
+     *
+     * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+     * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+     * does not match any of the domains you plan to visit.
+     *
+     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+     * work by replacing `localhost` with `local.playwright`.
+     *
+     */
+    clientCertificates?: Array<{
+      /**
+       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+       */
+      origin: string;
+
+      /**
+       * Path to the file with the certificate in PEM format.
+       */
+      certPath?: string;
+
+      /**
+       * Direct value of the certificate in PEM format.
+       */
+      cert?: Buffer;
+
+      /**
+       * Path to the file with the private key in PEM format.
+       */
+      keyPath?: string;
+
+      /**
+       * Direct value of the private key in PEM format.
+       */
+      key?: Buffer;
+
+      /**
+       * Path to the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfxPath?: string;
+
+      /**
+       * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfx?: Buffer;
+
+      /**
+       * Passphrase for the private key (PEM or PFX).
+       */
+      passphrase?: string;
+    }>;
+
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
+
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    contrast?: null|"no-preference"|"more";
+
+    /**
+     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+     */
+    deviceScaleFactor?: number;
+
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
+     * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-headless)
+     * option will be set `false`.
+     * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
+     */
+    devtools?: boolean;
+
+    /**
+     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
+     * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
+     * created in is closed.
+     */
+    downloadsPath?: string;
+
+    /**
+     * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
+     */
+    env?: { [key: string]: string|number|boolean; };
+
+    /**
+     * Path to a browser executable to run instead of the bundled one. If
+     * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-executable-path)
+     * is a relative path, then it is resolved relative to the current working directory. Note that Playwright only works
+     * with the bundled Chromium, Firefox or WebKit, use at your own risk.
+     */
+    executablePath?: string;
+
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
+    /**
+     * Firefox user preferences. Learn more about the Firefox user preferences at
+     * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
+     *
+     * You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via
+     * `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
+     */
+    firefoxUserPrefs?: { [key: string]: string|number|boolean; };
+
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     */
+    forcedColors?: null|"active"|"none";
+
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
+
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
+
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
+
+    /**
+     * Close the browser process on SIGHUP. Defaults to `true`.
+     */
+    handleSIGHUP?: boolean;
+
+    /**
+     * Close the browser process on Ctrl-C. Defaults to `true`.
+     */
+    handleSIGINT?: boolean;
+
+    /**
+     * Close the browser process on SIGTERM. Defaults to `true`.
+     */
+    handleSIGTERM?: boolean;
+
+    /**
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about
+     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     */
+    hasTouch?: boolean;
+
+    /**
+     * Whether to run browser in headless mode. More details for
+     * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
+     * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+     * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+     * `true`.
+     */
+    headless?: boolean;
+
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
+
+    /**
+     * If `true`, Playwright does not pass its own configurations args and only uses the ones from
+     * [`args`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-args). If
+     * an array is given, then filters out the given default arguments. Dangerous option; use with care. Defaults to
+     * `false`.
+     */
+    ignoreDefaultArgs?: boolean|Array<string>;
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     */
+    isMobile?: boolean;
+
+    /**
+     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     */
+    javaScriptEnabled?: boolean;
+
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
+
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
+
+    /**
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     */
+    offline?: boolean;
+
+    /**
+     * A list of permissions to grant to all pages in this context. See
+     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+     * for more details. Defaults to none.
+     */
+    permissions?: Array<string>;
+
+    /**
+     * Network proxy settings.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
+
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
+
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
+
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
+
+    /**
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
+     */
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
+
+      /**
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
+       */
+      content?: "omit"|"embed"|"attach";
+
+      /**
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
+       */
+      path: string;
+
+      /**
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       */
+      mode?: "full"|"minimal";
+
+      /**
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       */
+      urlFilter?: string|RegExp;
+    };
+
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
+      /**
+       * Path to the directory to put videos into.
+       */
+      dir: string;
+
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
+
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
+
+    /**
+     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+     * [`viewport`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-viewport)
+     * is set.
+     */
+    screen?: {
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+
+    /**
+     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+     *   registered.
+     * - `'block'`: Playwright will block all registration of Service Workers.
+     */
+    serviceWorkers?: "allow"|"block";
+
+    /**
+     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+     * on.
+     */
+    slowMo?: number;
+
+    /**
+     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+     * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
+     */
+    strictSelectors?: boolean;
+
+    /**
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
+     * to disable timeout.
+     */
+    timeout?: number;
+
+    /**
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
+     */
+    timezoneId?: string;
+
+    /**
+     * If specified, traces are saved into this directory.
+     */
+    tracesDir?: string;
+
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)
+     * instead.
+     */
+    videoSize?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)
+     * instead.
+     */
+    videosPath?: string;
+
+    /**
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     *
+     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+     * by the operating system. It makes the execution of the tests non-deterministic.
+     *
+     */
+    viewport?: null|{
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+  }): Promise<BrowserContext>;
+
+  /**
+   * Returns the browser app instance. You can connect to it via
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect),
+   * which requires the major/minor client/server version to match (1.2.3 → is compatible with 1.2.x).
+   *
+   * **Usage**
+   *
+   * Launches browser server that client can connect to. An example of launching a browser executable and connecting to
+   * it later:
+   *
+   * ```js
+   * const { chromium } = require('playwright');  // Or 'webkit' or 'firefox'.
+   *
+   * (async () => {
+   *   const browserServer = await chromium.launchServer();
+   *   const wsEndpoint = browserServer.wsEndpoint();
+   *   // Use web socket endpoint later to establish a connection.
+   *   const browser = await chromium.connect(wsEndpoint);
+   *   // Close browser instance.
+   *   await browserServer.close();
+   * })();
+   * ```
+   *
+   * @param options
+   */
+  launchServer(options?: {
+    /**
+     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+     *
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
+     */
+    args?: Array<string>;
+
+    /**
+     * Browser distribution channel.
+     *
+     * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
+     *
+     * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+     * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+     */
+    channel?: string;
+
+    /**
+     * Enable Chromium sandboxing. Defaults to `false`.
+     */
+    chromiumSandbox?: boolean;
+
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
+     * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-server-option-headless) option
+     * will be set `false`.
+     * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
+     */
+    devtools?: boolean;
+
+    /**
+     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
+     * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
+     * created in is closed.
+     */
+    downloadsPath?: string;
+
+    /**
+     * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
+     */
+    env?: { [key: string]: string|number|boolean; };
+
+    /**
+     * Path to a browser executable to run instead of the bundled one. If
+     * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-server-option-executable-path)
+     * is a relative path, then it is resolved relative to the current working directory. Note that Playwright only works
+     * with the bundled Chromium, Firefox or WebKit, use at your own risk.
+     */
+    executablePath?: string;
+
+    /**
+     * Firefox user preferences. Learn more about the Firefox user preferences at
+     * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
+     *
+     * You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via
+     * `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
+     */
+    firefoxUserPrefs?: { [key: string]: string|number|boolean; };
+
+    /**
+     * Close the browser process on SIGHUP. Defaults to `true`.
+     */
+    handleSIGHUP?: boolean;
+
+    /**
+     * Close the browser process on Ctrl-C. Defaults to `true`.
+     */
+    handleSIGINT?: boolean;
+
+    /**
+     * Close the browser process on SIGTERM. Defaults to `true`.
+     */
+    handleSIGTERM?: boolean;
+
+    /**
+     * Whether to run browser in headless mode. More details for
+     * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
+     * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+     * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+     * `true`.
+     */
+    headless?: boolean;
+
+    /**
+     * Host to use for the web socket. It is optional and if it is omitted, the server will accept connections on the
+     * unspecified IPv6 address (::) when IPv6 is available, or the unspecified IPv4 address (0.0.0.0) otherwise. Consider
+     * hardening it with picking a specific interface.
+     */
+    host?: string;
+
+    /**
+     * If `true`, Playwright does not pass its own configurations args and only uses the ones from
+     * [`args`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-server-option-args). If an array is
+     * given, then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
+     */
+    ignoreDefaultArgs?: boolean|Array<string>;
+
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
+
+    /**
+     * Port to use for the web socket. Defaults to 0 that picks any available port.
+     */
+    port?: number;
+
+    /**
+     * Network proxy settings.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
+
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
+
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
+
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
+
+    /**
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
+     * to disable timeout.
+     */
+    timeout?: number;
+
+    /**
+     * If specified, traces are saved into this directory.
+     */
+    tracesDir?: string;
+
+    /**
+     * Path at which to serve the Browser Server. For security, this defaults to an unguessable string.
+     *
+     * **NOTE** Any process or web page (including those running in Playwright) with knowledge of the `wsPath` can take
+     * control of the OS user. For this reason, you should use an unguessable token when using this option.
+     *
+     */
+    wsPath?: string;
+  }): Promise<BrowserServer>;
+
+  /**
+   * Returns browser name. For example: `'chromium'`, `'webkit'` or `'firefox'`.
+   */
+  name(): string;
+}
+
+/**
+ * The `CDPSession` instances are used to talk raw Chrome Devtools Protocol:
+ * - protocol methods can be called with `session.send` method.
+ * - protocol events can be subscribed to with `session.on` method.
+ *
+ * Useful links:
+ * - Documentation on DevTools Protocol can be found here:
+ *   [DevTools Protocol Viewer](https://chromedevtools.github.io/devtools-protocol/).
+ * - Getting Started with DevTools Protocol:
+ *   https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md
+ *
+ * ```js
+ * const client = await page.context().newCDPSession(page);
+ * await client.send('Animation.enable');
+ * client.on('Animation.animationCreated', () => console.log('Animation created!'));
+ * const response = await client.send('Animation.getPlaybackRate');
+ * console.log('playback rate is ' + response.playbackRate);
+ * await client.send('Animation.setPlaybackRate', {
+ *   playbackRate: response.playbackRate / 2
+ * });
+ * ```
+ *
+ */
+export interface CDPSession {
+  on: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  addListener: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  off: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  removeListener: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  once: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  /**
+   * @param method Protocol method name.
+   * @param params Optional method parameters.
+   */
+  send<T extends keyof Protocol.CommandParameters>(
+    method: T,
+    params?: Protocol.CommandParameters[T]
+  ): Promise<Protocol.CommandReturnValues[T]>;
+  /**
+   * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be
+   * used to send messages.
+   */
+  detach(): Promise<void>;
+}
+
+/**
+ * Whenever a [`WebSocket`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) route is set up with
+ * [page.routeWebSocket(url, handler)](https://playwright.dev/docs/api/class-page#page-route-web-socket) or
+ * [browserContext.routeWebSocket(url, handler)](https://playwright.dev/docs/api/class-browsercontext#browser-context-route-web-socket),
+ * the `WebSocketRoute` object allows to handle the WebSocket, like an actual server would do.
+ *
+ * **Mocking**
+ *
+ * By default, the routed WebSocket will not connect to the server. This way, you can mock entire communication over
+ * the WebSocket. Here is an example that responds to a `"request"` with a `"response"`.
+ *
+ * ```js
+ * await page.routeWebSocket('wss://example.com/ws', ws => {
+ *   ws.onMessage(message => {
+ *     if (message === 'request')
+ *       ws.send('response');
+ *   });
+ * });
+ * ```
+ *
+ * Since we do not call
+ * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server)
+ * inside the WebSocket route handler, Playwright assumes that WebSocket will be mocked, and opens the WebSocket
+ * inside the page automatically.
+ *
+ * Here is another example that handles JSON messages:
+ *
+ * ```js
+ * await page.routeWebSocket('wss://example.com/ws', ws => {
+ *   ws.onMessage(message => {
+ *     const json = JSON.parse(message);
+ *     if (json.request === 'question')
+ *       ws.send(JSON.stringify({ response: 'answer' }));
+ *   });
+ * });
+ * ```
+ *
+ * **Intercepting**
+ *
+ * Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block
+ * them. Calling
+ * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server)
+ * returns a server-side `WebSocketRoute` instance that you can send messages to, or handle incoming messages.
+ *
+ * Below is an example that modifies some messages sent by the page to the server. Messages sent from the server to
+ * the page are left intact, relying on the default forwarding.
+ *
+ * ```js
+ * await page.routeWebSocket('/ws', ws => {
+ *   const server = ws.connectToServer();
+ *   ws.onMessage(message => {
+ *     if (message === 'request')
+ *       server.send('request2');
+ *     else
+ *       server.send(message);
+ *   });
+ * });
+ * ```
+ *
+ * After connecting to the server, all **messages are forwarded** between the page and the server by default.
+ *
+ * However, if you call
+ * [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+ * on the original route, messages from the page to the server **will not be forwarded** anymore, but should instead
+ * be handled by the
+ * [`handler`](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message-option-handler).
+ *
+ * Similarly, calling
+ * [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+ * on the server-side WebSocket will **stop forwarding messages** from the server to the page, and
+ * [`handler`](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message-option-handler) should
+ * take care of them.
+ *
+ * The following example blocks some messages in both directions. Since it calls
+ * [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+ * in both directions, there is no automatic forwarding at all.
+ *
+ * ```js
+ * await page.routeWebSocket('/ws', ws => {
+ *   const server = ws.connectToServer();
+ *   ws.onMessage(message => {
+ *     if (message !== 'blocked-from-the-page')
+ *       server.send(message);
+ *   });
+ *   server.onMessage(message => {
+ *     if (message !== 'blocked-from-the-server')
+ *       ws.send(message);
+ *   });
+ * });
+ * ```
+ *
+ */
+export interface WebSocketRoute {
+  /**
+   * This method allows to handle messages that are sent by the WebSocket, either from the page or from the server.
+   *
+   * When called on the original WebSocket route, this method handles messages sent from the page. You can handle this
+   * messages by responding to them with
+   * [webSocketRoute.send(message)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-send),
+   * forwarding them to the server-side connection returned by
+   * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server)
+   * or do something else.
+   *
+   * Once this method is called, messages are not automatically forwarded to the server or to the page - you should do
+   * that manually by calling
+   * [webSocketRoute.send(message)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-send). See
+   * examples at the top for more details.
+   *
+   * Calling this method again will override the handler with a new one.
+   * @param handler Function that will handle messages.
+   */
+  onMessage(handler: (message: string | Buffer) => any): void;
+  /**
+   * Allows to handle [`WebSocket.close`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close).
+   *
+   * By default, closing one side of the connection, either in the page or on the server, will close the other side.
+   * However, when
+   * [webSocketRoute.onClose(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-close)
+   * handler is set up, the default forwarding of closure is disabled, and handler should take care of it.
+   * @param handler Function that will handle WebSocket closure. Received an optional
+   * [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code) and an optional
+   * [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+   */
+  onClose(handler: (code: number | undefined, reason: string | undefined) => any): void;
+  /**
+   * Closes one side of the WebSocket connection.
+   * @param options
+   */
+  close(options?: {
+    /**
+     * Optional [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code).
+     */
+    code?: number;
+
+    /**
+     * Optional [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+     */
+    reason?: string;
+  }): Promise<void>;
+
+  /**
+   * By default, routed WebSocket does not connect to the server, so you can mock entire WebSocket communication. This
+   * method connects to the actual WebSocket server, and returns the server-side
+   * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute) instance, giving the ability to send and
+   * receive messages from the server.
+   *
+   * Once connected to the server:
+   * - Messages received from the server will be **automatically forwarded** to the WebSocket in the page, unless
+   *   [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+   *   is called on the server-side `WebSocketRoute`.
+   * - Messages sent by the [`WebSocket.send()`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send) call
+   *   in the page will be **automatically forwarded** to the server, unless
+   *   [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+   *   is called on the original `WebSocketRoute`.
+   *
+   * See examples at the top for more details.
+   */
+  connectToServer(): WebSocketRoute;
+
+  /**
+   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
+   * on the result of
+   * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server),
+   * sends the message to the server. See examples at the top for more details.
+   * @param message Message to send.
+   */
+  send(message: string|Buffer): void;
+
+  /**
+   * URL of the WebSocket created in the page.
+   */
+  url(): string;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+type DeviceDescriptor = {
+  viewport: ViewportSize;
+  userAgent: string;
+  deviceScaleFactor: number;
+  isMobile: boolean;
+  hasTouch: boolean;
+  defaultBrowserType: 'chromium' | 'firefox' | 'webkit';
+};
+
+export namespace errors {
+
+/**
+ * - extends: [Error]
+ *
+ * TimeoutError is emitted whenever certain operations are terminated due to timeout, e.g.
+ * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) or
+ * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch).
+ *
+ * ```js
+ * const playwright = require('playwright');
+ *
+ * (async () => {
+ *   const browser = await playwright.chromium.launch();
+ *   const context = await browser.newContext();
+ *   const page = await context.newPage();
+ *   try {
+ *     await page.locator('text=Foo').click({
+ *       timeout: 100,
+ *     });
+ *   } catch (error) {
+ *     if (error instanceof playwright.errors.TimeoutError)
+ *       console.log('Timeout!');
+ *   }
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ */
+class TimeoutError extends Error {
+}
+
+}
+
+/**
+ * The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is
+ * used by assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or
+ * [switches](https://en.wikipedia.org/wiki/Switch_access).
+ *
+ * Accessibility is a very platform-specific thing. On different platforms, there are different screen readers that
+ * might have wildly different output.
+ *
+ * Rendering engines of Chromium, Firefox and WebKit have a concept of "accessibility tree", which is then translated
+ * into different platform-specific APIs. Accessibility namespace gives access to this Accessibility Tree.
+ *
+ * Most of the accessibility tree gets filtered out when converting from internal browser AX Tree to Platform-specific
+ * AX-Tree or by assistive technologies themselves. By default, Playwright tries to approximate this filtering,
+ * exposing only the "interesting" nodes of the tree.
+ */
+export interface Accessibility {
+  /**
+   * Captures the current state of the accessibility tree. The returned object represents the root accessible node of
+   * the page.
+   *
+   * **NOTE** The Chromium accessibility tree contains nodes that go unused on most platforms and by most screen
+   * readers. Playwright will discard them as well for an easier to process tree, unless
+   * [`interestingOnly`](https://playwright.dev/docs/api/class-accessibility#accessibility-snapshot-option-interesting-only)
+   * is set to `false`.
+   *
+   * **Usage**
+   *
+   * An example of dumping the entire accessibility tree:
+   *
+   * ```js
+   * const snapshot = await page.accessibility.snapshot();
+   * console.log(snapshot);
+   * ```
+   *
+   * An example of logging the focused node's name:
+   *
+   * ```js
+   * const snapshot = await page.accessibility.snapshot();
+   * const node = findFocusedNode(snapshot);
+   * console.log(node && node.name);
+   *
+   * function findFocusedNode(node) {
+   *   if (node.focused)
+   *     return node;
+   *   for (const child of node.children || []) {
+   *     const foundNode = findFocusedNode(child);
+   *     if (foundNode)
+   *       return foundNode;
+   *   }
+   *   return null;
+   * }
+   * ```
+   *
+   * @deprecated This method is deprecated. Please use other libraries such as [Axe](https://www.deque.com/axe/) if you need to test
+   * page accessibility. See our Node.js [guide](https://playwright.dev/docs/accessibility-testing) for integration with
+   * Axe.
+   * @param options
+   */
+  snapshot(options?: AccessibilitySnapshotOptions): Promise<null|AccessibilityNode>;
+
+}
+
+type AccessibilityNode = {
+  role: string;
+  name: string;
+  value?: string|number;
+  description?: string;
+  keyshortcuts?: string;
+  roledescription?: string;
+  valuetext?: string;
+  disabled?: boolean;
+  expanded?: boolean;
+  focused?: boolean;
+  modal?: boolean;
+  multiline?: boolean;
+  multiselectable?: boolean;
+  readonly?: boolean;
+  required?: boolean;
+  selected?: boolean;
+  checked?: boolean|"mixed";
+  pressed?: boolean|"mixed";
+  level?: number;
+  valuemin?: number;
+  valuemax?: number;
+  autocomplete?: string;
+  haspopup?: string;
+  invalid?: string;
+  orientation?: string;
+  children?: AccessibilityNode[];
+}
+
+export const devices: Devices;
+
+//@ts-ignore this will be any if electron is not installed
+type ElectronType = typeof import('electron');
+
+/**
+ * Electron application representation. You can use
+ * [electron.launch([options])](https://playwright.dev/docs/api/class-electron#electron-launch) to obtain the
+ * application instance. This instance you can control main electron process as well as work with Electron windows:
+ *
+ * ```js
+ * const { _electron: electron } = require('playwright');
+ *
+ * (async () => {
+ *   // Launch Electron app.
+ *   const electronApp = await electron.launch({ args: ['main.js'] });
+ *
+ *   // Evaluation expression in the Electron context.
+ *   const appPath = await electronApp.evaluate(async ({ app }) => {
+ *     // This runs in the main Electron process, parameter here is always
+ *     // the result of the require('electron') in the main app script.
+ *     return app.getAppPath();
+ *   });
+ *   console.log(appPath);
+ *
+ *   // Get the first window that the app opens, wait if necessary.
+ *   const window = await electronApp.firstWindow();
+ *   // Print the title.
+ *   console.log(await window.title());
+ *   // Capture a screenshot.
+ *   await window.screenshot({ path: 'intro.png' });
+ *   // Direct Electron console to Node terminal.
+ *   window.on('console', console.log);
+ *   // Click button.
+ *   await window.click('text=Click me');
+ *   // Exit app.
+ *   await electronApp.close();
+ * })();
+ * ```
+ *
+ */
+export interface ElectronApplication {
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a [Promise], then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * would wait for the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a non-[Serializable] value, then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns `undefined`. Playwright also supports transferring some additional values that are not serializable by
+   * `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
+   */
+  evaluate<R, Arg>(pageFunction: PageFunctionOn<ElectronType, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a [Promise], then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * would wait for the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a non-[Serializable] value, then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns `undefined`. Playwright also supports transferring some additional values that are not serializable by
+   * `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
+   */
+  evaluate<R>(pageFunction: PageFunctionOn<ElectronType, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * and
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * is that
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns a [Promise], then
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg>(pageFunction: PageFunctionOn<ElectronType, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * and
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * is that
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns a [Promise], then
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R>(pageFunction: PageFunctionOn<ElectronType, void, R>, arg?: any): Promise<SmartHandle<R>>;
+  /**
+   * This event is issued when the application process has been terminated.
+   */
+  on(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  on(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
+   */
+  on(event: 'window', listener: (page: Page) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: () => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'window', listener: (page: Page) => any): this;
+
+  /**
+   * This event is issued when the application process has been terminated.
+   */
+  addListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  addListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
+   */
+  addListener(event: 'window', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'window', listener: (page: Page) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'window', listener: (page: Page) => any): this;
+
+  /**
+   * This event is issued when the application process has been terminated.
+   */
+  prependListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  prependListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+
+  /**
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
+   */
+  prependListener(event: 'window', listener: (page: Page) => any): this;
+
+  /**
+   * Returns the BrowserWindow object that corresponds to the given Playwright page.
+   * @param page Page to retrieve the window for.
+   */
+  browserWindow(page: Page): Promise<JSHandle>;
+
+  /**
+   * Closes Electron application.
+   */
+  close(): Promise<void>;
+
+  /**
+   * This method returns browser context that can be used for setting up context-wide routing, etc.
+   */
+  context(): BrowserContext;
+
+  /**
+   * Convenience method that waits for the first application window to be opened.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const electronApp = await electron.launch({
+   *   args: ['main.js']
+   * });
+   * const window = await electronApp.firstWindow();
+   * // ...
+   * ```
+   *
+   * @param options
+   */
+  firstWindow(options?: {
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The
+     * default value can be changed by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout).
+     */
+    timeout?: number;
+  }): Promise<Page>;
+
+  /**
+   * Returns the main process for this Electron Application.
+   */
+  process(): ChildProcess;
+
+  /**
+   * This event is issued when the application process has been terminated.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: () => boolean | Promise<boolean>, timeout?: number } | (() => boolean | Promise<boolean>)): Promise<void>;
+
+  /**
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  waitForEvent(event: 'console', optionsOrPredicate?: { predicate?: (consoleMessage: ConsoleMessage) => boolean | Promise<boolean>, timeout?: number } | ((consoleMessage: ConsoleMessage) => boolean | Promise<boolean>)): Promise<ConsoleMessage>;
+
+  /**
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
+   */
+  waitForEvent(event: 'window', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
+
+
+  /**
+   * Convenience method that returns all the opened windows.
+   */
+  windows(): Array<Page>;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+export type AndroidElementInfo = {
+  clazz: string;
+  desc: string;
+  res: string;
+  pkg: string;
+  text: string;
+  bounds: { x: number, y: number, width: number, height: number };
+  checkable: boolean;
+  checked: boolean;
+  clickable: boolean;
+  enabled: boolean;
+  focusable: boolean;
+  focused: boolean;
+  longClickable: boolean;
+  scrollable: boolean;
+  selected: boolean;
+};
+
+export type AndroidSelector = {
+  checkable?: boolean,
+  checked?: boolean,
+  clazz?: string | RegExp,
+  clickable?: boolean,
+  depth?: number,
+  desc?: string | RegExp,
+  enabled?: boolean,
+  focusable?: boolean,
+  focused?: boolean,
+  hasChild?: { selector: AndroidSelector },
+  hasDescendant?: { selector: AndroidSelector, maxDepth?: number },
+  longClickable?: boolean,
+  pkg?: string | RegExp,
+  res?: string | RegExp,
+  scrollable?: boolean,
+  selected?: boolean,
+  text?: string | RegExp,
+};
+
+export type AndroidKey =
+  'Unknown' |
+  'SoftLeft' | 'SoftRight' |
+  'Home' |
+  'Back' |
+  'Call' | 'EndCall' |
+  '0' |  '1' |  '2' |  '3' |  '4' |  '5' |  '6' |  '7' |  '8' |  '9' |
+  'Star' | 'Pound' | '*' | '#' |
+  'DialUp' | 'DialDown' | 'DialLeft' | 'DialRight' | 'DialCenter' |
+  'VolumeUp' | 'VolumeDown' |
+  'ChannelUp' | 'ChannelDown' |
+  'Power' |
+  'Camera' |
+  'Clear' |
+  'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' |
+  'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' |
+  'Comma' | ',' |
+  'Period' | '.' |
+  'AltLeft' | 'AltRight' |
+  'ShiftLeft' | 'ShiftRight' |
+  'Tab' | '\t' |
+  'Space' | ' ' |
+  'Sym' |
+  'Explorer' |
+  'Envelop' |
+  'Enter' | '\n' |
+  'Del' |
+  'Grave' |
+  'Minus' | '-' |
+  'Equals' | '=' |
+  'LeftBracket' | '(' |
+  'RightBracket' | ')' |
+  'Backslash' | '\\' |
+  'Semicolon' | ';' |
+  'Apostrophe' | '`' |
+  'Slash' | '/' |
+  'At' | '@' |
+  'Num' |
+  'HeadsetHook' |
+  'Focus' |
+  'Plus' | '+' |
+  'Menu' |
+  'Notification' |
+  'Search' |
+  'RecentApps' |
+  'AppSwitch' |
+  'Assist' |
+  'Cut' |
+  'Copy' |
+  'Paste';
+
+export const _electron: Electron;
+export const _android: Android;
+export const _bidiChromium: BrowserType;
+export const _bidiFirefox: BrowserType;
+
+// This is required to not export everything by default. See https://github.com/Microsoft/TypeScript/issues/19545#issuecomment-340490459
+export {};
+
+
+/**
+ * Playwright has **experimental** support for Android automation. This includes Chrome for Android and Android
+ * WebView.
+ *
+ * *Requirements*
+ * - Android device or AVD Emulator.
+ * - [ADB daemon](https://developer.android.com/studio/command-line/adb) running and authenticated with your device.
+ *   Typically running `adb devices` is all you need to do.
+ * - [`Chrome 87`](https://play.google.com/store/apps/details?id=com.android.chrome) or newer installed on the
+ *   device
+ * - "Enable command line on non-rooted devices" enabled in `chrome://flags`.
+ *
+ * *Known limitations*
+ * - Raw USB operation is not yet supported, so you need ADB.
+ * - Device needs to be awake to produce screenshots. Enabling "Stay awake" developer mode will help.
+ * - We didn't run all the tests against the device, so not everything works.
+ *
+ * *How to run*
+ *
+ * An example of the Android automation script would be:
+ *
+ * ```js
+ * const { _android: android } = require('playwright');
+ *
+ * (async () => {
+ *   // Connect to the device.
+ *   const [device] = await android.devices();
+ *   console.log(`Model: ${device.model()}`);
+ *   console.log(`Serial: ${device.serial()}`);
+ *   // Take screenshot of the whole device.
+ *   await device.screenshot({ path: 'device.png' });
+ *
+ *   {
+ *     // --------------------- WebView -----------------------
+ *
+ *     // Launch an application with WebView.
+ *     await device.shell('am force-stop org.chromium.webview_shell');
+ *     await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+ *     // Get the WebView.
+ *     const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+ *
+ *     // Fill the input box.
+ *     await device.fill({
+ *       res: 'org.chromium.webview_shell:id/url_field',
+ *     }, 'github.com/microsoft/playwright');
+ *     await device.press({
+ *       res: 'org.chromium.webview_shell:id/url_field',
+ *     }, 'Enter');
+ *
+ *     // Work with WebView's page as usual.
+ *     const page = await webview.page();
+ *     await page.waitForNavigation({ url: /.*microsoft\/playwright.*\/ });
+ *     console.log(await page.title());
+ *   }
+ *
+ *   {
+ *     // --------------------- Browser -----------------------
+ *
+ *     // Launch Chrome browser.
+ *     await device.shell('am force-stop com.android.chrome');
+ *     const context = await device.launchBrowser();
+ *
+ *     // Use BrowserContext as usual.
+ *     const page = await context.newPage();
+ *     await page.goto('https://webkit.org/');
+ *     console.log(await page.evaluate(() => window.location.href));
+ *     await page.screenshot({ path: 'page.png' });
+ *
+ *     await context.close();
+ *   }
+ *
+ *   // Close the device.
+ *   await device.close();
+ * })();
+ * ```
+ *
+ */
+export interface Android {
+  /**
+   * This methods attaches Playwright to an existing Android device. Use
+   * [android.launchServer([options])](https://playwright.dev/docs/api/class-android#android-launch-server) to launch a
+   * new Android server instance.
+   * @param wsEndpoint A browser websocket endpoint to connect to.
+   * @param options
+   */
+  connect(wsEndpoint: string, options?: {
+    /**
+     * Additional HTTP headers to be sent with web socket connect request. Optional.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+     * on. Defaults to `0`.
+     */
+    slowMo?: number;
+
+    /**
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to `30000` (30 seconds). Pass
+     * `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<AndroidDevice>;
+
+  /**
+   * Returns the list of detected Android devices.
+   * @param options
+   */
+  devices(options?: {
+    /**
+     * Optional host to establish ADB server connection. Default to `127.0.0.1`.
+     */
+    host?: string;
+
+    /**
+     * Prevents automatic playwright driver installation on attach. Assumes that the drivers have been installed already.
+     */
+    omitDriverInstall?: boolean;
+
+    /**
+     * Optional port to establish ADB server connection. Default to `5037`.
+     */
+    port?: number;
+  }): Promise<Array<AndroidDevice>>;
+
+  /**
+   * Launches Playwright Android server that clients can connect to. See the following example:
+   *
+   * **Usage**
+   *
+   * Server Side:
+   *
+   * ```js
+   * const { _android } = require('playwright');
+   *
+   * (async () => {
+   *   const browserServer = await _android.launchServer({
+   *     // If you have multiple devices connected and want to use a specific one.
+   *     // deviceSerialNumber: '<deviceSerialNumber>',
+   *   });
+   *   const wsEndpoint = browserServer.wsEndpoint();
+   *   console.log(wsEndpoint);
+   * })();
+   * ```
+   *
+   * Client Side:
+   *
+   * ```js
+   * const { _android } = require('playwright');
+   *
+   * (async () => {
+   *   const device = await _android.connect('<wsEndpoint>');
+   *
+   *   console.log(device.model());
+   *   console.log(device.serial());
+   *   await device.shell('am force-stop com.android.chrome');
+   *   const context = await device.launchBrowser();
+   *
+   *   const page = await context.newPage();
+   *   await page.goto('https://webkit.org/');
+   *   console.log(await page.evaluate(() => window.location.href));
+   *   await page.screenshot({ path: 'page-chrome-1.png' });
+   *
+   *   await context.close();
+   * })();
+   * ```
+   *
+   * @param options
+   */
+  launchServer(options?: {
+    /**
+     * Optional host to establish ADB server connection. Default to `127.0.0.1`.
+     */
+    adbHost?: string;
+
+    /**
+     * Optional port to establish ADB server connection. Default to `5037`.
+     */
+    adbPort?: number;
+
+    /**
+     * Optional device serial number to launch the browser on. If not specified, it will throw if multiple devices are
+     * connected.
+     */
+    deviceSerialNumber?: string;
+
+    /**
+     * Host to use for the web socket. It is optional and if it is omitted, the server will accept connections on the
+     * unspecified IPv6 address (::) when IPv6 is available, or the unspecified IPv4 address (0.0.0.0) otherwise. Consider
+     * hardening it with picking a specific interface.
+     */
+    host?: string;
+
+    /**
+     * Prevents automatic playwright driver installation on attach. Assumes that the drivers have been installed already.
+     */
+    omitDriverInstall?: boolean;
+
+    /**
+     * Port to use for the web socket. Defaults to 0 that picks any available port.
+     */
+    port?: number;
+
+    /**
+     * Path at which to serve the Android Server. For security, this defaults to an unguessable string.
+     *
+     * **NOTE** Any process or web page (including those running in Playwright) with knowledge of the `wsPath` can take
+     * control of the OS user. For this reason, you should use an unguessable token when using this option.
+     *
+     */
+    wsPath?: string;
+  }): Promise<BrowserServer>;
+
+  /**
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-android#android-set-default-timeout-option-timeout) option.
+   * @param timeout Maximum time in milliseconds
+   */
+  setDefaultTimeout(timeout: number): void;
+}
+
+/**
+ * [AndroidDevice](https://playwright.dev/docs/api/class-androiddevice) represents a connected device, either real
+ * hardware or emulated. Devices can be obtained using
+ * [android.devices([options])](https://playwright.dev/docs/api/class-android#android-devices).
+ */
+export interface AndroidDevice {
+  /**
+   * Emitted when the device connection gets closed.
+   */
+  on(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+
+  /**
+   * Emitted when a new WebView instance is detected.
+   */
+  on(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+
+  /**
+   * Emitted when the device connection gets closed.
+   */
+  addListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+
+  /**
+   * Emitted when a new WebView instance is detected.
+   */
+  addListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+
+  /**
+   * Emitted when the device connection gets closed.
+   */
+  prependListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+
+  /**
+   * Emitted when a new WebView instance is detected.
+   */
+  prependListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+
+  /**
+   * Disconnects from the device.
+   */
+  close(): Promise<void>;
+
+  /**
+   * Drags the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-drag-option-selector) towards
+   * [`dest`](https://playwright.dev/docs/api/class-androiddevice#android-device-drag-option-dest) point.
+   * @param selector Selector to drag.
+   * @param dest Point to drag to.
+   * @param options
+   */
+  drag(selector: AndroidSelector, dest: {
+    x: number;
+
+    y: number;
+  }, options?: {
+    /**
+     * Optional speed of the drag in pixels per second.
+     */
+    speed?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Fills the specific
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-fill-option-selector) input box
+   * with [`text`](https://playwright.dev/docs/api/class-androiddevice#android-device-fill-option-text).
+   * @param selector Selector to fill.
+   * @param text Text to be filled in the input box.
+   * @param options
+   */
+  fill(selector: AndroidSelector, text: string, options?: {
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Flings the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-fling-option-selector) in  the
+   * specified [`direction`](https://playwright.dev/docs/api/class-androiddevice#android-device-fling-option-direction).
+   * @param selector Selector to fling.
+   * @param direction Fling direction.
+   * @param options
+   */
+  fling(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", options?: {
+    /**
+     * Optional speed of the fling in pixels per second.
+     */
+    speed?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Returns information about a widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-info-option-selector).
+   * @param selector Selector to return information about.
+   */
+  info(selector: AndroidSelector): Promise<AndroidElementInfo>;
+
+  /**
+   * Installs an apk on the device.
+   * @param file Either a path to the apk file, or apk file content.
+   * @param options
+   */
+  installApk(file: string|Buffer, options?: {
+    /**
+     * Optional arguments to pass to the `shell:cmd package install` call. Defaults to `-r -t -S`.
+     */
+    args?: Array<string>;
+  }): Promise<void>;
+
+  /**
+   * Launches Chrome browser on the device, and returns its persistent context.
+   * @param options
+   */
+  launchBrowser(options?: {
+    /**
+     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+     */
+    acceptDownloads?: boolean;
+
+    /**
+     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+     *
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
+     */
+    args?: Array<string>;
+
+    /**
+     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+     * or
+     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+     * it takes the base URL in consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Unset by default. Examples:
+     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
+     */
+    baseURL?: string;
+
+    /**
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     */
+    bypassCSP?: boolean;
+
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
+
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    contrast?: null|"no-preference"|"more";
+
+    /**
+     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+     */
+    deviceScaleFactor?: number;
+
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     */
+    forcedColors?: null|"active"|"none";
+
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
+
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
+
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
+
+    /**
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about
+     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     */
+    hasTouch?: boolean;
+
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     */
+    isMobile?: boolean;
+
+    /**
+     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     */
+    javaScriptEnabled?: boolean;
+
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
+
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
+
+    /**
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     */
+    offline?: boolean;
+
+    /**
+     * A list of permissions to grant to all pages in this context. See
+     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+     * for more details. Defaults to none.
+     */
+    permissions?: Array<string>;
+
+    /**
+     * Optional package name to launch instead of default Chrome for Android.
+     */
+    pkg?: string;
+
+    /**
+     * Network proxy settings.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
+
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
+
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
+
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
+
+    /**
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
+     */
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
+
+      /**
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
+       */
+      content?: "omit"|"embed"|"attach";
+
+      /**
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
+       */
+      path: string;
+
+      /**
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       */
+      mode?: "full"|"minimal";
+
+      /**
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       */
+      urlFilter?: string|RegExp;
+    };
+
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
+      /**
+       * Path to the directory to put videos into.
+       */
+      dir: string;
+
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
+
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
+
+    /**
+     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+     * [`viewport`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-viewport) is
+     * set.
+     */
+    screen?: {
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+
+    /**
+     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+     *   registered.
+     * - `'block'`: Playwright will block all registration of Service Workers.
+     */
+    serviceWorkers?: "allow"|"block";
+
+    /**
+     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+     * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
+     */
+    strictSelectors?: boolean;
+
+    /**
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
+     */
+    timezoneId?: string;
+
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)
+     * instead.
+     */
+    videoSize?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)
+     * instead.
+     */
+    videosPath?: string;
+
+    /**
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     *
+     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+     * by the operating system. It makes the execution of the tests non-deterministic.
+     *
+     */
+    viewport?: null|{
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+  }): Promise<BrowserContext>;
+
+  /**
+   * Performs a long tap on the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-long-tap-option-selector).
+   * @param selector Selector to tap on.
+   * @param options
+   */
+  longTap(selector: AndroidSelector, options?: {
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Device model.
+   */
+  model(): string;
+
+  /**
+   * Launches a process in the shell on the device and returns a socket to communicate with the launched process.
+   * @param command Shell command to execute.
+   */
+  open(command: string): Promise<AndroidSocket>;
+
+  /**
+   * Pinches the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-pinch-close-option-selector) in the
+   * closing direction.
+   * @param selector Selector to pinch close.
+   * @param percent The size of the pinch as a percentage of the widget's size.
+   * @param options
+   */
+  pinchClose(selector: AndroidSelector, percent: number, options?: {
+    /**
+     * Optional speed of the pinch in pixels per second.
+     */
+    speed?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Pinches the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-pinch-open-option-selector) in the
+   * open direction.
+   * @param selector Selector to pinch open.
+   * @param percent The size of the pinch as a percentage of the widget's size.
+   * @param options
+   */
+  pinchOpen(selector: AndroidSelector, percent: number, options?: {
+    /**
+     * Optional speed of the pinch in pixels per second.
+     */
+    speed?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Presses the specific [`key`](https://playwright.dev/docs/api/class-androiddevice#android-device-press-option-key)
+   * in the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-press-option-selector).
+   * @param selector Selector to press the key in.
+   * @param key The key to press.
+   * @param options
+   */
+  press(selector: AndroidSelector, key: AndroidKey, options?: {
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Copies a file to the device.
+   * @param file Either a path to the file, or file content.
+   * @param path Path to the file on the device.
+   * @param options
+   */
+  push(file: string|Buffer, path: string, options?: {
+    /**
+     * Optional file mode, defaults to `644` (`rw-r--r--`).
+     */
+    mode?: number;
+  }): Promise<void>;
+
+  /**
+   * Returns the buffer with the captured screenshot of the device.
+   * @param options
+   */
+  screenshot(options?: {
+    /**
+     * The file path to save the image to. If
+     * [`path`](https://playwright.dev/docs/api/class-androiddevice#android-device-screenshot-option-path) is a relative
+     * path, then it is resolved relative to the current working directory. If no path is provided, the image won't be
+     * saved to the disk.
+     */
+    path?: string;
+  }): Promise<Buffer>;
+
+  /**
+   * Scrolls the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-scroll-option-selector) in  the
+   * specified
+   * [`direction`](https://playwright.dev/docs/api/class-androiddevice#android-device-scroll-option-direction).
+   * @param selector Selector to scroll.
+   * @param direction Scroll direction.
+   * @param percent Distance to scroll as a percentage of the widget's size.
+   * @param options
+   */
+  scroll(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", percent: number, options?: {
+    /**
+     * Optional speed of the scroll in pixels per second.
+     */
+    speed?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Device serial number.
+   */
+  serial(): string;
+
+  /**
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout-option-timeout)
+   * option.
+   * @param timeout Maximum time in milliseconds
+   */
+  setDefaultTimeout(timeout: number): void;
+
+  /**
+   * Executes a shell command on the device and returns its output.
+   * @param command Shell command to execute.
+   */
+  shell(command: string): Promise<Buffer>;
+
+  /**
+   * Swipes the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-swipe-option-selector) in  the
+   * specified [`direction`](https://playwright.dev/docs/api/class-androiddevice#android-device-swipe-option-direction).
+   * @param selector Selector to swipe.
+   * @param direction Swipe direction.
+   * @param percent Distance to swipe as a percentage of the widget's size.
+   * @param options
+   */
+  swipe(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", percent: number, options?: {
+    /**
+     * Optional speed of the swipe in pixels per second.
+     */
+    speed?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Taps on the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-tap-option-selector).
+   * @param selector Selector to tap on.
+   * @param options
+   */
+  tap(selector: AndroidSelector, options?: {
+    /**
+     * Optional duration of the tap in milliseconds.
+     */
+    duration?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Waits for the specific
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-wait-option-selector) to either
+   * appear or disappear, depending on the
+   * [`state`](https://playwright.dev/docs/api/class-androiddevice#android-device-wait-option-state).
+   * @param selector Selector to wait for.
+   * @param options
+   */
+  wait(selector: AndroidSelector, options?: {
+    /**
+     * Optional state. Can be either:
+     * - default - wait for element to be present.
+     * - `'gone'` - wait for element to not be present.
+     */
+    state?: "gone";
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Emitted when the device connection gets closed.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: (androidDevice: AndroidDevice) => boolean | Promise<boolean>, timeout?: number } | ((androidDevice: AndroidDevice) => boolean | Promise<boolean>)): Promise<AndroidDevice>;
+
+  /**
+   * Emitted when a new WebView instance is detected.
+   */
+  waitForEvent(event: 'webview', optionsOrPredicate?: { predicate?: (androidWebView: AndroidWebView) => boolean | Promise<boolean>, timeout?: number } | ((androidWebView: AndroidWebView) => boolean | Promise<boolean>)): Promise<AndroidWebView>;
+
+
+  /**
+   * This method waits until [AndroidWebView](https://playwright.dev/docs/api/class-androidwebview) matching the
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view-option-selector) is opened
+   * and returns it. If there is already an open [AndroidWebView](https://playwright.dev/docs/api/class-androidwebview)
+   * matching the
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view-option-selector), returns
+   * immediately.
+   * @param selector
+   * @param options
+   */
+  webView(selector: {
+    /**
+     * Optional Package identifier.
+     */
+    pkg?: string;
+
+    /**
+     * Optional webview socket name.
+     */
+    socketName?: string;
+  }, options?: {
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
+  }): Promise<AndroidWebView>;
+
+  /**
+   * Currently open WebViews.
+   */
+  webViews(): Array<AndroidWebView>;
+
+  input: AndroidInput;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+export interface AndroidInput {
+  /**
+   * Performs a drag between [`from`](https://playwright.dev/docs/api/class-androidinput#android-input-drag-option-from)
+   * and [`to`](https://playwright.dev/docs/api/class-androidinput#android-input-drag-option-to) points.
+   * @param from The start point of the drag.
+   * @param to The end point of the drag.
+   * @param steps The number of steps in the drag. Each step takes 5 milliseconds to complete.
+   */
+  drag(from: {
+    x: number;
+
+    y: number;
+  }, to: {
+    x: number;
+
+    y: number;
+  }, steps: number): Promise<void>;
+
+  /**
+   * Presses the [`key`](https://playwright.dev/docs/api/class-androidinput#android-input-press-option-key).
+   * @param key Key to press.
+   */
+  press(key: AndroidKey): Promise<void>;
+
+  /**
+   * Swipes following the path defined by
+   * [`segments`](https://playwright.dev/docs/api/class-androidinput#android-input-swipe-option-segments).
+   * @param from The point to start swiping from.
+   * @param segments Points following the [`from`](https://playwright.dev/docs/api/class-androidinput#android-input-swipe-option-from)
+   * point in the swipe gesture.
+   * @param steps The number of steps for each segment. Each step takes 5 milliseconds to complete, so 100 steps means half a second
+   * per each segment.
+   */
+  swipe(from: {
+    x: number;
+
+    y: number;
+  }, segments: ReadonlyArray<{
+    x: number;
+
+    y: number;
+  }>, steps: number): Promise<void>;
+
+  /**
+   * Taps at the specified [`point`](https://playwright.dev/docs/api/class-androidinput#android-input-tap-option-point).
+   * @param point The point to tap at.
+   */
+  tap(point: {
+    x: number;
+
+    y: number;
+  }): Promise<void>;
+
+  /**
+   * Types [`text`](https://playwright.dev/docs/api/class-androidinput#android-input-type-option-text) into currently
+   * focused widget.
+   * @param text Text to type.
+   */
+  type(text: string): Promise<void>;
+}
+
+/**
+ * [AndroidSocket](https://playwright.dev/docs/api/class-androidsocket) is a way to communicate with a process
+ * launched on the [AndroidDevice](https://playwright.dev/docs/api/class-androiddevice). Use
+ * [androidDevice.open(command)](https://playwright.dev/docs/api/class-androiddevice#android-device-open) to open a
+ * socket.
+ */
+export interface AndroidSocket {
+  /**
+   * Emitted when the socket is closed.
+   */
+  on(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when data is available to read from the socket.
+   */
+  on(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: () => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Emitted when the socket is closed.
+   */
+  addListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when data is available to read from the socket.
+   */
+  addListener(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Emitted when the socket is closed.
+   */
+  prependListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when data is available to read from the socket.
+   */
+  prependListener(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Closes the socket.
+   */
+  close(): Promise<void>;
+
+  /**
+   * Writes some [`data`](https://playwright.dev/docs/api/class-androidsocket#android-socket-write-option-data) to the
+   * socket.
+   * @param data Data to write.
+   */
+  write(data: Buffer): Promise<void>;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * [AndroidWebView](https://playwright.dev/docs/api/class-androidwebview) represents a WebView open on the
+ * [AndroidDevice](https://playwright.dev/docs/api/class-androiddevice). WebView is usually obtained using
+ * [androidDevice.webView(selector[, options])](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view).
+ */
+export interface AndroidWebView {
+  /**
+   * Emitted when the WebView is closed.
+   */
+  on(event: 'close', listener: () => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when the WebView is closed.
+   */
+  addListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when the WebView is closed.
+   */
+  prependListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Connects to the WebView and returns a regular Playwright [Page](https://playwright.dev/docs/api/class-page) to
+   * interact with.
+   */
+  page(): Promise<Page>;
+
+  /**
+   * WebView process PID.
+   */
+  pid(): number;
+
+  /**
+   * WebView package identifier.
+   */
+  pkg(): string;
+}
+
+/**
+ * Exposes API that can be used for the Web API testing. This class is used for creating
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) instance which in turn can be used for
+ * sending web requests. An instance of this class can be obtained via
+ * [playwright.request](https://playwright.dev/docs/api/class-playwright#playwright-request). For more information see
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext).
+ */
+export interface APIRequest {
+  /**
+   * Creates new instances of [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext).
+   * @param options
+   */
+  newContext(options?: {
+    /**
+     * Methods like
+     * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
+     * take the base URL into consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Examples:
+     * - baseURL: `http://localhost:3000` and sending request to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and sending request to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
+     */
+    baseURL?: string;
+
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * **Details**
+     *
+     * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+     * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+     * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+     * with an exact match to the request origin that the certificate is valid for.
+     *
+     * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+     * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+     * does not match any of the domains you plan to visit.
+     *
+     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+     * work by replacing `localhost` with `local.playwright`.
+     *
+     */
+    clientCertificates?: Array<{
+      /**
+       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+       */
+      origin: string;
+
+      /**
+       * Path to the file with the certificate in PEM format.
+       */
+      certPath?: string;
+
+      /**
+       * Direct value of the certificate in PEM format.
+       */
+      cert?: Buffer;
+
+      /**
+       * Path to the file with the private key in PEM format.
+       */
+      keyPath?: string;
+
+      /**
+       * Direct value of the private key in PEM format.
+       */
+      key?: Buffer;
+
+      /**
+       * Path to the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfxPath?: string;
+
+      /**
+       * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfx?: Buffer;
+
+      /**
+       * Passphrase for the private key (PEM or PFX).
+       */
+      passphrase?: string;
+    }>;
+
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects. This can be overwritten for each request
+     * individually.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Network proxy settings.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
+
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
+
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
+
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
+
+    /**
+     * Populates context with given storage state. This option can be used to initialize context with logged-in
+     * information obtained via
+     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state)
+     * or
+     * [apiRequestContext.storageState([options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state).
+     * Either a path to the file with saved storage, or the value returned by one of
+     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state)
+     * or
+     * [apiRequestContext.storageState([options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state)
+     * methods.
+     */
+    storageState?: string|{
+      cookies: Array<{
+        name: string;
+
+        value: string;
+
+        domain: string;
+
+        path: string;
+
+        /**
+         * Unix time in seconds.
+         */
+        expires: number;
+
+        httpOnly: boolean;
+
+        secure: boolean;
+
+        sameSite: "Strict"|"Lax"|"None";
+      }>;
+
+      origins: Array<{
+        origin: string;
+
+        localStorage: Array<{
+          name: string;
+
+          value: string;
+        }>;
+      }>;
+    };
+
+    /**
+     * Maximum time in milliseconds to wait for the response. Defaults to `30000` (30 seconds). Pass `0` to disable
+     * timeout.
+     */
+    timeout?: number;
+
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+  }): Promise<APIRequestContext>;
+}
+
+/**
+ * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services,
+ * prepare environment or the service to your e2e test.
+ *
+ * Each Playwright browser context has associated with it
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) instance which shares cookie storage
+ * with the browser context and can be accessed via
+ * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) or
+ * [page.request](https://playwright.dev/docs/api/class-page#page-request). It is also possible to create a new
+ * APIRequestContext instance manually by calling
+ * [apiRequest.newContext([options])](https://playwright.dev/docs/api/class-apirequest#api-request-new-context).
+ *
+ * **Cookie management**
+ *
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) returned by
+ * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) and
+ * [page.request](https://playwright.dev/docs/api/class-page#page-request) shares cookie storage with the
+ * corresponding [BrowserContext](https://playwright.dev/docs/api/class-browsercontext). Each API request will have
+ * `Cookie` header populated with the values from the browser context. If the API response contains `Set-Cookie`
+ * header it will automatically update [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) cookies
+ * and requests made from the page will pick them up. This means that if you log in using this API, your e2e test will
+ * be logged in and vice versa.
+ *
+ * If you want API requests to not interfere with the browser cookies you should create a new
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) by calling
+ * [apiRequest.newContext([options])](https://playwright.dev/docs/api/class-apirequest#api-request-new-context). Such
+ * `APIRequestContext` object will have its own isolated cookie storage.
+ */
+export interface APIRequestContext {
+  /**
+   * Sends HTTP(S) [DELETE](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  delete(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * All responses returned by
+   * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
+   * and similar methods are stored in the memory, so that you can later call
+   * [apiResponse.body()](https://playwright.dev/docs/api/class-apiresponse#api-response-body).This method discards all
+   * its resources, calling any method on disposed
+   * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) will throw an exception.
+   * @param options
+   */
+  dispose(options?: {
+    /**
+     * The reason to be reported to the operations interrupted by the context disposal.
+     */
+    reason?: string;
+  }): Promise<void>;
+
+  /**
+   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and
+   * update context cookies from the response. The method will automatically follow redirects.
+   *
+   * **Usage**
+   *
+   * JSON objects can be passed directly to the request:
+   *
+   * ```js
+   * await request.fetch('https://example.com/api/createBook', {
+   *   method: 'post',
+   *   data: {
+   *     title: 'Book Title',
+   *     author: 'John Doe',
+   *   }
+   * });
+   * ```
+   *
+   * The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data`
+   * encoding, by specifiying the `multipart` parameter:
+   *
+   * ```js
+   * const form = new FormData();
+   * form.set('name', 'John');
+   * form.append('name', 'Doe');
+   * // Send two file fields with the same name.
+   * form.append('file', new File(['console.log(2024);'], 'f1.js', { type: 'text/javascript' }));
+   * form.append('file', new File(['hello'], 'f2.txt', { type: 'text/plain' }));
+   * await request.fetch('https://example.com/api/uploadForm', {
+   *   multipart: form
+   * });
+   * ```
+   *
+   * @param urlOrRequest Target URL or Request to get all parameters from.
+   * @param options
+   */
+  fetch(urlOrRequest: string|Request, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * If set changes the fetch method (e.g. [PUT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT) or
+     * [POST](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST)). If not specified, GET method is used.
+     */
+    method?: string;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * Sends HTTP(S) [GET](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * **Usage**
+   *
+   * Request parameters can be configured with `params` option, they will be serialized into the URL search parameters:
+   *
+   * ```js
+   * // Passing params as object
+   * await request.get('https://example.com/api/getText', {
+   *   params: {
+   *     'isbn': '1234',
+   *     'page': 23,
+   *   }
+   * });
+   *
+   * // Passing params as URLSearchParams
+   * const searchParams = new URLSearchParams();
+   * searchParams.set('isbn', '1234');
+   * searchParams.append('page', 23);
+   * searchParams.append('page', 24);
+   * await request.get('https://example.com/api/getText', { params: searchParams });
+   *
+   * // Passing params as string
+   * const queryString = 'isbn=1234&page=23&page=24';
+   * await request.get('https://example.com/api/getText', { params: queryString });
+   * ```
+   *
+   * @param url Target URL.
+   * @param options
+   */
+  get(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * Sends HTTP(S) [HEAD](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  head(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * Sends HTTP(S) [PATCH](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  patch(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * Sends HTTP(S) [POST](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * **Usage**
+   *
+   * JSON objects can be passed directly to the request:
+   *
+   * ```js
+   * await request.post('https://example.com/api/createBook', {
+   *   data: {
+   *     title: 'Book Title',
+   *     author: 'John Doe',
+   *   }
+   * });
+   * ```
+   *
+   * To send form data to the server use `form` option. Its value will be encoded into the request body with
+   * `application/x-www-form-urlencoded` encoding (see below how to use `multipart/form-data` form encoding to send
+   * files):
+   *
+   * ```js
+   * await request.post('https://example.com/api/findBook', {
+   *   form: {
+   *     title: 'Book Title',
+   *     author: 'John Doe',
+   *   }
+   * });
+   * ```
+   *
+   * The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data`
+   * encoding. Use [FormData] to construct request body and pass it to the request as `multipart` parameter:
+   *
+   * ```js
+   * const form = new FormData();
+   * form.set('name', 'John');
+   * form.append('name', 'Doe');
+   * // Send two file fields with the same name.
+   * form.append('file', new File(['console.log(2024);'], 'f1.js', { type: 'text/javascript' }));
+   * form.append('file', new File(['hello'], 'f2.txt', { type: 'text/plain' }));
+   * await request.post('https://example.com/api/uploadForm', {
+   *   multipart: form
+   * });
+   * ```
+   *
+   * @param url Target URL.
+   * @param options
+   */
+  post(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * Sends HTTP(S) [PUT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  put(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
+
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
+
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
+
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
+
+      /**
+       * File type
+       */
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
+
+  /**
+   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was
+   * passed to the constructor.
+   * @param options
+   */
+  storageState(options?: {
+    /**
+     * Set to `true` to include IndexedDB in the storage state snapshot.
+     */
+    indexedDB?: boolean;
+
+    /**
+     * The file path to save the storage state to. If
+     * [`path`](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state-option-path) is
+     * a relative path, then it is resolved relative to current working directory. If no path is provided, storage state
+     * is still returned, but won't be saved to the disk.
+     */
+    path?: string;
+  }): Promise<{
+    cookies: Array<{
+      name: string;
+
+      value: string;
+
+      domain: string;
+
+      path: string;
+
+      /**
+       * Unix time in seconds.
+       */
+      expires: number;
+
+      httpOnly: boolean;
+
+      secure: boolean;
+
+      sameSite: "Strict"|"Lax"|"None";
+    }>;
+
+    origins: Array<{
+      origin: string;
+
+      localStorage: Array<{
+        name: string;
+
+        value: string;
+      }>;
+    }>;
+  }>;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * [APIResponse](https://playwright.dev/docs/api/class-apiresponse) class represents responses returned by
+ * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
+ * and similar methods.
+ */
+export interface APIResponse {
+  /**
+   * Returns the buffer with response body.
+   */
+  body(): Promise<Buffer>;
+
+  /**
+   * Disposes the body of this response. If not called then the body will stay in memory until the context closes.
+   */
+  dispose(): Promise<void>;
+
+  /**
+   * An object with all the response HTTP headers associated with this response.
+   */
+  headers(): { [key: string]: string; };
+
+  /**
+   * An array with all the response HTTP headers associated with this response. Header names are not lower-cased.
+   * Headers with multiple entries, such as `Set-Cookie`, appear in the array multiple times.
+   */
+  headersArray(): Array<{
+    /**
+     * Name of the header.
+     */
+    name: string;
+
+    /**
+     * Value of the header.
+     */
+    value: string;
+  }>;
+
+  /**
+   * Returns the JSON representation of response body.
+   *
+   * This method will throw if the response body is not parsable via `JSON.parse`.
+   */
+  json(): Promise<Serializable>;
+
+  /**
+   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
+   */
+  ok(): boolean;
+
+  /**
+   * Contains the status code of the response (e.g., 200 for a success).
+   */
+  status(): number;
+
+  /**
+   * Contains the status text of the response (e.g. usually an "OK" for a success).
+   */
+  statusText(): string;
+
+  /**
+   * Returns the text representation of response body.
+   */
+  text(): Promise<string>;
+
+  /**
+   * Contains the URL of the response.
+   */
+  url(): string;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+export interface BrowserServer {
+  /**
+   * Emitted when the browser server closes.
+   */
+  on(event: 'close', listener: () => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when the browser server closes.
+   */
+  addListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when the browser server closes.
+   */
+  prependListener(event: 'close', listener: () => any): this;
+
+  /**
+   * Closes the browser gracefully and makes sure the process is terminated.
+   */
+  close(): Promise<void>;
+
+  /**
+   * Kills the browser process and waits for the process to exit.
+   */
+  kill(): Promise<void>;
+
+  /**
+   * Spawned browser application process.
+   */
+  process(): ChildProcess;
+
+  /**
+   * Browser websocket url.
+   *
+   * Browser websocket endpoint which can be used as an argument to
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect)
+   * to establish connection to the browser.
+   *
+   * Note that if the listen `host` option in `launchServer` options is not specified, localhost will be output anyway,
+   * even if the actual listening address is an unspecified address.
+   */
+  wsEndpoint(): string;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * Accurately simulating time-dependent behavior is essential for verifying the correctness of applications. Learn
+ * more about [clock emulation](https://playwright.dev/docs/clock).
+ *
+ * Note that clock is installed for the entire [BrowserContext](https://playwright.dev/docs/api/class-browsercontext),
+ * so the time in all the pages and iframes is controlled by the same clock.
+ */
+export interface Clock {
+  /**
+   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user
+   * closing the laptop lid for a while and reopening it later, after given time.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.clock.fastForward(1000);
+   * await page.clock.fastForward('30:00');
+   * ```
+   *
+   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are
+   * "08" for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
+   */
+  fastForward(ticks: number|string): Promise<void>;
+
+  /**
+   * Install fake implementations for the following time-related functions:
+   * - `Date`
+   * - `setTimeout`
+   * - `clearTimeout`
+   * - `setInterval`
+   * - `clearInterval`
+   * - `requestAnimationFrame`
+   * - `cancelAnimationFrame`
+   * - `requestIdleCallback`
+   * - `cancelIdleCallback`
+   * - `performance`
+   *
+   * Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers,
+   * and control the behavior of time-dependent functions. See
+   * [clock.runFor(ticks)](https://playwright.dev/docs/api/class-clock#clock-run-for) and
+   * [clock.fastForward(ticks)](https://playwright.dev/docs/api/class-clock#clock-fast-forward) for more information.
+   * @param options
+   */
+  install(options?: {
+    /**
+     * Time to initialize with, current system time by default.
+     */
+    time?: number|string|Date;
+  }): Promise<void>;
+
+  /**
+   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired
+   * unless [clock.runFor(ticks)](https://playwright.dev/docs/api/class-clock#clock-run-for),
+   * [clock.fastForward(ticks)](https://playwright.dev/docs/api/class-clock#clock-fast-forward),
+   * [clock.pauseAt(time)](https://playwright.dev/docs/api/class-clock#clock-pause-at) or
+   * [clock.resume()](https://playwright.dev/docs/api/class-clock#clock-resume) is called.
+   *
+   * Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it
+   * at the specified time and pausing.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.clock.pauseAt(new Date('2020-02-02'));
+   * await page.clock.pauseAt('2020-02-02');
+   * ```
+   *
+   * For best results, install the clock before navigating the page and set it to a time slightly before the intended
+   * test time. This ensures that all timers run normally during page loading, preventing the page from getting stuck.
+   * Once the page has fully loaded, you can safely use
+   * [clock.pauseAt(time)](https://playwright.dev/docs/api/class-clock#clock-pause-at) to pause the clock.
+   *
+   * ```js
+   * // Initialize clock with some time before the test time and let the page load
+   * // naturally. `Date.now` will progress as the timers fire.
+   * await page.clock.install({ time: new Date('2024-12-10T08:00:00') });
+   * await page.goto('http://localhost:3333');
+   * await page.clock.pauseAt(new Date('2024-12-10T10:00:00'));
+   * ```
+   *
+   * @param time Time to pause at.
+   */
+  pauseAt(time: number|string|Date): Promise<void>;
+
+  /**
+   * Resumes timers. Once this method is called, time resumes flowing, timers are fired as usual.
+   */
+  resume(): Promise<void>;
+
+  /**
+   * Advance the clock, firing all the time-related callbacks.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.clock.runFor(1000);
+   * await page.clock.runFor('30:00');
+   * ```
+   *
+   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are
+   * "08" for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
+   */
+  runFor(ticks: number|string): Promise<void>;
+
+  /**
+   * Makes `Date.now` and `new Date()` return fixed fake time at all times, keeps all the timers running.
+   *
+   * Use this method for simple scenarios where you only need to test with a predefined time. For more advanced
+   * scenarios, use [clock.install([options])](https://playwright.dev/docs/api/class-clock#clock-install) instead. Read
+   * docs on [clock emulation](https://playwright.dev/docs/clock) to learn more.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.clock.setFixedTime(Date.now());
+   * await page.clock.setFixedTime(new Date('2020-02-02'));
+   * await page.clock.setFixedTime('2020-02-02');
+   * ```
+   *
+   * @param time Time to be set in milliseconds.
+   */
+  setFixedTime(time: number|string|Date): Promise<void>;
+
+  /**
+   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for
+   * example switching from summer to winter time, or changing time zones.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.clock.setSystemTime(Date.now());
+   * await page.clock.setSystemTime(new Date('2020-02-02'));
+   * await page.clock.setSystemTime('2020-02-02');
+   * ```
+   *
+   * @param time Time to be set in milliseconds.
+   */
+  setSystemTime(time: number|string|Date): Promise<void>;
+}
+
+/**
+ * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) objects are dispatched by page via the
+ * [page.on('console')](https://playwright.dev/docs/api/class-page#page-event-console) event. For each console message
+ * logged in the page there will be corresponding event in the Playwright context.
+ *
+ * ```js
+ * // Listen for all console logs
+ * page.on('console', msg => console.log(msg.text()));
+ *
+ * // Listen for all console events and handle errors
+ * page.on('console', msg => {
+ *   if (msg.type() === 'error')
+ *     console.log(`Error text: "${msg.text()}"`);
+ * });
+ *
+ * // Get the next console log
+ * const msgPromise = page.waitForEvent('console');
+ * await page.evaluate(() => {
+ *   console.log('hello', 42, { foo: 'bar' });  // Issue console.log inside the page
+ * });
+ * const msg = await msgPromise;
+ *
+ * // Deconstruct console log arguments
+ * await msg.args()[0].jsonValue(); // hello
+ * await msg.args()[1].jsonValue(); // 42
+ * ```
+ *
+ */
+export interface ConsoleMessage {
+  /**
+   * List of arguments passed to a `console` function call. See also
+   * [page.on('console')](https://playwright.dev/docs/api/class-page#page-event-console).
+   */
+  args(): Array<JSHandle>;
+
+  location(): {
+    /**
+     * URL of the resource.
+     */
+    url: string;
+
+    /**
+     * 0-based line number in the resource.
+     */
+    lineNumber: number;
+
+    /**
+     * 0-based column number in the resource.
+     */
+    columnNumber: number;
+  };
+
+  /**
+   * The page that produced this console message, if any.
+   */
+  page(): null|Page;
+
+  /**
+   * The text of the console message.
+   */
+  text(): string;
+
+  type(): "log"|"debug"|"info"|"error"|"warning"|"dir"|"dirxml"|"table"|"trace"|"clear"|"startGroup"|"startGroupCollapsed"|"endGroup"|"assert"|"profile"|"profileEnd"|"count"|"timeEnd";
+}
+
+/**
+ * Coverage gathers information about parts of JavaScript and CSS that were used by the page.
+ *
+ * An example of using JavaScript coverage to produce Istanbul report for page load:
+ *
+ * **NOTE** Coverage APIs are only supported on Chromium-based browsers.
+ *
+ * ```js
+ * const { chromium } = require('playwright');
+ * const v8toIstanbul = require('v8-to-istanbul');
+ *
+ * (async () => {
+ *   const browser = await chromium.launch();
+ *   const page = await browser.newPage();
+ *   await page.coverage.startJSCoverage();
+ *   await page.goto('https://chromium.org');
+ *   const coverage = await page.coverage.stopJSCoverage();
+ *   for (const entry of coverage) {
+ *     const converter = v8toIstanbul('', 0, { source: entry.source });
+ *     await converter.load();
+ *     converter.applyCoverage(entry.functions);
+ *     console.log(JSON.stringify(converter.toIstanbul()));
+ *   }
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ */
+export interface Coverage {
+  /**
+   * Returns coverage is started
+   * @param options
+   */
+  startCSSCoverage(options?: {
+    /**
+     * Whether to reset coverage on every navigation. Defaults to `true`.
+     */
+    resetOnNavigation?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns coverage is started
+   *
+   * **NOTE** Anonymous scripts are ones that don't have an associated url. These are scripts that are dynamically
+   * created on the page using `eval` or `new Function`. If
+   * [`reportAnonymousScripts`](https://playwright.dev/docs/api/class-coverage#coverage-start-js-coverage-option-report-anonymous-scripts)
+   * is set to `true`, anonymous scripts will have `__playwright_evaluation_script__` as their URL.
+   *
+   * @param options
+   */
+  startJSCoverage(options?: {
+    /**
+     * Whether anonymous scripts generated by the page should be reported. Defaults to `false`.
+     */
+    reportAnonymousScripts?: boolean;
+
+    /**
+     * Whether to reset coverage on every navigation. Defaults to `true`.
+     */
+    resetOnNavigation?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Returns the array of coverage reports for all stylesheets
+   *
+   * **NOTE** CSS Coverage doesn't include dynamically injected style tags without sourceURLs.
+   *
+   */
+  stopCSSCoverage(): Promise<Array<{
+    /**
+     * StyleSheet URL
+     */
+    url: string;
+
+    /**
+     * StyleSheet content, if available.
+     */
+    text?: string;
+
+    /**
+     * StyleSheet ranges that were used. Ranges are sorted and non-overlapping.
+     */
+    ranges: Array<{
+      /**
+       * A start offset in text, inclusive
+       */
+      start: number;
+
+      /**
+       * An end offset in text, exclusive
+       */
+      end: number;
+    }>;
+  }>>;
+
+  /**
+   * Returns the array of coverage reports for all scripts
+   *
+   * **NOTE** JavaScript Coverage doesn't include anonymous scripts by default. However, scripts with sourceURLs are
+   * reported.
+   *
+   */
+  stopJSCoverage(): Promise<Array<{
+    /**
+     * Script URL
+     */
+    url: string;
+
+    /**
+     * Script ID
+     */
+    scriptId: string;
+
+    /**
+     * Script content, if applicable.
+     */
+    source?: string;
+
+    /**
+     * V8-specific coverage format.
+     */
+    functions: Array<{
+      functionName: string;
+
+      isBlockCoverage: boolean;
+
+      ranges: Array<{
+        count: number;
+
+        startOffset: number;
+
+        endOffset: number;
+      }>;
+    }>;
+  }>>;
+}
+
+/**
+ * [Dialog](https://playwright.dev/docs/api/class-dialog) objects are dispatched by page via the
+ * [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) event.
+ *
+ * An example of using `Dialog` class:
+ *
+ * ```js
+ * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+ *
+ * (async () => {
+ *   const browser = await chromium.launch();
+ *   const page = await browser.newPage();
+ *   page.on('dialog', async dialog => {
+ *     console.log(dialog.message());
+ *     await dialog.dismiss();
+ *   });
+ *   await page.evaluate(() => alert('1'));
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ * **NOTE** Dialogs are dismissed automatically, unless there is a
+ * [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) listener. When listener is
+ * present, it **must** either
+ * [dialog.accept([promptText])](https://playwright.dev/docs/api/class-dialog#dialog-accept) or
+ * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
+ * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
+ * dialog, and actions like click will never finish.
+ *
+ */
+export interface Dialog {
+  /**
+   * Returns when the dialog has been accepted.
+   * @param promptText A text to enter in prompt. Does not cause any effects if the dialog's `type` is not prompt. Optional.
+   */
+  accept(promptText?: string): Promise<void>;
+
+  /**
+   * If dialog is prompt, returns default prompt value. Otherwise, returns empty string.
+   */
+  defaultValue(): string;
+
+  /**
+   * Returns when the dialog has been dismissed.
+   */
+  dismiss(): Promise<void>;
+
+  /**
+   * A message displayed in the dialog.
+   */
+  message(): string;
+
+  /**
+   * The page that initiated this dialog, if available.
+   */
+  page(): null|Page;
+
+  /**
+   * Returns dialog's type, can be one of `alert`, `beforeunload`, `confirm` or `prompt`.
+   */
+  type(): string;
+}
+
+/**
+ * [Download](https://playwright.dev/docs/api/class-download) objects are dispatched by page via the
+ * [page.on('download')](https://playwright.dev/docs/api/class-page#page-event-download) event.
+ *
+ * All the downloaded files belonging to the browser context are deleted when the browser context is closed.
+ *
+ * Download event is emitted once the download starts. Download path becomes available once download completes.
+ *
+ * ```js
+ * // Start waiting for download before clicking. Note no await.
+ * const downloadPromise = page.waitForEvent('download');
+ * await page.getByText('Download file').click();
+ * const download = await downloadPromise;
+ *
+ * // Wait for the download process to complete and save the downloaded file somewhere.
+ * await download.saveAs('/path/to/save/at/' + download.suggestedFilename());
+ * ```
+ *
+ */
+export interface Download {
+  /**
+   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations,
+   * `download.failure()` would resolve to `'canceled'`.
+   */
+  cancel(): Promise<void>;
+
+  /**
+   * Returns a readable stream for a successful download, or throws for a failed/canceled download.
+   */
+  createReadStream(): Promise<Readable>;
+
+  /**
+   * Deletes the downloaded file. Will wait for the download to finish if necessary.
+   */
+  delete(): Promise<void>;
+
+  /**
+   * Returns download error if any. Will wait for the download to finish if necessary.
+   */
+  failure(): Promise<null|string>;
+
+  /**
+   * Get the page that the download belongs to.
+   */
+  page(): Page;
+
+  /**
+   * Returns path to the downloaded file for a successful download, or throws for a failed/canceled download. The method
+   * will wait for the download to finish if necessary. The method throws when connected remotely.
+   *
+   * Note that the download's file name is a random GUID, use
+   * [download.suggestedFilename()](https://playwright.dev/docs/api/class-download#download-suggested-filename) to get
+   * suggested file name.
+   */
+  path(): Promise<string>;
+
+  /**
+   * Copy the download to a user-specified path. It is safe to call this method while the download is still in progress.
+   * Will wait for the download to finish if necessary.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await download.saveAs('/path/to/save/at/' + download.suggestedFilename());
+   * ```
+   *
+   * @param path Path where the download should be copied.
+   */
+  saveAs(path: string): Promise<void>;
+
+  /**
+   * Returns suggested filename for this download. It is typically computed by the browser from the
+   * [`Content-Disposition`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition) response
+   * header or the `download` attribute. See the spec on [whatwg](https://html.spec.whatwg.org/#downloading-resources).
+   * Different browsers can use different logic for computing it.
+   */
+  suggestedFilename(): string;
+
+  /**
+   * Returns downloaded url.
+   */
+  url(): string;
+}
+
+/**
+ * Playwright has **experimental** support for Electron automation. You can access electron namespace via:
+ *
+ * ```js
+ * const { _electron } = require('playwright');
+ * ```
+ *
+ * An example of the Electron automation script would be:
+ *
+ * ```js
+ * const { _electron: electron } = require('playwright');
+ *
+ * (async () => {
+ *   // Launch Electron app.
+ *   const electronApp = await electron.launch({ args: ['main.js'] });
+ *
+ *   // Evaluation expression in the Electron context.
+ *   const appPath = await electronApp.evaluate(async ({ app }) => {
+ *     // This runs in the main Electron process, parameter here is always
+ *     // the result of the require('electron') in the main app script.
+ *     return app.getAppPath();
+ *   });
+ *   console.log(appPath);
+ *
+ *   // Get the first window that the app opens, wait if necessary.
+ *   const window = await electronApp.firstWindow();
+ *   // Print the title.
+ *   console.log(await window.title());
+ *   // Capture a screenshot.
+ *   await window.screenshot({ path: 'intro.png' });
+ *   // Direct Electron console to Node terminal.
+ *   window.on('console', console.log);
+ *   // Click button.
+ *   await window.click('text=Click me');
+ *   // Exit app.
+ *   await electronApp.close();
+ * })();
+ * ```
+ *
+ * **Supported Electron versions are:**
+ * - v12.2.0+
+ * - v13.4.0+
+ * - v14+
+ *
+ * **Known issues:**
+ *
+ * If you are not able to launch Electron and it will end up in timeouts during launch, try the following:
+ * - Ensure that `nodeCliInspect`
+ *   ([FuseV1Options.EnableNodeCliInspectArguments](https://www.electronjs.org/docs/latest/tutorial/fuses#nodecliinspect))
+ *   fuse is **not** set to `false`.
+ */
+export interface Electron {
+  /**
+   * Launches electron application specified with the
+   * [`executablePath`](https://playwright.dev/docs/api/class-electron#electron-launch-option-executable-path).
+   * @param options
+   */
+  launch(options?: {
+    /**
+     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+     */
+    acceptDownloads?: boolean;
+
+    /**
+     * Additional arguments to pass to the application when launching. You typically pass the main script name here.
+     */
+    args?: Array<string>;
+
+    /**
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     */
+    bypassCSP?: boolean;
+
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
+
+    /**
+     * Current working directory to launch application from.
+     */
+    cwd?: string;
+
+    /**
+     * Specifies environment variables that will be visible to Electron. Defaults to `process.env`.
+     */
+    env?: { [key: string]: string; };
+
+    /**
+     * Launches given Electron application. If not specified, launches the default Electron executable installed in this
+     * package, located at `node_modules/.bin/electron`.
+     */
+    executablePath?: string;
+
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
+
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
+
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
+
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
+
+    /**
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     */
+    offline?: boolean;
+
+    /**
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
+     */
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
+
+      /**
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
+       */
+      content?: "omit"|"embed"|"attach";
+
+      /**
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
+       */
+      path: string;
+
+      /**
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       */
+      mode?: "full"|"minimal";
+
+      /**
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       */
+      urlFilter?: string|RegExp;
+    };
+
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
+      /**
+       * Path to the directory to put videos into.
+       */
+      dir: string;
+
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
+
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Maximum time in milliseconds to wait for the application to start. Defaults to `30000` (30 seconds). Pass `0` to
+     * disable timeout.
+     */
+    timeout?: number;
+
+    /**
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
+     */
+    timezoneId?: string;
+
+    /**
+     * If specified, traces are saved into this directory.
+     */
+    tracesDir?: string;
+  }): Promise<ElectronApplication>;
+}
+
+/**
+ * [FileChooser](https://playwright.dev/docs/api/class-filechooser) objects are dispatched by the page in the
+ * [page.on('filechooser')](https://playwright.dev/docs/api/class-page#page-event-file-chooser) event.
+ *
+ * ```js
+ * // Start waiting for file chooser before clicking. Note no await.
+ * const fileChooserPromise = page.waitForEvent('filechooser');
+ * await page.getByText('Upload file').click();
+ * const fileChooser = await fileChooserPromise;
+ * await fileChooser.setFiles(path.join(__dirname, 'myfile.pdf'));
+ * ```
+ *
+ */
+export interface FileChooser {
+  /**
+   * Returns input element associated with this file chooser.
+   */
+  element(): ElementHandle;
+
+  /**
+   * Returns whether this file chooser accepts multiple files.
+   */
+  isMultiple(): boolean;
+
+  /**
+   * Returns page this file chooser belongs to.
+   */
+  page(): Page;
+
+  /**
+   * Sets the value of the file input this chooser is associated with. If some of the `filePaths` are relative paths,
+   * then they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * @param files
+   * @param options
+   */
+  setFiles(files: string|ReadonlyArray<string>|{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }|ReadonlyArray<{
+    /**
+     * File name
+     */
+    name: string;
+
+    /**
+     * File type
+     */
+    mimeType: string;
+
+    /**
+     * File content
+     */
+    buffer: Buffer;
+  }>, options?: {
+    /**
+     * This option has no effect.
+     * @deprecated This option has no effect.
+     */
+    noWaitAfter?: boolean;
+
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<void>;
+}
+
+/**
+ * FrameLocator represents a view to the `iframe` on the page. It captures the logic sufficient to retrieve the
+ * `iframe` and locate elements in that iframe. FrameLocator can be created with either
+ * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame),
+ * [page.frameLocator(selector)](https://playwright.dev/docs/api/class-page#page-frame-locator) or
+ * [locator.frameLocator(selector)](https://playwright.dev/docs/api/class-locator#locator-frame-locator) method.
+ *
+ * ```js
+ * const locator = page.locator('#my-frame').contentFrame().getByText('Submit');
+ * await locator.click();
+ * ```
+ *
+ * **Strictness**
+ *
+ * Frame locators are strict. This means that all operations on frame locators will throw if more than one element
+ * matches a given selector.
+ *
+ * ```js
+ * // Throws if there are several frames in DOM:
+ * await page.locator('.result-frame').contentFrame().getByRole('button').click();
+ *
+ * // Works because we explicitly tell locator to pick the first frame:
+ * await page.locator('.result-frame').contentFrame().first().getByRole('button').click();
+ * ```
+ *
+ * **Converting Locator to FrameLocator**
+ *
+ * If you have a [Locator](https://playwright.dev/docs/api/class-locator) object pointing to an `iframe` it can be
+ * converted to [FrameLocator](https://playwright.dev/docs/api/class-framelocator) using
+ * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame).
+ *
+ * **Converting FrameLocator to Locator**
+ *
+ * If you have a [FrameLocator](https://playwright.dev/docs/api/class-framelocator) object it can be converted to
+ * [Locator](https://playwright.dev/docs/api/class-locator) pointing to the same `iframe` using
+ * [frameLocator.owner()](https://playwright.dev/docs/api/class-framelocator#frame-locator-owner).
+ */
+export interface FrameLocator {
+  /**
+   * Returns locator to the first matching frame.
+   * @deprecated Use [locator.first()](https://playwright.dev/docs/api/class-locator#locator-first) followed by
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame) instead.
+   */
+  first(): FrameLocator;
+
+  /**
+   * When working with iframes, you can create a frame locator that will enter the iframe and allow selecting elements
+   * in that iframe.
+   * @param selector A selector to use when resolving DOM element.
+   */
+  frameLocator(selector: string): FrameLocator;
+
+  /**
+   * Allows locating elements by their alt text.
+   *
+   * **Usage**
+   *
+   * For example, this method will find the image by alt text "Playwright logo":
+   *
+   * ```html
+   * <img alt='Playwright logo'>
+   * ```
+   *
+   * ```js
+   * await page.getByAltText('Playwright logo').click();
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByAltText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the text of the associated `<label>` or `aria-labelledby` element, or by the
+   * `aria-label` attribute.
+   *
+   * **Usage**
+   *
+   * For example, this method will find inputs by label "Username" and "Password" in the following DOM:
+   *
+   * ```html
+   * <input aria-label="Username">
+   * <label for="password-input">Password:</label>
+   * <input id="password-input">
+   * ```
+   *
+   * ```js
+   * await page.getByLabel('Username').fill('john');
+   * await page.getByLabel('Password').fill('secret');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByLabel(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating input elements by the placeholder text.
+   *
+   * **Usage**
+   *
+   * For example, consider the following DOM structure.
+   *
+   * ```html
+   * <input type="email" placeholder="name@example.com" />
+   * ```
+   *
+   * You can fill the input after locating it by the placeholder text:
+   *
+   * ```js
+   * await page
+   *     .getByPlaceholder('name@example.com')
+   *     .fill('playwright@microsoft.com');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByPlaceholder(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their [ARIA role](https://www.w3.org/TR/wai-aria-1.2/#roles),
+   * [ARIA attributes](https://www.w3.org/TR/wai-aria-1.2/#aria-attributes) and
+   * [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <h3>Sign up</h3>
+   * <label>
+   *   <input type="checkbox" /> Subscribe
+   * </label>
+   * <br/>
+   * <button>Submit</button>
+   * ```
+   *
+   * You can locate each element by it's implicit role:
+   *
+   * ```js
+   * await expect(page.getByRole('heading', { name: 'Sign up' })).toBeVisible();
+   *
+   * await page.getByRole('checkbox', { name: 'Subscribe' }).check();
+   *
+   * await page.getByRole('button', { name: /submit/i }).click();
+   * ```
+   *
+   * **Details**
+   *
+   * Role selector **does not replace** accessibility audits and conformance tests, but rather gives early feedback
+   * about the ARIA guidelines.
+   *
+   * Many html elements have an implicitly [defined role](https://w3c.github.io/html-aam/#html-element-role-mappings)
+   * that is recognized by the role selector. You can find all the
+   * [supported roles here](https://www.w3.org/TR/wai-aria-1.2/#role_definitions). ARIA guidelines **do not recommend**
+   * duplicating implicit roles and attributes by setting `role` and/or `aria-*` attributes to default values.
+   * @param role Required aria role.
+   * @param options
+   */
+  getByRole(role: "alert"|"alertdialog"|"application"|"article"|"banner"|"blockquote"|"button"|"caption"|"cell"|"checkbox"|"code"|"columnheader"|"combobox"|"complementary"|"contentinfo"|"definition"|"deletion"|"dialog"|"directory"|"document"|"emphasis"|"feed"|"figure"|"form"|"generic"|"grid"|"gridcell"|"group"|"heading"|"img"|"insertion"|"link"|"list"|"listbox"|"listitem"|"log"|"main"|"marquee"|"math"|"meter"|"menu"|"menubar"|"menuitem"|"menuitemcheckbox"|"menuitemradio"|"navigation"|"none"|"note"|"option"|"paragraph"|"presentation"|"progressbar"|"radio"|"radiogroup"|"region"|"row"|"rowgroup"|"rowheader"|"scrollbar"|"search"|"searchbox"|"separator"|"slider"|"spinbutton"|"status"|"strong"|"subscript"|"superscript"|"switch"|"tab"|"table"|"tablist"|"tabpanel"|"term"|"textbox"|"time"|"timer"|"toolbar"|"tooltip"|"tree"|"treegrid"|"treeitem", options?: {
+    /**
+     * An attribute that is usually set by `aria-checked` or native `<input type=checkbox>` controls.
+     *
+     * Learn more about [`aria-checked`](https://www.w3.org/TR/wai-aria-1.2/#aria-checked).
+     */
+    checked?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-disabled` or `disabled`.
+     *
+     * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
+     * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
+     */
+    disabled?: boolean;
+
+    /**
+     * Whether [`name`](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role-option-name) is
+     * matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role-option-name) is a regular
+     * expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-expanded`.
+     *
+     * Learn more about [`aria-expanded`](https://www.w3.org/TR/wai-aria-1.2/#aria-expanded).
+     */
+    expanded?: boolean;
+
+    /**
+     * Option that controls whether hidden elements are matched. By default, only non-hidden elements, as
+     * [defined by ARIA](https://www.w3.org/TR/wai-aria-1.2/#tree_exclusion), are matched by role selector.
+     *
+     * Learn more about [`aria-hidden`](https://www.w3.org/TR/wai-aria-1.2/#aria-hidden).
+     */
+    includeHidden?: boolean;
+
+    /**
+     * A number attribute that is usually present for roles `heading`, `listitem`, `row`, `treeitem`, with default values
+     * for `<h1>-<h6>` elements.
+     *
+     * Learn more about [`aria-level`](https://www.w3.org/TR/wai-aria-1.2/#aria-level).
+     */
+    level?: number;
+
+    /**
+     * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role-option-exact) to control
+     * this behavior.
+     *
+     * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
+     */
+    name?: string|RegExp;
+
+    /**
+     * An attribute that is usually set by `aria-pressed`.
+     *
+     * Learn more about [`aria-pressed`](https://www.w3.org/TR/wai-aria-1.2/#aria-pressed).
+     */
+    pressed?: boolean;
+
+    /**
+     * An attribute that is usually set by `aria-selected`.
+     *
+     * Learn more about [`aria-selected`](https://www.w3.org/TR/wai-aria-1.2/#aria-selected).
+     */
+    selected?: boolean;
+  }): Locator;
+
+  /**
+   * Locate element by the test id.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <button data-testid="directions">Itinéraire</button>
+   * ```
+   *
+   * You can locate the element by it's test id:
+   *
+   * ```js
+   * await page.getByTestId('directions').click();
+   * ```
+   *
+   * **Details**
+   *
+   * By default, the `data-testid` attribute is used as a test id. Use
+   * [selectors.setTestIdAttribute(attributeName)](https://playwright.dev/docs/api/class-selectors#selectors-set-test-id-attribute)
+   * to configure a different test id attribute if necessary.
+   *
+   * ```js
+   * // Set custom test id attribute from @playwright/test config:
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     testIdAttribute: 'data-pw'
+   *   },
+   * });
+   * ```
+   *
+   * @param testId Id to locate the element by.
+   */
+  getByTestId(testId: string|RegExp): Locator;
+
+  /**
+   * Allows locating elements that contain given text.
+   *
+   * See also [locator.filter([options])](https://playwright.dev/docs/api/class-locator#locator-filter) that allows to
+   * match by another criteria, like an accessible role, and then filter by the text content.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure:
+   *
+   * ```html
+   * <div>Hello <span>world</span></div>
+   * <div>Hello</div>
+   * ```
+   *
+   * You can locate by text substring, exact string, or a regular expression:
+   *
+   * ```js
+   * // Matches <span>
+   * page.getByText('world');
+   *
+   * // Matches first <div>
+   * page.getByText('Hello world');
+   *
+   * // Matches second <div>
+   * page.getByText('Hello', { exact: true });
+   *
+   * // Matches both <div>s
+   * page.getByText(/Hello/);
+   *
+   * // Matches second <div>
+   * page.getByText(/^hello$/i);
+   * ```
+   *
+   * **Details**
+   *
+   * Matching by text always normalizes whitespace, even with exact match. For example, it turns multiple spaces into
+   * one, turns line breaks into spaces and ignores leading and trailing whitespace.
+   *
+   * Input elements of the type `button` and `submit` are matched by their `value` instead of the text content. For
+   * example, locating by text `"Log in"` matches `<input type=button value="Log in">`.
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByText(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Allows locating elements by their title attribute.
+   *
+   * **Usage**
+   *
+   * Consider the following DOM structure.
+   *
+   * ```html
+   * <span title='Issues count'>25 issues</span>
+   * ```
+   *
+   * You can check the issues count after locating it by the title text:
+   *
+   * ```js
+   * await expect(page.getByTitle('Issues count')).toHaveText('25 issues');
+   * ```
+   *
+   * @param text Text to locate the element for.
+   * @param options
+   */
+  getByTitle(text: string|RegExp, options?: {
+    /**
+     * Whether to find an exact match: case-sensitive and whole-string. Default to false. Ignored when locating by a
+     * regular expression. Note that exact match still trims whitespace.
+     */
+    exact?: boolean;
+  }): Locator;
+
+  /**
+   * Returns locator to the last matching frame.
+   * @deprecated Use [locator.last()](https://playwright.dev/docs/api/class-locator#locator-last) followed by
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame) instead.
+   */
+  last(): FrameLocator;
+
+  /**
+   * The method finds an element matching the specified selector in the locator's subtree. It also accepts filter
+   * options, similar to [locator.filter([options])](https://playwright.dev/docs/api/class-locator#locator-filter)
+   * method.
+   *
+   * [Learn more about locators](https://playwright.dev/docs/locators).
+   * @param selectorOrLocator A selector or locator to use when resolving DOM element.
+   * @param options
+   */
+  locator(selectorOrLocator: string|Locator, options?: {
+    /**
+     * Narrows down the results of the method to those which contain elements matching this relative locator. For example,
+     * `article` that has `text=Playwright` matches `<article><div>Playwright</div></article>`.
+     *
+     * Inner locator **must be relative** to the outer locator and is queried starting with the outer locator match, not
+     * the document root. For example, you can find `content` that has `div` in
+     * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
+     * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    has?: Locator;
+
+    /**
+     * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
+     * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
+     *
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
+     */
+    hasNot?: Locator;
+
+    /**
+     * Matches elements that do not contain specified text somewhere inside, possibly in a child or a descendant element.
+     * When passed a [string], matching is case-insensitive and searches for a substring.
+     */
+    hasNotText?: string|RegExp;
+
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When
+     * passed a [string], matching is case-insensitive and searches for a substring. For example, `"Playwright"` matches
+     * `<article><div>Playwright</div></article>`.
+     */
+    hasText?: string|RegExp;
+  }): Locator;
+
+  /**
+   * Returns locator to the n-th matching frame. It's zero based, `nth(0)` selects the first frame.
+   * @deprecated Use [locator.nth(index)](https://playwright.dev/docs/api/class-locator#locator-nth) followed by
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame) instead.
+   * @param index
+   */
+  nth(index: number): FrameLocator;
+
+  /**
+   * Returns a [Locator](https://playwright.dev/docs/api/class-locator) object pointing to the same `iframe` as this
+   * frame locator.
+   *
+   * Useful when you have a [FrameLocator](https://playwright.dev/docs/api/class-framelocator) object obtained
+   * somewhere, and later on would like to interact with the `iframe` element.
+   *
+   * For a reverse operation, use
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const frameLocator = page.locator('iframe[name="embedded"]').contentFrame();
+   * // ...
+   * const locator = frameLocator.owner();
+   * await expect(locator).toBeVisible();
+   * ```
+   *
+   */
+  owner(): Locator;
+}
+
+/**
+ * Keyboard provides an api for managing a virtual keyboard. The high level api is
+ * [keyboard.type(text[, options])](https://playwright.dev/docs/api/class-keyboard#keyboard-type), which takes raw
+ * characters and generates proper `keydown`, `keypress`/`input`, and `keyup` events on your page.
+ *
+ * For finer control, you can use [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down),
+ * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up), and
+ * [keyboard.insertText(text)](https://playwright.dev/docs/api/class-keyboard#keyboard-insert-text) to manually fire
+ * events as if they were generated from a real keyboard.
+ *
+ * An example of holding down `Shift` in order to select and delete some text:
+ *
+ * ```js
+ * await page.keyboard.type('Hello World!');
+ * await page.keyboard.press('ArrowLeft');
+ *
+ * await page.keyboard.down('Shift');
+ * for (let i = 0; i < ' World'.length; i++)
+ *   await page.keyboard.press('ArrowLeft');
+ * await page.keyboard.up('Shift');
+ *
+ * await page.keyboard.press('Backspace');
+ * // Result text will end up saying 'Hello!'
+ * ```
+ *
+ * An example of pressing uppercase `A`
+ *
+ * ```js
+ * await page.keyboard.press('Shift+KeyA');
+ * // or
+ * await page.keyboard.press('Shift+A');
+ * ```
+ *
+ * An example to trigger select-all with the keyboard
+ *
+ * ```js
+ * await page.keyboard.press('ControlOrMeta+A');
+ * ```
+ *
+ */
+export interface Keyboard {
+  /**
+   * Dispatches a `keydown` event.
+   *
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) can specify the intended
+   * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) values can be found
+   * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
+   *
+   * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
+   * `Delete`, `Escape`, `ArrowDown`, `End`, `Enter`, `Home`, `Insert`, `PageDown`, `PageUp`, `ArrowRight`, `ArrowUp`,
+   * etc.
+   *
+   * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
+   * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
+   *
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) in the upper case.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) is a modifier key, `Shift`,
+   * `Meta`, `Control`, or `Alt`, subsequent key presses will be sent with that modifier active. To release the modifier
+   * key, use [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   *
+   * After the key is pressed once, subsequent calls to
+   * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) will have
+   * [repeat](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat) set to true. To release the key,
+   * use [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   *
+   * **NOTE** Modifier keys DO influence `keyboard.down`. Holding down `Shift` will type the text in upper case.
+   *
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   */
+  down(key: string): Promise<void>;
+
+  /**
+   * Dispatches only `input` event, does not emit the `keydown`, `keyup` or `keypress` events.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.keyboard.insertText('嗨');
+   * ```
+   *
+   * **NOTE** Modifier keys DO NOT effect `keyboard.insertText`. Holding down `Shift` will not type the text in upper
+   * case.
+   *
+   * @param text Sets input to the specified text value.
+   */
+  insertText(text: string): Promise<void>;
+
+  /**
+   * **NOTE** In most cases, you should use
+   * [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press) instead.
+   *
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) can specify the intended
+   * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) values can be found
+   * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
+   *
+   * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
+   * `Delete`, `Escape`, `ArrowDown`, `End`, `Enter`, `Home`, `Insert`, `PageDown`, `PageUp`, `ArrowRight`, `ArrowUp`,
+   * etc.
+   *
+   * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
+   * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
+   *
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) in the upper case.
+   *
+   * If [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
+   *
+   * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
+   * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const page = await browser.newPage();
+   * await page.goto('https://keycode.info');
+   * await page.keyboard.press('A');
+   * await page.screenshot({ path: 'A.png' });
+   * await page.keyboard.press('ArrowLeft');
+   * await page.screenshot({ path: 'ArrowLeft.png' });
+   * await page.keyboard.press('Shift+O');
+   * await page.screenshot({ path: 'O.png' });
+   * await browser.close();
+   * ```
+   *
+   * Shortcut for [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
+   * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   * @param options
+   */
+  press(key: string, options?: {
+    /**
+     * Time to wait between `keydown` and `keyup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** In most cases, you should use
+   * [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill) instead. You only need
+   * to press keys one by one if there is special keyboard handling on the page - in this case use
+   * [locator.pressSequentially(text[, options])](https://playwright.dev/docs/api/class-locator#locator-press-sequentially).
+   *
+   * Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.
+   *
+   * To press a special key, like `Control` or `ArrowDown`, use
+   * [keyboard.press(key[, options])](https://playwright.dev/docs/api/class-keyboard#keyboard-press).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.keyboard.type('Hello'); // Types instantly
+   * await page.keyboard.type('World', { delay: 100 }); // Types slower, like a user
+   * ```
+   *
+   * **NOTE** Modifier keys DO NOT effect `keyboard.type`. Holding down `Shift` will not type the text in upper case.
+   *
+   * **NOTE** For characters that are not on a US keyboard, only an `input` event will be sent.
+   *
+   * @param text A text to type into a focused element.
+   * @param options
+   */
+  type(text: string, options?: {
+    /**
+     * Time to wait between key presses in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+  }): Promise<void>;
+
+  /**
+   * Dispatches a `keyup` event.
+   * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
+   */
+  up(key: string): Promise<void>;
+}
+
+/**
+ * Playwright generates a lot of logs and they are accessible via the pluggable logger sink.
+ *
+ * ```js
+ * const { chromium } = require('playwright');  // Or 'firefox' or 'webkit'.
+ *
+ * (async () => {
+ *   const browser = await chromium.launch({
+ *     logger: {
+ *       isEnabled: (name, severity) => name === 'api',
+ *       log: (name, severity, message, args) => console.log(`${name} ${message}`)
+ *     }
+ *   });
+ *   // ...
+ * })();
+ * ```
+ *
+ */
+export interface Logger {
+  /**
+   * Determines whether sink is interested in the logger with the given name and severity.
+   * @param name logger name
+   * @param severity
+   */
+  isEnabled(name: string, severity: "verbose"|"info"|"warning"|"error"): boolean;
+
+  /**
+   * @param name logger name
+   * @param severity
+   * @param message log message format
+   * @param args message arguments
+   * @param hints optional formatting hints
+   */
+  log(name: string, severity: "verbose"|"info"|"warning"|"error", message: string|Error, args: ReadonlyArray<Object>, hints: {
+    /**
+     * Optional preferred logger color.
+     */
+    color?: string;
+  }): void;
+}
+
+/**
+ * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
+ *
+ * **NOTE** If you want to debug where the mouse moved, you can use the [Trace viewer](https://playwright.dev/docs/trace-viewer-intro) or
+ * [Playwright Inspector](https://playwright.dev/docs/running-tests). A red dot showing the location of the mouse will be shown for every
+ * mouse action.
+ *
+ * Every `page` object has its own Mouse, accessible with
+ * [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse).
+ *
+ * ```js
+ * // Using ‘page.mouse’ to trace a 100x100 square.
+ * await page.mouse.move(0, 0);
+ * await page.mouse.down();
+ * await page.mouse.move(0, 100);
+ * await page.mouse.move(100, 100);
+ * await page.mouse.move(100, 0);
+ * await page.mouse.move(0, 0);
+ * await page.mouse.up();
+ * ```
+ *
+ */
+export interface Mouse {
+  /**
+   * Shortcut for [mouse.move(x, y[, options])](https://playwright.dev/docs/api/class-mouse#mouse-move),
+   * [mouse.down([options])](https://playwright.dev/docs/api/class-mouse#mouse-down),
+   * [mouse.up([options])](https://playwright.dev/docs/api/class-mouse#mouse-up).
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
+   * @param options
+   */
+  click(x: number, y: number, options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+  }): Promise<void>;
+
+  /**
+   * Shortcut for [mouse.move(x, y[, options])](https://playwright.dev/docs/api/class-mouse#mouse-move),
+   * [mouse.down([options])](https://playwright.dev/docs/api/class-mouse#mouse-down),
+   * [mouse.up([options])](https://playwright.dev/docs/api/class-mouse#mouse-up),
+   * [mouse.down([options])](https://playwright.dev/docs/api/class-mouse#mouse-down) and
+   * [mouse.up([options])](https://playwright.dev/docs/api/class-mouse#mouse-up).
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
+   * @param options
+   */
+  dblclick(x: number, y: number, options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * Time to wait between `mousedown` and `mouseup` in milliseconds. Defaults to 0.
+     */
+    delay?: number;
+  }): Promise<void>;
+
+  /**
+   * Dispatches a `mousedown` event.
+   * @param options
+   */
+  down(options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+  }): Promise<void>;
+
+  /**
+   * Dispatches a `mousemove` event.
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
+   * @param options
+   */
+  move(x: number, y: number, options?: {
+    /**
+     * Defaults to 1. Sends intermediate `mousemove` events.
+     */
+    steps?: number;
+  }): Promise<void>;
+
+  /**
+   * Dispatches a `mouseup` event.
+   * @param options
+   */
+  up(options?: {
+    /**
+     * Defaults to `left`.
+     */
+    button?: "left"|"right"|"middle";
+
+    /**
+     * defaults to 1. See [UIEvent.detail].
+     */
+    clickCount?: number;
+  }): Promise<void>;
+
+  /**
+   * Dispatches a `wheel` event. This method is usually used to manually scroll the page. See
+   * [scrolling](https://playwright.dev/docs/input#scrolling) for alternative ways to scroll.
+   *
+   * **NOTE** Wheel events may cause scrolling if they are not handled, and this method does not wait for the scrolling
+   * to finish before returning.
+   *
+   * @param deltaX Pixels to scroll horizontally.
+   * @param deltaY Pixels to scroll vertically.
+   */
+  wheel(deltaX: number, deltaY: number): Promise<void>;
+}
+
+/**
+ * This object can be used to launch or connect to Chromium, returning instances of
+ * [Browser](https://playwright.dev/docs/api/class-browser).
+ */
+export const chromium: BrowserType;
+
+/**
+ * This object can be used to launch or connect to Firefox, returning instances of
+ * [Browser](https://playwright.dev/docs/api/class-browser).
+ */
+export const firefox: BrowserType;
+
+/**
+ * Exposes API that can be used for the Web API testing.
+ */
+export const request: APIRequest;
+
+/**
+ * Selectors can be used to install custom selector engines. See [extensibility](https://playwright.dev/docs/extensibility) for more
+ * information.
+ */
+export const selectors: Selectors;
+
+/**
+ * This object can be used to launch or connect to WebKit, returning instances of
+ * [Browser](https://playwright.dev/docs/api/class-browser).
+ */
+export const webkit: BrowserType;
+
+/**
+ * Whenever the page sends a request for a network resource the following sequence of events are emitted by
+ * [Page](https://playwright.dev/docs/api/class-page):
+ * - [page.on('request')](https://playwright.dev/docs/api/class-page#page-event-request) emitted when the request is
+ *   issued by the page.
+ * - [page.on('response')](https://playwright.dev/docs/api/class-page#page-event-response) emitted when/if the
+ *   response status and headers are received for the request.
+ * - [page.on('requestfinished')](https://playwright.dev/docs/api/class-page#page-event-request-finished) emitted
+ *   when the response body is downloaded and the request is complete.
+ *
+ * If request fails at some point, then instead of `'requestfinished'` event (and possibly instead of 'response'
+ * event), the  [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed) event
+ * is emitted.
+ *
+ * **NOTE** HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request
+ * will complete with `'requestfinished'` event.
+ *
+ * If request gets a 'redirect' response, the request is successfully finished with the `requestfinished` event, and a
+ * new request is  issued to a redirected url.
+ */
+export interface Request {
+  /**
+   * An object with all the request HTTP headers associated with this request. The header names are lower-cased.
+   */
+  allHeaders(): Promise<{ [key: string]: string; }>;
+
+  /**
+   * The method returns `null` unless this request has failed, as reported by `requestfailed` event.
+   *
+   * **Usage**
+   *
+   * Example of logging of all the failed requests:
+   *
+   * ```js
+   * page.on('requestfailed', request => {
+   *   console.log(request.url() + ' ' + request.failure().errorText);
+   * });
+   * ```
+   *
+   */
+  failure(): null|{
+    /**
+     * Human-readable error message, e.g. `'net::ERR_FAILED'`.
+     */
+    errorText: string;
+  };
+
+  /**
+   * Returns the [Frame](https://playwright.dev/docs/api/class-frame) that initiated this request.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const frameUrl = request.frame().url();
+   * ```
+   *
+   * **Details**
+   *
+   * Note that in some cases the frame is not available, and this method will throw.
+   * - When request originates in the Service Worker. You can use `request.serviceWorker()` to check that.
+   * - When navigation request is issued before the corresponding frame is created. You can use
+   *   [request.isNavigationRequest()](https://playwright.dev/docs/api/class-request#request-is-navigation-request) to
+   *   check that.
+   *
+   * Here is an example that handles all the cases:
+   *
+   * ```js
+   * if (request.serviceWorker())
+   *   console.log(`request ${request.url()} from a service worker`);
+   * else if (request.isNavigationRequest())
+   *   console.log(`request ${request.url()} is a navigation request`);
+   * else
+   *   console.log(`request ${request.url()} from a frame ${request.frame().url()}`);
+   * ```
+   *
+   */
+  frame(): Frame;
+
+  /**
+   * An object with the request HTTP headers. The header names are lower-cased. Note that this method does not return
+   * security-related headers, including cookie-related ones. You can use
+   * [request.allHeaders()](https://playwright.dev/docs/api/class-request#request-all-headers) for complete list of
+   * headers that include `cookie` information.
+   */
+  headers(): { [key: string]: string; };
+
+  /**
+   * An array with all the request HTTP headers associated with this request. Unlike
+   * [request.allHeaders()](https://playwright.dev/docs/api/class-request#request-all-headers), header names are NOT
+   * lower-cased. Headers with multiple entries, such as `Set-Cookie`, appear in the array multiple times.
+   */
+  headersArray(): Promise<Array<{
+    /**
+     * Name of the header.
+     */
+    name: string;
+
+    /**
+     * Value of the header.
+     */
+    value: string;
+  }>>;
+
+  /**
+   * Returns the value of the header matching the name. The name is case-insensitive.
+   * @param name Name of the header.
+   */
+  headerValue(name: string): Promise<null|string>;
+
+  /**
+   * Whether this request is driving frame's navigation.
+   *
+   * Some navigation requests are issued before the corresponding frame is created, and therefore do not have
+   * [request.frame()](https://playwright.dev/docs/api/class-request#request-frame) available.
+   */
+  isNavigationRequest(): boolean;
+
+  /**
+   * Request's method (GET, POST, etc.)
+   */
+  method(): string;
+
+  /**
+   * Request's post body, if any.
+   */
+  postData(): null|string;
+
+  /**
+   * Request's post body in a binary form, if any.
+   */
+  postDataBuffer(): null|Buffer;
+
+  /**
+   * Returns parsed request's body for `form-urlencoded` and JSON as a fallback if any.
+   *
+   * When the response is `application/x-www-form-urlencoded` then a key/value object of the values will be returned.
+   * Otherwise it will be parsed as JSON.
+   */
+  postDataJSON(): null|Serializable;
+
+  /**
+   * Request that was redirected by the server to this one, if any.
+   *
+   * When the server responds with a redirect, Playwright creates a new
+   * [Request](https://playwright.dev/docs/api/class-request) object. The two requests are connected by
+   * `redirectedFrom()` and `redirectedTo()` methods. When multiple server redirects has happened, it is possible to
+   * construct the whole redirect chain by repeatedly calling `redirectedFrom()`.
+   *
+   * **Usage**
+   *
+   * For example, if the website `http://example.com` redirects to `https://example.com`:
+   *
+   * ```js
+   * const response = await page.goto('http://example.com');
+   * console.log(response.request().redirectedFrom().url()); // 'http://example.com'
+   * ```
+   *
+   * If the website `https://google.com` has no redirects:
+   *
+   * ```js
+   * const response = await page.goto('https://google.com');
+   * console.log(response.request().redirectedFrom()); // null
+   * ```
+   *
+   */
+  redirectedFrom(): null|Request;
+
+  /**
+   * New request issued by the browser if the server responded with redirect.
+   *
+   * **Usage**
+   *
+   * This method is the opposite of
+   * [request.redirectedFrom()](https://playwright.dev/docs/api/class-request#request-redirected-from):
+   *
+   * ```js
+   * console.log(request.redirectedFrom().redirectedTo() === request); // true
+   * ```
+   *
+   */
+  redirectedTo(): null|Request;
+
+  /**
+   * Contains the request's resource type as it was perceived by the rendering engine. ResourceType will be one of the
+   * following: `document`, `stylesheet`, `image`, `media`, `font`, `script`, `texttrack`, `xhr`, `fetch`,
+   * `eventsource`, `websocket`, `manifest`, `other`.
+   */
+  resourceType(): string;
+
+  /**
+   * Returns the matching [Response](https://playwright.dev/docs/api/class-response) object, or `null` if the response
+   * was not received due to error.
+   */
+  response(): Promise<null|Response>;
+
+  /**
+   * The Service [Worker](https://playwright.dev/docs/api/class-worker) that is performing the request.
+   *
+   * **Details**
+   *
+   * This method is Chromium only. It's safe to call when using other browsers, but it will always be `null`.
+   *
+   * Requests originated in a Service Worker do not have a
+   * [request.frame()](https://playwright.dev/docs/api/class-request#request-frame) available.
+   */
+  serviceWorker(): null|Worker;
+
+  /**
+   * Returns resource size information for given request.
+   */
+  sizes(): Promise<{
+    /**
+     * Size of the request body (POST data payload) in bytes. Set to 0 if there was no body.
+     */
+    requestBodySize: number;
+
+    /**
+     * Total number of bytes from the start of the HTTP request message until (and including) the double CRLF before the
+     * body.
+     */
+    requestHeadersSize: number;
+
+    /**
+     * Size of the received response body (encoded) in bytes.
+     */
+    responseBodySize: number;
+
+    /**
+     * Total number of bytes from the start of the HTTP response message until (and including) the double CRLF before the
+     * body.
+     */
+    responseHeadersSize: number;
+  }>;
+
+  /**
+   * Returns resource timing information for given request. Most of the timing values become available upon the
+   * response, `responseEnd` becomes available when request finishes. Find more information at
+   * [Resource Timing API](https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const requestFinishedPromise = page.waitForEvent('requestfinished');
+   * await page.goto('http://example.com');
+   * const request = await requestFinishedPromise;
+   * console.log(request.timing());
+   * ```
+   *
+   */
+  timing(): {
+    /**
+     * Request start time in milliseconds elapsed since January 1, 1970 00:00:00 UTC
+     */
+    startTime: number;
+
+    /**
+     * Time immediately before the browser starts the domain name lookup for the resource. The value is given in
+     * milliseconds relative to `startTime`, -1 if not available.
+     */
+    domainLookupStart: number;
+
+    /**
+     * Time immediately after the browser starts the domain name lookup for the resource. The value is given in
+     * milliseconds relative to `startTime`, -1 if not available.
+     */
+    domainLookupEnd: number;
+
+    /**
+     * Time immediately before the user agent starts establishing the connection to the server to retrieve the resource.
+     * The value is given in milliseconds relative to `startTime`, -1 if not available.
+     */
+    connectStart: number;
+
+    /**
+     * Time immediately before the browser starts the handshake process to secure the current connection. The value is
+     * given in milliseconds relative to `startTime`, -1 if not available.
+     */
+    secureConnectionStart: number;
+
+    /**
+     * Time immediately before the user agent starts establishing the connection to the server to retrieve the resource.
+     * The value is given in milliseconds relative to `startTime`, -1 if not available.
+     */
+    connectEnd: number;
+
+    /**
+     * Time immediately before the browser starts requesting the resource from the server, cache, or local resource. The
+     * value is given in milliseconds relative to `startTime`, -1 if not available.
+     */
+    requestStart: number;
+
+    /**
+     * Time immediately after the browser receives the first byte of the response from the server, cache, or local
+     * resource. The value is given in milliseconds relative to `startTime`, -1 if not available.
+     */
+    responseStart: number;
+
+    /**
+     * Time immediately after the browser receives the last byte of the resource or immediately before the transport
+     * connection is closed, whichever comes first. The value is given in milliseconds relative to `startTime`, -1 if not
+     * available.
+     */
+    responseEnd: number;
+  };
+
+  /**
+   * URL of the request.
+   */
+  url(): string;
+}
+
+/**
+ * [Response](https://playwright.dev/docs/api/class-response) class represents responses which are received by page.
+ */
+export interface Response {
+  /**
+   * An object with all the response HTTP headers associated with this response.
+   */
+  allHeaders(): Promise<{ [key: string]: string; }>;
+
+  /**
+   * Returns the buffer with response body.
+   */
+  body(): Promise<Buffer>;
+
+  /**
+   * Waits for this response to finish, returns always `null`.
+   */
+  finished(): Promise<null|Error>;
+
+  /**
+   * Returns the [Frame](https://playwright.dev/docs/api/class-frame) that initiated this response.
+   */
+  frame(): Frame;
+
+  /**
+   * Indicates whether this Response was fulfilled by a Service Worker's Fetch Handler (i.e. via
+   * [FetchEvent.respondWith](https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent/respondWith)).
+   */
+  fromServiceWorker(): boolean;
+
+  /**
+   * An object with the response HTTP headers. The header names are lower-cased. Note that this method does not return
+   * security-related headers, including cookie-related ones. You can use
+   * [response.allHeaders()](https://playwright.dev/docs/api/class-response#response-all-headers) for complete list of
+   * headers that include `cookie` information.
+   */
+  headers(): { [key: string]: string; };
+
+  /**
+   * An array with all the request HTTP headers associated with this response. Unlike
+   * [response.allHeaders()](https://playwright.dev/docs/api/class-response#response-all-headers), header names are NOT
+   * lower-cased. Headers with multiple entries, such as `Set-Cookie`, appear in the array multiple times.
+   */
+  headersArray(): Promise<Array<{
+    /**
+     * Name of the header.
+     */
+    name: string;
+
+    /**
+     * Value of the header.
+     */
+    value: string;
+  }>>;
+
+  /**
+   * Returns the value of the header matching the name. The name is case-insensitive. If multiple headers have the same
+   * name (except `set-cookie`), they are returned as a list separated by `, `. For `set-cookie`, the `\n` separator is
+   * used. If no headers are found, `null` is returned.
+   * @param name Name of the header.
+   */
+  headerValue(name: string): Promise<null|string>;
+
+  /**
+   * Returns all values of the headers matching the name, for example `set-cookie`. The name is case-insensitive.
+   * @param name Name of the header.
+   */
+  headerValues(name: string): Promise<Array<string>>;
+
+  /**
+   * Returns the JSON representation of response body.
+   *
+   * This method will throw if the response body is not parsable via `JSON.parse`.
+   */
+  json(): Promise<Serializable>;
+
+  /**
+   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
+   */
+  ok(): boolean;
+
+  /**
+   * Returns the matching [Request](https://playwright.dev/docs/api/class-request) object.
+   */
+  request(): Request;
+
+  /**
+   * Returns SSL and other security information.
+   */
+  securityDetails(): Promise<null|{
+    /**
+     * Common Name component of the Issuer field. from the certificate. This should only be used for informational
+     * purposes. Optional.
+     */
+    issuer?: string;
+
+    /**
+     * The specific TLS protocol used. (e.g. `TLS 1.3`). Optional.
+     */
+    protocol?: string;
+
+    /**
+     * Common Name component of the Subject field from the certificate. This should only be used for informational
+     * purposes. Optional.
+     */
+    subjectName?: string;
+
+    /**
+     * Unix timestamp (in seconds) specifying when this cert becomes valid. Optional.
+     */
+    validFrom?: number;
+
+    /**
+     * Unix timestamp (in seconds) specifying when this cert becomes invalid. Optional.
+     */
+    validTo?: number;
+  }>;
+
+  /**
+   * Returns the IP address and port of the server.
+   */
+  serverAddr(): Promise<null|{
+    /**
+     * IPv4 or IPV6 address of the server.
+     */
+    ipAddress: string;
+
+    port: number;
+  }>;
+
+  /**
+   * Contains the status code of the response (e.g., 200 for a success).
+   */
+  status(): number;
+
+  /**
+   * Contains the status text of the response (e.g. usually an "OK" for a success).
+   */
+  statusText(): string;
+
+  /**
+   * Returns the text representation of response body.
+   */
+  text(): Promise<string>;
+
+  /**
+   * Contains the URL of the response.
+   */
+  url(): string;
+}
+
+/**
+ * Whenever a network route is set up with
+ * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) or
+ * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route),
+ * the `Route` object allows to handle the route.
+ *
+ * Learn more about [networking](https://playwright.dev/docs/network).
+ */
+export interface Route {
+  /**
+   * Aborts the route's request.
+   * @param errorCode Optional error code. Defaults to `failed`, could be one of the following:
+   * - `'aborted'` - An operation was aborted (due to user action)
+   * - `'accessdenied'` - Permission to access a resource, other than the network, was denied
+   * - `'addressunreachable'` - The IP address is unreachable. This usually means that there is no route to the
+   * specified host or network.
+   * - `'blockedbyclient'` - The client chose to block the request.
+   * - `'blockedbyresponse'` - The request failed because the response was delivered along with requirements which are
+   * not met ('X-Frame-Options' and 'Content-Security-Policy' ancestor checks, for instance).
+   * - `'connectionaborted'` - A connection timed out as a result of not receiving an ACK for data sent.
+   * - `'connectionclosed'` - A connection was closed (corresponding to a TCP FIN).
+   * - `'connectionfailed'` - A connection attempt failed.
+   * - `'connectionrefused'` - A connection attempt was refused.
+   * - `'connectionreset'` - A connection was reset (corresponding to a TCP RST).
+   * - `'internetdisconnected'` - The Internet connection has been lost.
+   * - `'namenotresolved'` - The host name could not be resolved.
+   * - `'timedout'` - An operation timed out.
+   * - `'failed'` - A generic failure occurred.
+   */
+  abort(errorCode?: string): Promise<void>;
+
+  /**
+   * Sends route's request to the network with optional overrides.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.route('**\/*', async (route, request) => {
+   *   // Override headers
+   *   const headers = {
+   *     ...request.headers(),
+   *     foo: 'foo-value', // set "foo" header
+   *     bar: undefined, // remove "bar" header
+   *   };
+   *   await route.continue({ headers });
+   * });
+   * ```
+   *
+   * **Details**
+   *
+   * The [`headers`](https://playwright.dev/docs/api/class-route#route-continue-option-headers) option applies to both
+   * the routed request and any redirects it initiates. However,
+   * [`url`](https://playwright.dev/docs/api/class-route#route-continue-option-url),
+   * [`method`](https://playwright.dev/docs/api/class-route#route-continue-option-method), and
+   * [`postData`](https://playwright.dev/docs/api/class-route#route-continue-option-post-data) only apply to the
+   * original request and are not carried over to redirected requests.
+   *
+   * [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) will immediately send the
+   * request to the network, other matching handlers won't be invoked. Use
+   * [route.fallback([options])](https://playwright.dev/docs/api/class-route#route-fallback) If you want next matching
+   * handler in the chain to be invoked.
+   *
+   * **NOTE** The `Cookie` header cannot be overridden using this method. If a value is provided, it will be ignored,
+   * and the cookie will be loaded from the browser's cookie store. To set custom cookies, use
+   * [browserContext.addCookies(cookies)](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-cookies).
+   *
+   * @param options
+   */
+  continue(options?: {
+    /**
+     * If set changes the request HTTP headers. Header values will be converted to a string.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * If set changes the request method (e.g. GET or POST).
+     */
+    method?: string;
+
+    /**
+     * If set changes the post data of request.
+     */
+    postData?: string|Buffer|Serializable;
+
+    /**
+     * If set changes the request URL. New URL must have same protocol as original one.
+     */
+    url?: string;
+  }): Promise<void>;
+
+  /**
+   * Continues route's request with optional overrides. The method is similar to
+   * [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) with the difference that
+   * other matching handlers will be invoked before sending the request.
+   *
+   * **Usage**
+   *
+   * When several routes match the given pattern, they run in the order opposite to their registration. That way the
+   * last registered route can always override all the previous ones. In the example below, request will be handled by
+   * the bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
+   * registered route.
+   *
+   * ```js
+   * await page.route('**\/*', async route => {
+   *   // Runs last.
+   *   await route.abort();
+   * });
+   * await page.route('**\/*', async route => {
+   *   // Runs second.
+   *   await route.fallback();
+   * });
+   * await page.route('**\/*', async route => {
+   *   // Runs first.
+   *   await route.fallback();
+   * });
+   * ```
+   *
+   * Registering multiple routes is useful when you want separate handlers to handle different kinds of requests, for
+   * example API calls vs page resources or GET requests vs POST requests as in the example below.
+   *
+   * ```js
+   * // Handle GET requests.
+   * await page.route('**\/*', async route => {
+   *   if (route.request().method() !== 'GET') {
+   *     await route.fallback();
+   *     return;
+   *   }
+   *   // Handling GET only.
+   *   // ...
+   * });
+   *
+   * // Handle POST requests.
+   * await page.route('**\/*', async route => {
+   *   if (route.request().method() !== 'POST') {
+   *     await route.fallback();
+   *     return;
+   *   }
+   *   // Handling POST only.
+   *   // ...
+   * });
+   * ```
+   *
+   * One can also modify request while falling back to the subsequent handler, that way intermediate route handler can
+   * modify url, method, headers and postData of the request.
+   *
+   * ```js
+   * await page.route('**\/*', async (route, request) => {
+   *   // Override headers
+   *   const headers = {
+   *     ...request.headers(),
+   *     foo: 'foo-value', // set "foo" header
+   *     bar: undefined, // remove "bar" header
+   *   };
+   *   await route.fallback({ headers });
+   * });
+   * ```
+   *
+   * Use [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) to immediately send the
+   * request to the network, other matching handlers won't be invoked in that case.
+   * @param options
+   */
+  fallback(options?: {
+    /**
+     * If set changes the request HTTP headers. Header values will be converted to a string.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * If set changes the request method (e.g. GET or POST).
+     */
+    method?: string;
+
+    /**
+     * If set changes the post data of request.
+     */
+    postData?: string|Buffer|Serializable;
+
+    /**
+     * If set changes the request URL. New URL must have same protocol as original one. Changing the URL won't affect the
+     * route matching, all the routes are matched using the original request URL.
+     */
+    url?: string;
+  }): Promise<void>;
+
+  /**
+   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
+   * fulfilled.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.route('https://dog.ceo/api/breeds/list/all', async route => {
+   *   const response = await route.fetch();
+   *   const json = await response.json();
+   *   json.message['big_red_dog'] = [];
+   *   await route.fulfill({ response, json });
+   * });
+   * ```
+   *
+   * **Details**
+   *
+   * Note that [`headers`](https://playwright.dev/docs/api/class-route#route-fetch-option-headers) option will apply to
+   * the fetched request as well as any redirects initiated by it. If you want to only apply
+   * [`headers`](https://playwright.dev/docs/api/class-route#route-fetch-option-headers) to the original request, but
+   * not to redirects, look into [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue)
+   * instead.
+   * @param options
+   */
+  fetch(options?: {
+    /**
+     * If set changes the request HTTP headers. Header values will be converted to a string.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
+    /**
+     * If set changes the request method (e.g. GET or POST).
+     */
+    method?: string;
+
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    postData?: string|Buffer|Serializable;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+
+    /**
+     * If set changes the request URL. New URL must have same protocol as original one.
+     */
+    url?: string;
+  }): Promise<APIResponse>;
+
+  /**
+   * Fulfills route's request with given response.
+   *
+   * **Usage**
+   *
+   * An example of fulfilling all requests with 404 responses:
+   *
+   * ```js
+   * await page.route('**\/*', async route => {
+   *   await route.fulfill({
+   *     status: 404,
+   *     contentType: 'text/plain',
+   *     body: 'Not Found!'
+   *   });
+   * });
+   * ```
+   *
+   * An example of serving static file:
+   *
+   * ```js
+   * await page.route('**\/xhr_endpoint', route => route.fulfill({ path: 'mock_data.json' }));
+   * ```
+   *
+   * @param options
+   */
+  fulfill(options?: {
+    /**
+     * Response body.
+     */
+    body?: string|Buffer;
+
+    /**
+     * If set, equals to setting `Content-Type` response header.
+     */
+    contentType?: string;
+
+    /**
+     * Response headers. Header values will be converted to a string.
+     */
+    headers?: { [key: string]: string; };
+
+    /**
+     * JSON response. This method will set the content type to `application/json` if not set.
+     */
+    json?: Serializable;
+
+    /**
+     * File path to respond with. The content type will be inferred from file extension. If `path` is a relative path,
+     * then it is resolved relative to the current working directory.
+     */
+    path?: string;
+
+    /**
+     * [APIResponse](https://playwright.dev/docs/api/class-apiresponse) to fulfill route's request with. Individual fields
+     * of the response (such as headers) can be overridden using fulfill options.
+     */
+    response?: APIResponse;
+
+    /**
+     * Response status code, defaults to `200`.
+     */
+    status?: number;
+  }): Promise<void>;
+
+  /**
+   * A request to be routed.
+   */
+  request(): Request;
+}
+
+/**
+ * Selectors can be used to install custom selector engines. See [extensibility](https://playwright.dev/docs/extensibility) for more
+ * information.
+ */
+export interface Selectors {
+  /**
+   * Selectors must be registered before creating the page.
+   *
+   * **Usage**
+   *
+   * An example of registering selector engine that queries elements based on a tag name:
+   *
+   * ```js
+   * const { selectors, firefox } = require('@playwright/test');  // Or 'chromium' or 'webkit'.
+   *
+   * (async () => {
+   *   // Must be a function that evaluates to a selector engine instance.
+   *   const createTagNameEngine = () => ({
+   *     // Returns the first element matching given selector in the root's subtree.
+   *     query(root, selector) {
+   *       return root.querySelector(selector);
+   *     },
+   *
+   *     // Returns all elements matching given selector in the root's subtree.
+   *     queryAll(root, selector) {
+   *       return Array.from(root.querySelectorAll(selector));
+   *     }
+   *   });
+   *
+   *   // Register the engine. Selectors will be prefixed with "tag=".
+   *   await selectors.register('tag', createTagNameEngine);
+   *
+   *   const browser = await firefox.launch();
+   *   const page = await browser.newPage();
+   *   await page.setContent(`<div><button>Click me</button></div>`);
+   *
+   *   // Use the selector prefixed with its name.
+   *   const button = page.locator('tag=button');
+   *   // We can combine it with built-in locators.
+   *   await page.locator('tag=div').getByText('Click me').click();
+   *   // Can use it in any methods supporting selectors.
+   *   const buttonCount = await page.locator('tag=button').count();
+   *
+   *   await browser.close();
+   * })();
+   * ```
+   *
+   * @param name Name that is used in selectors as a prefix, e.g. `{name: 'foo'}` enables `foo=myselectorbody` selectors. May only
+   * contain `[a-zA-Z0-9_]` characters.
+   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * @param options
+   */
+  register(name: string, script: Function|string|{
+    /**
+     * Path to the JavaScript file. If `path` is a relative path, then it is resolved relative to the current working
+     * directory. Optional.
+     */
+    path?: string;
+
+    /**
+     * Raw script content. Optional.
+     */
+    content?: string;
+  }, options?: {
+    /**
+     * Whether to run this selector engine in isolated JavaScript environment. This environment has access to the same
+     * DOM, but not any JavaScript objects from the frame's scripts. Defaults to `false`. Note that running as a content
+     * script is not guaranteed when this engine is used together with other registered engines.
+     */
+    contentScript?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Defines custom attribute name to be used in
+   * [page.getByTestId(testId)](https://playwright.dev/docs/api/class-page#page-get-by-test-id). `data-testid` is used
+   * by default.
+   * @param attributeName Test id attribute name.
+   */
+  setTestIdAttribute(attributeName: string): void;
+}
+
+/**
+ * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on
+ * the touchscreen can only be used in browser contexts that have been initialized with `hasTouch` set to true.
+ *
+ * This class is limited to emulating tap gestures. For examples of other gestures simulated by manually dispatching
+ * touch events, see the [emulating legacy touch events](https://playwright.dev/docs/touch-events) page.
+ */
+export interface Touchscreen {
+  /**
+   * Dispatches a `touchstart` and `touchend` event with a single touch at the position
+   * ([`x`](https://playwright.dev/docs/api/class-touchscreen#touchscreen-tap-option-x),[`y`](https://playwright.dev/docs/api/class-touchscreen#touchscreen-tap-option-y)).
+   *
+   * **NOTE** [page.tap(selector[, options])](https://playwright.dev/docs/api/class-page#page-tap) the method will throw
+   * if [`hasTouch`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-has-touch) option of the
+   * browser context is false.
+   *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
+   */
+  tap(x: number, y: number): Promise<void>;
+}
+
+/**
+ * API for collecting and saving Playwright traces. Playwright traces can be opened in
+ * [Trace Viewer](https://playwright.dev/docs/trace-viewer) after Playwright script runs.
+ *
+ * **NOTE** You probably want to
+ * [enable tracing in your config file](https://playwright.dev/docs/api/class-testoptions#test-options-trace) instead
+ * of using `context.tracing`.
+ *
+ * The `context.tracing` API captures browser operations and network activity, but it doesn't record test assertions
+ * (like `expect` calls). We recommend
+ * [enabling tracing through Playwright Test configuration](https://playwright.dev/docs/api/class-testoptions#test-options-trace),
+ * which includes those assertions and provides a more complete trace for debugging test failures.
+ *
+ * Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
+ *
+ * ```js
+ * const browser = await chromium.launch();
+ * const context = await browser.newContext();
+ * await context.tracing.start({ screenshots: true, snapshots: true });
+ * const page = await context.newPage();
+ * await page.goto('https://playwright.dev');
+ * expect(page.url()).toBe('https://playwright.dev');
+ * await context.tracing.stop({ path: 'trace.zip' });
+ * ```
+ *
+ */
+export interface Tracing {
+  /**
+   * **NOTE** Use `test.step` instead when available.
+   *
+   * Creates a new group within the trace, assigning any subsequent API calls to this group, until
+   * [tracing.groupEnd()](https://playwright.dev/docs/api/class-tracing#tracing-group-end) is called. Groups can be
+   * nested and will be visible in the trace viewer.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // use test.step instead
+   * await test.step('Log in', async () => {
+   *   // ...
+   * });
+   * ```
+   *
+   * @param name Group name shown in the trace viewer.
+   * @param options
+   */
+  group(name: string, options?: {
+    /**
+     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the
+     * [tracing.group(name[, options])](https://playwright.dev/docs/api/class-tracing#tracing-group) call.
+     */
+    location?: {
+      file: string;
+
+      line?: number;
+
+      column?: number;
+    };
+  }): Promise<void>;
+
+  /**
+   * Closes the last group created by
+   * [tracing.group(name[, options])](https://playwright.dev/docs/api/class-tracing#tracing-group).
+   */
+  groupEnd(): Promise<void>;
+
+  /**
+   * Start tracing.
+   *
+   * **NOTE** You probably want to
+   * [enable tracing in your config file](https://playwright.dev/docs/api/class-testoptions#test-options-trace) instead
+   * of using `Tracing.start`.
+   *
+   * The `context.tracing` API captures browser operations and network activity, but it doesn't record test assertions
+   * (like `expect` calls). We recommend
+   * [enabling tracing through Playwright Test configuration](https://playwright.dev/docs/api/class-testoptions#test-options-trace),
+   * which includes those assertions and provides a more complete trace for debugging test failures.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await context.tracing.start({ screenshots: true, snapshots: true });
+   * const page = await context.newPage();
+   * await page.goto('https://playwright.dev');
+   * expect(page.url()).toBe('https://playwright.dev');
+   * await context.tracing.stop({ path: 'trace.zip' });
+   * ```
+   *
+   * @param options
+   */
+  start(options?: {
+    /**
+     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the
+     * [`tracesDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-traces-dir) directory
+     * specified in
+     * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). To specify
+     * the final trace zip file name, you need to pass `path` option to
+     * [tracing.stop([options])](https://playwright.dev/docs/api/class-tracing#tracing-stop) instead.
+     */
+    name?: string;
+
+    /**
+     * Whether to capture screenshots during tracing. Screenshots are used to build a timeline preview.
+     */
+    screenshots?: boolean;
+
+    /**
+     * If this option is true tracing will
+     * - capture DOM snapshot on every action
+     * - record network activity
+     */
+    snapshots?: boolean;
+
+    /**
+     * Whether to include source files for trace actions.
+     */
+    sources?: boolean;
+
+    /**
+     * Trace name to be shown in the Trace Viewer.
+     */
+    title?: string;
+  }): Promise<void>;
+
+  /**
+   * Start a new trace chunk. If you'd like to record multiple traces on the same
+   * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext), use
+   * [tracing.start([options])](https://playwright.dev/docs/api/class-tracing#tracing-start) once, and then create
+   * multiple trace chunks with
+   * [tracing.startChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-start-chunk) and
+   * [tracing.stopChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-stop-chunk).
+   *
+   * **Usage**
+   *
+   * ```js
+   * await context.tracing.start({ screenshots: true, snapshots: true });
+   * const page = await context.newPage();
+   * await page.goto('https://playwright.dev');
+   *
+   * await context.tracing.startChunk();
+   * await page.getByText('Get Started').click();
+   * // Everything between startChunk and stopChunk will be recorded in the trace.
+   * await context.tracing.stopChunk({ path: 'trace1.zip' });
+   *
+   * await context.tracing.startChunk();
+   * await page.goto('http://example.com');
+   * // Save a second trace file with different actions.
+   * await context.tracing.stopChunk({ path: 'trace2.zip' });
+   * ```
+   *
+   * @param options
+   */
+  startChunk(options?: {
+    /**
+     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the
+     * [`tracesDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-traces-dir) directory
+     * specified in
+     * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). To specify
+     * the final trace zip file name, you need to pass `path` option to
+     * [tracing.stopChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-stop-chunk) instead.
+     */
+    name?: string;
+
+    /**
+     * Trace name to be shown in the Trace Viewer.
+     */
+    title?: string;
+  }): Promise<void>;
+
+  /**
+   * Stop tracing.
+   * @param options
+   */
+  stop(options?: {
+    /**
+     * Export trace into the file with the given path.
+     */
+    path?: string;
+  }): Promise<void>;
+
+  /**
+   * Stop the trace chunk. See
+   * [tracing.startChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-start-chunk) for more details
+   * about multiple trace chunks.
+   * @param options
+   */
+  stopChunk(options?: {
+    /**
+     * Export trace collected since the last
+     * [tracing.startChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-start-chunk) call into the
+     * file with the given path.
+     */
+    path?: string;
+  }): Promise<void>;
+}
+
+/**
+ * When browser context is created with the `recordVideo` option, each page has a video object associated with it.
+ *
+ * ```js
+ * console.log(await page.video().path());
+ * ```
+ *
+ */
+export interface Video {
+  /**
+   * Deletes the video file. Will wait for the video to finish if necessary.
+   */
+  delete(): Promise<void>;
+
+  /**
+   * Returns the file system path this video will be recorded to. The video is guaranteed to be written to the
+   * filesystem upon closing the browser context. This method throws when connected remotely.
+   */
+  path(): Promise<string>;
+
+  /**
+   * Saves the video to a user-specified path. It is safe to call this method while the video is still in progress, or
+   * after the page has closed. This method waits until the page is closed and the video is fully saved.
+   * @param path Path where the video should be saved.
+   */
+  saveAs(path: string): Promise<void>;
+}
+
+/**
+ * [WebError](https://playwright.dev/docs/api/class-weberror) class represents an unhandled exception thrown in the
+ * page. It is dispatched via the
+ * [browserContext.on('weberror')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-web-error)
+ * event.
+ *
+ * ```js
+ * // Log all uncaught errors to the terminal
+ * context.on('weberror', webError => {
+ *   console.log(`Uncaught exception: "${webError.error()}"`);
+ * });
+ *
+ * // Navigate to a page with an exception.
+ * await page.goto('data:text/html,<script>throw new Error("Test")</script>');
+ * ```
+ *
+ */
+export interface WebError {
+  /**
+   * Unhandled error that was thrown.
+   */
+  error(): Error;
+
+  /**
+   * The page that produced this unhandled exception, if any.
+   */
+  page(): null|Page;
+}
+
+/**
+ * The [WebSocket](https://playwright.dev/docs/api/class-websocket) class represents WebSocket connections within a
+ * page. It provides the ability to inspect and manipulate the data being transmitted and received.
+ *
+ * If you want to intercept or modify WebSocket frames, consider using
+ * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute).
+ */
+export interface WebSocket {
+  /**
+   * Fired when the websocket closes.
+   */
+  on(event: 'close', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Fired when the websocket receives a frame.
+   */
+  on(event: 'framereceived', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Fired when the websocket sends a frame.
+   */
+  on(event: 'framesent', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Fired when the websocket has an error.
+   */
+  on(event: 'socketerror', listener: (string: string) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'framereceived', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'framesent', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'socketerror', listener: (string: string) => any): this;
+
+  /**
+   * Fired when the websocket closes.
+   */
+  addListener(event: 'close', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Fired when the websocket receives a frame.
+   */
+  addListener(event: 'framereceived', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Fired when the websocket sends a frame.
+   */
+  addListener(event: 'framesent', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Fired when the websocket has an error.
+   */
+  addListener(event: 'socketerror', listener: (string: string) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'framereceived', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'framesent', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'socketerror', listener: (string: string) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'framereceived', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'framesent', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'socketerror', listener: (string: string) => any): this;
+
+  /**
+   * Fired when the websocket closes.
+   */
+  prependListener(event: 'close', listener: (webSocket: WebSocket) => any): this;
+
+  /**
+   * Fired when the websocket receives a frame.
+   */
+  prependListener(event: 'framereceived', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Fired when the websocket sends a frame.
+   */
+  prependListener(event: 'framesent', listener: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => any): this;
+
+  /**
+   * Fired when the websocket has an error.
+   */
+  prependListener(event: 'socketerror', listener: (string: string) => any): this;
+
+  /**
+   * Indicates that the web socket has been closed.
+   */
+  isClosed(): boolean;
+
+  /**
+   * Contains the URL of the WebSocket.
+   */
+  url(): string;
+
+  /**
+   * Fired when the websocket closes.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: (webSocket: WebSocket) => boolean | Promise<boolean>, timeout?: number } | ((webSocket: WebSocket) => boolean | Promise<boolean>)): Promise<WebSocket>;
+
+  /**
+   * Fired when the websocket receives a frame.
+   */
+  waitForEvent(event: 'framereceived', optionsOrPredicate?: { predicate?: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => boolean | Promise<boolean>, timeout?: number } | ((data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => boolean | Promise<boolean>)): Promise<{
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }>;
+
+  /**
+   * Fired when the websocket sends a frame.
+   */
+  waitForEvent(event: 'framesent', optionsOrPredicate?: { predicate?: (data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => boolean | Promise<boolean>, timeout?: number } | ((data: {
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }) => boolean | Promise<boolean>)): Promise<{
+    /**
+     * frame payload
+     */
+    payload: string|Buffer;
+  }>;
+
+  /**
+   * Fired when the websocket has an error.
+   */
+  waitForEvent(event: 'socketerror', optionsOrPredicate?: { predicate?: (string: string) => boolean | Promise<boolean>, timeout?: number } | ((string: string) => boolean | Promise<boolean>)): Promise<string>;
+
+}
+
+interface AccessibilitySnapshotOptions {
+  /**
+   * Prune uninteresting nodes from the tree. Defaults to `true`.
+   */
+  interestingOnly?: boolean;
+
+  /**
+   * The root DOM element for the snapshot. Defaults to the whole page.
+   */
+  root?: ElementHandle;
+}
+
+export interface LaunchOptions {
+  /**
+   * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+   *
+   * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+   * [here](https://peter.sh/experiments/chromium-command-line-switches/).
+   */
+  args?: Array<string>;
+
+  /**
+   * Browser distribution channel.
+   *
+   * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
+   *
+   * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+   * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+   */
+  channel?: string;
+
+  /**
+   * Enable Chromium sandboxing. Defaults to `false`.
+   */
+  chromiumSandbox?: boolean;
+
+  /**
+   * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
+   * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-headless) option will be
+   * set `false`.
+   * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
+   */
+  devtools?: boolean;
+
+  /**
+   * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
+   * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
+   * created in is closed.
+   */
+  downloadsPath?: string;
+
+  /**
+   * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
+   */
+  env?: { [key: string]: string|number|boolean; };
+
+  /**
+   * Path to a browser executable to run instead of the bundled one. If
+   * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-executable-path) is
+   * a relative path, then it is resolved relative to the current working directory. Note that Playwright only works
+   * with the bundled Chromium, Firefox or WebKit, use at your own risk.
+   */
+  executablePath?: string;
+
+  /**
+   * Firefox user preferences. Learn more about the Firefox user preferences at
+   * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
+   *
+   * You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via
+   * `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
+   */
+  firefoxUserPrefs?: { [key: string]: string|number|boolean; };
+
+  /**
+   * Close the browser process on SIGHUP. Defaults to `true`.
+   */
+  handleSIGHUP?: boolean;
+
+  /**
+   * Close the browser process on Ctrl-C. Defaults to `true`.
+   */
+  handleSIGINT?: boolean;
+
+  /**
+   * Close the browser process on SIGTERM. Defaults to `true`.
+   */
+  handleSIGTERM?: boolean;
+
+  /**
+   * Whether to run browser in headless mode. More details for
+   * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
+   * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+   * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+   * `true`.
+   */
+  headless?: boolean;
+
+  /**
+   * If `true`, Playwright does not pass its own configurations args and only uses the ones from
+   * [`args`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-args). If an array is given,
+   * then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
+   */
+  ignoreDefaultArgs?: boolean|Array<string>;
+
+  /**
+   * Logger sink for Playwright logging.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+   */
+  logger?: Logger;
+
+  /**
+   * Network proxy settings.
+   */
+  proxy?: {
+    /**
+     * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+     * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+     */
+    server: string;
+
+    /**
+     * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+     */
+    bypass?: string;
+
+    /**
+     * Optional username to use if HTTP proxy requires authentication.
+     */
+    username?: string;
+
+    /**
+     * Optional password to use if HTTP proxy requires authentication.
+     */
+    password?: string;
+  };
+
+  /**
+   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+   * on.
+   */
+  slowMo?: number;
+
+  /**
+   * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
+   * to disable timeout.
+   */
+  timeout?: number;
+
+  /**
+   * If specified, traces are saved into this directory.
+   */
+  tracesDir?: string;
+}
+
+export interface ConnectOverCDPOptions {
+  /**
+   * @deprecated Use the first argument instead.
+   */
+  endpointURL?: string;
+
+  /**
+   * Additional HTTP headers to be sent with connect request. Optional.
+   */
+  headers?: { [key: string]: string; };
+
+  /**
+   * Logger sink for Playwright logging. Optional.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+   */
+  logger?: Logger;
+
+  /**
+   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+   * on. Defaults to 0.
+   */
+  slowMo?: number;
+
+  /**
+   * Maximum time in milliseconds to wait for the connection to be established. Defaults to `30000` (30 seconds). Pass
+   * `0` to disable timeout.
+   */
+  timeout?: number;
+}
+
+export interface ConnectOptions {
+  /**
+   * This option exposes network available on the connecting client to the browser being connected to. Consists of a
+   * list of rules separated by comma.
+   *
+   * Available rules:
+   * 1. Hostname pattern, for example: `example.com`, `*.org:99`, `x.*.y.com`, `*foo.org`.
+   * 1. IP literal, for example: `127.0.0.1`, `0.0.0.0:99`, `[::1]`, `[0:0::1]:99`.
+   * 1. `<loopback>` that matches local loopback interfaces: `localhost`, `*.localhost`, `127.0.0.1`, `[::1]`.
+   *
+   * Some common examples:
+   * 1. `"*"` to expose all network.
+   * 1. `"<loopback>"` to expose localhost network.
+   * 1. `"*.test.internal-domain,*.staging.internal-domain,<loopback>"` to expose test/staging deployments and
+   *    localhost.
+   */
+  exposeNetwork?: string;
+
+  /**
+   * Additional HTTP headers to be sent with web socket connect request. Optional.
+   */
+  headers?: { [key: string]: string; };
+
+  /**
+   * Logger sink for Playwright logging. Optional.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+   */
+  logger?: Logger;
+
+  /**
+   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+   * on. Defaults to 0.
+   */
+  slowMo?: number;
+
+  /**
+   * Maximum time in milliseconds to wait for the connection to be established. Defaults to `0` (no timeout).
+   */
+  timeout?: number;
+}
+
+export interface LocatorScreenshotOptions {
+  /**
+   * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
+   * treatment depending on their duration:
+   * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
+   * - infinite animations are canceled to initial state, and then played over after the screenshot.
+   *
+   * Defaults to `"allow"` that leaves animations untouched.
+   */
+  animations?: "disabled"|"allow";
+
+  /**
+   * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
+   * changed.  Defaults to `"hide"`.
+   */
+  caret?: "hide"|"initial";
+
+  /**
+   * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
+   * box `#FF00FF` (customized by
+   * [`maskColor`](https://playwright.dev/docs/api/class-locator#locator-screenshot-option-mask-color)) that completely
+   * covers its bounding box. The mask is also applied to invisible elements, see
+   * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
+   */
+  mask?: Array<Locator>;
+
+  /**
+   * Specify the color of the overlay box for masked elements, in
+   * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
+   */
+  maskColor?: string;
+
+  /**
+   * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
+   * Defaults to `false`.
+   */
+  omitBackground?: boolean;
+
+  /**
+   * The file path to save the image to. The screenshot type will be inferred from file extension. If
+   * [`path`](https://playwright.dev/docs/api/class-locator#locator-screenshot-option-path) is a relative path, then it
+   * is resolved relative to the current working directory. If no path is provided, the image won't be saved to the
+   * disk.
+   */
+  path?: string;
+
+  /**
+   * The quality of the image, between 0-100. Not applicable to `png` images.
+   */
+  quality?: number;
+
+  /**
+   * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
+   * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
+   * screenshots of high-dpi devices will be twice as large or even larger.
+   *
+   * Defaults to `"device"`.
+   */
+  scale?: "css"|"device";
+
+  /**
+   * Text of the stylesheet to apply while making the screenshot. This is where you can hide dynamic elements, make
+   * elements invisible or change their properties to help you creating repeatable screenshots. This stylesheet pierces
+   * the Shadow DOM and applies to the inner frames.
+   */
+  style?: string;
+
+  /**
+   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+   * option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   */
+  timeout?: number;
+
+  /**
+   * Specify screenshot type, defaults to `png`.
+   */
+  type?: "png"|"jpeg";
+}
+
+interface ElementHandleWaitForSelectorOptions {
+  /**
+   * Defaults to `'visible'`. Can be either:
+   * - `'attached'` - wait for element to be present in DOM.
+   * - `'detached'` - wait for element to not be present in DOM.
+   * - `'visible'` - wait for element to have non-empty bounding box and no `visibility:hidden`. Note that element
+   *   without any content or with `display:none` has an empty bounding box and is not considered visible.
+   * - `'hidden'` - wait for element to be either detached from DOM, or have an empty bounding box or
+   *   `visibility:hidden`. This is opposite to the `'visible'` option.
+   */
+  state?: "attached"|"detached"|"visible"|"hidden";
+
+  /**
+   * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+   * element, the call throws an exception.
+   */
+  strict?: boolean;
+
+  /**
+   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+   * option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   */
+  timeout?: number;
+}
+
+export interface BrowserContextOptions {
+  /**
+   * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+   */
+  acceptDownloads?: boolean;
+
+  /**
+   * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+   * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+   * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+   * or
+   * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+   * it takes the base URL in consideration by using the
+   * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+   * Unset by default. Examples:
+   * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+   * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+   *   `http://localhost:3000/foo/bar.html`
+   * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+   *   `http://localhost:3000/bar.html`
+   */
+  baseURL?: string;
+
+  /**
+   * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+   */
+  bypassCSP?: boolean;
+
+  /**
+   * TLS Client Authentication allows the server to request a client certificate and verify it.
+   *
+   * **Details**
+   *
+   * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+   * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+   * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+   * with an exact match to the request origin that the certificate is valid for.
+   *
+   * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+   * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+   * does not match any of the domains you plan to visit.
+   *
+   * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+   * work by replacing `localhost` with `local.playwright`.
+   *
+   */
+  clientCertificates?: Array<{
+    /**
+     * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+     */
+    origin: string;
+
+    /**
+     * Path to the file with the certificate in PEM format.
+     */
+    certPath?: string;
+
+    /**
+     * Direct value of the certificate in PEM format.
+     */
+    cert?: Buffer;
+
+    /**
+     * Path to the file with the private key in PEM format.
+     */
+    keyPath?: string;
+
+    /**
+     * Direct value of the private key in PEM format.
+     */
+    key?: Buffer;
+
+    /**
+     * Path to the PFX or PKCS12 encoded private key and certificate chain.
+     */
+    pfxPath?: string;
+
+    /**
+     * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+     */
+    pfx?: Buffer;
+
+    /**
+     * Passphrase for the private key (PEM or PFX).
+     */
+    passphrase?: string;
+  }>;
+
+  /**
+   * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+   * media feature, supported values are `'light'` and `'dark'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+   */
+  colorScheme?: null|"light"|"dark"|"no-preference";
+
+  /**
+   * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+   */
+  contrast?: null|"no-preference"|"more";
+
+  /**
+   * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+   * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+   */
+  deviceScaleFactor?: number;
+
+  /**
+   * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+   */
+  extraHTTPHeaders?: { [key: string]: string; };
+
+  /**
+   * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+   */
+  forcedColors?: null|"active"|"none";
+
+  geolocation?: Geolocation;
+
+  /**
+   * Specifies if viewport supports touch events. Defaults to false. Learn more about
+   * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+   */
+  hasTouch?: boolean;
+
+  /**
+   * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+   * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+   */
+  httpCredentials?: HTTPCredentials;
+
+  /**
+   * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+   */
+  ignoreHTTPSErrors?: boolean;
+
+  /**
+   * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+   * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+   * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+   */
+  isMobile?: boolean;
+
+  /**
+   * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+   * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+   */
+  javaScriptEnabled?: boolean;
+
+  /**
+   * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+   * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+   * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+   */
+  locale?: string;
+
+  /**
+   * Logger sink for Playwright logging.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+   */
+  logger?: Logger;
+
+  /**
+   * Whether to emulate network being offline. Defaults to `false`. Learn more about
+   * [network emulation](https://playwright.dev/docs/emulation#offline).
+   */
+  offline?: boolean;
+
+  /**
+   * A list of permissions to grant to all pages in this context. See
+   * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+   * for more details. Defaults to none.
+   */
+  permissions?: Array<string>;
+
+  /**
+   * Network proxy settings to use with this context. Defaults to none.
+   */
+  proxy?: {
+    /**
+     * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+     * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+     */
+    server: string;
+
+    /**
+     * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+     */
+    bypass?: string;
+
+    /**
+     * Optional username to use if HTTP proxy requires authentication.
+     */
+    username?: string;
+
+    /**
+     * Optional password to use if HTTP proxy requires authentication.
+     */
+    password?: string;
+  };
+
+  /**
+   * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+   * If not specified, the HAR is not recorded. Make sure to await
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+   * the HAR to be saved.
+   */
+  recordHar?: {
+    /**
+     * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+     * `content` policy instead.
+     */
+    omitContent?: boolean;
+
+    /**
+     * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+     * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+     * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+     * files and to `embed` for all other file extensions.
+     */
+    content?: "omit"|"embed"|"attach";
+
+    /**
+     * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+     * default.
+     */
+    path: string;
+
+    /**
+     * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+     */
+    mode?: "full"|"minimal";
+
+    /**
+     * A glob or regex pattern to filter requests that are stored in the HAR. When a
+     * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+     * options was provided and the passed URL is a path, it gets merged via the
+     * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+     */
+    urlFilter?: string|RegExp;
+  };
+
+  /**
+   * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+   * Make sure to await
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+   * videos to be saved.
+   */
+  recordVideo?: {
+    /**
+     * Path to the directory to put videos into.
+     */
+    dir: string;
+
+    /**
+     * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+     * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+     * each page will be scaled down if necessary to fit the specified size.
+     */
+    size?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+  };
+
+  /**
+   * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+   */
+  reducedMotion?: null|"reduce"|"no-preference";
+
+  /**
+   * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+   * [`viewport`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-viewport) is set.
+   */
+  screen?: {
+    /**
+     * page width in pixels.
+     */
+    width: number;
+
+    /**
+     * page height in pixels.
+     */
+    height: number;
+  };
+
+  /**
+   * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+   * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+   *   registered.
+   * - `'block'`: Playwright will block all registration of Service Workers.
+   */
+  serviceWorkers?: "allow"|"block";
+
+  /**
+   * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
+   *
+   * Populates context with given storage state. This option can be used to initialize context with logged-in
+   * information obtained via
+   * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
+   */
+  storageState?: string|{
+    /**
+     * Cookies to set for context
+     */
+    cookies: Array<{
+      name: string;
+
+      value: string;
+
+      /**
+       * Domain and path are required. For the cookie to apply to all subdomains as well, prefix domain with a dot, like
+       * this: ".example.com"
+       */
+      domain: string;
+
+      /**
+       * Domain and path are required
+       */
+      path: string;
+
+      /**
+       * Unix time in seconds.
+       */
+      expires: number;
+
+      httpOnly: boolean;
+
+      secure: boolean;
+
+      /**
+       * sameSite flag
+       */
+      sameSite: "Strict"|"Lax"|"None";
+    }>;
+
+    origins: Array<{
+      origin: string;
+
+      /**
+       * localStorage to set for context
+       */
+      localStorage: Array<{
+        name: string;
+
+        value: string;
+      }>;
+    }>;
+  };
+
+  /**
+   * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+   * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+   * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+   * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
+   */
+  strictSelectors?: boolean;
+
+  /**
+   * Changes the timezone of the context. See
+   * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+   * for a list of supported timezone IDs. Defaults to the system timezone.
+   */
+  timezoneId?: string;
+
+  /**
+   * Specific user agent to use in this context.
+   */
+  userAgent?: string;
+
+  /**
+   * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.
+   */
+  videoSize?: {
+    /**
+     * Video frame width.
+     */
+    width: number;
+
+    /**
+     * Video frame height.
+     */
+    height: number;
+  };
+
+  /**
+   * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.
+   */
+  videosPath?: string;
+
+  /**
+   * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+   * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+   *
+   * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+   * by the operating system. It makes the execution of the tests non-deterministic.
+   *
+   */
+  viewport?: null|ViewportSize;
+}
+
+export interface ViewportSize {
+  /**
+   * page width in pixels.
+   */
+  width: number;
+
+  /**
+   * page height in pixels.
+   */
+  height: number;
+}
+
+export interface HTTPCredentials {
+  username: string;
+
+  password: string;
+
+  /**
+   * Restrain sending http credentials on specific origin (scheme://host:port).
+   */
+  origin?: string;
+
+  /**
+   * This option only applies to the requests sent from corresponding
+   * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+   * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+   * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+   * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+   */
+  send?: "unauthorized"|"always";
+}
+
+export interface Geolocation {
+  /**
+   * Latitude between -90 and 90.
+   */
+  latitude: number;
+
+  /**
+   * Longitude between -180 and 180.
+   */
+  longitude: number;
+
+  /**
+   * Non-negative accuracy value. Defaults to `0`.
+   */
+  accuracy?: number;
+}
+
+export interface Cookie {
+  name: string;
+
+  value: string;
+
+  domain: string;
+
+  path: string;
+
+  /**
+   * Unix time in seconds.
+   */
+  expires: number;
+
+  httpOnly: boolean;
+
+  secure: boolean;
+
+  sameSite: "Strict"|"Lax"|"None";
+
+  partitionKey?: string;
+}
+
+interface PageWaitForSelectorOptions {
+  /**
+   * Defaults to `'visible'`. Can be either:
+   * - `'attached'` - wait for element to be present in DOM.
+   * - `'detached'` - wait for element to not be present in DOM.
+   * - `'visible'` - wait for element to have non-empty bounding box and no `visibility:hidden`. Note that element
+   *   without any content or with `display:none` has an empty bounding box and is not considered visible.
+   * - `'hidden'` - wait for element to be either detached from DOM, or have an empty bounding box or
+   *   `visibility:hidden`. This is opposite to the `'visible'` option.
+   */
+  state?: "attached"|"detached"|"visible"|"hidden";
+
+  /**
+   * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+   * element, the call throws an exception.
+   */
+  strict?: boolean;
+
+  /**
+   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+   * option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   */
+  timeout?: number;
+}
+
+interface PageWaitForFunctionOptions {
+  /**
+   * If [`polling`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-polling) is `'raf'`, then
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression) is constantly
+   * executed in `requestAnimationFrame` callback. If
+   * [`polling`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-polling) is a number, then it
+   * is treated as an interval in milliseconds at which the function would be executed. Defaults to `raf`.
+   */
+  polling?: number|"raf";
+
+  /**
+   * Maximum time to wait for in milliseconds. Defaults to `0` - no timeout. The default value can be changed via
+   * `actionTimeout` option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   */
+  timeout?: number;
+}
+
+export interface PageScreenshotOptions {
+  /**
+   * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
+   * treatment depending on their duration:
+   * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
+   * - infinite animations are canceled to initial state, and then played over after the screenshot.
+   *
+   * Defaults to `"allow"` that leaves animations untouched.
+   */
+  animations?: "disabled"|"allow";
+
+  /**
+   * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
+   * changed.  Defaults to `"hide"`.
+   */
+  caret?: "hide"|"initial";
+
+  /**
+   * An object which specifies clipping of the resulting image.
+   */
+  clip?: {
+    /**
+     * x-coordinate of top-left corner of clip area
+     */
+    x: number;
+
+    /**
+     * y-coordinate of top-left corner of clip area
+     */
+    y: number;
+
+    /**
+     * width of clipping area
+     */
+    width: number;
+
+    /**
+     * height of clipping area
+     */
+    height: number;
+  };
+
+  /**
+   * When true, takes a screenshot of the full scrollable page, instead of the currently visible viewport. Defaults to
+   * `false`.
+   */
+  fullPage?: boolean;
+
+  /**
+   * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
+   * box `#FF00FF` (customized by
+   * [`maskColor`](https://playwright.dev/docs/api/class-page#page-screenshot-option-mask-color)) that completely covers
+   * its bounding box. The mask is also applied to invisible elements, see
+   * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
+   */
+  mask?: Array<Locator>;
+
+  /**
+   * Specify the color of the overlay box for masked elements, in
+   * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
+   */
+  maskColor?: string;
+
+  /**
+   * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
+   * Defaults to `false`.
+   */
+  omitBackground?: boolean;
+
+  /**
+   * The file path to save the image to. The screenshot type will be inferred from file extension. If
+   * [`path`](https://playwright.dev/docs/api/class-page#page-screenshot-option-path) is a relative path, then it is
+   * resolved relative to the current working directory. If no path is provided, the image won't be saved to the disk.
+   */
+  path?: string;
+
+  /**
+   * The quality of the image, between 0-100. Not applicable to `png` images.
+   */
+  quality?: number;
+
+  /**
+   * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
+   * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
+   * screenshots of high-dpi devices will be twice as large or even larger.
+   *
+   * Defaults to `"device"`.
+   */
+  scale?: "css"|"device";
+
+  /**
+   * Text of the stylesheet to apply while making the screenshot. This is where you can hide dynamic elements, make
+   * elements invisible or change their properties to help you creating repeatable screenshots. This stylesheet pierces
+   * the Shadow DOM and applies to the inner frames.
+   */
+  style?: string;
+
+  /**
+   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+   * option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   */
+  timeout?: number;
+
+  /**
+   * Specify screenshot type, defaults to `png`.
+   */
+  type?: "png"|"jpeg";
+}
+
+type Devices = {
+  "Blackberry PlayBook": DeviceDescriptor;
+  "Blackberry PlayBook landscape": DeviceDescriptor;
+  "BlackBerry Z30": DeviceDescriptor;
+  "BlackBerry Z30 landscape": DeviceDescriptor;
+  "Galaxy Note 3": DeviceDescriptor;
+  "Galaxy Note 3 landscape": DeviceDescriptor;
+  "Galaxy Note II": DeviceDescriptor;
+  "Galaxy Note II landscape": DeviceDescriptor;
+  "Galaxy S III": DeviceDescriptor;
+  "Galaxy S III landscape": DeviceDescriptor;
+  "Galaxy S5": DeviceDescriptor;
+  "Galaxy S5 landscape": DeviceDescriptor;
+  "Galaxy S8": DeviceDescriptor;
+  "Galaxy S8 landscape": DeviceDescriptor;
+  "Galaxy S9+": DeviceDescriptor;
+  "Galaxy S9+ landscape": DeviceDescriptor;
+  "Galaxy S24": DeviceDescriptor;
+  "Galaxy S24 landscape": DeviceDescriptor;
+  "Galaxy A55": DeviceDescriptor;
+  "Galaxy A55 landscape": DeviceDescriptor;
+  "Galaxy Tab S4": DeviceDescriptor;
+  "Galaxy Tab S4 landscape": DeviceDescriptor;
+  "Galaxy Tab S9": DeviceDescriptor;
+  "Galaxy Tab S9 landscape": DeviceDescriptor;
+  "iPad (gen 5)": DeviceDescriptor;
+  "iPad (gen 5) landscape": DeviceDescriptor;
+  "iPad (gen 6)": DeviceDescriptor;
+  "iPad (gen 6) landscape": DeviceDescriptor;
+  "iPad (gen 7)": DeviceDescriptor;
+  "iPad (gen 7) landscape": DeviceDescriptor;
+  "iPad (gen 11)": DeviceDescriptor;
+  "iPad (gen 11) landscape": DeviceDescriptor;
+  "iPad Mini": DeviceDescriptor;
+  "iPad Mini landscape": DeviceDescriptor;
+  "iPad Pro 11": DeviceDescriptor;
+  "iPad Pro 11 landscape": DeviceDescriptor;
+  "iPhone 6": DeviceDescriptor;
+  "iPhone 6 landscape": DeviceDescriptor;
+  "iPhone 6 Plus": DeviceDescriptor;
+  "iPhone 6 Plus landscape": DeviceDescriptor;
+  "iPhone 7": DeviceDescriptor;
+  "iPhone 7 landscape": DeviceDescriptor;
+  "iPhone 7 Plus": DeviceDescriptor;
+  "iPhone 7 Plus landscape": DeviceDescriptor;
+  "iPhone 8": DeviceDescriptor;
+  "iPhone 8 landscape": DeviceDescriptor;
+  "iPhone 8 Plus": DeviceDescriptor;
+  "iPhone 8 Plus landscape": DeviceDescriptor;
+  "iPhone SE": DeviceDescriptor;
+  "iPhone SE landscape": DeviceDescriptor;
+  "iPhone SE (3rd gen)": DeviceDescriptor;
+  "iPhone SE (3rd gen) landscape": DeviceDescriptor;
+  "iPhone X": DeviceDescriptor;
+  "iPhone X landscape": DeviceDescriptor;
+  "iPhone XR": DeviceDescriptor;
+  "iPhone XR landscape": DeviceDescriptor;
+  "iPhone 11": DeviceDescriptor;
+  "iPhone 11 landscape": DeviceDescriptor;
+  "iPhone 11 Pro": DeviceDescriptor;
+  "iPhone 11 Pro landscape": DeviceDescriptor;
+  "iPhone 11 Pro Max": DeviceDescriptor;
+  "iPhone 11 Pro Max landscape": DeviceDescriptor;
+  "iPhone 12": DeviceDescriptor;
+  "iPhone 12 landscape": DeviceDescriptor;
+  "iPhone 12 Pro": DeviceDescriptor;
+  "iPhone 12 Pro landscape": DeviceDescriptor;
+  "iPhone 12 Pro Max": DeviceDescriptor;
+  "iPhone 12 Pro Max landscape": DeviceDescriptor;
+  "iPhone 12 Mini": DeviceDescriptor;
+  "iPhone 12 Mini landscape": DeviceDescriptor;
+  "iPhone 13": DeviceDescriptor;
+  "iPhone 13 landscape": DeviceDescriptor;
+  "iPhone 13 Pro": DeviceDescriptor;
+  "iPhone 13 Pro landscape": DeviceDescriptor;
+  "iPhone 13 Pro Max": DeviceDescriptor;
+  "iPhone 13 Pro Max landscape": DeviceDescriptor;
+  "iPhone 13 Mini": DeviceDescriptor;
+  "iPhone 13 Mini landscape": DeviceDescriptor;
+  "iPhone 14": DeviceDescriptor;
+  "iPhone 14 landscape": DeviceDescriptor;
+  "iPhone 14 Plus": DeviceDescriptor;
+  "iPhone 14 Plus landscape": DeviceDescriptor;
+  "iPhone 14 Pro": DeviceDescriptor;
+  "iPhone 14 Pro landscape": DeviceDescriptor;
+  "iPhone 14 Pro Max": DeviceDescriptor;
+  "iPhone 14 Pro Max landscape": DeviceDescriptor;
+  "iPhone 15": DeviceDescriptor;
+  "iPhone 15 landscape": DeviceDescriptor;
+  "iPhone 15 Plus": DeviceDescriptor;
+  "iPhone 15 Plus landscape": DeviceDescriptor;
+  "iPhone 15 Pro": DeviceDescriptor;
+  "iPhone 15 Pro landscape": DeviceDescriptor;
+  "iPhone 15 Pro Max": DeviceDescriptor;
+  "iPhone 15 Pro Max landscape": DeviceDescriptor;
+  "Kindle Fire HDX": DeviceDescriptor;
+  "Kindle Fire HDX landscape": DeviceDescriptor;
+  "LG Optimus L70": DeviceDescriptor;
+  "LG Optimus L70 landscape": DeviceDescriptor;
+  "Microsoft Lumia 550": DeviceDescriptor;
+  "Microsoft Lumia 550 landscape": DeviceDescriptor;
+  "Microsoft Lumia 950": DeviceDescriptor;
+  "Microsoft Lumia 950 landscape": DeviceDescriptor;
+  "Nexus 10": DeviceDescriptor;
+  "Nexus 10 landscape": DeviceDescriptor;
+  "Nexus 4": DeviceDescriptor;
+  "Nexus 4 landscape": DeviceDescriptor;
+  "Nexus 5": DeviceDescriptor;
+  "Nexus 5 landscape": DeviceDescriptor;
+  "Nexus 5X": DeviceDescriptor;
+  "Nexus 5X landscape": DeviceDescriptor;
+  "Nexus 6": DeviceDescriptor;
+  "Nexus 6 landscape": DeviceDescriptor;
+  "Nexus 6P": DeviceDescriptor;
+  "Nexus 6P landscape": DeviceDescriptor;
+  "Nexus 7": DeviceDescriptor;
+  "Nexus 7 landscape": DeviceDescriptor;
+  "Nokia Lumia 520": DeviceDescriptor;
+  "Nokia Lumia 520 landscape": DeviceDescriptor;
+  "Nokia N9": DeviceDescriptor;
+  "Nokia N9 landscape": DeviceDescriptor;
+  "Pixel 2": DeviceDescriptor;
+  "Pixel 2 landscape": DeviceDescriptor;
+  "Pixel 2 XL": DeviceDescriptor;
+  "Pixel 2 XL landscape": DeviceDescriptor;
+  "Pixel 3": DeviceDescriptor;
+  "Pixel 3 landscape": DeviceDescriptor;
+  "Pixel 4": DeviceDescriptor;
+  "Pixel 4 landscape": DeviceDescriptor;
+  "Pixel 4a (5G)": DeviceDescriptor;
+  "Pixel 4a (5G) landscape": DeviceDescriptor;
+  "Pixel 5": DeviceDescriptor;
+  "Pixel 5 landscape": DeviceDescriptor;
+  "Pixel 7": DeviceDescriptor;
+  "Pixel 7 landscape": DeviceDescriptor;
+  "Moto G4": DeviceDescriptor;
+  "Moto G4 landscape": DeviceDescriptor;
+  "Desktop Chrome HiDPI": DeviceDescriptor;
+  "Desktop Edge HiDPI": DeviceDescriptor;
+  "Desktop Firefox HiDPI": DeviceDescriptor;
+  "Desktop Safari": DeviceDescriptor;
+  "Desktop Chrome": DeviceDescriptor;
+  "Desktop Edge": DeviceDescriptor;
+  "Desktop Firefox": DeviceDescriptor;
+  [key: string]: DeviceDescriptor;
+}
+
+export interface ChromiumBrowserContext extends BrowserContext { }
+export interface ChromiumBrowser extends Browser { }
+export interface FirefoxBrowser extends Browser { }
+export interface WebKitBrowser extends Browser { }
+export interface ChromiumCoverage extends Coverage { }
diff --git a/packages/playwright-core/.eslintrc.js b/packages/playwright-core/.eslintrc.js
deleted file mode 100644
index 84888f1ae3baf..0000000000000
--- a/packages/playwright-core/.eslintrc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: "../../.eslintrc-with-ts-config.js",
-};
diff --git a/packages/playwright-core/.npmignore b/packages/playwright-core/.npmignore
index c8c43feeb1360..e574cbd699cb0 100644
--- a/packages/playwright-core/.npmignore
+++ b/packages/playwright-core/.npmignore
@@ -12,7 +12,7 @@
 !lib/**/*.ttf
 !lib/utilsBundleImpl/xdg-open
 # Exclude injected files. A preprocessed version of these is included via lib/generated.
-# See src/server/injected/README.md.
+# See packages/injected/src/README.md.
 lib/**/injected/
 # Include all binaries that we ship with the package.
 !bin/**/*
diff --git a/packages/playwright-core/ThirdPartyNotices.txt b/packages/playwright-core/ThirdPartyNotices.txt
index 3c5a71e20fdae..57cf609a1ce6a 100644
--- a/packages/playwright-core/ThirdPartyNotices.txt
+++ b/packages/playwright-core/ThirdPartyNotices.txt
@@ -4,25 +4,23 @@ THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
 
 This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
 
--	@types/node@17.0.24 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/yauzl@2.10.0 (https://github.com/DefinitelyTyped/DefinitelyTyped)
 -	agent-base@6.0.2 (https://github.com/TooTallNate/node-agent-base)
 -	balanced-match@1.0.2 (https://github.com/juliangruber/balanced-match)
--	brace-expansion@1.1.11 (https://github.com/juliangruber/brace-expansion)
+-	brace-expansion@1.1.12 (https://github.com/juliangruber/brace-expansion)
 -	buffer-crc32@0.2.13 (https://github.com/brianloveswords/buffer-crc32)
--	codemirror-shadow-1@0.0.1 (https://github.com/codemirror/CodeMirror)
+-	codemirror@5.65.18 (https://github.com/codemirror/CodeMirror)
 -	colors@1.4.0 (https://github.com/Marak/colors.js)
--	commander@8.3.0 (https://github.com/tj/commander.js)
+-	commander@13.1.0 (https://github.com/tj/commander.js)
 -	concat-map@0.0.1 (https://github.com/substack/node-concat-map)
 -	debug@4.3.4 (https://github.com/debug-js/debug)
+-	debug@4.4.0 (https://github.com/debug-js/debug)
 -	define-lazy-prop@2.0.0 (https://github.com/sindresorhus/define-lazy-prop)
+-	diff@7.0.0 (https://github.com/kpdecker/jsdiff)
+-	dotenv@16.4.5 (https://github.com/motdotla/dotenv)
 -	end-of-stream@1.4.4 (https://github.com/mafintosh/end-of-stream)
--	escape-string-regexp@2.0.0 (https://github.com/sindresorhus/escape-string-regexp)
--	extract-zip@2.0.1 (https://github.com/maxogden/extract-zip)
--	fd-slicer@1.1.0 (https://github.com/andrewrk/node-fd-slicer)
 -	get-stream@5.2.0 (https://github.com/sindresorhus/get-stream)
 -	graceful-fs@4.2.10 (https://github.com/isaacs/node-graceful-fs)
--	https-proxy-agent@5.0.0 (https://github.com/TooTallNate/node-https-proxy-agent)
+-	https-proxy-agent@5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
 -	ip-address@9.0.5 (https://github.com/beaugunderson/ip-address)
 -	is-docker@2.2.1 (https://github.com/sindresorhus/is-docker)
 -	is-wsl@2.2.0 (https://github.com/sindresorhus/is-wsl)
@@ -31,77 +29,26 @@ This project incorporates components from the projects listed below. The origina
 -	mime@3.0.0 (https://github.com/broofa/mime)
 -	minimatch@3.1.2 (https://github.com/isaacs/minimatch)
 -	ms@2.1.2 (https://github.com/zeit/ms)
+-	ms@2.1.3 (https://github.com/vercel/ms)
 -	once@1.4.0 (https://github.com/isaacs/once)
 -	open@8.4.0 (https://github.com/sindresorhus/open)
 -	pend@1.2.0 (https://github.com/andrewrk/node-pend)
 -	pngjs@6.0.0 (https://github.com/lukeapage/pngjs)
 -	progress@2.0.3 (https://github.com/visionmedia/node-progress)
 -	proxy-from-env@1.1.0 (https://github.com/Rob--W/proxy-from-env)
--	pump@3.0.0 (https://github.com/mafintosh/pump)
+-	pump@3.0.2 (https://github.com/mafintosh/pump)
 -	retry@0.12.0 (https://github.com/tim-kos/node-retry)
 -	signal-exit@3.0.7 (https://github.com/tapjs/signal-exit)
 -	smart-buffer@4.2.0 (https://github.com/JoshGlazebrook/smart-buffer)
 -	socks-proxy-agent@6.1.1 (https://github.com/TooTallNate/node-socks-proxy-agent)
 -	socks@2.8.3 (https://github.com/JoshGlazebrook/socks)
 -	sprintf-js@1.1.3 (https://github.com/alexei/sprintf.js)
--	stack-utils@2.0.5 (https://github.com/tapjs/stack-utils)
 -	wrappy@1.0.2 (https://github.com/npm/wrappy)
 -	ws@8.17.1 (https://github.com/websockets/ws)
--	yauzl@2.10.0 (https://github.com/thejoshwolfe/yauzl)
+-	yaml@2.6.0 (https://github.com/eemeli/yaml)
+-	yauzl@3.2.0 (https://github.com/thejoshwolfe/yauzl)
 -	yazl@2.5.1 (https://github.com/thejoshwolfe/yazl)
 
-%% @types/node@17.0.24 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
-=========================================
-END OF @types/node@17.0.24 AND INFORMATION
-
-%% @types/yauzl@2.10.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
-=========================================
-END OF @types/yauzl@2.10.0 AND INFORMATION
-
 %% agent-base@6.0.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 agent-base
@@ -278,7 +225,7 @@ SOFTWARE.
 =========================================
 END OF balanced-match@1.0.2 AND INFORMATION
 
-%% brace-expansion@1.1.11 NOTICES AND INFORMATION BEGIN HERE
+%% brace-expansion@1.1.12 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -302,7 +249,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF brace-expansion@1.1.11 AND INFORMATION
+END OF brace-expansion@1.1.12 AND INFORMATION
 
 %% buffer-crc32@0.2.13 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -328,7 +275,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEAL
 =========================================
 END OF buffer-crc32@0.2.13 AND INFORMATION
 
-%% codemirror-shadow-1@0.0.1 NOTICES AND INFORMATION BEGIN HERE
+%% codemirror@5.65.18 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -352,7 +299,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF codemirror-shadow-1@0.0.1 AND INFORMATION
+END OF codemirror@5.65.18 AND INFORMATION
 
 %% colors@1.4.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -384,7 +331,7 @@ THE SOFTWARE.
 =========================================
 END OF colors@1.4.0 AND INFORMATION
 
-%% commander@8.3.0 NOTICES AND INFORMATION BEGIN HERE
+%% commander@13.1.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 (The MIT License)
 
@@ -409,7 +356,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF commander@8.3.0 AND INFORMATION
+END OF commander@13.1.0 AND INFORMATION
 
 %% concat-map@0.0.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -458,6 +405,30 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF debug@4.3.4 AND INFORMATION
 
+%% debug@4.4.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2018-2021 Josh Junon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the 'Software'), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF debug@4.4.0 AND INFORMATION
+
 %% define-lazy-prop@2.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
@@ -472,49 +443,43 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF define-lazy-prop@2.0.0 AND INFORMATION
 
-%% end-of-stream@1.4.4 NOTICES AND INFORMATION BEGIN HERE
+%% diff@7.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+BSD 3-Clause License
 
-Copyright (c) 2014 Mathias Buus
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-=========================================
-END OF end-of-stream@1.4.4 AND INFORMATION
+Copyright (c) 2009-2015, Kevin Decker <kpdecker@gmail.com>
+All rights reserved.
 
-%% escape-string-regexp@2.0.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =========================================
-END OF escape-string-regexp@2.0.0 AND INFORMATION
+END OF diff@7.0.0 AND INFORMATION
 
-%% extract-zip@2.0.1 NOTICES AND INFORMATION BEGIN HERE
+%% dotenv@16.4.5 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright (c) 2014 Max Ogden and other contributors
+Copyright (c) 2015, Scott Motte
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -538,33 +503,33 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =========================================
-END OF extract-zip@2.0.1 AND INFORMATION
+END OF dotenv@16.4.5 AND INFORMATION
 
-%% fd-slicer@1.1.0 NOTICES AND INFORMATION BEGIN HERE
+%% end-of-stream@1.4.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright (c) 2014 Andrew Kelley
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation files
-(the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Copyright (c) 2014 Mathias Buus
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 =========================================
-END OF fd-slicer@1.1.0 AND INFORMATION
+END OF end-of-stream@1.4.4 AND INFORMATION
 
 %% get-stream@5.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -600,7 +565,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =========================================
 END OF graceful-fs@4.2.10 AND INFORMATION
 
-%% https-proxy-agent@5.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% https-proxy-agent@5.0.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 https-proxy-agent
 ================
@@ -740,7 +705,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 [CONNECT]: http://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_Tunneling
 =========================================
-END OF https-proxy-agent@5.0.0 AND INFORMATION
+END OF https-proxy-agent@5.0.1 AND INFORMATION
 
 %% ip-address@9.0.5 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -941,6 +906,32 @@ SOFTWARE.
 =========================================
 END OF ms@2.1.2 AND INFORMATION
 
+%% ms@2.1.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2020 Vercel, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF ms@2.1.3 AND INFORMATION
+
 %% once@1.4.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The ISC License
@@ -1080,7 +1071,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF proxy-from-env@1.1.0 AND INFORMATION
 
-%% pump@3.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% pump@3.0.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
@@ -1104,7 +1095,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF pump@3.0.0 AND INFORMATION
+END OF pump@3.0.2 AND INFORMATION
 
 %% retry@0.12.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -1389,32 +1380,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =========================================
 END OF sprintf-js@1.1.3 AND INFORMATION
 
-%% stack-utils@2.0.5 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License (MIT)
-
-Copyright (c) Isaac Z. Schlueter <i@izs.me>, James Talmage <james@talmage.io> (github.com/jamestalmage), and Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-=========================================
-END OF stack-utils@2.0.5 AND INFORMATION
-
 %% wrappy@1.0.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The ISC License
@@ -1460,7 +1425,25 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF ws@8.17.1 AND INFORMATION
 
-%% yauzl@2.10.0 NOTICES AND INFORMATION BEGIN HERE
+%% yaml@2.6.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright Eemeli Aro <eemeli@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
+=========================================
+END OF yaml@2.6.0 AND INFORMATION
+
+%% yauzl@3.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
@@ -1484,7 +1467,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF yauzl@2.10.0 AND INFORMATION
+END OF yauzl@3.2.0 AND INFORMATION
 
 %% yazl@2.5.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -1514,6 +1497,6 @@ END OF yazl@2.5.1 AND INFORMATION
 
 SUMMARY BEGIN HERE
 =========================================
-Total Packages: 45
+Total Packages: 44
 =========================================
 END OF SUMMARY
\ No newline at end of file
diff --git a/packages/playwright-core/bin/PrintDeps.exe b/packages/playwright-core/bin/PrintDeps.exe
deleted file mode 100644
index eb8ddf4d7b508..0000000000000
Binary files a/packages/playwright-core/bin/PrintDeps.exe and /dev/null differ
diff --git a/packages/playwright-core/bin/README.md b/packages/playwright-core/bin/README.md
deleted file mode 100644
index 2426643de541c..0000000000000
--- a/packages/playwright-core/bin/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-See building instructions at [`/browser_patches/winldd/README.md`](../../../browser_patches/winldd/README.md)
-
diff --git a/packages/playwright-core/bin/reinstall_chrome_beta_linux.sh b/packages/playwright-core/bin/reinstall_chrome_beta_linux.sh
index 14c684599c824..0451bda3efddd 100755
--- a/packages/playwright-core/bin/reinstall_chrome_beta_linux.sh
+++ b/packages/playwright-core/bin/reinstall_chrome_beta_linux.sh
@@ -7,15 +7,17 @@ if [[ $(arch) == "aarch64" ]]; then
   exit 1
 fi
 
-if [[ ! -f "/etc/os-release" ]]; then
-  echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
-  exit 1
-fi
+if [ -z "$PLAYWRIGHT_HOST_PLATFORM_OVERRIDE" ]; then
+  if [[ ! -f "/etc/os-release" ]]; then
+    echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
+    exit 1
+  fi
 
-ID=$(bash -c 'source /etc/os-release && echo $ID')
-if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
-  echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
-  exit 1
+  ID=$(bash -c 'source /etc/os-release && echo $ID')
+  if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
+    echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
+    exit 1
+  fi
 fi
 
 # 1. make sure to remove old beta if any.
diff --git a/packages/playwright-core/bin/reinstall_chrome_beta_mac.sh b/packages/playwright-core/bin/reinstall_chrome_beta_mac.sh
index b6e1990cfc8b3..617e3b5ee5bb7 100755
--- a/packages/playwright-core/bin/reinstall_chrome_beta_mac.sh
+++ b/packages/playwright-core/bin/reinstall_chrome_beta_mac.sh
@@ -4,7 +4,7 @@ set -x
 
 rm -rf "/Applications/Google Chrome Beta.app"
 cd /tmp
-curl -o ./googlechromebeta.dmg -k https://dl.google.com/chrome/mac/universal/beta/googlechromebeta.dmg
+curl --retry 3 -o ./googlechromebeta.dmg https://dl.google.com/chrome/mac/universal/beta/googlechromebeta.dmg
 hdiutil attach -nobrowse -quiet -noautofsck -noautoopen -mountpoint /Volumes/googlechromebeta.dmg ./googlechromebeta.dmg
 cp -pR "/Volumes/googlechromebeta.dmg/Google Chrome Beta.app" /Applications
 hdiutil detach /Volumes/googlechromebeta.dmg
diff --git a/packages/playwright-core/bin/reinstall_chrome_stable_linux.sh b/packages/playwright-core/bin/reinstall_chrome_stable_linux.sh
index 28a19699dffec..78f1d41397fa1 100755
--- a/packages/playwright-core/bin/reinstall_chrome_stable_linux.sh
+++ b/packages/playwright-core/bin/reinstall_chrome_stable_linux.sh
@@ -7,15 +7,17 @@ if [[ $(arch) == "aarch64" ]]; then
   exit 1
 fi
 
-if [[ ! -f "/etc/os-release" ]]; then
-  echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
-  exit 1
-fi
+if [ -z "$PLAYWRIGHT_HOST_PLATFORM_OVERRIDE" ]; then
+  if [[ ! -f "/etc/os-release" ]]; then
+    echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
+    exit 1
+  fi
 
-ID=$(bash -c 'source /etc/os-release && echo $ID')
-if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
-  echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
-  exit 1
+  ID=$(bash -c 'source /etc/os-release && echo $ID')
+  if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
+    echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
+    exit 1
+  fi
 fi
 
 # 1. make sure to remove old stable if any.
diff --git a/packages/playwright-core/bin/reinstall_chrome_stable_mac.sh b/packages/playwright-core/bin/reinstall_chrome_stable_mac.sh
index 91d826c0148e1..6aa650a55a23f 100755
--- a/packages/playwright-core/bin/reinstall_chrome_stable_mac.sh
+++ b/packages/playwright-core/bin/reinstall_chrome_stable_mac.sh
@@ -4,7 +4,7 @@ set -x
 
 rm -rf "/Applications/Google Chrome.app"
 cd /tmp
-curl -o ./googlechrome.dmg -k https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg
+curl --retry 3 -o ./googlechrome.dmg https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg
 hdiutil attach -nobrowse -quiet -noautofsck -noautoopen -mountpoint /Volumes/googlechrome.dmg ./googlechrome.dmg
 cp -pR "/Volumes/googlechrome.dmg/Google Chrome.app" /Applications
 hdiutil detach /Volumes/googlechrome.dmg
diff --git a/packages/playwright-core/bin/reinstall_msedge_beta_linux.sh b/packages/playwright-core/bin/reinstall_msedge_beta_linux.sh
index ff8c3c9f89847..a1531a95d0d41 100755
--- a/packages/playwright-core/bin/reinstall_msedge_beta_linux.sh
+++ b/packages/playwright-core/bin/reinstall_msedge_beta_linux.sh
@@ -8,15 +8,17 @@ if [[ $(arch) == "aarch64" ]]; then
   exit 1
 fi
 
-if [[ ! -f "/etc/os-release" ]]; then
-  echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
-  exit 1
-fi
-
-ID=$(bash -c 'source /etc/os-release && echo $ID')
-if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
-  echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
-  exit 1
+if [ -z "$PLAYWRIGHT_HOST_PLATFORM_OVERRIDE" ]; then
+  if [[ ! -f "/etc/os-release" ]]; then
+    echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
+    exit 1
+  fi
+
+  ID=$(bash -c 'source /etc/os-release && echo $ID')
+  if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
+    echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
+    exit 1
+  fi
 fi
 
 # 1. make sure to remove old beta if any.
@@ -30,6 +32,12 @@ if ! command -v curl >/dev/null; then
   apt-get install -y curl
 fi
 
+# GnuPG is not preinstalled in slim images
+if ! command -v gpg >/dev/null; then
+  apt-get update
+  apt-get install -y gpg
+fi
+
 # 3. Add the GPG key, the apt repo, update the apt cache, and install the package
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/microsoft.gpg
 install -o root -g root -m 644 /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/
diff --git a/packages/playwright-core/bin/reinstall_msedge_beta_mac.sh b/packages/playwright-core/bin/reinstall_msedge_beta_mac.sh
index 69c0602485afd..72ec3e4e5732d 100755
--- a/packages/playwright-core/bin/reinstall_msedge_beta_mac.sh
+++ b/packages/playwright-core/bin/reinstall_msedge_beta_mac.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 
 cd /tmp
-curl -o ./msedge_beta.pkg -k "$1"
+curl --retry 3 -o ./msedge_beta.pkg "$1"
 # Note: there's no way to uninstall previously installed MSEdge.
 # However, running PKG again seems to update installation.
 sudo installer -pkg /tmp/msedge_beta.pkg -target /
diff --git a/packages/playwright-core/bin/reinstall_msedge_dev_linux.sh b/packages/playwright-core/bin/reinstall_msedge_dev_linux.sh
index 6a026722b15f4..7fde34e5b8acd 100755
--- a/packages/playwright-core/bin/reinstall_msedge_dev_linux.sh
+++ b/packages/playwright-core/bin/reinstall_msedge_dev_linux.sh
@@ -8,15 +8,17 @@ if [[ $(arch) == "aarch64" ]]; then
   exit 1
 fi
 
-if [[ ! -f "/etc/os-release" ]]; then
-  echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
-  exit 1
-fi
-
-ID=$(bash -c 'source /etc/os-release && echo $ID')
-if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
-  echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
-  exit 1
+if [ -z "$PLAYWRIGHT_HOST_PLATFORM_OVERRIDE" ]; then
+  if [[ ! -f "/etc/os-release" ]]; then
+    echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
+    exit 1
+  fi
+
+  ID=$(bash -c 'source /etc/os-release && echo $ID')
+  if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
+    echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
+    exit 1
+  fi
 fi
 
 # 1. make sure to remove old dev if any.
@@ -30,6 +32,12 @@ if ! command -v curl >/dev/null; then
   apt-get install -y curl
 fi
 
+# GnuPG is not preinstalled in slim images
+if ! command -v gpg >/dev/null; then
+  apt-get update
+  apt-get install -y gpg
+fi
+
 # 3. Add the GPG key, the apt repo, update the apt cache, and install the package
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/microsoft.gpg
 install -o root -g root -m 644 /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/
diff --git a/packages/playwright-core/bin/reinstall_msedge_dev_mac.sh b/packages/playwright-core/bin/reinstall_msedge_dev_mac.sh
index 0ad05b0a2b2e9..3376e8696cde7 100755
--- a/packages/playwright-core/bin/reinstall_msedge_dev_mac.sh
+++ b/packages/playwright-core/bin/reinstall_msedge_dev_mac.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 
 cd /tmp
-curl -o ./msedge_dev.pkg -k "$1"
+curl --retry 3 -o ./msedge_dev.pkg "$1"
 # Note: there's no way to uninstall previously installed MSEdge.
 # However, running PKG again seems to update installation.
 sudo installer -pkg /tmp/msedge_dev.pkg -target /
diff --git a/packages/playwright-core/bin/reinstall_msedge_stable_linux.sh b/packages/playwright-core/bin/reinstall_msedge_stable_linux.sh
index 1f2c9bf382ec3..4acb1dbf1bcc6 100755
--- a/packages/playwright-core/bin/reinstall_msedge_stable_linux.sh
+++ b/packages/playwright-core/bin/reinstall_msedge_stable_linux.sh
@@ -8,15 +8,17 @@ if [[ $(arch) == "aarch64" ]]; then
   exit 1
 fi
 
-if [[ ! -f "/etc/os-release" ]]; then
-  echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
-  exit 1
-fi
-
-ID=$(bash -c 'source /etc/os-release && echo $ID')
-if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
-  echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
-  exit 1
+if [ -z "$PLAYWRIGHT_HOST_PLATFORM_OVERRIDE" ]; then
+  if [[ ! -f "/etc/os-release" ]]; then
+    echo "ERROR: cannot install on unknown linux distribution (/etc/os-release is missing)"
+    exit 1
+  fi
+
+  ID=$(bash -c 'source /etc/os-release && echo $ID')
+  if [[ "${ID}" != "ubuntu" && "${ID}" != "debian" ]]; then
+    echo "ERROR: cannot install on $ID distribution - only Ubuntu and Debian are supported"
+    exit 1
+  fi
 fi
 
 # 1. make sure to remove old stable if any.
@@ -30,6 +32,12 @@ if ! command -v curl >/dev/null; then
   apt-get install -y curl
 fi
 
+# GnuPG is not preinstalled in slim images
+if ! command -v gpg >/dev/null; then
+  apt-get update
+  apt-get install -y gpg
+fi
+
 # 3. Add the GPG key, the apt repo, update the apt cache, and install the package
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/microsoft.gpg
 install -o root -g root -m 644 /tmp/microsoft.gpg /etc/apt/trusted.gpg.d/
diff --git a/packages/playwright-core/bin/reinstall_msedge_stable_mac.sh b/packages/playwright-core/bin/reinstall_msedge_stable_mac.sh
index b82cfb37cd203..afcd2f531b5e4 100755
--- a/packages/playwright-core/bin/reinstall_msedge_stable_mac.sh
+++ b/packages/playwright-core/bin/reinstall_msedge_stable_mac.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 
 cd /tmp
-curl -o ./msedge_stable.pkg -k "$1"
+curl --retry 3 -o ./msedge_stable.pkg "$1"
 # Note: there's no way to uninstall previously installed MSEdge.
 # However, running PKG again seems to update installation.
 sudo installer -pkg /tmp/msedge_stable.pkg -target /
diff --git a/packages/playwright-core/bin/socks-certs/README.md b/packages/playwright-core/bin/socks-certs/README.md
deleted file mode 100644
index 4950ef1f3cc31..0000000000000
--- a/packages/playwright-core/bin/socks-certs/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Certfificates for Socks Proxy
-
-These certificates are used when client certificates are used with
-Playwright. Playwright then creates a Socks proxy, which sits between
-the browser and the actual target server. The Socks proxy uses this certificiate
-to talk to the browser and establishes its own secure TLS connection to the server.
-The certificates are generated via:
-
-```bash
-openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -keyout key.pem -out cert.pem -subj "/CN=localhost"
-```
diff --git a/packages/playwright-core/bin/socks-certs/cert.pem b/packages/playwright-core/bin/socks-certs/cert.pem
deleted file mode 100644
index cce2f57bd5237..0000000000000
--- a/packages/playwright-core/bin/socks-certs/cert.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDCTCCAfGgAwIBAgIUTcrzEueVL/OuLHr4LBIPWeS4UL0wDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MDcwNDA4NDAzNFoXDTM0MDcw
-MjA4NDAzNFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEApof+SZVN4UGma4xJDVHhMSpmEJoCdMPr+HFadJJK/brF
-BNOhA1C5wNk8oD/XYo7enAHQH/EsBnq4MMxv79rXTGnIdXMF+43GdMDh5kh81FQy
-Esw8Vt4eif9eZkjUxI2GHhR2ovJewmQa7E+SeUB2RzJTqz8QPLhd74JFfgaci+S2
-8L37ScVjcw55T1PcNflzB4vwsQHBT3yND0MLDhm+8MLzmTl4Mw5PgIOaBl5Jh8Tr
-wQF4eeeB3FPJoMQhTP8aGBjW1mo+NmSSRAPIAZyhmCAnDeC33yRjAaiHjaL5Pr9f
-wt5zoF5+U1xWhGXWzGOE6p/VTj62F9a2fOXNHclYJQIDAQABo1MwUTAdBgNVHQ4E
-FgQU9BoVzGtb5x70KqGO/89N1hyqi5kwHwYDVR0jBBgwFoAU9BoVzGtb5x70KqGO
-/89N1hyqi5kwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAYcbI
-wvcfx2p8z0RNN3EA+epKX1SagZyJX4ORIO8kln1sDU+ceHde3n3xnp1dg6HG2qh1
-a7CZub/fNUaP9R8+6iiV0wPT7Ybkb2NIJcH1yq+/bfSS5OC5DO0yv9SUADdBoDwa
-zOuBAqdcYW1BHYcbAzsQnniRcejHu06ioaS6SwwJ8150rQnLT4Lh9LAl40W6v4nZ
-NdTGQETTrbjcgH1ER4IhWTKtVyPOxGF9A/OOawMEdfS8BhUO7YRS4QNFFaQMrJAb
-MDhDtjSyDogLr8P43xjjWvQWG9a7zTF0kKEsdJ0cEG5HATpg8bPHmrouxbs2HGeH
-kJXzMykrsYyXsInN3w==
------END CERTIFICATE-----
diff --git a/packages/playwright-core/bin/socks-certs/key.pem b/packages/playwright-core/bin/socks-certs/key.pem
deleted file mode 100644
index 75f8e3bccc3c8..0000000000000
--- a/packages/playwright-core/bin/socks-certs/key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCmh/5JlU3hQaZr
-jEkNUeExKmYQmgJ0w+v4cVp0kkr9usUE06EDULnA2TygP9dijt6cAdAf8SwGergw
-zG/v2tdMach1cwX7jcZ0wOHmSHzUVDISzDxW3h6J/15mSNTEjYYeFHai8l7CZBrs
-T5J5QHZHMlOrPxA8uF3vgkV+BpyL5LbwvftJxWNzDnlPU9w1+XMHi/CxAcFPfI0P
-QwsOGb7wwvOZOXgzDk+Ag5oGXkmHxOvBAXh554HcU8mgxCFM/xoYGNbWaj42ZJJE
-A8gBnKGYICcN4LffJGMBqIeNovk+v1/C3nOgXn5TXFaEZdbMY4Tqn9VOPrYX1rZ8
-5c0dyVglAgMBAAECggEAB6zX4vNPKhUZAvbtvP/rlZUDLDu05kXLX+F1jk7ZxvTv
-NKg+UQVM8l7wxN/8YM3944nP2lEGuuu4BoO9mvvmlV6Avy0EdxITNflX0AHCQxT4
-U9Z253gIR0ruQl+T8tUk+8jsqNjr1iC//ukx8oWujdx7b7aR3IKQzcOeyU6rs2TN
-lyrVVsEaFVi9+wCw0xyiCmPlobrn+egdigw7Zhp2BRinC6W9eMxuPS2hlhQUhBm/
-eiD96YWp0RAv/L5qO93reoXIAzrrLdcUgPEnnq1zN7y2xihU2+B2sTph1m/A26+J
-yPcXd7vQrXlRXQU6PaCa+0oJULlpiAzy3HPbnr4BkQKBgQDdmekTX8dQqiEZPX1C
-017QRFbx0/x/TDFDSeJbDeauMzzCaGqCO2WVmYmTvFtby2G4/6BYowVtJVHm4uJl
-XsYk8dWIQGLPIj1Cw7ZieJvb2EVRxgnY2oMaOTOazHzPHFzZV718zwEeZrryT82J
-881E8wgM8V3DjkS4ye3TbwvimQKBgQDAYa/IdnpAg5z1TREi9Tt8fnoGpmSscAak
-USgeXVsvoNzXXkE94MiiCOOrX1r68TWYDAzq6MKGDewkWOfLwXWR6D5C2LyE1q9P
-1pxstgs/nC3ZUTz0yEH47ahSmhywhGlvXXOQEXUSLiVTOdeMCubMqwQW80F1868n
-aBHcj5/lbQKBgQDIojjsWaNT3TTqbUmj30vQtI8jlBLgDlPr4FEYr5VT0wAH5BHK
-p4xpzgFJyRfOHG312TuMBM087LUinfjsXsp3WJ1EJ0dO0mk0sY3HyfsTKNRaHTt9
-Ixnf/DpExS+bNMq73Tyqa6FPrSNFkAtAA4SuEHwRe9aw33ZI+EpjS/8uwQKBgQCi
-9NwqSLlLVnColEw0uVdXH+cLJPzX19i4bQo3lkp8MJ2ATJWk7XflUPRQoGf3ckQ8
-c9CpVtoXJUnmi+xkeo21Nu0uQFqHhzZewWIk75rdmdR4ZUjl649+ZQkUVviASNjq
-fVU7Lp5k9POm6LL9K+rOaPoA2rKTUAQItC2VD4+YjQKBgB6kgvgN6Mz/u0RE3kkV
-2GOoP5sso71Hxwh7o6JEzUMhR+e/T/LLcBwEjLYcf1FYRySHsXLn2Ar/Uw1J7pAZ
-ud54/at+7mTDliaT8Ar7S9vcso7ZfmuDX9qB9+c77idPskVBPo2tjJbwvFcB6sww
-5Elcfmj6tEP4YLJ6Kv3qTPhT
------END PRIVATE KEY-----
diff --git a/packages/playwright-core/browsers.json b/packages/playwright-core/browsers.json
index b372eecd717f8..99fb3c9a922b2 100644
--- a/packages/playwright-core/browsers.json
+++ b/packages/playwright-core/browsers.json
@@ -3,46 +3,73 @@
   "browsers": [
     {
       "name": "chromium",
-      "revision": "1128",
+      "revision": "1193",
       "installByDefault": true,
-      "browserVersion": "128.0.6613.7"
+      "browserVersion": "140.0.7339.186"
+    },
+    {
+      "name": "chromium-headless-shell",
+      "revision": "1193",
+      "installByDefault": true,
+      "browserVersion": "140.0.7339.186"
     },
     {
       "name": "chromium-tip-of-tree",
-      "revision": "1244",
+      "revision": "1357",
+      "installByDefault": false,
+      "browserVersion": "141.0.7342.0"
+    },
+    {
+      "name": "chromium-tip-of-tree-headless-shell",
+      "revision": "1357",
       "installByDefault": false,
-      "browserVersion": "129.0.6616.0"
+      "browserVersion": "141.0.7342.0"
     },
     {
       "name": "firefox",
-      "revision": "1458",
+      "revision": "1490",
       "installByDefault": true,
-      "browserVersion": "128.0"
+      "browserVersion": "141.0"
     },
     {
       "name": "firefox-beta",
-      "revision": "1458",
+      "revision": "1485",
       "installByDefault": false,
-      "browserVersion": "129.0b2"
+      "browserVersion": "142.0b4"
     },
     {
       "name": "webkit",
-      "revision": "2051",
+      "revision": "2203",
       "installByDefault": true,
       "revisionOverrides": {
+        "debian11-x64": "2105",
+        "debian11-arm64": "2105",
         "mac10.14": "1446",
         "mac10.15": "1616",
         "mac11": "1816",
         "mac11-arm64": "1816",
         "mac12": "2009",
-        "mac12-arm64": "2009"
+        "mac12-arm64": "2009",
+        "mac13": "2140",
+        "mac13-arm64": "2140",
+        "ubuntu20.04-x64": "2092",
+        "ubuntu20.04-arm64": "2092"
       },
-      "browserVersion": "18.0"
+      "browserVersion": "26.0"
     },
     {
       "name": "ffmpeg",
-      "revision": "1009",
-      "installByDefault": true
+      "revision": "1011",
+      "installByDefault": true,
+      "revisionOverrides": {
+        "mac12": "1010",
+        "mac12-arm64": "1010"
+      }
+    },
+    {
+      "name": "winldd",
+      "revision": "1007",
+      "installByDefault": false
     },
     {
       "name": "android",
diff --git a/packages/playwright-core/bundles/utils/build.js b/packages/playwright-core/bundles/utils/build.js
deleted file mode 100644
index 08cd4786ede8d..0000000000000
--- a/packages/playwright-core/bundles/utils/build.js
+++ /dev/null
@@ -1,50 +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-check
-const path = require('path');
-const esbuild = require('esbuild');
-const fs = require('fs');
-
-const outdir = path.join(__dirname, '../../lib/utilsBundleImpl');
-
-if (!fs.existsSync(outdir))
-  fs.mkdirSync(outdir);
-
-{
-  // 'open' package requires 'xdg-open' binary to be present, which does not get bundled by esbuild.
-  fs.copyFileSync(path.join(__dirname, 'node_modules/open/xdg-open'), path.join(outdir, 'xdg-open'));
-}
-
-(async () => {
-  const ctx = await esbuild.context({
-    entryPoints: [path.join(__dirname, 'src/utilsBundleImpl.ts')],
-    bundle: true,
-    outfile: path.join(outdir, 'index.js'),
-    format: 'cjs',
-    platform: 'node',
-    target: 'ES2019',
-    sourcemap: process.argv.includes('--sourcemap'),
-    minify: process.argv.includes('--minify'),
-  });
-  await ctx.rebuild();
-  if (process.argv.includes('--watch'))
-    await ctx.watch();
-  await ctx.dispose();
-})().catch(error => {
-  console.error(error);
-  process.exit(1);
-});
diff --git a/packages/playwright-core/bundles/utils/package-lock.json b/packages/playwright-core/bundles/utils/package-lock.json
index 66c4cdae12fe2..7900f7c098660 100644
--- a/packages/playwright-core/bundles/utils/package-lock.json
+++ b/packages/playwright-core/bundles/utils/package-lock.json
@@ -1,7 +1,7 @@
 {
   "name": "utils-bundle",
   "version": "0.0.1",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
@@ -9,10 +9,12 @@
       "version": "0.0.1",
       "dependencies": {
         "colors": "1.4.0",
-        "commander": "8.3.0",
+        "commander": "^13.0.0",
         "debug": "^4.3.4",
+        "diff": "^7.0.0",
+        "dotenv": "^16.4.5",
         "graceful-fs": "4.2.10",
-        "https-proxy-agent": "5.0.0",
+        "https-proxy-agent": "5.0.1",
         "jpeg-js": "0.4.4",
         "mime": "^3.0.0",
         "minimatch": "^3.1.2",
@@ -23,11 +25,12 @@
         "retry": "0.12.0",
         "signal-exit": "3.0.7",
         "socks-proxy-agent": "6.1.1",
-        "stack-utils": "2.0.5",
-        "ws": "8.17.1"
+        "ws": "8.17.1",
+        "yaml": "^2.6.0"
       },
       "devDependencies": {
         "@types/debug": "^4.1.7",
+        "@types/diff": "^6.0.0",
         "@types/mime": "^2.0.3",
         "@types/minimatch": "^3.0.5",
         "@types/pngjs": "^6.0.1",
@@ -47,6 +50,13 @@
         "@types/ms": "*"
       }
     },
+    "node_modules/@types/diff": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-6.0.0.tgz",
+      "integrity": "sha512-dhVCYGv3ZSbzmQaBSagrv1WJ6rXCdkyTcDyoNu1MD8JohI7pR7k8wdZEm+mvdxRKXyHVwckFzWU1vJc+Z29MlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/mime": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz",
@@ -145,9 +155,9 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -157,16 +167,18 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.1.90"
       }
     },
     "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
+      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 12"
+        "node": ">=18"
       }
     },
     "node_modules/concat-map": {
@@ -198,12 +210,24 @@
         "node": ">=8"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+    "node_modules/diff": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.5",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
+      "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
       }
     },
     "node_modules/graceful-fs": {
@@ -212,9 +236,9 @@
       "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -387,17 +411,6 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
     },
-    "node_modules/stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ws": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
@@ -417,295 +430,17 @@
           "optional": true
         }
       }
-    }
-  },
-  "dependencies": {
-    "@types/debug": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-      "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
-      "dev": true,
-      "requires": {
-        "@types/ms": "*"
-      }
-    },
-    "@types/mime": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz",
-      "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==",
-      "dev": true
-    },
-    "@types/minimatch": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-      "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-      "dev": true
-    },
-    "@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "17.0.25",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz",
-      "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==",
-      "dev": true
-    },
-    "@types/pngjs": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@types/pngjs/-/pngjs-6.0.1.tgz",
-      "integrity": "sha512-J39njbdW1U/6YyVXvC9+1iflZghP8jgRf2ndYghdJb5xL49LYDB+1EuAxfbuJ2IBbWIL3AjHPQhgaTxT3YaYeg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/progress": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/progress/-/progress-2.0.5.tgz",
-      "integrity": "sha512-ZYYVc/kSMkhH9W/4dNK/sLNra3cnkfT2nJyOAIDY+C2u6w72wa0s1aXAezVtbTsnN8HID1uhXCrLwDE2ZXpplg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/proper-lockfile": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@types/proper-lockfile/-/proper-lockfile-4.1.2.tgz",
-      "integrity": "sha512-kd4LMvcnpYkspDcp7rmXKedn8iJSCoa331zRRamUp5oanKt/CefbEGPQP7G89enz7sKD4bvsr8mHSsC8j5WOvA==",
-      "dev": true,
-      "requires": {
-        "@types/retry": "*"
-      }
-    },
-    "@types/proxy-from-env": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/proxy-from-env/-/proxy-from-env-1.0.1.tgz",
-      "integrity": "sha512-luG++TFHyS61eKcfkR1CVV6a1GMNXDjtqEQIIfaSHax75xp0HU3SlezjOi1yqubJwrG8e9DeW59n6wTblIDwFg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/retry": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
-      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
-      "dev": true
-    },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-      "dev": true
-    },
-    "@types/ws": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.2.2.tgz",
-      "integrity": "sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
-    },
-    "commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
-    },
-    "escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "ip-address": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
-      "requires": {
-        "jsbn": "1.1.0",
-        "sprintf-js": "^1.1.3"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "jpeg-js": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz",
-      "integrity": "sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="
-    },
-    "jsbn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
-    },
-    "mime": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
-      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "pngjs": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz",
-      "integrity": "sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg=="
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
-    },
-    "proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "smart-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
-    },
-    "socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
-      "requires": {
-        "ip-address": "^9.0.5",
-        "smart-buffer": "^4.2.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz",
-      "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==",
-      "requires": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.1",
-        "socks": "^2.6.1"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
-      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
-    },
-    "stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "requires": {
-        "escape-string-regexp": "^2.0.0"
+    "node_modules/yaml": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14"
       }
-    },
-    "ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
-      "requires": {}
     }
   }
 }
diff --git a/packages/playwright-core/bundles/utils/package.json b/packages/playwright-core/bundles/utils/package.json
index 8ac0c112fed14..c0559de57d1dd 100644
--- a/packages/playwright-core/bundles/utils/package.json
+++ b/packages/playwright-core/bundles/utils/package.json
@@ -2,18 +2,14 @@
   "name": "utils-bundle",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "esbuild": "node build.js",
-    "build": "npm run esbuild -- --minify",
-    "watch": "npm run esbuild -- --watch --sourcemap",
-    "generate-license": "node ../../../../utils/generate_third_party_notice.js"
-  },
   "dependencies": {
     "colors": "1.4.0",
-    "commander": "8.3.0",
+    "commander": "^13.0.0",
     "debug": "^4.3.4",
+    "diff": "^7.0.0",
+    "dotenv": "^16.4.5",
     "graceful-fs": "4.2.10",
-    "https-proxy-agent": "5.0.0",
+    "https-proxy-agent": "5.0.1",
     "jpeg-js": "0.4.4",
     "mime": "^3.0.0",
     "minimatch": "^3.1.2",
@@ -24,11 +20,12 @@
     "retry": "0.12.0",
     "signal-exit": "3.0.7",
     "socks-proxy-agent": "6.1.1",
-    "stack-utils": "2.0.5",
-    "ws": "8.17.1"
+    "ws": "8.17.1",
+    "yaml": "^2.6.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
+    "@types/diff": "^6.0.0",
     "@types/mime": "^2.0.3",
     "@types/minimatch": "^3.0.5",
     "@types/pngjs": "^6.0.1",
diff --git a/packages/playwright-core/bundles/utils/src/utilsBundleImpl.ts b/packages/playwright-core/bundles/utils/src/utilsBundleImpl.ts
index 49dc61a05cb39..409372e89448e 100644
--- a/packages/playwright-core/bundles/utils/src/utilsBundleImpl.ts
+++ b/packages/playwright-core/bundles/utils/src/utilsBundleImpl.ts
@@ -14,12 +14,20 @@
  * limitations under the License.
  */
 
+/* eslint-disable import/order */
+
 import colorsLibrary from 'colors/safe';
 export const colors = colorsLibrary;
 
 import debugLibrary from 'debug';
 export const debug = debugLibrary;
 
+import * as diffLibrary from 'diff';
+export const diff = diffLibrary;
+
+import dotenvLibrary from 'dotenv';
+export const dotenv = dotenvLibrary;
+
 export { getProxyForUrl } from 'proxy-from-env';
 
 export { HttpsProxyAgent } from 'https-proxy-agent';
@@ -48,8 +56,8 @@ export const progress = progressLibrary;
 
 export { SocksProxyAgent } from 'socks-proxy-agent';
 
-import StackUtilsLibrary from 'stack-utils';
-export const StackUtils = StackUtilsLibrary;
+import yamlLibrary from 'yaml';
+export const yaml = yamlLibrary;
 
 // @ts-ignore
 import wsLibrary, { WebSocketServer, Receiver, Sender } from 'ws';
diff --git a/packages/playwright-core/bundles/zip/build.js b/packages/playwright-core/bundles/zip/build.js
deleted file mode 100644
index a7246b832b911..0000000000000
--- a/packages/playwright-core/bundles/zip/build.js
+++ /dev/null
@@ -1,57 +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-check
-const path = require('path');
-const fs = require('fs');
-const esbuild = require('esbuild');
-
-// Can be removed once https://github.com/thejoshwolfe/yauzl/issues/114 is fixed.
-/** @type{import('esbuild').Plugin} */
-let patchFdSlicerToHideBufferDeprecationWarning = {
-  name: 'patch-fd-slicer-deprecation',
-  setup(build) {
-    build.onResolve({ filter: /^fd-slicer$/ }, () => {
-      const originalPath = require.resolve('fd-slicer');
-      const patchedPath = path.join(path.dirname(originalPath), path.basename(originalPath, '.js') + '.pw-patched.js');
-      let sourceFileContent = fs.readFileSync(originalPath, 'utf8')
-      sourceFileContent = sourceFileContent.replace(/new Buffer\(toRead\)/g, 'Buffer.alloc(toRead)');
-      fs.writeFileSync(patchedPath, sourceFileContent);
-      return { path: patchedPath }
-    });
-  },
-};
-
-(async () => {
-  const ctx = await esbuild.context({
-    entryPoints: [path.join(__dirname, 'src/zipBundleImpl.ts')],
-    bundle: true,
-    outdir: path.join(__dirname, '../../lib'),
-    plugins: [patchFdSlicerToHideBufferDeprecationWarning],
-    format: 'cjs',
-    platform: 'node',
-    target: 'ES2019',
-    sourcemap: process.argv.includes('--sourcemap'),
-    minify: process.argv.includes('--minify'),
-  });
-  await ctx.rebuild();
-  if (process.argv.includes('--watch'))
-    await ctx.watch();
-  await ctx.dispose();
-})().catch(error => {
-  console.error(error);
-  process.exit(1);
-});
diff --git a/packages/playwright-core/bundles/zip/package-lock.json b/packages/playwright-core/bundles/zip/package-lock.json
index 8476d11c199ae..19eaf81c63825 100644
--- a/packages/playwright-core/bundles/zip/package-lock.json
+++ b/packages/playwright-core/bundles/zip/package-lock.json
@@ -8,8 +8,9 @@
       "name": "zip-bundle",
       "version": "0.0.1",
       "dependencies": {
-        "extract-zip": "2.0.1",
-        "yauzl": "2.10.0",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "3.2.0",
         "yazl": "2.5.1"
       },
       "devDependencies": {
@@ -21,13 +22,13 @@
       "version": "17.0.24",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.24.tgz",
       "integrity": "sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==",
-      "devOptional": true
+      "dev": true
     },
     "node_modules/@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -50,11 +51,12 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -69,41 +71,16 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
     },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
       "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -115,14 +92,16 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
@@ -130,12 +109,14 @@
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "license": "MIT"
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -144,15 +125,20 @@
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
     },
     "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz",
+      "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==",
+      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "pend": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/yazl": {
@@ -169,13 +155,13 @@
       "version": "17.0.24",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.24.tgz",
       "integrity": "sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==",
-      "devOptional": true
+      "dev": true
     },
     "@types/yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "@types/node": "*"
       }
@@ -195,11 +181,11 @@
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
     },
     "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "requires": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       }
     },
     "end-of-stream": {
@@ -210,25 +196,6 @@
         "once": "^1.4.0"
       }
     },
-    "extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      }
-    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
     "get-stream": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -238,14 +205,14 @@
       }
     },
     "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "requires": {
         "wrappy": "1"
       }
@@ -253,12 +220,12 @@
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
     },
     "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -267,15 +234,15 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
     },
     "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz",
+      "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==",
       "requires": {
         "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "pend": "~1.2.0"
       }
     },
     "yazl": {
diff --git a/packages/playwright-core/bundles/zip/package.json b/packages/playwright-core/bundles/zip/package.json
index 0d9650d2841be..a9b4976072900 100644
--- a/packages/playwright-core/bundles/zip/package.json
+++ b/packages/playwright-core/bundles/zip/package.json
@@ -2,15 +2,11 @@
   "name": "zip-bundle",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "esbuild": "node build.js",
-    "build": "npm run esbuild -- --minify",
-    "watch": "npm run esbuild -- --watch --sourcemap",
-    "generate-license": "node ../../../../utils/generate_third_party_notice.js"
-  },
   "dependencies": {
-    "extract-zip": "2.0.1",
-    "yauzl": "2.10.0",
+    "debug": "^4.1.1",
+    "get-stream": "^5.1.0",
+
+    "yauzl": "3.2.0",
     "yazl": "2.5.1"
   },
   "devDependencies": {
diff --git a/packages/playwright-core/bundles/zip/src/third_party/extract-zip.d.ts b/packages/playwright-core/bundles/zip/src/third_party/extract-zip.d.ts
new file mode 100644
index 0000000000000..9c15913775bb8
--- /dev/null
+++ b/packages/playwright-core/bundles/zip/src/third_party/extract-zip.d.ts
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2014 Max Ogden and other contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// Based on the type definitions for extract-zip 1.6
+// Definitions by: Mizunashi Mana <https://github.com/mizunashi-mana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/e69b58e/types/extract-zip/index.d.ts
+
+import { Entry, ZipFile } from 'yauzl';
+
+declare namespace extract {
+    interface Options {
+        /** The path to the directory where the extracted files are written */
+        dir: string;
+        /** Directory Mode (permissions), defaults to `0o755` */
+        defaultDirMode?: number;
+        /** File Mode (permissions), defaults to `0o644` */
+        defaultFileMode?: number;
+        /**
+         * If present, will be called with (entry, zipfile),
+         * entry is every entry from the zip file forwarded
+         * from the entry event from yauzl. zipfile is the
+         * yauzl instance
+         */
+        onEntry?: (entry: Entry, zipfile: ZipFile) => void;
+    }
+}
+
+declare function extract(
+  zipPath: string,
+  opts: extract.Options,
+): Promise<void>;
+
+export = extract;
diff --git a/packages/playwright-core/bundles/zip/src/third_party/extract-zip.js b/packages/playwright-core/bundles/zip/src/third_party/extract-zip.js
new file mode 100644
index 0000000000000..0dd76be59559e
--- /dev/null
+++ b/packages/playwright-core/bundles/zip/src/third_party/extract-zip.js
@@ -0,0 +1,199 @@
+/**
+ * Copyright (c) 2014 Max Ogden and other contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+const debug = require('debug')('extract-zip')
+// eslint-disable-next-line node/no-unsupported-features/node-builtins
+const { createWriteStream, promises: fs } = require('fs')
+const getStream = require('get-stream')
+const path = require('path')
+const { promisify } = require('util')
+const stream = require('stream')
+const yauzl = require('yauzl')
+
+const openZip = promisify(yauzl.open)
+const pipeline = promisify(stream.pipeline)
+
+class Extractor {
+  constructor (zipPath, opts) {
+    this.zipPath = zipPath
+    this.opts = opts
+  }
+
+  async extract () {
+    debug('opening', this.zipPath, 'with opts', this.opts)
+
+    this.zipfile = await openZip(this.zipPath, { lazyEntries: true })
+    this.canceled = false
+
+    return new Promise((resolve, reject) => {
+      this.zipfile.on('error', err => {
+        this.canceled = true
+        reject(err)
+      })
+      this.zipfile.readEntry()
+
+      this.zipfile.on('close', () => {
+        if (!this.canceled) {
+          debug('zip extraction complete')
+          resolve()
+        }
+      })
+
+      this.zipfile.on('entry', async entry => {
+        /* istanbul ignore if */
+        if (this.canceled) {
+          debug('skipping entry', entry.fileName, { cancelled: this.canceled })
+          return
+        }
+
+        debug('zipfile entry', entry.fileName)
+
+        if (entry.fileName.startsWith('__MACOSX/')) {
+          this.zipfile.readEntry()
+          return
+        }
+
+        const destDir = path.dirname(path.join(this.opts.dir, entry.fileName))
+
+        try {
+          await fs.mkdir(destDir, { recursive: true })
+
+          const canonicalDestDir = await fs.realpath(destDir)
+          const relativeDestDir = path.relative(this.opts.dir, canonicalDestDir)
+
+          if (relativeDestDir.split(path.sep).includes('..')) {
+            throw new Error(`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`)
+          }
+
+          await this.extractEntry(entry)
+          debug('finished processing', entry.fileName)
+          this.zipfile.readEntry()
+        } catch (err) {
+          this.canceled = true
+          this.zipfile.close()
+          reject(err)
+        }
+      })
+    })
+  }
+
+  async extractEntry (entry) {
+    /* istanbul ignore if */
+    if (this.canceled) {
+      debug('skipping entry extraction', entry.fileName, { cancelled: this.canceled })
+      return
+    }
+
+    if (this.opts.onEntry) {
+      this.opts.onEntry(entry, this.zipfile)
+    }
+
+    const dest = path.join(this.opts.dir, entry.fileName)
+
+    // convert external file attr int into a fs stat mode int
+    const mode = (entry.externalFileAttributes >> 16) & 0xFFFF
+    // check if it's a symlink or dir (using stat mode constants)
+    const IFMT = 61440
+    const IFDIR = 16384
+    const IFLNK = 40960
+    const symlink = (mode & IFMT) === IFLNK
+    let isDir = (mode & IFMT) === IFDIR
+
+    // Failsafe, borrowed from jsZip
+    if (!isDir && entry.fileName.endsWith('/')) {
+      isDir = true
+    }
+
+    // check for windows weird way of specifying a directory
+    // https://github.com/maxogden/extract-zip/issues/13#issuecomment-154494566
+    const madeBy = entry.versionMadeBy >> 8
+    if (!isDir) isDir = (madeBy === 0 && entry.externalFileAttributes === 16)
+
+    debug('extracting entry', { filename: entry.fileName, isDir: isDir, isSymlink: symlink })
+
+    const procMode = this.getExtractedMode(mode, isDir) & 0o777
+
+    // always ensure folders are created
+    const destDir = isDir ? dest : path.dirname(dest)
+
+    const mkdirOptions = { recursive: true }
+    if (isDir) {
+      mkdirOptions.mode = procMode
+    }
+    debug('mkdir', { dir: destDir, ...mkdirOptions })
+    await fs.mkdir(destDir, mkdirOptions)
+    if (isDir) return
+
+    debug('opening read stream', dest)
+    const readStream = await promisify(this.zipfile.openReadStream.bind(this.zipfile))(entry)
+
+    if (symlink) {
+      const link = await getStream(readStream)
+      debug('creating symlink', link, dest)
+      await fs.symlink(link, dest)
+    } else {
+      await pipeline(readStream, createWriteStream(dest, { mode: procMode }))
+    }
+  }
+
+  getExtractedMode (entryMode, isDir) {
+    let mode = entryMode
+    // Set defaults, if necessary
+    if (mode === 0) {
+      if (isDir) {
+        if (this.opts.defaultDirMode) {
+          mode = parseInt(this.opts.defaultDirMode, 10)
+        }
+
+        if (!mode) {
+          mode = 0o755
+        }
+      } else {
+        if (this.opts.defaultFileMode) {
+          mode = parseInt(this.opts.defaultFileMode, 10)
+        }
+
+        if (!mode) {
+          mode = 0o644
+        }
+      }
+    }
+
+    return mode
+  }
+}
+
+module.exports = async function (zipPath, opts) {
+  debug('creating target directory', opts.dir)
+
+  if (!path.isAbsolute(opts.dir)) {
+    throw new Error('Target directory is expected to be absolute')
+  }
+
+  await fs.mkdir(opts.dir, { recursive: true })
+  opts.dir = await fs.realpath(opts.dir)
+  return new Extractor(zipPath, opts).extract()
+}
diff --git a/packages/playwright-core/bundles/zip/src/zipBundleImpl.ts b/packages/playwright-core/bundles/zip/src/zipBundleImpl.ts
index b69e1a168a71a..a26529342792f 100644
--- a/packages/playwright-core/bundles/zip/src/zipBundleImpl.ts
+++ b/packages/playwright-core/bundles/zip/src/zipBundleImpl.ts
@@ -16,5 +16,5 @@
 
 export * as yazl from 'yazl';
 export * as yauzl from 'yauzl';
-import extractZip from 'extract-zip';
+const extractZip = require('./third_party/extract-zip');
 export const extract = extractZip;
diff --git a/packages/playwright-core/index.js b/packages/playwright-core/index.js
index 3d246e9f14eac..d4991d0ed26c8 100644
--- a/packages/playwright-core/index.js
+++ b/packages/playwright-core/index.js
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const minimumMajorNodeVersion = 14;
+const minimumMajorNodeVersion = 18;
 const currentNodeVersion = process.versions.node;
 const semver = currentNodeVersion.split('.');
 const [major] = [+semver[0]];
 
 if (major < minimumMajorNodeVersion) {
-  // eslint-disable-next-line no-console
   console.error(
       'You are running Node.js ' +
       currentNodeVersion +
diff --git a/packages/playwright-core/package.json b/packages/playwright-core/package.json
index c003463218927..8f24ee3ba93c2 100644
--- a/packages/playwright-core/package.json
+++ b/packages/playwright-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playwright-core",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -23,15 +23,15 @@
     },
     "./package.json": "./package.json",
     "./lib/outofprocess": "./lib/outofprocess.js",
-    "./lib/image_tools/stats": "./lib/image_tools/stats.js",
-    "./lib/image_tools/compare": "./lib/image_tools/compare.js",
-    "./lib/image_tools/imageChannel": "./lib/image_tools/imageChannel.js",
-    "./lib/image_tools/colorUtils": "./lib/image_tools/colorUtils.js",
     "./lib/cli/program": "./lib/cli/program.js",
-    "./lib/server/registry/index": "./lib/server/registry/index.js",
     "./lib/remote/playwrightServer": "./lib/remote/playwrightServer.js",
     "./lib/server": "./lib/server/index.js",
-    "./lib/utils": "./lib/utils/index.js",
+    "./lib/server/utils/image_tools/stats": "./lib/server/utils/image_tools/stats.js",
+    "./lib/server/utils/image_tools/compare": "./lib/server/utils/image_tools/compare.js",
+    "./lib/server/utils/image_tools/imageChannel": "./lib/server/utils/image_tools/imageChannel.js",
+    "./lib/server/utils/image_tools/colorUtils": "./lib/server/utils/image_tools/colorUtils.js",
+    "./lib/server/registry/index": "./lib/server/registry/index.js",
+    "./lib/utils": "./lib/utils.js",
     "./lib/utilsBundle": "./lib/utilsBundle.js",
     "./lib/zipBundle": "./lib/zipBundle.js",
     "./types/protocol": "./types/protocol.d.ts",
diff --git a/packages/playwright-core/src/DEPS.list b/packages/playwright-core/src/DEPS.list
index 2f7995ab62d55..c4f50cb22e158 100644
--- a/packages/playwright-core/src/DEPS.list
+++ b/packages/playwright-core/src/DEPS.list
@@ -1,13 +1,29 @@
 [browserServerImpl.ts]
-**
+remote/
+server/
+server/utils
+utils/isomorphic/
+utilsBundle.ts
+protocol/validator.ts
+protocol/validatorPrimitives.ts
 
 [androidServerImpl.ts]
-**
+remote/
+server/
+server/utils
+utils/isomorphic/
+utilsBundle.ts
 
 [inProcessFactory.ts]
 **
 
+[inprocess.ts]
+utils/
+server/utils
+
 [outofprocess.ts]
 client/
 protocol/
 utils/
+utils/isomorphic
+server/utils
diff --git a/packages/playwright-core/src/androidServerImpl.ts b/packages/playwright-core/src/androidServerImpl.ts
index a0d7bb5496b01..a147cecea4d9a 100644
--- a/packages/playwright-core/src/androidServerImpl.ts
+++ b/packages/playwright-core/src/androidServerImpl.ts
@@ -14,23 +14,26 @@
  * limitations under the License.
  */
 
-import type { LaunchAndroidServerOptions } from './client/types';
+import { PlaywrightServer } from './remote/playwrightServer';
+import { createPlaywright } from './server/playwright';
+import { createGuid } from './server/utils/crypto';
 import { ws } from './utilsBundle';
-import type { WebSocketEventEmitter } from './utilsBundle';
+import { ProgressController } from './server/progress';
+
 import type { BrowserServer } from './client/browserType';
-import { createGuid } from './utils';
-import { createPlaywright } from './server/playwright';
-import { PlaywrightServer } from './remote/playwrightServer';
+import type { LaunchAndroidServerOptions } from './client/types';
+import type { WebSocketEventEmitter } from './utilsBundle';
 
 export class AndroidServerLauncherImpl {
   async launchServer(options: LaunchAndroidServerOptions = {}): Promise<BrowserServer> {
     const playwright = createPlaywright({ sdkLanguage: 'javascript', isServer: true });
     // 1. Pre-connect to the device
-    let devices = await playwright.android.devices({
+    const controller = new ProgressController();
+    let devices = await controller.run(progress => playwright.android.devices(progress, {
       host: options.adbHost,
       port: options.adbPort,
       omitDriverInstall: options.omitDriverInstall,
-    });
+    }));
 
     if (devices.length === 0)
       throw new Error('No devices found');
@@ -38,7 +41,7 @@ export class AndroidServerLauncherImpl {
     if (options.deviceSerialNumber) {
       devices = devices.filter(d => d.serial === options.deviceSerialNumber);
       if (devices.length === 0)
-        throw new Error(`No device with serial number '${options.deviceSerialNumber}' not found`);
+        throw new Error(`No device with serial number '${options.deviceSerialNumber}' was found`);
     }
 
     if (devices.length > 1)
diff --git a/packages/playwright-core/src/browserServerImpl.ts b/packages/playwright-core/src/browserServerImpl.ts
index dfe960c5eaad7..c789991584afc 100644
--- a/packages/playwright-core/src/browserServerImpl.ts
+++ b/packages/playwright-core/src/browserServerImpl.ts
@@ -14,50 +14,78 @@
  * limitations under the License.
  */
 
-import type { LaunchServerOptions, Logger } from './client/types';
-import { ws } from './utilsBundle';
-import type { WebSocketEventEmitter } from './utilsBundle';
-import type { BrowserServerLauncher, BrowserServer } from './client/browserType';
-import { envObjectToArray } from './client/clientHelper';
-import { createGuid } from './utils';
-import type { ProtocolLogger } from './server/types';
-import { serverSideCallMetadata } from './server/instrumentation';
-import { createPlaywright } from './server/playwright';
 import { PlaywrightServer } from './remote/playwrightServer';
 import { helper } from './server/helper';
-import { rewriteErrorMessage } from './utils/stackTrace';
-import { SocksProxy } from './common/socksProxy';
+import { createPlaywright } from './server/playwright';
+import { createGuid } from './server/utils/crypto';
+import { isUnderTest } from './server/utils/debug';
+import { rewriteErrorMessage } from './utils/isomorphic/stackTrace';
+import { DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT } from './utils/isomorphic/time';
+import { ws } from './utilsBundle';
+import * as validatorPrimitives from './protocol/validatorPrimitives';
+import { ProgressController } from './server/progress';
+
+import type { BrowserServer, BrowserServerLauncher } from './client/browserType';
+import type { LaunchOptions, LaunchServerOptions, Logger, Env } from './client/types';
+import type { ProtocolLogger } from './server/types';
+import type { WebSocketEventEmitter } from './utilsBundle';
+import type { Browser } from './server/browser';
 
 export class BrowserServerLauncherImpl implements BrowserServerLauncher {
-  private _browserName: 'chromium' | 'firefox' | 'webkit';
+  private _browserName: 'chromium' | 'firefox' | 'webkit' | '_bidiFirefox' | '_bidiChromium';
 
-  constructor(browserName: 'chromium' | 'firefox' | 'webkit') {
+  constructor(browserName: 'chromium' | 'firefox' | 'webkit' | '_bidiFirefox' | '_bidiChromium') {
     this._browserName = browserName;
   }
 
-  async launchServer(options: LaunchServerOptions = {}): Promise<BrowserServer> {
+  async launchServer(options: LaunchOptions & LaunchServerOptions & { _userDataDir?: string } = {}): Promise<BrowserServer> {
     const playwright = createPlaywright({ sdkLanguage: 'javascript', isServer: true });
-    // TODO: enable socks proxy once ipv6 is supported.
-    const socksProxy = false ? new SocksProxy() : undefined;
-    playwright.options.socksProxyPort = await socksProxy?.listen(0);
-
     // 1. Pre-launch the browser
-    const metadata = serverSideCallMetadata();
-    const browser = await playwright[this._browserName].launch(metadata, {
+    const metadata = { id: '', startTime: 0, endTime: 0, type: 'Internal', method: '', params: {}, log: [], internal: true };
+    const validatorContext = {
+      tChannelImpl: (names: '*' | string[], arg: any, path: string) => {
+        throw new validatorPrimitives.ValidationError(`${path}: channels are not expected in launchServer`);
+      },
+      binary: 'buffer',
+      isUnderTest,
+    } satisfies validatorPrimitives.ValidatorContext;
+    let launchOptions = {
       ...options,
       ignoreDefaultArgs: Array.isArray(options.ignoreDefaultArgs) ? options.ignoreDefaultArgs : undefined,
       ignoreAllDefaultArgs: !!options.ignoreDefaultArgs && !Array.isArray(options.ignoreDefaultArgs),
       env: options.env ? envObjectToArray(options.env) : undefined,
-    }, toProtocolLogger(options.logger)).catch(e => {
+      timeout: options.timeout ?? DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT,
+    };
+
+    let browser: Browser;
+    try {
+      const controller = new ProgressController(metadata);
+      browser = await controller.run(async progress => {
+        if (options._userDataDir !== undefined) {
+          const validator = validatorPrimitives.scheme['BrowserTypeLaunchPersistentContextParams'];
+          launchOptions = validator({ ...launchOptions, userDataDir: options._userDataDir }, '', validatorContext);
+          const context = await playwright[this._browserName].launchPersistentContext(progress, options._userDataDir, launchOptions);
+          return context._browser;
+        } else {
+          const validator = validatorPrimitives.scheme['BrowserTypeLaunchParams'];
+          launchOptions = validator(launchOptions, '', validatorContext);
+          return await playwright[this._browserName].launch(progress, launchOptions, toProtocolLogger(options.logger));
+        }
+      });
+    } catch (e) {
       const log = helper.formatBrowserLogs(metadata.log);
       rewriteErrorMessage(e, `${e.message} Failed to launch browser.${log}`);
       throw e;
-    });
+    }
+
+    return this.launchServerOnExistingBrowser(browser, options);
+  }
 
+  async launchServerOnExistingBrowser(browser: Browser, options: LaunchServerOptions): Promise<BrowserServer> {
     const path = options.wsPath ? (options.wsPath.startsWith('/') ? options.wsPath : `/${options.wsPath}`) : `/${createGuid()}`;
 
     // 2. Start the server
-    const server = new PlaywrightServer({ mode: 'launchServer', path, maxConnections: Infinity, preLaunchedBrowser: browser, preLaunchedSocksProxy: socksProxy });
+    const server = new PlaywrightServer({ mode: options._sharedBrowser ? 'launchServerShared' : 'launchServer', path, maxConnections: Infinity, preLaunchedBrowser: browser, debugController: options._debugController });
     const wsEndpoint = await server.listen(options.port, options.host);
 
     // 3. Return the BrowserServer interface
@@ -70,7 +98,6 @@ export class BrowserServerLauncherImpl implements BrowserServerLauncher {
     (browserServer as any)._disconnectForTest = () => server.close();
     (browserServer as any)._userDataDirForTest = (browser as any)._userDataDirForTest;
     browser.options.browserProcess.onclose = (exitCode, signal) => {
-      socksProxy?.close().catch(() => {});
       server.close();
       browserServer.emit('close', exitCode, signal);
     };
@@ -84,3 +111,12 @@ function toProtocolLogger(logger: Logger | undefined): ProtocolLogger | undefine
       logger.log('protocol', 'verbose', (direction === 'send' ? 'SEND ► ' : '◀ RECV ') + JSON.stringify(message), [], {});
   } : undefined;
 }
+
+function envObjectToArray(env: Env): { name: string, value: string }[] {
+  const result: { name: string, value: string }[] = [];
+  for (const name in env) {
+    if (!Object.is(env[name], undefined))
+      result.push({ name, value: String(env[name]) });
+  }
+  return result;
+}
diff --git a/packages/playwright-core/src/cli/DEPS.list b/packages/playwright-core/src/cli/DEPS.list
index ab30158290a6d..f828f97330198 100644
--- a/packages/playwright-core/src/cli/DEPS.list
+++ b/packages/playwright-core/src/cli/DEPS.list
@@ -1,18 +1,15 @@
 [*]
 ../../
-../client
-../common
-../debug/injected
 ../generated/
-../server/injected/
+../server/
 ../server/trace
+../server/utils
 ../utils
 ../utilsBundle.ts
 
 [program.ts]
 ../server/trace/viewer/traceViewer.ts
 ../server/
-../containers/
 
 [driver.ts]
 ../**
diff --git a/packages/playwright-core/src/cli/driver.ts b/packages/playwright-core/src/cli/driver.ts
index e48dc2a4d2c35..f716d8efa7aaa 100644
--- a/packages/playwright-core/src/cli/driver.ts
+++ b/packages/playwright-core/src/cli/driver.ts
@@ -17,13 +17,15 @@
 /* eslint-disable no-console */
 
 import fs from 'fs';
+
 import * as playwright from '../..';
+import { PipeTransport } from '../server/utils/pipeTransport';
+import { PlaywrightServer } from '../remote/playwrightServer';
+import { DispatcherConnection, PlaywrightDispatcher, RootDispatcher, createPlaywright } from '../server';
+import { gracefullyProcessExitDoNotHang } from '../server/utils/processLauncher';
+
 import type { BrowserType } from '../client/browserType';
 import type { LaunchServerOptions } from '../client/types';
-import { createPlaywright, DispatcherConnection, RootDispatcher, PlaywrightDispatcher } from '../server';
-import { PipeTransport } from '../protocol/transport';
-import { PlaywrightServer } from '../remote/playwrightServer';
-import { gracefullyProcessExitDoNotHang } from '../utils/processLauncher';
 
 export function printApiJson() {
   // Note: this file is generated by build-playwright-driver.sh
@@ -36,6 +38,7 @@ export function runDriver() {
     const playwright = createPlaywright({ sdkLanguage });
     return new PlaywrightDispatcher(rootScope, playwright);
   });
+  // eslint-disable-next-line no-restricted-properties
   const transport = new PipeTransport(process.stdout, process.stdin);
   transport.onmessage = (message: string) => dispatcherConnection.dispatch(JSON.parse(message));
   // Certain Language Binding JSON parsers (e.g. .NET) do not like strings with lone surrogates.
diff --git a/packages/playwright-core/src/cli/program.ts b/packages/playwright-core/src/cli/program.ts
index ad943c049e0d8..5dc18774b7d47 100644
--- a/packages/playwright-core/src/cli/program.ts
+++ b/packages/playwright-core/src/cli/program.ts
@@ -19,23 +19,26 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import type { Command } from '../utilsBundle';
-import { program } from '../utilsBundle';
-export { program } from '../utilsBundle';
-import { runDriver, runServer, printApiJson, launchBrowserServer } from './driver';
-import { runTraceInBrowser, runTraceViewerApp } from '../server/trace/viewer/traceViewer';
-import type { TraceViewerServerOptions } from '../server/trace/viewer/traceViewer';
+
 import * as playwright from '../..';
-import type { BrowserContext } from '../client/browserContext';
+import { launchBrowserServer, printApiJson, runDriver, runServer } from './driver';
+import { registry, writeDockerVersion } from '../server';
+import { gracefullyProcessExitDoNotHang, isLikelyNpxGlobal, ManualPromise } from '../utils';
+import { runTraceInBrowser, runTraceViewerApp } from '../server/trace/viewer/traceViewer';
+import { assert, getPackageManagerExecCommand } from '../utils';
+import { wrapInASCIIBox } from '../server/utils/ascii';
+import { dotenv, program } from '../utilsBundle';
+
 import type { Browser } from '../client/browser';
-import type { Page } from '../client/page';
+import type { BrowserContext } from '../client/browserContext';
 import type { BrowserType } from '../client/browserType';
+import type { Page } from '../client/page';
 import type { BrowserContextOptions, LaunchOptions } from '../client/types';
-import { spawn } from 'child_process';
-import { wrapInASCIIBox, isLikelyNpxGlobal, assert, gracefullyProcessExitDoNotHang, getPackageManagerExecCommand } from '../utils';
-import type { Executable } from '../server';
-import { registry, writeDockerVersion } from '../server';
-import { isTargetClosedError } from '../client/errors';
+import type { Executable, BrowserInfo } from '../server';
+import type { TraceViewerServerOptions } from '../server/trace/viewer/traceViewer';
+import type { Command } from '../utilsBundle';
+
+export { program } from '../utilsBundle';
 
 const packageJSON = require('../../package.json');
 
@@ -54,7 +57,7 @@ program
 
 commandWithOpenOptions('open [url]', 'open page in browser specified via -b, --browser', [])
     .action(function(url, options) {
-      open(options, url, codegenId()).catch(logErrorAndExit);
+      open(options, url).catch(logErrorAndExit);
     })
     .addHelpText('afterAll', `
 Examples:
@@ -66,10 +69,9 @@ commandWithOpenOptions('codegen [url]', 'open page and generate code for user ac
     [
       ['-o, --output <file name>', 'saves the generated script to a file'],
       ['--target <language>', `language to generate, one of javascript, playwright-test, python, python-async, python-pytest, csharp, csharp-mstest, csharp-nunit, java, java-junit`, codegenId()],
-      ['--save-trace <filename>', 'record a trace for the session and save it to a file'],
       ['--test-id-attribute <attributeName>', 'use the specified attribute to generate data test ID selectors'],
-    ]).action(function(url, options) {
-  codegen(options, url).catch(logErrorAndExit);
+    ]).action(async function(url, options) {
+  await codegen(options, url);
 }).addHelpText('afterAll', `
 Examples:
 
@@ -77,48 +79,124 @@ Examples:
   $ codegen --target=python
   $ codegen -b webkit https://example.com`);
 
-program
-    .command('debug <app> [args...]', { hidden: true })
-    .description('run command in debug mode: disable timeout, open inspector')
-    .allowUnknownOption(true)
-    .action(function(app, options) {
-      spawn(app, options, {
-        env: { ...process.env, PWDEBUG: '1' },
-        stdio: 'inherit'
-      });
-    }).addHelpText('afterAll', `
-Examples:
-
-  $ debug node test.js
-  $ debug npm run test`);
-
 function suggestedBrowsersToInstall() {
   return registry.executables().filter(e => e.installType !== 'none' && e.type !== 'tool').map(e => e.name).join(', ');
 }
 
-function checkBrowsersToInstall(args: string[]): Executable[] {
+function defaultBrowsersToInstall(options: { noShell?: boolean, onlyShell?: boolean }): Executable[] {
+  let executables = registry.defaultExecutables();
+  if (options.noShell)
+    executables = executables.filter(e => e.name !== 'chromium-headless-shell');
+  if (options.onlyShell)
+    executables = executables.filter(e => e.name !== 'chromium');
+  return executables;
+}
+
+function checkBrowsersToInstall(args: string[], options: { noShell?: boolean, onlyShell?: boolean }): Executable[] {
+  if (options.noShell && options.onlyShell)
+    throw new Error(`Only one of --no-shell and --only-shell can be specified`);
+
   const faultyArguments: string[] = [];
   const executables: Executable[] = [];
-  for (const arg of args) {
+  const handleArgument = (arg: string) => {
     const executable = registry.findExecutable(arg);
     if (!executable || executable.installType === 'none')
       faultyArguments.push(arg);
     else
       executables.push(executable);
+    if (executable?.browserName === 'chromium')
+      executables.push(registry.findExecutable('ffmpeg')!);
+  };
+
+  for (const arg of args) {
+    if (arg === 'chromium') {
+      if (!options.onlyShell)
+        handleArgument('chromium');
+      if (!options.noShell)
+        handleArgument('chromium-headless-shell');
+    } else {
+      handleArgument(arg);
+    }
   }
+
+  if (process.platform === 'win32')
+    executables.push(registry.findExecutable('winldd')!);
+
   if (faultyArguments.length)
     throw new Error(`Invalid installation targets: ${faultyArguments.map(name => `'${name}'`).join(', ')}. Expecting one of: ${suggestedBrowsersToInstall()}`);
   return executables;
 }
 
+function printInstalledBrowsers(browsers: BrowserInfo[]) {
+  const browserPaths = new Set<string>();
+  for (const browser of browsers)
+    browserPaths.add(browser.browserPath);
+  console.log(`  Browsers:`);
+  for (const browserPath of [...browserPaths].sort())
+    console.log(`    ${browserPath}`);
+  console.log(`  References:`);
+
+  const references = new Set<string>();
+  for (const browser of browsers)
+    references.add(browser.referenceDir);
+  for (const reference of [...references].sort())
+    console.log(`    ${reference}`);
+}
+
+function printGroupedByPlaywrightVersion(browsers: BrowserInfo[]) {
+  const dirToVersion = new Map<string, string>();
+  for (const browser of browsers) {
+    if (dirToVersion.has(browser.referenceDir))
+      continue;
+    const packageJSON = require(path.join(browser.referenceDir, 'package.json'));
+    const version = packageJSON.version;
+    dirToVersion.set(browser.referenceDir, version);
+  }
+
+  const groupedByPlaywrightMinorVersion = new Map<string, BrowserInfo[]>();
+  for (const browser of browsers) {
+    const version = dirToVersion.get(browser.referenceDir)!;
+    let entries = groupedByPlaywrightMinorVersion.get(version);
+    if (!entries) {
+      entries = [];
+      groupedByPlaywrightMinorVersion.set(version, entries);
+    }
+    entries.push(browser);
+  }
+
+  const sortedVersions = [...groupedByPlaywrightMinorVersion.keys()].sort((a, b) => {
+    const aComponents = a.split('.');
+    const bComponents = b.split('.');
+    const aMajor = parseInt(aComponents[0], 10);
+    const bMajor = parseInt(bComponents[0], 10);
+    if (aMajor !== bMajor)
+      return aMajor - bMajor;
+    const aMinor = parseInt(aComponents[1], 10);
+    const bMinor = parseInt(bComponents[1], 10);
+    if (aMinor !== bMinor)
+      return aMinor - bMinor;
+    return aComponents.slice(2).join('.').localeCompare(bComponents.slice(2).join('.'));
+  });
+
+  for (const version of sortedVersions) {
+    console.log(`\nPlaywright version: ${version}`);
+    printInstalledBrowsers(groupedByPlaywrightMinorVersion.get(version)!);
+  }
+}
 
 program
     .command('install [browser...]')
     .description('ensure browsers necessary for this version of Playwright are installed')
     .option('--with-deps', 'install system dependencies for browsers')
     .option('--dry-run', 'do not execute installation, only print information')
+    .option('--list', 'prints list of browsers from all playwright installations')
     .option('--force', 'force reinstall of stable browser channels')
-    .action(async function(args: string[], options: { withDeps?: boolean, force?: boolean, dryRun?: boolean }) {
+    .option('--only-shell', 'only install headless shell when installing chromium')
+    .option('--no-shell', 'do not install chromium headless shell')
+    .action(async function(args: string[], options: { withDeps?: boolean, force?: boolean, dryRun?: boolean, list?: boolean, shell?: boolean, noShell?: boolean, onlyShell?: boolean }) {
+      // For '--no-shell' option, commander sets `shell: false` instead.
+      if (options.shell === false)
+        options.noShell = true;
       if (isLikelyNpxGlobal()) {
         console.error(wrapInASCIIBox([
           `WARNING: It looks like you are running 'npx playwright install' without first`,
@@ -141,9 +219,11 @@ program
       }
       try {
         const hasNoArguments = !args.length;
-        const executables = hasNoArguments ? registry.defaultExecutables() : checkBrowsersToInstall(args);
+        const executables = hasNoArguments ? defaultBrowsersToInstall(options) : checkBrowsersToInstall(args, options);
         if (options.withDeps)
           await registry.installDeps(executables, !!options.dryRun);
+        if (options.dryRun && options.list)
+          throw new Error(`Only one of --dry-run and --list can be specified`);
         if (options.dryRun) {
           for (const executable of executables) {
             const version = executable.browserVersion ? `version ` + executable.browserVersion : '';
@@ -157,6 +237,9 @@ program
             }
             console.log(``);
           }
+        } else if (options.list) {
+          const browsers = await registry.listInstalledBrowsers();
+          printGroupedByPlaywrightVersion(browsers);
         } else {
           const forceReinstall = hasNoArguments ? false : !!options.force;
           await registry.install(executables, forceReinstall);
@@ -199,9 +282,9 @@ program
     .action(async function(args: string[], options: { dryRun?: boolean }) {
       try {
         if (!args.length)
-          await registry.installDeps(registry.defaultExecutables(), !!options.dryRun);
+          await registry.installDeps(defaultBrowsersToInstall({}), !!options.dryRun);
         else
-          await registry.installDeps(checkBrowsersToInstall(args), !!options.dryRun);
+          await registry.installDeps(checkBrowsersToInstall(args, {}), !!options.dryRun);
       } catch (e) {
         console.log(`Failed to install browser dependencies\n${e}`);
         gracefullyProcessExitDoNotHang(1);
@@ -223,7 +306,7 @@ const browsers = [
 for (const { alias, name, type } of browsers) {
   commandWithOpenOptions(`${alias} [url]`, `open page in ${name}`, [])
       .action(function(url, options) {
-        open({ ...options, browser: type }, url, options.target).catch(logErrorAndExit);
+        open({ ...options, browser: type }, url).catch(logErrorAndExit);
       }).addHelpText('afterAll', `
 Examples:
 
@@ -244,6 +327,7 @@ Examples:
 
 commandWithOpenOptions('pdf <url> <filename>', 'save page as pdf',
     [
+      ['--paper-format <format>', 'paper format: Letter, Legal, Tabloid, Ledger, A0, A1, A2, A3, A4, A5, A6'],
       ['--wait-for-selector <selector>', 'wait for given selector before saving as pdf'],
       ['--wait-for-timeout <timeout>', 'wait for given timeout in milliseconds before saving as pdf'],
     ]).action(function(url, filename, options) {
@@ -260,7 +344,7 @@ program
     });
 
 program
-    .command('run-server', { hidden: true })
+    .command('run-server')
     .option('--port <port>', 'Server port')
     .option('--host <host>', 'Server host')
     .option('--path <path>', 'Endpoint Path', '/')
@@ -335,23 +419,24 @@ type Options = {
   saveHar?: string;
   saveHarGlob?: string;
   saveStorage?: string;
-  saveTrace?: string;
   timeout: string;
   timezone?: string;
   viewportSize?: string;
   userAgent?: string;
+  userDataDir?: string;
 };
 
 type CaptureOptions = {
   waitForSelector?: string;
   waitForTimeout?: string;
   fullPage: boolean;
+  paperFormat?: string;
 };
 
-async function launchContext(options: Options, headless: boolean, executablePath?: string): Promise<{ browser: Browser, browserName: string, launchOptions: LaunchOptions, contextOptions: BrowserContextOptions, context: BrowserContext }> {
+async function launchContext(options: Options, extraOptions: LaunchOptions): Promise<{ browser: Browser, browserName: string, launchOptions: LaunchOptions, contextOptions: BrowserContextOptions, context: BrowserContext, closeBrowser: () => Promise<void> }> {
   validateOptions(options);
   const browserType = lookupBrowserType(options);
-  const launchOptions: LaunchOptions = { headless, executablePath };
+  const launchOptions: LaunchOptions = extraOptions;
   if (options.channel)
     launchOptions.channel = options.channel as any;
   launchOptions.handleSIGINT = false;
@@ -363,7 +448,7 @@ async function launchContext(options: Options, headless: boolean, executablePath
   // In headful mode, use host device scale factor for things to look nice.
   // In headless, keep things the way it works in Playwright by default.
   // Assume high-dpi on MacOS. TODO: this is not perfect.
-  if (!headless)
+  if (!extraOptions.headless)
     contextOptions.deviceScaleFactor = os.platform() === 'darwin' ? 2 : 1;
 
   // Work around the WebKit GTK scrolling issue.
@@ -388,40 +473,15 @@ async function launchContext(options: Options, headless: boolean, executablePath
       launchOptions.proxy.bypass = options.proxyBypass;
   }
 
-  const browser = await browserType.launch(launchOptions);
-
-  if (process.env.PWTEST_CLI_IS_UNDER_TEST) {
-    (process as any)._didSetSourcesForTest = (text: string) => {
-      process.stdout.write('\n-------------8<-------------\n');
-      process.stdout.write(text);
-      process.stdout.write('\n-------------8<-------------\n');
-      const autoExitCondition = process.env.PWTEST_CLI_AUTO_EXIT_WHEN;
-      if (autoExitCondition && text.includes(autoExitCondition))
-        Promise.all(context.pages().map(async p => p.close()));
-    };
-    // Make sure we exit abnormally when browser crashes.
-    const logs: string[] = [];
-    require('playwright-core/lib/utilsBundle').debug.log = (...args: any[]) => {
-      const line = require('util').format(...args) + '\n';
-      logs.push(line);
-      process.stderr.write(line);
-    };
-    browser.on('disconnected', () => {
-      const hasCrashLine = logs.some(line => line.includes('process did exit:') && !line.includes('process did exit: exitCode=0, signal=null'));
-      if (hasCrashLine) {
-        process.stderr.write('Detected browser crash.\n');
-        gracefullyProcessExitDoNotHang(1);
-      }
-    });
-  }
-
   // Viewport size
   if (options.viewportSize) {
     try {
-      const [width, height] = options.viewportSize.split(',').map(n => parseInt(n, 10));
+      const [width, height] = options.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');
+      throw new Error('Invalid viewport size format: use "width,height", for example --viewport-size="800,600"');
     }
   }
 
@@ -477,9 +537,16 @@ async function launchContext(options: Options, headless: boolean, executablePath
     contextOptions.serviceWorkers = 'block';
   }
 
-  // Close app when the last window closes.
+  let browser: Browser;
+  let context: BrowserContext;
 
-  const context = await browser.newContext(contextOptions);
+  if (options.userDataDir) {
+    context = await browserType.launchPersistentContext(options.userDataDir, { ...launchOptions, ...contextOptions });
+    browser = context.browser()!;
+  } else {
+    browser = await browserType.launch(launchOptions);
+    context = await browser.newContext(contextOptions);
+  }
 
   let closingBrowser = false;
   async function closeBrowser() {
@@ -488,8 +555,6 @@ async function launchContext(options: Options, headless: boolean, executablePath
     if (closingBrowser)
       return;
     closingBrowser = true;
-    if (options.saveTrace)
-      await context.tracing.stop({ path: options.saveTrace });
     if (options.saveStorage)
       await context.storageState({ path: options.saveStorage }).catch(e => null);
     if (options.saveHar)
@@ -504,7 +569,7 @@ async function launchContext(options: Options, headless: boolean, executablePath
       if (hasPage)
         return;
       // Avoid the error when the last page is closed because the browser has been closed.
-      closeBrowser().catch(e => null);
+      closeBrowser().catch(() => {});
     });
   });
   process.on('SIGINT', async () => {
@@ -516,51 +581,44 @@ async function launchContext(options: Options, headless: boolean, executablePath
   context.setDefaultTimeout(timeout);
   context.setDefaultNavigationTimeout(timeout);
 
-  if (options.saveTrace)
-    await context.tracing.start({ screenshots: true, snapshots: true });
-
   // Omit options that we add automatically for presentation purpose.
   delete launchOptions.headless;
   delete launchOptions.executablePath;
   delete launchOptions.handleSIGINT;
   delete contextOptions.deviceScaleFactor;
-  return { browser, browserName: browserType.name(), context, contextOptions, launchOptions };
+  return { browser, browserName: browserType.name(), context, contextOptions, launchOptions, closeBrowser };
 }
 
 async function openPage(context: BrowserContext, url: string | undefined): Promise<Page> {
-  const page = await context.newPage();
+  let page = context.pages()[0];
+  if (!page)
+    page = await context.newPage();
   if (url) {
     if (fs.existsSync(url))
       url = 'file://' + path.resolve(url);
     else if (!url.startsWith('http') && !url.startsWith('file://') && !url.startsWith('about:') && !url.startsWith('data:'))
       url = 'http://' + url;
-    await page.goto(url).catch(error => {
-      if (process.env.PWTEST_CLI_AUTO_EXIT_WHEN && isTargetClosedError(error)) {
-        // Tests with PWTEST_CLI_AUTO_EXIT_WHEN might close page too fast, resulting
-        // in a stray navigation aborted error. We should ignore it.
-      } else {
-        throw error;
-      }
-    });
+    await page.goto(url);
   }
   return page;
 }
 
-async function open(options: Options, url: string | undefined, language: string) {
-  const { context, launchOptions, contextOptions } = await launchContext(options, !!process.env.PWTEST_CLI_HEADLESS, process.env.PWTEST_CLI_EXECUTABLE_PATH);
-  await context._enableRecorder({
-    language,
-    launchOptions,
-    contextOptions,
-    device: options.device,
-    saveStorage: options.saveStorage,
-  });
+async function open(options: Options, url: string | undefined) {
+  const { context } = await launchContext(options, { headless: !!process.env.PWTEST_CLI_HEADLESS, executablePath: process.env.PWTEST_CLI_EXECUTABLE_PATH });
   await openPage(context, url);
 }
 
 async function codegen(options: Options & { target: string, output?: string, testIdAttribute?: string }, url: string | undefined) {
   const { target: language, output: outputFile, testIdAttribute: testIdAttributeName } = options;
-  const { context, launchOptions, contextOptions } = await launchContext(options, !!process.env.PWTEST_CLI_HEADLESS, process.env.PWTEST_CLI_EXECUTABLE_PATH);
+  const tracesDir = path.join(os.tmpdir(), `playwright-recorder-trace-${Date.now()}`);
+  const { context, browser, launchOptions, contextOptions, closeBrowser } = await launchContext(options, {
+    headless: !!process.env.PWTEST_CLI_HEADLESS,
+    executablePath: process.env.PWTEST_CLI_EXECUTABLE_PATH,
+    tracesDir,
+  });
+  const donePromise = new ManualPromise<void>();
+  maybeSetupTestHooks(browser, closeBrowser, donePromise);
+  dotenv.config({ path: 'playwright.env' });
   await context._enableRecorder({
     language,
     launchOptions,
@@ -573,6 +631,49 @@ async function codegen(options: Options & { target: string, output?: string, tes
     handleSIGINT: false,
   });
   await openPage(context, url);
+  donePromise.resolve();
+}
+
+async function maybeSetupTestHooks(browser: Browser, closeBrowser: () => Promise<void>, donePromise: Promise<void>) {
+  if (!process.env.PWTEST_CLI_IS_UNDER_TEST)
+    return;
+
+  // Make sure we exit abnormally when browser crashes.
+  const logs: string[] = [];
+  require('playwright-core/lib/utilsBundle').debug.log = (...args: any[]) => {
+    const line = require('util').format(...args) + '\n';
+    logs.push(line);
+    // eslint-disable-next-line no-restricted-properties
+    process.stderr.write(line);
+  };
+  browser.on('disconnected', () => {
+    const hasCrashLine = logs.some(line => line.includes('process did exit:') && !line.includes('process did exit: exitCode=0, signal=null'));
+    if (hasCrashLine) {
+      // eslint-disable-next-line no-restricted-properties
+      process.stderr.write('Detected browser crash.\n');
+      gracefullyProcessExitDoNotHang(1);
+    }
+  });
+
+  const close = async () => {
+    await donePromise;
+    await closeBrowser();
+  };
+
+  if (process.env.PWTEST_CLI_EXIT_AFTER_TIMEOUT) {
+    setTimeout(close, +process.env.PWTEST_CLI_EXIT_AFTER_TIMEOUT);
+    return;
+  }
+
+  // Note: we cannot use SIGINT, as it is not available on Windows.
+  let stdin = '';
+  process.stdin.on('data', data => {
+    stdin += data.toString();
+    if (stdin.startsWith('exit')) {
+      process.stdin.destroy();
+      close();
+    }
+  });
 }
 
 async function waitForPage(page: Page, captureOptions: CaptureOptions) {
@@ -587,7 +688,7 @@ async function waitForPage(page: Page, captureOptions: CaptureOptions) {
 }
 
 async function screenshot(options: Options, captureOptions: CaptureOptions, url: string, path: string) {
-  const { context } = await launchContext(options, true);
+  const { context } = await launchContext(options, { headless: true });
   console.log('Navigating to ' + url);
   const page = await openPage(context, url);
   await waitForPage(page, captureOptions);
@@ -600,12 +701,12 @@ async function screenshot(options: Options, captureOptions: CaptureOptions, url:
 async function pdf(options: Options, captureOptions: CaptureOptions, url: string, path: string) {
   if (options.browser !== 'chromium')
     throw new Error('PDF creation is only working with Chromium');
-  const { context } = await launchContext({ ...options, browser: 'chromium' }, true);
+  const { context } = await launchContext({ ...options, browser: 'chromium' }, { headless: true });
   console.log('Navigating to ' + url);
   const page = await openPage(context, url);
   await waitForPage(page, captureOptions);
   console.log('Saving as pdf into ' + path);
-  await page.pdf!({ path });
+  await page.pdf!({ path, format: captureOptions.paperFormat });
   // launchContext takes care of closing the browser.
   await page.close();
 }
@@ -675,6 +776,7 @@ function commandWithOpenOptions(command: string, description: string, options: a
       .option('--timezone <time zone>', 'time zone to emulate, for example "Europe/Rome"')
       .option('--timeout <timeout>', 'timeout for Playwright actions in milliseconds, no timeout by default')
       .option('--user-agent <ua string>', 'specify user agent string')
+      .option('--user-data-dir <directory>', 'use the specified user data directory instead of a new context')
       .option('--viewport-size <size>', 'specify browser viewport size in pixels, for example "1280, 720"');
 }
 
diff --git a/packages/playwright-core/src/cli/programWithTestStub.ts b/packages/playwright-core/src/cli/programWithTestStub.ts
index 1c11c14ec2773..e7c42575260ee 100644
--- a/packages/playwright-core/src/cli/programWithTestStub.ts
+++ b/packages/playwright-core/src/cli/programWithTestStub.ts
@@ -16,7 +16,8 @@
 
 /* eslint-disable no-console */
 
-import { getPackageManager, gracefullyProcessExitDoNotHang } from '../utils';
+import { gracefullyProcessExitDoNotHang } from '../server/utils/processLauncher';
+import { getPackageManager } from '../utils';
 import { program } from './program';
 export { program } from './program';
 
@@ -54,7 +55,9 @@ const kExternalPlaywrightTestCommands = [
 ];
 function addExternalPlaywrightTestCommands() {
   for (const [command, description] of kExternalPlaywrightTestCommands) {
-    const playwrightTest = program.command(command).allowUnknownOption(true);
+    const playwrightTest = program.command(command)
+        .allowUnknownOption(true)
+        .allowExcessArguments(true);
     playwrightTest.description(`${description} Available in @playwright/test package.`);
     playwrightTest.action(async () => {
       printPlaywrightTestError(command);
diff --git a/packages/playwright-core/src/client/.eslintrc.js b/packages/playwright-core/src/client/.eslintrc.js
deleted file mode 100644
index 38d3ba3f0ba88..0000000000000
--- a/packages/playwright-core/src/client/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-module.exports = {
-  extends: '../../../.eslintrc.js',
-  plugins: ['internal-playwright'],
-  rules: {
-    'internal-playwright/await-promise-in-class-returns': 'error',
-  },
-};
diff --git a/packages/playwright-core/src/client/DEPS.list b/packages/playwright-core/src/client/DEPS.list
index 4be2917927a59..1c44a4a48b98d 100644
--- a/packages/playwright-core/src/client/DEPS.list
+++ b/packages/playwright-core/src/client/DEPS.list
@@ -1,5 +1,3 @@
 [*]
-../common/
 ../protocol/
-../utils/**
-../utilsBundle.ts
+../utils/isomorphic
diff --git a/packages/playwright-core/src/client/accessibility.ts b/packages/playwright-core/src/client/accessibility.ts
index a3390d8c58a47..02db39e801fae 100644
--- a/packages/playwright-core/src/client/accessibility.ts
+++ b/packages/playwright-core/src/client/accessibility.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import type { ElementHandle } from './elementHandle';
 import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
 
 type SerializedAXNode = Omit<channels.AXNode, 'valueString' | 'valueNumber' | 'children' | 'checked' | 'pressed'> & {
   value?: string|number,
diff --git a/packages/playwright-core/src/client/android.ts b/packages/playwright-core/src/client/android.ts
index 07912bfbdd654..834a30bbe11d7 100644
--- a/packages/playwright-core/src/client/android.ts
+++ b/packages/playwright-core/src/client/android.ts
@@ -14,27 +14,31 @@
  * limitations under the License.
  */
 
-import fs from 'fs';
-import { isString, isRegExp, monotonicTime } from '../utils';
-import type * as channels from '@protocol/channels';
-import { Events } from './events';
+import { EventEmitter } from './eventEmitter';
 import { BrowserContext, prepareBrowserContextParams } from './browserContext';
 import { ChannelOwner } from './channelOwner';
-import type * as api from '../../types/types';
-import type * as types from './types';
-import type { Page } from './page';
-import { TimeoutSettings } from '../common/timeoutSettings';
+import { TargetClosedError, isTargetClosedError } from './errors';
+import { Events } from './events';
 import { Waiter } from './waiter';
-import { EventEmitter } from 'events';
-import { Connection } from './connection';
-import { isTargetClosedError, TargetClosedError } from './errors';
-import { raceAgainstDeadline } from '../utils/timeoutRunner';
+import { TimeoutSettings } from './timeoutSettings';
+import { isRegExp, isString } from '../utils/isomorphic/rtti';
+import { monotonicTime } from '../utils/isomorphic/time';
+import { raceAgainstDeadline } from '../utils/isomorphic/timeoutRunner';
+import { connectOverWebSocket } from './webSocket';
+
+import type { Page } from './page';
+import type * as types from './types';
+import type * as api from '../../types/types';
 import type { AndroidServerLauncherImpl } from '../androidServerImpl';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
+import type { Playwright } from './playwright';
 
 type Direction = 'down' | 'up' | 'left' | 'right';
 type SpeedOptions = { speed?: number };
 
 export class Android extends ChannelOwner<channels.AndroidChannel> implements api.Android {
+  _playwright!: Playwright;
   readonly _timeoutSettings: TimeoutSettings;
   _serverLauncher?: AndroidServerLauncherImpl;
 
@@ -44,12 +48,11 @@ export class Android extends ChannelOwner<channels.AndroidChannel> implements ap
 
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.AndroidInitializer) {
     super(parent, type, guid, initializer);
-    this._timeoutSettings = new TimeoutSettings();
+    this._timeoutSettings = new TimeoutSettings(this._platform);
   }
 
   setDefaultTimeout(timeout: number) {
     this._timeoutSettings.setDefaultTimeout(timeout);
-    this._channel.setDefaultTimeoutNoReply({ timeout });
   }
 
   async devices(options: { port?: number } = {}): Promise<AndroidDevice[]> {
@@ -67,47 +70,29 @@ export class Android extends ChannelOwner<channels.AndroidChannel> implements ap
     return await this._wrapApiCall(async () => {
       const deadline = options.timeout ? monotonicTime() + options.timeout : 0;
       const headers = { 'x-playwright-browser': 'android', ...options.headers };
-      const localUtils = this._connection.localUtils();
-      const connectParams: channels.LocalUtilsConnectParams = { wsEndpoint, headers, slowMo: options.slowMo, timeout: options.timeout };
-      const { pipe } = await localUtils._channel.connect(connectParams);
-      const closePipe = () => pipe.close().catch(() => {});
-      const connection = new Connection(localUtils, this._instrumentation);
-      connection.markAsRemote();
-      connection.on('close', closePipe);
+      const connectParams: channels.LocalUtilsConnectParams = { wsEndpoint, headers, slowMo: options.slowMo, timeout: options.timeout || 0 };
+      const connection = await connectOverWebSocket(this._connection, connectParams);
 
       let device: AndroidDevice;
-      let closeError: string | undefined;
-      const onPipeClosed = () => {
+      connection.on('close', () => {
         device?._didClose();
-        connection.close(closeError);
-      };
-      pipe.on('closed', onPipeClosed);
-      connection.onmessage = message => pipe.send({ message }).catch(onPipeClosed);
-
-      pipe.on('message', ({ message }) => {
-        try {
-          connection!.dispatch(message);
-        } catch (e) {
-          closeError = String(e);
-          closePipe();
-        }
       });
 
       const result = await raceAgainstDeadline(async () => {
         const playwright = await connection!.initializePlaywright();
         if (!playwright._initializer.preConnectedAndroidDevice) {
-          closePipe();
+          connection.close();
           throw new Error('Malformed endpoint. Did you use Android.launchServer method?');
         }
         device = AndroidDevice.from(playwright._initializer.preConnectedAndroidDevice!);
         device._shouldCloseConnectionOnClose = true;
-        device.on(Events.AndroidDevice.Close, closePipe);
+        device.on(Events.AndroidDevice.Close, () => connection.close());
         return device;
       }, deadline);
       if (!result.timedOut) {
         return result.result;
       } else {
-        closePipe();
+        connection.close();
         throw new Error(`Timeout ${options.timeout}ms exceeded`);
       }
     });
@@ -117,6 +102,7 @@ export class Android extends ChannelOwner<channels.AndroidChannel> implements ap
 export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> implements api.AndroidDevice {
   readonly _timeoutSettings: TimeoutSettings;
   private _webViews = new Map<string, AndroidWebView>();
+  private _android: Android;
   _shouldCloseConnectionOnClose = false;
 
   static from(androidDevice: channels.AndroidDeviceChannel): AndroidDevice {
@@ -127,8 +113,9 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
 
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.AndroidDeviceInitializer) {
     super(parent, type, guid, initializer);
+    this._android = parent as Android;
     this.input = new AndroidInput(this);
-    this._timeoutSettings = new TimeoutSettings((parent as Android)._timeoutSettings);
+    this._timeoutSettings = new TimeoutSettings(this._platform, (parent as Android)._timeoutSettings);
     this._channel.on('webViewAdded', ({ webView }) => this._onWebViewAdded(webView));
     this._channel.on('webViewRemoved', ({ socketName }) => this._onWebViewRemoved(socketName));
     this._channel.on('close', () => this._didClose());
@@ -149,7 +136,6 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
 
   setDefaultTimeout(timeout: number) {
     this._timeoutSettings.setDefaultTimeout(timeout);
-    this._channel.setDefaultTimeoutNoReply({ timeout });
   }
 
   serial(): string {
@@ -178,59 +164,59 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
     return await this.waitForEvent('webview', { ...options, predicate });
   }
 
-  async wait(selector: api.AndroidSelector, options?: { state?: 'gone' } & types.TimeoutOptions) {
-    await this._channel.wait({ selector: toSelectorChannel(selector), ...options });
+  async wait(selector: api.AndroidSelector, options: { state?: 'gone' } & types.TimeoutOptions = {}) {
+    await this._channel.wait({ androidSelector: toSelectorChannel(selector), ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async fill(selector: api.AndroidSelector, text: string, options?: types.TimeoutOptions) {
-    await this._channel.fill({ selector: toSelectorChannel(selector), text, ...options });
+  async fill(selector: api.AndroidSelector, text: string, options: types.TimeoutOptions = {}) {
+    await this._channel.fill({ androidSelector: toSelectorChannel(selector), text, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async press(selector: api.AndroidSelector, key: api.AndroidKey, options?: types.TimeoutOptions) {
+  async press(selector: api.AndroidSelector, key: api.AndroidKey, options: types.TimeoutOptions = {}) {
     await this.tap(selector, options);
     await this.input.press(key);
   }
 
-  async tap(selector: api.AndroidSelector, options?: { duration?: number } & types.TimeoutOptions) {
-    await this._channel.tap({ selector: toSelectorChannel(selector), ...options });
+  async tap(selector: api.AndroidSelector, options: { duration?: number } & types.TimeoutOptions = {}) {
+    await this._channel.tap({ androidSelector: toSelectorChannel(selector), ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async drag(selector: api.AndroidSelector, dest: types.Point, options?: SpeedOptions & types.TimeoutOptions) {
-    await this._channel.drag({ selector: toSelectorChannel(selector), dest, ...options });
+  async drag(selector: api.AndroidSelector, dest: types.Point, options: SpeedOptions & types.TimeoutOptions = {}) {
+    await this._channel.drag({ androidSelector: toSelectorChannel(selector), dest, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async fling(selector: api.AndroidSelector, direction: Direction, options?: SpeedOptions & types.TimeoutOptions) {
-    await this._channel.fling({ selector: toSelectorChannel(selector), direction, ...options });
+  async fling(selector: api.AndroidSelector, direction: Direction, options: SpeedOptions & types.TimeoutOptions = {}) {
+    await this._channel.fling({ androidSelector: toSelectorChannel(selector), direction, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async longTap(selector: api.AndroidSelector, options?: types.TimeoutOptions) {
-    await this._channel.longTap({ selector: toSelectorChannel(selector), ...options });
+  async longTap(selector: api.AndroidSelector, options: types.TimeoutOptions = {}) {
+    await this._channel.longTap({ androidSelector: toSelectorChannel(selector), ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async pinchClose(selector: api.AndroidSelector, percent: number, options?: SpeedOptions & types.TimeoutOptions) {
-    await this._channel.pinchClose({ selector: toSelectorChannel(selector), percent, ...options });
+  async pinchClose(selector: api.AndroidSelector, percent: number, options: SpeedOptions & types.TimeoutOptions = {}) {
+    await this._channel.pinchClose({ androidSelector: toSelectorChannel(selector), percent, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async pinchOpen(selector: api.AndroidSelector, percent: number, options?: SpeedOptions & types.TimeoutOptions) {
-    await this._channel.pinchOpen({ selector: toSelectorChannel(selector), percent, ...options });
+  async pinchOpen(selector: api.AndroidSelector, percent: number, options: SpeedOptions & types.TimeoutOptions = {}) {
+    await this._channel.pinchOpen({ androidSelector: toSelectorChannel(selector), percent, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async scroll(selector: api.AndroidSelector, direction: Direction, percent: number, options?: SpeedOptions & types.TimeoutOptions) {
-    await this._channel.scroll({ selector: toSelectorChannel(selector), direction, percent, ...options });
+  async scroll(selector: api.AndroidSelector, direction: Direction, percent: number, options: SpeedOptions & types.TimeoutOptions = {}) {
+    await this._channel.scroll({ androidSelector: toSelectorChannel(selector), direction, percent, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
-  async swipe(selector: api.AndroidSelector, direction: Direction, percent: number, options?: SpeedOptions & types.TimeoutOptions) {
-    await this._channel.swipe({ selector: toSelectorChannel(selector), direction, percent, ...options });
+  async swipe(selector: api.AndroidSelector, direction: Direction, percent: number, options: SpeedOptions & types.TimeoutOptions = {}) {
+    await this._channel.swipe({ androidSelector: toSelectorChannel(selector), direction, percent, ...options, timeout: this._timeoutSettings.timeout(options) });
   }
 
   async info(selector: api.AndroidSelector): Promise<api.AndroidElementInfo> {
-    return (await this._channel.info({ selector: toSelectorChannel(selector) })).info;
+    return (await this._channel.info({ androidSelector: toSelectorChannel(selector) })).info;
   }
 
   async screenshot(options: { path?: string } = {}): Promise<Buffer> {
     const { binary } = await this._channel.screenshot();
     if (options.path)
-      await fs.promises.writeFile(options.path, binary);
+      await this._platform.fs().promises.writeFile(options.path, binary);
     return binary;
   }
 
@@ -265,18 +251,21 @@ export class AndroidDevice extends ChannelOwner<channels.AndroidDeviceChannel> i
   }
 
   async installApk(file: string | Buffer, options?: { args: string[] }): Promise<void> {
-    await this._channel.installApk({ file: await loadFile(file), args: options && options.args });
+    await this._channel.installApk({ file: await loadFile(this._platform, file), args: options && options.args });
   }
 
   async push(file: string | Buffer, path: string, options?: { mode: number }): Promise<void> {
-    await this._channel.push({ file: await loadFile(file), path, mode: options ? options.mode : undefined });
+    await this._channel.push({ file: await loadFile(this._platform, file), path, mode: options ? options.mode : undefined });
   }
 
   async launchBrowser(options: types.BrowserContextOptions & { pkg?: string } = {}): Promise<BrowserContext> {
-    const contextOptions = await prepareBrowserContextParams(options);
+    const contextOptions = await prepareBrowserContextParams(this._platform, options);
     const result = await this._channel.launchBrowser(contextOptions);
-    const context = BrowserContext.from(result.context) as BrowserContext;
-    context._setOptions(contextOptions, {});
+    const context = BrowserContext.from(result.context);
+    const selectors = this._android._playwright.selectors;
+    selectors._contextsForSelectors.add(context);
+    context.once(Events.BrowserContext.Close, () => selectors._contextsForSelectors.delete(context));
+    await context._initializeHarFromOptions(options.recordHar);
     return context;
   }
 
@@ -319,9 +308,9 @@ export class AndroidSocket extends ChannelOwner<channels.AndroidSocketChannel> i
   }
 }
 
-async function loadFile(file: string | Buffer): Promise<Buffer> {
+async function loadFile(platform: Platform, file: string | Buffer): Promise<Buffer> {
   if (isString(file))
-    return await fs.promises.readFile(file);
+    return await platform.fs().promises.readFile(file);
   return file;
 }
 
@@ -395,8 +384,8 @@ function toSelectorChannel(selector: api.AndroidSelector): channels.AndroidSelec
     enabled,
     focusable,
     focused,
-    hasChild: hasChild ? { selector: toSelectorChannel(hasChild.selector) } : undefined,
-    hasDescendant: hasDescendant ? { selector: toSelectorChannel(hasDescendant.selector), maxDepth: hasDescendant.maxDepth } : undefined,
+    hasChild: hasChild ? { androidSelector: toSelectorChannel(hasChild.selector) } : undefined,
+    hasDescendant: hasDescendant ? { androidSelector: toSelectorChannel(hasDescendant.selector), maxDepth: hasDescendant.maxDepth } : undefined,
     longClickable,
     scrollable,
     selected,
@@ -409,7 +398,7 @@ export class AndroidWebView extends EventEmitter implements api.AndroidWebView {
   private _pagePromise: Promise<Page> | undefined;
 
   constructor(device: AndroidDevice, data: channels.AndroidWebView) {
-    super();
+    super(device._platform);
     this._device = device;
     this._data = data;
   }
diff --git a/packages/playwright-core/src/client/api.ts b/packages/playwright-core/src/client/api.ts
index 6eab70e159ca4..7273ea244a268 100644
--- a/packages/playwright-core/src/client/api.ts
+++ b/packages/playwright-core/src/client/api.ts
@@ -15,7 +15,7 @@
  */
 
 export { Accessibility } from './accessibility';
-export { Android, AndroidDevice, AndroidWebView, AndroidInput, AndroidSocket } from './android';
+export { Android, AndroidDevice, AndroidInput, AndroidSocket, AndroidWebView } from './android';
 export { Browser } from './browser';
 export { BrowserContext } from './browserContext';
 export type { BrowserServer } from './browserType';
@@ -26,7 +26,7 @@ export { Coverage } from './coverage';
 export { Dialog } from './dialog';
 export { Download } from './download';
 export { Electron, ElectronApplication } from './electron';
-export { Locator, FrameLocator } from './locator';
+export { FrameLocator, Locator } from './locator';
 export { ElementHandle } from './elementHandle';
 export { FileChooser } from './fileChooser';
 export type { Logger } from './types';
@@ -34,7 +34,7 @@ export { TimeoutError } from './errors';
 export { Frame } from './frame';
 export { Keyboard, Mouse, Touchscreen } from './input';
 export { JSHandle } from './jsHandle';
-export { Request, Response, Route, WebSocket } from './network';
+export { Request, Response, Route, WebSocket, WebSocketRoute } from './network';
 export { APIRequest, APIRequestContext, APIResponse } from './fetch';
 export { Page } from './page';
 export { Selectors } from './selectors';
diff --git a/packages/playwright-core/src/client/artifact.ts b/packages/playwright-core/src/client/artifact.ts
index c3a53c0294a52..7c6fd947cfdb7 100644
--- a/packages/playwright-core/src/client/artifact.ts
+++ b/packages/playwright-core/src/client/artifact.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import * as fs from 'fs';
-import { Stream } from './stream';
-import { mkdirIfNeeded } from '../utils/fileUtils';
 import { ChannelOwner } from './channelOwner';
+import { Stream } from './stream';
+import { mkdirIfNeeded } from './fileUtils';
+
+import type * as channels from '@protocol/channels';
 import type { Readable } from 'stream';
 
 export class Artifact extends ChannelOwner<channels.ArtifactChannel> {
@@ -40,9 +40,9 @@ export class Artifact extends ChannelOwner<channels.ArtifactChannel> {
 
     const result = await this._channel.saveAsStream();
     const stream = Stream.from(result.stream);
-    await mkdirIfNeeded(path);
+    await mkdirIfNeeded(this._platform, path);
     await new Promise((resolve, reject) => {
-      stream.stream().pipe(fs.createWriteStream(path))
+      stream.stream().pipe(this._platform.fs().createWriteStream(path))
           .on('finish' as any, resolve)
           .on('error' as any, reject);
     });
diff --git a/packages/playwright-core/src/client/browser.ts b/packages/playwright-core/src/client/browser.ts
index be47ddeb51dd1..d112e884436ba 100644
--- a/packages/playwright-core/src/client/browser.ts
+++ b/packages/playwright-core/src/client/browser.ts
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-import fs from 'fs';
-import type * as channels from '@protocol/channels';
+import { Artifact } from './artifact';
 import { BrowserContext, prepareBrowserContextParams } from './browserContext';
-import type { Page } from './page';
+import { CDPSession } from './cdpSession';
 import { ChannelOwner } from './channelOwner';
-import { Events } from './events';
-import type { LaunchOptions, BrowserContextOptions, HeadersArray } from './types';
 import { isTargetClosedError } from './errors';
-import type * as api from '../../types/types';
-import { CDPSession } from './cdpSession';
+import { Events } from './events';
+import { mkdirIfNeeded } from './fileUtils';
+
 import type { BrowserType } from './browserType';
-import { Artifact } from './artifact';
-import { mkdirIfNeeded } from '../utils';
+import type { Page } from './page';
+import type { BrowserContextOptions, LaunchOptions, LaunchServerOptions, Logger } from './types';
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
 
 export class Browser extends ChannelOwner<channels.BrowserChannel> implements api.Browser {
   readonly _contexts = new Set<BrowserContext>();
@@ -37,9 +37,6 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
   _options: LaunchOptions = {};
   readonly _name: string;
   private _path: string | undefined;
-
-  // Used from @playwright/test fixtures.
-  _connectHeaders?: HeadersArray;
   _closeReason: string | undefined;
 
   static from(browser: channels.BrowserChannel): Browser {
@@ -49,6 +46,7 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.BrowserInitializer) {
     super(parent, type, guid, initializer);
     this._name = initializer.name;
+    this._channel.on('context', ({ context }) => this._didCreateContext(BrowserContext.from(context)));
     this._channel.on('close', () => this._didClose());
     this._closedPromise = new Promise(f => this.once(Events.Browser.Disconnected, f));
   }
@@ -62,32 +60,66 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
   }
 
   async _newContextForReuse(options: BrowserContextOptions = {}): Promise<BrowserContext> {
-    return await this._wrapApiCall(async () => {
-      for (const context of this._contexts) {
-        await this._browserType._willCloseContext(context);
-        for (const page of context.pages())
-          page._onClose();
-        context._onClose();
-      }
-      return await this._innerNewContext(options, true);
-    }, true);
+    return await this._innerNewContext(options, true);
   }
 
-  async _stopPendingOperations(reason: string) {
-    return await this._wrapApiCall(async () => {
-      await this._channel.stopPendingOperations({ reason });
-    }, true);
+  async _disconnectFromReusedContext(reason: string) {
+    const context = [...this._contexts].find(context => context._forReuse);
+    if (!context)
+      return;
+    await this._instrumentation.runBeforeCloseBrowserContext(context);
+    for (const page of context.pages())
+      page._onClose();
+    context._onClose();
+    await this._channel.disconnectFromReusedContext({ reason });
   }
 
   async _innerNewContext(options: BrowserContextOptions = {}, forReuse: boolean): Promise<BrowserContext> {
-    options = { ...this._browserType._defaultContextOptions, ...options };
-    const contextOptions = await prepareBrowserContextParams(options);
+    options = this._browserType._playwright.selectors._withSelectorOptions({
+      ...this._browserType._playwright._defaultContextOptions,
+      ...options,
+    });
+    const contextOptions = await prepareBrowserContextParams(this._platform, options);
     const response = forReuse ? await this._channel.newContextForReuse(contextOptions) : await this._channel.newContext(contextOptions);
     const context = BrowserContext.from(response.context);
-    await this._browserType._didCreateContext(context, contextOptions, this._options, options.logger || this._logger);
+    if (forReuse)
+      context._forReuse = true;
+    if (options.logger)
+      context._logger = options.logger;
+    await context._initializeHarFromOptions(options.recordHar);
+    await this._instrumentation.runAfterCreateBrowserContext(context);
     return context;
   }
 
+  _connectToBrowserType(browserType: BrowserType, browserOptions: LaunchOptions, logger: Logger | undefined) {
+    // Note: when using connect(), `browserType` is different from `this._parent`.
+    // This is why browser type is not wired up in the constructor,
+    // and instead this separate method is called later on.
+    this._browserType = browserType;
+    this._options = browserOptions;
+    this._logger = logger;
+    for (const context of this._contexts)
+      this._setupBrowserContext(context);
+  }
+
+  private _didCreateContext(context: BrowserContext) {
+    context._browser = this;
+    this._contexts.add(context);
+    // Note: when connecting to a browser, initial contexts arrive before `browserType` is set,
+    // and will be configured later in `_connectToBrowserType`.
+    if (this._browserType)
+      this._setupBrowserContext(context);
+  }
+
+  private _setupBrowserContext(context: BrowserContext) {
+    context._logger = this._logger;
+    context.tracing._tracesDir = this._options.tracesDir;
+    this._browserType._contexts.add(context);
+    this._browserType._playwright.selectors._contextsForSelectors.add(context);
+    context.setDefaultTimeout(this._browserType._playwright._defaultContextTimeout);
+    context.setDefaultNavigationTimeout(this._browserType._playwright._defaultContextNavigationTimeout);
+  }
+
   contexts(): BrowserContext[] {
     return [...this._contexts];
   }
@@ -103,7 +135,7 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
       page._ownedContext = context;
       context._ownerPage = page;
       return page;
-    });
+    }, { title: 'Create page' });
   }
 
   isConnected(): boolean {
@@ -114,6 +146,17 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
     return CDPSession.from((await this._channel.newBrowserCDPSession()).session);
   }
 
+  async _launchServer(options: LaunchServerOptions = {}) {
+    const serverLauncher = this._browserType._serverLauncher;
+    const browserImpl = this._connection.toImpl?.(this);
+    if (!serverLauncher || !browserImpl)
+      throw new Error('Launching server is not supported');
+    return await serverLauncher.launchServerOnExistingBrowser(browserImpl, {
+      _sharedBrowser: true,
+      ...options,
+    });
+  }
+
   async startTracing(page?: Page, options: { path?: string; screenshots?: boolean; categories?: string[]; } = {}) {
     this._path = options.path;
     await this._channel.startTracing({ ...options, page: page ? page._channel : undefined });
@@ -124,8 +167,8 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
     const buffer = await artifact.readIntoBuffer();
     await artifact.delete();
     if (this._path) {
-      await mkdirIfNeeded(this._path);
-      await fs.promises.writeFile(this._path, buffer);
+      await mkdirIfNeeded(this._platform, this._path);
+      await this._platform.fs().promises.writeFile(this._path, buffer);
       this._path = undefined;
     }
     return buffer;
diff --git a/packages/playwright-core/src/client/browserContext.ts b/packages/playwright-core/src/client/browserContext.ts
index 3eb8214ca5d93..7b8015b630cb4 100644
--- a/packages/playwright-core/src/client/browserContext.ts
+++ b/packages/playwright-core/src/client/browserContext.ts
@@ -15,47 +15,58 @@
  * limitations under the License.
  */
 
-import { Page, BindingCall } from './page';
-import { Frame } from './frame';
-import * as network from './network';
-import type * as channels from '@protocol/channels';
-import fs from 'fs';
-import path from 'path';
+import { Artifact } from './artifact';
+import { Browser } from './browser';
+import { CDPSession } from './cdpSession';
 import { ChannelOwner } from './channelOwner';
 import { evaluationScript } from './clientHelper';
-import { Browser } from './browser';
-import { Worker } from './worker';
+import { Clock } from './clock';
+import { ConsoleMessage } from './consoleMessage';
+import { Dialog } from './dialog';
+import { TargetClosedError, parseError } from './errors';
 import { Events } from './events';
-import { TimeoutSettings } from '../common/timeoutSettings';
-import { Waiter } from './waiter';
-import type { URLMatch, Headers, WaitForEventOptions, BrowserContextOptions, StorageState, LaunchOptions } from './types';
-import { headersObjectToArray, isRegExp, isString, urlMatchesEqual } from '../utils';
-import { mkdirIfNeeded } from '../utils/fileUtils';
-import type * as api from '../../types/types';
-import type * as structs from '../../types/structs';
-import { CDPSession } from './cdpSession';
-import { Tracing } from './tracing';
-import type { BrowserType } from './browserType';
-import { Artifact } from './artifact';
 import { APIRequestContext } from './fetch';
-import { rewriteErrorMessage } from '../utils/stackTrace';
+import { Frame } from './frame';
 import { HarRouter } from './harRouter';
-import { ConsoleMessage } from './consoleMessage';
-import { Dialog } from './dialog';
+import * as network from './network';
+import { BindingCall, Page } from './page';
+import { Tracing } from './tracing';
+import { Waiter } from './waiter';
 import { WebError } from './webError';
-import { TargetClosedError, parseError } from './errors';
-import { Clock } from './clock';
+import { Worker } from './worker';
+import { TimeoutSettings } from './timeoutSettings';
+import { mkdirIfNeeded } from './fileUtils';
+import { headersObjectToArray } from '../utils/isomorphic/headers';
+import { urlMatchesEqual } from '../utils/isomorphic/urlMatch';
+import { isRegExp, isString } from '../utils/isomorphic/rtti';
+import { rewriteErrorMessage } from '../utils/isomorphic/stackTrace';
+
+import type { BrowserContextOptions, Headers, SetStorageState, StorageState, WaitForEventOptions } from './types';
+import type * as structs from '../../types/structs';
+import type * as api from '../../types/types';
+import type { URLMatch } from '../utils/isomorphic/urlMatch';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
+import type * as actions from '@recorder/actions';
+
+interface RecorderEventSink {
+  actionAdded?(page: Page, actionInContext: actions.ActionInContext, code: string): void;
+  actionUpdated?(page: Page, actionInContext: actions.ActionInContext, code: string): void;
+  signalAdded?(page: Page, signal: actions.SignalInContext): void;
+}
 
 export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel> implements api.BrowserContext {
   _pages = new Set<Page>();
   _routes: network.RouteHandler[] = [];
-  readonly _browser: Browser | null = null;
-  _browserType: BrowserType | undefined;
+  _webSocketRoutes: network.WebSocketRouteHandler[] = [];
+  // Browser is null for browser contexts created outside of normal browser, e.g. android or electron.
+  _browser: Browser | null = null;
   readonly _bindings = new Map<string, (source: structs.BindingSource, ...args: any[]) => any>();
-  _timeoutSettings = new TimeoutSettings();
+  _timeoutSettings: TimeoutSettings;
   _ownerPage: Page | undefined;
+  _forReuse = false;
   private _closedPromise: Promise<void>;
-  _options: channels.BrowserNewContextParams = { };
+  readonly _options: channels.BrowserNewContextParams;
 
   readonly request: APIRequestContext;
   readonly tracing: Tracing;
@@ -63,11 +74,11 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
 
   readonly _backgroundPages = new Set<Page>();
   readonly _serviceWorkers = new Set<Worker>();
-  readonly _isChromium: boolean;
   private _harRecorders = new Map<string, { path: string, content: 'embed' | 'attach' | 'omit' | undefined }>();
-  _closeWasCalled = false;
+  _closingStatus: 'none' | 'closing' | 'closed' = 'none';
   private _closeReason: string | undefined;
   private _harRouters: HarRouter[] = [];
+  private _onRecorderEventSink: RecorderEventSink | undefined;
 
   static from(context: channels.BrowserContextChannel): BrowserContext {
     return (context as any)._object;
@@ -79,18 +90,18 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
 
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.BrowserContextInitializer) {
     super(parent, type, guid, initializer);
-    if (parent instanceof Browser)
-      this._browser = parent;
-    this._browser?._contexts.add(this);
-    this._isChromium = this._browser?._name === 'chromium';
+    this._options = initializer.options;
+    this._timeoutSettings = new TimeoutSettings(this._platform);
     this.tracing = Tracing.from(initializer.tracing);
     this.request = APIRequestContext.from(initializer.requestContext);
+    this.request._timeoutSettings = this._timeoutSettings;
     this.clock = new Clock(this);
 
     this._channel.on('bindingCall', ({ binding }) => this._onBinding(BindingCall.from(binding)));
     this._channel.on('close', () => this._onClose());
     this._channel.on('page', ({ page }) => this._onPage(Page.from(page)));
     this._channel.on('route', ({ route }) => this._onRoute(network.Route.from(route)));
+    this._channel.on('webSocketRoute', ({ webSocketRoute }) => this._onWebSocketRoute(network.WebSocketRoute.from(webSocketRoute)));
     this._channel.on('backgroundPage', ({ page }) => {
       const backgroundPage = Page.from(page);
       this._backgroundPages.add(backgroundPage);
@@ -103,7 +114,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
       this.emit(Events.BrowserContext.ServiceWorker, serviceWorker);
     });
     this._channel.on('console', event => {
-      const consoleMessage = new ConsoleMessage(event);
+      const consoleMessage = new ConsoleMessage(this._platform, event);
       this.emit(Events.BrowserContext.Console, consoleMessage);
       const page = consoleMessage.page();
       if (page)
@@ -137,6 +148,14 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
     this._channel.on('requestFailed', ({ request, failureText, responseEndTiming, page }) => this._onRequestFailed(network.Request.from(request), responseEndTiming, failureText, Page.fromNullable(page)));
     this._channel.on('requestFinished', params => this._onRequestFinished(params));
     this._channel.on('response', ({ response, page }) => this._onResponse(network.Response.from(response), Page.fromNullable(page)));
+    this._channel.on('recorderEvent', ({ event, data, page, code }) => {
+      if (event === 'actionAdded')
+        this._onRecorderEventSink?.actionAdded?.(Page.from(page), data as actions.ActionInContext, code);
+      else if (event === 'actionUpdated')
+        this._onRecorderEventSink?.actionUpdated?.(Page.from(page), data as actions.ActionInContext, code);
+      else if (event === 'signalAdded')
+        this._onRecorderEventSink?.signalAdded?.(Page.from(page), data as actions.SignalInContext);
+    });
     this._closedPromise = new Promise(f => this.once(Events.BrowserContext.Close, f));
 
     this._setEventToSubscriptionMapping(new Map<string, channels.BrowserContextUpdateSubscriptionParams['event']>([
@@ -149,11 +168,15 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
     ]));
   }
 
-  _setOptions(contextOptions: channels.BrowserNewContextParams, browserOptions: LaunchOptions) {
-    this._options = contextOptions;
-    if (this._options.recordHar)
-      this._harRecorders.set('', { path: this._options.recordHar.path, content: this._options.recordHar.content });
-    this.tracing._tracesDir = browserOptions.tracesDir;
+  async _initializeHarFromOptions(recordHar: BrowserContextOptions['recordHar']) {
+    if (!recordHar)
+      return;
+    const defaultContent = recordHar.path.endsWith('.zip') ? 'attach' : 'embed';
+    await this._recordIntoHAR(recordHar.path, null, {
+      url: recordHar.urlFilter,
+      updateContent: recordHar.content ?? (recordHar.omitContent ? 'omit' : defaultContent),
+      updateMode: recordHar.mode ?? 'full',
+    });
   }
 
   private _onPage(page: Page): void {
@@ -202,7 +225,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
     const routeHandlers = this._routes.slice();
     for (const routeHandler of routeHandlers) {
       // If the page or the context was closed we stall all requests right away.
-      if (page?._closeWasCalled || this._closeWasCalled)
+      if (page?._closeWasCalled || this._closingStatus !== 'none')
         return;
       if (!routeHandler.matches(route.request().url()))
         continue;
@@ -213,13 +236,21 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
         this._routes.splice(index, 1);
       const handled = await routeHandler.handle(route);
       if (!this._routes.length)
-        this._wrapApiCall(() => this._updateInterceptionPatterns(), true).catch(() => {});
+        this._updateInterceptionPatterns({ internal: true }).catch(() => {});
       if (handled)
         return;
     }
     // If the page is closed or unrouteAll() was called without waiting and interception disabled,
     // the method will throw an error - silence it.
-    await route._innerContinue(true).catch(() => {});
+    await route._innerContinue(true /* isFallback */).catch(() => {});
+  }
+
+  async _onWebSocketRoute(webSocketRoute: network.WebSocketRoute) {
+    const routeHandler = this._webSocketRoutes.find(route => route.matches(webSocketRoute.url()));
+    if (routeHandler)
+      await routeHandler.handle(webSocketRoute);
+    else
+      webSocketRoute.connectToServer();
   }
 
   async _onBinding(bindingCall: BindingCall) {
@@ -231,16 +262,10 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
 
   setDefaultNavigationTimeout(timeout: number | undefined) {
     this._timeoutSettings.setDefaultNavigationTimeout(timeout);
-    this._wrapApiCall(async () => {
-      this._channel.setDefaultNavigationTimeoutNoReply({ timeout }).catch(() => {});
-    }, true);
   }
 
   setDefaultTimeout(timeout: number | undefined) {
     this._timeoutSettings.setDefaultTimeout(timeout);
-    this._wrapApiCall(async () => {
-      this._channel.setDefaultTimeoutNoReply({ timeout }).catch(() => {});
-    }, true);
   }
 
   browser(): Browser | null {
@@ -309,7 +334,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
   }
 
   async addInitScript(script: Function | string | { path?: string, content?: string }, arg?: any): Promise<void> {
-    const source = await evaluationScript(script, arg);
+    const source = await evaluationScript(this._platform, script, arg);
     await this._channel.addInitScript({ source });
   }
 
@@ -325,29 +350,39 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
   }
 
   async route(url: URLMatch, handler: network.RouteHandlerCallback, options: { times?: number } = {}): Promise<void> {
-    this._routes.unshift(new network.RouteHandler(this._options.baseURL, url, handler, options.times));
-    await this._updateInterceptionPatterns();
+    this._routes.unshift(new network.RouteHandler(this._platform, this._options.baseURL, url, handler, options.times));
+    await this._updateInterceptionPatterns({ title: 'Route requests' });
   }
 
-  async _recordIntoHAR(har: string, page: Page | null, options: { url?: string | RegExp, notFound?: 'abort' | 'fallback', update?: boolean, updateContent?: 'attach' | 'embed', updateMode?: 'minimal' | 'full'} = {}): Promise<void> {
+  async routeWebSocket(url: URLMatch, handler: network.WebSocketRouteHandlerCallback): Promise<void> {
+    this._webSocketRoutes.unshift(new network.WebSocketRouteHandler(this._options.baseURL, url, handler));
+    await this._updateWebSocketInterceptionPatterns({ title: 'Route WebSockets' });
+  }
+
+  async _recordIntoHAR(har: string, page: Page | null, options: { url?: string | RegExp, updateContent?: 'attach' | 'embed' | 'omit', updateMode?: 'minimal' | 'full'} = {}): Promise<void> {
     const { harId } = await this._channel.harStart({
       page: page?._channel,
-      options: prepareRecordHarOptions({
-        path: har,
+      options: {
+        zip: har.endsWith('.zip'),
         content: options.updateContent ?? 'attach',
+        urlGlob: isString(options.url) ? options.url : undefined,
+        urlRegexSource: isRegExp(options.url) ? options.url.source : undefined,
+        urlRegexFlags: isRegExp(options.url) ? options.url.flags : undefined,
         mode: options.updateMode ?? 'minimal',
-        urlFilter: options.url
-      })!
+      },
     });
     this._harRecorders.set(harId, { path: har, content: options.updateContent ?? 'attach' });
   }
 
   async routeFromHAR(har: string, options: { url?: string | RegExp, notFound?: 'abort' | 'fallback', update?: boolean, updateContent?: 'attach' | 'embed', updateMode?: 'minimal' | 'full' } = {}): Promise<void> {
+    const localUtils = this._connection.localUtils();
+    if (!localUtils)
+      throw new Error('Route from har is not supported in thin clients');
     if (options.update) {
       await this._recordIntoHAR(har, null, options);
       return;
     }
-    const harRouter = await HarRouter.create(this._connection.localUtils(), har, options.notFound || 'abort', { urlMatch: options.url });
+    const harRouter = await HarRouter.create(localUtils, har, options.notFound || 'abort', { urlMatch: options.url });
     this._harRouters.push(harRouter);
     await harRouter.addContextRoute(this);
   }
@@ -376,16 +411,21 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
 
   private async _unrouteInternal(removed: network.RouteHandler[], remaining: network.RouteHandler[], behavior?: 'wait'|'ignoreErrors'|'default'): Promise<void> {
     this._routes = remaining;
-    await this._updateInterceptionPatterns();
-    if (!behavior || behavior === 'default')
-      return;
-    const promises = removed.map(routeHandler => routeHandler.stop(behavior));
-    await Promise.all(promises);
+    if (behavior && behavior !== 'default') {
+      const promises = removed.map(routeHandler => routeHandler.stop(behavior));
+      await Promise.all(promises);
+    }
+    await this._updateInterceptionPatterns({ title: 'Unroute requests' });
   }
 
-  private async _updateInterceptionPatterns() {
+  private async _updateInterceptionPatterns(options: { internal: true } | { title: string }) {
     const patterns = network.RouteHandler.prepareInterceptionPatterns(this._routes);
-    await this._channel.setNetworkInterceptionPatterns({ patterns });
+    await this._wrapApiCall(() => this._channel.setNetworkInterceptionPatterns({ patterns }), options);
+  }
+
+  private async _updateWebSocketInterceptionPatterns(options: { internal: true } | { title: string }) {
+    const patterns = network.WebSocketRouteHandler.prepareInterceptionPatterns(this._webSocketRoutes);
+    await this._wrapApiCall(() => this._channel.setWebSocketInterceptionPatterns({ patterns }), options);
   }
 
   _effectiveCloseReason(): string | undefined {
@@ -406,11 +446,11 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
     });
   }
 
-  async storageState(options: { path?: string } = {}): Promise<StorageState> {
-    const state = await this._channel.storageState();
+  async storageState(options: { path?: string, indexedDB?: boolean } = {}): Promise<StorageState> {
+    const state = await this._channel.storageState({ indexedDB: options.indexedDB });
     if (options.path) {
-      await mkdirIfNeeded(options.path);
-      await fs.promises.writeFile(options.path, JSON.stringify(state, undefined, 2), 'utf8');
+      await mkdirIfNeeded(this._platform, options.path);
+      await this._platform.fs().promises.writeFile(options.path, JSON.stringify(state, undefined, 2), 'utf8');
     }
     return state;
   }
@@ -432,9 +472,10 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
   }
 
   _onClose() {
-    if (this._browser)
-      this._browser._contexts.delete(this);
-    this._browserType?._contexts?.delete(this);
+    this._closingStatus = 'closed';
+    this._browser?._contexts.delete(this);
+    this._browser?._browserType._contexts.delete(this);
+    this._browser?._browserType._playwright.selectors._contextsForSelectors.delete(this);
     this._disposeHarRouters();
     this.tracing._resetStackCounter();
     this.emit(Events.BrowserContext.Close, this);
@@ -445,15 +486,13 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
   }
 
   async close(options: { reason?: string } = {}): Promise<void> {
-    if (this._closeWasCalled)
+    if (this._closingStatus !== 'none')
       return;
     this._closeReason = options.reason;
-    this._closeWasCalled = true;
-    await this._wrapApiCall(async () => {
-      await this.request.dispose(options);
-    }, true);
+    this._closingStatus = 'closing';
+    await this.request.dispose(options);
+    await this._instrumentation.runBeforeCloseBrowserContext(this);
     await this._wrapApiCall(async () => {
-      await this._browserType?._willCloseContext(this);
       for (const [harId, harParams] of this._harRecorders) {
         const har = await this._channel.harExport({ harId });
         const artifact = Artifact.from(har.artifact);
@@ -461,58 +500,45 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
         const isCompressed = harParams.content === 'attach' || harParams.path.endsWith('.zip');
         const needCompressed = harParams.path.endsWith('.zip');
         if (isCompressed && !needCompressed) {
+          const localUtils = this._connection.localUtils();
+          if (!localUtils)
+            throw new Error('Uncompressed har is not supported in thin clients');
           await artifact.saveAs(harParams.path + '.tmp');
-          await this._connection.localUtils()._channel.harUnzip({ zipFile: harParams.path + '.tmp', harFile: harParams.path });
+          await localUtils.harUnzip({ zipFile: harParams.path + '.tmp', harFile: harParams.path });
         } else {
           await artifact.saveAs(harParams.path);
         }
         await artifact.delete();
       }
-    }, true);
+    }, { internal: true });
     await this._channel.close(options);
     await this._closedPromise;
   }
 
-  async _enableRecorder(params: {
-      language: string,
-      launchOptions?: LaunchOptions,
-      contextOptions?: BrowserContextOptions,
-      device?: string,
-      saveStorage?: string,
-      mode?: 'recording' | 'inspecting',
-      testIdAttributeName?: string,
-      outputFile?: string,
-      handleSIGINT?: boolean,
-  }) {
-    await this._channel.recorderSupplementEnable(params);
+  async _enableRecorder(params: channels.BrowserContextEnableRecorderParams, eventSink?: RecorderEventSink) {
+    if (eventSink)
+      this._onRecorderEventSink = eventSink;
+    await this._channel.enableRecorder(params);
+  }
+
+  async _disableRecorder() {
+    this._onRecorderEventSink = undefined;
+    await this._channel.disableRecorder();
   }
 }
 
-async function prepareStorageState(options: BrowserContextOptions): Promise<channels.BrowserNewContextParams['storageState']> {
-  if (typeof options.storageState !== 'string')
-    return options.storageState;
+async function prepareStorageState(platform: Platform, storageState: string | SetStorageState): Promise<NonNullable<channels.BrowserNewContextParams['storageState']>> {
+  if (typeof storageState !== 'string')
+    return storageState as any;
   try {
-    return JSON.parse(await fs.promises.readFile(options.storageState, 'utf8'));
+    return JSON.parse(await platform.fs().promises.readFile(storageState, 'utf8'));
   } catch (e) {
-    rewriteErrorMessage(e, `Error reading storage state from ${options.storageState}:\n` + e.message);
+    rewriteErrorMessage(e, `Error reading storage state from ${storageState}:\n` + e.message);
     throw e;
   }
 }
 
-function prepareRecordHarOptions(options: BrowserContextOptions['recordHar']): channels.RecordHarOptions | undefined {
-  if (!options)
-    return;
-  return {
-    path: options.path,
-    content: options.content || (options.omitContent ? 'omit' : undefined),
-    urlGlob: isString(options.urlFilter) ? options.urlFilter : undefined,
-    urlRegexSource: isRegExp(options.urlFilter) ? options.urlFilter.source : undefined,
-    urlRegexFlags: isRegExp(options.urlFilter) ? options.urlFilter.flags : undefined,
-    mode: options.mode
-  };
-}
-
-export async function prepareBrowserContextParams(options: BrowserContextOptions): Promise<channels.BrowserNewContextParams> {
+export async function prepareBrowserContextParams(platform: Platform, options: BrowserContextOptions): Promise<channels.BrowserNewContextParams> {
   if (options.videoSize && !options.videosPath)
     throw new Error(`"videoSize" option requires "videosPath" to be specified`);
   if (options.extraHTTPHeaders)
@@ -522,14 +548,14 @@ export async function prepareBrowserContextParams(options: BrowserContextOptions
     viewport: options.viewport === null ? undefined : options.viewport,
     noDefaultViewport: options.viewport === null,
     extraHTTPHeaders: options.extraHTTPHeaders ? headersObjectToArray(options.extraHTTPHeaders) : undefined,
-    storageState: await prepareStorageState(options),
+    storageState: options.storageState ? await prepareStorageState(platform, options.storageState) : undefined,
     serviceWorkers: options.serviceWorkers,
-    recordHar: prepareRecordHarOptions(options.recordHar),
     colorScheme: options.colorScheme === null ? 'no-override' : options.colorScheme,
     reducedMotion: options.reducedMotion === null ? 'no-override' : options.reducedMotion,
     forcedColors: options.forcedColors === null ? 'no-override' : options.forcedColors,
+    contrast: options.contrast === null ? 'no-override' : options.contrast,
     acceptDownloads: toAcceptDownloadsProtocol(options.acceptDownloads),
-    clientCertificates: await toClientCertificatesProtocol(options.clientCertificates),
+    clientCertificates: await toClientCertificatesProtocol(platform, options.clientCertificates),
   };
   if (!contextParams.recordVideo && options.videosPath) {
     contextParams.recordVideo = {
@@ -538,7 +564,7 @@ export async function prepareBrowserContextParams(options: BrowserContextOptions
     };
   }
   if (contextParams.recordVideo && contextParams.recordVideo.dir)
-    contextParams.recordVideo.dir = path.resolve(process.cwd(), contextParams.recordVideo.dir);
+    contextParams.recordVideo.dir = platform.path().resolve(contextParams.recordVideo.dir);
   return contextParams;
 }
 
@@ -550,16 +576,22 @@ function toAcceptDownloadsProtocol(acceptDownloads?: boolean) {
   return 'deny';
 }
 
-export async function toClientCertificatesProtocol(certs?: BrowserContextOptions['clientCertificates']): Promise<channels.PlaywrightNewRequestParams['clientCertificates']> {
+export async function toClientCertificatesProtocol(platform: Platform, certs?: BrowserContextOptions['clientCertificates']): Promise<channels.PlaywrightNewRequestParams['clientCertificates']> {
   if (!certs)
     return undefined;
-  return await Promise.all(certs.map(async cert => {
-    return {
-      origin: cert.origin,
-      cert: cert.certPath ? await fs.promises.readFile(cert.certPath) : undefined,
-      key: cert.keyPath ? await fs.promises.readFile(cert.keyPath) : undefined,
-      pfx: cert.pfxPath ? await fs.promises.readFile(cert.pfxPath) : undefined,
-      passphrase: cert.passphrase,
-    };
-  }));
+
+  const bufferizeContent = async (value?: Buffer, path?: string): Promise<Buffer | undefined> => {
+    if (value)
+      return value;
+    if (path)
+      return await platform.fs().promises.readFile(path);
+  };
+
+  return await Promise.all(certs.map(async cert => ({
+    origin: cert.origin,
+    cert: await bufferizeContent(cert.cert, cert.certPath),
+    key: await bufferizeContent(cert.key, cert.keyPath),
+    pfx: await bufferizeContent(cert.pfx, cert.pfxPath),
+    passphrase: cert.passphrase,
+  })));
 }
diff --git a/packages/playwright-core/src/client/browserType.ts b/packages/playwright-core/src/client/browserType.ts
index 06672cc64e534..c0491a07154bd 100644
--- a/packages/playwright-core/src/client/browserType.ts
+++ b/packages/playwright-core/src/client/browserType.ts
@@ -14,22 +14,28 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { Browser } from './browser';
 import { BrowserContext, prepareBrowserContextParams } from './browserContext';
 import { ChannelOwner } from './channelOwner';
-import type { LaunchOptions, LaunchServerOptions, ConnectOptions, LaunchPersistentContextOptions, BrowserContextOptions, Logger } from './types';
-import { Connection } from './connection';
-import { Events } from './events';
-import type { ChildProcess } from 'child_process';
 import { envObjectToArray } from './clientHelper';
-import { assert, headersObjectToArray, monotonicTime } from '../utils';
-import type * as api from '../../types/types';
-import { raceAgainstDeadline } from '../utils/timeoutRunner';
+import { Events } from './events';
+import { assert } from '../utils/isomorphic/assert';
+import { headersObjectToArray } from '../utils/isomorphic/headers';
+import { monotonicTime } from '../utils/isomorphic/time';
+import { raceAgainstDeadline } from '../utils/isomorphic/timeoutRunner';
+import { connectOverWebSocket } from './webSocket';
+import { TimeoutSettings } from './timeoutSettings';
+
 import type { Playwright } from './playwright';
+import type { ConnectOptions, LaunchOptions, LaunchPersistentContextOptions, LaunchServerOptions } from './types';
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
+import type { ChildProcess } from 'child_process';
+import type { Browser as BrowserImpl } from '../server/browser';
 
 export interface BrowserServerLauncher {
-  launchServer(options?: LaunchServerOptions): Promise<api.BrowserServer>;
+  launchServer(options?: LaunchOptions & LaunchServerOptions): Promise<api.BrowserServer>;
+  launchServerOnExistingBrowser(browser: BrowserImpl, options?: LaunchServerOptions): Promise<api.BrowserServer>;
 }
 
 // This is here just for api generation and checking.
@@ -45,12 +51,6 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
   _contexts = new Set<BrowserContext>();
   _playwright!: Playwright;
 
-  // Instrumentation.
-  _defaultContextOptions?: BrowserContextOptions;
-  _defaultContextTimeout?: number;
-  _defaultContextNavigationTimeout?: number;
-  private _defaultLaunchOptions?: LaunchOptions;
-
   static from(browserType: channels.BrowserTypeChannel): BrowserType {
     return (browserType as any)._object;
   }
@@ -69,17 +69,18 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
     assert(!(options as any).userDataDir, 'userDataDir option is not supported in `browserType.launch`. Use `browserType.launchPersistentContext` instead');
     assert(!(options as any).port, 'Cannot specify a port without launching as a server.');
 
-    const logger = options.logger || this._defaultLaunchOptions?.logger;
-    options = { ...this._defaultLaunchOptions, ...options };
+    const logger = options.logger || this._playwright._defaultLaunchOptions?.logger;
+    options = { ...this._playwright._defaultLaunchOptions, ...options };
     const launchOptions: channels.BrowserTypeLaunchParams = {
       ...options,
       ignoreDefaultArgs: Array.isArray(options.ignoreDefaultArgs) ? options.ignoreDefaultArgs : undefined,
       ignoreAllDefaultArgs: !!options.ignoreDefaultArgs && !Array.isArray(options.ignoreDefaultArgs),
       env: options.env ? envObjectToArray(options.env) : undefined,
+      timeout: new TimeoutSettings(this._platform).launchTimeout(options),
     };
     return await this._wrapApiCall(async () => {
       const browser = Browser.from((await this._channel.launch(launchOptions)).browser);
-      this._didLaunchBrowser(browser, options, logger);
+      browser._connectToBrowserType(this, options, logger);
       return browser;
     });
   }
@@ -87,33 +88,42 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
   async launchServer(options: LaunchServerOptions = {}): Promise<api.BrowserServer> {
     if (!this._serverLauncher)
       throw new Error('Launching server is not supported');
-    options = { ...this._defaultLaunchOptions, ...options };
+    options = { ...this._playwright._defaultLaunchOptions, ...options };
     return await this._serverLauncher.launchServer(options);
   }
 
   async launchPersistentContext(userDataDir: string, options: LaunchPersistentContextOptions = {}): Promise<BrowserContext> {
-    const logger = options.logger || this._defaultLaunchOptions?.logger;
+    const logger = options.logger || this._playwright._defaultLaunchOptions?.logger;
     assert(!(options as any).port, 'Cannot specify a port without launching as a server.');
-    options = { ...this._defaultLaunchOptions, ...this._defaultContextOptions, ...options };
-    const contextParams = await prepareBrowserContextParams(options);
+    options = this._playwright.selectors._withSelectorOptions({
+      ...this._playwright._defaultLaunchOptions,
+      ...this._playwright._defaultContextOptions,
+      ...options,
+    });
+    const contextParams = await prepareBrowserContextParams(this._platform, options);
     const persistentParams: channels.BrowserTypeLaunchPersistentContextParams = {
       ...contextParams,
       ignoreDefaultArgs: Array.isArray(options.ignoreDefaultArgs) ? options.ignoreDefaultArgs : undefined,
       ignoreAllDefaultArgs: !!options.ignoreDefaultArgs && !Array.isArray(options.ignoreDefaultArgs),
       env: options.env ? envObjectToArray(options.env) : undefined,
       channel: options.channel,
-      userDataDir,
+      userDataDir: (this._platform.path().isAbsolute(userDataDir) || !userDataDir) ? userDataDir : this._platform.path().resolve(userDataDir),
+      timeout: new TimeoutSettings(this._platform).launchTimeout(options),
     };
-    return await this._wrapApiCall(async () => {
+    const context = await this._wrapApiCall(async () => {
       const result = await this._channel.launchPersistentContext(persistentParams);
+      const browser = Browser.from(result.browser);
+      browser._connectToBrowserType(this, options, logger);
       const context = BrowserContext.from(result.context);
-      await this._didCreateContext(context, contextParams, options, logger);
+      await context._initializeHarFromOptions(options.recordHar);
       return context;
     });
+    await this._instrumentation.runAfterCreateBrowserContext(context);
+    return context;
   }
 
-  connect(options: api.ConnectOptions & { wsEndpoint: string }): Promise<api.Browser>;
-  connect(wsEndpoint: string, options?: api.ConnectOptions): Promise<api.Browser>;
+  connect(options: api.ConnectOptions & { wsEndpoint: string }): Promise<Browser>;
+  connect(wsEndpoint: string, options?: api.ConnectOptions): Promise<Browser>;
   async connect(optionsOrWsEndpoint: string | (api.ConnectOptions & { wsEndpoint: string }), options?: api.ConnectOptions): Promise<Browser>{
     if (typeof optionsOrWsEndpoint === 'string')
       return await this._connect({ ...options, wsEndpoint: optionsOrWsEndpoint });
@@ -126,50 +136,25 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
     return await this._wrapApiCall(async () => {
       const deadline = params.timeout ? monotonicTime() + params.timeout : 0;
       const headers = { 'x-playwright-browser': this.name(), ...params.headers };
-      const localUtils = this._connection.localUtils();
       const connectParams: channels.LocalUtilsConnectParams = {
         wsEndpoint: params.wsEndpoint,
         headers,
         exposeNetwork: params.exposeNetwork ?? params._exposeNetwork,
         slowMo: params.slowMo,
-        timeout: params.timeout,
+        timeout: params.timeout || 0,
       };
       if ((params as any).__testHookRedirectPortForwarding)
         connectParams.socksProxyRedirectPortForTest = (params as any).__testHookRedirectPortForwarding;
-      const { pipe, headers: connectHeaders } = await localUtils._channel.connect(connectParams);
-      const closePipe = () => pipe.close().catch(() => {});
-      const connection = new Connection(localUtils, this._instrumentation);
-      connection.markAsRemote();
-      connection.on('close', closePipe);
-
+      const connection = await connectOverWebSocket(this._connection, connectParams);
       let browser: Browser;
-      let closeError: string | undefined;
-      const onPipeClosed = (reason?: string) => {
+      connection.on('close', () => {
         // Emulate all pages, contexts and the browser closing upon disconnect.
         for (const context of browser?.contexts() || []) {
           for (const page of context.pages())
             page._onClose();
           context._onClose();
         }
-        connection.close(reason || closeError);
-        // Give a chance to any API call promises to reject upon page/context closure.
-        // This happens naturally when we receive page.onClose and browser.onClose from the server
-        // in separate tasks. However, upon pipe closure we used to dispatch them all synchronously
-        // here and promises did not have a chance to reject.
-        // The order of rejects vs closure is a part of the API contract and our test runner
-        // relies on it to attribute rejections to the right test.
         setTimeout(() => browser?._didClose(), 0);
-      };
-      pipe.on('closed', params => onPipeClosed(params.reason));
-      connection.onmessage = message => this._wrapApiCall(() => pipe.send({ message }).catch(() => onPipeClosed()), /* isInternal */ true);
-
-      pipe.on('message', ({ message }) => {
-        try {
-          connection!.dispatch(message);
-        } catch (e) {
-          closeError = String(e);
-          closePipe();
-        }
       });
 
       const result = await raceAgainstDeadline(async () => {
@@ -179,21 +164,20 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
 
         const playwright = await connection!.initializePlaywright();
         if (!playwright._initializer.preLaunchedBrowser) {
-          closePipe();
+          connection.close();
           throw new Error('Malformed endpoint. Did you use BrowserType.launchServer method?');
         }
-        playwright._setSelectors(this._playwright.selectors);
+        playwright.selectors = this._playwright.selectors;
         browser = Browser.from(playwright._initializer.preLaunchedBrowser!);
-        this._didLaunchBrowser(browser, {}, logger);
+        browser._connectToBrowserType(this, {}, logger);
         browser._shouldCloseConnectionOnClose = true;
-        browser._connectHeaders = connectHeaders;
-        browser.on(Events.Browser.Disconnected, () => this._wrapApiCall(() => closePipe(), /* isInternal */ true));
+        browser.on(Events.Browser.Disconnected, () => connection.close());
         return browser;
       }, deadline);
       if (!result.timedOut) {
         return result.result;
       } else {
-        closePipe();
+        connection.close();
         throw new Error(`Timeout ${params.timeout}ms exceeded`);
       }
     });
@@ -217,35 +201,12 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel> imple
       endpointURL,
       headers,
       slowMo: params.slowMo,
-      timeout: params.timeout
+      timeout: new TimeoutSettings(this._platform).timeout(params),
     });
     const browser = Browser.from(result.browser);
-    this._didLaunchBrowser(browser, {}, params.logger);
+    browser._connectToBrowserType(this, {}, params.logger);
     if (result.defaultContext)
-      await this._didCreateContext(BrowserContext.from(result.defaultContext), {}, {}, params.logger);
+      await this._instrumentation.runAfterCreateBrowserContext(BrowserContext.from(result.defaultContext));
     return browser;
   }
-
-  _didLaunchBrowser(browser: Browser, browserOptions: LaunchOptions, logger: Logger | undefined) {
-    browser._browserType = this;
-    browser._options = browserOptions;
-    browser._logger = logger;
-  }
-
-  async _didCreateContext(context: BrowserContext, contextOptions: channels.BrowserNewContextParams, browserOptions: LaunchOptions, logger: Logger | undefined) {
-    context._logger = logger;
-    context._browserType = this;
-    this._contexts.add(context);
-    context._setOptions(contextOptions, browserOptions);
-    if (this._defaultContextTimeout !== undefined)
-      context.setDefaultTimeout(this._defaultContextTimeout);
-    if (this._defaultContextNavigationTimeout !== undefined)
-      context.setDefaultNavigationTimeout(this._defaultContextNavigationTimeout);
-    await this._instrumentation.runAfterCreateBrowserContext(context);
-  }
-
-  async _willCloseContext(context: BrowserContext) {
-    this._contexts.delete(context);
-    await this._instrumentation.runBeforeCloseBrowserContext(context);
-  }
 }
diff --git a/packages/playwright-core/src/client/cdpSession.ts b/packages/playwright-core/src/client/cdpSession.ts
index 68d1cb57f875e..0a58f79d27bba 100644
--- a/packages/playwright-core/src/client/cdpSession.ts
+++ b/packages/playwright-core/src/client/cdpSession.ts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
-import type { Protocol } from '../server/chromium/protocol';
+
 import type * as api from '../../types/types';
+import type { Protocol } from '../server/chromium/protocol';
+import type * as channels from '@protocol/channels';
 
 export class CDPSession extends ChannelOwner<channels.CDPSessionChannel> implements api.CDPSession {
   static from(cdpSession: channels.CDPSessionChannel): CDPSession {
diff --git a/packages/playwright-core/src/client/channelOwner.ts b/packages/playwright-core/src/client/channelOwner.ts
index 4ebe32595c6bb..31adda7d17cf9 100644
--- a/packages/playwright-core/src/client/channelOwner.ts
+++ b/packages/playwright-core/src/client/channelOwner.ts
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-import { EventEmitter } from 'events';
-import type * as channels from '@protocol/channels';
-import { maybeFindValidator, ValidationError, type ValidatorContext } from '../protocol/validator';
-import { debugLogger } from '../utils/debugLogger';
-import type { ExpectZone } from '../utils/stackTrace';
-import { captureLibraryStackTrace, stringifyStackFrames } from '../utils/stackTrace';
-import { isUnderTest } from '../utils';
-import { zones } from '../utils/zones';
-import type { ClientInstrumentation } from './clientInstrumentation';
+import { EventEmitter } from './eventEmitter';
+import { ValidationError, maybeFindValidator  } from '../protocol/validator';
+import { methodMetainfo } from '../utils/isomorphic/protocolMetainfo';
+import { captureLibraryStackTrace } from './clientStackTrace';
+import { stringifyStackFrames } from '../utils/isomorphic/stackTrace';
+
+import type { ClientInstrumentation, RecoverFromApiErrorHandler } from './clientInstrumentation';
 import type { Connection } from './connection';
 import type { Logger } from './types';
+import type { ValidatorContext } from '../protocol/validator';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
 
 type Listener = (...args: any[]) => void;
 
@@ -43,9 +44,10 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
   _wasCollected: boolean = false;
 
   constructor(parent: ChannelOwner | Connection, type: string, guid: string, initializer: channels.InitializerTraits<T>) {
-    super();
+    const connection = parent instanceof ChannelOwner ? parent._connection : parent;
+    super(connection._platform);
     this.setMaxListeners(0);
-    this._connection = parent instanceof ChannelOwner ? parent._connection : parent;
+    this._connection = connection;
     this._type = type;
     this._guid = guid;
     this._parent = parent instanceof ChannelOwner ? parent : undefined;
@@ -57,7 +59,7 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
       this._logger = this._parent._logger;
     }
 
-    this._channel = this._createChannel(new EventEmitter());
+    this._channel = this._createChannel(new EventEmitter(connection._platform));
     this._initializer = initializer;
   }
 
@@ -67,11 +69,8 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
 
   private _updateSubscription(event: string | symbol, enabled: boolean) {
     const protocolEvent = this._eventToSubscriptionMapping.get(String(event));
-    if (protocolEvent) {
-      this._wrapApiCall(async () => {
-        await (this._channel as any).updateSubscription({ event: protocolEvent, enabled });
-      }, true).catch(() => {});
-    }
+    if (protocolEvent)
+      (this._channel as any).updateSubscription({ event: protocolEvent, enabled }).catch(() => {});
   }
 
   override on(event: string | symbol, listener: Listener): this {
@@ -135,24 +134,35 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
     };
   }
 
+  private _validatorToWireContext(): ValidatorContext {
+    return {
+      tChannelImpl: tChannelImplToWire,
+      binary: this._connection.rawBuffers() ? 'buffer' : 'toBase64',
+      isUnderTest: () => this._platform.isUnderTest(),
+    };
+  }
+
   private _createChannel(base: Object): T {
     const channel = new Proxy(base, {
       get: (obj: any, prop: string | symbol) => {
         if (typeof prop === 'string') {
           const validator = maybeFindValidator(this._type, prop, 'Params');
+          const { internal } = methodMetainfo.get(this._type + '.' + prop) || {};
           if (validator) {
             return async (params: any) => {
               return await this._wrapApiCall(async apiZone => {
-                const { apiName, frames, csi, callCookie, stepId } = apiZone.reported ? { apiName: undefined, csi: undefined, callCookie: undefined, frames: [], stepId: undefined } : apiZone;
-                apiZone.reported = true;
-                let currentStepId = stepId;
-                if (csi && apiName) {
-                  const out: { stepId?: string } = {};
-                  csi.onApiCallBegin(apiName, params, frames, callCookie, out);
-                  currentStepId = out.stepId;
+                const validatedParams = validator(params, '', this._validatorToWireContext());
+                if (!apiZone.internal && !apiZone.reported) {
+                  // Reporting/tracing/logging this api call for the first time.
+                  apiZone.reported = true;
+                  this._instrumentation.onApiCallBegin(apiZone, { type: this._type, method: prop, params });
+                  logApiCall(this._platform, this._logger, `=> ${apiZone.apiName} started`);
+                  return await this._connection.sendMessageToServer(this, prop, validatedParams, apiZone);
                 }
-                return await this._connection.sendMessageToServer(this, prop, validator(params, '', { tChannelImpl: tChannelImplToWire, binary: this._connection.rawBuffers() ? 'buffer' : 'toBase64' }), apiName, frames, currentStepId);
-              });
+                // Since this api call is either internal, or has already been reported/traced once,
+                // passing as internal.
+                return await this._connection.sendMessageToServer(this, prop, validatedParams, { internal: true });
+              }, { internal });
             };
           }
         }
@@ -163,57 +173,47 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
     return channel;
   }
 
-  async _wrapApiCall<R>(func: (apiZone: ApiZone) => Promise<R>, isInternal = false): Promise<R> {
+  async _wrapApiCall<R>(func: (apiZone: ApiZone) => Promise<R>, options?: { internal?: boolean, title?: string }): Promise<R> {
     const logger = this._logger;
-    const apiZone = zones.zoneData<ApiZone>('apiZone');
-    if (apiZone)
-      return await func(apiZone);
-
-    const stackTrace = captureLibraryStackTrace();
-    let apiName: string | undefined = stackTrace.apiName;
-    const frames: channels.StackFrame[] = stackTrace.frames;
-
-    isInternal = isInternal || this._type === 'LocalUtils';
-    if (isInternal)
-      apiName = undefined;
-
-    // Enclosing zone could have provided the apiName and wallTime.
-    const expectZone = zones.zoneData<ExpectZone>('expectZone');
-    const stepId = expectZone?.stepId;
-    if (!isInternal && expectZone)
-      apiName = expectZone.title;
+    const existingApiZone = this._platform.zones.current().data<ApiZone>();
+    if (existingApiZone)
+      return await func(existingApiZone);
 
-    // If we are coming from the expectZone, there is no need to generate a new
-    // step for the API call, since it will be generated by the expect itself.
-    const csi = isInternal || expectZone ? undefined : this._instrumentation;
-    const callCookie: any = {};
+    const stackTrace = captureLibraryStackTrace(this._platform);
+    const apiZone: ApiZone = { title: options?.title, apiName: stackTrace.apiName, frames: stackTrace.frames, internal: options?.internal ?? false, reported: false, userData: undefined, stepId: undefined };
 
     try {
-      logApiCall(logger, `=> ${apiName} started`, isInternal);
-      const apiZone: ApiZone = { apiName, frames, isInternal, reported: false, csi, callCookie, stepId };
-      const result = await zones.run('apiZone', apiZone, async () => await func(apiZone));
-      csi?.onApiCallEnd(callCookie);
-      logApiCall(logger, `<= ${apiName} succeeded`, isInternal);
+      const result = await this._platform.zones.current().push(apiZone).run(async () => await func(apiZone));
+      if (!options?.internal) {
+        logApiCall(this._platform, logger, `<= ${apiZone.apiName} succeeded`);
+        this._instrumentation.onApiCallEnd(apiZone);
+      }
       return result;
     } catch (e) {
-      const innerError = ((process.env.PWDEBUGIMPL || isUnderTest()) && e.stack) ? '\n<inner error>\n' + e.stack : '';
-      if (apiName && !apiName.includes('<anonymous>'))
-        e.message = apiName + ': ' + e.message;
+      const innerError = ((this._platform.showInternalStackFrames() || this._platform.isUnderTest()) && e.stack) ? '\n<inner error>\n' + e.stack : '';
+      if (apiZone.apiName && !apiZone.apiName.includes('<anonymous>'))
+        e.message = apiZone.apiName + ': ' + e.message;
       const stackFrames = '\n' + stringifyStackFrames(stackTrace.frames).join('\n') + innerError;
       if (stackFrames.trim())
         e.stack = e.message + stackFrames;
       else
         e.stack = '';
-      csi?.onApiCallEnd(callCookie, e);
-      logApiCall(logger, `<= ${apiName} failed`, isInternal);
+      if (!options?.internal) {
+        const recoveryHandlers: RecoverFromApiErrorHandler[] = [];
+        apiZone.error = e;
+        this._instrumentation.onApiCallRecovery(apiZone, e, recoveryHandlers);
+        for (const handler of recoveryHandlers) {
+          const recoverResult = await handler();
+          if (recoverResult.status === 'recovered')
+            return recoverResult.value as R;
+        }
+        logApiCall(this._platform, logger, `<= ${apiZone.apiName} failed`);
+        this._instrumentation.onApiCallEnd(apiZone);
+      }
       throw e;
     }
   }
 
-  _toImpl(): any {
-    return this._connection.toImpl?.(this);
-  }
-
   private toJSON() {
     // Jest's expect library tries to print objects sometimes.
     // RPC objects can contain links to lots of other objects,
@@ -226,12 +226,10 @@ export abstract class ChannelOwner<T extends channels.Channel = channels.Channel
   }
 }
 
-function logApiCall(logger: Logger | undefined, message: string, isNested: boolean) {
-  if (isNested)
-    return;
+function logApiCall(platform: Platform, logger: Logger | undefined, message: string) {
   if (logger && logger.isEnabled('api', 'info'))
     logger.log('api', 'info', message, [], { color: 'cyan' });
-  debugLogger.log('api', message);
+  platform.log('api', message);
 }
 
 function tChannelImplToWire(names: '*' | string[], arg: any, path: string, context: ValidatorContext) {
@@ -241,11 +239,12 @@ function tChannelImplToWire(names: '*' | string[], arg: any, path: string, conte
 }
 
 type ApiZone = {
-  apiName: string | undefined;
+  apiName: string;
   frames: channels.StackFrame[];
-  isInternal: boolean;
+  title?: string;
+  internal?: boolean;
   reported: boolean;
-  csi: ClientInstrumentation | undefined;
-  callCookie: any;
+  userData: any;
   stepId?: string;
+  error?: Error;
 };
diff --git a/packages/playwright-core/src/client/clientHelper.ts b/packages/playwright-core/src/client/clientHelper.ts
index 540230a4fcab4..aecc92a156380 100644
--- a/packages/playwright-core/src/client/clientHelper.ts
+++ b/packages/playwright-core/src/client/clientHelper.ts
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
+import { isString } from '../utils/isomorphic/rtti';
+
 import type * as types from './types';
-import fs from 'fs';
-import { isString } from '../utils';
+import type { Platform } from './platform';
 
 export function envObjectToArray(env: types.Env): { name: string, value: string }[] {
   const result: { name: string, value: string }[] = [];
@@ -28,7 +29,7 @@ export function envObjectToArray(env: types.Env): { name: string, value: string
   return result;
 }
 
-export async function evaluationScript(fun: Function | string | { path?: string, content?: string }, arg?: any, addSourceUrl: boolean = true): Promise<string> {
+export async function evaluationScript(platform: Platform, fun: Function | string | { path?: string, content?: string }, arg?: any, addSourceUrl: boolean = true): Promise<string> {
   if (typeof fun === 'function') {
     const source = fun.toString();
     const argString = Object.is(arg, undefined) ? 'undefined' : JSON.stringify(arg);
@@ -41,7 +42,7 @@ export async function evaluationScript(fun: Function | string | { path?: string,
   if (fun.content !== undefined)
     return fun.content;
   if (fun.path !== undefined) {
-    let source = await fs.promises.readFile(fun.path, 'utf8');
+    let source = await platform.fs().promises.readFile(fun.path, 'utf8');
     if (addSourceUrl)
       source = addSourceUrlToScript(source, fun.path);
     return source;
diff --git a/packages/playwright-core/src/client/clientInstrumentation.ts b/packages/playwright-core/src/client/clientInstrumentation.ts
index 6d90911acdd15..968e3d9810415 100644
--- a/packages/playwright-core/src/client/clientInstrumentation.ts
+++ b/packages/playwright-core/src/client/clientInstrumentation.ts
@@ -14,17 +14,35 @@
  * limitations under the License.
  */
 
-import type { StackFrame } from '@protocol/channels';
 import type { BrowserContext } from './browserContext';
 import type { APIRequestContext } from './fetch';
+import type { StackFrame } from '@protocol/channels';
+
+// Instrumentation can mutate the data, for example change apiName or stepId.
+export interface ApiCallData {
+  apiName: string;
+  title?: string;
+  frames: StackFrame[];
+  userData: any;
+  stepId?: string;
+  error?: Error;
+}
+
+export type RecoverFromApiErrorResult = {
+  status: 'recovered' | 'failed';
+  value?: string | number | boolean | undefined;
+};
+
+export type RecoverFromApiErrorHandler = () => Promise<RecoverFromApiErrorResult>;
 
 export interface ClientInstrumentation {
   addListener(listener: ClientInstrumentationListener): void;
   removeListener(listener: ClientInstrumentationListener): void;
   removeAllListeners(): void;
-  onApiCallBegin(apiCall: string, params: Record<string, any>, frames: StackFrame[], userData: any, out: { stepId?: string }): void;
-  onApiCallEnd(userData: any, error?: Error): void;
-  onWillPause(): void;
+  onApiCallBegin(apiCall: ApiCallData, channel: { type: string, method: string, params?: Record<string, any> }): void;
+  onApiCallRecovery(apiCall: ApiCallData, error: Error, recoveryHandlers: RecoverFromApiErrorHandler[]): void;
+  onApiCallEnd(apiCall: ApiCallData): void;
+  onWillPause(options: { keepTestTimeout: boolean }): void;
 
   runAfterCreateBrowserContext(context: BrowserContext): Promise<void>;
   runAfterCreateRequestContext(context: APIRequestContext): Promise<void>;
@@ -33,9 +51,10 @@ export interface ClientInstrumentation {
 }
 
 export interface ClientInstrumentationListener {
-  onApiCallBegin?(apiName: string, params: Record<string, any>, frames: StackFrame[], userData: any, out: { stepId?: string }): void;
-  onApiCallEnd?(userData: any, error?: Error): void;
-  onWillPause?(): void;
+  onApiCallBegin?(apiCall: ApiCallData, channel: { type: string, method: string, params?: Record<string, any>  }): void;
+  onApiCallRecovery?(apiCall: ApiCallData, error: Error, recoveryHandlers: RecoverFromApiErrorHandler[]): void;
+  onApiCallEnd?(apiCall: ApiCallData): void;
+  onWillPause?(options: { keepTestTimeout: boolean }): void;
 
   runAfterCreateBrowserContext?(context: BrowserContext): Promise<void>;
   runAfterCreateRequestContext?(context: APIRequestContext): Promise<void>;
diff --git a/packages/playwright-core/src/client/clientStackTrace.ts b/packages/playwright-core/src/client/clientStackTrace.ts
new file mode 100644
index 0000000000000..3dc16dbae6f72
--- /dev/null
+++ b/packages/playwright-core/src/client/clientStackTrace.ts
@@ -0,0 +1,76 @@
+/**
+ * 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 { captureRawStack, parseStackFrame } from '../utils/isomorphic/stackTrace';
+
+import type { Platform } from './platform';
+import type { StackFrame } from '@isomorphic/stackTrace';
+
+export function captureLibraryStackTrace(platform: Platform): { frames: StackFrame[], apiName: string } {
+  const stack = captureRawStack();
+
+  type ParsedFrame = {
+    frame: StackFrame;
+    frameText: string;
+    isPlaywrightLibrary: boolean;
+  };
+  let parsedFrames = stack.map(line => {
+    const frame = parseStackFrame(line, platform.pathSeparator, platform.showInternalStackFrames());
+    if (!frame || !frame.file)
+      return null;
+    const isPlaywrightLibrary = !!platform.coreDir && frame.file.startsWith(platform.coreDir);
+    const parsed: ParsedFrame = {
+      frame,
+      frameText: line,
+      isPlaywrightLibrary
+    };
+    return parsed;
+  }).filter(Boolean) as ParsedFrame[];
+
+  let apiName = '';
+
+  // Deepest transition between non-client code calling into client
+  // code is the api entry.
+  for (let i = 0; i < parsedFrames.length - 1; i++) {
+    const parsedFrame = parsedFrames[i];
+    if (parsedFrame.isPlaywrightLibrary && !parsedFrames[i + 1].isPlaywrightLibrary) {
+      apiName = apiName || normalizeAPIName(parsedFrame.frame.function);
+      break;
+    }
+  }
+
+  function normalizeAPIName(name?: string): string {
+    if (!name)
+      return '';
+    const match = name.match(/(API|JS|CDP|[A-Z])(.*)/);
+    if (!match)
+      return name;
+    return match[1].toLowerCase() + match[2];
+  }
+
+  // This is for the inspector so that it did not include the test runner stack frames.
+  const filterPrefixes = platform.boxedStackPrefixes();
+  parsedFrames = parsedFrames.filter(f => {
+    if (filterPrefixes.some(prefix => f.frame.file.startsWith(prefix)))
+      return false;
+    return true;
+  });
+
+  return {
+    frames: parsedFrames.map(p => p.frame),
+    apiName
+  };
+}
diff --git a/packages/playwright-core/src/client/clock.ts b/packages/playwright-core/src/client/clock.ts
index 73eb538c264bf..fdc7789b59635 100644
--- a/packages/playwright-core/src/client/clock.ts
+++ b/packages/playwright-core/src/client/clock.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type * as api from '../../types/types';
 import type { BrowserContext } from './browserContext';
+import type * as api from '../../types/types';
 
 export class Clock implements api.Clock {
   private _browserContext: BrowserContext;
diff --git a/packages/playwright-core/src/client/connection.ts b/packages/playwright-core/src/client/connection.ts
index 953fc279e974c..589e063244d84 100644
--- a/packages/playwright-core/src/client/connection.ts
+++ b/packages/playwright-core/src/client/connection.ts
@@ -14,37 +14,39 @@
  * limitations under the License.
  */
 
+import { EventEmitter } from './eventEmitter';
+import { Android, AndroidDevice, AndroidSocket } from './android';
+import { Artifact } from './artifact';
 import { Browser } from './browser';
 import { BrowserContext } from './browserContext';
 import { BrowserType } from './browserType';
+import { CDPSession } from './cdpSession';
 import { ChannelOwner } from './channelOwner';
+import { createInstrumentation } from './clientInstrumentation';
+import { Dialog } from './dialog';
+import { Electron, ElectronApplication } from './electron';
 import { ElementHandle } from './elementHandle';
+import { TargetClosedError, parseError } from './errors';
+import { APIRequestContext } from './fetch';
 import { Frame } from './frame';
 import { JSHandle } from './jsHandle';
-import { Request, Response, Route, WebSocket } from './network';
-import { Page, BindingCall } from './page';
-import { Worker } from './worker';
-import { Dialog } from './dialog';
-import { parseError, TargetClosedError } from './errors';
-import { CDPSession } from './cdpSession';
-import { Playwright } from './playwright';
-import { Electron, ElectronApplication } from './electron';
-import type * as channels from '@protocol/channels';
-import { Stream } from './stream';
-import { WritableStream } from './writableStream';
-import { debugLogger } from '../utils/debugLogger';
-import { SelectorsOwner } from './selectors';
-import { Android, AndroidSocket, AndroidDevice } from './android';
-import { Artifact } from './artifact';
-import { EventEmitter } from 'events';
 import { JsonPipe } from './jsonPipe';
-import { APIRequestContext } from './fetch';
 import { LocalUtils } from './localUtils';
+import { Request, Response, Route, WebSocket, WebSocketRoute } from './network';
+import { BindingCall, Page } from './page';
+import { Playwright } from './playwright';
+import { Stream } from './stream';
 import { Tracing } from './tracing';
-import { findValidator, ValidationError, type ValidatorContext } from '../protocol/validator';
-import { createInstrumentation } from './clientInstrumentation';
+import { Worker } from './worker';
+import { WritableStream } from './writableStream';
+import { ValidationError, findValidator  } from '../protocol/validator';
+import { rewriteErrorMessage } from '../utils/isomorphic/stackTrace';
+
 import type { ClientInstrumentation } from './clientInstrumentation';
-import { formatCallLog, rewriteErrorMessage, zones } from '../utils';
+import type { HeadersArray } from './types';
+import type { ValidatorContext } from '../protocol/validator';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
 
 class Root extends ChannelOwner<channels.RootChannel> {
   constructor(connection: Connection) {
@@ -65,22 +67,25 @@ export class Connection extends EventEmitter {
   readonly _objects = new Map<string, ChannelOwner>();
   onmessage = (message: object): void => {};
   private _lastId = 0;
-  private _callbacks = new Map<number, { resolve: (a: any) => void, reject: (a: Error) => void, apiName: string | undefined, type: string, method: string }>();
+  private _callbacks = new Map<number, { resolve: (a: any) => void, reject: (a: Error) => void, title: string | undefined, type: string, method: string }>();
   private _rootObject: Root;
   private _closedError: Error | undefined;
   private _isRemote = false;
   private _localUtils?: LocalUtils;
   private _rawBuffers = false;
   // Some connections allow resolving in-process dispatchers.
-  toImpl: ((client: ChannelOwner) => any) | undefined;
+  toImpl: ((client: ChannelOwner | Connection) => any) | undefined;
   private _tracingCount = 0;
   readonly _instrumentation: ClientInstrumentation;
+  // Used from @playwright/test fixtures -> TODO remove?
+  readonly headers: HeadersArray;
 
-  constructor(localUtils: LocalUtils | undefined, instrumentation: ClientInstrumentation | undefined) {
-    super();
-    this._rootObject = new Root(this);
-    this._localUtils = localUtils;
+  constructor(platform: Platform, localUtils?: LocalUtils, instrumentation?: ClientInstrumentation, headers: HeadersArray = []) {
+    super(platform);
     this._instrumentation = instrumentation || createInstrumentation();
+    this._localUtils = localUtils;
+    this._rootObject = new Root(this);
+    this.headers = headers;
   }
 
   markAsRemote() {
@@ -99,8 +104,8 @@ export class Connection extends EventEmitter {
     return this._rawBuffers;
   }
 
-  localUtils(): LocalUtils {
-    return this._localUtils!;
+  localUtils(): LocalUtils | undefined {
+    return this._localUtils;
   }
 
   async initializePlaywright(): Promise<Playwright> {
@@ -118,7 +123,7 @@ export class Connection extends EventEmitter {
       this._tracingCount--;
   }
 
-  async sendMessageToServer(object: ChannelOwner, method: string, params: any, apiName: string | undefined, frames: channels.StackFrame[], stepId?: string): Promise<any> {
+  async sendMessageToServer(object: ChannelOwner, method: string, params: any, options: { apiName?: string, title?: string, internal?: boolean, frames?: channels.StackFrame[], stepId?: string }): Promise<any> {
     if (this._closedError)
       throw this._closedError;
     if (object._wasCollected)
@@ -128,18 +133,26 @@ export class Connection extends EventEmitter {
     const type = object._type;
     const id = ++this._lastId;
     const message = { id, guid, method, params };
-    if (debugLogger.isEnabled('channel')) {
+    if (this._platform.isLogEnabled('channel')) {
       // Do not include metadata in debug logs to avoid noise.
-      debugLogger.log('channel', 'SEND> ' + JSON.stringify(message));
+      this._platform.log('channel', 'SEND> ' + JSON.stringify(message));
     }
-    const location = frames[0] ? { file: frames[0].file, line: frames[0].line, column: frames[0].column } : undefined;
-    const metadata: channels.Metadata = { apiName, location, internal: !apiName, stepId };
-    if (this._tracingCount && frames && type !== 'LocalUtils')
-      this._localUtils?._channel.addStackToTracingNoReply({ callData: { stack: frames, id } }).catch(() => {});
+    const location = options.frames?.[0] ? { file: options.frames[0].file, line: options.frames[0].line, column: options.frames[0].column } : undefined;
+    const metadata: channels.Metadata = { title: options.title, location, internal: options.internal, stepId: options.stepId };
+    if (this._tracingCount && options.frames && type !== 'LocalUtils')
+      this._localUtils?.addStackToTracingNoReply({ callData: { stack: options.frames ?? [], id } }).catch(() => {});
     // We need to exit zones before calling into the server, otherwise
     // when we receive events from the server, we would be in an API zone.
-    zones.exitZones(() => this.onmessage({ ...message, metadata }));
-    return await new Promise((resolve, reject) => this._callbacks.set(id, { resolve, reject, apiName, type, method }));
+    this._platform.zones.empty.run(() => this.onmessage({ ...message, metadata }));
+    return await new Promise((resolve, reject) => this._callbacks.set(id, { resolve, reject, title: options.title, type, method }));
+  }
+
+  private _validatorFromWireContext(): ValidatorContext {
+    return {
+      tChannelImpl: this._tChannelImplFromWire.bind(this),
+      binary: this._rawBuffers ? 'buffer' : 'fromBase64',
+      isUnderTest: () => this._platform.isUnderTest(),
+    };
   }
 
   dispatch(message: object) {
@@ -148,25 +161,25 @@ export class Connection extends EventEmitter {
 
     const { id, guid, method, params, result, error, log } = message as any;
     if (id) {
-      if (debugLogger.isEnabled('channel'))
-        debugLogger.log('channel', '<RECV ' + JSON.stringify(message));
+      if (this._platform.isLogEnabled('channel'))
+        this._platform.log('channel', '<RECV ' + JSON.stringify(message));
       const callback = this._callbacks.get(id);
       if (!callback)
         throw new Error(`Cannot find command to respond: ${id}`);
       this._callbacks.delete(id);
       if (error && !result) {
         const parsedError = parseError(error);
-        rewriteErrorMessage(parsedError, parsedError.message + formatCallLog(log));
+        rewriteErrorMessage(parsedError, parsedError.message + formatCallLog(this._platform, log));
         callback.reject(parsedError);
       } else {
         const validator = findValidator(callback.type, callback.method, 'Result');
-        callback.resolve(validator(result, '', { tChannelImpl: this._tChannelImplFromWire.bind(this), binary: this._rawBuffers ? 'buffer' : 'fromBase64' }));
+        callback.resolve(validator(result, '', this._validatorFromWireContext()));
       }
       return;
     }
 
-    if (debugLogger.isEnabled('channel'))
-      debugLogger.log('channel', '<EVENT ' + JSON.stringify(message));
+    if (this._platform.isLogEnabled('channel'))
+      this._platform.log('channel', '<EVENT ' + JSON.stringify(message));
     if (method === '__create__') {
       this._createRemoteObject(guid, params.type, params.guid, params.initializer);
       return;
@@ -190,7 +203,7 @@ export class Connection extends EventEmitter {
     }
 
     const validator = findValidator(object._type, method, 'Event');
-    (object._channel as any).emit(method, validator(params, '', { tChannelImpl: this._tChannelImplFromWire.bind(this), binary: this._rawBuffers ? 'buffer' : 'fromBase64' }));
+    (object._channel as any).emit(method, validator(params, '', this._validatorFromWireContext()));
   }
 
   close(cause?: string) {
@@ -221,7 +234,7 @@ export class Connection extends EventEmitter {
       throw new Error(`Cannot find parent object ${parentGuid} to create ${guid}`);
     let result: ChannelOwner<any>;
     const validator = findValidator(type, '', 'Initializer');
-    initializer = validator(initializer, '', { tChannelImpl: this._tChannelImplFromWire.bind(this), binary: this._rawBuffers ? 'buffer' : 'fromBase64' });
+    initializer = validator(initializer, '', this._validatorFromWireContext());
     switch (type) {
       case 'Android':
         result = new Android(parent, type, guid, initializer);
@@ -297,9 +310,6 @@ export class Connection extends EventEmitter {
       case 'Stream':
         result = new Stream(parent, type, guid, initializer);
         break;
-      case 'Selectors':
-        result = new SelectorsOwner(parent, type, guid, initializer);
-        break;
       case 'SocksSupport':
         result = new DummyChannelOwner(parent, type, guid, initializer);
         break;
@@ -309,6 +319,9 @@ export class Connection extends EventEmitter {
       case 'WebSocket':
         result = new WebSocket(parent, type, guid, initializer);
         break;
+      case 'WebSocketRoute':
+        result = new WebSocketRoute(parent, type, guid, initializer);
+        break;
       case 'Worker':
         result = new Worker(parent, type, guid, initializer);
         break;
@@ -321,3 +334,12 @@ export class Connection extends EventEmitter {
     return result;
   }
 }
+
+function formatCallLog(platform: Platform, log: string[] | undefined): string {
+  if (!log || !log.some(l => !!l))
+    return '';
+  return `
+Call log:
+${platform.colors.dim(log.join('\n'))}
+`;
+}
diff --git a/packages/playwright-core/src/client/consoleMessage.ts b/packages/playwright-core/src/client/consoleMessage.ts
index fcdc3fd1490be..5f8efee8c27ea 100644
--- a/packages/playwright-core/src/client/consoleMessage.ts
+++ b/packages/playwright-core/src/client/consoleMessage.ts
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import * as util from 'util';
 import { JSHandle } from './jsHandle';
-import type * as channels from '@protocol/channels';
-import type * as api from '../../types/types';
 import { Page } from './page';
 
+import type * as api from '../../types/types';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
+
 type ConsoleMessageLocation = channels.BrowserContextConsoleEvent['location'];
 
 export class ConsoleMessage implements api.ConsoleMessage {
@@ -27,17 +28,19 @@ export class ConsoleMessage implements api.ConsoleMessage {
   private _page: Page | null;
   private _event: channels.BrowserContextConsoleEvent | channels.ElectronApplicationConsoleEvent;
 
-  constructor(event: channels.BrowserContextConsoleEvent | channels.ElectronApplicationConsoleEvent) {
+  constructor(platform: Platform, event: channels.BrowserContextConsoleEvent | channels.ElectronApplicationConsoleEvent) {
     this._page = ('page' in event && event.page) ? Page.from(event.page) : null;
     this._event = event;
+    if (platform.inspectCustom)
+      (this as any)[platform.inspectCustom] = () => this._inspect();
   }
 
   page() {
     return this._page;
   }
 
-  type(): string {
-    return this._event.type;
+  type(): ReturnType<api.ConsoleMessage['type']> {
+    return this._event.type as ReturnType<api.ConsoleMessage['type']>;
   }
 
   text(): string {
@@ -52,7 +55,7 @@ export class ConsoleMessage implements api.ConsoleMessage {
     return this._event.location;
   }
 
-  [util.inspect.custom]() {
+  private _inspect() {
     return this.text();
   }
 }
diff --git a/packages/playwright-core/src/client/coverage.ts b/packages/playwright-core/src/client/coverage.ts
index c736d1fad0047..7e1cb7ef2b650 100644
--- a/packages/playwright-core/src/client/coverage.ts
+++ b/packages/playwright-core/src/client/coverage.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
 
 export class Coverage implements api.Coverage {
   private _channel: channels.PageChannel;
diff --git a/packages/playwright-core/src/client/dialog.ts b/packages/playwright-core/src/client/dialog.ts
index c012838b7ccec..52722cecfd61f 100644
--- a/packages/playwright-core/src/client/dialog.ts
+++ b/packages/playwright-core/src/client/dialog.ts
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
-import type * as api from '../../types/types';
 import { Page } from './page';
 
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
+
+
 export class Dialog extends ChannelOwner<channels.DialogChannel> implements api.Dialog {
   static from(dialog: channels.DialogChannel): Dialog {
     return (dialog as any)._object;
diff --git a/packages/playwright-core/src/client/download.ts b/packages/playwright-core/src/client/download.ts
index e5cdd01aa632b..550f485aa0982 100644
--- a/packages/playwright-core/src/client/download.ts
+++ b/packages/playwright-core/src/client/download.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import type { Readable } from 'stream';
-import type * as api from '../../types/types';
 import type { Artifact } from './artifact';
 import type { Page } from './page';
+import type * as api from '../../types/types';
+import type { Readable } from 'stream';
 
 export class Download implements api.Download {
   private _page: Page;
diff --git a/packages/playwright-core/src/client/electron.ts b/packages/playwright-core/src/client/electron.ts
index fcabfa494f9a2..fc33350d0750f 100644
--- a/packages/playwright-core/src/client/electron.ts
+++ b/packages/playwright-core/src/client/electron.ts
@@ -14,22 +14,24 @@
  * limitations under the License.
  */
 
-import type { BrowserWindow } from 'electron';
-import type * as childProcess from 'child_process';
-import type * as structs from '../../types/structs';
-import type * as api from '../../types/types';
-import type * as channels from '@protocol/channels';
-import { TimeoutSettings } from '../common/timeoutSettings';
 import { BrowserContext, prepareBrowserContextParams } from './browserContext';
 import { ChannelOwner } from './channelOwner';
 import { envObjectToArray } from './clientHelper';
+import { ConsoleMessage } from './consoleMessage';
+import { TargetClosedError, isTargetClosedError } from './errors';
 import { Events } from './events';
 import { JSHandle, parseResult, serializeArgument } from './jsHandle';
-import type { Page } from './page';
-import { ConsoleMessage } from './consoleMessage';
-import type { Env, WaitForEventOptions, Headers, BrowserContextOptions } from './types';
 import { Waiter } from './waiter';
-import { TargetClosedError, isTargetClosedError } from './errors';
+import { TimeoutSettings } from './timeoutSettings';
+
+import type { Page } from './page';
+import type { BrowserContextOptions, Env, Headers, WaitForEventOptions } from './types';
+import type * as structs from '../../types/structs';
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
+import type * as childProcess from 'child_process';
+import type { BrowserWindow } from 'electron';
+import type { Playwright } from './playwright';
 
 type ElectronOptions = Omit<channels.ElectronLaunchOptions, 'env'|'extraHTTPHeaders'|'recordHar'|'colorScheme'|'acceptDownloads'> & {
   env?: Env,
@@ -37,11 +39,14 @@ type ElectronOptions = Omit<channels.ElectronLaunchOptions, 'env'|'extraHTTPHead
   recordHar?: BrowserContextOptions['recordHar'],
   colorScheme?: 'dark' | 'light' | 'no-preference' | null,
   acceptDownloads?: boolean,
+  timeout?: number,
 };
 
 type ElectronAppType = typeof import('electron');
 
 export class Electron extends ChannelOwner<channels.ElectronChannel> implements api.Electron {
+  _playwright!: Playwright;
+
   static from(electron: channels.ElectronChannel): Electron {
     return (electron as any)._object;
   }
@@ -51,13 +56,18 @@ export class Electron extends ChannelOwner<channels.ElectronChannel> implements
   }
 
   async launch(options: ElectronOptions = {}): Promise<ElectronApplication> {
+    options = this._playwright.selectors._withSelectorOptions(options);
     const params: channels.ElectronLaunchParams = {
-      ...await prepareBrowserContextParams(options),
-      env: envObjectToArray(options.env ? options.env : process.env),
+      ...await prepareBrowserContextParams(this._platform, options),
+      env: envObjectToArray(options.env ? options.env : this._platform.env),
       tracesDir: options.tracesDir,
+      timeout: new TimeoutSettings(this._platform).launchTimeout(options),
     };
     const app = ElectronApplication.from((await this._channel.launch(params)).electronApplication);
-    app._context._setOptions(params, options);
+    this._playwright.selectors._contextsForSelectors.add(app._context);
+    app.once(Events.ElectronApplication.Close, () => this._playwright.selectors._contextsForSelectors.delete(app._context));
+    await app._context._initializeHarFromOptions(options.recordHar);
+    app._context.tracing._tracesDir = options.tracesDir;
     return app;
   }
 }
@@ -65,7 +75,7 @@ export class Electron extends ChannelOwner<channels.ElectronChannel> implements
 export class ElectronApplication extends ChannelOwner<channels.ElectronApplicationChannel> implements api.ElectronApplication {
   readonly _context: BrowserContext;
   private _windows = new Set<Page>();
-  private _timeoutSettings = new TimeoutSettings();
+  private _timeoutSettings: TimeoutSettings;
 
   static from(electronApplication: channels.ElectronApplicationChannel): ElectronApplication {
     return (electronApplication as any)._object;
@@ -73,6 +83,8 @@ export class ElectronApplication extends ChannelOwner<channels.ElectronApplicati
 
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.ElectronApplicationInitializer) {
     super(parent, type, guid, initializer);
+
+    this._timeoutSettings = new TimeoutSettings(this._platform);
     this._context = BrowserContext.from(initializer.context);
     for (const page of this._context._pages)
       this._onPage(page);
@@ -80,14 +92,14 @@ export class ElectronApplication extends ChannelOwner<channels.ElectronApplicati
     this._channel.on('close', () => {
       this.emit(Events.ElectronApplication.Close);
     });
-    this._channel.on('console', event => this.emit(Events.ElectronApplication.Console, new ConsoleMessage(event)));
+    this._channel.on('console', event => this.emit(Events.ElectronApplication.Console, new ConsoleMessage(this._platform, event)));
     this._setEventToSubscriptionMapping(new Map<string, channels.ElectronApplicationUpdateSubscriptionParams['event']>([
       [Events.ElectronApplication.Console, 'console'],
     ]));
   }
 
   process(): childProcess.ChildProcess {
-    return this._toImpl().process();
+    return this._connection.toImpl?.(this)?.process();
   }
 
   _onPage(page: Page) {
@@ -103,7 +115,7 @@ export class ElectronApplication extends ChannelOwner<channels.ElectronApplicati
 
   async firstWindow(options?: { timeout?: number }): Promise<Page> {
     if (this._windows.size)
-      return this._windows.values().next().value;
+      return this._windows.values().next().value!;
     return await this.waitForEvent('window', options);
   }
 
diff --git a/packages/playwright-core/src/client/elementHandle.ts b/packages/playwright-core/src/client/elementHandle.ts
index 0a89d3091bf52..93a600336d698 100644
--- a/packages/playwright-core/src/client/elementHandle.ts
+++ b/packages/playwright-core/src/client/elementHandle.ts
@@ -14,27 +14,25 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { Frame } from './frame';
-import type { Locator } from './locator';
-import { JSHandle, serializeArgument, parseResult } from './jsHandle';
-import type { ChannelOwner } from './channelOwner';
-import type { SelectOption, FilePayload, Rect, SelectOptionOptions } from './types';
-import fs from 'fs';
-import { mime } from '../utilsBundle';
-import path from 'path';
-import { assert, isString } from '../utils';
-import { fileUploadSizeLimit, mkdirIfNeeded } from '../utils/fileUtils';
-import type * as api from '../../types/types';
-import type * as structs from '../../types/structs';
-import type { BrowserContext } from './browserContext';
+import { JSHandle, parseResult, serializeArgument } from './jsHandle';
+import { assert } from '../utils/isomorphic/assert';
+import { fileUploadSizeLimit, mkdirIfNeeded } from './fileUtils';
+import { isString } from '../utils/isomorphic/rtti';
 import { WritableStream } from './writableStream';
-import { pipeline } from 'stream';
-import { promisify } from 'util';
+import { getMimeTypeForPath } from '../utils/isomorphic/mimeType';
 
-const pipelineAsync = promisify(pipeline);
+import type { BrowserContext } from './browserContext';
+import type { ChannelOwner } from './channelOwner';
+import type { Locator } from './locator';
+import type { FilePayload, Rect, SelectOption, SelectOptionOptions, TimeoutOptions } from './types';
+import type * as structs from '../../types/structs';
+import type * as api from '../../types/types';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
 
 export class ElementHandle<T extends Node = Node> extends JSHandle<T> implements api.ElementHandle {
+  private _frame: Frame;
   readonly _elementChannel: channels.ElementHandleChannel;
 
   static override from(handle: channels.ElementHandleChannel): ElementHandle {
@@ -47,6 +45,7 @@ export class ElementHandle<T extends Node = Node> extends JSHandle<T> implements
 
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.JSHandleInitializer) {
     super(parent, type, guid, initializer);
+    this._frame = parent as Frame;
     this._elementChannel = this._channel as channels.ElementHandleChannel;
   }
 
@@ -112,65 +111,65 @@ export class ElementHandle<T extends Node = Node> extends JSHandle<T> implements
     await this._elementChannel.dispatchEvent({ type, eventInit: serializeArgument(eventInit) });
   }
 
-  async scrollIntoViewIfNeeded(options: channels.ElementHandleScrollIntoViewIfNeededOptions = {}) {
-    await this._elementChannel.scrollIntoViewIfNeeded(options);
+  async scrollIntoViewIfNeeded(options: channels.ElementHandleScrollIntoViewIfNeededOptions & TimeoutOptions = {}) {
+    await this._elementChannel.scrollIntoViewIfNeeded({ ...options, timeout: this._frame._timeout(options) });
   }
 
-  async hover(options: channels.ElementHandleHoverOptions = {}): Promise<void> {
-    await this._elementChannel.hover(options);
+  async hover(options: channels.ElementHandleHoverOptions & TimeoutOptions = {}): Promise<void> {
+    await this._elementChannel.hover({ ...options, timeout: this._frame._timeout(options) });
   }
 
-  async click(options: channels.ElementHandleClickOptions = {}): Promise<void> {
-    return await this._elementChannel.click(options);
+  async click(options: channels.ElementHandleClickOptions & TimeoutOptions = {}): Promise<void> {
+    return await this._elementChannel.click({ ...options, timeout: this._frame._timeout(options) });
   }
 
-  async dblclick(options: channels.ElementHandleDblclickOptions = {}): Promise<void> {
-    return await this._elementChannel.dblclick(options);
+  async dblclick(options: channels.ElementHandleDblclickOptions & TimeoutOptions = {}): Promise<void> {
+    return await this._elementChannel.dblclick({ ...options, timeout: this._frame._timeout(options) });
   }
 
-  async tap(options: channels.ElementHandleTapOptions = {}): Promise<void> {
-    return await this._elementChannel.tap(options);
+  async tap(options: channels.ElementHandleTapOptions & TimeoutOptions = {}): Promise<void> {
+    return await this._elementChannel.tap({ ...options, timeout: this._frame._timeout(options) });
   }
 
   async selectOption(values: string | api.ElementHandle | SelectOption | string[] | api.ElementHandle[] | SelectOption[] | null, options: SelectOptionOptions = {}): Promise<string[]> {
-    const result = await this._elementChannel.selectOption({ ...convertSelectOptionValues(values), ...options });
+    const result = await this._elementChannel.selectOption({ ...convertSelectOptionValues(values), ...options, timeout: this._frame._timeout(options) });
     return result.values;
   }
 
-  async fill(value: string, options: channels.ElementHandleFillOptions = {}): Promise<void> {
-    return await this._elementChannel.fill({ value, ...options });
+  async fill(value: string, options: channels.ElementHandleFillOptions & TimeoutOptions = {}): Promise<void> {
+    return await this._elementChannel.fill({ value, ...options, timeout: this._frame._timeout(options) });
   }
 
-  async selectText(options: channels.ElementHandleSelectTextOptions = {}): Promise<void> {
-    await this._elementChannel.selectText(options);
+  async selectText(options: channels.ElementHandleSelectTextOptions & TimeoutOptions = {}): Promise<void> {
+    await this._elementChannel.selectText({ ...options, timeout: this._frame._timeout(options) });
   }
 
-  async setInputFiles(files: string | FilePayload | string[] | FilePayload[], options: channels.ElementHandleSetInputFilesOptions = {}) {
+  async setInputFiles(files: string | FilePayload | string[] | FilePayload[], options: channels.ElementHandleSetInputFilesOptions & TimeoutOptions = {}) {
     const frame = await this.ownerFrame();
     if (!frame)
       throw new Error('Cannot set input files to detached element');
-    const converted = await convertInputFiles(files, frame.page().context());
-    await this._elementChannel.setInputFiles({ ...converted, ...options });
+    const converted = await convertInputFiles(this._platform, files, frame.page().context());
+    await this._elementChannel.setInputFiles({ ...converted, ...options, timeout: this._frame._timeout(options) });
   }
 
   async focus(): Promise<void> {
     await this._elementChannel.focus();
   }
 
-  async type(text: string, options: channels.ElementHandleTypeOptions = {}): Promise<void> {
-    await this._elementChannel.type({ text, ...options });
+  async type(text: string, options: channels.ElementHandleTypeOptions & TimeoutOptions = {}): Promise<void> {
+    await this._elementChannel.type({ text, ...options, timeout: this._frame._timeout(options) });
   }
 
-  async press(key: string, options: channels.ElementHandlePressOptions = {}): Promise<void> {
-    await this._elementChannel.press({ key, ...options });
+  async press(key: string, options: channels.ElementHandlePressOptions & TimeoutOptions = {}): Promise<void> {
+    await this._elementChannel.press({ key, ...options, timeout: this._frame._timeout(options) });
   }
 
-  async check(options: channels.ElementHandleCheckOptions = {}) {
-    return await this._elementChannel.check(options);
+  async check(options: channels.ElementHandleCheckOptions & TimeoutOptions = {}) {
+    return await this._elementChannel.check({ ...options, timeout: this._frame._timeout(options) });
   }
 
-  async uncheck(options: channels.ElementHandleUncheckOptions = {}) {
-    return await this._elementChannel.uncheck(options);
+  async uncheck(options: channels.ElementHandleUncheckOptions & TimeoutOptions = {}) {
+    return await this._elementChannel.uncheck({ ...options, timeout: this._frame._timeout(options) });
   }
 
   async setChecked(checked: boolean, options?: channels.ElementHandleCheckOptions) {
@@ -185,20 +184,21 @@ export class ElementHandle<T extends Node = Node> extends JSHandle<T> implements
     return value === undefined ? null : value;
   }
 
-  async screenshot(options: Omit<channels.ElementHandleScreenshotOptions, 'mask'> & { path?: string, mask?: Locator[] } = {}): Promise<Buffer> {
-    const copy: channels.ElementHandleScreenshotOptions = { ...options, mask: undefined };
+  async screenshot(options: Omit<channels.ElementHandleScreenshotOptions, 'mask'> & TimeoutOptions & { path?: string, mask?: api.Locator[] } = {}): Promise<Buffer> {
+    const mask = options.mask as Locator[] | undefined;
+    const copy: channels.ElementHandleScreenshotParams = { ...options, mask: undefined, timeout: this._frame._timeout(options) };
     if (!copy.type)
       copy.type = determineScreenshotType(options);
-    if (options.mask) {
-      copy.mask = options.mask.map(locator => ({
+    if (mask) {
+      copy.mask = mask.map(locator => ({
         frame: locator._frame._channel,
         selector: locator._selector,
       }));
     }
     const result = await this._elementChannel.screenshot(copy);
     if (options.path) {
-      await mkdirIfNeeded(options.path);
-      await fs.promises.writeFile(options.path, result.binary);
+      await mkdirIfNeeded(this._platform, options.path);
+      await this._platform.fs().promises.writeFile(options.path, result.binary);
     }
     return result.binary;
   }
@@ -222,14 +222,14 @@ export class ElementHandle<T extends Node = Node> extends JSHandle<T> implements
     return parseResult(result.value);
   }
 
-  async waitForElementState(state: 'visible' | 'hidden' | 'stable' | 'enabled' | 'disabled', options: channels.ElementHandleWaitForElementStateOptions = {}): Promise<void> {
-    return await this._elementChannel.waitForElementState({ state, ...options });
+  async waitForElementState(state: 'visible' | 'hidden' | 'stable' | 'enabled' | 'disabled', options: TimeoutOptions = {}): Promise<void> {
+    return await this._elementChannel.waitForElementState({ state, ...options, timeout: this._frame._timeout(options) });
   }
 
-  waitForSelector(selector: string, options: channels.ElementHandleWaitForSelectorOptions & { state: 'attached' | 'visible' }): Promise<ElementHandle<SVGElement | HTMLElement>>;
-  waitForSelector(selector: string, options?: channels.ElementHandleWaitForSelectorOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
-  async waitForSelector(selector: string, options: channels.ElementHandleWaitForSelectorOptions = {}): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
-    const result = await this._elementChannel.waitForSelector({ selector, ...options });
+  waitForSelector(selector: string, options: channels.ElementHandleWaitForSelectorOptions & TimeoutOptions & { state: 'attached' | 'visible' }): Promise<ElementHandle<SVGElement | HTMLElement>>;
+  waitForSelector(selector: string, options?: channels.ElementHandleWaitForSelectorOptions & TimeoutOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
+  async waitForSelector(selector: string, options: channels.ElementHandleWaitForSelectorOptions & TimeoutOptions = {}): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
+    const result = await this._elementChannel.waitForSelector({ selector, ...options, timeout: this._frame._timeout(options) });
     return ElementHandle.fromNullable(result.element) as ElementHandle<SVGElement | HTMLElement> | null;
   }
 }
@@ -256,18 +256,18 @@ function filePayloadExceedsSizeLimit(payloads: FilePayload[]) {
   return payloads.reduce((size, item) => size + (item.buffer ? item.buffer.byteLength : 0), 0) >= fileUploadSizeLimit;
 }
 
-async function resolvePathsAndDirectoryForInputFiles(items: string[]): Promise<[string[] | undefined, string | undefined]> {
+async function resolvePathsAndDirectoryForInputFiles(platform: Platform, items: string[]): Promise<[string[] | undefined, string | undefined]> {
   let localPaths: string[] | undefined;
   let localDirectory: string | undefined;
   for (const item of items) {
-    const stat = await fs.promises.stat(item as string);
+    const stat = await platform.fs().promises.stat(item as string);
     if (stat.isDirectory()) {
       if (localDirectory)
         throw new Error('Multiple directories are not supported');
-      localDirectory = path.resolve(item as string);
+      localDirectory = platform.path().resolve(item as string);
     } else {
       localPaths ??= [];
-      localPaths.push(path.resolve(item as string));
+      localPaths.push(platform.path().resolve(item as string));
     }
   }
   if (localPaths?.length && localDirectory)
@@ -275,30 +275,30 @@ async function resolvePathsAndDirectoryForInputFiles(items: string[]): Promise<[
   return [localPaths, localDirectory];
 }
 
-export async function convertInputFiles(files: string | FilePayload | string[] | FilePayload[], context: BrowserContext): Promise<SetInputFilesFiles> {
+export async function convertInputFiles(platform: Platform, files: string | FilePayload | string[] | FilePayload[], context: BrowserContext): Promise<SetInputFilesFiles> {
   const items: (string | FilePayload)[] = Array.isArray(files) ? files.slice() : [files];
 
   if (items.some(item => typeof item === 'string')) {
     if (!items.every(item => typeof item === 'string'))
       throw new Error('File paths cannot be mixed with buffers');
 
-    const [localPaths, localDirectory] = await resolvePathsAndDirectoryForInputFiles(items);
+    const [localPaths, localDirectory] = await resolvePathsAndDirectoryForInputFiles(platform, items);
 
     if (context._connection.isRemote()) {
-      const files = localDirectory ? (await fs.promises.readdir(localDirectory, { withFileTypes: true, recursive: true })).filter(f => f.isFile()).map(f => path.join(f.path, f.name)) : localPaths!;
+      const files = localDirectory ? (await platform.fs().promises.readdir(localDirectory, { withFileTypes: true, recursive: true })).filter(f => f.isFile()).map(f => platform.path().join(f.path, f.name)) : localPaths!;
       const { writableStreams, rootDir } = await context._wrapApiCall(async () => context._channel.createTempFiles({
-        rootDirName: localDirectory ? path.basename(localDirectory) : undefined,
+        rootDirName: localDirectory ? platform.path().basename(localDirectory) : undefined,
         items: await Promise.all(files.map(async file => {
-          const lastModifiedMs = (await fs.promises.stat(file)).mtimeMs;
+          const lastModifiedMs = (await platform.fs().promises.stat(file)).mtimeMs;
           return {
-            name: localDirectory ? path.relative(localDirectory, file) : path.basename(file),
+            name: localDirectory ? platform.path().relative(localDirectory, file) : platform.path().basename(file),
             lastModifiedMs
           };
         })),
-      }), true);
+      }), { internal: true });
       for (let i = 0; i < files.length; i++) {
         const writable = WritableStream.from(writableStreams[i]);
-        await pipelineAsync(fs.createReadStream(files[i]), writable.stream());
+        await platform.streamFile(files[i], writable.stream());
       }
       return {
         directoryStream: rootDir,
@@ -319,7 +319,7 @@ export async function convertInputFiles(files: string | FilePayload | string[] |
 
 export function determineScreenshotType(options: { path?: string, type?: 'png' | 'jpeg' }): 'png' | 'jpeg' | undefined {
   if (options.path) {
-    const mimeType = mime.getType(options.path);
+    const mimeType = getMimeTypeForPath(options.path);
     if (mimeType === 'image/png')
       return 'png';
     else if (mimeType === 'image/jpeg')
diff --git a/packages/playwright-core/src/client/errors.ts b/packages/playwright-core/src/client/errors.ts
index 51555202e5b84..5d1465261f1da 100644
--- a/packages/playwright-core/src/client/errors.ts
+++ b/packages/playwright-core/src/client/errors.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import type { SerializedError } from '@protocol/channels';
-import { isError } from '../utils';
 import { parseSerializedValue, serializeValue } from '../protocol/serializers';
+import { isError } from '../utils/isomorphic/rtti';
+
+import type { SerializedError } from '@protocol/channels';
 
 export class TimeoutError extends Error {
   constructor(message: string) {
diff --git a/packages/playwright-core/src/client/eventEmitter.ts b/packages/playwright-core/src/client/eventEmitter.ts
new file mode 100644
index 0000000000000..e1c08619ec901
--- /dev/null
+++ b/packages/playwright-core/src/client/eventEmitter.ts
@@ -0,0 +1,398 @@
+/**
+ * Copyright Joyent, Inc. and other Node contributors.
+ * Modifications copyright (c) Microsoft Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the
+ * following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import type { EventEmitter as EventEmitterType } from 'events';
+import type { Platform } from './platform';
+
+type EventType = string | symbol;
+type Listener = (...args: any[]) => any;
+type EventMap = Record<EventType, Listener | Listener[]>;
+
+export class EventEmitter implements EventEmitterType {
+
+  private _events: EventMap | undefined = undefined;
+  private _eventsCount = 0;
+  private _maxListeners: number | undefined = undefined;
+  readonly _pendingHandlers = new Map<EventType, Set<Promise<void>>>();
+  private _rejectionHandler: ((error: Error) => void) | undefined;
+  readonly _platform: Platform;
+
+  constructor(platform: Platform) {
+    this._platform = platform;
+    if (this._events === undefined || this._events === Object.getPrototypeOf(this)._events) {
+      this._events = Object.create(null);
+      this._eventsCount = 0;
+    }
+    this._maxListeners = this._maxListeners || undefined;
+    this.on = this.addListener;
+    this.off = this.removeListener;
+  }
+
+  setMaxListeners(n: number): this {
+    if (typeof n !== 'number' || n < 0 || Number.isNaN(n))
+      throw new RangeError('The value of "n" is out of range. It must be a non-negative number. Received ' + n + '.');
+    this._maxListeners = n;
+    return this;
+  }
+
+  getMaxListeners(): number {
+    return this._maxListeners === undefined ? this._platform.defaultMaxListeners() : this._maxListeners;
+  }
+
+  emit(type: EventType, ...args: any[]): boolean {
+    const events = this._events;
+    if (events === undefined)
+      return false;
+
+    const handler = events?.[type];
+    if (handler === undefined)
+      return false;
+
+    if (typeof handler === 'function') {
+      this._callHandler(type, handler, args);
+    } else {
+      const len = handler.length;
+      const listeners = handler.slice();
+      for (let i = 0; i < len; ++i)
+        this._callHandler(type, listeners[i], args);
+    }
+    return true;
+  }
+
+  private _callHandler(type: EventType, handler: Listener, args: any[]): void {
+    const promise = Reflect.apply(handler, this, args);
+    if (!(promise instanceof Promise))
+      return;
+    let set = this._pendingHandlers.get(type);
+    if (!set) {
+      set = new Set();
+      this._pendingHandlers.set(type, set);
+    }
+    set.add(promise);
+    promise.catch(e => {
+      if (this._rejectionHandler)
+        this._rejectionHandler(e);
+      else
+        throw e;
+    }).finally(() => set.delete(promise));
+  }
+
+  addListener(type: EventType, listener: Listener): this {
+    return this._addListener(type, listener, false);
+  }
+
+  on(type: EventType, listener: Listener): this {
+    return this._addListener(type, listener, false);
+  }
+
+  private _addListener(type: EventType, listener: Listener, prepend: boolean): this {
+    checkListener(listener);
+    let events = this._events;
+    let existing;
+    if (events === undefined) {
+      events = this._events = Object.create(null);
+      this._eventsCount = 0;
+    } else {
+      // To avoid recursion in the case that type === "newListener"! Before
+      // adding it to the listeners, first emit "newListener".
+      if (events.newListener !== undefined) {
+        this.emit('newListener', type, unwrapListener(listener));
+
+        // Re-assign `events` because a newListener handler could have caused the
+        // this._events to be assigned to a new object
+        events = this._events!;
+      }
+      existing = events[type];
+    }
+
+    if (existing === undefined) {
+      // Optimize the case of one listener. Don't need the extra array object.
+      existing = events![type] = listener;
+      ++this._eventsCount;
+    } else {
+      if (typeof existing === 'function') {
+        // Adding the second element, need to change to array.
+        existing = events![type] =
+          prepend ? [listener, existing] : [existing, listener];
+        // If we've already got an array, just append.
+      } else if (prepend) {
+        existing.unshift(listener);
+      } else {
+        existing.push(listener);
+      }
+
+      // Check for listener leak
+      const m = this.getMaxListeners();
+      if (m > 0 && existing.length > m && !(existing as any).warned) {
+        (existing as any).warned = true;
+        // No error code for this since it is a Warning
+        const w = new Error('Possible EventEmitter memory leak detected. ' +
+                            existing.length + ' ' + String(type) + ' listeners ' +
+                            'added. Use emitter.setMaxListeners() to ' +
+                            'increase limit') as any;
+        w.name = 'MaxListenersExceededWarning';
+        w.emitter = this;
+        w.type = type;
+        w.count = existing.length;
+        if (!this._platform.isUnderTest()) {
+          // eslint-disable-next-line no-console
+          console.warn(w);
+        }
+      }
+    }
+
+    return this;
+  }
+
+  prependListener(type: EventType, listener: Listener): this {
+    return this._addListener(type, listener, true);
+  }
+
+  once(type: EventType, listener: Listener): this {
+    checkListener(listener);
+    this.on(type, new OnceWrapper(this, type, listener).wrapperFunction);
+    return this;
+  }
+
+  prependOnceListener(type: EventType, listener: Listener): this {
+    checkListener(listener);
+    this.prependListener(type, new OnceWrapper(this, type, listener).wrapperFunction);
+    return this;
+  }
+
+  removeListener(type: EventType, listener: Listener): this {
+    checkListener(listener);
+
+    const events = this._events;
+    if (events === undefined)
+      return this;
+
+    const list = events[type];
+    if (list === undefined)
+      return this;
+
+    if (list === listener || (list as any).listener === listener) {
+      if (--this._eventsCount === 0) {
+        this._events = Object.create(null);
+      } else {
+        delete events[type];
+        if (events.removeListener)
+          this.emit('removeListener', type, (list as any).listener ?? listener);
+      }
+    } else if (typeof list !== 'function') {
+      let position = -1;
+      let originalListener;
+
+      for (let i = list.length - 1; i >= 0; i--) {
+        if (list[i] === listener || wrappedListener(list[i]) === listener) {
+          originalListener = wrappedListener(list[i]);
+          position = i;
+          break;
+        }
+      }
+
+      if (position < 0)
+        return this;
+
+      if (position === 0)
+        list.shift();
+      else
+        list.splice(position, 1);
+
+      if (list.length === 1)
+        events[type] = list[0];
+
+      if (events.removeListener !== undefined)
+        this.emit('removeListener', type, originalListener || listener);
+    }
+
+    return this;
+
+  }
+
+  off(type: EventType, listener: Listener): this {
+    return this.removeListener(type, listener);
+  }
+
+  removeAllListeners(type?: EventType): this;
+  removeAllListeners(type: EventType | undefined, options: { behavior?: 'wait'|'ignoreErrors'|'default' }): Promise<void>;
+  removeAllListeners(type?: string, options?: { behavior?: 'wait'|'ignoreErrors'|'default' }): this | Promise<void> {
+    this._removeAllListeners(type);
+    if (!options)
+      return this;
+
+    if (options.behavior === 'wait') {
+      const errors: Error[] = [];
+      this._rejectionHandler = error => errors.push(error);
+      return this._waitFor(type).then(() => {
+        if (errors.length)
+          throw errors[0];
+      });
+    }
+
+    if (options.behavior === 'ignoreErrors')
+      this._rejectionHandler = () => {};
+
+    return Promise.resolve();
+  }
+
+  private _removeAllListeners(type?: string) {
+    const events = this._events;
+    if (!events)
+      return;
+
+    // not listening for removeListener, no need to emit
+    if (!events.removeListener) {
+      if (type === undefined) {
+        this._events = Object.create(null);
+        this._eventsCount = 0;
+      } else if (events[type] !== undefined) {
+        if (--this._eventsCount === 0)
+          this._events = Object.create(null);
+        else
+          delete events[type];
+      }
+      return;
+    }
+
+    // emit removeListener for all listeners on all events
+    if (type === undefined) {
+      const keys = Object.keys(events);
+      let key;
+      for (let i = 0; i < keys.length; ++i) {
+        key = keys[i];
+        if (key === 'removeListener')
+          continue;
+        this._removeAllListeners(key);
+      }
+      this._removeAllListeners('removeListener');
+      this._events = Object.create(null);
+      this._eventsCount = 0;
+      return;
+    }
+
+    const listeners = events[type];
+
+    if (typeof listeners === 'function') {
+      this.removeListener(type, listeners);
+    } else if (listeners !== undefined) {
+      // LIFO order
+      for (let i = listeners.length - 1; i >= 0; i--)
+        this.removeListener(type, listeners[i]);
+    }
+  }
+
+  listeners(type: EventType): Listener[] {
+    return this._listeners(this, type, true);
+  }
+
+  rawListeners(type: EventType): Listener[] {
+    return this._listeners(this, type, false);
+  }
+
+  listenerCount(type: EventType): number {
+    const events = this._events;
+    if (events !== undefined) {
+      const listener = events[type];
+      if (typeof listener === 'function')
+        return 1;
+      if (listener !== undefined)
+        return listener.length;
+    }
+    return 0;
+  }
+
+  eventNames(): Array<string | symbol> {
+    return this._eventsCount > 0 && this._events ? Reflect.ownKeys(this._events) : [];
+  }
+
+  private async _waitFor(type?: EventType) {
+    let promises: Promise<void>[] = [];
+    if (type) {
+      promises = [...(this._pendingHandlers.get(type) || [])];
+    } else {
+      promises = [];
+      for (const [, pending] of this._pendingHandlers)
+        promises.push(...pending);
+    }
+    await Promise.all(promises);
+  }
+
+  private _listeners(target: EventEmitter, type: EventType, unwrap: boolean): Listener[] {
+    const events = target._events;
+
+    if (events === undefined)
+      return [];
+
+    const listener = events[type];
+    if (listener === undefined)
+      return [];
+
+    if (typeof listener === 'function')
+      return unwrap ? [unwrapListener(listener)] : [listener];
+
+    return unwrap ? unwrapListeners(listener) : listener.slice();
+  }
+}
+
+function checkListener(listener: any) {
+  if (typeof listener !== 'function')
+    throw new TypeError('The "listener" argument must be of type Function. Received type ' + typeof listener);
+}
+
+class OnceWrapper {
+  private _fired = false;
+  readonly wrapperFunction: (...args: any[]) => Promise<void> | void;
+  readonly _listener: Listener;
+  private _eventEmitter: EventEmitter;
+  private _eventType: EventType;
+
+  constructor(eventEmitter: EventEmitter, eventType: EventType, listener: Listener) {
+    this._eventEmitter = eventEmitter;
+    this._eventType = eventType;
+    this._listener = listener;
+    this.wrapperFunction = this._handle.bind(this);
+    (this.wrapperFunction as any).listener = listener;
+  }
+
+  private _handle(...args: any[]) {
+    if (this._fired)
+      return;
+    this._fired = true;
+    this._eventEmitter.removeListener(this._eventType, this.wrapperFunction);
+    return this._listener.apply(this._eventEmitter, args);
+  }
+}
+
+function unwrapListener(l: Listener): Listener {
+  return wrappedListener(l) ?? l;
+}
+
+function unwrapListeners(arr: Listener[]): Listener[] {
+  return arr.map(l => wrappedListener(l) ?? l);
+}
+
+function wrappedListener(l: Listener): Listener {
+  return (l as any).listener;
+}
diff --git a/packages/playwright-core/src/client/fetch.ts b/packages/playwright-core/src/client/fetch.ts
index 63f74ef26e041..31029eaca94e1 100644
--- a/packages/playwright-core/src/client/fetch.ts
+++ b/packages/playwright-core/src/client/fetch.ts
@@ -14,30 +14,33 @@
  * limitations under the License.
  */
 
-import fs from 'fs';
-import path from 'path';
-import * as util from 'util';
-import type { Serializable } from '../../types/structs';
-import type * as api from '../../types/types';
-import type { HeadersArray, NameValue } from '../common/types';
-import type * as channels from '@protocol/channels';
-import { assert, headersObjectToArray, isString } from '../utils';
-import { mkdirIfNeeded } from '../utils/fileUtils';
+import { toClientCertificatesProtocol } from './browserContext';
 import { ChannelOwner } from './channelOwner';
+import { TargetClosedError, isTargetClosedError } from './errors';
 import { RawHeaders } from './network';
-import type { ClientCertificate, FilePayload, Headers, StorageState } from './types';
-import type { Playwright } from './playwright';
 import { Tracing } from './tracing';
-import { TargetClosedError, isTargetClosedError } from './errors';
-import { toClientCertificatesProtocol } from './browserContext';
+import { assert } from '../utils/isomorphic/assert';
+import { mkdirIfNeeded } from './fileUtils';
+import { headersObjectToArray } from '../utils/isomorphic/headers';
+import { isString } from '../utils/isomorphic/rtti';
+import { TimeoutSettings } from './timeoutSettings';
+
+import type { Playwright } from './playwright';
+import type { ClientCertificate, FilePayload, Headers, SetStorageState, StorageState, TimeoutOptions } from './types';
+import type { Serializable } from '../../types/structs';
+import type * as api from '../../types/types';
+import type { HeadersArray, NameValue } from '../utils/isomorphic/types';
+import type { Platform } from './platform';
+import type * as channels from '@protocol/channels';
+import type * as fs from 'fs';
 
 export type FetchOptions = {
-  params?: { [key: string]: string; },
+  params?: { [key: string]: string | number | boolean; } | URLSearchParams | string,
   method?: string,
   headers?: Headers,
   data?: string | Buffer | Serializable,
-  form?: { [key: string]: string|number|boolean; };
-  multipart?: { [key: string]: string|number|boolean|fs.ReadStream|FilePayload; };
+  form?: { [key: string]: string|number|boolean; } | FormData;
+  multipart?: { [key: string]: string|number|boolean|fs.ReadStream|FilePayload; } | FormData;
   timeout?: number,
   failOnStatusCode?: boolean,
   ignoreHTTPSErrors?: boolean,
@@ -47,7 +50,7 @@ export type FetchOptions = {
 
 type NewContextOptions = Omit<channels.PlaywrightNewRequestOptions, 'extraHTTPHeaders' | 'clientCertificates' | 'storageState' | 'tracesDir'> & {
   extraHTTPHeaders?: Headers,
-  storageState?: string | StorageState,
+  storageState?: string | SetStorageState,
   clientCertificates?: ClientCertificate[];
 };
 
@@ -57,30 +60,29 @@ export class APIRequest implements api.APIRequest {
   private _playwright: Playwright;
   readonly _contexts = new Set<APIRequestContext>();
 
-  // Instrumentation.
-  _defaultContextOptions?: NewContextOptions & { tracesDir?: string };
-
   constructor(playwright: Playwright) {
     this._playwright = playwright;
   }
 
-  async newContext(options: NewContextOptions = {}): Promise<APIRequestContext> {
-    options = { ...this._defaultContextOptions, ...options };
+  async newContext(options: NewContextOptions & TimeoutOptions = {}): Promise<APIRequestContext> {
+    options = {
+      ...this._playwright._defaultContextOptions,
+      ...options,
+    };
     const storageState = typeof options.storageState === 'string' ?
-      JSON.parse(await fs.promises.readFile(options.storageState, 'utf8')) :
+      JSON.parse(await this._playwright._platform.fs().promises.readFile(options.storageState, 'utf8')) :
       options.storageState;
-    // We do not expose tracesDir in the API, so do not allow options to accidentally override it.
-    const tracesDir = this._defaultContextOptions?.tracesDir;
     const context = APIRequestContext.from((await this._playwright._channel.newRequest({
       ...options,
       extraHTTPHeaders: options.extraHTTPHeaders ? headersObjectToArray(options.extraHTTPHeaders) : undefined,
       storageState,
-      tracesDir,
-      clientCertificates: await toClientCertificatesProtocol(options.clientCertificates),
+      tracesDir: this._playwright._defaultLaunchOptions?.tracesDir, // We do not expose tracesDir in the API, so do not allow options to accidentally override it.
+      clientCertificates: await toClientCertificatesProtocol(this._playwright._platform, options.clientCertificates),
     })).request);
     this._contexts.add(context);
     context._request = this;
-    context._tracing._tracesDir = tracesDir;
+    context._timeoutSettings.setDefaultTimeout(options.timeout ?? this._playwright._defaultContextTimeout);
+    context._tracing._tracesDir = this._playwright._defaultLaunchOptions?.tracesDir;
     await context._instrumentation.runAfterCreateRequestContext(context);
     return context;
   }
@@ -90,6 +92,7 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
   _request?: APIRequest;
   readonly _tracing: Tracing;
   private _closeReason: string | undefined;
+  _timeoutSettings: TimeoutSettings;
 
   static from(channel: channels.APIRequestContextChannel): APIRequestContext {
     return (channel as any)._object;
@@ -98,6 +101,7 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.APIRequestContextInitializer) {
     super(parent, type, guid, initializer);
     this._tracing = Tracing.from(initializer.tracing);
+    this._timeoutSettings = new TimeoutSettings(this._platform);
   }
 
   async [Symbol.asyncDispose]() {
@@ -175,8 +179,12 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
       assert(options.maxRedirects === undefined || options.maxRedirects >= 0, `'maxRedirects' must be greater than or equal to '0'`);
       assert(options.maxRetries === undefined || options.maxRetries >= 0, `'maxRetries' must be greater than or equal to '0'`);
       const url = options.url !== undefined ? options.url : options.request!.url();
-      const params = objectToArray(options.params);
       const method = options.method || options.request?.method();
+      let encodedParams = undefined;
+      if (typeof options.params === 'string')
+        encodedParams = options.params;
+      else if (options.params instanceof URLSearchParams)
+        encodedParams = options.params.toString();
       // Cannot call allHeaders() here as the request may be paused inside route handler.
       const headersObj = options.headers || options.request?.headers();
       const headers = headersObj ? headersObjectToArray(headersObj) : undefined;
@@ -198,7 +206,16 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
           throw new Error(`Unexpected 'data' type`);
         }
       } else if (options.form) {
-        formData = objectToArray(options.form);
+        if (globalThis.FormData && options.form instanceof FormData) {
+          formData = [];
+          for (const [name, value] of options.form.entries()) {
+            if (typeof value !== 'string')
+              throw new Error(`Expected string for options.form["${name}"], found File. Please use options.multipart instead.`);
+            formData.push({ name, value });
+          }
+        } else {
+          formData = objectToArray(options.form);
+        }
       } else if (options.multipart) {
         multipartData = [];
         if (globalThis.FormData && options.multipart instanceof FormData) {
@@ -218,7 +235,7 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
         } else {
           // Convert file-like values to ServerFilePayload structs.
           for (const [name, value] of Object.entries(options.multipart))
-            multipartData.push(await toFormField(name, value));
+            multipartData.push(await toFormField(this._platform, name, value));
         }
       }
       if (postDataBuffer === undefined && jsonData === undefined && formData === undefined && multipartData === undefined)
@@ -228,14 +245,15 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
       };
       const result = await this._channel.fetch({
         url,
-        params,
+        params: typeof options.params === 'object' ? objectToArray(options.params) : undefined,
+        encodedParams,
         method,
         headers,
         postData: postDataBuffer,
         jsonData,
         formData,
         multipartData,
-        timeout: options.timeout,
+        timeout: this._timeoutSettings.timeout(options),
         failOnStatusCode: options.failOnStatusCode,
         ignoreHTTPSErrors: options.ignoreHTTPSErrors,
         maxRedirects: options.maxRedirects,
@@ -246,26 +264,27 @@ export class APIRequestContext extends ChannelOwner<channels.APIRequestContextCh
     });
   }
 
-  async storageState(options: { path?: string } = {}): Promise<StorageState> {
-    const state = await this._channel.storageState();
+  async storageState(options: { path?: string, indexedDB?: boolean } = {}): Promise<StorageState> {
+    const state = await this._channel.storageState({ indexedDB: options.indexedDB });
     if (options.path) {
-      await mkdirIfNeeded(options.path);
-      await fs.promises.writeFile(options.path, JSON.stringify(state, undefined, 2), 'utf8');
+      await mkdirIfNeeded(this._platform, options.path);
+      await this._platform.fs().promises.writeFile(options.path, JSON.stringify(state, undefined, 2), 'utf8');
     }
     return state;
   }
 }
 
-async function toFormField(name: string, value: string|number|boolean|fs.ReadStream|FilePayload): Promise<channels.FormField> {
+async function toFormField(platform: Platform, name: string, value: string | number | boolean | fs.ReadStream | FilePayload): Promise<channels.FormField> {
+  const typeOfValue = typeof value;
   if (isFilePayload(value)) {
     const payload = value as FilePayload;
     if (!Buffer.isBuffer(payload.buffer))
       throw new Error(`Unexpected buffer type of 'data.${name}'`);
     return { name, file: filePayloadToJson(payload) };
-  } else if (value instanceof fs.ReadStream) {
-    return { name, file: await readStreamToJson(value as fs.ReadStream) };
-  } else {
+  } else if (typeOfValue === 'string' || typeOfValue === 'number' || typeOfValue === 'boolean') {
     return { name, value: String(value) };
+  } else {
+    return { name, file: await readStreamToJson(platform, value as fs.ReadStream) };
   }
 }
 
@@ -292,6 +311,9 @@ export class APIResponse implements api.APIResponse {
     this._request = context;
     this._initializer = initializer;
     this._headers = new RawHeaders(this._initializer.headers);
+
+    if (context._platform.inspectCustom)
+      (this as any)[context._platform.inspectCustom] = () => this._inspect();
   }
 
   ok(): boolean {
@@ -319,16 +341,18 @@ export class APIResponse implements api.APIResponse {
   }
 
   async body(): Promise<Buffer> {
-    try {
-      const result = await this._request._channel.fetchResponseBody({ fetchUid: this._fetchUid() });
-      if (result.binary === undefined)
-        throw new Error('Response has been disposed');
-      return result.binary;
-    } catch (e) {
-      if (isTargetClosedError(e))
-        throw new Error('Response has been disposed');
-      throw e;
-    }
+    return await this._request._wrapApiCall(async () => {
+      try {
+        const result = await this._request._channel.fetchResponseBody({ fetchUid: this._fetchUid() });
+        if (result.binary === undefined)
+          throw new Error('Response has been disposed');
+        return result.binary;
+      } catch (e) {
+        if (isTargetClosedError(e))
+          throw new Error('Response has been disposed');
+        throw e;
+      }
+    }, { internal: true });
   }
 
   async text(): Promise<string> {
@@ -349,7 +373,7 @@ export class APIResponse implements api.APIResponse {
     await this._request._channel.disposeAPIResponse({ fetchUid: this._fetchUid() });
   }
 
-  [util.inspect.custom]() {
+  private _inspect() {
     const headers = this.headersArray().map(({ name, value }) => `  ${name}: ${value}`);
     return `APIResponse: ${this.status()} ${this.statusText()}\n${headers.join('\n')}`;
   }
@@ -374,7 +398,7 @@ function filePayloadToJson(payload: FilePayload): ServerFilePayload {
   };
 }
 
-async function readStreamToJson(stream: fs.ReadStream): Promise<ServerFilePayload> {
+async function readStreamToJson(platform: Platform, stream: fs.ReadStream): Promise<ServerFilePayload> {
   const buffer = await new Promise<Buffer>((resolve, reject) => {
     const chunks: Buffer[] = [];
     stream.on('data', chunk => chunks.push(chunk as Buffer));
@@ -383,7 +407,7 @@ async function readStreamToJson(stream: fs.ReadStream): Promise<ServerFilePayloa
   });
   const streamPath: string = Buffer.isBuffer(stream.path) ? stream.path.toString('utf8') : stream.path;
   return {
-    name: path.basename(streamPath),
+    name: platform.path().basename(streamPath),
     buffer,
   };
 }
@@ -402,8 +426,10 @@ function objectToArray(map?: { [key: string]: any }): NameValue[] | undefined {
   if (!map)
     return undefined;
   const result = [];
-  for (const [name, value] of Object.entries(map))
-    result.push({ name, value: String(value) });
+  for (const [name, value] of Object.entries(map)) {
+    if (value !== undefined)
+      result.push({ name, value: String(value) });
+  }
   return result;
 }
 
diff --git a/packages/playwright-core/src/client/fileChooser.ts b/packages/playwright-core/src/client/fileChooser.ts
index 5e7b1113ffd8e..04a08d35a408a 100644
--- a/packages/playwright-core/src/client/fileChooser.ts
+++ b/packages/playwright-core/src/client/fileChooser.ts
@@ -16,9 +16,9 @@
 
 import type { ElementHandle } from './elementHandle';
 import type { Page } from './page';
-import type { FilePayload } from './types';
-import type * as channels from '@protocol/channels';
+import type { FilePayload, TimeoutOptions } from './types';
 import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
 
 export class FileChooser implements api.FileChooser {
   private _page: Page;
@@ -43,7 +43,7 @@ export class FileChooser implements api.FileChooser {
     return this._page;
   }
 
-  async setFiles(files: string | FilePayload | string[] | FilePayload[], options?: channels.ElementHandleSetInputFilesOptions) {
+  async setFiles(files: string | FilePayload | string[] | FilePayload[], options?: channels.ElementHandleSetInputFilesOptions & TimeoutOptions) {
     return await this._elementHandle.setInputFiles(files, options);
   }
 }
diff --git a/packages/playwright-ct-solid/hooks.d.ts b/packages/playwright-core/src/client/fileUtils.ts
similarity index 60%
rename from packages/playwright-ct-solid/hooks.d.ts
rename to packages/playwright-core/src/client/fileUtils.ts
index 097c8cf11fbb6..1eb483394655c 100644
--- a/packages/playwright-ct-solid/hooks.d.ts
+++ b/packages/playwright-core/src/client/fileUtils.ts
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import { JSXElement } from 'solid-js';
+import type { Platform } from './platform';
 
-export declare function beforeMount<HooksConfig>(
-  callback: (params: { hooksConfig?: HooksConfig, App: () => JSXElement }) => Promise<void | JSXElement>
-): void;
-export declare function afterMount<HooksConfig>(
-  callback: (params: { hooksConfig?: HooksConfig }) => Promise<void>
-): void;
+// Keep in sync with the server.
+export const fileUploadSizeLimit = 50 * 1024 * 1024;
+
+export async function mkdirIfNeeded(platform: Platform, filePath: string) {
+  // This will harmlessly throw on windows if the dirname is the root directory.
+  await platform.fs().promises.mkdir(platform.path().dirname(filePath), { recursive: true }).catch(() => {});
+}
diff --git a/packages/playwright-core/src/client/frame.ts b/packages/playwright-core/src/client/frame.ts
index a7ceeb9456b23..7aaa8353f1165 100644
--- a/packages/playwright-core/src/client/frame.ts
+++ b/packages/playwright-core/src/client/frame.ts
@@ -15,27 +15,29 @@
  * limitations under the License.
  */
 
-import { assert } from '../utils';
-import type * as channels from '@protocol/channels';
+import { EventEmitter } from './eventEmitter';
 import { ChannelOwner } from './channelOwner';
+import { addSourceUrlToScript } from './clientHelper';
+import { ElementHandle, convertInputFiles, convertSelectOptionValues } from './elementHandle';
+import { Events } from './events';
+import { JSHandle, assertMaxArguments, parseResult, serializeArgument } from './jsHandle';
 import { FrameLocator, Locator, testIdAttributeName } from './locator';
-import type { LocatorOptions } from './locator';
-import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from '../utils/isomorphic/locatorUtils';
-import type { ByRoleOptions } from '../utils/isomorphic/locatorUtils';
-import { ElementHandle, convertSelectOptionValues, convertInputFiles } from './elementHandle';
-import { assertMaxArguments, JSHandle, serializeArgument, parseResult } from './jsHandle';
-import fs from 'fs';
 import * as network from './network';
-import type { Page } from './page';
-import { EventEmitter } from 'events';
-import { Waiter } from './waiter';
-import { Events } from './events';
-import type { LifecycleEvent, URLMatch, SelectOption, SelectOptionOptions, FilePayload, WaitForFunctionOptions, StrictOptions } from './types';
 import { kLifecycleEvents } from './types';
-import { urlMatches } from '../utils/network';
-import type * as api from '../../types/types';
+import { Waiter } from './waiter';
+import { assert } from '../utils/isomorphic/assert';
+import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from '../utils/isomorphic/locatorUtils';
+import { urlMatches } from '../utils/isomorphic/urlMatch';
+import { TimeoutSettings } from './timeoutSettings';
+
+import type { LocatorOptions } from './locator';
+import type { Page } from './page';
+import type { FilePayload, LifecycleEvent, SelectOption, SelectOptionOptions, StrictOptions, TimeoutOptions, WaitForFunctionOptions } from './types';
 import type * as structs from '../../types/structs';
-import { addSourceUrlToScript } from './clientHelper';
+import type * as api from '../../types/types';
+import type { ByRoleOptions } from '../utils/isomorphic/locatorUtils';
+import type { URLMatch } from '../utils/isomorphic/urlMatch';
+import type * as channels from '@protocol/channels';
 
 export type WaitForNavigationOptions = {
   timeout?: number,
@@ -63,7 +65,7 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
 
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.FrameInitializer) {
     super(parent, type, guid, initializer);
-    this._eventEmitter = new EventEmitter();
+    this._eventEmitter = new EventEmitter(parent._platform);
     this._eventEmitter.setMaxListeners(0);
     this._parentFrame = Frame.fromNullable(initializer.parentFrame);
     if (this._parentFrame)
@@ -96,9 +98,19 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
     return this._page!;
   }
 
-  async goto(url: string, options: channels.FrameGotoOptions = {}): Promise<network.Response | null> {
+  _timeout(options?: TimeoutOptions): number {
+    const timeoutSettings = this._page?._timeoutSettings || new TimeoutSettings(this._platform);
+    return timeoutSettings.timeout(options || {});
+  }
+
+  _navigationTimeout(options?: TimeoutOptions): number {
+    const timeoutSettings = this._page?._timeoutSettings || new TimeoutSettings(this._platform);
+    return timeoutSettings.navigationTimeout(options || {});
+  }
+
+  async goto(url: string, options: channels.FrameGotoOptions & TimeoutOptions = {}): Promise<network.Response | null> {
     const waitUntil = verifyLoadState('waitUntil', options.waitUntil === undefined ? 'load' : options.waitUntil);
-    return network.Response.fromNullable((await this._channel.goto({ url, ...options, waitUntil })).response);
+    return network.Response.fromNullable((await this._channel.goto({ url, ...options, waitUntil, timeout: this._navigationTimeout(options) })).response);
   }
 
   private _setupNavigationWaiter(options: { timeout?: number }): Waiter {
@@ -145,7 +157,7 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
       const response = request ? await waiter.waitForPromise(request._finalRequest()._internalResponse()) : null;
       waiter.dispose();
       return response;
-    });
+    }, { title: 'Wait for navigation' });
   }
 
   async waitForLoadState(state: LifecycleEvent = 'load', options: { timeout?: number } = {}): Promise<void> {
@@ -161,7 +173,7 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
         });
       }
       waiter.dispose();
-    });
+    }, { title: `Wait for load state "${state}"` });
   }
 
   async waitForURL(url: URLMatch, options: { waitUntil?: LifecycleEvent, timeout?: number } = {}): Promise<void> {
@@ -187,6 +199,11 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
     return parseResult(result.value);
   }
 
+  async _evaluateFunction(functionDeclaration: string) {
+    const result = await this._channel.evaluateExpression({ expression: functionDeclaration, isFunction: true, arg: serializeArgument(undefined) });
+    return parseResult(result.value);
+  }
+
   async _evaluateExposeUtilityScript<R, Arg>(pageFunction: structs.PageFunction<Arg, R>, arg?: Arg): Promise<R> {
     assertMaxArguments(arguments.length, 2);
     const result = await this._channel.evaluateExpression({ expression: String(pageFunction), isFunction: typeof pageFunction === 'function', arg: serializeArgument(arg) });
@@ -198,19 +215,19 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
     return ElementHandle.fromNullable(result.element) as ElementHandle<SVGElement | HTMLElement> | null;
   }
 
-  waitForSelector(selector: string, options: channels.FrameWaitForSelectorOptions & { state: 'attached' | 'visible' }): Promise<ElementHandle<SVGElement | HTMLElement>>;
-  waitForSelector(selector: string, options?: channels.FrameWaitForSelectorOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
-  async waitForSelector(selector: string, options: channels.FrameWaitForSelectorOptions = {}): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
+  waitForSelector(selector: string, options: channels.FrameWaitForSelectorOptions & TimeoutOptions & { state: 'attached' | 'visible' }): Promise<ElementHandle<SVGElement | HTMLElement>>;
+  waitForSelector(selector: string, options?: channels.FrameWaitForSelectorOptions & TimeoutOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
+  async waitForSelector(selector: string, options: channels.FrameWaitForSelectorOptions & TimeoutOptions = {}): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
     if ((options as any).visibility)
       throw new Error('options.visibility is not supported, did you mean options.state?');
     if ((options as any).waitFor && (options as any).waitFor !== 'visible')
       throw new Error('options.waitFor is not supported, did you mean options.state?');
-    const result = await this._channel.waitForSelector({ selector, ...options });
+    const result = await this._channel.waitForSelector({ selector, ...options, timeout: this._timeout(options) });
     return ElementHandle.fromNullable(result.element) as ElementHandle<SVGElement | HTMLElement> | null;
   }
 
-  async dispatchEvent(selector: string, type: string, eventInit?: any, options: channels.FrameDispatchEventOptions = {}): Promise<void> {
-    await this._channel.dispatchEvent({ selector, type, eventInit: serializeArgument(eventInit), ...options });
+  async dispatchEvent(selector: string, type: string, eventInit?: any, options: channels.FrameDispatchEventOptions & TimeoutOptions = {}): Promise<void> {
+    await this._channel.dispatchEvent({ selector, type, eventInit: serializeArgument(eventInit), ...options, timeout: this._timeout(options) });
   }
 
   async $eval<R, Arg>(selector: string, pageFunction: structs.PageFunctionOn<Element, Arg, R>, arg?: Arg): Promise<R> {
@@ -230,17 +247,17 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
     return result.elements.map(e => ElementHandle.from(e) as ElementHandle<SVGElement | HTMLElement>);
   }
 
-  async _queryCount(selector: string): Promise<number> {
-    return (await this._channel.queryCount({ selector })).value;
+  async _queryCount(selector: string, options?: {}): Promise<number> {
+    return (await this._channel.queryCount({ selector, ...options })).value;
   }
 
   async content(): Promise<string> {
     return (await this._channel.content()).value;
   }
 
-  async setContent(html: string, options: channels.FrameSetContentOptions = {}): Promise<void> {
+  async setContent(html: string, options: channels.FrameSetContentOptions & TimeoutOptions = {}): Promise<void> {
     const waitUntil = verifyLoadState('waitUntil', options.waitUntil === undefined ? 'load' : options.waitUntil);
-    await this._channel.setContent({ html, ...options, waitUntil });
+    await this._channel.setContent({ html, ...options, waitUntil, timeout: this._navigationTimeout(options) });
   }
 
   name(): string {
@@ -266,7 +283,7 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
   async addScriptTag(options: { url?: string, path?: string, content?: string, type?: string } = {}): Promise<ElementHandle> {
     const copy = { ...options };
     if (copy.path) {
-      copy.content = (await fs.promises.readFile(copy.path)).toString();
+      copy.content = (await this._platform.fs().promises.readFile(copy.path)).toString();
       copy.content = addSourceUrlToScript(copy.content, copy.path);
     }
     return ElementHandle.from((await this._channel.addScriptTag({ ...copy })).element);
@@ -275,30 +292,30 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
   async addStyleTag(options: { url?: string; path?: string; content?: string; } = {}): Promise<ElementHandle> {
     const copy = { ...options };
     if (copy.path) {
-      copy.content = (await fs.promises.readFile(copy.path)).toString();
+      copy.content = (await this._platform.fs().promises.readFile(copy.path)).toString();
       copy.content += '/*# sourceURL=' + copy.path.replace(/\n/g, '') + '*/';
     }
     return ElementHandle.from((await this._channel.addStyleTag({ ...copy })).element);
   }
 
-  async click(selector: string, options: channels.FrameClickOptions = {}) {
-    return await this._channel.click({ selector, ...options });
+  async click(selector: string, options: channels.FrameClickOptions & TimeoutOptions = {}) {
+    return await this._channel.click({ selector, ...options, timeout: this._timeout(options) });
   }
 
-  async dblclick(selector: string, options: channels.FrameDblclickOptions = {}) {
-    return await this._channel.dblclick({ selector, ...options });
+  async dblclick(selector: string, options: channels.FrameDblclickOptions & TimeoutOptions = {}) {
+    return await this._channel.dblclick({ selector, ...options, timeout: this._timeout(options) });
   }
 
-  async dragAndDrop(source: string, target: string, options: channels.FrameDragAndDropOptions = {}) {
-    return await this._channel.dragAndDrop({ source, target, ...options });
+  async dragAndDrop(source: string, target: string, options: channels.FrameDragAndDropOptions & TimeoutOptions = {}) {
+    return await this._channel.dragAndDrop({ source, target, ...options, timeout: this._timeout(options) });
   }
 
-  async tap(selector: string, options: channels.FrameTapOptions = {}) {
-    return await this._channel.tap({ selector, ...options });
+  async tap(selector: string, options: channels.FrameTapOptions & TimeoutOptions = {}) {
+    return await this._channel.tap({ selector, ...options, timeout: this._timeout(options) });
   }
 
-  async fill(selector: string, value: string, options: channels.FrameFillOptions = {}) {
-    return await this._channel.fill({ selector, value, ...options });
+  async fill(selector: string, value: string, options: channels.FrameFillOptions & TimeoutOptions = {}) {
+    return await this._channel.fill({ selector, value, ...options, timeout: this._timeout(options) });
   }
 
   async _highlight(selector: string) {
@@ -341,83 +358,83 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
     return new FrameLocator(this, selector);
   }
 
-  async focus(selector: string, options: channels.FrameFocusOptions = {}) {
-    await this._channel.focus({ selector, ...options });
+  async focus(selector: string, options: channels.FrameFocusOptions & TimeoutOptions = {}) {
+    await this._channel.focus({ selector, ...options, timeout: this._timeout(options) });
   }
 
-  async textContent(selector: string, options: channels.FrameTextContentOptions = {}): Promise<null|string> {
-    const value = (await this._channel.textContent({ selector, ...options })).value;
+  async textContent(selector: string, options: channels.FrameTextContentOptions & TimeoutOptions = {}): Promise<null|string> {
+    const value = (await this._channel.textContent({ selector, ...options, timeout: this._timeout(options) })).value;
     return value === undefined ? null : value;
   }
 
-  async innerText(selector: string, options: channels.FrameInnerTextOptions = {}): Promise<string> {
-    return (await this._channel.innerText({ selector, ...options })).value;
+  async innerText(selector: string, options: channels.FrameInnerTextOptions & TimeoutOptions = {}): Promise<string> {
+    return (await this._channel.innerText({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async innerHTML(selector: string, options: channels.FrameInnerHTMLOptions = {}): Promise<string> {
-    return (await this._channel.innerHTML({ selector, ...options })).value;
+  async innerHTML(selector: string, options: channels.FrameInnerHTMLOptions & TimeoutOptions = {}): Promise<string> {
+    return (await this._channel.innerHTML({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async getAttribute(selector: string, name: string, options: channels.FrameGetAttributeOptions = {}): Promise<string | null> {
-    const value = (await this._channel.getAttribute({ selector, name, ...options })).value;
+  async getAttribute(selector: string, name: string, options: channels.FrameGetAttributeOptions & TimeoutOptions = {}): Promise<string | null> {
+    const value = (await this._channel.getAttribute({ selector, name, ...options, timeout: this._timeout(options) })).value;
     return value === undefined ? null : value;
   }
 
-  async inputValue(selector: string, options: channels.FrameInputValueOptions = {}): Promise<string> {
-    return (await this._channel.inputValue({ selector, ...options })).value;
+  async inputValue(selector: string, options: channels.FrameInputValueOptions & TimeoutOptions = {}): Promise<string> {
+    return (await this._channel.inputValue({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async isChecked(selector: string, options: channels.FrameIsCheckedOptions = {}): Promise<boolean> {
-    return (await this._channel.isChecked({ selector, ...options })).value;
+  async isChecked(selector: string, options: channels.FrameIsCheckedOptions & TimeoutOptions = {}): Promise<boolean> {
+    return (await this._channel.isChecked({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async isDisabled(selector: string, options: channels.FrameIsDisabledOptions = {}): Promise<boolean> {
-    return (await this._channel.isDisabled({ selector, ...options })).value;
+  async isDisabled(selector: string, options: channels.FrameIsDisabledOptions & TimeoutOptions = {}): Promise<boolean> {
+    return (await this._channel.isDisabled({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async isEditable(selector: string, options: channels.FrameIsEditableOptions = {}): Promise<boolean> {
-    return (await this._channel.isEditable({ selector, ...options })).value;
+  async isEditable(selector: string, options: channels.FrameIsEditableOptions & TimeoutOptions = {}): Promise<boolean> {
+    return (await this._channel.isEditable({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async isEnabled(selector: string, options: channels.FrameIsEnabledOptions = {}): Promise<boolean> {
-    return (await this._channel.isEnabled({ selector, ...options })).value;
+  async isEnabled(selector: string, options: channels.FrameIsEnabledOptions & TimeoutOptions = {}): Promise<boolean> {
+    return (await this._channel.isEnabled({ selector, ...options, timeout: this._timeout(options) })).value;
   }
 
-  async isHidden(selector: string, options: channels.FrameIsHiddenOptions = {}): Promise<boolean> {
+  async isHidden(selector: string, options: channels.FrameIsHiddenOptions & TimeoutOptions = {}): Promise<boolean> {
     return (await this._channel.isHidden({ selector, ...options })).value;
   }
 
-  async isVisible(selector: string, options: channels.FrameIsVisibleOptions = {}): Promise<boolean> {
+  async isVisible(selector: string, options: channels.FrameIsVisibleOptions & TimeoutOptions = {}): Promise<boolean> {
     return (await this._channel.isVisible({ selector, ...options })).value;
   }
 
-  async hover(selector: string, options: channels.FrameHoverOptions = {}) {
-    await this._channel.hover({ selector, ...options });
+  async hover(selector: string, options: channels.FrameHoverOptions & TimeoutOptions = {}) {
+    await this._channel.hover({ selector, ...options, timeout: this._timeout(options) });
   }
 
   async selectOption(selector: string, values: string | api.ElementHandle | SelectOption | string[] | api.ElementHandle[] | SelectOption[] | null, options: SelectOptionOptions & StrictOptions = {}): Promise<string[]> {
-    return (await this._channel.selectOption({ selector, ...convertSelectOptionValues(values), ...options })).values;
+    return (await this._channel.selectOption({ selector, ...convertSelectOptionValues(values), ...options, timeout: this._timeout(options) })).values;
   }
 
-  async setInputFiles(selector: string, files: string | FilePayload | string[] | FilePayload[], options: channels.FrameSetInputFilesOptions = {}): Promise<void> {
-    const converted = await convertInputFiles(files, this.page().context());
-    await this._channel.setInputFiles({ selector, ...converted, ...options });
+  async setInputFiles(selector: string, files: string | FilePayload | string[] | FilePayload[], options: channels.FrameSetInputFilesOptions & TimeoutOptions = {}): Promise<void> {
+    const converted = await convertInputFiles(this._platform, files, this.page().context());
+    await this._channel.setInputFiles({ selector, ...converted, ...options, timeout: this._timeout(options) });
   }
 
-  async type(selector: string, text: string, options: channels.FrameTypeOptions = {}) {
-    await this._channel.type({ selector, text, ...options });
+  async type(selector: string, text: string, options: channels.FrameTypeOptions & TimeoutOptions = {}) {
+    await this._channel.type({ selector, text, ...options, timeout: this._timeout(options) });
   }
 
-  async press(selector: string, key: string, options: channels.FramePressOptions = {}) {
-    await this._channel.press({ selector, key, ...options });
+  async press(selector: string, key: string, options: channels.FramePressOptions & TimeoutOptions = {}) {
+    await this._channel.press({ selector, key, ...options, timeout: this._timeout(options) });
   }
 
-  async check(selector: string, options: channels.FrameCheckOptions = {}) {
-    await this._channel.check({ selector, ...options });
+  async check(selector: string, options: channels.FrameCheckOptions & TimeoutOptions = {}) {
+    await this._channel.check({ selector, ...options, timeout: this._timeout(options) });
   }
 
-  async uncheck(selector: string, options: channels.FrameUncheckOptions = {}) {
-    await this._channel.uncheck({ selector, ...options });
+  async uncheck(selector: string, options: channels.FrameUncheckOptions & TimeoutOptions = {}) {
+    await this._channel.uncheck({ selector, ...options, timeout: this._timeout(options) });
   }
 
   async setChecked(selector: string, checked: boolean, options?: channels.FrameCheckOptions) {
@@ -428,7 +445,7 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
   }
 
   async waitForTimeout(timeout: number) {
-    await this._channel.waitForTimeout({ timeout });
+    await this._channel.waitForTimeout({ waitTimeout: timeout });
   }
 
   async waitForFunction<R, Arg>(pageFunction: structs.PageFunction<Arg, R>, arg?: Arg, options: WaitForFunctionOptions = {}): Promise<structs.SmartHandle<R>> {
@@ -440,6 +457,7 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
       expression: String(pageFunction),
       isFunction: typeof pageFunction === 'function',
       arg: serializeArgument(arg),
+      timeout: this._timeout(options),
     });
     return JSHandle.from(result.handle) as any as structs.SmartHandle<R>;
   }
@@ -447,6 +465,15 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
   async title(): Promise<string> {
     return (await this._channel.title()).value;
   }
+
+  async _expect(expression: string, options: Omit<channels.FrameExpectParams, 'expression'>): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }> {
+    const params: channels.FrameExpectParams = { expression, ...options, isNot: !!options.isNot };
+    params.expectedValue = serializeArgument(options.expectedValue);
+    const result = (await this._channel.expect(params));
+    if (result.received !== undefined)
+      result.received = parseResult(result.received);
+    return result;
+  }
 }
 
 export function verifyLoadState(name: string, waitUntil: LifecycleEvent): LifecycleEvent {
diff --git a/packages/playwright-core/src/client/harRouter.ts b/packages/playwright-core/src/client/harRouter.ts
index 5fe32a39be9f9..a9ab966b2a574 100644
--- a/packages/playwright-core/src/client/harRouter.ts
+++ b/packages/playwright-core/src/client/harRouter.ts
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-import { debugLogger } from '../utils/debugLogger';
 import type { BrowserContext } from './browserContext';
 import type { LocalUtils } from './localUtils';
 import type { Route } from './network';
-import type { URLMatch } from './types';
 import type { Page } from './page';
+import type { URLMatch } from '../utils/isomorphic/urlMatch';
 
 type HarNotFoundAction = 'abort' | 'fallback';
 
@@ -30,7 +29,7 @@ export class HarRouter {
   private _options: { urlMatch?: URLMatch; baseURL?: string; };
 
   static async create(localUtils: LocalUtils, file: string, notFoundAction: HarNotFoundAction, options: { urlMatch?: URLMatch }): Promise<HarRouter> {
-    const { harId, error } = await localUtils._channel.harOpen({ file });
+    const { harId, error } = await localUtils.harOpen({ file });
     if (error)
       throw new Error(error);
     return new HarRouter(localUtils, harId!, notFoundAction, options);
@@ -46,7 +45,7 @@ export class HarRouter {
   private async _handle(route: Route) {
     const request = route.request();
 
-    const response = await this._localUtils._channel.harLookup({
+    const response = await this._localUtils.harLookup({
       harId: this._harId,
       url: request.url(),
       method: request.method(),
@@ -56,7 +55,7 @@ export class HarRouter {
     });
 
     if (response.action === 'redirect') {
-      debugLogger.log('api', `HAR: ${route.request().url()} redirected to ${response.redirectURL}`);
+      route._platform.log('api', `HAR: ${route.request().url()} redirected to ${response.redirectURL}`);
       await route._redirectNavigationRequest(response.redirectURL!);
       return;
     }
@@ -78,7 +77,7 @@ export class HarRouter {
     }
 
     if (response.action === 'error')
-      debugLogger.log('api', 'HAR: ' + response.message!);
+      route._platform.log('api', 'HAR: ' + response.message!);
     // Report the error, but fall through to the default handler.
 
     if (this._notFoundAction === 'abort') {
@@ -102,6 +101,6 @@ export class HarRouter {
   }
 
   dispose() {
-    this._localUtils._channel.harClose({ harId: this._harId }).catch(() => {});
+    this._localUtils.harClose({ harId: this._harId }).catch(() => {});
   }
 }
diff --git a/packages/playwright-core/src/client/input.ts b/packages/playwright-core/src/client/input.ts
index e06b0e3e4ab4e..d77fc3b54dc03 100644
--- a/packages/playwright-core/src/client/input.ts
+++ b/packages/playwright-core/src/client/input.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import type * as api from '../../types/types';
 import type { Page } from './page';
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
 
 export class Keyboard implements api.Keyboard {
   private _page: Page;
@@ -71,7 +71,9 @@ export class Mouse implements api.Mouse {
   }
 
   async dblclick(x: number, y: number, options: Omit<channels.PageMouseClickOptions, 'clickCount'> = {}) {
-    await this.click(x, y, { ...options, clickCount: 2 });
+    await this._page._wrapApiCall(async () => {
+      await this.click(x, y, { ...options, clickCount: 2 });
+    }, { title: 'Double click' });
   }
 
   async wheel(deltaX: number, deltaY: number) {
diff --git a/packages/playwright-core/src/client/jsHandle.ts b/packages/playwright-core/src/client/jsHandle.ts
index bb85894870811..2a898c967483e 100644
--- a/packages/playwright-core/src/client/jsHandle.ts
+++ b/packages/playwright-core/src/client/jsHandle.ts
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
+import { isTargetClosedError } from './errors';
 import { parseSerializedValue, serializeValue } from '../protocol/serializers';
-import type * as api from '../../types/types';
+
 import type * as structs from '../../types/structs';
-import { isTargetClosedError } from './errors';
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
+
 
 export class JSHandle<T = any> extends ChannelOwner<channels.JSHandleChannel> implements api.JSHandle {
   private _preview: string;
@@ -39,6 +41,11 @@ export class JSHandle<T = any> extends ChannelOwner<channels.JSHandleChannel> im
     return parseResult(result.value);
   }
 
+  async _evaluateFunction(functionDeclaration: string) {
+    const result = await this._channel.evaluateExpression({ expression: functionDeclaration, isFunction: true, arg: serializeArgument(undefined) });
+    return parseResult(result.value);
+  }
+
   async evaluateHandle<R, Arg>(pageFunction: structs.PageFunctionOn<T, Arg, R>, arg?: Arg): Promise<structs.SmartHandle<R>> {
     const result = await this._channel.evaluateExpressionHandle({ expression: String(pageFunction), isFunction: typeof pageFunction === 'function', arg: serializeArgument(arg) });
     return JSHandle.from(result.handle) as any as structs.SmartHandle<R>;
@@ -78,13 +85,6 @@ export class JSHandle<T = any> extends ChannelOwner<channels.JSHandleChannel> im
     }
   }
 
-  async _objectCount() {
-    return await this._wrapApiCall(async () => {
-      const { count } = await this._channel.objectCount();
-      return count;
-    });
-  }
-
   override toString(): string {
     return this._preview;
   }
diff --git a/packages/playwright-core/src/client/jsonPipe.ts b/packages/playwright-core/src/client/jsonPipe.ts
index 0c6b53502fa29..9e6635638e0a7 100644
--- a/packages/playwright-core/src/client/jsonPipe.ts
+++ b/packages/playwright-core/src/client/jsonPipe.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
 
+import type * as channels from '@protocol/channels';
+
 export class JsonPipe extends ChannelOwner<channels.JsonPipeChannel> {
   static from(jsonPipe: channels.JsonPipeChannel): JsonPipe {
     return (jsonPipe as any)._object;
diff --git a/packages/playwright-core/src/client/localUtils.ts b/packages/playwright-core/src/client/localUtils.ts
index 6cadb00326d4a..79a035c0f6b54 100644
--- a/packages/playwright-core/src/client/localUtils.ts
+++ b/packages/playwright-core/src/client/localUtils.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
+
 import type { Size } from './types';
+import type * as channels from '@protocol/channels';
 
 type DeviceDescriptor = {
   userAgent: string,
@@ -37,4 +38,36 @@ export class LocalUtils extends ChannelOwner<channels.LocalUtilsChannel> {
     for (const { name, descriptor } of initializer.deviceDescriptors)
       this.devices[name] = descriptor;
   }
+
+  async zip(params: channels.LocalUtilsZipParams): Promise<void> {
+    return await this._channel.zip(params);
+  }
+
+  async harOpen(params: channels.LocalUtilsHarOpenParams): Promise<channels.LocalUtilsHarOpenResult> {
+    return await this._channel.harOpen(params);
+  }
+
+  async harLookup(params: channels.LocalUtilsHarLookupParams): Promise<channels.LocalUtilsHarLookupResult> {
+    return await this._channel.harLookup(params);
+  }
+
+  async harClose(params: channels.LocalUtilsHarCloseParams): Promise<void> {
+    return await this._channel.harClose(params);
+  }
+
+  async harUnzip(params: channels.LocalUtilsHarUnzipParams): Promise<void> {
+    return await this._channel.harUnzip(params);
+  }
+
+  async tracingStarted(params: channels.LocalUtilsTracingStartedParams): Promise<channels.LocalUtilsTracingStartedResult> {
+    return await this._channel.tracingStarted(params);
+  }
+
+  async traceDiscarded(params: channels.LocalUtilsTraceDiscardedParams): Promise<void> {
+    return await this._channel.traceDiscarded(params);
+  }
+
+  async addStackToTracingNoReply(params: channels.LocalUtilsAddStackToTracingNoReplyParams): Promise<void> {
+    return await this._channel.addStackToTracingNoReply(params);
+  }
 }
diff --git a/packages/playwright-core/src/client/locator.ts b/packages/playwright-core/src/client/locator.ts
index b6058e0abb825..f7afdbb5fe550 100644
--- a/packages/playwright-core/src/client/locator.ts
+++ b/packages/playwright-core/src/client/locator.ts
@@ -14,24 +14,27 @@
  * limitations under the License.
  */
 
-import type * as structs from '../../types/structs';
-import type * as api from '../../types/types';
-import type * as channels from '@protocol/channels';
-import * as util from 'util';
-import { asLocator, isString, monotonicTime } from '../utils';
 import { ElementHandle } from './elementHandle';
-import type { Frame } from './frame';
-import type { FilePayload, FrameExpectOptions, Rect, SelectOption, SelectOptionOptions, TimeoutOptions } from './types';
-import { parseResult, serializeArgument } from './jsHandle';
+import { asLocator } from '../utils/isomorphic/locatorGenerators';
+import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from '../utils/isomorphic/locatorUtils';
 import { escapeForTextSelector } from '../utils/isomorphic/stringUtils';
+import { isString } from '../utils/isomorphic/rtti';
+import { monotonicTime } from '../utils/isomorphic/time';
+
+import type { Frame } from './frame';
+import type { FilePayload, FrameExpectParams, Rect, SelectOption, SelectOptionOptions, TimeoutOptions } from './types';
+import type * as structs from '../../types/structs';
+import type * as api from '../../types/types';
 import type { ByRoleOptions } from '../utils/isomorphic/locatorUtils';
-import { getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector } from '../utils/isomorphic/locatorUtils';
+import type * as channels from '@protocol/channels';
+
 
 export type LocatorOptions = {
   hasText?: string | RegExp;
   hasNotText?: string | RegExp;
   has?: Locator;
   hasNot?: Locator;
+  visible?: boolean;
 };
 
 export class Locator implements api.Locator {
@@ -61,10 +64,16 @@ export class Locator implements api.Locator {
         throw new Error(`Inner "hasNot" locator must belong to the same frame.`);
       this._selector += ` >> internal:has-not=` + JSON.stringify(locator._selector);
     }
+
+    if (options?.visible !== undefined)
+      this._selector += ` >> visible=${options.visible ? 'true' : 'false'}`;
+
+    if (this._frame._platform.inspectCustom)
+      (this as any)[this._frame._platform.inspectCustom] = () => this._inspect();
   }
 
-  private async _withElement<R>(task: (handle: ElementHandle<SVGElement | HTMLElement>, timeout?: number) => Promise<R>, timeout?: number): Promise<R> {
-    timeout = this._frame.page()._timeoutSettings.timeout({ timeout });
+  private async _withElement<R>(task: (handle: ElementHandle<SVGElement | HTMLElement>, timeout?: number) => Promise<R>, options: { title: string, internal?: boolean, timeout?: number }): Promise<R> {
+    const timeout = this._frame._timeout({ timeout: options.timeout });
     const deadline = timeout ? monotonicTime() + timeout : 0;
 
     return await this._frame._wrapApiCall<R>(async () => {
@@ -77,7 +86,7 @@ export class Locator implements api.Locator {
       } finally {
         await handle.dispose();
       }
-    });
+    }, { title: options.title, internal: options.internal });
   }
 
   _equals(locator: Locator) {
@@ -89,26 +98,26 @@ export class Locator implements api.Locator {
   }
 
   async boundingBox(options?: TimeoutOptions): Promise<Rect | null> {
-    return await this._withElement(h => h.boundingBox(), options?.timeout);
+    return await this._withElement(h => h.boundingBox(), { title: 'Bounding box', timeout: options?.timeout });
   }
 
-  async check(options: channels.ElementHandleCheckOptions = {}) {
+  async check(options: channels.ElementHandleCheckOptions & TimeoutOptions = {}) {
     return await this._frame.check(this._selector, { strict: true, ...options });
   }
 
-  async click(options: channels.ElementHandleClickOptions = {}): Promise<void> {
+  async click(options: channels.ElementHandleClickOptions & TimeoutOptions = {}): Promise<void> {
     return await this._frame.click(this._selector, { strict: true, ...options });
   }
 
-  async dblclick(options: channels.ElementHandleDblclickOptions = {}): Promise<void> {
-    return await this._frame.dblclick(this._selector, { strict: true, ...options });
+  async dblclick(options: channels.ElementHandleDblclickOptions & TimeoutOptions = {}): Promise<void> {
+    await this._frame.dblclick(this._selector, { strict: true, ...options });
   }
 
   async dispatchEvent(type: string, eventInit: Object = {}, options?: TimeoutOptions) {
     return await this._frame.dispatchEvent(this._selector, type, eventInit, { strict: true, ...options });
   }
 
-  async dragTo(target: Locator, options: channels.FrameDragAndDropOptions = {}) {
+  async dragTo(target: Locator, options: channels.FrameDragAndDropOptions & TimeoutOptions = {}) {
     return await this._frame.dragAndDrop(this._selector, target._selector, {
       strict: true,
       ...options,
@@ -116,7 +125,11 @@ export class Locator implements api.Locator {
   }
 
   async evaluate<R, Arg>(pageFunction: structs.PageFunctionOn<SVGElement | HTMLElement, Arg, R>, arg?: Arg, options?: TimeoutOptions): Promise<R> {
-    return await this._withElement(h => h.evaluate(pageFunction, arg), options?.timeout);
+    return await this._withElement(h => h.evaluate(pageFunction, arg), { title: 'Evaluate', timeout: options?.timeout });
+  }
+
+  async _evaluateFunction(functionDeclaration: string, options?: TimeoutOptions) {
+    return await this._withElement(h => h._evaluateFunction(functionDeclaration), { title: 'Evaluate', timeout: options?.timeout });
   }
 
   async evaluateAll<R, Arg>(pageFunction: structs.PageFunctionOn<Element[], Arg, R>, arg?: Arg): Promise<R> {
@@ -124,15 +137,15 @@ export class Locator implements api.Locator {
   }
 
   async evaluateHandle<R, Arg>(pageFunction: structs.PageFunctionOn<any, Arg, R>, arg?: Arg, options?: TimeoutOptions): Promise<structs.SmartHandle<R>> {
-    return await this._withElement(h => h.evaluateHandle(pageFunction, arg), options?.timeout);
+    return await this._withElement(h => h.evaluateHandle(pageFunction, arg), { title: 'Evaluate', timeout: options?.timeout });
   }
 
-  async fill(value: string, options: channels.ElementHandleFillOptions = {}): Promise<void> {
+  async fill(value: string, options: channels.ElementHandleFillOptions & TimeoutOptions = {}): Promise<void> {
     return await this._frame.fill(this._selector, value, { strict: true, ...options });
   }
 
   async clear(options: channels.ElementHandleFillOptions = {}): Promise<void> {
-    return await this.fill('', options);
+    await this._frame._wrapApiCall(() => this.fill('', options), { title: 'Clear' });
   }
 
   async _highlight() {
@@ -144,7 +157,7 @@ export class Locator implements api.Locator {
     return await this._frame._highlight(this._selector);
   }
 
-  locator(selectorOrLocator: string | Locator, options?: LocatorOptions): Locator {
+  locator(selectorOrLocator: string | Locator, options?: Omit<LocatorOptions, 'visible'>): Locator {
     if (isString(selectorOrLocator))
       return new Locator(this._frame, this._selector + ' >> ' + selectorOrLocator, options);
     if (selectorOrLocator._frame !== this._frame)
@@ -200,6 +213,10 @@ export class Locator implements api.Locator {
     return new FrameLocator(this._frame, this._selector);
   }
 
+  describe(description: string) {
+    return new Locator(this._frame, this._selector + ' >> internal:describe=' + JSON.stringify(description));
+  }
+
   first(): Locator {
     return new Locator(this._frame, this._selector + ' >> nth=0');
   }
@@ -229,18 +246,23 @@ export class Locator implements api.Locator {
   }
 
   async blur(options?: TimeoutOptions): Promise<void> {
-    await this._frame._channel.blur({ selector: this._selector, strict: true, ...options });
+    await this._frame._channel.blur({ selector: this._selector, strict: true, ...options, timeout: this._frame._timeout(options) });
   }
 
-  async count(): Promise<number> {
-    return await this._frame._queryCount(this._selector);
+  // options are only here for testing
+  async count(_options?: {}): Promise<number> {
+    return await this._frame._queryCount(this._selector, _options);
+  }
+
+  async _resolveSelector(): Promise<{ resolvedSelector: string }> {
+    return await this._frame._channel.resolveSelector({ selector: this._selector });
   }
 
   async getAttribute(name: string, options?: TimeoutOptions): Promise<string | null> {
     return await this._frame.getAttribute(this._selector, name, { strict: true, ...options });
   }
 
-  async hover(options: channels.ElementHandleHoverOptions = {}): Promise<void> {
+  async hover(options: channels.ElementHandleHoverOptions & TimeoutOptions = {}): Promise<void> {
     return await this._frame.hover(this._selector, { strict: true, ...options });
   }
 
@@ -280,38 +302,44 @@ export class Locator implements api.Locator {
     return await this._frame.isVisible(this._selector, { strict: true, ...options });
   }
 
-  async press(key: string, options: channels.ElementHandlePressOptions = {}): Promise<void> {
+  async press(key: string, options: channels.ElementHandlePressOptions & TimeoutOptions = {}): Promise<void> {
     return await this._frame.press(this._selector, key, { strict: true, ...options });
   }
 
-  async screenshot(options: Omit<channels.ElementHandleScreenshotOptions, 'mask'> & { path?: string, mask?: Locator[] } = {}): Promise<Buffer> {
-    return await this._withElement((h, timeout) => h.screenshot({ ...options, timeout }), options.timeout);
+  async screenshot(options: Omit<channels.ElementHandleScreenshotOptions, 'mask'> & TimeoutOptions & { path?: string, mask?: api.Locator[] } = {}): Promise<Buffer> {
+    const mask = options.mask as Locator[] | undefined;
+    return await this._withElement((h, timeout) => h.screenshot({ ...options, mask, timeout }), { title: 'Screenshot', timeout: options.timeout });
+  }
+
+  async ariaSnapshot(options?: TimeoutOptions): Promise<string> {
+    const result = await this._frame._channel.ariaSnapshot({ ...options, selector: this._selector, timeout: this._frame._timeout(options) });
+    return result.snapshot;
   }
 
-  async scrollIntoViewIfNeeded(options: channels.ElementHandleScrollIntoViewIfNeededOptions = {}) {
-    return await this._withElement((h, timeout) => h.scrollIntoViewIfNeeded({ ...options, timeout }), options.timeout);
+  async scrollIntoViewIfNeeded(options: channels.ElementHandleScrollIntoViewIfNeededOptions & TimeoutOptions = {}) {
+    return await this._withElement((h, timeout) => h.scrollIntoViewIfNeeded({ ...options, timeout }), { title: 'Scroll into view', timeout: options.timeout });
   }
 
   async selectOption(values: string | api.ElementHandle | SelectOption | string[] | api.ElementHandle[] | SelectOption[] | null, options: SelectOptionOptions = {}): Promise<string[]> {
     return await this._frame.selectOption(this._selector, values, { strict: true, ...options });
   }
 
-  async selectText(options: channels.ElementHandleSelectTextOptions = {}): Promise<void> {
-    return await this._withElement((h, timeout) => h.selectText({ ...options, timeout }), options.timeout);
+  async selectText(options: channels.ElementHandleSelectTextOptions & TimeoutOptions = {}): Promise<void> {
+    return await this._withElement((h, timeout) => h.selectText({ ...options, timeout }), { title: 'Select text', timeout: options.timeout });
   }
 
-  async setChecked(checked: boolean, options?: channels.ElementHandleCheckOptions) {
+  async setChecked(checked: boolean, options?: channels.ElementHandleCheckOptions & TimeoutOptions) {
     if (checked)
       await this.check(options);
     else
       await this.uncheck(options);
   }
 
-  async setInputFiles(files: string | FilePayload | string[] | FilePayload[], options: channels.ElementHandleSetInputFilesOptions = {}) {
+  async setInputFiles(files: string | FilePayload | string[] | FilePayload[], options: channels.ElementHandleSetInputFilesOptions & TimeoutOptions = {}) {
     return await this._frame.setInputFiles(this._selector, files, { strict: true, ...options });
   }
 
-  async tap(options: channels.ElementHandleTapOptions = {}): Promise<void> {
+  async tap(options: channels.ElementHandleTapOptions & TimeoutOptions = {}): Promise<void> {
     return await this._frame.tap(this._selector, { strict: true, ...options });
   }
 
@@ -319,15 +347,15 @@ export class Locator implements api.Locator {
     return await this._frame.textContent(this._selector, { strict: true, ...options });
   }
 
-  async type(text: string, options: channels.ElementHandleTypeOptions = {}): Promise<void> {
+  async type(text: string, options: channels.ElementHandleTypeOptions & TimeoutOptions = {}): Promise<void> {
     return await this._frame.type(this._selector, text, { strict: true, ...options });
   }
 
-  async pressSequentially(text: string, options: channels.ElementHandleTypeOptions = {}): Promise<void> {
+  async pressSequentially(text: string, options: channels.ElementHandleTypeOptions & TimeoutOptions = {}): Promise<void> {
     return await this.type(text, options);
   }
 
-  async uncheck(options: channels.ElementHandleUncheckOptions = {}) {
+  async uncheck(options: channels.ElementHandleUncheckOptions & TimeoutOptions = {}) {
     return await this._frame.uncheck(this._selector, { strict: true, ...options });
   }
 
@@ -343,22 +371,20 @@ export class Locator implements api.Locator {
     return await this._frame.$$eval(this._selector, ee => ee.map(e => e.textContent || ''));
   }
 
-  waitFor(options: channels.FrameWaitForSelectorOptions & { state: 'attached' | 'visible' }): Promise<void>;
-  waitFor(options?: channels.FrameWaitForSelectorOptions): Promise<void>;
-  async waitFor(options?: channels.FrameWaitForSelectorOptions): Promise<void> {
-    await this._frame._channel.waitForSelector({ selector: this._selector, strict: true, omitReturnValue: true, ...options });
+  waitFor(options: channels.FrameWaitForSelectorOptions & TimeoutOptions & { state: 'attached' | 'visible' }): Promise<void>;
+  waitFor(options?: channels.FrameWaitForSelectorOptions & TimeoutOptions): Promise<void>;
+  async waitFor(options?: channels.FrameWaitForSelectorOptions & TimeoutOptions): Promise<void> {
+    await this._frame._channel.waitForSelector({ selector: this._selector, strict: true, omitReturnValue: true, ...options, timeout: this._frame._timeout(options) });
   }
 
-  async _expect(expression: string, options: Omit<FrameExpectOptions, 'expectedValue'> & { expectedValue?: any }): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }> {
-    const params: channels.FrameExpectParams = { selector: this._selector, expression, ...options, isNot: !!options.isNot };
-    params.expectedValue = serializeArgument(options.expectedValue);
-    const result = (await this._frame._channel.expect(params));
-    if (result.received !== undefined)
-      result.received = parseResult(result.received);
-    return result;
+  async _expect(expression: string, options: FrameExpectParams): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }> {
+    return this._frame._expect(expression, {
+      ...options,
+      selector: this._selector,
+    });
   }
 
-  [util.inspect.custom]() {
+  private _inspect() {
     return this.toString();
   }
 
diff --git a/packages/playwright-core/src/client/network.ts b/packages/playwright-core/src/client/network.ts
index 2e28b6cd1ba78..88c34c6785ed9 100644
--- a/packages/playwright-core/src/client/network.ts
+++ b/packages/playwright-core/src/client/network.ts
@@ -14,27 +14,31 @@
  * limitations under the License.
  */
 
-import { URLSearchParams } from 'url';
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
+import { isTargetClosedError } from './errors';
+import { Events } from './events';
+import { APIResponse } from './fetch';
 import { Frame } from './frame';
+import { Waiter } from './waiter';
 import { Worker } from './worker';
-import type { Headers, RemoteAddr, SecurityDetails, WaitForEventOptions } from './types';
-import fs from 'fs';
-import { mime } from '../utilsBundle';
-import { assert, isString, headersObjectToArray, isRegExp, rewriteErrorMessage } from '../utils';
-import { ManualPromise, LongStandingScope } from '../utils/manualPromise';
-import { Events } from './events';
+import { assert } from '../utils/isomorphic/assert';
+import { headersObjectToArray } from '../utils/isomorphic/headers';
+import { urlMatches } from '../utils/isomorphic/urlMatch';
+import { LongStandingScope, ManualPromise } from '../utils/isomorphic/manualPromise';
+import { MultiMap } from '../utils/isomorphic/multimap';
+import { isRegExp, isString } from '../utils/isomorphic/rtti';
+import { rewriteErrorMessage } from '../utils/isomorphic/stackTrace';
+import { getMimeTypeForPath } from '../utils/isomorphic/mimeType';
+
+import type { BrowserContext } from './browserContext';
 import type { Page } from './page';
-import { Waiter } from './waiter';
-import type * as api from '../../types/types';
-import type { HeadersArray, URLMatch } from '../common/types';
-import { urlMatches } from '../utils/network';
-import { MultiMap } from '../utils/multimap';
-import { APIResponse } from './fetch';
+import type { Headers, RemoteAddr, SecurityDetails, WaitForEventOptions } from './types';
 import type { Serializable } from '../../types/structs';
-import type { BrowserContext } from './browserContext';
-import { isTargetClosedError } from './errors';
+import type * as api from '../../types/types';
+import type { HeadersArray } from '../utils/isomorphic/types';
+import type { URLMatch } from '../utils/isomorphic/urlMatch';
+import type * as channels from '@protocol/channels';
+import type { Platform, Zone } from './platform';
 
 export type NetworkCookie = {
   name: string,
@@ -172,7 +176,7 @@ export class Request extends ChannelOwner<channels.RequestChannel> implements ap
     if (!this._actualHeadersPromise) {
       this._actualHeadersPromise = this._wrapApiCall(async () => {
         return new RawHeaders((await this._channel.rawRequestHeaders()).headers);
-      });
+      }, { internal: true });
     }
     return await this._actualHeadersPromise;
   }
@@ -194,9 +198,7 @@ export class Request extends ChannelOwner<channels.RequestChannel> implements ap
   }
 
   async _internalResponse(): Promise<Response | null> {
-    return await this._wrapApiCall(async () => {
-      return Response.fromNullable((await this._channel.response()).response);
-    }, true);
+    return Response.fromNullable((await this._channel.response()).response);
   }
 
   frame(): Frame {
@@ -326,7 +328,7 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
 
   async abort(errorCode?: string) {
     await this._handleRoute(async () => {
-      await this._raceWithTargetClose(this._channel.abort({ requestUrl: this.request()._initializer.url, errorCode }));
+      await this._raceWithTargetClose(this._channel.abort({ errorCode }));
     });
   }
 
@@ -344,9 +346,7 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
 
   async fulfill(options: { response?: api.APIResponse, status?: number, headers?: Headers, contentType?: string, body?: string | Buffer, json?: any, path?: string } = {}) {
     await this._handleRoute(async () => {
-      await this._wrapApiCall(async () => {
-        await this._innerFulfill(options);
-      });
+      await this._innerFulfill(options);
     });
   }
 
@@ -384,7 +384,7 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
     let isBase64 = false;
     let length = 0;
     if (options.path) {
-      const buffer = await fs.promises.readFile(options.path);
+      const buffer = await this._platform.fs().promises.readFile(options.path);
       body = buffer.toString('base64');
       isBase64 = true;
       length = buffer.length;
@@ -405,12 +405,11 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
     else if (options.json)
       headers['content-type'] = 'application/json';
     else if (options.path)
-      headers['content-type'] = mime.getType(options.path) || 'application/octet-stream';
+      headers['content-type'] = getMimeTypeForPath(options.path) || 'application/octet-stream';
     if (length && !('content-length' in headers))
       headers['content-length'] = String(length);
 
     await this._raceWithTargetClose(this._channel.fulfill({
-      requestUrl: this.request()._initializer.url,
       status: statusOption || 200,
       headers: headersObjectToArray(headers),
       body,
@@ -422,7 +421,7 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
   async continue(options: FallbackOverrides = {}) {
     await this._handleRoute(async () => {
       this.request()._applyFallbackOverrides(options);
-      await this._innerContinue();
+      await this._innerContinue(false /* isFallback */);
     });
   }
 
@@ -437,22 +436,179 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
     chain.resolve(done);
   }
 
-  async _innerContinue(internal = false) {
+  async _innerContinue(isFallback: boolean) {
     const options = this.request()._fallbackOverridesForContinue();
-    return await this._wrapApiCall(async () => {
-      await this._raceWithTargetClose(this._channel.continue({
-        requestUrl: this.request()._initializer.url,
-        url: options.url,
-        method: options.method,
-        headers: options.headers ? headersObjectToArray(options.headers) : undefined,
-        postData: options.postDataBuffer,
-        isFallback: internal,
-      }));
-    }, !!internal);
+    return await this._raceWithTargetClose(this._channel.continue({
+      url: options.url,
+      method: options.method,
+      headers: options.headers ? headersObjectToArray(options.headers) : undefined,
+      postData: options.postDataBuffer,
+      isFallback,
+    }));
+  }
+}
+
+export class WebSocketRoute extends ChannelOwner<channels.WebSocketRouteChannel> implements api.WebSocketRoute {
+  static from(route: channels.WebSocketRouteChannel): WebSocketRoute {
+    return (route as any)._object;
+  }
+
+  private _onPageMessage?: (message: string | Buffer) => any;
+  private _onPageClose?: (code: number | undefined, reason: string | undefined) => any;
+  private _onServerMessage?: (message: string | Buffer) => any;
+  private _onServerClose?: (code: number | undefined, reason: string | undefined) => any;
+  private _server: api.WebSocketRoute;
+  private _connected = false;
+
+  constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.WebSocketRouteInitializer) {
+    super(parent, type, guid, initializer);
+
+    this._server = {
+      onMessage: (handler: (message: string | Buffer) => any) => {
+        this._onServerMessage = handler;
+      },
+
+      onClose: (handler: (code: number | undefined, reason: string | undefined) => any) => {
+        this._onServerClose = handler;
+      },
+
+      connectToServer: () => {
+        throw new Error(`connectToServer must be called on the page-side WebSocketRoute`);
+      },
+
+      url: () => {
+        return this._initializer.url;
+      },
+
+      close: async (options: { code?: number, reason?: string } = {}) => {
+        await this._channel.closeServer({ ...options, wasClean: true }).catch(() => {});
+      },
+
+      send: (message: string | Buffer) => {
+        if (isString(message))
+          this._channel.sendToServer({ message, isBase64: false }).catch(() => {});
+        else
+          this._channel.sendToServer({ message: message.toString('base64'), isBase64: true }).catch(() => {});
+      },
+
+      async [Symbol.asyncDispose]() {
+        await this.close();
+      },
+    };
+
+    this._channel.on('messageFromPage', ({ message, isBase64 }) => {
+      if (this._onPageMessage)
+        this._onPageMessage(isBase64 ? Buffer.from(message, 'base64') : message);
+      else if (this._connected)
+        this._channel.sendToServer({ message, isBase64 }).catch(() => {});
+    });
+
+    this._channel.on('messageFromServer', ({ message, isBase64 }) => {
+      if (this._onServerMessage)
+        this._onServerMessage(isBase64 ? Buffer.from(message, 'base64') : message);
+      else
+        this._channel.sendToPage({ message, isBase64 }).catch(() => {});
+    });
+
+    this._channel.on('closePage', ({ code, reason, wasClean }) => {
+      if (this._onPageClose)
+        this._onPageClose(code, reason);
+      else
+        this._channel.closeServer({ code, reason, wasClean }).catch(() => {});
+    });
+
+    this._channel.on('closeServer', ({ code, reason, wasClean }) => {
+      if (this._onServerClose)
+        this._onServerClose(code, reason);
+      else
+        this._channel.closePage({ code, reason, wasClean }).catch(() => {});
+    });
+  }
+
+  url() {
+    return this._initializer.url;
+  }
+
+  async close(options: { code?: number, reason?: string } = {}) {
+    await this._channel.closePage({ ...options, wasClean: true }).catch(() => {});
+  }
+
+  connectToServer() {
+    if (this._connected)
+      throw new Error('Already connected to the server');
+    this._connected = true;
+    this._channel.connect().catch(() => {});
+    return this._server;
+  }
+
+  send(message: string | Buffer) {
+    if (isString(message))
+      this._channel.sendToPage({ message, isBase64: false }).catch(() => {});
+    else
+      this._channel.sendToPage({ message: message.toString('base64'), isBase64: true }).catch(() => {});
+  }
+
+  onMessage(handler: (message: string | Buffer) => any) {
+    this._onPageMessage = handler;
+  }
+
+  onClose(handler: (code: number | undefined, reason: string | undefined) => any) {
+    this._onPageClose = handler;
+  }
+
+  async [Symbol.asyncDispose]() {
+    await this.close();
+  }
+
+  async _afterHandle() {
+    if (this._connected)
+      return;
+    // Ensure that websocket is "open" and can send messages without an actual server connection.
+    // If this happens after the page has been closed, ignore the error.
+    await this._channel.ensureOpened().catch(() => {});
+  }
+}
+
+export class WebSocketRouteHandler {
+  private readonly _baseURL: string | undefined;
+  readonly url: URLMatch;
+  readonly handler: WebSocketRouteHandlerCallback;
+
+  constructor(baseURL: string | undefined, url: URLMatch, handler: WebSocketRouteHandlerCallback) {
+    this._baseURL = baseURL;
+    this.url = url;
+    this.handler = handler;
+  }
+
+  static prepareInterceptionPatterns(handlers: WebSocketRouteHandler[]) {
+    const patterns: channels.BrowserContextSetWebSocketInterceptionPatternsParams['patterns'] = [];
+    let all = false;
+    for (const handler of handlers) {
+      if (isString(handler.url))
+        patterns.push({ glob: handler.url });
+      else if (isRegExp(handler.url))
+        patterns.push({ regexSource: handler.url.source, regexFlags: handler.url.flags });
+      else
+        all = true;
+    }
+    if (all)
+      return [{ glob: '**/*' }];
+    return patterns;
+  }
+
+  public matches(wsURL: string): boolean {
+    return urlMatches(this._baseURL, wsURL, this.url, true);
+  }
+
+  public async handle(webSocketRoute: WebSocketRoute) {
+    const handler = this.handler;
+    await handler(webSocketRoute);
+    await webSocketRoute._afterHandle();
   }
 }
 
 export type RouteHandlerCallback = (route: Route, request: Request) => Promise<any> | void;
+export type WebSocketRouteHandlerCallback = (ws: WebSocketRoute) => Promise<any> | void;
 
 export type ResourceTiming = {
   startTime: number;
@@ -655,12 +811,14 @@ export class RouteHandler {
   readonly handler: RouteHandlerCallback;
   private _ignoreException: boolean = false;
   private _activeInvocations: Set<{ complete: Promise<void>, route: Route }> = new Set();
+  private _savedZone: Zone;
 
-  constructor(baseURL: string | undefined, url: URLMatch, handler: RouteHandlerCallback, times: number = Number.MAX_SAFE_INTEGER) {
+  constructor(platform: Platform, baseURL: string | undefined, url: URLMatch, handler: RouteHandlerCallback, times: number = Number.MAX_SAFE_INTEGER) {
     this._baseURL = baseURL;
     this._times = times;
     this.url = url;
     this.handler = handler;
+    this._savedZone = platform.zones.current().pop();
   }
 
   static prepareInterceptionPatterns(handlers: RouteHandler[]) {
@@ -684,6 +842,10 @@ export class RouteHandler {
   }
 
   public async handle(route: Route): Promise<boolean> {
+    return await this._savedZone.run(async () => this._handleImpl(route));
+  }
+
+  private async _handleImpl(route: Route): Promise<boolean> {
     const handlerInvocation = { complete: new ManualPromise(), route } ;
     this._activeInvocations.add(handlerInvocation);
     try {
diff --git a/packages/playwright-core/src/client/page.ts b/packages/playwright-core/src/client/page.ts
index 84848e433dc4c..4dbf85ab03c42 100644
--- a/packages/playwright-core/src/client/page.ts
+++ b/packages/playwright-core/src/client/page.ts
@@ -15,41 +15,45 @@
  * limitations under the License.
  */
 
-import fs from 'fs';
-import path from 'path';
-import type * as structs from '../../types/structs';
-import type * as api from '../../types/types';
-import { serializeError, isTargetClosedError, TargetClosedError } from './errors';
-import { urlMatches } from '../utils/network';
-import { TimeoutSettings } from '../common/timeoutSettings';
-import type * as channels from '@protocol/channels';
-import { assert, headersObjectToArray, isObject, isRegExp, isString, LongStandingScope, urlMatchesEqual } from '../utils';
-import { mkdirIfNeeded } from '../utils/fileUtils';
 import { Accessibility } from './accessibility';
 import { Artifact } from './artifact';
-import type { BrowserContext } from './browserContext';
 import { ChannelOwner } from './channelOwner';
 import { evaluationScript } from './clientHelper';
 import { Coverage } from './coverage';
 import { Download } from './download';
-import { determineScreenshotType, ElementHandle } from './elementHandle';
+import { ElementHandle, determineScreenshotType } from './elementHandle';
+import { TargetClosedError, isTargetClosedError, serializeError } from './errors';
 import { Events } from './events';
-import type { APIRequestContext } from './fetch';
 import { FileChooser } from './fileChooser';
-import type { WaitForNavigationOptions } from './frame';
 import { Frame, verifyLoadState } from './frame';
+import { HarRouter } from './harRouter';
 import { Keyboard, Mouse, Touchscreen } from './input';
-import { assertMaxArguments, JSHandle, parseResult, serializeArgument } from './jsHandle';
-import type { FrameLocator, Locator, LocatorOptions } from './locator';
-import type { ByRoleOptions } from '../utils/isomorphic/locatorUtils';
-import { trimStringWithEllipsis } from '../utils/isomorphic/stringUtils';
-import { type RouteHandlerCallback, type Request, Response, Route, RouteHandler, validateHeaders, WebSocket } from './network';
-import type { FilePayload, Headers, LifecycleEvent, SelectOption, SelectOptionOptions, Size, URLMatch, WaitForEventOptions, WaitForFunctionOptions } from './types';
+import { JSHandle, assertMaxArguments, parseResult, serializeArgument } from './jsHandle';
+import { Response, Route, RouteHandler, WebSocket,  WebSocketRoute, WebSocketRouteHandler, validateHeaders } from './network';
 import { Video } from './video';
 import { Waiter } from './waiter';
 import { Worker } from './worker';
-import { HarRouter } from './harRouter';
+import { TimeoutSettings } from './timeoutSettings';
+import { assert } from '../utils/isomorphic/assert';
+import { mkdirIfNeeded } from './fileUtils';
+import { headersObjectToArray } from '../utils/isomorphic/headers';
+import { trimStringWithEllipsis  } from '../utils/isomorphic/stringUtils';
+import { urlMatches, urlMatchesEqual } from '../utils/isomorphic/urlMatch';
+import { LongStandingScope } from '../utils/isomorphic/manualPromise';
+import { isObject, isRegExp, isString } from '../utils/isomorphic/rtti';
+
+import type { BrowserContext } from './browserContext';
 import type { Clock } from './clock';
+import type { APIRequestContext } from './fetch';
+import type { WaitForNavigationOptions } from './frame';
+import type { FrameLocator, Locator, LocatorOptions } from './locator';
+import type { Request, RouteHandlerCallback, WebSocketRouteHandlerCallback } from './network';
+import type { FilePayload, Headers, LifecycleEvent, SelectOption, SelectOptionOptions, Size, TimeoutOptions, WaitForEventOptions, WaitForFunctionOptions } from './types';
+import type * as structs from '../../types/structs';
+import type * as api from '../../types/types';
+import type { ByRoleOptions } from '../utils/isomorphic/locatorUtils';
+import type { URLMatch } from '../utils/isomorphic/urlMatch';
+import type * as channels from '@protocol/channels';
 
 type PDFOptions = Omit<channels.PagePdfParams, 'width' | 'height' | 'margin'> & {
   width?: string | number,
@@ -66,6 +70,7 @@ type PDFOptions = Omit<channels.PagePdfParams, 'width' | 'height' | 'margin'> &
 export type ExpectScreenshotOptions = Omit<channels.PageExpectScreenshotOptions, 'locator' | 'expected' | 'mask'> & {
   expected?: Buffer,
   locator?: api.Locator,
+  timeout: number,
   isNot: boolean,
   mask?: api.Locator[],
 };
@@ -79,8 +84,9 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
   _workers = new Set<Worker>();
   private _closed = false;
   readonly _closedOrCrashedScope = new LongStandingScope();
-  private _viewportSize: Size | null;
+  private _viewportSize: Size | undefined;
   _routes: RouteHandler[] = [];
+  _webSocketRoutes: WebSocketRouteHandler[] = [];
 
   readonly accessibility: Accessibility;
   readonly coverage: Coverage;
@@ -112,7 +118,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.PageInitializer) {
     super(parent, type, guid, initializer);
     this._browserContext = parent as unknown as BrowserContext;
-    this._timeoutSettings = new TimeoutSettings(this._browserContext._timeoutSettings);
+    this._timeoutSettings = new TimeoutSettings(this._platform, this._browserContext._timeoutSettings);
 
     this.accessibility = new Accessibility(this._channel);
     this.keyboard = new Keyboard(this);
@@ -124,7 +130,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     this._mainFrame = Frame.from(initializer.mainFrame);
     this._mainFrame._page = this;
     this._frames.add(this._mainFrame);
-    this._viewportSize = initializer.viewportSize || null;
+    this._viewportSize = initializer.viewportSize;
     this._closed = initializer.isClosed;
     this._opener = Page.fromNullable(initializer.opener);
 
@@ -140,10 +146,12 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     this._channel.on('frameDetached', ({ frame }) => this._onFrameDetached(Frame.from(frame)));
     this._channel.on('locatorHandlerTriggered', ({ uid }) => this._onLocatorHandlerTriggered(uid));
     this._channel.on('route', ({ route }) => this._onRoute(Route.from(route)));
+    this._channel.on('webSocketRoute', ({ webSocketRoute }) => this._onWebSocketRoute(WebSocketRoute.from(webSocketRoute)));
     this._channel.on('video', ({ artifact }) => {
       const artifactObject = Artifact.from(artifact);
       this._forceVideo()._artifactReady(artifactObject);
     });
+    this._channel.on('viewportSizeChanged', ({ viewportSize }) => this._viewportSize = viewportSize);
     this._channel.on('webSocket', ({ webSocket }) => this.emit(Events.Page.WebSocket, WebSocket.from(webSocket)));
     this._channel.on('worker', ({ worker }) => this._onWorker(Worker.from(worker)));
 
@@ -184,7 +192,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     const routeHandlers = this._routes.slice();
     for (const routeHandler of routeHandlers) {
       // If the page was closed we stall all requests right away.
-      if (this._closeWasCalled || this._browserContext._closeWasCalled)
+      if (this._closeWasCalled || this._browserContext._closingStatus !== 'none')
         return;
       if (!routeHandler.matches(route.request().url()))
         continue;
@@ -195,7 +203,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
         this._routes.splice(index, 1);
       const handled = await routeHandler.handle(route);
       if (!this._routes.length)
-        this._wrapApiCall(() => this._updateInterceptionPatterns(), true).catch(() => {});
+        this._updateInterceptionPatterns({ internal: true }).catch(() => {});
       if (handled)
         return;
     }
@@ -203,6 +211,14 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     await this._browserContext._onRoute(route);
   }
 
+  private async _onWebSocketRoute(webSocketRoute: WebSocketRoute) {
+    const routeHandler = this._webSocketRoutes.find(route => route.matches(webSocketRoute.url()));
+    if (routeHandler)
+      await routeHandler.handle(webSocketRoute);
+    else
+      await this._browserContext._onWebSocketRoute(webSocketRoute);
+  }
+
   async _onBinding(bindingCall: BindingCall) {
     const func = this._bindings.get(bindingCall._initializer.name);
     if (func) {
@@ -261,16 +277,10 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
 
   setDefaultNavigationTimeout(timeout: number) {
     this._timeoutSettings.setDefaultNavigationTimeout(timeout);
-    this._wrapApiCall(async () => {
-      this._channel.setDefaultNavigationTimeoutNoReply({ timeout }).catch(() => {});
-    }, true);
   }
 
   setDefaultTimeout(timeout: number) {
     this._timeoutSettings.setDefaultTimeout(timeout);
-    this._wrapApiCall(async () => {
-      this._channel.setDefaultTimeoutNoReply({ timeout }).catch(() => {});
-    }, true);
   }
 
   private _forceVideo(): Video {
@@ -292,9 +302,9 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return await this._mainFrame.$(selector, options);
   }
 
-  waitForSelector(selector: string, options: channels.FrameWaitForSelectorOptions & { state: 'attached' | 'visible' }): Promise<ElementHandle<SVGElement | HTMLElement>>;
-  waitForSelector(selector: string, options?: channels.FrameWaitForSelectorOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
-  async waitForSelector(selector: string, options?: channels.FrameWaitForSelectorOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
+  waitForSelector(selector: string, options: channels.FrameWaitForSelectorOptions & TimeoutOptions & { state: 'attached' | 'visible' }): Promise<ElementHandle<SVGElement | HTMLElement>>;
+  waitForSelector(selector: string, options?: channels.FrameWaitForSelectorOptions & TimeoutOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
+  async waitForSelector(selector: string, options?: channels.FrameWaitForSelectorOptions & TimeoutOptions): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
     return await this._mainFrame.waitForSelector(selector, options);
   }
 
@@ -353,17 +363,17 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return await this._mainFrame.content();
   }
 
-  async setContent(html: string, options?: channels.FrameSetContentOptions): Promise<void> {
+  async setContent(html: string, options?: channels.FrameSetContentOptions & TimeoutOptions): Promise<void> {
     return await this._mainFrame.setContent(html, options);
   }
 
-  async goto(url: string, options?: channels.FrameGotoOptions): Promise<Response | null> {
+  async goto(url: string, options?: channels.FrameGotoOptions & TimeoutOptions): Promise<Response | null> {
     return await this._mainFrame.goto(url, options);
   }
 
-  async reload(options: channels.PageReloadOptions = {}): Promise<Response | null> {
+  async reload(options: channels.PageReloadOptions & TimeoutOptions = {}): Promise<Response | null> {
     const waitUntil = verifyLoadState('waitUntil', options.waitUntil === undefined ? 'load' : options.waitUntil);
-    return Response.fromNullable((await this._channel.reload({ ...options, waitUntil })).response);
+    return Response.fromNullable((await this._channel.reload({ ...options, waitUntil, timeout: this._timeoutSettings.navigationTimeout(options) })).response);
   }
 
   async addLocatorHandler(locator: Locator, handler: (locator: Locator) => any, options: { times?: number, noWaitAfter?: boolean } = {}): Promise<void> {
@@ -388,7 +398,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     } finally {
       if (remove)
         this._locatorHandlers.delete(uid);
-      this._wrapApiCall(() => this._channel.resolveLocatorHandlerNoReply({ uid, remove }), true).catch(() => {});
+      this._channel.resolveLocatorHandlerNoReply({ uid, remove }).catch(() => {});
     }
   }
 
@@ -401,7 +411,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     }
   }
 
-  async waitForLoadState(state?: LifecycleEvent, options?: { timeout?: number }): Promise<void> {
+  async waitForLoadState(state?: LifecycleEvent, options?: TimeoutOptions): Promise<void> {
     return await this._mainFrame.waitForLoadState(state, options);
   }
 
@@ -409,11 +419,11 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return await this._mainFrame.waitForNavigation(options);
   }
 
-  async waitForURL(url: URLMatch, options?: { waitUntil?: LifecycleEvent, timeout?: number }): Promise<void> {
+  async waitForURL(url: URLMatch, options?: TimeoutOptions & { waitUntil?: LifecycleEvent }): Promise<void> {
     return await this._mainFrame.waitForURL(url, options);
   }
 
-  async waitForRequest(urlOrPredicate: string | RegExp | ((r: Request) => boolean | Promise<boolean>), options: { timeout?: number } = {}): Promise<Request> {
+  async waitForRequest(urlOrPredicate: string | RegExp | ((r: Request) => boolean | Promise<boolean>), options: TimeoutOptions = {}): Promise<Request> {
     const predicate = async (request: Request) => {
       if (isString(urlOrPredicate) || isRegExp(urlOrPredicate))
         return urlMatches(this._browserContext._options.baseURL, request.url(), urlOrPredicate);
@@ -424,7 +434,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return await this._waitForEvent(Events.Page.Request, { predicate, timeout: options.timeout }, logLine);
   }
 
-  async waitForResponse(urlOrPredicate: string | RegExp | ((r: Response) => boolean | Promise<boolean>), options: { timeout?: number } = {}): Promise<Response> {
+  async waitForResponse(urlOrPredicate: string | RegExp | ((r: Response) => boolean | Promise<boolean>), options: TimeoutOptions = {}): Promise<Response> {
     const predicate = async (response: Response) => {
       if (isString(urlOrPredicate) || isRegExp(urlOrPredicate))
         return urlMatches(this._browserContext._options.baseURL, response.url(), urlOrPredicate);
@@ -461,22 +471,27 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     });
   }
 
-  async goBack(options: channels.PageGoBackOptions = {}): Promise<Response | null> {
+  async goBack(options: channels.PageGoBackOptions & TimeoutOptions = {}): Promise<Response | null> {
     const waitUntil = verifyLoadState('waitUntil', options.waitUntil === undefined ? 'load' : options.waitUntil);
-    return Response.fromNullable((await this._channel.goBack({ ...options, waitUntil })).response);
+    return Response.fromNullable((await this._channel.goBack({ ...options, waitUntil, timeout: this._timeoutSettings.navigationTimeout(options) })).response);
   }
 
-  async goForward(options: channels.PageGoForwardOptions = {}): Promise<Response | null> {
+  async goForward(options: channels.PageGoForwardOptions & TimeoutOptions = {}): Promise<Response | null> {
     const waitUntil = verifyLoadState('waitUntil', options.waitUntil === undefined ? 'load' : options.waitUntil);
-    return Response.fromNullable((await this._channel.goForward({ ...options, waitUntil })).response);
+    return Response.fromNullable((await this._channel.goForward({ ...options, waitUntil, timeout: this._timeoutSettings.navigationTimeout(options) })).response);
   }
 
-  async emulateMedia(options: { media?: 'screen' | 'print' | null, colorScheme?: 'dark' | 'light' | 'no-preference' | null, reducedMotion?: 'reduce' | 'no-preference' | null, forcedColors?: 'active' | 'none' | null } = {}) {
+  async requestGC() {
+    await this._channel.requestGC();
+  }
+
+  async emulateMedia(options: { media?: 'screen' | 'print' | null, colorScheme?: 'dark' | 'light' | 'no-preference' | null, reducedMotion?: 'reduce' | 'no-preference' | null, forcedColors?: 'active' | 'none' | null, contrast?: 'no-preference' | 'more' | null } = {}) {
     await this._channel.emulateMedia({
       media: options.media === null ? 'no-override' : options.media,
       colorScheme: options.colorScheme === null ? 'no-override' : options.colorScheme,
       reducedMotion: options.reducedMotion === null ? 'no-override' : options.reducedMotion,
       forcedColors: options.forcedColors === null ? 'no-override' : options.forcedColors,
+      contrast: options.contrast === null ? 'no-override' : options.contrast,
     });
   }
 
@@ -486,7 +501,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
   }
 
   viewportSize(): Size | null {
-    return this._viewportSize;
+    return this._viewportSize || null;
   }
 
   async evaluate<R, Arg>(pageFunction: structs.PageFunction<Arg, R>, arg?: Arg): Promise<R> {
@@ -494,26 +509,38 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return await this._mainFrame.evaluate(pageFunction, arg);
   }
 
+  async _evaluateFunction(functionDeclaration: string) {
+    return this._mainFrame._evaluateFunction(functionDeclaration);
+  }
+
   async addInitScript(script: Function | string | { path?: string, content?: string }, arg?: any) {
-    const source = await evaluationScript(script, arg);
+    const source = await evaluationScript(this._platform, script, arg);
     await this._channel.addInitScript({ source });
   }
 
   async route(url: URLMatch, handler: RouteHandlerCallback, options: { times?: number } = {}): Promise<void> {
-    this._routes.unshift(new RouteHandler(this._browserContext._options.baseURL, url, handler, options.times));
-    await this._updateInterceptionPatterns();
+    this._routes.unshift(new RouteHandler(this._platform, this._browserContext._options.baseURL, url, handler, options.times));
+    await this._updateInterceptionPatterns({ title: 'Route requests' });
   }
 
   async routeFromHAR(har: string, options: { url?: string | RegExp, notFound?: 'abort' | 'fallback', update?: boolean, updateContent?: 'attach' | 'embed', updateMode?: 'minimal' | 'full'} = {}): Promise<void> {
+    const localUtils = this._connection.localUtils();
+    if (!localUtils)
+      throw new Error('Route from har is not supported in thin clients');
     if (options.update) {
       await this._browserContext._recordIntoHAR(har, this, options);
       return;
     }
-    const harRouter = await HarRouter.create(this._connection.localUtils(), har, options.notFound || 'abort', { urlMatch: options.url });
+    const harRouter = await HarRouter.create(localUtils, har, options.notFound || 'abort', { urlMatch: options.url });
     this._harRouters.push(harRouter);
     await harRouter.addPageRoute(this);
   }
 
+  async routeWebSocket(url: URLMatch, handler: WebSocketRouteHandlerCallback): Promise<void> {
+    this._webSocketRoutes.unshift(new WebSocketRouteHandler(this._browserContext._options.baseURL, url, handler));
+    await this._updateWebSocketInterceptionPatterns({ title: 'Route WebSockets' });
+  }
+
   private _disposeHarRouters() {
     this._harRouters.forEach(router => router.dispose());
     this._harRouters = [];
@@ -538,37 +565,43 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
 
   private async _unrouteInternal(removed: RouteHandler[], remaining: RouteHandler[], behavior?: 'wait'|'ignoreErrors'|'default'): Promise<void> {
     this._routes = remaining;
-    await this._updateInterceptionPatterns();
-    if (!behavior || behavior === 'default')
-      return;
-    const promises = removed.map(routeHandler => routeHandler.stop(behavior));
-    await Promise.all(promises);
+    if (behavior && behavior !== 'default') {
+      const promises = removed.map(routeHandler => routeHandler.stop(behavior));
+      await Promise.all(promises);
+    }
+    await this._updateInterceptionPatterns({ title: 'Unroute requests' });
   }
 
-  private async _updateInterceptionPatterns() {
+  private async _updateInterceptionPatterns(options: { internal: true } | { title: string }) {
     const patterns = RouteHandler.prepareInterceptionPatterns(this._routes);
-    await this._channel.setNetworkInterceptionPatterns({ patterns });
+    await this._wrapApiCall(() => this._channel.setNetworkInterceptionPatterns({ patterns }), options);
   }
 
-  async screenshot(options: Omit<channels.PageScreenshotOptions, 'mask'> & { path?: string, mask?: Locator[] } = {}): Promise<Buffer> {
-    const copy: channels.PageScreenshotOptions = { ...options, mask: undefined };
+  private async _updateWebSocketInterceptionPatterns(options: { internal: true } | { title: string }) {
+    const patterns = WebSocketRouteHandler.prepareInterceptionPatterns(this._webSocketRoutes);
+    await this._wrapApiCall(() => this._channel.setWebSocketInterceptionPatterns({ patterns }), options);
+  }
+
+  async screenshot(options: Omit<channels.PageScreenshotOptions, 'mask'> & TimeoutOptions & { path?: string, mask?: api.Locator[] } = {}): Promise<Buffer> {
+    const mask = options.mask as Locator[] | undefined;
+    const copy: channels.PageScreenshotParams = { ...options, mask: undefined, timeout: this._timeoutSettings.timeout(options) };
     if (!copy.type)
       copy.type = determineScreenshotType(options);
-    if (options.mask) {
-      copy.mask = options.mask.map(locator => ({
+    if (mask) {
+      copy.mask = mask.map(locator => ({
         frame: locator._frame._channel,
         selector: locator._selector,
       }));
     }
     const result = await this._channel.screenshot(copy);
     if (options.path) {
-      await mkdirIfNeeded(options.path);
-      await fs.promises.writeFile(options.path, result.binary);
+      await mkdirIfNeeded(this._platform, options.path);
+      await this._platform.fs().promises.writeFile(options.path, result.binary);
     }
     return result.binary;
   }
 
-  async _expectScreenshot(options: ExpectScreenshotOptions): Promise<{ actual?: Buffer, previous?: Buffer, diff?: Buffer, errorMessage?: string, log?: string[]}> {
+  async _expectScreenshot(options: ExpectScreenshotOptions): Promise<{ actual?: Buffer, previous?: Buffer, diff?: Buffer, errorMessage?: string, log?: string[], timedOut?: boolean}> {
     const mask = options?.mask ? options?.mask.map(locator => ({
       frame: (locator as Locator)._frame._channel,
       selector: (locator as Locator)._selector,
@@ -616,23 +649,23 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return this._closed;
   }
 
-  async click(selector: string, options?: channels.FrameClickOptions) {
+  async click(selector: string, options?: channels.FrameClickOptions & TimeoutOptions) {
     return await this._mainFrame.click(selector, options);
   }
 
-  async dragAndDrop(source: string, target: string, options?: channels.FrameDragAndDropOptions) {
+  async dragAndDrop(source: string, target: string, options?: channels.FrameDragAndDropOptions & TimeoutOptions) {
     return await this._mainFrame.dragAndDrop(source, target, options);
   }
 
-  async dblclick(selector: string, options?: channels.FrameDblclickOptions) {
-    return await this._mainFrame.dblclick(selector, options);
+  async dblclick(selector: string, options?: channels.FrameDblclickOptions & TimeoutOptions) {
+    await this._mainFrame.dblclick(selector, options);
   }
 
-  async tap(selector: string, options?: channels.FrameTapOptions) {
+  async tap(selector: string, options?: channels.FrameTapOptions & TimeoutOptions) {
     return await this._mainFrame.tap(selector, options);
   }
 
-  async fill(selector: string, value: string, options?: channels.FrameFillOptions) {
+  async fill(selector: string, value: string, options?: channels.FrameFillOptions & TimeoutOptions) {
     return await this._mainFrame.fill(selector, value, options);
   }
 
@@ -672,55 +705,55 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return this.mainFrame().frameLocator(selector);
   }
 
-  async focus(selector: string, options?: channels.FrameFocusOptions) {
+  async focus(selector: string, options?: channels.FrameFocusOptions & TimeoutOptions) {
     return await this._mainFrame.focus(selector, options);
   }
 
-  async textContent(selector: string, options?: channels.FrameTextContentOptions): Promise<null|string> {
+  async textContent(selector: string, options?: channels.FrameTextContentOptions & TimeoutOptions): Promise<null|string> {
     return await this._mainFrame.textContent(selector, options);
   }
 
-  async innerText(selector: string, options?: channels.FrameInnerTextOptions): Promise<string> {
+  async innerText(selector: string, options?: channels.FrameInnerTextOptions & TimeoutOptions): Promise<string> {
     return await this._mainFrame.innerText(selector, options);
   }
 
-  async innerHTML(selector: string, options?: channels.FrameInnerHTMLOptions): Promise<string> {
+  async innerHTML(selector: string, options?: channels.FrameInnerHTMLOptions & TimeoutOptions): Promise<string> {
     return await this._mainFrame.innerHTML(selector, options);
   }
 
-  async getAttribute(selector: string, name: string, options?: channels.FrameGetAttributeOptions): Promise<string | null> {
+  async getAttribute(selector: string, name: string, options?: channels.FrameGetAttributeOptions & TimeoutOptions): Promise<string | null> {
     return await this._mainFrame.getAttribute(selector, name, options);
   }
 
-  async inputValue(selector: string, options?: channels.FrameInputValueOptions): Promise<string> {
+  async inputValue(selector: string, options?: channels.FrameInputValueOptions & TimeoutOptions): Promise<string> {
     return await this._mainFrame.inputValue(selector, options);
   }
 
-  async isChecked(selector: string, options?: channels.FrameIsCheckedOptions): Promise<boolean> {
+  async isChecked(selector: string, options?: channels.FrameIsCheckedOptions & TimeoutOptions): Promise<boolean> {
     return await this._mainFrame.isChecked(selector, options);
   }
 
-  async isDisabled(selector: string, options?: channels.FrameIsDisabledOptions): Promise<boolean> {
+  async isDisabled(selector: string, options?: channels.FrameIsDisabledOptions & TimeoutOptions): Promise<boolean> {
     return await this._mainFrame.isDisabled(selector, options);
   }
 
-  async isEditable(selector: string, options?: channels.FrameIsEditableOptions): Promise<boolean> {
+  async isEditable(selector: string, options?: channels.FrameIsEditableOptions & TimeoutOptions): Promise<boolean> {
     return await this._mainFrame.isEditable(selector, options);
   }
 
-  async isEnabled(selector: string, options?: channels.FrameIsEnabledOptions): Promise<boolean> {
+  async isEnabled(selector: string, options?: channels.FrameIsEnabledOptions & TimeoutOptions): Promise<boolean> {
     return await this._mainFrame.isEnabled(selector, options);
   }
 
-  async isHidden(selector: string, options?: channels.FrameIsHiddenOptions): Promise<boolean> {
+  async isHidden(selector: string, options?: channels.FrameIsHiddenOptions & TimeoutOptions): Promise<boolean> {
     return await this._mainFrame.isHidden(selector, options);
   }
 
-  async isVisible(selector: string, options?: channels.FrameIsVisibleOptions): Promise<boolean> {
+  async isVisible(selector: string, options?: channels.FrameIsVisibleOptions & TimeoutOptions): Promise<boolean> {
     return await this._mainFrame.isVisible(selector, options);
   }
 
-  async hover(selector: string, options?: channels.FrameHoverOptions) {
+  async hover(selector: string, options?: channels.FrameHoverOptions & TimeoutOptions) {
     return await this._mainFrame.hover(selector, options);
   }
 
@@ -728,27 +761,27 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return await this._mainFrame.selectOption(selector, values, options);
   }
 
-  async setInputFiles(selector: string, files: string | FilePayload | string[] | FilePayload[], options?: channels.FrameSetInputFilesOptions): Promise<void> {
+  async setInputFiles(selector: string, files: string | FilePayload | string[] | FilePayload[], options?: channels.FrameSetInputFilesOptions & TimeoutOptions): Promise<void> {
     return await this._mainFrame.setInputFiles(selector, files, options);
   }
 
-  async type(selector: string, text: string, options?: channels.FrameTypeOptions) {
+  async type(selector: string, text: string, options?: channels.FrameTypeOptions & TimeoutOptions) {
     return await this._mainFrame.type(selector, text, options);
   }
 
-  async press(selector: string, key: string, options?: channels.FramePressOptions) {
+  async press(selector: string, key: string, options?: channels.FramePressOptions & TimeoutOptions) {
     return await this._mainFrame.press(selector, key, options);
   }
 
-  async check(selector: string, options?: channels.FrameCheckOptions) {
+  async check(selector: string, options?: channels.FrameCheckOptions & TimeoutOptions) {
     return await this._mainFrame.check(selector, options);
   }
 
-  async uncheck(selector: string, options?: channels.FrameUncheckOptions) {
+  async uncheck(selector: string, options?: channels.FrameUncheckOptions & TimeoutOptions) {
     return await this._mainFrame.uncheck(selector, options);
   }
 
-  async setChecked(selector: string, checked: boolean, options?: channels.FrameCheckOptions) {
+  async setChecked(selector: string, checked: boolean, options?: channels.FrameCheckOptions & TimeoutOptions) {
     return await this._mainFrame.setChecked(selector, checked, options);
   }
 
@@ -764,14 +797,14 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     return [...this._workers];
   }
 
-  async pause() {
-    if (require('inspector').url())
+  async pause(_options?: { __testHookKeepTestTimeout: boolean }) {
+    if (this._platform.isJSDebuggerAttached())
       return;
     const defaultNavigationTimeout = this._browserContext._timeoutSettings.defaultNavigationTimeout();
     const defaultTimeout = this._browserContext._timeoutSettings.defaultTimeout();
     this._browserContext.setDefaultNavigationTimeout(0);
     this._browserContext.setDefaultTimeout(0);
-    this._instrumentation?.onWillPause();
+    this._instrumentation?.onWillPause({ keepTestTimeout: !!_options?.__testHookKeepTestTimeout });
     await this._closedOrCrashedScope.safeRace(this.context()._channel.pause());
     this._browserContext.setDefaultNavigationTimeout(defaultNavigationTimeout);
     this._browserContext.setDefaultTimeout(defaultTimeout);
@@ -792,11 +825,17 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
     }
     const result = await this._channel.pdf(transportOptions);
     if (options.path) {
-      await fs.promises.mkdir(path.dirname(options.path), { recursive: true });
-      await fs.promises.writeFile(options.path, result.pdf);
+      const platform = this._platform;
+      await platform.fs().promises.mkdir(platform.path().dirname(options.path), { recursive: true });
+      await platform.fs().promises.writeFile(options.path, result.pdf);
     }
     return result.pdf;
   }
+
+  async _snapshotForAI(options: TimeoutOptions = {}): Promise<string> {
+    const result = await this._channel.snapshotForAI({ timeout: this._timeoutSettings.timeout(options) });
+    return result.snapshot;
+  }
 }
 
 export class BindingCall extends ChannelOwner<channels.BindingCallChannel> {
diff --git a/packages/playwright-core/src/client/platform.ts b/packages/playwright-core/src/client/platform.ts
new file mode 100644
index 0000000000000..5228e8a3580ad
--- /dev/null
+++ b/packages/playwright-core/src/client/platform.ts
@@ -0,0 +1,123 @@
+/**
+ * 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 { webColors } from '../utils/isomorphic/colors';
+
+import type * as fs from 'fs';
+import type * as path from 'path';
+import type { Readable, Writable } from 'stream';
+import type { Colors } from '@isomorphic/colors';
+import type * as channels from '@protocol/channels';
+
+export type Zone = {
+  push(data: unknown): Zone;
+  pop(): Zone;
+  run<R>(func: () => R): R;
+  data<T>(): T | undefined;
+};
+
+const noopZone: Zone = {
+  push: () => noopZone,
+  pop: () => noopZone,
+  run: func => func(),
+  data: () => undefined,
+};
+
+export type Platform = {
+  name: 'node' | 'web' | 'empty';
+
+  boxedStackPrefixes: () => string[];
+  calculateSha1: (text: string) => Promise<string>;
+  colors: Colors;
+  coreDir?: string;
+  createGuid: () => string;
+  defaultMaxListeners: () => number;
+  env: Record<string, string | undefined>;
+  fs: () => typeof fs;
+  inspectCustom: symbol | undefined;
+  isDebugMode: () => boolean;
+  isJSDebuggerAttached: () => boolean;
+  isLogEnabled: (name: 'api' | 'channel') => boolean;
+  isUnderTest: () => boolean,
+  log: (name: 'api' | 'channel', message: string | Error | object) => void;
+  path: () => typeof path;
+  pathSeparator: string;
+  showInternalStackFrames: () => boolean,
+  streamFile: (path: string, writable: Writable) => Promise<void>,
+  streamReadable: (channel: channels.StreamChannel) => Readable,
+  streamWritable: (channel: channels.WritableStreamChannel) => Writable,
+  zones: { empty: Zone, current: () => Zone; };
+};
+
+export const emptyPlatform: Platform = {
+  name: 'empty',
+
+  boxedStackPrefixes: () => [],
+
+  calculateSha1: async () => {
+    throw new Error('Not implemented');
+  },
+
+  colors: webColors,
+
+  createGuid: () => {
+    throw new Error('Not implemented');
+  },
+
+  defaultMaxListeners: () => 10,
+
+  env: {},
+
+  fs: () => {
+    throw new Error('Not implemented');
+  },
+
+  inspectCustom: undefined,
+
+  isDebugMode: () => false,
+
+  isJSDebuggerAttached: () => false,
+
+  isLogEnabled(name: 'api' | 'channel') {
+    return false;
+  },
+
+  isUnderTest: () => false,
+
+  log(name: 'api' | 'channel', message: string | Error | object) { },
+
+  path: () => {
+    throw new Error('Function not implemented.');
+  },
+
+  pathSeparator: '/',
+
+  showInternalStackFrames: () => false,
+
+  streamFile(path: string, writable: Writable): Promise<void> {
+    throw new Error('Streams are not available');
+  },
+
+  streamReadable: (channel: channels.StreamChannel) => {
+    throw new Error('Streams are not available');
+  },
+
+  streamWritable: (channel: channels.WritableStreamChannel) => {
+    throw new Error('Streams are not available');
+  },
+
+  zones: { empty: noopZone, current: () => noopZone },
+};
diff --git a/packages/playwright-core/src/client/playwright.ts b/packages/playwright-core/src/client/playwright.ts
index 593e0bd49fe2d..48c6349080f15 100644
--- a/packages/playwright-core/src/client/playwright.ts
+++ b/packages/playwright-core/src/client/playwright.ts
@@ -14,18 +14,23 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import { TimeoutError } from './errors';
 import { Android } from './android';
+import { Browser } from './browser';
 import { BrowserType } from './browserType';
 import { ChannelOwner } from './channelOwner';
 import { Electron } from './electron';
+import { TimeoutError } from './errors';
 import { APIRequest } from './fetch';
-import { Selectors, SelectorsOwner } from './selectors';
+import { Selectors } from './selectors';
+
+import type * as channels from '@protocol/channels';
+import type { BrowserContextOptions, LaunchOptions } from 'playwright-core';
 
 export class Playwright extends ChannelOwner<channels.PlaywrightChannel> {
   readonly _android: Android;
   readonly _electron: Electron;
+  readonly _bidiChromium: BrowserType;
+  readonly _bidiFirefox: BrowserType;
   readonly chromium: BrowserType;
   readonly firefox: BrowserType;
   readonly webkit: BrowserType;
@@ -34,6 +39,12 @@ export class Playwright extends ChannelOwner<channels.PlaywrightChannel> {
   readonly request: APIRequest;
   readonly errors: { TimeoutError: typeof TimeoutError };
 
+  // Instrumentation.
+  _defaultLaunchOptions?: LaunchOptions;
+  _defaultContextOptions?: BrowserContextOptions;
+  _defaultContextTimeout?: number;
+  _defaultContextNavigationTimeout?: number;
+
   constructor(parent: ChannelOwner, type: string, guid: string, initializer: channels.PlaywrightInitializer) {
     super(parent, type, guid, initializer);
     this.request = new APIRequest(this);
@@ -44,27 +55,37 @@ export class Playwright extends ChannelOwner<channels.PlaywrightChannel> {
     this.webkit = BrowserType.from(initializer.webkit);
     this.webkit._playwright = this;
     this._android = Android.from(initializer.android);
+    this._android._playwright = this;
     this._electron = Electron.from(initializer.electron);
+    this._electron._playwright = this;
+    this._bidiChromium = BrowserType.from(initializer._bidiChromium);
+    this._bidiChromium._playwright = this;
+    this._bidiFirefox = BrowserType.from(initializer._bidiFirefox);
+    this._bidiFirefox._playwright = this;
     this.devices = this._connection.localUtils()?.devices ?? {};
-    this.selectors = new Selectors();
+    this.selectors = new Selectors(this._connection._platform);
     this.errors = { TimeoutError };
+  }
 
-    const selectorsOwner = SelectorsOwner.from(initializer.selectors);
-    this.selectors._addChannel(selectorsOwner);
-    this._connection.on('close', () => {
-      this.selectors._removeChannel(selectorsOwner);
-    });
-    (global as any)._playwrightInstance = this;
+  static from(channel: channels.PlaywrightChannel): Playwright {
+    return (channel as any)._object;
   }
 
-  _setSelectors(selectors: Selectors) {
-    const selectorsOwner = SelectorsOwner.from(this._initializer.selectors);
-    this.selectors._removeChannel(selectorsOwner);
-    this.selectors = selectors;
-    this.selectors._addChannel(selectorsOwner);
+  private _browserTypes(): BrowserType[] {
+    return [this.chromium, this.firefox, this.webkit, this._bidiChromium, this._bidiFirefox];
   }
 
-  static from(channel: channels.PlaywrightChannel): Playwright {
-    return (channel as any)._object;
+  _preLaunchedBrowser(): Browser {
+    const browser = Browser.from(this._initializer.preLaunchedBrowser!);
+    browser._connectToBrowserType(this[browser._name as 'chromium' | 'firefox' | 'webkit'], {}, undefined);
+    return browser;
+  }
+
+  _allContexts() {
+    return this._browserTypes().flatMap(type => [...type._contexts]);
+  }
+
+  _allPages() {
+    return this._allContexts().flatMap(context => context.pages());
   }
 }
diff --git a/packages/playwright-core/src/client/selectors.ts b/packages/playwright-core/src/client/selectors.ts
index 2739be0e8dc06..3a34cef5a96ff 100644
--- a/packages/playwright-core/src/client/selectors.ts
+++ b/packages/playwright-core/src/client/selectors.ts
@@ -15,46 +15,43 @@
  */
 
 import { evaluationScript } from './clientHelper';
-import type * as channels from '@protocol/channels';
-import { ChannelOwner } from './channelOwner';
+import { setTestIdAttribute } from './locator';
+
 import type { SelectorEngine } from './types';
 import type * as api from '../../types/types';
-import { setTestIdAttribute, testIdAttributeName } from './locator';
+import type * as channels from '@protocol/channels';
+import type { BrowserContext } from './browserContext';
+import type { Platform } from './platform';
 
 export class Selectors implements api.Selectors {
-  private _channels = new Set<SelectorsOwner>();
-  private _registrations: channels.SelectorsRegisterParams[] = [];
+  private _platform: Platform;
+  private _selectorEngines: channels.SelectorEngine[] = [];
+  private _testIdAttributeName: string | undefined;
+  readonly _contextsForSelectors = new Set<BrowserContext>();
 
-  async register(name: string, script: string | (() => SelectorEngine) | { path?: string, content?: string }, options: { contentScript?: boolean } = {}): Promise<void> {
-    const source = await evaluationScript(script, undefined, false);
-    const params = { ...options, name, source };
-    for (const channel of this._channels)
-      await channel._channel.register(params);
-    this._registrations.push(params);
+  constructor(platform: Platform) {
+    this._platform = platform;
   }
 
-  setTestIdAttribute(attributeName: string) {
-    setTestIdAttribute(attributeName);
-    for (const channel of this._channels)
-      channel._channel.setTestIdAttributeName({ testIdAttributeName: attributeName }).catch(() => {});
-  }
+  async register(name: string, script: string | (() => SelectorEngine) | { path?: string, content?: string }, options: { contentScript?: boolean } = {}): Promise<void> {
+    if (this._selectorEngines.some(engine => engine.name === name))
+      throw new Error(`selectors.register: "${name}" selector engine has been already registered`);
 
-  _addChannel(channel: SelectorsOwner) {
-    this._channels.add(channel);
-    for (const params of this._registrations) {
-      // This should not fail except for connection closure, but just in case we catch.
-      channel._channel.register(params).catch(() => {});
-      channel._channel.setTestIdAttributeName({ testIdAttributeName: testIdAttributeName() }).catch(() => {});
-    }
+    const source = await evaluationScript(this._platform, script, undefined, false);
+    const selectorEngine: channels.SelectorEngine = { ...options, name, source };
+    for (const context of this._contextsForSelectors)
+      await context._channel.registerSelectorEngine({ selectorEngine });
+    this._selectorEngines.push(selectorEngine);
   }
 
-  _removeChannel(channel: SelectorsOwner) {
-    this._channels.delete(channel);
+  setTestIdAttribute(attributeName: string) {
+    this._testIdAttributeName = attributeName;
+    setTestIdAttribute(attributeName);
+    for (const context of this._contextsForSelectors)
+      context._channel.setTestIdAttributeName({ testIdAttributeName: attributeName }).catch(() => {});
   }
-}
 
-export class SelectorsOwner extends ChannelOwner<channels.SelectorsChannel> {
-  static from(browser: channels.SelectorsChannel): SelectorsOwner {
-    return (browser as any)._object;
+  _withSelectorOptions<T>(options: T) {
+    return { ...options, selectorEngines: this._selectorEngines, testIdAttributeName: this._testIdAttributeName };
   }
 }
diff --git a/packages/playwright-core/src/client/stream.ts b/packages/playwright-core/src/client/stream.ts
index bb202ac4ad4ac..97c1e4b634351 100644
--- a/packages/playwright-core/src/client/stream.ts
+++ b/packages/playwright-core/src/client/stream.ts
@@ -15,9 +15,11 @@
  */
 
 import { Readable } from 'stream';
-import type * as channels from '@protocol/channels';
+
 import { ChannelOwner } from './channelOwner';
 
+import type * as channels from '@protocol/channels';
+
 export class Stream extends ChannelOwner<channels.StreamChannel> {
   static from(Stream: channels.StreamChannel): Stream {
     return (Stream as any)._object;
@@ -28,29 +30,6 @@ export class Stream extends ChannelOwner<channels.StreamChannel> {
   }
 
   stream(): Readable {
-    return new StreamImpl(this._channel);
-  }
-}
-
-class StreamImpl extends Readable {
-  private _channel: channels.StreamChannel;
-
-  constructor(channel: channels.StreamChannel) {
-    super();
-    this._channel = channel;
-  }
-
-  override async _read() {
-    const result = await this._channel.read({ size: 1024 * 1024 });
-    if (result.binary.byteLength)
-      this.push(result.binary);
-    else
-      this.push(null);
-  }
-
-  override _destroy(error: Error | null, callback: (error: Error | null | undefined) => void): void {
-    // Stream might be destroyed after the connection was closed.
-    this._channel.close().catch(e => null);
-    super._destroy(error, callback);
+    return this._platform.streamReadable(this._channel);
   }
 }
diff --git a/packages/playwright-core/src/common/timeoutSettings.ts b/packages/playwright-core/src/client/timeoutSettings.ts
similarity index 76%
rename from packages/playwright-core/src/common/timeoutSettings.ts
rename to packages/playwright-core/src/client/timeoutSettings.ts
index 65c8be1ecf265..5e5034dcbb21d 100644
--- a/packages/playwright-core/src/common/timeoutSettings.ts
+++ b/packages/playwright-core/src/client/timeoutSettings.ts
@@ -15,18 +15,19 @@
  * limitations under the License.
  */
 
-import { debugMode } from '../utils';
+import { DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT, DEFAULT_PLAYWRIGHT_TIMEOUT } from '../utils/isomorphic/time';
 
-export const DEFAULT_TIMEOUT = 30000;
-export const DEFAULT_LAUNCH_TIMEOUT = 3 * 60 * 1000; // 3 minutes
+import type { Platform } from './platform';
 
 export class TimeoutSettings {
   private _parent: TimeoutSettings | undefined;
   private _defaultTimeout: number | undefined;
   private _defaultNavigationTimeout: number | undefined;
+  private _platform: Platform;
 
-  constructor(parent?: TimeoutSettings) {
+  constructor(platform: Platform, parent?: TimeoutSettings) {
     this._parent = parent;
+    this._platform = platform;
   }
 
   setDefaultTimeout(timeout: number | undefined) {
@@ -50,40 +51,34 @@ export class TimeoutSettings {
       return options.timeout;
     if (this._defaultNavigationTimeout !== undefined)
       return this._defaultNavigationTimeout;
-    if (debugMode())
+    if (this._platform.isDebugMode())
       return 0;
     if (this._defaultTimeout !== undefined)
       return this._defaultTimeout;
     if (this._parent)
       return this._parent.navigationTimeout(options);
-    return DEFAULT_TIMEOUT;
+    return DEFAULT_PLAYWRIGHT_TIMEOUT;
   }
 
   timeout(options: { timeout?: number }): number {
     if (typeof options.timeout === 'number')
       return options.timeout;
-    if (debugMode())
+    if (this._platform.isDebugMode())
       return 0;
     if (this._defaultTimeout !== undefined)
       return this._defaultTimeout;
     if (this._parent)
       return this._parent.timeout(options);
-    return DEFAULT_TIMEOUT;
+    return DEFAULT_PLAYWRIGHT_TIMEOUT;
   }
 
-  static timeout(options: { timeout?: number }): number {
+  launchTimeout(options: { timeout?: number }): number {
     if (typeof options.timeout === 'number')
       return options.timeout;
-    if (debugMode())
+    if (this._platform.isDebugMode())
       return 0;
-    return DEFAULT_TIMEOUT;
-  }
-
-  static launchTimeout(options: { timeout?: number }): number {
-    if (typeof options.timeout === 'number')
-      return options.timeout;
-    if (debugMode())
-      return 0;
-    return DEFAULT_LAUNCH_TIMEOUT;
+    if (this._parent)
+      return this._parent.launchTimeout(options);
+    return DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT;
   }
 }
diff --git a/packages/playwright-core/src/client/tracing.ts b/packages/playwright-core/src/client/tracing.ts
index 7330cd9f269bd..536d1673b8a6c 100644
--- a/packages/playwright-core/src/client/tracing.ts
+++ b/packages/playwright-core/src/client/tracing.ts
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import type * as api from '../../types/types';
-import type * as channels from '@protocol/channels';
 import { Artifact } from './artifact';
 import { ChannelOwner } from './channelOwner';
 
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
+
 export class Tracing extends ChannelOwner<channels.TracingChannel> implements api.Tracing {
   private _includeSources = false;
   _tracesDir: string | undefined;
@@ -34,23 +35,32 @@ export class Tracing extends ChannelOwner<channels.TracingChannel> implements ap
   }
 
   async start(options: { name?: string, title?: string, snapshots?: boolean, screenshots?: boolean, sources?: boolean, _live?: boolean } = {}) {
-    this._includeSources = !!options.sources;
-    const traceName = await this._wrapApiCall(async () => {
+    await this._wrapApiCall(async () => {
+      this._includeSources = !!options.sources;
       await this._channel.tracingStart({
         name: options.name,
         snapshots: options.snapshots,
         screenshots: options.screenshots,
         live: options._live,
       });
-      const response = await this._channel.tracingStartChunk({ name: options.name, title: options.title });
-      return response.traceName;
-    }, true);
-    await this._startCollectingStacks(traceName);
+      const { traceName } = await this._channel.tracingStartChunk({ name: options.name, title: options.title });
+      await this._startCollectingStacks(traceName);
+    });
   }
 
   async startChunk(options: { name?: string, title?: string } = {}) {
-    const { traceName } = await this._channel.tracingStartChunk(options);
-    await this._startCollectingStacks(traceName);
+    await this._wrapApiCall(async () => {
+      const { traceName } = await this._channel.tracingStartChunk(options);
+      await this._startCollectingStacks(traceName);
+    });
+  }
+
+  async group(name: string, options: { location?: { file: string, line?: number, column?: number } } = {}) {
+    await this._channel.tracingGroup({ name, location: options.location });
+  }
+
+  async groupEnd() {
+    await this._channel.tracingGroupEnd();
   }
 
   private async _startCollectingStacks(traceName: string) {
@@ -58,21 +68,21 @@ export class Tracing extends ChannelOwner<channels.TracingChannel> implements ap
       this._isTracing = true;
       this._connection.setIsTracing(true);
     }
-    const result = await this._connection.localUtils()._channel.tracingStarted({ tracesDir: this._tracesDir, traceName });
-    this._stacksId = result.stacksId;
+    const result = await this._connection.localUtils()?.tracingStarted({ tracesDir: this._tracesDir, traceName });
+    this._stacksId = result?.stacksId;
   }
 
   async stopChunk(options: { path?: string } = {}) {
     await this._wrapApiCall(async () => {
       await this._doStopChunk(options.path);
-    }, true);
+    });
   }
 
   async stop(options: { path?: string } = {}) {
     await this._wrapApiCall(async () => {
       await this._doStopChunk(options.path);
       await this._channel.tracingStop();
-    }, true);
+    });
   }
 
   private async _doStopChunk(filePath: string | undefined) {
@@ -82,15 +92,19 @@ export class Tracing extends ChannelOwner<channels.TracingChannel> implements ap
       // Not interested in artifacts.
       await this._channel.tracingStopChunk({ mode: 'discard' });
       if (this._stacksId)
-        await this._connection.localUtils()._channel.traceDiscarded({ stacksId: this._stacksId });
+        await this._connection.localUtils()!.traceDiscarded({ stacksId: this._stacksId });
       return;
     }
 
+    const localUtils = this._connection.localUtils();
+    if (!localUtils)
+      throw new Error('Cannot save trace in thin clients');
+
     const isLocal = !this._connection.isRemote();
 
     if (isLocal) {
       const result = await this._channel.tracingStopChunk({ mode: 'entries' });
-      await this._connection.localUtils()._channel.zip({ zipFile: filePath, entries: result.entries!, mode: 'write', stacksId: this._stacksId, includeSources: this._includeSources });
+      await localUtils.zip({ zipFile: filePath, entries: result.entries!, mode: 'write', stacksId: this._stacksId, includeSources: this._includeSources });
       return;
     }
 
@@ -99,7 +113,7 @@ export class Tracing extends ChannelOwner<channels.TracingChannel> implements ap
     // The artifact may be missing if the browser closed while stopping tracing.
     if (!result.artifact) {
       if (this._stacksId)
-        await this._connection.localUtils()._channel.traceDiscarded({ stacksId: this._stacksId });
+        await localUtils.traceDiscarded({ stacksId: this._stacksId });
       return;
     }
 
@@ -108,7 +122,7 @@ export class Tracing extends ChannelOwner<channels.TracingChannel> implements ap
     await artifact.saveAs(filePath);
     await artifact.delete();
 
-    await this._connection.localUtils()._channel.zip({ zipFile: filePath, entries: [], mode: 'append', stacksId: this._stacksId, includeSources: this._includeSources });
+    await localUtils.zip({ zipFile: filePath, entries: [], mode: 'append', stacksId: this._stacksId, includeSources: this._includeSources });
   }
 
   _resetStackCounter() {
diff --git a/packages/playwright-core/src/client/types.ts b/packages/playwright-core/src/client/types.ts
index 1eb28f38c9c29..bcdf728423a89 100644
--- a/packages/playwright-core/src/client/types.ts
+++ b/packages/playwright-core/src/client/types.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
+import type { Size } from '../utils/isomorphic/types';
 import type * as channels from '@protocol/channels';
-import type { Size } from '../common/types';
-export type { Size, Point, Rect, Quad, URLMatch, TimeoutOptions, HeadersArray } from '../common/types';
+export type { HeadersArray, Point, Quad, Rect, Size } from '../utils/isomorphic/types';
 
 type LoggerSeverity = 'verbose' | 'info' | 'warning' | 'error';
 export interface Logger {
@@ -25,23 +25,24 @@ export interface Logger {
   log(name: string, severity: LoggerSeverity, message: string | Error, args: any[], hints: { color?: string }): void;
 }
 
+export type TimeoutOptions = { timeout?: number };
 export type StrictOptions = { strict?: boolean };
 export type Headers = { [key: string]: string };
 export type Env = { [key: string]: string | number | boolean | undefined };
 
-export type WaitForEventOptions = Function | { predicate?: Function, timeout?: number };
-export type WaitForFunctionOptions = { timeout?: number, polling?: 'raf' | number };
+export type WaitForEventOptions = Function | TimeoutOptions & { predicate?: Function };
+export type WaitForFunctionOptions = TimeoutOptions & { polling?: 'raf' | number };
 
 export type SelectOption = { value?: string, label?: string, index?: number, valueOrLabel?: string };
-export type SelectOptionOptions = { force?: boolean, timeout?: number, noWaitAfter?: boolean };
+export type SelectOptionOptions = TimeoutOptions & { force?: boolean };
 export type FilePayload = { name: string, mimeType: string, buffer: Buffer };
 export type StorageState = {
   cookies: channels.NetworkCookie[],
-  origins: channels.OriginStorage[]
+  origins: (Omit<channels.OriginStorage, 'indexedDB'>)[],
 };
 export type SetStorageState = {
   cookies?: channels.SetNetworkCookie[],
-  origins?: channels.OriginStorage[]
+  origins?: (Omit<channels.SetOriginStorage, 'indexedDB'> & { indexedDB?: unknown[] })[]
 };
 
 export type LifecycleEvent = channels.LifecycleEvent;
@@ -49,13 +50,16 @@ export const kLifecycleEvents: Set<LifecycleEvent> = new Set(['load', 'domconten
 
 export type ClientCertificate = {
   origin: string;
+  cert?: Buffer;
   certPath?: string;
+  key?: Buffer;
   keyPath?: string;
+  pfx?: Buffer;
   pfxPath?: string;
   passphrase?: string;
 };
 
-export type BrowserContextOptions = Omit<channels.BrowserNewContextOptions, 'viewport' | 'noDefaultViewport' | 'extraHTTPHeaders' | 'clientCertificates' | 'storageState' | 'recordHar' | 'colorScheme' | 'reducedMotion' | 'forcedColors' | 'acceptDownloads'> & {
+export type BrowserContextOptions = Omit<channels.BrowserNewContextOptions, 'viewport' | 'noDefaultViewport' | 'extraHTTPHeaders' | 'clientCertificates' | 'storageState' | 'recordHar' | 'colorScheme' | 'reducedMotion' | 'forcedColors' | 'acceptDownloads' | 'contrast'> & {
   viewport?: Size | null;
   extraHTTPHeaders?: Headers;
   logger?: Logger;
@@ -77,6 +81,7 @@ export type BrowserContextOptions = Omit<channels.BrowserNewContextOptions, 'vie
   colorScheme?: 'dark' | 'light' | 'no-preference' | null;
   reducedMotion?: 'reduce' | 'no-preference' | null;
   forcedColors?: 'active' | 'none' | null;
+  contrast?: 'more' | 'no-preference' | null;
   acceptDownloads?: boolean;
   clientCertificates?: ClientCertificate[];
 };
@@ -86,7 +91,7 @@ type LaunchOverrides = {
   env?: Env;
   logger?: Logger;
   firefoxUserPrefs?: { [key: string]: string | number | boolean };
-};
+} & TimeoutOptions;
 
 export type LaunchOptions = Omit<channels.BrowserTypeLaunchOptions, 'ignoreAllDefaultArgs' | 'ignoreDefaultArgs' | 'env' | 'firefoxUserPrefs'> & LaunchOverrides;
 export type LaunchPersistentContextOptions = Omit<LaunchOptions & BrowserContextOptions, 'storageState'>;
@@ -101,30 +106,11 @@ export type ConnectOptions = {
   logger?: Logger,
 };
 export type LaunchServerOptions = {
-  channel?: channels.BrowserTypeLaunchOptions['channel'],
-  executablePath?: string,
-  args?: string[],
-  ignoreDefaultArgs?: boolean | string[],
-  handleSIGINT?: boolean,
-  handleSIGTERM?: boolean,
-  handleSIGHUP?: boolean,
-  timeout?: number,
-  env?: Env,
-  headless?: boolean,
-  devtools?: boolean,
-  proxy?: {
-    server: string,
-    bypass?: string,
-    username?: string,
-    password?: string
-  },
-  downloadsPath?: string,
-  chromiumSandbox?: boolean,
   host?: string,
   port?: number,
   wsPath?: string,
-  logger?: Logger,
-  firefoxUserPrefs?: { [key: string]: string | number | boolean };
+  _debugController?: boolean;
+  _sharedBrowser?: boolean;
 };
 
 export type LaunchAndroidServerOptions = {
@@ -151,4 +137,4 @@ export type SelectorEngine = {
 export type RemoteAddr = channels.RemoteAddr;
 export type SecurityDetails = channels.SecurityDetails;
 
-export type FrameExpectOptions = channels.FrameExpectOptions & { isNot?: boolean };
+export type FrameExpectParams = Omit<channels.FrameExpectParams, 'selector'|'expression'|'expectedValue'> & { expectedValue?: any };
diff --git a/packages/playwright-core/src/client/video.ts b/packages/playwright-core/src/client/video.ts
index 08c39d4247024..1ff4065be74f6 100644
--- a/packages/playwright-core/src/client/video.ts
+++ b/packages/playwright-core/src/client/video.ts
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import type { Page } from './page';
-import type * as api from '../../types/types';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
+
 import type { Artifact } from './artifact';
 import type { Connection } from './connection';
-import { ManualPromise } from '../utils';
+import type { Page } from './page';
+import type * as api from '../../types/types';
 
 export class Video implements api.Video {
   private _artifact: Promise<Artifact | null> | null = null;
diff --git a/packages/playwright-core/src/client/waiter.ts b/packages/playwright-core/src/client/waiter.ts
index 1b3ffbe78d895..94736099e0f93 100644
--- a/packages/playwright-core/src/client/waiter.ts
+++ b/packages/playwright-core/src/client/waiter.ts
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import type { EventEmitter } from 'events';
-import { rewriteErrorMessage } from '../utils/stackTrace';
 import { TimeoutError } from './errors';
-import { createGuid } from '../utils';
-import type * as channels from '@protocol/channels';
+import { rewriteErrorMessage } from '../utils/isomorphic/stackTrace';
+
 import type { ChannelOwner } from './channelOwner';
+import type * as channels from '@protocol/channels';
+import type { EventEmitter } from 'events';
+import type { Zone } from './platform';
 
 export class Waiter {
   private _dispose: (() => void)[];
@@ -29,15 +30,18 @@ export class Waiter {
   private _channelOwner: ChannelOwner<channels.EventTargetChannel>;
   private _waitId: string;
   private _error: string | undefined;
+  private _savedZone: Zone;
 
   constructor(channelOwner: ChannelOwner<channels.EventTargetChannel>, event: string) {
-    this._waitId = createGuid();
+    this._waitId = channelOwner._platform.createGuid();
     this._channelOwner = channelOwner;
+    this._savedZone = channelOwner._platform.zones.current().pop();
+
     this._channelOwner._channel.waitForEventInfo({ info: { waitId: this._waitId, phase: 'before', event } }).catch(() => {});
     this._dispose = [
       () => this._channelOwner._wrapApiCall(async () => {
         await this._channelOwner._channel.waitForEventInfo({ info: { waitId: this._waitId, phase: 'after', error: this._error } });
-      }, true).catch(() => {}),
+      }, { internal: true }).catch(() => {}),
     ];
   }
 
@@ -46,12 +50,12 @@ export class Waiter {
   }
 
   async waitForEvent<T = void>(emitter: EventEmitter, event: string, predicate?: (arg: T) => boolean | Promise<boolean>): Promise<T> {
-    const { promise, dispose } = waitForEvent(emitter, event, predicate);
+    const { promise, dispose } = waitForEvent(emitter, event, this._savedZone, predicate);
     return await this.waitForPromise(promise, dispose);
   }
 
   rejectOnEvent<T = void>(emitter: EventEmitter, event: string, error: Error | (() => Error), predicate?: (arg: T) => boolean | Promise<boolean>) {
-    const { promise, dispose } = waitForEvent(emitter, event, predicate);
+    const { promise, dispose } = waitForEvent(emitter, event, this._savedZone, predicate);
     this._rejectOn(promise.then(() => { throw (typeof error === 'function' ? error() : error); }), dispose);
   }
 
@@ -92,8 +96,8 @@ export class Waiter {
   log(s: string) {
     this._logs.push(s);
     this._channelOwner._wrapApiCall(async () => {
-      await this._channelOwner._channel.waitForEventInfo({ info: { waitId: this._waitId, phase: 'log', message: s } }).catch(() => {});
-    }, true);
+      await this._channelOwner._channel.waitForEventInfo({ info: { waitId: this._waitId, phase: 'log', message: s } });
+    }, { internal: true }).catch(() => {});
   }
 
   private _rejectOn(promise: Promise<any>, dispose?: () => void) {
@@ -103,19 +107,21 @@ export class Waiter {
   }
 }
 
-function waitForEvent<T = void>(emitter: EventEmitter, event: string, predicate?: (arg: T) => boolean | Promise<boolean>): { promise: Promise<T>, dispose: () => void } {
+function waitForEvent<T = void>(emitter: EventEmitter, event: string, savedZone: Zone, predicate?: (arg: T) => boolean | Promise<boolean>): { promise: Promise<T>, dispose: () => void } {
   let listener: (eventArg: any) => void;
   const promise = new Promise<T>((resolve, reject) => {
     listener = async (eventArg: any) => {
-      try {
-        if (predicate && !(await predicate(eventArg)))
-          return;
-        emitter.removeListener(event, listener);
-        resolve(eventArg);
-      } catch (e) {
-        emitter.removeListener(event, listener);
-        reject(e);
-      }
+      await savedZone.run(async () => {
+        try {
+          if (predicate && !(await predicate(eventArg)))
+            return;
+          emitter.removeListener(event, listener);
+          resolve(eventArg);
+        } catch (e) {
+          emitter.removeListener(event, listener);
+          reject(e);
+        }
+      });
     };
     emitter.addListener(event, listener);
   });
diff --git a/packages/playwright-core/src/client/webError.ts b/packages/playwright-core/src/client/webError.ts
index 13a942abee745..3993113796f44 100644
--- a/packages/playwright-core/src/client/webError.ts
+++ b/packages/playwright-core/src/client/webError.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type * as api from '../../types/types';
 import type { Page } from './page';
+import type * as api from '../../types/types';
 
 export class WebError implements api.WebError {
   private _page: Page | null;
diff --git a/packages/playwright-core/src/client/webSocket.ts b/packages/playwright-core/src/client/webSocket.ts
new file mode 100644
index 0000000000000..39ce48892b74e
--- /dev/null
+++ b/packages/playwright-core/src/client/webSocket.ts
@@ -0,0 +1,110 @@
+/**
+ * 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 { ChannelOwner } from './channelOwner';
+import { Connection } from './connection';
+
+import type { HeadersArray } from './types';
+import type * as channels from '@protocol/channels';
+
+export async function connectOverWebSocket(parentConnection: Connection, params: channels.LocalUtilsConnectParams): Promise<Connection> {
+  const localUtils = parentConnection.localUtils();
+  const transport = localUtils ? new JsonPipeTransport(localUtils) : new WebSocketTransport();
+  const connectHeaders = await transport.connect(params);
+  const connection = new Connection(parentConnection._platform, localUtils, parentConnection._instrumentation, connectHeaders);
+  connection.markAsRemote();
+  connection.on('close', () => transport.close());
+
+  let closeError: string | undefined;
+  const onTransportClosed = (reason?: string) => {
+    connection.close(reason || closeError);
+  };
+  transport.onClose(reason => onTransportClosed(reason));
+  connection.onmessage = message => transport.send(message).catch(() => onTransportClosed());
+  transport.onMessage(message => {
+    try {
+      connection!.dispatch(message);
+    } catch (e) {
+      closeError = String(e);
+      transport.close().catch(() => {});
+    }
+  });
+  return connection;
+}
+
+interface Transport {
+  connect(params: channels.LocalUtilsConnectParams): Promise<HeadersArray>;
+  send(message: any): Promise<void>;
+  onMessage(callback: (message: object) => void): void;
+  onClose(callback: (reason?: string) => void): void;
+  close(): Promise<void>;
+}
+
+class JsonPipeTransport implements Transport {
+  private _pipe: channels.JsonPipeChannel | undefined;
+  private _owner: ChannelOwner<channels.LocalUtilsChannel>;
+
+  constructor(owner: ChannelOwner<channels.LocalUtilsChannel>) {
+    this._owner = owner;
+  }
+
+  async connect(params: channels.LocalUtilsConnectParams) {
+    const { pipe, headers: connectHeaders } = await this._owner._channel.connect(params);
+    this._pipe = pipe;
+    return connectHeaders;
+  }
+
+  async send(message: object) {
+    await this._pipe!.send({ message });
+  }
+
+  onMessage(callback: (message: object) => void) {
+    this._pipe!.on('message', ({ message }) => callback(message));
+  }
+
+  onClose(callback: (reason?: string) => void) {
+    this._pipe!.on('closed', ({ reason }) => callback(reason));
+  }
+
+  async close() {
+    await this._pipe!.close().catch(() => {});
+  }
+}
+
+class WebSocketTransport implements Transport {
+  private _ws: WebSocket | undefined;
+
+  async connect(params: channels.LocalUtilsConnectParams) {
+    this._ws = new window.WebSocket(params.wsEndpoint);
+    return [];
+  }
+
+  async send(message: object) {
+    this._ws!.send(JSON.stringify(message));
+  }
+
+  onMessage(callback: (message: object) => void) {
+    this._ws!.addEventListener('message', event => callback(JSON.parse(event.data)));
+  }
+
+  onClose(callback: (reason?: string) => void) {
+    this._ws!.addEventListener('close', () => callback());
+  }
+
+  async close() {
+    this._ws!.close();
+  }
+}
diff --git a/packages/playwright-core/src/client/worker.ts b/packages/playwright-core/src/client/worker.ts
index 31d5d3057f9f8..5a5a5fe246c80 100644
--- a/packages/playwright-core/src/client/worker.ts
+++ b/packages/playwright-core/src/client/worker.ts
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-import { Events } from './events';
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
-import { assertMaxArguments, JSHandle, parseResult, serializeArgument } from './jsHandle';
-import type { Page } from './page';
+import { TargetClosedError } from './errors';
+import { Events } from './events';
+import { JSHandle, assertMaxArguments, parseResult, serializeArgument } from './jsHandle';
+import { LongStandingScope } from '../utils/isomorphic/manualPromise';
+
 import type { BrowserContext } from './browserContext';
-import type * as api from '../../types/types';
+import type { Page } from './page';
 import type * as structs from '../../types/structs';
-import { LongStandingScope } from '../utils';
-import { TargetClosedError } from './errors';
+import type * as api from '../../types/types';
+import type * as channels from '@protocol/channels';
+
 
 export class Worker extends ChannelOwner<channels.WorkerChannel> implements api.Worker {
   _page: Page | undefined;  // Set for web workers.
diff --git a/packages/playwright-core/src/client/writableStream.ts b/packages/playwright-core/src/client/writableStream.ts
index 8ed799292c9ff..38a2d0214a007 100644
--- a/packages/playwright-core/src/client/writableStream.ts
+++ b/packages/playwright-core/src/client/writableStream.ts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import { Writable } from 'stream';
-import type * as channels from '@protocol/channels';
 import { ChannelOwner } from './channelOwner';
 
+import type * as channels from '@protocol/channels';
+import type { Writable } from 'stream';
+
 export class WritableStream extends ChannelOwner<channels.WritableStreamChannel> {
   static from(Stream: channels.WritableStreamChannel): WritableStream {
     return (Stream as any)._object;
@@ -28,26 +29,6 @@ export class WritableStream extends ChannelOwner<channels.WritableStreamChannel>
   }
 
   stream(): Writable {
-    return new WritableStreamImpl(this._channel);
-  }
-}
-
-class WritableStreamImpl extends Writable {
-  private _channel: channels.WritableStreamChannel;
-
-  constructor(channel: channels.WritableStreamChannel) {
-    super();
-    this._channel = channel;
-  }
-
-  override async _write(chunk: Buffer | string, encoding: BufferEncoding, callback: (error?: Error | null) => void) {
-    const error = await this._channel.write({ binary: typeof chunk === 'string' ? Buffer.from(chunk) : chunk }).catch(e => e);
-    callback(error || null);
-  }
-
-  override async _final(callback: (error?: Error | null) => void) {
-    // Stream might be destroyed after the connection was closed.
-    const error = await this._channel.close().catch(e => e);
-    callback(error || null);
+    return this._platform.streamWritable(this._channel);
   }
 }
diff --git a/packages/playwright-core/src/common/DEPS.list b/packages/playwright-core/src/common/DEPS.list
index 60df36081b99d..686b88087b173 100644
--- a/packages/playwright-core/src/common/DEPS.list
+++ b/packages/playwright-core/src/common/DEPS.list
@@ -1,3 +1,2 @@
 [*]
-../utils/
-../utilsBundle.ts
\ No newline at end of file
+../utils/isomorphic/
diff --git a/packages/playwright-core/src/inProcessFactory.ts b/packages/playwright-core/src/inProcessFactory.ts
index f38589f0b2459..8a77643c8e8ac 100644
--- a/packages/playwright-core/src/inProcessFactory.ts
+++ b/packages/playwright-core/src/inProcessFactory.ts
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-import type { Playwright as PlaywrightAPI } from './client/playwright';
-import { createPlaywright, DispatcherConnection, RootDispatcher, PlaywrightDispatcher } from './server';
-import { Connection } from './client/connection';
-import { BrowserServerLauncherImpl } from './browserServerImpl';
 import { AndroidServerLauncherImpl } from './androidServerImpl';
-import type { Language } from './utils/isomorphic/locatorGenerators';
+import { BrowserServerLauncherImpl } from './browserServerImpl';
+import { DispatcherConnection, PlaywrightDispatcher, RootDispatcher, createPlaywright } from './server';
+import { nodePlatform } from './server/utils/nodePlatform';
+import { Connection } from './client/connection';
+
+import type { Playwright as PlaywrightAPI } from './client/playwright';
+import type { Language } from './utils';
 
 export function createInProcessPlaywright(): PlaywrightAPI {
   const playwright = createPlaywright({ sdkLanguage: (process.env.PW_LANG_NAME as Language | undefined) || 'javascript' });
-
-  const clientConnection = new Connection(undefined, undefined);
+  const clientConnection = new Connection(nodePlatform);
   clientConnection.useRawBuffers();
   const dispatcherConnection = new DispatcherConnection(true /* local */);
 
@@ -41,12 +42,19 @@ export function createInProcessPlaywright(): PlaywrightAPI {
   playwrightAPI.firefox._serverLauncher = new BrowserServerLauncherImpl('firefox');
   playwrightAPI.webkit._serverLauncher = new BrowserServerLauncherImpl('webkit');
   playwrightAPI._android._serverLauncher = new AndroidServerLauncherImpl();
+  playwrightAPI._bidiChromium._serverLauncher = new BrowserServerLauncherImpl('_bidiChromium');
+  playwrightAPI._bidiFirefox._serverLauncher = new BrowserServerLauncherImpl('_bidiFirefox');
 
   // Switch to async dispatch after we got Playwright object.
   dispatcherConnection.onmessage = message => setImmediate(() => clientConnection.dispatch(message));
   clientConnection.onmessage = message => setImmediate(() => dispatcherConnection.dispatch(message));
 
-  clientConnection.toImpl = (x: any) => x ? dispatcherConnection._dispatchers.get(x._guid)!._object : dispatcherConnection._dispatchers.get('');
-  (playwrightAPI as any)._toImpl = clientConnection.toImpl;
+  clientConnection.toImpl = x => {
+    if (x instanceof Connection)
+      return x === clientConnection ? dispatcherConnection : undefined;
+    if (!x)
+      return dispatcherConnection._dispatcherByGuid.get('');
+    return dispatcherConnection._dispatcherByGuid.get(x._guid)!._object;
+  };
   return playwrightAPI;
 }
diff --git a/packages/playwright-core/src/outofprocess.ts b/packages/playwright-core/src/outofprocess.ts
index 81deaead67e1a..3496c9895d271 100644
--- a/packages/playwright-core/src/outofprocess.ts
+++ b/packages/playwright-core/src/outofprocess.ts
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
+import * as childProcess from 'child_process';
+import path from 'path';
+
 import { Connection } from './client/connection';
-import { PipeTransport } from './protocol/transport';
+import { PipeTransport } from './server/utils/pipeTransport';
+import { ManualPromise } from './utils/isomorphic/manualPromise';
+import { nodePlatform } from './server/utils/nodePlatform';
+
 import type { Playwright } from './client/playwright';
-import * as childProcess from 'child_process';
-import * as path from 'path';
-import { ManualPromise } from './utils/manualPromise';
+
 
 export async function start(env: any = {}): Promise<{ playwright: Playwright, stop: () => Promise<void> }> {
   const client = new PlaywrightClient(env);
@@ -43,9 +47,10 @@ class PlaywrightClient {
       },
     });
     this._driverProcess.unref();
+    // eslint-disable-next-line no-restricted-properties
     this._driverProcess.stderr!.on('data', data => process.stderr.write(data));
 
-    const connection = new Connection(undefined, undefined);
+    const connection = new Connection(nodePlatform);
     const transport = new PipeTransport(this._driverProcess.stdin!, this._driverProcess.stdout!);
     connection.onmessage = message => transport.send(JSON.stringify(message));
     transport.onmessage = message => connection.dispatch(JSON.parse(message));
diff --git a/packages/playwright-core/src/protocol/DEPS.list b/packages/playwright-core/src/protocol/DEPS.list
index bf64b324f1c3f..d4e5c2cb00b8a 100644
--- a/packages/playwright-core/src/protocol/DEPS.list
+++ b/packages/playwright-core/src/protocol/DEPS.list
@@ -1,4 +1,2 @@
 [*]
-../common/
-../utils/
-
+../utils/isomorphic
diff --git a/packages/playwright-core/src/protocol/debug.ts b/packages/playwright-core/src/protocol/debug.ts
deleted file mode 100644
index 4f44f5941e6be..0000000000000
--- a/packages/playwright-core/src/protocol/debug.ts
+++ /dev/null
@@ -1,190 +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.
- */
-
-// This file is generated by generate_channels.js, do not edit manually.
-
-export const slowMoActions = new Set([
-  'Page.goBack',
-  'Page.goForward',
-  'Page.reload',
-  'Page.keyboardDown',
-  'Page.keyboardUp',
-  'Page.keyboardInsertText',
-  'Page.keyboardType',
-  'Page.keyboardPress',
-  'Page.mouseMove',
-  'Page.mouseDown',
-  'Page.mouseUp',
-  'Page.mouseClick',
-  'Page.mouseWheel',
-  'Page.touchscreenTap',
-  'Frame.blur',
-  'Frame.check',
-  'Frame.click',
-  'Frame.dragAndDrop',
-  'Frame.dblclick',
-  'Frame.dispatchEvent',
-  'Frame.fill',
-  'Frame.focus',
-  'Frame.goto',
-  'Frame.hover',
-  'Frame.press',
-  'Frame.selectOption',
-  'Frame.setInputFiles',
-  'Frame.tap',
-  'Frame.type',
-  'Frame.uncheck',
-  'ElementHandle.check',
-  'ElementHandle.click',
-  'ElementHandle.dblclick',
-  'ElementHandle.dispatchEvent',
-  'ElementHandle.fill',
-  'ElementHandle.focus',
-  'ElementHandle.hover',
-  'ElementHandle.press',
-  'ElementHandle.scrollIntoViewIfNeeded',
-  'ElementHandle.selectOption',
-  'ElementHandle.selectText',
-  'ElementHandle.setInputFiles',
-  'ElementHandle.tap',
-  'ElementHandle.type',
-  'ElementHandle.uncheck'
-]);
-
-export const commandsWithTracingSnapshots = new Set([
-  'EventTarget.waitForEventInfo',
-  'BrowserContext.waitForEventInfo',
-  'Page.waitForEventInfo',
-  'WebSocket.waitForEventInfo',
-  'ElectronApplication.waitForEventInfo',
-  'AndroidDevice.waitForEventInfo',
-  'Page.emulateMedia',
-  'Page.goBack',
-  'Page.goForward',
-  'Page.reload',
-  'Page.expectScreenshot',
-  'Page.screenshot',
-  'Page.setViewportSize',
-  'Page.keyboardDown',
-  'Page.keyboardUp',
-  'Page.keyboardInsertText',
-  'Page.keyboardType',
-  'Page.keyboardPress',
-  'Page.mouseMove',
-  'Page.mouseDown',
-  'Page.mouseUp',
-  'Page.mouseClick',
-  'Page.mouseWheel',
-  'Page.touchscreenTap',
-  'Frame.evalOnSelector',
-  'Frame.evalOnSelectorAll',
-  'Frame.addScriptTag',
-  'Frame.addStyleTag',
-  'Frame.blur',
-  'Frame.check',
-  'Frame.click',
-  'Frame.dragAndDrop',
-  'Frame.dblclick',
-  'Frame.dispatchEvent',
-  'Frame.evaluateExpression',
-  'Frame.evaluateExpressionHandle',
-  'Frame.fill',
-  'Frame.focus',
-  'Frame.getAttribute',
-  'Frame.goto',
-  'Frame.hover',
-  'Frame.innerHTML',
-  'Frame.innerText',
-  'Frame.inputValue',
-  'Frame.isChecked',
-  'Frame.isDisabled',
-  'Frame.isEnabled',
-  'Frame.isHidden',
-  'Frame.isVisible',
-  'Frame.isEditable',
-  'Frame.press',
-  'Frame.selectOption',
-  'Frame.setContent',
-  'Frame.setInputFiles',
-  'Frame.tap',
-  'Frame.textContent',
-  'Frame.type',
-  'Frame.uncheck',
-  'Frame.waitForTimeout',
-  'Frame.waitForFunction',
-  'Frame.waitForSelector',
-  'Frame.expect',
-  'JSHandle.evaluateExpression',
-  'ElementHandle.evaluateExpression',
-  'JSHandle.evaluateExpressionHandle',
-  'ElementHandle.evaluateExpressionHandle',
-  'ElementHandle.evalOnSelector',
-  'ElementHandle.evalOnSelectorAll',
-  'ElementHandle.check',
-  'ElementHandle.click',
-  'ElementHandle.dblclick',
-  'ElementHandle.dispatchEvent',
-  'ElementHandle.fill',
-  'ElementHandle.focus',
-  'ElementHandle.hover',
-  'ElementHandle.innerHTML',
-  'ElementHandle.innerText',
-  'ElementHandle.inputValue',
-  'ElementHandle.isChecked',
-  'ElementHandle.isDisabled',
-  'ElementHandle.isEditable',
-  'ElementHandle.isEnabled',
-  'ElementHandle.isHidden',
-  'ElementHandle.isVisible',
-  'ElementHandle.press',
-  'ElementHandle.screenshot',
-  'ElementHandle.scrollIntoViewIfNeeded',
-  'ElementHandle.selectOption',
-  'ElementHandle.selectText',
-  'ElementHandle.setInputFiles',
-  'ElementHandle.tap',
-  'ElementHandle.textContent',
-  'ElementHandle.type',
-  'ElementHandle.uncheck',
-  'ElementHandle.waitForElementState',
-  'ElementHandle.waitForSelector'
-]);
-
-export const pausesBeforeInputActions = new Set([
-  'Frame.check',
-  'Frame.click',
-  'Frame.dragAndDrop',
-  'Frame.dblclick',
-  'Frame.fill',
-  'Frame.hover',
-  'Frame.press',
-  'Frame.selectOption',
-  'Frame.setInputFiles',
-  'Frame.tap',
-  'Frame.type',
-  'Frame.uncheck',
-  'ElementHandle.check',
-  'ElementHandle.click',
-  'ElementHandle.dblclick',
-  'ElementHandle.fill',
-  'ElementHandle.hover',
-  'ElementHandle.press',
-  'ElementHandle.selectOption',
-  'ElementHandle.setInputFiles',
-  'ElementHandle.tap',
-  'ElementHandle.type',
-  'ElementHandle.uncheck'
-]);
\ No newline at end of file
diff --git a/packages/playwright-core/src/protocol/serializers.ts b/packages/playwright-core/src/protocol/serializers.ts
index 559d4a062eb66..80dc28f454ce1 100644
--- a/packages/playwright-core/src/protocol/serializers.ts
+++ b/packages/playwright-core/src/protocol/serializers.ts
@@ -17,10 +17,10 @@
 import type { SerializedValue } from '@protocol/channels';
 
 export function parseSerializedValue(value: SerializedValue, handles: any[] | undefined): any {
-  return innerParseSerializedValue(value, handles, new Map());
+  return innerParseSerializedValue(value, handles, new Map(), []);
 }
 
-function innerParseSerializedValue(value: SerializedValue, handles: any[] | undefined, refs: Map<number, object>): any {
+function innerParseSerializedValue(value: SerializedValue, handles: any[] | undefined, refs: Map<number, object>, accessChain: Array<string | number>): any {
   if (value.ref !== undefined)
     return refs.get(value.ref);
   if (value.n !== undefined)
@@ -57,19 +57,23 @@ function innerParseSerializedValue(value: SerializedValue, handles: any[] | unde
   }
   if (value.r !== undefined)
     return new RegExp(value.r.p, value.r.f);
+  if (value.ta !== undefined) {
+    const ctor = typedArrayKindToConstructor[value.ta.k] as any;
+    return new ctor(value.ta.b.buffer, value.ta.b.byteOffset, value.ta.b.length / ctor.BYTES_PER_ELEMENT);
+  }
 
   if (value.a !== undefined) {
     const result: any[] = [];
     refs.set(value.id!, result);
-    for (const v of value.a)
-      result.push(innerParseSerializedValue(v, handles, refs));
+    for (let i = 0; i < value.a.length; i++)
+      result.push(innerParseSerializedValue(value.a[i], handles, refs, [...accessChain, i]));
     return result;
   }
   if (value.o !== undefined) {
     const result: any = {};
     refs.set(value.id!, result);
     for (const { k, v } of value.o)
-      result[k] = innerParseSerializedValue(v, handles, refs);
+      result[k] = innerParseSerializedValue(v, handles, refs, [...accessChain, k]);
     return result;
   }
   if (value.h !== undefined) {
@@ -77,7 +81,7 @@ function innerParseSerializedValue(value: SerializedValue, handles: any[] | unde
       throw new Error('Unexpected handle');
     return handles[value.h];
   }
-  throw new Error('Unexpected value');
+  throw new Error(`Attempting to deserialize unexpected value${accessChainToDisplayString(accessChain)}: ${value}`);
 }
 
 export type HandleOrValue = { h: number } | { fallThrough: any };
@@ -87,10 +91,10 @@ type VisitorInfo = {
 };
 
 export function serializeValue(value: any, handleSerializer: (value: any) => HandleOrValue): SerializedValue {
-  return innerSerializeValue(value, handleSerializer, { lastId: 0, visited: new Map() });
+  return innerSerializeValue(value, handleSerializer, { lastId: 0, visited: new Map() }, []);
 }
 
-function innerSerializeValue(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo): SerializedValue {
+function innerSerializeValue(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo, accessChain: Array<string | number>): SerializedValue {
   const handle = handleSerializer(value);
   if ('fallThrough' in handle)
     value = handle.fallThrough;
@@ -128,6 +132,10 @@ function innerSerializeValue(value: any, handleSerializer: (value: any) => Handl
   if (isRegExp(value))
     return { r: { p: value.source, f: value.flags } };
 
+  const typedArrayKind = constructorToTypedArrayKind.get(value.constructor);
+  if (typedArrayKind)
+    return { ta: { b: Buffer.from(value.buffer, value.byteOffset, value.byteLength), k: typedArrayKind } };
+
   const id = visitorInfo.visited.get(value);
   if (id)
     return { ref: id };
@@ -137,7 +145,7 @@ function innerSerializeValue(value: any, handleSerializer: (value: any) => Handl
     const id = ++visitorInfo.lastId;
     visitorInfo.visited.set(value, id);
     for (let i = 0; i < value.length; ++i)
-      a.push(innerSerializeValue(value[i], handleSerializer, visitorInfo));
+      a.push(innerSerializeValue(value[i], handleSerializer, visitorInfo, [...accessChain, i]));
     return { a, id };
   }
   if (typeof value === 'object') {
@@ -145,10 +153,21 @@ function innerSerializeValue(value: any, handleSerializer: (value: any) => Handl
     const id = ++visitorInfo.lastId;
     visitorInfo.visited.set(value, id);
     for (const name of Object.keys(value))
-      o.push({ k: name, v: innerSerializeValue(value[name], handleSerializer, visitorInfo) });
+      o.push({ k: name, v: innerSerializeValue(value[name], handleSerializer, visitorInfo, [...accessChain, name]) });
     return { o, id };
   }
-  throw new Error('Unexpected value');
+  // Likely only functions can reach here.
+  throw new Error(`Attempting to serialize unexpected value${accessChainToDisplayString(accessChain)}: ${value}`);
+}
+
+function accessChainToDisplayString(accessChain: Array<string | number>): string {
+  const chainString = accessChain.map((accessor, i) => {
+    if (typeof accessor === 'string')
+      return i ? `.${accessor}` : accessor;
+    return `[${accessor}]`;
+  }).join('');
+
+  return chainString.length > 0 ? ` at position "${chainString}"` : '';
 }
 
 function isRegExp(obj: any): obj is RegExp {
@@ -167,3 +186,20 @@ function isError(obj: any): obj is Error {
   const proto = obj ? Object.getPrototypeOf(obj) : null;
   return obj instanceof Error || proto?.name === 'Error' || (proto && isError(proto));
 }
+
+
+type TypedArrayKind = NonNullable<SerializedValue['ta']>['k'];
+const typedArrayKindToConstructor: Record<TypedArrayKind, Function> = {
+  i8: Int8Array,
+  ui8: Uint8Array,
+  ui8c: Uint8ClampedArray,
+  i16: Int16Array,
+  ui16: Uint16Array,
+  i32: Int32Array,
+  ui32: Uint32Array,
+  f32: Float32Array,
+  f64: Float64Array,
+  bi64: BigInt64Array,
+  bui64: BigUint64Array,
+};
+const constructorToTypedArrayKind: Map<Function, TypedArrayKind> = new Map(Object.entries(typedArrayKindToConstructor).map(([k, v]) => [v, k as TypedArrayKind]));
diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.ts
index 81755c79bc5b9..7cc9066da70c0 100644
--- a/packages/playwright-core/src/protocol/validator.ts
+++ b/packages/playwright-core/src/protocol/validator.ts
@@ -16,48 +16,52 @@
 
 // This file is generated by generate_channels.js, do not edit manually.
 
-import { scheme, tOptional, tObject, tBoolean, tNumber, tString, tAny, tEnum, tArray, tBinary, tChannel, tType } from './validatorPrimitives';
+import { scheme, tOptional, tObject, tBoolean, tInt, tFloat, tString, tAny, tEnum, tArray, tBinary, tChannel, tType } from './validatorPrimitives';
 export type { Validator, ValidatorContext } from './validatorPrimitives';
 export { ValidationError, findValidator, maybeFindValidator, createMetadataValidator } from './validatorPrimitives';
 
 scheme.StackFrame = tObject({
   file: tString,
-  line: tNumber,
-  column: tNumber,
+  line: tInt,
+  column: tInt,
   function: tOptional(tString),
 });
 scheme.Metadata = tObject({
   location: tOptional(tObject({
     file: tString,
-    line: tOptional(tNumber),
-    column: tOptional(tNumber),
+    line: tOptional(tInt),
+    column: tOptional(tInt),
   })),
-  apiName: tOptional(tString),
+  title: tOptional(tString),
   internal: tOptional(tBoolean),
   stepId: tOptional(tString),
 });
 scheme.ClientSideCallMetadata = tObject({
-  id: tNumber,
+  id: tInt,
   stack: tOptional(tArray(tType('StackFrame'))),
 });
 scheme.Point = tObject({
-  x: tNumber,
-  y: tNumber,
+  x: tFloat,
+  y: tFloat,
 });
 scheme.Rect = tObject({
-  x: tNumber,
-  y: tNumber,
-  width: tNumber,
-  height: tNumber,
+  x: tFloat,
+  y: tFloat,
+  width: tFloat,
+  height: tFloat,
 });
 scheme.SerializedValue = tObject({
-  n: tOptional(tNumber),
+  n: tOptional(tFloat),
   b: tOptional(tBoolean),
   s: tOptional(tString),
   v: tOptional(tEnum(['null', 'undefined', 'NaN', 'Infinity', '-Infinity', '-0'])),
   d: tOptional(tString),
   u: tOptional(tString),
   bi: tOptional(tString),
+  ta: tOptional(tObject({
+    b: tBinary,
+    k: tEnum(['i8', 'ui8', 'ui8c', 'i16', 'ui16', 'i32', 'ui32', 'f32', 'f64', 'bi64', 'bui64']),
+  })),
   e: tOptional(tObject({
     m: tString,
     n: tString,
@@ -72,9 +76,9 @@ scheme.SerializedValue = tObject({
     k: tString,
     v: tType('SerializedValue'),
   }))),
-  h: tOptional(tNumber),
-  id: tOptional(tNumber),
-  ref: tOptional(tNumber),
+  h: tOptional(tInt),
+  id: tOptional(tInt),
+  ref: tOptional(tInt),
 });
 scheme.SerializedArgument = tObject({
   value: tType('SerializedValue'),
@@ -88,11 +92,16 @@ scheme.ExpectedTextValue = tObject({
   ignoreCase: tOptional(tBoolean),
   normalizeWhiteSpace: tOptional(tBoolean),
 });
+scheme.SelectorEngine = tObject({
+  name: tString,
+  source: tString,
+  contentScript: tOptional(tBoolean),
+});
 scheme.AXNode = tObject({
   role: tString,
   name: tString,
   valueString: tOptional(tString),
-  valueNumber: tOptional(tNumber),
+  valueNumber: tOptional(tFloat),
   description: tOptional(tString),
   keyshortcuts: tOptional(tString),
   roledescription: tOptional(tString),
@@ -108,9 +117,9 @@ scheme.AXNode = tObject({
   selected: tOptional(tBoolean),
   checked: tOptional(tEnum(['checked', 'unchecked', 'mixed'])),
   pressed: tOptional(tEnum(['pressed', 'released', 'mixed'])),
-  level: tOptional(tNumber),
-  valuemin: tOptional(tNumber),
-  valuemax: tOptional(tNumber),
+  level: tOptional(tInt),
+  valuemin: tOptional(tFloat),
+  valuemax: tOptional(tFloat),
   autocomplete: tOptional(tString),
   haspopup: tOptional(tString),
   invalid: tOptional(tString),
@@ -123,28 +132,61 @@ scheme.SetNetworkCookie = tObject({
   url: tOptional(tString),
   domain: tOptional(tString),
   path: tOptional(tString),
-  expires: tOptional(tNumber),
+  expires: tOptional(tFloat),
   httpOnly: tOptional(tBoolean),
   secure: tOptional(tBoolean),
   sameSite: tOptional(tEnum(['Strict', 'Lax', 'None'])),
+  partitionKey: tOptional(tString),
+  _crHasCrossSiteAncestor: tOptional(tBoolean),
 });
 scheme.NetworkCookie = tObject({
   name: tString,
   value: tString,
   domain: tString,
   path: tString,
-  expires: tNumber,
+  expires: tFloat,
   httpOnly: tBoolean,
   secure: tBoolean,
   sameSite: tEnum(['Strict', 'Lax', 'None']),
+  partitionKey: tOptional(tString),
+  _crHasCrossSiteAncestor: tOptional(tBoolean),
 });
 scheme.NameValue = tObject({
   name: tString,
   value: tString,
 });
+scheme.IndexedDBDatabase = tObject({
+  name: tString,
+  version: tInt,
+  stores: tArray(tObject({
+    name: tString,
+    autoIncrement: tBoolean,
+    keyPath: tOptional(tString),
+    keyPathArray: tOptional(tArray(tString)),
+    records: tArray(tObject({
+      key: tOptional(tAny),
+      keyEncoded: tOptional(tAny),
+      value: tOptional(tAny),
+      valueEncoded: tOptional(tAny),
+    })),
+    indexes: tArray(tObject({
+      name: tString,
+      keyPath: tOptional(tString),
+      keyPathArray: tOptional(tArray(tString)),
+      multiEntry: tBoolean,
+      unique: tBoolean,
+    })),
+  })),
+});
+scheme.SetOriginStorage = tObject({
+  origin: tString,
+  localStorage: tArray(tType('NameValue')),
+  indexedDB: tOptional(tArray(tType('IndexedDBDatabase'))),
+});
 scheme.OriginStorage = tObject({
   origin: tString,
   localStorage: tArray(tType('NameValue')),
+  indexedDB: tOptional(tArray(tType('IndexedDBDatabase'))),
 });
 scheme.SerializedError = tObject({
   error: tOptional(tObject({
@@ -155,7 +197,7 @@ scheme.SerializedError = tObject({
   value: tOptional(tType('SerializedValue')),
 });
 scheme.RecordHarOptions = tObject({
-  path: tString,
+  zip: tOptional(tBoolean),
   content: tOptional(tEnum(['embed', 'attach', 'omit'])),
   mode: tOptional(tEnum(['full', 'minimal'])),
   urlGlob: tOptional(tString),
@@ -171,11 +213,13 @@ scheme.FormField = tObject({
     buffer: tBinary,
   })),
 });
+scheme.SDKLanguage = tEnum(['javascript', 'python', 'java', 'csharp']);
 scheme.APIRequestContextInitializer = tObject({
   tracing: tChannel(['Tracing']),
 });
 scheme.APIRequestContextFetchParams = tObject({
   url: tString,
+  encodedParams: tOptional(tString),
   params: tOptional(tArray(tType('NameValue'))),
   method: tOptional(tString),
   headers: tOptional(tArray(tType('NameValue'))),
@@ -183,11 +227,11 @@ scheme.APIRequestContextFetchParams = tObject({
   jsonData: tOptional(tString),
   formData: tOptional(tArray(tType('NameValue'))),
   multipartData: tOptional(tArray(tType('FormField'))),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   failOnStatusCode: tOptional(tBoolean),
   ignoreHTTPSErrors: tOptional(tBoolean),
-  maxRedirects: tOptional(tNumber),
-  maxRetries: tOptional(tNumber),
+  maxRedirects: tOptional(tInt),
+  maxRetries: tOptional(tInt),
 });
 scheme.APIRequestContextFetchResult = tObject({
   response: tType('APIResponse'),
@@ -204,7 +248,9 @@ scheme.APIRequestContextFetchLogParams = tObject({
 scheme.APIRequestContextFetchLogResult = tObject({
   log: tArray(tString),
 });
-scheme.APIRequestContextStorageStateParams = tOptional(tObject({}));
+scheme.APIRequestContextStorageStateParams = tObject({
+  indexedDB: tOptional(tBoolean),
+});
 scheme.APIRequestContextStorageStateResult = tObject({
   cookies: tArray(tType('NetworkCookie')),
   origins: tArray(tType('OriginStorage')),
@@ -220,7 +266,7 @@ scheme.APIRequestContextDisposeResult = tOptional(tObject({}));
 scheme.APIResponse = tObject({
   fetchUid: tString,
   url: tString,
-  status: tNumber,
+  status: tInt,
   statusText: tString,
   headers: tArray(tType('NameValue')),
 });
@@ -231,14 +277,14 @@ scheme.LocalUtilsInitializer = tObject({
     descriptor: tObject({
       userAgent: tString,
       viewport: tObject({
-        width: tNumber,
-        height: tNumber,
+        width: tInt,
+        height: tInt,
       }),
       screen: tOptional(tObject({
-        width: tNumber,
-        height: tNumber,
+        width: tInt,
+        height: tInt,
       })),
-      deviceScaleFactor: tNumber,
+      deviceScaleFactor: tFloat,
       isMobile: tBoolean,
       hasTouch: tBoolean,
       defaultBrowserType: tEnum(['chromium', 'firefox', 'webkit']),
@@ -272,7 +318,7 @@ scheme.LocalUtilsHarLookupResult = tObject({
   action: tEnum(['error', 'redirect', 'fulfill', 'noentry']),
   message: tOptional(tString),
   redirectURL: tOptional(tString),
-  status: tOptional(tNumber),
+  status: tOptional(tInt),
   headers: tOptional(tArray(tType('NameValue'))),
   body: tOptional(tBinary),
 });
@@ -289,9 +335,9 @@ scheme.LocalUtilsConnectParams = tObject({
   wsEndpoint: tString,
   headers: tOptional(tAny),
   exposeNetwork: tOptional(tString),
-  slowMo: tOptional(tNumber),
-  timeout: tOptional(tNumber),
-  socksProxyRedirectPortForTest: tOptional(tNumber),
+  slowMo: tOptional(tFloat),
+  timeout: tFloat,
+  socksProxyRedirectPortForTest: tOptional(tInt),
 });
 scheme.LocalUtilsConnectResult = tObject({
   pipe: tChannel(['JsonPipe']),
@@ -312,9 +358,17 @@ scheme.LocalUtilsTraceDiscardedParams = tObject({
   stacksId: tString,
 });
 scheme.LocalUtilsTraceDiscardedResult = tOptional(tObject({}));
+scheme.LocalUtilsGlobToRegexParams = tObject({
+  glob: tString,
+  baseURL: tOptional(tString),
+  webSocketUrl: tOptional(tBoolean),
+});
+scheme.LocalUtilsGlobToRegexResult = tObject({
+  regex: tString,
+});
 scheme.RootInitializer = tOptional(tObject({}));
 scheme.RootInitializeParams = tObject({
-  sdkLanguage: tEnum(['javascript', 'python', 'java', 'csharp']),
+  sdkLanguage: tType('SDKLanguage'),
 });
 scheme.RootInitializeResult = tObject({
   playwright: tChannel(['Playwright']),
@@ -323,10 +377,11 @@ scheme.PlaywrightInitializer = tObject({
   chromium: tChannel(['BrowserType']),
   firefox: tChannel(['BrowserType']),
   webkit: tChannel(['BrowserType']),
+  _bidiChromium: tChannel(['BrowserType']),
+  _bidiFirefox: tChannel(['BrowserType']),
   android: tChannel(['Android']),
   electron: tChannel(['Electron']),
   utils: tOptional(tChannel(['LocalUtils'])),
-  selectors: tChannel(['Selectors']),
   preLaunchedBrowser: tOptional(tChannel(['Browser'])),
   preConnectedAndroidDevice: tOptional(tChannel(['AndroidDevice'])),
   socksSupport: tOptional(tChannel(['SocksSupport'])),
@@ -336,6 +391,7 @@ scheme.PlaywrightNewRequestParams = tObject({
   userAgent: tOptional(tString),
   ignoreHTTPSErrors: tOptional(tBoolean),
   extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
+  failOnStatusCode: tOptional(tBoolean),
   clientCertificates: tOptional(tArray(tObject({
     origin: tString,
     cert: tOptional(tBinary),
@@ -343,6 +399,7 @@ scheme.PlaywrightNewRequestParams = tObject({
     passphrase: tOptional(tString),
     pfx: tOptional(tBinary),
   }))),
+  maxRedirects: tOptional(tInt),
   httpCredentials: tOptional(tObject({
     username: tString,
     password: tString,
@@ -355,10 +412,9 @@ scheme.PlaywrightNewRequestParams = tObject({
     username: tOptional(tString),
     password: tOptional(tString),
   })),
-  timeout: tOptional(tNumber),
   storageState: tOptional(tObject({
     cookies: tOptional(tArray(tType('NetworkCookie'))),
-    origins: tOptional(tArray(tType('OriginStorage'))),
+    origins: tOptional(tArray(tType('SetOriginStorage'))),
   })),
   tracesDir: tOptional(tString),
 });
@@ -372,22 +428,33 @@ scheme.RecorderSource = tObject({
   text: tString,
   language: tString,
   highlight: tArray(tObject({
-    line: tNumber,
+    line: tInt,
     type: tString,
   })),
-  revealLine: tOptional(tNumber),
+  revealLine: tOptional(tInt),
   group: tOptional(tString),
 });
 scheme.DebugControllerInitializer = tOptional(tObject({}));
 scheme.DebugControllerInspectRequestedEvent = tObject({
   selector: tString,
   locator: tString,
+  ariaSnapshot: tString,
 });
 scheme.DebugControllerSetModeRequestedEvent = tObject({
   mode: tString,
 });
 scheme.DebugControllerStateChangedEvent = tObject({
-  pageCount: tNumber,
+  pageCount: tInt,
+  browsers: tArray(tObject({
+    id: tString,
+    name: tString,
+    channel: tOptional(tString),
+    contexts: tArray(tObject({
+      pages: tArray(tObject({
+        url: tString,
+      })),
+    })),
+  })),
 });
 scheme.DebugControllerSourceChangedEvent = tObject({
   text: tString,
@@ -400,26 +467,22 @@ scheme.DebugControllerPausedEvent = tObject({
 });
 scheme.DebugControllerInitializeParams = tObject({
   codegenId: tString,
-  sdkLanguage: tEnum(['javascript', 'python', 'java', 'csharp']),
+  sdkLanguage: tType('SDKLanguage'),
 });
 scheme.DebugControllerInitializeResult = tOptional(tObject({}));
 scheme.DebugControllerSetReportStateChangedParams = tObject({
   enabled: tBoolean,
 });
 scheme.DebugControllerSetReportStateChangedResult = tOptional(tObject({}));
-scheme.DebugControllerResetForReuseParams = tOptional(tObject({}));
-scheme.DebugControllerResetForReuseResult = tOptional(tObject({}));
-scheme.DebugControllerNavigateParams = tObject({
-  url: tString,
-});
-scheme.DebugControllerNavigateResult = tOptional(tObject({}));
 scheme.DebugControllerSetRecorderModeParams = tObject({
   mode: tEnum(['inspecting', 'recording', 'none']),
   testIdAttributeName: tOptional(tString),
+  generateAutoExpect: tOptional(tBoolean),
 });
 scheme.DebugControllerSetRecorderModeResult = tOptional(tObject({}));
 scheme.DebugControllerHighlightParams = tObject({
-  selector: tString,
+  selector: tOptional(tString),
+  ariaTemplate: tOptional(tString),
 });
 scheme.DebugControllerHighlightResult = tOptional(tObject({}));
 scheme.DebugControllerHideHighlightParams = tOptional(tObject({}));
@@ -428,13 +491,11 @@ scheme.DebugControllerResumeParams = tOptional(tObject({}));
 scheme.DebugControllerResumeResult = tOptional(tObject({}));
 scheme.DebugControllerKillParams = tOptional(tObject({}));
 scheme.DebugControllerKillResult = tOptional(tObject({}));
-scheme.DebugControllerCloseAllBrowsersParams = tOptional(tObject({}));
-scheme.DebugControllerCloseAllBrowsersResult = tOptional(tObject({}));
 scheme.SocksSupportInitializer = tOptional(tObject({}));
 scheme.SocksSupportSocksRequestedEvent = tObject({
   uid: tString,
   host: tString,
-  port: tNumber,
+  port: tInt,
 });
 scheme.SocksSupportSocksDataEvent = tObject({
   uid: tString,
@@ -446,7 +507,7 @@ scheme.SocksSupportSocksClosedEvent = tObject({
 scheme.SocksSupportSocksConnectedParams = tObject({
   uid: tString,
   host: tString,
-  port: tNumber,
+  port: tInt,
 });
 scheme.SocksSupportSocksConnectedResult = tOptional(tObject({}));
 scheme.SocksSupportSocksFailedParams = tObject({
@@ -468,17 +529,6 @@ scheme.SocksSupportSocksEndParams = tObject({
   uid: tString,
 });
 scheme.SocksSupportSocksEndResult = tOptional(tObject({}));
-scheme.SelectorsInitializer = tOptional(tObject({}));
-scheme.SelectorsRegisterParams = tObject({
-  name: tString,
-  source: tString,
-  contentScript: tOptional(tBoolean),
-});
-scheme.SelectorsRegisterResult = tOptional(tObject({}));
-scheme.SelectorsSetTestIdAttributeNameParams = tObject({
-  testIdAttributeName: tString,
-});
-scheme.SelectorsSetTestIdAttributeNameResult = tOptional(tObject({}));
 scheme.BrowserTypeInitializer = tObject({
   executablePath: tString,
   name: tString,
@@ -489,10 +539,11 @@ scheme.BrowserTypeLaunchParams = tObject({
   args: tOptional(tArray(tString)),
   ignoreAllDefaultArgs: tOptional(tBoolean),
   ignoreDefaultArgs: tOptional(tArray(tString)),
+  assistantMode: tOptional(tBoolean),
   handleSIGINT: tOptional(tBoolean),
   handleSIGTERM: tOptional(tBoolean),
   handleSIGHUP: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   env: tOptional(tArray(tType('NameValue'))),
   headless: tOptional(tBoolean),
   devtools: tOptional(tBoolean),
@@ -506,7 +557,8 @@ scheme.BrowserTypeLaunchParams = tObject({
   tracesDir: tOptional(tString),
   chromiumSandbox: tOptional(tBoolean),
   firefoxUserPrefs: tOptional(tAny),
-  slowMo: tOptional(tNumber),
+  cdpPort: tOptional(tInt),
+  slowMo: tOptional(tFloat),
 });
 scheme.BrowserTypeLaunchResult = tObject({
   browser: tChannel(['Browser']),
@@ -517,10 +569,11 @@ scheme.BrowserTypeLaunchPersistentContextParams = tObject({
   args: tOptional(tArray(tString)),
   ignoreAllDefaultArgs: tOptional(tBoolean),
   ignoreDefaultArgs: tOptional(tArray(tString)),
+  assistantMode: tOptional(tBoolean),
   handleSIGINT: tOptional(tBoolean),
   handleSIGTERM: tOptional(tBoolean),
   handleSIGHUP: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   env: tOptional(tArray(tType('NameValue'))),
   headless: tOptional(tBoolean),
   devtools: tOptional(tBoolean),
@@ -534,14 +587,15 @@ scheme.BrowserTypeLaunchPersistentContextParams = tObject({
   tracesDir: tOptional(tString),
   chromiumSandbox: tOptional(tBoolean),
   firefoxUserPrefs: tOptional(tAny),
+  cdpPort: tOptional(tInt),
   noDefaultViewport: tOptional(tBoolean),
   viewport: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   screen: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   ignoreHTTPSErrors: tOptional(tBoolean),
   clientCertificates: tOptional(tArray(tObject({
@@ -557,9 +611,9 @@ scheme.BrowserTypeLaunchPersistentContextParams = tObject({
   locale: tOptional(tString),
   timezoneId: tOptional(tString),
   geolocation: tOptional(tObject({
-    longitude: tNumber,
-    latitude: tNumber,
-    accuracy: tOptional(tNumber),
+    longitude: tFloat,
+    latitude: tFloat,
+    accuracy: tOptional(tFloat),
   })),
   permissions: tOptional(tArray(tString)),
   extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
@@ -570,35 +624,38 @@ scheme.BrowserTypeLaunchPersistentContextParams = tObject({
     origin: tOptional(tString),
     send: tOptional(tEnum(['always', 'unauthorized'])),
   })),
-  deviceScaleFactor: tOptional(tNumber),
+  deviceScaleFactor: tOptional(tFloat),
   isMobile: tOptional(tBoolean),
   hasTouch: tOptional(tBoolean),
   colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
   reducedMotion: tOptional(tEnum(['reduce', 'no-preference', 'no-override'])),
   forcedColors: tOptional(tEnum(['active', 'none', 'no-override'])),
   acceptDownloads: tOptional(tEnum(['accept', 'deny', 'internal-browser-default'])),
+  contrast: tOptional(tEnum(['no-preference', 'more', 'no-override'])),
   baseURL: tOptional(tString),
   recordVideo: tOptional(tObject({
     dir: tString,
     size: tOptional(tObject({
-      width: tNumber,
-      height: tNumber,
+      width: tInt,
+      height: tInt,
     })),
   })),
-  recordHar: tOptional(tType('RecordHarOptions')),
   strictSelectors: tOptional(tBoolean),
   serviceWorkers: tOptional(tEnum(['allow', 'block'])),
+  selectorEngines: tOptional(tArray(tType('SelectorEngine'))),
+  testIdAttributeName: tOptional(tString),
   userDataDir: tString,
-  slowMo: tOptional(tNumber),
+  slowMo: tOptional(tFloat),
 });
 scheme.BrowserTypeLaunchPersistentContextResult = tObject({
+  browser: tChannel(['Browser']),
   context: tChannel(['BrowserContext']),
 });
 scheme.BrowserTypeConnectOverCDPParams = tObject({
   endpointURL: tString,
   headers: tOptional(tArray(tType('NameValue'))),
-  slowMo: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  slowMo: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.BrowserTypeConnectOverCDPResult = tObject({
   browser: tChannel(['Browser']),
@@ -608,6 +665,9 @@ scheme.BrowserInitializer = tObject({
   version: tString,
   name: tString,
 });
+scheme.BrowserContextEvent = tObject({
+  context: tChannel(['BrowserContext']),
+});
 scheme.BrowserCloseEvent = tOptional(tObject({}));
 scheme.BrowserCloseParams = tObject({
   reason: tOptional(tString),
@@ -622,12 +682,12 @@ scheme.BrowserDefaultUserAgentForTestResult = tObject({
 scheme.BrowserNewContextParams = tObject({
   noDefaultViewport: tOptional(tBoolean),
   viewport: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   screen: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   ignoreHTTPSErrors: tOptional(tBoolean),
   clientCertificates: tOptional(tArray(tObject({
@@ -643,9 +703,9 @@ scheme.BrowserNewContextParams = tObject({
   locale: tOptional(tString),
   timezoneId: tOptional(tString),
   geolocation: tOptional(tObject({
-    longitude: tNumber,
-    latitude: tNumber,
-    accuracy: tOptional(tNumber),
+    longitude: tFloat,
+    latitude: tFloat,
+    accuracy: tOptional(tFloat),
   })),
   permissions: tOptional(tArray(tString)),
   extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
@@ -656,24 +716,26 @@ scheme.BrowserNewContextParams = tObject({
     origin: tOptional(tString),
     send: tOptional(tEnum(['always', 'unauthorized'])),
   })),
-  deviceScaleFactor: tOptional(tNumber),
+  deviceScaleFactor: tOptional(tFloat),
   isMobile: tOptional(tBoolean),
   hasTouch: tOptional(tBoolean),
   colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
   reducedMotion: tOptional(tEnum(['reduce', 'no-preference', 'no-override'])),
   forcedColors: tOptional(tEnum(['active', 'none', 'no-override'])),
   acceptDownloads: tOptional(tEnum(['accept', 'deny', 'internal-browser-default'])),
+  contrast: tOptional(tEnum(['no-preference', 'more', 'no-override'])),
   baseURL: tOptional(tString),
   recordVideo: tOptional(tObject({
     dir: tString,
     size: tOptional(tObject({
-      width: tNumber,
-      height: tNumber,
+      width: tInt,
+      height: tInt,
     })),
   })),
-  recordHar: tOptional(tType('RecordHarOptions')),
   strictSelectors: tOptional(tBoolean),
   serviceWorkers: tOptional(tEnum(['allow', 'block'])),
+  selectorEngines: tOptional(tArray(tType('SelectorEngine'))),
+  testIdAttributeName: tOptional(tString),
   proxy: tOptional(tObject({
     server: tString,
     bypass: tOptional(tString),
@@ -682,7 +744,7 @@ scheme.BrowserNewContextParams = tObject({
   })),
   storageState: tOptional(tObject({
     cookies: tOptional(tArray(tType('SetNetworkCookie'))),
-    origins: tOptional(tArray(tType('OriginStorage'))),
+    origins: tOptional(tArray(tType('SetOriginStorage'))),
   })),
 });
 scheme.BrowserNewContextResult = tObject({
@@ -691,12 +753,12 @@ scheme.BrowserNewContextResult = tObject({
 scheme.BrowserNewContextForReuseParams = tObject({
   noDefaultViewport: tOptional(tBoolean),
   viewport: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   screen: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   ignoreHTTPSErrors: tOptional(tBoolean),
   clientCertificates: tOptional(tArray(tObject({
@@ -712,9 +774,9 @@ scheme.BrowserNewContextForReuseParams = tObject({
   locale: tOptional(tString),
   timezoneId: tOptional(tString),
   geolocation: tOptional(tObject({
-    longitude: tNumber,
-    latitude: tNumber,
-    accuracy: tOptional(tNumber),
+    longitude: tFloat,
+    latitude: tFloat,
+    accuracy: tOptional(tFloat),
   })),
   permissions: tOptional(tArray(tString)),
   extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
@@ -725,24 +787,26 @@ scheme.BrowserNewContextForReuseParams = tObject({
     origin: tOptional(tString),
     send: tOptional(tEnum(['always', 'unauthorized'])),
   })),
-  deviceScaleFactor: tOptional(tNumber),
+  deviceScaleFactor: tOptional(tFloat),
   isMobile: tOptional(tBoolean),
   hasTouch: tOptional(tBoolean),
   colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
   reducedMotion: tOptional(tEnum(['reduce', 'no-preference', 'no-override'])),
   forcedColors: tOptional(tEnum(['active', 'none', 'no-override'])),
   acceptDownloads: tOptional(tEnum(['accept', 'deny', 'internal-browser-default'])),
+  contrast: tOptional(tEnum(['no-preference', 'more', 'no-override'])),
   baseURL: tOptional(tString),
   recordVideo: tOptional(tObject({
     dir: tString,
     size: tOptional(tObject({
-      width: tNumber,
-      height: tNumber,
+      width: tInt,
+      height: tInt,
     })),
   })),
-  recordHar: tOptional(tType('RecordHarOptions')),
   strictSelectors: tOptional(tBoolean),
   serviceWorkers: tOptional(tEnum(['allow', 'block'])),
+  selectorEngines: tOptional(tArray(tType('SelectorEngine'))),
+  testIdAttributeName: tOptional(tString),
   proxy: tOptional(tObject({
     server: tString,
     bypass: tOptional(tString),
@@ -751,16 +815,16 @@ scheme.BrowserNewContextForReuseParams = tObject({
   })),
   storageState: tOptional(tObject({
     cookies: tOptional(tArray(tType('SetNetworkCookie'))),
-    origins: tOptional(tArray(tType('OriginStorage'))),
+    origins: tOptional(tArray(tType('SetOriginStorage'))),
   })),
 });
 scheme.BrowserNewContextForReuseResult = tObject({
   context: tChannel(['BrowserContext']),
 });
-scheme.BrowserStopPendingOperationsParams = tObject({
+scheme.BrowserDisconnectFromReusedContextParams = tObject({
   reason: tString,
 });
-scheme.BrowserStopPendingOperationsResult = tOptional(tObject({}));
+scheme.BrowserDisconnectFromReusedContextResult = tOptional(tObject({}));
 scheme.BrowserNewBrowserCDPSessionParams = tOptional(tObject({}));
 scheme.BrowserNewBrowserCDPSessionResult = tObject({
   session: tChannel(['CDPSession']),
@@ -800,6 +864,64 @@ scheme.BrowserContextInitializer = tObject({
   isChromium: tBoolean,
   requestContext: tChannel(['APIRequestContext']),
   tracing: tChannel(['Tracing']),
+  options: tObject({
+    noDefaultViewport: tOptional(tBoolean),
+    viewport: tOptional(tObject({
+      width: tInt,
+      height: tInt,
+    })),
+    screen: tOptional(tObject({
+      width: tInt,
+      height: tInt,
+    })),
+    ignoreHTTPSErrors: tOptional(tBoolean),
+    clientCertificates: tOptional(tArray(tObject({
+      origin: tString,
+      cert: tOptional(tBinary),
+      key: tOptional(tBinary),
+      passphrase: tOptional(tString),
+      pfx: tOptional(tBinary),
+    }))),
+    javaScriptEnabled: tOptional(tBoolean),
+    bypassCSP: tOptional(tBoolean),
+    userAgent: tOptional(tString),
+    locale: tOptional(tString),
+    timezoneId: tOptional(tString),
+    geolocation: tOptional(tObject({
+      longitude: tFloat,
+      latitude: tFloat,
+      accuracy: tOptional(tFloat),
+    })),
+    permissions: tOptional(tArray(tString)),
+    extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
+    offline: tOptional(tBoolean),
+    httpCredentials: tOptional(tObject({
+      username: tString,
+      password: tString,
+      origin: tOptional(tString),
+      send: tOptional(tEnum(['always', 'unauthorized'])),
+    })),
+    deviceScaleFactor: tOptional(tFloat),
+    isMobile: tOptional(tBoolean),
+    hasTouch: tOptional(tBoolean),
+    colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
+    reducedMotion: tOptional(tEnum(['reduce', 'no-preference', 'no-override'])),
+    forcedColors: tOptional(tEnum(['active', 'none', 'no-override'])),
+    acceptDownloads: tOptional(tEnum(['accept', 'deny', 'internal-browser-default'])),
+    contrast: tOptional(tEnum(['no-preference', 'more', 'no-override'])),
+    baseURL: tOptional(tString),
+    recordVideo: tOptional(tObject({
+      dir: tString,
+      size: tOptional(tObject({
+        width: tInt,
+        height: tInt,
+      })),
+    })),
+    strictSelectors: tOptional(tBoolean),
+    serviceWorkers: tOptional(tEnum(['allow', 'block'])),
+    selectorEngines: tOptional(tArray(tType('SelectorEngine'))),
+    testIdAttributeName: tOptional(tString),
+  }),
 });
 scheme.BrowserContextBindingCallEvent = tObject({
   binding: tChannel(['BindingCall']),
@@ -810,8 +932,8 @@ scheme.BrowserContextConsoleEvent = tObject({
   args: tArray(tChannel(['ElementHandle', 'JSHandle'])),
   location: tObject({
     url: tString,
-    lineNumber: tNumber,
-    columnNumber: tNumber,
+    lineNumber: tInt,
+    columnNumber: tInt,
   }),
   page: tChannel(['Page']),
 });
@@ -829,6 +951,9 @@ scheme.BrowserContextPageErrorEvent = tObject({
 scheme.BrowserContextRouteEvent = tObject({
   route: tChannel(['Route']),
 });
+scheme.BrowserContextWebSocketRouteEvent = tObject({
+  webSocketRoute: tChannel(['WebSocketRoute']),
+});
 scheme.BrowserContextVideoEvent = tObject({
   artifact: tChannel(['Artifact']),
 });
@@ -845,19 +970,25 @@ scheme.BrowserContextRequestEvent = tObject({
 scheme.BrowserContextRequestFailedEvent = tObject({
   request: tChannel(['Request']),
   failureText: tOptional(tString),
-  responseEndTiming: tNumber,
+  responseEndTiming: tFloat,
   page: tOptional(tChannel(['Page'])),
 });
 scheme.BrowserContextRequestFinishedEvent = tObject({
   request: tChannel(['Request']),
   response: tOptional(tChannel(['Response'])),
-  responseEndTiming: tNumber,
+  responseEndTiming: tFloat,
   page: tOptional(tChannel(['Page'])),
 });
 scheme.BrowserContextResponseEvent = tObject({
   response: tChannel(['Response']),
   page: tOptional(tChannel(['Page'])),
 });
+scheme.BrowserContextRecorderEventEvent = tObject({
+  event: tEnum(['actionAdded', 'actionUpdated', 'signalAdded']),
+  data: tAny,
+  page: tChannel(['Page']),
+  code: tString,
+});
 scheme.BrowserContextAddCookiesParams = tObject({
   cookies: tArray(tType('SetNetworkCookie')),
 });
@@ -904,23 +1035,23 @@ scheme.BrowserContextNewPageParams = tOptional(tObject({}));
 scheme.BrowserContextNewPageResult = tObject({
   page: tChannel(['Page']),
 });
-scheme.BrowserContextSetDefaultNavigationTimeoutNoReplyParams = tObject({
-  timeout: tOptional(tNumber),
+scheme.BrowserContextRegisterSelectorEngineParams = tObject({
+  selectorEngine: tType('SelectorEngine'),
 });
-scheme.BrowserContextSetDefaultNavigationTimeoutNoReplyResult = tOptional(tObject({}));
-scheme.BrowserContextSetDefaultTimeoutNoReplyParams = tObject({
-  timeout: tOptional(tNumber),
+scheme.BrowserContextRegisterSelectorEngineResult = tOptional(tObject({}));
+scheme.BrowserContextSetTestIdAttributeNameParams = tObject({
+  testIdAttributeName: tString,
 });
-scheme.BrowserContextSetDefaultTimeoutNoReplyResult = tOptional(tObject({}));
+scheme.BrowserContextSetTestIdAttributeNameResult = tOptional(tObject({}));
 scheme.BrowserContextSetExtraHTTPHeadersParams = tObject({
   headers: tArray(tType('NameValue')),
 });
 scheme.BrowserContextSetExtraHTTPHeadersResult = tOptional(tObject({}));
 scheme.BrowserContextSetGeolocationParams = tObject({
   geolocation: tOptional(tObject({
-    longitude: tNumber,
-    latitude: tNumber,
-    accuracy: tOptional(tNumber),
+    longitude: tFloat,
+    latitude: tFloat,
+    accuracy: tOptional(tFloat),
   })),
 });
 scheme.BrowserContextSetGeolocationResult = tOptional(tObject({}));
@@ -940,20 +1071,31 @@ scheme.BrowserContextSetNetworkInterceptionPatternsParams = tObject({
   })),
 });
 scheme.BrowserContextSetNetworkInterceptionPatternsResult = tOptional(tObject({}));
+scheme.BrowserContextSetWebSocketInterceptionPatternsParams = tObject({
+  patterns: tArray(tObject({
+    glob: tOptional(tString),
+    regexSource: tOptional(tString),
+    regexFlags: tOptional(tString),
+  })),
+});
+scheme.BrowserContextSetWebSocketInterceptionPatternsResult = tOptional(tObject({}));
 scheme.BrowserContextSetOfflineParams = tObject({
   offline: tBoolean,
 });
 scheme.BrowserContextSetOfflineResult = tOptional(tObject({}));
-scheme.BrowserContextStorageStateParams = tOptional(tObject({}));
+scheme.BrowserContextStorageStateParams = tObject({
+  indexedDB: tOptional(tBoolean),
+});
 scheme.BrowserContextStorageStateResult = tObject({
   cookies: tArray(tType('NetworkCookie')),
   origins: tArray(tType('OriginStorage')),
 });
 scheme.BrowserContextPauseParams = tOptional(tObject({}));
 scheme.BrowserContextPauseResult = tOptional(tObject({}));
-scheme.BrowserContextRecorderSupplementEnableParams = tObject({
+scheme.BrowserContextEnableRecorderParams = tObject({
   language: tOptional(tString),
   mode: tOptional(tEnum(['inspecting', 'recording'])),
+  recorderMode: tOptional(tEnum(['default', 'api'])),
   pauseOnNextStatement: tOptional(tBoolean),
   testIdAttributeName: tOptional(tString),
   launchOptions: tOptional(tAny),
@@ -964,7 +1106,9 @@ scheme.BrowserContextRecorderSupplementEnableParams = tObject({
   handleSIGINT: tOptional(tBoolean),
   omitCallTracking: tOptional(tBoolean),
 });
-scheme.BrowserContextRecorderSupplementEnableResult = tOptional(tObject({}));
+scheme.BrowserContextEnableRecorderResult = tOptional(tObject({}));
+scheme.BrowserContextDisableRecorderParams = tOptional(tObject({}));
+scheme.BrowserContextDisableRecorderResult = tOptional(tObject({}));
 scheme.BrowserContextNewCDPSessionParams = tObject({
   page: tOptional(tChannel(['Page'])),
   frame: tOptional(tChannel(['Frame'])),
@@ -989,7 +1133,7 @@ scheme.BrowserContextCreateTempFilesParams = tObject({
   rootDirName: tOptional(tString),
   items: tArray(tObject({
     name: tString,
-    lastModifiedMs: tOptional(tNumber),
+    lastModifiedMs: tOptional(tFloat),
   })),
 });
 scheme.BrowserContextCreateTempFilesResult = tObject({
@@ -1002,42 +1146,42 @@ scheme.BrowserContextUpdateSubscriptionParams = tObject({
 });
 scheme.BrowserContextUpdateSubscriptionResult = tOptional(tObject({}));
 scheme.BrowserContextClockFastForwardParams = tObject({
-  ticksNumber: tOptional(tNumber),
+  ticksNumber: tOptional(tFloat),
   ticksString: tOptional(tString),
 });
 scheme.BrowserContextClockFastForwardResult = tOptional(tObject({}));
 scheme.BrowserContextClockInstallParams = tObject({
-  timeNumber: tOptional(tNumber),
+  timeNumber: tOptional(tFloat),
   timeString: tOptional(tString),
 });
 scheme.BrowserContextClockInstallResult = tOptional(tObject({}));
 scheme.BrowserContextClockPauseAtParams = tObject({
-  timeNumber: tOptional(tNumber),
+  timeNumber: tOptional(tFloat),
   timeString: tOptional(tString),
 });
 scheme.BrowserContextClockPauseAtResult = tOptional(tObject({}));
 scheme.BrowserContextClockResumeParams = tOptional(tObject({}));
 scheme.BrowserContextClockResumeResult = tOptional(tObject({}));
 scheme.BrowserContextClockRunForParams = tObject({
-  ticksNumber: tOptional(tNumber),
+  ticksNumber: tOptional(tFloat),
   ticksString: tOptional(tString),
 });
 scheme.BrowserContextClockRunForResult = tOptional(tObject({}));
 scheme.BrowserContextClockSetFixedTimeParams = tObject({
-  timeNumber: tOptional(tNumber),
+  timeNumber: tOptional(tFloat),
   timeString: tOptional(tString),
 });
 scheme.BrowserContextClockSetFixedTimeResult = tOptional(tObject({}));
 scheme.BrowserContextClockSetSystemTimeParams = tObject({
-  timeNumber: tOptional(tNumber),
+  timeNumber: tOptional(tFloat),
   timeString: tOptional(tString),
 });
 scheme.BrowserContextClockSetSystemTimeResult = tOptional(tObject({}));
 scheme.PageInitializer = tObject({
   mainFrame: tChannel(['Frame']),
   viewportSize: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   isClosed: tBoolean,
   opener: tOptional(tChannel(['Page'])),
@@ -1052,6 +1196,12 @@ scheme.PageDownloadEvent = tObject({
   suggestedFilename: tString,
   artifact: tChannel(['Artifact']),
 });
+scheme.PageViewportSizeChangedEvent = tObject({
+  viewportSize: tOptional(tObject({
+    width: tInt,
+    height: tInt,
+  })),
+});
 scheme.PageFileChooserEvent = tObject({
   element: tChannel(['ElementHandle']),
   isMultiple: tBoolean,
@@ -1063,11 +1213,14 @@ scheme.PageFrameDetachedEvent = tObject({
   frame: tChannel(['Frame']),
 });
 scheme.PageLocatorHandlerTriggeredEvent = tObject({
-  uid: tNumber,
+  uid: tInt,
 });
 scheme.PageRouteEvent = tObject({
   route: tChannel(['Route']),
 });
+scheme.PageWebSocketRouteEvent = tObject({
+  webSocketRoute: tChannel(['WebSocketRoute']),
+});
 scheme.PageVideoEvent = tObject({
   artifact: tChannel(['Artifact']),
 });
@@ -1077,14 +1230,6 @@ scheme.PageWebSocketEvent = tObject({
 scheme.PageWorkerEvent = tObject({
   worker: tChannel(['Worker']),
 });
-scheme.PageSetDefaultNavigationTimeoutNoReplyParams = tObject({
-  timeout: tOptional(tNumber),
-});
-scheme.PageSetDefaultNavigationTimeoutNoReplyResult = tOptional(tObject({}));
-scheme.PageSetDefaultTimeoutNoReplyParams = tObject({
-  timeout: tOptional(tNumber),
-});
-scheme.PageSetDefaultTimeoutNoReplyResult = tOptional(tObject({}));
 scheme.PageAddInitScriptParams = tObject({
   source: tString,
 });
@@ -1099,6 +1244,7 @@ scheme.PageEmulateMediaParams = tObject({
   colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
   reducedMotion: tOptional(tEnum(['reduce', 'no-preference', 'no-override'])),
   forcedColors: tOptional(tEnum(['active', 'none', 'no-override'])),
+  contrast: tOptional(tEnum(['no-preference', 'more', 'no-override'])),
 });
 scheme.PageEmulateMediaResult = tOptional(tObject({}));
 scheme.PageExposeBindingParams = tObject({
@@ -1107,37 +1253,39 @@ scheme.PageExposeBindingParams = tObject({
 });
 scheme.PageExposeBindingResult = tOptional(tObject({}));
 scheme.PageGoBackParams = tObject({
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   waitUntil: tOptional(tType('LifecycleEvent')),
 });
 scheme.PageGoBackResult = tObject({
   response: tOptional(tChannel(['Response'])),
 });
 scheme.PageGoForwardParams = tObject({
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   waitUntil: tOptional(tType('LifecycleEvent')),
 });
 scheme.PageGoForwardResult = tObject({
   response: tOptional(tChannel(['Response'])),
 });
+scheme.PageRequestGCParams = tOptional(tObject({}));
+scheme.PageRequestGCResult = tOptional(tObject({}));
 scheme.PageRegisterLocatorHandlerParams = tObject({
   selector: tString,
   noWaitAfter: tOptional(tBoolean),
 });
 scheme.PageRegisterLocatorHandlerResult = tObject({
-  uid: tNumber,
+  uid: tInt,
 });
 scheme.PageResolveLocatorHandlerNoReplyParams = tObject({
-  uid: tNumber,
+  uid: tInt,
   remove: tOptional(tBoolean),
 });
 scheme.PageResolveLocatorHandlerNoReplyResult = tOptional(tObject({}));
 scheme.PageUnregisterLocatorHandlerParams = tObject({
-  uid: tNumber,
+  uid: tInt,
 });
 scheme.PageUnregisterLocatorHandlerResult = tOptional(tObject({}));
 scheme.PageReloadParams = tObject({
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   waitUntil: tOptional(tType('LifecycleEvent')),
 });
 scheme.PageReloadResult = tObject({
@@ -1145,16 +1293,16 @@ scheme.PageReloadResult = tObject({
 });
 scheme.PageExpectScreenshotParams = tObject({
   expected: tOptional(tBinary),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   isNot: tBoolean,
   locator: tOptional(tObject({
     frame: tChannel(['Frame']),
     selector: tString,
   })),
   comparator: tOptional(tString),
-  maxDiffPixels: tOptional(tNumber),
-  maxDiffPixelRatio: tOptional(tNumber),
-  threshold: tOptional(tNumber),
+  maxDiffPixels: tOptional(tInt),
+  maxDiffPixelRatio: tOptional(tFloat),
+  threshold: tOptional(tFloat),
   fullPage: tOptional(tBoolean),
   clip: tOptional(tType('Rect')),
   omitBackground: tOptional(tBoolean),
@@ -1173,12 +1321,13 @@ scheme.PageExpectScreenshotResult = tObject({
   errorMessage: tOptional(tString),
   actual: tOptional(tBinary),
   previous: tOptional(tBinary),
+  timedOut: tOptional(tBoolean),
   log: tOptional(tArray(tString)),
 });
 scheme.PageScreenshotParams = tObject({
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   type: tOptional(tEnum(['png', 'jpeg'])),
-  quality: tOptional(tNumber),
+  quality: tOptional(tInt),
   fullPage: tOptional(tBoolean),
   clip: tOptional(tType('Rect')),
   omitBackground: tOptional(tBoolean),
@@ -1207,10 +1356,18 @@ scheme.PageSetNetworkInterceptionPatternsParams = tObject({
   })),
 });
 scheme.PageSetNetworkInterceptionPatternsResult = tOptional(tObject({}));
+scheme.PageSetWebSocketInterceptionPatternsParams = tObject({
+  patterns: tArray(tObject({
+    glob: tOptional(tString),
+    regexSource: tOptional(tString),
+    regexFlags: tOptional(tString),
+  })),
+});
+scheme.PageSetWebSocketInterceptionPatternsResult = tOptional(tObject({}));
 scheme.PageSetViewportSizeParams = tObject({
   viewportSize: tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   }),
 });
 scheme.PageSetViewportSizeResult = tOptional(tObject({}));
@@ -1228,46 +1385,46 @@ scheme.PageKeyboardInsertTextParams = tObject({
 scheme.PageKeyboardInsertTextResult = tOptional(tObject({}));
 scheme.PageKeyboardTypeParams = tObject({
   text: tString,
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
 });
 scheme.PageKeyboardTypeResult = tOptional(tObject({}));
 scheme.PageKeyboardPressParams = tObject({
   key: tString,
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
 });
 scheme.PageKeyboardPressResult = tOptional(tObject({}));
 scheme.PageMouseMoveParams = tObject({
-  x: tNumber,
-  y: tNumber,
-  steps: tOptional(tNumber),
+  x: tFloat,
+  y: tFloat,
+  steps: tOptional(tInt),
 });
 scheme.PageMouseMoveResult = tOptional(tObject({}));
 scheme.PageMouseDownParams = tObject({
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  clickCount: tOptional(tNumber),
+  clickCount: tOptional(tInt),
 });
 scheme.PageMouseDownResult = tOptional(tObject({}));
 scheme.PageMouseUpParams = tObject({
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  clickCount: tOptional(tNumber),
+  clickCount: tOptional(tInt),
 });
 scheme.PageMouseUpResult = tOptional(tObject({}));
 scheme.PageMouseClickParams = tObject({
-  x: tNumber,
-  y: tNumber,
-  delay: tOptional(tNumber),
+  x: tFloat,
+  y: tFloat,
+  delay: tOptional(tFloat),
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  clickCount: tOptional(tNumber),
+  clickCount: tOptional(tInt),
 });
 scheme.PageMouseClickResult = tOptional(tObject({}));
 scheme.PageMouseWheelParams = tObject({
-  deltaX: tNumber,
-  deltaY: tNumber,
+  deltaX: tFloat,
+  deltaY: tFloat,
 });
 scheme.PageMouseWheelResult = tOptional(tObject({}));
 scheme.PageTouchscreenTapParams = tObject({
-  x: tNumber,
-  y: tNumber,
+  x: tFloat,
+  y: tFloat,
 });
 scheme.PageTouchscreenTapResult = tOptional(tObject({}));
 scheme.PageAccessibilitySnapshotParams = tObject({
@@ -1278,7 +1435,7 @@ scheme.PageAccessibilitySnapshotResult = tObject({
   rootAXNode: tOptional(tType('AXNode')),
 });
 scheme.PagePdfParams = tObject({
-  scale: tOptional(tNumber),
+  scale: tOptional(tFloat),
   displayHeaderFooter: tOptional(tBoolean),
   headerTemplate: tOptional(tString),
   footerTemplate: tOptional(tString),
@@ -1301,6 +1458,12 @@ scheme.PagePdfParams = tObject({
 scheme.PagePdfResult = tObject({
   pdf: tBinary,
 });
+scheme.PageSnapshotForAIParams = tObject({
+  timeout: tFloat,
+});
+scheme.PageSnapshotForAIResult = tObject({
+  snapshot: tString,
+});
 scheme.PageStartJSCoverageParams = tObject({
   resetOnNavigation: tOptional(tBoolean),
   reportAnonymousScripts: tOptional(tBoolean),
@@ -1316,9 +1479,9 @@ scheme.PageStopJSCoverageResult = tObject({
       functionName: tString,
       isBlockCoverage: tBoolean,
       ranges: tArray(tObject({
-        startOffset: tNumber,
-        endOffset: tNumber,
-        count: tNumber,
+        startOffset: tInt,
+        endOffset: tInt,
+        count: tInt,
       })),
     })),
   })),
@@ -1333,8 +1496,8 @@ scheme.PageStopCSSCoverageResult = tObject({
     url: tString,
     text: tOptional(tString),
     ranges: tArray(tObject({
-      start: tNumber,
-      end: tNumber,
+      start: tInt,
+      end: tInt,
     })),
   })),
 });
@@ -1397,10 +1560,17 @@ scheme.FrameAddStyleTagParams = tObject({
 scheme.FrameAddStyleTagResult = tObject({
   element: tChannel(['ElementHandle']),
 });
+scheme.FrameAriaSnapshotParams = tObject({
+  selector: tString,
+  timeout: tFloat,
+});
+scheme.FrameAriaSnapshotResult = tObject({
+  snapshot: tString,
+});
 scheme.FrameBlurParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameBlurResult = tOptional(tObject({}));
 scheme.FrameCheckParams = tObject({
@@ -1408,7 +1578,7 @@ scheme.FrameCheckParams = tObject({
   strict: tOptional(tBoolean),
   force: tOptional(tBoolean),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.FrameCheckResult = tOptional(tObject({}));
@@ -1419,10 +1589,10 @@ scheme.FrameClickParams = tObject({
   noWaitAfter: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  clickCount: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  clickCount: tOptional(tInt),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.FrameClickResult = tOptional(tObject({}));
@@ -1434,7 +1604,7 @@ scheme.FrameDragAndDropParams = tObject({
   source: tString,
   target: tString,
   force: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
   sourcePosition: tOptional(tType('Point')),
   targetPosition: tOptional(tType('Point')),
@@ -1447,9 +1617,9 @@ scheme.FrameDblclickParams = tObject({
   force: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.FrameDblclickResult = tOptional(tObject({}));
@@ -1458,7 +1628,7 @@ scheme.FrameDispatchEventParams = tObject({
   strict: tOptional(tBoolean),
   type: tString,
   eventInit: tType('SerializedArgument'),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameDispatchEventResult = tOptional(tObject({}));
 scheme.FrameEvaluateExpressionParams = tObject({
@@ -1482,19 +1652,25 @@ scheme.FrameFillParams = tObject({
   strict: tOptional(tBoolean),
   value: tString,
   force: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameFillResult = tOptional(tObject({}));
 scheme.FrameFocusParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameFocusResult = tOptional(tObject({}));
 scheme.FrameFrameElementParams = tOptional(tObject({}));
 scheme.FrameFrameElementResult = tObject({
   element: tChannel(['ElementHandle']),
 });
+scheme.FrameResolveSelectorParams = tObject({
+  selector: tString,
+});
+scheme.FrameResolveSelectorResult = tObject({
+  resolvedSelector: tString,
+});
 scheme.FrameHighlightParams = tObject({
   selector: tString,
 });
@@ -1503,14 +1679,14 @@ scheme.FrameGetAttributeParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
   name: tString,
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameGetAttributeResult = tObject({
   value: tOptional(tString),
 });
 scheme.FrameGotoParams = tObject({
   url: tString,
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   waitUntil: tOptional(tType('LifecycleEvent')),
   referer: tOptional(tString),
 });
@@ -1523,14 +1699,14 @@ scheme.FrameHoverParams = tObject({
   force: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.FrameHoverResult = tOptional(tObject({}));
 scheme.FrameInnerHTMLParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameInnerHTMLResult = tObject({
   value: tString,
@@ -1538,7 +1714,7 @@ scheme.FrameInnerHTMLResult = tObject({
 scheme.FrameInnerTextParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameInnerTextResult = tObject({
   value: tString,
@@ -1546,7 +1722,7 @@ scheme.FrameInnerTextResult = tObject({
 scheme.FrameInputValueParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameInputValueResult = tObject({
   value: tString,
@@ -1554,7 +1730,7 @@ scheme.FrameInputValueResult = tObject({
 scheme.FrameIsCheckedParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameIsCheckedResult = tObject({
   value: tBoolean,
@@ -1562,7 +1738,7 @@ scheme.FrameIsCheckedResult = tObject({
 scheme.FrameIsDisabledParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameIsDisabledResult = tObject({
   value: tBoolean,
@@ -1570,7 +1746,7 @@ scheme.FrameIsDisabledResult = tObject({
 scheme.FrameIsEnabledParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameIsEnabledResult = tObject({
   value: tBoolean,
@@ -1592,7 +1768,7 @@ scheme.FrameIsVisibleResult = tObject({
 scheme.FrameIsEditableParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameIsEditableResult = tObject({
   value: tBoolean,
@@ -1601,9 +1777,9 @@ scheme.FramePressParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
   key: tString,
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
   noWaitAfter: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FramePressResult = tOptional(tObject({}));
 scheme.FrameQuerySelectorParams = tObject({
@@ -1623,7 +1799,7 @@ scheme.FrameQueryCountParams = tObject({
   selector: tString,
 });
 scheme.FrameQueryCountResult = tObject({
-  value: tNumber,
+  value: tInt,
 });
 scheme.FrameSelectOptionParams = tObject({
   selector: tString,
@@ -1633,18 +1809,17 @@ scheme.FrameSelectOptionParams = tObject({
     valueOrLabel: tOptional(tString),
     value: tOptional(tString),
     label: tOptional(tString),
-    index: tOptional(tNumber),
+    index: tOptional(tInt),
   }))),
   force: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
-  noWaitAfter: tOptional(tBoolean),
+  timeout: tFloat,
 });
 scheme.FrameSelectOptionResult = tObject({
   values: tArray(tString),
 });
 scheme.FrameSetContentParams = tObject({
   html: tString,
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   waitUntil: tOptional(tType('LifecycleEvent')),
 });
 scheme.FrameSetContentResult = tOptional(tObject({}));
@@ -1660,7 +1835,7 @@ scheme.FrameSetInputFilesParams = tObject({
   directoryStream: tOptional(tChannel(['WritableStream'])),
   localPaths: tOptional(tArray(tString)),
   streams: tOptional(tArray(tChannel(['WritableStream']))),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameSetInputFilesResult = tOptional(tObject({}));
 scheme.FrameTapParams = tObject({
@@ -1669,14 +1844,14 @@ scheme.FrameTapParams = tObject({
   force: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.FrameTapResult = tOptional(tObject({}));
 scheme.FrameTextContentParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameTextContentResult = tObject({
   value: tOptional(tString),
@@ -1689,8 +1864,8 @@ scheme.FrameTypeParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
   text: tString,
-  delay: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  delay: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.FrameTypeResult = tOptional(tObject({}));
 scheme.FrameUncheckParams = tObject({
@@ -1698,20 +1873,20 @@ scheme.FrameUncheckParams = tObject({
   strict: tOptional(tBoolean),
   force: tOptional(tBoolean),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.FrameUncheckResult = tOptional(tObject({}));
 scheme.FrameWaitForTimeoutParams = tObject({
-  timeout: tNumber,
+  waitTimeout: tFloat,
 });
 scheme.FrameWaitForTimeoutResult = tOptional(tObject({}));
 scheme.FrameWaitForFunctionParams = tObject({
   expression: tString,
   isFunction: tOptional(tBoolean),
   arg: tType('SerializedArgument'),
-  timeout: tOptional(tNumber),
-  pollingInterval: tOptional(tNumber),
+  timeout: tFloat,
+  pollingInterval: tOptional(tFloat),
 });
 scheme.FrameWaitForFunctionResult = tObject({
   handle: tChannel(['ElementHandle', 'JSHandle']),
@@ -1719,7 +1894,7 @@ scheme.FrameWaitForFunctionResult = tObject({
 scheme.FrameWaitForSelectorParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   state: tOptional(tEnum(['attached', 'detached', 'visible', 'hidden'])),
   omitReturnValue: tOptional(tBoolean),
 });
@@ -1727,15 +1902,15 @@ scheme.FrameWaitForSelectorResult = tObject({
   element: tOptional(tChannel(['ElementHandle'])),
 });
 scheme.FrameExpectParams = tObject({
-  selector: tString,
+  selector: tOptional(tString),
   expression: tString,
   expressionArg: tOptional(tAny),
   expectedText: tOptional(tArray(tType('ExpectedTextValue'))),
-  expectedNumber: tOptional(tNumber),
+  expectedNumber: tOptional(tFloat),
   expectedValue: tOptional(tType('SerializedArgument')),
   useInnerText: tOptional(tBoolean),
   isNot: tBoolean,
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.FrameExpectResult = tObject({
   matches: tBoolean,
@@ -1817,12 +1992,6 @@ scheme.JSHandleJsonValueResult = tObject({
   value: tType('SerializedValue'),
 });
 scheme.ElementHandleJsonValueResult = tType('JSHandleJsonValueResult');
-scheme.JSHandleObjectCountParams = tOptional(tObject({}));
-scheme.ElementHandleObjectCountParams = tType('JSHandleObjectCountParams');
-scheme.JSHandleObjectCountResult = tObject({
-  count: tNumber,
-});
-scheme.ElementHandleObjectCountResult = tType('JSHandleObjectCountResult');
 scheme.ElementHandleInitializer = tObject({
   preview: tString,
 });
@@ -1852,7 +2021,7 @@ scheme.ElementHandleBoundingBoxResult = tObject({
 scheme.ElementHandleCheckParams = tObject({
   force: tOptional(tBoolean),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.ElementHandleCheckResult = tOptional(tObject({}));
@@ -1861,10 +2030,10 @@ scheme.ElementHandleClickParams = tObject({
   noWaitAfter: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  clickCount: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  clickCount: tOptional(tInt),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.ElementHandleClickResult = tOptional(tObject({}));
@@ -1876,9 +2045,9 @@ scheme.ElementHandleDblclickParams = tObject({
   force: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  delay: tOptional(tNumber),
+  delay: tOptional(tFloat),
   button: tOptional(tEnum(['left', 'right', 'middle'])),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.ElementHandleDblclickResult = tOptional(tObject({}));
@@ -1890,7 +2059,7 @@ scheme.ElementHandleDispatchEventResult = tOptional(tObject({}));
 scheme.ElementHandleFillParams = tObject({
   value: tString,
   force: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.ElementHandleFillResult = tOptional(tObject({}));
 scheme.ElementHandleFocusParams = tOptional(tObject({}));
@@ -1905,7 +2074,7 @@ scheme.ElementHandleHoverParams = tObject({
   force: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.ElementHandleHoverResult = tOptional(tObject({}));
@@ -1951,8 +2120,8 @@ scheme.ElementHandleOwnerFrameResult = tObject({
 });
 scheme.ElementHandlePressParams = tObject({
   key: tString,
-  delay: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  delay: tOptional(tFloat),
+  timeout: tFloat,
   noWaitAfter: tOptional(tBoolean),
 });
 scheme.ElementHandlePressResult = tOptional(tObject({}));
@@ -1970,9 +2139,9 @@ scheme.ElementHandleQuerySelectorAllResult = tObject({
   elements: tArray(tChannel(['ElementHandle'])),
 });
 scheme.ElementHandleScreenshotParams = tObject({
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   type: tOptional(tEnum(['png', 'jpeg'])),
-  quality: tOptional(tNumber),
+  quality: tOptional(tInt),
   omitBackground: tOptional(tBoolean),
   caret: tOptional(tEnum(['hide', 'initial'])),
   animations: tOptional(tEnum(['disabled', 'allow'])),
@@ -1988,7 +2157,7 @@ scheme.ElementHandleScreenshotResult = tObject({
   binary: tBinary,
 });
 scheme.ElementHandleScrollIntoViewIfNeededParams = tObject({
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.ElementHandleScrollIntoViewIfNeededResult = tOptional(tObject({}));
 scheme.ElementHandleSelectOptionParams = tObject({
@@ -1997,18 +2166,17 @@ scheme.ElementHandleSelectOptionParams = tObject({
     valueOrLabel: tOptional(tString),
     value: tOptional(tString),
     label: tOptional(tString),
-    index: tOptional(tNumber),
+    index: tOptional(tInt),
   }))),
   force: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
-  noWaitAfter: tOptional(tBoolean),
+  timeout: tFloat,
 });
 scheme.ElementHandleSelectOptionResult = tObject({
   values: tArray(tString),
 });
 scheme.ElementHandleSelectTextParams = tObject({
   force: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.ElementHandleSelectTextResult = tOptional(tObject({}));
 scheme.ElementHandleSetInputFilesParams = tObject({
@@ -2021,14 +2189,14 @@ scheme.ElementHandleSetInputFilesParams = tObject({
   directoryStream: tOptional(tChannel(['WritableStream'])),
   localPaths: tOptional(tArray(tString)),
   streams: tOptional(tArray(tChannel(['WritableStream']))),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.ElementHandleSetInputFilesResult = tOptional(tObject({}));
 scheme.ElementHandleTapParams = tObject({
   force: tOptional(tBoolean),
   modifiers: tOptional(tArray(tEnum(['Alt', 'Control', 'ControlOrMeta', 'Meta', 'Shift']))),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.ElementHandleTapResult = tOptional(tObject({}));
@@ -2038,26 +2206,26 @@ scheme.ElementHandleTextContentResult = tObject({
 });
 scheme.ElementHandleTypeParams = tObject({
   text: tString,
-  delay: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  delay: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.ElementHandleTypeResult = tOptional(tObject({}));
 scheme.ElementHandleUncheckParams = tObject({
   force: tOptional(tBoolean),
   position: tOptional(tType('Point')),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   trial: tOptional(tBoolean),
 });
 scheme.ElementHandleUncheckResult = tOptional(tObject({}));
 scheme.ElementHandleWaitForElementStateParams = tObject({
   state: tEnum(['visible', 'hidden', 'stable', 'enabled', 'disabled', 'editable']),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.ElementHandleWaitForElementStateResult = tOptional(tObject({}));
 scheme.ElementHandleWaitForSelectorParams = tObject({
   selector: tString,
   strict: tOptional(tBoolean),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   state: tOptional(tEnum(['attached', 'detached', 'visible', 'hidden'])),
 });
 scheme.ElementHandleWaitForSelectorResult = tObject({
@@ -2091,7 +2259,6 @@ scheme.RouteRedirectNavigationRequestParams = tObject({
 scheme.RouteRedirectNavigationRequestResult = tOptional(tObject({}));
 scheme.RouteAbortParams = tObject({
   errorCode: tOptional(tString),
-  requestUrl: tString,
 });
 scheme.RouteAbortResult = tOptional(tObject({}));
 scheme.RouteContinueParams = tObject({
@@ -2099,33 +2266,78 @@ scheme.RouteContinueParams = tObject({
   method: tOptional(tString),
   headers: tOptional(tArray(tType('NameValue'))),
   postData: tOptional(tBinary),
-  requestUrl: tString,
   isFallback: tBoolean,
 });
 scheme.RouteContinueResult = tOptional(tObject({}));
 scheme.RouteFulfillParams = tObject({
-  status: tOptional(tNumber),
+  status: tOptional(tInt),
   headers: tOptional(tArray(tType('NameValue'))),
   body: tOptional(tString),
   isBase64: tOptional(tBoolean),
   fetchResponseUid: tOptional(tString),
-  requestUrl: tString,
 });
 scheme.RouteFulfillResult = tOptional(tObject({}));
+scheme.WebSocketRouteInitializer = tObject({
+  url: tString,
+});
+scheme.WebSocketRouteMessageFromPageEvent = tObject({
+  message: tString,
+  isBase64: tBoolean,
+});
+scheme.WebSocketRouteMessageFromServerEvent = tObject({
+  message: tString,
+  isBase64: tBoolean,
+});
+scheme.WebSocketRouteClosePageEvent = tObject({
+  code: tOptional(tInt),
+  reason: tOptional(tString),
+  wasClean: tBoolean,
+});
+scheme.WebSocketRouteCloseServerEvent = tObject({
+  code: tOptional(tInt),
+  reason: tOptional(tString),
+  wasClean: tBoolean,
+});
+scheme.WebSocketRouteConnectParams = tOptional(tObject({}));
+scheme.WebSocketRouteConnectResult = tOptional(tObject({}));
+scheme.WebSocketRouteEnsureOpenedParams = tOptional(tObject({}));
+scheme.WebSocketRouteEnsureOpenedResult = tOptional(tObject({}));
+scheme.WebSocketRouteSendToPageParams = tObject({
+  message: tString,
+  isBase64: tBoolean,
+});
+scheme.WebSocketRouteSendToPageResult = tOptional(tObject({}));
+scheme.WebSocketRouteSendToServerParams = tObject({
+  message: tString,
+  isBase64: tBoolean,
+});
+scheme.WebSocketRouteSendToServerResult = tOptional(tObject({}));
+scheme.WebSocketRouteClosePageParams = tObject({
+  code: tOptional(tInt),
+  reason: tOptional(tString),
+  wasClean: tBoolean,
+});
+scheme.WebSocketRouteClosePageResult = tOptional(tObject({}));
+scheme.WebSocketRouteCloseServerParams = tObject({
+  code: tOptional(tInt),
+  reason: tOptional(tString),
+  wasClean: tBoolean,
+});
+scheme.WebSocketRouteCloseServerResult = tOptional(tObject({}));
 scheme.ResourceTiming = tObject({
-  startTime: tNumber,
-  domainLookupStart: tNumber,
-  domainLookupEnd: tNumber,
-  connectStart: tNumber,
-  secureConnectionStart: tNumber,
-  connectEnd: tNumber,
-  requestStart: tNumber,
-  responseStart: tNumber,
+  startTime: tFloat,
+  domainLookupStart: tFloat,
+  domainLookupEnd: tFloat,
+  connectStart: tFloat,
+  secureConnectionStart: tFloat,
+  connectEnd: tFloat,
+  requestStart: tFloat,
+  responseStart: tFloat,
 });
 scheme.ResponseInitializer = tObject({
   request: tChannel(['Request']),
   url: tString,
-  status: tNumber,
+  status: tInt,
   statusText: tString,
   headers: tArray(tType('NameValue')),
   timing: tType('ResourceTiming'),
@@ -2155,29 +2367,29 @@ scheme.SecurityDetails = tObject({
   issuer: tOptional(tString),
   protocol: tOptional(tString),
   subjectName: tOptional(tString),
-  validFrom: tOptional(tNumber),
-  validTo: tOptional(tNumber),
+  validFrom: tOptional(tFloat),
+  validTo: tOptional(tFloat),
 });
 scheme.RequestSizes = tObject({
-  requestBodySize: tNumber,
-  requestHeadersSize: tNumber,
-  responseBodySize: tNumber,
-  responseHeadersSize: tNumber,
+  requestBodySize: tInt,
+  requestHeadersSize: tInt,
+  responseBodySize: tInt,
+  responseHeadersSize: tInt,
 });
 scheme.RemoteAddr = tObject({
   ipAddress: tString,
-  port: tNumber,
+  port: tInt,
 });
 scheme.WebSocketInitializer = tObject({
   url: tString,
 });
 scheme.WebSocketOpenEvent = tOptional(tObject({}));
 scheme.WebSocketFrameSentEvent = tObject({
-  opcode: tNumber,
+  opcode: tInt,
   data: tString,
 });
 scheme.WebSocketFrameReceivedEvent = tObject({
-  opcode: tNumber,
+  opcode: tInt,
   data: tString,
 });
 scheme.WebSocketSocketErrorEvent = tObject({
@@ -2225,6 +2437,17 @@ scheme.TracingTracingStartChunkParams = tObject({
 scheme.TracingTracingStartChunkResult = tObject({
   traceName: tString,
 });
+scheme.TracingTracingGroupParams = tObject({
+  name: tString,
+  location: tOptional(tObject({
+    file: tString,
+    line: tOptional(tInt),
+    column: tOptional(tInt),
+  })),
+});
+scheme.TracingTracingGroupResult = tOptional(tObject({}));
+scheme.TracingTracingGroupEndParams = tOptional(tObject({}));
+scheme.TracingTracingGroupEndResult = tOptional(tObject({}));
 scheme.TracingTracingStopChunkParams = tObject({
   mode: tEnum(['archive', 'discard', 'entries']),
 });
@@ -2263,7 +2486,7 @@ scheme.ArtifactDeleteParams = tOptional(tObject({}));
 scheme.ArtifactDeleteResult = tOptional(tObject({}));
 scheme.StreamInitializer = tOptional(tObject({}));
 scheme.StreamReadParams = tObject({
-  size: tOptional(tNumber),
+  size: tOptional(tInt),
 });
 scheme.StreamReadResult = tObject({
   binary: tBinary,
@@ -2297,15 +2520,15 @@ scheme.ElectronLaunchParams = tObject({
   args: tOptional(tArray(tString)),
   cwd: tOptional(tString),
   env: tOptional(tArray(tType('NameValue'))),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
   acceptDownloads: tOptional(tEnum(['accept', 'deny', 'internal-browser-default'])),
   bypassCSP: tOptional(tBoolean),
   colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
   extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
   geolocation: tOptional(tObject({
-    longitude: tNumber,
-    latitude: tNumber,
-    accuracy: tOptional(tNumber),
+    longitude: tFloat,
+    latitude: tFloat,
+    accuracy: tOptional(tFloat),
   })),
   httpCredentials: tOptional(tObject({
     username: tString,
@@ -2315,17 +2538,18 @@ scheme.ElectronLaunchParams = tObject({
   ignoreHTTPSErrors: tOptional(tBoolean),
   locale: tOptional(tString),
   offline: tOptional(tBoolean),
-  recordHar: tOptional(tType('RecordHarOptions')),
   recordVideo: tOptional(tObject({
     dir: tString,
     size: tOptional(tObject({
-      width: tNumber,
-      height: tNumber,
+      width: tInt,
+      height: tInt,
     })),
   })),
   strictSelectors: tOptional(tBoolean),
   timezoneId: tOptional(tString),
   tracesDir: tOptional(tString),
+  selectorEngines: tOptional(tArray(tType('SelectorEngine'))),
+  testIdAttributeName: tOptional(tString),
 });
 scheme.ElectronLaunchResult = tObject({
   electronApplication: tChannel(['ElectronApplication']),
@@ -2340,8 +2564,8 @@ scheme.ElectronApplicationConsoleEvent = tObject({
   args: tArray(tChannel(['ElementHandle', 'JSHandle'])),
   location: tObject({
     url: tString,
-    lineNumber: tNumber,
-    columnNumber: tNumber,
+    lineNumber: tInt,
+    columnNumber: tInt,
   }),
 });
 scheme.ElectronApplicationBrowserWindowParams = tObject({
@@ -2374,16 +2598,12 @@ scheme.ElectronApplicationUpdateSubscriptionResult = tOptional(tObject({}));
 scheme.AndroidInitializer = tOptional(tObject({}));
 scheme.AndroidDevicesParams = tObject({
   host: tOptional(tString),
-  port: tOptional(tNumber),
+  port: tOptional(tInt),
   omitDriverInstall: tOptional(tBoolean),
 });
 scheme.AndroidDevicesResult = tObject({
   devices: tArray(tChannel(['AndroidDevice'])),
 });
-scheme.AndroidSetDefaultTimeoutNoReplyParams = tObject({
-  timeout: tNumber,
-});
-scheme.AndroidSetDefaultTimeoutNoReplyResult = tOptional(tObject({}));
 scheme.AndroidSocketInitializer = tOptional(tObject({}));
 scheme.AndroidSocketDataEvent = tObject({
   data: tBinary,
@@ -2407,74 +2627,74 @@ scheme.AndroidDeviceWebViewRemovedEvent = tObject({
   socketName: tString,
 });
 scheme.AndroidDeviceWaitParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
   state: tOptional(tEnum(['gone'])),
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceWaitResult = tOptional(tObject({}));
 scheme.AndroidDeviceFillParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
   text: tString,
-  timeout: tOptional(tNumber),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceFillResult = tOptional(tObject({}));
 scheme.AndroidDeviceTapParams = tObject({
-  selector: tType('AndroidSelector'),
-  duration: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  androidSelector: tType('AndroidSelector'),
+  duration: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceTapResult = tOptional(tObject({}));
 scheme.AndroidDeviceDragParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
   dest: tType('Point'),
-  speed: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  speed: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceDragResult = tOptional(tObject({}));
 scheme.AndroidDeviceFlingParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
   direction: tEnum(['up', 'down', 'left', 'right']),
-  speed: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  speed: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceFlingResult = tOptional(tObject({}));
 scheme.AndroidDeviceLongTapParams = tObject({
-  selector: tType('AndroidSelector'),
-  timeout: tOptional(tNumber),
+  androidSelector: tType('AndroidSelector'),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceLongTapResult = tOptional(tObject({}));
 scheme.AndroidDevicePinchCloseParams = tObject({
-  selector: tType('AndroidSelector'),
-  percent: tNumber,
-  speed: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  androidSelector: tType('AndroidSelector'),
+  percent: tFloat,
+  speed: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDevicePinchCloseResult = tOptional(tObject({}));
 scheme.AndroidDevicePinchOpenParams = tObject({
-  selector: tType('AndroidSelector'),
-  percent: tNumber,
-  speed: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  androidSelector: tType('AndroidSelector'),
+  percent: tFloat,
+  speed: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDevicePinchOpenResult = tOptional(tObject({}));
 scheme.AndroidDeviceScrollParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
   direction: tEnum(['up', 'down', 'left', 'right']),
-  percent: tNumber,
-  speed: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  percent: tFloat,
+  speed: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceScrollResult = tOptional(tObject({}));
 scheme.AndroidDeviceSwipeParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
   direction: tEnum(['up', 'down', 'left', 'right']),
-  percent: tNumber,
-  speed: tOptional(tNumber),
-  timeout: tOptional(tNumber),
+  percent: tFloat,
+  speed: tOptional(tFloat),
+  timeout: tFloat,
 });
 scheme.AndroidDeviceSwipeResult = tOptional(tObject({}));
 scheme.AndroidDeviceInfoParams = tObject({
-  selector: tType('AndroidSelector'),
+  androidSelector: tType('AndroidSelector'),
 });
 scheme.AndroidDeviceInfoResult = tObject({
   info: tType('AndroidElementInfo'),
@@ -2497,24 +2717,24 @@ scheme.AndroidDeviceInputTapParams = tObject({
 scheme.AndroidDeviceInputTapResult = tOptional(tObject({}));
 scheme.AndroidDeviceInputSwipeParams = tObject({
   segments: tArray(tType('Point')),
-  steps: tNumber,
+  steps: tInt,
 });
 scheme.AndroidDeviceInputSwipeResult = tOptional(tObject({}));
 scheme.AndroidDeviceInputDragParams = tObject({
   from: tType('Point'),
   to: tType('Point'),
-  steps: tNumber,
+  steps: tInt,
 });
 scheme.AndroidDeviceInputDragResult = tOptional(tObject({}));
 scheme.AndroidDeviceLaunchBrowserParams = tObject({
   noDefaultViewport: tOptional(tBoolean),
   viewport: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   screen: tOptional(tObject({
-    width: tNumber,
-    height: tNumber,
+    width: tInt,
+    height: tInt,
   })),
   ignoreHTTPSErrors: tOptional(tBoolean),
   clientCertificates: tOptional(tArray(tObject({
@@ -2530,9 +2750,9 @@ scheme.AndroidDeviceLaunchBrowserParams = tObject({
   locale: tOptional(tString),
   timezoneId: tOptional(tString),
   geolocation: tOptional(tObject({
-    longitude: tNumber,
-    latitude: tNumber,
-    accuracy: tOptional(tNumber),
+    longitude: tFloat,
+    latitude: tFloat,
+    accuracy: tOptional(tFloat),
   })),
   permissions: tOptional(tArray(tString)),
   extraHTTPHeaders: tOptional(tArray(tType('NameValue'))),
@@ -2543,24 +2763,26 @@ scheme.AndroidDeviceLaunchBrowserParams = tObject({
     origin: tOptional(tString),
     send: tOptional(tEnum(['always', 'unauthorized'])),
   })),
-  deviceScaleFactor: tOptional(tNumber),
+  deviceScaleFactor: tOptional(tFloat),
   isMobile: tOptional(tBoolean),
   hasTouch: tOptional(tBoolean),
   colorScheme: tOptional(tEnum(['dark', 'light', 'no-preference', 'no-override'])),
   reducedMotion: tOptional(tEnum(['reduce', 'no-preference', 'no-override'])),
   forcedColors: tOptional(tEnum(['active', 'none', 'no-override'])),
   acceptDownloads: tOptional(tEnum(['accept', 'deny', 'internal-browser-default'])),
+  contrast: tOptional(tEnum(['no-preference', 'more', 'no-override'])),
   baseURL: tOptional(tString),
   recordVideo: tOptional(tObject({
     dir: tString,
     size: tOptional(tObject({
-      width: tNumber,
-      height: tNumber,
+      width: tInt,
+      height: tInt,
     })),
   })),
-  recordHar: tOptional(tType('RecordHarOptions')),
   strictSelectors: tOptional(tBoolean),
   serviceWorkers: tOptional(tEnum(['allow', 'block'])),
+  selectorEngines: tOptional(tArray(tType('SelectorEngine'))),
+  testIdAttributeName: tOptional(tString),
   pkg: tOptional(tString),
   args: tOptional(tArray(tString)),
   proxy: tOptional(tObject({
@@ -2593,13 +2815,9 @@ scheme.AndroidDeviceInstallApkResult = tOptional(tObject({}));
 scheme.AndroidDevicePushParams = tObject({
   file: tBinary,
   path: tString,
-  mode: tOptional(tNumber),
+  mode: tOptional(tInt),
 });
 scheme.AndroidDevicePushResult = tOptional(tObject({}));
-scheme.AndroidDeviceSetDefaultTimeoutNoReplyParams = tObject({
-  timeout: tNumber,
-});
-scheme.AndroidDeviceSetDefaultTimeoutNoReplyResult = tOptional(tObject({}));
 scheme.AndroidDeviceConnectToWebViewParams = tObject({
   socketName: tString,
 });
@@ -2609,7 +2827,7 @@ scheme.AndroidDeviceConnectToWebViewResult = tObject({
 scheme.AndroidDeviceCloseParams = tOptional(tObject({}));
 scheme.AndroidDeviceCloseResult = tOptional(tObject({}));
 scheme.AndroidWebView = tObject({
-  pid: tNumber,
+  pid: tInt,
   pkg: tString,
   socketName: tString,
 });
@@ -2618,17 +2836,17 @@ scheme.AndroidSelector = tObject({
   checked: tOptional(tBoolean),
   clazz: tOptional(tString),
   clickable: tOptional(tBoolean),
-  depth: tOptional(tNumber),
+  depth: tOptional(tInt),
   desc: tOptional(tString),
   enabled: tOptional(tBoolean),
   focusable: tOptional(tBoolean),
   focused: tOptional(tBoolean),
   hasChild: tOptional(tObject({
-    selector: tType('AndroidSelector'),
+    androidSelector: tType('AndroidSelector'),
   })),
   hasDescendant: tOptional(tObject({
-    selector: tType('AndroidSelector'),
-    maxDepth: tOptional(tNumber),
+    androidSelector: tType('AndroidSelector'),
+    maxDepth: tOptional(tInt),
   })),
   longClickable: tOptional(tBoolean),
   pkg: tOptional(tString),
@@ -2667,4 +2885,4 @@ scheme.JsonPipeSendParams = tObject({
 });
 scheme.JsonPipeSendResult = tOptional(tObject({}));
 scheme.JsonPipeCloseParams = tOptional(tObject({}));
-scheme.JsonPipeCloseResult = tOptional(tObject({}));
\ No newline at end of file
+scheme.JsonPipeCloseResult = tOptional(tObject({}));
diff --git a/packages/playwright-core/src/protocol/validatorPrimitives.ts b/packages/playwright-core/src/protocol/validatorPrimitives.ts
index 9d4614512b11e..3c96c0748f8de 100644
--- a/packages/playwright-core/src/protocol/validatorPrimitives.ts
+++ b/packages/playwright-core/src/protocol/validatorPrimitives.ts
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-import { isUnderTest } from '../utils';
-
 export class ValidationError extends Error {}
 export type Validator = (arg: any, path: string, context: ValidatorContext) => any;
 export type ValidatorContext = {
-  tChannelImpl: (names: '*' | string[], arg: any, path: string, context: ValidatorContext) => any,
-  binary: 'toBase64' | 'fromBase64' | 'buffer',
+  tChannelImpl: (names: '*' | string[], arg: any, path: string, context: ValidatorContext) => any;
+  binary: 'toBase64' | 'fromBase64' | 'buffer';
+  isUnderTest: () => boolean;
 };
 export const scheme: { [key: string]: Validator } = {};
 
@@ -38,12 +37,24 @@ export function createMetadataValidator(): Validator {
   return tOptional(scheme['Metadata']);
 }
 
-export const tNumber: Validator = (arg: any, path: string, context: ValidatorContext) => {
+export const tFloat: Validator = (arg: any, path: string, context: ValidatorContext) => {
   if (arg instanceof Number)
     return arg.valueOf();
   if (typeof arg === 'number')
     return arg;
-  throw new ValidationError(`${path}: expected number, got ${typeof arg}`);
+  throw new ValidationError(`${path}: expected float, got ${typeof arg}`);
+};
+export const tInt: Validator = (arg: any, path: string, context: ValidatorContext) => {
+  let value: number;
+  if (arg instanceof Number)
+    value = arg.valueOf();
+  else if (typeof arg === 'number')
+    value = arg;
+  else
+    throw new ValidationError(`${path}: expected integer, got ${typeof arg}`);
+  if (!Number.isInteger(value))
+    throw new ValidationError(`${path}: expected integer, got float ${value}`);
+  return value;
 };
 export const tBoolean: Validator = (arg: any, path: string, context: ValidatorContext) => {
   if (arg instanceof Boolean)
@@ -113,7 +124,7 @@ export const tObject = (s: { [key: string]: Validator }): Validator => {
       if (!Object.is(value, undefined))
         result[key] = value;
     }
-    if (isUnderTest()) {
+    if (context.isUnderTest()) {
       for (const [key, value] of Object.entries(arg)) {
         if (key.startsWith('__testHook'))
           result[key] = value;
diff --git a/packages/playwright-core/src/remote/DEPS.list b/packages/playwright-core/src/remote/DEPS.list
index 69b28504948fc..f9c5148cac6fa 100644
--- a/packages/playwright-core/src/remote/DEPS.list
+++ b/packages/playwright-core/src/remote/DEPS.list
@@ -1,8 +1,8 @@
 [*]
-../client/
-../common/
 ../server/
 ../server/android/
 ../server/dispatchers/
+../server/utils/
 ../utils/
+../utils/isomorphic
 ../utilsBundle.ts
diff --git a/packages/playwright-core/src/remote/playwrightConnection.ts b/packages/playwright-core/src/remote/playwrightConnection.ts
index cce31207a876a..8741a46fa4b65 100644
--- a/packages/playwright-core/src/remote/playwrightConnection.ts
+++ b/packages/playwright-core/src/remote/playwrightConnection.ts
@@ -14,60 +14,39 @@
  * limitations under the License.
  */
 
-import type { WebSocket } from '../utilsBundle';
-import type { DispatcherScope, Playwright } from '../server';
-import type * as channels from '@protocol/channels';
-import { createPlaywright, DispatcherConnection, RootDispatcher, PlaywrightDispatcher } from '../server';
-import { Browser } from '../server/browser';
-import { serverSideCallMetadata } from '../server/instrumentation';
-import { SocksProxy } from '../common/socksProxy';
-import { assert, isUnderTest } from '../utils';
-import type { LaunchOptions } from '../server/types';
+import { DispatcherConnection, PlaywrightDispatcher, RootDispatcher } from '../server';
 import { AndroidDevice } from '../server/android/android';
+import { Browser } from '../server/browser';
 import { DebugControllerDispatcher } from '../server/dispatchers/debugControllerDispatcher';
-import { startProfiling, stopProfiling } from '../utils';
-import { monotonicTime } from '../utils';
-import { debugLogger } from '../utils/debugLogger';
+import { startProfiling, stopProfiling } from '../server/utils/profiler';
+import { monotonicTime, Semaphore } from '../utils';
+import { debugLogger } from '../server/utils/debugLogger';
+import { PlaywrightDispatcherOptions } from '../server/dispatchers/playwrightDispatcher';
 
-export type ClientType = 'controller' | 'launch-browser' | 'reuse-browser' | 'pre-launched-browser-or-android';
-
-type Options = {
-  socksProxyPattern: string | undefined,
-  browserName: string | null,
-  launchOptions: LaunchOptions,
-};
+import type { DispatcherScope, Playwright } from '../server';
+import type { WebSocket } from '../utilsBundle';
 
-type PreLaunched = {
-  playwright?: Playwright | undefined;
-  browser?: Browser | undefined;
-  androidDevice?: AndroidDevice | undefined;
-  socksProxy?: SocksProxy | undefined;
-};
+export interface PlaywrightInitializeResult extends PlaywrightDispatcherOptions {
+  dispose?(): Promise<void>;
+}
 
 export class PlaywrightConnection {
   private _ws: WebSocket;
-  private _onClose: () => void;
+  private _semaphore: Semaphore;
   private _dispatcherConnection: DispatcherConnection;
   private _cleanups: (() => Promise<void>)[] = [];
   private _id: string;
   private _disconnected = false;
-  private _preLaunched: PreLaunched;
-  private _options: Options;
   private _root: DispatcherScope;
   private _profileName: string;
 
-  constructor(lock: Promise<void>, clientType: ClientType, ws: WebSocket, options: Options, preLaunched: PreLaunched, id: string, onClose: () => void) {
+  constructor(semaphore: Semaphore, ws: WebSocket, controller: boolean, playwright: Playwright, initialize: () => Promise<PlaywrightInitializeResult>, id: string) {
     this._ws = ws;
-    this._preLaunched = preLaunched;
-    this._options = options;
-    options.launchOptions = filterLaunchOptions(options.launchOptions);
-    if (clientType === 'reuse-browser' || clientType === 'pre-launched-browser-or-android')
-      assert(preLaunched.playwright);
-    if (clientType === 'pre-launched-browser-or-android')
-      assert(preLaunched.browser || preLaunched.androidDevice);
-    this._onClose = onClose;
+    this._semaphore = semaphore;
     this._id = id;
-    this._profileName = `${new Date().toISOString()}-${clientType}`;
+    this._profileName = new Date().toISOString();
+
+    const lock = this._semaphore.acquire();
 
     this._dispatcherConnection = new DispatcherConnection();
     this._dispatcherConnection.onmessage = async message => {
@@ -95,158 +74,51 @@ export class PlaywrightConnection {
     ws.on('close', () => this._onDisconnect());
     ws.on('error', (error: Error) => this._onDisconnect(error));
 
-    if (clientType === 'controller') {
-      this._root = this._initDebugControllerMode();
+    if (controller) {
+      debugLogger.log('server', `[${this._id}] engaged reuse controller mode`);
+      this._root = new DebugControllerDispatcher(this._dispatcherConnection, playwright.debugController);
       return;
     }
 
-    this._root = new RootDispatcher(this._dispatcherConnection, async (scope, options) => {
+    this._root = new RootDispatcher(this._dispatcherConnection, async (scope, params) => {
       await startProfiling();
-      if (clientType === 'reuse-browser')
-        return await this._initReuseBrowsersMode(scope);
-      if (clientType === 'pre-launched-browser-or-android')
-        return this._preLaunched.browser ? await this._initPreLaunchedBrowserMode(scope) : await this._initPreLaunchedAndroidMode(scope);
-      if (clientType === 'launch-browser')
-        return await this._initLaunchBrowserMode(scope, options);
-      throw new Error('Unsupported client type: ' + clientType);
-    });
-  }
-
-  private async _initLaunchBrowserMode(scope: RootDispatcher, options: channels.RootInitializeParams) {
-    debugLogger.log('server', `[${this._id}] engaged launch mode for "${this._options.browserName}"`);
-    const playwright = createPlaywright({ sdkLanguage: options.sdkLanguage, isServer: true });
-
-    const ownedSocksProxy = await this._createOwnedSocksProxy(playwright);
-    const browser = await playwright[this._options.browserName as 'chromium'].launch(serverSideCallMetadata(), this._options.launchOptions);
-
-    this._cleanups.push(async () => {
-      for (const browser of playwright.allBrowsers())
-        await browser.close({ reason: 'Connection terminated' });
-    });
-    browser.on(Browser.Events.Disconnected, () => {
-      // Underlying browser did close for some reason - force disconnect the client.
-      this.close({ code: 1001, reason: 'Browser closed' });
-    });
-
-    return new PlaywrightDispatcher(scope, playwright, ownedSocksProxy, browser);
-  }
-
-  private async _initPreLaunchedBrowserMode(scope: RootDispatcher) {
-    debugLogger.log('server', `[${this._id}] engaged pre-launched (browser) mode`);
-    const playwright = this._preLaunched.playwright!;
-
-    // Note: connected client owns the socks proxy and configures the pattern.
-    this._preLaunched.socksProxy?.setPattern(this._options.socksProxyPattern);
-
-    const browser = this._preLaunched.browser!;
-    browser.on(Browser.Events.Disconnected, () => {
-      // Underlying browser did close for some reason - force disconnect the client.
-      this.close({ code: 1001, reason: 'Browser closed' });
-    });
-
-    const playwrightDispatcher = new PlaywrightDispatcher(scope, playwright, this._preLaunched.socksProxy, browser);
-    // In pre-launched mode, keep only the pre-launched browser.
-    for (const b of playwright.allBrowsers()) {
-      if (b !== browser)
-        await b.close({ reason: 'Connection terminated' });
-    }
-    this._cleanups.push(() => playwrightDispatcher.cleanup());
-    return playwrightDispatcher;
-  }
 
-  private async _initPreLaunchedAndroidMode(scope: RootDispatcher) {
-    debugLogger.log('server', `[${this._id}] engaged pre-launched (Android) mode`);
-    const playwright = this._preLaunched.playwright!;
-    const androidDevice = this._preLaunched.androidDevice!;
-    androidDevice.on(AndroidDevice.Events.Close, () => {
-      // Underlying browser did close for some reason - force disconnect the client.
-      this.close({ code: 1001, reason: 'Android device disconnected' });
-    });
-    const playwrightDispatcher = new PlaywrightDispatcher(scope, playwright, undefined, undefined, androidDevice);
-    this._cleanups.push(() => playwrightDispatcher.cleanup());
-    return playwrightDispatcher;
-  }
-
-  private _initDebugControllerMode(): DebugControllerDispatcher {
-    debugLogger.log('server', `[${this._id}] engaged reuse controller mode`);
-    const playwright = this._preLaunched.playwright!;
-    // Always create new instance based on the reused Playwright instance.
-    return new DebugControllerDispatcher(this._dispatcherConnection, playwright.debugController);
-  }
-
-  private async _initReuseBrowsersMode(scope: RootDispatcher) {
-    // Note: reuse browser mode does not support socks proxy, because
-    // clients come and go, while the browser stays the same.
-
-    debugLogger.log('server', `[${this._id}] engaged reuse browsers mode for ${this._options.browserName}`);
-    const playwright = this._preLaunched.playwright!;
-
-    const requestedOptions = launchOptionsHash(this._options.launchOptions);
-    let browser = playwright.allBrowsers().find(b => {
-      if (b.options.name !== this._options.browserName)
-        return false;
-      const existingOptions = launchOptionsHash(b.options.originalLaunchOptions);
-      return existingOptions === requestedOptions;
-    });
-
-    // Close remaining browsers of this type+channel. Keep different browser types for the speed.
-    for (const b of playwright.allBrowsers()) {
-      if (b === browser)
-        continue;
-      if (b.options.name === this._options.browserName && b.options.channel === this._options.launchOptions.channel)
-        await b.close({ reason: 'Connection terminated' });
-    }
-
-    if (!browser) {
-      browser = await playwright[(this._options.browserName || 'chromium') as 'chromium'].launch(serverSideCallMetadata(), {
-        ...this._options.launchOptions,
-        headless: !!process.env.PW_DEBUG_CONTROLLER_HEADLESS,
-      });
-      browser.on(Browser.Events.Disconnected, () => {
-        // Underlying browser did close for some reason - force disconnect the client.
-        this.close({ code: 1001, reason: 'Browser closed' });
-      });
-    }
-
-    this._cleanups.push(async () => {
-      // Don't close the pages so that user could debug them,
-      // but close all the empty browsers and contexts to clean up.
-      for (const browser of playwright.allBrowsers()) {
-        for (const context of browser.contexts()) {
-          if (!context.pages().length)
-            await context.close({ reason: 'Connection terminated' });
-          else
-            await context.stopPendingOperations('Connection closed');
-        }
-        if (!browser.contexts())
-          await browser.close({ reason: 'Connection terminated' });
+      const options = await initialize();
+      if (options.preLaunchedBrowser) {
+        const browser = options.preLaunchedBrowser;
+        browser.options.sdkLanguage = params.sdkLanguage;
+        browser.on(Browser.Events.Disconnected, () => {
+          // Underlying browser did close for some reason - force disconnect the client.
+          this.close({ code: 1001, reason: 'Browser closed' });
+        });
       }
-    });
+      if (options.preLaunchedAndroidDevice) {
+        const androidDevice = options.preLaunchedAndroidDevice;
+        androidDevice.on(AndroidDevice.Events.Close, () => {
+          // Underlying android device did close for some reason - force disconnect the client.
+          this.close({ code: 1001, reason: 'Android device disconnected' });
+        });
+      }
+      if (options.dispose)
+        this._cleanups.push(options.dispose);
 
-    const playwrightDispatcher = new PlaywrightDispatcher(scope, playwright, undefined, browser);
-    return playwrightDispatcher;
-  }
+      const dispatcher = new PlaywrightDispatcher(scope, playwright, options);
+      this._cleanups.push(() => dispatcher.cleanup());
 
-  private async _createOwnedSocksProxy(playwright: Playwright): Promise<SocksProxy | undefined> {
-    if (!this._options.socksProxyPattern)
-      return;
-    const socksProxy = new SocksProxy();
-    socksProxy.setPattern(this._options.socksProxyPattern);
-    playwright.options.socksProxyPort = await socksProxy.listen(0);
-    debugLogger.log('server', `[${this._id}] started socks proxy on port ${playwright.options.socksProxyPort}`);
-    this._cleanups.push(() => socksProxy.close());
-    return socksProxy;
+      return dispatcher;
+    });
   }
 
   private async _onDisconnect(error?: Error) {
     this._disconnected = true;
     debugLogger.log('server', `[${this._id}] disconnected. error: ${error}`);
+    await this._root.stopPendingOperations(new Error('Disconnected')).catch(() => {});
     this._root._dispose();
     debugLogger.log('server', `[${this._id}] starting cleanup`);
     for (const cleanup of this._cleanups)
       await cleanup().catch(() => {});
     await stopProfiling(this._profileName);
-    this._onClose();
+    this._semaphore.release();
     debugLogger.log('server', `[${this._id}] finished cleanup`);
   }
 
@@ -271,45 +143,3 @@ export class PlaywrightConnection {
     }
   }
 }
-
-function launchOptionsHash(options: LaunchOptions) {
-  const copy = { ...options };
-  for (const k of Object.keys(copy)) {
-    const key = k as keyof LaunchOptions;
-    if (copy[key] === defaultLaunchOptions[key])
-      delete copy[key];
-  }
-  for (const key of optionsThatAllowBrowserReuse)
-    delete copy[key];
-  return JSON.stringify(copy);
-}
-
-function filterLaunchOptions(options: LaunchOptions): LaunchOptions {
-  return {
-    channel: options.channel,
-    args: options.args,
-    ignoreAllDefaultArgs: options.ignoreAllDefaultArgs,
-    ignoreDefaultArgs: options.ignoreDefaultArgs,
-    timeout: options.timeout,
-    headless: options.headless,
-    proxy: options.proxy,
-    chromiumSandbox: options.chromiumSandbox,
-    firefoxUserPrefs: options.firefoxUserPrefs,
-    slowMo: options.slowMo,
-    executablePath: isUnderTest() ? options.executablePath : undefined,
-  };
-}
-
-const defaultLaunchOptions: LaunchOptions = {
-  ignoreAllDefaultArgs: false,
-  handleSIGINT: false,
-  handleSIGTERM: false,
-  handleSIGHUP: false,
-  headless: true,
-  devtools: false,
-};
-
-const optionsThatAllowBrowserReuse: (keyof LaunchOptions)[] = [
-  'headless',
-  'tracesDir',
-];
diff --git a/packages/playwright-core/src/remote/playwrightServer.ts b/packages/playwright-core/src/remote/playwrightServer.ts
index 121cc2d83adb4..0f5629d7d66d3 100644
--- a/packages/playwright-core/src/remote/playwrightServer.ts
+++ b/packages/playwright-core/src/remote/playwrightServer.ts
@@ -14,45 +14,67 @@
  * limitations under the License.
  */
 
-import type { Browser } from '../server/browser';
-import type { Playwright } from '../server/playwright';
+import { PlaywrightConnection, PlaywrightInitializeResult } from './playwrightConnection';
 import { createPlaywright } from '../server/playwright';
-import { PlaywrightConnection } from './playwrightConnection';
-import type { ClientType } from './playwrightConnection';
-import type  { LaunchOptions } from '../server/types';
-import { Semaphore } from '../utils/semaphore';
+import { Semaphore } from '../utils/isomorphic/semaphore';
+import { DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT } from '../utils/isomorphic/time';
+import { WSServer } from '../server/utils/wsServer';
+import { wrapInASCIIBox } from '../server/utils/ascii';
+import { getPlaywrightVersion } from '../server/utils/userAgent';
+import { debugLogger, isUnderTest } from '../utils';
+import { SocksProxy } from '../server/utils/socksProxy';
+import { Browser } from '../server/browser';
+import { ProgressController } from '../server/progress';
+
 import type { AndroidDevice } from '../server/android/android';
-import type { SocksProxy } from '../common/socksProxy';
-import { debugLogger } from '../utils/debugLogger';
-import { userAgentVersionMatchesErrorMessage } from '../utils';
-import { WSServer } from '../utils/wsServer';
+import type { Playwright } from '../server/playwright';
+import type { LaunchOptions as LaunchOptionsWithoutTimeout } from '../server/types';
+
+type LaunchOptionsWithTimeout = LaunchOptionsWithoutTimeout & { timeout: number };
 
 type ServerOptions = {
   path: string;
   maxConnections: number;
-  mode: 'default' | 'launchServer' | 'extension';
+  mode: 'default' | 'launchServer' | 'launchServerShared' | 'extension';
   preLaunchedBrowser?: Browser;
   preLaunchedAndroidDevice?: AndroidDevice;
   preLaunchedSocksProxy?: SocksProxy;
+  debugController?: boolean;
 };
 
 export class PlaywrightServer {
-  private _preLaunchedPlaywright: Playwright | undefined;
+  private _playwright: Playwright;
   private _options: ServerOptions;
   private _wsServer: WSServer;
 
+  private _dontReuseBrowsers = new Set<Browser>();
+
   constructor(options: ServerOptions) {
     this._options = options;
-    if (options.preLaunchedBrowser)
-      this._preLaunchedPlaywright = options.preLaunchedBrowser.attribution.playwright;
+    if (options.preLaunchedBrowser) {
+      this._playwright = options.preLaunchedBrowser.attribution.playwright;
+      this._dontReuse(options.preLaunchedBrowser);
+    }
     if (options.preLaunchedAndroidDevice)
-      this._preLaunchedPlaywright = options.preLaunchedAndroidDevice._android.attribution.playwright;
+      this._playwright = options.preLaunchedAndroidDevice._android.attribution.playwright;
+    this._playwright ??= createPlaywright({ sdkLanguage: 'javascript', isServer: true });
 
     const browserSemaphore = new Semaphore(this._options.maxConnections);
     const controllerSemaphore = new Semaphore(1);
     const reuseBrowserSemaphore = new Semaphore(1);
 
     this._wsServer = new WSServer({
+      onRequest: (request, response) => {
+        if (request.method === 'GET' && request.url === '/json') {
+          response.setHeader('Content-Type', 'application/json');
+          response.end(JSON.stringify({
+            wsEndpointPath: this._options.path,
+          }));
+          return;
+        }
+        response.end('Running');
+      },
+
       onUpgrade: (request, socket) => {
         const uaError = userAgentVersionMatchesErrorMessage(request.headers['user-agent'] || '');
         if (uaError)
@@ -73,51 +95,218 @@ export class PlaywrightServer {
         const launchOptionsHeader = request.headers['x-playwright-launch-options'] || '';
         const launchOptionsHeaderValue = Array.isArray(launchOptionsHeader) ? launchOptionsHeader[0] : launchOptionsHeader;
         const launchOptionsParam = url.searchParams.get('launch-options');
-        let launchOptions: LaunchOptions = {};
+        let launchOptions: LaunchOptionsWithTimeout = { timeout: DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT };
         try {
           launchOptions = JSON.parse(launchOptionsParam || launchOptionsHeaderValue);
+          if (!launchOptions.timeout)
+            launchOptions.timeout = DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT;
         } catch (e) {
         }
 
-        // Instantiate playwright for the extension modes.
         const isExtension = this._options.mode === 'extension';
+        const allowFSPaths = isExtension;
+        launchOptions = filterLaunchOptions(launchOptions, allowFSPaths);
+
+        if (url.searchParams.has('debug-controller')) {
+          if (!(this._options.debugController || isExtension))
+            throw new Error('Debug controller is not enabled');
+          return new PlaywrightConnection(
+              controllerSemaphore,
+              ws,
+              true,
+              this._playwright,
+              async () => { throw new Error('shouldnt be used'); },
+              id,
+          );
+        }
+
         if (isExtension) {
-          if (!this._preLaunchedPlaywright)
-            this._preLaunchedPlaywright = createPlaywright({ sdkLanguage: 'javascript', isServer: true });
+          const connectFilter = url.searchParams.get('connect');
+          if (connectFilter) {
+            if (connectFilter !== 'first')
+              throw new Error(`Unknown connect filter: ${connectFilter}`);
+            return new PlaywrightConnection(
+                browserSemaphore,
+                ws,
+                false,
+                this._playwright,
+                () => this._initConnectMode(id, connectFilter, browserName, launchOptions),
+                id,
+            );
+          }
+
+          return new PlaywrightConnection(
+              reuseBrowserSemaphore,
+              ws,
+              false,
+              this._playwright,
+              () => this._initReuseBrowsersMode(browserName, launchOptions, id),
+              id,
+          );
         }
 
-        let clientType: ClientType = 'launch-browser';
-        let semaphore: Semaphore = browserSemaphore;
-        if (isExtension && url.searchParams.has('debug-controller')) {
-          clientType = 'controller';
-          semaphore = controllerSemaphore;
-        } else if (isExtension) {
-          clientType = 'reuse-browser';
-          semaphore = reuseBrowserSemaphore;
-        } else if (this._options.mode === 'launchServer') {
-          clientType = 'pre-launched-browser-or-android';
-          semaphore = browserSemaphore;
+        if (this._options.mode === 'launchServer' || this._options.mode === 'launchServerShared') {
+          if (this._options.preLaunchedBrowser) {
+            return new PlaywrightConnection(
+                browserSemaphore,
+                ws,
+                false,
+                this._playwright,
+                () => this._initPreLaunchedBrowserMode(id),
+                id,
+            );
+          }
+
+          return new PlaywrightConnection(
+              browserSemaphore,
+              ws,
+              false,
+              this._playwright,
+              () => this._initPreLaunchedAndroidMode(id),
+              id,
+          );
         }
 
         return new PlaywrightConnection(
-            semaphore.acquire(),
-            clientType, ws,
-            { socksProxyPattern: proxyValue, browserName, launchOptions },
-            {
-              playwright: this._preLaunchedPlaywright,
-              browser: this._options.preLaunchedBrowser,
-              androidDevice: this._options.preLaunchedAndroidDevice,
-              socksProxy: this._options.preLaunchedSocksProxy,
-            },
-            id, () => semaphore.release());
+            browserSemaphore,
+            ws,
+            false,
+            this._playwright,
+            () => this._initLaunchBrowserMode(browserName, proxyValue, launchOptions, id),
+            id,
+        );
       },
+    });
+  }
+
+  private async _initReuseBrowsersMode(browserName: string | null, launchOptions: LaunchOptionsWithTimeout, id: string): Promise<PlaywrightInitializeResult> {
+    // Note: reuse browser mode does not support socks proxy, because
+    // clients come and go, while the browser stays the same.
+
+    debugLogger.log('server', `[${id}] engaged reuse browsers mode for ${browserName}`);
+
+    const requestedOptions = launchOptionsHash(launchOptions);
+    let browser = this._playwright.allBrowsers().find(b => {
+      if (b.options.name !== browserName)
+        return false;
+      if (this._dontReuseBrowsers.has(b))
+        return false;
+      const existingOptions = launchOptionsHash({ ...b.options.originalLaunchOptions, timeout: DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT });
+      return existingOptions === requestedOptions;
+    });
+
+    // Close remaining browsers of this type+channel. Keep different browser types for the speed.
+    for (const b of this._playwright.allBrowsers()) {
+      if (b === browser)
+        continue;
+      if (this._dontReuseBrowsers.has(b))
+        continue;
+      if (b.options.name === browserName && b.options.channel === launchOptions.channel)
+        await b.close({ reason: 'Connection terminated' });
+    }
 
-      onClose: async () => {
-        debugLogger.log('server', 'closing browsers');
-        if (this._preLaunchedPlaywright)
-          await Promise.all(this._preLaunchedPlaywright.allBrowsers().map(browser => browser.close({ reason: 'Playwright Server stopped' })));
-        debugLogger.log('server', 'closed browsers');
+    if (!browser) {
+      const browserType = this._playwright[(browserName || 'chromium') as 'chromium'];
+      const controller = new ProgressController();
+      browser = await controller.run(progress => browserType.launch(progress, {
+        ...launchOptions,
+        headless: !!process.env.PW_DEBUG_CONTROLLER_HEADLESS,
+      }), launchOptions.timeout);
+    }
+
+    return {
+      preLaunchedBrowser: browser,
+      denyLaunch: true,
+      dispose: async () => {
+        // Don't close the pages so that user could debug them,
+        // but close all the empty contexts to clean up.
+        // keep around browser so it can be reused by the next connection.
+        for (const context of browser.contexts()) {
+          if (!context.pages().length)
+            await context.close({ reason: 'Connection terminated' });
+        }
       }
+    };
+  }
+
+  private async _initConnectMode(id: string, filter: 'first', browserName: string | null, launchOptions: LaunchOptionsWithTimeout): Promise<PlaywrightInitializeResult> {
+    browserName ??= 'chromium';
+
+    debugLogger.log('server', `[${id}] engaged connect mode`);
+
+    let browser = this._playwright.allBrowsers().find(b => b.options.name === browserName);
+    if (!browser) {
+      const browserType = this._playwright[browserName as 'chromium'];
+      const controller = new ProgressController();
+      browser = await controller.run(progress => browserType.launch(progress, launchOptions), launchOptions.timeout);
+      this._dontReuse(browser);
+    }
+
+    return {
+      preLaunchedBrowser: browser,
+      denyLaunch: true,
+      sharedBrowser: true,
+    };
+  }
+
+  private async _initPreLaunchedBrowserMode(id: string): Promise<PlaywrightInitializeResult> {
+    debugLogger.log('server', `[${id}] engaged pre-launched (browser) mode`);
+
+    const browser = this._options.preLaunchedBrowser!;
+
+    // In pre-launched mode, keep only the pre-launched browser.
+    for (const b of this._playwright.allBrowsers()) {
+      if (b !== browser)
+        await b.close({ reason: 'Connection terminated' });
+    }
+
+    return {
+      preLaunchedBrowser: browser,
+      socksProxy: this._options.preLaunchedSocksProxy,
+      sharedBrowser: this._options.mode === 'launchServerShared',
+      denyLaunch: true,
+    };
+  }
+
+  private async _initPreLaunchedAndroidMode(id: string): Promise<PlaywrightInitializeResult> {
+    debugLogger.log('server', `[${id}] engaged pre-launched (Android) mode`);
+    const androidDevice = this._options.preLaunchedAndroidDevice!;
+    return {
+      preLaunchedAndroidDevice: androidDevice,
+      denyLaunch: true,
+    };
+  }
+
+  private async _initLaunchBrowserMode(browserName: string | null, proxyValue: string | undefined, launchOptions: LaunchOptionsWithTimeout, id: string): Promise<PlaywrightInitializeResult> {
+    debugLogger.log('server', `[${id}] engaged launch mode for "${browserName}"`);
+    let socksProxy: SocksProxy | undefined;
+    if (proxyValue) {
+      socksProxy = new SocksProxy();
+      socksProxy.setPattern(proxyValue);
+      launchOptions.socksProxyPort = await socksProxy.listen(0);
+      debugLogger.log('server', `[${id}] started socks proxy on port ${launchOptions.socksProxyPort}`);
+    } else {
+      launchOptions.socksProxyPort = undefined;
+    }
+    const browserType = this._playwright[browserName as 'chromium'];
+    const controller = new ProgressController();
+    const browser = await controller.run(progress => browserType.launch(progress, launchOptions), launchOptions.timeout);
+    this._dontReuseBrowsers.add(browser);
+    return {
+      preLaunchedBrowser: browser,
+      socksProxy,
+      denyLaunch: true,
+      dispose: async () => {
+        await browser.close({ reason: 'Connection terminated' });
+        socksProxy?.close();
+      },
+    };
+  }
+
+  private _dontReuse(browser: Browser) {
+    this._dontReuseBrowsers.add(browser);
+    browser.on(Browser.Events.Disconnected, () => {
+      this._dontReuseBrowsers.delete(browser);
     });
   }
 
@@ -129,3 +318,72 @@ export class PlaywrightServer {
     await this._wsServer.close();
   }
 }
+
+function userAgentVersionMatchesErrorMessage(userAgent: string) {
+  const match = userAgent.match(/^Playwright\/(\d+\.\d+\.\d+)/);
+  if (!match) {
+    // Cannot parse user agent - be lax.
+    return;
+  }
+  const received = match[1].split('.').slice(0, 2).join('.');
+  const expected = getPlaywrightVersion(true);
+  if (received !== expected) {
+    return wrapInASCIIBox([
+      `Playwright version mismatch:`,
+      `  - server version: v${expected}`,
+      `  - client version: v${received}`,
+      ``,
+      `If you are using VSCode extension, restart VSCode.`,
+      ``,
+      `If you are connecting to a remote service,`,
+      `keep your local Playwright version in sync`,
+      `with the remote service version.`,
+      ``,
+      `<3 Playwright Team`
+    ].join('\n'), 1);
+  }
+}
+
+function launchOptionsHash(options: LaunchOptionsWithTimeout) {
+  const copy = { ...options };
+  for (const k of Object.keys(copy)) {
+    const key = k as keyof LaunchOptionsWithTimeout;
+    if (copy[key] === defaultLaunchOptions[key])
+      delete copy[key];
+  }
+  for (const key of optionsThatAllowBrowserReuse)
+    delete copy[key];
+  return JSON.stringify(copy);
+}
+
+function filterLaunchOptions(options: LaunchOptionsWithTimeout, allowFSPaths: boolean): LaunchOptionsWithTimeout {
+  return {
+    channel: options.channel,
+    args: options.args,
+    ignoreAllDefaultArgs: options.ignoreAllDefaultArgs,
+    ignoreDefaultArgs: options.ignoreDefaultArgs,
+    timeout: options.timeout,
+    headless: options.headless,
+    proxy: options.proxy,
+    chromiumSandbox: options.chromiumSandbox,
+    firefoxUserPrefs: options.firefoxUserPrefs,
+    slowMo: options.slowMo,
+    executablePath: (isUnderTest() || allowFSPaths) ? options.executablePath : undefined,
+    downloadsPath: allowFSPaths ? options.downloadsPath : undefined,
+  };
+}
+
+const defaultLaunchOptions: Partial<LaunchOptionsWithTimeout> = {
+  ignoreAllDefaultArgs: false,
+  handleSIGINT: false,
+  handleSIGTERM: false,
+  handleSIGHUP: false,
+  headless: true,
+  devtools: false,
+};
+
+const optionsThatAllowBrowserReuse: (keyof LaunchOptionsWithTimeout)[] = [
+  'headless',
+  'timeout',
+  'tracesDir',
+];
diff --git a/packages/playwright-core/src/server/DEPS.list b/packages/playwright-core/src/server/DEPS.list
index bc32bb8486c71..85e6f0a420168 100644
--- a/packages/playwright-core/src/server/DEPS.list
+++ b/packages/playwright-core/src/server/DEPS.list
@@ -1,21 +1,22 @@
 [*]
-../common/
 ../generated/
 ../protocol/
-../utils/
+../utils
 ../utils/isomorphic/
 ../utilsBundle.ts
 ../zipBundle.ts
 ./
-./injected/
+./codegen/
 ./isomorphic/
 ./har/
 ./recorder/
 ./registry/
 ./trace/recorder/tracing.ts
+./utils/
 
 [playwright.ts]
 ./android/
+./bidi/
 ./chromium/
 ./electron/
 ./firefox/
diff --git a/packages/playwright-core/src/server/android/DEPS.list b/packages/playwright-core/src/server/android/DEPS.list
index 10e75d06f083f..1ecc153814c31 100644
--- a/packages/playwright-core/src/server/android/DEPS.list
+++ b/packages/playwright-core/src/server/android/DEPS.list
@@ -1,8 +1,8 @@
 [*]
 ../
-../../common/
 ../../protocol/
-../../utils/
+../../utils/isomorphic/
 ../../utilsBundle.ts
 ../chromium/
+../utils
 ../registry/
\ No newline at end of file
diff --git a/packages/playwright-core/src/server/android/android.ts b/packages/playwright-core/src/server/android/android.ts
index 0b4cb331b0f2e..077d0569bcb6c 100644
--- a/packages/playwright-core/src/server/android/android.ts
+++ b/packages/playwright-core/src/server/android/android.ts
@@ -14,30 +14,35 @@
  * limitations under the License.
  */
 
-import { debug } from '../../utilsBundle';
 import { EventEmitter } from 'events';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import type * as stream from 'stream';
+
+import { PipeTransport } from '../utils/pipeTransport';
+import { createGuid } from '../utils/crypto';
+import { isUnderTest } from '../utils/debug';
+import { getPackageManagerExecCommand } from '../utils/env';
+import { makeWaitForNextTask } from '../utils/task';
+import { RecentLogsCollector } from '../utils/debugLogger';
+import { debug } from '../../utilsBundle';
 import { wsReceiver, wsSender } from '../../utilsBundle';
-import { createGuid, makeWaitForNextTask, isUnderTest, getPackageManagerExecCommand } from '../../utils';
-import { removeFolders } from '../../utils/fileUtils';
-import type { BrowserOptions, BrowserProcess } from '../browser';
-import type { BrowserContext } from '../browserContext';
 import { validateBrowserContextOptions } from '../browserContext';
-import { ProgressController } from '../progress';
+import { chromiumSwitches } from '../chromium/chromiumSwitches';
 import { CRBrowser } from '../chromium/crBrowser';
+import { removeFolders } from '../utils/fileUtils';
 import { helper } from '../helper';
-import { PipeTransport } from '../../protocol/transport';
-import { RecentLogsCollector } from '../../utils/debugLogger';
-import { gracefullyCloseSet } from '../../utils/processLauncher';
-import { TimeoutSettings } from '../../common/timeoutSettings';
-import type * as channels from '@protocol/channels';
-import { SdkObject, serverSideCallMetadata } from '../instrumentation';
-import { chromiumSwitches } from '../chromium/chromiumSwitches';
+import { SdkObject } from '../instrumentation';
+import { gracefullyCloseSet } from '../utils/processLauncher';
+import { isAbortError, Progress, ProgressController, raceUncancellableOperationWithCleanup } from '../progress';
 import { registry } from '../registry';
 
+import type { BrowserOptions, BrowserProcess } from '../browser';
+import type { BrowserContext } from '../browserContext';
+import type * as types from '../types';
+import type * as channels from '@protocol/channels';
+import type * as stream from 'stream';
+
 const ARTIFACTS_FOLDER = path.join(os.tmpdir(), 'playwright-artifacts-');
 
 export interface Backend {
@@ -54,7 +59,6 @@ export interface DeviceBackend {
 }
 
 export interface SocketBackend extends EventEmitter {
-  guid: string;
   write(data: Buffer): Promise<void>;
   close(): void;
 }
@@ -62,27 +66,20 @@ export interface SocketBackend extends EventEmitter {
 export class Android extends SdkObject {
   private _backend: Backend;
   private _devices = new Map<string, AndroidDevice>();
-  readonly _timeoutSettings: TimeoutSettings;
 
   constructor(parent: SdkObject, backend: Backend) {
     super(parent, 'android');
     this._backend = backend;
-    this._timeoutSettings = new TimeoutSettings();
-  }
-
-  setDefaultTimeout(timeout: number) {
-    this._timeoutSettings.setDefaultTimeout(timeout);
   }
 
-  async devices(options: channels.AndroidDevicesOptions): Promise<AndroidDevice[]> {
-    const devices = (await this._backend.devices(options)).filter(d => d.status === 'device');
+  async devices(progress: Progress, options: channels.AndroidDevicesOptions): Promise<AndroidDevice[]> {
+    const devices = (await progress.race(this._backend.devices(options))).filter(d => d.status === 'device');
     const newSerials = new Set<string>();
     for (const d of devices) {
       newSerials.add(d.serial);
       if (this._devices.has(d.serial))
         continue;
-      const device = await AndroidDevice.create(this, d, options);
-      this._devices.set(d.serial, device);
+      await progress.race(AndroidDevice.create(this, d, options).then(device => this._devices.set(d.serial, device)));
     }
     for (const d of this._devices.keys()) {
       if (!newSerials.has(d))
@@ -105,7 +102,6 @@ export class AndroidDevice extends SdkObject {
   private _lastId = 0;
   private _callbacks = new Map<number, { fulfill: (result: any) => void, reject: (error: Error) => void }>();
   private _pollingWebViews: NodeJS.Timeout | undefined;
-  readonly _timeoutSettings: TimeoutSettings;
   private _webViews = new Map<string, channels.AndroidWebView>();
 
   static Events = {
@@ -125,7 +121,7 @@ export class AndroidDevice extends SdkObject {
     this.model = model;
     this.serial = backend.serial;
     this._options = options;
-    this._timeoutSettings = new TimeoutSettings(android._timeoutSettings);
+    this.logName = 'browser';
   }
 
   static async create(android: Android, backend: DeviceBackend, options: channels.AndroidDevicesOptions): Promise<AndroidDevice> {
@@ -148,18 +144,14 @@ export class AndroidDevice extends SdkObject {
     poll();
   }
 
-  setDefaultTimeout(timeout: number) {
-    this._timeoutSettings.setDefaultTimeout(timeout);
-  }
-
   async shell(command: string): Promise<Buffer> {
     const result = await this._backend.runCommand(`shell:${command}`);
     await this._refreshWebViews();
     return result;
   }
 
-  async open(command: string): Promise<SocketBackend> {
-    return await this._backend.open(`${command}`);
+  async open(progress: Progress, command: string): Promise<SocketBackend> {
+    return await this._open(progress, command);
   }
 
   async screenshot(): Promise<Buffer> {
@@ -169,20 +161,22 @@ export class AndroidDevice extends SdkObject {
   private async _driver(): Promise<PipeTransport | undefined> {
     if (this._isClosed)
       return;
-    if (!this._driverPromise)
-      this._driverPromise = this._installDriver();
+    if (!this._driverPromise) {
+      const controller = new ProgressController();
+      this._driverPromise = controller.run(progress => this._installDriver(progress));
+    }
     return this._driverPromise;
   }
 
-  private async _installDriver(): Promise<PipeTransport> {
+  private async _installDriver(progress: Progress): Promise<PipeTransport> {
     debug('pw:android')('Stopping the old driver');
-    await this.shell(`am force-stop com.microsoft.playwright.androiddriver`);
+    await progress.race(this.shell(`am force-stop com.microsoft.playwright.androiddriver`));
 
     // uninstall and install driver on every execution
     if (!this._options.omitDriverInstall) {
       debug('pw:android')('Uninstalling the old driver');
-      await this.shell(`cmd package uninstall com.microsoft.playwright.androiddriver`);
-      await this.shell(`cmd package uninstall com.microsoft.playwright.androiddriver.test`);
+      await progress.race(this.shell(`cmd package uninstall com.microsoft.playwright.androiddriver`));
+      await progress.race(this.shell(`cmd package uninstall com.microsoft.playwright.androiddriver.test`));
 
       debug('pw:android')('Installing the new driver');
       const executable = registry.findExecutable('android')!;
@@ -191,7 +185,7 @@ export class AndroidDevice extends SdkObject {
         const fullName = path.join(executable.directory!, file);
         if (!fs.existsSync(fullName))
           throw new Error(`Please install Android driver apk using '${packageManagerCommand} playwright install android'`);
-        await this.installApk(await fs.promises.readFile(fullName));
+        await this.installApk(progress, await progress.race(fs.promises.readFile(fullName)));
       }
     } else {
       debug('pw:android')('Skipping the driver installation');
@@ -199,7 +193,7 @@ export class AndroidDevice extends SdkObject {
 
     debug('pw:android')('Starting the new driver');
     this.shell('am instrument -w com.microsoft.playwright.androiddriver.test/androidx.test.runner.AndroidJUnitRunner').catch(e => debug('pw:android')(e));
-    const socket = await this._waitForLocalAbstract('playwright_android_driver_socket');
+    const socket = await this._waitForLocalAbstract(progress, 'playwright_android_driver_socket');
     const transport = new PipeTransport(socket, socket, socket, 'be');
     transport.onmessage = message => {
       const response = JSON.parse(message);
@@ -216,14 +210,16 @@ export class AndroidDevice extends SdkObject {
     return transport;
   }
 
-  private async _waitForLocalAbstract(socketName: string): Promise<SocketBackend> {
+  private async _waitForLocalAbstract(progress: Progress, socketName: string): Promise<SocketBackend> {
     let socket: SocketBackend | undefined;
     debug('pw:android')(`Polling the socket localabstract:${socketName}`);
     while (!socket) {
       try {
-        socket = await this._backend.open(`localabstract:${socketName}`);
+        socket = await this._open(progress, `localabstract:${socketName}`);
       } catch (e) {
-        await new Promise(f => setTimeout(f, 250));
+        if (isAbortError(e))
+          throw e;
+        await progress.wait(250);
       }
     }
     debug('pw:android')(`Connected to localabstract:${socketName}`);
@@ -231,8 +227,15 @@ export class AndroidDevice extends SdkObject {
   }
 
   async send(method: string, params: any = {}): Promise<any> {
-    // Patch the timeout in!
-    params.timeout = this._timeoutSettings.timeout(params);
+    params = {
+      ...params,
+      // Patch the timeout in, just in case it's missing in one of the commands.
+      timeout: params.timeout || 0,
+    };
+    if (params.androidSelector) {
+      params.selector = params.androidSelector;
+      delete params.androidSelector;
+    }
     const driver = await this._driver();
     if (!driver)
       throw new Error('Device is closed');
@@ -259,18 +262,23 @@ export class AndroidDevice extends SdkObject {
     this.emit(AndroidDevice.Events.Close);
   }
 
-  async launchBrowser(pkg: string = 'com.android.chrome', options: channels.AndroidDeviceLaunchBrowserParams): Promise<BrowserContext> {
+  async launchBrowser(progress: Progress, pkg: string = 'com.android.chrome', options: channels.AndroidDeviceLaunchBrowserParams): Promise<BrowserContext> {
     debug('pw:android')('Force-stopping', pkg);
     await this._backend.runCommand(`shell:am force-stop ${pkg}`);
     const socketName = isUnderTest() ? 'webview_devtools_remote_playwright_test' : ('playwright_' + createGuid() + '_devtools_remote');
     const commandLine = this._defaultArgs(options, socketName).join(' ');
     debug('pw:android')('Starting', pkg, commandLine);
     // encode commandLine to base64 to avoid issues (bash encoding) with special characters
-    await this._backend.runCommand(`shell:echo "${Buffer.from(commandLine).toString('base64')}" | base64 -d > /data/local/tmp/chrome-command-line`);
-    await this._backend.runCommand(`shell:am start -a android.intent.action.VIEW -d about:blank ${pkg}`);
-    const browserContext = await this._connectToBrowser(socketName, options);
-    await this._backend.runCommand(`shell:rm /data/local/tmp/chrome-command-line`);
-    return browserContext;
+    await progress.race(this._backend.runCommand(`shell:echo "${Buffer.from(commandLine).toString('base64')}" | base64 -d > /data/local/tmp/chrome-command-line`));
+    await progress.race(this._backend.runCommand(`shell:am start -a android.intent.action.VIEW -d about:blank ${pkg}`));
+    const browserContext = await this._connectToBrowser(progress, socketName, options);
+    try {
+      await progress.race(this._backend.runCommand(`shell:rm /data/local/tmp/chrome-command-line`));
+      return browserContext;
+    } catch (error) {
+      await browserContext.close({ reason: 'Failed to launch' }).catch(() => {});
+      throw error;
+    }
   }
 
   private _defaultArgs(options: channels.AndroidDeviceLaunchBrowserParams, socketName: string): string[] {
@@ -279,7 +287,7 @@ export class AndroidDevice extends SdkObject {
       '--disable-fre',
       '--no-default-browser-check',
       `--remote-debugging-socket-name=${socketName}`,
-      ...chromiumSwitches,
+      ...chromiumSwitches(),
       ...this._innerDefaultArgs(options)
     ];
     return chromeArguments;
@@ -302,88 +310,94 @@ export class AndroidDevice extends SdkObject {
     return chromeArguments;
   }
 
-  async connectToWebView(socketName: string): Promise<BrowserContext> {
+  async connectToWebView(progress: Progress, socketName: string): Promise<BrowserContext> {
     const webView = this._webViews.get(socketName);
     if (!webView)
       throw new Error('WebView has been closed');
-    return await this._connectToBrowser(socketName);
+    return await this._connectToBrowser(progress, socketName);
+  }
+
+  private async _connectToBrowser(progress: Progress, socketName: string, options: types.BrowserContextOptions = {}): Promise<BrowserContext> {
+    const socket = await this._waitForLocalAbstract(progress, socketName);
+    try {
+      const androidBrowser = new AndroidBrowser(this, socket);
+      await progress.race(androidBrowser._init());
+      this._browserConnections.add(androidBrowser);
+
+      const artifactsDir = await progress.race(fs.promises.mkdtemp(ARTIFACTS_FOLDER));
+      const cleanupArtifactsDir = async () => {
+        const errors = (await removeFolders([artifactsDir])).filter(Boolean);
+        for (let i = 0; i < (errors || []).length; ++i)
+          debug('pw:android')(`exception while removing ${artifactsDir}: ${errors[i]}`);
+      };
+      gracefullyCloseSet.add(cleanupArtifactsDir);
+      socket.on('close', async () => {
+        gracefullyCloseSet.delete(cleanupArtifactsDir);
+        cleanupArtifactsDir().catch(e => debug('pw:android')(`could not cleanup artifacts dir: ${e}`));
+      });
+      const browserOptions: BrowserOptions = {
+        name: 'clank',
+        isChromium: true,
+        slowMo: 0,
+        persistent: { ...options, noDefaultViewport: true },
+        artifactsDir,
+        downloadsPath: artifactsDir,
+        tracesDir: artifactsDir,
+        browserProcess: new ClankBrowserProcess(androidBrowser),
+        proxy: options.proxy,
+        protocolLogger: helper.debugProtocolLogger(),
+        browserLogsCollector: new RecentLogsCollector(),
+        originalLaunchOptions: {},
+      };
+      validateBrowserContextOptions(options, browserOptions);
+
+      const browser = await progress.race(CRBrowser.connect(this.attribution.playwright, androidBrowser, browserOptions));
+      const defaultContext = browser._defaultContext!;
+      await defaultContext._loadDefaultContextAsIs(progress);
+      return defaultContext;
+    } catch (error) {
+      socket.close();
+      throw error;
+    }
   }
 
-  private async _connectToBrowser(socketName: string, options: channels.BrowserNewContextParams = {}): Promise<BrowserContext> {
-    const socket = await this._waitForLocalAbstract(socketName);
-    const androidBrowser = new AndroidBrowser(this, socket);
-    await androidBrowser._init();
-    this._browserConnections.add(androidBrowser);
-
-    const artifactsDir = await fs.promises.mkdtemp(ARTIFACTS_FOLDER);
-    const cleanupArtifactsDir = async () => {
-      const errors = await removeFolders([artifactsDir]);
-      for (let i = 0; i < (errors || []).length; ++i)
-        debug('pw:android')(`exception while removing ${artifactsDir}: ${errors[i]}`);
-    };
-    gracefullyCloseSet.add(cleanupArtifactsDir);
-    socket.on('close', async () => {
-      gracefullyCloseSet.delete(cleanupArtifactsDir);
-      cleanupArtifactsDir().catch(e => debug('pw:android')(`could not cleanup artifacts dir: ${e}`));
-    });
-    const browserOptions: BrowserOptions = {
-      name: 'clank',
-      isChromium: true,
-      slowMo: 0,
-      persistent: { ...options, noDefaultViewport: true },
-      artifactsDir,
-      downloadsPath: artifactsDir,
-      tracesDir: artifactsDir,
-      browserProcess: new ClankBrowserProcess(androidBrowser),
-      proxy: options.proxy,
-      protocolLogger: helper.debugProtocolLogger(),
-      browserLogsCollector: new RecentLogsCollector(),
-      originalLaunchOptions: {},
-    };
-    validateBrowserContextOptions(options, browserOptions);
-
-    const browser = await CRBrowser.connect(this.attribution.playwright, androidBrowser, browserOptions);
-    const controller = new ProgressController(serverSideCallMetadata(), this);
-    const defaultContext = browser._defaultContext!;
-    await controller.run(async progress => {
-      await defaultContext._loadDefaultContextAsIs(progress);
-    });
-    return defaultContext;
+  private _open(progress: Progress, command: string): Promise<SocketBackend> {
+    return raceUncancellableOperationWithCleanup(progress, () => this._backend.open(command), socket => socket.close());
   }
 
   webViews(): channels.AndroidWebView[] {
     return [...this._webViews.values()];
   }
 
-  async installApk(content: Buffer, options?: { args?: string[] }): Promise<void> {
+  async installApk(progress: Progress, content: Buffer, options?: { args?: string[] }): Promise<void> {
     const args = options && options.args ? options.args : ['-r', '-t', '-S'];
     debug('pw:android')('Opening install socket');
-    const installSocket = await this._backend.open(`shell:cmd package install ${args.join(' ')} ${content.length}`);
+    const installSocket = await this._open(progress, `shell:cmd package install ${args.join(' ')} ${content.length}`);
     debug('pw:android')('Writing driver bytes: ' + content.length);
-    await installSocket.write(content);
-    const success = await new Promise(f => installSocket.on('data', f));
+    await progress.race(installSocket.write(content));
+    const success = await progress.race(new Promise(f => installSocket.on('data', f)));
     debug('pw:android')('Written driver bytes: ' + success);
     installSocket.close();
   }
 
-  async push(content: Buffer, path: string, mode = 0o644): Promise<void> {
-    const socket = await this._backend.open(`sync:`);
+  async push(progress: Progress, content: Buffer, path: string, mode = 0o644): Promise<void> {
+    const socket = await this._open(progress, `sync:`);
     const sendHeader = async (command: string, length: number) => {
       const buffer = Buffer.alloc(command.length + 4);
       buffer.write(command, 0);
       buffer.writeUInt32LE(length, command.length);
-      await socket.write(buffer);
+      await progress.race(socket.write(buffer));
     };
     const send = async (command: string, data: Buffer) => {
       await sendHeader(command, data.length);
-      await socket.write(data);
+      await progress.race(socket.write(data));
     };
     await send('SEND', Buffer.from(`${path},${mode}`));
     const maxChunk = 65535;
     for (let i = 0; i < content.length; i += maxChunk)
       await send('DATA', content.slice(i, i + maxChunk));
     await sendHeader('DONE', (Date.now() / 1000) | 0);
-    const result = await new Promise<Buffer>(f => socket.once('data', f));
+    const result = await progress.race(new Promise<Buffer>(f => socket.once('data', f)));
     const code = result.slice(0, 4).toString();
     if (code !== 'OKAY')
       throw new Error('Could not push: ' + code);
@@ -523,5 +537,3 @@ class ClankBrowserProcess implements BrowserProcess {
     await this._browser.close();
   }
 }
-
-
diff --git a/packages/playwright-core/src/server/android/backendAdb.ts b/packages/playwright-core/src/server/android/backendAdb.ts
index cd718b9d95c13..b25b5a24f36fe 100644
--- a/packages/playwright-core/src/server/android/backendAdb.ts
+++ b/packages/playwright-core/src/server/android/backendAdb.ts
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-import { debug } from '../../utilsBundle';
-import type * as channels from '@protocol/channels';
-import * as net from 'net';
 import { EventEmitter } from 'events';
+import net from 'net';
+
+import { assert } from '../../utils/isomorphic/assert';
+import { debug } from '../../utilsBundle';
+
 import type { Backend, DeviceBackend, SocketBackend } from './android';
-import { assert, createGuid } from '../../utils';
+import type * as channels from '@protocol/channels';
+
 
 export class AdbBackend implements Backend {
   async devices(options: channels.AndroidDevicesOptions = {}): Promise<DeviceBackend[]> {
@@ -113,7 +116,6 @@ function encodeMessage(message: string): Buffer {
 }
 
 class BufferedSocketWrapper extends EventEmitter implements SocketBackend {
-  readonly guid = createGuid();
   private _socket: net.Socket;
   private _buffer = Buffer.from([]);
   private _isSocket = false;
diff --git a/packages/playwright-core/src/server/artifact.ts b/packages/playwright-core/src/server/artifact.ts
index 8824365b80cad..c6f2b4bc9c1ef 100644
--- a/packages/playwright-core/src/server/artifact.ts
+++ b/packages/playwright-core/src/server/artifact.ts
@@ -15,10 +15,11 @@
  */
 
 import fs from 'fs';
+
 import { assert } from '../utils';
-import { ManualPromise } from '../utils/manualPromise';
-import { SdkObject } from './instrumentation';
 import { TargetClosedError } from './errors';
+import { SdkObject } from './instrumentation';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
 
 type SaveCallback = (localPath: string, error?: Error) => Promise<void>;
 type CancelCallback = () => Promise<void>;
diff --git a/packages/playwright-core/src/server/bidi/DEPS.list b/packages/playwright-core/src/server/bidi/DEPS.list
new file mode 100644
index 0000000000000..ab509f181c876
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/DEPS.list
@@ -0,0 +1,14 @@
+[*]
+../../utils/
+../../utils/isomorphic/
+../
+../isomorphic/
+../utils
+./third_party/
+
+[bidiOverCdp.ts]
+***
+
+[bidiChromium.ts]
+../chromium/chromiumSwitches.ts
+../chromium/chromium.ts
diff --git a/packages/playwright-core/src/server/bidi/bidiBrowser.ts b/packages/playwright-core/src/server/bidi/bidiBrowser.ts
new file mode 100644
index 0000000000000..ce55d0fb1ec9f
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiBrowser.ts
@@ -0,0 +1,476 @@
+/**
+ * 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 { eventsHelper } from '../utils/eventsHelper';
+import { Browser } from '../browser';
+import { BrowserContext, verifyGeolocation } from '../browserContext';
+import * as network from '../network';
+import { BidiConnection } from './bidiConnection';
+import { bidiBytesValueToString } from './bidiNetworkManager';
+import { BidiPage, kPlaywrightBindingChannel } from './bidiPage';
+import { PageBinding } from '../page';
+import * as bidi from './third_party/bidiProtocol';
+
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type { BrowserOptions } from '../browser';
+import type { SdkObject } from '../instrumentation';
+import type { InitScript, Page } from '../page';
+import type { ConnectionTransport } from '../transport';
+import type * as types from '../types';
+import type { BidiSession } from './bidiConnection';
+import type * as channels from '@protocol/channels';
+
+
+export class BidiBrowser extends Browser {
+  private readonly _connection: BidiConnection;
+  readonly _browserSession: BidiSession;
+  private _bidiSessionInfo!: bidi.Session.NewResult;
+  readonly _contexts = new Map<string, BidiBrowserContext>();
+  readonly _bidiPages = new Map<bidi.BrowsingContext.BrowsingContext, BidiPage>();
+  private readonly _eventListeners: RegisteredListener[];
+
+  static async connect(parent: SdkObject, transport: ConnectionTransport, options: BrowserOptions): Promise<BidiBrowser> {
+    const browser = new BidiBrowser(parent, transport, options);
+    if ((options as any).__testHookOnConnectToBrowser)
+      await (options as any).__testHookOnConnectToBrowser();
+
+    browser._bidiSessionInfo = await browser._browserSession.send('session.new', {
+      capabilities: {
+        alwaysMatch: {
+          acceptInsecureCerts: options.persistent?.internalIgnoreHTTPSErrors || options.persistent?.ignoreHTTPSErrors,
+          proxy: getProxyConfiguration(options.originalLaunchOptions.proxyOverride ?? options.proxy),
+          unhandledPromptBehavior: {
+            default: bidi.Session.UserPromptHandlerType.Ignore,
+          },
+          webSocketUrl: true
+        },
+      }
+    });
+
+    await browser._browserSession.send('session.subscribe', {
+      events: [
+        'browsingContext',
+        'network',
+        'log',
+        'script',
+      ],
+    });
+
+    if (options.persistent) {
+      const context = new BidiBrowserContext(browser, undefined, options.persistent);
+      browser._defaultContext = context;
+      await context._initialize();
+      // Create default page as we cannot get access to the existing one.
+      const page = await browser._defaultContext.doCreateNewPage();
+      await page.waitForInitializedOrError();
+    }
+    return browser;
+  }
+
+  constructor(parent: SdkObject, transport: ConnectionTransport, options: BrowserOptions) {
+    super(parent, options);
+    this._connection = new BidiConnection(transport, this._onDisconnect.bind(this), options.protocolLogger, options.browserLogsCollector);
+    this._browserSession = this._connection.browserSession;
+    this._eventListeners = [
+      eventsHelper.addEventListener(this._browserSession, 'browsingContext.contextCreated', this._onBrowsingContextCreated.bind(this)),
+      eventsHelper.addEventListener(this._browserSession, 'script.realmDestroyed', this._onScriptRealmDestroyed.bind(this)),
+    ];
+  }
+
+  _onDisconnect() {
+    this._didClose();
+  }
+
+  async doCreateNewContext(options: types.BrowserContextOptions): Promise<BrowserContext> {
+    const proxy = options.proxyOverride || options.proxy;
+    const { userContext } = await this._browserSession.send('browser.createUserContext', {
+      acceptInsecureCerts: options.internalIgnoreHTTPSErrors || options.ignoreHTTPSErrors,
+      proxy: getProxyConfiguration(proxy),
+    });
+    const context = new BidiBrowserContext(this, userContext, options);
+    await context._initialize();
+    this._contexts.set(userContext, context);
+    return context;
+  }
+
+  contexts(): BrowserContext[] {
+    return Array.from(this._contexts.values());
+  }
+
+  version(): string {
+    return this._bidiSessionInfo.capabilities.browserVersion;
+  }
+
+  userAgent(): string {
+    return this._bidiSessionInfo.capabilities.userAgent;
+  }
+
+  isConnected(): boolean {
+    return !this._connection.isClosed();
+  }
+
+  private _onBrowsingContextCreated(event: bidi.BrowsingContext.Info) {
+    if (event.parent) {
+      const parentFrameId = event.parent;
+      for (const page of this._bidiPages.values()) {
+        const parentFrame = page._page.frameManager.frame(parentFrameId);
+        if (!parentFrame)
+          continue;
+        page._session.addFrameBrowsingContext(event.context);
+        page._page.frameManager.frameAttached(event.context, parentFrameId);
+        const frame = page._page.frameManager.frame(event.context);
+        if (frame)
+          frame._url = event.url;
+        return;
+      }
+      return;
+    }
+    let context = this._contexts.get(event.userContext);
+    if (!context)
+      context = this._defaultContext as BidiBrowserContext;
+    if (!context)
+      return;
+    const session = this._connection.createMainFrameBrowsingContextSession(event.context);
+    const opener = event.originalOpener && this._bidiPages.get(event.originalOpener);
+    const page = new BidiPage(context, session, opener || null);
+    page._page.mainFrame()._url = event.url;
+    this._bidiPages.set(event.context, page);
+  }
+
+  _onBrowsingContextDestroyed(event: bidi.BrowsingContext.Info) {
+    if (event.parent) {
+      this._browserSession.removeFrameBrowsingContext(event.context);
+      const parentFrameId = event.parent;
+      for (const page of this._bidiPages.values()) {
+        const parentFrame = page._page.frameManager.frame(parentFrameId);
+        if (!parentFrame)
+          continue;
+        page._page.frameManager.frameDetached(event.context);
+        return;
+      }
+      return;
+    }
+    const bidiPage = this._bidiPages.get(event.context);
+    if (!bidiPage)
+      return;
+    bidiPage.didClose();
+    this._bidiPages.delete(event.context);
+  }
+
+  private _onScriptRealmDestroyed(event: bidi.Script.RealmDestroyedParameters) {
+    for (const page of this._bidiPages.values()) {
+      if (page._onRealmDestroyed(event))
+        return;
+    }
+  }
+}
+
+export class BidiBrowserContext extends BrowserContext {
+  declare readonly _browser: BidiBrowser;
+  private _originToPermissions = new Map<string, string[]>();
+  private _initScriptIds = new Map<InitScript, string>();
+
+  constructor(browser: BidiBrowser, browserContextId: string | undefined, options: types.BrowserContextOptions) {
+    super(browser, options, browserContextId);
+    this._authenticateProxyViaHeader();
+  }
+
+  private _bidiPages() {
+    return [...this._browser._bidiPages.values()].filter(bidiPage => bidiPage._browserContext === this);
+  }
+
+  override async _initialize() {
+    const promises: Promise<any>[] = [
+      super._initialize(),
+    ];
+    promises.push(this.doUpdateDefaultViewport());
+    if (this._options.geolocation)
+      promises.push(this.setGeolocation(this._options.geolocation));
+    if (this._options.locale) {
+      promises.push(this._browser._browserSession.send('emulation.setLocaleOverride', {
+        locale: this._options.locale,
+        userContexts: [this._userContextId()],
+      }));
+    }
+    await Promise.all(promises);
+  }
+
+  override possiblyUninitializedPages(): Page[] {
+    return this._bidiPages().map(bidiPage => bidiPage._page);
+  }
+
+  override async doCreateNewPage(): Promise<Page> {
+    const { context } = await this._browser._browserSession.send('browsingContext.create', {
+      type: bidi.BrowsingContext.CreateType.Window,
+      userContext: this._browserContextId,
+    });
+    return this._browser._bidiPages.get(context)!._page;
+  }
+
+  async doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]> {
+    const { cookies } = await this._browser._browserSession.send('storage.getCookies',
+        { partition: { type: 'storageKey', userContext: this._browserContextId } });
+    return network.filterCookies(cookies.map((c: bidi.Network.Cookie) => {
+      const copy: channels.NetworkCookie = {
+        name: c.name,
+        value: bidiBytesValueToString(c.value),
+        domain: c.domain,
+        path: c.path,
+        httpOnly: c.httpOnly,
+        secure: c.secure,
+        expires: c.expiry ?? -1,
+        sameSite: c.sameSite ? fromBidiSameSite(c.sameSite) : 'None',
+      };
+      return copy;
+    }), urls);
+  }
+
+  async addCookies(cookies: channels.SetNetworkCookie[]) {
+    cookies = network.rewriteCookies(cookies);
+    const promises = cookies.map((c: channels.SetNetworkCookie) => {
+      const cookie: bidi.Storage.PartialCookie = {
+        name: c.name,
+        value: { type: 'string', value: c.value },
+        domain: c.domain!,
+        path: c.path,
+        httpOnly: c.httpOnly,
+        secure: c.secure,
+        sameSite: c.sameSite && toBidiSameSite(c.sameSite),
+        expiry: (c.expires === -1 || c.expires === undefined) ? undefined : Math.round(c.expires),
+      };
+      return this._browser._browserSession.send('storage.setCookie',
+          { cookie, partition: { type: 'storageKey', userContext: this._browserContextId } });
+    });
+    await Promise.all(promises);
+  }
+
+  async doClearCookies() {
+    await this._browser._browserSession.send('storage.deleteCookies',
+        { partition: { type: 'storageKey', userContext: this._browserContextId } });
+  }
+
+  async doGrantPermissions(origin: string, permissions: string[]) {
+    const currentPermissions = this._originToPermissions.get(origin) || [];
+    const toGrant = permissions.filter(permission => !currentPermissions.includes(permission));
+    this._originToPermissions.set(origin, [...currentPermissions, ...toGrant]);
+    await Promise.all(toGrant.map(permission => this._setPermission(origin, permission, bidi.Permissions.PermissionState.Granted)));
+  }
+
+  async doClearPermissions() {
+    const currentPermissions = [...this._originToPermissions.entries()];
+    this._originToPermissions = new Map();
+    await Promise.all(currentPermissions.map(([origin, permissions]) => permissions.map(
+        p => this._setPermission(origin, p, bidi.Permissions.PermissionState.Prompt))));
+  }
+
+  private async _setPermission(origin: string, permission: string, state: bidi.Permissions.PermissionState) {
+    await this._browser._browserSession.send('permissions.setPermission', {
+      descriptor: {
+        name: permission,
+      },
+      state,
+      origin,
+      userContext: this._userContextId(),
+    });
+  }
+
+  async setGeolocation(geolocation?: types.Geolocation): Promise<void> {
+    verifyGeolocation(geolocation);
+    this._options.geolocation = geolocation;
+    // Setting geolocation on the user context automatically applies it to all existing
+    // pages in the context in Bidi.
+    await this._browser._browserSession.send('emulation.setGeolocationOverride', {
+      coordinates: geolocation ? {
+        latitude: geolocation.latitude,
+        longitude: geolocation.longitude,
+        accuracy: geolocation.accuracy,
+      } : null,
+      userContexts: [this._userContextId()],
+    });
+  }
+
+  async doUpdateExtraHTTPHeaders(): Promise<void> {
+  }
+
+  async setUserAgent(userAgent: string | undefined): Promise<void> {
+  }
+
+  async doUpdateOffline(): Promise<void> {
+  }
+
+  async doSetHTTPCredentials(httpCredentials?: types.Credentials): Promise<void> {
+    this._options.httpCredentials = httpCredentials;
+    for (const page of this.pages())
+      await (page.delegate as BidiPage).updateHttpCredentials();
+  }
+
+  async doAddInitScript(initScript: InitScript) {
+    const { script } = await this._browser._browserSession.send('script.addPreloadScript', {
+      // TODO: remove function call from the source.
+      functionDeclaration: `() => { return ${initScript.source} }`,
+      userContexts: [this._userContextId()],
+    });
+    this._initScriptIds.set(initScript, script);
+  }
+
+  async doRemoveInitScripts(initScripts: InitScript[]) {
+    const ids: string[] = [];
+    for (const script of initScripts) {
+      const id = this._initScriptIds.get(script);
+      if (id)
+        ids.push(id);
+      this._initScriptIds.delete(script);
+    }
+    await Promise.all(ids.map(script => this._browser._browserSession.send('script.removePreloadScript', { script })));
+  }
+
+  async doUpdateRequestInterception(): Promise<void> {
+  }
+
+  override async doUpdateDefaultViewport() {
+    if (!this._options.viewport)
+      return;
+    await this._browser._browserSession.send('browsingContext.setViewport', {
+      viewport: {
+        width: this._options.viewport.width,
+        height: this._options.viewport.height
+      },
+      devicePixelRatio: this._options.deviceScaleFactor || 1,
+      userContexts: [this._userContextId()],
+    });
+  }
+
+  override async doUpdateDefaultEmulatedMedia() {
+  }
+
+  override async doExposePlaywrightBinding() {
+    const args: bidi.Script.ChannelValue[] = [{
+      type: 'channel',
+      value: {
+        channel: kPlaywrightBindingChannel,
+        ownership: bidi.Script.ResultOwnership.Root,
+      }
+    }];
+    const functionDeclaration = `function addMainBinding(callback) { globalThis['${PageBinding.kBindingName}'] = callback; }`;
+    const promises = [];
+    promises.push(this._browser._browserSession.send('script.addPreloadScript', {
+      functionDeclaration,
+      arguments: args,
+      userContexts: [this._userContextId()],
+    }));
+    promises.push(...this._bidiPages().map(page => {
+      const realms = [...page._realmToContext].filter(([realm, context]) => context.world === 'main').map(([realm, context]) => realm);
+      return Promise.all(realms.map(realm => {
+        return page._session.send('script.callFunction', {
+          functionDeclaration,
+          arguments: args,
+          target: { realm },
+          awaitPromise: false,
+          userActivation: false,
+        });
+      }));
+    }));
+    await Promise.all(promises);
+  }
+
+  onClosePersistent() {}
+
+  override async clearCache(): Promise<void> {
+  }
+
+  async doClose(reason: string | undefined) {
+    if (!this._browserContextId) {
+      // Closing persistent context should close the browser.
+      await this._browser.close({ reason });
+      return;
+    }
+    await this._browser._browserSession.send('browser.removeUserContext', {
+      userContext: this._browserContextId
+    });
+    this._browser._contexts.delete(this._browserContextId);
+  }
+
+  async cancelDownload(uuid: string) {
+  }
+
+  private _userContextId(): bidi.Browser.UserContext {
+    if (this._browserContextId)
+      return this._browserContextId;
+    // Default context always has same id, see
+    // https://w3c.github.io/webdriver-bidi/#default-user-context
+    return 'default';
+  }
+}
+
+function fromBidiSameSite(sameSite: bidi.Network.SameSite): channels.NetworkCookie['sameSite'] {
+  switch (sameSite) {
+    case 'strict': return 'Strict';
+    case 'lax': return 'Lax';
+    case 'none': return 'None';
+  }
+  return 'None';
+}
+
+function toBidiSameSite(sameSite: channels.SetNetworkCookie['sameSite']): bidi.Network.SameSite {
+  switch (sameSite) {
+    case 'Strict': return bidi.Network.SameSite.Strict;
+    case 'Lax': return bidi.Network.SameSite.Lax;
+    case 'None': return bidi.Network.SameSite.None;
+  }
+  return bidi.Network.SameSite.None;
+}
+
+function getProxyConfiguration(proxySettings?: types.ProxySettings): bidi.Session.ManualProxyConfiguration | undefined {
+  if (!proxySettings)
+    return undefined;
+
+  const proxy: bidi.Session.ManualProxyConfiguration = {
+    proxyType: 'manual',
+  };
+  const url = new URL(proxySettings.server);  // Validate proxy server.
+  switch (url.protocol) {
+    case 'http:':
+      proxy.httpProxy = url.host;
+      break;
+    case 'https:':
+      proxy.sslProxy = url.host;
+      break;
+    case 'socks4:':
+      proxy.socksProxy = url.host;
+      proxy.socksVersion = 4;
+      break;
+    case 'socks5:':
+      proxy.socksProxy = url.host;
+      proxy.socksVersion = 5;
+      break;
+    default:
+      throw new Error('Invalid proxy server protocol: ' + proxySettings.server);
+  }
+  const bypass = proxySettings.bypass ?? process.env.PLAYWRIGHT_PROXY_BYPASS_FOR_TESTING;
+  if (bypass)
+    proxy.noProxy = bypass.split(',');
+  // TODO: support authentication.
+
+  return proxy;
+}
+
+export namespace Network {
+  export const enum SameSite {
+    Strict = 'strict',
+    Lax = 'lax',
+    None = 'none',
+  }
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiChromium.ts b/packages/playwright-core/src/server/bidi/bidiChromium.ts
new file mode 100644
index 0000000000000..ac8639a1fc1e9
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiChromium.ts
@@ -0,0 +1,166 @@
+/**
+ * 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 'os';
+
+import { wrapInASCIIBox } from '../utils/ascii';
+import { BrowserType, kNoXServerRunningError } from '../browserType';
+import { BidiBrowser } from './bidiBrowser';
+import { kBrowserCloseMessageId } from './bidiConnection';
+import { chromiumSwitches } from '../chromium/chromiumSwitches';
+import { RecentLogsCollector } from '../utils/debugLogger';
+import { waitForReadyState } from '../chromium/chromium';
+
+import type { BrowserOptions } from '../browser';
+import type { SdkObject } from '../instrumentation';
+import type { Env } from '../utils/processLauncher';
+import type { ProtocolError } from '../protocolError';
+import type { ConnectionTransport } from '../transport';
+import type * as types from '../types';
+
+
+export class BidiChromium extends BrowserType {
+  constructor(parent: SdkObject) {
+    super(parent, '_bidiChromium');
+  }
+
+  override async connectToTransport(transport: ConnectionTransport, options: BrowserOptions, browserLogsCollector: RecentLogsCollector): Promise<BidiBrowser> {
+    // Chrome doesn't support Bidi, we create Bidi over CDP which is used by Chrome driver.
+    // bidiOverCdp depends on chromium-bidi which we only have in devDependencies, so
+    // we load bidiOverCdp dynamically.
+    const bidiTransport = await require('./bidiOverCdp').connectBidiOverCdp(transport);
+    (transport as any)[kBidiOverCdpWrapper] = bidiTransport;
+    try {
+      return BidiBrowser.connect(this.attribution.playwright, bidiTransport, options);
+    } catch (e) {
+      if (browserLogsCollector.recentLogs().some(log => log.includes('Failed to create a ProcessSingleton for your profile directory.'))) {
+        throw new Error(
+            'Failed to create a ProcessSingleton for your profile directory. ' +
+            'This usually means that the profile is already in use by another instance of Chromium.'
+        );
+      }
+      throw e;
+    }
+  }
+
+  override doRewriteStartupLog(error: ProtocolError): ProtocolError {
+    if (!error.logs)
+      return error;
+    if (error.logs.includes('Missing X server'))
+      error.logs = '\n' + wrapInASCIIBox(kNoXServerRunningError, 1);
+    // These error messages are taken from Chromium source code as of July, 2020:
+    // https://github.com/chromium/chromium/blob/70565f67e79f79e17663ad1337dc6e63ee207ce9/content/browser/zygote_host/zygote_host_impl_linux.cc
+    if (!error.logs.includes('crbug.com/357670') && !error.logs.includes('No usable sandbox!') && !error.logs.includes('crbug.com/638180'))
+      return error;
+    error.logs = [
+      `Chromium sandboxing failed!`,
+      `================================`,
+      `To avoid the sandboxing issue, do either of the following:`,
+      `  - (preferred): Configure your environment to support sandboxing`,
+      `  - (alternative): Launch Chromium without sandbox using 'chromiumSandbox: false' option`,
+      `================================`,
+      ``,
+    ].join('\n');
+    return error;
+  }
+
+  override amendEnvironment(env: Env): Env {
+    return env;
+  }
+
+  override attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+    // Note that it's fine to reuse the transport, since our connection ignores kBrowserCloseMessageId.
+    const bidiTransport = (transport as any)[kBidiOverCdpWrapper];
+    if (bidiTransport)
+      transport = bidiTransport;
+    transport.send({ method: 'browser.close', params: {}, id: kBrowserCloseMessageId });
+  }
+
+  override supportsPipeTransport(): boolean {
+    return false;
+  }
+
+  override defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
+    const chromeArguments = this._innerDefaultArgs(options);
+    chromeArguments.push(`--user-data-dir=${userDataDir}`);
+    chromeArguments.push('--remote-debugging-port=0');
+    if (isPersistent)
+      chromeArguments.push('about:blank');
+    else
+      chromeArguments.push('--no-startup-window');
+    return chromeArguments;
+  }
+
+  override async waitForReadyState(options: types.LaunchOptions, browserLogsCollector: RecentLogsCollector): Promise<{ wsEndpoint?: string }> {
+    return waitForReadyState({ ...options, cdpPort: 0 }, browserLogsCollector);
+  }
+
+  private _innerDefaultArgs(options: types.LaunchOptions): string[] {
+    const { args = [] } = options;
+    const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir'));
+    if (userDataDirArg)
+      throw this._createUserDataDirArgMisuseError('--user-data-dir');
+    if (args.find(arg => arg.startsWith('--remote-debugging-pipe')))
+      throw new Error('Playwright manages remote debugging connection itself.');
+    if (args.find(arg => !arg.startsWith('-')))
+      throw new Error('Arguments can not specify page to be opened');
+    const chromeArguments = [...chromiumSwitches(options.assistantMode)];
+
+    if (os.platform() === 'darwin') {
+      // See https://issues.chromium.org/issues/40277080
+      chromeArguments.push('--enable-unsafe-swiftshader');
+    }
+
+    if (options.devtools)
+      chromeArguments.push('--auto-open-devtools-for-tabs');
+    if (options.headless) {
+      chromeArguments.push('--headless');
+
+      chromeArguments.push(
+          '--hide-scrollbars',
+          '--mute-audio',
+          '--blink-settings=primaryHoverType=2,availableHoverTypes=2,primaryPointerType=4,availablePointerTypes=4',
+      );
+    }
+    if (options.chromiumSandbox !== true)
+      chromeArguments.push('--no-sandbox');
+    const proxy = options.proxyOverride || options.proxy;
+    if (proxy) {
+      const proxyURL = new URL(proxy.server);
+      const isSocks = proxyURL.protocol === 'socks5:';
+      // https://www.chromium.org/developers/design-documents/network-settings
+      if (isSocks && !options.socksProxyPort) {
+        // https://www.chromium.org/developers/design-documents/network-stack/socks-proxy
+        chromeArguments.push(`--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE ${proxyURL.hostname}"`);
+      }
+      chromeArguments.push(`--proxy-server=${proxy.server}`);
+      const proxyBypassRules = [];
+      // https://source.chromium.org/chromium/chromium/src/+/master:net/docs/proxy.md;l=548;drc=71698e610121078e0d1a811054dcf9fd89b49578
+      if (options.socksProxyPort)
+        proxyBypassRules.push('<-loopback>');
+      if (proxy.bypass)
+        proxyBypassRules.push(...proxy.bypass.split(',').map(t => t.trim()).map(t => t.startsWith('.') ? '*' + t : t));
+      if (!process.env.PLAYWRIGHT_DISABLE_FORCED_CHROMIUM_PROXIED_LOOPBACK && !proxyBypassRules.includes('<-loopback>'))
+        proxyBypassRules.push('<-loopback>');
+      if (proxyBypassRules.length > 0)
+        chromeArguments.push(`--proxy-bypass-list=${proxyBypassRules.join(';')}`);
+    }
+    chromeArguments.push(...args);
+    return chromeArguments;
+  }
+}
+
+const kBidiOverCdpWrapper = Symbol('kBidiConnectionWrapper');
diff --git a/packages/playwright-core/src/server/bidi/bidiConnection.ts b/packages/playwright-core/src/server/bidi/bidiConnection.ts
new file mode 100644
index 0000000000000..0882836c38a36
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiConnection.ts
@@ -0,0 +1,232 @@
+/**
+ * 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 { debugLogger } from '../utils/debugLogger';
+import { helper } from '../helper';
+import { ProtocolError } from '../protocolError';
+
+import type { RecentLogsCollector } from '../utils/debugLogger';
+import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
+import type { ProtocolLogger } from '../types';
+import type * as bidiCommands from './third_party/bidiCommands';
+import type * as bidi from './third_party/bidiProtocol';
+
+// BidiPlaywright uses this special id to issue Browser.close command which we
+// should ignore.
+export const kBrowserCloseMessageId = 0;
+
+export class BidiConnection {
+  private readonly _transport: ConnectionTransport;
+  private readonly _onDisconnect: () => void;
+  private readonly _protocolLogger: ProtocolLogger;
+  private readonly _browserLogsCollector: RecentLogsCollector;
+  _browserDisconnectedLogs: string | undefined;
+  private _lastId = 0;
+  private _closed = false;
+  readonly browserSession: BidiSession;
+  readonly _browsingContextToSession = new Map<string, BidiSession>();
+
+  constructor(transport: ConnectionTransport, onDisconnect: () => void, protocolLogger: ProtocolLogger, browserLogsCollector: RecentLogsCollector) {
+    this._transport = transport;
+    this._onDisconnect = onDisconnect;
+    this._protocolLogger = protocolLogger;
+    this._browserLogsCollector = browserLogsCollector;
+    this.browserSession = new BidiSession(this, '', (message: any) => {
+      this.rawSend(message);
+    });
+    this._transport.onmessage = this._dispatchMessage.bind(this);
+    // onclose should be set last, since it can be immediately called.
+    this._transport.onclose = this._onClose.bind(this);
+  }
+
+  nextMessageId(): number {
+    return ++this._lastId;
+  }
+
+  rawSend(message: ProtocolRequest) {
+    this._protocolLogger('send', message);
+    this._transport.send(message);
+  }
+
+  private _dispatchMessage(message: ProtocolResponse) {
+    this._protocolLogger('receive', message);
+    const object = message as bidi.Message;
+    // Bidi messages do not have a common session identifier, so we
+    // route them based on BrowsingContext.
+    if (object.type === 'event') {
+      // Route page events to the right session.
+      let context;
+      if ('context' in object.params)
+        context = object.params.context;
+      else if (object.method === 'log.entryAdded' || object.method === 'script.message')
+        context = object.params.source?.context;
+      if (context) {
+        const session = this._browsingContextToSession.get(context);
+        if (session) {
+          session.dispatchMessage(message);
+          return;
+        }
+      }
+    } else if (message.id) {
+      // Find caller session.
+      for (const session of this._browsingContextToSession.values()) {
+        if (session.hasCallback(message.id)) {
+          session.dispatchMessage(message);
+          return;
+        }
+      }
+    }
+    this.browserSession.dispatchMessage(message);
+  }
+
+  _onClose(reason?: string) {
+    this._closed = true;
+    this._transport.onmessage = undefined;
+    this._transport.onclose = undefined;
+    this._browserDisconnectedLogs = helper.formatBrowserLogs(this._browserLogsCollector.recentLogs(), reason);
+    this.browserSession.dispose();
+    this._onDisconnect();
+  }
+
+  isClosed() {
+    return this._closed;
+  }
+
+  close() {
+    if (!this._closed)
+      this._transport.close();
+  }
+
+  createMainFrameBrowsingContextSession(bowsingContextId: bidi.BrowsingContext.BrowsingContext): BidiSession {
+    const result = new BidiSession(this, bowsingContextId, message => this.rawSend(message));
+    this._browsingContextToSession.set(bowsingContextId, result);
+    return result;
+  }
+}
+
+type BidiEvents = {
+  [K in bidi.Event['method']]: Extract<bidi.Event, {method: K}>;
+};
+
+export class BidiSession extends EventEmitter {
+  readonly connection: BidiConnection;
+  readonly sessionId: string;
+
+  private _disposed = false;
+  private readonly _rawSend: (message: any) => void;
+  private readonly _callbacks = new Map<number, { resolve: (o: any) => void, reject: (e: ProtocolError) => void, error: ProtocolError }>();
+  private _crashed: boolean = false;
+  private readonly _browsingContexts = new Set<string>();
+
+  override on: <T extends keyof BidiEvents | symbol>(event: T, listener: (payload: T extends symbol ? any : BidiEvents[T extends keyof BidiEvents ? T : never]['params']) => void) => this;
+  override addListener: <T extends keyof BidiEvents | symbol>(event: T, listener: (payload: T extends symbol ? any : BidiEvents[T extends keyof BidiEvents ? T : never]['params']) => void) => this;
+  override off: <T extends keyof BidiEvents | symbol>(event: T, listener: (payload: T extends symbol ? any : BidiEvents[T extends keyof BidiEvents ? T : never]['params']) => void) => this;
+  override removeListener: <T extends keyof BidiEvents | symbol>(event: T, listener: (payload: T extends symbol ? any : BidiEvents[T extends keyof BidiEvents ? T : never]['params']) => void) => this;
+  override once: <T extends keyof BidiEvents | symbol>(event: T, listener: (payload: T extends symbol ? any : BidiEvents[T extends keyof BidiEvents ? T : never]['params']) => void) => this;
+
+  constructor(connection: BidiConnection, sessionId: string, rawSend: (message: any) => void) {
+    super();
+    this.setMaxListeners(0);
+    this.connection = connection;
+    this.sessionId = sessionId;
+    this._rawSend = rawSend;
+
+    this.on = super.on;
+    this.off = super.removeListener;
+    this.addListener = super.addListener;
+    this.removeListener = super.removeListener;
+    this.once = super.once;
+  }
+
+  addFrameBrowsingContext(context: string) {
+    this._browsingContexts.add(context);
+    this.connection._browsingContextToSession.set(context, this);
+  }
+
+  removeFrameBrowsingContext(context: string) {
+    this._browsingContexts.delete(context);
+    this.connection._browsingContextToSession.delete(context);
+  }
+
+  async send<T extends keyof bidiCommands.Commands>(
+    method: T,
+    params?: bidiCommands.Commands[T]['params']
+  ): Promise<bidiCommands.Commands[T]['returnType']> {
+    if (this._crashed || this._disposed || this.connection._browserDisconnectedLogs)
+      throw new ProtocolError(this._crashed ? 'crashed' : 'closed', undefined, this.connection._browserDisconnectedLogs);
+    const id = this.connection.nextMessageId();
+    const messageObj = { id, method, params };
+    this._rawSend(messageObj);
+    return new Promise<bidiCommands.Commands[T]['returnType']>((resolve, reject) => {
+      this._callbacks.set(id, { resolve, reject, error: new ProtocolError('error', method) });
+    });
+  }
+
+  sendMayFail<T extends keyof bidiCommands.Commands>(method: T, params?: bidiCommands.Commands[T]['params']): Promise<bidiCommands.Commands[T]['returnType'] | void> {
+    return this.send(method, params).catch(error => debugLogger.log('error', error));
+  }
+
+  markAsCrashed() {
+    this._crashed = true;
+  }
+
+  isDisposed(): boolean {
+    return this._disposed;
+  }
+
+  dispose() {
+    this._disposed = true;
+    this.connection._browsingContextToSession.delete(this.sessionId);
+    for (const context of this._browsingContexts)
+      this.connection._browsingContextToSession.delete(context);
+    this._browsingContexts.clear();
+    for (const callback of this._callbacks.values()) {
+      callback.error.type = this._crashed ? 'crashed' : 'closed';
+      callback.error.logs = this.connection._browserDisconnectedLogs;
+      callback.reject(callback.error);
+    }
+    this._callbacks.clear();
+  }
+
+  hasCallback(id: number): boolean {
+    return this._callbacks.has(id);
+  }
+
+  dispatchMessage(message: any) {
+    const object = message as bidi.Message;
+    if (object.id === kBrowserCloseMessageId)
+      return;
+    if (object.id && this._callbacks.has(object.id)) {
+      const callback = this._callbacks.get(object.id)!;
+      this._callbacks.delete(object.id);
+      if (object.type === 'error') {
+        callback.error.setMessage(object.error + '\nMessage: ' + object.message);
+        callback.reject(callback.error);
+      } else if (object.type === 'success') {
+        callback.resolve(object.result);
+      } else {
+        callback.error.setMessage('Internal error, unexpected response type: ' + JSON.stringify(object));
+        callback.reject(callback.error);
+      }
+    } else if (object.id) {
+      // Response might come after session has been disposed and rejected all callbacks.
+    } else {
+      Promise.resolve().then(() => this.emit(object.method, object.params));
+    }
+  }
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts b/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts
new file mode 100644
index 0000000000000..33a2890bfb853
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiExecutionContext.ts
@@ -0,0 +1,219 @@
+/**
+ * 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 '../../utils';
+import { parseEvaluationResultValue } from '../../utils/isomorphic/utilityScriptSerializers';
+import * as js from '../javascript';
+import * as dom from '../dom';
+import { BidiDeserializer } from './third_party/bidiDeserializer';
+import * as bidi from './third_party/bidiProtocol';
+import { BidiSerializer } from './third_party/bidiSerializer';
+
+import type { BidiSession } from './bidiConnection';
+
+export class BidiExecutionContext implements js.ExecutionContextDelegate {
+  private readonly _session: BidiSession;
+  readonly _target: bidi.Script.Target;
+
+  constructor(session: BidiSession, realmInfo: bidi.Script.RealmInfo) {
+    this._session = session;
+    if (realmInfo.type === 'window') {
+      // Simple realm does not seem to work for Window contexts.
+      this._target = {
+        context: realmInfo.context,
+        sandbox: realmInfo.sandbox,
+      };
+    } else {
+      this._target = {
+        realm: realmInfo.realm
+      };
+    }
+  }
+
+  async rawEvaluateJSON(expression: string): Promise<any> {
+    const response = await this._session.send('script.evaluate', {
+      expression,
+      target: this._target,
+      serializationOptions: {
+        maxObjectDepth: 10,
+        maxDomDepth: 10,
+      },
+      awaitPromise: true,
+      userActivation: true,
+    });
+    if (response.type === 'success')
+      return BidiDeserializer.deserialize(response.result);
+    if (response.type === 'exception')
+      throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
+    throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
+  }
+
+  async rawEvaluateHandle(context: js.ExecutionContext, expression: string): Promise<js.JSHandle> {
+    const response = await this._session.send('script.evaluate', {
+      expression,
+      target: this._target,
+      resultOwnership: bidi.Script.ResultOwnership.Root, // Necessary for the handle to be returned.
+      serializationOptions: { maxObjectDepth: 0, maxDomDepth: 0 },
+      awaitPromise: true,
+      userActivation: true,
+    });
+    if (response.type === 'success') {
+      if ('handle' in response.result)
+        return createHandle(context, response.result);
+      throw new js.JavaScriptErrorInEvaluate('Cannot get handle: ' + JSON.stringify(response.result));
+    }
+    if (response.type === 'exception')
+      throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
+    throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
+  }
+
+  async evaluateWithArguments(functionDeclaration: string, returnByValue: boolean, utilityScript: js.JSHandle, values: any[], handles: js.JSHandle[]): Promise<any> {
+    const response = await this._session.send('script.callFunction', {
+      functionDeclaration,
+      target: this._target,
+      arguments: [
+        { handle: utilityScript._objectId! },
+        ...values.map(BidiSerializer.serialize),
+        ...handles.map(handle => ({ handle: handle._objectId! })),
+      ],
+      resultOwnership: returnByValue ? undefined : bidi.Script.ResultOwnership.Root, // Necessary for the handle to be returned.
+      serializationOptions: returnByValue ? {} : { maxObjectDepth: 0, maxDomDepth: 0 },
+      awaitPromise: true,
+      userActivation: true,
+    });
+    if (response.type === 'exception')
+      throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
+    if (response.type === 'success') {
+      if (returnByValue)
+        return parseEvaluationResultValue(BidiDeserializer.deserialize(response.result));
+      return createHandle(utilityScript._context, response.result);
+    }
+    throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
+  }
+
+  async getProperties(handle: js.JSHandle): Promise<Map<string, js.JSHandle>> {
+    const names = await handle.evaluate(object => {
+      const names = [];
+      const descriptors = Object.getOwnPropertyDescriptors(object);
+      for (const name in descriptors) {
+        if (descriptors[name]?.enumerable)
+          names.push(name);
+      }
+      return names;
+    });
+    const values = await Promise.all(names.map(name => handle.evaluateHandle((object, name) => object[name], name)));
+    const map = new Map<string, js.JSHandle>();
+    for (let i = 0; i < names.length; i++)
+      map.set(names[i], values[i]);
+    return map;
+  }
+
+  async releaseHandle(handle: js.JSHandle): Promise<void> {
+    if (!handle._objectId)
+      return;
+    await this._session.send('script.disown', {
+      target: this._target,
+      handles: [handle._objectId],
+    });
+  }
+
+
+  async nodeIdForElementHandle(handle: dom.ElementHandle): Promise<bidi.Script.SharedReference> {
+    const shared = await this._remoteValueForReference({ handle: handle._objectId });
+    // TODO: store sharedId in the handle.
+    if (!('sharedId' in shared))
+      throw new Error('Element is not a node');
+    return {
+      sharedId: shared.sharedId!,
+    };
+  }
+
+  async remoteObjectForNodeId(context: dom.FrameExecutionContext, nodeId: bidi.Script.SharedReference): Promise<js.JSHandle> {
+    const result = await this._remoteValueForReference(nodeId, true);
+    if (!('handle' in result))
+      throw new Error('Can\'t get remote object for nodeId');
+    return createHandle(context, result);
+  }
+
+  async contentFrameIdForFrame(handle: dom.ElementHandle) {
+    const contentWindow = await this._rawCallFunction('e => e.contentWindow', { handle: handle._objectId });
+    if (contentWindow?.type === 'window')
+      return contentWindow.value.context;
+    return null;
+  }
+
+  async frameIdForWindowHandle(handle: js.JSHandle): Promise<string | null> {
+    if (!handle._objectId)
+      throw new Error('JSHandle is not a DOM node handle');
+    const contentWindow = await this._remoteValueForReference({ handle: handle._objectId });
+    if (contentWindow.type === 'window')
+      return contentWindow.value.context;
+    return null;
+  }
+
+  private async _remoteValueForReference(reference: bidi.Script.RemoteReference, createHandle?: boolean) {
+    return await this._rawCallFunction('e => e', reference, createHandle);
+  }
+
+  private async _rawCallFunction(functionDeclaration: string, arg: bidi.Script.LocalValue, createHandle?: boolean): Promise<bidi.Script.RemoteValue> {
+    const response = await this._session.send('script.callFunction', {
+      functionDeclaration,
+      target: this._target,
+      arguments: [arg],
+      // "Root" is necessary for the handle to be returned.
+      resultOwnership: createHandle ? bidi.Script.ResultOwnership.Root : bidi.Script.ResultOwnership.None,
+      serializationOptions: { maxObjectDepth: 0, maxDomDepth: 0 },
+      awaitPromise: true,
+      userActivation: true,
+    });
+    if (response.type === 'exception')
+      throw new js.JavaScriptErrorInEvaluate(response.exceptionDetails.text + '\nFull val: ' + JSON.stringify(response.exceptionDetails));
+    if (response.type === 'success')
+      return response.result;
+    throw new js.JavaScriptErrorInEvaluate('Unexpected response type: ' + JSON.stringify(response));
+  }
+}
+
+function renderPreview(remoteObject: bidi.Script.RemoteValue): string | undefined {
+  if (remoteObject.type === 'undefined')
+    return 'undefined';
+  if (remoteObject.type === 'null')
+    return 'null';
+  if ('value' in remoteObject)
+    return String(remoteObject.value);
+  return `<${remoteObject.type}>`;
+}
+
+function remoteObjectValue(remoteObject: bidi.Script.RemoteValue): any {
+  if (remoteObject.type === 'undefined')
+    return undefined;
+  if (remoteObject.type === 'null')
+    return null;
+  if (remoteObject.type === 'number' && typeof remoteObject.value === 'string')
+    return js.parseUnserializableValue(remoteObject.value);
+  if ('value' in remoteObject)
+    return remoteObject.value;
+  return undefined;
+}
+
+export function createHandle(context: js.ExecutionContext, remoteObject: bidi.Script.RemoteValue): js.JSHandle {
+  if (remoteObject.type === 'node') {
+    assert(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context, remoteObject.handle!);
+  }
+  const objectId = 'handle' in remoteObject ? remoteObject.handle : undefined;
+  return new js.JSHandle(context, remoteObject.type, renderPreview(remoteObject), objectId, remoteObjectValue(remoteObject));
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiFirefox.ts b/packages/playwright-core/src/server/bidi/bidiFirefox.ts
new file mode 100644
index 0000000000000..7c96383fe1827
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiFirefox.ts
@@ -0,0 +1,120 @@
+/**
+ * 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 'os';
+import path from 'path';
+
+import { wrapInASCIIBox } from '../utils/ascii';
+import { BrowserType, kNoXServerRunningError } from '../browserType';
+import { BidiBrowser } from './bidiBrowser';
+import { kBrowserCloseMessageId } from './bidiConnection';
+import { createProfile } from './third_party/firefoxPrefs';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+
+import type { BrowserOptions } from '../browser';
+import type { SdkObject } from '../instrumentation';
+import type { Env } from '../utils/processLauncher';
+import type { ProtocolError } from '../protocolError';
+import type { ConnectionTransport } from '../transport';
+import type * as types from '../types';
+import type { RecentLogsCollector } from '../utils/debugLogger';
+
+
+export class BidiFirefox extends BrowserType {
+  constructor(parent: SdkObject) {
+    super(parent, '_bidiFirefox');
+  }
+
+  override executablePath(): string {
+    return '';
+  }
+
+  override async connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<BidiBrowser> {
+    return BidiBrowser.connect(this.attribution.playwright, transport, options);
+  }
+
+  override doRewriteStartupLog(error: ProtocolError): ProtocolError {
+    if (!error.logs)
+      return error;
+    // https://github.com/microsoft/playwright/issues/6500
+    if (error.logs.includes(`as root in a regular user's session is not supported.`))
+      error.logs = '\n' + wrapInASCIIBox(`Firefox is unable to launch if the $HOME folder isn't owned by the current user.\nWorkaround: Set the HOME=/root environment variable${process.env.GITHUB_ACTION ? ' in your GitHub Actions workflow file' : ''} when running Playwright.`, 1);
+    if (error.logs.includes('no DISPLAY environment variable specified'))
+      error.logs = '\n' + wrapInASCIIBox(kNoXServerRunningError, 1);
+    return error;
+  }
+
+  override amendEnvironment(env: Env): Env {
+    if (!path.isAbsolute(os.homedir()))
+      throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${os.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
+
+    env = {
+      ...env,
+      'MOZ_CRASHREPORTER': '1',
+      'MOZ_CRASHREPORTER_NO_REPORT': '1',
+      'MOZ_CRASHREPORTER_SHUTDOWN': '1',
+    };
+
+    if (os.platform() === 'linux') {
+      // Always remove SNAP_NAME and SNAP_INSTANCE_NAME env variables since they
+      // confuse Firefox: in our case, builds never come from SNAP.
+      // See https://github.com/microsoft/playwright/issues/20555
+      return { ...env, SNAP_NAME: undefined, SNAP_INSTANCE_NAME: undefined };
+    }
+    return env;
+  }
+
+  override attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+    // Note that it's fine to reuse the transport, since our connection ignores kBrowserCloseMessageId.
+    transport.send({ method: 'browser.close', params: {}, id: kBrowserCloseMessageId });
+  }
+
+  override supportsPipeTransport(): boolean {
+    return false;
+  }
+
+  override async prepareUserDataDir(options: types.LaunchOptions, userDataDir: string): Promise<void> {
+    await createProfile({
+      path: userDataDir,
+      preferences: options.firefoxUserPrefs || {},
+    });
+  }
+
+  override defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
+    const { args = [], headless } = options;
+    const userDataDirArg = args.find(arg => arg.startsWith('-profile') || arg.startsWith('--profile'));
+    if (userDataDirArg)
+      throw this._createUserDataDirArgMisuseError('--profile');
+    const firefoxArguments = ['--remote-debugging-port=0'];
+    if (headless)
+      firefoxArguments.push('--headless');
+    else
+      firefoxArguments.push('--foreground');
+    firefoxArguments.push(`--profile`, userDataDir);
+    firefoxArguments.push(...args);
+    return firefoxArguments;
+  }
+
+  override async waitForReadyState(options: types.LaunchOptions, browserLogsCollector: RecentLogsCollector): Promise<{ wsEndpoint?: string }> {
+    const result = new ManualPromise<{ wsEndpoint?: string }>();
+    browserLogsCollector.onMessage(message => {
+      const match = message.match(/WebDriver BiDi listening on (ws:\/\/.*)$/);
+      if (match)
+        result.resolve({ wsEndpoint: match[1] + '/session' });
+    });
+    return result;
+  }
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiInput.ts b/packages/playwright-core/src/server/bidi/bidiInput.ts
new file mode 100644
index 0000000000000..30a6439745197
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiInput.ts
@@ -0,0 +1,145 @@
+/**
+ * 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 { resolveSmartModifierString } from '../input';
+import { getBidiKeyValue } from './third_party/bidiKeyboard';
+import * as bidi from './third_party/bidiProtocol';
+
+import type * as input from '../input';
+import type * as types from '../types';
+import type { BidiSession } from './bidiConnection';
+import type { Progress } from '../progress';
+
+export class RawKeyboardImpl implements input.RawKeyboard {
+  private _session: BidiSession;
+
+  constructor(session: BidiSession) {
+    this._session = session;
+  }
+
+  setSession(session: BidiSession) {
+    this._session = session;
+  }
+
+  async keydown(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription, autoRepeat: boolean): Promise<void> {
+    keyName = resolveSmartModifierString(keyName);
+    const actions: bidi.Input.KeySourceAction[] = [];
+    actions.push({ type: 'keyDown', value: getBidiKeyValue(keyName) });
+    await this._performActions(progress, actions);
+  }
+
+  async keyup(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription): Promise<void> {
+    keyName = resolveSmartModifierString(keyName);
+    const actions: bidi.Input.KeySourceAction[] = [];
+    actions.push({ type: 'keyUp', value: getBidiKeyValue(keyName) });
+    await this._performActions(progress, actions);
+  }
+
+  async sendText(progress: Progress, text: string): Promise<void> {
+    const actions: bidi.Input.KeySourceAction[] = [];
+    for (const char of text) {
+      const value = getBidiKeyValue(char);
+      actions.push({ type: 'keyDown', value });
+      actions.push({ type: 'keyUp', value });
+    }
+    await this._performActions(progress, actions);
+  }
+
+  private async _performActions(progress: Progress, actions: bidi.Input.KeySourceAction[]) {
+    await progress.race(this._session.send('input.performActions', {
+      context: this._session.sessionId,
+      actions: [
+        {
+          type: 'key',
+          id: 'pw_keyboard',
+          actions,
+        }
+      ]
+    }));
+  }
+}
+
+export class RawMouseImpl implements input.RawMouse {
+  private readonly _session: BidiSession;
+
+  constructor(session: BidiSession) {
+    this._session = session;
+  }
+
+  async move(progress: Progress, x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
+    await this._performActions(progress, [{ type: 'pointerMove', x, y }]);
+  }
+
+  async down(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+    await this._performActions(progress, [{ type: 'pointerDown', button: toBidiButton(button) }]);
+  }
+
+  async up(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+    await this._performActions(progress, [{ type: 'pointerUp', button: toBidiButton(button) }]);
+  }
+
+  async wheel(progress: Progress, x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
+    // Bidi throws when x/y are not integers.
+    x = Math.floor(x);
+    y = Math.floor(y);
+    await progress.race(this._session.send('input.performActions', {
+      context: this._session.sessionId,
+      actions: [
+        {
+          type: 'wheel',
+          id: 'pw_mouse_wheel',
+          actions: [{ type: 'scroll', x, y, deltaX, deltaY }],
+        }
+      ]
+    }));
+  }
+
+  private async _performActions(progress: Progress, actions: bidi.Input.PointerSourceAction[]) {
+    await progress.race(this._session.send('input.performActions', {
+      context: this._session.sessionId,
+      actions: [
+        {
+          type: 'pointer',
+          id: 'pw_mouse',
+          parameters: {
+            pointerType: bidi.Input.PointerType.Mouse,
+          },
+          actions,
+        }
+      ]
+    }));
+  }
+}
+
+export class RawTouchscreenImpl implements input.RawTouchscreen {
+  private readonly _session: BidiSession;
+
+  constructor(session: BidiSession) {
+    this._session = session;
+  }
+
+  async tap(progress: Progress, x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
+  }
+}
+
+function toBidiButton(button: string): number {
+  switch (button) {
+    case 'left': return 0;
+    case 'right': return 2;
+    case 'middle': return 1;
+  }
+  throw new Error('Unknown button: ' + button);
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts
new file mode 100644
index 0000000000000..f4e4a801d6428
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts
@@ -0,0 +1,346 @@
+/**
+ * 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 { eventsHelper } from '../utils/eventsHelper';
+import { parseRawCookie } from '../cookieStore';
+import * as network from '../network';
+import * as bidi from './third_party/bidiProtocol';
+
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type * as frames from '../frames';
+import type { Page } from '../page';
+import type * as types from '../types';
+import type { BidiSession } from './bidiConnection';
+
+
+export class BidiNetworkManager {
+  private readonly _session: BidiSession;
+  private readonly _requests: Map<string, BidiRequest>;
+  private readonly _page: Page;
+  private readonly _eventListeners: RegisteredListener[];
+  private _userRequestInterceptionEnabled: boolean = false;
+  private _protocolRequestInterceptionEnabled: boolean = false;
+  private _credentials: types.Credentials | undefined;
+  private _intercepId: bidi.Network.Intercept | undefined;
+
+  constructor(bidiSession: BidiSession, page: Page) {
+    this._session = bidiSession;
+    this._requests = new Map();
+    this._page = page;
+    this._eventListeners = [
+      eventsHelper.addEventListener(bidiSession, 'network.beforeRequestSent', this._onBeforeRequestSent.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'network.responseStarted', this._onResponseStarted.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'network.responseCompleted', this._onResponseCompleted.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'network.fetchError', this._onFetchError.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'network.authRequired', this._onAuthRequired.bind(this)),
+    ];
+  }
+
+  dispose() {
+    eventsHelper.removeEventListeners(this._eventListeners);
+  }
+
+  private _onBeforeRequestSent(param: bidi.Network.BeforeRequestSentParameters) {
+    if (param.request.url.startsWith('data:'))
+      return;
+    const redirectedFrom = param.redirectCount ? (this._requests.get(param.request.request) || null) : null;
+    const frame = redirectedFrom ? redirectedFrom.request.frame() : (param.context ? this._page.frameManager.frame(param.context) : null);
+    if (!frame)
+      return;
+    if (redirectedFrom)
+      this._requests.delete(redirectedFrom._id);
+    let route;
+    if (param.intercepts) {
+      // We do not support intercepting redirects.
+      if (redirectedFrom) {
+        let params = {};
+        if (redirectedFrom._originalRequestRoute?._alreadyContinuedHeaders)
+          params = toBidiRequestHeaders(redirectedFrom._originalRequestRoute._alreadyContinuedHeaders ?? []);
+
+        this._session.sendMayFail('network.continueRequest', {
+          request: param.request.request,
+          ...params,
+        });
+      } else {
+        route = new BidiRouteImpl(this._session, param.request.request);
+      }
+    }
+    const request = new BidiRequest(frame, redirectedFrom, param, route);
+    this._requests.set(request._id, request);
+    this._page.frameManager.requestStarted(request.request, route);
+  }
+
+  private _onResponseStarted(params: bidi.Network.ResponseStartedParameters) {
+    const request = this._requests.get(params.request.request);
+    if (!request)
+      return;
+    const getResponseBody = async () => {
+      throw new Error(`Response body is not available for requests in Bidi`);
+    };
+    const timings = params.request.timings;
+    const startTime = timings.requestTime;
+    function relativeToStart(time: number): number {
+      if (!time)
+        return -1;
+      return (time - startTime);
+    }
+    const timing: network.ResourceTiming = {
+      startTime: startTime,
+      requestStart: relativeToStart(timings.requestStart),
+      responseStart: relativeToStart(timings.responseStart),
+      domainLookupStart: relativeToStart(timings.dnsStart),
+      domainLookupEnd: relativeToStart(timings.dnsEnd),
+      connectStart: relativeToStart(timings.connectStart),
+      secureConnectionStart: relativeToStart(timings.tlsStart),
+      connectEnd: relativeToStart(timings.connectEnd),
+    };
+    const response = new network.Response(request.request, params.response.status, params.response.statusText, fromBidiHeaders(params.response.headers), timing, getResponseBody, false);
+    response._serverAddrFinished();
+    response._securityDetailsFinished();
+    // "raw" headers are the same as "provisional" headers in Bidi.
+    response.setRawResponseHeaders(null);
+    response.setResponseHeadersSize(params.response.headersSize);
+    this._page.frameManager.requestReceivedResponse(response);
+  }
+
+  private _onResponseCompleted(params: bidi.Network.ResponseCompletedParameters) {
+    const request = this._requests.get(params.request.request);
+    if (!request)
+      return;
+    const response = request.request._existingResponse()!;
+    // TODO: body size is the encoded size
+    response.setTransferSize(params.response.bodySize);
+    response.setEncodedBodySize(params.response.bodySize);
+
+    // Keep redirected requests in the map for future reference as redirectedFrom.
+    const isRedirected = response.status() >= 300 && response.status() <= 399;
+    const responseEndTime = params.request.timings.responseEnd - response.timing().startTime;
+    if (isRedirected) {
+      response._requestFinished(responseEndTime);
+    } else {
+      this._requests.delete(request._id);
+      response._requestFinished(responseEndTime);
+    }
+    response._setHttpVersion(params.response.protocol);
+    this._page.frameManager.reportRequestFinished(request.request, response);
+
+  }
+
+  private _onFetchError(params: bidi.Network.FetchErrorParameters) {
+    const request = this._requests.get(params.request.request);
+    if (!request)
+      return;
+    this._requests.delete(request._id);
+    const response = request.request._existingResponse();
+    if (response) {
+      response.setTransferSize(null);
+      response.setEncodedBodySize(null);
+      response._requestFinished(-1);
+    }
+    request.request._setFailureText(params.errorText);
+    // TODO: support canceled flag
+    this._page.frameManager.requestFailed(request.request, params.errorText === 'NS_BINDING_ABORTED');
+  }
+
+  private _onAuthRequired(params: bidi.Network.AuthRequiredParameters) {
+    const isBasic = params.response.authChallenges?.some(challenge => challenge.scheme.startsWith('Basic'));
+    const credentials = this._page.browserContext._options.httpCredentials;
+    if (isBasic && credentials) {
+      this._session.sendMayFail('network.continueWithAuth', {
+        request: params.request.request,
+        action: 'provideCredentials',
+        credentials: {
+          type: 'password',
+          username: credentials.username,
+          password: credentials.password,
+        }
+      });
+    } else {
+      this._session.sendMayFail('network.continueWithAuth', {
+        request: params.request.request,
+        action: 'default',
+      });
+    }
+  }
+
+  async setRequestInterception(value: boolean) {
+    this._userRequestInterceptionEnabled = value;
+    await this._updateProtocolRequestInterception();
+  }
+
+  async setCredentials(credentials: types.Credentials | undefined) {
+    this._credentials = credentials;
+    await this._updateProtocolRequestInterception();
+  }
+
+  async _updateProtocolRequestInterception(initial?: boolean) {
+    const enabled = this._userRequestInterceptionEnabled || !!this._credentials;
+    if (enabled === this._protocolRequestInterceptionEnabled)
+      return;
+    this._protocolRequestInterceptionEnabled = enabled;
+    if (initial && !enabled)
+      return;
+    const cachePromise = this._session.send('network.setCacheBehavior', { cacheBehavior: enabled ? 'bypass' : 'default' });
+    let interceptPromise = Promise.resolve<any>(undefined);
+    if (enabled) {
+      interceptPromise = this._session.send('network.addIntercept', {
+        phases: [bidi.Network.InterceptPhase.AuthRequired, bidi.Network.InterceptPhase.BeforeRequestSent],
+        urlPatterns: [{ type: 'pattern' }],
+        // urlPatterns: [{ type: 'string', pattern: '*' }],
+      }).then(r => {
+        this._intercepId = r.intercept;
+      });
+    } else if (this._intercepId) {
+      interceptPromise = this._session.send('network.removeIntercept', { intercept: this._intercepId });
+      this._intercepId = undefined;
+    }
+    await Promise.all([cachePromise, interceptPromise]);
+  }
+}
+
+
+class BidiRequest {
+  readonly request: network.Request;
+  readonly _id: string;
+  private _redirectedTo: BidiRequest | undefined;
+  // Only first request in the chain can be intercepted, so this will
+  // store the first and only Route in the chain (if any).
+  _originalRequestRoute: BidiRouteImpl | undefined;
+
+  constructor(frame: frames.Frame, redirectedFrom: BidiRequest | null, payload: bidi.Network.BeforeRequestSentParameters, route: BidiRouteImpl | undefined) {
+    this._id = payload.request.request;
+    if (redirectedFrom)
+      redirectedFrom._redirectedTo = this;
+    // TODO: missing in the spec?
+    const postDataBuffer = null;
+    this.request = new network.Request(frame._page.browserContext, frame, null, redirectedFrom ? redirectedFrom.request : null, payload.navigation ?? undefined,
+        payload.request.url, 'other', payload.request.method, postDataBuffer, fromBidiHeaders(payload.request.headers));
+    // "raw" headers are the same as "provisional" headers in Bidi.
+    this.request.setRawRequestHeaders(null);
+    this.request._setBodySize(payload.request.bodySize || 0);
+    this._originalRequestRoute = route ?? redirectedFrom?._originalRequestRoute;
+    route?._setRequest(this.request);
+  }
+
+  _finalRequest(): BidiRequest {
+    let request: BidiRequest = this;
+    while (request._redirectedTo)
+      request = request._redirectedTo;
+    return request;
+  }
+}
+
+class BidiRouteImpl implements network.RouteDelegate {
+  private _requestId: bidi.Network.Request;
+  private _session: BidiSession;
+  private _request!: network.Request;
+  _alreadyContinuedHeaders: types.HeadersArray | undefined;
+
+  constructor(session: BidiSession, requestId: bidi.Network.Request) {
+    this._session = session;
+    this._requestId = requestId;
+  }
+
+  _setRequest(request: network.Request) {
+    this._request = request;
+  }
+
+  async continue(overrides: types.NormalizedContinueOverrides) {
+    // Firefox does not update content-length header.
+    let headers = overrides.headers || this._request.headers();
+    if (overrides.postData && headers) {
+      headers = headers.map(header => {
+        if (header.name.toLowerCase() === 'content-length')
+          return { name: header.name, value: overrides.postData!.byteLength.toString() };
+        return header;
+      });
+    }
+    this._alreadyContinuedHeaders = headers;
+    await this._session.sendMayFail('network.continueRequest', {
+      request: this._requestId,
+      url: overrides.url,
+      method: overrides.method,
+      ...toBidiRequestHeaders(this._alreadyContinuedHeaders),
+      body: overrides.postData ? { type: 'base64', value: Buffer.from(overrides.postData).toString('base64') } : undefined,
+    });
+  }
+
+  async fulfill(response: types.NormalizedFulfillResponse) {
+    const base64body = response.isBase64 ? response.body : Buffer.from(response.body).toString('base64');
+    await this._session.sendMayFail('network.provideResponse', {
+      request: this._requestId,
+      statusCode: response.status,
+      reasonPhrase: network.statusText(response.status),
+      ...toBidiResponseHeaders(response.headers),
+      body: { type: 'base64', value: base64body },
+    });
+  }
+
+  async abort(errorCode: string) {
+    await this._session.sendMayFail('network.failRequest', {
+      request: this._requestId
+    });
+  }
+}
+
+function fromBidiHeaders(bidiHeaders: bidi.Network.Header[]): types.HeadersArray {
+  const result: types.HeadersArray = [];
+  for (const { name, value } of bidiHeaders)
+    result.push({ name, value: bidiBytesValueToString(value) });
+  return result;
+}
+
+function toBidiRequestHeaders(allHeaders: types.HeadersArray): { headers: bidi.Network.Header[] } {
+  const bidiHeaders = toBidiHeaders(allHeaders);
+  return { headers: bidiHeaders };
+}
+
+function toBidiResponseHeaders(headers: types.HeadersArray): { cookies: bidi.Network.SetCookieHeader[], headers: bidi.Network.Header[] } {
+  const setCookieHeaders = headers.filter(h => h.name.toLowerCase() === 'set-cookie');
+  const otherHeaders = headers.filter(h => h.name.toLowerCase() !== 'set-cookie');
+  const rawCookies = setCookieHeaders.map(h => parseRawCookie(h.value));
+  const cookies: bidi.Network.SetCookieHeader[] = rawCookies.filter(Boolean).map(c => {
+    return {
+      ...c!,
+      value: { type: 'string', value: c!.value },
+      sameSite: toBidiSameSite(c!.sameSite),
+    };
+  });
+  return { cookies, headers: toBidiHeaders(otherHeaders) };
+}
+
+function toBidiHeaders(headers: types.HeadersArray): bidi.Network.Header[] {
+  return headers.map(({ name, value }) => ({ name, value: { type: 'string', value } }));
+}
+
+export function bidiBytesValueToString(value: bidi.Network.BytesValue): string {
+  if (value.type === 'string')
+    return value.value;
+  if (value.type === 'base64')
+    return Buffer.from(value.type, 'base64').toString('binary');
+  return 'unknown value type: ' + (value as any).type;
+
+}
+
+function toBidiSameSite(sameSite?: 'Strict' | 'Lax' | 'None'): bidi.Network.SameSite | undefined {
+  if (!sameSite)
+    return undefined;
+  if (sameSite === 'Strict')
+    return bidi.Network.SameSite.Strict;
+  if (sameSite === 'Lax')
+    return bidi.Network.SameSite.Lax;
+  return bidi.Network.SameSite.None;
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiOverCdp.ts b/packages/playwright-core/src/server/bidi/bidiOverCdp.ts
new file mode 100644
index 0000000000000..8acd45563d0a3
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiOverCdp.ts
@@ -0,0 +1,102 @@
+/**
+ * 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 * as bidiMapper from 'chromium-bidi/lib/cjs/bidiMapper/BidiMapper';
+import * as bidiCdpConnection from 'chromium-bidi/lib/cjs/cdp/CdpConnection';
+
+import { debugLogger } from '../utils/debugLogger';
+
+import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
+import type { ChromiumBidi } from 'chromium-bidi/lib/cjs/protocol/protocol';
+import type * as bidiTransport from 'chromium-bidi/lib/cjs/utils/transport';
+
+const bidiServerLogger = (prefix: string, ...args: unknown[]): void => {
+  debugLogger.log(prefix as any, args);
+};
+
+export async function connectBidiOverCdp(cdp: ConnectionTransport): Promise<ConnectionTransport> {
+  let server: bidiMapper.BidiServer | undefined = undefined;
+  const bidiTransport = new BidiTransportImpl();
+  const bidiConnection = new BidiConnection(bidiTransport, () => server?.close());
+  const cdpTransportImpl = new CdpTransportImpl(cdp);
+  const cdpConnection = new bidiCdpConnection.MapperCdpConnection(cdpTransportImpl, bidiServerLogger);
+  // Make sure onclose event is propagated.
+  cdp.onclose = () => bidiConnection.onclose?.();
+  server = await bidiMapper.BidiServer.createAndStart(
+      bidiTransport,
+      cdpConnection,
+      await cdpConnection.createBrowserSession(),
+      /* selfTargetId= */ '',
+      undefined,
+      bidiServerLogger);
+  return bidiConnection;
+}
+
+class BidiTransportImpl implements bidiMapper.BidiTransport {
+  _handler?: (message: ChromiumBidi.Command) => Promise<void> | void;
+  _bidiConnection!: BidiConnection;
+
+  setOnMessage(handler: (message: ChromiumBidi.Command) => Promise<void> | void) {
+    this._handler = handler;
+  }
+  sendMessage(message: ChromiumBidi.Message): Promise<void> | void {
+    return this._bidiConnection.onmessage?.(message as any);
+  }
+  close() {
+    this._bidiConnection.onclose?.();
+  }
+}
+
+class BidiConnection implements ConnectionTransport {
+  private _bidiTransport: BidiTransportImpl;
+  private _closeCallback: () => void;
+
+  constructor(bidiTransport: BidiTransportImpl, closeCallback: () => void) {
+    this._bidiTransport = bidiTransport;
+    this._bidiTransport._bidiConnection = this;
+    this._closeCallback = closeCallback;
+  }
+  send(s: ProtocolRequest): void {
+    this._bidiTransport._handler?.(s as any);
+  }
+  close(): void {
+    this._closeCallback();
+  }
+  onmessage?: ((message: ProtocolResponse) => void) | undefined;
+  onclose?: ((reason?: string) => void) | undefined;
+}
+
+class CdpTransportImpl implements bidiTransport.Transport {
+  private _connection: ConnectionTransport;
+  private _handler?: (message: string) => Promise<void> | void;
+  _bidiConnection!: BidiConnection;
+
+  constructor(connection: ConnectionTransport) {
+    this._connection = connection;
+    this._connection.onmessage = message => {
+      this._handler?.(JSON.stringify(message));
+    };
+  }
+  setOnMessage(handler: (message: string) => Promise<void> | void) {
+    this._handler = handler;
+  }
+  sendMessage(message: string): Promise<void> | void {
+    return this._connection.send(JSON.parse(message));
+  }
+  close(): void {
+    this._connection.close();
+  }
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiPage.ts b/packages/playwright-core/src/server/bidi/bidiPage.ts
new file mode 100644
index 0000000000000..d9807955a66be
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiPage.ts
@@ -0,0 +1,538 @@
+/**
+ * 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 { eventsHelper } from '../utils/eventsHelper';
+import * as dialog from '../dialog';
+import * as dom from '../dom';
+import { Page } from '../page';
+import { BidiExecutionContext, createHandle } from './bidiExecutionContext';
+import { RawKeyboardImpl, RawMouseImpl, RawTouchscreenImpl } from './bidiInput';
+import { BidiNetworkManager } from './bidiNetworkManager';
+import { BidiPDF } from './bidiPdf';
+import * as bidi from './third_party/bidiProtocol';
+
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type * as accessibility from '../accessibility';
+import type * as frames from '../frames';
+import type { InitScript, PageDelegate } from '../page';
+import type { Progress } from '../progress';
+import type * as types from '../types';
+import type { BidiBrowserContext } from './bidiBrowser';
+import type { BidiSession } from './bidiConnection';
+import type * as channels from '@protocol/channels';
+
+const UTILITY_WORLD_NAME = '__playwright_utility_world__';
+export const kPlaywrightBindingChannel = 'playwrightChannel';
+
+export class BidiPage implements PageDelegate {
+  readonly rawMouse: RawMouseImpl;
+  readonly rawKeyboard: RawKeyboardImpl;
+  readonly rawTouchscreen: RawTouchscreenImpl;
+  readonly _page: Page;
+  readonly _session: BidiSession;
+  readonly _opener: BidiPage | null;
+  readonly _realmToContext: Map<string, dom.FrameExecutionContext>;
+  private _sessionListeners: RegisteredListener[] = [];
+  readonly _browserContext: BidiBrowserContext;
+  readonly _networkManager: BidiNetworkManager;
+  private readonly _pdf: BidiPDF;
+  private _initScriptIds = new Map<InitScript, string>();
+
+  constructor(browserContext: BidiBrowserContext, bidiSession: BidiSession, opener: BidiPage | null) {
+    this._session = bidiSession;
+    this._opener = opener;
+    this.rawKeyboard = new RawKeyboardImpl(bidiSession);
+    this.rawMouse = new RawMouseImpl(bidiSession);
+    this.rawTouchscreen = new RawTouchscreenImpl(bidiSession);
+    this._realmToContext = new Map();
+    this._page = new Page(this, browserContext);
+    this._browserContext = browserContext;
+    this._networkManager = new BidiNetworkManager(this._session, this._page);
+    this._pdf = new BidiPDF(this._session);
+    this._page.on(Page.Events.FrameDetached, (frame: frames.Frame) => this._removeContextsForFrame(frame, false));
+    this._sessionListeners = [
+      eventsHelper.addEventListener(bidiSession, 'script.realmCreated', this._onRealmCreated.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'script.message', this._onScriptMessage.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.contextDestroyed', this._onBrowsingContextDestroyed.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationStarted', this._onNavigationStarted.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationCommitted', this._onNavigationCommitted.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationAborted', this._onNavigationAborted.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.navigationFailed', this._onNavigationFailed.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.fragmentNavigated', this._onFragmentNavigated.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.historyUpdated', this._onHistoryUpdated.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.domContentLoaded', this._onDomContentLoaded.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.load', this._onLoad.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'browsingContext.userPromptOpened', this._onUserPromptOpened.bind(this)),
+      eventsHelper.addEventListener(bidiSession, 'log.entryAdded', this._onLogEntryAdded.bind(this)),
+    ];
+
+    // Initialize main frame.
+    // TODO: Wait for first execution context to be created and maybe about:blank navigated.
+    this._initialize().then(
+        () => this._page.reportAsNew(this._opener?._page),
+        error => this._page.reportAsNew(this._opener?._page, error));
+  }
+
+  private async _initialize() {
+    // Initialize main frame.
+    this._onFrameAttached(this._session.sessionId, null);
+    await Promise.all([
+      this.updateHttpCredentials(),
+      this.updateRequestInterception(),
+      // If the page is created by the Playwright client's call, some initialization
+      // may be pending. Wait for it to complete before reporting the page as new.
+    ]);
+  }
+
+  didClose() {
+    this._session.dispose();
+    eventsHelper.removeEventListeners(this._sessionListeners);
+    this._page._didClose();
+  }
+
+  private _onFrameAttached(frameId: string, parentFrameId: string | null): frames.Frame {
+    return this._page.frameManager.frameAttached(frameId, parentFrameId);
+  }
+
+  private _removeContextsForFrame(frame: frames.Frame, notifyFrame: boolean) {
+    for (const [contextId, context] of this._realmToContext) {
+      if (context.frame === frame) {
+        this._realmToContext.delete(contextId);
+        if (notifyFrame)
+          frame._contextDestroyed(context);
+      }
+    }
+  }
+
+  private _onRealmCreated(realmInfo: bidi.Script.RealmInfo) {
+    if (this._realmToContext.has(realmInfo.realm))
+      return;
+    if (realmInfo.type !== 'window')
+      return;
+    const frame = this._page.frameManager.frame(realmInfo.context);
+    if (!frame)
+      return;
+    let worldName: types.World;
+    if (!realmInfo.sandbox) {
+      worldName = 'main';
+      // Force creating utility world every time the main world is created (e.g. due to navigation).
+      this._touchUtilityWorld(realmInfo.context);
+    } else if (realmInfo.sandbox === UTILITY_WORLD_NAME) {
+      worldName = 'utility';
+    } else {
+      return;
+    }
+    const delegate = new BidiExecutionContext(this._session, realmInfo);
+    const context = new dom.FrameExecutionContext(delegate, frame, worldName);
+    frame._contextCreated(worldName, context);
+    this._realmToContext.set(realmInfo.realm, context);
+  }
+
+  private async _touchUtilityWorld(context: bidi.BrowsingContext.BrowsingContext) {
+    await this._session.sendMayFail('script.evaluate', {
+      expression: '1 + 1',
+      target: {
+        context,
+        sandbox: UTILITY_WORLD_NAME,
+      },
+      serializationOptions: {
+        maxObjectDepth: 10,
+        maxDomDepth: 10,
+      },
+      awaitPromise: true,
+      userActivation: true,
+    });
+  }
+
+  _onRealmDestroyed(params: bidi.Script.RealmDestroyedParameters): boolean {
+    const context = this._realmToContext.get(params.realm);
+    if (!context)
+      return false;
+    this._realmToContext.delete(params.realm);
+    context.frame._contextDestroyed(context);
+    return true;
+  }
+
+  // TODO: route the message directly to the browser
+  private _onBrowsingContextDestroyed(params: bidi.BrowsingContext.Info) {
+    this._browserContext._browser._onBrowsingContextDestroyed(params);
+  }
+
+  private _onNavigationStarted(params: bidi.BrowsingContext.NavigationInfo) {
+    const frameId = params.context;
+    this._page.frameManager.frameRequestedNavigation(frameId, params.navigation!);
+  }
+
+  private _onNavigationCommitted(params: bidi.BrowsingContext.NavigationInfo) {
+    const frameId = params.context;
+    this._page.frameManager.frameCommittedNewDocumentNavigation(frameId, params.url, '', params.navigation!, /* initial */ false);
+  }
+
+  private _onDomContentLoaded(params: bidi.BrowsingContext.NavigationInfo) {
+    const frameId = params.context;
+    this._page.frameManager.frameLifecycleEvent(frameId, 'domcontentloaded');
+  }
+
+  private _onLoad(params: bidi.BrowsingContext.NavigationInfo) {
+    this._page.frameManager.frameLifecycleEvent(params.context, 'load');
+  }
+
+  private _onNavigationAborted(params: bidi.BrowsingContext.NavigationInfo) {
+    this._page.frameManager.frameAbortedNavigation(params.context, 'Navigation aborted', params.navigation || undefined);
+  }
+
+  private _onNavigationFailed(params: bidi.BrowsingContext.NavigationInfo) {
+    this._page.frameManager.frameAbortedNavigation(params.context, 'Navigation failed', params.navigation || undefined);
+  }
+
+  private _onFragmentNavigated(params: bidi.BrowsingContext.NavigationInfo) {
+    this._page.frameManager.frameCommittedSameDocumentNavigation(params.context, params.url);
+  }
+
+  private _onHistoryUpdated(params: bidi.BrowsingContext.HistoryUpdatedParameters) {
+    this._page.frameManager.frameCommittedSameDocumentNavigation(params.context, params.url);
+  }
+
+  private _onUserPromptOpened(event: bidi.BrowsingContext.UserPromptOpenedParameters) {
+    this._page.browserContext.dialogManager.dialogDidOpen(new dialog.Dialog(
+        this._page,
+        event.type as dialog.DialogType,
+        event.message,
+        async (accept: boolean, userText?: string) => {
+          await this._session.send('browsingContext.handleUserPrompt', { context: event.context, accept, userText });
+        },
+        event.defaultValue));
+  }
+
+  private _onLogEntryAdded(params: bidi.Log.Entry) {
+    if (params.type !== 'console')
+      return;
+    const entry: bidi.Log.ConsoleLogEntry = params as bidi.Log.ConsoleLogEntry;
+    const context = this._realmToContext.get(params.source.realm);
+    if (!context)
+      return;
+    const callFrame = params.stackTrace?.callFrames[0];
+    const location = callFrame ?? { url: '', lineNumber: 1, columnNumber: 1 };
+    this._page.addConsoleMessage(entry.method, entry.args.map(arg => createHandle(context, arg)), location, params.text || undefined);
+  }
+
+  async navigateFrame(frame: frames.Frame, url: string, referrer: string | undefined): Promise<frames.GotoResult> {
+    const { navigation } = await this._session.send('browsingContext.navigate', {
+      context: frame._id,
+      url,
+    });
+    return { newDocumentId: navigation || undefined };
+  }
+
+  async updateExtraHTTPHeaders(): Promise<void> {
+  }
+
+  async updateEmulateMedia(): Promise<void> {
+  }
+
+  async updateUserAgent(): Promise<void> {
+  }
+
+  async bringToFront(): Promise<void> {
+    await this._session.send('browsingContext.activate', {
+      context: this._session.sessionId,
+    });
+  }
+
+  async updateEmulatedViewportSize(): Promise<void> {
+    const options = this._browserContext._options;
+    const emulatedSize = this._page.emulatedSize();
+    if (!emulatedSize)
+      return;
+    const viewportSize = emulatedSize.viewport;
+    await this._session.send('browsingContext.setViewport', {
+      context: this._session.sessionId,
+      viewport: {
+        width: viewportSize.width,
+        height: viewportSize.height,
+      },
+      devicePixelRatio: options.deviceScaleFactor || 1
+    });
+  }
+
+  async updateRequestInterception(): Promise<void> {
+    await this._networkManager.setRequestInterception(this._page.needsRequestInterception());
+  }
+
+  async updateOffline() {
+  }
+
+  async updateHttpCredentials() {
+    await this._networkManager.setCredentials(this._browserContext._options.httpCredentials);
+  }
+
+  async updateFileChooserInterception() {
+  }
+
+  async reload(): Promise<void> {
+    await this._session.send('browsingContext.reload', {
+      context: this._session.sessionId,
+      // ignoreCache: true,
+      wait: bidi.BrowsingContext.ReadinessState.Interactive,
+    });
+  }
+
+  async goBack(): Promise<boolean> {
+    return await this._session.send('browsingContext.traverseHistory', {
+      context: this._session.sessionId,
+      delta: -1,
+    }).then(() => true).catch(() => false);
+  }
+
+  async goForward(): Promise<boolean> {
+    return await this._session.send('browsingContext.traverseHistory', {
+      context: this._session.sessionId,
+      delta: +1,
+    }).then(() => true).catch(() => false);
+  }
+
+  async requestGC(): Promise<void> {
+    throw new Error('Method not implemented.');
+  }
+
+  private async _onScriptMessage(event: bidi.Script.MessageParameters) {
+    if (event.channel !== kPlaywrightBindingChannel)
+      return;
+    const pageOrError = await this._page.waitForInitializedOrError();
+    if (pageOrError instanceof Error)
+      return;
+    const context = this._realmToContext.get(event.source.realm);
+    if (!context)
+      return;
+    if (event.data.type !== 'string')
+      return;
+    await this._page.onBindingCalled(event.data.value, context);
+  }
+
+  async addInitScript(initScript: InitScript): Promise<void> {
+    const { script } = await this._session.send('script.addPreloadScript', {
+      // TODO: remove function call from the source.
+      functionDeclaration: `() => { return ${initScript.source} }`,
+      // TODO: push to iframes?
+      contexts: [this._session.sessionId],
+    });
+    this._initScriptIds.set(initScript, script);
+  }
+
+  async removeInitScripts(initScripts: InitScript[]): Promise<void> {
+    const ids: string[] = [];
+    for (const script of initScripts) {
+      const id = this._initScriptIds.get(script);
+      if (id)
+        ids.push(id);
+      this._initScriptIds.delete(script);
+    }
+    await Promise.all(ids.map(script => this._session.send('script.removePreloadScript', { script })));
+  }
+
+  async closePage(runBeforeUnload: boolean): Promise<void> {
+    await this._session.send('browsingContext.close', {
+      context: this._session.sessionId,
+      promptUnload: runBeforeUnload,
+    });
+  }
+
+  async setBackgroundColor(color?: { r: number; g: number; b: number; a: number; }): Promise<void> {
+  }
+
+  async takeScreenshot(progress: Progress, format: string, documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, quality: number | undefined, fitsViewport: boolean, scale: 'css' | 'device'): Promise<Buffer> {
+    const rect = (documentRect || viewportRect)!;
+    const { data } = await progress.race(this._session.send('browsingContext.captureScreenshot', {
+      context: this._session.sessionId,
+      format: {
+        type: `image/${format === 'png' ? 'png' : 'jpeg'}`,
+        quality: quality ? quality / 100 : 0.8,
+      },
+      origin: documentRect ? 'document' : 'viewport',
+      clip: {
+        type: 'box',
+        ...rect,
+      }
+    }));
+    return Buffer.from(data, 'base64');
+  }
+
+  async getContentFrame(handle: dom.ElementHandle): Promise<frames.Frame | null> {
+    const executionContext = toBidiExecutionContext(handle._context);
+    const frameId = await executionContext.contentFrameIdForFrame(handle);
+    if (!frameId)
+      return null;
+    return this._page.frameManager.frame(frameId);
+  }
+
+  async getOwnerFrame(handle: dom.ElementHandle): Promise<string | null> {
+    // TODO: switch to utility world?
+    const windowHandle = await handle.evaluateHandle(node => {
+      const doc = node.ownerDocument ?? node as Document;
+      return doc.defaultView;
+    });
+    if (!windowHandle)
+      return null;
+    const executionContext = toBidiExecutionContext(handle._context);
+    return executionContext.frameIdForWindowHandle(windowHandle);
+  }
+
+  async getBoundingBox(handle: dom.ElementHandle): Promise<types.Rect | null> {
+    const box = await handle.evaluate(element => {
+      if (!(element instanceof Element))
+        return null;
+      const rect = element.getBoundingClientRect();
+      return { x: rect.x, y: rect.y, width: rect.width, height: rect.height };
+    });
+    if (!box)
+      return null;
+    const position = await this._framePosition(handle._frame);
+    if (!position)
+      return null;
+    box.x += position.x;
+    box.y += position.y;
+    return box;
+  }
+
+  // TODO: move to Frame.
+  private async _framePosition(frame: frames.Frame): Promise<types.Point | null> {
+    if (frame === this._page.mainFrame())
+      return { x: 0, y: 0 };
+    const element = await frame.frameElement();
+    const box = await element.boundingBox();
+    if (!box)
+      return null;
+    const style = await element.evaluateInUtility(([injected, iframe]) => injected.describeIFrameStyle(iframe as Element), {}).catch(e => 'error:notconnected' as const);
+    if (style === 'error:notconnected' || style === 'transformed')
+      return null;
+    // Content box is offset by border and padding widths.
+    box.x += style.left;
+    box.y += style.top;
+    return box;
+  }
+
+  async scrollRectIntoViewIfNeeded(handle: dom.ElementHandle<Element>, rect?: types.Rect): Promise<'error:notvisible' | 'error:notconnected' | 'done'> {
+    return await handle.evaluateInUtility(([injected, node]) => {
+      node.scrollIntoView({
+        block: 'center',
+        inline: 'center',
+        behavior: 'instant',
+      });
+    }, null).then(() => 'done' as const).catch(e => {
+      if (e instanceof Error && e.message.includes('Node is detached from document'))
+        return 'error:notconnected';
+      if (e instanceof Error && e.message.includes('Node does not have a layout object'))
+        return 'error:notvisible';
+      throw e;
+    });
+  }
+
+  async setScreencastOptions(options: { width: number, height: number, quality: number } | null): Promise<void> {
+  }
+
+  rafCountForStablePosition(): number {
+    return 1;
+  }
+
+  async getContentQuads(handle: dom.ElementHandle<Element>): Promise<types.Quad[] | null | 'error:notconnected'> {
+    const quads = await handle.evaluateInUtility(([injected, node]) => {
+      if (!node.isConnected)
+        return 'error:notconnected';
+      const rects = node.getClientRects();
+      if (!rects)
+        return null;
+      return [...rects].map(rect => [
+        { x: rect.left, y: rect.top },
+        { x: rect.right, y: rect.top },
+        { x: rect.right, y: rect.bottom },
+        { x: rect.left, y: rect.bottom },
+      ]);
+    }, null);
+    if (!quads || quads === 'error:notconnected')
+      return quads;
+    // TODO: consider transforming quads to support clicks in iframes.
+    const position = await this._framePosition(handle._frame);
+    if (!position)
+      return null;
+    quads.forEach(quad => quad.forEach(point => {
+      point.x += position.x;
+      point.y += position.y;
+    }));
+    return quads as types.Quad[];
+  }
+
+  async setInputFilePaths(handle: dom.ElementHandle<HTMLInputElement>, paths: string[]): Promise<void> {
+    const fromContext = toBidiExecutionContext(handle._context);
+    await this._session.send('input.setFiles', {
+      context: this._session.sessionId,
+      element: await fromContext.nodeIdForElementHandle(handle),
+      files: paths,
+    });
+  }
+
+  async adoptElementHandle<T extends Node>(handle: dom.ElementHandle<T>, to: dom.FrameExecutionContext): Promise<dom.ElementHandle<T>> {
+    const fromContext = toBidiExecutionContext(handle._context);
+    const nodeId = await fromContext.nodeIdForElementHandle(handle);
+    const executionContext = toBidiExecutionContext(to);
+    return await executionContext.remoteObjectForNodeId(to, nodeId) as dom.ElementHandle<T>;
+  }
+
+  async getAccessibilityTree(needle?: dom.ElementHandle): Promise<{tree: accessibility.AXNode, needle: accessibility.AXNode | null}> {
+    throw new Error('Method not implemented.');
+  }
+
+  async inputActionEpilogue(): Promise<void> {
+  }
+
+  async resetForReuse(progress: Progress): Promise<void> {
+  }
+
+  async pdf(options: channels.PagePdfParams): Promise<Buffer> {
+    return this._pdf.generate(options);
+  }
+
+  async getFrameElement(frame: frames.Frame): Promise<dom.ElementHandle> {
+    const parent = frame.parentFrame();
+    if (!parent)
+      throw new Error('Frame has been detached.');
+    const parentContext = await parent._mainContext();
+    const list = await parentContext.evaluateHandle(() => { return [...document.querySelectorAll('iframe,frame')]; });
+    const length = await list.evaluate(list => list.length);
+    let foundElement = null;
+    for (let i = 0; i < length; i++) {
+      const element = await list.evaluateHandle((list, i) => list[i], i);
+      const candidate = await element.contentFrame();
+      if (frame === candidate) {
+        foundElement = element;
+        break;
+      } else {
+        element.dispose();
+      }
+    }
+    list.dispose();
+    if (!foundElement)
+      throw new Error('Frame has been detached.');
+    return foundElement;
+  }
+
+  shouldToggleStyleSheetToSyncAnimations(): boolean {
+    return true;
+  }
+}
+
+function toBidiExecutionContext(executionContext: dom.FrameExecutionContext): BidiExecutionContext {
+  return executionContext.delegate as BidiExecutionContext;
+}
diff --git a/packages/playwright-core/src/server/bidi/bidiPdf.ts b/packages/playwright-core/src/server/bidi/bidiPdf.ts
new file mode 100644
index 0000000000000..b9a8c5cb92f89
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/bidiPdf.ts
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ * Modifications 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 '../../utils';
+
+import type { BidiSession } from './bidiConnection';
+import type * as channels from '@protocol/channels';
+
+const PagePaperFormats: { [key: string]: { width: number, height: number }} = {
+  letter: { width: 8.5, height: 11 },
+  legal: { width: 8.5, height: 14 },
+  tabloid: { width: 11, height: 17 },
+  ledger: { width: 17, height: 11 },
+  a0: { width: 33.1, height: 46.8 },
+  a1: { width: 23.4, height: 33.1 },
+  a2: { width: 16.54, height: 23.4 },
+  a3: { width: 11.7, height: 16.54 },
+  a4: { width: 8.27, height: 11.7 },
+  a5: { width: 5.83, height: 8.27 },
+  a6: { width: 4.13, height: 5.83 },
+};
+
+const unitToPixels: { [key: string]: number } = {
+  'px': 1,
+  'in': 96,
+  'cm': 37.8,
+  'mm': 3.78
+};
+
+function convertPrintParameterToInches(text: string | undefined): number | undefined {
+  if (text === undefined)
+    return undefined;
+  let unit = text.substring(text.length - 2).toLowerCase();
+  let valueText = '';
+  if (unitToPixels.hasOwnProperty(unit)) {
+    valueText = text.substring(0, text.length - 2);
+  } else {
+    // In case of unknown unit try to parse the whole parameter as number of pixels.
+    // This is consistent with phantom's paperSize behavior.
+    unit = 'px';
+    valueText = text;
+  }
+  const value = Number(valueText);
+  assert(!isNaN(value), 'Failed to parse parameter value: ' + text);
+  const pixels = value * unitToPixels[unit];
+  return pixels / 96;
+}
+
+export class BidiPDF {
+  private _session: BidiSession;
+
+  constructor(session: BidiSession) {
+    this._session = session;
+  }
+
+  async generate(options: channels.PagePdfParams): Promise<Buffer> {
+    const {
+      scale = 1,
+      printBackground = false,
+      landscape = false,
+      pageRanges = '',
+      margin = {},
+    } = options;
+
+    let paperWidth = 8.5;
+    let paperHeight = 11;
+    if (options.format) {
+      const format = PagePaperFormats[options.format.toLowerCase()];
+      assert(format, 'Unknown paper format: ' + options.format);
+      paperWidth = format.width;
+      paperHeight = format.height;
+    } else {
+      paperWidth = convertPrintParameterToInches(options.width) || paperWidth;
+      paperHeight = convertPrintParameterToInches(options.height) || paperHeight;
+    }
+
+    const { data } = await this._session.send('browsingContext.print', {
+      context: this._session.sessionId,
+      background: printBackground,
+      margin: {
+        bottom: convertPrintParameterToInches(margin.bottom) || 0,
+        left: convertPrintParameterToInches(margin.left) || 0,
+        right: convertPrintParameterToInches(margin.right) || 0,
+        top: convertPrintParameterToInches(margin.top) || 0
+      },
+      orientation: landscape ? 'landscape' : 'portrait',
+      page: {
+        width: paperWidth,
+        height: paperHeight
+      },
+      pageRanges: pageRanges ? pageRanges.split(',').map(r => r.trim()) : undefined,
+      scale,
+    });
+    return Buffer.from(data, 'base64');
+  }
+}
diff --git a/packages/playwright-core/src/server/bidi/third_party/LICENSE b/packages/playwright-core/src/server/bidi/third_party/LICENSE
new file mode 100644
index 0000000000000..d2c171df74e93
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2017 Google Inc.
+
+   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
+
+       https://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.
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiCommands.d.ts b/packages/playwright-core/src/server/bidi/third_party/bidiCommands.d.ts
new file mode 100644
index 0000000000000..5be629678aeaf
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiCommands.d.ts
@@ -0,0 +1,193 @@
+/**
+ * @license
+ * Copyright 2024 Google Inc.
+ * Modifications copyright (c) Microsoft Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Copied from upstream: https://github.com/puppeteer/puppeteer/blob/main/packages/puppeteer-core/src/bidi/core/Connection.ts
+
+import type * as Bidi from './bidiProtocol';
+
+export interface Commands {
+  'script.evaluate': {
+    params: Bidi.Script.EvaluateParameters;
+    returnType: Bidi.Script.EvaluateResult;
+  };
+  'script.callFunction': {
+    params: Bidi.Script.CallFunctionParameters;
+    returnType: Bidi.Script.EvaluateResult;
+  };
+  'script.disown': {
+    params: Bidi.Script.DisownParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'script.addPreloadScript': {
+    params: Bidi.Script.AddPreloadScriptParameters;
+    returnType: Bidi.Script.AddPreloadScriptResult;
+  };
+  'script.removePreloadScript': {
+    params: Bidi.Script.RemovePreloadScriptParameters;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'browser.close': {
+    params: Bidi.EmptyParams;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'browser.createUserContext': {
+    params: Bidi.EmptyParams;
+    returnType: Bidi.Browser.CreateUserContextResult;
+  };
+  'browser.getUserContexts': {
+    params: Bidi.EmptyParams;
+    returnType: Bidi.Browser.GetUserContextsResult;
+  };
+  'browser.removeUserContext': {
+    params: {
+      userContext: Bidi.Browser.UserContext;
+    };
+    returnType: Bidi.Browser.RemoveUserContext;
+  };
+
+  'browsingContext.activate': {
+    params: Bidi.BrowsingContext.ActivateParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'browsingContext.create': {
+    params: Bidi.BrowsingContext.CreateParameters;
+    returnType: Bidi.BrowsingContext.CreateResult;
+  };
+  'browsingContext.close': {
+    params: Bidi.BrowsingContext.CloseParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'browsingContext.getTree': {
+    params: Bidi.BrowsingContext.GetTreeParameters;
+    returnType: Bidi.BrowsingContext.GetTreeResult;
+  };
+  'browsingContext.locateNodes': {
+    params: Bidi.BrowsingContext.LocateNodesParameters;
+    returnType: Bidi.BrowsingContext.LocateNodesResult;
+  };
+  'browsingContext.navigate': {
+    params: Bidi.BrowsingContext.NavigateParameters;
+    returnType: Bidi.BrowsingContext.NavigateResult;
+  };
+  'browsingContext.reload': {
+    params: Bidi.BrowsingContext.ReloadParameters;
+    returnType: Bidi.BrowsingContext.NavigateResult;
+  };
+  'browsingContext.print': {
+    params: Bidi.BrowsingContext.PrintParameters;
+    returnType: Bidi.BrowsingContext.PrintResult;
+  };
+  'browsingContext.captureScreenshot': {
+    params: Bidi.BrowsingContext.CaptureScreenshotParameters;
+    returnType: Bidi.BrowsingContext.CaptureScreenshotResult;
+  };
+  'browsingContext.handleUserPrompt': {
+    params: Bidi.BrowsingContext.HandleUserPromptParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'browsingContext.setViewport': {
+    params: Bidi.BrowsingContext.SetViewportParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'browsingContext.traverseHistory': {
+    params: Bidi.BrowsingContext.TraverseHistoryParameters;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'input.performActions': {
+    params: Bidi.Input.PerformActionsParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'input.releaseActions': {
+    params: Bidi.Input.ReleaseActionsParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'input.setFiles': {
+    params: Bidi.Input.SetFilesParameters;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'emulation.setGeolocationOverride': {
+    params: Bidi.Emulation.SetGeolocationOverrideParameters;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'emulation.setLocaleOverride': {
+    params: Bidi.Emulation.SetLocaleOverrideParameters;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'permissions.setPermission': {
+    params: Bidi.Permissions.SetPermissionParameters;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'session.end': {
+    params: Bidi.EmptyParams;
+    returnType: Bidi.EmptyResult;
+  };
+  'session.new': {
+    params: Bidi.Session.NewParameters;
+    returnType: Bidi.Session.NewResult;
+  };
+  'session.status': {
+    params: object;
+    returnType: Bidi.Session.StatusResult;
+  };
+  'session.subscribe': {
+    params: Bidi.Session.SubscriptionRequest;
+    returnType: Bidi.EmptyResult;
+  };
+  'session.unsubscribe': {
+    params: Bidi.Session.SubscriptionRequest;
+    returnType: Bidi.EmptyResult;
+  };
+
+  'storage.deleteCookies': {
+    params: Bidi.Storage.DeleteCookiesParameters;
+    returnType: Bidi.Storage.DeleteCookiesResult;
+  };
+  'storage.getCookies': {
+    params: Bidi.Storage.GetCookiesParameters;
+    returnType: Bidi.Storage.GetCookiesResult;
+  };
+  'network.setCacheBehavior': {
+    params: Bidi.Network.SetCacheBehaviorParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'storage.setCookie': {
+    params: Bidi.Storage.SetCookieParameters;
+    returnType: Bidi.Storage.SetCookieParameters;
+  };
+
+  'network.addIntercept': {
+    params: Bidi.Network.AddInterceptParameters;
+    returnType: Bidi.Network.AddInterceptResult;
+  };
+  'network.removeIntercept': {
+    params: Bidi.Network.RemoveInterceptParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'network.continueRequest': {
+    params: Bidi.Network.ContinueRequestParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'network.continueWithAuth': {
+    params: Bidi.Network.ContinueWithAuthParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'network.failRequest': {
+    params: Bidi.Network.FailRequestParameters;
+    returnType: Bidi.EmptyResult;
+  };
+  'network.provideResponse': {
+    params: Bidi.Network.ProvideResponseParameters;
+    returnType: Bidi.EmptyResult;
+  };
+}
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiDeserializer.ts b/packages/playwright-core/src/server/bidi/third_party/bidiDeserializer.ts
new file mode 100644
index 0000000000000..33ee3e4fda720
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiDeserializer.ts
@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright 2024 Google Inc.
+ * Modifications copyright (c) Microsoft Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Copied from upstream: https://github.com/puppeteer/puppeteer/blob/main/packages/puppeteer-core/src/bidi/Deserializer.ts
+
+import type * as Bidi from './bidiProtocol';
+
+/* eslint-disable object-curly-spacing */
+
+/**
+ * @internal
+ */
+export class BidiDeserializer {
+  static deserialize(result: Bidi.Script.RemoteValue): any {
+    if (!result)
+      return undefined;
+
+    switch (result.type) {
+      case 'array':
+        return result.value?.map(value => {
+          return BidiDeserializer.deserialize(value);
+        });
+      case 'set':
+        return result.value?.reduce((acc: Set<unknown>, value) => {
+          return acc.add(BidiDeserializer.deserialize(value));
+        }, new Set());
+      case 'object':
+        return result.value?.reduce((acc: Record<any, unknown>, tuple) => {
+          const {key, value} = BidiDeserializer._deserializeTuple(tuple);
+          acc[key as any] = value;
+          return acc;
+        }, {});
+      case 'map':
+        return result.value?.reduce((acc: Map<unknown, unknown>, tuple) => {
+          const {key, value} = BidiDeserializer._deserializeTuple(tuple);
+          return acc.set(key, value);
+        }, new Map());
+      case 'promise':
+        return {};
+      case 'regexp':
+        return new RegExp(result.value.pattern, result.value.flags);
+      case 'date':
+        return new Date(result.value);
+      case 'undefined':
+        return undefined;
+      case 'null':
+        return null;
+      case 'number':
+        return BidiDeserializer._deserializeNumber(result.value);
+      case 'bigint':
+        return BigInt(result.value);
+      case 'boolean':
+        return Boolean(result.value);
+      case 'string':
+        return result.value;
+    }
+
+    throw new Error(`Deserialization of type ${result.type} not supported.`);
+  }
+
+  static _deserializeNumber(value: Bidi.Script.SpecialNumber | number): number {
+    switch (value) {
+      case '-0':
+        return -0;
+      case 'NaN':
+        return NaN;
+      case 'Infinity':
+        return Infinity;
+      case '-Infinity':
+        return -Infinity;
+      default:
+        return value;
+    }
+  }
+
+  static _deserializeTuple([serializedKey, serializedValue]: [
+    Bidi.Script.RemoteValue | string,
+    Bidi.Script.RemoteValue,
+  ]): {key: unknown; value: unknown} {
+    const key =
+      typeof serializedKey === 'string'
+        ? serializedKey
+        : BidiDeserializer.deserialize(serializedKey);
+    const value = BidiDeserializer.deserialize(serializedValue);
+
+    return {key, value};
+  }
+}
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiKeyboard.ts b/packages/playwright-core/src/server/bidi/third_party/bidiKeyboard.ts
new file mode 100644
index 0000000000000..b4feff3b4d1e4
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiKeyboard.ts
@@ -0,0 +1,235 @@
+/**
+ * @license
+ * Copyright 2024 Google Inc.
+ * Modifications copyright (c) Microsoft Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Copied from upstream: https://github.com/puppeteer/puppeteer/blob/main/packages/puppeteer-core/src/bidi/Input.ts
+
+/* eslint-disable curly */
+
+export const getBidiKeyValue = (keyName: string) => {
+  switch (keyName) {
+    case '\r':
+    case '\n':
+      keyName = 'Enter';
+      break;
+  }
+  // Measures the number of code points rather than UTF-16 code units.
+  if ([...keyName].length === 1) {
+    return keyName;
+  }
+  switch (keyName) {
+    case 'Cancel':
+      return '\uE001';
+    case 'Help':
+      return '\uE002';
+    case 'Backspace':
+      return '\uE003';
+    case 'Tab':
+      return '\uE004';
+    case 'Clear':
+      return '\uE005';
+    case 'Enter':
+      return '\uE007';
+    case 'Shift':
+    case 'ShiftLeft':
+      return '\uE008';
+    case 'Control':
+    case 'ControlLeft':
+      return '\uE009';
+    case 'Alt':
+    case 'AltLeft':
+      return '\uE00A';
+    case 'Pause':
+      return '\uE00B';
+    case 'Escape':
+      return '\uE00C';
+    case 'PageUp':
+      return '\uE00E';
+    case 'PageDown':
+      return '\uE00F';
+    case 'End':
+      return '\uE010';
+    case 'Home':
+      return '\uE011';
+    case 'ArrowLeft':
+      return '\uE012';
+    case 'ArrowUp':
+      return '\uE013';
+    case 'ArrowRight':
+      return '\uE014';
+    case 'ArrowDown':
+      return '\uE015';
+    case 'Insert':
+      return '\uE016';
+    case 'Delete':
+      return '\uE017';
+    case 'NumpadEqual':
+      return '\uE019';
+    case 'Numpad0':
+      return '\uE01A';
+    case 'Numpad1':
+      return '\uE01B';
+    case 'Numpad2':
+      return '\uE01C';
+    case 'Numpad3':
+      return '\uE01D';
+    case 'Numpad4':
+      return '\uE01E';
+    case 'Numpad5':
+      return '\uE01F';
+    case 'Numpad6':
+      return '\uE020';
+    case 'Numpad7':
+      return '\uE021';
+    case 'Numpad8':
+      return '\uE022';
+    case 'Numpad9':
+      return '\uE023';
+    case 'NumpadMultiply':
+      return '\uE024';
+    case 'NumpadAdd':
+      return '\uE025';
+    case 'NumpadSubtract':
+      return '\uE027';
+    case 'NumpadDecimal':
+      return '\uE028';
+    case 'NumpadDivide':
+      return '\uE029';
+    case 'F1':
+      return '\uE031';
+    case 'F2':
+      return '\uE032';
+    case 'F3':
+      return '\uE033';
+    case 'F4':
+      return '\uE034';
+    case 'F5':
+      return '\uE035';
+    case 'F6':
+      return '\uE036';
+    case 'F7':
+      return '\uE037';
+    case 'F8':
+      return '\uE038';
+    case 'F9':
+      return '\uE039';
+    case 'F10':
+      return '\uE03A';
+    case 'F11':
+      return '\uE03B';
+    case 'F12':
+      return '\uE03C';
+    case 'Meta':
+    case 'MetaLeft':
+      return '\uE03D';
+    case 'ShiftRight':
+      return '\uE050';
+    case 'ControlRight':
+      return '\uE051';
+    case 'AltRight':
+      return '\uE052';
+    case 'MetaRight':
+      return '\uE053';
+    case 'Space':
+      return ' ';
+    case 'Digit0':
+      return '0';
+    case 'Digit1':
+      return '1';
+    case 'Digit2':
+      return '2';
+    case 'Digit3':
+      return '3';
+    case 'Digit4':
+      return '4';
+    case 'Digit5':
+      return '5';
+    case 'Digit6':
+      return '6';
+    case 'Digit7':
+      return '7';
+    case 'Digit8':
+      return '8';
+    case 'Digit9':
+      return '9';
+    case 'KeyA':
+      return 'a';
+    case 'KeyB':
+      return 'b';
+    case 'KeyC':
+      return 'c';
+    case 'KeyD':
+      return 'd';
+    case 'KeyE':
+      return 'e';
+    case 'KeyF':
+      return 'f';
+    case 'KeyG':
+      return 'g';
+    case 'KeyH':
+      return 'h';
+    case 'KeyI':
+      return 'i';
+    case 'KeyJ':
+      return 'j';
+    case 'KeyK':
+      return 'k';
+    case 'KeyL':
+      return 'l';
+    case 'KeyM':
+      return 'm';
+    case 'KeyN':
+      return 'n';
+    case 'KeyO':
+      return 'o';
+    case 'KeyP':
+      return 'p';
+    case 'KeyQ':
+      return 'q';
+    case 'KeyR':
+      return 'r';
+    case 'KeyS':
+      return 's';
+    case 'KeyT':
+      return 't';
+    case 'KeyU':
+      return 'u';
+    case 'KeyV':
+      return 'v';
+    case 'KeyW':
+      return 'w';
+    case 'KeyX':
+      return 'x';
+    case 'KeyY':
+      return 'y';
+    case 'KeyZ':
+      return 'z';
+    case 'Semicolon':
+      return ';';
+    case 'Equal':
+      return '=';
+    case 'Comma':
+      return ',';
+    case 'Minus':
+      return '-';
+    case 'Period':
+      return '.';
+    case 'Slash':
+      return '/';
+    case 'Backquote':
+      return '`';
+    case 'BracketLeft':
+      return '[';
+    case 'Backslash':
+      return '\\';
+    case 'BracketRight':
+      return ']';
+    case 'Quote':
+      return '"';
+    default:
+      throw new Error(`Unknown key: "${keyName}"`);
+  }
+};
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiProtocol.ts b/packages/playwright-core/src/server/bidi/third_party/bidiProtocol.ts
new file mode 100644
index 0000000000000..e52a44407535e
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiProtocol.ts
@@ -0,0 +1,18 @@
+/**
+ * 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 * from './bidiProtocolCore';
+export * from './bidiProtocolPermissions';
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiProtocolCore.ts b/packages/playwright-core/src/server/bidi/third_party/bidiProtocolCore.ts
new file mode 100644
index 0000000000000..5d9bedd66261e
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiProtocolCore.ts
@@ -0,0 +1,2719 @@
+/**
+ * Copyright 2024 Google LLC.
+ * 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.
+ */
+
+// Copied from upstream: https://github.com/GoogleChromeLabs/chromium-bidi/blob/main/src/protocol/generated/webdriver-bidi.ts
+
+/**
+ * THIS FILE IS AUTOGENERATED by cddlconv 0.1.6.
+ * Run `node tools/generate-bidi-types.mjs` to regenerate.
+ * @see https://github.com/w3c/webdriver-bidi/blob/master/index.bs
+ */
+
+export type Event = {
+  type: 'event';
+} & EventData &
+  Extensible;
+export type Command = {
+  id: JsUint;
+} & CommandData &
+  Extensible;
+export type CommandResponse = {
+  type: 'success';
+  id: JsUint;
+  result: ResultData;
+} & Extensible;
+export type EventData =
+  | BrowsingContextEvent
+  | InputEvent
+  | LogEvent
+  | NetworkEvent
+  | ScriptEvent;
+export type CommandData =
+  | BrowserCommand
+  | BrowsingContextCommand
+  | EmulationCommand
+  | InputCommand
+  | NetworkCommand
+  | ScriptCommand
+  | SessionCommand
+  | StorageCommand
+  | WebExtensionCommand;
+export type ResultData =
+  | BrowsingContextResult
+  | EmptyResult
+  | NetworkResult
+  | ScriptResult
+  | SessionResult
+  | StorageResult
+  | WebExtensionResult;
+export type EmptyParams = Extensible;
+export type Message = CommandResponse | ErrorResponse | Event;
+export type ErrorResponse = {
+  type: 'error';
+  id: JsUint | null;
+  error: ErrorCode;
+  message: string;
+  stacktrace?: string;
+} & Extensible;
+export type EmptyResult = Extensible;
+export type Extensible = {
+  [key: string]: any;
+};
+
+/**
+ * Must be between `-9007199254740991` and `9007199254740991`, inclusive.
+ */
+export type JsInt = number;
+
+/**
+ * Must be between `0` and `9007199254740991`, inclusive.
+ */
+export type JsUint = number;
+export const enum ErrorCode {
+  InvalidArgument = 'invalid argument',
+  InvalidSelector = 'invalid selector',
+  InvalidSessionId = 'invalid session id',
+  InvalidWebExtension = 'invalid web extension',
+  MoveTargetOutOfBounds = 'move target out of bounds',
+  NoSuchAlert = 'no such alert',
+  NoSuchNetworkCollector = 'no such network collector',
+  NoSuchElement = 'no such element',
+  NoSuchFrame = 'no such frame',
+  NoSuchHandle = 'no such handle',
+  NoSuchHistoryEntry = 'no such history entry',
+  NoSuchIntercept = 'no such intercept',
+  NoSuchNetworkData = 'no such network data',
+  NoSuchNode = 'no such node',
+  NoSuchRequest = 'no such request',
+  NoSuchScript = 'no such script',
+  NoSuchStoragePartition = 'no such storage partition',
+  NoSuchUserContext = 'no such user context',
+  NoSuchWebExtension = 'no such web extension',
+  SessionNotCreated = 'session not created',
+  UnableToCaptureScreen = 'unable to capture screen',
+  UnableToCloseBrowser = 'unable to close browser',
+  UnableToSetCookie = 'unable to set cookie',
+  UnableToSetFileInput = 'unable to set file input',
+  UnavailableNetworkData = 'unavailable network data',
+  UnderspecifiedStoragePartition = 'underspecified storage partition',
+  UnknownCommand = 'unknown command',
+  UnknownError = 'unknown error',
+  UnsupportedOperation = 'unsupported operation',
+}
+export type SessionCommand =
+  | Session.End
+  | Session.New
+  | Session.Status
+  | Session.Subscribe
+  | Session.Unsubscribe;
+export namespace Session {
+  export type ProxyConfiguration =
+    | Session.AutodetectProxyConfiguration
+    | Session.DirectProxyConfiguration
+    | Session.ManualProxyConfiguration
+    | Session.PacProxyConfiguration
+    | Session.SystemProxyConfiguration;
+}
+export type SessionResult =
+  | Session.NewResult
+  | Session.StatusResult
+  | Session.SubscribeResult;
+export namespace Session {
+  export type CapabilitiesRequest = {
+    alwaysMatch?: Session.CapabilityRequest;
+    firstMatch?: [...Session.CapabilityRequest[]];
+  };
+}
+export namespace Session {
+  export type CapabilityRequest = {
+    acceptInsecureCerts?: boolean;
+    browserName?: string;
+    browserVersion?: string;
+    platformName?: string;
+    proxy?: Session.ProxyConfiguration;
+    unhandledPromptBehavior?: Session.UserPromptHandler;
+  } & Extensible;
+}
+export namespace Session {
+  export type AutodetectProxyConfiguration = {
+    proxyType: 'autodetect';
+  } & Extensible;
+}
+export namespace Session {
+  export type DirectProxyConfiguration = {
+    proxyType: 'direct';
+  } & Extensible;
+}
+export namespace Session {
+  export type ManualProxyConfiguration = {
+    proxyType: 'manual';
+    httpProxy?: string;
+    sslProxy?: string;
+  } & ({} | Session.SocksProxyConfiguration) & {
+      noProxy?: [...string[]];
+    } & Extensible;
+}
+export namespace Session {
+  export type SocksProxyConfiguration = {
+    socksProxy: string;
+    /**
+     * Must be between `0` and `255`, inclusive.
+     */
+    socksVersion: number;
+  };
+}
+export namespace Session {
+  export type PacProxyConfiguration = {
+    proxyType: 'pac';
+    proxyAutoconfigUrl: string;
+  } & Extensible;
+}
+export namespace Session {
+  export type SystemProxyConfiguration = {
+    proxyType: 'system';
+  } & Extensible;
+}
+export namespace Session {
+  export type UserPromptHandler = {
+    alert?: Session.UserPromptHandlerType;
+    beforeUnload?: Session.UserPromptHandlerType;
+    confirm?: Session.UserPromptHandlerType;
+    default?: Session.UserPromptHandlerType;
+    file?: Session.UserPromptHandlerType;
+    prompt?: Session.UserPromptHandlerType;
+  };
+}
+export namespace Session {
+  export const enum UserPromptHandlerType {
+    Accept = 'accept',
+    Dismiss = 'dismiss',
+    Ignore = 'ignore',
+  }
+}
+export namespace Session {
+  export type Subscription = string;
+}
+export namespace Session {
+  export type SubscriptionRequest = {
+    events: [string, ...string[]];
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace Session {
+  export type UnsubscribeByIdRequest = {
+    subscriptions: [Session.Subscription, ...Session.Subscription[]];
+  };
+}
+export namespace Session {
+  export type UnsubscribeByAttributesRequest = {
+    events: [string, ...string[]];
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+  };
+}
+export namespace Session {
+  export type Status = {
+    method: 'session.status';
+    params: EmptyParams;
+  };
+}
+export namespace Session {
+  export type StatusResult = {
+    ready: boolean;
+    message: string;
+  };
+}
+export namespace Session {
+  export type New = {
+    method: 'session.new';
+    params: Session.NewParameters;
+  };
+}
+export namespace Session {
+  export type NewParameters = {
+    capabilities: Session.CapabilitiesRequest;
+  };
+}
+export namespace Session {
+  export type NewResult = {
+    sessionId: string;
+    capabilities: {
+      acceptInsecureCerts: boolean;
+      browserName: string;
+      browserVersion: string;
+      platformName: string;
+      setWindowRect: boolean;
+      userAgent: string;
+      proxy?: Session.ProxyConfiguration;
+      unhandledPromptBehavior?: Session.UserPromptHandler;
+      webSocketUrl?: string;
+    } & Extensible;
+  };
+}
+export namespace Session {
+  export type End = {
+    method: 'session.end';
+    params: EmptyParams;
+  };
+}
+export namespace Session {
+  export type Subscribe = {
+    method: 'session.subscribe';
+    params: Session.SubscriptionRequest;
+  };
+}
+export namespace Session {
+  export type SubscribeResult = {
+    subscription: Session.Subscription;
+  };
+}
+export namespace Session {
+  export type Unsubscribe = {
+    method: 'session.unsubscribe';
+    params: Session.UnsubscribeParameters;
+  };
+}
+export namespace Session {
+  export type UnsubscribeParameters =
+    | Session.UnsubscribeByAttributesRequest
+    | Session.UnsubscribeByIdRequest;
+}
+export type BrowserCommand =
+  | Browser.Close
+  | Browser.CreateUserContext
+  | Browser.GetClientWindows
+  | Browser.GetUserContexts
+  | Browser.RemoveUserContext
+  | Browser.SetClientWindowState;
+export type BrowserResult =
+  | Browser.CreateUserContextResult
+  | Browser.GetUserContextsResult;
+export namespace Browser {
+  export type ClientWindow = string;
+}
+export namespace Browser {
+  export type ClientWindowInfo = {
+    active: boolean;
+    clientWindow: Browser.ClientWindow;
+    height: JsUint;
+    state: 'fullscreen' | 'maximized' | 'minimized' | 'normal';
+    width: JsUint;
+    x: JsInt;
+    y: JsInt;
+  };
+}
+export namespace Browser {
+  export type UserContext = string;
+}
+export namespace Browser {
+  export type UserContextInfo = {
+    userContext: Browser.UserContext;
+  };
+}
+export namespace Browser {
+  export type Close = {
+    method: 'browser.close';
+    params: EmptyParams;
+  };
+}
+export namespace Browser {
+  export type CreateUserContext = {
+    method: 'browser.createUserContext';
+    params: Browser.CreateUserContextParameters;
+  };
+}
+export namespace Browser {
+  export type CreateUserContextParameters = {
+    acceptInsecureCerts?: boolean;
+    proxy?: Session.ProxyConfiguration;
+    unhandledPromptBehavior?: Session.UserPromptHandler;
+  };
+}
+export namespace Browser {
+  export type CreateUserContextResult = Browser.UserContextInfo;
+}
+export namespace Browser {
+  export type GetClientWindows = {
+    method: 'browser.getClientWindows';
+    params: EmptyParams;
+  };
+}
+export namespace Browser {
+  export type GetClientWindowsResult = {
+    clientWindows: [...Browser.ClientWindowInfo[]];
+  };
+}
+export namespace Browser {
+  export type GetUserContexts = {
+    method: 'browser.getUserContexts';
+    params: EmptyParams;
+  };
+}
+export namespace Browser {
+  export type GetUserContextsResult = {
+    userContexts: [Browser.UserContextInfo, ...Browser.UserContextInfo[]];
+  };
+}
+export namespace Browser {
+  export type RemoveUserContext = {
+    method: 'browser.removeUserContext';
+    params: Browser.RemoveUserContextParameters;
+  };
+}
+export namespace Browser {
+  export type RemoveUserContextParameters = {
+    userContext: Browser.UserContext;
+  };
+}
+export namespace Browser {
+  export type SetClientWindowState = {
+    method: 'browser.setClientWindowState';
+    params: Browser.SetClientWindowStateParameters;
+  };
+}
+export namespace Browser {
+  export type SetClientWindowStateParameters = {
+    clientWindow: Browser.ClientWindow;
+  } & (Browser.ClientWindowNamedState | Browser.ClientWindowRectState);
+}
+export namespace Browser {
+  export type ClientWindowNamedState = {
+    state: 'fullscreen' | 'maximized' | 'minimized';
+  };
+}
+export namespace Browser {
+  export type ClientWindowRectState = {
+    state: 'normal';
+    width?: JsUint;
+    height?: JsUint;
+    x?: JsInt;
+    y?: JsInt;
+  };
+}
+export type BrowsingContextCommand =
+  | BrowsingContext.Activate
+  | BrowsingContext.CaptureScreenshot
+  | BrowsingContext.Close
+  | BrowsingContext.Create
+  | BrowsingContext.GetTree
+  | BrowsingContext.HandleUserPrompt
+  | BrowsingContext.LocateNodes
+  | BrowsingContext.Navigate
+  | BrowsingContext.Print
+  | BrowsingContext.Reload
+  | BrowsingContext.SetViewport
+  | BrowsingContext.TraverseHistory;
+export type BrowsingContextEvent =
+  | BrowsingContext.ContextCreated
+  | BrowsingContext.ContextDestroyed
+  | BrowsingContext.DomContentLoaded
+  | BrowsingContext.DownloadEnd
+  | BrowsingContext.DownloadWillBegin
+  | BrowsingContext.FragmentNavigated
+  | BrowsingContext.HistoryUpdated
+  | BrowsingContext.Load
+  | BrowsingContext.NavigationAborted
+  | BrowsingContext.NavigationCommitted
+  | BrowsingContext.NavigationFailed
+  | BrowsingContext.NavigationStarted
+  | BrowsingContext.UserPromptClosed
+  | BrowsingContext.UserPromptOpened;
+export type BrowsingContextResult =
+  | BrowsingContext.CaptureScreenshotResult
+  | BrowsingContext.CreateResult
+  | BrowsingContext.GetTreeResult
+  | BrowsingContext.LocateNodesResult
+  | BrowsingContext.NavigateResult
+  | BrowsingContext.PrintResult
+  | BrowsingContext.TraverseHistoryResult;
+export namespace BrowsingContext {
+  export type BrowsingContext = string;
+}
+export namespace BrowsingContext {
+  export type InfoList = [...BrowsingContext.Info[]];
+}
+export namespace BrowsingContext {
+  export type Info = {
+    children: BrowsingContext.InfoList | null;
+    clientWindow: Browser.ClientWindow;
+    context: BrowsingContext.BrowsingContext;
+    originalOpener: BrowsingContext.BrowsingContext | null;
+    url: string;
+    userContext: Browser.UserContext;
+    parent?: BrowsingContext.BrowsingContext | null;
+  };
+}
+export namespace BrowsingContext {
+  export type Locator =
+    | BrowsingContext.AccessibilityLocator
+    | BrowsingContext.CssLocator
+    | BrowsingContext.ContextLocator
+    | BrowsingContext.InnerTextLocator
+    | BrowsingContext.XPathLocator;
+}
+export namespace BrowsingContext {
+  export type AccessibilityLocator = {
+    type: 'accessibility';
+    value: {
+      name?: string;
+      role?: string;
+    };
+  };
+}
+export namespace BrowsingContext {
+  export type CssLocator = {
+    type: 'css';
+    value: string;
+  };
+}
+export namespace BrowsingContext {
+  export type ContextLocator = {
+    type: 'context';
+    value: {
+      context: BrowsingContext.BrowsingContext;
+    };
+  };
+}
+export namespace BrowsingContext {
+  export type InnerTextLocator = {
+    type: 'innerText';
+    value: string;
+    ignoreCase?: boolean;
+    matchType?: 'full' | 'partial';
+    maxDepth?: JsUint;
+  };
+}
+export namespace BrowsingContext {
+  export type XPathLocator = {
+    type: 'xpath';
+    value: string;
+  };
+}
+export namespace BrowsingContext {
+  export type Navigation = string;
+}
+export namespace BrowsingContext {
+  export type BaseNavigationInfo = {
+    context: BrowsingContext.BrowsingContext;
+    navigation: BrowsingContext.Navigation | null;
+    timestamp: JsUint;
+    url: string;
+  };
+}
+export namespace BrowsingContext {
+  export type NavigationInfo = BrowsingContext.BaseNavigationInfo;
+}
+export namespace BrowsingContext {
+  export const enum ReadinessState {
+    None = 'none',
+    Interactive = 'interactive',
+    Complete = 'complete',
+  }
+}
+export namespace BrowsingContext {
+  export const enum UserPromptType {
+    Alert = 'alert',
+    Beforeunload = 'beforeunload',
+    Confirm = 'confirm',
+    Prompt = 'prompt',
+  }
+}
+export namespace BrowsingContext {
+  export type Activate = {
+    method: 'browsingContext.activate';
+    params: BrowsingContext.ActivateParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type ActivateParameters = {
+    context: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace BrowsingContext {
+  export type CaptureScreenshotParameters = {
+    context: BrowsingContext.BrowsingContext;
+    /**
+     * @defaultValue `"viewport"`
+     */
+    origin?: 'viewport' | 'document';
+    format?: BrowsingContext.ImageFormat;
+    clip?: BrowsingContext.ClipRectangle;
+  };
+}
+export namespace BrowsingContext {
+  export type CaptureScreenshot = {
+    method: 'browsingContext.captureScreenshot';
+    params: BrowsingContext.CaptureScreenshotParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type ImageFormat = {
+    type: string;
+    /**
+     * Must be between `0` and `1`, inclusive.
+     */
+    quality?: number;
+  };
+}
+export namespace BrowsingContext {
+  export type ClipRectangle =
+    | BrowsingContext.BoxClipRectangle
+    | BrowsingContext.ElementClipRectangle;
+}
+export namespace BrowsingContext {
+  export type ElementClipRectangle = {
+    type: 'element';
+    element: Script.SharedReference;
+  };
+}
+export namespace BrowsingContext {
+  export type BoxClipRectangle = {
+    type: 'box';
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+  };
+}
+export namespace BrowsingContext {
+  export type CaptureScreenshotResult = {
+    data: string;
+  };
+}
+export namespace BrowsingContext {
+  export type Close = {
+    method: 'browsingContext.close';
+    params: BrowsingContext.CloseParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type CloseParameters = {
+    context: BrowsingContext.BrowsingContext;
+    /**
+     * @defaultValue `false`
+     */
+    promptUnload?: boolean;
+  };
+}
+export namespace BrowsingContext {
+  export type Create = {
+    method: 'browsingContext.create';
+    params: BrowsingContext.CreateParameters;
+  };
+}
+export namespace BrowsingContext {
+  export const enum CreateType {
+    Tab = 'tab',
+    Window = 'window',
+  }
+}
+export namespace BrowsingContext {
+  export type CreateParameters = {
+    type: BrowsingContext.CreateType;
+    referenceContext?: BrowsingContext.BrowsingContext;
+    /**
+     * @defaultValue `false`
+     */
+    background?: boolean;
+    userContext?: Browser.UserContext;
+  };
+}
+export namespace BrowsingContext {
+  export type CreateResult = {
+    context: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace BrowsingContext {
+  export type GetTree = {
+    method: 'browsingContext.getTree';
+    params: BrowsingContext.GetTreeParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type GetTreeParameters = {
+    maxDepth?: JsUint;
+    root?: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace BrowsingContext {
+  export type GetTreeResult = {
+    contexts: BrowsingContext.InfoList;
+  };
+}
+export namespace BrowsingContext {
+  export type HandleUserPrompt = {
+    method: 'browsingContext.handleUserPrompt';
+    params: BrowsingContext.HandleUserPromptParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type HandleUserPromptParameters = {
+    context: BrowsingContext.BrowsingContext;
+    accept?: boolean;
+    userText?: string;
+  };
+}
+export namespace BrowsingContext {
+  export type LocateNodesParameters = {
+    context: BrowsingContext.BrowsingContext;
+    locator: BrowsingContext.Locator;
+    /**
+     * Must be greater than or equal to `1`.
+     */
+    maxNodeCount?: JsUint;
+    serializationOptions?: Script.SerializationOptions;
+    startNodes?: [Script.SharedReference, ...Script.SharedReference[]];
+  };
+}
+export namespace BrowsingContext {
+  export type LocateNodes = {
+    method: 'browsingContext.locateNodes';
+    params: BrowsingContext.LocateNodesParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type LocateNodesResult = {
+    nodes: [...Script.NodeRemoteValue[]];
+  };
+}
+export namespace BrowsingContext {
+  export type Navigate = {
+    method: 'browsingContext.navigate';
+    params: BrowsingContext.NavigateParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type NavigateParameters = {
+    context: BrowsingContext.BrowsingContext;
+    url: string;
+    wait?: BrowsingContext.ReadinessState;
+  };
+}
+export namespace BrowsingContext {
+  export type NavigateResult = {
+    navigation: BrowsingContext.Navigation | null;
+    url: string;
+  };
+}
+export namespace BrowsingContext {
+  export type Print = {
+    method: 'browsingContext.print';
+    params: BrowsingContext.PrintParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type PrintParameters = {
+    context: BrowsingContext.BrowsingContext;
+    /**
+     * @defaultValue `false`
+     */
+    background?: boolean;
+    margin?: BrowsingContext.PrintMarginParameters;
+    /**
+     * @defaultValue `"portrait"`
+     */
+    orientation?: 'portrait' | 'landscape';
+    page?: BrowsingContext.PrintPageParameters;
+    pageRanges?: [...(JsUint | string)[]];
+    /**
+     * Must be between `0.1` and `2`, inclusive.
+     *
+     * @defaultValue `1`
+     */
+    scale?: number;
+    /**
+     * @defaultValue `true`
+     */
+    shrinkToFit?: boolean;
+  };
+}
+export namespace BrowsingContext {
+  export type PrintMarginParameters = {
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `1`
+     */
+    bottom?: number;
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `1`
+     */
+    left?: number;
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `1`
+     */
+    right?: number;
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `1`
+     */
+    top?: number;
+  };
+}
+export namespace BrowsingContext {
+  export type PrintPageParameters = {
+    /**
+     * Must be greater than or equal to `0.0352`.
+     *
+     * @defaultValue `27.94`
+     */
+    height?: number;
+    /**
+     * Must be greater than or equal to `0.0352`.
+     *
+     * @defaultValue `21.59`
+     */
+    width?: number;
+  };
+}
+export namespace BrowsingContext {
+  export type PrintResult = {
+    data: string;
+  };
+}
+export namespace BrowsingContext {
+  export type Reload = {
+    method: 'browsingContext.reload';
+    params: BrowsingContext.ReloadParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type ReloadParameters = {
+    context: BrowsingContext.BrowsingContext;
+    ignoreCache?: boolean;
+    wait?: BrowsingContext.ReadinessState;
+  };
+}
+export namespace BrowsingContext {
+  export type SetViewport = {
+    method: 'browsingContext.setViewport';
+    params: BrowsingContext.SetViewportParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type SetViewportParameters = {
+    context?: BrowsingContext.BrowsingContext;
+    viewport?: BrowsingContext.Viewport | null;
+    /**
+     * Must be greater than `0`.
+     */
+    devicePixelRatio?: number | null;
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace BrowsingContext {
+  export type Viewport = {
+    width: JsUint;
+    height: JsUint;
+  };
+}
+export namespace BrowsingContext {
+  export type TraverseHistory = {
+    method: 'browsingContext.traverseHistory';
+    params: BrowsingContext.TraverseHistoryParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type TraverseHistoryParameters = {
+    context: BrowsingContext.BrowsingContext;
+    delta: JsInt;
+  };
+}
+export namespace BrowsingContext {
+  export type TraverseHistoryResult = Record<string, never>;
+}
+export namespace BrowsingContext {
+  export type ContextCreated = {
+    method: 'browsingContext.contextCreated';
+    params: BrowsingContext.Info;
+  };
+}
+export namespace BrowsingContext {
+  export type ContextDestroyed = {
+    method: 'browsingContext.contextDestroyed';
+    params: BrowsingContext.Info;
+  };
+}
+export namespace BrowsingContext {
+  export type NavigationStarted = {
+    method: 'browsingContext.navigationStarted';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type FragmentNavigated = {
+    method: 'browsingContext.fragmentNavigated';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type HistoryUpdated = {
+    method: 'browsingContext.historyUpdated';
+    params: BrowsingContext.HistoryUpdatedParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type HistoryUpdatedParameters = {
+    context: BrowsingContext.BrowsingContext;
+    timestamp: JsUint;
+    url: string;
+  };
+}
+export namespace BrowsingContext {
+  export type DomContentLoaded = {
+    method: 'browsingContext.domContentLoaded';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type Load = {
+    method: 'browsingContext.load';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type DownloadWillBegin = {
+    method: 'browsingContext.downloadWillBegin';
+    params: BrowsingContext.DownloadWillBeginParams;
+  };
+}
+export namespace BrowsingContext {
+  export type DownloadWillBeginParams = {
+    suggestedFilename: string;
+  } & BrowsingContext.BaseNavigationInfo;
+}
+export namespace BrowsingContext {
+  export type DownloadEnd = {
+    method: 'browsingContext.downloadEnd';
+    params: BrowsingContext.DownloadEndParams;
+  };
+}
+export namespace BrowsingContext {
+  export type DownloadEndParams =
+    | BrowsingContext.DownloadCanceledParams
+    | BrowsingContext.DownloadCompleteParams;
+}
+export namespace BrowsingContext {
+  export type DownloadCanceledParams = {
+    status: 'canceled';
+  } & BrowsingContext.BaseNavigationInfo;
+}
+export namespace BrowsingContext {
+  export type DownloadCompleteParams = {
+    status: 'complete';
+    filepath: string | null;
+  } & BrowsingContext.BaseNavigationInfo;
+}
+export namespace BrowsingContext {
+  export type NavigationAborted = {
+    method: 'browsingContext.navigationAborted';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type NavigationCommitted = {
+    method: 'browsingContext.navigationCommitted';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type NavigationFailed = {
+    method: 'browsingContext.navigationFailed';
+    params: BrowsingContext.NavigationInfo;
+  };
+}
+export namespace BrowsingContext {
+  export type UserPromptClosed = {
+    method: 'browsingContext.userPromptClosed';
+    params: BrowsingContext.UserPromptClosedParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type UserPromptClosedParameters = {
+    context: BrowsingContext.BrowsingContext;
+    accepted: boolean;
+    type: BrowsingContext.UserPromptType;
+    userText?: string;
+  };
+}
+export namespace BrowsingContext {
+  export type UserPromptOpened = {
+    method: 'browsingContext.userPromptOpened';
+    params: BrowsingContext.UserPromptOpenedParameters;
+  };
+}
+export namespace BrowsingContext {
+  export type UserPromptOpenedParameters = {
+    context: BrowsingContext.BrowsingContext;
+    handler: Session.UserPromptHandlerType;
+    message: string;
+    type: BrowsingContext.UserPromptType;
+    defaultValue?: string;
+  };
+}
+export type EmulationCommand =
+  | Emulation.SetForcedColorsModeThemeOverride
+  | Emulation.SetGeolocationOverride
+  | Emulation.SetLocaleOverride
+  | Emulation.SetScreenOrientationOverride
+  | Emulation.SetTimezoneOverride;
+export namespace Emulation {
+  export type SetForcedColorsModeThemeOverride = {
+    method: 'emulation.setForcedColorsModeThemeOverride';
+    params: Emulation.SetForcedColorsModeThemeOverrideParameters;
+  };
+}
+export namespace Emulation {
+  export type SetForcedColorsModeThemeOverrideParameters = {
+    theme: Emulation.ForcedColorsModeTheme | null;
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace Emulation {
+  export const enum ForcedColorsModeTheme {
+    Light = 'light',
+    Dark = 'dark',
+  }
+}
+export namespace Emulation {
+  export type SetGeolocationOverride = {
+    method: 'emulation.setGeolocationOverride';
+    params: Emulation.SetGeolocationOverrideParameters;
+  };
+}
+export namespace Emulation {
+  export type SetGeolocationOverrideParameters = (
+    | {
+        coordinates: Emulation.GeolocationCoordinates | null;
+      }
+    | {
+        error: Emulation.GeolocationPositionError;
+      }
+  ) & {
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace Emulation {
+  export type GeolocationCoordinates = {
+    /**
+     * Must be between `-90` and `90`, inclusive.
+     */
+    latitude: number;
+    /**
+     * Must be between `-180` and `180`, inclusive.
+     */
+    longitude: number;
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `1`
+     */
+    accuracy?: number;
+    /**
+     * @defaultValue `null`
+     */
+    altitude?: number | null;
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `null`
+     */
+    altitudeAccuracy?: number | null;
+    /**
+     * Must be between `0` and `360`.
+     *
+     * @defaultValue `null`
+     */
+    heading?: number | null;
+    /**
+     * Must be greater than or equal to `0`.
+     *
+     * @defaultValue `null`
+     */
+    speed?: number | null;
+  };
+}
+export namespace Emulation {
+  export type GeolocationPositionError = {
+    type: 'positionUnavailable';
+  };
+}
+export namespace Emulation {
+  export type SetLocaleOverride = {
+    method: 'emulation.setLocaleOverride';
+    params: Emulation.SetLocaleOverrideParameters;
+  };
+}
+export namespace Emulation {
+  export type SetLocaleOverrideParameters = {
+    locale: string | null;
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace Emulation {
+  export type SetScreenOrientationOverride = {
+    method: 'emulation.setScreenOrientationOverride';
+    params: Emulation.SetScreenOrientationOverrideParameters;
+  };
+}
+export namespace Emulation {
+  export const enum ScreenOrientationNatural {
+    Portrait = 'portrait',
+    Landscape = 'landscape',
+  }
+}
+export namespace Emulation {
+  export type ScreenOrientationType =
+    | 'portrait-primary'
+    | 'portrait-secondary'
+    | 'landscape-primary'
+    | 'landscape-secondary';
+}
+export namespace Emulation {
+  export type ScreenOrientation = {
+    natural: Emulation.ScreenOrientationNatural;
+    type: Emulation.ScreenOrientationType;
+  };
+}
+export namespace Emulation {
+  export type SetScreenOrientationOverrideParameters = {
+    screenOrientation: Emulation.ScreenOrientation | null;
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace Emulation {
+  export type SetTimezoneOverride = {
+    method: 'emulation.setTimezoneOverride';
+    params: Emulation.SetTimezoneOverrideParameters;
+  };
+}
+export namespace Emulation {
+  export type SetTimezoneOverrideParameters = {
+    timezone: string | null;
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export type NetworkCommand =
+  | Network.AddDataCollector
+  | Network.AddIntercept
+  | Network.ContinueRequest
+  | Network.ContinueResponse
+  | Network.ContinueWithAuth
+  | Network.DisownData
+  | Network.FailRequest
+  | Network.GetData
+  | Network.ProvideResponse
+  | Network.RemoveDataCollector
+  | Network.RemoveIntercept
+  | Network.SetCacheBehavior
+  | Network.SetExtraHeaders;
+export type NetworkEvent =
+  | Network.AuthRequired
+  | Network.BeforeRequestSent
+  | Network.FetchError
+  | Network.ResponseCompleted
+  | Network.ResponseStarted;
+export type NetworkResult = Network.AddInterceptResult;
+export namespace Network {
+  export type AuthChallenge = {
+    scheme: string;
+    realm: string;
+  };
+}
+export namespace Network {
+  export type AuthCredentials = {
+    type: 'password';
+    username: string;
+    password: string;
+  };
+}
+export namespace Network {
+  export type BaseParameters = {
+    context: BrowsingContext.BrowsingContext | null;
+    isBlocked: boolean;
+    navigation: BrowsingContext.Navigation | null;
+    redirectCount: JsUint;
+    request: Network.RequestData;
+    timestamp: JsUint;
+    intercepts?: [Network.Intercept, ...Network.Intercept[]];
+  };
+}
+export namespace Network {
+  export type BytesValue = Network.StringValue | Network.Base64Value;
+}
+export namespace Network {
+  export type StringValue = {
+    type: 'string';
+    value: string;
+  };
+}
+export namespace Network {
+  export type Base64Value = {
+    type: 'base64';
+    value: string;
+  };
+}
+export namespace Network {
+  export type Collector = string;
+}
+export namespace Network {
+  export const enum CollectorType {
+    Blob = 'blob',
+  }
+}
+export namespace Network {
+  export const enum SameSite {
+    Strict = 'strict',
+    Lax = 'lax',
+    None = 'none',
+    Default = 'default',
+  }
+}
+export namespace Network {
+  export type Cookie = {
+    name: string;
+    value: Network.BytesValue;
+    domain: string;
+    path: string;
+    size: JsUint;
+    httpOnly: boolean;
+    secure: boolean;
+    sameSite: Network.SameSite;
+    expiry?: JsUint;
+  } & Extensible;
+}
+export namespace Network {
+  export type CookieHeader = {
+    name: string;
+    value: Network.BytesValue;
+  };
+}
+export namespace Network {
+  export const enum DataType {
+    Response = 'response',
+  }
+}
+export namespace Network {
+  export type FetchTimingInfo = {
+    timeOrigin: number;
+    requestTime: number;
+    redirectStart: number;
+    redirectEnd: number;
+    fetchStart: number;
+    dnsStart: number;
+    dnsEnd: number;
+    connectStart: number;
+    connectEnd: number;
+    tlsStart: number;
+    requestStart: number;
+    responseStart: number;
+    responseEnd: number;
+  };
+}
+export namespace Network {
+  export type Header = {
+    name: string;
+    value: Network.BytesValue;
+  };
+}
+export namespace Network {
+  export type Initiator = {
+    columnNumber?: JsUint;
+    lineNumber?: JsUint;
+    request?: Network.Request;
+    stackTrace?: Script.StackTrace;
+    type?: 'parser' | 'script' | 'preflight' | 'other';
+  };
+}
+export namespace Network {
+  export type Intercept = string;
+}
+export namespace Network {
+  export type Request = string;
+}
+export namespace Network {
+  export type RequestData = {
+    request: Network.Request;
+    url: string;
+    method: string;
+    headers: [...Network.Header[]];
+    cookies: [...Network.Cookie[]];
+    headersSize: JsUint;
+    bodySize: JsUint | null;
+    destination: string;
+    initiatorType: string | null;
+    timings: Network.FetchTimingInfo;
+  };
+}
+export namespace Network {
+  export type ResponseContent = {
+    size: JsUint;
+  };
+}
+export namespace Network {
+  export type ResponseData = {
+    url: string;
+    protocol: string;
+    status: JsUint;
+    statusText: string;
+    fromCache: boolean;
+    headers: [...Network.Header[]];
+    mimeType: string;
+    bytesReceived: JsUint;
+    headersSize: JsUint | null;
+    bodySize: JsUint | null;
+    content: Network.ResponseContent;
+    authChallenges?: [...Network.AuthChallenge[]];
+  };
+}
+export namespace Network {
+  export type SetCookieHeader = {
+    name: string;
+    value: Network.BytesValue;
+    domain?: string;
+    httpOnly?: boolean;
+    expiry?: string;
+    maxAge?: JsInt;
+    path?: string;
+    sameSite?: Network.SameSite;
+    secure?: boolean;
+  };
+}
+export namespace Network {
+  export type UrlPattern = Network.UrlPatternPattern | Network.UrlPatternString;
+}
+export namespace Network {
+  export type UrlPatternPattern = {
+    type: 'pattern';
+    protocol?: string;
+    hostname?: string;
+    port?: string;
+    pathname?: string;
+    search?: string;
+  };
+}
+export namespace Network {
+  export type UrlPatternString = {
+    type: 'string';
+    pattern: string;
+  };
+}
+export namespace Network {
+  export type AddDataCollector = {
+    method: 'network.addDataCollector';
+    params: Network.AddDataCollectorParameters;
+  };
+}
+export namespace Network {
+  export type AddDataCollectorParameters = {
+    dataTypes: [Network.DataType, ...Network.DataType[]];
+    maxEncodedDataSize: JsUint;
+    /**
+     * @defaultValue `"blob"`
+     */
+    collectorType?: Network.CollectorType;
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export namespace Network {
+  export type AddDataCollectorResult = {
+    collector: Network.Collector;
+  };
+}
+export namespace Network {
+  export type AddInterceptParameters = {
+    phases: [Network.InterceptPhase, ...Network.InterceptPhase[]];
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    urlPatterns?: [...Network.UrlPattern[]];
+  };
+}
+export namespace Network {
+  export type AddIntercept = {
+    method: 'network.addIntercept';
+    params: Network.AddInterceptParameters;
+  };
+}
+export namespace Network {
+  export const enum InterceptPhase {
+    BeforeRequestSent = 'beforeRequestSent',
+    ResponseStarted = 'responseStarted',
+    AuthRequired = 'authRequired',
+  }
+}
+export namespace Network {
+  export type AddInterceptResult = {
+    intercept: Network.Intercept;
+  };
+}
+export namespace Network {
+  export type ContinueRequest = {
+    method: 'network.continueRequest';
+    params: Network.ContinueRequestParameters;
+  };
+}
+export namespace Network {
+  export type ContinueRequestParameters = {
+    request: Network.Request;
+    body?: Network.BytesValue;
+    cookies?: [...Network.CookieHeader[]];
+    headers?: [...Network.Header[]];
+    method?: string;
+    url?: string;
+  };
+}
+export namespace Network {
+  export type ContinueResponse = {
+    method: 'network.continueResponse';
+    params: Network.ContinueResponseParameters;
+  };
+}
+export namespace Network {
+  export type ContinueResponseParameters = {
+    request: Network.Request;
+    cookies?: [...Network.SetCookieHeader[]];
+    credentials?: Network.AuthCredentials;
+    headers?: [...Network.Header[]];
+    reasonPhrase?: string;
+    statusCode?: JsUint;
+  };
+}
+export namespace Network {
+  export type ContinueWithAuth = {
+    method: 'network.continueWithAuth';
+    params: Network.ContinueWithAuthParameters;
+  };
+}
+export namespace Network {
+  export type ContinueWithAuthParameters = {
+    request: Network.Request;
+  } & (
+    | Network.ContinueWithAuthCredentials
+    | Network.ContinueWithAuthNoCredentials
+  );
+}
+export namespace Network {
+  export type ContinueWithAuthCredentials = {
+    action: 'provideCredentials';
+    credentials: Network.AuthCredentials;
+  };
+}
+export namespace Network {
+  export type ContinueWithAuthNoCredentials = {
+    action: 'default' | 'cancel';
+  };
+}
+export namespace Network {
+  export type DisownData = {
+    method: 'network.disownData';
+    params: Network.DisownDataParameters;
+  };
+}
+export namespace Network {
+  export type DisownDataParameters = {
+    dataType: Network.DataType;
+    collector: Network.Collector;
+    request: Network.Request;
+  };
+}
+export namespace Network {
+  export type FailRequest = {
+    method: 'network.failRequest';
+    params: Network.FailRequestParameters;
+  };
+}
+export namespace Network {
+  export type FailRequestParameters = {
+    request: Network.Request;
+  };
+}
+export namespace Network {
+  export type GetData = {
+    method: 'network.getData';
+    params: Network.GetDataParameters;
+  };
+}
+export namespace Network {
+  export type GetDataParameters = {
+    dataType: Network.DataType;
+    collector?: Network.Collector;
+    /**
+     * @defaultValue `false`
+     */
+    disown?: boolean;
+    request: Network.Request;
+  };
+}
+export namespace Network {
+  export type GetDataResult = {
+    bytes: Network.BytesValue;
+  };
+}
+export namespace Network {
+  export type ProvideResponse = {
+    method: 'network.provideResponse';
+    params: Network.ProvideResponseParameters;
+  };
+}
+export namespace Network {
+  export type ProvideResponseParameters = {
+    request: Network.Request;
+    body?: Network.BytesValue;
+    cookies?: [...Network.SetCookieHeader[]];
+    headers?: [...Network.Header[]];
+    reasonPhrase?: string;
+    statusCode?: JsUint;
+  };
+}
+export namespace Network {
+  export type RemoveDataCollector = {
+    method: 'network.removeDataCollector';
+    params: Network.RemoveDataCollectorParameters;
+  };
+}
+export namespace Network {
+  export type RemoveDataCollectorParameters = {
+    collector: Network.Collector;
+  };
+}
+export namespace Network {
+  export type RemoveIntercept = {
+    method: 'network.removeIntercept';
+    params: Network.RemoveInterceptParameters;
+  };
+}
+export namespace Network {
+  export type RemoveInterceptParameters = {
+    intercept: Network.Intercept;
+  };
+}
+export namespace Network {
+  export type SetCacheBehavior = {
+    method: 'network.setCacheBehavior';
+    params: Network.SetCacheBehaviorParameters;
+  };
+}
+export namespace Network {
+  export type SetCacheBehaviorParameters = {
+    cacheBehavior: 'default' | 'bypass';
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+  };
+}
+export namespace Network {
+  export type SetExtraHeaders = {
+    method: 'network.setExtraHeaders';
+    params: Network.SetExtraHeadersParameters;
+  };
+}
+export namespace Network {
+  export type SetExtraHeadersParameters = {
+    headers: [Network.Header, ...Network.Header[]];
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+  };
+}
+export type ScriptEvent =
+  | Script.Message
+  | Script.RealmCreated
+  | Script.RealmDestroyed;
+export namespace Network {
+  export type AuthRequiredParameters = Network.BaseParameters & {
+    response: Network.ResponseData;
+  };
+}
+export namespace Network {
+  export type BeforeRequestSentParameters = Network.BaseParameters & {
+    initiator?: Network.Initiator;
+  };
+}
+export namespace Network {
+  export type FetchErrorParameters = Network.BaseParameters & {
+    errorText: string;
+  };
+}
+export namespace Network {
+  export type ResponseCompletedParameters = Network.BaseParameters & {
+    response: Network.ResponseData;
+  };
+}
+export namespace Network {
+  export type ResponseStartedParameters = Network.BaseParameters & {
+    response: Network.ResponseData;
+  };
+}
+export type ScriptCommand =
+  | Script.AddPreloadScript
+  | Script.CallFunction
+  | Script.Disown
+  | Script.Evaluate
+  | Script.GetRealms
+  | Script.RemovePreloadScript;
+export type ScriptResult =
+  | Script.AddPreloadScriptResult
+  | Script.EvaluateResult
+  | Script.GetRealmsResult;
+export namespace Network {
+  export type AuthRequired = {
+    method: 'network.authRequired';
+    params: Network.AuthRequiredParameters;
+  };
+}
+export namespace Network {
+  export type BeforeRequestSent = {
+    method: 'network.beforeRequestSent';
+    params: Network.BeforeRequestSentParameters;
+  };
+}
+export namespace Network {
+  export type FetchError = {
+    method: 'network.fetchError';
+    params: Network.FetchErrorParameters;
+  };
+}
+export namespace Network {
+  export type ResponseCompleted = {
+    method: 'network.responseCompleted';
+    params: Network.ResponseCompletedParameters;
+  };
+}
+export namespace Network {
+  export type ResponseStarted = {
+    method: 'network.responseStarted';
+    params: Network.ResponseStartedParameters;
+  };
+}
+export namespace Script {
+  export type Channel = string;
+}
+export namespace Script {
+  export type EvaluateResultSuccess = {
+    type: 'success';
+    result: Script.RemoteValue;
+    realm: Script.Realm;
+  };
+}
+export namespace Script {
+  export type ExceptionDetails = {
+    columnNumber: JsUint;
+    exception: Script.RemoteValue;
+    lineNumber: JsUint;
+    stackTrace: Script.StackTrace;
+    text: string;
+  };
+}
+export namespace Script {
+  export type ChannelValue = {
+    type: 'channel';
+    value: Script.ChannelProperties;
+  };
+}
+export namespace Script {
+  export type ChannelProperties = {
+    channel: Script.Channel;
+    serializationOptions?: Script.SerializationOptions;
+    ownership?: Script.ResultOwnership;
+  };
+}
+export namespace Script {
+  export type EvaluateResult =
+    | Script.EvaluateResultSuccess
+    | Script.EvaluateResultException;
+}
+export namespace Script {
+  export type EvaluateResultException = {
+    type: 'exception';
+    exceptionDetails: Script.ExceptionDetails;
+    realm: Script.Realm;
+  };
+}
+export namespace Script {
+  export type Handle = string;
+}
+export namespace Script {
+  export type InternalId = string;
+}
+export namespace Script {
+  export type ListLocalValue = [...Script.LocalValue[]];
+}
+export namespace Script {
+  export type LocalValue =
+    | Script.RemoteReference
+    | Script.PrimitiveProtocolValue
+    | Script.ChannelValue
+    | Script.ArrayLocalValue
+    | Script.DateLocalValue
+    | Script.MapLocalValue
+    | Script.ObjectLocalValue
+    | Script.RegExpLocalValue
+    | Script.SetLocalValue;
+}
+export namespace Script {
+  export type ArrayLocalValue = {
+    type: 'array';
+    value: Script.ListLocalValue;
+  };
+}
+export namespace Script {
+  export type DateLocalValue = {
+    type: 'date';
+    value: string;
+  };
+}
+export namespace Script {
+  export type MappingLocalValue = [
+    ...[Script.LocalValue | string, Script.LocalValue][],
+  ];
+}
+export namespace Script {
+  export type MapLocalValue = {
+    type: 'map';
+    value: Script.MappingLocalValue;
+  };
+}
+export namespace Script {
+  export type ObjectLocalValue = {
+    type: 'object';
+    value: Script.MappingLocalValue;
+  };
+}
+export namespace Script {
+  export type RegExpValue = {
+    pattern: string;
+    flags?: string;
+  };
+}
+export namespace Script {
+  export type RegExpLocalValue = {
+    type: 'regexp';
+    value: Script.RegExpValue;
+  };
+}
+export namespace Script {
+  export type SetLocalValue = {
+    type: 'set';
+    value: Script.ListLocalValue;
+  };
+}
+export namespace Script {
+  export type PreloadScript = string;
+}
+export namespace Script {
+  export type Realm = string;
+}
+export namespace Script {
+  export type PrimitiveProtocolValue =
+    | Script.UndefinedValue
+    | Script.NullValue
+    | Script.StringValue
+    | Script.NumberValue
+    | Script.BooleanValue
+    | Script.BigIntValue;
+}
+export namespace Script {
+  export type UndefinedValue = {
+    type: 'undefined';
+  };
+}
+export namespace Script {
+  export type NullValue = {
+    type: 'null';
+  };
+}
+export namespace Script {
+  export type StringValue = {
+    type: 'string';
+    value: string;
+  };
+}
+export namespace Script {
+  export type SpecialNumber = 'NaN' | '-0' | 'Infinity' | '-Infinity';
+}
+export namespace Script {
+  export type NumberValue = {
+    type: 'number';
+    value: number | Script.SpecialNumber;
+  };
+}
+export namespace Script {
+  export type BooleanValue = {
+    type: 'boolean';
+    value: boolean;
+  };
+}
+export namespace Script {
+  export type BigIntValue = {
+    type: 'bigint';
+    value: string;
+  };
+}
+export namespace Script {
+  export type RealmInfo =
+    | Script.WindowRealmInfo
+    | Script.DedicatedWorkerRealmInfo
+    | Script.SharedWorkerRealmInfo
+    | Script.ServiceWorkerRealmInfo
+    | Script.WorkerRealmInfo
+    | Script.PaintWorkletRealmInfo
+    | Script.AudioWorkletRealmInfo
+    | Script.WorkletRealmInfo;
+}
+export namespace Script {
+  export type BaseRealmInfo = {
+    realm: Script.Realm;
+    origin: string;
+  };
+}
+export namespace Script {
+  export type WindowRealmInfo = Script.BaseRealmInfo & {
+    type: 'window';
+    context: BrowsingContext.BrowsingContext;
+    sandbox?: string;
+  };
+}
+export namespace Script {
+  export type DedicatedWorkerRealmInfo = Script.BaseRealmInfo & {
+    type: 'dedicated-worker';
+    owners: [Script.Realm];
+  };
+}
+export namespace Script {
+  export type SharedWorkerRealmInfo = Script.BaseRealmInfo & {
+    type: 'shared-worker';
+  };
+}
+export namespace Script {
+  export type ServiceWorkerRealmInfo = Script.BaseRealmInfo & {
+    type: 'service-worker';
+  };
+}
+export namespace Script {
+  export type WorkerRealmInfo = Script.BaseRealmInfo & {
+    type: 'worker';
+  };
+}
+export namespace Script {
+  export type PaintWorkletRealmInfo = Script.BaseRealmInfo & {
+    type: 'paint-worklet';
+  };
+}
+export namespace Script {
+  export type AudioWorkletRealmInfo = Script.BaseRealmInfo & {
+    type: 'audio-worklet';
+  };
+}
+export namespace Script {
+  export type WorkletRealmInfo = Script.BaseRealmInfo & {
+    type: 'worklet';
+  };
+}
+export namespace Script {
+  export type RealmType =
+    | 'window'
+    | 'dedicated-worker'
+    | 'shared-worker'
+    | 'service-worker'
+    | 'worker'
+    | 'paint-worklet'
+    | 'audio-worklet'
+    | 'worklet';
+}
+export namespace Script {
+  export type ListRemoteValue = [...Script.RemoteValue[]];
+}
+export namespace Script {
+  export type MappingRemoteValue = [
+    ...[Script.RemoteValue | string, Script.RemoteValue][],
+  ];
+}
+export namespace Script {
+  export type RemoteValue =
+    | Script.PrimitiveProtocolValue
+    | Script.SymbolRemoteValue
+    | Script.ArrayRemoteValue
+    | Script.ObjectRemoteValue
+    | Script.FunctionRemoteValue
+    | Script.RegExpRemoteValue
+    | Script.DateRemoteValue
+    | Script.MapRemoteValue
+    | Script.SetRemoteValue
+    | Script.WeakMapRemoteValue
+    | Script.WeakSetRemoteValue
+    | Script.GeneratorRemoteValue
+    | Script.ErrorRemoteValue
+    | Script.ProxyRemoteValue
+    | Script.PromiseRemoteValue
+    | Script.TypedArrayRemoteValue
+    | Script.ArrayBufferRemoteValue
+    | Script.NodeListRemoteValue
+    | Script.HtmlCollectionRemoteValue
+    | Script.NodeRemoteValue
+    | Script.WindowProxyRemoteValue;
+}
+export namespace Script {
+  export type RemoteReference =
+    | Script.SharedReference
+    | Script.RemoteObjectReference;
+}
+export namespace Script {
+  export type SharedReference = {
+    sharedId: Script.SharedId;
+    handle?: Script.Handle;
+  } & Extensible;
+}
+export namespace Script {
+  export type RemoteObjectReference = {
+    handle: Script.Handle;
+    sharedId?: Script.SharedId;
+  } & Extensible;
+}
+export namespace Script {
+  export type SymbolRemoteValue = {
+    type: 'symbol';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type ArrayRemoteValue = {
+    type: 'array';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.ListRemoteValue;
+  };
+}
+export namespace Script {
+  export type ObjectRemoteValue = {
+    type: 'object';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.MappingRemoteValue;
+  };
+}
+export namespace Script {
+  export type FunctionRemoteValue = {
+    type: 'function';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type RegExpRemoteValue = Script.RegExpLocalValue & {
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type DateRemoteValue = Script.DateLocalValue & {
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type MapRemoteValue = {
+    type: 'map';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.MappingRemoteValue;
+  };
+}
+export namespace Script {
+  export type SetRemoteValue = {
+    type: 'set';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.ListRemoteValue;
+  };
+}
+export namespace Script {
+  export type WeakMapRemoteValue = {
+    type: 'weakmap';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type WeakSetRemoteValue = {
+    type: 'weakset';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type GeneratorRemoteValue = {
+    type: 'generator';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type ErrorRemoteValue = {
+    type: 'error';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type ProxyRemoteValue = {
+    type: 'proxy';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type PromiseRemoteValue = {
+    type: 'promise';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type TypedArrayRemoteValue = {
+    type: 'typedarray';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type ArrayBufferRemoteValue = {
+    type: 'arraybuffer';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type NodeListRemoteValue = {
+    type: 'nodelist';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.ListRemoteValue;
+  };
+}
+export namespace Script {
+  export type HtmlCollectionRemoteValue = {
+    type: 'htmlcollection';
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.ListRemoteValue;
+  };
+}
+export namespace Script {
+  export type NodeRemoteValue = {
+    type: 'node';
+    sharedId?: Script.SharedId;
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+    value?: Script.NodeProperties;
+  };
+}
+export namespace Script {
+  export type NodeProperties = {
+    nodeType: JsUint;
+    childNodeCount: JsUint;
+    attributes?: {
+      [key: string]: string;
+    };
+    children?: [...Script.NodeRemoteValue[]];
+    localName?: string;
+    mode?: 'open' | 'closed';
+    namespaceURI?: string;
+    nodeValue?: string;
+    shadowRoot?: Script.NodeRemoteValue | null;
+  };
+}
+export namespace Script {
+  export type WindowProxyRemoteValue = {
+    type: 'window';
+    value: Script.WindowProxyProperties;
+    handle?: Script.Handle;
+    internalId?: Script.InternalId;
+  };
+}
+export namespace Script {
+  export type WindowProxyProperties = {
+    context: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace Script {
+  export const enum ResultOwnership {
+    Root = 'root',
+    None = 'none',
+  }
+}
+export namespace Script {
+  export type SerializationOptions = {
+    /**
+     * @defaultValue `0`
+     */
+    maxDomDepth?: JsUint | null;
+    /**
+     * @defaultValue `null`
+     */
+    maxObjectDepth?: JsUint | null;
+    /**
+     * @defaultValue `"none"`
+     */
+    includeShadowTree?: 'none' | 'open' | 'all';
+  };
+}
+export namespace Script {
+  export type SharedId = string;
+}
+export namespace Script {
+  export type StackFrame = {
+    columnNumber: JsUint;
+    functionName: string;
+    lineNumber: JsUint;
+    url: string;
+  };
+}
+export namespace Script {
+  export type StackTrace = {
+    callFrames: [...Script.StackFrame[]];
+  };
+}
+export namespace Script {
+  export type Source = {
+    realm: Script.Realm;
+    context?: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace Script {
+  export type RealmTarget = {
+    realm: Script.Realm;
+  };
+}
+export namespace Script {
+  export type ContextTarget = {
+    context: BrowsingContext.BrowsingContext;
+    sandbox?: string;
+  };
+}
+export namespace Script {
+  export type Target = Script.ContextTarget | Script.RealmTarget;
+}
+export namespace Script {
+  export type AddPreloadScript = {
+    method: 'script.addPreloadScript';
+    params: Script.AddPreloadScriptParameters;
+  };
+}
+export namespace Script {
+  export type AddPreloadScriptParameters = {
+    functionDeclaration: string;
+    arguments?: [...Script.ChannelValue[]];
+    contexts?: [
+      BrowsingContext.BrowsingContext,
+      ...BrowsingContext.BrowsingContext[],
+    ];
+    userContexts?: [Browser.UserContext, ...Browser.UserContext[]];
+    sandbox?: string;
+  };
+}
+export namespace Script {
+  export type AddPreloadScriptResult = {
+    script: Script.PreloadScript;
+  };
+}
+export namespace Script {
+  export type Disown = {
+    method: 'script.disown';
+    params: Script.DisownParameters;
+  };
+}
+export namespace Script {
+  export type DisownParameters = {
+    handles: [...Script.Handle[]];
+    target: Script.Target;
+  };
+}
+export namespace Script {
+  export type CallFunctionParameters = {
+    functionDeclaration: string;
+    awaitPromise: boolean;
+    target: Script.Target;
+    arguments?: [...Script.LocalValue[]];
+    resultOwnership?: Script.ResultOwnership;
+    serializationOptions?: Script.SerializationOptions;
+    this?: Script.LocalValue;
+    /**
+     * @defaultValue `false`
+     */
+    userActivation?: boolean;
+  };
+}
+export namespace Script {
+  export type CallFunction = {
+    method: 'script.callFunction';
+    params: Script.CallFunctionParameters;
+  };
+}
+export namespace Script {
+  export type Evaluate = {
+    method: 'script.evaluate';
+    params: Script.EvaluateParameters;
+  };
+}
+export namespace Script {
+  export type EvaluateParameters = {
+    expression: string;
+    target: Script.Target;
+    awaitPromise: boolean;
+    resultOwnership?: Script.ResultOwnership;
+    serializationOptions?: Script.SerializationOptions;
+    /**
+     * @defaultValue `false`
+     */
+    userActivation?: boolean;
+  };
+}
+export namespace Script {
+  export type GetRealms = {
+    method: 'script.getRealms';
+    params: Script.GetRealmsParameters;
+  };
+}
+export namespace Script {
+  export type GetRealmsParameters = {
+    context?: BrowsingContext.BrowsingContext;
+    type?: Script.RealmType;
+  };
+}
+export namespace Script {
+  export type GetRealmsResult = {
+    realms: [...Script.RealmInfo[]];
+  };
+}
+export namespace Script {
+  export type RemovePreloadScript = {
+    method: 'script.removePreloadScript';
+    params: Script.RemovePreloadScriptParameters;
+  };
+}
+export namespace Script {
+  export type RemovePreloadScriptParameters = {
+    script: Script.PreloadScript;
+  };
+}
+export namespace Script {
+  export type MessageParameters = {
+    channel: Script.Channel;
+    data: Script.RemoteValue;
+    source: Script.Source;
+  };
+}
+export namespace Script {
+  export type RealmCreated = {
+    method: 'script.realmCreated';
+    params: Script.RealmInfo;
+  };
+}
+export namespace Script {
+  export type Message = {
+    method: 'script.message';
+    params: Script.MessageParameters;
+  };
+}
+export namespace Script {
+  export type RealmDestroyed = {
+    method: 'script.realmDestroyed';
+    params: Script.RealmDestroyedParameters;
+  };
+}
+export namespace Script {
+  export type RealmDestroyedParameters = {
+    realm: Script.Realm;
+  };
+}
+export type StorageCommand =
+  | Storage.DeleteCookies
+  | Storage.GetCookies
+  | Storage.SetCookie;
+export type StorageResult =
+  | Storage.DeleteCookiesResult
+  | Storage.GetCookiesResult
+  | Storage.SetCookieResult;
+export namespace Storage {
+  export type PartitionKey = {
+    userContext?: string;
+    sourceOrigin?: string;
+  } & Extensible;
+}
+export namespace Storage {
+  export type GetCookies = {
+    method: 'storage.getCookies';
+    params: Storage.GetCookiesParameters;
+  };
+}
+export namespace Storage {
+  export type CookieFilter = {
+    name?: string;
+    value?: Network.BytesValue;
+    domain?: string;
+    path?: string;
+    size?: JsUint;
+    httpOnly?: boolean;
+    secure?: boolean;
+    sameSite?: Network.SameSite;
+    expiry?: JsUint;
+  } & Extensible;
+}
+export namespace Storage {
+  export type BrowsingContextPartitionDescriptor = {
+    type: 'context';
+    context: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace Storage {
+  export type StorageKeyPartitionDescriptor = {
+    type: 'storageKey';
+    userContext?: string;
+    sourceOrigin?: string;
+  } & Extensible;
+}
+export namespace Storage {
+  export type PartitionDescriptor =
+    | Storage.BrowsingContextPartitionDescriptor
+    | Storage.StorageKeyPartitionDescriptor;
+}
+export namespace Storage {
+  export type GetCookiesParameters = {
+    filter?: Storage.CookieFilter;
+    partition?: Storage.PartitionDescriptor;
+  };
+}
+export namespace Storage {
+  export type GetCookiesResult = {
+    cookies: [...Network.Cookie[]];
+    partitionKey: Storage.PartitionKey;
+  };
+}
+export namespace Storage {
+  export type SetCookie = {
+    method: 'storage.setCookie';
+    params: Storage.SetCookieParameters;
+  };
+}
+export namespace Storage {
+  export type PartialCookie = {
+    name: string;
+    value: Network.BytesValue;
+    domain: string;
+    path?: string;
+    httpOnly?: boolean;
+    secure?: boolean;
+    sameSite?: Network.SameSite;
+    expiry?: JsUint;
+  } & Extensible;
+}
+export namespace Storage {
+  export type SetCookieParameters = {
+    cookie: Storage.PartialCookie;
+    partition?: Storage.PartitionDescriptor;
+  };
+}
+export namespace Storage {
+  export type SetCookieResult = {
+    partitionKey: Storage.PartitionKey;
+  };
+}
+export namespace Storage {
+  export type DeleteCookies = {
+    method: 'storage.deleteCookies';
+    params: Storage.DeleteCookiesParameters;
+  };
+}
+export namespace Storage {
+  export type DeleteCookiesParameters = {
+    filter?: Storage.CookieFilter;
+    partition?: Storage.PartitionDescriptor;
+  };
+}
+export namespace Storage {
+  export type DeleteCookiesResult = {
+    partitionKey: Storage.PartitionKey;
+  };
+}
+export type LogEvent = Log.EntryAdded;
+export namespace Log {
+  export const enum Level {
+    Debug = 'debug',
+    Info = 'info',
+    Warn = 'warn',
+    Error = 'error',
+  }
+}
+export namespace Log {
+  export type Entry =
+    | Log.GenericLogEntry
+    | Log.ConsoleLogEntry
+    | Log.JavascriptLogEntry;
+}
+export namespace Log {
+  export type BaseLogEntry = {
+    level: Log.Level;
+    source: Script.Source;
+    text: string | null;
+    timestamp: JsUint;
+    stackTrace?: Script.StackTrace;
+  };
+}
+export namespace Log {
+  export type GenericLogEntry = Log.BaseLogEntry & {
+    type: string;
+  };
+}
+export namespace Log {
+  export type ConsoleLogEntry = Log.BaseLogEntry & {
+    type: 'console';
+    method: string;
+    args: [...Script.RemoteValue[]];
+  };
+}
+export namespace Log {
+  export type JavascriptLogEntry = Log.BaseLogEntry & {
+    type: 'javascript';
+  };
+}
+export namespace Log {
+  export type EntryAdded = {
+    method: 'log.entryAdded';
+    params: Log.Entry;
+  };
+}
+export type InputCommand =
+  | Input.PerformActions
+  | Input.ReleaseActions
+  | Input.SetFiles;
+export type InputEvent = Input.FileDialogOpened;
+export namespace Input {
+  export type ElementOrigin = {
+    type: 'element';
+    element: Script.SharedReference;
+  };
+}
+export namespace Input {
+  export type PerformActionsParameters = {
+    context: BrowsingContext.BrowsingContext;
+    actions: [...Input.SourceActions[]];
+  };
+}
+export namespace Input {
+  export type NoneSourceActions = {
+    type: 'none';
+    id: string;
+    actions: [...Input.NoneSourceAction[]];
+  };
+}
+export namespace Input {
+  export type KeySourceActions = {
+    type: 'key';
+    id: string;
+    actions: [...Input.KeySourceAction[]];
+  };
+}
+export namespace Input {
+  export type PointerSourceActions = {
+    type: 'pointer';
+    id: string;
+    parameters?: Input.PointerParameters;
+    actions: [...Input.PointerSourceAction[]];
+  };
+}
+export namespace Input {
+  export type PerformActions = {
+    method: 'input.performActions';
+    params: Input.PerformActionsParameters;
+  };
+}
+export namespace Input {
+  export type SourceActions =
+    | Input.NoneSourceActions
+    | Input.KeySourceActions
+    | Input.PointerSourceActions
+    | Input.WheelSourceActions;
+}
+export namespace Input {
+  export type NoneSourceAction = Input.PauseAction;
+}
+export namespace Input {
+  export type KeySourceAction =
+    | Input.PauseAction
+    | Input.KeyDownAction
+    | Input.KeyUpAction;
+}
+export namespace Input {
+  export const enum PointerType {
+    Mouse = 'mouse',
+    Pen = 'pen',
+    Touch = 'touch',
+  }
+}
+export namespace Input {
+  export type PointerParameters = {
+    /**
+     * @defaultValue `"mouse"`
+     */
+    pointerType?: Input.PointerType;
+  };
+}
+export namespace Input {
+  export type WheelSourceActions = {
+    type: 'wheel';
+    id: string;
+    actions: [...Input.WheelSourceAction[]];
+  };
+}
+export namespace Input {
+  export type PointerSourceAction =
+    | Input.PauseAction
+    | Input.PointerDownAction
+    | Input.PointerUpAction
+    | Input.PointerMoveAction;
+}
+export namespace Input {
+  export type WheelSourceAction = Input.PauseAction | Input.WheelScrollAction;
+}
+export namespace Input {
+  export type PauseAction = {
+    type: 'pause';
+    duration?: JsUint;
+  };
+}
+export namespace Input {
+  export type KeyDownAction = {
+    type: 'keyDown';
+    value: string;
+  };
+}
+export namespace Input {
+  export type KeyUpAction = {
+    type: 'keyUp';
+    value: string;
+  };
+}
+export namespace Input {
+  export type PointerUpAction = {
+    type: 'pointerUp';
+    button: JsUint;
+  };
+}
+export namespace Input {
+  export type PointerDownAction = {
+    type: 'pointerDown';
+    button: JsUint;
+  } & Input.PointerCommonProperties;
+}
+export namespace Input {
+  export type PointerMoveAction = {
+    type: 'pointerMove';
+    x: number;
+    y: number;
+    duration?: JsUint;
+    origin?: Input.Origin;
+  } & Input.PointerCommonProperties;
+}
+export namespace Input {
+  export type WheelScrollAction = {
+    type: 'scroll';
+    x: JsInt;
+    y: JsInt;
+    deltaX: JsInt;
+    deltaY: JsInt;
+    duration?: JsUint;
+    /**
+     * @defaultValue `"viewport"`
+     */
+    origin?: Input.Origin;
+  };
+}
+export namespace Input {
+  export type PointerCommonProperties = {
+    /**
+     * @defaultValue `1`
+     */
+    width?: JsUint;
+    /**
+     * @defaultValue `1`
+     */
+    height?: JsUint;
+    /**
+     * @defaultValue `0`
+     */
+    pressure?: number;
+    /**
+     * @defaultValue `0`
+     */
+    tangentialPressure?: number;
+    /**
+     * Must be between `0` and `359`, inclusive.
+     *
+     * @defaultValue `0`
+     */
+    twist?: number;
+    /**
+     * Must be between `0` and `1.5707963267948966`, inclusive.
+     *
+     * @defaultValue `0`
+     */
+    altitudeAngle?: number;
+    /**
+     * Must be between `0` and `6.283185307179586`, inclusive.
+     *
+     * @defaultValue `0`
+     */
+    azimuthAngle?: number;
+  };
+}
+export namespace Input {
+  export type Origin = 'viewport' | 'pointer' | Input.ElementOrigin;
+}
+export namespace Input {
+  export type ReleaseActions = {
+    method: 'input.releaseActions';
+    params: Input.ReleaseActionsParameters;
+  };
+}
+export namespace Input {
+  export type ReleaseActionsParameters = {
+    context: BrowsingContext.BrowsingContext;
+  };
+}
+export namespace Input {
+  export type SetFiles = {
+    method: 'input.setFiles';
+    params: Input.SetFilesParameters;
+  };
+}
+export namespace Input {
+  export type SetFilesParameters = {
+    context: BrowsingContext.BrowsingContext;
+    element: Script.SharedReference;
+    files: [...string[]];
+  };
+}
+export namespace Input {
+  export type FileDialogOpened = {
+    method: 'input.fileDialogOpened';
+    params: Input.FileDialogInfo;
+  };
+}
+export namespace Input {
+  export type FileDialogInfo = {
+    context: BrowsingContext.BrowsingContext;
+    element?: Script.SharedReference;
+    multiple: boolean;
+  };
+}
+export type WebExtensionCommand = WebExtension.Install | WebExtension.Uninstall;
+export type WebExtensionResult = WebExtension.InstallResult;
+export namespace WebExtension {
+  export type Extension = string;
+}
+export namespace WebExtension {
+  export type InstallParameters = {
+    extensionData: WebExtension.ExtensionData;
+  };
+}
+export namespace WebExtension {
+  export type Install = {
+    method: 'webExtension.install';
+    params: WebExtension.InstallParameters;
+  };
+}
+export namespace WebExtension {
+  export type ExtensionData =
+    | WebExtension.ExtensionArchivePath
+    | WebExtension.ExtensionBase64Encoded
+    | WebExtension.ExtensionPath;
+}
+export namespace WebExtension {
+  export type ExtensionPath = {
+    type: 'path';
+    path: string;
+  };
+}
+export namespace WebExtension {
+  export type ExtensionArchivePath = {
+    type: 'archivePath';
+    path: string;
+  };
+}
+export namespace WebExtension {
+  export type ExtensionBase64Encoded = {
+    type: 'base64';
+    value: string;
+  };
+}
+export namespace WebExtension {
+  export type InstallResult = {
+    extension: WebExtension.Extension;
+  };
+}
+export namespace WebExtension {
+  export type Uninstall = {
+    method: 'webExtension.uninstall';
+    params: WebExtension.UninstallParameters;
+  };
+}
+export namespace WebExtension {
+  export type UninstallParameters = {
+    extension: WebExtension.Extension;
+  };
+}
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiProtocolPermissions.ts b/packages/playwright-core/src/server/bidi/third_party/bidiProtocolPermissions.ts
new file mode 100644
index 0000000000000..906dbf0adea96
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiProtocolPermissions.ts
@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright 2024 Google Inc.
+ * Modifications copyright (c) Microsoft Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Copied from upstream: https://github.com/GoogleChromeLabs/chromium-bidi/blob/main/src/protocol/generated/webdriver-bidi-permissions.ts
+
+/**
+ * THIS FILE IS AUTOGENERATED by cddlconv 0.1.6.
+ * Run `node tools/generate-bidi-types.mjs` to regenerate.
+ * @see https://github.com/w3c/webdriver-bidi/blob/master/index.bs
+ */
+
+export type PermissionsCommand = Permissions.SetPermission;
+export namespace Permissions {
+  export type PermissionDescriptor = {
+    name: string;
+  };
+}
+export namespace Permissions {
+  export const enum PermissionState {
+    Granted = 'granted',
+    Denied = 'denied',
+    Prompt = 'prompt',
+  }
+}
+export namespace Permissions {
+  export type SetPermission = {
+    method: 'permissions.setPermission';
+    params: Permissions.SetPermissionParameters;
+  };
+}
+export namespace Permissions {
+  export type SetPermissionParameters = {
+    descriptor: Permissions.PermissionDescriptor;
+    state: Permissions.PermissionState;
+    origin: string;
+    userContext?: string;
+  };
+}
diff --git a/packages/playwright-core/src/server/bidi/third_party/bidiSerializer.ts b/packages/playwright-core/src/server/bidi/third_party/bidiSerializer.ts
new file mode 100644
index 0000000000000..c325e2d99882a
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/bidiSerializer.ts
@@ -0,0 +1,150 @@
+/**
+ * @license
+ * Copyright 2024 Google Inc.
+ * Modifications copyright (c) Microsoft Corporation.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Copied from upstream: https://github.com/puppeteer/puppeteer/blob/main/packages/puppeteer-core/src/bidi/Serializer.ts
+
+import type * as Bidi from './bidiProtocol';
+
+/* eslint-disable curly, indent */
+
+/**
+ * @internal
+ */
+class UnserializableError extends Error {}
+
+/**
+ * @internal
+ */
+export class BidiSerializer {
+  static serialize(arg: unknown): Bidi.Script.LocalValue {
+    switch (typeof arg) {
+      case 'symbol':
+      case 'function':
+        throw new UnserializableError(`Unable to serializable ${typeof arg}`);
+      case 'object':
+        return BidiSerializer._serializeObject(arg);
+
+      case 'undefined':
+        return {
+          type: 'undefined',
+        };
+      case 'number':
+        return BidiSerializer._serializeNumber(arg);
+      case 'bigint':
+        return {
+          type: 'bigint',
+          value: arg.toString(),
+        };
+      case 'string':
+        return {
+          type: 'string',
+          value: arg,
+        };
+      case 'boolean':
+        return {
+          type: 'boolean',
+          value: arg,
+        };
+    }
+  }
+
+  static _serializeNumber(arg: number): Bidi.Script.LocalValue {
+    let value: Bidi.Script.SpecialNumber | number;
+    if (Object.is(arg, -0)) {
+      value = '-0';
+    } else if (Object.is(arg, Infinity)) {
+      value = 'Infinity';
+    } else if (Object.is(arg, -Infinity)) {
+      value = '-Infinity';
+    } else if (Object.is(arg, NaN)) {
+      value = 'NaN';
+    } else {
+      value = arg;
+    }
+    return {
+      type: 'number',
+      value,
+    };
+  }
+
+  static _serializeObject(arg: object | null): Bidi.Script.LocalValue {
+    if (arg === null) {
+      return {
+        type: 'null',
+      };
+    } else if (Array.isArray(arg)) {
+      const parsedArray = arg.map(subArg => {
+        return BidiSerializer.serialize(subArg);
+      });
+
+      return {
+        type: 'array',
+        value: parsedArray,
+      };
+    } else if (isPlainObject(arg)) {
+      try {
+        JSON.stringify(arg);
+      } catch (error) {
+        if (
+          error instanceof TypeError &&
+          error.message.startsWith('Converting circular structure to JSON')
+        ) {
+          error.message += ' Recursive objects are not allowed.';
+        }
+        throw error;
+      }
+
+      const parsedObject: Bidi.Script.MappingLocalValue = [];
+      for (const key in arg) {
+        parsedObject.push([BidiSerializer.serialize(key), BidiSerializer.serialize(arg[key])]);
+      }
+
+      return {
+        type: 'object',
+        value: parsedObject,
+      };
+    } else if (isRegExp(arg)) {
+      return {
+        type: 'regexp',
+        value: {
+          pattern: arg.source,
+          flags: arg.flags,
+        },
+      };
+    } else if (isDate(arg)) {
+      return {
+        type: 'date',
+        value: arg.toISOString(),
+      };
+    }
+
+    throw new UnserializableError(
+      'Custom object serialization not possible. Use plain objects instead.'
+    );
+  }
+}
+
+/**
+ * @internal
+ */
+export const isPlainObject = (obj: unknown): obj is Record<any, unknown> => {
+  return typeof obj === 'object' && obj?.constructor === Object;
+};
+
+/**
+ * @internal
+ */
+export const isRegExp = (obj: unknown): obj is RegExp => {
+  return typeof obj === 'object' && obj?.constructor === RegExp;
+};
+
+/**
+ * @internal
+ */
+export const isDate = (obj: unknown): obj is Date => {
+  return typeof obj === 'object' && obj?.constructor === Date;
+};
diff --git a/packages/playwright-core/src/server/bidi/third_party/firefoxPrefs.ts b/packages/playwright-core/src/server/bidi/third_party/firefoxPrefs.ts
new file mode 100644
index 0000000000000..af6617098b0ba
--- /dev/null
+++ b/packages/playwright-core/src/server/bidi/third_party/firefoxPrefs.ts
@@ -0,0 +1,309 @@
+/**
+ * @license
+ * Copyright 2023 Google Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Copied from upstream: https://github.com/puppeteer/puppeteer/blob/main/packages/browsers/src/browser-data/firefox.ts
+
+import fs from 'fs';
+import path from 'path';
+
+/* eslint-disable curly, indent */
+
+interface ProfileOptions {
+  preferences: Record<string, unknown>;
+  path: string;
+}
+
+export async function createProfile(options: ProfileOptions): Promise<void> {
+  if (!fs.existsSync(options.path)) {
+    await fs.promises.mkdir(options.path, {
+      recursive: true,
+    });
+  }
+  await writePreferences({
+    preferences: {
+      ...defaultProfilePreferences(options.preferences),
+      ...options.preferences,
+    },
+    path: options.path,
+  });
+}
+
+function defaultProfilePreferences(
+  extraPrefs: Record<string, unknown>
+): Record<string, unknown> {
+  const server = 'dummy.test';
+
+  const defaultPrefs = {
+    // Make sure Shield doesn't hit the network.
+    'app.normandy.api_url': '',
+    // Disable Firefox old build background check
+    'app.update.checkInstallTime': false,
+    // Disable automatically upgrading Firefox
+    'app.update.disabledForTesting': true,
+
+    // Increase the APZ content response timeout to 1 minute
+    'apz.content_response_timeout': 60000,
+
+    // Prevent various error message on the console
+    // jest-puppeteer asserts that no error message is emitted by the console
+    'browser.contentblocking.features.standard':
+      '-tp,tpPrivate,cookieBehavior0,-cm,-fp',
+
+    // Enable the dump function: which sends messages to the system
+    // console
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1543115
+    'browser.dom.window.dump.enabled': true,
+
+    // Make sure newtab weather doesn't hit the network to retrieve weather data.
+    'browser.newtabpage.activity-stream.discoverystream.region-weather-config': '',
+
+    // Make sure newtab wallpapers don't hit the network to retrieve wallpaper data.
+    'browser.newtabpage.activity-stream.newtabWallpapers.enabled': false,
+    'browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled': false,
+
+    // Make sure Topsites doesn't hit the network to retrieve sponsored tiles.
+    'browser.newtabpage.activity-stream.showSponsoredTopSites': false,
+
+    // Disable topstories
+    'browser.newtabpage.activity-stream.feeds.system.topstories': false,
+
+    // Always display a blank page
+    'browser.newtabpage.enabled': false,
+
+    // Background thumbnails in particular cause grief: and disabling
+    // thumbnails in general cannot hurt
+    'browser.pagethumbnails.capturing_disabled': true,
+
+    // Disable safebrowsing components.
+    'browser.safebrowsing.blockedURIs.enabled': false,
+    'browser.safebrowsing.downloads.enabled': false,
+    'browser.safebrowsing.malware.enabled': false,
+    'browser.safebrowsing.phishing.enabled': false,
+
+    // Disable updates to search engines.
+    'browser.search.update': false,
+    // Do not restore the last open set of tabs if the browser has crashed
+    'browser.sessionstore.resume_from_crash': false,
+    // Skip check for default browser on startup
+    'browser.shell.checkDefaultBrowser': false,
+
+    // Disable newtabpage
+    'browser.startup.homepage': 'about:blank',
+    // Do not redirect user when a milstone upgrade of Firefox is detected
+    'browser.startup.homepage_override.mstone': 'ignore',
+    // Start with a blank page about:blank
+    'browser.startup.page': 0,
+
+    // Do not allow background tabs to be zombified on Android: otherwise for
+    // tests that open additional tabs: the test harness tab itself might get
+    // unloaded
+    'browser.tabs.disableBackgroundZombification': false,
+    // Do not warn when closing all other open tabs
+    'browser.tabs.warnOnCloseOtherTabs': false,
+    // Do not warn when multiple tabs will be opened
+    'browser.tabs.warnOnOpen': false,
+
+    // Do not automatically offer translations, as tests do not expect this.
+    'browser.translations.automaticallyPopup': false,
+
+    // Disable the UI tour.
+    'browser.uitour.enabled': false,
+    // Turn off search suggestions in the location bar so as not to trigger
+    // network connections.
+    'browser.urlbar.suggest.searches': false,
+    // Disable first run splash page on Windows 10
+    'browser.usedOnWindows10.introURL': '',
+    // Do not warn on quitting Firefox
+    'browser.warnOnQuit': false,
+
+    // Defensively disable data reporting systems
+    'datareporting.healthreport.documentServerURI': `http://${server}/dummy/healthreport/`,
+    'datareporting.healthreport.logging.consoleEnabled': false,
+    'datareporting.healthreport.service.enabled': false,
+    'datareporting.healthreport.service.firstRun': false,
+    'datareporting.healthreport.uploadEnabled': false,
+
+    // Do not show datareporting policy notifications which can interfere with tests
+    'datareporting.policy.dataSubmissionEnabled': false,
+    'datareporting.policy.dataSubmissionPolicyBypassNotification': true,
+
+    // DevTools JSONViewer sometimes fails to load dependencies with its require.js.
+    // This doesn't affect Puppeteer but spams console (Bug 1424372)
+    'devtools.jsonview.enabled': false,
+
+    // Disable popup-blocker
+    'dom.disable_open_during_load': false,
+
+    // Enable the support for File object creation in the content process
+    // Required for |Page.setFileInputFiles| protocol method.
+    'dom.file.createInChild': true,
+
+    // Disable the ProcessHangMonitor
+    'dom.ipc.reportProcessHangs': false,
+
+    // Disable slow script dialogues
+    'dom.max_chrome_script_run_time': 0,
+    'dom.max_script_run_time': 0,
+
+    // Disable background timer throttling to allow tests to run in parallel
+    // without a decrease in performance.
+    'dom.min_background_timeout_value': 0,
+    'dom.min_background_timeout_value_without_budget_throttling': 0,
+    'dom.timeout.enable_budget_timer_throttling': false,
+
+    // Disable HTTPS-First upgrades
+    'dom.security.https_first': false,
+
+    // Only load extensions from the application and user profile
+    // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
+    'extensions.autoDisableScopes': 0,
+    'extensions.enabledScopes': 5,
+
+    // Disable metadata caching for installed add-ons by default
+    'extensions.getAddons.cache.enabled': false,
+
+    // Disable installing any distribution extensions or add-ons.
+    'extensions.installDistroAddons': false,
+
+    // Disabled screenshots extension
+    'extensions.screenshots.disabled': true,
+
+    // Turn off extension updates so they do not bother tests
+    'extensions.update.enabled': false,
+
+    // Turn off extension updates so they do not bother tests
+    'extensions.update.notifyUser': false,
+
+    // Make sure opening about:addons will not hit the network
+    'extensions.webservice.discoverURL': `http://${server}/dummy/discoveryURL`,
+
+    // Allow the application to have focus even it runs in the background
+    'focusmanager.testmode': true,
+
+    // Disable useragent updates
+    'general.useragent.updates.enabled': false,
+
+    // Always use network provider for geolocation tests so we bypass the
+    // macOS dialog raised by the corelocation provider
+    'geo.provider.testing': true,
+
+    // Do not scan Wifi
+    'geo.wifi.scan': false,
+
+    // No hang monitor
+    'hangmonitor.timeout': 0,
+
+    // Show chrome errors and warnings in the error console
+    'javascript.options.showInConsole': true,
+
+    // Do not throttle rendering (requestAnimationFrame) in background tabs
+    'layout.testing.top-level-always-active': true,
+
+    // Disable download and usage of OpenH264: and Widevine plugins
+    'media.gmp-manager.updateEnabled': false,
+
+    // Disable the GFX sanity window
+    'media.sanity-test.disabled': true,
+
+    // Disable connectivity service pings
+    'network.connectivity-service.enabled': false,
+
+    // Disable experimental feature that is only available in Nightly
+    'network.cookie.sameSite.laxByDefault': false,
+
+    // Do not prompt for temporary redirects
+    'network.http.prompt-temp-redirect': false,
+
+    // Disable speculative connections so they are not reported as leaking
+    // when they are hanging around
+    'network.http.speculative-parallel-limit': 0,
+
+    // Do not automatically switch between offline and online
+    'network.manage-offline-status': false,
+
+    // Make sure SNTP requests do not hit the network
+    'network.sntp.pools': server,
+
+    // Disable Flash.
+    'plugin.state.flash': 0,
+
+    'privacy.trackingprotection.enabled': false,
+
+    // Can be removed once Firefox 89 is no longer supported
+    // https://bugzilla.mozilla.org/show_bug.cgi?id=1710839
+    'remote.enabled': true,
+
+    // Don't do network connections for mitm priming
+    'security.certerrors.mitm.priming.enabled': false,
+
+    // Local documents have access to all other local documents,
+    // including directory listings
+    'security.fileuri.strict_origin_policy': false,
+
+    // Do not wait for the notification button security delay
+    'security.notification_enable_delay': 0,
+
+    // Do not automatically fill sign-in forms with known usernames and
+    // passwords
+    'signon.autofillForms': false,
+
+    // Disable password capture, so that tests that include forms are not
+    // influenced by the presence of the persistent doorhanger notification
+    'signon.rememberSignons': false,
+
+    // Disable first-run welcome page
+    'startup.homepage_welcome_url': 'about:blank',
+
+    // Disable first-run welcome page
+    'startup.homepage_welcome_url.additional': '',
+
+    // Disable browser animations (tabs, fullscreen, sliding alerts)
+    'toolkit.cosmeticAnimations.enabled': false,
+
+    // Prevent starting into safe mode after application crashes
+    'toolkit.startup.max_resumed_crashes': -1,
+  };
+
+  return Object.assign(defaultPrefs, extraPrefs);
+}
+
+/**
+ * Populates the user.js file with custom preferences as needed to allow
+ * Firefox's CDP support to properly function. These preferences will be
+ * automatically copied over to prefs.js during startup of Firefox. To be
+ * able to restore the original values of preferences a backup of prefs.js
+ * will be created.
+ *
+ * @param prefs - List of preferences to add.
+ * @param profilePath - Firefox profile to write the preferences to.
+ */
+async function writePreferences(options: ProfileOptions): Promise<void> {
+  const prefsPath = path.join(options.path, 'prefs.js');
+  const lines = Object.entries(options.preferences).map(([key, value]) => {
+    return `user_pref(${JSON.stringify(key)}, ${JSON.stringify(value)});`;
+  });
+
+  // Use allSettled to prevent corruption
+  const result = await Promise.allSettled([
+    fs.promises.writeFile(path.join(options.path, 'user.js'), lines.join('\n')),
+    // Create a backup of the preferences file if it already exitsts.
+    fs.promises.access(prefsPath, fs.constants.F_OK).then(
+      async () => {
+        await fs.promises.copyFile(
+          prefsPath,
+          path.join(options.path, 'prefs.js.playwright')
+        );
+      },
+      // Swallow only if file does not exist
+      () => {}
+    ),
+  ]);
+  for (const command of result) {
+    if (command.status === 'rejected') {
+      throw command.reason;
+    }
+  }
+}
diff --git a/packages/playwright-core/src/server/browser.ts b/packages/playwright-core/src/server/browser.ts
index 663b9be377fe6..615a372d980c8 100644
--- a/packages/playwright-core/src/server/browser.ts
+++ b/packages/playwright-core/src/server/browser.ts
@@ -14,17 +14,21 @@
  * limitations under the License.
  */
 
-import type * as types from './types';
-import type * as channels from '@protocol/channels';
-import { BrowserContext, createClientCertificatesProxyIfNeeded, validateBrowserContextOptions } from './browserContext';
-import { Page } from './page';
+import { Artifact } from './artifact';
+import { BrowserContext, validateBrowserContextOptions } from './browserContext';
 import { Download } from './download';
+import { SdkObject } from './instrumentation';
+import { Page } from './page';
+import { ClientCertificatesProxy } from './socksClientCertificatesInterceptor';
+
+import type * as types from './types';
 import type { ProxySettings } from './types';
+import type { RecentLogsCollector } from './utils/debugLogger';
+import type * as channels from '@protocol/channels';
 import type { ChildProcess } from 'child_process';
-import type { RecentLogsCollector } from '../utils/debugLogger';
-import type { CallMetadata } from './instrumentation';
-import { SdkObject } from './instrumentation';
-import { Artifact } from './artifact';
+import type { Language } from '../utils';
+import type { Progress } from './progress';
+
 
 export interface BrowserProcess {
   onclose?: ((exitCode: number | null, signal: string | null) => void);
@@ -41,7 +45,7 @@ export type BrowserOptions = {
   downloadsPath: string,
   tracesDir: string,
   headful?: boolean,
-  persistent?: channels.BrowserNewContextParams,  // Undefined means no persistent context.
+  persistent?: types.BrowserContextOptions,  // Undefined means no persistent context.
   browserProcess: BrowserProcess,
   customExecutablePath?: string;
   proxy?: ProxySettings,
@@ -49,12 +53,14 @@ export type BrowserOptions = {
   browserLogsCollector: RecentLogsCollector,
   slowMo?: number;
   wsEndpoint?: string;  // Only there when connected over web socket.
+  sdkLanguage?: Language;
   originalLaunchOptions: types.LaunchOptions;
 };
 
 export abstract class Browser extends SdkObject {
 
   static Events = {
+    Context: 'context',
     Disconnected: 'disconnected',
   };
 
@@ -74,42 +80,55 @@ export abstract class Browser extends SdkObject {
     this.instrumentation.onBrowserOpen(this);
   }
 
-  abstract doCreateNewContext(options: channels.BrowserNewContextParams): Promise<BrowserContext>;
+  abstract doCreateNewContext(options: types.BrowserContextOptions): Promise<BrowserContext>;
   abstract contexts(): BrowserContext[];
   abstract isConnected(): boolean;
   abstract version(): string;
   abstract userAgent(): string;
 
-  async newContext(metadata: CallMetadata, options: channels.BrowserNewContextParams): Promise<BrowserContext> {
+  sdkLanguage() {
+    return this.options.sdkLanguage || this.attribution.playwright.options.sdkLanguage;
+  }
+
+  async newContext(progress: Progress, options: types.BrowserContextOptions): Promise<BrowserContext> {
     validateBrowserContextOptions(options, this.options);
-    const clientCertificatesProxy = await createClientCertificatesProxyIfNeeded(options, this.options);
-    let context;
+    let clientCertificatesProxy: ClientCertificatesProxy | undefined;
+    let context: BrowserContext | undefined;
     try {
-      context = await this.doCreateNewContext(options);
+      if (options.clientCertificates?.length) {
+        clientCertificatesProxy = await ClientCertificatesProxy.create(progress, options);
+        options = { ...options };
+        options.proxyOverride = clientCertificatesProxy.proxySettings();
+        options.internalIgnoreHTTPSErrors = true;
+      }
+      context = await progress.race(this.doCreateNewContext(options));
+      context._clientCertificatesProxy = clientCertificatesProxy;
+      if ((options as any).__testHookBeforeSetStorageState)
+        await progress.race((options as any).__testHookBeforeSetStorageState());
+      await context.setStorageState(progress, options.storageState, 'initial');
+      this.emit(Browser.Events.Context, context);
+      return context;
     } catch (error) {
-      await clientCertificatesProxy?.close();
+      await context?.close({ reason: 'Failed to create context' }).catch(() => {});
+      await clientCertificatesProxy?.close().catch(() => {});
       throw error;
     }
-    context._clientCertificatesProxy = clientCertificatesProxy;
-    if (options.storageState)
-      await context.setStorageState(metadata, options.storageState);
-    return context;
   }
 
-  async newContextForReuse(params: channels.BrowserNewContextForReuseParams, metadata: CallMetadata): Promise<{ context: BrowserContext, needsReset: boolean }> {
+  async newContextForReuse(progress: Progress, params: channels.BrowserNewContextForReuseParams): Promise<BrowserContext> {
     const hash = BrowserContext.reusableContextHash(params);
     if (!this._contextForReuse || hash !== this._contextForReuse.hash || !this._contextForReuse.context.canResetForReuse()) {
       if (this._contextForReuse)
         await this._contextForReuse.context.close({ reason: 'Context reused' });
-      this._contextForReuse = { context: await this.newContext(metadata, params), hash };
-      return { context: this._contextForReuse.context, needsReset: false };
+      this._contextForReuse = { context: await this.newContext(progress, params), hash };
+      return this._contextForReuse.context;
     }
-    await this._contextForReuse.context.stopPendingOperations('Context recreated');
-    return { context: this._contextForReuse.context, needsReset: true };
+    await this._contextForReuse.context.resetForReuse(progress, params);
+    return this._contextForReuse.context;
   }
 
-  async stopPendingOperations(reason: string) {
-    await this._contextForReuse?.context?.stopPendingOperations(reason);
+  contextForReuse() {
+    return this._contextForReuse?.context;
   }
 
   _downloadCreated(page: Page, uuid: string, url: string, suggestedFilename?: string) {
@@ -137,7 +156,7 @@ export abstract class Browser extends SdkObject {
     this._idToVideo.set(videoId, { context, artifact });
     pageOrError.then(page => {
       if (page instanceof Page) {
-        page._video = artifact;
+        page.video = artifact;
         page.emitOnContext(BrowserContext.Events.VideoStarted, artifact);
         page.emit(Page.Events.Video, artifact);
       }
diff --git a/packages/playwright-core/src/server/browserContext.ts b/packages/playwright-core/src/server/browserContext.ts
index da21dff70819e..1866e05a21b44 100644
--- a/packages/playwright-core/src/server/browserContext.ts
+++ b/packages/playwright-core/src/server/browserContext.ts
@@ -15,41 +15,42 @@
  * limitations under the License.
  */
 
-import * as os from 'os';
-import { TimeoutSettings } from '../common/timeoutSettings';
-import { createGuid, debugMode } from '../utils';
-import { mkdirIfNeeded } from '../utils/fileUtils';
-import type { Browser, BrowserOptions } from './browser';
-import type { Download } from './download';
-import type * as frames from './frames';
+import fs from 'fs';
+import path from 'path';
+
+import { createGuid } from './utils/crypto';
+import { debugMode } from './utils/debug';
+import { Clock } from './clock';
+import { Debugger } from './debugger';
+import { DialogManager } from './dialog';
+import { BrowserContextAPIRequestContext } from './fetch';
+import { mkdirIfNeeded } from './utils/fileUtils';
+import { rewriteErrorMessage } from '../utils/isomorphic/stackTrace';
+import { HarRecorder } from './har/harRecorder';
 import { helper } from './helper';
+import { SdkObject } from './instrumentation';
 import * as network from './network';
 import { InitScript } from './page';
-import type { PageDelegate } from './page';
 import { Page, PageBinding } from './page';
-import type { Progress, ProgressController } from './progress';
-import type { Selectors } from './selectors';
-import type * as types from './types';
-import type * as channels from '@protocol/channels';
-import path from 'path';
-import fs from 'fs';
-import type { CallMetadata } from './instrumentation';
-import { serverSideCallMetadata, SdkObject } from './instrumentation';
-import { Debugger } from './debugger';
+import { RecorderApp } from './recorder/recorderApp';
+import { Selectors } from './selectors';
 import { Tracing } from './trace/recorder/tracing';
-import { HarRecorder } from './har/harRecorder';
-import { Recorder } from './recorder';
-import * as consoleApiSource from '../generated/consoleApiSource';
-import { BrowserContextAPIRequestContext } from './fetch';
+import * as rawStorageSource from '../generated/storageScriptSource';
+
 import type { Artifact } from './artifact';
-import { Clock } from './clock';
-import { ClientCertificatesProxy } from './socksClientCertificatesInterceptor';
+import type { Browser, BrowserOptions } from './browser';
+import type { Download } from './download';
+import type * as frames from './frames';
+import type { Progress } from './progress';
+import type { ClientCertificatesProxy } from './socksClientCertificatesInterceptor';
+import type { SerializedStorage } from '@injected/storageScript';
+import type * as types from './types';
+import type * as channels from '@protocol/channels';
 
 export abstract class BrowserContext extends SdkObject {
   static Events = {
     Console: 'console',
     Close: 'close',
-    Dialog: 'dialog',
     Page: 'page',
     // Can't use just 'error' due to node.js special treatment of error events.
     // @see https://nodejs.org/api/events.html#events_error_events
@@ -63,13 +64,12 @@ export abstract class BrowserContext extends SdkObject {
     RequestContinued: 'requestcontinued',
     BeforeClose: 'beforeclose',
     VideoStarted: 'videostarted',
+    RecorderEvent: 'recorderevent',
   };
 
-  readonly _timeoutSettings = new TimeoutSettings();
   readonly _pageBindings = new Map<string, PageBinding>();
-  readonly _activeProgressControllers = new Set<ProgressController>();
-  readonly _options: channels.BrowserNewContextParams;
-  _requestInterceptor?: network.RouteHandler;
+  readonly _options: types.BrowserContextOptions;
+  readonly requestInterceptors: network.RouteHandler[] = [];
   private _isPersistentContext: boolean;
   private _closedStatus: 'open' | 'closing' | 'closed' = 'open';
   readonly _closePromise: Promise<Error>;
@@ -78,22 +78,25 @@ export abstract class BrowserContext extends SdkObject {
   readonly _downloads = new Set<Download>();
   readonly _browser: Browser;
   readonly _browserContextId: string | undefined;
-  private _selectors?: Selectors;
+  private _selectors: Selectors;
   private _origins = new Set<string>();
   readonly _harRecorders = new Map<string, HarRecorder>();
   readonly tracing: Tracing;
   readonly fetchRequest: BrowserContextAPIRequestContext;
   private _customCloseHandler?: () => Promise<any>;
   readonly _tempDirs: string[] = [];
-  private _settingStorageState = false;
-  readonly initScripts: InitScript[] = [];
+  private _creatingStorageStatePage = false;
+  bindingsInitScript?: InitScript;
+  initScripts: InitScript[] = [];
   private _routesInFlight = new Set<network.Route>();
   private _debugger!: Debugger;
   _closeReason: string | undefined;
   readonly clock: Clock;
   _clientCertificatesProxy: ClientCertificatesProxy | undefined;
+  private _playwrightBindingExposed = false;
+  readonly dialogManager: DialogManager;
 
-  constructor(browser: Browser, options: channels.BrowserNewContextParams, browserContextId: string | undefined) {
+  constructor(browser: Browser, options: types.BrowserContextOptions, browserContextId: string | undefined) {
     super(browser, 'browser-context');
     this.attribution.context = this;
     this._browser = browser;
@@ -101,26 +104,20 @@ export abstract class BrowserContext extends SdkObject {
     this._browserContextId = browserContextId;
     this._isPersistentContext = !browserContextId;
     this._closePromise = new Promise(fulfill => this._closePromiseFulfill = fulfill);
+    this._selectors = new Selectors(options.selectorEngines || [], options.testIdAttributeName);
 
     this.fetchRequest = new BrowserContextAPIRequestContext(this);
-
-    if (this._options.recordHar)
-      this._harRecorders.set('', new HarRecorder(this, null, this._options.recordHar));
-
     this.tracing = new Tracing(this, browser.options.tracesDir);
     this.clock = new Clock(this);
+    this.dialogManager = new DialogManager(this.instrumentation);
   }
 
   isPersistentContext(): boolean {
     return this._isPersistentContext;
   }
 
-  setSelectors(selectors: Selectors) {
-    this._selectors = selectors;
-  }
-
   selectors(): Selectors {
-    return this._selectors || this.attribution.playwright.selectors;
+    return this._selectors;
   }
 
   async _initialize() {
@@ -131,19 +128,25 @@ export abstract class BrowserContext extends SdkObject {
 
     // When PWDEBUG=1, show inspector for each context.
     if (debugMode() === 'inspector')
-      await Recorder.show(this, { pauseOnNextStatement: true });
+      await RecorderApp.show(this, { pauseOnNextStatement: true });
 
     // When paused, show inspector.
     if (this._debugger.isPaused())
-      Recorder.showInspector(this);
+      RecorderApp.showInspectorNoReply(this);
+
     this._debugger.on(Debugger.Events.PausedStateChanged, () => {
-      Recorder.showInspector(this);
+      if (this._debugger.isPaused())
+        RecorderApp.showInspectorNoReply(this);
     });
 
-    if (debugMode() === 'console')
-      await this.extendInjectedScript(consoleApiSource.source);
+    if (debugMode() === 'console') {
+      await this.extendInjectedScript(`
+        function installConsoleApi(injectedScript) { injectedScript.consoleApi.install(); }
+        module.exports = { default: () => installConsoleApi };
+      `);
+    }
     if (this._options.serviceWorkers === 'block')
-      await this.addInitScript(`\nnavigator.serviceWorker.register = async () => { console.warn('Service Worker registration blocked by Playwright'); };\n`);
+      await this.addInitScript(undefined, `\nif (navigator.serviceWorker) navigator.serviceWorker.register = async () => { console.warn('Service Worker registration blocked by Playwright'); };\n`);
 
     if (this._options.permissions)
       await this.grantPermissions(this._options.permissions);
@@ -164,18 +167,12 @@ export abstract class BrowserContext extends SdkObject {
     return true;
   }
 
-  async stopPendingOperations(reason: string) {
-    // When using context reuse, stop pending operations to gracefully terminate all the actions
-    // with a user-friendly error message containing operation log.
-    for (const controller of this._activeProgressControllers)
-      controller.abort(new Error(reason));
-    // Let rejections in microtask generate events before returning.
-    await new Promise(f => setTimeout(f, 0));
-  }
-
   static reusableContextHash(params: channels.BrowserNewContextForReuseParams): string {
     const paramsCopy = { ...params };
 
+    if (paramsCopy.selectorEngines?.length === 0)
+      delete paramsCopy.selectorEngines;
+
     for (const k of Object.keys(paramsCopy)) {
       const key = k as keyof channels.BrowserNewContextForReuseParams;
       if (paramsCopy[key] === defaultNewContextParamValues[key])
@@ -187,52 +184,38 @@ export abstract class BrowserContext extends SdkObject {
     return JSON.stringify(paramsCopy);
   }
 
-  async resetForReuse(metadata: CallMetadata, params: channels.BrowserNewContextForReuseParams | null) {
-    this.setDefaultNavigationTimeout(undefined);
-    this.setDefaultTimeout(undefined);
-    this.tracing.resetForReuse();
+  async resetForReuse(progress: Progress, params: channels.BrowserNewContextForReuseParams | null) {
+    await this.tracing.resetForReuse(progress);
 
     if (params) {
       for (const key of paramsThatAllowContextReuse)
         (this._options as any)[key] = params[key];
+      if (params.testIdAttributeName)
+        this.selectors().setTestIdAttributeName(params.testIdAttributeName);
     }
 
-    await this._cancelAllRoutesInFlight();
-
     // Close extra pages early.
     let page: Page | undefined = this.pages()[0];
-    const [, ...otherPages] = this.pages();
+    const otherPages = this.possiblyUninitializedPages().filter(p => p !== page);
     for (const p of otherPages)
-      await p.close(metadata);
+      await p.close();
     if (page && page.hasCrashed()) {
-      await page.close(metadata);
+      await page.close();
       page = undefined;
     }
 
-    // Unless dialogs are dismissed, setting extra http headers below does not respond.
-    page?._frameManager.setCloseAllOpeningDialogs(true);
-    await page?._frameManager.closeOpenDialogs();
     // Navigate to about:blank first to ensure no page scripts are running after this point.
-    await page?.mainFrame().goto(metadata, 'about:blank', { timeout: 0 });
-    page?._frameManager.setCloseAllOpeningDialogs(false);
-
-    await this._resetStorage();
-    await this._removeExposedBindings();
-    await this._removeInitScripts();
-    this.clock.markAsUninstalled();
-    // TODO: following can be optimized to not perform noops.
-    if (this._options.permissions)
-      await this.grantPermissions(this._options.permissions);
-    else
-      await this.clearPermissions();
-    await this.setExtraHTTPHeaders(this._options.extraHTTPHeaders || []);
-    await this.setGeolocation(this._options.geolocation);
-    await this.setOffline(!!this._options.offline);
-    await this.setUserAgent(this._options.userAgent);
-    await this.clearCache();
-    await this._resetCookies();
+    await page?.mainFrame().gotoImpl(progress, 'about:blank', {});
+
+    // Note: we only need to reset properties from the "paramsThatAllowContextReuse" list.
+    // All other properties force a new context.
+    await this.clock.uninstall(progress);
+    await progress.race(this.setUserAgent(this._options.userAgent));
+    await progress.race(this.doUpdateDefaultEmulatedMedia());
+    await progress.race(this.doUpdateDefaultViewport());
+    await this.setStorageState(progress, this._options.storageState, 'resetForReuse');
 
-    await page?.resetForReuse(metadata);
+    await page?.resetForReuse(progress);
   }
 
   _browserClosed() {
@@ -255,14 +238,16 @@ export abstract class BrowserContext extends SdkObject {
     this.emit(BrowserContext.Events.Close);
   }
 
+  pages(): Page[] {
+    return this.possiblyUninitializedPages().filter(page => page.initializedOrUndefined());
+  }
+
   // BrowserContext methods.
-  abstract pages(): Page[];
-  abstract newPageDelegate(): Promise<PageDelegate>;
+  abstract possiblyUninitializedPages(): Page[];
+  abstract doCreateNewPage(): Promise<Page>;
   abstract addCookies(cookies: channels.SetNetworkCookie[]): Promise<void>;
   abstract setGeolocation(geolocation?: types.Geolocation): Promise<void>;
-  abstract setExtraHTTPHeaders(headers: types.HeadersArray): Promise<void>;
   abstract setUserAgent(userAgent: string | undefined): Promise<void>;
-  abstract setOffline(offline: boolean): Promise<void>;
   abstract cancelDownload(uuid: string): Promise<void>;
   abstract clearCache(): Promise<void>;
   protected abstract doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]>;
@@ -271,10 +256,13 @@ export abstract class BrowserContext extends SdkObject {
   protected abstract doClearPermissions(): Promise<void>;
   protected abstract doSetHTTPCredentials(httpCredentials?: types.Credentials): Promise<void>;
   protected abstract doAddInitScript(initScript: InitScript): Promise<void>;
-  protected abstract doRemoveInitScripts(): Promise<void>;
-  protected abstract doExposeBinding(binding: PageBinding): Promise<void>;
-  protected abstract doRemoveExposedBindings(): Promise<void>;
+  protected abstract doRemoveInitScripts(initScripts: InitScript[]): Promise<void>;
+  protected abstract doUpdateExtraHTTPHeaders(): Promise<void>;
+  protected abstract doUpdateOffline(): Promise<void>;
   protected abstract doUpdateRequestInterception(): Promise<void>;
+  protected abstract doUpdateDefaultViewport(): Promise<void>;
+  protected abstract doUpdateDefaultEmulatedMedia(): Promise<void>;
+  protected abstract doExposePlaywrightBinding(): Promise<void>;
   protected abstract doClose(reason: string | undefined): Promise<void>;
   protected abstract onClosePersistent(): void;
 
@@ -311,24 +299,54 @@ export abstract class BrowserContext extends SdkObject {
     return this.doSetHTTPCredentials(httpCredentials);
   }
 
-  async exposeBinding(name: string, needsHandle: boolean, playwrightBinding: frames.FunctionWithSource): Promise<void> {
+  getBindingClient(name: string): unknown | undefined {
+    return this._pageBindings.get(name)?.forClient;
+  }
+
+  async exposePlaywrightBindingIfNeeded() {
+    if (this._playwrightBindingExposed)
+      return;
+    this._playwrightBindingExposed = true;
+    await this.doExposePlaywrightBinding();
+
+    this.bindingsInitScript = PageBinding.createInitScript();
+    this.initScripts.push(this.bindingsInitScript);
+    await this.doAddInitScript(this.bindingsInitScript);
+    await this.safeNonStallingEvaluateInAllFrames(this.bindingsInitScript.source, 'main');
+  }
+
+  needsPlaywrightBinding() {
+    return this._playwrightBindingExposed;
+  }
+
+  async exposeBinding(progress: Progress, name: string, needsHandle: boolean, playwrightBinding: frames.FunctionWithSource, forClient?: unknown): Promise<PageBinding> {
     if (this._pageBindings.has(name))
       throw new Error(`Function "${name}" has been already registered`);
     for (const page of this.pages()) {
       if (page.getBinding(name))
         throw new Error(`Function "${name}" has been already registered in one of the pages`);
     }
+    await progress.race(this.exposePlaywrightBindingIfNeeded());
     const binding = new PageBinding(name, playwrightBinding, needsHandle);
+    binding.forClient = forClient;
     this._pageBindings.set(name, binding);
-    await this.doExposeBinding(binding);
+    try {
+      await progress.race(this.doAddInitScript(binding.initScript));
+      await progress.race(this.safeNonStallingEvaluateInAllFrames(binding.initScript.source, 'main'));
+      return binding;
+    } catch (error) {
+      this._pageBindings.delete(name);
+      throw error;
+    }
   }
 
-  async _removeExposedBindings() {
-    for (const key of this._pageBindings.keys()) {
-      if (!key.startsWith('__pw'))
-        this._pageBindings.delete(key);
-    }
-    await this.doRemoveExposedBindings();
+  async removeExposedBindings(bindings: PageBinding[]) {
+    bindings = bindings.filter(binding => this._pageBindings.get(binding.name) === binding);
+    for (const binding of bindings)
+      this._pageBindings.delete(binding.name);
+    await this.doRemoveInitScripts(bindings.map(binding => binding.initScript));
+    const cleanup = bindings.map(binding => `{ ${binding.cleanupScript} };\n`).join('');
+    await this.safeNonStallingEvaluateInAllFrames(cleanup, 'main');
   }
 
   async grantPermissions(permissions: string[], origin?: string) {
@@ -349,39 +367,59 @@ export abstract class BrowserContext extends SdkObject {
     await this.doClearPermissions();
   }
 
-  setDefaultNavigationTimeout(timeout: number | undefined) {
-    this._timeoutSettings.setDefaultNavigationTimeout(timeout);
+  async setExtraHTTPHeaders(progress: Progress, headers: types.HeadersArray) {
+    const oldHeaders = this._options.extraHTTPHeaders;
+    this._options.extraHTTPHeaders = headers;
+    try {
+      await progress.race(this.doUpdateExtraHTTPHeaders());
+    } catch (error) {
+      this._options.extraHTTPHeaders = oldHeaders;
+      // Note: no await, headers will be reset in the background as soon as possible.
+      this.doUpdateExtraHTTPHeaders().catch(() => {});
+      throw error;
+    }
   }
 
-  setDefaultTimeout(timeout: number | undefined) {
-    this._timeoutSettings.setDefaultTimeout(timeout);
+  async setOffline(progress: Progress, offline: boolean) {
+    const oldOffline = this._options.offline;
+    this._options.offline = offline;
+    try {
+      await progress.race(this.doUpdateOffline());
+    } catch (error) {
+      this._options.offline = oldOffline;
+      // Note: no await, offline will be reset in the background as soon as possible.
+      this.doUpdateOffline().catch(() => {});
+      throw error;
+    }
   }
 
-  async _loadDefaultContextAsIs(progress: Progress): Promise<Page[]> {
-    if (!this.pages().length) {
+  async _loadDefaultContextAsIs(progress: Progress): Promise<Page | undefined> {
+    if (!this.possiblyUninitializedPages().length) {
       const waitForEvent = helper.waitForEvent(progress, this, BrowserContext.Events.Page);
-      progress.cleanupWhenAborted(() => waitForEvent.dispose);
-      const page = (await waitForEvent.promise) as Page;
-      if (page._pageIsError)
-        throw page._pageIsError;
+      // Race against BrowserContext.close
+      await Promise.race([waitForEvent.promise, this._closePromise]);
     }
-    const pages = this.pages();
-    if (pages[0]._pageIsError)
-      throw pages[0]._pageIsError;
-    await pages[0].mainFrame()._waitForLoadState(progress, 'load');
-    return pages;
+    const page = this.possiblyUninitializedPages()[0];
+    if (!page)
+      return;
+    const pageOrError = await progress.race(page.waitForInitializedOrError());
+    if (pageOrError instanceof Error)
+      throw pageOrError;
+    await page.mainFrame()._waitForLoadState(progress, 'load');
+    return page;
   }
 
   async _loadDefaultContext(progress: Progress) {
-    const pages = await this._loadDefaultContextAsIs(progress);
+    const defaultPage = await this._loadDefaultContextAsIs(progress);
+    if (!defaultPage)
+      return;
     const browserName = this._browser.options.name;
     if ((this._options.isMobile && browserName === 'chromium') || (this._options.locale && browserName === 'webkit')) {
       // Workaround for:
       // - chromium fails to change isMobile for existing page;
       // - webkit fails to change locale for existing page.
-      const oldPage = pages[0];
-      await this.newPage(progress.metadata);
-      await oldPage.close(progress.metadata);
+      await this.newPage(progress);
+      await defaultPage.close();
     }
   }
 
@@ -407,19 +445,41 @@ export abstract class BrowserContext extends SdkObject {
       this._options.httpCredentials = { username, password: password || '' };
   }
 
-  async addInitScript(source: string) {
+  async addInitScript(progress: Progress | undefined, source: string) {
     const initScript = new InitScript(source);
     this.initScripts.push(initScript);
-    await this.doAddInitScript(initScript);
+    try {
+      const promise = this.doAddInitScript(initScript);
+      if (progress)
+        await progress.race(promise);
+      else
+        await promise;
+      return initScript;
+    } catch (error) {
+      // Note: no await, init script will be removed in the background as soon as possible.
+      this.removeInitScripts([initScript]).catch(() => {});
+      throw error;
+    }
   }
 
-  async _removeInitScripts(): Promise<void> {
-    this.initScripts.splice(0, this.initScripts.length);
-    await this.doRemoveInitScripts();
+  async removeInitScripts(initScripts: InitScript[]) {
+    const set = new Set(initScripts);
+    this.initScripts = this.initScripts.filter(script => !set.has(script));
+    await this.doRemoveInitScripts(initScripts);
   }
 
-  async setRequestInterceptor(handler: network.RouteHandler | undefined): Promise<void> {
-    this._requestInterceptor = handler;
+  async addRequestInterceptor(progress: Progress, handler: network.RouteHandler): Promise<void> {
+    // Note: progress is intentionally ignored, because this operation is not cancellable and should not block in the browser anyway.
+    this.requestInterceptors.push(handler);
+    await this.doUpdateRequestInterception();
+  }
+
+  async removeRequestInterceptor(handler: network.RouteHandler): Promise<void> {
+    const index = this.requestInterceptors.indexOf(handler);
+    if (index === -1)
+      return;
+    this.requestInterceptors.splice(index, 1);
+    await this.notifyRoutesInFlightAboutRemovedHandler(handler);
     await this.doUpdateRequestInterception();
   }
 
@@ -478,41 +538,53 @@ export abstract class BrowserContext extends SdkObject {
     await this._closePromise;
   }
 
-  async newPage(metadata: CallMetadata): Promise<Page> {
-    const pageDelegate = await this.newPageDelegate();
-    if (metadata.isServerSide)
-      pageDelegate.potentiallyUninitializedPage().markAsServerSideOnly();
-    const pageOrError = await pageDelegate.pageOrError();
-    if (pageOrError instanceof Page) {
-      if (pageOrError.isClosed())
-        throw new Error('Page has been closed.');
-      return pageOrError;
+  async newPage(progress: Progress, forStorageState?: boolean): Promise<Page> {
+    let page: Page | undefined;
+    try {
+      this._creatingStorageStatePage = !!forStorageState;
+      page = await progress.race(this.doCreateNewPage());
+      const pageOrError = await progress.race(page.waitForInitializedOrError());
+      if (pageOrError instanceof Page) {
+        if (pageOrError.isClosed())
+          throw new Error('Page has been closed.');
+        return pageOrError;
+      }
+      throw pageOrError;
+    } catch (error) {
+      await page?.close({ reason: 'Failed to create page' }).catch(() => {});
+      throw error;
+    } finally {
+      this._creatingStorageStatePage = false;
     }
-    throw pageOrError;
   }
 
   addVisitedOrigin(origin: string) {
     this._origins.add(origin);
   }
 
-  async storageState(): Promise<channels.BrowserContextStorageStateResult> {
+  async storageState(progress: Progress, indexedDB = false): Promise<channels.BrowserContextStorageStateResult> {
     const result: channels.BrowserContextStorageStateResult = {
       cookies: await this.cookies(),
       origins: []
     };
     const originsToSave = new Set(this._origins);
 
+    const collectScript = `(() => {
+      const module = {};
+      ${rawStorageSource.source}
+      const script = new (module.exports.StorageScript())(${this._browser.options.name === 'firefox'});
+      return script.collect(${indexedDB});
+    })()`;
+
     // First try collecting storage stage from existing pages.
     for (const page of this.pages()) {
       const origin = page.mainFrame().origin();
       if (!origin || !originsToSave.has(origin))
         continue;
       try {
-        const storage = await page.mainFrame().nonStallingEvaluateInExistingContext(`({
-          localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
-        })`, 'utility');
-        if (storage.localStorage.length)
-          result.origins.push({ origin, localStorage: storage.localStorage } as channels.OriginStorage);
+        const storage: SerializedStorage = await page.mainFrame().nonStallingEvaluateInExistingContext(collectScript, 'utility');
+        if (storage.localStorage.length || storage.indexedDB?.length)
+          result.origins.push({ origin, localStorage: storage.localStorage, indexedDB: storage.indexedDB });
         originsToSave.delete(origin);
       } catch {
         // When failed on the live page, we'll retry on the blank page below.
@@ -521,94 +593,75 @@ export abstract class BrowserContext extends SdkObject {
 
     // If there are still origins to save, create a blank page to iterate over origins.
     if (originsToSave.size)  {
-      const internalMetadata = serverSideCallMetadata();
-      const page = await this.newPage(internalMetadata);
-      await page._setServerRequestInterceptor(handler => {
-        handler.fulfill({ body: '<html></html>', requestUrl: handler.request().url() }).catch(() => {});
-        return true;
-      });
-      for (const origin of originsToSave) {
-        const originStorage: channels.OriginStorage = { origin, localStorage: [] };
-        const frame = page.mainFrame();
-        await frame.goto(internalMetadata, origin);
-        const storage = await frame.evaluateExpression(`({
-          localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
-        })`, { world: 'utility' });
-        originStorage.localStorage = storage.localStorage;
-        if (storage.localStorage.length)
-          result.origins.push(originStorage);
+      const page = await this.newPage(progress, true /* forStorageState */);
+      try {
+        await page.addRequestInterceptor(progress, route => {
+          route.fulfill({ body: '<html></html>' }).catch(() => {});
+        }, 'prepend');
+        for (const origin of originsToSave) {
+          const frame = page.mainFrame();
+          await frame.gotoImpl(progress, origin, {});
+          const storage: SerializedStorage = await progress.race(frame.evaluateExpression(collectScript, { world: 'utility' }));
+          if (storage.localStorage.length || storage.indexedDB?.length)
+            result.origins.push({ origin, localStorage: storage.localStorage, indexedDB: storage.indexedDB });
+        }
+      } finally {
+        await page.close();
       }
-      await page.close(internalMetadata);
     }
     return result;
   }
 
-  async _resetStorage() {
-    const oldOrigins = this._origins;
-    const newOrigins = new Map(this._options.storageState?.origins?.map(p => [p.origin, p]) || []);
-    if (!oldOrigins.size && !newOrigins.size)
-      return;
-    let page = this.pages()[0];
-
-    const internalMetadata = serverSideCallMetadata();
-    page = page || await this.newPage({
-      ...internalMetadata,
-      // Do not mark this page as internal, because we will leave it for later reuse
-      // as a user-visible page.
-      isServerSide: false,
-    });
-    await page._setServerRequestInterceptor(handler => {
-      handler.fulfill({ body: '<html></html>', requestUrl: handler.request().url() }).catch(() => {});
-      return true;
-    });
-
-    for (const origin of new Set([...oldOrigins, ...newOrigins.keys()])) {
-      const frame = page.mainFrame();
-      await frame.goto(internalMetadata, origin);
-      await frame.resetStorageForCurrentOriginBestEffort(newOrigins.get(origin));
-    }
+  isCreatingStorageStatePage(): boolean {
+    return this._creatingStorageStatePage;
+  }
 
-    await page._setServerRequestInterceptor(undefined);
+  async setStorageState(progress: Progress, state: channels.BrowserNewContextParams['storageState'], mode: 'initial' | 'resetForReuse') {
+    let page: Page | undefined;
+    let interceptor: network.RouteHandler | undefined;
+    try {
+      if (mode !== 'initial') {
+        await progress.race(this.clearCache());
+        await progress.race(this.doClearCookies());
+      }
 
-    this._origins = new Set([...newOrigins.keys()]);
-    // It is safe to not restore the URL to about:blank since we are doing it in Page::resetForReuse.
-  }
+      if (state?.cookies)
+        await progress.race(this.addCookies(state.cookies));
 
-  async _resetCookies() {
-    await this.doClearCookies();
-    if (this._options.storageState?.cookies)
-      await this.addCookies(this._options.storageState?.cookies);
-  }
+      const newOrigins = new Map(state?.origins?.map(p => [p.origin, p]) || []);
+      const allOrigins = new Set([...this._origins, ...newOrigins.keys()]);
+      if (allOrigins.size) {
+        if (mode === 'resetForReuse')
+          page = this.pages()[0];
+        if (!page)
+          page = await this.newPage(progress, mode !== 'resetForReuse' /* forStorageState */);
 
-  isSettingStorageState(): boolean {
-    return this._settingStorageState;
-  }
+        interceptor = (route: network.Route) => {
+          route.fulfill({ body: '<html></html>' }).catch(() => {});
+        };
+        await page.addRequestInterceptor(progress, interceptor, 'prepend');
 
-  async setStorageState(metadata: CallMetadata, state: NonNullable<channels.BrowserNewContextParams['storageState']>) {
-    this._settingStorageState = true;
-    try {
-      if (state.cookies)
-        await this.addCookies(state.cookies);
-      if (state.origins && state.origins.length)  {
-        const internalMetadata = serverSideCallMetadata();
-        const page = await this.newPage(internalMetadata);
-        await page._setServerRequestInterceptor(handler => {
-          handler.fulfill({ body: '<html></html>', requestUrl: handler.request().url() }).catch(() => {});
-          return true;
-        });
-        for (const originState of state.origins) {
+        for (const origin of allOrigins) {
           const frame = page.mainFrame();
-          await frame.goto(metadata, originState.origin);
-          await frame.evaluateExpression(`
-            originState => {
-              for (const { name, value } of (originState.localStorage || []))
-                localStorage.setItem(name, value);
-            }`, { isFunction: true, world: 'utility' }, originState);
+          await frame.gotoImpl(progress, origin, {});
+          const restoreScript = `(() => {
+            const module = {};
+            ${rawStorageSource.source}
+            const script = new (module.exports.StorageScript())(${this._browser.options.name === 'firefox'});
+            return script.restore(${JSON.stringify(newOrigins.get(origin))});
+          })()`;
+          await progress.race(frame.evaluateExpression(restoreScript, { world: 'utility' }));
         }
-        await page.close(internalMetadata);
       }
+      this._origins = new Set([...newOrigins.keys()]);
+    } catch (error) {
+      rewriteErrorMessage(error, `Error setting storage state:\n` + error.message);
+      throw error;
     } finally {
-      this._settingStorageState = false;
+      if (mode !== 'resetForReuse')
+        await page?.close();
+      else if (interceptor)
+        await page?.removeRequestInterceptor(interceptor);
     }
   }
 
@@ -626,13 +679,13 @@ export abstract class BrowserContext extends SdkObject {
     await Promise.all(this.pages().map(page => page.safeNonStallingEvaluateInAllFrames(expression, world, options)));
   }
 
-  async _harStart(page: Page | null, options: channels.RecordHarOptions): Promise<string> {
+  harStart(page: Page | null, options: channels.RecordHarOptions): string {
     const harId = createGuid();
     this._harRecorders.set(harId, new HarRecorder(this, page, options));
     return harId;
   }
 
-  async _harExport(harId: string | undefined): Promise<Artifact> {
+  async harExport(harId: string | undefined): Promise<Artifact> {
     const recorder = this._harRecorders.get(harId || '')!;
     return recorder.export();
   }
@@ -645,32 +698,12 @@ export abstract class BrowserContext extends SdkObject {
     this._routesInFlight.delete(route);
   }
 
-  async _cancelAllRoutesInFlight() {
-    await Promise.all([...this._routesInFlight].map(r => r.abort())).catch(() => {});
-    this._routesInFlight.clear();
+  async notifyRoutesInFlightAboutRemovedHandler(handler: network.RouteHandler): Promise<void> {
+    await Promise.all([...this._routesInFlight].map(route => route.removeHandler(handler)));
   }
 }
 
-export function assertBrowserContextIsNotOwned(context: BrowserContext) {
-  for (const page of context.pages()) {
-    if (page._ownedContext)
-      throw new Error('Please use browser.newContext() for multi-page scripts that share the context.');
-  }
-}
-
-export async function createClientCertificatesProxyIfNeeded(options: channels.BrowserNewContextOptions, browserOptions?: BrowserOptions) {
-  if (!options.clientCertificates?.length)
-    return;
-  if ((options.proxy?.server && options.proxy?.server !== 'per-context') || (browserOptions?.proxy?.server && browserOptions?.proxy?.server !== 'http://per-context'))
-    throw new Error('Cannot specify both proxy and clientCertificates');
-  verifyClientCertificates(options.clientCertificates);
-  const clientCertificatesProxy = new ClientCertificatesProxy(options);
-  options.proxy = { server: await clientCertificatesProxy.listen() };
-  options.ignoreHTTPSErrors = true;
-  return clientCertificatesProxy;
-}
-
-export function validateBrowserContextOptions(options: channels.BrowserNewContextParams, browserOptions: BrowserOptions) {
+export function validateBrowserContextOptions(options: types.BrowserContextOptions, browserOptions: BrowserOptions) {
   if (options.noDefaultViewport && options.deviceScaleFactor !== undefined)
     throw new Error(`"deviceScaleFactor" option is not supported with null "viewport"`);
   if (options.noDefaultViewport && !!options.isMobile)
@@ -701,15 +734,12 @@ export function validateBrowserContextOptions(options: channels.BrowserNewContex
     options.recordVideo.size!.width &= ~1;
     options.recordVideo.size!.height &= ~1;
   }
-  if (options.proxy) {
-    if (!browserOptions.proxy && browserOptions.isChromium && os.platform() === 'win32')
-      throw new Error(`Browser needs to be launched with the global proxy. If all contexts override the proxy, global proxy will be never used and can be any string, for example "launch({ proxy: { server: 'http://per-context' } })"`);
+  if (options.proxy)
     options.proxy = normalizeProxySettings(options.proxy);
-  }
   verifyGeolocation(options.geolocation);
 }
 
-export function verifyGeolocation(geolocation?: types.Geolocation) {
+export function verifyGeolocation(geolocation?: types.Geolocation): asserts geolocation is types.Geolocation {
   if (!geolocation)
     return;
   geolocation.accuracy = geolocation.accuracy || 0;
@@ -722,7 +752,7 @@ export function verifyGeolocation(geolocation?: types.Geolocation) {
     throw new Error(`geolocation.accuracy: precondition 0 <= ACCURACY failed.`);
 }
 
-export function verifyClientCertificates(clientCertificates?: channels.BrowserNewContextParams['clientCertificates']) {
+export function verifyClientCertificates(clientCertificates?: types.BrowserContextOptions['clientCertificates']) {
   if (!clientCertificates)
     return;
   for (const cert of clientCertificates) {
@@ -766,9 +796,11 @@ const paramsThatAllowContextReuse: (keyof channels.BrowserNewContextForReusePara
   'colorScheme',
   'forcedColors',
   'reducedMotion',
+  'contrast',
   'screen',
   'userAgent',
   'viewport',
+  'testIdAttributeName',
 ];
 
 const defaultNewContextParamValues: channels.BrowserNewContextForReuseParams = {
diff --git a/packages/playwright-core/src/server/browserType.ts b/packages/playwright-core/src/server/browserType.ts
index 24a057ebf9db6..4f6491e11cfea 100644
--- a/packages/playwright-core/src/server/browserType.ts
+++ b/packages/playwright-core/src/server/browserType.ts
@@ -15,31 +15,34 @@
  */
 
 import fs from 'fs';
-import * as os from 'os';
+import os from 'os';
 import path from 'path';
-import type { BrowserContext } from './browserContext';
-import { createClientCertificatesProxyIfNeeded, normalizeProxySettings, validateBrowserContextOptions } from './browserContext';
-import type { BrowserName } from './registry';
+
+import { normalizeProxySettings, validateBrowserContextOptions } from './browserContext';
+import { debugMode } from './utils/debug';
+import { assert } from '../utils/isomorphic/assert';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
+import { DEFAULT_PLAYWRIGHT_TIMEOUT } from '../utils/isomorphic/time';
+import { existsAsync } from './utils/fileUtils';
+import { helper } from './helper';
+import { SdkObject } from './instrumentation';
+import { PipeTransport } from './pipeTransport';
+import { envArrayToObject, launchProcess } from './utils/processLauncher';
+import {  isProtocolError } from './protocolError';
 import { registry } from './registry';
-import type { ConnectionTransport } from './transport';
+import { ClientCertificatesProxy } from './socksClientCertificatesInterceptor';
 import { WebSocketTransport } from './transport';
-import type { BrowserOptions, Browser, BrowserProcess } from './browser';
-import type { Env } from '../utils/processLauncher';
-import { launchProcess, envArrayToObject } from '../utils/processLauncher';
-import { PipeTransport } from './pipeTransport';
+import { RecentLogsCollector } from './utils/debugLogger';
+
+import type { Browser, BrowserOptions, BrowserProcess } from './browser';
+import type { BrowserContext } from './browserContext';
+import type { Env } from './utils/processLauncher';
 import type { Progress } from './progress';
-import { ProgressController } from './progress';
+import type { ProtocolError } from './protocolError';
+import type { BrowserName } from './registry';
+import type { ConnectionTransport } from './transport';
 import type * as types from './types';
 import type * as channels from '@protocol/channels';
-import { DEFAULT_TIMEOUT, TimeoutSettings } from '../common/timeoutSettings';
-import { debugMode } from '../utils';
-import { existsAsync } from '../utils/fileUtils';
-import { helper } from './helper';
-import { RecentLogsCollector } from '../utils/debugLogger';
-import type { CallMetadata } from './instrumentation';
-import { SdkObject } from './instrumentation';
-import { ManualPromise } from '../utils/manualPromise';
-import { type ProtocolError, isProtocolError } from './protocolError';
 
 export const kNoXServerRunningError = 'Looks like you launched a headed browser without having a XServer running.\n' +
   'Set either \'headless: true\' or use \'xvfb-run <your-playwright-app>\' before running Playwright.\n\n<3 Playwright Team';
@@ -51,6 +54,7 @@ export abstract class BrowserType extends SdkObject {
     super(parent, 'browser-type');
     this.attribution.browserType = this;
     this._name = browserName;
+    this.logName = 'browser';
   }
 
   executablePath(): string {
@@ -61,38 +65,35 @@ export abstract class BrowserType extends SdkObject {
     return this._name;
   }
 
-  async launch(metadata: CallMetadata, options: types.LaunchOptions, protocolLogger?: types.ProtocolLogger): Promise<Browser> {
+  async launch(progress: Progress, options: types.LaunchOptions, protocolLogger?: types.ProtocolLogger): Promise<Browser> {
     options = this._validateLaunchOptions(options);
-    const controller = new ProgressController(metadata, this);
-    controller.setLogName('browser');
-    const browser = await controller.run(progress => {
-      const seleniumHubUrl = (options as any).__testHookSeleniumRemoteURL || process.env.SELENIUM_REMOTE_URL;
-      if (seleniumHubUrl)
-        return this._launchWithSeleniumHub(progress, seleniumHubUrl, options);
-      return this._innerLaunchWithRetries(progress, options, undefined, helper.debugProtocolLogger(protocolLogger)).catch(e => { throw this._rewriteStartupLog(e); });
-    }, TimeoutSettings.launchTimeout(options));
-    return browser;
+    const seleniumHubUrl = (options as any).__testHookSeleniumRemoteURL || process.env.SELENIUM_REMOTE_URL;
+    if (seleniumHubUrl)
+      return this._launchWithSeleniumHub(progress, seleniumHubUrl, options);
+    return this._innerLaunchWithRetries(progress, options, undefined, helper.debugProtocolLogger(protocolLogger)).catch(e => { throw this._rewriteStartupLog(e); });
   }
 
-  async launchPersistentContext(metadata: CallMetadata, userDataDir: string, options: channels.BrowserTypeLaunchPersistentContextOptions & { useWebSocket?: boolean }): Promise<BrowserContext> {
-    options = this._validateLaunchOptions(options);
-    const controller = new ProgressController(metadata, this);
-    const persistent: channels.BrowserNewContextParams = { ...options };
-    controller.setLogName('browser');
-    const browser = await controller.run(async progress => {
-      // Note: Any initial TLS requests will fail since we rely on the Page/Frames initialize which sets ignoreHTTPSErrors.
-      const clientCertificatesProxy = await createClientCertificatesProxyIfNeeded(persistent);
-      if (clientCertificatesProxy)
-        options.proxy = persistent.proxy;
-      progress.cleanupWhenAborted(() => clientCertificatesProxy?.close());
-      const browser = await this._innerLaunchWithRetries(progress, options, persistent, helper.debugProtocolLogger(), userDataDir).catch(e => { throw this._rewriteStartupLog(e); });
+  async launchPersistentContext(progress: Progress, userDataDir: string, options: channels.BrowserTypeLaunchPersistentContextOptions & { cdpPort?: number, internalIgnoreHTTPSErrors?: boolean, socksProxyPort?: number }): Promise<BrowserContext> {
+    const launchOptions = this._validateLaunchOptions(options);
+    // Note: Any initial TLS requests will fail since we rely on the Page/Frames initialize which sets ignoreHTTPSErrors.
+    let clientCertificatesProxy: ClientCertificatesProxy | undefined;
+    if (options.clientCertificates?.length) {
+      clientCertificatesProxy = await ClientCertificatesProxy.create(progress, options);
+      launchOptions.proxyOverride = clientCertificatesProxy.proxySettings();
+      options = { ...options };
+      options.internalIgnoreHTTPSErrors = true;
+    }
+    try {
+      const browser = await this._innerLaunchWithRetries(progress, launchOptions, options, helper.debugProtocolLogger(), userDataDir).catch(e => { throw this._rewriteStartupLog(e); });
       browser._defaultContext!._clientCertificatesProxy = clientCertificatesProxy;
-      return browser;
-    }, TimeoutSettings.launchTimeout(options));
-    return browser._defaultContext!;
+      return browser._defaultContext!;
+    } catch (error) {
+      await clientCertificatesProxy?.close().catch(() => {});
+      throw error;
+    }
   }
 
-  async _innerLaunchWithRetries(progress: Progress, options: types.LaunchOptions, persistent: channels.BrowserNewContextParams | undefined, protocolLogger: types.ProtocolLogger, userDataDir?: string): Promise<Browser> {
+  async _innerLaunchWithRetries(progress: Progress, options: types.LaunchOptions, persistent: types.BrowserContextOptions | undefined, protocolLogger: types.ProtocolLogger, userDataDir?: string): Promise<Browser> {
     try {
       return await this._innerLaunch(progress, options, persistent, protocolLogger, userDataDir);
     } catch (error) {
@@ -106,61 +107,61 @@ export abstract class BrowserType extends SdkObject {
     }
   }
 
-  async _innerLaunch(progress: Progress, options: types.LaunchOptions, persistent: channels.BrowserNewContextParams | undefined, protocolLogger: types.ProtocolLogger, maybeUserDataDir?: string): Promise<Browser> {
+  async _innerLaunch(progress: Progress, options: types.LaunchOptions, persistent: types.BrowserContextOptions | undefined, protocolLogger: types.ProtocolLogger, maybeUserDataDir?: string): Promise<Browser> {
     options.proxy = options.proxy ? normalizeProxySettings(options.proxy) : undefined;
     const browserLogsCollector = new RecentLogsCollector();
     const { browserProcess, userDataDir, artifactsDir, transport } = await this._launchProcess(progress, options, !!persistent, browserLogsCollector, maybeUserDataDir);
-    if ((options as any).__testHookBeforeCreateBrowser)
-      await (options as any).__testHookBeforeCreateBrowser();
-    const browserOptions: BrowserOptions = {
-      name: this._name,
-      isChromium: this._name === 'chromium',
-      channel: options.channel,
-      slowMo: options.slowMo,
-      persistent,
-      headful: !options.headless,
-      artifactsDir,
-      downloadsPath: (options.downloadsPath || artifactsDir)!,
-      tracesDir: (options.tracesDir || artifactsDir)!,
-      browserProcess,
-      customExecutablePath: options.executablePath,
-      proxy: options.proxy,
-      protocolLogger,
-      browserLogsCollector,
-      wsEndpoint: options.useWebSocket ? (transport as WebSocketTransport).wsEndpoint : undefined,
-      originalLaunchOptions: options,
-    };
-    if (persistent)
-      validateBrowserContextOptions(persistent, browserOptions);
-    copyTestHooks(options, browserOptions);
-    const browser = await this._connectToTransport(transport, browserOptions);
-    (browser as any)._userDataDirForTest = userDataDir;
-    // We assume no control when using custom arguments, and do not prepare the default context in that case.
-    if (persistent && !options.ignoreAllDefaultArgs)
-      await browser._defaultContext!._loadDefaultContext(progress);
-    return browser;
+    try {
+      if ((options as any).__testHookBeforeCreateBrowser)
+        await progress.race((options as any).__testHookBeforeCreateBrowser());
+      const browserOptions: BrowserOptions = {
+        name: this._name,
+        isChromium: this._name === 'chromium',
+        channel: options.channel,
+        slowMo: options.slowMo,
+        persistent,
+        headful: !options.headless,
+        artifactsDir,
+        downloadsPath: (options.downloadsPath || artifactsDir)!,
+        tracesDir: (options.tracesDir || artifactsDir)!,
+        browserProcess,
+        customExecutablePath: options.executablePath,
+        proxy: options.proxy,
+        protocolLogger,
+        browserLogsCollector,
+        wsEndpoint: transport instanceof WebSocketTransport ? transport.wsEndpoint : undefined,
+        originalLaunchOptions: options,
+      };
+      if (persistent)
+        validateBrowserContextOptions(persistent, browserOptions);
+      copyTestHooks(options, browserOptions);
+      const browser = await progress.race(this.connectToTransport(transport, browserOptions, browserLogsCollector));
+      (browser as any)._userDataDirForTest = userDataDir;
+      // We assume no control when using custom arguments, and do not prepare the default context in that case.
+      if (persistent && !options.ignoreAllDefaultArgs)
+        await browser._defaultContext!._loadDefaultContext(progress);
+      return browser;
+    } catch (error) {
+      await browserProcess.close().catch(() => {});
+      throw error;
+    }
   }
 
-  private async _launchProcess(progress: Progress, options: types.LaunchOptions, isPersistent: boolean, browserLogsCollector: RecentLogsCollector, userDataDir?: string): Promise<{ browserProcess: BrowserProcess, artifactsDir: string, userDataDir: string, transport: ConnectionTransport }> {
+  private async _prepareToLaunch(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string | undefined) {
     const {
       ignoreDefaultArgs,
       ignoreAllDefaultArgs,
       args = [],
       executablePath = null,
-      handleSIGINT = true,
-      handleSIGTERM = true,
-      handleSIGHUP = true,
     } = options;
-
-    const env = options.env ? envArrayToObject(options.env) : process.env;
-
     await this._createArtifactDirs(options);
 
-    const tempDirectories = [];
+    const tempDirectories: string[] = [];
     const artifactsDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-artifacts-'));
     tempDirectories.push(artifactsDir);
 
     if (userDataDir) {
+      assert(path.isAbsolute(userDataDir), 'userDataDir must be an absolute path');
       // Firefox bails if the profile directory does not exist, Chrome creates it. We ensure consistent behavior here.
       if (!await existsAsync(userDataDir))
         await fs.promises.mkdir(userDataDir, { recursive: true, mode: 0o700 });
@@ -168,14 +169,15 @@ export abstract class BrowserType extends SdkObject {
       userDataDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), `playwright_${this._name}dev_profile-`));
       tempDirectories.push(userDataDir);
     }
+    await this.prepareUserDataDir(options, userDataDir);
 
-    const browserArguments = [];
+    const browserArguments: string[] = [];
     if (ignoreAllDefaultArgs)
       browserArguments.push(...args);
     else if (ignoreDefaultArgs)
-      browserArguments.push(...this._defaultArgs(options, isPersistent, userDataDir).filter(arg => ignoreDefaultArgs.indexOf(arg) === -1));
+      browserArguments.push(...this.defaultArgs(options, isPersistent, userDataDir).filter(arg => ignoreDefaultArgs.indexOf(arg) === -1));
     else
-      browserArguments.push(...this._defaultArgs(options, isPersistent, userDataDir));
+      browserArguments.push(...this.defaultArgs(options, isPersistent, userDataDir));
 
     let executable: string;
     if (executablePath) {
@@ -183,54 +185,62 @@ export abstract class BrowserType extends SdkObject {
         throw new Error(`Failed to launch ${this._name} because executable doesn't exist at ${executablePath}`);
       executable = executablePath;
     } else {
-      const registryExecutable = registry.findExecutable(options.channel || this._name);
+      const registryExecutable = registry.findExecutable(this.getExecutableName(options));
       if (!registryExecutable || registryExecutable.browserName !== this._name)
         throw new Error(`Unsupported ${this._name} channel "${options.channel}"`);
       executable = registryExecutable.executablePathOrDie(this.attribution.playwright.options.sdkLanguage);
       await registry.validateHostRequirementsForExecutablesIfNeeded([registryExecutable], this.attribution.playwright.options.sdkLanguage);
     }
 
-    const waitForWSEndpoint = (options.useWebSocket || options.args?.some(a => a.startsWith('--remote-debugging-port'))) ? new ManualPromise<string>() : undefined;
-    const waitForJuggler = this._name === 'firefox' ? new ManualPromise<void>() : undefined;
+    return { executable, browserArguments, userDataDir, artifactsDir, tempDirectories };
+  }
+
+  private async _launchProcess(progress: Progress, options: types.LaunchOptions, isPersistent: boolean, browserLogsCollector: RecentLogsCollector, userDataDir?: string): Promise<{ browserProcess: BrowserProcess, artifactsDir: string, userDataDir: string, transport: ConnectionTransport }> {
+    const {
+      handleSIGINT = true,
+      handleSIGTERM = true,
+      handleSIGHUP = true,
+    } = options;
+
+    const env = options.env ? envArrayToObject(options.env) : process.env;
+    const prepared = await progress.race(this._prepareToLaunch(options, isPersistent, userDataDir));
+
     // Note: it is important to define these variables before launchProcess, so that we don't get
     // "Cannot access 'browserServer' before initialization" if something went wrong.
     let transport: ConnectionTransport | undefined = undefined;
     let browserProcess: BrowserProcess | undefined = undefined;
+    const exitPromise = new ManualPromise();
     const { launchedProcess, gracefullyClose, kill } = await launchProcess({
-      command: executable,
-      args: browserArguments,
-      env: this._amendEnvironment(env, userDataDir, executable, browserArguments),
+      command: prepared.executable,
+      args: prepared.browserArguments,
+      env: this.amendEnvironment(env, prepared.userDataDir, isPersistent),
       handleSIGINT,
       handleSIGTERM,
       handleSIGHUP,
       log: (message: string) => {
-        if (waitForWSEndpoint) {
-          const match = message.match(/DevTools listening on (.*)/);
-          if (match)
-            waitForWSEndpoint.resolve(match[1]);
-        }
-        if (waitForJuggler && message.includes('Juggler listening to the pipe'))
-          waitForJuggler.resolve();
         progress.log(message);
         browserLogsCollector.log(message);
       },
       stdio: 'pipe',
-      tempDirectories,
+      tempDirectories: prepared.tempDirectories,
       attemptToGracefullyClose: async () => {
         if ((options as any).__testHookGracefullyClose)
           await (options as any).__testHookGracefullyClose();
-        // We try to gracefully close to prevent crash reporting and core dumps.
-        // Note that it's fine to reuse the pipe transport, since
-        // our connection ignores kBrowserCloseMessageId.
-        this._attemptToGracefullyCloseBrowser(transport!);
+        if (transport) {
+          // We try to gracefully close to prevent crash reporting and core dumps.
+          this.attemptToGracefullyCloseBrowser(transport);
+        } else {
+          throw new Error('Force-killing the browser because no transport is available to gracefully close it.');
+        }
       },
       onExit: (exitCode, signal) => {
         // Unblock launch when browser prematurely exits.
-        waitForJuggler?.resolve();
+        exitPromise.resolve();
         if (browserProcess && browserProcess.onclose)
           browserProcess.onclose(exitCode, signal);
       },
     });
+
     async function closeOrKill(timeout: number): Promise<void> {
       let timer: NodeJS.Timeout;
       try {
@@ -247,19 +257,25 @@ export abstract class BrowserType extends SdkObject {
     browserProcess = {
       onclose: undefined,
       process: launchedProcess,
-      close: () => closeOrKill((options as any).__testHookBrowserCloseTimeout || DEFAULT_TIMEOUT),
+      close: () => closeOrKill((options as any).__testHookBrowserCloseTimeout || DEFAULT_PLAYWRIGHT_TIMEOUT),
       kill
     };
-    progress.cleanupWhenAborted(() => closeOrKill(progress.timeUntilDeadline()));
-    const wsEndpoint = await waitForWSEndpoint;
-    await waitForJuggler;
-    if (options.useWebSocket) {
-      transport = await WebSocketTransport.connect(progress, wsEndpoint!);
-    } else {
-      const stdio = launchedProcess.stdio as unknown as [NodeJS.ReadableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.ReadableStream];
-      transport = new PipeTransport(stdio[3], stdio[4]);
+    try {
+      const { wsEndpoint } = await progress.race([
+        this.waitForReadyState(options, browserLogsCollector),
+        exitPromise.then(() => ({ wsEndpoint: undefined })),
+      ]);
+      if (options.cdpPort !== undefined || !this.supportsPipeTransport()) {
+        transport = await WebSocketTransport.connect(progress, wsEndpoint!);
+      } else {
+        const stdio = launchedProcess.stdio as unknown as [NodeJS.ReadableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.WritableStream, NodeJS.ReadableStream];
+        transport = new PipeTransport(stdio[3], stdio[4]);
+      }
+      return { browserProcess, artifactsDir: prepared.artifactsDir, userDataDir: prepared.userDataDir, transport };
+    } catch (error) {
+      await closeOrKill(DEFAULT_PLAYWRIGHT_TIMEOUT).catch(() => {});
+      throw error;
     }
-    return { browserProcess, artifactsDir, userDataDir, transport };
   }
 
   async _createArtifactDirs(options: types.LaunchOptions): Promise<void> {
@@ -269,7 +285,7 @@ export abstract class BrowserType extends SdkObject {
       await fs.promises.mkdir(options.tracesDir, { recursive: true });
   }
 
-  async connectOverCDP(metadata: CallMetadata, endpointURL: string, options: { slowMo?: number }, timeout?: number): Promise<Browser> {
+  async connectOverCDP(progress: Progress, endpointURL: string, options: { slowMo?: number, timeout?: number, headers?: types.HeadersArray }): Promise<Browser> {
     throw new Error('CDP connections are only supported by Chromium');
   }
 
@@ -277,15 +293,15 @@ export abstract class BrowserType extends SdkObject {
     throw new Error('Connecting to SELENIUM_REMOTE_URL is only supported by Chromium');
   }
 
-  private _validateLaunchOptions<Options extends types.LaunchOptions>(options: Options): Options {
+  private _validateLaunchOptions(options: types.LaunchOptions): types.LaunchOptions {
     const { devtools = false } = options;
     let { headless = !devtools, downloadsPath, proxy } = options;
-    if (debugMode())
+    if (debugMode() === 'inspector')
       headless = false;
     if (downloadsPath && !path.isAbsolute(downloadsPath))
       downloadsPath = path.join(process.cwd(), downloadsPath);
-    if (this.attribution.playwright.options.socksProxyPort)
-      proxy = { server: `socks5://127.0.0.1:${this.attribution.playwright.options.socksProxyPort}` };
+    if (options.socksProxyPort)
+      proxy = { server: `socks5://127.0.0.1:${options.socksProxyPort}` };
     return { ...options, devtools, headless, downloadsPath, proxy };
   }
 
@@ -305,14 +321,29 @@ export abstract class BrowserType extends SdkObject {
   _rewriteStartupLog(error: Error): Error {
     if (!isProtocolError(error))
       return error;
-    return this._doRewriteStartupLog(error);
+    return this.doRewriteStartupLog(error);
+  }
+
+  async waitForReadyState(options: types.LaunchOptions, browserLogsCollector: RecentLogsCollector): Promise<{ wsEndpoint?: string }> {
+    return {};
+  }
+
+  async prepareUserDataDir(options: types.LaunchOptions, userDataDir: string): Promise<void> {
+  }
+
+  supportsPipeTransport(): boolean {
+    return true;
+  }
+
+  getExecutableName(options: types.LaunchOptions): string {
+    return options.channel || this._name;
   }
 
-  abstract _defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[];
-  abstract _connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<Browser>;
-  abstract _amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env;
-  abstract _doRewriteStartupLog(error: ProtocolError): ProtocolError;
-  abstract _attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void;
+  abstract defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[];
+  abstract connectToTransport(transport: ConnectionTransport, options: BrowserOptions, browserLogsCollector: RecentLogsCollector): Promise<Browser>;
+  abstract amendEnvironment(env: Env, userDataDir: string, isPersistent: boolean): Env;
+  abstract doRewriteStartupLog(error: ProtocolError): ProtocolError;
+  abstract attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void;
 }
 
 function copyTestHooks(from: object, to: object) {
diff --git a/packages/playwright-core/src/server/callLog.ts b/packages/playwright-core/src/server/callLog.ts
new file mode 100644
index 0000000000000..4de5a907d6029
--- /dev/null
+++ b/packages/playwright-core/src/server/callLog.ts
@@ -0,0 +1,88 @@
+/**
+ * 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 function compressCallLog(log: string[]): string[] {
+  const lines: string[] = [];
+
+  for (const block of findRepeatedSubsequences(log)) {
+    for (let i = 0; i < block.sequence.length; i++) {
+      const line = block.sequence[i];
+      const leadingWhitespace = line.match(/^\s*/);
+      const whitespacePrefix = '  ' + leadingWhitespace?.[0] || '';
+      const countPrefix = `${block.count} × `;
+      if (block.count > 1 && i === 0)
+        lines.push(whitespacePrefix + countPrefix + line.trim());
+      else if (block.count > 1)
+        lines.push(whitespacePrefix + ' '.repeat(countPrefix.length - 2) + '- ' + line.trim());
+      else
+        lines.push(whitespacePrefix + '- ' + line.trim());
+    }
+  }
+  return lines;
+}
+
+function findRepeatedSubsequences(s: string[]): { sequence: string[]; count: number }[] {
+  const n = s.length;
+  const result = [];
+  let i = 0;
+
+  const arraysEqual = (a1: string[], a2: string[]) => {
+    if (a1.length !== a2.length)
+      return false;
+    for (let j = 0; j < a1.length; j++) {
+      if (a1[j] !== a2[j])
+        return false;
+    }
+
+    return true;
+  };
+
+  while (i < n) {
+    let maxRepeatCount = 1;
+    let maxRepeatSubstr = [s[i]]; // Initialize with the element at index i
+    let maxRepeatLength = 1;
+
+    // Try substrings of length from 1 to the remaining length of the array
+    for (let p = 1; p <= n - i; p++) {
+      const substr = s.slice(i, i + p); // Extract substring as array
+      let k = 1;
+
+      // Count how many times the substring repeats consecutively
+      while (
+        i + p * k <= n &&
+        arraysEqual(s.slice(i + p * (k - 1), i + p * k), substr)
+      )
+        k += 1;
+
+      k -= 1; // Adjust k since it increments one extra time in the loop
+
+      // Update the maximal repeating substring if necessary
+      if (k > 1 && (k * p) > (maxRepeatCount * maxRepeatLength)) {
+        maxRepeatCount = k;
+        maxRepeatSubstr = substr;
+        maxRepeatLength = p;
+      }
+    }
+
+    // Record the substring and its count
+    result.push({ sequence: maxRepeatSubstr, count: maxRepeatCount });
+    i += maxRepeatLength * maxRepeatCount; // Move index forward
+  }
+
+  return result;
+}
+
+export const findRepeatedSubsequencesForTest = findRepeatedSubsequences;
diff --git a/packages/playwright-core/src/server/chromium/chromium.ts b/packages/playwright-core/src/server/chromium/chromium.ts
index e745cca214135..60d9ccdbe3cb3 100644
--- a/packages/playwright-core/src/server/chromium/chromium.ts
+++ b/packages/playwright-core/src/server/chromium/chromium.ts
@@ -18,37 +18,36 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import type stream from 'stream';
+
+import { chromiumSwitches } from './chromiumSwitches';
 import { CRBrowser } from './crBrowser';
-import type { Env } from '../../utils/processLauncher';
-import { gracefullyCloseSet } from '../../utils/processLauncher';
 import { kBrowserCloseMessageId } from './crConnection';
+import { debugMode, headersArrayToObject, headersObjectToArray, } from '../../utils';
+import { wrapInASCIIBox } from '../utils/ascii';
+import { RecentLogsCollector } from '../utils/debugLogger';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { fetchData } from '../utils/network';
+import { getUserAgent } from '../utils/userAgent';
+import { validateBrowserContextOptions } from '../browserContext';
 import { BrowserType, kNoXServerRunningError } from '../browserType';
-import type { ConnectionTransport, ProtocolRequest } from '../transport';
+import { helper } from '../helper';
+import { registry } from '../registry';
 import { WebSocketTransport } from '../transport';
 import { CRDevTools } from './crDevTools';
-import type { BrowserOptions, BrowserProcess } from '../browser';
 import { Browser } from '../browser';
-import type * as types from '../types';
-import type * as channels from '@protocol/channels';
-import type { HTTPRequestParams } from '../../utils/network';
-import { fetchData } from '../../utils/network';
-import { getUserAgent } from '../../utils/userAgent';
-import { wrapInASCIIBox } from '../../utils/ascii';
-import { debugMode, headersArrayToObject, headersObjectToArray, } from '../../utils';
-import { removeFolders } from '../../utils/fileUtils';
-import { RecentLogsCollector } from '../../utils/debugLogger';
+import { removeFolders } from '../utils/fileUtils';
+import { gracefullyCloseSet } from '../utils/processLauncher';
+
+import type { HTTPRequestParams } from '../utils/network';
+import type { BrowserOptions, BrowserProcess } from '../browser';
+import type { SdkObject } from '../instrumentation';
+import type { Env } from '../utils/processLauncher';
 import type { Progress } from '../progress';
-import { ProgressController } from '../progress';
-import { TimeoutSettings } from '../../common/timeoutSettings';
-import { helper } from '../helper';
-import type { CallMetadata, SdkObject } from '../instrumentation';
-import type http from 'http';
-import { registry } from '../registry';
-import { ManualPromise } from '../../utils/manualPromise';
-import { validateBrowserContextOptions } from '../browserContext';
-import { chromiumSwitches } from './chromiumSwitches';
 import type { ProtocolError } from '../protocolError';
+import type { ConnectionTransport, ProtocolRequest } from '../transport';
+import type * as types from '../types';
+import type http from 'http';
+import type stream from 'stream';
 
 const ARTIFACTS_FOLDER = path.join(os.tmpdir(), 'playwright-artifacts-');
 
@@ -58,16 +57,12 @@ export class Chromium extends BrowserType {
   constructor(parent: SdkObject) {
     super(parent, 'chromium');
 
-    if (debugMode())
+    if (debugMode() === 'inspector')
       this._devtools = this._createDevTools();
   }
 
-  override async connectOverCDP(metadata: CallMetadata, endpointURL: string, options: { slowMo?: number, headers?: types.HeadersArray }, timeout?: number) {
-    const controller = new ProgressController(metadata, this);
-    controller.setLogName('browser');
-    return controller.run(async progress => {
-      return await this._connectOverCDPInternal(progress, endpointURL, options);
-    }, TimeoutSettings.timeout({ timeout }));
+  override async connectOverCDP(progress: Progress, endpointURL: string, options: { slowMo?: number, headers?: types.HeadersArray }) {
+    return await this._connectOverCDPInternal(progress, endpointURL, options);
   }
 
   async _connectOverCDPInternal(progress: Progress, endpointURL: string, options: types.LaunchOptions & { headers?: types.HeadersArray }, onClose?: () => Promise<void>) {
@@ -80,49 +75,48 @@ export class Chromium extends BrowserType {
     else if (headersMap && !Object.keys(headersMap).some(key => key.toLowerCase() === 'user-agent'))
       headersMap['User-Agent'] = getUserAgent();
 
-    const artifactsDir = await fs.promises.mkdtemp(ARTIFACTS_FOLDER);
-
-    const wsEndpoint = await urlToWSEndpoint(progress, endpointURL, headersMap);
-    progress.throwIfAborted();
-
-    const chromeTransport = await WebSocketTransport.connect(progress, wsEndpoint, headersMap);
-    const cleanedUp = new ManualPromise<void>();
+    const artifactsDir = await progress.race(fs.promises.mkdtemp(ARTIFACTS_FOLDER));
     const doCleanup = async () => {
       await removeFolders([artifactsDir]);
-      await onClose?.();
-      cleanedUp.resolve();
+      const cb = onClose;
+      onClose = undefined; // Make sure to only call onClose once.
+      await cb?.();
     };
+
+    let chromeTransport: WebSocketTransport | undefined;
     const doClose = async () => {
-      await chromeTransport.closeAndWait();
-      await cleanedUp;
+      await chromeTransport?.closeAndWait();
+      await doCleanup();
     };
-    const browserProcess: BrowserProcess = { close: doClose, kill: doClose };
-    const persistent: channels.BrowserNewContextParams = { noDefaultViewport: true };
-    const browserOptions: BrowserOptions = {
-      slowMo: options.slowMo,
-      name: 'chromium',
-      isChromium: true,
-      persistent,
-      browserProcess,
-      protocolLogger: helper.debugProtocolLogger(),
-      browserLogsCollector: new RecentLogsCollector(),
-      artifactsDir,
-      downloadsPath: options.downloadsPath || artifactsDir,
-      tracesDir: options.tracesDir || artifactsDir,
-      // On Windows context level proxies only work, if there isn't a global proxy
-      // set. This is currently a bug in the CR/Windows networking stack. By
-      // passing an arbitrary value we disable the check in PW land which warns
-      // users in normal (launch/launchServer) mode since otherwise connectOverCDP
-      // does not work at all with proxies on Windows.
-      proxy: { server: 'per-context' },
-      originalLaunchOptions: {},
-    };
-    validateBrowserContextOptions(persistent, browserOptions);
-    progress.throwIfAborted();
-    const browser = await CRBrowser.connect(this.attribution.playwright, chromeTransport, browserOptions);
-    browser._isCollocatedWithServer = false;
-    browser.on(Browser.Events.Disconnected, doCleanup);
-    return browser;
+
+    try {
+      const wsEndpoint = await urlToWSEndpoint(progress, endpointURL, headersMap);
+      chromeTransport = await WebSocketTransport.connect(progress, wsEndpoint, { headers: headersMap });
+
+      const browserProcess: BrowserProcess = { close: doClose, kill: doClose };
+      const persistent: types.BrowserContextOptions = { noDefaultViewport: true };
+      const browserOptions: BrowserOptions = {
+        slowMo: options.slowMo,
+        name: 'chromium',
+        isChromium: true,
+        persistent,
+        browserProcess,
+        protocolLogger: helper.debugProtocolLogger(),
+        browserLogsCollector: new RecentLogsCollector(),
+        artifactsDir,
+        downloadsPath: options.downloadsPath || artifactsDir,
+        tracesDir: options.tracesDir || artifactsDir,
+        originalLaunchOptions: {},
+      };
+      validateBrowserContextOptions(persistent, browserOptions);
+      const browser = await progress.race(CRBrowser.connect(this.attribution.playwright, chromeTransport, browserOptions));
+      browser._isCollocatedWithServer = false;
+      browser.on(Browser.Events.Disconnected, doCleanup);
+      return browser;
+    } catch (error) {
+      await doClose().catch(() => {});
+      throw error;
+    }
   }
 
   private _createDevTools() {
@@ -131,16 +125,26 @@ export class Chromium extends BrowserType {
     return directory ? new CRDevTools(path.join(directory, 'devtools-preferences.json')) : undefined;
   }
 
-  async _connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<CRBrowser> {
+  override async connectToTransport(transport: ConnectionTransport, options: BrowserOptions, browserLogsCollector: RecentLogsCollector): Promise<CRBrowser> {
     let devtools = this._devtools;
     if ((options as any).__testHookForDevTools) {
       devtools = this._createDevTools();
       await (options as any).__testHookForDevTools(devtools);
     }
-    return CRBrowser.connect(this.attribution.playwright, transport, options, devtools);
+    try {
+      return await CRBrowser.connect(this.attribution.playwright, transport, options, devtools);
+    } catch (e) {
+      if (browserLogsCollector.recentLogs().some(log => log.includes('Failed to create a ProcessSingleton for your profile directory.'))) {
+        throw new Error(
+            'Failed to create a ProcessSingleton for your profile directory. ' +
+            'This usually means that the profile is already in use by another instance of Chromium.'
+        );
+      }
+      throw e;
+    }
   }
 
-  _doRewriteStartupLog(error: ProtocolError): ProtocolError {
+  override doRewriteStartupLog(error: ProtocolError): ProtocolError {
     if (!error.logs)
       return error;
     if (error.logs.includes('Missing X server'))
@@ -161,17 +165,18 @@ export class Chromium extends BrowserType {
     return error;
   }
 
-  _amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
+  override amendEnvironment(env: Env): Env {
     return env;
   }
 
-  _attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+  override attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+    // Note that it's fine to reuse the transport, since our connection ignores kBrowserCloseMessageId.
     const message: ProtocolRequest = { method: 'Browser.close', id: kBrowserCloseMessageId, params: {} };
     transport.send(message);
   }
 
   override async _launchWithSeleniumHub(progress: Progress, hubUrl: string, options: types.LaunchOptions): Promise<CRBrowser> {
-    await this._createArtifactDirs(options);
+    await progress.race(this._createArtifactDirs(options));
 
     if (!hubUrl.endsWith('/'))
       hubUrl = hubUrl + '/';
@@ -198,7 +203,7 @@ export class Chromium extends BrowserType {
     }
 
     progress.log(`<selenium> connecting to ${hubUrl}`);
-    const response = await fetchData({
+    const response = await fetchData(progress, {
       url: hubUrl + 'session',
       method: 'POST',
       headers: {
@@ -208,7 +213,6 @@ export class Chromium extends BrowserType {
       data: JSON.stringify({
         capabilities: { alwaysMatch: desiredCapabilities }
       }),
-      timeout: progress.timeUntilDeadline(),
     }, seleniumErrorHandler);
     const value = JSON.parse(response).value;
     const sessionId = value.sessionId;
@@ -216,7 +220,8 @@ export class Chromium extends BrowserType {
 
     const disconnectFromSelenium = async () => {
       progress.log(`<selenium> disconnecting from sessionId=${sessionId}`);
-      await fetchData({
+      // Do not pass "progress" to disconnect even after the progress has aborted.
+      await fetchData(undefined, {
         url: hubUrl + 'session/' + sessionId,
         method: 'DELETE',
         headers,
@@ -252,10 +257,9 @@ export class Chromium extends BrowserType {
         if (endpointURL.hostname === 'localhost' || endpointURL.hostname === '127.0.0.1') {
           const sessionInfoUrl = new URL(hubUrl).origin + '/grid/api/testsession?session=' + sessionId;
           try {
-            const sessionResponse = await fetchData({
+            const sessionResponse = await fetchData(progress, {
               url: sessionInfoUrl,
               method: 'GET',
-              timeout: progress.timeUntilDeadline(),
               headers,
             }, seleniumErrorHandler);
             const proxyId = JSON.parse(sessionResponse).proxyId;
@@ -277,11 +281,11 @@ export class Chromium extends BrowserType {
     }
   }
 
-  _defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
+  override defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
     const chromeArguments = this._innerDefaultArgs(options);
     chromeArguments.push(`--user-data-dir=${userDataDir}`);
-    if (options.useWebSocket)
-      chromeArguments.push('--remote-debugging-port=0');
+    if (options.cdpPort !== undefined)
+      chromeArguments.push(`--remote-debugging-port=${options.cdpPort}`);
     else
       chromeArguments.push('--remote-debugging-pipe');
     if (isPersistent)
@@ -292,7 +296,7 @@ export class Chromium extends BrowserType {
   }
 
   private _innerDefaultArgs(options: types.LaunchOptions): string[] {
-    const { args = [], proxy } = options;
+    const { args = [] } = options;
     const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir'));
     if (userDataDirArg)
       throw this._createUserDataDirArgMisuseError('--user-data-dir');
@@ -300,23 +304,17 @@ export class Chromium extends BrowserType {
       throw new Error('Playwright manages remote debugging connection itself.');
     if (args.find(arg => !arg.startsWith('-')))
       throw new Error('Arguments can not specify page to be opened');
-    const chromeArguments = [...chromiumSwitches];
+    const chromeArguments = [...chromiumSwitches(options.assistantMode, options.channel)];
 
     if (os.platform() === 'darwin') {
-      // See https://github.com/microsoft/playwright/issues/7362
-      chromeArguments.push('--enable-use-zoom-for-dsf=false');
-      // See https://bugs.chromium.org/p/chromium/issues/detail?id=1407025.
-      if (options.headless)
-        chromeArguments.push('--use-angle');
+      // See https://issues.chromium.org/issues/40277080
+      chromeArguments.push('--enable-unsafe-swiftshader');
     }
 
     if (options.devtools)
       chromeArguments.push('--auto-open-devtools-for-tabs');
     if (options.headless) {
-      if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW)
-        chromeArguments.push('--headless=new');
-      else
-        chromeArguments.push('--headless=old');
+      chromeArguments.push('--headless');
 
       chromeArguments.push(
           '--hide-scrollbars',
@@ -326,18 +324,19 @@ export class Chromium extends BrowserType {
     }
     if (options.chromiumSandbox !== true)
       chromeArguments.push('--no-sandbox');
+    const proxy = options.proxyOverride || options.proxy;
     if (proxy) {
       const proxyURL = new URL(proxy.server);
       const isSocks = proxyURL.protocol === 'socks5:';
       // https://www.chromium.org/developers/design-documents/network-settings
-      if (isSocks && !this.attribution.playwright.options.socksProxyPort) {
+      if (isSocks && !options.socksProxyPort) {
         // https://www.chromium.org/developers/design-documents/network-stack/socks-proxy
         chromeArguments.push(`--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE ${proxyURL.hostname}"`);
       }
       chromeArguments.push(`--proxy-server=${proxy.server}`);
       const proxyBypassRules = [];
       // https://source.chromium.org/chromium/chromium/src/+/master:net/docs/proxy.md;l=548;drc=71698e610121078e0d1a811054dcf9fd89b49578
-      if (this.attribution.playwright.options.socksProxyPort)
+      if (options.socksProxyPort)
         proxyBypassRules.push('<-loopback>');
       if (proxy.bypass)
         proxyBypassRules.push(...proxy.bypass.split(',').map(t => t.trim()).map(t => t.startsWith('.') ? '*' + t : t));
@@ -349,14 +348,46 @@ export class Chromium extends BrowserType {
     chromeArguments.push(...args);
     return chromeArguments;
   }
+
+  override async waitForReadyState(options: types.LaunchOptions, browserLogsCollector: RecentLogsCollector): Promise<{ wsEndpoint?: string }> {
+    return waitForReadyState(options, browserLogsCollector);
+  }
+
+  override getExecutableName(options: types.LaunchOptions): string {
+    if (options.channel)
+      return options.channel;
+    return options.headless ? 'chromium-headless-shell' : 'chromium';
+  }
+}
+
+export async function waitForReadyState(options: types.LaunchOptions, browserLogsCollector: RecentLogsCollector): Promise<{ wsEndpoint?: string }> {
+  if (options.cdpPort === undefined && !options.args?.some(a => a.startsWith('--remote-debugging-port')))
+    return {};
+
+  const result = new ManualPromise<{ wsEndpoint?: string }>();
+  browserLogsCollector.onMessage(message => {
+    if (message.includes('Failed to create a ProcessSingleton for your profile directory.')) {
+      result.reject(new Error('Failed to create a ProcessSingleton for your profile directory. ' +
+        'This usually means that the profile is already in use by another instance of Chromium.'));
+    }
+    const match = message.match(/DevTools listening on (.*)/);
+    if (match)
+      result.resolve({ wsEndpoint: match[1] });
+  });
+  return result;
 }
 
 async function urlToWSEndpoint(progress: Progress, endpointURL: string, headers: { [key: string]: string; }) {
   if (endpointURL.startsWith('ws'))
     return endpointURL;
   progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
-  const httpURL = endpointURL.endsWith('/') ? `${endpointURL}json/version/` : `${endpointURL}/json/version/`;
-  const json = await fetchData({
+  const url = new URL(endpointURL);
+  if (!url.pathname.endsWith('/'))
+    url.pathname += '/';
+  url.pathname += 'json/version/';
+  const httpURL = url.toString();
+
+  const json = await fetchData(progress, {
     url: httpURL,
     headers,
   }, async (_, resp) => new Error(`Unexpected status ${resp.statusCode} when connecting to ${httpURL}.\n` +
diff --git a/packages/playwright-core/src/server/chromium/chromiumSwitches.ts b/packages/playwright-core/src/server/chromium/chromiumSwitches.ts
index 54b80a5d8288f..cedf70082c0f8 100644
--- a/packages/playwright-core/src/server/chromium/chromiumSwitches.ts
+++ b/packages/playwright-core/src/server/chromium/chromiumSwitches.ts
@@ -17,7 +17,33 @@
 
 // No dependencies as it is used from the Electron loader.
 
-export const chromiumSwitches = [
+const disabledFeatures = (assistantMode?: boolean) => [
+  // See https://github.com/microsoft/playwright/pull/10380
+  'AcceptCHFrame',
+  // See https://github.com/microsoft/playwright/issues/14047
+  'AvoidUnnecessaryBeforeUnloadCheckSync',
+  'DestroyProfileOnBrowserClose',
+  // See https://github.com/microsoft/playwright/pull/13854
+  'DialMediaRouteProvider',
+  'GlobalMediaControls',
+  // See https://github.com/microsoft/playwright/pull/27605
+  'HttpsUpgrades',
+  // Hides the Lens feature in the URL address bar. Its not working in unofficial builds.
+  'LensOverlay',
+  // See https://github.com/microsoft/playwright/pull/8162
+  'MediaRouter',
+  // See https://github.com/microsoft/playwright/issues/28023
+  'PaintHolding',
+  // See https://github.com/microsoft/playwright/issues/32230
+  'ThirdPartyStoragePartitioning',
+  // See https://github.com/microsoft/playwright/issues/16126
+  'Translate',
+  // See https://issues.chromium.org/u/1/issues/435410220
+  'AutoDeElevate',
+  assistantMode ? 'AutomationControlled' : '',
+].filter(Boolean);
+
+export const chromiumSwitches = (assistantMode?: boolean, channel?: string) => [
   '--disable-field-trial-config', // https://source.chromium.org/chromium/chromium/src/+/main:testing/variations/README.md
   '--disable-background-networking',
   '--disable-background-timer-throttling',
@@ -31,12 +57,8 @@ export const chromiumSwitches = [
   '--disable-default-apps',
   '--disable-dev-shm-usage',
   '--disable-extensions',
-  // AvoidUnnecessaryBeforeUnloadCheckSync - https://github.com/microsoft/playwright/issues/14047
-  // Translate - https://github.com/microsoft/playwright/issues/16126
-  // HttpsUpgrades - https://github.com/microsoft/playwright/pull/27605
-  // PaintHolding - https://github.com/microsoft/playwright/issues/28023
-  // PlzDedicatedWorker - https://github.com/microsoft/playwright/issues/31747
-  '--disable-features=ImprovedCookieControls,LazyFrameLoading,GlobalMediaControls,DestroyProfileOnBrowserClose,MediaRouter,DialMediaRouteProvider,AcceptCHFrame,AutoExpandDetailsElement,CertificateTransparencyComponentUpdater,AvoidUnnecessaryBeforeUnloadCheckSync,Translate,HttpsUpgrades,PaintHolding,PlzDedicatedWorker',
+  '--disable-features=' + disabledFeatures(assistantMode).join(','),
+  channel === 'chromium-tip-of-tree' ? '--enable-features=CDPScreenshotNewSurface' : '',
   '--allow-pre-commit-input',
   '--disable-hang-monitor',
   '--disable-ipc-flooding-protection',
@@ -46,7 +68,6 @@ export const chromiumSwitches = [
   '--force-color-profile=srgb',
   '--metrics-recording-only',
   '--no-first-run',
-  '--enable-automation',
   '--password-store=basic',
   '--use-mock-keychain',
   // See https://chromium-review.googlesource.com/c/chromium/src/+/2436773
@@ -56,4 +77,7 @@ export const chromiumSwitches = [
   '--disable-search-engine-choice-screen',
   // https://issues.chromium.org/41491762
   '--unsafely-disable-devtools-self-xss-warnings',
-];
+  // Edge can potentially restart on Windows (msRelaunchNoCompatLayer) which looses its file descriptors (stdout/stderr) and CDP (3/4). Disable until fixed upstream.
+  '--edge-skip-compat-layer-relaunch',
+  assistantMode ? '' : '--enable-automation',
+].filter(Boolean);
diff --git a/packages/playwright-core/src/server/chromium/crAccessibility.ts b/packages/playwright-core/src/server/chromium/crAccessibility.ts
index 30d02ee7bff01..539f3057c72a5 100644
--- a/packages/playwright-core/src/server/chromium/crAccessibility.ts
+++ b/packages/playwright-core/src/server/chromium/crAccessibility.ts
@@ -17,8 +17,8 @@
 
 import type { CRSession } from './crConnection';
 import type { Protocol } from './protocol';
-import type * as dom from '../dom';
 import type * as accessibility from '../accessibility';
+import type * as dom from '../dom';
 import type * as channels from '@protocol/channels';
 
 export async function getAccessibilityTree(client: CRSession, needle?: dom.ElementHandle): Promise<{tree: accessibility.AXNode, needle: accessibility.AXNode | null}> {
@@ -299,6 +299,6 @@ class CRAXNode implements accessibility.AXNode {
       for (const childId of node._payload.childIds || [])
         node._children.push(nodeById.get(childId)!);
     }
-    return nodeById.values().next().value;
+    return nodeById.values().next().value!;
   }
 }
diff --git a/packages/playwright-core/src/server/chromium/crBrowser.ts b/packages/playwright-core/src/server/chromium/crBrowser.ts
index 777ff2eee82fe..decbf3a86167f 100644
--- a/packages/playwright-core/src/server/chromium/crBrowser.ts
+++ b/packages/playwright-core/src/server/chromium/crBrowser.ts
@@ -15,28 +15,30 @@
  * limitations under the License.
  */
 
-import type { BrowserOptions } from '../browser';
 import path from 'path';
+
+import { assert } from '../../utils/isomorphic/assert';
+import { createGuid } from '../utils/crypto';
+import { Artifact } from '../artifact';
 import { Browser } from '../browser';
-import { assertBrowserContextIsNotOwned, BrowserContext, verifyGeolocation } from '../browserContext';
-import { assert, createGuid } from '../../utils';
+import { BrowserContext, verifyGeolocation } from '../browserContext';
+import { Frame } from '../frames';
 import * as network from '../network';
-import type { InitScript, PageBinding, PageDelegate, Worker } from '../page';
 import { Page } from '../page';
-import { Frame } from '../frames';
-import type { Dialog } from '../dialog';
-import type { ConnectionTransport } from '../transport';
-import type * as types from '../types';
-import type * as channels from '@protocol/channels';
-import type { CRSession, CDPSession } from './crConnection';
-import { ConnectionEvents, CRConnection } from './crConnection';
+import { CRConnection, ConnectionEvents } from './crConnection';
 import { CRPage } from './crPage';
 import { saveProtocolStream } from './crProtocolHelper';
-import type { Protocol } from './protocol';
-import type { CRDevTools } from './crDevTools';
 import { CRServiceWorker } from './crServiceWorker';
+
+import type { InitScript, Worker } from '../page';
+import type { ConnectionTransport } from '../transport';
+import type * as types from '../types';
+import type { CDPSession, CRSession } from './crConnection';
+import type { CRDevTools } from './crDevTools';
+import type { Protocol } from './protocol';
+import type { BrowserOptions } from '../browser';
 import type { SdkObject } from '../instrumentation';
-import { Artifact } from '../artifact';
+import type * as channels from '@protocol/channels';
 
 export class CRBrowser extends Browser {
   readonly _connection: CRConnection;
@@ -56,7 +58,7 @@ export class CRBrowser extends Browser {
   static async connect(parent: SdkObject, transport: ConnectionTransport, options: BrowserOptions, devtools?: CRDevTools): Promise<CRBrowser> {
     // Make a copy in case we need to update `headful` property below.
     options = { ...options };
-    const connection = new CRConnection(transport, options.protocolLogger, options.browserLogsCollector);
+    const connection = new CRConnection(parent, transport, options.protocolLogger, options.browserLogsCollector);
     const browser = new CRBrowser(parent, connection, options);
     browser._devtools = devtools;
     if (browser.isClank())
@@ -100,18 +102,19 @@ export class CRBrowser extends Browser {
     this._session.on('Browser.downloadProgress', this._onDownloadProgress.bind(this));
   }
 
-  async doCreateNewContext(options: channels.BrowserNewContextParams): Promise<BrowserContext> {
+  async doCreateNewContext(options: types.BrowserContextOptions): Promise<BrowserContext> {
+    const proxy = options.proxyOverride || options.proxy;
     let proxyBypassList = undefined;
-    if (options.proxy) {
+    if (proxy) {
       if (process.env.PLAYWRIGHT_DISABLE_FORCED_CHROMIUM_PROXIED_LOOPBACK)
-        proxyBypassList = options.proxy.bypass;
+        proxyBypassList = proxy.bypass;
       else
-        proxyBypassList = '<-loopback>' + (options.proxy.bypass ? `,${options.proxy.bypass}` : '');
+        proxyBypassList = '<-loopback>' + (proxy.bypass ? `,${proxy.bypass}` : '');
     }
 
     const { browserContextId } = await this._session.send('Target.createBrowserContext', {
       disposeOnDetach: true,
-      proxyServer: options.proxy ? options.proxy.server : undefined,
+      proxyServer: proxy ? proxy.server : undefined,
       proxyBypassList,
     });
     const context = new CRBrowserContext(this, browserContextId, options);
@@ -145,10 +148,10 @@ export class CRBrowser extends Browser {
   }
 
   async _waitForAllPagesToBeInitialized() {
-    await Promise.all([...this._crPages.values()].map(page => page.pageOrError()));
+    await Promise.all([...this._crPages.values()].map(crPage => crPage._page.waitForInitializedOrError()));
   }
 
-  _onAttachedToTarget({ targetInfo, sessionId, waitingForDebugger }: Protocol.Target.attachedToTargetPayload) {
+  _onAttachedToTarget({ targetInfo, sessionId }: Protocol.Target.attachedToTargetPayload) {
     if (targetInfo.type === 'browser')
       return;
     const session = this._session.createChildSession(sessionId);
@@ -241,7 +244,7 @@ export class CRBrowser extends Browser {
 
   private _findOwningPage(frameId: string) {
     for (const crPage of this._crPages.values()) {
-      const frame = crPage._page._frameManager.frame(frameId);
+      const frame = crPage._page.frameManager.frame(frameId);
       if (frame)
         return crPage;
     }
@@ -258,10 +261,10 @@ export class CRBrowser extends Browser {
     }
     page.willBeginDownload();
 
-    let originPage = page._initializedPage;
+    let originPage = page._page.initializedOrUndefined();
     // If it's a new window download, report it on the opener page.
     if (!originPage && page._opener)
-      originPage = page._opener._initializedPage;
+      originPage = page._opener._page.initializedOrUndefined();
     if (!originPage)
       return;
     this._downloadCreated(originPage, payload.guid, payload.url, payload.suggestedFilename);
@@ -284,7 +287,7 @@ export class CRBrowser extends Browser {
 
   async startTracing(page?: Page, options: { screenshots?: boolean; categories?: string[]; } = {}) {
     assert(!this._tracingRecording, 'Cannot start recording trace while already recording trace.');
-    this._tracingClient = page ? (page._delegate as CRPage)._mainFrameSession._client : this._session;
+    this._tracingClient = page ? (page.delegate as CRPage)._mainFrameSession._client : this._session;
 
     const defaultCategories = [
       '-*', 'devtools.timeline', 'v8.execute', 'disabled-by-default-devtools.timeline',
@@ -340,7 +343,7 @@ export class CRBrowserContext extends BrowserContext {
 
   declare readonly _browser: CRBrowser;
 
-  constructor(browser: CRBrowser, browserContextId: string | undefined, options: channels.BrowserNewContextParams) {
+  constructor(browser: CRBrowser, browserContextId: string | undefined, options: types.BrowserContextOptions) {
     super(browser, options, browserContextId);
     this._authenticateProxyViaCredentials();
   }
@@ -363,52 +366,68 @@ export class CRBrowserContext extends BrowserContext {
     return [...this._browser._crPages.values()].filter(crPage => crPage._browserContext === this);
   }
 
-  pages(): Page[] {
-    return this._crPages().map(crPage => crPage._initializedPage).filter(Boolean) as Page[];
+  override possiblyUninitializedPages(): Page[] {
+    return this._crPages().map(crPage => crPage._page);
   }
 
-  async newPageDelegate(): Promise<PageDelegate> {
-    assertBrowserContextIsNotOwned(this);
-
-    const oldKeys = this._browser.isClank() ? new Set(this._browser._crPages.keys()) : undefined;
-
-    let { targetId } = await this._browser._session.send('Target.createTarget', { url: 'about:blank', browserContextId: this._browserContextId });
-
-    if (oldKeys) {
-      // Chrome for Android returns tab ids (1, 2, 3, 4, 5) instead of content target ids here, work around it via the
-      // heuristic assuming that there is only one page created at a time.
-      const newKeys = new Set(this._browser._crPages.keys());
-      // Remove old keys.
-      for (const key of oldKeys)
-        newKeys.delete(key);
-      // Remove potential concurrent popups.
-      for (const key of newKeys) {
-        const page = this._browser._crPages.get(key)!;
-        if (page._opener)
-          newKeys.delete(key);
-      }
-      assert(newKeys.size === 1);
-      [targetId] = [...newKeys];
-    }
-    return this._browser._crPages.get(targetId)!;
+  override async doCreateNewPage(): Promise<Page> {
+    const { targetId } = await this._browser._session.send('Target.createTarget', { url: 'about:blank', browserContextId: this._browserContextId });
+    return this._browser._crPages.get(targetId)!._page;
   }
 
   async doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]> {
     const { cookies } = await this._browser._session.send('Storage.getCookies', { browserContextId: this._browserContextId });
     return network.filterCookies(cookies.map(c => {
-      const copy: any = { sameSite: 'Lax', ...c };
-      delete copy.size;
-      delete copy.priority;
-      delete copy.session;
-      delete copy.sameParty;
-      delete copy.sourceScheme;
-      delete copy.sourcePort;
-      return copy as channels.NetworkCookie;
+      const { name, value, domain, path, expires, httpOnly, secure, sameSite } = c;
+      const copy: channels.NetworkCookie = {
+        name,
+        value,
+        domain,
+        path,
+        expires,
+        httpOnly,
+        secure,
+        sameSite: sameSite ?? 'Lax',
+      };
+      // If hasCrossSiteAncestor is false, the cookie is a partitioned first party cookie,
+      // this is Chromium specific, see https://chromestatus.com/feature/5144832583663616
+      // and https://github.com/explainers-by-googlers/CHIPS-spec.
+      if (c.partitionKey) {
+        copy._crHasCrossSiteAncestor = c.partitionKey.hasCrossSiteAncestor;
+        copy.partitionKey = c.partitionKey.topLevelSite;
+      }
+      return copy;
     }), urls);
   }
 
   async addCookies(cookies: channels.SetNetworkCookie[]) {
-    await this._browser._session.send('Storage.setCookies', { cookies: network.rewriteCookies(cookies), browserContextId: this._browserContextId });
+    function toChromiumCookie(cookie: channels.SetNetworkCookie) {
+      const { name, value, url, domain, path, expires, httpOnly, secure, sameSite, partitionKey, _crHasCrossSiteAncestor } = cookie;
+      const copy: Protocol.Network.CookieParam = {
+        name,
+        value,
+        url,
+        domain,
+        path,
+        expires,
+        httpOnly,
+        secure,
+        sameSite
+      };
+      if (partitionKey) {
+        copy.partitionKey = {
+          topLevelSite: partitionKey,
+          // _crHasCrossSiteAncestor is non-standard, set it true by default if the cookie is partitioned.
+          hasCrossSiteAncestor: _crHasCrossSiteAncestor ?? true,
+        };
+      }
+      return copy;
+    }
+
+    await this._browser._session.send('Storage.setCookies', {
+      cookies: network.rewriteCookies(cookies).map(toChromiumCookie),
+      browserContextId: this._browserContextId
+    });
   }
 
   async doClearCookies() {
@@ -427,13 +446,13 @@ export class CRBrowserContext extends BrowserContext {
       ['accelerometer', 'sensors'],
       ['gyroscope', 'sensors'],
       ['magnetometer', 'sensors'],
-      ['accessibility-events', 'accessibilityEvents'],
       ['clipboard-read', 'clipboardReadWrite'],
       ['clipboard-write', 'clipboardSanitizedWrite'],
       ['payment-handler', 'paymentHandler'],
       // chrome-specific permissions we have.
       ['midi-sysex', 'midiSysex'],
       ['storage-access', 'storageAccess'],
+      ['local-fonts', 'localFonts'],
     ]);
     const filtered = permissions.map(permission => {
       const protocolPermission = webPermissionToProtocol.get(permission);
@@ -452,13 +471,12 @@ export class CRBrowserContext extends BrowserContext {
     verifyGeolocation(geolocation);
     this._options.geolocation = geolocation;
     for (const page of this.pages())
-      await (page._delegate as CRPage).updateGeolocation();
+      await (page.delegate as CRPage).updateGeolocation();
   }
 
-  async setExtraHTTPHeaders(headers: types.HeadersArray): Promise<void> {
-    this._options.extraHTTPHeaders = headers;
+  async doUpdateExtraHTTPHeaders(): Promise<void> {
     for (const page of this.pages())
-      await (page._delegate as CRPage).updateExtraHTTPHeaders();
+      await (page.delegate as CRPage).updateExtraHTTPHeaders();
     for (const sw of this.serviceWorkers())
       await (sw as CRServiceWorker).updateExtraHTTPHeaders();
   }
@@ -466,14 +484,13 @@ export class CRBrowserContext extends BrowserContext {
   async setUserAgent(userAgent: string | undefined): Promise<void> {
     this._options.userAgent = userAgent;
     for (const page of this.pages())
-      await (page._delegate as CRPage).updateUserAgent();
+      await (page.delegate as CRPage).updateUserAgent();
     // TODO: service workers don't have Emulation domain?
   }
 
-  async setOffline(offline: boolean): Promise<void> {
-    this._options.offline = offline;
+  async doUpdateOffline(): Promise<void> {
     for (const page of this.pages())
-      await (page._delegate as CRPage).updateOffline();
+      await (page.delegate as CRPage).updateOffline();
     for (const sw of this.serviceWorkers())
       await (sw as CRServiceWorker).updateOffline();
   }
@@ -481,36 +498,39 @@ export class CRBrowserContext extends BrowserContext {
   async doSetHTTPCredentials(httpCredentials?: types.Credentials): Promise<void> {
     this._options.httpCredentials = httpCredentials;
     for (const page of this.pages())
-      await (page._delegate as CRPage).updateHttpCredentials();
+      await (page.delegate as CRPage).updateHttpCredentials();
     for (const sw of this.serviceWorkers())
       await (sw as CRServiceWorker).updateHttpCredentials();
   }
 
   async doAddInitScript(initScript: InitScript) {
     for (const page of this.pages())
-      await (page._delegate as CRPage).addInitScript(initScript);
+      await (page.delegate as CRPage).addInitScript(initScript);
   }
 
-  async doRemoveInitScripts() {
+  async doRemoveInitScripts(initScripts: InitScript[]) {
     for (const page of this.pages())
-      await (page._delegate as CRPage).removeInitScripts();
+      await (page.delegate as CRPage).removeInitScripts(initScripts);
   }
 
-  async doExposeBinding(binding: PageBinding) {
+  async doUpdateRequestInterception(): Promise<void> {
     for (const page of this.pages())
-      await (page._delegate as CRPage).exposeBinding(binding);
+      await (page.delegate as CRPage).updateRequestInterception();
+    for (const sw of this.serviceWorkers())
+      await (sw as CRServiceWorker).updateRequestInterception();
   }
 
-  async doRemoveExposedBindings() {
-    for (const page of this.pages())
-      await (page._delegate as CRPage).removeExposedBindings();
+  override async doUpdateDefaultViewport() {
+    // No-op, because each page resets its own viewport.
   }
 
-  async doUpdateRequestInterception(): Promise<void> {
-    for (const page of this.pages())
-      await (page._delegate as CRPage).updateRequestInterception();
-    for (const sw of this.serviceWorkers())
-      await (sw as CRServiceWorker).updateRequestInterception();
+  override async doUpdateDefaultEmulatedMedia() {
+    // No-op, because each page resets its own color scheme.
+  }
+
+  override async doExposePlaywrightBinding() {
+    for (const page of this._crPages())
+      await page.exposePlaywrightBinding();
   }
 
   async doClose(reason: string | undefined) {
@@ -518,12 +538,7 @@ export class CRBrowserContext extends BrowserContext {
     // dialogs, so we should close all that are currently opened.
     // We also won't get new ones since `Target.disposeBrowserContext` does not trigger
     // beforeunload.
-    const openedBeforeUnloadDialogs: Dialog[] = [];
-    for (const crPage of this._crPages()) {
-      const dialogs = [...crPage._page._frameManager._openedDialogs].filter(dialog => dialog.type() === 'beforeunload');
-      openedBeforeUnloadDialogs.push(...dialogs);
-    }
-    await Promise.all(openedBeforeUnloadDialogs.map(dialog => dialog.dismiss()));
+    await this.dialogManager.closeBeforeUnloadDialogs();
 
     if (!this._browserContextId) {
       await this.stopVideoRecording();
@@ -535,7 +550,7 @@ export class CRBrowserContext extends BrowserContext {
     await this._browser._session.send('Target.disposeBrowserContext', { browserContextId: this._browserContextId });
     this._browser._contexts.delete(this._browserContextId);
     for (const [targetId, serviceWorker] of this._browser._serviceWorkers) {
-      if (serviceWorker._browserContext !== this)
+      if (serviceWorker.browserContext !== this)
         continue;
       // When closing a browser context, service workers are shutdown
       // asynchronously and we get detached from them later.
@@ -554,7 +569,7 @@ export class CRBrowserContext extends BrowserContext {
     // When persistent context is closed, we do not necessary get Target.detachedFromTarget
     // for all the background pages.
     for (const [targetId, backgroundPage] of this._browser._backgroundPages.entries()) {
-      if (backgroundPage._browserContext === this && backgroundPage._initializedPage) {
+      if (backgroundPage._browserContext === this && backgroundPage._page.initializedOrUndefined()) {
         backgroundPage.didClose();
         this._browser._backgroundPages.delete(targetId);
       }
@@ -579,22 +594,22 @@ export class CRBrowserContext extends BrowserContext {
   backgroundPages(): Page[] {
     const result: Page[] = [];
     for (const backgroundPage of this._browser._backgroundPages.values()) {
-      if (backgroundPage._browserContext === this && backgroundPage._initializedPage)
-        result.push(backgroundPage._initializedPage);
+      if (backgroundPage._browserContext === this && backgroundPage._page.initializedOrUndefined())
+        result.push(backgroundPage._page);
     }
     return result;
   }
 
   serviceWorkers(): Worker[] {
-    return Array.from(this._browser._serviceWorkers.values()).filter(serviceWorker => serviceWorker._browserContext === this);
+    return Array.from(this._browser._serviceWorkers.values()).filter(serviceWorker => serviceWorker.browserContext === this);
   }
 
   async newCDPSession(page: Page | Frame): Promise<CDPSession> {
     let targetId: string | null = null;
     if (page instanceof Page) {
-      targetId = (page._delegate as CRPage)._targetId;
+      targetId = (page.delegate as CRPage)._targetId;
     } else if (page instanceof Frame) {
-      const session = (page._page._delegate as CRPage)._sessions.get(page._id);
+      const session = (page._page.delegate as CRPage)._sessions.get(page._id);
       if (!session)
         throw new Error(`This frame does not have a separate CDP session, it is a part of the parent frame's session`);
       targetId = session._targetId;
diff --git a/packages/playwright-core/src/server/chromium/crConnection.ts b/packages/playwright-core/src/server/chromium/crConnection.ts
index c257d0d7ec01a..0a8d3427fcc01 100644
--- a/packages/playwright-core/src/server/chromium/crConnection.ts
+++ b/packages/playwright-core/src/server/chromium/crConnection.ts
@@ -15,15 +15,18 @@
  * limitations under the License.
  */
 
-import { type RegisteredListener, assert, eventsHelper } from '../../utils';
+import {  assert, eventsHelper } from '../../utils';
+import { debugLogger } from '../utils/debugLogger';
+import { helper } from '../helper';
+import { ProtocolError } from '../protocolError';
+import { SdkObject } from '../instrumentation';
+
+import type { RegisteredListener } from '../../utils';
 import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
 import type { Protocol } from './protocol';
-import { EventEmitter } from 'events';
-import type { RecentLogsCollector } from '../../utils/debugLogger';
-import { debugLogger } from '../../utils/debugLogger';
+import type { RecentLogsCollector } from '../utils/debugLogger';
 import type { ProtocolLogger } from '../types';
-import { helper } from '../helper';
-import { ProtocolError } from '../protocolError';
+
 
 export const ConnectionEvents = {
   Disconnected: Symbol('ConnectionEvents.Disconnected')
@@ -33,7 +36,7 @@ export const ConnectionEvents = {
 // should ignore.
 export const kBrowserCloseMessageId = -9999;
 
-export class CRConnection extends EventEmitter {
+export class CRConnection extends SdkObject {
   private _lastId = 0;
   private readonly _transport: ConnectionTransport;
   readonly _sessions = new Map<string, CRSession>();
@@ -43,8 +46,8 @@ export class CRConnection extends EventEmitter {
   readonly rootSession: CRSession;
   _closed = false;
 
-  constructor(transport: ConnectionTransport, protocolLogger: ProtocolLogger, browserLogsCollector: RecentLogsCollector) {
-    super();
+  constructor(parent: SdkObject, transport: ConnectionTransport, protocolLogger: ProtocolLogger, browserLogsCollector: RecentLogsCollector) {
+    super(parent, 'cr-connection');
     this.setMaxListeners(0);
     this._transport = transport;
     this._protocolLogger = protocolLogger;
@@ -97,7 +100,7 @@ export class CRConnection extends EventEmitter {
 
 type SessionEventListener = (method: string, params?: Object) => void;
 
-export class CRSession extends EventEmitter {
+export class CRSession extends SdkObject {
   private readonly _connection: CRConnection;
   private _eventListener?: SessionEventListener;
   private readonly _callbacks = new Map<number, { resolve: (o: any) => void, reject: (e: ProtocolError) => void, error: ProtocolError }>();
@@ -112,7 +115,7 @@ export class CRSession extends EventEmitter {
   override once: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
 
   constructor(connection: CRConnection, parentSession: CRSession | null, sessionId: string, eventListener?: SessionEventListener) {
-    super();
+    super(connection, 'cr-session');
     this.setMaxListeners(0);
     this._connection = connection;
     this._parentSession = parentSession;
@@ -199,19 +202,17 @@ export class CRSession extends EventEmitter {
   }
 }
 
-export class CDPSession extends EventEmitter {
+export class CDPSession extends SdkObject {
   static Events = {
     Event: 'event',
     Closed: 'close',
   };
 
-  readonly guid: string;
   private _session: CRSession;
   private _listeners: RegisteredListener[] = [];
 
   constructor(parentSession: CRSession, sessionId: string) {
-    super();
-    this.guid = `cdp-session@${sessionId}`;
+    super(parentSession, 'cdp-session');
     this._session = parentSession.createChildSession(sessionId, (method, params) => this.emit(CDPSession.Events.Event, { method, params }));
     this._listeners = [eventsHelper.addEventListener(parentSession, 'Target.detachedFromTarget', (event: Protocol.Target.detachedFromTargetPayload) => {
       if (event.sessionId === sessionId)
diff --git a/packages/playwright-core/src/server/chromium/crCoverage.ts b/packages/playwright-core/src/server/chromium/crCoverage.ts
index ccb9b40ae0d74..cf68dd59f45ef 100644
--- a/packages/playwright-core/src/server/chromium/crCoverage.ts
+++ b/packages/playwright-core/src/server/chromium/crCoverage.ts
@@ -15,12 +15,16 @@
  * limitations under the License.
  */
 
+import { assert } from '../../utils';
+import { eventsHelper } from '../utils/eventsHelper';
+import { raceUncancellableOperationWithCleanup } from '../progress';
+
 import type { CRSession } from './crConnection';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
 import type { Protocol } from './protocol';
+import type { RegisteredListener } from '../utils/eventsHelper';
 import type * as channels from '@protocol/channels';
-import { assert } from '../../utils';
+import type { Progress } from '@protocol/progress';
+
 
 export class CRCoverage {
   private _jsCoverage: JSCoverage;
@@ -31,16 +35,16 @@ export class CRCoverage {
     this._cssCoverage = new CSSCoverage(client);
   }
 
-  async startJSCoverage(options: channels.PageStartJSCoverageParams) {
-    return await this._jsCoverage.start(options);
+  async startJSCoverage(progress: Progress, options: channels.PageStartJSCoverageParams) {
+    await raceUncancellableOperationWithCleanup(progress, () => this._jsCoverage.start(options), () => this._jsCoverage.stop());
   }
 
   async stopJSCoverage(): Promise<channels.PageStopJSCoverageResult> {
     return await this._jsCoverage.stop();
   }
 
-  async startCSSCoverage(options: channels.PageStartCSSCoverageParams) {
-    return await this._cssCoverage.start(options);
+  async startCSSCoverage(progress: Progress, options: channels.PageStartCSSCoverageParams) {
+    await raceUncancellableOperationWithCleanup(progress, () => this._cssCoverage.start(options), () => this._cssCoverage.stop());
   }
 
   async stopCSSCoverage(): Promise<channels.PageStopCSSCoverageResult> {
@@ -113,8 +117,8 @@ class JSCoverage {
   }
 
   async stop(): Promise<channels.PageStopJSCoverageResult> {
-    assert(this._enabled, 'JSCoverage is not enabled');
-    this._enabled = false;
+    if (!this._enabled)
+      return { entries: [] };
     const [profileResponse] = await Promise.all([
       this._client.send('Profiler.takePreciseCoverage'),
       this._client.send('Profiler.stopPreciseCoverage'),
@@ -122,6 +126,7 @@ class JSCoverage {
       this._client.send('Debugger.disable'),
     ] as const);
     eventsHelper.removeEventListeners(this._eventListeners);
+    this._enabled = false;
 
     const coverage: channels.PageStopJSCoverageResult = { entries: [] };
     for (const entry of profileResponse.result) {
@@ -195,14 +200,15 @@ class CSSCoverage {
   }
 
   async stop(): Promise<channels.PageStopCSSCoverageResult> {
-    assert(this._enabled, 'CSSCoverage is not enabled');
-    this._enabled = false;
+    if (!this._enabled)
+      return { entries: [] };
     const ruleTrackingResponse = await this._client.send('CSS.stopRuleUsageTracking');
     await Promise.all([
       this._client.send('CSS.disable'),
       this._client.send('DOM.disable'),
     ]);
     eventsHelper.removeEventListeners(this._eventListeners);
+    this._enabled = false;
 
     // aggregate by styleSheetId
     const styleSheetIdToCoverage = new Map();
diff --git a/packages/playwright-core/src/server/chromium/crDevTools.ts b/packages/playwright-core/src/server/chromium/crDevTools.ts
index 40cd134bcc50d..5225d6d54f4ec 100644
--- a/packages/playwright-core/src/server/chromium/crDevTools.ts
+++ b/packages/playwright-core/src/server/chromium/crDevTools.ts
@@ -15,6 +15,7 @@
  */
 
 import fs from 'fs';
+
 import type { CRSession } from './crConnection';
 
 const kBindingName = '__pw_devtools__';
diff --git a/packages/playwright-core/src/server/chromium/crDragDrop.ts b/packages/playwright-core/src/server/chromium/crDragDrop.ts
index ea4af1ce7e1b4..893968917a4c0 100644
--- a/packages/playwright-core/src/server/chromium/crDragDrop.ts
+++ b/packages/playwright-core/src/server/chromium/crDragDrop.ts
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
+import { toModifiersMask } from './crProtocolHelper';
+import { assert } from '../../utils';
+
 import type { CRPage } from './crPage';
 import type * as types from '../types';
-import { assert } from '../../utils';
 import type { Protocol } from './protocol';
-import { toModifiersMask } from './crProtocolHelper';
+import type { Progress } from '../progress';
+
 
 declare global {
   interface Window {
@@ -49,16 +52,16 @@ export class DragManager {
     return true;
   }
 
-  async interceptDragCausedByMove(x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, moveCallback: () => Promise<void>): Promise<void> {
+  async interceptDragCausedByMove(progress: Progress, x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, moveCallback: () => Promise<void>): Promise<void> {
     this._lastPosition = { x, y };
     if (this._dragState) {
-      await this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {
+      await progress.race(this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {
         type: 'dragOver',
         x,
         y,
         data: this._dragState,
         modifiers: toModifiersMask(modifiers),
-      });
+      }));
       return;
     }
     if (button !== 'left')
@@ -88,35 +91,35 @@ export class DragManager {
       };
     }
 
-    await this._crPage._page.safeNonStallingEvaluateInAllFrames(`(${setupDragListeners.toString()})()`, 'utility');
-
-    client.on('Input.dragIntercepted', onDragIntercepted!);
     try {
+      let expectingDrag = false;
+      await progress.race(this._crPage._page.safeNonStallingEvaluateInAllFrames(`(${setupDragListeners.toString()})()`, 'utility'));
+      client.on('Input.dragIntercepted', onDragIntercepted!);
       await client.send('Input.setInterceptDrags', { enabled: true });
-    } catch {
-      // If Input.setInterceptDrags is not supported, just do a regular move.
-      // This can be removed once we stop supporting old Electron.
-      client.off('Input.dragIntercepted', onDragIntercepted!);
-      return moveCallback();
+      try {
+        await progress.race(moveCallback());
+        expectingDrag = (await Promise.all(this._crPage._page.frames().map(async frame => {
+          return frame.nonStallingEvaluateInExistingContext('window.__cleanupDrag?.()', 'utility').catch(() => false);
+        }))).some(x => x);
+      } finally {
+        client.off('Input.dragIntercepted', onDragIntercepted!);
+        await client.send('Input.setInterceptDrags', { enabled: false });
+      }
+      this._dragState = expectingDrag ? (await dragInterceptedPromise).data : null;
+    } catch (error) {
+      // Cleanup without blocking, it will be done before the next playwright action.
+      this._crPage._page.safeNonStallingEvaluateInAllFrames('window.__cleanupDrag?.()', 'utility').catch(() => {});
+      throw error;
     }
-    await moveCallback();
-
-    const expectingDrag = (await Promise.all(this._crPage._page.frames().map(async frame => {
-      return frame.nonStallingEvaluateInExistingContext('window.__cleanupDrag && window.__cleanupDrag()', 'utility').catch(() => false);
-    }))).some(x => x);
-    this._dragState = expectingDrag ? (await dragInterceptedPromise).data : null;
-    client.off('Input.dragIntercepted', onDragIntercepted!);
-    await client.send('Input.setInterceptDrags', { enabled: false });
-
 
     if (this._dragState) {
-      await this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {
+      await progress.race(this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {
         type: 'dragEnter',
         x,
         y,
         data: this._dragState,
         modifiers: toModifiersMask(modifiers),
-      });
+      }));
     }
   }
 
@@ -124,15 +127,15 @@ export class DragManager {
     return !!this._dragState;
   }
 
-  async drop(x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
+  async drop(progress: Progress, x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
     assert(this._dragState, 'missing drag state');
-    await this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {
+    await progress.race(this._crPage._mainFrameSession._client.send('Input.dispatchDragEvent', {
       type: 'drop',
       x,
       y,
       data: this._dragState,
       modifiers: toModifiersMask(modifiers),
-    });
+    }));
     this._dragState = null;
   }
 }
diff --git a/packages/playwright-core/src/server/chromium/crExecutionContext.ts b/packages/playwright-core/src/server/chromium/crExecutionContext.ts
index c6952f5c82b38..63eb493ea0601 100644
--- a/packages/playwright-core/src/server/chromium/crExecutionContext.ts
+++ b/packages/playwright-core/src/server/chromium/crExecutionContext.ts
@@ -15,14 +15,17 @@
  * limitations under the License.
  */
 
-import type { CRSession } from './crConnection';
+import { assert } from '../../utils/isomorphic/assert';
 import { getExceptionMessage, releaseObject } from './crProtocolHelper';
-import type { Protocol } from './protocol';
+import { rewriteErrorMessage } from '../../utils/isomorphic/stackTrace';
+import { parseEvaluationResultValue } from '../../utils/isomorphic/utilityScriptSerializers';
 import * as js from '../javascript';
-import { rewriteErrorMessage } from '../../utils/stackTrace';
-import { parseEvaluationResultValue } from '../isomorphic/utilityScriptSerializers';
+import * as dom from '../dom';
 import { isSessionClosedError } from '../protocolError';
 
+import type { CRSession } from './crConnection';
+import type { Protocol } from './protocol';
+
 export class CRExecutionContext implements js.ExecutionContextDelegate {
   _client: CRSession;
   _contextId: number;
@@ -43,34 +46,24 @@ export class CRExecutionContext implements js.ExecutionContextDelegate {
     return remoteObject.value;
   }
 
-  async rawEvaluateHandle(expression: string): Promise<js.ObjectId> {
+  async rawEvaluateHandle(context: js.ExecutionContext, expression: string): Promise<js.JSHandle> {
     const { exceptionDetails, result: remoteObject } = await this._client.send('Runtime.evaluate', {
       expression,
       contextId: this._contextId,
     }).catch(rewriteError);
     if (exceptionDetails)
       throw new js.JavaScriptErrorInEvaluate(getExceptionMessage(exceptionDetails));
-    return remoteObject.objectId!;
-  }
-
-  rawCallFunctionNoReply(func: Function, ...args: any[]) {
-    this._client.send('Runtime.callFunctionOn', {
-      functionDeclaration: func.toString(),
-      arguments: args.map(a => a instanceof js.JSHandle ? { objectId: a._objectId } : { value: a }),
-      returnByValue: true,
-      executionContextId: this._contextId,
-      userGesture: true
-    }).catch(() => {});
+    return createHandle(context, remoteObject);
   }
 
-  async evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: js.JSHandle<any>, values: any[], objectIds: string[]): Promise<any> {
+  async evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: js.JSHandle, values: any[], handles: js.JSHandle[]): Promise<any> {
     const { exceptionDetails, result: remoteObject } = await this._client.send('Runtime.callFunctionOn', {
       functionDeclaration: expression,
       objectId: utilityScript._objectId,
       arguments: [
         { objectId: utilityScript._objectId },
         ...values.map(value => ({ value })),
-        ...objectIds.map(objectId => ({ objectId })),
+        ...handles.map(handle => ({ objectId: handle._objectId! })),
       ],
       returnByValue,
       awaitPromise: true,
@@ -78,43 +71,33 @@ export class CRExecutionContext implements js.ExecutionContextDelegate {
     }).catch(rewriteError);
     if (exceptionDetails)
       throw new js.JavaScriptErrorInEvaluate(getExceptionMessage(exceptionDetails));
-    return returnByValue ? parseEvaluationResultValue(remoteObject.value) : utilityScript._context.createHandle(remoteObject);
+    return returnByValue ? parseEvaluationResultValue(remoteObject.value) : createHandle(utilityScript._context, remoteObject);
   }
 
-  async getProperties(context: js.ExecutionContext, objectId: js.ObjectId): Promise<Map<string, js.JSHandle>> {
+  async getProperties(object: js.JSHandle): Promise<Map<string, js.JSHandle>> {
     const response = await this._client.send('Runtime.getProperties', {
-      objectId,
+      objectId: object._objectId!,
       ownProperties: true
     });
     const result = new Map();
     for (const property of response.result) {
       if (!property.enumerable || !property.value)
         continue;
-      result.set(property.name, context.createHandle(property.value));
+      result.set(property.name, createHandle(object._context, property.value));
     }
     return result;
   }
 
-  createHandle(context: js.ExecutionContext, remoteObject: Protocol.Runtime.RemoteObject): js.JSHandle {
-    return new js.JSHandle(context, remoteObject.subtype || remoteObject.type, renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
-  }
-
-  async releaseHandle(objectId: js.ObjectId): Promise<void> {
-    await releaseObject(this._client, objectId);
-  }
-
-  async objectCount(objectId: js.ObjectId): Promise<number> {
-    const result = await this._client.send('Runtime.queryObjects', {
-      prototypeObjectId: objectId
-    });
-    const match = result.objects.description!.match(/Array\((\d+)\)/)!;
-    return +match[1];
+  async releaseHandle(handle: js.JSHandle): Promise<void> {
+    if (!handle._objectId)
+      return;
+    await releaseObject(this._client, handle._objectId);
   }
 }
 
 function rewriteError(error: Error): Protocol.Runtime.evaluateReturnValue {
   if (error.message.includes('Object reference chain is too long'))
-    return { result: { type: 'undefined' } };
+    throw new Error('Cannot serialize result: object reference chain is too long.');
   if (error.message.includes('Object couldn\'t be returned by value'))
     return { result: { type: 'undefined' } };
 
@@ -149,3 +132,11 @@ function renderPreview(object: Protocol.Runtime.RemoteObject): string | undefine
     return js.sparseArrayToString(object.preview.properties);
   return object.description;
 }
+
+export function createHandle(context: js.ExecutionContext, remoteObject: Protocol.Runtime.RemoteObject): js.JSHandle {
+  if (remoteObject.subtype === 'node') {
+    assert(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context, remoteObject.objectId!);
+  }
+  return new js.JSHandle(context, remoteObject.subtype || remoteObject.type, renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
+}
diff --git a/packages/playwright-core/src/server/chromium/crInput.ts b/packages/playwright-core/src/server/chromium/crInput.ts
index bbfd973d10f97..beb030c9bff9a 100644
--- a/packages/playwright-core/src/server/chromium/crInput.ts
+++ b/packages/playwright-core/src/server/chromium/crInput.ts
@@ -15,14 +15,17 @@
  * limitations under the License.
  */
 
+import { isString } from '../../utils';
 import * as input from '../input';
+import { macEditingCommands } from '../macEditingCommands';
+import { toButtonsMask, toModifiersMask } from './crProtocolHelper';
+
 import type * as types from '../types';
 import type { CRSession } from './crConnection';
-import { macEditingCommands } from '../macEditingCommands';
-import { isString } from '../../utils';
 import type { DragManager } from './crDragDrop';
 import type { CRPage } from './crPage';
-import { toButtonsMask, toModifiersMask } from './crProtocolHelper';
+import type { Progress } from '../progress';
+
 
 export class RawKeyboardImpl implements input.RawKeyboard {
   constructor(
@@ -50,14 +53,15 @@ export class RawKeyboardImpl implements input.RawKeyboard {
     return commands.map(c => c.substring(0, c.length - 1));
   }
 
-  async keydown(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number, autoRepeat: boolean, text: string | undefined): Promise<void> {
-    if (code === 'Escape' && await this._dragManger.cancelDrag())
+  async keydown(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription, autoRepeat: boolean): Promise<void> {
+    const { code, key, location, text } = description;
+    if (code === 'Escape' && await progress.race(this._dragManger.cancelDrag()))
       return;
     const commands = this._commandsForCode(code, modifiers);
-    await this._client.send('Input.dispatchKeyEvent', {
+    await progress.race(this._client.send('Input.dispatchKeyEvent', {
       type: text ? 'keyDown' : 'rawKeyDown',
       modifiers: toModifiersMask(modifiers),
-      windowsVirtualKeyCode: keyCodeWithoutLocation,
+      windowsVirtualKeyCode: description.keyCodeWithoutLocation,
       code,
       commands,
       key,
@@ -66,22 +70,23 @@ export class RawKeyboardImpl implements input.RawKeyboard {
       autoRepeat,
       location,
       isKeypad: location === input.keypadLocation
-    });
+    }));
   }
 
-  async keyup(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number): Promise<void> {
-    await this._client.send('Input.dispatchKeyEvent', {
+  async keyup(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription): Promise<void> {
+    const { code, key, location } = description;
+    await progress.race(this._client.send('Input.dispatchKeyEvent', {
       type: 'keyUp',
       modifiers: toModifiersMask(modifiers),
       key,
-      windowsVirtualKeyCode: keyCodeWithoutLocation,
+      windowsVirtualKeyCode: description.keyCodeWithoutLocation,
       code,
       location
-    });
+    }));
   }
 
-  async sendText(text: string): Promise<void> {
-    await this._client.send('Input.insertText', { text });
+  async sendText(progress: Progress, text: string): Promise<void> {
+    await progress.race(this._client.send('Input.insertText', { text }));
   }
 }
 
@@ -96,45 +101,48 @@ export class RawMouseImpl implements input.RawMouse {
     this._dragManager = dragManager;
   }
 
-  async move(x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
+  async move(progress: Progress, x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
     const actualMove = async () => {
-      await this._client.send('Input.dispatchMouseEvent', {
+      await progress.race(this._client.send('Input.dispatchMouseEvent', {
         type: 'mouseMoved',
         button,
         buttons: toButtonsMask(buttons),
         x,
         y,
-        modifiers: toModifiersMask(modifiers)
-      });
+        modifiers: toModifiersMask(modifiers),
+        force: buttons.size > 0 ? 0.5 : 0,
+      }));
     };
     if (forClick) {
       // Avoid extra protocol calls related to drag and drop, because click relies on
       // move-down-up protocol commands being sent synchronously.
-      return actualMove();
+      await actualMove();
+      return;
     }
-    await this._dragManager.interceptDragCausedByMove(x, y, button, buttons, modifiers, actualMove);
+    await this._dragManager.interceptDragCausedByMove(progress, x, y, button, buttons, modifiers, actualMove);
   }
 
-  async down(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+  async down(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
     if (this._dragManager.isDragging())
       return;
-    await this._client.send('Input.dispatchMouseEvent', {
+    await progress.race(this._client.send('Input.dispatchMouseEvent', {
       type: 'mousePressed',
       button,
       buttons: toButtonsMask(buttons),
       x,
       y,
       modifiers: toModifiersMask(modifiers),
-      clickCount
-    });
+      clickCount,
+      force: buttons.size > 0 ? 0.5 : 0,
+    }));
   }
 
-  async up(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+  async up(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
     if (this._dragManager.isDragging()) {
-      await this._dragManager.drop(x, y, modifiers);
+      await this._dragManager.drop(progress, x, y, modifiers);
       return;
     }
-    await this._client.send('Input.dispatchMouseEvent', {
+    await progress.race(this._client.send('Input.dispatchMouseEvent', {
       type: 'mouseReleased',
       button,
       buttons: toButtonsMask(buttons),
@@ -142,18 +150,18 @@ export class RawMouseImpl implements input.RawMouse {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
 
-  async wheel(x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
-    await this._client.send('Input.dispatchMouseEvent', {
+  async wheel(progress: Progress, x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
+    await progress.race(this._client.send('Input.dispatchMouseEvent', {
       type: 'mouseWheel',
       x,
       y,
       modifiers: toModifiersMask(modifiers),
       deltaX,
       deltaY,
-    });
+    }));
   }
 }
 
@@ -163,8 +171,8 @@ export class RawTouchscreenImpl implements input.RawTouchscreen {
   constructor(client: CRSession) {
     this._client = client;
   }
-  async tap(x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
-    await Promise.all([
+  async tap(progress: Progress, x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
+    await progress.race(Promise.all([
       this._client.send('Input.dispatchTouchEvent', {
         type: 'touchStart',
         modifiers: toModifiersMask(modifiers),
@@ -177,6 +185,6 @@ export class RawTouchscreenImpl implements input.RawTouchscreen {
         modifiers: toModifiersMask(modifiers),
         touchPoints: []
       }),
-    ]);
+    ]));
   }
 }
diff --git a/packages/playwright-core/src/server/chromium/crNetworkManager.ts b/packages/playwright-core/src/server/chromium/crNetworkManager.ts
index 850f466afa35c..27a4cba97fdc5 100644
--- a/packages/playwright-core/src/server/chromium/crNetworkManager.ts
+++ b/packages/playwright-core/src/server/chromium/crNetworkManager.ts
@@ -15,20 +15,22 @@
  * limitations under the License.
  */
 
-import type { CRSession } from './crConnection';
-import type { Page } from '../page';
+import { assert, headersArrayToObject, headersObjectToArray } from '../../utils';
+import { eventsHelper } from '../utils/eventsHelper';
 import { helper } from '../helper';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import type { Protocol } from './protocol';
 import * as network from '../network';
+import { isProtocolError, isSessionClosedError } from '../protocolError';
+
+import type { CRSession } from './crConnection';
+import type { Protocol } from './protocol';
+import type { RegisteredListener } from '../utils/eventsHelper';
 import type * as contexts from '../browserContext';
 import type * as frames from '../frames';
+import type { Page } from '../page';
 import type * as types from '../types';
 import type { CRPage } from './crPage';
-import { assert, headersArrayToObject, headersObjectToArray } from '../../utils';
 import type { CRServiceWorker } from './crServiceWorker';
-import { isProtocolError, isSessionClosedError } from '../protocolError';
+
 
 type SessionInfo = {
   session: CRSession;
@@ -72,13 +74,13 @@ export class CRNetworkManager {
     ];
     if (this._page) {
       sessionInfo.eventListeners.push(...[
-        eventsHelper.addEventListener(session, 'Network.webSocketCreated', e => this._page!._frameManager.onWebSocketCreated(e.requestId, e.url)),
-        eventsHelper.addEventListener(session, 'Network.webSocketWillSendHandshakeRequest', e => this._page!._frameManager.onWebSocketRequest(e.requestId)),
-        eventsHelper.addEventListener(session, 'Network.webSocketHandshakeResponseReceived', e => this._page!._frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
-        eventsHelper.addEventListener(session, 'Network.webSocketFrameSent', e => e.response.payloadData && this._page!._frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
-        eventsHelper.addEventListener(session, 'Network.webSocketFrameReceived', e => e.response.payloadData && this._page!._frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
-        eventsHelper.addEventListener(session, 'Network.webSocketClosed', e => this._page!._frameManager.webSocketClosed(e.requestId)),
-        eventsHelper.addEventListener(session, 'Network.webSocketFrameError', e => this._page!._frameManager.webSocketError(e.requestId, e.errorMessage)),
+        eventsHelper.addEventListener(session, 'Network.webSocketCreated', e => this._page!.frameManager.onWebSocketCreated(e.requestId, e.url)),
+        eventsHelper.addEventListener(session, 'Network.webSocketWillSendHandshakeRequest', e => this._page!.frameManager.onWebSocketRequest(e.requestId)),
+        eventsHelper.addEventListener(session, 'Network.webSocketHandshakeResponseReceived', e => this._page!.frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
+        eventsHelper.addEventListener(session, 'Network.webSocketFrameSent', e => e.response.payloadData && this._page!.frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
+        eventsHelper.addEventListener(session, 'Network.webSocketFrameReceived', e => e.response.payloadData && this._page!.frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
+        eventsHelper.addEventListener(session, 'Network.webSocketClosed', e => this._page!.frameManager.webSocketClosed(e.requestId)),
+        eventsHelper.addEventListener(session, 'Network.webSocketFrameError', e => this._page!.frameManager.webSocketError(e.requestId, e.errorMessage)),
       ]);
     }
     this._sessions.set(session, sessionInfo);
@@ -285,19 +287,19 @@ export class CRNetworkManager {
         redirectedFrom = request;
       }
     }
-    let frame = requestWillBeSentEvent.frameId ? this._page?._frameManager.frame(requestWillBeSentEvent.frameId) : requestWillBeSentSessionInfo.workerFrame;
+    let frame = requestWillBeSentEvent.frameId ? this._page?.frameManager.frame(requestWillBeSentEvent.frameId) : requestWillBeSentSessionInfo.workerFrame;
     // Requests from workers lack frameId, because we receive Network.requestWillBeSent
     // on the worker target. However, we receive Fetch.requestPaused on the page target,
     // and lack workerFrame there. Luckily, Fetch.requestPaused provides a frameId.
     if (!frame && this._page && requestPausedEvent && requestPausedEvent.frameId)
-      frame = this._page._frameManager.frame(requestPausedEvent.frameId);
+      frame = this._page.frameManager.frame(requestPausedEvent.frameId);
 
     // Check if it's main resource request interception (targetId === main frame id).
-    if (!frame && this._page && requestWillBeSentEvent.frameId === (this._page?._delegate as CRPage)._targetId) {
+    if (!frame && this._page && requestWillBeSentEvent.frameId === (this._page?.delegate as CRPage)._targetId) {
       // Main resource request for the page is being intercepted so the Frame is not created
       // yet. Precreate it here for the purposes of request interception. It will be updated
       // later as soon as the request continues and we receive frame tree from the page.
-      frame = this._page._frameManager.frameAttached(requestWillBeSentEvent.frameId, null);
+      frame = this._page.frameManager.frameAttached(requestWillBeSentEvent.frameId, null);
     }
 
     // CORS options preflight request is generated by the network stack. If interception is enabled,
@@ -347,7 +349,7 @@ export class CRNetworkManager {
     const documentId = isNavigationRequest ? requestWillBeSentEvent.loaderId : undefined;
     const request = new InterceptableRequest({
       session: requestWillBeSentSessionInfo.session,
-      context: (this._page || this._serviceWorker)!._browserContext,
+      context: (this._page || this._serviceWorker)!.browserContext,
       frame: frame || null,
       serviceWorker: this._serviceWorker || null,
       documentId,
@@ -365,7 +367,7 @@ export class CRNetworkManager {
       // right away, so that client can call it from the route handler.
       request.request.setRawRequestHeaders(headersObjectToArray(requestPausedEvent!.request.headers, '\n'));
     }
-    (this._page?._frameManager || this._serviceWorker)!.requestStarted(request.request, route || undefined);
+    (this._page?.frameManager || this._serviceWorker)!.requestStarted(request.request, route || undefined);
   }
 
   _createResponse(request: InterceptableRequest, responsePayload: Protocol.Network.Response, hasExtraInfo: boolean): network.Response {
@@ -452,8 +454,8 @@ export class CRNetworkManager {
     response.setEncodedBodySize(null);
     response._requestFinished((timestamp - request._timestamp) * 1000);
     this._deleteRequest(request);
-    (this._page?._frameManager || this._serviceWorker)!.requestReceivedResponse(response);
-    (this._page?._frameManager || this._serviceWorker)!.reportRequestFinished(request.request, response);
+    (this._page?.frameManager || this._serviceWorker)!.requestReceivedResponse(response);
+    (this._page?.frameManager || this._serviceWorker)!.reportRequestFinished(request.request, response);
   }
 
   _onResponseReceivedExtraInfo(event: Protocol.Network.responseReceivedExtraInfoPayload) {
@@ -477,7 +479,7 @@ export class CRNetworkManager {
     if (!request)
       return;
     const response = this._createResponse(request, event.response, event.hasExtraInfo);
-    (this._page?._frameManager || this._serviceWorker)!.requestReceivedResponse(response);
+    (this._page?.frameManager || this._serviceWorker)!.requestReceivedResponse(response);
   }
 
   _onLoadingFinished(sessionInfo: SessionInfo, event: Protocol.Network.loadingFinishedPayload) {
@@ -488,7 +490,7 @@ export class CRNetworkManager {
     // @see https://crbug.com/750469
     if (!request)
       return;
-    this._maybeUpdateOOPIFMainRequest(sessionInfo, request);
+    this._maybeUpdateRequestSession(sessionInfo, request);
 
     // Under certain conditions we never get the Network.responseReceived
     // event from protocol. @see https://crbug.com/883475
@@ -499,7 +501,7 @@ export class CRNetworkManager {
       response._requestFinished(helper.secondsToRoundishMillis(event.timestamp - request._timestamp));
     }
     this._deleteRequest(request);
-    (this._page?._frameManager || this._serviceWorker)!.reportRequestFinished(request.request, response);
+    (this._page?.frameManager || this._serviceWorker)!.reportRequestFinished(request.request, response);
   }
 
   _onLoadingFailed(sessionInfo: SessionInfo, event: Protocol.Network.loadingFailedPayload) {
@@ -523,7 +525,7 @@ export class CRNetworkManager {
     // @see https://crbug.com/750469
     if (!request)
       return;
-    this._maybeUpdateOOPIFMainRequest(sessionInfo, request);
+    this._maybeUpdateRequestSession(sessionInfo, request);
     const response = request.request._existingResponse();
     if (response) {
       response.setTransferSize(null);
@@ -535,14 +537,20 @@ export class CRNetworkManager {
     }
     this._deleteRequest(request);
     request.request._setFailureText(event.errorText || event.blockedReason || '');
-    (this._page?._frameManager || this._serviceWorker)!.requestFailed(request.request, !!event.canceled);
+    (this._page?.frameManager || this._serviceWorker)!.requestFailed(request.request, !!event.canceled);
   }
 
-  private _maybeUpdateOOPIFMainRequest(sessionInfo: SessionInfo, request: InterceptableRequest) {
+  private _maybeUpdateRequestSession(sessionInfo: SessionInfo, request: InterceptableRequest) {
     // OOPIF has a main request that starts in the parent session but finishes in the child session.
     // We check for the main request by matching loaderId and requestId, and if it now belongs to
     // a child session, migrate it there.
-    if (request.session !== sessionInfo.session && !sessionInfo.isMain && request._documentId === request._requestId)
+    //
+    // Same goes for the main worker script with PlzDedicatedWorker enabled, which is the default.
+    // Here we check the `workerFrame`.
+    //
+    // In theory, we can always update the session. However, we try to be conservative here
+    // to make sure we understand all the scenarios where the session should be updated.
+    if (request.session !== sessionInfo.session && !sessionInfo.isMain && (request._documentId === request._requestId || sessionInfo.workerFrame))
       request.session = sessionInfo.session;
   }
 }
@@ -609,7 +617,7 @@ class RouteImpl implements network.RouteDelegate {
     this._interceptionId = interceptionId;
   }
 
-  async continue(request: network.Request, overrides: types.NormalizedContinueOverrides): Promise<void> {
+  async continue(overrides: types.NormalizedContinueOverrides): Promise<void> {
     this._alreadyContinuedParams = {
       requestId: this._interceptionId!,
       url: overrides.url,
@@ -658,6 +666,8 @@ async function catchDisallowedErrors(callback: () => Promise<void>) {
   } catch (e) {
     if (isProtocolError(e) && e.message.includes('Invalid http status code or phrase'))
       throw e;
+    if (isProtocolError(e) && e.message.includes('Unsafe header'))
+      throw e;
   }
 }
 
diff --git a/packages/playwright-core/src/server/chromium/crPage.ts b/packages/playwright-core/src/server/chromium/crPage.ts
index 53b96ad4032c1..c019cac28b726 100644
--- a/packages/playwright-core/src/server/chromium/crPage.ts
+++ b/packages/playwright-core/src/server/chromium/crPage.ts
@@ -16,43 +16,46 @@
  */
 
 import path from 'path';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import { registry } from '../registry';
-import { rewriteErrorMessage } from '../../utils/stackTrace';
-import { assert, createGuid } from '../../utils';
+
+import { assert } from '../../utils/isomorphic/assert';
+import { createGuid } from '../utils/crypto';
+import { eventsHelper } from '../utils/eventsHelper';
+import { rewriteErrorMessage } from '../../utils/isomorphic/stackTrace';
 import * as dialog from '../dialog';
 import * as dom from '../dom';
 import * as frames from '../frames';
 import { helper } from '../helper';
 import * as network from '../network';
-import type { InitScript, PageBinding, PageDelegate } from '../page';
-import { Page, Worker } from '../page';
-import type { Progress } from '../progress';
-import type * as types from '../types';
-import type * as channels from '@protocol/channels';
+import { Page, PageBinding, Worker } from '../page';
+import { registry } from '../registry';
 import { getAccessibilityTree } from './crAccessibility';
 import { CRBrowserContext } from './crBrowser';
-import type { CRSession } from './crConnection';
 import { CRCoverage } from './crCoverage';
 import { DragManager } from './crDragDrop';
-import { CRExecutionContext } from './crExecutionContext';
+import { createHandle, CRExecutionContext } from './crExecutionContext';
 import { RawKeyboardImpl, RawMouseImpl, RawTouchscreenImpl } from './crInput';
 import { CRNetworkManager } from './crNetworkManager';
 import { CRPDF } from './crPdf';
 import { exceptionToError, releaseObject, toConsoleMessageLocation } from './crProtocolHelper';
 import { platformToFontFamilies } from './defaultFontFamilies';
-import type { Protocol } from './protocol';
 import { VideoRecorder } from './videoRecorder';
 import { BrowserContext } from '../browserContext';
 import { TargetClosedError } from '../errors';
 import { isSessionClosedError } from '../protocolError';
 
+import type { CRSession } from './crConnection';
+import type { Protocol } from './protocol';
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type { InitScript, PageDelegate } from '../page';
+import type { Progress } from '../progress';
+import type * as types from '../types';
+import type * as channels from '@protocol/channels';
+
 
-const UTILITY_WORLD_NAME = '__playwright_utility_world__';
 export type WindowBounds = { top?: number, left?: number, width?: number, height?: number };
 
 export class CRPage implements PageDelegate {
+  readonly utilityWorldName: string;
   readonly _mainFrameSession: FrameSession;
   readonly _sessions = new Map<Protocol.Target.TargetID, FrameSession>();
   readonly _page: Page;
@@ -65,8 +68,6 @@ export class CRPage implements PageDelegate {
   private readonly _pdf: CRPDF;
   private readonly _coverage: CRCoverage;
   readonly _browserContext: CRBrowserContext;
-  private readonly _pagePromise: Promise<Page | Error>;
-  _initializedPage: Page | null = null;
   private _isBackgroundPage: boolean;
 
   // Holds window features for the next popup being opened via window.open,
@@ -77,7 +78,7 @@ export class CRPage implements PageDelegate {
   readonly _nextWindowOpenPopupFeatures: string[][] = [];
 
   static mainFrameSession(page: Page): FrameSession {
-    const crPage = page._delegate as CRPage;
+    const crPage = page.delegate as CRPage;
     return crPage._mainFrameSession;
   }
 
@@ -93,6 +94,9 @@ export class CRPage implements PageDelegate {
     this._coverage = new CRCoverage(client);
     this._browserContext = browserContext;
     this._page = new Page(this, browserContext);
+    // Create a unique utility world for this Playwright instance, just in case there
+    // are multiple instances of Playwright connected to the same browser page.
+    this.utilityWorldName = `__playwright_utility_world_${this._page.guid}`;
     this._networkManager = new CRNetworkManager(this._page, null);
     // Sync any browser context state to the network manager. This does not talk over CDP because
     // we have not connected any sessions to the network manager yet.
@@ -106,32 +110,13 @@ export class CRPage implements PageDelegate {
       const features = opener._nextWindowOpenPopupFeatures.shift() || [];
       const viewportSize = helper.getViewportSizeFromWindowFeatures(features);
       if (viewportSize)
-        this._page._emulatedSize = { viewport: viewportSize, screen: viewportSize };
+        this._page.setEmulatedSizeFromWindowOpen({ viewport: viewportSize, screen: viewportSize });
     }
-    // Note: it is important to call |reportAsNew| before resolving pageOrError promise,
-    // so that anyone who awaits pageOrError got a ready and reported page.
-    this._pagePromise = this._mainFrameSession._initialize(bits.hasUIWindow).then(async r => {
-      await this._page.initOpener(this._opener);
-      return r;
-    }).catch(async e => {
-      await this._page.initOpener(this._opener);
-      throw e;
-    }).then(() => {
-      this._initializedPage = this._page;
-      this._reportAsNew();
-      return this._page;
-    }).catch(e => {
-      this._reportAsNew(e);
-      return e;
-    });
-  }
 
-  potentiallyUninitializedPage(): Page {
-    return this._page;
-  }
-
-  private _reportAsNew(error?: Error) {
-    this._page.reportAsNew(error, this._isBackgroundPage ? CRBrowserContext.CREvents.BackgroundPage : BrowserContext.Events.Page);
+    const createdEvent = this._isBackgroundPage ? CRBrowserContext.CREvents.BackgroundPage : BrowserContext.Events.Page;
+    this._mainFrameSession._initialize(bits.hasUIWindow).then(
+        () => this._page.reportAsNew(this._opener?._page, undefined, createdEvent),
+        error => this._page.reportAsNew(this._opener?._page, error, createdEvent));
   }
 
   private async _forAllFrameSessions(cb: (frame: FrameSession) => Promise<any>) {
@@ -168,10 +153,6 @@ export class CRPage implements PageDelegate {
     this._mainFrameSession._willBeginDownload();
   }
 
-  async pageOrError(): Promise<Page | Error> {
-    return this._pagePromise;
-  }
-
   didClose() {
     for (const session of this._sessions.values())
       session.dispose();
@@ -182,15 +163,6 @@ export class CRPage implements PageDelegate {
     return this._sessionForFrame(frame)._navigate(frame, url, referrer);
   }
 
-  async exposeBinding(binding: PageBinding) {
-    await this._forAllFrameSessions(frame => frame._initBinding(binding));
-    await Promise.all(this._page.frames().map(frame => frame.evaluateExpression(binding.source).catch(e => {})));
-  }
-
-  async removeExposedBindings() {
-    await this._forAllFrameSessions(frame => frame._removeExposedBindings());
-  }
-
   async updateExtraHTTPHeaders(): Promise<void> {
     const headers = network.mergeHeaders([
       this._browserContext._options.extraHTTPHeaders,
@@ -256,12 +228,20 @@ export class CRPage implements PageDelegate {
     return this._go(+1);
   }
 
+  async requestGC(): Promise<void> {
+    await this._mainFrameSession._client.send('HeapProfiler.collectGarbage');
+  }
+
   async addInitScript(initScript: InitScript, world: types.World = 'main'): Promise<void> {
     await this._forAllFrameSessions(frame => frame._evaluateOnNewDocument(initScript, world));
   }
 
-  async removeInitScripts() {
-    await this._forAllFrameSessions(frame => frame._removeEvaluatesOnNewDocument());
+  async exposePlaywrightBinding() {
+    await this._forAllFrameSessions(frame => frame.exposePlaywrightBinding());
+  }
+
+  async removeInitScripts(initScripts: InitScript[]): Promise<void> {
+    await this._forAllFrameSessions(frame => frame._removeEvaluatesOnNewDocument(initScripts));
   }
 
   async closePage(runBeforeUnload: boolean): Promise<void> {
@@ -276,7 +256,7 @@ export class CRPage implements PageDelegate {
   }
 
   async takeScreenshot(progress: Progress, format: 'png' | 'jpeg', documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, quality: number | undefined, fitsViewport: boolean, scale: 'css' | 'device'): Promise<Buffer> {
-    const { visualViewport } = await this._mainFrameSession._client.send('Page.getLayoutMetrics');
+    const { visualViewport } = await progress.race(this._mainFrameSession._client.send('Page.getLayoutMetrics'));
     if (!documentRect) {
       documentRect = {
         x: visualViewport.pageX + viewportRect!.x,
@@ -294,8 +274,7 @@ export class CRPage implements PageDelegate {
       const deviceScaleFactor = this._browserContext._options.deviceScaleFactor || 1;
       clip.scale /= deviceScaleFactor;
     }
-    progress.throwIfAborted();
-    const result = await this._mainFrameSession._client.send('Page.captureScreenshot', { format, quality, clip, captureBeyondViewport: !fitsViewport });
+    const result = await progress.race(this._mainFrameSession._client.send('Page.captureScreenshot', { format, quality, clip, captureBeyondViewport: !fitsViewport }));
     return Buffer.from(result.data, 'base64');
   }
 
@@ -307,10 +286,6 @@ export class CRPage implements PageDelegate {
     return this._sessionForHandle(handle)._getOwnerFrame(handle);
   }
 
-  isElementHandle(remoteObject: any): boolean {
-    return (remoteObject as Protocol.Runtime.RemoteObject).subtype === 'node';
-  }
-
   async getBoundingBox(handle: dom.ElementHandle): Promise<types.Rect | null> {
     return this._sessionForHandle(handle)._getBoundingBox(handle);
   }
@@ -340,11 +315,6 @@ export class CRPage implements PageDelegate {
     return this._sessionForHandle(handle)._getContentQuads(handle);
   }
 
-  async setInputFiles(handle: dom.ElementHandle<HTMLInputElement>, files: types.FilePayload[]): Promise<void> {
-    await handle.evaluateInUtility(([injected, node, files]) =>
-      injected.setInputFiles(node, files), files);
-  }
-
   async setInputFilePaths(handle: dom.ElementHandle<HTMLInputElement>, files: string[]): Promise<void> {
     const frame = await handle.ownerFrame();
     if (!frame)
@@ -368,7 +338,9 @@ export class CRPage implements PageDelegate {
     await this._mainFrameSession._client.send('Page.enable').catch(e => {});
   }
 
-  async resetForReuse(): Promise<void> {
+  async resetForReuse(progress: Progress): Promise<void> {
+    // See https://github.com/microsoft/playwright/issues/22432.
+    await this.rawMouse.move(progress, -1, -1, 'none', new Set(), new Set(), true);
   }
 
   async pdf(options: channels.PagePdfParams): Promise<Buffer> {
@@ -419,10 +391,9 @@ class FrameSession {
   private _videoRecorder: VideoRecorder | null = null;
   private _screencastId: string | null = null;
   private _screencastClients = new Set<any>();
-  private _evaluateOnNewDocumentIdentifiers: string[] = [];
-  private _exposedBindingNames: string[] = [];
   private _metricsOverride: Protocol.Emulation.setDeviceMetricsOverrideParameters | undefined;
   private _workerSessions = new Map<string, CRSession>();
+  private _initScriptIds = new Map<InitScript, string>();
 
   constructor(crPage: CRPage, client: CRSession, targetId: string, parentSession: FrameSession | null) {
     this._client = client;
@@ -436,6 +407,9 @@ class FrameSession {
       this._firstNonInitialNavigationCommittedFulfill = f;
       this._firstNonInitialNavigationCommittedReject = r;
     });
+    // The Promise is not always awaited (e.g. FrameSession._initialize can throw)
+    // so we catch errors here to prevent unhandled promise rejection.
+    this._firstNonInitialNavigationCommittedPromise.catch(() => {});
   }
 
   _isMainFrame(): boolean {
@@ -472,8 +446,7 @@ class FrameSession {
   }
 
   async _initialize(hasUIWindow: boolean) {
-    const isSettingStorageState = this._page._browserContext.isSettingStorageState();
-    if (!isSettingStorageState && hasUIWindow &&
+    if (!this._page.isStorageStatePage && hasUIWindow &&
       !this._crPage._browserContext._browser.isClank() &&
       !this._crPage._browserContext._options.noDefaultViewport) {
       const { windowId } = await this._client.send('Browser.getWindowForTarget');
@@ -481,7 +454,7 @@ class FrameSession {
     }
 
     let screencastOptions: types.PageScreencastOptions | undefined;
-    if (!isSettingStorageState && this._isMainFrame() && this._crPage._browserContext._options.recordVideo && hasUIWindow) {
+    if (!this._page.isStorageStatePage && this._isMainFrame() && this._crPage._browserContext._options.recordVideo && hasUIWindow) {
       const screencastId = createGuid();
       const outputFile = path.join(this._crPage._browserContext._options.recordVideo.dir, screencastId + '.webm');
       screencastOptions = {
@@ -493,7 +466,7 @@ class FrameSession {
       // Note: it is important to start video recorder before sending Page.startScreencast,
       // and it is equally important to send Page.startScreencast before sending Runtime.runIfWaitingForDebugger.
       await this._createVideoRecorder(screencastId, screencastOptions);
-      this._crPage.pageOrError().then(p => {
+      this._crPage._page.waitForInitializedOrError().then(p => {
         if (p instanceof Error)
           this._stopVideoRecording().catch(() => {});
       });
@@ -511,18 +484,14 @@ class FrameSession {
           this._addRendererListeners();
         }
 
-        const localFrames = this._isMainFrame() ? this._page.frames() : [this._page._frameManager.frame(this._targetId)!];
+        const localFrames = this._isMainFrame() ? this._page.frames() : [this._page.frameManager.frame(this._targetId)!];
         for (const frame of localFrames) {
           // Note: frames might be removed before we send these.
           this._client._sendMayFail('Page.createIsolatedWorld', {
             frameId: frame._id,
             grantUniveralAccess: true,
-            worldName: UTILITY_WORLD_NAME,
+            worldName: this._crPage.utilityWorldName,
           });
-          for (const binding of this._crPage._browserContext._pageBindings.values())
-            frame.evaluateExpression(binding.source).catch(e => {});
-          for (const initScript of this._crPage._browserContext.initScripts)
-            frame.evaluateExpression(initScript.source).catch(e => {});
         }
 
         const isInitialEmptyPage = this._isMainFrame() && this._page.mainFrame().url() === ':';
@@ -543,18 +512,29 @@ class FrameSession {
       this._client.send('Runtime.enable', {}),
       this._client.send('Page.addScriptToEvaluateOnNewDocument', {
         source: '',
-        worldName: UTILITY_WORLD_NAME,
+        worldName: this._crPage.utilityWorldName,
       }),
       this._crPage._networkManager.addSession(this._client, undefined, this._isMainFrame()),
-      this._client.send('Target.setAutoAttach', { autoAttach: true, waitForDebuggerOnStart: true, flatten: true }),
+      this._client.send('Target.setAutoAttach', {
+        autoAttach: true,
+        waitForDebuggerOnStart: true,
+        flatten: true,
+        filter: [
+          { type: 'iframe' },
+          { type: 'worker' },
+          { type: 'service_worker', exclude: !process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS }
+        ]
+      }),
     ];
-    if (!isSettingStorageState) {
+    if (!this._page.isStorageStatePage) {
+      if (this._crPage._browserContext.needsPlaywrightBinding())
+        promises.push(this.exposePlaywrightBinding());
       if (this._isMainFrame())
         promises.push(this._client.send('Emulation.setFocusEmulationEnabled', { enabled: true }));
       const options = this._crPage._browserContext._options;
       if (options.bypassCSP)
         promises.push(this._client.send('Page.setBypassCSP', { enabled: true }));
-      if (options.ignoreHTTPSErrors)
+      if (options.ignoreHTTPSErrors || options.internalIgnoreHTTPSErrors)
         promises.push(this._client.send('Security.setIgnoreCertificateErrors', { ignore: true }));
       if (this._isMainFrame())
         promises.push(this._updateViewport());
@@ -573,12 +553,8 @@ class FrameSession {
       promises.push(this._updateGeolocation(true));
       promises.push(this._updateEmulateMedia());
       promises.push(this._updateFileChooserInterception(true));
-      for (const binding of this._crPage._page.allBindings())
-        promises.push(this._initBinding(binding));
-      for (const initScript of this._crPage._browserContext.initScripts)
-        promises.push(this._evaluateOnNewDocument(initScript, 'main'));
-      for (const initScript of this._crPage._page.initScripts)
-        promises.push(this._evaluateOnNewDocument(initScript, 'main'));
+      for (const initScript of this._crPage._page.allInitScripts())
+        promises.push(this._evaluateOnNewDocument(initScript, 'main', true /* runImmediately */));
       if (screencastOptions)
         promises.push(this._startVideoRecording(screencastOptions));
     }
@@ -601,6 +577,8 @@ class FrameSession {
 
   async _navigate(frame: frames.Frame, url: string, referrer: string | undefined): Promise<frames.GotoResult> {
     const response = await this._client.send('Page.navigate', { url, referrer, frameId: frame._id, referrerPolicy: 'unsafeUrl' });
+    if (response.isDownload)
+      throw new frames.NavigationAbortedError(response.loaderId, 'Download is starting');
     if (response.errorText)
       throw new frames.NavigationAbortedError(response.loaderId, `${response.errorText} at ${url}`);
     return { newDocumentId: response.loaderId };
@@ -610,9 +588,9 @@ class FrameSession {
     if (this._eventBelongsToStaleFrame(event.frameId))
       return;
     if (event.name === 'load')
-      this._page._frameManager.frameLifecycleEvent(event.frameId, 'load');
+      this._page.frameManager.frameLifecycleEvent(event.frameId, 'load');
     else if (event.name === 'DOMContentLoaded')
-      this._page._frameManager.frameLifecycleEvent(event.frameId, 'domcontentloaded');
+      this._page.frameManager.frameLifecycleEvent(event.frameId, 'domcontentloaded');
   }
 
   _handleFrameTree(frameTree: Protocol.Page.FrameTree) {
@@ -626,7 +604,7 @@ class FrameSession {
   }
 
   private _eventBelongsToStaleFrame(frameId: string)  {
-    const frame = this._page._frameManager.frame(frameId);
+    const frame = this._page.frameManager.frame(frameId);
     // Subtree may be already gone because some ancestor navigation destroyed the oopif.
     if (!frame)
       return true;
@@ -643,26 +621,26 @@ class FrameSession {
     if (frameSession && frameId !== this._targetId) {
       // This is a remote -> local frame transition.
       frameSession._swappedIn = true;
-      const frame = this._page._frameManager.frame(frameId);
+      const frame = this._page.frameManager.frame(frameId);
       // Frame or even a whole subtree may be already gone, because some ancestor did navigate.
       if (frame)
-        this._page._frameManager.removeChildFramesRecursively(frame);
+        this._page.frameManager.removeChildFramesRecursively(frame);
       return;
     }
-    if (parentFrameId && !this._page._frameManager.frame(parentFrameId)) {
+    if (parentFrameId && !this._page.frameManager.frame(parentFrameId)) {
       // Parent frame may be gone already because some ancestor frame navigated and
       // destroyed the whole subtree of some oopif, while oopif's process is still sending us events.
       // Be careful to not confuse this with "main frame navigated cross-process" scenario
       // where parentFrameId is null.
       return;
     }
-    this._page._frameManager.frameAttached(frameId, parentFrameId);
+    this._page.frameManager.frameAttached(frameId, parentFrameId);
   }
 
   _onFrameNavigated(framePayload: Protocol.Page.Frame, initial: boolean) {
     if (this._eventBelongsToStaleFrame(framePayload.id))
       return;
-    this._page._frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url + (framePayload.urlFragment || ''), framePayload.name || '', framePayload.loaderId, initial);
+    this._page.frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url + (framePayload.urlFragment || ''), framePayload.name || '', framePayload.loaderId, initial);
     if (!initial)
       this._firstNonInitialNavigationCommittedFulfill();
   }
@@ -671,13 +649,13 @@ class FrameSession {
     if (this._eventBelongsToStaleFrame(payload.frameId))
       return;
     if (payload.disposition === 'currentTab')
-      this._page._frameManager.frameRequestedNavigation(payload.frameId);
+      this._page.frameManager.frameRequestedNavigation(payload.frameId);
   }
 
   _onFrameNavigatedWithinDocument(frameId: string, url: string) {
     if (this._eventBelongsToStaleFrame(frameId))
       return;
-    this._page._frameManager.frameCommittedSameDocumentNavigation(frameId, url);
+    this._page.frameManager.frameCommittedSameDocumentNavigation(frameId, url);
   }
 
   _onFrameDetached(frameId: string, reason: 'remove' | 'swap') {
@@ -691,27 +669,26 @@ class FrameSession {
       // This is a local -> remote frame transition, where
       // Page.frameDetached arrives before Target.attachedToTarget.
       // We should keep the frame in the tree, and it will be used for the new target.
-      const frame = this._page._frameManager.frame(frameId);
+      const frame = this._page.frameManager.frame(frameId);
       if (frame)
-        this._page._frameManager.removeChildFramesRecursively(frame);
+        this._page.frameManager.removeChildFramesRecursively(frame);
       return;
     }
     // Just a regular frame detach.
-    this._page._frameManager.frameDetached(frameId);
+    this._page.frameManager.frameDetached(frameId);
   }
 
   _onExecutionContextCreated(contextPayload: Protocol.Runtime.ExecutionContextDescription) {
-    const frame = contextPayload.auxData ? this._page._frameManager.frame(contextPayload.auxData.frameId) : null;
+    const frame = contextPayload.auxData ? this._page.frameManager.frame(contextPayload.auxData.frameId) : null;
     if (!frame || this._eventBelongsToStaleFrame(frame._id))
       return;
     const delegate = new CRExecutionContext(this._client, contextPayload);
     let worldName: types.World|null = null;
     if (contextPayload.auxData && !!contextPayload.auxData.isDefault)
       worldName = 'main';
-    else if (contextPayload.name === UTILITY_WORLD_NAME)
+    else if (contextPayload.name === this._crPage.utilityWorldName)
       worldName = 'utility';
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    (context as any)[contextDelegateSymbol] = delegate;
     if (worldName)
       frame._contextCreated(worldName, context);
     this._contextIdToContext.set(contextPayload.id, context);
@@ -736,10 +713,14 @@ class FrameSession {
     if (event.targetInfo.type === 'iframe') {
       // Frame id equals target id.
       const targetId = event.targetInfo.targetId;
-      const frame = this._page._frameManager.frame(targetId);
+      const frame = this._page.frameManager.frame(targetId);
       if (!frame)
         return; // Subtree may be already gone due to renderer/browser race.
-      this._page._frameManager.removeChildFramesRecursively(frame);
+      this._page.frameManager.removeChildFramesRecursively(frame);
+      for (const [contextId, context] of this._contextIdToContext) {
+        if (context.frame === frame)
+          this._onExecutionContextDestroyed(contextId);
+      }
       const frameSession = new FrameSession(this._crPage, session, targetId, this);
       this._crPage._sessions.set(targetId, frameSession);
       frameSession._initialize(false).catch(e => e);
@@ -753,22 +734,30 @@ class FrameSession {
 
     const url = event.targetInfo.url;
     const worker = new Worker(this._page, url);
-    this._page._addWorker(event.sessionId, worker);
+    this._page.addWorker(event.sessionId, worker);
     this._workerSessions.set(event.sessionId, session);
     session.once('Runtime.executionContextCreated', async event => {
-      worker._createExecutionContext(new CRExecutionContext(session, event.context));
+      worker.createExecutionContext(new CRExecutionContext(session, event.context));
     });
     // This might fail if the target is closed before we initialize.
     session._sendMayFail('Runtime.enable');
     // TODO: attribute workers to the right frame.
-    this._crPage._networkManager.addSession(session, this._page._frameManager.frame(this._targetId) ?? undefined).catch(() => {});
+    this._crPage._networkManager.addSession(session, this._page.frameManager.frame(this._targetId) ?? undefined).catch(() => {});
     session._sendMayFail('Runtime.runIfWaitingForDebugger');
-    session._sendMayFail('Target.setAutoAttach', { autoAttach: true, waitForDebuggerOnStart: true, flatten: true });
+    session._sendMayFail('Target.setAutoAttach', {
+      autoAttach: true,
+      waitForDebuggerOnStart: true,
+      flatten: true,
+      filter: [
+        { type: 'worker' },
+        { type: 'service_worker', exclude: !process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS }
+      ]
+    });
     session.on('Target.attachedToTarget', event => this._onAttachedToTarget(event));
     session.on('Target.detachedFromTarget', event => this._onDetachedFromTarget(event));
     session.on('Runtime.consoleAPICalled', event => {
-      const args = event.args.map(o => worker._existingExecutionContext!.createHandle(o));
-      this._page._addConsoleMessage(event.type, args, toConsoleMessageLocation(event.stackTrace));
+      const args = event.args.map(o => createHandle(worker.existingExecutionContext!, o));
+      this._page.addConsoleMessage(event.type, args, toConsoleMessageLocation(event.stackTrace));
     });
     session.on('Runtime.exceptionThrown', exception => this._page.emitOnContextOnceInitialized(BrowserContext.Events.PageError, exceptionToError(exception.exceptionDetails), this._page));
   }
@@ -778,7 +767,7 @@ class FrameSession {
     const workerSession = this._workerSessions.get(event.sessionId);
     if (workerSession) {
       workerSession.dispose();
-      this._page._removeWorker(event.sessionId);
+      this._page.removeWorker(event.sessionId);
       return;
     }
 
@@ -801,7 +790,7 @@ class FrameSession {
       // Child was not swapped in - that means frameAttached did not happen and
       // this is remote detach rather than remote -> local swap.
       if (!childFrameSession._swappedIn)
-        this._page._frameManager.frameDetached(event.targetId!);
+        this._page.frameManager.frameDetached(event.targetId!);
       childFrameSession.dispose();
     });
   }
@@ -830,46 +819,30 @@ class FrameSession {
     const context = this._contextIdToContext.get(event.executionContextId);
     if (!context)
       return;
-    const values = event.args.map(arg => context.createHandle(arg));
-    this._page._addConsoleMessage(event.type, values, toConsoleMessageLocation(event.stackTrace));
-  }
-
-  async _initBinding(binding: PageBinding) {
-    const [, response] = await Promise.all([
-      this._client.send('Runtime.addBinding', { name: binding.name }),
-      this._client.send('Page.addScriptToEvaluateOnNewDocument', { source: binding.source })
-    ]);
-    this._exposedBindingNames.push(binding.name);
-    if (!binding.name.startsWith('__pw'))
-      this._evaluateOnNewDocumentIdentifiers.push(response.identifier);
-  }
-
-  async _removeExposedBindings() {
-    const toRetain: string[] = [];
-    const toRemove: string[] = [];
-    for (const name of this._exposedBindingNames)
-      (name.startsWith('__pw_') ? toRetain : toRemove).push(name);
-    this._exposedBindingNames = toRetain;
-    await Promise.all(toRemove.map(name => this._client.send('Runtime.removeBinding', { name })));
+    const values = event.args.map(arg => createHandle(context, arg));
+    this._page.addConsoleMessage(event.type, values, toConsoleMessageLocation(event.stackTrace));
   }
 
   async _onBindingCalled(event: Protocol.Runtime.bindingCalledPayload) {
-    const pageOrError = await this._crPage.pageOrError();
+    const pageOrError = await this._crPage._page.waitForInitializedOrError();
     if (!(pageOrError instanceof Error)) {
       const context = this._contextIdToContext.get(event.executionContextId);
       if (context)
-        await this._page._onBindingCalled(event.payload, context);
+        await this._page.onBindingCalled(event.payload, context);
     }
   }
 
   _onDialog(event: Protocol.Page.javascriptDialogOpeningPayload) {
-    if (!this._page._frameManager.frame(this._targetId))
+    if (!this._page.frameManager.frame(this._targetId))
       return; // Our frame/subtree may be gone already.
-    this._page.emitOnContext(BrowserContext.Events.Dialog, new dialog.Dialog(
+    this._page.browserContext.dialogManager.dialogDidOpen(new dialog.Dialog(
         this._page,
         event.type,
         event.message,
         async (accept: boolean, promptText?: string) => {
+          // TODO: this should actually be a CDP event that notifies about a cancelled navigation attempt.
+          if (this._isMainFrame() && event.type === 'beforeunload' && !accept)
+            this._page.frameManager.frameAbortedNavigation(this._page.mainFrame()._id, 'navigation cancelled by beforeunload dialog');
           await this._client.send('Page.handleJavaScriptDialog', { accept, promptText });
         },
         event.defaultPrompt));
@@ -894,14 +867,14 @@ class FrameSession {
         lineNumber: lineNumber || 0,
         columnNumber: 0,
       };
-      this._page._addConsoleMessage(level, [], location, text);
+      this._page.addConsoleMessage(level, [], location, text);
     }
   }
 
   async _onFileChooserOpened(event: Protocol.Page.fileChooserOpenedPayload) {
     if (!event.backendNodeId)
       return;
-    const frame = this._page._frameManager.frame(event.frameId);
+    const frame = this._page.frameManager.frame(event.frameId);
     if (!frame)
       return;
     let handle;
@@ -916,8 +889,7 @@ class FrameSession {
   }
 
   _willBeginDownload() {
-    const originPage = this._crPage._initializedPage;
-    if (!originPage) {
+    if (!this._crPage._page.initializedOrUndefined()) {
       // Resume the page creation with an error. The page will automatically close right
       // after the download begins.
       this._firstNonInitialNavigationCommittedReject(new Error('Starting new page download'));
@@ -931,7 +903,7 @@ class FrameSession {
     const buffer = Buffer.from(payload.data, 'base64');
     this._page.emit(Page.Events.ScreencastFrame, {
       buffer,
-      timestamp: payload.metadata.timestamp,
+      frameSwapWallTime: payload.metadata.timestamp ? payload.metadata.timestamp * 1000 : undefined,
       width: payload.metadata.deviceWidth,
       height: payload.metadata.deviceHeight,
     });
@@ -939,7 +911,7 @@ class FrameSession {
 
   async _createVideoRecorder(screencastId: string, options: types.PageScreencastOptions): Promise<void> {
     assert(!this._screencastId);
-    const ffmpegPath = registry.findExecutable('ffmpeg')!.executablePathOrDie(this._page.attribution.playwright.options.sdkLanguage);
+    const ffmpegPath = registry.findExecutable('ffmpeg')!.executablePathOrDie(this._page.browserContext._browser.sdkLanguage());
     this._videoRecorder = await VideoRecorder.launch(this._crPage._page, ffmpegPath, options);
     this._screencastId = screencastId;
   }
@@ -957,7 +929,7 @@ class FrameSession {
     });
     // Wait for the first frame before reporting video to the client.
     gotFirstFrame.then(() => {
-      this._crPage._browserContext._browser._videoStarted(this._crPage._browserContext, screencastId, options.outputFile, this._crPage.pageOrError());
+      this._crPage._browserContext._browser._videoStarted(this._crPage._browserContext, screencastId, options.outputFile, this._crPage._page.waitForInitializedOrError());
     });
   }
 
@@ -1000,7 +972,7 @@ class FrameSession {
     assert(this._isMainFrame());
     const options = this._crPage._browserContext._options;
     const emulatedSize = this._page.emulatedSize();
-    if (emulatedSize === null)
+    if (!emulatedSize)
       return;
     const viewportSize = emulatedSize.viewport;
     const screenSize = emulatedSize.screen;
@@ -1019,9 +991,7 @@ class FrameSession {
     };
     if (JSON.stringify(this._metricsOverride) === JSON.stringify(metricsOverride))
       return;
-    const promises = [
-      this._client.send('Emulation.setDeviceMetricsOverride', metricsOverride),
-    ];
+    const promises = [];
     if (!preserveWindowBoundaries && this._windowId) {
       let insets = { width: 0, height: 0 };
       if (this._crPage._browserContext._browser.options.headful) {
@@ -1045,6 +1015,8 @@ class FrameSession {
         height: viewportSize.height + insets.height
       }));
     }
+    // Make sure that the viewport emulationis set after the embedder window resize.
+    promises.push(this._client.send('Emulation.setDeviceMetricsOverride', metricsOverride));
     await Promise.all(promises);
     this._metricsOverride = metricsOverride;
   }
@@ -1070,10 +1042,12 @@ class FrameSession {
     const colorScheme = emulatedMedia.colorScheme === 'no-override' ? '' : emulatedMedia.colorScheme;
     const reducedMotion = emulatedMedia.reducedMotion === 'no-override' ? '' : emulatedMedia.reducedMotion;
     const forcedColors = emulatedMedia.forcedColors === 'no-override' ? '' : emulatedMedia.forcedColors;
+    const contrast = emulatedMedia.contrast === 'no-override' ? '' : emulatedMedia.contrast;
     const features = [
       { name: 'prefers-color-scheme', value: colorScheme },
       { name: 'prefers-reduced-motion', value: reducedMotion },
       { name: 'forced-colors', value: forcedColors },
+      { name: 'prefers-contrast', value: contrast },
     ];
     await this._client.send('Emulation.setEmulatedMedia', { media, features });
   }
@@ -1099,16 +1073,25 @@ class FrameSession {
     await this._client.send('Page.setInterceptFileChooserDialog', { enabled }).catch(() => {}); // target can be closed.
   }
 
-  async _evaluateOnNewDocument(initScript: InitScript, world: types.World): Promise<void> {
-    const worldName = world === 'utility' ? UTILITY_WORLD_NAME : undefined;
-    const { identifier } = await this._client.send('Page.addScriptToEvaluateOnNewDocument', { source: initScript.source, worldName });
-    this._evaluateOnNewDocumentIdentifiers.push(identifier);
+  async _evaluateOnNewDocument(initScript: InitScript, world: types.World, runImmediately?: boolean): Promise<void> {
+    const worldName = world === 'utility' ? this._crPage.utilityWorldName : undefined;
+    const { identifier } = await this._client.send('Page.addScriptToEvaluateOnNewDocument', { source: initScript.source, worldName, runImmediately });
+    this._initScriptIds.set(initScript, identifier);
   }
 
-  async _removeEvaluatesOnNewDocument(): Promise<void> {
-    const identifiers = this._evaluateOnNewDocumentIdentifiers;
-    this._evaluateOnNewDocumentIdentifiers = [];
-    await Promise.all(identifiers.map(identifier => this._client.send('Page.removeScriptToEvaluateOnNewDocument', { identifier })));
+  async _removeEvaluatesOnNewDocument(initScripts: InitScript[]): Promise<void> {
+    const ids: string[] = [];
+    for (const script of initScripts) {
+      const id = this._initScriptIds.get(script);
+      if (id)
+        ids.push(id);
+      this._initScriptIds.delete(script);
+    }
+    await Promise.all(ids.map(identifier => this._client.send('Page.removeScriptToEvaluateOnNewDocument', { identifier }).catch(() => {}))); // target can be closed
+  }
+
+  async exposePlaywrightBinding() {
+    await this._client.send('Runtime.addBinding', { name: PageBinding.kBindingName });
   }
 
   async _getContentFrame(handle: dom.ElementHandle): Promise<frames.Frame | null> {
@@ -1117,7 +1100,7 @@ class FrameSession {
     });
     if (!nodeInfo || typeof nodeInfo.node.frameId !== 'string')
       return null;
-    return this._page._frameManager.frame(nodeInfo.node.frameId);
+    return this._page.frameManager.frame(nodeInfo.node.frameId);
   }
 
   async _getOwnerFrame(handle: dom.ElementHandle): Promise<string | null> {
@@ -1159,7 +1142,7 @@ class FrameSession {
   }
 
   private async _framePosition(): Promise<types.Point | null> {
-    const frame = this._page._frameManager.frame(this._targetId);
+    const frame = this._page.frameManager.frame(this._targetId);
     if (!frame)
       return null;
     if (frame === this._page.mainFrame())
@@ -1209,11 +1192,11 @@ class FrameSession {
   async _adoptBackendNodeId(backendNodeId: Protocol.DOM.BackendNodeId, to: dom.FrameExecutionContext): Promise<dom.ElementHandle> {
     const result = await this._client._sendMayFail('DOM.resolveNode', {
       backendNodeId,
-      executionContextId: ((to as any)[contextDelegateSymbol] as CRExecutionContext)._contextId,
+      executionContextId: (to.delegate as CRExecutionContext)._contextId,
     });
     if (!result || result.object.subtype === 'null')
       throw new Error(dom.kUnableToAdoptErrorMessage);
-    return to.createHandle(result.object).asElement()!;
+    return createHandle(to, result.object).asElement()!;
   }
 }
 
@@ -1242,17 +1225,15 @@ async function emulateTimezone(session: CRSession, timezoneId: string) {
   }
 }
 
-const contextDelegateSymbol = Symbol('delegate');
-
 // Chromium reference: https://source.chromium.org/chromium/chromium/src/+/main:components/embedder_support/user_agent_utils.cc;l=434;drc=70a6711e08e9f9e0d8e4c48e9ba5cab62eb010c2
-function calculateUserAgentMetadata(options: channels.BrowserNewContextParams) {
+function calculateUserAgentMetadata(options: types.BrowserContextOptions) {
   const ua = options.userAgent;
   if (!ua)
     return undefined;
   const metadata: Protocol.Emulation.UserAgentMetadata = {
     mobile: !!options.isMobile,
     model: '',
-    architecture: 'x64',
+    architecture: 'x86',
     platform: 'Windows',
     platformVersion: '',
   };
diff --git a/packages/playwright-core/src/server/chromium/crPdf.ts b/packages/playwright-core/src/server/chromium/crPdf.ts
index 8dae2d1fa1442..70d11208b9e82 100644
--- a/packages/playwright-core/src/server/chromium/crPdf.ts
+++ b/packages/playwright-core/src/server/chromium/crPdf.ts
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
+import { readProtocolStream } from './crProtocolHelper';
 import { assert } from '../../utils';
-import type * as channels from '@protocol/channels';
+
 import type { CRSession } from './crConnection';
-import { readProtocolStream } from './crProtocolHelper';
+import type * as channels from '@protocol/channels';
 
 const PagePaperFormats: { [key: string]: { width: number, height: number }} = {
   letter: { width: 8.5, height: 11 },
diff --git a/packages/playwright-core/src/server/chromium/crProtocolHelper.ts b/packages/playwright-core/src/server/chromium/crProtocolHelper.ts
index 9458bed1246eb..2f60ff32d0192 100644
--- a/packages/playwright-core/src/server/chromium/crProtocolHelper.ts
+++ b/packages/playwright-core/src/server/chromium/crProtocolHelper.ts
@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 
+import fs from 'fs';
+
+import { splitErrorMessage } from '../../utils/isomorphic/stackTrace';
+import { mkdirIfNeeded } from '../utils/fileUtils';
+
 import type { CRSession } from './crConnection';
 import type { Protocol } from './protocol';
-import fs from 'fs';
 import type * as types from '../types';
-import { mkdirIfNeeded } from '../../utils/fileUtils';
-import { splitErrorMessage } from '../../utils/stackTrace';
+
 
 export function getExceptionMessage(exceptionDetails: Protocol.Runtime.ExceptionDetails): string {
   if (exceptionDetails.exception)
diff --git a/packages/playwright-core/src/server/chromium/crServiceWorker.ts b/packages/playwright-core/src/server/chromium/crServiceWorker.ts
index 730504866b859..23099867c588e 100644
--- a/packages/playwright-core/src/server/chromium/crServiceWorker.ts
+++ b/packages/playwright-core/src/server/chromium/crServiceWorker.ts
@@ -14,26 +14,27 @@
  * limitations under the License.
  */
 import { Worker } from '../page';
-import type { CRBrowserContext } from './crBrowser';
-import type { CRSession } from './crConnection';
 import { CRExecutionContext } from './crExecutionContext';
 import { CRNetworkManager } from './crNetworkManager';
-import * as network from '../network';
 import { BrowserContext } from '../browserContext';
+import * as network from '../network';
+
+import type { CRBrowserContext } from './crBrowser';
+import type { CRSession } from './crConnection';
 
 export class CRServiceWorker extends Worker {
-  readonly _browserContext: CRBrowserContext;
-  readonly _networkManager?: CRNetworkManager;
+  readonly browserContext: CRBrowserContext;
+  private readonly _networkManager?: CRNetworkManager;
   private _session: CRSession;
 
   constructor(browserContext: CRBrowserContext, session: CRSession, url: string) {
     super(browserContext, url);
     this._session = session;
-    this._browserContext = browserContext;
+    this.browserContext = browserContext;
     if (!!process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS)
       this._networkManager = new CRNetworkManager(null, this);
     session.once('Runtime.executionContextCreated', event => {
-      this._createExecutionContext(new CRExecutionContext(session, event.context));
+      this.createExecutionContext(new CRExecutionContext(session, event.context));
     });
 
     if (this._networkManager && this._isNetworkInspectionEnabled()) {
@@ -61,19 +62,19 @@ export class CRServiceWorker extends Worker {
   async updateOffline(): Promise<void> {
     if (!this._isNetworkInspectionEnabled())
       return;
-    await this._networkManager?.setOffline(!!this._browserContext._options.offline).catch(() => {});
+    await this._networkManager?.setOffline(!!this.browserContext._options.offline).catch(() => {});
   }
 
   async updateHttpCredentials(): Promise<void> {
     if (!this._isNetworkInspectionEnabled())
       return;
-    await this._networkManager?.authenticate(this._browserContext._options.httpCredentials || null).catch(() => {});
+    await this._networkManager?.authenticate(this.browserContext._options.httpCredentials || null).catch(() => {});
   }
 
   async updateExtraHTTPHeaders(): Promise<void> {
     if (!this._isNetworkInspectionEnabled())
       return;
-    await this._networkManager?.setExtraHTTPHeaders(this._browserContext._options.extraHTTPHeaders || []).catch(() => {});
+    await this._networkManager?.setExtraHTTPHeaders(this.browserContext._options.extraHTTPHeaders || []).catch(() => {});
   }
 
   async updateRequestInterception(): Promise<void> {
@@ -83,32 +84,28 @@ export class CRServiceWorker extends Worker {
   }
 
   needsRequestInterception(): boolean {
-    return this._isNetworkInspectionEnabled() && !!this._browserContext._requestInterceptor;
+    return this._isNetworkInspectionEnabled() && this.browserContext.requestInterceptors.length > 0;
   }
 
   reportRequestFinished(request: network.Request, response: network.Response | null) {
-    this._browserContext.emit(BrowserContext.Events.RequestFinished, { request, response });
+    this.browserContext.emit(BrowserContext.Events.RequestFinished, { request, response });
   }
 
   requestFailed(request: network.Request, _canceled: boolean) {
-    this._browserContext.emit(BrowserContext.Events.RequestFailed, request);
+    this.browserContext.emit(BrowserContext.Events.RequestFailed, request);
   }
 
   requestReceivedResponse(response: network.Response) {
-    this._browserContext.emit(BrowserContext.Events.Response, response);
+    this.browserContext.emit(BrowserContext.Events.Response, response);
   }
 
   requestStarted(request: network.Request, route?: network.RouteDelegate) {
-    this._browserContext.emit(BrowserContext.Events.Request, request);
-    if (route) {
-      const r = new network.Route(request, route);
-      if (this._browserContext._requestInterceptor?.(r, request))
-        return;
-      r.continue({ isFallback: true }).catch(() => {});
-    }
+    this.browserContext.emit(BrowserContext.Events.Request, request);
+    if (route)
+      new network.Route(request, route).handle(this.browserContext.requestInterceptors);
   }
 
   private _isNetworkInspectionEnabled(): boolean {
-    return this._browserContext._options.serviceWorkers !== 'block';
+    return this.browserContext._options.serviceWorkers !== 'block';
   }
 }
diff --git a/packages/playwright-core/src/server/chromium/protocol.d.ts b/packages/playwright-core/src/server/chromium/protocol.d.ts
index 99ce1d3a6aaa3..1fab022bfb268 100644
--- a/packages/playwright-core/src/server/chromium/protocol.d.ts
+++ b/packages/playwright-core/src/server/chromium/protocol.d.ts
@@ -112,7 +112,7 @@ export module Protocol {
 - from 'checked' to 'selected': states which apply to widgets
 - from 'activedescendant' to 'owns' - relationships between elements other than parent/child/sibling.
      */
-    export type AXPropertyName = "busy"|"disabled"|"editable"|"focusable"|"focused"|"hidden"|"hiddenRoot"|"invalid"|"keyshortcuts"|"settable"|"roledescription"|"live"|"atomic"|"relevant"|"root"|"autocomplete"|"hasPopup"|"level"|"multiselectable"|"orientation"|"multiline"|"readonly"|"required"|"valuemin"|"valuemax"|"valuetext"|"checked"|"expanded"|"modal"|"pressed"|"selected"|"activedescendant"|"controls"|"describedby"|"details"|"errormessage"|"flowto"|"labelledby"|"owns"|"url";
+    export type AXPropertyName = "actions"|"busy"|"disabled"|"editable"|"focusable"|"focused"|"hidden"|"hiddenRoot"|"invalid"|"keyshortcuts"|"settable"|"roledescription"|"live"|"atomic"|"relevant"|"root"|"autocomplete"|"hasPopup"|"level"|"multiselectable"|"orientation"|"multiline"|"readonly"|"required"|"valuemin"|"valuemax"|"valuetext"|"checked"|"expanded"|"modal"|"pressed"|"selected"|"activedescendant"|"controls"|"describedby"|"details"|"errormessage"|"flowto"|"labelledby"|"owns"|"url";
     /**
      * A node in the accessibility tree.
      */
@@ -685,8 +685,8 @@ percentage [0 - 100] for scroll driven animations
       /**
        * The unique request id.
        */
-      requestId: Network.RequestId;
-      url?: string;
+      requestId?: Network.RequestId;
+      url: string;
     }
     /**
      * Information about the frame affected by an inspector issue.
@@ -694,9 +694,23 @@ percentage [0 - 100] for scroll driven animations
     export interface AffectedFrame {
       frameId: Page.FrameId;
     }
-    export type CookieExclusionReason = "ExcludeSameSiteUnspecifiedTreatedAsLax"|"ExcludeSameSiteNoneInsecure"|"ExcludeSameSiteLax"|"ExcludeSameSiteStrict"|"ExcludeInvalidSameParty"|"ExcludeSamePartyCrossPartyContext"|"ExcludeDomainNonASCII"|"ExcludeThirdPartyCookieBlockedInFirstPartySet"|"ExcludeThirdPartyPhaseout";
-    export type CookieWarningReason = "WarnSameSiteUnspecifiedCrossSiteContext"|"WarnSameSiteNoneInsecure"|"WarnSameSiteUnspecifiedLaxAllowUnsafe"|"WarnSameSiteStrictLaxDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeLax"|"WarnSameSiteLaxCrossDowngradeStrict"|"WarnSameSiteLaxCrossDowngradeLax"|"WarnAttributeValueExceedsMaxSize"|"WarnDomainNonASCII"|"WarnThirdPartyPhaseout"|"WarnCrossSiteRedirectDowngradeChangesInclusion";
+    export type CookieExclusionReason = "ExcludeSameSiteUnspecifiedTreatedAsLax"|"ExcludeSameSiteNoneInsecure"|"ExcludeSameSiteLax"|"ExcludeSameSiteStrict"|"ExcludeInvalidSameParty"|"ExcludeSamePartyCrossPartyContext"|"ExcludeDomainNonASCII"|"ExcludeThirdPartyCookieBlockedInFirstPartySet"|"ExcludeThirdPartyPhaseout"|"ExcludePortMismatch"|"ExcludeSchemeMismatch";
+    export type CookieWarningReason = "WarnSameSiteUnspecifiedCrossSiteContext"|"WarnSameSiteNoneInsecure"|"WarnSameSiteUnspecifiedLaxAllowUnsafe"|"WarnSameSiteStrictLaxDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeLax"|"WarnSameSiteLaxCrossDowngradeStrict"|"WarnSameSiteLaxCrossDowngradeLax"|"WarnAttributeValueExceedsMaxSize"|"WarnDomainNonASCII"|"WarnThirdPartyPhaseout"|"WarnCrossSiteRedirectDowngradeChangesInclusion"|"WarnDeprecationTrialMetadata"|"WarnThirdPartyCookieHeuristic";
     export type CookieOperation = "SetCookie"|"ReadCookie";
+    /**
+     * Represents the category of insight that a cookie issue falls under.
+     */
+    export type InsightType = "GitHubResource"|"GracePeriod"|"Heuristics";
+    /**
+     * Information about the suggested solution to a cookie issue.
+     */
+    export interface CookieIssueInsight {
+      type: InsightType;
+      /**
+       * Link to table entry in third-party cookie migration readiness list.
+       */
+      tableEntryUrl?: string;
+    }
     /**
      * This information is currently necessary, as the front-end has a difficult
 time finding a specific cookie. With this, we can convey specific error
@@ -721,6 +735,10 @@ may be used by the front-end as additional context.
       siteForCookies?: string;
       cookieUrl?: string;
       request?: AffectedRequest;
+      /**
+       * The recommended solution to the issue.
+       */
+      insight?: CookieIssueInsight;
     }
     export type MixedContentResolutionStatus = "MixedContentBlocked"|"MixedContentAutomaticallyUpgraded"|"MixedContentWarning";
     export type MixedContentResourceType = "AttributionSrc"|"Audio"|"Beacon"|"CSPReport"|"Download"|"EventSource"|"Favicon"|"Font"|"Form"|"Frame"|"Image"|"Import"|"JSON"|"Manifest"|"Ping"|"PluginData"|"PluginResource"|"Prefetch"|"Resource"|"Script"|"ServiceWorker"|"SharedWorker"|"SpeculationRules"|"Stylesheet"|"Track"|"Video"|"Worker"|"XMLHttpRequest"|"XSLT";
@@ -758,7 +776,7 @@ Does not always exist (e.g. for unsafe form submission urls).
      * Enum indicating the reason a response has been blocked. These reasons are
 refinements of the net error BLOCKED_BY_RESPONSE.
      */
-    export type BlockedByResponseReason = "CoepFrameResourceNeedsCoepHeader"|"CoopSandboxedIFrameCannotNavigateToCoopPage"|"CorpNotSameOrigin"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoep"|"CorpNotSameOriginAfterDefaultedToSameOriginByDip"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoepAndDip"|"CorpNotSameSite";
+    export type BlockedByResponseReason = "CoepFrameResourceNeedsCoepHeader"|"CoopSandboxedIFrameCannotNavigateToCoopPage"|"CorpNotSameOrigin"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoep"|"CorpNotSameOriginAfterDefaultedToSameOriginByDip"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoepAndDip"|"CorpNotSameSite"|"SRIMessageSignatureMismatch";
     /**
      * Details for a request that has been blocked with the BLOCKED_BY_RESPONSE
 code. Currently only used for COEP/COOP, but may be extended to include
@@ -786,7 +804,7 @@ some CSP errors in the future.
        */
       frame: AffectedFrame;
     }
-    export type ContentSecurityPolicyViolationType = "kInlineViolation"|"kEvalViolation"|"kURLViolation"|"kTrustedTypesSinkViolation"|"kTrustedTypesPolicyViolation"|"kWasmEvalViolation";
+    export type ContentSecurityPolicyViolationType = "kInlineViolation"|"kEvalViolation"|"kURLViolation"|"kSRIViolation"|"kTrustedTypesSinkViolation"|"kTrustedTypesPolicyViolation"|"kWasmEvalViolation";
     export interface SourceCodeLocation {
       scriptId?: Runtime.ScriptId;
       url: string;
@@ -840,8 +858,10 @@ CORS RFC1918 enforcement.
       resourceIPAddressSpace?: Network.IPAddressSpace;
       clientSecurityState?: Network.ClientSecurityState;
     }
-    export type AttributionReportingIssueType = "PermissionPolicyDisabled"|"UntrustworthyReportingOrigin"|"InsecureContext"|"InvalidHeader"|"InvalidRegisterTriggerHeader"|"SourceAndTriggerHeaders"|"SourceIgnored"|"TriggerIgnored"|"OsSourceIgnored"|"OsTriggerIgnored"|"InvalidRegisterOsSourceHeader"|"InvalidRegisterOsTriggerHeader"|"WebAndOsHeaders"|"NoWebOrOsSupport"|"NavigationRegistrationWithoutTransientUserActivation"|"InvalidInfoHeader"|"NoRegisterSourceHeader"|"NoRegisterTriggerHeader"|"NoRegisterOsSourceHeader"|"NoRegisterOsTriggerHeader";
+    export type AttributionReportingIssueType = "PermissionPolicyDisabled"|"UntrustworthyReportingOrigin"|"InsecureContext"|"InvalidHeader"|"InvalidRegisterTriggerHeader"|"SourceAndTriggerHeaders"|"SourceIgnored"|"TriggerIgnored"|"OsSourceIgnored"|"OsTriggerIgnored"|"InvalidRegisterOsSourceHeader"|"InvalidRegisterOsTriggerHeader"|"WebAndOsHeaders"|"NoWebOrOsSupport"|"NavigationRegistrationWithoutTransientUserActivation"|"InvalidInfoHeader"|"NoRegisterSourceHeader"|"NoRegisterTriggerHeader"|"NoRegisterOsSourceHeader"|"NoRegisterOsTriggerHeader"|"NavigationRegistrationUniqueScopeAlreadySet";
     export type SharedDictionaryError = "UseErrorCrossOriginNoCorsRequest"|"UseErrorDictionaryLoadFailure"|"UseErrorMatchingDictionaryNotUsed"|"UseErrorUnexpectedContentDictionaryHeader"|"WriteErrorCossOriginNoCorsRequest"|"WriteErrorDisallowedBySettings"|"WriteErrorExpiredResponse"|"WriteErrorFeatureDisabled"|"WriteErrorInsufficientResources"|"WriteErrorInvalidMatchField"|"WriteErrorInvalidStructuredHeader"|"WriteErrorNavigationRequest"|"WriteErrorNoMatchField"|"WriteErrorNonListMatchDestField"|"WriteErrorNonSecureContext"|"WriteErrorNonStringIdField"|"WriteErrorNonStringInMatchDestList"|"WriteErrorNonStringMatchField"|"WriteErrorNonTokenTypeField"|"WriteErrorRequestAborted"|"WriteErrorShuttingDown"|"WriteErrorTooLongIdField"|"WriteErrorUnsupportedType";
+    export type SRIMessageSignatureError = "MissingSignatureHeader"|"MissingSignatureInputHeader"|"InvalidSignatureHeader"|"InvalidSignatureInputHeader"|"SignatureHeaderValueIsNotByteSequence"|"SignatureHeaderValueIsParameterized"|"SignatureHeaderValueIsIncorrectLength"|"SignatureInputHeaderMissingLabel"|"SignatureInputHeaderValueNotInnerList"|"SignatureInputHeaderValueMissingComponents"|"SignatureInputHeaderInvalidComponentType"|"SignatureInputHeaderInvalidComponentName"|"SignatureInputHeaderInvalidHeaderComponentParameter"|"SignatureInputHeaderInvalidDerivedComponentParameter"|"SignatureInputHeaderKeyIdLength"|"SignatureInputHeaderInvalidParameter"|"SignatureInputHeaderMissingRequiredParameters"|"ValidationFailedSignatureExpired"|"ValidationFailedInvalidLength"|"ValidationFailedSignatureMismatch"|"ValidationFailedIntegrityMismatch";
+    export type UnencodedDigestError = "MalformedDictionary"|"UnknownAlgorithm"|"IncorrectDigestType"|"IncorrectDigestLength";
     /**
      * Details for issues around "Attribution Reporting API" usage.
 Explainer: https://github.com/WICG/attribution-reporting-api
@@ -875,6 +895,16 @@ instead of "limited-quirks".
       sharedDictionaryError: SharedDictionaryError;
       request: AffectedRequest;
     }
+    export interface SRIMessageSignatureIssueDetails {
+      error: SRIMessageSignatureError;
+      signatureBase: string;
+      integrityAssertions: string[];
+      request: AffectedRequest;
+    }
+    export interface UnencodedDigestIssueDetails {
+      error: UnencodedDigestError;
+      request: AffectedRequest;
+    }
     export type GenericIssueErrorType = "FormLabelForNameError"|"FormDuplicateIdForInputError"|"FormInputWithNoLabelError"|"FormAutocompleteAttributeEmptyError"|"FormEmptyIdAndNameAttributesForInputError"|"FormAriaLabelledByToNonExistingId"|"FormInputAssignedAutocompleteValueToIdOrNameAttributeError"|"FormLabelHasNeitherForNorNestedInput"|"FormLabelForMatchesNonExistingIdError"|"FormInputHasWrongButWellIntendedAutocompleteValueError"|"ResponseWasBlockedByORB";
     /**
      * Depending on the concrete errorType, different properties are set.
@@ -934,7 +964,7 @@ Should be updated alongside RequestIdTokenStatus in
 third_party/blink/public/mojom/devtools/inspector_issue.mojom to include
 all cases except for success.
      */
-    export type FederatedAuthRequestIssueReason = "ShouldEmbargo"|"TooManyRequests"|"WellKnownHttpNotFound"|"WellKnownNoResponse"|"WellKnownInvalidResponse"|"WellKnownListEmpty"|"WellKnownInvalidContentType"|"ConfigNotInWellKnown"|"WellKnownTooBig"|"ConfigHttpNotFound"|"ConfigNoResponse"|"ConfigInvalidResponse"|"ConfigInvalidContentType"|"ClientMetadataHttpNotFound"|"ClientMetadataNoResponse"|"ClientMetadataInvalidResponse"|"ClientMetadataInvalidContentType"|"IdpNotPotentiallyTrustworthy"|"DisabledInSettings"|"DisabledInFlags"|"ErrorFetchingSignin"|"InvalidSigninResponse"|"AccountsHttpNotFound"|"AccountsNoResponse"|"AccountsInvalidResponse"|"AccountsListEmpty"|"AccountsInvalidContentType"|"IdTokenHttpNotFound"|"IdTokenNoResponse"|"IdTokenInvalidResponse"|"IdTokenIdpErrorResponse"|"IdTokenCrossSiteIdpErrorResponse"|"IdTokenInvalidRequest"|"IdTokenInvalidContentType"|"ErrorIdToken"|"Canceled"|"RpPageNotVisible"|"SilentMediationFailure"|"ThirdPartyCookiesBlocked"|"NotSignedInWithIdp"|"MissingTransientUserActivation"|"ReplacedByButtonMode"|"InvalidFieldsSpecified"|"RelyingPartyOriginIsOpaque"|"TypeNotMatching";
+    export type FederatedAuthRequestIssueReason = "ShouldEmbargo"|"TooManyRequests"|"WellKnownHttpNotFound"|"WellKnownNoResponse"|"WellKnownInvalidResponse"|"WellKnownListEmpty"|"WellKnownInvalidContentType"|"ConfigNotInWellKnown"|"WellKnownTooBig"|"ConfigHttpNotFound"|"ConfigNoResponse"|"ConfigInvalidResponse"|"ConfigInvalidContentType"|"ClientMetadataHttpNotFound"|"ClientMetadataNoResponse"|"ClientMetadataInvalidResponse"|"ClientMetadataInvalidContentType"|"IdpNotPotentiallyTrustworthy"|"DisabledInSettings"|"DisabledInFlags"|"ErrorFetchingSignin"|"InvalidSigninResponse"|"AccountsHttpNotFound"|"AccountsNoResponse"|"AccountsInvalidResponse"|"AccountsListEmpty"|"AccountsInvalidContentType"|"IdTokenHttpNotFound"|"IdTokenNoResponse"|"IdTokenInvalidResponse"|"IdTokenIdpErrorResponse"|"IdTokenCrossSiteIdpErrorResponse"|"IdTokenInvalidRequest"|"IdTokenInvalidContentType"|"ErrorIdToken"|"Canceled"|"RpPageNotVisible"|"SilentMediationFailure"|"ThirdPartyCookiesBlocked"|"NotSignedInWithIdp"|"MissingTransientUserActivation"|"ReplacedByActiveMode"|"InvalidFieldsSpecified"|"RelyingPartyOriginIsOpaque"|"TypeNotMatching"|"UiDismissedNoEmbargo"|"CorsError"|"SuppressedBySegmentationPlatform";
     export interface FederatedAuthUserInfoRequestIssueDetails {
       federatedAuthUserInfoRequestIssueReason: FederatedAuthUserInfoRequestIssueReason;
     }
@@ -963,6 +993,26 @@ features, encourage the use of new ones, and provide general guidance.
       failureMessage: string;
       requestId?: Network.RequestId;
     }
+    export type PartitioningBlobURLInfo = "BlockedCrossPartitionFetching"|"EnforceNoopenerForNavigation";
+    export interface PartitioningBlobURLIssueDetails {
+      /**
+       * The BlobURL that failed to load.
+       */
+      url: string;
+      /**
+       * Additional information about the Partitioning Blob URL issue.
+       */
+      partitioningBlobURLInfo: PartitioningBlobURLInfo;
+    }
+    export type ElementAccessibilityIssueReason = "DisallowedSelectChild"|"DisallowedOptGroupChild"|"NonPhrasingContentOptionChild"|"InteractiveContentOptionChild"|"InteractiveContentLegendChild"|"InteractiveContentSummaryDescendant";
+    /**
+     * This issue warns about errors in the select or summary element content model.
+     */
+    export interface ElementAccessibilityIssueDetails {
+      nodeId: DOM.BackendNodeId;
+      elementAccessibilityIssueReason: ElementAccessibilityIssueReason;
+      hasDisallowedAttributes: boolean;
+    }
     export type StyleSheetLoadingIssueReason = "LateImportRule"|"RequestFailed";
     /**
      * This issue warns when a referenced stylesheet couldn't be loaded.
@@ -1000,12 +1050,24 @@ registrations being ignored.
        */
       propertyValue?: string;
     }
+    export type UserReidentificationIssueType = "BlockedFrameNavigation"|"BlockedSubresource";
+    /**
+     * This issue warns about uses of APIs that may be considered misuse to
+re-identify users.
+     */
+    export interface UserReidentificationIssueDetails {
+      type: UserReidentificationIssueType;
+      /**
+       * Applies to BlockedFrameNavigation and BlockedSubresource issue types.
+       */
+      request?: AffectedRequest;
+    }
     /**
      * A unique identifier for the type of issue. Each type may use one of the
 optional fields in InspectorIssueDetails to convey more specific
 information about the kind of issue.
      */
-    export type InspectorIssueCode = "CookieIssue"|"MixedContentIssue"|"BlockedByResponseIssue"|"HeavyAdIssue"|"ContentSecurityPolicyIssue"|"SharedArrayBufferIssue"|"LowTextContrastIssue"|"CorsIssue"|"AttributionReportingIssue"|"QuirksModeIssue"|"NavigatorUserAgentIssue"|"GenericIssue"|"DeprecationIssue"|"ClientHintIssue"|"FederatedAuthRequestIssue"|"BounceTrackingIssue"|"CookieDeprecationMetadataIssue"|"StylesheetLoadingIssue"|"FederatedAuthUserInfoRequestIssue"|"PropertyRuleIssue"|"SharedDictionaryIssue";
+    export type InspectorIssueCode = "CookieIssue"|"MixedContentIssue"|"BlockedByResponseIssue"|"HeavyAdIssue"|"ContentSecurityPolicyIssue"|"SharedArrayBufferIssue"|"LowTextContrastIssue"|"CorsIssue"|"AttributionReportingIssue"|"QuirksModeIssue"|"PartitioningBlobURLIssue"|"NavigatorUserAgentIssue"|"GenericIssue"|"DeprecationIssue"|"ClientHintIssue"|"FederatedAuthRequestIssue"|"BounceTrackingIssue"|"CookieDeprecationMetadataIssue"|"StylesheetLoadingIssue"|"FederatedAuthUserInfoRequestIssue"|"PropertyRuleIssue"|"SharedDictionaryIssue"|"ElementAccessibilityIssue"|"SRIMessageSignatureIssue"|"UnencodedDigestIssue"|"UserReidentificationIssue";
     /**
      * This struct holds a list of optional fields with additional information
 specific to the kind of issue. When adding a new issue code, please also
@@ -1022,6 +1084,7 @@ add a new optional field to this type.
       corsIssueDetails?: CorsIssueDetails;
       attributionReportingIssueDetails?: AttributionReportingIssueDetails;
       quirksModeIssueDetails?: QuirksModeIssueDetails;
+      partitioningBlobURLIssueDetails?: PartitioningBlobURLIssueDetails;
       navigatorUserAgentIssueDetails?: NavigatorUserAgentIssueDetails;
       genericIssueDetails?: GenericIssueDetails;
       deprecationIssueDetails?: DeprecationIssueDetails;
@@ -1033,6 +1096,10 @@ add a new optional field to this type.
       propertyRuleIssueDetails?: PropertyRuleIssueDetails;
       federatedAuthUserInfoRequestIssueDetails?: FederatedAuthUserInfoRequestIssueDetails;
       sharedDictionaryIssueDetails?: SharedDictionaryIssueDetails;
+      elementAccessibilityIssueDetails?: ElementAccessibilityIssueDetails;
+      sriMessageSignatureIssueDetails?: SRIMessageSignatureIssueDetails;
+      unencodedDigestIssueDetails?: UnencodedDigestIssueDetails;
+      userReidentificationIssueDetails?: UserReidentificationIssueDetails;
     }
     /**
      * A unique id for a DevTools inspector issue. Allows other entities (e.g.
@@ -1131,17 +1198,21 @@ using Audits.issueAdded event.
   }
   
   /**
-   * Defines commands and events for browser extensions. Available if the client
-is connected using the --remote-debugging-pipe flag and
-the --enable-unsafe-extension-debugging flag is set.
+   * Defines commands and events for browser extensions.
    */
   export module Extensions {
+    /**
+     * Storage areas.
+     */
+    export type StorageArea = "session"|"local"|"sync"|"managed";
     
     
     /**
      * Installs an unpacked extension from the filesystem similar to
 --load-extension CLI flags. Returns extension ID once the extension
-has been installed.
+has been installed. Available if the client is connected using the
+--remote-debugging-pipe flag and the --enable-unsafe-extension-debugging
+flag is set.
      */
     export type loadUnpackedParameters = {
       /**
@@ -1155,6 +1226,94 @@ has been installed.
        */
       id: string;
     }
+    /**
+     * Uninstalls an unpacked extension (others not supported) from the profile.
+Available if the client is connected using the --remote-debugging-pipe flag
+and the --enable-unsafe-extension-debugging.
+     */
+    export type uninstallParameters = {
+      /**
+       * Extension id.
+       */
+      id: string;
+    }
+    export type uninstallReturnValue = {
+    }
+    /**
+     * Gets data from extension storage in the given `storageArea`. If `keys` is
+specified, these are used to filter the result.
+     */
+    export type getStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to retrieve data from.
+       */
+      storageArea: StorageArea;
+      /**
+       * Keys to retrieve.
+       */
+      keys?: string[];
+    }
+    export type getStorageItemsReturnValue = {
+      data: { [key: string]: string };
+    }
+    /**
+     * Removes `keys` from extension storage in the given `storageArea`.
+     */
+    export type removeStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to remove data from.
+       */
+      storageArea: StorageArea;
+      /**
+       * Keys to remove.
+       */
+      keys: string[];
+    }
+    export type removeStorageItemsReturnValue = {
+    }
+    /**
+     * Clears extension storage in the given `storageArea`.
+     */
+    export type clearStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to remove data from.
+       */
+      storageArea: StorageArea;
+    }
+    export type clearStorageItemsReturnValue = {
+    }
+    /**
+     * Sets `values` in extension storage in the given `storageArea`. The provided `values`
+will be merged with existing values in the storage area.
+     */
+    export type setStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to set data in.
+       */
+      storageArea: StorageArea;
+      /**
+       * Values to set.
+       */
+      values: { [key: string]: string };
+    }
+    export type setStorageItemsReturnValue = {
+    }
   }
   
   /**
@@ -1455,7 +1614,7 @@ events afterwards if enabled and recording.
        */
       windowState?: WindowState;
     }
-    export type PermissionType = "accessibilityEvents"|"audioCapture"|"backgroundSync"|"backgroundFetch"|"capturedSurfaceControl"|"clipboardReadWrite"|"clipboardSanitizedWrite"|"displayCapture"|"durableStorage"|"flash"|"geolocation"|"idleDetection"|"localFonts"|"midi"|"midiSysex"|"nfc"|"notifications"|"paymentHandler"|"periodicBackgroundSync"|"protectedMediaIdentifier"|"sensors"|"storageAccess"|"speakerSelection"|"topLevelStorageAccess"|"videoCapture"|"videoCapturePanTiltZoom"|"wakeLockScreen"|"wakeLockSystem"|"windowManagement";
+    export type PermissionType = "ar"|"audioCapture"|"automaticFullscreen"|"backgroundFetch"|"backgroundSync"|"cameraPanTiltZoom"|"capturedSurfaceControl"|"clipboardReadWrite"|"clipboardSanitizedWrite"|"displayCapture"|"durableStorage"|"geolocation"|"handTracking"|"idleDetection"|"keyboardLock"|"localFonts"|"localNetworkAccess"|"midi"|"midiSysex"|"nfc"|"notifications"|"paymentHandler"|"periodicBackgroundSync"|"pointerLock"|"protectedMediaIdentifier"|"sensors"|"smartCard"|"speakerSelection"|"storageAccess"|"topLevelStorageAccess"|"videoCapture"|"vr"|"wakeLockScreen"|"wakeLockSystem"|"webAppInstallation"|"webPrinting"|"windowManagement";
     export type PermissionSetting = "granted"|"denied"|"prompt";
     /**
      * Definition of PermissionDescriptor defined in the Permissions API:
@@ -1492,7 +1651,7 @@ Note that userVisibleOnly = true is the only currently supported type.
     /**
      * Browser command ids used by executeBrowserCommand.
      */
-    export type BrowserCommandId = "openTabSearch"|"closeTabSearch";
+    export type BrowserCommandId = "openTabSearch"|"closeTabSearch"|"openGlic";
     /**
      * Chrome histogram bucket.
      */
@@ -1531,6 +1690,7 @@ Note that userVisibleOnly = true is the only currently supported type.
        */
       buckets: Bucket[];
     }
+    export type PrivacySandboxAPI = "BiddingAndAuctionServices"|"TrustedKeyValue";
     
     /**
      * Fired when page is about to start a download.
@@ -1573,6 +1733,12 @@ Note that userVisibleOnly = true is the only currently supported type.
        * Download status.
        */
       state: "inProgress"|"completed"|"canceled";
+      /**
+       * If download is "completed", provides the path of the downloaded file.
+Depending on the platform, it is not guaranteed to be set, nor the file
+is guaranteed to exist.
+       */
+      filePath?: string;
     }
     
     /**
@@ -1818,6 +1984,27 @@ with 'left', 'top', 'width' or 'height'. Leaves unspecified fields unchanged.
     }
     export type setWindowBoundsReturnValue = {
     }
+    /**
+     * Set size of the browser contents resizing browser window as necessary.
+     */
+    export type setContentsSizeParameters = {
+      /**
+       * Browser window id.
+       */
+      windowId: WindowID;
+      /**
+       * The window contents width in DIP. Assumes current width if omitted.
+Must be specified if 'height' is omitted.
+       */
+      width?: number;
+      /**
+       * The window contents height in DIP. Assumes current height if omitted.
+Must be specified if 'width' is omitted.
+       */
+      height?: number;
+    }
+    export type setContentsSizeReturnValue = {
+    }
     /**
      * Set dock tile details, platform-specific.
      */
@@ -1847,6 +2034,24 @@ without the site actually being enrolled. Only supported on page targets.
     }
     export type addPrivacySandboxEnrollmentOverrideReturnValue = {
     }
+    /**
+     * Configures encryption keys used with a given privacy sandbox API to talk
+to a trusted coordinator.  Since this is intended for test automation only,
+coordinatorOrigin must be a .test domain. No existing coordinator
+configuration for the origin may exist.
+     */
+    export type addPrivacySandboxCoordinatorKeyConfigParameters = {
+      api: PrivacySandboxAPI;
+      coordinatorOrigin: string;
+      keyConfig: string;
+      /**
+       * BrowserContext to perform the action in. When omitted, default browser
+context is used.
+       */
+      browserContextId?: BrowserContextID;
+    }
+    export type addPrivacySandboxCoordinatorKeyConfigReturnValue = {
+    }
   }
   
   /**
@@ -1882,6 +2087,19 @@ inspector" rules), "regular" for regular stylesheets.
        */
       matches: RuleMatch[];
     }
+    /**
+     * CSS style coming from animations with the name of the animation.
+     */
+    export interface CSSAnimationStyle {
+      /**
+       * The name of the animation.
+       */
+      name?: string;
+      /**
+       * The style coming from the animation.
+       */
+      style: CSSStyle;
+    }
     /**
      * Inherited CSS rule collection from ancestor node.
      */
@@ -1895,6 +2113,19 @@ inspector" rules), "regular" for regular stylesheets.
        */
       matchedCSSRules: RuleMatch[];
     }
+    /**
+     * Inherited CSS style collection for animated styles from ancestor node.
+     */
+    export interface InheritedAnimatedStyleEntry {
+      /**
+       * Styles coming from the animations of the ancestor, if any, in the style inheritance chain.
+       */
+      animationStyles?: CSSAnimationStyle[];
+      /**
+       * The style coming from the transitions of the ancestor, if any, in the style inheritance chain.
+       */
+      transitionsStyle?: CSSStyle;
+    }
     /**
      * Inherited pseudo element matches from pseudos of an ancestor node.
      */
@@ -2104,12 +2335,17 @@ The array enumerates @scope at-rules starting with the innermost one, going outw
        * The array keeps the types of ancestor CSSRules from the innermost going outwards.
        */
       ruleTypes?: CSSRuleType[];
+      /**
+       * @starting-style CSS at-rule array.
+The array enumerates @starting-style at-rules starting with the innermost one, going outwards.
+       */
+      startingStyles?: CSSStartingStyle[];
     }
     /**
      * Enum indicating the type of a CSS rule, used to represent the order of a style rule's ancestors.
 This list only contains rule types that are collected during the ancestor rule collection.
      */
-    export type CSSRuleType = "MediaRule"|"SupportsRule"|"ContainerRule"|"LayerRule"|"ScopeRule"|"StyleRule";
+    export type CSSRuleType = "MediaRule"|"SupportsRule"|"ContainerRule"|"LayerRule"|"ScopeRule"|"StyleRule"|"StartingStyleRule";
     /**
      * CSS coverage information.
      */
@@ -2345,6 +2581,14 @@ available).
        * Optional logical axes queried for the container.
        */
       logicalAxes?: DOM.LogicalAxes;
+      /**
+       * true if the query contains scroll-state() queries.
+       */
+      queriesScrollState?: boolean;
+      /**
+       * true if the query contains anchored() queries.
+       */
+      queriesAnchored?: boolean;
     }
     /**
      * CSS Supports at-rule descriptor.
@@ -2396,6 +2640,20 @@ available).
       text: string;
       /**
        * The associated rule header range in the enclosing stylesheet (if
+available).
+       */
+      range?: SourceRange;
+      /**
+       * Identifier of the stylesheet containing this object (if exists).
+       */
+      styleSheetId?: StyleSheetId;
+    }
+    /**
+     * CSS Starting Style at-rule descriptor.
+     */
+    export interface CSSStartingStyle {
+      /**
+       * The associated rule header range in the enclosing stylesheet (if
 available).
        */
       range?: SourceRange;
@@ -2532,16 +2790,6 @@ stylesheet rules) this rule came from.
        */
       style: CSSStyle;
     }
-    /**
-     * CSS position-fallback rule representation.
-     */
-    export interface CSSPositionFallbackRule {
-      name: Value;
-      /**
-       * List of keyframes.
-       */
-      tryRules: CSSTryRule[];
-    }
     /**
      * CSS @position-try rule representation.
      */
@@ -2631,6 +2879,83 @@ stylesheet rules) this rule came from.
        */
       style: CSSStyle;
     }
+    /**
+     * CSS function argument representation.
+     */
+    export interface CSSFunctionParameter {
+      /**
+       * The parameter name.
+       */
+      name: string;
+      /**
+       * The parameter type.
+       */
+      type: string;
+    }
+    /**
+     * CSS function conditional block representation.
+     */
+    export interface CSSFunctionConditionNode {
+      /**
+       * Media query for this conditional block. Only one type of condition should be set.
+       */
+      media?: CSSMedia;
+      /**
+       * Container query for this conditional block. Only one type of condition should be set.
+       */
+      containerQueries?: CSSContainerQuery;
+      /**
+       * @supports CSS at-rule condition. Only one type of condition should be set.
+       */
+      supports?: CSSSupports;
+      /**
+       * Block body.
+       */
+      children: CSSFunctionNode[];
+      /**
+       * The condition text.
+       */
+      conditionText: string;
+    }
+    /**
+     * Section of the body of a CSS function rule.
+     */
+    export interface CSSFunctionNode {
+      /**
+       * A conditional block. If set, style should not be set.
+       */
+      condition?: CSSFunctionConditionNode;
+      /**
+       * Values set by this node. If set, condition should not be set.
+       */
+      style?: CSSStyle;
+    }
+    /**
+     * CSS function at-rule representation.
+     */
+    export interface CSSFunctionRule {
+      /**
+       * Name of the function.
+       */
+      name: Value;
+      /**
+       * The css style sheet identifier (absent for user agent stylesheet and user-specified
+stylesheet rules) this rule came from.
+       */
+      styleSheetId?: StyleSheetId;
+      /**
+       * Parent stylesheet's origin.
+       */
+      origin: StyleSheetOrigin;
+      /**
+       * List of parameters.
+       */
+      parameters: CSSFunctionParameter[];
+      /**
+       * Function body.
+       */
+      children: CSSFunctionNode[];
+    }
     /**
      * CSS keyframe rule representation.
      */
@@ -2710,6 +3035,12 @@ resized.) The current implementation considers only viewport-dependent media fea
        */
       styleSheetId: StyleSheetId;
     }
+    export type computedStyleUpdatedPayload = {
+      /**
+       * The node id that has updated computed styles.
+       */
+      nodeId: DOM.NodeId;
+    }
     
     /**
      * Inserts a new rule with the given `ruleText` in a stylesheet with given `styleSheetId`, at the
@@ -2761,6 +3092,13 @@ incorrect results if the declaration contains a var() for example.
        * Identifier of the frame where "via-inspector" stylesheet should be created.
        */
       frameId: Page.FrameId;
+      /**
+       * If true, creates a new stylesheet for every call. If false,
+returns a stylesheet previously created by a call with force=false
+for the frame's document if it exists or creates a new stylesheet
+(default: false).
+       */
+      force?: boolean;
     }
     export type createStyleSheetReturnValue = {
       /**
@@ -2799,6 +3137,21 @@ the browser.
     }
     export type forcePseudoStateReturnValue = {
     }
+    /**
+     * Ensures that the given node is in its starting-style state.
+     */
+    export type forceStartingStyleParameters = {
+      /**
+       * The element id for which to force the starting-style state.
+       */
+      nodeId: DOM.NodeId;
+      /**
+       * Boolean indicating if this is on or off.
+       */
+      forced: boolean;
+    }
+    export type forceStartingStyleReturnValue = {
+    }
     export type getBackgroundColorsParameters = {
       /**
        * Id of the node to get background colors for.
@@ -2836,6 +3189,51 @@ be ignored (as if the image had failed to load).
        */
       computedStyle: CSSComputedStyleProperty[];
     }
+    /**
+     * Resolve the specified values in the context of the provided element.
+For example, a value of '1em' is evaluated according to the computed
+'font-size' of the element and a value 'calc(1px + 2px)' will be
+resolved to '3px'.
+If the `propertyName` was specified the `values` are resolved as if
+they were property's declaration. If a value cannot be parsed according
+to the provided property syntax, the value is parsed using combined
+syntax as if null `propertyName` was provided. If the value cannot be
+resolved even then, return the provided value without any changes.
+     */
+    export type resolveValuesParameters = {
+      /**
+       * Substitution functions (var()/env()/attr()) and cascade-dependent
+keywords (revert/revert-layer) do not work.
+       */
+      values: string[];
+      /**
+       * Id of the node in whose context the expression is evaluated
+       */
+      nodeId: DOM.NodeId;
+      /**
+       * Only longhands and custom property names are accepted.
+       */
+      propertyName?: string;
+      /**
+       * Pseudo element type, only works for pseudo elements that generate
+elements in the tree, such as ::before and ::after.
+       */
+      pseudoType?: DOM.PseudoType;
+      /**
+       * Pseudo element custom ident.
+       */
+      pseudoIdentifier?: string;
+    }
+    export type resolveValuesReturnValue = {
+      results: string[];
+    }
+    export type getLonghandPropertiesParameters = {
+      shorthandName: string;
+      value: string;
+    }
+    export type getLonghandPropertiesReturnValue = {
+      longhandProperties: CSSProperty[];
+    }
     /**
      * Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM
 attributes) for a DOM node identified by `nodeId`.
@@ -2853,6 +3251,28 @@ attributes) for a DOM node identified by `nodeId`.
        */
       attributesStyle?: CSSStyle;
     }
+    /**
+     * Returns the styles coming from animations & transitions
+including the animation & transition styles coming from inheritance chain.
+     */
+    export type getAnimatedStylesForNodeParameters = {
+      nodeId: DOM.NodeId;
+    }
+    export type getAnimatedStylesForNodeReturnValue = {
+      /**
+       * Styles coming from animations.
+       */
+      animationStyles?: CSSAnimationStyle[];
+      /**
+       * Style coming from transitions.
+       */
+      transitionsStyle?: CSSStyle;
+      /**
+       * Inherited style entries for animationsStyle and transitionsStyle from
+the inheritance chain of the element.
+       */
+      inherited?: InheritedAnimatedStyleEntry[];
+    }
     /**
      * Returns requested styles for a DOM node identified by `nodeId`.
      */
@@ -2888,10 +3308,6 @@ attributes) for a DOM node identified by `nodeId`.
        * A list of CSS keyframed animations matching this node.
        */
       cssKeyframesRules?: CSSKeyframesRule[];
-      /**
-       * A list of CSS position fallbacks matching this node.
-       */
-      cssPositionFallbackRules?: CSSPositionFallbackRule[];
       /**
        * A list of CSS @position-try rules matching this node, based on the position-try-fallbacks property.
        */
@@ -2917,6 +3333,18 @@ will not be set if there is no active position-try fallback.
        * Id of the first parent element that does not have display: contents.
        */
       parentLayoutNodeId?: DOM.NodeId;
+      /**
+       * A list of CSS at-function rules referenced by styles of this node.
+       */
+      cssFunctionRules?: CSSFunctionRule[];
+    }
+    /**
+     * Returns the values of the default UA-defined environment variables used in env()
+     */
+    export type getEnvironmentVariablesParameters = {
+    }
+    export type getEnvironmentVariablesReturnValue = {
+      environmentVariables: { [key: string]: string };
     }
     /**
      * Returns all media queries parsed by the rendering engine.
@@ -2974,6 +3402,19 @@ returns an array of locations of the CSS selector in the style sheet.
     export type getLocationForSelectorReturnValue = {
       ranges: SourceRange[];
     }
+    /**
+     * Starts tracking the given node for the computed style updates
+and whenever the computed style is updated for node, it queues
+a `computedStyleUpdated` event with throttling.
+There can only be 1 node tracked for computed style updates
+so passing a new node id removes tracking from the previous node.
+Pass `undefined` to disable tracking.
+     */
+    export type trackComputedStyleUpdatesForNodeParameters = {
+      nodeId?: DOM.NodeId;
+    }
+    export type trackComputedStyleUpdatesForNodeReturnValue = {
+    }
     /**
      * Starts tracking the given computed styles for updates. The specified array of properties
 replaces the one previously specified. Pass empty array to disable tracking.
@@ -3496,7 +3937,7 @@ front-end.
     /**
      * Pseudo element type.
      */
-    export type PseudoType = "first-line"|"first-letter"|"before"|"after"|"marker"|"backdrop"|"selection"|"search-text"|"target-text"|"spelling-error"|"grammar-error"|"highlight"|"first-line-inherited"|"scroll-marker"|"scroll-marker-group"|"scrollbar"|"scrollbar-thumb"|"scrollbar-button"|"scrollbar-track"|"scrollbar-track-piece"|"scrollbar-corner"|"resizer"|"input-list-button"|"view-transition"|"view-transition-group"|"view-transition-image-pair"|"view-transition-old"|"view-transition-new";
+    export type PseudoType = "first-line"|"first-letter"|"checkmark"|"before"|"after"|"picker-icon"|"marker"|"backdrop"|"column"|"selection"|"search-text"|"target-text"|"spelling-error"|"grammar-error"|"highlight"|"first-line-inherited"|"scroll-marker"|"scroll-marker-group"|"scroll-button"|"scrollbar"|"scrollbar-thumb"|"scrollbar-button"|"scrollbar-track"|"scrollbar-track-piece"|"scrollbar-corner"|"resizer"|"input-list-button"|"view-transition"|"view-transition-group"|"view-transition-image-pair"|"view-transition-group-children"|"view-transition-old"|"view-transition-new"|"placeholder"|"file-selector-button"|"details-content"|"picker"|"permission-icon";
     /**
      * Shadow root type.
      */
@@ -3645,6 +4086,14 @@ The property is always undefined now.
       isSVG?: boolean;
       compatibilityMode?: CompatibilityMode;
       assignedSlot?: BackendNode;
+      isScrollable?: boolean;
+    }
+    /**
+     * A structure to hold the top-level node of a detached tree and an array of its retained descendants.
+     */
+    export interface DetachedElementInfo {
+      treeNode: Node;
+      retainedNodeIds: NodeId[];
     }
     /**
      * A structure holding an RGBA color.
@@ -3882,6 +4331,19 @@ The property is always undefined now.
      * Called when top layer elements are changed.
      */
     export type topLayerElementsUpdatedPayload = void;
+    /**
+     * Fired when a node's scrollability state changes.
+     */
+    export type scrollableFlagUpdatedPayload = {
+      /**
+       * The id of the node.
+       */
+      nodeId: DOM.NodeId;
+      /**
+       * If the node is scrollable.
+       */
+      isScrollable: boolean;
+    }
     /**
      * Called when a pseudo element is removed from an element.
      */
@@ -4268,6 +4730,10 @@ either returned or not.
        * JavaScript object id of the node wrapper.
        */
       objectId?: Runtime.RemoteObjectId;
+      /**
+       * Include all shadow roots. Equals to false if not specified.
+       */
+      includeShadowDOM?: boolean;
     }
     export type getOuterHTMLReturnValue = {
       /**
@@ -4483,7 +4949,7 @@ appear on top of all other content.
       /**
        * Type of relation to get.
        */
-      relation: "PopoverTarget";
+      relation: "PopoverTarget"|"InterestTarget"|"CommandFor";
     }
     export type getElementByRelationReturnValue = {
       /**
@@ -4693,6 +5159,17 @@ File wrapper.
     export type getFileInfoReturnValue = {
       path: string;
     }
+    /**
+     * Returns list of detached nodes
+     */
+    export type getDetachedDomNodesParameters = {
+    }
+    export type getDetachedDomNodesReturnValue = {
+      /**
+       * The list of detached nodes
+       */
+      detachedNodes: DetachedElementInfo[];
+    }
     /**
      * Enables console to refer to the node with given id via $x (see Command Line API for more details
 $x functions).
@@ -4779,15 +5256,18 @@ $x functions).
     }
     /**
      * Returns the query container of the given node based on container query
-conditions: containerName, physical, and logical axes. If no axes are
-provided, the style container is returned, which is the direct parent or the
-closest element with a matching container-name.
+conditions: containerName, physical and logical axes, and whether it queries
+scroll-state or anchored elements. If no axes are provided and
+queriesScrollState is false, the style container is returned, which is the
+direct parent or the closest element with a matching container-name.
      */
     export type getContainerForNodeParameters = {
       nodeId: NodeId;
       containerName?: string;
       physicalAxes?: PhysicalAxes;
       logicalAxes?: LogicalAxes;
+      queriesScrollState?: boolean;
+      queriesAnchored?: boolean;
     }
     export type getContainerForNodeReturnValue = {
       /**
@@ -4834,6 +5314,27 @@ the given positioned element.
        */
       nodeId: NodeId;
     }
+    /**
+     * When enabling, this API force-opens the popover identified by nodeId
+and keeps it open until disabled.
+     */
+    export type forceShowPopoverParameters = {
+      /**
+       * Id of the popover HTMLElement
+       */
+      nodeId: NodeId;
+      /**
+       * If true, opens the popover and keeps it open. If false, closes the
+popover if it was previously force-opened.
+       */
+      enable: boolean;
+    }
+    export type forceShowPopoverReturnValue = {
+      /**
+       * List of popovers that were closed in order to respect popover stacking order.
+       */
+      nodeIds: NodeId[];
+    }
   }
   
   /**
@@ -5702,81 +6203,6 @@ The final text color opacity is computed based on the opacity of all overlapping
     }
   }
   
-  export module Database {
-    /**
-     * Unique identifier of Database object.
-     */
-    export type DatabaseId = string;
-    /**
-     * Database object.
-     */
-    export interface Database {
-      /**
-       * Database ID.
-       */
-      id: DatabaseId;
-      /**
-       * Database domain.
-       */
-      domain: string;
-      /**
-       * Database name.
-       */
-      name: string;
-      /**
-       * Database version.
-       */
-      version: string;
-    }
-    /**
-     * Database error.
-     */
-    export interface Error {
-      /**
-       * Error message.
-       */
-      message: string;
-      /**
-       * Error code.
-       */
-      code: number;
-    }
-    
-    export type addDatabasePayload = {
-      database: Database;
-    }
-    
-    /**
-     * Disables database tracking, prevents database events from being sent to the client.
-     */
-    export type disableParameters = {
-    }
-    export type disableReturnValue = {
-    }
-    /**
-     * Enables database tracking, database events will now be delivered to the client.
-     */
-    export type enableParameters = {
-    }
-    export type enableReturnValue = {
-    }
-    export type executeSQLParameters = {
-      databaseId: DatabaseId;
-      query: string;
-    }
-    export type executeSQLReturnValue = {
-      columnNames?: string[];
-      values?: any[];
-      sqlError?: Error;
-    }
-    export type getDatabaseTableNamesParameters = {
-      databaseId: DatabaseId;
-    }
-    export type getDatabaseTableNamesReturnValue = {
-      tableNames: string[];
-    }
-  }
-  
   export module DeviceOrientation {
     
     
@@ -5812,6 +6238,40 @@ The final text color opacity is computed based on the opacity of all overlapping
    * This domain emulates different environments for the page.
    */
   export module Emulation {
+    export interface SafeAreaInsets {
+      /**
+       * Overrides safe-area-inset-top.
+       */
+      top?: number;
+      /**
+       * Overrides safe-area-max-inset-top.
+       */
+      topMax?: number;
+      /**
+       * Overrides safe-area-inset-left.
+       */
+      left?: number;
+      /**
+       * Overrides safe-area-max-inset-left.
+       */
+      leftMax?: number;
+      /**
+       * Overrides safe-area-inset-bottom.
+       */
+      bottom?: number;
+      /**
+       * Overrides safe-area-max-inset-bottom.
+       */
+      bottomMax?: number;
+      /**
+       * Overrides safe-area-inset-right.
+       */
+      right?: number;
+      /**
+       * Overrides safe-area-max-inset-right.
+       */
+      rightMax?: number;
+    }
     /**
      * Screen orientation.
      */
@@ -5887,12 +6347,17 @@ Missing optional values will be filled in by the target with what it would norma
       mobile: boolean;
       bitness?: string;
       wow64?: boolean;
+      /**
+       * Used to specify User Agent form-factor values.
+See https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factors
+       */
+      formFactors?: string[];
     }
     /**
      * Used to specify sensor types to emulate.
 See https://w3c.github.io/sensors/#automation for more information.
      */
-    export type SensorType = "absolute-orientation"|"accelerometer"|"ambient-light"|"gravity"|"gyroscope"|"linear-acceleration"|"magnetometer"|"proximity"|"relative-orientation";
+    export type SensorType = "absolute-orientation"|"accelerometer"|"ambient-light"|"gravity"|"gyroscope"|"linear-acceleration"|"magnetometer"|"relative-orientation";
     export interface SensorMetadata {
       available?: boolean;
       minimumFrequency?: number;
@@ -6011,6 +6476,15 @@ cleared.
     }
     export type setDefaultBackgroundColorOverrideReturnValue = {
     }
+    /**
+     * Overrides the values for env(safe-area-inset-*) and env(safe-area-max-inset-*). Unset values will cause the
+respective variables to be undefined, even if previously overridden.
+     */
+    export type setSafeAreaInsetsOverrideParameters = {
+      insets: SafeAreaInsets;
+    }
+    export type setSafeAreaInsetsOverrideReturnValue = {
+    }
     /**
      * Overrides the values of device screen dimensions (window.screen.width, window.screen.height,
 window.innerWidth, window.innerHeight, and "device-width"/"device-height"-related CSS media
@@ -6070,6 +6544,7 @@ change is not observed by the page, e.g. viewport-relative elements do not chang
       /**
        * If set, the display feature of a multi-segment screen. If not set, multi-segment support
 is turned-off.
+Deprecated, use Emulation.setDisplayFeaturesOverride.
        */
       displayFeature?: DisplayFeature;
       /**
@@ -6100,6 +6575,25 @@ Does nothing if no override is set.
     }
     export type clearDevicePostureOverrideReturnValue = {
     }
+    /**
+     * Start using the given display features to pupulate the Viewport Segments API.
+This override can also be set in setDeviceMetricsOverride().
+     */
+    export type setDisplayFeaturesOverrideParameters = {
+      features: DisplayFeature[];
+    }
+    export type setDisplayFeaturesOverrideReturnValue = {
+    }
+    /**
+     * Clears the display features override set with either setDeviceMetricsOverride()
+or setDisplayFeaturesOverride() and starts using display features from the
+platform again.
+Does nothing if no override is set.
+     */
+    export type clearDisplayFeaturesOverrideParameters = {
+    }
+    export type clearDisplayFeaturesOverrideReturnValue = {
+    }
     export type setScrollbarsHiddenParameters = {
       /**
        * Whether scrollbars should be always hidden.
@@ -6156,8 +6650,16 @@ physiologically accurate emulations for medically recognized color vision defici
     export type setEmulatedVisionDeficiencyReturnValue = {
     }
     /**
-     * Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position
-unavailable.
+     * Emulates the given OS text scale.
+     */
+    export type setEmulatedOSTextScaleParameters = {
+      scale?: number;
+    }
+    export type setEmulatedOSTextScaleReturnValue = {
+    }
+    /**
+     * Overrides the Geolocation Position or Error. Omitting latitude, longitude or
+accuracy emulates position unavailable.
      */
     export type setGeolocationOverrideParameters = {
       /**
@@ -6172,6 +6674,22 @@ unavailable.
        * Mock accuracy
        */
       accuracy?: number;
+      /**
+       * Mock altitude
+       */
+      altitude?: number;
+      /**
+       * Mock altitudeAccuracy
+       */
+      altitudeAccuracy?: number;
+      /**
+       * Mock heading
+       */
+      heading?: number;
+      /**
+       * Mock speed
+       */
+      speed?: number;
     }
     export type setGeolocationOverrideReturnValue = {
     }
@@ -6219,7 +6737,8 @@ platform-provided telemetry data.
     export type setPressureSourceOverrideEnabledReturnValue = {
     }
     /**
-     * Provides a given pressure state that will be processed and eventually be
+     * TODO: OBSOLETE: To remove when setPressureDataOverride is merged.
+Provides a given pressure state that will be processed and eventually be
 delivered to PressureObserver users. |source| must have been previously
 overridden by setPressureSourceOverrideEnabled.
      */
@@ -6229,6 +6748,18 @@ overridden by setPressureSourceOverrideEnabled.
     }
     export type setPressureStateOverrideReturnValue = {
     }
+    /**
+     * Provides a given pressure data set that will be processed and eventually be
+delivered to PressureObserver users. |source| must have been previously
+overridden by setPressureSourceOverrideEnabled.
+     */
+    export type setPressureDataOverrideParameters = {
+      source: PressureSource;
+      state: PressureState;
+      ownContributionEstimate?: number;
+    }
+    export type setPressureDataOverrideReturnValue = {
+    }
     /**
      * Overrides the Idle state.
      */
@@ -6376,6 +6907,17 @@ on Android.
     }
     export type setDisabledImageTypesReturnValue = {
     }
+    /**
+     * Override the value of navigator.connection.saveData
+     */
+    export type setDataSaverOverrideParameters = {
+      /**
+       * Override value. Omitting the parameter disables the override.
+       */
+      dataSaverEnabled?: boolean;
+    }
+    export type setDataSaverOverrideReturnValue = {
+    }
     export type setHardwareConcurrencyOverrideParameters = {
       /**
        * Hardware concurrency to report
@@ -6419,6 +6961,19 @@ on Android.
     }
     export type setAutomationOverrideReturnValue = {
     }
+    /**
+     * Allows overriding the difference between the small and large viewport sizes, which determine the
+value of the `svh` and `lvh` unit, respectively. Only supported for top-level frames.
+     */
+    export type setSmallViewportHeightDifferenceOverrideParameters = {
+      /**
+       * This will cause an element of size 100svh to be `difference` pixels smaller than an element
+of size 100lvh.
+       */
+      difference: number;
+    }
+    export type setSmallViewportHeightDifferenceOverrideReturnValue = {
+    }
   }
   
   /**
@@ -8019,8 +8574,25 @@ or hexadecimal (0x prefixed) string.
        */
       size: number;
     }
+    /**
+     * DOM object counter data.
+     */
+    export interface DOMCounter {
+      /**
+       * Object name. Note: object names should be presumed volatile and clients should not expect
+the returned names to be consistent across runs.
+       */
+      name: string;
+      /**
+       * Object count.
+       */
+      count: number;
+    }
     
     
+    /**
+     * Retruns current DOM object counters.
+     */
     export type getDOMCountersParameters = {
     }
     export type getDOMCountersReturnValue = {
@@ -8028,6 +8600,21 @@ or hexadecimal (0x prefixed) string.
       nodes: number;
       jsEventListeners: number;
     }
+    /**
+     * Retruns DOM object counters after preparing renderer for leak detection.
+     */
+    export type getDOMCountersForLeakDetectionParameters = {
+    }
+    export type getDOMCountersForLeakDetectionReturnValue = {
+      /**
+       * DOM object counters.
+       */
+      counters: DOMCounter[];
+    }
+    /**
+     * Prepares for leak detection by terminating workers, stopping spellcheckers,
+dropping non-essential internal caches, running garbage collections, etc.
+     */
     export type prepareForLeakDetectionParameters = {
     }
     export type prepareForLeakDetectionReturnValue = {
@@ -8120,13 +8707,15 @@ file, data and other requests and responses, their headers, bodies, timing, etc.
     /**
      * Resource type as it was perceived by the rendering engine.
      */
-    export type ResourceType = "Document"|"Stylesheet"|"Image"|"Media"|"Font"|"Script"|"TextTrack"|"XHR"|"Fetch"|"Prefetch"|"EventSource"|"WebSocket"|"Manifest"|"SignedExchange"|"Ping"|"CSPViolationReport"|"Preflight"|"Other";
+    export type ResourceType = "Document"|"Stylesheet"|"Image"|"Media"|"Font"|"Script"|"TextTrack"|"XHR"|"Fetch"|"Prefetch"|"EventSource"|"WebSocket"|"Manifest"|"SignedExchange"|"Ping"|"CSPViolationReport"|"Preflight"|"FedCM"|"Other";
     /**
      * Unique loader identifier.
      */
     export type LoaderId = string;
     /**
-     * Unique request identifier.
+     * Unique network request identifier.
+Note that this does not identify individual HTTP requests that are part of
+a network request.
      */
     export type RequestId = string;
     /**
@@ -8441,11 +9030,11 @@ applicable or not known.
     /**
      * The reason why request was blocked.
      */
-    export type BlockedReason = "other"|"csp"|"mixed-content"|"origin"|"inspector"|"subresource-filter"|"content-type"|"coep-frame-resource-needs-coep-header"|"coop-sandboxed-iframe-cannot-navigate-to-coop-page"|"corp-not-same-origin"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep"|"corp-not-same-origin-after-defaulted-to-same-origin-by-dip"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep-and-dip"|"corp-not-same-site";
+    export type BlockedReason = "other"|"csp"|"mixed-content"|"origin"|"inspector"|"integrity"|"subresource-filter"|"content-type"|"coep-frame-resource-needs-coep-header"|"coop-sandboxed-iframe-cannot-navigate-to-coop-page"|"corp-not-same-origin"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep"|"corp-not-same-origin-after-defaulted-to-same-origin-by-dip"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep-and-dip"|"corp-not-same-site"|"sri-message-signature-mismatch";
     /**
      * The reason why request was blocked.
      */
-    export type CorsError = "DisallowedByMode"|"InvalidResponse"|"WildcardOriginNotAllowed"|"MissingAllowOriginHeader"|"MultipleAllowOriginValues"|"InvalidAllowOriginValue"|"AllowOriginMismatch"|"InvalidAllowCredentials"|"CorsDisabledScheme"|"PreflightInvalidStatus"|"PreflightDisallowedRedirect"|"PreflightWildcardOriginNotAllowed"|"PreflightMissingAllowOriginHeader"|"PreflightMultipleAllowOriginValues"|"PreflightInvalidAllowOriginValue"|"PreflightAllowOriginMismatch"|"PreflightInvalidAllowCredentials"|"PreflightMissingAllowExternal"|"PreflightInvalidAllowExternal"|"PreflightMissingAllowPrivateNetwork"|"PreflightInvalidAllowPrivateNetwork"|"InvalidAllowMethodsPreflightResponse"|"InvalidAllowHeadersPreflightResponse"|"MethodDisallowedByPreflightResponse"|"HeaderDisallowedByPreflightResponse"|"RedirectContainsCredentials"|"InsecurePrivateNetwork"|"InvalidPrivateNetworkAccess"|"UnexpectedPrivateNetworkAccess"|"NoCorsRedirectModeNotFollow"|"PreflightMissingPrivateNetworkAccessId"|"PreflightMissingPrivateNetworkAccessName"|"PrivateNetworkAccessPermissionUnavailable"|"PrivateNetworkAccessPermissionDenied";
+    export type CorsError = "DisallowedByMode"|"InvalidResponse"|"WildcardOriginNotAllowed"|"MissingAllowOriginHeader"|"MultipleAllowOriginValues"|"InvalidAllowOriginValue"|"AllowOriginMismatch"|"InvalidAllowCredentials"|"CorsDisabledScheme"|"PreflightInvalidStatus"|"PreflightDisallowedRedirect"|"PreflightWildcardOriginNotAllowed"|"PreflightMissingAllowOriginHeader"|"PreflightMultipleAllowOriginValues"|"PreflightInvalidAllowOriginValue"|"PreflightAllowOriginMismatch"|"PreflightInvalidAllowCredentials"|"PreflightMissingAllowExternal"|"PreflightInvalidAllowExternal"|"PreflightMissingAllowPrivateNetwork"|"PreflightInvalidAllowPrivateNetwork"|"InvalidAllowMethodsPreflightResponse"|"InvalidAllowHeadersPreflightResponse"|"MethodDisallowedByPreflightResponse"|"HeaderDisallowedByPreflightResponse"|"RedirectContainsCredentials"|"InsecurePrivateNetwork"|"InvalidPrivateNetworkAccess"|"UnexpectedPrivateNetworkAccess"|"NoCorsRedirectModeNotFollow"|"PreflightMissingPrivateNetworkAccessId"|"PreflightMissingPrivateNetworkAccessName"|"PrivateNetworkAccessPermissionUnavailable"|"PrivateNetworkAccessPermissionDenied"|"LocalNetworkAccessPermissionDenied";
     export interface CorsErrorStatus {
       corsError: CorsError;
       failedParameter: string;
@@ -8480,7 +9069,7 @@ records.
     /**
      * Source of service worker router.
      */
-    export type ServiceWorkerRouterSource = "network"|"cache"|"fetch-event"|"race-network-and-fetch-handler";
+    export type ServiceWorkerRouterSource = "network"|"cache"|"fetch-event"|"race-network-and-fetch-handler"|"race-network-and-cache";
     export interface ServiceWorkerRouterInfo {
       /**
        * ID of the rule matched. If there is a matched rule, this field will
@@ -8612,6 +9201,11 @@ Otherwise, the API is not used.
        * Security details for the request.
        */
       securityDetails?: SecurityDetails;
+      /**
+       * Indicates whether the request was sent through IP Protection proxies. If
+set to true, the request used the IP Protection privacy feature.
+       */
+      isIpProtectionUsed?: boolean;
     }
     /**
      * WebSocket request data.
@@ -8701,6 +9295,7 @@ If the opcode isn't 1, then payloadData is a base64 encoded string representing
       type: "parser"|"script"|"preload"|"SignedExchange"|"preflight"|"other";
       /**
        * Initiator JavaScript stack trace, set for Script only.
+Requires the Debugger domain to be enabled.
        */
       stack?: Runtime.StackTrace;
       /**
@@ -8815,11 +9410,11 @@ This is a temporary ability and it will be removed in the future.
     /**
      * Types of reasons why a cookie may not be sent with a request.
      */
-    export type CookieBlockedReason = "SecureOnly"|"NotOnPath"|"DomainMismatch"|"SameSiteStrict"|"SameSiteLax"|"SameSiteUnspecifiedTreatedAsLax"|"SameSiteNoneInsecure"|"UserPreferences"|"ThirdPartyPhaseout"|"ThirdPartyBlockedInFirstPartySet"|"UnknownError"|"SchemefulSameSiteStrict"|"SchemefulSameSiteLax"|"SchemefulSameSiteUnspecifiedTreatedAsLax"|"SamePartyFromCrossPartyContext"|"NameValuePairExceedsMaxSize";
+    export type CookieBlockedReason = "SecureOnly"|"NotOnPath"|"DomainMismatch"|"SameSiteStrict"|"SameSiteLax"|"SameSiteUnspecifiedTreatedAsLax"|"SameSiteNoneInsecure"|"UserPreferences"|"ThirdPartyPhaseout"|"ThirdPartyBlockedInFirstPartySet"|"UnknownError"|"SchemefulSameSiteStrict"|"SchemefulSameSiteLax"|"SchemefulSameSiteUnspecifiedTreatedAsLax"|"SamePartyFromCrossPartyContext"|"NameValuePairExceedsMaxSize"|"PortMismatch"|"SchemeMismatch"|"AnonymousContext";
     /**
      * Types of reasons why a cookie should have been blocked by 3PCD but is exempted for the request.
      */
-    export type CookieExemptionReason = "None"|"UserSetting"|"TPCDMetadata"|"TPCDDeprecationTrial"|"TPCDHeuristics"|"EnterprisePolicy"|"StorageAccess"|"TopLevelStorageAccess"|"CorsOptIn"|"Scheme";
+    export type CookieExemptionReason = "None"|"UserSetting"|"TPCDMetadata"|"TPCDDeprecationTrial"|"TopLevelTPCDDeprecationTrial"|"TPCDHeuristics"|"EnterprisePolicy"|"StorageAccess"|"TopLevelStorageAccess"|"Scheme"|"SameSiteNoneCookiesInSandbox";
     /**
      * A cookie which was not stored from a response with the corresponding reason.
      */
@@ -9103,6 +9698,11 @@ https://wicg.github.io/webpackage/draft-yasskin-httpbis-origin-signed-exchanges-
        * The outer response of signed HTTP exchange which was received from network.
        */
       outerResponse: Response;
+      /**
+       * Whether network response for the signed exchange was accompanied by
+extra headers.
+       */
+      hasExtraInfo: boolean;
       /**
        * Information about the signed exchange header.
        */
@@ -9120,8 +9720,61 @@ https://wicg.github.io/webpackage/draft-yasskin-httpbis-origin-signed-exchanges-
      * List of content encodings supported by the backend.
      */
     export type ContentEncoding = "deflate"|"gzip"|"br"|"zstd";
-    export type PrivateNetworkRequestPolicy = "Allow"|"BlockFromInsecureToMorePrivate"|"WarnFromInsecureToMorePrivate"|"PreflightBlock"|"PreflightWarn";
-    export type IPAddressSpace = "Local"|"Private"|"Public"|"Unknown";
+    export type DirectSocketDnsQueryType = "ipv4"|"ipv6";
+    export interface DirectTCPSocketOptions {
+      /**
+       * TCP_NODELAY option
+       */
+      noDelay: boolean;
+      /**
+       * Expected to be unsigned integer.
+       */
+      keepAliveDelay?: number;
+      /**
+       * Expected to be unsigned integer.
+       */
+      sendBufferSize?: number;
+      /**
+       * Expected to be unsigned integer.
+       */
+      receiveBufferSize?: number;
+      dnsQueryType?: DirectSocketDnsQueryType;
+    }
+    export interface DirectUDPSocketOptions {
+      remoteAddr?: string;
+      /**
+       * Unsigned int 16.
+       */
+      remotePort?: number;
+      localAddr?: string;
+      /**
+       * Unsigned int 16.
+       */
+      localPort?: number;
+      dnsQueryType?: DirectSocketDnsQueryType;
+      /**
+       * Expected to be unsigned integer.
+       */
+      sendBufferSize?: number;
+      /**
+       * Expected to be unsigned integer.
+       */
+      receiveBufferSize?: number;
+    }
+    export interface DirectUDPMessage {
+      data: binary;
+      /**
+       * Null for connected mode.
+       */
+      remoteAddr?: string;
+      /**
+       * Null for connected mode.
+Expected to be unsigned integer.
+       */
+      remotePort?: number;
+    }
+    export type PrivateNetworkRequestPolicy = "Allow"|"BlockFromInsecureToMorePrivate"|"WarnFromInsecureToMorePrivate"|"PreflightBlock"|"PreflightWarn"|"PermissionBlock"|"PermissionWarn";
+    export type IPAddressSpace = "Loopback"|"Local"|"Public"|"Unknown";
     export interface ConnectTiming {
       /**
        * Timing's requestTime is a baseline in seconds, while the other numbers are ticks in
@@ -9690,6 +10343,125 @@ or were emitted for this request.
        */
       timestamp: MonotonicTime;
     }
+    /**
+     * Fired upon direct_socket.TCPSocket creation.
+     */
+    export type directTCPSocketCreatedPayload = {
+      identifier: RequestId;
+      remoteAddr: string;
+      /**
+       * Unsigned int 16.
+       */
+      remotePort: number;
+      options: DirectTCPSocketOptions;
+      timestamp: MonotonicTime;
+      initiator?: Initiator;
+    }
+    /**
+     * Fired when direct_socket.TCPSocket connection is opened.
+     */
+    export type directTCPSocketOpenedPayload = {
+      identifier: RequestId;
+      remoteAddr: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      remotePort: number;
+      timestamp: MonotonicTime;
+      localAddr?: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      localPort?: number;
+    }
+    /**
+     * Fired when direct_socket.TCPSocket is aborted.
+     */
+    export type directTCPSocketAbortedPayload = {
+      identifier: RequestId;
+      errorMessage: string;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when direct_socket.TCPSocket is closed.
+     */
+    export type directTCPSocketClosedPayload = {
+      identifier: RequestId;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when data is sent to tcp direct socket stream.
+     */
+    export type directTCPSocketChunkSentPayload = {
+      identifier: RequestId;
+      data: binary;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when data is received from tcp direct socket stream.
+     */
+    export type directTCPSocketChunkReceivedPayload = {
+      identifier: RequestId;
+      data: binary;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired upon direct_socket.UDPSocket creation.
+     */
+    export type directUDPSocketCreatedPayload = {
+      identifier: RequestId;
+      options: DirectUDPSocketOptions;
+      timestamp: MonotonicTime;
+      initiator?: Initiator;
+    }
+    /**
+     * Fired when direct_socket.UDPSocket connection is opened.
+     */
+    export type directUDPSocketOpenedPayload = {
+      identifier: RequestId;
+      localAddr: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      localPort: number;
+      timestamp: MonotonicTime;
+      remoteAddr?: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      remotePort?: number;
+    }
+    /**
+     * Fired when direct_socket.UDPSocket is aborted.
+     */
+    export type directUDPSocketAbortedPayload = {
+      identifier: RequestId;
+      errorMessage: string;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when direct_socket.UDPSocket is closed.
+     */
+    export type directUDPSocketClosedPayload = {
+      identifier: RequestId;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when message is sent to udp direct socket stream.
+     */
+    export type directUDPSocketChunkSentPayload = {
+      identifier: RequestId;
+      message: DirectUDPMessage;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when message is received from udp direct socket stream.
+     */
+    export type directUDPSocketChunkReceivedPayload = {
+      identifier: RequestId;
+      message: DirectUDPMessage;
+      timestamp: MonotonicTime;
+    }
     /**
      * Fired when additional information about a requestWillBeSent event is available from the
 network stack. Not every requestWillBeSent event will have an additional
@@ -9741,6 +10513,9 @@ are represented by the invalid cookie line string instead of a proper cookie.
       blockedCookies: BlockedSetCookieWithReason[];
       /**
        * Raw response headers as they were received over the wire.
+Duplicate headers in the response are represented as a single key with their values
+concatentated using `\n` as the separator.
+See also `headersText` that contains verbatim text for HTTP/1.*.
        */
       headers: Headers;
       /**
@@ -9786,6 +10561,9 @@ Only one responseReceivedEarlyHints may be fired for eached responseReceived eve
       requestId: RequestId;
       /**
        * Raw response headers as they were received over the wire.
+Duplicate headers in the response are represented as a single key with their values
+concatentated using `\n` as the separator.
+See also `headersText` that contains verbatim text for HTTP/1.*.
        */
       headers: Headers;
     }
@@ -9802,7 +10580,7 @@ or after the response was received.
 of the operation already exists und thus, the operation was abort
 preemptively (e.g. a cache hit).
        */
-      status: "Ok"|"InvalidArgument"|"MissingIssuerKeys"|"FailedPrecondition"|"ResourceExhausted"|"AlreadyExists"|"ResourceLimited"|"Unauthorized"|"BadResponse"|"InternalError"|"UnknownError"|"FulfilledLocally";
+      status: "Ok"|"InvalidArgument"|"MissingIssuerKeys"|"FailedPrecondition"|"ResourceExhausted"|"AlreadyExists"|"ResourceLimited"|"Unauthorized"|"BadResponse"|"InternalError"|"UnknownError"|"FulfilledLocally"|"SiteIssuerLimit";
       type: TrustTokenOperationType;
       requestId: RequestId;
       /**
@@ -10112,6 +10890,10 @@ all partition key attributes match the cookie partition key attribute.
        * Longest post body size (in bytes) that would be included in requestWillBeSent notification
        */
       maxPostDataSize?: number;
+      /**
+       * Whether DirectSocket chunk send/receive events should be reported.
+       */
+      reportDirectSocketTraffic?: boolean;
     }
     export type enableReturnValue = {
     }
@@ -10496,6 +11278,26 @@ should be omitted for worker targets.
     export type loadNetworkResourceReturnValue = {
       resource: LoadNetworkResourcePageResult;
     }
+    /**
+     * Sets Controls for third-party cookie access
+Page reload is required before the new cookie behavior will be observed
+     */
+    export type setCookieControlsParameters = {
+      /**
+       * Whether 3pc restriction is enabled.
+       */
+      enableThirdPartyCookieRestriction: boolean;
+      /**
+       * Whether 3pc grace period exception should be enabled; false by default.
+       */
+      disableThirdPartyCookieMetadata: boolean;
+      /**
+       * Whether 3pc heuristics exceptions should be enabled; false by default.
+       */
+      disableThirdPartyCookieHeuristics: boolean;
+    }
+    export type setCookieControlsReturnValue = {
+    }
   }
   
   /**
@@ -10892,7 +11694,7 @@ should be omitted for worker targets.
        */
       maskColor?: DOM.RGBA;
     }
-    export type InspectMode = "searchForNode"|"searchForUAShadowDOM"|"captureAreaScreenshot"|"showDistances"|"none";
+    export type InspectMode = "searchForNode"|"searchForUAShadowDOM"|"captureAreaScreenshot"|"none";
     
     /**
      * Fired when the node should be inspected. This happens after call to `setInspectMode` or when
@@ -11268,7 +12070,7 @@ Backend then generates 'inspectNodeRequested' event upon element selection.
     export type setShowHitTestBordersReturnValue = {
     }
     /**
-     * Request that backend shows an overlay with web vital metrics.
+     * Deprecated, no longer has any effect.
      */
     export type setShowWebVitalsParameters = {
       show: boolean;
@@ -11342,20 +12144,40 @@ Backend then generates 'inspectNodeRequested' event upon element selection.
       explanations?: AdFrameExplanation[];
     }
     /**
-     * Identifies the bottom-most script which caused the frame to be labelled
-as an ad.
+     * Identifies the script which caused a script or frame to be labelled as an
+ad.
      */
     export interface AdScriptId {
       /**
-       * Script Id of the bottom-most script which caused the frame to be labelled
-as an ad.
+       * Script Id of the script which caused a script or frame to be labelled as
+an ad.
        */
       scriptId: Runtime.ScriptId;
       /**
-       * Id of adScriptId's debugger.
+       * Id of scriptId's debugger.
        */
       debuggerId: Runtime.UniqueDebuggerId;
     }
+    /**
+     * Encapsulates the script ancestry and the root script filterlist rule that
+caused the frame to be labelled as an ad. Only created when `ancestryChain`
+is not empty.
+     */
+    export interface AdScriptAncestry {
+      /**
+       * A chain of `AdScriptId`s representing the ancestry of an ad script that
+led to the creation of a frame. The chain is ordered from the script
+itself (lower level) up to its root ancestor that was flagged by
+filterlist.
+       */
+      ancestryChain: AdScriptId[];
+      /**
+       * The filterlist rule that caused the root (last) script in
+`ancestryChain` to be ad-tagged. Only populated if the rule is
+available.
+       */
+      rootScriptFilterlistRule?: string;
+    }
     /**
      * Indicates whether the frame is a secure context and why it is the case.
      */
@@ -11367,9 +12189,10 @@ as an ad.
     export type GatedAPIFeatures = "SharedArrayBuffers"|"SharedArrayBuffersTransferAllowed"|"PerformanceMeasureMemory"|"PerformanceProfile";
     /**
      * All Permissions Policy features. This enum should match the one defined
-in third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5.
+in services/network/public/cpp/permissions_policy/permissions_policy_features.json5.
+LINT.IfChange(PermissionsPolicyFeature)
      */
-    export type PermissionsPolicyFeature = "accelerometer"|"ambient-light-sensor"|"attribution-reporting"|"autoplay"|"bluetooth"|"browsing-topics"|"camera"|"captured-surface-control"|"ch-dpr"|"ch-device-memory"|"ch-downlink"|"ch-ect"|"ch-prefers-color-scheme"|"ch-prefers-reduced-motion"|"ch-prefers-reduced-transparency"|"ch-rtt"|"ch-save-data"|"ch-ua"|"ch-ua-arch"|"ch-ua-bitness"|"ch-ua-platform"|"ch-ua-model"|"ch-ua-mobile"|"ch-ua-form-factors"|"ch-ua-full-version"|"ch-ua-full-version-list"|"ch-ua-platform-version"|"ch-ua-wow64"|"ch-viewport-height"|"ch-viewport-width"|"ch-width"|"clipboard-read"|"clipboard-write"|"compute-pressure"|"cross-origin-isolated"|"deferred-fetch"|"digital-credentials-get"|"direct-sockets"|"display-capture"|"document-domain"|"encrypted-media"|"execution-while-out-of-viewport"|"execution-while-not-rendered"|"focus-without-user-activation"|"fullscreen"|"frobulate"|"gamepad"|"geolocation"|"gyroscope"|"hid"|"identity-credentials-get"|"idle-detection"|"interest-cohort"|"join-ad-interest-group"|"keyboard-map"|"local-fonts"|"magnetometer"|"microphone"|"midi"|"otp-credentials"|"payment"|"picture-in-picture"|"private-aggregation"|"private-state-token-issuance"|"private-state-token-redemption"|"publickey-credentials-create"|"publickey-credentials-get"|"run-ad-auction"|"screen-wake-lock"|"serial"|"shared-autofill"|"shared-storage"|"shared-storage-select-url"|"smart-card"|"speaker-selection"|"storage-access"|"sub-apps"|"sync-xhr"|"unload"|"usb"|"usb-unrestricted"|"vertical-scroll"|"web-printing"|"web-share"|"window-management"|"xr-spatial-tracking";
+    export type PermissionsPolicyFeature = "accelerometer"|"all-screens-capture"|"ambient-light-sensor"|"aria-notify"|"attribution-reporting"|"autoplay"|"bluetooth"|"browsing-topics"|"camera"|"captured-surface-control"|"ch-dpr"|"ch-device-memory"|"ch-downlink"|"ch-ect"|"ch-prefers-color-scheme"|"ch-prefers-reduced-motion"|"ch-prefers-reduced-transparency"|"ch-rtt"|"ch-save-data"|"ch-ua"|"ch-ua-arch"|"ch-ua-bitness"|"ch-ua-high-entropy-values"|"ch-ua-platform"|"ch-ua-model"|"ch-ua-mobile"|"ch-ua-form-factors"|"ch-ua-full-version"|"ch-ua-full-version-list"|"ch-ua-platform-version"|"ch-ua-wow64"|"ch-viewport-height"|"ch-viewport-width"|"ch-width"|"clipboard-read"|"clipboard-write"|"compute-pressure"|"controlled-frame"|"cross-origin-isolated"|"deferred-fetch"|"deferred-fetch-minimal"|"device-attributes"|"digital-credentials-get"|"direct-sockets"|"direct-sockets-private"|"display-capture"|"document-domain"|"encrypted-media"|"execution-while-out-of-viewport"|"execution-while-not-rendered"|"fenced-unpartitioned-storage-read"|"focus-without-user-activation"|"fullscreen"|"frobulate"|"gamepad"|"geolocation"|"gyroscope"|"hid"|"identity-credentials-get"|"idle-detection"|"interest-cohort"|"join-ad-interest-group"|"keyboard-map"|"language-detector"|"language-model"|"local-fonts"|"local-network-access"|"magnetometer"|"media-playback-while-not-visible"|"microphone"|"midi"|"on-device-speech-recognition"|"otp-credentials"|"payment"|"picture-in-picture"|"popins"|"private-aggregation"|"private-state-token-issuance"|"private-state-token-redemption"|"publickey-credentials-create"|"publickey-credentials-get"|"record-ad-auction-events"|"rewriter"|"run-ad-auction"|"screen-wake-lock"|"serial"|"shared-autofill"|"shared-storage"|"shared-storage-select-url"|"smart-card"|"speaker-selection"|"storage-access"|"sub-apps"|"summarizer"|"sync-xhr"|"translator"|"unload"|"usb"|"usb-unrestricted"|"vertical-scroll"|"web-app-installation"|"web-printing"|"web-share"|"window-management"|"writer"|"xr-spatial-tracking";
     /**
      * Reason for a permissions policy feature to be disabled.
      */
@@ -11415,6 +12238,17 @@ parsable.
       status: OriginTrialStatus;
       tokensWithStatus: OriginTrialTokenWithStatus[];
     }
+    /**
+     * Additional information about the frame document's security origin.
+     */
+    export interface SecurityOriginDetails {
+      /**
+       * Indicates whether the frame document's security origin is one
+of the local hostnames (e.g. "localhost") or IP addresses (IPv4
+127.0.0.0/8 or IPv6 ::1).
+       */
+      isLocalhost: boolean;
+    }
     /**
      * Information about the Frame on the page.
      */
@@ -11454,6 +12288,10 @@ Example URLs: http://www.google.com/file.html -> "google.com"
        * Frame document's security origin.
        */
       securityOrigin: string;
+      /**
+       * Additional details about the frame document's security origin.
+       */
+      securityOriginDetails?: SecurityOriginDetails;
       /**
        * Frame document's mimeType as determined by the browser.
        */
@@ -11784,7 +12622,7 @@ Example URLs: http://www.google.com/file.html -> "google.com"
        */
       fixed?: number;
     }
-    export type ClientNavigationReason = "formSubmissionGet"|"formSubmissionPost"|"httpHeaderRefresh"|"scriptInitiated"|"metaTagRefresh"|"pageBlockInterstitial"|"reload"|"anchorClick";
+    export type ClientNavigationReason = "anchorClick"|"formSubmissionGet"|"formSubmissionPost"|"httpHeaderRefresh"|"initialFrameNavigation"|"metaTagRefresh"|"other"|"pageBlockInterstitial"|"reload"|"scriptInitiated";
     export type ClientNavigationDisposition = "currentTab"|"newTab"|"newWindow"|"download";
     export interface InstallabilityErrorArgument {
       /**
@@ -11946,10 +12784,6 @@ https://github.com/WICG/manifest-incubations/blob/gh-pages/scope_extensions-expl
       startUrl?: string;
       themeColor?: string;
     }
-    /**
-     * Enum of possible auto-response for permission / prompt dialogs.
-     */
-    export type AutoResponseMode = "none"|"autoAccept"|"autoReject"|"autoOptOut";
     /**
      * The type of a frameNavigated event.
      */
@@ -11957,7 +12791,7 @@ https://github.com/WICG/manifest-incubations/blob/gh-pages/scope_extensions-expl
     /**
      * List of not restored reasons for back-forward cache.
      */
-    export type BackForwardCacheNotRestoredReason = "NotPrimaryMainFrame"|"BackForwardCacheDisabled"|"RelatedActiveContentsExist"|"HTTPStatusNotOK"|"SchemeNotHTTPOrHTTPS"|"Loading"|"WasGrantedMediaAccess"|"DisableForRenderFrameHostCalled"|"DomainNotAllowed"|"HTTPMethodNotGET"|"SubframeIsNavigating"|"Timeout"|"CacheLimit"|"JavaScriptExecution"|"RendererProcessKilled"|"RendererProcessCrashed"|"SchedulerTrackedFeatureUsed"|"ConflictingBrowsingInstance"|"CacheFlushed"|"ServiceWorkerVersionActivation"|"SessionRestored"|"ServiceWorkerPostMessage"|"EnteredBackForwardCacheBeforeServiceWorkerHostAdded"|"RenderFrameHostReused_SameSite"|"RenderFrameHostReused_CrossSite"|"ServiceWorkerClaim"|"IgnoreEventAndEvict"|"HaveInnerContents"|"TimeoutPuttingInCache"|"BackForwardCacheDisabledByLowMemory"|"BackForwardCacheDisabledByCommandLine"|"NetworkRequestDatapipeDrainedAsBytesConsumer"|"NetworkRequestRedirected"|"NetworkRequestTimeout"|"NetworkExceedsBufferLimit"|"NavigationCancelledWhileRestoring"|"NotMostRecentNavigationEntry"|"BackForwardCacheDisabledForPrerender"|"UserAgentOverrideDiffers"|"ForegroundCacheLimit"|"BrowsingInstanceNotSwapped"|"BackForwardCacheDisabledForDelegate"|"UnloadHandlerExistsInMainFrame"|"UnloadHandlerExistsInSubFrame"|"ServiceWorkerUnregistration"|"CacheControlNoStore"|"CacheControlNoStoreCookieModified"|"CacheControlNoStoreHTTPOnlyCookieModified"|"NoResponseHead"|"Unknown"|"ActivationNavigationsDisallowedForBug1234857"|"ErrorDocument"|"FencedFramesEmbedder"|"CookieDisabled"|"HTTPAuthRequired"|"CookieFlushed"|"BroadcastChannelOnMessage"|"WebViewSettingsChanged"|"WebViewJavaScriptObjectChanged"|"WebViewMessageListenerInjected"|"WebViewSafeBrowsingAllowlistChanged"|"WebViewDocumentStartJavascriptChanged"|"WebSocket"|"WebTransport"|"WebRTC"|"MainResourceHasCacheControlNoStore"|"MainResourceHasCacheControlNoCache"|"SubresourceHasCacheControlNoStore"|"SubresourceHasCacheControlNoCache"|"ContainsPlugins"|"DocumentLoaded"|"OutstandingNetworkRequestOthers"|"RequestedMIDIPermission"|"RequestedAudioCapturePermission"|"RequestedVideoCapturePermission"|"RequestedBackForwardCacheBlockedSensors"|"RequestedBackgroundWorkPermission"|"BroadcastChannel"|"WebXR"|"SharedWorker"|"WebLocks"|"WebHID"|"WebShare"|"RequestedStorageAccessGrant"|"WebNfc"|"OutstandingNetworkRequestFetch"|"OutstandingNetworkRequestXHR"|"AppBanner"|"Printing"|"WebDatabase"|"PictureInPicture"|"SpeechRecognizer"|"IdleManager"|"PaymentManager"|"SpeechSynthesis"|"KeyboardLock"|"WebOTPService"|"OutstandingNetworkRequestDirectSocket"|"InjectedJavascript"|"InjectedStyleSheet"|"KeepaliveRequest"|"IndexedDBEvent"|"Dummy"|"JsNetworkRequestReceivedCacheControlNoStoreResource"|"WebRTCSticky"|"WebTransportSticky"|"WebSocketSticky"|"SmartCard"|"LiveMediaStreamTrack"|"UnloadHandler"|"ParserAborted"|"ContentSecurityHandler"|"ContentWebAuthenticationAPI"|"ContentFileChooser"|"ContentSerial"|"ContentFileSystemAccess"|"ContentMediaDevicesDispatcherHost"|"ContentWebBluetooth"|"ContentWebUSB"|"ContentMediaSessionService"|"ContentScreenReader"|"EmbedderPopupBlockerTabHelper"|"EmbedderSafeBrowsingTriggeredPopupBlocker"|"EmbedderSafeBrowsingThreatDetails"|"EmbedderAppBannerManager"|"EmbedderDomDistillerViewerSource"|"EmbedderDomDistillerSelfDeletingRequestDelegate"|"EmbedderOomInterventionTabHelper"|"EmbedderOfflinePage"|"EmbedderChromePasswordManagerClientBindCredentialManager"|"EmbedderPermissionRequestManager"|"EmbedderModalDialog"|"EmbedderExtensions"|"EmbedderExtensionMessaging"|"EmbedderExtensionMessagingForOpenPort"|"EmbedderExtensionSentMessageToCachedFrame"|"RequestedByWebViewClient";
+    export type BackForwardCacheNotRestoredReason = "NotPrimaryMainFrame"|"BackForwardCacheDisabled"|"RelatedActiveContentsExist"|"HTTPStatusNotOK"|"SchemeNotHTTPOrHTTPS"|"Loading"|"WasGrantedMediaAccess"|"DisableForRenderFrameHostCalled"|"DomainNotAllowed"|"HTTPMethodNotGET"|"SubframeIsNavigating"|"Timeout"|"CacheLimit"|"JavaScriptExecution"|"RendererProcessKilled"|"RendererProcessCrashed"|"SchedulerTrackedFeatureUsed"|"ConflictingBrowsingInstance"|"CacheFlushed"|"ServiceWorkerVersionActivation"|"SessionRestored"|"ServiceWorkerPostMessage"|"EnteredBackForwardCacheBeforeServiceWorkerHostAdded"|"RenderFrameHostReused_SameSite"|"RenderFrameHostReused_CrossSite"|"ServiceWorkerClaim"|"IgnoreEventAndEvict"|"HaveInnerContents"|"TimeoutPuttingInCache"|"BackForwardCacheDisabledByLowMemory"|"BackForwardCacheDisabledByCommandLine"|"NetworkRequestDatapipeDrainedAsBytesConsumer"|"NetworkRequestRedirected"|"NetworkRequestTimeout"|"NetworkExceedsBufferLimit"|"NavigationCancelledWhileRestoring"|"NotMostRecentNavigationEntry"|"BackForwardCacheDisabledForPrerender"|"UserAgentOverrideDiffers"|"ForegroundCacheLimit"|"BrowsingInstanceNotSwapped"|"BackForwardCacheDisabledForDelegate"|"UnloadHandlerExistsInMainFrame"|"UnloadHandlerExistsInSubFrame"|"ServiceWorkerUnregistration"|"CacheControlNoStore"|"CacheControlNoStoreCookieModified"|"CacheControlNoStoreHTTPOnlyCookieModified"|"NoResponseHead"|"Unknown"|"ActivationNavigationsDisallowedForBug1234857"|"ErrorDocument"|"FencedFramesEmbedder"|"CookieDisabled"|"HTTPAuthRequired"|"CookieFlushed"|"BroadcastChannelOnMessage"|"WebViewSettingsChanged"|"WebViewJavaScriptObjectChanged"|"WebViewMessageListenerInjected"|"WebViewSafeBrowsingAllowlistChanged"|"WebViewDocumentStartJavascriptChanged"|"WebSocket"|"WebTransport"|"WebRTC"|"MainResourceHasCacheControlNoStore"|"MainResourceHasCacheControlNoCache"|"SubresourceHasCacheControlNoStore"|"SubresourceHasCacheControlNoCache"|"ContainsPlugins"|"DocumentLoaded"|"OutstandingNetworkRequestOthers"|"RequestedMIDIPermission"|"RequestedAudioCapturePermission"|"RequestedVideoCapturePermission"|"RequestedBackForwardCacheBlockedSensors"|"RequestedBackgroundWorkPermission"|"BroadcastChannel"|"WebXR"|"SharedWorker"|"SharedWorkerMessage"|"WebLocks"|"WebHID"|"WebShare"|"RequestedStorageAccessGrant"|"WebNfc"|"OutstandingNetworkRequestFetch"|"OutstandingNetworkRequestXHR"|"AppBanner"|"Printing"|"WebDatabase"|"PictureInPicture"|"SpeechRecognizer"|"IdleManager"|"PaymentManager"|"SpeechSynthesis"|"KeyboardLock"|"WebOTPService"|"OutstandingNetworkRequestDirectSocket"|"InjectedJavascript"|"InjectedStyleSheet"|"KeepaliveRequest"|"IndexedDBEvent"|"Dummy"|"JsNetworkRequestReceivedCacheControlNoStoreResource"|"WebRTCSticky"|"WebTransportSticky"|"WebSocketSticky"|"SmartCard"|"LiveMediaStreamTrack"|"UnloadHandler"|"ParserAborted"|"ContentSecurityHandler"|"ContentWebAuthenticationAPI"|"ContentFileChooser"|"ContentSerial"|"ContentFileSystemAccess"|"ContentMediaDevicesDispatcherHost"|"ContentWebBluetooth"|"ContentWebUSB"|"ContentMediaSessionService"|"ContentScreenReader"|"ContentDiscarded"|"EmbedderPopupBlockerTabHelper"|"EmbedderSafeBrowsingTriggeredPopupBlocker"|"EmbedderSafeBrowsingThreatDetails"|"EmbedderAppBannerManager"|"EmbedderDomDistillerViewerSource"|"EmbedderDomDistillerSelfDeletingRequestDelegate"|"EmbedderOomInterventionTabHelper"|"EmbedderOfflinePage"|"EmbedderChromePasswordManagerClientBindCredentialManager"|"EmbedderPermissionRequestManager"|"EmbedderModalDialog"|"EmbedderExtensions"|"EmbedderExtensionMessaging"|"EmbedderExtensionMessagingForOpenPort"|"EmbedderExtensionSentMessageToCachedFrame"|"RequestedByWebViewClient"|"PostMessageByWebViewClient"|"CacheControlNoStoreDeviceBoundSessionTerminated"|"CacheLimitPrunedOnModerateMemoryPressure"|"CacheLimitPrunedOnCriticalMemoryPressure";
     /**
      * Types of not restored reasons for back-forward cache.
      */
@@ -12068,6 +12902,16 @@ dependent on the reason:
       frameId: FrameId;
       reason: "remove"|"swap";
     }
+    /**
+     * Fired before frame subtree is detached. Emitted before any frame of the
+subtree is actually detached.
+     */
+    export type frameSubtreeWillBeDetachedPayload = {
+      /**
+       * Id of the frame that is the root of the subtree that will be detached.
+       */
+      frameId: FrameId;
+    }
     /**
      * Fired once navigation of the frame has completed. Frame is now associated with the new loader.
      */
@@ -12088,6 +12932,33 @@ dependent on the reason:
       frame: Frame;
     }
     export type frameResizedPayload = void;
+    /**
+     * Fired when a navigation starts. This event is fired for both
+renderer-initiated and browser-initiated navigations. For renderer-initiated
+navigations, the event is fired after `frameRequestedNavigation`.
+Navigation may still be cancelled after the event is issued. Multiple events
+can be fired for a single navigation, for example, when a same-document
+navigation becomes a cross-document navigation (such as in the case of a
+frameset).
+     */
+    export type frameStartedNavigatingPayload = {
+      /**
+       * ID of the frame that is being navigated.
+       */
+      frameId: FrameId;
+      /**
+       * The URL the navigation started with. The final URL can be different.
+       */
+      url: string;
+      /**
+       * Loader identifier. Even though it is present in case of same-document
+navigation, the previously committed loaderId would not change unless
+the navigation changes from a same-document to a cross-document
+navigation.
+       */
+      loaderId: Network.LoaderId;
+      navigationType: "reload"|"reloadBypassingCache"|"restore"|"restoreWithPost"|"historySameDocument"|"historyDifferentDocument"|"sameDocument"|"differentDocument";
+    }
     /**
      * Fired when a renderer-initiated navigation is requested.
 Navigation may still be cancelled after the event is issued.
@@ -12207,6 +13078,10 @@ Deprecated. Use Browser.downloadProgress instead.
 closed.
      */
     export type javascriptDialogClosedPayload = {
+      /**
+       * Frame id.
+       */
+      frameId: FrameId;
       /**
        * Whether dialog was confirmed.
        */
@@ -12225,6 +13100,10 @@ open.
        * Frame url.
        */
       url: string;
+      /**
+       * Frame id.
+       */
+      frameId: FrameId;
       /**
        * Message that will be displayed by the dialog.
        */
@@ -12245,7 +13124,8 @@ the page execution. Execution can be resumed via calling Page.handleJavaScriptDi
       defaultPrompt?: string;
     }
     /**
-     * Fired for top level page lifecycle events such as navigation, load, paint, etc.
+     * Fired for lifecycle events (navigation, load, paint, etc) in the current
+target (including local frames).
      */
     export type lifecycleEventPayload = {
       /**
@@ -12298,6 +13178,10 @@ when bfcache navigation fails.
        * Frame's new url.
        */
       url: string;
+      /**
+       * Navigation type
+       */
+      navigationType: "fragment"|"historyApi"|"other";
     }
     /**
      * Compressed image data requested by the `startScreencast`.
@@ -12348,8 +13232,7 @@ etc.
       userGesture: boolean;
     }
     /**
-     * Issued for every compilation cache generated. Is only available
-if Page.setGenerateCompilationCache is enabled.
+     * Issued for every compilation cache generated.
      */
     export type compilationCacheProducedPayload = {
       url: string;
@@ -12528,6 +13411,11 @@ option, use with caution.
      * Enables page domain notifications.
      */
     export type enableParameters = {
+      /**
+       * If true, the `Page.fileChooserOpened` event will be emitted regardless of the state set by
+`Page.setInterceptFileChooserDialog` command (default: false).
+       */
+      enableFileChooserOpenedEvent?: boolean;
     }
     export type enableReturnValue = {
     }
@@ -12586,15 +13474,18 @@ Only returns values if the feature flag 'WebAppEnableManifestId' is enabled
        */
       recommendedId?: string;
     }
-    export type getAdScriptIdParameters = {
+    export type getAdScriptAncestryParameters = {
       frameId: FrameId;
     }
-    export type getAdScriptIdReturnValue = {
+    export type getAdScriptAncestryReturnValue = {
       /**
-       * Identifies the bottom-most script which caused the frame to be labelled
-as an ad. Only sent if frame is labelled as an ad and id is available.
+       * The ancestry chain of ad script identifiers leading to this frame's
+creation, along with the root script's filterlist rule. The ancestry
+chain is ordered from the most immediate script (in the frame creation
+stack) to more distant ancestors (that created the immediately preceding
+script). Only sent if frame is labelled as an ad and ids are available.
        */
-      adScriptId?: AdScriptId;
+      adScriptAncestry?: AdScriptAncestry;
     }
     /**
      * Returns present frame tree structure.
@@ -12749,6 +13640,10 @@ as the previously committed loaderId would not change.
        * User friendly error message, present if and only if navigation has failed.
        */
       errorText?: string;
+      /**
+       * Whether the navigation resulted in a download.
+       */
+      isDownload?: boolean;
     }
     /**
      * Navigates current page to the given history entry.
@@ -13266,7 +14161,7 @@ cross-process navigation.
 https://w3c.github.io/secure-payment-confirmation/#sctn-automation-set-spc-transaction-mode
      */
     export type setSPCTransactionModeParameters = {
-      mode: AutoResponseMode;
+      mode: "none"|"autoAccept"|"autoChooseToAuthAnotherWay"|"autoReject"|"autoOptOut";
     }
     export type setSPCTransactionModeReturnValue = {
     }
@@ -13275,7 +14170,7 @@ https://w3c.github.io/secure-payment-confirmation/#sctn-automation-set-spc-trans
 https://html.spec.whatwg.org/multipage/system-state.html#rph-automation
      */
     export type setRPHRegistrationModeParameters = {
-      mode: AutoResponseMode;
+      mode: "none"|"autoAccept"|"autoReject";
     }
     export type setRPHRegistrationModeReturnValue = {
     }
@@ -13308,6 +14203,12 @@ Instead, a protocol event `Page.fileChooserOpened` is emitted.
      */
     export type setInterceptFileChooserDialogParameters = {
       enabled: boolean;
+      /**
+       * If true, cancels the dialog by emitting relevant events (if any)
+in addition to not showing it if the interception is enabled
+(default: false).
+       */
+      cancel?: boolean;
     }
     export type setInterceptFileChooserDialogReturnValue = {
     }
@@ -13887,11 +14788,6 @@ For cached script it is the last time the cache entry was validated.
     }
     export type enableReturnValue = {
     }
-    export type inspectWorkerParameters = {
-      versionId: string;
-    }
-    export type inspectWorkerReturnValue = {
-    }
     export type setForceUpdateOnPageLoadParameters = {
       forceUpdateOnPageLoad: boolean;
     }
@@ -13933,7 +14829,7 @@ For cached script it is the last time the cache entry was validated.
     /**
      * Enum of possible storage types.
      */
-    export type StorageType = "appcache"|"cookies"|"file_systems"|"indexeddb"|"local_storage"|"shader_cache"|"websql"|"service_workers"|"cache_storage"|"interest_groups"|"shared_storage"|"storage_buckets"|"all"|"other";
+    export type StorageType = "cookies"|"file_systems"|"indexeddb"|"local_storage"|"shader_cache"|"websql"|"service_workers"|"cache_storage"|"interest_groups"|"shared_storage"|"storage_buckets"|"all"|"other";
     /**
      * Usage for a storage type.
      */
@@ -13972,9 +14868,13 @@ Tokens from that issuer.
      */
     export type InterestGroupAuctionFetchType = "bidderJs"|"bidderWasm"|"sellerJs"|"bidderTrustedSignals"|"sellerTrustedSignals";
     /**
-     * Enum of shared storage access types.
+     * Enum of shared storage access scopes.
      */
-    export type SharedStorageAccessType = "documentAddModule"|"documentSelectURL"|"documentRun"|"documentSet"|"documentAppend"|"documentDelete"|"documentClear"|"documentGet"|"workletSet"|"workletAppend"|"workletDelete"|"workletClear"|"workletGet"|"workletKeys"|"workletEntries"|"workletLength"|"workletRemainingBudget"|"headerSet"|"headerAppend"|"headerDelete"|"headerClear";
+    export type SharedStorageAccessScope = "window"|"sharedStorageWorklet"|"protectedAudienceWorklet"|"header";
+    /**
+     * Enum of shared storage access methods.
+     */
+    export type SharedStorageAccessMethod = "addModule"|"createWorklet"|"selectURL"|"run"|"batchUpdate"|"set"|"append"|"delete"|"clear"|"get"|"keys"|"values"|"entries"|"length"|"remainingBudget";
     /**
      * Struct for a single key-value pair in an origin's shared storage.
      */
@@ -14004,6 +14904,28 @@ storage.
        */
       bytesUsed: number;
     }
+    /**
+     * Represents a dictionary object passed in as privateAggregationConfig to
+run or selectURL.
+     */
+    export interface SharedStoragePrivateAggregationConfig {
+      /**
+       * The chosen aggregation service deployment.
+       */
+      aggregationCoordinatorOrigin?: string;
+      /**
+       * The context ID provided.
+       */
+      contextId?: string;
+      /**
+       * Configures the maximum size allowed for filtering IDs.
+       */
+      filteringIdMaxBytes: number;
+      /**
+       * The limit on the number of contributions in the final report.
+       */
+      maxContributions?: number;
+    }
     /**
      * Pair of reporting metadata details for a candidate URL for `selectURL()`.
      */
@@ -14031,57 +14953,102 @@ presence/absence can vary according to SharedStorageAccessType.
     export interface SharedStorageAccessParams {
       /**
        * Spec of the module script URL.
-Present only for SharedStorageAccessType.documentAddModule.
+Present only for SharedStorageAccessMethods: addModule and
+createWorklet.
        */
       scriptSourceUrl?: string;
+      /**
+       * String denoting "context-origin", "script-origin", or a custom
+origin to be used as the worklet's data origin.
+Present only for SharedStorageAccessMethod: createWorklet.
+       */
+      dataOrigin?: string;
       /**
        * Name of the registered operation to be run.
-Present only for SharedStorageAccessType.documentRun and
-SharedStorageAccessType.documentSelectURL.
+Present only for SharedStorageAccessMethods: run and selectURL.
        */
       operationName?: string;
+      /**
+       * ID of the operation call.
+Present only for SharedStorageAccessMethods: run and selectURL.
+       */
+      operationId?: string;
+      /**
+       * Whether or not to keep the worket alive for future run or selectURL
+calls.
+Present only for SharedStorageAccessMethods: run and selectURL.
+       */
+      keepAlive?: boolean;
+      /**
+       * Configures the private aggregation options.
+Present only for SharedStorageAccessMethods: run and selectURL.
+       */
+      privateAggregationConfig?: SharedStoragePrivateAggregationConfig;
       /**
        * The operation's serialized data in bytes (converted to a string).
-Present only for SharedStorageAccessType.documentRun and
-SharedStorageAccessType.documentSelectURL.
+Present only for SharedStorageAccessMethods: run and selectURL.
+TODO(crbug.com/401011862): Consider updating this parameter to binary.
        */
       serializedData?: string;
       /**
        * Array of candidate URLs' specs, along with any associated metadata.
-Present only for SharedStorageAccessType.documentSelectURL.
+Present only for SharedStorageAccessMethod: selectURL.
        */
       urlsWithMetadata?: SharedStorageUrlWithMetadata[];
+      /**
+       * Spec of the URN:UUID generated for a selectURL call.
+Present only for SharedStorageAccessMethod: selectURL.
+       */
+      urnUuid?: string;
       /**
        * Key for a specific entry in an origin's shared storage.
-Present only for SharedStorageAccessType.documentSet,
-SharedStorageAccessType.documentAppend,
-SharedStorageAccessType.documentDelete,
-SharedStorageAccessType.workletSet,
-SharedStorageAccessType.workletAppend,
-SharedStorageAccessType.workletDelete,
-SharedStorageAccessType.workletGet,
-SharedStorageAccessType.headerSet,
-SharedStorageAccessType.headerAppend, and
-SharedStorageAccessType.headerDelete.
+Present only for SharedStorageAccessMethods: set, append, delete, and
+get.
        */
       key?: string;
       /**
        * Value for a specific entry in an origin's shared storage.
-Present only for SharedStorageAccessType.documentSet,
-SharedStorageAccessType.documentAppend,
-SharedStorageAccessType.workletSet,
-SharedStorageAccessType.workletAppend,
-SharedStorageAccessType.headerSet, and
-SharedStorageAccessType.headerAppend.
+Present only for SharedStorageAccessMethods: set and append.
        */
       value?: string;
       /**
        * Whether or not to set an entry for a key if that key is already present.
-Present only for SharedStorageAccessType.documentSet,
-SharedStorageAccessType.workletSet, and
-SharedStorageAccessType.headerSet.
+Present only for SharedStorageAccessMethod: set.
        */
       ignoreIfPresent?: boolean;
+      /**
+       * A number denoting the (0-based) order of the worklet's
+creation relative to all other shared storage worklets created by
+documents using the current storage partition.
+Present only for SharedStorageAccessMethods: addModule, createWorklet.
+       */
+      workletOrdinal?: number;
+      /**
+       * Hex representation of the DevTools token used as the TargetID for the
+associated shared storage worklet.
+Present only for SharedStorageAccessMethods: addModule, createWorklet,
+run, selectURL, and any other SharedStorageAccessMethod when the
+SharedStorageAccessScope is sharedStorageWorklet.
+       */
+      workletTargetId?: Target.TargetID;
+      /**
+       * Name of the lock to be acquired, if present.
+Optionally present only for SharedStorageAccessMethods: batchUpdate,
+set, append, delete, and clear.
+       */
+      withLock?: string;
+      /**
+       * If the method has been called as part of a batchUpdate, then this
+number identifies the batch to which it belongs.
+Optionally present only for SharedStorageAccessMethods:
+batchUpdate (required), set, append, delete, and clear.
+       */
+      batchUpdateId?: string;
+      /**
+       * Number of modifier methods sent in batch.
+Present only for SharedStorageAccessMethod: batchUpdate.
+       */
+      batchSize?: number;
     }
     export type StorageBucketsDurability = "relaxed"|"strict";
     export interface StorageBucket {
@@ -14135,14 +15102,6 @@ SharedStorageAccessType.headerSet.
        */
       ends: number[];
     }
-    export interface AttributionReportingTriggerSpec {
-      /**
-       * number instead of integer because not all uint32 can be represented by
-int
-       */
-      triggerData: number[];
-      eventReportWindows: AttributionReportingEventReportWindows;
-    }
     export type AttributionReportingTriggerDataMatching = "exact"|"modulus";
     export interface AttributionReportingAggregatableDebugReportingData {
       keyPiece: UnsignedInt128AsBase16;
@@ -14163,13 +15122,31 @@ int, only present for source registrations
       debugData: AttributionReportingAggregatableDebugReportingData[];
       aggregationCoordinatorOrigin?: string;
     }
+    export interface AttributionScopesData {
+      values: string[];
+      /**
+       * number instead of integer because not all uint32 can be represented by
+int
+       */
+      limit: number;
+      maxEventStates: number;
+    }
+    export interface AttributionReportingNamedBudgetDef {
+      name: string;
+      budget: number;
+    }
     export interface AttributionReportingSourceRegistration {
       time: Network.TimeSinceEpoch;
       /**
        * duration in seconds
        */
       expiry: number;
-      triggerSpecs: AttributionReportingTriggerSpec[];
+      /**
+       * number instead of integer because not all uint32 can be represented by
+int
+       */
+      triggerData: number[];
+      eventReportWindows: AttributionReportingEventReportWindows;
       /**
        * duration in seconds
        */
@@ -14186,8 +15163,13 @@ int, only present for source registrations
       triggerDataMatching: AttributionReportingTriggerDataMatching;
       destinationLimitPriority: SignedInt64AsBase10;
       aggregatableDebugReportingConfig: AttributionReportingAggregatableDebugReportingConfig;
+      scopesData?: AttributionScopesData;
+      maxEventLevelReports: number;
+      namedBudgets: AttributionReportingNamedBudgetDef[];
+      debugReporting: boolean;
+      eventLevelEpsilon: number;
     }
-    export type AttributionReportingSourceRegistrationResult = "success"|"internalError"|"insufficientSourceCapacity"|"insufficientUniqueDestinationCapacity"|"excessiveReportingOrigins"|"prohibitedByBrowserPolicy"|"successNoised"|"destinationReportingLimitReached"|"destinationGlobalLimitReached"|"destinationBothLimitsReached"|"reportingOriginsPerSiteLimitReached"|"exceedsMaxChannelCapacity"|"exceedsMaxTriggerStateCardinality"|"destinationPerDayReportingLimitReached";
+    export type AttributionReportingSourceRegistrationResult = "success"|"internalError"|"insufficientSourceCapacity"|"insufficientUniqueDestinationCapacity"|"excessiveReportingOrigins"|"prohibitedByBrowserPolicy"|"successNoised"|"destinationReportingLimitReached"|"destinationGlobalLimitReached"|"destinationBothLimitsReached"|"reportingOriginsPerSiteLimitReached"|"exceedsMaxChannelCapacity"|"exceedsMaxScopesChannelCapacity"|"exceedsMaxTriggerStateCardinality"|"exceedsMaxEventStatesLimit"|"destinationPerDayReportingLimitReached";
     export type AttributionReportingSourceRegistrationTimeConfig = "include"|"exclude";
     export interface AttributionReportingAggregatableValueDictEntry {
       key: string;
@@ -14217,6 +15199,10 @@ int
       dedupKey?: UnsignedInt64AsBase10;
       filters: AttributionReportingFilterPair;
     }
+    export interface AttributionReportingNamedBudgetCandidate {
+      name?: string;
+      filters: AttributionReportingFilterPair;
+    }
     export interface AttributionReportingTriggerRegistration {
       filters: AttributionReportingFilterPair;
       debugKey?: UnsignedInt64AsBase10;
@@ -14230,9 +15216,12 @@ int
       sourceRegistrationTimeConfig: AttributionReportingSourceRegistrationTimeConfig;
       triggerContextId?: string;
       aggregatableDebugReportingConfig: AttributionReportingAggregatableDebugReportingConfig;
+      scopes: string[];
+      namedBudgets: AttributionReportingNamedBudgetCandidate[];
     }
     export type AttributionReportingEventLevelResult = "success"|"successDroppedLowerPriority"|"internalError"|"noCapacityForAttributionDestination"|"noMatchingSources"|"deduplicated"|"excessiveAttributions"|"priorityTooLow"|"neverAttributedSource"|"excessiveReportingOrigins"|"noMatchingSourceFilterData"|"prohibitedByBrowserPolicy"|"noMatchingConfigurations"|"excessiveReports"|"falselyAttributedSource"|"reportWindowPassed"|"notRegistered"|"reportWindowNotStarted"|"noMatchingTriggerData";
-    export type AttributionReportingAggregatableResult = "success"|"internalError"|"noCapacityForAttributionDestination"|"noMatchingSources"|"excessiveAttributions"|"excessiveReportingOrigins"|"noHistograms"|"insufficientBudget"|"noMatchingSourceFilterData"|"notRegistered"|"prohibitedByBrowserPolicy"|"deduplicated"|"reportWindowPassed"|"excessiveReports";
+    export type AttributionReportingAggregatableResult = "success"|"internalError"|"noCapacityForAttributionDestination"|"noMatchingSources"|"excessiveAttributions"|"excessiveReportingOrigins"|"noHistograms"|"insufficientBudget"|"insufficientNamedBudget"|"noMatchingSourceFilterData"|"notRegistered"|"prohibitedByBrowserPolicy"|"deduplicated"|"reportWindowPassed"|"excessiveReports";
+    export type AttributionReportingReportResult = "sent"|"prohibited"|"failedToAssemble"|"expired";
     /**
      * A single Related Website Set object.
      */
@@ -14386,34 +15375,78 @@ loadingFailed).
 request.  In the case of trusted signals, it's possible that only some of
 them actually care about the keys being queried.
        */
-      auctions: InterestGroupAuctionId[];
+      auctions: InterestGroupAuctionId[];
+    }
+    /**
+     * Shared storage was accessed by the associated page.
+The following parameters are included in all events.
+     */
+    export type sharedStorageAccessedPayload = {
+      /**
+       * Time of the access.
+       */
+      accessTime: Network.TimeSinceEpoch;
+      /**
+       * Enum value indicating the access scope.
+       */
+      scope: SharedStorageAccessScope;
+      /**
+       * Enum value indicating the Shared Storage API method invoked.
+       */
+      method: SharedStorageAccessMethod;
+      /**
+       * DevTools Frame Token for the primary frame tree's root.
+       */
+      mainFrameId: Page.FrameId;
+      /**
+       * Serialization of the origin owning the Shared Storage data.
+       */
+      ownerOrigin: string;
+      /**
+       * Serialization of the site owning the Shared Storage data.
+       */
+      ownerSite: string;
+      /**
+       * The sub-parameters wrapped by `params` are all optional and their
+presence/absence depends on `type`.
+       */
+      params: SharedStorageAccessParams;
     }
     /**
-     * Shared storage was accessed by the associated page.
+     * A shared storage run or selectURL operation finished its execution.
 The following parameters are included in all events.
      */
-    export type sharedStorageAccessedPayload = {
+    export type sharedStorageWorkletOperationExecutionFinishedPayload = {
       /**
-       * Time of the access.
+       * Time that the operation finished.
        */
-      accessTime: Network.TimeSinceEpoch;
+      finishedTime: Network.TimeSinceEpoch;
+      /**
+       * Time, in microseconds, from start of shared storage JS API call until
+end of operation execution in the worklet.
+       */
+      executionTime: number;
       /**
        * Enum value indicating the Shared Storage API method invoked.
        */
-      type: SharedStorageAccessType;
+      method: SharedStorageAccessMethod;
+      /**
+       * ID of the operation call.
+       */
+      operationId: string;
+      /**
+       * Hex representation of the DevTools token used as the TargetID for the
+associated shared storage worklet.
+       */
+      workletTargetId: Target.TargetID;
       /**
        * DevTools Frame Token for the primary frame tree's root.
        */
       mainFrameId: Page.FrameId;
       /**
-       * Serialized origin for the context that invoked the Shared Storage API.
+       * Serialization of the origin owning the Shared Storage data.
        */
       ownerOrigin: string;
-      /**
-       * The sub-parameters wrapped by `params` are all optional and their
-presence/absence depends on `type`.
-       */
-      params: SharedStorageAccessParams;
     }
     export type storageBucketCreatedOrUpdatedPayload = {
       bucketInfo: StorageBucketInfo;
@@ -14430,6 +15463,24 @@ presence/absence depends on `type`.
       eventLevel: AttributionReportingEventLevelResult;
       aggregatable: AttributionReportingAggregatableResult;
     }
+    export type attributionReportingReportSentPayload = {
+      url: string;
+      body: { [key: string]: string };
+      result: AttributionReportingReportResult;
+      /**
+       * If result is `sent`, populated with net/HTTP status.
+       */
+      netError?: number;
+      netErrorName?: string;
+      httpStatusCode?: number;
+    }
+    export type attributionReportingVerboseDebugReportSentPayload = {
+      url: string;
+      body?: { [key: string]: string }[];
+      netError?: number;
+      netErrorName?: string;
+      httpStatusCode?: number;
+    }
     
     /**
      * Returns a storage key given a frame id.
@@ -14833,6 +15884,35 @@ session. The effective Related Website Sets will not change during a browser ses
     export type getRelatedWebsiteSetsReturnValue = {
       sets: RelatedWebsiteSet[];
     }
+    /**
+     * Returns the list of URLs from a page and its embedded resources that match
+existing grace period URL pattern rules.
+https://developers.google.com/privacy-sandbox/cookies/temporary-exceptions/grace-period
+     */
+    export type getAffectedUrlsForThirdPartyCookieMetadataParameters = {
+      /**
+       * The URL of the page currently being visited.
+       */
+      firstPartyUrl: string;
+      /**
+       * The list of embedded resource URLs from the page.
+       */
+      thirdPartyUrls: string[];
+    }
+    export type getAffectedUrlsForThirdPartyCookieMetadataReturnValue = {
+      /**
+       * Array of matching URLs. If there is a primary pattern match for the first-
+party URL, only the first-party URL is returned in the array.
+       */
+      matchedUrls: string[];
+    }
+    export type setProtectedAudienceKAnonymityParameters = {
+      owner: string;
+      name: string;
+      hashes: binary[];
+    }
+    export type setProtectedAudienceKAnonymityReturnValue = {
+    }
   }
   
   /**
@@ -15125,6 +16205,10 @@ If filter is not specified, the one assumed is
       host: string;
       port: number;
     }
+    /**
+     * The state of the target window.
+     */
+    export type WindowState = "normal"|"minimized"|"maximized"|"fullscreen";
     
     /**
      * Issued when attached to target because of auto-attach or `attachToTarget` command.
@@ -15265,6 +16349,10 @@ The object has the following API:
        * Binding name, 'cdp' if not specified.
        */
       bindingName?: string;
+      /**
+       * If true, inherits the current root session's permissions (default: false).
+       */
+      inheritPermissions?: boolean;
     }
     export type exposeDevToolsProtocolReturnValue = {
     }
@@ -15317,35 +16405,54 @@ Parts of the URL other than those constituting origin are ignored.
        */
       url: string;
       /**
-       * Frame width in DIP (headless chrome only).
+       * Frame left origin in DIP (requires newWindow to be true or headless shell).
+       */
+      left?: number;
+      /**
+       * Frame top origin in DIP (requires newWindow to be true or headless shell).
+       */
+      top?: number;
+      /**
+       * Frame width in DIP (requires newWindow to be true or headless shell).
        */
       width?: number;
       /**
-       * Frame height in DIP (headless chrome only).
+       * Frame height in DIP (requires newWindow to be true or headless shell).
        */
       height?: number;
+      /**
+       * Frame window state (requires newWindow to be true or headless shell).
+Default is normal.
+       */
+      windowState?: WindowState;
       /**
        * The browser context to create the page in.
        */
       browserContextId?: Browser.BrowserContextID;
       /**
-       * Whether BeginFrames for this target will be controlled via DevTools (headless chrome only,
+       * Whether BeginFrames for this target will be controlled via DevTools (headless shell only,
 not supported on MacOS yet, false by default).
        */
       enableBeginFrameControl?: boolean;
       /**
-       * Whether to create a new Window or Tab (chrome-only, false by default).
+       * Whether to create a new Window or Tab (false by default, not supported by headless shell).
        */
       newWindow?: boolean;
       /**
-       * Whether to create the target in background or foreground (chrome-only,
-false by default).
+       * Whether to create the target in background or foreground (false by default, not supported
+by headless shell).
        */
       background?: boolean;
       /**
        * Whether to create the target of type "tab".
        */
       forTab?: boolean;
+      /**
+       * Whether to create a hidden target. The hidden target is observable via protocol, but not
+present in the tab UI strip. Cannot be created with `forTab: true`, `newWindow: true` or
+`background: false`. The life-time of the tab is limited to the life-time of the session.
+       */
+      hidden?: boolean;
     }
     export type createTargetReturnValue = {
       /**
@@ -15422,11 +16529,14 @@ and crbug.com/991325.
     export type sendMessageToTargetReturnValue = {
     }
     /**
-     * Controls whether to automatically attach to new targets which are considered to be related to
-this one. When turned on, attaches to all existing related targets as well. When turned off,
+     * Controls whether to automatically attach to new targets which are considered
+to be directly related to this one (for example, iframes or workers).
+When turned on, attaches to all existing related targets as well. When turned off,
 automatically detaches from all currently attached targets.
 This also clears all targets added by `autoAttachRelated` from the list of targets to watch
 for creation of related targets.
+You might want to call this recursively for auto-attached targets to attach
+to all available targets.
      */
     export type setAutoAttachParameters = {
       /**
@@ -15501,6 +16611,21 @@ to run paused targets.
     }
     export type setRemoteLocationsReturnValue = {
     }
+    /**
+     * Opens a DevTools window for the target.
+     */
+    export type openDevToolsParameters = {
+      /**
+       * This can be the page or tab target ID.
+       */
+      targetId: TargetID;
+    }
+    export type openDevToolsReturnValue = {
+      /**
+       * The targetId of DevTools page target.
+       */
+      targetId: TargetID;
+    }
   }
   
   /**
@@ -15553,7 +16678,7 @@ to run paused targets.
     export type MemoryDumpConfig = { [key: string]: string };
     export interface TraceConfig {
       /**
-       * Controls how the trace buffer stores data.
+       * Controls how the trace buffer stores data. The default is `recordUntilFull`.
        */
       recordMode?: "recordUntilFull"|"recordContinuously"|"recordAsMuchAsPossible"|"echoToConsole";
       /**
@@ -15766,6 +16891,8 @@ are ignored.
   export module Fetch {
     /**
      * Unique request identifier.
+Note that this does not identify individual HTTP requests that are part of
+a network request.
      */
     export type RequestId = string;
     /**
@@ -16148,7 +17275,7 @@ https://webaudio.github.io/web-audio-api/
     /**
      * Enum of AudioContextState from the spec
      */
-    export type ContextState = "suspended"|"running"|"closed";
+    export type ContextState = "suspended"|"running"|"closed"|"interrupted";
     /**
      * Enum of AudioNode types
      */
@@ -16480,6 +17607,17 @@ flag set to this value. Defaults to the authenticator's
 defaultBackupState value.
        */
       backupState?: boolean;
+      /**
+       * The credential's user.name property. Equivalent to empty if not set.
+https://w3c.github.io/webauthn/#dom-publickeycredentialentity-name
+       */
+      userName?: string;
+      /**
+       * The credential's user.displayName property. Equivalent to empty if
+not set.
+https://w3c.github.io/webauthn/#dom-publickeycredentialuserentity-displayname
+       */
+      userDisplayName?: string;
     }
     
     /**
@@ -16489,6 +17627,22 @@ defaultBackupState value.
       authenticatorId: AuthenticatorId;
       credential: Credential;
     }
+    /**
+     * Triggered when a credential is deleted, e.g. through
+PublicKeyCredential.signalUnknownCredential().
+     */
+    export type credentialDeletedPayload = {
+      authenticatorId: AuthenticatorId;
+      credentialId: binary;
+    }
+    /**
+     * Triggered when a credential is updated, e.g. through
+PublicKeyCredential.signalCurrentUserDetails().
+     */
+    export type credentialUpdatedPayload = {
+      authenticatorId: AuthenticatorId;
+      credential: Credential;
+    }
     /**
      * Triggered when a credential is used in a webauthn assertion.
      */
@@ -16881,7 +18035,7 @@ See also:
        */
       errorMessage?: string;
     }
-    export type RuleSetErrorType = "SourceIsNotJsonObject"|"InvalidRulesSkipped";
+    export type RuleSetErrorType = "SourceIsNotJsonObject"|"InvalidRulesSkipped"|"InvalidRulesetLevelTag";
     /**
      * The type of preloading attempted. It corresponds to
 mojom::SpeculationAction (although PrefetchWithSubresources is omitted as it
@@ -16919,10 +18073,20 @@ possible for multiple rule sets and links to trigger a single attempt.
       ruleSetIds: RuleSetId[];
       nodeIds: DOM.BackendNodeId[];
     }
+    /**
+     * Chrome manages different types of preloads together using a
+concept of preloading pipeline. For example, if a site uses a
+SpeculationRules for prerender, Chrome first starts a prefetch and
+then upgrades it to prerender.
+
+CDP events for them are emitted separately but they share
+`PreloadPipelineId`.
+     */
+    export type PreloadPipelineId = string;
     /**
      * List of FinalStatus reasons for Prerender2.
      */
-    export type PrerenderFinalStatus = "Activated"|"Destroyed"|"LowEndDevice"|"InvalidSchemeRedirect"|"InvalidSchemeNavigation"|"NavigationRequestBlockedByCsp"|"MainFrameNavigation"|"MojoBinderPolicy"|"RendererProcessCrashed"|"RendererProcessKilled"|"Download"|"TriggerDestroyed"|"NavigationNotCommitted"|"NavigationBadHttpStatus"|"ClientCertRequested"|"NavigationRequestNetworkError"|"CancelAllHostsForTesting"|"DidFailLoad"|"Stop"|"SslCertificateError"|"LoginAuthRequested"|"UaChangeRequiresReload"|"BlockedByClient"|"AudioOutputDeviceRequested"|"MixedContent"|"TriggerBackgrounded"|"MemoryLimitExceeded"|"DataSaverEnabled"|"TriggerUrlHasEffectiveUrl"|"ActivatedBeforeStarted"|"InactivePageRestriction"|"StartFailed"|"TimeoutBackgrounded"|"CrossSiteRedirectInInitialNavigation"|"CrossSiteNavigationInInitialNavigation"|"SameSiteCrossOriginRedirectNotOptInInInitialNavigation"|"SameSiteCrossOriginNavigationNotOptInInInitialNavigation"|"ActivationNavigationParameterMismatch"|"ActivatedInBackground"|"EmbedderHostDisallowed"|"ActivationNavigationDestroyedBeforeSuccess"|"TabClosedByUserGesture"|"TabClosedWithoutUserGesture"|"PrimaryMainFrameRendererProcessCrashed"|"PrimaryMainFrameRendererProcessKilled"|"ActivationFramePolicyNotCompatible"|"PreloadingDisabled"|"BatterySaverEnabled"|"ActivatedDuringMainFrameNavigation"|"PreloadingUnsupportedByWebContents"|"CrossSiteRedirectInMainFrameNavigation"|"CrossSiteNavigationInMainFrameNavigation"|"SameSiteCrossOriginRedirectNotOptInInMainFrameNavigation"|"SameSiteCrossOriginNavigationNotOptInInMainFrameNavigation"|"MemoryPressureOnTrigger"|"MemoryPressureAfterTriggered"|"PrerenderingDisabledByDevTools"|"SpeculationRuleRemoved"|"ActivatedWithAuxiliaryBrowsingContexts"|"MaxNumOfRunningEagerPrerendersExceeded"|"MaxNumOfRunningNonEagerPrerendersExceeded"|"MaxNumOfRunningEmbedderPrerendersExceeded"|"PrerenderingUrlHasEffectiveUrl"|"RedirectedPrerenderingUrlHasEffectiveUrl"|"ActivationUrlHasEffectiveUrl"|"JavaScriptInterfaceAdded"|"JavaScriptInterfaceRemoved"|"AllPrerenderingCanceled"|"WindowClosed";
+    export type PrerenderFinalStatus = "Activated"|"Destroyed"|"LowEndDevice"|"InvalidSchemeRedirect"|"InvalidSchemeNavigation"|"NavigationRequestBlockedByCsp"|"MojoBinderPolicy"|"RendererProcessCrashed"|"RendererProcessKilled"|"Download"|"TriggerDestroyed"|"NavigationNotCommitted"|"NavigationBadHttpStatus"|"ClientCertRequested"|"NavigationRequestNetworkError"|"CancelAllHostsForTesting"|"DidFailLoad"|"Stop"|"SslCertificateError"|"LoginAuthRequested"|"UaChangeRequiresReload"|"BlockedByClient"|"AudioOutputDeviceRequested"|"MixedContent"|"TriggerBackgrounded"|"MemoryLimitExceeded"|"DataSaverEnabled"|"TriggerUrlHasEffectiveUrl"|"ActivatedBeforeStarted"|"InactivePageRestriction"|"StartFailed"|"TimeoutBackgrounded"|"CrossSiteRedirectInInitialNavigation"|"CrossSiteNavigationInInitialNavigation"|"SameSiteCrossOriginRedirectNotOptInInInitialNavigation"|"SameSiteCrossOriginNavigationNotOptInInInitialNavigation"|"ActivationNavigationParameterMismatch"|"ActivatedInBackground"|"EmbedderHostDisallowed"|"ActivationNavigationDestroyedBeforeSuccess"|"TabClosedByUserGesture"|"TabClosedWithoutUserGesture"|"PrimaryMainFrameRendererProcessCrashed"|"PrimaryMainFrameRendererProcessKilled"|"ActivationFramePolicyNotCompatible"|"PreloadingDisabled"|"BatterySaverEnabled"|"ActivatedDuringMainFrameNavigation"|"PreloadingUnsupportedByWebContents"|"CrossSiteRedirectInMainFrameNavigation"|"CrossSiteNavigationInMainFrameNavigation"|"SameSiteCrossOriginRedirectNotOptInInMainFrameNavigation"|"SameSiteCrossOriginNavigationNotOptInInMainFrameNavigation"|"MemoryPressureOnTrigger"|"MemoryPressureAfterTriggered"|"PrerenderingDisabledByDevTools"|"SpeculationRuleRemoved"|"ActivatedWithAuxiliaryBrowsingContexts"|"MaxNumOfRunningEagerPrerendersExceeded"|"MaxNumOfRunningNonEagerPrerendersExceeded"|"MaxNumOfRunningEmbedderPrerendersExceeded"|"PrerenderingUrlHasEffectiveUrl"|"RedirectedPrerenderingUrlHasEffectiveUrl"|"ActivationUrlHasEffectiveUrl"|"JavaScriptInterfaceAdded"|"JavaScriptInterfaceRemoved"|"AllPrerenderingCanceled"|"WindowClosed"|"SlowNetwork"|"OtherPrerenderedPageActivated"|"V8OptimizerDisabled"|"PrerenderFailedDuringPrefetch"|"BrowsingDataRemoved"|"PrerenderHostReused";
     /**
      * Preloading status values, see also PreloadingTriggeringOutcome. This
 status is shared by prefetchStatusUpdated and prerenderStatusUpdated.
@@ -16932,7 +18096,7 @@ status is shared by prefetchStatusUpdated and prerenderStatusUpdated.
      * TODO(https://crbug.com/1384419): revisit the list of PrefetchStatus and
 filter out the ones that aren't necessary to the developers.
      */
-    export type PrefetchStatus = "PrefetchAllowed"|"PrefetchFailedIneligibleRedirect"|"PrefetchFailedInvalidRedirect"|"PrefetchFailedMIMENotSupported"|"PrefetchFailedNetError"|"PrefetchFailedNon2XX"|"PrefetchFailedPerPageLimitExceeded"|"PrefetchEvictedAfterCandidateRemoved"|"PrefetchEvictedForNewerPrefetch"|"PrefetchHeldback"|"PrefetchIneligibleRetryAfter"|"PrefetchIsPrivacyDecoy"|"PrefetchIsStale"|"PrefetchNotEligibleBrowserContextOffTheRecord"|"PrefetchNotEligibleDataSaverEnabled"|"PrefetchNotEligibleExistingProxy"|"PrefetchNotEligibleHostIsNonUnique"|"PrefetchNotEligibleNonDefaultStoragePartition"|"PrefetchNotEligibleSameSiteCrossOriginPrefetchRequiredProxy"|"PrefetchNotEligibleSchemeIsNotHttps"|"PrefetchNotEligibleUserHasCookies"|"PrefetchNotEligibleUserHasServiceWorker"|"PrefetchNotEligibleBatterySaverEnabled"|"PrefetchNotEligiblePreloadingDisabled"|"PrefetchNotFinishedInTime"|"PrefetchNotStarted"|"PrefetchNotUsedCookiesChanged"|"PrefetchProxyNotAvailable"|"PrefetchResponseUsed"|"PrefetchSuccessfulButNotUsed"|"PrefetchNotUsedProbeFailed";
+    export type PrefetchStatus = "PrefetchAllowed"|"PrefetchFailedIneligibleRedirect"|"PrefetchFailedInvalidRedirect"|"PrefetchFailedMIMENotSupported"|"PrefetchFailedNetError"|"PrefetchFailedNon2XX"|"PrefetchEvictedAfterBrowsingDataRemoved"|"PrefetchEvictedAfterCandidateRemoved"|"PrefetchEvictedForNewerPrefetch"|"PrefetchHeldback"|"PrefetchIneligibleRetryAfter"|"PrefetchIsPrivacyDecoy"|"PrefetchIsStale"|"PrefetchNotEligibleBrowserContextOffTheRecord"|"PrefetchNotEligibleDataSaverEnabled"|"PrefetchNotEligibleExistingProxy"|"PrefetchNotEligibleHostIsNonUnique"|"PrefetchNotEligibleNonDefaultStoragePartition"|"PrefetchNotEligibleSameSiteCrossOriginPrefetchRequiredProxy"|"PrefetchNotEligibleSchemeIsNotHttps"|"PrefetchNotEligibleUserHasCookies"|"PrefetchNotEligibleUserHasServiceWorker"|"PrefetchNotEligibleUserHasServiceWorkerNoFetchHandler"|"PrefetchNotEligibleRedirectFromServiceWorker"|"PrefetchNotEligibleRedirectToServiceWorker"|"PrefetchNotEligibleBatterySaverEnabled"|"PrefetchNotEligiblePreloadingDisabled"|"PrefetchNotFinishedInTime"|"PrefetchNotStarted"|"PrefetchNotUsedCookiesChanged"|"PrefetchProxyNotAvailable"|"PrefetchResponseUsed"|"PrefetchSuccessfulButNotUsed"|"PrefetchNotUsedProbeFailed";
     /**
      * Information of headers to be displayed when the header mismatch occurred.
      */
@@ -16966,6 +18130,7 @@ filter out the ones that aren't necessary to the developers.
      */
     export type prefetchStatusUpdatedPayload = {
       key: PreloadingAttemptKey;
+      pipelineId: PreloadPipelineId;
       /**
        * The frame id of the frame initiating prefetch.
        */
@@ -16980,6 +18145,7 @@ filter out the ones that aren't necessary to the developers.
      */
     export type prerenderStatusUpdatedPayload = {
       key: PreloadingAttemptKey;
+      pipelineId: PreloadPipelineId;
       status: PreloadingStatus;
       prerenderStatus?: PrerenderFinalStatus;
       /**
@@ -17158,15 +18324,30 @@ https://web.dev/learn/pwa/web-app-manifest.
       fileHandlers: FileHandler[];
     }
     /**
-     * Installs the given manifest identity, optionally using the given install_url
-or IWA bundle location.
+     * Installs the given manifest identity, optionally using the given installUrlOrBundleUrl
+
+IWA-specific install description:
+manifestId corresponds to isolated-app:// + web_package::SignedWebBundleId
+
+File installation mode:
+The installUrlOrBundleUrl can be either file:// or http(s):// pointing
+to a signed web bundle (.swbn). In this case SignedWebBundleId must correspond to
+The .swbn file's signing key.
 
-TODO(crbug.com/337872319) Support IWA to meet the following specific
-requirement.
-IWA-specific install description: If the manifest_id is isolated-app://,
-install_url_or_bundle_url is required, and can be either an http(s) URL or
-file:// URL pointing to a signed web bundle (.swbn). The .swbn file's
-signing key must correspond to manifest_id. If Chrome is not in IWA dev
+Dev proxy installation mode:
+installUrlOrBundleUrl must be http(s):// that serves dev mode IWA.
+web_package::SignedWebBundleId must be of type dev proxy.
+
+The advantage of dev proxy mode is that all changes to IWA
+automatically will be reflected in the running app without
+reinstallation.
+
+To generate bundle id for proxy mode:
+1. Generate 32 random bytes.
+2. Add a specific suffix 0x00 at the end.
+3. Encode the entire sequence using Base32 without padding.
+
+If Chrome is not in IWA dev
 mode, the installation will fail, regardless of the state of the allowlist.
      */
     export type installParameters = {
@@ -17270,6 +18451,292 @@ supported yet.
     }
   }
   
+  /**
+   * This domain allows configuring virtual Bluetooth devices to test
+the web-bluetooth API.
+   */
+  export module BluetoothEmulation {
+    /**
+     * Indicates the various states of Central.
+     */
+    export type CentralState = "absent"|"powered-off"|"powered-on";
+    /**
+     * Indicates the various types of GATT event.
+     */
+    export type GATTOperationType = "connection"|"discovery";
+    /**
+     * Indicates the various types of characteristic write.
+     */
+    export type CharacteristicWriteType = "write-default-deprecated"|"write-with-response"|"write-without-response";
+    /**
+     * Indicates the various types of characteristic operation.
+     */
+    export type CharacteristicOperationType = "read"|"write"|"subscribe-to-notifications"|"unsubscribe-from-notifications";
+    /**
+     * Indicates the various types of descriptor operation.
+     */
+    export type DescriptorOperationType = "read"|"write";
+    /**
+     * Stores the manufacturer data
+     */
+    export interface ManufacturerData {
+      /**
+       * Company identifier
+https://bitbucket.org/bluetooth-SIG/public/src/main/assigned_numbers/company_identifiers/company_identifiers.yaml
+https://usb.org/developers
+       */
+      key: number;
+      /**
+       * Manufacturer-specific data
+       */
+      data: binary;
+    }
+    /**
+     * Stores the byte data of the advertisement packet sent by a Bluetooth device.
+     */
+    export interface ScanRecord {
+      name?: string;
+      uuids?: string[];
+      /**
+       * Stores the external appearance description of the device.
+       */
+      appearance?: number;
+      /**
+       * Stores the transmission power of a broadcasting device.
+       */
+      txPower?: number;
+      /**
+       * Key is the company identifier and the value is an array of bytes of
+manufacturer specific data.
+       */
+      manufacturerData?: ManufacturerData[];
+    }
+    /**
+     * Stores the advertisement packet information that is sent by a Bluetooth device.
+     */
+    export interface ScanEntry {
+      deviceAddress: string;
+      rssi: number;
+      scanRecord: ScanRecord;
+    }
+    /**
+     * Describes the properties of a characteristic. This follows Bluetooth Core
+Specification BT 4.2 Vol 3 Part G 3.3.1. Characteristic Properties.
+     */
+    export interface CharacteristicProperties {
+      broadcast?: boolean;
+      read?: boolean;
+      writeWithoutResponse?: boolean;
+      write?: boolean;
+      notify?: boolean;
+      indicate?: boolean;
+      authenticatedSignedWrites?: boolean;
+      extendedProperties?: boolean;
+    }
+    
+    /**
+     * Event for when a GATT operation of |type| to the peripheral with |address|
+happened.
+     */
+    export type gattOperationReceivedPayload = {
+      address: string;
+      type: GATTOperationType;
+    }
+    /**
+     * Event for when a characteristic operation of |type| to the characteristic
+respresented by |characteristicId| happened. |data| and |writeType| is
+expected to exist when |type| is write.
+     */
+    export type characteristicOperationReceivedPayload = {
+      characteristicId: string;
+      type: CharacteristicOperationType;
+      data?: binary;
+      writeType?: CharacteristicWriteType;
+    }
+    /**
+     * Event for when a descriptor operation of |type| to the descriptor
+respresented by |descriptorId| happened. |data| is expected to exist when
+|type| is write.
+     */
+    export type descriptorOperationReceivedPayload = {
+      descriptorId: string;
+      type: DescriptorOperationType;
+      data?: binary;
+    }
+    
+    /**
+     * Enable the BluetoothEmulation domain.
+     */
+    export type enableParameters = {
+      /**
+       * State of the simulated central.
+       */
+      state: CentralState;
+      /**
+       * If the simulated central supports low-energy.
+       */
+      leSupported: boolean;
+    }
+    export type enableReturnValue = {
+    }
+    /**
+     * Set the state of the simulated central.
+     */
+    export type setSimulatedCentralStateParameters = {
+      /**
+       * State of the simulated central.
+       */
+      state: CentralState;
+    }
+    export type setSimulatedCentralStateReturnValue = {
+    }
+    /**
+     * Disable the BluetoothEmulation domain.
+     */
+    export type disableParameters = {
+    }
+    export type disableReturnValue = {
+    }
+    /**
+     * Simulates a peripheral with |address|, |name| and |knownServiceUuids|
+that has already been connected to the system.
+     */
+    export type simulatePreconnectedPeripheralParameters = {
+      address: string;
+      name: string;
+      manufacturerData: ManufacturerData[];
+      knownServiceUuids: string[];
+    }
+    export type simulatePreconnectedPeripheralReturnValue = {
+    }
+    /**
+     * Simulates an advertisement packet described in |entry| being received by
+the central.
+     */
+    export type simulateAdvertisementParameters = {
+      entry: ScanEntry;
+    }
+    export type simulateAdvertisementReturnValue = {
+    }
+    /**
+     * Simulates the response code from the peripheral with |address| for a
+GATT operation of |type|. The |code| value follows the HCI Error Codes from
+Bluetooth Core Specification Vol 2 Part D 1.3 List Of Error Codes.
+     */
+    export type simulateGATTOperationResponseParameters = {
+      address: string;
+      type: GATTOperationType;
+      code: number;
+    }
+    export type simulateGATTOperationResponseReturnValue = {
+    }
+    /**
+     * Simulates the response from the characteristic with |characteristicId| for a
+characteristic operation of |type|. The |code| value follows the Error
+Codes from Bluetooth Core Specification Vol 3 Part F 3.4.1.1 Error Response.
+The |data| is expected to exist when simulating a successful read operation
+response.
+     */
+    export type simulateCharacteristicOperationResponseParameters = {
+      characteristicId: string;
+      type: CharacteristicOperationType;
+      code: number;
+      data?: binary;
+    }
+    export type simulateCharacteristicOperationResponseReturnValue = {
+    }
+    /**
+     * Simulates the response from the descriptor with |descriptorId| for a
+descriptor operation of |type|. The |code| value follows the Error
+Codes from Bluetooth Core Specification Vol 3 Part F 3.4.1.1 Error Response.
+The |data| is expected to exist when simulating a successful read operation
+response.
+     */
+    export type simulateDescriptorOperationResponseParameters = {
+      descriptorId: string;
+      type: DescriptorOperationType;
+      code: number;
+      data?: binary;
+    }
+    export type simulateDescriptorOperationResponseReturnValue = {
+    }
+    /**
+     * Adds a service with |serviceUuid| to the peripheral with |address|.
+     */
+    export type addServiceParameters = {
+      address: string;
+      serviceUuid: string;
+    }
+    export type addServiceReturnValue = {
+      /**
+       * An identifier that uniquely represents this service.
+       */
+      serviceId: string;
+    }
+    /**
+     * Removes the service respresented by |serviceId| from the simulated central.
+     */
+    export type removeServiceParameters = {
+      serviceId: string;
+    }
+    export type removeServiceReturnValue = {
+    }
+    /**
+     * Adds a characteristic with |characteristicUuid| and |properties| to the
+service represented by |serviceId|.
+     */
+    export type addCharacteristicParameters = {
+      serviceId: string;
+      characteristicUuid: string;
+      properties: CharacteristicProperties;
+    }
+    export type addCharacteristicReturnValue = {
+      /**
+       * An identifier that uniquely represents this characteristic.
+       */
+      characteristicId: string;
+    }
+    /**
+     * Removes the characteristic respresented by |characteristicId| from the
+simulated central.
+     */
+    export type removeCharacteristicParameters = {
+      characteristicId: string;
+    }
+    export type removeCharacteristicReturnValue = {
+    }
+    /**
+     * Adds a descriptor with |descriptorUuid| to the characteristic respresented
+by |characteristicId|.
+     */
+    export type addDescriptorParameters = {
+      characteristicId: string;
+      descriptorUuid: string;
+    }
+    export type addDescriptorReturnValue = {
+      /**
+       * An identifier that uniquely represents this descriptor.
+       */
+      descriptorId: string;
+    }
+    /**
+     * Removes the descriptor with |descriptorId| from the simulated central.
+     */
+    export type removeDescriptorParameters = {
+      descriptorId: string;
+    }
+    export type removeDescriptorReturnValue = {
+    }
+    /**
+     * Simulates a GATT disconnection from the peripheral with |address|.
+     */
+    export type simulateGATTDisconnectionParameters = {
+      address: string;
+    }
+    export type simulateGATTDisconnectionReturnValue = {
+    }
+  }
+  
   /**
    * This domain is deprecated - use Runtime or Log instead.
    */
@@ -17502,15 +18969,26 @@ variables as its properties.
       /**
        * Type of the debug symbols.
        */
-      type: "None"|"SourceMap"|"EmbeddedDWARF"|"ExternalDWARF";
+      type: "SourceMap"|"EmbeddedDWARF"|"ExternalDWARF";
       /**
        * URL of the external symbol source.
        */
       externalURL?: string;
     }
+    export interface ResolvedBreakpoint {
+      /**
+       * Breakpoint unique identifier.
+       */
+      breakpointId: BreakpointId;
+      /**
+       * Actual breakpoint location.
+       */
+      location: Location;
+    }
     
     /**
      * Fired when breakpoint is resolved to an actual script and location.
+Deprecated in favor of `resolvedBreakpoints` in the `scriptParsed` event.
      */
     export type breakpointResolvedPayload = {
       /**
@@ -17595,6 +19073,10 @@ variables as its properties.
        * Content hash of the script, SHA-256.
        */
       hash: string;
+      /**
+       * For Wasm modules, the content of the `build_id` custom section. For JavaScript the `debugId` magic comment.
+       */
+      buildId: string;
       /**
        * Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string}
        */
@@ -17669,6 +19151,10 @@ scripts upon enabling debugger.
        * Content hash of the script, SHA-256.
        */
       hash: string;
+      /**
+       * For Wasm modules, the content of the `build_id` custom section. For JavaScript the `debugId` magic comment.
+       */
+      buildId: string;
       /**
        * Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string}
        */
@@ -17706,13 +19192,19 @@ scripts upon enabling debugger.
        */
       scriptLanguage?: Debugger.ScriptLanguage;
       /**
-       * If the scriptLanguage is WebASsembly, the source of debug symbols for the module.
+       * If the scriptLanguage is WebAssembly, the source of debug symbols for the module.
        */
-      debugSymbols?: Debugger.DebugSymbols;
+      debugSymbols?: Debugger.DebugSymbols[];
       /**
        * The name the embedder supplied for this script.
        */
       embedderName?: string;
+      /**
+       * The list of set breakpoints in this script if calls to `setBreakpointByUrl`
+matches this script's URL or hash. Clients that use this list can ignore the
+`breakpointResolved` event. They are equivalent.
+       */
+      resolvedBreakpoints?: ResolvedBreakpoint[];
     }
     
     /**
@@ -18031,6 +19523,19 @@ call stacks (default).
     }
     export type setAsyncCallStackDepthReturnValue = {
     }
+    /**
+     * Replace previous blackbox execution contexts with passed ones. Forces backend to skip
+stepping/pausing in scripts in these execution contexts. VM will try to leave blackboxed script by
+performing 'step in' several times, finally resorting to 'step out' if unsuccessful.
+     */
+    export type setBlackboxExecutionContextsParameters = {
+      /**
+       * Array of execution context unique ids for the debugger to ignore.
+       */
+      uniqueIds: string[];
+    }
+    export type setBlackboxExecutionContextsReturnValue = {
+    }
     /**
      * Replace previous blackbox patterns with passed ones. Forces backend to skip stepping/pausing in
 scripts with url matching one of the patterns. VM will try to leave blackboxed script by
@@ -18041,6 +19546,10 @@ performing 'step in' several times, finally resorting to 'step out' if unsuccess
        * Array of regexps that will be used to check script url for blackbox state.
        */
       patterns: string[];
+      /**
+       * If true, also ignore scripts with no source url.
+       */
+      skipAnonymous?: boolean;
     }
     export type setBlackboxPatternsReturnValue = {
     }
@@ -19621,13 +21130,21 @@ It is the total usage of the corresponding isolate not scoped to a particular Ru
     }
     export type getHeapUsageReturnValue = {
       /**
-       * Used heap size in bytes.
+       * Used JavaScript heap size in bytes.
        */
       usedSize: number;
       /**
-       * Allocated heap size in bytes.
+       * Allocated JavaScript heap size in bytes.
        */
       totalSize: number;
+      /**
+       * Used size in bytes in the embedder's garbage-collected heap.
+       */
+      embedderHeapUsedSize: number;
+      /**
+       * Size in bytes of backing storage for array buffers and external strings.
+       */
+      backingStorageSize: number;
     }
     /**
      * Returns properties of a given object. Object group of the result is inherited from the target
@@ -19920,6 +21437,7 @@ Error was thrown.
     "CSS.styleSheetAdded": CSS.styleSheetAddedPayload;
     "CSS.styleSheetChanged": CSS.styleSheetChangedPayload;
     "CSS.styleSheetRemoved": CSS.styleSheetRemovedPayload;
+    "CSS.computedStyleUpdated": CSS.computedStyleUpdatedPayload;
     "Cast.sinksUpdated": Cast.sinksUpdatedPayload;
     "Cast.issueUpdated": Cast.issueUpdatedPayload;
     "DOM.attributeModified": DOM.attributeModifiedPayload;
@@ -19933,6 +21451,7 @@ Error was thrown.
     "DOM.inlineStyleInvalidated": DOM.inlineStyleInvalidatedPayload;
     "DOM.pseudoElementAdded": DOM.pseudoElementAddedPayload;
     "DOM.topLayerElementsUpdated": DOM.topLayerElementsUpdatedPayload;
+    "DOM.scrollableFlagUpdated": DOM.scrollableFlagUpdatedPayload;
     "DOM.pseudoElementRemoved": DOM.pseudoElementRemovedPayload;
     "DOM.setChildNodes": DOM.setChildNodesPayload;
     "DOM.shadowRootPopped": DOM.shadowRootPoppedPayload;
@@ -19941,7 +21460,6 @@ Error was thrown.
     "DOMStorage.domStorageItemRemoved": DOMStorage.domStorageItemRemovedPayload;
     "DOMStorage.domStorageItemUpdated": DOMStorage.domStorageItemUpdatedPayload;
     "DOMStorage.domStorageItemsCleared": DOMStorage.domStorageItemsClearedPayload;
-    "Database.addDatabase": Database.addDatabasePayload;
     "Emulation.virtualTimeBudgetExpired": Emulation.virtualTimeBudgetExpiredPayload;
     "Input.dragIntercepted": Input.dragInterceptedPayload;
     "Inspector.detached": Inspector.detachedPayload;
@@ -19970,6 +21488,18 @@ Error was thrown.
     "Network.webTransportCreated": Network.webTransportCreatedPayload;
     "Network.webTransportConnectionEstablished": Network.webTransportConnectionEstablishedPayload;
     "Network.webTransportClosed": Network.webTransportClosedPayload;
+    "Network.directTCPSocketCreated": Network.directTCPSocketCreatedPayload;
+    "Network.directTCPSocketOpened": Network.directTCPSocketOpenedPayload;
+    "Network.directTCPSocketAborted": Network.directTCPSocketAbortedPayload;
+    "Network.directTCPSocketClosed": Network.directTCPSocketClosedPayload;
+    "Network.directTCPSocketChunkSent": Network.directTCPSocketChunkSentPayload;
+    "Network.directTCPSocketChunkReceived": Network.directTCPSocketChunkReceivedPayload;
+    "Network.directUDPSocketCreated": Network.directUDPSocketCreatedPayload;
+    "Network.directUDPSocketOpened": Network.directUDPSocketOpenedPayload;
+    "Network.directUDPSocketAborted": Network.directUDPSocketAbortedPayload;
+    "Network.directUDPSocketClosed": Network.directUDPSocketClosedPayload;
+    "Network.directUDPSocketChunkSent": Network.directUDPSocketChunkSentPayload;
+    "Network.directUDPSocketChunkReceived": Network.directUDPSocketChunkReceivedPayload;
     "Network.requestWillBeSentExtraInfo": Network.requestWillBeSentExtraInfoPayload;
     "Network.responseReceivedExtraInfo": Network.responseReceivedExtraInfoPayload;
     "Network.responseReceivedEarlyHints": Network.responseReceivedEarlyHintsPayload;
@@ -19991,9 +21521,11 @@ Error was thrown.
     "Page.frameAttached": Page.frameAttachedPayload;
     "Page.frameClearedScheduledNavigation": Page.frameClearedScheduledNavigationPayload;
     "Page.frameDetached": Page.frameDetachedPayload;
+    "Page.frameSubtreeWillBeDetached": Page.frameSubtreeWillBeDetachedPayload;
     "Page.frameNavigated": Page.frameNavigatedPayload;
     "Page.documentOpened": Page.documentOpenedPayload;
     "Page.frameResized": Page.frameResizedPayload;
+    "Page.frameStartedNavigating": Page.frameStartedNavigatingPayload;
     "Page.frameRequestedNavigation": Page.frameRequestedNavigationPayload;
     "Page.frameScheduledNavigation": Page.frameScheduledNavigationPayload;
     "Page.frameStartedLoading": Page.frameStartedLoadingPayload;
@@ -20028,10 +21560,13 @@ Error was thrown.
     "Storage.interestGroupAuctionEventOccurred": Storage.interestGroupAuctionEventOccurredPayload;
     "Storage.interestGroupAuctionNetworkRequestCreated": Storage.interestGroupAuctionNetworkRequestCreatedPayload;
     "Storage.sharedStorageAccessed": Storage.sharedStorageAccessedPayload;
+    "Storage.sharedStorageWorkletOperationExecutionFinished": Storage.sharedStorageWorkletOperationExecutionFinishedPayload;
     "Storage.storageBucketCreatedOrUpdated": Storage.storageBucketCreatedOrUpdatedPayload;
     "Storage.storageBucketDeleted": Storage.storageBucketDeletedPayload;
     "Storage.attributionReportingSourceRegistered": Storage.attributionReportingSourceRegisteredPayload;
     "Storage.attributionReportingTriggerRegistered": Storage.attributionReportingTriggerRegisteredPayload;
+    "Storage.attributionReportingReportSent": Storage.attributionReportingReportSentPayload;
+    "Storage.attributionReportingVerboseDebugReportSent": Storage.attributionReportingVerboseDebugReportSentPayload;
     "Target.attachedToTarget": Target.attachedToTargetPayload;
     "Target.detachedFromTarget": Target.detachedFromTargetPayload;
     "Target.receivedMessageFromTarget": Target.receivedMessageFromTargetPayload;
@@ -20059,6 +21594,8 @@ Error was thrown.
     "WebAudio.nodeParamConnected": WebAudio.nodeParamConnectedPayload;
     "WebAudio.nodeParamDisconnected": WebAudio.nodeParamDisconnectedPayload;
     "WebAuthn.credentialAdded": WebAuthn.credentialAddedPayload;
+    "WebAuthn.credentialDeleted": WebAuthn.credentialDeletedPayload;
+    "WebAuthn.credentialUpdated": WebAuthn.credentialUpdatedPayload;
     "WebAuthn.credentialAsserted": WebAuthn.credentialAssertedPayload;
     "Media.playerPropertiesChanged": Media.playerPropertiesChangedPayload;
     "Media.playerEventsAdded": Media.playerEventsAddedPayload;
@@ -20074,6 +21611,9 @@ Error was thrown.
     "Preload.preloadingAttemptSourcesUpdated": Preload.preloadingAttemptSourcesUpdatedPayload;
     "FedCm.dialogShown": FedCm.dialogShownPayload;
     "FedCm.dialogClosed": FedCm.dialogClosedPayload;
+    "BluetoothEmulation.gattOperationReceived": BluetoothEmulation.gattOperationReceivedPayload;
+    "BluetoothEmulation.characteristicOperationReceived": BluetoothEmulation.characteristicOperationReceivedPayload;
+    "BluetoothEmulation.descriptorOperationReceived": BluetoothEmulation.descriptorOperationReceivedPayload;
     "Console.messageAdded": Console.messageAddedPayload;
     "Debugger.breakpointResolved": Debugger.breakpointResolvedPayload;
     "Debugger.paused": Debugger.pausedPayload;
@@ -20122,6 +21662,11 @@ Error was thrown.
     "Audits.checkContrast": Audits.checkContrastParameters;
     "Audits.checkFormsIssues": Audits.checkFormsIssuesParameters;
     "Extensions.loadUnpacked": Extensions.loadUnpackedParameters;
+    "Extensions.uninstall": Extensions.uninstallParameters;
+    "Extensions.getStorageItems": Extensions.getStorageItemsParameters;
+    "Extensions.removeStorageItems": Extensions.removeStorageItemsParameters;
+    "Extensions.clearStorageItems": Extensions.clearStorageItemsParameters;
+    "Extensions.setStorageItems": Extensions.setStorageItemsParameters;
     "Autofill.trigger": Autofill.triggerParameters;
     "Autofill.setAddresses": Autofill.setAddressesParameters;
     "Autofill.disable": Autofill.disableParameters;
@@ -20145,24 +21690,32 @@ Error was thrown.
     "Browser.getWindowBounds": Browser.getWindowBoundsParameters;
     "Browser.getWindowForTarget": Browser.getWindowForTargetParameters;
     "Browser.setWindowBounds": Browser.setWindowBoundsParameters;
+    "Browser.setContentsSize": Browser.setContentsSizeParameters;
     "Browser.setDockTile": Browser.setDockTileParameters;
     "Browser.executeBrowserCommand": Browser.executeBrowserCommandParameters;
     "Browser.addPrivacySandboxEnrollmentOverride": Browser.addPrivacySandboxEnrollmentOverrideParameters;
+    "Browser.addPrivacySandboxCoordinatorKeyConfig": Browser.addPrivacySandboxCoordinatorKeyConfigParameters;
     "CSS.addRule": CSS.addRuleParameters;
     "CSS.collectClassNames": CSS.collectClassNamesParameters;
     "CSS.createStyleSheet": CSS.createStyleSheetParameters;
     "CSS.disable": CSS.disableParameters;
     "CSS.enable": CSS.enableParameters;
     "CSS.forcePseudoState": CSS.forcePseudoStateParameters;
+    "CSS.forceStartingStyle": CSS.forceStartingStyleParameters;
     "CSS.getBackgroundColors": CSS.getBackgroundColorsParameters;
     "CSS.getComputedStyleForNode": CSS.getComputedStyleForNodeParameters;
+    "CSS.resolveValues": CSS.resolveValuesParameters;
+    "CSS.getLonghandProperties": CSS.getLonghandPropertiesParameters;
     "CSS.getInlineStylesForNode": CSS.getInlineStylesForNodeParameters;
+    "CSS.getAnimatedStylesForNode": CSS.getAnimatedStylesForNodeParameters;
     "CSS.getMatchedStylesForNode": CSS.getMatchedStylesForNodeParameters;
+    "CSS.getEnvironmentVariables": CSS.getEnvironmentVariablesParameters;
     "CSS.getMediaQueries": CSS.getMediaQueriesParameters;
     "CSS.getPlatformFontsForNode": CSS.getPlatformFontsForNodeParameters;
     "CSS.getStyleSheetText": CSS.getStyleSheetTextParameters;
     "CSS.getLayersForNode": CSS.getLayersForNodeParameters;
     "CSS.getLocationForSelector": CSS.getLocationForSelectorParameters;
+    "CSS.trackComputedStyleUpdatesForNode": CSS.trackComputedStyleUpdatesForNodeParameters;
     "CSS.trackComputedStyleUpdates": CSS.trackComputedStyleUpdatesParameters;
     "CSS.takeComputedStyleUpdates": CSS.takeComputedStyleUpdatesParameters;
     "CSS.setEffectivePropertyValueForNode": CSS.setEffectivePropertyValueForNodeParameters;
@@ -20232,6 +21785,7 @@ Error was thrown.
     "DOM.setNodeStackTracesEnabled": DOM.setNodeStackTracesEnabledParameters;
     "DOM.getNodeStackTraces": DOM.getNodeStackTracesParameters;
     "DOM.getFileInfo": DOM.getFileInfoParameters;
+    "DOM.getDetachedDomNodes": DOM.getDetachedDomNodesParameters;
     "DOM.setInspectedNode": DOM.setInspectedNodeParameters;
     "DOM.setNodeName": DOM.setNodeNameParameters;
     "DOM.setNodeValue": DOM.setNodeValueParameters;
@@ -20241,6 +21795,7 @@ Error was thrown.
     "DOM.getContainerForNode": DOM.getContainerForNodeParameters;
     "DOM.getQueryingDescendantsForContainer": DOM.getQueryingDescendantsForContainerParameters;
     "DOM.getAnchorElement": DOM.getAnchorElementParameters;
+    "DOM.forceShowPopover": DOM.forceShowPopoverParameters;
     "DOMDebugger.getEventListeners": DOMDebugger.getEventListenersParameters;
     "DOMDebugger.removeDOMBreakpoint": DOMDebugger.removeDOMBreakpointParameters;
     "DOMDebugger.removeEventListenerBreakpoint": DOMDebugger.removeEventListenerBreakpointParameters;
@@ -20264,10 +21819,6 @@ Error was thrown.
     "DOMStorage.getDOMStorageItems": DOMStorage.getDOMStorageItemsParameters;
     "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemParameters;
     "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemParameters;
-    "Database.disable": Database.disableParameters;
-    "Database.enable": Database.enableParameters;
-    "Database.executeSQL": Database.executeSQLParameters;
-    "Database.getDatabaseTableNames": Database.getDatabaseTableNamesParameters;
     "DeviceOrientation.clearDeviceOrientationOverride": DeviceOrientation.clearDeviceOrientationOverrideParameters;
     "DeviceOrientation.setDeviceOrientationOverride": DeviceOrientation.setDeviceOrientationOverrideParameters;
     "Emulation.canEmulate": Emulation.canEmulateParameters;
@@ -20278,20 +21829,25 @@ Error was thrown.
     "Emulation.setAutoDarkModeOverride": Emulation.setAutoDarkModeOverrideParameters;
     "Emulation.setCPUThrottlingRate": Emulation.setCPUThrottlingRateParameters;
     "Emulation.setDefaultBackgroundColorOverride": Emulation.setDefaultBackgroundColorOverrideParameters;
+    "Emulation.setSafeAreaInsetsOverride": Emulation.setSafeAreaInsetsOverrideParameters;
     "Emulation.setDeviceMetricsOverride": Emulation.setDeviceMetricsOverrideParameters;
     "Emulation.setDevicePostureOverride": Emulation.setDevicePostureOverrideParameters;
     "Emulation.clearDevicePostureOverride": Emulation.clearDevicePostureOverrideParameters;
+    "Emulation.setDisplayFeaturesOverride": Emulation.setDisplayFeaturesOverrideParameters;
+    "Emulation.clearDisplayFeaturesOverride": Emulation.clearDisplayFeaturesOverrideParameters;
     "Emulation.setScrollbarsHidden": Emulation.setScrollbarsHiddenParameters;
     "Emulation.setDocumentCookieDisabled": Emulation.setDocumentCookieDisabledParameters;
     "Emulation.setEmitTouchEventsForMouse": Emulation.setEmitTouchEventsForMouseParameters;
     "Emulation.setEmulatedMedia": Emulation.setEmulatedMediaParameters;
     "Emulation.setEmulatedVisionDeficiency": Emulation.setEmulatedVisionDeficiencyParameters;
+    "Emulation.setEmulatedOSTextScale": Emulation.setEmulatedOSTextScaleParameters;
     "Emulation.setGeolocationOverride": Emulation.setGeolocationOverrideParameters;
     "Emulation.getOverriddenSensorInformation": Emulation.getOverriddenSensorInformationParameters;
     "Emulation.setSensorOverrideEnabled": Emulation.setSensorOverrideEnabledParameters;
     "Emulation.setSensorOverrideReadings": Emulation.setSensorOverrideReadingsParameters;
     "Emulation.setPressureSourceOverrideEnabled": Emulation.setPressureSourceOverrideEnabledParameters;
     "Emulation.setPressureStateOverride": Emulation.setPressureStateOverrideParameters;
+    "Emulation.setPressureDataOverride": Emulation.setPressureDataOverrideParameters;
     "Emulation.setIdleOverride": Emulation.setIdleOverrideParameters;
     "Emulation.clearIdleOverride": Emulation.clearIdleOverrideParameters;
     "Emulation.setNavigatorOverrides": Emulation.setNavigatorOverridesParameters;
@@ -20303,9 +21859,11 @@ Error was thrown.
     "Emulation.setTimezoneOverride": Emulation.setTimezoneOverrideParameters;
     "Emulation.setVisibleSize": Emulation.setVisibleSizeParameters;
     "Emulation.setDisabledImageTypes": Emulation.setDisabledImageTypesParameters;
+    "Emulation.setDataSaverOverride": Emulation.setDataSaverOverrideParameters;
     "Emulation.setHardwareConcurrencyOverride": Emulation.setHardwareConcurrencyOverrideParameters;
     "Emulation.setUserAgentOverride": Emulation.setUserAgentOverrideParameters;
     "Emulation.setAutomationOverride": Emulation.setAutomationOverrideParameters;
+    "Emulation.setSmallViewportHeightDifferenceOverride": Emulation.setSmallViewportHeightDifferenceOverrideParameters;
     "HeadlessExperimental.beginFrame": HeadlessExperimental.beginFrameParameters;
     "HeadlessExperimental.disable": HeadlessExperimental.disableParameters;
     "HeadlessExperimental.enable": HeadlessExperimental.enableParameters;
@@ -20352,6 +21910,7 @@ Error was thrown.
     "Log.startViolationsReport": Log.startViolationsReportParameters;
     "Log.stopViolationsReport": Log.stopViolationsReportParameters;
     "Memory.getDOMCounters": Memory.getDOMCountersParameters;
+    "Memory.getDOMCountersForLeakDetection": Memory.getDOMCountersForLeakDetectionParameters;
     "Memory.prepareForLeakDetection": Memory.prepareForLeakDetectionParameters;
     "Memory.forciblyPurgeJavaScriptMemory": Memory.forciblyPurgeJavaScriptMemoryParameters;
     "Memory.setPressureNotificationsSuppressed": Memory.setPressureNotificationsSuppressedParameters;
@@ -20395,6 +21954,7 @@ Error was thrown.
     "Network.getSecurityIsolationStatus": Network.getSecurityIsolationStatusParameters;
     "Network.enableReportingApi": Network.enableReportingApiParameters;
     "Network.loadNetworkResource": Network.loadNetworkResourceParameters;
+    "Network.setCookieControls": Network.setCookieControlsParameters;
     "Overlay.disable": Overlay.disableParameters;
     "Overlay.enable": Overlay.enableParameters;
     "Overlay.getHighlightObjectForTest": Overlay.getHighlightObjectForTestParameters;
@@ -20440,7 +22000,7 @@ Error was thrown.
     "Page.getInstallabilityErrors": Page.getInstallabilityErrorsParameters;
     "Page.getManifestIcons": Page.getManifestIconsParameters;
     "Page.getAppId": Page.getAppIdParameters;
-    "Page.getAdScriptId": Page.getAdScriptIdParameters;
+    "Page.getAdScriptAncestry": Page.getAdScriptAncestryParameters;
     "Page.getFrameTree": Page.getFrameTreeParameters;
     "Page.getLayoutMetrics": Page.getLayoutMetricsParameters;
     "Page.getNavigationHistory": Page.getNavigationHistoryParameters;
@@ -20499,7 +22059,6 @@ Error was thrown.
     "ServiceWorker.dispatchSyncEvent": ServiceWorker.dispatchSyncEventParameters;
     "ServiceWorker.dispatchPeriodicSyncEvent": ServiceWorker.dispatchPeriodicSyncEventParameters;
     "ServiceWorker.enable": ServiceWorker.enableParameters;
-    "ServiceWorker.inspectWorker": ServiceWorker.inspectWorkerParameters;
     "ServiceWorker.setForceUpdateOnPageLoad": ServiceWorker.setForceUpdateOnPageLoadParameters;
     "ServiceWorker.skipWaiting": ServiceWorker.skipWaitingParameters;
     "ServiceWorker.startWorker": ServiceWorker.startWorkerParameters;
@@ -20542,6 +22101,8 @@ Error was thrown.
     "Storage.setAttributionReportingTracking": Storage.setAttributionReportingTrackingParameters;
     "Storage.sendPendingAttributionReports": Storage.sendPendingAttributionReportsParameters;
     "Storage.getRelatedWebsiteSets": Storage.getRelatedWebsiteSetsParameters;
+    "Storage.getAffectedUrlsForThirdPartyCookieMetadata": Storage.getAffectedUrlsForThirdPartyCookieMetadataParameters;
+    "Storage.setProtectedAudienceKAnonymity": Storage.setProtectedAudienceKAnonymityParameters;
     "SystemInfo.getInfo": SystemInfo.getInfoParameters;
     "SystemInfo.getFeatureState": SystemInfo.getFeatureStateParameters;
     "SystemInfo.getProcessInfo": SystemInfo.getProcessInfoParameters;
@@ -20562,6 +22123,7 @@ Error was thrown.
     "Target.autoAttachRelated": Target.autoAttachRelatedParameters;
     "Target.setDiscoverTargets": Target.setDiscoverTargetsParameters;
     "Target.setRemoteLocations": Target.setRemoteLocationsParameters;
+    "Target.openDevTools": Target.openDevToolsParameters;
     "Tethering.bind": Tethering.bindParameters;
     "Tethering.unbind": Tethering.unbindParameters;
     "Tracing.end": Tracing.endParameters;
@@ -20616,6 +22178,21 @@ Error was thrown.
     "PWA.launchFilesInApp": PWA.launchFilesInAppParameters;
     "PWA.openCurrentPageInApp": PWA.openCurrentPageInAppParameters;
     "PWA.changeAppUserSettings": PWA.changeAppUserSettingsParameters;
+    "BluetoothEmulation.enable": BluetoothEmulation.enableParameters;
+    "BluetoothEmulation.setSimulatedCentralState": BluetoothEmulation.setSimulatedCentralStateParameters;
+    "BluetoothEmulation.disable": BluetoothEmulation.disableParameters;
+    "BluetoothEmulation.simulatePreconnectedPeripheral": BluetoothEmulation.simulatePreconnectedPeripheralParameters;
+    "BluetoothEmulation.simulateAdvertisement": BluetoothEmulation.simulateAdvertisementParameters;
+    "BluetoothEmulation.simulateGATTOperationResponse": BluetoothEmulation.simulateGATTOperationResponseParameters;
+    "BluetoothEmulation.simulateCharacteristicOperationResponse": BluetoothEmulation.simulateCharacteristicOperationResponseParameters;
+    "BluetoothEmulation.simulateDescriptorOperationResponse": BluetoothEmulation.simulateDescriptorOperationResponseParameters;
+    "BluetoothEmulation.addService": BluetoothEmulation.addServiceParameters;
+    "BluetoothEmulation.removeService": BluetoothEmulation.removeServiceParameters;
+    "BluetoothEmulation.addCharacteristic": BluetoothEmulation.addCharacteristicParameters;
+    "BluetoothEmulation.removeCharacteristic": BluetoothEmulation.removeCharacteristicParameters;
+    "BluetoothEmulation.addDescriptor": BluetoothEmulation.addDescriptorParameters;
+    "BluetoothEmulation.removeDescriptor": BluetoothEmulation.removeDescriptorParameters;
+    "BluetoothEmulation.simulateGATTDisconnection": BluetoothEmulation.simulateGATTDisconnectionParameters;
     "Console.clearMessages": Console.clearMessagesParameters;
     "Console.disable": Console.disableParameters;
     "Console.enable": Console.enableParameters;
@@ -20636,6 +22213,7 @@ Error was thrown.
     "Debugger.resume": Debugger.resumeParameters;
     "Debugger.searchInContent": Debugger.searchInContentParameters;
     "Debugger.setAsyncCallStackDepth": Debugger.setAsyncCallStackDepthParameters;
+    "Debugger.setBlackboxExecutionContexts": Debugger.setBlackboxExecutionContextsParameters;
     "Debugger.setBlackboxPatterns": Debugger.setBlackboxPatternsParameters;
     "Debugger.setBlackboxedRanges": Debugger.setBlackboxedRangesParameters;
     "Debugger.setBreakpoint": Debugger.setBreakpointParameters;
@@ -20722,6 +22300,11 @@ Error was thrown.
     "Audits.checkContrast": Audits.checkContrastReturnValue;
     "Audits.checkFormsIssues": Audits.checkFormsIssuesReturnValue;
     "Extensions.loadUnpacked": Extensions.loadUnpackedReturnValue;
+    "Extensions.uninstall": Extensions.uninstallReturnValue;
+    "Extensions.getStorageItems": Extensions.getStorageItemsReturnValue;
+    "Extensions.removeStorageItems": Extensions.removeStorageItemsReturnValue;
+    "Extensions.clearStorageItems": Extensions.clearStorageItemsReturnValue;
+    "Extensions.setStorageItems": Extensions.setStorageItemsReturnValue;
     "Autofill.trigger": Autofill.triggerReturnValue;
     "Autofill.setAddresses": Autofill.setAddressesReturnValue;
     "Autofill.disable": Autofill.disableReturnValue;
@@ -20745,24 +22328,32 @@ Error was thrown.
     "Browser.getWindowBounds": Browser.getWindowBoundsReturnValue;
     "Browser.getWindowForTarget": Browser.getWindowForTargetReturnValue;
     "Browser.setWindowBounds": Browser.setWindowBoundsReturnValue;
+    "Browser.setContentsSize": Browser.setContentsSizeReturnValue;
     "Browser.setDockTile": Browser.setDockTileReturnValue;
     "Browser.executeBrowserCommand": Browser.executeBrowserCommandReturnValue;
     "Browser.addPrivacySandboxEnrollmentOverride": Browser.addPrivacySandboxEnrollmentOverrideReturnValue;
+    "Browser.addPrivacySandboxCoordinatorKeyConfig": Browser.addPrivacySandboxCoordinatorKeyConfigReturnValue;
     "CSS.addRule": CSS.addRuleReturnValue;
     "CSS.collectClassNames": CSS.collectClassNamesReturnValue;
     "CSS.createStyleSheet": CSS.createStyleSheetReturnValue;
     "CSS.disable": CSS.disableReturnValue;
     "CSS.enable": CSS.enableReturnValue;
     "CSS.forcePseudoState": CSS.forcePseudoStateReturnValue;
+    "CSS.forceStartingStyle": CSS.forceStartingStyleReturnValue;
     "CSS.getBackgroundColors": CSS.getBackgroundColorsReturnValue;
     "CSS.getComputedStyleForNode": CSS.getComputedStyleForNodeReturnValue;
+    "CSS.resolveValues": CSS.resolveValuesReturnValue;
+    "CSS.getLonghandProperties": CSS.getLonghandPropertiesReturnValue;
     "CSS.getInlineStylesForNode": CSS.getInlineStylesForNodeReturnValue;
+    "CSS.getAnimatedStylesForNode": CSS.getAnimatedStylesForNodeReturnValue;
     "CSS.getMatchedStylesForNode": CSS.getMatchedStylesForNodeReturnValue;
+    "CSS.getEnvironmentVariables": CSS.getEnvironmentVariablesReturnValue;
     "CSS.getMediaQueries": CSS.getMediaQueriesReturnValue;
     "CSS.getPlatformFontsForNode": CSS.getPlatformFontsForNodeReturnValue;
     "CSS.getStyleSheetText": CSS.getStyleSheetTextReturnValue;
     "CSS.getLayersForNode": CSS.getLayersForNodeReturnValue;
     "CSS.getLocationForSelector": CSS.getLocationForSelectorReturnValue;
+    "CSS.trackComputedStyleUpdatesForNode": CSS.trackComputedStyleUpdatesForNodeReturnValue;
     "CSS.trackComputedStyleUpdates": CSS.trackComputedStyleUpdatesReturnValue;
     "CSS.takeComputedStyleUpdates": CSS.takeComputedStyleUpdatesReturnValue;
     "CSS.setEffectivePropertyValueForNode": CSS.setEffectivePropertyValueForNodeReturnValue;
@@ -20832,6 +22423,7 @@ Error was thrown.
     "DOM.setNodeStackTracesEnabled": DOM.setNodeStackTracesEnabledReturnValue;
     "DOM.getNodeStackTraces": DOM.getNodeStackTracesReturnValue;
     "DOM.getFileInfo": DOM.getFileInfoReturnValue;
+    "DOM.getDetachedDomNodes": DOM.getDetachedDomNodesReturnValue;
     "DOM.setInspectedNode": DOM.setInspectedNodeReturnValue;
     "DOM.setNodeName": DOM.setNodeNameReturnValue;
     "DOM.setNodeValue": DOM.setNodeValueReturnValue;
@@ -20841,6 +22433,7 @@ Error was thrown.
     "DOM.getContainerForNode": DOM.getContainerForNodeReturnValue;
     "DOM.getQueryingDescendantsForContainer": DOM.getQueryingDescendantsForContainerReturnValue;
     "DOM.getAnchorElement": DOM.getAnchorElementReturnValue;
+    "DOM.forceShowPopover": DOM.forceShowPopoverReturnValue;
     "DOMDebugger.getEventListeners": DOMDebugger.getEventListenersReturnValue;
     "DOMDebugger.removeDOMBreakpoint": DOMDebugger.removeDOMBreakpointReturnValue;
     "DOMDebugger.removeEventListenerBreakpoint": DOMDebugger.removeEventListenerBreakpointReturnValue;
@@ -20864,10 +22457,6 @@ Error was thrown.
     "DOMStorage.getDOMStorageItems": DOMStorage.getDOMStorageItemsReturnValue;
     "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemReturnValue;
     "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemReturnValue;
-    "Database.disable": Database.disableReturnValue;
-    "Database.enable": Database.enableReturnValue;
-    "Database.executeSQL": Database.executeSQLReturnValue;
-    "Database.getDatabaseTableNames": Database.getDatabaseTableNamesReturnValue;
     "DeviceOrientation.clearDeviceOrientationOverride": DeviceOrientation.clearDeviceOrientationOverrideReturnValue;
     "DeviceOrientation.setDeviceOrientationOverride": DeviceOrientation.setDeviceOrientationOverrideReturnValue;
     "Emulation.canEmulate": Emulation.canEmulateReturnValue;
@@ -20878,20 +22467,25 @@ Error was thrown.
     "Emulation.setAutoDarkModeOverride": Emulation.setAutoDarkModeOverrideReturnValue;
     "Emulation.setCPUThrottlingRate": Emulation.setCPUThrottlingRateReturnValue;
     "Emulation.setDefaultBackgroundColorOverride": Emulation.setDefaultBackgroundColorOverrideReturnValue;
+    "Emulation.setSafeAreaInsetsOverride": Emulation.setSafeAreaInsetsOverrideReturnValue;
     "Emulation.setDeviceMetricsOverride": Emulation.setDeviceMetricsOverrideReturnValue;
     "Emulation.setDevicePostureOverride": Emulation.setDevicePostureOverrideReturnValue;
     "Emulation.clearDevicePostureOverride": Emulation.clearDevicePostureOverrideReturnValue;
+    "Emulation.setDisplayFeaturesOverride": Emulation.setDisplayFeaturesOverrideReturnValue;
+    "Emulation.clearDisplayFeaturesOverride": Emulation.clearDisplayFeaturesOverrideReturnValue;
     "Emulation.setScrollbarsHidden": Emulation.setScrollbarsHiddenReturnValue;
     "Emulation.setDocumentCookieDisabled": Emulation.setDocumentCookieDisabledReturnValue;
     "Emulation.setEmitTouchEventsForMouse": Emulation.setEmitTouchEventsForMouseReturnValue;
     "Emulation.setEmulatedMedia": Emulation.setEmulatedMediaReturnValue;
     "Emulation.setEmulatedVisionDeficiency": Emulation.setEmulatedVisionDeficiencyReturnValue;
+    "Emulation.setEmulatedOSTextScale": Emulation.setEmulatedOSTextScaleReturnValue;
     "Emulation.setGeolocationOverride": Emulation.setGeolocationOverrideReturnValue;
     "Emulation.getOverriddenSensorInformation": Emulation.getOverriddenSensorInformationReturnValue;
     "Emulation.setSensorOverrideEnabled": Emulation.setSensorOverrideEnabledReturnValue;
     "Emulation.setSensorOverrideReadings": Emulation.setSensorOverrideReadingsReturnValue;
     "Emulation.setPressureSourceOverrideEnabled": Emulation.setPressureSourceOverrideEnabledReturnValue;
     "Emulation.setPressureStateOverride": Emulation.setPressureStateOverrideReturnValue;
+    "Emulation.setPressureDataOverride": Emulation.setPressureDataOverrideReturnValue;
     "Emulation.setIdleOverride": Emulation.setIdleOverrideReturnValue;
     "Emulation.clearIdleOverride": Emulation.clearIdleOverrideReturnValue;
     "Emulation.setNavigatorOverrides": Emulation.setNavigatorOverridesReturnValue;
@@ -20903,9 +22497,11 @@ Error was thrown.
     "Emulation.setTimezoneOverride": Emulation.setTimezoneOverrideReturnValue;
     "Emulation.setVisibleSize": Emulation.setVisibleSizeReturnValue;
     "Emulation.setDisabledImageTypes": Emulation.setDisabledImageTypesReturnValue;
+    "Emulation.setDataSaverOverride": Emulation.setDataSaverOverrideReturnValue;
     "Emulation.setHardwareConcurrencyOverride": Emulation.setHardwareConcurrencyOverrideReturnValue;
     "Emulation.setUserAgentOverride": Emulation.setUserAgentOverrideReturnValue;
     "Emulation.setAutomationOverride": Emulation.setAutomationOverrideReturnValue;
+    "Emulation.setSmallViewportHeightDifferenceOverride": Emulation.setSmallViewportHeightDifferenceOverrideReturnValue;
     "HeadlessExperimental.beginFrame": HeadlessExperimental.beginFrameReturnValue;
     "HeadlessExperimental.disable": HeadlessExperimental.disableReturnValue;
     "HeadlessExperimental.enable": HeadlessExperimental.enableReturnValue;
@@ -20952,6 +22548,7 @@ Error was thrown.
     "Log.startViolationsReport": Log.startViolationsReportReturnValue;
     "Log.stopViolationsReport": Log.stopViolationsReportReturnValue;
     "Memory.getDOMCounters": Memory.getDOMCountersReturnValue;
+    "Memory.getDOMCountersForLeakDetection": Memory.getDOMCountersForLeakDetectionReturnValue;
     "Memory.prepareForLeakDetection": Memory.prepareForLeakDetectionReturnValue;
     "Memory.forciblyPurgeJavaScriptMemory": Memory.forciblyPurgeJavaScriptMemoryReturnValue;
     "Memory.setPressureNotificationsSuppressed": Memory.setPressureNotificationsSuppressedReturnValue;
@@ -20995,6 +22592,7 @@ Error was thrown.
     "Network.getSecurityIsolationStatus": Network.getSecurityIsolationStatusReturnValue;
     "Network.enableReportingApi": Network.enableReportingApiReturnValue;
     "Network.loadNetworkResource": Network.loadNetworkResourceReturnValue;
+    "Network.setCookieControls": Network.setCookieControlsReturnValue;
     "Overlay.disable": Overlay.disableReturnValue;
     "Overlay.enable": Overlay.enableReturnValue;
     "Overlay.getHighlightObjectForTest": Overlay.getHighlightObjectForTestReturnValue;
@@ -21040,7 +22638,7 @@ Error was thrown.
     "Page.getInstallabilityErrors": Page.getInstallabilityErrorsReturnValue;
     "Page.getManifestIcons": Page.getManifestIconsReturnValue;
     "Page.getAppId": Page.getAppIdReturnValue;
-    "Page.getAdScriptId": Page.getAdScriptIdReturnValue;
+    "Page.getAdScriptAncestry": Page.getAdScriptAncestryReturnValue;
     "Page.getFrameTree": Page.getFrameTreeReturnValue;
     "Page.getLayoutMetrics": Page.getLayoutMetricsReturnValue;
     "Page.getNavigationHistory": Page.getNavigationHistoryReturnValue;
@@ -21099,7 +22697,6 @@ Error was thrown.
     "ServiceWorker.dispatchSyncEvent": ServiceWorker.dispatchSyncEventReturnValue;
     "ServiceWorker.dispatchPeriodicSyncEvent": ServiceWorker.dispatchPeriodicSyncEventReturnValue;
     "ServiceWorker.enable": ServiceWorker.enableReturnValue;
-    "ServiceWorker.inspectWorker": ServiceWorker.inspectWorkerReturnValue;
     "ServiceWorker.setForceUpdateOnPageLoad": ServiceWorker.setForceUpdateOnPageLoadReturnValue;
     "ServiceWorker.skipWaiting": ServiceWorker.skipWaitingReturnValue;
     "ServiceWorker.startWorker": ServiceWorker.startWorkerReturnValue;
@@ -21142,6 +22739,8 @@ Error was thrown.
     "Storage.setAttributionReportingTracking": Storage.setAttributionReportingTrackingReturnValue;
     "Storage.sendPendingAttributionReports": Storage.sendPendingAttributionReportsReturnValue;
     "Storage.getRelatedWebsiteSets": Storage.getRelatedWebsiteSetsReturnValue;
+    "Storage.getAffectedUrlsForThirdPartyCookieMetadata": Storage.getAffectedUrlsForThirdPartyCookieMetadataReturnValue;
+    "Storage.setProtectedAudienceKAnonymity": Storage.setProtectedAudienceKAnonymityReturnValue;
     "SystemInfo.getInfo": SystemInfo.getInfoReturnValue;
     "SystemInfo.getFeatureState": SystemInfo.getFeatureStateReturnValue;
     "SystemInfo.getProcessInfo": SystemInfo.getProcessInfoReturnValue;
@@ -21162,6 +22761,7 @@ Error was thrown.
     "Target.autoAttachRelated": Target.autoAttachRelatedReturnValue;
     "Target.setDiscoverTargets": Target.setDiscoverTargetsReturnValue;
     "Target.setRemoteLocations": Target.setRemoteLocationsReturnValue;
+    "Target.openDevTools": Target.openDevToolsReturnValue;
     "Tethering.bind": Tethering.bindReturnValue;
     "Tethering.unbind": Tethering.unbindReturnValue;
     "Tracing.end": Tracing.endReturnValue;
@@ -21216,6 +22816,21 @@ Error was thrown.
     "PWA.launchFilesInApp": PWA.launchFilesInAppReturnValue;
     "PWA.openCurrentPageInApp": PWA.openCurrentPageInAppReturnValue;
     "PWA.changeAppUserSettings": PWA.changeAppUserSettingsReturnValue;
+    "BluetoothEmulation.enable": BluetoothEmulation.enableReturnValue;
+    "BluetoothEmulation.setSimulatedCentralState": BluetoothEmulation.setSimulatedCentralStateReturnValue;
+    "BluetoothEmulation.disable": BluetoothEmulation.disableReturnValue;
+    "BluetoothEmulation.simulatePreconnectedPeripheral": BluetoothEmulation.simulatePreconnectedPeripheralReturnValue;
+    "BluetoothEmulation.simulateAdvertisement": BluetoothEmulation.simulateAdvertisementReturnValue;
+    "BluetoothEmulation.simulateGATTOperationResponse": BluetoothEmulation.simulateGATTOperationResponseReturnValue;
+    "BluetoothEmulation.simulateCharacteristicOperationResponse": BluetoothEmulation.simulateCharacteristicOperationResponseReturnValue;
+    "BluetoothEmulation.simulateDescriptorOperationResponse": BluetoothEmulation.simulateDescriptorOperationResponseReturnValue;
+    "BluetoothEmulation.addService": BluetoothEmulation.addServiceReturnValue;
+    "BluetoothEmulation.removeService": BluetoothEmulation.removeServiceReturnValue;
+    "BluetoothEmulation.addCharacteristic": BluetoothEmulation.addCharacteristicReturnValue;
+    "BluetoothEmulation.removeCharacteristic": BluetoothEmulation.removeCharacteristicReturnValue;
+    "BluetoothEmulation.addDescriptor": BluetoothEmulation.addDescriptorReturnValue;
+    "BluetoothEmulation.removeDescriptor": BluetoothEmulation.removeDescriptorReturnValue;
+    "BluetoothEmulation.simulateGATTDisconnection": BluetoothEmulation.simulateGATTDisconnectionReturnValue;
     "Console.clearMessages": Console.clearMessagesReturnValue;
     "Console.disable": Console.disableReturnValue;
     "Console.enable": Console.enableReturnValue;
@@ -21236,6 +22851,7 @@ Error was thrown.
     "Debugger.resume": Debugger.resumeReturnValue;
     "Debugger.searchInContent": Debugger.searchInContentReturnValue;
     "Debugger.setAsyncCallStackDepth": Debugger.setAsyncCallStackDepthReturnValue;
+    "Debugger.setBlackboxExecutionContexts": Debugger.setBlackboxExecutionContextsReturnValue;
     "Debugger.setBlackboxPatterns": Debugger.setBlackboxPatternsReturnValue;
     "Debugger.setBlackboxedRanges": Debugger.setBlackboxedRangesReturnValue;
     "Debugger.setBreakpoint": Debugger.setBreakpointReturnValue;
diff --git a/packages/playwright-core/src/server/chromium/videoRecorder.ts b/packages/playwright-core/src/server/chromium/videoRecorder.ts
index bfb377e79bee1..0e4c25d8d94be 100644
--- a/packages/playwright-core/src/server/chromium/videoRecorder.ts
+++ b/packages/playwright-core/src/server/chromium/videoRecorder.ts
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-import type { ChildProcess } from 'child_process';
-import { assert, monotonicTime } from '../../utils';
+import { assert, debugLogger, monotonicTime } from '../../utils';
 import { Page } from '../page';
-import { launchProcess } from '../../utils/processLauncher';
-import type { Progress } from '../progress';
-import { ProgressController } from '../progress';
-import { serverSideCallMetadata } from '../instrumentation';
+import { launchProcess } from '../utils/processLauncher';
+
 import type * as types from '../types';
+import type { ChildProcess } from 'child_process';
 
 const fps = 25;
 
@@ -32,7 +30,6 @@ export class VideoRecorder {
   private _lastFrameTimestamp: number = 0;
   private _lastFrameBuffer: Buffer | null = null;
   private _lastWriteTimestamp: number = 0;
-  private readonly _progress: Progress;
   private _frameQueue: Buffer[] = [];
   private _isStopped = false;
   private _ffmpegPath: string;
@@ -41,19 +38,14 @@ export class VideoRecorder {
     if (!options.outputFile.endsWith('.webm'))
       throw new Error('File must have .webm extension');
 
-    const controller = new ProgressController(serverSideCallMetadata(), page);
-    controller.setLogName('browser');
-    return await controller.run(async progress => {
-      const recorder = new VideoRecorder(page, ffmpegPath, progress);
-      await recorder._launch(options);
-      return recorder;
-    });
+    const recorder = new VideoRecorder(page, ffmpegPath);
+    await recorder._launch(options);
+    return recorder;
   }
 
-  private constructor(page: Page, ffmpegPath: string, progress: Progress) {
-    this._progress = progress;
+  private constructor(page: Page, ffmpegPath: string) {
     this._ffmpegPath = ffmpegPath;
-    page.on(Page.Events.ScreencastFrame, frame => this.writeFrame(frame.buffer, frame.timestamp));
+    page.on(Page.Events.ScreencastFrame, frame => this.writeFrame(frame.buffer, frame.frameSwapWallTime / 1000));
   }
 
   private async _launch(options: types.PageScreencastOptions) {
@@ -98,29 +90,28 @@ export class VideoRecorder {
 
     const w = options.width;
     const h = options.height;
-    const args = `-loglevel error -f image2pipe -avioflags direct -fpsprobesize 0 -probesize 32 -analyzeduration 0 -c:v mjpeg -i - -y -an -r ${fps} -c:v vp8 -qmin 0 -qmax 50 -crf 8 -deadline realtime -speed 8 -b:v 1M -threads 1 -vf pad=${w}:${h}:0:0:gray,crop=${w}:${h}:0:0`.split(' ');
+    const args = `-loglevel error -f image2pipe -avioflags direct -fpsprobesize 0 -probesize 32 -analyzeduration 0 -c:v mjpeg -i pipe:0 -y -an -r ${fps} -c:v vp8 -qmin 0 -qmax 50 -crf 8 -deadline realtime -speed 8 -b:v 1M -threads 1 -vf pad=${w}:${h}:0:0:gray,crop=${w}:${h}:0:0`.split(' ');
     args.push(options.outputFile);
-    const progress = this._progress;
 
     const { launchedProcess, gracefullyClose } = await launchProcess({
       command: this._ffmpegPath,
       args,
       stdio: 'stdin',
-      log: (message: string) => progress.log(message),
+      log: (message: string) => debugLogger.log('browser', message),
       tempDirectories: [],
       attemptToGracefullyClose: async () => {
-        progress.log('Closing stdin...');
+        debugLogger.log('browser', 'Closing stdin...');
         launchedProcess.stdin!.end();
       },
       onExit: (exitCode, signal) => {
-        progress.log(`ffmpeg onkill exitCode=${exitCode} signal=${signal}`);
+        debugLogger.log('browser', `ffmpeg onkill exitCode=${exitCode} signal=${signal}`);
       },
     });
     launchedProcess.stdin!.on('finish', () => {
-      progress.log('ffmpeg finished input.');
+      debugLogger.log('browser', 'ffmpeg finished input.');
     });
     launchedProcess.stdin!.on('error', () => {
-      progress.log('ffmpeg error.');
+      debugLogger.log('browser', 'ffmpeg error.');
     });
     this._process = launchedProcess;
     this._gracefullyClose = gracefullyClose;
@@ -152,7 +143,7 @@ export class VideoRecorder {
   private async _sendFrame(frame: Buffer) {
     return new Promise(f => this._process!.stdin!.write(frame, f)).then(error => {
       if (error)
-        this._progress.log(`ffmpeg failed to write: ${String(error)}`);
+        debugLogger.log('browser', `ffmpeg failed to write: ${String(error)}`);
     });
   }
 
diff --git a/packages/playwright-core/src/server/clock.ts b/packages/playwright-core/src/server/clock.ts
index e77399c4fe11f..59964b2807275 100644
--- a/packages/playwright-core/src/server/clock.ts
+++ b/packages/playwright-core/src/server/clock.ts
@@ -14,80 +14,95 @@
  * limitations under the License.
  */
 
+import * as rawClockSource from '../generated/clockSource';
+
 import type { BrowserContext } from './browserContext';
-import * as clockSource from '../generated/clockSource';
+import type { InitScript } from './page';
+import type { Progress } from '@protocol/progress';
 
 export class Clock {
   private _browserContext: BrowserContext;
-  private _scriptInstalled = false;
+  private _initScripts: InitScript[] = [];
 
   constructor(browserContext: BrowserContext) {
     this._browserContext = browserContext;
   }
 
-  markAsUninstalled() {
-    this._scriptInstalled = false;
+  async uninstall(progress: Progress) {
+    await progress.race(this._browserContext.removeInitScripts(this._initScripts));
+    this._initScripts = [];
   }
 
-  async fastForward(ticks: number | string) {
-    await this._installIfNeeded();
+  async fastForward(progress: Progress, ticks: number | string) {
+    await this._installIfNeeded(progress);
     const ticksMillis = parseTicks(ticks);
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('fastForward', ${Date.now()}, ${ticksMillis})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.fastForward(${ticksMillis})`);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('fastForward', ${Date.now()}, ${ticksMillis})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.fastForward(${ticksMillis})`));
   }
 
-  async install(time: number | string | undefined) {
-    await this._installIfNeeded();
+  async install(progress: Progress, time: number | string | undefined) {
+    await this._installIfNeeded(progress);
     const timeMillis = time !== undefined ? parseTime(time) : Date.now();
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('install', ${Date.now()}, ${timeMillis})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.install(${timeMillis})`);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('install', ${Date.now()}, ${timeMillis})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.install(${timeMillis})`));
   }
 
-  async pauseAt(ticks: number | string) {
-    await this._installIfNeeded();
+  async pauseAt(progress: Progress, ticks: number | string) {
+    await this._installIfNeeded(progress);
     const timeMillis = parseTime(ticks);
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('pauseAt', ${Date.now()}, ${timeMillis})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.pauseAt(${timeMillis})`);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('pauseAt', ${Date.now()}, ${timeMillis})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.pauseAt(${timeMillis})`));
+  }
+
+  resumeNoReply() {
+    if (!this._initScripts.length)
+      return;
+    const doResume = async () => {
+      this._initScripts.push(await this._browserContext.addInitScript(undefined, `globalThis.__pwClock.controller.log('resume', ${Date.now()})`));
+      await this._evaluateInFrames(`globalThis.__pwClock.controller.resume()`);
+    };
+    doResume().catch(() => {});
   }
 
-  async resume() {
-    await this._installIfNeeded();
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('resume', ${Date.now()})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.resume()`);
+  async resume(progress: Progress) {
+    await this._installIfNeeded(progress);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('resume', ${Date.now()})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.resume()`));
   }
 
-  async setFixedTime(time: string | number) {
-    await this._installIfNeeded();
+  async setFixedTime(progress: Progress, time: string | number) {
+    await this._installIfNeeded(progress);
     const timeMillis = parseTime(time);
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('setFixedTime', ${Date.now()}, ${timeMillis})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.setFixedTime(${timeMillis})`);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('setFixedTime', ${Date.now()}, ${timeMillis})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.setFixedTime(${timeMillis})`));
   }
 
-  async setSystemTime(time: string | number) {
-    await this._installIfNeeded();
+  async setSystemTime(progress: Progress, time: string | number) {
+    await this._installIfNeeded(progress);
     const timeMillis = parseTime(time);
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('setSystemTime', ${Date.now()}, ${timeMillis})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.setSystemTime(${timeMillis})`);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('setSystemTime', ${Date.now()}, ${timeMillis})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.setSystemTime(${timeMillis})`));
   }
 
-  async runFor(ticks: number | string) {
-    await this._installIfNeeded();
+  async runFor(progress: Progress, ticks: number | string) {
+    await this._installIfNeeded(progress);
     const ticksMillis = parseTicks(ticks);
-    await this._browserContext.addInitScript(`globalThis.__pwClock.controller.log('runFor', ${Date.now()}, ${ticksMillis})`);
-    await this._evaluateInFrames(`globalThis.__pwClock.controller.runFor(${ticksMillis})`);
+    this._initScripts.push(await this._browserContext.addInitScript(progress, `globalThis.__pwClock.controller.log('runFor', ${Date.now()}, ${ticksMillis})`));
+    await progress.race(this._evaluateInFrames(`globalThis.__pwClock.controller.runFor(${ticksMillis})`));
   }
 
-  private async _installIfNeeded() {
-    if (this._scriptInstalled)
+  private async _installIfNeeded(progress: Progress) {
+    if (this._initScripts.length)
       return;
-    this._scriptInstalled = true;
     const script = `(() => {
       const module = {};
-      ${clockSource.source}
-      globalThis.__pwClock = (module.exports.inject())(globalThis);
+      ${rawClockSource.source}
+      if (!globalThis.__pwClock)
+        globalThis.__pwClock = (module.exports.inject())(globalThis);
     })();`;
-    await this._browserContext.addInitScript(script);
-    await this._evaluateInFrames(script);
+    const initScript = await this._browserContext.addInitScript(progress, script);
+    await progress.race(this._evaluateInFrames(script));
+    this._initScripts.push(initScript);
   }
 
   private async _evaluateInFrames(script: string) {
diff --git a/packages/playwright-core/src/server/codegen/DEPS.list b/packages/playwright-core/src/server/codegen/DEPS.list
new file mode 100644
index 0000000000000..58432390fd9d2
--- /dev/null
+++ b/packages/playwright-core/src/server/codegen/DEPS.list
@@ -0,0 +1,3 @@
+[*]
+../../utils/
+../deviceDescriptors.ts
diff --git a/packages/playwright-core/src/server/recorder/csharp.ts b/packages/playwright-core/src/server/codegen/csharp.ts
similarity index 80%
rename from packages/playwright-core/src/server/recorder/csharp.ts
rename to packages/playwright-core/src/server/codegen/csharp.ts
index 461b33e9445b7..dc6745f73b211 100644
--- a/packages/playwright-core/src/server/recorder/csharp.ts
+++ b/packages/playwright-core/src/server/codegen/csharp.ts
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-import type { BrowserContextOptions } from '../../..';
-import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './language';
-import { sanitizeDeviceOptions, toSignalMap } from './language';
-import type { ActionInContext } from './codeGenerator';
-import type { Action } from './recorderActions';
-import type { MouseClickOptions } from './utils';
-import { toModifiers } from './utils';
-import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
+import { sanitizeDeviceOptions, toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
+import { asLocator, escapeWithQuotes } from '../../utils';
 import { deviceDescriptors } from '../deviceDescriptors';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
+
+import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
+import type { BrowserContextOptions } from '../../../types/types';
+import type * as actions from '@recorder/actions';
 
 type CSharpLanguageMode = 'library' | 'mstest' | 'nunit';
 
@@ -50,20 +47,18 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
     this._mode = mode;
   }
 
-  generateAction(actionInContext: ActionInContext): string {
+  generateAction(actionInContext: actions.ActionInContext): string {
     const action = this._generateActionInner(actionInContext);
     if (action)
       return action;
     return '';
   }
 
-  _generateActionInner(actionInContext: ActionInContext): string {
+  _generateActionInner(actionInContext: actions.ActionInContext): string {
     const action = actionInContext.action;
     if (this._mode !== 'library' && (action.name === 'openPage' || action.name === 'closePage'))
       return '';
-    let pageAlias = actionInContext.frame.pageAlias;
-    if (this._mode !== 'library')
-      pageAlias = pageAlias.replace('page', 'Page');
+    const  pageAlias = this._formatPageAlias(actionInContext.frame.pageAlias);
     const formatter = new CSharpFormatter(this._mode === 'library' ? 0 : 8);
 
     if (action.name === 'openPage') {
@@ -73,14 +68,8 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
       return formatter.format();
     }
 
-    let subject: string;
-    if (actionInContext.frame.isMainFrame) {
-      subject = pageAlias;
-    } else {
-      const locators = actionInContext.frame.selectorsChain.map(selector => `.FrameLocator(${quote(selector)})`);
-      subject = `${pageAlias}${locators.join('')}`;
-    }
-
+    const locators = actionInContext.frame.framePath.map(selector => `.${this._asLocator(selector)}.ContentFrame`);
+    const subject = `${pageAlias}${locators.join('')}`;
     const signals = toSignalMap(action);
 
     if (signals.dialog) {
@@ -94,7 +83,7 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
     }
 
     const lines: string[] = [];
-    lines.push(this._generateActionCall(subject, action));
+    lines.push(this._generateActionCall(subject, actionInContext));
 
     if (signals.download) {
       lines.unshift(`var download${signals.download.downloadAlias} = await ${pageAlias}.RunAndWaitForDownloadAsync(async () =>\n{`);
@@ -102,7 +91,7 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
     }
 
     if (signals.popup) {
-      lines.unshift(`var ${signals.popup.popupAlias} = await ${pageAlias}.RunAndWaitForPopupAsync(async () =>\n{`);
+      lines.unshift(`var ${this._formatPageAlias(signals.popup.popupAlias)} = await ${pageAlias}.RunAndWaitForPopupAsync(async () =>\n{`);
       lines.push(`});`);
     }
 
@@ -112,7 +101,19 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
     return formatter.format();
   }
 
-  private _generateActionCall(subject: string, action: Action): string {
+  private _formatPageAlias(pageAlias: string): string {
+    if (this._mode === 'library')
+      return pageAlias;
+
+    if (pageAlias === 'page')
+      return 'Page'; // first page is class member
+
+    // other pages are local variables
+    return pageAlias;
+  }
+
+  private _generateActionCall(subject: string, actionInContext: actions.ActionInContext): string {
+    const action = actionInContext.action;
     switch (action.name) {
       case 'openPage':
         throw Error('Not reached');
@@ -122,16 +123,7 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
         let method = 'Click';
         if (action.clickCount === 2)
           method = 'DblClick';
-        const modifiers = toModifiers(action.modifiers);
-        const options: MouseClickOptions = {};
-        if (action.button !== 'left')
-          options.button = action.button;
-        if (modifiers.length)
-          options.modifiers = modifiers;
-        if (action.clickCount > 2)
-          options.clickCount = action.clickCount;
-        if (action.position)
-          options.position = action.position;
+        const options = toClickOptionsForSourceCode(action);
         if (!Object.entries(options).length)
           return `await ${subject}.${this._asLocator(action.selector)}.${method}Async();`;
         const optionsString = formatObject(options, '    ', 'Locator' + method + 'Options');
@@ -146,7 +138,7 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
       case 'setInputFiles':
         return `await ${subject}.${this._asLocator(action.selector)}.SetInputFilesAsync(${formatObject(action.files)});`;
       case 'press': {
-        const modifiers = toModifiers(action.modifiers);
+        const modifiers = toKeyboardModifiers(action.modifiers);
         const shortcut = [...modifiers, action.key].join('+');
         return `await ${subject}.${this._asLocator(action.selector)}.PressAsync(${quote(shortcut)});`;
       }
@@ -164,6 +156,8 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
         const assertion = action.value ? `ToHaveValueAsync(${quote(action.value)})` : `ToBeEmptyAsync()`;
         return `await Expect(${subject}.${this._asLocator(action.selector)}).${assertion};`;
       }
+      case 'assertSnapshot':
+        return `await Expect(${subject}.${this._asLocator(action.selector)}).ToMatchAriaSnapshotAsync(${quote(action.ariaSnapshot)});`;
     }
   }
 
@@ -187,6 +181,10 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
       using var playwright = await Playwright.CreateAsync();
       await using var browser = await playwright.${toPascal(options.browserName)}.LaunchAsync(${formatObject(options.launchOptions, '    ', 'BrowserTypeLaunchOptions')});
       var context = await browser.NewContextAsync(${formatContextOptions(options.contextOptions, options.deviceName)});`);
+    if (options.contextOptions.recordHar) {
+      const url = options.contextOptions.recordHar.urlFilter;
+      formatter.add(`      await context.RouteFromHARAsync(${quote(options.contextOptions.recordHar.path)}${url ? `, ${formatObject({ url }, '    ', 'BrowserContextRouteFromHAROptions')}` : ''});`);
+    }
     formatter.newLine();
     return formatter.format();
   }
@@ -212,6 +210,10 @@ export class CSharpLanguageGenerator implements LanguageGenerator {
     formatter.add(`    [${this._mode === 'nunit' ? 'Test' : 'TestMethod'}]
     public async Task MyTest()
     {`);
+    if (options.contextOptions.recordHar) {
+      const url = options.contextOptions.recordHar.urlFilter;
+      formatter.add(`    await Context.RouteFromHARAsync(${quote(options.contextOptions.recordHar.path)}${url ? `, ${formatObject({ url }, '    ', 'BrowserContextRouteFromHAROptions')}` : ''});`);
+    }
     return formatter.format();
   }
 
@@ -277,32 +279,22 @@ function toPascal(value: string): string {
   return value[0].toUpperCase() + value.slice(1);
 }
 
-function convertContextOptions(options: BrowserContextOptions): any {
-  const result: any = { ...options };
-  if (options.recordHar) {
-    result['recordHarPath'] = options.recordHar.path;
-    result['recordHarContent'] = options.recordHar.content;
-    result['recordHarMode'] = options.recordHar.mode;
-    result['recordHarOmitContent'] = options.recordHar.omitContent;
-    result['recordHarUrlFilter'] = options.recordHar.urlFilter;
-    delete result.recordHar;
-  }
-  return result;
-}
-
-function formatContextOptions(options: BrowserContextOptions, deviceName: string | undefined): string {
+function formatContextOptions(contextOptions: BrowserContextOptions, deviceName: string | undefined): string {
+  let options = { ...contextOptions };
+  // recordHAR is replaced with routeFromHAR in the generated code.
+  delete options.recordHar;
   const device = deviceName && deviceDescriptors[deviceName];
   if (!device) {
     if (!Object.entries(options).length)
       return '';
-    return formatObject(convertContextOptions(options), '    ', 'BrowserNewContextOptions');
+    return formatObject(options, '    ', 'BrowserNewContextOptions');
   }
 
   options = sanitizeDeviceOptions(device, options);
   if (!Object.entries(options).length)
     return `playwright.Devices[${quote(deviceName!)}]`;
 
-  return formatObject(convertContextOptions(options), '    ', `BrowserNewContextOptions(playwright.Devices[${quote(deviceName!)}])`);
+  return formatObject(options, '    ', `BrowserNewContextOptions(playwright.Devices[${quote(deviceName!)}])`);
 }
 
 class CSharpFormatter {
diff --git a/packages/playwright-core/src/server/recorder/java.ts b/packages/playwright-core/src/server/codegen/java.ts
similarity index 81%
rename from packages/playwright-core/src/server/recorder/java.ts
rename to packages/playwright-core/src/server/codegen/java.ts
index f38b026a37171..19fefdd1db6d1 100644
--- a/packages/playwright-core/src/server/recorder/java.ts
+++ b/packages/playwright-core/src/server/codegen/java.ts
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-import type { BrowserContextOptions } from '../../..';
-import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './language';
-import { toSignalMap } from './language';
-import type { ActionInContext } from './codeGenerator';
-import type { Action } from './recorderActions';
-import type { MouseClickOptions } from './utils';
-import { toModifiers } from './utils';
+import { toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
 import { deviceDescriptors } from '../deviceDescriptors';
 import { JavaScriptFormatter } from './javascript';
-import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
+import { asLocator, escapeWithQuotes } from '../../utils';
+
+import type { BrowserContextOptions } from '../../../types/types';
+import type * as types from '../types';
+import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
+import type * as actions from '@recorder/actions';
 
 type JavaLanguageMode = 'library' | 'junit';
 
@@ -48,7 +46,7 @@ export class JavaLanguageGenerator implements LanguageGenerator {
     this._mode = mode;
   }
 
-  generateAction(actionInContext: ActionInContext): string {
+  generateAction(actionInContext: actions.ActionInContext): string {
     const action = actionInContext.action;
     const pageAlias = actionInContext.frame.pageAlias;
     const offset = this._mode === 'junit' ? 4 : 6;
@@ -64,16 +62,8 @@ export class JavaLanguageGenerator implements LanguageGenerator {
       return formatter.format();
     }
 
-    let subject: string;
-    let inFrameLocator = false;
-    if (actionInContext.frame.isMainFrame) {
-      subject = pageAlias;
-    } else {
-      const locators = actionInContext.frame.selectorsChain.map(selector => `.frameLocator(${quote(selector)})`);
-      subject = `${pageAlias}${locators.join('')}`;
-      inFrameLocator = true;
-    }
-
+    const locators = actionInContext.frame.framePath.map(selector => `.${this._asLocator(selector, false)}.contentFrame()`);
+    const subject = `${pageAlias}${locators.join('')}`;
     const signals = toSignalMap(action);
 
     if (signals.dialog) {
@@ -83,7 +73,7 @@ export class JavaLanguageGenerator implements LanguageGenerator {
       });`);
     }
 
-    let code = this._generateActionCall(subject, action, inFrameLocator);
+    let code = this._generateActionCall(subject, actionInContext, !!actionInContext.frame.framePath.length);
 
     if (signals.popup) {
       code = `Page ${signals.popup.popupAlias} = ${pageAlias}.waitForPopup(() -> {
@@ -102,7 +92,8 @@ export class JavaLanguageGenerator implements LanguageGenerator {
     return formatter.format();
   }
 
-  private _generateActionCall(subject: string, action: Action, inFrameLocator: boolean): string {
+  private _generateActionCall(subject: string, actionInContext: actions.ActionInContext, inFrameLocator: boolean): string {
+    const action = actionInContext.action;
     switch (action.name) {
       case 'openPage':
         throw Error('Not reached');
@@ -112,16 +103,7 @@ export class JavaLanguageGenerator implements LanguageGenerator {
         let method = 'click';
         if (action.clickCount === 2)
           method = 'dblclick';
-        const modifiers = toModifiers(action.modifiers);
-        const options: MouseClickOptions = {};
-        if (action.button !== 'left')
-          options.button = action.button;
-        if (modifiers.length)
-          options.modifiers = modifiers;
-        if (action.clickCount > 2)
-          options.clickCount = action.clickCount;
-        if (action.position)
-          options.position = action.position;
+        const options = toClickOptionsForSourceCode(action);
         const optionsText = formatClickOptions(options);
         return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.${method}(${optionsText});`;
       }
@@ -134,14 +116,14 @@ export class JavaLanguageGenerator implements LanguageGenerator {
       case 'setInputFiles':
         return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.setInputFiles(${formatPath(action.files.length === 1 ? action.files[0] : action.files)});`;
       case 'press': {
-        const modifiers = toModifiers(action.modifiers);
+        const modifiers = toKeyboardModifiers(action.modifiers);
         const shortcut = [...modifiers, action.key].join('+');
         return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.press(${quote(shortcut)});`;
       }
       case 'navigate':
         return `${subject}.navigate(${quote(action.url)});`;
       case 'select':
-        return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.selectOption(${formatSelectOption(action.options.length > 1 ? action.options : action.options[0])});`;
+        return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.selectOption(${formatSelectOption(action.options.length === 1 ? action.options[0] : action.options)});`;
       case 'assertText':
         return `assertThat(${subject}.${this._asLocator(action.selector, inFrameLocator)}).${action.substring ? 'containsText' : 'hasText'}(${quote(action.text)});`;
       case 'assertChecked':
@@ -152,6 +134,8 @@ export class JavaLanguageGenerator implements LanguageGenerator {
         const assertion = action.value ? `hasValue(${quote(action.value)})` : `isEmpty()`;
         return `assertThat(${subject}.${this._asLocator(action.selector, inFrameLocator)}).${assertion};`;
       }
+      case 'assertSnapshot':
+        return `assertThat(${subject}.${this._asLocator(action.selector, inFrameLocator)}).matchesAriaSnapshot(${quote(action.ariaSnapshot)});`;
     }
   }
 
@@ -167,26 +151,38 @@ export class JavaLanguageGenerator implements LanguageGenerator {
       import com.microsoft.playwright.Page;
       import com.microsoft.playwright.options.*;
 
-      import org.junit.jupiter.api.*;
+      ${options.contextOptions.recordHar ? `import java.nio.file.Paths;\n` : ''}import org.junit.jupiter.api.*;
       import static com.microsoft.playwright.assertions.PlaywrightAssertions.*;
 
       @UsePlaywright
       public class TestExample {
         @Test
         void test(Page page) {`);
+      if (options.contextOptions.recordHar) {
+        const url = options.contextOptions.recordHar.urlFilter;
+        const recordHarOptions = typeof url === 'string' ? `, new Page.RouteFromHAROptions()
+            .setUrl(${quote(url)})` : '';
+        formatter.add(`          page.routeFromHAR(Paths.get(${quote(options.contextOptions.recordHar.path)})${recordHarOptions});`);
+      }
       return formatter.format();
     }
     formatter.add(`
     import com.microsoft.playwright.*;
     import com.microsoft.playwright.options.*;
     import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
-    import java.util.*;
+    ${options.contextOptions.recordHar ? `import java.nio.file.Paths;\n` : ''}import java.util.*;
 
     public class Example {
       public static void main(String[] args) {
         try (Playwright playwright = Playwright.create()) {
           Browser browser = playwright.${options.browserName}().launch(${formatLaunchOptions(options.launchOptions)});
           BrowserContext context = browser.newContext(${formatContextOptions(options.contextOptions, options.deviceName)});`);
+    if (options.contextOptions.recordHar) {
+      const url = options.contextOptions.recordHar.urlFilter;
+      const recordHarOptions = typeof url === 'string' ? `, new BrowserContext.RouteFromHAROptions()
+          .setUrl(${quote(url)})` : '';
+      formatter.add(`          context.routeFromHAR(Paths.get(${quote(options.contextOptions.recordHar.path)})${recordHarOptions});`);
+    }
     return formatter.format();
   }
 
@@ -257,16 +253,6 @@ function formatContextOptions(contextOptions: BrowserContextOptions, deviceName:
     lines.push(`  .setLocale(${quote(options.locale)})`);
   if (options.proxy)
     lines.push(`  .setProxy(new Proxy(${quote(options.proxy.server)}))`);
-  if (options.recordHar?.content)
-    lines.push(`  .setRecordHarContent(HarContentPolicy.${options.recordHar?.content.toUpperCase()})`);
-  if (options.recordHar?.mode)
-    lines.push(`  .setRecordHarMode(HarMode.${options.recordHar?.mode.toUpperCase()})`);
-  if (options.recordHar?.omitContent)
-    lines.push(`  .setRecordHarOmitContent(true)`);
-  if (options.recordHar?.path)
-    lines.push(`  .setRecordHarPath(Paths.get(${quote(options.recordHar.path)}))`);
-  if (options.recordHar?.urlFilter)
-    lines.push(`  .setRecordHarUrlFilter(${quote(options.recordHar.urlFilter as string)})`);
   if (options.serviceWorkers)
     lines.push(`  .setServiceWorkers(ServiceWorkerPolicy.${options.serviceWorkers.toUpperCase()})`);
   if (options.storageState)
@@ -280,7 +266,7 @@ function formatContextOptions(contextOptions: BrowserContextOptions, deviceName:
   return lines.join('\n');
 }
 
-function formatClickOptions(options: MouseClickOptions) {
+function formatClickOptions(options: types.MouseClickOptions) {
   const lines = [];
   if (options.button)
     lines.push(`  .setButton(MouseButton.${options.button.toUpperCase()})`);
diff --git a/packages/playwright-core/src/server/recorder/javascript.ts b/packages/playwright-core/src/server/codegen/javascript.ts
similarity index 75%
rename from packages/playwright-core/src/server/recorder/javascript.ts
rename to packages/playwright-core/src/server/codegen/javascript.ts
index 9bafcd6574d13..9c5f7273c578f 100644
--- a/packages/playwright-core/src/server/recorder/javascript.ts
+++ b/packages/playwright-core/src/server/codegen/javascript.ts
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-import type { BrowserContextOptions } from '../../..';
-import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './language';
-import { sanitizeDeviceOptions, toSignalMap } from './language';
-import type { ActionInContext } from './codeGenerator';
-import type { Action } from './recorderActions';
-import type { MouseClickOptions } from './utils';
-import { toModifiers } from './utils';
+import { sanitizeDeviceOptions, toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
+import { asLocator, escapeWithQuotes } from '../../utils';
 import { deviceDescriptors } from '../deviceDescriptors';
-import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
+
+import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
+import type { BrowserContextOptions } from '../../../types/types';
+import type * as actions from '@recorder/actions';
 
 export class JavaScriptLanguageGenerator implements LanguageGenerator {
   id: string;
@@ -38,7 +35,7 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
     this._isTest = isTest;
   }
 
-  generateAction(actionInContext: ActionInContext): string {
+  generateAction(actionInContext: actions.ActionInContext): string {
     const action = actionInContext.action;
     if (this._isTest && (action.name === 'openPage' || action.name === 'closePage'))
       return '';
@@ -53,14 +50,8 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
       return formatter.format();
     }
 
-    let subject: string;
-    if (actionInContext.frame.isMainFrame) {
-      subject = pageAlias;
-    } else {
-      const locators = actionInContext.frame.selectorsChain.map(selector => `.frameLocator(${quote(selector)})`);
-      subject = `${pageAlias}${locators.join('')}`;
-    }
-
+    const locators = actionInContext.frame.framePath.map(selector => `.${this._asLocator(selector)}.contentFrame()`);
+    const subject = `${pageAlias}${locators.join('')}`;
     const signals = toSignalMap(action);
 
     if (signals.dialog) {
@@ -75,7 +66,7 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
     if (signals.download)
       formatter.add(`const download${signals.download.downloadAlias}Promise = ${pageAlias}.waitForEvent('download');`);
 
-    formatter.add(this._generateActionCall(subject, action));
+    formatter.add(wrapWithStep(actionInContext.description, this._generateActionCall(subject, actionInContext)));
 
     if (signals.popup)
       formatter.add(`const ${signals.popup.popupAlias} = await ${signals.popup.popupAlias}Promise;`);
@@ -85,7 +76,8 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
     return formatter.format();
   }
 
-  private _generateActionCall(subject: string, action: Action): string {
+  private _generateActionCall(subject: string, actionInContext: actions.ActionInContext): string {
+    const action = actionInContext.action;
     switch (action.name) {
       case 'openPage':
         throw Error('Not reached');
@@ -95,16 +87,7 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
         let method = 'click';
         if (action.clickCount === 2)
           method = 'dblclick';
-        const modifiers = toModifiers(action.modifiers);
-        const options: MouseClickOptions = {};
-        if (action.button !== 'left')
-          options.button = action.button;
-        if (modifiers.length)
-          options.modifiers = modifiers;
-        if (action.clickCount > 2)
-          options.clickCount = action.clickCount;
-        if (action.position)
-          options.position = action.position;
+        const options = toClickOptionsForSourceCode(action);
         const optionsString = formatOptions(options, false);
         return `await ${subject}.${this._asLocator(action.selector)}.${method}(${optionsString});`;
       }
@@ -117,14 +100,14 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
       case 'setInputFiles':
         return `await ${subject}.${this._asLocator(action.selector)}.setInputFiles(${formatObject(action.files.length === 1 ? action.files[0] : action.files)});`;
       case 'press': {
-        const modifiers = toModifiers(action.modifiers);
+        const modifiers = toKeyboardModifiers(action.modifiers);
         const shortcut = [...modifiers, action.key].join('+');
         return `await ${subject}.${this._asLocator(action.selector)}.press(${quote(shortcut)});`;
       }
       case 'navigate':
         return `await ${subject}.goto(${quote(action.url)});`;
       case 'select':
-        return `await ${subject}.${this._asLocator(action.selector)}.selectOption(${formatObject(action.options.length > 1 ? action.options : action.options[0])});`;
+        return `await ${subject}.${this._asLocator(action.selector)}.selectOption(${formatObject(action.options.length === 1 ? action.options[0] : action.options)});`;
       case 'assertText':
         return `${this._isTest ? '' : '// '}await expect(${subject}.${this._asLocator(action.selector)}).${action.substring ? 'toContainText' : 'toHaveText'}(${quote(action.text)});`;
       case 'assertChecked':
@@ -135,6 +118,10 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
         const assertion = action.value ? `toHaveValue(${quote(action.value)})` : `toBeEmpty()`;
         return `${this._isTest ? '' : '// '}await expect(${subject}.${this._asLocator(action.selector)}).${assertion};`;
       }
+      case 'assertSnapshot': {
+        const commentIfNeeded = this._isTest ? '' : '// ';
+        return `${commentIfNeeded}await expect(${subject}.${this._asLocator(action.selector)}).toMatchAriaSnapshot(${quoteMultiline(action.ariaSnapshot, `${commentIfNeeded}  `)});`;
+      }
     }
   }
 
@@ -156,11 +143,15 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
 
   generateTestHeader(options: LanguageGeneratorOptions): string {
     const formatter = new JavaScriptFormatter();
-    const useText = formatContextOptions(options.contextOptions, options.deviceName);
+    const useText = formatContextOptions(options.contextOptions, options.deviceName, this._isTest);
     formatter.add(`
       import { test, expect${options.deviceName ? ', devices' : ''} } from '@playwright/test';
 ${useText ? '\ntest.use(' + useText + ');\n' : ''}
       test('test', async ({ page }) => {`);
+    if (options.contextOptions.recordHar) {
+      const url = options.contextOptions.recordHar.urlFilter;
+      formatter.add(`  await page.routeFromHAR(${quote(options.contextOptions.recordHar.path)}${url ? `, ${formatOptions({ url }, false)}` : ''});`);
+    }
     return formatter.format();
   }
 
@@ -175,7 +166,9 @@ ${useText ? '\ntest.use(' + useText + ');\n' : ''}
 
       (async () => {
         const browser = await ${options.browserName}.launch(${formatObjectOrVoid(options.launchOptions)});
-        const context = await browser.newContext(${formatContextOptions(options.contextOptions, options.deviceName)});`);
+        const context = await browser.newContext(${formatContextOptions(options.contextOptions, options.deviceName, false)});`);
+    if (options.contextOptions.recordHar)
+      formatter.add(`        await context.routeFromHAR(${quote(options.contextOptions.recordHar.path)});`);
     return formatter.format();
   }
 
@@ -217,8 +210,10 @@ function formatObjectOrVoid(value: any, indent = '  '): string {
   return result === '{}' ? '' : result;
 }
 
-function formatContextOptions(options: BrowserContextOptions, deviceName: string | undefined): string {
+function formatContextOptions(options: BrowserContextOptions, deviceName: string | undefined, isTest: boolean): string {
   const device = deviceName && deviceDescriptors[deviceName];
+  // recordHAR is replaced with routeFromHAR in the generated code.
+  options = { ...options, recordHar: undefined };
   if (!device)
     return formatObjectOrVoid(options);
   // Filter out all the properties from the device descriptor.
@@ -242,11 +237,13 @@ export class JavaScriptFormatter {
   }
 
   prepend(text: string) {
-    this._lines = text.trim().split('\n').map(line => line.trim()).concat(this._lines);
+    const trim = isMultilineString(text) ? (line: string) => line : (line: string) => line.trim();
+    this._lines = text.trim().split('\n').map(trim).concat(this._lines);
   }
 
   add(text: string) {
-    this._lines.push(...text.trim().split('\n').map(line => line.trim()));
+    const trim = isMultilineString(text) ? (line: string) => line : (line: string) => line.trim();
+    this._lines.push(...text.trim().split('\n').map(trim));
   }
 
   newLine() {
@@ -277,3 +274,23 @@ export class JavaScriptFormatter {
 function quote(text: string) {
   return escapeWithQuotes(text, '\'');
 }
+
+function wrapWithStep(description: string | undefined, body: string) {
+  return description ? `await test.step(\`${description}\`, async () => {
+${body}
+});` : body;
+}
+
+export function quoteMultiline(text: string, indent = '  ') {
+  const escape = (text: string) => text.replace(/\\/g, '\\\\')
+      .replace(/`/g, '\\`')
+      .replace(/\$\{/g, '\\${');
+  const lines = text.split('\n');
+  if (lines.length === 1)
+    return '`' + escape(text) + '`';
+  return '`\n' + lines.map(line => indent + escape(line).replace(/\${/g, '\\${')).join('\n') + `\n${indent}\``;
+}
+
+function isMultilineString(text: string) {
+  return text.match(/`[\S\s]*`/)?.[0].includes('\n');
+}
diff --git a/packages/playwright-core/src/server/recorder/jsonl.ts b/packages/playwright-core/src/server/codegen/jsonl.ts
similarity index 82%
rename from packages/playwright-core/src/server/recorder/jsonl.ts
rename to packages/playwright-core/src/server/codegen/jsonl.ts
index 636aaae70f422..a15acfb8f8e76 100644
--- a/packages/playwright-core/src/server/recorder/jsonl.ts
+++ b/packages/playwright-core/src/server/codegen/jsonl.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
-import type { ActionInContext } from './codeGenerator';
-import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './language';
+import { asLocator } from '../../utils';
+
+import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
+import type * as actions from '@recorder/actions';
 
 export class JsonlLanguageGenerator implements LanguageGenerator {
   id = 'jsonl';
@@ -24,12 +25,13 @@ export class JsonlLanguageGenerator implements LanguageGenerator {
   name = 'JSONL';
   highlighter = 'javascript' as Language;
 
-  generateAction(actionInContext: ActionInContext): string {
+  generateAction(actionInContext: actions.ActionInContext): string {
     const locator = (actionInContext.action as any).selector ? JSON.parse(asLocator('jsonl', (actionInContext.action as any).selector)) : undefined;
     const entry = {
       ...actionInContext.action,
-      pageAlias: actionInContext.frame.pageAlias,
+      ...actionInContext.frame,
       locator,
+      ariaSnapshot: undefined,
     };
     return JSON.stringify(entry);
   }
diff --git a/packages/playwright-core/src/server/codegen/language.ts b/packages/playwright-core/src/server/codegen/language.ts
new file mode 100644
index 0000000000000..1da8a915617ec
--- /dev/null
+++ b/packages/playwright-core/src/server/codegen/language.ts
@@ -0,0 +1,124 @@
+/**
+ * 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 { BrowserContextOptions } from '../../..';
+import type * as types from '../types';
+import type { LanguageGenerator, LanguageGeneratorOptions } from './types';
+import type * as actions from '@recorder/actions';
+
+export function generateCode(actions: actions.ActionInContext[], languageGenerator: LanguageGenerator, options: LanguageGeneratorOptions) {
+  const header = languageGenerator.generateHeader(options);
+  const footer = languageGenerator.generateFooter(options.saveStorage);
+  const actionTexts = actions.map(a => generateActionText(languageGenerator, a, !!options.generateAutoExpect)).filter(Boolean) as string[];
+  const text = [header, ...actionTexts, footer].join('\n');
+  return { header, footer, actionTexts, text };
+}
+
+function generateActionText(generator: LanguageGenerator, action: actions.ActionInContext, generateAutoExpect: boolean): string | undefined {
+  let text = generator.generateAction(action);
+  if (!text)
+    return;
+  if (generateAutoExpect && action.action.preconditionSelector) {
+    const expectAction: actions.ActionInContext = {
+      frame: action.frame,
+      startTime: action.startTime,
+      endTime: action.startTime,
+      action: {
+        name: 'assertVisible',
+        selector: action.action.preconditionSelector,
+        signals: [],
+      },
+    };
+    const expectText = generator.generateAction(expectAction);
+    if (expectText)
+      text = expectText + '\n\n' + text;
+  }
+  return text;
+}
+
+export function sanitizeDeviceOptions(device: any, options: BrowserContextOptions): BrowserContextOptions {
+  // Filter out all the properties from the device descriptor.
+  const cleanedOptions: Record<string, any> = {};
+  for (const property in options) {
+    if (JSON.stringify(device[property]) !== JSON.stringify((options as any)[property]))
+      cleanedOptions[property] = (options as any)[property];
+  }
+  return cleanedOptions;
+}
+
+export function toSignalMap(action: actions.Action) {
+  let popup: actions.PopupSignal | undefined;
+  let download: actions.DownloadSignal | undefined;
+  let dialog: actions.DialogSignal | undefined;
+  for (const signal of action.signals) {
+    if (signal.name === 'popup')
+      popup = signal;
+    else if (signal.name === 'download')
+      download = signal;
+    else if (signal.name === 'dialog')
+      dialog = signal;
+  }
+  return {
+    popup,
+    download,
+    dialog,
+  };
+}
+
+export function toKeyboardModifiers(modifiers: number): types.SmartKeyboardModifier[] {
+  const result: types.SmartKeyboardModifier[] = [];
+  if (modifiers & 1)
+    result.push('Alt');
+  if (modifiers & 2)
+    result.push('ControlOrMeta');
+  if (modifiers & 4)
+    result.push('ControlOrMeta');
+  if (modifiers & 8)
+    result.push('Shift');
+  return result;
+}
+
+export function fromKeyboardModifiers(modifiers?: types.SmartKeyboardModifier[]): number {
+  let result = 0;
+  if (!modifiers)
+    return result;
+  if (modifiers.includes('Alt'))
+    result |= 1;
+  if (modifiers.includes('Control'))
+    result |= 2;
+  if (modifiers.includes('ControlOrMeta'))
+    result |= 2;
+  if (modifiers.includes('Meta'))
+    result |= 4;
+  if (modifiers.includes('Shift'))
+    result |= 8;
+  return result;
+}
+
+export function toClickOptionsForSourceCode(action: actions.ClickAction): types.MouseClickOptions {
+  const modifiers = toKeyboardModifiers(action.modifiers);
+  const options: types.MouseClickOptions = {};
+  if (action.button !== 'left')
+    options.button = action.button;
+  if (modifiers.length)
+    options.modifiers = modifiers;
+  // Do not render clickCount === 2 for dblclick.
+  if (action.clickCount > 2)
+    options.clickCount = action.clickCount;
+  if (action.position)
+    options.position = action.position;
+  return options;
+}
diff --git a/packages/playwright-core/src/server/codegen/languages.ts b/packages/playwright-core/src/server/codegen/languages.ts
new file mode 100644
index 0000000000000..730293396e093
--- /dev/null
+++ b/packages/playwright-core/src/server/codegen/languages.ts
@@ -0,0 +1,39 @@
+/**
+ * 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 { CSharpLanguageGenerator } from './csharp';
+import { JavaLanguageGenerator } from './java';
+import { JavaScriptLanguageGenerator } from './javascript';
+import { JsonlLanguageGenerator } from './jsonl';
+import { PythonLanguageGenerator } from './python';
+
+export function languageSet() {
+  // Note: generators are ordered in the order of preference for each language.
+  // For example, 'playwright-test' comes before 'javascript'.
+  return new Set([
+    new JavaScriptLanguageGenerator(/* isPlaywrightTest */true),
+    new JavaScriptLanguageGenerator(/* isPlaywrightTest */false),
+    new PythonLanguageGenerator(/* isAsync */false, /* isPytest */true),
+    new PythonLanguageGenerator(/* isAsync */false, /* isPytest */false),
+    new PythonLanguageGenerator(/* isAsync */true,  /* isPytest */false),
+    new CSharpLanguageGenerator('mstest'),
+    new CSharpLanguageGenerator('nunit'),
+    new CSharpLanguageGenerator('library'),
+    new JavaLanguageGenerator('junit'),
+    new JavaLanguageGenerator('library'),
+    new JsonlLanguageGenerator(),
+  ]);
+}
diff --git a/packages/playwright-core/src/server/recorder/python.ts b/packages/playwright-core/src/server/codegen/python.ts
similarity index 81%
rename from packages/playwright-core/src/server/recorder/python.ts
rename to packages/playwright-core/src/server/codegen/python.ts
index ec592840abd43..314489441a652 100644
--- a/packages/playwright-core/src/server/recorder/python.ts
+++ b/packages/playwright-core/src/server/codegen/python.ts
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-import type { BrowserContextOptions } from '../../..';
-import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './language';
-import { sanitizeDeviceOptions, toSignalMap } from './language';
-import type { ActionInContext } from './codeGenerator';
-import type { Action } from './recorderActions';
-import type { MouseClickOptions } from './utils';
-import { toModifiers } from './utils';
-import { escapeWithQuotes, toSnakeCase } from '../../utils/isomorphic/stringUtils';
+import { sanitizeDeviceOptions, toClickOptionsForSourceCode, toKeyboardModifiers, toSignalMap } from './language';
+import { asLocator, escapeWithQuotes, toSnakeCase } from '../../utils';
 import { deviceDescriptors } from '../deviceDescriptors';
-import { asLocator } from '../../utils/isomorphic/locatorGenerators';
+
+import type { Language, LanguageGenerator, LanguageGeneratorOptions } from './types';
+import type { BrowserContextOptions } from '../../../types/types';
+import type * as actions from '@recorder/actions';
 
 export class PythonLanguageGenerator implements LanguageGenerator {
   id: string;
@@ -45,7 +42,7 @@ export class PythonLanguageGenerator implements LanguageGenerator {
     this._asyncPrefix = isAsync ? 'async ' : '';
   }
 
-  generateAction(actionInContext: ActionInContext): string {
+  generateAction(actionInContext: actions.ActionInContext): string {
     const action = actionInContext.action;
     if (this._isPyTest && (action.name === 'openPage' || action.name === 'closePage'))
       return '';
@@ -60,20 +57,14 @@ export class PythonLanguageGenerator implements LanguageGenerator {
       return formatter.format();
     }
 
-    let subject: string;
-    if (actionInContext.frame.isMainFrame) {
-      subject = pageAlias;
-    } else {
-      const locators = actionInContext.frame.selectorsChain.map(selector => `.frame_locator(${quote(selector)})`);
-      subject = `${pageAlias}${locators.join('')}`;
-    }
-
+    const locators = actionInContext.frame.framePath.map(selector => `.${this._asLocator(selector)}.content_frame`);
+    const subject = `${pageAlias}${locators.join('')}`;
     const signals = toSignalMap(action);
 
     if (signals.dialog)
       formatter.add(`  ${pageAlias}.once("dialog", lambda dialog: dialog.dismiss())`);
 
-    let code = `${this._awaitPrefix}${this._generateActionCall(subject, action)}`;
+    let code = `${this._awaitPrefix}${this._generateActionCall(subject, actionInContext)}`;
 
     if (signals.popup) {
       code = `${this._asyncPrefix}with ${pageAlias}.expect_popup() as ${signals.popup.popupAlias}_info {
@@ -94,7 +85,8 @@ export class PythonLanguageGenerator implements LanguageGenerator {
     return formatter.format();
   }
 
-  private _generateActionCall(subject: string, action: Action): string {
+  private _generateActionCall(subject: string, actionInContext: actions.ActionInContext): string {
+    const action = actionInContext.action;
     switch (action.name) {
       case 'openPage':
         throw Error('Not reached');
@@ -104,16 +96,7 @@ export class PythonLanguageGenerator implements LanguageGenerator {
         let method = 'click';
         if (action.clickCount === 2)
           method = 'dblclick';
-        const modifiers = toModifiers(action.modifiers);
-        const options: MouseClickOptions = {};
-        if (action.button !== 'left')
-          options.button = action.button;
-        if (modifiers.length)
-          options.modifiers = modifiers;
-        if (action.clickCount > 2)
-          options.clickCount = action.clickCount;
-        if (action.position)
-          options.position = action.position;
+        const options = toClickOptionsForSourceCode(action);
         const optionsString = formatOptions(options, false);
         return `${subject}.${this._asLocator(action.selector)}.${method}(${optionsString})`;
       }
@@ -126,7 +109,7 @@ export class PythonLanguageGenerator implements LanguageGenerator {
       case 'setInputFiles':
         return `${subject}.${this._asLocator(action.selector)}.set_input_files(${formatValue(action.files.length === 1 ? action.files[0] : action.files)})`;
       case 'press': {
-        const modifiers = toModifiers(action.modifiers);
+        const modifiers = toKeyboardModifiers(action.modifiers);
         const shortcut = [...modifiers, action.key].join('+');
         return `${subject}.${this._asLocator(action.selector)}.press(${quote(shortcut)})`;
       }
@@ -144,6 +127,8 @@ export class PythonLanguageGenerator implements LanguageGenerator {
         const assertion = action.value ? `to_have_value(${quote(action.value)})` : `to_be_empty()`;
         return `expect(${subject}.${this._asLocator(action.selector)}).${assertion};`;
       }
+      case 'assertSnapshot':
+        return `expect(${subject}.${this._asLocator(action.selector)}).to_match_aria_snapshot(${quote(action.ariaSnapshot)})`;
     }
   }
 
@@ -153,6 +138,7 @@ export class PythonLanguageGenerator implements LanguageGenerator {
 
   generateHeader(options: LanguageGeneratorOptions): string {
     const formatter = new PythonFormatter();
+    const recordHar = options.contextOptions.recordHar;
     if (this._isPyTest) {
       const contextOptions = formatContextOptions(options.contextOptions, options.deviceName, true /* asDict */);
       const fixture = contextOptions ? `
@@ -162,11 +148,13 @@ def browser_context_args(browser_context_args, playwright) {
     return {${contextOptions}}
 }
 ` : '';
-      formatter.add(`${options.deviceName ? 'import pytest\n' : ''}import re
+      formatter.add(`${options.deviceName || contextOptions ? 'import pytest\n' : ''}import re
 from playwright.sync_api import Page, expect
 ${fixture}
 
 def test_example(page: Page) -> None {`);
+      if (recordHar)
+        formatter.add(`    page.route_from_har(${quote(recordHar.path)}${typeof recordHar.urlFilter === 'string' ? `, url=${quote(recordHar.urlFilter)}` : ''})`);
     } else if (this._isAsync) {
       formatter.add(`
 import asyncio
@@ -177,6 +165,8 @@ from playwright.async_api import Playwright, async_playwright, expect
 async def run(playwright: Playwright) -> None {
     browser = await playwright.${options.browserName}.launch(${formatOptions(options.launchOptions, false)})
     context = await browser.new_context(${formatContextOptions(options.contextOptions, options.deviceName)})`);
+      if (recordHar)
+        formatter.add(`    await context.route_from_har(${quote(recordHar.path)}${typeof recordHar.urlFilter === 'string' ? `, url=${quote(recordHar.urlFilter)}` : ''})`);
     } else {
       formatter.add(`
 import re
@@ -186,6 +176,8 @@ from playwright.sync_api import Playwright, sync_playwright, expect
 def run(playwright: Playwright) -> None {
     browser = playwright.${options.browserName}.launch(${formatOptions(options.launchOptions, false)})
     context = browser.new_context(${formatContextOptions(options.contextOptions, options.deviceName)})`);
+      if (recordHar)
+        formatter.add(`    context.route_from_har(${quote(recordHar.path)}${typeof recordHar.urlFilter === 'string' ? `, url=${quote(recordHar.urlFilter)}` : ''})`);
     }
     return formatter.format();
   }
@@ -248,24 +240,13 @@ function formatOptions(value: any, hasArguments: boolean, asDict?: boolean): str
   }).join(', ');
 }
 
-function convertContextOptions(options: BrowserContextOptions): any {
-  const result: any = { ...options };
-  if (options.recordHar) {
-    result['record_har_path'] = options.recordHar.path;
-    result['record_har_content'] = options.recordHar.content;
-    result['record_har_mode'] = options.recordHar.mode;
-    result['record_har_omit_content'] = options.recordHar.omitContent;
-    result['record_har_url_filter'] = options.recordHar.urlFilter;
-    delete result.recordHar;
-  }
-  return result;
-}
-
 function formatContextOptions(options: BrowserContextOptions, deviceName: string | undefined, asDict?: boolean): string {
+  // recordHAR is replaced with routeFromHAR in the generated code.
+  options = { ...options, recordHar: undefined };
   const device = deviceName && deviceDescriptors[deviceName];
   if (!device)
-    return formatOptions(convertContextOptions(options), false, asDict);
-  return `**playwright.devices[${quote(deviceName!)}]` + formatOptions(convertContextOptions(sanitizeDeviceOptions(device, options)), true, asDict);
+    return formatOptions(options, false, asDict);
+  return `**playwright.devices[${quote(deviceName!)}]` + formatOptions(sanitizeDeviceOptions(device, options), true, asDict);
 }
 
 class PythonFormatter {
diff --git a/packages/playwright-core/src/server/codegen/types.ts b/packages/playwright-core/src/server/codegen/types.ts
new file mode 100644
index 0000000000000..c4d3c827bf379
--- /dev/null
+++ b/packages/playwright-core/src/server/codegen/types.ts
@@ -0,0 +1,39 @@
+/**
+ * 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 { BrowserContextOptions, LaunchOptions } from '../../../types/types';
+import type { Language } from '../../utils';
+import type * as actions from '@recorder/actions';
+export type { Language } from '../../utils';
+
+export type LanguageGeneratorOptions = {
+  browserName: string;
+  launchOptions: LaunchOptions;
+  contextOptions: BrowserContextOptions;
+  deviceName?: string;
+  saveStorage?: string;
+  generateAutoExpect?: boolean;
+};
+
+export interface LanguageGenerator {
+  id: string;
+  groupName: string;
+  name: string;
+  highlighter: Language;
+  generateHeader(options: LanguageGeneratorOptions): string;
+  generateAction(actionInContext: actions.ActionInContext): string;
+  generateFooter(saveStorage: string | undefined): string;
+}
diff --git a/packages/playwright-core/src/server/console.ts b/packages/playwright-core/src/server/console.ts
index e1faa7fb8f5fa..383b49fc823e7 100644
--- a/packages/playwright-core/src/server/console.ts
+++ b/packages/playwright-core/src/server/console.ts
@@ -15,8 +15,8 @@
  */
 
 import type * as js from './javascript';
-import type { ConsoleMessageLocation } from './types';
 import type { Page } from './page';
+import type { ConsoleMessageLocation } from './types';
 
 export class ConsoleMessage {
   private _type: string;
diff --git a/packages/playwright-core/src/server/cookieStore.ts b/packages/playwright-core/src/server/cookieStore.ts
index fbf3f718f058c..c8839cebd9d71 100644
--- a/packages/playwright-core/src/server/cookieStore.ts
+++ b/packages/playwright-core/src/server/cookieStore.ts
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+import { isLocalHostname, kMaxCookieExpiresDateInSeconds } from './network';
+
 import type * as channels from '@protocol/channels';
 
-class Cookie {
+export class Cookie {
   private _raw: channels.NetworkCookie;
   constructor(data: channels.NetworkCookie) {
     this._raw = data;
@@ -28,7 +30,7 @@ class Cookie {
 
   // https://datatracker.ietf.org/doc/html/rfc6265#section-5.4
   matches(url: URL): boolean {
-    if (this._raw.secure && (url.protocol !== 'https:' && url.hostname !== 'localhost'))
+    if (this._raw.secure && (url.protocol !== 'https:' && !isLocalHostname(url.hostname)))
       return false;
     if (!domainMatches(url.hostname, this._raw.domain))
       return false;
@@ -115,6 +117,97 @@ export class CookieStore {
   }
 }
 
+type RawCookie = {
+  name: string,
+  value: string,
+  domain?: string,
+  path?: string,
+  expires?: number,
+  httpOnly?: boolean,
+  secure?: boolean,
+  sameSite?: 'Strict' | 'Lax' | 'None',
+};
+
+export function parseRawCookie(header: string): RawCookie | null {
+  const pairs = header.split(';').filter(s => s.trim().length > 0).map(p => {
+    let key = '';
+    let value = '';
+    const separatorPos = p.indexOf('=');
+    if (separatorPos === -1) {
+      // If only a key is specified, the value is left undefined.
+      key = p.trim();
+    } else {
+      // Otherwise we assume that the key is the element before the first `=`
+      key = p.slice(0, separatorPos).trim();
+      // And the value is the rest of the string.
+      value = p.slice(separatorPos + 1).trim();
+    }
+    return [key, value];
+  });
+  if (!pairs.length)
+    return null;
+  const [name, value] = pairs[0];
+  const cookie: RawCookie = {
+    name,
+    value,
+  };
+  for (let i = 1; i < pairs.length; i++) {
+    const [name, value] = pairs[i];
+    switch (name.toLowerCase()) {
+      case 'expires':
+        const expiresMs = (+new Date(value));
+        // https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.1
+        if (isFinite(expiresMs)) {
+          if (expiresMs <= 0)
+            cookie.expires = 0;
+          else
+            cookie.expires = Math.min(expiresMs / 1000, kMaxCookieExpiresDateInSeconds);
+        }
+        break;
+      case 'max-age':
+        const maxAgeSec = parseInt(value, 10);
+        if (isFinite(maxAgeSec)) {
+          // From https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.2
+          // If delta-seconds is less than or equal to zero (0), let expiry-time
+          // be the earliest representable date and time.
+          if (maxAgeSec <= 0)
+            cookie.expires = 0;
+          else
+            cookie.expires = Math.min(Date.now() / 1000 + maxAgeSec, kMaxCookieExpiresDateInSeconds);
+        }
+        break;
+      case 'domain':
+        cookie.domain = value.toLocaleLowerCase() || '';
+        if (cookie.domain && !cookie.domain.startsWith('.') && cookie.domain.includes('.'))
+          cookie.domain = '.' + cookie.domain;
+        break;
+      case 'path':
+        cookie.path = value || '';
+        break;
+      case 'secure':
+        cookie.secure = true;
+        break;
+      case 'httponly':
+        cookie.httpOnly = true;
+        break;
+      case 'samesite':
+        switch (value.toLowerCase()) {
+          case 'none':
+            cookie.sameSite = 'None';
+            break;
+          case 'lax':
+            cookie.sameSite = 'Lax';
+            break;
+          case 'strict':
+            cookie.sameSite = 'Strict';
+            break;
+        }
+        break;
+    }
+  }
+  return cookie;
+}
+
 export function domainMatches(value: string, domain: string): boolean {
   if (value === domain)
     return true;
diff --git a/packages/playwright-core/src/server/debugController.ts b/packages/playwright-core/src/server/debugController.ts
index ea2dc9a8054af..6871d37775d7a 100644
--- a/packages/playwright-core/src/server/debugController.ts
+++ b/packages/playwright-core/src/server/debugController.ts
@@ -14,19 +14,26 @@
  * limitations under the License.
  */
 
-import type { Mode, Source } from '@recorder/recorderTypes';
-import { gracefullyProcessExitDoNotHang } from '../utils/processLauncher';
-import type { Browser } from './browser';
+import { SdkObject, createInstrumentation } from './instrumentation';
+import { gracefullyProcessExitDoNotHang } from './utils/processLauncher';
+import { Recorder, RecorderEvent } from './recorder';
+import { asLocator  } from '../utils';
+import { parseAriaSnapshotUnsafe } from '../utils/isomorphic/ariaSnapshot';
+import { yaml } from '../utilsBundle';
+import { unsafeLocatorOrSelectorAsSelector } from '../utils/isomorphic/locatorParser';
+import { generateCode } from './codegen/language';
+import { collapseActions } from './recorder/recorderUtils';
+import { JavaScriptLanguageGenerator } from './codegen/javascript';
+import { Frame } from './frames';
+import { Page } from './page';
+
+import type { Language } from '../utils';
 import type { BrowserContext } from './browserContext';
-import { createInstrumentation, SdkObject, serverSideCallMetadata } from './instrumentation';
 import type { InstrumentationListener } from './instrumentation';
 import type { Playwright } from './playwright';
-import { Recorder } from './recorder';
-import { EmptyRecorderApp } from './recorder/recorderApp';
-import { asLocator } from '../utils/isomorphic/locatorGenerators';
-import type { Language } from '../utils/isomorphic/locatorGenerators';
-
-const internalMetadata = serverSideCallMetadata();
+import type { ElementInfo, Mode } from '@recorder/recorderTypes';
+import type { Progress } from '@protocol/progress';
+import type * as actions from '@recorder/actions';
 
 export class DebugController extends SdkObject {
   static Events = {
@@ -37,13 +44,11 @@ export class DebugController extends SdkObject {
     SetModeRequested: 'setModeRequested',
   };
 
-  private _autoCloseTimer: NodeJS.Timeout | undefined;
-  // TODO: remove in 1.27
-  private _autoCloseAllowed = false;
-  private _trackHierarchyListener: InstrumentationListener | undefined;
+  private _reportState = false;
+  private _disposeListeners = new Set<() => void>();
   private _playwright: Playwright;
   _sdkLanguage: Language = 'javascript';
-  _codegenId: string = 'playwright-test';
+  _generateAutoExpect = false;
 
   constructor(playwright: Playwright) {
     super({ attribution: { isInternalPlaywright: true }, instrumentation: createInstrumentation() } as any, undefined, 'DebugController');
@@ -51,157 +56,130 @@ export class DebugController extends SdkObject {
   }
 
   initialize(codegenId: string, sdkLanguage: Language) {
-    this._codegenId = codegenId;
     this._sdkLanguage = sdkLanguage;
-    Recorder.setAppFactory(async () => new InspectingRecorderApp(this));
-  }
-
-  setAutoCloseAllowed(allowed: boolean) {
-    this._autoCloseAllowed = allowed;
   }
 
   dispose() {
     this.setReportStateChanged(false);
-    this.setAutoCloseAllowed(false);
-    Recorder.setAppFactory(undefined);
   }
 
   setReportStateChanged(enabled: boolean) {
-    if (enabled && !this._trackHierarchyListener) {
-      this._trackHierarchyListener = {
-        onPageOpen: () => this._emitSnapshot(),
-        onPageClose: () => this._emitSnapshot(),
+    if (this._reportState === enabled)
+      return;
+    this._reportState = enabled;
+    if (enabled) {
+      const listener: InstrumentationListener = {
+        onPageOpen: page => {
+          this._emitSnapshot(false);
+          const handleNavigation = () => this._emitSnapshot(false);
+          page.mainFrame().on(Frame.Events.InternalNavigation, handleNavigation);
+          const dispose = () => page.mainFrame().off(Frame.Events.InternalNavigation, handleNavigation);
+          this._disposeListeners.add(dispose);
+          page.on(Page.Events.Close, () => this._disposeListeners.delete(dispose));
+        },
+        onPageClose: () => this._emitSnapshot(false),
       };
-      this._playwright.instrumentation.addListener(this._trackHierarchyListener, null);
-    } else if (!enabled && this._trackHierarchyListener) {
-      this._playwright.instrumentation.removeListener(this._trackHierarchyListener);
-      this._trackHierarchyListener = undefined;
+      this._playwright.instrumentation.addListener(listener, null);
+      this._disposeListeners.add(() => this._playwright.instrumentation.removeListener(listener));
+      this._emitSnapshot(true);
+    } else {
+      for (const dispose of this._disposeListeners)
+        dispose();
+      this._disposeListeners.clear();
     }
   }
 
-  async resetForReuse() {
-    const contexts = new Set<BrowserContext>();
-    for (const page of this._playwright.allPages())
-      contexts.add(page.context());
-    for (const context of contexts)
-      await context.resetForReuse(internalMetadata, null);
-  }
-
-  async navigate(url: string) {
-    for (const p of this._playwright.allPages())
-      await p.mainFrame().goto(internalMetadata, url);
-  }
-
-  async setRecorderMode(params: { mode: Mode, file?: string, testIdAttributeName?: string }) {
-    // TODO: |file| is only used in the legacy mode.
-    await this._closeBrowsersWithoutPages();
+  async setRecorderMode(progress: Progress, params: { mode: Mode, testIdAttributeName?: string, generateAutoExpect?: boolean }) {
+    await progress.race(this._closeBrowsersWithoutPages());
+    this._generateAutoExpect = !!params.generateAutoExpect;
 
     if (params.mode === 'none') {
-      for (const recorder of await this._allRecorders()) {
+      for (const recorder of await progress.race(this._allRecorders())) {
         recorder.hideHighlightedSelector();
         recorder.setMode('none');
       }
-      this.setAutoCloseEnabled(true);
       return;
     }
 
     if (!this._playwright.allBrowsers().length)
-      await this._playwright.chromium.launch(internalMetadata, { headless: !!process.env.PW_DEBUG_CONTROLLER_HEADLESS });
+      await this._playwright.chromium.launch(progress, { headless: !!process.env.PW_DEBUG_CONTROLLER_HEADLESS });
     // Create page if none.
     const pages = this._playwright.allPages();
     if (!pages.length) {
       const [browser] = this._playwright.allBrowsers();
-      const { context } = await browser.newContextForReuse({}, internalMetadata);
-      await context.newPage(internalMetadata);
+      const context = await browser.newContextForReuse(progress, {});
+      await context.newPage(progress);
     }
     // Update test id attribute.
     if (params.testIdAttributeName) {
       for (const page of this._playwright.allPages())
-        page.context().selectors().setTestIdAttributeName(params.testIdAttributeName);
+        page.browserContext.selectors().setTestIdAttributeName(params.testIdAttributeName);
     }
     // Toggle the mode.
-    for (const recorder of await this._allRecorders()) {
+    for (const recorder of await progress.race(this._allRecorders())) {
       recorder.hideHighlightedSelector();
-      if (params.mode !== 'inspecting')
-        recorder.setOutput(this._codegenId, params.file);
       recorder.setMode(params.mode);
     }
-    this.setAutoCloseEnabled(true);
-  }
-
-  async setAutoCloseEnabled(enabled: boolean) {
-    if (!this._autoCloseAllowed)
-      return;
-    if (this._autoCloseTimer)
-      clearTimeout(this._autoCloseTimer);
-    if (!enabled)
-      return;
-    const heartBeat = () => {
-      if (!this._playwright.allPages().length)
-        gracefullyProcessExitDoNotHang(0);
-      else
-        this._autoCloseTimer = setTimeout(heartBeat, 5000);
-    };
-    this._autoCloseTimer = setTimeout(heartBeat, 30000);
   }
 
-  async highlight(selector: string) {
-    for (const recorder of await this._allRecorders())
-      recorder.setHighlightedSelector(this._sdkLanguage, selector);
+  async highlight(progress: Progress, params: { selector?: string, ariaTemplate?: string }) {
+    // Assert parameters validity.
+    if (params.selector)
+      unsafeLocatorOrSelectorAsSelector(this._sdkLanguage, params.selector, 'data-testid');
+    const ariaTemplate = params.ariaTemplate ? parseAriaSnapshotUnsafe(yaml, params.ariaTemplate) : undefined;
+    for (const recorder of await progress.race(this._allRecorders())) {
+      if (ariaTemplate)
+        recorder.setHighlightedAriaTemplate(ariaTemplate);
+      else if (params.selector)
+        recorder.setHighlightedSelector(params.selector);
+    }
   }
 
-  async hideHighlight() {
+  async hideHighlight(progress: Progress) {
     // Hide all active recorder highlights.
-    for (const recorder of await this._allRecorders())
+    for (const recorder of await progress.race(this._allRecorders()))
       recorder.hideHighlightedSelector();
     // Hide all locator.highlight highlights.
-    await this._playwright.hideHighlight();
-  }
-
-  allBrowsers(): Browser[] {
-    return [...this._playwright.allBrowsers()];
+    await Promise.all(this._playwright.allPages().map(p => p.hideHighlight().catch(() => {})));
   }
 
-  async resume() {
-    for (const recorder of await this._allRecorders())
+  async resume(progress: Progress) {
+    for (const recorder of await progress.race(this._allRecorders()))
       recorder.resume();
   }
 
-  async kill() {
+  kill() {
     gracefullyProcessExitDoNotHang(0);
   }
 
-  async closeAllBrowsers() {
-    await Promise.all(this.allBrowsers().map(browser => browser.close({ reason: 'Close all browsers requested' })));
-  }
-
-  private _emitSnapshot() {
-    const browsers = [];
-    let pageCount = 0;
-    for (const browser of this._playwright.allBrowsers()) {
-      const b = {
-        contexts: [] as any[]
-      };
-      browsers.push(b);
-      for (const context of browser.contexts()) {
-        const c = {
-          pages: [] as any[]
-        };
-        b.contexts.push(c);
-        for (const page of context.pages())
-          c.pages.push(page.mainFrame().url());
-        pageCount += context.pages().length;
-      }
-    }
-    this.emit(DebugController.Events.StateChanged, { pageCount });
+  private _emitSnapshot(initial: boolean) {
+    const pageCount = this._playwright.allPages().length;
+    if (initial && !pageCount)
+      return;
+    this.emit(DebugController.Events.StateChanged, {
+      pageCount,
+      browsers: this._playwright.allBrowsers().map(browser => ({
+        id: browser.guid,
+        name: browser.options.name,
+        channel: browser.options.channel,
+        contexts: browser.contexts().map(context => ({
+          pages: context.pages().map(page => ({
+            url: page.mainFrame().url(),
+          }))
+        }))
+      }))
+    });
   }
 
   private async _allRecorders(): Promise<Recorder[]> {
     const contexts = new Set<BrowserContext>();
     for (const page of this._playwright.allPages())
-      contexts.add(page.context());
-    const result = await Promise.all([...contexts].map(c => Recorder.show(c, { omitCallTracking: true })));
-    return result.filter(Boolean) as Recorder[];
+      contexts.add(page.browserContext);
+    const recorders = await Promise.all([...contexts].map(c => Recorder.forContext(c, { omitCallTracking: true })));
+    const nonNullRecorders = recorders.filter(Boolean) as Recorder[];
+    for (const recorder of recorders)
+      wireListeners(recorder, this);
+    return nonNullRecorders;
   }
 
   private async _closeBrowsersWithoutPages() {
@@ -216,30 +194,45 @@ export class DebugController extends SdkObject {
   }
 }
 
-class InspectingRecorderApp extends EmptyRecorderApp {
-  private _debugController: DebugController;
-
-  constructor(debugController: DebugController) {
-    super();
-    this._debugController = debugController;
-  }
-
-  override async setSelector(selector: string): Promise<void> {
-    const locator: string = asLocator(this._debugController._sdkLanguage, selector);
-    this._debugController.emit(DebugController.Events.InspectRequested, { selector, locator });
-  }
-
-  override async setSources(sources: Source[]): Promise<void> {
-    const source = sources.find(s => s.id === this._debugController._codegenId);
-    const { text, header, footer, actions } = source || { text: '' };
-    this._debugController.emit(DebugController.Events.SourceChanged, { text, header, footer, actions });
-  }
-
-  override async setPaused(paused: boolean) {
-    this._debugController.emit(DebugController.Events.Paused, { paused });
-  }
+const wiredSymbol = Symbol('wired');
+
+function wireListeners(recorder: Recorder, debugController: DebugController) {
+  if ((recorder as any)[wiredSymbol])
+    return;
+  (recorder as any)[wiredSymbol] = true;
+
+  const actions: actions.ActionInContext[] = [];
+  const languageGenerator = new JavaScriptLanguageGenerator(/* isPlaywrightTest */true);
+
+  const actionsChanged = () => {
+    const aa = collapseActions(actions);
+    const { header, footer, text, actionTexts } = generateCode(aa, languageGenerator, {
+      browserName: 'chromium',
+      launchOptions: {},
+      contextOptions: {},
+      generateAutoExpect: debugController._generateAutoExpect,
+    });
+    debugController.emit(DebugController.Events.SourceChanged, { text, header, footer, actions: actionTexts });
+  };
 
-  override async setMode(mode: Mode) {
-    this._debugController.emit(DebugController.Events.SetModeRequested, { mode });
-  }
+  recorder.on(RecorderEvent.ElementPicked, (elementInfo: ElementInfo) => {
+    const locator: string = asLocator(debugController._sdkLanguage, elementInfo.selector);
+    debugController.emit(DebugController.Events.InspectRequested, { selector: elementInfo.selector, locator, ariaSnapshot: elementInfo.ariaSnapshot });
+  });
+  recorder.on(RecorderEvent.PausedStateChanged, (paused: boolean) => {
+    debugController.emit(DebugController.Events.Paused, { paused });
+  });
+  recorder.on(RecorderEvent.ModeChanged, (mode: Mode) => {
+    debugController.emit(DebugController.Events.SetModeRequested, { mode });
+  });
+  recorder.on(RecorderEvent.ActionAdded, (action: actions.ActionInContext) => {
+    actions.push(action);
+    actionsChanged();
+  });
+  recorder.on(RecorderEvent.SignalAdded, (signal: actions.SignalInContext) => {
+    const lastAction = actions.findLast(a => a.frame.pageGuid === signal.frame.pageGuid);
+    if (lastAction)
+      lastAction.action.signals.push(signal.signal);
+    actionsChanged();
+  });
 }
diff --git a/packages/playwright-core/src/server/debugger.ts b/packages/playwright-core/src/server/debugger.ts
index 420b438ccb33e..7ca2ed6e15827 100644
--- a/packages/playwright-core/src/server/debugger.ts
+++ b/packages/playwright-core/src/server/debugger.ts
@@ -15,10 +15,12 @@
  */
 
 import { EventEmitter } from 'events';
+
 import { debugMode, isUnderTest, monotonicTime } from '../utils';
 import { BrowserContext } from './browserContext';
+import { methodMetainfo } from '../utils/isomorphic/protocolMetainfo';
+
 import type { CallMetadata, InstrumentationListener, SdkObject } from './instrumentation';
-import { commandsWithTracingSnapshots, pausesBeforeInputActions, slowMoActions } from '../protocol/debug';
 
 const symbol = Symbol('Debugger');
 
@@ -32,7 +34,6 @@ export class Debugger extends EventEmitter implements InstrumentationListener {
     PausedStateChanged: 'pausedstatechanged'
   };
   private _muted = false;
-  private _slowMo: number | undefined;
 
   constructor(context: BrowserContext) {
     super();
@@ -45,7 +46,6 @@ export class Debugger extends EventEmitter implements InstrumentationListener {
     this._context.once(BrowserContext.Events.Close, () => {
       this._context.instrumentation.removeListener(this);
     });
-    this._slowMo = this._context._browser.options.slowMo;
   }
 
   async setMuted(muted: boolean) {
@@ -59,15 +59,6 @@ export class Debugger extends EventEmitter implements InstrumentationListener {
       await this.pause(sdkObject, metadata);
   }
 
-  async _doSlowMo() {
-    await new Promise(f => setTimeout(f, this._slowMo));
-  }
-
-  async onAfterCall(sdkObject: SdkObject, metadata: CallMetadata): Promise<void> {
-    if (this._slowMo && shouldSlowMo(metadata))
-      await this._doSlowMo();
-  }
-
   async onBeforeInputAction(sdkObject: SdkObject, metadata: CallMetadata): Promise<void> {
     if (this._muted)
       return;
@@ -128,20 +119,8 @@ function shouldPauseOnCall(sdkObject: SdkObject, metadata: CallMetadata): boolea
 }
 
 function shouldPauseBeforeStep(metadata: CallMetadata): boolean {
-  // Don't stop on internal.
-  if (!metadata.apiName)
+  if (metadata.internal)
     return false;
-  // Always stop on 'close'
-  if (metadata.method === 'close')
-    return true;
-  if (metadata.method === 'waitForSelector' || metadata.method === 'waitForEventInfo')
-    return false;  // Never stop on those, primarily for the test harness.
-  const step = metadata.type + '.' + metadata.method;
-  // Stop before everything that generates snapshot. But don't stop before those marked as pausesBeforeInputActions
-  // since we stop in them on a separate instrumentation signal.
-  return commandsWithTracingSnapshots.has(step) && !pausesBeforeInputActions.has(metadata.type + '.' + metadata.method);
-}
-
-export function shouldSlowMo(metadata: CallMetadata): boolean {
-  return slowMoActions.has(metadata.type + '.' + metadata.method);
+  const metainfo = methodMetainfo.get(metadata.type + '.' + metadata.method);
+  return !!metainfo?.pausesBeforeAction;
 }
diff --git a/packages/playwright-core/src/server/deviceDescriptors.ts b/packages/playwright-core/src/server/deviceDescriptors.ts
index b46789c0e59b0..c4ad1f73fa747 100644
--- a/packages/playwright-core/src/server/deviceDescriptors.ts
+++ b/packages/playwright-core/src/server/deviceDescriptors.ts
@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
+import deviceDescriptorsSource from './deviceDescriptorsSource.json';
+
 import type { Devices } from './types';
 
-import deviceDescriptorsSource from './deviceDescriptorsSource.json';
 
 export const deviceDescriptors = deviceDescriptorsSource as Devices;
diff --git a/packages/playwright-core/src/server/deviceDescriptorsSource.json b/packages/playwright-core/src/server/deviceDescriptorsSource.json
index 2209498e325dd..dddc412a51d02 100644
--- a/packages/playwright-core/src/server/deviceDescriptorsSource.json
+++ b/packages/playwright-core/src/server/deviceDescriptorsSource.json
@@ -1,6 +1,6 @@
 {
   "Blackberry PlayBook": {
-    "userAgent": "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/18.0 Safari/536.2+",
+    "userAgent": "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/26.0 Safari/536.2+",
     "viewport": {
       "width": 600,
       "height": 1024
@@ -11,7 +11,7 @@
     "defaultBrowserType": "webkit"
   },
   "Blackberry PlayBook landscape": {
-    "userAgent": "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/18.0 Safari/536.2+",
+    "userAgent": "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/26.0 Safari/536.2+",
     "viewport": {
       "width": 1024,
       "height": 600
@@ -22,7 +22,7 @@
     "defaultBrowserType": "webkit"
   },
   "BlackBerry Z30": {
-    "userAgent": "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/18.0 Mobile Safari/537.10+",
+    "userAgent": "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/26.0 Mobile Safari/537.10+",
     "viewport": {
       "width": 360,
       "height": 640
@@ -33,7 +33,7 @@
     "defaultBrowserType": "webkit"
   },
   "BlackBerry Z30 landscape": {
-    "userAgent": "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/18.0 Mobile Safari/537.10+",
+    "userAgent": "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/26.0 Mobile Safari/537.10+",
     "viewport": {
       "width": 640,
       "height": 360
@@ -44,7 +44,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy Note 3": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/18.0 Mobile Safari/534.30",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/26.0 Mobile Safari/534.30",
     "viewport": {
       "width": 360,
       "height": 640
@@ -55,7 +55,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy Note 3 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/18.0 Mobile Safari/534.30",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) Version/26.0 Mobile Safari/534.30",
     "viewport": {
       "width": 640,
       "height": 360
@@ -66,7 +66,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy Note II": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/18.0 Mobile Safari/534.30",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/26.0 Mobile Safari/534.30",
     "viewport": {
       "width": 360,
       "height": 640
@@ -77,7 +77,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy Note II landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/18.0 Mobile Safari/534.30",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/26.0 Mobile Safari/534.30",
     "viewport": {
       "width": 640,
       "height": 360
@@ -88,7 +88,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy S III": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/18.0 Mobile Safari/534.30",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/26.0 Mobile Safari/534.30",
     "viewport": {
       "width": 360,
       "height": 640
@@ -99,7 +99,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy S III landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/18.0 Mobile Safari/534.30",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/26.0 Mobile Safari/534.30",
     "viewport": {
       "width": 640,
       "height": 360
@@ -110,7 +110,7 @@
     "defaultBrowserType": "webkit"
   },
   "Galaxy S5": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 360,
       "height": 640
@@ -121,7 +121,7 @@
     "defaultBrowserType": "chromium"
   },
   "Galaxy S5 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 640,
       "height": 360
@@ -132,7 +132,7 @@
     "defaultBrowserType": "chromium"
   },
   "Galaxy S8": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; SM-G950U Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; SM-G950U Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 360,
       "height": 740
@@ -143,7 +143,7 @@
     "defaultBrowserType": "chromium"
   },
   "Galaxy S8 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; SM-G950U Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; SM-G950U Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 740,
       "height": 360
@@ -154,7 +154,7 @@
     "defaultBrowserType": "chromium"
   },
   "Galaxy S9+": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 320,
       "height": 658
@@ -165,7 +165,7 @@
     "defaultBrowserType": "chromium"
   },
   "Galaxy S9+ landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; SM-G965U Build/R16NW) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 658,
       "height": 320
@@ -175,8 +175,52 @@
     "hasTouch": true,
     "defaultBrowserType": "chromium"
   },
+  "Galaxy S24": {
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; SM-S921U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
+    "viewport": {
+      "width": 480,
+      "height": 1040
+    },
+    "deviceScaleFactor": 2.25,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "chromium"
+  },
+  "Galaxy S24 landscape": {
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; SM-S921U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
+    "viewport": {
+      "width": 1040,
+      "height": 480
+    },
+    "deviceScaleFactor": 2.25,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "chromium"
+  },
+  "Galaxy A55": {
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; SM-A556B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
+    "viewport": {
+      "width": 480,
+      "height": 1040
+    },
+    "deviceScaleFactor": 2.25,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "chromium"
+  },
+  "Galaxy A55 landscape": {
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; SM-A556B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
+    "viewport": {
+      "width": 1040,
+      "height": 480
+    },
+    "deviceScaleFactor": 2.25,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "chromium"
+  },
   "Galaxy Tab S4": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.1.0; SM-T837A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.1.0; SM-T837A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "viewport": {
       "width": 712,
       "height": 1138
@@ -187,7 +231,7 @@
     "defaultBrowserType": "chromium"
   },
   "Galaxy Tab S4 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.1.0; SM-T837A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.1.0; SM-T837A) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "viewport": {
       "width": 1138,
       "height": 712
@@ -197,8 +241,30 @@
     "hasTouch": true,
     "defaultBrowserType": "chromium"
   },
+  "Galaxy Tab S9": {
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; SM-X710) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
+    "viewport": {
+      "width": 640,
+      "height": 1024
+    },
+    "deviceScaleFactor": 2.5,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "chromium"
+  },
+  "Galaxy Tab S9 landscape": {
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; SM-X710) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
+    "viewport": {
+      "width": 1024,
+      "height": 640
+    },
+    "deviceScaleFactor": 2.5,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "chromium"
+  },
   "iPad (gen 5)": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 768,
       "height": 1024
@@ -209,7 +275,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad (gen 5) landscape": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 1024,
       "height": 768
@@ -220,7 +286,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad (gen 6)": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 768,
       "height": 1024
@@ -231,7 +297,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad (gen 6) landscape": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 1024,
       "height": 768
@@ -242,7 +308,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad (gen 7)": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 810,
       "height": 1080
@@ -253,7 +319,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad (gen 7) landscape": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 1080,
       "height": 810
@@ -263,8 +329,30 @@
     "hasTouch": true,
     "defaultBrowserType": "webkit"
   },
+  "iPad (gen 11)": {
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/19E241 Safari/604.1",
+    "viewport": {
+      "width": 656,
+      "height": 944
+    },
+    "deviceScaleFactor": 2.5,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "webkit"
+  },
+  "iPad (gen 11) landscape": {
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/19E241 Safari/604.1",
+    "viewport": {
+      "width": 944,
+      "height": 656
+    },
+    "deviceScaleFactor": 2.5,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "webkit"
+  },
   "iPad Mini": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 768,
       "height": 1024
@@ -275,7 +363,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad Mini landscape": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 1024,
       "height": 768
@@ -286,7 +374,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad Pro 11": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 834,
       "height": 1194
@@ -297,7 +385,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPad Pro 11 landscape": {
-    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 1194,
       "height": 834
@@ -308,7 +396,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 6": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 375,
       "height": 667
@@ -319,7 +407,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 6 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 667,
       "height": 375
@@ -330,7 +418,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 6 Plus": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 414,
       "height": 736
@@ -341,7 +429,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 6 Plus landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 736,
       "height": 414
@@ -352,7 +440,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 7": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 375,
       "height": 667
@@ -363,7 +451,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 7 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 667,
       "height": 375
@@ -374,7 +462,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 7 Plus": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 414,
       "height": 736
@@ -385,7 +473,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 7 Plus landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 736,
       "height": 414
@@ -396,7 +484,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 8": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 375,
       "height": 667
@@ -407,7 +495,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 8 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 667,
       "height": 375
@@ -418,7 +506,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 8 Plus": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 414,
       "height": 736
@@ -429,7 +517,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 8 Plus landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 736,
       "height": 414
@@ -440,7 +528,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone SE": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/18.0 Mobile/14E304 Safari/602.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/26.0 Mobile/14E304 Safari/602.1",
     "viewport": {
       "width": 320,
       "height": 568
@@ -451,7 +539,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone SE landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/18.0 Mobile/14E304 Safari/602.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/26.0 Mobile/14E304 Safari/602.1",
     "viewport": {
       "width": 568,
       "height": 320
@@ -461,8 +549,30 @@
     "hasTouch": true,
     "defaultBrowserType": "webkit"
   },
+  "iPhone SE (3rd gen)": {
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/26.0 Mobile/19E241 Safari/602.1",
+    "viewport": {
+      "width": 375,
+      "height": 667
+    },
+    "deviceScaleFactor": 2,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "webkit"
+  },
+  "iPhone SE (3rd gen) landscape": {
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/26.0 Mobile/19E241 Safari/602.1",
+    "viewport": {
+      "width": 667,
+      "height": 375
+    },
+    "deviceScaleFactor": 2,
+    "isMobile": true,
+    "hasTouch": true,
+    "defaultBrowserType": "webkit"
+  },
   "iPhone X": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 375,
       "height": 812
@@ -473,7 +583,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone X landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/18.0 Mobile/15A372 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/26.0 Mobile/15A372 Safari/604.1",
     "viewport": {
       "width": 812,
       "height": 375
@@ -484,7 +594,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone XR": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 414,
       "height": 896
@@ -495,7 +605,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone XR landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "viewport": {
       "width": 896,
       "height": 414
@@ -506,7 +616,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 11": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 414,
       "height": 896
@@ -521,7 +631,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 11 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 414,
       "height": 896
@@ -536,7 +646,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 11 Pro": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 375,
       "height": 812
@@ -551,7 +661,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 11 Pro landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 375,
       "height": 812
@@ -566,7 +676,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 11 Pro Max": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 414,
       "height": 896
@@ -581,7 +691,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 11 Pro Max landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 414,
       "height": 896
@@ -596,7 +706,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -611,7 +721,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -626,7 +736,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 Pro": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -641,7 +751,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 Pro landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -656,7 +766,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 Pro Max": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 428,
       "height": 926
@@ -671,7 +781,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 Pro Max landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 428,
       "height": 926
@@ -686,7 +796,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 Mini": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 375,
       "height": 812
@@ -701,7 +811,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 12 Mini landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 375,
       "height": 812
@@ -716,7 +826,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -731,7 +841,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -746,7 +856,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 Pro": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -761,7 +871,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 Pro landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -776,7 +886,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 Pro Max": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 428,
       "height": 926
@@ -791,7 +901,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 Pro Max landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 428,
       "height": 926
@@ -806,7 +916,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 Mini": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 375,
       "height": 812
@@ -821,7 +931,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 13 Mini landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 375,
       "height": 812
@@ -836,7 +946,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -851,7 +961,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 390,
       "height": 844
@@ -866,7 +976,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 Plus": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 428,
       "height": 926
@@ -881,7 +991,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 Plus landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 428,
       "height": 926
@@ -896,7 +1006,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 Pro": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 393,
       "height": 852
@@ -911,7 +1021,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 Pro landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 393,
       "height": 852
@@ -926,7 +1036,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 Pro Max": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 430,
       "height": 932
@@ -941,7 +1051,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 14 Pro Max landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 430,
       "height": 932
@@ -956,7 +1066,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 393,
       "height": 852
@@ -971,7 +1081,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 393,
       "height": 852
@@ -986,7 +1096,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 Plus": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 430,
       "height": 932
@@ -1001,7 +1111,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 Plus landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 430,
       "height": 932
@@ -1016,7 +1126,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 Pro": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 393,
       "height": 852
@@ -1031,7 +1141,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 Pro landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 393,
       "height": 852
@@ -1046,7 +1156,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 Pro Max": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 430,
       "height": 932
@@ -1061,7 +1171,7 @@
     "defaultBrowserType": "webkit"
   },
   "iPhone 15 Pro Max landscape": {
-    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1",
+    "userAgent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1",
     "screen": {
       "width": 430,
       "height": 932
@@ -1098,7 +1208,7 @@
     "defaultBrowserType": "webkit"
   },
   "LG Optimus L70": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 384,
       "height": 640
@@ -1109,7 +1219,7 @@
     "defaultBrowserType": "chromium"
   },
   "LG Optimus L70 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 640,
       "height": 384
@@ -1120,10 +1230,10 @@
     "defaultBrowserType": "chromium"
   },
   "Microsoft Lumia 550": {
-    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36 Edge/14.14263",
+    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36 Edge/14.14263",
     "viewport": {
-      "width": 640,
-      "height": 360
+      "width": 360,
+      "height": 640
     },
     "deviceScaleFactor": 2,
     "isMobile": true,
@@ -1131,10 +1241,10 @@
     "defaultBrowserType": "chromium"
   },
   "Microsoft Lumia 550 landscape": {
-    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36 Edge/14.14263",
+    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 550) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36 Edge/14.14263",
     "viewport": {
-      "width": 360,
-      "height": 640
+      "width": 640,
+      "height": 360
     },
     "deviceScaleFactor": 2,
     "isMobile": true,
@@ -1142,7 +1252,7 @@
     "defaultBrowserType": "chromium"
   },
   "Microsoft Lumia 950": {
-    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36 Edge/14.14263",
+    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36 Edge/14.14263",
     "viewport": {
       "width": 360,
       "height": 640
@@ -1153,7 +1263,7 @@
     "defaultBrowserType": "chromium"
   },
   "Microsoft Lumia 950 landscape": {
-    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36 Edge/14.14263",
+    "userAgent": "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36 Edge/14.14263",
     "viewport": {
       "width": 640,
       "height": 360
@@ -1164,7 +1274,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 10": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 10 Build/MOB31T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 10 Build/MOB31T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "viewport": {
       "width": 800,
       "height": 1280
@@ -1175,7 +1285,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 10 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 10 Build/MOB31T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 10 Build/MOB31T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "viewport": {
       "width": 1280,
       "height": 800
@@ -1186,7 +1296,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 4": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 384,
       "height": 640
@@ -1197,7 +1307,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 4 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 640,
       "height": 384
@@ -1208,7 +1318,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 5": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 360,
       "height": 640
@@ -1219,7 +1329,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 5 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 640,
       "height": 360
@@ -1230,7 +1340,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 5X": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 5X Build/OPR4.170623.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 5X Build/OPR4.170623.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 412,
       "height": 732
@@ -1241,7 +1351,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 5X landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 5X Build/OPR4.170623.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 5X Build/OPR4.170623.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 732,
       "height": 412
@@ -1252,7 +1362,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 6": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6 Build/N6F26U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6 Build/N6F26U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 412,
       "height": 732
@@ -1263,7 +1373,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 6 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6 Build/N6F26U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6 Build/N6F26U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 732,
       "height": 412
@@ -1274,7 +1384,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 6P": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 412,
       "height": 732
@@ -1285,7 +1395,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 6P landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 732,
       "height": 412
@@ -1296,7 +1406,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 7": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MOB30X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MOB30X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "viewport": {
       "width": 600,
       "height": 960
@@ -1307,7 +1417,7 @@
     "defaultBrowserType": "chromium"
   },
   "Nexus 7 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MOB30X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MOB30X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "viewport": {
       "width": 960,
       "height": 600
@@ -1362,7 +1472,7 @@
     "defaultBrowserType": "webkit"
   },
   "Pixel 2": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 411,
       "height": 731
@@ -1373,7 +1483,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 2 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 731,
       "height": 411
@@ -1384,7 +1494,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 2 XL": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Pixel 2 XL Build/OPD1.170816.004) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Pixel 2 XL Build/OPD1.170816.004) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 411,
       "height": 823
@@ -1395,7 +1505,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 2 XL landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Pixel 2 XL Build/OPD1.170816.004) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 8.0.0; Pixel 2 XL Build/OPD1.170816.004) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 823,
       "height": 411
@@ -1406,7 +1516,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 3": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.181105.017.A1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.181105.017.A1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 393,
       "height": 786
@@ -1417,7 +1527,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 3 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.181105.017.A1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 9; Pixel 3 Build/PQ1A.181105.017.A1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 786,
       "height": 393
@@ -1428,7 +1538,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 4": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 353,
       "height": 745
@@ -1439,7 +1549,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 4 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 10; Pixel 4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 745,
       "height": 353
@@ -1450,7 +1560,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 4a (5G)": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 4a (5G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 4a (5G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "screen": {
       "width": 412,
       "height": 892
@@ -1465,7 +1575,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 4a (5G) landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 4a (5G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 4a (5G)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "screen": {
       "height": 892,
       "width": 412
@@ -1480,7 +1590,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 5": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "screen": {
       "width": 393,
       "height": 851
@@ -1495,7 +1605,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 5 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "screen": {
       "width": 851,
       "height": 393
@@ -1510,7 +1620,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 7": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 14; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "screen": {
       "width": 412,
       "height": 915
@@ -1525,7 +1635,7 @@
     "defaultBrowserType": "chromium"
   },
   "Pixel 7 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 14; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 14; Pixel 7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "screen": {
       "width": 915,
       "height": 412
@@ -1540,7 +1650,7 @@
     "defaultBrowserType": "chromium"
   },
   "Moto G4": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 360,
       "height": 640
@@ -1551,7 +1661,7 @@
     "defaultBrowserType": "chromium"
   },
   "Moto G4 landscape": {
-    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Mobile Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Linux; Android 7.0; Moto G (4)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Mobile Safari/537.36",
     "viewport": {
       "width": 640,
       "height": 360
@@ -1562,7 +1672,7 @@
     "defaultBrowserType": "chromium"
   },
   "Desktop Chrome HiDPI": {
-    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "screen": {
       "width": 1792,
       "height": 1120
@@ -1577,7 +1687,7 @@
     "defaultBrowserType": "chromium"
   },
   "Desktop Edge HiDPI": {
-    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36 Edg/128.0.6613.7",
+    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36 Edg/140.0.7339.186",
     "screen": {
       "width": 1792,
       "height": 1120
@@ -1592,7 +1702,7 @@
     "defaultBrowserType": "chromium"
   },
   "Desktop Firefox HiDPI": {
-    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0",
+    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:141.0) Gecko/20100101 Firefox/141.0",
     "screen": {
       "width": 1792,
       "height": 1120
@@ -1607,7 +1717,7 @@
     "defaultBrowserType": "firefox"
   },
   "Desktop Safari": {
-    "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
+    "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Safari/605.1.15",
     "screen": {
       "width": 1792,
       "height": 1120
@@ -1622,7 +1732,7 @@
     "defaultBrowserType": "webkit"
   },
   "Desktop Chrome": {
-    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36",
+    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36",
     "screen": {
       "width": 1920,
       "height": 1080
@@ -1637,7 +1747,7 @@
     "defaultBrowserType": "chromium"
   },
   "Desktop Edge": {
-    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.7 Safari/537.36 Edg/128.0.6613.7",
+    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.7339.186 Safari/537.36 Edg/140.0.7339.186",
     "screen": {
       "width": 1920,
       "height": 1080
@@ -1652,7 +1762,7 @@
     "defaultBrowserType": "chromium"
   },
   "Desktop Firefox": {
-    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0",
+    "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:141.0) Gecko/20100101 Firefox/141.0",
     "screen": {
       "width": 1920,
       "height": 1080
diff --git a/packages/playwright-core/src/server/dialog.ts b/packages/playwright-core/src/server/dialog.ts
index 51dcfc2fc961e..03a670ba31f15 100644
--- a/packages/playwright-core/src/server/dialog.ts
+++ b/packages/playwright-core/src/server/dialog.ts
@@ -16,9 +16,11 @@
  */
 
 import { assert } from '../utils';
-import type { Page } from './page';
 import { SdkObject } from './instrumentation';
 
+import type { Instrumentation } from './instrumentation';
+import type { Page } from './page';
+
 type OnHandle = (accept: boolean, promptText?: string) => Promise<void>;
 
 export type DialogType = 'alert' | 'beforeunload' | 'confirm' | 'prompt';
@@ -38,7 +40,6 @@ export class Dialog extends SdkObject {
     this._message = message;
     this._onHandle = onHandle;
     this._defaultValue = defaultValue || '';
-    this._page._frameManager.dialogDidOpen(this);
   }
 
   page() {
@@ -60,14 +61,14 @@ export class Dialog extends SdkObject {
   async accept(promptText?: string) {
     assert(!this._handled, 'Cannot accept dialog which is already handled!');
     this._handled = true;
-    this._page._frameManager.dialogWillClose(this);
+    this._page.browserContext.dialogManager.dialogWillClose(this);
     await this._onHandle(true, promptText);
   }
 
   async dismiss() {
     assert(!this._handled, 'Cannot dismiss dialog which is already handled!');
     this._handled = true;
-    this._page._frameManager.dialogWillClose(this);
+    this._page.browserContext.dialogManager.dialogWillClose(this);
     await this._onHandle(false);
   }
 
@@ -78,3 +79,56 @@ export class Dialog extends SdkObject {
       await this.dismiss();
   }
 }
+
+export class DialogManager {
+  private _instrumentation: Instrumentation;
+  private _dialogHandlers = new Set<(dialog: Dialog) => boolean>();
+  private _openedDialogs = new Set<Dialog>();
+
+  constructor(instrumentation: Instrumentation) {
+    this._instrumentation = instrumentation;
+  }
+
+  dialogDidOpen(dialog: Dialog) {
+    // Any ongoing evaluations will be stalled until the dialog is closed.
+    for (const frame of dialog.page().frameManager.frames())
+      frame._invalidateNonStallingEvaluations('JavaScript dialog interrupted evaluation');
+    this._openedDialogs.add(dialog);
+    this._instrumentation.onDialog(dialog);
+
+    let hasHandlers = false;
+    for (const handler of this._dialogHandlers) {
+      if (handler(dialog))
+        hasHandlers = true;
+    }
+    if (!hasHandlers)
+      dialog.close().then(() => {});
+  }
+
+  dialogWillClose(dialog: Dialog) {
+    this._openedDialogs.delete(dialog);
+  }
+
+  addDialogHandler(handler: (dialog: Dialog) => boolean) {
+    this._dialogHandlers.add(handler);
+  }
+
+  removeDialogHandler(handler: (dialog: Dialog) => boolean) {
+    this._dialogHandlers.delete(handler);
+    if (!this._dialogHandlers.size) {
+      for (const dialog of this._openedDialogs)
+        dialog.close().catch(() => {});
+    }
+  }
+
+  hasOpenDialogsForPage(page: Page) {
+    return [...this._openedDialogs].some(dialog => dialog.page() === page);
+  }
+
+  async closeBeforeUnloadDialogs() {
+    await Promise.all([...this._openedDialogs].map(async dialog => {
+      if (dialog.type() === 'beforeunload')
+        await dialog.dismiss();
+    }));
+  }
+}
diff --git a/packages/playwright-core/src/server/dispatchers/DEPS.list b/packages/playwright-core/src/server/dispatchers/DEPS.list
index 4a9ce35a5a08f..b91f84e960ecb 100644
--- a/packages/playwright-core/src/server/dispatchers/DEPS.list
+++ b/packages/playwright-core/src/server/dispatchers/DEPS.list
@@ -1,6 +1,8 @@
 [*]
-../../common/
+../../generated/
 ../../protocol/
 ../../utils/
+../../utils/isomorphic
+../../utilsBundle.ts
 ../../zipBundle.ts
 ../**
diff --git a/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts b/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts
index 7198229f53f4d..2ee799f2c7a42 100644
--- a/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/androidDispatcher.ts
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
+import { BrowserContextDispatcher } from './browserContextDispatcher';
+import { Dispatcher } from './dispatcher';
+import { AndroidDevice } from '../android/android';
+import { eventsHelper } from '../utils/eventsHelper';
+import { SdkObject } from '../instrumentation';
+
 import type { RootDispatcher } from './dispatcher';
-import { Dispatcher, existingDispatcher } from './dispatcher';
 import type { Android, SocketBackend } from '../android/android';
-import { AndroidDevice } from '../android/android';
 import type * as channels from '@protocol/channels';
-import { BrowserContextDispatcher } from './browserContextDispatcher';
-import type { CallMetadata } from '../instrumentation';
+import type { Progress } from '@protocol/progress';
 
 export class AndroidDispatcher extends Dispatcher<Android, channels.AndroidChannel, RootDispatcher> implements channels.AndroidChannel {
   _type_Android = true;
@@ -28,16 +31,12 @@ export class AndroidDispatcher extends Dispatcher<Android, channels.AndroidChann
     super(scope, android, 'Android', {});
   }
 
-  async devices(params: channels.AndroidDevicesParams): Promise<channels.AndroidDevicesResult> {
-    const devices = await this._object.devices(params);
+  async devices(params: channels.AndroidDevicesParams, progress: Progress): Promise<channels.AndroidDevicesResult> {
+    const devices = await this._object.devices(progress, params);
     return {
       devices: devices.map(d => AndroidDeviceDispatcher.from(this, d))
     };
   }
-
-  async setDefaultTimeoutNoReply(params: channels.AndroidSetDefaultTimeoutNoReplyParams) {
-    this._object.setDefaultTimeout(params.timeout);
-  }
 }
 
 export class AndroidDeviceDispatcher extends Dispatcher<AndroidDevice, channels.AndroidDeviceChannel, AndroidDispatcher> implements channels.AndroidDeviceChannel {
@@ -45,7 +44,7 @@ export class AndroidDeviceDispatcher extends Dispatcher<AndroidDevice, channels.
   _type_AndroidDevice = true;
 
   static from(scope: AndroidDispatcher, device: AndroidDevice): AndroidDeviceDispatcher {
-    const result = existingDispatcher<AndroidDeviceDispatcher>(device);
+    const result = scope.connection.existingDispatcher<AndroidDeviceDispatcher>(device);
     return result || new AndroidDeviceDispatcher(scope, device);
   }
 
@@ -58,55 +57,57 @@ export class AndroidDeviceDispatcher extends Dispatcher<AndroidDevice, channels.
       this._dispatchEvent('webViewAdded', { webView });
     this.addObjectListener(AndroidDevice.Events.WebViewAdded, webView => this._dispatchEvent('webViewAdded', { webView }));
     this.addObjectListener(AndroidDevice.Events.WebViewRemoved, socketName => this._dispatchEvent('webViewRemoved', { socketName }));
-    this.addObjectListener(AndroidDevice.Events.Close, socketName => this._dispatchEvent('close'));
+    this.addObjectListener(AndroidDevice.Events.Close, () => this._dispatchEvent('close'));
   }
 
-  async wait(params: channels.AndroidDeviceWaitParams) {
-    await this._object.send('wait', params);
+  async wait(params: channels.AndroidDeviceWaitParams, progress: Progress) {
+    await progress.race(this._object.send('wait', params));
   }
 
-  async fill(params: channels.AndroidDeviceFillParams) {
-    await this._object.send('click', { selector: params.selector });
-    await this._object.send('fill', params);
+  async fill(params: channels.AndroidDeviceFillParams, progress: Progress) {
+    await progress.race(this._object.send('click', { selector: params.androidSelector }));
+    await progress.race(this._object.send('fill', params));
   }
 
-  async tap(params: channels.AndroidDeviceTapParams) {
-    await this._object.send('click', params);
+  async tap(params: channels.AndroidDeviceTapParams, progress: Progress) {
+    await progress.race(this._object.send('click', params));
   }
 
-  async drag(params: channels.AndroidDeviceDragParams) {
-    await this._object.send('drag', params);
+  async drag(params: channels.AndroidDeviceDragParams, progress: Progress) {
+    await progress.race(this._object.send('drag', params));
   }
 
-  async fling(params: channels.AndroidDeviceFlingParams) {
-    await this._object.send('fling', params);
+  async fling(params: channels.AndroidDeviceFlingParams, progress: Progress) {
+    await progress.race(this._object.send('fling', params));
   }
 
-  async longTap(params: channels.AndroidDeviceLongTapParams) {
-    await this._object.send('longClick', params);
+  async longTap(params: channels.AndroidDeviceLongTapParams, progress: Progress) {
+    await progress.race(this._object.send('longClick', params));
   }
 
-  async pinchClose(params: channels.AndroidDevicePinchCloseParams) {
-    await this._object.send('pinchClose', params);
+  async pinchClose(params: channels.AndroidDevicePinchCloseParams, progress: Progress) {
+    await progress.race(this._object.send('pinchClose', params));
   }
 
-  async pinchOpen(params: channels.AndroidDevicePinchOpenParams) {
-    await this._object.send('pinchOpen', params);
+  async pinchOpen(params: channels.AndroidDevicePinchOpenParams, progress: Progress) {
+    await progress.race(this._object.send('pinchOpen', params));
   }
 
-  async scroll(params: channels.AndroidDeviceScrollParams) {
-    await this._object.send('scroll', params);
+  async scroll(params: channels.AndroidDeviceScrollParams, progress: Progress) {
+    await progress.race(this._object.send('scroll', params));
   }
 
-  async swipe(params: channels.AndroidDeviceSwipeParams) {
-    await this._object.send('swipe', params);
+  async swipe(params: channels.AndroidDeviceSwipeParams, progress: Progress) {
+    await progress.race(this._object.send('swipe', params));
   }
 
-  async info(params: channels.AndroidDeviceTapParams): Promise<channels.AndroidDeviceInfoResult> {
-    return { info: await this._object.send('info', params) };
+  async info(params: channels.AndroidDeviceTapParams, progress: Progress): Promise<channels.AndroidDeviceInfoResult> {
+    const info = await progress.race(this._object.send('info', params));
+    fixupAndroidElementInfo(info);
+    return { info };
   }
 
-  async inputType(params: channels.AndroidDeviceInputTypeParams) {
+  async inputType(params: channels.AndroidDeviceInputTypeParams, progress: Progress) {
     const text = params.text;
     const keyCodes: number[] = [];
     for (let i = 0; i < text.length; ++i) {
@@ -115,70 +116,91 @@ export class AndroidDeviceDispatcher extends Dispatcher<AndroidDevice, channels.
         throw new Error('No mapping for ' + text[i] + ' found');
       keyCodes.push(code);
     }
-    await Promise.all(keyCodes.map(keyCode => this._object.send('inputPress', { keyCode })));
+    await progress.race(Promise.all(keyCodes.map(keyCode => this._object.send('inputPress', { keyCode }))));
   }
 
-  async inputPress(params: channels.AndroidDeviceInputPressParams) {
+  async inputPress(params: channels.AndroidDeviceInputPressParams, progress: Progress) {
     if (!keyMap.has(params.key))
       throw new Error('Unknown key: ' + params.key);
-    await this._object.send('inputPress', { keyCode: keyMap.get(params.key) });
+    await progress.race(this._object.send('inputPress', { keyCode: keyMap.get(params.key) }));
   }
 
-  async inputTap(params: channels.AndroidDeviceInputTapParams) {
-    await this._object.send('inputClick', params);
+  async inputTap(params: channels.AndroidDeviceInputTapParams, progress: Progress) {
+    await progress.race(this._object.send('inputClick', params));
   }
 
-  async inputSwipe(params: channels.AndroidDeviceInputSwipeParams) {
-    await this._object.send('inputSwipe', params);
+  async inputSwipe(params: channels.AndroidDeviceInputSwipeParams, progress: Progress) {
+    await progress.race(this._object.send('inputSwipe', params));
   }
 
-  async inputDrag(params: channels.AndroidDeviceInputDragParams) {
-    await this._object.send('inputDrag', params);
+  async inputDrag(params: channels.AndroidDeviceInputDragParams, progress: Progress) {
+    await progress.race(this._object.send('inputDrag', params));
   }
 
-  async screenshot(params: channels.AndroidDeviceScreenshotParams): Promise<channels.AndroidDeviceScreenshotResult> {
-    return { binary: await this._object.screenshot() };
+  async screenshot(params: channels.AndroidDeviceScreenshotParams, progress: Progress): Promise<channels.AndroidDeviceScreenshotResult> {
+    return { binary: await progress.race(this._object.screenshot()) };
   }
 
-  async shell(params: channels.AndroidDeviceShellParams): Promise<channels.AndroidDeviceShellResult> {
-    return { result: await this._object.shell(params.command) };
+  async shell(params: channels.AndroidDeviceShellParams, progress: Progress): Promise<channels.AndroidDeviceShellResult> {
+    return { result: await progress.race(this._object.shell(params.command)) };
   }
 
-  async open(params: channels.AndroidDeviceOpenParams, metadata: CallMetadata): Promise<channels.AndroidDeviceOpenResult> {
-    const socket = await this._object.open(params.command);
-    return { socket: new AndroidSocketDispatcher(this, socket) };
+  async open(params: channels.AndroidDeviceOpenParams, progress: Progress): Promise<channels.AndroidDeviceOpenResult> {
+    const socket = await this._object.open(progress, params.command);
+    return { socket: new AndroidSocketDispatcher(this, new SocketSdkObject(this._object, socket)) };
   }
 
-  async installApk(params: channels.AndroidDeviceInstallApkParams) {
-    await this._object.installApk(params.file, { args: params.args });
+  async installApk(params: channels.AndroidDeviceInstallApkParams, progress: Progress) {
+    await this._object.installApk(progress, params.file, { args: params.args });
   }
 
-  async push(params: channels.AndroidDevicePushParams) {
-    await this._object.push(params.file, params.path, params.mode);
+  async push(params: channels.AndroidDevicePushParams, progress: Progress) {
+    await progress.race(this._object.push(progress, params.file, params.path, params.mode));
   }
 
-  async launchBrowser(params: channels.AndroidDeviceLaunchBrowserParams): Promise<channels.AndroidDeviceLaunchBrowserResult> {
-    const context = await this._object.launchBrowser(params.pkg, params);
-    return { context: new BrowserContextDispatcher(this, context) };
+  async launchBrowser(params: channels.AndroidDeviceLaunchBrowserParams, progress: Progress): Promise<channels.AndroidDeviceLaunchBrowserResult> {
+    const context = await this._object.launchBrowser(progress, params.pkg, params);
+    return { context: BrowserContextDispatcher.from(this, context) };
   }
 
-  async close(params: channels.AndroidDeviceCloseParams) {
+  async close(params: channels.AndroidDeviceCloseParams, progress: Progress) {
     await this._object.close();
   }
 
-  async setDefaultTimeoutNoReply(params: channels.AndroidDeviceSetDefaultTimeoutNoReplyParams) {
-    this._object.setDefaultTimeout(params.timeout);
+  async connectToWebView(params: channels.AndroidDeviceConnectToWebViewParams, progress: Progress): Promise<channels.AndroidDeviceConnectToWebViewResult> {
+    return { context: BrowserContextDispatcher.from(this, await this._object.connectToWebView(progress, params.socketName)) };
   }
+}
 
-  async connectToWebView(params: channels.AndroidDeviceConnectToWebViewParams): Promise<channels.AndroidDeviceConnectToWebViewResult> {
-    return { context: new BrowserContextDispatcher(this, await this._object.connectToWebView(params.socketName)) };
+class SocketSdkObject extends SdkObject implements SocketBackend {
+  private _socket: SocketBackend;
+  private _eventListeners;
+
+  constructor(parent: SdkObject, socket: SocketBackend) {
+    super(parent, 'socket');
+    this._socket = socket;
+    this._eventListeners = [
+      eventsHelper.addEventListener(socket, 'data', data => this.emit('data', data)),
+      eventsHelper.addEventListener(socket, 'close', () => {
+        eventsHelper.removeEventListeners(this._eventListeners);
+        this.emit('close');
+      }),
+    ];
+  }
+
+  async write(data: Buffer) {
+    await this._socket.write(data);
+  }
+
+  close() {
+    this._socket.close();
   }
 }
 
-export class AndroidSocketDispatcher extends Dispatcher<SocketBackend, channels.AndroidSocketChannel, AndroidDeviceDispatcher> implements channels.AndroidSocketChannel {
+export class AndroidSocketDispatcher extends Dispatcher<SocketSdkObject, channels.AndroidSocketChannel, AndroidDeviceDispatcher> implements channels.AndroidSocketChannel {
   _type_AndroidSocket = true;
 
-  constructor(scope: AndroidDeviceDispatcher, socket: SocketBackend) {
+  constructor(scope: AndroidDeviceDispatcher, socket: SocketSdkObject) {
     super(scope, socket, 'AndroidSocket', {});
     this.addObjectListener('data', (data: Buffer) => this._dispatchEvent('data', { data }));
     this.addObjectListener('close', () => {
@@ -187,11 +209,11 @@ export class AndroidSocketDispatcher extends Dispatcher<SocketBackend, channels.
     });
   }
 
-  async write(params: channels.AndroidSocketWriteParams, metadata: CallMetadata): Promise<void> {
-    await this._object.write(params.data);
+  async write(params: channels.AndroidSocketWriteParams, progress: Progress): Promise<void> {
+    await progress.race(this._object.write(params.data));
   }
 
-  async close(params: channels.AndroidSocketCloseParams, metadata: CallMetadata): Promise<void> {
+  async close(params: channels.AndroidSocketCloseParams, progress: Progress): Promise<void> {
     this._object.close();
   }
 }
@@ -305,3 +327,14 @@ const keyMap = new Map<string, number>([
   ['Copy', 278],
   ['Paste', 279],
 ]);
+
+function fixupAndroidElementInfo(info: channels.AndroidElementInfo) {
+  // Some of the properties are nullable, see https://developer.android.com/reference/androidx/test/uiautomator/UiObject2.
+  info.clazz = info.clazz || '';
+  info.pkg = info.pkg || '';
+  info.res = info.res || '';
+  info.desc = info.desc || '';
+  info.text = info.text || '';
+  for (const child of info.children || [])
+    fixupAndroidElementInfo(child);
+}
diff --git a/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts b/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts
index 1996f117765ae..556b0ae7ec408 100644
--- a/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/artifactDispatcher.ts
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import { Dispatcher, existingDispatcher } from './dispatcher';
-import type { DispatcherScope } from './dispatcher';
-import { StreamDispatcher } from './streamDispatcher';
 import fs from 'fs';
-import { mkdirIfNeeded } from '../../utils/fileUtils';
+
+import { Dispatcher } from './dispatcher';
+import { StreamDispatcher } from './streamDispatcher';
+import { mkdirIfNeeded } from '../utils/fileUtils';
+
+import type { DispatcherScope } from './dispatcher';
 import type { Artifact } from '../artifact';
-import type { CallMetadata } from '../instrumentation';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class ArtifactDispatcher extends Dispatcher<Artifact, channels.ArtifactChannel, DispatcherScope> implements channels.ArtifactChannel {
   _type_Artifact = true;
@@ -33,7 +35,7 @@ export class ArtifactDispatcher extends Dispatcher<Artifact, channels.ArtifactCh
   static fromNullable(parentScope: DispatcherScope, artifact: Artifact): ArtifactDispatcher | undefined {
     if (!artifact)
       return undefined;
-    const result = existingDispatcher<ArtifactDispatcher>(artifact);
+    const result = parentScope.connection.existingDispatcher<ArtifactDispatcher>(artifact);
     return result || new ArtifactDispatcher(parentScope, artifact);
   }
 
@@ -43,13 +45,13 @@ export class ArtifactDispatcher extends Dispatcher<Artifact, channels.ArtifactCh
     });
   }
 
-  async pathAfterFinished(): Promise<channels.ArtifactPathAfterFinishedResult> {
-    const path = await this._object.localPathAfterFinished();
+  async pathAfterFinished(params: channels.ArtifactPathAfterFinishedParams, progress: Progress): Promise<channels.ArtifactPathAfterFinishedResult> {
+    const path = await progress.race(this._object.localPathAfterFinished());
     return { value: path };
   }
 
-  async saveAs(params: channels.ArtifactSaveAsParams): Promise<channels.ArtifactSaveAsResult> {
-    return await new Promise((resolve, reject) => {
+  async saveAs(params: channels.ArtifactSaveAsParams, progress: Progress): Promise<channels.ArtifactSaveAsResult> {
+    return await progress.race(new Promise((resolve, reject) => {
       this._object.saveAs(async (localPath, error) => {
         if (error) {
           reject(error);
@@ -63,11 +65,11 @@ export class ArtifactDispatcher extends Dispatcher<Artifact, channels.ArtifactCh
           reject(e);
         }
       });
-    });
+    }));
   }
 
-  async saveAsStream(): Promise<channels.ArtifactSaveAsStreamResult> {
-    return await new Promise((resolve, reject) => {
+  async saveAsStream(params: channels.ArtifactSaveAsStreamParams, progress: Progress): Promise<channels.ArtifactSaveAsStreamResult> {
+    return await progress.race(new Promise((resolve, reject) => {
       this._object.saveAs(async (localPath, error) => {
         if (error) {
           reject(error);
@@ -88,27 +90,27 @@ export class ArtifactDispatcher extends Dispatcher<Artifact, channels.ArtifactCh
           reject(e);
         }
       });
-    });
+    }));
   }
 
-  async stream(): Promise<channels.ArtifactStreamResult> {
-    const fileName = await this._object.localPathAfterFinished();
+  async stream(params: channels.ArtifactStreamParams, progress: Progress): Promise<channels.ArtifactStreamResult> {
+    const fileName = await progress.race(this._object.localPathAfterFinished());
     const readable = fs.createReadStream(fileName, { highWaterMark: 1024 * 1024 });
     return { stream: new StreamDispatcher(this, readable) };
   }
 
-  async failure(): Promise<channels.ArtifactFailureResult> {
-    const error = await this._object.failureError();
+  async failure(params: channels.ArtifactFailureParams, progress: Progress): Promise<channels.ArtifactFailureResult> {
+    const error = await progress.race(this._object.failureError());
     return { error: error || undefined };
   }
 
-  async cancel(): Promise<void> {
-    await this._object.cancel();
+  async cancel(params: channels.ArtifactCancelParams, progress: Progress): Promise<void> {
+    await progress.race(this._object.cancel());
   }
 
-  async delete(_: any, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
-    await this._object.delete();
+  async delete(params: channels.ArtifactDeleteParams, progress: Progress): Promise<void> {
+    progress.metadata.potentiallyClosesScope = true;
+    await progress.race(this._object.delete());
     this._dispose();
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts
index 5654950360048..cc779595e1992 100644
--- a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts
@@ -14,56 +14,87 @@
  * limitations under the License.
  */
 
+import fs from 'fs';
+import path from 'path';
+
 import { BrowserContext } from '../browserContext';
-import { Dispatcher, existingDispatcher } from './dispatcher';
-import type { DispatcherScope } from './dispatcher';
-import { PageDispatcher, BindingCallDispatcher, WorkerDispatcher } from './pageDispatcher';
-import type { FrameDispatcher } from './frameDispatcher';
-import type * as channels from '@protocol/channels';
-import { RouteDispatcher, RequestDispatcher, ResponseDispatcher, APIRequestContextDispatcher } from './networkDispatchers';
-import { CRBrowserContext } from '../chromium/crBrowser';
-import { CDPSessionDispatcher } from './cdpSessionDispatcher';
-import { Recorder } from '../recorder';
-import type { CallMetadata } from '../instrumentation';
 import { ArtifactDispatcher } from './artifactDispatcher';
-import type { Artifact } from '../artifact';
-import type { Request, Response } from '../network';
+import { CDPSessionDispatcher } from './cdpSessionDispatcher';
+import { DialogDispatcher } from './dialogDispatcher';
+import { Dispatcher } from './dispatcher';
+import { ElementHandleDispatcher } from './elementHandlerDispatcher';
+import { FrameDispatcher } from './frameDispatcher';
+import { JSHandleDispatcher } from './jsHandleDispatcher';
+import { APIRequestContextDispatcher, RequestDispatcher, ResponseDispatcher, RouteDispatcher } from './networkDispatchers';
+import { BindingCallDispatcher, PageDispatcher, WorkerDispatcher } from './pageDispatcher';
+import { CRBrowserContext } from '../chromium/crBrowser';
+import { serializeError } from '../errors';
 import { TracingDispatcher } from './tracingDispatcher';
-import * as fs from 'fs';
-import * as path from 'path';
-import { createGuid, urlMatches } from '../../utils';
+import { WebSocketRouteDispatcher } from './webSocketRouteDispatcher';
 import { WritableStreamDispatcher } from './writableStreamDispatcher';
-import { DialogDispatcher } from './dialogDispatcher';
-import type { Page } from '../page';
-import type { Dialog } from '../dialog';
+import { createGuid } from '../utils/crypto';
+import { urlMatches } from '../../utils/isomorphic/urlMatch';
+import { Recorder } from '../recorder';
+import { RecorderApp } from '../recorder/recorderApp';
+
+import type { Artifact } from '../artifact';
 import type { ConsoleMessage } from '../console';
-import { serializeError } from '../errors';
-import { ElementHandleDispatcher } from './elementHandlerDispatcher';
+import type { Dialog } from '../dialog';
+import type { Request, Response, RouteHandler } from '../network';
+import type { InitScript, Page, PageBinding } from '../page';
+import type { DispatcherScope } from './dispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channels.BrowserContextChannel, DispatcherScope> implements channels.BrowserContextChannel {
   _type_EventTarget = true;
   _type_BrowserContext = true;
   private _context: BrowserContext;
   private _subscriptions = new Set<channels.BrowserContextUpdateSubscriptionParams['event']>();
+  _webSocketInterceptionPatterns: channels.BrowserContextSetWebSocketInterceptionPatternsParams['patterns'] = [];
+  private _bindings: PageBinding[] = [];
+  private _initScripts: InitScript[] = [];
+  private _dialogHandler: (dialog: Dialog) => boolean;
+  private _clockPaused = false;
+  private _requestInterceptor: RouteHandler;
+  private _interceptionUrlMatchers: (string | RegExp)[] = [];
+  private _routeWebSocketInitScript: InitScript | undefined;
+
+  static from(parentScope: DispatcherScope, context: BrowserContext): BrowserContextDispatcher {
+    const result = parentScope.connection.existingDispatcher<BrowserContextDispatcher>(context);
+    return result || new BrowserContextDispatcher(parentScope, context);
+  }
 
-  constructor(parentScope: DispatcherScope, context: BrowserContext) {
+  private constructor(parentScope: DispatcherScope, context: BrowserContext) {
     // We will reparent these to the context below.
     const requestContext = APIRequestContextDispatcher.from(parentScope as BrowserContextDispatcher, context.fetchRequest);
     const tracing = TracingDispatcher.from(parentScope as BrowserContextDispatcher, context.tracing);
 
     super(parentScope, context, 'BrowserContext', {
       isChromium: context._browser.options.isChromium,
-      isLocalBrowserOnServer: context._browser._isCollocatedWithServer,
       requestContext,
       tracing,
+      options: context._options,
     });
 
     this.adopt(requestContext);
     this.adopt(tracing);
 
+    this._requestInterceptor = (route, request) => {
+      const matchesSome = this._interceptionUrlMatchers.some(urlMatch => urlMatches(this._context._options.baseURL, request.url(), urlMatch));
+      // If there is already a dispatcher, that means we've already routed this request through page.
+      // Client expects a single `route` event, either on the page or on the context, so we can just fallback here.
+      const routeDispatcher = this.connection.existingDispatcher<RouteDispatcher>(route);
+      if (!matchesSome || routeDispatcher) {
+        route.continue({ isFallback: true }).catch(() => {});
+        return;
+      }
+      this._dispatchEvent('route', { route: new RouteDispatcher(RequestDispatcher.from(this, request), route) });
+    };
+
     this._context = context;
-    // Note: when launching persistent context, dispatcher is created very late,
-    // so we can already have pages, videos and everything else.
+    // Note: when launching persistent context, or connecting to an existing browser,
+    // dispatcher is created very late, so we can already have pages, videos and everything else.
 
     const onVideo = (artifact: Artifact) => {
       // Note: Video must outlive Page and BrowserContext, so that client can saveAs it
@@ -97,17 +128,23 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
           page: pageDispatcher,
           type: message.type(),
           text: message.text(),
-          args: message.args().map(a => ElementHandleDispatcher.fromJSHandle(pageDispatcher, a)),
+          args: message.args().map(a => {
+            const elementHandle = a.asElement();
+            if (elementHandle)
+              return ElementHandleDispatcher.from(FrameDispatcher.from(this, elementHandle._frame), elementHandle);
+            return JSHandleDispatcher.fromJSHandle(pageDispatcher, a);
+          }),
           location: message.location(),
         });
       }
     });
-    this.addObjectListener(BrowserContext.Events.Dialog, (dialog: Dialog) => {
-      if (this._shouldDispatchEvent(dialog.page(), 'dialog'))
-        this._dispatchEvent('dialog', { dialog: new DialogDispatcher(this, dialog) });
-      else
-        dialog.close().catch(() => {});
-    });
+    this._dialogHandler = dialog => {
+      if (!this._shouldDispatchEvent(dialog.page(), 'dialog'))
+        return false;
+      this._dispatchEvent('dialog', { dialog: new DialogDispatcher(this, dialog) });
+      return true;
+    };
+    context.dialogManager.addDialogHandler(this._dialogHandler);
 
     if (context._browser.options.name === 'chromium') {
       for (const page of (context as CRBrowserContext).backgroundPages())
@@ -123,7 +160,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
       // - We are redirected from a reported request so that redirectedTo was updated on client.
       // - We are a navigation request and dispatcher will be reported as a part of the goto return value and newDocument param anyways.
       //   By the time requestFinished is triggered to update the request, we should have a request on the client already.
-      const redirectFromDispatcher = request.redirectedFrom() && existingDispatcher(request.redirectedFrom());
+      const redirectFromDispatcher = request.redirectedFrom() && this.connection.existingDispatcher(request.redirectedFrom());
       if (!redirectFromDispatcher && !this._shouldDispatchNetworkEvent(request, 'request') && !request.isNavigationRequest())
         return;
       const requestDispatcher = RequestDispatcher.from(this, request);
@@ -133,7 +170,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
       });
     });
     this.addObjectListener(BrowserContext.Events.Response, (response: Response) => {
-      const requestDispatcher = existingDispatcher<RequestDispatcher>(response.request());
+      const requestDispatcher = this.connection.existingDispatcher<RequestDispatcher>(response.request());
       if (!requestDispatcher && !this._shouldDispatchNetworkEvent(response.request(), 'response'))
         return;
       this._dispatchEvent('response', {
@@ -142,7 +179,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
       });
     });
     this.addObjectListener(BrowserContext.Events.RequestFailed, (request: Request) => {
-      const requestDispatcher = existingDispatcher<RequestDispatcher>(request);
+      const requestDispatcher = this.connection.existingDispatcher<RequestDispatcher>(request);
       if (!requestDispatcher && !this._shouldDispatchNetworkEvent(request, 'requestFailed'))
         return;
       this._dispatchEvent('requestFailed', {
@@ -153,7 +190,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
       });
     });
     this.addObjectListener(BrowserContext.Events.RequestFinished, ({ request, response }: { request: Request, response: Response | null }) => {
-      const requestDispatcher = existingDispatcher<RequestDispatcher>(request);
+      const requestDispatcher = this.connection.existingDispatcher<RequestDispatcher>(request);
       if (!requestDispatcher && !this._shouldDispatchNetworkEvent(request, 'requestFinished'))
         return;
       this._dispatchEvent('requestFinished', {
@@ -163,6 +200,9 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
         page: PageDispatcher.fromNullable(this, request.frame()?._page.initializedOrUndefined()),
       });
     });
+    this.addObjectListener(BrowserContext.Events.RecorderEvent, ({ event, data, page, code }: { event: 'actionAdded' | 'actionUpdated' | 'signalAdded', data: any, page: Page, code: string }) => {
+      this._dispatchEvent('recorderEvent', { event, data, code, page: PageDispatcher.from(this, page) });
+    });
   }
 
   private _shouldDispatchNetworkEvent(request: Request, event: channels.BrowserContextUpdateSubscriptionParams['event'] & channels.PageUpdateSubscriptionParams['event']): boolean {
@@ -172,38 +212,30 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
   private _shouldDispatchEvent(page: Page | undefined, event: channels.BrowserContextUpdateSubscriptionParams['event'] & channels.PageUpdateSubscriptionParams['event']): boolean {
     if (this._subscriptions.has(event))
       return true;
-    const pageDispatcher = page ? existingDispatcher<PageDispatcher>(page) : undefined;
+    const pageDispatcher = page ? this.connection.existingDispatcher<PageDispatcher>(page) : undefined;
     if (pageDispatcher?._subscriptions.has(event))
       return true;
     return false;
   }
 
-  async createTempFiles(params: channels.BrowserContextCreateTempFilesParams): Promise<channels.BrowserContextCreateTempFilesResult> {
+  async createTempFiles(params: channels.BrowserContextCreateTempFilesParams, progress: Progress): Promise<channels.BrowserContextCreateTempFilesResult> {
     const dir = this._context._browser.options.artifactsDir;
     const tmpDir = path.join(dir, 'upload-' + createGuid());
     const tempDirWithRootName = params.rootDirName ? path.join(tmpDir, path.basename(params.rootDirName)) : tmpDir;
-    await fs.promises.mkdir(tempDirWithRootName, { recursive: true });
+    await progress.race(fs.promises.mkdir(tempDirWithRootName, { recursive: true }));
     this._context._tempDirs.push(tmpDir);
     return {
       rootDir: params.rootDirName ? new WritableStreamDispatcher(this, tempDirWithRootName) : undefined,
       writableStreams: await Promise.all(params.items.map(async item => {
-        await fs.promises.mkdir(path.dirname(path.join(tempDirWithRootName, item.name)), { recursive: true });
+        await progress.race(fs.promises.mkdir(path.dirname(path.join(tempDirWithRootName, item.name)), { recursive: true }));
         const file = fs.createWriteStream(path.join(tempDirWithRootName, item.name));
         return new WritableStreamDispatcher(this, file, item.lastModifiedMs);
       }))
     };
   }
 
-  async setDefaultNavigationTimeoutNoReply(params: channels.BrowserContextSetDefaultNavigationTimeoutNoReplyParams) {
-    this._context.setDefaultNavigationTimeout(params.timeout);
-  }
-
-  async setDefaultTimeoutNoReply(params: channels.BrowserContextSetDefaultTimeoutNoReplyParams) {
-    this._context.setDefaultTimeout(params.timeout);
-  }
-
-  async exposeBinding(params: channels.BrowserContextExposeBindingParams): Promise<void> {
-    await this._context.exposeBinding(params.name, !!params.needsHandle, (source, ...args) => {
+  async exposeBinding(params: channels.BrowserContextExposeBindingParams, progress: Progress): Promise<void> {
+    const binding = await this._context.exposeBinding(progress, params.name, !!params.needsHandle, (source, ...args) => {
       // When reusing the context, we might have some bindings called late enough,
       // after context and page dispatchers have been disposed.
       if (this._disposed)
@@ -213,21 +245,24 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
       this._dispatchEvent('bindingCall', { binding });
       return binding.promise();
     });
+    this._bindings.push(binding);
   }
 
-  async newPage(params: channels.BrowserContextNewPageParams, metadata: CallMetadata): Promise<channels.BrowserContextNewPageResult> {
-    return { page: PageDispatcher.from(this, await this._context.newPage(metadata)) };
+  async newPage(params: channels.BrowserContextNewPageParams, progress: Progress): Promise<channels.BrowserContextNewPageResult> {
+    return { page: PageDispatcher.from(this, await this._context.newPage(progress)) };
   }
 
-  async cookies(params: channels.BrowserContextCookiesParams): Promise<channels.BrowserContextCookiesResult> {
-    return { cookies: await this._context.cookies(params.urls) };
+  async cookies(params: channels.BrowserContextCookiesParams, progress: Progress): Promise<channels.BrowserContextCookiesResult> {
+    return { cookies: await progress.race(this._context.cookies(params.urls)) };
   }
 
-  async addCookies(params: channels.BrowserContextAddCookiesParams): Promise<void> {
+  async addCookies(params: channels.BrowserContextAddCookiesParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     await this._context.addCookies(params.cookies);
   }
 
-  async clearCookies(params: channels.BrowserContextClearCookiesParams): Promise<void> {
+  async clearCookies(params: channels.BrowserContextClearCookiesParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     const nameRe = params.nameRegexSource !== undefined && params.nameRegexFlags !== undefined ? new RegExp(params.nameRegexSource, params.nameRegexFlags) : undefined;
     const domainRe = params.domainRegexSource !== undefined && params.domainRegexFlags !== undefined ? new RegExp(params.domainRegexSource, params.domainRegexFlags) : undefined;
     const pathRe = params.pathRegexSource !== undefined && params.pathRegexFlags !== undefined ? new RegExp(params.pathRegexSource, params.pathRegexFlags) : undefined;
@@ -238,125 +273,166 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
     });
   }
 
-  async grantPermissions(params: channels.BrowserContextGrantPermissionsParams): Promise<void> {
+  async grantPermissions(params: channels.BrowserContextGrantPermissionsParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     await this._context.grantPermissions(params.permissions, params.origin);
   }
 
-  async clearPermissions(): Promise<void> {
+  async clearPermissions(params: channels.BrowserContextClearPermissionsParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     await this._context.clearPermissions();
   }
 
-  async setGeolocation(params: channels.BrowserContextSetGeolocationParams): Promise<void> {
+  async setGeolocation(params: channels.BrowserContextSetGeolocationParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     await this._context.setGeolocation(params.geolocation);
   }
 
-  async setExtraHTTPHeaders(params: channels.BrowserContextSetExtraHTTPHeadersParams): Promise<void> {
-    await this._context.setExtraHTTPHeaders(params.headers);
+  async setExtraHTTPHeaders(params: channels.BrowserContextSetExtraHTTPHeadersParams, progress: Progress): Promise<void> {
+    await this._context.setExtraHTTPHeaders(progress, params.headers);
   }
 
-  async setOffline(params: channels.BrowserContextSetOfflineParams): Promise<void> {
-    await this._context.setOffline(params.offline);
+  async setOffline(params: channels.BrowserContextSetOfflineParams, progress: Progress): Promise<void> {
+    await this._context.setOffline(progress, params.offline);
   }
 
-  async setHTTPCredentials(params: channels.BrowserContextSetHTTPCredentialsParams): Promise<void> {
-    await this._context.setHTTPCredentials(params.httpCredentials);
+  async setHTTPCredentials(params: channels.BrowserContextSetHTTPCredentialsParams, progress: Progress): Promise<void> {
+    // Note: this operation is deprecated, so we do not properly cleanup.
+    await progress.race(this._context.setHTTPCredentials(params.httpCredentials));
   }
 
-  async addInitScript(params: channels.BrowserContextAddInitScriptParams): Promise<void> {
-    await this._context.addInitScript(params.source);
+  async addInitScript(params: channels.BrowserContextAddInitScriptParams, progress: Progress): Promise<void> {
+    this._initScripts.push(await this._context.addInitScript(progress, params.source));
   }
 
-  async setNetworkInterceptionPatterns(params: channels.BrowserContextSetNetworkInterceptionPatternsParams): Promise<void> {
+  async setNetworkInterceptionPatterns(params: channels.BrowserContextSetNetworkInterceptionPatternsParams, progress: Progress): Promise<void> {
+    const hadMatchers = this._interceptionUrlMatchers.length > 0;
     if (!params.patterns.length) {
-      await this._context.setRequestInterceptor(undefined);
-      return;
+      // Note: it is important to remove the interceptor when there are no patterns,
+      // because that disables the slow-path interception in the browser itself.
+      if (hadMatchers)
+        await this._context.removeRequestInterceptor(this._requestInterceptor);
+      this._interceptionUrlMatchers = [];
+    } else {
+      this._interceptionUrlMatchers = params.patterns.map(pattern => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags!) : pattern.glob!);
+      if (!hadMatchers)
+        await this._context.addRequestInterceptor(progress, this._requestInterceptor);
     }
-    const urlMatchers = params.patterns.map(pattern => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags!) : pattern.glob!);
-    await this._context.setRequestInterceptor((route, request) => {
-      const matchesSome = urlMatchers.some(urlMatch => urlMatches(this._context._options.baseURL, request.url(), urlMatch));
-      if (!matchesSome)
-        return false;
-      this._dispatchEvent('route', { route: RouteDispatcher.from(RequestDispatcher.from(this, request), route) });
-      return true;
-    });
   }
 
-  async storageState(params: channels.BrowserContextStorageStateParams, metadata: CallMetadata): Promise<channels.BrowserContextStorageStateResult> {
-    return await this._context.storageState();
+  async setWebSocketInterceptionPatterns(params: channels.PageSetWebSocketInterceptionPatternsParams, progress: Progress): Promise<void> {
+    this._webSocketInterceptionPatterns = params.patterns;
+    if (params.patterns.length && !this._routeWebSocketInitScript)
+      this._routeWebSocketInitScript = await WebSocketRouteDispatcher.install(progress, this.connection, this._context);
+  }
+
+  async storageState(params: channels.BrowserContextStorageStateParams, progress: Progress): Promise<channels.BrowserContextStorageStateResult> {
+    return await progress.race(this._context.storageState(progress, params.indexedDB));
   }
 
-  async close(params: channels.BrowserContextCloseParams, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
+  async close(params: channels.BrowserContextCloseParams, progress: Progress): Promise<void> {
+    progress.metadata.potentiallyClosesScope = true;
     await this._context.close(params);
   }
 
-  async recorderSupplementEnable(params: channels.BrowserContextRecorderSupplementEnableParams): Promise<void> {
-    await Recorder.show(this._context, params);
+  async enableRecorder(params: channels.BrowserContextEnableRecorderParams, progress: Progress): Promise<void> {
+    await RecorderApp.show(this._context, params);
+  }
+
+  async disableRecorder(params: channels.BrowserContextDisableRecorderParams, progress: Progress): Promise<void> {
+    const recorder = Recorder.existingForContext(this._context);
+    if (recorder)
+      recorder.setMode('none');
   }
 
-  async pause(params: channels.BrowserContextPauseParams, metadata: CallMetadata) {
+  async pause(params: channels.BrowserContextPauseParams, progress: Progress) {
     // Debugger will take care of this.
   }
 
-  async newCDPSession(params: channels.BrowserContextNewCDPSessionParams): Promise<channels.BrowserContextNewCDPSessionResult> {
+  async newCDPSession(params: channels.BrowserContextNewCDPSessionParams, progress: Progress): Promise<channels.BrowserContextNewCDPSessionResult> {
     if (!this._object._browser.options.isChromium)
       throw new Error(`CDP session is only available in Chromium`);
     if (!params.page && !params.frame || params.page && params.frame)
       throw new Error(`CDP session must be initiated with either Page or Frame, not none or both`);
     const crBrowserContext = this._object as CRBrowserContext;
-    return { session: new CDPSessionDispatcher(this, await crBrowserContext.newCDPSession((params.page ? params.page as PageDispatcher : params.frame as FrameDispatcher)._object)) };
+    return { session: new CDPSessionDispatcher(this, await progress.race(crBrowserContext.newCDPSession((params.page ? params.page as PageDispatcher : params.frame as FrameDispatcher)._object))) };
   }
 
-  async harStart(params: channels.BrowserContextHarStartParams): Promise<channels.BrowserContextHarStartResult> {
-    const harId = await this._context._harStart(params.page ? (params.page as PageDispatcher)._object : null, params.options);
+  async harStart(params: channels.BrowserContextHarStartParams, progress: Progress): Promise<channels.BrowserContextHarStartResult> {
+    const harId = this._context.harStart(params.page ? (params.page as PageDispatcher)._object : null, params.options);
     return { harId };
   }
 
-  async harExport(params: channels.BrowserContextHarExportParams): Promise<channels.BrowserContextHarExportResult> {
-    const artifact = await this._context._harExport(params.harId);
+  async harExport(params: channels.BrowserContextHarExportParams, progress: Progress): Promise<channels.BrowserContextHarExportResult> {
+    const artifact = await progress.race(this._context.harExport(params.harId));
     if (!artifact)
       throw new Error('No HAR artifact. Ensure record.harPath is set.');
     return { artifact: ArtifactDispatcher.from(this, artifact) };
   }
 
-  async clockFastForward(params: channels.BrowserContextClockFastForwardParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockFastForwardResult> {
-    await this._context.clock.fastForward(params.ticksString ?? params.ticksNumber ?? 0);
+  async clockFastForward(params: channels.BrowserContextClockFastForwardParams, progress: Progress): Promise<channels.BrowserContextClockFastForwardResult> {
+    await this._context.clock.fastForward(progress, params.ticksString ?? params.ticksNumber ?? 0);
   }
 
-  async clockInstall(params: channels.BrowserContextClockInstallParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockInstallResult> {
-    await this._context.clock.install(params.timeString ?? params.timeNumber ?? undefined);
+  async clockInstall(params: channels.BrowserContextClockInstallParams, progress: Progress): Promise<channels.BrowserContextClockInstallResult> {
+    await this._context.clock.install(progress, params.timeString ?? params.timeNumber ?? undefined);
   }
 
-  async clockPauseAt(params: channels.BrowserContextClockPauseAtParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockPauseAtResult> {
-    await this._context.clock.pauseAt(params.timeString ?? params.timeNumber ?? 0);
+  async clockPauseAt(params: channels.BrowserContextClockPauseAtParams, progress: Progress): Promise<channels.BrowserContextClockPauseAtResult> {
+    await this._context.clock.pauseAt(progress, params.timeString ?? params.timeNumber ?? 0);
+    this._clockPaused = true;
   }
 
-  async clockResume(params: channels.BrowserContextClockResumeParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockResumeResult> {
-    await this._context.clock.resume();
+  async clockResume(params: channels.BrowserContextClockResumeParams, progress: Progress): Promise<channels.BrowserContextClockResumeResult> {
+    await this._context.clock.resume(progress);
+    this._clockPaused = false;
   }
 
-  async clockRunFor(params: channels.BrowserContextClockRunForParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockRunForResult> {
-    await this._context.clock.runFor(params.ticksString ?? params.ticksNumber ?? 0);
+  async clockRunFor(params: channels.BrowserContextClockRunForParams, progress: Progress): Promise<channels.BrowserContextClockRunForResult> {
+    await this._context.clock.runFor(progress, params.ticksString ?? params.ticksNumber ?? 0);
   }
 
-  async clockSetFixedTime(params: channels.BrowserContextClockSetFixedTimeParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockSetFixedTimeResult> {
-    await this._context.clock.setFixedTime(params.timeString ?? params.timeNumber ?? 0);
+  async clockSetFixedTime(params: channels.BrowserContextClockSetFixedTimeParams, progress: Progress): Promise<channels.BrowserContextClockSetFixedTimeResult> {
+    await this._context.clock.setFixedTime(progress, params.timeString ?? params.timeNumber ?? 0);
   }
 
-  async clockSetSystemTime(params: channels.BrowserContextClockSetSystemTimeParams, metadata?: CallMetadata | undefined): Promise<channels.BrowserContextClockSetSystemTimeResult> {
-    await this._context.clock.setSystemTime(params.timeString ?? params.timeNumber ?? 0);
+  async clockSetSystemTime(params: channels.BrowserContextClockSetSystemTimeParams, progress: Progress): Promise<channels.BrowserContextClockSetSystemTimeResult> {
+    await this._context.clock.setSystemTime(progress, params.timeString ?? params.timeNumber ?? 0);
   }
 
-  async updateSubscription(params: channels.BrowserContextUpdateSubscriptionParams): Promise<void> {
+  async updateSubscription(params: channels.BrowserContextUpdateSubscriptionParams, progress: Progress): Promise<void> {
     if (params.enabled)
       this._subscriptions.add(params.event);
     else
       this._subscriptions.delete(params.event);
   }
 
+  async registerSelectorEngine(params: channels.BrowserContextRegisterSelectorEngineParams, progress: Progress): Promise<void> {
+    this._object.selectors().register(params.selectorEngine);
+  }
+
+  async setTestIdAttributeName(params: channels.BrowserContextSetTestIdAttributeNameParams, progress: Progress): Promise<void> {
+    this._object.selectors().setTestIdAttributeName(params.testIdAttributeName);
+  }
+
   override _onDispose() {
     // Avoid protocol calls for the closed context.
-    if (!this._context.isClosingOrClosed())
-      this._context.setRequestInterceptor(undefined).catch(() => {});
+    if (this._context.isClosingOrClosed())
+      return;
+
+    // Cleanup properly and leave the page in a good state. Other clients may still connect and use it.
+    this._context.dialogManager.removeDialogHandler(this._dialogHandler);
+    this._interceptionUrlMatchers = [];
+    this._context.removeRequestInterceptor(this._requestInterceptor).catch(() => {});
+    this._context.removeExposedBindings(this._bindings).catch(() => {});
+    this._bindings = [];
+    this._context.removeInitScripts(this._initScripts).catch(() => {});
+    this._initScripts = [];
+    if (this._routeWebSocketInitScript)
+      WebSocketRouteDispatcher.uninstall(this.connection, this._context, this._routeWebSocketInitScript).catch(() => {});
+    this._routeWebSocketInitScript = undefined;
+    if (this._clockPaused)
+      this._context.clock.resumeNoReply();
+    this._clockPaused = false;
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts
index 99ce5f961f570..bda9e1f42650d 100644
--- a/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/browserDispatcher.ts
@@ -15,26 +15,42 @@
  */
 
 import { Browser } from '../browser';
-import type * as channels from '@protocol/channels';
 import { BrowserContextDispatcher } from './browserContextDispatcher';
 import { CDPSessionDispatcher } from './cdpSessionDispatcher';
-import { existingDispatcher } from './dispatcher';
-import type { RootDispatcher } from './dispatcher';
 import { Dispatcher } from './dispatcher';
-import type { CRBrowser } from '../chromium/crBrowser';
-import type { PageDispatcher } from './pageDispatcher';
-import type { CallMetadata } from '../instrumentation';
 import { BrowserContext } from '../browserContext';
-import { Selectors } from '../selectors';
-import type { BrowserTypeDispatcher } from './browserTypeDispatcher';
 import { ArtifactDispatcher } from './artifactDispatcher';
 
+import type { BrowserTypeDispatcher } from './browserTypeDispatcher';
+import type { PageDispatcher } from './pageDispatcher';
+import type { CRBrowser } from '../chromium/crBrowser';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+
+type BrowserDispatcherOptions = {
+  // Do not allow to close this browser.
+  ignoreStopAndKill?: boolean,
+  // Only expose browser contexts created by this dispatcher. By default, all contexts are exposed.
+  isolateContexts?: boolean,
+};
+
 export class BrowserDispatcher extends Dispatcher<Browser, channels.BrowserChannel, BrowserTypeDispatcher> implements channels.BrowserChannel {
   _type_Browser = true;
+  private _options: BrowserDispatcherOptions;
+  private _isolatedContexts = new Set<BrowserContext>();
 
-  constructor(scope: BrowserTypeDispatcher, browser: Browser) {
+  constructor(scope: BrowserTypeDispatcher, browser: Browser, options: BrowserDispatcherOptions = {}) {
     super(scope, browser, 'Browser', { version: browser.version(), name: browser.options.name });
-    this.addObjectListener(Browser.Events.Disconnected, () => this._didClose());
+    this._options = options;
+
+    if (!options.isolateContexts) {
+      this.addObjectListener(Browser.Events.Context, (context: BrowserContext) => this._dispatchEvent('context', { context: BrowserContextDispatcher.from(this, context) }));
+      this.addObjectListener(Browser.Events.Disconnected, () => this._didClose());
+      if (browser._defaultContext)
+        this._dispatchEvent('context', { context: BrowserContextDispatcher.from(this, browser._defaultContext) });
+      for (const context of browser.contexts())
+        this._dispatchEvent('context', { context: BrowserContextDispatcher.from(this, context) });
+    }
   }
 
   _didClose() {
@@ -42,26 +58,51 @@ export class BrowserDispatcher extends Dispatcher<Browser, channels.BrowserChann
     this._dispose();
   }
 
-  async newContext(params: channels.BrowserNewContextParams, metadata: CallMetadata): Promise<channels.BrowserNewContextResult> {
-    const context = await this._object.newContext(metadata, params);
-    return { context: new BrowserContextDispatcher(this, context) };
+  async newContext(params: channels.BrowserNewContextParams, progress: Progress): Promise<channels.BrowserNewContextResult> {
+    if (params.recordVideo && this._object.attribution.playwright.options.isServer)
+      params.recordVideo.dir = this._object.options.artifactsDir;
+
+    if (!this._options.isolateContexts) {
+      const context = await this._object.newContext(progress, params);
+      const contextDispatcher = BrowserContextDispatcher.from(this, context);
+      return { context: contextDispatcher };
+    }
+
+    const context = await this._object.newContext(progress, params);
+    this._isolatedContexts.add(context);
+    context.on(BrowserContext.Events.Close, () => this._isolatedContexts.delete(context));
+    const contextDispatcher = BrowserContextDispatcher.from(this, context);
+    this._dispatchEvent('context', { context: contextDispatcher });
+    return { context: contextDispatcher };
   }
 
-  async newContextForReuse(params: channels.BrowserNewContextForReuseParams, metadata: CallMetadata): Promise<channels.BrowserNewContextForReuseResult> {
-    return await newContextForReuse(this._object, this, params, null, metadata);
+  async newContextForReuse(params: channels.BrowserNewContextForReuseParams, progress: Progress): Promise<channels.BrowserNewContextForReuseResult> {
+    const context = await this._object.newContextForReuse(progress, params);
+    const contextDispatcher = BrowserContextDispatcher.from(this, context);
+    this._dispatchEvent('context', { context: contextDispatcher });
+    return { context: contextDispatcher };
   }
 
-  async stopPendingOperations(params: channels.BrowserStopPendingOperationsParams, metadata: CallMetadata): Promise<channels.BrowserStopPendingOperationsResult> {
-    await this._object.stopPendingOperations(params.reason);
+  async disconnectFromReusedContext(params: channels.BrowserDisconnectFromReusedContextParams, progress: Progress): Promise<void> {
+    const context = this._object.contextForReuse();
+    const contextDispatcher = context ? this.connection.existingDispatcher<BrowserContextDispatcher>(context) : undefined;
+    if (contextDispatcher) {
+      await contextDispatcher.stopPendingOperations(new Error(params.reason));
+      contextDispatcher._dispose();
+    }
   }
 
-  async close(params: channels.BrowserCloseParams, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
+  async close(params: channels.BrowserCloseParams, progress: Progress): Promise<void> {
+    if (this._options.ignoreStopAndKill)
+      return;
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.close(params);
   }
 
-  async killForTests(_: any, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
+  async killForTests(params: channels.BrowserKillForTestsParams, progress: Progress): Promise<void> {
+    if (this._options.ignoreStopAndKill)
+      return;
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.killForTests();
   }
 
@@ -69,86 +110,24 @@ export class BrowserDispatcher extends Dispatcher<Browser, channels.BrowserChann
     return { userAgent: this._object.userAgent() };
   }
 
-  async newBrowserCDPSession(): Promise<channels.BrowserNewBrowserCDPSessionResult> {
+  async newBrowserCDPSession(params: channels.BrowserNewBrowserCDPSessionParams, progress: Progress): Promise<channels.BrowserNewBrowserCDPSessionResult> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     if (!this._object.options.isChromium)
       throw new Error(`CDP session is only available in Chromium`);
     const crBrowser = this._object as CRBrowser;
     return { session: new CDPSessionDispatcher(this, await crBrowser.newBrowserCDPSession()) };
   }
 
-  async startTracing(params: channels.BrowserStartTracingParams): Promise<void> {
-    if (!this._object.options.isChromium)
-      throw new Error(`Tracing is only available in Chromium`);
-    const crBrowser = this._object as CRBrowser;
-    await crBrowser.startTracing(params.page ? (params.page as PageDispatcher)._object : undefined, params);
-  }
-
-  async stopTracing(): Promise<channels.BrowserStopTracingResult> {
-    if (!this._object.options.isChromium)
-      throw new Error(`Tracing is only available in Chromium`);
-    const crBrowser = this._object as CRBrowser;
-    return { artifact: ArtifactDispatcher.from(this, await crBrowser.stopTracing()) };
-  }
-}
-
-// This class implements multiplexing browser dispatchers over a single Browser instance.
-export class ConnectedBrowserDispatcher extends Dispatcher<Browser, channels.BrowserChannel, RootDispatcher> implements channels.BrowserChannel {
-  _type_Browser = true;
-  private _contexts = new Set<BrowserContext>();
-  readonly selectors: Selectors;
-
-  constructor(scope: RootDispatcher, browser: Browser) {
-    super(scope, browser, 'Browser', { version: browser.version(), name: browser.options.name });
-    // When we have a remotely-connected browser, each client gets a fresh Selector instance,
-    // so that two clients do not interfere between each other.
-    this.selectors = new Selectors();
-  }
-
-  async newContext(params: channels.BrowserNewContextParams, metadata: CallMetadata): Promise<channels.BrowserNewContextResult> {
-    if (params.recordVideo)
-      params.recordVideo.dir = this._object.options.artifactsDir;
-    const context = await this._object.newContext(metadata, params);
-    this._contexts.add(context);
-    context.setSelectors(this.selectors);
-    context.on(BrowserContext.Events.Close, () => this._contexts.delete(context));
-    return { context: new BrowserContextDispatcher(this, context) };
-  }
-
-  async newContextForReuse(params: channels.BrowserNewContextForReuseParams, metadata: CallMetadata): Promise<channels.BrowserNewContextForReuseResult> {
-    return await newContextForReuse(this._object, this as any as BrowserDispatcher, params, this.selectors, metadata);
-  }
-
-  async stopPendingOperations(params: channels.BrowserStopPendingOperationsParams, metadata: CallMetadata): Promise<channels.BrowserStopPendingOperationsResult> {
-    await this._object.stopPendingOperations(params.reason);
-  }
-
-  async close(): Promise<void> {
-    // Client should not send us Browser.close.
-  }
-
-  async killForTests(): Promise<void> {
-    // Client should not send us Browser.killForTests.
-  }
-
-  async defaultUserAgentForTest(): Promise<channels.BrowserDefaultUserAgentForTestResult> {
-    throw new Error('Client should not send us Browser.defaultUserAgentForTest');
-  }
-
-  async newBrowserCDPSession(): Promise<channels.BrowserNewBrowserCDPSessionResult> {
-    if (!this._object.options.isChromium)
-      throw new Error(`CDP session is only available in Chromium`);
-    const crBrowser = this._object as CRBrowser;
-    return { session: new CDPSessionDispatcher(this as any as BrowserDispatcher, await crBrowser.newBrowserCDPSession()) };
-  }
-
-  async startTracing(params: channels.BrowserStartTracingParams): Promise<void> {
+  async startTracing(params: channels.BrowserStartTracingParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     if (!this._object.options.isChromium)
       throw new Error(`Tracing is only available in Chromium`);
     const crBrowser = this._object as CRBrowser;
     await crBrowser.startTracing(params.page ? (params.page as PageDispatcher)._object : undefined, params);
   }
 
-  async stopTracing(): Promise<channels.BrowserStopTracingResult> {
+  async stopTracing(params: channels.BrowserStopTracingParams, progress: Progress): Promise<channels.BrowserStopTracingResult> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     if (!this._object.options.isChromium)
       throw new Error(`Tracing is only available in Chromium`);
     const crBrowser = this._object as CRBrowser;
@@ -156,20 +135,6 @@ export class ConnectedBrowserDispatcher extends Dispatcher<Browser, channels.Bro
   }
 
   async cleanupContexts() {
-    await Promise.all(Array.from(this._contexts).map(context => context.close({ reason: 'Global context cleanup (connection terminated)' })));
-  }
-}
-
-async function newContextForReuse(browser: Browser, scope: BrowserDispatcher, params: channels.BrowserNewContextForReuseParams, selectors: Selectors | null, metadata: CallMetadata): Promise<channels.BrowserNewContextForReuseResult> {
-  const { context, needsReset } = await browser.newContextForReuse(params, metadata);
-  if (needsReset) {
-    const oldContextDispatcher = existingDispatcher<BrowserContextDispatcher>(context);
-    if (oldContextDispatcher)
-      oldContextDispatcher._dispose();
-    await context.resetForReuse(metadata, params);
+    await Promise.all(Array.from(this._isolatedContexts).map(context => context.close({ reason: 'Global context cleanup (connection terminated)' })));
   }
-  if (selectors)
-    context.setSelectors(selectors);
-  const contextDispatcher = new BrowserContextDispatcher(scope, context);
-  return { context: contextDispatcher };
 }
diff --git a/packages/playwright-core/src/server/dispatchers/browserTypeDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserTypeDispatcher.ts
index bf7ccd518f4e1..80d92b7e821d0 100644
--- a/packages/playwright-core/src/server/dispatchers/browserTypeDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/browserTypeDispatcher.ts
@@ -14,39 +14,53 @@
  * limitations under the License.
  */
 
-import type { BrowserType } from '../browserType';
+import { BrowserContextDispatcher } from './browserContextDispatcher';
 import { BrowserDispatcher } from './browserDispatcher';
-import type * as channels from '@protocol/channels';
-import type { RootDispatcher } from './dispatcher';
 import { Dispatcher } from './dispatcher';
-import { BrowserContextDispatcher } from './browserContextDispatcher';
-import type { CallMetadata } from '../instrumentation';
+
+import type { BrowserType } from '../browserType';
+import type { RootDispatcher } from './dispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class BrowserTypeDispatcher extends Dispatcher<BrowserType, channels.BrowserTypeChannel, RootDispatcher> implements channels.BrowserTypeChannel {
   _type_BrowserType = true;
-  constructor(scope: RootDispatcher, browserType: BrowserType) {
+  private readonly _denyLaunch: boolean;
+  constructor(scope: RootDispatcher, browserType: BrowserType, denyLaunch: boolean) {
     super(scope, browserType, 'BrowserType', {
       executablePath: browserType.executablePath(),
       name: browserType.name()
     });
+    this._denyLaunch = denyLaunch;
   }
 
-  async launch(params: channels.BrowserTypeLaunchParams, metadata: CallMetadata): Promise<channels.BrowserTypeLaunchResult> {
-    const browser = await this._object.launch(metadata, params);
+  async launch(params: channels.BrowserTypeLaunchParams, progress: Progress): Promise<channels.BrowserTypeLaunchResult> {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+
+    const browser = await this._object.launch(progress, params);
     return { browser: new BrowserDispatcher(this, browser) };
   }
 
-  async launchPersistentContext(params: channels.BrowserTypeLaunchPersistentContextParams, metadata: CallMetadata): Promise<channels.BrowserTypeLaunchPersistentContextResult> {
-    const browserContext = await this._object.launchPersistentContext(metadata, params.userDataDir, params);
-    return { context: new BrowserContextDispatcher(this, browserContext) };
+  async launchPersistentContext(params: channels.BrowserTypeLaunchPersistentContextParams, progress: Progress): Promise<channels.BrowserTypeLaunchPersistentContextResult> {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+
+    const browserContext = await this._object.launchPersistentContext(progress, params.userDataDir, params);
+    const browserDispatcher = new BrowserDispatcher(this, browserContext._browser);
+    const contextDispatcher = BrowserContextDispatcher.from(browserDispatcher, browserContext);
+    return { browser: browserDispatcher, context: contextDispatcher };
   }
 
-  async connectOverCDP(params: channels.BrowserTypeConnectOverCDPParams, metadata: CallMetadata): Promise<channels.BrowserTypeConnectOverCDPResult> {
-    const browser = await this._object.connectOverCDP(metadata, params.endpointURL, params, params.timeout);
+  async connectOverCDP(params: channels.BrowserTypeConnectOverCDPParams, progress: Progress): Promise<channels.BrowserTypeConnectOverCDPResult> {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+
+    const browser = await this._object.connectOverCDP(progress, params.endpointURL, params);
     const browserDispatcher = new BrowserDispatcher(this, browser);
     return {
       browser: browserDispatcher,
-      defaultContext: browser._defaultContext ? new BrowserContextDispatcher(browserDispatcher, browser._defaultContext) : undefined,
+      defaultContext: browser._defaultContext ? BrowserContextDispatcher.from(browserDispatcher, browser._defaultContext) : undefined,
     };
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/cdpSessionDispatcher.ts b/packages/playwright-core/src/server/dispatchers/cdpSessionDispatcher.ts
index 33fa19f5e786a..58d785705ef3f 100644
--- a/packages/playwright-core/src/server/dispatchers/cdpSessionDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/cdpSessionDispatcher.ts
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-import { CDPSession } from '../chromium/crConnection';
-import type * as channels from '@protocol/channels';
 import { Dispatcher } from './dispatcher';
-import type { BrowserDispatcher } from './browserDispatcher';
+import { CDPSession } from '../chromium/crConnection';
+
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
-import type { CallMetadata } from '../instrumentation';
+import type { BrowserDispatcher } from './browserDispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class CDPSessionDispatcher extends Dispatcher<CDPSession, channels.CDPSessionChannel, BrowserDispatcher | BrowserContextDispatcher> implements channels.CDPSessionChannel {
   _type_CDPSession = true;
@@ -30,12 +31,12 @@ export class CDPSessionDispatcher extends Dispatcher<CDPSession, channels.CDPSes
     this.addObjectListener(CDPSession.Events.Closed, () => this._dispose());
   }
 
-  async send(params: channels.CDPSessionSendParams): Promise<channels.CDPSessionSendResult> {
-    return { result: await this._object.send(params.method as any, params.params) };
+  async send(params: channels.CDPSessionSendParams, progress: Progress): Promise<channels.CDPSessionSendResult> {
+    return { result: await progress.race(this._object.send(params.method as any, params.params)) };
   }
 
-  async detach(_: any, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
+  async detach(_: any, progress: Progress): Promise<void> {
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.detach();
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts b/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts
index 34c4d3b4ca79c..595535925741f 100644
--- a/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/debugControllerDispatcher.ts
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { eventsHelper } from '../../utils';
-import type { RegisteredListener } from '../../utils/eventsHelper';
 import { DebugController } from '../debugController';
-import type { DispatcherConnection, RootDispatcher } from './dispatcher';
 import { Dispatcher } from './dispatcher';
 
+import type { DispatcherConnection, RootDispatcher } from './dispatcher';
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+
+
 export class DebugControllerDispatcher extends Dispatcher<DebugController, channels.DebugControllerChannel, RootDispatcher> implements channels.DebugControllerChannel {
   _type_DebugController;
   private _listeners: RegisteredListener[];
@@ -32,8 +35,8 @@ export class DebugControllerDispatcher extends Dispatcher<DebugController, chann
       eventsHelper.addEventListener(this._object, DebugController.Events.StateChanged, params => {
         this._dispatchEvent('stateChanged', params);
       }),
-      eventsHelper.addEventListener(this._object, DebugController.Events.InspectRequested, ({ selector, locator }) => {
-        this._dispatchEvent('inspectRequested', { selector, locator });
+      eventsHelper.addEventListener(this._object, DebugController.Events.InspectRequested, ({ selector, locator, ariaSnapshot }) => {
+        this._dispatchEvent('inspectRequested', { selector, locator, ariaSnapshot });
       }),
       eventsHelper.addEventListener(this._object, DebugController.Events.SourceChanged, ({ text, header, footer, actions }) => {
         this._dispatchEvent('sourceChanged', ({ text, header, footer, actions }));
@@ -47,44 +50,32 @@ export class DebugControllerDispatcher extends Dispatcher<DebugController, chann
     ];
   }
 
-  async initialize(params: channels.DebugControllerInitializeParams) {
+  async initialize(params: channels.DebugControllerInitializeParams, progress: Progress) {
     this._object.initialize(params.codegenId, params.sdkLanguage);
   }
 
-  async setReportStateChanged(params: channels.DebugControllerSetReportStateChangedParams) {
+  async setReportStateChanged(params: channels.DebugControllerSetReportStateChangedParams, progress: Progress) {
     this._object.setReportStateChanged(params.enabled);
   }
 
-  async resetForReuse() {
-    await this._object.resetForReuse();
-  }
-
-  async navigate(params: channels.DebugControllerNavigateParams) {
-    await this._object.navigate(params.url);
-  }
-
-  async setRecorderMode(params: channels.DebugControllerSetRecorderModeParams) {
-    await this._object.setRecorderMode(params);
-  }
-
-  async highlight(params: channels.DebugControllerHighlightParams) {
-    await this._object.highlight(params.selector);
+  async setRecorderMode(params: channels.DebugControllerSetRecorderModeParams, progress: Progress) {
+    await this._object.setRecorderMode(progress, params);
   }
 
-  async hideHighlight() {
-    await this._object.hideHighlight();
+  async highlight(params: channels.DebugControllerHighlightParams, progress: Progress) {
+    await this._object.highlight(progress, params);
   }
 
-  async resume() {
-    await this._object.resume();
+  async hideHighlight(params: channels.DebugControllerHideHighlightParams, progress: Progress) {
+    await this._object.hideHighlight(progress);
   }
 
-  async kill() {
-    await this._object.kill();
+  async resume(params: channels.DebugControllerResumeParams, progress: Progress) {
+    await this._object.resume(progress);
   }
 
-  async closeAllBrowsers() {
-    await this._object.closeAllBrowsers();
+  async kill(params: channels.DebugControllerKillParams, progress: Progress) {
+    this._object.kill();
   }
 
   override _onDispose() {
diff --git a/packages/playwright-core/src/server/dispatchers/dialogDispatcher.ts b/packages/playwright-core/src/server/dispatchers/dialogDispatcher.ts
index 50ff01f108d8d..52a29691a2de8 100644
--- a/packages/playwright-core/src/server/dispatchers/dialogDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/dialogDispatcher.ts
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import type { Dialog } from '../dialog';
-import type * as channels from '@protocol/channels';
 import { Dispatcher } from './dispatcher';
 import { PageDispatcher } from './pageDispatcher';
+
+import type { Dialog } from '../dialog';
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class DialogDispatcher extends Dispatcher<Dialog, channels.DialogChannel, BrowserContextDispatcher | PageDispatcher> implements channels.DialogChannel {
   _type_Dialog = true;
@@ -34,11 +36,11 @@ export class DialogDispatcher extends Dispatcher<Dialog, channels.DialogChannel,
     });
   }
 
-  async accept(params: { promptText?: string }): Promise<void> {
-    await this._object.accept(params.promptText);
+  async accept(params: channels.DialogAcceptParams, progress: Progress): Promise<void> {
+    await progress.race(this._object.accept(params.promptText));
   }
 
-  async dismiss(): Promise<void> {
-    await this._object.dismiss();
+  async dismiss(params: channels.DialogDismissParams, progress: Progress): Promise<void> {
+    await progress.race(this._object.dismiss());
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/dispatcher.ts b/packages/playwright-core/src/server/dispatchers/dispatcher.ts
index e14960b495f9e..8f725a5b893c6 100644
--- a/packages/playwright-core/src/server/dispatchers/dispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/dispatcher.ts
@@ -15,24 +15,26 @@
  */
 
 import { EventEmitter } from 'events';
-import type * as channels from '@protocol/channels';
-import { findValidator, ValidationError, createMetadataValidator, type ValidatorContext } from '../../protocol/validator';
-import { LongStandingScope, assert, isUnderTest, monotonicTime, rewriteErrorMessage } from '../../utils';
+
+import { eventsHelper } from '../utils/eventsHelper';
+import { ValidationError, createMetadataValidator, findValidator  } from '../../protocol/validator';
+import { assert, monotonicTime, rewriteErrorMessage, debugLogger } from '../../utils';
+import { isUnderTest } from '../utils/debug';
 import { TargetClosedError, isTargetClosedError, serializeError } from '../errors';
+import { createRootSdkObject, SdkObject } from '../instrumentation';
+import { isProtocolError } from '../protocolError';
+import { compressCallLog } from '../callLog';
+import { methodMetainfo } from '../../utils/isomorphic/protocolMetainfo';
+import { Progress, ProgressController } from '../progress';
+
 import type { CallMetadata } from '../instrumentation';
-import { SdkObject } from '../instrumentation';
 import type { PlaywrightDispatcher } from './playwrightDispatcher';
-import { eventsHelper } from '../..//utils/eventsHelper';
-import type { RegisteredListener } from '../..//utils/eventsHelper';
-import { isProtocolError } from '../protocolError';
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type { ValidatorContext } from '../../protocol/validator';
+import type * as channels from '@protocol/channels';
 
-export const dispatcherSymbol = Symbol('dispatcher');
 const metadataValidator = createMetadataValidator();
 
-export function existingDispatcher<DispatcherType>(object: any): DispatcherType | undefined {
-  return object[dispatcherSymbol];
-}
-
 let maxDispatchersOverride: number | undefined;
 export function setMaxDispatchersForTest(value: number | undefined) {
   maxDispatchersOverride = value;
@@ -44,25 +46,23 @@ function maxDispatchersForBucket(gcBucket: string) {
   }[gcBucket] ?? 10000;
 }
 
-export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeType extends DispatcherScope> extends EventEmitter implements channels.Channel {
-  private _connection: DispatcherConnection;
-  // Parent is always "isScope".
+export class Dispatcher<Type extends SdkObject, ChannelType, ParentScopeType extends DispatcherScope> extends EventEmitter implements channels.Channel {
+  readonly connection: DispatcherConnection;
   private _parent: ParentScopeType | undefined;
-  // Only "isScope" channel owners have registered dispatchers inside.
   private _dispatchers = new Map<string, DispatcherScope>();
   protected _disposed = false;
   protected _eventListeners: RegisteredListener[] = [];
+  private _activeProgressControllers = new Set<ProgressController>();
 
   readonly _guid: string;
   readonly _type: string;
   readonly _gcBucket: string;
   _object: Type;
-  private _openScope = new LongStandingScope();
 
-  constructor(parent: ParentScopeType | DispatcherConnection, object: Type, type: string, initializer: channels.InitializerTraits<Type>, gcBucket?: string) {
+  constructor(parent: ParentScopeType | DispatcherConnection, object: Type, type: string, initializer: channels.InitializerTraits<ChannelType>, gcBucket?: string) {
     super();
 
-    this._connection = parent instanceof DispatcherConnection ? parent : parent._connection;
+    this.connection = parent instanceof DispatcherConnection ? parent : parent.connection;
     this._parent = parent instanceof DispatcherConnection ? undefined : parent;
 
     const guid = object.guid;
@@ -71,17 +71,15 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeT
     this._object = object;
     this._gcBucket = gcBucket ?? type;
 
-    (object as any)[dispatcherSymbol] = this;
-
-    this._connection.registerDispatcher(this);
+    this.connection.registerDispatcher(this);
     if (this._parent) {
       assert(!this._parent._dispatchers.has(guid));
       this._parent._dispatchers.set(guid, this);
     }
 
     if (this._parent)
-      this._connection.sendCreate(this._parent, type, guid, initializer);
-    this._connection.maybeDisposeStaleDispatchers(this._gcBucket);
+      this.connection.sendCreate(this._parent, type, guid, initializer);
+    this.connection.maybeDisposeStaleDispatchers(this._gcBucket);
   }
 
   parentScope(): ParentScopeType {
@@ -99,17 +97,20 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeT
     oldParent._dispatchers.delete(child._guid);
     this._dispatchers.set(child._guid, child);
     child._parent = this;
-    this._connection.sendAdopt(this, child);
+    this.connection.sendAdopt(this, child);
   }
 
-  async _handleCommand(callMetadata: CallMetadata, method: string, validParams: any) {
-    const commandPromise = (this as any)[method](validParams, callMetadata);
+  async _runCommand(callMetadata: CallMetadata, method: string, validParams: any) {
+    const controller = new ProgressController(callMetadata, message => {
+      const logName = this._object.logName || 'api';
+      debugLogger.log(logName, message);
+      this._object.instrumentation.onCallLog(this._object, callMetadata, logName, message);
+    });
+    this._activeProgressControllers.add(controller);
     try {
-      return await this._openScope.race(commandPromise);
-    } catch (e) {
-      if (callMetadata.potentiallyClosesScope && isTargetClosedError(e))
-        return await commandPromise;
-      throw e;
+      return await controller.run(progress => (this as any)[method](validParams, progress), validParams?.timeout);
+    } finally {
+      this._activeProgressControllers.delete(controller);
     }
   }
 
@@ -120,35 +121,49 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeT
       // Just ignore this event outside of tests.
       return;
     }
-    this._connection.sendEvent(this, method as string, params);
+    this.connection.sendEvent(this, method as string, params);
   }
 
   _dispose(reason?: 'gc') {
     this._disposeRecursively(new TargetClosedError());
-    this._connection.sendDispose(this, reason);
+    this.connection.sendDispose(this, reason);
   }
 
   protected _onDispose() {
   }
 
+  async stopPendingOperations(error: Error) {
+    const controllers: ProgressController[] = [];
+    const collect = (dispatcher: DispatcherScope) => {
+      controllers.push(...dispatcher._activeProgressControllers);
+      for (const child of [...dispatcher._dispatchers.values()])
+        collect(child);
+    };
+    collect(this);
+    await Promise.all(controllers.map(controller => controller.abort(error)));
+  }
+
   private _disposeRecursively(error: Error) {
     assert(!this._disposed, `${this._guid} is disposed more than once`);
+    for (const controller of this._activeProgressControllers) {
+      if (!controller.metadata.potentiallyClosesScope)
+        controller.abort(error).catch(() => {});
+    }
     this._onDispose();
     this._disposed = true;
     eventsHelper.removeEventListeners(this._eventListeners);
 
     // Clean up from parent and connection.
     this._parent?._dispatchers.delete(this._guid);
-    const list = this._connection._dispatchersByBucket.get(this._gcBucket);
+    const list = this.connection._dispatchersByBucket.get(this._gcBucket);
     list?.delete(this._guid);
-    this._connection._dispatchers.delete(this._guid);
+    this.connection._dispatcherByGuid.delete(this._guid);
+    this.connection._dispatcherByObject.delete(this._object);
 
     // Dispose all children.
     for (const dispatcher of [...this._dispatchers.values()])
       dispatcher._disposeRecursively(error);
     this._dispatchers.clear();
-    delete (this._object as any)[dispatcherSymbol];
-    this._openScope.close(error);
   }
 
   _debugScopeState(): any {
@@ -163,16 +178,17 @@ export class Dispatcher<Type extends { guid: string }, ChannelType, ParentScopeT
   }
 }
 
-export type DispatcherScope = Dispatcher<any, any, any>;
+export type DispatcherScope = Dispatcher<SdkObject, any, any>;
 
-export class RootDispatcher extends Dispatcher<{ guid: '' }, any, any> {
+export class RootDispatcher extends Dispatcher<SdkObject, any, any> {
   private _initialized = false;
 
   constructor(connection: DispatcherConnection, private readonly createPlaywright?: (scope: RootDispatcher, options: channels.RootInitializeParams) => Promise<PlaywrightDispatcher>) {
-    super(connection, { guid: '' }, 'Root', {});
+    super(connection, createRootSdkObject(), 'Root', {});
   }
 
-  async initialize(params: channels.RootInitializeParams): Promise<channels.RootInitializeResult> {
+  async initialize(params: channels.RootInitializeParams, progress: Progress): Promise<channels.RootInitializeResult> {
+    // Note: progress is deliberately ignored here.
     assert(this.createPlaywright);
     assert(!this._initialized);
     this._initialized = true;
@@ -183,7 +199,8 @@ export class RootDispatcher extends Dispatcher<{ guid: '' }, any, any> {
 }
 
 export class DispatcherConnection {
-  readonly _dispatchers = new Map<string, DispatcherScope>();
+  readonly _dispatcherByGuid = new Map<string, DispatcherScope>();
+  readonly _dispatcherByObject = new Map<any, DispatcherScope>();
   readonly _dispatchersByBucket = new Map<string, Set<string>>();
   onmessage = (message: object) => {};
   private _waitOperations = new Map<string, CallMetadata>();
@@ -195,13 +212,13 @@ export class DispatcherConnection {
 
   sendEvent(dispatcher: DispatcherScope, event: string, params: any) {
     const validator = findValidator(dispatcher._type, event, 'Event');
-    params = validator(params, '', { tChannelImpl: this._tChannelImplToWire.bind(this), binary: this._isLocal ? 'buffer' : 'toBase64' });
+    params = validator(params, '', this._validatorToWireContext());
     this.onmessage({ guid: dispatcher._guid, method: event, params });
   }
 
   sendCreate(parent: DispatcherScope, type: string, guid: string, initializer: any) {
     const validator = findValidator(type, '', 'Initializer');
-    initializer = validator(initializer, '', { tChannelImpl: this._tChannelImplToWire.bind(this), binary: this._isLocal ? 'buffer' : 'toBase64' });
+    initializer = validator(initializer, '', this._validatorToWireContext());
     this.onmessage({ guid: parent._guid, method: '__create__', params: { type, initializer, guid } });
   }
 
@@ -213,10 +230,26 @@ export class DispatcherConnection {
     this.onmessage({ guid: dispatcher._guid, method: '__dispose__', params: { reason } });
   }
 
+  private _validatorToWireContext(): ValidatorContext {
+    return {
+      tChannelImpl: this._tChannelImplToWire.bind(this),
+      binary: this._isLocal ? 'buffer' : 'toBase64',
+      isUnderTest,
+    };
+  }
+
+  private _validatorFromWireContext(): ValidatorContext {
+    return {
+      tChannelImpl: this._tChannelImplFromWire.bind(this),
+      binary: this._isLocal ? 'buffer' : 'fromBase64',
+      isUnderTest,
+    };
+  }
+
   private _tChannelImplFromWire(names: '*' | string[], arg: any, path: string, context: ValidatorContext): any {
     if (arg && typeof arg === 'object' && typeof arg.guid === 'string') {
       const guid = arg.guid;
-      const dispatcher = this._dispatchers.get(guid);
+      const dispatcher = this._dispatcherByGuid.get(guid);
       if (!dispatcher)
         throw new ValidationError(`${path}: no object with guid ${guid}`);
       if (names !== '*' && !names.includes(dispatcher._type))
@@ -235,9 +268,14 @@ export class DispatcherConnection {
     throw new ValidationError(`${path}: expected dispatcher ${names.toString()}`);
   }
 
+  existingDispatcher<DispatcherType>(object: any): DispatcherType | undefined {
+    return this._dispatcherByObject.get(object) as DispatcherType | undefined;
+  }
+
   registerDispatcher(dispatcher: DispatcherScope) {
-    assert(!this._dispatchers.has(dispatcher._guid));
-    this._dispatchers.set(dispatcher._guid, dispatcher);
+    assert(!this._dispatcherByGuid.has(dispatcher._guid));
+    this._dispatcherByGuid.set(dispatcher._guid, dispatcher);
+    this._dispatcherByObject.set(dispatcher._object, dispatcher);
     let list = this._dispatchersByBucket.get(dispatcher._gcBucket);
     if (!list) {
       list = new Set();
@@ -255,7 +293,7 @@ export class DispatcherConnection {
     const disposeCount = (maxDispatchers / 10) | 0;
     this._dispatchersByBucket.set(gcBucket, new Set(dispatchersArray.slice(disposeCount)));
     for (let i = 0; i < disposeCount; ++i) {
-      const d = this._dispatchers.get(dispatchersArray[i]);
+      const d = this._dispatcherByGuid.get(dispatchersArray[i]);
       if (!d)
         continue;
       d._dispose('gc');
@@ -264,7 +302,7 @@ export class DispatcherConnection {
 
   async dispatch(message: object) {
     const { id, guid, method, params, metadata } = message as any;
-    const dispatcher = this._dispatchers.get(guid);
+    const dispatcher = this._dispatcherByGuid.get(guid);
     if (!dispatcher) {
       this.onmessage({ id, error: serializeError(new TargetClosedError()) });
       return;
@@ -274,8 +312,9 @@ export class DispatcherConnection {
     let validMetadata: channels.Metadata;
     try {
       const validator = findValidator(dispatcher._type, method, 'Params');
-      validParams = validator(params, '', { tChannelImpl: this._tChannelImplFromWire.bind(this), binary: this._isLocal ? 'buffer' : 'fromBase64' });
-      validMetadata = metadataValidator(metadata, '', { tChannelImpl: this._tChannelImplFromWire.bind(this), binary: this._isLocal ? 'buffer' : 'fromBase64' });
+      const validatorContext = this._validatorFromWireContext();
+      validParams = validator(params, '', validatorContext);
+      validMetadata = metadataValidator(metadata, '', validatorContext);
       if (typeof (dispatcher as any)[method] !== 'function')
         throw new Error(`Mismatching dispatcher: "${dispatcher._type}" does not implement "${method}"`);
     } catch (e) {
@@ -283,16 +322,23 @@ export class DispatcherConnection {
       return;
     }
 
-    const sdkObject = dispatcher._object instanceof SdkObject ? dispatcher._object : undefined;
+    const metainfo = methodMetainfo.get(dispatcher._type + '.' + method);
+    if (metainfo?.internal) {
+      // For non-js ports, it is easier to detect internal calls here rather
+      // than generate protocol metainfo for each language.
+      validMetadata.internal = true;
+    }
+
+    const sdkObject = dispatcher._object;
     const callMetadata: CallMetadata = {
       id: `call@${id}`,
       location: validMetadata.location,
-      apiName: validMetadata.apiName,
+      title: validMetadata.title,
       internal: validMetadata.internal,
       stepId: validMetadata.stepId,
-      objectId: sdkObject?.guid,
-      pageId: sdkObject?.attribution?.page?.guid,
-      frameId: sdkObject?.attribution?.frame?.guid,
+      objectId: sdkObject.guid,
+      pageId: sdkObject.attribution?.page?.guid,
+      frameId: sdkObject.attribution?.frame?.guid,
       startTime: monotonicTime(),
       endTime: 0,
       type: dispatcher._type,
@@ -301,7 +347,7 @@ export class DispatcherConnection {
       log: [],
     };
 
-    if (sdkObject && params?.info?.waitId) {
+    if (params?.info?.waitId) {
       // Process logs for waitForNavigation/waitForLoadState/etc.
       const info = params.info;
       switch (info.phase) {
@@ -328,42 +374,51 @@ export class DispatcherConnection {
       }
     }
 
-    await sdkObject?.instrumentation.onBeforeCall(sdkObject, callMetadata);
+    await sdkObject.instrumentation.onBeforeCall(sdkObject, callMetadata);
     const response: any = { id };
     try {
-      const result = await dispatcher._handleCommand(callMetadata, method, validParams);
+      // If the dispatcher has been disposed while running the instrumentation call, error out.
+      if (this._dispatcherByGuid.get(guid) !== dispatcher)
+        throw new TargetClosedError(closeReason(sdkObject));
+      const result = await dispatcher._runCommand(callMetadata, method, validParams);
       const validator = findValidator(dispatcher._type, method, 'Result');
-      response.result = validator(result, '', { tChannelImpl: this._tChannelImplToWire.bind(this), binary: this._isLocal ? 'buffer' : 'toBase64' });
+      response.result = validator(result, '', this._validatorToWireContext());
       callMetadata.result = result;
     } catch (e) {
-      if (isTargetClosedError(e) && sdkObject) {
+      if (isTargetClosedError(e)) {
         const reason = closeReason(sdkObject);
         if (reason)
           rewriteErrorMessage(e, reason);
       } else if (isProtocolError(e)) {
-        if (e.type === 'closed') {
-          const reason = sdkObject ? closeReason(sdkObject) : undefined;
-          e = new TargetClosedError(reason, e.browserLogMessage());
-        } else if (e.type === 'crashed') {
+        if (e.type === 'closed')
+          e = new TargetClosedError(closeReason(sdkObject), e.browserLogMessage());
+        else if (e.type === 'crashed')
           rewriteErrorMessage(e, 'Target crashed ' + e.browserLogMessage());
-        }
       }
       response.error = serializeError(e);
       // The command handler could have set error in the metadata, do not reset it if there was no exception.
       callMetadata.error = response.error;
     } finally {
       callMetadata.endTime = monotonicTime();
-      await sdkObject?.instrumentation.onAfterCall(sdkObject, callMetadata);
+      await sdkObject.instrumentation.onAfterCall(sdkObject, callMetadata);
+      if (metainfo?.slowMo)
+        await this._doSlowMo(sdkObject);
     }
 
     if (response.error)
-      response.log = callMetadata.log;
+      response.log = compressCallLog(callMetadata.log);
     this.onmessage(response);
   }
+
+  private async _doSlowMo(sdkObject: SdkObject): Promise<void> {
+    const slowMo = sdkObject.attribution.browser?.options.slowMo;
+    if (slowMo)
+      await new Promise(f => setTimeout(f, slowMo));
+  }
 }
 
 function closeReason(sdkObject: SdkObject): string | undefined {
-  return sdkObject.attribution.page?._closeReason ||
+  return sdkObject.attribution.page?.closeReason ||
     sdkObject.attribution.context?._closeReason ||
     sdkObject.attribution.browser?._closeReason;
 }
diff --git a/packages/playwright-core/src/server/dispatchers/electronDispatcher.ts b/packages/playwright-core/src/server/dispatchers/electronDispatcher.ts
index a4e28da26f2de..2c9cbcc9d2f93 100644
--- a/packages/playwright-core/src/server/dispatchers/electronDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/electronDispatcher.ts
@@ -14,26 +14,32 @@
  * limitations under the License.
  */
 
-import type { RootDispatcher } from './dispatcher';
+import { BrowserContextDispatcher } from './browserContextDispatcher';
 import { Dispatcher } from './dispatcher';
-import type { Electron } from '../electron/electron';
+import { JSHandleDispatcher, parseArgument, serializeResult } from './jsHandleDispatcher';
 import { ElectronApplication } from '../electron/electron';
-import type * as channels from '@protocol/channels';
-import { BrowserContextDispatcher } from './browserContextDispatcher';
+
+import type { RootDispatcher } from './dispatcher';
 import type { PageDispatcher } from './pageDispatcher';
 import type { ConsoleMessage } from '../console';
-import { parseArgument, serializeResult } from './jsHandleDispatcher';
-import { ElementHandleDispatcher } from './elementHandlerDispatcher';
+import type { Electron } from '../electron/electron';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+
 
 export class ElectronDispatcher extends Dispatcher<Electron, channels.ElectronChannel, RootDispatcher> implements channels.ElectronChannel {
   _type_Electron = true;
+  _denyLaunch: boolean;
 
-  constructor(scope: RootDispatcher, electron: Electron) {
+  constructor(scope: RootDispatcher, electron: Electron, denyLaunch: boolean) {
     super(scope, electron, 'Electron', {});
+    this._denyLaunch = denyLaunch;
   }
 
-  async launch(params: channels.ElectronLaunchParams): Promise<channels.ElectronLaunchResult> {
-    const electronApplication = await this._object.launch(params);
+  async launch(params: channels.ElectronLaunchParams, progress: Progress): Promise<channels.ElectronLaunchResult> {
+    if (this._denyLaunch)
+      throw new Error(`Launching more browsers is not allowed.`);
+    const electronApplication = await this._object.launch(progress, params);
     return { electronApplication: new ElectronApplicationDispatcher(this, electronApplication) };
   }
 }
@@ -45,7 +51,7 @@ export class ElectronApplicationDispatcher extends Dispatcher<ElectronApplicatio
 
   constructor(scope: ElectronDispatcher, electronApplication: ElectronApplication) {
     super(scope, electronApplication, 'ElectronApplication', {
-      context: new BrowserContextDispatcher(scope, electronApplication.context())
+      context: BrowserContextDispatcher.from(scope, electronApplication.context())
     });
     this.addObjectListener(ElectronApplication.Events.Close, () => {
       this._dispatchEvent('close');
@@ -57,36 +63,32 @@ export class ElectronApplicationDispatcher extends Dispatcher<ElectronApplicatio
       this._dispatchEvent('console', {
         type: message.type(),
         text: message.text(),
-        args: message.args().map(a => ElementHandleDispatcher.fromJSHandle(this, a)),
+        args: message.args().map(a => JSHandleDispatcher.fromJSHandle(this, a)),
         location: message.location()
       });
     });
   }
 
-  async browserWindow(params: channels.ElectronApplicationBrowserWindowParams): Promise<channels.ElectronApplicationBrowserWindowResult> {
-    const handle = await this._object.browserWindow((params.page as PageDispatcher).page());
-    return { handle: ElementHandleDispatcher.fromJSHandle(this, handle) };
+  async browserWindow(params: channels.ElectronApplicationBrowserWindowParams, progress: Progress): Promise<channels.ElectronApplicationBrowserWindowResult> {
+    const handle = await progress.race(this._object.browserWindow((params.page as PageDispatcher).page()));
+    return { handle: JSHandleDispatcher.fromJSHandle(this, handle) };
   }
 
-  async evaluateExpression(params: channels.ElectronApplicationEvaluateExpressionParams): Promise<channels.ElectronApplicationEvaluateExpressionResult> {
-    const handle = await this._object._nodeElectronHandlePromise;
-    return { value: serializeResult(await handle.evaluateExpression(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg))) };
+  async evaluateExpression(params: channels.ElectronApplicationEvaluateExpressionParams, progress: Progress): Promise<channels.ElectronApplicationEvaluateExpressionResult> {
+    const handle = await progress.race(this._object._nodeElectronHandlePromise);
+    return { value: serializeResult(await progress.race(handle.evaluateExpression(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg)))) };
   }
 
-  async evaluateExpressionHandle(params: channels.ElectronApplicationEvaluateExpressionHandleParams): Promise<channels.ElectronApplicationEvaluateExpressionHandleResult> {
-    const handle = await this._object._nodeElectronHandlePromise;
-    const result = await handle.evaluateExpressionHandle(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg));
-    return { handle: ElementHandleDispatcher.fromJSHandle(this, result) };
+  async evaluateExpressionHandle(params: channels.ElectronApplicationEvaluateExpressionHandleParams, progress: Progress): Promise<channels.ElectronApplicationEvaluateExpressionHandleResult> {
+    const handle = await progress.race(this._object._nodeElectronHandlePromise);
+    const result = await progress.race(handle.evaluateExpressionHandle(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg)));
+    return { handle: JSHandleDispatcher.fromJSHandle(this, result) };
   }
 
-  async updateSubscription(params: channels.ElectronApplicationUpdateSubscriptionParams): Promise<void> {
+  async updateSubscription(params: channels.ElectronApplicationUpdateSubscriptionParams, progress: Progress): Promise<void> {
     if (params.enabled)
       this._subscriptions.add(params.event);
     else
       this._subscriptions.delete(params.event);
   }
-
-  async close(): Promise<void> {
-    await this._object.close();
-  }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts b/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts
index d4d0280ec4fc7..215aa288f6975 100644
--- a/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/elementHandlerDispatcher.ts
@@ -14,215 +14,209 @@
  * limitations under the License.
  */
 
+import { BrowserContextDispatcher } from './browserContextDispatcher';
+import { FrameDispatcher } from './frameDispatcher';
+import { JSHandleDispatcher, parseArgument, serializeResult } from './jsHandleDispatcher';
+
 import type { ElementHandle } from '../dom';
 import type { Frame } from '../frames';
 import type * as js from '../javascript';
 import type * as channels from '@protocol/channels';
-import { existingDispatcher } from './dispatcher';
-import { JSHandleDispatcher, serializeResult, parseArgument } from './jsHandleDispatcher';
-import type { JSHandleDispatcherParentScope } from './jsHandleDispatcher';
-import { FrameDispatcher } from './frameDispatcher';
-import type { CallMetadata } from '../instrumentation';
-import { BrowserContextDispatcher } from './browserContextDispatcher';
-import { PageDispatcher, WorkerDispatcher } from './pageDispatcher';
+import type { Progress } from '@protocol/progress';
+
 
-export class ElementHandleDispatcher extends JSHandleDispatcher implements channels.ElementHandleChannel {
+export class ElementHandleDispatcher extends JSHandleDispatcher<FrameDispatcher> implements channels.ElementHandleChannel {
   _type_ElementHandle = true;
 
   readonly _elementHandle: ElementHandle;
 
-  static from(scope: JSHandleDispatcherParentScope, handle: ElementHandle): ElementHandleDispatcher {
-    return existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);
+  static from(scope: FrameDispatcher, handle: ElementHandle): ElementHandleDispatcher {
+    return scope.connection.existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);
   }
 
-  static fromNullable(scope: JSHandleDispatcherParentScope, handle: ElementHandle | null): ElementHandleDispatcher | undefined {
+  static fromNullable(scope: FrameDispatcher, handle: ElementHandle | null): ElementHandleDispatcher | undefined {
     if (!handle)
       return undefined;
-    return existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);
+    return scope.connection.existingDispatcher<ElementHandleDispatcher>(handle) || new ElementHandleDispatcher(scope, handle);
   }
 
-  static fromJSHandle(scope: JSHandleDispatcherParentScope, handle: js.JSHandle): JSHandleDispatcher {
-    const result = existingDispatcher<JSHandleDispatcher>(handle);
+  static fromJSOrElementHandle(scope: FrameDispatcher, handle: js.JSHandle): JSHandleDispatcher {
+    const result = scope.connection.existingDispatcher<JSHandleDispatcher>(handle);
     if (result)
       return result;
-    return handle.asElement() ? new ElementHandleDispatcher(scope, handle.asElement()!) : new JSHandleDispatcher(scope, handle);
+    const elementHandle = handle.asElement();
+    if (!elementHandle)
+      return new JSHandleDispatcher(scope, handle);
+    return new ElementHandleDispatcher(scope, elementHandle);
   }
 
-  private constructor(scope: JSHandleDispatcherParentScope, elementHandle: ElementHandle) {
+  private constructor(scope: FrameDispatcher, elementHandle: ElementHandle) {
     super(scope, elementHandle);
     this._elementHandle = elementHandle;
   }
 
-  async ownerFrame(params: channels.ElementHandleOwnerFrameParams, metadata: CallMetadata): Promise<channels.ElementHandleOwnerFrameResult> {
+  async ownerFrame(params: channels.ElementHandleOwnerFrameParams, progress: Progress): Promise<channels.ElementHandleOwnerFrameResult> {
     const frame = await this._elementHandle.ownerFrame();
     return { frame: frame ? FrameDispatcher.from(this._browserContextDispatcher(), frame) : undefined };
   }
 
-  async contentFrame(params: channels.ElementHandleContentFrameParams, metadata: CallMetadata): Promise<channels.ElementHandleContentFrameResult> {
-    const frame = await this._elementHandle.contentFrame();
+  async contentFrame(params: channels.ElementHandleContentFrameParams, progress: Progress): Promise<channels.ElementHandleContentFrameResult> {
+    const frame = await progress.race(this._elementHandle.contentFrame());
     return { frame: frame ? FrameDispatcher.from(this._browserContextDispatcher(), frame) : undefined };
   }
 
-  async getAttribute(params: channels.ElementHandleGetAttributeParams, metadata: CallMetadata): Promise<channels.ElementHandleGetAttributeResult> {
-    const value = await this._elementHandle.getAttribute(metadata, params.name);
+  async getAttribute(params: channels.ElementHandleGetAttributeParams, progress: Progress): Promise<channels.ElementHandleGetAttributeResult> {
+    const value = await this._elementHandle.getAttribute(progress, params.name);
     return { value: value === null ? undefined : value };
   }
 
-  async inputValue(params: channels.ElementHandleInputValueParams, metadata: CallMetadata): Promise<channels.ElementHandleInputValueResult> {
-    const value = await this._elementHandle.inputValue(metadata);
+  async inputValue(params: channels.ElementHandleInputValueParams, progress: Progress): Promise<channels.ElementHandleInputValueResult> {
+    const value = await this._elementHandle.inputValue(progress);
     return { value };
   }
 
-  async textContent(params: channels.ElementHandleTextContentParams, metadata: CallMetadata): Promise<channels.ElementHandleTextContentResult> {
-    const value = await this._elementHandle.textContent(metadata);
+  async textContent(params: channels.ElementHandleTextContentParams, progress: Progress): Promise<channels.ElementHandleTextContentResult> {
+    const value = await this._elementHandle.textContent(progress);
     return { value: value === null ? undefined : value };
   }
 
-  async innerText(params: channels.ElementHandleInnerTextParams, metadata: CallMetadata): Promise<channels.ElementHandleInnerTextResult> {
-    return { value: await this._elementHandle.innerText(metadata) };
+  async innerText(params: channels.ElementHandleInnerTextParams, progress: Progress): Promise<channels.ElementHandleInnerTextResult> {
+    return { value: await this._elementHandle.innerText(progress) };
   }
 
-  async innerHTML(params: channels.ElementHandleInnerHTMLParams, metadata: CallMetadata): Promise<channels.ElementHandleInnerHTMLResult> {
-    return { value: await this._elementHandle.innerHTML(metadata) };
+  async innerHTML(params: channels.ElementHandleInnerHTMLParams, progress: Progress): Promise<channels.ElementHandleInnerHTMLResult> {
+    return { value: await this._elementHandle.innerHTML(progress) };
   }
 
-  async isChecked(params: channels.ElementHandleIsCheckedParams, metadata: CallMetadata): Promise<channels.ElementHandleIsCheckedResult> {
-    return { value: await this._elementHandle.isChecked(metadata) };
+  async isChecked(params: channels.ElementHandleIsCheckedParams, progress: Progress): Promise<channels.ElementHandleIsCheckedResult> {
+    return { value: await this._elementHandle.isChecked(progress) };
   }
 
-  async isDisabled(params: channels.ElementHandleIsDisabledParams, metadata: CallMetadata): Promise<channels.ElementHandleIsDisabledResult> {
-    return { value: await this._elementHandle.isDisabled(metadata) };
+  async isDisabled(params: channels.ElementHandleIsDisabledParams, progress: Progress): Promise<channels.ElementHandleIsDisabledResult> {
+    return { value: await this._elementHandle.isDisabled(progress) };
   }
 
-  async isEditable(params: channels.ElementHandleIsEditableParams, metadata: CallMetadata): Promise<channels.ElementHandleIsEditableResult> {
-    return { value: await this._elementHandle.isEditable(metadata) };
+  async isEditable(params: channels.ElementHandleIsEditableParams, progress: Progress): Promise<channels.ElementHandleIsEditableResult> {
+    return { value: await this._elementHandle.isEditable(progress) };
   }
 
-  async isEnabled(params: channels.ElementHandleIsEnabledParams, metadata: CallMetadata): Promise<channels.ElementHandleIsEnabledResult> {
-    return { value: await this._elementHandle.isEnabled(metadata) };
+  async isEnabled(params: channels.ElementHandleIsEnabledParams, progress: Progress): Promise<channels.ElementHandleIsEnabledResult> {
+    return { value: await this._elementHandle.isEnabled(progress) };
   }
 
-  async isHidden(params: channels.ElementHandleIsHiddenParams, metadata: CallMetadata): Promise<channels.ElementHandleIsHiddenResult> {
-    return { value: await this._elementHandle.isHidden(metadata) };
+  async isHidden(params: channels.ElementHandleIsHiddenParams, progress: Progress): Promise<channels.ElementHandleIsHiddenResult> {
+    return { value: await this._elementHandle.isHidden(progress) };
   }
 
-  async isVisible(params: channels.ElementHandleIsVisibleParams, metadata: CallMetadata): Promise<channels.ElementHandleIsVisibleResult> {
-    return { value: await this._elementHandle.isVisible(metadata) };
+  async isVisible(params: channels.ElementHandleIsVisibleParams, progress: Progress): Promise<channels.ElementHandleIsVisibleResult> {
+    return { value: await this._elementHandle.isVisible(progress) };
   }
 
-  async dispatchEvent(params: channels.ElementHandleDispatchEventParams, metadata: CallMetadata): Promise<void> {
-    await this._elementHandle.dispatchEvent(metadata, params.type, parseArgument(params.eventInit));
+  async dispatchEvent(params: channels.ElementHandleDispatchEventParams, progress: Progress): Promise<void> {
+    await this._elementHandle.dispatchEvent(progress, params.type, parseArgument(params.eventInit));
   }
 
-  async scrollIntoViewIfNeeded(params: channels.ElementHandleScrollIntoViewIfNeededParams, metadata: CallMetadata): Promise<void> {
-    await this._elementHandle.scrollIntoViewIfNeeded(metadata, params);
+  async scrollIntoViewIfNeeded(params: channels.ElementHandleScrollIntoViewIfNeededParams, progress: Progress): Promise<void> {
+    await this._elementHandle.scrollIntoViewIfNeeded(progress);
   }
 
-  async hover(params: channels.ElementHandleHoverParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.hover(metadata, params);
+  async hover(params: channels.ElementHandleHoverParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.hover(progress, params);
   }
 
-  async click(params: channels.ElementHandleClickParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.click(metadata, params);
+  async click(params: channels.ElementHandleClickParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.click(progress, params);
   }
 
-  async dblclick(params: channels.ElementHandleDblclickParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.dblclick(metadata, params);
+  async dblclick(params: channels.ElementHandleDblclickParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.dblclick(progress, params);
   }
 
-  async tap(params: channels.ElementHandleTapParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.tap(metadata, params);
+  async tap(params: channels.ElementHandleTapParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.tap(progress, params);
   }
 
-  async selectOption(params: channels.ElementHandleSelectOptionParams, metadata: CallMetadata): Promise<channels.ElementHandleSelectOptionResult> {
+  async selectOption(params: channels.ElementHandleSelectOptionParams, progress: Progress): Promise<channels.ElementHandleSelectOptionResult> {
     const elements = (params.elements || []).map(e => (e as ElementHandleDispatcher)._elementHandle);
-    return { values: await this._elementHandle.selectOption(metadata, elements, params.options || [], params) };
+    return { values: await this._elementHandle.selectOption(progress, elements, params.options || [], params) };
   }
 
-  async fill(params: channels.ElementHandleFillParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.fill(metadata, params.value, params);
+  async fill(params: channels.ElementHandleFillParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.fill(progress, params.value, params);
   }
 
-  async selectText(params: channels.ElementHandleSelectTextParams, metadata: CallMetadata): Promise<void> {
-    await this._elementHandle.selectText(metadata, params);
+  async selectText(params: channels.ElementHandleSelectTextParams, progress: Progress): Promise<void> {
+    await this._elementHandle.selectText(progress, params);
   }
 
-  async setInputFiles(params: channels.ElementHandleSetInputFilesParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.setInputFiles(metadata, params);
+  async setInputFiles(params: channels.ElementHandleSetInputFilesParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.setInputFiles(progress, params);
   }
 
-  async focus(params: channels.ElementHandleFocusParams, metadata: CallMetadata): Promise<void> {
-    await this._elementHandle.focus(metadata);
+  async focus(params: channels.ElementHandleFocusParams, progress: Progress): Promise<void> {
+    await this._elementHandle.focus(progress);
   }
 
-  async type(params: channels.ElementHandleTypeParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.type(metadata, params.text, params);
+  async type(params: channels.ElementHandleTypeParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.type(progress, params.text, params);
   }
 
-  async press(params: channels.ElementHandlePressParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.press(metadata, params.key, params);
+  async press(params: channels.ElementHandlePressParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.press(progress, params.key, params);
   }
 
-  async check(params: channels.ElementHandleCheckParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.check(metadata, params);
+  async check(params: channels.ElementHandleCheckParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.check(progress, params);
   }
 
-  async uncheck(params: channels.ElementHandleUncheckParams, metadata: CallMetadata): Promise<void> {
-    return await this._elementHandle.uncheck(metadata, params);
+  async uncheck(params: channels.ElementHandleUncheckParams, progress: Progress): Promise<void> {
+    return await this._elementHandle.uncheck(progress, params);
   }
 
-  async boundingBox(params: channels.ElementHandleBoundingBoxParams, metadata: CallMetadata): Promise<channels.ElementHandleBoundingBoxResult> {
-    const value = await this._elementHandle.boundingBox();
+  async boundingBox(params: channels.ElementHandleBoundingBoxParams, progress: Progress): Promise<channels.ElementHandleBoundingBoxResult> {
+    const value = await progress.race(this._elementHandle.boundingBox());
     return { value: value || undefined };
   }
 
-  async screenshot(params: channels.ElementHandleScreenshotParams, metadata: CallMetadata): Promise<channels.ElementHandleScreenshotResult> {
+  async screenshot(params: channels.ElementHandleScreenshotParams, progress: Progress): Promise<channels.ElementHandleScreenshotResult> {
     const mask: { frame: Frame, selector: string }[] = (params.mask || []).map(({ frame, selector }) => ({
       frame: (frame as FrameDispatcher)._object,
       selector,
     }));
-    return { binary: await this._elementHandle.screenshot(metadata, { ...params, mask }) };
+    return { binary: await this._elementHandle.screenshot(progress, { ...params, mask }) };
   }
 
-  async querySelector(params: channels.ElementHandleQuerySelectorParams, metadata: CallMetadata): Promise<channels.ElementHandleQuerySelectorResult> {
-    const handle = await this._elementHandle.querySelector(params.selector, params);
+  async querySelector(params: channels.ElementHandleQuerySelectorParams, progress: Progress): Promise<channels.ElementHandleQuerySelectorResult> {
+    const handle = await progress.race(this._elementHandle.querySelector(params.selector, params));
     return { element: ElementHandleDispatcher.fromNullable(this.parentScope(), handle) };
   }
 
-  async querySelectorAll(params: channels.ElementHandleQuerySelectorAllParams, metadata: CallMetadata): Promise<channels.ElementHandleQuerySelectorAllResult> {
-    const elements = await this._elementHandle.querySelectorAll(params.selector);
+  async querySelectorAll(params: channels.ElementHandleQuerySelectorAllParams, progress: Progress): Promise<channels.ElementHandleQuerySelectorAllResult> {
+    const elements = await progress.race(this._elementHandle.querySelectorAll(params.selector));
     return { elements: elements.map(e => ElementHandleDispatcher.from(this.parentScope(), e)) };
   }
 
-  async evalOnSelector(params: channels.ElementHandleEvalOnSelectorParams, metadata: CallMetadata): Promise<channels.ElementHandleEvalOnSelectorResult> {
-    return { value: serializeResult(await this._elementHandle.evalOnSelector(params.selector, !!params.strict, params.expression, params.isFunction, parseArgument(params.arg))) };
+  async evalOnSelector(params: channels.ElementHandleEvalOnSelectorParams, progress: Progress): Promise<channels.ElementHandleEvalOnSelectorResult> {
+    return { value: serializeResult(await progress.race(this._elementHandle.evalOnSelector(params.selector, !!params.strict, params.expression, params.isFunction, parseArgument(params.arg)))) };
   }
 
-  async evalOnSelectorAll(params: channels.ElementHandleEvalOnSelectorAllParams, metadata: CallMetadata): Promise<channels.ElementHandleEvalOnSelectorAllResult> {
-    return { value: serializeResult(await this._elementHandle.evalOnSelectorAll(params.selector, params.expression, params.isFunction, parseArgument(params.arg))) };
+  async evalOnSelectorAll(params: channels.ElementHandleEvalOnSelectorAllParams, progress: Progress): Promise<channels.ElementHandleEvalOnSelectorAllResult> {
+    return { value: serializeResult(await progress.race(this._elementHandle.evalOnSelectorAll(params.selector, params.expression, params.isFunction, parseArgument(params.arg)))) };
   }
 
-  async waitForElementState(params: channels.ElementHandleWaitForElementStateParams, metadata: CallMetadata): Promise<void> {
-    await this._elementHandle.waitForElementState(metadata, params.state, params);
+  async waitForElementState(params: channels.ElementHandleWaitForElementStateParams, progress: Progress): Promise<void> {
+    await this._elementHandle.waitForElementState(progress, params.state);
   }
 
-  async waitForSelector(params: channels.ElementHandleWaitForSelectorParams, metadata: CallMetadata): Promise<channels.ElementHandleWaitForSelectorResult> {
-    return { element: ElementHandleDispatcher.fromNullable(this.parentScope(), await this._elementHandle.waitForSelector(metadata, params.selector, params)) };
+  async waitForSelector(params: channels.ElementHandleWaitForSelectorParams, progress: Progress): Promise<channels.ElementHandleWaitForSelectorResult> {
+    return { element: ElementHandleDispatcher.fromNullable(this.parentScope(), await this._elementHandle.waitForSelector(progress, params.selector, params)) };
   }
 
   private _browserContextDispatcher(): BrowserContextDispatcher {
-    const scope = this.parentScope();
-    if (scope instanceof BrowserContextDispatcher)
-      return scope;
-    if (scope instanceof PageDispatcher)
-      return scope.parentScope();
-    if ((scope instanceof WorkerDispatcher) || (scope instanceof FrameDispatcher))  {
-      const parentScope = scope.parentScope();
-      if (parentScope instanceof BrowserContextDispatcher)
-        return parentScope;
-      return parentScope.parentScope();
-    }
-    throw new Error('ElementHandle belongs to unexpected scope');
+    const parentScope = this.parentScope().parentScope();
+    if (parentScope instanceof BrowserContextDispatcher)
+      return parentScope;
+    return parentScope.parentScope();
   }
 
 }
diff --git a/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts b/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts
index 6dcb9a7220fcd..6f9e692473390 100644
--- a/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/frameDispatcher.ts
@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
-import type { NavigationEvent } from '../frames';
 import { Frame } from '../frames';
-import type * as channels from '@protocol/channels';
-import { Dispatcher, existingDispatcher } from './dispatcher';
+import { Dispatcher } from './dispatcher';
 import { ElementHandleDispatcher } from './elementHandlerDispatcher';
 import { parseArgument, serializeResult } from './jsHandleDispatcher';
 import { ResponseDispatcher } from './networkDispatchers';
 import { RequestDispatcher } from './networkDispatchers';
-import type { CallMetadata } from '../instrumentation';
+import { parseAriaSnapshotUnsafe } from '../../utils/isomorphic/ariaSnapshot';
+import { yaml } from '../../utilsBundle';
+
+import type { Progress } from '../progress';
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
 import type { PageDispatcher } from './pageDispatcher';
-import { debugAssert } from '../../utils';
+import type { NavigationEvent } from '../frames';
+import type * as channels from '@protocol/channels';
 
 export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, BrowserContextDispatcher | PageDispatcher> implements channels.FrameChannel {
   _type_Frame = true;
@@ -33,7 +35,7 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, Br
   private _browserContextDispatcher: BrowserContextDispatcher;
 
   static from(scope: BrowserContextDispatcher, frame: Frame): FrameDispatcher {
-    const result = existingDispatcher<FrameDispatcher>(frame);
+    const result = scope.connection.existingDispatcher<FrameDispatcher>(frame);
     return result || new FrameDispatcher(scope, frame);
   }
 
@@ -47,9 +49,8 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, Br
     // Main frames are gc'ed separately from any other frames, so that
     // methods on Page that redirect to the main frame remain operational.
     // Note: we cannot check parentFrame() here because it may be null after the frame has been detached.
-    debugAssert(frame._page.mainFrame(), 'Cannot determine whether the frame is a main frame');
     const gcBucket = frame._page.mainFrame() === frame ? 'MainFrame' : 'Frame';
-    const pageDispatcher = existingDispatcher<PageDispatcher>(frame._page);
+    const pageDispatcher = scope.connection.existingDispatcher<PageDispatcher>(frame._page);
     super(pageDispatcher || scope, frame, 'Frame', {
       url: frame.url(),
       name: frame.name(),
@@ -74,194 +75,204 @@ export class FrameDispatcher extends Dispatcher<Frame, channels.FrameChannel, Br
     });
   }
 
-  async goto(params: channels.FrameGotoParams, metadata: CallMetadata): Promise<channels.FrameGotoResult> {
-    return { response: ResponseDispatcher.fromNullable(this._browserContextDispatcher, await this._frame.goto(metadata, params.url, params)) };
+  async goto(params: channels.FrameGotoParams, progress: Progress): Promise<channels.FrameGotoResult> {
+    return { response: ResponseDispatcher.fromNullable(this._browserContextDispatcher, await this._frame.goto(progress, params.url, params)) };
   }
 
-  async frameElement(): Promise<channels.FrameFrameElementResult> {
-    return { element: ElementHandleDispatcher.from(this, await this._frame.frameElement()) };
+  async frameElement(params: channels.FrameFrameElementParams, progress: Progress): Promise<channels.FrameFrameElementResult> {
+    return { element: ElementHandleDispatcher.from(this, await progress.race(this._frame.frameElement())) };
   }
 
-  async evaluateExpression(params: channels.FrameEvaluateExpressionParams, metadata: CallMetadata): Promise<channels.FrameEvaluateExpressionResult> {
-    return { value: serializeResult(await this._frame.evaluateExpression(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg))) };
+  async evaluateExpression(params: channels.FrameEvaluateExpressionParams, progress: Progress): Promise<channels.FrameEvaluateExpressionResult> {
+    return { value: serializeResult(await progress.race(this._frame.evaluateExpression(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg)))) };
   }
 
-  async evaluateExpressionHandle(params: channels.FrameEvaluateExpressionHandleParams, metadata: CallMetadata): Promise<channels.FrameEvaluateExpressionHandleResult> {
-    return { handle: ElementHandleDispatcher.fromJSHandle(this, await this._frame.evaluateExpressionHandle(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg))) };
+  async evaluateExpressionHandle(params: channels.FrameEvaluateExpressionHandleParams, progress: Progress): Promise<channels.FrameEvaluateExpressionHandleResult> {
+    return { handle: ElementHandleDispatcher.fromJSOrElementHandle(this, await progress.race(this._frame.evaluateExpressionHandle(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg)))) };
   }
 
-  async waitForSelector(params: channels.FrameWaitForSelectorParams, metadata: CallMetadata): Promise<channels.FrameWaitForSelectorResult> {
-    return { element: ElementHandleDispatcher.fromNullable(this, await this._frame.waitForSelector(metadata, params.selector, params)) };
+  async waitForSelector(params: channels.FrameWaitForSelectorParams, progress: Progress): Promise<channels.FrameWaitForSelectorResult> {
+    return { element: ElementHandleDispatcher.fromNullable(this, await this._frame.waitForSelector(progress, params.selector, true, params)) };
   }
 
-  async dispatchEvent(params: channels.FrameDispatchEventParams, metadata: CallMetadata): Promise<void> {
-    return this._frame.dispatchEvent(metadata, params.selector, params.type, parseArgument(params.eventInit), params);
+  async dispatchEvent(params: channels.FrameDispatchEventParams, progress: Progress): Promise<void> {
+    return this._frame.dispatchEvent(progress, params.selector, params.type, parseArgument(params.eventInit), params);
   }
 
-  async evalOnSelector(params: channels.FrameEvalOnSelectorParams, metadata: CallMetadata): Promise<channels.FrameEvalOnSelectorResult> {
-    return { value: serializeResult(await this._frame.evalOnSelector(params.selector, !!params.strict, params.expression, params.isFunction, parseArgument(params.arg))) };
+  async evalOnSelector(params: channels.FrameEvalOnSelectorParams, progress: Progress): Promise<channels.FrameEvalOnSelectorResult> {
+    return { value: serializeResult(await progress.race(this._frame.evalOnSelector(params.selector, !!params.strict, params.expression, params.isFunction, parseArgument(params.arg)))) };
   }
 
-  async evalOnSelectorAll(params: channels.FrameEvalOnSelectorAllParams, metadata: CallMetadata): Promise<channels.FrameEvalOnSelectorAllResult> {
-    return { value: serializeResult(await this._frame.evalOnSelectorAll(params.selector, params.expression, params.isFunction, parseArgument(params.arg))) };
+  async evalOnSelectorAll(params: channels.FrameEvalOnSelectorAllParams, progress: Progress): Promise<channels.FrameEvalOnSelectorAllResult> {
+    return { value: serializeResult(await progress.race(this._frame.evalOnSelectorAll(params.selector, params.expression, params.isFunction, parseArgument(params.arg)))) };
   }
 
-  async querySelector(params: channels.FrameQuerySelectorParams, metadata: CallMetadata): Promise<channels.FrameQuerySelectorResult> {
-    return { element: ElementHandleDispatcher.fromNullable(this, await this._frame.querySelector(params.selector, params)) };
+  async querySelector(params: channels.FrameQuerySelectorParams, progress: Progress): Promise<channels.FrameQuerySelectorResult> {
+    return { element: ElementHandleDispatcher.fromNullable(this, await progress.race(this._frame.querySelector(params.selector, params))) };
   }
 
-  async querySelectorAll(params: channels.FrameQuerySelectorAllParams, metadata: CallMetadata): Promise<channels.FrameQuerySelectorAllResult> {
-    const elements = await this._frame.querySelectorAll(params.selector);
+  async querySelectorAll(params: channels.FrameQuerySelectorAllParams, progress: Progress): Promise<channels.FrameQuerySelectorAllResult> {
+    const elements = await progress.race(this._frame.querySelectorAll(params.selector));
     return { elements: elements.map(e => ElementHandleDispatcher.from(this, e)) };
   }
 
-  async queryCount(params: channels.FrameQueryCountParams): Promise<channels.FrameQueryCountResult> {
-    return { value: await this._frame.queryCount(params.selector) };
+  async queryCount(params: channels.FrameQueryCountParams, progress: Progress): Promise<channels.FrameQueryCountResult> {
+    return { value: await progress.race(this._frame.queryCount(params.selector, params)) };
   }
 
-  async content(): Promise<channels.FrameContentResult> {
-    return { value: await this._frame.content() };
+  async content(params: channels.FrameContentParams, progress: Progress): Promise<channels.FrameContentResult> {
+    return { value: await progress.race(this._frame.content()) };
   }
 
-  async setContent(params: channels.FrameSetContentParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.setContent(metadata, params.html, params);
+  async setContent(params: channels.FrameSetContentParams, progress: Progress): Promise<void> {
+    return await this._frame.setContent(progress, params.html, params);
   }
 
-  async addScriptTag(params: channels.FrameAddScriptTagParams, metadata: CallMetadata): Promise<channels.FrameAddScriptTagResult> {
-    return { element: ElementHandleDispatcher.from(this, await this._frame.addScriptTag(params)) };
+  async addScriptTag(params: channels.FrameAddScriptTagParams, progress: Progress): Promise<channels.FrameAddScriptTagResult> {
+    return { element: ElementHandleDispatcher.from(this, await progress.race(this._frame.addScriptTag(params))) };
   }
 
-  async addStyleTag(params: channels.FrameAddStyleTagParams, metadata: CallMetadata): Promise<channels.FrameAddStyleTagResult> {
-    return { element: ElementHandleDispatcher.from(this, await this._frame.addStyleTag(params)) };
+  async addStyleTag(params: channels.FrameAddStyleTagParams, progress: Progress): Promise<channels.FrameAddStyleTagResult> {
+    return { element: ElementHandleDispatcher.from(this, await progress.race(this._frame.addStyleTag(params))) };
   }
 
-  async click(params: channels.FrameClickParams, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
-    return await this._frame.click(metadata, params.selector, params);
+  async click(params: channels.FrameClickParams, progress: Progress): Promise<void> {
+    progress.metadata.potentiallyClosesScope = true;
+    return await this._frame.click(progress, params.selector, params);
   }
 
-  async dblclick(params: channels.FrameDblclickParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.dblclick(metadata, params.selector, params);
+  async dblclick(params: channels.FrameDblclickParams, progress: Progress): Promise<void> {
+    return await this._frame.dblclick(progress, params.selector, params);
   }
 
-  async dragAndDrop(params: channels.FrameDragAndDropParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.dragAndDrop(metadata, params.source, params.target, params);
+  async dragAndDrop(params: channels.FrameDragAndDropParams, progress: Progress): Promise<void> {
+    return await this._frame.dragAndDrop(progress, params.source, params.target, params);
   }
 
-  async tap(params: channels.FrameTapParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.tap(metadata, params.selector, params);
+  async tap(params: channels.FrameTapParams, progress: Progress): Promise<void> {
+    return await this._frame.tap(progress, params.selector, params);
   }
 
-  async fill(params: channels.FrameFillParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.fill(metadata, params.selector, params.value, params);
+  async fill(params: channels.FrameFillParams, progress: Progress): Promise<void> {
+    return await this._frame.fill(progress, params.selector, params.value, params);
   }
 
-  async focus(params: channels.FrameFocusParams, metadata: CallMetadata): Promise<void> {
-    await this._frame.focus(metadata, params.selector, params);
+  async focus(params: channels.FrameFocusParams, progress: Progress): Promise<void> {
+    await this._frame.focus(progress, params.selector, params);
   }
 
-  async blur(params: channels.FrameBlurParams, metadata: CallMetadata): Promise<void> {
-    await this._frame.blur(metadata, params.selector, params);
+  async blur(params: channels.FrameBlurParams, progress: Progress): Promise<void> {
+    await this._frame.blur(progress, params.selector, params);
   }
 
-  async textContent(params: channels.FrameTextContentParams, metadata: CallMetadata): Promise<channels.FrameTextContentResult> {
-    const value = await this._frame.textContent(metadata, params.selector, params);
+  async textContent(params: channels.FrameTextContentParams, progress: Progress): Promise<channels.FrameTextContentResult> {
+    const value = await this._frame.textContent(progress, params.selector, params);
     return { value: value === null ? undefined : value };
   }
 
-  async innerText(params: channels.FrameInnerTextParams, metadata: CallMetadata): Promise<channels.FrameInnerTextResult> {
-    return { value: await this._frame.innerText(metadata, params.selector, params) };
+  async innerText(params: channels.FrameInnerTextParams, progress: Progress): Promise<channels.FrameInnerTextResult> {
+    return { value: await this._frame.innerText(progress, params.selector, params) };
   }
 
-  async innerHTML(params: channels.FrameInnerHTMLParams, metadata: CallMetadata): Promise<channels.FrameInnerHTMLResult> {
-    return { value: await this._frame.innerHTML(metadata, params.selector, params) };
+  async innerHTML(params: channels.FrameInnerHTMLParams, progress: Progress): Promise<channels.FrameInnerHTMLResult> {
+    return { value: await this._frame.innerHTML(progress, params.selector, params) };
   }
 
-  async getAttribute(params: channels.FrameGetAttributeParams, metadata: CallMetadata): Promise<channels.FrameGetAttributeResult> {
-    const value = await this._frame.getAttribute(metadata, params.selector, params.name, params);
+  async resolveSelector(params: channels.FrameResolveSelectorParams, progress: Progress): Promise<channels.FrameResolveSelectorResult> {
+    return await this._frame.resolveSelector(progress, params.selector);
+  }
+
+  async getAttribute(params: channels.FrameGetAttributeParams, progress: Progress): Promise<channels.FrameGetAttributeResult> {
+    const value = await this._frame.getAttribute(progress, params.selector, params.name, params);
     return { value: value === null ? undefined : value };
   }
 
-  async inputValue(params: channels.FrameInputValueParams, metadata: CallMetadata): Promise<channels.FrameInputValueResult> {
-    const value = await this._frame.inputValue(metadata, params.selector, params);
+  async inputValue(params: channels.FrameInputValueParams, progress: Progress): Promise<channels.FrameInputValueResult> {
+    const value = await this._frame.inputValue(progress, params.selector, params);
     return { value };
   }
 
-  async isChecked(params: channels.FrameIsCheckedParams, metadata: CallMetadata): Promise<channels.FrameIsCheckedResult> {
-    return { value: await this._frame.isChecked(metadata, params.selector, params) };
+  async isChecked(params: channels.FrameIsCheckedParams, progress: Progress): Promise<channels.FrameIsCheckedResult> {
+    return { value: await this._frame.isChecked(progress, params.selector, params) };
   }
 
-  async isDisabled(params: channels.FrameIsDisabledParams, metadata: CallMetadata): Promise<channels.FrameIsDisabledResult> {
-    return { value: await this._frame.isDisabled(metadata, params.selector, params) };
+  async isDisabled(params: channels.FrameIsDisabledParams, progress: Progress): Promise<channels.FrameIsDisabledResult> {
+    return { value: await this._frame.isDisabled(progress, params.selector, params) };
   }
 
-  async isEditable(params: channels.FrameIsEditableParams, metadata: CallMetadata): Promise<channels.FrameIsEditableResult> {
-    return { value: await this._frame.isEditable(metadata, params.selector, params) };
+  async isEditable(params: channels.FrameIsEditableParams, progress: Progress): Promise<channels.FrameIsEditableResult> {
+    return { value: await this._frame.isEditable(progress, params.selector, params) };
   }
 
-  async isEnabled(params: channels.FrameIsEnabledParams, metadata: CallMetadata): Promise<channels.FrameIsEnabledResult> {
-    return { value: await this._frame.isEnabled(metadata, params.selector, params) };
+  async isEnabled(params: channels.FrameIsEnabledParams, progress: Progress): Promise<channels.FrameIsEnabledResult> {
+    return { value: await this._frame.isEnabled(progress, params.selector, params) };
   }
 
-  async isHidden(params: channels.FrameIsHiddenParams, metadata: CallMetadata): Promise<channels.FrameIsHiddenResult> {
-    return { value: await this._frame.isHidden(metadata, params.selector, params) };
+  async isHidden(params: channels.FrameIsHiddenParams, progress: Progress): Promise<channels.FrameIsHiddenResult> {
+    return { value: await this._frame.isHidden(progress, params.selector, params) };
   }
 
-  async isVisible(params: channels.FrameIsVisibleParams, metadata: CallMetadata): Promise<channels.FrameIsVisibleResult> {
-    return { value: await this._frame.isVisible(metadata, params.selector, params) };
+  async isVisible(params: channels.FrameIsVisibleParams, progress: Progress): Promise<channels.FrameIsVisibleResult> {
+    return { value: await this._frame.isVisible(progress, params.selector, params) };
   }
 
-  async hover(params: channels.FrameHoverParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.hover(metadata, params.selector, params);
+  async hover(params: channels.FrameHoverParams, progress: Progress): Promise<void> {
+    return await this._frame.hover(progress, params.selector, params);
   }
 
-  async selectOption(params: channels.FrameSelectOptionParams, metadata: CallMetadata): Promise<channels.FrameSelectOptionResult> {
+  async selectOption(params: channels.FrameSelectOptionParams, progress: Progress): Promise<channels.FrameSelectOptionResult> {
     const elements = (params.elements || []).map(e => (e as ElementHandleDispatcher)._elementHandle);
-    return { values: await this._frame.selectOption(metadata, params.selector, elements, params.options || [], params) };
+    return { values: await this._frame.selectOption(progress, params.selector, elements, params.options || [], params) };
   }
 
-  async setInputFiles(params: channels.FrameSetInputFilesParams, metadata: CallMetadata): Promise<channels.FrameSetInputFilesResult> {
-    return await this._frame.setInputFiles(metadata, params.selector, params);
+  async setInputFiles(params: channels.FrameSetInputFilesParams, progress: Progress): Promise<channels.FrameSetInputFilesResult> {
+    return await this._frame.setInputFiles(progress, params.selector, params);
   }
 
-  async type(params: channels.FrameTypeParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.type(metadata, params.selector, params.text, params);
+  async type(params: channels.FrameTypeParams, progress: Progress): Promise<void> {
+    return await this._frame.type(progress, params.selector, params.text, params);
   }
 
-  async press(params: channels.FramePressParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.press(metadata, params.selector, params.key, params);
+  async press(params: channels.FramePressParams, progress: Progress): Promise<void> {
+    return await this._frame.press(progress, params.selector, params.key, params);
   }
 
-  async check(params: channels.FrameCheckParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.check(metadata, params.selector, params);
+  async check(params: channels.FrameCheckParams, progress: Progress): Promise<void> {
+    return await this._frame.check(progress, params.selector, params);
   }
 
-  async uncheck(params: channels.FrameUncheckParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.uncheck(metadata, params.selector, params);
+  async uncheck(params: channels.FrameUncheckParams, progress: Progress): Promise<void> {
+    return await this._frame.uncheck(progress, params.selector, params);
   }
 
-  async waitForTimeout(params: channels.FrameWaitForTimeoutParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.waitForTimeout(metadata, params.timeout);
+  async waitForTimeout(params: channels.FrameWaitForTimeoutParams, progress: Progress): Promise<void> {
+    return await this._frame.waitForTimeout(progress, params.waitTimeout);
   }
 
-  async waitForFunction(params: channels.FrameWaitForFunctionParams, metadata: CallMetadata): Promise<channels.FrameWaitForFunctionResult> {
-    return { handle: ElementHandleDispatcher.fromJSHandle(this, await this._frame._waitForFunctionExpression(metadata, params.expression, params.isFunction, parseArgument(params.arg), params)) };
+  async waitForFunction(params: channels.FrameWaitForFunctionParams, progress: Progress): Promise<channels.FrameWaitForFunctionResult> {
+    return { handle: ElementHandleDispatcher.fromJSOrElementHandle(this, await this._frame.waitForFunctionExpression(progress, params.expression, params.isFunction, parseArgument(params.arg), params)) };
   }
 
-  async title(params: channels.FrameTitleParams, metadata: CallMetadata): Promise<channels.FrameTitleResult> {
-    return { value: await this._frame.title() };
+  async title(params: channels.FrameTitleParams, progress: Progress): Promise<channels.FrameTitleResult> {
+    return { value: await progress.race(this._frame.title()) };
   }
 
-  async highlight(params: channels.FrameHighlightParams, metadata: CallMetadata): Promise<void> {
-    return await this._frame.highlight(params.selector);
+  async highlight(params: channels.FrameHighlightParams, progress: Progress): Promise<void> {
+    return await this._frame.highlight(progress, params.selector);
   }
 
-  async expect(params: channels.FrameExpectParams, metadata: CallMetadata): Promise<channels.FrameExpectResult> {
-    metadata.potentiallyClosesScope = true;
-    const expectedValue = params.expectedValue ? parseArgument(params.expectedValue) : undefined;
-    const result = await this._frame.expect(metadata, params.selector, { ...params, expectedValue });
+  async expect(params: channels.FrameExpectParams, progress: Progress): Promise<channels.FrameExpectResult> {
+    progress.metadata.potentiallyClosesScope = true;
+    let expectedValue = params.expectedValue ? parseArgument(params.expectedValue) : undefined;
+    if (params.expression === 'to.match.aria' && expectedValue)
+      expectedValue = parseAriaSnapshotUnsafe(yaml, expectedValue);
+    const result = await this._frame.expect(progress, params.selector, { ...params, expectedValue }, params.timeout);
     if (result.received !== undefined)
       result.received = serializeResult(result.received);
     return result;
   }
+
+  async ariaSnapshot(params: channels.FrameAriaSnapshotParams, progress: Progress): Promise<channels.FrameAriaSnapshotResult> {
+    return { snapshot: await this._frame.ariaSnapshot(progress, params.selector) };
+  }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts b/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts
index 07e9d38ee5c2b..4bd068f3738af 100644
--- a/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/jsHandleDispatcher.ts
@@ -14,22 +14,27 @@
  * limitations under the License.
  */
 
-import type * as js from '../javascript';
-import type * as channels from '@protocol/channels';
 import { Dispatcher } from './dispatcher';
 import { ElementHandleDispatcher } from './elementHandlerDispatcher';
 import { parseSerializedValue, serializeValue } from '../../protocol/serializers';
-import type { PageDispatcher, WorkerDispatcher } from './pageDispatcher';
+
+import type * as js from '../javascript';
 import type { ElectronApplicationDispatcher } from './electronDispatcher';
 import type { FrameDispatcher } from './frameDispatcher';
-import type { CallMetadata } from '../instrumentation';
+import type { PageDispatcher, WorkerDispatcher } from './pageDispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export type JSHandleDispatcherParentScope = PageDispatcher | FrameDispatcher | WorkerDispatcher | ElectronApplicationDispatcher;
 
-export class JSHandleDispatcher extends Dispatcher<js.JSHandle, channels.JSHandleChannel, JSHandleDispatcherParentScope> implements channels.JSHandleChannel {
+export class JSHandleDispatcher<ParentScope extends JSHandleDispatcherParentScope = JSHandleDispatcherParentScope> extends Dispatcher<js.JSHandle, channels.JSHandleChannel, ParentScope> implements channels.JSHandleChannel {
   _type_JSHandle = true;
 
-  protected constructor(scope: JSHandleDispatcherParentScope, jsHandle: js.JSHandle) {
+  static fromJSHandle(scope: JSHandleDispatcherParentScope, handle: js.JSHandle): JSHandleDispatcher {
+    return scope.connection.existingDispatcher<JSHandleDispatcher>(handle) || new JSHandleDispatcher(scope, handle);
+  }
+
+  protected constructor(scope: ParentScope, jsHandle: js.JSHandle) {
     // Do not call this directly, use createHandle() instead.
     super(scope, jsHandle, jsHandle.asElement() ? 'ElementHandle' : 'JSHandle', {
       preview: jsHandle.toString(),
@@ -37,38 +42,39 @@ export class JSHandleDispatcher extends Dispatcher<js.JSHandle, channels.JSHandl
     jsHandle._setPreviewCallback(preview => this._dispatchEvent('previewUpdated', { preview }));
   }
 
-  async evaluateExpression(params: channels.JSHandleEvaluateExpressionParams): Promise<channels.JSHandleEvaluateExpressionResult> {
-    return { value: serializeResult(await this._object.evaluateExpression(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg))) };
+  async evaluateExpression(params: channels.JSHandleEvaluateExpressionParams, progress: Progress): Promise<channels.JSHandleEvaluateExpressionResult> {
+    const jsHandle = await progress.race(this._object.evaluateExpression(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg)));
+    return { value: serializeResult(jsHandle) };
   }
 
-  async evaluateExpressionHandle(params: channels.JSHandleEvaluateExpressionHandleParams): Promise<channels.JSHandleEvaluateExpressionHandleResult> {
-    const jsHandle = await this._object.evaluateExpressionHandle(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg));
-    return { handle: ElementHandleDispatcher.fromJSHandle(this.parentScope(), jsHandle) };
+  async evaluateExpressionHandle(params: channels.JSHandleEvaluateExpressionHandleParams, progress: Progress): Promise<channels.JSHandleEvaluateExpressionHandleResult> {
+    const jsHandle = await progress.race(this._object.evaluateExpressionHandle(params.expression, { isFunction: params.isFunction }, parseArgument(params.arg)));
+    // If "jsHandle" is an ElementHandle, it belongs to the same frame as "this".
+    return { handle: ElementHandleDispatcher.fromJSOrElementHandle(this.parentScope() as FrameDispatcher, jsHandle) };
   }
 
-  async getProperty(params: channels.JSHandleGetPropertyParams): Promise<channels.JSHandleGetPropertyResult> {
-    const jsHandle = await this._object.getProperty(params.name);
-    return { handle: ElementHandleDispatcher.fromJSHandle(this.parentScope(), jsHandle) };
+  async getProperty(params: channels.JSHandleGetPropertyParams, progress: Progress): Promise<channels.JSHandleGetPropertyResult> {
+    const jsHandle = await progress.race(this._object.getProperty(params.name));
+    // If "jsHandle" is an ElementHandle, it belongs to the same frame as "this".
+    return { handle: ElementHandleDispatcher.fromJSOrElementHandle(this.parentScope() as FrameDispatcher, jsHandle) };
   }
 
-  async getPropertyList(): Promise<channels.JSHandleGetPropertyListResult> {
-    const map = await this._object.getProperties();
+  async getPropertyList(params: channels.JSHandleGetPropertyListParams, progress: Progress): Promise<channels.JSHandleGetPropertyListResult> {
+    const map = await progress.race(this._object.getProperties());
     const properties = [];
-    for (const [name, value] of map)
-      properties.push({ name, value: ElementHandleDispatcher.fromJSHandle(this.parentScope(), value) });
+    for (const [name, value] of map) {
+      // If "jsHandle" is an ElementHandle, it belongs to the same frame as "this".
+      properties.push({ name, value: ElementHandleDispatcher.fromJSOrElementHandle(this.parentScope() as FrameDispatcher, value) });
+    }
     return { properties };
   }
 
-  async jsonValue(): Promise<channels.JSHandleJsonValueResult> {
-    return { value: serializeResult(await this._object.jsonValue()) };
-  }
-
-  async objectCount(params?: channels.JSHandleObjectCountParams | undefined): Promise<channels.JSHandleObjectCountResult> {
-    return { count: await this._object.objectCount() };
+  async jsonValue(params: channels.JSHandleJsonValueParams, progress: Progress): Promise<channels.JSHandleJsonValueResult> {
+    return { value: serializeResult(await progress.race(this._object.jsonValue())) };
   }
 
-  async dispose(_: any, metadata: CallMetadata) {
-    metadata.potentiallyClosesScope = true;
+  async dispose(_: any, progress: Progress) {
+    progress.metadata.potentiallyClosesScope = true;
     this._object.dispose();
     this._dispose();
   }
diff --git a/packages/playwright-core/src/server/dispatchers/jsonPipeDispatcher.ts b/packages/playwright-core/src/server/dispatchers/jsonPipeDispatcher.ts
index dead26993f826..f60e50cd9231d 100644
--- a/packages/playwright-core/src/server/dispatchers/jsonPipeDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/jsonPipeDispatcher.ts
@@ -14,22 +14,24 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { Dispatcher } from './dispatcher';
-import { createGuid } from '../../utils';
+import { SdkObject } from '../instrumentation';
+
 import type { LocalUtilsDispatcher } from './localUtilsDispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
-export class JsonPipeDispatcher extends Dispatcher<{ guid: string }, channels.JsonPipeChannel, LocalUtilsDispatcher> implements channels.JsonPipeChannel {
+export class JsonPipeDispatcher extends Dispatcher<SdkObject, channels.JsonPipeChannel, LocalUtilsDispatcher> implements channels.JsonPipeChannel {
   _type_JsonPipe = true;
   constructor(scope: LocalUtilsDispatcher) {
-    super(scope, { guid: 'jsonPipe@' + createGuid() }, 'JsonPipe', {});
+    super(scope, new SdkObject(scope._object, 'jsonPipe'), 'JsonPipe', {});
   }
 
-  async send(params: channels.JsonPipeSendParams): Promise<channels.JsonPipeSendResult> {
+  async send(params: channels.JsonPipeSendParams, progress: Progress): Promise<channels.JsonPipeSendResult> {
     this.emit('message', params.message);
   }
 
-  async close(): Promise<void> {
+  async close(params: channels.JsonPipeCloseParams, progress: Progress): Promise<void> {
     this.emit('close');
     if (!this._disposed) {
       this._dispatchEvent('closed', {});
diff --git a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
index b6f8fe80ac793..94d0332b47a6e 100644
--- a/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/localUtilsDispatcher.ts
@@ -14,46 +14,33 @@
  * limitations under the License.
  */
 
-import type EventEmitter from 'events';
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import type * as channels from '@protocol/channels';
-import { ManualPromise } from '../../utils/manualPromise';
-import { assert, calculateSha1, createGuid, removeFolders } from '../../utils';
-import type { RootDispatcher } from './dispatcher';
 import { Dispatcher } from './dispatcher';
-import { yazl, yauzl } from '../../zipBundle';
-import { ZipFile } from '../../utils/zipFile';
-import type * as har from '@trace/har';
-import type { HeadersArray } from '../types';
+import { SdkObject } from '../../server/instrumentation';
+import * as localUtils from '../localUtils';
+import { getUserAgent } from '../utils/userAgent';
+import { deviceDescriptors as descriptors }  from '../deviceDescriptors';
 import { JsonPipeDispatcher } from '../dispatchers/jsonPipeDispatcher';
-import { WebSocketTransport } from '../transport';
+import { Progress } from '../progress';
 import { SocksInterceptor } from '../socksInterceptor';
-import type { CallMetadata } from '../instrumentation';
-import { getUserAgent } from '../../utils/userAgent';
-import type { Progress } from '../progress';
-import { ProgressController } from '../progress';
-import { fetchData } from '../../utils/network';
-import type { HTTPRequestParams } from '../../utils/network';
-import type http from 'http';
+import { WebSocketTransport } from '../transport';
+import { fetchData } from '../utils/network';
+import { resolveGlobToRegexPattern } from '../../utils/isomorphic/urlMatch';
+
+import type { HarBackend } from '../harBackend';
 import type { Playwright } from '../playwright';
-import { SdkObject } from '../../server/instrumentation';
-import { serializeClientSideCallMetadata } from '../../utils';
-import { deviceDescriptors as descriptors }  from '../deviceDescriptors';
+import type { RootDispatcher } from './dispatcher';
+import type * as channels from '@protocol/channels';
+import type * as http from 'http';
+import type { HTTPRequestParams } from '../utils/network';
 
-export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels.LocalUtilsChannel, RootDispatcher> implements channels.LocalUtilsChannel {
+export class LocalUtilsDispatcher extends Dispatcher<SdkObject, channels.LocalUtilsChannel, RootDispatcher> implements channels.LocalUtilsChannel {
   _type_LocalUtils: boolean;
   private _harBackends = new Map<string, HarBackend>();
-  private _stackSessions = new Map<string, {
-    file: string,
-    writer: Promise<void>,
-    tmpDir: string | undefined,
-    callStacks: channels.ClientSideCallMetadata[]
-  }>();
+  private _stackSessions = new Map<string, localUtils.StackSession>();
 
   constructor(scope: RootDispatcher, playwright: Playwright) {
     const localUtils = new SdkObject(playwright, 'localUtils', 'localUtils');
+    localUtils.logName = 'browser';
     const deviceDescriptors = Object.entries(descriptors)
         .map(([name, descriptor]) => ({ name, descriptor }));
     super(scope, localUtils, 'LocalUtils', {
@@ -62,379 +49,98 @@ export class LocalUtilsDispatcher extends Dispatcher<{ guid: string }, channels.
     this._type_LocalUtils = true;
   }
 
-  async zip(params: channels.LocalUtilsZipParams): Promise<void> {
-    const promise = new ManualPromise<void>();
-    const zipFile = new yazl.ZipFile();
-    (zipFile as any as EventEmitter).on('error', error => promise.reject(error));
-
-    const addFile = (file: string, name: string) => {
-      try {
-        if (fs.statSync(file).isFile())
-          zipFile.addFile(file, name);
-      } catch (e) {
-      }
-    };
-
-    for (const entry of params.entries)
-      addFile(entry.value, entry.name);
-
-    // Add stacks and the sources.
-    const stackSession = params.stacksId ? this._stackSessions.get(params.stacksId) : undefined;
-    if (stackSession?.callStacks.length) {
-      await stackSession.writer;
-      if (process.env.PW_LIVE_TRACE_STACKS) {
-        zipFile.addFile(stackSession.file, 'trace.stacks');
-      } else {
-        const buffer = Buffer.from(JSON.stringify(serializeClientSideCallMetadata(stackSession.callStacks)));
-        zipFile.addBuffer(buffer, 'trace.stacks');
-      }
-    }
-
-    // Collect sources from stacks.
-    if (params.includeSources) {
-      const sourceFiles = new Set<string>();
-      for (const { stack } of stackSession?.callStacks || []) {
-        if (!stack)
-          continue;
-        for (const { file } of stack)
-          sourceFiles.add(file);
-      }
-      for (const sourceFile of sourceFiles)
-        addFile(sourceFile, 'resources/src@' + calculateSha1(sourceFile) + '.txt');
-    }
-
-    if (params.mode === 'write') {
-      // New file, just compress the entries.
-      await fs.promises.mkdir(path.dirname(params.zipFile), { recursive: true });
-      zipFile.end(undefined, () => {
-        zipFile.outputStream.pipe(fs.createWriteStream(params.zipFile))
-            .on('close', () => promise.resolve())
-            .on('error', error => promise.reject(error));
-      });
-      await promise;
-      await this._deleteStackSession(params.stacksId);
-      return;
-    }
-
-    // File already exists. Repack and add new entries.
-    const tempFile = params.zipFile + '.tmp';
-    await fs.promises.rename(params.zipFile, tempFile);
-
-    yauzl.open(tempFile, (err, inZipFile) => {
-      if (err) {
-        promise.reject(err);
-        return;
-      }
-      assert(inZipFile);
-      let pendingEntries = inZipFile.entryCount;
-      inZipFile.on('entry', entry => {
-        inZipFile.openReadStream(entry, (err, readStream) => {
-          if (err) {
-            promise.reject(err);
-            return;
-          }
-          zipFile.addReadStream(readStream!, entry.fileName);
-          if (--pendingEntries === 0) {
-            zipFile.end(undefined, () => {
-              zipFile.outputStream.pipe(fs.createWriteStream(params.zipFile)).on('close', () => {
-                fs.promises.unlink(tempFile).then(() => {
-                  promise.resolve();
-                }).catch(error => promise.reject(error));
-              });
-            });
-          }
-        });
-      });
-    });
-    await promise;
-    await this._deleteStackSession(params.stacksId);
-  }
-
-  async harOpen(params: channels.LocalUtilsHarOpenParams, metadata: CallMetadata): Promise<channels.LocalUtilsHarOpenResult> {
-    let harBackend: HarBackend;
-    if (params.file.endsWith('.zip')) {
-      const zipFile = new ZipFile(params.file);
-      const entryNames = await zipFile.entries();
-      const harEntryName = entryNames.find(e => e.endsWith('.har'));
-      if (!harEntryName)
-        return { error: 'Specified archive does not have a .har file' };
-      const har = await zipFile.read(harEntryName);
-      const harFile = JSON.parse(har.toString()) as har.HARFile;
-      harBackend = new HarBackend(harFile, null, zipFile);
-    } else {
-      const harFile = JSON.parse(await fs.promises.readFile(params.file, 'utf-8')) as har.HARFile;
-      harBackend = new HarBackend(harFile, path.dirname(params.file), null);
-    }
-    this._harBackends.set(harBackend.id, harBackend);
-    return { harId: harBackend.id };
-  }
-
-  async harLookup(params: channels.LocalUtilsHarLookupParams, metadata: CallMetadata): Promise<channels.LocalUtilsHarLookupResult> {
-    const harBackend = this._harBackends.get(params.harId);
-    if (!harBackend)
-      return { action: 'error', message: `Internal error: har was not opened` };
-    return await harBackend.lookup(params.url, params.method, params.headers, params.postData, params.isNavigationRequest);
+  async zip(params: channels.LocalUtilsZipParams, progress: Progress): Promise<void> {
+    return await localUtils.zip(progress, this._stackSessions, params);
   }
 
-  async harClose(params: channels.LocalUtilsHarCloseParams, metadata: CallMetadata): Promise<void> {
-    const harBackend = this._harBackends.get(params.harId);
-    if (harBackend) {
-      this._harBackends.delete(harBackend.id);
-      harBackend.dispose();
-    }
+  async harOpen(params: channels.LocalUtilsHarOpenParams, progress: Progress): Promise<channels.LocalUtilsHarOpenResult> {
+    return await localUtils.harOpen(progress, this._harBackends, params);
   }
 
-  async harUnzip(params: channels.LocalUtilsHarUnzipParams, metadata: CallMetadata): Promise<void> {
-    const dir = path.dirname(params.zipFile);
-    const zipFile = new ZipFile(params.zipFile);
-    for (const entry of await zipFile.entries()) {
-      const buffer = await zipFile.read(entry);
-      if (entry === 'har.har')
-        await fs.promises.writeFile(params.harFile, buffer);
-      else
-        await fs.promises.writeFile(path.join(dir, entry), buffer);
-    }
-    zipFile.close();
-    await fs.promises.unlink(params.zipFile);
+  async harLookup(params: channels.LocalUtilsHarLookupParams, progress: Progress): Promise<channels.LocalUtilsHarLookupResult> {
+    return await localUtils.harLookup(progress, this._harBackends, params);
   }
 
-  async connect(params: channels.LocalUtilsConnectParams, metadata: CallMetadata): Promise<channels.LocalUtilsConnectResult> {
-    const controller = new ProgressController(metadata, this._object as SdkObject);
-    controller.setLogName('browser');
-    return await controller.run(async progress => {
-      const wsHeaders = {
-        'User-Agent': getUserAgent(),
-        'x-playwright-proxy': params.exposeNetwork ?? '',
-        ...params.headers,
-      };
-      const wsEndpoint = await urlToWSEndpoint(progress, params.wsEndpoint);
-
-      const transport = await WebSocketTransport.connect(progress, wsEndpoint, wsHeaders, true, 'x-playwright-debug-log');
-      const socksInterceptor = new SocksInterceptor(transport, params.exposeNetwork, params.socksProxyRedirectPortForTest);
-      const pipe = new JsonPipeDispatcher(this);
-      transport.onmessage = json => {
-        if (socksInterceptor.interceptMessage(json))
-          return;
-        const cb = () => {
-          try {
-            pipe.dispatch(json);
-          } catch (e) {
-            transport.close();
-          }
-        };
-        if (params.slowMo)
-          setTimeout(cb, params.slowMo);
-        else
-          cb();
-      };
-      pipe.on('message', message => {
-        transport.send(message);
-      });
-      transport.onclose = (reason?: string) => {
-        socksInterceptor?.cleanup();
-        pipe.wasClosed(reason);
-      };
-      pipe.on('close', () => transport.close());
-      return { pipe, headers: transport.headers };
-    }, params.timeout || 0);
+  async harClose(params: channels.LocalUtilsHarCloseParams, progress: Progress): Promise<void> {
+    localUtils.harClose(this._harBackends, params);
   }
 
-  async tracingStarted(params: channels.LocalUtilsTracingStartedParams, metadata?: CallMetadata | undefined): Promise<channels.LocalUtilsTracingStartedResult> {
-    let tmpDir = undefined;
-    if (!params.tracesDir)
-      tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-tracing-'));
-    const traceStacksFile = path.join(params.tracesDir || tmpDir!, params.traceName + '.stacks');
-    this._stackSessions.set(traceStacksFile, { callStacks: [], file: traceStacksFile, writer: Promise.resolve(), tmpDir });
-    return { stacksId: traceStacksFile };
+  async harUnzip(params: channels.LocalUtilsHarUnzipParams, progress: Progress): Promise<void> {
+    return await localUtils.harUnzip(progress, params);
   }
 
-  async traceDiscarded(params: channels.LocalUtilsTraceDiscardedParams, metadata?: CallMetadata | undefined): Promise<void> {
-    await this._deleteStackSession(params.stacksId);
+  async tracingStarted(params: channels.LocalUtilsTracingStartedParams, progress: Progress): Promise<channels.LocalUtilsTracingStartedResult> {
+    return await localUtils.tracingStarted(progress, this._stackSessions, params);
   }
 
-  async addStackToTracingNoReply(params: channels.LocalUtilsAddStackToTracingNoReplyParams, metadata?: CallMetadata | undefined): Promise<void> {
-    for (const session of this._stackSessions.values()) {
-      session.callStacks.push(params.callData);
-      if (process.env.PW_LIVE_TRACE_STACKS) {
-        session.writer = session.writer.then(() => {
-          const buffer = Buffer.from(JSON.stringify(serializeClientSideCallMetadata(session.callStacks)));
-          return fs.promises.writeFile(session.file, buffer);
-        });
-      }
-    }
+  async traceDiscarded(params: channels.LocalUtilsTraceDiscardedParams, progress: Progress): Promise<void> {
+    return await localUtils.traceDiscarded(progress, this._stackSessions, params);
   }
 
-  private async _deleteStackSession(stacksId?: string) {
-    const session = stacksId ? this._stackSessions.get(stacksId) : undefined;
-    if (!session)
-      return;
-    await session.writer;
-    if (session.tmpDir)
-      await removeFolders([session.tmpDir]);
-    this._stackSessions.delete(stacksId!);
+  async addStackToTracingNoReply(params: channels.LocalUtilsAddStackToTracingNoReplyParams, progress: Progress): Promise<void> {
+    localUtils.addStackToTracingNoReply(this._stackSessions, params);
   }
-}
-
-const redirectStatus = [301, 302, 303, 307, 308];
 
-class HarBackend {
-  readonly id = createGuid();
-  private _harFile: har.HARFile;
-  private _zipFile: ZipFile | null;
-  private _baseDir: string | null;
-
-  constructor(harFile: har.HARFile, baseDir: string | null, zipFile: ZipFile | null) {
-    this._harFile = harFile;
-    this._baseDir = baseDir;
-    this._zipFile = zipFile;
-  }
-
-  async lookup(url: string, method: string, headers: HeadersArray, postData: Buffer | undefined, isNavigationRequest: boolean): Promise<{
-      action: 'error' | 'redirect' | 'fulfill' | 'noentry',
-      message?: string,
-      redirectURL?: string,
-      status?: number,
-      headers?: HeadersArray,
-      body?: Buffer }> {
-    let entry;
-    try {
-      entry = await this._harFindResponse(url, method, headers, postData);
-    } catch (e) {
-      return { action: 'error', message: 'HAR error: ' + e.message };
-    }
-
-    if (!entry)
-      return { action: 'noentry' };
-
-    // If navigation is being redirected, restart it with the final url to ensure the document's url changes.
-    if (entry.request.url !== url && isNavigationRequest)
-      return { action: 'redirect', redirectURL: entry.request.url };
-
-    const response = entry.response;
-    try {
-      const buffer = await this._loadContent(response.content);
-      return {
-        action: 'fulfill',
-        status: response.status,
-        headers: response.headers,
-        body: buffer,
-      };
-    } catch (e) {
-      return { action: 'error', message: e.message };
-    }
-  }
-
-  private async _loadContent(content: { text?: string, encoding?: string, _file?: string }): Promise<Buffer> {
-    const file = content._file;
-    let buffer: Buffer;
-    if (file) {
-      if (this._zipFile)
-        buffer = await this._zipFile.read(file);
-      else
-        buffer = await fs.promises.readFile(path.resolve(this._baseDir!, file));
-    } else {
-      buffer = Buffer.from(content.text || '', content.encoding === 'base64' ? 'base64' : 'utf-8');
-    }
-    return buffer;
-  }
-
-  private async _harFindResponse(url: string, method: string, headers: HeadersArray, postData: Buffer | undefined): Promise<har.Entry | undefined> {
-    const harLog = this._harFile.log;
-    const visited = new Set<har.Entry>();
-    while (true) {
-      const entries: har.Entry[] = [];
-      for (const candidate of harLog.entries) {
-        if (candidate.request.url !== url || candidate.request.method !== method)
-          continue;
-        if (method === 'POST' && postData && candidate.request.postData) {
-          const buffer = await this._loadContent(candidate.request.postData);
-          if (!buffer.equals(postData)) {
-            const boundary = multipartBoundary(headers);
-            if (!boundary)
-              continue;
-            const candidataBoundary = multipartBoundary(candidate.request.headers);
-            if (!candidataBoundary)
-              continue;
-            // Try to match multipart/form-data ignroing boundary as it changes between requests.
-            if (postData.toString().replaceAll(boundary, '') !== buffer.toString().replaceAll(candidataBoundary, ''))
-              continue;
-          }
-        }
-        entries.push(candidate);
-      }
+  async connect(params: channels.LocalUtilsConnectParams, progress: Progress): Promise<channels.LocalUtilsConnectResult> {
+    const wsHeaders = {
+      'User-Agent': getUserAgent(),
+      'x-playwright-proxy': params.exposeNetwork ?? '',
+      ...params.headers,
+    };
+    const wsEndpoint = await urlToWSEndpoint(progress, params.wsEndpoint);
 
-      if (!entries.length)
+    const transport = await WebSocketTransport.connect(progress, wsEndpoint, { headers: wsHeaders, followRedirects: true, debugLogHeader: 'x-playwright-debug-log' });
+    const socksInterceptor = new SocksInterceptor(transport, params.exposeNetwork, params.socksProxyRedirectPortForTest);
+    const pipe = new JsonPipeDispatcher(this);
+    transport.onmessage = json => {
+      if (socksInterceptor.interceptMessage(json))
         return;
-
-      let entry = entries[0];
-
-      // Disambiguate using headers - then one with most matching headers wins.
-      if (entries.length > 1) {
-        const list: { candidate: har.Entry, matchingHeaders: number }[] = [];
-        for (const candidate of entries) {
-          const matchingHeaders = countMatchingHeaders(candidate.request.headers, headers);
-          list.push({ candidate, matchingHeaders });
+      const cb = () => {
+        try {
+          pipe.dispatch(json);
+        } catch (e) {
+          transport.close();
         }
-        list.sort((a, b) => b.matchingHeaders - a.matchingHeaders);
-        entry = list[0].candidate;
-      }
-
-      if (visited.has(entry))
-        throw new Error(`Found redirect cycle for ${url}`);
-
-      visited.add(entry);
-
-      // Follow redirects.
-      const locationHeader = entry.response.headers.find(h => h.name.toLowerCase() === 'location');
-      if (redirectStatus.includes(entry.response.status) && locationHeader) {
-        const locationURL = new URL(locationHeader.value, url);
-        url = locationURL.toString();
-        if ((entry.response.status === 301 || entry.response.status === 302) && method === 'POST' ||
-          entry.response.status === 303 && !['GET', 'HEAD'].includes(method)) {
-          // HTTP-redirect fetch step 13 (https://fetch.spec.whatwg.org/#http-redirect-fetch)
-          method = 'GET';
-        }
-        continue;
-      }
-
-      return entry;
-    }
-  }
-
-  dispose() {
-    this._zipFile?.close();
+      };
+      if (params.slowMo)
+        setTimeout(cb, params.slowMo);
+      else
+        cb();
+    };
+    pipe.on('message', message => {
+      transport.send(message);
+    });
+    transport.onclose = (reason?: string) => {
+      socksInterceptor?.cleanup();
+      pipe.wasClosed(reason);
+    };
+    pipe.on('close', () => transport.close());
+    return { pipe, headers: transport.headers };
   }
-}
 
-function countMatchingHeaders(harHeaders: har.Header[], headers: HeadersArray): number {
-  const set = new Set(headers.map(h => h.name.toLowerCase() + ':' + h.value));
-  let matches = 0;
-  for (const h of harHeaders) {
-    if (set.has(h.name.toLowerCase() + ':' + h.value))
-      ++matches;
+  async globToRegex(params: channels.LocalUtilsGlobToRegexParams, progress: Progress): Promise<channels.LocalUtilsGlobToRegexResult> {
+    const regex = resolveGlobToRegexPattern(params.baseURL, params.glob, params.webSocketUrl);
+    return { regex };
   }
-  return matches;
 }
 
-export async function urlToWSEndpoint(progress: Progress|undefined, endpointURL: string): Promise<string> {
+async function urlToWSEndpoint(progress: Progress, endpointURL: string): Promise<string> {
   if (endpointURL.startsWith('ws'))
     return endpointURL;
 
-  progress?.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
+  progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
   const fetchUrl = new URL(endpointURL);
   if (!fetchUrl.pathname.endsWith('/'))
     fetchUrl.pathname += '/';
   fetchUrl.pathname += 'json';
-  const json = await fetchData({
+  const json = await fetchData(progress, {
     url: fetchUrl.toString(),
     method: 'GET',
-    timeout: progress?.timeUntilDeadline() ?? 30_000,
     headers: { 'User-Agent': getUserAgent() },
   }, async (params: HTTPRequestParams, response: http.IncomingMessage) => {
     return new Error(`Unexpected status ${response.statusCode} when connecting to ${fetchUrl.toString()}.\n` +
         `This does not look like a Playwright server, try connecting via ws://.`);
   });
-  progress?.throwIfAborted();
 
   const wsUrl = new URL(endpointURL);
   let wsEndpointPath = JSON.parse(json).wsEndpointPath;
@@ -446,13 +152,3 @@ export async function urlToWSEndpoint(progress: Progress|undefined, endpointURL:
   wsUrl.protocol = wsUrl.protocol === 'https:' ? 'wss:' : 'ws:';
   return wsUrl.toString();
 }
-
-function multipartBoundary(headers: HeadersArray) {
-  const contentType = headers.find(h => h.name.toLowerCase() === 'content-type');
-  if (!contentType?.value.includes('multipart/form-data'))
-    return undefined;
-  const boundary = contentType.value.match(/boundary=(\S+)/);
-  if (boundary)
-    return boundary[1];
-  return undefined;
-}
diff --git a/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts b/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts
index ba600f697e7d7..1e406f15a0a83 100644
--- a/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts
+++ b/packages/playwright-core/src/server/dispatchers/networkDispatchers.ts
@@ -14,25 +14,27 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import type { APIRequestContext } from '../fetch';
-import type { CallMetadata } from '../instrumentation';
-import type { Request, Response, Route } from '../network';
 import { WebSocket } from '../network';
-import type { RootDispatcher } from './dispatcher';
-import { Dispatcher, existingDispatcher } from './dispatcher';
+import { Dispatcher } from './dispatcher';
+import { FrameDispatcher } from './frameDispatcher';
+import { WorkerDispatcher } from './pageDispatcher';
 import { TracingDispatcher } from './tracingDispatcher';
+
+import type { APIRequestContext } from '../fetch';
+import type { Request, Response, Route } from '../network';
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
+import type { RootDispatcher } from './dispatcher';
 import type { PageDispatcher } from './pageDispatcher';
-import { FrameDispatcher } from './frameDispatcher';
-import { WorkerDispatcher } from './pageDispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+
 
 export class RequestDispatcher extends Dispatcher<Request, channels.RequestChannel, BrowserContextDispatcher | PageDispatcher | FrameDispatcher> implements channels.RequestChannel {
   _type_Request: boolean;
   private _browserContextDispatcher: BrowserContextDispatcher;
 
   static from(scope: BrowserContextDispatcher, request: Request): RequestDispatcher {
-    const result = existingDispatcher<RequestDispatcher>(request);
+    const result = scope.connection.existingDispatcher<RequestDispatcher>(request);
     return result || new RequestDispatcher(scope, request);
   }
 
@@ -45,7 +47,7 @@ export class RequestDispatcher extends Dispatcher<Request, channels.RequestChann
     // Always try to attach request to the page, if not, frame.
     const frame = request.frame();
     const page = request.frame()?._page;
-    const pageDispatcher = page ? existingDispatcher<PageDispatcher>(page) : null;
+    const pageDispatcher = page ? scope.connection.existingDispatcher<PageDispatcher>(page) : null;
     const frameDispatcher = frame ? FrameDispatcher.from(scope, frame) : null;
     super(pageDispatcher || frameDispatcher || scope, request, 'Request', {
       frame: FrameDispatcher.fromNullable(scope, request.frame()),
@@ -62,12 +64,12 @@ export class RequestDispatcher extends Dispatcher<Request, channels.RequestChann
     this._browserContextDispatcher = scope;
   }
 
-  async rawRequestHeaders(params?: channels.RequestRawRequestHeadersParams): Promise<channels.RequestRawRequestHeadersResult> {
-    return { headers: await this._object.rawRequestHeaders() };
+  async rawRequestHeaders(params: channels.RequestRawRequestHeadersParams, progress: Progress): Promise<channels.RequestRawRequestHeadersResult> {
+    return { headers: await progress.race(this._object.rawRequestHeaders()) };
   }
 
-  async response(): Promise<channels.RequestResponseResult> {
-    return { response: ResponseDispatcher.fromNullable(this._browserContextDispatcher, await this._object.response()) };
+  async response(params: channels.RequestResponseParams, progress: Progress): Promise<channels.RequestResponseResult> {
+    return { response: ResponseDispatcher.fromNullable(this._browserContextDispatcher, await progress.race(this._object.response())) };
   }
 }
 
@@ -75,7 +77,7 @@ export class ResponseDispatcher extends Dispatcher<Response, channels.ResponseCh
   _type_Response = true;
 
   static from(scope: BrowserContextDispatcher, response: Response): ResponseDispatcher {
-    const result = existingDispatcher<ResponseDispatcher>(response);
+    const result = scope.connection.existingDispatcher<ResponseDispatcher>(response);
     const requestDispatcher = RequestDispatcher.from(scope, response.request());
     return result || new ResponseDispatcher(requestDispatcher, response);
   }
@@ -97,43 +99,48 @@ export class ResponseDispatcher extends Dispatcher<Response, channels.ResponseCh
     });
   }
 
-  async body(): Promise<channels.ResponseBodyResult> {
-    return { binary: await this._object.body() };
+  async body(params: channels.ResponseBodyParams, progress: Progress): Promise<channels.ResponseBodyResult> {
+    return { binary: await progress.race(this._object.body()) };
   }
 
-  async securityDetails(): Promise<channels.ResponseSecurityDetailsResult> {
-    return { value: await this._object.securityDetails() || undefined };
+  async securityDetails(params: channels.ResponseSecurityDetailsParams, progress: Progress): Promise<channels.ResponseSecurityDetailsResult> {
+    return { value: await progress.race(this._object.securityDetails()) || undefined };
   }
 
-  async serverAddr(): Promise<channels.ResponseServerAddrResult> {
-    return { value: await this._object.serverAddr() || undefined };
+  async serverAddr(params: channels.ResponseServerAddrParams, progress: Progress): Promise<channels.ResponseServerAddrResult> {
+    return { value: await progress.race(this._object.serverAddr()) || undefined };
   }
 
-  async rawResponseHeaders(params?: channels.ResponseRawResponseHeadersParams): Promise<channels.ResponseRawResponseHeadersResult> {
-    return { headers: await this._object.rawResponseHeaders() };
+  async rawResponseHeaders(params: channels.ResponseRawResponseHeadersParams, progress: Progress): Promise<channels.ResponseRawResponseHeadersResult> {
+    return { headers: await progress.race(this._object.rawResponseHeaders()) };
   }
 
-  async sizes(params?: channels.ResponseSizesParams): Promise<channels.ResponseSizesResult> {
-    return { sizes: await this._object.sizes() };
+  async sizes(params: channels.ResponseSizesParams, progress: Progress): Promise<channels.ResponseSizesResult> {
+    return { sizes: await progress.race(this._object.sizes()) };
   }
 }
 
 export class RouteDispatcher extends Dispatcher<Route, channels.RouteChannel, RequestDispatcher> implements channels.RouteChannel {
   _type_Route = true;
 
-  static from(scope: RequestDispatcher, route: Route): RouteDispatcher {
-    const result = existingDispatcher<RouteDispatcher>(route);
-    return result || new RouteDispatcher(scope, route);
-  }
+  private _handled = false;
 
-  private constructor(scope: RequestDispatcher, route: Route) {
+  constructor(scope: RequestDispatcher, route: Route) {
     super(scope, route, 'Route', {
       // Context route can point to a non-reported request, so we send the request in the initializer.
       request: scope
     });
   }
 
-  async continue(params: channels.RouteContinueParams, metadata: CallMetadata): Promise<channels.RouteContinueResult> {
+  private _checkNotHandled() {
+    if (this._handled)
+      throw new Error('Route is already handled!');
+    this._handled = true;
+  }
+
+  async continue(params: channels.RouteContinueParams, progress: Progress): Promise<channels.RouteContinueResult> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
+    this._checkNotHandled();
     await this._object.continue({
       url: params.url,
       method: params.method,
@@ -143,16 +150,21 @@ export class RouteDispatcher extends Dispatcher<Route, channels.RouteChannel, Re
     });
   }
 
-  async fulfill(params: channels.RouteFulfillParams, metadata: CallMetadata): Promise<void> {
+  async fulfill(params: channels.RouteFulfillParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
+    this._checkNotHandled();
     await this._object.fulfill(params);
   }
 
-  async abort(params: channels.RouteAbortParams, metadata: CallMetadata): Promise<void> {
+  async abort(params: channels.RouteAbortParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
+    this._checkNotHandled();
     await this._object.abort(params.errorCode || 'failed');
   }
 
-  async redirectNavigationRequest(params: channels.RouteRedirectNavigationRequestParams): Promise<void> {
-    await this._object.redirectNavigationRequest(params.url);
+  async redirectNavigationRequest(params: channels.RouteRedirectNavigationRequestParams, progress: Progress): Promise<void> {
+    this._checkNotHandled();
+    this._object.redirectNavigationRequest(params.url);
   }
 }
 
@@ -175,7 +187,7 @@ export class APIRequestContextDispatcher extends Dispatcher<APIRequestContext, c
   _type_APIRequestContext = true;
 
   static from(scope: RootDispatcher | BrowserContextDispatcher, request: APIRequestContext): APIRequestContextDispatcher {
-    const result = existingDispatcher<APIRequestContextDispatcher>(request);
+    const result = scope.connection.existingDispatcher<APIRequestContextDispatcher>(request);
     return result || new APIRequestContextDispatcher(scope, request);
   }
 
@@ -194,18 +206,18 @@ export class APIRequestContextDispatcher extends Dispatcher<APIRequestContext, c
     this.adopt(tracing);
   }
 
-  async storageState(): Promise<channels.APIRequestContextStorageStateResult> {
-    return this._object.storageState();
+  async storageState(params: channels.APIRequestContextStorageStateParams, progress: Progress): Promise<channels.APIRequestContextStorageStateResult> {
+    return await this._object.storageState(progress, params.indexedDB);
   }
 
-  async dispose(params: channels.APIRequestContextDisposeParams, metadata: CallMetadata): Promise<void> {
-    metadata.potentiallyClosesScope = true;
+  async dispose(params: channels.APIRequestContextDisposeParams, progress: Progress): Promise<void> {
+    progress.metadata.potentiallyClosesScope = true;
     await this._object.dispose(params);
     this._dispose();
   }
 
-  async fetch(params: channels.APIRequestContextFetchParams, metadata: CallMetadata): Promise<channels.APIRequestContextFetchResult> {
-    const fetchResponse = await this._object.fetch(params, metadata);
+  async fetch(params: channels.APIRequestContextFetchParams, progress: Progress): Promise<channels.APIRequestContextFetchResult> {
+    const fetchResponse = await this._object.fetch(progress, params);
     return {
       response: {
         url: fetchResponse.url,
@@ -217,16 +229,16 @@ export class APIRequestContextDispatcher extends Dispatcher<APIRequestContext, c
     };
   }
 
-  async fetchResponseBody(params: channels.APIRequestContextFetchResponseBodyParams): Promise<channels.APIRequestContextFetchResponseBodyResult> {
+  async fetchResponseBody(params: channels.APIRequestContextFetchResponseBodyParams, progress: Progress): Promise<channels.APIRequestContextFetchResponseBodyResult> {
     return { binary: this._object.fetchResponses.get(params.fetchUid) };
   }
 
-  async fetchLog(params: channels.APIRequestContextFetchLogParams): Promise<channels.APIRequestContextFetchLogResult> {
+  async fetchLog(params: channels.APIRequestContextFetchLogParams, progress: Progress): Promise<channels.APIRequestContextFetchLogResult> {
     const log = this._object.fetchLog.get(params.fetchUid) || [];
     return { log };
   }
 
-  async disposeAPIResponse(params: channels.APIRequestContextDisposeAPIResponseParams): Promise<void> {
+  async disposeAPIResponse(params: channels.APIRequestContextDisposeAPIResponseParams, progress: Progress): Promise<void> {
     this._object.disposeResponse(params.fetchUid);
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts
index 3101cd051d042..4a55c099b2822 100644
--- a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts
@@ -14,33 +14,47 @@
  * limitations under the License.
  */
 
-import type { BrowserContext } from '../browserContext';
-import type { Frame } from '../frames';
 import { Page, Worker } from '../page';
-import type * as channels from '@protocol/channels';
-import { Dispatcher, existingDispatcher } from './dispatcher';
+import { Dispatcher } from './dispatcher';
 import { parseError } from '../errors';
+import { ArtifactDispatcher } from './artifactDispatcher';
+import { ElementHandleDispatcher } from './elementHandlerDispatcher';
 import { FrameDispatcher } from './frameDispatcher';
+import { JSHandleDispatcher, parseArgument, serializeResult } from './jsHandleDispatcher';
 import { RequestDispatcher } from './networkDispatchers';
 import { ResponseDispatcher } from './networkDispatchers';
 import { RouteDispatcher, WebSocketDispatcher } from './networkDispatchers';
-import { serializeResult, parseArgument } from './jsHandleDispatcher';
-import { ElementHandleDispatcher } from './elementHandlerDispatcher';
-import type { FileChooser } from '../fileChooser';
-import type { CRCoverage } from '../chromium/crCoverage';
-import type { JSHandle } from '../javascript';
-import type { CallMetadata } from '../instrumentation';
+import { WebSocketRouteDispatcher } from './webSocketRouteDispatcher';
+import { SdkObject } from '../instrumentation';
+import { urlMatches } from '../../utils/isomorphic/urlMatch';
+
 import type { Artifact } from '../artifact';
-import { ArtifactDispatcher } from './artifactDispatcher';
+import type { BrowserContext } from '../browserContext';
+import type { CRCoverage } from '../chromium/crCoverage';
 import type { Download } from '../download';
-import { createGuid, urlMatches } from '../../utils';
+import type { FileChooser } from '../fileChooser';
+import type { JSHandle } from '../javascript';
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
+import type { Frame } from '../frames';
+import type { RouteHandler } from '../network';
+import type { InitScript, PageBinding } from '../page';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, BrowserContextDispatcher> implements channels.PageChannel {
   _type_EventTarget = true;
   _type_Page = true;
   private _page: Page;
   _subscriptions = new Set<channels.PageUpdateSubscriptionParams['event']>();
+  _webSocketInterceptionPatterns: channels.PageSetWebSocketInterceptionPatternsParams['patterns'] = [];
+  private _bindings: PageBinding[] = [];
+  private _initScripts: InitScript[] = [];
+  private _requestInterceptor: RouteHandler;
+  private _interceptionUrlMatchers: (string | RegExp)[] = [];
+  private _routeWebSocketInitScript: InitScript | undefined;
+  private _locatorHandlers = new Set<number>();
+  private _jsCoverageActive = false;
+  private _cssCoverageActive = false;
 
   static from(parentScope: BrowserContextDispatcher, page: Page): PageDispatcher {
     return PageDispatcher.fromNullable(parentScope, page)!;
@@ -49,7 +63,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
   static fromNullable(parentScope: BrowserContextDispatcher, page: Page | undefined): PageDispatcher | undefined {
     if (!page)
       return undefined;
-    const result = existingDispatcher<PageDispatcher>(page);
+    const result = parentScope.connection.existingDispatcher<PageDispatcher>(page);
     return result || new PageDispatcher(parentScope, page);
   }
 
@@ -62,7 +76,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
 
     super(parentScope, page, 'Page', {
       mainFrame,
-      viewportSize: page.viewportSize() || undefined,
+      viewportSize: page.emulatedSize()?.viewport,
       isClosed: page.isClosed(),
       opener: PageDispatcher.fromNullable(parentScope, page.opener())
     });
@@ -70,6 +84,15 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
     this.adopt(mainFrame);
 
     this._page = page;
+    this._requestInterceptor = (route, request) => {
+      const matchesSome = this._interceptionUrlMatchers.some(urlMatch => urlMatches(this._page.browserContext._options.baseURL, request.url(), urlMatch));
+      if (!matchesSome) {
+        route.continue({ isFallback: true }).catch(() => {});
+        return;
+      }
+      this._dispatchEvent('route', { route: new RouteDispatcher(RequestDispatcher.from(this.parentScope(), request), route) });
+    };
+
     this.addObjectListener(Page.Events.Close, () => {
       this._dispatchEvent('close');
       this._dispose();
@@ -79,6 +102,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
       // Artifact can outlive the page, so bind to the context scope.
       this._dispatchEvent('download', { url: download.url, suggestedFilename: download.suggestedFilename(), artifact: ArtifactDispatcher.from(parentScope, download.artifact) });
     });
+    this.addObjectListener(Page.Events.EmulatedSizeChanged, () => this._dispatchEvent('viewportSizeChanged', { viewportSize: page.emulatedSize()?.viewport }));
     this.addObjectListener(Page.Events.FileChooser, (fileChooser: FileChooser) => this._dispatchEvent('fileChooser', {
       element: ElementHandleDispatcher.from(mainFrame, fileChooser.element()),
       isMultiple: fileChooser.isMultiple()
@@ -89,10 +113,10 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
     this.addObjectListener(Page.Events.WebSocket, webSocket => this._dispatchEvent('webSocket', { webSocket: new WebSocketDispatcher(this, webSocket) }));
     this.addObjectListener(Page.Events.Worker, worker => this._dispatchEvent('worker', { worker: new WorkerDispatcher(this, worker) }));
     this.addObjectListener(Page.Events.Video, (artifact: Artifact) => this._dispatchEvent('video', { artifact: ArtifactDispatcher.from(parentScope, artifact) }));
-    if (page._video)
-      this._dispatchEvent('video', { artifact: ArtifactDispatcher.from(this.parentScope(), page._video) });
+    if (page.video)
+      this._dispatchEvent('video', { artifact: ArtifactDispatcher.from(this.parentScope(), page.video) });
     // Ensure client knows about all frames.
-    const frames = page._frameManager.frames();
+    const frames = page.frameManager.frames();
     for (let i = 1; i < frames.length; i++)
       this._onFrameAttached(frames[i]);
   }
@@ -101,16 +125,8 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
     return this._page;
   }
 
-  async setDefaultNavigationTimeoutNoReply(params: channels.PageSetDefaultNavigationTimeoutNoReplyParams, metadata: CallMetadata): Promise<void> {
-    this._page.setDefaultNavigationTimeout(params.timeout);
-  }
-
-  async setDefaultTimeoutNoReply(params: channels.PageSetDefaultTimeoutNoReplyParams, metadata: CallMetadata): Promise<void> {
-    this._page.setDefaultTimeout(params.timeout);
-  }
-
-  async exposeBinding(params: channels.PageExposeBindingParams, metadata: CallMetadata): Promise<void> {
-    await this._page.exposeBinding(params.name, !!params.needsHandle, (source, ...args) => {
+  async exposeBinding(params: channels.PageExposeBindingParams, progress: Progress): Promise<void> {
+    const binding = await this._page.exposeBinding(progress, params.name, !!params.needsHandle, (source, ...args) => {
       // When reusing the context, we might have some bindings called late enough,
       // after context and page dispatchers have been disposed.
       if (this._disposed)
@@ -119,70 +135,84 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
       this._dispatchEvent('bindingCall', { binding });
       return binding.promise();
     });
+    this._bindings.push(binding);
   }
 
-  async setExtraHTTPHeaders(params: channels.PageSetExtraHTTPHeadersParams, metadata: CallMetadata): Promise<void> {
-    await this._page.setExtraHTTPHeaders(params.headers);
+  async setExtraHTTPHeaders(params: channels.PageSetExtraHTTPHeadersParams, progress: Progress): Promise<void> {
+    await this._page.setExtraHTTPHeaders(progress, params.headers);
   }
 
-  async reload(params: channels.PageReloadParams, metadata: CallMetadata): Promise<channels.PageReloadResult> {
-    return { response: ResponseDispatcher.fromNullable(this.parentScope(), await this._page.reload(metadata, params)) };
+  async reload(params: channels.PageReloadParams, progress: Progress): Promise<channels.PageReloadResult> {
+    return { response: ResponseDispatcher.fromNullable(this.parentScope(), await this._page.reload(progress, params)) };
   }
 
-  async goBack(params: channels.PageGoBackParams, metadata: CallMetadata): Promise<channels.PageGoBackResult> {
-    return { response: ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goBack(metadata, params)) };
+  async goBack(params: channels.PageGoBackParams, progress: Progress): Promise<channels.PageGoBackResult> {
+    return { response: ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goBack(progress, params)) };
   }
 
-  async goForward(params: channels.PageGoForwardParams, metadata: CallMetadata): Promise<channels.PageGoForwardResult> {
-    return { response: ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goForward(metadata, params)) };
+  async goForward(params: channels.PageGoForwardParams, progress: Progress): Promise<channels.PageGoForwardResult> {
+    return { response: ResponseDispatcher.fromNullable(this.parentScope(), await this._page.goForward(progress, params)) };
   }
 
-  async registerLocatorHandler(params: channels.PageRegisterLocatorHandlerParams, metadata: CallMetadata): Promise<channels.PageRegisterLocatorHandlerResult> {
+  async requestGC(params: channels.PageRequestGCParams, progress: Progress): Promise<channels.PageRequestGCResult> {
+    await progress.race(this._page.requestGC());
+  }
+
+  async registerLocatorHandler(params: channels.PageRegisterLocatorHandlerParams, progress: Progress): Promise<channels.PageRegisterLocatorHandlerResult> {
     const uid = this._page.registerLocatorHandler(params.selector, params.noWaitAfter);
+    this._locatorHandlers.add(uid);
     return { uid };
   }
 
-  async resolveLocatorHandlerNoReply(params: channels.PageResolveLocatorHandlerNoReplyParams, metadata: CallMetadata): Promise<void> {
+  async resolveLocatorHandlerNoReply(params: channels.PageResolveLocatorHandlerNoReplyParams, progress: Progress): Promise<void> {
     this._page.resolveLocatorHandler(params.uid, params.remove);
   }
 
-  async unregisterLocatorHandler(params: channels.PageUnregisterLocatorHandlerParams, metadata: CallMetadata): Promise<void> {
+  async unregisterLocatorHandler(params: channels.PageUnregisterLocatorHandlerParams, progress: Progress): Promise<void> {
     this._page.unregisterLocatorHandler(params.uid);
+    this._locatorHandlers.delete(params.uid);
   }
 
-  async emulateMedia(params: channels.PageEmulateMediaParams, metadata: CallMetadata): Promise<void> {
-    await this._page.emulateMedia({
+  async emulateMedia(params: channels.PageEmulateMediaParams, progress: Progress): Promise<void> {
+    await this._page.emulateMedia(progress, {
       media: params.media,
       colorScheme: params.colorScheme,
       reducedMotion: params.reducedMotion,
       forcedColors: params.forcedColors,
+      contrast: params.contrast,
     });
   }
 
-  async setViewportSize(params: channels.PageSetViewportSizeParams, metadata: CallMetadata): Promise<void> {
-    await this._page.setViewportSize(params.viewportSize);
+  async setViewportSize(params: channels.PageSetViewportSizeParams, progress: Progress): Promise<void> {
+    await this._page.setViewportSize(progress, params.viewportSize);
   }
 
-  async addInitScript(params: channels.PageAddInitScriptParams, metadata: CallMetadata): Promise<void> {
-    await this._page.addInitScript(params.source);
+  async addInitScript(params: channels.PageAddInitScriptParams, progress: Progress): Promise<void> {
+    this._initScripts.push(await this._page.addInitScript(progress, params.source));
   }
 
-  async setNetworkInterceptionPatterns(params: channels.PageSetNetworkInterceptionPatternsParams, metadata: CallMetadata): Promise<void> {
+  async setNetworkInterceptionPatterns(params: channels.PageSetNetworkInterceptionPatternsParams, progress: Progress): Promise<void> {
+    const hadMatchers = this._interceptionUrlMatchers.length > 0;
     if (!params.patterns.length) {
-      await this._page.setClientRequestInterceptor(undefined);
-      return;
+      // Note: it is important to remove the interceptor when there are no patterns,
+      // because that disables the slow-path interception in the browser itself.
+      if (hadMatchers)
+        await this._page.removeRequestInterceptor(this._requestInterceptor);
+      this._interceptionUrlMatchers = [];
+    } else {
+      this._interceptionUrlMatchers = params.patterns.map(pattern => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags!) : pattern.glob!);
+      if (!hadMatchers)
+        await this._page.addRequestInterceptor(progress, this._requestInterceptor);
     }
-    const urlMatchers = params.patterns.map(pattern => pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags!) : pattern.glob!);
-    await this._page.setClientRequestInterceptor((route, request) => {
-      const matchesSome = urlMatchers.some(urlMatch => urlMatches(this._page._browserContext._options.baseURL, request.url(), urlMatch));
-      if (!matchesSome)
-        return false;
-      this._dispatchEvent('route', { route: RouteDispatcher.from(RequestDispatcher.from(this.parentScope(), request), route) });
-      return true;
-    });
   }
 
-  async expectScreenshot(params: channels.PageExpectScreenshotParams, metadata: CallMetadata): Promise<channels.PageExpectScreenshotResult> {
+  async setWebSocketInterceptionPatterns(params: channels.PageSetWebSocketInterceptionPatternsParams, progress: Progress): Promise<void> {
+    this._webSocketInterceptionPatterns = params.patterns;
+    if (params.patterns.length && !this._routeWebSocketInitScript)
+      this._routeWebSocketInitScript = await WebSocketRouteDispatcher.install(progress, this.connection, this._page);
+  }
+
+  async expectScreenshot(params: channels.PageExpectScreenshotParams, progress: Progress): Promise<channels.PageExpectScreenshotResult> {
     const mask: { frame: Frame, selector: string }[] = (params.mask || []).map(({ frame, selector }) => ({
       frame: (frame as FrameDispatcher)._object,
       selector,
@@ -191,115 +221,129 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
       frame: (params.locator.frame as FrameDispatcher)._object,
       selector: params.locator.selector,
     } : undefined;
-    return await this._page.expectScreenshot(metadata, {
+    return await this._page.expectScreenshot(progress, {
       ...params,
       locator,
       mask,
     });
   }
 
-  async screenshot(params: channels.PageScreenshotParams, metadata: CallMetadata): Promise<channels.PageScreenshotResult> {
+  async screenshot(params: channels.PageScreenshotParams, progress: Progress): Promise<channels.PageScreenshotResult> {
     const mask: { frame: Frame, selector: string }[] = (params.mask || []).map(({ frame, selector }) => ({
       frame: (frame as FrameDispatcher)._object,
       selector,
     }));
-    return { binary: await this._page.screenshot(metadata, { ...params, mask }) };
+    return { binary: await this._page.screenshot(progress, { ...params, mask }) };
   }
 
-  async close(params: channels.PageCloseParams, metadata: CallMetadata): Promise<void> {
+  async close(params: channels.PageCloseParams, progress: Progress): Promise<void> {
     if (!params.runBeforeUnload)
-      metadata.potentiallyClosesScope = true;
-    await this._page.close(metadata, params);
+      progress.metadata.potentiallyClosesScope = true;
+    await this._page.close(params);
   }
 
-  async updateSubscription(params: channels.PageUpdateSubscriptionParams): Promise<void> {
+  async updateSubscription(params: channels.PageUpdateSubscriptionParams, progress: Progress): Promise<void> {
+    // Note: progress is ignored because this operation is not cancellable and should not block in the browser anyway.
     if (params.event === 'fileChooser')
-      await this._page.setFileChooserIntercepted(params.enabled);
+      await this._page.setFileChooserInterceptedBy(params.enabled, this);
     if (params.enabled)
       this._subscriptions.add(params.event);
     else
       this._subscriptions.delete(params.event);
   }
 
-  async keyboardDown(params: channels.PageKeyboardDownParams, metadata: CallMetadata): Promise<void> {
-    await this._page.keyboard.down(params.key);
+  async keyboardDown(params: channels.PageKeyboardDownParams, progress: Progress): Promise<void> {
+    await this._page.keyboard.down(progress, params.key);
   }
 
-  async keyboardUp(params: channels.PageKeyboardUpParams, metadata: CallMetadata): Promise<void> {
-    await this._page.keyboard.up(params.key);
+  async keyboardUp(params: channels.PageKeyboardUpParams, progress: Progress): Promise<void> {
+    await this._page.keyboard.up(progress, params.key);
   }
 
-  async keyboardInsertText(params: channels.PageKeyboardInsertTextParams, metadata: CallMetadata): Promise<void> {
-    await this._page.keyboard.insertText(params.text);
+  async keyboardInsertText(params: channels.PageKeyboardInsertTextParams, progress: Progress): Promise<void> {
+    await this._page.keyboard.insertText(progress, params.text);
   }
 
-  async keyboardType(params: channels.PageKeyboardTypeParams, metadata: CallMetadata): Promise<void> {
-    await this._page.keyboard.type(params.text, params);
+  async keyboardType(params: channels.PageKeyboardTypeParams, progress: Progress): Promise<void> {
+    await this._page.keyboard.type(progress, params.text, params);
   }
 
-  async keyboardPress(params: channels.PageKeyboardPressParams, metadata: CallMetadata): Promise<void> {
-    await this._page.keyboard.press(params.key, params);
+  async keyboardPress(params: channels.PageKeyboardPressParams, progress: Progress): Promise<void> {
+    await this._page.keyboard.press(progress, params.key, params);
   }
 
-  async mouseMove(params: channels.PageMouseMoveParams, metadata: CallMetadata): Promise<void> {
-    await this._page.mouse.move(params.x, params.y, params, metadata);
+  async mouseMove(params: channels.PageMouseMoveParams, progress: Progress): Promise<void> {
+    progress.metadata.point = { x: params.x, y: params.y };
+    await this._page.mouse.move(progress, params.x, params.y, params);
   }
 
-  async mouseDown(params: channels.PageMouseDownParams, metadata: CallMetadata): Promise<void> {
-    await this._page.mouse.down(params, metadata);
+  async mouseDown(params: channels.PageMouseDownParams, progress: Progress): Promise<void> {
+    progress.metadata.point = this._page.mouse.currentPoint();
+    await this._page.mouse.down(progress, params);
   }
 
-  async mouseUp(params: channels.PageMouseUpParams, metadata: CallMetadata): Promise<void> {
-    await this._page.mouse.up(params, metadata);
+  async mouseUp(params: channels.PageMouseUpParams, progress: Progress): Promise<void> {
+    progress.metadata.point = this._page.mouse.currentPoint();
+    await this._page.mouse.up(progress, params);
   }
 
-  async mouseClick(params: channels.PageMouseClickParams, metadata: CallMetadata): Promise<void> {
-    await this._page.mouse.click(params.x, params.y, params, metadata);
+  async mouseClick(params: channels.PageMouseClickParams, progress: Progress): Promise<void> {
+    progress.metadata.point = { x: params.x, y: params.y };
+    await this._page.mouse.click(progress, params.x, params.y, params);
   }
 
-  async mouseWheel(params: channels.PageMouseWheelParams, metadata: CallMetadata): Promise<void> {
-    await this._page.mouse.wheel(params.deltaX, params.deltaY);
+  async mouseWheel(params: channels.PageMouseWheelParams, progress: Progress): Promise<void> {
+    await this._page.mouse.wheel(progress, params.deltaX, params.deltaY);
   }
 
-  async touchscreenTap(params: channels.PageTouchscreenTapParams, metadata: CallMetadata): Promise<void> {
-    await this._page.touchscreen.tap(params.x, params.y, metadata);
+  async touchscreenTap(params: channels.PageTouchscreenTapParams, progress: Progress): Promise<void> {
+    progress.metadata.point = { x: params.x, y: params.y };
+    await this._page.touchscreen.tap(progress, params.x, params.y);
   }
 
-  async accessibilitySnapshot(params: channels.PageAccessibilitySnapshotParams, metadata: CallMetadata): Promise<channels.PageAccessibilitySnapshotResult> {
-    const rootAXNode = await this._page.accessibility.snapshot({
+  async accessibilitySnapshot(params: channels.PageAccessibilitySnapshotParams, progress: Progress): Promise<channels.PageAccessibilitySnapshotResult> {
+    const rootAXNode = await progress.race(this._page.accessibility.snapshot({
       interestingOnly: params.interestingOnly,
       root: params.root ? (params.root as ElementHandleDispatcher)._elementHandle : undefined
-    });
+    }));
     return { rootAXNode: rootAXNode || undefined };
   }
 
-  async pdf(params: channels.PagePdfParams, metadata: CallMetadata): Promise<channels.PagePdfResult> {
+  async pdf(params: channels.PagePdfParams, progress: Progress): Promise<channels.PagePdfResult> {
     if (!this._page.pdf)
       throw new Error('PDF generation is only supported for Headless Chromium');
-    const buffer = await this._page.pdf(params);
+    const buffer = await progress.race(this._page.pdf(params));
     return { pdf: buffer };
   }
 
-  async bringToFront(params: channels.PageBringToFrontParams, metadata: CallMetadata): Promise<void> {
-    await this._page.bringToFront();
+  async snapshotForAI(params: channels.PageSnapshotForAIParams, progress: Progress): Promise<channels.PageSnapshotForAIResult> {
+    return { snapshot: await this._page.snapshotForAI(progress) };
   }
 
-  async startJSCoverage(params: channels.PageStartJSCoverageParams, metadata: CallMetadata): Promise<void> {
+  async bringToFront(params: channels.PageBringToFrontParams, progress: Progress): Promise<void> {
+    await progress.race(this._page.bringToFront());
+  }
+
+  async startJSCoverage(params: channels.PageStartJSCoverageParams, progress: Progress): Promise<void> {
     const coverage = this._page.coverage as CRCoverage;
-    await coverage.startJSCoverage(params);
+    await coverage.startJSCoverage(progress, params);
+    this._jsCoverageActive = true;
   }
 
-  async stopJSCoverage(params: channels.PageStopJSCoverageParams, metadata: CallMetadata): Promise<channels.PageStopJSCoverageResult> {
+  async stopJSCoverage(params: channels.PageStopJSCoverageParams, progress: Progress): Promise<channels.PageStopJSCoverageResult> {
+    this._jsCoverageActive = false;
     const coverage = this._page.coverage as CRCoverage;
     return await coverage.stopJSCoverage();
   }
 
-  async startCSSCoverage(params: channels.PageStartCSSCoverageParams, metadata: CallMetadata): Promise<void> {
+  async startCSSCoverage(params: channels.PageStartCSSCoverageParams, progress: Progress): Promise<void> {
     const coverage = this._page.coverage as CRCoverage;
-    await coverage.startCSSCoverage(params);
+    await coverage.startCSSCoverage(progress, params);
+    this._cssCoverageActive = true;
   }
 
-  async stopCSSCoverage(params: channels.PageStopCSSCoverageParams, metadata: CallMetadata): Promise<channels.PageStopCSSCoverageResult> {
+  async stopCSSCoverage(params: channels.PageStopCSSCoverageParams, progress: Progress): Promise<channels.PageStopCSSCoverageResult> {
+    this._cssCoverageActive = false;
     const coverage = this._page.coverage as CRCoverage;
     return await coverage.stopCSSCoverage();
   }
@@ -314,8 +358,29 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
 
   override _onDispose() {
     // Avoid protocol calls for the closed page.
-    if (!this._page.isClosedOrClosingOrCrashed())
-      this._page.setClientRequestInterceptor(undefined).catch(() => {});
+    if (this._page.isClosedOrClosingOrCrashed())
+      return;
+
+    // Cleanup properly and leave the page in a good state. Other clients may still connect and use it.
+    this._interceptionUrlMatchers = [];
+    this._page.removeRequestInterceptor(this._requestInterceptor).catch(() => {});
+    this._page.removeExposedBindings(this._bindings).catch(() => {});
+    this._bindings = [];
+    this._page.removeInitScripts(this._initScripts).catch(() => {});
+    this._initScripts = [];
+    if (this._routeWebSocketInitScript)
+      WebSocketRouteDispatcher.uninstall(this.connection, this._page, this._routeWebSocketInitScript).catch(() => {});
+    this._routeWebSocketInitScript = undefined;
+    for (const uid of this._locatorHandlers)
+      this._page.unregisterLocatorHandler(uid);
+    this._locatorHandlers.clear();
+    this._page.setFileChooserInterceptedBy(false, this).catch(() => {});
+    if (this._jsCoverageActive)
+      (this._page.coverage as CRCoverage).stopJSCoverage().catch(() => {});
+    this._jsCoverageActive = false;
+    if (this._cssCoverageActive)
+      (this._page.coverage as CRCoverage).stopCSSCoverage().catch(() => {});
+    this._cssCoverageActive = false;
   }
 }
 
@@ -326,38 +391,39 @@ export class WorkerDispatcher extends Dispatcher<Worker, channels.WorkerChannel,
   static fromNullable(scope: PageDispatcher | BrowserContextDispatcher, worker: Worker | null): WorkerDispatcher | undefined {
     if (!worker)
       return undefined;
-    const result = existingDispatcher<WorkerDispatcher>(worker);
+    const result = scope.connection.existingDispatcher<WorkerDispatcher>(worker);
     return result || new WorkerDispatcher(scope, worker);
   }
 
   constructor(scope: PageDispatcher | BrowserContextDispatcher, worker: Worker) {
     super(scope, worker, 'Worker', {
-      url: worker.url()
+      url: worker.url
     });
     this.addObjectListener(Worker.Events.Close, () => this._dispatchEvent('close'));
   }
 
-  async evaluateExpression(params: channels.WorkerEvaluateExpressionParams, metadata: CallMetadata): Promise<channels.WorkerEvaluateExpressionResult> {
-    return { value: serializeResult(await this._object.evaluateExpression(params.expression, params.isFunction, parseArgument(params.arg))) };
+  async evaluateExpression(params: channels.WorkerEvaluateExpressionParams, progress: Progress): Promise<channels.WorkerEvaluateExpressionResult> {
+    return { value: serializeResult(await progress.race(this._object.evaluateExpression(params.expression, params.isFunction, parseArgument(params.arg)))) };
   }
 
-  async evaluateExpressionHandle(params: channels.WorkerEvaluateExpressionHandleParams, metadata: CallMetadata): Promise<channels.WorkerEvaluateExpressionHandleResult> {
-    return { handle: ElementHandleDispatcher.fromJSHandle(this, await this._object.evaluateExpressionHandle(params.expression, params.isFunction, parseArgument(params.arg))) };
+  async evaluateExpressionHandle(params: channels.WorkerEvaluateExpressionHandleParams, progress: Progress): Promise<channels.WorkerEvaluateExpressionHandleResult> {
+    return { handle: JSHandleDispatcher.fromJSHandle(this, await progress.race(this._object.evaluateExpressionHandle(params.expression, params.isFunction, parseArgument(params.arg)))) };
   }
 }
 
-export class BindingCallDispatcher extends Dispatcher<{ guid: string }, channels.BindingCallChannel, PageDispatcher | BrowserContextDispatcher> implements channels.BindingCallChannel {
+export class BindingCallDispatcher extends Dispatcher<SdkObject, channels.BindingCallChannel, PageDispatcher | BrowserContextDispatcher> implements channels.BindingCallChannel {
   _type_BindingCall = true;
   private _resolve: ((arg: any) => void) | undefined;
   private _reject: ((error: any) => void) | undefined;
   private _promise: Promise<any>;
 
   constructor(scope: PageDispatcher, name: string, needsHandle: boolean, source: { context: BrowserContext, page: Page, frame: Frame }, args: any[]) {
-    super(scope, { guid: 'bindingCall@' + createGuid() }, 'BindingCall', {
-      frame: FrameDispatcher.from(scope.parentScope(), source.frame),
+    const frameDispatcher = FrameDispatcher.from(scope.parentScope(), source.frame);
+    super(scope, new SdkObject(scope._object, 'bindingCall'), 'BindingCall', {
+      frame: frameDispatcher,
       name,
       args: needsHandle ? undefined : args.map(serializeResult),
-      handle: needsHandle ? ElementHandleDispatcher.fromJSHandle(scope, args[0] as JSHandle) : undefined,
+      handle: needsHandle ? ElementHandleDispatcher.fromJSOrElementHandle(frameDispatcher, args[0] as JSHandle) : undefined,
     });
     this._promise = new Promise((resolve, reject) => {
       this._resolve = resolve;
@@ -369,12 +435,12 @@ export class BindingCallDispatcher extends Dispatcher<{ guid: string }, channels
     return this._promise;
   }
 
-  async resolve(params: channels.BindingCallResolveParams, metadata: CallMetadata): Promise<void> {
+  async resolve(params: channels.BindingCallResolveParams, progress: Progress): Promise<void> {
     this._resolve!(parseArgument(params.result));
     this._dispose();
   }
 
-  async reject(params: channels.BindingCallRejectParams, metadata: CallMetadata): Promise<void> {
+  async reject(params: channels.BindingCallRejectParams, progress: Progress): Promise<void> {
     this._reject!(parseError(params.error));
     this._dispose();
   }
diff --git a/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts b/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts
index 2122f064c957a..d26042339bbbf 100644
--- a/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/playwrightDispatcher.ts
@@ -14,51 +14,79 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import type { Browser } from '../browser';
+import { SocksProxy } from '../utils/socksProxy';
 import { GlobalAPIRequestContext } from '../fetch';
-import type { Playwright } from '../playwright';
-import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from '../../common/socksProxy';
-import { SocksProxy } from '../../common/socksProxy';
 import { AndroidDispatcher } from './androidDispatcher';
+import { AndroidDeviceDispatcher } from './androidDispatcher';
+import { BrowserDispatcher } from './browserDispatcher';
 import { BrowserTypeDispatcher } from './browserTypeDispatcher';
-import type { RootDispatcher } from './dispatcher';
 import { Dispatcher } from './dispatcher';
 import { ElectronDispatcher } from './electronDispatcher';
 import { LocalUtilsDispatcher } from './localUtilsDispatcher';
 import { APIRequestContextDispatcher } from './networkDispatchers';
-import { SelectorsDispatcher } from './selectorsDispatcher';
-import { ConnectedBrowserDispatcher } from './browserDispatcher';
-import { createGuid } from '../../utils';
+import { SdkObject } from '../instrumentation';
+import { eventsHelper  } from '../utils/eventsHelper';
+
+import type { RootDispatcher } from './dispatcher';
+import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from '../utils/socksProxy';
+import type { RegisteredListener } from '../utils/eventsHelper';
 import type { AndroidDevice } from '../android/android';
-import { AndroidDeviceDispatcher } from './androidDispatcher';
-import { eventsHelper, type RegisteredListener } from '../../utils/eventsHelper';
+import type { Browser } from '../browser';
+import type { Playwright } from '../playwright';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+
+export type PlaywrightDispatcherOptions = {
+  socksProxy?: SocksProxy;
+  denyLaunch?: boolean;
+  preLaunchedBrowser?: Browser;
+  preLaunchedAndroidDevice?: AndroidDevice;
+  sharedBrowser?: boolean;
+};
 
 export class PlaywrightDispatcher extends Dispatcher<Playwright, channels.PlaywrightChannel, RootDispatcher> implements channels.PlaywrightChannel {
   _type_Playwright;
-  private _browserDispatcher: ConnectedBrowserDispatcher | undefined;
+  private _browserDispatcher: BrowserDispatcher | undefined;
 
-  constructor(scope: RootDispatcher, playwright: Playwright, socksProxy?: SocksProxy, preLaunchedBrowser?: Browser, prelaunchedAndroidDevice?: AndroidDevice) {
-    const browserDispatcher = preLaunchedBrowser ? new ConnectedBrowserDispatcher(scope, preLaunchedBrowser) : undefined;
+  constructor(scope: RootDispatcher, playwright: Playwright, options: PlaywrightDispatcherOptions = {}) {
+    const denyLaunch = options.denyLaunch ?? false;
+    const chromium = new BrowserTypeDispatcher(scope, playwright.chromium, denyLaunch);
+    const firefox = new BrowserTypeDispatcher(scope, playwright.firefox, denyLaunch);
+    const webkit = new BrowserTypeDispatcher(scope, playwright.webkit, denyLaunch);
+    const _bidiChromium = new BrowserTypeDispatcher(scope, playwright._bidiChromium, denyLaunch);
+    const _bidiFirefox = new BrowserTypeDispatcher(scope, playwright._bidiFirefox, denyLaunch);
     const android = new AndroidDispatcher(scope, playwright.android);
-    const prelaunchedAndroidDeviceDispatcher = prelaunchedAndroidDevice ? new AndroidDeviceDispatcher(android, prelaunchedAndroidDevice) : undefined;
-    super(scope, playwright, 'Playwright', {
-      chromium: new BrowserTypeDispatcher(scope, playwright.chromium),
-      firefox: new BrowserTypeDispatcher(scope, playwright.firefox),
-      webkit: new BrowserTypeDispatcher(scope, playwright.webkit),
+    const initializer: channels.PlaywrightInitializer = {
+      chromium,
+      firefox,
+      webkit,
+      _bidiChromium,
+      _bidiFirefox,
       android,
-      electron: new ElectronDispatcher(scope, playwright.electron),
+      electron: new ElectronDispatcher(scope, playwright.electron, denyLaunch),
       utils: playwright.options.isServer ? undefined : new LocalUtilsDispatcher(scope, playwright),
-      selectors: new SelectorsDispatcher(scope, browserDispatcher?.selectors || playwright.selectors),
-      preLaunchedBrowser: browserDispatcher,
-      preConnectedAndroidDevice: prelaunchedAndroidDeviceDispatcher,
-      socksSupport: socksProxy ? new SocksSupportDispatcher(scope, socksProxy) : undefined,
-    });
+      socksSupport: options.socksProxy ? new SocksSupportDispatcher(scope, playwright, options.socksProxy) : undefined,
+    };
+
+    let browserDispatcher: BrowserDispatcher | undefined;
+    if (options.preLaunchedBrowser) {
+      const browserTypeDispatcher = initializer[options.preLaunchedBrowser.options.name as keyof typeof initializer] as BrowserTypeDispatcher;
+      browserDispatcher = new BrowserDispatcher(browserTypeDispatcher, options.preLaunchedBrowser, {
+        ignoreStopAndKill: true,
+        isolateContexts: !options.sharedBrowser,
+      });
+      initializer.preLaunchedBrowser = browserDispatcher;
+    }
+
+    if (options.preLaunchedAndroidDevice)
+      initializer.preConnectedAndroidDevice = new AndroidDeviceDispatcher(android, options.preLaunchedAndroidDevice);
+
+    super(scope, playwright, 'Playwright', initializer);
     this._type_Playwright = true;
     this._browserDispatcher = browserDispatcher;
   }
 
-  async newRequest(params: channels.PlaywrightNewRequestParams): Promise<channels.PlaywrightNewRequestResult> {
+  async newRequest(params: channels.PlaywrightNewRequestParams, progress: Progress): Promise<channels.PlaywrightNewRequestResult> {
     const request = new GlobalAPIRequestContext(this._object, params);
     return { request: APIRequestContextDispatcher.from(this.parentScope(), request) };
   }
@@ -69,13 +97,13 @@ export class PlaywrightDispatcher extends Dispatcher<Playwright, channels.Playwr
   }
 }
 
-class SocksSupportDispatcher extends Dispatcher<{ guid: string }, channels.SocksSupportChannel, RootDispatcher> implements channels.SocksSupportChannel {
+class SocksSupportDispatcher extends Dispatcher<SdkObject, channels.SocksSupportChannel, RootDispatcher> implements channels.SocksSupportChannel {
   _type_SocksSupport: boolean;
   private _socksProxy: SocksProxy;
   private _socksListeners: RegisteredListener[];
 
-  constructor(scope: RootDispatcher, socksProxy: SocksProxy) {
-    super(scope, { guid: 'socksSupport@' + createGuid() }, 'SocksSupport', {});
+  constructor(scope: RootDispatcher, parent: SdkObject, socksProxy: SocksProxy) {
+    super(scope, new SdkObject(parent, 'socksSupport'), 'SocksSupport', {});
     this._type_SocksSupport = true;
     this._socksProxy = socksProxy;
     this._socksListeners = [
@@ -85,23 +113,23 @@ class SocksSupportDispatcher extends Dispatcher<{ guid: string }, channels.Socks
     ];
   }
 
-  async socksConnected(params: channels.SocksSupportSocksConnectedParams): Promise<void> {
+  async socksConnected(params: channels.SocksSupportSocksConnectedParams, progress: Progress): Promise<void> {
     this._socksProxy?.socketConnected(params);
   }
 
-  async socksFailed(params: channels.SocksSupportSocksFailedParams): Promise<void> {
+  async socksFailed(params: channels.SocksSupportSocksFailedParams, progress: Progress): Promise<void> {
     this._socksProxy?.socketFailed(params);
   }
 
-  async socksData(params: channels.SocksSupportSocksDataParams): Promise<void> {
+  async socksData(params: channels.SocksSupportSocksDataParams, progress: Progress): Promise<void> {
     this._socksProxy?.sendSocketData(params);
   }
 
-  async socksError(params: channels.SocksSupportSocksErrorParams): Promise<void> {
+  async socksError(params: channels.SocksSupportSocksErrorParams, progress: Progress): Promise<void> {
     this._socksProxy?.sendSocketError(params);
   }
 
-  async socksEnd(params: channels.SocksSupportSocksEndParams): Promise<void> {
+  async socksEnd(params: channels.SocksSupportSocksEndParams, progress: Progress): Promise<void> {
     this._socksProxy?.sendSocketEnd(params);
   }
 
diff --git a/packages/playwright-core/src/server/dispatchers/selectorsDispatcher.ts b/packages/playwright-core/src/server/dispatchers/selectorsDispatcher.ts
deleted file mode 100644
index 4582a8081d707..0000000000000
--- a/packages/playwright-core/src/server/dispatchers/selectorsDispatcher.ts
+++ /dev/null
@@ -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 type { RootDispatcher } from './dispatcher';
-import { Dispatcher } from './dispatcher';
-import type * as channels from '@protocol/channels';
-import type { Selectors } from '../selectors';
-
-export class SelectorsDispatcher extends Dispatcher<Selectors, channels.SelectorsChannel, RootDispatcher> implements channels.SelectorsChannel {
-  _type_Selectors = true;
-
-  constructor(scope: RootDispatcher, selectors: Selectors) {
-    super(scope, selectors, 'Selectors', {});
-  }
-
-  async register(params: channels.SelectorsRegisterParams): Promise<void> {
-    await this._object.register(params.name, params.source, params.contentScript);
-  }
-
-  async setTestIdAttributeName(params: channels.SelectorsSetTestIdAttributeNameParams): Promise<void> {
-    this._object.setTestIdAttributeName(params.testIdAttributeName);
-  }
-}
diff --git a/packages/playwright-core/src/server/dispatchers/streamDispatcher.ts b/packages/playwright-core/src/server/dispatchers/streamDispatcher.ts
index 4a45468389215..2d7da4fa66424 100644
--- a/packages/playwright-core/src/server/dispatchers/streamDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/streamDispatcher.ts
@@ -14,24 +14,36 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import { Dispatcher } from './dispatcher';
-import type * as stream from 'stream';
-import { ManualPromise, createGuid } from '../../utils';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { SdkObject } from '../instrumentation';
+
 import type { ArtifactDispatcher } from './artifactDispatcher';
+import type * as channels from '@protocol/channels';
+import type * as stream from 'stream';
+import type { Progress } from '@protocol/progress';
+
+class StreamSdkObject extends SdkObject {
+  readonly stream: stream.Readable;
+
+  constructor(parent: SdkObject, stream: stream.Readable) {
+    super(parent, 'stream');
+    this.stream = stream;
+  }
+}
 
-export class StreamDispatcher extends Dispatcher<{ guid: string, stream: stream.Readable }, channels.StreamChannel, ArtifactDispatcher> implements channels.StreamChannel {
+export class StreamDispatcher extends Dispatcher<StreamSdkObject, channels.StreamChannel, ArtifactDispatcher> implements channels.StreamChannel {
   _type_Stream = true;
   private _ended: boolean = false;
 
   constructor(scope: ArtifactDispatcher, stream: stream.Readable) {
-    super(scope, { guid: 'stream@' + createGuid(), stream }, 'Stream', {});
+    super(scope, new StreamSdkObject(scope._object, stream), 'Stream', {});
     // In Node v12.9.0+ we can use readableEnded.
     stream.once('end', () => this._ended =  true);
     stream.once('error', () => this._ended =  true);
   }
 
-  async read(params: channels.StreamReadParams): Promise<channels.StreamReadResult> {
+  async read(params: channels.StreamReadParams, progress: Progress): Promise<channels.StreamReadResult> {
     const stream = this._object.stream;
     if (this._ended)
       return { binary: Buffer.from('') };
@@ -41,16 +53,17 @@ export class StreamDispatcher extends Dispatcher<{ guid: string, stream: stream.
       stream.on('readable', done);
       stream.on('end', done);
       stream.on('error', done);
-      await readyPromise;
-      stream.off('readable', done);
-      stream.off('end', done);
-      stream.off('error', done);
+      await progress.race(readyPromise).finally(() => {
+        stream.off('readable', done);
+        stream.off('end', done);
+        stream.off('error', done);
+      });
     }
     const buffer = stream.read(Math.min(stream.readableLength, params.size || stream.readableLength));
     return { binary: buffer || Buffer.from('') };
   }
 
-  async close() {
+  async close(params: channels.StreamCloseParams, progress: Progress): Promise<void> {
     this._object.stream.destroy();
   }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts b/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts
index b8214fbe31b5f..678d35b1e9875 100644
--- a/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/tracingDispatcher.ts
@@ -14,18 +14,21 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import type { Tracing } from '../trace/recorder/tracing';
 import { ArtifactDispatcher } from './artifactDispatcher';
-import { Dispatcher, existingDispatcher } from './dispatcher';
+import { Dispatcher } from './dispatcher';
+
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
 import type { APIRequestContextDispatcher } from './networkDispatchers';
+import type { Tracing } from '../trace/recorder/tracing';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
 
 export class TracingDispatcher extends Dispatcher<Tracing, channels.TracingChannel, BrowserContextDispatcher | APIRequestContextDispatcher> implements channels.TracingChannel {
   _type_Tracing = true;
+  private _started = false;
 
   static from(scope: BrowserContextDispatcher | APIRequestContextDispatcher, tracing: Tracing): TracingDispatcher {
-    const result = existingDispatcher<TracingDispatcher>(tracing);
+    const result = scope.connection.existingDispatcher<TracingDispatcher>(tracing);
     return result || new TracingDispatcher(scope, tracing);
   }
 
@@ -33,21 +36,38 @@ export class TracingDispatcher extends Dispatcher<Tracing, channels.TracingChann
     super(scope, tracing, 'Tracing', {});
   }
 
-  async tracingStart(params: channels.TracingTracingStartParams): Promise<channels.TracingTracingStartResult> {
-    await this._object.start(params);
+  async tracingStart(params: channels.TracingTracingStartParams, progress: Progress): Promise<channels.TracingTracingStartResult> {
+    this._object.start(params);
+    this._started = true;
   }
 
-  async tracingStartChunk(params: channels.TracingTracingStartChunkParams): Promise<channels.TracingTracingStartChunkResult> {
-    return await this._object.startChunk(params);
+  async tracingStartChunk(params: channels.TracingTracingStartChunkParams, progress: Progress): Promise<channels.TracingTracingStartChunkResult> {
+    return await this._object.startChunk(progress, params);
   }
 
-  async tracingStopChunk(params: channels.TracingTracingStopChunkParams): Promise<channels.TracingTracingStopChunkResult> {
-    const { artifact, entries } = await this._object.stopChunk(params);
+  async tracingGroup(params: channels.TracingTracingGroupParams, progress: Progress): Promise<channels.TracingTracingGroupResult> {
+    const { name, location } = params;
+    this._object.group(name, location, progress.metadata);
+  }
+
+  async tracingGroupEnd(params: channels.TracingTracingGroupEndParams, progress: Progress): Promise<channels.TracingTracingGroupEndResult> {
+    this._object.groupEnd();
+  }
+
+  async tracingStopChunk(params: channels.TracingTracingStopChunkParams, progress: Progress): Promise<channels.TracingTracingStopChunkResult> {
+    const { artifact, entries } = await this._object.stopChunk(progress, params);
     return { artifact: artifact ? ArtifactDispatcher.from(this, artifact) : undefined, entries };
   }
 
-  async tracingStop(params: channels.TracingTracingStopParams): Promise<channels.TracingTracingStopResult> {
-    await this._object.stop();
+  async tracingStop(params: channels.TracingTracingStopParams, progress: Progress): Promise<channels.TracingTracingStopResult> {
+    this._started = false;
+    await this._object.stop(progress);
   }
 
+  override _onDispose() {
+    // Avoid protocol calls for the closed context.
+    if (this._started)
+      this._object.stopChunk(undefined, { mode: 'discard' }).then(() => this._object.stop(undefined)).catch(() => {});
+    this._started = false;
+  }
 }
diff --git a/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts
new file mode 100644
index 0000000000000..53384dded91d7
--- /dev/null
+++ b/packages/playwright-core/src/server/dispatchers/webSocketRouteDispatcher.ts
@@ -0,0 +1,172 @@
+/**
+ * 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 { Page } from '../page';
+import { Dispatcher } from './dispatcher';
+import { PageDispatcher } from './pageDispatcher';
+import * as rawWebSocketMockSource from '../../generated/webSocketMockSource';
+import { SdkObject } from '../instrumentation';
+import { urlMatches } from '../../utils/isomorphic/urlMatch';
+import { eventsHelper } from '../utils/eventsHelper';
+
+import type { BrowserContextDispatcher } from './browserContextDispatcher';
+import type { BrowserContext } from '../browserContext';
+import type { DispatcherConnection } from './dispatcher';
+import type { Frame } from '../frames';
+import type * as ws from '@injected/webSocketMock';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+import type { InitScript, PageBinding } from '../page';
+
+export class WebSocketRouteDispatcher extends Dispatcher<SdkObject, channels.WebSocketRouteChannel, PageDispatcher | BrowserContextDispatcher> implements channels.WebSocketRouteChannel {
+  _type_WebSocketRoute = true;
+  private _id: string;
+  private _frame: Frame;
+  private static _idToDispatcher = new Map<string, WebSocketRouteDispatcher>();
+
+  constructor(scope: PageDispatcher | BrowserContextDispatcher, id: string, url: string, frame: Frame) {
+    super(scope, new SdkObject(scope._object, 'webSocketRoute'), 'WebSocketRoute', { url });
+    this._id = id;
+    this._frame = frame;
+    this._eventListeners.push(
+        // When the frame navigates or detaches, there will be no more communication
+        // from the mock websocket, so pretend like it was closed.
+        eventsHelper.addEventListener(frame._page, Page.Events.InternalFrameNavigatedToNewDocument, (frame: Frame) => {
+          if (frame === this._frame)
+            this._executionContextGone();
+        }),
+        eventsHelper.addEventListener(frame._page, Page.Events.FrameDetached, (frame: Frame) => {
+          if (frame === this._frame)
+            this._executionContextGone();
+        }),
+        eventsHelper.addEventListener(frame._page, Page.Events.Close, () => this._executionContextGone()),
+        eventsHelper.addEventListener(frame._page, Page.Events.Crash, () => this._executionContextGone()),
+    );
+    WebSocketRouteDispatcher._idToDispatcher.set(this._id, this);
+    (scope as any)._dispatchEvent('webSocketRoute', { webSocketRoute: this });
+  }
+
+  static async install(progress: Progress, connection: DispatcherConnection, target: Page | BrowserContext): Promise<InitScript> {
+    const context = target instanceof Page ? target.browserContext : target;
+    let data = context.getBindingClient(kBindingName) as BindingData | undefined;
+    if (data && data.connection !== connection)
+      throw new Error('Another client is already routing WebSockets');
+    if (!data) {
+      data = { counter: 0, connection, binding: null as any };
+      data.binding = await context.exposeBinding(progress, kBindingName, false, (source, payload: ws.BindingPayload) => {
+        if (payload.type === 'onCreate') {
+          const contextDispatcher = connection.existingDispatcher<BrowserContextDispatcher>(context);
+          const pageDispatcher = contextDispatcher ? PageDispatcher.fromNullable(contextDispatcher, source.page) : undefined;
+          let scope: PageDispatcher | BrowserContextDispatcher | undefined;
+          if (pageDispatcher && matchesPattern(pageDispatcher, context._options.baseURL, payload.url))
+            scope = pageDispatcher;
+          else if (contextDispatcher && matchesPattern(contextDispatcher, context._options.baseURL, payload.url))
+            scope = contextDispatcher;
+          if (scope) {
+            new WebSocketRouteDispatcher(scope, payload.id, payload.url, source.frame);
+          } else {
+            const request: ws.PassthroughRequest = { id: payload.id, type: 'passthrough' };
+            source.frame.evaluateExpression(`globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {});
+          }
+          return;
+        }
+
+        const dispatcher = WebSocketRouteDispatcher._idToDispatcher.get(payload.id);
+        if (payload.type === 'onMessageFromPage')
+          dispatcher?._dispatchEvent('messageFromPage', { message: payload.data.data, isBase64: payload.data.isBase64 });
+        if (payload.type === 'onMessageFromServer')
+          dispatcher?._dispatchEvent('messageFromServer', { message: payload.data.data, isBase64: payload.data.isBase64 });
+        if (payload.type === 'onClosePage')
+          dispatcher?._dispatchEvent('closePage', { code: payload.code, reason: payload.reason, wasClean: payload.wasClean });
+        if (payload.type === 'onCloseServer')
+          dispatcher?._dispatchEvent('closeServer', { code: payload.code, reason: payload.reason, wasClean: payload.wasClean });
+      }, data);
+    }
+    ++data.counter;
+
+    return await target.addInitScript(progress, `
+      (() => {
+        const module = {};
+        ${rawWebSocketMockSource.source}
+        (module.exports.inject())(globalThis);
+      })();
+    `);
+  }
+
+  static async uninstall(connection: DispatcherConnection, target: Page | BrowserContext, initScript: InitScript) {
+    const context = target instanceof Page ? target.browserContext : target;
+    const data = context.getBindingClient(kBindingName) as BindingData | undefined;
+    if (!data || data.connection !== connection)
+      return;
+    if (--data.counter <= 0)
+      await context.removeExposedBindings([data.binding]);
+    await target.removeInitScripts([initScript]);
+  }
+
+  async connect(params: channels.WebSocketRouteConnectParams, progress: Progress) {
+    await this._evaluateAPIRequest(progress, { id: this._id, type: 'connect' });
+  }
+
+  async ensureOpened(params: channels.WebSocketRouteEnsureOpenedParams, progress: Progress) {
+    await this._evaluateAPIRequest(progress, { id: this._id, type: 'ensureOpened' });
+  }
+
+  async sendToPage(params: channels.WebSocketRouteSendToPageParams, progress: Progress) {
+    await this._evaluateAPIRequest(progress, { id: this._id, type: 'sendToPage', data: { data: params.message, isBase64: params.isBase64 } });
+  }
+
+  async sendToServer(params: channels.WebSocketRouteSendToServerParams, progress: Progress) {
+    await this._evaluateAPIRequest(progress, { id: this._id, type: 'sendToServer', data: { data: params.message, isBase64: params.isBase64 } });
+  }
+
+  async closePage(params: channels.WebSocketRouteClosePageParams, progress: Progress) {
+    await this._evaluateAPIRequest(progress, { id: this._id, type: 'closePage', code: params.code, reason: params.reason, wasClean: params.wasClean });
+  }
+
+  async closeServer(params: channels.WebSocketRouteCloseServerParams, progress: Progress) {
+    await this._evaluateAPIRequest(progress, { id: this._id, type: 'closeServer', code: params.code, reason: params.reason, wasClean: params.wasClean });
+  }
+
+  private async _evaluateAPIRequest(progress: Progress, request: ws.APIRequest) {
+    await progress.race(this._frame.evaluateExpression(`globalThis.__pwWebSocketDispatch(${JSON.stringify(request)})`).catch(() => {}));
+  }
+
+  override _onDispose() {
+    WebSocketRouteDispatcher._idToDispatcher.delete(this._id);
+  }
+
+  private _executionContextGone() {
+    // We could enter here after being disposed upon page closure:
+    // - first from the recursive dispose inintiated by PageDispatcher;
+    // - then from our own page.on('close') listener.
+    if (!this._disposed) {
+      this._dispatchEvent('closePage', { wasClean: true });
+      this._dispatchEvent('closeServer', { wasClean: true });
+    }
+  }
+}
+
+function matchesPattern(dispatcher: PageDispatcher | BrowserContextDispatcher, baseURL: string | undefined, url: string) {
+  for (const pattern of dispatcher._webSocketInterceptionPatterns || []) {
+    const urlMatch = pattern.regexSource ? new RegExp(pattern.regexSource, pattern.regexFlags) : pattern.glob;
+    if (urlMatches(baseURL, url, urlMatch, true))
+      return true;
+  }
+  return false;
+}
+
+const kBindingName = '__pwWebSocketBinding';
+type BindingData = { counter: number, connection: DispatcherConnection, binding: PageBinding };
diff --git a/packages/playwright-core/src/server/dispatchers/writableStreamDispatcher.ts b/packages/playwright-core/src/server/dispatchers/writableStreamDispatcher.ts
index 3e54e644d5547..052b21eec6c0b 100644
--- a/packages/playwright-core/src/server/dispatchers/writableStreamDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/writableStreamDispatcher.ts
@@ -14,42 +14,54 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
+import fs from 'fs';
+
 import { Dispatcher } from './dispatcher';
-import * as fs from 'fs';
-import { createGuid } from '../../utils';
+import { SdkObject } from '../instrumentation';
+
 import type { BrowserContextDispatcher } from './browserContextDispatcher';
+import type * as channels from '@protocol/channels';
+import type { Progress } from '@protocol/progress';
+
+class WritableStreamSdkObject extends SdkObject {
+  readonly streamOrDirectory: fs.WriteStream | string;
+  readonly lastModifiedMs: number | undefined;
+
+  constructor(parent: SdkObject, streamOrDirectory: fs.WriteStream | string, lastModifiedMs: number | undefined) {
+    super(parent, 'stream');
+    this.streamOrDirectory = streamOrDirectory;
+    this.lastModifiedMs = lastModifiedMs;
+  }
+}
 
-export class WritableStreamDispatcher extends Dispatcher<{ guid: string, streamOrDirectory: fs.WriteStream | string }, channels.WritableStreamChannel, BrowserContextDispatcher> implements channels.WritableStreamChannel {
+export class WritableStreamDispatcher extends Dispatcher<WritableStreamSdkObject, channels.WritableStreamChannel, BrowserContextDispatcher> implements channels.WritableStreamChannel {
   _type_WritableStream = true;
-  private _lastModifiedMs: number | undefined;
 
   constructor(scope: BrowserContextDispatcher, streamOrDirectory: fs.WriteStream | string, lastModifiedMs?: number) {
-    super(scope, { guid: 'writableStream@' + createGuid(), streamOrDirectory }, 'WritableStream', {});
-    this._lastModifiedMs = lastModifiedMs;
+    super(scope, new WritableStreamSdkObject(scope._object, streamOrDirectory, lastModifiedMs), 'WritableStream', {});
   }
 
-  async write(params: channels.WritableStreamWriteParams): Promise<channels.WritableStreamWriteResult> {
+  async write(params: channels.WritableStreamWriteParams, progress: Progress): Promise<channels.WritableStreamWriteResult> {
     if (typeof this._object.streamOrDirectory === 'string')
       throw new Error('Cannot write to a directory');
     const stream = this._object.streamOrDirectory;
-    await new Promise<void>((fulfill, reject) => {
+    await progress.race(new Promise<void>((fulfill, reject) => {
       stream.write(params.binary, error => {
         if (error)
           reject(error);
         else
           fulfill();
       });
-    });
+    }));
   }
 
-  async close() {
+  async close(params: channels.WritableStreamCloseParams, progress: Progress): Promise<void> {
     if (typeof this._object.streamOrDirectory === 'string')
       throw new Error('Cannot close a directory');
     const stream = this._object.streamOrDirectory;
-    await new Promise<void>(fulfill => stream.end(fulfill));
-    if (this._lastModifiedMs)
-      await fs.promises.utimes(this.path(), new Date(this._lastModifiedMs), new Date(this._lastModifiedMs));
+    await progress.race(new Promise<void>(fulfill => stream.end(fulfill)));
+    if (this._object.lastModifiedMs)
+      await progress.race(fs.promises.utimes(this.path(), new Date(this._object.lastModifiedMs), new Date(this._object.lastModifiedMs)));
   }
 
   path(): string {
diff --git a/packages/playwright-core/src/server/dom.ts b/packages/playwright-core/src/server/dom.ts
index 60aa899412703..a393afc170b16 100644
--- a/packages/playwright-core/src/server/dom.ts
+++ b/packages/playwright-core/src/server/dom.ts
@@ -15,21 +15,19 @@
  */
 
 import fs from 'fs';
-import type * as channels from '@protocol/channels';
-import * as injectedScriptSource from '../generated/injectedScriptSource';
-import { isSessionClosedError } from './protocolError';
-import type { ScreenshotOptions } from './screenshotter';
-import type * as frames from './frames';
-import type { InjectedScript, HitTargetInterceptionResult, ElementState } from './injected/injectedScript';
-import type { CallMetadata } from './instrumentation';
+
 import * as js from './javascript';
+import { isUnderTest } from '../utils';
+import { prepareFilesForUpload } from './fileUploadUtils';
+import * as rawInjectedScriptSource from '../generated/injectedScriptSource';
+
+import type * as frames from './frames';
+import type { ElementState, HitTargetInterceptionResult, InjectedScript, InjectedScriptOptions } from '@injected/injectedScript';
 import type { Page } from './page';
 import type { Progress } from './progress';
-import { ProgressController } from './progress';
+import type { ScreenshotOptions } from './screenshotter';
 import type * as types from './types';
-import type { TimeoutOptions } from '../common/types';
-import { isUnderTest } from '../utils';
-import { prepareFilesForUpload } from './fileUploadUtils';
+import type * as channels from '@protocol/channels';
 
 export type InputFilesItems = {
   filePayloads?: types.FilePayload[],
@@ -38,7 +36,7 @@ export type InputFilesItems = {
 };
 
 type ActionName = 'click' | 'hover' | 'dblclick' | 'tap' | 'move and up' | 'move and down';
-type PerformActionResult = 'error:notvisible' | 'error:notconnected' | 'error:notinviewport' | 'error:optionsnotfound' | { missingState: ElementState } | { hitTargetDescription: string } | 'done';
+type PerformActionResult = 'error:notvisible' | 'error:notconnected' | 'error:notinviewport' | 'error:optionsnotfound' | 'error:optionnotenabled' | { missingState: ElementState } | { hitTargetDescription: string } | 'done';
 
 export class NonRecoverableDOMError extends Error {
 }
@@ -60,7 +58,7 @@ export class FrameExecutionContext extends js.ExecutionContext {
 
   override adoptIfNeeded(handle: js.JSHandle): Promise<js.JSHandle> | null {
     if (handle instanceof ElementHandle && handle._context !== this)
-      return this.frame._page._delegate.adoptElementHandle(handle, this);
+      return this.frame._page.delegate.adoptElementHandle(handle, this);
     return null;
   }
 
@@ -80,35 +78,33 @@ export class FrameExecutionContext extends js.ExecutionContext {
     return js.evaluateExpression(this, expression, { ...options, returnByValue: false }, arg);
   }
 
-  override createHandle(remoteObject: js.RemoteObject): js.JSHandle {
-    if (this.frame._page._delegate.isElementHandle(remoteObject))
-      return new ElementHandle(this, remoteObject.objectId!);
-    return super.createHandle(remoteObject);
-  }
-
   injectedScript(): Promise<js.JSHandle<InjectedScript>> {
     if (!this._injectedScriptPromise) {
-      const custom: string[] = [];
-      const selectorsRegistry = this.frame._page.context().selectors();
+      const customEngines: InjectedScriptOptions['customEngines'] = [];
+      const selectorsRegistry = this.frame._page.browserContext.selectors();
       for (const [name, { source }] of selectorsRegistry._engines)
-        custom.push(`{ name: '${name}', engine: (${source}) }`);
-      const sdkLanguage = this.frame.attribution.playwright.options.sdkLanguage;
+        customEngines.push({ name, source: `(${source})` });
+      const sdkLanguage = this.frame._page.browserContext._browser.sdkLanguage();
+      const options: InjectedScriptOptions = {
+        isUnderTest: isUnderTest(),
+        sdkLanguage,
+        testIdAttributeName: selectorsRegistry.testIdAttributeName(),
+        stableRafCount: this.frame._page.delegate.rafCountForStablePosition(),
+        browserName: this.frame._page.browserContext._browser.options.name,
+        customEngines,
+      };
       const source = `
         (() => {
         const module = {};
-        ${injectedScriptSource.source}
-        return new (module.exports.InjectedScript())(
-          globalThis,
-          ${isUnderTest()},
-          "${sdkLanguage}",
-          ${JSON.stringify(selectorsRegistry.testIdAttributeName())},
-          ${this.frame._page._delegate.rafCountForStablePosition()},
-          "${this.frame._page._browserContext._browser.options.name}",
-          [${custom.join(',\n')}]
-        );
+        ${rawInjectedScriptSource.source}
+        return new (module.exports.InjectedScript())(globalThis, ${JSON.stringify(options)});
         })();
       `;
-      this._injectedScriptPromise = this.rawEvaluateHandle(source).then(objectId => new js.JSHandle(this, 'object', 'InjectedScript', objectId));
+      this._injectedScriptPromise = this.rawEvaluateHandle(source)
+          .then(handle => {
+            handle._setPreview('InjectedScript');
+            return handle;
+          });
     }
     return this._injectedScriptPromise;
   }
@@ -142,7 +138,7 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       const utility = await this._frame._utilityContext();
       return await utility.evaluate(pageFunction, [await utility.injectedScript(), this, arg]);
     } catch (e) {
-      if (js.isJavaScriptErrorInEvaluate(e) || isSessionClosedError(e))
+      if (this._frame.isNonRetriableError(e))
         throw e;
       return 'error:notconnected';
     }
@@ -153,21 +149,21 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       const utility = await this._frame._utilityContext();
       return await utility.evaluateHandle(pageFunction, [await utility.injectedScript(), this, arg]);
     } catch (e) {
-      if (js.isJavaScriptErrorInEvaluate(e) || isSessionClosedError(e))
+      if (this._frame.isNonRetriableError(e))
         throw e;
       return 'error:notconnected';
     }
   }
 
   async ownerFrame(): Promise<frames.Frame | null> {
-    const frameId = await this._page._delegate.getOwnerFrame(this);
+    const frameId = await this._page.delegate.getOwnerFrame(this);
     if (!frameId)
       return null;
-    const frame = this._page._frameManager.frame(frameId);
+    const frame = this._page.frameManager.frame(frameId);
     if (frame)
       return frame;
-    for (const page of this._page._browserContext.pages()) {
-      const frame = page._frameManager.frame(frameId);
+    for (const page of this._page.browserContext.pages()) {
+      const frame = page.frameManager.frame(frameId);
       if (frame)
         return frame;
     }
@@ -182,58 +178,55 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     const isFrameElement = throwRetargetableDOMError(await this.isIframeElement());
     if (!isFrameElement)
       return null;
-    return this._page._delegate.getContentFrame(this);
+    return this._page.delegate.getContentFrame(this);
   }
 
-  async getAttribute(metadata: CallMetadata, name: string): Promise<string | null> {
-    return this._frame.getAttribute(metadata, ':scope', name, {}, this);
+  async getAttribute(progress: Progress, name: string): Promise<string | null> {
+    return this._frame.getAttribute(progress, ':scope', name, {}, this);
   }
 
-  async inputValue(metadata: CallMetadata): Promise<string> {
-    return this._frame.inputValue(metadata, ':scope', {}, this);
+  async inputValue(progress: Progress): Promise<string> {
+    return this._frame.inputValue(progress, ':scope', {}, this);
   }
 
-  async textContent(metadata: CallMetadata): Promise<string | null> {
-    return this._frame.textContent(metadata, ':scope', {}, this);
+  async textContent(progress: Progress): Promise<string | null> {
+    return this._frame.textContent(progress, ':scope', {}, this);
   }
 
-  async innerText(metadata: CallMetadata): Promise<string> {
-    return this._frame.innerText(metadata, ':scope', {}, this);
+  async innerText(progress: Progress): Promise<string> {
+    return this._frame.innerText(progress, ':scope', {}, this);
   }
 
-  async innerHTML(metadata: CallMetadata): Promise<string> {
-    return this._frame.innerHTML(metadata, ':scope', {}, this);
+  async innerHTML(progress: Progress): Promise<string> {
+    return this._frame.innerHTML(progress, ':scope', {}, this);
   }
 
-  async dispatchEvent(metadata: CallMetadata, type: string, eventInit: Object = {}) {
-    return this._frame.dispatchEvent(metadata, ':scope', type, eventInit, {}, this);
+  async dispatchEvent(progress: Progress, type: string, eventInit: Object = {}) {
+    return this._frame.dispatchEvent(progress, ':scope', type, eventInit, {}, this);
   }
 
-  async _scrollRectIntoViewIfNeeded(rect?: types.Rect): Promise<'error:notvisible' | 'error:notconnected' | 'done'> {
-    return await this._page._delegate.scrollRectIntoViewIfNeeded(this, rect);
+  async _scrollRectIntoViewIfNeeded(progress: Progress, rect?: types.Rect): Promise<'error:notvisible' | 'error:notconnected' | 'done'> {
+    return await progress.race(this._page.delegate.scrollRectIntoViewIfNeeded(this, rect));
   }
 
   async _waitAndScrollIntoViewIfNeeded(progress: Progress, waitForVisible: boolean): Promise<void> {
     const result = await this._retryAction(progress, 'scroll into view', async () => {
       progress.log(`  waiting for element to be stable`);
-      const waitResult = await this.evaluateInUtility(async ([injected, node, { waitForVisible }]) => {
+      const waitResult = await progress.race(this.evaluateInUtility(async ([injected, node, { waitForVisible }]) => {
         return await injected.checkElementStates(node, waitForVisible ? ['visible', 'stable'] : ['stable']);
-      }, { waitForVisible });
+      }, { waitForVisible }));
       if (waitResult)
         return waitResult;
-      return await this._scrollRectIntoViewIfNeeded();
+      return await this._scrollRectIntoViewIfNeeded(progress);
     }, {});
     assertDone(throwRetargetableDOMError(result));
   }
 
-  async scrollIntoViewIfNeeded(metadata: CallMetadata, options: types.TimeoutOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(
-        progress => this._waitAndScrollIntoViewIfNeeded(progress, false /* waitForVisible */),
-        this._page._timeoutSettings.timeout(options));
+  async scrollIntoViewIfNeeded(progress: Progress) {
+    await this._waitAndScrollIntoViewIfNeeded(progress, false /* waitForVisible */);
   }
 
-  private async _clickablePoint(): Promise<types.Point | 'error:notvisible' | 'error:notinviewport'> {
+  private async _clickablePoint(): Promise<types.Point | 'error:notvisible' | 'error:notinviewport' | 'error:notconnected'> {
     const intersectQuadWithViewport = (quad: types.Quad): types.Quad => {
       return quad.map(point => ({
         x: Math.min(Math.max(point.x, 0), metrics.width),
@@ -254,9 +247,11 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     };
 
     const [quads, metrics] = await Promise.all([
-      this._page._delegate.getContentQuads(this),
+      this._page.delegate.getContentQuads(this),
       this._page.mainFrame()._utilityContext().then(utility => utility.evaluate(() => ({ width: innerWidth, height: innerHeight }))),
     ] as const);
+    if (quads === 'error:notconnected')
+      return quads;
     if (!quads || !quads.length)
       return 'error:notvisible';
 
@@ -264,14 +259,22 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     const filtered = quads.map(quad => intersectQuadWithViewport(quad)).filter(quad => computeQuadArea(quad) > 0.99);
     if (!filtered.length)
       return 'error:notinviewport';
-    // Return the middle point of the first quad.
-    const result = { x: 0, y: 0 };
-    for (const point of filtered[0]) {
-      result.x += point.x / 4;
-      result.y += point.y / 4;
+    if (this._page.browserContext._browser.options.name === 'firefox') {
+      // Firefox internally uses integer coordinates, so 8.x is converted to 8 or 9 when clicking.
+      //
+      // This does not work nicely for small elements. For example, 1x1 square with corners
+      // (8;8) and (9;9) is targeted when clicking at (8;8) but not when clicking at (9;9).
+      // So, clicking at (8.x;8.y) will sometimes click at (9;9) and miss the target.
+      //
+      // Therefore, we try to find an integer point within a quad to make sure we click inside the element.
+      for (const quad of filtered) {
+        const integerPoint = findIntegerPointInsideQuad(quad);
+        if (integerPoint)
+          return integerPoint;
+      }
     }
-    compensateHalfIntegerRoundingError(result);
-    return result;
+    // Return the middle point of the first quad.
+    return quadMiddlePoint(filtered[0]);
   }
 
   private async _offsetPoint(offset: types.Point): Promise<types.Point | 'error:notvisible' | 'error:notconnected'> {
@@ -290,26 +293,26 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     };
   }
 
-  async _retryAction(progress: Progress, actionName: string, action: (retry: number) => Promise<PerformActionResult>, options: { trial?: boolean, force?: boolean, skipLocatorHandlersCheckpoint?: boolean }): Promise<'error:notconnected' | 'done'> {
+  async _retryAction(progress: Progress, actionName: string, action: (retry: number) => Promise<PerformActionResult>, options: { trial?: boolean, force?: boolean, skipActionPreChecks?: boolean }): Promise<'error:notconnected' | 'done'> {
     let retry = 0;
     // We progressively wait longer between retries, up to 500ms.
     const waitTime = [0, 20, 100, 100, 500];
 
-    while (progress.isRunning()) {
+    while (true) {
       if (retry) {
-        progress.log(`retrying ${actionName} action${options.trial ? ' (trial run)' : ''}, attempt #${retry}`);
+        progress.log(`retrying ${actionName} action${options.trial ? ' (trial run)' : ''}`);
         const timeout = waitTime[Math.min(retry - 1, waitTime.length - 1)];
         if (timeout) {
           progress.log(`  waiting ${timeout}ms`);
-          const result = await this.evaluateInUtility(([injected, node, timeout]) => new Promise<void>(f => setTimeout(f, timeout)), timeout);
+          const result = await progress.race(this.evaluateInUtility(([injected, node, timeout]) => new Promise<void>(f => setTimeout(f, timeout)), timeout));
           if (result === 'error:notconnected')
             return result;
         }
       } else {
         progress.log(`attempting ${actionName} action${options.trial ? ' (trial run)' : ''}`);
       }
-      if (!options.skipLocatorHandlersCheckpoint && !options.force)
-        await this._frame._page.performLocatorHandlersCheckpoint(progress);
+      if (!options.skipActionPreChecks && !options.force)
+        await this._frame._page.performActionPreChecks(progress);
       const result = await action(retry);
       ++retry;
       if (result === 'error:notvisible') {
@@ -328,6 +331,10 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
         progress.log('  did not find some options');
         continue;
       }
+      if (result === 'error:optionnotenabled') {
+        progress.log('  option being selected is not enabled');
+        continue;
+      }
       if (typeof result === 'object' && 'hitTargetDescription' in result) {
         progress.log(`  ${result.hitTargetDescription} intercepts pointer events`);
         continue;
@@ -338,13 +345,12 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       }
       return result;
     }
-    return 'done';
   }
 
   async _retryPointerAction(progress: Progress, actionName: ActionName, waitForEnabled: boolean, action: (point: types.Point) => Promise<void>,
     options: { waitAfter: boolean | 'disabled' } & types.PointerActionOptions & types.PointerActionWaitOptions): Promise<'error:notconnected' | 'done'> {
     // Note: do not perform locator handlers checkpoint to avoid moving the mouse in the middle of a drag operation.
-    const skipLocatorHandlersCheckpoint = actionName === 'move and up';
+    const skipActionPreChecks = actionName === 'move and up';
     return await this._retryAction(progress, actionName, async retry => {
       // By default, we scroll with protocol method to reveal the action point.
       // However, that might not work to scroll from under position:sticky elements
@@ -358,7 +364,7 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       ];
       const forceScrollOptions = scrollOptions[retry % scrollOptions.length];
       return await this._performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options);
-    }, { ...options, skipLocatorHandlersCheckpoint });
+    }, { ...options, skipActionPreChecks });
   }
 
   async _performPointerAction(
@@ -379,61 +385,59 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
           return 'done' as const;
         }, forceScrollOptions);
       }
-      return await this._scrollRectIntoViewIfNeeded(position ? { x: position.x, y: position.y, width: 0, height: 0 } : undefined);
+      return await this._scrollRectIntoViewIfNeeded(progress, position ? { x: position.x, y: position.y, width: 0, height: 0 } : undefined);
     };
 
     if (this._frame.parentFrame()) {
       // Best-effort scroll to make sure any iframes containing this element are scrolled
       // into view and visible, so they are not throttled.
       // See https://github.com/microsoft/playwright/issues/27196 for an example.
-      progress.throwIfAborted();  // Avoid action that has side-effects.
-      await doScrollIntoView().catch(() => {});
+      await progress.race(doScrollIntoView().catch(() => {}));
     }
 
     if ((options as any).__testHookBeforeStable)
-      await (options as any).__testHookBeforeStable();
+      await progress.race((options as any).__testHookBeforeStable());
 
     if (!force) {
       const elementStates: ElementState[] = waitForEnabled ? ['visible', 'enabled', 'stable'] : ['visible', 'stable'];
       progress.log(`  waiting for element to be ${waitForEnabled ? 'visible, enabled and stable' : 'visible and stable'}`);
-      const result = await this.evaluateInUtility(async ([injected, node, { elementStates }]) => {
+      const result = await progress.race(this.evaluateInUtility(async ([injected, node, { elementStates }]) => {
         return await injected.checkElementStates(node, elementStates);
-      }, { elementStates });
+      }, { elementStates }));
       if (result)
         return result;
       progress.log(`  element is ${waitForEnabled ? 'visible, enabled and stable' : 'visible and stable'}`);
     }
 
     if ((options as any).__testHookAfterStable)
-      await (options as any).__testHookAfterStable();
+      await progress.race((options as any).__testHookAfterStable());
 
     progress.log('  scrolling into view if needed');
-    progress.throwIfAborted();  // Avoid action that has side-effects.
-    const scrolled = await doScrollIntoView();
+    const scrolled = await progress.race(doScrollIntoView());
     if (scrolled !== 'done')
       return scrolled;
     progress.log('  done scrolling');
 
-    const maybePoint = position ? await this._offsetPoint(position) : await this._clickablePoint();
+    const maybePoint = position ? await progress.race(this._offsetPoint(position)) : await progress.race(this._clickablePoint());
     if (typeof maybePoint === 'string')
       return maybePoint;
     const point = roundPoint(maybePoint);
     progress.metadata.point = point;
-    await progress.beforeInputAction(this);
+    await progress.race(this.instrumentation.onBeforeInputAction(this, progress.metadata));
 
     let hitTargetInterceptionHandle: js.JSHandle<HitTargetInterceptionResult> | undefined;
     if (force) {
       progress.log(`  forcing action`);
     } else {
       if ((options as any).__testHookBeforeHitTarget)
-        await (options as any).__testHookBeforeHitTarget();
+        await progress.race((options as any).__testHookBeforeHitTarget());
 
-      const frameCheckResult = await this._checkFrameIsHitTarget(point);
+      const frameCheckResult = await progress.race(this._checkFrameIsHitTarget(point));
       if (frameCheckResult === 'error:notconnected' || ('hitTargetDescription' in frameCheckResult))
         return frameCheckResult;
       const hitPoint = frameCheckResult.framePoint;
       const actionType = actionName === 'move and up' ? 'drag' : ((actionName === 'hover' || actionName === 'tap') ? actionName : 'mouse');
-      const handle = await this.evaluateHandleInUtility(([injected, node, { actionType, hitPoint, trial }]) => injected.setupHitTargetInterceptor(node, actionType, hitPoint, trial), { actionType, hitPoint, trial: !!options.trial } as const);
+      const handle = await progress.race(this.evaluateHandleInUtility(([injected, node, { actionType, hitPoint, trial }]) => injected.setupHitTargetInterceptor(node, actionType, hitPoint, trial), { actionType, hitPoint, trial: !!options.trial } as const));
       if (handle === 'error:notconnected')
         return handle;
       if (!handle._objectId) {
@@ -443,25 +447,18 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
         return { hitTargetDescription: error };
       }
       hitTargetInterceptionHandle = handle as any;
-      progress.cleanupWhenAborted(() => {
-        // Do not await here, just in case the renderer is stuck (e.g. on alert)
-        // and we won't be able to cleanup.
-        hitTargetInterceptionHandle!.evaluate(h => h.stop()).catch(e => {});
-        hitTargetInterceptionHandle!.dispose();
-      });
     }
 
-    const actionResult = await this._page._frameManager.waitForSignalsCreatedBy(progress, options.waitAfter === true, async () => {
+    const actionResult = await this._page.frameManager.waitForSignalsCreatedBy(progress, options.waitAfter === true, async () => {
       if ((options as any).__testHookBeforePointerAction)
-        await (options as any).__testHookBeforePointerAction();
-      progress.throwIfAborted();  // Avoid action that has side-effects.
+        await progress.race((options as any).__testHookBeforePointerAction());
       let restoreModifiers: types.KeyboardModifier[] | undefined;
       if (options && options.modifiers)
-        restoreModifiers = await this._page.keyboard.ensureModifiers(options.modifiers);
+        restoreModifiers = await this._page.keyboard.ensureModifiers(progress, options.modifiers);
       progress.log(`  performing ${actionName} action`);
       await action(point);
       if (restoreModifiers)
-        await this._page.keyboard.ensureModifiers(restoreModifiers);
+        await this._page.keyboard.ensureModifiers(progress, restoreModifiers);
       if (hitTargetInterceptionHandle) {
         const stopHitTargetInterception = this._frame.raceAgainstEvaluationStallingEvents(() => {
           return hitTargetInterceptionHandle.evaluate(h => h.stop());
@@ -471,7 +468,7 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
         if (options.waitAfter !== false) {
           // When noWaitAfter is passed, we do not want to accidentally stall on
           // non-committed navigation blocking the evaluate.
-          const hitTargetResult = await stopHitTargetInterception;
+          const hitTargetResult = await progress.race(stopHitTargetInterception);
           if (hitTargetResult !== 'done')
             return hitTargetResult;
         }
@@ -479,8 +476,13 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       progress.log(`  ${options.trial ? 'trial ' : ''}${actionName} action done`);
       progress.log('  waiting for scheduled navigations to finish');
       if ((options as any).__testHookAfterPointerAction)
-        await (options as any).__testHookAfterPointerAction();
+        await progress.race((options as any).__testHookAfterPointerAction());
       return 'done';
+    }).finally(() => {
+      // Do not await here, just in case the renderer is stuck (e.g. on alert)
+      // and we won't be able to cleanup.
+      const stopPromise = hitTargetInterceptionHandle?.evaluate(h => h.stop()).catch(() => {});
+      stopPromise?.then(() => hitTargetInterceptionHandle?.dispose());
     });
     if (actionResult !== 'done')
       return actionResult;
@@ -488,77 +490,76 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     return 'done';
   }
 
-  async hover(metadata: CallMetadata, options: types.PointerActionOptions & types.PointerActionWaitOptions): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._hover(progress, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  private async _markAsTargetElement(progress: Progress) {
+    if (!progress.metadata.id)
+      return;
+    await progress.race(this.evaluateInUtility(([injected, node, callId]) => {
+      if (node.nodeType === 1 /* Node.ELEMENT_NODE */)
+        injected.markTargetElements(new Set([node as Node as Element]), callId);
+    }, progress.metadata.id));
+  }
+
+  async hover(progress: Progress, options: types.PointerActionOptions & types.PointerActionWaitOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._hover(progress, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   _hover(progress: Progress, options: types.PointerActionOptions & types.PointerActionWaitOptions): Promise<'error:notconnected' | 'done'> {
-    return this._retryPointerAction(progress, 'hover', false /* waitForEnabled */, point => this._page.mouse.move(point.x, point.y), { ...options, waitAfter: 'disabled' });
+    return this._retryPointerAction(progress, 'hover', false /* waitForEnabled */, point => this._page.mouse.move(progress, point.x, point.y), { ...options, waitAfter: 'disabled' });
   }
 
-  async click(metadata: CallMetadata, options: { noWaitAfter?: boolean } & types.MouseClickOptions & types.PointerActionWaitOptions = {}): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._click(progress, { ...options, waitAfter: !options.noWaitAfter });
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async click(progress: Progress, options: { noWaitAfter?: boolean } & types.MouseClickOptions & types.PointerActionWaitOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._click(progress, { ...options, waitAfter: !options.noWaitAfter });
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   _click(progress: Progress, options: { waitAfter: boolean | 'disabled' } & types.MouseClickOptions & types.PointerActionWaitOptions): Promise<'error:notconnected' | 'done'> {
-    return this._retryPointerAction(progress, 'click', true /* waitForEnabled */, point => this._page.mouse.click(point.x, point.y, options), options);
+    return this._retryPointerAction(progress, 'click', true /* waitForEnabled */, point => this._page.mouse.click(progress, point.x, point.y, options), options);
   }
 
-  async dblclick(metadata: CallMetadata, options: types.MouseMultiClickOptions & types.PointerActionWaitOptions): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._dblclick(progress, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async dblclick(progress: Progress, options: types.MouseMultiClickOptions & types.PointerActionWaitOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._dblclick(progress, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   _dblclick(progress: Progress, options: types.MouseMultiClickOptions & types.PointerActionWaitOptions): Promise<'error:notconnected' | 'done'> {
-    return this._retryPointerAction(progress, 'dblclick', true /* waitForEnabled */, point => this._page.mouse.dblclick(point.x, point.y, options), { ...options, waitAfter: 'disabled' });
+    return this._retryPointerAction(progress, 'dblclick', true /* waitForEnabled */, point => this._page.mouse.click(progress, point.x, point.y, { ...options, clickCount: 2 }), { ...options, waitAfter: 'disabled' });
   }
 
-  async tap(metadata: CallMetadata, options: types.PointerActionWaitOptions = {}): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._tap(progress, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async tap(progress: Progress, options: types.PointerActionWaitOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._tap(progress, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   _tap(progress: Progress, options: types.PointerActionWaitOptions): Promise<'error:notconnected' | 'done'> {
-    return this._retryPointerAction(progress, 'tap', true /* waitForEnabled */, point => this._page.touchscreen.tap(point.x, point.y), { ...options, waitAfter: 'disabled' });
+    return this._retryPointerAction(progress, 'tap', true /* waitForEnabled */, point => this._page.touchscreen.tap(progress, point.x, point.y), { ...options, waitAfter: 'disabled' });
   }
 
-  async selectOption(metadata: CallMetadata, elements: ElementHandle[], values: types.SelectOption[], options: { noWaitAfter?: boolean } & types.CommonActionOptions): Promise<string[]> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._selectOption(progress, elements, values, options);
-      return throwRetargetableDOMError(result);
-    }, this._page._timeoutSettings.timeout(options));
+  async selectOption(progress: Progress, elements: ElementHandle[], values: types.SelectOption[], options: types.CommonActionOptions): Promise<string[]> {
+    await this._markAsTargetElement(progress);
+    const result = await this._selectOption(progress, elements, values, options);
+    return throwRetargetableDOMError(result);
   }
 
-  async _selectOption(progress: Progress, elements: ElementHandle[], values: types.SelectOption[], options: { noWaitAfter?: boolean } & types.CommonActionOptions): Promise<string[] | 'error:notconnected'> {
+  async _selectOption(progress: Progress, elements: ElementHandle[], values: types.SelectOption[], options: types.CommonActionOptions): Promise<string[] | 'error:notconnected'> {
     let resultingOptions: string[] = [];
-    await this._retryAction(progress, 'select option', async () => {
-      await progress.beforeInputAction(this);
+    const result = await this._retryAction(progress, 'select option', async () => {
+      await progress.race(this.instrumentation.onBeforeInputAction(this, progress.metadata));
       if (!options.force)
         progress.log(`  waiting for element to be visible and enabled`);
       const optionsToSelect = [...elements, ...values];
-      const result = await this.evaluateInUtility(async ([injected, node, { optionsToSelect, force }]) => {
+      const result = await progress.race(this.evaluateInUtility(async ([injected, node, { optionsToSelect, force }]) => {
         if (!force) {
           const checkResult = await injected.checkElementStates(node, ['visible', 'enabled']);
           if (checkResult)
             return checkResult;
         }
         return injected.selectOptions(node, optionsToSelect);
-      }, { optionsToSelect, force: options.force });
+      }, { optionsToSelect, force: options.force }));
       if (Array.isArray(result)) {
         progress.log('  selected specified option(s)');
         resultingOptions = result;
@@ -566,37 +567,36 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       }
       return result;
     }, options);
+    if (result === 'error:notconnected')
+      return result;
     return resultingOptions;
   }
 
-  async fill(metadata: CallMetadata, value: string, options: types.CommonActionOptions = {}): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._fill(progress, value, options);
-      assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async fill(progress: Progress, value: string, options: types.CommonActionOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._fill(progress, value, options);
+    assertDone(throwRetargetableDOMError(result));
   }
 
   async _fill(progress: Progress, value: string, options: types.CommonActionOptions): Promise<'error:notconnected' | 'done'> {
     progress.log(`  fill("${value}")`);
     return await this._retryAction(progress, 'fill', async () => {
-      await progress.beforeInputAction(this);
+      await progress.race(this.instrumentation.onBeforeInputAction(this, progress.metadata));
       if (!options.force)
         progress.log('  waiting for element to be visible, enabled and editable');
-      const result = await this.evaluateInUtility(async ([injected, node, { value, force }]) => {
+      const result = await progress.race(this.evaluateInUtility(async ([injected, node, { value, force }]) => {
         if (!force) {
           const checkResult = await injected.checkElementStates(node, ['visible', 'enabled', 'editable']);
           if (checkResult)
             return checkResult;
         }
         return injected.fill(node, value);
-      }, { value, force: options.force });
-      progress.throwIfAborted();  // Avoid action that has side-effects.
+      }, { value, force: options.force }));
       if (result === 'needsinput') {
         if (value)
-          await this._page.keyboard.insertText(value);
+          await this._page.keyboard.insertText(progress, value);
         else
-          await this._page.keyboard.press('Delete');
+          await this._page.keyboard.press(progress, 'Delete');
         return 'done';
       } else {
         return result;
@@ -604,38 +604,33 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     }, options);
   }
 
-  async selectText(metadata: CallMetadata, options: types.CommonActionOptions = {}): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._retryAction(progress, 'selectText', async () => {
-        if (!options.force)
-          progress.log('  waiting for element to be visible');
-        return await this.evaluateInUtility(async ([injected, node, { force }]) => {
-          if (!force) {
-            const checkResult = await injected.checkElementStates(node, ['visible']);
-            if (checkResult)
-              return checkResult;
-          }
-          return injected.selectText(node);
-        }, { force: options.force });
-      }, options);
-      assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
-  }
-
-  async setInputFiles(metadata: CallMetadata, params: channels.ElementHandleSetInputFilesParams) {
-    const inputFileItems = await prepareFilesForUpload(this._frame, params);
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._setInputFiles(progress, inputFileItems);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(params));
+  async selectText(progress: Progress, options: types.CommonActionOptions): Promise<void> {
+    const result = await this._retryAction(progress, 'selectText', async () => {
+      if (!options.force)
+        progress.log('  waiting for element to be visible');
+      return await progress.race(this.evaluateInUtility(async ([injected, node, { force }]) => {
+        if (!force) {
+          const checkResult = await injected.checkElementStates(node, ['visible']);
+          if (checkResult)
+            return checkResult;
+        }
+        return injected.selectText(node);
+      }, { force: options.force }));
+    }, options);
+    assertDone(throwRetargetableDOMError(result));
+  }
+
+  async setInputFiles(progress: Progress, params: Omit<channels.ElementHandleSetInputFilesParams, 'timeout'>) {
+    const inputFileItems = await progress.race(prepareFilesForUpload(this._frame, params));
+    await this._markAsTargetElement(progress);
+    const result = await this._setInputFiles(progress, inputFileItems);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   async _setInputFiles(progress: Progress, items: InputFilesItems): Promise<'error:notconnected' | 'done'> {
     const { filePayloads, localPaths, localDirectory } = items;
     const multiple = filePayloads && filePayloads.length > 1 || localPaths && localPaths.length > 1;
-    const result = await this.evaluateHandleInUtility(([injected, node, { multiple, directoryUpload }]): Element | undefined => {
+    const result = await progress.race(this.evaluateHandleInUtility(([injected, node, { multiple, directoryUpload }]): Element | undefined => {
       const element = injected.retarget(node, 'follow-label');
       if (!element)
         return;
@@ -649,108 +644,95 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
       if (!directoryUpload && inputElement.webkitdirectory)
         throw injected.createStacklessError('[webkitdirectory] input requires passing a path to a directory');
       return inputElement;
-    }, { multiple, directoryUpload: !!localDirectory });
+    }, { multiple, directoryUpload: !!localDirectory }));
     if (result === 'error:notconnected' || !result.asElement())
       return 'error:notconnected';
     const retargeted = result.asElement() as ElementHandle<HTMLInputElement>;
-    await progress.beforeInputAction(this);
-    progress.throwIfAborted();  // Avoid action that has side-effects.
+    await progress.race(this.instrumentation.onBeforeInputAction(this, progress.metadata));
     if (localPaths || localDirectory) {
       const localPathsOrDirectory = localDirectory ? [localDirectory] : localPaths!;
-      await Promise.all((localPathsOrDirectory).map(localPath => (
+      await progress.race(Promise.all((localPathsOrDirectory).map(localPath => (
         fs.promises.access(localPath, fs.constants.F_OK)
-      )));
+      ))));
       // Browsers traverse the given directory asynchronously and we want to ensure all files are uploaded.
       const waitForInputEvent = localDirectory ? this.evaluate(node => new Promise<any>(fulfill => {
         node.addEventListener('input', fulfill, { once: true });
       })).catch(() => {}) : Promise.resolve();
-      await this._page._delegate.setInputFilePaths(retargeted, localPathsOrDirectory);
-      await waitForInputEvent;
+      await progress.race(this._page.delegate.setInputFilePaths(retargeted, localPathsOrDirectory));
+      await progress.race(waitForInputEvent);
     } else {
-      await this._page._delegate.setInputFiles(retargeted, filePayloads!);
+      await progress.race(retargeted.evaluateInUtility(([injected, node, files]) =>
+        injected.setInputFiles(node, files), filePayloads!));
     }
     return 'done';
   }
 
-  async focus(metadata: CallMetadata): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    await controller.run(async progress => {
-      const result = await this._focus(progress);
-      return assertDone(throwRetargetableDOMError(result));
-    }, 0);
+  async focus(progress: Progress): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._focus(progress);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   async _focus(progress: Progress, resetSelectionIfNotFocused?: boolean): Promise<'error:notconnected' | 'done'> {
-    progress.throwIfAborted();  // Avoid action that has side-effects.
-    return await this.evaluateInUtility(([injected, node, resetSelectionIfNotFocused]) => injected.focusNode(node, resetSelectionIfNotFocused), resetSelectionIfNotFocused);
+    return await progress.race(this.evaluateInUtility(([injected, node, resetSelectionIfNotFocused]) => injected.focusNode(node, resetSelectionIfNotFocused), resetSelectionIfNotFocused));
   }
 
   async _blur(progress: Progress): Promise<'error:notconnected' | 'done'> {
-    progress.throwIfAborted();  // Avoid action that has side-effects.
-    return await this.evaluateInUtility(([injected, node]) => injected.blurNode(node), {});
+    return await progress.race(this.evaluateInUtility(([injected, node]) => injected.blurNode(node), {}));
   }
 
-  async type(metadata: CallMetadata, text: string, options: { delay?: number } & types.TimeoutOptions & types.StrictOptions): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._type(progress, text, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async type(progress: Progress, text: string, options: { delay?: number } & types.StrictOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._type(progress, text, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
-  async _type(progress: Progress, text: string, options: { delay?: number } & types.TimeoutOptions & types.StrictOptions): Promise<'error:notconnected' | 'done'> {
+  async _type(progress: Progress, text: string, options: { delay?: number } & types.StrictOptions): Promise<'error:notconnected' | 'done'> {
     progress.log(`elementHandle.type("${text}")`);
-    await progress.beforeInputAction(this);
+    await progress.race(this.instrumentation.onBeforeInputAction(this, progress.metadata));
     const result = await this._focus(progress, true /* resetSelectionIfNotFocused */);
     if (result !== 'done')
       return result;
-    progress.throwIfAborted();  // Avoid action that has side-effects.
-    await this._page.keyboard.type(text, options);
+    await this._page.keyboard.type(progress, text, options);
     return 'done';
   }
 
-  async press(metadata: CallMetadata, key: string, options: { delay?: number, noWaitAfter?: boolean } & types.TimeoutOptions & types.StrictOptions): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._press(progress, key, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async press(progress: Progress, key: string, options: { delay?: number, noWaitAfter?: boolean } & types.StrictOptions): Promise<void> {
+    await this._markAsTargetElement(progress);
+    const result = await this._press(progress, key, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
-  async _press(progress: Progress, key: string, options: { delay?: number, noWaitAfter?: boolean } & types.TimeoutOptions & types.StrictOptions): Promise<'error:notconnected' | 'done'> {
+  async _press(progress: Progress, key: string, options: { delay?: number, noWaitAfter?: boolean } & types.StrictOptions): Promise<'error:notconnected' | 'done'> {
     progress.log(`elementHandle.press("${key}")`);
-    await progress.beforeInputAction(this);
-    return this._page._frameManager.waitForSignalsCreatedBy(progress, !options.noWaitAfter, async () => {
+    await progress.race(this.instrumentation.onBeforeInputAction(this, progress.metadata));
+    return this._page.frameManager.waitForSignalsCreatedBy(progress, !options.noWaitAfter, async () => {
       const result = await this._focus(progress, true /* resetSelectionIfNotFocused */);
       if (result !== 'done')
         return result;
-      progress.throwIfAborted();  // Avoid action that has side-effects.
-      await this._page.keyboard.press(key, options);
+      await this._page.keyboard.press(progress, key, options);
       return 'done';
     });
   }
 
-  async check(metadata: CallMetadata, options: { position?: types.Point } & types.PointerActionWaitOptions) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._setChecked(progress, true, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async check(progress: Progress, options: { position?: types.Point } & types.PointerActionWaitOptions) {
+    const result = await this._setChecked(progress, true, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
-  async uncheck(metadata: CallMetadata, options: { position?: types.Point } & types.PointerActionWaitOptions) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const result = await this._setChecked(progress, false, options);
-      return assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async uncheck(progress: Progress, options: { position?: types.Point } & types.PointerActionWaitOptions) {
+    const result = await this._setChecked(progress, false, options);
+    return assertDone(throwRetargetableDOMError(result));
   }
 
   async _setChecked(progress: Progress, state: boolean, options: { position?: types.Point } & types.PointerActionWaitOptions): Promise<'error:notconnected' | 'done'> {
     const isChecked = async () => {
-      const result = await this.evaluateInUtility(([injected, node]) => injected.elementState(node, 'checked'), {});
-      return throwRetargetableDOMError(result);
+      const result = await progress.race(this.evaluateInUtility(([injected, node]) => injected.elementState(node, 'checked'), {}));
+      if (result === 'error:notconnected' || result.received === 'error:notconnected')
+        throwElementIsNotAttached();
+      return result.matches;
     };
+    await this._markAsTargetElement(progress);
     if (await isChecked() === state)
       return 'done';
     const result = await this._click(progress, { ...options, waitAfter: 'disabled' });
@@ -764,14 +746,15 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
   }
 
   async boundingBox(): Promise<types.Rect | null> {
-    return this._page._delegate.getBoundingBox(this);
+    return this._page.delegate.getBoundingBox(this);
   }
 
-  async screenshot(metadata: CallMetadata, options: ScreenshotOptions & TimeoutOptions = {}): Promise<Buffer> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(
-        progress => this._page._screenshotter.screenshotElement(progress, this, options),
-        this._page._timeoutSettings.timeout(options));
+  async ariaSnapshot(): Promise<string> {
+    return await this.evaluateInUtility(([injected, element]) => injected.ariaSnapshot(element, { mode: 'expect' }), {});
+  }
+
+  async screenshot(progress: Progress, options: ScreenshotOptions): Promise<Buffer> {
+    return await this._page.screenshotter.screenshotElement(progress, this, options);
   }
 
   async querySelector(selector: string, options: types.StrictOptions): Promise<ElementHandle | null> {
@@ -790,50 +773,47 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     return this._frame.evalOnSelectorAll(selector, expression, isFunction, arg, this);
   }
 
-  async isVisible(metadata: CallMetadata): Promise<boolean> {
-    return this._frame.isVisible(metadata, ':scope', {}, this);
+  async isVisible(progress: Progress): Promise<boolean> {
+    return this._frame.isVisible(progress, ':scope', {}, this);
   }
 
-  async isHidden(metadata: CallMetadata): Promise<boolean> {
-    return this._frame.isHidden(metadata, ':scope', {}, this);
+  async isHidden(progress: Progress): Promise<boolean> {
+    return this._frame.isHidden(progress, ':scope', {}, this);
   }
 
-  async isEnabled(metadata: CallMetadata): Promise<boolean> {
-    return this._frame.isEnabled(metadata, ':scope', {}, this);
+  async isEnabled(progress: Progress): Promise<boolean> {
+    return this._frame.isEnabled(progress, ':scope', {}, this);
   }
 
-  async isDisabled(metadata: CallMetadata): Promise<boolean> {
-    return this._frame.isDisabled(metadata, ':scope', {}, this);
+  async isDisabled(progress: Progress): Promise<boolean> {
+    return this._frame.isDisabled(progress, ':scope', {}, this);
   }
 
-  async isEditable(metadata: CallMetadata): Promise<boolean> {
-    return this._frame.isEditable(metadata, ':scope', {}, this);
+  async isEditable(progress: Progress): Promise<boolean> {
+    return this._frame.isEditable(progress, ':scope', {}, this);
   }
 
-  async isChecked(metadata: CallMetadata): Promise<boolean> {
-    return this._frame.isChecked(metadata, ':scope', {}, this);
+  async isChecked(progress: Progress): Promise<boolean> {
+    return this._frame.isChecked(progress, ':scope', {}, this);
   }
 
-  async waitForElementState(metadata: CallMetadata, state: 'visible' | 'hidden' | 'stable' | 'enabled' | 'disabled' | 'editable', options: types.TimeoutOptions = {}): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      const actionName = `wait for ${state}`;
-      const result = await this._retryAction(progress, actionName, async () => {
-        return await this.evaluateInUtility(async ([injected, node, state]) => {
-          return (await injected.checkElementStates(node, [state])) || 'done';
-        }, state);
-      }, {});
-      assertDone(throwRetargetableDOMError(result));
-    }, this._page._timeoutSettings.timeout(options));
+  async waitForElementState(progress: Progress, state: 'visible' | 'hidden' | 'stable' | 'enabled' | 'disabled' | 'editable'): Promise<void> {
+    const actionName = `wait for ${state}`;
+    const result = await this._retryAction(progress, actionName, async () => {
+      return await progress.race(this.evaluateInUtility(async ([injected, node, state]) => {
+        return (await injected.checkElementStates(node, [state])) || 'done';
+      }, state));
+    }, {});
+    assertDone(throwRetargetableDOMError(result));
   }
 
-  async waitForSelector(metadata: CallMetadata, selector: string, options: types.WaitForElementOptions = {}): Promise<ElementHandle<Element> | null> {
-    return this._frame.waitForSelector(metadata, selector, options, this);
+  async waitForSelector(progress: Progress, selector: string, options: types.WaitForElementOptions): Promise<ElementHandle<Element> | null> {
+    return await this._frame.waitForSelector(progress, selector, true, options, this);
   }
 
   async _adoptTo(context: FrameExecutionContext): Promise<ElementHandle<T>> {
     if (this._context !== context) {
-      const adopted = await this._page._delegate.adoptElementHandle(this, context);
+      const adopted = await this._page.delegate.adoptElementHandle(this, context);
       this.dispose();
       return adopted;
     }
@@ -879,10 +859,14 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
 
 export function throwRetargetableDOMError<T>(result: T | 'error:notconnected'): T {
   if (result === 'error:notconnected')
-    throw new Error('Element is not attached to the DOM');
+    throwElementIsNotAttached();
   return result;
 }
 
+export function throwElementIsNotAttached(): never {
+  throw new Error('Element is not attached to the DOM');
+}
+
 export function assertDone(result: 'done'): void {
   // This function converts 'done' to void and ensures typescript catches unhandled errors.
 }
@@ -894,24 +878,47 @@ function roundPoint(point: types.Point): types.Point {
   };
 }
 
-function compensateHalfIntegerRoundingError(point: types.Point) {
-  // Firefox internally uses integer coordinates, so 8.5 is converted to 9 when clicking.
-  //
-  // This does not work nicely for small elements. For example, 1x1 square with corners
-  // (8;8) and (9;9) is targeted when clicking at (8;8) but not when clicking at (9;9).
-  // So, clicking at (8.5;8.5) will effectively click at (9;9) and miss the target.
-  //
-  // Therefore, we skew half-integer values from the interval (8.49, 8.51) towards
-  // (8.47, 8.49) that is rounded towards 8. This means clicking at (8.5;8.5) will
-  // be replaced with (8.48;8.48) and will effectively click at (8;8).
-  //
-  // Other browsers use float coordinates, so this change should not matter.
-  const remainderX = point.x - Math.floor(point.x);
-  if (remainderX > 0.49 && remainderX < 0.51)
-    point.x -= 0.02;
-  const remainderY = point.y - Math.floor(point.y);
-  if (remainderY > 0.49 && remainderY < 0.51)
-    point.y -= 0.02;
+function quadMiddlePoint(quad: types.Quad): types.Point {
+  const result = { x: 0, y: 0 };
+  for (const point of quad) {
+    result.x += point.x / 4;
+    result.y += point.y / 4;
+  }
+  return result;
+}
+
+function triangleArea(p1: types.Point, p2: types.Point, p3: types.Point): number {
+  return Math.abs(p1.x * (p2.y - p3.y) + p2.x * (p3.y - p1.y) + p3.x * (p1.y - p2.y)) / 2;
+}
+
+function isPointInsideQuad(point: types.Point, quad: types.Quad): boolean {
+  const area1 = triangleArea(point, quad[0], quad[1]) + triangleArea(point, quad[1], quad[2]) + triangleArea(point, quad[2], quad[3]) + triangleArea(point, quad[3], quad[0]);
+  const area2 = triangleArea(quad[0], quad[1], quad[2]) + triangleArea(quad[1], quad[2], quad[3]);
+  // Check that point is inside the quad.
+  if (Math.abs(area1 - area2) > 0.1)
+    return false;
+  // Check that point is not on the right/bottom edge, because clicking
+  // there does not actually click the element.
+  return point.x < Math.max(quad[0].x, quad[1].x, quad[2].x, quad[3].x) &&
+         point.y < Math.max(quad[0].y, quad[1].y, quad[2].y, quad[3].y);
+}
+
+function findIntegerPointInsideQuad(quad: types.Quad): types.Point | undefined {
+  // Try all four rounding directions of the middle point.
+  const point = quadMiddlePoint(quad);
+  point.x = Math.floor(point.x);
+  point.y = Math.floor(point.y);
+  if (isPointInsideQuad(point, quad))
+    return point;
+  point.x += 1;
+  if (isPointInsideQuad(point, quad))
+    return point;
+  point.y += 1;
+  if (isPointInsideQuad(point, quad))
+    return point;
+  point.x -= 1;
+  if (isPointInsideQuad(point, quad))
+    return point;
 }
 
 export const kUnableToAdoptErrorMessage = 'Unable to adopt element handle from a different document';
diff --git a/packages/playwright-core/src/server/download.ts b/packages/playwright-core/src/server/download.ts
index f7a92c8c7ddf3..5ba6ed8ef0a27 100644
--- a/packages/playwright-core/src/server/download.ts
+++ b/packages/playwright-core/src/server/download.ts
@@ -15,6 +15,7 @@
  */
 
 import path from 'path';
+
 import { Page } from './page';
 import { assert } from '../utils';
 import { Artifact } from './artifact';
@@ -26,25 +27,34 @@ export class Download {
   private _suggestedFilename: string | undefined;
 
   constructor(page: Page, downloadsPath: string, uuid: string, url: string, suggestedFilename?: string) {
-    const unaccessibleErrorMessage = page._browserContext._options.acceptDownloads === 'deny' ? 'Pass { acceptDownloads: true } when you are creating your browser context.' : undefined;
+    const unaccessibleErrorMessage = page.browserContext._options.acceptDownloads === 'deny' ? 'Pass { acceptDownloads: true } when you are creating your browser context.' : undefined;
     this.artifact = new Artifact(page, path.join(downloadsPath, uuid), unaccessibleErrorMessage, () => {
-      return this._page._browserContext.cancelDownload(uuid);
+      return this._page.browserContext.cancelDownload(uuid);
     });
     this._page = page;
     this.url = url;
     this._suggestedFilename = suggestedFilename;
-    page._browserContext._downloads.add(this);
+    page.browserContext._downloads.add(this);
     if (suggestedFilename !== undefined)
-      this._page.emit(Page.Events.Download, this);
+      this._fireDownloadEvent();
+  }
+
+  page(): Page {
+    return this._page;
   }
 
   _filenameSuggested(suggestedFilename: string) {
     assert(this._suggestedFilename === undefined);
     this._suggestedFilename = suggestedFilename;
-    this._page.emit(Page.Events.Download, this);
+    this._fireDownloadEvent();
   }
 
   suggestedFilename(): string {
     return this._suggestedFilename!;
   }
+
+  private _fireDownloadEvent() {
+    this._page.instrumentation.onDownload(this._page, this);
+    this._page.emit(Page.Events.Download, this);
+  }
 }
diff --git a/packages/playwright-core/src/server/electron/DEPS.list b/packages/playwright-core/src/server/electron/DEPS.list
index 99583c8624fb7..193adeb6d633c 100644
--- a/packages/playwright-core/src/server/electron/DEPS.list
+++ b/packages/playwright-core/src/server/electron/DEPS.list
@@ -1,5 +1,6 @@
 [*]
 ../
-../../common/
 ../../utils/
+../../utils/isomorphic/
 ../chromium/
+../utils
\ No newline at end of file
diff --git a/packages/playwright-core/src/server/electron/electron.ts b/packages/playwright-core/src/server/electron/electron.ts
index b8f361b48a936..8a341743bd4b2 100644
--- a/packages/playwright-core/src/server/electron/electron.ts
+++ b/packages/playwright-core/src/server/electron/electron.ts
@@ -17,35 +17,37 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import type { CRBrowserContext } from '../chromium/crBrowser';
+import * as readline from 'readline';
+
+import { ManualPromise } from '../../utils';
+import { wrapInASCIIBox } from '../utils/ascii';
+import { RecentLogsCollector } from '../utils/debugLogger';
+import { eventsHelper } from '../utils/eventsHelper';
+import { validateBrowserContextOptions } from '../browserContext';
 import { CRBrowser } from '../chromium/crBrowser';
-import type { CRSession } from '../chromium/crConnection';
 import { CRConnection } from '../chromium/crConnection';
-import type { CRPage } from '../chromium/crPage';
-import { CRExecutionContext } from '../chromium/crExecutionContext';
-import type { Protocol } from '../chromium/protocol';
+import { createHandle, CRExecutionContext } from '../chromium/crExecutionContext';
+import { toConsoleMessageLocation } from '../chromium/crProtocolHelper';
+import { ConsoleMessage } from '../console';
+import { helper } from '../helper';
+import { SdkObject } from '../instrumentation';
 import * as js from '../javascript';
-import type { Page } from '../page';
-import { TimeoutSettings } from '../../common/timeoutSettings';
-import { ManualPromise, wrapInASCIIBox } from '../../utils';
+import { envArrayToObject, launchProcess } from '../utils/processLauncher';
 import { WebSocketTransport } from '../transport';
-import { launchProcess, envArrayToObject } from '../../utils/processLauncher';
-import type { BrowserContext } from '../browserContext';
-import { validateBrowserContextOptions } from '../browserContext';
-import type { BrowserWindow } from 'electron';
-import type { Progress } from '../progress';
-import { ProgressController } from '../progress';
-import { helper } from '../helper';
-import { eventsHelper } from '../../utils/eventsHelper';
+
 import type { BrowserOptions, BrowserProcess } from '../browser';
+import type { BrowserContext } from '../browserContext';
+import type { CRBrowserContext } from '../chromium/crBrowser';
+import type { CRSession } from '../chromium/crConnection';
+import type { CRPage } from '../chromium/crPage';
+import type { Protocol } from '../chromium/protocol';
+import type { Page } from '../page';
 import type { Playwright } from '../playwright';
-import type * as childProcess from 'child_process';
-import * as readline from 'readline';
-import { RecentLogsCollector } from '../../utils/debugLogger';
-import { serverSideCallMetadata, SdkObject } from '../instrumentation';
+import type { Progress } from '../progress';
+import type * as types from '../types';
 import type * as channels from '@protocol/channels';
-import { toConsoleMessageLocation } from '../chromium/crProtocolHelper';
-import { ConsoleMessage } from '../console';
+import type * as childProcess from 'child_process';
+import type { BrowserWindow } from 'electron';
 
 const ARTIFACTS_FOLDER = path.join(os.tmpdir(), 'playwright-artifacts-');
 
@@ -60,7 +62,6 @@ export class ElectronApplication extends SdkObject {
   private _nodeSession: CRSession;
   private _nodeExecutionContext: js.ExecutionContext | undefined;
   _nodeElectronHandlePromise: ManualPromise<js.JSHandle<typeof import('electron')>> = new ManualPromise();
-  readonly _timeoutSettings = new TimeoutSettings();
   private _process: childProcess.ChildProcess;
 
   constructor(parent: SdkObject, browser: CRBrowser, nodeConnection: CRConnection, process: childProcess.ChildProcess) {
@@ -112,7 +113,7 @@ export class ElectronApplication extends SdkObject {
     }
     if (!this._nodeExecutionContext)
       return;
-    const args = event.args.map(arg => this._nodeExecutionContext!.createHandle(arg));
+    const args = event.args.map(arg => createHandle(this._nodeExecutionContext!, arg));
     const message = new ConsoleMessage(null, event.type, undefined, args, toConsoleMessageLocation(event.stackTrace));
     this.emit(ElectronApplication.Events.Console, message);
   }
@@ -138,7 +139,7 @@ export class ElectronApplication extends SdkObject {
 
   async browserWindow(page: Page): Promise<js.JSHandle<BrowserWindow>> {
     // Assume CRPage as Electron is always Chromium.
-    const targetId = (page._delegate as CRPage)._targetId;
+    const targetId = (page.delegate as CRPage)._targetId;
     const electronHandle = await this._nodeElectronHandlePromise;
     return await electronHandle.evaluateHandle(({ BrowserWindow, webContents }, targetId) => {
       const wc = webContents.fromDevToolsTargetId(targetId);
@@ -150,114 +151,109 @@ export class ElectronApplication extends SdkObject {
 export class Electron extends SdkObject {
   constructor(playwright: Playwright) {
     super(playwright, 'electron');
+    this.logName = 'browser';
   }
 
-  async launch(options: channels.ElectronLaunchParams): Promise<ElectronApplication> {
-    const {
-      args = [],
-    } = options;
-    const controller = new ProgressController(serverSideCallMetadata(), this);
-    controller.setLogName('browser');
-    return controller.run(async progress => {
-      let app: ElectronApplication | undefined = undefined;
-      // --remote-debugging-port=0 must be the last playwright's argument, loader.ts relies on it.
-      let electronArguments = ['--inspect=0', '--remote-debugging-port=0', ...args];
-
-      if (os.platform() === 'linux') {
-        const runningAsRoot = process.geteuid && process.geteuid() === 0;
-        if (runningAsRoot && electronArguments.indexOf('--no-sandbox') === -1)
-          electronArguments.unshift('--no-sandbox');
-      }
+  async launch(progress: Progress, options: Omit<channels.ElectronLaunchParams, 'timeout'>): Promise<ElectronApplication> {
+    let app: ElectronApplication | undefined = undefined;
+    // --remote-debugging-port=0 must be the last playwright's argument, loader.ts relies on it.
+    let electronArguments = ['--inspect=0', '--remote-debugging-port=0', ...(options.args || [])];
 
-      const artifactsDir = await fs.promises.mkdtemp(ARTIFACTS_FOLDER);
+    if (os.platform() === 'linux') {
+      const runningAsRoot = process.geteuid && process.geteuid() === 0;
+      if (runningAsRoot && electronArguments.indexOf('--no-sandbox') === -1)
+        electronArguments.unshift('--no-sandbox');
+    }
 
-      const browserLogsCollector = new RecentLogsCollector();
-      const env = options.env ? envArrayToObject(options.env) : process.env;
+    const artifactsDir = await progress.race(fs.promises.mkdtemp(ARTIFACTS_FOLDER));
+    const browserLogsCollector = new RecentLogsCollector();
+    const env = options.env ? envArrayToObject(options.env) : process.env;
 
-      let command: string;
-      if (options.executablePath) {
-        command = options.executablePath;
-      } else {
-        try {
-          // By default we fallback to the Electron App executable path.
-          // 'electron/index.js' resolves to the actual Electron App.
-          command = require('electron/index.js');
-        } catch (error: any) {
-          if ((error as NodeJS.ErrnoException)?.code === 'MODULE_NOT_FOUND') {
-            throw new Error('\n' + wrapInASCIIBox([
-              'Electron executablePath not found!',
-              'Please install it using `npm install -D electron` or set the executablePath to your Electron executable.',
-            ].join('\n'), 1));
-          }
-          throw error;
+    let command: string;
+    if (options.executablePath) {
+      command = options.executablePath;
+    } else {
+      try {
+        // By default we fallback to the Electron App executable path.
+        // 'electron/index.js' resolves to the actual Electron App.
+        command = require('electron/index.js');
+      } catch (error: any) {
+        if ((error as NodeJS.ErrnoException)?.code === 'MODULE_NOT_FOUND') {
+          throw new Error('\n' + wrapInASCIIBox([
+            'Electron executablePath not found!',
+            'Please install it using `npm install -D electron` or set the executablePath to your Electron executable.',
+          ].join('\n'), 1));
         }
-        // Only use our own loader for non-packaged apps.
-        // Packaged apps might have their own command line handling.
-        electronArguments.unshift('-r', require.resolve('./loader'));
-      }
-      let shell = false;
-      if (process.platform === 'win32') {
-        // On Windows in order to run .cmd files, shell: true is required.
-        // https://github.com/nodejs/node/issues/52554
-        shell = true;
-        // On Windows, we need to quote the executable path due to shell: true.
-        command = `"${command}"`;
-        // On Windows, we need to quote the arguments due to shell: true.
-        electronArguments = electronArguments.map(arg => `"${arg}"`);
+        throw error;
       }
+      // Only use our own loader for non-packaged apps.
+      // Packaged apps might have their own command line handling.
+      electronArguments.unshift('-r', require.resolve('./loader'));
+    }
+    let shell = false;
+    if (process.platform === 'win32') {
+      // On Windows in order to run .cmd files, shell: true is required.
+      // https://github.com/nodejs/node/issues/52554
+      shell = true;
+      // On Windows, we need to quote the executable path due to shell: true.
+      command = `"${command}"`;
+      // On Windows, we need to quote the arguments due to shell: true.
+      electronArguments = electronArguments.map(arg => `"${arg}"`);
+    }
 
-      // When debugging Playwright test that runs Electron, NODE_OPTIONS
-      // will make the debugger attach to Electron's Node. But Playwright
-      // also needs to attach to drive the automation. Disable external debugging.
-      delete env.NODE_OPTIONS;
-      const { launchedProcess, gracefullyClose, kill } = await launchProcess({
-        command,
-        args: electronArguments,
-        env,
-        log: (message: string) => {
-          progress.log(message);
-          browserLogsCollector.log(message);
-        },
-        shell,
-        stdio: 'pipe',
-        cwd: options.cwd,
-        tempDirectories: [artifactsDir],
-        attemptToGracefullyClose: () => app!.close(),
-        handleSIGINT: true,
-        handleSIGTERM: true,
-        handleSIGHUP: true,
-        onExit: () => app?.emit(ElectronApplication.Events.Close),
-      });
+    // When debugging Playwright test that runs Electron, NODE_OPTIONS
+    // will make the debugger attach to Electron's Node. But Playwright
+    // also needs to attach to drive the automation. Disable external debugging.
+    delete env.NODE_OPTIONS;
+    const { launchedProcess, gracefullyClose, kill } = await launchProcess({
+      command,
+      args: electronArguments,
+      env,
+      log: (message: string) => {
+        progress.log(message);
+        browserLogsCollector.log(message);
+      },
+      shell,
+      stdio: 'pipe',
+      cwd: options.cwd,
+      tempDirectories: [artifactsDir],
+      attemptToGracefullyClose: () => app!.close(),
+      handleSIGINT: true,
+      handleSIGTERM: true,
+      handleSIGHUP: true,
+      onExit: () => app?.emit(ElectronApplication.Events.Close),
+    });
 
-      // All waitForLines must be started immediately.
-      // Otherwise the lines might come before we are ready.
-      const waitForXserverError = new Promise(async (resolve, reject) => {
-        waitForLine(progress, launchedProcess, /Unable to open X display/).then(() => reject(new Error([
-          'Unable to open X display!',
-          `================================`,
-          'Most likely this is because there is no X server available.',
-          "Use 'xvfb-run' on Linux to launch your tests with an emulated display server.",
-          "For example: 'xvfb-run npm run test:e2e'",
-          `================================`,
-          progress.metadata.log
-        ].join('\n')))).catch(() => {});
-      });
-      const nodeMatchPromise = waitForLine(progress, launchedProcess, /^Debugger listening on (ws:\/\/.*)$/);
-      const chromeMatchPromise = waitForLine(progress, launchedProcess, /^DevTools listening on (ws:\/\/.*)$/);
-      const debuggerDisconnectPromise = waitForLine(progress, launchedProcess, /Waiting for the debugger to disconnect\.\.\./);
+    // All waitForLines must be started immediately.
+    // Otherwise the lines might come before we are ready.
+    const waitForXserverError = waitForLine(progress, launchedProcess, /Unable to open X display/).then(() => {
+      throw new Error([
+        'Unable to open X display!',
+        `================================`,
+        'Most likely this is because there is no X server available.',
+        "Use 'xvfb-run' on Linux to launch your tests with an emulated display server.",
+        "For example: 'xvfb-run npm run test:e2e'",
+        `================================`,
+        progress.metadata.log
+      ].join('\n'));
+    });
+    const nodeMatchPromise = waitForLine(progress, launchedProcess, /^Debugger listening on (ws:\/\/.*)$/);
+    const chromeMatchPromise = waitForLine(progress, launchedProcess, /^DevTools listening on (ws:\/\/.*)$/);
+    const debuggerDisconnectPromise = waitForLine(progress, launchedProcess, /Waiting for the debugger to disconnect\.\.\./);
 
+    try {
       const nodeMatch = await nodeMatchPromise;
       const nodeTransport = await WebSocketTransport.connect(progress, nodeMatch[1]);
-      const nodeConnection = new CRConnection(nodeTransport, helper.debugProtocolLogger(), browserLogsCollector);
-
+      const nodeConnection = new CRConnection(this, nodeTransport, helper.debugProtocolLogger(), browserLogsCollector);
       // Immediately release exiting process under debug.
       debuggerDisconnectPromise.then(() => {
         nodeTransport.close();
       }).catch(() => {});
+
       const chromeMatch = await Promise.race([
         chromeMatchPromise,
         waitForXserverError,
-      ]) as RegExpMatchArray;
+      ]);
       const chromeTransport = await WebSocketTransport.connect(progress, chromeMatch[1]);
       const browserProcess: BrowserProcess = {
         onclose: undefined,
@@ -265,7 +261,7 @@ export class Electron extends SdkObject {
         close: gracefullyClose,
         kill
       };
-      const contextOptions: channels.BrowserNewContextParams = {
+      const contextOptions: types.BrowserContextOptions = {
         ...options,
         noDefaultViewport: true,
       };
@@ -283,38 +279,39 @@ export class Electron extends SdkObject {
         originalLaunchOptions: {},
       };
       validateBrowserContextOptions(contextOptions, browserOptions);
-      const browser = await CRBrowser.connect(this.attribution.playwright, chromeTransport, browserOptions);
+      const browser = await progress.race(CRBrowser.connect(this.attribution.playwright, chromeTransport, browserOptions));
       app = new ElectronApplication(this, browser, nodeConnection, launchedProcess);
-      await app.initialize();
+      await progress.race(app.initialize());
       return app;
-    }, TimeoutSettings.launchTimeout(options));
+    } catch (error) {
+      await kill();
+      throw error;
+    }
   }
 }
 
-function waitForLine(progress: Progress, process: childProcess.ChildProcess, regex: RegExp): Promise<RegExpMatchArray> {
-  return new Promise((resolve, reject) => {
-    const rl = readline.createInterface({ input: process.stderr! });
-    const failError = new Error('Process failed to launch!');
-    const listeners = [
-      eventsHelper.addEventListener(rl, 'line', onLine),
-      eventsHelper.addEventListener(rl, 'close', reject.bind(null, failError)),
-      eventsHelper.addEventListener(process, 'exit', reject.bind(null, failError)),
-      // It is Ok to remove error handler because we did not create process and there is another listener.
-      eventsHelper.addEventListener(process, 'error', reject.bind(null, failError))
-    ];
+async function waitForLine(progress: Progress, process: childProcess.ChildProcess, regex: RegExp) {
+  const promise = new ManualPromise<RegExpMatchArray>();
+  // eslint-disable-next-line no-restricted-properties
+  const rl = readline.createInterface({ input: process.stderr! });
+  const failError = new Error('Process failed to launch!');
+  const listeners = [
+    eventsHelper.addEventListener(rl, 'line', onLine),
+    eventsHelper.addEventListener(rl, 'close', () => promise.reject(failError)),
+    eventsHelper.addEventListener(process, 'exit', () => promise.reject(failError)),
+    // It is Ok to remove error handler because we did not create process and there is another listener.
+    eventsHelper.addEventListener(process, 'error', () => promise.reject(failError)),
+  ];
 
-    progress.cleanupWhenAborted(cleanup);
-
-    function onLine(line: string) {
-      const match = line.match(regex);
-      if (!match)
-        return;
-      cleanup();
-      resolve(match);
-    }
+  function onLine(line: string) {
+    const match = line.match(regex);
+    if (match)
+      promise.resolve(match);
+  }
 
-    function cleanup() {
-      eventsHelper.removeEventListeners(listeners);
-    }
-  });
+  try {
+    return await progress.race(promise);
+  } finally {
+    eventsHelper.removeEventListeners(listeners);
+  }
 }
diff --git a/packages/playwright-core/src/server/electron/loader.ts b/packages/playwright-core/src/server/electron/loader.ts
index 98bd92d4573aa..c3aee60db97b3 100644
--- a/packages/playwright-core/src/server/electron/loader.ts
+++ b/packages/playwright-core/src/server/electron/loader.ts
@@ -15,6 +15,7 @@
  */
 
 const { app } = require('electron');
+
 const { chromiumSwitches } = require('../chromium/chromiumSwitches');
 
 // Always pass user arguments first, see https://github.com/microsoft/playwright/issues/16614 and
@@ -22,7 +23,7 @@ const { chromiumSwitches } = require('../chromium/chromiumSwitches');
 // [Electron, -r, loader.js[, --no-sandbox>], --inspect=0, --remote-debugging-port=0, ...args]
 process.argv.splice(1, process.argv.indexOf('--remote-debugging-port=0'));
 
-for (const arg of chromiumSwitches) {
+for (const arg of chromiumSwitches()) {
   const match = arg.match(/--([^=]*)=?(.*)/)!;
   app.commandLine.appendSwitch(match[1], match[2]);
 }
diff --git a/packages/playwright-core/src/server/errors.ts b/packages/playwright-core/src/server/errors.ts
index c3a63cb0339fe..88fe8b4403c94 100644
--- a/packages/playwright-core/src/server/errors.ts
+++ b/packages/playwright-core/src/server/errors.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import type { SerializedError } from '@protocol/channels';
-import { isError } from '../utils';
 import { parseSerializedValue, serializeValue } from '../protocol/serializers';
+import { isError } from '../utils';
+
+import type { SerializedError } from '@protocol/channels';
 
 class CustomError extends Error {
   constructor(message: string) {
diff --git a/packages/playwright-core/src/server/fetch.ts b/packages/playwright-core/src/server/fetch.ts
index 9064c7a84b7c7..b1ff775a1fdfc 100644
--- a/packages/playwright-core/src/server/fetch.ts
+++ b/packages/playwright-core/src/server/fetch.ts
@@ -14,44 +14,46 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import type { LookupAddress } from 'dns';
 import http from 'http';
-import fs from 'fs';
 import https from 'https';
-import type { Readable, TransformCallback } from 'stream';
-import { pipeline, Transform } from 'stream';
-import url from 'url';
-import zlib from 'zlib';
-import type { HTTPCredentials } from '../../types/types';
-import { TimeoutSettings } from '../common/timeoutSettings';
-import { getUserAgent } from '../utils/userAgent';
-import { assert, createGuid, isUnderTest, monotonicTime } from '../utils';
-import { HttpsProxyAgent, SocksProxyAgent } from '../utilsBundle';
+import { Transform, pipeline } from 'stream';
+import { TLSSocket } from 'tls';
+import * as zlib from 'zlib';
+
+import { assert, constructURLBasedOnBaseURL, createProxyAgent, eventsHelper, monotonicTime  } from '../utils';
+import { createGuid } from './utils/crypto';
+import { getUserAgent } from './utils/userAgent';
 import { BrowserContext, verifyClientCertificates } from './browserContext';
-import { CookieStore, domainMatches } from './cookieStore';
+import { Cookie, CookieStore, domainMatches, parseRawCookie } from './cookieStore';
 import { MultipartFormData } from './formData';
-import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent } from '../utils/happy-eyeballs';
-import type { CallMetadata } from './instrumentation';
 import { SdkObject } from './instrumentation';
+import { isAbortError } from './progress';
+import { getMatchingTLSOptionsForOrigin, rewriteOpenSSLErrorIfNeeded } from './socksClientCertificatesInterceptor';
+import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent, timingForSocket } from './utils/happyEyeballs';
+import { Tracing } from './trace/recorder/tracing';
+
 import type { Playwright } from './playwright';
 import type { Progress } from './progress';
-import { ProgressController } from './progress';
-import { Tracing } from './trace/recorder/tracing';
 import type * as types from './types';
 import type { HeadersArray, ProxySettings } from './types';
-import { kMaxCookieExpiresDateInSeconds } from './network';
-import { clientCertificatesToTLSOptions } from './socksClientCertificatesInterceptor';
+import type { HTTPCredentials } from '../../types/types';
+import type { RegisteredListener } from '../utils';
+import type * as channels from '@protocol/channels';
+import type * as har from '@trace/har';
+import type { LookupAddress } from 'dns';
+import type { Readable, TransformCallback } from 'stream';
+
 
 type FetchRequestOptions = {
   userAgent: string;
   extraHTTPHeaders?: HeadersArray;
+  failOnStatusCode?: boolean;
   httpCredentials?: HTTPCredentials;
   proxy?: ProxySettings;
-  timeoutSettings: TimeoutSettings;
   ignoreHTTPSErrors?: boolean;
+  maxRedirects?: number;
   baseURL?: string;
-  clientCertificates?: channels.BrowserNewContextOptions['clientCertificates'];
+  clientCertificates?: types.BrowserContextOptions['clientCertificates'];
 };
 
 type HeadersObject = Readonly<{ [name: string]: string }>;
@@ -73,15 +75,20 @@ export type APIRequestFinishedEvent = {
   statusCode: number;
   statusMessage: string;
   body?: Buffer;
+  timings: har.Timings;
+  serverIPAddress?: string;
+  serverPort?: number;
+  securityDetails?: har.SecurityDetails;
 };
 
 type SendRequestOptions = https.RequestOptions & {
   maxRedirects: number,
-  deadline: number,
   headers: HeadersObject,
   __testHookLookup?: (hostname: string) => LookupAddress[]
 };
 
+type SendRequestResult = Omit<channels.APIResponse, 'fetchUid'> & { body: Buffer };
+
 export abstract class APIRequestContext extends SdkObject {
   static Events = {
     Dispose: 'dispose',
@@ -93,7 +100,6 @@ export abstract class APIRequestContext extends SdkObject {
   readonly fetchResponses: Map<string, Buffer> = new Map();
   readonly fetchLog: Map<string, string[]> = new Map();
   protected static allInstances: Set<APIRequestContext> = new Set();
-  readonly _activeProgressControllers = new Set<ProgressController>();
   _closeReason: string | undefined;
 
   static findResponseBody(guid: string): Buffer | undefined {
@@ -129,7 +135,7 @@ export abstract class APIRequestContext extends SdkObject {
   abstract _defaultOptions(): FetchRequestOptions;
   abstract _addCookies(cookies: channels.NetworkCookie[]): Promise<void>;
   abstract _cookies(url: URL): Promise<channels.NetworkCookie[]>;
-  abstract storageState(): Promise<channels.APIRequestContextStorageStateResult>;
+  abstract storageState(progress: Progress, indexedDB?: boolean): Promise<channels.APIRequestContextStorageStateResult>;
 
   private _storeResponseBody(body: Buffer): string {
     const uid = createGuid();
@@ -137,7 +143,7 @@ export abstract class APIRequestContext extends SdkObject {
     return uid;
   }
 
-  async fetch(params: channels.APIRequestContextFetchParams, metadata: CallMetadata): Promise<channels.APIResponse> {
+  async fetch(progress: Progress, params: channels.APIRequestContextFetchParams): Promise<channels.APIResponse> {
     const defaults = this._defaultOptions();
     const headers: HeadersObject = {
       'user-agent': defaults.userAgent,
@@ -155,10 +161,12 @@ export abstract class APIRequestContext extends SdkObject {
         setHeader(headers, name, value);
     }
 
-    const requestUrl = new URL(params.url, defaults.baseURL);
-    if (params.params) {
+    const requestUrl = new URL(constructURLBasedOnBaseURL(defaults.baseURL, params.url));
+    if (params.encodedParams) {
+      requestUrl.search = params.encodedParams;
+    } else if (params.params) {
       for (const { name, value } of params.params)
-        requestUrl.searchParams.set(name, value);
+        requestUrl.searchParams.append(name, value);
     }
 
     const credentials = this._getHttpCredentials(requestUrl);
@@ -168,36 +176,22 @@ export abstract class APIRequestContext extends SdkObject {
     const method = params.method?.toUpperCase() || 'GET';
     const proxy = defaults.proxy;
     let agent;
-    if (proxy && proxy.server !== 'per-context' && !shouldBypassProxy(requestUrl, proxy.bypass)) {
-      const proxyOpts = url.parse(proxy.server);
-      if (proxyOpts.protocol?.startsWith('socks')) {
-        agent = new SocksProxyAgent({
-          host: proxyOpts.hostname,
-          port: proxyOpts.port || undefined,
-        });
-      } else {
-        if (proxy.username)
-          proxyOpts.auth = `${proxy.username}:${proxy.password || ''}`;
-        // TODO: We should use HttpProxyAgent conditional on proxyOpts.protocol instead of always using CONNECT method.
-        agent = new HttpsProxyAgent(proxyOpts);
-      }
-    }
+    // We skip 'per-context' in order to not break existing users. 'per-context' was previously used to
+    // workaround an upstream Chromium bug. Can be removed in the future.
+    if (proxy?.server !== 'per-context')
+      agent = createProxyAgent(proxy, requestUrl);
 
-    const timeout = defaults.timeoutSettings.timeout(params);
-    const deadline = timeout && (monotonicTime() + timeout);
+    let maxRedirects = params.maxRedirects ?? (defaults.maxRedirects ?? 20);
+    maxRedirects = maxRedirects === 0 ? -1 : maxRedirects;
 
     const options: SendRequestOptions = {
       method,
       headers,
       agent,
-      maxRedirects: params.maxRedirects === 0 ? -1 : params.maxRedirects === undefined ? 20 : params.maxRedirects,
-      timeout,
-      deadline,
-      ...clientCertificatesToTLSOptions(this._defaultOptions().clientCertificates, requestUrl.origin),
+      maxRedirects,
+      ...getMatchingTLSOptionsForOrigin(this._defaultOptions().clientCertificates, requestUrl.origin),
       __testHookLookup: (params as any).__testHookLookup,
     };
-    if (process.env.PWTEST_UNSUPPORTED_CUSTOM_CA && isUnderTest())
-      options.ca = [fs.readFileSync(process.env.PWTEST_UNSUPPORTED_CUSTOM_CA)];
     // rejectUnauthorized = undefined is treated as true in Node.js 12.
     if (params.ignoreHTTPSErrors || defaults.ignoreHTTPSErrors)
       options.rejectUnauthorized = false;
@@ -205,14 +199,20 @@ export abstract class APIRequestContext extends SdkObject {
     const postData = serializePostData(params, headers);
     if (postData)
       setHeader(headers, 'content-length', String(postData.byteLength));
-    const controller = new ProgressController(metadata, this);
-    const fetchResponse = await controller.run(progress => {
-      return this._sendRequestWithRetries(progress, requestUrl, options, postData, params.maxRetries);
-    });
+    const fetchResponse = await this._sendRequestWithRetries(progress, requestUrl, options, postData, params.maxRetries);
     const fetchUid = this._storeResponseBody(fetchResponse.body);
-    this.fetchLog.set(fetchUid, controller.metadata.log);
-    if (params.failOnStatusCode && (fetchResponse.status < 200 || fetchResponse.status >= 400))
-      throw new Error(`${fetchResponse.status} ${fetchResponse.statusText}`);
+    this.fetchLog.set(fetchUid, progress.metadata.log);
+    const failOnStatusCode = params.failOnStatusCode !== undefined ? params.failOnStatusCode : !!defaults.failOnStatusCode;
+    if (failOnStatusCode && (fetchResponse.status < 200 || fetchResponse.status >= 400)) {
+      let responseText = '';
+      if (fetchResponse.body.byteLength) {
+        let text = fetchResponse.body.toString('utf8');
+        if (text.length > 1000)
+          text = text.substring(0, 997) + '...';
+        responseText = `\nResponse text:\n${text}`;
+      }
+      throw new Error(`${fetchResponse.status} ${fetchResponse.statusText}${responseText}`);
+    }
     return { ...fetchResponse, fetchUid };
   }
 
@@ -243,40 +243,47 @@ export abstract class APIRequestContext extends SdkObject {
     return cookies;
   }
 
-  private async _updateRequestCookieHeader(url: URL, headers: HeadersObject) {
+  private async _updateRequestCookieHeader(progress: Progress, url: URL, headers: HeadersObject) {
     if (getHeader(headers, 'cookie') !== undefined)
       return;
-    const cookies = await this._cookies(url);
+    const contextCookies = await progress.race(this._cookies(url));
+    // Browser context returns cookies with domain matching both .example.com and
+    // example.com. Those without leading dot are only sent when domain is strictly
+    // matching example.com, but not for sub.example.com.
+    const cookies = contextCookies.filter(c => new Cookie(c).matches(url));
     if (cookies.length) {
       const valueArray = cookies.map(c => `${c.name}=${c.value}`);
       setHeader(headers, 'cookie', valueArray.join('; '));
     }
   }
 
-  private async _sendRequestWithRetries(progress: Progress, url: URL, options: SendRequestOptions, postData?: Buffer, maxRetries?: number): Promise<Omit<channels.APIResponse, 'fetchUid'> & { body: Buffer }>{
+  private async _sendRequestWithRetries(progress: Progress, url: URL, options: SendRequestOptions, postData?: Buffer, maxRetries?: number): Promise<SendRequestResult>{
     maxRetries ??= 0;
     let backoff = 250;
     for (let i = 0; i <= maxRetries; i++) {
       try {
         return await this._sendRequest(progress, url, options, postData);
       } catch (e) {
+        if (isAbortError(e))
+          throw e;
+        e = rewriteOpenSSLErrorIfNeeded(e);
         if (maxRetries === 0)
           throw e;
-        if (i === maxRetries || (options.deadline && monotonicTime() + backoff > options.deadline))
+        if (i === maxRetries)
           throw new Error(`Failed after ${i + 1} attempt(s): ${e}`);
         // Retry on connection reset only.
         if (e.code !== 'ECONNRESET')
           throw e;
         progress.log(`  Received ECONNRESET, will retry after ${backoff}ms.`);
-        await new Promise(f => setTimeout(f, backoff));
+        await progress.wait(backoff);
         backoff *= 2;
       }
     }
     throw new Error('Unreachable');
   }
 
-  private async _sendRequest(progress: Progress, url: URL, options: SendRequestOptions, postData?: Buffer): Promise<Omit<channels.APIResponse, 'fetchUid'> & { body: Buffer }>{
-    await this._updateRequestCookieHeader(url, options.headers);
+  private async _sendRequest(progress: Progress, url: URL, options: SendRequestOptions, postData?: Buffer): Promise<SendRequestResult>{
+    await this._updateRequestCookieHeader(progress, url, options.headers);
 
     const requestCookies = getHeader(options.headers, 'cookie')?.split(';').map(p => {
       const [name, value] = p.split('=').map(v => v.trim());
@@ -291,14 +298,44 @@ export abstract class APIRequestContext extends SdkObject {
     };
     this.emit(APIRequestContext.Events.Request, requestEvent);
 
-    return new Promise((fulfill, reject) => {
+    let destroyRequest: (() => void) | undefined;
+    const resultPromise = new Promise<SendRequestResult>((fulfill, reject) => {
       const requestConstructor: ((url: URL, options: http.RequestOptions, callback?: (res: http.IncomingMessage) => void) => http.ClientRequest)
         = (url.protocol === 'https:' ? https : http).request;
       // If we have a proxy agent already, do not override it.
       const agent = options.agent || (url.protocol === 'https:' ? httpsHappyEyeballsAgent : httpHappyEyeballsAgent);
       const requestOptions = { ...options, agent };
+
+      const startAt = monotonicTime();
+      let reusedSocketAt: number | undefined;
+      let dnsLookupAt: number | undefined;
+      let tcpConnectionAt: number | undefined;
+      let tlsHandshakeAt: number | undefined;
+      let requestFinishAt: number | undefined;
+      let serverIPAddress: string | undefined;
+      let serverPort: number | undefined;
+
+      let securityDetails: har.SecurityDetails | undefined;
+
+      const listeners: RegisteredListener[] = [];
+
       const request = requestConstructor(url, requestOptions as any, async response => {
+        const responseAt = monotonicTime();
+
         const notifyRequestFinished = (body?: Buffer) => {
+          const endAt = monotonicTime();
+          // spec: http://www.softwareishard.com/blog/har-12-spec/#timings
+          const connectEnd = tlsHandshakeAt ?? tcpConnectionAt;
+          const timings: har.Timings = {
+            send: requestFinishAt! - startAt,
+            wait: responseAt - requestFinishAt!,
+            receive: endAt - responseAt,
+            dns: dnsLookupAt ? dnsLookupAt - startAt : -1,
+            connect: connectEnd ? connectEnd - startAt : -1, // "If [ssl] is defined then the time is also included in the connect field "
+            ssl: tlsHandshakeAt ? tlsHandshakeAt - tcpConnectionAt! : -1,
+            blocked: reusedSocketAt ? reusedSocketAt - startAt : -1,
+          };
+
           const requestFinishedEvent: APIRequestFinishedEvent = {
             requestEvent,
             httpVersion: response.httpVersion,
@@ -307,7 +344,11 @@ export abstract class APIRequestContext extends SdkObject {
             headers: response.headers,
             rawHeaders: response.rawHeaders,
             cookies,
-            body
+            body,
+            timings,
+            serverIPAddress,
+            serverPort,
+            securityDetails,
           };
           this.emit(APIRequestContext.Events.RequestFinished, requestFinishedEvent);
         };
@@ -327,7 +368,7 @@ export abstract class APIRequestContext extends SdkObject {
         }
 
         if (redirectStatus.includes(response.statusCode!) && options.maxRedirects >= 0) {
-          if (!options.maxRedirects) {
+          if (options.maxRedirects === 0) {
             reject(new Error('Max redirect count exceeded'));
             request.destroy();
             return;
@@ -355,9 +396,7 @@ export abstract class APIRequestContext extends SdkObject {
             headers,
             agent: options.agent,
             maxRedirects: options.maxRedirects - 1,
-            timeout: options.timeout,
-            deadline: options.deadline,
-            ...clientCertificatesToTLSOptions(this._defaultOptions().clientCertificates, url.origin),
+            ...getMatchingTLSOptionsForOrigin(this._defaultOptions().clientCertificates, url.origin),
             __testHookLookup: options.__testHookLookup,
           };
           // rejectUnauthorized = undefined is treated as true in node 12.
@@ -445,13 +484,51 @@ export abstract class APIRequestContext extends SdkObject {
         body.on('end', notifyBodyFinished);
       });
       request.on('error', reject);
+      destroyRequest = () => request.destroy();
 
-      const disposeListener = () => {
-        reject(new Error('Request context disposed.'));
-        request.destroy();
-      };
-      this.on(APIRequestContext.Events.Dispose, disposeListener);
-      request.on('close', () => this.off(APIRequestContext.Events.Dispose, disposeListener));
+      listeners.push(
+          eventsHelper.addEventListener(this, APIRequestContext.Events.Dispose, () => {
+            reject(new Error('Request context disposed.'));
+            request.destroy();
+          })
+      );
+      request.on('close', () => eventsHelper.removeEventListeners(listeners));
+
+      request.on('socket', socket => {
+        if (request.reusedSocket) {
+          reusedSocketAt = monotonicTime();
+          return;
+        }
+
+        // happy eyeballs don't emit lookup and connect events, so we use our custom ones
+        const happyEyeBallsTimings = timingForSocket(socket);
+        dnsLookupAt = happyEyeBallsTimings.dnsLookupAt;
+        tcpConnectionAt = happyEyeBallsTimings.tcpConnectionAt;
+
+        // non-happy-eyeballs sockets
+        listeners.push(
+            eventsHelper.addEventListener(socket, 'lookup', () => { dnsLookupAt = monotonicTime(); }),
+            eventsHelper.addEventListener(socket, 'connect', () => { tcpConnectionAt = monotonicTime(); }),
+            eventsHelper.addEventListener(socket, 'secureConnect', () => {
+              tlsHandshakeAt = monotonicTime();
+
+              if (socket instanceof TLSSocket) {
+                const peerCertificate = socket.getPeerCertificate();
+                securityDetails = {
+                  protocol: socket.getProtocol() ?? undefined,
+                  subjectName: peerCertificate.subject.CN,
+                  validFrom: new Date(peerCertificate.valid_from).getTime() / 1000,
+                  validTo: new Date(peerCertificate.valid_to).getTime() / 1000,
+                  issuer: peerCertificate.issuer.CN
+                };
+              }
+            }),
+        );
+
+        serverIPAddress = socket.remoteAddress;
+        serverPort = socket.remotePort;
+      });
+      request.on('finish', () => { requestFinishAt = monotonicTime(); });
 
       progress.log(`→ ${options.method} ${url.toString()}`);
       if (options.headers) {
@@ -459,23 +536,15 @@ export abstract class APIRequestContext extends SdkObject {
           progress.log(`  ${name}: ${value}`);
       }
 
-      if (options.deadline) {
-        const rejectOnTimeout = () =>  {
-          reject(new Error(`Request timed out after ${options.timeout}ms`));
-          request.destroy();
-        };
-        const remaining = options.deadline - monotonicTime();
-        if (remaining <= 0) {
-          rejectOnTimeout();
-          return;
-        }
-        request.setTimeout(remaining, rejectOnTimeout);
-      }
-
       if (postData)
         request.write(postData);
       request.end();
     });
+
+    return progress.race(resultPromise).catch(error => {
+      destroyRequest?.();
+      throw error;
+    });
   }
 
   private _getHttpCredentials(url: URL) {
@@ -527,9 +596,9 @@ export class BrowserContextAPIRequestContext extends APIRequestContext {
     return {
       userAgent: this._context._options.userAgent || this._context._browser.userAgent(),
       extraHTTPHeaders: this._context._options.extraHTTPHeaders,
+      failOnStatusCode: undefined,
       httpCredentials: this._context._options.httpCredentials,
       proxy: this._context._options.proxy || this._context._browser.options.proxy,
-      timeoutSettings: this._context._timeoutSettings,
       ignoreHTTPSErrors: this._context._options.ignoreHTTPSErrors,
       baseURL: this._context._options.baseURL,
       clientCertificates: this._context._options.clientCertificates,
@@ -544,8 +613,8 @@ export class BrowserContextAPIRequestContext extends APIRequestContext {
     return await this._context.cookies(url.toString());
   }
 
-  override async storageState(): Promise<channels.APIRequestContextStorageStateResult> {
-    return this._context.storageState();
+  override async storageState(progress: Progress, indexedDB?: boolean): Promise<channels.APIRequestContextStorageStateResult> {
+    return this._context.storageState(progress, indexedDB);
   }
 }
 
@@ -559,20 +628,8 @@ export class GlobalAPIRequestContext extends APIRequestContext {
   constructor(playwright: Playwright, options: channels.PlaywrightNewRequestOptions) {
     super(playwright);
     this.attribution.context = this;
-    const timeoutSettings = new TimeoutSettings();
-    if (options.timeout !== undefined)
-      timeoutSettings.setDefaultTimeout(options.timeout);
-    const proxy = options.proxy;
-    if (proxy?.server) {
-      let url = proxy?.server.trim();
-      if (!/^\w+:\/\//.test(url))
-        url = 'http://' + url;
-      proxy.server = url;
-      if (options.clientCertificates)
-        throw new Error('Cannot specify both proxy and clientCertificates');
-    }
     if (options.storageState) {
-      this._origins = options.storageState.origins;
+      this._origins = options.storageState.origins?.map(origin => ({ indexedDB: [], ...origin }));
       this._cookieStore.addCookies(options.storageState.cookies || []);
     }
     verifyClientCertificates(options.clientCertificates);
@@ -580,11 +637,12 @@ export class GlobalAPIRequestContext extends APIRequestContext {
       baseURL: options.baseURL,
       userAgent: options.userAgent || getUserAgent(),
       extraHTTPHeaders: options.extraHTTPHeaders,
+      failOnStatusCode: !!options.failOnStatusCode,
       ignoreHTTPSErrors: !!options.ignoreHTTPSErrors,
+      maxRedirects: options.maxRedirects,
       httpCredentials: options.httpCredentials,
       clientCertificates: options.clientCertificates,
-      proxy,
-      timeoutSettings,
+      proxy: options.proxy,
     };
     this._tracing = new Tracing(this, options.tracesDir);
   }
@@ -612,10 +670,10 @@ export class GlobalAPIRequestContext extends APIRequestContext {
     return this._cookieStore.cookies(url);
   }
 
-  override async storageState(): Promise<channels.APIRequestContextStorageStateResult> {
+  override async storageState(progress: Progress, indexedDB = false): Promise<channels.APIRequestContextStorageStateResult> {
     return {
       cookies: this._cookieStore.allCookies(),
-      origins: this._origins || []
+      origins: (this._origins || []).map(origin => ({ ...origin, indexedDB: indexedDB ? origin.indexedDB : [] })),
     };
   }
 }
@@ -630,27 +688,10 @@ function toHeadersArray(rawHeaders: string[]): types.HeadersArray {
 const redirectStatus = [301, 302, 303, 307, 308];
 
 function parseCookie(header: string): channels.NetworkCookie | null {
-  const pairs = header.split(';').filter(s => s.trim().length > 0).map(p => {
-    let key = '';
-    let value = '';
-    const separatorPos = p.indexOf('=');
-    if (separatorPos === -1) {
-      // If only a key is specified, the value is left undefined.
-      key = p.trim();
-    } else {
-      // Otherwise we assume that the key is the element before the first `=`
-      key = p.slice(0, separatorPos).trim();
-      // And the value is the rest of the string.
-      value = p.slice(separatorPos + 1).trim();
-    }
-    return [key, value];
-  });
-  if (!pairs.length)
+  const raw = parseRawCookie(header);
+  if (!raw)
     return null;
-  const [name, value] = pairs[0];
   const cookie: channels.NetworkCookie = {
-    name,
-    value,
     domain: '',
     path: '',
     expires: -1,
@@ -658,62 +699,9 @@ function parseCookie(header: string): channels.NetworkCookie | null {
     secure: false,
     // From https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
     // The cookie-sending behavior if SameSite is not specified is SameSite=Lax.
-    sameSite: 'Lax'
+    sameSite: 'Lax',
+    ...raw
   };
-  for (let i = 1; i < pairs.length; i++) {
-    const [name, value] = pairs[i];
-    switch (name.toLowerCase()) {
-      case 'expires':
-        const expiresMs = (+new Date(value));
-        // https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.1
-        if (isFinite(expiresMs)) {
-          if (expiresMs <= 0)
-            cookie.expires = 0;
-          else
-            cookie.expires = Math.min(expiresMs / 1000, kMaxCookieExpiresDateInSeconds);
-        }
-        break;
-      case 'max-age':
-        const maxAgeSec = parseInt(value, 10);
-        if (isFinite(maxAgeSec)) {
-          // From https://datatracker.ietf.org/doc/html/rfc6265#section-5.2.2
-          // If delta-seconds is less than or equal to zero (0), let expiry-time
-          // be the earliest representable date and time.
-          if (maxAgeSec <= 0)
-            cookie.expires = 0;
-          else
-            cookie.expires = Math.min(Date.now() / 1000 + maxAgeSec, kMaxCookieExpiresDateInSeconds);
-        }
-        break;
-      case 'domain':
-        cookie.domain = value.toLocaleLowerCase() || '';
-        if (cookie.domain && !cookie.domain.startsWith('.') && cookie.domain.includes('.'))
-          cookie.domain = '.' + cookie.domain;
-        break;
-      case 'path':
-        cookie.path = value || '';
-        break;
-      case 'secure':
-        cookie.secure = true;
-        break;
-      case 'httponly':
-        cookie.httpOnly = true;
-        break;
-      case 'samesite':
-        switch (value.toLowerCase()) {
-          case 'none':
-            cookie.sameSite = 'None';
-            break;
-          case 'lax':
-            cookie.sameSite = 'Lax';
-            break;
-          case 'strict':
-            cookie.sameSite = 'Strict';
-            break;
-        }
-        break;
-    }
-  }
   return cookie;
 }
 
@@ -762,19 +750,6 @@ function removeHeader(headers: { [name: string]: string }, name: string) {
   delete headers[name];
 }
 
-function shouldBypassProxy(url: URL, bypass?: string): boolean {
-  if (!bypass)
-    return false;
-  const domains = bypass.split(',').map(s => {
-    s = s.trim();
-    if (!s.startsWith('.'))
-      s = '.' + s;
-    return s;
-  });
-  const domain = '.' + url.hostname;
-  return domains.some(d => domain.endsWith(d));
-}
-
 function setBasicAuthorizationHeader(headers: { [name: string]: string }, credentials: HTTPCredentials) {
   const { username, password } = credentials;
   const encoded = Buffer.from(`${username || ''}:${password || ''}`).toString('base64');
diff --git a/packages/playwright-core/src/server/fileUploadUtils.ts b/packages/playwright-core/src/server/fileUploadUtils.ts
index 22ac13b12758e..5a3487a5c10be 100644
--- a/packages/playwright-core/src/server/fileUploadUtils.ts
+++ b/packages/playwright-core/src/server/fileUploadUtils.ts
@@ -14,22 +14,27 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
 import fs from 'fs';
 import path from 'path';
-import { assert, fileUploadSizeLimit } from '../utils';
+
+import { assert } from '../utils/isomorphic/assert';
 import { mime } from '../utilsBundle';
+
 import type { WritableStreamDispatcher } from './dispatchers/writableStreamDispatcher';
 import type { InputFilesItems } from './dom';
 import type { Frame } from './frames';
 import type * as types from './types';
+import type * as channels from '@protocol/channels';
+
+// Keep in sync with the client.
+export const fileUploadSizeLimit = 50 * 1024 * 1024;
 
 async function filesExceedUploadLimit(files: string[]) {
   const sizes = await Promise.all(files.map(async file => (await fs.promises.stat(file)).size));
   return sizes.reduce((total, size) => total + size, 0) >= fileUploadSizeLimit;
 }
 
-export async function prepareFilesForUpload(frame: Frame, params: channels.ElementHandleSetInputFilesParams): Promise<InputFilesItems> {
+export async function prepareFilesForUpload(frame: Frame, params: Omit<channels.ElementHandleSetInputFilesParams, 'timeout'>): Promise<InputFilesItems> {
   const { payloads, streams, directoryStream } = params;
   let { localPaths, localDirectory } = params;
 
@@ -53,7 +58,7 @@ export async function prepareFilesForUpload(frame: Frame, params: channels.Eleme
     lastModifiedMs?: number,
   }[] | undefined = payloads;
 
-  if (!frame._page._browserContext._browser._isCollocatedWithServer) {
+  if (!frame._page.browserContext._browser._isCollocatedWithServer) {
     // If the browser is on a different machine read files into buffers.
     if (localPaths) {
       if (await filesExceedUploadLimit(localPaths))
@@ -77,4 +82,4 @@ export async function prepareFilesForUpload(frame: Frame, params: channels.Eleme
   }));
 
   return { localPaths, localDirectory, filePayloads };
-}
\ No newline at end of file
+}
diff --git a/packages/playwright-core/src/server/firefox/ffBrowser.ts b/packages/playwright-core/src/server/firefox/ffBrowser.ts
index 7ed2d8cb2ff14..b9ae8f2d3656d 100644
--- a/packages/playwright-core/src/server/firefox/ffBrowser.ts
+++ b/packages/playwright-core/src/server/firefox/ffBrowser.ts
@@ -15,20 +15,23 @@
  * limitations under the License.
  */
 
-import { TargetClosedError } from '../errors';
 import { assert } from '../../utils';
-import type { BrowserOptions } from '../browser';
 import { Browser } from '../browser';
-import { assertBrowserContextIsNotOwned, BrowserContext, verifyGeolocation } from '../browserContext';
+import { BrowserContext, verifyGeolocation } from '../browserContext';
+import { TargetClosedError } from '../errors';
 import * as network from '../network';
-import type { InitScript, Page, PageBinding, PageDelegate } from '../page';
+import { ConnectionEvents, FFConnection  } from './ffConnection';
+import { FFPage } from './ffPage';
+import { PageBinding } from '../page';
+
+import type { BrowserOptions } from '../browser';
+import type { SdkObject } from '../instrumentation';
+import type { InitScript, Page } from '../page';
 import type { ConnectionTransport } from '../transport';
 import type * as types from '../types';
-import type * as channels from '@protocol/channels';
-import { ConnectionEvents, FFConnection, type FFSession } from './ffConnection';
-import { FFPage } from './ffPage';
+import type { FFSession } from './ffConnection';
 import type { Protocol } from './protocol';
-import type { SdkObject } from '../instrumentation';
+import type * as channels from '@protocol/channels';
 
 export class FFBrowser extends Browser {
   private _connection: FFConnection;
@@ -57,8 +60,9 @@ export class FFBrowser extends Browser {
       browser._defaultContext = new FFBrowserContext(browser, undefined, options.persistent);
       promises.push((browser._defaultContext as FFBrowserContext)._initialize());
     }
-    if (options.proxy)
-      promises.push(browser.session.send('Browser.setBrowserProxy', toJugglerProxyOptions(options.proxy)));
+    const proxy = options.originalLaunchOptions.proxyOverride || options.proxy;
+    if (proxy)
+      promises.push(browser.session.send('Browser.setBrowserProxy', toJugglerProxyOptions(proxy)));
     await Promise.all(promises);
     return browser;
   }
@@ -87,7 +91,7 @@ export class FFBrowser extends Browser {
     return !this._connection._closed;
   }
 
-  async doCreateNewContext(options: channels.BrowserNewContextParams): Promise<BrowserContext> {
+  async doCreateNewContext(options: types.BrowserContextOptions): Promise<BrowserContext> {
     if (options.isMobile)
       throw new Error('options.isMobile is not supported in Firefox');
     const { browserContextId } = await this.session.send('Browser.createBrowserContext', { removeOnDetach: true });
@@ -132,16 +136,16 @@ export class FFBrowser extends Browser {
       return;
 
     // Abort the navigation that turned into download.
-    ffPage._page._frameManager.frameAbortedNavigation(payload.frameId, 'Download is starting');
+    ffPage._page.frameManager.frameAbortedNavigation(payload.frameId, 'Download is starting');
 
-    let originPage = ffPage._initializedPage;
+    let originPage = ffPage._page.initializedOrUndefined();
     // If it's a new window download, report it on the opener page.
     if (!originPage) {
       // Resume the page creation with an error. The page will automatically close right
       // after the download begins.
       ffPage._markAsError(new Error('Starting new page download'));
       if (ffPage._opener)
-        originPage = ffPage._opener._initializedPage;
+        originPage = ffPage._opener._page.initializedOrUndefined();
     }
     if (!originPage)
       return;
@@ -171,14 +175,17 @@ export class FFBrowser extends Browser {
 export class FFBrowserContext extends BrowserContext {
   declare readonly _browser: FFBrowser;
 
-  constructor(browser: FFBrowser, browserContextId: string | undefined, options: channels.BrowserNewContextParams) {
+  constructor(browser: FFBrowser, browserContextId: string | undefined, options: types.BrowserContextOptions) {
     super(browser, options, browserContextId);
   }
 
   override async _initialize() {
     assert(!this._ffPages().length);
     const browserContextId = this._browserContextId;
-    const promises: Promise<any>[] = [super._initialize()];
+    const promises: Promise<any>[] = [
+      super._initialize(),
+      this._updateInitScripts(),
+    ];
     if (this._options.acceptDownloads !== 'internal-browser-default') {
       promises.push(this._browser.session.send('Browser.setDownloadOptions', {
         browserContextId,
@@ -188,20 +195,14 @@ export class FFBrowserContext extends BrowserContext {
         },
       }));
     }
-    if (this._options.viewport) {
-      const viewport = {
-        viewportSize: { width: this._options.viewport.width, height: this._options.viewport.height },
-        deviceScaleFactor: this._options.deviceScaleFactor || 1,
-      };
-      promises.push(this._browser.session.send('Browser.setDefaultViewport', { browserContextId, viewport }));
-    }
+    promises.push(this.doUpdateDefaultViewport());
     if (this._options.hasTouch)
       promises.push(this._browser.session.send('Browser.setTouchOverride', { browserContextId, hasTouch: true }));
     if (this._options.userAgent)
       promises.push(this._browser.session.send('Browser.setUserAgentOverride', { browserContextId, userAgent: this._options.userAgent }));
     if (this._options.bypassCSP)
       promises.push(this._browser.session.send('Browser.setBypassCSP', { browserContextId, bypassCSP: true }));
-    if (this._options.ignoreHTTPSErrors)
+    if (this._options.ignoreHTTPSErrors || this._options.internalIgnoreHTTPSErrors)
       promises.push(this._browser.session.send('Browser.setIgnoreHTTPSErrors', { browserContextId, ignoreHTTPSErrors: true }));
     if (this._options.javaScriptEnabled === false)
       promises.push(this._browser.session.send('Browser.setJavaScriptDisabled', { browserContextId, javaScriptDisabled: true }));
@@ -210,31 +211,14 @@ export class FFBrowserContext extends BrowserContext {
     if (this._options.timezoneId)
       promises.push(this._browser.session.send('Browser.setTimezoneOverride', { browserContextId, timezoneId: this._options.timezoneId }));
     if (this._options.extraHTTPHeaders || this._options.locale)
-      promises.push(this.setExtraHTTPHeaders(this._options.extraHTTPHeaders || []));
+      promises.push(this.doUpdateExtraHTTPHeaders());
     if (this._options.httpCredentials)
       promises.push(this.setHTTPCredentials(this._options.httpCredentials));
     if (this._options.geolocation)
       promises.push(this.setGeolocation(this._options.geolocation));
     if (this._options.offline)
-      promises.push(this.setOffline(this._options.offline));
-    if (this._options.colorScheme !== 'no-override') {
-      promises.push(this._browser.session.send('Browser.setColorScheme', {
-        browserContextId,
-        colorScheme: this._options.colorScheme !== undefined  ? this._options.colorScheme : 'light',
-      }));
-    }
-    if (this._options.reducedMotion !== 'no-override') {
-      promises.push(this._browser.session.send('Browser.setReducedMotion', {
-        browserContextId,
-        reducedMotion: this._options.reducedMotion !== undefined  ? this._options.reducedMotion : 'no-preference',
-      }));
-    }
-    if (this._options.forcedColors !== 'no-override') {
-      promises.push(this._browser.session.send('Browser.setForcedColors', {
-        browserContextId,
-        forcedColors: this._options.forcedColors !== undefined  ? this._options.forcedColors : 'none',
-      }));
-    }
+      promises.push(this.doUpdateOffline());
+    promises.push(this.doUpdateDefaultEmulatedMedia());
     if (this._options.recordVideo) {
       promises.push(this._ensureVideosPath().then(() => {
         return this._browser.session.send('Browser.setVideoRecordingOptions', {
@@ -247,10 +231,11 @@ export class FFBrowserContext extends BrowserContext {
         });
       }));
     }
-    if (this._options.proxy) {
+    const proxy = this._options.proxyOverride || this._options.proxy;
+    if (proxy) {
       promises.push(this._browser.session.send('Browser.setContextProxy', {
         browserContextId: this._browserContextId,
-        ...toJugglerProxyOptions(this._options.proxy)
+        ...toJugglerProxyOptions(proxy)
       }));
     }
 
@@ -261,12 +246,11 @@ export class FFBrowserContext extends BrowserContext {
     return Array.from(this._browser._ffPages.values()).filter(ffPage => ffPage._browserContext === this);
   }
 
-  pages(): Page[] {
-    return this._ffPages().map(ffPage => ffPage._initializedPage).filter(pageOrNull => !!pageOrNull) as Page[];
+  override possiblyUninitializedPages(): Page[] {
+    return this._ffPages().map(ffPage => ffPage._page);
   }
 
-  async newPageDelegate(): Promise<PageDelegate> {
-    assertBrowserContextIsNotOwned(this);
+  override async doCreateNewPage(): Promise<Page> {
     const { targetId } = await this._browser.session.send('Browser.newPage', {
       browserContextId: this._browserContextId
     }).catch(e =>  {
@@ -274,24 +258,41 @@ export class FFBrowserContext extends BrowserContext {
         throw new Error(`Invalid timezone ID: ${this._options.timezoneId}`);
       throw e;
     });
-    return this._browser._ffPages.get(targetId)!;
+    return this._browser._ffPages.get(targetId)!._page;
   }
 
   async doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]> {
     const { cookies } = await this._browser.session.send('Browser.getCookies', { browserContextId: this._browserContextId });
     return network.filterCookies(cookies.map(c => {
-      const copy: any = { ... c };
-      delete copy.size;
-      delete copy.session;
-      return copy as channels.NetworkCookie;
+      const { name, value, domain, path, expires, httpOnly, secure, sameSite } = c;
+      return {
+        name,
+        value,
+        domain,
+        path,
+        expires,
+        httpOnly,
+        secure,
+        sameSite,
+      };
     }), urls);
   }
 
   async addCookies(cookies: channels.SetNetworkCookie[]) {
-    const cc = network.rewriteCookies(cookies).map(c => ({
-      ...c,
-      expires: c.expires === -1 ? undefined : c.expires,
-    }));
+    const cc = network.rewriteCookies(cookies).map(c => {
+      const { name, value, url, domain, path, expires, httpOnly, secure, sameSite } = c;
+      return {
+        name,
+        value,
+        url,
+        domain,
+        path,
+        expires: expires === -1 ? undefined : expires,
+        httpOnly,
+        secure,
+        sameSite
+      };
+    });
     await this._browser.session.send('Browser.setCookies', { browserContextId: this._browserContextId, cookies: cc });
   }
 
@@ -325,9 +326,8 @@ export class FFBrowserContext extends BrowserContext {
     await this._browser.session.send('Browser.setGeolocationOverride', { browserContextId: this._browserContextId, geolocation: geolocation || null });
   }
 
-  async setExtraHTTPHeaders(headers: types.HeadersArray): Promise<void> {
-    this._options.extraHTTPHeaders = headers;
-    let allHeaders = this._options.extraHTTPHeaders;
+  async doUpdateExtraHTTPHeaders(): Promise<void> {
+    let allHeaders = this._options.extraHTTPHeaders || [];
     if (this._options.locale)
       allHeaders = network.mergeHeaders([allHeaders, network.singleHeader('Accept-Language', this._options.locale)]);
     await this._browser.session.send('Browser.setExtraHTTPHeaders', { browserContextId: this._browserContextId, headers: allHeaders });
@@ -337,9 +337,8 @@ export class FFBrowserContext extends BrowserContext {
     await this._browser.session.send('Browser.setUserAgentOverride', { browserContextId: this._browserContextId, userAgent: userAgent || null });
   }
 
-  async setOffline(offline: boolean): Promise<void> {
-    this._options.offline = offline;
-    await this._browser.session.send('Browser.setOnlineOverride', { browserContextId: this._browserContextId, override: offline ? 'offline' : 'online' });
+  async doUpdateOffline(): Promise<void> {
+    await this._browser.session.send('Browser.setOnlineOverride', { browserContextId: this._browserContextId, override: this._options.offline ? 'offline' : 'online' });
   }
 
   async doSetHTTPCredentials(httpCredentials?: types.Credentials): Promise<void> {
@@ -353,30 +352,69 @@ export class FFBrowserContext extends BrowserContext {
   }
 
   async doAddInitScript(initScript: InitScript) {
-    await this._browser.session.send('Browser.setInitScripts', { browserContextId: this._browserContextId, scripts: this.initScripts.map(script => ({ script: script.source })) });
+    await this._updateInitScripts();
   }
 
-  async doRemoveInitScripts() {
-    await this._browser.session.send('Browser.setInitScripts', { browserContextId: this._browserContextId, scripts: [] });
+  async doRemoveInitScripts(initScripts: InitScript[]) {
+    await this._updateInitScripts();
   }
 
-  async doExposeBinding(binding: PageBinding) {
-    await this._browser.session.send('Browser.addBinding', { browserContextId: this._browserContextId, name: binding.name, script: binding.source });
-  }
-
-  async doRemoveExposedBindings() {
-    // TODO: implement me.
-    // This is not a critical problem, what ends up happening is
-    // an old binding will be restored upon page reload and will point nowhere.
+  private async _updateInitScripts() {
+    const bindingScripts = [...this._pageBindings.values()].map(binding => binding.initScript.source);
+    if (this.bindingsInitScript)
+      bindingScripts.unshift(this.bindingsInitScript.source);
+    const initScripts = this.initScripts.map(script => script.source);
+    await this._browser.session.send('Browser.setInitScripts', { browserContextId: this._browserContextId, scripts: [...bindingScripts, ...initScripts].map(script => ({ script })) });
   }
 
   async doUpdateRequestInterception(): Promise<void> {
     await Promise.all([
-      this._browser.session.send('Browser.setRequestInterception', { browserContextId: this._browserContextId, enabled: !!this._requestInterceptor }),
-      this._browser.session.send('Browser.setCacheDisabled', { browserContextId: this._browserContextId, cacheDisabled: !!this._requestInterceptor }),
+      this._browser.session.send('Browser.setRequestInterception', { browserContextId: this._browserContextId, enabled: this.requestInterceptors.length > 0 }),
+      this._browser.session.send('Browser.setCacheDisabled', { browserContextId: this._browserContextId, cacheDisabled: this.requestInterceptors.length > 0 }),
     ]);
   }
 
+  override async doUpdateDefaultViewport() {
+    if (!this._options.viewport)
+      return;
+    const viewport = {
+      viewportSize: { width: this._options.viewport.width, height: this._options.viewport.height },
+      deviceScaleFactor: this._options.deviceScaleFactor || 1,
+    };
+    await this._browser.session.send('Browser.setDefaultViewport', { browserContextId: this._browserContextId, viewport });
+  }
+
+  override async doUpdateDefaultEmulatedMedia() {
+    if (this._options.colorScheme !== 'no-override') {
+      await this._browser.session.send('Browser.setColorScheme', {
+        browserContextId: this._browserContextId,
+        colorScheme: this._options.colorScheme !== undefined  ? this._options.colorScheme : 'light',
+      });
+    }
+    if (this._options.reducedMotion !== 'no-override') {
+      await this._browser.session.send('Browser.setReducedMotion', {
+        browserContextId: this._browserContextId,
+        reducedMotion: this._options.reducedMotion !== undefined  ? this._options.reducedMotion : 'no-preference',
+      });
+    }
+    if (this._options.forcedColors !== 'no-override') {
+      await this._browser.session.send('Browser.setForcedColors', {
+        browserContextId: this._browserContextId,
+        forcedColors: this._options.forcedColors !== undefined  ? this._options.forcedColors : 'none',
+      });
+    }
+    if (this._options.contrast !== 'no-override') {
+      await this._browser.session.send('Browser.setContrast', {
+        browserContextId: this._browserContextId,
+        contrast: this._options.contrast !== undefined  ? this._options.contrast : 'no-preference',
+      });
+    }
+  }
+
+  override async doExposePlaywrightBinding() {
+    this._browser.session.send('Browser.addBinding', { browserContextId: this._browserContextId, name: PageBinding.kBindingName, script: '' });
+  }
+
   onClosePersistent() {}
 
   override async clearCache(): Promise<void> {
@@ -433,5 +471,5 @@ function toJugglerProxyOptions(proxy: types.ProxySettings) {
 
 // Prefs for quick fixes that didn't make it to the build.
 // Should all be moved to `playwright.cfg`.
-const kBandaidFirefoxUserPrefs = {};
-
+const kBandaidFirefoxUserPrefs = {
+};
diff --git a/packages/playwright-core/src/server/firefox/ffConnection.ts b/packages/playwright-core/src/server/firefox/ffConnection.ts
index 1a24e1dbf0977..1477ace249d81 100644
--- a/packages/playwright-core/src/server/firefox/ffConnection.ts
+++ b/packages/playwright-core/src/server/firefox/ffConnection.ts
@@ -16,13 +16,16 @@
  */
 
 import { EventEmitter } from 'events';
+
+import { debugLogger } from '../utils/debugLogger';
+import { helper } from '../helper';
+import { ProtocolError } from '../protocolError';
+
 import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
 import type { Protocol } from './protocol';
-import type { RecentLogsCollector } from '../../utils/debugLogger';
-import { debugLogger } from '../../utils/debugLogger';
+import type { RecentLogsCollector } from '../utils/debugLogger';
 import type { ProtocolLogger } from '../types';
-import { helper } from '../helper';
-import { ProtocolError } from '../protocolError';
+
 
 export const ConnectionEvents = {
   Disconnected: Symbol('Disconnected'),
diff --git a/packages/playwright-core/src/server/firefox/ffExecutionContext.ts b/packages/playwright-core/src/server/firefox/ffExecutionContext.ts
index 3a6b931a47c17..e686081ab372f 100644
--- a/packages/playwright-core/src/server/firefox/ffExecutionContext.ts
+++ b/packages/playwright-core/src/server/firefox/ffExecutionContext.ts
@@ -15,12 +15,15 @@
  * limitations under the License.
  */
 
+import { assert } from '../../utils/isomorphic/assert';
+import { rewriteErrorMessage } from '../../utils/isomorphic/stackTrace';
+import { parseEvaluationResultValue } from '../../utils/isomorphic/utilityScriptSerializers';
 import * as js from '../javascript';
+import * as dom from '../dom';
+import { isSessionClosedError } from '../protocolError';
+
 import type { FFSession } from './ffConnection';
 import type { Protocol } from './protocol';
-import { rewriteErrorMessage } from '../../utils/stackTrace';
-import { parseEvaluationResultValue } from '../isomorphic/utilityScriptSerializers';
-import { isSessionClosedError } from '../protocolError';
 
 export class FFExecutionContext implements js.ExecutionContextDelegate {
   _session: FFSession;
@@ -41,32 +44,23 @@ export class FFExecutionContext implements js.ExecutionContextDelegate {
     return payload.result!.value;
   }
 
-  async rawEvaluateHandle(expression: string): Promise<js.ObjectId> {
+  async rawEvaluateHandle(context: js.ExecutionContext, expression: string): Promise<js.JSHandle> {
     const payload = await this._session.send('Runtime.evaluate', {
       expression,
       returnByValue: false,
       executionContextId: this._executionContextId,
     }).catch(rewriteError);
     checkException(payload.exceptionDetails);
-    return payload.result!.objectId!;
-  }
-
-  rawCallFunctionNoReply(func: Function, ...args: any[]) {
-    this._session.send('Runtime.callFunction', {
-      functionDeclaration: func.toString(),
-      args: args.map(a => a instanceof js.JSHandle ? { objectId: a._objectId } : { value: a }) as any,
-      returnByValue: true,
-      executionContextId: this._executionContextId
-    }).catch(() => {});
+    return createHandle(context, payload.result!);
   }
 
-  async evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: js.JSHandle<any>, values: any[], objectIds: string[]): Promise<any> {
+  async evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: js.JSHandle, values: any[], handles: js.JSHandle[]): Promise<any> {
     const payload = await this._session.send('Runtime.callFunction', {
       functionDeclaration: expression,
       args: [
         { objectId: utilityScript._objectId, value: undefined },
         ...values.map(value => ({ value })),
-        ...objectIds.map(objectId => ({ objectId, value: undefined })),
+        ...handles.map(handle => ({ objectId: handle._objectId!, value: undefined })),
       ],
       returnByValue,
       executionContextId: this._executionContextId
@@ -74,34 +68,28 @@ export class FFExecutionContext implements js.ExecutionContextDelegate {
     checkException(payload.exceptionDetails);
     if (returnByValue)
       return parseEvaluationResultValue(payload.result!.value);
-    return utilityScript._context.createHandle(payload.result!);
+    return createHandle(utilityScript._context, payload.result!);
   }
 
-  async getProperties(context: js.ExecutionContext, objectId: js.ObjectId): Promise<Map<string, js.JSHandle>> {
+  async getProperties(object: js.JSHandle): Promise<Map<string, js.JSHandle>> {
     const response = await this._session.send('Runtime.getObjectProperties', {
       executionContextId: this._executionContextId,
-      objectId,
+      objectId: object._objectId!,
     });
     const result = new Map();
     for (const property of response.properties)
-      result.set(property.name, context.createHandle(property.value));
+      result.set(property.name, createHandle(object._context, property.value));
     return result;
   }
 
-  createHandle(context: js.ExecutionContext, remoteObject: Protocol.Runtime.RemoteObject): js.JSHandle {
-    return new js.JSHandle(context, remoteObject.subtype || remoteObject.type || '', renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
-  }
-
-  async releaseHandle(objectId: js.ObjectId): Promise<void> {
+  async releaseHandle(handle: js.JSHandle): Promise<void> {
+    if (!handle._objectId)
+      return;
     await this._session.send('Runtime.disposeObject', {
       executionContextId: this._executionContextId,
-      objectId
+      objectId: handle._objectId,
     });
   }
-
-  objectCount(objectId: js.ObjectId): Promise<number> {
-    throw new Error('Method not implemented in Firefox.');
-  }
 }
 
 function checkException(exceptionDetails?: Protocol.Runtime.ExceptionDetails) {
@@ -147,3 +135,11 @@ function renderPreview(object: Protocol.Runtime.RemoteObject): string | undefine
   if ('value' in object)
     return String(object.value);
 }
+
+export function createHandle(context: js.ExecutionContext, remoteObject: Protocol.Runtime.RemoteObject): js.JSHandle {
+  if (remoteObject.subtype === 'node') {
+    assert(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context, remoteObject.objectId!);
+  }
+  return new js.JSHandle(context, remoteObject.subtype || remoteObject.type || '', renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
+}
diff --git a/packages/playwright-core/src/server/firefox/ffInput.ts b/packages/playwright-core/src/server/firefox/ffInput.ts
index 66f35399a5da0..4a497b99f0795 100644
--- a/packages/playwright-core/src/server/firefox/ffInput.ts
+++ b/packages/playwright-core/src/server/firefox/ffInput.ts
@@ -17,6 +17,7 @@
 
 import type * as input from '../input';
 import type { Page } from '../page';
+import type { Progress } from '../progress';
 import type * as types from '../types';
 import type { FFSession } from './ffConnection';
 
@@ -61,34 +62,37 @@ export class RawKeyboardImpl implements input.RawKeyboard {
     this._client = client;
   }
 
-  async keydown(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number, autoRepeat: boolean, text: string | undefined): Promise<void> {
+  async keydown(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription, autoRepeat: boolean): Promise<void> {
+    let text = description.text;
     // Firefox will figure out Enter by itself
     if (text === '\r')
       text = '';
-    await this._client.send('Page.dispatchKeyEvent', {
+    const { code, key, location } = description;
+    await progress.race(this._client.send('Page.dispatchKeyEvent', {
       type: 'keydown',
-      keyCode: keyCodeWithoutLocation,
+      keyCode: description.keyCodeWithoutLocation,
       code,
       key,
       repeat: autoRepeat,
       location,
       text,
-    });
+    }));
   }
 
-  async keyup(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number): Promise<void> {
-    await this._client.send('Page.dispatchKeyEvent', {
+  async keyup(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription): Promise<void> {
+    const { code, key, location } = description;
+    await progress.race(this._client.send('Page.dispatchKeyEvent', {
       type: 'keyup',
       key,
-      keyCode: keyCodeWithoutLocation,
+      keyCode: description.keyCodeWithoutLocation,
       code,
       location,
       repeat: false
-    });
+    }));
   }
 
-  async sendText(text: string): Promise<void> {
-    await this._client.send('Page.insertText', { text });
+  async sendText(progress: Progress, text: string): Promise<void> {
+    await progress.race(this._client.send('Page.insertText', { text }));
   }
 }
 
@@ -100,19 +104,19 @@ export class RawMouseImpl implements input.RawMouse {
     this._client = client;
   }
 
-  async move(x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
-    await this._client.send('Page.dispatchMouseEvent', {
+  async move(progress: Progress, x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
+    await progress.race(this._client.send('Page.dispatchMouseEvent', {
       type: 'mousemove',
       button: 0,
       buttons: toButtonsMask(buttons),
       x: Math.floor(x),
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
 
-  async down(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
-    await this._client.send('Page.dispatchMouseEvent', {
+  async down(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+    await progress.race(this._client.send('Page.dispatchMouseEvent', {
       type: 'mousedown',
       button: toButtonNumber(button),
       buttons: toButtonsMask(buttons),
@@ -120,11 +124,11 @@ export class RawMouseImpl implements input.RawMouse {
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
 
-  async up(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
-    await this._client.send('Page.dispatchMouseEvent', {
+  async up(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+    await progress.race(this._client.send('Page.dispatchMouseEvent', {
       type: 'mouseup',
       button: toButtonNumber(button),
       buttons: toButtonsMask(buttons),
@@ -132,20 +136,20 @@ export class RawMouseImpl implements input.RawMouse {
       y: Math.floor(y),
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
 
-  async wheel(x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
+  async wheel(progress: Progress, x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
     // Wheel events hit the compositor first, so wait one frame for it to be synced.
     await this._page!.mainFrame().evaluateExpression(`new Promise(requestAnimationFrame)`, { world: 'utility' });
-    await this._client.send('Page.dispatchWheelEvent', {
+    await progress.race(this._client.send('Page.dispatchWheelEvent', {
       deltaX,
       deltaY,
       x: Math.floor(x),
       y: Math.floor(y),
       deltaZ: 0,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
 
   setPage(page: Page) {
@@ -159,11 +163,11 @@ export class RawTouchscreenImpl implements input.RawTouchscreen {
   constructor(client: FFSession) {
     this._client = client;
   }
-  async tap(x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
-    await this._client.send('Page.dispatchTapEvent', {
+  async tap(progress: Progress, x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
+    await progress.race(this._client.send('Page.dispatchTapEvent', {
       x,
       y,
       modifiers: toModifiersMask(modifiers),
-    });
+    }));
   }
 }
diff --git a/packages/playwright-core/src/server/firefox/ffNetworkManager.ts b/packages/playwright-core/src/server/firefox/ffNetworkManager.ts
index 266f5bcb83e7c..50bb3017a301c 100644
--- a/packages/playwright-core/src/server/firefox/ffNetworkManager.ts
+++ b/packages/playwright-core/src/server/firefox/ffNetworkManager.ts
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import type { FFSession } from './ffConnection';
-import type { Page } from '../page';
+import { eventsHelper } from '../utils/eventsHelper';
 import * as network from '../network';
+
+import type { FFSession } from './ffConnection';
+import type { HeadersArray } from '../../server/types';
+import type { RegisteredListener } from '../utils/eventsHelper';
 import type * as frames from '../frames';
+import type { Page } from '../page';
 import type * as types from '../types';
 import type { Protocol } from './protocol';
-import type { HeadersArray } from '../../server/types';
 
 export class FFNetworkManager {
   private _session: FFSession;
@@ -58,9 +59,12 @@ export class FFNetworkManager {
 
   _onRequestWillBeSent(event: Protocol.Network.requestWillBeSentPayload) {
     const redirectedFrom = event.redirectedFrom ? (this._requests.get(event.redirectedFrom) || null) : null;
-    const frame = redirectedFrom ? redirectedFrom.request.frame() : (event.frameId ? this._page._frameManager.frame(event.frameId) : null);
+    const frame = redirectedFrom ? redirectedFrom.request.frame() : (event.frameId ? this._page.frameManager.frame(event.frameId) : null);
     if (!frame)
       return;
+    // Align with Chromium and WebKit and not expose preflight OPTIONS requests to the client.
+    if (event.method === 'OPTIONS' && !event.isIntercepted)
+      return;
     if (redirectedFrom)
       this._requests.delete(redirectedFrom._id);
     const request = new InterceptableRequest(frame, redirectedFrom, event);
@@ -68,7 +72,7 @@ export class FFNetworkManager {
     if (event.isIntercepted)
       route = new FFRouteImpl(this._session, request);
     this._requests.set(request._id, request);
-    this._page._frameManager.requestStarted(request.request, route);
+    this._page.frameManager.requestStarted(request.request, route);
   }
 
   _onResponseReceived(event: Protocol.Network.responseReceivedPayload) {
@@ -120,7 +124,7 @@ export class FFNetworkManager {
     response.setRawResponseHeaders(null);
     // Headers size are not available in Firefox.
     response.setResponseHeadersSize(null);
-    this._page._frameManager.requestReceivedResponse(response);
+    this._page.frameManager.requestReceivedResponse(response);
   }
 
   _onRequestFinished(event: Protocol.Network.requestFinishedPayload) {
@@ -142,7 +146,7 @@ export class FFNetworkManager {
     }
     if (event.protocolVersion)
       response._setHttpVersion(event.protocolVersion);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
 
   _onRequestFailed(event: Protocol.Network.requestFailedPayload) {
@@ -157,7 +161,7 @@ export class FFNetworkManager {
       response._requestFinished(-1);
     }
     request.request._setFailureText(event.errorCode);
-    this._page._frameManager.requestFailed(request.request, event.errorCode === 'NS_BINDING_ABORTED');
+    this._page.frameManager.requestFailed(request.request, event.errorCode === 'NS_BINDING_ABORTED');
   }
 }
 
@@ -183,7 +187,7 @@ const causeToResourceType: {[key: string]: string} = {
   TYPE_XSLT: 'other',
   TYPE_BEACON: 'other',
   TYPE_FETCH: 'fetch',
-  TYPE_IMAGESET: 'images',
+  TYPE_IMAGESET: 'image',
   TYPE_WEB_MANIFEST: 'manifest',
 };
 
@@ -203,7 +207,7 @@ class InterceptableRequest {
     let postDataBuffer = null;
     if (payload.postData)
       postDataBuffer = Buffer.from(payload.postData, 'base64');
-    this.request = new network.Request(frame._page._browserContext, frame, null, redirectedFrom ? redirectedFrom.request : null, payload.navigationId,
+    this.request = new network.Request(frame._page.browserContext, frame, null, redirectedFrom ? redirectedFrom.request : null, payload.navigationId,
         payload.url, internalCauseToResourceType[payload.internalCause] || causeToResourceType[payload.cause] || 'other', payload.method, postDataBuffer, payload.headers);
     // "raw" headers are the same as "provisional" headers in Firefox.
     this.request.setRawRequestHeaders(null);
@@ -226,7 +230,7 @@ class FFRouteImpl implements network.RouteDelegate {
     this._request = request;
   }
 
-  async continue(request: network.Request, overrides: types.NormalizedContinueOverrides) {
+  async continue(overrides: types.NormalizedContinueOverrides) {
     await this._session.sendMayFail('Network.resumeInterceptedRequest', {
       requestId: this._request._id,
       url: overrides.url,
diff --git a/packages/playwright-core/src/server/firefox/ffPage.ts b/packages/playwright-core/src/server/firefox/ffPage.ts
index aac22d5e50ed8..c282649e7726d 100644
--- a/packages/playwright-core/src/server/firefox/ffPage.ts
+++ b/packages/playwright-core/src/server/firefox/ffPage.ts
@@ -15,29 +15,29 @@
  * limitations under the License.
  */
 
+import { eventsHelper } from '../utils/eventsHelper';
 import * as dialog from '../dialog';
 import * as dom from '../dom';
-import type * as frames from '../frames';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import type { PageBinding, PageDelegate } from '../page';
 import { InitScript } from '../page';
 import { Page, Worker } from '../page';
-import type * as types from '../types';
 import { getAccessibilityTree } from './ffAccessibility';
-import type { FFBrowserContext } from './ffBrowser';
 import { FFSession } from './ffConnection';
-import { FFExecutionContext } from './ffExecutionContext';
+import { createHandle, FFExecutionContext } from './ffExecutionContext';
 import { RawKeyboardImpl, RawMouseImpl, RawTouchscreenImpl } from './ffInput';
 import { FFNetworkManager } from './ffNetworkManager';
-import type { Protocol } from './protocol';
-import type { Progress } from '../progress';
-import { splitErrorMessage } from '../../utils/stackTrace';
-import { debugLogger } from '../../utils/debugLogger';
-import { ManualPromise } from '../../utils/manualPromise';
+import { debugLogger } from '../utils/debugLogger';
+import { splitErrorMessage } from '../../utils/isomorphic/stackTrace';
 import { BrowserContext } from '../browserContext';
 import { TargetClosedError } from '../errors';
 
+import type { Progress } from '../progress';
+import type { FFBrowserContext } from './ffBrowser';
+import type { Protocol } from './protocol';
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type * as frames from '../frames';
+import type { PageDelegate } from '../page';
+import type * as types from '../types';
+
 export const UTILITY_WORLD_NAME = '__playwright_utility_world__';
 
 export class FFPage implements PageDelegate {
@@ -49,9 +49,7 @@ export class FFPage implements PageDelegate {
   readonly _page: Page;
   readonly _networkManager: FFNetworkManager;
   readonly _browserContext: FFBrowserContext;
-  private _pagePromise = new ManualPromise<Page | Error>();
-  _initializedPage: Page | null = null;
-  private _initializationFailed = false;
+  private _reportedAsNew = false;
   readonly _opener: FFPage | null;
   private readonly _contextIdToContext: Map<string, dom.FrameExecutionContext>;
   private _eventListeners: RegisteredListener[];
@@ -102,64 +100,47 @@ export class FFPage implements PageDelegate {
       eventsHelper.addEventListener(this._session, 'Page.screencastFrame', this._onScreencastFrame.bind(this)),
 
     ];
-    this._session.once('Page.ready', async () => {
-      await this._page.initOpener(this._opener);
-      if (this._initializationFailed)
+    this._session.once('Page.ready', () => {
+      if (this._reportedAsNew)
         return;
-      // Note: it is important to call |reportAsNew| before resolving pageOrError promise,
-      // so that anyone who awaits pageOrError got a ready and reported page.
-      this._initializedPage = this._page;
-      this._page.reportAsNew();
-      this._pagePromise.resolve(this._page);
+      this._reportedAsNew = true;
+      this._page.reportAsNew(this._opener?._page);
     });
     // Ideally, we somehow ensure that utility world is created before Page.ready arrives, but currently it is racy.
     // Therefore, we can end up with an initialized page without utility world, although very unlikely.
     this.addInitScript(new InitScript(''), UTILITY_WORLD_NAME).catch(e => this._markAsError(e));
   }
 
-  potentiallyUninitializedPage(): Page {
-    return this._page;
-  }
-
   async _markAsError(error: Error) {
-    // Same error may be report twice: channer disconnected and session.send fails.
-    if (this._initializationFailed)
+    // Same error may be reported twice: channel disconnected and session.send fails.
+    if (this._reportedAsNew)
       return;
-    this._initializationFailed = true;
-
-    if (!this._initializedPage) {
-      await this._page.initOpener(this._opener);
-      this._page.reportAsNew(error);
-      this._pagePromise.resolve(error);
-    }
-  }
-
-  async pageOrError(): Promise<Page | Error> {
-    return this._pagePromise;
+    this._reportedAsNew = true;
+    this._page.reportAsNew(this._opener?._page, error);
   }
 
   _onWebSocketCreated(event: Protocol.Page.webSocketCreatedPayload) {
-    this._page._frameManager.onWebSocketCreated(webSocketId(event.frameId, event.wsid), event.requestURL);
-    this._page._frameManager.onWebSocketRequest(webSocketId(event.frameId, event.wsid));
+    this._page.frameManager.onWebSocketCreated(webSocketId(event.frameId, event.wsid), event.requestURL);
+    this._page.frameManager.onWebSocketRequest(webSocketId(event.frameId, event.wsid));
   }
 
   _onWebSocketClosed(event: Protocol.Page.webSocketClosedPayload) {
     if (event.error)
-      this._page._frameManager.webSocketError(webSocketId(event.frameId, event.wsid), event.error);
-    this._page._frameManager.webSocketClosed(webSocketId(event.frameId, event.wsid));
+      this._page.frameManager.webSocketError(webSocketId(event.frameId, event.wsid), event.error);
+    this._page.frameManager.webSocketClosed(webSocketId(event.frameId, event.wsid));
   }
 
   _onWebSocketFrameReceived(event: Protocol.Page.webSocketFrameReceivedPayload) {
-    this._page._frameManager.webSocketFrameReceived(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
+    this._page.frameManager.webSocketFrameReceived(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
   }
 
   _onWebSocketFrameSent(event: Protocol.Page.webSocketFrameSentPayload) {
-    this._page._frameManager.onWebSocketFrameSent(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
+    this._page.frameManager.onWebSocketFrameSent(webSocketId(event.frameId, event.wsid), event.opcode, event.data);
   }
 
   _onExecutionContextCreated(payload: Protocol.Runtime.executionContextCreatedPayload) {
     const { executionContextId, auxData } = payload;
-    const frame = this._page._frameManager.frame(auxData.frameId!);
+    const frame = this._page.frameManager.frame(auxData.frameId!);
     if (!frame)
       return;
     const delegate = new FFExecutionContext(this._session, executionContextId);
@@ -169,7 +150,6 @@ export class FFPage implements PageDelegate {
     else if (!auxData.name)
       worldName = 'main';
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    (context as any)[contextDelegateSymbol] = delegate;
     if (worldName)
       frame._contextCreated(worldName, context);
     this._contextIdToContext.set(executionContextId, context);
@@ -198,17 +178,17 @@ export class FFPage implements PageDelegate {
 
   _onLinkClicked(phase: 'before' | 'after') {
     if (phase === 'before')
-      this._page._frameManager.frameWillPotentiallyRequestNavigation();
+      this._page.frameManager.frameWillPotentiallyRequestNavigation();
     else
-      this._page._frameManager.frameDidPotentiallyRequestNavigation();
+      this._page.frameManager.frameDidPotentiallyRequestNavigation();
   }
 
   _onNavigationStarted(params: Protocol.Page.navigationStartedPayload) {
-    this._page._frameManager.frameRequestedNavigation(params.frameId, params.navigationId);
+    this._page.frameManager.frameRequestedNavigation(params.frameId, params.navigationId);
   }
 
   _onNavigationAborted(params: Protocol.Page.navigationAbortedPayload) {
-    this._page._frameManager.frameAbortedNavigation(params.frameId, params.errorText, params.navigationId);
+    this._page.frameManager.frameAbortedNavigation(params.frameId, params.errorText, params.navigationId);
   }
 
   _onNavigationCommitted(params: Protocol.Page.navigationCommittedPayload) {
@@ -216,27 +196,27 @@ export class FFPage implements PageDelegate {
       if (worker.frameId === params.frameId)
         this._onWorkerDestroyed({ workerId });
     }
-    this._page._frameManager.frameCommittedNewDocumentNavigation(params.frameId, params.url, params.name || '', params.navigationId || '', false);
+    this._page.frameManager.frameCommittedNewDocumentNavigation(params.frameId, params.url, params.name || '', params.navigationId || '', false);
   }
 
   _onSameDocumentNavigation(params: Protocol.Page.sameDocumentNavigationPayload) {
-    this._page._frameManager.frameCommittedSameDocumentNavigation(params.frameId, params.url);
+    this._page.frameManager.frameCommittedSameDocumentNavigation(params.frameId, params.url);
   }
 
   _onFrameAttached(params: Protocol.Page.frameAttachedPayload) {
-    this._page._frameManager.frameAttached(params.frameId, params.parentFrameId);
+    this._page.frameManager.frameAttached(params.frameId, params.parentFrameId);
   }
 
   _onFrameDetached(params: Protocol.Page.frameDetachedPayload) {
-    this._page._frameManager.frameDetached(params.frameId);
+    this._page.frameManager.frameDetached(params.frameId);
   }
 
   _onEventFired(payload: Protocol.Page.eventFiredPayload) {
     const { frameId, name } = payload;
     if (name === 'load')
-      this._page._frameManager.frameLifecycleEvent(frameId, 'load');
+      this._page.frameManager.frameLifecycleEvent(frameId, 'load');
     if (name === 'DOMContentLoaded')
-      this._page._frameManager.frameLifecycleEvent(frameId, 'domcontentloaded');
+      this._page.frameManager.frameLifecycleEvent(frameId, 'domcontentloaded');
   }
 
   _onUncaughtError(params: Protocol.Page.uncaughtErrorPayload) {
@@ -253,11 +233,11 @@ export class FFPage implements PageDelegate {
     if (!context)
       return;
     // Juggler reports 'warn' for some internal messages generated by the browser.
-    this._page._addConsoleMessage(type === 'warn' ? 'warning' : type, args.map(arg => context.createHandle(arg)), location);
+    this._page.addConsoleMessage(type === 'warn' ? 'warning' : type, args.map(arg => createHandle(context, arg)), location);
   }
 
   _onDialogOpened(params: Protocol.Page.dialogOpenedPayload) {
-    this._page.emitOnContext(BrowserContext.Events.Dialog, new dialog.Dialog(
+    this._page.browserContext.dialogManager.dialogDidOpen(new dialog.Dialog(
         this._page,
         params.type,
         params.message,
@@ -268,11 +248,11 @@ export class FFPage implements PageDelegate {
   }
 
   async _onBindingCalled(event: Protocol.Page.bindingCalledPayload) {
-    const pageOrError = await this.pageOrError();
+    const pageOrError = await this._page.waitForInitializedOrError();
     if (!(pageOrError instanceof Error)) {
       const context = this._contextIdToContext.get(event.executionContextId);
       if (context)
-        await this._page._onBindingCalled(event.payload, context);
+        await this._page.onBindingCalled(event.payload, context);
     }
   }
 
@@ -281,7 +261,7 @@ export class FFPage implements PageDelegate {
     const context = this._contextIdToContext.get(executionContextId);
     if (!context)
       return;
-    const handle = context.createHandle(element).asElement()!;
+    const handle = createHandle(context, element).asElement()!;
     await this._page._onFileChooserOpened(handle);
   }
 
@@ -298,14 +278,14 @@ export class FFPage implements PageDelegate {
       });
     });
     this._workers.set(workerId, { session: workerSession, frameId: event.frameId });
-    this._page._addWorker(workerId, worker);
+    this._page.addWorker(workerId, worker);
     workerSession.once('Runtime.executionContextCreated', event => {
-      worker._createExecutionContext(new FFExecutionContext(workerSession, event.executionContextId));
+      worker.createExecutionContext(new FFExecutionContext(workerSession, event.executionContextId));
     });
     workerSession.on('Runtime.console', event => {
       const { type, args, location } = event;
-      const context = worker._existingExecutionContext!;
-      this._page._addConsoleMessage(type, args.map(arg => context.createHandle(arg)), location);
+      const context = worker.existingExecutionContext!;
+      this._page.addConsoleMessage(type, args.map(arg => createHandle(context, arg)), location);
     });
     // Note: we receive worker exceptions directly from the page.
   }
@@ -317,7 +297,7 @@ export class FFPage implements PageDelegate {
       return;
     worker.session.dispose();
     this._workers.delete(workerId);
-    this._page._removeWorker(workerId);
+    this._page.removeWorker(workerId);
   }
 
   async _onDispatchMessageFromWorker(event: Protocol.Page.dispatchMessageFromWorkerPayload) {
@@ -333,15 +313,7 @@ export class FFPage implements PageDelegate {
   }
 
   _onVideoRecordingStarted(event: Protocol.Page.videoRecordingStartedPayload) {
-    this._browserContext._browser._videoStarted(this._browserContext, event.screencastId, event.file, this.pageOrError());
-  }
-
-  async exposeBinding(binding: PageBinding) {
-    await this._session.send('Page.addBinding', { name: binding.name, script: binding.source });
-  }
-
-  async removeExposedBindings() {
-    // TODO: implement me.
+    this._browserContext._browser._videoStarted(this._browserContext, event.screencastId, event.file, this._page.waitForInitializedOrError());
   }
 
   didClose() {
@@ -362,7 +334,7 @@ export class FFPage implements PageDelegate {
   }
 
   async updateEmulatedViewportSize(): Promise<void> {
-    const viewportSize = this._page.viewportSize();
+    const viewportSize = this._page.emulatedSize()?.viewport ?? null;
     await this._session.send('Page.setViewportSize', { viewportSize });
   }
 
@@ -375,12 +347,14 @@ export class FFPage implements PageDelegate {
     const colorScheme = emulatedMedia.colorScheme === 'no-override' ? undefined : emulatedMedia.colorScheme;
     const reducedMotion = emulatedMedia.reducedMotion === 'no-override' ? undefined : emulatedMedia.reducedMotion;
     const forcedColors = emulatedMedia.forcedColors === 'no-override' ? undefined : emulatedMedia.forcedColors;
+    const contrast = emulatedMedia.contrast === 'no-override' ? undefined : emulatedMedia.contrast;
     await this._session.send('Page.setEmulatedMedia', {
       // Empty string means reset.
       type: emulatedMedia.media === 'no-override' ? '' : emulatedMedia.media,
       colorScheme,
       reducedMotion,
       forcedColors,
+      contrast,
     });
   }
 
@@ -407,14 +381,23 @@ export class FFPage implements PageDelegate {
     return success;
   }
 
+  async requestGC(): Promise<void> {
+    await this._session.send('Heap.collectGarbage');
+  }
+
   async addInitScript(initScript: InitScript, worldName?: string): Promise<void> {
     this._initScripts.push({ initScript, worldName });
-    await this._session.send('Page.setInitScripts', { scripts: this._initScripts.map(s => ({ script: s.initScript.source, worldName: s.worldName })) });
+    await this._updateInitScripts();
+  }
+
+  async removeInitScripts(initScripts: InitScript[]): Promise<void> {
+    const set = new Set(initScripts);
+    this._initScripts = this._initScripts.filter(s => !set.has(s.initScript));
+    await this._updateInitScripts();
   }
 
-  async removeInitScripts() {
-    this._initScripts = [];
-    await this._session.send('Page.setInitScripts', { scripts: [] });
+  private async _updateInitScripts() {
+    await this._session.send('Page.setInitScripts', { scripts: this._initScripts.map(s => ({ script: s.initScript.source, worldName: s.worldName })) });
   }
 
   async closePage(runBeforeUnload: boolean): Promise<void> {
@@ -436,13 +419,12 @@ export class FFPage implements PageDelegate {
         height: viewportRect!.height,
       };
     }
-    progress.throwIfAborted();
-    const { data } = await this._session.send('Page.screenshot', {
+    const { data } = await progress.race(this._session.send('Page.screenshot', {
       mimeType: ('image/' + format) as ('image/png' | 'image/jpeg'),
       clip: documentRect,
       quality,
       omitDeviceScaleFactor: scale === 'css',
-    });
+    }));
     return Buffer.from(data, 'base64');
   }
 
@@ -453,7 +435,7 @@ export class FFPage implements PageDelegate {
     });
     if (!contentFrameId)
       return null;
-    return this._page._frameManager.frame(contentFrameId);
+    return this._page.frameManager.frame(contentFrameId);
   }
 
   async getOwnerFrame(handle: dom.ElementHandle): Promise<string | null> {
@@ -464,10 +446,6 @@ export class FFPage implements PageDelegate {
     return ownerFrameId || null;
   }
 
-  isElementHandle(remoteObject: any): boolean {
-    return remoteObject.subtype === 'node';
-  }
-
   async getBoundingBox(handle: dom.ElementHandle): Promise<types.Rect | null> {
     const quads = await this.getContentQuads(handle);
     if (!quads || !quads.length)
@@ -540,11 +518,6 @@ export class FFPage implements PageDelegate {
     return result.quads.map(quad => [quad.p1, quad.p2, quad.p3, quad.p4]);
   }
 
-  async setInputFiles(handle: dom.ElementHandle<HTMLInputElement>, files: types.FilePayload[]): Promise<void> {
-    await handle.evaluateInUtility(([injected, node, files]) =>
-      injected.setInputFiles(node, files), files);
-  }
-
   async setInputFilePaths(handle: dom.ElementHandle<HTMLInputElement>, files: string[]): Promise<void> {
     await this._session.send('Page.setFileInputFiles', {
       frameId: handle._context.frame._id,
@@ -557,11 +530,11 @@ export class FFPage implements PageDelegate {
     const result = await this._session.send('Page.adoptNode', {
       frameId: handle._context.frame._id,
       objectId: handle._objectId,
-      executionContextId: ((to as any)[contextDelegateSymbol] as FFExecutionContext)._executionContextId
+      executionContextId: (to.delegate as FFExecutionContext)._executionContextId
     });
     if (!result.remoteObject)
       throw new Error(dom.kUnableToAdoptErrorMessage);
-    return to.createHandle(result.remoteObject) as dom.ElementHandle<T>;
+    return createHandle(to, result.remoteObject) as dom.ElementHandle<T>;
   }
 
   async getAccessibilityTree(needle?: dom.ElementHandle) {
@@ -571,12 +544,12 @@ export class FFPage implements PageDelegate {
   async inputActionEpilogue(): Promise<void> {
   }
 
-  async resetForReuse(): Promise<void> {
+  async resetForReuse(progress: Progress): Promise<void> {
     // Firefox sometimes keeps the last mouse position in the page,
     // which affects things like hovered state.
     // See https://github.com/microsoft/playwright/issues/22432.
     // Move mouse to (-1, -1) to avoid anything being hovered.
-    await this.rawMouse.move(-1, -1, 'none', new Set(), new Set(), false);
+    await this.rawMouse.move(progress, -1, -1, 'none', new Set(), new Set(), false);
   }
 
   async getFrameElement(frame: frames.Frame): Promise<dom.ElementHandle> {
@@ -586,11 +559,11 @@ export class FFPage implements PageDelegate {
     const context = await parent._mainContext();
     const result = await this._session.send('Page.adoptNode', {
       frameId: frame._id,
-      executionContextId: ((context as any)[contextDelegateSymbol] as FFExecutionContext)._executionContextId
+      executionContextId: (context.delegate as FFExecutionContext)._executionContextId
     });
     if (!result.remoteObject)
       throw new Error('Frame has been detached.');
-    return context.createHandle(result.remoteObject) as dom.ElementHandle;
+    return createHandle(context, result.remoteObject) as dom.ElementHandle;
   }
 
   shouldToggleStyleSheetToSyncAnimations(): boolean {
@@ -601,5 +574,3 @@ export class FFPage implements PageDelegate {
 function webSocketId(frameId: string, wsid: string): string {
   return `${frameId}---${wsid}`;
 }
-
-const contextDelegateSymbol = Symbol('delegate');
diff --git a/packages/playwright-core/src/server/firefox/firefox.ts b/packages/playwright-core/src/server/firefox/firefox.ts
index 96d1edae4c04f..79dca474658a1 100644
--- a/packages/playwright-core/src/server/firefox/firefox.ts
+++ b/packages/playwright-core/src/server/firefox/firefox.ts
@@ -15,29 +15,33 @@
  * limitations under the License.
  */
 
-import * as os from 'os';
+import os from 'os';
 import path from 'path';
+
 import { FFBrowser } from './ffBrowser';
 import { kBrowserCloseMessageId } from './ffConnection';
+import { wrapInASCIIBox } from '../utils/ascii';
 import { BrowserType, kNoXServerRunningError } from '../browserType';
-import type { Env } from '../../utils/processLauncher';
-import type { ConnectionTransport } from '../transport';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+
 import type { BrowserOptions } from '../browser';
-import type * as types from '../types';
-import { wrapInASCIIBox } from '../../utils';
 import type { SdkObject } from '../instrumentation';
+import type { Env } from '../utils/processLauncher';
 import type { ProtocolError } from '../protocolError';
+import type { ConnectionTransport } from '../transport';
+import type * as types from '../types';
+import type { RecentLogsCollector } from '../utils/debugLogger';
 
 export class Firefox extends BrowserType {
   constructor(parent: SdkObject) {
     super(parent, 'firefox');
   }
 
-  _connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<FFBrowser> {
+  override connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<FFBrowser> {
     return FFBrowser.connect(this.attribution.playwright, transport, options);
   }
 
-  _doRewriteStartupLog(error: ProtocolError): ProtocolError {
+  override doRewriteStartupLog(error: ProtocolError): ProtocolError {
     if (!error.logs)
       return error;
     // https://github.com/microsoft/playwright/issues/6500
@@ -48,7 +52,7 @@ export class Firefox extends BrowserType {
     return error;
   }
 
-  _amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
+  override amendEnvironment(env: Env): Env {
     if (!path.isAbsolute(os.homedir()))
       throw new Error(`Cannot launch Firefox with relative home directory. Did you set ${os.platform() === 'win32' ? 'USERPROFILE' : 'HOME'} to a relative path?`);
     if (os.platform() === 'linux') {
@@ -60,12 +64,13 @@ export class Firefox extends BrowserType {
     return env;
   }
 
-  _attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+  override attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+    // Note that it's fine to reuse the transport, since our connection ignores kBrowserCloseMessageId.
     const message = { method: 'Browser.close', params: {}, id: kBrowserCloseMessageId };
     transport.send(message);
   }
 
-  _defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
+  override defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
     const { args = [], headless } = options;
     const userDataDirArg = args.find(arg => arg.startsWith('-profile') || arg.startsWith('--profile'));
     if (userDataDirArg)
@@ -88,5 +93,13 @@ export class Firefox extends BrowserType {
       firefoxArguments.push('-silent');
     return firefoxArguments;
   }
-}
 
+  override waitForReadyState(options: types.LaunchOptions, browserLogsCollector: RecentLogsCollector): Promise<{ wsEndpoint?: string }> {
+    const result = new ManualPromise<{ wsEndpoint?: string }>();
+    browserLogsCollector.onMessage(message => {
+      if (message.includes('Juggler listening to the pipe'))
+        result.resolve({});
+    });
+    return result;
+  }
+}
diff --git a/packages/playwright-core/src/server/firefox/protocol.d.ts b/packages/playwright-core/src/server/firefox/protocol.d.ts
index 7ebe32283b155..ccf81fd171910 100644
--- a/packages/playwright-core/src/server/firefox/protocol.d.ts
+++ b/packages/playwright-core/src/server/firefox/protocol.d.ts
@@ -220,11 +220,6 @@ export module Protocol {
       }|null;
     };
     export type setDefaultViewportReturnValue = void;
-    export type setScrollbarsHiddenParameters = {
-      browserContextId?: string;
-      hidden: boolean;
-    };
-    export type setScrollbarsHiddenReturnValue = void;
     export type setInitScriptsParameters = {
       browserContextId?: string;
       scripts: {
@@ -306,6 +301,11 @@ export module Protocol {
       forcedColors: ("active"|"none")|null;
     };
     export type setForcedColorsReturnValue = void;
+    export type setContrastParameters = {
+      browserContextId?: string;
+      contrast: ("less"|"more"|"custom"|"no-preference")|null;
+    };
+    export type setContrastReturnValue = void;
     export type setVideoRecordingOptionsParameters = {
       browserContextId?: string;
       options?: {
@@ -320,6 +320,11 @@ export module Protocol {
     };
     export type cancelDownloadReturnValue = void;
   }
+  export module Heap {
+    export type collectGarbageParameters = {
+    };
+    export type collectGarbageReturnValue = void;
+  }
   export module Page {
     export type DOMPoint = {
       x: number;
@@ -518,6 +523,10 @@ export module Protocol {
       }|null;
     };
     export type setViewportSizeReturnValue = void;
+    export type setZoomParameters = {
+      zoom: number;
+    };
+    export type setZoomReturnValue = void;
     export type bringToFrontParameters = {
     };
     export type bringToFrontReturnValue = void;
@@ -526,6 +535,7 @@ export module Protocol {
       colorScheme?: ("dark"|"light"|"no-preference");
       reducedMotion?: ("reduce"|"no-preference");
       forcedColors?: ("active"|"none");
+      contrast?: ("less"|"more"|"custom"|"no-preference");
     };
     export type setEmulatedMediaReturnValue = void;
     export type setCacheDisabledParameters = {
@@ -1116,7 +1126,6 @@ export module Protocol {
     "Browser.setDownloadOptions": Browser.setDownloadOptionsParameters;
     "Browser.setTouchOverride": Browser.setTouchOverrideParameters;
     "Browser.setDefaultViewport": Browser.setDefaultViewportParameters;
-    "Browser.setScrollbarsHidden": Browser.setScrollbarsHiddenParameters;
     "Browser.setInitScripts": Browser.setInitScriptsParameters;
     "Browser.addBinding": Browser.addBindingParameters;
     "Browser.grantPermissions": Browser.grantPermissionsParameters;
@@ -1128,12 +1137,15 @@ export module Protocol {
     "Browser.setColorScheme": Browser.setColorSchemeParameters;
     "Browser.setReducedMotion": Browser.setReducedMotionParameters;
     "Browser.setForcedColors": Browser.setForcedColorsParameters;
+    "Browser.setContrast": Browser.setContrastParameters;
     "Browser.setVideoRecordingOptions": Browser.setVideoRecordingOptionsParameters;
     "Browser.cancelDownload": Browser.cancelDownloadParameters;
+    "Heap.collectGarbage": Heap.collectGarbageParameters;
     "Page.close": Page.closeParameters;
     "Page.setFileInputFiles": Page.setFileInputFilesParameters;
     "Page.addBinding": Page.addBindingParameters;
     "Page.setViewportSize": Page.setViewportSizeParameters;
+    "Page.setZoom": Page.setZoomParameters;
     "Page.bringToFront": Page.bringToFrontParameters;
     "Page.setEmulatedMedia": Page.setEmulatedMediaParameters;
     "Page.setCacheDisabled": Page.setCacheDisabledParameters;
@@ -1197,7 +1209,6 @@ export module Protocol {
     "Browser.setDownloadOptions": Browser.setDownloadOptionsReturnValue;
     "Browser.setTouchOverride": Browser.setTouchOverrideReturnValue;
     "Browser.setDefaultViewport": Browser.setDefaultViewportReturnValue;
-    "Browser.setScrollbarsHidden": Browser.setScrollbarsHiddenReturnValue;
     "Browser.setInitScripts": Browser.setInitScriptsReturnValue;
     "Browser.addBinding": Browser.addBindingReturnValue;
     "Browser.grantPermissions": Browser.grantPermissionsReturnValue;
@@ -1209,12 +1220,15 @@ export module Protocol {
     "Browser.setColorScheme": Browser.setColorSchemeReturnValue;
     "Browser.setReducedMotion": Browser.setReducedMotionReturnValue;
     "Browser.setForcedColors": Browser.setForcedColorsReturnValue;
+    "Browser.setContrast": Browser.setContrastReturnValue;
     "Browser.setVideoRecordingOptions": Browser.setVideoRecordingOptionsReturnValue;
     "Browser.cancelDownload": Browser.cancelDownloadReturnValue;
+    "Heap.collectGarbage": Heap.collectGarbageReturnValue;
     "Page.close": Page.closeReturnValue;
     "Page.setFileInputFiles": Page.setFileInputFilesReturnValue;
     "Page.addBinding": Page.addBindingReturnValue;
     "Page.setViewportSize": Page.setViewportSizeReturnValue;
+    "Page.setZoom": Page.setZoomReturnValue;
     "Page.bringToFront": Page.bringToFrontReturnValue;
     "Page.setEmulatedMedia": Page.setEmulatedMediaReturnValue;
     "Page.setCacheDisabled": Page.setCacheDisabledReturnValue;
diff --git a/packages/playwright-core/src/server/formData.ts b/packages/playwright-core/src/server/formData.ts
index bc7f1e5bfe970..d628480954a0a 100644
--- a/packages/playwright-core/src/server/formData.ts
+++ b/packages/playwright-core/src/server/formData.ts
@@ -15,6 +15,7 @@
  */
 
 import { mime } from '../utilsBundle';
+
 import type * as channels from '@protocol/channels';
 
 export class MultipartFormData {
diff --git a/packages/playwright-core/src/server/frameSelectors.ts b/packages/playwright-core/src/server/frameSelectors.ts
index 951f9a8945997..f4e20ae16b385 100644
--- a/packages/playwright-core/src/server/frameSelectors.ts
+++ b/packages/playwright-core/src/server/frameSelectors.ts
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
+import { asLocator } from '../utils';
+import { InvalidSelectorError,  splitSelectorByFrame, stringifySelector, visitAllSelectorParts } from '../utils/isomorphic/selectorParser';
+
+import type { ElementHandle, FrameExecutionContext } from './dom';
 import type { Frame } from './frames';
-import type * as types from './types';
-import { stringifySelector, type ParsedSelector, splitSelectorByFrame, InvalidSelectorError, visitAllSelectorParts } from '../utils/isomorphic/selectorParser';
-import type { FrameExecutionContext, ElementHandle } from './dom';
+import type { InjectedScript } from '@injected/injectedScript';
 import type { JSHandle } from './javascript';
-import type { InjectedScript } from './injected/injectedScript';
-import { asLocator } from '../utils/isomorphic/locatorGenerators';
+import type * as types from './types';
+import type { ParsedSelector } from '../utils/isomorphic/selectorParser';
+
 
 export type SelectorInfo = {
   parsed: ParsedSelector,
@@ -42,11 +45,11 @@ export class FrameSelectors {
   }
 
   private _parseSelector(selector: string | ParsedSelector, options?: types.StrictOptions): SelectorInfo {
-    const strict = typeof options?.strict === 'boolean' ? options.strict : !!this.frame._page.context()._options.strictSelectors;
-    return this.frame._page.context().selectors().parseSelector(selector, strict);
+    const strict = typeof options?.strict === 'boolean' ? options.strict : !!this.frame._page.browserContext._options.strictSelectors;
+    return this.frame._page.browserContext.selectors().parseSelector(selector, strict);
   }
 
-  async query(selector: string, options?: types.StrictOptions, scope?: ElementHandle): Promise<ElementHandle<Element> | null> {
+  async query(selector: string, options?: types.StrictOptions & { mainWorld?: boolean }, scope?: ElementHandle): Promise<ElementHandle<Element> | null> {
     const resolved = await this.resolveInjectedForSelector(selector, options, scope);
     // Be careful, |this.frame| can be different from |resolved.frame|.
     if (!resolved)
@@ -72,11 +75,12 @@ export class FrameSelectors {
     }, { info: resolved.info, scope: resolved.scope });
   }
 
-  async queryCount(selector: string): Promise<number> {
+  async queryCount(selector: string, options: any): Promise<number> {
     const resolved = await this.resolveInjectedForSelector(selector);
     // Be careful, |this.frame| can be different from |resolved.frame|.
     if (!resolved)
       throw new Error(`Failed to find frame for selector "${selector}"`);
+    await options.__testHookBeforeQuery?.();
     return await resolved.injected.evaluate((injected, { info }) => {
       return injected.querySelectorAll(info.parsed, document).length;
     }, { info: resolved.info });
@@ -108,6 +112,22 @@ export class FrameSelectors {
     return Promise.all(result);
   }
 
+  private _jumpToAriaRefFrameIfNeeded(selector: string, info: SelectorInfo, frame: Frame): Frame {
+    if (info.parsed.parts[0].name !== 'aria-ref')
+      return frame;
+    const body = info.parsed.parts[0].body as string;
+    const match = body.match(/^f(\d+)e\d+$/);
+    if (!match)
+      return frame;
+    const frameIndex = +match[1];
+    const page = this.frame._page;
+    const frameId = page.lastSnapshotFrameIds[frameIndex - 1];
+    const jumptToFrame = frameId ? page.frameManager.frame(frameId) : null;
+    if (!jumptToFrame)
+      throw new InvalidSelectorError(`Invalid frame in aria-ref selector "${selector}"`);
+    return jumptToFrame;
+  }
+
   async resolveFrameForSelector(selector: string, options: types.StrictOptions = {}, scope?: ElementHandle): Promise<SelectorInFrame | null> {
     let frame: Frame = this.frame;
     const frameChunks = splitSelectorByFrame(selector);
@@ -115,7 +135,7 @@ export class FrameSelectors {
     for (const chunk of frameChunks) {
       visitAllSelectorParts(chunk, (part, nested) => {
         if (nested && part.name === 'internal:control' && part.body === 'enter-frame') {
-          const locator = asLocator(this.frame._page.attribution.playwright.options.sdkLanguage, selector);
+          const locator = asLocator(this.frame._page.browserContext._browser.sdkLanguage(), selector);
           throw new InvalidSelectorError(`Frame locators are not allowed inside composite locators, while querying "${locator}"`);
         }
       });
@@ -123,6 +143,7 @@ export class FrameSelectors {
 
     for (let i = 0; i < frameChunks.length - 1; ++i) {
       const info = this._parseSelector(frameChunks[i], options);
+      frame = this._jumpToAriaRefFrameIfNeeded(selector, info, frame);
       const context = await frame._context(info.world);
       const injectedScript = await context.injectedScript();
       const handle = await injectedScript.evaluateHandle((injected, { info, scope, selectorString }) => {
@@ -134,7 +155,7 @@ export class FrameSelectors {
       const element = handle.asElement() as ElementHandle<Element> | null;
       if (!element)
         return null;
-      const maybeFrame = await frame._page._delegate.getContentFrame(element);
+      const maybeFrame = await frame._page.delegate.getContentFrame(element);
       element.dispose();
       if (!maybeFrame)
         return null;
@@ -143,7 +164,9 @@ export class FrameSelectors {
     // If we end up in the different frame, we should start from the frame root, so throw away the scope.
     if (frame !== this.frame)
       scope = undefined;
-    return { frame, info: frame.selectors._parseSelector(frameChunks[frameChunks.length - 1], options), scope };
+    const lastChunk = frame.selectors._parseSelector(frameChunks[frameChunks.length - 1], options);
+    frame = this._jumpToAriaRefFrameIfNeeded(selector, lastChunk, frame);
+    return { frame, info: lastChunk, scope };
   }
 
   async resolveInjectedForSelector(selector: string, options?: { strict?: boolean, mainWorld?: boolean }, scope?: ElementHandle): Promise<{ injected: JSHandle<InjectedScript>, info: SelectorInfo, frame: Frame, scope?: ElementHandle } | undefined> {
@@ -160,7 +183,7 @@ export class FrameSelectors {
 async function adoptIfNeeded<T extends Node>(handle: ElementHandle<T>, context: FrameExecutionContext): Promise<ElementHandle<T>> {
   if (handle._context === context)
     return handle;
-  const adopted = handle._page._delegate.adoptElementHandle(handle, context);
+  const adopted = await handle._page.delegate.adoptElementHandle(handle, context);
   handle.dispose();
   return adopted;
 }
diff --git a/packages/playwright-core/src/server/frames.ts b/packages/playwright-core/src/server/frames.ts
index acd653e8b9464..b695b35781f55 100644
--- a/packages/playwright-core/src/server/frames.ts
+++ b/packages/playwright-core/src/server/frames.ts
@@ -15,33 +15,33 @@
  * limitations under the License.
  */
 
-import type * as channels from '@protocol/channels';
-import type { ConsoleMessage } from './console';
+import { BrowserContext } from './browserContext';
 import * as dom from './dom';
+import { TimeoutError } from './errors';
+import { prepareFilesForUpload } from './fileUploadUtils';
+import { FrameSelectors } from './frameSelectors';
 import { helper } from './helper';
-import type { RegisteredListener } from '../utils/eventsHelper';
-import { eventsHelper } from '../utils/eventsHelper';
+import { SdkObject } from './instrumentation';
 import * as js from './javascript';
 import * as network from './network';
-import type { Dialog } from './dialog';
 import { Page } from './page';
+import { isAbortError, ProgressController } from './progress';
 import * as types from './types';
-import { BrowserContext } from './browserContext';
-import type { Progress } from './progress';
-import { ProgressController } from './progress';
-import { LongStandingScope, assert, constructURLBasedOnBaseURL, makeWaitForNextTask, monotonicTime } from '../utils';
-import { ManualPromise } from '../utils/manualPromise';
-import { debugLogger } from '../utils/debugLogger';
-import type { CallMetadata } from './instrumentation';
-import { serverSideCallMetadata, SdkObject } from './instrumentation';
-import type { InjectedScript, ElementStateWithoutStable, FrameExpectParams } from './injected/injectedScript';
+import { LongStandingScope, asLocator, assert, constructURLBasedOnBaseURL, makeWaitForNextTask, renderTitleForCall } from '../utils';
 import { isSessionClosedError } from './protocolError';
-import { type ParsedSelector, isInvalidSelectorError } from '../utils/isomorphic/selectorParser';
+import { debugLogger } from './utils/debugLogger';
+import { eventsHelper } from './utils/eventsHelper';
+import {  isInvalidSelectorError } from '../utils/isomorphic/selectorParser';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
+import { compressCallLog } from './callLog';
+
+import type { ConsoleMessage } from './console';
+import type { ElementStateWithoutStable, FrameExpectParams, InjectedScript } from '@injected/injectedScript';
+import type { Progress } from './progress';
 import type { ScreenshotOptions } from './screenshotter';
-import { asLocator } from '../utils/isomorphic/locatorGenerators';
-import { FrameSelectors } from './frameSelectors';
-import { TimeoutError } from './errors';
-import { prepareFilesForUpload } from './fileUploadUtils';
+import type { RegisteredListener } from './utils/eventsHelper';
+import type { ParsedSelector } from '../utils/isomorphic/selectorParser';
+import type * as channels from '@protocol/channels';
 
 type ContextData = {
   contextPromise: ManualPromise<dom.FrameExecutionContext | { destroyedReason: string }>;
@@ -90,6 +90,8 @@ export class NavigationAbortedError extends Error {
   }
 }
 
+type ExpectResult = { matches: boolean, received?: any, log?: string[], timedOut?: boolean };
+
 const kDummyFrameId = '<dummy>';
 
 export class FrameManager {
@@ -99,8 +101,6 @@ export class FrameManager {
   readonly _consoleMessageTags = new Map<string, ConsoleTagHandler>();
   readonly _signalBarriers = new Set<SignalBarrier>();
   private _webSockets = new Map<string, network.WebSocket>();
-  _openedDialogs: Set<Dialog> = new Set();
-  private _closeAllOpeningDialogs = false;
 
   constructor(page: Page) {
     this._page = page;
@@ -161,20 +161,21 @@ export class FrameManager {
     }
   }
 
-  async waitForSignalsCreatedBy<T>(progress: Progress | null, waitAfter: boolean, action: () => Promise<T>): Promise<T> {
+  async waitForSignalsCreatedBy<T>(progress: Progress, waitAfter: boolean, action: () => Promise<T>): Promise<T> {
     if (!waitAfter)
       return action();
     const barrier = new SignalBarrier(progress);
     this._signalBarriers.add(barrier);
-    if (progress)
-      progress.cleanupWhenAborted(() => this._signalBarriers.delete(barrier));
-    const result = await action();
-    await this._page._delegate.inputActionEpilogue();
-    await barrier.waitFor();
-    this._signalBarriers.delete(barrier);
-    // Resolve in the next task, after all waitForNavigations.
-    await new Promise<void>(makeWaitForNextTask());
-    return result;
+    try {
+      const result = await action();
+      await progress.race(this._page.delegate.inputActionEpilogue());
+      await barrier.waitFor();
+      // Resolve in the next task, after all waitForNavigations.
+      await new Promise<void>(makeWaitForNextTask());
+      return result;
+    } finally {
+      this._signalBarriers.delete(barrier);
+    }
   }
 
   frameWillPotentiallyRequestNavigation() {
@@ -249,6 +250,11 @@ export class FrameManager {
     const frame = this._frames.get(frameId);
     if (!frame)
       return;
+    const pending = frame.pendingDocument();
+    if (pending && pending.documentId === undefined && pending.request === undefined) {
+      // WebKit has notified about the same-document navigation being requested, so clear it.
+      frame.setPendingDocument(undefined);
+    }
     frame._url = url;
     const navigationEvent: NavigationEvent = { url, name: frame._name, isPublic: true };
     this._fireInternalFrameNavigation(frame, navigationEvent);
@@ -292,21 +298,13 @@ export class FrameManager {
     if (request._documentId)
       frame.setPendingDocument({ documentId: request._documentId, request });
     if (request._isFavicon) {
-      if (route)
-        route.continue(request, { isFallback: true }).catch(() => {});
+      // Abort favicon requests to avoid network access in case of interception.
+      route?.abort('aborted').catch(() => {});
       return;
     }
     this._page.emitOnContext(BrowserContext.Events.Request, request);
-    if (route) {
-      const r = new network.Route(request, route);
-      if (this._page._serverRequestInterceptor?.(r, request))
-        return;
-      if (this._page._clientRequestInterceptor?.(r, request))
-        return;
-      if (this._page._browserContext._requestInterceptor?.(r, request))
-        return;
-      r.continue({ isFallback: true }).catch(() => {});
-    }
+    if (route)
+      new network.Route(request, route).handle([...this._page.requestInterceptors, ...this._page.browserContext.requestInterceptors]);
   }
 
   requestReceivedResponse(response: network.Response) {
@@ -336,29 +334,6 @@ export class FrameManager {
     this._page.emitOnContext(BrowserContext.Events.RequestFailed, request);
   }
 
-  dialogDidOpen(dialog: Dialog) {
-    // Any ongoing evaluations will be stalled until the dialog is closed.
-    for (const frame of this._frames.values())
-      frame._invalidateNonStallingEvaluations('JavaScript dialog interrupted evaluation');
-    if (this._closeAllOpeningDialogs)
-      dialog.close().then(() => {});
-    else
-      this._openedDialogs.add(dialog);
-  }
-
-  dialogWillClose(dialog: Dialog) {
-    this._openedDialogs.delete(dialog);
-  }
-
-  async closeOpenDialogs() {
-    await Promise.all([...this._openedDialogs].map(dialog => dialog.close())).catch(() => {});
-    this._openedDialogs.clear();
-  }
-
-  setCloseAllOpeningDialogs(closeDialogs: boolean) {
-    this._closeAllOpeningDialogs = closeDialogs;
-  }
-
   removeChildFramesRecursively(frame: Frame) {
     for (const child of frame.childFrames())
       this._removeFramesRecursively(child);
@@ -556,7 +531,7 @@ export class Frame extends SdkObject {
   async raceAgainstEvaluationStallingEvents<T>(cb: () => Promise<T>): Promise<T> {
     if (this._pendingDocument)
       throw new Error('Frame is currently attempting a navigation');
-    if (this._page._frameManager._openedDialogs.size)
+    if (this._page.browserContext.dialogManager.hasOpenDialogsForPage(this._page))
       throw new Error('Open JavaScript dialog prevents evaluation');
 
     const promise = new ManualPromise<T>();
@@ -611,7 +586,7 @@ export class Frame extends SdkObject {
     }
   }
 
-  async raceNavigationAction(progress: Progress, options: types.GotoOptions, action: () => Promise<network.Response | null>): Promise<network.Response | null> {
+  async raceNavigationAction(progress: Progress, action: () => Promise<network.Response | null>): Promise<network.Response | null> {
     return LongStandingScope.raceMultiple([
       this._detachedScope,
       this._page.openScope,
@@ -620,7 +595,7 @@ export class Frame extends SdkObject {
         const data = this._redirectedNavigations.get(e.documentId);
         if (data) {
           progress.log(`waiting for redirected navigation to "${data.url}"`);
-          return data.gotoPromise;
+          return progress.race(data.gotoPromise);
         }
       }
       throw e;
@@ -628,26 +603,21 @@ export class Frame extends SdkObject {
   }
 
   redirectNavigation(url: string, documentId: string, referer: string | undefined) {
-    const controller = new ProgressController(serverSideCallMetadata(), this);
+    const controller = new ProgressController();
     const data = {
       url,
-      gotoPromise: controller.run(progress => this._gotoAction(progress, url, { referer }), 0),
+      gotoPromise: controller.run(progress => this.gotoImpl(progress, url, { referer }), 0),
     };
     this._redirectedNavigations.set(documentId, data);
     data.gotoPromise.finally(() => this._redirectedNavigations.delete(documentId));
   }
 
-  async goto(metadata: CallMetadata, url: string, options: types.GotoOptions = {}): Promise<network.Response | null> {
-    const constructedNavigationURL = constructURLBasedOnBaseURL(this._page._browserContext._options.baseURL, url);
-    const controller = new ProgressController(metadata, this);
-    return controller.run(progress => this._goto(progress, constructedNavigationURL, options), this._page._timeoutSettings.navigationTimeout(options));
-  }
-
-  private async _goto(progress: Progress, url: string, options: types.GotoOptions): Promise<network.Response | null> {
-    return this.raceNavigationAction(progress, options, async () => this._gotoAction(progress, url, options));
+  async goto(progress: Progress, url: string, options: types.GotoOptions = {}): Promise<network.Response | null> {
+    const constructedNavigationURL = constructURLBasedOnBaseURL(this._page.browserContext._options.baseURL, url);
+    return this.raceNavigationAction(progress, async () => this.gotoImpl(progress, constructedNavigationURL, options));
   }
 
-  private async _gotoAction(progress: Progress, url: string, options: types.GotoOptions): Promise<network.Response | null> {
+  async gotoImpl(progress: Progress, url: string, options: types.GotoOptions): Promise<network.Response | null> {
     const waitUntil = verifyLifecycle('waitUntil', options.waitUntil === undefined ? 'load' : options.waitUntil);
     progress.log(`navigating to "${url}", waiting until "${waitUntil}"`);
     const headers = this._page.extraHTTPHeaders() || [];
@@ -660,18 +630,24 @@ export class Frame extends SdkObject {
     }
     url = helper.completeUserURL(url);
 
-    const sameDocument = helper.waitForEvent(progress, this, Frame.Events.InternalNavigation, (e: NavigationEvent) => !e.newDocument);
-    const navigateResult = await this._page._delegate.navigateFrame(this, url, referer);
+    const navigationEvents: NavigationEvent[] = [];
+    const collectNavigations = (arg: NavigationEvent) => navigationEvents.push(arg);
+    this.on(Frame.Events.InternalNavigation, collectNavigations);
+    const navigateResult = await progress.race(this._page.delegate.navigateFrame(this, url, referer)).finally(
+        () => this.off(Frame.Events.InternalNavigation, collectNavigations));
 
     let event: NavigationEvent;
     if (navigateResult.newDocumentId) {
-      sameDocument.dispose();
-      event = await helper.waitForEvent(progress, this, Frame.Events.InternalNavigation, (event: NavigationEvent) => {
+      const predicate = (event: NavigationEvent) => {
         // We are interested either in this specific document, or any other document that
         // did commit and replaced the expected document.
         return event.newDocument && (event.newDocument.documentId === navigateResult.newDocumentId || !event.error);
-      }).promise;
-
+      };
+      const events = navigationEvents.filter(predicate);
+      if (events.length)
+        event = events[0];
+      else
+        event = await helper.waitForEvent(progress, this, Frame.Events.InternalNavigation, predicate).promise;
       if (event.newDocument!.documentId !== navigateResult.newDocumentId) {
         // This is just a sanity check. In practice, new navigation should
         // cancel the previous one and report "request cancelled"-like error.
@@ -680,14 +656,20 @@ export class Frame extends SdkObject {
       if (event.error)
         throw event.error;
     } else {
-      event = await sameDocument.promise;
+      // Wait for same document navigation.
+      const predicate = (e: NavigationEvent) => !e.newDocument;
+      const events = navigationEvents.filter(predicate);
+      if (events.length)
+        event = events[0];
+      else
+        event = await helper.waitForEvent(progress, this, Frame.Events.InternalNavigation, predicate).promise;
     }
 
     if (!this._firedLifecycleEvents.has(waitUntil))
       await helper.waitForEvent(progress, this, Frame.Events.AddLifecycle, (e: types.LifecycleEvent) => e === waitUntil).promise;
 
     const request = event.newDocument ? event.newDocument.request : undefined;
-    const response = request ? request._finalRequest().response() : null;
+    const response = request ? progress.race(request._finalRequest().response()) : null;
     return response;
   }
 
@@ -711,7 +693,7 @@ export class Frame extends SdkObject {
       await helper.waitForEvent(progress, this, Frame.Events.AddLifecycle, (e: types.LifecycleEvent) => e === waitUntil).promise;
 
     const request = navigationEvent.newDocument ? navigationEvent.newDocument.request : undefined;
-    return request ? request._finalRequest().response() : null;
+    return request ? progress.race(request._finalRequest().response()) : null;
   }
 
   async _waitForLoadState(progress: Progress, state: types.LifecycleEvent): Promise<void> {
@@ -721,7 +703,7 @@ export class Frame extends SdkObject {
   }
 
   async frameElement(): Promise<dom.ElementHandle> {
-    return this._page._delegate.getFrameElement(this);
+    return this._page.delegate.getFrameElement(this);
   }
 
   _context(world: types.World): Promise<dom.FrameExecutionContext> {
@@ -761,8 +743,7 @@ export class Frame extends SdkObject {
     return this.selectors.query(selector, options);
   }
 
-  async waitForSelector(metadata: CallMetadata, selector: string, options: types.WaitForElementOptions, scope?: dom.ElementHandle): Promise<dom.ElementHandle<Element> | null> {
-    const controller = new ProgressController(metadata, this);
+  async waitForSelector(progress: Progress, selector: string, performActionPreChecksAndLog: boolean, options: types.WaitForElementOptions, scope?: dom.ElementHandle): Promise<dom.ElementHandle<Element> | null> {
     if ((options as any).visibility)
       throw new Error('options.visibility is not supported, did you mean options.state?');
     if ((options as any).waitFor && (options as any).waitFor !== 'visible')
@@ -770,26 +751,24 @@ export class Frame extends SdkObject {
     const { state = 'visible' } = options;
     if (!['attached', 'detached', 'visible', 'hidden'].includes(state))
       throw new Error(`state: expected one of (attached|detached|visible|hidden)`);
-    return controller.run(async progress => {
+    if (performActionPreChecksAndLog)
       progress.log(`waiting for ${this._asLocator(selector)}${state === 'attached' ? '' : ' to be ' + state}`);
-      return await this.waitForSelectorInternal(progress, selector, options, scope);
-    }, this._page._timeoutSettings.timeout(options));
-  }
-
-  async waitForSelectorInternal(progress: Progress, selector: string, options: types.WaitForElementOptions, scope?: dom.ElementHandle): Promise<dom.ElementHandle<Element> | null> {
-    const { state = 'visible' } = options;
     const promise = this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => {
-      const resolved = await this.selectors.resolveInjectedForSelector(selector, options, scope);
-      progress.throwIfAborted();
+      if (performActionPreChecksAndLog)
+        await this._page.performActionPreChecks(progress);
+
+      const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, options, scope));
       if (!resolved) {
         if (state === 'hidden' || state === 'detached')
           return null;
         return continuePolling;
       }
-      const result = await resolved.injected.evaluateHandle((injected, { info, root }) => {
+      const result = await progress.race(resolved.injected.evaluateHandle((injected, { info, root }) => {
+        if (root && !root.isConnected)
+          throw injected.createStacklessError('Element is not attached to the DOM');
         const elements = injected.querySelectorAll(info.parsed, root || document);
         const element: Element | undefined  = elements[0];
-        const visible = element ? injected.isVisible(element) : false;
+        const visible = element ? injected.utils.isElementVisible(element) : false;
         let log = '';
         if (elements.length > 1) {
           if (info.strict)
@@ -799,8 +778,8 @@ export class Frame extends SdkObject {
           log = `  locator resolved to ${visible ? 'visible' : 'hidden'} ${injected.previewNode(element)}`;
         }
         return { log, element, visible, attached: !!element };
-      }, { info: resolved.info, root: resolved.frame === this ? scope : undefined });
-      const { log, visible, attached } = await result.evaluate(r => ({ log: r.log, visible: r.visible, attached: r.attached }));
+      }, { info: resolved.info, root: resolved.frame === this ? scope : undefined }));
+      const { log, visible, attached } = await progress.race(result.evaluate(r => ({ log: r.log, visible: r.visible, attached: r.attached })));
       if (log)
         progress.log(log);
       const success = { attached, detached: !attached, visible, hidden: !visible }[state];
@@ -812,14 +791,15 @@ export class Frame extends SdkObject {
         result.dispose();
         return null;
       }
-      const element = state === 'attached' || state === 'visible' ? await result.evaluateHandle(r => r.element) : null;
+      const element = state === 'attached' || state === 'visible' ? await progress.race(result.evaluateHandle(r => r.element)) : null;
       result.dispose();
       if (!element)
         return null;
       if ((options as any).__testHookBeforeAdoptNode)
-        await (options as any).__testHookBeforeAdoptNode();
+        await progress.race((options as any).__testHookBeforeAdoptNode());
       try {
-        return await element._adoptTo(await resolved.frame._mainContext());
+        const mainContext = await progress.race(resolved.frame._mainContext());
+        return await progress.race(element._adoptTo(mainContext));
       } catch (e) {
         return continuePolling;
       }
@@ -827,8 +807,8 @@ export class Frame extends SdkObject {
     return scope ? scope._context._raceAgainstContextDestroyed(promise) : promise;
   }
 
-  async dispatchEvent(metadata: CallMetadata, selector: string, type: string, eventInit: Object = {}, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<void> {
-    await this._callOnElementOnceMatches(metadata, selector, (injectedScript, element, data) => {
+  async dispatchEvent(progress: Progress, selector: string, type: string, eventInit: Object = {}, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<void> {
+    await this._callOnElementOnceMatches(progress, selector, (injectedScript, element, data) => {
       injectedScript.dispatchEvent(element, data.type, data.eventInit);
     }, { type, eventInit }, { mainWorld: true, ...options }, scope);
   }
@@ -861,8 +841,14 @@ export class Frame extends SdkObject {
     return this.selectors.queryAll(selector);
   }
 
-  async queryCount(selector: string): Promise<number> {
-    return await this.selectors.queryCount(selector);
+  async queryCount(selector: string, options: any): Promise<number> {
+    try {
+      return await this.selectors.queryCount(selector, options);
+    } catch (e) {
+      if (this.isNonRetriableError(e))
+        throw e;
+      return 0;
+    }
   }
 
   async content(): Promise<string> {
@@ -877,37 +863,36 @@ export class Frame extends SdkObject {
         return retVal;
       });
     } catch (e) {
-      if (js.isJavaScriptErrorInEvaluate(e) || isSessionClosedError(e))
+      if (this.isNonRetriableError(e))
         throw e;
       throw new Error(`Unable to retrieve content because the page is navigating and changing the content.`);
     }
   }
 
-  async setContent(metadata: CallMetadata, html: string, options: types.NavigateOptions = {}): Promise<void> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      await this.raceNavigationAction(progress, options, async () => {
-        const waitUntil = options.waitUntil === undefined ? 'load' : options.waitUntil;
-        progress.log(`setting frame content, waiting until "${waitUntil}"`);
-        const tag = `--playwright--set--content--${this._id}--${++this._setContentCounter}--`;
-        const context = await this._utilityContext();
-        const lifecyclePromise = new Promise((resolve, reject) => {
-          this._page._frameManager._consoleMessageTags.set(tag, () => {
-            // Clear lifecycle right after document.open() - see 'tag' below.
-            this._onClearLifecycle();
-            this._waitForLoadState(progress, waitUntil).then(resolve).catch(reject);
-          });
-        });
-        const contentPromise = context.evaluate(({ html, tag }) => {
-          document.open();
-          console.debug(tag);  // eslint-disable-line no-console
-          document.write(html);
-          document.close();
-        }, { html, tag });
-        await Promise.all([contentPromise, lifecyclePromise]);
-        return null;
+  async setContent(progress: Progress, html: string, options: types.NavigateOptions): Promise<void> {
+    const tag = `--playwright--set--content--${this._id}--${++this._setContentCounter}--`;
+    await this.raceNavigationAction(progress, async () => {
+      const waitUntil = options.waitUntil === undefined ? 'load' : options.waitUntil;
+      progress.log(`setting frame content, waiting until "${waitUntil}"`);
+      const context = await progress.race(this._utilityContext());
+      const tagPromise = new ManualPromise<void>();
+      this._page.frameManager._consoleMessageTags.set(tag, () => {
+        // Clear lifecycle right after document.open() - see 'tag' below.
+        this._onClearLifecycle();
+        tagPromise.resolve();
       });
-    }, this._page._timeoutSettings.navigationTimeout(options));
+      const lifecyclePromise = progress.race(tagPromise).then(() => this._waitForLoadState(progress, waitUntil));
+      const contentPromise = progress.race(context.evaluate(({ html, tag }) => {
+        document.open();
+        console.debug(tag);  // eslint-disable-line no-console
+        document.write(html);
+        document.close();
+      }, { html, tag }));
+      await Promise.all([contentPromise, lifecyclePromise]);
+      return null;
+    }).finally(() => {
+      this._page.frameManager._consoleMessageTags.delete(tag);
+    });
   }
 
   name(): string {
@@ -921,7 +906,7 @@ export class Frame extends SdkObject {
   origin(): string | undefined {
     if (!this._url.startsWith('http'))
       return;
-    return network.parsedURL(this._url)?.origin;
+    return network.parseURL(this._url)?.origin;
   }
 
   parentFrame(): Frame | null {
@@ -952,7 +937,7 @@ export class Frame extends SdkObject {
       const result = (await context.evaluateHandle(addScriptContent, { content: content!, type })).asElement()!;
       // Another round trip to the browser to ensure that we receive CSP error messages
       // (if any) logged asynchronously in a separate task on the content main thread.
-      if (this._page._delegate.cspErrorsAsynchronousForInlineScripts)
+      if (this._page.delegate.cspErrorsAsynchronousForInlineScripts)
         await context.evaluate(() => true);
       return result;
     });
@@ -1033,7 +1018,7 @@ export class Frame extends SdkObject {
     let cspMessage: ConsoleMessage | undefined;
     const actionPromise = func().then(r => result = r).catch(e => error = e);
     const errorPromise = new Promise<void>(resolve => {
-      listeners.push(eventsHelper.addEventListener(this._page._browserContext, BrowserContext.Events.Console, (message: ConsoleMessage) => {
+      listeners.push(eventsHelper.addEventListener(this._page.browserContext, BrowserContext.Events.Console, (message: ConsoleMessage) => {
         if (message.page() !== this._page || message.type() !== 'error')
           return;
         if (message.text().includes('Content-Security-Policy') || message.text().includes('Content Security Policy')) {
@@ -1055,34 +1040,33 @@ export class Frame extends SdkObject {
     const continuePolling = Symbol('continuePolling');
     timeouts = [0, ...timeouts];
     let timeoutIndex = 0;
-    while (progress.isRunning()) {
+    while (true) {
       const timeout = timeouts[Math.min(timeoutIndex++, timeouts.length - 1)];
       if (timeout) {
         // Make sure we react immediately upon page close or frame detach.
         // We need this to show expected/received values in time.
         const actionPromise = new Promise(f => setTimeout(f, timeout));
-        await LongStandingScope.raceMultiple([
+        await progress.race(LongStandingScope.raceMultiple([
           this._page.openScope,
           this._detachedScope,
-        ], actionPromise);
+        ], actionPromise));
       }
-      progress.throwIfAborted();
       try {
         const result = await action(continuePolling);
         if (result === continuePolling)
           continue;
         return result as R;
       } catch (e) {
-        if (this._isErrorThatCannotBeRetried(e))
+        if (this.isNonRetriableError(e))
           throw e;
         continue;
       }
     }
-    progress.throwIfAborted();
-    return undefined as any;
   }
 
-  private _isErrorThatCannotBeRetried(e: Error) {
+  isNonRetriableError(e: Error) {
+    if (isAbortError(e))
+      return true;
     // Always fail on JavaScript errors or when the main connection is closed.
     if (js.isJavaScriptErrorInEvaluate(e) || isSessionClosedError(e))
       return true;
@@ -1100,19 +1084,20 @@ export class Frame extends SdkObject {
     progress: Progress,
     selector: string,
     strict: boolean | undefined,
-    performLocatorHandlersCheckpoint: boolean,
+    performActionPreChecks: boolean,
     action: (handle: dom.ElementHandle<Element>) => Promise<R | 'error:notconnected'>): Promise<R> {
     progress.log(`waiting for ${this._asLocator(selector)}`);
     return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => {
-      if (performLocatorHandlersCheckpoint)
-        await this._page.performLocatorHandlersCheckpoint(progress);
+      if (performActionPreChecks)
+        await this._page.performActionPreChecks(progress);
 
-      const resolved = await this.selectors.resolveInjectedForSelector(selector, { strict });
-      progress.throwIfAborted();
+      const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, { strict }));
       if (!resolved)
         return continuePolling;
-      const result = await resolved.injected.evaluateHandle((injected, { info }) => {
+      const result = await progress.race(resolved.injected.evaluateHandle((injected, { info, callId }) => {
         const elements = injected.querySelectorAll(info.parsed, document);
+        if (callId)
+          injected.markTargetElements(new Set(elements), callId);
         const element = elements[0] as Element | undefined;
         let log = '';
         if (elements.length > 1) {
@@ -1123,15 +1108,15 @@ export class Frame extends SdkObject {
           log = `  locator resolved to ${injected.previewNode(element)}`;
         }
         return { log, success: !!element, element };
-      }, { info: resolved.info });
-      const { log, success } = await result.evaluate(r => ({ log: r.log, success: r.success }));
+      }, { info: resolved.info, callId: progress.metadata.id }));
+      const { log, success } = await progress.race(result.evaluate(r => ({ log: r.log, success: r.success })));
       if (log)
         progress.log(log);
       if (!success) {
         result.dispose();
         return continuePolling;
       }
-      const element = await result.evaluateHandle(r => r.element) as dom.ElementHandle<Element>;
+      const element = await progress.race(result.evaluateHandle(r => r.element)) as dom.ElementHandle<Element>;
       result.dispose();
       try {
         const result = await action(element);
@@ -1147,107 +1132,114 @@ export class Frame extends SdkObject {
   }
 
   async rafrafTimeoutScreenshotElementWithProgress(progress: Progress, selector: string, timeout: number, options: ScreenshotOptions): Promise<Buffer> {
-    return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, true /* performLocatorHandlersCheckpoint */, async handle => {
-      await handle._frame.rafrafTimeout(timeout);
-      return await this._page._screenshotter.screenshotElement(progress, handle, options);
+    return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, true /* performActionPreChecks */, async handle => {
+      await handle._frame.rafrafTimeout(progress, timeout);
+      return await this._page.screenshotter.screenshotElement(progress, handle, options);
     });
   }
 
-  async click(metadata: CallMetadata, selector: string, options: { noWaitAfter?: boolean } & types.MouseClickOptions & types.PointerActionWaitOptions) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._click(progress, { ...options, waitAfter: !options.noWaitAfter })));
-    }, this._page._timeoutSettings.timeout(options));
-  }
-
-  async dblclick(metadata: CallMetadata, selector: string, options: types.MouseMultiClickOptions & types.PointerActionWaitOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._dblclick(progress, options)));
-    }, this._page._timeoutSettings.timeout(options));
-  }
-
-  async dragAndDrop(metadata: CallMetadata, source: string, target: string, options: types.DragActionOptions & types.PointerActionWaitOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    await controller.run(async progress => {
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, source, options.strict, !options.force /* performLocatorHandlersCheckpoint */, async handle => {
-        return handle._retryPointerAction(progress, 'move and down', false, async point => {
-          await this._page.mouse.move(point.x, point.y);
-          await this._page.mouse.down();
-        }, {
-          ...options,
-          waitAfter: 'disabled',
-          position: options.sourcePosition,
-          timeout: progress.timeUntilDeadline(),
-        });
-      }));
-      // Note: do not perform locator handlers checkpoint to avoid moving the mouse in the middle of a drag operation.
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, target, options.strict, false /* performLocatorHandlersCheckpoint */, async handle => {
-        return handle._retryPointerAction(progress, 'move and up', false, async point => {
-          await this._page.mouse.move(point.x, point.y);
-          await this._page.mouse.up();
-        }, {
-          ...options,
-          waitAfter: 'disabled',
-          position: options.targetPosition,
-          timeout: progress.timeUntilDeadline(),
-        });
-      }));
-    }, this._page._timeoutSettings.timeout(options));
+  async click(progress: Progress, selector: string, options: { noWaitAfter?: boolean } & types.MouseClickOptions & types.PointerActionWaitOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._click(progress, { ...options, waitAfter: !options.noWaitAfter })));
   }
 
-  async tap(metadata: CallMetadata, selector: string, options: types.PointerActionWaitOptions) {
-    if (!this._page._browserContext._options.hasTouch)
+  async dblclick(progress: Progress, selector: string, options: types.MouseMultiClickOptions & types.PointerActionWaitOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._dblclick(progress, options)));
+  }
+
+  async dragAndDrop(progress: Progress, source: string, target: string, options: types.DragActionOptions & types.PointerActionWaitOptions) {
+    dom.assertDone(await this._retryWithProgressIfNotConnected(progress, source, options.strict, !options.force /* performActionPreChecks */, async handle => {
+      return handle._retryPointerAction(progress, 'move and down', false, async point => {
+        await this._page.mouse.move(progress, point.x, point.y);
+        await this._page.mouse.down(progress);
+      }, {
+        ...options,
+        waitAfter: 'disabled',
+        position: options.sourcePosition,
+      });
+    }));
+    // Note: do not perform locator handlers checkpoint to avoid moving the mouse in the middle of a drag operation.
+    dom.assertDone(await this._retryWithProgressIfNotConnected(progress, target, options.strict, false /* performActionPreChecks */, async handle => {
+      return handle._retryPointerAction(progress, 'move and up', false, async point => {
+        await this._page.mouse.move(progress, point.x, point.y);
+        await this._page.mouse.up(progress);
+      }, {
+        ...options,
+        waitAfter: 'disabled',
+        position: options.targetPosition,
+      });
+    }));
+  }
+
+  async tap(progress: Progress, selector: string, options: types.PointerActionWaitOptions) {
+    if (!this._page.browserContext._options.hasTouch)
       throw new Error('The page does not support tap. Use hasTouch context option to enable touch support.');
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._tap(progress, options)));
-    }, this._page._timeoutSettings.timeout(options));
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._tap(progress, options)));
+  }
+
+  async fill(progress: Progress, selector: string, value: string, options: types.StrictOptions & { force?: boolean }) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._fill(progress, value, options)));
   }
 
-  async fill(metadata: CallMetadata, selector: string, value: string, options: types.TimeoutOptions & types.StrictOptions & { force?: boolean }) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._fill(progress, value, options)));
-    }, this._page._timeoutSettings.timeout(options));
+  async focus(progress: Progress, selector: string, options: types.StrictOptions) {
+    dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._focus(progress)));
   }
 
-  async focus(metadata: CallMetadata, selector: string, options: types.TimeoutOptions & types.StrictOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    await controller.run(async progress => {
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._focus(progress)));
-    }, this._page._timeoutSettings.timeout(options));
+  async blur(progress: Progress, selector: string, options: types.StrictOptions) {
+    dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._blur(progress)));
   }
 
-  async blur(metadata: CallMetadata, selector: string, options: types.TimeoutOptions & types.StrictOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    await controller.run(async progress => {
-      dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._blur(progress)));
-    }, this._page._timeoutSettings.timeout(options));
+  async resolveSelector(progress: Progress, selector: string, options: { mainWorld?: boolean } = {}): Promise<{ resolvedSelector: string }> {
+    const element = await progress.race(this.selectors.query(selector, options));
+    if (!element)
+      throw new Error(`No element matching ${selector}`);
+
+    const generated = await progress.race(element.evaluateInUtility(async ([injected, node]) => {
+      return injected.generateSelectorSimple(node as unknown as Element);
+    }, {}));
+    if (!generated)
+      throw new Error(`Unable to generate locator for ${selector}`);
+
+    let frame: Frame | null = element._frame;
+    const result = [generated];
+    while (frame?.parentFrame()) {
+      const frameElement = await progress.race(frame.frameElement());
+      if (frameElement) {
+        const generated = await progress.race(frameElement.evaluateInUtility(async ([injected, node]) => {
+          return injected.generateSelectorSimple(node as unknown as Element);
+        }, {}));
+        frameElement.dispose();
+        if (generated === 'error:notconnected' || !generated)
+          throw new Error(`Unable to generate locator for ${selector}`);
+        result.push(generated);
+      }
+      frame = frame.parentFrame();
+    }
+    const resolvedSelector = result.reverse().join(' >> internal:control=enter-frame >> ');
+    return { resolvedSelector };
   }
 
-  async textContent(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<string | null> {
-    return this._callOnElementOnceMatches(metadata, selector, (injected, element) => element.textContent, undefined, options, scope);
+  async textContent(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string | null> {
+    return this._callOnElementOnceMatches(progress, selector, (injected, element) => element.textContent, undefined, options, scope);
   }
 
-  async innerText(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<string> {
-    return this._callOnElementOnceMatches(metadata, selector, (injectedScript, element) => {
+  async innerText(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string> {
+    return this._callOnElementOnceMatches(progress, selector, (injectedScript, element) => {
       if (element.namespaceURI !== 'http://www.w3.org/1999/xhtml')
         throw injectedScript.createStacklessError('Node is not an HTMLElement');
       return (element as HTMLElement).innerText;
     }, undefined, options, scope);
   }
 
-  async innerHTML(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<string> {
-    return this._callOnElementOnceMatches(metadata, selector, (injected, element) => element.innerHTML, undefined, options, scope);
+  async innerHTML(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string> {
+    return this._callOnElementOnceMatches(progress, selector, (injected, element) => element.innerHTML, undefined, options, scope);
   }
 
-  async getAttribute(metadata: CallMetadata, selector: string, name: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<string | null> {
-    return this._callOnElementOnceMatches(metadata, selector, (injected, element, data) => element.getAttribute(data.name), { name }, options, scope);
+  async getAttribute(progress: Progress, selector: string, name: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<string | null> {
+    return this._callOnElementOnceMatches(progress, selector, (injected, element, data) => element.getAttribute(data.name), { name }, options, scope);
   }
 
-  async inputValue(metadata: CallMetadata, selector: string, options: types.TimeoutOptions & types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<string> {
-    return this._callOnElementOnceMatches(metadata, selector, (injectedScript, node) => {
+  async inputValue(progress: Progress, selector: string, options: types.StrictOptions, scope?: dom.ElementHandle): Promise<string> {
+    return this._callOnElementOnceMatches(progress, selector, (injectedScript, node) => {
       const element = injectedScript.retarget(node, 'follow-label');
       if (!element || (element.nodeName !== 'INPUT' && element.nodeName !== 'TEXTAREA' && element.nodeName !== 'SELECT'))
         throw injectedScript.createStacklessError('Node is not an <input>, <textarea> or <select> element');
@@ -1255,13 +1247,13 @@ export class Frame extends SdkObject {
     }, undefined, options, scope);
   }
 
-  async highlight(selector: string) {
-    const resolved = await this.selectors.resolveInjectedForSelector(selector);
+  async highlight(progress: Progress, selector: string) {
+    const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector));
     if (!resolved)
       return;
-    return await resolved.injected.evaluate((injected, { info }) => {
+    return await progress.race(resolved.injected.evaluate((injected, { info }) => {
       return injected.highlight(info.parsed);
-    }, { info: resolved.info });
+    }, { info: resolved.info }));
   }
 
   async hideHighlight() {
@@ -1274,183 +1266,126 @@ export class Frame extends SdkObject {
     });
   }
 
-  private async _elementState(metadata: CallMetadata, selector: string, state: ElementStateWithoutStable, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    const result = await this._callOnElementOnceMatches(metadata, selector, (injected, element, data) => {
+  private async _elementState(progress: Progress, selector: string, state: ElementStateWithoutStable, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<boolean> {
+    const result = await this._callOnElementOnceMatches(progress, selector, (injected, element, data) => {
       return injected.elementState(element, data.state);
     }, { state }, options, scope);
-    return dom.throwRetargetableDOMError(result);
+    if (result.received === 'error:notconnected')
+      dom.throwElementIsNotAttached();
+    return result.matches;
   }
 
-  async isVisible(metadata: CallMetadata, selector: string, options: types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      progress.log(`  checking visibility of ${this._asLocator(selector)}`);
-      return await this.isVisibleInternal(selector, options, scope);
-    }, this._page._timeoutSettings.timeout({}));
+  async isVisible(progress: Progress, selector: string, options: types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
+    progress.log(`  checking visibility of ${this._asLocator(selector)}`);
+    return await this.isVisibleInternal(progress, selector, options, scope);
   }
 
-  async isVisibleInternal(selector: string, options: types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
+  async isVisibleInternal(progress: Progress, selector: string, options: types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
     try {
-      const resolved = await this.selectors.resolveInjectedForSelector(selector, options, scope);
+      const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, options, scope));
       if (!resolved)
         return false;
-      return await resolved.injected.evaluate((injected, { info, root }) => {
+      return await progress.race(resolved.injected.evaluate((injected, { info, root }) => {
         const element = injected.querySelector(info.parsed, root || document, info.strict);
-        const state = element ? injected.elementState(element, 'visible') : false;
-        return state === 'error:notconnected' ? false : state;
-      }, { info: resolved.info, root: resolved.frame === this ? scope : undefined });
+        const state = element ? injected.elementState(element, 'visible') : { matches: false, received: 'error:notconnected' };
+        return state.matches;
+      }, { info: resolved.info, root: resolved.frame === this ? scope : undefined }));
     } catch (e) {
-      if (js.isJavaScriptErrorInEvaluate(e) || isInvalidSelectorError(e) || isSessionClosedError(e))
+      if (this.isNonRetriableError(e))
         throw e;
       return false;
     }
   }
 
-  async isHidden(metadata: CallMetadata, selector: string, options: types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    return !(await this.isVisible(metadata, selector, options, scope));
+  async isHidden(progress: Progress, selector: string, options: types.StrictOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
+    return !(await this.isVisible(progress, selector, options, scope));
   }
 
-  async isDisabled(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    return this._elementState(metadata, selector, 'disabled', options, scope);
+  async isDisabled(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<boolean> {
+    return this._elementState(progress, selector, 'disabled', options, scope);
   }
 
-  async isEnabled(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    return this._elementState(metadata, selector, 'enabled', options, scope);
+  async isEnabled(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<boolean> {
+    return this._elementState(progress, selector, 'enabled', options, scope);
   }
 
-  async isEditable(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    return this._elementState(metadata, selector, 'editable', options, scope);
+  async isEditable(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<boolean> {
+    return this._elementState(progress, selector, 'editable', options, scope);
   }
 
-  async isChecked(metadata: CallMetadata, selector: string, options: types.QueryOnSelectorOptions = {}, scope?: dom.ElementHandle): Promise<boolean> {
-    return this._elementState(metadata, selector, 'checked', options, scope);
+  async isChecked(progress: Progress, selector: string, options: types.QueryOnSelectorOptions, scope?: dom.ElementHandle): Promise<boolean> {
+    return this._elementState(progress, selector, 'checked', options, scope);
   }
 
-  async hover(metadata: CallMetadata, selector: string, options: types.PointerActionOptions & types.PointerActionWaitOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._hover(progress, options)));
-    }, this._page._timeoutSettings.timeout(options));
+  async hover(progress: Progress, selector: string, options: types.PointerActionOptions & types.PointerActionWaitOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._hover(progress, options)));
   }
 
-  async selectOption(metadata: CallMetadata, selector: string, elements: dom.ElementHandle[], values: types.SelectOption[], options: { noWaitAfter?: boolean } & types.CommonActionOptions = {}): Promise<string[]> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._selectOption(progress, elements, values, options));
-    }, this._page._timeoutSettings.timeout(options));
+  async selectOption(progress: Progress, selector: string, elements: dom.ElementHandle[], values: types.SelectOption[], options: types.CommonActionOptions): Promise<string[]> {
+    return await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._selectOption(progress, elements, values, options));
   }
 
-  async setInputFiles(metadata: CallMetadata, selector: string, params: channels.FrameSetInputFilesParams): Promise<channels.FrameSetInputFilesResult> {
+  async setInputFiles(progress: Progress, selector: string, params: Omit<channels.FrameSetInputFilesParams, 'timeout'>): Promise<channels.FrameSetInputFilesResult> {
     const inputFileItems = await prepareFilesForUpload(this, params);
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, params.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._setInputFiles(progress, inputFileItems)));
-    }, this._page._timeoutSettings.timeout(params));
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, params.strict, true /* performActionPreChecks */, handle => handle._setInputFiles(progress, inputFileItems)));
   }
 
-  async type(metadata: CallMetadata, selector: string, text: string, options: { delay?: number } & types.TimeoutOptions & types.StrictOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._type(progress, text, options)));
-    }, this._page._timeoutSettings.timeout(options));
+  async type(progress: Progress, selector: string, text: string, options: { delay?: number } & types.StrictOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._type(progress, text, options)));
   }
 
-  async press(metadata: CallMetadata, selector: string, key: string, options: { delay?: number, noWaitAfter?: boolean } & types.TimeoutOptions & types.StrictOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performLocatorHandlersCheckpoint */, handle => handle._press(progress, key, options)));
-    }, this._page._timeoutSettings.timeout(options));
+  async press(progress: Progress, selector: string, key: string, options: { delay?: number, noWaitAfter?: boolean } & types.StrictOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, true /* performActionPreChecks */, handle => handle._press(progress, key, options)));
   }
 
-  async check(metadata: CallMetadata, selector: string, options: types.PointerActionWaitOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._setChecked(progress, true, options)));
-    }, this._page._timeoutSettings.timeout(options));
+  async check(progress: Progress, selector: string, options: types.PointerActionWaitOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._setChecked(progress, true, options)));
   }
 
-  async uncheck(metadata: CallMetadata, selector: string, options: types.PointerActionWaitOptions = {}) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performLocatorHandlersCheckpoint */, handle => handle._setChecked(progress, false, options)));
-    }, this._page._timeoutSettings.timeout(options));
+  async uncheck(progress: Progress, selector: string, options: types.PointerActionWaitOptions) {
+    return dom.assertDone(await this._retryWithProgressIfNotConnected(progress, selector, options.strict, !options.force /* performActionPreChecks */, handle => handle._setChecked(progress, false, options)));
   }
 
-  async waitForTimeout(metadata: CallMetadata, timeout: number) {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async () => {
-      await new Promise(resolve => setTimeout(resolve, timeout));
-    });
+  async waitForTimeout(progress: Progress, timeout: number) {
+    return progress.wait(timeout);
   }
 
-  async expect(metadata: CallMetadata, selector: string, options: FrameExpectParams): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }> {
-    const result = await this._expectImpl(metadata, selector, options);
-    // Library mode special case for the expect errors which are return values, not exceptions.
-    if (result.matches === options.isNot)
-      metadata.error = { error: { name: 'Expect', message: 'Expect failed' } };
-    return result;
+  async ariaSnapshot(progress: Progress, selector: string): Promise<string> {
+    return await this._retryWithProgressIfNotConnected(progress, selector, true /* strict */, true /* performActionPreChecks */, handle => progress.race(handle.ariaSnapshot()));
   }
 
-  private async _expectImpl(metadata: CallMetadata, selector: string, options: FrameExpectParams): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }> {
-    let timeout = this._page._timeoutSettings.timeout(options);
-    const start = timeout > 0 ? monotonicTime() : 0;
+  async expect(progress: Progress, selector: string | undefined, options: FrameExpectParams, timeout?: number): Promise<ExpectResult> {
+    progress.log(`${renderTitleForCall(progress.metadata)}${timeout ? ` with timeout ${timeout}ms` : ''}`);
     const lastIntermediateResult: { received?: any, isSet: boolean } = { isSet: false };
-    const resultOneShot = await this._expectInternal(metadata, selector, options, true, timeout, lastIntermediateResult);
-    if (resultOneShot.matches !== options.isNot)
-      return resultOneShot;
-    if (timeout > 0) {
-      const elapsed = monotonicTime() - start;
-      timeout -= elapsed;
-    }
-    if (timeout < 0)
-      return { matches: options.isNot, log: metadata.log, timedOut: true, received: lastIntermediateResult.received };
-    return await this._expectInternal(metadata, selector, options, false, timeout, lastIntermediateResult);
-  }
-
-  private async _expectInternal(metadata: CallMetadata, selector: string, options: FrameExpectParams, oneShot: boolean, timeout: number, lastIntermediateResult: { received?: any, isSet: boolean }): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      if (oneShot) {
-        progress.log(`${metadata.apiName}${timeout ? ` with timeout ${timeout}ms` : ''}`);
+    const fixupMetadataError = (result: ExpectResult) => {
+      // Library mode special case for the expect errors which are return values, not exceptions.
+      if (result.matches === options.isNot)
+        progress.metadata.error = { error: { name: 'Expect', message: 'Expect failed' } };
+    };
+    try {
+      // Step 1: perform locator handlers checkpoint with a specified timeout.
+      if (selector)
         progress.log(`waiting for ${this._asLocator(selector)}`);
+      await this._page.performActionPreChecks(progress);
+
+      // Step 2: perform one-shot expect check without a timeout.
+      // Supports the case of `expect(locator).toBeVisible({ timeout: 1 })`
+      // that should succeed when the locator is already visible.
+      try {
+        const resultOneShot = await this._expectInternal(progress, selector, options, lastIntermediateResult, true);
+        if (resultOneShot.matches !== options.isNot)
+          return resultOneShot;
+      } catch (e) {
+        if (this.isNonRetriableError(e))
+          throw e;
+        // Ignore any other errors from one-shot, we'll handle them during retries.
       }
-      return await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1000], async continuePolling => {
-        await this._page.performLocatorHandlersCheckpoint(progress);
-
-        const selectorInFrame = await this.selectors.resolveFrameForSelector(selector, { strict: true });
-        progress.throwIfAborted();
-
-        const { frame, info } = selectorInFrame || { frame: this, info: undefined };
-        const world = options.expression === 'to.have.property' ? 'main' : (info?.world ?? 'utility');
-        const context = await frame._context(world);
-        const injected = await context.injectedScript();
-        progress.throwIfAborted();
-
-        const { log, matches, received, missingReceived } = await injected.evaluate(async (injected, { info, options, callId }) => {
-          const elements = info ? injected.querySelectorAll(info.parsed, document) : [];
-          const isArray = options.expression === 'to.have.count' || options.expression.endsWith('.array');
-          let log = '';
-          if (isArray)
-            log = `  locator resolved to ${elements.length} element${elements.length === 1 ? '' : 's'}`;
-          else if (elements.length > 1)
-            throw injected.strictModeViolationError(info!.parsed, elements);
-          else if (elements.length)
-            log = `  locator resolved to ${injected.previewNode(elements[0])}`;
-          if (callId)
-            injected.markTargetElements(new Set(elements), callId);
-          return { log, ...await injected.expect(elements[0], options, elements) };
-        }, { info, options, callId: metadata.id });
-
-        if (log)
-          progress.log(log);
-        // Note: missingReceived avoids `unexpected value "undefined"` when element was not found.
+
+      // Step 3: auto-retry expect with increasing timeouts. Bounded by the total remaining time.
+      const result = await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1000], async continuePolling => {
+        await this._page.performActionPreChecks(progress);
+        const { matches, received } = await this._expectInternal(progress, selector, options, lastIntermediateResult, false);
         if (matches === options.isNot) {
-          lastIntermediateResult.received = missingReceived ? '<element(s) not found>' : received;
-          lastIntermediateResult.isSet = true;
-          if (!missingReceived && !Array.isArray(received))
-            progress.log(`  unexpected value "${renderUnexpectedValue(options.expression, received)}"`);
-        }
-        if (!oneShot && matches === options.isNot) {
           // Keep waiting in these cases:
           // expect(locator).conditionThatDoesNotMatch
           // expect(locator).not.conditionThatDoesMatch
@@ -1458,77 +1393,126 @@ export class Frame extends SdkObject {
         }
         return { matches, received };
       });
-    }, oneShot ? 0 : timeout).catch(e => {
-      // Q: Why not throw upon isSessionClosedError(e) as in other places?
+      fixupMetadataError(result);
+      return result;
+    } catch (e) {
+      // Q: Why not throw upon isNonRetriableError(e) as in other places?
       // A: We want user to receive a friendly message containing the last intermediate result.
       if (js.isJavaScriptErrorInEvaluate(e) || isInvalidSelectorError(e))
         throw e;
-      const result: { matches: boolean, received?: any, log?: string[], timedOut?: boolean } = { matches: options.isNot, log: metadata.log };
+      const result: ExpectResult = { matches: options.isNot, log: compressCallLog(progress.metadata.log) };
       if (lastIntermediateResult.isSet)
         result.received = lastIntermediateResult.received;
       if (e instanceof TimeoutError)
         result.timedOut = true;
+      fixupMetadataError(result);
       return result;
-    });
+    }
   }
 
-  async _waitForFunctionExpression<R>(metadata: CallMetadata, expression: string, isFunction: boolean | undefined, arg: any, options: types.WaitForFunctionOptions, world: types.World = 'main'): Promise<js.SmartHandle<R>> {
-    const controller = new ProgressController(metadata, this);
+  private async _expectInternal(progress: Progress, selector: string | undefined, options: FrameExpectParams, lastIntermediateResult: { received?: any, isSet: boolean }, noAbort: boolean) {
+    // The first expect check, a.k.a. one-shot, always finishes - even when progress is aborted.
+    const race = <T>(p: Promise<T>) => noAbort ? p : progress.race(p);
+    const selectorInFrame = selector ? await race(this.selectors.resolveFrameForSelector(selector, { strict: true })) : undefined;
+
+    const { frame, info } = selectorInFrame || { frame: this, info: undefined };
+    const world = options.expression === 'to.have.property' ? 'main' : (info?.world ?? 'utility');
+    const context = await race(frame._context(world));
+    const injected = await race(context.injectedScript());
+
+    const { log, matches, received, missingReceived } = await race(injected.evaluate(async (injected, { info, options, callId }) => {
+      const elements = info ? injected.querySelectorAll(info.parsed, document) : [];
+      if (callId)
+        injected.markTargetElements(new Set(elements), callId);
+      const isArray = options.expression === 'to.have.count' || options.expression.endsWith('.array');
+      let log = '';
+      if (isArray)
+        log = `  locator resolved to ${elements.length} element${elements.length === 1 ? '' : 's'}`;
+      else if (elements.length > 1)
+        throw injected.strictModeViolationError(info!.parsed, elements);
+      else if (elements.length)
+        log = `  locator resolved to ${injected.previewNode(elements[0])}`;
+      return { log, ...await injected.expect(elements[0], options, elements) };
+    }, { info, options, callId: progress.metadata.id }));
+
+    if (log)
+      progress.log(log);
+    // Note: missingReceived avoids `unexpected value "undefined"` when element was not found.
+    if (matches === options.isNot) {
+      lastIntermediateResult.received = missingReceived ? '<element(s) not found>' : received;
+      lastIntermediateResult.isSet = true;
+      if (!missingReceived && !Array.isArray(received))
+        progress.log(`  unexpected value "${renderUnexpectedValue(options.expression, received)}"`);
+    }
+    return { matches, received };
+  }
+
+  async waitForFunctionExpression<R>(progress: Progress, expression: string, isFunction: boolean | undefined, arg: any, options: { pollingInterval?: number }, world: types.World = 'main'): Promise<js.SmartHandle<R>> {
     if (typeof options.pollingInterval === 'number')
       assert(options.pollingInterval > 0, 'Cannot poll with non-positive interval: ' + options.pollingInterval);
     expression = js.normalizeEvaluationExpression(expression, isFunction);
-    return controller.run(async progress => {
-      return this.retryWithProgressAndTimeouts(progress, [100], async () => {
-        const context = world === 'main' ? await this._mainContext() : await this._utilityContext();
-        const injectedScript = await context.injectedScript();
-        const handle = await injectedScript.evaluateHandle((injected, { expression, isFunction, polling, arg }) => {
-          const predicate = (): R => {
-            // NOTE: make sure to use `globalThis.eval` instead of `self.eval` due to a bug with sandbox isolation
-            // in firefox.
-            // See https://bugzilla.mozilla.org/show_bug.cgi?id=1814898
-            let result = globalThis.eval(expression);
-            if (isFunction === true) {
+    return this.retryWithProgressAndTimeouts(progress, [100], async () => {
+      const context = world === 'main' ? await progress.race(this._mainContext()) : await progress.race(this._utilityContext());
+      const injectedScript = await progress.race(context.injectedScript());
+      const handle = await progress.race(injectedScript.evaluateHandle((injected, { expression, isFunction, polling, arg }) => {
+        let evaledExpression: any;
+        const predicate = (): R => {
+          // NOTE: make sure to use `globalThis.eval` instead of `self.eval` due to a bug with sandbox isolation
+          // in firefox.
+          // See https://bugzilla.mozilla.org/show_bug.cgi?id=1814898
+          let result = evaledExpression ?? globalThis.eval(expression);
+          if (isFunction === true) {
+            evaledExpression = result;
+            result = result(arg);
+          } else if (isFunction === false) {
+            result = result;
+          } else {
+            // auto detect.
+            if (typeof result === 'function') {
+              evaledExpression = result;
               result = result(arg);
-            } else if (isFunction === false) {
-              result = result;
-            } else {
-              // auto detect.
-              if (typeof result === 'function')
-                result = result(arg);
             }
-            return result;
-          };
-
-          let fulfill: (result: R) => void;
-          let reject: (error: Error) => void;
-          let aborted = false;
-          const result = new Promise<R>((f, r) => { fulfill = f; reject = r; });
-
-          const next = () => {
-            if (aborted)
+          }
+          return result;
+        };
+
+        let fulfill: (result: R) => void;
+        let reject: (error: Error) => void;
+        let aborted = false;
+        const result = new Promise<R>((f, r) => { fulfill = f; reject = r; });
+
+        const next = () => {
+          if (aborted)
+            return;
+          try {
+            const success = predicate();
+            if (success) {
+              fulfill(success);
               return;
-            try {
-              const success = predicate();
-              if (success) {
-                fulfill(success);
-                return;
-              }
-              if (typeof polling !== 'number')
-                injected.builtinRequestAnimationFrame(next);
-              else
-                injected.builtinSetTimeout(next, polling);
-            } catch (e) {
-              reject(e);
             }
-          };
-
-          next();
-          return { result, abort: () => aborted = true };
-        }, { expression, isFunction, polling: options.pollingInterval, arg });
-        progress.cleanupWhenAborted(() => handle.evaluate(h => h.abort()).catch(() => {}));
-        return handle.evaluateHandle(h => h.result);
-      });
-    }, this._page._timeoutSettings.timeout(options));
+            if (typeof polling !== 'number')
+              injected.utils.builtins.requestAnimationFrame(next);
+            else
+              injected.utils.builtins.setTimeout(next, polling);
+          } catch (e) {
+            reject(e);
+          }
+        };
+
+        next();
+        return { result, abort: () => aborted = true };
+      }, { expression, isFunction, polling: options.pollingInterval, arg }));
+      try {
+        return await progress.race(handle.evaluateHandle(h => h.result));
+      } catch (error) {
+        // Note: it is important to await "abort()" to prevent any side effects
+        // after this method returns.
+        await handle.evaluate(h => h.abort()).catch(() => {});
+        throw error;
+      } finally {
+        handle.dispose();
+      }
+    });
   }
 
   async waitForFunctionValueInUtility<R>(progress: Progress, pageFunction: js.Func1<any, R>) {
@@ -1538,7 +1522,7 @@ export class Frame extends SdkObject {
         return result;
       return JSON.stringify(result);
     }`;
-    const handle = await this._waitForFunctionExpression(serverSideCallMetadata(), expression, true, undefined, { timeout: progress.timeUntilDeadline() }, 'utility');
+    const handle = await this.waitForFunctionExpression(progress, expression, true, undefined, {}, 'utility');
     return JSON.parse(handle.rawValue()) as R;
   }
 
@@ -1547,18 +1531,18 @@ export class Frame extends SdkObject {
     return context.evaluate(() => document.title);
   }
 
-  async rafrafTimeout(timeout: number): Promise<void> {
+  async rafrafTimeout(progress: Progress, timeout: number): Promise<void> {
     if (timeout === 0)
       return;
-    const context = await this._utilityContext();
+    const context = await progress.race(this._utilityContext());
     await Promise.all([
       // wait for double raf
-      context.evaluate(() => new Promise(x => {
+      progress.race(context.evaluate(() => new Promise(x => {
         requestAnimationFrame(() => {
           requestAnimationFrame(x);
         });
-      })),
-      new Promise(fulfill => setTimeout(fulfill, timeout)),
+      }))),
+      progress.wait(timeout),
     ]);
   }
 
@@ -1575,35 +1559,30 @@ export class Frame extends SdkObject {
     this._parentFrame = null;
   }
 
-  private async _callOnElementOnceMatches<T, R>(metadata: CallMetadata, selector: string, body: ElementCallback<T, R>, taskData: T, options: types.TimeoutOptions & types.StrictOptions & { mainWorld?: boolean } = {}, scope?: dom.ElementHandle): Promise<R> {
+  private async _callOnElementOnceMatches<T, R>(progress: Progress, selector: string, body: ElementCallback<T, R>, taskData: T, options: types.StrictOptions & { mainWorld?: boolean }, scope?: dom.ElementHandle): Promise<R> {
     const callbackText = body.toString();
-    const controller = new ProgressController(metadata, this);
-    return controller.run(async progress => {
-      progress.log(`waiting for ${this._asLocator(selector)}`);
-      const promise = this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => {
-        const resolved = await this.selectors.resolveInjectedForSelector(selector, options, scope);
-        progress.throwIfAborted();
-        if (!resolved)
-          return continuePolling;
-        const { log, success, value } = await resolved.injected.evaluate((injected, { info, callbackText, taskData, callId, root }) => {
-          const callback = injected.eval(callbackText) as ElementCallback<T, R>;
-          const element = injected.querySelector(info.parsed, root || document, info.strict);
-          if (!element)
-            return { success: false };
-          const log = `  locator resolved to ${injected.previewNode(element)}`;
-          if (callId)
-            injected.markTargetElements(new Set([element]), callId);
-          return { log, success: true, value: callback(injected, element, taskData as T) };
-        }, { info: resolved.info, callbackText, taskData, callId: progress.metadata.id, root: resolved.frame === this ? scope : undefined });
-
-        if (log)
-          progress.log(log);
-        if (!success)
-          return continuePolling;
-        return value!;
-      });
-      return scope ? scope._context._raceAgainstContextDestroyed(promise) : promise;
-    }, this._page._timeoutSettings.timeout(options));
+    progress.log(`waiting for ${this._asLocator(selector)}`);
+    const promise = this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async continuePolling => {
+      const resolved = await progress.race(this.selectors.resolveInjectedForSelector(selector, options, scope));
+      if (!resolved)
+        return continuePolling;
+      const { log, success, value } = await progress.race(resolved.injected.evaluate((injected, { info, callbackText, taskData, callId, root }) => {
+        const callback = injected.eval(callbackText) as ElementCallback<T, R>;
+        const element = injected.querySelector(info.parsed, root || document, info.strict);
+        if (!element)
+          return { success: false };
+        const log = `  locator resolved to ${injected.previewNode(element)}`;
+        if (callId)
+          injected.markTargetElements(new Set([element]), callId);
+        return { log, success: true, value: callback(injected, element, taskData as T) };
+      }, { info: resolved.info, callbackText, taskData, callId: progress.metadata.id, root: resolved.frame === this ? scope : undefined }));
+      if (log)
+        progress.log(log);
+      if (!success)
+        return continuePolling;
+      return value!;
+    });
+    return scope ? scope._context._raceAgainstContextDestroyed(promise) : promise;
   }
 
   private _setContext(world: types.World, context: dom.FrameExecutionContext | null) {
@@ -1659,86 +1638,53 @@ export class Frame extends SdkObject {
     this._firedNetworkIdleSelf = false;
   }
 
-  async extendInjectedScript(source: string, arg?: any): Promise<js.JSHandle> {
+  async extendInjectedScript(source: string, arg?: any) {
     const context = await this._context('main');
     const injectedScriptHandle = await context.injectedScript();
-    return injectedScriptHandle.evaluateHandle((injectedScript, { source, arg }) => {
-      return injectedScript.extend(source, arg);
+    await injectedScriptHandle.evaluate((injectedScript, { source, arg }) => {
+      injectedScript.extend(source, arg);
     }, { source, arg });
   }
 
-  async resetStorageForCurrentOriginBestEffort(newStorage: channels.OriginStorage | undefined) {
-    const context = await this._utilityContext();
-    await context.evaluate(async ({ ls }) => {
-      // Clean DOMStorage.
-      sessionStorage.clear();
-      localStorage.clear();
-
-      // Add new DOM Storage values.
-      for (const entry of ls || [])
-        localStorage[entry.name] = entry.value;
-
-      // Clean Service Workers
-      const registrations = navigator.serviceWorker ? await navigator.serviceWorker.getRegistrations() : [];
-      await Promise.all(registrations.map(async r => {
-        // Heuristic for service workers that stalled during main script fetch or importScripts:
-        // Waiting for them to finish unregistering takes ages so we do not await.
-        // However, they will unregister immediately after fetch finishes and should not affect next page load.
-        // Unfortunately, loading next page in Chromium still takes 5 seconds waiting for
-        // some operation on this bogus service worker to finish.
-        if (!r.installing && !r.waiting && !r.active)
-          r.unregister().catch(() => {});
-        else
-          await r.unregister().catch(() => {});
-      }));
-
-      // Clean IndexedDB
-      for (const db of await indexedDB.databases?.() || []) {
-        // Do not wait for the callback - it is called on timer in Chromium (slow).
-        if (db.name)
-          indexedDB.deleteDatabase(db.name!);
-      }
-    }, { ls: newStorage?.localStorage }).catch(() => {});
-  }
-
   private _asLocator(selector: string) {
-    return asLocator(this._page.attribution.playwright.options.sdkLanguage, selector);
+    return asLocator(this._page.browserContext._browser.sdkLanguage(), selector);
   }
 }
 
 class SignalBarrier {
-  private _progress: Progress | null;
+  private _progress: Progress;
   private _protectCount = 0;
   private _promise = new ManualPromise<void>();
 
-  constructor(progress: Progress | null) {
+  constructor(progress: Progress) {
     this._progress = progress;
     this.retain();
   }
 
   waitFor(): PromiseLike<void> {
     this.release();
-    return this._promise;
+    return this._progress.race(this._promise);
   }
 
-  async addFrameNavigation(frame: Frame) {
+  addFrameNavigation(frame: Frame) {
     // Auto-wait top-level navigations only.
     if (frame.parentFrame())
       return;
     this.retain();
-    const waiter = helper.waitForEvent(null, frame, Frame.Events.InternalNavigation, (e: NavigationEvent) => {
+    const waiter = helper.waitForEvent(this._progress, frame, Frame.Events.InternalNavigation, (e: NavigationEvent) => {
       if (!e.isPublic)
         return false;
       if (!e.error && this._progress)
         this._progress.log(`  navigated to "${frame._url}"`);
       return true;
     });
-    await LongStandingScope.raceMultiple([
+    LongStandingScope.raceMultiple([
       frame._page.openScope,
       frame._detachedScope,
-    ], waiter.promise).catch(() => {});
-    waiter.dispose();
-    this.release();
+    ], waiter.promise).catch(() => {}).finally(() => {
+      waiter.dispose();
+      this.release();
+    });
   }
 
   retain() {
@@ -1761,25 +1707,7 @@ function verifyLifecycle(name: string, waitUntil: types.LifecycleEvent): types.L
 }
 
 function renderUnexpectedValue(expression: string, received: any): string {
-  if (expression === 'to.be.checked')
-    return received ? 'checked' : 'unchecked';
-  if (expression === 'to.be.unchecked')
-    return received ? 'unchecked' : 'checked';
-  if (expression === 'to.be.visible')
-    return received ? 'visible' : 'hidden';
-  if (expression === 'to.be.hidden')
-    return received ? 'hidden' : 'visible';
-  if (expression === 'to.be.enabled')
-    return received ? 'enabled' : 'disabled';
-  if (expression === 'to.be.disabled')
-    return received ? 'disabled' : 'enabled';
-  if (expression === 'to.be.editable')
-    return received ? 'editable' : 'readonly';
-  if (expression === 'to.be.readonly')
-    return received ? 'readonly' : 'editable';
-  if (expression === 'to.be.empty')
-    return received ? 'empty' : 'not empty';
-  if (expression === 'to.be.focused')
-    return received ? 'focused' : 'not focused';
+  if (expression === 'to.match.aria')
+    return received ? received.raw : received;
   return received;
 }
diff --git a/packages/playwright-core/src/server/har/harRecorder.ts b/packages/playwright-core/src/server/har/harRecorder.ts
index e623587e57fa8..7d99a377902ce 100644
--- a/packages/playwright-core/src/server/har/harRecorder.ts
+++ b/packages/playwright-core/src/server/har/harRecorder.ts
@@ -16,18 +16,20 @@
 
 import fs from 'fs';
 import path from 'path';
+
 import { Artifact } from '../artifact';
-import type { BrowserContext } from '../browserContext';
-import type * as har from '@trace/har';
 import { HarTracer } from './harTracer';
-import type { HarTracerDelegate } from './harTracer';
-import type * as channels from '@protocol/channels';
+import { createGuid } from '../utils/crypto';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
 import { yazl } from '../../zipBundle';
+
+import type { BrowserContext } from '../browserContext';
+import type { HarTracerDelegate } from './harTracer';
 import type { ZipFile } from '../../zipBundle';
-import { ManualPromise } from '../../utils/manualPromise';
-import type EventEmitter from 'events';
-import { createGuid } from '../../utils';
 import type { Page } from '../page';
+import type * as channels from '@protocol/channels';
+import type * as har from '@trace/har';
+import type EventEmitter from 'events';
 
 export class HarRecorder implements HarTracerDelegate {
   private _artifact: Artifact;
@@ -40,7 +42,7 @@ export class HarRecorder implements HarTracerDelegate {
   constructor(context: BrowserContext, page: Page | null, options: channels.RecordHarOptions) {
     this._artifact = new Artifact(context, path.join(context._browser.options.artifactsDir, `${createGuid()}.har`));
     const urlFilterRe = options.urlRegexSource !== undefined && options.urlRegexFlags !== undefined ? new RegExp(options.urlRegexSource, options.urlRegexFlags) : undefined;
-    const expectsZip = options.path.endsWith('.zip');
+    const expectsZip = !!options.zip;
     const content = options.content || (expectsZip ? 'attach' : 'embed');
     this._tracer = new HarTracer(context, page, this, {
       content,
diff --git a/packages/playwright-core/src/server/har/harTracer.ts b/packages/playwright-core/src/server/har/harTracer.ts
index cb423a144db52..dc70ad2079e5e 100644
--- a/packages/playwright-core/src/server/har/harTracer.ts
+++ b/packages/playwright-core/src/server/har/harTracer.ts
@@ -14,24 +14,23 @@
  * limitations under the License.
  */
 
+import { assert, calculateSha1, monotonicTime } from '../../utils';
+import { getPlaywrightVersion, isTextualMimeType, urlMatches } from '../../utils';
+import { eventsHelper } from '../utils/eventsHelper';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { mime } from '../../utilsBundle';
 import { BrowserContext } from '../browserContext';
-import type { APIRequestEvent, APIRequestFinishedEvent } from '../fetch';
 import { APIRequestContext } from '../fetch';
+import { Frame } from '../frames';
 import { helper } from '../helper';
 import * as network from '../network';
-import type { Worker } from '../page';
+
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type { APIRequestEvent, APIRequestFinishedEvent } from '../fetch';
 import type { Page } from '../page';
-import type * as har from '@trace/har';
-import { assert, calculateSha1, monotonicTime } from '../../utils';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import { mime } from '../../utilsBundle';
-import { ManualPromise } from '../../utils/manualPromise';
-import { getPlaywrightVersion } from '../../utils/userAgent';
-import { urlMatches } from '../../utils/network';
-import { Frame } from '../frames';
+import type { Worker } from '../page';
 import type { HeadersArray, LifecycleEvent } from '../types';
-import { isTextualMimeType } from '../../utils/isomorphic/mimeType';
+import type * as har from '@trace/har';
 
 const FALLBACK_HTTP_VERSION = 'HTTP/1.1';
 
@@ -107,6 +106,8 @@ export class HarTracer {
           eventsHelper.addEventListener(this._context, BrowserContext.Events.RequestFulfilled, request => this._onRequestFulfilled(request)),
           eventsHelper.addEventListener(this._context, BrowserContext.Events.RequestContinued, request => this._onRequestContinued(request)),
       );
+      for (const page of this._context.pages())
+        this._createPageEntryIfNeeded(page);
     }
   }
 
@@ -214,6 +215,20 @@ export class HarTracer {
     harEntry.response.statusText = event.statusMessage;
     harEntry.response.httpVersion = event.httpVersion;
     harEntry.response.redirectURL = event.headers.location || '';
+
+    if (!this._options.omitServerIP) {
+      harEntry.serverIPAddress = event.serverIPAddress;
+      harEntry._serverPort = event.serverPort;
+    }
+
+    if (!this._options.omitTiming) {
+      harEntry.timings = event.timings;
+      this._computeHarEntryTotalTime(harEntry);
+    }
+
+    if (!this._options.omitSecurityDetails)
+      harEntry._securityDetails = event.securityDetails;
+
     for (let i = 0; i < event.rawHeaders.length; i += 2) {
       harEntry.response.headers.push({
         name: event.rawHeaders[i],
@@ -232,6 +247,8 @@ export class HarTracer {
     if (contentType)
       content.mimeType = contentType;
     this._storeResponseContent(event.body, content, 'other');
+    if (!this._options.omitSizes)
+      harEntry.response.bodySize = event.body?.length ?? 0;
 
     if (this._started)
       this._delegate.onEntryFinished(harEntry);
@@ -243,7 +260,7 @@ export class HarTracer {
     const page = request.frame()?._page;
     if (this._page && page !== this._page)
       return;
-    const url = network.parsedURL(request.url());
+    const url = network.parseURL(request.url());
     if (!url)
       return;
 
@@ -275,7 +292,7 @@ export class HarTracer {
   }
 
   private _recordRequestOverrides(harEntry: har.Entry, request: network.Request) {
-    if (!request._hasOverrides() || !this._options.recordRequestOverrides)
+    if (!request.overrides() || !this._options.recordRequestOverrides)
       return;
     harEntry.request.method = request.method();
     harEntry.request.url = request.url();
@@ -438,7 +455,7 @@ export class HarTracer {
       status: response.status(),
       statusText: response.statusText(),
       httpVersion: response.httpVersion(),
-      // These are bad values that will be overwritten bellow.
+      // These are bad values that will be overwritten below.
       cookies: [],
       headers: [],
       content: {
diff --git a/packages/playwright-core/src/server/harBackend.ts b/packages/playwright-core/src/server/harBackend.ts
new file mode 100644
index 0000000000000..a8ebb2e54d7f2
--- /dev/null
+++ b/packages/playwright-core/src/server/harBackend.ts
@@ -0,0 +1,176 @@
+/**
+ * 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 { createGuid } from './utils/crypto';
+import { ZipFile } from './utils/zipFile';
+
+import type { HeadersArray } from '../utils/isomorphic/types';
+import type * as har from '@trace/har';
+
+const redirectStatus = [301, 302, 303, 307, 308];
+
+export class HarBackend {
+  readonly id: string;
+  private _harFile: har.HARFile;
+  private _zipFile: ZipFile | null;
+  private _baseDir: string | null;
+
+  constructor(harFile: har.HARFile, baseDir: string | null, zipFile: ZipFile | null) {
+    this.id = createGuid();
+    this._harFile = harFile;
+    this._baseDir = baseDir;
+    this._zipFile = zipFile;
+  }
+
+  async lookup(url: string, method: string, headers: HeadersArray, postData: Buffer | undefined, isNavigationRequest: boolean): Promise<{
+      action: 'error' | 'redirect' | 'fulfill' | 'noentry',
+      message?: string,
+      redirectURL?: string,
+      status?: number,
+      headers?: HeadersArray,
+      body?: Buffer }> {
+    let entry;
+    try {
+      entry = await this._harFindResponse(url, method, headers, postData);
+    } catch (e) {
+      return { action: 'error', message: 'HAR error: ' + e.message };
+    }
+
+    if (!entry)
+      return { action: 'noentry' };
+
+    // If navigation is being redirected, restart it with the final url to ensure the document's url changes.
+    if (entry.request.url !== url && isNavigationRequest)
+      return { action: 'redirect', redirectURL: entry.request.url };
+
+    const response = entry.response;
+    try {
+      const buffer = await this._loadContent(response.content);
+      return {
+        action: 'fulfill',
+        status: response.status,
+        headers: response.headers,
+        body: buffer,
+      };
+    } catch (e) {
+      return { action: 'error', message: e.message };
+    }
+  }
+
+  private async _loadContent(content: { text?: string, encoding?: string, _file?: string }): Promise<Buffer> {
+    const file = content._file;
+    let buffer: Buffer;
+    if (file) {
+      if (this._zipFile)
+        buffer = await this._zipFile.read(file);
+      else
+        buffer = await fs.promises.readFile(path.resolve(this._baseDir!, file));
+    } else {
+      buffer = Buffer.from(content.text || '', content.encoding === 'base64' ? 'base64' : 'utf-8');
+    }
+    return buffer;
+  }
+
+  private async _harFindResponse(url: string, method: string, headers: HeadersArray, postData: Buffer | undefined): Promise<har.Entry | undefined> {
+    const harLog = this._harFile.log;
+    const visited = new Set<har.Entry>();
+    while (true) {
+      const entries: har.Entry[] = [];
+      for (const candidate of harLog.entries) {
+        if (candidate.request.url !== url || candidate.request.method !== method)
+          continue;
+        if (method === 'POST' && postData && candidate.request.postData) {
+          const buffer = await this._loadContent(candidate.request.postData);
+          if (!buffer.equals(postData)) {
+            const boundary = multipartBoundary(headers);
+            if (!boundary)
+              continue;
+            const candidataBoundary = multipartBoundary(candidate.request.headers);
+            if (!candidataBoundary)
+              continue;
+            // Try to match multipart/form-data ignoring boundary as it changes between requests.
+            if (postData.toString().replaceAll(boundary, '') !== buffer.toString().replaceAll(candidataBoundary, ''))
+              continue;
+          }
+        }
+        entries.push(candidate);
+      }
+
+      if (!entries.length)
+        return;
+
+      let entry = entries[0];
+
+      // Disambiguate using headers - then one with most matching headers wins.
+      if (entries.length > 1) {
+        const list: { candidate: har.Entry, matchingHeaders: number }[] = [];
+        for (const candidate of entries) {
+          const matchingHeaders = countMatchingHeaders(candidate.request.headers, headers);
+          list.push({ candidate, matchingHeaders });
+        }
+        list.sort((a, b) => b.matchingHeaders - a.matchingHeaders);
+        entry = list[0].candidate;
+      }
+
+      if (visited.has(entry))
+        throw new Error(`Found redirect cycle for ${url}`);
+
+      visited.add(entry);
+
+      // Follow redirects.
+      const locationHeader = entry.response.headers.find(h => h.name.toLowerCase() === 'location');
+      if (redirectStatus.includes(entry.response.status) && locationHeader) {
+        const locationURL = new URL(locationHeader.value, url);
+        url = locationURL.toString();
+        if ((entry.response.status === 301 || entry.response.status === 302) && method === 'POST' ||
+          entry.response.status === 303 && !['GET', 'HEAD'].includes(method)) {
+          // HTTP-redirect fetch step 13 (https://fetch.spec.whatwg.org/#http-redirect-fetch)
+          method = 'GET';
+        }
+        continue;
+      }
+
+      return entry;
+    }
+  }
+
+  dispose() {
+    this._zipFile?.close();
+  }
+}
+
+function countMatchingHeaders(harHeaders: har.Header[], headers: HeadersArray): number {
+  const set = new Set(headers.map(h => h.name.toLowerCase() + ':' + h.value));
+  let matches = 0;
+  for (const h of harHeaders) {
+    if (set.has(h.name.toLowerCase() + ':' + h.value))
+      ++matches;
+  }
+  return matches;
+}
+
+function multipartBoundary(headers: HeadersArray) {
+  const contentType = headers.find(h => h.name.toLowerCase() === 'content-type');
+  if (!contentType?.value.includes('multipart/form-data'))
+    return undefined;
+  const boundary = contentType.value.match(/boundary=(\S+)/);
+  if (boundary)
+    return boundary[1];
+  return undefined;
+}
diff --git a/packages/playwright-core/src/server/helper.ts b/packages/playwright-core/src/server/helper.ts
index 5b22dfd5e1977..e1e9e146815f7 100644
--- a/packages/playwright-core/src/server/helper.ts
+++ b/packages/playwright-core/src/server/helper.ts
@@ -15,12 +15,14 @@
  * limitations under the License.
  */
 
-import type { EventEmitter } from 'events';
-import type * as types from './types';
+import { debugLogger } from './utils/debugLogger';
+import { eventsHelper } from './utils/eventsHelper';
+
 import type { Progress } from './progress';
-import { debugLogger } from '../utils/debugLogger';
-import type { RegisteredListener } from '../utils/eventsHelper';
-import { eventsHelper } from '../utils/eventsHelper';
+import type * as types from './types';
+import type { RegisteredListener } from './utils/eventsHelper';
+import type { EventEmitter } from 'events';
+
 
 const MAX_LOG_LENGTH = process.env.MAX_LOG_LENGTH ? +process.env.MAX_LOG_LENGTH : Infinity;
 
@@ -53,24 +55,20 @@ class Helper {
     return null;
   }
 
-  static waitForEvent(progress: Progress | null, emitter: EventEmitter, event: string | symbol, predicate?: Function): { promise: Promise<any>, dispose: () => void } {
+  static waitForEvent(progress: Progress, emitter: EventEmitter, event: string | symbol, predicate?: Function): { promise: Promise<any>, dispose: () => void } {
     const listeners: RegisteredListener[] = [];
-    const promise = new Promise((resolve, reject) => {
+    const dispose = () => eventsHelper.removeEventListeners(listeners);
+    const promise = progress.race(new Promise((resolve, reject) => {
       listeners.push(eventsHelper.addEventListener(emitter, event, eventArg => {
         try {
           if (predicate && !predicate(eventArg))
             return;
-          eventsHelper.removeEventListeners(listeners);
           resolve(eventArg);
         } catch (e) {
-          eventsHelper.removeEventListeners(listeners);
           reject(e);
         }
       }));
-    });
-    const dispose = () => eventsHelper.removeEventListeners(listeners);
-    if (progress)
-      progress.cleanupWhenAborted(dispose);
+    })).finally(() => dispose());
     return { promise, dispose };
   }
 
diff --git a/packages/playwright-core/src/server/index.ts b/packages/playwright-core/src/server/index.ts
index 439febfe18dea..c15944f0ae208 100644
--- a/packages/playwright-core/src/server/index.ts
+++ b/packages/playwright-core/src/server/index.ts
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-export type { Executable } from './registry';
+export type {  BrowserInfo, Executable } from './registry';
 export {
-  registry,
-  registryDirectory,
   Registry,
-  installDefaultBrowsersForNpmInstall,
   installBrowsersForNpmInstall,
+  registry,
+  registryDirectory,
   writeDockerVersion } from './registry';
 
 export { DispatcherConnection, RootDispatcher } from './dispatchers/dispatcher';
@@ -29,6 +28,4 @@ export { createPlaywright } from './playwright';
 
 export type { DispatcherScope } from './dispatchers/dispatcher';
 export type { Playwright } from './playwright';
-export { openTraceInBrowser, openTraceViewerApp, runTraceViewerApp, startTraceViewerServer, installRootRedirect } from './trace/viewer/traceViewer';
-export { serverSideCallMetadata } from './instrumentation';
-export { SocksProxy } from '../common/socksProxy';
+export { installRootRedirect, openTraceInBrowser, openTraceViewerApp, runTraceViewerApp, startTraceViewerServer } from './trace/viewer/traceViewer';
diff --git a/packages/playwright-core/src/server/injected/.eslintrc.js b/packages/playwright-core/src/server/injected/.eslintrc.js
deleted file mode 100644
index e96e2a9f804d2..0000000000000
--- a/packages/playwright-core/src/server/injected/.eslintrc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-    rules: {
-        "no-restricted-globals": [
-            "error",
-            { "name": "window" },
-            { "name": "document" },
-            { "name": "globalThis" },
-        ]
-    }
-};
diff --git a/packages/playwright-core/src/server/injected/README.md b/packages/playwright-core/src/server/injected/README.md
deleted file mode 100644
index 6f04dbcd296c3..0000000000000
--- a/packages/playwright-core/src/server/injected/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Injected
-
-This directory contains helper sources which are injected into the page.
-
-These sources are bundled with webpack to `src/generated` to be used as a compile-time source constants. See `*.webpack.config.js` for configs.
diff --git a/packages/playwright-core/src/server/input.ts b/packages/playwright-core/src/server/input.ts
index f09f91b86fab5..e88c3e09578cf 100644
--- a/packages/playwright-core/src/server/input.ts
+++ b/packages/playwright-core/src/server/input.ts
@@ -16,13 +16,15 @@
 
 import { assert } from '../utils';
 import * as keyboardLayout from './usKeyboardLayout';
-import type * as types from './types';
+import { NonRecoverableDOMError } from './dom';
+
+import type { Progress } from './progress';
 import type { Page } from './page';
-import type { CallMetadata } from './instrumentation';
+import type * as types from './types';
 
 export const keypadLocation = keyboardLayout.keypadLocation;
 
-type KeyDescription = {
+export type KeyDescription = {
   keyCode: number,
   keyCodeWithoutLocation: number,
   key: string,
@@ -35,34 +37,36 @@ type KeyDescription = {
 const kModifiers: types.KeyboardModifier[] = ['Alt', 'Control', 'Meta', 'Shift'];
 
 export interface RawKeyboard {
-  keydown(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number, autoRepeat: boolean, text: string | undefined): Promise<void>;
-  keyup(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number): Promise<void>;
-  sendText(text: string): Promise<void>;
+  keydown(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: KeyDescription, autoRepeat: boolean): Promise<void>;
+  keyup(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: KeyDescription): Promise<void>;
+  sendText(progress: Progress, text: string): Promise<void>;
 }
 
 export class Keyboard {
   private _pressedModifiers = new Set<types.KeyboardModifier>();
   private _pressedKeys = new Set<string>();
   private _raw: RawKeyboard;
+  private _page: Page;
 
-  constructor(raw: RawKeyboard) {
+  constructor(raw: RawKeyboard, page: Page) {
     this._raw = raw;
+    this._page = page;
   }
 
-  async down(key: string) {
+  async down(progress: Progress, key: string) {
     const description = this._keyDescriptionForString(key);
     const autoRepeat = this._pressedKeys.has(description.code);
     this._pressedKeys.add(description.code);
     if (kModifiers.includes(description.key as types.KeyboardModifier))
       this._pressedModifiers.add(description.key as types.KeyboardModifier);
-    const text = description.text;
-    await this._raw.keydown(this._pressedModifiers, description.code, description.keyCode, description.keyCodeWithoutLocation, description.key, description.location, autoRepeat, text);
+    await this._raw.keydown(progress, this._pressedModifiers, key, description, autoRepeat);
   }
 
   private _keyDescriptionForString(str: string): KeyDescription {
     const keyString = resolveSmartModifierString(str);
     let description = usKeyboardLayout.get(keyString);
-    assert(description, `Unknown key: "${keyString}"`);
+    if (!description)
+      throw new NonRecoverableDOMError(`Unknown key: "${keyString}"`);
     const shift = this._pressedModifiers.has('Shift');
     description = shift && description.shifted ? description.shifted : description;
 
@@ -72,32 +76,32 @@ export class Keyboard {
     return description;
   }
 
-  async up(key: string) {
+  async up(progress: Progress, key: string) {
     const description = this._keyDescriptionForString(key);
     if (kModifiers.includes(description.key as types.KeyboardModifier))
       this._pressedModifiers.delete(description.key as types.KeyboardModifier);
     this._pressedKeys.delete(description.code);
-    await this._raw.keyup(this._pressedModifiers, description.code, description.keyCode, description.keyCodeWithoutLocation, description.key, description.location);
+    await this._raw.keyup(progress, this._pressedModifiers, key, description);
   }
 
-  async insertText(text: string) {
-    await this._raw.sendText(text);
+  async insertText(progress: Progress, text: string) {
+    await this._raw.sendText(progress, text);
   }
 
-  async type(text: string, options?: { delay?: number }) {
+  async type(progress: Progress, text: string, options?: { delay?: number }) {
     const delay = (options && options.delay) || undefined;
     for (const char of text) {
       if (usKeyboardLayout.has(char)) {
-        await this.press(char, { delay });
+        await this.press(progress, char, { delay });
       } else {
         if (delay)
-          await new Promise(f => setTimeout(f, delay));
-        await this.insertText(char);
+          await progress.wait(delay);
+        await this.insertText(progress, char);
       }
     }
   }
 
-  async press(key: string, options: { delay?: number } = {}) {
+  async press(progress: Progress, key: string, options: { delay?: number } = {}) {
     function split(keyString: string) {
       const keys = [];
       let building = '';
@@ -116,16 +120,16 @@ export class Keyboard {
     const tokens = split(key);
     key = tokens[tokens.length - 1];
     for (let i = 0; i < tokens.length - 1; ++i)
-      await this.down(tokens[i]);
-    await this.down(key);
+      await this.down(progress, tokens[i]);
+    await this.down(progress, key);
     if (options.delay)
-      await new Promise(f => setTimeout(f, options.delay));
-    await this.up(key);
+      await progress.wait(options.delay);
+    await this.up(progress, key);
     for (let i = tokens.length - 2; i >= 0; --i)
-      await this.up(tokens[i]);
+      await this.up(progress, tokens[i]);
   }
 
-  async ensureModifiers(mm: types.SmartKeyboardModifier[]): Promise<types.KeyboardModifier[]> {
+  async ensureModifiers(progress: Progress, mm: types.SmartKeyboardModifier[]): Promise<types.KeyboardModifier[]> {
     const modifiers = mm.map(resolveSmartModifier);
     for (const modifier of modifiers) {
       if (!kModifiers.includes(modifier))
@@ -136,9 +140,9 @@ export class Keyboard {
       const needDown = modifiers.includes(key);
       const isDown = this._pressedModifiers.has(key);
       if (needDown && !isDown)
-        await this.down(key);
+        await this.down(progress, key);
       else if (!needDown && isDown)
-        await this.up(key);
+        await this.up(progress, key);
     }
     return restore;
   }
@@ -159,10 +163,10 @@ export function resolveSmartModifier(m: types.SmartKeyboardModifier): types.Keyb
 }
 
 export interface RawMouse {
-  move(x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void>;
-  down(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void>;
-  up(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void>;
-  wheel(x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void>;
+  move(progress: Progress, x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void>;
+  down(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void>;
+  up(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void>;
+  wheel(progress: Progress, x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void>;
 }
 
 export class Mouse {
@@ -180,9 +184,11 @@ export class Mouse {
     this._keyboard = this._page.keyboard;
   }
 
-  async move(x: number, y: number, options: { steps?: number, forClick?: boolean } = {}, metadata?: CallMetadata) {
-    if (metadata)
-      metadata.point = { x, y };
+  currentPoint() {
+    return { x: this._x, y: this._y };
+  }
+
+  async move(progress: Progress, x: number, y: number, options: { steps?: number, forClick?: boolean } = {}) {
     const { steps = 1 } = options;
     const fromX = this._x;
     const fromY = this._y;
@@ -191,58 +197,48 @@ export class Mouse {
     for (let i = 1; i <= steps; i++) {
       const middleX = fromX + (x - fromX) * (i / steps);
       const middleY = fromY + (y - fromY) * (i / steps);
-      await this._raw.move(middleX, middleY, this._lastButton, this._buttons, this._keyboard._modifiers(), !!options.forClick);
+      await this._raw.move(progress, middleX, middleY, this._lastButton, this._buttons, this._keyboard._modifiers(), !!options.forClick);
     }
   }
 
-  async down(options: { button?: types.MouseButton, clickCount?: number } = {}, metadata?: CallMetadata) {
-    if (metadata)
-      metadata.point = { x: this._x, y: this._y };
+  async down(progress: Progress, options: { button?: types.MouseButton, clickCount?: number } = {}) {
     const { button = 'left', clickCount = 1 } = options;
     this._lastButton = button;
     this._buttons.add(button);
-    await this._raw.down(this._x, this._y, this._lastButton, this._buttons, this._keyboard._modifiers(), clickCount);
+    await this._raw.down(progress, this._x, this._y, this._lastButton, this._buttons, this._keyboard._modifiers(), clickCount);
   }
 
-  async up(options: { button?: types.MouseButton, clickCount?: number } = {}, metadata?: CallMetadata) {
-    if (metadata)
-      metadata.point = { x: this._x, y: this._y };
+  async up(progress: Progress, options: { button?: types.MouseButton, clickCount?: number } = {}) {
     const { button = 'left', clickCount = 1 } = options;
     this._lastButton = 'none';
     this._buttons.delete(button);
-    await this._raw.up(this._x, this._y, button, this._buttons, this._keyboard._modifiers(), clickCount);
+    await this._raw.up(progress, this._x, this._y, button, this._buttons, this._keyboard._modifiers(), clickCount);
   }
 
-  async click(x: number, y: number, options: { delay?: number, button?: types.MouseButton, clickCount?: number } = {}, metadata?: CallMetadata) {
-    if (metadata)
-      metadata.point = { x: this._x, y: this._y };
+  async click(progress: Progress, x: number, y: number, options: { delay?: number, button?: types.MouseButton, clickCount?: number } = {}) {
     const { delay = null, clickCount = 1 } = options;
     if (delay) {
-      this.move(x, y, { forClick: true });
+      this.move(progress, x, y, { forClick: true });
       for (let cc = 1; cc <= clickCount; ++cc) {
-        await this.down({ ...options, clickCount: cc });
-        await new Promise(f => setTimeout(f, delay));
-        await this.up({ ...options, clickCount: cc });
+        await this.down(progress, { ...options, clickCount: cc });
+        await progress.wait(delay);
+        await this.up(progress, { ...options, clickCount: cc });
         if (cc < clickCount)
-          await new Promise(f => setTimeout(f, delay));
+          await progress.wait(delay);
       }
     } else {
       const promises = [];
-      promises.push(this.move(x, y, { forClick: true }));
+      promises.push(this.move(progress, x, y, { forClick: true }));
       for (let cc = 1; cc <= clickCount; ++cc) {
-        promises.push(this.down({ ...options, clickCount: cc }));
-        promises.push(this.up({ ...options, clickCount: cc }));
+        promises.push(this.down(progress, { ...options, clickCount: cc }));
+        promises.push(this.up(progress, { ...options, clickCount: cc }));
       }
       await Promise.all(promises);
     }
   }
 
-  async dblclick(x: number, y: number, options: { delay?: number, button?: types.MouseButton } = {}) {
-    await this.click(x, y, { ...options, clickCount: 2 });
-  }
-
-  async wheel(deltaX: number, deltaY: number) {
-    await this._raw.wheel(this._x, this._y, this._buttons, this._keyboard._modifiers(), deltaX, deltaY);
+  async wheel(progress: Progress, deltaX: number, deltaY: number) {
+    await this._raw.wheel(progress, this._x, this._y, this._buttons, this._keyboard._modifiers(), deltaX, deltaY);
   }
 }
 
@@ -307,7 +303,7 @@ function buildLayoutClosure(layout: keyboardLayout.KeyboardLayout): Map<string,
 }
 
 export interface RawTouchscreen {
-  tap(x: number, y: number, modifiers: Set<types.KeyboardModifier>): Promise<void>;
+  tap(progress: Progress, x: number, y: number, modifiers: Set<types.KeyboardModifier>): Promise<void>;
 }
 
 export class Touchscreen {
@@ -319,11 +315,9 @@ export class Touchscreen {
     this._page = page;
   }
 
-  async tap(x: number, y: number, metadata?: CallMetadata) {
-    if (metadata)
-      metadata.point = { x, y };
-    if (!this._page._browserContext._options.hasTouch)
+  async tap(progress: Progress, x: number, y: number) {
+    if (!this._page.browserContext._options.hasTouch)
       throw new Error('hasTouch must be enabled on the browser context before using the touchscreen.');
-    await this._raw.tap(x, y, this._page.keyboard._modifiers());
+    await this._raw.tap(progress, x, y, this._page.keyboard._modifiers());
   }
 }
diff --git a/packages/playwright-core/src/server/instrumentation.ts b/packages/playwright-core/src/server/instrumentation.ts
index b4628ac904b3e..a4e6c39a3170b 100644
--- a/packages/playwright-core/src/server/instrumentation.ts
+++ b/packages/playwright-core/src/server/instrumentation.ts
@@ -15,15 +15,21 @@
  */
 
 import { EventEmitter } from 'events';
-import { createGuid } from '../utils';
-import type { APIRequestContext } from './fetch';
+
+import { createGuid } from './utils/crypto';
+
 import type { Browser } from './browser';
 import type { BrowserContext } from './browserContext';
 import type { BrowserType } from './browserType';
-import type { ElementHandle } from './dom';
+import type { Dialog } from './dialog';
+import type { Download } from './download';
+import type { APIRequestContext } from './fetch';
 import type { Frame } from './frames';
 import type { Page } from './page';
 import type { Playwright } from './playwright';
+import type { CallMetadata } from '@protocol/callMetadata';
+export type { CallMetadata } from '@protocol/callMetadata';
+import type { LogName } from './utils/debugLogger';
 
 export type Attribution = {
   playwright: Playwright;
@@ -34,13 +40,11 @@ export type Attribution = {
   frame?: Frame;
 };
 
-import type { CallMetadata } from '@protocol/callMetadata';
-export type { CallMetadata } from '@protocol/callMetadata';
-
 export class SdkObject extends EventEmitter {
   guid: string;
   attribution: Attribution;
   instrumentation: Instrumentation;
+  logName?: LogName;
 
   constructor(parent: SdkObject, guidPrefix?: string, guid?: string) {
     super();
@@ -51,28 +55,39 @@ export class SdkObject extends EventEmitter {
   }
 }
 
+export function createRootSdkObject() {
+  const fakeParent = { attribution: {}, instrumentation: createInstrumentation() };
+  const root = new SdkObject(fakeParent as any);
+  root.guid = '';
+  return root;
+}
+
 export interface Instrumentation {
   addListener(listener: InstrumentationListener, context: BrowserContext | APIRequestContext | null): void;
   removeListener(listener: InstrumentationListener): void;
   onBeforeCall(sdkObject: SdkObject, metadata: CallMetadata): Promise<void>;
-  onBeforeInputAction(sdkObject: SdkObject, metadata: CallMetadata, element: ElementHandle): Promise<void>;
+  onBeforeInputAction(sdkObject: SdkObject, metadata: CallMetadata): Promise<void>;
   onCallLog(sdkObject: SdkObject, metadata: CallMetadata, logName: string, message: string): void;
   onAfterCall(sdkObject: SdkObject, metadata: CallMetadata): Promise<void>;
   onPageOpen(page: Page): void;
   onPageClose(page: Page): void;
   onBrowserOpen(browser: Browser): void;
   onBrowserClose(browser: Browser): void;
+  onDialog(dialog: Dialog): void;
+  onDownload(page: Page, download: Download): void;
 }
 
 export interface InstrumentationListener {
   onBeforeCall?(sdkObject: SdkObject, metadata: CallMetadata): Promise<void>;
-  onBeforeInputAction?(sdkObject: SdkObject, metadata: CallMetadata, element: ElementHandle): Promise<void>;
+  onBeforeInputAction?(sdkObject: SdkObject, metadata: CallMetadata): Promise<void>;
   onCallLog?(sdkObject: SdkObject, metadata: CallMetadata, logName: string, message: string): void;
   onAfterCall?(sdkObject: SdkObject, metadata: CallMetadata): Promise<void>;
   onPageOpen?(page: Page): void;
   onPageClose?(page: Page): void;
   onBrowserOpen?(browser: Browser): void;
   onBrowserClose?(browser: Browser): void;
+  onDialog?(dialog: Dialog): void;
+  onDownload?(page: Page, download: Download): void;
 }
 
 export function createInstrumentation(): Instrumentation {
@@ -96,16 +111,3 @@ export function createInstrumentation(): Instrumentation {
     },
   });
 }
-
-export function serverSideCallMetadata(): CallMetadata {
-  return {
-    id: '',
-    startTime: 0,
-    endTime: 0,
-    type: 'Internal',
-    method: '',
-    params: {},
-    log: [],
-    isServerSide: true,
-  };
-}
diff --git a/packages/playwright-core/src/server/isomorphic/DEPS.list b/packages/playwright-core/src/server/isomorphic/DEPS.list
deleted file mode 100644
index 813c7f12f0c96..0000000000000
--- a/packages/playwright-core/src/server/isomorphic/DEPS.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# Files in this folder are used both in Node.js and injected environments, they are isomorphic and can't have dependencies.
-[*]
-../../utils/isomorphic
\ No newline at end of file
diff --git a/packages/playwright-core/src/server/isomorphic/utilityScriptSerializers.ts b/packages/playwright-core/src/server/isomorphic/utilityScriptSerializers.ts
deleted file mode 100644
index 0f3895fac5e75..0000000000000
--- a/packages/playwright-core/src/server/isomorphic/utilityScriptSerializers.ts
+++ /dev/null
@@ -1,231 +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 type SerializedValue =
-    undefined | boolean | number | string |
-    { v: 'null' | 'undefined' | 'NaN' | 'Infinity' | '-Infinity' | '-0' } |
-    { d: string } |
-    { u: string } |
-    { bi: string } |
-    { e: { n: string, m: string, s: string } } |
-    { r: { p: string, f: string } } |
-    { a: SerializedValue[], id: number } |
-    { o: { k: string, v: SerializedValue }[], id: number } |
-    { ref: number } |
-    { h: number };
-
-export type HandleOrValue = { h: number } | { fallThrough: any };
-
-type VisitorInfo = {
-  visited: Map<object, number>;
-  lastId: number;
-};
-
-export function source() {
-
-  function isRegExp(obj: any): obj is RegExp {
-    try {
-      return obj instanceof RegExp || Object.prototype.toString.call(obj) === '[object RegExp]';
-    } catch (error) {
-      return false;
-    }
-  }
-
-  function isDate(obj: any): obj is Date {
-    try {
-      return obj instanceof Date || Object.prototype.toString.call(obj) === '[object Date]';
-    } catch (error) {
-      return false;
-    }
-  }
-
-  function isURL(obj: any): obj is URL {
-    try {
-      return obj instanceof URL || Object.prototype.toString.call(obj) === '[object URL]';
-    } catch (error) {
-      return false;
-    }
-  }
-
-  function isError(obj: any): obj is Error {
-    try {
-      return obj instanceof Error || (obj && Object.getPrototypeOf(obj)?.name === 'Error');
-    } catch (error) {
-      return false;
-    }
-  }
-
-  function parseEvaluationResultValue(value: SerializedValue, handles: any[] = [], refs: Map<number, object> = new Map()): any {
-    if (Object.is(value, undefined))
-      return undefined;
-    if (typeof value === 'object' && value) {
-      if ('ref' in value)
-        return refs.get(value.ref);
-      if ('v' in value) {
-        if (value.v === 'undefined')
-          return undefined;
-        if (value.v === 'null')
-          return null;
-        if (value.v === 'NaN')
-          return NaN;
-        if (value.v === 'Infinity')
-          return Infinity;
-        if (value.v === '-Infinity')
-          return -Infinity;
-        if (value.v === '-0')
-          return -0;
-        return undefined;
-      }
-      if ('d' in value)
-        return new Date(value.d);
-      if ('u' in value)
-        return new URL(value.u);
-      if ('bi' in value)
-        return BigInt(value.bi);
-      if ('e' in value) {
-        const error = new Error(value.e.m);
-        error.name = value.e.n;
-        error.stack = value.e.s;
-        return error;
-      }
-      if ('r' in value)
-        return new RegExp(value.r.p, value.r.f);
-      if ('a' in value) {
-        const result: any[] = [];
-        refs.set(value.id, result);
-        for (const a of value.a)
-          result.push(parseEvaluationResultValue(a, handles, refs));
-        return result;
-      }
-      if ('o' in value) {
-        const result: any = {};
-        refs.set(value.id, result);
-        for (const { k, v } of value.o)
-          result[k] = parseEvaluationResultValue(v, handles, refs);
-        return result;
-      }
-      if ('h' in value)
-        return handles[value.h];
-    }
-    return value;
-  }
-
-  function serializeAsCallArgument(value: any, handleSerializer: (value: any) => HandleOrValue): SerializedValue {
-    return serialize(value, handleSerializer, { visited: new Map(), lastId: 0 });
-  }
-
-  function serialize(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo): SerializedValue {
-    if (value && typeof value === 'object') {
-      if (typeof globalThis.Window === 'function' && value instanceof globalThis.Window)
-        return 'ref: <Window>';
-      if (typeof globalThis.Document === 'function' && value instanceof globalThis.Document)
-        return 'ref: <Document>';
-      if (typeof globalThis.Node === 'function' && value instanceof globalThis.Node)
-        return 'ref: <Node>';
-    }
-    return innerSerialize(value, handleSerializer, visitorInfo);
-  }
-
-  function innerSerialize(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo): SerializedValue {
-    const result = handleSerializer(value);
-    if ('fallThrough' in result)
-      value = result.fallThrough;
-    else
-      return result;
-
-    if (typeof value === 'symbol')
-      return { v: 'undefined' };
-    if (Object.is(value, undefined))
-      return { v: 'undefined' };
-    if (Object.is(value, null))
-      return { v: 'null' };
-    if (Object.is(value, NaN))
-      return { v: 'NaN' };
-    if (Object.is(value, Infinity))
-      return { v: 'Infinity' };
-    if (Object.is(value, -Infinity))
-      return { v: '-Infinity' };
-    if (Object.is(value, -0))
-      return { v: '-0' };
-
-    if (typeof value === 'boolean')
-      return value;
-    if (typeof value === 'number')
-      return value;
-    if (typeof value === 'string')
-      return value;
-    if (typeof value === 'bigint')
-      return { bi: value.toString() };
-
-    if (isError(value))
-      return { e: { n: value.name, m: value.message, s: value.stack || '' } };
-    if (isDate(value))
-      return { d: value.toJSON() };
-    if (isURL(value))
-      return { u: value.toJSON() };
-    if (isRegExp(value))
-      return { r: { p: value.source, f: value.flags } };
-
-    const id = visitorInfo.visited.get(value);
-    if (id)
-      return { ref: id };
-
-    if (Array.isArray(value)) {
-      const a = [];
-      const id = ++visitorInfo.lastId;
-      visitorInfo.visited.set(value, id);
-      for (let i = 0; i < value.length; ++i)
-        a.push(serialize(value[i], handleSerializer, visitorInfo));
-      return { a, id };
-    }
-
-    if (typeof value === 'object') {
-      const o: { k: string, v: SerializedValue }[] = [];
-      const id = ++visitorInfo.lastId;
-      visitorInfo.visited.set(value, id);
-      for (const name of Object.keys(value)) {
-        let item;
-        try {
-          item = value[name];
-        } catch (e) {
-          continue;  // native bindings will throw sometimes
-        }
-        if (name === 'toJSON' && typeof item === 'function')
-          o.push({ k: name, v: { o: [], id: 0 } });
-        else
-          o.push({ k: name, v: serialize(item, handleSerializer, visitorInfo) });
-      }
-
-      let jsonWrapper;
-      try {
-        // If Object.keys().length === 0 we fall back to toJSON if it exists
-        if (o.length === 0 && value.toJSON && typeof value.toJSON === 'function')
-          jsonWrapper = { value: value.toJSON() };
-      } catch (e) {
-      }
-      if (jsonWrapper)
-        return innerSerialize(jsonWrapper.value, handleSerializer, visitorInfo);
-
-      return { o, id };
-    }
-  }
-
-  return { parseEvaluationResultValue, serializeAsCallArgument };
-}
-
-const result = source();
-export const parseEvaluationResultValue = result.parseEvaluationResultValue;
-export const serializeAsCallArgument = result.serializeAsCallArgument;
diff --git a/packages/playwright-core/src/server/javascript.ts b/packages/playwright-core/src/server/javascript.ts
index 663df78b5b86e..f754fb775c8f5 100644
--- a/packages/playwright-core/src/server/javascript.ts
+++ b/packages/playwright-core/src/server/javascript.ts
@@ -14,19 +14,14 @@
  * limitations under the License.
  */
 
-import type * as dom from './dom';
-import * as utilityScriptSource from '../generated/utilityScriptSource';
-import { serializeAsCallArgument } from './isomorphic/utilityScriptSerializers';
-import type { UtilityScript } from './injected/utilityScript';
 import { SdkObject } from './instrumentation';
-import { LongStandingScope } from '../utils/manualPromise';
+import * as rawUtilityScriptSource from '../generated/utilityScriptSource';
 import { isUnderTest } from '../utils';
+import { serializeAsCallArgument } from '../utils/isomorphic/utilityScriptSerializers';
+import { LongStandingScope } from '../utils/isomorphic/manualPromise';
 
-export type ObjectId = string;
-export type RemoteObject = {
-  objectId?: ObjectId,
-  value?: any
-};
+import type * as dom from './dom';
+import type { UtilityScript } from '@injected/utilityScript';
 
 interface TaggedAsJSHandle<T> {
   __jshandle: T;
@@ -52,17 +47,14 @@ export type SmartHandle<T> = T extends Node ? dom.ElementHandle<T> : JSHandle<T>
 
 export interface ExecutionContextDelegate {
   rawEvaluateJSON(expression: string): Promise<any>;
-  rawEvaluateHandle(expression: string): Promise<ObjectId>;
-  rawCallFunctionNoReply(func: Function, ...args: any[]): void;
-  evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: JSHandle<any>, values: any[], objectIds: ObjectId[]): Promise<any>;
-  getProperties(context: ExecutionContext, objectId: ObjectId): Promise<Map<string, JSHandle>>;
-  createHandle(context: ExecutionContext, remoteObject: RemoteObject): JSHandle;
-  releaseHandle(objectId: ObjectId): Promise<void>;
-  objectCount(objectId: ObjectId): Promise<number>;
+  rawEvaluateHandle(context: ExecutionContext, expression: string): Promise<JSHandle>;
+  evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: JSHandle, values: any[], handles: JSHandle[]): Promise<any>;
+  getProperties(object: JSHandle): Promise<Map<string, JSHandle>>;
+  releaseHandle(handle: JSHandle): Promise<void>;
 }
 
 export class ExecutionContext extends SdkObject {
-  private _delegate: ExecutionContextDelegate;
+  readonly delegate: ExecutionContextDelegate;
   private _utilityScriptPromise: Promise<JSHandle> | undefined;
   private _contextDestroyedScope = new LongStandingScope();
   readonly worldNameForTest: string;
@@ -70,7 +62,7 @@ export class ExecutionContext extends SdkObject {
   constructor(parent: SdkObject, delegate: ExecutionContextDelegate, worldNameForTest: string) {
     super(parent, 'execution-context');
     this.worldNameForTest = worldNameForTest;
-    this._delegate = delegate;
+    this.delegate = delegate;
   }
 
   contextDestroyed(reason: string) {
@@ -82,31 +74,24 @@ export class ExecutionContext extends SdkObject {
   }
 
   rawEvaluateJSON(expression: string): Promise<any> {
-    return this._raceAgainstContextDestroyed(this._delegate.rawEvaluateJSON(expression));
-  }
-
-  rawEvaluateHandle(expression: string): Promise<ObjectId> {
-    return this._raceAgainstContextDestroyed(this._delegate.rawEvaluateHandle(expression));
+    return this._raceAgainstContextDestroyed(this.delegate.rawEvaluateJSON(expression));
   }
 
-  rawCallFunctionNoReply(func: Function, ...args: any[]): void {
-    this._delegate.rawCallFunctionNoReply(func, ...args);
+  rawEvaluateHandle(expression: string): Promise<JSHandle> {
+    return this._raceAgainstContextDestroyed(this.delegate.rawEvaluateHandle(this, expression));
   }
 
-  evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: JSHandle<any>, values: any[], objectIds: ObjectId[]): Promise<any> {
-    return this._raceAgainstContextDestroyed(this._delegate.evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds));
+  async evaluateWithArguments(expression: string, returnByValue: boolean, values: any[], handles: JSHandle[]): Promise<any> {
+    const utilityScript = await this.utilityScript();
+    return this._raceAgainstContextDestroyed(this.delegate.evaluateWithArguments(expression, returnByValue, utilityScript, values, handles));
   }
 
-  getProperties(context: ExecutionContext, objectId: ObjectId): Promise<Map<string, JSHandle>> {
-    return this._raceAgainstContextDestroyed(this._delegate.getProperties(context, objectId));
+  getProperties(object: JSHandle): Promise<Map<string, JSHandle>> {
+    return this._raceAgainstContextDestroyed(this.delegate.getProperties(object));
   }
 
-  createHandle(remoteObject: RemoteObject): JSHandle {
-    return this._delegate.createHandle(this, remoteObject);
-  }
-
-  releaseHandle(objectId: ObjectId): Promise<void> {
-    return this._delegate.releaseHandle(objectId);
+  releaseHandle(handle: JSHandle): Promise<void> {
+    return this.delegate.releaseHandle(handle);
   }
 
   adoptIfNeeded(handle: JSHandle): Promise<JSHandle> | null {
@@ -118,18 +103,18 @@ export class ExecutionContext extends SdkObject {
       const source = `
       (() => {
         const module = {};
-        ${utilityScriptSource.source}
-        return new (module.exports.UtilityScript())(${isUnderTest()});
+        ${rawUtilityScriptSource.source}
+        return new (module.exports.UtilityScript())(globalThis, ${isUnderTest()});
       })();`;
-      this._utilityScriptPromise = this._raceAgainstContextDestroyed(this._delegate.rawEvaluateHandle(source).then(objectId => new JSHandle(this, 'object', 'UtilityScript', objectId)));
+      this._utilityScriptPromise = this._raceAgainstContextDestroyed(this.delegate.rawEvaluateHandle(this, source))
+          .then(handle => {
+            handle._setPreview('UtilityScript');
+            return handle;
+          });
     }
     return this._utilityScriptPromise;
   }
 
-  async objectCount(objectId: ObjectId): Promise<number> {
-    return this._delegate.objectCount(objectId);
-  }
-
   async doSlowMo() {
     // overridden in FrameExecutionContext
   }
@@ -139,13 +124,13 @@ export class JSHandle<T = any> extends SdkObject {
   __jshandle: T = true as any;
   readonly _context: ExecutionContext;
   _disposed = false;
-  readonly _objectId: ObjectId | undefined;
+  readonly _objectId: string | undefined;
   readonly _value: any;
   private _objectType: string;
   protected _preview: string;
   private _previewCallback: ((preview: string) => void) | undefined;
 
-  constructor(context: ExecutionContext, type: string, preview: string | undefined, objectId?: ObjectId, value?: any) {
+  constructor(context: ExecutionContext, type: string, preview: string | undefined, objectId?: string, value?: any) {
     super(context, 'handle');
     this._context = context;
     this._objectId = objectId;
@@ -156,10 +141,6 @@ export class JSHandle<T = any> extends SdkObject {
       (globalThis as any).leakedJSHandles.set(this, new Error('Leaked JSHandle'));
   }
 
-  callFunctionNoReply(func: Function, arg: any) {
-    this._context.rawCallFunctionNoReply(func, this, arg);
-  }
-
   async evaluate<R, Arg>(pageFunction: FuncOn<T, Arg, R>, arg?: Arg): Promise<R> {
     return evaluate(this._context, true /* returnByValue */, pageFunction, this, arg);
   }
@@ -195,7 +176,7 @@ export class JSHandle<T = any> extends SdkObject {
   async getProperties(): Promise<Map<string, JSHandle>> {
     if (!this._objectId)
       return new Map();
-    return this._context.getProperties(this._context, this._objectId);
+    return this._context.getProperties(this);
   }
 
   rawValue() {
@@ -205,9 +186,8 @@ export class JSHandle<T = any> extends SdkObject {
   async jsonValue(): Promise<T> {
     if (!this._objectId)
       return this._value;
-    const utilityScript = await this._context.utilityScript();
     const script = `(utilityScript, ...args) => utilityScript.jsonValue(...args)`;
-    return this._context.evaluateWithArguments(script, true, utilityScript, [true], [this._objectId]);
+    return this._context.evaluateWithArguments(script, true, [true], [this]);
   }
 
   asElement(): dom.ElementHandle | null {
@@ -219,7 +199,7 @@ export class JSHandle<T = any> extends SdkObject {
       return;
     this._disposed = true;
     if (this._objectId) {
-      this._context.releaseHandle(this._objectId).catch(e => {});
+      this._context.releaseHandle(this).catch(e => {});
       if ((globalThis as any).leakedJSHandles)
         (globalThis as any).leakedJSHandles.delete(this);
     }
@@ -246,12 +226,6 @@ export class JSHandle<T = any> extends SdkObject {
     if (this._previewCallback)
       this._previewCallback(preview);
   }
-
-  async objectCount(): Promise<number> {
-    if (!this._objectId)
-      throw new Error('Can only count objects for a handle that points to the constructor prototype');
-    return this._context.objectCount(this._objectId);
-  }
 }
 
 export async function evaluate(context: ExecutionContext, returnByValue: boolean, pageFunction: Function | string, ...args: any[]): Promise<any> {
@@ -259,7 +233,6 @@ export async function evaluate(context: ExecutionContext, returnByValue: boolean
 }
 
 export async function evaluateExpression(context: ExecutionContext, expression: string, options: { returnByValue?: boolean, isFunction?: boolean }, ...args: any[]): Promise<any> {
-  const utilityScript = await context.utilityScript();
   expression = normalizeEvaluationExpression(expression, options.isFunction);
   const handles: (Promise<JSHandle>)[] = [];
   const toDispose: Promise<JSHandle>[] = [];
@@ -283,11 +256,11 @@ export async function evaluateExpression(context: ExecutionContext, expression:
     return { fallThrough: handle };
   }));
 
-  const utilityScriptObjectIds: ObjectId[] = [];
+  const utilityScriptObjects: JSHandle[] = [];
   for (const handle of await Promise.all(handles)) {
     if (handle._context !== context)
       throw new JavaScriptErrorInEvaluate('JSHandles can be evaluated only in the context they were created!');
-    utilityScriptObjectIds.push(handle._objectId!);
+    utilityScriptObjects.push(handle);
   }
 
   // See UtilityScript for arguments.
@@ -295,7 +268,7 @@ export async function evaluateExpression(context: ExecutionContext, expression:
 
   const script = `(utilityScript, ...args) => utilityScript.evaluate(...args)`;
   try {
-    return await context.evaluateWithArguments(script, options.returnByValue || false, utilityScript, utilityScriptValues, utilityScriptObjectIds);
+    return await context.evaluateWithArguments(script, options.returnByValue || false, utilityScriptValues, utilityScriptObjects);
   } finally {
     toDispose.map(handlePromise => handlePromise.then(handle => handle.dispose()));
   }
diff --git a/packages/playwright-core/src/server/launchApp.ts b/packages/playwright-core/src/server/launchApp.ts
index 12cb343f95a59..ee65f3ca27258 100644
--- a/packages/playwright-core/src/server/launchApp.ts
+++ b/packages/playwright-core/src/server/launchApp.ts
@@ -16,14 +16,17 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { Page } from './page';
-import { findChromiumChannel } from './registry';
-import { isUnderTest } from '../utils';
-import { serverSideCallMetadata } from './instrumentation';
-import type * as types from './types';
+
+import { isUnderTest, rewriteErrorMessage, wrapInASCIIBox } from '../utils';
+import { buildPlaywrightCLICommand, findChromiumChannelBestEffort } from './registry';
+import { registryDirectory } from './registry';
+import { ProgressController } from './progress';
+
 import type { BrowserType } from './browserType';
 import type { CRPage } from './chromium/crPage';
-import { registryDirectory } from './registry';
+import type { Page } from './page';
+import type * as types from './types';
+
 
 export async function launchApp(browserType: BrowserType, options: {
   sdkLanguage: string,
@@ -33,6 +36,7 @@ export async function launchApp(browserType: BrowserType, options: {
 }) {
   const args = [...options.persistentContextOptions?.args ?? []];
 
+  let channel = options.persistentContextOptions?.channel;
   if (browserType.name() === 'chromium') {
     args.push(
         '--app=data:text/html,',
@@ -40,17 +44,33 @@ export async function launchApp(browserType: BrowserType, options: {
         ...(options.windowPosition ? [`--window-position=${options.windowPosition.x},${options.windowPosition.y}`] : []),
         '--test-type=',
     );
+    if (!channel && !options.persistentContextOptions?.executablePath)
+      channel = findChromiumChannelBestEffort(options.sdkLanguage);
   }
 
-  const context = await browserType.launchPersistentContext(serverSideCallMetadata(), '', {
-    channel: findChromiumChannel(options.sdkLanguage),
-    noDefaultViewport: true,
-    ignoreDefaultArgs: ['--enable-automation'],
-    colorScheme: 'no-override',
-    acceptDownloads: isUnderTest() ? 'accept' : 'internal-browser-default',
-    ...options?.persistentContextOptions,
-    args,
-  });
+  const controller = new ProgressController();
+  let context;
+  try {
+    context = await controller.run(progress => browserType.launchPersistentContext(progress, '', {
+      ignoreDefaultArgs: ['--enable-automation'],
+      ...options?.persistentContextOptions,
+      channel,
+      noDefaultViewport: options.persistentContextOptions?.noDefaultViewport ?? true,
+      acceptDownloads: options?.persistentContextOptions?.acceptDownloads ?? (isUnderTest() ? 'accept' : 'internal-browser-default'),
+      colorScheme: options?.persistentContextOptions?.colorScheme ?? 'no-override',
+      args,
+    }), 0); // Deliberately no timeout for our apps.
+  } catch (error) {
+    if (channel) {
+      error = rewriteErrorMessage(error, [
+        `Failed to launch "${channel}" channel.`,
+        'Using custom channels could lead to unexpected behavior due to Enterprise policies (chrome://policy).',
+        'Install the default browser instead:',
+        wrapInASCIIBox(`${buildPlaywrightCLICommand(options.sdkLanguage, 'install')}`, 2),
+      ].join('\n'));
+    }
+    throw error;
+  }
   const [page] = context.pages();
   // Chromium on macOS opens a new tab when clicking on the dock icon.
   // See https://github.com/microsoft/playwright/issues/9434
@@ -58,7 +78,7 @@ export async function launchApp(browserType: BrowserType, options: {
     context.on('page', async (newPage: Page) => {
       if (newPage.mainFrame().url() === 'chrome://new-tab-page/') {
         await page.bringToFront();
-        await newPage.close(serverSideCallMetadata());
+        await newPage.close();
       }
     });
   }
@@ -69,7 +89,7 @@ export async function launchApp(browserType: BrowserType, options: {
 
 async function installAppIcon(page: Page) {
   const icon = await fs.promises.readFile(require.resolve('./chromium/appIcon.png'));
-  const crPage = page._delegate as CRPage;
+  const crPage = page.delegate as CRPage;
   await crPage._mainFrameSession._client.send('Browser.setDockTile', {
     image: icon.toString('base64')
   });
@@ -79,21 +99,27 @@ export async function syncLocalStorageWithSettings(page: Page, appName: string)
   if (isUnderTest())
     return;
   const settingsFile = path.join(registryDirectory, '.settings', `${appName}.json`);
-  await page.exposeBinding('_saveSerializedSettings', false, (_, settings) => {
-    fs.mkdirSync(path.dirname(settingsFile), { recursive: true });
-    fs.writeFileSync(settingsFile, settings);
-  });
 
-  const settings = await fs.promises.readFile(settingsFile, 'utf-8').catch(() => ('{}'));
-  await page.addInitScript(
-      `(${String((settings: any) => {
-        // iframes w/ snapshots, etc.
-        if (location && location.protocol === 'data:')
-          return;
-        Object.entries(settings).map(([k, v]) => localStorage[k] = v);
-        (window as any).saveSettings = () => {
-          (window as any)._saveSerializedSettings(JSON.stringify({ ...localStorage }));
-        };
-      })})(${settings});
-  `);
+  const controller = new ProgressController();
+  await controller.run(async progress => {
+    await page.exposeBinding(progress, '_saveSerializedSettings', false, (_, settings) => {
+      fs.mkdirSync(path.dirname(settingsFile), { recursive: true });
+      fs.writeFileSync(settingsFile, settings);
+    });
+
+    const settings = await fs.promises.readFile(settingsFile, 'utf-8').catch(() => ('{}'));
+    await page.addInitScript(progress,
+        `(${String((settings: any) => {
+          // iframes w/ snapshots, etc.
+          if (location && location.protocol === 'data:')
+            return;
+          if (window.top !== window)
+            return;
+          Object.entries(settings).map(([k, v]) => localStorage[k] = v);
+          (window as any).saveSettings = () => {
+            (window as any)._saveSerializedSettings(JSON.stringify({ ...localStorage }));
+          };
+        })})(${settings});
+    `);
+  });
 }
diff --git a/packages/playwright-core/src/server/localUtils.ts b/packages/playwright-core/src/server/localUtils.ts
new file mode 100644
index 0000000000000..5fb9b57d41fb0
--- /dev/null
+++ b/packages/playwright-core/src/server/localUtils.ts
@@ -0,0 +1,219 @@
+/**
+ * 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 { calculateSha1 } from './utils/crypto';
+import { HarBackend } from './harBackend';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
+import { ZipFile } from './utils/zipFile';
+import { yauzl, yazl } from '../zipBundle';
+import { serializeClientSideCallMetadata } from '../utils/isomorphic/traceUtils';
+import { assert } from '../utils/isomorphic/assert';
+import { removeFolders } from './utils/fileUtils';
+
+import type * as channels from '@protocol/channels';
+import type * as har from '@trace/har';
+import type EventEmitter from 'events';
+import type { Progress } from '@protocol/progress';
+
+
+export type StackSession = {
+  file: string;
+  writer: Promise<void>;
+  tmpDir: string | undefined;
+  callStacks: channels.ClientSideCallMetadata[];
+};
+
+export async function zip(progress: Progress, stackSessions: Map<string, StackSession>, params: channels.LocalUtilsZipParams): Promise<void> {
+  const promise = new ManualPromise<void>();
+  const zipFile = new yazl.ZipFile();
+  (zipFile as any as EventEmitter).on('error', error => promise.reject(error));
+
+  const addFile = (file: string, name: string) => {
+    try {
+      if (fs.statSync(file).isFile())
+        zipFile.addFile(file, name);
+    } catch (e) {
+    }
+  };
+
+  for (const entry of params.entries)
+    addFile(entry.value, entry.name);
+
+  // Add stacks and the sources.
+  const stackSession = params.stacksId ? stackSessions.get(params.stacksId) : undefined;
+  if (stackSession?.callStacks.length) {
+    await progress.race(stackSession.writer);
+    if (process.env.PW_LIVE_TRACE_STACKS) {
+      zipFile.addFile(stackSession.file, 'trace.stacks');
+    } else {
+      const buffer = Buffer.from(JSON.stringify(serializeClientSideCallMetadata(stackSession.callStacks)));
+      zipFile.addBuffer(buffer, 'trace.stacks');
+    }
+  }
+
+  // Collect sources from stacks.
+  if (params.includeSources) {
+    const sourceFiles = new Set<string>();
+    for (const { stack } of stackSession?.callStacks || []) {
+      if (!stack)
+        continue;
+      for (const { file } of stack)
+        sourceFiles.add(file);
+    }
+    for (const sourceFile of sourceFiles)
+      addFile(sourceFile, 'resources/src@' + await calculateSha1(sourceFile) + '.txt');
+  }
+
+  if (params.mode === 'write') {
+    // New file, just compress the entries.
+    await progress.race(fs.promises.mkdir(path.dirname(params.zipFile), { recursive: true }));
+    zipFile.end(undefined, () => {
+      zipFile.outputStream.pipe(fs.createWriteStream(params.zipFile))
+          .on('close', () => promise.resolve())
+          .on('error', error => promise.reject(error));
+    });
+    await progress.race(promise);
+    await deleteStackSession(progress, stackSessions, params.stacksId);
+    return;
+  }
+
+  // File already exists. Repack and add new entries.
+  const tempFile = params.zipFile + '.tmp';
+  await progress.race(fs.promises.rename(params.zipFile, tempFile));
+
+  yauzl.open(tempFile, (err, inZipFile) => {
+    if (err) {
+      promise.reject(err);
+      return;
+    }
+    assert(inZipFile);
+    let pendingEntries = inZipFile.entryCount;
+    inZipFile.on('entry', entry => {
+      inZipFile.openReadStream(entry, (err, readStream) => {
+        if (err) {
+          promise.reject(err);
+          return;
+        }
+        zipFile.addReadStream(readStream!, entry.fileName);
+        if (--pendingEntries === 0) {
+          zipFile.end(undefined, () => {
+            zipFile.outputStream.pipe(fs.createWriteStream(params.zipFile)).on('close', () => {
+              fs.promises.unlink(tempFile).then(() => {
+                promise.resolve();
+              }).catch(error => promise.reject(error));
+            });
+          });
+        }
+      });
+    });
+  });
+  await progress.race(promise);
+  await deleteStackSession(progress, stackSessions, params.stacksId);
+}
+
+async function deleteStackSession(progress: Progress, stackSessions: Map<string, StackSession>, stacksId?: string) {
+  const session = stacksId ? stackSessions.get(stacksId) : undefined;
+  if (!session)
+    return;
+  stackSessions.delete(stacksId!);
+  if (session.tmpDir)
+    await progress.race(removeFolders([session.tmpDir]));
+}
+
+export async function harOpen(progress: Progress, harBackends: Map<string, HarBackend>, params: channels.LocalUtilsHarOpenParams): Promise<channels.LocalUtilsHarOpenResult> {
+  let harBackend: HarBackend;
+  if (params.file.endsWith('.zip')) {
+    const zipFile = new ZipFile(params.file);
+    try {
+      const entryNames = await progress.race(zipFile.entries());
+      const harEntryName = entryNames.find(e => e.endsWith('.har'));
+      if (!harEntryName)
+        return { error: 'Specified archive does not have a .har file' };
+      const har = await progress.race(zipFile.read(harEntryName));
+      const harFile = JSON.parse(har.toString()) as har.HARFile;
+      harBackend = new HarBackend(harFile, null, zipFile);
+    } catch (error) {
+      zipFile.close();
+      throw error;
+    }
+  } else {
+    const harFile = JSON.parse(await progress.race(fs.promises.readFile(params.file, 'utf-8'))) as har.HARFile;
+    harBackend = new HarBackend(harFile, path.dirname(params.file), null);
+  }
+  harBackends.set(harBackend.id, harBackend);
+  return { harId: harBackend.id };
+}
+
+export async function harLookup(progress: Progress, harBackends: Map<string, HarBackend>, params: channels.LocalUtilsHarLookupParams): Promise<channels.LocalUtilsHarLookupResult> {
+  const harBackend = harBackends.get(params.harId);
+  if (!harBackend)
+    return { action: 'error', message: `Internal error: har was not opened` };
+  return await progress.race(harBackend.lookup(params.url, params.method, params.headers, params.postData, params.isNavigationRequest));
+}
+
+export function harClose(harBackends: Map<string, HarBackend>, params: channels.LocalUtilsHarCloseParams) {
+  const harBackend = harBackends.get(params.harId);
+  if (harBackend) {
+    harBackends.delete(harBackend.id);
+    harBackend.dispose();
+  }
+}
+
+export async function harUnzip(progress: Progress, params: channels.LocalUtilsHarUnzipParams): Promise<void> {
+  const dir = path.dirname(params.zipFile);
+  const zipFile = new ZipFile(params.zipFile);
+  try {
+    for (const entry of await progress.race(zipFile.entries())) {
+      const buffer = await progress.race(zipFile.read(entry));
+      if (entry === 'har.har')
+        await progress.race(fs.promises.writeFile(params.harFile, buffer));
+      else
+        await progress.race(fs.promises.writeFile(path.join(dir, entry), buffer));
+    }
+    await progress.race(fs.promises.unlink(params.zipFile));
+  } finally {
+    zipFile.close();
+  }
+}
+
+export async function tracingStarted(progress: Progress, stackSessions: Map<string, StackSession>, params: channels.LocalUtilsTracingStartedParams): Promise<channels.LocalUtilsTracingStartedResult> {
+  let tmpDir = undefined;
+  if (!params.tracesDir)
+    tmpDir = await progress.race(fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-tracing-')));
+  const traceStacksFile = path.join(params.tracesDir || tmpDir!, params.traceName + '.stacks');
+  stackSessions.set(traceStacksFile, { callStacks: [], file: traceStacksFile, writer: Promise.resolve(), tmpDir });
+  return { stacksId: traceStacksFile };
+}
+
+export async function traceDiscarded(progress: Progress, stackSessions: Map<string, StackSession>, params: channels.LocalUtilsTraceDiscardedParams): Promise<void> {
+  await deleteStackSession(progress, stackSessions, params.stacksId);
+}
+
+export function addStackToTracingNoReply(stackSessions: Map<string, StackSession>, params: channels.LocalUtilsAddStackToTracingNoReplyParams) {
+  for (const session of stackSessions.values()) {
+    session.callStacks.push(params.callData);
+    if (process.env.PW_LIVE_TRACE_STACKS) {
+      session.writer = session.writer.then(() => {
+        const buffer = Buffer.from(JSON.stringify(serializeClientSideCallMetadata(session.callStacks)));
+        return fs.promises.writeFile(session.file, buffer);
+      });
+    }
+  }
+}
diff --git a/packages/playwright-core/src/server/network.ts b/packages/playwright-core/src/server/network.ts
index fd62e1751b8ac..a34050b0222c0 100644
--- a/packages/playwright-core/src/server/network.ts
+++ b/packages/playwright-core/src/server/network.ts
@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
+import { assert } from '../utils';
+import { BrowserContext } from './browserContext';
+import { APIRequestContext } from './fetch';
+import { SdkObject } from './instrumentation';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
+
 import type * as contexts from './browserContext';
-import type * as pages from './page';
 import type * as frames from './frames';
+import type * as pages from './page';
 import type * as types from './types';
-import type * as channels from '@protocol/channels';
-import { assert } from '../utils';
-import { ManualPromise } from '../utils/manualPromise';
-import { SdkObject } from './instrumentation';
-import type { HeadersArray, NameValue } from '../common/types';
-import { APIRequestContext } from './fetch';
 import type { NormalizedContinueOverrides } from './types';
-import { BrowserContext } from './browserContext';
+import type { HeadersArray, NameValue } from '../utils/isomorphic/types';
+import type * as channels from '@protocol/channels';
+
 
 export function filterCookies(cookies: channels.NetworkCookie[], urls: string[]): channels.NetworkCookie[] {
   const parsedURLs = urls.map(s => new URL(s));
@@ -41,7 +43,7 @@ export function filterCookies(cookies: channels.NetworkCookie[], urls: string[])
         continue;
       if (!parsedURL.pathname.startsWith(c.path))
         continue;
-      if (parsedURL.protocol !== 'https:' && parsedURL.hostname !== 'localhost' && c.secure)
+      if (parsedURL.protocol !== 'https:' && !isLocalHostname(parsedURL.hostname) && c.secure)
         continue;
       return true;
     }
@@ -49,6 +51,10 @@ export function filterCookies(cookies: channels.NetworkCookie[], urls: string[])
   });
 }
 
+export function isLocalHostname(hostname: string): boolean {
+  return hostname === 'localhost' || hostname.endsWith('.localhost');
+}
+
 // Rollover to 5-digit year:
 // 253402300799 == Fri, 31 Dec 9999 23:59:59 +0000 (UTC)
 // 253402300800 == Sat,  1 Jan 1000 00:00:00 +0000 (UTC)
@@ -74,7 +80,7 @@ export function rewriteCookies(cookies: channels.SetNetworkCookie[]): channels.S
   });
 }
 
-export function parsedURL(url: string): URL | null {
+export function parseURL(url: string): URL | null {
   try {
     return new URL(url);
   } catch (e) {
@@ -108,6 +114,7 @@ export class Request extends SdkObject {
   private _waitForResponsePromise = new ManualPromise<Response | null>();
   _responseEndTiming = -1;
   private _overrides: NormalizedContinueOverrides | undefined;
+  private _bodySize: number | undefined;
 
   constructor(context: contexts.BrowserContext, frame: frames.Frame | null, serviceWorker: pages.Worker | null, redirectedFrom: Request | null, documentId: string | undefined,
     url: string, resourceType: string, method: string, postData: Buffer | null, headers: HeadersArray) {
@@ -134,9 +141,10 @@ export class Request extends SdkObject {
     this._waitForResponsePromise.resolve(null);
   }
 
-  _setOverrides(overrides: types.NormalizedContinueOverrides) {
-    this._overrides = overrides;
+  _applyOverrides(overrides: types.NormalizedContinueOverrides) {
+    this._overrides = { ...this._overrides, ...overrides };
     this._updateHeadersMap();
+    return this._overrides;
   }
 
   private _updateHeadersMap() {
@@ -144,8 +152,8 @@ export class Request extends SdkObject {
       this._headersMap.set(name.toLowerCase(), value);
   }
 
-  _hasOverrides() {
-    return !!this._overrides;
+  overrides() {
+    return this._overrides;
   }
 
   url(): string {
@@ -182,7 +190,7 @@ export class Request extends SdkObject {
     return this._overrides?.headers || this._rawRequestHeadersPromise;
   }
 
-  response(): PromiseLike<Response | null> {
+  response(): Promise<Response | null> {
     return this._waitForResponsePromise;
   }
 
@@ -223,8 +231,13 @@ export class Request extends SdkObject {
     };
   }
 
+  // TODO(bidi): remove once post body is available.
+  _setBodySize(size: number) {
+    this._bodySize = size;
+  }
+
   bodySize(): number {
-    return this.postDataBuffer()?.length || 0;
+    return this._bodySize || this.postDataBuffer()?.length || 0;
   }
 
   async requestHeadersSize(): Promise<number> {
@@ -243,6 +256,8 @@ export class Route extends SdkObject {
   private readonly _request: Request;
   private readonly _delegate: RouteDelegate;
   private _handled = false;
+  private _currentHandler: RouteHandler | undefined;
+  private _futureHandlers: RouteHandler[] = [];
 
   constructor(request: Request, delegate: RouteDelegate) {
     super(request._frame || request._context, 'route');
@@ -251,6 +266,19 @@ export class Route extends SdkObject {
     this._request._context.addRouteInFlight(this);
   }
 
+  handle(handlers: RouteHandler[]) {
+    this._futureHandlers = [...handlers];
+    this.continue({ isFallback: true }).catch(() => {});
+  }
+
+  async removeHandler(handler: RouteHandler) {
+    this._futureHandlers = this._futureHandlers.filter(h => h !== handler);
+    if (handler === this._currentHandler) {
+      await this.continue({ isFallback: true }).catch(() => {});
+      return;
+    }
+  }
+
   request(): Request {
     return this._request;
   }
@@ -262,10 +290,11 @@ export class Route extends SdkObject {
     this._endHandling();
   }
 
-  async redirectNavigationRequest(url: string) {
+  redirectNavigationRequest(url: string) {
     this._startHandling();
     assert(this._request.isNavigationRequest());
     this._request.frame()!.redirectNavigation(url, this._request._documentId!, this._request.headerValue('referer'));
+    this._endHandling();
   }
 
   async fulfill(overrides: channels.RouteFulfillParams) {
@@ -314,31 +343,48 @@ export class Route extends SdkObject {
   }
 
   async continue(overrides: types.NormalizedContinueOverrides) {
-    this._startHandling();
     if (overrides.url) {
       const newUrl = new URL(overrides.url);
       const oldUrl = new URL(this._request.url());
       if (oldUrl.protocol !== newUrl.protocol)
         throw new Error('New URL must have same protocol as overridden URL');
     }
-    this._request._setOverrides(overrides);
+    if (overrides.headers) {
+      overrides.headers = overrides.headers?.filter(header => {
+        const headerName = header.name.toLowerCase();
+        return headerName !== 'cookie' && headerName !== 'host';
+      });
+    }
+    overrides = this._request._applyOverrides(overrides);
+
+    const nextHandler = this._futureHandlers.shift();
+    if (nextHandler) {
+      this._currentHandler = nextHandler;
+      nextHandler(this, this._request);
+      return;
+    }
+
     if (!overrides.isFallback)
       this._request._context.emit(BrowserContext.Events.RequestContinued, this._request);
-    await this._delegate.continue(this._request, overrides);
+    this._startHandling();
+    await this._delegate.continue(overrides);
     this._endHandling();
   }
 
   private _startHandling() {
     assert(!this._handled, 'Route is already handled!');
     this._handled = true;
+    this._currentHandler = undefined;
   }
 
   private _endHandling() {
+    this._futureHandlers = [];
+    this._currentHandler = undefined;
     this._request._context.removeRouteInFlight(this);
   }
 }
 
-export type RouteHandler = (route: Route, request: Request) => boolean;
+export type RouteHandler = (route: Route, request: Request) => void;
 
 type GetResponseBodyCallback = () => Promise<Buffer>;
 
@@ -612,7 +658,7 @@ export class WebSocket extends SdkObject {
 export interface RouteDelegate {
   abort(errorCode: string): Promise<void>;
   fulfill(response: types.NormalizedFulfillResponse): Promise<void>;
-  continue(request: Request, overrides: types.NormalizedContinueOverrides): Promise<void>;
+  continue(overrides: types.NormalizedContinueOverrides): Promise<void>;
 }
 
 // List taken from https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml with extra 306 and 418 codes.
diff --git a/packages/playwright-core/src/server/page.ts b/packages/playwright-core/src/server/page.ts
index 6206681048c80..7f8f7b7163a02 100644
--- a/packages/playwright-core/src/server/page.ts
+++ b/packages/playwright-core/src/server/page.ts
@@ -15,36 +15,36 @@
  * limitations under the License.
  */
 
-import type * as dom from './dom';
+import * as accessibility from './accessibility';
+import { BrowserContext } from './browserContext';
+import { ConsoleMessage } from './console';
+import { TargetClosedError, TimeoutError } from './errors';
+import { FileChooser } from './fileChooser';
 import * as frames from './frames';
+import { helper } from './helper';
 import * as input from './input';
+import { SdkObject } from './instrumentation';
 import * as js from './javascript';
+import { Screenshotter, validateScreenshotOptions } from './screenshotter';
+import { LongStandingScope, assert, renderTitleForCall, trimStringWithEllipsis } from '../utils';
+import { asLocator } from '../utils';
+import { getComparator } from './utils/comparators';
+import { debugLogger } from './utils/debugLogger';
+import { isInvalidSelectorError } from '../utils/isomorphic/selectorParser';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
+import { parseEvaluationResultValue } from '../utils/isomorphic/utilityScriptSerializers';
+import { compressCallLog } from './callLog';
+import * as rawBindingsControllerSource from '../generated/bindingsControllerSource';
+
+import type { Artifact } from './artifact';
+import type * as dom from './dom';
 import type * as network from './network';
-import type * as channels from '@protocol/channels';
+import type { Progress } from './progress';
 import type { ScreenshotOptions } from './screenshotter';
-import { Screenshotter, validateScreenshotOptions } from './screenshotter';
-import { TimeoutSettings } from '../common/timeoutSettings';
 import type * as types from './types';
-import { BrowserContext } from './browserContext';
-import { ConsoleMessage } from './console';
-import * as accessibility from './accessibility';
-import { FileChooser } from './fileChooser';
-import type { Progress } from './progress';
-import { ProgressController } from './progress';
-import { LongStandingScope, assert, createGuid, isError } from '../utils';
-import { ManualPromise } from '../utils/manualPromise';
-import { debugLogger } from '../utils/debugLogger';
-import type { ImageComparatorOptions } from '../utils/comparators';
-import { getComparator } from '../utils/comparators';
-import type { CallMetadata } from './instrumentation';
-import { SdkObject } from './instrumentation';
-import type { Artifact } from './artifact';
-import type { TimeoutOptions } from '../common/types';
-import { isInvalidSelectorError } from '../utils/isomorphic/selectorParser';
-import { parseEvaluationResultValue, source } from './isomorphic/utilityScriptSerializers';
-import type { SerializedValue } from './isomorphic/utilityScriptSerializers';
-import { TargetClosedError } from './errors';
-import { asLocator } from '../utils/isomorphic/locatorGenerators';
+import type { ImageComparatorOptions } from './utils/comparators';
+import type * as channels from '@protocol/channels';
+import type { BindingPayload } from '@injected/bindingsController';
 
 export interface PageDelegate {
   readonly rawMouse: input.RawMouse;
@@ -54,13 +54,10 @@ export interface PageDelegate {
   reload(): Promise<void>;
   goBack(): Promise<boolean>;
   goForward(): Promise<boolean>;
-  exposeBinding(binding: PageBinding): Promise<void>;
-  removeExposedBindings(): Promise<void>;
+  requestGC(): Promise<void>;
   addInitScript(initScript: InitScript): Promise<void>;
-  removeInitScripts(): Promise<void>;
+  removeInitScripts(initScripts: InitScript[]): Promise<void>;
   closePage(runBeforeUnload: boolean): Promise<void>;
-  potentiallyUninitializedPage(): Page;
-  pageOrError(): Promise<Page | Error>;
 
   navigateFrame(frame: frames.Frame, url: string, referrer: string | undefined): Promise<frames.GotoResult>;
 
@@ -74,12 +71,10 @@ export interface PageDelegate {
   setBackgroundColor(color?: { r: number; g: number; b: number; a: number; }): Promise<void>;
   takeScreenshot(progress: Progress, format: string, documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, quality: number | undefined, fitsViewport: boolean, scale: 'css' | 'device'): Promise<Buffer>;
 
-  isElementHandle(remoteObject: any): boolean;
   adoptElementHandle<T extends Node>(handle: dom.ElementHandle<T>, to: dom.FrameExecutionContext): Promise<dom.ElementHandle<T>>;
   getContentFrame(handle: dom.ElementHandle): Promise<frames.Frame | null>;  // Only called for frame owner elements.
   getOwnerFrame(handle: dom.ElementHandle): Promise<string | null>; // Returns frameId.
-  getContentQuads(handle: dom.ElementHandle): Promise<types.Quad[] | null>;
-  setInputFiles(handle: dom.ElementHandle<HTMLInputElement>, files: types.FilePayload[]): Promise<void>;
+  getContentQuads(handle: dom.ElementHandle): Promise<types.Quad[] | null | 'error:notconnected'>;
   setInputFilePaths(handle: dom.ElementHandle<HTMLInputElement>, files: string[]): Promise<void>;
   getBoundingBox(handle: dom.ElementHandle): Promise<types.Rect | null>;
   getFrameElement(frame: frames.Frame): Promise<dom.ElementHandle>;
@@ -97,7 +92,7 @@ export interface PageDelegate {
   // Work around for asynchronously dispatched CSP errors in Firefox.
   readonly cspErrorsAsynchronousForInlineScripts?: boolean;
   // Work around for mouse position in Firefox.
-  resetForReuse(): Promise<void>;
+  resetForReuse(progress: Progress): Promise<void>;
   // WebKit hack.
   shouldToggleStyleSheetToSyncAnimations(): boolean;
 }
@@ -109,10 +104,11 @@ type EmulatedMedia = {
   colorScheme: types.ColorScheme;
   reducedMotion: types.ReducedMotion;
   forcedColors: types.ForcedColors;
+  contrast: types.Contrast;
 };
 
 type ExpectScreenshotOptions = ImageComparatorOptions & ScreenshotOptions & {
-  timeout?: number,
+  timeout: number,
   expected?: Buffer,
   isNot?: boolean,
   locator?: {
@@ -126,6 +122,7 @@ export class Page extends SdkObject {
     Close: 'close',
     Crash: 'crash',
     Download: 'download',
+    EmulatedSizeChanged: 'emulatedsizechanged',
     FileChooser: 'filechooser',
     FrameAttached: 'frameattached',
     FrameDetached: 'framedetached',
@@ -139,35 +136,32 @@ export class Page extends SdkObject {
 
   private _closedState: 'open' | 'closing' | 'closed' = 'open';
   private _closedPromise = new ManualPromise<void>();
-  private _initialized = false;
+  private _initialized: Page | Error | undefined;
+  private _initializedPromise = new ManualPromise<Page | Error>();
   private _eventsToEmitAfterInitialized: { event: string | symbol, args: any[] }[] = [];
   private _crashed = false;
   readonly openScope = new LongStandingScope();
-  readonly _browserContext: BrowserContext;
+  readonly browserContext: BrowserContext;
   readonly keyboard: input.Keyboard;
   readonly mouse: input.Mouse;
   readonly touchscreen: input.Touchscreen;
-  readonly _timeoutSettings: TimeoutSettings;
-  readonly _delegate: PageDelegate;
-  _emulatedSize: EmulatedSize | undefined;
+  readonly delegate: PageDelegate;
+  private _emulatedSize: EmulatedSize | undefined;
   private _extraHTTPHeaders: types.HeadersArray | undefined;
   private _emulatedMedia: Partial<EmulatedMedia> = {};
-  private _interceptFileChooser = false;
+  private _fileChooserInterceptedBy = new Set<any>();
   private readonly _pageBindings = new Map<string, PageBinding>();
-  readonly initScripts: InitScript[] = [];
-  readonly _screenshotter: Screenshotter;
-  readonly _frameManager: frames.FrameManager;
+  initScripts: InitScript[] = [];
+  readonly screenshotter: Screenshotter;
+  readonly frameManager: frames.FrameManager;
   readonly accessibility: accessibility.Accessibility;
   private _workers = new Map<string, Worker>();
   readonly pdf: ((options: channels.PagePdfParams) => Promise<Buffer>) | undefined;
   readonly coverage: any;
-  _clientRequestInterceptor: network.RouteHandler | undefined;
-  _serverRequestInterceptor: network.RouteHandler | undefined;
-  _ownedContext: BrowserContext | undefined;
-  _pageIsError: Error | undefined;
-  _video: Artifact | null = null;
-  _opener: Page | undefined;
-  private _isServerSideOnly = false;
+  readonly requestInterceptors: network.RouteHandler[] = [];
+  video: Artifact | null = null;
+  private _opener: Page | undefined;
+  readonly isStorageStatePage: boolean;
   private _locatorHandlers = new Map<number, { selector: string, noWaitAfter?: boolean, resolved?: ManualPromise<void> }>();
   private _lastLocatorHandlerUid = 0;
   private _locatorHandlerRunningCounter = 0;
@@ -175,46 +169,48 @@ export class Page extends SdkObject {
   // Aiming at 25 fps by default - each frame is 40ms, but we give some slack with 35ms.
   // When throttling for tracing, 200ms between frames, except for 10 frames around the action.
   private _frameThrottler = new FrameThrottler(10, 35, 200);
-  _closeReason: string | undefined;
+  closeReason: string | undefined;
+  lastSnapshotFrameIds: string[] = [];
 
   constructor(delegate: PageDelegate, browserContext: BrowserContext) {
     super(browserContext, 'page');
     this.attribution.page = this;
-    this._delegate = delegate;
-    this._browserContext = browserContext;
+    this.delegate = delegate;
+    this.browserContext = browserContext;
     this.accessibility = new accessibility.Accessibility(delegate.getAccessibilityTree.bind(delegate));
-    this.keyboard = new input.Keyboard(delegate.rawKeyboard);
+    this.keyboard = new input.Keyboard(delegate.rawKeyboard, this);
     this.mouse = new input.Mouse(delegate.rawMouse, this);
     this.touchscreen = new input.Touchscreen(delegate.rawTouchscreen, this);
-    this._timeoutSettings = new TimeoutSettings(browserContext._timeoutSettings);
-    this._screenshotter = new Screenshotter(this);
-    this._frameManager = new frames.FrameManager(this);
+    this.screenshotter = new Screenshotter(this);
+    this.frameManager = new frames.FrameManager(this);
     if (delegate.pdf)
       this.pdf = delegate.pdf.bind(delegate);
     this.coverage = delegate.coverage ? delegate.coverage() : null;
+    this.isStorageStatePage = browserContext.isCreatingStorageStatePage();
   }
 
-  async initOpener(opener: PageDelegate | null) {
-    if (!opener)
-      return;
-    const openerPage = await opener.pageOrError();
-    if (openerPage instanceof Page && !openerPage.isClosed())
-      this._opener = openerPage;
+  async reportAsNew(opener: Page | undefined, error: Error | undefined = undefined, contextEvent: string = BrowserContext.Events.Page) {
+    if (opener) {
+      const openerPageOrError = await opener.waitForInitializedOrError();
+      if (openerPageOrError instanceof Page && !openerPageOrError.isClosed())
+        this._opener = openerPageOrError;
+    }
+    this._markInitialized(error, contextEvent);
   }
 
-  reportAsNew(error: Error | undefined = undefined, contextEvent: string = BrowserContext.Events.Page) {
+  private _markInitialized(error: Error | undefined = undefined, contextEvent: string = BrowserContext.Events.Page) {
     if (error) {
       // Initialization error could have happened because of
       // context/browser closure. Just ignore the page.
-      if (this._browserContext.isClosingOrClosed())
+      if (this.browserContext.isClosingOrClosed())
         return;
-      this._setIsError(error);
+      this.frameManager.createDummyMainFrameIfNeeded();
     }
-    this._initialized = true;
+    this._initialized = error || this;
     this.emitOnContext(contextEvent, this);
 
     for (const { event, args } of this._eventsToEmitAfterInitialized)
-      this._browserContext.emit(event, ...args);
+      this.browserContext.emit(event, ...args);
     this._eventsToEmitAfterInitialized = [];
 
     // It may happen that page initialization finishes after Close event has already been sent,
@@ -224,59 +220,57 @@ export class Page extends SdkObject {
       this.emit(Page.Events.Close);
     else
       this.instrumentation.onPageOpen(this);
+
+    // Note: it is important to resolve _initializedPromise at the end,
+    // so that anyone who awaits waitForInitializedOrError got a ready and reported page.
+    this._initializedPromise.resolve(this._initialized);
   }
 
-  initializedOrUndefined() {
+  initializedOrUndefined(): Page | undefined {
     return this._initialized ? this : undefined;
   }
 
+  waitForInitializedOrError(): Promise<Page | Error> {
+    return this._initializedPromise;
+  }
+
   emitOnContext(event: string | symbol, ...args: any[]) {
-    if (this._isServerSideOnly)
+    if (this.isStorageStatePage)
       return;
-    this._browserContext.emit(event, ...args);
+    this.browserContext.emit(event, ...args);
   }
 
   emitOnContextOnceInitialized(event: string | symbol, ...args: any[]) {
-    if (this._isServerSideOnly)
+    if (this.isStorageStatePage)
       return;
     // Some events, like console messages, may come before page is ready.
     // In this case, postpone the event until page is initialized,
     // and dispatch it to the client later, either on the live Page,
     // or on the "errored" Page.
     if (this._initialized)
-      this._browserContext.emit(event, ...args);
+      this.browserContext.emit(event, ...args);
     else
       this._eventsToEmitAfterInitialized.push({ event, args });
   }
 
-  async resetForReuse(metadata: CallMetadata) {
-    this.setDefaultNavigationTimeout(undefined);
-    this.setDefaultTimeout(undefined);
-    this._locatorHandlers.clear();
-
-    await this._removeExposedBindings();
-    await this._removeInitScripts();
-    await this.setClientRequestInterceptor(undefined);
-    await this._setServerRequestInterceptor(undefined);
-    await this.setFileChooserIntercepted(false);
+  async resetForReuse(progress: Progress) {
     // Re-navigate once init scripts are gone.
-    await this.mainFrame().goto(metadata, 'about:blank');
+    await this.mainFrame().gotoImpl(progress, 'about:blank', {});
+
     this._emulatedSize = undefined;
     this._emulatedMedia = {};
     this._extraHTTPHeaders = undefined;
-    this._interceptFileChooser = false;
-
     await Promise.all([
-      this._delegate.updateEmulatedViewportSize(),
-      this._delegate.updateEmulateMedia(),
-      this._delegate.updateFileChooserInterception(),
+      this.delegate.updateEmulatedViewportSize(),
+      this.delegate.updateEmulateMedia(),
+      this.delegate.updateExtraHTTPHeaders(),
     ]);
 
-    await this._delegate.resetForReuse();
+    await this.delegate.resetForReuse(progress);
   }
 
   _didClose() {
-    this._frameManager.dispose();
+    this.frameManager.dispose();
     this._frameThrottler.dispose();
     assert(this._closedState !== 'closed', 'Page closed twice');
     this._closedState = 'closed';
@@ -287,7 +281,7 @@ export class Page extends SdkObject {
   }
 
   _didCrash() {
-    this._frameManager.dispose();
+    this.frameManager.dispose();
     this._frameThrottler.dispose();
     this.emit(Page.Events.Crash);
     this._crashed = true;
@@ -311,66 +305,71 @@ export class Page extends SdkObject {
     this.emit(Page.Events.FileChooser, fileChooser);
   }
 
-  context(): BrowserContext {
-    return this._browserContext;
-  }
-
   opener(): Page | undefined {
     return this._opener;
   }
 
   mainFrame(): frames.Frame {
-    return this._frameManager.mainFrame();
+    return this.frameManager.mainFrame();
   }
 
   frames(): frames.Frame[] {
-    return this._frameManager.frames();
-  }
-
-  setDefaultNavigationTimeout(timeout: number | undefined) {
-    this._timeoutSettings.setDefaultNavigationTimeout(timeout);
-  }
-
-  setDefaultTimeout(timeout: number | undefined) {
-    this._timeoutSettings.setDefaultTimeout(timeout);
+    return this.frameManager.frames();
   }
 
-  async exposeBinding(name: string, needsHandle: boolean, playwrightBinding: frames.FunctionWithSource) {
+  async exposeBinding(progress: Progress, name: string, needsHandle: boolean, playwrightBinding: frames.FunctionWithSource): Promise<PageBinding> {
     if (this._pageBindings.has(name))
       throw new Error(`Function "${name}" has been already registered`);
-    if (this._browserContext._pageBindings.has(name))
+    if (this.browserContext._pageBindings.has(name))
       throw new Error(`Function "${name}" has been already registered in the browser context`);
+    await progress.race(this.browserContext.exposePlaywrightBindingIfNeeded());
     const binding = new PageBinding(name, playwrightBinding, needsHandle);
     this._pageBindings.set(name, binding);
-    await this._delegate.exposeBinding(binding);
+    try {
+      await progress.race(this.delegate.addInitScript(binding.initScript));
+      await progress.race(this.safeNonStallingEvaluateInAllFrames(binding.initScript.source, 'main'));
+      return binding;
+    } catch (error) {
+      this._pageBindings.delete(name);
+      throw error;
+    }
   }
 
-  async _removeExposedBindings() {
-    for (const key of this._pageBindings.keys()) {
-      if (!key.startsWith('__pw'))
-        this._pageBindings.delete(key);
-    }
-    await this._delegate.removeExposedBindings();
+  async removeExposedBindings(bindings: PageBinding[]) {
+    bindings = bindings.filter(binding => this._pageBindings.get(binding.name) === binding);
+    for (const binding of bindings)
+      this._pageBindings.delete(binding.name);
+    await this.delegate.removeInitScripts(bindings.map(binding => binding.initScript));
+    const cleanup = bindings.map(binding => `{ ${binding.cleanupScript} };\n`).join('');
+    await this.safeNonStallingEvaluateInAllFrames(cleanup, 'main');
   }
 
-  setExtraHTTPHeaders(headers: types.HeadersArray) {
-    this._extraHTTPHeaders = headers;
-    return this._delegate.updateExtraHTTPHeaders();
+  async setExtraHTTPHeaders(progress: Progress, headers: types.HeadersArray) {
+    const oldHeaders = this._extraHTTPHeaders;
+    try {
+      this._extraHTTPHeaders = headers;
+      await progress.race(this.delegate.updateExtraHTTPHeaders());
+    } catch (error) {
+      this._extraHTTPHeaders = oldHeaders;
+      // Note: no await, headers will be updated in the background as soon as possible.
+      this.delegate.updateExtraHTTPHeaders().catch(() => {});
+      throw error;
+    }
   }
 
   extraHTTPHeaders(): types.HeadersArray | undefined {
     return this._extraHTTPHeaders;
   }
 
-  async _onBindingCalled(payload: string, context: dom.FrameExecutionContext) {
+  async onBindingCalled(payload: string, context: dom.FrameExecutionContext) {
     if (this._closedState === 'closed')
       return;
     await PageBinding.dispatch(this, payload, context);
   }
 
-  _addConsoleMessage(type: string, args: js.JSHandle[], location: types.ConsoleMessageLocation, text?: string) {
+  addConsoleMessage(type: string, args: js.JSHandle[], location: types.ConsoleMessageLocation, text?: string) {
     const message = new ConsoleMessage(this, type, text, args, location);
-    const intercepted = this._frameManager.interceptConsoleMessage(message);
+    const intercepted = this.frameManager.interceptConsoleMessage(message);
     if (intercepted) {
       args.forEach(arg => arg.dispose());
       return;
@@ -378,23 +377,21 @@ export class Page extends SdkObject {
     this.emitOnContextOnceInitialized(BrowserContext.Events.Console, message);
   }
 
-  async reload(metadata: CallMetadata, options: types.NavigateOptions): Promise<network.Response | null> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(progress => this.mainFrame().raceNavigationAction(progress, options, async () => {
+  async reload(progress: Progress, options: types.NavigateOptions): Promise<network.Response | null> {
+    return this.mainFrame().raceNavigationAction(progress, async () => {
       // Note: waitForNavigation may fail before we get response to reload(),
       // so we should await it immediately.
       const [response] = await Promise.all([
         // Reload must be a new document, and should not be confused with a stray pushState.
         this.mainFrame()._waitForNavigation(progress, true /* requiresNewDocument */, options),
-        this._delegate.reload(),
+        progress.race(this.delegate.reload()),
       ]);
       return response;
-    }), this._timeoutSettings.navigationTimeout(options));
+    });
   }
 
-  async goBack(metadata: CallMetadata, options: types.NavigateOptions): Promise<network.Response | null> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(progress => this.mainFrame().raceNavigationAction(progress, options, async () => {
+  async goBack(progress: Progress, options: types.NavigateOptions): Promise<network.Response | null> {
+    return this.mainFrame().raceNavigationAction(progress, async () => {
       // Note: waitForNavigation may fail before we get response to goBack,
       // so we should catch it immediately.
       let error: Error | undefined;
@@ -402,19 +399,20 @@ export class Page extends SdkObject {
         error = e;
         return null;
       });
-      const result = await this._delegate.goBack();
-      if (!result)
+      const result = await progress.race(this.delegate.goBack());
+      if (!result) {
+        waitPromise.catch(() => {}); // Avoid an unhandled rejection.
         return null;
+      }
       const response = await waitPromise;
       if (error)
         throw error;
       return response;
-    }), this._timeoutSettings.navigationTimeout(options));
+    });
   }
 
-  async goForward(metadata: CallMetadata, options: types.NavigateOptions): Promise<network.Response | null> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(progress => this.mainFrame().raceNavigationAction(progress, options, async () => {
+  async goForward(progress: Progress, options: types.NavigateOptions): Promise<network.Response | null> {
+    return this.mainFrame().raceNavigationAction(progress, async () => {
       // Note: waitForNavigation may fail before we get response to goForward,
       // so we should catch it immediately.
       let error: Error | undefined;
@@ -422,14 +420,20 @@ export class Page extends SdkObject {
         error = e;
         return null;
       });
-      const result = await this._delegate.goForward();
-      if (!result)
+      const result = await progress.race(this.delegate.goForward());
+      if (!result) {
+        waitPromise.catch(() => {}); // Avoid an unhandled rejection.
         return null;
+      }
       const response = await waitPromise;
       if (error)
         throw error;
       return response;
-    }), this._timeoutSettings.navigationTimeout(options));
+    });
+  }
+
+  requestGC(): Promise<void> {
+    return this.delegate.requestGC();
   }
 
   registerLocatorHandler(selector: string, noWaitAfter: boolean | undefined) {
@@ -452,38 +456,60 @@ export class Page extends SdkObject {
     this._locatorHandlers.delete(uid);
   }
 
-  async performLocatorHandlersCheckpoint(progress: Progress) {
+  async performActionPreChecks(progress: Progress) {
+    await this._performWaitForNavigationCheck(progress);
+    await this._performLocatorHandlersCheckpoint(progress);
+    // Wait once again, just in case a locator handler caused a navigation.
+    await this._performWaitForNavigationCheck(progress);
+  }
+
+  private async _performWaitForNavigationCheck(progress: Progress) {
+    const mainFrame = this.frameManager.mainFrame();
+    if (!mainFrame || !mainFrame.pendingDocument())
+      return;
+    const url = mainFrame.pendingDocument()?.request?.url();
+    const toUrl = url ? `" ${trimStringWithEllipsis(url, 200)}"` : '';
+    progress.log(`  waiting for${toUrl} navigation to finish...`);
+    await helper.waitForEvent(progress, mainFrame, frames.Frame.Events.InternalNavigation, (e: frames.NavigationEvent) => {
+      if (!e.isPublic)
+        return false;
+      if (!e.error)
+        progress.log(`  navigated to "${trimStringWithEllipsis(mainFrame.url(), 200)}"`);
+      return true;
+    }).promise;
+  }
+
+  private async _performLocatorHandlersCheckpoint(progress: Progress) {
     // Do not run locator handlers from inside locator handler callbacks to avoid deadlocks.
     if (this._locatorHandlerRunningCounter)
       return;
     for (const [uid, handler] of this._locatorHandlers) {
       if (!handler.resolved) {
-        if (await this.mainFrame().isVisibleInternal(handler.selector, { strict: true })) {
+        if (await this.mainFrame().isVisibleInternal(progress, handler.selector, { strict: true })) {
           handler.resolved = new ManualPromise();
           this.emit(Page.Events.LocatorHandlerTriggered, uid);
         }
       }
       if (handler.resolved) {
         ++this._locatorHandlerRunningCounter;
-        progress.log(`  found ${asLocator(this.attribution.playwright.options.sdkLanguage, handler.selector)}, intercepting action to run the handler`);
+        progress.log(`  found ${asLocator(this.browserContext._browser.sdkLanguage(), handler.selector)}, intercepting action to run the handler`);
         const promise = handler.resolved.then(async () => {
-          progress.throwIfAborted();
           if (!handler.noWaitAfter) {
-            progress.log(`  locator handler has finished, waiting for ${asLocator(this.attribution.playwright.options.sdkLanguage, handler.selector)} to be hidden`);
-            await this.mainFrame().waitForSelectorInternal(progress, handler.selector, { state: 'hidden' });
+            progress.log(`  locator handler has finished, waiting for ${asLocator(this.browserContext._browser.sdkLanguage(), handler.selector)} to be hidden`);
+            await this.mainFrame().waitForSelector(progress, handler.selector, false, { state: 'hidden' });
           } else {
             progress.log(`  locator handler has finished`);
           }
         });
-        await this.openScope.race(promise).finally(() => --this._locatorHandlerRunningCounter);
-        // Avoid side-effects after long-running operation.
-        progress.throwIfAborted();
+        await progress.race(this.openScope.race(promise)).finally(() => --this._locatorHandlerRunningCounter);
         progress.log(`  interception handler has finished, continuing`);
       }
     }
   }
 
-  async emulateMedia(options: Partial<EmulatedMedia>) {
+  async emulateMedia(progress: Progress, options: Partial<EmulatedMedia>) {
+    const oldEmulatedMedia = { ...this._emulatedMedia };
+
     if (options.media !== undefined)
       this._emulatedMedia.media = options.media;
     if (options.colorScheme !== undefined)
@@ -492,77 +518,115 @@ export class Page extends SdkObject {
       this._emulatedMedia.reducedMotion = options.reducedMotion;
     if (options.forcedColors !== undefined)
       this._emulatedMedia.forcedColors = options.forcedColors;
+    if (options.contrast !== undefined)
+      this._emulatedMedia.contrast = options.contrast;
 
-    await this._delegate.updateEmulateMedia();
+    try {
+      await progress.race(this.delegate.updateEmulateMedia());
+    } catch (error) {
+      this._emulatedMedia = oldEmulatedMedia;
+      // Note: no await, emulated media will be updated in the background as soon as possible.
+      this.delegate.updateEmulateMedia().catch(() => {});
+      throw error;
+    }
   }
 
   emulatedMedia(): EmulatedMedia {
-    const contextOptions = this._browserContext._options;
+    const contextOptions = this.browserContext._options;
     return {
       media: this._emulatedMedia.media || 'no-override',
       colorScheme: this._emulatedMedia.colorScheme !== undefined ? this._emulatedMedia.colorScheme : contextOptions.colorScheme ?? 'light',
       reducedMotion: this._emulatedMedia.reducedMotion !== undefined ? this._emulatedMedia.reducedMotion : contextOptions.reducedMotion ?? 'no-preference',
       forcedColors: this._emulatedMedia.forcedColors !== undefined ? this._emulatedMedia.forcedColors : contextOptions.forcedColors ?? 'none',
+      contrast: this._emulatedMedia.contrast !== undefined ? this._emulatedMedia.contrast : contextOptions.contrast ?? 'no-preference',
     };
   }
 
-  async setViewportSize(viewportSize: types.Size) {
-    this._emulatedSize = { viewport: { ...viewportSize }, screen: { ...viewportSize } };
-    await this._delegate.updateEmulatedViewportSize();
+  async setViewportSize(progress: Progress, viewportSize: types.Size) {
+    const oldEmulatedSize = this._emulatedSize;
+    try {
+      this._setEmulatedSize({ viewport: { ...viewportSize }, screen: { ...viewportSize } });
+      await progress.race(this.delegate.updateEmulatedViewportSize());
+    } catch (error) {
+      this._emulatedSize = oldEmulatedSize;
+      // Note: no await, emulated size will be updated in the background as soon as possible.
+      this.delegate.updateEmulatedViewportSize().catch(() => {});
+      throw error;
+    }
+  }
+
+  setEmulatedSizeFromWindowOpen(emulatedSize: EmulatedSize) {
+    this._setEmulatedSize(emulatedSize);
   }
 
-  viewportSize(): types.Size | null {
-    return this.emulatedSize()?.viewport || null;
+  private _setEmulatedSize(emulatedSize: EmulatedSize) {
+    this._emulatedSize = emulatedSize;
+    this.emit(Page.Events.EmulatedSizeChanged);
   }
 
-  emulatedSize(): EmulatedSize | null {
+  emulatedSize(): EmulatedSize | undefined {
     if (this._emulatedSize)
       return this._emulatedSize;
-    const contextOptions = this._browserContext._options;
-    return contextOptions.viewport ? { viewport: contextOptions.viewport, screen: contextOptions.screen || contextOptions.viewport } : null;
+    const contextOptions = this.browserContext._options;
+    return contextOptions.viewport ? { viewport: contextOptions.viewport, screen: contextOptions.screen || contextOptions.viewport } : undefined;
   }
 
   async bringToFront(): Promise<void> {
-    await this._delegate.bringToFront();
+    await this.delegate.bringToFront();
   }
 
-  async addInitScript(source: string) {
+  async addInitScript(progress: Progress, source: string) {
     const initScript = new InitScript(source);
     this.initScripts.push(initScript);
-    await this._delegate.addInitScript(initScript);
+    try {
+      await progress.race(this.delegate.addInitScript(initScript));
+    } catch (error) {
+      // Note: no await, script will be removed in the background as soon as possible.
+      this.removeInitScripts([initScript]).catch(() => {});
+      throw error;
+    }
+    return initScript;
   }
 
-  async _removeInitScripts() {
-    this.initScripts.splice(0, this.initScripts.length);
-    await this._delegate.removeInitScripts();
+  async removeInitScripts(initScripts: InitScript[]) {
+    const set = new Set(initScripts);
+    this.initScripts = this.initScripts.filter(script => !set.has(script));
+    await this.delegate.removeInitScripts(initScripts);
   }
 
   needsRequestInterception(): boolean {
-    return !!this._clientRequestInterceptor || !!this._serverRequestInterceptor || !!this._browserContext._requestInterceptor;
+    return this.requestInterceptors.length > 0 || this.browserContext.requestInterceptors.length > 0;
   }
 
-  async setClientRequestInterceptor(handler: network.RouteHandler | undefined): Promise<void> {
-    this._clientRequestInterceptor = handler;
-    await this._delegate.updateRequestInterception();
+  async addRequestInterceptor(progress: Progress, handler: network.RouteHandler, prepend?: 'prepend'): Promise<void> {
+    // Note: progress is intentionally ignored, because this operation is not cancellable and should not block in the browser anyway.
+    if (prepend)
+      this.requestInterceptors.unshift(handler);
+    else
+      this.requestInterceptors.push(handler);
+    await this.delegate.updateRequestInterception();
   }
 
-  async _setServerRequestInterceptor(handler: network.RouteHandler | undefined): Promise<void> {
-    this._serverRequestInterceptor = handler;
-    await this._delegate.updateRequestInterception();
+  async removeRequestInterceptor(handler: network.RouteHandler): Promise<void> {
+    const index = this.requestInterceptors.indexOf(handler);
+    if (index === -1)
+      return;
+    this.requestInterceptors.splice(index, 1);
+    await this.browserContext.notifyRoutesInFlightAboutRemovedHandler(handler);
+    await this.delegate.updateRequestInterception();
   }
 
-  async expectScreenshot(metadata: CallMetadata, options: ExpectScreenshotOptions = {}): Promise<{ actual?: Buffer, previous?: Buffer, diff?: Buffer, errorMessage?: string, log?: string[] }> {
+  async expectScreenshot(progress: Progress, options: ExpectScreenshotOptions): Promise<{ actual?: Buffer, previous?: Buffer, diff?: Buffer, errorMessage?: string, log?: string[], timedOut?: boolean }> {
     const locator = options.locator;
-    const rafrafScreenshot = locator ? async (progress: Progress, timeout: number) => {
+    const rafrafScreenshot = locator ? async (timeout: number) => {
       return await locator.frame.rafrafTimeoutScreenshotElementWithProgress(progress, locator.selector, timeout, options || {});
-    } : async (progress: Progress, timeout: number) => {
-      await this.performLocatorHandlersCheckpoint(progress);
-      await this.mainFrame().rafrafTimeout(timeout);
-      return await this._screenshotter.screenshotPage(progress, options || {});
+    } : async (timeout: number) => {
+      await this.performActionPreChecks(progress);
+      await this.mainFrame().rafrafTimeout(progress, timeout);
+      return await this.screenshotter.screenshotPage(progress, options || {});
     };
 
     const comparator = getComparator('image/png');
-    const controller = new ProgressController(metadata, this);
     if (!options.expected && options.isNot)
       return { errorMessage: '"not" matcher requires expected result' };
     try {
@@ -577,7 +641,7 @@ export class Page extends SdkObject {
       previous?: Buffer,
       errorMessage: string,
       diff?: Buffer,
-    } | undefined = undefined;
+    } | undefined;
     const areEqualScreenshots = (actual: Buffer | undefined, expected: Buffer | undefined, previous: Buffer | undefined) => {
       const comparatorResult = actual && expected ? comparator(actual, expected, options) : undefined;
       if (comparatorResult !== undefined && !!comparatorResult === !!options.isNot)
@@ -586,26 +650,27 @@ export class Page extends SdkObject {
         intermediateResult = { errorMessage: comparatorResult.errorMessage, diff: comparatorResult.diff, actual, previous };
       return false;
     };
-    const callTimeout = this._timeoutSettings.timeout(options);
-    return controller.run(async progress => {
+
+    try {
       let actual: Buffer | undefined;
       let previous: Buffer | undefined;
       const pollIntervals = [0, 100, 250, 500];
-      progress.log(`${metadata.apiName}${callTimeout ? ` with timeout ${callTimeout}ms` : ''}`);
+      progress.log(`${renderTitleForCall(progress.metadata)}${options.timeout ? ` with timeout ${options.timeout}ms` : ''}`);
       if (options.expected)
         progress.log(`  verifying given screenshot expectation`);
       else
         progress.log(`  generating new stable screenshot expectation`);
       let isFirstIteration = true;
       while (true) {
-        progress.throwIfAborted();
         if (this.isClosed())
           throw new Error('The page has closed');
         const screenshotTimeout = pollIntervals.shift() ?? 1000;
         if (screenshotTimeout)
           progress.log(`waiting ${screenshotTimeout}ms before taking screenshot`);
         previous = actual;
-        actual = await rafrafScreenshot(progress, screenshotTimeout).catch(e => {
+        actual = await rafrafScreenshot(screenshotTimeout).catch(e => {
+          if (this.mainFrame().isNonRetriableError(e))
+            throw e;
           progress.log(`failed to take screenshot - ` + e.message);
           return undefined;
         });
@@ -631,52 +696,46 @@ export class Page extends SdkObject {
         return {};
       }
 
-      if (areEqualScreenshots(actual, options.expected, previous)) {
+      if (areEqualScreenshots(actual, options.expected, undefined)) {
         progress.log(`screenshot matched expectation`);
         return {};
       }
       throw new Error(intermediateResult!.errorMessage);
-    }, callTimeout).catch(e => {
-      // Q: Why not throw upon isSessionClosedError(e) as in other places?
+    } catch (e) {
+      // Q: Why not throw upon isNonRetriableError(e) as in other places?
       // A: We want user to receive a friendly diff between actual and expected/previous.
       if (js.isJavaScriptErrorInEvaluate(e) || isInvalidSelectorError(e))
         throw e;
+      let errorMessage = e.message;
+      if (e instanceof TimeoutError && intermediateResult?.previous)
+        errorMessage = `Failed to take two consecutive stable screenshots.`;
       return {
-        log: e.message ? [...metadata.log, e.message] : metadata.log,
+        log: compressCallLog(e.message ? [...progress.metadata.log, e.message] : progress.metadata.log),
         ...intermediateResult,
-        errorMessage: e.message,
+        errorMessage,
+        timedOut: (e instanceof TimeoutError),
       };
-    });
+    }
   }
 
-  async screenshot(metadata: CallMetadata, options: ScreenshotOptions & TimeoutOptions = {}): Promise<Buffer> {
-    const controller = new ProgressController(metadata, this);
-    return controller.run(
-        progress => this._screenshotter.screenshotPage(progress, options),
-        this._timeoutSettings.timeout(options));
+  async screenshot(progress: Progress, options: ScreenshotOptions): Promise<Buffer> {
+    return await this.screenshotter.screenshotPage(progress, options);
   }
 
-  async close(metadata: CallMetadata, options: { runBeforeUnload?: boolean, reason?: string } = {}) {
+  async close(options: { runBeforeUnload?: boolean, reason?: string } = {}) {
     if (this._closedState === 'closed')
       return;
     if (options.reason)
-      this._closeReason = options.reason;
+      this.closeReason = options.reason;
     const runBeforeUnload = !!options.runBeforeUnload;
     if (this._closedState !== 'closing') {
       this._closedState = 'closing';
       // This might throw if the browser context containing the page closes
       // while we are trying to close the page.
-      await this._delegate.closePage(runBeforeUnload).catch(e => debugLogger.log('error', e));
+      await this.delegate.closePage(runBeforeUnload).catch(e => debugLogger.log('error', e));
     }
     if (!runBeforeUnload)
       await this._closedPromise;
-    if (this._ownedContext)
-      await this._ownedContext.close(options);
-  }
-
-  private _setIsError(error: Error) {
-    this._pageIsError = error;
-    this._frameManager.createDummyMainFrameIfNeeded();
   }
 
   isClosed(): boolean {
@@ -691,12 +750,12 @@ export class Page extends SdkObject {
     return this._closedState !== 'open' || this._crashed;
   }
 
-  _addWorker(workerId: string, worker: Worker) {
+  addWorker(workerId: string, worker: Worker) {
     this._workers.set(workerId, worker);
     this.emit(Page.Events.Worker, worker);
   }
 
-  _removeWorker(workerId: string) {
+  removeWorker(workerId: string) {
     const worker = this._workers.get(workerId);
     if (!worker)
       return;
@@ -704,39 +763,47 @@ export class Page extends SdkObject {
     this._workers.delete(workerId);
   }
 
-  _clearWorkers() {
+  clearWorkers() {
     for (const [workerId, worker] of this._workers) {
       worker.didClose();
       this._workers.delete(workerId);
     }
   }
 
-  async setFileChooserIntercepted(enabled: boolean): Promise<void> {
-    this._interceptFileChooser = enabled;
-    await this._delegate.updateFileChooserInterception();
+  async setFileChooserInterceptedBy(enabled: boolean, by: any): Promise<void> {
+    const wasIntercepted = this.fileChooserIntercepted();
+    if (enabled)
+      this._fileChooserInterceptedBy.add(by);
+    else
+      this._fileChooserInterceptedBy.delete(by);
+    if (wasIntercepted !== this.fileChooserIntercepted())
+      await this.delegate.updateFileChooserInterception();
   }
 
   fileChooserIntercepted() {
-    return this._interceptFileChooser;
+    return this._fileChooserInterceptedBy.size > 0;
   }
 
   frameNavigatedToNewDocument(frame: frames.Frame) {
     this.emit(Page.Events.InternalFrameNavigatedToNewDocument, frame);
     const origin = frame.origin();
     if (origin)
-      this._browserContext.addVisitedOrigin(origin);
+      this.browserContext.addVisitedOrigin(origin);
   }
 
-  allBindings() {
-    return [...this._browserContext._pageBindings.values(), ...this._pageBindings.values()];
+  allInitScripts() {
+    const bindings = [...this.browserContext._pageBindings.values(), ...this._pageBindings.values()].map(binding => binding.initScript);
+    if (this.browserContext.bindingsInitScript)
+      bindings.unshift(this.browserContext.bindingsInitScript);
+    return [...bindings, ...this.browserContext.initScripts, ...this.initScripts];
   }
 
   getBinding(name: string) {
-    return this._pageBindings.get(name) || this._browserContext._pageBindings.get(name);
+    return this._pageBindings.get(name) || this.browserContext._pageBindings.get(name);
   }
 
   setScreencastOptions(options: { width: number, height: number, quality: number } | null) {
-    this._delegate.setScreencastOptions(options).catch(e => debugLogger.log('error', e));
+    this.delegate.setScreencastOptions(options).catch(e => debugLogger.log('error', e));
     this._frameThrottler.setThrottlingEnabled(!!options);
   }
 
@@ -764,8 +831,10 @@ export class Page extends SdkObject {
     await Promise.all(this.frames().map(frame => frame.hideHighlight().catch(() => {})));
   }
 
-  markAsServerSideOnly() {
-    this._isServerSideOnly = true;
+  async snapshotForAI(progress: Progress): Promise<string> {
+    this.lastSnapshotFrameIds = [];
+    const snapshot = await snapshotFrameForAI(progress, this.mainFrame(), 0, this.lastSnapshotFrameIds);
+    return snapshot.join('\n');
   }
 }
 
@@ -774,31 +843,28 @@ export class Worker extends SdkObject {
     Close: 'close',
   };
 
-  private _url: string;
+  readonly url: string;
   private _executionContextPromise: Promise<js.ExecutionContext>;
   private _executionContextCallback: (value: js.ExecutionContext) => void;
-  _existingExecutionContext: js.ExecutionContext | null = null;
+  existingExecutionContext: js.ExecutionContext | null = null;
   readonly openScope = new LongStandingScope();
 
   constructor(parent: SdkObject, url: string) {
     super(parent, 'worker');
-    this._url = url;
+    this.url = url;
     this._executionContextCallback = () => {};
     this._executionContextPromise = new Promise(x => this._executionContextCallback = x);
   }
 
-  _createExecutionContext(delegate: js.ExecutionContextDelegate) {
-    this._existingExecutionContext = new js.ExecutionContext(this, delegate, 'worker');
-    this._executionContextCallback(this._existingExecutionContext);
-  }
-
-  url(): string {
-    return this._url;
+  createExecutionContext(delegate: js.ExecutionContextDelegate) {
+    this.existingExecutionContext = new js.ExecutionContext(this, delegate, 'worker');
+    this._executionContextCallback(this.existingExecutionContext);
+    return this.existingExecutionContext;
   }
 
   didClose() {
-    if (this._existingExecutionContext)
-      this._existingExecutionContext.contextDestroyed('Worker was closed');
+    if (this.existingExecutionContext)
+      this.existingExecutionContext.contextDestroyed('Worker was closed');
     this.emit(Worker.Events.Close, this);
     this.openScope.close(new Error('Worker closed'));
   }
@@ -812,122 +878,66 @@ export class Worker extends SdkObject {
   }
 }
 
-type BindingPayload = {
-  name: string;
-  seq: number;
-  serializedArgs?: SerializedValue[],
-};
-
 export class PageBinding {
+  private static kController = '__playwright__binding__controller__';
+  static kBindingName = '__playwright__binding__';
+
+  static createInitScript() {
+    return new InitScript(`
+      (() => {
+        const module = {};
+        ${rawBindingsControllerSource.source}
+        const property = '${PageBinding.kController}';
+        if (!globalThis[property])
+          globalThis[property] = new (module.exports.BindingsController())(globalThis, '${PageBinding.kBindingName}');
+      })();
+    `);
+  }
+
   readonly name: string;
   readonly playwrightFunction: frames.FunctionWithSource;
-  readonly source: string;
+  readonly initScript: InitScript;
   readonly needsHandle: boolean;
+  readonly cleanupScript: string;
+  forClient?: unknown;
 
   constructor(name: string, playwrightFunction: frames.FunctionWithSource, needsHandle: boolean) {
     this.name = name;
     this.playwrightFunction = playwrightFunction;
-    this.source = `(${addPageBinding.toString()})(${JSON.stringify(name)}, ${needsHandle}, (${source})())`;
+    this.initScript = new InitScript(`globalThis['${PageBinding.kController}'].addBinding(${JSON.stringify(name)}, ${needsHandle})`);
     this.needsHandle = needsHandle;
+    this.cleanupScript = `globalThis['${PageBinding.kController}'].removeBinding(${JSON.stringify(name)})`;
   }
 
   static async dispatch(page: Page, payload: string, context: dom.FrameExecutionContext) {
     const { name, seq, serializedArgs } = JSON.parse(payload) as BindingPayload;
     try {
       assert(context.world);
-      const binding = page.getBinding(name)!;
+      const binding = page.getBinding(name);
+      if (!binding)
+        throw new Error(`Function "${name}" is not exposed`);
       let result: any;
       if (binding.needsHandle) {
-        const handle = await context.evaluateHandle(takeHandle, { name, seq }).catch(e => null);
-        result = await binding.playwrightFunction({ frame: context.frame, page, context: page._browserContext }, handle);
+        const handle = await context.evaluateExpressionHandle(`arg => globalThis['${PageBinding.kController}'].takeBindingHandle(arg)`, { isFunction: true }, { name, seq }).catch(e => null);
+        result = await binding.playwrightFunction({ frame: context.frame, page, context: page.browserContext }, handle);
       } else {
+        if (!Array.isArray(serializedArgs))
+          throw new Error(`serializedArgs is not an array. This can happen when Array.prototype.toJSON is defined incorrectly`);
         const args = serializedArgs!.map(a => parseEvaluationResultValue(a));
-        result = await binding.playwrightFunction({ frame: context.frame, page, context: page._browserContext }, ...args);
+        result = await binding.playwrightFunction({ frame: context.frame, page, context: page.browserContext }, ...args);
       }
-      context.evaluate(deliverResult, { name, seq, result }).catch(e => debugLogger.log('error', e));
+      context.evaluateExpressionHandle(`arg => globalThis['${PageBinding.kController}'].deliverBindingResult(arg)`, { isFunction: true }, { name, seq, result }).catch(e => debugLogger.log('error', e));
     } catch (error) {
-      if (isError(error))
-        context.evaluate(deliverError, { name, seq, message: error.message, stack: error.stack }).catch(e => debugLogger.log('error', e));
-      else
-        context.evaluate(deliverErrorValue, { name, seq, error }).catch(e => debugLogger.log('error', e));
-    }
-
-    function takeHandle(arg: { name: string, seq: number }) {
-      const handle = (globalThis as any)[arg.name]['handles'].get(arg.seq);
-      (globalThis as any)[arg.name]['handles'].delete(arg.seq);
-      return handle;
-    }
-
-    function deliverResult(arg: { name: string, seq: number, result: any }) {
-      (globalThis as any)[arg.name]['callbacks'].get(arg.seq).resolve(arg.result);
-      (globalThis as any)[arg.name]['callbacks'].delete(arg.seq);
-    }
-
-    function deliverError(arg: { name: string, seq: number, message: string, stack: string | undefined }) {
-      const error = new Error(arg.message);
-      error.stack = arg.stack;
-      (globalThis as any)[arg.name]['callbacks'].get(arg.seq).reject(error);
-      (globalThis as any)[arg.name]['callbacks'].delete(arg.seq);
-    }
-
-    function deliverErrorValue(arg: { name: string, seq: number, error: any }) {
-      (globalThis as any)[arg.name]['callbacks'].get(arg.seq).reject(arg.error);
-      (globalThis as any)[arg.name]['callbacks'].delete(arg.seq);
+      context.evaluateExpressionHandle(`arg => globalThis['${PageBinding.kController}'].deliverBindingResult(arg)`, { isFunction: true }, { name, seq, error }).catch(e => debugLogger.log('error', e));
     }
   }
 }
 
-function addPageBinding(bindingName: string, needsHandle: boolean, utilityScriptSerializers: ReturnType<typeof source>) {
-  const binding = (globalThis as any)[bindingName];
-  if (binding.__installed)
-    return;
-  (globalThis as any)[bindingName] = (...args: any[]) => {
-    const me = (globalThis as any)[bindingName];
-    if (needsHandle && args.slice(1).some(arg => arg !== undefined))
-      throw new Error(`exposeBindingHandle supports a single argument, ${args.length} received`);
-    let callbacks = me['callbacks'];
-    if (!callbacks) {
-      callbacks = new Map();
-      me['callbacks'] = callbacks;
-    }
-    const seq: number = (me['lastSeq'] || 0) + 1;
-    me['lastSeq'] = seq;
-    let handles = me['handles'];
-    if (!handles) {
-      handles = new Map();
-      me['handles'] = handles;
-    }
-    const promise = new Promise((resolve, reject) => callbacks.set(seq, { resolve, reject }));
-    let payload: BindingPayload;
-    if (needsHandle) {
-      handles.set(seq, args[0]);
-      payload = { name: bindingName, seq };
-    } else {
-      const serializedArgs = [];
-      for (let i = 0; i < args.length; i++) {
-        serializedArgs[i] = utilityScriptSerializers.serializeAsCallArgument(args[i], v => {
-          return { fallThrough: v };
-        });
-      }
-      payload = { name: bindingName, seq, serializedArgs };
-    }
-    binding(JSON.stringify(payload));
-    return promise;
-  };
-  (globalThis as any)[bindingName].__installed = true;
-}
-
 export class InitScript {
   readonly source: string;
 
   constructor(source: string) {
-    const guid = createGuid();
     this.source = `(() => {
-      globalThis.__pwInitScripts = globalThis.__pwInitScripts || {};
-      const hasInitScript = globalThis.__pwInitScripts[${JSON.stringify(guid)}];
-      if (hasInitScript)
-        return;
-      globalThis.__pwInitScripts[${JSON.stringify(guid)}] = true;
       ${source}
     })();`;
   }
@@ -998,3 +1008,55 @@ class FrameThrottler {
     }
   }
 }
+
+async function snapshotFrameForAI(progress: Progress, frame: frames.Frame, frameOrdinal: number, frameIds: string[]): Promise<string[]> {
+  // Only await the topmost navigations, inner frames will be empty when racing.
+  const snapshot = await frame.retryWithProgressAndTimeouts(progress, [1000, 2000, 4000, 8000], async continuePolling => {
+    try {
+      const context = await progress.race(frame._utilityContext());
+      const injectedScript = await progress.race(context.injectedScript());
+      const snapshotOrRetry = await progress.race(injectedScript.evaluate((injected, refPrefix) => {
+        const node = injected.document.body;
+        if (!node)
+          return true;
+        return injected.ariaSnapshot(node, { mode: 'ai', refPrefix });
+      }, frameOrdinal ? 'f' + frameOrdinal : ''));
+      if (snapshotOrRetry === true)
+        return continuePolling;
+      return snapshotOrRetry;
+    } catch (e) {
+      if (frame.isNonRetriableError(e))
+        throw e;
+      return continuePolling;
+    }
+  });
+
+  const lines = snapshot.split('\n');
+  const result = [];
+  for (const line of lines) {
+    const match = line.match(/^(\s*)- iframe (?:\[active\] )?\[ref=([^\]]*)\]/);
+    if (!match) {
+      result.push(line);
+      continue;
+    }
+
+    const leadingSpace = match[1];
+    const ref = match[2];
+    const frameSelector = `aria-ref=${ref} >> internal:control=enter-frame`;
+    const frameBodySelector = `${frameSelector} >> body`;
+    const child = await progress.race(frame.selectors.resolveFrameForSelector(frameBodySelector, { strict: true }));
+    if (!child) {
+      result.push(line);
+      continue;
+    }
+    const frameOrdinal = frameIds.length + 1;
+    frameIds.push(child.frame._id);
+    try {
+      const childSnapshot = await snapshotFrameForAI(progress, child.frame, frameOrdinal, frameIds);
+      result.push(line + ':', ...childSnapshot.map(l => leadingSpace + '  ' + l));
+    } catch {
+      result.push(line);
+    }
+  }
+  return result;
+}
diff --git a/packages/playwright-core/src/server/pipeTransport.ts b/packages/playwright-core/src/server/pipeTransport.ts
index b5755d098d912..ba811e606e496 100644
--- a/packages/playwright-core/src/server/pipeTransport.ts
+++ b/packages/playwright-core/src/server/pipeTransport.ts
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from './transport';
 import { makeWaitForNextTask } from '../utils';
-import { debugLogger } from '../utils/debugLogger';
+import { debugLogger } from './utils/debugLogger';
+
+import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from './transport';
 
 export class PipeTransport implements ConnectionTransport {
   private _pipeRead: NodeJS.ReadableStream;
diff --git a/packages/playwright-core/src/server/playwright.ts b/packages/playwright-core/src/server/playwright.ts
index c4ffd518ce7b8..bdd98bd8af02c 100644
--- a/packages/playwright-core/src/server/playwright.ts
+++ b/packages/playwright-core/src/server/playwright.ts
@@ -16,40 +16,41 @@
 
 import { Android } from './android/android';
 import { AdbBackend } from './android/backendAdb';
-import type { Browser } from './browser';
+import { BidiChromium } from './bidi/bidiChromium';
+import { BidiFirefox } from './bidi/bidiFirefox';
 import { Chromium } from './chromium/chromium';
+import { DebugController } from './debugController';
 import { Electron } from './electron/electron';
 import { Firefox } from './firefox/firefox';
-import { Selectors } from './selectors';
+import { SdkObject, createRootSdkObject } from './instrumentation';
 import { WebKit } from './webkit/webkit';
-import type { CallMetadata } from './instrumentation';
-import { createInstrumentation, SdkObject } from './instrumentation';
-import { debugLogger } from '../utils/debugLogger';
+
+import type { BrowserType } from './browserType';
+import type { Language } from '../utils';
+import type { Browser } from './browser';
 import type { Page } from './page';
-import { DebugController } from './debugController';
-import type { Language } from '../utils/isomorphic/locatorGenerators';
 
 type PlaywrightOptions = {
-  socksProxyPort?: number;
   sdkLanguage: Language;
   isInternalPlaywright?: boolean;
   isServer?: boolean;
 };
 
 export class Playwright extends SdkObject {
-  readonly selectors: Selectors;
-  readonly chromium: Chromium;
+  readonly chromium: BrowserType;
   readonly android: Android;
   readonly electron: Electron;
-  readonly firefox: Firefox;
-  readonly webkit: WebKit;
+  readonly firefox: BrowserType;
+  readonly webkit: BrowserType;
+  readonly _bidiChromium: BrowserType;
+  readonly _bidiFirefox: BrowserType;
   readonly options: PlaywrightOptions;
   readonly debugController: DebugController;
   private _allPages = new Set<Page>();
   private _allBrowsers = new Set<Browser>();
 
   constructor(options: PlaywrightOptions) {
-    super({ attribution: {}, instrumentation: createInstrumentation() } as any, undefined, 'Playwright');
+    super(createRootSdkObject(), undefined, 'Playwright');
     this.options = options;
     this.attribution.playwright = this;
     this.instrumentation.addListener({
@@ -57,23 +58,17 @@ export class Playwright extends SdkObject {
       onBrowserClose: browser => this._allBrowsers.delete(browser),
       onPageOpen: page => this._allPages.add(page),
       onPageClose: page => this._allPages.delete(page),
-      onCallLog: (sdkObject: SdkObject, metadata: CallMetadata, logName: string, message: string) => {
-        debugLogger.log(logName as any, message);
-      }
     }, null);
     this.chromium = new Chromium(this);
+    this._bidiChromium = new BidiChromium(this);
+    this._bidiFirefox = new BidiFirefox(this);
     this.firefox = new Firefox(this);
     this.webkit = new WebKit(this);
     this.electron = new Electron(this);
     this.android = new Android(this, new AdbBackend());
-    this.selectors = new Selectors();
     this.debugController = new DebugController(this);
   }
 
-  async hideHighlight() {
-    await Promise.all([...this._allPages].map(p => p.hideHighlight().catch(() => {})));
-  }
-
   allBrowsers(): Browser[] {
     return [...this._allBrowsers];
   }
diff --git a/packages/playwright-core/src/server/progress.ts b/packages/playwright-core/src/server/progress.ts
index 70de43b94456d..5e9ef3db00ca3 100644
--- a/packages/playwright-core/src/server/progress.ts
+++ b/packages/playwright-core/src/server/progress.ts
@@ -15,109 +15,104 @@
  */
 
 import { TimeoutError } from './errors';
-import { assert, monotonicTime } from '../utils';
-import type { LogName } from '../utils/debugLogger';
-import type { CallMetadata, Instrumentation, SdkObject } from './instrumentation';
-import type { ElementHandle } from './dom';
-import { ManualPromise } from '../utils/manualPromise';
+import { assert } from '../utils';
+import { ManualPromise } from '../utils/isomorphic/manualPromise';
 
-export interface Progress {
-  log(message: string): void;
-  timeUntilDeadline(): number;
-  isRunning(): boolean;
-  cleanupWhenAborted(cleanup: () => any): void;
-  throwIfAborted(): void;
-  beforeInputAction(element: ElementHandle): Promise<void>;
-  metadata: CallMetadata;
-}
+import type { Progress } from '@protocol/progress';
+import type { CallMetadata } from './instrumentation';
+
+export type { Progress } from '@protocol/progress';
 
 export class ProgressController {
   private _forceAbortPromise = new ManualPromise<any>();
+  private _donePromise = new ManualPromise<void>();
+  private _state: 'before' | 'running' | { error: Error } | 'finished' = 'before';
+  private _onCallLog?: (message: string) => void;
 
-  // Cleanups to be run only in the case of abort.
-  private _cleanups: (() => any)[] = [];
-
-  private _logName = 'api';
-  private _state: 'before' | 'running' | 'aborted' | 'finished' = 'before';
-  private _deadline: number = 0;
-  private _timeout: number = 0;
   readonly metadata: CallMetadata;
-  readonly instrumentation: Instrumentation;
-  readonly sdkObject: SdkObject;
 
-  constructor(metadata: CallMetadata, sdkObject: SdkObject) {
-    this.metadata = metadata;
-    this.sdkObject = sdkObject;
-    this.instrumentation = sdkObject.instrumentation;
+  constructor(metadata?: CallMetadata, onCallLog?: (message: string) => void) {
+    this.metadata = metadata || { id: '', startTime: 0, endTime: 0, type: 'Internal', method: '', params: {}, log: [], internal: true };
+    this._onCallLog = onCallLog;
     this._forceAbortPromise.catch(e => null);  // Prevent unhandled promise rejection.
   }
 
-  setLogName(logName: LogName) {
-    this._logName = logName;
-  }
-
-  abort(error: Error) {
-    this._forceAbortPromise.reject(error);
+  async abort(error: Error) {
+    if (this._state === 'running') {
+      (error as any)[kAbortErrorSymbol] = true;
+      this._state = { error };
+      this._forceAbortPromise.reject(error);
+    }
+    await this._donePromise;
   }
 
   async run<T>(task: (progress: Progress) => Promise<T>, timeout?: number): Promise<T> {
-    if (timeout) {
-      this._timeout = timeout;
-      this._deadline = timeout ? monotonicTime() + timeout : 0;
-    }
-
     assert(this._state === 'before');
     this._state = 'running';
-    this.sdkObject.attribution.context?._activeProgressControllers.add(this);
 
     const progress: Progress = {
       log: message => {
         if (this._state === 'running')
           this.metadata.log.push(message);
         // Note: we might be sending logs after progress has finished, for example browser logs.
-        this.instrumentation.onCallLog(this.sdkObject, this.metadata, this._logName, message);
+        this._onCallLog?.(message);
       },
-      timeUntilDeadline: () => this._deadline ? this._deadline - monotonicTime() : 2147483647, // 2^31-1 safe setTimeout in Node.
-      isRunning: () => this._state === 'running',
-      cleanupWhenAborted: (cleanup: () => any) => {
-        if (this._state === 'running')
-          this._cleanups.push(cleanup);
-        else
-          runCleanup(cleanup);
-      },
-      throwIfAborted: () => {
-        if (this._state === 'aborted')
-          throw new AbortedError();
+      metadata: this.metadata,
+      race: <T>(promise: Promise<T> | Promise<T>[]) => {
+        const promises = Array.isArray(promise) ? promise : [promise];
+        return Promise.race([...promises, this._forceAbortPromise]);
       },
-      beforeInputAction: async (element: ElementHandle) => {
-        await this.instrumentation.onBeforeInputAction(this.sdkObject, this.metadata, element);
+      wait: async (timeout: number) => {
+        let timer: NodeJS.Timeout;
+        const promise = new Promise<void>(f => timer = setTimeout(f, timeout));
+        return progress.race(promise).finally(() => clearTimeout(timer));
       },
-      metadata: this.metadata
     };
 
-    const timeoutError = new TimeoutError(`Timeout ${this._timeout}ms exceeded.`);
-    const timer = setTimeout(() => this._forceAbortPromise.reject(timeoutError), progress.timeUntilDeadline());
+    let timer: NodeJS.Timeout | undefined;
+    if (timeout) {
+      const timeoutError = new TimeoutError(`Timeout ${timeout}ms exceeded.`);
+      timer = setTimeout(() => {
+        if (this._state === 'running') {
+          (timeoutError as any)[kAbortErrorSymbol] = true;
+          this._state = { error: timeoutError };
+          this._forceAbortPromise.reject(timeoutError);
+        }
+      }, timeout);
+    }
+
     try {
-      const promise = task(progress);
-      const result = await Promise.race([promise, this._forceAbortPromise]);
+      const result = await task(progress);
       this._state = 'finished';
       return result;
-    } catch (e) {
-      this._state = 'aborted';
-      await Promise.all(this._cleanups.splice(0).map(runCleanup));
-      throw e;
+    } catch (error) {
+      this._state = { error };
+      throw error;
     } finally {
-      this.sdkObject.attribution.context?._activeProgressControllers.delete(this);
       clearTimeout(timer);
+      this._donePromise.resolve();
     }
   }
 }
 
-async function runCleanup(cleanup: () => any) {
+const kAbortErrorSymbol = Symbol('kAbortError');
+
+export function isAbortError(error: Error): boolean {
+  return !!(error as any)[kAbortErrorSymbol];
+}
+
+// Use this method to race some external operation that you really want to undo
+// when it goes beyond the progress abort.
+export async function raceUncancellableOperationWithCleanup<T>(progress: Progress, run: () => Promise<T>, cleanup: (t: T) => void | Promise<unknown>): Promise<T> {
+  let aborted = false;
   try {
-    await cleanup();
-  } catch (e) {
+    return await progress.race(run().then(async t => {
+      if (aborted)
+        await cleanup(t);
+      return t;
+    }));
+  } catch (error) {
+    aborted = true;
+    throw error;
   }
 }
-
-class AbortedError extends Error {}
diff --git a/packages/playwright-core/src/server/protocolError.ts b/packages/playwright-core/src/server/protocolError.ts
index 1f999b7c640b9..9ef856c2eb9fb 100644
--- a/packages/playwright-core/src/server/protocolError.ts
+++ b/packages/playwright-core/src/server/protocolError.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { rewriteErrorMessage } from '../utils/stackTrace';
+import { rewriteErrorMessage } from '../utils/isomorphic/stackTrace';
 
 export class ProtocolError extends Error {
   type: 'error' | 'closed' | 'crashed';
diff --git a/packages/playwright-core/src/server/recorder.ts b/packages/playwright-core/src/server/recorder.ts
index 3a770741ae37f..ebd738c648e20 100644
--- a/packages/playwright-core/src/server/recorder.ts
+++ b/packages/playwright-core/src/server/recorder.ts
@@ -14,90 +14,133 @@
  * limitations under the License.
  */
 
-import * as fs from 'fs';
-import type * as actions from './recorder/recorderActions';
-import type * as channels from '@protocol/channels';
-import type { ActionInContext } from './recorder/codeGenerator';
-import { CodeGenerator } from './recorder/codeGenerator';
-import { toClickOptions, toModifiers } from './recorder/utils';
-import { Page } from './page';
-import { Frame } from './frames';
+import EventEmitter from 'events';
+import fs from 'fs';
+
+import { isUnderTest } from '../utils';
 import { BrowserContext } from './browserContext';
-import { JavaLanguageGenerator } from './recorder/java';
-import { JavaScriptLanguageGenerator } from './recorder/javascript';
-import { JsonlLanguageGenerator } from './recorder/jsonl';
-import { CSharpLanguageGenerator } from './recorder/csharp';
-import { PythonLanguageGenerator } from './recorder/python';
-import * as recorderSource from '../generated/recorderSource';
-import * as consoleApiSource from '../generated/consoleApiSource';
-import { EmptyRecorderApp } from './recorder/recorderApp';
-import type { IRecorderApp } from './recorder/recorderApp';
-import { RecorderApp } from './recorder/recorderApp';
-import type { CallMetadata, InstrumentationListener, SdkObject } from './instrumentation';
-import type { Point } from '../common/types';
-import type { CallLog, CallLogStatus, EventData, Mode, OverlayState, Source, UIState } from '@recorder/recorderTypes';
-import { createGuid, isUnderTest, monotonicTime } from '../utils';
-import { metadataToCallLog } from './recorder/recorderUtils';
 import { Debugger } from './debugger';
-import { EventEmitter } from 'events';
-import { raceAgainstDeadline } from '../utils/timeoutRunner';
-import type { Language, LanguageGenerator } from './recorder/language';
+import { buildFullSelector, generateFrameSelector, metadataToCallLog } from './recorder/recorderUtils';
 import { locatorOrSelectorAsSelector } from '../utils/isomorphic/locatorParser';
-import { quoteCSSAttributeValue } from '../utils/isomorphic/stringUtils';
-import { eventsHelper, type RegisteredListener } from './../utils/eventsHelper';
-import type { Dialog } from './dialog';
+import { stringifySelector } from '../utils/isomorphic/selectorParser';
+import { ProgressController } from './progress';
+import { RecorderSignalProcessor } from './recorder/recorderSignalProcessor';
+import * as rawRecorderSource from './../generated/pollingRecorderSource';
+import { eventsHelper, monotonicTime } from './../utils';
+import { Frame } from './frames';
+import { Page } from './page';
+import { performAction } from './recorder/recorderRunner';
 
-type BindingSource = { frame: Frame, page: Page };
+import type { Language } from './codegen/types';
+import type { CallMetadata, InstrumentationListener, SdkObject } from './instrumentation';
+import type { Point } from '../utils/isomorphic/types';
+import type { AriaTemplateNode } from '@isomorphic/ariaSnapshot';
+import type * as channels from '@protocol/channels';
+import type * as actions from '@recorder/actions';
+import type { CallLog, CallLogStatus, ElementInfo, Mode, OverlayState, Source, UIState } from '@recorder/recorderTypes';
+import type { RegisteredListener } from '../utils';
 
 const recorderSymbol = Symbol('recorderSymbol');
 
-export class Recorder implements InstrumentationListener {
+type BindingSource = { frame: Frame, page: Page };
+
+export const RecorderEvent = {
+  PausedStateChanged: 'pausedStateChanged',
+  ModeChanged: 'modeChanged',
+  ElementPicked: 'elementPicked',
+  CallLogsUpdated: 'callLogsUpdated',
+  UserSourcesChanged: 'userSourcesChanged',
+  ActionAdded: 'actionAdded',
+  SignalAdded: 'signalAdded',
+  PageNavigated: 'pageNavigated',
+  ContextClosed: 'contextClosed',
+} as const;
+
+export type RecorderEventMap = {
+  [RecorderEvent.PausedStateChanged]: [paused: boolean];
+  [RecorderEvent.ModeChanged]: [mode: Mode];
+  [RecorderEvent.ElementPicked]: [elementInfo: ElementInfo, userGesture?: boolean];
+  [RecorderEvent.CallLogsUpdated]: [callLogs: CallLog[]];
+  [RecorderEvent.UserSourcesChanged]: [sources: Source[], pausedSourceId?: string];
+  [RecorderEvent.ActionAdded]: [action: actions.ActionInContext];
+  [RecorderEvent.SignalAdded]: [signal: actions.SignalInContext];
+  [RecorderEvent.PageNavigated]: [url: string];
+  [RecorderEvent.ContextClosed]: [];
+};
+
+export class Recorder extends EventEmitter<RecorderEventMap> implements InstrumentationListener {
+  readonly handleSIGINT: boolean | undefined;
   private _context: BrowserContext;
+  private _params: channels.BrowserContextEnableRecorderParams;
   private _mode: Mode;
-  private _highlightedSelector = '';
+  private _highlightedElement: { selector?: string, ariaTemplate?: AriaTemplateNode } = {};
   private _overlayState: OverlayState = { offsetX: 0 };
-  private _recorderApp: IRecorderApp | null = null;
   private _currentCallsMetadata = new Map<CallMetadata, SdkObject>();
-  private _recorderSources: Source[] = [];
   private _userSources = new Map<string, Source>();
   private _debugger: Debugger;
-  private _contextRecorder: ContextRecorder;
-  private _handleSIGINT: boolean | undefined;
   private _omitCallTracking = false;
-  private _currentLanguage: Language;
+  private _currentLanguage: Language = 'javascript';
+  private _recorderMode: 'default' | 'api';
 
-  private static recorderAppFactory: ((recorder: Recorder) => Promise<IRecorderApp>) | undefined;
-
-  static setAppFactory(recorderAppFactory: ((recorder: Recorder) => Promise<IRecorderApp>) | undefined) {
-    Recorder.recorderAppFactory = recorderAppFactory;
-  }
-
-  static showInspector(context: BrowserContext) {
-    const params: channels.BrowserContextRecorderSupplementEnableParams = {};
-    if (isUnderTest())
-      params.language = process.env.TEST_INSPECTOR_LANGUAGE;
-    Recorder.show(context, params).catch(() => {});
-  }
+  private _signalProcessor: RecorderSignalProcessor;
+  private _pageAliases = new Map<Page, string>();
+  private _lastPopupOrdinal = 0;
+  private _lastDialogOrdinal = -1;
+  private _lastDownloadOrdinal = -1;
+  private _listeners: RegisteredListener[] = [];
+  private _enabled: boolean = false;
+  private _callLogs: CallLog[] = [];
 
-  static show(context: BrowserContext, params: channels.BrowserContextRecorderSupplementEnableParams = {}): Promise<Recorder> {
+  static forContext(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams): Promise<Recorder> {
     let recorderPromise = (context as any)[recorderSymbol] as Promise<Recorder>;
     if (!recorderPromise) {
-      const recorder = new Recorder(context, params);
-      recorderPromise = recorder.install().then(() => recorder);
+      recorderPromise = Recorder._create(context, params);
       (context as any)[recorderSymbol] = recorderPromise;
     }
     return recorderPromise;
   }
 
-  constructor(context: BrowserContext, params: channels.BrowserContextRecorderSupplementEnableParams) {
-    this._mode = params.mode || 'none';
-    this._contextRecorder = new ContextRecorder(context, params);
+  static existingForContext(context: BrowserContext): Recorder | undefined {
+    return (context as any)[recorderSymbol] as Recorder;
+  }
+
+  private static async _create(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams = {}): Promise<Recorder> {
+    const recorder = new Recorder(context, params);
+    await recorder._install();
+    return recorder;
+  }
+
+  constructor(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams) {
+    super();
     this._context = context;
+    this._params = params;
+    this._mode = params.mode || 'none';
+    this._recorderMode = params.recorderMode ?? 'default';
+    this.handleSIGINT = params.handleSIGINT;
+
+    this._signalProcessor = new RecorderSignalProcessor({
+      addAction: (actionInContext: actions.ActionInContext) => {
+        if (this._enabled)
+          this.emit(RecorderEvent.ActionAdded, actionInContext);
+      },
+      addSignal: (signal: actions.SignalInContext) => {
+        if (this._enabled)
+          this.emit(RecorderEvent.SignalAdded, signal);
+      },
+    });
+
+    context.on(BrowserContext.Events.BeforeClose, () => {
+      this.emit(RecorderEvent.ContextClosed);
+    });
+    this._listeners.push(eventsHelper.addEventListener(process, 'exit', () => {
+      this.emit(RecorderEvent.ContextClosed);
+    }));
+
+    this._setEnabled(params.mode === 'recording');
+
     this._omitCallTracking = !!params.omitCallTracking;
     this._debugger = context.debugger();
-    this._handleSIGINT = params.handleSIGINT;
     context.instrumentation.addListener(this, context);
-    this._currentLanguage = this._contextRecorder.languageName();
 
     if (isUnderTest()) {
       // Most of our tests put elements at the top left, so get out of the way.
@@ -105,197 +148,228 @@ export class Recorder implements InstrumentationListener {
     }
   }
 
-  private static async defaultRecorderAppFactory(recorder: Recorder) {
-    if (process.env.PW_CODEGEN_NO_INSPECTOR)
-      return new EmptyRecorderApp();
-    return await RecorderApp.open(recorder, recorder._context, recorder._handleSIGINT);
-  }
-
-  async install() {
-    const recorderApp = await (Recorder.recorderAppFactory || Recorder.defaultRecorderAppFactory)(this);
-    this._recorderApp = recorderApp;
-    recorderApp.once('close', () => {
-      this._debugger.resume(false);
-      this._recorderApp = null;
-    });
-    recorderApp.on('event', (data: EventData) => {
-      if (data.event === 'setMode') {
-        this.setMode(data.params.mode);
-        return;
-      }
-      if (data.event === 'selectorUpdated') {
-        this.setHighlightedSelector(this._currentLanguage, data.params.selector);
-        return;
-      }
-      if (data.event === 'step') {
-        this._debugger.resume(true);
-        return;
-      }
-      if (data.event === 'fileChanged') {
-        this._currentLanguage = this._contextRecorder.languageName(data.params.file);
-        this._refreshOverlay();
-        return;
-      }
-      if (data.event === 'resume') {
-        this._debugger.resume(false);
-        return;
-      }
-      if (data.event === 'pause') {
-        this._debugger.pauseOnNextStatement();
-        return;
-      }
-      if (data.event === 'clear') {
-        this._contextRecorder.clearScript();
-        return;
-      }
-    });
-
-    await Promise.all([
-      recorderApp.setMode(this._mode),
-      recorderApp.setPaused(this._debugger.isPaused()),
-      this._pushAllSources()
-    ]);
+  private async _install() {
+    this.emit(RecorderEvent.ModeChanged, this._mode);
+    this.emit(RecorderEvent.PausedStateChanged, this._debugger.isPaused());
 
     this._context.once(BrowserContext.Events.Close, () => {
-      this._contextRecorder.dispose();
+      eventsHelper.removeEventListeners(this._listeners);
       this._context.instrumentation.removeListener(this);
-      recorderApp.close().catch(() => {});
-    });
-    this._contextRecorder.on(ContextRecorder.Events.Change, (data: { sources: Source[], primaryFileName: string }) => {
-      this._recorderSources = data.sources;
-      this._pushAllSources();
-      this._recorderApp?.setFileIfNeeded(data.primaryFileName);
+      this.emit(RecorderEvent.ContextClosed);
     });
 
-    await this._context.exposeBinding('__pw_recorderState', false, source => {
-      let actionSelector = '';
-      let actionPoint: Point | undefined;
-      const hasActiveScreenshotCommand = [...this._currentCallsMetadata.keys()].some(isScreenshotCommand);
-      if (!hasActiveScreenshotCommand) {
-        actionSelector = this._highlightedSelector;
-        for (const [metadata, sdkObject] of this._currentCallsMetadata) {
-          if (source.page === sdkObject.attribution.page) {
-            actionPoint = metadata.point || actionPoint;
-            actionSelector = actionSelector || metadata.params.selector;
+    const controller = new ProgressController();
+    await controller.run(async progress => {
+      await this._context.exposeBinding(progress, '__pw_recorderState', false, async source => {
+        let actionSelector: string | undefined;
+        let actionPoint: Point | undefined;
+        const hasActiveScreenshotCommand = [...this._currentCallsMetadata.keys()].some(isScreenshotCommand);
+        if (!hasActiveScreenshotCommand) {
+          actionSelector = await this._scopeHighlightedSelectorToFrame(source.frame);
+          for (const [metadata, sdkObject] of this._currentCallsMetadata) {
+            if (source.page === sdkObject.attribution.page) {
+              actionPoint = metadata.point || actionPoint;
+              actionSelector = actionSelector || metadata.params.selector;
+            }
           }
         }
-      }
-      const uiState: UIState = {
-        mode: this._mode,
-        actionPoint,
-        actionSelector,
-        language: this._currentLanguage,
-        testIdAttributeName: this._contextRecorder.testIdAttributeName(),
-        overlay: this._overlayState,
-      };
-      return uiState;
-    });
+        const uiState: UIState = {
+          mode: this._mode,
+          actionPoint,
+          actionSelector,
+          ariaTemplate: this._highlightedElement.ariaTemplate,
+          language: this._currentLanguage,
+          testIdAttributeName: this._testIdAttributeName(),
+          overlay: this._overlayState,
+        };
+        return uiState;
+      });
 
-    await this._context.exposeBinding('__pw_recorderSetSelector', false, async ({ frame }, selector: string) => {
-      const selectorPromises: Promise<string | undefined>[] = [];
-      let currentFrame: Frame | null = frame;
-      while (currentFrame) {
-        selectorPromises.push(findFrameSelector(currentFrame));
-        currentFrame = currentFrame.parentFrame();
-      }
-      const fullSelector = (await Promise.all(selectorPromises)).filter(Boolean);
-      fullSelector.push(selector);
-      await this._recorderApp?.setSelector(fullSelector.join(' >> internal:control=enter-frame >> '), true);
-    });
+      await this._context.exposeBinding(progress, '__pw_recorderElementPicked', false, async ({ frame }, elementInfo: ElementInfo) => {
+        const selectorChain = await generateFrameSelector(frame);
+        this.emit(RecorderEvent.ElementPicked, { selector: buildFullSelector(selectorChain, elementInfo.selector), ariaSnapshot: elementInfo.ariaSnapshot }, true);
+      });
 
-    await this._context.exposeBinding('__pw_recorderSetMode', false, async ({ frame }, mode: Mode) => {
-      if (frame.parentFrame())
-        return;
-      this.setMode(mode);
-    });
+      await this._context.exposeBinding(progress, '__pw_recorderSetMode', false, async ({ frame }, mode: Mode) => {
+        if (frame.parentFrame())
+          return;
+        this.setMode(mode);
+      });
 
-    await this._context.exposeBinding('__pw_recorderSetOverlayState', false, async ({ frame }, state: OverlayState) => {
-      if (frame.parentFrame())
-        return;
-      this._overlayState = state;
-    });
+      await this._context.exposeBinding(progress, '__pw_recorderSetOverlayState', false, async ({ frame }, state: OverlayState) => {
+        if (frame.parentFrame())
+          return;
+        this._overlayState = state;
+      });
 
-    await this._context.exposeBinding('__pw_resume', false, () => {
-      this._debugger.resume(false);
-    });
-    await this._context.extendInjectedScript(consoleApiSource.source);
+      await this._context.exposeBinding(progress, '__pw_resume', false, () => {
+        this._debugger.resume(false);
+      });
+
+      this._context.on(BrowserContext.Events.Page, (page: Page) => this._onPage(page));
+      for (const page of this._context.pages())
+        this._onPage(page);
+      this._context.dialogManager.addDialogHandler(dialog => {
+        this._onDialog(dialog.page());
+        // Not handling the dialog, let it automatically close.
+        return false;
+      });
+
+      // Input actions that potentially lead to navigation are intercepted on the page and are
+      // performed by the Playwright.
+      await this._context.exposeBinding(progress, '__pw_recorderPerformAction', false,
+          (source: BindingSource, action: actions.PerformOnRecordAction) => this._performAction(source.frame, action));
 
-    await this._contextRecorder.install();
+      // Other non-essential actions are simply being recorded.
+      await this._context.exposeBinding(progress, '__pw_recorderRecordAction', false,
+          (source: BindingSource, action: actions.Action) => this._recordAction(source.frame, action));
+
+      await this._context.extendInjectedScript(rawRecorderSource.source, { recorderMode: this._recorderMode });
+    });
 
     if (this._debugger.isPaused())
       this._pausedStateChanged();
     this._debugger.on(Debugger.Events.PausedStateChanged, () => this._pausedStateChanged());
-
-    (this._context as any).recorderAppForTest = recorderApp;
   }
 
-  _pausedStateChanged() {
+  private _pausedStateChanged() {
     // If we are called upon page.pause, we don't have metadatas, populate them.
     for (const { metadata, sdkObject } of this._debugger.pausedDetails()) {
       if (!this._currentCallsMetadata.has(metadata))
         this.onBeforeCall(sdkObject, metadata);
     }
-    this._recorderApp?.setPaused(this._debugger.isPaused());
+    this.emit(RecorderEvent.PausedStateChanged, this._debugger.isPaused());
     this._updateUserSources();
     this.updateCallLog([...this._currentCallsMetadata.keys()]);
   }
 
+  mode() {
+    return this._mode;
+  }
+
   setMode(mode: Mode) {
     if (this._mode === mode)
       return;
-    this._highlightedSelector = '';
+    this._highlightedElement = {};
     this._mode = mode;
-    this._recorderApp?.setMode(this._mode);
-    this._contextRecorder.setEnabled(this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue');
-    this._debugger.setMuted(this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue');
+    this.emit(RecorderEvent.ModeChanged, this._mode);
+    this._setEnabled(this._isRecording());
+    this._debugger.setMuted(this._isRecording());
     if (this._mode !== 'none' && this._mode !== 'standby' && this._context.pages().length === 1)
       this._context.pages()[0].bringToFront().catch(() => {});
     this._refreshOverlay();
   }
 
+  url(): string | undefined {
+    const page = this._context.pages()[0];
+    return page?.mainFrame().url();
+  }
+
+  setHighlightedSelector(selector: string) {
+    this._highlightedElement = { selector: locatorOrSelectorAsSelector(this._currentLanguage, selector, this._context.selectors().testIdAttributeName()) };
+    this._refreshOverlay();
+  }
+
+  setHighlightedAriaTemplate(ariaTemplate: AriaTemplateNode) {
+    this._highlightedElement = { ariaTemplate };
+    this._refreshOverlay();
+  }
+
+  step() {
+    this._debugger.resume(true);
+  }
+
+  setLanguage(language: Language) {
+    this._currentLanguage = language;
+    this._refreshOverlay();
+  }
+
   resume() {
     this._debugger.resume(false);
   }
 
-  mode() {
-    return this._mode;
+  pause() {
+    this._debugger.pauseOnNextStatement();
   }
 
-  setHighlightedSelector(language: Language, selector: string) {
-    this._highlightedSelector = locatorOrSelectorAsSelector(language, selector, this._context.selectors().testIdAttributeName());
-    this._refreshOverlay();
+  paused() {
+    return this._debugger.isPaused();
+  }
+
+  close() {
+    this._debugger.resume(false);
   }
 
   hideHighlightedSelector() {
-    this._highlightedSelector = '';
+    this._highlightedElement = {};
     this._refreshOverlay();
   }
 
-  setOutput(codegenId: string, outputFile: string | undefined) {
-    this._contextRecorder.setOutput(codegenId, outputFile);
+  pausedSourceId() {
+    for (const { metadata } of this._debugger.pausedDetails()) {
+      if (!metadata.location)
+        continue;
+      const source = this._userSources.get(metadata.location.file);
+      if (!source)
+        continue;
+      return source.id;
+    }
+  }
+
+  userSources() {
+    return [...this._userSources.values()];
+  }
+
+  callLog(): CallLog[] {
+    return this._callLogs;
+  }
+
+  private async _scopeHighlightedSelectorToFrame(frame: Frame): Promise<string | undefined> {
+    if (!this._highlightedElement.selector)
+      return;
+    try {
+      const mainFrame = frame._page.mainFrame();
+      const resolved = await mainFrame.selectors.resolveFrameForSelector(this._highlightedElement.selector);
+      // selector couldn't be found, don't highlight anything
+      if (!resolved)
+        return '';
+
+      // selector points to no specific frame, highlight in all frames
+      if (resolved?.frame === mainFrame)
+        return stringifySelector(resolved.info.parsed);
+
+      // selector points to this frame, highlight it
+      if (resolved?.frame === frame)
+        return stringifySelector(resolved.info.parsed);
+
+      // selector points to a different frame, highlight nothing
+      return '';
+    } catch {
+      return '';
+    }
   }
 
   private _refreshOverlay() {
-    for (const page of this._context.pages())
-      page.mainFrame().evaluateExpression('window.__pw_refreshOverlay()').catch(() => {});
+    for (const page of this._context.pages()) {
+      for (const frame of page.frames())
+        frame.evaluateExpression('window.__pw_refreshOverlay()').catch(() => {});
+    }
   }
 
   async onBeforeCall(sdkObject: SdkObject, metadata: CallMetadata) {
-    if (this._omitCallTracking || this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue')
+    if (this._omitCallTracking || this._isRecording())
       return;
     this._currentCallsMetadata.set(metadata, sdkObject);
     this._updateUserSources();
     this.updateCallLog([metadata]);
-    if (isScreenshotCommand(metadata)) {
+    if (isScreenshotCommand(metadata))
       this.hideHighlightedSelector();
-    } else if (metadata.params && metadata.params.selector) {
-      this._highlightedSelector = metadata.params.selector;
-      this._recorderApp?.setSelector(this._highlightedSelector).catch(() => {});
-    }
+    else if (metadata.params && metadata.params.selector)
+      this._highlightedElement = { selector: metadata.params.selector };
   }
 
   async onAfterCall(sdkObject: SdkObject, metadata: CallMetadata) {
-    if (this._omitCallTracking || this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue')
+    if (this._omitCallTracking || this._isRecording())
       return;
     if (!metadata.error)
       this._currentCallsMetadata.delete(metadata);
@@ -311,7 +385,6 @@ export class Recorder implements InstrumentationListener {
     }
 
     // Apply new decorations.
-    let fileToSelect = undefined;
     for (const metadata of this._currentCallsMetadata.keys()) {
       if (!metadata.location)
         continue;
@@ -325,16 +398,9 @@ export class Recorder implements InstrumentationListener {
         const paused = this._debugger.isPaused(metadata);
         source.highlight.push({ line, type: metadata.error ? 'error' : (paused ? 'paused' : 'running') });
         source.revealLine = line;
-        fileToSelect = source.id;
       }
     }
-    this._pushAllSources();
-    if (fileToSelect)
-      this._recorderApp?.setFileIfNeeded(fileToSelect);
-  }
-
-  private _pushAllSources() {
-    this._recorderApp?.setSources([...this._recorderSources, ...this._userSources.values()]);
+    this.emit(RecorderEvent.UserSourcesChanged, this.userSources(), this.pausedSourceId());
   }
 
   async onBeforeInputAction(sdkObject: SdkObject, metadata: CallMetadata) {
@@ -345,7 +411,7 @@ export class Recorder implements InstrumentationListener {
   }
 
   updateCallLog(metadatas: CallMetadata[]) {
-    if (this._mode === 'recording' || this._mode === 'assertingText' || this._mode === 'assertingVisibility' || this._mode === 'assertingValue')
+    if (this._isRecording())
       return;
     const logs: CallLog[] = [];
     for (const metadata of metadatas) {
@@ -358,7 +424,12 @@ export class Recorder implements InstrumentationListener {
         status = 'paused';
       logs.push(metadataToCallLog(metadata, status));
     }
-    this._recorderApp?.updateCallLogs(logs);
+    this._callLogs = logs;
+    this.emit(RecorderEvent.CallLogsUpdated, logs);
+  }
+
+  private _isRecording() {
+    return ['recording', 'assertingText', 'assertingVisibility', 'assertingValue', 'assertingSnapshot'].includes(this._mode);
   }
 
   private _readSource(fileName: string): string {
@@ -368,146 +439,31 @@ export class Recorder implements InstrumentationListener {
       return '// No source available';
     }
   }
-}
-
-class ContextRecorder extends EventEmitter {
-  static Events = {
-    Change: 'change'
-  };
-
-  private _generator: CodeGenerator;
-  private _pageAliases = new Map<Page, string>();
-  private _lastPopupOrdinal = 0;
-  private _lastDialogOrdinal = -1;
-  private _lastDownloadOrdinal = -1;
-  private _timers = new Set<NodeJS.Timeout>();
-  private _context: BrowserContext;
-  private _params: channels.BrowserContextRecorderSupplementEnableParams;
-  private _recorderSources: Source[];
-  private _throttledOutputFile: ThrottledFile | null = null;
-  private _orderedLanguages: LanguageGenerator[] = [];
-  private _listeners: RegisteredListener[] = [];
-
-  constructor(context: BrowserContext, params: channels.BrowserContextRecorderSupplementEnableParams) {
-    super();
-    this._context = context;
-    this._params = params;
-    this._recorderSources = [];
-    const language = params.language || context.attribution.playwright.options.sdkLanguage;
-    this.setOutput(language, params.outputFile);
-    const generator = new CodeGenerator(context._browser.options.name, params.mode === 'recording', params.launchOptions || {}, params.contextOptions || {}, params.device, params.saveStorage);
-    generator.on('change', () => {
-      this._recorderSources = [];
-      for (const languageGenerator of this._orderedLanguages) {
-        const { header, footer, actions, text } = generator.generateStructure(languageGenerator);
-        const source: Source = {
-          isRecorded: true,
-          label: languageGenerator.name,
-          group: languageGenerator.groupName,
-          id: languageGenerator.id,
-          text,
-          header,
-          footer,
-          actions,
-          language: languageGenerator.highlighter,
-          highlight: []
-        };
-        source.revealLine = text.split('\n').length - 1;
-        this._recorderSources.push(source);
-        if (languageGenerator === this._orderedLanguages[0])
-          this._throttledOutputFile?.setContent(source.text);
-      }
-      this.emit(ContextRecorder.Events.Change, {
-        sources: this._recorderSources,
-        primaryFileName: this._orderedLanguages[0].id
-      });
-    });
-    context.on(BrowserContext.Events.BeforeClose, () => {
-      this._throttledOutputFile?.flush();
-    });
-    this._listeners.push(eventsHelper.addEventListener(process, 'exit', () => {
-      this._throttledOutputFile?.flush();
-    }));
-    this._generator = generator;
-  }
-
-  setOutput(codegenId: string, outputFile?: string) {
-    const languages = new Set([
-      new JavaLanguageGenerator('junit'),
-      new JavaLanguageGenerator('library'),
-      new JavaScriptLanguageGenerator(/* isPlaywrightTest */false),
-      new JavaScriptLanguageGenerator(/* isPlaywrightTest */true),
-      new PythonLanguageGenerator(/* isAsync */false, /* isPytest */true),
-      new PythonLanguageGenerator(/* isAsync */false, /* isPytest */false),
-      new PythonLanguageGenerator(/* isAsync */true,  /* isPytest */false),
-      new CSharpLanguageGenerator('mstest'),
-      new CSharpLanguageGenerator('nunit'),
-      new CSharpLanguageGenerator('library'),
-      new JsonlLanguageGenerator(),
-    ]);
-    const primaryLanguage = [...languages].find(l => l.id === codegenId);
-    if (!primaryLanguage)
-      throw new Error(`\n===============================\nUnsupported language: '${codegenId}'\n===============================\n`);
-    languages.delete(primaryLanguage);
-    this._orderedLanguages = [primaryLanguage, ...languages];
-    this._throttledOutputFile = outputFile ? new ThrottledFile(outputFile) : null;
-    this._generator?.restart();
-  }
-
-  languageName(id?: string): Language {
-    for (const lang of this._orderedLanguages) {
-      if (!id || lang.id === id)
-        return lang.highlighter;
-    }
-    return 'javascript';
-  }
-
-  async install() {
-    this._context.on(BrowserContext.Events.Page, (page: Page) => this._onPage(page));
-    for (const page of this._context.pages())
-      this._onPage(page);
-    this._context.on(BrowserContext.Events.Dialog, (dialog: Dialog) => this._onDialog(dialog.page()));
-
-    // Input actions that potentially lead to navigation are intercepted on the page and are
-    // performed by the Playwright.
-    await this._context.exposeBinding('__pw_recorderPerformAction', false,
-        (source: BindingSource, action: actions.Action) => this._performAction(source.frame, action));
-
-    // Other non-essential actions are simply being recorded.
-    await this._context.exposeBinding('__pw_recorderRecordAction', false,
-        (source: BindingSource, action: actions.Action) => this._recordAction(source.frame, action));
-
-    await this._context.extendInjectedScript(recorderSource.source);
-  }
 
-  setEnabled(enabled: boolean) {
-    this._generator.setEnabled(enabled);
-  }
-
-  dispose() {
-    for (const timer of this._timers)
-      clearTimeout(timer);
-    this._timers.clear();
-    eventsHelper.removeEventListeners(this._listeners);
+  private _setEnabled(enabled: boolean) {
+    this._enabled = enabled;
   }
 
   private async _onPage(page: Page) {
     // First page is called page, others are called popup1, popup2, etc.
     const frame = page.mainFrame();
-    page.on('close', () => {
-      this._generator.addAction({
+    page.on(Page.Events.Close, () => {
+      this._signalProcessor.addAction({
         frame: this._describeMainFrame(page),
-        committed: true,
         action: {
           name: 'closePage',
           signals: [],
-        }
+        },
+        startTime: monotonicTime()
       });
       this._pageAliases.delete(page);
+      this._filePrimaryURLChanged();
     });
     frame.on(Frame.Events.InternalNavigation, event => {
-      if (event.isPublic)
+      if (event.isPublic) {
         this._onFrameNavigated(frame, page);
+        this._filePrimaryURLChanged();
+      }
     });
     page.on(Page.Events.Download, () => this._onDownload(page));
     const suffix = this._pageAliases.size ? String(++this._lastPopupOrdinal) : '';
@@ -517,20 +473,25 @@ class ContextRecorder extends EventEmitter {
     if (page.opener()) {
       this._onPopup(page.opener()!, page);
     } else {
-      this._generator.addAction({
+      this._signalProcessor.addAction({
         frame: this._describeMainFrame(page),
-        committed: true,
         action: {
           name: 'openPage',
           url: page.mainFrame().url(),
           signals: [],
-        }
+        },
+        startTime: monotonicTime()
       });
     }
+    this._filePrimaryURLChanged();
+  }
+
+  private _filePrimaryURLChanged() {
+    const page = this._context.pages()[0];
+    this.emit(RecorderEvent.PageNavigated, page?.mainFrame().url());
   }
 
-  clearScript(): void {
-    this._generator.restart();
+  clear(): void {
     if (this._params.mode === 'recording') {
       for (const page of this._context.pages())
         this._onFrameNavigated(page.mainFrame(), page);
@@ -539,163 +500,77 @@ class ContextRecorder extends EventEmitter {
 
   private _describeMainFrame(page: Page): actions.FrameDescription {
     return {
+      pageGuid: page.guid,
       pageAlias: this._pageAliases.get(page)!,
-      isMainFrame: true,
+      framePath: [],
     };
   }
 
   private async _describeFrame(frame: Frame): Promise<actions.FrameDescription> {
-    const page = frame._page;
-    const pageAlias = this._pageAliases.get(page)!;
-    const chain: Frame[] = [];
-    for (let ancestor: Frame | null = frame; ancestor; ancestor = ancestor.parentFrame())
-      chain.push(ancestor);
-    chain.reverse();
-
-    if (chain.length === 1)
-      return this._describeMainFrame(page);
-
-    const selectorPromises: Promise<string | undefined>[] = [];
-    for (let i = 0; i < chain.length - 1; i++)
-      selectorPromises.push(findFrameSelector(chain[i + 1]));
-
-    const result = await raceAgainstDeadline(() => Promise.all(selectorPromises), monotonicTime() + 2000);
-    if (!result.timedOut && result.result.every(selector => !!selector)) {
-      return {
-        pageAlias,
-        isMainFrame: false,
-        selectorsChain: result.result as string[],
-      };
-    }
-    // Best effort to find a selector for the frame.
-    const selectorsChain = [];
-    for (let i = 0; i < chain.length - 1; i++) {
-      if (chain[i].name())
-        selectorsChain.push(`iframe[name=${quoteCSSAttributeValue(chain[i].name())}]`);
-      else
-        selectorsChain.push(`iframe[src=${quoteCSSAttributeValue(chain[i].url())}]`);
-    }
     return {
-      pageAlias,
-      isMainFrame: false,
-      selectorsChain,
+      pageGuid: frame._page.guid,
+      pageAlias: this._pageAliases.get(frame._page)!,
+      framePath: await generateFrameSelector(frame),
     };
   }
 
-  testIdAttributeName(): string {
+  private _testIdAttributeName(): string {
     return this._params.testIdAttributeName || this._context.selectors().testIdAttributeName() || 'data-testid';
   }
 
-  private async _performAction(frame: Frame, action: actions.Action) {
-    // Commit last action so that no further signals are added to it.
-    this._generator.commitLastAction();
-
+  private async _createActionInContext(frame: Frame, action: actions.Action): Promise<actions.ActionInContext> {
     const frameDescription = await this._describeFrame(frame);
-    const actionInContext: ActionInContext = {
+    const actionInContext: actions.ActionInContext = {
       frame: frameDescription,
-      action
-    };
-
-    const perform = async (action: string, params: any, cb: (callMetadata: CallMetadata) => Promise<any>) => {
-      const callMetadata: CallMetadata = {
-        id: `call@${createGuid()}`,
-        apiName: 'frame.' + action,
-        objectId: frame.guid,
-        pageId: frame._page.guid,
-        frameId: frame.guid,
-        startTime: monotonicTime(),
-        endTime: 0,
-        type: 'Frame',
-        method: action,
-        params,
-        log: [],
-      };
-      this._generator.willPerformAction(actionInContext);
-
-      try {
-        await frame.instrumentation.onBeforeCall(frame, callMetadata);
-        await cb(callMetadata);
-      } catch (e) {
-        callMetadata.endTime = monotonicTime();
-        await frame.instrumentation.onAfterCall(frame, callMetadata);
-        this._generator.performedActionFailed(actionInContext);
-        return;
-      }
-
-      callMetadata.endTime = monotonicTime();
-      await frame.instrumentation.onAfterCall(frame, callMetadata);
-
-      this._setCommittedAfterTimeout(actionInContext);
-      this._generator.didPerformAction(actionInContext);
+      action,
+      description: undefined,
+      startTime: monotonicTime(),
     };
-
-    const kActionTimeout = 5000;
-    if (action.name === 'click') {
-      const { options } = toClickOptions(action);
-      await perform('click', { selector: action.selector }, callMetadata => frame.click(callMetadata, action.selector, { ...options, timeout: kActionTimeout, strict: true }));
-    }
-    if (action.name === 'press') {
-      const modifiers = toModifiers(action.modifiers);
-      const shortcut = [...modifiers, action.key].join('+');
-      await perform('press', { selector: action.selector, key: shortcut }, callMetadata => frame.press(callMetadata, action.selector, shortcut, { timeout: kActionTimeout, strict: true }));
-    }
-    if (action.name === 'check')
-      await perform('check', { selector: action.selector }, callMetadata => frame.check(callMetadata, action.selector, { timeout: kActionTimeout, strict: true }));
-    if (action.name === 'uncheck')
-      await perform('uncheck', { selector: action.selector }, callMetadata => frame.uncheck(callMetadata, action.selector, { timeout: kActionTimeout, strict: true }));
-    if (action.name === 'select') {
-      const values = action.options.map(value => ({ value }));
-      await perform('selectOption', { selector: action.selector, values }, callMetadata => frame.selectOption(callMetadata, action.selector, [], values, { timeout: kActionTimeout, strict: true }));
-    }
+    return actionInContext;
   }
 
-  private async _recordAction(frame: Frame, action: actions.Action) {
-    // Commit last action so that no further signals are added to it.
-    this._generator.commitLastAction();
-
-    const frameDescription = await this._describeFrame(frame);
-    const actionInContext: ActionInContext = {
-      frame: frameDescription,
-      action
-    };
-    this._setCommittedAfterTimeout(actionInContext);
-    this._generator.addAction(actionInContext);
+  private async _performAction(frame: Frame, action: actions.PerformOnRecordAction) {
+    const actionInContext = await this._createActionInContext(frame, action);
+    this._signalProcessor.addAction(actionInContext);
+    if (actionInContext.action.name !== 'openPage' && actionInContext.action.name !== 'closePage')
+      await performAction(this._pageAliases, actionInContext);
+    actionInContext.endTime = monotonicTime();
   }
 
-  private _setCommittedAfterTimeout(actionInContext: ActionInContext) {
-    const timer = setTimeout(() => {
-      // Commit the action after 5 seconds so that no further signals are added to it.
-      actionInContext.committed = true;
-      this._timers.delete(timer);
-    }, isUnderTest() ? 500 : 5000);
-    this._timers.add(timer);
+  private async _recordAction(frame: Frame, action: actions.Action) {
+    const actionInContext = await this._createActionInContext(frame, action);
+    this._signalProcessor.addAction(actionInContext);
   }
 
   private _onFrameNavigated(frame: Frame, page: Page) {
     const pageAlias = this._pageAliases.get(page);
-    this._generator.signal(pageAlias!, frame, { name: 'navigation', url: frame.url() });
+    this._signalProcessor.signal(pageAlias!, frame, { name: 'navigation', url: frame.url() });
   }
 
   private _onPopup(page: Page, popup: Page) {
     const pageAlias = this._pageAliases.get(page)!;
     const popupAlias = this._pageAliases.get(popup)!;
-    this._generator.signal(pageAlias, page.mainFrame(), { name: 'popup', popupAlias });
+    this._signalProcessor.signal(pageAlias, page.mainFrame(), { name: 'popup', popupAlias });
   }
 
   private _onDownload(page: Page) {
     const pageAlias = this._pageAliases.get(page)!;
     ++this._lastDownloadOrdinal;
-    this._generator.signal(pageAlias, page.mainFrame(), { name: 'download', downloadAlias: this._lastDownloadOrdinal ? String(this._lastDownloadOrdinal) : '' });
+    this._signalProcessor.signal(pageAlias, page.mainFrame(), { name: 'download', downloadAlias: this._lastDownloadOrdinal ? String(this._lastDownloadOrdinal) : '' });
   }
 
   private _onDialog(page: Page) {
     const pageAlias = this._pageAliases.get(page)!;
     ++this._lastDialogOrdinal;
-    this._generator.signal(pageAlias, page.mainFrame(), { name: 'dialog', dialogAlias: this._lastDialogOrdinal ? String(this._lastDialogOrdinal) : '' });
+    this._signalProcessor.signal(pageAlias, page.mainFrame(), { name: 'dialog', dialogAlias: this._lastDialogOrdinal ? String(this._lastDialogOrdinal) : '' });
   }
 }
 
-function languageForFile(file: string) {
+function isScreenshotCommand(metadata: CallMetadata) {
+  return metadata.method.toLowerCase().includes('screenshot');
+}
+
+function languageForFile(file: string): Language {
   if (file.endsWith('.py'))
     return 'python';
   if (file.endsWith('.java'))
@@ -704,49 +579,3 @@ function languageForFile(file: string) {
     return 'csharp';
   return 'javascript';
 }
-
-class ThrottledFile {
-  private _file: string;
-  private _timer: NodeJS.Timeout | undefined;
-  private _text: string | undefined;
-
-  constructor(file: string) {
-    this._file = file;
-  }
-
-  setContent(text: string) {
-    this._text = text;
-    if (!this._timer)
-      this._timer = setTimeout(() => this.flush(), 250);
-  }
-
-  flush(): void {
-    if (this._timer) {
-      clearTimeout(this._timer);
-      this._timer = undefined;
-    }
-    if (this._text)
-      fs.writeFileSync(this._file, this._text);
-    this._text = undefined;
-  }
-}
-
-function isScreenshotCommand(metadata: CallMetadata) {
-  return metadata.method.toLowerCase().includes('screenshot');
-}
-
-async function findFrameSelector(frame: Frame): Promise<string | undefined> {
-  try {
-    const parent = frame.parentFrame();
-    const frameElement = await frame.frameElement();
-    if (!frameElement || !parent)
-      return;
-    const utility = await parent._utilityContext();
-    const injected = await utility.injectedScript();
-    const selector = await injected.evaluate((injected, element) => {
-      return injected.generateSelectorSimple(element as Element, { testIdAttributeName: '', omitInternalEngines: true });
-    }, frameElement);
-    return selector;
-  } catch (e) {
-  }
-}
diff --git a/packages/playwright-core/src/server/recorder/DEPS.list b/packages/playwright-core/src/server/recorder/DEPS.list
index 69c4226c6828f..6151537ccb4af 100644
--- a/packages/playwright-core/src/server/recorder/DEPS.list
+++ b/packages/playwright-core/src/server/recorder/DEPS.list
@@ -1,8 +1,11 @@
 [*]
 ../
+../codegen/language.ts
+../codegen/languages.ts
 ../isomorphic/**
 ../registry/**
-../../common/
+../utils/**
+../../generated/pollingRecorderSource.ts
 ../../protocol/
 ../../utils/**
 ../../utilsBundle.ts
diff --git a/packages/playwright-core/src/server/recorder/chat.ts b/packages/playwright-core/src/server/recorder/chat.ts
new file mode 100644
index 0000000000000..c3ad0238f7f00
--- /dev/null
+++ b/packages/playwright-core/src/server/recorder/chat.ts
@@ -0,0 +1,185 @@
+/**
+ * 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 { WebSocketTransport } from '../transport';
+
+import type { ConnectionTransport, ProtocolResponse } from '../transport';
+
+export type ChatMessage = {
+  content: string;
+  user: 'user' | 'assistant';
+};
+
+export class Chat {
+  private _history: ChatMessage[] = [];
+  private _connectionPromise: Promise<Connection> | undefined;
+  private _chatSinks = new Map<string, (chunk: string) => void>();
+  private _wsEndpoint: string;
+
+  constructor(wsEndpoint: string) {
+    this._wsEndpoint =  wsEndpoint;
+  }
+
+  clearHistory() {
+    this._history = [];
+  }
+
+  async post<T>(prompt: string): Promise<T | null> {
+    await this._append('user', prompt);
+    let text = await asString(await this._post());
+    if (text.startsWith('```json') && text.endsWith('```'))
+      text = text.substring('```json'.length, text.length - '```'.length);
+    for (let i = 0; i < 3; ++i) {
+      try {
+        return JSON.parse(text);
+      } catch (e) {
+        await this._append('user', String(e));
+      }
+    }
+    throw new Error('Failed to parse response: ' + text);
+  }
+
+  private async _append(user: ChatMessage['user'], content: string) {
+    this._history.push({ user, content });
+  }
+
+  private async _connection(): Promise<Connection> {
+    if (!this._connectionPromise) {
+      this._connectionPromise = WebSocketTransport.connect(undefined, this._wsEndpoint).then(transport => {
+        return new Connection(transport, (method, params) => this._dispatchEvent(method, params), () => {});
+      });
+    }
+    return this._connectionPromise;
+  }
+
+  private _dispatchEvent(method: string, params: any) {
+    if (method === 'chatChunk') {
+      const { chatId, chunk } = params;
+      const chunkSink = this._chatSinks.get(chatId)!;
+      chunkSink(chunk);
+      if (!chunk)
+        this._chatSinks.delete(chatId);
+    }
+  }
+
+  private async _post(): Promise<AsyncIterable<string>> {
+    const connection = await this._connection();
+    const result = await connection.send('chat', { history: this._history });
+    const { chatId } = result;
+    const { iterable, addChunk } = iterablePump();
+    this._chatSinks.set(chatId, addChunk);
+    return iterable;
+  }
+}
+
+export async function asString(stream: AsyncIterable<string>): Promise<string> {
+  let result = '';
+  for await (const chunk of stream)
+    result += chunk;
+  return result;
+}
+
+type ChunkIterator = {
+  iterable: AsyncIterable<string>;
+  addChunk: (chunk: string) => void;
+};
+
+function iterablePump(): ChunkIterator {
+  let controller: ReadableStreamDefaultController<string>;
+  const stream = new ReadableStream<string>({ start: c => controller = c });
+
+  const iterable = (async function* () {
+    const reader = stream.getReader();
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      yield value!;
+    }
+  })();
+
+  return {
+    iterable,
+    addChunk: chunk => {
+      if (chunk)
+        controller.enqueue(chunk);
+      else
+        controller.close();
+    }
+  };
+}
+
+class Connection {
+  private readonly _transport: ConnectionTransport;
+  private _lastId = 0;
+  private _closed = false;
+  private _pending = new Map<number, { resolve: (result: any) => void; reject: (error: any) => void; }>();
+  private _onEvent: (method: string, params: any) => void;
+  private _onClose: () => void;
+
+  constructor(transport: ConnectionTransport, onEvent: (method: string, params: any) => void, onClose: () => void) {
+    this._transport = transport;
+    this._onEvent = onEvent;
+    this._onClose = onClose;
+    this._transport.onmessage = this._dispatchMessage.bind(this);
+    this._transport.onclose = this._close.bind(this);
+  }
+
+  send(method: string, params: any): Promise<any> {
+    const id = this._lastId++;
+    const message = { id, method, params };
+    this._transport.send(message);
+    return new Promise((resolve, reject) => {
+      this._pending.set(id, { resolve, reject });
+    });
+  }
+
+  private _dispatchMessage(message: ProtocolResponse) {
+    if (message.id === undefined) {
+      this._onEvent(message.method!, message.params);
+      return;
+    }
+
+    const callback = this._pending.get(message.id);
+    this._pending.delete(message.id);
+    if (!callback)
+      return;
+
+    if (message.error) {
+      callback.reject(new Error(message.error.message));
+      return;
+    }
+    callback.resolve(message.result);
+  }
+
+  _close() {
+    this._closed = true;
+    this._transport.onmessage = undefined;
+    this._transport.onclose = undefined;
+    for (const { reject } of this._pending.values())
+      reject(new Error('Connection closed'));
+    this._onClose();
+  }
+
+  isClosed() {
+    return this._closed;
+  }
+
+  close() {
+    if (!this._closed)
+      this._transport.close();
+  }
+}
diff --git a/packages/playwright-core/src/server/recorder/codeGenerator.ts b/packages/playwright-core/src/server/recorder/codeGenerator.ts
deleted file mode 100644
index d3bb5f86d985a..0000000000000
--- a/packages/playwright-core/src/server/recorder/codeGenerator.ts
+++ /dev/null
@@ -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 { EventEmitter } from 'events';
-import type { BrowserContextOptions, LaunchOptions } from '../../..';
-import type { Frame } from '../frames';
-import type { LanguageGenerator, LanguageGeneratorOptions } from './language';
-import type { Action, Signal, FrameDescription } from './recorderActions';
-
-export type ActionInContext = {
-  frame: FrameDescription;
-  action: Action;
-  committed?: boolean;
-};
-
-export class CodeGenerator extends EventEmitter {
-  private _currentAction: ActionInContext | null = null;
-  private _lastAction: ActionInContext | null = null;
-  private _actions: ActionInContext[] = [];
-  private _enabled: boolean;
-  private _options: LanguageGeneratorOptions;
-
-  constructor(browserName: string, enabled: boolean, launchOptions: LaunchOptions, contextOptions: BrowserContextOptions, deviceName: string | undefined, saveStorage: string | undefined) {
-    super();
-
-    // Make a copy of options to modify them later.
-    launchOptions = { headless: false, ...launchOptions };
-    contextOptions = { ...contextOptions };
-    this._enabled = enabled;
-    this._options = { browserName, launchOptions, contextOptions, deviceName, saveStorage };
-    this.restart();
-  }
-
-  restart() {
-    this._currentAction = null;
-    this._lastAction = null;
-    this._actions = [];
-    this.emit('change');
-  }
-
-  setEnabled(enabled: boolean) {
-    this._enabled = enabled;
-  }
-
-  addAction(action: ActionInContext) {
-    if (!this._enabled)
-      return;
-    this.willPerformAction(action);
-    this.didPerformAction(action);
-  }
-
-  willPerformAction(action: ActionInContext) {
-    if (!this._enabled)
-      return;
-    this._currentAction = action;
-  }
-
-  performedActionFailed(action: ActionInContext) {
-    if (!this._enabled)
-      return;
-    if (this._currentAction === action)
-      this._currentAction = null;
-  }
-
-  didPerformAction(actionInContext: ActionInContext) {
-    if (!this._enabled)
-      return;
-    const action = actionInContext.action;
-    let eraseLastAction = false;
-    if (this._lastAction && this._lastAction.frame.pageAlias === actionInContext.frame.pageAlias) {
-      const lastAction = this._lastAction.action;
-      // We augment last action based on the type.
-      if (this._lastAction && action.name === 'fill' && lastAction.name === 'fill') {
-        if (action.selector === lastAction.selector)
-          eraseLastAction = true;
-      }
-      if (lastAction && action.name === 'click' && lastAction.name === 'click') {
-        if (action.selector === lastAction.selector && action.clickCount > lastAction.clickCount)
-          eraseLastAction = true;
-      }
-      if (lastAction && action.name === 'navigate' && lastAction.name === 'navigate') {
-        if (action.url === lastAction.url) {
-          // Already at a target URL.
-          this._currentAction = null;
-          return;
-        }
-      }
-      // Check and uncheck erase click.
-      if (lastAction && (action.name === 'check' || action.name === 'uncheck') && lastAction.name === 'click') {
-        if (action.selector === lastAction.selector)
-          eraseLastAction = true;
-      }
-    }
-
-    this._lastAction = actionInContext;
-    this._currentAction = null;
-    if (eraseLastAction)
-      this._actions.pop();
-    this._actions.push(actionInContext);
-    this.emit('change');
-  }
-
-  commitLastAction() {
-    if (!this._enabled)
-      return;
-    const action = this._lastAction;
-    if (action)
-      action.committed = true;
-  }
-
-  signal(pageAlias: string, frame: Frame, signal: Signal) {
-    if (!this._enabled)
-      return;
-
-    // Signal either arrives while action is being performed or shortly after.
-    if (this._currentAction) {
-      this._currentAction.action.signals.push(signal);
-      return;
-    }
-
-    if (this._lastAction && (!this._lastAction.committed || signal.name !== 'navigation')) {
-      const signals = this._lastAction.action.signals;
-      if (signal.name === 'navigation' && signals.length && signals[signals.length - 1].name === 'download')
-        return;
-      if (signal.name === 'download' && signals.length && signals[signals.length - 1].name === 'navigation')
-        signals.length = signals.length - 1;
-      this._lastAction.action.signals.push(signal);
-      this.emit('change');
-      return;
-    }
-
-    if (signal.name === 'navigation' && frame._page.mainFrame() === frame) {
-      this.addAction({
-        frame: {
-          pageAlias,
-          isMainFrame: true,
-        },
-        committed: true,
-        action: {
-          name: 'navigate',
-          url: frame.url(),
-          signals: [],
-        },
-      });
-    }
-  }
-
-  generateStructure(languageGenerator: LanguageGenerator) {
-    const header = languageGenerator.generateHeader(this._options);
-    const footer = languageGenerator.generateFooter(this._options.saveStorage);
-    const actions = this._actions.map(a => languageGenerator.generateAction(a)).filter(Boolean);
-    const text = [header, ...actions, footer].join('\n');
-    return { header, footer, actions, text };
-  }
-}
diff --git a/packages/playwright-core/src/server/recorder/language.ts b/packages/playwright-core/src/server/recorder/language.ts
deleted file mode 100644
index 87b1a8fac4847..0000000000000
--- a/packages/playwright-core/src/server/recorder/language.ts
+++ /dev/null
@@ -1,71 +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 { BrowserContextOptions, LaunchOptions } from '../../..';
-import type { Language } from '../../utils/isomorphic/locatorGenerators';
-import type { ActionInContext } from './codeGenerator';
-import type { Action, DialogSignal, DownloadSignal, PopupSignal } from './recorderActions';
-export type { Language } from '../../utils/isomorphic/locatorGenerators';
-
-export type LanguageGeneratorOptions = {
-  browserName: string;
-  launchOptions: LaunchOptions;
-  contextOptions: BrowserContextOptions;
-  deviceName?: string;
-  saveStorage?: string;
-};
-
-export type LocatorType = 'default' | 'role' | 'text' | 'label' | 'placeholder' | 'alt' | 'title' | 'test-id' | 'nth' | 'first' | 'last' | 'has-text';
-export type LocatorBase = 'page' | 'locator' | 'frame-locator';
-
-export interface LanguageGenerator {
-  id: string;
-  groupName: string;
-  name: string;
-  highlighter: Language;
-  generateHeader(options: LanguageGeneratorOptions): string;
-  generateAction(actionInContext: ActionInContext): string;
-  generateFooter(saveStorage: string | undefined): string;
-}
-
-export function sanitizeDeviceOptions(device: any, options: BrowserContextOptions): BrowserContextOptions {
-  // Filter out all the properties from the device descriptor.
-  const cleanedOptions: Record<string, any> = {};
-  for (const property in options) {
-    if (JSON.stringify(device[property]) !== JSON.stringify((options as any)[property]))
-      cleanedOptions[property] = (options as any)[property];
-  }
-  return cleanedOptions;
-}
-
-export function toSignalMap(action: Action) {
-  let popup: PopupSignal | undefined;
-  let download: DownloadSignal | undefined;
-  let dialog: DialogSignal | undefined;
-  for (const signal of action.signals) {
-    if (signal.name === 'popup')
-      popup = signal;
-    else if (signal.name === 'download')
-      download = signal;
-    else if (signal.name === 'dialog')
-      dialog = signal;
-  }
-  return {
-    popup,
-    download,
-    dialog,
-  };
-}
diff --git a/packages/playwright-core/src/server/recorder/recorderApp.ts b/packages/playwright-core/src/server/recorder/recorderApp.ts
index 40637302a0025..5d1ffb81bd11b 100644
--- a/packages/playwright-core/src/server/recorder/recorderApp.ts
+++ b/packages/playwright-core/src/server/recorder/recorderApp.ts
@@ -16,174 +16,408 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { Page } from '../page';
-import { ProgressController } from '../progress';
-import { EventEmitter } from 'events';
-import { serverSideCallMetadata } from '../instrumentation';
-import type { CallLog, EventData, Mode, Source } from '@recorder/recorderTypes';
-import { isUnderTest } from '../../utils';
+
+import { isUnderTest } from '../utils/debug';
 import { mime } from '../../utilsBundle';
 import { syncLocalStorageWithSettings } from '../launchApp';
-import type { Recorder } from '../recorder';
-import type { BrowserContext } from '../browserContext';
 import { launchApp } from '../launchApp';
+import { ProgressController } from '../progress';
+import { ThrottledFile } from './throttledFile';
+import { languageSet } from '../codegen/languages';
+import { collapseActions, shouldMergeAction } from './recorderUtils';
+import { generateCode } from '../codegen/language';
+import { Recorder, RecorderEvent } from '../recorder';
+import { BrowserContext } from '../browserContext';
 
-declare global {
-  interface Window {
-    playwrightSetFileIfNeeded: (file: string) => void;
-    playwrightSetMode: (mode: Mode) => void;
-    playwrightSetPaused: (paused: boolean) => void;
-    playwrightSetSources: (sources: Source[]) => void;
-    playwrightSetOverlayVisible: (visible: boolean) => void;
-    playwrightSetSelector: (selector: string, focus?: boolean) => void;
-    playwrightUpdateLogs: (callLogs: CallLog[]) => void;
-    dispatch(data: EventData): Promise<void>;
-    saveSettings(data: any): Promise<void>;
-  }
-}
-
-export interface IRecorderApp extends EventEmitter {
-  close(): Promise<void>;
-  setPaused(paused: boolean): Promise<void>;
-  setMode(mode: Mode): Promise<void>;
-  setFileIfNeeded(file: string): Promise<void>;
-  setSelector(selector: string, userGesture?: boolean): Promise<void>;
-  updateCallLogs(callLogs: CallLog[]): Promise<void>;
-  setSources(sources: Source[]): Promise<void>;
-}
+import type { Page } from '../page';
+import type * as actions from '@recorder/actions';
+import type { CallLog, ElementInfo, Mode, Source } from '@recorder/recorderTypes';
+import type { Language, LanguageGeneratorOptions } from '../codegen/types';
+import type * as channels from '@protocol/channels';
 
-export class EmptyRecorderApp extends EventEmitter implements IRecorderApp {
-  async close(): Promise<void> {}
-  async setPaused(paused: boolean): Promise<void> {}
-  async setMode(mode: Mode): Promise<void> {}
-  async setFileIfNeeded(file: string): Promise<void> {}
-  async setSelector(selector: string, userGesture?: boolean): Promise<void> {}
-  async updateCallLogs(callLogs: CallLog[]): Promise<void> {}
-  async setSources(sources: Source[]): Promise<void> {}
-}
+export type RecorderAppParams = channels.BrowserContextEnableRecorderParams & {
+  browserName: string;
+  sdkLanguage: Language;
+  headed: boolean;
+  executablePath?: string;
+  channel?: string;
+};
 
-export class RecorderApp extends EventEmitter implements IRecorderApp {
-  private _page: Page;
-  readonly wsEndpoint: string | undefined;
+export class RecorderApp {
   private _recorder: Recorder;
+  private _page: Page;
+  readonly wsEndpointForTest: string | undefined;
+  private _languageGeneratorOptions: LanguageGeneratorOptions;
+  private _throttledOutputFile: ThrottledFile | null = null;
+  private _actions: actions.ActionInContext[] = [];
+  private _userSources: Source[] = [];
+  private _recorderSources: Source[] = [];
+  private _primaryGeneratorId: string;
+  private _selectedGeneratorId: string;
 
-  constructor(recorder: Recorder, page: Page, wsEndpoint: string | undefined) {
-    super();
-    this.setMaxListeners(0);
-    this._recorder = recorder;
+  private constructor(recorder: Recorder, params: RecorderAppParams, page: Page, wsEndpointForTest: string | undefined) {
     this._page = page;
-    this.wsEndpoint = wsEndpoint;
-  }
+    this._recorder = recorder;
+    this.wsEndpointForTest = wsEndpointForTest;
 
-  async close() {
-    await this._page.context().close({ reason: 'Recorder window closed' });
+    // Make a copy of options to modify them later.
+    this._languageGeneratorOptions = {
+      browserName: params.browserName,
+      launchOptions: { headless: false, ...params.launchOptions, tracesDir: undefined },
+      contextOptions: { ...params.contextOptions },
+      deviceName: params.device,
+      saveStorage: params.saveStorage,
+    };
+
+    this._throttledOutputFile = params.outputFile ? new ThrottledFile(params.outputFile) : null;
+    this._primaryGeneratorId = process.env.TEST_INSPECTOR_LANGUAGE || params.language || determinePrimaryGeneratorId(params.sdkLanguage);
+    this._selectedGeneratorId = this._primaryGeneratorId;
   }
 
-  private async _init() {
+  private async _init(inspectedContext: BrowserContext) {
     await syncLocalStorageWithSettings(this._page, 'recorder');
 
-    await this._page._setServerRequestInterceptor(route => {
-      if (!route.request().url().startsWith('https://playwright/'))
-        return false;
-
-      const uri = route.request().url().substring('https://playwright/'.length);
-      const file = require.resolve('../../vite/recorder/' + uri);
-      fs.promises.readFile(file).then(buffer => {
-        route.fulfill({
-          requestUrl: route.request().url(),
-          status: 200,
-          headers: [
-            { name: 'Content-Type', value: mime.getType(path.extname(file)) || 'application/octet-stream' }
-          ],
-          body: buffer.toString('base64'),
-          isBase64: true
-        }).catch(() => {});
+    const controller = new ProgressController();
+    await controller.run(async progress => {
+      await this._page.addRequestInterceptor(progress, route => {
+        if (!route.request().url().startsWith('https://playwright/')) {
+          route.continue({ isFallback: true }).catch(() => {});
+          return;
+        }
+
+        const uri = route.request().url().substring('https://playwright/'.length);
+        const file = require.resolve('../../vite/recorder/' + uri);
+        fs.promises.readFile(file).then(buffer => {
+          route.fulfill({
+            status: 200,
+            headers: [
+              { name: 'Content-Type', value: mime.getType(path.extname(file)) || 'application/octet-stream' }
+            ],
+            body: buffer.toString('base64'),
+            isBase64: true
+          }).catch(() => {});
+        });
       });
-      return true;
-    });
 
-    await this._page.exposeBinding('dispatch', false, (_, data: any) => this.emit('event', data));
+      await this._page.exposeBinding(progress, 'dispatch', false, (_, data: any) => this._handleUIEvent(data));
+
+      this._page.once('close', () => {
+        this._recorder.close();
+        this._page.browserContext.close({ reason: 'Recorder window closed' }).catch(() => {});
+        delete (inspectedContext as any)[recorderAppSymbol];
+      });
 
-    this._page.once('close', () => {
-      this.emit('close');
-      this._page.context().close({ reason: 'Recorder window closed' }).catch(() => {});
+      await this._page.mainFrame().goto(progress, process.env.PW_HMR ? 'http://localhost:44225' : 'https://playwright/index.html');
     });
 
-    const mainFrame = this._page.mainFrame();
-    await mainFrame.goto(serverSideCallMetadata(), 'https://playwright/index.html');
+    const url = this._recorder.url();
+    if (url)
+      this._onPageNavigated(url);
+    this._onModeChanged(this._recorder.mode());
+    this._onPausedStateChanged(this._recorder.paused());
+    this._updateActions('reveal');
+    // Update paused sources *after* generated ones, to reveal the currently paused source if any.
+    this._onUserSourcesChanged(this._recorder.userSources(), this._recorder.pausedSourceId());
+    this._onCallLogsUpdated(this._recorder.callLog());
+    this._wireListeners(this._recorder);
+  }
+
+  private _handleUIEvent(data: any) {
+    if (data.event === 'clear') {
+      this._actions = [];
+      this._updateActions('reveal');
+      this._recorder.clear();
+      return;
+    }
+    if (data.event === 'fileChanged') {
+      const source = [...this._recorderSources, ...this._userSources].find(s => s.id === data.params.fileId);
+      if (source) {
+        if (source.isRecorded)
+          this._selectedGeneratorId = source.id;
+        this._recorder.setLanguage(source.language);
+      }
+      return;
+    }
+    if (data.event === 'setAutoExpect') {
+      this._languageGeneratorOptions.generateAutoExpect = data.params.autoExpect;
+      this._updateActions();
+      return;
+    }
+    if (data.event === 'setMode') {
+      this._recorder.setMode(data.params.mode);
+      return;
+    }
+    if (data.event === 'resume') {
+      this._recorder.resume();
+      return;
+    }
+    if (data.event === 'pause') {
+      this._recorder.pause();
+      return;
+    }
+    if (data.event === 'step') {
+      this._recorder.step();
+      return;
+    }
+    if (data.event === 'highlightRequested') {
+      if (data.params.selector)
+        this._recorder.setHighlightedSelector(data.params.selector);
+      if (data.params.ariaTemplate)
+        this._recorder.setHighlightedAriaTemplate(data.params.ariaTemplate);
+      return;
+    }
+    throw new Error(`Unknown event: ${data.event}`);
+  }
+
+  static async show(context: BrowserContext, params: channels.BrowserContextEnableRecorderParams) {
+    if (process.env.PW_CODEGEN_NO_INSPECTOR)
+      return;
+    const recorder = await Recorder.forContext(context, params);
+    if (params.recorderMode === 'api') {
+      const browserName = context._browser.options.name;
+      await ProgrammaticRecorderApp.run(context, recorder, browserName, params);
+      return;
+    }
+    await RecorderApp._show(recorder, context, params);
   }
 
-  static async open(recorder: Recorder, inspectedContext: BrowserContext, handleSIGINT: boolean | undefined): Promise<IRecorderApp> {
-    const sdkLanguage = inspectedContext.attribution.playwright.options.sdkLanguage;
+  async close() {
+    await this._page.close();
+  }
+
+  static showInspectorNoReply(context: BrowserContext) {
+    if (process.env.PW_CODEGEN_NO_INSPECTOR)
+      return;
+    void Recorder.forContext(context, {}).then(recorder => RecorderApp._show(recorder, context, {})).catch(() => {});
+  }
+
+  private static async _show(recorder: Recorder, inspectedContext: BrowserContext, params: channels.BrowserContextEnableRecorderParams) {
+    if ((inspectedContext as any)[recorderAppSymbol])
+      return;
+    (inspectedContext as any)[recorderAppSymbol] = true;
+    const sdkLanguage = inspectedContext._browser.sdkLanguage();
     const headed = !!inspectedContext._browser.options.headful;
     const recorderPlaywright = (require('../playwright').createPlaywright as typeof import('../playwright').createPlaywright)({ sdkLanguage: 'javascript', isInternalPlaywright: true });
-    const { context, page } = await launchApp(recorderPlaywright.chromium, {
+    const { context: appContext, page } = await launchApp(recorderPlaywright.chromium, {
       sdkLanguage,
       windowSize: { width: 600, height: 600 },
       windowPosition: { x: 1020, y: 10 },
       persistentContextOptions: {
         noDefaultViewport: true,
         headless: !!process.env.PWTEST_CLI_HEADLESS || (isUnderTest() && !headed),
-        useWebSocket: !!process.env.PWTEST_RECORDER_PORT,
-        handleSIGINT,
-        args: process.env.PWTEST_RECORDER_PORT ? [`--remote-debugging-port=${process.env.PWTEST_RECORDER_PORT}`] : [],
+        cdpPort: isUnderTest() ? 0 : undefined,
+        handleSIGINT: params.handleSIGINT,
+        executablePath: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.customExecutablePath : undefined,
+        // Use the same channel as the inspected context to guarantee that the browser is installed.
+        channel: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.channel : undefined,
       }
     });
-    const controller = new ProgressController(serverSideCallMetadata(), context._browser);
+    const controller = new ProgressController();
     await controller.run(async progress => {
-      await context._browser._defaultContext!._loadDefaultContextAsIs(progress);
+      await appContext._browser._defaultContext!._loadDefaultContextAsIs(progress);
     });
 
-    const result = new RecorderApp(recorder, page, context._browser.options.wsEndpoint);
-    await result._init();
-    return result;
+    const appParams = {
+      browserName: inspectedContext._browser.options.name,
+      sdkLanguage: inspectedContext._browser.sdkLanguage(),
+      wsEndpointForTest: inspectedContext._browser.options.wsEndpoint,
+      headed: !!inspectedContext._browser.options.headful,
+      executablePath: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.customExecutablePath : undefined,
+      channel: inspectedContext._browser.options.isChromium ? inspectedContext._browser.options.channel : undefined,
+      ...params,
+    };
+
+    const recorderApp = new RecorderApp(recorder, appParams, page, appContext._browser.options.wsEndpoint);
+    await recorderApp._init(inspectedContext);
+    (inspectedContext as any).recorderAppForTest = recorderApp;
   }
 
-  async setMode(mode: Mode): Promise<void> {
-    await this._page.mainFrame().evaluateExpression(((mode: Mode) => {
-      window.playwrightSetMode(mode);
-    }).toString(), { isFunction: true }, mode).catch(() => {});
+  private _wireListeners(recorder: Recorder) {
+    recorder.on(RecorderEvent.ActionAdded, (action: actions.ActionInContext) => {
+      this._onActionAdded(action);
+    });
+
+    recorder.on(RecorderEvent.SignalAdded, (signal: actions.SignalInContext) => {
+      this._onSignalAdded(signal);
+    });
+
+    recorder.on(RecorderEvent.PageNavigated, (url: string) => {
+      this._onPageNavigated(url);
+    });
+
+    recorder.on(RecorderEvent.ContextClosed, () => {
+      this._onContextClosed();
+    });
+
+    recorder.on(RecorderEvent.ModeChanged, (mode: Mode) => {
+      this._onModeChanged(mode);
+    });
+
+    recorder.on(RecorderEvent.PausedStateChanged, (paused: boolean) => {
+      this._onPausedStateChanged(paused);
+    });
+
+    recorder.on(RecorderEvent.UserSourcesChanged, (sources: Source[], pausedSourceId?: string) => {
+      this._onUserSourcesChanged(sources, pausedSourceId);
+    });
+
+    recorder.on(RecorderEvent.ElementPicked, (elementInfo: ElementInfo, userGesture?: boolean) => {
+      this._onElementPicked(elementInfo, userGesture);
+    });
+
+    recorder.on(RecorderEvent.CallLogsUpdated, (callLogs: CallLog[]) => {
+      this._onCallLogsUpdated(callLogs);
+    });
+  }
+
+  private _onActionAdded(action: actions.ActionInContext) {
+    this._actions.push(action);
+    this._updateActions('reveal');
+  }
+
+  private _onSignalAdded(signal: actions.SignalInContext) {
+    const lastAction = this._actions.findLast(a => a.frame.pageGuid === signal.frame.pageGuid);
+    if (lastAction)
+      lastAction.action.signals.push(signal.signal);
+    this._updateActions();
+  }
+
+  private _onPageNavigated(url: string) {
+    this._page.mainFrame().evaluateExpression((({ url }: { url: string }) => {
+      window.playwrightSetPageURL(url);
+    }).toString(), { isFunction: true }, { url }).catch(() => {});
+  }
+
+  private _onContextClosed() {
+    this._throttledOutputFile?.flush();
+    this._page.browserContext.close({ reason: 'Recorder window closed' }).catch(() => {});
   }
 
-  async setFileIfNeeded(file: string): Promise<void> {
-    await this._page.mainFrame().evaluateExpression(((file: string) => {
-      window.playwrightSetFileIfNeeded(file);
-    }).toString(), { isFunction: true }, file).catch(() => {});
+  private _onModeChanged(mode: Mode) {
+    this._page.mainFrame().evaluateExpression(((mode: Mode) => {
+      window.playwrightSetMode(mode);
+    }).toString(), { isFunction: true }, mode).catch(() => {});
   }
 
-  async setPaused(paused: boolean): Promise<void> {
-    await this._page.mainFrame().evaluateExpression(((paused: boolean) => {
+  private _onPausedStateChanged(paused: boolean) {
+    this._page.mainFrame().evaluateExpression(((paused: boolean) => {
       window.playwrightSetPaused(paused);
     }).toString(), { isFunction: true }, paused).catch(() => {});
   }
 
-  async setSources(sources: Source[]): Promise<void> {
-    await this._page.mainFrame().evaluateExpression(((sources: Source[]) => {
+  private _onUserSourcesChanged(sources: Source[], pausedSourceId: string | undefined) {
+    if (!sources.length && !this._userSources.length)
+      return;
+    this._userSources = sources;
+    this._pushAllSources();
+    this._revealSource(pausedSourceId);
+  }
+
+  private _onElementPicked(elementInfo: ElementInfo, userGesture?: boolean) {
+    if (userGesture)
+      this._page.bringToFront();
+    this._page.mainFrame().evaluateExpression(((param: { elementInfo: ElementInfo, userGesture?: boolean }) => {
+      window.playwrightElementPicked(param.elementInfo, param.userGesture);
+    }).toString(), { isFunction: true }, { elementInfo, userGesture }).catch(() => {});
+  }
+
+  private _onCallLogsUpdated(callLogs: CallLog[]) {
+    this._page.mainFrame().evaluateExpression(((callLogs: CallLog[]) => {
+      window.playwrightUpdateLogs(callLogs);
+    }).toString(), { isFunction: true }, callLogs).catch(() => {});
+  }
+
+  private _pushAllSources() {
+    const sources = [...this._userSources, ...this._recorderSources];
+    this._page.mainFrame().evaluateExpression((({ sources }: { sources: Source[] }) => {
       window.playwrightSetSources(sources);
-    }).toString(), { isFunction: true }, sources).catch(() => {});
+    }).toString(), { isFunction: true }, { sources }).catch(() => {});
+  }
 
-    // Testing harness for runCLI mode.
-    if (process.env.PWTEST_CLI_IS_UNDER_TEST && sources.length)
-      (process as any)._didSetSourcesForTest(sources[0].text);
+  private _revealSource(sourceId: string | undefined) {
+    if (!sourceId)
+      return;
+    this._page.mainFrame().evaluateExpression((({ sourceId }: { sourceId: string }) => {
+      window.playwrightSelectSource(sourceId);
+    }).toString(), { isFunction: true }, { sourceId }).catch(() => {});
   }
 
-  async setSelector(selector: string, userGesture?: boolean): Promise<void> {
-    if (userGesture) {
-      if (this._recorder.mode() === 'inspecting') {
-        this._recorder.setMode('standby');
-        this._page.bringToFront();
-      } else {
-        this._recorder.setMode('recording');
-      }
+  private _updateActions(reveal?: 'reveal') {
+    const recorderSources = [];
+    const actions = collapseActions(this._actions);
+
+    let revealSourceId: string | undefined;
+    for (const languageGenerator of languageSet()) {
+      const { header, footer, actionTexts, text } = generateCode(actions, languageGenerator, this._languageGeneratorOptions);
+      const source: Source = {
+        isRecorded: true,
+        label: languageGenerator.name,
+        group: languageGenerator.groupName,
+        id: languageGenerator.id,
+        text,
+        header,
+        footer,
+        actions: actionTexts,
+        language: languageGenerator.highlighter,
+        highlight: []
+      };
+      source.revealLine = text.split('\n').length - 1;
+      recorderSources.push(source);
+      if (languageGenerator.id === this._primaryGeneratorId)
+        this._throttledOutputFile?.setContent(source.text);
+      if (reveal === 'reveal' && source.id === this._selectedGeneratorId)
+        revealSourceId = source.id;
     }
-    await this._page.mainFrame().evaluateExpression(((data: { selector: string, userGesture?: boolean }) => {
-      window.playwrightSetSelector(data.selector, data.userGesture);
-    }).toString(), { isFunction: true }, { selector, userGesture }).catch(() => {});
+
+    this._recorderSources = recorderSources;
+    this._pushAllSources();
+    this._revealSource(revealSourceId);
+  }
+}
+
+// For example, if the SDK language is 'javascript', this returns 'playwright-test'.
+function determinePrimaryGeneratorId(sdkLanguage: Language): string {
+  for (const language of languageSet()) {
+    if (language.highlighter === sdkLanguage)
+      return language.id;
   }
+  return sdkLanguage;
+}
 
-  async updateCallLogs(callLogs: CallLog[]): Promise<void> {
-    await this._page.mainFrame().evaluateExpression(((callLogs: CallLog[]) => {
-      window.playwrightUpdateLogs(callLogs);
-    }).toString(), { isFunction: true }, callLogs).catch(() => {});
+export class ProgrammaticRecorderApp {
+  static async run(inspectedContext: BrowserContext, recorder: Recorder, browserName: string, params: channels.BrowserContextEnableRecorderParams) {
+    let lastAction: actions.ActionInContext | null = null;
+    const languages = [...languageSet()];
+
+    const languageGeneratorOptions = {
+      browserName: browserName,
+      launchOptions: { headless: false, ...params.launchOptions, tracesDir: undefined },
+      contextOptions: { ...params.contextOptions },
+      deviceName: params.device,
+      saveStorage: params.saveStorage,
+    };
+    const languageGenerator = languages.find(l => l.id === params.language) ?? languages.find(l => l.id === 'playwright-test')!;
+
+    recorder.on(RecorderEvent.ActionAdded, action => {
+      const page = findPageByGuid(inspectedContext, action.frame.pageGuid);
+      if (!page)
+        return;
+      const { actionTexts } = generateCode([action], languageGenerator, languageGeneratorOptions);
+      if (!lastAction || !shouldMergeAction(action, lastAction))
+        inspectedContext.emit(BrowserContext.Events.RecorderEvent, { event: 'actionAdded', data: action, page, code: actionTexts.join('\n') });
+      else
+        inspectedContext.emit(BrowserContext.Events.RecorderEvent, { event: 'actionUpdated', data: action, page, code: actionTexts.join('\n') });
+      lastAction = action;
+    });
+    recorder.on(RecorderEvent.SignalAdded, signal => {
+      const page = findPageByGuid(inspectedContext, signal.frame.pageGuid);
+      inspectedContext.emit(BrowserContext.Events.RecorderEvent, { event: 'signalAdded', data: signal, page, code: '' });
+    });
   }
 }
+
+function findPageByGuid(context: BrowserContext, guid: string) {
+  return context.pages().find(p => p.guid === guid);
+}
+
+const recorderAppSymbol = Symbol('recorderApp');
diff --git a/packages/playwright-core/src/server/recorder/recorderRunner.ts b/packages/playwright-core/src/server/recorder/recorderRunner.ts
new file mode 100644
index 0000000000000..6dfa3bbfa7acf
--- /dev/null
+++ b/packages/playwright-core/src/server/recorder/recorderRunner.ts
@@ -0,0 +1,145 @@
+/**
+ * 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 { serializeExpectedTextValues } from '../../utils';
+import { toKeyboardModifiers } from '../codegen/language';
+import { buildFullSelector, mainFrameForAction } from './recorderUtils';
+import { Progress, ProgressController } from '../progress';
+
+import type { Page } from '../page';
+import type * as types from '../types';
+import type * as actions from '@recorder/actions';
+import type { Frame } from '../frames';
+
+export async function performAction(pageAliases: Map<Page, string>, actionInContext: actions.ActionInContext) {
+  const mainFrame = mainFrameForAction(pageAliases, actionInContext);
+  const controller = new ProgressController();
+  const kActionTimeout = 5000;
+  return await controller.run(progress => performActionImpl(progress, mainFrame, actionInContext), kActionTimeout);
+}
+
+async function performActionImpl(progress: Progress, mainFrame: Frame, actionInContext: actions.ActionInContext) {
+  const { action } = actionInContext;
+
+  if (action.name === 'navigate') {
+    await mainFrame.goto(progress, action.url);
+    return;
+  }
+
+  if (action.name === 'openPage')
+    throw Error('Not reached');
+
+  if (action.name === 'closePage') {
+    await mainFrame._page.close();
+    return;
+  }
+
+  const selector = buildFullSelector(actionInContext.frame.framePath, action.selector);
+
+  if (action.name === 'click') {
+    const options = toClickOptions(action);
+    await mainFrame.click(progress, selector, { ...options, strict: true });
+    return;
+  }
+
+  if (action.name === 'press') {
+    const modifiers = toKeyboardModifiers(action.modifiers);
+    const shortcut = [...modifiers, action.key].join('+');
+    await mainFrame.press(progress, selector, shortcut, { strict: true });
+    return;
+  }
+
+  if (action.name === 'fill') {
+    await mainFrame.fill(progress, selector, action.text, { strict: true });
+    return;
+  }
+
+  if (action.name === 'setInputFiles') {
+    await mainFrame.setInputFiles(progress, selector, { selector, payloads: [], strict: true });
+    return;
+  }
+
+  if (action.name === 'check') {
+    await mainFrame.check(progress, selector, { strict: true });
+    return;
+  }
+
+  if (action.name === 'uncheck') {
+    await mainFrame.uncheck(progress, selector, { strict: true });
+    return;
+  }
+
+  if (action.name === 'select') {
+    const values = action.options.map(value => ({ value }));
+    await mainFrame.selectOption(progress, selector, [], values, { strict: true });
+    return;
+  }
+
+  if (action.name === 'assertChecked') {
+    await mainFrame.expect(progress, selector, {
+      selector,
+      expression: 'to.be.checked',
+      expectedValue: { checked: action.checked },
+      isNot: !action.checked,
+    });
+    return;
+  }
+
+  if (action.name === 'assertText') {
+    await mainFrame.expect(progress, selector, {
+      selector,
+      expression: 'to.have.text',
+      expectedText: serializeExpectedTextValues([action.text], { matchSubstring: true, normalizeWhiteSpace: true }),
+      isNot: false,
+    });
+    return;
+  }
+
+  if (action.name === 'assertValue') {
+    await mainFrame.expect(progress, selector, {
+      selector,
+      expression: 'to.have.value',
+      expectedValue: action.value,
+      isNot: false,
+    });
+    return;
+  }
+
+  if (action.name === 'assertVisible') {
+    await mainFrame.expect(progress, selector, {
+      selector,
+      expression: 'to.be.visible',
+      isNot: false,
+    });
+    return;
+  }
+
+  throw new Error('Internal error: unexpected action ' + (action as any).name);
+}
+
+export function toClickOptions(action: actions.ClickAction): types.MouseClickOptions {
+  const modifiers = toKeyboardModifiers(action.modifiers);
+  const options: types.MouseClickOptions = {};
+  if (action.button !== 'left')
+    options.button = action.button;
+  if (modifiers.length)
+    options.modifiers = modifiers;
+  if (action.clickCount > 1)
+    options.clickCount = action.clickCount;
+  if (action.position)
+    options.position = action.position;
+  return options;
+}
diff --git a/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts b/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts
new file mode 100644
index 0000000000000..a4d33fe40d33e
--- /dev/null
+++ b/packages/playwright-core/src/server/recorder/recorderSignalProcessor.ts
@@ -0,0 +1,89 @@
+/**
+ * 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 { isUnderTest } from '../utils/debug';
+import { monotonicTime } from '../../utils/isomorphic/time';
+import { generateFrameSelector } from './recorderUtils';
+
+import type { Signal } from '../../../../recorder/src/actions';
+import type { Frame } from '../frames';
+import type * as actions from '@recorder/actions';
+
+export interface ProcessorDelegate {
+  addAction(actionInContext: actions.ActionInContext): void;
+  addSignal(signalInContext: actions.SignalInContext): void;
+}
+
+export class RecorderSignalProcessor {
+  private _delegate: ProcessorDelegate;
+  private _lastAction: actions.ActionInContext | null = null;
+
+  constructor(actionSink: ProcessorDelegate) {
+    this._delegate = actionSink;
+  }
+
+  addAction(actionInContext: actions.ActionInContext) {
+    this._lastAction = actionInContext;
+    this._delegate.addAction(actionInContext);
+  }
+
+  signal(pageAlias: string, frame: Frame, signal: Signal) {
+    const timestamp = monotonicTime();
+    if (signal.name === 'navigation' && frame._page.mainFrame() === frame) {
+      const lastAction = this._lastAction;
+      const signalThreshold = isUnderTest() ? 500 : 5000;
+
+      let generateGoto = false;
+      if (!lastAction)
+        generateGoto = true;
+      else if (lastAction.action.name !== 'click' && lastAction.action.name !== 'press' && lastAction.action.name !== 'fill')
+        generateGoto = true;
+      else if (timestamp - lastAction.startTime > signalThreshold)
+        generateGoto = true;
+
+      if (generateGoto) {
+        this.addAction({
+          frame: {
+            pageGuid: frame._page.guid,
+            pageAlias,
+            framePath: [],
+          },
+          action: {
+            name: 'navigate',
+            url: frame.url(),
+            signals: [],
+          },
+          startTime: timestamp,
+          endTime: timestamp,
+        });
+      }
+      return;
+    }
+
+    generateFrameSelector(frame).then(framePath => {
+      const signalInContext: actions.SignalInContext = {
+        frame: {
+          pageGuid: frame._page.guid,
+          pageAlias,
+          framePath,
+        },
+        signal,
+        timestamp,
+      };
+      this._delegate.addSignal(signalInContext);
+    });
+  }
+}
diff --git a/packages/playwright-core/src/server/recorder/recorderUtils.ts b/packages/playwright-core/src/server/recorder/recorderUtils.ts
index d6237b4899471..03693b3f580d6 100644
--- a/packages/playwright-core/src/server/recorder/recorderUtils.ts
+++ b/packages/playwright-core/src/server/recorder/recorderUtils.ts
@@ -14,14 +14,22 @@
  * limitations under the License.
  */
 
+import { renderTitleForCall } from '../../utils/isomorphic/protocolFormatter';
+import { monotonicTime, quoteCSSAttributeValue  } from '../../utils';
+import { raceAgainstDeadline } from '../../utils/isomorphic/timeoutRunner';
+import { Frame } from '../frames';
+
 import type { CallMetadata } from '../instrumentation';
+import type { Page } from '../page';
+import type * as actions from '@recorder/actions';
 import type { CallLog, CallLogStatus } from '@recorder/recorderTypes';
 
+export function buildFullSelector(framePath: string[], selector: string) {
+  return [...framePath, selector].join(' >> internal:control=enter-frame >> ');
+}
+
 export function metadataToCallLog(metadata: CallMetadata, status: CallLogStatus): CallLog {
-  let title = metadata.apiName || metadata.method;
-  if (metadata.method === 'waitForEventInfo')
-    title += `(${metadata.params.info.event})`;
-  title = title.replace('object.expect', 'expect');
+  const title = renderTitleForCall(metadata);
   if (metadata.error)
     status = 'error';
   const params = {
@@ -36,7 +44,7 @@ export function metadataToCallLog(metadata: CallMetadata, status: CallLogStatus)
   const callLog: CallLog = {
     id: metadata.id,
     messages: metadata.log,
-    title,
+    title: title ?? '',
     status,
     error: metadata.error?.error?.message,
     params,
@@ -44,3 +52,101 @@ export function metadataToCallLog(metadata: CallMetadata, status: CallLogStatus)
   };
   return callLog;
 }
+
+export function mainFrameForAction(pageAliases: Map<Page, string>, actionInContext: actions.ActionInContext): Frame {
+  const pageAlias = actionInContext.frame.pageAlias;
+  const page = [...pageAliases.entries()].find(([, alias]) => pageAlias === alias)?.[0];
+  if (!page)
+    throw new Error(`Internal error: page ${pageAlias} not found in [${[...pageAliases.values()]}]`);
+  return page.mainFrame();
+}
+
+export async function frameForAction(pageAliases: Map<Page, string>, actionInContext: actions.ActionInContext, action: actions.ActionWithSelector): Promise<Frame> {
+  const pageAlias = actionInContext.frame.pageAlias;
+  const page = [...pageAliases.entries()].find(([, alias]) => pageAlias === alias)?.[0];
+  if (!page)
+    throw new Error('Internal error: page not found');
+  const fullSelector = buildFullSelector(actionInContext.frame.framePath, action.selector);
+  const result = await page.mainFrame().selectors.resolveFrameForSelector(fullSelector);
+  if (!result)
+    throw new Error('Internal error: frame not found');
+  return result.frame;
+}
+
+function isSameAction(a: actions.ActionInContext, b: actions.ActionInContext): boolean {
+  return a.action.name === b.action.name && a.frame.pageAlias === b.frame.pageAlias && a.frame.framePath.join('|') === b.frame.framePath.join('|');
+}
+
+function isSameSelector(action: actions.ActionInContext, lastAction: actions.ActionInContext): boolean {
+  return 'selector' in action.action && 'selector' in lastAction.action && action.action.selector === lastAction.action.selector;
+}
+
+function isShortlyAfter(action: actions.ActionInContext, lastAction: actions.ActionInContext): boolean {
+  return action.startTime - lastAction.startTime < 500;
+}
+
+export function shouldMergeAction(action: actions.ActionInContext, lastAction: actions.ActionInContext | undefined): boolean {
+  if (!lastAction)
+    return false;
+  switch (action.action.name) {
+    case 'fill':
+      return isSameAction(action, lastAction) && isSameSelector(action, lastAction);
+    case 'navigate':
+      return isSameAction(action, lastAction);
+    case 'click':
+      return isSameAction(action, lastAction) && isSameSelector(action, lastAction) && isShortlyAfter(action, lastAction) && action.action.clickCount > (lastAction.action as actions.ClickAction).clickCount;
+  }
+  return false;
+}
+
+export function collapseActions(actions: actions.ActionInContext[]): actions.ActionInContext[] {
+  const result: actions.ActionInContext[] = [];
+  for (const action of actions) {
+    const lastAction = result[result.length - 1];
+    const shouldMerge = shouldMergeAction(action, lastAction);
+    if (!shouldMerge) {
+      result.push(action);
+      continue;
+    }
+    const startTime = result[result.length - 1].startTime;
+    result[result.length - 1] = action;
+    result[result.length - 1].startTime = startTime;
+  }
+  return result;
+}
+
+export async function generateFrameSelector(frame: Frame): Promise<string[]> {
+  const selectorPromises: Promise<string>[] = [];
+  while (frame) {
+    const parent = frame.parentFrame();
+    if (!parent)
+      break;
+    selectorPromises.push(generateFrameSelectorInParent(parent, frame));
+    frame = parent;
+  }
+  const result = await Promise.all(selectorPromises);
+  return result.reverse();
+}
+
+async function generateFrameSelectorInParent(parent: Frame, frame: Frame): Promise<string> {
+  const result = await raceAgainstDeadline(async () => {
+    try {
+      const frameElement = await frame.frameElement();
+      if (!frameElement || !parent)
+        return;
+      const utility = await parent._utilityContext();
+      const injected = await utility.injectedScript();
+      const selector = await injected.evaluate((injected, element) => {
+        return injected.generateSelectorSimple(element as Element);
+      }, frameElement);
+      return selector;
+    } catch (e) {
+    }
+  }, monotonicTime() + 2000);
+  if (!result.timedOut && result.result)
+    return result.result;
+
+  if (frame.name())
+    return `iframe[name=${quoteCSSAttributeValue(frame.name())}]`;
+  return `iframe[src=${quoteCSSAttributeValue(frame.url())}]`;
+}
diff --git a/packages/playwright-ct-solid/index.d.ts b/packages/playwright-core/src/server/recorder/throttledFile.ts
similarity index 52%
rename from packages/playwright-ct-solid/index.d.ts
rename to packages/playwright-core/src/server/recorder/throttledFile.ts
index c5e6d6d2da311..e0d1c935681a9 100644
--- a/packages/playwright-ct-solid/index.d.ts
+++ b/packages/playwright-core/src/server/recorder/throttledFile.ts
@@ -14,22 +14,30 @@
  * limitations under the License.
  */
 
-import type { TestType, Locator } from '@playwright/experimental-ct-core';
+import fs from 'fs';
 
-export interface MountOptions<HooksConfig> {
-  hooksConfig?: HooksConfig;
-}
+export class ThrottledFile {
+  private _file: string;
+  private _timer: NodeJS.Timeout | undefined;
+  private _text: string | undefined;
 
-export interface MountResult extends Locator {
-  unmount(): Promise<void>;
-  update(component: JSX.Element): Promise<void>;
-}
+  constructor(file: string) {
+    this._file = file;
+  }
 
-export const test: TestType<{
-  mount<HooksConfig>(
-    component: JSX.Element,
-    options?: MountOptions<HooksConfig>
-  ): Promise<MountResult>;
-}>;
+  setContent(text: string) {
+    this._text = text;
+    if (!this._timer)
+      this._timer = setTimeout(() => this.flush(), 250);
+  }
 
-export { defineConfig, PlaywrightTestConfig, expect, devices } from '@playwright/experimental-ct-core';
+  flush(): void {
+    if (this._timer) {
+      clearTimeout(this._timer);
+      this._timer = undefined;
+    }
+    if (this._text)
+      fs.writeFileSync(this._file, this._text);
+    this._text = undefined;
+  }
+}
diff --git a/packages/playwright-core/src/server/recorder/utils.ts b/packages/playwright-core/src/server/recorder/utils.ts
deleted file mode 100644
index 883a8ab129aef..0000000000000
--- a/packages/playwright-core/src/server/recorder/utils.ts
+++ /dev/null
@@ -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 type { Frame } from '../frames';
-import type { SmartKeyboardModifier } from '../types';
-import type * as actions from './recorderActions';
-
-export type MouseClickOptions = Parameters<Frame['click']>[2];
-
-export function toClickOptions(action: actions.ClickAction): { method: 'click' | 'dblclick', options: MouseClickOptions } {
-  let method: 'click' | 'dblclick' = 'click';
-  if (action.clickCount === 2)
-    method = 'dblclick';
-  const modifiers = toModifiers(action.modifiers);
-  const options: MouseClickOptions = {};
-  if (action.button !== 'left')
-    options.button = action.button;
-  if (modifiers.length)
-    options.modifiers = modifiers;
-  if (action.clickCount > 2)
-    options.clickCount = action.clickCount;
-  if (action.position)
-    options.position = action.position;
-  return { method, options };
-}
-
-export function toModifiers(modifiers: number): SmartKeyboardModifier[] {
-  const result: SmartKeyboardModifier[] = [];
-  if (modifiers & 1)
-    result.push('Alt');
-  if (modifiers & 2)
-    result.push('ControlOrMeta');
-  if (modifiers & 4)
-    result.push('ControlOrMeta');
-  if (modifiers & 8)
-    result.push('Shift');
-  return result;
-}
diff --git a/packages/playwright-core/src/server/registry/browserFetcher.ts b/packages/playwright-core/src/server/registry/browserFetcher.ts
index 6f8da6e825d07..acd3a52f143fd 100644
--- a/packages/playwright-core/src/server/registry/browserFetcher.ts
+++ b/packages/playwright-core/src/server/registry/browserFetcher.ts
@@ -15,19 +15,22 @@
  * limitations under the License.
  */
 
+import * as childProcess from 'child_process';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import childProcess from 'child_process';
-import { existsAsync } from '../../utils/fileUtils';
-import { debugLogger } from '../../utils/debugLogger';
-import { ManualPromise } from '../../utils/manualPromise';
-import { colors, progress as ProgressBar } from '../../utilsBundle';
+
+import { debugLogger } from '../utils/debugLogger';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { getUserAgent } from '../utils/userAgent';
+import { progress as ProgressBar, colors } from '../../utilsBundle';
+import { existsAsync } from '../utils/fileUtils';
+
 import { browserDirectoryToMarkerFilePath } from '.';
-import { getUserAgent } from '../../utils/userAgent';
+
 import type { DownloadParams } from './oopDownloadBrowserMain';
 
-export async function downloadBrowserWithProgressBar(title: string, browserDirectory: string, executablePath: string | undefined, downloadURLs: string[], downloadFileName: string, downloadConnectionTimeout: number): Promise<boolean> {
+export async function downloadBrowserWithProgressBar(title: string, browserDirectory: string, executablePath: string | undefined, downloadURLs: string[], downloadFileName: string, downloadSocketTimeout: number): Promise<boolean> {
   if (await existsAsync(browserDirectoryToMarkerFilePath(browserDirectory))) {
     // Already downloaded.
     debugLogger.log('install', `${title} is already downloaded.`);
@@ -36,12 +39,12 @@ export async function downloadBrowserWithProgressBar(title: string, browserDirec
 
   const zipPath = path.join(os.tmpdir(), downloadFileName);
   try {
-    const retryCount = 3;
+    const retryCount = 5;
     for (let attempt = 1; attempt <= retryCount; ++attempt) {
       debugLogger.log('install', `downloading ${title} - attempt #${attempt}`);
       const url = downloadURLs[(attempt - 1) % downloadURLs.length];
       logPolitely(`Downloading ${title}` + colors.dim(` from ${url}`));
-      const { error } = await downloadBrowserWithProgressBarOutOfProcess(title, browserDirectory, url, zipPath, executablePath, downloadConnectionTimeout);
+      const { error } = await downloadBrowserWithProgressBarOutOfProcess(title, browserDirectory, url, zipPath, executablePath, downloadSocketTimeout);
       if (!error) {
         debugLogger.log('install', `SUCCESS installing ${title}`);
         break;
@@ -72,7 +75,7 @@ export async function downloadBrowserWithProgressBar(title: string, browserDirec
  * Thats why we execute it in a separate process and check manually if the destination file exists.
  * https://github.com/microsoft/playwright/issues/17394
  */
-function downloadBrowserWithProgressBarOutOfProcess(title: string, browserDirectory: string, url: string, zipPath: string, executablePath: string | undefined, connectionTimeout: number): Promise<{ error: Error | null }> {
+function downloadBrowserWithProgressBarOutOfProcess(title: string, browserDirectory: string, url: string, zipPath: string, executablePath: string | undefined, socketTimeout: number): Promise<{ error: Error | null }> {
   const cp = childProcess.fork(path.join(__dirname, 'oopDownloadBrowserMain.js'));
   const promise = new ManualPromise<{ error: Error | null }>();
   const progress = getDownloadProgress();
@@ -105,7 +108,7 @@ function downloadBrowserWithProgressBarOutOfProcess(title: string, browserDirect
     url,
     zipPath,
     executablePath,
-    connectionTimeout,
+    socketTimeout,
     userAgent: getUserAgent(),
   };
   cp.send({ method: 'download', params: downloadParams });
@@ -123,6 +126,7 @@ export function logPolitely(toBeLogged: string) {
 type OnProgressCallback = (downloadedBytes: number, totalBytes: number) => void;
 
 function getDownloadProgress(): OnProgressCallback {
+  // eslint-disable-next-line no-restricted-properties
   if (process.stdout.isTTY)
     return getAnimatedDownloadProgress();
   return getBasicDownloadProgress();
diff --git a/packages/playwright-core/src/server/registry/dependencies.ts b/packages/playwright-core/src/server/registry/dependencies.ts
index 44f56f3d2fbd5..2b97d02d20a8b 100644
--- a/packages/playwright-core/src/server/registry/dependencies.ts
+++ b/packages/playwright-core/src/server/registry/dependencies.ts
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
+import * as childProcess from 'child_process';
 import fs from 'fs';
+import os from 'os';
 import path from 'path';
-import * as os from 'os';
-import childProcess from 'child_process';
-import * as utils from '../../utils';
-import { spawnAsync } from '../../utils/spawnAsync';
-import { hostPlatform, isOfficiallySupportedPlatform } from '../../utils/hostPlatform';
-import { buildPlaywrightCLICommand } from '.';
+
 import { deps } from './nativeDeps';
-import { getPlaywrightVersion } from '../../utils/userAgent';
+import { wrapInASCIIBox } from '../utils/ascii';
+import { hostPlatform, isOfficiallySupportedPlatform } from '../utils/hostPlatform';
+import { spawnAsync } from '../utils/spawnAsync';
+import { getPlaywrightVersion } from '../utils/userAgent';
+
+import { buildPlaywrightCLICommand, registry } from '.';
 
 const BIN_DIRECTORY = path.join(__dirname, '..', '..', '..', 'bin');
 const languageBindingVersion = process.env.PW_CLI_DISPLAY_VERSION || require('../../../package.json').version;
@@ -95,7 +97,7 @@ export async function installDependenciesLinux(targets: Set<DependencyGroup>, dr
   for (const target of targets) {
     const info = deps[platform];
     if (!info) {
-      console.warn(`Cannot install dependencies for ${platform}!`);  // eslint-disable-line no-console
+      console.warn(`Cannot install dependencies for ${platform} with Playwright ${getPlaywrightVersion()}!`);  // eslint-disable-line no-console
       return;
     }
     libraries.push(...info[target]);
@@ -122,12 +124,12 @@ export async function installDependenciesLinux(targets: Set<DependencyGroup>, dr
   });
 }
 
-export async function validateDependenciesWindows(windowsExeAndDllDirectories: string[]) {
+export async function validateDependenciesWindows(sdkLanguage: string, windowsExeAndDllDirectories: string[]) {
   const directoryPaths = windowsExeAndDllDirectories;
   const lddPaths: string[] = [];
   for (const directoryPath of directoryPaths)
     lddPaths.push(...(await executablesOrSharedLibraries(directoryPath)));
-  const allMissingDeps = await Promise.all(lddPaths.map(lddPath => missingFileDependenciesWindows(lddPath)));
+  const allMissingDeps = await Promise.all(lddPaths.map(lddPath => missingFileDependenciesWindows(sdkLanguage, lddPath)));
   const missingDeps: Set<string> = new Set();
   for (const deps of allMissingDeps) {
     for (const dep of deps)
@@ -269,7 +271,7 @@ export async function validateDependenciesLinux(sdkLanguage: string, linuxLddDir
     ]);
   }
 
-  throw new Error('\n' + utils.wrapInASCIIBox(errorLines.join('\n'), 1));
+  throw new Error('\n' + wrapInASCIIBox(errorLines.join('\n'), 1));
 }
 
 function isSharedLib(basename: string) {
@@ -302,8 +304,8 @@ async function executablesOrSharedLibraries(directoryPath: string): Promise<stri
   return executablersOrLibraries as string[];
 }
 
-async function missingFileDependenciesWindows(filePath: string): Promise<Array<string>> {
-  const executable = path.join(__dirname, '..', '..', '..', 'bin', 'PrintDeps.exe');
+async function missingFileDependenciesWindows(sdkLanguage: string, filePath: string): Promise<Array<string>> {
+  const executable = registry.findExecutable('winldd')!.executablePathOrDie(sdkLanguage);
   const dirname = path.dirname(filePath);
   const { stdout, code } = await spawnAsync(executable, [filePath], {
     cwd: dirname,
diff --git a/packages/playwright-core/src/server/registry/index.ts b/packages/playwright-core/src/server/registry/index.ts
index c7ce3a2e7e243..aa32c266e147d 100644
--- a/packages/playwright-core/src/server/registry/index.ts
+++ b/packages/playwright-core/src/server/registry/index.ts
@@ -15,38 +15,46 @@
  * limitations under the License.
  */
 
-import * as os from 'os';
+import fs from 'fs';
+import os from 'os';
 import path from 'path';
 import * as util from 'util';
-import * as fs from 'fs';
+
+import { downloadBrowserWithProgressBar, logPolitely } from './browserFetcher';
+import { dockerVersion, readDockerVersionSync, transformCommandsForRoot } from './dependencies';
+import { installDependenciesLinux, installDependenciesWindows, validateDependenciesLinux, validateDependenciesWindows } from './dependencies';
+import { calculateSha1, getAsBooleanFromENV, getFromENV, getPackageManagerExecCommand } from '../../utils';
+import { wrapInASCIIBox } from '../utils/ascii';
+import { debugLogger } from '../utils/debugLogger';
+import {  hostPlatform, isOfficiallySupportedPlatform } from '../utils/hostPlatform';
+import { fetchData, NET_DEFAULT_TIMEOUT } from '../utils/network';
+import { spawnAsync } from '../utils/spawnAsync';
+import { getEmbedderName } from '../utils/userAgent';
 import { lockfile } from '../../utilsBundle';
-import { fetchData } from '../../utils/network';
-import { getEmbedderName } from '../../utils/userAgent';
-import { getFromENV, getAsBooleanFromENV, calculateSha1, wrapInASCIIBox, getPackageManagerExecCommand } from '../../utils';
-import { removeFolders, existsAsync, canAccessFile } from '../../utils/fileUtils';
-import { type HostPlatform, hostPlatform, isOfficiallySupportedPlatform } from '../../utils/hostPlatform';
-import { spawnAsync } from '../../utils/spawnAsync';
+import { canAccessFile, existsAsync, removeFolders } from '../utils/fileUtils';
+
 import type { DependencyGroup } from './dependencies';
-import { transformCommandsForRoot, dockerVersion, readDockerVersionSync } from './dependencies';
-import { installDependenciesLinux, installDependenciesWindows, validateDependenciesLinux, validateDependenciesWindows } from './dependencies';
-import { downloadBrowserWithProgressBar, logPolitely } from './browserFetcher';
+import type { HostPlatform } from '../utils/hostPlatform';
+
 export { writeDockerVersion } from './dependencies';
-import { debugLogger } from '../../utils/debugLogger';
 
 const PACKAGE_PATH = path.join(__dirname, '..', '..', '..');
 const BIN_PATH = path.join(__dirname, '..', '..', '..', 'bin');
 
 const PLAYWRIGHT_CDN_MIRRORS = [
-  'https://playwright.azureedge.net',
-  'https://playwright-akamai.azureedge.net',
-  'https://playwright-verizon.azureedge.net',
+  'https://cdn.playwright.dev/dbazure/download/playwright', // ESRP CDN
+  'https://playwright.download.prss.microsoft.com/dbazure/download/playwright', // Directly hit ESRP CDN
+  'https://cdn.playwright.dev', // Hit the Storage Bucket directly
 ];
 
 if (process.env.PW_TEST_CDN_THAT_SHOULD_WORK) {
   for (let i = 0; i < PLAYWRIGHT_CDN_MIRRORS.length; i++) {
     const cdn = PLAYWRIGHT_CDN_MIRRORS[i];
-    if (cdn !== process.env.PW_TEST_CDN_THAT_SHOULD_WORK)
-      PLAYWRIGHT_CDN_MIRRORS[i] = cdn + '.does-not-resolve.playwright.dev';
+    if (cdn !== process.env.PW_TEST_CDN_THAT_SHOULD_WORK) {
+      const parsedCDN = new URL(cdn);
+      parsedCDN.hostname = parsedCDN.hostname + '.does-not-resolve.playwright.dev';
+      PLAYWRIGHT_CDN_MIRRORS[i] = parsedCDN.toString();
+    }
   }
 }
 
@@ -56,6 +64,11 @@ const EXECUTABLE_PATHS = {
     'mac': ['chrome-mac', 'Chromium.app', 'Contents', 'MacOS', 'Chromium'],
     'win': ['chrome-win', 'chrome.exe'],
   },
+  'chromium-headless-shell': {
+    'linux': ['chrome-linux', 'headless_shell'],
+    'mac': ['chrome-mac', 'headless_shell'],
+    'win': ['chrome-win', 'headless_shell.exe'],
+  },
   'firefox': {
     'linux': ['firefox', 'firefox'],
     'mac': ['firefox', 'Nightly.app', 'Contents', 'MacOS', 'firefox'],
@@ -71,6 +84,11 @@ const EXECUTABLE_PATHS = {
     'mac': ['ffmpeg-mac'],
     'win': ['ffmpeg-win64.exe'],
   },
+  'winldd': {
+    'linux': undefined,
+    'mac': undefined,
+    'win': ['PrintDeps.exe'],
+  },
 };
 
 type DownloadPaths = Record<HostPlatform, string | undefined>;
@@ -89,6 +107,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
     'debian12-x64': 'builds/chromium/%s/chromium-linux.zip',
     'debian12-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
+    'debian13-x64': 'builds/chromium/%s/chromium-linux.zip',
+    'debian13-arm64': 'builds/chromium/%s/chromium-linux-arm64.zip',
     'mac10.13': 'builds/chromium/%s/chromium-mac.zip',
     'mac10.14': 'builds/chromium/%s/chromium-mac.zip',
     'mac10.15': 'builds/chromium/%s/chromium-mac.zip',
@@ -100,8 +120,41 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
     'mac14': 'builds/chromium/%s/chromium-mac.zip',
     'mac14-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
+    'mac15': 'builds/chromium/%s/chromium-mac.zip',
+    'mac15-arm64': 'builds/chromium/%s/chromium-mac-arm64.zip',
     'win64': 'builds/chromium/%s/chromium-win64.zip',
   },
+  'chromium-headless-shell': {
+    '<unknown>': undefined,
+    'ubuntu18.04-x64': undefined,
+    'ubuntu20.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+    'ubuntu22.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+    'ubuntu24.04-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+    'ubuntu18.04-arm64': undefined,
+    'ubuntu20.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+    'ubuntu22.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+    'ubuntu24.04-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+    'debian11-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+    'debian11-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+    'debian12-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+    'debian12-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+    'debian13-x64': 'builds/chromium/%s/chromium-headless-shell-linux.zip',
+    'debian13-arm64': 'builds/chromium/%s/chromium-headless-shell-linux-arm64.zip',
+    'mac10.13': undefined,
+    'mac10.14': undefined,
+    'mac10.15': undefined,
+    'mac11': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+    'mac11-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+    'mac12': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+    'mac12-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+    'mac13': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+    'mac13-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+    'mac14': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+    'mac14-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+    'mac15': 'builds/chromium/%s/chromium-headless-shell-mac.zip',
+    'mac15-arm64': 'builds/chromium/%s/chromium-headless-shell-mac-arm64.zip',
+    'win64': 'builds/chromium/%s/chromium-headless-shell-win64.zip',
+  },
   'chromium-tip-of-tree': {
     '<unknown>': undefined,
     'ubuntu18.04-x64': undefined,
@@ -116,6 +169,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
     'debian12-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
     'debian12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
+    'debian13-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux.zip',
+    'debian13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-linux-arm64.zip',
     'mac10.13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
     'mac10.14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
     'mac10.15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
@@ -127,8 +182,41 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
     'mac14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
     'mac14-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
+    'mac15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac.zip',
+    'mac15-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-mac-arm64.zip',
     'win64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-win64.zip',
   },
+  'chromium-tip-of-tree-headless-shell': {
+    '<unknown>': undefined,
+    'ubuntu18.04-x64': undefined,
+    'ubuntu20.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
+    'ubuntu22.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
+    'ubuntu24.04-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
+    'ubuntu18.04-arm64': undefined,
+    'ubuntu20.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
+    'ubuntu22.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
+    'ubuntu24.04-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
+    'debian11-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
+    'debian11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
+    'debian12-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
+    'debian12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
+    'debian13-x64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux.zip',
+    'debian13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-linux-arm64.zip',
+    'mac10.13': undefined,
+    'mac10.14': undefined,
+    'mac10.15': undefined,
+    'mac11': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
+    'mac11-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
+    'mac12': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
+    'mac12-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
+    'mac13': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
+    'mac13-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
+    'mac14': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
+    'mac14-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
+    'mac15': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac.zip',
+    'mac15-arm64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-mac-arm64.zip',
+    'win64': 'builds/chromium-tip-of-tree/%s/chromium-tip-of-tree-headless-shell-win64.zip',
+  },
   'firefox': {
     '<unknown>': undefined,
     'ubuntu18.04-x64': undefined,
@@ -143,6 +231,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/firefox/%s/firefox-debian-11-arm64.zip',
     'debian12-x64': 'builds/firefox/%s/firefox-debian-12.zip',
     'debian12-arm64': 'builds/firefox/%s/firefox-debian-12-arm64.zip',
+    'debian13-x64': 'builds/firefox/%s/firefox-debian-13.zip',
+    'debian13-arm64': 'builds/firefox/%s/firefox-debian-13-arm64.zip',
     'mac10.13': 'builds/firefox/%s/firefox-mac.zip',
     'mac10.14': 'builds/firefox/%s/firefox-mac.zip',
     'mac10.15': 'builds/firefox/%s/firefox-mac.zip',
@@ -154,6 +244,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/firefox/%s/firefox-mac-arm64.zip',
     'mac14': 'builds/firefox/%s/firefox-mac.zip',
     'mac14-arm64': 'builds/firefox/%s/firefox-mac-arm64.zip',
+    'mac15': 'builds/firefox/%s/firefox-mac.zip',
+    'mac15-arm64': 'builds/firefox/%s/firefox-mac-arm64.zip',
     'win64': 'builds/firefox/%s/firefox-win64.zip',
   },
   'firefox-beta': {
@@ -170,6 +262,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-11-arm64.zip',
     'debian12-x64': 'builds/firefox-beta/%s/firefox-beta-debian-12.zip',
     'debian12-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-12-arm64.zip',
+    'debian13-x64': 'builds/firefox-beta/%s/firefox-beta-debian-12.zip',
+    'debian13-arm64': 'builds/firefox-beta/%s/firefox-beta-debian-12-arm64.zip',
     'mac10.13': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
     'mac10.14': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
     'mac10.15': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
@@ -181,6 +275,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-arm64.zip',
     'mac14': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
     'mac14-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-arm64.zip',
+    'mac15': 'builds/firefox-beta/%s/firefox-beta-mac.zip',
+    'mac15-arm64': 'builds/firefox-beta/%s/firefox-beta-mac-arm64.zip',
     'win64': 'builds/firefox-beta/%s/firefox-beta-win64.zip',
   },
   'webkit': {
@@ -197,6 +293,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/webkit/%s/webkit-debian-11-arm64.zip',
     'debian12-x64': 'builds/webkit/%s/webkit-debian-12.zip',
     'debian12-arm64': 'builds/webkit/%s/webkit-debian-12-arm64.zip',
+    'debian13-x64': 'builds/webkit/%s/webkit-debian-13.zip',
+    'debian13-arm64': 'builds/webkit/%s/webkit-debian-13-arm64.zip',
     'mac10.13': undefined,
     'mac10.14': 'builds/deprecated-webkit-mac-10.14/%s/deprecated-webkit-mac-10.14.zip',
     'mac10.15': 'builds/deprecated-webkit-mac-10.15/%s/deprecated-webkit-mac-10.15.zip',
@@ -208,6 +306,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/webkit/%s/webkit-mac-13-arm64.zip',
     'mac14': 'builds/webkit/%s/webkit-mac-14.zip',
     'mac14-arm64': 'builds/webkit/%s/webkit-mac-14-arm64.zip',
+    'mac15': 'builds/webkit/%s/webkit-mac-15.zip',
+    'mac15-arm64': 'builds/webkit/%s/webkit-mac-15-arm64.zip',
     'win64': 'builds/webkit/%s/webkit-win64.zip',
   },
   'ffmpeg': {
@@ -224,6 +324,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
     'debian12-x64': 'builds/ffmpeg/%s/ffmpeg-linux.zip',
     'debian12-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
+    'debian13-x64': 'builds/ffmpeg/%s/ffmpeg-linux.zip',
+    'debian13-arm64': 'builds/ffmpeg/%s/ffmpeg-linux-arm64.zip',
     'mac10.13': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
     'mac10.14': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
     'mac10.15': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
@@ -235,8 +337,41 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
     'mac14': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
     'mac14-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
+    'mac15': 'builds/ffmpeg/%s/ffmpeg-mac.zip',
+    'mac15-arm64': 'builds/ffmpeg/%s/ffmpeg-mac-arm64.zip',
     'win64': 'builds/ffmpeg/%s/ffmpeg-win64.zip',
   },
+  'winldd': {
+    '<unknown>': undefined,
+    'ubuntu18.04-x64': undefined,
+    'ubuntu20.04-x64': undefined,
+    'ubuntu22.04-x64': undefined,
+    'ubuntu24.04-x64': undefined,
+    'ubuntu18.04-arm64': undefined,
+    'ubuntu20.04-arm64': undefined,
+    'ubuntu22.04-arm64': undefined,
+    'ubuntu24.04-arm64': undefined,
+    'debian11-x64': undefined,
+    'debian11-arm64': undefined,
+    'debian12-x64': undefined,
+    'debian12-arm64': undefined,
+    'debian13-x64': undefined,
+    'debian13-arm64': undefined,
+    'mac10.13': undefined,
+    'mac10.14': undefined,
+    'mac10.15': undefined,
+    'mac11': undefined,
+    'mac11-arm64': undefined,
+    'mac12': undefined,
+    'mac12-arm64': undefined,
+    'mac13': undefined,
+    'mac13-arm64': undefined,
+    'mac14': undefined,
+    'mac14-arm64': undefined,
+    'mac15': undefined,
+    'mac15-arm64': undefined,
+    'win64': 'builds/winldd/%s/winldd-win64.zip',
+  },
   'android': {
     '<unknown>': 'builds/android/%s/android.zip',
     'ubuntu18.04-x64': undefined,
@@ -251,6 +386,8 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'debian11-arm64': 'builds/android/%s/android.zip',
     'debian12-x64': 'builds/android/%s/android.zip',
     'debian12-arm64': 'builds/android/%s/android.zip',
+    'debian13-x64': 'builds/android/%s/android.zip',
+    'debian13-arm64': 'builds/android/%s/android.zip',
     'mac10.13': 'builds/android/%s/android.zip',
     'mac10.14': 'builds/android/%s/android.zip',
     'mac10.15': 'builds/android/%s/android.zip',
@@ -262,8 +399,15 @@ const DOWNLOAD_PATHS: Record<BrowserName | InternalTool, DownloadPaths> = {
     'mac13-arm64': 'builds/android/%s/android.zip',
     'mac14': 'builds/android/%s/android.zip',
     'mac14-arm64': 'builds/android/%s/android.zip',
+    'mac15': 'builds/android/%s/android.zip',
+    'mac15-arm64': 'builds/android/%s/android.zip',
     'win64': 'builds/android/%s/android.zip',
   },
+  // TODO(bidi): implement downloads.
+  '_bidiFirefox': {
+  } as DownloadPaths,
+  '_bidiChromium': {
+  } as DownloadPaths,
 };
 
 export const registryDirectory = (() => {
@@ -301,7 +445,7 @@ export const registryDirectory = (() => {
 function isBrowserDirectory(browserDirectory: string): boolean {
   const baseName = path.basename(browserDirectory);
   for (const browserName of allDownloadable) {
-    if (baseName.startsWith(browserName + '-'))
+    if (baseName.startsWith(browserName.replace(/-/g, '_') + '-'))
       return true;
   }
   return false;
@@ -321,12 +465,20 @@ type BrowsersJSON = {
 type BrowsersJSONDescriptor = {
   name: string,
   revision: string,
+  hasRevisionOverride: boolean
   browserVersion?: string,
   installByDefault: boolean,
   dir: string,
 };
 
-function readDescriptors(browsersJSON: BrowsersJSON) {
+export type BrowserInfo = {
+  browserName: string,
+  browserVersion: number,
+  browserPath: string
+  referenceDir: string,
+};
+
+function readDescriptors(browsersJSON: BrowsersJSON): BrowsersJSONDescriptor[] {
   return (browsersJSON['browsers']).map(obj => {
     const name = obj.name;
     const revisionOverride = (obj.revisionOverrides || {})[hostPlatform];
@@ -335,6 +487,7 @@ function readDescriptors(browsersJSON: BrowsersJSON) {
     const descriptor: BrowsersJSONDescriptor = {
       name,
       revision,
+      hasRevisionOverride: !!revisionOverride,
       // We only put browser version for the supported operating systems.
       browserVersion: revisionOverride ? undefined : obj.browserVersion,
       installByDefault: !!obj.installByDefault,
@@ -349,14 +502,15 @@ function readDescriptors(browsersJSON: BrowsersJSON) {
   });
 }
 
-export type BrowserName = 'chromium' | 'firefox' | 'webkit';
-type InternalTool = 'ffmpeg' | 'firefox-beta' | 'chromium-tip-of-tree' | 'android';
+export type BrowserName = 'chromium' | 'firefox' | 'webkit' | '_bidiFirefox' | '_bidiChromium';
+type InternalTool = 'ffmpeg' | 'winldd' | 'firefox-beta' | 'chromium-tip-of-tree' | 'chromium-headless-shell' | 'chromium-tip-of-tree-headless-shell' | 'android';
+type BidiChannel = 'moz-firefox' | 'moz-firefox-beta' | 'moz-firefox-nightly' | 'bidi-chrome-canary' | 'bidi-chrome-stable' | 'bidi-chromium';
 type ChromiumChannel = 'chrome' | 'chrome-beta' | 'chrome-dev' | 'chrome-canary' | 'msedge' | 'msedge-beta' | 'msedge-dev' | 'msedge-canary';
-const allDownloadable = ['chromium', 'firefox', 'webkit', 'ffmpeg', 'firefox-beta', 'chromium-tip-of-tree'];
+const allDownloadable = ['android', 'chromium', 'firefox', 'webkit', 'ffmpeg', 'firefox-beta', 'chromium-tip-of-tree', 'chromium-headless-shell', 'chromium-tip-of-tree-headless-shell'];
 
 export interface Executable {
   type: 'browser' | 'tool' | 'channel';
-  name: BrowserName | InternalTool | ChromiumChannel;
+  name: BrowserName | InternalTool | ChromiumChannel | BidiChannel;
   browserName: BrowserName | undefined;
   installType: 'download-by-default' | 'download-on-demand' | 'install-script' | 'none';
   directory: string | undefined;
@@ -427,7 +581,7 @@ export class Registry {
       executablePath: () => chromiumExecutable,
       executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium', chromiumExecutable, chromium.installByDefault, sdkLanguage),
       installType: chromium.installByDefault ? 'download-by-default' : 'download-on-demand',
-      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'chromium', chromium.dir, ['chrome-linux'], [], ['chrome-win']),
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, chromium.dir, ['chrome-linux'], [], ['chrome-win']),
       downloadURLs: this._downloadURLs(chromium),
       browserVersion: chromium.browserVersion,
       _install: () => this._downloadExecutable(chromium, chromiumExecutable),
@@ -435,6 +589,42 @@ export class Registry {
       _isHermeticInstallation: true,
     });
 
+    const chromiumHeadlessShell = descriptors.find(d => d.name === 'chromium-headless-shell')!;
+    const chromiumHeadlessShellExecutable = findExecutablePath(chromiumHeadlessShell.dir, 'chromium-headless-shell');
+    this._executables.push({
+      type: 'channel',
+      name: 'chromium-headless-shell',
+      browserName: 'chromium',
+      directory: chromiumHeadlessShell.dir,
+      executablePath: () => chromiumHeadlessShellExecutable,
+      executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium', chromiumHeadlessShellExecutable, chromiumHeadlessShell.installByDefault, sdkLanguage),
+      installType: chromiumHeadlessShell.installByDefault ? 'download-by-default' : 'download-on-demand',
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, chromiumHeadlessShell.dir, ['chrome-linux'], [], ['chrome-win']),
+      downloadURLs: this._downloadURLs(chromiumHeadlessShell),
+      browserVersion: chromium.browserVersion,
+      _install: () => this._downloadExecutable(chromiumHeadlessShell, chromiumHeadlessShellExecutable),
+      _dependencyGroup: 'chromium',
+      _isHermeticInstallation: true,
+    });
+
+    const chromiumTipOfTreeHeadlessShell = descriptors.find(d => d.name === 'chromium-tip-of-tree-headless-shell')!;
+    const chromiumTipOfTreeHeadlessShellExecutable = findExecutablePath(chromiumTipOfTreeHeadlessShell.dir, 'chromium-headless-shell');
+    this._executables.push({
+      type: 'channel',
+      name: 'chromium-tip-of-tree-headless-shell',
+      browserName: 'chromium',
+      directory: chromiumTipOfTreeHeadlessShell.dir,
+      executablePath: () => chromiumTipOfTreeHeadlessShellExecutable,
+      executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium', chromiumTipOfTreeHeadlessShellExecutable, chromiumTipOfTreeHeadlessShell.installByDefault, sdkLanguage),
+      installType: chromiumTipOfTreeHeadlessShell.installByDefault ? 'download-by-default' : 'download-on-demand',
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, chromiumTipOfTreeHeadlessShell.dir, ['chrome-linux'], [], ['chrome-win']),
+      downloadURLs: this._downloadURLs(chromiumTipOfTreeHeadlessShell),
+      browserVersion: chromium.browserVersion,
+      _install: () => this._downloadExecutable(chromiumTipOfTreeHeadlessShell, chromiumTipOfTreeHeadlessShellExecutable),
+      _dependencyGroup: 'chromium',
+      _isHermeticInstallation: true,
+    });
+
     const chromiumTipOfTree = descriptors.find(d => d.name === 'chromium-tip-of-tree')!;
     const chromiumTipOfTreeExecutable = findExecutablePath(chromiumTipOfTree.dir, 'chromium');
     this._executables.push({
@@ -445,7 +635,7 @@ export class Registry {
       executablePath: () => chromiumTipOfTreeExecutable,
       executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium-tip-of-tree', chromiumTipOfTreeExecutable, chromiumTipOfTree.installByDefault, sdkLanguage),
       installType: chromiumTipOfTree.installByDefault ? 'download-by-default' : 'download-on-demand',
-      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'chromium', chromiumTipOfTree.dir, ['chrome-linux'], [], ['chrome-win']),
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, chromiumTipOfTree.dir, ['chrome-linux'], [], ['chrome-win']),
       downloadURLs: this._downloadURLs(chromiumTipOfTree),
       browserVersion: chromiumTipOfTree.browserVersion,
       _install: () => this._downloadExecutable(chromiumTipOfTree, chromiumTipOfTreeExecutable),
@@ -480,7 +670,7 @@ export class Registry {
     }));
 
     this._executables.push(this._createChromiumChannel('chrome-canary', {
-      'linux': '',
+      'linux': '/opt/google/chrome-canary/chrome',
       'darwin': '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
       'win32': `\\Google\\Chrome SxS\\Application\\chrome.exe`,
     }));
@@ -521,6 +711,48 @@ export class Registry {
       'win32': `\\Microsoft\\Edge SxS\\Application\\msedge.exe`,
     }));
 
+    this._executables.push(this._createBidiFirefoxChannel('moz-firefox', {
+      'linux': '/snap/bin/firefox',
+      'darwin': '/Applications/Firefox.app/Contents/MacOS/firefox',
+      'win32': '\\Mozilla Firefox\\firefox.exe',
+    }));
+    this._executables.push(this._createBidiFirefoxChannel('moz-firefox-beta', {
+      'linux': '/opt/firefox-beta/firefox',
+      'darwin': '/Applications/Firefox.app/Contents/MacOS/firefox',
+      'win32': '\\Mozilla Firefox\\firefox.exe',
+    }));
+    this._executables.push(this._createBidiFirefoxChannel('moz-firefox-nightly', {
+      'linux': '/opt/firefox-nightly/firefox',
+      'darwin': '/Applications/Firefox Nightly.app/Contents/MacOS/firefox',
+      'win32': '\\Mozilla Firefox\\firefox.exe',
+    }));
+
+    this._executables.push(this._createBidiChromiumChannel('bidi-chrome-stable', {
+      'linux': '/opt/google/chrome/chrome',
+      'darwin': '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+      'win32': `\\Google\\Chrome\\Application\\chrome.exe`,
+    }));
+    this._executables.push(this._createBidiChromiumChannel('bidi-chrome-canary', {
+      'linux': '/opt/google/chrome-canary/chrome',
+      'darwin': '/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary',
+      'win32': `\\Google\\Chrome SxS\\Application\\chrome.exe`,
+    }));
+    this._executables.push({
+      type: 'browser',
+      name: '_bidiChromium',
+      browserName: '_bidiChromium',
+      directory: chromium.dir,
+      executablePath: () => chromiumExecutable,
+      executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('chromium', chromiumExecutable, chromium.installByDefault, sdkLanguage),
+      installType: 'download-on-demand',
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, chromium.dir, ['chrome-linux'], [], ['chrome-win']),
+      downloadURLs: this._downloadURLs(chromium),
+      browserVersion: chromium.browserVersion,
+      _install: () => this._downloadExecutable(chromium, chromiumExecutable),
+      _dependencyGroup: 'chromium',
+      _isHermeticInstallation: true,
+    });
+
     const firefox = descriptors.find(d => d.name === 'firefox')!;
     const firefoxExecutable = findExecutablePath(firefox.dir, 'firefox');
     this._executables.push({
@@ -531,7 +763,7 @@ export class Registry {
       executablePath: () => firefoxExecutable,
       executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('firefox', firefoxExecutable, firefox.installByDefault, sdkLanguage),
       installType: firefox.installByDefault ? 'download-by-default' : 'download-on-demand',
-      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'firefox', firefox.dir, ['firefox'], [], ['firefox']),
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, firefox.dir, ['firefox'], [], ['firefox']),
       downloadURLs: this._downloadURLs(firefox),
       browserVersion: firefox.browserVersion,
       _install: () => this._downloadExecutable(firefox, firefoxExecutable),
@@ -549,7 +781,7 @@ export class Registry {
       executablePath: () => firefoxBetaExecutable,
       executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('firefox-beta', firefoxBetaExecutable, firefoxBeta.installByDefault, sdkLanguage),
       installType: firefoxBeta.installByDefault ? 'download-by-default' : 'download-on-demand',
-      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'firefox', firefoxBeta.dir, ['firefox'], [], ['firefox']),
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, firefoxBeta.dir, ['firefox'], [], ['firefox']),
       downloadURLs: this._downloadURLs(firefoxBeta),
       browserVersion: firefoxBeta.browserVersion,
       _install: () => this._downloadExecutable(firefoxBeta, firefoxBetaExecutable),
@@ -577,7 +809,7 @@ export class Registry {
       executablePath: () => webkitExecutable,
       executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('webkit', webkitExecutable, webkit.installByDefault, sdkLanguage),
       installType: webkit.installByDefault ? 'download-by-default' : 'download-on-demand',
-      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, 'webkit', webkit.dir, webkitLinuxLddDirectories, ['libGLESv2.so.2', 'libx264.so'], ['']),
+      _validateHostRequirements: (sdkLanguage: string) => this._validateHostRequirements(sdkLanguage, webkit.dir, webkitLinuxLddDirectories, ['libGLESv2.so.2', 'libx264.so'], ['']),
       downloadURLs: this._downloadURLs(webkit),
       browserVersion: webkit.browserVersion,
       _install: () => this._downloadExecutable(webkit, webkitExecutable),
@@ -601,6 +833,22 @@ export class Registry {
       _dependencyGroup: 'tools',
       _isHermeticInstallation: true,
     });
+    const winldd = descriptors.find(d => d.name === 'winldd')!;
+    const winlddExecutable = findExecutablePath(winldd.dir, 'winldd');
+    this._executables.push({
+      type: 'tool',
+      name: 'winldd',
+      browserName: undefined,
+      directory: winldd.dir,
+      executablePath: () => winlddExecutable,
+      executablePathOrDie: (sdkLanguage: string) => executablePathOrDie('winldd', winlddExecutable, winldd.installByDefault, sdkLanguage),
+      installType: process.platform === 'win32' ? 'download-by-default' : 'none',
+      _validateHostRequirements: () => Promise.resolve(),
+      downloadURLs: this._downloadURLs(winldd),
+      _install: () => this._downloadExecutable(winldd, winlddExecutable),
+      _dependencyGroup: 'tools',
+      _isHermeticInstallation: true,
+    });
     const android = descriptors.find(d => d.name === 'android')!;
     this._executables.push({
       type: 'tool',
@@ -627,7 +875,12 @@ export class Registry {
         return undefined;
       }
       const prefixes = (process.platform === 'win32' ? [
-        process.env.LOCALAPPDATA, process.env.PROGRAMFILES, process.env['PROGRAMFILES(X86)']
+        process.env.LOCALAPPDATA,
+        process.env.PROGRAMFILES,
+        process.env['PROGRAMFILES(X86)'],
+        // In some cases there is no PROGRAMFILES/(86) env var set but HOMEDRIVE is set.
+        process.env.HOMEDRIVE + '\\Program Files',
+        process.env.HOMEDRIVE + '\\Program Files (x86)',
       ].filter(Boolean) : ['']) as string[];
 
       for (const prefix of prefixes) {
@@ -656,6 +909,89 @@ export class Registry {
     };
   }
 
+  private _createBidiFirefoxChannel(name: BidiChannel, lookAt: Record<'linux' | 'darwin' | 'win32', string>, install?: () => Promise<void>): ExecutableImpl {
+    const executablePath = (sdkLanguage: string, shouldThrow: boolean) => {
+      const suffix = lookAt[process.platform as 'linux' | 'darwin' | 'win32'];
+      if (!suffix) {
+        if (shouldThrow)
+          throw new Error(`Firefox distribution '${name}' is not supported on ${process.platform}`);
+        return undefined;
+      }
+      const prefixes = (process.platform === 'win32' ? [
+        process.env.LOCALAPPDATA,
+        process.env.PROGRAMFILES,
+        process.env['PROGRAMFILES(X86)'],
+        // In some cases there is no PROGRAMFILES/(86) env var set but HOMEDRIVE is set.
+        process.env.HOMEDRIVE + '\\Program Files',
+        process.env.HOMEDRIVE + '\\Program Files (x86)',
+      ].filter(Boolean) : ['']) as string[];
+
+      for (const prefix of prefixes) {
+        const executablePath = path.join(prefix, suffix);
+        if (canAccessFile(executablePath))
+          return executablePath;
+      }
+      if (shouldThrow)
+        throw new Error(`Cannot find Firefox installation for channel '${name}' at the standard system paths.`);
+      return undefined;
+    };
+    return {
+      type: 'channel',
+      name,
+      browserName: '_bidiFirefox',
+      directory: undefined,
+      executablePath: (sdkLanguage: string) => executablePath(sdkLanguage, false),
+      executablePathOrDie: (sdkLanguage: string) => executablePath(sdkLanguage, true)!,
+      installType: 'none',
+      _validateHostRequirements: () => Promise.resolve(),
+      _isHermeticInstallation: true,
+      _install: install,
+    };
+  }
+
+  private _createBidiChromiumChannel(name: BidiChannel, lookAt: Record<'linux' | 'darwin' | 'win32', string>, install?: () => Promise<void>): ExecutableImpl {
+    const executablePath = (sdkLanguage: string, shouldThrow: boolean) => {
+      const suffix = lookAt[process.platform as 'linux' | 'darwin' | 'win32'];
+      if (!suffix) {
+        if (shouldThrow)
+          throw new Error(`Chromium distribution '${name}' is not supported on ${process.platform}`);
+        return undefined;
+      }
+      const prefixes = (process.platform === 'win32' ? [
+        process.env.LOCALAPPDATA,
+        process.env.PROGRAMFILES,
+        process.env['PROGRAMFILES(X86)'],
+        // In some cases there is no PROGRAMFILES/(86) env var set but HOMEDRIVE is set.
+        process.env.HOMEDRIVE + '\\Program Files',
+        process.env.HOMEDRIVE + '\\Program Files (x86)',
+      ].filter(Boolean) : ['']) as string[];
+
+      for (const prefix of prefixes) {
+        const executablePath = path.join(prefix, suffix);
+        if (canAccessFile(executablePath))
+          return executablePath;
+      }
+      if (!shouldThrow)
+        return undefined;
+
+      const location = prefixes.length ? ` at ${path.join(prefixes[0], suffix)}` : ``;
+      const installation = install ? `\nRun "${buildPlaywrightCLICommand(sdkLanguage, 'install ' + name)}"` : '';
+      throw new Error(`Chromium distribution '${name}' is not found${location}${installation}`);
+    };
+    return {
+      type: 'channel',
+      name,
+      browserName: '_bidiChromium',
+      directory: undefined,
+      executablePath: (sdkLanguage: string) => executablePath(sdkLanguage, false),
+      executablePathOrDie: (sdkLanguage: string) => executablePath(sdkLanguage, true)!,
+      installType: install ? 'install-script' : 'none',
+      _validateHostRequirements: () => Promise.resolve(),
+      _isHermeticInstallation: false,
+      _install: install,
+    };
+  }
+
   executables(): Executable[] {
     return this._executables;
   }
@@ -670,25 +1006,19 @@ export class Registry {
     return this._executables.filter(e => e.installType === 'download-by-default');
   }
 
-  private _addRequirementsAndDedupe(executables: Executable[]): ExecutableImpl[] {
-    const set = new Set<ExecutableImpl>();
-    for (const executable of executables as ExecutableImpl[]) {
-      set.add(executable);
-      if (executable.browserName === 'chromium')
-        set.add(this.findExecutable('ffmpeg')!);
-    }
-    return Array.from(set);
+  private _dedupe(executables: Executable[]): ExecutableImpl[] {
+    return Array.from(new Set(executables as ExecutableImpl[]));
   }
 
-  private async _validateHostRequirements(sdkLanguage: string, browserName: BrowserName, browserDirectory: string, linuxLddDirectories: string[], dlOpenLibraries: string[], windowsExeAndDllDirectories: string[]) {
+  private async _validateHostRequirements(sdkLanguage: string, browserDirectory: string, linuxLddDirectories: string[], dlOpenLibraries: string[], windowsExeAndDllDirectories: string[]) {
     if (os.platform() === 'linux')
       return await validateDependenciesLinux(sdkLanguage, linuxLddDirectories.map(d => path.join(browserDirectory, d)), dlOpenLibraries);
     if (os.platform() === 'win32' && os.arch() === 'x64')
-      return await validateDependenciesWindows(windowsExeAndDllDirectories.map(d => path.join(browserDirectory, d)));
+      return await validateDependenciesWindows(sdkLanguage, windowsExeAndDllDirectories.map(d => path.join(browserDirectory, d)));
   }
 
   async installDeps(executablesToInstallDeps: Executable[], dryRun: boolean) {
-    const executables = this._addRequirementsAndDedupe(executablesToInstallDeps);
+    const executables = this._dedupe(executablesToInstallDeps);
     const targets = new Set<DependencyGroup>();
     for (const executable of executables) {
       if (executable._dependencyGroup)
@@ -702,7 +1032,7 @@ export class Registry {
   }
 
   async install(executablesToInstall: Executable[], forceReinstall: boolean) {
-    const executables = this._addRequirementsAndDedupe(executablesToInstall);
+    const executables = this._dedupe(executablesToInstall);
     await fs.promises.mkdir(registryDirectory, { recursive: true });
     const lockfilePath = path.join(registryDirectory, '__dirlock');
     const linksDir = path.join(registryDirectory, '.links');
@@ -727,7 +1057,8 @@ export class Registry {
       await fs.promises.writeFile(path.join(linksDir, calculateSha1(PACKAGE_PATH)), PACKAGE_PATH);
 
       // Remove stale browsers.
-      await this._validateInstallationCache(linksDir);
+      if (!getAsBooleanFromENV('PLAYWRIGHT_SKIP_BROWSER_GC'))
+        await this._validateInstallationCache(linksDir);
 
       // Install browsers for this package.
       for (const executable of executables) {
@@ -737,7 +1068,8 @@ export class Registry {
         const { embedderName } = getEmbedderName();
         if (!getAsBooleanFromENV('CI') && !executable._isHermeticInstallation && !forceReinstall && executable.executablePath(embedderName)) {
           const command = buildPlaywrightCLICommand(embedderName, 'install --force ' + executable.name);
-          throw new Error('\n' + wrapInASCIIBox([
+          // eslint-disable-next-line no-restricted-properties
+          process.stderr.write('\n' + wrapInASCIIBox([
             `ATTENTION: "${executable.name}" is already installed on the system!`,
             ``,
             `"${executable.name}" installation is not hermetic; installing newer version`,
@@ -751,7 +1083,8 @@ export class Registry {
             `    ${command}`,
             ``,
             `<3 Playwright Team`,
-          ].join('\n'), 1));
+          ].join('\n'), 1) + '\n\n');
+          return;
         }
         await executable._install();
       }
@@ -792,6 +1125,7 @@ export class Registry {
 
     // Remove stale browsers.
     await this._validateInstallationCache(linksDir);
+
     return {
       numberOfBrowsersLeft: (await fs.promises.readdir(registryDirectory).catch(() => [])).filter(browserDirectory => isBrowserDirectory(browserDirectory)).length
     };
@@ -799,6 +1133,7 @@ export class Registry {
 
   async validateHostRequirementsForExecutablesIfNeeded(executables: Executable[], sdkLanguage: string) {
     if (getAsBooleanFromENV('PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS')) {
+      // eslint-disable-next-line no-restricted-properties
       process.stderr.write('Skipping host requirements validation logic because `PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS` env variable is set.\n');
       return;
     }
@@ -856,6 +1191,13 @@ export class Registry {
       throw new Error(`ERROR: Playwright does not support ${descriptor.name} on ${hostPlatform}`);
     if (!isOfficiallySupportedPlatform)
       logPolitely(`BEWARE: your OS is not officially supported by Playwright; downloading fallback build for ${hostPlatform}.`);
+    if (descriptor.hasRevisionOverride) {
+      const message = `You are using a frozen ${descriptor.name} browser which does not receive updates anymore on ${hostPlatform}. Please update to the latest version of your operating system to test up-to-date browsers.`;
+      if (process.env.GITHUB_ACTIONS)
+        console.log(`::warning title=Playwright::${message}`);  // eslint-disable-line no-console
+      else
+        logPolitely(message);
+    }
 
     const displayName = descriptor.name.split('-').map(word => {
       return word === 'ffmpeg' ? 'FFMPEG' : word.charAt(0).toUpperCase() + word.slice(1);
@@ -865,9 +1207,11 @@ export class Registry {
       : `${displayName} playwright build v${descriptor.revision}`;
 
     const downloadFileName = `playwright-download-${descriptor.name}-${hostPlatform}-${descriptor.revision}.zip`;
-    const downloadConnectionTimeoutEnv = getFromENV('PLAYWRIGHT_DOWNLOAD_CONNECTION_TIMEOUT');
-    const downloadConnectionTimeout = +(downloadConnectionTimeoutEnv || '0') || 30_000;
-    await downloadBrowserWithProgressBar(title, descriptor.dir, executablePath, downloadURLs, downloadFileName, downloadConnectionTimeout).catch(e => {
+    // PLAYWRIGHT_DOWNLOAD_CONNECTION_TIMEOUT is a misnomer, it actually controls the socket's
+    // max idle timeout. Unfortunately, we cannot rename it without breaking existing user workflows.
+    const downloadSocketTimeoutEnv = getFromENV('PLAYWRIGHT_DOWNLOAD_CONNECTION_TIMEOUT');
+    const downloadSocketTimeout = +(downloadSocketTimeoutEnv || '0') || NET_DEFAULT_TIMEOUT;
+    await downloadBrowserWithProgressBar(title, descriptor.dir, executablePath, downloadURLs, downloadFileName, downloadSocketTimeout).catch(e => {
       throw new Error(`Failed to download ${title}, caused by\n${e.stack}`);
     });
   }
@@ -875,7 +1219,7 @@ export class Registry {
   private async _installMSEdgeChannel(channel: 'msedge'|'msedge-beta'|'msedge-dev', scripts: Record<'linux' | 'darwin' | 'win32', string>) {
     const scriptArgs: string[] = [];
     if (process.platform !== 'linux') {
-      const products = lowercaseAllKeys(JSON.parse(await fetchData({ url: 'https://edgeupdates.microsoft.com/api/products' })));
+      const products = lowercaseAllKeys(JSON.parse(await fetchData(undefined, { url: 'https://edgeupdates.microsoft.com/api/products' })));
 
       const productName = {
         'msedge': 'Stable',
@@ -922,9 +1266,21 @@ export class Registry {
     }
   }
 
+  async listInstalledBrowsers() {
+    const linksDir = path.join(registryDirectory, '.links');
+    const { browsers } = await this._traverseBrowserInstallations(linksDir);
+    return browsers.filter(browser => fs.existsSync(browser.browserPath));
+  }
+
   private async _validateInstallationCache(linksDir: string) {
-    // 1. Collect used downloads and package descriptors.
-    const usedBrowserPaths: Set<string> = new Set();
+    const { browsers, brokenLinks } = await this._traverseBrowserInstallations(linksDir);
+    await this._deleteStaleBrowsers(browsers);
+    await this._deleteBrokenInstallations(brokenLinks);
+  }
+
+  private async _traverseBrowserInstallations(linksDir: string): Promise<{ browsers: BrowserInfo[], brokenLinks: string[] }> {
+    const browserList: BrowserInfo[] = [];
+    const brokenLinks: string[] = [];
     for (const fileName of await fs.promises.readdir(linksDir)) {
       const linkPath = path.join(linksDir, fileName);
       let linkTarget = '';
@@ -941,34 +1297,53 @@ export class Registry {
           const descriptor = descriptors.find(d => d.name === browserName);
           if (!descriptor)
             continue;
-          const usedBrowserPath = descriptor.dir;
-          const browserRevision = parseInt(descriptor.revision, 10);
-          // Old browser installations don't have marker file.
-          // We switched chromium from 999999 to 1000, 300000 is the new Y2K.
-          const shouldHaveMarkerFile = (browserName === 'chromium' && (browserRevision >= 786218 || browserRevision < 300000)) ||
-              (browserName === 'firefox' && browserRevision >= 1128) ||
-              (browserName === 'webkit' && browserRevision >= 1307) ||
-              // All new applications have a marker file right away.
-              (browserName !== 'firefox' && browserName !== 'chromium' && browserName !== 'webkit');
-          if (!shouldHaveMarkerFile || (await existsAsync(browserDirectoryToMarkerFilePath(usedBrowserPath))))
-            usedBrowserPaths.add(usedBrowserPath);
+
+          const browserPath = descriptor.dir;
+          const browserVersion = parseInt(descriptor.revision, 10);
+          browserList.push({
+            browserName,
+            browserVersion,
+            browserPath,
+            referenceDir: linkTarget,
+          });
         }
       } catch (e) {
-        await fs.promises.unlink(linkPath).catch(e => {});
+        brokenLinks.push(linkPath);
       }
     }
 
-    // 2. Delete all unused browsers.
-    if (!getAsBooleanFromENV('PLAYWRIGHT_SKIP_BROWSER_GC')) {
-      let downloadedBrowsers = (await fs.promises.readdir(registryDirectory)).map(file => path.join(registryDirectory, file));
-      downloadedBrowsers = downloadedBrowsers.filter(file => isBrowserDirectory(file));
-      const directories = new Set<string>(downloadedBrowsers);
-      for (const browserDirectory of usedBrowserPaths)
-        directories.delete(browserDirectory);
-      for (const directory of directories)
-        logPolitely('Removing unused browser at ' + directory);
-      await removeFolders([...directories]);
+    return { browsers: browserList, brokenLinks };
+  }
+
+  private async _deleteStaleBrowsers(browserList: BrowserInfo[]) {
+    const usedBrowserPaths: Set<string> = new Set();
+    for (const browser of browserList) {
+      const { browserName, browserVersion, browserPath } = browser;
+
+      // Old browser installations don't have marker file.
+      // We switched chromium from 999999 to 1000, 300000 is the new Y2K.
+      const shouldHaveMarkerFile = (browserName === 'chromium' && (browserVersion >= 786218 || browserVersion < 300000)) ||
+          (browserName === 'firefox' && browserVersion >= 1128) ||
+          (browserName === 'webkit' && browserVersion >= 1307) ||
+          // All new applications have a marker file right away.
+          (browserName !== 'firefox' && browserName !== 'chromium' && browserName !== 'webkit');
+      if (!shouldHaveMarkerFile || (await existsAsync(browserDirectoryToMarkerFilePath(browserPath))))
+        usedBrowserPaths.add(browserPath);
     }
+
+    let downloadedBrowsers = (await fs.promises.readdir(registryDirectory)).map(file => path.join(registryDirectory, file));
+    downloadedBrowsers = downloadedBrowsers.filter(file => isBrowserDirectory(file));
+    const directories = new Set<string>(downloadedBrowsers);
+    for (const browserDirectory of usedBrowserPaths)
+      directories.delete(browserDirectory);
+    for (const directory of directories)
+      logPolitely('Removing unused browser at ' + directory);
+    await removeFolders([...directories]);
+  }
+
+  private async _deleteBrokenInstallations(brokenLinks: string[]) {
+    for (const linkPath of brokenLinks)
+      await fs.promises.unlink(linkPath).catch(e => {});
   }
 }
 
@@ -991,11 +1366,6 @@ export function buildPlaywrightCLICommand(sdkLanguage: string, parameters: strin
   }
 }
 
-export async function installDefaultBrowsersForNpmInstall() {
-  const defaultBrowserNames = registry.defaultExecutables().map(e => e.name);
-  return installBrowsersForNpmInstall(defaultBrowserNames);
-}
-
 export async function installBrowsersForNpmInstall(browsers: string[]) {
   // PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD should have a value of 0 or 1
   if (getAsBooleanFromENV('PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD')) {
@@ -1003,6 +1373,8 @@ export async function installBrowsersForNpmInstall(browsers: string[]) {
     return false;
   }
   const executables: Executable[] = [];
+  if (process.platform === 'win32')
+    executables.push(registry.findExecutable('winldd')!);
   for (const browserName of browsers) {
     const executable = registry.findExecutable(browserName);
     if (!executable || executable.installType === 'none')
@@ -1013,7 +1385,8 @@ export async function installBrowsersForNpmInstall(browsers: string[]) {
   await registry.install(executables, false /* forceReinstall */);
 }
 
-export function findChromiumChannel(sdkLanguage: string): string | undefined {
+// for launchApp -> UI Mode / Trace Viewer
+export function findChromiumChannelBestEffort(sdkLanguage: string): string | undefined {
   // Fall back to the stable channels of popular vendors to work out of the box.
   // Null means no installation and no channels found.
   let channel = null;
diff --git a/packages/playwright-core/src/server/registry/nativeDeps.ts b/packages/playwright-core/src/server/registry/nativeDeps.ts
index 0f67455d267e6..d6eb7d5b2192b 100644
--- a/packages/playwright-core/src/server/registry/nativeDeps.ts
+++ b/packages/playwright-core/src/server/registry/nativeDeps.ts
@@ -329,7 +329,7 @@ export const deps: any = {
       'libgstreamer-gl1.0-0',
       'libgstreamer-plugins-base1.0-0',
       'libgstreamer1.0-0',
-      'libgtk-3-0',
+      'libgtk-4-1',
       'libgudev-1.0-0',
       'libharfbuzz-icu0',
       'libharfbuzz0b',
@@ -359,8 +359,10 @@ export const deps: any = {
       'libx264-163',
       'libatomic1',
       'libevent-2.1-7',
+      'libavif13',
     ],
     lib2package: {
+      'libavif.so.13': 'libavif13',
       'libsoup-3.0.so.0': 'libsoup-3.0-0',
       'libasound.so.2': 'libasound2',
       'libatk-1.0.so.0': 'libatk1.0-0',
@@ -398,6 +400,7 @@ export const deps: any = {
       'libgsttag-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
       'libgstvideo-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
       'libgtk-3.so.0': 'libgtk-3-0',
+      'libgtk-4.so.1': 'libgtk-4-1',
       'libgudev-1.0.so.0': 'libgudev-1.0-0',
       'libharfbuzz-icu.so.0': 'libharfbuzz-icu0',
       'libharfbuzz.so.0': 'libharfbuzz0b',
@@ -542,7 +545,7 @@ export const deps: any = {
       'libgstreamer-plugins-bad1.0-0',
       'libgstreamer-plugins-base1.0-0',
       'libgstreamer1.0-0',
-      'libgtk-3-0t64',
+      'libgtk-4-1',
       'libharfbuzz-icu0',
       'libharfbuzz0b',
       'libhyphen0',
@@ -566,9 +569,11 @@ export const deps: any = {
       'libxkbcommon0',
       'libxml2',
       'libxslt1.1',
-      'libx264-164'
+      'libx264-164',
+      'libavif16',
     ],
     lib2package: {
+      'libavif.so.16': 'libavif16',
       'libasound.so.2': 'libasound2t64',
       'libatk-1.0.so.0': 'libatk1.0-0t64',
       'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0t64',
@@ -617,6 +622,7 @@ export const deps: any = {
       'libgsttag-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
       'libgstvideo-1.0.so.0': 'libgstreamer-plugins-base1.0-0',
       'libgtk-3.so.0': 'libgtk-3-0t64',
+      'libgtk-4.so.1': 'libgtk-4-1',
       'libharfbuzz-icu.so.0': 'libharfbuzz-icu0',
       'libharfbuzz.so.0': 'libharfbuzz0b',
       'libhyphen.so.0': 'libhyphen0',
@@ -963,7 +969,7 @@ export const deps: any = {
       'libgstreamer-gl1.0-0',
       'libgstreamer-plugins-base1.0-0',
       'libgstreamer1.0-0',
-      'libgtk-3-0',
+      'libgtk-4-1',
       'libgudev-1.0-0',
       'libharfbuzz-icu0',
       'libharfbuzz0b',
@@ -994,8 +1000,10 @@ export const deps: any = {
       'libxslt1.1',
       'libatomic1',
       'libevent-2.1-7',
+      'libavif15',
     ],
     lib2package: {
+      'libavif.so.15': 'libavif15',
       'libsoup-3.0.so.0': 'libsoup-3.0-0',
       'libasound.so.2': 'libasound2',
       'libatk-1.0.so.0': 'libatk1.0-0',
@@ -1022,6 +1030,169 @@ export const deps: any = {
       'libXfixes.so.3': 'libxfixes3',
       'libxkbcommon.so.0': 'libxkbcommon0',
       'libXrandr.so.2': 'libxrandr2',
+      'libgtk-4.so.1': 'libgtk-4-1',
+    }
+  },
+  'debian13-x64': {
+    tools: [
+      'xvfb',
+      'fonts-noto-color-emoji',
+      'fonts-unifont',
+      'libfontconfig1',
+      'libfreetype6',
+      'xfonts-scalable',
+      'fonts-liberation',
+      'fonts-ipafont-gothic',
+      'fonts-wqy-zenhei',
+      'fonts-tlwg-loma-otf',
+      'fonts-freefont-ttf',
+    ],
+    chromium: [
+      'libasound2t64',
+      'libatk-bridge2.0-0t64',
+      'libatk1.0-0t64',
+      'libatspi2.0-0t64',
+      'libcairo2',
+      'libcups2t64',
+      'libdbus-1-3',
+      'libdrm2',
+      'libgbm1',
+      'libglib2.0-0t64',
+      'libnspr4',
+      'libnss3',
+      'libpango-1.0-0',
+      'libx11-6',
+      'libxcb1',
+      'libxcomposite1',
+      'libxdamage1',
+      'libxext6',
+      'libxfixes3',
+      'libxkbcommon0',
+      'libxrandr2'
+    ],
+    firefox: [
+      'libasound2',
+      'libatk1.0-0t64',
+      'libcairo-gobject2',
+      'libcairo2',
+      'libdbus-1-3',
+      'libdbus-glib-1-2',
+      'libfontconfig1',
+      'libfreetype6',
+      'libgdk-pixbuf-2.0-0',
+      'libglib2.0-0t64',
+      'libgtk-3-0t64',
+      'libharfbuzz0b',
+      'libpango-1.0-0',
+      'libpangocairo-1.0-0',
+      'libx11-6',
+      'libx11-xcb1',
+      'libxcb-shm0',
+      'libxcb1',
+      'libxcomposite1',
+      'libxcursor1',
+      'libxdamage1',
+      'libxext6',
+      'libxfixes3',
+      'libxi6',
+      'libxrandr2',
+      'libxrender1',
+      'libxtst6'
+    ],
+    webkit: [
+      'libsoup-3.0-0',
+      'gstreamer1.0-libav',
+      'gstreamer1.0-plugins-bad',
+      'gstreamer1.0-plugins-base',
+      'gstreamer1.0-plugins-good',
+      'libatk-bridge2.0-0t64',
+      'libatk1.0-0t64',
+      'libcairo2',
+      'libdbus-1-3',
+      'libdrm2',
+      'libegl1',
+      'libenchant-2-2',
+      'libepoxy0',
+      'libevdev2',
+      'libfontconfig1',
+      'libfreetype6',
+      'libgbm1',
+      'libgdk-pixbuf-2.0-0',
+      'libgles2',
+      'libglib2.0-0t64',
+      'libglx0',
+      'libgstreamer-gl1.0-0',
+      'libgstreamer-plugins-base1.0-0',
+      'libgstreamer1.0-0',
+      'libgtk-4-1',
+      'libgudev-1.0-0',
+      'libharfbuzz-icu0',
+      'libharfbuzz0b',
+      'libhyphen0',
+      'libicu76',
+      'libjpeg62-turbo',
+      'liblcms2-2',
+      'libmanette-0.2-0',
+      'libnotify4',
+      'libopengl0',
+      'libopenjp2-7',
+      'libopus0',
+      'libpango-1.0-0',
+      'libpng16-16t64',
+      'libproxy1v5',
+      'libsecret-1-0',
+      'libwayland-client0',
+      'libwayland-egl1',
+      'libwayland-server0',
+      'libwebp7',
+      'libwebpdemux2',
+      'libwoff1',
+      'libx11-6',
+      'libxcomposite1',
+      'libxdamage1',
+      'libxkbcommon0',
+      'libxml2',
+      'libxslt1.1',
+      'libatomic1',
+      'libevent-2.1-7t64',
+      'libavif16',
+    ],
+    lib2package: {
+      'libicudata.so.74': 'libicu76',
+      'libicui18n.so.74': 'libicu76',
+      'libicuuc.so.74': 'libicu76',
+      'libevent-2.1.so.7': 'libevent-2.1-7t64',
+      'libpng16.so.16': 'libpng16-16t64',
+      'libgdk-3.so.0': 'libgtk-3-0t64',
+      'libgtk-3.so.0': 'libgtk-3-0t64',
+      'libavif.so.16': 'libavif16',
+      'libsoup-3.0.so.0': 'libsoup-3.0-0',
+      'libasound.so.2': 'libasound2t64',
+      'libatk-1.0.so.0': 'libatk1.0-0t64',
+      'libatk-bridge-2.0.so.0': 'libatk-bridge2.0-0t64',
+      'libatspi.so.0': 'libatspi2.0-0t64',
+      'libcairo.so.2': 'libcairo2',
+      'libcups.so.2': 'libcups2t64',
+      'libdbus-1.so.3': 'libdbus-1-3',
+      'libdrm.so.2': 'libdrm2',
+      'libgbm.so.1': 'libgbm1',
+      'libgio-2.0.so.0': 'libglib2.0-0t64',
+      'libglib-2.0.so.0': 'libglib2.0-0t64',
+      'libgobject-2.0.so.0': 'libglib2.0-0t64',
+      'libnspr4.so': 'libnspr4',
+      'libnss3.so': 'libnss3',
+      'libnssutil3.so': 'libnss3',
+      'libpango-1.0.so.0': 'libpango-1.0-0',
+      'libsmime3.so': 'libnss3',
+      'libX11.so.6': 'libx11-6',
+      'libxcb.so.1': 'libxcb1',
+      'libXcomposite.so.1': 'libxcomposite1',
+      'libXdamage.so.1': 'libxdamage1',
+      'libXext.so.6': 'libxext6',
+      'libXfixes.so.3': 'libxfixes3',
+      'libxkbcommon.so.0': 'libxkbcommon0',
+      'libXrandr.so.2': 'libxrandr2',
+      'libgtk-4.so.1': 'libgtk-4-1',
     }
   },
 };
@@ -1096,3 +1267,16 @@ deps['debian12-arm64'] = {
   },
 };
 
+deps['debian13-arm64'] = {
+  tools: [...deps['debian13-x64'].tools],
+  chromium: [...deps['debian13-x64'].chromium],
+  firefox: [
+    ...deps['debian13-x64'].firefox,
+  ],
+  webkit: [
+    ...deps['debian13-x64'].webkit,
+  ],
+  lib2package: {
+    ...deps['debian13-x64'].lib2package,
+  },
+};
diff --git a/packages/playwright-core/src/server/registry/oopDownloadBrowserMain.ts b/packages/playwright-core/src/server/registry/oopDownloadBrowserMain.ts
index 247581277ea4d..9c59d0e6f2c97 100644
--- a/packages/playwright-core/src/server/registry/oopDownloadBrowserMain.ts
+++ b/packages/playwright-core/src/server/registry/oopDownloadBrowserMain.ts
@@ -16,8 +16,9 @@
 
 import fs from 'fs';
 import path from 'path';
-import { httpRequest } from '../../utils/network';
-import { ManualPromise } from '../../utils/manualPromise';
+
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { httpRequest } from '../utils/network';
 import { extract } from '../../zipBundle';
 
 export type DownloadParams = {
@@ -26,7 +27,7 @@ export type DownloadParams = {
   url: string;
   zipPath: string;
   executablePath: string | undefined;
-  connectionTimeout: number;
+  socketTimeout: number;
   userAgent: string;
 };
 
@@ -47,13 +48,12 @@ function downloadFile(options: DownloadParams): Promise<void> {
   let totalBytes = 0;
 
   const promise = new ManualPromise<void>();
-
   httpRequest({
     url: options.url,
     headers: {
       'User-Agent': options.userAgent,
     },
-    timeout: options.connectionTimeout,
+    socketTimeout: options.socketTimeout,
   }, response => {
     log(`-- response status code: ${response.statusCode}`);
     if (response.statusCode !== 200) {
diff --git a/packages/playwright-core/src/server/screenshotter.ts b/packages/playwright-core/src/server/screenshotter.ts
index 485560b5395a4..93765cc3372f5 100644
--- a/packages/playwright-core/src/server/screenshotter.ts
+++ b/packages/playwright-core/src/server/screenshotter.ts
@@ -15,16 +15,18 @@
  * limitations under the License.
  */
 
-import type * as dom from './dom';
-import type { Rect } from '../common/types';
 import { helper } from './helper';
-import type { Page } from './page';
+import { assert } from '../utils';
+import { MultiMap } from '../utils/isomorphic/multimap';
+
+import type * as dom from './dom';
 import type { Frame } from './frames';
-import type { ParsedSelector } from '../utils/isomorphic/selectorParser';
-import type * as types from './types';
+import type { Page } from './page';
 import type { Progress } from './progress';
-import { assert } from '../utils';
-import { MultiMap } from '../utils/multimap';
+import type * as types from './types';
+import type { Rect } from '../utils/isomorphic/types';
+import type { ParsedSelector } from '../utils/isomorphic/selectorParser';
+
 
 declare global {
   interface Window {
@@ -171,12 +173,11 @@ export class Screenshotter {
     this._queue = new TaskQueue();
   }
 
-  private async _originalViewportSize(progress: Progress): Promise<{ viewportSize: types.Size, originalViewportSize: types.Size | null }> {
-    const originalViewportSize = this._page.viewportSize();
-    let viewportSize = originalViewportSize;
+  private async _originalViewportSize(progress: Progress): Promise<types.Size> {
+    let viewportSize = this._page.emulatedSize()?.viewport;
     if (!viewportSize)
       viewportSize = await this._page.mainFrame().waitForFunctionValueInUtility(progress, () => ({ width: window.innerWidth, height: window.innerHeight }));
-    return { viewportSize, originalViewportSize };
+    return viewportSize;
   }
 
   private async _fullPageSize(progress: Progress): Promise<types.Size> {
@@ -203,27 +204,22 @@ export class Screenshotter {
     const format = validateScreenshotOptions(options);
     return this._queue.postTask(async () => {
       progress.log('taking page screenshot');
-      const { viewportSize } = await this._originalViewportSize(progress);
+      const viewportSize = await this._originalViewportSize(progress);
       await this._preparePageForScreenshot(progress, this._page.mainFrame(), options.style, options.caret !== 'initial', options.animations === 'disabled');
-      progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
-
-      if (options.fullPage) {
-        const fullPageSize = await this._fullPageSize(progress);
-        let documentRect = { x: 0, y: 0, width: fullPageSize.width, height: fullPageSize.height };
-        const fitsViewport = fullPageSize.width <= viewportSize.width && fullPageSize.height <= viewportSize.height;
-        if (options.clip)
-          documentRect = trimClipToSize(options.clip, documentRect);
-        const buffer = await this._screenshot(progress, format, documentRect, undefined, fitsViewport, options);
-        progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
+      try {
+        if (options.fullPage) {
+          const fullPageSize = await this._fullPageSize(progress);
+          let documentRect = { x: 0, y: 0, width: fullPageSize.width, height: fullPageSize.height };
+          const fitsViewport = fullPageSize.width <= viewportSize.width && fullPageSize.height <= viewportSize.height;
+          if (options.clip)
+            documentRect = trimClipToSize(options.clip, documentRect);
+          return await this._screenshot(progress, format, documentRect, undefined, fitsViewport, options);
+        }
+        const viewportRect = options.clip ? trimClipToSize(options.clip, viewportSize) : { x: 0, y: 0, ...viewportSize };
+        return await this._screenshot(progress, format, undefined, viewportRect, true, options);
+      } finally {
         await this._restorePageAfterScreenshot();
-        return buffer;
       }
-
-      const viewportRect = options.clip ? trimClipToSize(options.clip, viewportSize) : { x: 0, y: 0, ...viewportSize };
-      const buffer = await this._screenshot(progress, format, undefined, viewportRect, true, options);
-      progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
-      await this._restorePageAfterScreenshot();
-      return buffer;
     });
   }
 
@@ -231,43 +227,44 @@ export class Screenshotter {
     const format = validateScreenshotOptions(options);
     return this._queue.postTask(async () => {
       progress.log('taking element screenshot');
-      const { viewportSize } = await this._originalViewportSize(progress);
+      const viewportSize = await this._originalViewportSize(progress);
 
       await this._preparePageForScreenshot(progress, handle._frame, options.style, options.caret !== 'initial', options.animations === 'disabled');
-      progress.throwIfAborted(); // Do not do extra work.
-
-      await handle._waitAndScrollIntoViewIfNeeded(progress, true /* waitForVisible */);
-
-      progress.throwIfAborted(); // Do not do extra work.
-      const boundingBox = await handle.boundingBox();
-      assert(boundingBox, 'Node is either not visible or not an HTMLElement');
-      assert(boundingBox.width !== 0, 'Node has 0 width.');
-      assert(boundingBox.height !== 0, 'Node has 0 height.');
-
-      const fitsViewport = boundingBox.width <= viewportSize.width && boundingBox.height <= viewportSize.height;
-      progress.throwIfAborted(); // Avoid extra work.
-      const scrollOffset = await this._page.mainFrame().waitForFunctionValueInUtility(progress, () => ({ x: window.scrollX, y: window.scrollY }));
-      const documentRect = { ...boundingBox };
-      documentRect.x += scrollOffset.x;
-      documentRect.y += scrollOffset.y;
-      const buffer = await this._screenshot(progress, format, helper.enclosingIntRect(documentRect), undefined, fitsViewport, options);
-      progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
-      await this._restorePageAfterScreenshot();
-      return buffer;
+      try {
+        await handle._waitAndScrollIntoViewIfNeeded(progress, true /* waitForVisible */);
+
+        const boundingBox = await progress.race(handle.boundingBox());
+        assert(boundingBox, 'Node is either not visible or not an HTMLElement');
+        assert(boundingBox.width !== 0, 'Node has 0 width.');
+        assert(boundingBox.height !== 0, 'Node has 0 height.');
+
+        const fitsViewport = boundingBox.width <= viewportSize.width && boundingBox.height <= viewportSize.height;
+        const scrollOffset = await this._page.mainFrame().waitForFunctionValueInUtility(progress, () => ({ x: window.scrollX, y: window.scrollY }));
+        const documentRect = { ...boundingBox };
+        documentRect.x += scrollOffset.x;
+        documentRect.y += scrollOffset.y;
+        return await this._screenshot(progress, format, helper.enclosingIntRect(documentRect), undefined, fitsViewport, options);
+      } finally {
+        await this._restorePageAfterScreenshot();
+      }
     });
   }
 
   async _preparePageForScreenshot(progress: Progress, frame: Frame, screenshotStyle: string | undefined, hideCaret: boolean, disableAnimations: boolean) {
     if (disableAnimations)
       progress.log('  disabled all CSS animations');
-    const syncAnimations = this._page._delegate.shouldToggleStyleSheetToSyncAnimations();
-    await this._page.safeNonStallingEvaluateInAllFrames('(' + inPagePrepareForScreenshots.toString() + `)(${JSON.stringify(screenshotStyle)}, ${hideCaret}, ${disableAnimations}, ${syncAnimations})`, 'utility');
-    if (!process.env.PW_TEST_SCREENSHOT_NO_FONTS_READY) {
-      progress.log('waiting for fonts to load...');
-      await frame.nonStallingEvaluateInExistingContext('document.fonts.ready', 'utility').catch(() => {});
-      progress.log('fonts loaded');
+    const syncAnimations = this._page.delegate.shouldToggleStyleSheetToSyncAnimations();
+    await progress.race(this._page.safeNonStallingEvaluateInAllFrames('(' + inPagePrepareForScreenshots.toString() + `)(${JSON.stringify(screenshotStyle)}, ${hideCaret}, ${disableAnimations}, ${syncAnimations})`, 'utility'));
+    try {
+      if (!process.env.PW_TEST_SCREENSHOT_NO_FONTS_READY) {
+        progress.log('waiting for fonts to load...');
+        await progress.race(frame.nonStallingEvaluateInExistingContext('document.fonts.ready', 'utility').catch(() => {}));
+        progress.log('fonts loaded');
+      }
+    } catch (error) {
+      await this._restorePageAfterScreenshot();
+      throw error;
     }
-    progress.cleanupWhenAborted(() => this._restorePageAfterScreenshot());
   }
 
   async _restorePageAfterScreenshot() {
@@ -275,58 +272,56 @@ export class Screenshotter {
   }
 
   async _maskElements(progress: Progress, options: ScreenshotOptions): Promise<() => Promise<void>> {
+    if (!options.mask || !options.mask.length)
+      return () => Promise.resolve();
+
     const framesToParsedSelectors: MultiMap<Frame, ParsedSelector> = new MultiMap();
+    await progress.race(Promise.all((options.mask || []).map(async ({ frame, selector }) => {
+      const pair = await frame.selectors.resolveFrameForSelector(selector);
+      if (pair)
+        framesToParsedSelectors.set(pair.frame, pair.info.parsed);
+    })));
 
+    const frames = [...framesToParsedSelectors.keys()];
     const cleanup = async () => {
-      await Promise.all([...framesToParsedSelectors.keys()].map(async frame => {
-        await frame.hideHighlight();
-      }));
+      await Promise.all(frames.map(frame => frame.hideHighlight()));
     };
 
-    if (!options.mask || !options.mask.length)
+    try {
+      const promises = frames.map(frame => frame.maskSelectors(framesToParsedSelectors.get(frame), options.maskColor || '#F0F'));
+      await progress.race(Promise.all(promises));
       return cleanup;
-
-    await Promise.all((options.mask || []).map(async ({ frame, selector }) => {
-      const pair = await frame.selectors.resolveFrameForSelector(selector);
-      if (pair)
-        framesToParsedSelectors.set(pair.frame, pair.info.parsed);
-    }));
-    progress.throwIfAborted(); // Avoid extra work.
-
-    await Promise.all([...framesToParsedSelectors.keys()].map(async frame => {
-      await frame.maskSelectors(framesToParsedSelectors.get(frame), options.maskColor || '#F0F');
-    }));
-    progress.cleanupWhenAborted(cleanup);
-    return cleanup;
+    } catch (error) {
+      cleanup().catch(() => {});
+      throw error;
+    }
   }
 
   private async _screenshot(progress: Progress, format: 'png' | 'jpeg', documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, fitsViewport: boolean, options: ScreenshotOptions): Promise<Buffer> {
     if ((options as any).__testHookBeforeScreenshot)
-      await (options as any).__testHookBeforeScreenshot();
-    progress.throwIfAborted(); // Screenshotting is expensive - avoid extra work.
-    const shouldSetDefaultBackground = options.omitBackground && format === 'png';
-    if (shouldSetDefaultBackground) {
-      await this._page._delegate.setBackgroundColor({ r: 0, g: 0, b: 0, a: 0 });
-      progress.cleanupWhenAborted(() => this._page._delegate.setBackgroundColor());
-    }
-    progress.throwIfAborted(); // Avoid extra work.
+      await progress.race((options as any).__testHookBeforeScreenshot());
 
+    const shouldSetDefaultBackground = options.omitBackground && format === 'png';
+    if (shouldSetDefaultBackground)
+      await progress.race(this._page.delegate.setBackgroundColor({ r: 0, g: 0, b: 0, a: 0 }));
     const cleanupHighlight = await this._maskElements(progress, options);
-    progress.throwIfAborted(); // Avoid extra work.
 
-    const quality = format === 'jpeg' ? options.quality ?? 80 : undefined;
-    const buffer = await this._page._delegate.takeScreenshot(progress, format, documentRect, viewportRect, quality, fitsViewport, options.scale || 'device');
-    progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
-
-    await cleanupHighlight();
-    progress.throwIfAborted(); // Avoid restoring after failure - should be done by cleanup.
-
-    if (shouldSetDefaultBackground)
-      await this._page._delegate.setBackgroundColor();
-    progress.throwIfAborted(); // Avoid side effects.
-    if ((options as any).__testHookAfterScreenshot)
-      await (options as any).__testHookAfterScreenshot();
-    return buffer;
+    try {
+      const quality = format === 'jpeg' ? options.quality ?? 80 : undefined;
+      const buffer = await this._page.delegate.takeScreenshot(progress, format, documentRect, viewportRect, quality, fitsViewport, options.scale || 'device');
+      await cleanupHighlight();
+      if (shouldSetDefaultBackground)
+        await this._page.delegate.setBackgroundColor();
+      if ((options as any).__testHookAfterScreenshot)
+        await progress.race((options as any).__testHookAfterScreenshot());
+      return buffer;
+    } catch (error) {
+      // Cleanup without blocking, it will be done before the next playwright action.
+      cleanupHighlight().catch(() => {});
+      if (shouldSetDefaultBackground)
+        this._page.delegate.setBackgroundColor().catch(() => {});
+      throw error;
+    }
   }
 }
 
diff --git a/packages/playwright-core/src/server/selectors.ts b/packages/playwright-core/src/server/selectors.ts
index b54a0269a56b4..fbe46ea310e6a 100644
--- a/packages/playwright-core/src/server/selectors.ts
+++ b/packages/playwright-core/src/server/selectors.ts
@@ -14,17 +14,20 @@
  * limitations under the License.
  */
 
-import { visitAllSelectorParts, InvalidSelectorError, type ParsedSelector, parseSelector, stringifySelector } from '../utils/isomorphic/selectorParser';
-import { createGuid } from '../utils';
+import { createGuid } from './utils/crypto';
+import { InvalidSelectorError,  parseSelector, stringifySelector, visitAllSelectorParts } from '../utils/isomorphic/selectorParser';
+
+import type { ParsedSelector } from '../utils/isomorphic/selectorParser';
+import type * as channels from '@protocol/channels';
 
 export class Selectors {
   private readonly _builtinEngines: Set<string>;
   private readonly _builtinEnginesInMainWorld: Set<string>;
-  readonly _engines: Map<string, { source: string, contentScript: boolean }>;
+  readonly _engines: Map<string, channels.SelectorEngine>;
   readonly guid = `selectors@${createGuid()}`;
-  private _testIdAttributeName: string = 'data-testid';
+  private _testIdAttributeName: string;
 
-  constructor() {
+  constructor(engines: channels.SelectorEngine[], testIdAttributeName: string | undefined) {
     // Note: keep in sync with InjectedScript class.
     this._builtinEngines = new Set([
       'css', 'css:light',
@@ -39,23 +42,28 @@ export class Selectors {
       'internal:has', 'internal:has-not',
       'internal:has-text', 'internal:has-not-text',
       'internal:and', 'internal:or', 'internal:chain',
-      'role', 'internal:attr', 'internal:label', 'internal:text', 'internal:role', 'internal:testid',
+      'role', 'internal:attr', 'internal:label', 'internal:text',
+      'internal:role', 'internal:testid', 'internal:describe',
+      'aria-ref'
     ]);
     this._builtinEnginesInMainWorld = new Set([
       '_react', '_vue',
     ]);
     this._engines = new Map();
+    this._testIdAttributeName = testIdAttributeName ?? 'data-testid';
+    for (const engine of engines)
+      this.register(engine);
   }
 
-  async register(name: string, source: string, contentScript: boolean = false): Promise<void> {
-    if (!name.match(/^[a-zA-Z_0-9-]+$/))
+  register(engine: channels.SelectorEngine) {
+    if (!engine.name.match(/^[a-zA-Z_0-9-]+$/))
       throw new Error('Selector engine name may only contain [a-zA-Z0-9_] characters');
     // Note: we keep 'zs' for future use.
-    if (this._builtinEngines.has(name) || name === 'zs' || name === 'zs:light')
-      throw new Error(`"${name}" is a predefined selector engine`);
-    if (this._engines.has(name))
-      throw new Error(`"${name}" selector engine has been already registered`);
-    this._engines.set(name, { source, contentScript });
+    if (this._builtinEngines.has(engine.name) || engine.name === 'zs' || engine.name === 'zs:light')
+      throw new Error(`"${engine.name}" is a predefined selector engine`);
+    if (this._engines.has(engine.name))
+      throw new Error(`"${engine.name}" selector engine has been already registered`);
+    this._engines.set(engine.name, engine);
   }
 
   testIdAttributeName(): string {
@@ -66,10 +74,6 @@ export class Selectors {
     this._testIdAttributeName = testIdAttributeName;
   }
 
-  unregisterAll() {
-    this._engines.clear();
-  }
-
   parseSelector(selector: string | ParsedSelector, strict: boolean) {
     const parsed = typeof selector === 'string' ? parseSelector(selector) : selector;
     let needsMainWorld = false;
diff --git a/packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts b/packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts
index f16a60fe008eb..846d2ca3d16b3 100644
--- a/packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts
+++ b/packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts
@@ -14,201 +14,262 @@
  * limitations under the License.
  */
 
-import net from 'net';
-import path from 'path';
+import { EventEmitter } from 'events';
 import http2 from 'http2';
-import type https from 'https';
-import fs from 'fs';
-import tls from 'tls';
+import net from 'net';
 import stream from 'stream';
-import { createSocket, createTLSSocket } from '../utils/happy-eyeballs';
-import { isUnderTest, ManualPromise } from '../utils';
-import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from '../common/socksProxy';
-import { SocksProxy } from '../common/socksProxy';
-import type * as channels from '@protocol/channels';
-import { debugLogger } from '../utils/debugLogger';
+import tls from 'tls';
+
+import { SocksProxy } from './utils/socksProxy';
+import { escapeHTML, generateSelfSignedCertificate, rewriteErrorMessage } from '../utils';
+import { verifyClientCertificates } from './browserContext';
+import { createProxyAgent } from './utils/network';
+import { debugLogger } from './utils/debugLogger';
+import { createSocket } from './utils/happyEyeballs';
+import { getProxyForUrl } from '../utilsBundle';
+
+import type * as types from './types';
+import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from './utils/socksProxy';
+import type https from 'https';
+import type { Progress } from '@protocol/progress';
 
 let dummyServerTlsOptions: tls.TlsOptions | undefined = undefined;
 function loadDummyServerCertsIfNeeded() {
   if (dummyServerTlsOptions)
     return;
-  dummyServerTlsOptions = {
-    key: fs.readFileSync(path.join(__dirname, '../../bin/socks-certs/key.pem')),
-    cert: fs.readFileSync(path.join(__dirname, '../../bin/socks-certs/cert.pem')),
-  };
+  const { cert, key } = generateSelfSignedCertificate();
+  dummyServerTlsOptions = { key, cert };
 }
 
-class ALPNCache {
-  private _cache = new Map<string, ManualPromise<string>>();
+// Client Certificates in Playwright are implemented as a SOCKS5 proxy that injects client certificates into the TLS handshake.
+// We do that to avoid patching the browsers TLS stack and expose the certificates there.
+// The following shows two flow diagrams, one for http:// and one for https://.
+// Key Decision Point: First byte check (0x16 = TLS handshake)
 
-  get(host: string, port: number, success: (protocol: string) => void) {
-    const cacheKey = `${host}:${port}`;
-    {
-      const result = this._cache.get(cacheKey);
-      if (result) {
-        result.then(success);
-        return;
-      }
-    }
-    const result = new ManualPromise<string>();
-    this._cache.set(cacheKey, result);
-    result.then(success);
-    createTLSSocket({
-      host,
-      port,
-      servername: net.isIP(host) ? undefined : host,
-      ALPNProtocols: ['h2', 'http/1.1'],
-      rejectUnauthorized: false,
-    }).then(socket => {
-      socket.on('secureConnect', () => {
-        // The server may not respond with ALPN, in which case we default to http/1.1.
-        result.resolve(socket.alpnProtocol || 'http/1.1');
-        socket.end();
-      });
-    }).catch(error => {
-      debugLogger.log('client-certificates', `ALPN error: ${error.message}`);
-      result.resolve('http/1.1');
-    });
-  }
-}
+// HTTP FLOW (Plain text):
+//     BROWSER                    PROXY                     SERVER
+//        │                        │                         │
+//        │   SOCKS5 Connect       │                         │
+//        │───────────────────────►│                         │
+//        │                        │    TCP Connect          │
+//        │                        │────────────────────────►│
+//        │                        │                         │
+//        │   HTTP Request         │                         │
+//        │───────────────────────►│                         │
+//        │                        │ Check: not 0x16         │
+//        │                        │ → Direct pipe           │
+//        │                        │                         │
+//        │                        │   HTTP Request          │
+//        │                        │────────────────────────►│
+//        │                        │                         │
+//        │◄═══════════════════════│════════════════════════►│
+//        │      Plain HTTP        │      Plain HTTP         │
+
+// HTTPS FLOW (TLS with client certificates):
+//     BROWSER                    PROXY                     SERVER
+//        │                        │                         │
+//        │   SOCKS5 Connect       │                         │
+//        │───────────────────────►│                         │
+//        │                        │    TCP Connect          │
+//        │                        │────────────────────────►│
+//        │                        │                         │
+//        │   TLS ClientHello      │                         │
+//        │   (with ALPN)          │                         │
+//        │───────────────────────►│                         │
+//        │                        │ Check: 0x16 = TLS       │
+//        │                        │ Parse ALPN protocols    │
+//        │                        │ Create dual TLS conns   │
+//        │                        │                         │
+//        │                        │   TLS ClientHello       │
+//        │                        │   (with client cert)    │
+//        │                        │────────────────────────►│
+//        │                        │                         │
+//        │                        │◄───── TLS Handshake ────│
+//        │◄──── TLS Handshake ────│                         │
+//        │                        │                         │
+//        │◄═══════════════════════│════════════════════════►│
+//        │      Encrypted Data    │    Encrypted Data       │
+//        │      (HTTP/1.1 or H2)  │    (with client auth)   │
 
 class SocksProxyConnection {
   private readonly socksProxy: ClientCertificatesProxy;
   private readonly uid: string;
   private readonly host: string;
   private readonly port: number;
-  firstPackageReceived: boolean = false;
-  target!: net.Socket;
-  // In case of http, we just pipe data to the target socket and they are |undefined|.
-  internal: stream.Duplex | undefined;
-  private _targetCloseEventListener: () => void;
+  private _firstPackageReceived = false;
+  private _serverEncrypted!: net.Socket;
+  private _browserEncrypted: stream.Duplex;
+  private _brorwserDecrypted: Promise<tls.TLSSocket> | undefined;
+  private _serverCloseEventListener: () => void;
+  private _closed = false;
 
   constructor(socksProxy: ClientCertificatesProxy, uid: string, host: string, port: number) {
     this.socksProxy = socksProxy;
     this.uid = uid;
     this.host = host;
     this.port = port;
-    this._targetCloseEventListener = () => this.socksProxy._socksProxy.sendSocketEnd({ uid: this.uid });
+    this._serverCloseEventListener = () => {
+      this._browserEncrypted.destroy();
+    };
+    this._browserEncrypted = new stream.Duplex({
+      read: () => { },
+      write: (data, encoding, callback) => {
+        this.socksProxy._socksProxy.sendSocketData({ uid: this.uid, data });
+        callback();
+      },
+      destroy: (error, callback) => {
+        if (error)
+          socksProxy._socksProxy.sendSocketError({ uid: this.uid, error: error.message });
+        else
+          socksProxy._socksProxy.sendSocketEnd({ uid: this.uid });
+        callback();
+      },
+    });
   }
 
   async connect() {
-    this.target = await createSocket(rewriteToLocalhostIfNeeded(this.host), this.port);
-    this.target.on('close', this._targetCloseEventListener);
-    this.target.on('error', error => this.socksProxy._socksProxy.sendSocketError({ uid: this.uid, error: error.message }));
+    const proxyAgent = this.socksProxy.getProxyAgent(this.host, this.port);
+    if (proxyAgent)
+      this._serverEncrypted = await proxyAgent.callback(new EventEmitter() as any, { host: rewriteToLocalhostIfNeeded(this.host), port: this.port, secureEndpoint: false });
+    else
+      this._serverEncrypted = await createSocket(rewriteToLocalhostIfNeeded(this.host), this.port);
+
+    this._serverEncrypted.once('close', this._serverCloseEventListener);
+    this._serverEncrypted.once('error', error => this._browserEncrypted.destroy(error));
+    if (this._closed) {
+      this._serverEncrypted.destroy();
+      return;
+    }
     this.socksProxy._socksProxy.socketConnected({
       uid: this.uid,
-      host: this.target.localAddress!,
-      port: this.target.localPort!,
+      host: this._serverEncrypted.localAddress!,
+      port: this._serverEncrypted.localPort!,
     });
   }
 
   public onClose() {
-    this.internal?.destroy();
-    this.target.destroy();
+    // Close the other end and cleanup TLS resources.
+    this._serverEncrypted.destroy();
+    this._browserEncrypted.destroy();
+    this._closed = true;
   }
 
   public onData(data: Buffer) {
     // HTTP / TLS are client-hello based protocols. This allows us to detect
     // the protocol on the first package and attach appropriate listeners.
-    if (!this.firstPackageReceived) {
-      this.firstPackageReceived = true;
+    if (!this._firstPackageReceived) {
+      this._firstPackageReceived = true;
       // 0x16 is SSLv3/TLS "handshake" content type: https://en.wikipedia.org/wiki/Transport_Layer_Security#TLS_record
       if (data[0] === 0x16)
-        this._attachTLSListeners();
+        this._establishTlsTunnel(this._browserEncrypted, data);
       else
-        this.target.on('data', data => this.socksProxy._socksProxy.sendSocketData({ uid: this.uid, data }));
+        this._establishPlaintextTunnel(this._browserEncrypted);
     }
-    if (this.internal)
-      this.internal.push(data);
-    else
-      this.target.write(data);
+
+    this._browserEncrypted.push(data);
   }
 
-  private _attachTLSListeners() {
-    this.internal = new stream.Duplex({
-      read: () => {},
-      write: (data, encoding, callback) => {
-        this.socksProxy._socksProxy.sendSocketData({ uid: this.uid, data });
-        callback();
+
+  private _establishPlaintextTunnel(browserEncrypted: stream.Duplex) {
+    browserEncrypted.pipe(this._serverEncrypted);
+    this._serverEncrypted.pipe(browserEncrypted);
+  }
+
+  private _establishTlsTunnel(browserEncrypted: stream.Duplex, clientHello: Buffer) {
+    const browserALPNProtocols = parseALPNFromClientHello(clientHello) || ['http/1.1'];
+    debugLogger.log('client-certificates', `Browser->Proxy ${this.host}:${this.port} offers ALPN ${browserALPNProtocols}`);
+
+    const serverDecrypted = tls.connect({
+      socket: this._serverEncrypted,
+      host: this.host,
+      port: this.port,
+      rejectUnauthorized: !this.socksProxy.ignoreHTTPSErrors,
+      ALPNProtocols: browserALPNProtocols,
+      servername: !net.isIP(this.host) ? this.host : undefined,
+      secureContext: this.socksProxy.secureContextMap.get(new URL(`https://${this.host}:${this.port}`).origin),
+    }, async () => {
+      const browserDecrypted = await this._upgradeToTLSIfNeeded(browserEncrypted, serverDecrypted.alpnProtocol);
+      debugLogger.log('client-certificates', `Proxy->Server ${this.host}:${this.port} chooses ALPN ${browserDecrypted.alpnProtocol}`);
+      browserDecrypted.pipe(serverDecrypted);
+      serverDecrypted.pipe(browserDecrypted);
+
+      const cleanup = (error: Error | undefined) => this._serverEncrypted.destroy(error);
+
+      browserDecrypted.once('error', cleanup);
+      serverDecrypted.once('error', cleanup);
+      browserDecrypted.once('close', cleanup);
+      serverDecrypted.once('close', cleanup);
+
+      if (this._closed)
+        serverDecrypted.destroy();
+    });
+    serverDecrypted.once('error', async (error: Error) => {
+      debugLogger.log('client-certificates', `error when connecting to server: ${error.message.replaceAll('\n', ' ')}`);
+
+      // Once we receive an error, we manually close the server connection.
+      // In case of an 'error' event on the server connection, we still need to perform the http2 handshake on the browser side.
+      // This is an async operation, so we need to remove the listener to prevent the socket from being closed too early.
+      // This means we call this._serverCloseEventListener manually.
+      this._serverEncrypted.removeListener('close', this._serverCloseEventListener);
+      this._serverEncrypted.destroy();
+
+      const browserDecrypted = await this._upgradeToTLSIfNeeded(this._browserEncrypted, serverDecrypted.alpnProtocol);
+      const responseBody = escapeHTML('Playwright client-certificate error: ' + error.message)
+          .replaceAll('\n', ' <br>');
+      if (browserDecrypted.alpnProtocol === 'h2') {
+        // This method is available only in Node.js 20+
+        if ('performServerHandshake' in http2) {
+          // @ts-expect-error
+          const session: http2.ServerHttp2Session = http2.performServerHandshake(browserDecrypted);
+          session.on('error', error => {
+            this._browserEncrypted.destroy(error);
+          });
+          session.once('stream', (stream: http2.ServerHttp2Stream) => {
+            const cleanup = (error?: Error) => {
+              session.close();
+              this._browserEncrypted.destroy(error);
+            };
+            stream.once('end', cleanup);
+            stream.once('error', cleanup);
+            stream.respond({
+              [http2.constants.HTTP2_HEADER_CONTENT_TYPE]: 'text/html',
+              [http2.constants.HTTP2_HEADER_STATUS]: 503,
+            });
+            stream.end(responseBody);
+          });
+        } else {
+          this._browserEncrypted.destroy(error);
+        }
+      } else {
+        browserDecrypted.end([
+          'HTTP/1.1 503 Internal Server Error',
+          'Content-Type: text/html; charset=utf-8',
+          'Content-Length: ' + Buffer.byteLength(responseBody),
+          '',
+          responseBody,
+        ].join('\r\n'));
       }
     });
-    this.socksProxy.alpnCache.get(rewriteToLocalhostIfNeeded(this.host), this.port, alpnProtocolChosenByServer => {
-      debugLogger.log('client-certificates', `Proxy->Target ${this.host}:${this.port} chooses ALPN ${alpnProtocolChosenByServer}`);
+  }
+
+  private async _upgradeToTLSIfNeeded(socket: stream.Duplex, alpnProtocol: string | false | null): Promise<tls.TLSSocket> {
+    // TLS errors can happen after secureConnect event from the server. In this case the socket is already upgraded to TLS.
+    this._brorwserDecrypted ??= new Promise<tls.TLSSocket>((resolve, reject) => {
       const dummyServer = tls.createServer({
         ...dummyServerTlsOptions,
-        ALPNProtocols: alpnProtocolChosenByServer === 'h2' ? ['h2', 'http/1.1'] : ['http/1.1'],
+        ALPNProtocols: [alpnProtocol || 'http/1.1'],
       });
-      this.internal?.on('close', () => dummyServer.close());
-      dummyServer.emit('connection', this.internal);
-      dummyServer.on('secureConnection', internalTLS => {
-        debugLogger.log('client-certificates', `Browser->Proxy ${this.host}:${this.port} chooses ALPN ${internalTLS.alpnProtocol}`);
-        const tlsOptions: tls.ConnectionOptions = {
-          socket: this.target,
-          host: this.host,
-          port: this.port,
-          rejectUnauthorized: !this.socksProxy.ignoreHTTPSErrors,
-          ALPNProtocols: [internalTLS.alpnProtocol || 'http/1.1'],
-          ...clientCertificatesToTLSOptions(this.socksProxy.clientCertificates, `https://${this.host}:${this.port}`),
-        };
-        if (!net.isIP(this.host))
-          tlsOptions.servername = this.host;
-        if (process.env.PWTEST_UNSUPPORTED_CUSTOM_CA && isUnderTest())
-          tlsOptions.ca = [fs.readFileSync(process.env.PWTEST_UNSUPPORTED_CUSTOM_CA)];
-        const targetTLS = tls.connect(tlsOptions);
-
-        targetTLS.on('secureConnect', () => {
-          internalTLS.pipe(targetTLS);
-          targetTLS.pipe(internalTLS);
-        });
-
-        // Handle close and errors
-        const closeBothSockets = () => {
-          internalTLS.end();
-          targetTLS.end();
-        };
-
-        internalTLS.on('end', () => closeBothSockets());
-        targetTLS.on('end', () => closeBothSockets());
-
-        internalTLS.on('error', () => closeBothSockets());
-        targetTLS.on('error', error => {
-          debugLogger.log('client-certificates', `error when connecting to target: ${error.message}`);
-          const responseBody = 'Playwright client-certificate error: ' + error.message;
-          if (internalTLS?.alpnProtocol === 'h2') {
-            // This method is available only in Node.js 20+
-            if ('performServerHandshake' in http2) {
-              // In case of an 'error' event on the target connection, we still need to perform the http2 handshake on the browser side.
-              // This is an async operation, so we need to intercept the close event to prevent the socket from being closed too early.
-              this.target.removeListener('close', this._targetCloseEventListener);
-              // @ts-expect-error
-              const session: http2.ServerHttp2Session = http2.performServerHandshake(internalTLS);
-              session.on('stream', (stream: http2.ServerHttp2Stream) => {
-                stream.respond({
-                  'content-type': 'text/html',
-                  [http2.constants.HTTP2_HEADER_STATUS]: 503,
-                });
-                stream.end(responseBody, () => {
-                  session.close();
-                  closeBothSockets();
-                });
-                stream.on('error', () => closeBothSockets());
-              });
-            } else {
-              closeBothSockets();
-            }
-          } else {
-            internalTLS.end([
-              'HTTP/1.1 503 Internal Server Error',
-              'Content-Type: text/html; charset=utf-8',
-              'Content-Length: ' + Buffer.byteLength(responseBody),
-              '\r\n',
-              responseBody,
-            ].join('\r\n'));
-            closeBothSockets();
-          }
-        });
+      dummyServer.emit('connection', socket);
+      dummyServer.once('secureConnection', tlsSocket => {
+        dummyServer.close();
+        resolve(tlsSocket);
+      });
+      dummyServer.once('error', error => {
+        dummyServer.close();
+        reject(error);
       });
     });
+    return this._brorwserDecrypted;
   }
 }
 
@@ -216,15 +277,16 @@ export class ClientCertificatesProxy {
   _socksProxy: SocksProxy;
   private _connections: Map<string, SocksProxyConnection> = new Map();
   ignoreHTTPSErrors: boolean | undefined;
-  clientCertificates: channels.BrowserNewContextOptions['clientCertificates'];
-  alpnCache: ALPNCache;
+  secureContextMap: Map<string, tls.SecureContext> = new Map();
+  private _proxy: types.ProxySettings | undefined;
 
-  constructor(
-    contextOptions: Pick<channels.BrowserNewContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors'>
+  private constructor(
+    contextOptions: Pick<types.BrowserContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors' | 'proxy'>
   ) {
-    this.alpnCache = new ALPNCache();
+    verifyClientCertificates(contextOptions.clientCertificates);
     this.ignoreHTTPSErrors = contextOptions.ignoreHTTPSErrors;
-    this.clientCertificates = contextOptions.clientCertificates;
+    this._proxy = contextOptions.proxy;
+    this._initSecureContexts(contextOptions.clientCertificates);
     this._socksProxy = new SocksProxy();
     this._socksProxy.setPattern('*');
     this._socksProxy.addListener(SocksProxy.Events.SocksRequested, async (payload: SocksSocketRequestedPayload) => {
@@ -233,10 +295,11 @@ export class ClientCertificatesProxy {
         await connection.connect();
         this._connections.set(payload.uid, connection);
       } catch (error) {
+        debugLogger.log('client-certificates', `Failed to connect to ${payload.host}:${payload.port}: ${error.message}`);
         this._socksProxy.socketFailed({ uid: payload.uid, errorCode: error.code });
       }
     });
-    this._socksProxy.addListener(SocksProxy.Events.SocksData, async (payload: SocksSocketDataPayload) => {
+    this._socksProxy.addListener(SocksProxy.Events.SocksData, (payload: SocksSocketDataPayload) => {
       this._connections.get(payload.uid)?.onData(payload.data);
     });
     this._socksProxy.addListener(SocksProxy.Events.SocksClosed, (payload: SocksSocketClosedPayload) => {
@@ -246,9 +309,49 @@ export class ClientCertificatesProxy {
     loadDummyServerCertsIfNeeded();
   }
 
-  public async listen(): Promise<string> {
-    const port = await this._socksProxy.listen(0, '127.0.0.1');
-    return `socks5://127.0.0.1:${port}`;
+  getProxyAgent(host: string, port: number) {
+    const proxyFromOptions = createProxyAgent(this._proxy);
+    if (proxyFromOptions)
+      return proxyFromOptions;
+    const proxyFromEnv = getProxyForUrl(`https://${host}:${port}`);
+    if (proxyFromEnv)
+      return createProxyAgent({ server: proxyFromEnv });
+  }
+
+  _initSecureContexts(clientCertificates: types.BrowserContextOptions['clientCertificates']) {
+    // Step 1. Group certificates by origin.
+    const origin2certs = new Map<string, types.BrowserContextOptions['clientCertificates']>();
+    for (const cert of clientCertificates || []) {
+      const origin = normalizeOrigin(cert.origin);
+      const certs = origin2certs.get(origin) || [];
+      certs.push(cert);
+      origin2certs.set(origin, certs);
+    }
+
+    // Step 2. Create secure contexts for each origin.
+    for (const [origin, certs] of origin2certs) {
+      try {
+        this.secureContextMap.set(origin, tls.createSecureContext(convertClientCertificatesToTLSOptions(certs)));
+      } catch (error) {
+        error = rewriteOpenSSLErrorIfNeeded(error);
+        throw rewriteErrorMessage(error, `Failed to load client certificate: ${error.message}`);
+      }
+    }
+  }
+
+  public static async create(progress: Progress, contextOptions: Pick<types.BrowserContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors' | 'proxy'>) {
+    const proxy = new ClientCertificatesProxy(contextOptions);
+    try {
+      await progress.race(proxy._socksProxy.listen(0, '127.0.0.1'));
+      return proxy;
+    } catch (error) {
+      await proxy.close();
+      throw error;
+    }
+  }
+
+  public proxySettings(): types.ProxySettings {
+    return { server: `socks5://127.0.0.1:${this._socksProxy.port()}` };
   }
 
   public async close() {
@@ -256,25 +359,25 @@ export class ClientCertificatesProxy {
   }
 }
 
-export function clientCertificatesToTLSOptions(
-  clientCertificates: channels.BrowserNewContextOptions['clientCertificates'],
-  origin: string
+function normalizeOrigin(origin: string): string {
+  try {
+    return new URL(origin).origin;
+  } catch (error) {
+    return origin;
+  }
+}
+
+function convertClientCertificatesToTLSOptions(
+  clientCertificates: types.BrowserContextOptions['clientCertificates']
 ): Pick<https.RequestOptions, 'pfx' | 'key' | 'cert'> | undefined {
-  const matchingCerts = clientCertificates?.filter(c => {
-    try {
-      return new URL(c.origin).origin === origin;
-    } catch (error) {
-      return c.origin === origin;
-    }
-  });
-  if (!matchingCerts || !matchingCerts.length)
+  if (!clientCertificates || !clientCertificates.length)
     return;
   const tlsOptions = {
     pfx: [] as { buf: Buffer, passphrase?: string }[],
     key: [] as { pem: Buffer, passphrase?: string }[],
     cert: [] as Buffer[],
   };
-  for (const cert of matchingCerts) {
+  for (const cert of clientCertificates) {
     if (cert.cert)
       tlsOptions.cert.push(cert.cert);
     if (cert.key)
@@ -285,6 +388,148 @@ export function clientCertificatesToTLSOptions(
   return tlsOptions;
 }
 
+export function getMatchingTLSOptionsForOrigin(
+  clientCertificates: types.BrowserContextOptions['clientCertificates'],
+  origin: string
+): Pick<https.RequestOptions, 'pfx' | 'key' | 'cert'> | undefined {
+  const matchingCerts = clientCertificates?.filter(c =>
+    normalizeOrigin(c.origin) === origin
+  );
+  return convertClientCertificatesToTLSOptions(matchingCerts);
+}
+
 function rewriteToLocalhostIfNeeded(host: string): string {
   return host === 'local.playwright' ? 'localhost' : host;
 }
+
+export function rewriteOpenSSLErrorIfNeeded(error: Error): Error {
+  if (error.message !== 'unsupported' && (error as NodeJS.ErrnoException).code !== 'ERR_CRYPTO_UNSUPPORTED_OPERATION')
+    return error;
+  return rewriteErrorMessage(error, [
+    'Unsupported TLS certificate.',
+    'Most likely, the security algorithm of the given certificate was deprecated by OpenSSL.',
+    'For more details, see https://github.com/openssl/openssl/blob/master/README-PROVIDERS.md#the-legacy-provider',
+    'You could probably modernize the certificate by following the steps at https://github.com/nodejs/node/issues/40672#issuecomment-1243648223',
+  ].join('\n'));
+}
+
+
+/**
+ * Parses the ALPN (Application-Layer Protocol Negotiation) extension from a TLS ClientHello.
+ * Based on RFC 8446 (TLS 1.3): https://datatracker.ietf.org/doc/html/rfc8446
+ */
+function parseALPNFromClientHello(buffer: Buffer): string[] | null {
+  if (buffer.length < 6)
+    return null;
+
+  // --- TLS Record Header (RFC 8446 §5.1) ---
+  // https://datatracker.ietf.org/doc/html/rfc8446#section-5.1
+  // TLSPlaintext.type (1 byte): 0x16 = TLS handshake
+  if (buffer[0] !== 0x16)
+    return null;
+
+  let offset = 5; // TLS record header is 5 bytes
+
+  // --- Handshake Header (RFC 8446 §4.1) ---
+  // HandshakeType (1 byte): 0x01 = ClientHello
+  // https://datatracker.ietf.org/doc/html/rfc8446#section-4
+  if (buffer[offset] !== 0x01)
+    return null;
+
+  offset += 4; // Handshake header: type (1) + length (3)
+
+  // --- ClientHello (RFC 8446 §4.1.2) ---
+  // https://datatracker.ietf.org/doc/html/rfc8446#section-4.1.2
+
+  // legacy_version (2 bytes) — always 0x0303 (TLS 1.2 for compatibility)
+  offset += 2;
+  // random (32 bytes)
+  offset += 32;
+
+  // legacy_session_id<0..32> (preceded by 1-byte length)
+  if (offset >= buffer.length)
+    return null;
+  const sessionIdLength = buffer[offset];
+  offset += 1 + sessionIdLength;
+
+  // cipher_suites<2..2^16-2> (preceded by 2-byte length)
+  if (offset + 2 > buffer.length)
+    return null;
+  const cipherSuitesLength = buffer.readUInt16BE(offset);
+  offset += 2 + cipherSuitesLength;
+
+  // legacy_compression_methods<1..2^8-1> (preceded by 1-byte length)
+  if (offset >= buffer.length)
+    return null;
+  const compressionMethodsLength = buffer[offset];
+  offset += 1 + compressionMethodsLength;
+
+  // extensions<8..2^16-1> (preceded by 2-byte length)
+  if (offset + 2 > buffer.length)
+    return null;
+  const extensionsLength = buffer.readUInt16BE(offset);
+  offset += 2;
+
+  const extensionsEnd = offset + extensionsLength;
+  if (extensionsEnd > buffer.length)
+    return null;
+
+  // --- Extensions (RFC 8446 §4.2) ---
+  // https://datatracker.ietf.org/doc/html/rfc8446#section-4.2
+  // Each extension is structured as:
+  // - extension_type (2 bytes)
+  // - extension_data length (2 bytes)
+  // - extension_data (variable)
+  while (offset + 4 <= extensionsEnd) {
+    const extensionType = buffer.readUInt16BE(offset);
+    offset += 2;
+    const extensionLength = buffer.readUInt16BE(offset);
+    offset += 2;
+
+    if (offset + extensionLength > extensionsEnd)
+      return null;
+
+    // ALPN extension (RFC 8446 §4.2.11): extension_type = 16
+    // https://datatracker.ietf.org/doc/html/rfc8446#section-4.2
+    if (extensionType === 16)
+      return parseALPNExtension(buffer.subarray(offset, offset + extensionLength));
+
+    offset += extensionLength;
+  }
+
+  return null; // No ALPN extension found
+}
+
+/**
+ * Parses the ALPN extension data from a ClientHello extension block.
+ *
+ * The ALPN structure is defined in:
+ * - RFC 7301 §3.1: https://datatracker.ietf.org/doc/html/rfc7301#section-3.1
+ */
+function parseALPNExtension(buffer: Buffer): string[] | null {
+  if (buffer.length < 2)
+    return null;
+
+  // protocol_name_list<2..2^16-1> (preceded by 2-byte length)
+  const listLength = buffer.readUInt16BE(0);
+  if (listLength !== buffer.length - 2)
+    return null;
+
+  const protocols: string[] = [];
+  let offset = 2;
+
+  while (offset < buffer.length) {
+    // ProtocolName<1..2^8-1> (preceded by 1-byte length)
+    const protocolLength = buffer[offset];
+    offset += 1;
+
+    if (offset + protocolLength > buffer.length)
+      break;
+
+    const protocol = buffer.subarray(offset, offset + protocolLength).toString('utf8');
+    protocols.push(protocol);
+    offset += protocolLength;
+  }
+
+  return protocols.length > 0 ? protocols : null;
+}
diff --git a/packages/playwright-core/src/server/socksInterceptor.ts b/packages/playwright-core/src/server/socksInterceptor.ts
index 498e8bfe7382c..c29981204fa10 100644
--- a/packages/playwright-core/src/server/socksInterceptor.ts
+++ b/packages/playwright-core/src/server/socksInterceptor.ts
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-import * as socks from '../common/socksProxy';
 import EventEmitter from 'events';
-import type * as channels from '@protocol/channels';
+
+import * as socks from './utils/socksProxy';
+import { ValidationError, findValidator } from '../protocol/validator';
+import { isUnderTest } from './utils/debug';
+
 import type { WebSocketTransport } from './transport';
-import { findValidator, ValidationError } from '../protocol/validator';
 import type { ValidatorContext } from '../protocol/validator';
+import type * as channels from '@protocol/channels';
 
 export class SocksInterceptor {
   private _handler: socks.SocksProxyHandler;
@@ -40,7 +43,7 @@ export class SocksInterceptor {
             const id = --lastId;
             this._ids.add(id);
             const validator = findValidator('SocksSupport', prop, 'Params');
-            params = validator(params, '', { tChannelImpl: tChannelForSocks, binary: 'toBase64' });
+            params = validator(params, '', { tChannelImpl: tChannelForSocks, binary: 'toBase64', isUnderTest });
             transport.send({ id, guid: this._socksSupportObjectGuid, method: prop, params, metadata: { stack: [], apiName: '', internal: true } } as any);
           } catch (e) {
           }
@@ -72,7 +75,7 @@ export class SocksInterceptor {
     }
     if (this._socksSupportObjectGuid && message.guid === this._socksSupportObjectGuid) {
       const validator = findValidator('SocksSupport', message.method, 'Event');
-      const params = validator(message.params, '', { tChannelImpl: tChannelForSocks, binary: 'fromBase64' });
+      const params = validator(message.params, '', { tChannelImpl: tChannelForSocks, binary: 'fromBase64', isUnderTest });
       this._channel.emit(message.method, params);
       return true;
     }
@@ -83,4 +86,3 @@ export class SocksInterceptor {
 function tChannelForSocks(names: '*' | string[], arg: any, path: string, context: ValidatorContext) {
   throw new ValidationError(`${path}: channels are not expected in SocksSupport`);
 }
-
diff --git a/packages/playwright-core/src/server/trace/recorder/DEPS.list b/packages/playwright-core/src/server/trace/recorder/DEPS.list
index 201a4b001d0ee..195bdb5eb866b 100644
--- a/packages/playwright-core/src/server/trace/recorder/DEPS.list
+++ b/packages/playwright-core/src/server/trace/recorder/DEPS.list
@@ -1,10 +1,10 @@
 [*]
 ../../
 ../../har/
-../../../common/
 ../../../protocol/
-../../../utils/
 ../../../utilsBundle.ts
+../../../utils/isomorphic/
 ../../../zipBundle.ts
 ../../dispatchers/dispatcher.ts
-../common/
\ No newline at end of file
+../../utils
+../common/
diff --git a/packages/playwright-core/src/server/trace/recorder/snapshotter.ts b/packages/playwright-core/src/server/trace/recorder/snapshotter.ts
index 48bfea7302113..5d0139df0718a 100644
--- a/packages/playwright-core/src/server/trace/recorder/snapshotter.ts
+++ b/packages/playwright-core/src/server/trace/recorder/snapshotter.ts
@@ -14,18 +14,20 @@
  * limitations under the License.
  */
 
+import { frameSnapshotStreamer } from './snapshotterInjected';
+import { monotonicTime } from '../../../utils/isomorphic/time';
+import { calculateSha1, createGuid } from '../../utils/crypto';
+import { debugLogger } from '../../utils/debugLogger';
+import { eventsHelper } from '../../utils/eventsHelper';
+import { mime } from '../../../utilsBundle';
 import { BrowserContext } from '../../browserContext';
 import { Page } from '../../page';
-import type { RegisteredListener } from '../../../utils/eventsHelper';
-import { eventsHelper } from '../../../utils/eventsHelper';
-import { debugLogger } from '../../../utils/debugLogger';
-import type { Frame } from '../../frames';
+
 import type { SnapshotData } from './snapshotterInjected';
-import { frameSnapshotStreamer } from './snapshotterInjected';
-import { calculateSha1, createGuid, monotonicTime } from '../../../utils';
+import type { RegisteredListener } from '../../utils/eventsHelper';
+import type { Frame } from '../../frames';
+import type { InitScript } from '../../page';
 import type { FrameSnapshot } from '@trace/snapshot';
-import type { ElementHandle } from '../../dom';
-import { mime } from '../../../utilsBundle';
 
 export type SnapshotterBlob = {
   buffer: Buffer,
@@ -42,7 +44,7 @@ export class Snapshotter {
   private _delegate: SnapshotterDelegate;
   private _eventListeners: RegisteredListener[] = [];
   private _snapshotStreamer: string;
-  private _initialized = false;
+  private _initScript: InitScript | undefined;
   private _started = false;
 
   constructor(context: BrowserContext, delegate: SnapshotterDelegate) {
@@ -58,25 +60,27 @@ export class Snapshotter {
 
   async start() {
     this._started = true;
-    if (!this._initialized) {
-      this._initialized = true;
+    if (!this._initScript)
       await this._initialize();
-    }
     await this.reset();
   }
 
   async reset() {
     if (this._started)
-      await this._runInAllFrames(`window["${this._snapshotStreamer}"].reset()`);
+      await this._context.safeNonStallingEvaluateInAllFrames(`window["${this._snapshotStreamer}"].reset()`, 'main');
   }
 
-  async stop() {
+  stop() {
     this._started = false;
   }
 
-  resetForReuse() {
+  async resetForReuse() {
     // Next time we start recording, we will call addInitScript again.
-    this._initialized = false;
+    if (this._initScript) {
+      eventsHelper.removeEventListeners(this._eventListeners);
+      await this._context.removeInitScripts([this._initScript]);
+      this._initScript = undefined;
+    }
   }
 
   async _initialize() {
@@ -87,39 +91,19 @@ export class Snapshotter {
     ];
 
     const { javaScriptEnabled } = this._context._options;
-    const initScript = `(${frameSnapshotStreamer})("${this._snapshotStreamer}", ${javaScriptEnabled || javaScriptEnabled === undefined})`;
-    await this._context.addInitScript(initScript);
-    await this._runInAllFrames(initScript);
-  }
-
-  private async _runInAllFrames(expression: string) {
-    const frames = [];
-    for (const page of this._context.pages())
-      frames.push(...page.frames());
-    await Promise.all(frames.map(frame => {
-      return frame.nonStallingRawEvaluateInExistingMainContext(expression).catch(e => debugLogger.log('error', e));
-    }));
+    const initScriptSource = `(${frameSnapshotStreamer})("${this._snapshotStreamer}", ${javaScriptEnabled || javaScriptEnabled === undefined})`;
+    this._initScript = await this._context.addInitScript(undefined, initScriptSource);
+    await this._context.safeNonStallingEvaluateInAllFrames(initScriptSource, 'main');
   }
 
   dispose() {
     eventsHelper.removeEventListeners(this._eventListeners);
   }
 
-  async captureSnapshot(page: Page, callId: string, snapshotName: string, element?: ElementHandle): Promise<void> {
+  async captureSnapshot(page: Page, callId: string, snapshotName: string): Promise<void> {
     // Prepare expression synchronously.
     const expression = `window["${this._snapshotStreamer}"].captureSnapshot(${JSON.stringify(snapshotName)})`;
 
-    // In a best-effort manner, without waiting for it, mark target element.
-    element?.callFunctionNoReply((element: Element, callId: string) => {
-      const customEvent = new CustomEvent('__playwright_target__', {
-        bubbles: true,
-        cancelable: true,
-        detail: callId,
-        composed: true,
-      });
-      element.dispatchEvent(customEvent);
-    }, callId);
-
     // In each frame, in a non-stalling manner, capture the snapshots.
     const snapshots = page.frames().map(async frame => {
       const data = await frame.nonStallingRawEvaluateInExistingMainContext(expression).catch(e => debugLogger.log('error', e)) as SnapshotData;
@@ -137,6 +121,7 @@ export class Snapshotter {
         html: data.html,
         viewport: data.viewport,
         timestamp: monotonicTime(),
+        wallTime: data.wallTime,
         collectionTime: data.collectionTime,
         resourceOverrides: [],
         isMainFrame: page.mainFrame() === frame
diff --git a/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts b/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts
index 14e34c8aee0c3..953868585ba70 100644
--- a/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts
+++ b/packages/playwright-core/src/server/trace/recorder/snapshotterInjected.ts
@@ -27,7 +27,7 @@ export type SnapshotData = {
   }[],
   viewport: { width: number, height: number },
   url: string,
-  timestamp: number,
+  wallTime: number,
   collectionTime: number,
 };
 
@@ -47,6 +47,9 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:
   const kTargetAttribute = '__playwright_target__';
   const kCustomElementsAttribute = '__playwright_custom_elements__';
   const kCurrentSrcAttribute = '__playwright_current_src__';
+  const kBoundingRectAttribute = '__playwright_bounding_rect__';
+  const kPopoverOpenAttribute = '__playwright_popover_open_';
+  const kDialogOpenAttribute = '__playwright_dialog_open_';
 
   // Symbols for our own info on Nodes/StyleSheets.
   const kSnapshotFrameId = Symbol('__playwright_snapshot_frameid_');
@@ -139,12 +142,19 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:
     }
 
     private _refreshListeners() {
-      (document as any).addEventListener('__playwright_target__', (event: CustomEvent) => {
+      (document as any).addEventListener('__playwright_mark_target__', (event: CustomEvent) => {
         if (!event.detail)
           return;
         const callId = event.detail as string;
         (event.composedPath()[0] as any).__playwright_target__ = callId;
       });
+      (document as any).addEventListener('__playwright_unmark_target__', (event: CustomEvent) => {
+        if (!event.detail)
+          return;
+        const callId = event.detail as string;
+        if ((event.composedPath()[0] as any).__playwright_target__ === callId)
+          delete (event.composedPath()[0] as any).__playwright_target__;
+      });
     }
 
     private _interceptNativeMethod(obj: any, method: string, cb: (thisObj: any, result: any) => void) {
@@ -429,6 +439,30 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:
             expectValue(value);
             attrs[kSelectedAttribute] = value;
           }
+          if (nodeName === 'CANVAS' || nodeName === 'IFRAME' || nodeName === 'FRAME') {
+            const boundingRect = (element as HTMLElement).getBoundingClientRect();
+            const value = JSON.stringify({
+              left: boundingRect.left,
+              top: boundingRect.top,
+              right: boundingRect.right,
+              bottom: boundingRect.bottom
+            });
+            expectValue(kBoundingRectAttribute);
+            expectValue(value);
+            attrs[kBoundingRectAttribute] = value;
+          }
+          if ((element as HTMLElement).popover && (element as HTMLElement).matches && (element as HTMLElement).matches(':popover-open')) {
+            const value = 'true';
+            expectValue(kPopoverOpenAttribute);
+            expectValue(value);
+            attrs[kPopoverOpenAttribute] = value;
+          }
+          if (nodeName === 'DIALOG' && (element as HTMLDialogElement).open) {
+            const value = (element as HTMLDialogElement).matches(':modal') ? 'modal' : 'true';
+            expectValue(kDialogOpenAttribute);
+            expectValue(value);
+            attrs[kDialogOpenAttribute] = value;
+          }
           if (element.scrollTop) {
             expectValue(kScrollTopAttribute);
             expectValue(element.scrollTop);
@@ -515,6 +549,8 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:
               continue;
             if (nodeName === 'FRAME' && name === 'src')
               continue;
+            if (nodeName === 'DIALOG' && name === 'open')
+              continue;
             let value = element.attributes[i].value;
             if (nodeName === 'META')
               value = this.__sanitizeMetaAttribute(name, value, (node as HTMLMetaElement).httpEquiv);
@@ -572,7 +608,7 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:
           height: window.innerHeight,
         },
         url: location.href,
-        timestamp,
+        wallTime: Date.now(),
         collectionTime: 0,
       };
 
@@ -589,7 +625,7 @@ export function frameSnapshotStreamer(snapshotStreamer: string, removeNoScript:
         result.resourceOverrides.push({ url, content, contentType: 'text/css' },);
       }
 
-      result.collectionTime = performance.now() - result.timestamp;
+      result.collectionTime = performance.now() - timestamp;
       return result;
     }
   }
diff --git a/packages/playwright-core/src/server/trace/recorder/tracing.ts b/packages/playwright-core/src/server/trace/recorder/tracing.ts
index 1dec4f536a9bc..5e8e7e6226702 100644
--- a/packages/playwright-core/src/server/trace/recorder/tracing.ts
+++ b/packages/playwright-core/src/server/trace/recorder/tracing.ts
@@ -17,29 +17,39 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import type { NameValue } from '../../../common/types';
-import type { TracingTracingStopChunkParams } from '@protocol/channels';
-import { commandsWithTracingSnapshots } from '../../../protocol/debug';
-import { assert, createGuid, monotonicTime, SerializedFS, removeFolders, eventsHelper, type RegisteredListener } from '../../../utils';
+
+import { Snapshotter } from './snapshotter';
+import { methodMetainfo } from '../../../utils/isomorphic/protocolMetainfo';
+import { assert } from '../../../utils/isomorphic/assert';
+import { monotonicTime } from '../../../utils/isomorphic/time';
+import { eventsHelper  } from '../../utils/eventsHelper';
+import { createGuid  } from '../../utils/crypto';
 import { Artifact } from '../../artifact';
 import { BrowserContext } from '../../browserContext';
-import type { ElementHandle } from '../../dom';
-import type { APIRequestContext } from '../../fetch';
-import type { CallMetadata, InstrumentationListener } from '../../instrumentation';
+import { Dispatcher } from '../../dispatchers/dispatcher';
+import { serializeError } from '../../errors';
+import { SerializedFS, removeFolders  } from '../../utils/fileUtils';
+import { HarTracer } from '../../har/harTracer';
 import { SdkObject } from '../../instrumentation';
 import { Page } from '../../page';
-import type * as har from '@trace/har';
+import { isAbortError } from '../../progress';
+
+import type { SnapshotterBlob, SnapshotterDelegate } from './snapshotter';
+import type { NameValue } from '../../../utils/isomorphic/types';
+import type { RegisteredListener } from '../../../utils';
+import type { ConsoleMessage } from '../../console';
+import type { Dialog } from '../../dialog';
+import type { Download } from '../../download';
+import type { APIRequestContext } from '../../fetch';
 import type { HarTracerDelegate } from '../../har/harTracer';
-import { HarTracer } from '../../har/harTracer';
+import type { CallMetadata, InstrumentationListener } from '../../instrumentation';
+import type { StackFrame, TracingTracingStopChunkParams } from '@protocol/channels';
+import type * as har from '@trace/har';
 import type { FrameSnapshot } from '@trace/snapshot';
 import type * as trace from '@trace/trace';
-import type { SnapshotterBlob, SnapshotterDelegate } from './snapshotter';
-import { Snapshotter } from './snapshotter';
-import type { ConsoleMessage } from '../../console';
-import { Dispatcher } from '../../dispatchers/dispatcher';
-import { serializeError } from '../../errors';
+import type { Progress } from '@protocol/progress';
 
-const version: trace.VERSION = 7;
+const version: trace.VERSION = 8;
 
 export type TracerOptions = {
   name?: string;
@@ -60,6 +70,7 @@ type RecordingState = {
   traceSha1s: Set<string>,
   recording: boolean;
   callIds: Set<string>;
+  groupStack: string[];
 };
 
 const kScreencastOptions = { width: 800, height: 600, quality: 90 };
@@ -100,8 +111,9 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       platform: process.platform,
       wallTime: 0,
       monotonicTime: 0,
-      sdkLanguage: context.attribution.playwright.options.sdkLanguage,
-      testIdAttributeName
+      sdkLanguage: this._sdkLanguage(),
+      testIdAttributeName,
+      contextId: context.guid,
     };
     if (context instanceof BrowserContext) {
       this._snapshotter = new Snapshotter(context, this);
@@ -112,21 +124,26 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     }
   }
 
-  async resetForReuse() {
+  private _sdkLanguage() {
+    return this._context instanceof BrowserContext ? this._context._browser.sdkLanguage() : this._context.attribution.playwright.options.sdkLanguage;
+  }
+
+  async resetForReuse(progress: Progress) {
     // Discard previous chunk if any and ignore any errors there.
-    await this.stopChunk({ mode: 'discard' }).catch(() => {});
-    await this.stop();
-    this._snapshotter?.resetForReuse();
+    await this.stopChunk(progress, { mode: 'discard' }).catch(() => {});
+    await this.stop(progress);
+    if (this._snapshotter)
+      await progress.race(this._snapshotter.resetForReuse());
   }
 
-  async start(options: TracerOptions) {
+  start(options: TracerOptions) {
     if (this._isStopping)
       throw new Error('Cannot start tracing while stopping');
     if (this._state)
       throw new Error('Tracing has been already started');
 
     // Re-write for testing.
-    this._contextCreatedEvent.sdkLanguage = this._context.attribution.playwright.options.sdkLanguage;
+    this._contextCreatedEvent.sdkLanguage = this._sdkLanguage();
 
     // TODO: passing the same name for two contexts makes them write into a single file
     // and conflict.
@@ -147,6 +164,7 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       networkSha1s: new Set(),
       recording: false,
       callIds: new Set(),
+      groupStack: [],
     };
     this._fs.mkdir(this._state.resourcesDir);
     this._fs.writeFile(this._state.networkFile, '');
@@ -155,9 +173,9 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       this._harTracer.start({ omitScripts: !options.live });
   }
 
-  async startChunk(options: { name?: string, title?: string } = {}): Promise<{ traceName: string }> {
+  async startChunk(progress: Progress, options: { name?: string, title?: string } = {}): Promise<{ traceName: string }> {
     if (this._state && this._state.recording)
-      await this.stopChunk({ mode: 'discard' });
+      await this.stopChunk(progress, { mode: 'discard' });
 
     if (!this._state)
       throw new Error('Must start tracing before starting a new chunk');
@@ -167,10 +185,16 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     this._state.recording = true;
     this._state.callIds.clear();
 
+    // - Browser context network trace is shared across chunks as it contains resources
+    // used to serve page snapshots, so make a copy with the new name.
+    // - APIRequestContext network traces are chunk-specific, always start from scratch.
+    const preserveNetworkResources = this._context instanceof BrowserContext;
     if (options.name && options.name !== this._state.traceName)
-      this._changeTraceName(this._state, options.name);
+      this._changeTraceName(this._state, options.name, preserveNetworkResources);
     else
       this._allocateNewTraceFile(this._state);
+    if (!preserveNetworkResources)
+      this._fs.writeFile(this._state.networkFile, '');
 
     this._fs.mkdir(path.dirname(this._state.traceFile));
     const event: trace.TraceEvent = {
@@ -179,7 +203,7 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       wallTime: Date.now(),
       monotonicTime: monotonicTime()
     };
-    this._fs.appendFile(this._state.traceFile, JSON.stringify(event) + '\n');
+    this._appendTraceEvent(event);
 
     this._context.instrumentation.addListener(this, this._context);
     this._eventListeners.push(
@@ -193,6 +217,53 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     return { traceName: this._state.traceName };
   }
 
+  private _currentGroupId(): string | undefined {
+    return this._state?.groupStack.length ? this._state.groupStack[this._state.groupStack.length - 1] : undefined;
+  }
+
+  group(name: string, location: { file: string, line?: number, column?: number } | undefined, metadata: CallMetadata) {
+    if (!this._state)
+      return;
+    const stackFrames: StackFrame[] = [];
+    const { file, line, column } = location ?? metadata.location ?? {};
+    if (file) {
+      stackFrames.push({
+        file,
+        line: line ?? 0,
+        column: column ?? 0,
+      });
+    }
+    const event: trace.BeforeActionTraceEvent = {
+      type: 'before',
+      callId: metadata.id,
+      startTime: metadata.startTime,
+      title: name,
+      class: 'Tracing',
+      method: 'tracingGroup',
+      params: { },
+      stepId: metadata.stepId,
+      stack: stackFrames,
+    };
+    if (this._currentGroupId())
+      event.parentId = this._currentGroupId();
+    this._state.groupStack.push(event.callId);
+    this._appendTraceEvent(event);
+  }
+
+  groupEnd() {
+    if (!this._state)
+      return;
+    const callId = this._state.groupStack.pop();
+    if (!callId)
+      return;
+    const event: trace.AfterActionTraceEvent = {
+      type: 'after',
+      callId,
+      endTime: monotonicTime(),
+    };
+    this._appendTraceEvent(event);
+  }
+
   private _startScreencast() {
     if (!(this._context instanceof BrowserContext))
       return;
@@ -217,28 +288,31 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     state.traceFile = path.join(state.tracesDir, `${state.traceName}${suffix}.trace`);
   }
 
-  private _changeTraceName(state: RecordingState, name: string) {
+  private _changeTraceName(state: RecordingState, name: string, preserveNetworkResources: boolean) {
     state.traceName = name;
     state.chunkOrdinal = 0;  // Reset ordinal for the new name.
     this._allocateNewTraceFile(state);
 
-    // Network file survives across chunks, so make a copy with the new name.
     const newNetworkFile = path.join(state.tracesDir, name + '.network');
-    this._fs.copyFile(state.networkFile, newNetworkFile);
+    if (preserveNetworkResources)
+      this._fs.copyFile(state.networkFile, newNetworkFile);
     state.networkFile = newNetworkFile;
   }
 
-  async stop() {
+  async stop(progress: Progress | undefined) {
     if (!this._state)
       return;
     if (this._isStopping)
       throw new Error(`Tracing is already stopping`);
     if (this._state.recording)
       throw new Error(`Must stop trace file before stopping tracing`);
+    this._closeAllGroups();
     this._harTracer.stop();
     this.flushHarEntries();
-    await this._fs.syncAndGetError();
-    this._state = undefined;
+    const promise = progress ? progress.race(this._fs.syncAndGetError()) : this._fs.syncAndGetError();
+    await promise.finally(() => {
+      this._state = undefined;
+    });
   }
 
   async deleteTmpTracesDir() {
@@ -263,7 +337,12 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     await this._fs.syncAndGetError();
   }
 
-  async stopChunk(params: TracingTracingStopChunkParams): Promise<{ artifact?: Artifact, entries?: NameValue[] }> {
+  private _closeAllGroups() {
+    while (this._currentGroupId())
+      this.groupEnd();
+  }
+
+  async stopChunk(progress: Progress | undefined, params: TracingTracingStopChunkParams): Promise<{ artifact?: Artifact, entries?: NameValue[] }> {
     if (this._isStopping)
       throw new Error(`Tracing is already stopping`);
     this._isStopping = true;
@@ -275,13 +354,15 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       return {};
     }
 
+    this._closeAllGroups();
+
     this._context.instrumentation.removeListener(this);
     eventsHelper.removeEventListeners(this._eventListeners);
     if (this._state.options.screenshots)
       this._stopScreencast();
 
     if (this._state.options.snapshots)
-      await this._snapshotter?.stop();
+      this._snapshotter?.stop();
 
     this.flushHarEntries();
 
@@ -315,7 +396,8 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       this._fs.zip(entries, zipFileName);
 
     // Make sure all file operations complete.
-    const error = await this._fs.syncAndGetError();
+    const promise = progress ? progress.race(this._fs.syncAndGetError()) : this._fs.syncAndGetError();
+    const error = await promise.catch(e => e);
 
     this._isStopping = false;
     if (this._state)
@@ -326,7 +408,7 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     if (error) {
       // This check is here because closing the browser removes the tracesDir and tracing
       // cannot access removed files. Clients are ready for the missing artifact.
-      if (this._context instanceof BrowserContext && !this._context._browser.isConnected())
+      if (!isAbortError(error) && this._context instanceof BrowserContext && !this._context._browser.isConnected())
         return {};
       throw error;
     }
@@ -339,7 +421,7 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     return { artifact };
   }
 
-  async _captureSnapshot(snapshotName: string, sdkObject: SdkObject, metadata: CallMetadata, element?: ElementHandle): Promise<void> {
+  async _captureSnapshot(snapshotName: string, sdkObject: SdkObject, metadata: CallMetadata): Promise<void> {
     if (!this._snapshotter)
       return;
     if (!sdkObject.attribution.page)
@@ -348,12 +430,12 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
       return;
     if (!shouldCaptureSnapshot(metadata))
       return;
-    await this._snapshotter.captureSnapshot(sdkObject.attribution.page, metadata.id, snapshotName, element).catch(() => {});
+    await this._snapshotter.captureSnapshot(sdkObject.attribution.page, metadata.id, snapshotName).catch(() => {});
   }
 
   onBeforeCall(sdkObject: SdkObject, metadata: CallMetadata) {
     // IMPORTANT: no awaits before this._appendTraceEvent in this method.
-    const event = createBeforeActionTraceEvent(metadata);
+    const event = createBeforeActionTraceEvent(metadata, this._currentGroupId());
     if (!event)
       return Promise.resolve();
     sdkObject.attribution.page?.temporarilyDisableTracingScreencastThrottling();
@@ -363,7 +445,7 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     return this._captureSnapshot(event.beforeSnapshot, sdkObject, metadata);
   }
 
-  onBeforeInputAction(sdkObject: SdkObject, metadata: CallMetadata, element: ElementHandle) {
+  onBeforeInputAction(sdkObject: SdkObject, metadata: CallMetadata) {
     if (!this._state?.callIds.has(metadata.id))
       return Promise.resolve();
     // IMPORTANT: no awaits before this._appendTraceEvent in this method.
@@ -373,11 +455,13 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     sdkObject.attribution.page?.temporarilyDisableTracingScreencastThrottling();
     event.inputSnapshot = `input@${metadata.id}`;
     this._appendTraceEvent(event);
-    return this._captureSnapshot(event.inputSnapshot, sdkObject, metadata, element);
+    return this._captureSnapshot(event.inputSnapshot, sdkObject, metadata);
   }
 
   onCallLog(sdkObject: SdkObject, metadata: CallMetadata, logName: string, message: string) {
-    if (metadata.isServerSide || metadata.internal)
+    if (!this._state?.callIds.has(metadata.id))
+      return;
+    if (metadata.internal)
       return;
     if (logName !== 'api')
       return;
@@ -447,6 +531,50 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
     this._appendTraceEvent(event);
   }
 
+  onDialog(dialog: Dialog) {
+    const event: trace.EventTraceEvent = {
+      type: 'event',
+      time: monotonicTime(),
+      class: 'BrowserContext',
+      method: 'dialog',
+      params: { pageId: dialog.page().guid, type: dialog.type(), message: dialog.message(), defaultValue: dialog.defaultValue() },
+    };
+    this._appendTraceEvent(event);
+  }
+
+  onDownload(page: Page, download: Download) {
+    const event: trace.EventTraceEvent = {
+      type: 'event',
+      time: monotonicTime(),
+      class: 'BrowserContext',
+      method: 'download',
+      params: { pageId: page.guid, url: download.url, suggestedFilename: download.suggestedFilename() },
+    };
+    this._appendTraceEvent(event);
+  }
+
+  onPageOpen(page: Page) {
+    const event: trace.EventTraceEvent = {
+      type: 'event',
+      time: monotonicTime(),
+      class: 'BrowserContext',
+      method: 'page',
+      params: { pageId: page.guid, openerPageId: page.opener()?.guid },
+    };
+    this._appendTraceEvent(event);
+  }
+
+  onPageClose(page: Page) {
+    const event: trace.EventTraceEvent = {
+      type: 'event',
+      time: monotonicTime(),
+      class: 'BrowserContext',
+      method: 'pageClosed',
+      params: { pageId: page.guid },
+    };
+    this._appendTraceEvent(event);
+  }
+
   private _onPageError(error: Error, page: Page) {
     const event: trace.EventTraceEvent = {
       type: 'event',
@@ -472,7 +600,8 @@ export class Tracing extends SdkObject implements InstrumentationListener, Snaps
             sha1,
             width: params.width,
             height: params.height,
-            timestamp: monotonicTime()
+            timestamp: monotonicTime(),
+            frameSwapWallTime: params.frameSwapWallTime,
           };
           // Make sure to write the screencast frame before adding a reference to it.
           this._appendResource(sha1, params.buffer);
@@ -521,24 +650,28 @@ function visitTraceEvent(object: any, sha1s: Set<string>): any {
   return object;
 }
 
-export function shouldCaptureSnapshot(metadata: CallMetadata): boolean {
-  return commandsWithTracingSnapshots.has(metadata.type + '.' + metadata.method);
+function shouldCaptureSnapshot(metadata: CallMetadata): boolean {
+  const metainfo = methodMetainfo.get(metadata.type + '.' + metadata.method);
+  return !!metainfo?.snapshot;
 }
 
-function createBeforeActionTraceEvent(metadata: CallMetadata): trace.BeforeActionTraceEvent | null {
+function createBeforeActionTraceEvent(metadata: CallMetadata, parentId?: string): trace.BeforeActionTraceEvent | null {
   if (metadata.internal || metadata.method.startsWith('tracing'))
     return null;
-  return {
+  const event: trace.BeforeActionTraceEvent = {
     type: 'before',
     callId: metadata.id,
     startTime: metadata.startTime,
-    apiName: metadata.apiName || metadata.type + '.' + metadata.method,
+    title: metadata.title,
     class: metadata.type,
     method: metadata.method,
     params: metadata.params,
     stepId: metadata.stepId,
     pageId: metadata.pageId,
   };
+  if (parentId)
+    event.parentId = parentId;
+  return event;
 }
 
 function createInputActionTraceEvent(metadata: CallMetadata): trace.InputActionTraceEvent | null {
diff --git a/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts b/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts
index af079101591ec..36d4cf655eccf 100644
--- a/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts
+++ b/packages/playwright-core/src/server/trace/test/inMemorySnapshotter.ts
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
+import { SnapshotStorage } from '../../../../../trace-viewer/src/sw/snapshotStorage';
+import { ManualPromise } from '../../../utils';
+import { HarTracer } from '../../har/harTracer';
+import { Snapshotter } from '../recorder/snapshotter';
+
+import type { SnapshotRenderer } from '../../../../../trace-viewer/src/sw/snapshotRenderer';
 import type { BrowserContext } from '../../browserContext';
+import type { HarTracerDelegate } from '../../har/harTracer';
 import type { Page } from '../../page';
-import type { FrameSnapshot } from '@trace/snapshot';
-import type { SnapshotRenderer } from '../../../../../trace-viewer/src/snapshotRenderer';
-import { SnapshotStorage } from '../../../../../trace-viewer/src/snapshotStorage';
 import type { SnapshotterBlob, SnapshotterDelegate } from '../recorder/snapshotter';
-import { Snapshotter } from '../recorder/snapshotter';
-import type { ElementHandle } from '../../dom';
-import type { HarTracerDelegate } from '../../har/harTracer';
-import { HarTracer } from '../../har/harTracer';
 import type * as har from '@trace/har';
-import { ManualPromise } from '../../../utils';
+import type { FrameSnapshot } from '@trace/snapshot';
+
 
 export class InMemorySnapshotter implements SnapshotterDelegate, HarTracerDelegate {
   private _blobs = new Map<string, Buffer>();
@@ -59,11 +60,11 @@ export class InMemorySnapshotter implements SnapshotterDelegate, HarTracerDelega
     this._harTracer.stop();
   }
 
-  async captureSnapshot(page: Page, callId: string, snapshotName: string, element?: ElementHandle): Promise<SnapshotRenderer> {
+  async captureSnapshot(page: Page, callId: string, snapshotName: string): Promise<SnapshotRenderer> {
     if (this._snapshotReadyPromises.has(snapshotName))
       throw new Error('Duplicate snapshot name: ' + snapshotName);
 
-    this._snapshotter.captureSnapshot(page, callId, snapshotName, element).catch(() => {});
+    this._snapshotter.captureSnapshot(page, callId, snapshotName).catch(() => {});
     const promise = new ManualPromise<SnapshotRenderer>();
     this._snapshotReadyPromises.set(snapshotName, promise);
     return promise;
@@ -73,7 +74,7 @@ export class InMemorySnapshotter implements SnapshotterDelegate, HarTracerDelega
   }
 
   onEntryFinished(entry: har.Entry) {
-    this._storage.addResource(entry);
+    this._storage.addResource('', entry);
   }
 
   onContentBlob(sha1: string, buffer: Buffer) {
@@ -86,7 +87,7 @@ export class InMemorySnapshotter implements SnapshotterDelegate, HarTracerDelega
 
   onFrameSnapshot(snapshot: FrameSnapshot): void {
     ++this._snapshotCount;
-    const renderer = this._storage.addFrameSnapshot(snapshot);
+    const renderer = this._storage.addFrameSnapshot('', snapshot, []);
     this._snapshotReadyPromises.get(snapshot.snapshotName || '')?.resolve(renderer);
   }
 
diff --git a/packages/playwright-core/src/server/trace/viewer/DEPS.list b/packages/playwright-core/src/server/trace/viewer/DEPS.list
index df8177e9518ec..cd0ac02b8a122 100644
--- a/packages/playwright-core/src/server/trace/viewer/DEPS.list
+++ b/packages/playwright-core/src/server/trace/viewer/DEPS.list
@@ -1,5 +1,6 @@
 [*]
 ../../
+../../utils/
 ../../registry/
 ../../../generated/
 ../../../utils/
diff --git a/packages/playwright-core/src/server/trace/viewer/traceViewer.ts b/packages/playwright-core/src/server/trace/viewer/traceViewer.ts
index d053a3e643d3a..3c367e4ad6e3b 100644
--- a/packages/playwright-core/src/server/trace/viewer/traceViewer.ts
+++ b/packages/playwright-core/src/server/trace/viewer/traceViewer.ts
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-import path from 'path';
 import fs from 'fs';
-import { HttpServer } from '../../../utils/httpServer';
-import type { Transport } from '../../../utils/httpServer';
-import { gracefullyProcessExitDoNotHang, isUnderTest } from '../../../utils';
+import path from 'path';
+
+import { gracefullyProcessExitDoNotHang } from '../../../utils';
+import { isUnderTest } from '../../../utils';
+import { HttpServer } from '../../utils/httpServer';
+import { open } from '../../../utilsBundle';
 import { syncLocalStorageWithSettings } from '../../launchApp';
-import { serverSideCallMetadata } from '../../instrumentation';
+import { launchApp } from '../../launchApp';
 import { createPlaywright } from '../../playwright';
 import { ProgressController } from '../../progress';
-import { open } from '../../../utilsBundle';
-import type { Page } from '../../page';
+
+import type { Transport } from '../../utils/httpServer';
 import type { BrowserType } from '../../browserType';
-import { launchApp } from '../../launchApp';
+import type { Page } from '../../page';
 
 export type TraceViewerServerOptions = {
   host?: string;
@@ -40,14 +42,9 @@ export type TraceViewerRedirectOptions = {
   grep?: string;
   grepInvert?: string;
   project?: string[];
-  workers?: number | string;
-  headed?: boolean;
-  timeout?: number;
   reporter?: string[];
   webApp?: string;
   isServer?: boolean;
-  outputDir?: string;
-  updateSnapshots?: 'all' | 'none' | 'missing';
 };
 
 export type TraceViewerAppOptions = {
@@ -72,6 +69,10 @@ export async function startTraceViewerServer(options?: TraceViewerServerOptions)
   server.routePrefix('/trace', (request, response) => {
     const url = new URL('http://localhost' + request.url!);
     const relativePath = url.pathname.slice('/trace'.length);
+    if (process.env.PW_HMR) {
+      // When running in Vite HMR mode, port is hardcoded in build.js
+      response.appendHeader('Access-Control-Allow-Origin', 'http://localhost:44223');
+    }
     if (relativePath.endsWith('/stall.js'))
       return true;
     if (relativePath.startsWith('/file')) {
@@ -109,6 +110,8 @@ export async function startTraceViewerServer(options?: TraceViewerServerOptions)
 
 export async function installRootRedirect(server: HttpServer, traceUrls: string[], options: TraceViewerRedirectOptions) {
   const params = new URLSearchParams();
+  if (path.sep !== path.posix.sep)
+    params.set('pathSeparator', path.sep);
   for (const traceUrl of traceUrls)
     params.append('trace', traceUrl);
   if (server.wsGuid())
@@ -125,20 +128,16 @@ export async function installRootRedirect(server: HttpServer, traceUrls: string[
     params.append('grepInvert', options.grepInvert);
   for (const project of options.project || [])
     params.append('project', project);
-  if (options.workers)
-    params.append('workers', String(options.workers));
-  if (options.timeout)
-    params.append('timeout', String(options.timeout));
-  if (options.headed)
-    params.append('headed', '');
-  if (options.outputDir)
-    params.append('outputDir', options.outputDir);
-  if (options.updateSnapshots)
-    params.append('updateSnapshots', options.updateSnapshots);
   for (const reporter of options.reporter || [])
     params.append('reporter', reporter);
 
-  const urlPath  = `./trace/${options.webApp || 'index.html'}?${params.toString()}`;
+  let baseUrl = '.';
+  if (process.env.PW_HMR) {
+    baseUrl = 'http://localhost:44223'; // port is hardcoded in build.js
+    params.set('server', server.urlPrefix('precise'));
+  }
+
+  const urlPath  = `${baseUrl}/trace/${options.webApp || 'index.html'}?${params.toString()}`;
   server.routePath('/', (_, response) => {
     response.statusCode = 302;
     response.setHeader('Location', urlPath);
@@ -169,31 +168,33 @@ export async function openTraceViewerApp(url: string, browserName: string, optio
   const traceViewerBrowser = isUnderTest() ? 'chromium' : browserName;
 
   const { context, page } = await launchApp(traceViewerPlaywright[traceViewerBrowser as 'chromium'], {
-    // TODO: store language in the trace.
     sdkLanguage: traceViewerPlaywright.options.sdkLanguage,
     windowSize: { width: 1280, height: 800 },
     persistentContextOptions: {
       ...options?.persistentContextOptions,
-      useWebSocket: isUnderTest(),
+      cdpPort: isUnderTest() ? 0 : undefined,
       headless: !!options?.headless,
+      colorScheme: isUnderTest() ? 'light' : undefined,
     },
   });
 
-  const controller = new ProgressController(serverSideCallMetadata(), context._browser);
+  const controller = new ProgressController();
   await controller.run(async progress => {
     await context._browser._defaultContext!._loadDefaultContextAsIs(progress);
-  });
 
-  if (process.env.PWTEST_PRINT_WS_ENDPOINT)
-    process.stderr.write('DevTools listening on: ' + context._browser.options.wsEndpoint + '\n');
+    if (process.env.PWTEST_PRINT_WS_ENDPOINT) {
+      // eslint-disable-next-line no-restricted-properties
+      process.stderr.write('DevTools listening on: ' + context._browser.options.wsEndpoint + '\n');
+    }
 
-  if (!isUnderTest())
-    await syncLocalStorageWithSettings(page, 'traceviewer');
+    if (!isUnderTest())
+      await syncLocalStorageWithSettings(page, 'traceviewer');
 
-  if (isUnderTest())
-    page.on('close', () => context.close({ reason: 'Trace viewer closed' }).catch(() => {}));
+    if (isUnderTest())
+      page.on('close', () => context.close({ reason: 'Trace viewer closed' }).catch(() => {}));
 
-  await page.mainFrame().goto(serverSideCallMetadata(), url);
+    await page.mainFrame().goto(progress, url);
+  });
   return page;
 }
 
@@ -221,6 +222,9 @@ class StdinServer implements Transport {
     process.stdin.on('close', () => gracefullyProcessExitDoNotHang(0));
   }
 
+  onconnect() {
+  }
+
   async dispatch(method: string, params: any) {
     if (method === 'initialize') {
       if (this._traceUrl)
diff --git a/packages/playwright-core/src/server/transport.ts b/packages/playwright-core/src/server/transport.ts
index e213e030e7efc..c8b63fe7acde8 100644
--- a/packages/playwright-core/src/server/transport.ts
+++ b/packages/playwright-core/src/server/transport.ts
@@ -15,15 +15,17 @@
  * limitations under the License.
  */
 
+import { makeWaitForNextTask } from '../utils';
+import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent } from './utils/happyEyeballs';
 import { ws } from '../utilsBundle';
+
 import type { WebSocket } from '../utilsBundle';
-import type { ClientRequest, IncomingMessage } from 'http';
 import type { Progress } from './progress';
-import { makeWaitForNextTask } from '../utils';
-import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent } from '../utils/happy-eyeballs';
 import type { HeadersArray } from './types';
+import type { ClientRequest, IncomingMessage } from 'http';
 
 export const perMessageDeflate = {
+  clientNoContextTakeover: true,
   zlibDeflateOptions: {
     level: 3,
   },
@@ -58,6 +60,12 @@ export interface ConnectionTransport {
   onclose?: (reason?: string) => void,
 }
 
+type WebSocketTransportOptions = {
+  headers?: { [key: string]: string; };
+  followRedirects?: boolean;
+  debugLogHeader?: string;
+};
+
 export class WebSocketTransport implements ConnectionTransport {
   private _ws: WebSocket;
   private _progress?: Progress;
@@ -68,23 +76,18 @@ export class WebSocketTransport implements ConnectionTransport {
   readonly wsEndpoint: string;
   readonly headers: HeadersArray = [];
 
-  static async connect(progress: (Progress|undefined), url: string, headers?: { [key: string]: string; }, followRedirects?: boolean, debugLogHeader?: string): Promise<WebSocketTransport> {
-    return await WebSocketTransport._connect(progress, url, headers || {}, { follow: !!followRedirects, hadRedirects: false }, debugLogHeader);
+  static async connect(progress: (Progress|undefined), url: string, options: WebSocketTransportOptions = {}): Promise<WebSocketTransport> {
+    return await WebSocketTransport._connect(progress, url, options, false /* hadRedirects */);
   }
 
-  static async _connect(progress: (Progress|undefined), url: string, headers: { [key: string]: string; }, redirect: { follow: boolean, hadRedirects: boolean }, debugLogHeader?: string): Promise<WebSocketTransport> {
+  static async _connect(progress: (Progress|undefined), url: string, options: WebSocketTransportOptions, hadRedirects: boolean): Promise<WebSocketTransport> {
     const logUrl = stripQueryParams(url);
     progress?.log(`<ws connecting> ${logUrl}`);
-    const transport = new WebSocketTransport(progress, url, logUrl, headers, redirect.follow && redirect.hadRedirects, debugLogHeader);
-    let success = false;
-    progress?.cleanupWhenAborted(async () => {
-      if (!success)
-        await transport.closeAndWait().catch(e => null);
-    });
-    const result = await new Promise<{ transport?: WebSocketTransport, redirect?: IncomingMessage }>((fulfill, reject) => {
+    const transport = new WebSocketTransport(progress, url, logUrl, { ...options, followRedirects: !!options.followRedirects && hadRedirects });
+    const resultPromise = new Promise<{ redirect?: IncomingMessage }>((fulfill, reject) => {
       transport._ws.on('open', async () => {
         progress?.log(`<ws connected> ${logUrl}`);
-        fulfill({ transport });
+        fulfill({});
       });
       transport._ws.on('error', event => {
         progress?.log(`<ws connect error> ${logUrl} ${event.message}`);
@@ -92,13 +95,13 @@ export class WebSocketTransport implements ConnectionTransport {
         transport._ws.close();
       });
       transport._ws.on('unexpected-response', (request: ClientRequest, response: IncomingMessage) => {
-        if (redirect.follow && !redirect.hadRedirects && (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 307 || response.statusCode === 308)) {
+        if (options.followRedirects && !hadRedirects && (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 307 || response.statusCode === 308)) {
           fulfill({ redirect: response });
           transport._ws.close();
           return;
         }
         for (let i = 0; i < response.rawHeaders.length; i += 2) {
-          if (debugLogHeader && response.rawHeaders[i] === debugLogHeader)
+          if (options.debugLogHeader && response.rawHeaders[i] === options.debugLogHeader)
             progress?.log(response.rawHeaders[i + 1]);
         }
         const chunks: Buffer[] = [];
@@ -112,35 +115,36 @@ export class WebSocketTransport implements ConnectionTransport {
         });
       });
     });
-
-    if (result.redirect) {
-      // Strip authorization headers from the redirected request.
-      const newHeaders = Object.fromEntries(Object.entries(headers || {}).filter(([name]) => {
-        return !name.includes('access-key') && name.toLowerCase() !== 'authorization';
-      }));
-      return WebSocketTransport._connect(progress, result.redirect.headers.location!, newHeaders, { follow: true, hadRedirects: true }, debugLogHeader);
+    try {
+      const result = progress ? await progress.race(resultPromise) : await resultPromise;
+      if (result.redirect) {
+        // Strip authorization headers from the redirected request.
+        const newHeaders = Object.fromEntries(Object.entries(options.headers || {}).filter(([name]) => {
+          return !name.includes('access-key') && name.toLowerCase() !== 'authorization';
+        }));
+        return WebSocketTransport._connect(progress, result.redirect.headers.location!, { ...options, headers: newHeaders }, true /* hadRedirects */);
+      }
+      return transport;
+    } catch (error) {
+      await transport.closeAndWait();
+      throw error;
     }
-
-    success = true;
-    return transport;
   }
 
-  constructor(progress: Progress|undefined, url: string, logUrl: string, headers?: { [key: string]: string; }, followRedirects?: boolean, debugLogHeader?: string) {
+  constructor(progress: Progress|undefined, url: string, logUrl: string, options: WebSocketTransportOptions) {
     this.wsEndpoint = url;
     this._logUrl = logUrl;
     this._ws = new ws(url, [], {
       maxPayload: 256 * 1024 * 1024, // 256Mb,
-      // Prevent internal http client error when passing negative timeout.
-      handshakeTimeout: Math.max(progress?.timeUntilDeadline() ?? 30_000, 1),
-      headers,
-      followRedirects,
+      headers: options.headers,
+      followRedirects: options.followRedirects,
       agent: (/^(https|wss):\/\//.test(url)) ? httpsHappyEyeballsAgent : httpHappyEyeballsAgent,
       perMessageDeflate,
     });
     this._ws.on('upgrade', response => {
       for (let i = 0; i < response.rawHeaders.length; i += 2) {
         this.headers.push({ name: response.rawHeaders[i], value: response.rawHeaders[i + 1] });
-        if (debugLogHeader && response.rawHeaders[i] === debugLogHeader)
+        if (options.debugLogHeader && response.rawHeaders[i] === options.debugLogHeader)
           progress?.log(response.rawHeaders[i + 1]);
       }
     });
diff --git a/packages/playwright-core/src/server/types.ts b/packages/playwright-core/src/server/types.ts
index 66ebf2014c86c..089ef21fdf0bf 100644
--- a/packages/playwright-core/src/server/types.ts
+++ b/packages/playwright-core/src/server/types.ts
@@ -15,28 +15,26 @@
  * limitations under the License.
  */
 
-import type { Size, Point, TimeoutOptions, HeadersArray } from '../common/types';
-export type { Size, Point, Rect, Quad, URLMatch, TimeoutOptions, HeadersArray } from '../common/types';
+import type { HeadersArray, Point, Size } from '../utils/isomorphic/types';
+export type { HeadersArray, Point, Quad, Rect, Size } from '../utils/isomorphic/types';
 import type * as channels from '@protocol/channels';
 
 export type StrictOptions = {
   strict?: boolean,
 };
 
-export type QueryOnSelectorOptions = StrictOptions & TimeoutOptions;
+export type QueryOnSelectorOptions = StrictOptions;
 
-export type WaitForElementOptions = TimeoutOptions & StrictOptions & { state?: 'attached' | 'detached' | 'visible' | 'hidden' } & { omitReturnValue?: boolean };
-
-export type WaitForFunctionOptions = TimeoutOptions & { pollingInterval?: number };
+export type WaitForElementOptions = StrictOptions & { state?: 'attached' | 'detached' | 'visible' | 'hidden' } & { omitReturnValue?: boolean };
 
 export type LifecycleEvent = 'load' | 'domcontentloaded' | 'networkidle' | 'commit';
 export const kLifecycleEvents: Set<LifecycleEvent> = new Set(['load', 'domcontentloaded', 'networkidle', 'commit']);
 
-export type NavigateOptions = TimeoutOptions & {
+export type NavigateOptions = {
   waitUntil?: LifecycleEvent,
 };
 
-export type CommonActionOptions = TimeoutOptions & StrictOptions & {
+export type CommonActionOptions = StrictOptions & {
   force?: boolean,
 };
 
@@ -84,6 +82,8 @@ export type ReducedMotion = 'no-preference' | 'reduce' | 'no-override';
 
 export type ForcedColors = 'active' | 'none' | 'no-override';
 
+export type Contrast = 'no-preference' | 'more' | 'no-override';
+
 export type DeviceDescriptor = {
   userAgent: string,
   viewport: Size,
@@ -150,7 +150,17 @@ export type NormalizedContinueOverrides = {
 
 export type EmulatedSize = { viewport: Size, screen: Size };
 
-export type LaunchOptions = channels.BrowserTypeLaunchOptions & { useWebSocket?: boolean };
+export type LaunchOptions = Omit<channels.BrowserTypeLaunchParams, 'timeout'> & {
+  cdpPort?: number,
+  proxyOverride?: ProxySettings,
+  assistantMode?: boolean,
+  socksProxyPort?: number,
+};
+
+export type BrowserContextOptions = channels.BrowserNewContextOptions & {
+  proxyOverride?: ProxySettings;
+  internalIgnoreHTTPSErrors?: boolean;
+};
 
 export type ProtocolLogger = (direction: 'send' | 'receive', message: object) => void;
 
diff --git a/packages/playwright-core/src/server/utils/DEPS.list b/packages/playwright-core/src/server/utils/DEPS.list
new file mode 100644
index 0000000000000..8d1b7a30f27b9
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/DEPS.list
@@ -0,0 +1,9 @@
+[*]
+../../utils
+../../utils/isomorphic
+../../utilsBundle.ts
+../../zipBundle.ts
+
+[comparators.ts]
+./image_tools
+../../third_party/pixelmatch
diff --git a/packages/playwright-core/src/utils/ascii.ts b/packages/playwright-core/src/server/utils/ascii.ts
similarity index 100%
rename from packages/playwright-core/src/utils/ascii.ts
rename to packages/playwright-core/src/server/utils/ascii.ts
diff --git a/packages/playwright-core/src/utils/comparators.ts b/packages/playwright-core/src/server/utils/comparators.ts
similarity index 83%
rename from packages/playwright-core/src/utils/comparators.ts
rename to packages/playwright-core/src/server/utils/comparators.ts
index ef63b2d37661e..59871ac5ef815 100644
--- a/packages/playwright-core/src/utils/comparators.ts
+++ b/packages/playwright-core/src/server/utils/comparators.ts
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import { colors, jpegjs } from '../utilsBundle';
-const pixelmatch = require('../third_party/pixelmatch');
-import { compare } from '../image_tools/compare';
-const { diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL } = require('../third_party/diff_match_patch');
-import { PNG } from '../utilsBundle';
+import { compare } from './image_tools/compare';
+// @ts-ignore
+import pixelmatch from '../../third_party/pixelmatch';
+import { jpegjs } from '../../utilsBundle';
+import { colors, diff } from '../../utilsBundle';
+import { PNG } from '../../utilsBundle';
 
 export type ImageComparatorOptions = { threshold?: number, maxDiffPixels?: number, maxDiffPixelRatio?: number, comparator?: string };
 export type ComparatorResult = { diff?: Buffer; errorMessage: string; } | null;
@@ -37,7 +38,7 @@ export function getComparator(mimeType: string): Comparator {
 
 const JPEG_JS_MAX_BUFFER_SIZE_IN_MB = 5 * 1024; // ~5 GB
 
-function compareBuffersOrStrings(actualBuffer: Buffer | string, expectedBuffer: Buffer): ComparatorResult {
+export function compareBuffersOrStrings(actualBuffer: Buffer | string, expectedBuffer: Buffer): ComparatorResult {
   if (typeof actualBuffer === 'string')
     return compareText(actualBuffer, expectedBuffer);
   if (!actualBuffer || !(actualBuffer instanceof Buffer))
@@ -108,36 +109,27 @@ function validateBuffer(buffer: Buffer, mimeType: string): void {
 function compareText(actual: Buffer | string, expectedBuffer: Buffer): ComparatorResult {
   if (typeof actual !== 'string')
     return { errorMessage: 'Actual result should be a string' };
-  const expected = expectedBuffer.toString('utf-8');
+  let expected = expectedBuffer.toString('utf-8');
   if (expected === actual)
     return null;
-  const dmp = new diff_match_patch();
-  const d = dmp.diff_main(expected, actual);
-  dmp.diff_cleanupSemantic(d);
-  return {
-    errorMessage: diff_prettyTerminal(d)
-  };
-}
+  // Eliminate '\\ No newline at end of file'
+  if (!actual.endsWith('\n'))
+    actual += '\n';
+  if (!expected.endsWith('\n'))
+    expected += '\n';
 
-function diff_prettyTerminal(diffs: [number, string][]) {
-  const html = [];
-  for (let x = 0; x < diffs.length; x++) {
-    const op = diffs[x][0];    // Operation (insert, delete, equal)
-    const data = diffs[x][1];  // Text of change.
-    const text = data;
-    switch (op) {
-      case DIFF_INSERT:
-        html[x] = colors.green(text);
-        break;
-      case DIFF_DELETE:
-        html[x] = colors.reset(colors.strikethrough(colors.red(text)));
-        break;
-      case DIFF_EQUAL:
-        html[x] = text;
-        break;
-    }
-  }
-  return html.join('');
+  const lines = diff.createPatch('file', expected, actual, undefined, undefined, { context: 5 }).split('\n');
+  const coloredLines = lines.slice(4).map(line => {
+    if (line.startsWith('-'))
+      return colors.green(line);
+    if (line.startsWith('+'))
+      return colors.red(line);
+    if (line.startsWith('@@'))
+      return colors.dim(line);
+    return line;
+  });
+  const errorMessage = coloredLines.join('\n');
+  return { errorMessage  };
 }
 
 function resizeImage(image: ImageData, size: { width: number, height: number }): ImageData {
diff --git a/packages/playwright-core/src/server/utils/crypto.ts b/packages/playwright-core/src/server/utils/crypto.ts
new file mode 100644
index 0000000000000..ab51dbb25a3c6
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/crypto.ts
@@ -0,0 +1,197 @@
+/**
+ * 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';
+
+import { assert } from '../../utils/isomorphic/assert';
+
+export function createGuid(): string {
+  return crypto.randomBytes(16).toString('hex');
+}
+
+export function calculateSha1(buffer: Buffer | string): string {
+  const hash = crypto.createHash('sha1');
+  hash.update(buffer);
+  return hash.digest('hex');
+}
+
+// Variable-length quantity encoding aka. base-128 encoding
+function encodeBase128(value: number): Buffer {
+  const bytes = [];
+  do {
+    let byte = value & 0x7f;
+    value >>>= 7;
+    if (bytes.length > 0)
+      byte |= 0x80;
+    bytes.push(byte);
+  } while (value > 0);
+  return Buffer.from(bytes.reverse());
+}
+
+// ASN1/DER Speficiation:   https://www.itu.int/rec/T-REC-X.680-X.693-202102-I/en
+class DER {
+  static encodeSequence(data: Buffer[]): Buffer {
+    return this._encode(0x30, Buffer.concat(data));
+  }
+  static encodeInteger(data: number): Buffer {
+    assert(data >= -128 && data <= 127);
+    return this._encode(0x02, Buffer.from([data]));
+  }
+  static encodeObjectIdentifier(oid: string): Buffer {
+    const parts = oid.split('.').map(v => Number(v));
+    // Encode the second part, which could be large, using base-128 encoding if necessary
+    const output = [encodeBase128(40 * parts[0] + parts[1])];
+
+    for (let i = 2; i < parts.length; i++)
+      output.push(encodeBase128(parts[i]));
+
+
+    return this._encode(0x06, Buffer.concat(output));
+  }
+  static encodeNull(): Buffer {
+    return Buffer.from([0x05, 0x00]);
+  }
+  static encodeSet(data: Buffer[]): Buffer {
+    assert(data.length === 1, 'Only one item in the set is supported. We\'d need to sort the data to support more.');
+    // We expect the data to be already sorted.
+    return this._encode(0x31, Buffer.concat(data));
+  }
+  static encodeExplicitContextDependent(tag: number, data: Buffer): Buffer {
+    return this._encode(0xa0 + tag, data);
+  }
+  static encodePrintableString(data: string): Buffer {
+    return this._encode(0x13, Buffer.from(data));
+  }
+  static encodeBitString(data: Buffer): Buffer {
+    // The first byte of the content is the number of unused bits at the end
+    const unusedBits = 0; // Assuming all bits are used
+    const content = Buffer.concat([Buffer.from([unusedBits]), data]);
+    return this._encode(0x03, content);
+  }
+  static encodeDate(date: Date): Buffer {
+    const year = date.getUTCFullYear();
+    const isGeneralizedTime = year >= 2050;
+    const parts = [
+      isGeneralizedTime ? year.toString() : year.toString().slice(-2),
+      (date.getUTCMonth() + 1).toString().padStart(2, '0'),
+      date.getUTCDate().toString().padStart(2, '0'),
+      date.getUTCHours().toString().padStart(2, '0'),
+      date.getUTCMinutes().toString().padStart(2, '0'),
+      date.getUTCSeconds().toString().padStart(2, '0')
+    ];
+    const encodedDate = parts.join('') + 'Z';
+    const tag = isGeneralizedTime ? 0x18 : 0x17; // 0x18 for GeneralizedTime, 0x17 for UTCTime
+    return this._encode(tag, Buffer.from(encodedDate));
+  }
+  private static _encode(tag: number, data: Buffer): Buffer {
+    const lengthBytes = this._encodeLength(data.length);
+    return Buffer.concat([Buffer.from([tag]), lengthBytes, data]);
+  }
+  private static _encodeLength(length: number): Buffer {
+    if (length < 128) {
+      return Buffer.from([length]);
+    } else {
+      const lengthBytes = [];
+      while (length > 0) {
+        lengthBytes.unshift(length & 0xFF);
+        length >>= 8;
+      }
+      return Buffer.from([0x80 | lengthBytes.length, ...lengthBytes]);
+    }
+  }
+}
+
+// X.509 Specification: https://datatracker.ietf.org/doc/html/rfc2459#section-4.1
+export function generateSelfSignedCertificate() {
+  const { privateKey, publicKey } = crypto.generateKeyPairSync('rsa', { modulusLength: 2048 });
+  const publicKeyDer = publicKey.export({ type: 'pkcs1', format: 'der' });
+
+  const oneYearInMilliseconds = 365 * 24 * 60 * 60 * 1_000;
+  const notBefore = new Date(new Date().getTime() - oneYearInMilliseconds);
+  const notAfter = new Date(new Date().getTime() + oneYearInMilliseconds);
+
+  // List of fields / structure: https://datatracker.ietf.org/doc/html/rfc2459#section-4.1
+  const tbsCertificate = DER.encodeSequence([
+    DER.encodeExplicitContextDependent(0, DER.encodeInteger(1)), // version
+    DER.encodeInteger(1), // serialNumber
+    DER.encodeSequence([
+      DER.encodeObjectIdentifier('1.2.840.113549.1.1.11'), // sha256WithRSAEncryption PKCS #1
+      DER.encodeNull()
+    ]), // signature
+    DER.encodeSequence([
+      DER.encodeSet([
+        DER.encodeSequence([
+          DER.encodeObjectIdentifier('2.5.4.3'), // commonName X.520 DN component
+          DER.encodePrintableString('localhost')
+        ]),
+      ]),
+      DER.encodeSet([
+        DER.encodeSequence([
+          DER.encodeObjectIdentifier('2.5.4.10'), // organizationName X.520 DN component
+          DER.encodePrintableString('Playwright Client Certificate Support')
+        ])
+      ])
+    ]), // issuer
+    DER.encodeSequence([
+      DER.encodeDate(notBefore), // notBefore
+      DER.encodeDate(notAfter), // notAfter
+    ]), // validity
+    DER.encodeSequence([
+      DER.encodeSet([
+        DER.encodeSequence([
+          DER.encodeObjectIdentifier('2.5.4.3'), // commonName X.520 DN component
+          DER.encodePrintableString('localhost')
+        ]),
+      ]),
+      DER.encodeSet([
+        DER.encodeSequence([
+          DER.encodeObjectIdentifier('2.5.4.10'), // organizationName X.520 DN component
+          DER.encodePrintableString('Playwright Client Certificate Support')
+        ])
+      ])
+    ]), // subject
+    DER.encodeSequence([
+      DER.encodeSequence([
+        DER.encodeObjectIdentifier('1.2.840.113549.1.1.1'), // rsaEncryption PKCS #1
+        DER.encodeNull()
+      ]),
+      DER.encodeBitString(publicKeyDer)
+    ]), // SubjectPublicKeyInfo
+  ]);
+
+  const signature = crypto.sign('sha256', tbsCertificate, privateKey);
+
+  const certificate = DER.encodeSequence([
+    tbsCertificate,
+    DER.encodeSequence([
+      DER.encodeObjectIdentifier('1.2.840.113549.1.1.11'), // sha256WithRSAEncryption PKCS #1
+      DER.encodeNull()
+    ]),
+    DER.encodeBitString(signature)
+  ]);
+
+  const certPem = [
+    '-----BEGIN CERTIFICATE-----',
+    // Split the base64 string into lines of 64 characters
+    certificate.toString('base64').match(/.{1,64}/g)!.join('\n'),
+    '-----END CERTIFICATE-----'
+  ].join('\n');
+
+  return {
+    cert: certPem,
+    key: privateKey.export({ type: 'pkcs1', format: 'pem' }),
+  };
+}
diff --git a/packages/playwright-core/src/server/utils/debug.ts b/packages/playwright-core/src/server/utils/debug.ts
new file mode 100644
index 0000000000000..680113d90499b
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/debug.ts
@@ -0,0 +1,32 @@
+/**
+ * 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 { getFromENV, getAsBooleanFromENV } from './env';
+
+const _debugMode = getFromENV('PWDEBUG') || '';
+
+export function debugMode() {
+  if (_debugMode === 'console')
+    return 'console';
+  if (_debugMode === '0' || _debugMode === 'false')
+    return '';
+  return _debugMode ? 'inspector' : '';
+}
+
+const _isUnderTest = getAsBooleanFromENV('PWTEST_UNDER_TEST');
+export function isUnderTest(): boolean {
+  return _isUnderTest;
+}
diff --git a/packages/playwright-core/src/utils/debugLogger.ts b/packages/playwright-core/src/server/utils/debugLogger.ts
similarity index 86%
rename from packages/playwright-core/src/utils/debugLogger.ts
rename to packages/playwright-core/src/server/utils/debugLogger.ts
index a5196da896ec9..ec2cef4a1cd7d 100644
--- a/packages/playwright-core/src/utils/debugLogger.ts
+++ b/packages/playwright-core/src/server/utils/debugLogger.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import { debug } from '../utilsBundle';
 import fs from 'fs';
 
+import { debug } from '../../utilsBundle';
+
 const debugLoggerColorMap = {
   'api': 45, // cyan
   'protocol': 34, // green
@@ -29,7 +30,8 @@ const debugLoggerColorMap = {
   'channel': 33, // blue
   'server': 45, // cyan
   'server:channel': 34, // green
-  'server:metadata': 33, // blue
+  'server:metadata': 33, // blue,
+  'recorder': 45, // cyan
 };
 export type LogName = keyof typeof debugLoggerColorMap;
 
@@ -70,11 +72,14 @@ export const debugLogger = new DebugLogger();
 const kLogCount = 150;
 export class RecentLogsCollector {
   private _logs: string[] = [];
+  private _listeners: ((log: string) => void)[] = [];
 
   log(message: string) {
     this._logs.push(message);
     if (this._logs.length === kLogCount * 2)
       this._logs.splice(0, kLogCount);
+    for (const listener of this._listeners)
+      listener(message);
   }
 
   recentLogs(): string[] {
@@ -82,4 +87,10 @@ export class RecentLogsCollector {
       return this._logs.slice(-kLogCount);
     return this._logs;
   }
+
+  onMessage(listener: (message: string) => void) {
+    for (const message of this._logs)
+      listener(message);
+    this._listeners.push(listener);
+  }
 }
diff --git a/packages/playwright-core/src/utils/env.ts b/packages/playwright-core/src/server/utils/env.ts
similarity index 93%
rename from packages/playwright-core/src/utils/env.ts
rename to packages/playwright-core/src/server/utils/env.ts
index 2a4dd0bfd4f33..500c180f56745 100644
--- a/packages/playwright-core/src/utils/env.ts
+++ b/packages/playwright-core/src/server/utils/env.ts
@@ -47,3 +47,7 @@ export function getPackageManagerExecCommand() {
     return 'pnpm exec';
   return 'npx';
 }
+
+export function isLikelyNpxGlobal() {
+  return process.argv.length >= 2 && process.argv[1].includes('_npx');
+}
diff --git a/packages/playwright-core/src/utils/eventsHelper.ts b/packages/playwright-core/src/server/utils/eventsHelper.ts
similarity index 100%
rename from packages/playwright-core/src/utils/eventsHelper.ts
rename to packages/playwright-core/src/server/utils/eventsHelper.ts
diff --git a/packages/playwright-core/src/server/utils/expectUtils.ts b/packages/playwright-core/src/server/utils/expectUtils.ts
new file mode 100644
index 0000000000000..6d7a2a1e3db2f
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/expectUtils.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { isRegExp, isString } from '../../utils/isomorphic/rtti';
+
+import type { ExpectedTextValue } from '@protocol/channels';
+
+export function serializeExpectedTextValues(items: (string | RegExp)[], options: { matchSubstring?: boolean, normalizeWhiteSpace?: boolean, ignoreCase?: boolean } = {}): ExpectedTextValue[] {
+  return items.map(i => ({
+    string: isString(i) ? i : undefined,
+    regexSource: isRegExp(i) ? i.source : undefined,
+    regexFlags: isRegExp(i) ? i.flags : undefined,
+    matchSubstring: options.matchSubstring,
+    ignoreCase: options.ignoreCase,
+    normalizeWhiteSpace: options.normalizeWhiteSpace,
+  }));
+}
diff --git a/packages/playwright-core/src/utils/fileUtils.ts b/packages/playwright-core/src/server/utils/fileUtils.ts
similarity index 96%
rename from packages/playwright-core/src/utils/fileUtils.ts
rename to packages/playwright-core/src/server/utils/fileUtils.ts
index b7f441aa37748..3eab2c036613c 100644
--- a/packages/playwright-core/src/utils/fileUtils.ts
+++ b/packages/playwright-core/src/server/utils/fileUtils.ts
@@ -16,11 +16,11 @@
 
 import fs from 'fs';
 import path from 'path';
-import { ManualPromise } from './manualPromise';
-import type { EventEmitter } from 'events';
-import { yazl } from '../zipBundle';
 
-export const fileUploadSizeLimit = 50 * 1024 * 1024;
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { yazl } from '../../zipBundle';
+
+import type { EventEmitter } from 'events';
 
 export const existsAsync = (path: string): Promise<boolean> => new Promise(resolve => fs.stat(path, err => resolve(!err)));
 
@@ -29,7 +29,7 @@ export async function mkdirIfNeeded(filePath: string) {
   await fs.promises.mkdir(path.dirname(filePath), { recursive: true }).catch(() => {});
 }
 
-export async function removeFolders(dirs: string[]): Promise<Error[]> {
+export async function removeFolders(dirs: string[]): Promise<(Error| undefined)[]> {
   return await Promise.all(dirs.map((dir: string) =>
     fs.promises.rm(dir, { recursive: true, force: true, maxRetries: 10 }).catch(e => e)
   ));
diff --git a/packages/playwright-core/src/utils/happy-eyeballs.ts b/packages/playwright-core/src/server/utils/happyEyeballs.ts
similarity index 84%
rename from packages/playwright-core/src/utils/happy-eyeballs.ts
rename to packages/playwright-core/src/server/utils/happyEyeballs.ts
index 80663b8192702..eb8531db4c1a4 100644
--- a/packages/playwright-core/src/utils/happy-eyeballs.ts
+++ b/packages/playwright-core/src/server/utils/happyEyeballs.ts
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-import * as dns from 'dns';
-import * as http from 'http';
-import * as https from 'https';
-import * as net from 'net';
-import * as tls from 'tls';
-import { ManualPromise } from './manualPromise';
-import { assert } from './debug';
+import dns from 'dns';
+import http from 'http';
+import https from 'https';
+import net from 'net';
+import tls from 'tls';
+
+import { assert } from '../../utils/isomorphic/assert';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { monotonicTime } from '../../utils/isomorphic/time';
 
 // Implementation(partial) of Happy Eyeballs 2 algorithm described in
 // https://www.rfc-editor.org/rfc/rfc8305
@@ -28,6 +30,9 @@ import { assert } from './debug';
 // Same as in Chromium (https://source.chromium.org/chromium/chromium/src/+/5666ff4f5077a7e2f72902f3a95f5d553ea0d88d:net/socket/transport_connect_job.cc;l=102)
 const connectionAttemptDelayMs = 300;
 
+const kDNSLookupAt = Symbol('kDNSLookupAt');
+const kTCPConnectionAt = Symbol('kTCPConnectionAt');
+
 class HttpHappyEyeballsAgent extends http.Agent {
   createConnection(options: http.ClientRequestArgs, oncreate?: (err: Error | null, socket?: net.Socket) => void): net.Socket | undefined {
     // There is no ambiguity in case of IP address.
@@ -71,40 +76,43 @@ export async function createTLSSocket(options: tls.ConnectionOptions): Promise<t
   return new Promise((resolve, reject) => {
     assert(options.host, 'host is required');
     if (net.isIP(options.host)) {
-      const socket = tls.connect(options)
-      socket.on('connect', () => resolve(socket));
+      const socket = tls.connect(options);
+      socket.on('secureConnect', () => resolve(socket));
       socket.on('error', error => reject(error));
     } else {
       createConnectionAsync(options, (err, socket) => {
         if (err)
           reject(err);
-        if (socket)
-          resolve(socket);
+        if (socket) {
+          socket.on('secureConnect', () => resolve(socket));
+          socket.on('error', error => reject(error));
+        }
       }, true).catch(err => reject(err));
     }
   });
 }
 
 export async function createConnectionAsync(
-  options: http.ClientRequestArgs, 
-  oncreate: ((err: Error | null, socket?: tls.TLSSocket) => void) | undefined, 
+  options: http.ClientRequestArgs,
+  oncreate: ((err: Error | null, socket?: tls.TLSSocket) => void) | undefined,
   useTLS: true
 ): Promise<void>;
 
 export async function createConnectionAsync(
-  options: http.ClientRequestArgs, 
-  oncreate: ((err: Error | null, socket?: net.Socket) => void) | undefined, 
+  options: http.ClientRequestArgs,
+  oncreate: ((err: Error | null, socket?: net.Socket) => void) | undefined,
   useTLS: false
 ): Promise<void>;
 
 export async function createConnectionAsync(
-  options: http.ClientRequestArgs, 
-  oncreate: ((err: Error | null, socket?: any) => void) | undefined, 
+  options: http.ClientRequestArgs,
+  oncreate: ((err: Error | null, socket?: any) => void) | undefined,
   useTLS: boolean
 ): Promise<void> {
   const lookup = (options as any).__testHookLookup || lookupAddresses;
   const hostname = clientRequestArgsToHostName(options);
   const addresses = await lookup(hostname);
+  const dnsLookupAt = monotonicTime();
   const sockets = new Set<net.Socket>();
   let firstError;
   let errorCount = 0;
@@ -130,9 +138,13 @@ export async function createConnectionAsync(
         port: options.port as number,
         host: address });
 
+    (socket as any)[kDNSLookupAt] = dnsLookupAt;
+
     // Each socket may fire only one of 'connect', 'timeout' or 'error' events.
     // None of these events are fired after socket.destroy() is called.
     socket.on('connect', () => {
+      (socket as any)[kTCPConnectionAt] = monotonicTime();
+
       connected.resolve();
       oncreate?.(null, socket);
       // TODO: Cache the result?
@@ -187,3 +199,9 @@ function clientRequestArgsToHostName(options: http.ClientRequestArgs): string {
   throw new Error('Either options.hostname or options.host must be provided');
 }
 
+export function timingForSocket(socket: net.Socket | tls.TLSSocket) {
+  return {
+    dnsLookupAt: (socket as any)[kDNSLookupAt] as number | undefined,
+    tcpConnectionAt: (socket as any)[kTCPConnectionAt] as number | undefined,
+  };
+}
diff --git a/packages/playwright-core/src/utils/hostPlatform.ts b/packages/playwright-core/src/server/utils/hostPlatform.ts
similarity index 74%
rename from packages/playwright-core/src/utils/hostPlatform.ts
rename to packages/playwright-core/src/server/utils/hostPlatform.ts
index 9e7be7a5a85a8..43bbff7e3253e 100644
--- a/packages/playwright-core/src/utils/hostPlatform.ts
+++ b/packages/playwright-core/src/server/utils/hostPlatform.ts
@@ -15,6 +15,7 @@
  */
 
 import os from 'os';
+
 import { getLinuxDistributionInfoSync } from './linuxUtils';
 
 export type HostPlatform = 'win64' |
@@ -25,15 +26,23 @@ export type HostPlatform = 'win64' |
                            'mac12' | 'mac12-arm64' |
                            'mac13' | 'mac13-arm64' |
                            'mac14' | 'mac14-arm64' |
+                           'mac15' | 'mac15-arm64' |
                            'ubuntu18.04-x64' | 'ubuntu18.04-arm64' |
                            'ubuntu20.04-x64' | 'ubuntu20.04-arm64' |
                            'ubuntu22.04-x64' | 'ubuntu22.04-arm64' |
                            'ubuntu24.04-x64' | 'ubuntu24.04-arm64' |
                            'debian11-x64' | 'debian11-arm64' |
                            'debian12-x64' | 'debian12-arm64' |
+                           'debian13-x64' | 'debian13-arm64' |
                            '<unknown>';
 
 function calculatePlatform(): { hostPlatform: HostPlatform, isOfficiallySupportedPlatform: boolean } {
+  if (process.env.PLAYWRIGHT_HOST_PLATFORM_OVERRIDE) {
+    return {
+      hostPlatform: process.env.PLAYWRIGHT_HOST_PLATFORM_OVERRIDE as HostPlatform,
+      isOfficiallySupportedPlatform: false
+    };
+  }
   const platform = os.platform();
   if (platform === 'darwin') {
     const ver = os.release().split('.').map((a: string) => parseInt(a, 10));
@@ -47,9 +56,9 @@ function calculatePlatform(): { hostPlatform: HostPlatform, isOfficiallySupporte
       macVersion = 'mac10.15';
     } else {
       // ver[0] >= 20
-      const LAST_STABLE_MAC_MAJOR_VERSION = 14;
+      const LAST_STABLE_MACOS_MAJOR_VERSION = 15;
       // Best-effort support for MacOS beta versions.
-      macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MAC_MAJOR_VERSION);
+      macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MACOS_MAJOR_VERSION);
       // BigSur is the first version that might run on Apple Silicon.
       if (os.cpus().some(cpu => cpu.model.includes('Apple')))
         macVersion += '-arm64';
@@ -67,20 +76,27 @@ function calculatePlatform(): { hostPlatform: HostPlatform, isOfficiallySupporte
     // KDE Neon is ubuntu-based and has the same versions.
     // TUXEDO OS is ubuntu-based and has the same versions.
     if (distroInfo?.id === 'ubuntu' || distroInfo?.id === 'pop' || distroInfo?.id === 'neon' || distroInfo?.id === 'tuxedo') {
-      const isOfficiallySupportedPlatform = distroInfo?.id === 'ubuntu';
-      if (parseInt(distroInfo.version, 10) <= 19)
+      const isUbuntu = distroInfo?.id === 'ubuntu';
+      const version = distroInfo?.version;
+      const major = parseInt(distroInfo.version, 10);
+      if (major < 20)
         return { hostPlatform: ('ubuntu18.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
-      if (parseInt(distroInfo.version, 10) <= 21)
-        return { hostPlatform: ('ubuntu20.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
-      if (parseInt(distroInfo.version, 10) <= 22)
-        return { hostPlatform: ('ubuntu22.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
-      return { hostPlatform: ('ubuntu24.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
+      if (major < 22)
+        return { hostPlatform: ('ubuntu20.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: isUbuntu && version === '20.04' };
+      if (major < 24)
+        return { hostPlatform: ('ubuntu22.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: isUbuntu && version === '22.04' };
+      if (major < 26)
+        return { hostPlatform: ('ubuntu24.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: isUbuntu && version === '24.04' };
+      return { hostPlatform: ('ubuntu' + distroInfo.version + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
     }
     // Linux Mint is ubuntu-based but does not have the same versions
     if (distroInfo?.id === 'linuxmint') {
-      if (parseInt(distroInfo.version, 10) <= 20)
+      const mintMajor = parseInt(distroInfo.version, 10);
+      if (mintMajor <= 20)
         return { hostPlatform: ('ubuntu20.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
-      return { hostPlatform: ('ubuntu22.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
+      if (mintMajor === 21)
+        return { hostPlatform: ('ubuntu22.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
+      return { hostPlatform: ('ubuntu24.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
     }
     if (distroInfo?.id === 'debian' || distroInfo?.id === 'raspbian') {
       const isOfficiallySupportedPlatform = distroInfo?.id === 'debian';
@@ -88,10 +104,12 @@ function calculatePlatform(): { hostPlatform: HostPlatform, isOfficiallySupporte
         return { hostPlatform: ('debian11' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
       if (distroInfo?.version === '12')
         return { hostPlatform: ('debian12' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
+      if (distroInfo?.version === '13')
+        return { hostPlatform: ('debian13' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
       // use most recent supported release for 'debian testing' and 'unstable'.
       // they never include a numeric version entry in /etc/os-release.
       if (distroInfo?.version === '')
-        return { hostPlatform: ('debian12' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
+        return { hostPlatform: ('debian13' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform };
     }
     return { hostPlatform: ('ubuntu20.04' + archSuffix) as HostPlatform, isOfficiallySupportedPlatform: false };
   }
diff --git a/packages/playwright-core/src/utils/httpServer.ts b/packages/playwright-core/src/server/utils/httpServer.ts
similarity index 94%
rename from packages/playwright-core/src/utils/httpServer.ts
rename to packages/playwright-core/src/server/utils/httpServer.ts
index 24a84ea50271c..0fd977f3c043e 100644
--- a/packages/playwright-core/src/utils/httpServer.ts
+++ b/packages/playwright-core/src/server/utils/httpServer.ts
@@ -14,21 +14,24 @@
  * limitations under the License.
  */
 
-import type http from 'http';
 import fs from 'fs';
 import path from 'path';
-import { mime, wsServer } from '../utilsBundle';
-import { assert } from './debug';
-import { createHttpServer } from './network';
-import { ManualPromise } from './manualPromise';
+
+import { mime, wsServer } from '../../utilsBundle';
 import { createGuid } from './crypto';
+import { assert } from '../../utils/isomorphic/assert';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+import { createHttpServer } from './network';
+
+import type http from 'http';
 
 export type ServerRouteHandler = (request: http.IncomingMessage, response: http.ServerResponse) => boolean;
 
 export type Transport = {
   sendEvent?: (method: string, params: any) => void;
-  dispatch: (method: string, params: any) => Promise<any>;
   close?: () => void;
+  onconnect: () => void;
+  dispatch: (method: string, params: any) => Promise<any>;
   onclose: () => void;
 };
 
@@ -82,6 +85,7 @@ export class HttpServer {
     this._wsGuid = guid || createGuid();
     const wss = new wsServer({ server: this._server, path: '/' + this._wsGuid });
     wss.on('connection', ws => {
+      transport.onconnect();
       transport.sendEvent = (method, params)  => ws.send(JSON.stringify({ method, params }));
       transport.close = () => ws.close();
       ws.on('message', async message => {
@@ -212,12 +216,6 @@ export class HttpServer {
   }
 
   private _onRequest(request: http.IncomingMessage, response: http.ServerResponse) {
-    response.setHeader('Access-Control-Allow-Origin', '*');
-    response.setHeader('Access-Control-Request-Method', '*');
-    response.setHeader('Access-Control-Allow-Methods', 'OPTIONS, GET');
-    if (request.headers.origin)
-      response.setHeader('Access-Control-Allow-Headers', request.headers.origin);
-
     if (request.method === 'OPTIONS') {
       response.writeHead(200);
       response.end();
diff --git a/packages/playwright-core/src/image_tools/colorUtils.ts b/packages/playwright-core/src/server/utils/image_tools/colorUtils.ts
similarity index 100%
rename from packages/playwright-core/src/image_tools/colorUtils.ts
rename to packages/playwright-core/src/server/utils/image_tools/colorUtils.ts
diff --git a/packages/playwright-core/src/image_tools/compare.ts b/packages/playwright-core/src/server/utils/image_tools/compare.ts
similarity index 99%
rename from packages/playwright-core/src/image_tools/compare.ts
rename to packages/playwright-core/src/server/utils/image_tools/compare.ts
index ee4b6b691d07f..8dddb5df35d88 100644
--- a/packages/playwright-core/src/image_tools/compare.ts
+++ b/packages/playwright-core/src/server/utils/image_tools/compare.ts
@@ -16,7 +16,7 @@
 
 import { blendWithWhite, colorDeltaE94, rgb2gray } from './colorUtils';
 import { ImageChannel } from './imageChannel';
-import { ssim, FastStats } from './stats';
+import { FastStats, ssim } from './stats';
 
 const SSIM_WINDOW_RADIUS = 15;
 const VARIANCE_WINDOW_RADIUS = 1;
diff --git a/packages/playwright-core/src/image_tools/imageChannel.ts b/packages/playwright-core/src/server/utils/image_tools/imageChannel.ts
similarity index 100%
rename from packages/playwright-core/src/image_tools/imageChannel.ts
rename to packages/playwright-core/src/server/utils/image_tools/imageChannel.ts
diff --git a/packages/playwright-core/src/image_tools/stats.ts b/packages/playwright-core/src/server/utils/image_tools/stats.ts
similarity index 99%
rename from packages/playwright-core/src/image_tools/stats.ts
rename to packages/playwright-core/src/server/utils/image_tools/stats.ts
index b35371b4a1579..79b170243c4fb 100644
--- a/packages/playwright-core/src/image_tools/stats.ts
+++ b/packages/playwright-core/src/server/utils/image_tools/stats.ts
@@ -124,4 +124,3 @@ export class FastStats implements Stats {
     return (this._sum(this._partialSumMult, x1, y1, x2, y2) - this._sum(this._partialSumC1, x1, y1, x2, y2) * this._sum(this._partialSumC2, x1, y1, x2, y2) / N) / N;
   }
 }
-
diff --git a/packages/playwright-core/src/utils/linuxUtils.ts b/packages/playwright-core/src/server/utils/linuxUtils.ts
similarity index 72%
rename from packages/playwright-core/src/utils/linuxUtils.ts
rename to packages/playwright-core/src/server/utils/linuxUtils.ts
index d8e227f107b23..86d6362588694 100644
--- a/packages/playwright-core/src/utils/linuxUtils.ts
+++ b/packages/playwright-core/src/server/utils/linuxUtils.ts
@@ -23,26 +23,6 @@ let osRelease: {
   version: string,
 } | undefined;
 
-export async function getLinuxDistributionInfo(): Promise<{ id: string, version: string } | undefined> {
-  if (process.platform !== 'linux')
-    return undefined;
-  if (!osRelease && !didFailToReadOSRelease) {
-    try {
-      // List of /etc/os-release values for different distributions could be
-      // found here: https://gist.github.com/aslushnikov/8ceddb8288e4cf9db3039c02e0f4fb75
-      const osReleaseText = await fs.promises.readFile('/etc/os-release', 'utf8');
-      const fields = parseOSReleaseText(osReleaseText);
-      osRelease = {
-        id: fields.get('id') ?? '',
-        version: fields.get('version_id') ?? '',
-      };
-    } catch (e) {
-      didFailToReadOSRelease = true;
-    }
-  }
-  return osRelease;
-}
-
 export function getLinuxDistributionInfoSync(): { id: string, version: string } | undefined {
   if (process.platform !== 'linux')
     return undefined;
@@ -77,4 +57,3 @@ function parseOSReleaseText(osReleaseText: string): Map<string, string> {
   }
   return fields;
 }
-
diff --git a/packages/playwright-core/src/utils/network.ts b/packages/playwright-core/src/server/utils/network.ts
similarity index 62%
rename from packages/playwright-core/src/utils/network.ts
rename to packages/playwright-core/src/server/utils/network.ts
index b9bc2c0f06e6b..157a6f70862b7 100644
--- a/packages/playwright-core/src/utils/network.ts
+++ b/packages/playwright-core/src/server/utils/network.ts
@@ -16,29 +16,30 @@
 
 
 import http from 'http';
-import https from 'https';
 import http2 from 'http2';
-import type net from 'net';
-import { getProxyForUrl } from '../utilsBundle';
-import { HttpsProxyAgent } from '../utilsBundle';
+import https from 'https';
 import url from 'url';
-import type { URLMatch } from '../common/types';
-import { isString, isRegExp } from './rtti';
-import { globToRegex } from './glob';
-import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent } from './happy-eyeballs';
+
+import { HttpsProxyAgent, SocksProxyAgent, getProxyForUrl } from '../../utilsBundle';
+import { httpHappyEyeballsAgent, httpsHappyEyeballsAgent } from './happyEyeballs';
+import { ManualPromise } from '../../utils/isomorphic/manualPromise';
+
+import type net from 'net';
+import type { ProxySettings } from '../types';
+import type { Progress } from '../progress';
 
 export type HTTPRequestParams = {
   url: string,
   method?: string,
   headers?: http.OutgoingHttpHeaders,
   data?: string | Buffer,
-  timeout?: number,
   rejectUnauthorized?: boolean,
+  socketTimeout?: number,
 };
 
 export const NET_DEFAULT_TIMEOUT = 30_000;
 
-export function httpRequest(params: HTTPRequestParams, onResponse: (r: http.IncomingMessage) => void, onError: (error: Error) => void) {
+export function httpRequest(params: HTTPRequestParams, onResponse: (r: http.IncomingMessage) => void, onError: (error: Error) => void): { cancel(error: Error | undefined): void } {
   const parsedUrl = url.parse(params.url);
   let options: https.RequestOptions = {
     ...parsedUrl,
@@ -49,8 +50,6 @@ export function httpRequest(params: HTTPRequestParams, onResponse: (r: http.Inco
   if (params.rejectUnauthorized !== undefined)
     options.rejectUnauthorized = params.rejectUnauthorized;
 
-  const timeout = params.timeout ?? NET_DEFAULT_TIMEOUT;
-
   const proxyURL = getProxyForUrl(params.url);
   if (proxyURL) {
     const parsedProxyURL = url.parse(proxyURL);
@@ -70,88 +69,102 @@ export function httpRequest(params: HTTPRequestParams, onResponse: (r: http.Inco
     }
   }
 
+  let cancelRequest: (e: Error | undefined) => void;
   const requestCallback = (res: http.IncomingMessage) => {
     const statusCode = res.statusCode || 0;
-    if (statusCode >= 300 && statusCode < 400 && res.headers.location)
-      httpRequest({ ...params, url: new URL(res.headers.location, params.url).toString() }, onResponse, onError);
-    else
+    if (statusCode >= 300 && statusCode < 400 && res.headers.location) {
+      // Close the original socket before following the redirect. Otherwise
+      // it may stay idle and cause a timeout error.
+      request.destroy();
+      cancelRequest = httpRequest({ ...params, url: new URL(res.headers.location, params.url).toString() }, onResponse, onError).cancel;
+    } else {
       onResponse(res);
+    }
   };
   const request = options.protocol === 'https:' ?
     https.request(options, requestCallback) :
     http.request(options, requestCallback);
   request.on('error', onError);
-  if (timeout !== undefined) {
-    const rejectOnTimeout = () =>  {
-      onError(new Error(`Request to ${params.url} timed out after ${timeout}ms`));
+  if (params.socketTimeout !== undefined) {
+    request.setTimeout(params.socketTimeout, () =>  {
+      onError(new Error(`Request to ${params.url} timed out after ${params.socketTimeout}ms`));
       request.abort();
-    };
-    if (timeout <= 0) {
-      rejectOnTimeout();
-      return;
-    }
-    request.setTimeout(timeout, rejectOnTimeout);
+    });
   }
+  cancelRequest = e => {
+    try {
+      request.destroy(e);
+    } catch {
+    }
+  };
   request.end(params.data);
+  return { cancel: e => cancelRequest(e) };
 }
 
-export function fetchData(params: HTTPRequestParams, onError?: (params: HTTPRequestParams, response: http.IncomingMessage) => Promise<Error>): Promise<string> {
-  return new Promise((resolve, reject) => {
-    httpRequest(params, async response => {
-      if (response.statusCode !== 200) {
-        const error = onError ? await onError(params, response) : new Error(`fetch failed: server returned code ${response.statusCode}. URL: ${params.url}`);
-        reject(error);
-        return;
-      }
-      let body = '';
-      response.on('data', (chunk: string) => body += chunk);
-      response.on('error', (error: any) => reject(error));
-      response.on('end', () => resolve(body));
-    }, reject);
-  });
-}
-
-export function urlMatchesEqual(match1: URLMatch, match2: URLMatch) {
-  if (isRegExp(match1) && isRegExp(match2))
-    return match1.source === match2.source && match1.flags === match2.flags;
-  return match1 === match2;
+export async function fetchData(progress: Progress | undefined, params: HTTPRequestParams, onError?: (params: HTTPRequestParams, response: http.IncomingMessage) => Promise<Error>): Promise<string> {
+  const promise = new ManualPromise<string>();
+  const { cancel } = httpRequest(params, async response => {
+    if (response.statusCode !== 200) {
+      const error = onError ? await onError(params, response) : new Error(`fetch failed: server returned code ${response.statusCode}. URL: ${params.url}`);
+      promise.reject(error);
+      return;
+    }
+    let body = '';
+    response.on('data', (chunk: string) => body += chunk);
+    response.on('error', (error: any) => promise.reject(error));
+    response.on('end', () => promise.resolve(body));
+  }, error => promise.reject(error));
+  if (!progress)
+    return promise;
+  try {
+    return await progress.race(promise);
+  } catch (error) {
+    cancel(error);
+    throw error;
+  }
 }
 
-export function urlMatches(baseURL: string | undefined, urlString: string, match: URLMatch | undefined): boolean {
-  if (match === undefined || match === '')
-    return true;
-  if (isString(match) && !match.startsWith('*'))
-    match = constructURLBasedOnBaseURL(baseURL, match);
-  if (isString(match))
-    match = globToRegex(match);
-  if (isRegExp(match))
-    return match.test(urlString);
-  if (typeof match === 'string' && match === urlString)
-    return true;
-  const url = parsedURL(urlString);
-  if (!url)
+function shouldBypassProxy(url: URL, bypass?: string): boolean {
+  if (!bypass)
     return false;
-  if (typeof match === 'string')
-    return url.pathname === match;
-  if (typeof match !== 'function')
-    throw new Error('url parameter should be string, RegExp or function');
-  return match(url);
+  const domains = bypass.split(',').map(s => {
+    s = s.trim();
+    if (!s.startsWith('.'))
+      s = '.' + s;
+    return s;
+  });
+  const domain = '.' + url.hostname;
+  return domains.some(d => domain.endsWith(d));
 }
 
-function parsedURL(url: string): URL | null {
-  try {
-    return new URL(url);
-  } catch (e) {
-    return null;
+export function createProxyAgent(proxy?: ProxySettings, forUrl?: URL) {
+  if (!proxy)
+    return;
+  if (forUrl && proxy.bypass && shouldBypassProxy(forUrl, proxy.bypass))
+    return;
+
+  // Browsers allow to specify proxy without a protocol, defaulting to http.
+  let proxyServer = proxy.server.trim();
+  if (!/^\w+:\/\//.test(proxyServer))
+    proxyServer = 'http://' + proxyServer;
+
+  const proxyOpts = url.parse(proxyServer);
+  if (proxyOpts.protocol?.startsWith('socks')) {
+    return new SocksProxyAgent({
+      host: proxyOpts.hostname,
+      port: proxyOpts.port || undefined,
+    });
   }
-}
+  if (proxy.username)
+    proxyOpts.auth = `${proxy.username}:${proxy.password || ''}`;
 
-export function constructURLBasedOnBaseURL(baseURL: string | undefined, givenURL: string): string {
-  try {
-    return (new URL(givenURL, baseURL)).toString();
-  } catch (e) {
-    return givenURL;
+  if (forUrl && ['ws:', 'wss:'].includes(forUrl.protocol)) {
+    // Force CONNECT method for WebSockets.
+    return new HttpsProxyAgent(proxyOpts);
   }
+
+  // TODO: We should use HttpProxyAgent conditional on proxyOpts.protocol instead of always using CONNECT method.
+  return new HttpsProxyAgent(proxyOpts);
 }
 
 export function createHttpServer(requestListener?: (req: http.IncomingMessage, res: http.ServerResponse) => void): http.Server;
@@ -170,7 +183,7 @@ export function createHttpsServer(...args: any[]): https.Server {
   return server;
 }
 
-export function createHttp2Server(  onRequestHandler?: (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => void,): http2.Http2SecureServer;
+export function createHttp2Server(onRequestHandler?: (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => void,): http2.Http2SecureServer;
 export function createHttp2Server(options: http2.SecureServerOptions, onRequestHandler?: (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => void,): http2.Http2SecureServer;
 export function createHttp2Server(...args: any[]): http2.Http2SecureServer {
   const server = http2.createSecureServer(...args);
diff --git a/packages/playwright-core/src/server/utils/nodePlatform.ts b/packages/playwright-core/src/server/utils/nodePlatform.ts
new file mode 100644
index 0000000000000..84eb0e4015f8a
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/nodePlatform.ts
@@ -0,0 +1,173 @@
+/**
+ * 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';
+import fs from 'fs';
+import path from 'path';
+import * as util from 'util';
+import { Readable, Writable, pipeline } from 'stream';
+import { EventEmitter } from 'events';
+
+import { colors } from '../../utilsBundle';
+import { debugLogger } from './debugLogger';
+import { currentZone, emptyZone } from './zones';
+import { debugMode, isUnderTest } from './debug';
+
+import type { Platform, Zone } from '../../client/platform';
+import type { Zone as ZoneImpl } from './zones';
+import type * as channels from '@protocol/channels';
+
+const pipelineAsync = util.promisify(pipeline);
+
+class NodeZone implements Zone {
+  private _zone: ZoneImpl;
+
+  constructor(zone: ZoneImpl) {
+    this._zone = zone;
+  }
+
+  push<T>(data: T) {
+    return new NodeZone(this._zone.with('apiZone', data));
+  }
+
+  pop() {
+    return new NodeZone(this._zone.without('apiZone'));
+  }
+
+  run<R>(func: () => R): R {
+    return this._zone.run(func);
+  }
+
+  data<T>(): T | undefined {
+    return this._zone.data('apiZone');
+  }
+}
+
+let boxedStackPrefixes: string[] = [];
+export function setBoxedStackPrefixes(prefixes: string[]) {
+  boxedStackPrefixes = prefixes;
+}
+
+const coreDir = path.dirname(require.resolve('../../../package.json'));
+
+export const nodePlatform: Platform = {
+  name: 'node',
+
+  boxedStackPrefixes: () => {
+    if (process.env.PWDEBUGIMPL)
+      return [];
+    return [coreDir, ...boxedStackPrefixes];
+  },
+
+  calculateSha1: (text: string) => {
+    const sha1 = crypto.createHash('sha1');
+    sha1.update(text);
+    return Promise.resolve(sha1.digest('hex'));
+  },
+
+  colors,
+
+  coreDir,
+
+  createGuid: () => crypto.randomBytes(16).toString('hex'),
+
+  defaultMaxListeners: () => EventEmitter.defaultMaxListeners,
+  fs: () => fs,
+
+  env: process.env,
+
+  inspectCustom: util.inspect.custom,
+
+  isDebugMode: () => debugMode() === 'inspector',
+
+  isJSDebuggerAttached: () => !!require('inspector').url(),
+
+  isLogEnabled(name: 'api' | 'channel') {
+    return debugLogger.isEnabled(name);
+  },
+
+  isUnderTest: () => isUnderTest(),
+
+  log(name: 'api' | 'channel', message: string | Error | object) {
+    debugLogger.log(name, message);
+  },
+
+  path: () => path,
+
+  pathSeparator: path.sep,
+
+  showInternalStackFrames: () => !!process.env.PWDEBUGIMPL,
+
+  async streamFile(path: string, stream: Writable): Promise<void> {
+    await pipelineAsync(fs.createReadStream(path), stream);
+  },
+
+  streamReadable: (channel: channels.StreamChannel) => {
+    return new ReadableStreamImpl(channel);
+  },
+
+  streamWritable: (channel: channels.WritableStreamChannel) => {
+    return new WritableStreamImpl(channel);
+  },
+
+  zones: {
+    current: () => new NodeZone(currentZone()),
+    empty: new NodeZone(emptyZone),
+  }
+};
+
+class ReadableStreamImpl extends Readable {
+  private _channel: channels.StreamChannel;
+
+  constructor(channel: channels.StreamChannel) {
+    super();
+    this._channel = channel;
+  }
+
+  override async _read() {
+    const result = await this._channel.read({ size: 1024 * 1024 });
+    if (result.binary.byteLength)
+      this.push(result.binary);
+    else
+      this.push(null);
+  }
+
+  override _destroy(error: Error | null, callback: (error: Error | null | undefined) => void): void {
+    // Stream might be destroyed after the connection was closed.
+    this._channel.close().catch(e => null);
+    super._destroy(error, callback);
+  }
+}
+
+class WritableStreamImpl extends Writable {
+  private _channel: channels.WritableStreamChannel;
+
+  constructor(channel: channels.WritableStreamChannel) {
+    super();
+    this._channel = channel;
+  }
+
+  override async _write(chunk: Buffer | string, encoding: BufferEncoding, callback: (error?: Error | null) => void) {
+    const error = await this._channel.write({ binary: typeof chunk === 'string' ? Buffer.from(chunk) : chunk }).catch(e => e);
+    callback(error || null);
+  }
+
+  override async _final(callback: (error?: Error | null) => void) {
+    // Stream might be destroyed after the connection was closed.
+    const error = await this._channel.close().catch(e => e);
+    callback(error || null);
+  }
+}
diff --git a/packages/playwright-core/src/protocol/transport.ts b/packages/playwright-core/src/server/utils/pipeTransport.ts
similarity index 95%
rename from packages/playwright-core/src/protocol/transport.ts
rename to packages/playwright-core/src/server/utils/pipeTransport.ts
index e647100c63a0b..64b1d80e8fcb8 100644
--- a/packages/playwright-core/src/protocol/transport.ts
+++ b/packages/playwright-core/src/server/utils/pipeTransport.ts
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-import { makeWaitForNextTask } from '../utils';
+import { makeWaitForNextTask } from './task';
 
-export interface WritableStream {
+interface WritableStream {
   write(data: Buffer): void;
 }
 
-export interface ReadableStream {
+interface ReadableStream {
   on(event: 'data', callback: (b: Buffer) => void): void;
   on(event: 'close', callback: () => void): void;
 }
 
-export interface ClosableStream {
+interface ClosableStream {
   close(): void;
 }
 
diff --git a/packages/playwright-core/src/utils/processLauncher.ts b/packages/playwright-core/src/server/utils/processLauncher.ts
similarity index 98%
rename from packages/playwright-core/src/utils/processLauncher.ts
rename to packages/playwright-core/src/server/utils/processLauncher.ts
index 4e6c1030b2962..e027708c1b54b 100644
--- a/packages/playwright-core/src/utils/processLauncher.ts
+++ b/packages/playwright-core/src/server/utils/processLauncher.ts
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-import fs from 'fs';
 import * as childProcess from 'child_process';
+import fs from 'fs';
 import * as readline from 'readline';
-import { isUnderTest } from './';
+
 import { removeFolders } from './fileUtils';
+import { isUnderTest } from '../../utils';
 
 export type Env = {[key: string]: string | number | boolean | undefined};
 
@@ -163,7 +164,10 @@ export async function launchProcess(options: LaunchProcessOptions): Promise<Laun
     spawnedProcess.once('error', error => {
       failed(new Error('Failed to launch: ' + error));
     });
-    return cleanup().then(() => failedPromise).then(e => Promise.reject(e));
+    return failedPromise.then(async error => {
+      await cleanup();
+      throw error;
+    });
   }
   options.log(`<launched> pid=${spawnedProcess.pid}`);
 
@@ -180,7 +184,7 @@ export async function launchProcess(options: LaunchProcessOptions): Promise<Laun
   let processClosed = false;
   let fulfillCleanup = () => {};
   const waitForCleanup = new Promise<void>(f => fulfillCleanup = f);
-  spawnedProcess.once('exit', (exitCode, signal) => {
+  spawnedProcess.once('close', (exitCode, signal) => {
     options.log(`[pid=${spawnedProcess.pid}] <process did exit: exitCode=${exitCode}, signal=${signal}>`);
     processClosed = true;
     gracefullyCloseSet.delete(gracefullyClose);
diff --git a/packages/playwright-core/src/utils/profiler.ts b/packages/playwright-core/src/server/utils/profiler.ts
similarity index 96%
rename from packages/playwright-core/src/utils/profiler.ts
rename to packages/playwright-core/src/server/utils/profiler.ts
index b68d96040449d..e414f0ff4a960 100644
--- a/packages/playwright-core/src/utils/profiler.ts
+++ b/packages/playwright-core/src/server/utils/profiler.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
+import fs from 'fs';
+import path from 'path';
 
 const profileDir = process.env.PWTEST_PROFILE_DIR || '';
 
diff --git a/packages/playwright-core/src/common/socksProxy.ts b/packages/playwright-core/src/server/utils/socksProxy.ts
similarity index 98%
rename from packages/playwright-core/src/common/socksProxy.ts
rename to packages/playwright-core/src/server/utils/socksProxy.ts
index 6566262d643d8..40c62c43c3327 100644
--- a/packages/playwright-core/src/common/socksProxy.ts
+++ b/packages/playwright-core/src/server/utils/socksProxy.ts
@@ -15,11 +15,14 @@
  */
 
 import EventEmitter from 'events';
-import type { AddressInfo } from 'net';
 import net from 'net';
-import { debugLogger } from '../utils/debugLogger';
-import { createSocket } from '../utils/happy-eyeballs';
-import { assert, createGuid,  } from '../utils';
+
+import { assert } from '../../utils/isomorphic/assert';
+import { createGuid } from './crypto';
+import { debugLogger } from './debugLogger';
+import { createSocket } from './happyEyeballs';
+
+import type { AddressInfo } from 'net';
 
 // https://tools.ietf.org/html/rfc1928
 
diff --git a/packages/playwright-core/src/utils/spawnAsync.ts b/packages/playwright-core/src/server/utils/spawnAsync.ts
similarity index 93%
rename from packages/playwright-core/src/utils/spawnAsync.ts
rename to packages/playwright-core/src/server/utils/spawnAsync.ts
index 8e286fad47b90..c3bb8f086c75b 100644
--- a/packages/playwright-core/src/utils/spawnAsync.ts
+++ b/packages/playwright-core/src/server/utils/spawnAsync.ts
@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
-import type { SpawnOptions } from 'child_process';
 import { spawn } from 'child_process';
 
+import type { SpawnOptions } from 'child_process';
+
 export function spawnAsync(cmd: string, args: string[], options: SpawnOptions = {}): Promise<{stdout: string, stderr: string, code: number | null, error?: Error}> {
   const process = spawn(cmd, args, Object.assign({ windowsHide: true }, options));
 
   return new Promise(resolve => {
     let stdout = '';
     let stderr = '';
+    /* eslint-disable no-restricted-properties */
     if (process.stdout)
       process.stdout.on('data', data => stdout += data.toString());
     if (process.stderr)
       process.stderr.on('data', data => stderr += data.toString());
+    /* eslint-enable no-restricted-properties */
     process.on('close', code => resolve({ stdout, stderr, code }));
     process.on('error', error => resolve({ stdout, stderr, code: 0, error }));
   });
diff --git a/packages/playwright-core/src/utils/task.ts b/packages/playwright-core/src/server/utils/task.ts
similarity index 100%
rename from packages/playwright-core/src/utils/task.ts
rename to packages/playwright-core/src/server/utils/task.ts
diff --git a/packages/playwright-core/src/utils/userAgent.ts b/packages/playwright-core/src/server/utils/userAgent.ts
similarity index 77%
rename from packages/playwright-core/src/utils/userAgent.ts
rename to packages/playwright-core/src/server/utils/userAgent.ts
index 17b1bc51c87c7..d9c7619ac51f7 100644
--- a/packages/playwright-core/src/utils/userAgent.ts
+++ b/packages/playwright-core/src/server/utils/userAgent.ts
@@ -16,8 +16,8 @@
 
 import { execSync } from 'child_process';
 import os from 'os';
+
 import { getLinuxDistributionInfoSync } from '../utils/linuxUtils';
-import { wrapInASCIIBox } from './ascii';
 
 let cachedUserAgent: string | undefined;
 
@@ -77,31 +77,6 @@ export function getEmbedderName(): { embedderName: string, embedderVersion: stri
 }
 
 export function getPlaywrightVersion(majorMinorOnly = false): string {
-  const version = process.env.PW_VERSION_OVERRIDE || require('./../../package.json').version;
+  const version = process.env.PW_VERSION_OVERRIDE || require('./../../../package.json').version;
   return majorMinorOnly ? version.split('.').slice(0, 2).join('.') : version;
 }
-
-export function userAgentVersionMatchesErrorMessage(userAgent: string) {
-  const match = userAgent.match(/^Playwright\/(\d+\.\d+\.\d+)/);
-  if (!match) {
-    // Cannot parse user agent - be lax.
-    return;
-  }
-  const received = match[1].split('.').slice(0, 2).join('.');
-  const expected = getPlaywrightVersion(true);
-  if (received !== expected) {
-    return wrapInASCIIBox([
-      `Playwright version mismatch:`,
-      `  - server version: v${expected}`,
-      `  - client version: v${received}`,
-      ``,
-      `If you are using VSCode extension, restart VSCode.`,
-      ``,
-      `If you are connecting to a remote service,`,
-      `keep your local Playwright version in sync`,
-      `with the remote service version.`,
-      ``,
-      `<3 Playwright Team`
-    ].join('\n'), 1);
-  }
-}
diff --git a/packages/playwright-core/src/utils/wsServer.ts b/packages/playwright-core/src/server/utils/wsServer.ts
similarity index 76%
rename from packages/playwright-core/src/utils/wsServer.ts
rename to packages/playwright-core/src/server/utils/wsServer.ts
index 63c0ed1fedf89..16878bdaf9b80 100644
--- a/packages/playwright-core/src/utils/wsServer.ts
+++ b/packages/playwright-core/src/server/utils/wsServer.ts
@@ -14,17 +14,20 @@
  * limitations under the License.
  */
 
+import { createHttpServer } from './network';
+import { wsServer } from '../../utilsBundle';
+import { debugLogger } from './debugLogger';
+
+import type { WebSocket, WebSocketServer } from '../../utilsBundle';
 import type http from 'http';
 import type stream from 'stream';
-import { createHttpServer } from '../utils';
-import type { WebSocketServer, WebSocket } from '../utilsBundle';
-import { wsServer } from '../utilsBundle';
-import { debugLogger } from './debugLogger';
+
 
 let lastConnectionId = 0;
 const kConnectionSymbol = Symbol('kConnection');
 
 export const perMessageDeflate = {
+  serverNoContextTakeover: true,
   zlibDeflateOptions: {
     level: 3,
   },
@@ -39,10 +42,10 @@ export type WSConnection = {
 };
 
 export type WSServerDelegate = {
-  onHeaders?: (headers: string[]) => void;
-  onUpgrade?: (request: http.IncomingMessage, socket: stream.Duplex) => { error: string } | undefined;
+  onRequest: (request: http.IncomingMessage, response: http.ServerResponse) => void;
+  onHeaders: (headers: string[]) => void;
+  onUpgrade: (request: http.IncomingMessage, socket: stream.Duplex) => { error: string } | undefined;
   onConnection: (request: http.IncomingMessage, url: URL, ws: WebSocket, id: string) => WSConnection;
-  onClose?(): Promise<void>;
 };
 
 export class WSServer {
@@ -57,16 +60,7 @@ export class WSServer {
   async listen(port: number = 0, hostname: string | undefined, path: string): Promise<string> {
     debugLogger.log('server', `Server started at ${new Date()}`);
 
-    const server = createHttpServer((request: http.IncomingMessage, response: http.ServerResponse) => {
-      if (request.method === 'GET' && request.url === '/json') {
-        response.setHeader('Content-Type', 'application/json');
-        response.end(JSON.stringify({
-          wsEndpointPath: path,
-        }));
-        return;
-      }
-      response.end('Running');
-    });
+    const server = createHttpServer(this._delegate.onRequest);
     server.on('error', error => debugLogger.log('server', String(error)));
     this.server = server;
 
@@ -89,8 +83,7 @@ export class WSServer {
       perMessageDeflate,
     });
 
-    if (this._delegate.onHeaders)
-      this._wsServer.on('headers', headers => this._delegate.onHeaders!(headers));
+    this._wsServer.on('headers', headers => this._delegate.onHeaders(headers));
 
     server.on('upgrade', (request, socket, head) => {
       const pathname = new URL('http://localhost' + request.url!).pathname;
@@ -99,13 +92,13 @@ export class WSServer {
         socket.destroy();
         return;
       }
-      const upgradeResult = this._delegate.onUpgrade?.(request, socket);
+      const upgradeResult = this._delegate.onUpgrade(request, socket);
       if (upgradeResult) {
         socket.write(upgradeResult.error);
         socket.destroy();
         return;
       }
-      this._wsServer?.handleUpgrade(request, socket, head, ws => this._wsServer?.emit('connection', ws, request));
+      this._wsServer!.handleUpgrade(request, socket, head, ws => this._wsServer!.emit('connection', ws, request));
     });
 
     this._wsServer.on('connection', (ws, request) => {
@@ -113,8 +106,13 @@ export class WSServer {
       const url = new URL('http://localhost' + (request.url || ''));
       const id = String(++lastConnectionId);
       debugLogger.log('server', `[${id}] serving connection: ${request.url}`);
-      const connection = this._delegate.onConnection(request, url, ws, id);
-      (ws as any)[kConnectionSymbol] = connection;
+      try {
+        const connection = this._delegate.onConnection(request, url, ws, id);
+        (ws as any)[kConnectionSymbol] = connection;
+      } catch (error) {
+        debugLogger.log('server', `[${id}] connection error: ${error}`);
+        ws.close(1011, String(error));
+      }
     });
 
     return wsEndpoint;
@@ -143,7 +141,5 @@ export class WSServer {
     this._wsServer = undefined;
     this.server = undefined;
     debugLogger.log('server', 'closed server');
-
-    await this._delegate.onClose?.();
   }
 }
diff --git a/packages/playwright-core/src/utils/zipFile.ts b/packages/playwright-core/src/server/utils/zipFile.ts
similarity index 95%
rename from packages/playwright-core/src/utils/zipFile.ts
rename to packages/playwright-core/src/server/utils/zipFile.ts
index 3ae68b16503e9..43b5a3430c7d1 100644
--- a/packages/playwright-core/src/utils/zipFile.ts
+++ b/packages/playwright-core/src/server/utils/zipFile.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import { yauzl } from '../zipBundle';
-import type { UnzipFile, Entry } from '../zipBundle';
+import { yauzl } from '../../zipBundle';
+
+import type { Entry, UnzipFile } from '../../zipBundle';
 
 export class ZipFile {
   private _fileName: string;
diff --git a/packages/playwright-core/src/server/utils/zones.ts b/packages/playwright-core/src/server/utils/zones.ts
new file mode 100644
index 0000000000000..b5860167b0696
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/zones.ts
@@ -0,0 +1,55 @@
+/**
+ * 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 { AsyncLocalStorage } from 'async_hooks';
+
+export type ZoneType = 'apiZone' | 'stepZone';
+
+const asyncLocalStorage = new AsyncLocalStorage<Zone | undefined>();
+
+export class Zone {
+  private readonly _asyncLocalStorage: AsyncLocalStorage<Zone | undefined>;
+  private readonly _data: ReadonlyMap<ZoneType, unknown>;
+
+  constructor(asyncLocalStorage: AsyncLocalStorage<Zone | undefined>, store: Map<ZoneType, unknown>) {
+    this._asyncLocalStorage = asyncLocalStorage;
+    this._data = store;
+  }
+
+  with(type: ZoneType, data: unknown): Zone {
+    return new Zone(this._asyncLocalStorage, new Map(this._data).set(type, data));
+  }
+
+  without(type?: ZoneType): Zone {
+    const data = type ? new Map(this._data) : new Map();
+    data.delete(type);
+    return new Zone(this._asyncLocalStorage, data);
+  }
+
+  run<R>(func: () => R): R {
+    return this._asyncLocalStorage.run(this, func);
+  }
+
+  data<T>(type: ZoneType): T | undefined {
+    return this._data.get(type) as T | undefined;
+  }
+}
+
+export const emptyZone = new Zone(asyncLocalStorage, new Map());
+
+export function currentZone(): Zone {
+  return asyncLocalStorage.getStore() ?? emptyZone;
+}
diff --git a/packages/playwright-core/src/server/webkit/protocol.d.ts b/packages/playwright-core/src/server/webkit/protocol.d.ts
index 9e71534a17171..7356b36e47a9f 100644
--- a/packages/playwright-core/src/server/webkit/protocol.d.ts
+++ b/packages/playwright-core/src/server/webkit/protocol.d.ts
@@ -26,7 +26,6 @@ export module Protocol {
        * Equal to the corresponding `transition-property` CSS property. Should not be provided if `animationName` is also provided.
        */
       cssTransitionProperty?: string;
-      effect?: Effect;
       /**
        * Backtrace that was captured when this `WebAnimation` was created.
        */
@@ -104,10 +103,6 @@ export module Protocol {
      */
     export type effectChangedPayload = {
       animationId: AnimationId;
-      /**
-       * This is omitted when the effect is removed without a replacement.
-       */
-      effect?: Effect;
     }
     /**
      * Dispatched whenever the target of any effect of any animation is changed in any way.
@@ -155,6 +150,18 @@ export module Protocol {
     }
     export type disableReturnValue = {
     }
+    /**
+     * Gets the `Effect` for the animation with the given `AnimationId`.
+     */
+    export type requestEffectParameters = {
+      animationId: AnimationId;
+    }
+    export type requestEffectReturnValue = {
+      /**
+       * This is omitted when there is no effect.
+       */
+      effect?: Effect;
+    }
     /**
      * Gets the `DOM.NodeId` for the target of the effect of the animation with the given `AnimationId`.
      */
@@ -193,142 +200,6 @@ export module Protocol {
     }
   }
   
-  export module ApplicationCache {
-    /**
-     * Detailed application cache resource information.
-     */
-    export interface ApplicationCacheResource {
-      /**
-       * Resource url.
-       */
-      url: string;
-      /**
-       * Resource size.
-       */
-      size: number;
-      /**
-       * Resource type.
-       */
-      type: string;
-    }
-    /**
-     * Detailed application cache information.
-     */
-    export interface ApplicationCache {
-      /**
-       * Manifest URL.
-       */
-      manifestURL: string;
-      /**
-       * Application cache size.
-       */
-      size: number;
-      /**
-       * Application cache creation time.
-       */
-      creationTime: number;
-      /**
-       * Application cache update time.
-       */
-      updateTime: number;
-      /**
-       * Application cache resources.
-       */
-      resources: ApplicationCacheResource[];
-    }
-    /**
-     * Frame identifier - manifest URL pair.
-     */
-    export interface FrameWithManifest {
-      /**
-       * Frame identifier.
-       */
-      frameId: Network.FrameId;
-      /**
-       * Manifest URL.
-       */
-      manifestURL: string;
-      /**
-       * Application cache status.
-       */
-      status: number;
-    }
-    
-    export type applicationCacheStatusUpdatedPayload = {
-      /**
-       * Identifier of the frame containing document whose application cache updated status.
-       */
-      frameId: Network.FrameId;
-      /**
-       * Manifest URL.
-       */
-      manifestURL: string;
-      /**
-       * Updated application cache status.
-       */
-      status: number;
-    }
-    export type networkStateUpdatedPayload = {
-      isNowOnline: boolean;
-    }
-    
-    /**
-     * Returns array of frame identifiers with manifest urls for each frame containing a document associated with some application cache.
-     */
-    export type getFramesWithManifestsParameters = {
-    }
-    export type getFramesWithManifestsReturnValue = {
-      /**
-       * Array of frame identifiers with manifest urls for each frame containing a document associated with some application cache.
-       */
-      frameIds: FrameWithManifest[];
-    }
-    /**
-     * Enables application cache domain notifications.
-     */
-    export type enableParameters = {
-    }
-    export type enableReturnValue = {
-    }
-    /**
-     * Disable application cache domain notifications.
-     */
-    export type disableParameters = {
-    }
-    export type disableReturnValue = {
-    }
-    /**
-     * Returns manifest URL for document in the given frame.
-     */
-    export type getManifestForFrameParameters = {
-      /**
-       * Identifier of the frame containing document whose manifest is retrieved.
-       */
-      frameId: Network.FrameId;
-    }
-    export type getManifestForFrameReturnValue = {
-      /**
-       * Manifest URL for document in the given frame.
-       */
-      manifestURL: string;
-    }
-    /**
-     * Returns relevant application cache data for the document in given frame.
-     */
-    export type getApplicationCacheForFrameParameters = {
-      /**
-       * Identifier of the frame containing document whose application cache is retrieved.
-       */
-      frameId: Network.FrameId;
-    }
-    export type getApplicationCacheForFrameReturnValue = {
-      /**
-       * Relevant application cache data for the document in given frame.
-       */
-      applicationCache: ApplicationCache;
-    }
-  }
-  
   export module Audit {
     
     
@@ -536,7 +407,7 @@ export module Protocol {
     /**
      * Pseudo-style identifier (see <code>enum PseudoId</code> in <code>RenderStyleConstants.h</code>).
      */
-    export type PseudoId = "first-line"|"first-letter"|"grammar-error"|"highlight"|"marker"|"before"|"after"|"selection"|"backdrop"|"spelling-error"|"view-transition"|"view-transition-group"|"view-transition-image-pair"|"view-transition-old"|"view-transition-new"|"-webkit-scrollbar"|"-webkit-resizer"|"-webkit-scrollbar-thumb"|"-webkit-scrollbar-button"|"-webkit-scrollbar-track"|"-webkit-scrollbar-track-piece"|"-webkit-scrollbar-corner";
+    export type PseudoId = "first-line"|"first-letter"|"grammar-error"|"highlight"|"marker"|"before"|"after"|"selection"|"backdrop"|"spelling-error"|"target-text"|"view-transition"|"view-transition-group"|"view-transition-image-pair"|"view-transition-old"|"view-transition-new"|"-webkit-scrollbar"|"-webkit-resizer"|"-webkit-scrollbar-thumb"|"-webkit-scrollbar-button"|"-webkit-scrollbar-track"|"-webkit-scrollbar-track-piece"|"-webkit-scrollbar-corner";
     /**
      * Pseudo-style identifier (see <code>enum PseudoId</code> in <code>RenderStyleConstants.h</code>).
      */
@@ -861,9 +732,9 @@ export module Protocol {
      */
     export interface Grouping {
       /**
-       * Source of the media query: "media-rule" if specified by a @media rule, "media-import-rule" if specified by an @import rule, "media-link-node" if specified by a "media" attribute in a linked style sheet's LINK tag, "media-style-node" if specified by a "media" attribute in an inline style sheet's STYLE tag, "supports-rule" if specified by an @supports rule, "layer-rule" if specified by an @layer rule, "container-rule" if specified by an @container rule, "style-rule" if specified by a CSSStyleRule containing the rule inside this grouping.
+       * Source of the media query: "media-rule" if specified by a @media rule, "media-import-rule" if specified by an @import rule, "media-link-node" if specified by a "media" attribute in a linked style sheet's LINK tag, "media-style-node" if specified by a "media" attribute in an inline style sheet's STYLE tag, "supports-rule" if specified by an @supports rule, "layer-rule" if specified by an @layer rule, "container-rule" if specified by an @container rule, "scope-rule" if specified by a @scope rule, "starting-style-rule" if specified by a @starting-style rule, "style-rule" if specified by a CSSStyleRule containing the rule inside this grouping.
        */
-      type: "media-rule"|"media-import-rule"|"media-link-node"|"media-style-node"|"supports-rule"|"layer-rule"|"layer-import-rule"|"container-rule"|"style-rule";
+      type: "media-rule"|"media-import-rule"|"media-link-node"|"media-style-node"|"supports-rule"|"layer-rule"|"layer-import-rule"|"container-rule"|"scope-rule"|"starting-style-rule"|"style-rule";
       /**
        * The CSS rule identifier for the `@rule` (absent for non-editable grouping rules) or the nesting parent style rule's selector. In CSSOM terms, this is the parent rule of either the previous Grouping for a CSSRule, or of a CSSRule itself.
        */
@@ -930,7 +801,7 @@ export module Protocol {
     /**
      * Relevant layout information about the node. Things not in this list are not important to Web Inspector.
      */
-    export type LayoutFlag = "rendered"|"scrollable"|"flex"|"grid"|"event";
+    export type LayoutFlag = "rendered"|"scrollable"|"flex"|"grid"|"event"|"slot-assigned"|"slot-filled";
     /**
      * The mode for how layout context type changes are handled (default: <code>Observed</code>). <code>Observed</code> limits handling to those nodes already known to the frontend by other means (generally, this means the node is a visible item in the Elements tab). <code>All</code> informs the frontend of all layout context type changes and all nodes with a known layout context are sent to the frontend.
      */
@@ -1565,7 +1436,7 @@ export module Protocol {
     /**
      * Channels for different types of log messages.
      */
-    export type ChannelSource = "xml"|"javascript"|"network"|"console-api"|"storage"|"appcache"|"rendering"|"css"|"security"|"content-blocker"|"media"|"mediasource"|"webrtc"|"itp-debug"|"private-click-measurement"|"payment-request"|"other";
+    export type ChannelSource = "xml"|"javascript"|"network"|"console-api"|"storage"|"rendering"|"css"|"accessibility"|"security"|"content-blocker"|"media"|"mediasource"|"webrtc"|"itp-debug"|"private-click-measurement"|"payment-request"|"other";
     /**
      * Level of logging.
      */
@@ -2300,6 +2171,8 @@ export module Protocol {
        * The native width of the video track in CSS pixels
        */
       width: number;
+      spatialVideoMetadata?: SpatialVideoMetadata;
+      videoProjectionMetadata?: VideoProjectionMetadata;
     }
     /**
      * WebCodecs VideoColorSpace
@@ -2339,26 +2212,41 @@ export module Protocol {
        */
       totalVideoFrames: number;
     }
-    export interface ViewportSize {
-      width: number;
-      height: number;
-    }
     /**
-     * Data to construct File object.
+     * A structure containing metadata describing spatial video properties.
      */
-    export interface FilePayload {
+    export interface SpatialVideoMetadata {
+      width: number;
+      height: number;
       /**
-       * File name.
+       * The horizontal field-of-view measurement, in degrees
        */
-      name: string;
+      horizontalFOVDegrees: number;
       /**
-       * File type.
+       * The distance between the centers of the lenses in a camera system, in micrometers
        */
-      type: string;
+      baseline: number;
       /**
-       * Base64-encoded file data.
+       * The relative shift of the left and right eye images, as a percentage.
        */
-      data: string;
+      disparityAdjustment: number;
+    }
+    /**
+     * Video Projection Metadata Kind.
+     */
+    export type VideoProjectionMetadataKind = "unknown"|"equirectangular"|"half-equirectangular"|"equi-angular-cubemap"|"parametric"|"pyramid"|"apple-immersive-video";
+    /**
+     * A structure containing metadata describing video projections.
+     */
+    export interface VideoProjectionMetadata {
+      /**
+       * The kind of video projection.
+       */
+      kind: VideoProjectionMetadataKind;
+    }
+    export interface ViewportSize {
+      width: number;
+      height: number;
     }
     
     /**
@@ -2618,6 +2506,27 @@ export module Protocol {
     }
     export type requestChildNodesReturnValue = {
     }
+    /**
+     * Requests the <code>HTMLSlotElement</code> that the node with the given id is assigned to.
+     */
+    export type requestAssignedSlotParameters = {
+      nodeId: NodeId;
+    }
+    export type requestAssignedSlotReturnValue = {
+      /**
+       * Not provided if the given node is not assigned to a <code>HTMLSlotElement</code>.
+       */
+      slotElementId?: NodeId;
+    }
+    /**
+     * Requests the list of assigned nodes for the <code>HTMLSlotElement</code> with the given id.
+     */
+    export type requestAssignedNodesParameters = {
+      slotElementId: NodeId;
+    }
+    export type requestAssignedNodesReturnValue = {
+      assignedNodeIds: NodeId[];
+    }
     /**
      * Executes <code>querySelector</code> on a given node.
      */
@@ -3422,14 +3331,10 @@ might return multiple quads for inline nodes.
        * Input element handle.
        */
       objectId: Runtime.RemoteObjectId;
-      /**
-       * Files to set
-       */
-      files?: FilePayload[];
       /**
        * File paths to set
        */
-      paths?: string[];
+      paths: string[];
     }
     export type setInputFilesReturnValue = {
     }
@@ -3644,81 +3549,6 @@ might return multiple quads for inline nodes.
     }
   }
   
-  export module Database {
-    /**
-     * Unique identifier of Database object.
-     */
-    export type DatabaseId = string;
-    /**
-     * Database object.
-     */
-    export interface Database {
-      /**
-       * Database ID.
-       */
-      id: DatabaseId;
-      /**
-       * Database domain.
-       */
-      domain: string;
-      /**
-       * Database name.
-       */
-      name: string;
-      /**
-       * Database version.
-       */
-      version: string;
-    }
-    /**
-     * Database error.
-     */
-    export interface Error {
-      /**
-       * Error message.
-       */
-      message: string;
-      /**
-       * Error code.
-       */
-      code: number;
-    }
-    
-    export type addDatabasePayload = {
-      database: Database;
-    }
-    
-    /**
-     * Enables database tracking, database events will now be delivered to the client.
-     */
-    export type enableParameters = {
-    }
-    export type enableReturnValue = {
-    }
-    /**
-     * Disables database tracking, prevents database events from being sent to the client.
-     */
-    export type disableParameters = {
-    }
-    export type disableReturnValue = {
-    }
-    export type getDatabaseTableNamesParameters = {
-      databaseId: DatabaseId;
-    }
-    export type getDatabaseTableNamesReturnValue = {
-      tableNames: string[];
-    }
-    export type executeSQLParameters = {
-      databaseId: DatabaseId;
-      query: string;
-    }
-    export type executeSQLReturnValue = {
-      columnNames?: string[];
-      values?: any[];
-      sqlError?: Error;
-    }
-  }
-  
   /**
    * Debugger domain exposes JavaScript debugging capabilities. It allows setting and removing breakpoints, stepping through execution, exploring stack traces, etc.
    */
@@ -4452,19 +4282,23 @@ might return multiple quads for inline nodes.
       savedResultIndex?: number;
     }
     /**
-     * Sets whether the given URL should be in the list of blackboxed scripts, which are ignored when pausing/stepping/debugging.
+     * Sets whether the given URL should be in the list of blackboxed scripts, which are ignored when pausing.
      */
     export type setShouldBlackboxURLParameters = {
       url: string;
       shouldBlackbox: boolean;
       /**
-       * If true, <code>url</code> is case sensitive.
+       * If <code>true</code>, <code>url</code> is case sensitive. Defaults to true.
        */
       caseSensitive?: boolean;
       /**
-       * If true, treat <code>url</code> as regular expression.
+       * If <code>true</code>, treat <code>url</code> as regular expression. Defaults to false.
        */
       isRegex?: boolean;
+      /**
+       * If provided, limits where in the script the debugger will skip pauses. Expected structure is a repeated <code>[startLine, startColumn, endLine, endColumn]</code>. Ignored if <code>shouldBlackbox</code> is <code>false</code>.
+       */
+      sourceRanges?: number[];
     }
     export type setShouldBlackboxURLReturnValue = {
     }
@@ -6506,7 +6340,7 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     /**
      * List of settings able to be overridden by WebInspector.
      */
-    export type Setting = "PrivateClickMeasurementDebugModeEnabled"|"AuthorAndUserStylesEnabled"|"ICECandidateFilteringEnabled"|"ITPDebugModeEnabled"|"ImagesEnabled"|"MediaCaptureRequiresSecureConnection"|"MockCaptureDevicesEnabled"|"NeedsSiteSpecificQuirks"|"ScriptEnabled"|"ShowDebugBorders"|"ShowRepaintCounter"|"WebSecurityEnabled"|"DeviceOrientationEventEnabled"|"SpeechRecognitionEnabled"|"PointerLockEnabled"|"NotificationsEnabled"|"FullScreenEnabled"|"InputTypeMonthEnabled"|"InputTypeWeekEnabled";
+    export type Setting = "PrivateClickMeasurementDebugModeEnabled"|"AuthorAndUserStylesEnabled"|"ICECandidateFilteringEnabled"|"ITPDebugModeEnabled"|"ImagesEnabled"|"MediaCaptureRequiresSecureConnection"|"MockCaptureDevicesEnabled"|"NeedsSiteSpecificQuirks"|"ScriptEnabled"|"ShowDebugBorders"|"ShowRepaintCounter"|"WebSecurityEnabled"|"DeviceOrientationEventEnabled"|"SpeechRecognitionEnabled"|"PointerLockEnabled"|"NotificationsEnabled"|"FullScreenEnabled"|"InputTypeMonthEnabled"|"InputTypeWeekEnabled"|"FixedBackgroundsPaintRelativeToDocument";
     /**
      * A user preference that can be overriden by Web Inspector, like an accessibility preference.
      */
@@ -6685,6 +6519,10 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
        * Cookie Same-Site policy.
        */
       sameSite: CookieSameSitePolicy;
+      /**
+       * Cookie partition key. If null and partitioned property is true, then key must be computed.
+       */
+      partitionKey?: string;
     }
     /**
      * Accessibility Node
@@ -7069,6 +6907,10 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
      */
     export type setCookieParameters = {
       cookie: Cookie;
+      /**
+       * If true, then cookie's partition key should be set.
+       */
+      shouldPartition?: boolean;
     }
     export type setCookieReturnValue = {
     }
@@ -7650,6 +7492,10 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
        * Proxy bypass list, similar to the one passed to --proxy-bypass-list
        */
       proxyBypassList?: string;
+      /**
+       * Wether to use storage partitioning. Be default Playwright disables the partitioning.
+       */
+      enableStoragePartitioning?: boolean;
     }
     export type createContextReturnValue = {
       /**
@@ -7769,6 +7615,18 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     }
     export type setIgnoreCertificateErrorsReturnValue = {
     }
+    /**
+     * Changes page zoom factor.
+     */
+    export type setPageZoomFactorParameters = {
+      /**
+       * Unique identifier of the page proxy.
+       */
+      pageProxyId: PageProxyID;
+      zoomFactor: number;
+    }
+    export type setPageZoomFactorReturnValue = {
+    }
     /**
      * Returns all cookies in the given browser context.
      */
@@ -9261,8 +9119,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "Animation.trackingStart": Animation.trackingStartPayload;
     "Animation.trackingUpdate": Animation.trackingUpdatePayload;
     "Animation.trackingComplete": Animation.trackingCompletePayload;
-    "ApplicationCache.applicationCacheStatusUpdated": ApplicationCache.applicationCacheStatusUpdatedPayload;
-    "ApplicationCache.networkStateUpdated": ApplicationCache.networkStateUpdatedPayload;
     "Browser.extensionsEnabled": Browser.extensionsEnabledPayload;
     "Browser.extensionsDisabled": Browser.extensionsDisabledPayload;
     "CPUProfiler.trackingStart": CPUProfiler.trackingStartPayload;
@@ -9312,7 +9168,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "DOMStorage.domStorageItemRemoved": DOMStorage.domStorageItemRemovedPayload;
     "DOMStorage.domStorageItemAdded": DOMStorage.domStorageItemAddedPayload;
     "DOMStorage.domStorageItemUpdated": DOMStorage.domStorageItemUpdatedPayload;
-    "Database.addDatabase": Database.addDatabasePayload;
     "Debugger.globalObjectCleared": Debugger.globalObjectClearedPayload;
     "Debugger.scriptParsed": Debugger.scriptParsedPayload;
     "Debugger.scriptFailedToParse": Debugger.scriptFailedToParsePayload;
@@ -9390,15 +9245,11 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
   export interface CommandParameters {
     "Animation.enable": Animation.enableParameters;
     "Animation.disable": Animation.disableParameters;
+    "Animation.requestEffect": Animation.requestEffectParameters;
     "Animation.requestEffectTarget": Animation.requestEffectTargetParameters;
     "Animation.resolveAnimation": Animation.resolveAnimationParameters;
     "Animation.startTracking": Animation.startTrackingParameters;
     "Animation.stopTracking": Animation.stopTrackingParameters;
-    "ApplicationCache.getFramesWithManifests": ApplicationCache.getFramesWithManifestsParameters;
-    "ApplicationCache.enable": ApplicationCache.enableParameters;
-    "ApplicationCache.disable": ApplicationCache.disableParameters;
-    "ApplicationCache.getManifestForFrame": ApplicationCache.getManifestForFrameParameters;
-    "ApplicationCache.getApplicationCacheForFrame": ApplicationCache.getApplicationCacheForFrameParameters;
     "Audit.setup": Audit.setupParameters;
     "Audit.run": Audit.runParameters;
     "Audit.teardown": Audit.teardownParameters;
@@ -9446,6 +9297,8 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "Console.setLoggingChannelLevel": Console.setLoggingChannelLevelParameters;
     "DOM.getDocument": DOM.getDocumentParameters;
     "DOM.requestChildNodes": DOM.requestChildNodesParameters;
+    "DOM.requestAssignedSlot": DOM.requestAssignedSlotParameters;
+    "DOM.requestAssignedNodes": DOM.requestAssignedNodesParameters;
     "DOM.querySelector": DOM.querySelectorParameters;
     "DOM.querySelectorAll": DOM.querySelectorAllParameters;
     "DOM.setNodeName": DOM.setNodeNameParameters;
@@ -9508,10 +9361,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemParameters;
     "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemParameters;
     "DOMStorage.clearDOMStorageItems": DOMStorage.clearDOMStorageItemsParameters;
-    "Database.enable": Database.enableParameters;
-    "Database.disable": Database.disableParameters;
-    "Database.getDatabaseTableNames": Database.getDatabaseTableNamesParameters;
-    "Database.executeSQL": Database.executeSQLParameters;
     "Debugger.enable": Debugger.enableParameters;
     "Debugger.disable": Debugger.disableParameters;
     "Debugger.setAsyncStackTraceDepth": Debugger.setAsyncStackTraceDepthParameters;
@@ -9646,6 +9495,7 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "Playwright.grantFileReadAccess": Playwright.grantFileReadAccessParameters;
     "Playwright.takePageScreenshot": Playwright.takePageScreenshotParameters;
     "Playwright.setIgnoreCertificateErrors": Playwright.setIgnoreCertificateErrorsParameters;
+    "Playwright.setPageZoomFactor": Playwright.setPageZoomFactorParameters;
     "Playwright.getAllCookies": Playwright.getAllCookiesParameters;
     "Playwright.setCookies": Playwright.setCookiesParameters;
     "Playwright.deleteAllCookies": Playwright.deleteAllCookiesParameters;
@@ -9702,15 +9552,11 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
   export interface CommandReturnValues {
     "Animation.enable": Animation.enableReturnValue;
     "Animation.disable": Animation.disableReturnValue;
+    "Animation.requestEffect": Animation.requestEffectReturnValue;
     "Animation.requestEffectTarget": Animation.requestEffectTargetReturnValue;
     "Animation.resolveAnimation": Animation.resolveAnimationReturnValue;
     "Animation.startTracking": Animation.startTrackingReturnValue;
     "Animation.stopTracking": Animation.stopTrackingReturnValue;
-    "ApplicationCache.getFramesWithManifests": ApplicationCache.getFramesWithManifestsReturnValue;
-    "ApplicationCache.enable": ApplicationCache.enableReturnValue;
-    "ApplicationCache.disable": ApplicationCache.disableReturnValue;
-    "ApplicationCache.getManifestForFrame": ApplicationCache.getManifestForFrameReturnValue;
-    "ApplicationCache.getApplicationCacheForFrame": ApplicationCache.getApplicationCacheForFrameReturnValue;
     "Audit.setup": Audit.setupReturnValue;
     "Audit.run": Audit.runReturnValue;
     "Audit.teardown": Audit.teardownReturnValue;
@@ -9758,6 +9604,8 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "Console.setLoggingChannelLevel": Console.setLoggingChannelLevelReturnValue;
     "DOM.getDocument": DOM.getDocumentReturnValue;
     "DOM.requestChildNodes": DOM.requestChildNodesReturnValue;
+    "DOM.requestAssignedSlot": DOM.requestAssignedSlotReturnValue;
+    "DOM.requestAssignedNodes": DOM.requestAssignedNodesReturnValue;
     "DOM.querySelector": DOM.querySelectorReturnValue;
     "DOM.querySelectorAll": DOM.querySelectorAllReturnValue;
     "DOM.setNodeName": DOM.setNodeNameReturnValue;
@@ -9820,10 +9668,6 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemReturnValue;
     "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemReturnValue;
     "DOMStorage.clearDOMStorageItems": DOMStorage.clearDOMStorageItemsReturnValue;
-    "Database.enable": Database.enableReturnValue;
-    "Database.disable": Database.disableReturnValue;
-    "Database.getDatabaseTableNames": Database.getDatabaseTableNamesReturnValue;
-    "Database.executeSQL": Database.executeSQLReturnValue;
     "Debugger.enable": Debugger.enableReturnValue;
     "Debugger.disable": Debugger.disableReturnValue;
     "Debugger.setAsyncStackTraceDepth": Debugger.setAsyncStackTraceDepthReturnValue;
@@ -9958,6 +9802,7 @@ the top of the viewport and Y increases as it proceeds towards the bottom of the
     "Playwright.grantFileReadAccess": Playwright.grantFileReadAccessReturnValue;
     "Playwright.takePageScreenshot": Playwright.takePageScreenshotReturnValue;
     "Playwright.setIgnoreCertificateErrors": Playwright.setIgnoreCertificateErrorsReturnValue;
+    "Playwright.setPageZoomFactor": Playwright.setPageZoomFactorReturnValue;
     "Playwright.getAllCookies": Playwright.getAllCookiesReturnValue;
     "Playwright.setCookies": Playwright.setCookiesReturnValue;
     "Playwright.deleteAllCookies": Playwright.deleteAllCookiesReturnValue;
diff --git a/packages/playwright-core/src/server/webkit/webkit.ts b/packages/playwright-core/src/server/webkit/webkit.ts
index 33f4a68c208e7..27ae2a7a05f4c 100644
--- a/packages/playwright-core/src/server/webkit/webkit.ts
+++ b/packages/playwright-core/src/server/webkit/webkit.ts
@@ -15,45 +15,51 @@
  * limitations under the License.
  */
 
-import { WKBrowser } from '../webkit/wkBrowser';
-import type { Env } from '../../utils/processLauncher';
 import path from 'path';
+
 import { kBrowserCloseMessageId } from './wkConnection';
+import { wrapInASCIIBox } from '../utils/ascii';
 import { BrowserType, kNoXServerRunningError } from '../browserType';
-import type { ConnectionTransport } from '../transport';
+import { WKBrowser } from '../webkit/wkBrowser';
+
 import type { BrowserOptions } from '../browser';
-import type * as types from '../types';
-import { wrapInASCIIBox } from '../../utils';
 import type { SdkObject } from '../instrumentation';
+import type { Env } from '../utils/processLauncher';
 import type { ProtocolError } from '../protocolError';
+import type { ConnectionTransport } from '../transport';
+import type * as types from '../types';
 
 export class WebKit extends BrowserType {
   constructor(parent: SdkObject) {
     super(parent, 'webkit');
   }
 
-  _connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<WKBrowser> {
+  override connectToTransport(transport: ConnectionTransport, options: BrowserOptions): Promise<WKBrowser> {
     return WKBrowser.connect(this.attribution.playwright, transport, options);
   }
 
-  _amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[]): Env {
-    return { ...env, CURL_COOKIE_JAR_PATH: path.join(userDataDir, 'cookiejar.db') };
+  override amendEnvironment(env: Env, userDataDir: string, isPersistent: boolean): Env {
+    return {
+      ...env,
+      CURL_COOKIE_JAR_PATH: process.platform === 'win32' && isPersistent ? path.join(userDataDir, 'cookiejar.db') : undefined,
+    };
   }
 
-  _doRewriteStartupLog(error: ProtocolError): ProtocolError {
+  override doRewriteStartupLog(error: ProtocolError): ProtocolError {
     if (!error.logs)
       return error;
-    if (error.logs.includes('cannot open display'))
+    if (error.logs.includes('Failed to open display') || error.logs.includes('cannot open display'))
       error.logs = '\n' + wrapInASCIIBox(kNoXServerRunningError, 1);
     return error;
   }
 
-  _attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+  override attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void {
+    // Note that it's fine to reuse the transport, since our connection ignores kBrowserCloseMessageId.
     transport.send({ method: 'Playwright.close', params: {}, id: kBrowserCloseMessageId });
   }
 
-  _defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
-    const { args = [], proxy, headless } = options;
+  override defaultArgs(options: types.LaunchOptions, isPersistent: boolean, userDataDir: string): string[] {
+    const { args = [], headless } = options;
     const userDataDirArg = args.find(arg => arg.startsWith('--user-data-dir'));
     if (userDataDirArg)
       throw this._createUserDataDirArgMisuseError('--user-data-dir');
@@ -68,6 +74,7 @@ export class WebKit extends BrowserType {
       webkitArguments.push(`--user-data-dir=${userDataDir}`);
     else
       webkitArguments.push(`--no-startup-window`);
+    const proxy = options.proxyOverride || options.proxy;
     if (proxy) {
       if (process.platform === 'darwin') {
         webkitArguments.push(`--proxy=${proxy.server}`);
diff --git a/packages/playwright-core/src/server/webkit/wkAccessibility.ts b/packages/playwright-core/src/server/webkit/wkAccessibility.ts
index 80c855ea7b852..52b9199df55bc 100644
--- a/packages/playwright-core/src/server/webkit/wkAccessibility.ts
+++ b/packages/playwright-core/src/server/webkit/wkAccessibility.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import type * as accessibility from '../accessibility';
-import type { WKSession } from './wkConnection';
 import type { Protocol } from './protocol';
+import type { WKSession } from './wkConnection';
 import type * as dom from '../dom';
 import type * as channels from '@protocol/channels';
 
diff --git a/packages/playwright-core/src/server/webkit/wkBrowser.ts b/packages/playwright-core/src/server/webkit/wkBrowser.ts
index c94486a5c13bb..5ee778b8301ba 100644
--- a/packages/playwright-core/src/server/webkit/wkBrowser.ts
+++ b/packages/playwright-core/src/server/webkit/wkBrowser.ts
@@ -15,33 +15,31 @@
  * limitations under the License.
  */
 
-import type { BrowserOptions } from '../browser';
-import { Browser } from '../browser';
-import { assertBrowserContextIsNotOwned, BrowserContext, verifyGeolocation } from '../browserContext';
-import type { RegisteredListener } from '../../utils/eventsHelper';
 import { assert } from '../../utils';
-import { eventsHelper } from '../../utils/eventsHelper';
+import { Browser } from '../browser';
+import { BrowserContext, verifyGeolocation } from '../browserContext';
 import * as network from '../network';
-import type { InitScript, Page, PageBinding, PageDelegate } from '../page';
+import { WKConnection, WKSession, kPageProxyMessageReceived } from './wkConnection';
+import { WKPage } from './wkPage';
+import { TargetClosedError } from '../errors';
+
+import type { BrowserOptions } from '../browser';
+import type { SdkObject } from '../instrumentation';
+import type { InitScript, Page } from '../page';
 import type { ConnectionTransport } from '../transport';
 import type * as types from '../types';
-import type * as channels from '@protocol/channels';
 import type { Protocol } from './protocol';
 import type { PageProxyMessageReceivedPayload } from './wkConnection';
-import { kPageProxyMessageReceived, WKConnection, WKSession } from './wkConnection';
-import { WKPage } from './wkPage';
-import { TargetClosedError } from '../errors';
-import type { SdkObject } from '../instrumentation';
+import type * as channels from '@protocol/channels';
 
-const DEFAULT_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15';
-const BROWSER_VERSION = '18.0';
+const BROWSER_VERSION = '26.0';
+const DEFAULT_USER_AGENT = `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/${BROWSER_VERSION} Safari/605.1.15`;
 
 export class WKBrowser extends Browser {
   private readonly _connection: WKConnection;
   readonly _browserSession: WKSession;
   readonly _contexts = new Map<string, WKBrowserContext>();
   readonly _wkPages = new Map<string, WKPage>();
-  private readonly _eventListeners: RegisteredListener[];
 
   static async connect(parent: SdkObject, transport: ConnectionTransport, options: BrowserOptions): Promise<WKBrowser> {
     const browser = new WKBrowser(parent, transport, options);
@@ -63,17 +61,15 @@ export class WKBrowser extends Browser {
     super(parent, options);
     this._connection = new WKConnection(transport, this._onDisconnect.bind(this), options.protocolLogger, options.browserLogsCollector);
     this._browserSession = this._connection.browserSession;
-    this._eventListeners = [
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.pageProxyCreated', this._onPageProxyCreated.bind(this)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.pageProxyDestroyed', this._onPageProxyDestroyed.bind(this)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.provisionalLoadFailed', event => this._onProvisionalLoadFailed(event)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.windowOpen', event => this._onWindowOpen(event)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.downloadCreated', this._onDownloadCreated.bind(this)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.downloadFilenameSuggested', this._onDownloadFilenameSuggested.bind(this)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.downloadFinished', this._onDownloadFinished.bind(this)),
-      eventsHelper.addEventListener(this._browserSession, 'Playwright.screencastFinished', this._onScreencastFinished.bind(this)),
-      eventsHelper.addEventListener(this._browserSession, kPageProxyMessageReceived, this._onPageProxyMessageReceived.bind(this)),
-    ];
+    this._browserSession.on('Playwright.pageProxyCreated', this._onPageProxyCreated.bind(this));
+    this._browserSession.on('Playwright.pageProxyDestroyed', this._onPageProxyDestroyed.bind(this));
+    this._browserSession.on('Playwright.provisionalLoadFailed', event => this._onProvisionalLoadFailed(event));
+    this._browserSession.on('Playwright.windowOpen', event => this._onWindowOpen(event));
+    this._browserSession.on('Playwright.downloadCreated', this._onDownloadCreated.bind(this));
+    this._browserSession.on('Playwright.downloadFilenameSuggested', this._onDownloadFilenameSuggested.bind(this));
+    this._browserSession.on('Playwright.downloadFinished', this._onDownloadFinished.bind(this));
+    this._browserSession.on('Playwright.screencastFinished', this._onScreencastFinished.bind(this));
+    this._browserSession.on(kPageProxyMessageReceived, this._onPageProxyMessageReceived.bind(this));
   }
 
   _onDisconnect() {
@@ -86,12 +82,13 @@ export class WKBrowser extends Browser {
     this._didClose();
   }
 
-  async doCreateNewContext(options: channels.BrowserNewContextParams): Promise<BrowserContext> {
-    const createOptions = options.proxy ? {
-      // Enable socks5 hostname resolution on Windows. Workaround can be removed once fixed upstream.
+  async doCreateNewContext(options: types.BrowserContextOptions): Promise<BrowserContext> {
+    const proxy = options.proxyOverride || options.proxy;
+    const createOptions = proxy ? {
+      // Enable socks5 hostname resolution on Windows.
       // See https://github.com/microsoft/playwright/issues/20451
-      proxyServer: process.platform === 'win32' ? options.proxy.server.replace(/^socks5:\/\//, 'socks5h://') : options.proxy.server,
-      proxyBypassList: options.proxy.bypass
+      proxyServer: process.platform === 'win32' ? proxy.server.replace(/^socks5:\/\//, 'socks5h://') : proxy.server,
+      proxyBypassList: proxy.bypass
     } : undefined;
     const { browserContextId } = await this._browserSession.send('Playwright.createContext', createOptions);
     options.userAgent = options.userAgent || DEFAULT_USER_AGENT;
@@ -124,15 +121,15 @@ export class WKBrowser extends Browser {
     // TODO: this is racy, because download might be unrelated any navigation, and we will
     // abort navigation that is still running. We should be able to fix this by
     // instrumenting policy decision start/proceed/cancel.
-    page._page._frameManager.frameAbortedNavigation(payload.frameId, 'Download is starting');
-    let originPage = page._initializedPage;
+    page._page.frameManager.frameAbortedNavigation(payload.frameId, 'Download is starting');
+    let originPage = page._page.initializedOrUndefined();
     // If it's a new window download, report it on the opener page.
     if (!originPage) {
       // Resume the page creation with an error. The page will automatically close right
       // after the download begins.
       page._firstNonInitialNavigationCommittedReject(new Error('Starting new page download'));
       if (page._opener)
-        originPage = page._opener._initializedPage;
+        originPage = page._opener._page.initializedOrUndefined();
     }
     if (!originPage)
       return;
@@ -178,8 +175,8 @@ export class WKBrowser extends Browser {
     const wkPage = this._wkPages.get(pageProxyId);
     if (!wkPage)
       return;
-    wkPage.didClose();
     this._wkPages.delete(pageProxyId);
+    wkPage.didClose();
   }
 
   _onPageProxyMessageReceived(event: PageProxyMessageReceivedPayload) {
@@ -211,7 +208,7 @@ export class WKBrowser extends Browser {
 export class WKBrowserContext extends BrowserContext {
   declare readonly _browser: WKBrowser;
 
-  constructor(browser: WKBrowser, browserContextId: string | undefined, options: channels.BrowserNewContextParams) {
+  constructor(browser: WKBrowser, browserContextId: string | undefined, options: types.BrowserContextOptions) {
     super(browser, options, browserContextId);
     this._validateEmulatedViewport(options.viewport);
     this._authenticateProxyViaHeader();
@@ -226,14 +223,14 @@ export class WKBrowserContext extends BrowserContext {
       downloadPath: this._browser.options.downloadsPath,
       browserContextId
     }));
-    if (this._options.ignoreHTTPSErrors)
+    if (this._options.ignoreHTTPSErrors || this._options.internalIgnoreHTTPSErrors)
       promises.push(this._browser._browserSession.send('Playwright.setIgnoreCertificateErrors', { browserContextId, ignore: true }));
     if (this._options.locale)
       promises.push(this._browser._browserSession.send('Playwright.setLanguages', { browserContextId, languages: [this._options.locale] }));
     if (this._options.geolocation)
       promises.push(this.setGeolocation(this._options.geolocation));
     if (this._options.offline)
-      promises.push(this.setOffline(this._options.offline));
+      promises.push(this.doUpdateOffline());
     if (this._options.httpCredentials)
       promises.push(this.setHTTPCredentials(this._options.httpCredentials));
     await Promise.all(promises);
@@ -243,32 +240,49 @@ export class WKBrowserContext extends BrowserContext {
     return Array.from(this._browser._wkPages.values()).filter(wkPage => wkPage._browserContext === this);
   }
 
-  pages(): Page[] {
-    return this._wkPages().map(wkPage => wkPage._initializedPage).filter(pageOrNull => !!pageOrNull) as Page[];
+  override possiblyUninitializedPages(): Page[] {
+    return this._wkPages().map(wkPage => wkPage._page);
   }
 
-  async newPageDelegate(): Promise<PageDelegate> {
-    assertBrowserContextIsNotOwned(this);
+  override async doCreateNewPage(): Promise<Page> {
     const { pageProxyId } = await this._browser._browserSession.send('Playwright.createPage', { browserContextId: this._browserContextId });
-    return this._browser._wkPages.get(pageProxyId)!;
+    return this._browser._wkPages.get(pageProxyId)!._page;
   }
 
   async doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]> {
     const { cookies } = await this._browser._browserSession.send('Playwright.getAllCookies', { browserContextId: this._browserContextId });
     return network.filterCookies(cookies.map((c: channels.NetworkCookie) => {
-      const copy: any = { ... c };
-      copy.expires = c.expires === -1 ? -1 : c.expires / 1000;
-      delete copy.session;
-      return copy as channels.NetworkCookie;
+      const { name, value, domain, path, expires, httpOnly, secure, sameSite } = c;
+      const copy: channels.NetworkCookie = {
+        name,
+        value,
+        domain,
+        path,
+        expires: expires === -1 ? -1 : expires / 1000,
+        httpOnly,
+        secure,
+        sameSite,
+      };
+      return copy;
     }), urls);
   }
 
   async addCookies(cookies: channels.SetNetworkCookie[]) {
-    const cc = network.rewriteCookies(cookies).map(c => ({
-      ...c,
-      session: c.expires === -1 || c.expires === undefined,
-      expires: c.expires && c.expires !== -1 ? c.expires * 1000 : c.expires,
-    })) as Protocol.Playwright.SetCookieParam[];
+    const cc = network.rewriteCookies(cookies).map(c => {
+      const { name, value, domain, path, expires, httpOnly, secure, sameSite } = c;
+      const copy: Protocol.Playwright.SetCookieParam = {
+        name,
+        value,
+        domain: domain!,
+        path: path!,
+        expires: expires && expires !== -1 ? expires * 1000 : expires,
+        httpOnly,
+        secure,
+        sameSite,
+        session: expires === -1 || expires === undefined,
+      };
+      return copy;
+    });
     await this._browser._browserSession.send('Playwright.setCookies', { cookies: cc, browserContextId: this._browserContextId });
   }
 
@@ -277,11 +291,11 @@ export class WKBrowserContext extends BrowserContext {
   }
 
   async doGrantPermissions(origin: string, permissions: string[]) {
-    await Promise.all(this.pages().map(page => (page._delegate as WKPage)._grantPermissions(origin, permissions)));
+    await Promise.all(this.pages().map(page => (page.delegate as WKPage)._grantPermissions(origin, permissions)));
   }
 
   async doClearPermissions() {
-    await Promise.all(this.pages().map(page => (page._delegate as WKPage)._clearPermissions()));
+    await Promise.all(this.pages().map(page => (page.delegate as WKPage)._clearPermissions()));
   }
 
   async setGeolocation(geolocation?: types.Geolocation): Promise<void> {
@@ -291,53 +305,54 @@ export class WKBrowserContext extends BrowserContext {
     await this._browser._browserSession.send('Playwright.setGeolocationOverride', { browserContextId: this._browserContextId, geolocation: payload });
   }
 
-  async setExtraHTTPHeaders(headers: types.HeadersArray): Promise<void> {
-    this._options.extraHTTPHeaders = headers;
+  async doUpdateExtraHTTPHeaders(): Promise<void> {
     for (const page of this.pages())
-      await (page._delegate as WKPage).updateExtraHTTPHeaders();
+      await (page.delegate as WKPage).updateExtraHTTPHeaders();
   }
 
   async setUserAgent(userAgent: string | undefined): Promise<void> {
     this._options.userAgent = userAgent;
     for (const page of this.pages())
-      await (page._delegate as WKPage).updateUserAgent();
+      await (page.delegate as WKPage).updateUserAgent();
   }
 
-  async setOffline(offline: boolean): Promise<void> {
-    this._options.offline = offline;
+  async doUpdateOffline(): Promise<void> {
     for (const page of this.pages())
-      await (page._delegate as WKPage).updateOffline();
+      await (page.delegate as WKPage).updateOffline();
   }
 
   async doSetHTTPCredentials(httpCredentials?: types.Credentials): Promise<void> {
     this._options.httpCredentials = httpCredentials;
     for (const page of this.pages())
-      await (page._delegate as WKPage).updateHttpCredentials();
+      await (page.delegate as WKPage).updateHttpCredentials();
   }
 
   async doAddInitScript(initScript: InitScript) {
     for (const page of this.pages())
-      await (page._delegate as WKPage)._updateBootstrapScript();
+      await (page.delegate as WKPage)._updateBootstrapScript();
   }
 
-  async doRemoveInitScripts() {
+  async doRemoveInitScripts(initScripts: InitScript[]) {
     for (const page of this.pages())
-      await (page._delegate as WKPage)._updateBootstrapScript();
+      await (page.delegate as WKPage)._updateBootstrapScript();
   }
 
-  async doExposeBinding(binding: PageBinding) {
+  async doUpdateRequestInterception(): Promise<void> {
     for (const page of this.pages())
-      await (page._delegate as WKPage).exposeBinding(binding);
+      await (page.delegate as WKPage).updateRequestInterception();
   }
 
-  async doRemoveExposedBindings() {
-    for (const page of this.pages())
-      await (page._delegate as WKPage).removeExposedBindings();
+  override async doUpdateDefaultViewport() {
+    // No-op, because each page resets its own viewport.
   }
 
-  async doUpdateRequestInterception(): Promise<void> {
+  override async doUpdateDefaultEmulatedMedia() {
+    // No-op, because each page resets its own color scheme.
+  }
+
+  override async doExposePlaywrightBinding() {
     for (const page of this.pages())
-      await (page._delegate as WKPage).updateRequestInterception();
+      await (page.delegate as WKPage).exposePlaywrightBinding();
   }
 
   onClosePersistent() {}
@@ -364,7 +379,7 @@ export class WKBrowserContext extends BrowserContext {
     await this._browser._browserSession.send('Playwright.cancelDownload', { uuid });
   }
 
-  _validateEmulatedViewport(viewportSize?: types.Size | null) {
+  _validateEmulatedViewport(viewportSize: types.Size | undefined) {
     if (!viewportSize)
       return;
     if (process.platform === 'win32' && this._browser.options.headful && (viewportSize.width < 250 || viewportSize.height < 240))
diff --git a/packages/playwright-core/src/server/webkit/wkConnection.ts b/packages/playwright-core/src/server/webkit/wkConnection.ts
index 403b32bbd6b6a..ada50a413b1ba 100644
--- a/packages/playwright-core/src/server/webkit/wkConnection.ts
+++ b/packages/playwright-core/src/server/webkit/wkConnection.ts
@@ -16,14 +16,17 @@
  */
 
 import { EventEmitter } from 'events';
+
 import { assert } from '../../utils';
+import { debugLogger } from '../utils/debugLogger';
+import { helper } from '../helper';
+import { ProtocolError } from '../protocolError';
+
 import type { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
 import type { Protocol } from './protocol';
-import type { RecentLogsCollector } from '../../utils/debugLogger';
-import { debugLogger } from '../../utils/debugLogger';
+import type { RecentLogsCollector } from '../utils/debugLogger';
 import type { ProtocolLogger } from '../types';
-import { helper } from '../helper';
-import { ProtocolError } from '../protocolError';
+
 
 // WKPlaywright uses this special id to issue Browser.close command which we
 // should ignore.
@@ -31,7 +34,7 @@ export const kBrowserCloseMessageId = -9999;
 
 // We emulate kPageProxyMessageReceived message to unify it with Browser.pageProxyCreated
 // and Browser.pageProxyDestroyed for easier management.
-export const kPageProxyMessageReceived = 'kPageProxyMessageReceived';
+export const kPageProxyMessageReceived = Symbol('kPageProxyMessageReceived');
 export type PageProxyMessageReceivedPayload = { pageProxyId: string, message: any };
 
 export class WKConnection {
diff --git a/packages/playwright-core/src/server/webkit/wkExecutionContext.ts b/packages/playwright-core/src/server/webkit/wkExecutionContext.ts
index 8d6bbff084e05..41ce8d2bc7e90 100644
--- a/packages/playwright-core/src/server/webkit/wkExecutionContext.ts
+++ b/packages/playwright-core/src/server/webkit/wkExecutionContext.ts
@@ -15,11 +15,14 @@
  * limitations under the License.
  */
 
-import type { WKSession } from './wkConnection';
-import type { Protocol } from './protocol';
 import * as js from '../javascript';
-import { parseEvaluationResultValue } from '../isomorphic/utilityScriptSerializers';
+import * as dom from '../dom';
 import { isSessionClosedError } from '../protocolError';
+import { assert } from '../../utils/isomorphic/assert';
+import { parseEvaluationResultValue } from '../../utils/isomorphic/utilityScriptSerializers';
+
+import type { Protocol } from './protocol';
+import type { WKSession } from './wkConnection';
 
 export class WKExecutionContext implements js.ExecutionContextDelegate {
   private readonly _session: WKSession;
@@ -45,7 +48,7 @@ export class WKExecutionContext implements js.ExecutionContextDelegate {
     }
   }
 
-  async rawEvaluateHandle(expression: string): Promise<js.ObjectId> {
+  async rawEvaluateHandle(context: js.ExecutionContext, expression: string): Promise<js.JSHandle> {
     try {
       const response = await this._session.send('Runtime.evaluate', {
         expression,
@@ -54,23 +57,13 @@ export class WKExecutionContext implements js.ExecutionContextDelegate {
       });
       if (response.wasThrown)
         throw new js.JavaScriptErrorInEvaluate(response.result.description);
-      return response.result.objectId!;
+      return createHandle(context, response.result);
     } catch (error) {
       throw rewriteError(error);
     }
   }
 
-  rawCallFunctionNoReply(func: Function, ...args: any[]) {
-    this._session.send('Runtime.callFunctionOn', {
-      functionDeclaration: func.toString(),
-      objectId: args.find(a => a instanceof js.JSHandle)!._objectId!,
-      arguments: args.map(a => a instanceof js.JSHandle ? { objectId: a._objectId } : { value: a }),
-      returnByValue: true,
-      emulateUserGesture: true
-    }).catch(() => {});
-  }
-
-  async evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: js.JSHandle<any>, values: any[], objectIds: string[]): Promise<any> {
+  async evaluateWithArguments(expression: string, returnByValue: boolean, utilityScript: js.JSHandle<any>, values: any[], handles: js.JSHandle[]): Promise<any> {
     try {
       const response = await this._session.send('Runtime.callFunctionOn', {
         functionDeclaration: expression,
@@ -78,7 +71,7 @@ export class WKExecutionContext implements js.ExecutionContextDelegate {
         arguments: [
           { objectId: utilityScript._objectId },
           ...values.map(value => ({ value })),
-          ...objectIds.map(objectId => ({ objectId })),
+          ...handles.map(handle => ({ objectId: handle._objectId! })),
         ],
         returnByValue,
         emulateUserGesture: true,
@@ -88,37 +81,30 @@ export class WKExecutionContext implements js.ExecutionContextDelegate {
         throw new js.JavaScriptErrorInEvaluate(response.result.description);
       if (returnByValue)
         return parseEvaluationResultValue(response.result.value);
-      return utilityScript._context.createHandle(response.result);
+      return createHandle(utilityScript._context, response.result);
     } catch (error) {
       throw rewriteError(error);
     }
   }
 
-  async getProperties(context: js.ExecutionContext, objectId: js.ObjectId): Promise<Map<string, js.JSHandle>> {
+  async getProperties(object: js.JSHandle): Promise<Map<string, js.JSHandle>> {
     const response = await this._session.send('Runtime.getProperties', {
-      objectId,
+      objectId: object._objectId!,
       ownProperties: true
     });
     const result = new Map();
     for (const property of response.properties) {
       if (!property.enumerable || !property.value)
         continue;
-      result.set(property.name, context.createHandle(property.value));
+      result.set(property.name, createHandle(object._context, property.value));
     }
     return result;
   }
 
-  createHandle(context: js.ExecutionContext, remoteObject: Protocol.Runtime.RemoteObject): js.JSHandle {
-    const isPromise = remoteObject.className === 'Promise';
-    return new js.JSHandle(context, isPromise ? 'promise' : remoteObject.subtype || remoteObject.type, renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
-  }
-
-  async releaseHandle(objectId: js.ObjectId): Promise<void> {
-    await this._session.send('Runtime.releaseObject', { objectId });
-  }
-
-  objectCount(objectId: js.ObjectId): Promise<number> {
-    throw new Error('Method not implemented in WebKit.');
+  async releaseHandle(handle: js.JSHandle): Promise<void> {
+    if (!handle._objectId)
+      return;
+    await this._session.send('Runtime.releaseObject', { objectId: handle._objectId });
   }
 }
 
@@ -129,6 +115,8 @@ function potentiallyUnserializableValue(remoteObject: Protocol.Runtime.RemoteObj
 }
 
 function rewriteError(error: Error): Error {
+  if (error.message.includes('Object has too long reference chain'))
+    throw new Error('Cannot serialize result: object reference chain is too long.');
   if (!js.isJavaScriptErrorInEvaluate(error) && !isSessionClosedError(error))
     return new Error('Execution context was destroyed, most likely because of a navigation.');
   return error;
@@ -150,3 +138,12 @@ function renderPreview(object: Protocol.Runtime.RemoteObject): string | undefine
     return js.sparseArrayToString(object.preview.properties!);
   return object.description;
 }
+
+export function createHandle(context: js.ExecutionContext, remoteObject: Protocol.Runtime.RemoteObject): js.JSHandle {
+  if (remoteObject.subtype === 'node') {
+    assert(context instanceof dom.FrameExecutionContext);
+    return new dom.ElementHandle(context as dom.FrameExecutionContext, remoteObject.objectId!);
+  }
+  const isPromise = remoteObject.className === 'Promise';
+  return new js.JSHandle(context, isPromise ? 'promise' : remoteObject.subtype || remoteObject.type, renderPreview(remoteObject), remoteObject.objectId, potentiallyUnserializableValue(remoteObject));
+}
diff --git a/packages/playwright-core/src/server/webkit/wkInput.ts b/packages/playwright-core/src/server/webkit/wkInput.ts
index 0732f246d1bff..3d1dffd1963e2 100644
--- a/packages/playwright-core/src/server/webkit/wkInput.ts
+++ b/packages/playwright-core/src/server/webkit/wkInput.ts
@@ -15,12 +15,14 @@
  * limitations under the License.
  */
 
+import { isString } from '../../utils';
 import * as input from '../input';
-import type * as types from '../types';
 import { macEditingCommands } from '../macEditingCommands';
+
+import type * as types from '../types';
 import type { WKSession } from './wkConnection';
-import { isString } from '../../utils';
 import type { Page } from '../page';
+import type { Progress } from '../progress';
 
 function toModifiersMask(modifiers: Set<types.KeyboardModifier>): number {
   // From Source/WebKit/Shared/WebEvent.h
@@ -59,18 +61,19 @@ export class RawKeyboardImpl implements input.RawKeyboard {
     this._session = session;
   }
 
-  async keydown(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number, autoRepeat: boolean, text: string | undefined): Promise<void> {
+  async keydown(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription, autoRepeat: boolean): Promise<void> {
     const parts = [];
     for (const modifier of (['Shift', 'Control', 'Alt', 'Meta']) as types.KeyboardModifier[]) {
       if (modifiers.has(modifier))
         parts.push(modifier);
     }
+    const { code, keyCode, key, text } = description;
     parts.push(code);
     const shortcut = parts.join('+');
     let commands = macEditingCommands[shortcut];
     if (isString(commands))
       commands = [commands];
-    await this._pageProxySession.send('Input.dispatchKeyEvent', {
+    await progress.race(this._pageProxySession.send('Input.dispatchKeyEvent', {
       type: 'keyDown',
       modifiers: toModifiersMask(modifiers),
       windowsVirtualKeyCode: keyCode,
@@ -80,23 +83,24 @@ export class RawKeyboardImpl implements input.RawKeyboard {
       unmodifiedText: text,
       autoRepeat,
       macCommands: commands,
-      isKeypad: location === input.keypadLocation
-    });
+      isKeypad: description.location === input.keypadLocation
+    }));
   }
 
-  async keyup(modifiers: Set<types.KeyboardModifier>, code: string, keyCode: number, keyCodeWithoutLocation: number, key: string, location: number): Promise<void> {
-    await this._pageProxySession.send('Input.dispatchKeyEvent', {
+  async keyup(progress: Progress, modifiers: Set<types.KeyboardModifier>, keyName: string, description: input.KeyDescription): Promise<void> {
+    const { code, key } = description;
+    await progress.race(this._pageProxySession.send('Input.dispatchKeyEvent', {
       type: 'keyUp',
       modifiers: toModifiersMask(modifiers),
       key,
-      windowsVirtualKeyCode: keyCode,
+      windowsVirtualKeyCode: description.keyCode,
       code,
-      isKeypad: location === input.keypadLocation
-    });
+      isKeypad: description.location === input.keypadLocation
+    }));
   }
 
-  async sendText(text: string): Promise<void> {
-    await this._session!.send('Page.insertText', { text });
+  async sendText(progress: Progress, text: string): Promise<void> {
+    await progress.race(this._session!.send('Page.insertText', { text }));
   }
 }
 
@@ -113,19 +117,19 @@ export class RawMouseImpl implements input.RawMouse {
     this._session = session;
   }
 
-  async move(x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
-    await this._pageProxySession.send('Input.dispatchMouseEvent', {
+  async move(progress: Progress, x: number, y: number, button: types.MouseButton | 'none', buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, forClick: boolean): Promise<void> {
+    await progress.race(this._pageProxySession.send('Input.dispatchMouseEvent', {
       type: 'move',
       button,
       buttons: toButtonsMask(buttons),
       x,
       y,
       modifiers: toModifiersMask(modifiers)
-    });
+    }));
   }
 
-  async down(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
-    await this._pageProxySession.send('Input.dispatchMouseEvent', {
+  async down(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+    await progress.race(this._pageProxySession.send('Input.dispatchMouseEvent', {
       type: 'down',
       button,
       buttons: toButtonsMask(buttons),
@@ -133,11 +137,11 @@ export class RawMouseImpl implements input.RawMouse {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
 
-  async up(x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
-    await this._pageProxySession.send('Input.dispatchMouseEvent', {
+  async up(progress: Progress, x: number, y: number, button: types.MouseButton, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, clickCount: number): Promise<void> {
+    await progress.race(this._pageProxySession.send('Input.dispatchMouseEvent', {
       type: 'up',
       button,
       buttons: toButtonsMask(buttons),
@@ -145,22 +149,22 @@ export class RawMouseImpl implements input.RawMouse {
       y,
       modifiers: toModifiersMask(modifiers),
       clickCount
-    });
+    }));
   }
 
-  async wheel(x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
-    if (this._page?._browserContext._options.isMobile)
+  async wheel(progress: Progress, x: number, y: number, buttons: Set<types.MouseButton>, modifiers: Set<types.KeyboardModifier>, deltaX: number, deltaY: number): Promise<void> {
+    if (this._page?.browserContext._options.isMobile)
       throw new Error('Mouse wheel is not supported in mobile WebKit');
     await this._session!.send('Page.updateScrollingState');
     // Wheel events hit the compositor first, so wait one frame for it to be synced.
-    await this._page!.mainFrame().evaluateExpression(`new Promise(requestAnimationFrame)`, { world: 'utility' });
-    await this._pageProxySession.send('Input.dispatchWheelEvent', {
+    await progress.race(this._page!.mainFrame().evaluateExpression(`new Promise(requestAnimationFrame)`, { world: 'utility' }));
+    await progress.race(this._pageProxySession.send('Input.dispatchWheelEvent', {
       x,
       y,
       deltaX,
       deltaY,
       modifiers: toModifiersMask(modifiers),
-    });
+    }));
   }
 
   setPage(page: Page) {
@@ -175,11 +179,11 @@ export class RawTouchscreenImpl implements input.RawTouchscreen {
     this._pageProxySession = session;
   }
 
-  async tap(x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
-    await this._pageProxySession.send('Input.dispatchTapEvent', {
+  async tap(progress: Progress, x: number, y: number, modifiers: Set<types.KeyboardModifier>) {
+    await progress.race(this._pageProxySession.send('Input.dispatchTapEvent', {
       x,
       y,
       modifiers: toModifiersMask(modifiers),
-    });
+    }));
   }
 }
diff --git a/packages/playwright-core/src/server/webkit/wkInterceptableRequest.ts b/packages/playwright-core/src/server/webkit/wkInterceptableRequest.ts
index a4501277891fe..e4cd9a78f0c76 100644
--- a/packages/playwright-core/src/server/webkit/wkInterceptableRequest.ts
+++ b/packages/playwright-core/src/server/webkit/wkInterceptableRequest.ts
@@ -15,12 +15,14 @@
  * limitations under the License.
  */
 
-import type * as frames from '../frames';
+import { assert, headersArrayToObject, headersObjectToArray } from '../../utils';
 import * as network from '../network';
+
+import type * as frames from '../frames';
 import type * as types from '../types';
 import type { Protocol } from './protocol';
 import type { WKSession } from './wkConnection';
-import { assert, headersObjectToArray, headersArrayToObject } from '../../utils';
+
 
 const errorReasons: { [reason: string]: Protocol.Network.ResourceErrorType } = {
   'aborted': 'Cancellation',
@@ -55,7 +57,7 @@ export class WKInterceptableRequest {
     this._wallTime = event.walltime * 1000;
     if (event.request.postData)
       postDataBuffer = Buffer.from(event.request.postData, 'base64');
-    this.request = new network.Request(frame._page._browserContext, frame, null, redirectedFrom?.request || null, documentId, event.request.url,
+    this.request = new network.Request(frame._page.browserContext, frame, null, redirectedFrom?.request || null, documentId, event.request.url,
         resourceType, event.request.method, postDataBuffer, headersObjectToArray(event.request.headers));
   }
 
@@ -141,7 +143,7 @@ export class WKRouteImpl implements network.RouteDelegate {
     });
   }
 
-  async continue(request: network.Request, overrides: types.NormalizedContinueOverrides) {
+  async continue(overrides: types.NormalizedContinueOverrides) {
     // In certain cases, protocol will return error if the request was already canceled
     // or the page was closed. We should tolerate these errors.
     await this._session.sendMayFail('Network.interceptWithRequest', {
diff --git a/packages/playwright-core/src/server/webkit/wkPage.ts b/packages/playwright-core/src/server/webkit/wkPage.ts
index d16d0139735e6..9e37f40ee823e 100644
--- a/packages/playwright-core/src/server/webkit/wkPage.ts
+++ b/packages/playwright-core/src/server/webkit/wkPage.ts
@@ -16,37 +16,39 @@
  */
 
 import path from 'path';
-import os from 'os';
+
+import { assert } from '../../utils';
+import { headersArrayToObject } from '../../utils/isomorphic/headers';
+import { createGuid } from '../utils/crypto';
+import { eventsHelper } from '../utils/eventsHelper';
+import { hostPlatform } from '../utils/hostPlatform';
+import { splitErrorMessage } from '../../utils/isomorphic/stackTrace';
 import { PNG, jpegjs } from '../../utilsBundle';
-import { splitErrorMessage } from '../../utils/stackTrace';
-import { assert, createGuid, debugAssert, headersArrayToObject } from '../../utils';
-import { hostPlatform } from '../../utils/hostPlatform';
-import type * as accessibility from '../accessibility';
+import { BrowserContext } from '../browserContext';
 import * as dialog from '../dialog';
 import * as dom from '../dom';
-import type * as frames from '../frames';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
+import { TargetClosedError } from '../errors';
 import { helper } from '../helper';
-import type { JSHandle } from '../javascript';
 import * as network from '../network';
-import type { InitScript, PageBinding, PageDelegate } from '../page';
-import { Page } from '../page';
-import type { Progress } from '../progress';
-import type * as types from '../types';
-import type { Protocol } from './protocol';
+import { Page, PageBinding } from '../page';
 import { getAccessibilityTree } from './wkAccessibility';
-import type { WKBrowserContext } from './wkBrowser';
 import { WKSession } from './wkConnection';
-import { WKExecutionContext } from './wkExecutionContext';
+import { createHandle, WKExecutionContext } from './wkExecutionContext';
 import { RawKeyboardImpl, RawMouseImpl, RawTouchscreenImpl } from './wkInput';
 import { WKInterceptableRequest, WKRouteImpl } from './wkInterceptableRequest';
 import { WKProvisionalPage } from './wkProvisionalPage';
 import { WKWorkers } from './wkWorkers';
-import { debugLogger } from '../../utils/debugLogger';
-import { ManualPromise } from '../../utils/manualPromise';
-import { BrowserContext } from '../browserContext';
-import { TargetClosedError } from '../errors';
+import { debugLogger } from '../utils/debugLogger';
+
+import type { Protocol } from './protocol';
+import type { WKBrowserContext } from './wkBrowser';
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type * as accessibility from '../accessibility';
+import type * as frames from '../frames';
+import type { JSHandle } from '../javascript';
+import type { InitScript, PageDelegate } from '../page';
+import type { Progress } from '../progress';
+import type * as types from '../types';
 
 const UTILITY_WORLD_NAME = '__playwright_utility_world__';
 
@@ -57,7 +59,6 @@ export class WKPage implements PageDelegate {
   _session: WKSession;
   private _provisionalPage: WKProvisionalPage | null = null;
   readonly _page: Page;
-  private readonly _pagePromise = new ManualPromise<Page | Error>();
   private readonly _pageProxySession: WKSession;
   readonly _opener: WKPage | null;
   private readonly _requestIdToRequest = new Map<string, WKInterceptableRequest>();
@@ -67,7 +68,6 @@ export class WKPage implements PageDelegate {
   private _sessionListeners: RegisteredListener[] = [];
   private _eventListeners: RegisteredListener[];
   readonly _browserContext: WKBrowserContext;
-  _initializedPage: Page | null = null;
   private _firstNonInitialNavigationCommittedPromise: Promise<void>;
   private _firstNonInitialNavigationCommittedFulfill = () => {};
   _firstNonInitialNavigationCommittedReject = (e: Error) => {};
@@ -104,20 +104,18 @@ export class WKPage implements PageDelegate {
       this._firstNonInitialNavigationCommittedFulfill = f;
       this._firstNonInitialNavigationCommittedReject = r;
     });
+    // Avoid unhandled rejection on disconnect in the middle of initialization.
+    this._firstNonInitialNavigationCommittedPromise.catch(() => {});
     if (opener && !browserContext._options.noDefaultViewport && opener._nextWindowOpenPopupFeatures) {
       const viewportSize = helper.getViewportSizeFromWindowFeatures(opener._nextWindowOpenPopupFeatures);
       opener._nextWindowOpenPopupFeatures = undefined;
       if (viewportSize)
-        this._page._emulatedSize = { viewport: viewportSize, screen: viewportSize };
+        this._page.setEmulatedSizeFromWindowOpen({ viewport: viewportSize, screen: viewportSize });
     }
   }
 
-  potentiallyUninitializedPage(): Page {
-    return this._page;
-  }
-
   private async _initializePageProxySession() {
-    if (this._page._browserContext.isSettingStorageState())
+    if (this._page.isStorageStatePage)
       return;
     const promises: Promise<any>[] = [
       this._pageProxySession.send('Dialog.enable'),
@@ -184,12 +182,14 @@ export class WKPage implements PageDelegate {
       session.send('Network.enable'),
       this._workers.initializeSession(session)
     ];
+    if (this._page.browserContext.needsPlaywrightBinding())
+      promises.push(session.send('Runtime.addBinding', { name: PageBinding.kBindingName }));
     if (this._page.needsRequestInterception()) {
       promises.push(session.send('Network.setInterceptionEnabled', { enabled: true }));
       promises.push(session.send('Network.setResourceCachingDisabled', { disabled: true }));
       promises.push(session.send('Network.addInterception', { url: '.*', stage: 'request', isRegex: true }));
     }
-    if (this._page._browserContext.isSettingStorageState()) {
+    if (this._page.isStorageStatePage) {
       await Promise.all(promises);
       return;
     }
@@ -198,10 +198,8 @@ export class WKPage implements PageDelegate {
     if (contextOptions.userAgent)
       promises.push(this.updateUserAgent());
     const emulatedMedia = this._page.emulatedMedia();
-    if (emulatedMedia.media || emulatedMedia.colorScheme || emulatedMedia.reducedMotion || emulatedMedia.forcedColors)
-      promises.push(WKPage._setEmulateMedia(session, emulatedMedia.media, emulatedMedia.colorScheme, emulatedMedia.reducedMotion, emulatedMedia.forcedColors));
-    for (const binding of this._page.allBindings())
-      promises.push(session.send('Runtime.addBinding', { name: binding.name }));
+    if (emulatedMedia.media || emulatedMedia.colorScheme || emulatedMedia.reducedMotion || emulatedMedia.forcedColors || emulatedMedia.contrast)
+      promises.push(WKPage._setEmulateMedia(session, emulatedMedia.media, emulatedMedia.colorScheme, emulatedMedia.reducedMotion, emulatedMedia.forcedColors, emulatedMedia.contrast));
     const bootstrapScript = this._calculateBootstrapScript();
     if (bootstrapScript.length)
       promises.push(session.send('Page.setBootstrapScript', { source: bootstrapScript }));
@@ -232,6 +230,7 @@ export class WKPage implements PageDelegate {
     promises.push(session.send('Page.overrideSetting', { setting: 'PointerLockEnabled', value: !contextOptions.isMobile }));
     promises.push(session.send('Page.overrideSetting', { setting: 'InputTypeMonthEnabled', value: contextOptions.isMobile }));
     promises.push(session.send('Page.overrideSetting', { setting: 'InputTypeWeekEnabled', value: contextOptions.isMobile }));
+    promises.push(session.send('Page.overrideSetting', { setting: 'FixedBackgroundsPaintRelativeToDocument', value: contextOptions.isMobile }));
     await Promise.all(promises);
   }
 
@@ -284,7 +283,7 @@ export class WKPage implements PageDelegate {
   }
 
   handleProvisionalLoadFailed(event: Protocol.Playwright.provisionalLoadFailedPayload) {
-    if (!this._initializedPage) {
+    if (!this._page.initializedOrUndefined()) {
       this._firstNonInitialNavigationCommittedReject(new Error('Initial load failed'));
       return;
     }
@@ -293,18 +292,13 @@ export class WKPage implements PageDelegate {
     let errorText = event.error;
     if (errorText.includes('cancelled'))
       errorText += '; maybe frame was detached?';
-    this._page._frameManager.frameAbortedNavigation(this._page.mainFrame()._id, errorText, event.loaderId);
+    this._page.frameManager.frameAbortedNavigation(this._page.mainFrame()._id, errorText, event.loaderId);
   }
 
   handleWindowOpen(event: Protocol.Playwright.windowOpenPayload) {
-    debugAssert(!this._nextWindowOpenPopupFeatures);
     this._nextWindowOpenPopupFeatures = event.windowFeatures;
   }
 
-  async pageOrError(): Promise<Page | Error> {
-    return this._pagePromise;
-  }
-
   private async _onTargetCreated(event: Protocol.Target.targetCreatedPayload) {
     const { targetInfo } = event;
     const session = new WKSession(this._pageProxySession.connection, targetInfo.targetId, (message: any) => {
@@ -317,7 +311,7 @@ export class WKPage implements PageDelegate {
     assert(targetInfo.type === 'page', 'Only page targets are expected in WebKit, received: ' + targetInfo.type);
 
     if (!targetInfo.isProvisional) {
-      assert(!this._initializedPage);
+      assert(!this._page.initializedOrUndefined());
       let pageOrError: Page | Error;
       try {
         this._setSession(session);
@@ -329,6 +323,7 @@ export class WKPage implements PageDelegate {
       } catch (e) {
         pageOrError = e;
       }
+
       if (targetInfo.isPaused)
         this._pageProxySession.sendMayFail('Target.resume', { targetId: targetInfo.targetId });
       if ((pageOrError instanceof Page) && this._page.mainFrame().url() === '') {
@@ -340,16 +335,8 @@ export class WKPage implements PageDelegate {
         } catch (e) {
           pageOrError = e;
         }
-      } else {
-        // Avoid rejection on disconnect.
-        this._firstNonInitialNavigationCommittedPromise.catch(() => {});
       }
-      await this._page.initOpener(this._opener);
-      // Note: it is important to call |reportAsNew| before resolving pageOrError promise,
-      // so that anyone who awaits pageOrError got a ready and reported page.
-      this._initializedPage = pageOrError instanceof Page ? pageOrError : null;
-      this._page.reportAsNew(pageOrError instanceof Page ? undefined : pageOrError);
-      this._pagePromise.resolve(pageOrError);
+      this._page.reportAsNew(this._opener?._page, pageOrError instanceof Page ? undefined : pageOrError);
     } else {
       assert(targetInfo.isProvisional);
       assert(!this._provisionalPage);
@@ -381,8 +368,8 @@ export class WKPage implements PageDelegate {
       eventsHelper.addEventListener(this._session, 'Page.willCheckNavigationPolicy', event => this._onWillCheckNavigationPolicy(event.frameId)),
       eventsHelper.addEventListener(this._session, 'Page.didCheckNavigationPolicy', event => this._onDidCheckNavigationPolicy(event.frameId, event.cancel)),
       eventsHelper.addEventListener(this._session, 'Page.frameScheduledNavigation', event => this._onFrameScheduledNavigation(event.frameId, event.delay, event.targetIsCurrentFrame)),
-      eventsHelper.addEventListener(this._session, 'Page.loadEventFired', event => this._page._frameManager.frameLifecycleEvent(event.frameId, 'load')),
-      eventsHelper.addEventListener(this._session, 'Page.domContentEventFired', event => this._page._frameManager.frameLifecycleEvent(event.frameId, 'domcontentloaded')),
+      eventsHelper.addEventListener(this._session, 'Page.loadEventFired', event => this._page.frameManager.frameLifecycleEvent(event.frameId, 'load')),
+      eventsHelper.addEventListener(this._session, 'Page.domContentEventFired', event => this._page.frameManager.frameLifecycleEvent(event.frameId, 'domcontentloaded')),
       eventsHelper.addEventListener(this._session, 'Runtime.executionContextCreated', event => this._onExecutionContextCreated(event.context)),
       eventsHelper.addEventListener(this._session, 'Runtime.bindingCalled', event => this._onBindingCalled(event.contextId, event.argument)),
       eventsHelper.addEventListener(this._session, 'Console.messageAdded', event => this._onConsoleMessage(event)),
@@ -394,13 +381,13 @@ export class WKPage implements PageDelegate {
       eventsHelper.addEventListener(this._session, 'Network.responseReceived', e => this._onResponseReceived(this._session, e)),
       eventsHelper.addEventListener(this._session, 'Network.loadingFinished', e => this._onLoadingFinished(e)),
       eventsHelper.addEventListener(this._session, 'Network.loadingFailed', e => this._onLoadingFailed(this._session, e)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketCreated', e => this._page._frameManager.onWebSocketCreated(e.requestId, e.url)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketWillSendHandshakeRequest', e => this._page._frameManager.onWebSocketRequest(e.requestId)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketHandshakeResponseReceived', e => this._page._frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketFrameSent', e => e.response.payloadData && this._page._frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketFrameReceived', e => e.response.payloadData && this._page._frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketClosed', e => this._page._frameManager.webSocketClosed(e.requestId)),
-      eventsHelper.addEventListener(this._session, 'Network.webSocketFrameError', e => this._page._frameManager.webSocketError(e.requestId, e.errorMessage)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketCreated', e => this._page.frameManager.onWebSocketCreated(e.requestId, e.url)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketWillSendHandshakeRequest', e => this._page.frameManager.onWebSocketRequest(e.requestId)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketHandshakeResponseReceived', e => this._page.frameManager.onWebSocketResponse(e.requestId, e.response.status, e.response.statusText)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketFrameSent', e => e.response.payloadData && this._page.frameManager.onWebSocketFrameSent(e.requestId, e.response.opcode, e.response.payloadData)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketFrameReceived', e => e.response.payloadData && this._page.frameManager.webSocketFrameReceived(e.requestId, e.response.opcode, e.response.payloadData)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketClosed', e => this._page.frameManager.webSocketClosed(e.requestId)),
+      eventsHelper.addEventListener(this._session, 'Network.webSocketFrameError', e => this._page.frameManager.webSocketError(e.requestId, e.errorMessage)),
     ];
   }
   private async _updateState<T extends keyof Protocol.CommandParameters>(
@@ -433,7 +420,7 @@ export class WKPage implements PageDelegate {
     //   one.
     if (this._provisionalPage)
       return;
-    this._page._frameManager.frameRequestedNavigation(frameId);
+    this._page.frameManager.frameRequestedNavigation(frameId);
   }
 
   private _onDidCheckNavigationPolicy(frameId: string, cancel?: boolean) {
@@ -443,19 +430,19 @@ export class WKPage implements PageDelegate {
     // the provisional page. Bail out as we are tracking it.
     if (this._provisionalPage)
       return;
-    this._page._frameManager.frameAbortedNavigation(frameId, 'Navigation canceled by policy check');
+    this._page.frameManager.frameAbortedNavigation(frameId, 'Navigation canceled by policy check');
   }
 
   private _onFrameScheduledNavigation(frameId: string, delay: number, targetIsCurrentFrame: boolean) {
     if (targetIsCurrentFrame)
-      this._page._frameManager.frameRequestedNavigation(frameId);
+      this._page.frameManager.frameRequestedNavigation(frameId);
   }
 
   private _handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) {
     this._onFrameAttached(frameTree.frame.id, frameTree.frame.parentId || null);
     this._onFrameNavigated(frameTree.frame, true);
-    this._page._frameManager.frameLifecycleEvent(frameTree.frame.id, 'domcontentloaded');
-    this._page._frameManager.frameLifecycleEvent(frameTree.frame.id, 'load');
+    this._page.frameManager.frameLifecycleEvent(frameTree.frame.id, 'domcontentloaded');
+    this._page.frameManager.frameLifecycleEvent(frameTree.frame.id, 'load');
 
     if (!frameTree.childFrames)
       return;
@@ -464,26 +451,26 @@ export class WKPage implements PageDelegate {
   }
 
   _onFrameAttached(frameId: string, parentFrameId: string | null): frames.Frame {
-    return this._page._frameManager.frameAttached(frameId, parentFrameId);
+    return this._page.frameManager.frameAttached(frameId, parentFrameId);
   }
 
   private _onFrameNavigated(framePayload: Protocol.Page.Frame, initial: boolean) {
-    const frame = this._page._frameManager.frame(framePayload.id);
+    const frame = this._page.frameManager.frame(framePayload.id);
     assert(frame);
     this._removeContextsForFrame(frame, true);
     if (!framePayload.parentId)
       this._workers.clear();
-    this._page._frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url, framePayload.name || '', framePayload.loaderId, initial);
+    this._page.frameManager.frameCommittedNewDocumentNavigation(framePayload.id, framePayload.url, framePayload.name || '', framePayload.loaderId, initial);
     if (!initial)
       this._firstNonInitialNavigationCommittedFulfill();
   }
 
   private _onFrameNavigatedWithinDocument(frameId: string, url: string) {
-    this._page._frameManager.frameCommittedSameDocumentNavigation(frameId, url);
+    this._page.frameManager.frameCommittedSameDocumentNavigation(frameId, url);
   }
 
   private _onFrameDetached(frameId: string) {
-    this._page._frameManager.frameDetached(frameId);
+    this._page.frameManager.frameDetached(frameId);
   }
 
   private _removeContextsForFrame(frame: frames.Frame, notifyFrame: boolean) {
@@ -499,7 +486,7 @@ export class WKPage implements PageDelegate {
   private _onExecutionContextCreated(contextPayload: Protocol.Runtime.ExecutionContextDescription) {
     if (this._contextIdToContext.has(contextPayload.id))
       return;
-    const frame = this._page._frameManager.frame(contextPayload.frameId);
+    const frame = this._page.frameManager.frame(contextPayload.frameId);
     if (!frame)
       return;
     const delegate = new WKExecutionContext(this._session, contextPayload.id);
@@ -509,18 +496,17 @@ export class WKPage implements PageDelegate {
     else if (contextPayload.type === 'user' && contextPayload.name === UTILITY_WORLD_NAME)
       worldName = 'utility';
     const context = new dom.FrameExecutionContext(delegate, frame, worldName);
-    (context as any)[contextDelegateSymbol] = delegate;
     if (worldName)
       frame._contextCreated(worldName, context);
     this._contextIdToContext.set(contextPayload.id, context);
   }
 
   private async _onBindingCalled(contextId: Protocol.Runtime.ExecutionContextId, argument: string) {
-    const pageOrError = await this.pageOrError();
+    const pageOrError = await this._page.waitForInitializedOrError();
     if (!(pageOrError instanceof Error)) {
       const context = this._contextIdToContext.get(contextId);
       if (context)
-        await this._page._onBindingCalled(argument, context);
+        await this._page.onBindingCalled(argument, context);
     }
   }
 
@@ -575,7 +561,7 @@ export class WKPage implements PageDelegate {
       }
       if (!context)
         return;
-      handles.push(context.createHandle(p));
+      handles.push(createHandle(context, p));
     }
     this._lastConsoleMessage = {
       derivedType,
@@ -601,17 +587,20 @@ export class WKPage implements PageDelegate {
         location
       } = this._lastConsoleMessage;
       for (let i = count; i < event.count; ++i)
-        this._page._addConsoleMessage(derivedType, handles, location, handles.length ? undefined : text);
+        this._page.addConsoleMessage(derivedType, handles, location, handles.length ? undefined : text);
       this._lastConsoleMessage.count = event.count;
     }
   }
 
   _onDialog(event: Protocol.Dialog.javascriptDialogOpeningPayload) {
-    this._page.emitOnContext(BrowserContext.Events.Dialog, new dialog.Dialog(
+    this._page.browserContext.dialogManager.dialogDidOpen(new dialog.Dialog(
         this._page,
         event.type as dialog.DialogType,
         event.message,
         async (accept: boolean, promptText?: string) => {
+          // TODO: this should actually be a RDP event that notifies about a cancelled navigation attempt.
+          if (event.type === 'beforeunload' && !accept)
+            this._page.frameManager.frameAbortedNavigation(this._page.mainFrame()._id, 'navigation cancelled by beforeunload dialog');
           await this._pageProxySession.send('Dialog.handleJavaScriptDialog', { accept, promptText });
         },
         event.defaultPrompt));
@@ -620,8 +609,8 @@ export class WKPage implements PageDelegate {
   private async _onFileChooserOpened(event: {frameId: Protocol.Network.FrameId, element: Protocol.Runtime.RemoteObject}) {
     let handle;
     try {
-      const context = await this._page._frameManager.frame(event.frameId)!._mainContext();
-      handle = context.createHandle(event.element).asElement()!;
+      const context = await this._page.frameManager.frame(event.frameId)!._mainContext();
+      handle =  createHandle(context, event.element).asElement()!;
     } catch (e) {
       // During async processing, frame/context may go away. We should not throw.
       return;
@@ -629,7 +618,7 @@ export class WKPage implements PageDelegate {
     await this._page._onFileChooserOpened(handle);
   }
 
-  private static async _setEmulateMedia(session: WKSession, mediaType: types.MediaType, colorScheme: types.ColorScheme, reducedMotion: types.ReducedMotion, forcedColors: types.ForcedColors): Promise<void> {
+  private static async _setEmulateMedia(session: WKSession, mediaType: types.MediaType, colorScheme: types.ColorScheme, reducedMotion: types.ReducedMotion, forcedColors: types.ForcedColors, contrast: types.Contrast): Promise<void> {
     const promises = [];
     promises.push(session.send('Page.setEmulatedMedia', { media: mediaType === 'no-override' ? '' : mediaType }));
     let appearance: any = undefined;
@@ -653,6 +642,13 @@ export class WKPage implements PageDelegate {
       case 'no-override': forcedColorsWk = undefined; break;
     }
     promises.push(session.send('Page.setForcedColors', { forcedColors: forcedColorsWk }));
+    let contrastWk: any = undefined;
+    switch (contrast) {
+      case 'more': contrastWk = 'More'; break;
+      case 'no-preference': contrastWk = 'NoPreference'; break;
+      case 'no-override': contrastWk = undefined; break;
+    }
+    promises.push(session.send('Page.overrideUserPreference', { name: 'PrefersContrast', value: contrastWk }));
     await Promise.all(promises);
   }
 
@@ -675,11 +671,12 @@ export class WKPage implements PageDelegate {
     const colorScheme = emulatedMedia.colorScheme;
     const reducedMotion = emulatedMedia.reducedMotion;
     const forcedColors = emulatedMedia.forcedColors;
-    await this._forAllSessions(session => WKPage._setEmulateMedia(session, emulatedMedia.media, colorScheme, reducedMotion, forcedColors));
+    const contrast = emulatedMedia.contrast;
+    await this._forAllSessions(session => WKPage._setEmulateMedia(session, emulatedMedia.media, colorScheme, reducedMotion, forcedColors, contrast));
   }
 
   async updateEmulatedViewportSize(): Promise<void> {
-    this._browserContext._validateEmulatedViewport(this._page.viewportSize());
+    this._browserContext._validateEmulatedViewport(this._page.emulatedSize()?.viewport);
     await this._updateViewport();
   }
 
@@ -696,11 +693,11 @@ export class WKPage implements PageDelegate {
 
   async _updateViewport(): Promise<void> {
     const options = this._browserContext._options;
-    const deviceSize = this._page.emulatedSize();
-    if (deviceSize === null)
+    const emulatedSize = this._page.emulatedSize();
+    if (!emulatedSize)
       return;
-    const viewportSize = deviceSize.viewport;
-    const screenSize = deviceSize.screen;
+    const viewportSize = emulatedSize.viewport;
+    const screenSize = emulatedSize.screen;
     const promises: Promise<any>[] = [
       this._pageProxySession.send('Emulation.setDeviceMetricsOverride', {
         width: viewportSize.width,
@@ -715,14 +712,14 @@ export class WKPage implements PageDelegate {
     ];
     if (options.isMobile) {
       const angle = viewportSize.width > viewportSize.height ? 90 : 0;
-      // Special handling for macOS 12.
-      const useLegacySetOrientationOverrideMethod = os.platform() === 'darwin' && parseInt(os.release().split('.')[0], 10) <= 21;
-      if (useLegacySetOrientationOverrideMethod)
-        promises.push(this._session.send('Page.setOrientationOverride' as any, { angle }));
-      else
-        promises.push(this._pageProxySession.send('Emulation.setOrientationOverride', { angle }));
+      promises.push(this._pageProxySession.send('Emulation.setOrientationOverride', { angle }));
     }
     await Promise.all(promises);
+
+    // WPE WebKit is failing in mesa due to a race condition if we start interacting
+    // with the page too quickly.
+    if (!this._browserContext._browser?.options.headful && (hostPlatform === 'ubuntu22.04-x64' || hostPlatform.startsWith('debian12')))
+      await new Promise(r => setTimeout(r, 500));
   }
 
   async updateRequestInterception(): Promise<void> {
@@ -768,41 +765,58 @@ export class WKPage implements PageDelegate {
     });
   }
 
-  async exposeBinding(binding: PageBinding): Promise<void> {
-    this._session.send('Runtime.addBinding', { name: binding.name });
-    await this._updateBootstrapScript();
-    await Promise.all(this._page.frames().map(frame => frame.evaluateExpression(binding.source).catch(e => {})));
+  async requestGC(): Promise<void> {
+    await this._session.send('Heap.gc');
   }
 
-  async removeExposedBindings(): Promise<void> {
+  async addInitScript(initScript: InitScript): Promise<void> {
     await this._updateBootstrapScript();
   }
 
-  async addInitScript(initScript: InitScript): Promise<void> {
+  async removeInitScripts(initScripts: InitScript[]): Promise<void> {
     await this._updateBootstrapScript();
   }
 
-  async removeInitScripts() {
-    await this._updateBootstrapScript();
+  async exposePlaywrightBinding() {
+    await this._updateState('Runtime.addBinding', { name: PageBinding.kBindingName });
   }
 
   private _calculateBootstrapScript(): string {
     const scripts: string[] = [];
-    if (!this._page.context()._options.isMobile) {
+    if (!this._page.browserContext._options.isMobile) {
       scripts.push('delete window.orientation');
       scripts.push('delete window.ondevicemotion');
       scripts.push('delete window.ondeviceorientation');
     }
     scripts.push('if (!window.safari) window.safari = { pushNotification: { toString() { return "[object SafariRemoteNotification]"; } } };');
     scripts.push('if (!window.GestureEvent) window.GestureEvent = function GestureEvent() {};');
-
-    for (const binding of this._page.allBindings())
-      scripts.push(binding.source);
-    scripts.push(...this._browserContext.initScripts.map(s => s.source));
-    scripts.push(...this._page.initScripts.map(s => s.source));
+    scripts.push(this._publicKeyCredentialScript());
+    scripts.push(...this._page.allInitScripts().map(script => script.source));
     return scripts.join(';\n');
   }
 
+  private _publicKeyCredentialScript(): string {
+    function polyfill() {
+      /**
+       * Some sites don't check existance of PublicKeyCredentials because all browsers except Webkit on Linux implement it.
+       * We polyfill the subset that's used for feature detection, so that login flows that'd work in Safari don't crash with "PublicKeyCredential is not defined" in CI.
+       * https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential
+       */
+      window.PublicKeyCredential ??= {
+        async getClientCapabilities() {
+          return {};
+        },
+        async isConditionalMediationAvailable() {
+          return false;
+        },
+        async isUserVerifyingPlatformAuthenticatorAvailable() {
+          return false;
+        },
+      } as any;
+    }
+    return `(${polyfill.toString()})();`;
+  }
+
   async _updateBootstrapScript(): Promise<void> {
     await this._updateState('Page.setBootstrapScript', { source: this._calculateBootstrapScript() });
   }
@@ -820,7 +834,7 @@ export class WKPage implements PageDelegate {
   }
 
   private _toolbarHeight(): number {
-    if (this._page._browserContext._browser?.options.headful)
+    if (this._page.browserContext._browser?.options.headful)
       return hostPlatform === 'mac10.15' ? 55 : 59;
     return 0;
   }
@@ -834,7 +848,7 @@ export class WKPage implements PageDelegate {
       toolbarHeight: this._toolbarHeight()
     });
     this._recordingVideoFile = options.outputFile;
-    this._browserContext._browser._videoStarted(this._browserContext, screencastId, options.outputFile, this.pageOrError());
+    this._browserContext._browser._videoStarted(this._browserContext, screencastId, options.outputFile, this._page.waitForInitializedOrError());
   }
 
   async _stopVideo(): Promise<void> {
@@ -849,8 +863,8 @@ export class WKPage implements PageDelegate {
     // (see https://github.com/microsoft/playwright/issues/16727).
     if (process.platform === 'darwin')
       return;
-    if (!omitDeviceScaleFactor && this._page._browserContext._options.deviceScaleFactor)
-      side = Math.ceil(side * this._page._browserContext._options.deviceScaleFactor);
+    if (!omitDeviceScaleFactor && this._page.browserContext._options.deviceScaleFactor)
+      side = Math.ceil(side * this._page.browserContext._options.deviceScaleFactor);
     if (side > 32767)
       throw new Error('Cannot take screenshot larger than 32767 pixels on any dimension');
   }
@@ -860,9 +874,9 @@ export class WKPage implements PageDelegate {
     const omitDeviceScaleFactor = scale === 'css';
     this.validateScreenshotDimension(rect.width, omitDeviceScaleFactor);
     this.validateScreenshotDimension(rect.height, omitDeviceScaleFactor);
-    const result = await this._session.send('Page.snapshotRect', { ...rect, coordinateSystem: documentRect ? 'Page' : 'Viewport', omitDeviceScaleFactor });
+    const result = await progress.race(this._session.send('Page.snapshotRect', { ...rect, coordinateSystem: documentRect ? 'Page' : 'Viewport', omitDeviceScaleFactor }));
     const prefix = 'data:image/png;base64,';
-    let buffer = Buffer.from(result.dataURL.substr(prefix.length), 'base64');
+    let buffer: Buffer = Buffer.from(result.dataURL.substr(prefix.length), 'base64');
     if (format === 'jpeg')
       buffer = jpegjs.encode(PNG.sync.read(buffer), quality).data;
     return buffer;
@@ -874,7 +888,7 @@ export class WKPage implements PageDelegate {
     });
     if (!nodeInfo.contentFrameId)
       return null;
-    return this._page._frameManager.frame(nodeInfo.contentFrameId);
+    return this._page.frameManager.frame(nodeInfo.contentFrameId);
   }
 
   async getOwnerFrame(handle: dom.ElementHandle): Promise<string | null> {
@@ -886,10 +900,6 @@ export class WKPage implements PageDelegate {
     return nodeInfo.ownerFrameId || null;
   }
 
-  isElementHandle(remoteObject: any): boolean {
-    return (remoteObject as Protocol.Runtime.RemoteObject).subtype === 'node';
-  }
-
   async getBoundingBox(handle: dom.ElementHandle): Promise<types.Rect | null> {
     const quads = await this.getContentQuads(handle);
     if (!quads || !quads.length)
@@ -963,16 +973,6 @@ export class WKPage implements PageDelegate {
     ]);
   }
 
-  async setInputFiles(handle: dom.ElementHandle<HTMLInputElement>, files: types.FilePayload[]): Promise<void> {
-    const objectId = handle._objectId;
-    const protocolFiles = files.map(file => ({
-      name: file.name,
-      type: file.mimeType,
-      data: file.buffer,
-    }));
-    await this._session.send('DOM.setInputFiles', { objectId, files: protocolFiles });
-  }
-
   async setInputFilePaths(handle: dom.ElementHandle<HTMLInputElement>, paths: string[]): Promise<void> {
     const pageProxyId = this._pageProxySession.sessionId;
     const objectId = handle._objectId;
@@ -985,11 +985,11 @@ export class WKPage implements PageDelegate {
   async adoptElementHandle<T extends Node>(handle: dom.ElementHandle<T>, to: dom.FrameExecutionContext): Promise<dom.ElementHandle<T>> {
     const result = await this._session.sendMayFail('DOM.resolveNode', {
       objectId: handle._objectId,
-      executionContextId: ((to as any)[contextDelegateSymbol] as WKExecutionContext)._contextId
+      executionContextId: (to.delegate as WKExecutionContext)._contextId
     });
     if (!result || result.object.subtype === 'null')
       throw new Error(dom.kUnableToAdoptErrorMessage);
-    return to.createHandle(result.object) as dom.ElementHandle<T>;
+    return createHandle(to, result.object) as dom.ElementHandle<T>;
   }
 
   async getAccessibilityTree(needle?: dom.ElementHandle): Promise<{tree: accessibility.AXNode, needle: accessibility.AXNode | null}> {
@@ -999,7 +999,7 @@ export class WKPage implements PageDelegate {
   async inputActionEpilogue(): Promise<void> {
   }
 
-  async resetForReuse(): Promise<void> {
+  async resetForReuse(progress: Progress): Promise<void> {
   }
 
   async getFrameElement(frame: frames.Frame): Promise<dom.ElementHandle> {
@@ -1009,11 +1009,11 @@ export class WKPage implements PageDelegate {
     const context = await parent._mainContext();
     const result = await this._session.send('DOM.resolveNode', {
       frameId: frame._id,
-      executionContextId: ((context as any)[contextDelegateSymbol] as WKExecutionContext)._contextId
+      executionContextId: (context.delegate as WKExecutionContext)._contextId
     });
     if (!result || result.object.subtype === 'null')
       throw new Error('Frame has been detached.');
-    return context.createHandle(result.object) as dom.ElementHandle;
+    return createHandle(context, result.object) as dom.ElementHandle;
   }
 
   private _maybeCancelCoopNavigationRequest(provisionalPage: WKProvisionalPage) {
@@ -1046,6 +1046,9 @@ export class WKPage implements PageDelegate {
   _onRequestWillBeSent(session: WKSession, event: Protocol.Network.requestWillBeSentPayload) {
     if (event.request.url.startsWith('data:'))
       return;
+    // WebKit started dispatching network events for about:blank after https://commits.webkit.org/292206@main.
+    if (event.request.url.startsWith('about:'))
+      return;
 
     // We do not support intercepting redirects.
     if (this._page.needsRequestInterception() && !event.redirectResponse)
@@ -1064,7 +1067,7 @@ export class WKPage implements PageDelegate {
         redirectedFrom = request;
       }
     }
-    const frame = redirectedFrom ? redirectedFrom.request.frame() : this._page._frameManager.frame(event.frameId);
+    const frame = redirectedFrom ? redirectedFrom.request.frame() : this._page.frameManager.frame(event.frameId);
     // sometimes we get stray network events for detached frames
     // TODO(einbinder) why?
     if (!frame)
@@ -1082,7 +1085,7 @@ export class WKPage implements PageDelegate {
       request.request.setRawRequestHeaders(null);
     }
     this._requestIdToRequest.set(event.requestId, request);
-    this._page._frameManager.requestStarted(request.request, route);
+    this._page.frameManager.requestStarted(request.request, route);
   }
 
   private _handleRequestRedirect(request: WKInterceptableRequest, requestId: string, responsePayload: Protocol.Network.Response, timestamp: number) {
@@ -1093,8 +1096,8 @@ export class WKPage implements PageDelegate {
     response.setEncodedBodySize(null);
     response._requestFinished(responsePayload.timing ? helper.secondsToRoundishMillis(timestamp - request._timestamp) : -1);
     this._requestIdToRequest.delete(requestId);
-    this._page._frameManager.requestReceivedResponse(response);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.requestReceivedResponse(response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
 
   _onRequestIntercepted(session: WKSession, event: Protocol.Network.requestInterceptedPayload) {
@@ -1124,9 +1127,9 @@ export class WKPage implements PageDelegate {
 
     this._requestIdToResponseReceivedPayloadEvent.set(event.requestId, event);
     const response = request.createResponse(event.response);
-    this._page._frameManager.requestReceivedResponse(response);
+    this._page.frameManager.requestReceivedResponse(response);
 
-    if (response.status() === 204) {
+    if (response.status() === 204 && request.request.isNavigationRequest()) {
       this._onLoadingFailed(session, {
         requestId: event.requestId,
         errorText: 'Aborted: 204 No Content',
@@ -1167,7 +1170,7 @@ export class WKPage implements PageDelegate {
 
     this._requestIdToResponseReceivedPayloadEvent.delete(event.requestId);
     this._requestIdToRequest.delete(event.requestId);
-    this._page._frameManager.reportRequestFinished(request.request, response);
+    this._page.frameManager.reportRequestFinished(request.request, response);
   }
 
   _onLoadingFailed(session: WKSession, event: Protocol.Network.loadingFailedPayload) {
@@ -1198,7 +1201,7 @@ export class WKPage implements PageDelegate {
     }
     this._requestIdToRequest.delete(event.requestId);
     request.request._setFailureText(event.errorText);
-    this._page._frameManager.requestFailed(request.request, event.errorText.includes('cancelled'));
+    this._page.frameManager.requestFailed(request.request, event.errorText.includes('cancelled'));
   }
 
   async _grantPermissions(origin: string, permissions: string[]) {
@@ -1284,5 +1287,3 @@ function isLoadedSecurely(url: string, timing: network.ResourceTiming) {
     return true;
   } catch (_) {}
 }
-
-const contextDelegateSymbol = Symbol('delegate');
diff --git a/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts b/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts
index b8af1b9ca31fd..4fa5d3e709fd2 100644
--- a/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts
+++ b/packages/playwright-core/src/server/webkit/wkProvisionalPage.ts
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+import { assert } from '../../utils';
+import { eventsHelper } from '../utils/eventsHelper';
+
+import type { Protocol } from './protocol';
 import type { WKSession } from './wkConnection';
 import type { WKPage } from './wkPage';
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import type { Protocol } from './protocol';
-import { assert } from '../../utils';
+import type { RegisteredListener } from '../utils/eventsHelper';
 import type * as network from '../network';
 
 export class WKProvisionalPage {
@@ -48,7 +49,7 @@ export class WKProvisionalPage {
       return (payload: any) => {
         // Pretend that the events happened in the same process.
         if (payload.frameId)
-          payload.frameId = this._wkPage._page._frameManager.mainFrame()._id;
+          payload.frameId = this._wkPage._page.frameManager.mainFrame()._id;
         handler(payload);
       };
     };
@@ -85,7 +86,7 @@ export class WKProvisionalPage {
       this._wkPage._adoptRequestFromNewProcess(this._coopNavigationRequest, this._session, event.requestId);
       // Simply ignore this event as it has already been dispatched from the original process
       // and there will ne no requestIntercepted event from the provisional process as it resumes
-      // existing network load (that has already received reponse headers).
+      // existing network load (that has already received response headers).
       return;
     }
     this._wkPage._onRequestWillBeSent(this._session, event);
@@ -105,4 +106,4 @@ export class WKProvisionalPage {
     assert(!frameTree.frame.parentId);
     this._mainFrameId = frameTree.frame.id;
   }
-}
\ No newline at end of file
+}
diff --git a/packages/playwright-core/src/server/webkit/wkWorkers.ts b/packages/playwright-core/src/server/webkit/wkWorkers.ts
index ae69b72f8a945..689ca95ccc15b 100644
--- a/packages/playwright-core/src/server/webkit/wkWorkers.ts
+++ b/packages/playwright-core/src/server/webkit/wkWorkers.ts
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import type { RegisteredListener } from '../../utils/eventsHelper';
-import { eventsHelper } from '../../utils/eventsHelper';
-import type { Page } from '../page';
+import { eventsHelper } from '../utils/eventsHelper';
 import { Worker } from '../page';
-import type { Protocol } from './protocol';
 import { WKSession } from './wkConnection';
-import { WKExecutionContext } from './wkExecutionContext';
+import { createHandle, WKExecutionContext } from './wkExecutionContext';
+
+import type { Protocol } from './protocol';
+import type { RegisteredListener } from '../utils/eventsHelper';
+import type { Page } from '../page';
 import type * as types from '../types';
 
 export class WKWorkers {
@@ -47,8 +48,8 @@ export class WKWorkers {
           });
         });
         this._workerSessions.set(event.workerId, workerSession);
-        worker._createExecutionContext(new WKExecutionContext(workerSession, undefined));
-        this._page._addWorker(event.workerId, worker);
+        worker.createExecutionContext(new WKExecutionContext(workerSession, undefined));
+        this._page.addWorker(event.workerId, worker);
         workerSession.on('Console.messageAdded', event => this._onConsoleMessage(worker, event));
         Promise.all([
           workerSession.send('Runtime.enable'),
@@ -56,7 +57,7 @@ export class WKWorkers {
           session.send('Worker.initialized', { workerId: event.workerId })
         ]).catch(e => {
           // Worker can go as we are initializing it.
-          this._page._removeWorker(event.workerId);
+          this._page.removeWorker(event.workerId);
         });
       }),
       eventsHelper.addEventListener(session, 'Worker.dispatchMessageFromWorker', (event: Protocol.Worker.dispatchMessageFromWorkerPayload) => {
@@ -71,13 +72,13 @@ export class WKWorkers {
           return;
         workerSession.dispose();
         this._workerSessions.delete(event.workerId);
-        this._page._removeWorker(event.workerId);
+        this._page.removeWorker(event.workerId);
       })
     ];
   }
 
   clear() {
-    this._page._clearWorkers();
+    this._page.clearWorkers();
     this._workerSessions.clear();
   }
 
@@ -94,13 +95,13 @@ export class WKWorkers {
       derivedType = 'timeEnd';
 
     const handles = (parameters || []).map(p => {
-      return worker._existingExecutionContext!.createHandle(p);
+      return createHandle(worker.existingExecutionContext!, p);
     });
     const location: types.ConsoleMessageLocation = {
       url: url || '',
       lineNumber: (lineNumber || 1) - 1,
       columnNumber: (columnNumber || 1) - 1
     };
-    this._page._addConsoleMessage(derivedType, handles, location, handles.length ? undefined : text);
+    this._page.addConsoleMessage(derivedType, handles, location, handles.length ? undefined : text);
   }
 }
diff --git a/packages/playwright-core/src/third_party/diff_match_patch.js b/packages/playwright-core/src/third_party/diff_match_patch.js
deleted file mode 100644
index ba0df0f6abd13..0000000000000
--- a/packages/playwright-core/src/third_party/diff_match_patch.js
+++ /dev/null
@@ -1,2222 +0,0 @@
-/**
- * Diff Match and Patch
- * Copyright 2018 The diff-match-patch Authors.
- * https://github.com/google/diff-match-patch
- *
- * 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.
- */
-
-/**
- * @fileoverview Computes the difference between two texts to create a patch.
- * Applies the patch onto another text, allowing for errors.
- * @author fraser@google.com (Neil Fraser)
- */
-
-/**
- * Class containing the diff, match and patch methods.
- * @constructor
- */
-var diff_match_patch = function() {
-
-  // Defaults.
-  // Redefine these in your program to override the defaults.
-
-  // Number of seconds to map a diff before giving up (0 for infinity).
-  this.Diff_Timeout = 1.0;
-  // Cost of an empty edit operation in terms of edit characters.
-  this.Diff_EditCost = 4;
-  // At what point is no match declared (0.0 = perfection, 1.0 = very loose).
-  this.Match_Threshold = 0.5;
-  // How far to search for a match (0 = exact location, 1000+ = broad match).
-  // A match this many characters away from the expected location will add
-  // 1.0 to the score (0.0 is a perfect match).
-  this.Match_Distance = 1000;
-  // When deleting a large block of text (over ~64 characters), how close do
-  // the contents have to be to match the expected contents. (0.0 = perfection,
-  // 1.0 = very loose).  Note that Match_Threshold controls how closely the
-  // end points of a delete need to match.
-  this.Patch_DeleteThreshold = 0.5;
-  // Chunk size for context length.
-  this.Patch_Margin = 4;
-
-  // The number of bits in an int.
-  this.Match_MaxBits = 32;
-};
-
-
-//  DIFF FUNCTIONS
-
-
-/**
- * The data structure representing a diff is an array of tuples:
- * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
- * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
- */
-var DIFF_DELETE = -1;
-var DIFF_INSERT = 1;
-var DIFF_EQUAL = 0;
-
-/**
- * Class representing one diff tuple.
- * Attempts to look like a two-element array (which is what this used to be).
- * @param {number} op Operation, one of: DIFF_DELETE, DIFF_INSERT, DIFF_EQUAL.
- * @param {string} text Text to be deleted, inserted, or retained.
- * @constructor
- */
-diff_match_patch.Diff = function(op, text) {
-  this[0] = op;
-  this[1] = text;
-};
-
-diff_match_patch.Diff.prototype.length = 2;
-
-/**
- * Emulate the output of a two-element array.
- * @return {string} Diff operation as a string.
- */
-diff_match_patch.Diff.prototype.toString = function() {
-  return this[0] + ',' + this[1];
-};
-
-
-/**
- * Find the differences between two texts.  Simplifies the problem by stripping
- * any common prefix or suffix off the texts before diffing.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {boolean=} opt_checklines Optional speedup flag. If present and false,
- *     then don't run a line-level diff first to identify the changed areas.
- *     Defaults to true, which does a faster, slightly less optimal diff.
- * @param {number=} opt_deadline Optional time when the diff should be complete
- *     by.  Used internally for recursive calls.  Users should set DiffTimeout
- *     instead.
- * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
- */
-diff_match_patch.prototype.diff_main = function(text1, text2, opt_checklines,
-    opt_deadline) {
-  // Set a deadline by which time the diff must be complete.
-  if (typeof opt_deadline == 'undefined') {
-    if (this.Diff_Timeout <= 0) {
-      opt_deadline = Number.MAX_VALUE;
-    } else {
-      opt_deadline = (new Date).getTime() + this.Diff_Timeout * 1000;
-    }
-  }
-  var deadline = opt_deadline;
-
-  // Check for null inputs.
-  if (text1 == null || text2 == null) {
-    throw new Error('Null input. (diff_main)');
-  }
-
-  // Check for equality (speedup).
-  if (text1 == text2) {
-    if (text1) {
-      return [new diff_match_patch.Diff(DIFF_EQUAL, text1)];
-    }
-    return [];
-  }
-
-  if (typeof opt_checklines == 'undefined') {
-    opt_checklines = true;
-  }
-  var checklines = opt_checklines;
-
-  // Trim off common prefix (speedup).
-  var commonlength = this.diff_commonPrefix(text1, text2);
-  var commonprefix = text1.substring(0, commonlength);
-  text1 = text1.substring(commonlength);
-  text2 = text2.substring(commonlength);
-
-  // Trim off common suffix (speedup).
-  commonlength = this.diff_commonSuffix(text1, text2);
-  var commonsuffix = text1.substring(text1.length - commonlength);
-  text1 = text1.substring(0, text1.length - commonlength);
-  text2 = text2.substring(0, text2.length - commonlength);
-
-  // Compute the diff on the middle block.
-  var diffs = this.diff_compute_(text1, text2, checklines, deadline);
-
-  // Restore the prefix and suffix.
-  if (commonprefix) {
-    diffs.unshift(new diff_match_patch.Diff(DIFF_EQUAL, commonprefix));
-  }
-  if (commonsuffix) {
-    diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, commonsuffix));
-  }
-  this.diff_cleanupMerge(diffs);
-  return diffs;
-};
-
-
-/**
- * Find the differences between two texts.  Assumes that the texts do not
- * have any common prefix or suffix.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {boolean} checklines Speedup flag.  If false, then don't run a
- *     line-level diff first to identify the changed areas.
- *     If true, then run a faster, slightly less optimal diff.
- * @param {number} deadline Time when the diff should be complete by.
- * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
- * @private
- */
-diff_match_patch.prototype.diff_compute_ = function(text1, text2, checklines,
-    deadline) {
-  var diffs;
-
-  if (!text1) {
-    // Just add some text (speedup).
-    return [new diff_match_patch.Diff(DIFF_INSERT, text2)];
-  }
-
-  if (!text2) {
-    // Just delete some text (speedup).
-    return [new diff_match_patch.Diff(DIFF_DELETE, text1)];
-  }
-
-  var longtext = text1.length > text2.length ? text1 : text2;
-  var shorttext = text1.length > text2.length ? text2 : text1;
-  var i = longtext.indexOf(shorttext);
-  if (i != -1) {
-    // Shorter text is inside the longer text (speedup).
-    diffs = [new diff_match_patch.Diff(DIFF_INSERT, longtext.substring(0, i)),
-             new diff_match_patch.Diff(DIFF_EQUAL, shorttext),
-             new diff_match_patch.Diff(DIFF_INSERT,
-                 longtext.substring(i + shorttext.length))];
-    // Swap insertions for deletions if diff is reversed.
-    if (text1.length > text2.length) {
-      diffs[0][0] = diffs[2][0] = DIFF_DELETE;
-    }
-    return diffs;
-  }
-
-  if (shorttext.length == 1) {
-    // Single character string.
-    // After the previous speedup, the character can't be an equality.
-    return [new diff_match_patch.Diff(DIFF_DELETE, text1),
-            new diff_match_patch.Diff(DIFF_INSERT, text2)];
-  }
-
-  // Check to see if the problem can be split in two.
-  var hm = this.diff_halfMatch_(text1, text2);
-  if (hm) {
-    // A half-match was found, sort out the return data.
-    var text1_a = hm[0];
-    var text1_b = hm[1];
-    var text2_a = hm[2];
-    var text2_b = hm[3];
-    var mid_common = hm[4];
-    // Send both pairs off for separate processing.
-    var diffs_a = this.diff_main(text1_a, text2_a, checklines, deadline);
-    var diffs_b = this.diff_main(text1_b, text2_b, checklines, deadline);
-    // Merge the results.
-    return diffs_a.concat([new diff_match_patch.Diff(DIFF_EQUAL, mid_common)],
-                          diffs_b);
-  }
-
-  if (checklines && text1.length > 100 && text2.length > 100) {
-    return this.diff_lineMode_(text1, text2, deadline);
-  }
-
-  return this.diff_bisect_(text1, text2, deadline);
-};
-
-
-/**
- * Do a quick line-level diff on both strings, then rediff the parts for
- * greater accuracy.
- * This speedup can produce non-minimal diffs.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {number} deadline Time when the diff should be complete by.
- * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
- * @private
- */
-diff_match_patch.prototype.diff_lineMode_ = function(text1, text2, deadline) {
-  // Scan the text on a line-by-line basis first.
-  var a = this.diff_linesToChars_(text1, text2);
-  text1 = a.chars1;
-  text2 = a.chars2;
-  var linearray = a.lineArray;
-
-  var diffs = this.diff_main(text1, text2, false, deadline);
-
-  // Convert the diff back to original text.
-  this.diff_charsToLines_(diffs, linearray);
-  // Eliminate freak matches (e.g. blank lines)
-  this.diff_cleanupSemantic(diffs);
-
-  // Rediff any replacement blocks, this time character-by-character.
-  // Add a dummy entry at the end.
-  diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, ''));
-  var pointer = 0;
-  var count_delete = 0;
-  var count_insert = 0;
-  var text_delete = '';
-  var text_insert = '';
-  while (pointer < diffs.length) {
-    switch (diffs[pointer][0]) {
-      case DIFF_INSERT:
-        count_insert++;
-        text_insert += diffs[pointer][1];
-        break;
-      case DIFF_DELETE:
-        count_delete++;
-        text_delete += diffs[pointer][1];
-        break;
-      case DIFF_EQUAL:
-        // Upon reaching an equality, check for prior redundancies.
-        if (count_delete >= 1 && count_insert >= 1) {
-          // Delete the offending records and add the merged ones.
-          diffs.splice(pointer - count_delete - count_insert,
-                       count_delete + count_insert);
-          pointer = pointer - count_delete - count_insert;
-          var subDiff =
-              this.diff_main(text_delete, text_insert, false, deadline);
-          for (var j = subDiff.length - 1; j >= 0; j--) {
-            diffs.splice(pointer, 0, subDiff[j]);
-          }
-          pointer = pointer + subDiff.length;
-        }
-        count_insert = 0;
-        count_delete = 0;
-        text_delete = '';
-        text_insert = '';
-        break;
-    }
-    pointer++;
-  }
-  diffs.pop();  // Remove the dummy entry at the end.
-
-  return diffs;
-};
-
-
-/**
- * Find the 'middle snake' of a diff, split the problem in two
- * and return the recursively constructed diff.
- * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {number} deadline Time at which to bail if not yet complete.
- * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
- * @private
- */
-diff_match_patch.prototype.diff_bisect_ = function(text1, text2, deadline) {
-  // Cache the text lengths to prevent multiple calls.
-  var text1_length = text1.length;
-  var text2_length = text2.length;
-  var max_d = Math.ceil((text1_length + text2_length) / 2);
-  var v_offset = max_d;
-  var v_length = 2 * max_d;
-  var v1 = new Array(v_length);
-  var v2 = new Array(v_length);
-  // Setting all elements to -1 is faster in Chrome & Firefox than mixing
-  // integers and undefined.
-  for (var x = 0; x < v_length; x++) {
-    v1[x] = -1;
-    v2[x] = -1;
-  }
-  v1[v_offset + 1] = 0;
-  v2[v_offset + 1] = 0;
-  var delta = text1_length - text2_length;
-  // If the total number of characters is odd, then the front path will collide
-  // with the reverse path.
-  var front = (delta % 2 != 0);
-  // Offsets for start and end of k loop.
-  // Prevents mapping of space beyond the grid.
-  var k1start = 0;
-  var k1end = 0;
-  var k2start = 0;
-  var k2end = 0;
-  for (var d = 0; d < max_d; d++) {
-    // Bail out if deadline is reached.
-    if ((new Date()).getTime() > deadline) {
-      break;
-    }
-
-    // Walk the front path one step.
-    for (var k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
-      var k1_offset = v_offset + k1;
-      var x1;
-      if (k1 == -d || (k1 != d && v1[k1_offset - 1] < v1[k1_offset + 1])) {
-        x1 = v1[k1_offset + 1];
-      } else {
-        x1 = v1[k1_offset - 1] + 1;
-      }
-      var y1 = x1 - k1;
-      while (x1 < text1_length && y1 < text2_length &&
-             text1.charAt(x1) == text2.charAt(y1)) {
-        x1++;
-        y1++;
-      }
-      v1[k1_offset] = x1;
-      if (x1 > text1_length) {
-        // Ran off the right of the graph.
-        k1end += 2;
-      } else if (y1 > text2_length) {
-        // Ran off the bottom of the graph.
-        k1start += 2;
-      } else if (front) {
-        var k2_offset = v_offset + delta - k1;
-        if (k2_offset >= 0 && k2_offset < v_length && v2[k2_offset] != -1) {
-          // Mirror x2 onto top-left coordinate system.
-          var x2 = text1_length - v2[k2_offset];
-          if (x1 >= x2) {
-            // Overlap detected.
-            return this.diff_bisectSplit_(text1, text2, x1, y1, deadline);
-          }
-        }
-      }
-    }
-
-    // Walk the reverse path one step.
-    for (var k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
-      var k2_offset = v_offset + k2;
-      var x2;
-      if (k2 == -d || (k2 != d && v2[k2_offset - 1] < v2[k2_offset + 1])) {
-        x2 = v2[k2_offset + 1];
-      } else {
-        x2 = v2[k2_offset - 1] + 1;
-      }
-      var y2 = x2 - k2;
-      while (x2 < text1_length && y2 < text2_length &&
-             text1.charAt(text1_length - x2 - 1) ==
-             text2.charAt(text2_length - y2 - 1)) {
-        x2++;
-        y2++;
-      }
-      v2[k2_offset] = x2;
-      if (x2 > text1_length) {
-        // Ran off the left of the graph.
-        k2end += 2;
-      } else if (y2 > text2_length) {
-        // Ran off the top of the graph.
-        k2start += 2;
-      } else if (!front) {
-        var k1_offset = v_offset + delta - k2;
-        if (k1_offset >= 0 && k1_offset < v_length && v1[k1_offset] != -1) {
-          var x1 = v1[k1_offset];
-          var y1 = v_offset + x1 - k1_offset;
-          // Mirror x2 onto top-left coordinate system.
-          x2 = text1_length - x2;
-          if (x1 >= x2) {
-            // Overlap detected.
-            return this.diff_bisectSplit_(text1, text2, x1, y1, deadline);
-          }
-        }
-      }
-    }
-  }
-  // Diff took too long and hit the deadline or
-  // number of diffs equals number of characters, no commonality at all.
-  return [new diff_match_patch.Diff(DIFF_DELETE, text1),
-          new diff_match_patch.Diff(DIFF_INSERT, text2)];
-};
-
-
-/**
- * Given the location of the 'middle snake', split the diff in two parts
- * and recurse.
- * @param {string} text1 Old string to be diffed.
- * @param {string} text2 New string to be diffed.
- * @param {number} x Index of split point in text1.
- * @param {number} y Index of split point in text2.
- * @param {number} deadline Time at which to bail if not yet complete.
- * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
- * @private
- */
-diff_match_patch.prototype.diff_bisectSplit_ = function(text1, text2, x, y,
-    deadline) {
-  var text1a = text1.substring(0, x);
-  var text2a = text2.substring(0, y);
-  var text1b = text1.substring(x);
-  var text2b = text2.substring(y);
-
-  // Compute both diffs serially.
-  var diffs = this.diff_main(text1a, text2a, false, deadline);
-  var diffsb = this.diff_main(text1b, text2b, false, deadline);
-
-  return diffs.concat(diffsb);
-};
-
-
-/**
- * Split two texts into an array of strings.  Reduce the texts to a string of
- * hashes where each Unicode character represents one line.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
- *     An object containing the encoded text1, the encoded text2 and
- *     the array of unique strings.
- *     The zeroth element of the array of unique strings is intentionally blank.
- * @private
- */
-diff_match_patch.prototype.diff_linesToChars_ = function(text1, text2) {
-  var lineArray = [];  // e.g. lineArray[4] == 'Hello\n'
-  var lineHash = {};   // e.g. lineHash['Hello\n'] == 4
-
-  // '\x00' is a valid character, but various debuggers don't like it.
-  // So we'll insert a junk entry to avoid generating a null character.
-  lineArray[0] = '';
-
-  /**
-   * Split a text into an array of strings.  Reduce the texts to a string of
-   * hashes where each Unicode character represents one line.
-   * Modifies linearray and linehash through being a closure.
-   * @param {string} text String to encode.
-   * @return {string} Encoded string.
-   * @private
-   */
-  function diff_linesToCharsMunge_(text) {
-    var chars = '';
-    // Walk the text, pulling out a substring for each line.
-    // text.split('\n') would would temporarily double our memory footprint.
-    // Modifying text would create many large strings to garbage collect.
-    var lineStart = 0;
-    var lineEnd = -1;
-    // Keeping our own length variable is faster than looking it up.
-    var lineArrayLength = lineArray.length;
-    while (lineEnd < text.length - 1) {
-      lineEnd = text.indexOf('\n', lineStart);
-      if (lineEnd == -1) {
-        lineEnd = text.length - 1;
-      }
-      var line = text.substring(lineStart, lineEnd + 1);
-
-      if (lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) :
-          (lineHash[line] !== undefined)) {
-        chars += String.fromCharCode(lineHash[line]);
-      } else {
-        if (lineArrayLength == maxLines) {
-          // Bail out at 65535 because
-          // String.fromCharCode(65536) == String.fromCharCode(0)
-          line = text.substring(lineStart);
-          lineEnd = text.length;
-        }
-        chars += String.fromCharCode(lineArrayLength);
-        lineHash[line] = lineArrayLength;
-        lineArray[lineArrayLength++] = line;
-      }
-      lineStart = lineEnd + 1;
-    }
-    return chars;
-  }
-  // Allocate 2/3rds of the space for text1, the rest for text2.
-  var maxLines = 40000;
-  var chars1 = diff_linesToCharsMunge_(text1);
-  maxLines = 65535;
-  var chars2 = diff_linesToCharsMunge_(text2);
-  return {chars1: chars1, chars2: chars2, lineArray: lineArray};
-};
-
-
-/**
- * Rehydrate the text in a diff from a string of line hashes to real lines of
- * text.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @param {!Array.<string>} lineArray Array of unique strings.
- * @private
- */
-diff_match_patch.prototype.diff_charsToLines_ = function(diffs, lineArray) {
-  for (var i = 0; i < diffs.length; i++) {
-    var chars = diffs[i][1];
-    var text = [];
-    for (var j = 0; j < chars.length; j++) {
-      text[j] = lineArray[chars.charCodeAt(j)];
-    }
-    diffs[i][1] = text.join('');
-  }
-};
-
-
-/**
- * Determine the common prefix of two strings.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {number} The number of characters common to the start of each
- *     string.
- */
-diff_match_patch.prototype.diff_commonPrefix = function(text1, text2) {
-  // Quick check for common null cases.
-  if (!text1 || !text2 || text1.charAt(0) != text2.charAt(0)) {
-    return 0;
-  }
-  // Binary search.
-  // Performance analysis: https://neil.fraser.name/news/2007/10/09/
-  var pointermin = 0;
-  var pointermax = Math.min(text1.length, text2.length);
-  var pointermid = pointermax;
-  var pointerstart = 0;
-  while (pointermin < pointermid) {
-    if (text1.substring(pointerstart, pointermid) ==
-        text2.substring(pointerstart, pointermid)) {
-      pointermin = pointermid;
-      pointerstart = pointermin;
-    } else {
-      pointermax = pointermid;
-    }
-    pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
-  }
-  return pointermid;
-};
-
-
-/**
- * Determine the common suffix of two strings.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {number} The number of characters common to the end of each string.
- */
-diff_match_patch.prototype.diff_commonSuffix = function(text1, text2) {
-  // Quick check for common null cases.
-  if (!text1 || !text2 ||
-      text1.charAt(text1.length - 1) != text2.charAt(text2.length - 1)) {
-    return 0;
-  }
-  // Binary search.
-  // Performance analysis: https://neil.fraser.name/news/2007/10/09/
-  var pointermin = 0;
-  var pointermax = Math.min(text1.length, text2.length);
-  var pointermid = pointermax;
-  var pointerend = 0;
-  while (pointermin < pointermid) {
-    if (text1.substring(text1.length - pointermid, text1.length - pointerend) ==
-        text2.substring(text2.length - pointermid, text2.length - pointerend)) {
-      pointermin = pointermid;
-      pointerend = pointermin;
-    } else {
-      pointermax = pointermid;
-    }
-    pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
-  }
-  return pointermid;
-};
-
-
-/**
- * Determine if the suffix of one string is the prefix of another.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {number} The number of characters common to the end of the first
- *     string and the start of the second string.
- * @private
- */
-diff_match_patch.prototype.diff_commonOverlap_ = function(text1, text2) {
-  // Cache the text lengths to prevent multiple calls.
-  var text1_length = text1.length;
-  var text2_length = text2.length;
-  // Eliminate the null case.
-  if (text1_length == 0 || text2_length == 0) {
-    return 0;
-  }
-  // Truncate the longer string.
-  if (text1_length > text2_length) {
-    text1 = text1.substring(text1_length - text2_length);
-  } else if (text1_length < text2_length) {
-    text2 = text2.substring(0, text1_length);
-  }
-  var text_length = Math.min(text1_length, text2_length);
-  // Quick check for the worst case.
-  if (text1 == text2) {
-    return text_length;
-  }
-
-  // Start by looking for a single character match
-  // and increase length until no match is found.
-  // Performance analysis: https://neil.fraser.name/news/2010/11/04/
-  var best = 0;
-  var length = 1;
-  while (true) {
-    var pattern = text1.substring(text_length - length);
-    var found = text2.indexOf(pattern);
-    if (found == -1) {
-      return best;
-    }
-    length += found;
-    if (found == 0 || text1.substring(text_length - length) ==
-        text2.substring(0, length)) {
-      best = length;
-      length++;
-    }
-  }
-};
-
-
-/**
- * Do the two texts share a substring which is at least half the length of the
- * longer text?
- * This speedup can produce non-minimal diffs.
- * @param {string} text1 First string.
- * @param {string} text2 Second string.
- * @return {Array.<string>} Five element Array, containing the prefix of
- *     text1, the suffix of text1, the prefix of text2, the suffix of
- *     text2 and the common middle.  Or null if there was no match.
- * @private
- */
-diff_match_patch.prototype.diff_halfMatch_ = function(text1, text2) {
-  if (this.Diff_Timeout <= 0) {
-    // Don't risk returning a non-optimal diff if we have unlimited time.
-    return null;
-  }
-  var longtext = text1.length > text2.length ? text1 : text2;
-  var shorttext = text1.length > text2.length ? text2 : text1;
-  if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
-    return null;  // Pointless.
-  }
-  var dmp = this;  // 'this' becomes 'window' in a closure.
-
-  /**
-   * Does a substring of shorttext exist within longtext such that the substring
-   * is at least half the length of longtext?
-   * Closure, but does not reference any external variables.
-   * @param {string} longtext Longer string.
-   * @param {string} shorttext Shorter string.
-   * @param {number} i Start index of quarter length substring within longtext.
-   * @return {Array.<string>} Five element Array, containing the prefix of
-   *     longtext, the suffix of longtext, the prefix of shorttext, the suffix
-   *     of shorttext and the common middle.  Or null if there was no match.
-   * @private
-   */
-  function diff_halfMatchI_(longtext, shorttext, i) {
-    // Start with a 1/4 length substring at position i as a seed.
-    var seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
-    var j = -1;
-    var best_common = '';
-    var best_longtext_a, best_longtext_b, best_shorttext_a, best_shorttext_b;
-    while ((j = shorttext.indexOf(seed, j + 1)) != -1) {
-      var prefixLength = dmp.diff_commonPrefix(longtext.substring(i),
-                                               shorttext.substring(j));
-      var suffixLength = dmp.diff_commonSuffix(longtext.substring(0, i),
-                                               shorttext.substring(0, j));
-      if (best_common.length < suffixLength + prefixLength) {
-        best_common = shorttext.substring(j - suffixLength, j) +
-            shorttext.substring(j, j + prefixLength);
-        best_longtext_a = longtext.substring(0, i - suffixLength);
-        best_longtext_b = longtext.substring(i + prefixLength);
-        best_shorttext_a = shorttext.substring(0, j - suffixLength);
-        best_shorttext_b = shorttext.substring(j + prefixLength);
-      }
-    }
-    if (best_common.length * 2 >= longtext.length) {
-      return [best_longtext_a, best_longtext_b,
-              best_shorttext_a, best_shorttext_b, best_common];
-    } else {
-      return null;
-    }
-  }
-
-  // First check if the second quarter is the seed for a half-match.
-  var hm1 = diff_halfMatchI_(longtext, shorttext,
-                             Math.ceil(longtext.length / 4));
-  // Check again based on the third quarter.
-  var hm2 = diff_halfMatchI_(longtext, shorttext,
-                             Math.ceil(longtext.length / 2));
-  var hm;
-  if (!hm1 && !hm2) {
-    return null;
-  } else if (!hm2) {
-    hm = hm1;
-  } else if (!hm1) {
-    hm = hm2;
-  } else {
-    // Both matched.  Select the longest.
-    hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
-  }
-
-  // A half-match was found, sort out the return data.
-  var text1_a, text1_b, text2_a, text2_b;
-  if (text1.length > text2.length) {
-    text1_a = hm[0];
-    text1_b = hm[1];
-    text2_a = hm[2];
-    text2_b = hm[3];
-  } else {
-    text2_a = hm[0];
-    text2_b = hm[1];
-    text1_a = hm[2];
-    text1_b = hm[3];
-  }
-  var mid_common = hm[4];
-  return [text1_a, text1_b, text2_a, text2_b, mid_common];
-};
-
-
-/**
- * Reduce the number of edits by eliminating semantically trivial equalities.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- */
-diff_match_patch.prototype.diff_cleanupSemantic = function(diffs) {
-  var changes = false;
-  var equalities = [];  // Stack of indices where equalities are found.
-  var equalitiesLength = 0;  // Keeping our own length var is faster in JS.
-  /** @type {?string} */
-  var lastEquality = null;
-  // Always equal to diffs[equalities[equalitiesLength - 1]][1]
-  var pointer = 0;  // Index of current position.
-  // Number of characters that changed prior to the equality.
-  var length_insertions1 = 0;
-  var length_deletions1 = 0;
-  // Number of characters that changed after the equality.
-  var length_insertions2 = 0;
-  var length_deletions2 = 0;
-  while (pointer < diffs.length) {
-    if (diffs[pointer][0] == DIFF_EQUAL) {  // Equality found.
-      equalities[equalitiesLength++] = pointer;
-      length_insertions1 = length_insertions2;
-      length_deletions1 = length_deletions2;
-      length_insertions2 = 0;
-      length_deletions2 = 0;
-      lastEquality = diffs[pointer][1];
-    } else {  // An insertion or deletion.
-      if (diffs[pointer][0] == DIFF_INSERT) {
-        length_insertions2 += diffs[pointer][1].length;
-      } else {
-        length_deletions2 += diffs[pointer][1].length;
-      }
-      // Eliminate an equality that is smaller or equal to the edits on both
-      // sides of it.
-      if (lastEquality && (lastEquality.length <=
-          Math.max(length_insertions1, length_deletions1)) &&
-          (lastEquality.length <= Math.max(length_insertions2,
-                                           length_deletions2))) {
-        // Duplicate record.
-        diffs.splice(equalities[equalitiesLength - 1], 0,
-                     new diff_match_patch.Diff(DIFF_DELETE, lastEquality));
-        // Change second copy to insert.
-        diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
-        // Throw away the equality we just deleted.
-        equalitiesLength--;
-        // Throw away the previous equality (it needs to be reevaluated).
-        equalitiesLength--;
-        pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
-        length_insertions1 = 0;  // Reset the counters.
-        length_deletions1 = 0;
-        length_insertions2 = 0;
-        length_deletions2 = 0;
-        lastEquality = null;
-        changes = true;
-      }
-    }
-    pointer++;
-  }
-
-  // Normalize the diff.
-  if (changes) {
-    this.diff_cleanupMerge(diffs);
-  }
-  this.diff_cleanupSemanticLossless(diffs);
-
-  // Find any overlaps between deletions and insertions.
-  // e.g: <del>abcxxx</del><ins>xxxdef</ins>
-  //   -> <del>abc</del>xxx<ins>def</ins>
-  // e.g: <del>xxxabc</del><ins>defxxx</ins>
-  //   -> <ins>def</ins>xxx<del>abc</del>
-  // Only extract an overlap if it is as big as the edit ahead or behind it.
-  pointer = 1;
-  while (pointer < diffs.length) {
-    if (diffs[pointer - 1][0] == DIFF_DELETE &&
-        diffs[pointer][0] == DIFF_INSERT) {
-      var deletion = diffs[pointer - 1][1];
-      var insertion = diffs[pointer][1];
-      var overlap_length1 = this.diff_commonOverlap_(deletion, insertion);
-      var overlap_length2 = this.diff_commonOverlap_(insertion, deletion);
-      if (overlap_length1 >= overlap_length2) {
-        if (overlap_length1 >= deletion.length / 2 ||
-            overlap_length1 >= insertion.length / 2) {
-          // Overlap found.  Insert an equality and trim the surrounding edits.
-          diffs.splice(pointer, 0, new diff_match_patch.Diff(DIFF_EQUAL,
-              insertion.substring(0, overlap_length1)));
-          diffs[pointer - 1][1] =
-              deletion.substring(0, deletion.length - overlap_length1);
-          diffs[pointer + 1][1] = insertion.substring(overlap_length1);
-          pointer++;
-        }
-      } else {
-        if (overlap_length2 >= deletion.length / 2 ||
-            overlap_length2 >= insertion.length / 2) {
-          // Reverse overlap found.
-          // Insert an equality and swap and trim the surrounding edits.
-          diffs.splice(pointer, 0, new diff_match_patch.Diff(DIFF_EQUAL,
-              deletion.substring(0, overlap_length2)));
-          diffs[pointer - 1][0] = DIFF_INSERT;
-          diffs[pointer - 1][1] =
-              insertion.substring(0, insertion.length - overlap_length2);
-          diffs[pointer + 1][0] = DIFF_DELETE;
-          diffs[pointer + 1][1] =
-              deletion.substring(overlap_length2);
-          pointer++;
-        }
-      }
-      pointer++;
-    }
-    pointer++;
-  }
-};
-
-
-/**
- * Look for single edits surrounded on both sides by equalities
- * which can be shifted sideways to align the edit to a word boundary.
- * e.g: The c<ins>at c</ins>ame. -> The <ins>cat </ins>came.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- */
-diff_match_patch.prototype.diff_cleanupSemanticLossless = function(diffs) {
-  /**
-   * Given two strings, compute a score representing whether the internal
-   * boundary falls on logical boundaries.
-   * Scores range from 6 (best) to 0 (worst).
-   * Closure, but does not reference any external variables.
-   * @param {string} one First string.
-   * @param {string} two Second string.
-   * @return {number} The score.
-   * @private
-   */
-  function diff_cleanupSemanticScore_(one, two) {
-    if (!one || !two) {
-      // Edges are the best.
-      return 6;
-    }
-
-    // Each port of this function behaves slightly differently due to
-    // subtle differences in each language's definition of things like
-    // 'whitespace'.  Since this function's purpose is largely cosmetic,
-    // the choice has been made to use each language's native features
-    // rather than force total conformity.
-    var char1 = one.charAt(one.length - 1);
-    var char2 = two.charAt(0);
-    var nonAlphaNumeric1 = char1.match(diff_match_patch.nonAlphaNumericRegex_);
-    var nonAlphaNumeric2 = char2.match(diff_match_patch.nonAlphaNumericRegex_);
-    var whitespace1 = nonAlphaNumeric1 &&
-        char1.match(diff_match_patch.whitespaceRegex_);
-    var whitespace2 = nonAlphaNumeric2 &&
-        char2.match(diff_match_patch.whitespaceRegex_);
-    var lineBreak1 = whitespace1 &&
-        char1.match(diff_match_patch.linebreakRegex_);
-    var lineBreak2 = whitespace2 &&
-        char2.match(diff_match_patch.linebreakRegex_);
-    var blankLine1 = lineBreak1 &&
-        one.match(diff_match_patch.blanklineEndRegex_);
-    var blankLine2 = lineBreak2 &&
-        two.match(diff_match_patch.blanklineStartRegex_);
-
-    if (blankLine1 || blankLine2) {
-      // Five points for blank lines.
-      return 5;
-    } else if (lineBreak1 || lineBreak2) {
-      // Four points for line breaks.
-      return 4;
-    } else if (nonAlphaNumeric1 && !whitespace1 && whitespace2) {
-      // Three points for end of sentences.
-      return 3;
-    } else if (whitespace1 || whitespace2) {
-      // Two points for whitespace.
-      return 2;
-    } else if (nonAlphaNumeric1 || nonAlphaNumeric2) {
-      // One point for non-alphanumeric.
-      return 1;
-    }
-    return 0;
-  }
-
-  var pointer = 1;
-  // Intentionally ignore the first and last element (don't need checking).
-  while (pointer < diffs.length - 1) {
-    if (diffs[pointer - 1][0] == DIFF_EQUAL &&
-        diffs[pointer + 1][0] == DIFF_EQUAL) {
-      // This is a single edit surrounded by equalities.
-      var equality1 = diffs[pointer - 1][1];
-      var edit = diffs[pointer][1];
-      var equality2 = diffs[pointer + 1][1];
-
-      // First, shift the edit as far left as possible.
-      var commonOffset = this.diff_commonSuffix(equality1, edit);
-      if (commonOffset) {
-        var commonString = edit.substring(edit.length - commonOffset);
-        equality1 = equality1.substring(0, equality1.length - commonOffset);
-        edit = commonString + edit.substring(0, edit.length - commonOffset);
-        equality2 = commonString + equality2;
-      }
-
-      // Second, step character by character right, looking for the best fit.
-      var bestEquality1 = equality1;
-      var bestEdit = edit;
-      var bestEquality2 = equality2;
-      var bestScore = diff_cleanupSemanticScore_(equality1, edit) +
-          diff_cleanupSemanticScore_(edit, equality2);
-      while (edit.charAt(0) === equality2.charAt(0)) {
-        equality1 += edit.charAt(0);
-        edit = edit.substring(1) + equality2.charAt(0);
-        equality2 = equality2.substring(1);
-        var score = diff_cleanupSemanticScore_(equality1, edit) +
-            diff_cleanupSemanticScore_(edit, equality2);
-        // The >= encourages trailing rather than leading whitespace on edits.
-        if (score >= bestScore) {
-          bestScore = score;
-          bestEquality1 = equality1;
-          bestEdit = edit;
-          bestEquality2 = equality2;
-        }
-      }
-
-      if (diffs[pointer - 1][1] != bestEquality1) {
-        // We have an improvement, save it back to the diff.
-        if (bestEquality1) {
-          diffs[pointer - 1][1] = bestEquality1;
-        } else {
-          diffs.splice(pointer - 1, 1);
-          pointer--;
-        }
-        diffs[pointer][1] = bestEdit;
-        if (bestEquality2) {
-          diffs[pointer + 1][1] = bestEquality2;
-        } else {
-          diffs.splice(pointer + 1, 1);
-          pointer--;
-        }
-      }
-    }
-    pointer++;
-  }
-};
-
-// Define some regex patterns for matching boundaries.
-diff_match_patch.nonAlphaNumericRegex_ = /[^a-zA-Z0-9]/;
-diff_match_patch.whitespaceRegex_ = /\s/;
-diff_match_patch.linebreakRegex_ = /[\r\n]/;
-diff_match_patch.blanklineEndRegex_ = /\n\r?\n$/;
-diff_match_patch.blanklineStartRegex_ = /^\r?\n\r?\n/;
-
-/**
- * Reduce the number of edits by eliminating operationally trivial equalities.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- */
-diff_match_patch.prototype.diff_cleanupEfficiency = function(diffs) {
-  var changes = false;
-  var equalities = [];  // Stack of indices where equalities are found.
-  var equalitiesLength = 0;  // Keeping our own length var is faster in JS.
-  /** @type {?string} */
-  var lastEquality = null;
-  // Always equal to diffs[equalities[equalitiesLength - 1]][1]
-  var pointer = 0;  // Index of current position.
-  // Is there an insertion operation before the last equality.
-  var pre_ins = false;
-  // Is there a deletion operation before the last equality.
-  var pre_del = false;
-  // Is there an insertion operation after the last equality.
-  var post_ins = false;
-  // Is there a deletion operation after the last equality.
-  var post_del = false;
-  while (pointer < diffs.length) {
-    if (diffs[pointer][0] == DIFF_EQUAL) {  // Equality found.
-      if (diffs[pointer][1].length < this.Diff_EditCost &&
-          (post_ins || post_del)) {
-        // Candidate found.
-        equalities[equalitiesLength++] = pointer;
-        pre_ins = post_ins;
-        pre_del = post_del;
-        lastEquality = diffs[pointer][1];
-      } else {
-        // Not a candidate, and can never become one.
-        equalitiesLength = 0;
-        lastEquality = null;
-      }
-      post_ins = post_del = false;
-    } else {  // An insertion or deletion.
-      if (diffs[pointer][0] == DIFF_DELETE) {
-        post_del = true;
-      } else {
-        post_ins = true;
-      }
-      /*
-       * Five types to be split:
-       * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
-       * <ins>A</ins>X<ins>C</ins><del>D</del>
-       * <ins>A</ins><del>B</del>X<ins>C</ins>
-       * <ins>A</del>X<ins>C</ins><del>D</del>
-       * <ins>A</ins><del>B</del>X<del>C</del>
-       */
-      if (lastEquality && ((pre_ins && pre_del && post_ins && post_del) ||
-                           ((lastEquality.length < this.Diff_EditCost / 2) &&
-                            (pre_ins + pre_del + post_ins + post_del) == 3))) {
-        // Duplicate record.
-        diffs.splice(equalities[equalitiesLength - 1], 0,
-                     new diff_match_patch.Diff(DIFF_DELETE, lastEquality));
-        // Change second copy to insert.
-        diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
-        equalitiesLength--;  // Throw away the equality we just deleted;
-        lastEquality = null;
-        if (pre_ins && pre_del) {
-          // No changes made which could affect previous entry, keep going.
-          post_ins = post_del = true;
-          equalitiesLength = 0;
-        } else {
-          equalitiesLength--;  // Throw away the previous equality.
-          pointer = equalitiesLength > 0 ?
-              equalities[equalitiesLength - 1] : -1;
-          post_ins = post_del = false;
-        }
-        changes = true;
-      }
-    }
-    pointer++;
-  }
-
-  if (changes) {
-    this.diff_cleanupMerge(diffs);
-  }
-};
-
-
-/**
- * Reorder and merge like edit sections.  Merge equalities.
- * Any edit section can move as long as it doesn't cross an equality.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- */
-diff_match_patch.prototype.diff_cleanupMerge = function(diffs) {
-  // Add a dummy entry at the end.
-  diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, ''));
-  var pointer = 0;
-  var count_delete = 0;
-  var count_insert = 0;
-  var text_delete = '';
-  var text_insert = '';
-  var commonlength;
-  while (pointer < diffs.length) {
-    switch (diffs[pointer][0]) {
-      case DIFF_INSERT:
-        count_insert++;
-        text_insert += diffs[pointer][1];
-        pointer++;
-        break;
-      case DIFF_DELETE:
-        count_delete++;
-        text_delete += diffs[pointer][1];
-        pointer++;
-        break;
-      case DIFF_EQUAL:
-        // Upon reaching an equality, check for prior redundancies.
-        if (count_delete + count_insert > 1) {
-          if (count_delete !== 0 && count_insert !== 0) {
-            // Factor out any common prefixies.
-            commonlength = this.diff_commonPrefix(text_insert, text_delete);
-            if (commonlength !== 0) {
-              if ((pointer - count_delete - count_insert) > 0 &&
-                  diffs[pointer - count_delete - count_insert - 1][0] ==
-                  DIFF_EQUAL) {
-                diffs[pointer - count_delete - count_insert - 1][1] +=
-                    text_insert.substring(0, commonlength);
-              } else {
-                diffs.splice(0, 0, new diff_match_patch.Diff(DIFF_EQUAL,
-                    text_insert.substring(0, commonlength)));
-                pointer++;
-              }
-              text_insert = text_insert.substring(commonlength);
-              text_delete = text_delete.substring(commonlength);
-            }
-            // Factor out any common suffixies.
-            commonlength = this.diff_commonSuffix(text_insert, text_delete);
-            if (commonlength !== 0) {
-              diffs[pointer][1] = text_insert.substring(text_insert.length -
-                  commonlength) + diffs[pointer][1];
-              text_insert = text_insert.substring(0, text_insert.length -
-                  commonlength);
-              text_delete = text_delete.substring(0, text_delete.length -
-                  commonlength);
-            }
-          }
-          // Delete the offending records and add the merged ones.
-          pointer -= count_delete + count_insert;
-          diffs.splice(pointer, count_delete + count_insert);
-          if (text_delete.length) {
-            diffs.splice(pointer, 0,
-                new diff_match_patch.Diff(DIFF_DELETE, text_delete));
-            pointer++;
-          }
-          if (text_insert.length) {
-            diffs.splice(pointer, 0,
-                new diff_match_patch.Diff(DIFF_INSERT, text_insert));
-            pointer++;
-          }
-          pointer++;
-        } else if (pointer !== 0 && diffs[pointer - 1][0] == DIFF_EQUAL) {
-          // Merge this equality with the previous one.
-          diffs[pointer - 1][1] += diffs[pointer][1];
-          diffs.splice(pointer, 1);
-        } else {
-          pointer++;
-        }
-        count_insert = 0;
-        count_delete = 0;
-        text_delete = '';
-        text_insert = '';
-        break;
-    }
-  }
-  if (diffs[diffs.length - 1][1] === '') {
-    diffs.pop();  // Remove the dummy entry at the end.
-  }
-
-  // Second pass: look for single edits surrounded on both sides by equalities
-  // which can be shifted sideways to eliminate an equality.
-  // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
-  var changes = false;
-  pointer = 1;
-  // Intentionally ignore the first and last element (don't need checking).
-  while (pointer < diffs.length - 1) {
-    if (diffs[pointer - 1][0] == DIFF_EQUAL &&
-        diffs[pointer + 1][0] == DIFF_EQUAL) {
-      // This is a single edit surrounded by equalities.
-      if (diffs[pointer][1].substring(diffs[pointer][1].length -
-          diffs[pointer - 1][1].length) == diffs[pointer - 1][1]) {
-        // Shift the edit over the previous equality.
-        diffs[pointer][1] = diffs[pointer - 1][1] +
-            diffs[pointer][1].substring(0, diffs[pointer][1].length -
-                                        diffs[pointer - 1][1].length);
-        diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
-        diffs.splice(pointer - 1, 1);
-        changes = true;
-      } else if (diffs[pointer][1].substring(0, diffs[pointer + 1][1].length) ==
-          diffs[pointer + 1][1]) {
-        // Shift the edit over the next equality.
-        diffs[pointer - 1][1] += diffs[pointer + 1][1];
-        diffs[pointer][1] =
-            diffs[pointer][1].substring(diffs[pointer + 1][1].length) +
-            diffs[pointer + 1][1];
-        diffs.splice(pointer + 1, 1);
-        changes = true;
-      }
-    }
-    pointer++;
-  }
-  // If shifts were made, the diff needs reordering and another shift sweep.
-  if (changes) {
-    this.diff_cleanupMerge(diffs);
-  }
-};
-
-
-/**
- * loc is a location in text1, compute and return the equivalent location in
- * text2.
- * e.g. 'The cat' vs 'The big cat', 1->1, 5->8
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @param {number} loc Location within text1.
- * @return {number} Location within text2.
- */
-diff_match_patch.prototype.diff_xIndex = function(diffs, loc) {
-  var chars1 = 0;
-  var chars2 = 0;
-  var last_chars1 = 0;
-  var last_chars2 = 0;
-  var x;
-  for (x = 0; x < diffs.length; x++) {
-    if (diffs[x][0] !== DIFF_INSERT) {  // Equality or deletion.
-      chars1 += diffs[x][1].length;
-    }
-    if (diffs[x][0] !== DIFF_DELETE) {  // Equality or insertion.
-      chars2 += diffs[x][1].length;
-    }
-    if (chars1 > loc) {  // Overshot the location.
-      break;
-    }
-    last_chars1 = chars1;
-    last_chars2 = chars2;
-  }
-  // Was the location was deleted?
-  if (diffs.length != x && diffs[x][0] === DIFF_DELETE) {
-    return last_chars2;
-  }
-  // Add the remaining character length.
-  return last_chars2 + (loc - last_chars1);
-};
-
-
-/**
- * Convert a diff array into a pretty HTML report.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @return {string} HTML representation.
- */
-diff_match_patch.prototype.diff_prettyHtml = function(diffs) {
-  var html = [];
-  var pattern_amp = /&/g;
-  var pattern_lt = /</g;
-  var pattern_gt = />/g;
-  var pattern_para = /\n/g;
-  for (var x = 0; x < diffs.length; x++) {
-    var op = diffs[x][0];    // Operation (insert, delete, equal)
-    var data = diffs[x][1];  // Text of change.
-    var text = data.replace(pattern_amp, '&amp;').replace(pattern_lt, '&lt;')
-        .replace(pattern_gt, '&gt;').replace(pattern_para, '&para;<br>');
-    switch (op) {
-      case DIFF_INSERT:
-        html[x] = '<ins style="background:#e6ffe6;">' + text + '</ins>';
-        break;
-      case DIFF_DELETE:
-        html[x] = '<del style="background:#ffe6e6;">' + text + '</del>';
-        break;
-      case DIFF_EQUAL:
-        html[x] = '<span>' + text + '</span>';
-        break;
-    }
-  }
-  return html.join('');
-};
-
-
-/**
- * Compute and return the source text (all equalities and deletions).
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @return {string} Source text.
- */
-diff_match_patch.prototype.diff_text1 = function(diffs) {
-  var text = [];
-  for (var x = 0; x < diffs.length; x++) {
-    if (diffs[x][0] !== DIFF_INSERT) {
-      text[x] = diffs[x][1];
-    }
-  }
-  return text.join('');
-};
-
-
-/**
- * Compute and return the destination text (all equalities and insertions).
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @return {string} Destination text.
- */
-diff_match_patch.prototype.diff_text2 = function(diffs) {
-  var text = [];
-  for (var x = 0; x < diffs.length; x++) {
-    if (diffs[x][0] !== DIFF_DELETE) {
-      text[x] = diffs[x][1];
-    }
-  }
-  return text.join('');
-};
-
-
-/**
- * Compute the Levenshtein distance; the number of inserted, deleted or
- * substituted characters.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @return {number} Number of changes.
- */
-diff_match_patch.prototype.diff_levenshtein = function(diffs) {
-  var levenshtein = 0;
-  var insertions = 0;
-  var deletions = 0;
-  for (var x = 0; x < diffs.length; x++) {
-    var op = diffs[x][0];
-    var data = diffs[x][1];
-    switch (op) {
-      case DIFF_INSERT:
-        insertions += data.length;
-        break;
-      case DIFF_DELETE:
-        deletions += data.length;
-        break;
-      case DIFF_EQUAL:
-        // A deletion and an insertion is one substitution.
-        levenshtein += Math.max(insertions, deletions);
-        insertions = 0;
-        deletions = 0;
-        break;
-    }
-  }
-  levenshtein += Math.max(insertions, deletions);
-  return levenshtein;
-};
-
-
-/**
- * Crush the diff into an encoded string which describes the operations
- * required to transform text1 into text2.
- * E.g. =3\t-2\t+ing  -> Keep 3 chars, delete 2 chars, insert 'ing'.
- * Operations are tab-separated.  Inserted text is escaped using %xx notation.
- * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
- * @return {string} Delta text.
- */
-diff_match_patch.prototype.diff_toDelta = function(diffs) {
-  var text = [];
-  for (var x = 0; x < diffs.length; x++) {
-    switch (diffs[x][0]) {
-      case DIFF_INSERT:
-        text[x] = '+' + encodeURI(diffs[x][1]);
-        break;
-      case DIFF_DELETE:
-        text[x] = '-' + diffs[x][1].length;
-        break;
-      case DIFF_EQUAL:
-        text[x] = '=' + diffs[x][1].length;
-        break;
-    }
-  }
-  return text.join('\t').replace(/%20/g, ' ');
-};
-
-
-/**
- * Given the original text1, and an encoded string which describes the
- * operations required to transform text1 into text2, compute the full diff.
- * @param {string} text1 Source string for the diff.
- * @param {string} delta Delta text.
- * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
- * @throws {!Error} If invalid input.
- */
-diff_match_patch.prototype.diff_fromDelta = function(text1, delta) {
-  var diffs = [];
-  var diffsLength = 0;  // Keeping our own length var is faster in JS.
-  var pointer = 0;  // Cursor in text1
-  var tokens = delta.split(/\t/g);
-  for (var x = 0; x < tokens.length; x++) {
-    // Each token begins with a one character parameter which specifies the
-    // operation of this token (delete, insert, equality).
-    var param = tokens[x].substring(1);
-    switch (tokens[x].charAt(0)) {
-      case '+':
-        try {
-          diffs[diffsLength++] =
-              new diff_match_patch.Diff(DIFF_INSERT, decodeURI(param));
-        } catch (ex) {
-          // Malformed URI sequence.
-          throw new Error('Illegal escape in diff_fromDelta: ' + param);
-        }
-        break;
-      case '-':
-        // Fall through.
-      case '=':
-        var n = parseInt(param, 10);
-        if (isNaN(n) || n < 0) {
-          throw new Error('Invalid number in diff_fromDelta: ' + param);
-        }
-        var text = text1.substring(pointer, pointer += n);
-        if (tokens[x].charAt(0) == '=') {
-          diffs[diffsLength++] = new diff_match_patch.Diff(DIFF_EQUAL, text);
-        } else {
-          diffs[diffsLength++] = new diff_match_patch.Diff(DIFF_DELETE, text);
-        }
-        break;
-      default:
-        // Blank tokens are ok (from a trailing \t).
-        // Anything else is an error.
-        if (tokens[x]) {
-          throw new Error('Invalid diff operation in diff_fromDelta: ' +
-                          tokens[x]);
-        }
-    }
-  }
-  if (pointer != text1.length) {
-    throw new Error('Delta length (' + pointer +
-        ') does not equal source text length (' + text1.length + ').');
-  }
-  return diffs;
-};
-
-
-//  MATCH FUNCTIONS
-
-
-/**
- * Locate the best instance of 'pattern' in 'text' near 'loc'.
- * @param {string} text The text to search.
- * @param {string} pattern The pattern to search for.
- * @param {number} loc The location to search around.
- * @return {number} Best match index or -1.
- */
-diff_match_patch.prototype.match_main = function(text, pattern, loc) {
-  // Check for null inputs.
-  if (text == null || pattern == null || loc == null) {
-    throw new Error('Null input. (match_main)');
-  }
-
-  loc = Math.max(0, Math.min(loc, text.length));
-  if (text == pattern) {
-    // Shortcut (potentially not guaranteed by the algorithm)
-    return 0;
-  } else if (!text.length) {
-    // Nothing to match.
-    return -1;
-  } else if (text.substring(loc, loc + pattern.length) == pattern) {
-    // Perfect match at the perfect spot!  (Includes case of null pattern)
-    return loc;
-  } else {
-    // Do a fuzzy compare.
-    return this.match_bitap_(text, pattern, loc);
-  }
-};
-
-
-/**
- * Locate the best instance of 'pattern' in 'text' near 'loc' using the
- * Bitap algorithm.
- * @param {string} text The text to search.
- * @param {string} pattern The pattern to search for.
- * @param {number} loc The location to search around.
- * @return {number} Best match index or -1.
- * @private
- */
-diff_match_patch.prototype.match_bitap_ = function(text, pattern, loc) {
-  if (pattern.length > this.Match_MaxBits) {
-    throw new Error('Pattern too long for this browser.');
-  }
-
-  // Initialise the alphabet.
-  var s = this.match_alphabet_(pattern);
-
-  var dmp = this;  // 'this' becomes 'window' in a closure.
-
-  /**
-   * Compute and return the score for a match with e errors and x location.
-   * Accesses loc and pattern through being a closure.
-   * @param {number} e Number of errors in match.
-   * @param {number} x Location of match.
-   * @return {number} Overall score for match (0.0 = good, 1.0 = bad).
-   * @private
-   */
-  function match_bitapScore_(e, x) {
-    var accuracy = e / pattern.length;
-    var proximity = Math.abs(loc - x);
-    if (!dmp.Match_Distance) {
-      // Dodge divide by zero error.
-      return proximity ? 1.0 : accuracy;
-    }
-    return accuracy + (proximity / dmp.Match_Distance);
-  }
-
-  // Highest score beyond which we give up.
-  var score_threshold = this.Match_Threshold;
-  // Is there a nearby exact match? (speedup)
-  var best_loc = text.indexOf(pattern, loc);
-  if (best_loc != -1) {
-    score_threshold = Math.min(match_bitapScore_(0, best_loc), score_threshold);
-    // What about in the other direction? (speedup)
-    best_loc = text.lastIndexOf(pattern, loc + pattern.length);
-    if (best_loc != -1) {
-      score_threshold =
-          Math.min(match_bitapScore_(0, best_loc), score_threshold);
-    }
-  }
-
-  // Initialise the bit arrays.
-  var matchmask = 1 << (pattern.length - 1);
-  best_loc = -1;
-
-  var bin_min, bin_mid;
-  var bin_max = pattern.length + text.length;
-  var last_rd;
-  for (var d = 0; d < pattern.length; d++) {
-    // Scan for the best match; each iteration allows for one more error.
-    // Run a binary search to determine how far from 'loc' we can stray at this
-    // error level.
-    bin_min = 0;
-    bin_mid = bin_max;
-    while (bin_min < bin_mid) {
-      if (match_bitapScore_(d, loc + bin_mid) <= score_threshold) {
-        bin_min = bin_mid;
-      } else {
-        bin_max = bin_mid;
-      }
-      bin_mid = Math.floor((bin_max - bin_min) / 2 + bin_min);
-    }
-    // Use the result from this iteration as the maximum for the next.
-    bin_max = bin_mid;
-    var start = Math.max(1, loc - bin_mid + 1);
-    var finish = Math.min(loc + bin_mid, text.length) + pattern.length;
-
-    var rd = Array(finish + 2);
-    rd[finish + 1] = (1 << d) - 1;
-    for (var j = finish; j >= start; j--) {
-      // The alphabet (s) is a sparse hash, so the following line generates
-      // warnings.
-      var charMatch = s[text.charAt(j - 1)];
-      if (d === 0) {  // First pass: exact match.
-        rd[j] = ((rd[j + 1] << 1) | 1) & charMatch;
-      } else {  // Subsequent passes: fuzzy match.
-        rd[j] = (((rd[j + 1] << 1) | 1) & charMatch) |
-                (((last_rd[j + 1] | last_rd[j]) << 1) | 1) |
-                last_rd[j + 1];
-      }
-      if (rd[j] & matchmask) {
-        var score = match_bitapScore_(d, j - 1);
-        // This match will almost certainly be better than any existing match.
-        // But check anyway.
-        if (score <= score_threshold) {
-          // Told you so.
-          score_threshold = score;
-          best_loc = j - 1;
-          if (best_loc > loc) {
-            // When passing loc, don't exceed our current distance from loc.
-            start = Math.max(1, 2 * loc - best_loc);
-          } else {
-            // Already passed loc, downhill from here on in.
-            break;
-          }
-        }
-      }
-    }
-    // No hope for a (better) match at greater error levels.
-    if (match_bitapScore_(d + 1, loc) > score_threshold) {
-      break;
-    }
-    last_rd = rd;
-  }
-  return best_loc;
-};
-
-
-/**
- * Initialise the alphabet for the Bitap algorithm.
- * @param {string} pattern The text to encode.
- * @return {!Object} Hash of character locations.
- * @private
- */
-diff_match_patch.prototype.match_alphabet_ = function(pattern) {
-  var s = {};
-  for (var i = 0; i < pattern.length; i++) {
-    s[pattern.charAt(i)] = 0;
-  }
-  for (var i = 0; i < pattern.length; i++) {
-    s[pattern.charAt(i)] |= 1 << (pattern.length - i - 1);
-  }
-  return s;
-};
-
-
-//  PATCH FUNCTIONS
-
-
-/**
- * Increase the context until it is unique,
- * but don't let the pattern expand beyond Match_MaxBits.
- * @param {!diff_match_patch.patch_obj} patch The patch to grow.
- * @param {string} text Source text.
- * @private
- */
-diff_match_patch.prototype.patch_addContext_ = function(patch, text) {
-  if (text.length == 0) {
-    return;
-  }
-  if (patch.start2 === null) {
-    throw Error('patch not initialized');
-  }
-  var pattern = text.substring(patch.start2, patch.start2 + patch.length1);
-  var padding = 0;
-
-  // Look for the first and last matches of pattern in text.  If two different
-  // matches are found, increase the pattern length.
-  while (text.indexOf(pattern) != text.lastIndexOf(pattern) &&
-         pattern.length < this.Match_MaxBits - this.Patch_Margin -
-         this.Patch_Margin) {
-    padding += this.Patch_Margin;
-    pattern = text.substring(patch.start2 - padding,
-                             patch.start2 + patch.length1 + padding);
-  }
-  // Add one chunk for good luck.
-  padding += this.Patch_Margin;
-
-  // Add the prefix.
-  var prefix = text.substring(patch.start2 - padding, patch.start2);
-  if (prefix) {
-    patch.diffs.unshift(new diff_match_patch.Diff(DIFF_EQUAL, prefix));
-  }
-  // Add the suffix.
-  var suffix = text.substring(patch.start2 + patch.length1,
-                              patch.start2 + patch.length1 + padding);
-  if (suffix) {
-    patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, suffix));
-  }
-
-  // Roll back the start points.
-  patch.start1 -= prefix.length;
-  patch.start2 -= prefix.length;
-  // Extend the lengths.
-  patch.length1 += prefix.length + suffix.length;
-  patch.length2 += prefix.length + suffix.length;
-};
-
-
-/**
- * Compute a list of patches to turn text1 into text2.
- * Use diffs if provided, otherwise compute it ourselves.
- * There are four ways to call this function, depending on what data is
- * available to the caller:
- * Method 1:
- * a = text1, b = text2
- * Method 2:
- * a = diffs
- * Method 3 (optimal):
- * a = text1, b = diffs
- * Method 4 (deprecated, use method 3):
- * a = text1, b = text2, c = diffs
- *
- * @param {string|!Array.<!diff_match_patch.Diff>} a text1 (methods 1,3,4) or
- * Array of diff tuples for text1 to text2 (method 2).
- * @param {string|!Array.<!diff_match_patch.Diff>=} opt_b text2 (methods 1,4) or
- * Array of diff tuples for text1 to text2 (method 3) or undefined (method 2).
- * @param {string|!Array.<!diff_match_patch.Diff>=} opt_c Array of diff tuples
- * for text1 to text2 (method 4) or undefined (methods 1,2,3).
- * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects.
- */
-diff_match_patch.prototype.patch_make = function(a, opt_b, opt_c) {
-  var text1, diffs;
-  if (typeof a == 'string' && typeof opt_b == 'string' &&
-      typeof opt_c == 'undefined') {
-    // Method 1: text1, text2
-    // Compute diffs from text1 and text2.
-    text1 = /** @type {string} */(a);
-    diffs = this.diff_main(text1, /** @type {string} */(opt_b), true);
-    if (diffs.length > 2) {
-      this.diff_cleanupSemantic(diffs);
-      this.diff_cleanupEfficiency(diffs);
-    }
-  } else if (a && typeof a == 'object' && typeof opt_b == 'undefined' &&
-      typeof opt_c == 'undefined') {
-    // Method 2: diffs
-    // Compute text1 from diffs.
-    diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(a);
-    text1 = this.diff_text1(diffs);
-  } else if (typeof a == 'string' && opt_b && typeof opt_b == 'object' &&
-      typeof opt_c == 'undefined') {
-    // Method 3: text1, diffs
-    text1 = /** @type {string} */(a);
-    diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(opt_b);
-  } else if (typeof a == 'string' && typeof opt_b == 'string' &&
-      opt_c && typeof opt_c == 'object') {
-    // Method 4: text1, text2, diffs
-    // text2 is not used.
-    text1 = /** @type {string} */(a);
-    diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(opt_c);
-  } else {
-    throw new Error('Unknown call format to patch_make.');
-  }
-
-  if (diffs.length === 0) {
-    return [];  // Get rid of the null case.
-  }
-  var patches = [];
-  var patch = new diff_match_patch.patch_obj();
-  var patchDiffLength = 0;  // Keeping our own length var is faster in JS.
-  var char_count1 = 0;  // Number of characters into the text1 string.
-  var char_count2 = 0;  // Number of characters into the text2 string.
-  // Start with text1 (prepatch_text) and apply the diffs until we arrive at
-  // text2 (postpatch_text).  We recreate the patches one by one to determine
-  // context info.
-  var prepatch_text = text1;
-  var postpatch_text = text1;
-  for (var x = 0; x < diffs.length; x++) {
-    var diff_type = diffs[x][0];
-    var diff_text = diffs[x][1];
-
-    if (!patchDiffLength && diff_type !== DIFF_EQUAL) {
-      // A new patch starts here.
-      patch.start1 = char_count1;
-      patch.start2 = char_count2;
-    }
-
-    switch (diff_type) {
-      case DIFF_INSERT:
-        patch.diffs[patchDiffLength++] = diffs[x];
-        patch.length2 += diff_text.length;
-        postpatch_text = postpatch_text.substring(0, char_count2) + diff_text +
-                         postpatch_text.substring(char_count2);
-        break;
-      case DIFF_DELETE:
-        patch.length1 += diff_text.length;
-        patch.diffs[patchDiffLength++] = diffs[x];
-        postpatch_text = postpatch_text.substring(0, char_count2) +
-                         postpatch_text.substring(char_count2 +
-                             diff_text.length);
-        break;
-      case DIFF_EQUAL:
-        if (diff_text.length <= 2 * this.Patch_Margin &&
-            patchDiffLength && diffs.length != x + 1) {
-          // Small equality inside a patch.
-          patch.diffs[patchDiffLength++] = diffs[x];
-          patch.length1 += diff_text.length;
-          patch.length2 += diff_text.length;
-        } else if (diff_text.length >= 2 * this.Patch_Margin) {
-          // Time for a new patch.
-          if (patchDiffLength) {
-            this.patch_addContext_(patch, prepatch_text);
-            patches.push(patch);
-            patch = new diff_match_patch.patch_obj();
-            patchDiffLength = 0;
-            // Unlike Unidiff, our patch lists have a rolling context.
-            // https://github.com/google/diff-match-patch/wiki/Unidiff
-            // Update prepatch text & pos to reflect the application of the
-            // just completed patch.
-            prepatch_text = postpatch_text;
-            char_count1 = char_count2;
-          }
-        }
-        break;
-    }
-
-    // Update the current character count.
-    if (diff_type !== DIFF_INSERT) {
-      char_count1 += diff_text.length;
-    }
-    if (diff_type !== DIFF_DELETE) {
-      char_count2 += diff_text.length;
-    }
-  }
-  // Pick up the leftover patch if not empty.
-  if (patchDiffLength) {
-    this.patch_addContext_(patch, prepatch_text);
-    patches.push(patch);
-  }
-
-  return patches;
-};
-
-
-/**
- * Given an array of patches, return another array that is identical.
- * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
- * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects.
- */
-diff_match_patch.prototype.patch_deepCopy = function(patches) {
-  // Making deep copies is hard in JavaScript.
-  var patchesCopy = [];
-  for (var x = 0; x < patches.length; x++) {
-    var patch = patches[x];
-    var patchCopy = new diff_match_patch.patch_obj();
-    patchCopy.diffs = [];
-    for (var y = 0; y < patch.diffs.length; y++) {
-      patchCopy.diffs[y] =
-          new diff_match_patch.Diff(patch.diffs[y][0], patch.diffs[y][1]);
-    }
-    patchCopy.start1 = patch.start1;
-    patchCopy.start2 = patch.start2;
-    patchCopy.length1 = patch.length1;
-    patchCopy.length2 = patch.length2;
-    patchesCopy[x] = patchCopy;
-  }
-  return patchesCopy;
-};
-
-
-/**
- * Merge a set of patches onto the text.  Return a patched text, as well
- * as a list of true/false values indicating which patches were applied.
- * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
- * @param {string} text Old text.
- * @return {!Array.<string|!Array.<boolean>>} Two element Array, containing the
- *      new text and an array of boolean values.
- */
-diff_match_patch.prototype.patch_apply = function(patches, text) {
-  if (patches.length == 0) {
-    return [text, []];
-  }
-
-  // Deep copy the patches so that no changes are made to originals.
-  patches = this.patch_deepCopy(patches);
-
-  var nullPadding = this.patch_addPadding(patches);
-  text = nullPadding + text + nullPadding;
-
-  this.patch_splitMax(patches);
-  // delta keeps track of the offset between the expected and actual location
-  // of the previous patch.  If there are patches expected at positions 10 and
-  // 20, but the first patch was found at 12, delta is 2 and the second patch
-  // has an effective expected position of 22.
-  var delta = 0;
-  var results = [];
-  for (var x = 0; x < patches.length; x++) {
-    var expected_loc = patches[x].start2 + delta;
-    var text1 = this.diff_text1(patches[x].diffs);
-    var start_loc;
-    var end_loc = -1;
-    if (text1.length > this.Match_MaxBits) {
-      // patch_splitMax will only provide an oversized pattern in the case of
-      // a monster delete.
-      start_loc = this.match_main(text, text1.substring(0, this.Match_MaxBits),
-                                  expected_loc);
-      if (start_loc != -1) {
-        end_loc = this.match_main(text,
-            text1.substring(text1.length - this.Match_MaxBits),
-            expected_loc + text1.length - this.Match_MaxBits);
-        if (end_loc == -1 || start_loc >= end_loc) {
-          // Can't find valid trailing context.  Drop this patch.
-          start_loc = -1;
-        }
-      }
-    } else {
-      start_loc = this.match_main(text, text1, expected_loc);
-    }
-    if (start_loc == -1) {
-      // No match found.  :(
-      results[x] = false;
-      // Subtract the delta for this failed patch from subsequent patches.
-      delta -= patches[x].length2 - patches[x].length1;
-    } else {
-      // Found a match.  :)
-      results[x] = true;
-      delta = start_loc - expected_loc;
-      var text2;
-      if (end_loc == -1) {
-        text2 = text.substring(start_loc, start_loc + text1.length);
-      } else {
-        text2 = text.substring(start_loc, end_loc + this.Match_MaxBits);
-      }
-      if (text1 == text2) {
-        // Perfect match, just shove the replacement text in.
-        text = text.substring(0, start_loc) +
-               this.diff_text2(patches[x].diffs) +
-               text.substring(start_loc + text1.length);
-      } else {
-        // Imperfect match.  Run a diff to get a framework of equivalent
-        // indices.
-        var diffs = this.diff_main(text1, text2, false);
-        if (text1.length > this.Match_MaxBits &&
-            this.diff_levenshtein(diffs) / text1.length >
-            this.Patch_DeleteThreshold) {
-          // The end points match, but the content is unacceptably bad.
-          results[x] = false;
-        } else {
-          this.diff_cleanupSemanticLossless(diffs);
-          var index1 = 0;
-          var index2;
-          for (var y = 0; y < patches[x].diffs.length; y++) {
-            var mod = patches[x].diffs[y];
-            if (mod[0] !== DIFF_EQUAL) {
-              index2 = this.diff_xIndex(diffs, index1);
-            }
-            if (mod[0] === DIFF_INSERT) {  // Insertion
-              text = text.substring(0, start_loc + index2) + mod[1] +
-                     text.substring(start_loc + index2);
-            } else if (mod[0] === DIFF_DELETE) {  // Deletion
-              text = text.substring(0, start_loc + index2) +
-                     text.substring(start_loc + this.diff_xIndex(diffs,
-                         index1 + mod[1].length));
-            }
-            if (mod[0] !== DIFF_DELETE) {
-              index1 += mod[1].length;
-            }
-          }
-        }
-      }
-    }
-  }
-  // Strip the padding off.
-  text = text.substring(nullPadding.length, text.length - nullPadding.length);
-  return [text, results];
-};
-
-
-/**
- * Add some padding on text start and end so that edges can match something.
- * Intended to be called only from within patch_apply.
- * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
- * @return {string} The padding string added to each side.
- */
-diff_match_patch.prototype.patch_addPadding = function(patches) {
-  var paddingLength = this.Patch_Margin;
-  var nullPadding = '';
-  for (var x = 1; x <= paddingLength; x++) {
-    nullPadding += String.fromCharCode(x);
-  }
-
-  // Bump all the patches forward.
-  for (var x = 0; x < patches.length; x++) {
-    patches[x].start1 += paddingLength;
-    patches[x].start2 += paddingLength;
-  }
-
-  // Add some padding on start of first diff.
-  var patch = patches[0];
-  var diffs = patch.diffs;
-  if (diffs.length == 0 || diffs[0][0] != DIFF_EQUAL) {
-    // Add nullPadding equality.
-    diffs.unshift(new diff_match_patch.Diff(DIFF_EQUAL, nullPadding));
-    patch.start1 -= paddingLength;  // Should be 0.
-    patch.start2 -= paddingLength;  // Should be 0.
-    patch.length1 += paddingLength;
-    patch.length2 += paddingLength;
-  } else if (paddingLength > diffs[0][1].length) {
-    // Grow first equality.
-    var extraLength = paddingLength - diffs[0][1].length;
-    diffs[0][1] = nullPadding.substring(diffs[0][1].length) + diffs[0][1];
-    patch.start1 -= extraLength;
-    patch.start2 -= extraLength;
-    patch.length1 += extraLength;
-    patch.length2 += extraLength;
-  }
-
-  // Add some padding on end of last diff.
-  patch = patches[patches.length - 1];
-  diffs = patch.diffs;
-  if (diffs.length == 0 || diffs[diffs.length - 1][0] != DIFF_EQUAL) {
-    // Add nullPadding equality.
-    diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, nullPadding));
-    patch.length1 += paddingLength;
-    patch.length2 += paddingLength;
-  } else if (paddingLength > diffs[diffs.length - 1][1].length) {
-    // Grow last equality.
-    var extraLength = paddingLength - diffs[diffs.length - 1][1].length;
-    diffs[diffs.length - 1][1] += nullPadding.substring(0, extraLength);
-    patch.length1 += extraLength;
-    patch.length2 += extraLength;
-  }
-
-  return nullPadding;
-};
-
-
-/**
- * Look through the patches and break up any which are longer than the maximum
- * limit of the match algorithm.
- * Intended to be called only from within patch_apply.
- * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
- */
-diff_match_patch.prototype.patch_splitMax = function(patches) {
-  var patch_size = this.Match_MaxBits;
-  for (var x = 0; x < patches.length; x++) {
-    if (patches[x].length1 <= patch_size) {
-      continue;
-    }
-    var bigpatch = patches[x];
-    // Remove the big old patch.
-    patches.splice(x--, 1);
-    var start1 = bigpatch.start1;
-    var start2 = bigpatch.start2;
-    var precontext = '';
-    while (bigpatch.diffs.length !== 0) {
-      // Create one of several smaller patches.
-      var patch = new diff_match_patch.patch_obj();
-      var empty = true;
-      patch.start1 = start1 - precontext.length;
-      patch.start2 = start2 - precontext.length;
-      if (precontext !== '') {
-        patch.length1 = patch.length2 = precontext.length;
-        patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, precontext));
-      }
-      while (bigpatch.diffs.length !== 0 &&
-             patch.length1 < patch_size - this.Patch_Margin) {
-        var diff_type = bigpatch.diffs[0][0];
-        var diff_text = bigpatch.diffs[0][1];
-        if (diff_type === DIFF_INSERT) {
-          // Insertions are harmless.
-          patch.length2 += diff_text.length;
-          start2 += diff_text.length;
-          patch.diffs.push(bigpatch.diffs.shift());
-          empty = false;
-        } else if (diff_type === DIFF_DELETE && patch.diffs.length == 1 &&
-                   patch.diffs[0][0] == DIFF_EQUAL &&
-                   diff_text.length > 2 * patch_size) {
-          // This is a large deletion.  Let it pass in one chunk.
-          patch.length1 += diff_text.length;
-          start1 += diff_text.length;
-          empty = false;
-          patch.diffs.push(new diff_match_patch.Diff(diff_type, diff_text));
-          bigpatch.diffs.shift();
-        } else {
-          // Deletion or equality.  Only take as much as we can stomach.
-          diff_text = diff_text.substring(0,
-              patch_size - patch.length1 - this.Patch_Margin);
-          patch.length1 += diff_text.length;
-          start1 += diff_text.length;
-          if (diff_type === DIFF_EQUAL) {
-            patch.length2 += diff_text.length;
-            start2 += diff_text.length;
-          } else {
-            empty = false;
-          }
-          patch.diffs.push(new diff_match_patch.Diff(diff_type, diff_text));
-          if (diff_text == bigpatch.diffs[0][1]) {
-            bigpatch.diffs.shift();
-          } else {
-            bigpatch.diffs[0][1] =
-                bigpatch.diffs[0][1].substring(diff_text.length);
-          }
-        }
-      }
-      // Compute the head context for the next patch.
-      precontext = this.diff_text2(patch.diffs);
-      precontext =
-          precontext.substring(precontext.length - this.Patch_Margin);
-      // Append the end context for this patch.
-      var postcontext = this.diff_text1(bigpatch.diffs)
-                            .substring(0, this.Patch_Margin);
-      if (postcontext !== '') {
-        patch.length1 += postcontext.length;
-        patch.length2 += postcontext.length;
-        if (patch.diffs.length !== 0 &&
-            patch.diffs[patch.diffs.length - 1][0] === DIFF_EQUAL) {
-          patch.diffs[patch.diffs.length - 1][1] += postcontext;
-        } else {
-          patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, postcontext));
-        }
-      }
-      if (!empty) {
-        patches.splice(++x, 0, patch);
-      }
-    }
-  }
-};
-
-
-/**
- * Take a list of patches and return a textual representation.
- * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
- * @return {string} Text representation of patches.
- */
-diff_match_patch.prototype.patch_toText = function(patches) {
-  var text = [];
-  for (var x = 0; x < patches.length; x++) {
-    text[x] = patches[x];
-  }
-  return text.join('');
-};
-
-
-/**
- * Parse a textual representation of patches and return a list of Patch objects.
- * @param {string} textline Text representation of patches.
- * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects.
- * @throws {!Error} If invalid input.
- */
-diff_match_patch.prototype.patch_fromText = function(textline) {
-  var patches = [];
-  if (!textline) {
-    return patches;
-  }
-  var text = textline.split('\n');
-  var textPointer = 0;
-  var patchHeader = /^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;
-  while (textPointer < text.length) {
-    var m = text[textPointer].match(patchHeader);
-    if (!m) {
-      throw new Error('Invalid patch string: ' + text[textPointer]);
-    }
-    var patch = new diff_match_patch.patch_obj();
-    patches.push(patch);
-    patch.start1 = parseInt(m[1], 10);
-    if (m[2] === '') {
-      patch.start1--;
-      patch.length1 = 1;
-    } else if (m[2] == '0') {
-      patch.length1 = 0;
-    } else {
-      patch.start1--;
-      patch.length1 = parseInt(m[2], 10);
-    }
-
-    patch.start2 = parseInt(m[3], 10);
-    if (m[4] === '') {
-      patch.start2--;
-      patch.length2 = 1;
-    } else if (m[4] == '0') {
-      patch.length2 = 0;
-    } else {
-      patch.start2--;
-      patch.length2 = parseInt(m[4], 10);
-    }
-    textPointer++;
-
-    while (textPointer < text.length) {
-      var sign = text[textPointer].charAt(0);
-      try {
-        var line = decodeURI(text[textPointer].substring(1));
-      } catch (ex) {
-        // Malformed URI sequence.
-        throw new Error('Illegal escape in patch_fromText: ' + line);
-      }
-      if (sign == '-') {
-        // Deletion.
-        patch.diffs.push(new diff_match_patch.Diff(DIFF_DELETE, line));
-      } else if (sign == '+') {
-        // Insertion.
-        patch.diffs.push(new diff_match_patch.Diff(DIFF_INSERT, line));
-      } else if (sign == ' ') {
-        // Minor equality.
-        patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, line));
-      } else if (sign == '@') {
-        // Start of next patch.
-        break;
-      } else if (sign === '') {
-        // Blank line?  Whatever.
-      } else {
-        // WTF?
-        throw new Error('Invalid patch mode "' + sign + '" in: ' + line);
-      }
-      textPointer++;
-    }
-  }
-  return patches;
-};
-
-
-/**
- * Class representing one patch operation.
- * @constructor
- */
-diff_match_patch.patch_obj = function() {
-  /** @type {!Array.<!diff_match_patch.Diff>} */
-  this.diffs = [];
-  /** @type {?number} */
-  this.start1 = null;
-  /** @type {?number} */
-  this.start2 = null;
-  /** @type {number} */
-  this.length1 = 0;
-  /** @type {number} */
-  this.length2 = 0;
-};
-
-
-/**
- * Emulate GNU diff's format.
- * Header: @@ -382,8 +481,9 @@
- * Indices are printed as 1-based, not 0-based.
- * @return {string} The GNU diff string.
- */
-diff_match_patch.patch_obj.prototype.toString = function() {
-  var coords1, coords2;
-  if (this.length1 === 0) {
-    coords1 = this.start1 + ',0';
-  } else if (this.length1 == 1) {
-    coords1 = this.start1 + 1;
-  } else {
-    coords1 = (this.start1 + 1) + ',' + this.length1;
-  }
-  if (this.length2 === 0) {
-    coords2 = this.start2 + ',0';
-  } else if (this.length2 == 1) {
-    coords2 = this.start2 + 1;
-  } else {
-    coords2 = (this.start2 + 1) + ',' + this.length2;
-  }
-  var text = ['@@ -' + coords1 + ' +' + coords2 + ' @@\n'];
-  var op;
-  // Escape the body of the patch with %xx notation.
-  for (var x = 0; x < this.diffs.length; x++) {
-    switch (this.diffs[x][0]) {
-      case DIFF_INSERT:
-        op = '+';
-        break;
-      case DIFF_DELETE:
-        op = '-';
-        break;
-      case DIFF_EQUAL:
-        op = ' ';
-        break;
-    }
-    text[x + 1] = op + encodeURI(this.diffs[x][1]) + '\n';
-  }
-  return text.join('').replace(/%20/g, ' ');
-};
-
-module.exports = { diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL };
diff --git a/packages/playwright-core/src/utils.ts b/packages/playwright-core/src/utils.ts
new file mode 100644
index 0000000000000..db049937ce068
--- /dev/null
+++ b/packages/playwright-core/src/utils.ts
@@ -0,0 +1,58 @@
+/**
+ * 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 * from './utils/isomorphic/ariaSnapshot';
+export * from './utils/isomorphic/assert';
+export * from './utils/isomorphic/colors';
+export * from './utils/isomorphic/headers';
+export * from './utils/isomorphic/locatorGenerators';
+export * from './utils/isomorphic/manualPromise';
+export * from './utils/isomorphic/mimeType';
+export * from './utils/isomorphic/multimap';
+export * from './utils/isomorphic/protocolFormatter';
+export * from './utils/isomorphic/protocolMetainfo';
+export * from './utils/isomorphic/rtti';
+export * from './utils/isomorphic/semaphore';
+export * from './utils/isomorphic/stackTrace';
+export * from './utils/isomorphic/stringUtils';
+export * from './utils/isomorphic/time';
+export * from './utils/isomorphic/timeoutRunner';
+export * from './utils/isomorphic/urlMatch';
+
+export * from './server/utils/ascii';
+export * from './server/utils/comparators';
+export * from './server/utils/crypto';
+export * from './server/utils/debug';
+export * from './server/utils/debugLogger';
+export * from './server/utils/env';
+export * from './server/utils/eventsHelper';
+export * from './server/utils/expectUtils';
+export * from './server/utils/fileUtils';
+export * from './server/utils/hostPlatform';
+export * from './server/utils/httpServer';
+export * from './server/utils/network';
+export * from './server/utils/nodePlatform';
+export * from './server/utils/processLauncher';
+export * from './server/utils/profiler';
+export * from './server/utils/socksProxy';
+export * from './server/utils/spawnAsync';
+export * from './server/utils/task';
+export * from './server/utils/userAgent';
+export * from './server/utils/wsServer';
+export * from './server/utils/zipFile';
+export * from './server/utils/zones';
+
+export { colors } from './utilsBundle';
diff --git a/packages/playwright-core/src/utils/DEPS.list b/packages/playwright-core/src/utils/DEPS.list
deleted file mode 100644
index 514f09d407344..0000000000000
--- a/packages/playwright-core/src/utils/DEPS.list
+++ /dev/null
@@ -1,7 +0,0 @@
-[*]
-./
-../third_party/diff_match_patch
-../third_party/pixelmatch
-../image_tools/compare.ts
-../utilsBundle.ts
-../zipBundle.ts
diff --git a/packages/playwright-core/src/utils/debug.ts b/packages/playwright-core/src/utils/debug.ts
deleted file mode 100644
index 2e199b3a31360..0000000000000
--- a/packages/playwright-core/src/utils/debug.ts
+++ /dev/null
@@ -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 { getFromENV } from './env';
-
-export function assert(value: any, message?: string): asserts value {
-  if (!value)
-    throw new Error(message || 'Assertion error');
-}
-
-export function debugAssert(value: any, message?: string): asserts value {
-  if (isUnderTest() && !value)
-    throw new Error(message);
-}
-
-const debugEnv = getFromENV('PWDEBUG') || '';
-export function debugMode() {
-  if (debugEnv === 'console')
-    return 'console';
-  if (debugEnv === '0' || debugEnv === 'false')
-    return '';
-  return debugEnv ? 'inspector' : '';
-}
-
-let _isUnderTest = !!process.env.PWTEST_UNDER_TEST;
-export function setUnderTest() {
-  _isUnderTest = true;
-}
-
-export function isUnderTest(): boolean {
-  return _isUnderTest;
-}
diff --git a/packages/playwright-core/src/utils/glob.ts b/packages/playwright-core/src/utils/glob.ts
deleted file mode 100644
index b464fc9a24b9c..0000000000000
--- a/packages/playwright-core/src/utils/glob.ts
+++ /dev/null
@@ -1,81 +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.
- */
-
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#escaping
-const escapedChars = new Set(['$', '^', '+', '.', '*', '(', ')', '|', '\\', '?', '{', '}', '[', ']']);
-
-export function globToRegex(glob: string): RegExp {
-  const tokens = ['^'];
-  let inGroup = false;
-  for (let i = 0; i < glob.length; ++i) {
-    const c = glob[i];
-    if (c === '\\' && i + 1 < glob.length) {
-      const char = glob[++i];
-      tokens.push(escapedChars.has(char) ? '\\' + char : char);
-      continue;
-    }
-    if (c === '*') {
-      const beforeDeep = glob[i - 1];
-      let starCount = 1;
-      while (glob[i + 1] === '*') {
-        starCount++;
-        i++;
-      }
-      const afterDeep = glob[i + 1];
-      const isDeep = starCount > 1 &&
-          (beforeDeep === '/' || beforeDeep === undefined) &&
-          (afterDeep === '/' || afterDeep === undefined);
-      if (isDeep) {
-        tokens.push('((?:[^/]*(?:\/|$))*)');
-        i++;
-      } else {
-        tokens.push('([^/]*)');
-      }
-      continue;
-    }
-
-    switch (c) {
-      case '?':
-        tokens.push('.');
-        break;
-      case '[':
-        tokens.push('[');
-        break;
-      case ']':
-        tokens.push(']');
-        break;
-      case '{':
-        inGroup = true;
-        tokens.push('(');
-        break;
-      case '}':
-        inGroup = false;
-        tokens.push(')');
-        break;
-      case ',':
-        if (inGroup) {
-          tokens.push('|');
-          break;
-        }
-        tokens.push('\\' + c);
-        break;
-      default:
-        tokens.push(escapedChars.has(c) ? '\\' + c : c);
-    }
-  }
-  tokens.push('$');
-  return new RegExp(tokens.join(''));
-}
diff --git a/packages/playwright-core/src/utils/index.ts b/packages/playwright-core/src/utils/index.ts
deleted file mode 100644
index 67ec09d91d32f..0000000000000
--- a/packages/playwright-core/src/utils/index.ts
+++ /dev/null
@@ -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.
- */
-
-export * from './ascii';
-export * from './comparators';
-export * from './crypto';
-export * from './debug';
-export * from './env';
-export * from './eventsHelper';
-export * from './fileUtils';
-export * from './glob';
-export * from './headers';
-export * from './hostPlatform';
-export * from './httpServer';
-export * from './manualPromise';
-export * from './isomorphic/mimeType';
-export * from './multimap';
-export * from './network';
-export * from './processLauncher';
-export * from './profiler';
-export * from './rtti';
-export * from './semaphore';
-export * from './spawnAsync';
-export * from './stackTrace';
-export * from './task';
-export * from './time';
-export * from './timeoutRunner';
-export * from './traceUtils';
-export * from './userAgent';
-export * from './wsServer';
-export * from './zipFile';
-export * from './zones';
-export * from './isomorphic/locatorGenerators';
-export * from './isomorphic/stringUtils';
diff --git a/packages/playwright-core/src/utils/isomorphic/DEPS.list b/packages/playwright-core/src/utils/isomorphic/DEPS.list
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/playwright-core/src/utils/isomorphic/ariaSnapshot.ts b/packages/playwright-core/src/utils/isomorphic/ariaSnapshot.ts
new file mode 100644
index 0000000000000..a51921bc701e5
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/ariaSnapshot.ts
@@ -0,0 +1,487 @@
+/**
+ * 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.
+ */
+
+// https://www.w3.org/TR/wai-aria-1.2/#role_definitions
+
+export type AriaRole = 'alert' | 'alertdialog' | 'application' | 'article' | 'banner' | 'blockquote' | 'button' | 'caption' | 'cell' | 'checkbox' | 'code' | 'columnheader' | 'combobox' |
+  'complementary' | 'contentinfo' | 'definition' | 'deletion' | 'dialog' | 'directory' | 'document' | 'emphasis' | 'feed' | 'figure' | 'form' | 'generic' | 'grid' |
+  'gridcell' | 'group' | 'heading' | 'img' | 'insertion' | 'link' | 'list' | 'listbox' | 'listitem' | 'log' | 'main' | 'mark' | 'marquee' | 'math' | 'meter' | 'menu' |
+  'menubar' | 'menuitem' | 'menuitemcheckbox' | 'menuitemradio' | 'navigation' | 'none' | 'note' | 'option' | 'paragraph' | 'presentation' | 'progressbar' | 'radio' | 'radiogroup' |
+  'region' | 'row' | 'rowgroup' | 'rowheader' | 'scrollbar' | 'search' | 'searchbox' | 'separator' | 'slider' |
+  'spinbutton' | 'status' | 'strong' | 'subscript' | 'superscript' | 'switch' | 'tab' | 'table' | 'tablist' | 'tabpanel' | 'term' | 'textbox' | 'time' | 'timer' |
+  'toolbar' | 'tooltip' | 'tree' | 'treegrid' | 'treeitem';
+
+export type AriaProps = {
+  checked?: boolean | 'mixed';
+  disabled?: boolean;
+  expanded?: boolean;
+  active?: boolean;
+  level?: number;
+  pressed?: boolean | 'mixed';
+  selected?: boolean;
+};
+
+// We pass parsed template between worlds using JSON, make it easy.
+export type AriaRegex = { pattern: string };
+
+export type AriaTemplateTextNode = {
+  kind: 'text';
+  text: AriaRegex | string;
+};
+
+export type AriaTemplateRoleNode = AriaProps & {
+  kind: 'role';
+  role: AriaRole | 'fragment';
+  name?: AriaRegex | string;
+  children?: AriaTemplateNode[];
+  props?: Record<string, string | AriaRegex>;
+  containerMode?: 'contain' | 'equal' | 'deep-equal';
+};
+
+export type AriaTemplateNode = AriaTemplateRoleNode | AriaTemplateTextNode;
+
+import type * as yamlTypes from 'yaml';
+
+type YamlLibrary = {
+  parseDocument: typeof yamlTypes.parseDocument;
+  Scalar: typeof yamlTypes.Scalar;
+  YAMLMap: typeof yamlTypes.YAMLMap;
+  YAMLSeq: typeof yamlTypes.YAMLSeq;
+  LineCounter: typeof yamlTypes.LineCounter;
+};
+
+type ParsedYamlPosition = { line: number; col: number; };
+type ParsingOptions = yamlTypes.ParseOptions;
+
+export type ParsedYamlError = {
+  message: string;
+  range: [ParsedYamlPosition, ParsedYamlPosition];
+};
+
+export function parseAriaSnapshotUnsafe(yaml: YamlLibrary, text: string, options: ParsingOptions = {}): AriaTemplateNode {
+  const result = parseAriaSnapshot(yaml, text, options);
+  if (result.errors.length)
+    throw new Error(result.errors[0].message);
+  return result.fragment;
+}
+
+export function parseAriaSnapshot(yaml: YamlLibrary, text: string, options: ParsingOptions = {}): { fragment: AriaTemplateNode, errors: ParsedYamlError[] } {
+  const lineCounter = new yaml.LineCounter();
+  const parseOptions: ParsingOptions = {
+    keepSourceTokens: true,
+    lineCounter,
+    ...options,
+  };
+  const yamlDoc = yaml.parseDocument(text, parseOptions);
+  const errors: ParsedYamlError[] = [];
+
+  const convertRange = (range: [number, number] | yamlTypes.Range): [ParsedYamlPosition, ParsedYamlPosition] => {
+    return [lineCounter.linePos(range[0]), lineCounter.linePos(range[1])];
+  };
+
+  const addError = (error: yamlTypes.YAMLError) => {
+    errors.push({
+      message: error.message,
+      range: [lineCounter.linePos(error.pos[0]), lineCounter.linePos(error.pos[1])],
+    });
+  };
+
+  const convertSeq = (container: AriaTemplateRoleNode, seq: yamlTypes.YAMLSeq) => {
+    for (const item of seq.items) {
+      const itemIsString = item instanceof yaml.Scalar && typeof item.value === 'string';
+      if (itemIsString) {
+        const childNode = KeyParser.parse(item, parseOptions, errors);
+        if (childNode) {
+          container.children = container.children || [];
+          container.children.push(childNode);
+        }
+        continue;
+      }
+      const itemIsMap = item instanceof yaml.YAMLMap;
+      if (itemIsMap) {
+        convertMap(container, item);
+        continue;
+      }
+      errors.push({
+        message: 'Sequence items should be strings or maps',
+        range: convertRange((item as any).range || seq.range),
+      });
+    }
+  };
+
+  const convertMap = (container: AriaTemplateRoleNode, map: yamlTypes.YAMLMap) => {
+    for (const entry of map.items) {
+      container.children = container.children || [];
+      // Key must by a string
+      const keyIsString = entry.key instanceof yaml.Scalar && typeof entry.key.value === 'string';
+      if (!keyIsString) {
+        errors.push({
+          message: 'Only string keys are supported',
+          range: convertRange((entry.key as any).range || map.range),
+        });
+        continue;
+      }
+
+      const key: yamlTypes.Scalar<string> = entry.key as yamlTypes.Scalar<string>;
+      const value = entry.value;
+
+      // - text: "text"
+      if (key.value === 'text') {
+        const valueIsString = value instanceof yaml.Scalar && typeof value.value === 'string';
+        if (!valueIsString) {
+          errors.push({
+            message: 'Text value should be a string',
+            range: convertRange(((entry.value as any).range || map.range)),
+          });
+          continue;
+        }
+        container.children.push({
+          kind: 'text',
+          text: valueOrRegex(value.value)
+        });
+        continue;
+      }
+
+      // - /children: equal
+      if (key.value === '/children') {
+        const valueIsString = value instanceof yaml.Scalar && typeof value.value === 'string';
+        if (!valueIsString || (value.value !== 'contain' && value.value !== 'equal' && value.value !== 'deep-equal')) {
+          errors.push({
+            message: 'Strict value should be "contain", "equal" or "deep-equal"',
+            range: convertRange(((entry.value as any).range || map.range)),
+          });
+          continue;
+        }
+        container.containerMode = value.value;
+        continue;
+      }
+
+      // - /url: "about:blank"
+      if (key.value.startsWith('/')) {
+        const valueIsString = value instanceof yaml.Scalar && typeof value.value === 'string';
+        if (!valueIsString) {
+          errors.push({
+            message: 'Property value should be a string',
+            range: convertRange(((entry.value as any).range || map.range)),
+          });
+          continue;
+        }
+        container.props = container.props ?? {};
+        container.props[key.value.slice(1)] = valueOrRegex(value.value);
+        continue;
+      }
+
+      // role "name": ...
+      const childNode = KeyParser.parse(key, parseOptions, errors);
+      if (!childNode)
+        continue;
+
+      // - role "name": "text"
+      const valueIsScalar = value instanceof yaml.Scalar;
+      if (valueIsScalar) {
+        const type = typeof value.value;
+        if (type !== 'string' && type !== 'number' && type !== 'boolean') {
+          errors.push({
+            message: 'Node value should be a string or a sequence',
+            range: convertRange(((entry.value as any).range || map.range)),
+          });
+          continue;
+        }
+
+        container.children.push({
+          ...childNode,
+          children: [{
+            kind: 'text',
+            text: valueOrRegex(String(value.value))
+          }]
+        });
+        continue;
+      }
+
+      // - role "name":
+      //   - child
+      const valueIsSequence = value instanceof yaml.YAMLSeq;
+      if (valueIsSequence) {
+        container.children.push(childNode);
+        convertSeq(childNode, value as yamlTypes.YAMLSeq);
+        continue;
+      }
+
+      errors.push({
+        message: 'Map values should be strings or sequences',
+        range: convertRange((entry.value as any).range || map.range),
+      });
+    }
+  };
+
+  const fragment: AriaTemplateNode = { kind: 'role', role: 'fragment' };
+
+  yamlDoc.errors.forEach(addError);
+  if (errors.length)
+    return { errors, fragment };
+
+  if (!(yamlDoc.contents instanceof yaml.YAMLSeq)) {
+    errors.push({
+      message: 'Aria snapshot must be a YAML sequence, elements starting with " -"',
+      range: yamlDoc.contents ? convertRange(yamlDoc.contents!.range) : [{ line: 0, col: 0 }, { line: 0, col: 0 }],
+    });
+  }
+  if (errors.length)
+    return { errors, fragment };
+
+  convertSeq(fragment, yamlDoc.contents as yamlTypes.YAMLSeq);
+  if (errors.length)
+    return { errors, fragment: emptyFragment };
+  // `- button` should target the button, not its parent.
+  if (fragment.children?.length === 1 && (!fragment.containerMode || fragment.containerMode === 'contain'))
+    return { fragment: fragment.children[0], errors: [] };
+  return { fragment, errors: [] };
+}
+
+const emptyFragment: AriaTemplateRoleNode = { kind: 'role', role: 'fragment' };
+
+function normalizeWhitespace(text: string) {
+  // TODO: why is this different from normalizeWhitespace in stringUtils.ts?
+  return text.replace(/[\u200b\u00ad]/g, '').replace(/[\r\n\s\t]+/g, ' ').trim();
+}
+
+export function valueOrRegex(value: string): string | AriaRegex {
+  return value.startsWith('/') && value.endsWith('/') && value.length > 1 ? { pattern: value.slice(1, -1) } : normalizeWhitespace(value);
+}
+
+export class KeyParser {
+  private _input: string;
+  private _pos: number;
+  private _length: number;
+  private _options: ParsingOptions;
+
+  static parse(text: yamlTypes.Scalar<string>, options: ParsingOptions, errors: ParsedYamlError[]): AriaTemplateRoleNode | null {
+    try {
+      return new KeyParser(text.value, options)._parse();
+    } catch (e) {
+      if (e instanceof ParserError) {
+        const message = options.prettyErrors === false ? e.message : e.message + ':\n\n' + text.value + '\n' + ' '.repeat(e.pos) + '^\n';
+        errors.push({
+          message,
+          range: [options.lineCounter!.linePos(text.range![0]), options.lineCounter!.linePos(text.range![0] + e.pos)],
+        });
+        return null;
+      }
+      throw e;
+    }
+  }
+
+  constructor(input: string, options: ParsingOptions) {
+    this._input = input;
+    this._pos = 0;
+    this._length = input.length;
+    this._options = options;
+  }
+
+  private _peek() {
+    return this._input[this._pos] || '';
+  }
+
+  private _next() {
+    if (this._pos < this._length)
+      return this._input[this._pos++];
+    return null;
+  }
+
+  private _eof() {
+    return this._pos >= this._length;
+  }
+
+  private _isWhitespace() {
+    return !this._eof() && /\s/.test(this._peek());
+  }
+
+  private _skipWhitespace() {
+    while (this._isWhitespace())
+      this._pos++;
+  }
+
+  private _readIdentifier(type: 'role' | 'attribute'): string {
+    if (this._eof())
+      this._throwError(`Unexpected end of input when expecting ${type}`);
+    const start = this._pos;
+    while (!this._eof() && /[a-zA-Z]/.test(this._peek()))
+      this._pos++;
+    return this._input.slice(start, this._pos);
+  }
+
+  private _readString(): string {
+    let result = '';
+    let escaped = false;
+    while (!this._eof()) {
+      const ch = this._next();
+      if (escaped) {
+        result += ch;
+        escaped = false;
+      } else if (ch === '\\') {
+        escaped = true;
+      } else if (ch === '"') {
+        return result;
+      } else {
+        result += ch;
+      }
+    }
+    this._throwError('Unterminated string');
+  }
+
+  private _throwError(message: string, offset: number = 0): never {
+    throw new ParserError(message, offset || this._pos);
+  }
+
+  private _readRegex(): AriaRegex {
+    let result = '';
+    let escaped = false;
+    let insideClass = false;
+    while (!this._eof()) {
+      const ch = this._next();
+      if (escaped) {
+        result += ch;
+        escaped = false;
+      } else if (ch === '\\') {
+        escaped = true;
+        result += ch;
+      } else if (ch === '/' && !insideClass) {
+        return { pattern: result };
+      } else if (ch === '[') {
+        insideClass = true;
+        result += ch;
+      } else if (ch === ']' && insideClass) {
+        result += ch;
+        insideClass = false;
+      } else {
+        result += ch;
+      }
+    }
+    this._throwError('Unterminated regex');
+  }
+
+  private _readStringOrRegex(): string | AriaRegex | null {
+    const ch = this._peek();
+    if (ch === '"') {
+      this._next();
+      return normalizeWhitespace(this._readString());
+    }
+
+    if (ch === '/') {
+      this._next();
+      return this._readRegex();
+    }
+
+    return null;
+  }
+
+  private _readAttributes(result: AriaTemplateRoleNode) {
+    let errorPos = this._pos;
+    while (true) {
+      this._skipWhitespace();
+      if (this._peek() === '[') {
+        this._next();
+        this._skipWhitespace();
+        errorPos = this._pos;
+        const flagName = this._readIdentifier('attribute');
+        this._skipWhitespace();
+        let flagValue = '';
+        if (this._peek() === '=') {
+          this._next();
+          this._skipWhitespace();
+          errorPos = this._pos;
+          while (this._peek() !== ']' && !this._isWhitespace() && !this._eof())
+            flagValue += this._next();
+        }
+        this._skipWhitespace();
+        if (this._peek() !== ']')
+          this._throwError('Expected ]');
+
+        this._next(); // Consume ']'
+        this._applyAttribute(result, flagName, flagValue || 'true', errorPos);
+      } else {
+        break;
+      }
+    }
+  }
+
+  _parse(): AriaTemplateRoleNode {
+    this._skipWhitespace();
+
+    const role = this._readIdentifier('role') as AriaTemplateRoleNode['role'];
+    this._skipWhitespace();
+    const name = this._readStringOrRegex() || '';
+    const result: AriaTemplateRoleNode = { kind: 'role', role, name };
+    this._readAttributes(result);
+    this._skipWhitespace();
+    if (!this._eof())
+      this._throwError('Unexpected input');
+    return result;
+  }
+
+  private _applyAttribute(node: AriaTemplateRoleNode, key: string, value: string, errorPos: number) {
+    if (key === 'checked') {
+      this._assert(value === 'true' || value === 'false' || value === 'mixed', 'Value of "checked\" attribute must be a boolean or "mixed"', errorPos);
+      node.checked = value === 'true' ? true : value === 'false' ? false : 'mixed';
+      return;
+    }
+    if (key === 'disabled') {
+      this._assert(value === 'true' || value === 'false', 'Value of "disabled" attribute must be a boolean', errorPos);
+      node.disabled = value === 'true';
+      return;
+    }
+    if (key === 'expanded') {
+      this._assert(value === 'true' || value === 'false', 'Value of "expanded" attribute must be a boolean', errorPos);
+      node.expanded = value === 'true';
+      return;
+    }
+    if (key === 'active') {
+      this._assert(value === 'true' || value === 'false', 'Value of "active" attribute must be a boolean', errorPos);
+      node.active = value === 'true';
+      return;
+    }
+    if (key === 'level') {
+      this._assert(!isNaN(Number(value)), 'Value of "level" attribute must be a number', errorPos);
+      node.level = Number(value);
+      return;
+    }
+    if (key === 'pressed') {
+      this._assert(value === 'true' || value === 'false' || value === 'mixed', 'Value of "pressed" attribute must be a boolean or "mixed"', errorPos);
+      node.pressed = value === 'true' ? true : value === 'false' ? false : 'mixed';
+      return;
+    }
+    if (key === 'selected') {
+      this._assert(value === 'true' || value === 'false', 'Value of "selected" attribute must be a boolean', errorPos);
+      node.selected = value === 'true';
+      return;
+    }
+    this._assert(false, `Unsupported attribute [${key}]`, errorPos);
+  }
+
+  private _assert(value: any, message: string, valuePos: number): asserts value {
+    if (!value)
+      this._throwError(message || 'Assertion error', valuePos);
+  }
+}
+
+export class ParserError extends Error {
+  readonly pos: number;
+
+  constructor(message: string, pos: number) {
+    super(message);
+    this.pos = pos;
+  }
+}
diff --git a/packages/playwright-ct-vue2/cli.js b/packages/playwright-core/src/utils/isomorphic/assert.ts
old mode 100755
new mode 100644
similarity index 81%
rename from packages/playwright-ct-vue2/cli.js
rename to packages/playwright-core/src/utils/isomorphic/assert.ts
index 9cc834ee95e85..bd0c38d413c3e
--- a/packages/playwright-ct-vue2/cli.js
+++ b/packages/playwright-core/src/utils/isomorphic/assert.ts
@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -15,6 +14,7 @@
  * limitations under the License.
  */
 
-const { program } = require('@playwright/experimental-ct-core/lib/program');
-
-program.parse(process.argv);
+export function assert(value: any, message?: string): asserts value {
+  if (!value)
+    throw new Error(message || 'Assertion error');
+}
diff --git a/packages/playwright-core/src/utils/isomorphic/colors.ts b/packages/playwright-core/src/utils/isomorphic/colors.ts
new file mode 100644
index 0000000000000..7be0955ad3a49
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/colors.ts
@@ -0,0 +1,66 @@
+/**
+ * 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 const webColors = {
+  enabled: true,
+  reset: (text: string) => applyStyle(0, 0, text),
+
+  bold: (text: string) => applyStyle(1, 22, text),
+  dim: (text: string) => applyStyle(2, 22, text),
+  italic: (text: string) => applyStyle(3, 23, text),
+  underline: (text: string) => applyStyle(4, 24, text),
+  inverse: (text: string) => applyStyle(7, 27, text),
+  hidden: (text: string) => applyStyle(8, 28, text),
+  strikethrough: (text: string) => applyStyle(9, 29, text),
+
+  black: (text: string) => applyStyle(30, 39, text),
+  red: (text: string) => applyStyle(31, 39, text),
+  green: (text: string) => applyStyle(32, 39, text),
+  yellow: (text: string) => applyStyle(33, 39, text),
+  blue: (text: string) => applyStyle(34, 39, text),
+  magenta: (text: string) => applyStyle(35, 39, text),
+  cyan: (text: string) => applyStyle(36, 39, text),
+  white: (text: string) => applyStyle(37, 39, text),
+  gray: (text: string) => applyStyle(90, 39, text),
+  grey: (text: string) => applyStyle(90, 39, text),
+};
+
+export type Colors = typeof webColors;
+
+export const noColors: Colors = {
+  enabled: false,
+  reset: t => t,
+  bold: t => t,
+  dim: t => t,
+  italic: t => t,
+  underline: t => t,
+  inverse: t => t,
+  hidden: t => t,
+  strikethrough: t => t,
+  black: t => t,
+  red: t => t,
+  green: t => t,
+  yellow: t => t,
+  blue: t => t,
+  magenta: t => t,
+  cyan: t => t,
+  white: t => t,
+  gray: t => t,
+  grey: t => t,
+};
+
+
+const applyStyle = (open: number, close: number, text: string) => `\u001b[${open}m${text}\u001b[${close}m`;
diff --git a/packages/playwright-core/src/utils/isomorphic/cssParser.ts b/packages/playwright-core/src/utils/isomorphic/cssParser.ts
index 58d4df243b909..9a791a1da4c9f 100644
--- a/packages/playwright-core/src/utils/isomorphic/cssParser.ts
+++ b/packages/playwright-core/src/utils/isomorphic/cssParser.ts
@@ -43,7 +43,7 @@ export function parseCSS(selector: string, customNames: Set<string>): { selector
     if (!(tokens[tokens.length - 1] instanceof css.EOFToken))
       tokens.push(new css.EOFToken());
   } catch (e) {
-    const newMessage = e.message + ` while parsing selector "${selector}"`;
+    const newMessage = e.message + ` while parsing css selector "${selector}". Did you mean to CSS.escape it?`;
     const index = (e.stack || '').indexOf(e.message);
     if (index !== -1)
       e.stack = e.stack.substring(0, index) + newMessage + e.stack.substring(index + e.message.length);
@@ -68,13 +68,13 @@ export function parseCSS(selector: string, customNames: Set<string>): { selector
       (token instanceof css.PercentageToken);
   });
   if (unsupportedToken)
-    throw new InvalidSelectorError(`Unsupported token "${unsupportedToken.toSource()}" while parsing selector "${selector}"`);
+    throw new InvalidSelectorError(`Unsupported token "${unsupportedToken.toSource()}" while parsing css selector "${selector}". Did you mean to CSS.escape it?`);
 
   let pos = 0;
   const names = new Set<string>();
 
   function unexpected() {
-    return new InvalidSelectorError(`Unexpected token "${tokens[pos].toSource()}" while parsing selector "${selector}"`);
+    return new InvalidSelectorError(`Unexpected token "${tokens[pos].toSource()}" while parsing css selector "${selector}". Did you mean to CSS.escape it?`);
   }
 
   function skipWhitespace() {
@@ -246,7 +246,7 @@ export function parseCSS(selector: string, customNames: Set<string>): { selector
   if (!isEOF())
     throw unexpected();
   if (result.some(arg => typeof arg !== 'object' || !('simples' in arg)))
-    throw new InvalidSelectorError(`Error while parsing selector "${selector}"`);
+    throw new InvalidSelectorError(`Error while parsing css selector "${selector}". Did you mean to CSS.escape it?`);
   return { selector: result as CSSComplexSelector[], names: Array.from(names) };
 }
 
diff --git a/packages/playwright-core/src/utils/headers.ts b/packages/playwright-core/src/utils/isomorphic/headers.ts
similarity index 100%
rename from packages/playwright-core/src/utils/headers.ts
rename to packages/playwright-core/src/utils/isomorphic/headers.ts
diff --git a/packages/playwright-core/src/utils/isomorphic/locatorGenerators.ts b/packages/playwright-core/src/utils/isomorphic/locatorGenerators.ts
index e51fa0b6239ac..58459d8ae93be 100644
--- a/packages/playwright-core/src/utils/isomorphic/locatorGenerators.ts
+++ b/packages/playwright-core/src/utils/isomorphic/locatorGenerators.ts
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
+import {  parseAttributeSelector, parseSelector, stringifySelector } from './selectorParser';
 import { escapeWithQuotes, normalizeEscapedRegexQuotes, toSnakeCase, toTitleCase } from './stringUtils';
-import { type NestedSelectorBody, parseAttributeSelector, parseSelector, stringifySelector } from './selectorParser';
+
+import type { NestedSelectorBody } from './selectorParser';
 import type { ParsedSelector } from './selectorParser';
 
 export type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl';
-export type LocatorType = 'default' | 'role' | 'text' | 'label' | 'placeholder' | 'alt' | 'title' | 'test-id' | 'nth' | 'first' | 'last' | 'has-text' | 'has-not-text' | 'has' | 'hasNot' | 'frame' | 'and' | 'or' | 'chain';
+export type LocatorType = 'default' | 'role' | 'text' | 'label' | 'placeholder' | 'alt' | 'title' | 'test-id' | 'nth' | 'first' | 'last' | 'visible' | 'has-text' | 'has-not-text' | 'has' | 'hasNot' | 'frame' | 'frame-locator' | 'and' | 'or' | 'chain';
 export type LocatorBase = 'page' | 'locator' | 'frame-locator';
 export type Quote = '\'' | '"' | '`';
 
@@ -35,8 +37,24 @@ export interface LocatorFactory {
   chainLocators(locators: string[]): string;
 }
 
+export function asLocatorDescription(lang: Language, selector: string): string | undefined {
+  try {
+    const parsed = parseSelector(selector);
+    const lastPart = parsed.parts[parsed.parts.length - 1];
+    if (lastPart?.name === 'internal:describe') {
+      const description = JSON.parse(lastPart.body as string);
+      if (typeof description === 'string')
+        return description;
+    }
+    return innerAsLocators(new generators[lang](), parsed, false, 1)[0];
+  } catch (e) {
+    // Tolerate invalid input.
+    return selector;
+  }
+}
+
 export function asLocator(lang: Language, selector: string, isFrameLocator: boolean = false): string {
-  return asLocators(lang, selector, isFrameLocator)[0];
+  return asLocators(lang, selector, isFrameLocator, 1)[0];
 }
 
 export function asLocators(lang: Language, selector: string, isFrameLocator: boolean = false, maxOutputSize = 20, preferredQuote?: Quote): string[] {
@@ -50,16 +68,6 @@ export function asLocators(lang: Language, selector: string, isFrameLocator: boo
 
 function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFrameLocator: boolean = false, maxOutputSize = 20): string[] {
   const parts = [...parsed.parts];
-  // frameLocator('iframe').first is actually "iframe >> nth=0 >> internal:control=enter-frame"
-  // To make it easier to parse, we turn it into "iframe >> internal:control=enter-frame >> nth=0"
-  for (let index = 0; index < parts.length - 1; index++) {
-    if (parts[index].name === 'nth' && parts[index + 1].name === 'internal:control' && (parts[index + 1].body as string) === 'enter-frame') {
-      // Swap nth and enter-frame.
-      const [nth] = parts.splice(index, 1);
-      parts.splice(index + 1, 0, nth);
-    }
-  }
-
   const tokens: string[][] = [];
   let nextBase: LocatorBase = isFrameLocator ? 'frame-locator' : 'page';
   for (let index = 0; index < parts.length; index++) {
@@ -67,6 +75,8 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
     const base = nextBase;
     nextBase = 'locator';
 
+    if (part.name === 'internal:describe')
+      continue;
     if (part.name === 'nth') {
       if (part.body === '0')
         tokens.push([factory.generateLocator(base, 'first', ''), factory.generateLocator(base, 'nth', '0')]);
@@ -76,6 +86,10 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
         tokens.push([factory.generateLocator(base, 'nth', part.body as string)]);
       continue;
     }
+    if (part.name === 'visible') {
+      tokens.push([factory.generateLocator(base, 'visible', part.body as string), factory.generateLocator(base, 'default', `visible=${part.body}`)]);
+      continue;
+    }
     if (part.name === 'internal:text') {
       const { exact, text } = detectExact(part.body as string);
       tokens.push([factory.generateLocator(base, 'text', text, { exact })]);
@@ -167,20 +181,30 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
         continue;
       }
     }
+    if (part.name === 'internal:control' && (part.body as string) === 'enter-frame') {
+      // transform last tokens from `${selector}` into `${selector}.contentFrame()` and `frameLocator(${selector})`
+      const lastTokens = tokens[tokens.length - 1];
+      const lastPart = parts[index - 1];
+
+      const transformed = lastTokens.map(token => factory.chainLocators([token, factory.generateLocator(base, 'frame', '')]));
+      if (['xpath', 'css'].includes(lastPart.name)) {
+        transformed.push(
+            factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] })),
+            factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] }, true))
+        );
+      }
 
-    let locatorType: LocatorType = 'default';
-
-    const nextPart = parts[index + 1];
-    if (nextPart && nextPart.name === 'internal:control' && (nextPart.body as string) === 'enter-frame') {
-      locatorType = 'frame';
+      lastTokens.splice(0, lastTokens.length, ...transformed);
       nextBase = 'frame-locator';
-      index++;
+      continue;
     }
 
+    const nextPart = parts[index + 1];
+
     const selectorPart = stringifySelector({ parts: [part] });
-    const locatorPart = factory.generateLocator(base, locatorType, selectorPart);
+    const locatorPart = factory.generateLocator(base, 'default', selectorPart);
 
-    if (locatorType === 'default' && nextPart && ['internal:has-text', 'internal:has-not-text'].includes(nextPart.name)) {
+    if (nextPart && ['internal:has-text', 'internal:has-not-text'].includes(nextPart.name)) {
       const { exact, text } = detectExact(nextPart.body as string);
       // There is no locator equivalent for strict has-text and has-not-text, leave it as is.
       if (!exact) {
@@ -204,7 +228,7 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
     let locatorPartWithEngine: string | undefined;
     if (['xpath', 'css'].includes(part.name)) {
       const selectorPart = stringifySelector({ parts: [part] }, /* forceEngineName */ true);
-      locatorPartWithEngine = factory.generateLocator(base, locatorType, selectorPart);
+      locatorPartWithEngine = factory.generateLocator(base, 'default', selectorPart);
     }
 
     tokens.push([locatorPart, locatorPartWithEngine].filter(Boolean) as string[]);
@@ -220,7 +244,7 @@ function combineTokens(factory: LocatorFactory, tokens: string[][], maxOutputSiz
   const visit = (index: number) => {
     if (index === tokens.length) {
       result.push(factory.chainLocators(currentTokens));
-      return currentTokens.length < maxOutputSize;
+      return result.length < maxOutputSize;
     }
     for (const taken of tokens[index]) {
       currentTokens[index] = taken;
@@ -263,14 +287,18 @@ export class JavaScriptLocatorFactory implements LocatorFactory {
         if (options.hasNotText !== undefined)
           return `locator(${this.quote(body as string)}, { hasNotText: ${this.toHasText(options.hasNotText)} })`;
         return `locator(${this.quote(body as string)})`;
-      case 'frame':
+      case 'frame-locator':
         return `frameLocator(${this.quote(body as string)})`;
+      case 'frame':
+        return `contentFrame()`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
         return `first()`;
       case 'last':
         return `last()`;
+      case 'visible':
+        return `filter({ visible: ${body === 'true' ? 'true' : 'false'} })`;
       case 'role':
         const attrs: string[] = [];
         if (isRegExp(options.name)) {
@@ -355,14 +383,18 @@ export class PythonLocatorFactory implements LocatorFactory {
         if (options.hasNotText !== undefined)
           return `locator(${this.quote(body as string)}, has_not_text=${this.toHasText(options.hasNotText)})`;
         return `locator(${this.quote(body as string)})`;
-      case 'frame':
+      case 'frame-locator':
         return `frame_locator(${this.quote(body as string)})`;
+      case 'frame':
+        return `content_frame`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
         return `first`;
       case 'last':
         return `last`;
+      case 'visible':
+        return `filter(visible=${body === 'true' ? 'True' : 'False'})`;
       case 'role':
         const attrs: string[] = [];
         if (isRegExp(options.name)) {
@@ -460,14 +492,18 @@ export class JavaLocatorFactory implements LocatorFactory {
         if (options.hasNotText !== undefined)
           return `locator(${this.quote(body as string)}, new ${clazz}.LocatorOptions().setHasNotText(${this.toHasText(options.hasNotText)}))`;
         return `locator(${this.quote(body as string)})`;
-      case 'frame':
+      case 'frame-locator':
         return `frameLocator(${this.quote(body as string)})`;
+      case 'frame':
+        return `contentFrame()`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
         return `first()`;
       case 'last':
         return `last()`;
+      case 'visible':
+        return `filter(new ${clazz}.FilterOptions().setVisible(${body === 'true' ? 'true' : 'false'}))`;
       case 'role':
         const attrs: string[] = [];
         if (isRegExp(options.name)) {
@@ -555,14 +591,18 @@ export class CSharpLocatorFactory implements LocatorFactory {
         if (options.hasNotText !== undefined)
           return `Locator(${this.quote(body as string)}, new() { ${this.toHasNotText(options.hasNotText)} })`;
         return `Locator(${this.quote(body as string)})`;
-      case 'frame':
+      case 'frame-locator':
         return `FrameLocator(${this.quote(body as string)})`;
+      case 'frame':
+        return `ContentFrame`;
       case 'nth':
         return `Nth(${body})`;
       case 'first':
         return `First`;
       case 'last':
         return `Last`;
+      case 'visible':
+        return `Filter(new() { Visible = ${body === 'true' ? 'true' : 'false'} })`;
       case 'role':
         const attrs: string[] = [];
         if (isRegExp(options.name)) {
diff --git a/packages/playwright-core/src/utils/isomorphic/locatorParser.ts b/packages/playwright-core/src/utils/isomorphic/locatorParser.ts
index d9bbca2f7e0af..6dcbc1cbcc351 100644
--- a/packages/playwright-core/src/utils/isomorphic/locatorParser.ts
+++ b/packages/playwright-core/src/utils/isomorphic/locatorParser.ts
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-import { escapeForAttributeSelector, escapeForTextSelector } from '../../utils/isomorphic/stringUtils';
 import { asLocators } from './locatorGenerators';
-import type { Language, Quote } from './locatorGenerators';
 import { parseSelector } from './selectorParser';
+import { escapeForAttributeSelector, escapeForTextSelector } from './stringUtils';
+
+import type { Language, Quote } from './locatorGenerators';
 
 type TemplateParams = { quote: string, text: string }[];
 function parseLocator(locator: string, testIdAttributeName: string): { selector: string, preferredQuote: Quote | undefined } {
@@ -75,6 +76,7 @@ function parseLocator(locator: string, testIdAttributeName: string): { selector:
       .replace(/has_text/g, 'hastext')
       .replace(/has_not/g, 'hasnot')
       .replace(/frame_locator/g, 'framelocator')
+      .replace(/content_frame/g, 'contentframe')
       .replace(/[{}\s]/g, '')
       .replace(/new\(\)/g, '')
       .replace(/new[\w]+\.[\w]+options\(\)/g, '')
@@ -90,7 +92,8 @@ function parseLocator(locator: string, testIdAttributeName: string): { selector:
       .replace(/newregex\(([^)]+)\)/g, 'r$1')
       .replace(/string=/g, '=')
       .replace(/regex=/g, '=')
-      .replace(/,,/g, ',');
+      .replace(/,,/g, ',')
+      .replace(/,\)/g, ')');
 
   const preferredQuote = params.map(p => p.quote).filter(quote => '\'"`'.includes(quote))[0] as Quote | undefined;
   return { selector: transform(template, params, testIdAttributeName), preferredQuote };
@@ -154,6 +157,7 @@ function transform(template: string, params: TemplateParams, testIdAttributeName
   template = template
       .replace(/\,set([\w]+)\(([^)]+)\)/g, (_, group1, group2) => ',' + group1.toLowerCase() + '=' + group2.toLowerCase())
       .replace(/framelocator\(([^)]+)\)/g, '$1.internal:control=enter-frame')
+      .replace(/contentframe(\(\))?/g, 'internal:control=enter-frame')
       .replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2')
       .replace(/locator\(([^)]+),hasnottext=([^),]+)\)/g, 'locator($1).internal:has-not-text=$2')
       .replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2')
@@ -166,12 +170,15 @@ function transform(template: string, params: TemplateParams, testIdAttributeName
       .replace(/first(\(\))?/g, 'nth=0')
       .replace(/last(\(\))?/g, 'nth=-1')
       .replace(/nth\(([^)]+)\)/g, 'nth=$1')
+      .replace(/filter\(,?visible=true\)/g, 'visible=true')
+      .replace(/filter\(,?visible=false\)/g, 'visible=false')
       .replace(/filter\(,?hastext=([^)]+)\)/g, 'internal:has-text=$1')
       .replace(/filter\(,?hasnottext=([^)]+)\)/g, 'internal:has-not-text=$1')
       .replace(/filter\(,?has2=([^)]+)\)/g, 'internal:has=$1')
       .replace(/filter\(,?hasnot2=([^)]+)\)/g, 'internal:has-not=$1')
       .replace(/,exact=false/g, '')
       .replace(/,exact=true/g, 's')
+      .replace(/,includehidden=/g, ',include-hidden=')
       .replace(/\,/g, '][');
 
   const parts = template.split('.');
@@ -213,24 +220,29 @@ function transform(template: string, params: TemplateParams, testIdAttributeName
 
 export function locatorOrSelectorAsSelector(language: Language, locator: string, testIdAttributeName: string): string {
   try {
-    parseSelector(locator);
-    return locator;
+    return unsafeLocatorOrSelectorAsSelector(language, locator, testIdAttributeName);
   } catch (e) {
+    return '';
   }
+}
+
+export function unsafeLocatorOrSelectorAsSelector(language: Language, locator: string, testIdAttributeName: string): string {
   try {
-    const { selector, preferredQuote } = parseLocator(locator, testIdAttributeName);
-    const locators = asLocators(language, selector, undefined, undefined, preferredQuote);
-    const digest = digestForComparison(language, locator);
-    if (locators.some(candidate => digestForComparison(language, candidate) === digest))
-      return selector;
+    parseSelector(locator);
+    return locator;
   } catch (e) {
   }
+  const { selector, preferredQuote } = parseLocator(locator, testIdAttributeName);
+  const locators = asLocators(language, selector, undefined, undefined, preferredQuote);
+  const digest = digestForComparison(language, locator);
+  if (locators.some(candidate => digestForComparison(language, candidate) === digest))
+    return selector;
   return '';
 }
 
 function digestForComparison(language: Language, locator: string) {
   locator = locator.replace(/\s/g, '');
   if (language === 'javascript')
-    locator = locator.replace(/\\?["`]/g, '\'');
+    locator = locator.replace(/\\?["`]/g, '\'').replace(/,{}/g, '');
   return locator;
 }
diff --git a/packages/playwright-core/src/utils/manualPromise.ts b/packages/playwright-core/src/utils/isomorphic/manualPromise.ts
similarity index 100%
rename from packages/playwright-core/src/utils/manualPromise.ts
rename to packages/playwright-core/src/utils/isomorphic/manualPromise.ts
diff --git a/packages/playwright-core/src/utils/isomorphic/mimeType.ts b/packages/playwright-core/src/utils/isomorphic/mimeType.ts
index 2f8b9d48292f6..45ac92d645c45 100644
--- a/packages/playwright-core/src/utils/isomorphic/mimeType.ts
+++ b/packages/playwright-core/src/utils/isomorphic/mimeType.ts
@@ -1,14 +1,14 @@
 /**
  * Copyright (c) Microsoft Corporation.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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,
+ * 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.
@@ -20,4 +20,427 @@ export function isJsonMimeType(mimeType: string) {
 
 export function isTextualMimeType(mimeType: string) {
   return !!mimeType.match(/^(text\/.*?|application\/(json|(x-)?javascript|xml.*?|ecmascript|graphql|x-www-form-urlencoded)|image\/svg(\+xml)?|application\/.*?(\+json|\+xml))(;\s*charset=.*)?$/);
-}
\ No newline at end of file
+}
+export function getMimeTypeForPath(path: string): string | null {
+  const dotIndex = path.lastIndexOf('.');
+  if (dotIndex === -1)
+    return null;
+  const extension = path.substring(dotIndex + 1);
+  return types.get(extension) || null;
+}
+
+const types: Map<string, string> = new Map([
+  ['ez', 'application/andrew-inset'],
+  ['aw', 'application/applixware'],
+  ['atom', 'application/atom+xml'],
+  ['atomcat', 'application/atomcat+xml'],
+  ['atomdeleted', 'application/atomdeleted+xml'],
+  ['atomsvc', 'application/atomsvc+xml'],
+  ['dwd', 'application/atsc-dwd+xml'],
+  ['held', 'application/atsc-held+xml'],
+  ['rsat', 'application/atsc-rsat+xml'],
+  ['bdoc', 'application/bdoc'],
+  ['xcs', 'application/calendar+xml'],
+  ['ccxml', 'application/ccxml+xml'],
+  ['cdfx', 'application/cdfx+xml'],
+  ['cdmia', 'application/cdmi-capability'],
+  ['cdmic', 'application/cdmi-container'],
+  ['cdmid', 'application/cdmi-domain'],
+  ['cdmio', 'application/cdmi-object'],
+  ['cdmiq', 'application/cdmi-queue'],
+  ['cu', 'application/cu-seeme'],
+  ['mpd', 'application/dash+xml'],
+  ['davmount', 'application/davmount+xml'],
+  ['dbk', 'application/docbook+xml'],
+  ['dssc', 'application/dssc+der'],
+  ['xdssc', 'application/dssc+xml'],
+  ['ecma', 'application/ecmascript'],
+  ['es', 'application/ecmascript'],
+  ['emma', 'application/emma+xml'],
+  ['emotionml', 'application/emotionml+xml'],
+  ['epub', 'application/epub+zip'],
+  ['exi', 'application/exi'],
+  ['exp', 'application/express'],
+  ['fdt', 'application/fdt+xml'],
+  ['pfr', 'application/font-tdpfr'],
+  ['geojson', 'application/geo+json'],
+  ['gml', 'application/gml+xml'],
+  ['gpx', 'application/gpx+xml'],
+  ['gxf', 'application/gxf'],
+  ['gz', 'application/gzip'],
+  ['hjson', 'application/hjson'],
+  ['stk', 'application/hyperstudio'],
+  ['ink', 'application/inkml+xml'],
+  ['inkml', 'application/inkml+xml'],
+  ['ipfix', 'application/ipfix'],
+  ['its', 'application/its+xml'],
+  ['ear', 'application/java-archive'],
+  ['jar', 'application/java-archive'],
+  ['war', 'application/java-archive'],
+  ['ser', 'application/java-serialized-object'],
+  ['class', 'application/java-vm'],
+  ['js', 'application/javascript'],
+  ['mjs', 'application/javascript'],
+  ['json', 'application/json'],
+  ['map', 'application/json'],
+  ['json5', 'application/json5'],
+  ['jsonml', 'application/jsonml+json'],
+  ['jsonld', 'application/ld+json'],
+  ['lgr', 'application/lgr+xml'],
+  ['lostxml', 'application/lost+xml'],
+  ['hqx', 'application/mac-binhex40'],
+  ['cpt', 'application/mac-compactpro'],
+  ['mads', 'application/mads+xml'],
+  ['webmanifest', 'application/manifest+json'],
+  ['mrc', 'application/marc'],
+  ['mrcx', 'application/marcxml+xml'],
+  ['ma', 'application/mathematica'],
+  ['mb', 'application/mathematica'],
+  ['nb', 'application/mathematica'],
+  ['mathml', 'application/mathml+xml'],
+  ['mbox', 'application/mbox'],
+  ['mscml', 'application/mediaservercontrol+xml'],
+  ['metalink', 'application/metalink+xml'],
+  ['meta4', 'application/metalink4+xml'],
+  ['mets', 'application/mets+xml'],
+  ['maei', 'application/mmt-aei+xml'],
+  ['musd', 'application/mmt-usd+xml'],
+  ['mods', 'application/mods+xml'],
+  ['m21', 'application/mp21'],
+  ['mp21', 'application/mp21'],
+  ['m4p', 'application/mp4'],
+  ['mp4s', 'application/mp4'],
+  ['doc', 'application/msword'],
+  ['dot', 'application/msword'],
+  ['mxf', 'application/mxf'],
+  ['nq', 'application/n-quads'],
+  ['nt', 'application/n-triples'],
+  ['cjs', 'application/node'],
+  ['bin', 'application/octet-stream'],
+  ['bpk', 'application/octet-stream'],
+  ['buffer', 'application/octet-stream'],
+  ['deb', 'application/octet-stream'],
+  ['deploy', 'application/octet-stream'],
+  ['dist', 'application/octet-stream'],
+  ['distz', 'application/octet-stream'],
+  ['dll', 'application/octet-stream'],
+  ['dmg', 'application/octet-stream'],
+  ['dms', 'application/octet-stream'],
+  ['dump', 'application/octet-stream'],
+  ['elc', 'application/octet-stream'],
+  ['exe', 'application/octet-stream'],
+  ['img', 'application/octet-stream'],
+  ['iso', 'application/octet-stream'],
+  ['lrf', 'application/octet-stream'],
+  ['mar', 'application/octet-stream'],
+  ['msi', 'application/octet-stream'],
+  ['msm', 'application/octet-stream'],
+  ['msp', 'application/octet-stream'],
+  ['pkg', 'application/octet-stream'],
+  ['so', 'application/octet-stream'],
+  ['oda', 'application/oda'],
+  ['opf', 'application/oebps-package+xml'],
+  ['ogx', 'application/ogg'],
+  ['omdoc', 'application/omdoc+xml'],
+  ['onepkg', 'application/onenote'],
+  ['onetmp', 'application/onenote'],
+  ['onetoc', 'application/onenote'],
+  ['onetoc2', 'application/onenote'],
+  ['oxps', 'application/oxps'],
+  ['relo', 'application/p2p-overlay+xml'],
+  ['xer', 'application/patch-ops-error+xml'],
+  ['pdf', 'application/pdf'],
+  ['pgp', 'application/pgp-encrypted'],
+  ['asc', 'application/pgp-signature'],
+  ['sig', 'application/pgp-signature'],
+  ['prf', 'application/pics-rules'],
+  ['p10', 'application/pkcs10'],
+  ['p7c', 'application/pkcs7-mime'],
+  ['p7m', 'application/pkcs7-mime'],
+  ['p7s', 'application/pkcs7-signature'],
+  ['p8', 'application/pkcs8'],
+  ['ac', 'application/pkix-attr-cert'],
+  ['cer', 'application/pkix-cert'],
+  ['crl', 'application/pkix-crl'],
+  ['pkipath', 'application/pkix-pkipath'],
+  ['pki', 'application/pkixcmp'],
+  ['pls', 'application/pls+xml'],
+  ['ai', 'application/postscript'],
+  ['eps', 'application/postscript'],
+  ['ps', 'application/postscript'],
+  ['provx', 'application/provenance+xml'],
+  ['pskcxml', 'application/pskc+xml'],
+  ['raml', 'application/raml+yaml'],
+  ['owl', 'application/rdf+xml'],
+  ['rdf', 'application/rdf+xml'],
+  ['rif', 'application/reginfo+xml'],
+  ['rnc', 'application/relax-ng-compact-syntax'],
+  ['rl', 'application/resource-lists+xml'],
+  ['rld', 'application/resource-lists-diff+xml'],
+  ['rs', 'application/rls-services+xml'],
+  ['rapd', 'application/route-apd+xml'],
+  ['sls', 'application/route-s-tsid+xml'],
+  ['rusd', 'application/route-usd+xml'],
+  ['gbr', 'application/rpki-ghostbusters'],
+  ['mft', 'application/rpki-manifest'],
+  ['roa', 'application/rpki-roa'],
+  ['rsd', 'application/rsd+xml'],
+  ['rss', 'application/rss+xml'],
+  ['rtf', 'application/rtf'],
+  ['sbml', 'application/sbml+xml'],
+  ['scq', 'application/scvp-cv-request'],
+  ['scs', 'application/scvp-cv-response'],
+  ['spq', 'application/scvp-vp-request'],
+  ['spp', 'application/scvp-vp-response'],
+  ['sdp', 'application/sdp'],
+  ['senmlx', 'application/senml+xml'],
+  ['sensmlx', 'application/sensml+xml'],
+  ['setpay', 'application/set-payment-initiation'],
+  ['setreg', 'application/set-registration-initiation'],
+  ['shf', 'application/shf+xml'],
+  ['sieve', 'application/sieve'],
+  ['siv', 'application/sieve'],
+  ['smi', 'application/smil+xml'],
+  ['smil', 'application/smil+xml'],
+  ['rq', 'application/sparql-query'],
+  ['srx', 'application/sparql-results+xml'],
+  ['gram', 'application/srgs'],
+  ['grxml', 'application/srgs+xml'],
+  ['sru', 'application/sru+xml'],
+  ['ssdl', 'application/ssdl+xml'],
+  ['ssml', 'application/ssml+xml'],
+  ['swidtag', 'application/swid+xml'],
+  ['tei', 'application/tei+xml'],
+  ['teicorpus', 'application/tei+xml'],
+  ['tfi', 'application/thraud+xml'],
+  ['tsd', 'application/timestamped-data'],
+  ['toml', 'application/toml'],
+  ['trig', 'application/trig'],
+  ['ttml', 'application/ttml+xml'],
+  ['ubj', 'application/ubjson'],
+  ['rsheet', 'application/urc-ressheet+xml'],
+  ['td', 'application/urc-targetdesc+xml'],
+  ['vxml', 'application/voicexml+xml'],
+  ['wasm', 'application/wasm'],
+  ['wgt', 'application/widget'],
+  ['hlp', 'application/winhlp'],
+  ['wsdl', 'application/wsdl+xml'],
+  ['wspolicy', 'application/wspolicy+xml'],
+  ['xaml', 'application/xaml+xml'],
+  ['xav', 'application/xcap-att+xml'],
+  ['xca', 'application/xcap-caps+xml'],
+  ['xdf', 'application/xcap-diff+xml'],
+  ['xel', 'application/xcap-el+xml'],
+  ['xns', 'application/xcap-ns+xml'],
+  ['xenc', 'application/xenc+xml'],
+  ['xht', 'application/xhtml+xml'],
+  ['xhtml', 'application/xhtml+xml'],
+  ['xlf', 'application/xliff+xml'],
+  ['rng', 'application/xml'],
+  ['xml', 'application/xml'],
+  ['xsd', 'application/xml'],
+  ['xsl', 'application/xml'],
+  ['dtd', 'application/xml-dtd'],
+  ['xop', 'application/xop+xml'],
+  ['xpl', 'application/xproc+xml'],
+  ['*xsl', 'application/xslt+xml'],
+  ['xslt', 'application/xslt+xml'],
+  ['xspf', 'application/xspf+xml'],
+  ['mxml', 'application/xv+xml'],
+  ['xhvml', 'application/xv+xml'],
+  ['xvm', 'application/xv+xml'],
+  ['xvml', 'application/xv+xml'],
+  ['yang', 'application/yang'],
+  ['yin', 'application/yin+xml'],
+  ['zip', 'application/zip'],
+  ['*3gpp', 'audio/3gpp'],
+  ['adp', 'audio/adpcm'],
+  ['amr', 'audio/amr'],
+  ['au', 'audio/basic'],
+  ['snd', 'audio/basic'],
+  ['kar', 'audio/midi'],
+  ['mid', 'audio/midi'],
+  ['midi', 'audio/midi'],
+  ['rmi', 'audio/midi'],
+  ['mxmf', 'audio/mobile-xmf'],
+  ['*mp3', 'audio/mp3'],
+  ['m4a', 'audio/mp4'],
+  ['mp4a', 'audio/mp4'],
+  ['m2a', 'audio/mpeg'],
+  ['m3a', 'audio/mpeg'],
+  ['mp2', 'audio/mpeg'],
+  ['mp2a', 'audio/mpeg'],
+  ['mp3', 'audio/mpeg'],
+  ['mpga', 'audio/mpeg'],
+  ['oga', 'audio/ogg'],
+  ['ogg', 'audio/ogg'],
+  ['opus', 'audio/ogg'],
+  ['spx', 'audio/ogg'],
+  ['s3m', 'audio/s3m'],
+  ['sil', 'audio/silk'],
+  ['wav', 'audio/wav'],
+  ['*wav', 'audio/wave'],
+  ['weba', 'audio/webm'],
+  ['xm', 'audio/xm'],
+  ['ttc', 'font/collection'],
+  ['otf', 'font/otf'],
+  ['ttf', 'font/ttf'],
+  ['woff', 'font/woff'],
+  ['woff2', 'font/woff2'],
+  ['exr', 'image/aces'],
+  ['apng', 'image/apng'],
+  ['avif', 'image/avif'],
+  ['bmp', 'image/bmp'],
+  ['cgm', 'image/cgm'],
+  ['drle', 'image/dicom-rle'],
+  ['emf', 'image/emf'],
+  ['fits', 'image/fits'],
+  ['g3', 'image/g3fax'],
+  ['gif', 'image/gif'],
+  ['heic', 'image/heic'],
+  ['heics', 'image/heic-sequence'],
+  ['heif', 'image/heif'],
+  ['heifs', 'image/heif-sequence'],
+  ['hej2', 'image/hej2k'],
+  ['hsj2', 'image/hsj2'],
+  ['ief', 'image/ief'],
+  ['jls', 'image/jls'],
+  ['jp2', 'image/jp2'],
+  ['jpg2', 'image/jp2'],
+  ['jpe', 'image/jpeg'],
+  ['jpeg', 'image/jpeg'],
+  ['jpg', 'image/jpeg'],
+  ['jph', 'image/jph'],
+  ['jhc', 'image/jphc'],
+  ['jpm', 'image/jpm'],
+  ['jpf', 'image/jpx'],
+  ['jpx', 'image/jpx'],
+  ['jxr', 'image/jxr'],
+  ['jxra', 'image/jxra'],
+  ['jxrs', 'image/jxrs'],
+  ['jxs', 'image/jxs'],
+  ['jxsc', 'image/jxsc'],
+  ['jxsi', 'image/jxsi'],
+  ['jxss', 'image/jxss'],
+  ['ktx', 'image/ktx'],
+  ['ktx2', 'image/ktx2'],
+  ['png', 'image/png'],
+  ['sgi', 'image/sgi'],
+  ['svg', 'image/svg+xml'],
+  ['svgz', 'image/svg+xml'],
+  ['t38', 'image/t38'],
+  ['tif', 'image/tiff'],
+  ['tiff', 'image/tiff'],
+  ['tfx', 'image/tiff-fx'],
+  ['webp', 'image/webp'],
+  ['wmf', 'image/wmf'],
+  ['disposition-notification', 'message/disposition-notification'],
+  ['u8msg', 'message/global'],
+  ['u8dsn', 'message/global-delivery-status'],
+  ['u8mdn', 'message/global-disposition-notification'],
+  ['u8hdr', 'message/global-headers'],
+  ['eml', 'message/rfc822'],
+  ['mime', 'message/rfc822'],
+  ['3mf', 'model/3mf'],
+  ['gltf', 'model/gltf+json'],
+  ['glb', 'model/gltf-binary'],
+  ['iges', 'model/iges'],
+  ['igs', 'model/iges'],
+  ['mesh', 'model/mesh'],
+  ['msh', 'model/mesh'],
+  ['silo', 'model/mesh'],
+  ['mtl', 'model/mtl'],
+  ['obj', 'model/obj'],
+  ['stpx', 'model/step+xml'],
+  ['stpz', 'model/step+zip'],
+  ['stpxz', 'model/step-xml+zip'],
+  ['stl', 'model/stl'],
+  ['vrml', 'model/vrml'],
+  ['wrl', 'model/vrml'],
+  ['*x3db', 'model/x3d+binary'],
+  ['x3dbz', 'model/x3d+binary'],
+  ['x3db', 'model/x3d+fastinfoset'],
+  ['*x3dv', 'model/x3d+vrml'],
+  ['x3dvz', 'model/x3d+vrml'],
+  ['x3d', 'model/x3d+xml'],
+  ['x3dz', 'model/x3d+xml'],
+  ['x3dv', 'model/x3d-vrml'],
+  ['appcache', 'text/cache-manifest'],
+  ['manifest', 'text/cache-manifest'],
+  ['ics', 'text/calendar'],
+  ['ifb', 'text/calendar'],
+  ['coffee', 'text/coffeescript'],
+  ['litcoffee', 'text/coffeescript'],
+  ['css', 'text/css'],
+  ['csv', 'text/csv'],
+  ['htm', 'text/html'],
+  ['html', 'text/html'],
+  ['shtml', 'text/html'],
+  ['jade', 'text/jade'],
+  ['jsx', 'text/jsx'],
+  ['less', 'text/less'],
+  ['markdown', 'text/markdown'],
+  ['md', 'text/markdown'],
+  ['mml', 'text/mathml'],
+  ['mdx', 'text/mdx'],
+  ['n3', 'text/n3'],
+  ['conf', 'text/plain'],
+  ['def', 'text/plain'],
+  ['in', 'text/plain'],
+  ['ini', 'text/plain'],
+  ['list', 'text/plain'],
+  ['log', 'text/plain'],
+  ['text', 'text/plain'],
+  ['txt', 'text/plain'],
+  ['rtx', 'text/richtext'],
+  ['*rtf', 'text/rtf'],
+  ['sgm', 'text/sgml'],
+  ['sgml', 'text/sgml'],
+  ['shex', 'text/shex'],
+  ['slim', 'text/slim'],
+  ['slm', 'text/slim'],
+  ['spdx', 'text/spdx'],
+  ['styl', 'text/stylus'],
+  ['stylus', 'text/stylus'],
+  ['tsv', 'text/tab-separated-values'],
+  ['man', 'text/troff'],
+  ['me', 'text/troff'],
+  ['ms', 'text/troff'],
+  ['roff', 'text/troff'],
+  ['t', 'text/troff'],
+  ['tr', 'text/troff'],
+  ['ttl', 'text/turtle'],
+  ['uri', 'text/uri-list'],
+  ['uris', 'text/uri-list'],
+  ['urls', 'text/uri-list'],
+  ['vcard', 'text/vcard'],
+  ['vtt', 'text/vtt'],
+  ['*xml', 'text/xml'],
+  ['yaml', 'text/yaml'],
+  ['yml', 'text/yaml'],
+  ['3gp', 'video/3gpp'],
+  ['3gpp', 'video/3gpp'],
+  ['3g2', 'video/3gpp2'],
+  ['h261', 'video/h261'],
+  ['h263', 'video/h263'],
+  ['h264', 'video/h264'],
+  ['m4s', 'video/iso.segment'],
+  ['jpgv', 'video/jpeg'],
+  ['jpm', 'video/jpm'],
+  ['jpgm', 'video/jpm'],
+  ['mj2', 'video/mj2'],
+  ['mjp2', 'video/mj2'],
+  ['ts', 'video/mp2t'],
+  ['mp4', 'video/mp4'],
+  ['mp4v', 'video/mp4'],
+  ['mpg4', 'video/mp4'],
+  ['m1v', 'video/mpeg'],
+  ['m2v', 'video/mpeg'],
+  ['mpe', 'video/mpeg'],
+  ['mpeg', 'video/mpeg'],
+  ['mpg', 'video/mpeg'],
+  ['ogv', 'video/ogg'],
+  ['mov', 'video/quicktime'],
+  ['qt', 'video/quicktime'],
+  ['webm', 'video/webm']
+]);
diff --git a/packages/playwright-core/src/utils/multimap.ts b/packages/playwright-core/src/utils/isomorphic/multimap.ts
similarity index 100%
rename from packages/playwright-core/src/utils/multimap.ts
rename to packages/playwright-core/src/utils/isomorphic/multimap.ts
diff --git a/packages/playwright-core/src/utils/isomorphic/protocolFormatter.ts b/packages/playwright-core/src/utils/isomorphic/protocolFormatter.ts
new file mode 100644
index 0000000000000..9f8547d705d02
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/protocolFormatter.ts
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { methodMetainfo } from './protocolMetainfo';
+
+export function formatProtocolParam(params: Record<string, string> | undefined, alternatives: string): string | undefined {
+  if (!params)
+    return undefined;
+
+  for (const name of alternatives.split('|')) {
+    if (name === 'url') {
+      try {
+        const urlObject = new URL(params[name]);
+        if (urlObject.protocol === 'data:')
+          return urlObject.protocol;
+        if (urlObject.protocol === 'about:')
+          return params[name];
+        return urlObject.pathname + urlObject.search;
+      } catch (error) {
+        if (params[name] !== undefined)
+          return params[name];
+      }
+    }
+    if (name === 'timeNumber' && params[name] !== undefined) {
+      // eslint-disable-next-line no-restricted-globals
+      return new Date(params[name]).toString();
+    }
+
+    const value = deepParam(params, name);
+    if (value !== undefined)
+      return value;
+  }
+}
+
+function deepParam(params: Record<string, any>, name: string): string | undefined {
+  const tokens = name.split('.');
+  let current = params;
+  for (const token of tokens) {
+    if (typeof current !== 'object' || current === null)
+      return undefined;
+    current = current[token];
+  }
+  if (current === undefined)
+    return undefined;
+  return String(current);
+}
+
+export function renderTitleForCall(metadata: { title?: string, type: string, method: string, params: Record<string, string> | undefined }) {
+  const titleFormat = metadata.title ?? methodMetainfo.get(metadata.type + '.' + metadata.method)?.title ?? metadata.method;
+  return titleFormat.replace(/\{([^}]+)\}/g, (fullMatch, p1) => {
+    return formatProtocolParam(metadata.params, p1) ?? fullMatch;
+  });
+}
+
+export type ActionGroup = 'configuration' | 'route' | 'getter';
+
+export function getActionGroup(metadata: { type: string, method: string }) {
+  return methodMetainfo.get(metadata.type + '.' + metadata.method)?.group as undefined | ActionGroup;
+}
diff --git a/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts b/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
new file mode 100644
index 0000000000000..226f8dc6e92b2
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/protocolMetainfo.ts
@@ -0,0 +1,309 @@
+/**
+ * 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.
+ */
+
+// This file is generated by generate_channels.js, do not edit manually.
+
+export const methodMetainfo = new Map<string, { internal?: boolean, title?: string, slowMo?: boolean, snapshot?: boolean, pausesBeforeInput?: boolean, pausesBeforeAction?: boolean, group?: string }>([
+  ['APIRequestContext.fetch', { title: '{method} "{url}"', }],
+  ['APIRequestContext.fetchResponseBody', { title: 'Get response body', group: 'getter', }],
+  ['APIRequestContext.fetchLog', { internal: true, }],
+  ['APIRequestContext.storageState', { title: 'Get storage state', }],
+  ['APIRequestContext.disposeAPIResponse', { internal: true, }],
+  ['APIRequestContext.dispose', { internal: true, }],
+  ['LocalUtils.zip', { internal: true, }],
+  ['LocalUtils.harOpen', { internal: true, }],
+  ['LocalUtils.harLookup', { internal: true, }],
+  ['LocalUtils.harClose', { internal: true, }],
+  ['LocalUtils.harUnzip', { internal: true, }],
+  ['LocalUtils.connect', { internal: true, }],
+  ['LocalUtils.tracingStarted', { internal: true, }],
+  ['LocalUtils.addStackToTracingNoReply', { internal: true, }],
+  ['LocalUtils.traceDiscarded', { internal: true, }],
+  ['LocalUtils.globToRegex', { internal: true, }],
+  ['Root.initialize', { internal: true, }],
+  ['Playwright.newRequest', { title: 'Create request context', }],
+  ['DebugController.initialize', { internal: true, }],
+  ['DebugController.setReportStateChanged', { internal: true, }],
+  ['DebugController.setRecorderMode', { internal: true, }],
+  ['DebugController.highlight', { internal: true, }],
+  ['DebugController.hideHighlight', { internal: true, }],
+  ['DebugController.resume', { internal: true, }],
+  ['DebugController.kill', { internal: true, }],
+  ['SocksSupport.socksConnected', { internal: true, }],
+  ['SocksSupport.socksFailed', { internal: true, }],
+  ['SocksSupport.socksData', { internal: true, }],
+  ['SocksSupport.socksError', { internal: true, }],
+  ['SocksSupport.socksEnd', { internal: true, }],
+  ['BrowserType.launch', { title: 'Launch browser', }],
+  ['BrowserType.launchPersistentContext', { title: 'Launch persistent context', }],
+  ['BrowserType.connectOverCDP', { title: 'Connect over CDP', }],
+  ['Browser.close', { title: 'Close browser', pausesBeforeAction: true, }],
+  ['Browser.killForTests', { internal: true, }],
+  ['Browser.defaultUserAgentForTest', { internal: true, }],
+  ['Browser.newContext', { title: 'Create context', }],
+  ['Browser.newContextForReuse', { internal: true, }],
+  ['Browser.disconnectFromReusedContext', { internal: true, }],
+  ['Browser.newBrowserCDPSession', { title: 'Create CDP session', group: 'configuration', }],
+  ['Browser.startTracing', { title: 'Start browser tracing', group: 'configuration', }],
+  ['Browser.stopTracing', { title: 'Stop browser tracing', group: 'configuration', }],
+  ['EventTarget.waitForEventInfo', { title: 'Wait for event "{info.event}"', snapshot: true, }],
+  ['BrowserContext.waitForEventInfo', { title: 'Wait for event "{info.event}"', snapshot: true, }],
+  ['Page.waitForEventInfo', { title: 'Wait for event "{info.event}"', snapshot: true, }],
+  ['WebSocket.waitForEventInfo', { title: 'Wait for event "{info.event}"', snapshot: true, }],
+  ['ElectronApplication.waitForEventInfo', { title: 'Wait for event "{info.event}"', snapshot: true, }],
+  ['AndroidDevice.waitForEventInfo', { title: 'Wait for event "{info.event}"', snapshot: true, }],
+  ['BrowserContext.addCookies', { title: 'Add cookies', group: 'configuration', }],
+  ['BrowserContext.addInitScript', { title: 'Add init script', group: 'configuration', }],
+  ['BrowserContext.clearCookies', { title: 'Clear cookies', group: 'configuration', }],
+  ['BrowserContext.clearPermissions', { title: 'Clear permissions', group: 'configuration', }],
+  ['BrowserContext.close', { title: 'Close context', pausesBeforeAction: true, }],
+  ['BrowserContext.cookies', { title: 'Get cookies', group: 'getter', }],
+  ['BrowserContext.exposeBinding', { title: 'Expose binding', group: 'configuration', }],
+  ['BrowserContext.grantPermissions', { title: 'Grant permissions', group: 'configuration', }],
+  ['BrowserContext.newPage', { title: 'Create page', }],
+  ['BrowserContext.registerSelectorEngine', { internal: true, }],
+  ['BrowserContext.setTestIdAttributeName', { internal: true, }],
+  ['BrowserContext.setExtraHTTPHeaders', { title: 'Set extra HTTP headers', group: 'configuration', }],
+  ['BrowserContext.setGeolocation', { title: 'Set geolocation', group: 'configuration', }],
+  ['BrowserContext.setHTTPCredentials', { title: 'Set HTTP credentials', group: 'configuration', }],
+  ['BrowserContext.setNetworkInterceptionPatterns', { title: 'Route requests', group: 'route', }],
+  ['BrowserContext.setWebSocketInterceptionPatterns', { title: 'Route WebSockets', group: 'route', }],
+  ['BrowserContext.setOffline', { title: 'Set offline mode', }],
+  ['BrowserContext.storageState', { title: 'Get storage state', }],
+  ['BrowserContext.pause', { title: 'Pause', }],
+  ['BrowserContext.enableRecorder', { internal: true, }],
+  ['BrowserContext.disableRecorder', { internal: true, }],
+  ['BrowserContext.newCDPSession', { title: 'Create CDP session', group: 'configuration', }],
+  ['BrowserContext.harStart', { internal: true, }],
+  ['BrowserContext.harExport', { internal: true, }],
+  ['BrowserContext.createTempFiles', { internal: true, }],
+  ['BrowserContext.updateSubscription', { internal: true, }],
+  ['BrowserContext.clockFastForward', { title: 'Fast forward clock "{ticksNumber|ticksString}"', }],
+  ['BrowserContext.clockInstall', { title: 'Install clock "{timeNumber|timeString}"', }],
+  ['BrowserContext.clockPauseAt', { title: 'Pause clock "{timeNumber|timeString}"', }],
+  ['BrowserContext.clockResume', { title: 'Resume clock', }],
+  ['BrowserContext.clockRunFor', { title: 'Run clock "{ticksNumber|ticksString}"', }],
+  ['BrowserContext.clockSetFixedTime', { title: 'Set fixed time "{timeNumber|timeString}"', }],
+  ['BrowserContext.clockSetSystemTime', { title: 'Set system time "{timeNumber|timeString}"', }],
+  ['Page.addInitScript', { title: 'Add init script', group: 'configuration', }],
+  ['Page.close', { title: 'Close page', pausesBeforeAction: true, }],
+  ['Page.emulateMedia', { title: 'Emulate media', snapshot: true, pausesBeforeAction: true, }],
+  ['Page.exposeBinding', { title: 'Expose binding', group: 'configuration', }],
+  ['Page.goBack', { title: 'Go back', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.goForward', { title: 'Go forward', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.requestGC', { title: 'Request garbage collection', group: 'configuration', }],
+  ['Page.registerLocatorHandler', { title: 'Register locator handler', }],
+  ['Page.resolveLocatorHandlerNoReply', { internal: true, }],
+  ['Page.unregisterLocatorHandler', { title: 'Unregister locator handler', }],
+  ['Page.reload', { title: 'Reload', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.expectScreenshot', { title: 'Expect screenshot', snapshot: true, pausesBeforeAction: true, }],
+  ['Page.screenshot', { title: 'Screenshot', snapshot: true, pausesBeforeAction: true, }],
+  ['Page.setExtraHTTPHeaders', { title: 'Set extra HTTP headers', group: 'configuration', }],
+  ['Page.setNetworkInterceptionPatterns', { title: 'Route requests', group: 'route', }],
+  ['Page.setWebSocketInterceptionPatterns', { title: 'Route WebSockets', group: 'route', }],
+  ['Page.setViewportSize', { title: 'Set viewport size', snapshot: true, pausesBeforeAction: true, }],
+  ['Page.keyboardDown', { title: 'Key down "{key}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.keyboardUp', { title: 'Key up "{key}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.keyboardInsertText', { title: 'Insert "{text}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.keyboardType', { title: 'Type "{text}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.keyboardPress', { title: 'Press "{key}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.mouseMove', { title: 'Mouse move', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.mouseDown', { title: 'Mouse down', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.mouseUp', { title: 'Mouse up', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.mouseClick', { title: 'Click', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.mouseWheel', { title: 'Mouse wheel', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.touchscreenTap', { title: 'Tap', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Page.accessibilitySnapshot', { title: 'Accessibility snapshot', group: 'getter', }],
+  ['Page.pdf', { title: 'PDF', }],
+  ['Page.snapshotForAI', { internal: true, }],
+  ['Page.startJSCoverage', { title: 'Start JS coverage', group: 'configuration', }],
+  ['Page.stopJSCoverage', { title: 'Stop JS coverage', group: 'configuration', }],
+  ['Page.startCSSCoverage', { title: 'Start CSS coverage', group: 'configuration', }],
+  ['Page.stopCSSCoverage', { title: 'Stop CSS coverage', group: 'configuration', }],
+  ['Page.bringToFront', { title: 'Bring to front', }],
+  ['Page.updateSubscription', { internal: true, }],
+  ['Frame.evalOnSelector', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.evalOnSelectorAll', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.addScriptTag', { title: 'Add script tag', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.addStyleTag', { title: 'Add style tag', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.ariaSnapshot', { title: 'Aria snapshot', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.blur', { title: 'Blur', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.check', { title: 'Check', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.click', { title: 'Click', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.content', { title: 'Get content', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.dragAndDrop', { title: 'Drag and drop', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.dblclick', { title: 'Double click', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.dispatchEvent', { title: 'Dispatch "{type}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.evaluateExpression', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.evaluateExpressionHandle', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.fill', { title: 'Fill "{value}"', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.focus', { title: 'Focus', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.frameElement', { title: 'Get frame element', group: 'getter', }],
+  ['Frame.resolveSelector', { internal: true, }],
+  ['Frame.highlight', { title: 'Highlight element', group: 'configuration', }],
+  ['Frame.getAttribute', { title: 'Get attribute "{name}"', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.goto', { title: 'Navigate to "{url}"', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.hover', { title: 'Hover', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.innerHTML', { title: 'Get HTML', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.innerText', { title: 'Get inner text', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.inputValue', { title: 'Get input value', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.isChecked', { title: 'Is checked', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.isDisabled', { title: 'Is disabled', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.isEnabled', { title: 'Is enabled', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.isHidden', { title: 'Is hidden', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.isVisible', { title: 'Is visible', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.isEditable', { title: 'Is editable', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.press', { title: 'Press "{key}"', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.querySelector', { title: 'Query selector', snapshot: true, }],
+  ['Frame.querySelectorAll', { title: 'Query selector all', snapshot: true, }],
+  ['Frame.queryCount', { title: 'Query count', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.selectOption', { title: 'Select option', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.setContent', { title: 'Set content', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.setInputFiles', { title: 'Set input files', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.tap', { title: 'Tap', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.textContent', { title: 'Get text content', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['Frame.title', { title: 'Get page title', group: 'getter', }],
+  ['Frame.type', { title: 'Type "{text}"', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.uncheck', { title: 'Uncheck', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['Frame.waitForTimeout', { title: 'Wait for timeout', snapshot: true, }],
+  ['Frame.waitForFunction', { title: 'Wait for function', snapshot: true, pausesBeforeAction: true, }],
+  ['Frame.waitForSelector', { title: 'Wait for selector', snapshot: true, }],
+  ['Frame.expect', { title: 'Expect "{expression}"', snapshot: true, pausesBeforeAction: true, }],
+  ['Worker.evaluateExpression', { title: 'Evaluate', }],
+  ['Worker.evaluateExpressionHandle', { title: 'Evaluate', }],
+  ['JSHandle.dispose', { internal: true, }],
+  ['ElementHandle.dispose', { internal: true, }],
+  ['JSHandle.evaluateExpression', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.evaluateExpression', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['JSHandle.evaluateExpressionHandle', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.evaluateExpressionHandle', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['JSHandle.getPropertyList', { title: 'Get property list', group: 'getter', }],
+  ['ElementHandle.getPropertyList', { title: 'Get property list', group: 'getter', }],
+  ['JSHandle.getProperty', { title: 'Get JS property', group: 'getter', }],
+  ['ElementHandle.getProperty', { title: 'Get JS property', group: 'getter', }],
+  ['JSHandle.jsonValue', { title: 'Get JSON value', group: 'getter', }],
+  ['ElementHandle.jsonValue', { title: 'Get JSON value', group: 'getter', }],
+  ['ElementHandle.evalOnSelector', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.evalOnSelectorAll', { title: 'Evaluate', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.boundingBox', { title: 'Get bounding box', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.check', { title: 'Check', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.click', { title: 'Click', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.contentFrame', { title: 'Get content frame', group: 'getter', }],
+  ['ElementHandle.dblclick', { title: 'Double click', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.dispatchEvent', { title: 'Dispatch event', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.fill', { title: 'Fill "{value}"', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.focus', { title: 'Focus', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.getAttribute', { title: 'Get attribute', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.hover', { title: 'Hover', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.innerHTML', { title: 'Get HTML', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.innerText', { title: 'Get inner text', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.inputValue', { title: 'Get input value', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.isChecked', { title: 'Is checked', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.isDisabled', { title: 'Is disabled', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.isEditable', { title: 'Is editable', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.isEnabled', { title: 'Is enabled', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.isHidden', { title: 'Is hidden', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.isVisible', { title: 'Is visible', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.ownerFrame', { title: 'Get owner frame', group: 'getter', }],
+  ['ElementHandle.press', { title: 'Press "{key}"', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.querySelector', { title: 'Query selector', snapshot: true, }],
+  ['ElementHandle.querySelectorAll', { title: 'Query selector all', snapshot: true, }],
+  ['ElementHandle.screenshot', { title: 'Screenshot', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.scrollIntoViewIfNeeded', { title: 'Scroll into view', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.selectOption', { title: 'Select option', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.selectText', { title: 'Select text', slowMo: true, snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.setInputFiles', { title: 'Set input files', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.tap', { title: 'Tap', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.textContent', { title: 'Get text content', snapshot: true, pausesBeforeAction: true, group: 'getter', }],
+  ['ElementHandle.type', { title: 'Type', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.uncheck', { title: 'Uncheck', slowMo: true, snapshot: true, pausesBeforeInput: true, }],
+  ['ElementHandle.waitForElementState', { title: 'Wait for state', snapshot: true, pausesBeforeAction: true, }],
+  ['ElementHandle.waitForSelector', { title: 'Wait for selector', snapshot: true, }],
+  ['Request.response', { internal: true, }],
+  ['Request.rawRequestHeaders', { internal: true, }],
+  ['Route.redirectNavigationRequest', { internal: true, }],
+  ['Route.abort', { title: 'Abort request', group: 'route', }],
+  ['Route.continue', { title: 'Continue request', group: 'route', }],
+  ['Route.fulfill', { title: 'Fulfill request', group: 'route', }],
+  ['WebSocketRoute.connect', { title: 'Connect WebSocket to server', group: 'route', }],
+  ['WebSocketRoute.ensureOpened', { internal: true, }],
+  ['WebSocketRoute.sendToPage', { title: 'Send WebSocket message', group: 'route', }],
+  ['WebSocketRoute.sendToServer', { title: 'Send WebSocket message', group: 'route', }],
+  ['WebSocketRoute.closePage', { internal: true, }],
+  ['WebSocketRoute.closeServer', { internal: true, }],
+  ['Response.body', { title: 'Get response body', group: 'getter', }],
+  ['Response.securityDetails', { internal: true, }],
+  ['Response.serverAddr', { internal: true, }],
+  ['Response.rawResponseHeaders', { internal: true, }],
+  ['Response.sizes', { internal: true, }],
+  ['BindingCall.reject', { internal: true, }],
+  ['BindingCall.resolve', { internal: true, }],
+  ['Dialog.accept', { title: 'Accept dialog', }],
+  ['Dialog.dismiss', { title: 'Dismiss dialog', }],
+  ['Tracing.tracingStart', { title: 'Start tracing', group: 'configuration', }],
+  ['Tracing.tracingStartChunk', { title: 'Start tracing', group: 'configuration', }],
+  ['Tracing.tracingGroup', { title: 'Trace "{name}"', }],
+  ['Tracing.tracingGroupEnd', { title: 'Group end', }],
+  ['Tracing.tracingStopChunk', { title: 'Stop tracing', group: 'configuration', }],
+  ['Tracing.tracingStop', { title: 'Stop tracing', group: 'configuration', }],
+  ['Artifact.pathAfterFinished', { internal: true, }],
+  ['Artifact.saveAs', { internal: true, }],
+  ['Artifact.saveAsStream', { internal: true, }],
+  ['Artifact.failure', { internal: true, }],
+  ['Artifact.stream', { internal: true, }],
+  ['Artifact.cancel', { internal: true, }],
+  ['Artifact.delete', { internal: true, }],
+  ['Stream.read', { internal: true, }],
+  ['Stream.close', { internal: true, }],
+  ['WritableStream.write', { internal: true, }],
+  ['WritableStream.close', { internal: true, }],
+  ['CDPSession.send', { title: 'Send CDP command', group: 'configuration', }],
+  ['CDPSession.detach', { title: 'Detach CDP session', group: 'configuration', }],
+  ['Electron.launch', { title: 'Launch electron', }],
+  ['ElectronApplication.browserWindow', { internal: true, }],
+  ['ElectronApplication.evaluateExpression', { title: 'Evaluate', }],
+  ['ElectronApplication.evaluateExpressionHandle', { title: 'Evaluate', }],
+  ['ElectronApplication.updateSubscription', { internal: true, }],
+  ['Android.devices', { internal: true, }],
+  ['AndroidSocket.write', { internal: true, }],
+  ['AndroidSocket.close', { internal: true, }],
+  ['AndroidDevice.wait', { title: 'Wait', }],
+  ['AndroidDevice.fill', { title: 'Fill "{text}"', }],
+  ['AndroidDevice.tap', { title: 'Tap', }],
+  ['AndroidDevice.drag', { title: 'Drag', }],
+  ['AndroidDevice.fling', { title: 'Fling', }],
+  ['AndroidDevice.longTap', { title: 'Long tap', }],
+  ['AndroidDevice.pinchClose', { title: 'Pinch close', }],
+  ['AndroidDevice.pinchOpen', { title: 'Pinch open', }],
+  ['AndroidDevice.scroll', { title: 'Scroll', }],
+  ['AndroidDevice.swipe', { title: 'Swipe', }],
+  ['AndroidDevice.info', { internal: true, }],
+  ['AndroidDevice.screenshot', { title: 'Screenshot', }],
+  ['AndroidDevice.inputType', { title: 'Type', }],
+  ['AndroidDevice.inputPress', { title: 'Press', }],
+  ['AndroidDevice.inputTap', { title: 'Tap', }],
+  ['AndroidDevice.inputSwipe', { title: 'Swipe', }],
+  ['AndroidDevice.inputDrag', { title: 'Drag', }],
+  ['AndroidDevice.launchBrowser', { title: 'Launch browser', }],
+  ['AndroidDevice.open', { title: 'Open app', }],
+  ['AndroidDevice.shell', { title: 'Execute shell command', group: 'configuration', }],
+  ['AndroidDevice.installApk', { title: 'Install apk', }],
+  ['AndroidDevice.push', { title: 'Push', }],
+  ['AndroidDevice.connectToWebView', { title: 'Connect to Web View', }],
+  ['AndroidDevice.close', { internal: true, }],
+  ['JsonPipe.send', { internal: true, }],
+  ['JsonPipe.close', { internal: true, }]
+]);
diff --git a/packages/playwright-core/src/utils/rtti.ts b/packages/playwright-core/src/utils/isomorphic/rtti.ts
similarity index 86%
rename from packages/playwright-core/src/utils/rtti.ts
rename to packages/playwright-core/src/utils/isomorphic/rtti.ts
index a18d3a450a75b..ffef6c1cad4ca 100644
--- a/packages/playwright-core/src/utils/rtti.ts
+++ b/packages/playwright-core/src/utils/isomorphic/rtti.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export { isString } from  './isomorphic/stringUtils';
+export { isString } from  './stringUtils';
 
 export function isRegExp(obj: any): obj is RegExp {
   return obj instanceof RegExp || Object.prototype.toString.call(obj) === '[object RegExp]';
@@ -27,5 +27,3 @@ export function isObject(obj: any): obj is NonNullable<object> {
 export function isError(obj: any): obj is Error {
   return obj instanceof Error || (obj && Object.getPrototypeOf(obj)?.name === 'Error');
 }
-
-export const isLikelyNpxGlobal = () => process.argv.length >= 2 && process.argv[1].includes('_npx');
diff --git a/packages/playwright-core/src/utils/isomorphic/selectorParser.ts b/packages/playwright-core/src/utils/isomorphic/selectorParser.ts
index 64ba3c0c4df14..f37d1ef4c31d8 100644
--- a/packages/playwright-core/src/utils/isomorphic/selectorParser.ts
+++ b/packages/playwright-core/src/utils/isomorphic/selectorParser.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import type { CSSComplexSelectorList } from './cssParser';
 import { InvalidSelectorError, parseCSS } from './cssParser';
+
+import type { CSSComplexSelectorList } from './cssParser';
 export { InvalidSelectorError, isInvalidSelectorError } from './cssParser';
 
 export type NestedSelectorBody = { parsed: ParsedSelector, distance?: number };
diff --git a/packages/playwright-core/src/utils/semaphore.ts b/packages/playwright-core/src/utils/isomorphic/semaphore.ts
similarity index 100%
rename from packages/playwright-core/src/utils/semaphore.ts
rename to packages/playwright-core/src/utils/isomorphic/semaphore.ts
diff --git a/packages/playwright-core/src/utils/isomorphic/stackTrace.ts b/packages/playwright-core/src/utils/isomorphic/stackTrace.ts
new file mode 100644
index 0000000000000..dca83848e9414
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/stackTrace.ts
@@ -0,0 +1,201 @@
+/**
+ * The MIT License (MIT)
+ * Modifications copyright (c) Microsoft Corporation.
+ *
+ * Copyright (c) 2016-2023 Isaac Z. Schlueter i@izs.me, James Talmage james@talmage.io (github.com/jamestalmage), and
+ * Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+export type RawStack = string[];
+
+export type StackFrame = {
+  file: string,
+  line: number,
+  column: number,
+  function?: string,
+};
+
+export function captureRawStack(): RawStack {
+  const stackTraceLimit = Error.stackTraceLimit;
+  Error.stackTraceLimit = 50;
+  const error = new Error();
+  const stack = error.stack || '';
+  Error.stackTraceLimit = stackTraceLimit;
+  return stack.split('\n');
+}
+
+export function parseStackFrame(text: string, pathSeparator: string, showInternalStackFrames: boolean): StackFrame | null {
+  const match = text && text.match(re);
+  if (!match)
+    return null;
+
+  let fname = match[2];
+  let file = match[7];
+  if (!file)
+    return null;
+  if (!showInternalStackFrames && (file.startsWith('internal') || file.startsWith('node:')))
+    return null;
+
+  const line = match[8];
+  const column = match[9];
+  const closeParen = match[11] === ')';
+
+  const frame: StackFrame = {
+    file: '',
+    line: 0,
+    column: 0,
+  };
+
+  if (line)
+    frame.line = Number(line);
+
+  if (column)
+    frame.column = Number(column);
+
+  if (closeParen && file) {
+    // make sure parens are balanced
+    // if we have a file like "asdf) [as foo] (xyz.js", then odds are
+    // that the fname should be += " (asdf) [as foo]" and the file
+    // should be just "xyz.js"
+    // walk backwards from the end to find the last unbalanced (
+    let closes = 0;
+    for (let i = file.length - 1; i > 0; i--) {
+      if (file.charAt(i) === ')') {
+        closes++;
+      } else if (file.charAt(i) === '(' && file.charAt(i - 1) === ' ') {
+        closes--;
+        if (closes === -1 && file.charAt(i - 1) === ' ') {
+          const before = file.slice(0, i - 1);
+          const after = file.slice(i + 1);
+          file = after;
+          fname += ` (${before}`;
+          break;
+        }
+      }
+    }
+  }
+
+  if (fname) {
+    const methodMatch = fname.match(methodRe);
+    if (methodMatch)
+      fname = methodMatch[1];
+  }
+
+  if (file) {
+    if (file.startsWith('file://'))
+      file = fileURLToPath(file, pathSeparator);
+    frame.file = file;
+  }
+
+  if (fname)
+    frame.function = fname;
+
+  return frame;
+}
+
+export function rewriteErrorMessage<E extends Error>(e: E, newMessage: string): E {
+  const lines: string[] = (e.stack?.split('\n') || []).filter(l => l.startsWith('    at '));
+  e.message = newMessage;
+  const errorTitle = `${e.name}: ${e.message}`;
+  if (lines.length)
+    e.stack = `${errorTitle}\n${lines.join('\n')}`;
+  return e;
+}
+
+export function stringifyStackFrames(frames: StackFrame[]): string[] {
+  const stackLines: string[] = [];
+  for (const frame of frames) {
+    if (frame.function)
+      stackLines.push(`    at ${frame.function} (${frame.file}:${frame.line}:${frame.column})`);
+    else
+      stackLines.push(`    at ${frame.file}:${frame.line}:${frame.column}`);
+  }
+  return stackLines;
+}
+
+export function splitErrorMessage(message: string): { name: string, message: string } {
+  const separationIdx = message.indexOf(':');
+  return {
+    name: separationIdx !== -1 ? message.slice(0, separationIdx) : '',
+    message: separationIdx !== -1 && separationIdx + 2 <= message.length ? message.substring(separationIdx + 2) : message,
+  };
+}
+
+export function parseErrorStack(stack: string, pathSeparator: string, showInternalStackFrames: boolean = false): {
+  message: string;
+  stackLines: string[];
+  location?: StackFrame;
+} {
+  const lines = stack.split('\n');
+  let firstStackLine = lines.findIndex(line => line.startsWith('    at '));
+  if (firstStackLine === -1)
+    firstStackLine = lines.length;
+  const message = lines.slice(0, firstStackLine).join('\n');
+  const stackLines = lines.slice(firstStackLine);
+  let location: StackFrame | undefined;
+  for (const line of stackLines) {
+    const frame = parseStackFrame(line, pathSeparator, showInternalStackFrames);
+    if (!frame || !frame.file)
+      continue;
+    if (belongsToNodeModules(frame.file, pathSeparator))
+      continue;
+    location = { file: frame.file, column: frame.column || 0, line: frame.line || 0 };
+    break;
+  }
+  return { message, stackLines, location };
+}
+
+function belongsToNodeModules(file: string, pathSeparator: string) {
+  return file.includes(`${pathSeparator}node_modules${pathSeparator}`);
+}
+
+const re = new RegExp('^' +
+  // Sometimes we strip out the '    at' because it's noisy
+  '(?:\\s*at )?' +
+  // $1 = ctor if 'new'
+  '(?:(new) )?' +
+  // $2 = function name (can be literally anything)
+  // May contain method at the end as [as xyz]
+  '(?:(.*?) \\()?' +
+  // (eval at <anonymous> (file.js:1:1),
+  // $3 = eval origin
+  // $4:$5:$6 are eval file/line/col, but not normally reported
+  '(?:eval at ([^ ]+) \\((.+?):(\\d+):(\\d+)\\), )?' +
+  // file:line:col
+  // $7:$8:$9
+  // $10 = 'native' if native
+  '(?:(.+?):(\\d+):(\\d+)|(native))' +
+  // maybe close the paren, then end
+  // if $11 is ), then we only allow balanced parens in the filename
+  // any imbalance is placed on the fname.  This is a heuristic, and
+  // bound to be incorrect in some edge cases.  The bet is that
+  // having weird characters in method names is more common than
+  // having weird characters in filenames, which seems reasonable.
+  '(\\)?)$'
+);
+
+const methodRe = /^(.*?) \[as (.*?)\]$/;
+
+function fileURLToPath(fileUrl: string, pathSeparator: string): string {
+  if (!fileUrl.startsWith('file://'))
+    return fileUrl;
+
+  let path = decodeURIComponent(fileUrl.slice(7));
+  if (path.startsWith('/') && /^[a-zA-Z]:/.test(path.slice(1)))
+    path = path.slice(1);
+
+  return path.replace(/\//g, pathSeparator);
+}
diff --git a/packages/playwright-core/src/utils/isomorphic/stringUtils.ts b/packages/playwright-core/src/utils/isomorphic/stringUtils.ts
index df213a10855fe..af0a07c0c175a 100644
--- a/packages/playwright-core/src/utils/isomorphic/stringUtils.ts
+++ b/packages/playwright-core/src/utils/isomorphic/stringUtils.ts
@@ -23,10 +23,17 @@ export function escapeWithQuotes(text: string, char: string = '\'') {
   if (char === '"')
     return char + escapedText.replace(/["]/g, '\\"') + char;
   if (char === '`')
-    return char + escapedText.replace(/[`]/g, '`') + char;
+    return char + escapedText.replace(/[`]/g, '\\`') + char;
   throw new Error('Invalid escape char');
 }
 
+export function escapeTemplateString(text: string): string {
+  return text
+      .replace(/\\/g, '\\\\')
+      .replace(/`/g, '\\`')
+      .replace(/\$\{/g, '\\${');
+}
+
 export function isString(obj: any): obj is string {
   return typeof obj === 'string' || obj instanceof String;
 }
@@ -40,31 +47,8 @@ export function toSnakeCase(name: string): string {
   return name.replace(/([a-z0-9])([A-Z])/g, '$1_$2').replace(/([A-Z])([A-Z][a-z])/g, '$1_$2').toLowerCase();
 }
 
-export function cssEscape(s: string): string {
-  let result = '';
-  for (let i = 0; i < s.length; i++)
-    result += cssEscapeOne(s, i);
-  return result;
-}
-
 export function quoteCSSAttributeValue(text: string): string {
-  return `"${cssEscape(text).replace(/\\ /g, ' ')}"`;
-}
-
-function cssEscapeOne(s: string, i: number): string {
-  // https://drafts.csswg.org/cssom/#serialize-an-identifier
-  const c = s.charCodeAt(i);
-  if (c === 0x0000)
-    return '\uFFFD';
-  if ((c >= 0x0001 && c <= 0x001f) ||
-      (c >= 0x0030 && c <= 0x0039 && (i === 0 || (i === 1 && s.charCodeAt(0) === 0x002d))))
-    return '\\' + c.toString(16) + ' ';
-  if (i === 0 && c === 0x002d && s.length === 1)
-    return '\\' + s.charAt(i);
-  if (c >= 0x0080 || c === 0x002d || c === 0x005f || (c >= 0x0030 && c <= 0x0039) ||
-      (c >= 0x0041 && c <= 0x005a) || (c >= 0x0061 && c <= 0x007a))
-    return s.charAt(i);
-  return '\\' + s.charAt(i);
+  return `"${text.replace(/["\\]/g, char => '\\' + char)}"`;
 }
 
 let normalizedWhitespaceCache: Map<string, string> | undefined;
@@ -76,7 +60,7 @@ export function cacheNormalizedWhitespaces() {
 export function normalizeWhiteSpace(text: string): string {
   let result = normalizedWhitespaceCache?.get(text);
   if (result === undefined) {
-    result = text.replace(/\u200b/g, '').trim().replace(/\s+/g, ' ');
+    result = text.replace(/[\u200b\u00ad]/g, '').trim().replace(/\s+/g, ' ');
     normalizedWhitespaceCache?.set(text, result);
   }
   return result;
@@ -132,3 +116,40 @@ export function escapeRegExp(s: string) {
   // From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
   return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 }
+
+const escaped = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', '\'': '&#39;' };
+export function escapeHTMLAttribute(s: string): string {
+  return s.replace(/[&<>"']/ug, char => (escaped as any)[char]);
+}
+export function escapeHTML(s: string): string {
+  return s.replace(/[&<]/ug, char => (escaped as any)[char]);
+}
+
+export function longestCommonSubstring(s1: string, s2: string): string {
+  const n = s1.length;
+  const m = s2.length;
+  let maxLen = 0;
+  let endingIndex = 0;
+
+  // Initialize a 2D array with zeros
+  const dp = Array(n + 1)
+      .fill(null)
+      .map(() => Array(m + 1).fill(0));
+
+  // Build the dp table
+  for (let i = 1; i <= n; i++) {
+    for (let j = 1; j <= m; j++) {
+      if (s1[i - 1] === s2[j - 1]) {
+        dp[i][j] = dp[i - 1][j - 1] + 1;
+
+        if (dp[i][j] > maxLen) {
+          maxLen = dp[i][j];
+          endingIndex = i;
+        }
+      }
+    }
+  }
+
+  // Extract the longest common substring
+  return s1.slice(endingIndex - maxLen, endingIndex);
+}
diff --git a/packages/playwright-core/src/utils/isomorphic/time.ts b/packages/playwright-core/src/utils/isomorphic/time.ts
new file mode 100644
index 0000000000000..b5b68a59d5ee8
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/time.ts
@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+
+// Hopefully, this file is never used in injected sources,
+// because it does not use `builtins.performance`,
+// and can break when clock emulation is engaged.
+
+/* eslint-disable no-restricted-globals */
+
+let _timeOrigin = performance.timeOrigin;
+let _timeShift = 0;
+
+export function setTimeOrigin(origin: number) {
+  _timeOrigin = origin;
+  _timeShift = performance.timeOrigin - origin;
+}
+
+export function timeOrigin(): number {
+  return _timeOrigin;
+}
+
+export function monotonicTime(): number {
+  return Math.floor((performance.now() + _timeShift) * 1000) / 1000;
+}
+
+export const DEFAULT_PLAYWRIGHT_TIMEOUT = 30_000;
+export const DEFAULT_PLAYWRIGHT_LAUNCH_TIMEOUT = 3 * 60 * 1000; // 3 minutes
diff --git a/packages/playwright-core/src/utils/timeoutRunner.ts b/packages/playwright-core/src/utils/isomorphic/timeoutRunner.ts
similarity index 89%
rename from packages/playwright-core/src/utils/timeoutRunner.ts
rename to packages/playwright-core/src/utils/isomorphic/timeoutRunner.ts
index 622019565a19b..9a01d0f0796cc 100644
--- a/packages/playwright-core/src/utils/timeoutRunner.ts
+++ b/packages/playwright-core/src/utils/isomorphic/timeoutRunner.ts
@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 
-import { monotonicTime } from './';
+// Hopefully, this file is never used in injected sources,
+// because it does not use `builtins.setTimeout` and similar,
+// and can break when clock emulation is engaged.
+
+/* eslint-disable no-restricted-globals */
+
+import { monotonicTime } from './time';
 
 export async function raceAgainstDeadline<T>(cb: () => Promise<T>, deadline: number): Promise<{ result: T, timedOut: false } | { timedOut: true }> {
   let timer: NodeJS.Timeout | undefined;
diff --git a/packages/playwright-core/src/utils/isomorphic/traceUtils.ts b/packages/playwright-core/src/utils/isomorphic/traceUtils.ts
index edb1e1c66081f..f077cc5c4b4a1 100644
--- a/packages/playwright-core/src/utils/isomorphic/traceUtils.ts
+++ b/packages/playwright-core/src/utils/isomorphic/traceUtils.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { StackFrame } from '@protocol/channels';
+import type { ClientSideCallMetadata, StackFrame } from '@protocol/channels';
 
 export type SerializedStackFrame = [number, number, number, string];
 export type SerializedStack = [number, SerializedStackFrame[]];
@@ -33,3 +33,24 @@ export function parseClientSideCallMetadata(data: SerializedClientSideCallMetada
   }
   return result;
 }
+
+export function serializeClientSideCallMetadata(metadatas: ClientSideCallMetadata[]): SerializedClientSideCallMetadata {
+  const fileNames = new Map<string, number>();
+  const stacks: SerializedStack[] = [];
+  for (const m of metadatas) {
+    if (!m.stack || !m.stack.length)
+      continue;
+    const stack: SerializedStackFrame[] = [];
+    for (const frame of m.stack) {
+      let ordinal = fileNames.get(frame.file);
+      if (typeof ordinal !== 'number') {
+        ordinal = fileNames.size;
+        fileNames.set(frame.file, ordinal);
+      }
+      const stackFrame: SerializedStackFrame = [ordinal, frame.line || 0, frame.column || 0, frame.function || ''];
+      stack.push(stackFrame);
+    }
+    stacks.push([m.id, stack]);
+  }
+  return { files: [...fileNames.keys()], stacks };
+}
diff --git a/packages/playwright-core/src/common/types.ts b/packages/playwright-core/src/utils/isomorphic/types.ts
similarity index 84%
rename from packages/playwright-core/src/common/types.ts
rename to packages/playwright-core/src/utils/isomorphic/types.ts
index e179b8c4a148d..8bf7df0614d1c 100644
--- a/packages/playwright-core/src/common/types.ts
+++ b/packages/playwright-core/src/utils/isomorphic/types.ts
@@ -18,7 +18,5 @@ export type Size = { width: number, height: number };
 export type Point = { x: number, y: number };
 export type Rect = Size & Point;
 export type Quad = [ Point, Point, Point, Point ];
-export type URLMatch = string | RegExp | ((url: URL) => boolean);
-export type TimeoutOptions = { timeout?: number };
 export type NameValue = { name: string, value: string };
-export type HeadersArray = NameValue[];
\ No newline at end of file
+export type HeadersArray = NameValue[];
diff --git a/packages/playwright-core/src/utils/isomorphic/urlMatch.ts b/packages/playwright-core/src/utils/isomorphic/urlMatch.ts
new file mode 100644
index 0000000000000..84fcf8434a596
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/urlMatch.ts
@@ -0,0 +1,188 @@
+/**
+ * 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 { isString } from './stringUtils';
+
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#escaping
+const escapedChars = new Set(['$', '^', '+', '.', '*', '(', ')', '|', '\\', '?', '{', '}', '[', ']']);
+
+export function globToRegexPattern(glob: string): string {
+  const tokens = ['^'];
+  let inGroup = false;
+  for (let i = 0; i < glob.length; ++i) {
+    const c = glob[i];
+    if (c === '\\' && i + 1 < glob.length) {
+      const char = glob[++i];
+      tokens.push(escapedChars.has(char) ? '\\' + char : char);
+      continue;
+    }
+    if (c === '*') {
+      const beforeDeep = glob[i - 1];
+      let starCount = 1;
+      while (glob[i + 1] === '*') {
+        starCount++;
+        i++;
+      }
+      const afterDeep = glob[i + 1];
+      const isDeep = starCount > 1 &&
+          (beforeDeep === '/' || beforeDeep === undefined) &&
+          (afterDeep === '/' || afterDeep === undefined);
+      if (isDeep) {
+        tokens.push('((?:[^/]*(?:\/|$))*)');
+        i++;
+      } else {
+        tokens.push('([^/]*)');
+      }
+      continue;
+    }
+
+    switch (c) {
+      case '{':
+        inGroup = true;
+        tokens.push('(');
+        break;
+      case '}':
+        inGroup = false;
+        tokens.push(')');
+        break;
+      case ',':
+        if (inGroup) {
+          tokens.push('|');
+          break;
+        }
+        tokens.push('\\' + c);
+        break;
+      default:
+        tokens.push(escapedChars.has(c) ? '\\' + c : c);
+    }
+  }
+  tokens.push('$');
+  return tokens.join('');
+}
+
+function isRegExp(obj: any): obj is RegExp {
+  return obj instanceof RegExp || Object.prototype.toString.call(obj) === '[object RegExp]';
+}
+
+export type URLMatch = string | RegExp | ((url: URL) => boolean);
+
+export function urlMatchesEqual(match1: URLMatch, match2: URLMatch) {
+  if (isRegExp(match1) && isRegExp(match2))
+    return match1.source === match2.source && match1.flags === match2.flags;
+  return match1 === match2;
+}
+
+export function urlMatches(baseURL: string | undefined, urlString: string, match: URLMatch | undefined, webSocketUrl?: boolean): boolean {
+  if (match === undefined || match === '')
+    return true;
+  if (isString(match))
+    match = new RegExp(resolveGlobToRegexPattern(baseURL, match, webSocketUrl));
+  if (isRegExp(match)) {
+    const r = match.test(urlString);
+    return r;
+  }
+  const url = parseURL(urlString);
+  if (!url)
+    return false;
+  if (typeof match !== 'function')
+    throw new Error('url parameter should be string, RegExp or function');
+  return match(url);
+}
+
+export function resolveGlobToRegexPattern(baseURL: string | undefined, glob: string, webSocketUrl?: boolean): string {
+  if (webSocketUrl)
+    baseURL = toWebSocketBaseUrl(baseURL);
+  glob = resolveGlobBase(baseURL, glob);
+  return globToRegexPattern(glob);
+}
+
+function toWebSocketBaseUrl(baseURL: string | undefined) {
+  // Allow http(s) baseURL to match ws(s) urls.
+  if (baseURL && /^https?:\/\//.test(baseURL))
+    baseURL = baseURL.replace(/^http/, 'ws');
+  return baseURL;
+}
+
+function resolveGlobBase(baseURL: string | undefined, match: string): string {
+  if (!match.startsWith('*')) {
+    const tokenMap = new Map<string, string>();
+    function mapToken(original: string, replacement: string) {
+      if (original.length === 0)
+        return '';
+      tokenMap.set(replacement, original);
+      return replacement;
+    }
+    // Escaped `\\?` behaves the same as `?` in our glob patterns.
+    match = match.replaceAll(/\\\\\?/g, '?');
+    // Special case about: URLs as they are not relative to baseURL
+    if (match.startsWith('about:') || match.startsWith('data:')
+      || match.startsWith('chrome:') || match.startsWith('edge:')
+      || match.startsWith('file:'))
+      return match;
+    // Glob symbols may be escaped in the URL and some of them such as ? affect resolution,
+    // so we replace them with safe components first.
+    const relativePath = match.split('/').map((token, index) => {
+      if (token === '.' || token === '..' || token === '')
+        return token;
+      // Handle special case of http*://, note that the new schema has to be
+      // a web schema so that slashes are properly inserted after domain.
+      if (index === 0 && token.endsWith(':'))
+        return mapToken(token, 'http:');
+      const questionIndex = token.indexOf('?');
+      if (questionIndex === -1)
+        return mapToken(token, `$_${index}_$`);
+      const newPrefix = mapToken(token.substring(0, questionIndex), `$_${index}_$`);
+      const newSuffix = mapToken(token.substring(questionIndex), `?$_${index}_$`);
+      return newPrefix + newSuffix;
+    }).join('/');
+    const result = resolveBaseURL(baseURL, relativePath);
+    let resolved = result.resolved;
+    for (const [token, original] of tokenMap) {
+      const normalize = result.caseInsensitivePart?.includes(token);
+      resolved = resolved.replace(token, normalize ? original.toLowerCase() : original);
+    }
+    match = resolved;
+  }
+  return match;
+}
+
+function parseURL(url: string): URL | null {
+  try {
+    return new URL(url);
+  } catch (e) {
+    return null;
+  }
+}
+
+export function constructURLBasedOnBaseURL(baseURL: string | undefined, givenURL: string): string {
+  try {
+    return resolveBaseURL(baseURL, givenURL).resolved;
+  } catch (e) {
+    return givenURL;
+  }
+}
+
+function resolveBaseURL(baseURL: string | undefined, givenURL: string) {
+  try {
+    const url = new URL(givenURL, baseURL);
+    const resolved = url.toString();
+    // Schema and domain are case-insensitive.
+    const caseInsensitivePrefix = url.origin;
+    return { resolved, caseInsensitivePart: caseInsensitivePrefix };
+  } catch (e) {
+    return { resolved: givenURL };
+  }
+}
diff --git a/packages/playwright-core/src/utils/isomorphic/utilityScriptSerializers.ts b/packages/playwright-core/src/utils/isomorphic/utilityScriptSerializers.ts
new file mode 100644
index 0000000000000..36e24104898cd
--- /dev/null
+++ b/packages/playwright-core/src/utils/isomorphic/utilityScriptSerializers.ts
@@ -0,0 +1,291 @@
+/**
+ * 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 TypedArrayKind = 'i8' | 'ui8' | 'ui8c' | 'i16' | 'ui16' | 'i32' | 'ui32' | 'f32' | 'f64' | 'bi64' | 'bui64';
+
+export type SerializedValue =
+    undefined | boolean | number | string |
+    { v: 'null' | 'undefined' | 'NaN' | 'Infinity' | '-Infinity' | '-0' } |
+    { d: string } |
+    { u: string } |
+    { bi: string } |
+    { e: { n: string, m: string, s: string } } |
+    { r: { p: string, f: string } } |
+    { a: SerializedValue[], id: number } |
+    { o: { k: string, v: SerializedValue }[], id: number } |
+    { ref: number } |
+    { h: number } |
+    { ta: { b: string, k: TypedArrayKind } };
+
+type HandleOrValue = { h: number } | { fallThrough: any };
+
+type VisitorInfo = {
+  visited: Map<object, number>;
+  lastId: number;
+};
+
+function isRegExp(obj: any): obj is RegExp {
+  try {
+    return obj instanceof RegExp || Object.prototype.toString.call(obj) === '[object RegExp]';
+  } catch (error) {
+    return false;
+  }
+}
+
+// eslint-disable-next-line no-restricted-globals
+function isDate(obj: any): obj is Date {
+  try {
+    // eslint-disable-next-line no-restricted-globals
+    return obj instanceof Date || Object.prototype.toString.call(obj) === '[object Date]';
+  } catch (error) {
+    return false;
+  }
+}
+
+function isURL(obj: any): obj is URL {
+  try {
+    return obj instanceof URL || Object.prototype.toString.call(obj) === '[object URL]';
+  } catch (error) {
+    return false;
+  }
+}
+
+function isError(obj: any): obj is Error {
+  try {
+    return obj instanceof Error || (obj && Object.getPrototypeOf(obj)?.name === 'Error');
+  } catch (error) {
+    return false;
+  }
+}
+
+function isTypedArray(obj: any, constructor: Function): boolean {
+  try {
+    return obj instanceof constructor || Object.prototype.toString.call(obj) === `[object ${constructor.name}]`;
+  } catch (error) {
+    return false;
+  }
+}
+
+const typedArrayConstructors: Record<TypedArrayKind, Function> = {
+  i8: Int8Array,
+  ui8: Uint8Array,
+  ui8c: Uint8ClampedArray,
+  i16: Int16Array,
+  ui16: Uint16Array,
+  i32: Int32Array,
+  ui32: Uint32Array,
+  // TODO: add Float16Array once it's in baseline
+  f32: Float32Array,
+  f64: Float64Array,
+  bi64: BigInt64Array,
+  bui64: BigUint64Array,
+};
+
+function typedArrayToBase64(array: any) {
+  /**
+   * Firefox does not support iterating over typed arrays, so we use `.toBase64`.
+   * Error: 'Accessing TypedArray data over Xrays is slow, and forbidden in order to encourage performant code. To copy TypedArrays across origin boundaries, consider using Components.utils.cloneInto().'
+   */
+  if ('toBase64' in array)
+    return array.toBase64();
+  const binary = Array.from(new Uint8Array(array.buffer, array.byteOffset, array.byteLength)).map(b => String.fromCharCode(b)).join('');
+  return btoa(binary);
+}
+
+function base64ToTypedArray(base64: string, TypedArrayConstructor: any) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++)
+    bytes[i] = binary.charCodeAt(i);
+  return new TypedArrayConstructor(bytes.buffer);
+}
+
+export function parseEvaluationResultValue(value: SerializedValue, handles: any[] = [], refs: Map<number, object> = new Map()): any {
+  if (Object.is(value, undefined))
+    return undefined;
+  if (typeof value === 'object' && value) {
+    if ('ref' in value)
+      return refs.get(value.ref);
+    if ('v' in value) {
+      if (value.v === 'undefined')
+        return undefined;
+      if (value.v === 'null')
+        return null;
+      if (value.v === 'NaN')
+        return NaN;
+      if (value.v === 'Infinity')
+        return Infinity;
+      if (value.v === '-Infinity')
+        return -Infinity;
+      if (value.v === '-0')
+        return -0;
+      return undefined;
+    }
+    if ('d' in value) {
+      // eslint-disable-next-line no-restricted-globals
+      return new Date(value.d);
+    }
+    if ('u' in value)
+      return new URL(value.u);
+    if ('bi' in value)
+      return BigInt(value.bi);
+    if ('e' in value) {
+      const error = new Error(value.e.m);
+      error.name = value.e.n;
+      error.stack = value.e.s;
+      return error;
+    }
+    if ('r' in value)
+      return new RegExp(value.r.p, value.r.f);
+    if ('a' in value) {
+      const result: any[] = [];
+      refs.set(value.id, result);
+      for (const a of value.a)
+        result.push(parseEvaluationResultValue(a, handles, refs));
+      return result;
+    }
+    if ('o' in value) {
+      const result: any = {};
+      refs.set(value.id, result);
+      for (const { k, v } of value.o) {
+        if (k === '__proto__')
+          continue;
+        result[k] = parseEvaluationResultValue(v, handles, refs);
+      }
+      return result;
+    }
+    if ('h' in value)
+      return handles[value.h];
+    if ('ta' in value)
+      return base64ToTypedArray(value.ta.b, typedArrayConstructors[value.ta.k]);
+  }
+  return value;
+}
+
+export function serializeAsCallArgument(value: any, handleSerializer: (value: any) => HandleOrValue): SerializedValue {
+  return serialize(value, handleSerializer, { visited: new Map(), lastId: 0 });
+}
+
+function serialize(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo): SerializedValue {
+  if (value && typeof value === 'object') {
+    // eslint-disable-next-line no-restricted-globals
+    if (typeof globalThis.Window === 'function' && value instanceof globalThis.Window)
+      return 'ref: <Window>';
+    // eslint-disable-next-line no-restricted-globals
+    if (typeof globalThis.Document === 'function' && value instanceof globalThis.Document)
+      return 'ref: <Document>';
+    // eslint-disable-next-line no-restricted-globals
+    if (typeof globalThis.Node === 'function' && value instanceof globalThis.Node)
+      return 'ref: <Node>';
+  }
+  return innerSerialize(value, handleSerializer, visitorInfo);
+}
+
+function innerSerialize(value: any, handleSerializer: (value: any) => HandleOrValue, visitorInfo: VisitorInfo): SerializedValue {
+  const result = handleSerializer(value);
+  if ('fallThrough' in result)
+    value = result.fallThrough;
+  else
+    return result;
+
+  if (typeof value === 'symbol')
+    return { v: 'undefined' };
+  if (Object.is(value, undefined))
+    return { v: 'undefined' };
+  if (Object.is(value, null))
+    return { v: 'null' };
+  if (Object.is(value, NaN))
+    return { v: 'NaN' };
+  if (Object.is(value, Infinity))
+    return { v: 'Infinity' };
+  if (Object.is(value, -Infinity))
+    return { v: '-Infinity' };
+  if (Object.is(value, -0))
+    return { v: '-0' };
+
+  if (typeof value === 'boolean')
+    return value;
+  if (typeof value === 'number')
+    return value;
+  if (typeof value === 'string')
+    return value;
+  if (typeof value === 'bigint')
+    return { bi: value.toString() };
+
+  if (isError(value)) {
+    let stack;
+    if (value.stack?.startsWith(value.name + ': ' + value.message)) {
+      // v8
+      stack = value.stack;
+    } else {
+      stack = `${value.name}: ${value.message}\n${value.stack}`;
+    }
+    return { e: { n: value.name, m: value.message, s: stack } };
+  }
+  if (isDate(value))
+    return { d: value.toJSON() };
+  if (isURL(value))
+    return { u: value.toJSON() };
+  if (isRegExp(value))
+    return { r: { p: value.source, f: value.flags } };
+  for (const [k, ctor] of Object.entries(typedArrayConstructors) as [TypedArrayKind, Function][]) {
+    if (isTypedArray(value, ctor))
+      return { ta: { b: typedArrayToBase64(value), k } };
+  }
+
+  const id = visitorInfo.visited.get(value);
+  if (id)
+    return { ref: id };
+
+  if (Array.isArray(value)) {
+    const a = [];
+    const id = ++visitorInfo.lastId;
+    visitorInfo.visited.set(value, id);
+    for (let i = 0; i < value.length; ++i)
+      a.push(serialize(value[i], handleSerializer, visitorInfo));
+    return { a, id };
+  }
+
+  if (typeof value === 'object') {
+    const o: { k: string, v: SerializedValue }[] = [];
+    const id = ++visitorInfo.lastId;
+    visitorInfo.visited.set(value, id);
+    for (const name of Object.keys(value)) {
+      let item;
+      try {
+        item = value[name];
+      } catch (e) {
+        continue;  // native bindings will throw sometimes
+      }
+      if (name === 'toJSON' && typeof item === 'function')
+        o.push({ k: name, v: { o: [], id: 0 } });
+      else
+        o.push({ k: name, v: serialize(item, handleSerializer, visitorInfo) });
+    }
+
+    let jsonWrapper;
+    try {
+      // If Object.keys().length === 0 we fall back to toJSON if it exists
+      if (o.length === 0 && value.toJSON && typeof value.toJSON === 'function')
+        jsonWrapper = { value: value.toJSON() };
+    } catch (e) {
+    }
+    if (jsonWrapper)
+      return innerSerialize(jsonWrapper.value, handleSerializer, visitorInfo);
+
+    return { o, id };
+  }
+}
diff --git a/packages/playwright-core/src/utils/stackTrace.ts b/packages/playwright-core/src/utils/stackTrace.ts
deleted file mode 100644
index 77e1365b3f876..0000000000000
--- a/packages/playwright-core/src/utils/stackTrace.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import path from 'path';
-import { parseStackTraceLine } from '../utilsBundle';
-import { isUnderTest } from './';
-import type { StackFrame } from '@protocol/channels';
-import { colors } from '../utilsBundle';
-
-export function rewriteErrorMessage<E extends Error>(e: E, newMessage: string): E {
-  const lines: string[] = (e.stack?.split('\n') || []).filter(l => l.startsWith('    at '));
-  e.message = newMessage;
-  const errorTitle = `${e.name}: ${e.message}`;
-  if (lines.length)
-    e.stack = `${errorTitle}\n${lines.join('\n')}`;
-  return e;
-}
-
-const CORE_DIR = path.resolve(__dirname, '..', '..');
-
-const internalStackPrefixes = [
-  CORE_DIR,
-];
-export const addInternalStackPrefix = (prefix: string) => internalStackPrefixes.push(prefix);
-
-export type RawStack = string[];
-
-export function captureRawStack(): RawStack {
-  const stackTraceLimit = Error.stackTraceLimit;
-  Error.stackTraceLimit = 50;
-  const error = new Error();
-  const stack = error.stack || '';
-  Error.stackTraceLimit = stackTraceLimit;
-  return stack.split('\n');
-}
-
-export function captureLibraryStackTrace(): { frames: StackFrame[], apiName: string } {
-  const stack = captureRawStack();
-
-  const isTesting = isUnderTest();
-  type ParsedFrame = {
-    frame: StackFrame;
-    frameText: string;
-    isPlaywrightLibrary: boolean;
-  };
-  let parsedFrames = stack.map(line => {
-    const frame = parseStackTraceLine(line);
-    if (!frame || !frame.file)
-      return null;
-    const isPlaywrightLibrary = frame.file.startsWith(CORE_DIR);
-    const parsed: ParsedFrame = {
-      frame,
-      frameText: line,
-      isPlaywrightLibrary
-    };
-    return parsed;
-  }).filter(Boolean) as ParsedFrame[];
-
-  let apiName = '';
-
-  // Deepest transition between non-client code calling into client
-  // code is the api entry.
-  for (let i = 0; i < parsedFrames.length - 1; i++) {
-    const parsedFrame = parsedFrames[i];
-    if (parsedFrame.isPlaywrightLibrary && !parsedFrames[i + 1].isPlaywrightLibrary) {
-      apiName = apiName || normalizeAPIName(parsedFrame.frame.function);
-      break;
-    }
-  }
-
-  function normalizeAPIName(name?: string): string {
-    if (!name)
-      return '';
-    const match = name.match(/(API|JS|CDP|[A-Z])(.*)/);
-    if (!match)
-      return name;
-    return match[1].toLowerCase() + match[2];
-  }
-
-  // This is for the inspector so that it did not include the test runner stack frames.
-  parsedFrames = parsedFrames.filter(f => {
-    if (process.env.PWDEBUGIMPL)
-      return true;
-    if (internalStackPrefixes.some(prefix => f.frame.file.startsWith(prefix)))
-      return false;
-    return true;
-  });
-
-  return {
-    frames: parsedFrames.map(p => p.frame),
-    apiName
-  };
-}
-
-export function stringifyStackFrames(frames: StackFrame[]): string[] {
-  const stackLines: string[] = [];
-  for (const frame of frames) {
-    if (frame.function)
-      stackLines.push(`    at ${frame.function} (${frame.file}:${frame.line}:${frame.column})`);
-    else
-      stackLines.push(`    at ${frame.file}:${frame.line}:${frame.column}`);
-  }
-  return stackLines;
-}
-
-export function captureLibraryStackText() {
-  const parsed = captureLibraryStackTrace();
-  return stringifyStackFrames(parsed.frames).join('\n');
-}
-
-export function splitErrorMessage(message: string): { name: string, message: string } {
-  const separationIdx = message.indexOf(':');
-  return {
-    name: separationIdx !== -1 ? message.slice(0, separationIdx) : '',
-    message: separationIdx !== -1 && separationIdx + 2 <= message.length ? message.substring(separationIdx + 2) : message,
-  };
-}
-
-export function formatCallLog(log: string[] | undefined): string {
-  if (!log || !log.some(l => !!l))
-    return '';
-  return `
-Call log:
-  ${colors.dim('- ' + (log || []).join('\n  - '))}
-`;
-}
-
-export type ExpectZone = {
-  title: string;
-  stepId: string;
-};
diff --git a/packages/playwright-core/src/utils/time.ts b/packages/playwright-core/src/utils/time.ts
deleted file mode 100644
index d00ee62e82fc5..0000000000000
--- a/packages/playwright-core/src/utils/time.ts
+++ /dev/null
@@ -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.
- */
-
-// The `process.hrtime()` returns a time from some arbitrary
-// date in the past; on certain systems, this is the time from the system boot.
-// The `monotonicTime()` converts this to milliseconds.
-//
-// For a Linux server with uptime of 36 days, the `monotonicTime()` value
-// will be 36 * 86400 * 1000 = 3_110_400_000, which is larger than
-// the maximum value that `setTimeout` accepts as an argument: 2_147_483_647.
-//
-// To make the `monotonicTime()` a reasonable value, we anchor
-// it to the time of the first import of this utility.
-const initialTime = process.hrtime();
-
-export function monotonicTime(): number {
-  const [seconds, nanoseconds] = process.hrtime(initialTime);
-  return seconds * 1000 + (nanoseconds / 1000 | 0) / 1000;
-}
diff --git a/packages/playwright-core/src/utils/traceUtils.ts b/packages/playwright-core/src/utils/traceUtils.ts
deleted file mode 100644
index d0090b3665590..0000000000000
--- a/packages/playwright-core/src/utils/traceUtils.ts
+++ /dev/null
@@ -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 type { ClientSideCallMetadata } from '@protocol/channels';
-import type { SerializedClientSideCallMetadata, SerializedStack, SerializedStackFrame } from './isomorphic/traceUtils';
-
-export function serializeClientSideCallMetadata(metadatas: ClientSideCallMetadata[]): SerializedClientSideCallMetadata {
-  const fileNames = new Map<string, number>();
-  const stacks: SerializedStack[] = [];
-  for (const m of metadatas) {
-    if (!m.stack || !m.stack.length)
-      continue;
-    const stack: SerializedStackFrame[] = [];
-    for (const frame of m.stack) {
-      let ordinal = fileNames.get(frame.file);
-      if (typeof ordinal !== 'number') {
-        ordinal = fileNames.size;
-        fileNames.set(frame.file, ordinal);
-      }
-      const stackFrame: SerializedStackFrame = [ordinal, frame.line || 0, frame.column || 0, frame.function || ''];
-      stack.push(stackFrame);
-    }
-    stacks.push([m.id, stack]);
-  }
-  return { files: [...fileNames.keys()], stacks };
-}
diff --git a/packages/playwright-core/src/utils/zones.ts b/packages/playwright-core/src/utils/zones.ts
deleted file mode 100644
index 68cb6fa7fa74c..0000000000000
--- a/packages/playwright-core/src/utils/zones.ts
+++ /dev/null
@@ -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 { AsyncLocalStorage } from 'async_hooks';
-
-export type ZoneType = 'apiZone' | 'expectZone' | 'stepZone';
-
-class ZoneManager {
-  private readonly _asyncLocalStorage = new AsyncLocalStorage<Zone<unknown>|undefined>();
-
-  run<T, R>(type: ZoneType, data: T, func: () => R): R {
-    const previous = this._asyncLocalStorage.getStore();
-    const zone = new Zone(previous, type, data);
-    return this._asyncLocalStorage.run(zone, func);
-  }
-
-  zoneData<T>(type: ZoneType): T | undefined {
-    for (let zone = this._asyncLocalStorage.getStore(); zone; zone = zone.previous) {
-      if (zone.type === type)
-        return zone.data as T;
-    }
-    return undefined;
-  }
-
-  exitZones<R>(func: () => R): R {
-    return this._asyncLocalStorage.run(undefined, func);
-  }
-
-  printZones() {
-    const zones = [];
-    for (let zone = this._asyncLocalStorage.getStore(); zone; zone = zone.previous) {
-      let str = zone.type;
-      if (zone.type === 'apiZone')
-        str += `(${(zone.data as any).apiName})`;
-      zones.push(str);
-      
-    }
-    console.log('zones: ', zones.join(' -> '));
-  }
-}
-
-class Zone<T> {
-  readonly type: ZoneType;
-  readonly data: T;
-  readonly previous: Zone<unknown> | undefined;
-
-  constructor(previous: Zone<unknown> | undefined, type: ZoneType, data: T) {
-    this.type = type;
-    this.data = data;
-    this.previous = previous;
-  }
-}
-
-export const zones = new ZoneManager();
diff --git a/packages/playwright-core/src/utilsBundle.ts b/packages/playwright-core/src/utilsBundle.ts
index bb037a1ca7eef..41cccd1f57263 100644
--- a/packages/playwright-core/src/utilsBundle.ts
+++ b/packages/playwright-core/src/utilsBundle.ts
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import url from 'url';
-import path from 'path';
-
 export const colors: typeof import('../bundles/utils/node_modules/colors/safe') = require('./utilsBundleImpl').colors;
 export const debug: typeof import('../bundles/utils/node_modules/@types/debug') = require('./utilsBundleImpl').debug;
+export const diff: typeof import('../bundles/utils/node_modules/@types/diff') = require('./utilsBundleImpl').diff;
+export const dotenv: typeof import('../bundles/utils/node_modules/dotenv') = require('./utilsBundleImpl').dotenv;
 export const getProxyForUrl: typeof import('../bundles/utils/node_modules/@types/proxy-from-env').getProxyForUrl = require('./utilsBundleImpl').getProxyForUrl;
 export const HttpsProxyAgent: typeof import('../bundles/utils/node_modules/https-proxy-agent').HttpsProxyAgent = require('./utilsBundleImpl').HttpsProxyAgent;
 export const jpegjs: typeof import('../bundles/utils/node_modules/jpeg-js') = require('./utilsBundleImpl').jpegjs;
@@ -30,38 +29,14 @@ export const PNG: typeof import('../bundles/utils/node_modules/@types/pngjs').PN
 export const program: typeof import('../bundles/utils/node_modules/commander').program = require('./utilsBundleImpl').program;
 export const progress: typeof import('../bundles/utils/node_modules/@types/progress') = require('./utilsBundleImpl').progress;
 export const SocksProxyAgent: typeof import('../bundles/utils/node_modules/socks-proxy-agent').SocksProxyAgent = require('./utilsBundleImpl').SocksProxyAgent;
+export const yaml: typeof import('../bundles/utils/node_modules/yaml') = require('./utilsBundleImpl').yaml;
+export type { Range as YAMLRange, Scalar as YAMLScalar, YAMLError, YAMLMap, YAMLSeq } from '../bundles/utils/node_modules/yaml';
 export const ws: typeof import('../bundles/utils/node_modules/@types/ws') = require('./utilsBundleImpl').ws;
 export const wsServer: typeof import('../bundles/utils/node_modules/@types/ws').WebSocketServer = require('./utilsBundleImpl').wsServer;
 export const wsReceiver = require('./utilsBundleImpl').wsReceiver;
 export const wsSender = require('./utilsBundleImpl').wsSender;
 export type { Command } from '../bundles/utils/node_modules/commander';
-export type { WebSocket, WebSocketServer, RawData as WebSocketRawData, EventEmitter as WebSocketEventEmitter } from '../bundles/utils/node_modules/@types/ws';
-import type { StackFrame } from '@protocol/channels';
-
-const StackUtils: typeof import('../bundles/utils/node_modules/@types/stack-utils') = require('./utilsBundleImpl').StackUtils;
-const stackUtils = new StackUtils({ internals: StackUtils.nodeInternals() });
-const nodeInternals = StackUtils.nodeInternals();
-const nodeMajorVersion = +process.versions.node.split('.')[0];
-
-export function parseStackTraceLine(line: string): StackFrame | null {
-  if (!process.env.PWDEBUGIMPL && nodeMajorVersion < 16 && nodeInternals.some(internal => internal.test(line)))
-    return null;
-  const frame = stackUtils.parseLine(line);
-  if (!frame)
-    return null;
-  if (!process.env.PWDEBUGIMPL && (frame.file?.startsWith('internal') || frame.file?.startsWith('node:')))
-    return null;
-  if (!frame.file)
-    return null;
-  // ESM files return file:// URLs, see here: https://github.com/tapjs/stack-utils/issues/60
-  const file = frame.file.startsWith('file://') ? url.fileURLToPath(frame.file) : path.resolve(process.cwd(), frame.file);
-  return {
-    file,
-    line: frame.line || 0,
-    column: frame.column || 0,
-    function: frame.function,
-  };
-}
+export type { EventEmitter as WebSocketEventEmitter, RawData as WebSocketRawData, WebSocket, WebSocketServer } from '../bundles/utils/node_modules/@types/ws';
 
 export function ms(ms: number): string {
   if (!isFinite(ms))
diff --git a/packages/playwright-core/src/zipBundle.ts b/packages/playwright-core/src/zipBundle.ts
index 9c275873a8d1e..093a51698fc68 100644
--- a/packages/playwright-core/src/zipBundle.ts
+++ b/packages/playwright-core/src/zipBundle.ts
@@ -17,5 +17,5 @@
 export const yazl: typeof import('../bundles/zip/node_modules/@types/yazl') = require('./zipBundleImpl').yazl;
 export type { ZipFile } from '../bundles/zip/node_modules/@types/yazl';
 export const yauzl: typeof import('../bundles/zip/node_modules/@types/yauzl') = require('./zipBundleImpl').yauzl;
-export type { ZipFile as UnzipFile, Entry } from '../bundles/zip/node_modules/@types/yauzl';
-export const extract: typeof import('../bundles/zip/node_modules/extract-zip') = require('./zipBundleImpl').extract;
+export type { Entry, ZipFile as UnzipFile } from '../bundles/zip/node_modules/@types/yauzl';
+export const extract: typeof import('../bundles/zip/src/third_party/extract-zip.d.ts') = require('./zipBundleImpl').extract;
diff --git a/packages/playwright-core/types/protocol.d.ts b/packages/playwright-core/types/protocol.d.ts
index 99ce1d3a6aaa3..1fab022bfb268 100644
--- a/packages/playwright-core/types/protocol.d.ts
+++ b/packages/playwright-core/types/protocol.d.ts
@@ -112,7 +112,7 @@ export module Protocol {
 - from 'checked' to 'selected': states which apply to widgets
 - from 'activedescendant' to 'owns' - relationships between elements other than parent/child/sibling.
      */
-    export type AXPropertyName = "busy"|"disabled"|"editable"|"focusable"|"focused"|"hidden"|"hiddenRoot"|"invalid"|"keyshortcuts"|"settable"|"roledescription"|"live"|"atomic"|"relevant"|"root"|"autocomplete"|"hasPopup"|"level"|"multiselectable"|"orientation"|"multiline"|"readonly"|"required"|"valuemin"|"valuemax"|"valuetext"|"checked"|"expanded"|"modal"|"pressed"|"selected"|"activedescendant"|"controls"|"describedby"|"details"|"errormessage"|"flowto"|"labelledby"|"owns"|"url";
+    export type AXPropertyName = "actions"|"busy"|"disabled"|"editable"|"focusable"|"focused"|"hidden"|"hiddenRoot"|"invalid"|"keyshortcuts"|"settable"|"roledescription"|"live"|"atomic"|"relevant"|"root"|"autocomplete"|"hasPopup"|"level"|"multiselectable"|"orientation"|"multiline"|"readonly"|"required"|"valuemin"|"valuemax"|"valuetext"|"checked"|"expanded"|"modal"|"pressed"|"selected"|"activedescendant"|"controls"|"describedby"|"details"|"errormessage"|"flowto"|"labelledby"|"owns"|"url";
     /**
      * A node in the accessibility tree.
      */
@@ -685,8 +685,8 @@ percentage [0 - 100] for scroll driven animations
       /**
        * The unique request id.
        */
-      requestId: Network.RequestId;
-      url?: string;
+      requestId?: Network.RequestId;
+      url: string;
     }
     /**
      * Information about the frame affected by an inspector issue.
@@ -694,9 +694,23 @@ percentage [0 - 100] for scroll driven animations
     export interface AffectedFrame {
       frameId: Page.FrameId;
     }
-    export type CookieExclusionReason = "ExcludeSameSiteUnspecifiedTreatedAsLax"|"ExcludeSameSiteNoneInsecure"|"ExcludeSameSiteLax"|"ExcludeSameSiteStrict"|"ExcludeInvalidSameParty"|"ExcludeSamePartyCrossPartyContext"|"ExcludeDomainNonASCII"|"ExcludeThirdPartyCookieBlockedInFirstPartySet"|"ExcludeThirdPartyPhaseout";
-    export type CookieWarningReason = "WarnSameSiteUnspecifiedCrossSiteContext"|"WarnSameSiteNoneInsecure"|"WarnSameSiteUnspecifiedLaxAllowUnsafe"|"WarnSameSiteStrictLaxDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeLax"|"WarnSameSiteLaxCrossDowngradeStrict"|"WarnSameSiteLaxCrossDowngradeLax"|"WarnAttributeValueExceedsMaxSize"|"WarnDomainNonASCII"|"WarnThirdPartyPhaseout"|"WarnCrossSiteRedirectDowngradeChangesInclusion";
+    export type CookieExclusionReason = "ExcludeSameSiteUnspecifiedTreatedAsLax"|"ExcludeSameSiteNoneInsecure"|"ExcludeSameSiteLax"|"ExcludeSameSiteStrict"|"ExcludeInvalidSameParty"|"ExcludeSamePartyCrossPartyContext"|"ExcludeDomainNonASCII"|"ExcludeThirdPartyCookieBlockedInFirstPartySet"|"ExcludeThirdPartyPhaseout"|"ExcludePortMismatch"|"ExcludeSchemeMismatch";
+    export type CookieWarningReason = "WarnSameSiteUnspecifiedCrossSiteContext"|"WarnSameSiteNoneInsecure"|"WarnSameSiteUnspecifiedLaxAllowUnsafe"|"WarnSameSiteStrictLaxDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeStrict"|"WarnSameSiteStrictCrossDowngradeLax"|"WarnSameSiteLaxCrossDowngradeStrict"|"WarnSameSiteLaxCrossDowngradeLax"|"WarnAttributeValueExceedsMaxSize"|"WarnDomainNonASCII"|"WarnThirdPartyPhaseout"|"WarnCrossSiteRedirectDowngradeChangesInclusion"|"WarnDeprecationTrialMetadata"|"WarnThirdPartyCookieHeuristic";
     export type CookieOperation = "SetCookie"|"ReadCookie";
+    /**
+     * Represents the category of insight that a cookie issue falls under.
+     */
+    export type InsightType = "GitHubResource"|"GracePeriod"|"Heuristics";
+    /**
+     * Information about the suggested solution to a cookie issue.
+     */
+    export interface CookieIssueInsight {
+      type: InsightType;
+      /**
+       * Link to table entry in third-party cookie migration readiness list.
+       */
+      tableEntryUrl?: string;
+    }
     /**
      * This information is currently necessary, as the front-end has a difficult
 time finding a specific cookie. With this, we can convey specific error
@@ -721,6 +735,10 @@ may be used by the front-end as additional context.
       siteForCookies?: string;
       cookieUrl?: string;
       request?: AffectedRequest;
+      /**
+       * The recommended solution to the issue.
+       */
+      insight?: CookieIssueInsight;
     }
     export type MixedContentResolutionStatus = "MixedContentBlocked"|"MixedContentAutomaticallyUpgraded"|"MixedContentWarning";
     export type MixedContentResourceType = "AttributionSrc"|"Audio"|"Beacon"|"CSPReport"|"Download"|"EventSource"|"Favicon"|"Font"|"Form"|"Frame"|"Image"|"Import"|"JSON"|"Manifest"|"Ping"|"PluginData"|"PluginResource"|"Prefetch"|"Resource"|"Script"|"ServiceWorker"|"SharedWorker"|"SpeculationRules"|"Stylesheet"|"Track"|"Video"|"Worker"|"XMLHttpRequest"|"XSLT";
@@ -758,7 +776,7 @@ Does not always exist (e.g. for unsafe form submission urls).
      * Enum indicating the reason a response has been blocked. These reasons are
 refinements of the net error BLOCKED_BY_RESPONSE.
      */
-    export type BlockedByResponseReason = "CoepFrameResourceNeedsCoepHeader"|"CoopSandboxedIFrameCannotNavigateToCoopPage"|"CorpNotSameOrigin"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoep"|"CorpNotSameOriginAfterDefaultedToSameOriginByDip"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoepAndDip"|"CorpNotSameSite";
+    export type BlockedByResponseReason = "CoepFrameResourceNeedsCoepHeader"|"CoopSandboxedIFrameCannotNavigateToCoopPage"|"CorpNotSameOrigin"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoep"|"CorpNotSameOriginAfterDefaultedToSameOriginByDip"|"CorpNotSameOriginAfterDefaultedToSameOriginByCoepAndDip"|"CorpNotSameSite"|"SRIMessageSignatureMismatch";
     /**
      * Details for a request that has been blocked with the BLOCKED_BY_RESPONSE
 code. Currently only used for COEP/COOP, but may be extended to include
@@ -786,7 +804,7 @@ some CSP errors in the future.
        */
       frame: AffectedFrame;
     }
-    export type ContentSecurityPolicyViolationType = "kInlineViolation"|"kEvalViolation"|"kURLViolation"|"kTrustedTypesSinkViolation"|"kTrustedTypesPolicyViolation"|"kWasmEvalViolation";
+    export type ContentSecurityPolicyViolationType = "kInlineViolation"|"kEvalViolation"|"kURLViolation"|"kSRIViolation"|"kTrustedTypesSinkViolation"|"kTrustedTypesPolicyViolation"|"kWasmEvalViolation";
     export interface SourceCodeLocation {
       scriptId?: Runtime.ScriptId;
       url: string;
@@ -840,8 +858,10 @@ CORS RFC1918 enforcement.
       resourceIPAddressSpace?: Network.IPAddressSpace;
       clientSecurityState?: Network.ClientSecurityState;
     }
-    export type AttributionReportingIssueType = "PermissionPolicyDisabled"|"UntrustworthyReportingOrigin"|"InsecureContext"|"InvalidHeader"|"InvalidRegisterTriggerHeader"|"SourceAndTriggerHeaders"|"SourceIgnored"|"TriggerIgnored"|"OsSourceIgnored"|"OsTriggerIgnored"|"InvalidRegisterOsSourceHeader"|"InvalidRegisterOsTriggerHeader"|"WebAndOsHeaders"|"NoWebOrOsSupport"|"NavigationRegistrationWithoutTransientUserActivation"|"InvalidInfoHeader"|"NoRegisterSourceHeader"|"NoRegisterTriggerHeader"|"NoRegisterOsSourceHeader"|"NoRegisterOsTriggerHeader";
+    export type AttributionReportingIssueType = "PermissionPolicyDisabled"|"UntrustworthyReportingOrigin"|"InsecureContext"|"InvalidHeader"|"InvalidRegisterTriggerHeader"|"SourceAndTriggerHeaders"|"SourceIgnored"|"TriggerIgnored"|"OsSourceIgnored"|"OsTriggerIgnored"|"InvalidRegisterOsSourceHeader"|"InvalidRegisterOsTriggerHeader"|"WebAndOsHeaders"|"NoWebOrOsSupport"|"NavigationRegistrationWithoutTransientUserActivation"|"InvalidInfoHeader"|"NoRegisterSourceHeader"|"NoRegisterTriggerHeader"|"NoRegisterOsSourceHeader"|"NoRegisterOsTriggerHeader"|"NavigationRegistrationUniqueScopeAlreadySet";
     export type SharedDictionaryError = "UseErrorCrossOriginNoCorsRequest"|"UseErrorDictionaryLoadFailure"|"UseErrorMatchingDictionaryNotUsed"|"UseErrorUnexpectedContentDictionaryHeader"|"WriteErrorCossOriginNoCorsRequest"|"WriteErrorDisallowedBySettings"|"WriteErrorExpiredResponse"|"WriteErrorFeatureDisabled"|"WriteErrorInsufficientResources"|"WriteErrorInvalidMatchField"|"WriteErrorInvalidStructuredHeader"|"WriteErrorNavigationRequest"|"WriteErrorNoMatchField"|"WriteErrorNonListMatchDestField"|"WriteErrorNonSecureContext"|"WriteErrorNonStringIdField"|"WriteErrorNonStringInMatchDestList"|"WriteErrorNonStringMatchField"|"WriteErrorNonTokenTypeField"|"WriteErrorRequestAborted"|"WriteErrorShuttingDown"|"WriteErrorTooLongIdField"|"WriteErrorUnsupportedType";
+    export type SRIMessageSignatureError = "MissingSignatureHeader"|"MissingSignatureInputHeader"|"InvalidSignatureHeader"|"InvalidSignatureInputHeader"|"SignatureHeaderValueIsNotByteSequence"|"SignatureHeaderValueIsParameterized"|"SignatureHeaderValueIsIncorrectLength"|"SignatureInputHeaderMissingLabel"|"SignatureInputHeaderValueNotInnerList"|"SignatureInputHeaderValueMissingComponents"|"SignatureInputHeaderInvalidComponentType"|"SignatureInputHeaderInvalidComponentName"|"SignatureInputHeaderInvalidHeaderComponentParameter"|"SignatureInputHeaderInvalidDerivedComponentParameter"|"SignatureInputHeaderKeyIdLength"|"SignatureInputHeaderInvalidParameter"|"SignatureInputHeaderMissingRequiredParameters"|"ValidationFailedSignatureExpired"|"ValidationFailedInvalidLength"|"ValidationFailedSignatureMismatch"|"ValidationFailedIntegrityMismatch";
+    export type UnencodedDigestError = "MalformedDictionary"|"UnknownAlgorithm"|"IncorrectDigestType"|"IncorrectDigestLength";
     /**
      * Details for issues around "Attribution Reporting API" usage.
 Explainer: https://github.com/WICG/attribution-reporting-api
@@ -875,6 +895,16 @@ instead of "limited-quirks".
       sharedDictionaryError: SharedDictionaryError;
       request: AffectedRequest;
     }
+    export interface SRIMessageSignatureIssueDetails {
+      error: SRIMessageSignatureError;
+      signatureBase: string;
+      integrityAssertions: string[];
+      request: AffectedRequest;
+    }
+    export interface UnencodedDigestIssueDetails {
+      error: UnencodedDigestError;
+      request: AffectedRequest;
+    }
     export type GenericIssueErrorType = "FormLabelForNameError"|"FormDuplicateIdForInputError"|"FormInputWithNoLabelError"|"FormAutocompleteAttributeEmptyError"|"FormEmptyIdAndNameAttributesForInputError"|"FormAriaLabelledByToNonExistingId"|"FormInputAssignedAutocompleteValueToIdOrNameAttributeError"|"FormLabelHasNeitherForNorNestedInput"|"FormLabelForMatchesNonExistingIdError"|"FormInputHasWrongButWellIntendedAutocompleteValueError"|"ResponseWasBlockedByORB";
     /**
      * Depending on the concrete errorType, different properties are set.
@@ -934,7 +964,7 @@ Should be updated alongside RequestIdTokenStatus in
 third_party/blink/public/mojom/devtools/inspector_issue.mojom to include
 all cases except for success.
      */
-    export type FederatedAuthRequestIssueReason = "ShouldEmbargo"|"TooManyRequests"|"WellKnownHttpNotFound"|"WellKnownNoResponse"|"WellKnownInvalidResponse"|"WellKnownListEmpty"|"WellKnownInvalidContentType"|"ConfigNotInWellKnown"|"WellKnownTooBig"|"ConfigHttpNotFound"|"ConfigNoResponse"|"ConfigInvalidResponse"|"ConfigInvalidContentType"|"ClientMetadataHttpNotFound"|"ClientMetadataNoResponse"|"ClientMetadataInvalidResponse"|"ClientMetadataInvalidContentType"|"IdpNotPotentiallyTrustworthy"|"DisabledInSettings"|"DisabledInFlags"|"ErrorFetchingSignin"|"InvalidSigninResponse"|"AccountsHttpNotFound"|"AccountsNoResponse"|"AccountsInvalidResponse"|"AccountsListEmpty"|"AccountsInvalidContentType"|"IdTokenHttpNotFound"|"IdTokenNoResponse"|"IdTokenInvalidResponse"|"IdTokenIdpErrorResponse"|"IdTokenCrossSiteIdpErrorResponse"|"IdTokenInvalidRequest"|"IdTokenInvalidContentType"|"ErrorIdToken"|"Canceled"|"RpPageNotVisible"|"SilentMediationFailure"|"ThirdPartyCookiesBlocked"|"NotSignedInWithIdp"|"MissingTransientUserActivation"|"ReplacedByButtonMode"|"InvalidFieldsSpecified"|"RelyingPartyOriginIsOpaque"|"TypeNotMatching";
+    export type FederatedAuthRequestIssueReason = "ShouldEmbargo"|"TooManyRequests"|"WellKnownHttpNotFound"|"WellKnownNoResponse"|"WellKnownInvalidResponse"|"WellKnownListEmpty"|"WellKnownInvalidContentType"|"ConfigNotInWellKnown"|"WellKnownTooBig"|"ConfigHttpNotFound"|"ConfigNoResponse"|"ConfigInvalidResponse"|"ConfigInvalidContentType"|"ClientMetadataHttpNotFound"|"ClientMetadataNoResponse"|"ClientMetadataInvalidResponse"|"ClientMetadataInvalidContentType"|"IdpNotPotentiallyTrustworthy"|"DisabledInSettings"|"DisabledInFlags"|"ErrorFetchingSignin"|"InvalidSigninResponse"|"AccountsHttpNotFound"|"AccountsNoResponse"|"AccountsInvalidResponse"|"AccountsListEmpty"|"AccountsInvalidContentType"|"IdTokenHttpNotFound"|"IdTokenNoResponse"|"IdTokenInvalidResponse"|"IdTokenIdpErrorResponse"|"IdTokenCrossSiteIdpErrorResponse"|"IdTokenInvalidRequest"|"IdTokenInvalidContentType"|"ErrorIdToken"|"Canceled"|"RpPageNotVisible"|"SilentMediationFailure"|"ThirdPartyCookiesBlocked"|"NotSignedInWithIdp"|"MissingTransientUserActivation"|"ReplacedByActiveMode"|"InvalidFieldsSpecified"|"RelyingPartyOriginIsOpaque"|"TypeNotMatching"|"UiDismissedNoEmbargo"|"CorsError"|"SuppressedBySegmentationPlatform";
     export interface FederatedAuthUserInfoRequestIssueDetails {
       federatedAuthUserInfoRequestIssueReason: FederatedAuthUserInfoRequestIssueReason;
     }
@@ -963,6 +993,26 @@ features, encourage the use of new ones, and provide general guidance.
       failureMessage: string;
       requestId?: Network.RequestId;
     }
+    export type PartitioningBlobURLInfo = "BlockedCrossPartitionFetching"|"EnforceNoopenerForNavigation";
+    export interface PartitioningBlobURLIssueDetails {
+      /**
+       * The BlobURL that failed to load.
+       */
+      url: string;
+      /**
+       * Additional information about the Partitioning Blob URL issue.
+       */
+      partitioningBlobURLInfo: PartitioningBlobURLInfo;
+    }
+    export type ElementAccessibilityIssueReason = "DisallowedSelectChild"|"DisallowedOptGroupChild"|"NonPhrasingContentOptionChild"|"InteractiveContentOptionChild"|"InteractiveContentLegendChild"|"InteractiveContentSummaryDescendant";
+    /**
+     * This issue warns about errors in the select or summary element content model.
+     */
+    export interface ElementAccessibilityIssueDetails {
+      nodeId: DOM.BackendNodeId;
+      elementAccessibilityIssueReason: ElementAccessibilityIssueReason;
+      hasDisallowedAttributes: boolean;
+    }
     export type StyleSheetLoadingIssueReason = "LateImportRule"|"RequestFailed";
     /**
      * This issue warns when a referenced stylesheet couldn't be loaded.
@@ -1000,12 +1050,24 @@ registrations being ignored.
        */
       propertyValue?: string;
     }
+    export type UserReidentificationIssueType = "BlockedFrameNavigation"|"BlockedSubresource";
+    /**
+     * This issue warns about uses of APIs that may be considered misuse to
+re-identify users.
+     */
+    export interface UserReidentificationIssueDetails {
+      type: UserReidentificationIssueType;
+      /**
+       * Applies to BlockedFrameNavigation and BlockedSubresource issue types.
+       */
+      request?: AffectedRequest;
+    }
     /**
      * A unique identifier for the type of issue. Each type may use one of the
 optional fields in InspectorIssueDetails to convey more specific
 information about the kind of issue.
      */
-    export type InspectorIssueCode = "CookieIssue"|"MixedContentIssue"|"BlockedByResponseIssue"|"HeavyAdIssue"|"ContentSecurityPolicyIssue"|"SharedArrayBufferIssue"|"LowTextContrastIssue"|"CorsIssue"|"AttributionReportingIssue"|"QuirksModeIssue"|"NavigatorUserAgentIssue"|"GenericIssue"|"DeprecationIssue"|"ClientHintIssue"|"FederatedAuthRequestIssue"|"BounceTrackingIssue"|"CookieDeprecationMetadataIssue"|"StylesheetLoadingIssue"|"FederatedAuthUserInfoRequestIssue"|"PropertyRuleIssue"|"SharedDictionaryIssue";
+    export type InspectorIssueCode = "CookieIssue"|"MixedContentIssue"|"BlockedByResponseIssue"|"HeavyAdIssue"|"ContentSecurityPolicyIssue"|"SharedArrayBufferIssue"|"LowTextContrastIssue"|"CorsIssue"|"AttributionReportingIssue"|"QuirksModeIssue"|"PartitioningBlobURLIssue"|"NavigatorUserAgentIssue"|"GenericIssue"|"DeprecationIssue"|"ClientHintIssue"|"FederatedAuthRequestIssue"|"BounceTrackingIssue"|"CookieDeprecationMetadataIssue"|"StylesheetLoadingIssue"|"FederatedAuthUserInfoRequestIssue"|"PropertyRuleIssue"|"SharedDictionaryIssue"|"ElementAccessibilityIssue"|"SRIMessageSignatureIssue"|"UnencodedDigestIssue"|"UserReidentificationIssue";
     /**
      * This struct holds a list of optional fields with additional information
 specific to the kind of issue. When adding a new issue code, please also
@@ -1022,6 +1084,7 @@ add a new optional field to this type.
       corsIssueDetails?: CorsIssueDetails;
       attributionReportingIssueDetails?: AttributionReportingIssueDetails;
       quirksModeIssueDetails?: QuirksModeIssueDetails;
+      partitioningBlobURLIssueDetails?: PartitioningBlobURLIssueDetails;
       navigatorUserAgentIssueDetails?: NavigatorUserAgentIssueDetails;
       genericIssueDetails?: GenericIssueDetails;
       deprecationIssueDetails?: DeprecationIssueDetails;
@@ -1033,6 +1096,10 @@ add a new optional field to this type.
       propertyRuleIssueDetails?: PropertyRuleIssueDetails;
       federatedAuthUserInfoRequestIssueDetails?: FederatedAuthUserInfoRequestIssueDetails;
       sharedDictionaryIssueDetails?: SharedDictionaryIssueDetails;
+      elementAccessibilityIssueDetails?: ElementAccessibilityIssueDetails;
+      sriMessageSignatureIssueDetails?: SRIMessageSignatureIssueDetails;
+      unencodedDigestIssueDetails?: UnencodedDigestIssueDetails;
+      userReidentificationIssueDetails?: UserReidentificationIssueDetails;
     }
     /**
      * A unique id for a DevTools inspector issue. Allows other entities (e.g.
@@ -1131,17 +1198,21 @@ using Audits.issueAdded event.
   }
   
   /**
-   * Defines commands and events for browser extensions. Available if the client
-is connected using the --remote-debugging-pipe flag and
-the --enable-unsafe-extension-debugging flag is set.
+   * Defines commands and events for browser extensions.
    */
   export module Extensions {
+    /**
+     * Storage areas.
+     */
+    export type StorageArea = "session"|"local"|"sync"|"managed";
     
     
     /**
      * Installs an unpacked extension from the filesystem similar to
 --load-extension CLI flags. Returns extension ID once the extension
-has been installed.
+has been installed. Available if the client is connected using the
+--remote-debugging-pipe flag and the --enable-unsafe-extension-debugging
+flag is set.
      */
     export type loadUnpackedParameters = {
       /**
@@ -1155,6 +1226,94 @@ has been installed.
        */
       id: string;
     }
+    /**
+     * Uninstalls an unpacked extension (others not supported) from the profile.
+Available if the client is connected using the --remote-debugging-pipe flag
+and the --enable-unsafe-extension-debugging.
+     */
+    export type uninstallParameters = {
+      /**
+       * Extension id.
+       */
+      id: string;
+    }
+    export type uninstallReturnValue = {
+    }
+    /**
+     * Gets data from extension storage in the given `storageArea`. If `keys` is
+specified, these are used to filter the result.
+     */
+    export type getStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to retrieve data from.
+       */
+      storageArea: StorageArea;
+      /**
+       * Keys to retrieve.
+       */
+      keys?: string[];
+    }
+    export type getStorageItemsReturnValue = {
+      data: { [key: string]: string };
+    }
+    /**
+     * Removes `keys` from extension storage in the given `storageArea`.
+     */
+    export type removeStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to remove data from.
+       */
+      storageArea: StorageArea;
+      /**
+       * Keys to remove.
+       */
+      keys: string[];
+    }
+    export type removeStorageItemsReturnValue = {
+    }
+    /**
+     * Clears extension storage in the given `storageArea`.
+     */
+    export type clearStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to remove data from.
+       */
+      storageArea: StorageArea;
+    }
+    export type clearStorageItemsReturnValue = {
+    }
+    /**
+     * Sets `values` in extension storage in the given `storageArea`. The provided `values`
+will be merged with existing values in the storage area.
+     */
+    export type setStorageItemsParameters = {
+      /**
+       * ID of extension.
+       */
+      id: string;
+      /**
+       * StorageArea to set data in.
+       */
+      storageArea: StorageArea;
+      /**
+       * Values to set.
+       */
+      values: { [key: string]: string };
+    }
+    export type setStorageItemsReturnValue = {
+    }
   }
   
   /**
@@ -1455,7 +1614,7 @@ events afterwards if enabled and recording.
        */
       windowState?: WindowState;
     }
-    export type PermissionType = "accessibilityEvents"|"audioCapture"|"backgroundSync"|"backgroundFetch"|"capturedSurfaceControl"|"clipboardReadWrite"|"clipboardSanitizedWrite"|"displayCapture"|"durableStorage"|"flash"|"geolocation"|"idleDetection"|"localFonts"|"midi"|"midiSysex"|"nfc"|"notifications"|"paymentHandler"|"periodicBackgroundSync"|"protectedMediaIdentifier"|"sensors"|"storageAccess"|"speakerSelection"|"topLevelStorageAccess"|"videoCapture"|"videoCapturePanTiltZoom"|"wakeLockScreen"|"wakeLockSystem"|"windowManagement";
+    export type PermissionType = "ar"|"audioCapture"|"automaticFullscreen"|"backgroundFetch"|"backgroundSync"|"cameraPanTiltZoom"|"capturedSurfaceControl"|"clipboardReadWrite"|"clipboardSanitizedWrite"|"displayCapture"|"durableStorage"|"geolocation"|"handTracking"|"idleDetection"|"keyboardLock"|"localFonts"|"localNetworkAccess"|"midi"|"midiSysex"|"nfc"|"notifications"|"paymentHandler"|"periodicBackgroundSync"|"pointerLock"|"protectedMediaIdentifier"|"sensors"|"smartCard"|"speakerSelection"|"storageAccess"|"topLevelStorageAccess"|"videoCapture"|"vr"|"wakeLockScreen"|"wakeLockSystem"|"webAppInstallation"|"webPrinting"|"windowManagement";
     export type PermissionSetting = "granted"|"denied"|"prompt";
     /**
      * Definition of PermissionDescriptor defined in the Permissions API:
@@ -1492,7 +1651,7 @@ Note that userVisibleOnly = true is the only currently supported type.
     /**
      * Browser command ids used by executeBrowserCommand.
      */
-    export type BrowserCommandId = "openTabSearch"|"closeTabSearch";
+    export type BrowserCommandId = "openTabSearch"|"closeTabSearch"|"openGlic";
     /**
      * Chrome histogram bucket.
      */
@@ -1531,6 +1690,7 @@ Note that userVisibleOnly = true is the only currently supported type.
        */
       buckets: Bucket[];
     }
+    export type PrivacySandboxAPI = "BiddingAndAuctionServices"|"TrustedKeyValue";
     
     /**
      * Fired when page is about to start a download.
@@ -1573,6 +1733,12 @@ Note that userVisibleOnly = true is the only currently supported type.
        * Download status.
        */
       state: "inProgress"|"completed"|"canceled";
+      /**
+       * If download is "completed", provides the path of the downloaded file.
+Depending on the platform, it is not guaranteed to be set, nor the file
+is guaranteed to exist.
+       */
+      filePath?: string;
     }
     
     /**
@@ -1818,6 +1984,27 @@ with 'left', 'top', 'width' or 'height'. Leaves unspecified fields unchanged.
     }
     export type setWindowBoundsReturnValue = {
     }
+    /**
+     * Set size of the browser contents resizing browser window as necessary.
+     */
+    export type setContentsSizeParameters = {
+      /**
+       * Browser window id.
+       */
+      windowId: WindowID;
+      /**
+       * The window contents width in DIP. Assumes current width if omitted.
+Must be specified if 'height' is omitted.
+       */
+      width?: number;
+      /**
+       * The window contents height in DIP. Assumes current height if omitted.
+Must be specified if 'width' is omitted.
+       */
+      height?: number;
+    }
+    export type setContentsSizeReturnValue = {
+    }
     /**
      * Set dock tile details, platform-specific.
      */
@@ -1847,6 +2034,24 @@ without the site actually being enrolled. Only supported on page targets.
     }
     export type addPrivacySandboxEnrollmentOverrideReturnValue = {
     }
+    /**
+     * Configures encryption keys used with a given privacy sandbox API to talk
+to a trusted coordinator.  Since this is intended for test automation only,
+coordinatorOrigin must be a .test domain. No existing coordinator
+configuration for the origin may exist.
+     */
+    export type addPrivacySandboxCoordinatorKeyConfigParameters = {
+      api: PrivacySandboxAPI;
+      coordinatorOrigin: string;
+      keyConfig: string;
+      /**
+       * BrowserContext to perform the action in. When omitted, default browser
+context is used.
+       */
+      browserContextId?: BrowserContextID;
+    }
+    export type addPrivacySandboxCoordinatorKeyConfigReturnValue = {
+    }
   }
   
   /**
@@ -1882,6 +2087,19 @@ inspector" rules), "regular" for regular stylesheets.
        */
       matches: RuleMatch[];
     }
+    /**
+     * CSS style coming from animations with the name of the animation.
+     */
+    export interface CSSAnimationStyle {
+      /**
+       * The name of the animation.
+       */
+      name?: string;
+      /**
+       * The style coming from the animation.
+       */
+      style: CSSStyle;
+    }
     /**
      * Inherited CSS rule collection from ancestor node.
      */
@@ -1895,6 +2113,19 @@ inspector" rules), "regular" for regular stylesheets.
        */
       matchedCSSRules: RuleMatch[];
     }
+    /**
+     * Inherited CSS style collection for animated styles from ancestor node.
+     */
+    export interface InheritedAnimatedStyleEntry {
+      /**
+       * Styles coming from the animations of the ancestor, if any, in the style inheritance chain.
+       */
+      animationStyles?: CSSAnimationStyle[];
+      /**
+       * The style coming from the transitions of the ancestor, if any, in the style inheritance chain.
+       */
+      transitionsStyle?: CSSStyle;
+    }
     /**
      * Inherited pseudo element matches from pseudos of an ancestor node.
      */
@@ -2104,12 +2335,17 @@ The array enumerates @scope at-rules starting with the innermost one, going outw
        * The array keeps the types of ancestor CSSRules from the innermost going outwards.
        */
       ruleTypes?: CSSRuleType[];
+      /**
+       * @starting-style CSS at-rule array.
+The array enumerates @starting-style at-rules starting with the innermost one, going outwards.
+       */
+      startingStyles?: CSSStartingStyle[];
     }
     /**
      * Enum indicating the type of a CSS rule, used to represent the order of a style rule's ancestors.
 This list only contains rule types that are collected during the ancestor rule collection.
      */
-    export type CSSRuleType = "MediaRule"|"SupportsRule"|"ContainerRule"|"LayerRule"|"ScopeRule"|"StyleRule";
+    export type CSSRuleType = "MediaRule"|"SupportsRule"|"ContainerRule"|"LayerRule"|"ScopeRule"|"StyleRule"|"StartingStyleRule";
     /**
      * CSS coverage information.
      */
@@ -2345,6 +2581,14 @@ available).
        * Optional logical axes queried for the container.
        */
       logicalAxes?: DOM.LogicalAxes;
+      /**
+       * true if the query contains scroll-state() queries.
+       */
+      queriesScrollState?: boolean;
+      /**
+       * true if the query contains anchored() queries.
+       */
+      queriesAnchored?: boolean;
     }
     /**
      * CSS Supports at-rule descriptor.
@@ -2396,6 +2640,20 @@ available).
       text: string;
       /**
        * The associated rule header range in the enclosing stylesheet (if
+available).
+       */
+      range?: SourceRange;
+      /**
+       * Identifier of the stylesheet containing this object (if exists).
+       */
+      styleSheetId?: StyleSheetId;
+    }
+    /**
+     * CSS Starting Style at-rule descriptor.
+     */
+    export interface CSSStartingStyle {
+      /**
+       * The associated rule header range in the enclosing stylesheet (if
 available).
        */
       range?: SourceRange;
@@ -2532,16 +2790,6 @@ stylesheet rules) this rule came from.
        */
       style: CSSStyle;
     }
-    /**
-     * CSS position-fallback rule representation.
-     */
-    export interface CSSPositionFallbackRule {
-      name: Value;
-      /**
-       * List of keyframes.
-       */
-      tryRules: CSSTryRule[];
-    }
     /**
      * CSS @position-try rule representation.
      */
@@ -2631,6 +2879,83 @@ stylesheet rules) this rule came from.
        */
       style: CSSStyle;
     }
+    /**
+     * CSS function argument representation.
+     */
+    export interface CSSFunctionParameter {
+      /**
+       * The parameter name.
+       */
+      name: string;
+      /**
+       * The parameter type.
+       */
+      type: string;
+    }
+    /**
+     * CSS function conditional block representation.
+     */
+    export interface CSSFunctionConditionNode {
+      /**
+       * Media query for this conditional block. Only one type of condition should be set.
+       */
+      media?: CSSMedia;
+      /**
+       * Container query for this conditional block. Only one type of condition should be set.
+       */
+      containerQueries?: CSSContainerQuery;
+      /**
+       * @supports CSS at-rule condition. Only one type of condition should be set.
+       */
+      supports?: CSSSupports;
+      /**
+       * Block body.
+       */
+      children: CSSFunctionNode[];
+      /**
+       * The condition text.
+       */
+      conditionText: string;
+    }
+    /**
+     * Section of the body of a CSS function rule.
+     */
+    export interface CSSFunctionNode {
+      /**
+       * A conditional block. If set, style should not be set.
+       */
+      condition?: CSSFunctionConditionNode;
+      /**
+       * Values set by this node. If set, condition should not be set.
+       */
+      style?: CSSStyle;
+    }
+    /**
+     * CSS function at-rule representation.
+     */
+    export interface CSSFunctionRule {
+      /**
+       * Name of the function.
+       */
+      name: Value;
+      /**
+       * The css style sheet identifier (absent for user agent stylesheet and user-specified
+stylesheet rules) this rule came from.
+       */
+      styleSheetId?: StyleSheetId;
+      /**
+       * Parent stylesheet's origin.
+       */
+      origin: StyleSheetOrigin;
+      /**
+       * List of parameters.
+       */
+      parameters: CSSFunctionParameter[];
+      /**
+       * Function body.
+       */
+      children: CSSFunctionNode[];
+    }
     /**
      * CSS keyframe rule representation.
      */
@@ -2710,6 +3035,12 @@ resized.) The current implementation considers only viewport-dependent media fea
        */
       styleSheetId: StyleSheetId;
     }
+    export type computedStyleUpdatedPayload = {
+      /**
+       * The node id that has updated computed styles.
+       */
+      nodeId: DOM.NodeId;
+    }
     
     /**
      * Inserts a new rule with the given `ruleText` in a stylesheet with given `styleSheetId`, at the
@@ -2761,6 +3092,13 @@ incorrect results if the declaration contains a var() for example.
        * Identifier of the frame where "via-inspector" stylesheet should be created.
        */
       frameId: Page.FrameId;
+      /**
+       * If true, creates a new stylesheet for every call. If false,
+returns a stylesheet previously created by a call with force=false
+for the frame's document if it exists or creates a new stylesheet
+(default: false).
+       */
+      force?: boolean;
     }
     export type createStyleSheetReturnValue = {
       /**
@@ -2799,6 +3137,21 @@ the browser.
     }
     export type forcePseudoStateReturnValue = {
     }
+    /**
+     * Ensures that the given node is in its starting-style state.
+     */
+    export type forceStartingStyleParameters = {
+      /**
+       * The element id for which to force the starting-style state.
+       */
+      nodeId: DOM.NodeId;
+      /**
+       * Boolean indicating if this is on or off.
+       */
+      forced: boolean;
+    }
+    export type forceStartingStyleReturnValue = {
+    }
     export type getBackgroundColorsParameters = {
       /**
        * Id of the node to get background colors for.
@@ -2836,6 +3189,51 @@ be ignored (as if the image had failed to load).
        */
       computedStyle: CSSComputedStyleProperty[];
     }
+    /**
+     * Resolve the specified values in the context of the provided element.
+For example, a value of '1em' is evaluated according to the computed
+'font-size' of the element and a value 'calc(1px + 2px)' will be
+resolved to '3px'.
+If the `propertyName` was specified the `values` are resolved as if
+they were property's declaration. If a value cannot be parsed according
+to the provided property syntax, the value is parsed using combined
+syntax as if null `propertyName` was provided. If the value cannot be
+resolved even then, return the provided value without any changes.
+     */
+    export type resolveValuesParameters = {
+      /**
+       * Substitution functions (var()/env()/attr()) and cascade-dependent
+keywords (revert/revert-layer) do not work.
+       */
+      values: string[];
+      /**
+       * Id of the node in whose context the expression is evaluated
+       */
+      nodeId: DOM.NodeId;
+      /**
+       * Only longhands and custom property names are accepted.
+       */
+      propertyName?: string;
+      /**
+       * Pseudo element type, only works for pseudo elements that generate
+elements in the tree, such as ::before and ::after.
+       */
+      pseudoType?: DOM.PseudoType;
+      /**
+       * Pseudo element custom ident.
+       */
+      pseudoIdentifier?: string;
+    }
+    export type resolveValuesReturnValue = {
+      results: string[];
+    }
+    export type getLonghandPropertiesParameters = {
+      shorthandName: string;
+      value: string;
+    }
+    export type getLonghandPropertiesReturnValue = {
+      longhandProperties: CSSProperty[];
+    }
     /**
      * Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM
 attributes) for a DOM node identified by `nodeId`.
@@ -2853,6 +3251,28 @@ attributes) for a DOM node identified by `nodeId`.
        */
       attributesStyle?: CSSStyle;
     }
+    /**
+     * Returns the styles coming from animations & transitions
+including the animation & transition styles coming from inheritance chain.
+     */
+    export type getAnimatedStylesForNodeParameters = {
+      nodeId: DOM.NodeId;
+    }
+    export type getAnimatedStylesForNodeReturnValue = {
+      /**
+       * Styles coming from animations.
+       */
+      animationStyles?: CSSAnimationStyle[];
+      /**
+       * Style coming from transitions.
+       */
+      transitionsStyle?: CSSStyle;
+      /**
+       * Inherited style entries for animationsStyle and transitionsStyle from
+the inheritance chain of the element.
+       */
+      inherited?: InheritedAnimatedStyleEntry[];
+    }
     /**
      * Returns requested styles for a DOM node identified by `nodeId`.
      */
@@ -2888,10 +3308,6 @@ attributes) for a DOM node identified by `nodeId`.
        * A list of CSS keyframed animations matching this node.
        */
       cssKeyframesRules?: CSSKeyframesRule[];
-      /**
-       * A list of CSS position fallbacks matching this node.
-       */
-      cssPositionFallbackRules?: CSSPositionFallbackRule[];
       /**
        * A list of CSS @position-try rules matching this node, based on the position-try-fallbacks property.
        */
@@ -2917,6 +3333,18 @@ will not be set if there is no active position-try fallback.
        * Id of the first parent element that does not have display: contents.
        */
       parentLayoutNodeId?: DOM.NodeId;
+      /**
+       * A list of CSS at-function rules referenced by styles of this node.
+       */
+      cssFunctionRules?: CSSFunctionRule[];
+    }
+    /**
+     * Returns the values of the default UA-defined environment variables used in env()
+     */
+    export type getEnvironmentVariablesParameters = {
+    }
+    export type getEnvironmentVariablesReturnValue = {
+      environmentVariables: { [key: string]: string };
     }
     /**
      * Returns all media queries parsed by the rendering engine.
@@ -2974,6 +3402,19 @@ returns an array of locations of the CSS selector in the style sheet.
     export type getLocationForSelectorReturnValue = {
       ranges: SourceRange[];
     }
+    /**
+     * Starts tracking the given node for the computed style updates
+and whenever the computed style is updated for node, it queues
+a `computedStyleUpdated` event with throttling.
+There can only be 1 node tracked for computed style updates
+so passing a new node id removes tracking from the previous node.
+Pass `undefined` to disable tracking.
+     */
+    export type trackComputedStyleUpdatesForNodeParameters = {
+      nodeId?: DOM.NodeId;
+    }
+    export type trackComputedStyleUpdatesForNodeReturnValue = {
+    }
     /**
      * Starts tracking the given computed styles for updates. The specified array of properties
 replaces the one previously specified. Pass empty array to disable tracking.
@@ -3496,7 +3937,7 @@ front-end.
     /**
      * Pseudo element type.
      */
-    export type PseudoType = "first-line"|"first-letter"|"before"|"after"|"marker"|"backdrop"|"selection"|"search-text"|"target-text"|"spelling-error"|"grammar-error"|"highlight"|"first-line-inherited"|"scroll-marker"|"scroll-marker-group"|"scrollbar"|"scrollbar-thumb"|"scrollbar-button"|"scrollbar-track"|"scrollbar-track-piece"|"scrollbar-corner"|"resizer"|"input-list-button"|"view-transition"|"view-transition-group"|"view-transition-image-pair"|"view-transition-old"|"view-transition-new";
+    export type PseudoType = "first-line"|"first-letter"|"checkmark"|"before"|"after"|"picker-icon"|"marker"|"backdrop"|"column"|"selection"|"search-text"|"target-text"|"spelling-error"|"grammar-error"|"highlight"|"first-line-inherited"|"scroll-marker"|"scroll-marker-group"|"scroll-button"|"scrollbar"|"scrollbar-thumb"|"scrollbar-button"|"scrollbar-track"|"scrollbar-track-piece"|"scrollbar-corner"|"resizer"|"input-list-button"|"view-transition"|"view-transition-group"|"view-transition-image-pair"|"view-transition-group-children"|"view-transition-old"|"view-transition-new"|"placeholder"|"file-selector-button"|"details-content"|"picker"|"permission-icon";
     /**
      * Shadow root type.
      */
@@ -3645,6 +4086,14 @@ The property is always undefined now.
       isSVG?: boolean;
       compatibilityMode?: CompatibilityMode;
       assignedSlot?: BackendNode;
+      isScrollable?: boolean;
+    }
+    /**
+     * A structure to hold the top-level node of a detached tree and an array of its retained descendants.
+     */
+    export interface DetachedElementInfo {
+      treeNode: Node;
+      retainedNodeIds: NodeId[];
     }
     /**
      * A structure holding an RGBA color.
@@ -3882,6 +4331,19 @@ The property is always undefined now.
      * Called when top layer elements are changed.
      */
     export type topLayerElementsUpdatedPayload = void;
+    /**
+     * Fired when a node's scrollability state changes.
+     */
+    export type scrollableFlagUpdatedPayload = {
+      /**
+       * The id of the node.
+       */
+      nodeId: DOM.NodeId;
+      /**
+       * If the node is scrollable.
+       */
+      isScrollable: boolean;
+    }
     /**
      * Called when a pseudo element is removed from an element.
      */
@@ -4268,6 +4730,10 @@ either returned or not.
        * JavaScript object id of the node wrapper.
        */
       objectId?: Runtime.RemoteObjectId;
+      /**
+       * Include all shadow roots. Equals to false if not specified.
+       */
+      includeShadowDOM?: boolean;
     }
     export type getOuterHTMLReturnValue = {
       /**
@@ -4483,7 +4949,7 @@ appear on top of all other content.
       /**
        * Type of relation to get.
        */
-      relation: "PopoverTarget";
+      relation: "PopoverTarget"|"InterestTarget"|"CommandFor";
     }
     export type getElementByRelationReturnValue = {
       /**
@@ -4693,6 +5159,17 @@ File wrapper.
     export type getFileInfoReturnValue = {
       path: string;
     }
+    /**
+     * Returns list of detached nodes
+     */
+    export type getDetachedDomNodesParameters = {
+    }
+    export type getDetachedDomNodesReturnValue = {
+      /**
+       * The list of detached nodes
+       */
+      detachedNodes: DetachedElementInfo[];
+    }
     /**
      * Enables console to refer to the node with given id via $x (see Command Line API for more details
 $x functions).
@@ -4779,15 +5256,18 @@ $x functions).
     }
     /**
      * Returns the query container of the given node based on container query
-conditions: containerName, physical, and logical axes. If no axes are
-provided, the style container is returned, which is the direct parent or the
-closest element with a matching container-name.
+conditions: containerName, physical and logical axes, and whether it queries
+scroll-state or anchored elements. If no axes are provided and
+queriesScrollState is false, the style container is returned, which is the
+direct parent or the closest element with a matching container-name.
      */
     export type getContainerForNodeParameters = {
       nodeId: NodeId;
       containerName?: string;
       physicalAxes?: PhysicalAxes;
       logicalAxes?: LogicalAxes;
+      queriesScrollState?: boolean;
+      queriesAnchored?: boolean;
     }
     export type getContainerForNodeReturnValue = {
       /**
@@ -4834,6 +5314,27 @@ the given positioned element.
        */
       nodeId: NodeId;
     }
+    /**
+     * When enabling, this API force-opens the popover identified by nodeId
+and keeps it open until disabled.
+     */
+    export type forceShowPopoverParameters = {
+      /**
+       * Id of the popover HTMLElement
+       */
+      nodeId: NodeId;
+      /**
+       * If true, opens the popover and keeps it open. If false, closes the
+popover if it was previously force-opened.
+       */
+      enable: boolean;
+    }
+    export type forceShowPopoverReturnValue = {
+      /**
+       * List of popovers that were closed in order to respect popover stacking order.
+       */
+      nodeIds: NodeId[];
+    }
   }
   
   /**
@@ -5702,81 +6203,6 @@ The final text color opacity is computed based on the opacity of all overlapping
     }
   }
   
-  export module Database {
-    /**
-     * Unique identifier of Database object.
-     */
-    export type DatabaseId = string;
-    /**
-     * Database object.
-     */
-    export interface Database {
-      /**
-       * Database ID.
-       */
-      id: DatabaseId;
-      /**
-       * Database domain.
-       */
-      domain: string;
-      /**
-       * Database name.
-       */
-      name: string;
-      /**
-       * Database version.
-       */
-      version: string;
-    }
-    /**
-     * Database error.
-     */
-    export interface Error {
-      /**
-       * Error message.
-       */
-      message: string;
-      /**
-       * Error code.
-       */
-      code: number;
-    }
-    
-    export type addDatabasePayload = {
-      database: Database;
-    }
-    
-    /**
-     * Disables database tracking, prevents database events from being sent to the client.
-     */
-    export type disableParameters = {
-    }
-    export type disableReturnValue = {
-    }
-    /**
-     * Enables database tracking, database events will now be delivered to the client.
-     */
-    export type enableParameters = {
-    }
-    export type enableReturnValue = {
-    }
-    export type executeSQLParameters = {
-      databaseId: DatabaseId;
-      query: string;
-    }
-    export type executeSQLReturnValue = {
-      columnNames?: string[];
-      values?: any[];
-      sqlError?: Error;
-    }
-    export type getDatabaseTableNamesParameters = {
-      databaseId: DatabaseId;
-    }
-    export type getDatabaseTableNamesReturnValue = {
-      tableNames: string[];
-    }
-  }
-  
   export module DeviceOrientation {
     
     
@@ -5812,6 +6238,40 @@ The final text color opacity is computed based on the opacity of all overlapping
    * This domain emulates different environments for the page.
    */
   export module Emulation {
+    export interface SafeAreaInsets {
+      /**
+       * Overrides safe-area-inset-top.
+       */
+      top?: number;
+      /**
+       * Overrides safe-area-max-inset-top.
+       */
+      topMax?: number;
+      /**
+       * Overrides safe-area-inset-left.
+       */
+      left?: number;
+      /**
+       * Overrides safe-area-max-inset-left.
+       */
+      leftMax?: number;
+      /**
+       * Overrides safe-area-inset-bottom.
+       */
+      bottom?: number;
+      /**
+       * Overrides safe-area-max-inset-bottom.
+       */
+      bottomMax?: number;
+      /**
+       * Overrides safe-area-inset-right.
+       */
+      right?: number;
+      /**
+       * Overrides safe-area-max-inset-right.
+       */
+      rightMax?: number;
+    }
     /**
      * Screen orientation.
      */
@@ -5887,12 +6347,17 @@ Missing optional values will be filled in by the target with what it would norma
       mobile: boolean;
       bitness?: string;
       wow64?: boolean;
+      /**
+       * Used to specify User Agent form-factor values.
+See https://wicg.github.io/ua-client-hints/#sec-ch-ua-form-factors
+       */
+      formFactors?: string[];
     }
     /**
      * Used to specify sensor types to emulate.
 See https://w3c.github.io/sensors/#automation for more information.
      */
-    export type SensorType = "absolute-orientation"|"accelerometer"|"ambient-light"|"gravity"|"gyroscope"|"linear-acceleration"|"magnetometer"|"proximity"|"relative-orientation";
+    export type SensorType = "absolute-orientation"|"accelerometer"|"ambient-light"|"gravity"|"gyroscope"|"linear-acceleration"|"magnetometer"|"relative-orientation";
     export interface SensorMetadata {
       available?: boolean;
       minimumFrequency?: number;
@@ -6011,6 +6476,15 @@ cleared.
     }
     export type setDefaultBackgroundColorOverrideReturnValue = {
     }
+    /**
+     * Overrides the values for env(safe-area-inset-*) and env(safe-area-max-inset-*). Unset values will cause the
+respective variables to be undefined, even if previously overridden.
+     */
+    export type setSafeAreaInsetsOverrideParameters = {
+      insets: SafeAreaInsets;
+    }
+    export type setSafeAreaInsetsOverrideReturnValue = {
+    }
     /**
      * Overrides the values of device screen dimensions (window.screen.width, window.screen.height,
 window.innerWidth, window.innerHeight, and "device-width"/"device-height"-related CSS media
@@ -6070,6 +6544,7 @@ change is not observed by the page, e.g. viewport-relative elements do not chang
       /**
        * If set, the display feature of a multi-segment screen. If not set, multi-segment support
 is turned-off.
+Deprecated, use Emulation.setDisplayFeaturesOverride.
        */
       displayFeature?: DisplayFeature;
       /**
@@ -6100,6 +6575,25 @@ Does nothing if no override is set.
     }
     export type clearDevicePostureOverrideReturnValue = {
     }
+    /**
+     * Start using the given display features to pupulate the Viewport Segments API.
+This override can also be set in setDeviceMetricsOverride().
+     */
+    export type setDisplayFeaturesOverrideParameters = {
+      features: DisplayFeature[];
+    }
+    export type setDisplayFeaturesOverrideReturnValue = {
+    }
+    /**
+     * Clears the display features override set with either setDeviceMetricsOverride()
+or setDisplayFeaturesOverride() and starts using display features from the
+platform again.
+Does nothing if no override is set.
+     */
+    export type clearDisplayFeaturesOverrideParameters = {
+    }
+    export type clearDisplayFeaturesOverrideReturnValue = {
+    }
     export type setScrollbarsHiddenParameters = {
       /**
        * Whether scrollbars should be always hidden.
@@ -6156,8 +6650,16 @@ physiologically accurate emulations for medically recognized color vision defici
     export type setEmulatedVisionDeficiencyReturnValue = {
     }
     /**
-     * Overrides the Geolocation Position or Error. Omitting any of the parameters emulates position
-unavailable.
+     * Emulates the given OS text scale.
+     */
+    export type setEmulatedOSTextScaleParameters = {
+      scale?: number;
+    }
+    export type setEmulatedOSTextScaleReturnValue = {
+    }
+    /**
+     * Overrides the Geolocation Position or Error. Omitting latitude, longitude or
+accuracy emulates position unavailable.
      */
     export type setGeolocationOverrideParameters = {
       /**
@@ -6172,6 +6674,22 @@ unavailable.
        * Mock accuracy
        */
       accuracy?: number;
+      /**
+       * Mock altitude
+       */
+      altitude?: number;
+      /**
+       * Mock altitudeAccuracy
+       */
+      altitudeAccuracy?: number;
+      /**
+       * Mock heading
+       */
+      heading?: number;
+      /**
+       * Mock speed
+       */
+      speed?: number;
     }
     export type setGeolocationOverrideReturnValue = {
     }
@@ -6219,7 +6737,8 @@ platform-provided telemetry data.
     export type setPressureSourceOverrideEnabledReturnValue = {
     }
     /**
-     * Provides a given pressure state that will be processed and eventually be
+     * TODO: OBSOLETE: To remove when setPressureDataOverride is merged.
+Provides a given pressure state that will be processed and eventually be
 delivered to PressureObserver users. |source| must have been previously
 overridden by setPressureSourceOverrideEnabled.
      */
@@ -6229,6 +6748,18 @@ overridden by setPressureSourceOverrideEnabled.
     }
     export type setPressureStateOverrideReturnValue = {
     }
+    /**
+     * Provides a given pressure data set that will be processed and eventually be
+delivered to PressureObserver users. |source| must have been previously
+overridden by setPressureSourceOverrideEnabled.
+     */
+    export type setPressureDataOverrideParameters = {
+      source: PressureSource;
+      state: PressureState;
+      ownContributionEstimate?: number;
+    }
+    export type setPressureDataOverrideReturnValue = {
+    }
     /**
      * Overrides the Idle state.
      */
@@ -6376,6 +6907,17 @@ on Android.
     }
     export type setDisabledImageTypesReturnValue = {
     }
+    /**
+     * Override the value of navigator.connection.saveData
+     */
+    export type setDataSaverOverrideParameters = {
+      /**
+       * Override value. Omitting the parameter disables the override.
+       */
+      dataSaverEnabled?: boolean;
+    }
+    export type setDataSaverOverrideReturnValue = {
+    }
     export type setHardwareConcurrencyOverrideParameters = {
       /**
        * Hardware concurrency to report
@@ -6419,6 +6961,19 @@ on Android.
     }
     export type setAutomationOverrideReturnValue = {
     }
+    /**
+     * Allows overriding the difference between the small and large viewport sizes, which determine the
+value of the `svh` and `lvh` unit, respectively. Only supported for top-level frames.
+     */
+    export type setSmallViewportHeightDifferenceOverrideParameters = {
+      /**
+       * This will cause an element of size 100svh to be `difference` pixels smaller than an element
+of size 100lvh.
+       */
+      difference: number;
+    }
+    export type setSmallViewportHeightDifferenceOverrideReturnValue = {
+    }
   }
   
   /**
@@ -8019,8 +8574,25 @@ or hexadecimal (0x prefixed) string.
        */
       size: number;
     }
+    /**
+     * DOM object counter data.
+     */
+    export interface DOMCounter {
+      /**
+       * Object name. Note: object names should be presumed volatile and clients should not expect
+the returned names to be consistent across runs.
+       */
+      name: string;
+      /**
+       * Object count.
+       */
+      count: number;
+    }
     
     
+    /**
+     * Retruns current DOM object counters.
+     */
     export type getDOMCountersParameters = {
     }
     export type getDOMCountersReturnValue = {
@@ -8028,6 +8600,21 @@ or hexadecimal (0x prefixed) string.
       nodes: number;
       jsEventListeners: number;
     }
+    /**
+     * Retruns DOM object counters after preparing renderer for leak detection.
+     */
+    export type getDOMCountersForLeakDetectionParameters = {
+    }
+    export type getDOMCountersForLeakDetectionReturnValue = {
+      /**
+       * DOM object counters.
+       */
+      counters: DOMCounter[];
+    }
+    /**
+     * Prepares for leak detection by terminating workers, stopping spellcheckers,
+dropping non-essential internal caches, running garbage collections, etc.
+     */
     export type prepareForLeakDetectionParameters = {
     }
     export type prepareForLeakDetectionReturnValue = {
@@ -8120,13 +8707,15 @@ file, data and other requests and responses, their headers, bodies, timing, etc.
     /**
      * Resource type as it was perceived by the rendering engine.
      */
-    export type ResourceType = "Document"|"Stylesheet"|"Image"|"Media"|"Font"|"Script"|"TextTrack"|"XHR"|"Fetch"|"Prefetch"|"EventSource"|"WebSocket"|"Manifest"|"SignedExchange"|"Ping"|"CSPViolationReport"|"Preflight"|"Other";
+    export type ResourceType = "Document"|"Stylesheet"|"Image"|"Media"|"Font"|"Script"|"TextTrack"|"XHR"|"Fetch"|"Prefetch"|"EventSource"|"WebSocket"|"Manifest"|"SignedExchange"|"Ping"|"CSPViolationReport"|"Preflight"|"FedCM"|"Other";
     /**
      * Unique loader identifier.
      */
     export type LoaderId = string;
     /**
-     * Unique request identifier.
+     * Unique network request identifier.
+Note that this does not identify individual HTTP requests that are part of
+a network request.
      */
     export type RequestId = string;
     /**
@@ -8441,11 +9030,11 @@ applicable or not known.
     /**
      * The reason why request was blocked.
      */
-    export type BlockedReason = "other"|"csp"|"mixed-content"|"origin"|"inspector"|"subresource-filter"|"content-type"|"coep-frame-resource-needs-coep-header"|"coop-sandboxed-iframe-cannot-navigate-to-coop-page"|"corp-not-same-origin"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep"|"corp-not-same-origin-after-defaulted-to-same-origin-by-dip"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep-and-dip"|"corp-not-same-site";
+    export type BlockedReason = "other"|"csp"|"mixed-content"|"origin"|"inspector"|"integrity"|"subresource-filter"|"content-type"|"coep-frame-resource-needs-coep-header"|"coop-sandboxed-iframe-cannot-navigate-to-coop-page"|"corp-not-same-origin"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep"|"corp-not-same-origin-after-defaulted-to-same-origin-by-dip"|"corp-not-same-origin-after-defaulted-to-same-origin-by-coep-and-dip"|"corp-not-same-site"|"sri-message-signature-mismatch";
     /**
      * The reason why request was blocked.
      */
-    export type CorsError = "DisallowedByMode"|"InvalidResponse"|"WildcardOriginNotAllowed"|"MissingAllowOriginHeader"|"MultipleAllowOriginValues"|"InvalidAllowOriginValue"|"AllowOriginMismatch"|"InvalidAllowCredentials"|"CorsDisabledScheme"|"PreflightInvalidStatus"|"PreflightDisallowedRedirect"|"PreflightWildcardOriginNotAllowed"|"PreflightMissingAllowOriginHeader"|"PreflightMultipleAllowOriginValues"|"PreflightInvalidAllowOriginValue"|"PreflightAllowOriginMismatch"|"PreflightInvalidAllowCredentials"|"PreflightMissingAllowExternal"|"PreflightInvalidAllowExternal"|"PreflightMissingAllowPrivateNetwork"|"PreflightInvalidAllowPrivateNetwork"|"InvalidAllowMethodsPreflightResponse"|"InvalidAllowHeadersPreflightResponse"|"MethodDisallowedByPreflightResponse"|"HeaderDisallowedByPreflightResponse"|"RedirectContainsCredentials"|"InsecurePrivateNetwork"|"InvalidPrivateNetworkAccess"|"UnexpectedPrivateNetworkAccess"|"NoCorsRedirectModeNotFollow"|"PreflightMissingPrivateNetworkAccessId"|"PreflightMissingPrivateNetworkAccessName"|"PrivateNetworkAccessPermissionUnavailable"|"PrivateNetworkAccessPermissionDenied";
+    export type CorsError = "DisallowedByMode"|"InvalidResponse"|"WildcardOriginNotAllowed"|"MissingAllowOriginHeader"|"MultipleAllowOriginValues"|"InvalidAllowOriginValue"|"AllowOriginMismatch"|"InvalidAllowCredentials"|"CorsDisabledScheme"|"PreflightInvalidStatus"|"PreflightDisallowedRedirect"|"PreflightWildcardOriginNotAllowed"|"PreflightMissingAllowOriginHeader"|"PreflightMultipleAllowOriginValues"|"PreflightInvalidAllowOriginValue"|"PreflightAllowOriginMismatch"|"PreflightInvalidAllowCredentials"|"PreflightMissingAllowExternal"|"PreflightInvalidAllowExternal"|"PreflightMissingAllowPrivateNetwork"|"PreflightInvalidAllowPrivateNetwork"|"InvalidAllowMethodsPreflightResponse"|"InvalidAllowHeadersPreflightResponse"|"MethodDisallowedByPreflightResponse"|"HeaderDisallowedByPreflightResponse"|"RedirectContainsCredentials"|"InsecurePrivateNetwork"|"InvalidPrivateNetworkAccess"|"UnexpectedPrivateNetworkAccess"|"NoCorsRedirectModeNotFollow"|"PreflightMissingPrivateNetworkAccessId"|"PreflightMissingPrivateNetworkAccessName"|"PrivateNetworkAccessPermissionUnavailable"|"PrivateNetworkAccessPermissionDenied"|"LocalNetworkAccessPermissionDenied";
     export interface CorsErrorStatus {
       corsError: CorsError;
       failedParameter: string;
@@ -8480,7 +9069,7 @@ records.
     /**
      * Source of service worker router.
      */
-    export type ServiceWorkerRouterSource = "network"|"cache"|"fetch-event"|"race-network-and-fetch-handler";
+    export type ServiceWorkerRouterSource = "network"|"cache"|"fetch-event"|"race-network-and-fetch-handler"|"race-network-and-cache";
     export interface ServiceWorkerRouterInfo {
       /**
        * ID of the rule matched. If there is a matched rule, this field will
@@ -8612,6 +9201,11 @@ Otherwise, the API is not used.
        * Security details for the request.
        */
       securityDetails?: SecurityDetails;
+      /**
+       * Indicates whether the request was sent through IP Protection proxies. If
+set to true, the request used the IP Protection privacy feature.
+       */
+      isIpProtectionUsed?: boolean;
     }
     /**
      * WebSocket request data.
@@ -8701,6 +9295,7 @@ If the opcode isn't 1, then payloadData is a base64 encoded string representing
       type: "parser"|"script"|"preload"|"SignedExchange"|"preflight"|"other";
       /**
        * Initiator JavaScript stack trace, set for Script only.
+Requires the Debugger domain to be enabled.
        */
       stack?: Runtime.StackTrace;
       /**
@@ -8815,11 +9410,11 @@ This is a temporary ability and it will be removed in the future.
     /**
      * Types of reasons why a cookie may not be sent with a request.
      */
-    export type CookieBlockedReason = "SecureOnly"|"NotOnPath"|"DomainMismatch"|"SameSiteStrict"|"SameSiteLax"|"SameSiteUnspecifiedTreatedAsLax"|"SameSiteNoneInsecure"|"UserPreferences"|"ThirdPartyPhaseout"|"ThirdPartyBlockedInFirstPartySet"|"UnknownError"|"SchemefulSameSiteStrict"|"SchemefulSameSiteLax"|"SchemefulSameSiteUnspecifiedTreatedAsLax"|"SamePartyFromCrossPartyContext"|"NameValuePairExceedsMaxSize";
+    export type CookieBlockedReason = "SecureOnly"|"NotOnPath"|"DomainMismatch"|"SameSiteStrict"|"SameSiteLax"|"SameSiteUnspecifiedTreatedAsLax"|"SameSiteNoneInsecure"|"UserPreferences"|"ThirdPartyPhaseout"|"ThirdPartyBlockedInFirstPartySet"|"UnknownError"|"SchemefulSameSiteStrict"|"SchemefulSameSiteLax"|"SchemefulSameSiteUnspecifiedTreatedAsLax"|"SamePartyFromCrossPartyContext"|"NameValuePairExceedsMaxSize"|"PortMismatch"|"SchemeMismatch"|"AnonymousContext";
     /**
      * Types of reasons why a cookie should have been blocked by 3PCD but is exempted for the request.
      */
-    export type CookieExemptionReason = "None"|"UserSetting"|"TPCDMetadata"|"TPCDDeprecationTrial"|"TPCDHeuristics"|"EnterprisePolicy"|"StorageAccess"|"TopLevelStorageAccess"|"CorsOptIn"|"Scheme";
+    export type CookieExemptionReason = "None"|"UserSetting"|"TPCDMetadata"|"TPCDDeprecationTrial"|"TopLevelTPCDDeprecationTrial"|"TPCDHeuristics"|"EnterprisePolicy"|"StorageAccess"|"TopLevelStorageAccess"|"Scheme"|"SameSiteNoneCookiesInSandbox";
     /**
      * A cookie which was not stored from a response with the corresponding reason.
      */
@@ -9103,6 +9698,11 @@ https://wicg.github.io/webpackage/draft-yasskin-httpbis-origin-signed-exchanges-
        * The outer response of signed HTTP exchange which was received from network.
        */
       outerResponse: Response;
+      /**
+       * Whether network response for the signed exchange was accompanied by
+extra headers.
+       */
+      hasExtraInfo: boolean;
       /**
        * Information about the signed exchange header.
        */
@@ -9120,8 +9720,61 @@ https://wicg.github.io/webpackage/draft-yasskin-httpbis-origin-signed-exchanges-
      * List of content encodings supported by the backend.
      */
     export type ContentEncoding = "deflate"|"gzip"|"br"|"zstd";
-    export type PrivateNetworkRequestPolicy = "Allow"|"BlockFromInsecureToMorePrivate"|"WarnFromInsecureToMorePrivate"|"PreflightBlock"|"PreflightWarn";
-    export type IPAddressSpace = "Local"|"Private"|"Public"|"Unknown";
+    export type DirectSocketDnsQueryType = "ipv4"|"ipv6";
+    export interface DirectTCPSocketOptions {
+      /**
+       * TCP_NODELAY option
+       */
+      noDelay: boolean;
+      /**
+       * Expected to be unsigned integer.
+       */
+      keepAliveDelay?: number;
+      /**
+       * Expected to be unsigned integer.
+       */
+      sendBufferSize?: number;
+      /**
+       * Expected to be unsigned integer.
+       */
+      receiveBufferSize?: number;
+      dnsQueryType?: DirectSocketDnsQueryType;
+    }
+    export interface DirectUDPSocketOptions {
+      remoteAddr?: string;
+      /**
+       * Unsigned int 16.
+       */
+      remotePort?: number;
+      localAddr?: string;
+      /**
+       * Unsigned int 16.
+       */
+      localPort?: number;
+      dnsQueryType?: DirectSocketDnsQueryType;
+      /**
+       * Expected to be unsigned integer.
+       */
+      sendBufferSize?: number;
+      /**
+       * Expected to be unsigned integer.
+       */
+      receiveBufferSize?: number;
+    }
+    export interface DirectUDPMessage {
+      data: binary;
+      /**
+       * Null for connected mode.
+       */
+      remoteAddr?: string;
+      /**
+       * Null for connected mode.
+Expected to be unsigned integer.
+       */
+      remotePort?: number;
+    }
+    export type PrivateNetworkRequestPolicy = "Allow"|"BlockFromInsecureToMorePrivate"|"WarnFromInsecureToMorePrivate"|"PreflightBlock"|"PreflightWarn"|"PermissionBlock"|"PermissionWarn";
+    export type IPAddressSpace = "Loopback"|"Local"|"Public"|"Unknown";
     export interface ConnectTiming {
       /**
        * Timing's requestTime is a baseline in seconds, while the other numbers are ticks in
@@ -9690,6 +10343,125 @@ or were emitted for this request.
        */
       timestamp: MonotonicTime;
     }
+    /**
+     * Fired upon direct_socket.TCPSocket creation.
+     */
+    export type directTCPSocketCreatedPayload = {
+      identifier: RequestId;
+      remoteAddr: string;
+      /**
+       * Unsigned int 16.
+       */
+      remotePort: number;
+      options: DirectTCPSocketOptions;
+      timestamp: MonotonicTime;
+      initiator?: Initiator;
+    }
+    /**
+     * Fired when direct_socket.TCPSocket connection is opened.
+     */
+    export type directTCPSocketOpenedPayload = {
+      identifier: RequestId;
+      remoteAddr: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      remotePort: number;
+      timestamp: MonotonicTime;
+      localAddr?: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      localPort?: number;
+    }
+    /**
+     * Fired when direct_socket.TCPSocket is aborted.
+     */
+    export type directTCPSocketAbortedPayload = {
+      identifier: RequestId;
+      errorMessage: string;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when direct_socket.TCPSocket is closed.
+     */
+    export type directTCPSocketClosedPayload = {
+      identifier: RequestId;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when data is sent to tcp direct socket stream.
+     */
+    export type directTCPSocketChunkSentPayload = {
+      identifier: RequestId;
+      data: binary;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when data is received from tcp direct socket stream.
+     */
+    export type directTCPSocketChunkReceivedPayload = {
+      identifier: RequestId;
+      data: binary;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired upon direct_socket.UDPSocket creation.
+     */
+    export type directUDPSocketCreatedPayload = {
+      identifier: RequestId;
+      options: DirectUDPSocketOptions;
+      timestamp: MonotonicTime;
+      initiator?: Initiator;
+    }
+    /**
+     * Fired when direct_socket.UDPSocket connection is opened.
+     */
+    export type directUDPSocketOpenedPayload = {
+      identifier: RequestId;
+      localAddr: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      localPort: number;
+      timestamp: MonotonicTime;
+      remoteAddr?: string;
+      /**
+       * Expected to be unsigned integer.
+       */
+      remotePort?: number;
+    }
+    /**
+     * Fired when direct_socket.UDPSocket is aborted.
+     */
+    export type directUDPSocketAbortedPayload = {
+      identifier: RequestId;
+      errorMessage: string;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when direct_socket.UDPSocket is closed.
+     */
+    export type directUDPSocketClosedPayload = {
+      identifier: RequestId;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when message is sent to udp direct socket stream.
+     */
+    export type directUDPSocketChunkSentPayload = {
+      identifier: RequestId;
+      message: DirectUDPMessage;
+      timestamp: MonotonicTime;
+    }
+    /**
+     * Fired when message is received from udp direct socket stream.
+     */
+    export type directUDPSocketChunkReceivedPayload = {
+      identifier: RequestId;
+      message: DirectUDPMessage;
+      timestamp: MonotonicTime;
+    }
     /**
      * Fired when additional information about a requestWillBeSent event is available from the
 network stack. Not every requestWillBeSent event will have an additional
@@ -9741,6 +10513,9 @@ are represented by the invalid cookie line string instead of a proper cookie.
       blockedCookies: BlockedSetCookieWithReason[];
       /**
        * Raw response headers as they were received over the wire.
+Duplicate headers in the response are represented as a single key with their values
+concatentated using `\n` as the separator.
+See also `headersText` that contains verbatim text for HTTP/1.*.
        */
       headers: Headers;
       /**
@@ -9786,6 +10561,9 @@ Only one responseReceivedEarlyHints may be fired for eached responseReceived eve
       requestId: RequestId;
       /**
        * Raw response headers as they were received over the wire.
+Duplicate headers in the response are represented as a single key with their values
+concatentated using `\n` as the separator.
+See also `headersText` that contains verbatim text for HTTP/1.*.
        */
       headers: Headers;
     }
@@ -9802,7 +10580,7 @@ or after the response was received.
 of the operation already exists und thus, the operation was abort
 preemptively (e.g. a cache hit).
        */
-      status: "Ok"|"InvalidArgument"|"MissingIssuerKeys"|"FailedPrecondition"|"ResourceExhausted"|"AlreadyExists"|"ResourceLimited"|"Unauthorized"|"BadResponse"|"InternalError"|"UnknownError"|"FulfilledLocally";
+      status: "Ok"|"InvalidArgument"|"MissingIssuerKeys"|"FailedPrecondition"|"ResourceExhausted"|"AlreadyExists"|"ResourceLimited"|"Unauthorized"|"BadResponse"|"InternalError"|"UnknownError"|"FulfilledLocally"|"SiteIssuerLimit";
       type: TrustTokenOperationType;
       requestId: RequestId;
       /**
@@ -10112,6 +10890,10 @@ all partition key attributes match the cookie partition key attribute.
        * Longest post body size (in bytes) that would be included in requestWillBeSent notification
        */
       maxPostDataSize?: number;
+      /**
+       * Whether DirectSocket chunk send/receive events should be reported.
+       */
+      reportDirectSocketTraffic?: boolean;
     }
     export type enableReturnValue = {
     }
@@ -10496,6 +11278,26 @@ should be omitted for worker targets.
     export type loadNetworkResourceReturnValue = {
       resource: LoadNetworkResourcePageResult;
     }
+    /**
+     * Sets Controls for third-party cookie access
+Page reload is required before the new cookie behavior will be observed
+     */
+    export type setCookieControlsParameters = {
+      /**
+       * Whether 3pc restriction is enabled.
+       */
+      enableThirdPartyCookieRestriction: boolean;
+      /**
+       * Whether 3pc grace period exception should be enabled; false by default.
+       */
+      disableThirdPartyCookieMetadata: boolean;
+      /**
+       * Whether 3pc heuristics exceptions should be enabled; false by default.
+       */
+      disableThirdPartyCookieHeuristics: boolean;
+    }
+    export type setCookieControlsReturnValue = {
+    }
   }
   
   /**
@@ -10892,7 +11694,7 @@ should be omitted for worker targets.
        */
       maskColor?: DOM.RGBA;
     }
-    export type InspectMode = "searchForNode"|"searchForUAShadowDOM"|"captureAreaScreenshot"|"showDistances"|"none";
+    export type InspectMode = "searchForNode"|"searchForUAShadowDOM"|"captureAreaScreenshot"|"none";
     
     /**
      * Fired when the node should be inspected. This happens after call to `setInspectMode` or when
@@ -11268,7 +12070,7 @@ Backend then generates 'inspectNodeRequested' event upon element selection.
     export type setShowHitTestBordersReturnValue = {
     }
     /**
-     * Request that backend shows an overlay with web vital metrics.
+     * Deprecated, no longer has any effect.
      */
     export type setShowWebVitalsParameters = {
       show: boolean;
@@ -11342,20 +12144,40 @@ Backend then generates 'inspectNodeRequested' event upon element selection.
       explanations?: AdFrameExplanation[];
     }
     /**
-     * Identifies the bottom-most script which caused the frame to be labelled
-as an ad.
+     * Identifies the script which caused a script or frame to be labelled as an
+ad.
      */
     export interface AdScriptId {
       /**
-       * Script Id of the bottom-most script which caused the frame to be labelled
-as an ad.
+       * Script Id of the script which caused a script or frame to be labelled as
+an ad.
        */
       scriptId: Runtime.ScriptId;
       /**
-       * Id of adScriptId's debugger.
+       * Id of scriptId's debugger.
        */
       debuggerId: Runtime.UniqueDebuggerId;
     }
+    /**
+     * Encapsulates the script ancestry and the root script filterlist rule that
+caused the frame to be labelled as an ad. Only created when `ancestryChain`
+is not empty.
+     */
+    export interface AdScriptAncestry {
+      /**
+       * A chain of `AdScriptId`s representing the ancestry of an ad script that
+led to the creation of a frame. The chain is ordered from the script
+itself (lower level) up to its root ancestor that was flagged by
+filterlist.
+       */
+      ancestryChain: AdScriptId[];
+      /**
+       * The filterlist rule that caused the root (last) script in
+`ancestryChain` to be ad-tagged. Only populated if the rule is
+available.
+       */
+      rootScriptFilterlistRule?: string;
+    }
     /**
      * Indicates whether the frame is a secure context and why it is the case.
      */
@@ -11367,9 +12189,10 @@ as an ad.
     export type GatedAPIFeatures = "SharedArrayBuffers"|"SharedArrayBuffersTransferAllowed"|"PerformanceMeasureMemory"|"PerformanceProfile";
     /**
      * All Permissions Policy features. This enum should match the one defined
-in third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5.
+in services/network/public/cpp/permissions_policy/permissions_policy_features.json5.
+LINT.IfChange(PermissionsPolicyFeature)
      */
-    export type PermissionsPolicyFeature = "accelerometer"|"ambient-light-sensor"|"attribution-reporting"|"autoplay"|"bluetooth"|"browsing-topics"|"camera"|"captured-surface-control"|"ch-dpr"|"ch-device-memory"|"ch-downlink"|"ch-ect"|"ch-prefers-color-scheme"|"ch-prefers-reduced-motion"|"ch-prefers-reduced-transparency"|"ch-rtt"|"ch-save-data"|"ch-ua"|"ch-ua-arch"|"ch-ua-bitness"|"ch-ua-platform"|"ch-ua-model"|"ch-ua-mobile"|"ch-ua-form-factors"|"ch-ua-full-version"|"ch-ua-full-version-list"|"ch-ua-platform-version"|"ch-ua-wow64"|"ch-viewport-height"|"ch-viewport-width"|"ch-width"|"clipboard-read"|"clipboard-write"|"compute-pressure"|"cross-origin-isolated"|"deferred-fetch"|"digital-credentials-get"|"direct-sockets"|"display-capture"|"document-domain"|"encrypted-media"|"execution-while-out-of-viewport"|"execution-while-not-rendered"|"focus-without-user-activation"|"fullscreen"|"frobulate"|"gamepad"|"geolocation"|"gyroscope"|"hid"|"identity-credentials-get"|"idle-detection"|"interest-cohort"|"join-ad-interest-group"|"keyboard-map"|"local-fonts"|"magnetometer"|"microphone"|"midi"|"otp-credentials"|"payment"|"picture-in-picture"|"private-aggregation"|"private-state-token-issuance"|"private-state-token-redemption"|"publickey-credentials-create"|"publickey-credentials-get"|"run-ad-auction"|"screen-wake-lock"|"serial"|"shared-autofill"|"shared-storage"|"shared-storage-select-url"|"smart-card"|"speaker-selection"|"storage-access"|"sub-apps"|"sync-xhr"|"unload"|"usb"|"usb-unrestricted"|"vertical-scroll"|"web-printing"|"web-share"|"window-management"|"xr-spatial-tracking";
+    export type PermissionsPolicyFeature = "accelerometer"|"all-screens-capture"|"ambient-light-sensor"|"aria-notify"|"attribution-reporting"|"autoplay"|"bluetooth"|"browsing-topics"|"camera"|"captured-surface-control"|"ch-dpr"|"ch-device-memory"|"ch-downlink"|"ch-ect"|"ch-prefers-color-scheme"|"ch-prefers-reduced-motion"|"ch-prefers-reduced-transparency"|"ch-rtt"|"ch-save-data"|"ch-ua"|"ch-ua-arch"|"ch-ua-bitness"|"ch-ua-high-entropy-values"|"ch-ua-platform"|"ch-ua-model"|"ch-ua-mobile"|"ch-ua-form-factors"|"ch-ua-full-version"|"ch-ua-full-version-list"|"ch-ua-platform-version"|"ch-ua-wow64"|"ch-viewport-height"|"ch-viewport-width"|"ch-width"|"clipboard-read"|"clipboard-write"|"compute-pressure"|"controlled-frame"|"cross-origin-isolated"|"deferred-fetch"|"deferred-fetch-minimal"|"device-attributes"|"digital-credentials-get"|"direct-sockets"|"direct-sockets-private"|"display-capture"|"document-domain"|"encrypted-media"|"execution-while-out-of-viewport"|"execution-while-not-rendered"|"fenced-unpartitioned-storage-read"|"focus-without-user-activation"|"fullscreen"|"frobulate"|"gamepad"|"geolocation"|"gyroscope"|"hid"|"identity-credentials-get"|"idle-detection"|"interest-cohort"|"join-ad-interest-group"|"keyboard-map"|"language-detector"|"language-model"|"local-fonts"|"local-network-access"|"magnetometer"|"media-playback-while-not-visible"|"microphone"|"midi"|"on-device-speech-recognition"|"otp-credentials"|"payment"|"picture-in-picture"|"popins"|"private-aggregation"|"private-state-token-issuance"|"private-state-token-redemption"|"publickey-credentials-create"|"publickey-credentials-get"|"record-ad-auction-events"|"rewriter"|"run-ad-auction"|"screen-wake-lock"|"serial"|"shared-autofill"|"shared-storage"|"shared-storage-select-url"|"smart-card"|"speaker-selection"|"storage-access"|"sub-apps"|"summarizer"|"sync-xhr"|"translator"|"unload"|"usb"|"usb-unrestricted"|"vertical-scroll"|"web-app-installation"|"web-printing"|"web-share"|"window-management"|"writer"|"xr-spatial-tracking";
     /**
      * Reason for a permissions policy feature to be disabled.
      */
@@ -11415,6 +12238,17 @@ parsable.
       status: OriginTrialStatus;
       tokensWithStatus: OriginTrialTokenWithStatus[];
     }
+    /**
+     * Additional information about the frame document's security origin.
+     */
+    export interface SecurityOriginDetails {
+      /**
+       * Indicates whether the frame document's security origin is one
+of the local hostnames (e.g. "localhost") or IP addresses (IPv4
+127.0.0.0/8 or IPv6 ::1).
+       */
+      isLocalhost: boolean;
+    }
     /**
      * Information about the Frame on the page.
      */
@@ -11454,6 +12288,10 @@ Example URLs: http://www.google.com/file.html -> "google.com"
        * Frame document's security origin.
        */
       securityOrigin: string;
+      /**
+       * Additional details about the frame document's security origin.
+       */
+      securityOriginDetails?: SecurityOriginDetails;
       /**
        * Frame document's mimeType as determined by the browser.
        */
@@ -11784,7 +12622,7 @@ Example URLs: http://www.google.com/file.html -> "google.com"
        */
       fixed?: number;
     }
-    export type ClientNavigationReason = "formSubmissionGet"|"formSubmissionPost"|"httpHeaderRefresh"|"scriptInitiated"|"metaTagRefresh"|"pageBlockInterstitial"|"reload"|"anchorClick";
+    export type ClientNavigationReason = "anchorClick"|"formSubmissionGet"|"formSubmissionPost"|"httpHeaderRefresh"|"initialFrameNavigation"|"metaTagRefresh"|"other"|"pageBlockInterstitial"|"reload"|"scriptInitiated";
     export type ClientNavigationDisposition = "currentTab"|"newTab"|"newWindow"|"download";
     export interface InstallabilityErrorArgument {
       /**
@@ -11946,10 +12784,6 @@ https://github.com/WICG/manifest-incubations/blob/gh-pages/scope_extensions-expl
       startUrl?: string;
       themeColor?: string;
     }
-    /**
-     * Enum of possible auto-response for permission / prompt dialogs.
-     */
-    export type AutoResponseMode = "none"|"autoAccept"|"autoReject"|"autoOptOut";
     /**
      * The type of a frameNavigated event.
      */
@@ -11957,7 +12791,7 @@ https://github.com/WICG/manifest-incubations/blob/gh-pages/scope_extensions-expl
     /**
      * List of not restored reasons for back-forward cache.
      */
-    export type BackForwardCacheNotRestoredReason = "NotPrimaryMainFrame"|"BackForwardCacheDisabled"|"RelatedActiveContentsExist"|"HTTPStatusNotOK"|"SchemeNotHTTPOrHTTPS"|"Loading"|"WasGrantedMediaAccess"|"DisableForRenderFrameHostCalled"|"DomainNotAllowed"|"HTTPMethodNotGET"|"SubframeIsNavigating"|"Timeout"|"CacheLimit"|"JavaScriptExecution"|"RendererProcessKilled"|"RendererProcessCrashed"|"SchedulerTrackedFeatureUsed"|"ConflictingBrowsingInstance"|"CacheFlushed"|"ServiceWorkerVersionActivation"|"SessionRestored"|"ServiceWorkerPostMessage"|"EnteredBackForwardCacheBeforeServiceWorkerHostAdded"|"RenderFrameHostReused_SameSite"|"RenderFrameHostReused_CrossSite"|"ServiceWorkerClaim"|"IgnoreEventAndEvict"|"HaveInnerContents"|"TimeoutPuttingInCache"|"BackForwardCacheDisabledByLowMemory"|"BackForwardCacheDisabledByCommandLine"|"NetworkRequestDatapipeDrainedAsBytesConsumer"|"NetworkRequestRedirected"|"NetworkRequestTimeout"|"NetworkExceedsBufferLimit"|"NavigationCancelledWhileRestoring"|"NotMostRecentNavigationEntry"|"BackForwardCacheDisabledForPrerender"|"UserAgentOverrideDiffers"|"ForegroundCacheLimit"|"BrowsingInstanceNotSwapped"|"BackForwardCacheDisabledForDelegate"|"UnloadHandlerExistsInMainFrame"|"UnloadHandlerExistsInSubFrame"|"ServiceWorkerUnregistration"|"CacheControlNoStore"|"CacheControlNoStoreCookieModified"|"CacheControlNoStoreHTTPOnlyCookieModified"|"NoResponseHead"|"Unknown"|"ActivationNavigationsDisallowedForBug1234857"|"ErrorDocument"|"FencedFramesEmbedder"|"CookieDisabled"|"HTTPAuthRequired"|"CookieFlushed"|"BroadcastChannelOnMessage"|"WebViewSettingsChanged"|"WebViewJavaScriptObjectChanged"|"WebViewMessageListenerInjected"|"WebViewSafeBrowsingAllowlistChanged"|"WebViewDocumentStartJavascriptChanged"|"WebSocket"|"WebTransport"|"WebRTC"|"MainResourceHasCacheControlNoStore"|"MainResourceHasCacheControlNoCache"|"SubresourceHasCacheControlNoStore"|"SubresourceHasCacheControlNoCache"|"ContainsPlugins"|"DocumentLoaded"|"OutstandingNetworkRequestOthers"|"RequestedMIDIPermission"|"RequestedAudioCapturePermission"|"RequestedVideoCapturePermission"|"RequestedBackForwardCacheBlockedSensors"|"RequestedBackgroundWorkPermission"|"BroadcastChannel"|"WebXR"|"SharedWorker"|"WebLocks"|"WebHID"|"WebShare"|"RequestedStorageAccessGrant"|"WebNfc"|"OutstandingNetworkRequestFetch"|"OutstandingNetworkRequestXHR"|"AppBanner"|"Printing"|"WebDatabase"|"PictureInPicture"|"SpeechRecognizer"|"IdleManager"|"PaymentManager"|"SpeechSynthesis"|"KeyboardLock"|"WebOTPService"|"OutstandingNetworkRequestDirectSocket"|"InjectedJavascript"|"InjectedStyleSheet"|"KeepaliveRequest"|"IndexedDBEvent"|"Dummy"|"JsNetworkRequestReceivedCacheControlNoStoreResource"|"WebRTCSticky"|"WebTransportSticky"|"WebSocketSticky"|"SmartCard"|"LiveMediaStreamTrack"|"UnloadHandler"|"ParserAborted"|"ContentSecurityHandler"|"ContentWebAuthenticationAPI"|"ContentFileChooser"|"ContentSerial"|"ContentFileSystemAccess"|"ContentMediaDevicesDispatcherHost"|"ContentWebBluetooth"|"ContentWebUSB"|"ContentMediaSessionService"|"ContentScreenReader"|"EmbedderPopupBlockerTabHelper"|"EmbedderSafeBrowsingTriggeredPopupBlocker"|"EmbedderSafeBrowsingThreatDetails"|"EmbedderAppBannerManager"|"EmbedderDomDistillerViewerSource"|"EmbedderDomDistillerSelfDeletingRequestDelegate"|"EmbedderOomInterventionTabHelper"|"EmbedderOfflinePage"|"EmbedderChromePasswordManagerClientBindCredentialManager"|"EmbedderPermissionRequestManager"|"EmbedderModalDialog"|"EmbedderExtensions"|"EmbedderExtensionMessaging"|"EmbedderExtensionMessagingForOpenPort"|"EmbedderExtensionSentMessageToCachedFrame"|"RequestedByWebViewClient";
+    export type BackForwardCacheNotRestoredReason = "NotPrimaryMainFrame"|"BackForwardCacheDisabled"|"RelatedActiveContentsExist"|"HTTPStatusNotOK"|"SchemeNotHTTPOrHTTPS"|"Loading"|"WasGrantedMediaAccess"|"DisableForRenderFrameHostCalled"|"DomainNotAllowed"|"HTTPMethodNotGET"|"SubframeIsNavigating"|"Timeout"|"CacheLimit"|"JavaScriptExecution"|"RendererProcessKilled"|"RendererProcessCrashed"|"SchedulerTrackedFeatureUsed"|"ConflictingBrowsingInstance"|"CacheFlushed"|"ServiceWorkerVersionActivation"|"SessionRestored"|"ServiceWorkerPostMessage"|"EnteredBackForwardCacheBeforeServiceWorkerHostAdded"|"RenderFrameHostReused_SameSite"|"RenderFrameHostReused_CrossSite"|"ServiceWorkerClaim"|"IgnoreEventAndEvict"|"HaveInnerContents"|"TimeoutPuttingInCache"|"BackForwardCacheDisabledByLowMemory"|"BackForwardCacheDisabledByCommandLine"|"NetworkRequestDatapipeDrainedAsBytesConsumer"|"NetworkRequestRedirected"|"NetworkRequestTimeout"|"NetworkExceedsBufferLimit"|"NavigationCancelledWhileRestoring"|"NotMostRecentNavigationEntry"|"BackForwardCacheDisabledForPrerender"|"UserAgentOverrideDiffers"|"ForegroundCacheLimit"|"BrowsingInstanceNotSwapped"|"BackForwardCacheDisabledForDelegate"|"UnloadHandlerExistsInMainFrame"|"UnloadHandlerExistsInSubFrame"|"ServiceWorkerUnregistration"|"CacheControlNoStore"|"CacheControlNoStoreCookieModified"|"CacheControlNoStoreHTTPOnlyCookieModified"|"NoResponseHead"|"Unknown"|"ActivationNavigationsDisallowedForBug1234857"|"ErrorDocument"|"FencedFramesEmbedder"|"CookieDisabled"|"HTTPAuthRequired"|"CookieFlushed"|"BroadcastChannelOnMessage"|"WebViewSettingsChanged"|"WebViewJavaScriptObjectChanged"|"WebViewMessageListenerInjected"|"WebViewSafeBrowsingAllowlistChanged"|"WebViewDocumentStartJavascriptChanged"|"WebSocket"|"WebTransport"|"WebRTC"|"MainResourceHasCacheControlNoStore"|"MainResourceHasCacheControlNoCache"|"SubresourceHasCacheControlNoStore"|"SubresourceHasCacheControlNoCache"|"ContainsPlugins"|"DocumentLoaded"|"OutstandingNetworkRequestOthers"|"RequestedMIDIPermission"|"RequestedAudioCapturePermission"|"RequestedVideoCapturePermission"|"RequestedBackForwardCacheBlockedSensors"|"RequestedBackgroundWorkPermission"|"BroadcastChannel"|"WebXR"|"SharedWorker"|"SharedWorkerMessage"|"WebLocks"|"WebHID"|"WebShare"|"RequestedStorageAccessGrant"|"WebNfc"|"OutstandingNetworkRequestFetch"|"OutstandingNetworkRequestXHR"|"AppBanner"|"Printing"|"WebDatabase"|"PictureInPicture"|"SpeechRecognizer"|"IdleManager"|"PaymentManager"|"SpeechSynthesis"|"KeyboardLock"|"WebOTPService"|"OutstandingNetworkRequestDirectSocket"|"InjectedJavascript"|"InjectedStyleSheet"|"KeepaliveRequest"|"IndexedDBEvent"|"Dummy"|"JsNetworkRequestReceivedCacheControlNoStoreResource"|"WebRTCSticky"|"WebTransportSticky"|"WebSocketSticky"|"SmartCard"|"LiveMediaStreamTrack"|"UnloadHandler"|"ParserAborted"|"ContentSecurityHandler"|"ContentWebAuthenticationAPI"|"ContentFileChooser"|"ContentSerial"|"ContentFileSystemAccess"|"ContentMediaDevicesDispatcherHost"|"ContentWebBluetooth"|"ContentWebUSB"|"ContentMediaSessionService"|"ContentScreenReader"|"ContentDiscarded"|"EmbedderPopupBlockerTabHelper"|"EmbedderSafeBrowsingTriggeredPopupBlocker"|"EmbedderSafeBrowsingThreatDetails"|"EmbedderAppBannerManager"|"EmbedderDomDistillerViewerSource"|"EmbedderDomDistillerSelfDeletingRequestDelegate"|"EmbedderOomInterventionTabHelper"|"EmbedderOfflinePage"|"EmbedderChromePasswordManagerClientBindCredentialManager"|"EmbedderPermissionRequestManager"|"EmbedderModalDialog"|"EmbedderExtensions"|"EmbedderExtensionMessaging"|"EmbedderExtensionMessagingForOpenPort"|"EmbedderExtensionSentMessageToCachedFrame"|"RequestedByWebViewClient"|"PostMessageByWebViewClient"|"CacheControlNoStoreDeviceBoundSessionTerminated"|"CacheLimitPrunedOnModerateMemoryPressure"|"CacheLimitPrunedOnCriticalMemoryPressure";
     /**
      * Types of not restored reasons for back-forward cache.
      */
@@ -12068,6 +12902,16 @@ dependent on the reason:
       frameId: FrameId;
       reason: "remove"|"swap";
     }
+    /**
+     * Fired before frame subtree is detached. Emitted before any frame of the
+subtree is actually detached.
+     */
+    export type frameSubtreeWillBeDetachedPayload = {
+      /**
+       * Id of the frame that is the root of the subtree that will be detached.
+       */
+      frameId: FrameId;
+    }
     /**
      * Fired once navigation of the frame has completed. Frame is now associated with the new loader.
      */
@@ -12088,6 +12932,33 @@ dependent on the reason:
       frame: Frame;
     }
     export type frameResizedPayload = void;
+    /**
+     * Fired when a navigation starts. This event is fired for both
+renderer-initiated and browser-initiated navigations. For renderer-initiated
+navigations, the event is fired after `frameRequestedNavigation`.
+Navigation may still be cancelled after the event is issued. Multiple events
+can be fired for a single navigation, for example, when a same-document
+navigation becomes a cross-document navigation (such as in the case of a
+frameset).
+     */
+    export type frameStartedNavigatingPayload = {
+      /**
+       * ID of the frame that is being navigated.
+       */
+      frameId: FrameId;
+      /**
+       * The URL the navigation started with. The final URL can be different.
+       */
+      url: string;
+      /**
+       * Loader identifier. Even though it is present in case of same-document
+navigation, the previously committed loaderId would not change unless
+the navigation changes from a same-document to a cross-document
+navigation.
+       */
+      loaderId: Network.LoaderId;
+      navigationType: "reload"|"reloadBypassingCache"|"restore"|"restoreWithPost"|"historySameDocument"|"historyDifferentDocument"|"sameDocument"|"differentDocument";
+    }
     /**
      * Fired when a renderer-initiated navigation is requested.
 Navigation may still be cancelled after the event is issued.
@@ -12207,6 +13078,10 @@ Deprecated. Use Browser.downloadProgress instead.
 closed.
      */
     export type javascriptDialogClosedPayload = {
+      /**
+       * Frame id.
+       */
+      frameId: FrameId;
       /**
        * Whether dialog was confirmed.
        */
@@ -12225,6 +13100,10 @@ open.
        * Frame url.
        */
       url: string;
+      /**
+       * Frame id.
+       */
+      frameId: FrameId;
       /**
        * Message that will be displayed by the dialog.
        */
@@ -12245,7 +13124,8 @@ the page execution. Execution can be resumed via calling Page.handleJavaScriptDi
       defaultPrompt?: string;
     }
     /**
-     * Fired for top level page lifecycle events such as navigation, load, paint, etc.
+     * Fired for lifecycle events (navigation, load, paint, etc) in the current
+target (including local frames).
      */
     export type lifecycleEventPayload = {
       /**
@@ -12298,6 +13178,10 @@ when bfcache navigation fails.
        * Frame's new url.
        */
       url: string;
+      /**
+       * Navigation type
+       */
+      navigationType: "fragment"|"historyApi"|"other";
     }
     /**
      * Compressed image data requested by the `startScreencast`.
@@ -12348,8 +13232,7 @@ etc.
       userGesture: boolean;
     }
     /**
-     * Issued for every compilation cache generated. Is only available
-if Page.setGenerateCompilationCache is enabled.
+     * Issued for every compilation cache generated.
      */
     export type compilationCacheProducedPayload = {
       url: string;
@@ -12528,6 +13411,11 @@ option, use with caution.
      * Enables page domain notifications.
      */
     export type enableParameters = {
+      /**
+       * If true, the `Page.fileChooserOpened` event will be emitted regardless of the state set by
+`Page.setInterceptFileChooserDialog` command (default: false).
+       */
+      enableFileChooserOpenedEvent?: boolean;
     }
     export type enableReturnValue = {
     }
@@ -12586,15 +13474,18 @@ Only returns values if the feature flag 'WebAppEnableManifestId' is enabled
        */
       recommendedId?: string;
     }
-    export type getAdScriptIdParameters = {
+    export type getAdScriptAncestryParameters = {
       frameId: FrameId;
     }
-    export type getAdScriptIdReturnValue = {
+    export type getAdScriptAncestryReturnValue = {
       /**
-       * Identifies the bottom-most script which caused the frame to be labelled
-as an ad. Only sent if frame is labelled as an ad and id is available.
+       * The ancestry chain of ad script identifiers leading to this frame's
+creation, along with the root script's filterlist rule. The ancestry
+chain is ordered from the most immediate script (in the frame creation
+stack) to more distant ancestors (that created the immediately preceding
+script). Only sent if frame is labelled as an ad and ids are available.
        */
-      adScriptId?: AdScriptId;
+      adScriptAncestry?: AdScriptAncestry;
     }
     /**
      * Returns present frame tree structure.
@@ -12749,6 +13640,10 @@ as the previously committed loaderId would not change.
        * User friendly error message, present if and only if navigation has failed.
        */
       errorText?: string;
+      /**
+       * Whether the navigation resulted in a download.
+       */
+      isDownload?: boolean;
     }
     /**
      * Navigates current page to the given history entry.
@@ -13266,7 +14161,7 @@ cross-process navigation.
 https://w3c.github.io/secure-payment-confirmation/#sctn-automation-set-spc-transaction-mode
      */
     export type setSPCTransactionModeParameters = {
-      mode: AutoResponseMode;
+      mode: "none"|"autoAccept"|"autoChooseToAuthAnotherWay"|"autoReject"|"autoOptOut";
     }
     export type setSPCTransactionModeReturnValue = {
     }
@@ -13275,7 +14170,7 @@ https://w3c.github.io/secure-payment-confirmation/#sctn-automation-set-spc-trans
 https://html.spec.whatwg.org/multipage/system-state.html#rph-automation
      */
     export type setRPHRegistrationModeParameters = {
-      mode: AutoResponseMode;
+      mode: "none"|"autoAccept"|"autoReject";
     }
     export type setRPHRegistrationModeReturnValue = {
     }
@@ -13308,6 +14203,12 @@ Instead, a protocol event `Page.fileChooserOpened` is emitted.
      */
     export type setInterceptFileChooserDialogParameters = {
       enabled: boolean;
+      /**
+       * If true, cancels the dialog by emitting relevant events (if any)
+in addition to not showing it if the interception is enabled
+(default: false).
+       */
+      cancel?: boolean;
     }
     export type setInterceptFileChooserDialogReturnValue = {
     }
@@ -13887,11 +14788,6 @@ For cached script it is the last time the cache entry was validated.
     }
     export type enableReturnValue = {
     }
-    export type inspectWorkerParameters = {
-      versionId: string;
-    }
-    export type inspectWorkerReturnValue = {
-    }
     export type setForceUpdateOnPageLoadParameters = {
       forceUpdateOnPageLoad: boolean;
     }
@@ -13933,7 +14829,7 @@ For cached script it is the last time the cache entry was validated.
     /**
      * Enum of possible storage types.
      */
-    export type StorageType = "appcache"|"cookies"|"file_systems"|"indexeddb"|"local_storage"|"shader_cache"|"websql"|"service_workers"|"cache_storage"|"interest_groups"|"shared_storage"|"storage_buckets"|"all"|"other";
+    export type StorageType = "cookies"|"file_systems"|"indexeddb"|"local_storage"|"shader_cache"|"websql"|"service_workers"|"cache_storage"|"interest_groups"|"shared_storage"|"storage_buckets"|"all"|"other";
     /**
      * Usage for a storage type.
      */
@@ -13972,9 +14868,13 @@ Tokens from that issuer.
      */
     export type InterestGroupAuctionFetchType = "bidderJs"|"bidderWasm"|"sellerJs"|"bidderTrustedSignals"|"sellerTrustedSignals";
     /**
-     * Enum of shared storage access types.
+     * Enum of shared storage access scopes.
      */
-    export type SharedStorageAccessType = "documentAddModule"|"documentSelectURL"|"documentRun"|"documentSet"|"documentAppend"|"documentDelete"|"documentClear"|"documentGet"|"workletSet"|"workletAppend"|"workletDelete"|"workletClear"|"workletGet"|"workletKeys"|"workletEntries"|"workletLength"|"workletRemainingBudget"|"headerSet"|"headerAppend"|"headerDelete"|"headerClear";
+    export type SharedStorageAccessScope = "window"|"sharedStorageWorklet"|"protectedAudienceWorklet"|"header";
+    /**
+     * Enum of shared storage access methods.
+     */
+    export type SharedStorageAccessMethod = "addModule"|"createWorklet"|"selectURL"|"run"|"batchUpdate"|"set"|"append"|"delete"|"clear"|"get"|"keys"|"values"|"entries"|"length"|"remainingBudget";
     /**
      * Struct for a single key-value pair in an origin's shared storage.
      */
@@ -14004,6 +14904,28 @@ storage.
        */
       bytesUsed: number;
     }
+    /**
+     * Represents a dictionary object passed in as privateAggregationConfig to
+run or selectURL.
+     */
+    export interface SharedStoragePrivateAggregationConfig {
+      /**
+       * The chosen aggregation service deployment.
+       */
+      aggregationCoordinatorOrigin?: string;
+      /**
+       * The context ID provided.
+       */
+      contextId?: string;
+      /**
+       * Configures the maximum size allowed for filtering IDs.
+       */
+      filteringIdMaxBytes: number;
+      /**
+       * The limit on the number of contributions in the final report.
+       */
+      maxContributions?: number;
+    }
     /**
      * Pair of reporting metadata details for a candidate URL for `selectURL()`.
      */
@@ -14031,57 +14953,102 @@ presence/absence can vary according to SharedStorageAccessType.
     export interface SharedStorageAccessParams {
       /**
        * Spec of the module script URL.
-Present only for SharedStorageAccessType.documentAddModule.
+Present only for SharedStorageAccessMethods: addModule and
+createWorklet.
        */
       scriptSourceUrl?: string;
+      /**
+       * String denoting "context-origin", "script-origin", or a custom
+origin to be used as the worklet's data origin.
+Present only for SharedStorageAccessMethod: createWorklet.
+       */
+      dataOrigin?: string;
       /**
        * Name of the registered operation to be run.
-Present only for SharedStorageAccessType.documentRun and
-SharedStorageAccessType.documentSelectURL.
+Present only for SharedStorageAccessMethods: run and selectURL.
        */
       operationName?: string;
+      /**
+       * ID of the operation call.
+Present only for SharedStorageAccessMethods: run and selectURL.
+       */
+      operationId?: string;
+      /**
+       * Whether or not to keep the worket alive for future run or selectURL
+calls.
+Present only for SharedStorageAccessMethods: run and selectURL.
+       */
+      keepAlive?: boolean;
+      /**
+       * Configures the private aggregation options.
+Present only for SharedStorageAccessMethods: run and selectURL.
+       */
+      privateAggregationConfig?: SharedStoragePrivateAggregationConfig;
       /**
        * The operation's serialized data in bytes (converted to a string).
-Present only for SharedStorageAccessType.documentRun and
-SharedStorageAccessType.documentSelectURL.
+Present only for SharedStorageAccessMethods: run and selectURL.
+TODO(crbug.com/401011862): Consider updating this parameter to binary.
        */
       serializedData?: string;
       /**
        * Array of candidate URLs' specs, along with any associated metadata.
-Present only for SharedStorageAccessType.documentSelectURL.
+Present only for SharedStorageAccessMethod: selectURL.
        */
       urlsWithMetadata?: SharedStorageUrlWithMetadata[];
+      /**
+       * Spec of the URN:UUID generated for a selectURL call.
+Present only for SharedStorageAccessMethod: selectURL.
+       */
+      urnUuid?: string;
       /**
        * Key for a specific entry in an origin's shared storage.
-Present only for SharedStorageAccessType.documentSet,
-SharedStorageAccessType.documentAppend,
-SharedStorageAccessType.documentDelete,
-SharedStorageAccessType.workletSet,
-SharedStorageAccessType.workletAppend,
-SharedStorageAccessType.workletDelete,
-SharedStorageAccessType.workletGet,
-SharedStorageAccessType.headerSet,
-SharedStorageAccessType.headerAppend, and
-SharedStorageAccessType.headerDelete.
+Present only for SharedStorageAccessMethods: set, append, delete, and
+get.
        */
       key?: string;
       /**
        * Value for a specific entry in an origin's shared storage.
-Present only for SharedStorageAccessType.documentSet,
-SharedStorageAccessType.documentAppend,
-SharedStorageAccessType.workletSet,
-SharedStorageAccessType.workletAppend,
-SharedStorageAccessType.headerSet, and
-SharedStorageAccessType.headerAppend.
+Present only for SharedStorageAccessMethods: set and append.
        */
       value?: string;
       /**
        * Whether or not to set an entry for a key if that key is already present.
-Present only for SharedStorageAccessType.documentSet,
-SharedStorageAccessType.workletSet, and
-SharedStorageAccessType.headerSet.
+Present only for SharedStorageAccessMethod: set.
        */
       ignoreIfPresent?: boolean;
+      /**
+       * A number denoting the (0-based) order of the worklet's
+creation relative to all other shared storage worklets created by
+documents using the current storage partition.
+Present only for SharedStorageAccessMethods: addModule, createWorklet.
+       */
+      workletOrdinal?: number;
+      /**
+       * Hex representation of the DevTools token used as the TargetID for the
+associated shared storage worklet.
+Present only for SharedStorageAccessMethods: addModule, createWorklet,
+run, selectURL, and any other SharedStorageAccessMethod when the
+SharedStorageAccessScope is sharedStorageWorklet.
+       */
+      workletTargetId?: Target.TargetID;
+      /**
+       * Name of the lock to be acquired, if present.
+Optionally present only for SharedStorageAccessMethods: batchUpdate,
+set, append, delete, and clear.
+       */
+      withLock?: string;
+      /**
+       * If the method has been called as part of a batchUpdate, then this
+number identifies the batch to which it belongs.
+Optionally present only for SharedStorageAccessMethods:
+batchUpdate (required), set, append, delete, and clear.
+       */
+      batchUpdateId?: string;
+      /**
+       * Number of modifier methods sent in batch.
+Present only for SharedStorageAccessMethod: batchUpdate.
+       */
+      batchSize?: number;
     }
     export type StorageBucketsDurability = "relaxed"|"strict";
     export interface StorageBucket {
@@ -14135,14 +15102,6 @@ SharedStorageAccessType.headerSet.
        */
       ends: number[];
     }
-    export interface AttributionReportingTriggerSpec {
-      /**
-       * number instead of integer because not all uint32 can be represented by
-int
-       */
-      triggerData: number[];
-      eventReportWindows: AttributionReportingEventReportWindows;
-    }
     export type AttributionReportingTriggerDataMatching = "exact"|"modulus";
     export interface AttributionReportingAggregatableDebugReportingData {
       keyPiece: UnsignedInt128AsBase16;
@@ -14163,13 +15122,31 @@ int, only present for source registrations
       debugData: AttributionReportingAggregatableDebugReportingData[];
       aggregationCoordinatorOrigin?: string;
     }
+    export interface AttributionScopesData {
+      values: string[];
+      /**
+       * number instead of integer because not all uint32 can be represented by
+int
+       */
+      limit: number;
+      maxEventStates: number;
+    }
+    export interface AttributionReportingNamedBudgetDef {
+      name: string;
+      budget: number;
+    }
     export interface AttributionReportingSourceRegistration {
       time: Network.TimeSinceEpoch;
       /**
        * duration in seconds
        */
       expiry: number;
-      triggerSpecs: AttributionReportingTriggerSpec[];
+      /**
+       * number instead of integer because not all uint32 can be represented by
+int
+       */
+      triggerData: number[];
+      eventReportWindows: AttributionReportingEventReportWindows;
       /**
        * duration in seconds
        */
@@ -14186,8 +15163,13 @@ int, only present for source registrations
       triggerDataMatching: AttributionReportingTriggerDataMatching;
       destinationLimitPriority: SignedInt64AsBase10;
       aggregatableDebugReportingConfig: AttributionReportingAggregatableDebugReportingConfig;
+      scopesData?: AttributionScopesData;
+      maxEventLevelReports: number;
+      namedBudgets: AttributionReportingNamedBudgetDef[];
+      debugReporting: boolean;
+      eventLevelEpsilon: number;
     }
-    export type AttributionReportingSourceRegistrationResult = "success"|"internalError"|"insufficientSourceCapacity"|"insufficientUniqueDestinationCapacity"|"excessiveReportingOrigins"|"prohibitedByBrowserPolicy"|"successNoised"|"destinationReportingLimitReached"|"destinationGlobalLimitReached"|"destinationBothLimitsReached"|"reportingOriginsPerSiteLimitReached"|"exceedsMaxChannelCapacity"|"exceedsMaxTriggerStateCardinality"|"destinationPerDayReportingLimitReached";
+    export type AttributionReportingSourceRegistrationResult = "success"|"internalError"|"insufficientSourceCapacity"|"insufficientUniqueDestinationCapacity"|"excessiveReportingOrigins"|"prohibitedByBrowserPolicy"|"successNoised"|"destinationReportingLimitReached"|"destinationGlobalLimitReached"|"destinationBothLimitsReached"|"reportingOriginsPerSiteLimitReached"|"exceedsMaxChannelCapacity"|"exceedsMaxScopesChannelCapacity"|"exceedsMaxTriggerStateCardinality"|"exceedsMaxEventStatesLimit"|"destinationPerDayReportingLimitReached";
     export type AttributionReportingSourceRegistrationTimeConfig = "include"|"exclude";
     export interface AttributionReportingAggregatableValueDictEntry {
       key: string;
@@ -14217,6 +15199,10 @@ int
       dedupKey?: UnsignedInt64AsBase10;
       filters: AttributionReportingFilterPair;
     }
+    export interface AttributionReportingNamedBudgetCandidate {
+      name?: string;
+      filters: AttributionReportingFilterPair;
+    }
     export interface AttributionReportingTriggerRegistration {
       filters: AttributionReportingFilterPair;
       debugKey?: UnsignedInt64AsBase10;
@@ -14230,9 +15216,12 @@ int
       sourceRegistrationTimeConfig: AttributionReportingSourceRegistrationTimeConfig;
       triggerContextId?: string;
       aggregatableDebugReportingConfig: AttributionReportingAggregatableDebugReportingConfig;
+      scopes: string[];
+      namedBudgets: AttributionReportingNamedBudgetCandidate[];
     }
     export type AttributionReportingEventLevelResult = "success"|"successDroppedLowerPriority"|"internalError"|"noCapacityForAttributionDestination"|"noMatchingSources"|"deduplicated"|"excessiveAttributions"|"priorityTooLow"|"neverAttributedSource"|"excessiveReportingOrigins"|"noMatchingSourceFilterData"|"prohibitedByBrowserPolicy"|"noMatchingConfigurations"|"excessiveReports"|"falselyAttributedSource"|"reportWindowPassed"|"notRegistered"|"reportWindowNotStarted"|"noMatchingTriggerData";
-    export type AttributionReportingAggregatableResult = "success"|"internalError"|"noCapacityForAttributionDestination"|"noMatchingSources"|"excessiveAttributions"|"excessiveReportingOrigins"|"noHistograms"|"insufficientBudget"|"noMatchingSourceFilterData"|"notRegistered"|"prohibitedByBrowserPolicy"|"deduplicated"|"reportWindowPassed"|"excessiveReports";
+    export type AttributionReportingAggregatableResult = "success"|"internalError"|"noCapacityForAttributionDestination"|"noMatchingSources"|"excessiveAttributions"|"excessiveReportingOrigins"|"noHistograms"|"insufficientBudget"|"insufficientNamedBudget"|"noMatchingSourceFilterData"|"notRegistered"|"prohibitedByBrowserPolicy"|"deduplicated"|"reportWindowPassed"|"excessiveReports";
+    export type AttributionReportingReportResult = "sent"|"prohibited"|"failedToAssemble"|"expired";
     /**
      * A single Related Website Set object.
      */
@@ -14386,34 +15375,78 @@ loadingFailed).
 request.  In the case of trusted signals, it's possible that only some of
 them actually care about the keys being queried.
        */
-      auctions: InterestGroupAuctionId[];
+      auctions: InterestGroupAuctionId[];
+    }
+    /**
+     * Shared storage was accessed by the associated page.
+The following parameters are included in all events.
+     */
+    export type sharedStorageAccessedPayload = {
+      /**
+       * Time of the access.
+       */
+      accessTime: Network.TimeSinceEpoch;
+      /**
+       * Enum value indicating the access scope.
+       */
+      scope: SharedStorageAccessScope;
+      /**
+       * Enum value indicating the Shared Storage API method invoked.
+       */
+      method: SharedStorageAccessMethod;
+      /**
+       * DevTools Frame Token for the primary frame tree's root.
+       */
+      mainFrameId: Page.FrameId;
+      /**
+       * Serialization of the origin owning the Shared Storage data.
+       */
+      ownerOrigin: string;
+      /**
+       * Serialization of the site owning the Shared Storage data.
+       */
+      ownerSite: string;
+      /**
+       * The sub-parameters wrapped by `params` are all optional and their
+presence/absence depends on `type`.
+       */
+      params: SharedStorageAccessParams;
     }
     /**
-     * Shared storage was accessed by the associated page.
+     * A shared storage run or selectURL operation finished its execution.
 The following parameters are included in all events.
      */
-    export type sharedStorageAccessedPayload = {
+    export type sharedStorageWorkletOperationExecutionFinishedPayload = {
       /**
-       * Time of the access.
+       * Time that the operation finished.
        */
-      accessTime: Network.TimeSinceEpoch;
+      finishedTime: Network.TimeSinceEpoch;
+      /**
+       * Time, in microseconds, from start of shared storage JS API call until
+end of operation execution in the worklet.
+       */
+      executionTime: number;
       /**
        * Enum value indicating the Shared Storage API method invoked.
        */
-      type: SharedStorageAccessType;
+      method: SharedStorageAccessMethod;
+      /**
+       * ID of the operation call.
+       */
+      operationId: string;
+      /**
+       * Hex representation of the DevTools token used as the TargetID for the
+associated shared storage worklet.
+       */
+      workletTargetId: Target.TargetID;
       /**
        * DevTools Frame Token for the primary frame tree's root.
        */
       mainFrameId: Page.FrameId;
       /**
-       * Serialized origin for the context that invoked the Shared Storage API.
+       * Serialization of the origin owning the Shared Storage data.
        */
       ownerOrigin: string;
-      /**
-       * The sub-parameters wrapped by `params` are all optional and their
-presence/absence depends on `type`.
-       */
-      params: SharedStorageAccessParams;
     }
     export type storageBucketCreatedOrUpdatedPayload = {
       bucketInfo: StorageBucketInfo;
@@ -14430,6 +15463,24 @@ presence/absence depends on `type`.
       eventLevel: AttributionReportingEventLevelResult;
       aggregatable: AttributionReportingAggregatableResult;
     }
+    export type attributionReportingReportSentPayload = {
+      url: string;
+      body: { [key: string]: string };
+      result: AttributionReportingReportResult;
+      /**
+       * If result is `sent`, populated with net/HTTP status.
+       */
+      netError?: number;
+      netErrorName?: string;
+      httpStatusCode?: number;
+    }
+    export type attributionReportingVerboseDebugReportSentPayload = {
+      url: string;
+      body?: { [key: string]: string }[];
+      netError?: number;
+      netErrorName?: string;
+      httpStatusCode?: number;
+    }
     
     /**
      * Returns a storage key given a frame id.
@@ -14833,6 +15884,35 @@ session. The effective Related Website Sets will not change during a browser ses
     export type getRelatedWebsiteSetsReturnValue = {
       sets: RelatedWebsiteSet[];
     }
+    /**
+     * Returns the list of URLs from a page and its embedded resources that match
+existing grace period URL pattern rules.
+https://developers.google.com/privacy-sandbox/cookies/temporary-exceptions/grace-period
+     */
+    export type getAffectedUrlsForThirdPartyCookieMetadataParameters = {
+      /**
+       * The URL of the page currently being visited.
+       */
+      firstPartyUrl: string;
+      /**
+       * The list of embedded resource URLs from the page.
+       */
+      thirdPartyUrls: string[];
+    }
+    export type getAffectedUrlsForThirdPartyCookieMetadataReturnValue = {
+      /**
+       * Array of matching URLs. If there is a primary pattern match for the first-
+party URL, only the first-party URL is returned in the array.
+       */
+      matchedUrls: string[];
+    }
+    export type setProtectedAudienceKAnonymityParameters = {
+      owner: string;
+      name: string;
+      hashes: binary[];
+    }
+    export type setProtectedAudienceKAnonymityReturnValue = {
+    }
   }
   
   /**
@@ -15125,6 +16205,10 @@ If filter is not specified, the one assumed is
       host: string;
       port: number;
     }
+    /**
+     * The state of the target window.
+     */
+    export type WindowState = "normal"|"minimized"|"maximized"|"fullscreen";
     
     /**
      * Issued when attached to target because of auto-attach or `attachToTarget` command.
@@ -15265,6 +16349,10 @@ The object has the following API:
        * Binding name, 'cdp' if not specified.
        */
       bindingName?: string;
+      /**
+       * If true, inherits the current root session's permissions (default: false).
+       */
+      inheritPermissions?: boolean;
     }
     export type exposeDevToolsProtocolReturnValue = {
     }
@@ -15317,35 +16405,54 @@ Parts of the URL other than those constituting origin are ignored.
        */
       url: string;
       /**
-       * Frame width in DIP (headless chrome only).
+       * Frame left origin in DIP (requires newWindow to be true or headless shell).
+       */
+      left?: number;
+      /**
+       * Frame top origin in DIP (requires newWindow to be true or headless shell).
+       */
+      top?: number;
+      /**
+       * Frame width in DIP (requires newWindow to be true or headless shell).
        */
       width?: number;
       /**
-       * Frame height in DIP (headless chrome only).
+       * Frame height in DIP (requires newWindow to be true or headless shell).
        */
       height?: number;
+      /**
+       * Frame window state (requires newWindow to be true or headless shell).
+Default is normal.
+       */
+      windowState?: WindowState;
       /**
        * The browser context to create the page in.
        */
       browserContextId?: Browser.BrowserContextID;
       /**
-       * Whether BeginFrames for this target will be controlled via DevTools (headless chrome only,
+       * Whether BeginFrames for this target will be controlled via DevTools (headless shell only,
 not supported on MacOS yet, false by default).
        */
       enableBeginFrameControl?: boolean;
       /**
-       * Whether to create a new Window or Tab (chrome-only, false by default).
+       * Whether to create a new Window or Tab (false by default, not supported by headless shell).
        */
       newWindow?: boolean;
       /**
-       * Whether to create the target in background or foreground (chrome-only,
-false by default).
+       * Whether to create the target in background or foreground (false by default, not supported
+by headless shell).
        */
       background?: boolean;
       /**
        * Whether to create the target of type "tab".
        */
       forTab?: boolean;
+      /**
+       * Whether to create a hidden target. The hidden target is observable via protocol, but not
+present in the tab UI strip. Cannot be created with `forTab: true`, `newWindow: true` or
+`background: false`. The life-time of the tab is limited to the life-time of the session.
+       */
+      hidden?: boolean;
     }
     export type createTargetReturnValue = {
       /**
@@ -15422,11 +16529,14 @@ and crbug.com/991325.
     export type sendMessageToTargetReturnValue = {
     }
     /**
-     * Controls whether to automatically attach to new targets which are considered to be related to
-this one. When turned on, attaches to all existing related targets as well. When turned off,
+     * Controls whether to automatically attach to new targets which are considered
+to be directly related to this one (for example, iframes or workers).
+When turned on, attaches to all existing related targets as well. When turned off,
 automatically detaches from all currently attached targets.
 This also clears all targets added by `autoAttachRelated` from the list of targets to watch
 for creation of related targets.
+You might want to call this recursively for auto-attached targets to attach
+to all available targets.
      */
     export type setAutoAttachParameters = {
       /**
@@ -15501,6 +16611,21 @@ to run paused targets.
     }
     export type setRemoteLocationsReturnValue = {
     }
+    /**
+     * Opens a DevTools window for the target.
+     */
+    export type openDevToolsParameters = {
+      /**
+       * This can be the page or tab target ID.
+       */
+      targetId: TargetID;
+    }
+    export type openDevToolsReturnValue = {
+      /**
+       * The targetId of DevTools page target.
+       */
+      targetId: TargetID;
+    }
   }
   
   /**
@@ -15553,7 +16678,7 @@ to run paused targets.
     export type MemoryDumpConfig = { [key: string]: string };
     export interface TraceConfig {
       /**
-       * Controls how the trace buffer stores data.
+       * Controls how the trace buffer stores data. The default is `recordUntilFull`.
        */
       recordMode?: "recordUntilFull"|"recordContinuously"|"recordAsMuchAsPossible"|"echoToConsole";
       /**
@@ -15766,6 +16891,8 @@ are ignored.
   export module Fetch {
     /**
      * Unique request identifier.
+Note that this does not identify individual HTTP requests that are part of
+a network request.
      */
     export type RequestId = string;
     /**
@@ -16148,7 +17275,7 @@ https://webaudio.github.io/web-audio-api/
     /**
      * Enum of AudioContextState from the spec
      */
-    export type ContextState = "suspended"|"running"|"closed";
+    export type ContextState = "suspended"|"running"|"closed"|"interrupted";
     /**
      * Enum of AudioNode types
      */
@@ -16480,6 +17607,17 @@ flag set to this value. Defaults to the authenticator's
 defaultBackupState value.
        */
       backupState?: boolean;
+      /**
+       * The credential's user.name property. Equivalent to empty if not set.
+https://w3c.github.io/webauthn/#dom-publickeycredentialentity-name
+       */
+      userName?: string;
+      /**
+       * The credential's user.displayName property. Equivalent to empty if
+not set.
+https://w3c.github.io/webauthn/#dom-publickeycredentialuserentity-displayname
+       */
+      userDisplayName?: string;
     }
     
     /**
@@ -16489,6 +17627,22 @@ defaultBackupState value.
       authenticatorId: AuthenticatorId;
       credential: Credential;
     }
+    /**
+     * Triggered when a credential is deleted, e.g. through
+PublicKeyCredential.signalUnknownCredential().
+     */
+    export type credentialDeletedPayload = {
+      authenticatorId: AuthenticatorId;
+      credentialId: binary;
+    }
+    /**
+     * Triggered when a credential is updated, e.g. through
+PublicKeyCredential.signalCurrentUserDetails().
+     */
+    export type credentialUpdatedPayload = {
+      authenticatorId: AuthenticatorId;
+      credential: Credential;
+    }
     /**
      * Triggered when a credential is used in a webauthn assertion.
      */
@@ -16881,7 +18035,7 @@ See also:
        */
       errorMessage?: string;
     }
-    export type RuleSetErrorType = "SourceIsNotJsonObject"|"InvalidRulesSkipped";
+    export type RuleSetErrorType = "SourceIsNotJsonObject"|"InvalidRulesSkipped"|"InvalidRulesetLevelTag";
     /**
      * The type of preloading attempted. It corresponds to
 mojom::SpeculationAction (although PrefetchWithSubresources is omitted as it
@@ -16919,10 +18073,20 @@ possible for multiple rule sets and links to trigger a single attempt.
       ruleSetIds: RuleSetId[];
       nodeIds: DOM.BackendNodeId[];
     }
+    /**
+     * Chrome manages different types of preloads together using a
+concept of preloading pipeline. For example, if a site uses a
+SpeculationRules for prerender, Chrome first starts a prefetch and
+then upgrades it to prerender.
+
+CDP events for them are emitted separately but they share
+`PreloadPipelineId`.
+     */
+    export type PreloadPipelineId = string;
     /**
      * List of FinalStatus reasons for Prerender2.
      */
-    export type PrerenderFinalStatus = "Activated"|"Destroyed"|"LowEndDevice"|"InvalidSchemeRedirect"|"InvalidSchemeNavigation"|"NavigationRequestBlockedByCsp"|"MainFrameNavigation"|"MojoBinderPolicy"|"RendererProcessCrashed"|"RendererProcessKilled"|"Download"|"TriggerDestroyed"|"NavigationNotCommitted"|"NavigationBadHttpStatus"|"ClientCertRequested"|"NavigationRequestNetworkError"|"CancelAllHostsForTesting"|"DidFailLoad"|"Stop"|"SslCertificateError"|"LoginAuthRequested"|"UaChangeRequiresReload"|"BlockedByClient"|"AudioOutputDeviceRequested"|"MixedContent"|"TriggerBackgrounded"|"MemoryLimitExceeded"|"DataSaverEnabled"|"TriggerUrlHasEffectiveUrl"|"ActivatedBeforeStarted"|"InactivePageRestriction"|"StartFailed"|"TimeoutBackgrounded"|"CrossSiteRedirectInInitialNavigation"|"CrossSiteNavigationInInitialNavigation"|"SameSiteCrossOriginRedirectNotOptInInInitialNavigation"|"SameSiteCrossOriginNavigationNotOptInInInitialNavigation"|"ActivationNavigationParameterMismatch"|"ActivatedInBackground"|"EmbedderHostDisallowed"|"ActivationNavigationDestroyedBeforeSuccess"|"TabClosedByUserGesture"|"TabClosedWithoutUserGesture"|"PrimaryMainFrameRendererProcessCrashed"|"PrimaryMainFrameRendererProcessKilled"|"ActivationFramePolicyNotCompatible"|"PreloadingDisabled"|"BatterySaverEnabled"|"ActivatedDuringMainFrameNavigation"|"PreloadingUnsupportedByWebContents"|"CrossSiteRedirectInMainFrameNavigation"|"CrossSiteNavigationInMainFrameNavigation"|"SameSiteCrossOriginRedirectNotOptInInMainFrameNavigation"|"SameSiteCrossOriginNavigationNotOptInInMainFrameNavigation"|"MemoryPressureOnTrigger"|"MemoryPressureAfterTriggered"|"PrerenderingDisabledByDevTools"|"SpeculationRuleRemoved"|"ActivatedWithAuxiliaryBrowsingContexts"|"MaxNumOfRunningEagerPrerendersExceeded"|"MaxNumOfRunningNonEagerPrerendersExceeded"|"MaxNumOfRunningEmbedderPrerendersExceeded"|"PrerenderingUrlHasEffectiveUrl"|"RedirectedPrerenderingUrlHasEffectiveUrl"|"ActivationUrlHasEffectiveUrl"|"JavaScriptInterfaceAdded"|"JavaScriptInterfaceRemoved"|"AllPrerenderingCanceled"|"WindowClosed";
+    export type PrerenderFinalStatus = "Activated"|"Destroyed"|"LowEndDevice"|"InvalidSchemeRedirect"|"InvalidSchemeNavigation"|"NavigationRequestBlockedByCsp"|"MojoBinderPolicy"|"RendererProcessCrashed"|"RendererProcessKilled"|"Download"|"TriggerDestroyed"|"NavigationNotCommitted"|"NavigationBadHttpStatus"|"ClientCertRequested"|"NavigationRequestNetworkError"|"CancelAllHostsForTesting"|"DidFailLoad"|"Stop"|"SslCertificateError"|"LoginAuthRequested"|"UaChangeRequiresReload"|"BlockedByClient"|"AudioOutputDeviceRequested"|"MixedContent"|"TriggerBackgrounded"|"MemoryLimitExceeded"|"DataSaverEnabled"|"TriggerUrlHasEffectiveUrl"|"ActivatedBeforeStarted"|"InactivePageRestriction"|"StartFailed"|"TimeoutBackgrounded"|"CrossSiteRedirectInInitialNavigation"|"CrossSiteNavigationInInitialNavigation"|"SameSiteCrossOriginRedirectNotOptInInInitialNavigation"|"SameSiteCrossOriginNavigationNotOptInInInitialNavigation"|"ActivationNavigationParameterMismatch"|"ActivatedInBackground"|"EmbedderHostDisallowed"|"ActivationNavigationDestroyedBeforeSuccess"|"TabClosedByUserGesture"|"TabClosedWithoutUserGesture"|"PrimaryMainFrameRendererProcessCrashed"|"PrimaryMainFrameRendererProcessKilled"|"ActivationFramePolicyNotCompatible"|"PreloadingDisabled"|"BatterySaverEnabled"|"ActivatedDuringMainFrameNavigation"|"PreloadingUnsupportedByWebContents"|"CrossSiteRedirectInMainFrameNavigation"|"CrossSiteNavigationInMainFrameNavigation"|"SameSiteCrossOriginRedirectNotOptInInMainFrameNavigation"|"SameSiteCrossOriginNavigationNotOptInInMainFrameNavigation"|"MemoryPressureOnTrigger"|"MemoryPressureAfterTriggered"|"PrerenderingDisabledByDevTools"|"SpeculationRuleRemoved"|"ActivatedWithAuxiliaryBrowsingContexts"|"MaxNumOfRunningEagerPrerendersExceeded"|"MaxNumOfRunningNonEagerPrerendersExceeded"|"MaxNumOfRunningEmbedderPrerendersExceeded"|"PrerenderingUrlHasEffectiveUrl"|"RedirectedPrerenderingUrlHasEffectiveUrl"|"ActivationUrlHasEffectiveUrl"|"JavaScriptInterfaceAdded"|"JavaScriptInterfaceRemoved"|"AllPrerenderingCanceled"|"WindowClosed"|"SlowNetwork"|"OtherPrerenderedPageActivated"|"V8OptimizerDisabled"|"PrerenderFailedDuringPrefetch"|"BrowsingDataRemoved"|"PrerenderHostReused";
     /**
      * Preloading status values, see also PreloadingTriggeringOutcome. This
 status is shared by prefetchStatusUpdated and prerenderStatusUpdated.
@@ -16932,7 +18096,7 @@ status is shared by prefetchStatusUpdated and prerenderStatusUpdated.
      * TODO(https://crbug.com/1384419): revisit the list of PrefetchStatus and
 filter out the ones that aren't necessary to the developers.
      */
-    export type PrefetchStatus = "PrefetchAllowed"|"PrefetchFailedIneligibleRedirect"|"PrefetchFailedInvalidRedirect"|"PrefetchFailedMIMENotSupported"|"PrefetchFailedNetError"|"PrefetchFailedNon2XX"|"PrefetchFailedPerPageLimitExceeded"|"PrefetchEvictedAfterCandidateRemoved"|"PrefetchEvictedForNewerPrefetch"|"PrefetchHeldback"|"PrefetchIneligibleRetryAfter"|"PrefetchIsPrivacyDecoy"|"PrefetchIsStale"|"PrefetchNotEligibleBrowserContextOffTheRecord"|"PrefetchNotEligibleDataSaverEnabled"|"PrefetchNotEligibleExistingProxy"|"PrefetchNotEligibleHostIsNonUnique"|"PrefetchNotEligibleNonDefaultStoragePartition"|"PrefetchNotEligibleSameSiteCrossOriginPrefetchRequiredProxy"|"PrefetchNotEligibleSchemeIsNotHttps"|"PrefetchNotEligibleUserHasCookies"|"PrefetchNotEligibleUserHasServiceWorker"|"PrefetchNotEligibleBatterySaverEnabled"|"PrefetchNotEligiblePreloadingDisabled"|"PrefetchNotFinishedInTime"|"PrefetchNotStarted"|"PrefetchNotUsedCookiesChanged"|"PrefetchProxyNotAvailable"|"PrefetchResponseUsed"|"PrefetchSuccessfulButNotUsed"|"PrefetchNotUsedProbeFailed";
+    export type PrefetchStatus = "PrefetchAllowed"|"PrefetchFailedIneligibleRedirect"|"PrefetchFailedInvalidRedirect"|"PrefetchFailedMIMENotSupported"|"PrefetchFailedNetError"|"PrefetchFailedNon2XX"|"PrefetchEvictedAfterBrowsingDataRemoved"|"PrefetchEvictedAfterCandidateRemoved"|"PrefetchEvictedForNewerPrefetch"|"PrefetchHeldback"|"PrefetchIneligibleRetryAfter"|"PrefetchIsPrivacyDecoy"|"PrefetchIsStale"|"PrefetchNotEligibleBrowserContextOffTheRecord"|"PrefetchNotEligibleDataSaverEnabled"|"PrefetchNotEligibleExistingProxy"|"PrefetchNotEligibleHostIsNonUnique"|"PrefetchNotEligibleNonDefaultStoragePartition"|"PrefetchNotEligibleSameSiteCrossOriginPrefetchRequiredProxy"|"PrefetchNotEligibleSchemeIsNotHttps"|"PrefetchNotEligibleUserHasCookies"|"PrefetchNotEligibleUserHasServiceWorker"|"PrefetchNotEligibleUserHasServiceWorkerNoFetchHandler"|"PrefetchNotEligibleRedirectFromServiceWorker"|"PrefetchNotEligibleRedirectToServiceWorker"|"PrefetchNotEligibleBatterySaverEnabled"|"PrefetchNotEligiblePreloadingDisabled"|"PrefetchNotFinishedInTime"|"PrefetchNotStarted"|"PrefetchNotUsedCookiesChanged"|"PrefetchProxyNotAvailable"|"PrefetchResponseUsed"|"PrefetchSuccessfulButNotUsed"|"PrefetchNotUsedProbeFailed";
     /**
      * Information of headers to be displayed when the header mismatch occurred.
      */
@@ -16966,6 +18130,7 @@ filter out the ones that aren't necessary to the developers.
      */
     export type prefetchStatusUpdatedPayload = {
       key: PreloadingAttemptKey;
+      pipelineId: PreloadPipelineId;
       /**
        * The frame id of the frame initiating prefetch.
        */
@@ -16980,6 +18145,7 @@ filter out the ones that aren't necessary to the developers.
      */
     export type prerenderStatusUpdatedPayload = {
       key: PreloadingAttemptKey;
+      pipelineId: PreloadPipelineId;
       status: PreloadingStatus;
       prerenderStatus?: PrerenderFinalStatus;
       /**
@@ -17158,15 +18324,30 @@ https://web.dev/learn/pwa/web-app-manifest.
       fileHandlers: FileHandler[];
     }
     /**
-     * Installs the given manifest identity, optionally using the given install_url
-or IWA bundle location.
+     * Installs the given manifest identity, optionally using the given installUrlOrBundleUrl
+
+IWA-specific install description:
+manifestId corresponds to isolated-app:// + web_package::SignedWebBundleId
+
+File installation mode:
+The installUrlOrBundleUrl can be either file:// or http(s):// pointing
+to a signed web bundle (.swbn). In this case SignedWebBundleId must correspond to
+The .swbn file's signing key.
 
-TODO(crbug.com/337872319) Support IWA to meet the following specific
-requirement.
-IWA-specific install description: If the manifest_id is isolated-app://,
-install_url_or_bundle_url is required, and can be either an http(s) URL or
-file:// URL pointing to a signed web bundle (.swbn). The .swbn file's
-signing key must correspond to manifest_id. If Chrome is not in IWA dev
+Dev proxy installation mode:
+installUrlOrBundleUrl must be http(s):// that serves dev mode IWA.
+web_package::SignedWebBundleId must be of type dev proxy.
+
+The advantage of dev proxy mode is that all changes to IWA
+automatically will be reflected in the running app without
+reinstallation.
+
+To generate bundle id for proxy mode:
+1. Generate 32 random bytes.
+2. Add a specific suffix 0x00 at the end.
+3. Encode the entire sequence using Base32 without padding.
+
+If Chrome is not in IWA dev
 mode, the installation will fail, regardless of the state of the allowlist.
      */
     export type installParameters = {
@@ -17270,6 +18451,292 @@ supported yet.
     }
   }
   
+  /**
+   * This domain allows configuring virtual Bluetooth devices to test
+the web-bluetooth API.
+   */
+  export module BluetoothEmulation {
+    /**
+     * Indicates the various states of Central.
+     */
+    export type CentralState = "absent"|"powered-off"|"powered-on";
+    /**
+     * Indicates the various types of GATT event.
+     */
+    export type GATTOperationType = "connection"|"discovery";
+    /**
+     * Indicates the various types of characteristic write.
+     */
+    export type CharacteristicWriteType = "write-default-deprecated"|"write-with-response"|"write-without-response";
+    /**
+     * Indicates the various types of characteristic operation.
+     */
+    export type CharacteristicOperationType = "read"|"write"|"subscribe-to-notifications"|"unsubscribe-from-notifications";
+    /**
+     * Indicates the various types of descriptor operation.
+     */
+    export type DescriptorOperationType = "read"|"write";
+    /**
+     * Stores the manufacturer data
+     */
+    export interface ManufacturerData {
+      /**
+       * Company identifier
+https://bitbucket.org/bluetooth-SIG/public/src/main/assigned_numbers/company_identifiers/company_identifiers.yaml
+https://usb.org/developers
+       */
+      key: number;
+      /**
+       * Manufacturer-specific data
+       */
+      data: binary;
+    }
+    /**
+     * Stores the byte data of the advertisement packet sent by a Bluetooth device.
+     */
+    export interface ScanRecord {
+      name?: string;
+      uuids?: string[];
+      /**
+       * Stores the external appearance description of the device.
+       */
+      appearance?: number;
+      /**
+       * Stores the transmission power of a broadcasting device.
+       */
+      txPower?: number;
+      /**
+       * Key is the company identifier and the value is an array of bytes of
+manufacturer specific data.
+       */
+      manufacturerData?: ManufacturerData[];
+    }
+    /**
+     * Stores the advertisement packet information that is sent by a Bluetooth device.
+     */
+    export interface ScanEntry {
+      deviceAddress: string;
+      rssi: number;
+      scanRecord: ScanRecord;
+    }
+    /**
+     * Describes the properties of a characteristic. This follows Bluetooth Core
+Specification BT 4.2 Vol 3 Part G 3.3.1. Characteristic Properties.
+     */
+    export interface CharacteristicProperties {
+      broadcast?: boolean;
+      read?: boolean;
+      writeWithoutResponse?: boolean;
+      write?: boolean;
+      notify?: boolean;
+      indicate?: boolean;
+      authenticatedSignedWrites?: boolean;
+      extendedProperties?: boolean;
+    }
+    
+    /**
+     * Event for when a GATT operation of |type| to the peripheral with |address|
+happened.
+     */
+    export type gattOperationReceivedPayload = {
+      address: string;
+      type: GATTOperationType;
+    }
+    /**
+     * Event for when a characteristic operation of |type| to the characteristic
+respresented by |characteristicId| happened. |data| and |writeType| is
+expected to exist when |type| is write.
+     */
+    export type characteristicOperationReceivedPayload = {
+      characteristicId: string;
+      type: CharacteristicOperationType;
+      data?: binary;
+      writeType?: CharacteristicWriteType;
+    }
+    /**
+     * Event for when a descriptor operation of |type| to the descriptor
+respresented by |descriptorId| happened. |data| is expected to exist when
+|type| is write.
+     */
+    export type descriptorOperationReceivedPayload = {
+      descriptorId: string;
+      type: DescriptorOperationType;
+      data?: binary;
+    }
+    
+    /**
+     * Enable the BluetoothEmulation domain.
+     */
+    export type enableParameters = {
+      /**
+       * State of the simulated central.
+       */
+      state: CentralState;
+      /**
+       * If the simulated central supports low-energy.
+       */
+      leSupported: boolean;
+    }
+    export type enableReturnValue = {
+    }
+    /**
+     * Set the state of the simulated central.
+     */
+    export type setSimulatedCentralStateParameters = {
+      /**
+       * State of the simulated central.
+       */
+      state: CentralState;
+    }
+    export type setSimulatedCentralStateReturnValue = {
+    }
+    /**
+     * Disable the BluetoothEmulation domain.
+     */
+    export type disableParameters = {
+    }
+    export type disableReturnValue = {
+    }
+    /**
+     * Simulates a peripheral with |address|, |name| and |knownServiceUuids|
+that has already been connected to the system.
+     */
+    export type simulatePreconnectedPeripheralParameters = {
+      address: string;
+      name: string;
+      manufacturerData: ManufacturerData[];
+      knownServiceUuids: string[];
+    }
+    export type simulatePreconnectedPeripheralReturnValue = {
+    }
+    /**
+     * Simulates an advertisement packet described in |entry| being received by
+the central.
+     */
+    export type simulateAdvertisementParameters = {
+      entry: ScanEntry;
+    }
+    export type simulateAdvertisementReturnValue = {
+    }
+    /**
+     * Simulates the response code from the peripheral with |address| for a
+GATT operation of |type|. The |code| value follows the HCI Error Codes from
+Bluetooth Core Specification Vol 2 Part D 1.3 List Of Error Codes.
+     */
+    export type simulateGATTOperationResponseParameters = {
+      address: string;
+      type: GATTOperationType;
+      code: number;
+    }
+    export type simulateGATTOperationResponseReturnValue = {
+    }
+    /**
+     * Simulates the response from the characteristic with |characteristicId| for a
+characteristic operation of |type|. The |code| value follows the Error
+Codes from Bluetooth Core Specification Vol 3 Part F 3.4.1.1 Error Response.
+The |data| is expected to exist when simulating a successful read operation
+response.
+     */
+    export type simulateCharacteristicOperationResponseParameters = {
+      characteristicId: string;
+      type: CharacteristicOperationType;
+      code: number;
+      data?: binary;
+    }
+    export type simulateCharacteristicOperationResponseReturnValue = {
+    }
+    /**
+     * Simulates the response from the descriptor with |descriptorId| for a
+descriptor operation of |type|. The |code| value follows the Error
+Codes from Bluetooth Core Specification Vol 3 Part F 3.4.1.1 Error Response.
+The |data| is expected to exist when simulating a successful read operation
+response.
+     */
+    export type simulateDescriptorOperationResponseParameters = {
+      descriptorId: string;
+      type: DescriptorOperationType;
+      code: number;
+      data?: binary;
+    }
+    export type simulateDescriptorOperationResponseReturnValue = {
+    }
+    /**
+     * Adds a service with |serviceUuid| to the peripheral with |address|.
+     */
+    export type addServiceParameters = {
+      address: string;
+      serviceUuid: string;
+    }
+    export type addServiceReturnValue = {
+      /**
+       * An identifier that uniquely represents this service.
+       */
+      serviceId: string;
+    }
+    /**
+     * Removes the service respresented by |serviceId| from the simulated central.
+     */
+    export type removeServiceParameters = {
+      serviceId: string;
+    }
+    export type removeServiceReturnValue = {
+    }
+    /**
+     * Adds a characteristic with |characteristicUuid| and |properties| to the
+service represented by |serviceId|.
+     */
+    export type addCharacteristicParameters = {
+      serviceId: string;
+      characteristicUuid: string;
+      properties: CharacteristicProperties;
+    }
+    export type addCharacteristicReturnValue = {
+      /**
+       * An identifier that uniquely represents this characteristic.
+       */
+      characteristicId: string;
+    }
+    /**
+     * Removes the characteristic respresented by |characteristicId| from the
+simulated central.
+     */
+    export type removeCharacteristicParameters = {
+      characteristicId: string;
+    }
+    export type removeCharacteristicReturnValue = {
+    }
+    /**
+     * Adds a descriptor with |descriptorUuid| to the characteristic respresented
+by |characteristicId|.
+     */
+    export type addDescriptorParameters = {
+      characteristicId: string;
+      descriptorUuid: string;
+    }
+    export type addDescriptorReturnValue = {
+      /**
+       * An identifier that uniquely represents this descriptor.
+       */
+      descriptorId: string;
+    }
+    /**
+     * Removes the descriptor with |descriptorId| from the simulated central.
+     */
+    export type removeDescriptorParameters = {
+      descriptorId: string;
+    }
+    export type removeDescriptorReturnValue = {
+    }
+    /**
+     * Simulates a GATT disconnection from the peripheral with |address|.
+     */
+    export type simulateGATTDisconnectionParameters = {
+      address: string;
+    }
+    export type simulateGATTDisconnectionReturnValue = {
+    }
+  }
+  
   /**
    * This domain is deprecated - use Runtime or Log instead.
    */
@@ -17502,15 +18969,26 @@ variables as its properties.
       /**
        * Type of the debug symbols.
        */
-      type: "None"|"SourceMap"|"EmbeddedDWARF"|"ExternalDWARF";
+      type: "SourceMap"|"EmbeddedDWARF"|"ExternalDWARF";
       /**
        * URL of the external symbol source.
        */
       externalURL?: string;
     }
+    export interface ResolvedBreakpoint {
+      /**
+       * Breakpoint unique identifier.
+       */
+      breakpointId: BreakpointId;
+      /**
+       * Actual breakpoint location.
+       */
+      location: Location;
+    }
     
     /**
      * Fired when breakpoint is resolved to an actual script and location.
+Deprecated in favor of `resolvedBreakpoints` in the `scriptParsed` event.
      */
     export type breakpointResolvedPayload = {
       /**
@@ -17595,6 +19073,10 @@ variables as its properties.
        * Content hash of the script, SHA-256.
        */
       hash: string;
+      /**
+       * For Wasm modules, the content of the `build_id` custom section. For JavaScript the `debugId` magic comment.
+       */
+      buildId: string;
       /**
        * Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string}
        */
@@ -17669,6 +19151,10 @@ scripts upon enabling debugger.
        * Content hash of the script, SHA-256.
        */
       hash: string;
+      /**
+       * For Wasm modules, the content of the `build_id` custom section. For JavaScript the `debugId` magic comment.
+       */
+      buildId: string;
       /**
        * Embedder-specific auxiliary data likely matching {isDefault: boolean, type: 'default'|'isolated'|'worker', frameId: string}
        */
@@ -17706,13 +19192,19 @@ scripts upon enabling debugger.
        */
       scriptLanguage?: Debugger.ScriptLanguage;
       /**
-       * If the scriptLanguage is WebASsembly, the source of debug symbols for the module.
+       * If the scriptLanguage is WebAssembly, the source of debug symbols for the module.
        */
-      debugSymbols?: Debugger.DebugSymbols;
+      debugSymbols?: Debugger.DebugSymbols[];
       /**
        * The name the embedder supplied for this script.
        */
       embedderName?: string;
+      /**
+       * The list of set breakpoints in this script if calls to `setBreakpointByUrl`
+matches this script's URL or hash. Clients that use this list can ignore the
+`breakpointResolved` event. They are equivalent.
+       */
+      resolvedBreakpoints?: ResolvedBreakpoint[];
     }
     
     /**
@@ -18031,6 +19523,19 @@ call stacks (default).
     }
     export type setAsyncCallStackDepthReturnValue = {
     }
+    /**
+     * Replace previous blackbox execution contexts with passed ones. Forces backend to skip
+stepping/pausing in scripts in these execution contexts. VM will try to leave blackboxed script by
+performing 'step in' several times, finally resorting to 'step out' if unsuccessful.
+     */
+    export type setBlackboxExecutionContextsParameters = {
+      /**
+       * Array of execution context unique ids for the debugger to ignore.
+       */
+      uniqueIds: string[];
+    }
+    export type setBlackboxExecutionContextsReturnValue = {
+    }
     /**
      * Replace previous blackbox patterns with passed ones. Forces backend to skip stepping/pausing in
 scripts with url matching one of the patterns. VM will try to leave blackboxed script by
@@ -18041,6 +19546,10 @@ performing 'step in' several times, finally resorting to 'step out' if unsuccess
        * Array of regexps that will be used to check script url for blackbox state.
        */
       patterns: string[];
+      /**
+       * If true, also ignore scripts with no source url.
+       */
+      skipAnonymous?: boolean;
     }
     export type setBlackboxPatternsReturnValue = {
     }
@@ -19621,13 +21130,21 @@ It is the total usage of the corresponding isolate not scoped to a particular Ru
     }
     export type getHeapUsageReturnValue = {
       /**
-       * Used heap size in bytes.
+       * Used JavaScript heap size in bytes.
        */
       usedSize: number;
       /**
-       * Allocated heap size in bytes.
+       * Allocated JavaScript heap size in bytes.
        */
       totalSize: number;
+      /**
+       * Used size in bytes in the embedder's garbage-collected heap.
+       */
+      embedderHeapUsedSize: number;
+      /**
+       * Size in bytes of backing storage for array buffers and external strings.
+       */
+      backingStorageSize: number;
     }
     /**
      * Returns properties of a given object. Object group of the result is inherited from the target
@@ -19920,6 +21437,7 @@ Error was thrown.
     "CSS.styleSheetAdded": CSS.styleSheetAddedPayload;
     "CSS.styleSheetChanged": CSS.styleSheetChangedPayload;
     "CSS.styleSheetRemoved": CSS.styleSheetRemovedPayload;
+    "CSS.computedStyleUpdated": CSS.computedStyleUpdatedPayload;
     "Cast.sinksUpdated": Cast.sinksUpdatedPayload;
     "Cast.issueUpdated": Cast.issueUpdatedPayload;
     "DOM.attributeModified": DOM.attributeModifiedPayload;
@@ -19933,6 +21451,7 @@ Error was thrown.
     "DOM.inlineStyleInvalidated": DOM.inlineStyleInvalidatedPayload;
     "DOM.pseudoElementAdded": DOM.pseudoElementAddedPayload;
     "DOM.topLayerElementsUpdated": DOM.topLayerElementsUpdatedPayload;
+    "DOM.scrollableFlagUpdated": DOM.scrollableFlagUpdatedPayload;
     "DOM.pseudoElementRemoved": DOM.pseudoElementRemovedPayload;
     "DOM.setChildNodes": DOM.setChildNodesPayload;
     "DOM.shadowRootPopped": DOM.shadowRootPoppedPayload;
@@ -19941,7 +21460,6 @@ Error was thrown.
     "DOMStorage.domStorageItemRemoved": DOMStorage.domStorageItemRemovedPayload;
     "DOMStorage.domStorageItemUpdated": DOMStorage.domStorageItemUpdatedPayload;
     "DOMStorage.domStorageItemsCleared": DOMStorage.domStorageItemsClearedPayload;
-    "Database.addDatabase": Database.addDatabasePayload;
     "Emulation.virtualTimeBudgetExpired": Emulation.virtualTimeBudgetExpiredPayload;
     "Input.dragIntercepted": Input.dragInterceptedPayload;
     "Inspector.detached": Inspector.detachedPayload;
@@ -19970,6 +21488,18 @@ Error was thrown.
     "Network.webTransportCreated": Network.webTransportCreatedPayload;
     "Network.webTransportConnectionEstablished": Network.webTransportConnectionEstablishedPayload;
     "Network.webTransportClosed": Network.webTransportClosedPayload;
+    "Network.directTCPSocketCreated": Network.directTCPSocketCreatedPayload;
+    "Network.directTCPSocketOpened": Network.directTCPSocketOpenedPayload;
+    "Network.directTCPSocketAborted": Network.directTCPSocketAbortedPayload;
+    "Network.directTCPSocketClosed": Network.directTCPSocketClosedPayload;
+    "Network.directTCPSocketChunkSent": Network.directTCPSocketChunkSentPayload;
+    "Network.directTCPSocketChunkReceived": Network.directTCPSocketChunkReceivedPayload;
+    "Network.directUDPSocketCreated": Network.directUDPSocketCreatedPayload;
+    "Network.directUDPSocketOpened": Network.directUDPSocketOpenedPayload;
+    "Network.directUDPSocketAborted": Network.directUDPSocketAbortedPayload;
+    "Network.directUDPSocketClosed": Network.directUDPSocketClosedPayload;
+    "Network.directUDPSocketChunkSent": Network.directUDPSocketChunkSentPayload;
+    "Network.directUDPSocketChunkReceived": Network.directUDPSocketChunkReceivedPayload;
     "Network.requestWillBeSentExtraInfo": Network.requestWillBeSentExtraInfoPayload;
     "Network.responseReceivedExtraInfo": Network.responseReceivedExtraInfoPayload;
     "Network.responseReceivedEarlyHints": Network.responseReceivedEarlyHintsPayload;
@@ -19991,9 +21521,11 @@ Error was thrown.
     "Page.frameAttached": Page.frameAttachedPayload;
     "Page.frameClearedScheduledNavigation": Page.frameClearedScheduledNavigationPayload;
     "Page.frameDetached": Page.frameDetachedPayload;
+    "Page.frameSubtreeWillBeDetached": Page.frameSubtreeWillBeDetachedPayload;
     "Page.frameNavigated": Page.frameNavigatedPayload;
     "Page.documentOpened": Page.documentOpenedPayload;
     "Page.frameResized": Page.frameResizedPayload;
+    "Page.frameStartedNavigating": Page.frameStartedNavigatingPayload;
     "Page.frameRequestedNavigation": Page.frameRequestedNavigationPayload;
     "Page.frameScheduledNavigation": Page.frameScheduledNavigationPayload;
     "Page.frameStartedLoading": Page.frameStartedLoadingPayload;
@@ -20028,10 +21560,13 @@ Error was thrown.
     "Storage.interestGroupAuctionEventOccurred": Storage.interestGroupAuctionEventOccurredPayload;
     "Storage.interestGroupAuctionNetworkRequestCreated": Storage.interestGroupAuctionNetworkRequestCreatedPayload;
     "Storage.sharedStorageAccessed": Storage.sharedStorageAccessedPayload;
+    "Storage.sharedStorageWorkletOperationExecutionFinished": Storage.sharedStorageWorkletOperationExecutionFinishedPayload;
     "Storage.storageBucketCreatedOrUpdated": Storage.storageBucketCreatedOrUpdatedPayload;
     "Storage.storageBucketDeleted": Storage.storageBucketDeletedPayload;
     "Storage.attributionReportingSourceRegistered": Storage.attributionReportingSourceRegisteredPayload;
     "Storage.attributionReportingTriggerRegistered": Storage.attributionReportingTriggerRegisteredPayload;
+    "Storage.attributionReportingReportSent": Storage.attributionReportingReportSentPayload;
+    "Storage.attributionReportingVerboseDebugReportSent": Storage.attributionReportingVerboseDebugReportSentPayload;
     "Target.attachedToTarget": Target.attachedToTargetPayload;
     "Target.detachedFromTarget": Target.detachedFromTargetPayload;
     "Target.receivedMessageFromTarget": Target.receivedMessageFromTargetPayload;
@@ -20059,6 +21594,8 @@ Error was thrown.
     "WebAudio.nodeParamConnected": WebAudio.nodeParamConnectedPayload;
     "WebAudio.nodeParamDisconnected": WebAudio.nodeParamDisconnectedPayload;
     "WebAuthn.credentialAdded": WebAuthn.credentialAddedPayload;
+    "WebAuthn.credentialDeleted": WebAuthn.credentialDeletedPayload;
+    "WebAuthn.credentialUpdated": WebAuthn.credentialUpdatedPayload;
     "WebAuthn.credentialAsserted": WebAuthn.credentialAssertedPayload;
     "Media.playerPropertiesChanged": Media.playerPropertiesChangedPayload;
     "Media.playerEventsAdded": Media.playerEventsAddedPayload;
@@ -20074,6 +21611,9 @@ Error was thrown.
     "Preload.preloadingAttemptSourcesUpdated": Preload.preloadingAttemptSourcesUpdatedPayload;
     "FedCm.dialogShown": FedCm.dialogShownPayload;
     "FedCm.dialogClosed": FedCm.dialogClosedPayload;
+    "BluetoothEmulation.gattOperationReceived": BluetoothEmulation.gattOperationReceivedPayload;
+    "BluetoothEmulation.characteristicOperationReceived": BluetoothEmulation.characteristicOperationReceivedPayload;
+    "BluetoothEmulation.descriptorOperationReceived": BluetoothEmulation.descriptorOperationReceivedPayload;
     "Console.messageAdded": Console.messageAddedPayload;
     "Debugger.breakpointResolved": Debugger.breakpointResolvedPayload;
     "Debugger.paused": Debugger.pausedPayload;
@@ -20122,6 +21662,11 @@ Error was thrown.
     "Audits.checkContrast": Audits.checkContrastParameters;
     "Audits.checkFormsIssues": Audits.checkFormsIssuesParameters;
     "Extensions.loadUnpacked": Extensions.loadUnpackedParameters;
+    "Extensions.uninstall": Extensions.uninstallParameters;
+    "Extensions.getStorageItems": Extensions.getStorageItemsParameters;
+    "Extensions.removeStorageItems": Extensions.removeStorageItemsParameters;
+    "Extensions.clearStorageItems": Extensions.clearStorageItemsParameters;
+    "Extensions.setStorageItems": Extensions.setStorageItemsParameters;
     "Autofill.trigger": Autofill.triggerParameters;
     "Autofill.setAddresses": Autofill.setAddressesParameters;
     "Autofill.disable": Autofill.disableParameters;
@@ -20145,24 +21690,32 @@ Error was thrown.
     "Browser.getWindowBounds": Browser.getWindowBoundsParameters;
     "Browser.getWindowForTarget": Browser.getWindowForTargetParameters;
     "Browser.setWindowBounds": Browser.setWindowBoundsParameters;
+    "Browser.setContentsSize": Browser.setContentsSizeParameters;
     "Browser.setDockTile": Browser.setDockTileParameters;
     "Browser.executeBrowserCommand": Browser.executeBrowserCommandParameters;
     "Browser.addPrivacySandboxEnrollmentOverride": Browser.addPrivacySandboxEnrollmentOverrideParameters;
+    "Browser.addPrivacySandboxCoordinatorKeyConfig": Browser.addPrivacySandboxCoordinatorKeyConfigParameters;
     "CSS.addRule": CSS.addRuleParameters;
     "CSS.collectClassNames": CSS.collectClassNamesParameters;
     "CSS.createStyleSheet": CSS.createStyleSheetParameters;
     "CSS.disable": CSS.disableParameters;
     "CSS.enable": CSS.enableParameters;
     "CSS.forcePseudoState": CSS.forcePseudoStateParameters;
+    "CSS.forceStartingStyle": CSS.forceStartingStyleParameters;
     "CSS.getBackgroundColors": CSS.getBackgroundColorsParameters;
     "CSS.getComputedStyleForNode": CSS.getComputedStyleForNodeParameters;
+    "CSS.resolveValues": CSS.resolveValuesParameters;
+    "CSS.getLonghandProperties": CSS.getLonghandPropertiesParameters;
     "CSS.getInlineStylesForNode": CSS.getInlineStylesForNodeParameters;
+    "CSS.getAnimatedStylesForNode": CSS.getAnimatedStylesForNodeParameters;
     "CSS.getMatchedStylesForNode": CSS.getMatchedStylesForNodeParameters;
+    "CSS.getEnvironmentVariables": CSS.getEnvironmentVariablesParameters;
     "CSS.getMediaQueries": CSS.getMediaQueriesParameters;
     "CSS.getPlatformFontsForNode": CSS.getPlatformFontsForNodeParameters;
     "CSS.getStyleSheetText": CSS.getStyleSheetTextParameters;
     "CSS.getLayersForNode": CSS.getLayersForNodeParameters;
     "CSS.getLocationForSelector": CSS.getLocationForSelectorParameters;
+    "CSS.trackComputedStyleUpdatesForNode": CSS.trackComputedStyleUpdatesForNodeParameters;
     "CSS.trackComputedStyleUpdates": CSS.trackComputedStyleUpdatesParameters;
     "CSS.takeComputedStyleUpdates": CSS.takeComputedStyleUpdatesParameters;
     "CSS.setEffectivePropertyValueForNode": CSS.setEffectivePropertyValueForNodeParameters;
@@ -20232,6 +21785,7 @@ Error was thrown.
     "DOM.setNodeStackTracesEnabled": DOM.setNodeStackTracesEnabledParameters;
     "DOM.getNodeStackTraces": DOM.getNodeStackTracesParameters;
     "DOM.getFileInfo": DOM.getFileInfoParameters;
+    "DOM.getDetachedDomNodes": DOM.getDetachedDomNodesParameters;
     "DOM.setInspectedNode": DOM.setInspectedNodeParameters;
     "DOM.setNodeName": DOM.setNodeNameParameters;
     "DOM.setNodeValue": DOM.setNodeValueParameters;
@@ -20241,6 +21795,7 @@ Error was thrown.
     "DOM.getContainerForNode": DOM.getContainerForNodeParameters;
     "DOM.getQueryingDescendantsForContainer": DOM.getQueryingDescendantsForContainerParameters;
     "DOM.getAnchorElement": DOM.getAnchorElementParameters;
+    "DOM.forceShowPopover": DOM.forceShowPopoverParameters;
     "DOMDebugger.getEventListeners": DOMDebugger.getEventListenersParameters;
     "DOMDebugger.removeDOMBreakpoint": DOMDebugger.removeDOMBreakpointParameters;
     "DOMDebugger.removeEventListenerBreakpoint": DOMDebugger.removeEventListenerBreakpointParameters;
@@ -20264,10 +21819,6 @@ Error was thrown.
     "DOMStorage.getDOMStorageItems": DOMStorage.getDOMStorageItemsParameters;
     "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemParameters;
     "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemParameters;
-    "Database.disable": Database.disableParameters;
-    "Database.enable": Database.enableParameters;
-    "Database.executeSQL": Database.executeSQLParameters;
-    "Database.getDatabaseTableNames": Database.getDatabaseTableNamesParameters;
     "DeviceOrientation.clearDeviceOrientationOverride": DeviceOrientation.clearDeviceOrientationOverrideParameters;
     "DeviceOrientation.setDeviceOrientationOverride": DeviceOrientation.setDeviceOrientationOverrideParameters;
     "Emulation.canEmulate": Emulation.canEmulateParameters;
@@ -20278,20 +21829,25 @@ Error was thrown.
     "Emulation.setAutoDarkModeOverride": Emulation.setAutoDarkModeOverrideParameters;
     "Emulation.setCPUThrottlingRate": Emulation.setCPUThrottlingRateParameters;
     "Emulation.setDefaultBackgroundColorOverride": Emulation.setDefaultBackgroundColorOverrideParameters;
+    "Emulation.setSafeAreaInsetsOverride": Emulation.setSafeAreaInsetsOverrideParameters;
     "Emulation.setDeviceMetricsOverride": Emulation.setDeviceMetricsOverrideParameters;
     "Emulation.setDevicePostureOverride": Emulation.setDevicePostureOverrideParameters;
     "Emulation.clearDevicePostureOverride": Emulation.clearDevicePostureOverrideParameters;
+    "Emulation.setDisplayFeaturesOverride": Emulation.setDisplayFeaturesOverrideParameters;
+    "Emulation.clearDisplayFeaturesOverride": Emulation.clearDisplayFeaturesOverrideParameters;
     "Emulation.setScrollbarsHidden": Emulation.setScrollbarsHiddenParameters;
     "Emulation.setDocumentCookieDisabled": Emulation.setDocumentCookieDisabledParameters;
     "Emulation.setEmitTouchEventsForMouse": Emulation.setEmitTouchEventsForMouseParameters;
     "Emulation.setEmulatedMedia": Emulation.setEmulatedMediaParameters;
     "Emulation.setEmulatedVisionDeficiency": Emulation.setEmulatedVisionDeficiencyParameters;
+    "Emulation.setEmulatedOSTextScale": Emulation.setEmulatedOSTextScaleParameters;
     "Emulation.setGeolocationOverride": Emulation.setGeolocationOverrideParameters;
     "Emulation.getOverriddenSensorInformation": Emulation.getOverriddenSensorInformationParameters;
     "Emulation.setSensorOverrideEnabled": Emulation.setSensorOverrideEnabledParameters;
     "Emulation.setSensorOverrideReadings": Emulation.setSensorOverrideReadingsParameters;
     "Emulation.setPressureSourceOverrideEnabled": Emulation.setPressureSourceOverrideEnabledParameters;
     "Emulation.setPressureStateOverride": Emulation.setPressureStateOverrideParameters;
+    "Emulation.setPressureDataOverride": Emulation.setPressureDataOverrideParameters;
     "Emulation.setIdleOverride": Emulation.setIdleOverrideParameters;
     "Emulation.clearIdleOverride": Emulation.clearIdleOverrideParameters;
     "Emulation.setNavigatorOverrides": Emulation.setNavigatorOverridesParameters;
@@ -20303,9 +21859,11 @@ Error was thrown.
     "Emulation.setTimezoneOverride": Emulation.setTimezoneOverrideParameters;
     "Emulation.setVisibleSize": Emulation.setVisibleSizeParameters;
     "Emulation.setDisabledImageTypes": Emulation.setDisabledImageTypesParameters;
+    "Emulation.setDataSaverOverride": Emulation.setDataSaverOverrideParameters;
     "Emulation.setHardwareConcurrencyOverride": Emulation.setHardwareConcurrencyOverrideParameters;
     "Emulation.setUserAgentOverride": Emulation.setUserAgentOverrideParameters;
     "Emulation.setAutomationOverride": Emulation.setAutomationOverrideParameters;
+    "Emulation.setSmallViewportHeightDifferenceOverride": Emulation.setSmallViewportHeightDifferenceOverrideParameters;
     "HeadlessExperimental.beginFrame": HeadlessExperimental.beginFrameParameters;
     "HeadlessExperimental.disable": HeadlessExperimental.disableParameters;
     "HeadlessExperimental.enable": HeadlessExperimental.enableParameters;
@@ -20352,6 +21910,7 @@ Error was thrown.
     "Log.startViolationsReport": Log.startViolationsReportParameters;
     "Log.stopViolationsReport": Log.stopViolationsReportParameters;
     "Memory.getDOMCounters": Memory.getDOMCountersParameters;
+    "Memory.getDOMCountersForLeakDetection": Memory.getDOMCountersForLeakDetectionParameters;
     "Memory.prepareForLeakDetection": Memory.prepareForLeakDetectionParameters;
     "Memory.forciblyPurgeJavaScriptMemory": Memory.forciblyPurgeJavaScriptMemoryParameters;
     "Memory.setPressureNotificationsSuppressed": Memory.setPressureNotificationsSuppressedParameters;
@@ -20395,6 +21954,7 @@ Error was thrown.
     "Network.getSecurityIsolationStatus": Network.getSecurityIsolationStatusParameters;
     "Network.enableReportingApi": Network.enableReportingApiParameters;
     "Network.loadNetworkResource": Network.loadNetworkResourceParameters;
+    "Network.setCookieControls": Network.setCookieControlsParameters;
     "Overlay.disable": Overlay.disableParameters;
     "Overlay.enable": Overlay.enableParameters;
     "Overlay.getHighlightObjectForTest": Overlay.getHighlightObjectForTestParameters;
@@ -20440,7 +22000,7 @@ Error was thrown.
     "Page.getInstallabilityErrors": Page.getInstallabilityErrorsParameters;
     "Page.getManifestIcons": Page.getManifestIconsParameters;
     "Page.getAppId": Page.getAppIdParameters;
-    "Page.getAdScriptId": Page.getAdScriptIdParameters;
+    "Page.getAdScriptAncestry": Page.getAdScriptAncestryParameters;
     "Page.getFrameTree": Page.getFrameTreeParameters;
     "Page.getLayoutMetrics": Page.getLayoutMetricsParameters;
     "Page.getNavigationHistory": Page.getNavigationHistoryParameters;
@@ -20499,7 +22059,6 @@ Error was thrown.
     "ServiceWorker.dispatchSyncEvent": ServiceWorker.dispatchSyncEventParameters;
     "ServiceWorker.dispatchPeriodicSyncEvent": ServiceWorker.dispatchPeriodicSyncEventParameters;
     "ServiceWorker.enable": ServiceWorker.enableParameters;
-    "ServiceWorker.inspectWorker": ServiceWorker.inspectWorkerParameters;
     "ServiceWorker.setForceUpdateOnPageLoad": ServiceWorker.setForceUpdateOnPageLoadParameters;
     "ServiceWorker.skipWaiting": ServiceWorker.skipWaitingParameters;
     "ServiceWorker.startWorker": ServiceWorker.startWorkerParameters;
@@ -20542,6 +22101,8 @@ Error was thrown.
     "Storage.setAttributionReportingTracking": Storage.setAttributionReportingTrackingParameters;
     "Storage.sendPendingAttributionReports": Storage.sendPendingAttributionReportsParameters;
     "Storage.getRelatedWebsiteSets": Storage.getRelatedWebsiteSetsParameters;
+    "Storage.getAffectedUrlsForThirdPartyCookieMetadata": Storage.getAffectedUrlsForThirdPartyCookieMetadataParameters;
+    "Storage.setProtectedAudienceKAnonymity": Storage.setProtectedAudienceKAnonymityParameters;
     "SystemInfo.getInfo": SystemInfo.getInfoParameters;
     "SystemInfo.getFeatureState": SystemInfo.getFeatureStateParameters;
     "SystemInfo.getProcessInfo": SystemInfo.getProcessInfoParameters;
@@ -20562,6 +22123,7 @@ Error was thrown.
     "Target.autoAttachRelated": Target.autoAttachRelatedParameters;
     "Target.setDiscoverTargets": Target.setDiscoverTargetsParameters;
     "Target.setRemoteLocations": Target.setRemoteLocationsParameters;
+    "Target.openDevTools": Target.openDevToolsParameters;
     "Tethering.bind": Tethering.bindParameters;
     "Tethering.unbind": Tethering.unbindParameters;
     "Tracing.end": Tracing.endParameters;
@@ -20616,6 +22178,21 @@ Error was thrown.
     "PWA.launchFilesInApp": PWA.launchFilesInAppParameters;
     "PWA.openCurrentPageInApp": PWA.openCurrentPageInAppParameters;
     "PWA.changeAppUserSettings": PWA.changeAppUserSettingsParameters;
+    "BluetoothEmulation.enable": BluetoothEmulation.enableParameters;
+    "BluetoothEmulation.setSimulatedCentralState": BluetoothEmulation.setSimulatedCentralStateParameters;
+    "BluetoothEmulation.disable": BluetoothEmulation.disableParameters;
+    "BluetoothEmulation.simulatePreconnectedPeripheral": BluetoothEmulation.simulatePreconnectedPeripheralParameters;
+    "BluetoothEmulation.simulateAdvertisement": BluetoothEmulation.simulateAdvertisementParameters;
+    "BluetoothEmulation.simulateGATTOperationResponse": BluetoothEmulation.simulateGATTOperationResponseParameters;
+    "BluetoothEmulation.simulateCharacteristicOperationResponse": BluetoothEmulation.simulateCharacteristicOperationResponseParameters;
+    "BluetoothEmulation.simulateDescriptorOperationResponse": BluetoothEmulation.simulateDescriptorOperationResponseParameters;
+    "BluetoothEmulation.addService": BluetoothEmulation.addServiceParameters;
+    "BluetoothEmulation.removeService": BluetoothEmulation.removeServiceParameters;
+    "BluetoothEmulation.addCharacteristic": BluetoothEmulation.addCharacteristicParameters;
+    "BluetoothEmulation.removeCharacteristic": BluetoothEmulation.removeCharacteristicParameters;
+    "BluetoothEmulation.addDescriptor": BluetoothEmulation.addDescriptorParameters;
+    "BluetoothEmulation.removeDescriptor": BluetoothEmulation.removeDescriptorParameters;
+    "BluetoothEmulation.simulateGATTDisconnection": BluetoothEmulation.simulateGATTDisconnectionParameters;
     "Console.clearMessages": Console.clearMessagesParameters;
     "Console.disable": Console.disableParameters;
     "Console.enable": Console.enableParameters;
@@ -20636,6 +22213,7 @@ Error was thrown.
     "Debugger.resume": Debugger.resumeParameters;
     "Debugger.searchInContent": Debugger.searchInContentParameters;
     "Debugger.setAsyncCallStackDepth": Debugger.setAsyncCallStackDepthParameters;
+    "Debugger.setBlackboxExecutionContexts": Debugger.setBlackboxExecutionContextsParameters;
     "Debugger.setBlackboxPatterns": Debugger.setBlackboxPatternsParameters;
     "Debugger.setBlackboxedRanges": Debugger.setBlackboxedRangesParameters;
     "Debugger.setBreakpoint": Debugger.setBreakpointParameters;
@@ -20722,6 +22300,11 @@ Error was thrown.
     "Audits.checkContrast": Audits.checkContrastReturnValue;
     "Audits.checkFormsIssues": Audits.checkFormsIssuesReturnValue;
     "Extensions.loadUnpacked": Extensions.loadUnpackedReturnValue;
+    "Extensions.uninstall": Extensions.uninstallReturnValue;
+    "Extensions.getStorageItems": Extensions.getStorageItemsReturnValue;
+    "Extensions.removeStorageItems": Extensions.removeStorageItemsReturnValue;
+    "Extensions.clearStorageItems": Extensions.clearStorageItemsReturnValue;
+    "Extensions.setStorageItems": Extensions.setStorageItemsReturnValue;
     "Autofill.trigger": Autofill.triggerReturnValue;
     "Autofill.setAddresses": Autofill.setAddressesReturnValue;
     "Autofill.disable": Autofill.disableReturnValue;
@@ -20745,24 +22328,32 @@ Error was thrown.
     "Browser.getWindowBounds": Browser.getWindowBoundsReturnValue;
     "Browser.getWindowForTarget": Browser.getWindowForTargetReturnValue;
     "Browser.setWindowBounds": Browser.setWindowBoundsReturnValue;
+    "Browser.setContentsSize": Browser.setContentsSizeReturnValue;
     "Browser.setDockTile": Browser.setDockTileReturnValue;
     "Browser.executeBrowserCommand": Browser.executeBrowserCommandReturnValue;
     "Browser.addPrivacySandboxEnrollmentOverride": Browser.addPrivacySandboxEnrollmentOverrideReturnValue;
+    "Browser.addPrivacySandboxCoordinatorKeyConfig": Browser.addPrivacySandboxCoordinatorKeyConfigReturnValue;
     "CSS.addRule": CSS.addRuleReturnValue;
     "CSS.collectClassNames": CSS.collectClassNamesReturnValue;
     "CSS.createStyleSheet": CSS.createStyleSheetReturnValue;
     "CSS.disable": CSS.disableReturnValue;
     "CSS.enable": CSS.enableReturnValue;
     "CSS.forcePseudoState": CSS.forcePseudoStateReturnValue;
+    "CSS.forceStartingStyle": CSS.forceStartingStyleReturnValue;
     "CSS.getBackgroundColors": CSS.getBackgroundColorsReturnValue;
     "CSS.getComputedStyleForNode": CSS.getComputedStyleForNodeReturnValue;
+    "CSS.resolveValues": CSS.resolveValuesReturnValue;
+    "CSS.getLonghandProperties": CSS.getLonghandPropertiesReturnValue;
     "CSS.getInlineStylesForNode": CSS.getInlineStylesForNodeReturnValue;
+    "CSS.getAnimatedStylesForNode": CSS.getAnimatedStylesForNodeReturnValue;
     "CSS.getMatchedStylesForNode": CSS.getMatchedStylesForNodeReturnValue;
+    "CSS.getEnvironmentVariables": CSS.getEnvironmentVariablesReturnValue;
     "CSS.getMediaQueries": CSS.getMediaQueriesReturnValue;
     "CSS.getPlatformFontsForNode": CSS.getPlatformFontsForNodeReturnValue;
     "CSS.getStyleSheetText": CSS.getStyleSheetTextReturnValue;
     "CSS.getLayersForNode": CSS.getLayersForNodeReturnValue;
     "CSS.getLocationForSelector": CSS.getLocationForSelectorReturnValue;
+    "CSS.trackComputedStyleUpdatesForNode": CSS.trackComputedStyleUpdatesForNodeReturnValue;
     "CSS.trackComputedStyleUpdates": CSS.trackComputedStyleUpdatesReturnValue;
     "CSS.takeComputedStyleUpdates": CSS.takeComputedStyleUpdatesReturnValue;
     "CSS.setEffectivePropertyValueForNode": CSS.setEffectivePropertyValueForNodeReturnValue;
@@ -20832,6 +22423,7 @@ Error was thrown.
     "DOM.setNodeStackTracesEnabled": DOM.setNodeStackTracesEnabledReturnValue;
     "DOM.getNodeStackTraces": DOM.getNodeStackTracesReturnValue;
     "DOM.getFileInfo": DOM.getFileInfoReturnValue;
+    "DOM.getDetachedDomNodes": DOM.getDetachedDomNodesReturnValue;
     "DOM.setInspectedNode": DOM.setInspectedNodeReturnValue;
     "DOM.setNodeName": DOM.setNodeNameReturnValue;
     "DOM.setNodeValue": DOM.setNodeValueReturnValue;
@@ -20841,6 +22433,7 @@ Error was thrown.
     "DOM.getContainerForNode": DOM.getContainerForNodeReturnValue;
     "DOM.getQueryingDescendantsForContainer": DOM.getQueryingDescendantsForContainerReturnValue;
     "DOM.getAnchorElement": DOM.getAnchorElementReturnValue;
+    "DOM.forceShowPopover": DOM.forceShowPopoverReturnValue;
     "DOMDebugger.getEventListeners": DOMDebugger.getEventListenersReturnValue;
     "DOMDebugger.removeDOMBreakpoint": DOMDebugger.removeDOMBreakpointReturnValue;
     "DOMDebugger.removeEventListenerBreakpoint": DOMDebugger.removeEventListenerBreakpointReturnValue;
@@ -20864,10 +22457,6 @@ Error was thrown.
     "DOMStorage.getDOMStorageItems": DOMStorage.getDOMStorageItemsReturnValue;
     "DOMStorage.removeDOMStorageItem": DOMStorage.removeDOMStorageItemReturnValue;
     "DOMStorage.setDOMStorageItem": DOMStorage.setDOMStorageItemReturnValue;
-    "Database.disable": Database.disableReturnValue;
-    "Database.enable": Database.enableReturnValue;
-    "Database.executeSQL": Database.executeSQLReturnValue;
-    "Database.getDatabaseTableNames": Database.getDatabaseTableNamesReturnValue;
     "DeviceOrientation.clearDeviceOrientationOverride": DeviceOrientation.clearDeviceOrientationOverrideReturnValue;
     "DeviceOrientation.setDeviceOrientationOverride": DeviceOrientation.setDeviceOrientationOverrideReturnValue;
     "Emulation.canEmulate": Emulation.canEmulateReturnValue;
@@ -20878,20 +22467,25 @@ Error was thrown.
     "Emulation.setAutoDarkModeOverride": Emulation.setAutoDarkModeOverrideReturnValue;
     "Emulation.setCPUThrottlingRate": Emulation.setCPUThrottlingRateReturnValue;
     "Emulation.setDefaultBackgroundColorOverride": Emulation.setDefaultBackgroundColorOverrideReturnValue;
+    "Emulation.setSafeAreaInsetsOverride": Emulation.setSafeAreaInsetsOverrideReturnValue;
     "Emulation.setDeviceMetricsOverride": Emulation.setDeviceMetricsOverrideReturnValue;
     "Emulation.setDevicePostureOverride": Emulation.setDevicePostureOverrideReturnValue;
     "Emulation.clearDevicePostureOverride": Emulation.clearDevicePostureOverrideReturnValue;
+    "Emulation.setDisplayFeaturesOverride": Emulation.setDisplayFeaturesOverrideReturnValue;
+    "Emulation.clearDisplayFeaturesOverride": Emulation.clearDisplayFeaturesOverrideReturnValue;
     "Emulation.setScrollbarsHidden": Emulation.setScrollbarsHiddenReturnValue;
     "Emulation.setDocumentCookieDisabled": Emulation.setDocumentCookieDisabledReturnValue;
     "Emulation.setEmitTouchEventsForMouse": Emulation.setEmitTouchEventsForMouseReturnValue;
     "Emulation.setEmulatedMedia": Emulation.setEmulatedMediaReturnValue;
     "Emulation.setEmulatedVisionDeficiency": Emulation.setEmulatedVisionDeficiencyReturnValue;
+    "Emulation.setEmulatedOSTextScale": Emulation.setEmulatedOSTextScaleReturnValue;
     "Emulation.setGeolocationOverride": Emulation.setGeolocationOverrideReturnValue;
     "Emulation.getOverriddenSensorInformation": Emulation.getOverriddenSensorInformationReturnValue;
     "Emulation.setSensorOverrideEnabled": Emulation.setSensorOverrideEnabledReturnValue;
     "Emulation.setSensorOverrideReadings": Emulation.setSensorOverrideReadingsReturnValue;
     "Emulation.setPressureSourceOverrideEnabled": Emulation.setPressureSourceOverrideEnabledReturnValue;
     "Emulation.setPressureStateOverride": Emulation.setPressureStateOverrideReturnValue;
+    "Emulation.setPressureDataOverride": Emulation.setPressureDataOverrideReturnValue;
     "Emulation.setIdleOverride": Emulation.setIdleOverrideReturnValue;
     "Emulation.clearIdleOverride": Emulation.clearIdleOverrideReturnValue;
     "Emulation.setNavigatorOverrides": Emulation.setNavigatorOverridesReturnValue;
@@ -20903,9 +22497,11 @@ Error was thrown.
     "Emulation.setTimezoneOverride": Emulation.setTimezoneOverrideReturnValue;
     "Emulation.setVisibleSize": Emulation.setVisibleSizeReturnValue;
     "Emulation.setDisabledImageTypes": Emulation.setDisabledImageTypesReturnValue;
+    "Emulation.setDataSaverOverride": Emulation.setDataSaverOverrideReturnValue;
     "Emulation.setHardwareConcurrencyOverride": Emulation.setHardwareConcurrencyOverrideReturnValue;
     "Emulation.setUserAgentOverride": Emulation.setUserAgentOverrideReturnValue;
     "Emulation.setAutomationOverride": Emulation.setAutomationOverrideReturnValue;
+    "Emulation.setSmallViewportHeightDifferenceOverride": Emulation.setSmallViewportHeightDifferenceOverrideReturnValue;
     "HeadlessExperimental.beginFrame": HeadlessExperimental.beginFrameReturnValue;
     "HeadlessExperimental.disable": HeadlessExperimental.disableReturnValue;
     "HeadlessExperimental.enable": HeadlessExperimental.enableReturnValue;
@@ -20952,6 +22548,7 @@ Error was thrown.
     "Log.startViolationsReport": Log.startViolationsReportReturnValue;
     "Log.stopViolationsReport": Log.stopViolationsReportReturnValue;
     "Memory.getDOMCounters": Memory.getDOMCountersReturnValue;
+    "Memory.getDOMCountersForLeakDetection": Memory.getDOMCountersForLeakDetectionReturnValue;
     "Memory.prepareForLeakDetection": Memory.prepareForLeakDetectionReturnValue;
     "Memory.forciblyPurgeJavaScriptMemory": Memory.forciblyPurgeJavaScriptMemoryReturnValue;
     "Memory.setPressureNotificationsSuppressed": Memory.setPressureNotificationsSuppressedReturnValue;
@@ -20995,6 +22592,7 @@ Error was thrown.
     "Network.getSecurityIsolationStatus": Network.getSecurityIsolationStatusReturnValue;
     "Network.enableReportingApi": Network.enableReportingApiReturnValue;
     "Network.loadNetworkResource": Network.loadNetworkResourceReturnValue;
+    "Network.setCookieControls": Network.setCookieControlsReturnValue;
     "Overlay.disable": Overlay.disableReturnValue;
     "Overlay.enable": Overlay.enableReturnValue;
     "Overlay.getHighlightObjectForTest": Overlay.getHighlightObjectForTestReturnValue;
@@ -21040,7 +22638,7 @@ Error was thrown.
     "Page.getInstallabilityErrors": Page.getInstallabilityErrorsReturnValue;
     "Page.getManifestIcons": Page.getManifestIconsReturnValue;
     "Page.getAppId": Page.getAppIdReturnValue;
-    "Page.getAdScriptId": Page.getAdScriptIdReturnValue;
+    "Page.getAdScriptAncestry": Page.getAdScriptAncestryReturnValue;
     "Page.getFrameTree": Page.getFrameTreeReturnValue;
     "Page.getLayoutMetrics": Page.getLayoutMetricsReturnValue;
     "Page.getNavigationHistory": Page.getNavigationHistoryReturnValue;
@@ -21099,7 +22697,6 @@ Error was thrown.
     "ServiceWorker.dispatchSyncEvent": ServiceWorker.dispatchSyncEventReturnValue;
     "ServiceWorker.dispatchPeriodicSyncEvent": ServiceWorker.dispatchPeriodicSyncEventReturnValue;
     "ServiceWorker.enable": ServiceWorker.enableReturnValue;
-    "ServiceWorker.inspectWorker": ServiceWorker.inspectWorkerReturnValue;
     "ServiceWorker.setForceUpdateOnPageLoad": ServiceWorker.setForceUpdateOnPageLoadReturnValue;
     "ServiceWorker.skipWaiting": ServiceWorker.skipWaitingReturnValue;
     "ServiceWorker.startWorker": ServiceWorker.startWorkerReturnValue;
@@ -21142,6 +22739,8 @@ Error was thrown.
     "Storage.setAttributionReportingTracking": Storage.setAttributionReportingTrackingReturnValue;
     "Storage.sendPendingAttributionReports": Storage.sendPendingAttributionReportsReturnValue;
     "Storage.getRelatedWebsiteSets": Storage.getRelatedWebsiteSetsReturnValue;
+    "Storage.getAffectedUrlsForThirdPartyCookieMetadata": Storage.getAffectedUrlsForThirdPartyCookieMetadataReturnValue;
+    "Storage.setProtectedAudienceKAnonymity": Storage.setProtectedAudienceKAnonymityReturnValue;
     "SystemInfo.getInfo": SystemInfo.getInfoReturnValue;
     "SystemInfo.getFeatureState": SystemInfo.getFeatureStateReturnValue;
     "SystemInfo.getProcessInfo": SystemInfo.getProcessInfoReturnValue;
@@ -21162,6 +22761,7 @@ Error was thrown.
     "Target.autoAttachRelated": Target.autoAttachRelatedReturnValue;
     "Target.setDiscoverTargets": Target.setDiscoverTargetsReturnValue;
     "Target.setRemoteLocations": Target.setRemoteLocationsReturnValue;
+    "Target.openDevTools": Target.openDevToolsReturnValue;
     "Tethering.bind": Tethering.bindReturnValue;
     "Tethering.unbind": Tethering.unbindReturnValue;
     "Tracing.end": Tracing.endReturnValue;
@@ -21216,6 +22816,21 @@ Error was thrown.
     "PWA.launchFilesInApp": PWA.launchFilesInAppReturnValue;
     "PWA.openCurrentPageInApp": PWA.openCurrentPageInAppReturnValue;
     "PWA.changeAppUserSettings": PWA.changeAppUserSettingsReturnValue;
+    "BluetoothEmulation.enable": BluetoothEmulation.enableReturnValue;
+    "BluetoothEmulation.setSimulatedCentralState": BluetoothEmulation.setSimulatedCentralStateReturnValue;
+    "BluetoothEmulation.disable": BluetoothEmulation.disableReturnValue;
+    "BluetoothEmulation.simulatePreconnectedPeripheral": BluetoothEmulation.simulatePreconnectedPeripheralReturnValue;
+    "BluetoothEmulation.simulateAdvertisement": BluetoothEmulation.simulateAdvertisementReturnValue;
+    "BluetoothEmulation.simulateGATTOperationResponse": BluetoothEmulation.simulateGATTOperationResponseReturnValue;
+    "BluetoothEmulation.simulateCharacteristicOperationResponse": BluetoothEmulation.simulateCharacteristicOperationResponseReturnValue;
+    "BluetoothEmulation.simulateDescriptorOperationResponse": BluetoothEmulation.simulateDescriptorOperationResponseReturnValue;
+    "BluetoothEmulation.addService": BluetoothEmulation.addServiceReturnValue;
+    "BluetoothEmulation.removeService": BluetoothEmulation.removeServiceReturnValue;
+    "BluetoothEmulation.addCharacteristic": BluetoothEmulation.addCharacteristicReturnValue;
+    "BluetoothEmulation.removeCharacteristic": BluetoothEmulation.removeCharacteristicReturnValue;
+    "BluetoothEmulation.addDescriptor": BluetoothEmulation.addDescriptorReturnValue;
+    "BluetoothEmulation.removeDescriptor": BluetoothEmulation.removeDescriptorReturnValue;
+    "BluetoothEmulation.simulateGATTDisconnection": BluetoothEmulation.simulateGATTDisconnectionReturnValue;
     "Console.clearMessages": Console.clearMessagesReturnValue;
     "Console.disable": Console.disableReturnValue;
     "Console.enable": Console.enableReturnValue;
@@ -21236,6 +22851,7 @@ Error was thrown.
     "Debugger.resume": Debugger.resumeReturnValue;
     "Debugger.searchInContent": Debugger.searchInContentReturnValue;
     "Debugger.setAsyncCallStackDepth": Debugger.setAsyncCallStackDepthReturnValue;
+    "Debugger.setBlackboxExecutionContexts": Debugger.setBlackboxExecutionContextsReturnValue;
     "Debugger.setBlackboxPatterns": Debugger.setBlackboxPatternsReturnValue;
     "Debugger.setBlackboxedRanges": Debugger.setBlackboxedRangesReturnValue;
     "Debugger.setBreakpoint": Debugger.setBreakpointReturnValue;
diff --git a/packages/playwright-core/types/types.d.ts b/packages/playwright-core/types/types.d.ts
index 47e263cdb63f2..9d759a2bc2103 100644
--- a/packages/playwright-core/types/types.d.ts
+++ b/packages/playwright-core/types/types.d.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 import { ChildProcess } from 'child_process';
-import { EventEmitter } from 'events';
 import { Readable } from 'stream';
 import { ReadStream } from 'fs';
 import { Protocol } from './protocol';
@@ -29,11 +28,10 @@ type ElementHandleWaitForSelectorOptionsNotHidden = ElementHandleWaitForSelector
 };
 
 /**
- * - extends: [EventEmitter]
- *
- * Page provides methods to interact with a single tab in a {@link Browser}, or an
- * [extension background page](https://developer.chrome.com/extensions/background_pages) in Chromium. One {@link
- * Browser} instance might have multiple {@link Page} instances.
+ * Page provides methods to interact with a single tab in a [Browser](https://playwright.dev/docs/api/class-browser),
+ * or an [extension background page](https://developer.chrome.com/extensions/background_pages) in Chromium. One
+ * [Browser](https://playwright.dev/docs/api/class-browser) instance might have multiple
+ * [Page](https://playwright.dev/docs/api/class-page) instances.
  *
  * This example creates a page, navigates it to a URL, and then saves a screenshot:
  *
@@ -74,7 +72,8 @@ type ElementHandleWaitForSelectorOptionsNotHidden = ElementHandleWaitForSelector
  */
 export interface Page {
   /**
-   * Returns the value of the `pageFunction` invocation.
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression) invocation.
    *
    * If the function passed to the
    * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) returns a [Promise],
@@ -90,7 +89,7 @@ export interface Page {
    *
    * **Usage**
    *
-   * Passing argument to `pageFunction`:
+   * Passing argument to [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression):
    *
    * ```js
    * const result = await page.evaluate(([x, y]) => {
@@ -107,7 +106,7 @@ export interface Page {
    * console.log(await page.evaluate(`1 + ${x}`)); // prints "11"
    * ```
    *
-   * {@link ElementHandle} instances can be passed as an argument to the
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
    * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate):
    *
    * ```js
@@ -119,11 +118,13 @@ export interface Page {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression).
    */
   evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
   /**
-   * Returns the value of the `pageFunction` invocation.
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression) invocation.
    *
    * If the function passed to the
    * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) returns a [Promise],
@@ -139,7 +140,7 @@ export interface Page {
    *
    * **Usage**
    *
-   * Passing argument to `pageFunction`:
+   * Passing argument to [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression):
    *
    * ```js
    * const result = await page.evaluate(([x, y]) => {
@@ -156,7 +157,7 @@ export interface Page {
    * console.log(await page.evaluate(`1 + ${x}`)); // prints "11"
    * ```
    *
-   * {@link ElementHandle} instances can be passed as an argument to the
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
    * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate):
    *
    * ```js
@@ -168,18 +169,21 @@ export interface Page {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-option-expression).
    */
   evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
 
   /**
-   * Returns the value of the `pageFunction` invocation as a {@link JSHandle}.
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression) invocation as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * The only difference between
    * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) is that
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
-   * {@link JSHandle}.
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * If the function passed to the
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
@@ -200,7 +204,7 @@ export interface Page {
    * const aHandle = await page.evaluateHandle('document'); // Handle for the 'document'
    * ```
    *
-   * {@link JSHandle} instances can be passed as an argument to the
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle):
    *
    * ```js
@@ -211,17 +215,20 @@ export interface Page {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression).
    */
   evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
   /**
-   * Returns the value of the `pageFunction` invocation as a {@link JSHandle}.
+   * Returns the value of the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression) invocation as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * The only difference between
    * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) is that
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
-   * {@link JSHandle}.
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * If the function passed to the
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) returns
@@ -242,7 +249,7 @@ export interface Page {
    * const aHandle = await page.evaluateHandle('document'); // Handle for the 'document'
    * ```
    *
-   * {@link JSHandle} instances can be passed as an argument to the
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
    * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle):
    *
    * ```js
@@ -253,7 +260,8 @@ export interface Page {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-evaluate-handle-option-expression).
    */
   evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
 
@@ -290,8 +298,11 @@ export interface Page {
    * [browserContext.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-init-script)
    * and [page.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-page#page-add-init-script) is not
    * defined.
+   *
    * @param script Script to be evaluated in the page.
-   * @param arg Optional argument to pass to `script` (only supported when passing a function).
+   * @param arg Optional argument to pass to
+   * [`script`](https://playwright.dev/docs/api/class-page#page-add-init-script-option-script) (only supported when
+   * passing a function).
    */
   addInitScript<Arg>(script: PageFunction<Arg, any> | { path?: string, content?: string }, arg?: Arg): Promise<void>;
 
@@ -341,12 +352,15 @@ export interface Page {
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
    * The method finds an element matching the specified selector within the page and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error. Returns the value of `pageFunction`.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -362,7 +376,8 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    * @param options
    */
   $eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], Arg, R>, arg: Arg): Promise<R>;
@@ -370,12 +385,15 @@ export interface Page {
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
    * The method finds an element matching the specified selector within the page and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error. Returns the value of `pageFunction`.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -391,7 +409,8 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    * @param options
    */
   $eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<R>;
@@ -399,12 +418,15 @@ export interface Page {
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
    * The method finds an element matching the specified selector within the page and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error. Returns the value of `pageFunction`.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -420,7 +442,8 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    * @param options
    */
   $eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], void, R>, arg?: any): Promise<R>;
@@ -428,12 +451,15 @@ export interface Page {
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
    * The method finds an element matching the specified selector within the page and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error. Returns the value of `pageFunction`.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error. Returns the value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -449,7 +475,8 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-option-expression).
    * @param options
    */
   $eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, void, R>, arg?: any): Promise<R>;
@@ -457,12 +484,18 @@ export interface Page {
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
    * The method finds all elements matching the specified selector within the page and passes an array of matched
-   * elements as a first argument to `pageFunction`. Returns the result of `pageFunction` invocation.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
    * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -474,18 +507,25 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
    */
   $$eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
    * The method finds all elements matching the specified selector within the page and passes an array of matched
-   * elements as a first argument to `pageFunction`. Returns the result of `pageFunction` invocation.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
    * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -497,18 +537,25 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
    */
   $$eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
    * The method finds all elements matching the specified selector within the page and passes an array of matched
-   * elements as a first argument to `pageFunction`. Returns the result of `pageFunction` invocation.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
    * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -520,18 +567,25 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
    */
   $$eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], void, R>, arg?: any): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
    * The method finds all elements matching the specified selector within the page and passes an array of matched
-   * elements as a first argument to `pageFunction`. Returns the result of `pageFunction` invocation.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression). Returns
+   * the result of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression)
+   * invocation.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression) returns
+   * a [Promise], then
    * [page.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -543,12 +597,15 @@ export interface Page {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-eval-on-selector-all-option-expression).
    */
   $$eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], void, R>, arg?: any): Promise<R>;
 
   /**
-   * Returns when the `pageFunction` returns a truthy value. It resolves to a JSHandle of the truthy value.
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression) returns a
+   * truthy value. It resolves to a JSHandle of the truthy value.
    *
    * **Usage**
    *
@@ -579,12 +636,15 @@ export interface Page {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression).
    * @param options
    */
   waitForFunction<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
   /**
-   * Returns when the `pageFunction` returns a truthy value. It resolves to a JSHandle of the truthy value.
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression) returns a
+   * truthy value. It resolves to a JSHandle of the truthy value.
    *
    * **Usage**
    *
@@ -615,7 +675,8 @@ export interface Page {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression).
    * @param options
    */
   waitForFunction<R>(pageFunction: PageFunction<void, R>, arg?: any, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
@@ -625,15 +686,21 @@ export interface Page {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions makes the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -663,15 +730,21 @@ export interface Page {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions makes the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -701,15 +774,21 @@ export interface Page {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions makes the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -739,15 +818,21 @@ export interface Page {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option. Returns `null` if
+   * waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions makes the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions makes the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -774,12 +859,18 @@ export interface Page {
   waitForSelector(selector: string, options: PageWaitForSelectorOptions): Promise<null|ElementHandle<SVGElement | HTMLElement>>;
 
   /**
-   * The method adds a function called `name` on the `window` object of every frame in this page. When called, the
-   * function executes `callback` and returns a [Promise] which resolves to the return value of `callback`. If the
-   * `callback` returns a [Promise], it will be awaited.
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-name) on the `window` object of
+   * every frame in this page. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) and returns a
+   * [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback). If the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) returns a [Promise],
+   * it will be awaited.
    *
-   * The first argument of the `callback` function contains information about the caller: `{ browserContext:
-   * BrowserContext, page: Page, frame: Frame }`.
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) function contains
+   * information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
    *
    * See
    * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)
@@ -820,12 +911,18 @@ export interface Page {
    */
   exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<void>;
   /**
-   * The method adds a function called `name` on the `window` object of every frame in this page. When called, the
-   * function executes `callback` and returns a [Promise] which resolves to the return value of `callback`. If the
-   * `callback` returns a [Promise], it will be awaited.
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-name) on the `window` object of
+   * every frame in this page. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) and returns a
+   * [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback). If the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) returns a [Promise],
+   * it will be awaited.
    *
-   * The first argument of the `callback` function contains information about the caller: `{ browserContext:
-   * BrowserContext, page: Page, frame: Frame }`.
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-binding-option-callback) function contains
+   * information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
    *
    * See
    * [browserContext.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding)
@@ -865,6 +962,57 @@ export interface Page {
    * @param options
    */
   exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<void>;
+
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('request', async request => {
+   *   const response = await request.response();
+   *   const body = await response.body();
+   *   console.log(body.byteLength);
+   * });
+   * await page.goto('https://playwright.dev', { waitUntil: 'domcontentloaded' });
+   * // Waits for all the reported 'request' events to resolve.
+   * await page.removeAllListeners('request', { behavior: 'wait' });
+   * ```
+   *
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type?: string): this;
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   *
+   * **Usage**
+   *
+   * ```js
+   * page.on('request', async request => {
+   *   const response = await request.response();
+   *   const body = await response.body();
+   *   console.log(body.byteLength);
+   * });
+   * await page.goto('https://playwright.dev', { waitUntil: 'domcontentloaded' });
+   * // Waits for all the reported 'request' events to resolve.
+   * await page.removeAllListeners('request', { behavior: 'wait' });
+   * ```
+   *
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
   /**
    * Emitted when the page closes.
    */
@@ -873,7 +1021,8 @@ export interface Page {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -926,6 +1075,7 @@ export interface Page {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   on(event: 'dialog', listener: (dialog: Dialog) => any): this;
 
@@ -937,7 +1087,7 @@ export interface Page {
 
   /**
    * Emitted when attachment download started. User can access basic file operations on downloaded content via the
-   * passed {@link Download} instance.
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
    */
   on(event: 'download', listener: (download: Download) => any): this;
 
@@ -1004,7 +1154,7 @@ export interface Page {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * // Start waiting for popup before clicking. Note no await.
@@ -1017,6 +1167,7 @@ export interface Page {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   on(event: 'popup', listener: (page: Page) => any): this;
 
@@ -1042,6 +1193,7 @@ export interface Page {
    * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
    * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
    * error net::ERR_FAILED.
+   *
    */
   on(event: 'requestfailed', listener: (request: Request) => any): this;
 
@@ -1058,7 +1210,7 @@ export interface Page {
   on(event: 'response', listener: (response: Response) => any): this;
 
   /**
-   * Emitted when {@link WebSocket} request is sent.
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
    */
   on(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
 
@@ -1171,7 +1323,8 @@ export interface Page {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -1224,6 +1377,7 @@ export interface Page {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   addListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
 
@@ -1235,7 +1389,7 @@ export interface Page {
 
   /**
    * Emitted when attachment download started. User can access basic file operations on downloaded content via the
-   * passed {@link Download} instance.
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
    */
   addListener(event: 'download', listener: (download: Download) => any): this;
 
@@ -1302,7 +1456,7 @@ export interface Page {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * // Start waiting for popup before clicking. Note no await.
@@ -1315,6 +1469,7 @@ export interface Page {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   addListener(event: 'popup', listener: (page: Page) => any): this;
 
@@ -1340,6 +1495,7 @@ export interface Page {
    * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
    * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
    * error net::ERR_FAILED.
+   *
    */
   addListener(event: 'requestfailed', listener: (request: Request) => any): this;
 
@@ -1356,7 +1512,7 @@ export interface Page {
   addListener(event: 'response', listener: (response: Response) => any): this;
 
   /**
-   * Emitted when {@link WebSocket} request is sent.
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
    */
   addListener(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
 
@@ -1564,7 +1720,8 @@ export interface Page {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -1617,6 +1774,7 @@ export interface Page {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   prependListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
 
@@ -1628,7 +1786,7 @@ export interface Page {
 
   /**
    * Emitted when attachment download started. User can access basic file operations on downloaded content via the
-   * passed {@link Download} instance.
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
    */
   prependListener(event: 'download', listener: (download: Download) => any): this;
 
@@ -1695,7 +1853,7 @@ export interface Page {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * // Start waiting for popup before clicking. Note no await.
@@ -1708,6 +1866,7 @@ export interface Page {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   prependListener(event: 'popup', listener: (page: Page) => any): this;
 
@@ -1733,6 +1892,7 @@ export interface Page {
    * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
    * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
    * error net::ERR_FAILED.
+   *
    */
   prependListener(event: 'requestfailed', listener: (request: Request) => any): this;
 
@@ -1749,7 +1909,7 @@ export interface Page {
   prependListener(event: 'response', listener: (response: Response) => any): this;
 
   /**
-   * Emitted when {@link WebSocket} request is sent.
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
    */
   prependListener(event: 'websocket', listener: (webSocket: WebSocket) => any): this;
 
@@ -1777,7 +1937,8 @@ export interface Page {
    *   handler is only called when you perform an action/assertion - if the overlay becomes visible but you don't
    *   perform any actions, the handler will not be triggered.
    * - After executing the handler, Playwright will ensure that overlay that triggered the handler is not visible
-   *   anymore. You can opt-out of this behavior with `noWaitAfter`.
+   *   anymore. You can opt-out of this behavior with
+   *   [`noWaitAfter`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-no-wait-after).
    * - The execution time of the handler counts towards the timeout of the action/assertion that executed the handler.
    *   If your handler takes too long, it might cause timeouts.
    * - You can register multiple handlers. However, only a single handler will be running at a time. Make sure the
@@ -1785,13 +1946,17 @@ export interface Page {
    *
    * **NOTE** Running the handler will alter your page state mid-test. For example it will change the currently focused
    * element and move the mouse. Make sure that actions that run after the handler are self-contained and do not rely on
-   * the focus and mouse state being unchanged. <br /> <br /> For example, consider a test that calls
+   * the focus and mouse state being unchanged.
+   *
+   * For example, consider a test that calls
    * [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) followed by
    * [keyboard.press(key[, options])](https://playwright.dev/docs/api/class-keyboard#keyboard-press). If your handler
    * clicks a button between these two actions, the focused element most likely will be wrong, and key press will happen
    * on the unexpected element. Use
    * [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press) instead to avoid this
-   * problem. <br /> <br /> Another example is a series of mouse actions, where
+   * problem.
+   *
+   * Another example is a series of mouse actions, where
    * [mouse.move(x, y[, options])](https://playwright.dev/docs/api/class-mouse#mouse-move) is followed by
    * [mouse.down([options])](https://playwright.dev/docs/api/class-mouse#mouse-down). Again, when the handler runs
    * between these two actions, the mouse position will be wrong during the mouse down. Prefer self-contained actions
@@ -1827,8 +1992,9 @@ export interface Page {
    * ```
    *
    * An example with a custom callback on every actionability check. It uses a `<body>` locator that is always visible,
-   * so the handler is called before every actionability check. It is important to specify `noWaitAfter`, because the
-   * handler does not hide the `<body>` element.
+   * so the handler is called before every actionability check. It is important to specify
+   * [`noWaitAfter`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-no-wait-after), because
+   * the handler does not hide the `<body>` element.
    *
    * ```js
    * // Setup the handler.
@@ -1842,7 +2008,7 @@ export interface Page {
    * ```
    *
    * Handler takes the original locator as an argument. You can also automatically remove the handler after a number of
-   * invocations by setting `times`:
+   * invocations by setting [`times`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-times):
    *
    * ```js
    * await page.addLocatorHandler(page.getByLabel('Close'), async locator => {
@@ -1851,8 +2017,9 @@ export interface Page {
    * ```
    *
    * @param locator Locator that triggers the handler.
-   * @param handler Function that should be run once `locator` appears. This function should get rid of the element that blocks actions
-   * like click.
+   * @param handler Function that should be run once
+   * [`locator`](https://playwright.dev/docs/api/class-page#page-add-locator-handler-option-locator) appears. This
+   * function should get rid of the element that blocks actions like click.
    * @param options
    */
   addLocatorHandler(locator: Locator, handler: ((locator: Locator) => Promise<any>), options?: {
@@ -1930,19 +2097,24 @@ export interface Page {
    * **NOTE** Use locator-based [locator.check([options])](https://playwright.dev/docs/api/class-locator#locator-check) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method checks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
+   * This method checks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-check-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-check-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
    *    already checked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-check-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now checked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-check-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -1994,17 +2166,24 @@ export interface Page {
    * **NOTE** Use locator-based [locator.click([options])](https://playwright.dev/docs/api/class-locator#locator-click) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method clicks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-click-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-click-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-click-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
-   *    element, or the specified `position`.
-   * 1. Wait for initiated navigations to either succeed or fail, unless `noWaitAfter` option is set.
-   *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-page#page-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-page#page-click-option-no-wait-after) option is set.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-click-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -2071,19 +2250,25 @@ export interface Page {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
 
   /**
-   * If `runBeforeUnload` is `false`, does not run any unload handlers and waits for the page to be closed. If
-   * `runBeforeUnload` is `true` the method will run unload handlers, but will **not** wait for the page to close.
+   * If [`runBeforeUnload`](https://playwright.dev/docs/api/class-page#page-close-option-run-before-unload) is `false`,
+   * does not run any unload handlers and waits for the page to be closed. If
+   * [`runBeforeUnload`](https://playwright.dev/docs/api/class-page#page-close-option-run-before-unload) is `true` the
+   * method will run unload handlers, but will **not** wait for the page to close.
    *
    * By default, `page.close()` **does not** run `beforeunload` handlers.
    *
-   * **NOTE** if `runBeforeUnload` is passed as true, a `beforeunload` dialog might be summoned and should be handled
-   * manually via [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) event.
+   * **NOTE** if [`runBeforeUnload`](https://playwright.dev/docs/api/class-page#page-close-option-run-before-unload) is
+   * passed as true, a `beforeunload` dialog might be summoned and should be handled manually via
+   * [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) event.
+   *
    * @param options
    */
   close(options?: {
@@ -2113,18 +2298,26 @@ export interface Page {
    * **NOTE** Use locator-based [locator.dblclick([options])](https://playwright.dev/docs/api/class-locator#locator-dblclick)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method double clicks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method double clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-dblclick-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-page#page-dblclick-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-dblclick-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-page#page-dblclick-option-position).
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-dblclick-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** `page.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -2184,7 +2377,9 @@ export interface Page {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -2204,10 +2399,13 @@ export interface Page {
    * await page.dispatchEvent('button#submit', 'click');
    * ```
    *
-   * Under the hood, it creates an instance of an event based on the given `type`, initializes it with `eventInit`
-   * properties and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-page#page-dispatch-event-option-type), initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-page#page-dispatch-event-option-event-init) properties and
+   * dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
    *
-   * Since `eventInit` is event-specific, please refer to the events documentation for the lists of initial properties:
+   * Since [`eventInit`](https://playwright.dev/docs/api/class-page#page-dispatch-event-option-event-init) is
+   * event-specific, please refer to the events documentation for the lists of initial properties:
    * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
    * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
    * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
@@ -2354,19 +2552,24 @@ export interface Page {
    * // → true
    * await page.evaluate(() => matchMedia('(prefers-color-scheme: light)').matches);
    * // → false
-   * await page.evaluate(() => matchMedia('(prefers-color-scheme: no-preference)').matches);
-   * // → false
    * ```
    *
    * @param options
    */
   emulateMedia(options?: {
     /**
-     * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`.
-     * Passing `null` disables color scheme emulation.
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. Passing `null` disables color scheme emulation.
+     * `'no-preference'` is deprecated.
      */
     colorScheme?: null|"light"|"dark"|"no-preference";
 
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. Passing `null`
+     * disables contrast emulation.
+     */
+    contrast?: null|"no-preference"|"more";
+
     /**
      * Emulates `'forced-colors'` media feature, supported values are `'active'` and `'none'`. Passing `null` disables
      * forced colors emulation.
@@ -2387,10 +2590,15 @@ export interface Page {
   }): Promise<void>;
 
   /**
-   * The method adds a function called `name` on the `window` object of every frame in the page. When called, the
-   * function executes `callback` and returns a [Promise] which resolves to the return value of `callback`.
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-page#page-expose-function-option-name) on the `window` object of
+   * every frame in the page. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-function-option-callback) and returns a
+   * [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-page#page-expose-function-option-callback).
    *
-   * If the `callback` returns a [Promise], it will be awaited.
+   * If the [`callback`](https://playwright.dev/docs/api/class-page#page-expose-function-option-callback) returns a
+   * [Promise], it will be awaited.
    *
    * See
    * [browserContext.exposeFunction(name, callback)](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function)
@@ -2436,9 +2644,10 @@ export interface Page {
    * **NOTE** Use locator-based [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method waits for an element matching `selector`, waits for [actionability](https://playwright.dev/docs/actionability) checks,
-   * focuses the element, fills it and triggers an `input` event after filling. Note that you can pass an empty string
-   * to clear the input field.
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-fill-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, fills it and triggers an `input` event after
+   * filling. Note that you can pass an empty string to clear the input field.
    *
    * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
    * error. However, if the element is inside the `<label>` element that has an associated
@@ -2483,8 +2692,10 @@ export interface Page {
    * **NOTE** Use locator-based [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method fetches an element with `selector` and focuses it. If there's no element matching `selector`, the
-   * method waits until a matching element appears in the DOM.
+   * This method fetches an element with
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-focus-option-selector) and focuses it. If there's no
+   * element matching [`selector`](https://playwright.dev/docs/api/class-page#page-focus-option-selector), the method
+   * waits until a matching element appears in the DOM.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -2721,12 +2932,15 @@ export interface Page {
      *
      * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
      * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
      */
     disabled?: boolean;
 
     /**
-     * Whether `name` is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when `name` is a
-     * regular expression. Note that exact match still trims whitespace.
+     * Whether [`name`](https://playwright.dev/docs/api/class-page#page-get-by-role-option-name) is matched exactly:
+     * case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-page#page-get-by-role-option-name) is a regular expression. Note
+     * that exact match still trims whitespace.
      */
     exact?: boolean;
 
@@ -2755,7 +2969,8 @@ export interface Page {
 
     /**
      * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
-     * case-insensitive and searches for a substring, use `exact` to control this behavior.
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-page#page-get-by-role-option-exact) to control this behavior.
      *
      * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
      */
@@ -2961,7 +3176,8 @@ export interface Page {
    * The method will throw an error if:
    * - there's an SSL error (e.g. in case of self-signed certificates).
    * - target URL is invalid.
-   * - the `timeout` is exceeded during navigation.
+   * - the [`timeout`](https://playwright.dev/docs/api/class-page#page-goto-option-timeout) is exceeded during
+   *   navigation.
    * - the remote server does not respond or is unreachable.
    * - the main resource failed to load.
    *
@@ -2974,8 +3190,10 @@ export interface Page {
    *
    * **NOTE** Headless mode doesn't support navigation to a PDF document. See the
    * [upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=761295).
-   * @param url URL to navigate page to. The url should include scheme, e.g. `https://`. When a `baseURL` via the context options
-   * was provided and the passed URL is a path, it gets merged via the
+   *
+   * @param url URL to navigate page to. The url should include scheme, e.g. `https://`. When a
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+   * options was provided and the passed URL is a path, it gets merged via the
    * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
    * @param options
    */
@@ -3012,16 +3230,22 @@ export interface Page {
    * **NOTE** Use locator-based [locator.hover([options])](https://playwright.dev/docs/api/class-locator#locator-hover) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method hovers over an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method hovers over an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-hover-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-hover-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-hover-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-page#page-hover-option-position).
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-hover-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -3071,7 +3295,9 @@ export interface Page {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -3267,8 +3493,9 @@ export interface Page {
    * **NOTE** Use locator-based [locator.isHidden([options])](https://playwright.dev/docs/api/class-locator#locator-is-hidden)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).  `selector` that
-   * does not match any elements is considered hidden.
+   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-is-hidden-option-selector) that does not match any
+   * elements is considered hidden.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -3292,8 +3519,9 @@ export interface Page {
    * **NOTE** Use locator-based [locator.isVisible([options])](https://playwright.dev/docs/api/class-locator#locator-is-visible)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible). `selector` that does not match any elements
-   * is considered not visible.
+   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-is-visible-option-selector) that does not match any
+   * elements is considered not visible.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -3332,8 +3560,8 @@ export interface Page {
      * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
      * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     has?: Locator;
 
@@ -3341,8 +3569,8 @@ export interface Page {
      * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
      * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     hasNot?: Locator;
 
@@ -3371,22 +3599,21 @@ export interface Page {
   opener(): Promise<null|Page>;
 
   /**
-   * Pauses script execution. Playwright will stop executing the script and wait for the user to either press 'Resume'
-   * button in the page overlay or to call `playwright.resume()` in the DevTools console.
+   * Pauses script execution. Playwright will stop executing the script and wait for the user to either press the
+   * 'Resume' button in the page overlay or to call `playwright.resume()` in the DevTools console.
    *
    * User can inspect selectors or perform manual steps while paused. Resume will continue running the original script
    * from the place it was paused.
    *
-   * **NOTE** This method requires Playwright to be started in a headed mode, with a falsy `headless` value in the
-   * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch).
+   * **NOTE** This method requires Playwright to be started in a headed mode, with a falsy
+   * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-headless) option.
+   *
    */
   pause(): Promise<void>;
 
   /**
    * Returns the PDF buffer.
    *
-   * **NOTE** Generating a pdf is currently only supported in Chromium headless.
-   *
    * `page.pdf()` generates a pdf of the page with `print` css media. To generate a pdf with `screen` media, call
    * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) before calling
    * `page.pdf()`:
@@ -3403,8 +3630,10 @@ export interface Page {
    * await page.pdf({ path: 'page.pdf' });
    * ```
    *
-   * The `width`, `height`, and `margin` options accept values labeled with units. Unlabeled values are treated as
-   * pixels.
+   * The [`width`](https://playwright.dev/docs/api/class-page#page-pdf-option-width),
+   * [`height`](https://playwright.dev/docs/api/class-page#page-pdf-option-height), and
+   * [`margin`](https://playwright.dev/docs/api/class-page#page-pdf-option-margin) options accept values labeled with
+   * units. Unlabeled values are treated as pixels.
    *
    * A few examples:
    * - `page.pdf({width: 100})` - prints with width set to 100 pixels
@@ -3417,7 +3646,7 @@ export interface Page {
    * - `cm` - centimeter
    * - `mm` - millimeter
    *
-   * The `format` options are:
+   * The [`format`](https://playwright.dev/docs/api/class-page#page-pdf-option-format) options are:
    * - `Letter`: 8.5in x 11in
    * - `Legal`: 8.5in x 14in
    * - `Tabloid`: 11in x 17in
@@ -3430,8 +3659,11 @@ export interface Page {
    * - `A5`: 5.83in x 8.27in
    * - `A6`: 4.13in x 5.83in
    *
-   * **NOTE** `headerTemplate` and `footerTemplate` markup have the following limitations: > 1. Script tags inside
-   * templates are not evaluated. > 2. Page styles are not visible inside templates.
+   * **NOTE** [`headerTemplate`](https://playwright.dev/docs/api/class-page#page-pdf-option-header-template) and
+   * [`footerTemplate`](https://playwright.dev/docs/api/class-page#page-pdf-option-footer-template) markup have the
+   * following limitations: > 1. Script tags inside templates are not evaluated. > 2. Page styles are not visible inside
+   * templates.
+   *
    * @param options
    */
   pdf(options?: {
@@ -3441,12 +3673,15 @@ export interface Page {
     displayHeaderFooter?: boolean;
 
     /**
-     * HTML template for the print footer. Should use the same format as the `headerTemplate`.
+     * HTML template for the print footer. Should use the same format as the
+     * [`headerTemplate`](https://playwright.dev/docs/api/class-page#page-pdf-option-header-template).
      */
     footerTemplate?: string;
 
     /**
-     * Paper format. If set, takes priority over `width` or `height` options. Defaults to 'Letter'.
+     * Paper format. If set, takes priority over
+     * [`width`](https://playwright.dev/docs/api/class-page#page-pdf-option-width) or
+     * [`height`](https://playwright.dev/docs/api/class-page#page-pdf-option-height) options. Defaults to 'Letter'.
      */
     format?: string;
 
@@ -3507,14 +3742,18 @@ export interface Page {
     pageRanges?: string;
 
     /**
-     * The file path to save the PDF to. If `path` is a relative path, then it is resolved relative to the current working
-     * directory. If no path is provided, the PDF won't be saved to the disk.
+     * The file path to save the PDF to. If [`path`](https://playwright.dev/docs/api/class-page#page-pdf-option-path) is a
+     * relative path, then it is resolved relative to the current working directory. If no path is provided, the PDF won't
+     * be saved to the disk.
      */
     path?: string;
 
     /**
-     * Give any CSS `@page` size declared in the page priority over what is declared in `width` and `height` or `format`
-     * options. Defaults to `false`, which will scale the content to fit the paper size.
+     * Give any CSS `@page` size declared in the page priority over what is declared in
+     * [`width`](https://playwright.dev/docs/api/class-page#page-pdf-option-width) and
+     * [`height`](https://playwright.dev/docs/api/class-page#page-pdf-option-height) or
+     * [`format`](https://playwright.dev/docs/api/class-page#page-pdf-option-format) options. Defaults to `false`, which
+     * will scale the content to fit the paper size.
      */
     preferCSSPageSize?: boolean;
 
@@ -3547,9 +3786,10 @@ export interface Page {
    * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
    * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
    *
-   * `key` can specify the intended
+   * [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) can specify the intended
    * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
-   * to generate the text for. A superset of the `key` values can be found
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) values can be found
    * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
    *
    * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
@@ -3559,10 +3799,11 @@ export interface Page {
    * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
    * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
    *
-   * Holding down `Shift` will type the text that corresponds to the `key` in the upper case.
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) in the upper case.
    *
-   * If `key` is a single character, it is case-sensitive, so the values `a` and `A` will generate different respective
-   * texts.
+   * If [`key`](https://playwright.dev/docs/api/class-page#page-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
    *
    * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
    * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
@@ -3653,6 +3894,26 @@ export interface Page {
    */
   removeLocatorHandler(locator: Locator): Promise<void>;
 
+  /**
+   * Request the page to perform garbage collection. Note that there is no guarantee that all unreachable objects will
+   * be collected.
+   *
+   * This is useful to help detect memory leaks. For example, if your page has a large object `'suspect'` that might be
+   * leaked, you can check that it does not leak by using a
+   * [`WeakRef`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WeakRef).
+   *
+   * ```js
+   * // 1. In your page, save a WeakRef for the "suspect".
+   * await page.evaluate(() => globalThis.suspectWeakRef = new WeakRef(suspect));
+   * // 2. Request garbage collection.
+   * await page.requestGC();
+   * // 3. Check that weak ref does not deref to the original object.
+   * expect(await page.evaluate(() => !globalThis.suspectWeakRef.deref())).toBe(true);
+   * ```
+   *
+   */
+  requestGC(): Promise<void>;
+
   /**
    * Routing provides the capability to modify network requests that are made by a page.
    *
@@ -3664,7 +3925,8 @@ export interface Page {
    * **NOTE** [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) will not
    * intercept requests intercepted by Service Worker. See [this](https://github.com/microsoft/playwright/issues/1090)
    * issue. We recommend disabling Service Workers when using request interception by setting
-   * `Browser.newContext.serviceWorkers` to `'block'`.
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
    *
    * **NOTE** [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route) will not
    * intercept the first request of a popup page. Use
@@ -3711,8 +3973,10 @@ export interface Page {
    * [page.unroute(url[, handler])](https://playwright.dev/docs/api/class-page#page-unroute).
    *
    * **NOTE** Enabling routing disables http cache.
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a `baseURL` via the context
-   * options was provided and the passed URL is a path, it gets merged via the
+   *
+   * @param url A glob pattern, regex pattern, or predicate that receives a [URL] to match during routing. If
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) is set in the
+   * context options and the provided URL is a string that does not start with `*`, it is resolved using the
    * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
    * @param handler handler function to route the request.
    * @param options
@@ -3730,7 +3994,9 @@ export interface Page {
    *
    * Playwright will not serve requests intercepted by Service Worker from the HAR file. See
    * [this](https://github.com/microsoft/playwright/issues/1090) issue. We recommend disabling Service Workers when
-   * using request interception by setting `Browser.newContext.serviceWorkers` to `'block'`.
+   * using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
    * @param har Path to a [HAR](http://www.softwareishard.com/blog/har-12-spec) file with prerecorded network data. If `path` is a
    * relative path, then it is resolved relative to the current working directory.
    * @param options
@@ -3760,7 +4026,8 @@ export interface Page {
 
     /**
      * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
-     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to
+     * `minimal`.
      */
     updateMode?: "full"|"minimal";
 
@@ -3771,6 +4038,32 @@ export interface Page {
     url?: string|RegExp;
   }): Promise<void>;
 
+  /**
+   * This method allows to modify websocket connections that are made by the page.
+   *
+   * Note that only `WebSocket`s created after this method was called will be routed. It is recommended to call this
+   * method before navigating the page.
+   *
+   * **Usage**
+   *
+   * Below is an example of a simple mock that responds to a single message. See
+   * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute) for more details and examples.
+   *
+   * ```js
+   * await page.routeWebSocket('/ws', ws => {
+   *   ws.onMessage(message => {
+   *     if (message === 'request')
+   *       ws.send('response');
+   *   });
+   * });
+   * ```
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) context option.
+   * @param handler Handler function to route the WebSocket.
+   */
+  routeWebSocket(url: string|RegExp|((url: URL) => boolean), handler: ((websocketroute: WebSocketRoute) => Promise<any>|any)): Promise<void>;
+
   /**
    * Returns the buffer with the captured screenshot.
    * @param options
@@ -3782,8 +4075,10 @@ export interface Page {
    * [locator.selectOption(values[, options])](https://playwright.dev/docs/api/class-locator#locator-select-option)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method waits for an element matching `selector`, waits for [actionability](https://playwright.dev/docs/actionability) checks, waits
-   * until all specified options are present in the `<select>` element and selects these options.
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-select-option-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, waits until all specified options are present in the `<select>`
+   * element and selects these options.
    *
    * If the target element is not a `<select>` element, this method throws an error. However, if the element is inside
    * the `<label>` element that has an associated
@@ -3852,10 +4147,8 @@ export interface Page {
     force?: boolean;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
-     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
-     * navigating to inaccessible pages. Defaults to `false`.
-     * @deprecated This option will default to `true` in the future.
+     * This option has no effect.
+     * @deprecated This option has no effect.
      */
     noWaitAfter?: boolean;
 
@@ -3879,19 +4172,25 @@ export interface Page {
    * [locator.setChecked(checked[, options])](https://playwright.dev/docs/api/class-locator#locator-set-checked)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method checks or unchecks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
+   * This method checks or unchecks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-set-checked-option-selector) by performing the
+   * following steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-page#page-set-checked-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws.
    * 1. If the element already has the right checked state, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-set-checked-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-set-checked-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param checked Whether to check or uncheck the checkbox.
@@ -3986,18 +4285,21 @@ export interface Page {
    * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
    * and
    * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout).
+   *
    * @param timeout Maximum navigation time in milliseconds
    */
   setDefaultNavigationTimeout(timeout: number): void;
 
   /**
-   * This setting will change the default maximum time for all the methods accepting `timeout` option.
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-set-default-timeout-option-timeout) option.
    *
    * **NOTE**
    * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout)
    * takes priority over
    * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout).
-   * @param timeout Maximum time in milliseconds
+   *
+   * @param timeout Maximum time in milliseconds. Pass `0` to disable timeout.
    */
   setDefaultTimeout(timeout: number): void;
 
@@ -4007,6 +4309,7 @@ export interface Page {
    * **NOTE**
    * [page.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-page#page-set-extra-http-headers) does
    * not guarantee the order of headers in the outgoing requests.
+   *
    * @param headers An object containing additional HTTP headers to be sent with every request. All header values must be strings.
    */
   setExtraHTTPHeaders(headers: { [key: string]: string; }): Promise<void>;
@@ -4020,9 +4323,9 @@ export interface Page {
    * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs
    * with a `[webkitdirectory]` attribute, only a single directory path is supported.
    *
-   * This method expects `selector` to point to an
-   * [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the element is inside
-   * the `<label>` element that has an associated
+   * This method expects [`selector`](https://playwright.dev/docs/api/class-page#page-set-input-files-option-selector)
+   * to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the
+   * element is inside the `<label>` element that has an associated
    * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
@@ -4123,19 +4426,26 @@ export interface Page {
    * **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
    * more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method taps an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method taps an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-tap-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-page#page-tap-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-tap-option-force) option is set. If the element is
+   *    detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified [`position`](https://playwright.dev/docs/api/class-page#page-tap-option-position).
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-tap-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** [page.tap(selector[, options])](https://playwright.dev/docs/api/class-page#page-tap) the method will throw
-   * if `hasTouch` option of the browser context is false.
+   * if [`hasTouch`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-has-touch) option of the
+   * browser context is false.
+   *
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -4185,7 +4495,9 @@ export interface Page {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -4270,19 +4582,25 @@ export interface Page {
    * **NOTE** Use locator-based [locator.uncheck([options])](https://playwright.dev/docs/api/class-locator#locator-uncheck)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method unchecks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
+   * This method unchecks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-page#page-uncheck-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-page#page-uncheck-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
    *    already unchecked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-page#page-uncheck-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now unchecked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-page#page-uncheck-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -4332,8 +4650,9 @@ export interface Page {
 
   /**
    * Removes a route created with
-   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route). When `handler` is not
-   * specified, removes all routes for the `url`.
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route). When
+   * [`handler`](https://playwright.dev/docs/api/class-page#page-unroute-option-handler) is not specified, removes all
+   * routes for the [`url`](https://playwright.dev/docs/api/class-page#page-unroute-option-url).
    * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing.
    * @param handler Optional handler function to route the request.
    */
@@ -4384,7 +4703,8 @@ export interface Page {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -4437,6 +4757,7 @@ export interface Page {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   waitForEvent(event: 'dialog', optionsOrPredicate?: { predicate?: (dialog: Dialog) => boolean | Promise<boolean>, timeout?: number } | ((dialog: Dialog) => boolean | Promise<boolean>)): Promise<Dialog>;
 
@@ -4448,7 +4769,7 @@ export interface Page {
 
   /**
    * Emitted when attachment download started. User can access basic file operations on downloaded content via the
-   * passed {@link Download} instance.
+   * passed [Download](https://playwright.dev/docs/api/class-download) instance.
    */
   waitForEvent(event: 'download', optionsOrPredicate?: { predicate?: (download: Download) => boolean | Promise<boolean>, timeout?: number } | ((download: Download) => boolean | Promise<boolean>)): Promise<Download>;
 
@@ -4515,7 +4836,7 @@ export interface Page {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * // Start waiting for popup before clicking. Note no await.
@@ -4528,6 +4849,7 @@ export interface Page {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   waitForEvent(event: 'popup', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
 
@@ -4553,6 +4875,7 @@ export interface Page {
    * with [page.on('requestfailed')](https://playwright.dev/docs/api/class-page#page-event-request-failed). A request
    * will only be considered failed when the client cannot get an HTTP response from the server, e.g. due to network
    * error net::ERR_FAILED.
+   *
    */
   waitForEvent(event: 'requestfailed', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
 
@@ -4569,7 +4892,7 @@ export interface Page {
   waitForEvent(event: 'response', optionsOrPredicate?: { predicate?: (response: Response) => boolean | Promise<boolean>, timeout?: number } | ((response: Response) => boolean | Promise<boolean>)): Promise<Response>;
 
   /**
-   * Emitted when {@link WebSocket} request is sent.
+   * Emitted when [WebSocket](https://playwright.dev/docs/api/class-websocket) request is sent.
    */
   waitForEvent(event: 'websocket', optionsOrPredicate?: { predicate?: (webSocket: WebSocket) => boolean | Promise<boolean>, timeout?: number } | ((webSocket: WebSocket) => boolean | Promise<boolean>)): Promise<WebSocket>;
 
@@ -4645,6 +4968,7 @@ export interface Page {
    *
    * **NOTE** Usage of the [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) to change the URL
    * is considered a navigation.
+   *
    * @deprecated This method is inherently racy, please use
    * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url) instead.
    * @param options
@@ -4699,7 +5023,7 @@ export interface Page {
    * const request = await requestPromise;
    * ```
    *
-   * @param urlOrPredicate Request URL string, regex or predicate receiving {@link Request} object.
+   * @param urlOrPredicate Request URL string, regex or predicate receiving [Request](https://playwright.dev/docs/api/class-request) object.
    * @param options
    */
   waitForRequest(urlOrPredicate: string|RegExp|((request: Request) => boolean|Promise<boolean>), options?: {
@@ -4732,8 +5056,9 @@ export interface Page {
    * const response = await responsePromise;
    * ```
    *
-   * @param urlOrPredicate Request URL string, regex or predicate receiving {@link Response} object. When a `baseURL` via the context options
-   * was provided and the passed URL is a path, it gets merged via the
+   * @param urlOrPredicate Request URL string, regex or predicate receiving [Response](https://playwright.dev/docs/api/class-response) object.
+   * When a [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the
+   * context options was provided and the passed URL is a path, it gets merged via the
    * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
    * @param options
    */
@@ -4748,10 +5073,11 @@ export interface Page {
   }): Promise<Response>;
 
   /**
-   * **NOTE** Never wait for timeout in production. Tests that wait for time are inherently flaky. Use {@link Locator} actions
-   * and web assertions that wait automatically.
+   * **NOTE** Never wait for timeout in production. Tests that wait for time are inherently flaky. Use
+   * [Locator](https://playwright.dev/docs/api/class-locator) actions and web assertions that wait automatically.
    *
-   * Waits for the given `timeout` in milliseconds.
+   * Waits for the given [`timeout`](https://playwright.dev/docs/api/class-page#page-wait-for-timeout-option-timeout) in
+   * milliseconds.
    *
    * Note that `page.waitForTimeout()` should only be used for debugging. Tests using the timer in production are going
    * to be flaky. Use signals such as network events, selectors becoming visible and others instead.
@@ -4810,6 +5136,7 @@ export interface Page {
    * [WebWorkers](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) associated with the page.
    *
    * **NOTE** This does not contain ServiceWorkers
+   *
    */
   workers(): Array<Worker>;
 
@@ -4828,7 +5155,8 @@ export interface Page {
   /**
    * **NOTE** Only available for Chromium atm.
    *
-   * Browser-specific Coverage implementation. See {@link Coverage} for more details.
+   * Browser-specific Coverage implementation. See [Coverage](https://playwright.dev/docs/api/class-coverage) for more
+   * details.
    */
   coverage: Coverage;
 
@@ -4855,7 +5183,8 @@ export interface Page {
  * [page.mainFrame()](https://playwright.dev/docs/api/class-page#page-main-frame) and
  * [frame.childFrames()](https://playwright.dev/docs/api/class-frame#frame-child-frames) methods.
  *
- * {@link Frame} object's lifecycle is controlled by three events, dispatched on the page object:
+ * [Frame](https://playwright.dev/docs/api/class-frame) object's lifecycle is controlled by three events, dispatched
+ * on the page object:
  * - [page.on('frameattached')](https://playwright.dev/docs/api/class-page#page-event-frame-attached) - fired when
  *   the frame gets attached to the page. A Frame can be attached to the page only once.
  * - [page.on('framenavigated')](https://playwright.dev/docs/api/class-page#page-event-frame-navigated) - fired when
@@ -4886,7 +5215,8 @@ export interface Page {
  */
 export interface Frame {
   /**
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
    *
    * If the function passed to the
    * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns a
@@ -4915,7 +5245,7 @@ export interface Frame {
    * console.log(await frame.evaluate('1 + 2')); // prints "3"
    * ```
    *
-   * {@link ElementHandle} instances can be passed as an argument to the
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
    * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate):
    *
    * ```js
@@ -4927,11 +5257,13 @@ export interface Frame {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
    */
   evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
   /**
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
    *
    * If the function passed to the
    * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) returns a
@@ -4960,7 +5292,7 @@ export interface Frame {
    * console.log(await frame.evaluate('1 + 2')); // prints "3"
    * ```
    *
-   * {@link ElementHandle} instances can be passed as an argument to the
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) instances can be passed as an argument to the
    * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate):
    *
    * ```js
@@ -4972,18 +5304,21 @@ export interface Frame {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-option-expression).
    */
   evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
 
   /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * The only difference between
    * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) and
    * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle) is
    * that [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle)
-   * returns {@link JSHandle}.
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * If the function, passed to the
    * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle),
@@ -5004,7 +5339,7 @@ export interface Frame {
    * const aHandle = await frame.evaluateHandle('document'); // Handle for the 'document'.
    * ```
    *
-   * {@link JSHandle} instances can be passed as an argument to the
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
    * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle):
    *
    * ```js
@@ -5017,17 +5352,20 @@ export interface Frame {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression).
    */
   evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
   /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * The only difference between
    * [frame.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate) and
    * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle) is
    * that [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle)
-   * returns {@link JSHandle}.
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
    * If the function, passed to the
    * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle),
@@ -5048,7 +5386,7 @@ export interface Frame {
    * const aHandle = await frame.evaluateHandle('document'); // Handle for the 'document'.
    * ```
    *
-   * {@link JSHandle} instances can be passed as an argument to the
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) instances can be passed as an argument to the
    * [frame.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle):
    *
    * ```js
@@ -5061,7 +5399,8 @@ export interface Frame {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-evaluate-handle-option-expression).
    */
   evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
 
@@ -5071,8 +5410,8 @@ export interface Frame {
    *
    * Returns the ElementHandle pointing to the frame element.
    *
-   * **NOTE** The use of {@link ElementHandle} is discouraged, use {@link Locator} objects and web-first assertions
-   * instead.
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions instead.
    *
    * The method finds an element matching the specified selector within the frame. If no elements match the selector,
    * returns `null`.
@@ -5086,8 +5425,8 @@ export interface Frame {
    *
    * Returns the ElementHandle pointing to the frame element.
    *
-   * **NOTE** The use of {@link ElementHandle} is discouraged, use {@link Locator} objects and web-first assertions
-   * instead.
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions instead.
    *
    * The method finds an element matching the specified selector within the frame. If no elements match the selector,
    * returns `null`.
@@ -5102,7 +5441,8 @@ export interface Frame {
    *
    * Returns the ElementHandles pointing to the frame elements.
    *
-   * **NOTE** The use of {@link ElementHandle} is discouraged, use {@link Locator} objects instead.
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects instead.
    *
    * The method finds all elements matching the specified selector within the frame. If no elements match the selector,
    * returns empty array.
@@ -5115,7 +5455,8 @@ export interface Frame {
    *
    * Returns the ElementHandles pointing to the frame elements.
    *
-   * **NOTE** The use of {@link ElementHandle} is discouraged, use {@link Locator} objects instead.
+   * **NOTE** The use of [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) is discouraged, use
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects instead.
    *
    * The method finds all elements matching the specified selector within the frame. If no elements match the selector,
    * returns empty array.
@@ -5127,14 +5468,17 @@ export interface Frame {
    * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
    * tests. Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector within the frame and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -5148,7 +5492,8 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    * @param options
    */
   $eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], Arg, R>, arg: Arg): Promise<R>;
@@ -5156,14 +5501,17 @@ export interface Frame {
    * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
    * tests. Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector within the frame and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -5177,7 +5525,8 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    * @param options
    */
   $eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<R>;
@@ -5185,14 +5534,17 @@ export interface Frame {
    * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
    * tests. Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector within the frame and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -5206,7 +5558,8 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    * @param options
    */
   $eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], void, R>, arg?: any): Promise<R>;
@@ -5214,14 +5567,17 @@ export interface Frame {
    * **NOTE** This method does not wait for the element to pass the actionability checks and therefore can lead to the flaky
    * tests. Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector within the frame and passes it as a first argument to
-   * `pageFunction`. If no elements match the selector, the method throws an error.
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression). If no
+   * elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression) returns a
+   * [Promise], then
    * [frame.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -5235,7 +5591,8 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-option-expression).
    * @param options
    */
   $eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, void, R>, arg?: any): Promise<R>;
@@ -5243,14 +5600,18 @@ export interface Frame {
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector within the frame and passes an array of matched
-   * elements as a first argument to `pageFunction`.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -5262,20 +5623,25 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    */
   $$eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector within the frame and passes an array of matched
-   * elements as a first argument to `pageFunction`.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -5287,20 +5653,25 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    */
   $$eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector within the frame and passes an array of matched
-   * elements as a first argument to `pageFunction`.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -5312,20 +5683,25 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    */
   $$eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], void, R>, arg?: any): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector within the frame and passes an array of matched
-   * elements as a first argument to `pageFunction`.
+   * elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [frame.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -5337,12 +5713,15 @@ export interface Frame {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-eval-on-selector-all-option-expression).
    */
   $$eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], void, R>, arg?: any): Promise<R>;
 
   /**
-   * Returns when the `pageFunction` returns a truthy value, returns that value.
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression) returns a
+   * truthy value, returns that value.
    *
    * **Usage**
    *
@@ -5371,12 +5750,15 @@ export interface Frame {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression).
    * @param options
    */
   waitForFunction<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
   /**
-   * Returns when the `pageFunction` returns a truthy value, returns that value.
+   * Returns when the
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression) returns a
+   * truthy value, returns that value.
    *
    * **Usage**
    *
@@ -5405,7 +5787,8 @@ export interface Frame {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-frame#frame-wait-for-function-option-expression).
    * @param options
    */
   waitForFunction<R>(pageFunction: PageFunction<void, R>, arg?: any, options?: PageWaitForFunctionOptions): Promise<SmartHandle<R>>;
@@ -5415,15 +5798,21 @@ export interface Frame {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions make the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -5453,15 +5842,21 @@ export interface Frame {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions make the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -5491,15 +5886,21 @@ export interface Frame {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions make the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -5529,15 +5930,21 @@ export interface Frame {
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead. Read more
    * about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns when element specified by selector satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
+   * Returns when element specified by selector satisfies
+   * [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option. Returns `null`
+   * if waiting for `hidden` or `detached`.
    *
-   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using {@link Locator}
-   * objects and web-first assertions make the code wait-for-selector-free.
+   * **NOTE** Playwright automatically waits for element to be ready before performing an action. Using
+   * [Locator](https://playwright.dev/docs/api/class-locator) objects and web-first assertions make the code
+   * wait-for-selector-free.
    *
-   * Wait for the `selector` to satisfy `state` option (either appear/disappear from dom, or become visible/hidden). If
-   * at the moment of calling the method `selector` already satisfies the condition, the method will return immediately.
-   * If the selector doesn't satisfy the condition for the `timeout` milliseconds, the function will throw.
+   * Wait for the [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) to
+   * satisfy [`state`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-state) option (either
+   * appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-selector) already satisfies
+   * the condition, the method will return immediately. If the selector doesn't satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-selector-option-timeout) milliseconds, the
+   * function will throw.
    *
    * **Usage**
    *
@@ -5621,19 +6028,25 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.check([options])](https://playwright.dev/docs/api/class-locator#locator-check) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method checks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
+   * This method checks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-check-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-check-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
    *    already checked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-check-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now checked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-check-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -5687,17 +6100,25 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.click([options])](https://playwright.dev/docs/api/class-locator#locator-click) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method clicks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-click-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-click-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-click-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
-   *    element, or the specified `position`.
-   * 1. Wait for initiated navigations to either succeed or fail, unless `noWaitAfter` option is set.
-   *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-frame#frame-click-option-no-wait-after) option is set.
+   *
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-click-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -5764,7 +6185,9 @@ export interface Frame {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -5778,19 +6201,27 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.dblclick([options])](https://playwright.dev/docs/api/class-locator#locator-dblclick)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method double clicks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method double clicks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-selector) by performing the
+   * following steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
-   *    element, or the specified `position`. if the first click of the `dblclick()` triggers a navigation event,
-   *    this method will throw.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-position). if the first click
+   *    of the `dblclick()` triggers a navigation event, this method will throw.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-dblclick-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** `frame.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -5850,7 +6281,9 @@ export interface Frame {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -5870,10 +6303,13 @@ export interface Frame {
    * await frame.dispatchEvent('button#submit', 'click');
    * ```
    *
-   * Under the hood, it creates an instance of an event based on the given `type`, initializes it with `eventInit`
-   * properties and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-frame#frame-dispatch-event-option-type), initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-frame#frame-dispatch-event-option-event-init) properties and
+   * dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
    *
-   * Since `eventInit` is event-specific, please refer to the events documentation for the lists of initial properties:
+   * Since [`eventInit`](https://playwright.dev/docs/api/class-frame#frame-dispatch-event-option-event-init) is
+   * event-specific, please refer to the events documentation for the lists of initial properties:
    * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
    * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
    * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
@@ -5979,9 +6415,10 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.fill(value[, options])](https://playwright.dev/docs/api/class-locator#locator-fill)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method waits for an element matching `selector`, waits for [actionability](https://playwright.dev/docs/actionability) checks,
-   * focuses the element, fills it and triggers an `input` event after filling. Note that you can pass an empty string
-   * to clear the input field.
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-fill-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, focuses the element, fills it and triggers an `input` event after
+   * filling. Note that you can pass an empty string to clear the input field.
    *
    * If the target element is not an `<input>`, `<textarea>` or `[contenteditable]` element, this method throws an
    * error. However, if the element is inside the `<label>` element that has an associated
@@ -6026,8 +6463,10 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.focus([options])](https://playwright.dev/docs/api/class-locator#locator-focus) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method fetches an element with `selector` and focuses it. If there's no element matching `selector`, the
-   * method waits until a matching element appears in the DOM.
+   * This method fetches an element with
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-focus-option-selector) and focuses it. If there's no
+   * element matching [`selector`](https://playwright.dev/docs/api/class-frame#frame-focus-option-selector), the method
+   * waits until a matching element appears in the DOM.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -6252,12 +6691,15 @@ export interface Frame {
      *
      * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
      * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
      */
     disabled?: boolean;
 
     /**
-     * Whether `name` is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when `name` is a
-     * regular expression. Note that exact match still trims whitespace.
+     * Whether [`name`](https://playwright.dev/docs/api/class-frame#frame-get-by-role-option-name) is matched exactly:
+     * case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-frame#frame-get-by-role-option-name) is a regular expression. Note
+     * that exact match still trims whitespace.
      */
     exact?: boolean;
 
@@ -6286,7 +6728,8 @@ export interface Frame {
 
     /**
      * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
-     * case-insensitive and searches for a substring, use `exact` to control this behavior.
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-frame#frame-get-by-role-option-exact) to control this behavior.
      *
      * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
      */
@@ -6432,7 +6875,8 @@ export interface Frame {
    * The method will throw an error if:
    * - there's an SSL error (e.g. in case of self-signed certificates).
    * - target URL is invalid.
-   * - the `timeout` is exceeded during navigation.
+   * - the [`timeout`](https://playwright.dev/docs/api/class-frame#frame-goto-option-timeout) is exceeded during
+   *   navigation.
    * - the remote server does not respond or is unreachable.
    * - the main resource failed to load.
    *
@@ -6445,6 +6889,7 @@ export interface Frame {
    *
    * **NOTE** Headless mode doesn't support navigation to a PDF document. See the
    * [upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=761295).
+   *
    * @param url URL to navigate frame to. The url should include scheme, e.g. `https://`.
    * @param options
    */
@@ -6481,16 +6926,23 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.hover([options])](https://playwright.dev/docs/api/class-locator#locator-hover) instead.
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method hovers over an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method hovers over an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-hover-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-hover-option-selector). If there is none, wait
+   *    until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-hover-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-hover-option-position).
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-hover-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -6540,7 +6992,9 @@ export interface Frame {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -6733,8 +7187,9 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.isHidden([options])](https://playwright.dev/docs/api/class-locator#locator-is-hidden)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).  `selector` that
-   * does not match any elements is considered hidden.
+   * Returns whether the element is hidden, the opposite of [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-is-hidden-option-selector) that does not match any
+   * elements is considered hidden.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -6758,8 +7213,9 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.isVisible([options])](https://playwright.dev/docs/api/class-locator#locator-is-visible)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible). `selector` that does not match any elements
-   * is considered not visible.
+   * Returns whether the element is [visible](https://playwright.dev/docs/actionability#visible).
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-is-visible-option-selector) that does not match any
+   * elements is considered not visible.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -6800,8 +7256,8 @@ export interface Frame {
      * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
      * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     has?: Locator;
 
@@ -6809,8 +7265,8 @@ export interface Frame {
      * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
      * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     hasNot?: Locator;
 
@@ -6835,6 +7291,7 @@ export interface Frame {
    *
    * **NOTE** This value is calculated once when the frame is created, and will not update if the attribute is changed
    * later.
+   *
    */
   name(): string;
 
@@ -6852,9 +7309,10 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * `key` can specify the intended
+   * [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) can specify the intended
    * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
-   * to generate the text for. A superset of the `key` values can be found
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) values can be found
    * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
    *
    * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
@@ -6864,10 +7322,11 @@ export interface Frame {
    * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
    * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
    *
-   * Holding down `Shift` will type the text that corresponds to the `key` in the upper case.
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) in the upper case.
    *
-   * If `key` is a single character, it is case-sensitive, so the values `a` and `A` will generate different respective
-   * texts.
+   * If [`key`](https://playwright.dev/docs/api/class-frame#frame-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
    *
    * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
    * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
@@ -6910,8 +7369,10 @@ export interface Frame {
    * [locator.selectOption(values[, options])](https://playwright.dev/docs/api/class-locator#locator-select-option)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method waits for an element matching `selector`, waits for [actionability](https://playwright.dev/docs/actionability) checks, waits
-   * until all specified options are present in the `<select>` element and selects these options.
+   * This method waits for an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-select-option-option-selector), waits for
+   * [actionability](https://playwright.dev/docs/actionability) checks, waits until all specified options are present in the `<select>`
+   * element and selects these options.
    *
    * If the target element is not a `<select>` element, this method throws an error. However, if the element is inside
    * the `<label>` element that has an associated
@@ -6978,10 +7439,8 @@ export interface Frame {
     force?: boolean;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
-     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
-     * navigating to inaccessible pages. Defaults to `false`.
-     * @deprecated This option will default to `true` in the future.
+     * This option has no effect.
+     * @deprecated This option has no effect.
      */
     noWaitAfter?: boolean;
 
@@ -7005,19 +7464,25 @@ export interface Frame {
    * [locator.setChecked(checked[, options])](https://playwright.dev/docs/api/class-locator#locator-set-checked)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method checks or unchecks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
+   * This method checks or unchecks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-selector) by performing the
+   * following steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-selector). If there is
+   *    none, wait until a matching element is attached to the DOM.
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws.
    * 1. If the element already has the right checked state, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-set-checked-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param checked Whether to check or uncheck the checkbox.
@@ -7103,9 +7568,9 @@ export interface Frame {
    * Sets the value of the file input to these file paths or files. If some of the `filePaths` are relative paths, then
    * they are resolved relative to the current working directory. For empty array, clears the selected files.
    *
-   * This method expects `selector` to point to an
-   * [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the element is inside
-   * the `<label>` element that has an associated
+   * This method expects [`selector`](https://playwright.dev/docs/api/class-frame#frame-set-input-files-option-selector)
+   * to point to an [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the
+   * element is inside the `<label>` element that has an associated
    * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
@@ -7168,18 +7633,25 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
    * more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method taps an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * This method taps an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-tap-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching [`selector`](https://playwright.dev/docs/api/class-frame#frame-tap-option-selector).
+   *    If there is none, wait until a matching element is attached to the DOM.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-tap-option-force) option is set. If the element
+   *    is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-frame#frame-tap-option-position).
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-tap-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** `frame.tap()` requires that the `hasTouch` option of the browser context be set to true.
+   *
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -7229,7 +7701,9 @@ export interface Frame {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -7314,19 +7788,25 @@ export interface Frame {
    * **NOTE** Use locator-based [locator.uncheck([options])](https://playwright.dev/docs/api/class-locator#locator-uncheck)
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
-   * This method checks an element matching `selector` by performing the following steps:
-   * 1. Find an element matching `selector`. If there is none, wait until a matching element is attached to the DOM.
+   * This method checks an element matching
+   * [`selector`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-selector) by performing the following
+   * steps:
+   * 1. Find an element matching
+   *    [`selector`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-selector). If there is none,
+   *    wait until a matching element is attached to the DOM.
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws. If the element is
    *    already unchecked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-force) option is set. If the
+   *    element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now unchecked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-frame#frame-uncheck-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param selector A selector to search for an element. If there are multiple elements satisfying the selector, the first will be
    * used.
    * @param options
@@ -7435,6 +7915,7 @@ export interface Frame {
    *
    * **NOTE** Usage of the [History API](https://developer.mozilla.org/en-US/docs/Web/API/History_API) to change the URL
    * is considered a navigation.
+   *
    * @deprecated This method is inherently racy, please use
    * [frame.waitForURL(url[, options])](https://playwright.dev/docs/api/class-frame#frame-wait-for-url) instead.
    * @param options
@@ -7470,10 +7951,11 @@ export interface Frame {
   }): Promise<null|Response>;
 
   /**
-   * **NOTE** Never wait for timeout in production. Tests that wait for time are inherently flaky. Use {@link Locator} actions
-   * and web assertions that wait automatically.
+   * **NOTE** Never wait for timeout in production. Tests that wait for time are inherently flaky. Use
+   * [Locator](https://playwright.dev/docs/api/class-locator) actions and web assertions that wait automatically.
    *
-   * Waits for the given `timeout` in milliseconds.
+   * Waits for the given [`timeout`](https://playwright.dev/docs/api/class-frame#frame-wait-for-timeout-option-timeout)
+   * in milliseconds.
    *
    * Note that `frame.waitForTimeout()` should only be used for debugging. Tests using the timer in production are going
    * to be flaky. Use signals such as network events, selectors becoming visible and others instead.
@@ -7521,16 +8003,14 @@ export interface Frame {
 }
 
 /**
- * - extends: [EventEmitter]
- *
  * BrowserContexts provide a way to operate multiple independent browser sessions.
  *
  * If a page opens another page, e.g. with a `window.open` call, the popup will belong to the parent page's browser
  * context.
  *
- * Playwright allows creating "incognito" browser contexts with
+ * Playwright allows creating isolated non-persistent browser contexts with
  * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) method.
- * "Incognito" browser contexts don't write any browsing data to disk.
+ * Non-persistent browser contexts don't write any browsing data to disk.
  *
  * ```js
  * // Create a new incognito browser context
@@ -7545,12 +8025,19 @@ export interface Frame {
  */
 export interface BrowserContext {
   /**
-   * The method adds a function called `name` on the `window` object of every frame in every page in the context. When
-   * called, the function executes `callback` and returns a [Promise] which resolves to the return value of `callback`.
-   * If the `callback` returns a [Promise], it will be awaited.
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-name) on the
+   * `window` object of every frame in every page in the context. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * and returns a [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback).
+   * If the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * returns a [Promise], it will be awaited.
    *
-   * The first argument of the `callback` function contains information about the caller: `{ browserContext:
-   * BrowserContext, page: Page, frame: Frame }`.
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
    *
    * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)
    * for page-only version.
@@ -7586,12 +8073,19 @@ export interface BrowserContext {
    */
   exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<void>;
   /**
-   * The method adds a function called `name` on the `window` object of every frame in every page in the context. When
-   * called, the function executes `callback` and returns a [Promise] which resolves to the return value of `callback`.
-   * If the `callback` returns a [Promise], it will be awaited.
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-name) on the
+   * `window` object of every frame in every page in the context. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * and returns a [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback).
+   * If the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * returns a [Promise], it will be awaited.
    *
-   * The first argument of the `callback` function contains information about the caller: `{ browserContext:
-   * BrowserContext, page: Page, frame: Frame }`.
+   * The first argument of the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-binding-option-callback)
+   * function contains information about the caller: `{ browserContext: BrowserContext, page: Page, frame: Frame }`.
    *
    * See [page.exposeBinding(name, callback[, options])](https://playwright.dev/docs/api/class-page#page-expose-binding)
    * for page-only version.
@@ -7656,10 +8150,36 @@ export interface BrowserContext {
    * [browserContext.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-init-script)
    * and [page.addInitScript(script[, arg])](https://playwright.dev/docs/api/class-page#page-add-init-script) is not
    * defined.
+   *
    * @param script Script to be evaluated in all pages in the browser context.
-   * @param arg Optional argument to pass to `script` (only supported when passing a function).
+   * @param arg Optional argument to pass to
+   * [`script`](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-init-script-option-script)
+   * (only supported when passing a function).
    */
   addInitScript<Arg>(script: PageFunction<Arg, any> | { path?: string, content?: string }, arg?: Arg): Promise<void>;
+
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type?: string): this;
+  /**
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
+   */
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
   /**
    * **NOTE** Only works with Chromium browser's persistent context.
    *
@@ -7683,8 +8203,8 @@ export interface BrowserContext {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` and the page are available on the {@link ConsoleMessage} event handler
-   * argument.
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -7719,6 +8239,7 @@ export interface BrowserContext {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   on(event: 'dialog', listener: (dialog: Dialog) => any): this;
 
@@ -7735,7 +8256,7 @@ export interface BrowserContext {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * const newPagePromise = context.waitForEvent('page');
@@ -7747,6 +8268,7 @@ export interface BrowserContext {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   on(event: 'page', listener: (page: Page) => any): this;
 
@@ -7770,6 +8292,7 @@ export interface BrowserContext {
    * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
    * event and not with
    * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
    */
   on(event: 'requestfailed', listener: (request: Request) => any): this;
 
@@ -7879,8 +8402,8 @@ export interface BrowserContext {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` and the page are available on the {@link ConsoleMessage} event handler
-   * argument.
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -7915,6 +8438,7 @@ export interface BrowserContext {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   addListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
 
@@ -7931,7 +8455,7 @@ export interface BrowserContext {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * const newPagePromise = context.waitForEvent('page');
@@ -7943,6 +8467,7 @@ export interface BrowserContext {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   addListener(event: 'page', listener: (page: Page) => any): this;
 
@@ -7966,6 +8491,7 @@ export interface BrowserContext {
    * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
    * event and not with
    * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
    */
   addListener(event: 'requestfailed', listener: (request: Request) => any): this;
 
@@ -8130,8 +8656,8 @@ export interface BrowserContext {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` and the page are available on the {@link ConsoleMessage} event handler
-   * argument.
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -8166,6 +8692,7 @@ export interface BrowserContext {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   prependListener(event: 'dialog', listener: (dialog: Dialog) => any): this;
 
@@ -8182,7 +8709,7 @@ export interface BrowserContext {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * const newPagePromise = context.waitForEvent('page');
@@ -8194,6 +8721,7 @@ export interface BrowserContext {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   prependListener(event: 'page', listener: (page: Page) => any): this;
 
@@ -8217,6 +8745,7 @@ export interface BrowserContext {
    * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
    * event and not with
    * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
    */
   prependListener(event: 'requestfailed', listener: (request: Request) => any): this;
 
@@ -8301,6 +8830,13 @@ export interface BrowserContext {
      * Optional.
      */
     sameSite?: "Strict"|"Lax"|"None";
+
+    /**
+     * For partitioned third-party cookies (aka
+     * [CHIPS](https://developer.mozilla.org/en-US/docs/Web/Privacy/Guides/Privacy_sandbox/Partitioned_cookies)), the
+     * partition key. Optional.
+     */
+    partitionKey?: string;
   }>): Promise<void>;
 
   /**
@@ -8311,7 +8847,8 @@ export interface BrowserContext {
   backgroundPages(): Array<Page>;
 
   /**
-   * Returns the browser instance of the context. If it was launched as a persistent context null gets returned.
+   * Gets the browser instance that owns the context. Returns `null` if the context is created outside of normal
+   * browser, e.g. Android or Electron.
    */
   browser(): null|Browser;
 
@@ -8367,6 +8904,7 @@ export interface BrowserContext {
    * Closes the browser context. All the pages that belong to the browser context will be closed.
    *
    * **NOTE** The default browser context cannot be closed.
+   *
    * @param options
    */
   close(options?: {
@@ -8384,10 +8922,16 @@ export interface BrowserContext {
   cookies(urls?: string|ReadonlyArray<string>): Promise<Array<Cookie>>;
 
   /**
-   * The method adds a function called `name` on the `window` object of every frame in every page in the context. When
-   * called, the function executes `callback` and returns a [Promise] which resolves to the return value of `callback`.
+   * The method adds a function called
+   * [`name`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-name) on the
+   * `window` object of every frame in every page in the context. When called, the function executes
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-callback)
+   * and returns a [Promise] which resolves to the return value of
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-callback).
    *
-   * If the `callback` returns a [Promise], it will be awaited.
+   * If the
+   * [`callback`](https://playwright.dev/docs/api/class-browsercontext#browser-context-expose-function-option-callback)
+   * returns a [Promise], it will be awaited.
    *
    * See [page.exposeFunction(name, callback)](https://playwright.dev/docs/api/class-page#page-expose-function) for
    * page-only version.
@@ -8428,9 +8972,13 @@ export interface BrowserContext {
   /**
    * Grants specified permissions to the browser context. Only grants corresponding permissions to the given origin if
    * specified.
-   * @param permissions A permission or an array of permissions to grant. Permissions can be one of the following values:
+   * @param permissions A list of permissions to grant.
+   *
+   * **NOTE** Supported permissions differ between browsers, and even between different versions of the same browser.
+   * Any permission may stop working after an update.
+   *
+   * Here are some permissions that may be supported by some browsers:
    * - `'accelerometer'`
-   * - `'accessibility-events'`
    * - `'ambient-light-sensor'`
    * - `'background-sync'`
    * - `'camera'`
@@ -8445,6 +8993,7 @@ export interface BrowserContext {
    * - `'notifications'`
    * - `'payment-handler'`
    * - `'storage-access'`
+   * - `'local-fonts'`
    * @param options
    */
   grantPermissions(permissions: ReadonlyArray<string>, options?: {
@@ -8481,7 +9030,9 @@ export interface BrowserContext {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * will not intercept requests intercepted by Service Worker. See
    * [this](https://github.com/microsoft/playwright/issues/1090) issue. We recommend disabling Service Workers when
-   * using request interception by setting `Browser.newContext.serviceWorkers` to `'block'`.
+   * using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
    *
    * **Usage**
    *
@@ -8525,8 +9076,10 @@ export interface BrowserContext {
    * [browserContext.unroute(url[, handler])](https://playwright.dev/docs/api/class-browsercontext#browser-context-unroute).
    *
    * **NOTE** Enabling routing disables http cache.
-   * @param url A glob pattern, regex pattern or predicate receiving [URL] to match while routing. When a `baseURL` via the context
-   * options was provided and the passed URL is a path, it gets merged via the
+   *
+   * @param url A glob pattern, regex pattern, or predicate that receives a [URL] to match during routing. If
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) is set in the
+   * context options and the provided URL is a string that does not start with `*`, it is resolved using the
    * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor.
    * @param handler handler function to route the request.
    * @param options
@@ -8544,7 +9097,9 @@ export interface BrowserContext {
    *
    * Playwright will not serve requests intercepted by Service Worker from the HAR file. See
    * [this](https://github.com/microsoft/playwright/issues/1090) issue. We recommend disabling Service Workers when
-   * using request interception by setting `Browser.newContext.serviceWorkers` to `'block'`.
+   * using request interception by setting
+   * [`serviceWorkers`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-service-workers) to
+   * `'block'`.
    * @param har Path to a [HAR](http://www.softwareishard.com/blog/har-12-spec) file with prerecorded network data. If `path` is a
    * relative path, then it is resolved relative to the current working directory.
    * @param options
@@ -8586,6 +9141,34 @@ export interface BrowserContext {
     url?: string|RegExp;
   }): Promise<void>;
 
+  /**
+   * This method allows to modify websocket connections that are made by any page in the browser context.
+   *
+   * Note that only `WebSocket`s created after this method was called will be routed. It is recommended to call this
+   * method before creating any pages.
+   *
+   * **Usage**
+   *
+   * Below is an example of a simple handler that blocks some websocket messages. See
+   * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute) for more details and examples.
+   *
+   * ```js
+   * await context.routeWebSocket('/ws', async ws => {
+   *   ws.routeSend(message => {
+   *     if (message === 'to-be-blocked')
+   *       return;
+   *     ws.send(message);
+   *   });
+   *   await ws.connect();
+   * });
+   * ```
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) context option.
+   * @param handler Handler function to route the WebSocket.
+   */
+  routeWebSocket(url: string|RegExp|((url: URL) => boolean), handler: ((websocketroute: WebSocketRoute) => Promise<any>|any)): Promise<void>;
+
   /**
    * **NOTE** Service workers are only supported on Chromium-based browsers.
    *
@@ -8607,12 +9190,15 @@ export interface BrowserContext {
    * and [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) take
    * priority over
    * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout).
+   *
    * @param timeout Maximum navigation time in milliseconds
    */
   setDefaultNavigationTimeout(timeout: number): void;
 
   /**
-   * This setting will change the default maximum time for all the methods accepting `timeout` option.
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout-option-timeout)
+   * option.
    *
    * **NOTE**
    * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout),
@@ -8620,7 +9206,8 @@ export interface BrowserContext {
    * [browserContext.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-navigation-timeout)
    * take priority over
    * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout).
-   * @param timeout Maximum time in milliseconds
+   *
+   * @param timeout Maximum time in milliseconds. Pass `0` to disable timeout.
    */
   setDefaultTimeout(timeout: number): void;
 
@@ -8634,6 +9221,7 @@ export interface BrowserContext {
    * **NOTE**
    * [browserContext.setExtraHTTPHeaders(headers)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-extra-http-headers)
    * does not guarantee the order of headers in the outgoing requests.
+   *
    * @param headers An object containing additional HTTP headers to be sent with every request. All header values must be strings.
    */
   setExtraHTTPHeaders(headers: { [key: string]: string; }): Promise<void>;
@@ -8650,6 +9238,7 @@ export interface BrowserContext {
    * **NOTE** Consider using
    * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
    * to grant permissions for the browser context pages to read its geolocation.
+   *
    * @param geolocation
    */
   setGeolocation(geolocation: null|{
@@ -8685,13 +9274,23 @@ export interface BrowserContext {
   setOffline(offline: boolean): Promise<void>;
 
   /**
-   * Returns storage state for this browser context, contains current cookies and local storage snapshot.
+   * Returns storage state for this browser context, contains current cookies, local storage snapshot and IndexedDB
+   * snapshot.
    * @param options
    */
   storageState(options?: {
     /**
-     * The file path to save the storage state to. If `path` is a relative path, then it is resolved relative to current
-     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
+     * Set to `true` to include [IndexedDB](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) in the storage
+     * state snapshot. If your application uses IndexedDB to store authentication tokens, like Firebase Authentication,
+     * enable this.
+     */
+    indexedDB?: boolean;
+
+    /**
+     * The file path to save the storage state to. If
+     * [`path`](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state-option-path) is a
+     * relative path, then it is resolved relative to current working directory. If no path is provided, storage state is
+     * still returned, but won't be saved to the disk.
      */
     path?: string;
   }): Promise<{
@@ -8730,7 +9329,9 @@ export interface BrowserContext {
   /**
    * Removes a route created with
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
-   * When `handler` is not specified, removes all routes for the `url`.
+   * When [`handler`](https://playwright.dev/docs/api/class-browsercontext#browser-context-unroute-option-handler) is
+   * not specified, removes all routes for the
+   * [`url`](https://playwright.dev/docs/api/class-browsercontext#browser-context-unroute-option-url).
    * @param url A glob pattern, regex pattern or predicate receiving [URL] used to register a routing with
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route).
    * @param handler Optional handler function used to register a routing with
@@ -8780,8 +9381,8 @@ export interface BrowserContext {
   /**
    * Emitted when JavaScript within the page calls one of console API methods, e.g. `console.log` or `console.dir`.
    *
-   * The arguments passed into `console.log` and the page are available on the {@link ConsoleMessage} event handler
-   * argument.
+   * The arguments passed into `console.log` and the page are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
    * **Usage**
    *
@@ -8816,6 +9417,7 @@ export interface BrowserContext {
    * **NOTE** When no [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) or
    * [browserContext.on('dialog')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-dialog)
    * listeners are present, all dialogs are automatically dismissed.
+   *
    */
   waitForEvent(event: 'dialog', optionsOrPredicate?: { predicate?: (dialog: Dialog) => boolean | Promise<boolean>, timeout?: number } | ((dialog: Dialog) => boolean | Promise<boolean>)): Promise<Dialog>;
 
@@ -8832,7 +9434,7 @@ export interface BrowserContext {
    * [browserContext.route(url, handler[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-route)
    * and
    * [browserContext.on('request')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request)
-   * respectively instead of similar methods on the {@link Page}.
+   * respectively instead of similar methods on the [Page](https://playwright.dev/docs/api/class-page).
    *
    * ```js
    * const newPagePromise = context.waitForEvent('page');
@@ -8844,6 +9446,7 @@ export interface BrowserContext {
    * **NOTE** Use
    * [page.waitForLoadState([state, options])](https://playwright.dev/docs/api/class-page#page-wait-for-load-state) to
    * wait until the page gets to a particular state (you should not need it in most cases).
+   *
    */
   waitForEvent(event: 'page', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
 
@@ -8867,6 +9470,7 @@ export interface BrowserContext {
    * [browserContext.on('requestfinished')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-finished)
    * event and not with
    * [browserContext.on('requestfailed')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-request-failed).
+   *
    */
   waitForEvent(event: 'requestfailed', optionsOrPredicate?: { predicate?: (request: Request) => boolean | Promise<boolean>, timeout?: number } | ((request: Request) => boolean | Promise<boolean>)): Promise<Request>;
 
@@ -8915,283 +9519,1007 @@ export interface BrowserContext {
 }
 
 /**
- * The Worker class represents a [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API).
- * `worker` event is emitted on the page object to signal a worker creation. `close` event is emitted on the worker
- * object when the worker is gone.
+ * A Browser is created via
+ * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). An example
+ * of using a [Browser](https://playwright.dev/docs/api/class-browser) to create a
+ * [Page](https://playwright.dev/docs/api/class-page):
  *
  * ```js
- * page.on('worker', worker => {
- *   console.log('Worker created: ' + worker.url());
- *   worker.on('close', worker => console.log('Worker destroyed: ' + worker.url()));
- * });
+ * const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
  *
- * console.log('Current workers:');
- * for (const worker of page.workers())
- *   console.log('  ' + worker.url());
+ * (async () => {
+ *   const browser = await firefox.launch();
+ *   const page = await browser.newPage();
+ *   await page.goto('https://example.com');
+ *   await browser.close();
+ * })();
  * ```
  *
  */
-export interface Worker {
+export interface Browser {
   /**
-   * Returns the return value of `pageFunction`.
-   *
-   * If the function passed to the
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
-   * [Promise], then
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) would wait for
-   * the promise to resolve and return its value.
-   *
-   * If the function passed to the
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
-   * non-[Serializable] value, then
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns
-   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
-   * `-0`, `NaN`, `Infinity`, `-Infinity`.
-   * @param pageFunction Function to be evaluated in the worker context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
    */
-  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  removeAllListeners(type?: string): this;
   /**
-   * Returns the return value of `pageFunction`.
-   *
-   * If the function passed to the
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
-   * [Promise], then
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) would wait for
-   * the promise to resolve and return its value.
-   *
-   * If the function passed to the
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
-   * non-[Serializable] value, then
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns
-   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
-   * `-0`, `NaN`, `Infinity`, `-Infinity`.
-   * @param pageFunction Function to be evaluated in the worker context.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
-
-  /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
-   *
-   * The only difference between
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) and
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * is that
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * returns {@link JSHandle}.
-   *
-   * If the function passed to the
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * returns a [Promise], then
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * would wait for the promise to resolve and return its value.
-   * @param pageFunction Function to be evaluated in the worker context.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
-  /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
-   *
-   * The only difference between
-   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) and
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * is that
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * returns {@link JSHandle}.
-   *
-   * If the function passed to the
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * returns a [Promise], then
-   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
-   * would wait for the promise to resolve and return its value.
-   * @param pageFunction Function to be evaluated in the worker context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * Removes all the listeners of the given type (or all registered listeners if no type given). Allows to wait for
+   * async listeners to complete or to ignore subsequent errors from these listeners.
+   * @param type
+   * @param options
    */
-  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
   /**
-   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
-   * terminated.
+   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
+   * following:
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
    */
-  on(event: 'close', listener: (worker: Worker) => any): this;
+  on(event: 'disconnected', listener: (browser: Browser) => any): this;
 
   /**
    * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
    */
-  once(event: 'close', listener: (worker: Worker) => any): this;
+  once(event: 'disconnected', listener: (browser: Browser) => any): this;
 
   /**
-   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
-   * terminated.
+   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
+   * following:
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
    */
-  addListener(event: 'close', listener: (worker: Worker) => any): this;
+  addListener(event: 'disconnected', listener: (browser: Browser) => any): this;
 
   /**
    * Removes an event listener added by `on` or `addListener`.
    */
-  removeListener(event: 'close', listener: (worker: Worker) => any): this;
+  removeListener(event: 'disconnected', listener: (browser: Browser) => any): this;
 
   /**
    * Removes an event listener added by `on` or `addListener`.
    */
-  off(event: 'close', listener: (worker: Worker) => any): this;
+  off(event: 'disconnected', listener: (browser: Browser) => any): this;
 
   /**
-   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
-   * terminated.
+   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
+   * following:
+   * - Browser application is closed or crashed.
+   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
    */
-  prependListener(event: 'close', listener: (worker: Worker) => any): this;
+  prependListener(event: 'disconnected', listener: (browser: Browser) => any): this;
 
-  url(): string;
-}
+  /**
+   * Get the browser type (chromium, firefox or webkit) that the browser belongs to.
+   */
+  browserType(): BrowserType;
 
-/**
- * JSHandle represents an in-page JavaScript object. JSHandles can be created with the
- * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) method.
- *
- * ```js
- * const windowHandle = await page.evaluateHandle(() => window);
- * // ...
- * ```
- *
- * JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is exposed with
- * [jsHandle.dispose()](https://playwright.dev/docs/api/class-jshandle#js-handle-dispose). JSHandles are auto-disposed
- * when their origin frame gets navigated or the parent context gets destroyed.
- *
- * JSHandle instances can be used as an argument in
- * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector),
- * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
- * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle)
- * methods.
- */
-export interface JSHandle<T = any> {
   /**
-   * Returns the return value of `pageFunction`.
-   *
-   * This method passes this handle as the first argument to `pageFunction`.
-   *
-   * If `pageFunction` returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its
-   * value.
+   * In case this browser is obtained using
+   * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch), closes the
+   * browser and all of its pages (if any were opened).
    *
-   * **Usage**
+   * In case this browser is connected to, clears all created contexts belonging to this browser and disconnects from
+   * the browser server.
    *
-   * ```js
-   * const tweetHandle = await page.$('.tweet .retweets');
-   * expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10 retweets');
-   * ```
+   * **NOTE** This is similar to force-quitting the browser. To close pages gracefully and ensure you receive page close
+   * events, call
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) on
+   * any [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) instances you explicitly created earlier
+   * using [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) **before**
+   * calling [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close).
    *
-   * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * The [Browser](https://playwright.dev/docs/api/class-browser) object itself is considered to be disposed and cannot
+   * be used anymore.
+   * @param options
    */
-  evaluate<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<R>;
+  close(options?: {
+    /**
+     * The reason to be reported to the operations interrupted by the browser closure.
+     */
+    reason?: string;
+  }): Promise<void>;
+
   /**
-   * Returns the return value of `pageFunction`.
-   *
-   * This method passes this handle as the first argument to `pageFunction`.
-   *
-   * If `pageFunction` returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its
-   * value.
+   * Returns an array of all open browser contexts. In a newly created browser, this will return zero browser contexts.
    *
    * **Usage**
    *
    * ```js
-   * const tweetHandle = await page.$('.tweet .retweets');
-   * expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10 retweets');
+   * const browser = await pw.webkit.launch();
+   * console.log(browser.contexts().length); // prints `0`
+   *
+   * const context = await browser.newContext();
+   * console.log(browser.contexts().length); // prints `1`
    * ```
    *
-   * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
    */
-  evaluate<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<R>;
+  contexts(): Array<BrowserContext>;
 
   /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
-   *
-   * This method passes this handle as the first argument to `pageFunction`.
-   *
-   * The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle`
-   * returns {@link JSHandle}.
-   *
-   * If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would
-   * wait for the promise to resolve and return its value.
-   *
-   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
-   * more details.
-   * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluateHandle<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
-  /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
-   *
-   * This method passes this handle as the first argument to `pageFunction`.
-   *
-   * The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle`
-   * returns {@link JSHandle}.
-   *
-   * If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would
-   * wait for the promise to resolve and return its value.
-   *
-   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
-   * more details.
-   * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * Indicates that the browser is connected.
    */
-  evaluateHandle<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<SmartHandle<R>>;
+  isConnected(): boolean;
 
   /**
-   * Returns a JSON representation of the object. If the object has a `toJSON` function, it **will not be called**.
+   * **NOTE** CDP Sessions are only supported on Chromium-based browsers.
    *
-   * **NOTE** The method will return an empty JSON object if the referenced object is not stringifiable. It will throw
-   * an error if the object has circular references.
-   */
-  jsonValue(): Promise<T>;
-  /**
-   * Returns either `null` or the object handle itself, if the object handle is an instance of {@link ElementHandle}.
-   */
-  asElement(): T extends Node ? ElementHandle<T> : null;
-  /**
-   * The `jsHandle.dispose` method stops referencing the element handle.
+   * Returns the newly created browser session.
    */
-  dispose(): Promise<void>;
+  newBrowserCDPSession(): Promise<CDPSession>;
 
   /**
-   * The method returns a map with **own property names** as keys and JSHandle instances for the property values.
+   * Creates a new browser context. It won't share cookies/cache with other browser contexts.
+   *
+   * **NOTE** If directly using this method to create
+   * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext)s, it is best practice to explicitly close
+   * the returned context via
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) when
+   * your code is done with the [BrowserContext](https://playwright.dev/docs/api/class-browsercontext), and before
+   * calling [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close). This will ensure
+   * the `context` is closed gracefully and any artifacts—like HARs and videos—are fully flushed and saved.
    *
    * **Usage**
    *
    * ```js
-   * const handle = await page.evaluateHandle(() => ({ window, document }));
-   * const properties = await handle.getProperties();
-   * const windowHandle = properties.get('window');
-   * const documentHandle = properties.get('document');
-   * await handle.dispose();
+   * (async () => {
+   *   const browser = await playwright.firefox.launch();  // Or 'chromium' or 'webkit'.
+   *   // Create a new incognito browser context.
+   *   const context = await browser.newContext();
+   *   // Create a new page in a pristine context.
+   *   const page = await context.newPage();
+   *   await page.goto('https://example.com');
+   *
+   *   // Gracefully close up everything
+   *   await context.close();
+   *   await browser.close();
+   * })();
    * ```
    *
+   * @param options
    */
-  getProperties(): Promise<Map<string, JSHandle>>;
+  newContext(options?: BrowserContextOptions): Promise<BrowserContext>;
 
   /**
-   * Fetches a single property from the referenced object.
-   * @param propertyName property to get
+   * Creates a new page in a new browser context. Closing this page will close the context as well.
+   *
+   * This is a convenience API that should only be used for the single-page scenarios and short snippets. Production
+   * code and testing frameworks should explicitly create
+   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) followed by the
+   * [browserContext.newPage()](https://playwright.dev/docs/api/class-browsercontext#browser-context-new-page) to
+   * control their exact life times.
+   * @param options
    */
-  getProperty(propertyName: string): Promise<JSHandle>;
+  newPage(options?: {
+    /**
+     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+     */
+    acceptDownloads?: boolean;
 
-  [Symbol.asyncDispose](): Promise<void>;
-}
+    /**
+     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+     * or
+     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+     * it takes the base URL in consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Unset by default. Examples:
+     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
+     */
+    baseURL?: string;
 
-/**
- * - extends: {@link JSHandle}
- *
- * ElementHandle represents an in-page DOM element. ElementHandles can be created with the
- * [page.$(selector[, options])](https://playwright.dev/docs/api/class-page#page-query-selector) method.
- *
- * **NOTE** The use of ElementHandle is discouraged, use {@link Locator} objects and web-first assertions instead.
- *
- * ```js
- * const hrefElement = await page.$('a');
- * await hrefElement.click();
- * ```
+    /**
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     */
+    bypassCSP?: boolean;
+
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * **Details**
+     *
+     * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+     * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+     * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+     * with an exact match to the request origin that the certificate is valid for.
+     *
+     * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+     * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+     * does not match any of the domains you plan to visit.
+     *
+     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+     * work by replacing `localhost` with `local.playwright`.
+     *
+     */
+    clientCertificates?: Array<{
+      /**
+       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+       */
+      origin: string;
+
+      /**
+       * Path to the file with the certificate in PEM format.
+       */
+      certPath?: string;
+
+      /**
+       * Direct value of the certificate in PEM format.
+       */
+      cert?: Buffer;
+
+      /**
+       * Path to the file with the private key in PEM format.
+       */
+      keyPath?: string;
+
+      /**
+       * Direct value of the private key in PEM format.
+       */
+      key?: Buffer;
+
+      /**
+       * Path to the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfxPath?: string;
+
+      /**
+       * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfx?: Buffer;
+
+      /**
+       * Passphrase for the private key (PEM or PFX).
+       */
+      passphrase?: string;
+    }>;
+
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
+
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    contrast?: null|"no-preference"|"more";
+
+    /**
+     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+     */
+    deviceScaleFactor?: number;
+
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     */
+    forcedColors?: null|"active"|"none";
+
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
+
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
+
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
+
+    /**
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about
+     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     */
+    hasTouch?: boolean;
+
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     */
+    isMobile?: boolean;
+
+    /**
+     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     */
+    javaScriptEnabled?: boolean;
+
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
+
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
+
+    /**
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     */
+    offline?: boolean;
+
+    /**
+     * A list of permissions to grant to all pages in this context. See
+     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+     * for more details. Defaults to none.
+     */
+    permissions?: Array<string>;
+
+    /**
+     * Network proxy settings to use with this context. Defaults to none.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
+
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
+
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
+
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
+
+    /**
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
+     */
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
+
+      /**
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
+       */
+      content?: "omit"|"embed"|"attach";
+
+      /**
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
+       */
+      path: string;
+
+      /**
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       */
+      mode?: "full"|"minimal";
+
+      /**
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       */
+      urlFilter?: string|RegExp;
+    };
+
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
+      /**
+       * Path to the directory to put videos into.
+       */
+      dir: string;
+
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
+
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
+
+    /**
+     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+     * [`viewport`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-viewport) is set.
+     */
+    screen?: {
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+
+    /**
+     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+     *   registered.
+     * - `'block'`: Playwright will block all registration of Service Workers.
+     */
+    serviceWorkers?: "allow"|"block";
+
+    /**
+     * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
+     *
+     * Populates context with given storage state. This option can be used to initialize context with logged-in
+     * information obtained via
+     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
+     */
+    storageState?: string|{
+      /**
+       * Cookies to set for context
+       */
+      cookies: Array<{
+        name: string;
+
+        value: string;
+
+        /**
+         * Domain and path are required. For the cookie to apply to all subdomains as well, prefix domain with a dot, like
+         * this: ".example.com"
+         */
+        domain: string;
+
+        /**
+         * Domain and path are required
+         */
+        path: string;
+
+        /**
+         * Unix time in seconds.
+         */
+        expires: number;
+
+        httpOnly: boolean;
+
+        secure: boolean;
+
+        /**
+         * sameSite flag
+         */
+        sameSite: "Strict"|"Lax"|"None";
+      }>;
+
+      origins: Array<{
+        origin: string;
+
+        /**
+         * localStorage to set for context
+         */
+        localStorage: Array<{
+          name: string;
+
+          value: string;
+        }>;
+      }>;
+    };
+
+    /**
+     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+     * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
+     */
+    strictSelectors?: boolean;
+
+    /**
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
+     */
+    timezoneId?: string;
+
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+
+    /**
+     * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.
+     */
+    videoSize?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+
+    /**
+     * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-page-option-record-video) instead.
+     */
+    videosPath?: string;
+
+    /**
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     *
+     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+     * by the operating system. It makes the execution of the tests non-deterministic.
+     *
+     */
+    viewport?: null|{
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+  }): Promise<Page>;
+
+  /**
+   * **NOTE** This API controls
+   * [Chromium Tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool) which is a low-level
+   * chromium-specific debugging tool. API to control [Playwright Tracing](https://playwright.dev/docs/trace-viewer) could be found
+   * [here](https://playwright.dev/docs/api/class-tracing).
+   *
+   * You can use
+   * [browser.startTracing([page, options])](https://playwright.dev/docs/api/class-browser#browser-start-tracing) and
+   * [browser.stopTracing()](https://playwright.dev/docs/api/class-browser#browser-stop-tracing) to create a trace file
+   * that can be opened in Chrome DevTools performance panel.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await browser.startTracing(page, { path: 'trace.json' });
+   * await page.goto('https://www.google.com');
+   * await browser.stopTracing();
+   * ```
+   *
+   * @param page Optional, if specified, tracing includes screenshots of the given page.
+   * @param options
+   */
+  startTracing(page?: Page, options?: {
+    /**
+     * specify custom categories to use instead of default.
+     */
+    categories?: Array<string>;
+
+    /**
+     * A path to write the trace file to.
+     */
+    path?: string;
+
+    /**
+     * captures screenshots in the trace.
+     */
+    screenshots?: boolean;
+  }): Promise<void>;
+
+  /**
+   * **NOTE** This API controls
+   * [Chromium Tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool) which is a low-level
+   * chromium-specific debugging tool. API to control [Playwright Tracing](https://playwright.dev/docs/trace-viewer) could be found
+   * [here](https://playwright.dev/docs/api/class-tracing).
+   *
+   * Returns the buffer with trace data.
+   */
+  stopTracing(): Promise<Buffer>;
+
+  /**
+   * Returns the browser version.
+   */
+  version(): string;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * The Worker class represents a [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API).
+ * `worker` event is emitted on the page object to signal a worker creation. `close` event is emitted on the worker
+ * object when the worker is gone.
+ *
+ * ```js
+ * page.on('worker', worker => {
+ *   console.log('Worker created: ' + worker.url());
+ *   worker.on('close', worker => console.log('Worker destroyed: ' + worker.url()));
+ * });
+ *
+ * console.log('Current workers:');
+ * for (const worker of page.workers())
+ *   console.log('  ' + worker.url());
+ * ```
+ *
+ */
+export interface Worker {
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * [Promise], then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) would wait for
+   * the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * non-[Serializable] value, then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   */
+  evaluate<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * [Promise], then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) would wait for
+   * the promise to resolve and return its value.
+   *
+   * If the function passed to the
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns a
+   * non-[Serializable] value, then
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) returns
+   * `undefined`. Playwright also supports transferring some additional values that are not serializable by `JSON`:
+   * `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-option-expression).
+   */
+  evaluate<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) and
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * is that
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns a [Promise], then
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg>(pageFunction: PageFunction<Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression) as a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * The only difference between
+   * [worker.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate) and
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * is that
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * returns a [Promise], then
+   * [worker.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the worker context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-worker#worker-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R>(pageFunction: PageFunction<void, R>, arg?: any): Promise<SmartHandle<R>>;
+  /**
+   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
+   * terminated.
+   */
+  on(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
+   * terminated.
+   */
+  addListener(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: (worker: Worker) => any): this;
+
+  /**
+   * Emitted when this dedicated [WebWorker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API) is
+   * terminated.
+   */
+  prependListener(event: 'close', listener: (worker: Worker) => any): this;
+
+  url(): string;
+}
+
+/**
+ * JSHandle represents an in-page JavaScript object. JSHandles can be created with the
+ * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) method.
+ *
+ * ```js
+ * const windowHandle = await page.evaluateHandle(() => window);
+ * // ...
+ * ```
+ *
+ * JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is exposed with
+ * [jsHandle.dispose()](https://playwright.dev/docs/api/class-jshandle#js-handle-dispose). JSHandles are auto-disposed
+ * when their origin frame gets navigated or the parent context gets destroyed.
+ *
+ * JSHandle instances can be used as an argument in
+ * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector),
+ * [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) and
+ * [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle)
+ * methods.
+ */
+export interface JSHandle<T = any> {
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression)
+   * returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet .retweets');
+   * expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10 retweets');
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   */
+  evaluate<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   *
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression)
+   * returns a [Promise], then `handle.evaluate` would wait for the promise to resolve and return its value.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const tweetHandle = await page.$('.tweet .retweets');
+   * expect(await tweetHandle.evaluate(node => node.innerText)).toBe('10 retweets');
+   * ```
+   *
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-option-expression).
+   */
+  evaluate<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   *
+   * The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle`
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would
+   * wait for the promise to resolve and return its value.
+   *
+   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
+   * more details.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg, O extends T = T>(pageFunction: PageFunctionOn<O, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * This method passes this handle as the first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   *
+   * The only difference between `jsHandle.evaluate` and `jsHandle.evaluateHandle` is that `jsHandle.evaluateHandle`
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
+   *
+   * If the function passed to the `jsHandle.evaluateHandle` returns a [Promise], then `jsHandle.evaluateHandle` would
+   * wait for the promise to resolve and return its value.
+   *
+   * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
+   * more details.
+   * @param pageFunction Function to be evaluated in the page context.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, O extends T = T>(pageFunction: PageFunctionOn<O, void, R>, arg?: any): Promise<SmartHandle<R>>;
+
+  /**
+   * Returns a JSON representation of the object. If the object has a `toJSON` function, it **will not be called**.
+   *
+   * **NOTE** The method will return an empty JSON object if the referenced object is not stringifiable. It will throw
+   * an error if the object has circular references.
+   *
+   */
+  jsonValue(): Promise<T>;
+  /**
+   * Returns either `null` or the object handle itself, if the object handle is an instance of
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle).
+   */
+  asElement(): T extends Node ? ElementHandle<T> : null;
+  /**
+   * The `jsHandle.dispose` method stops referencing the element handle.
+   */
+  dispose(): Promise<void>;
+
+  /**
+   * The method returns a map with **own property names** as keys and JSHandle instances for the property values.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const handle = await page.evaluateHandle(() => ({ window, document }));
+   * const properties = await handle.getProperties();
+   * const windowHandle = properties.get('window');
+   * const documentHandle = properties.get('document');
+   * await handle.dispose();
+   * ```
+   *
+   */
+  getProperties(): Promise<Map<string, JSHandle>>;
+
+  /**
+   * Fetches a single property from the referenced object.
+   * @param propertyName property to get
+   */
+  getProperty(propertyName: string): Promise<JSHandle>;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * - extends: [JSHandle](https://playwright.dev/docs/api/class-jshandle)
+ *
+ * ElementHandle represents an in-page DOM element. ElementHandles can be created with the
+ * [page.$(selector[, options])](https://playwright.dev/docs/api/class-page#page-query-selector) method.
+ *
+ * **NOTE** The use of ElementHandle is discouraged, use [Locator](https://playwright.dev/docs/api/class-locator)
+ * objects and web-first assertions instead.
+ *
+ * ```js
+ * const hrefElement = await page.$('a');
+ * await hrefElement.click();
+ * ```
  *
  * ElementHandle prevents DOM element from garbage collection unless the handle is disposed with
  * [jsHandle.dispose()](https://playwright.dev/docs/api/class-jshandle#js-handle-dispose). ElementHandles are
@@ -9201,8 +10529,9 @@ export interface JSHandle<T = any> {
  * [page.$eval(selector, pageFunction[, arg, options])](https://playwright.dev/docs/api/class-page#page-eval-on-selector)
  * and [page.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate) methods.
  *
- * The difference between the {@link Locator} and ElementHandle is that the ElementHandle points to a particular
- * element, while {@link Locator} captures the logic of how to retrieve an element.
+ * The difference between the [Locator](https://playwright.dev/docs/api/class-locator) and ElementHandle is that the
+ * ElementHandle points to a particular element, while [Locator](https://playwright.dev/docs/api/class-locator)
+ * captures the logic of how to retrieve an element.
  *
  * In the example below, handle points to a particular DOM element on page. If that element changes text or is used by
  * React to render an entirely different component, handle is still pointing to that very DOM element. This can lead
@@ -9269,14 +10598,19 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
-   * first argument to `pageFunction`. If no elements match the selector, the method throws an error.
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -9290,21 +10624,27 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    */
   $eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
-   * first argument to `pageFunction`. If no elements match the selector, the method throws an error.
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -9318,21 +10658,27 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    */
   $eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
-   * first argument to `pageFunction`. If no elements match the selector, the method throws an error.
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -9346,21 +10692,27 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    */
   $eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K], void, R>, arg?: any): Promise<R>;
   /**
    * **NOTE** This method does not wait for the element to pass actionability checks and therefore can lead to the flaky tests.
    * Use
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate),
-   * other {@link Locator} helper methods or web-first assertions instead.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods or web-first assertions instead.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    *
    * The method finds an element matching the specified selector in the `ElementHandle`s subtree and passes it as a
-   * first argument to `pageFunction`. If no elements match the selector, the method throws an error.
+   * first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
+   * If no elements match the selector, the method throws an error.
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector)
    * would wait for the promise to resolve and return its value.
    *
@@ -9374,21 +10726,27 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-option-expression).
    */
   $eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E, void, R>, arg?: any): Promise<R>;
 
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
-   * of matched elements as a first argument to `pageFunction`.
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -9410,20 +10768,26 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    */
   $$eval<K extends keyof HTMLElementTagNameMap, R, Arg>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
-   * of matched elements as a first argument to `pageFunction`.
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -9445,20 +10809,26 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    */
   $$eval<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
-   * of matched elements as a first argument to `pageFunction`.
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -9480,20 +10850,26 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    */
   $$eval<K extends keyof HTMLElementTagNameMap, R>(selector: K, pageFunction: PageFunctionOn<HTMLElementTagNameMap[K][], void, R>, arg?: any): Promise<R>;
   /**
    * **NOTE** In most cases,
    * [locator.evaluateAll(pageFunction[, arg])](https://playwright.dev/docs/api/class-locator#locator-evaluate-all),
-   * other {@link Locator} helper methods and web-first assertions do a better job.
+   * other [Locator](https://playwright.dev/docs/api/class-locator) helper methods and web-first assertions do a better
+   * job.
    *
-   * Returns the return value of `pageFunction`.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
    * The method finds all elements matching the specified selector in the `ElementHandle`'s subtree and passes an array
-   * of matched elements as a first argument to `pageFunction`.
+   * of matched elements as a first argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    *
-   * If `pageFunction` returns a [Promise], then
+   * If
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression)
+   * returns a [Promise], then
    * [elementHandle.$$eval(selector, pageFunction[, arg])](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all)
    * would wait for the promise to resolve and return its value.
    *
@@ -9515,7 +10891,8 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * @param selector A selector to query for.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-elementhandle#element-handle-eval-on-selector-all-option-expression).
    */
   $$eval<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(selector: string, pageFunction: PageFunctionOn<E[], void, R>, arg?: any): Promise<R>;
 
@@ -9523,13 +10900,20 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** Use web assertions that assert visibility or a locator-based
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
    *
-   * Returns element specified by selector when it satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
-   *
-   * Wait for the `selector` relative to the element handle to satisfy `state` option (either appear/disappear from dom,
-   * or become visible/hidden). If at the moment of calling the method `selector` already satisfies the condition, the
-   * method will return immediately. If the selector doesn't satisfy the condition for the `timeout` milliseconds, the
-   * function will throw.
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
    *
    * **Usage**
    *
@@ -9543,6 +10927,7 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** This method does not work across navigations, use
    * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
    * instead.
+   *
    * @param selector A selector to query for.
    * @param options
    */
@@ -9551,13 +10936,20 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** Use web assertions that assert visibility or a locator-based
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
    *
-   * Returns element specified by selector when it satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
-   *
-   * Wait for the `selector` relative to the element handle to satisfy `state` option (either appear/disappear from dom,
-   * or become visible/hidden). If at the moment of calling the method `selector` already satisfies the condition, the
-   * method will return immediately. If the selector doesn't satisfy the condition for the `timeout` milliseconds, the
-   * function will throw.
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
    *
    * **Usage**
    *
@@ -9571,6 +10963,7 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** This method does not work across navigations, use
    * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
    * instead.
+   *
    * @param selector A selector to query for.
    * @param options
    */
@@ -9579,13 +10972,20 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** Use web assertions that assert visibility or a locator-based
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
    *
-   * Returns element specified by selector when it satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
-   *
-   * Wait for the `selector` relative to the element handle to satisfy `state` option (either appear/disappear from dom,
-   * or become visible/hidden). If at the moment of calling the method `selector` already satisfies the condition, the
-   * method will return immediately. If the selector doesn't satisfy the condition for the `timeout` milliseconds, the
-   * function will throw.
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
    *
    * **Usage**
    *
@@ -9599,6 +10999,7 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** This method does not work across navigations, use
    * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
    * instead.
+   *
    * @param selector A selector to query for.
    * @param options
    */
@@ -9607,13 +11008,20 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** Use web assertions that assert visibility or a locator-based
    * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) instead.
    *
-   * Returns element specified by selector when it satisfies `state` option. Returns `null` if waiting for `hidden` or
-   * `detached`.
-   *
-   * Wait for the `selector` relative to the element handle to satisfy `state` option (either appear/disappear from dom,
-   * or become visible/hidden). If at the moment of calling the method `selector` already satisfies the condition, the
-   * method will return immediately. If the selector doesn't satisfy the condition for the `timeout` milliseconds, the
-   * function will throw.
+   * Returns element specified by selector when it satisfies
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state)
+   * option. Returns `null` if waiting for `hidden` or `detached`.
+   *
+   * Wait for the
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * relative to the element handle to satisfy
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-state) option
+   * (either appear/disappear from dom, or become visible/hidden). If at the moment of calling the method
+   * [`selector`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-selector)
+   * already satisfies the condition, the method will return immediately. If the selector doesn't satisfy the condition
+   * for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-selector-option-timeout)
+   * milliseconds, the function will throw.
    *
    * **Usage**
    *
@@ -9627,6 +11035,7 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * **NOTE** This method does not work across navigations, use
    * [page.waitForSelector(selector[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-selector)
    * instead.
+   *
    * @param selector A selector to query for.
    * @param options
    */
@@ -9682,7 +11091,9 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * This method checks the element by performing the following steps:
    * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
    *    checked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-check-option-force) option is
+   *    set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
@@ -9690,8 +11101,9 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-check-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param options
    */
   check(options?: {
@@ -9736,16 +11148,22 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
    * This method clicks the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-force) option is
+   *    set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
-   *    element, or the specified `position`.
-   * 1. Wait for initiated navigations to either succeed or fail, unless `noWaitAfter` option is set.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-no-wait-after)
+   *    option is set.
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-click-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param options
    */
   click(options?: {
@@ -9819,17 +11237,23 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * instead. Read more about [locators](https://playwright.dev/docs/locators).
    *
    * This method double clicks the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dblclick-option-force) option is
+   *    set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dblclick-option-position).
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dblclick-option-timeout), this
+   * method throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables
+   * this.
    *
    * **NOTE** `elementHandle.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
    * @param options
    */
   dblclick(options?: {
@@ -9901,10 +11325,15 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * await elementHandle.dispatchEvent('click');
    * ```
    *
-   * Under the hood, it creates an instance of an event based on the given `type`, initializes it with `eventInit`
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dispatch-event-option-type),
+   * initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dispatch-event-option-event-init)
    * properties and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
    *
-   * Since `eventInit` is event-specific, please refer to the events documentation for the lists of initial properties:
+   * Since
+   * [`eventInit`](https://playwright.dev/docs/api/class-elementhandle#element-handle-dispatch-event-option-event-init)
+   * is event-specific, please refer to the events documentation for the lists of initial properties:
    * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
    * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
    * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
@@ -9990,15 +11419,19 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * Read more about [locators](https://playwright.dev/docs/locators).
    *
    * This method hovers over the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-hover-option-force) option is
+   *    set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-hover-option-position).
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-hover-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param options
    */
   hover(options?: {
@@ -10146,9 +11579,10 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
    * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
    *
-   * `key` can specify the intended
-   * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
-   * to generate the text for. A superset of the `key` values can be found
+   * [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) can specify the
+   * intended [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single
+   * character to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) values can be found
    * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
    *
    * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
@@ -10158,10 +11592,11 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
    * `ControlOrMeta`.
    *
-   * Holding down `Shift` will type the text that corresponds to the `key` in the upper case.
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) in the upper case.
    *
-   * If `key` is a single character, it is case-sensitive, so the values `a` and `A` will generate different respective
-   * texts.
+   * If [`key`](https://playwright.dev/docs/api/class-elementhandle#element-handle-press-option-key) is a single
+   * character, it is case-sensitive, so the values `a` and `A` will generate different respective texts.
    *
    * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
    * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
@@ -10224,7 +11659,10 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
 
     /**
      * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
-     * box `#FF00FF` (customized by `maskColor`) that completely covers its bounding box.
+     * box `#FF00FF` (customized by
+     * [`maskColor`](https://playwright.dev/docs/api/class-elementhandle#element-handle-screenshot-option-mask-color))
+     * that completely covers its bounding box. The mask is also applied to invisible elements, see
+     * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
      */
     mask?: Array<Locator>;
 
@@ -10241,9 +11679,10 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
     omitBackground?: boolean;
 
     /**
-     * The file path to save the image to. The screenshot type will be inferred from file extension. If `path` is a
-     * relative path, then it is resolved relative to the current working directory. If no path is provided, the image
-     * won't be saved to the disk.
+     * The file path to save the image to. The screenshot type will be inferred from file extension. If
+     * [`path`](https://playwright.dev/docs/api/class-elementhandle#element-handle-screenshot-option-path) is a relative
+     * path, then it is resolved relative to the current working directory. If no path is provided, the image won't be
+     * saved to the disk.
      */
     path?: string;
 
@@ -10379,10 +11818,8 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
     force?: boolean;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
-     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
-     * navigating to inaccessible pages. Defaults to `false`.
-     * @deprecated This option will default to `true` in the future.
+     * This option has no effect.
+     * @deprecated This option has no effect.
      */
     noWaitAfter?: boolean;
 
@@ -10431,15 +11868,18 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * This method checks or unchecks an element by performing the following steps:
    * 1. Ensure that element is a checkbox or a radio input. If not, this method throws.
    * 1. If the element already has the right checked state, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
-   *    the element is detached during the checks, the whole action is retried.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-set-checked-option-force) option
+   *    is set. If the element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-set-checked-option-timeout), this
+   * method throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables
+   * this.
    * @param checked Whether to check or uncheck the checkbox.
    * @param options
    */
@@ -10489,7 +11929,7 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs
    * with a `[webkitdirectory]` attribute, only a single directory path is supported.
    *
-   * This method expects {@link ElementHandle} to point to an
+   * This method expects [ElementHandle](https://playwright.dev/docs/api/class-elementhandle) to point to an
    * [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the element is inside
    * the `<label>` element that has an associated
    * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
@@ -10547,17 +11987,21 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * more about [locators](https://playwright.dev/docs/locators).
    *
    * This method taps the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-tap-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-elementhandle#element-handle-tap-option-position).
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-tap-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** `elementHandle.tap()` requires that the `hasTouch` option of the browser context be set to true.
+   *
    * @param options
    */
   tap(options?: {
@@ -10656,7 +12100,9 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * This method checks the element by performing the following steps:
    * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
    *    unchecked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-elementhandle#element-handle-uncheck-option-force) option is
+   *    set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
@@ -10664,8 +12110,9 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-uncheck-option-timeout), this method
+   * throws a [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param options
    */
   uncheck(options?: {
@@ -10706,10 +12153,13 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
   }): Promise<void>;
 
   /**
-   * Returns when the element satisfies the `state`.
+   * Returns when the element satisfies the
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-element-state-option-state).
    *
-   * Depending on the `state` parameter, this method waits for one of the [actionability](https://playwright.dev/docs/actionability) checks to
-   * pass. This method throws when the element is detached while waiting, unless waiting for the `"hidden"` state.
+   * Depending on the
+   * [`state`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-element-state-option-state)
+   * parameter, this method waits for one of the [actionability](https://playwright.dev/docs/actionability) checks to pass. This method throws
+   * when the element is detached while waiting, unless waiting for the `"hidden"` state.
    * - `"visible"` Wait until the element is [visible](https://playwright.dev/docs/actionability#visible).
    * - `"hidden"` Wait until the element is [not visible](https://playwright.dev/docs/actionability#visible) or not attached. Note that
    *   waiting for hidden does not throw when the element detaches.
@@ -10719,7 +12169,9 @@ export interface ElementHandle<T=Node> extends JSHandle<T> {
    * - `"disabled"` Wait until the element is [not enabled](https://playwright.dev/docs/actionability#enabled).
    * - `"editable"` Wait until the element is [editable](https://playwright.dev/docs/actionability#editable).
    *
-   * If the element does not satisfy the condition for the `timeout` milliseconds, this method will throw.
+   * If the element does not satisfy the condition for the
+   * [`timeout`](https://playwright.dev/docs/api/class-elementhandle#element-handle-wait-for-element-state-option-timeout)
+   * milliseconds, this method will throw.
    * @param state A state to wait for, see below for more details.
    * @param options
    */
@@ -10747,22 +12199,32 @@ export interface Locator {
    *
    * **Details**
    *
-   * Returns the return value of `pageFunction`, called with the matching element as a first argument, and `arg` as a
-   * second argument.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression), called with the
+   * matching element as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-arg) as a second argument.
    *
-   * If `pageFunction` returns a [Promise], this method will wait for the promise to resolve and return its value.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
    *
-   * If `pageFunction` throws or rejects, this method throws.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) throws or
+   * rejects, this method throws.
    *
    * **Usage**
    *
+   * Passing argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression):
+   *
    * ```js
-   * const tweets = page.locator('.tweet .retweets');
-   * expect(await tweets.evaluate(node => node.innerText)).toBe('10 retweets');
+   * const result = await page.getByTestId('myId').evaluate((element, [x, y]) => {
+   *   return element.textContent + ' ' + x * y;
+   * }, [7, 8]);
+   * console.log(result); // prints "myId text 56"
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression).
    * @param options
    */
   evaluate<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg, options?: {
@@ -10773,35 +12235,47 @@ export interface Locator {
    *
    * **Details**
    *
-   * Returns the return value of `pageFunction`, called with the matching element as a first argument, and `arg` as a
-   * second argument.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression), called with the
+   * matching element as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-arg) as a second argument.
    *
-   * If `pageFunction` returns a [Promise], this method will wait for the promise to resolve and return its value.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
    *
-   * If `pageFunction` throws or rejects, this method throws.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression) throws or
+   * rejects, this method throws.
    *
    * **Usage**
    *
+   * Passing argument to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression):
+   *
    * ```js
-   * const tweets = page.locator('.tweet .retweets');
-   * expect(await tweets.evaluate(node => node.innerText)).toBe('10 retweets');
+   * const result = await page.getByTestId('myId').evaluate((element, [x, y]) => {
+   *   return element.textContent + ' ' + x * y;
+   * }, [7, 8]);
+   * console.log(result); // prints "myId text 56"
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-option-expression).
    * @param options
    */
   evaluate<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>, options?: {
     timeout?: number;
   }): Promise<R>;
   /**
-   * Execute JavaScript code in the page, taking the matching element as an argument, and return a {@link JSHandle} with
-   * the result.
+   * Execute JavaScript code in the page, taking the matching element as an argument, and return a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) with the result.
    *
    * **Details**
    *
-   * Returns the return value of `pageFunction` as a{@link JSHandle}, called with the matching element as a first
-   * argument, and `arg` as a second argument.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) as
+   * a[JSHandle](https://playwright.dev/docs/api/class-jshandle), called with the matching element as a first argument,
+   * and [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-arg) as a second argument.
    *
    * The only difference between
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate)
@@ -10809,27 +12283,32 @@ export interface Locator {
    * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
    * is that
    * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
-   * returns {@link JSHandle}.
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
-   * If `pageFunction` returns a [Promise], this method will wait for the promise to resolve and return its value.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression)
+   * returns a [Promise], this method will wait for the promise to resolve and return its value.
    *
-   * If `pageFunction` throws or rejects, this method throws.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) throws
+   * or rejects, this method throws.
    *
    * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
    * more details.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression).
    * @param options
    */
   evaluateHandle<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
   /**
-   * Execute JavaScript code in the page, taking the matching element as an argument, and return a {@link JSHandle} with
-   * the result.
+   * Execute JavaScript code in the page, taking the matching element as an argument, and return a
+   * [JSHandle](https://playwright.dev/docs/api/class-jshandle) with the result.
    *
    * **Details**
    *
-   * Returns the return value of `pageFunction` as a{@link JSHandle}, called with the matching element as a first
-   * argument, and `arg` as a second argument.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) as
+   * a[JSHandle](https://playwright.dev/docs/api/class-jshandle), called with the matching element as a first argument,
+   * and [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-arg) as a second argument.
    *
    * The only difference between
    * [locator.evaluate(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate)
@@ -10837,16 +12316,19 @@ export interface Locator {
    * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
    * is that
    * [locator.evaluateHandle(pageFunction[, arg, options])](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle)
-   * returns {@link JSHandle}.
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
-   * If `pageFunction` returns a [Promise], this method will wait for the promise to resolve and return its value.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression)
+   * returns a [Promise], this method will wait for the promise to resolve and return its value.
    *
-   * If `pageFunction` throws or rejects, this method throws.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression) throws
+   * or rejects, this method throws.
    *
    * See [page.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-page#page-evaluate-handle) for
    * more details.
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-handle-option-expression).
    * @param options
    */
   evaluateHandle<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E, void, R>): Promise<SmartHandle<R>>;
@@ -10855,12 +12337,16 @@ export interface Locator {
    *
    * **Details**
    *
-   * Returns the return value of `pageFunction`, called with an array of all matching elements as a first argument, and
-   * `arg` as a second argument.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression), called with
+   * an array of all matching elements as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-arg) as a second argument.
    *
-   * If `pageFunction` returns a [Promise], this method will wait for the promise to resolve and return its value.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
    *
-   * If `pageFunction` throws or rejects, this method throws.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) throws or
+   * rejects, this method throws.
    *
    * **Usage**
    *
@@ -10870,7 +12356,8 @@ export interface Locator {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression).
    */
   evaluateAll<R, Arg, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E[], Arg, R>, arg: Arg): Promise<R>;
   /**
@@ -10878,12 +12365,16 @@ export interface Locator {
    *
    * **Details**
    *
-   * Returns the return value of `pageFunction`, called with an array of all matching elements as a first argument, and
-   * `arg` as a second argument.
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression), called with
+   * an array of all matching elements as a first argument, and
+   * [`arg`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-arg) as a second argument.
    *
-   * If `pageFunction` returns a [Promise], this method will wait for the promise to resolve and return its value.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) returns a
+   * [Promise], this method will wait for the promise to resolve and return its value.
    *
-   * If `pageFunction` throws or rejects, this method throws.
+   * If [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression) throws or
+   * rejects, this method throws.
    *
    * **Usage**
    *
@@ -10893,12 +12384,13 @@ export interface Locator {
    * ```
    *
    * @param pageFunction Function to be evaluated in the page context.
-   * @param arg Optional argument to pass to `pageFunction`.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-locator#locator-evaluate-all-option-expression).
    */
   evaluateAll<R, E extends SVGElement | HTMLElement = SVGElement | HTMLElement>(pageFunction: PageFunctionOn<E[], void, R>): Promise<R>;
   /**
-   * **NOTE** Always prefer using {@link Locator}s and web assertions over {@link ElementHandle}s because latter are inherently
-   * racy.
+   * **NOTE** Always prefer using [Locator](https://playwright.dev/docs/api/class-locator)s and web assertions over
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle)s because latter are inherently racy.
    *
    * Resolves given locator to the first matching DOM element. If there are no matching elements, waits for one. If
    * multiple elements match the locator, throws.
@@ -10912,10 +12404,14 @@ export interface Locator {
    * elements.
    *
    * **NOTE** [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all) does not wait for elements to
-   * match the locator, and instead immediately returns whatever is present in the page.  When the list of elements
-   * changes dynamically, [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all) will produce
-   * unpredictable and flaky results.  When the list of elements is stable, but loaded dynamically, wait for the full
-   * list to finish loading before calling [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all).
+   * match the locator, and instead immediately returns whatever is present in the page.
+   *
+   * When the list of elements changes dynamically,
+   * [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all) will produce unpredictable and flaky
+   * results.
+   *
+   * When the list of elements is stable, but loaded dynamically, wait for the full list to finish loading before
+   * calling [locator.all()](https://playwright.dev/docs/api/class-locator#locator-all).
    *
    * **Usage**
    *
@@ -10932,7 +12428,9 @@ export interface Locator {
    *
    * **NOTE** If you need to assert text on the page, prefer
    * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
-   * with `useInnerText` option to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   * with
+   * [`useInnerText`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text-option-use-inner-text)
+   * option to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
    *
    * **Usage**
    *
@@ -10974,6 +12472,57 @@ export interface Locator {
    */
   and(locator: Locator): Locator;
 
+  /**
+   * Captures the aria snapshot of the given element. Read more about [aria snapshots](https://playwright.dev/docs/aria-snapshots) and
+   * [expect(locator).toMatchAriaSnapshot(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot)
+   * for the corresponding assertion.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await page.getByRole('link').ariaSnapshot();
+   * ```
+   *
+   * **Details**
+   *
+   * This method captures the aria snapshot of the given element. The snapshot is a string that represents the state of
+   * the element and its children. The snapshot can be used to assert the state of the element in the test, or to
+   * compare it to state in the future.
+   *
+   * The ARIA snapshot is represented using [YAML](https://yaml.org/spec/1.2.2/) markup language:
+   * - The keys of the objects are the roles and optional accessible names of the elements.
+   * - The values are either text content or an array of child elements.
+   * - Generic static text can be represented with the `text` key.
+   *
+   * Below is the HTML markup and the respective ARIA snapshot:
+   *
+   * ```html
+   * <ul aria-label="Links">
+   *   <li><a href="/">Home</a></li>
+   *   <li><a href="/about">About</a></li>
+   * <ul>
+   * ```
+   *
+   * ```yml
+   * - list "Links":
+   *   - listitem:
+   *     - link "Home"
+   *   - listitem:
+   *     - link "About"
+   * ```
+   *
+   * @param options
+   */
+  ariaSnapshot(options?: {
+    /**
+     * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+     * option in the config, or by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+     * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+     */
+    timeout?: number;
+  }): Promise<string>;
+
   /**
    * Calls [blur](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/blur) on the element.
    * @param options
@@ -11052,7 +12601,8 @@ export interface Locator {
    * Performs the following steps:
    * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
    *    checked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-check-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
@@ -11060,8 +12610,9 @@ export interface Locator {
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-check-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **Usage**
    *
@@ -11156,16 +12707,21 @@ export interface Locator {
    * **Details**
    *
    * This method clicks the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-click-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
-   *    element, or the specified `position`.
-   * 1. Wait for initiated navigations to either succeed or fail, unless `noWaitAfter` option is set.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-click-option-position).
+   * 1. Wait for initiated navigations to either succeed or fail, unless
+   *    [`noWaitAfter`](https://playwright.dev/docs/api/class-locator#locator-click-option-no-wait-after) option is
+   *    set.
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-click-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **Usage**
    *
@@ -11243,16 +12799,19 @@ export interface Locator {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
 
   /**
-   * Returns a {@link FrameLocator} object pointing to the same `iframe` as this locator.
+   * Returns a [FrameLocator](https://playwright.dev/docs/api/class-framelocator) object pointing to the same `iframe`
+   * as this locator.
    *
-   * Useful when you have a {@link Locator} object obtained somewhere, and later on would like to interact with the
-   * content inside the frame.
+   * Useful when you have a [Locator](https://playwright.dev/docs/api/class-locator) object obtained somewhere, and
+   * later on would like to interact with the content inside the frame.
    *
    * For a reverse operation, use
    * [frameLocator.owner()](https://playwright.dev/docs/api/class-framelocator#frame-locator-owner).
@@ -11291,17 +12850,21 @@ export interface Locator {
    * **Details**
    *
    * This method double clicks the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-dblclick-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to double click in the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-dblclick-option-position).
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-dblclick-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** `element.dblclick()` dispatches two `click` events and a single `dblclick` event.
+   *
    * @param options
    */
   dblclick(options?: {
@@ -11353,11 +12916,28 @@ export interface Locator {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
 
+  /**
+   * Describes the locator, description is used in the trace viewer and reports. Returns the locator pointing to the
+   * same element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const button = page.getByTestId('btn-sub').describe('Subscribe button');
+   * await button.click();
+   * ```
+   *
+   * @param description Locator description.
+   */
+  describe(description: string): Locator;
+
   /**
    * Programmatically dispatch an event on the matching element.
    *
@@ -11373,10 +12953,13 @@ export interface Locator {
    * `click` is dispatched. This is equivalent to calling
    * [element.click()](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/click).
    *
-   * Under the hood, it creates an instance of an event based on the given `type`, initializes it with `eventInit`
-   * properties and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
+   * Under the hood, it creates an instance of an event based on the given
+   * [`type`](https://playwright.dev/docs/api/class-locator#locator-dispatch-event-option-type), initializes it with
+   * [`eventInit`](https://playwright.dev/docs/api/class-locator#locator-dispatch-event-option-event-init) properties
+   * and dispatches it on the element. Events are `composed`, `cancelable` and bubble by default.
    *
-   * Since `eventInit` is event-specific, please refer to the events documentation for the lists of initial properties:
+   * Since [`eventInit`](https://playwright.dev/docs/api/class-locator#locator-dispatch-event-option-event-init) is
+   * event-specific, please refer to the events documentation for the lists of initial properties:
    * - [DeviceMotionEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceMotionEvent/DeviceMotionEvent)
    * - [DeviceOrientationEvent](https://developer.mozilla.org/en-US/docs/Web/API/DeviceOrientationEvent/DeviceOrientationEvent)
    * - [DragEvent](https://developer.mozilla.org/en-US/docs/Web/API/DragEvent/DragEvent)
@@ -11388,10 +12971,10 @@ export interface Locator {
    * - [TouchEvent](https://developer.mozilla.org/en-US/docs/Web/API/TouchEvent/TouchEvent)
    * - [WheelEvent](https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent/WheelEvent)
    *
-   * You can also specify {@link JSHandle} as the property value if you want live objects to be passed into the event:
+   * You can also specify [JSHandle](https://playwright.dev/docs/api/class-jshandle) as the property value if you want
+   * live objects to be passed into the event:
    *
    * ```js
-   * // Note you can only create DataTransfer in Chromium and Firefox
    * const dataTransfer = await page.evaluateHandle(() => new DataTransfer());
    * await locator.dispatchEvent('dragstart', { dataTransfer });
    * ```
@@ -11483,8 +13066,8 @@ export interface Locator {
   }): Promise<void>;
 
   /**
-   * **NOTE** Always prefer using {@link Locator}s and web assertions over {@link ElementHandle}s because latter are inherently
-   * racy.
+   * **NOTE** Always prefer using [Locator](https://playwright.dev/docs/api/class-locator)s and web assertions over
+   * [ElementHandle](https://playwright.dev/docs/api/class-elementhandle)s because latter are inherently racy.
    *
    * Resolves given locator to all matching DOM elements. If there are no matching elements, returns an empty list.
    */
@@ -11562,8 +13145,8 @@ export interface Locator {
      * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
      * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     has?: Locator;
 
@@ -11571,8 +13154,8 @@ export interface Locator {
      * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
      * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     hasNot?: Locator;
 
@@ -11588,6 +13171,11 @@ export interface Locator {
      * `<article><div>Playwright</div></article>`.
      */
     hasText?: string|RegExp;
+
+    /**
+     * Only matches visible or invisible elements.
+     */
+    visible?: boolean;
   }): Locator;
 
   /**
@@ -11630,6 +13218,7 @@ export interface Locator {
    * **NOTE** If you need to assert an element's attribute, prefer
    * [expect(locator).toHaveAttribute(name, value[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-attribute)
    * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
    * @param name Attribute name to get the value for.
    * @param options
    */
@@ -11782,12 +13371,15 @@ export interface Locator {
      *
      * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
      * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
      */
     disabled?: boolean;
 
     /**
-     * Whether `name` is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when `name` is a
-     * regular expression. Note that exact match still trims whitespace.
+     * Whether [`name`](https://playwright.dev/docs/api/class-locator#locator-get-by-role-option-name) is matched exactly:
+     * case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-locator#locator-get-by-role-option-name) is a regular expression.
+     * Note that exact match still trims whitespace.
      */
     exact?: boolean;
 
@@ -11816,7 +13408,8 @@ export interface Locator {
 
     /**
      * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
-     * case-insensitive and searches for a substring, use `exact` to control this behavior.
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-locator#locator-get-by-role-option-exact) to control this behavior.
      *
      * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
      */
@@ -11973,15 +13566,18 @@ export interface Locator {
    * **Details**
    *
    * This method hovers over the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-hover-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to hover over the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-hover-option-position).
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-hover-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param options
    */
   hover(options?: {
@@ -12023,7 +13619,9 @@ export interface Locator {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -12047,7 +13645,10 @@ export interface Locator {
    *
    * **NOTE** If you need to assert text on the page, prefer
    * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
-   * with `useInnerText` option to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   * with
+   * [`useInnerText`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text-option-use-inner-text)
+   * option to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
    * @param options
    */
   innerText(options?: {
@@ -12142,7 +13743,9 @@ export interface Locator {
   }): Promise<boolean>;
 
   /**
-   * Returns whether the element is [editable](https://playwright.dev/docs/actionability#editable).
+   * Returns whether the element is [editable](https://playwright.dev/docs/actionability#editable). If the target element is not an `<input>`,
+   * `<textarea>`, `<select>`, `[contenteditable]` and does not have a role allowing `[aria-readonly]`, this method
+   * throws an error.
    *
    * **NOTE** If you need to assert that an element is editable, prefer
    * [expect(locator).toBeEditable([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-editable)
@@ -12270,8 +13873,8 @@ export interface Locator {
      * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
      * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     has?: Locator;
 
@@ -12279,8 +13882,8 @@ export interface Locator {
      * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
      * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     hasNot?: Locator;
 
@@ -12312,17 +13915,24 @@ export interface Locator {
   nth(index: number): Locator;
 
   /**
-   * Creates a locator that matches either of the two locators.
+   * Creates a locator matching all elements that match one or both of the two locators.
+   *
+   * Note that when both locators match something, the resulting locator will have multiple matches, potentially causing
+   * a [locator strictness](https://playwright.dev/docs/locators#strictness) violation.
    *
    * **Usage**
    *
    * Consider a scenario where you'd like to click on a "New email" button, but sometimes a security settings dialog
    * shows up instead. In this case, you can wait for either a "New email" button, or a dialog and act accordingly.
    *
+   * **NOTE** If both "New email" button and security dialog appear on screen, the "or" locator will match both of them,
+   * possibly throwing the ["strict mode violation" error](https://playwright.dev/docs/locators#strictness). In this case, you can use
+   * [locator.first()](https://playwright.dev/docs/api/class-locator#locator-first) to only match one of them.
+   *
    * ```js
    * const newEmail = page.getByRole('button', { name: 'New' });
    * const dialog = page.getByText('Confirm security settings');
-   * await expect(newEmail.or(dialog)).toBeVisible();
+   * await expect(newEmail.or(dialog).first()).toBeVisible();
    * if (await dialog.isVisible())
    *   await page.getByRole('button', { name: 'Dismiss' }).click();
    * await newEmail.click();
@@ -12352,9 +13962,10 @@ export interface Locator {
    * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) and
    * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
    *
-   * `key` can specify the intended
+   * [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) can specify the intended
    * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
-   * to generate the text for. A superset of the `key` values can be found
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) values can be found
    * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
    *
    * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
@@ -12364,10 +13975,11 @@ export interface Locator {
    * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
    * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
    *
-   * Holding down `Shift` will type the text that corresponds to the `key` in the upper case.
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) in the upper case.
    *
-   * If `key` is a single character, it is case-sensitive, so the values `a` and `A` will generate different respective
-   * texts.
+   * If [`key`](https://playwright.dev/docs/api/class-locator#locator-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
    *
    * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
    * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
@@ -12515,9 +14127,9 @@ export interface Locator {
    *
    * ```html
    * <select multiple>
-   *   <option value="red">Red</div>
-   *   <option value="green">Green</div>
-   *   <option value="blue">Blue</div>
+   *   <option value="red">Red</option>
+   *   <option value="green">Green</option>
+   *   <option value="blue">Blue</option>
    * </select>
    * ```
    *
@@ -12574,10 +14186,8 @@ export interface Locator {
     force?: boolean;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You
-     * can opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as
-     * navigating to inaccessible pages. Defaults to `false`.
-     * @deprecated This option will default to `true` in the future.
+     * This option has no effect.
+     * @deprecated This option has no effect.
      */
     noWaitAfter?: boolean;
 
@@ -12628,15 +14238,17 @@ export interface Locator {
    * This method checks or unchecks an element by performing the following steps:
    * 1. Ensure that matched element is a checkbox or a radio input. If not, this method throws.
    * 1. If the element already has the right checked state, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless `force` option is set. If
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the matched element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-set-checked-option-force) option is set. If
    *    the element is detached during the checks, the whole action is retried.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
    * 1. Ensure that the element is now checked or unchecked. If not, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-set-checked-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param checked Whether to check or uncheck the checkbox.
    * @param options
    */
@@ -12712,7 +14324,7 @@ export interface Locator {
    * Sets the value of the file input to these file paths or files. If some of the `filePaths` are relative paths, then
    * they are resolved relative to the current working directory. For empty array, clears the selected files.
    *
-   * This method expects {@link Locator} to point to an
+   * This method expects [Locator](https://playwright.dev/docs/api/class-locator) to point to an
    * [input element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input). However, if the element is inside
    * the `<label>` element that has an associated
    * [control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), targets the control instead.
@@ -12766,22 +14378,27 @@ export interface Locator {
   }): Promise<void>;
 
   /**
-   * Perform a tap gesture on the element matching the locator.
+   * Perform a tap gesture on the element matching the locator. For examples of emulating other gestures by manually
+   * dispatching touch events, see the [emulating legacy touch events](https://playwright.dev/docs/touch-events) page.
    *
    * **Details**
    *
    * This method taps the element by performing the following steps:
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-tap-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.touchscreen](https://playwright.dev/docs/api/class-page#page-touchscreen) to tap the center of the
-   *    element, or the specified `position`.
+   *    element, or the specified
+   *    [`position`](https://playwright.dev/docs/api/class-locator#locator-tap-option-position).
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-tap-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    *
    * **NOTE** `element.tap()` requires that the `hasTouch` option of the browser context be set to true.
+   *
    * @param options
    */
   tap(options?: {
@@ -12823,7 +14440,9 @@ export interface Locator {
 
     /**
      * When set, this method only performs the [actionability](https://playwright.dev/docs/actionability) checks and skips the action. Defaults
-     * to `false`. Useful to wait until the element is ready for the action without performing it.
+     * to `false`. Useful to wait until the element is ready for the action without performing it. Note that keyboard
+     * `modifiers` will be pressed regardless of `trial` to allow testing elements which are only visible when those keys
+     * are pressed.
      */
     trial?: boolean;
   }): Promise<void>;
@@ -12834,6 +14453,7 @@ export interface Locator {
    * **NOTE** If you need to assert text on the page, prefer
    * [expect(locator).toHaveText(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text)
    * to avoid flakiness. See [assertions guide](https://playwright.dev/docs/test-assertions) for more details.
+   *
    * @param options
    */
   textContent(options?: {
@@ -12896,7 +14516,8 @@ export interface Locator {
    * This method unchecks the element by performing the following steps:
    * 1. Ensure that element is a checkbox or a radio input. If not, this method throws. If the element is already
    *    unchecked, this method returns immediately.
-   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless `force` option is set.
+   * 1. Wait for [actionability](https://playwright.dev/docs/actionability) checks on the element, unless
+   *    [`force`](https://playwright.dev/docs/api/class-locator#locator-uncheck-option-force) option is set.
    * 1. Scroll the element into view if needed.
    * 1. Use [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse) to click in the center of the
    *    element.
@@ -12904,8 +14525,9 @@ export interface Locator {
    *
    * If the element is detached from the DOM at any moment during the action, this method throws.
    *
-   * When all steps combined have not finished during the specified `timeout`, this method throws a {@link
-   * TimeoutError}. Passing zero timeout disables this.
+   * When all steps combined have not finished during the specified
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-uncheck-option-timeout), this method throws a
+   * [TimeoutError](https://playwright.dev/docs/api/class-timeouterror). Passing zero timeout disables this.
    * @param options
    */
   uncheck(options?: {
@@ -12946,10 +14568,12 @@ export interface Locator {
   }): Promise<void>;
 
   /**
-   * Returns when element specified by locator satisfies the `state` option.
+   * Returns when element specified by locator satisfies the
+   * [`state`](https://playwright.dev/docs/api/class-locator#locator-wait-for-option-state) option.
    *
    * If target element already satisfies the condition, the method returns immediately. Otherwise, waits for up to
-   * `timeout` milliseconds until the condition is met.
+   * [`timeout`](https://playwright.dev/docs/api/class-locator#locator-wait-for-option-timeout) milliseconds until the
+   * condition is met.
    *
    * **Usage**
    *
@@ -13008,6 +14632,11 @@ export interface BrowserType<Unused = {}> {
    *
    * **NOTE** Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
    *
+   * **NOTE** This connection is significantly lower fidelity than the Playwright protocol connection via
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   * If you are experiencing issues or attempting to use advanced functionality, you probably want to use
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   *
    * **Usage**
    *
    * ```js
@@ -13033,6 +14662,11 @@ export interface BrowserType<Unused = {}> {
    *
    * **NOTE** Connecting over the Chrome DevTools Protocol is only supported for Chromium-based browsers.
    *
+   * **NOTE** This connection is significantly lower fidelity than the Playwright protocol connection via
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   * If you are experiencing issues or attempting to use advanced functionality, you probably want to use
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect).
+   *
    * **Usage**
    *
    * ```js
@@ -13047,10 +14681,12 @@ export interface BrowserType<Unused = {}> {
    */
   connectOverCDP(options: ConnectOverCDPOptions & { wsEndpoint?: string }): Promise<Browser>;
   /**
-   * This method attaches Playwright to an existing browser instance. When connecting to another browser launched via
-   * `BrowserType.launchServer` in Node.js, the major and minor version needs to match the client version (1.2.3 → is
-   * compatible with 1.2.x).
-   * @param wsEndpoint A browser websocket endpoint to connect to.
+   * This method attaches Playwright to an existing browser instance created via `BrowserType.launchServer` in Node.js.
+   *
+   * **NOTE** The major and minor version of the Playwright instance that connects needs to match the version of
+   * Playwright that launches the browser (1.2.3 → is compatible with 1.2.x).
+   *
+   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via `BrowserServer.wsEndpoint`.
    * @param options
    */
   connect(wsEndpoint: string, options?: ConnectOptions): Promise<Browser>;
@@ -13061,10 +14697,12 @@ export interface BrowserType<Unused = {}> {
    * @deprecated
    */
   /**
-   * This method attaches Playwright to an existing browser instance. When connecting to another browser launched via
-   * `BrowserType.launchServer` in Node.js, the major and minor version needs to match the client version (1.2.3 → is
-   * compatible with 1.2.x).
-   * @param wsEndpoint A browser websocket endpoint to connect to.
+   * This method attaches Playwright to an existing browser instance created via `BrowserType.launchServer` in Node.js.
+   *
+   * **NOTE** The major and minor version of the Playwright instance that connects needs to match the version of
+   * Playwright that launches the browser (1.2.3 → is compatible with 1.2.x).
+   *
+   * @param wsEndpoint A Playwright browser websocket endpoint to connect to. You obtain this endpoint via `BrowserServer.wsEndpoint`.
    * @param options
    */
   connect(options: ConnectOptions & { wsEndpoint?: string }): Promise<Browser>;
@@ -13078,7 +14716,9 @@ export interface BrowserType<Unused = {}> {
    *
    * **Usage**
    *
-   * You can use `ignoreDefaultArgs` to filter out `--mute-audio` from default arguments:
+   * You can use
+   * [`ignoreDefaultArgs`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-ignore-default-args)
+   * to filter out `--mute-audio` from default arguments:
    *
    * ```js
    * const browser = await chromium.launch({  // Or 'firefox' or 'webkit'.
@@ -13088,7 +14728,9 @@ export interface BrowserType<Unused = {}> {
    *
    * > **Chromium-only** Playwright can also be used to control the Google Chrome or Microsoft Edge browsers, but it
    * works best with the version of Chromium it is bundled with. There is no guarantee it will work with any other
-   * version. Use `executablePath` option with extreme caution.
+   * version. Use
+   * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-executable-path)
+   * option with extreme caution.
    * >
    * > If Google Chrome (rather than Chromium) is preferred, a
    * [Chrome Canary](https://www.google.com/chrome/browser/canary.html) or
@@ -13107,13 +14749,25 @@ export interface BrowserType<Unused = {}> {
   /**
    * Returns the persistent browser context instance.
    *
-   * Launches browser that uses persistent storage located at `userDataDir` and returns the only context. Closing this
-   * context will automatically close the browser.
-   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. More details for
+   * Launches browser that uses persistent storage located at
+   * [`userDataDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-user-data-dir)
+   * and returns the only context. Closing this context will automatically close the browser.
+   * @param userDataDir Path to a User Data Directory, which stores browser session data like cookies and local storage. Pass an empty
+   * string to create a temporary directory.
+   *
+   * More details for
    * [Chromium](https://chromium.googlesource.com/chromium/src/+/master/docs/user_data_dir.md#introduction) and
-   * [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Command_Line_Options#User_Profile). Note that Chromium's
-   * user data directory is the **parent** directory of the "Profile Path" seen at `chrome://version`. Pass an empty
-   * string to use a temporary directory instead.
+   * [Firefox](https://wiki.mozilla.org/Firefox/CommandLineOptions#User_profile). Chromium's user data directory is the
+   * **parent** directory of the "Profile Path" seen at `chrome://version`.
+   *
+   * Note that browsers do not allow launching multiple instances with the same User Data Directory.
+   *
+   * **NOTE** Chromium/Chrome: Due to recent Chrome policy changes, automating the default Chrome user profile is not
+   * supported. Pointing `userDataDir` to Chrome's main "User Data" directory (the profile used for your regular
+   * browsing) may result in pages not loading or the browser exiting. Create and use a separate directory (for example,
+   * an empty folder) as your automation profile instead. See https://developer.chrome.com/blog/remote-debugging-port
+   * for details.
+   *
    * @param options
    */
   launchPersistentContext(userDataDir: string, options?: {
@@ -13138,504 +14792,121 @@ export interface BrowserType<Unused = {}> {
      * or
      * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
      * it takes the base URL in consideration by using the
-     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
-     * Unset by default. Examples:
-     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
-     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
-     *   `http://localhost:3000/foo/bar.html`
-     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
-     *   `http://localhost:3000/bar.html`
-     */
-    baseURL?: string;
-
-    /**
-     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
-     */
-    bypassCSP?: boolean;
-
-    /**
-     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary",
-     * "msedge", "msedge-beta", "msedge-dev", "msedge-canary". Read more about using
-     * [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
-     */
-    channel?: string;
-
-    /**
-     * Enable Chromium sandboxing. Defaults to `false`.
-     */
-    chromiumSandbox?: boolean;
-
-    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * **Details**
-     *
-     * An array of client certificates to be used. Each certificate object must have both `certPath` and `keyPath` or a
-     * single `pfxPath` to load the client certificate. Optionally, `passphrase` property should be provided if the
-     * certficiate is encrypted. The `origin` property should be provided with an exact match to the request origin that
-     * the certificate is valid for.
-     *
-     * **NOTE** Using Client Certificates in combination with Proxy Servers is not supported.
-     *
-     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
-     * work by replacing `localhost` with `local.playwright`.
-     */
-    clientCertificates?: Array<{
-      /**
-       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
-       */
-      origin: string;
-
-      /**
-       * Path to the file with the certificate in PEM format.
-       */
-      certPath?: string;
-
-      /**
-       * Path to the file with the private key in PEM format.
-       */
-      keyPath?: string;
-
-      /**
-       * Path to the PFX or PKCS12 encoded private key and certificate chain.
-       */
-      pfxPath?: string;
-
-      /**
-       * Passphrase for the private key (PEM or PFX).
-       */
-      passphrase?: string;
-    }>;
-
-    /**
-     * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
-     */
-    colorScheme?: null|"light"|"dark"|"no-preference";
-
-    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
-     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
-     */
-    deviceScaleFactor?: number;
-
-    /**
-     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
-     * `headless` option will be set `false`.
-     * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
-     */
-    devtools?: boolean;
-
-    /**
-     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
-     * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
-     * created in is closed.
-     */
-    downloadsPath?: string;
-
-    /**
-     * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
-     */
-    env?: { [key: string]: string|number|boolean; };
-
-    /**
-     * Path to a browser executable to run instead of the bundled one. If `executablePath` is a relative path, then it is
-     * resolved relative to the current working directory. Note that Playwright only works with the bundled Chromium,
-     * Firefox or WebKit, use at your own risk.
-     */
-    executablePath?: string;
-
-    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
-     */
-    extraHTTPHeaders?: { [key: string]: string; };
-
-    /**
-     * Firefox user preferences. Learn more about the Firefox user preferences at
-     * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
-     */
-    firefoxUserPrefs?: { [key: string]: string|number|boolean; };
-
-    /**
-     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
-     */
-    forcedColors?: null|"active"|"none";
-
-    geolocation?: {
-      /**
-       * Latitude between -90 and 90.
-       */
-      latitude: number;
-
-      /**
-       * Longitude between -180 and 180.
-       */
-      longitude: number;
-
-      /**
-       * Non-negative accuracy value. Defaults to `0`.
-       */
-      accuracy?: number;
-    };
-
-    /**
-     * Close the browser process on SIGHUP. Defaults to `true`.
-     */
-    handleSIGHUP?: boolean;
-
-    /**
-     * Close the browser process on Ctrl-C. Defaults to `true`.
-     */
-    handleSIGINT?: boolean;
-
-    /**
-     * Close the browser process on SIGTERM. Defaults to `true`.
-     */
-    handleSIGTERM?: boolean;
-
-    /**
-     * Specifies if viewport supports touch events. Defaults to false. Learn more about
-     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
-     */
-    hasTouch?: boolean;
-
-    /**
-     * Whether to run browser in headless mode. More details for
-     * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
-     * [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode). Defaults to `true` unless the
-     * `devtools` option is `true`.
-     */
-    headless?: boolean;
-
-    /**
-     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
-     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
-     */
-    httpCredentials?: {
-      username: string;
-
-      password: string;
-
-      /**
-       * Restrain sending http credentials on specific origin (scheme://host:port).
-       */
-      origin?: string;
-
-      /**
-       * This option only applies to the requests sent from corresponding {@link APIRequestContext} and does not affect
-       * requests sent from the browser. `'always'` - `Authorization` header with basic authentication credentials will be
-       * sent with the each API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response
-       * with `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
-       */
-      send?: "unauthorized"|"always";
-    };
-
-    /**
-     * If `true`, Playwright does not pass its own configurations args and only uses the ones from `args`. If an array is
-     * given, then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
-     */
-    ignoreDefaultArgs?: boolean|Array<string>;
-
-    /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
-     */
-    ignoreHTTPSErrors?: boolean;
-
-    /**
-     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
-     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
-     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
-     */
-    isMobile?: boolean;
-
-    /**
-     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
-     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
-     */
-    javaScriptEnabled?: boolean;
-
-    /**
-     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
-     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
-     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Unset by default. Examples:
+     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
      */
-    locale?: string;
+    baseURL?: string;
 
     /**
-     * Logger sink for Playwright logging.
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
      */
-    logger?: Logger;
+    bypassCSP?: boolean;
 
     /**
-     * Whether to emulate network being offline. Defaults to `false`. Learn more about
-     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     * Browser distribution channel.
+     *
+     * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
+     *
+     * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+     * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
      */
-    offline?: boolean;
+    channel?: string;
 
     /**
-     * A list of permissions to grant to all pages in this context. See
-     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
-     * for more details. Defaults to none.
+     * Enable Chromium sandboxing. Defaults to `false`.
      */
-    permissions?: Array<string>;
+    chromiumSandbox?: boolean;
 
     /**
-     * Network proxy settings.
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * **Details**
+     *
+     * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+     * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+     * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+     * with an exact match to the request origin that the certificate is valid for.
+     *
+     * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+     * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+     * does not match any of the domains you plan to visit.
+     *
+     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+     * work by replacing `localhost` with `local.playwright`.
+     *
      */
-    proxy?: {
-      /**
-       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
-       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
-       */
-      server: string;
-
+    clientCertificates?: Array<{
       /**
-       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
        */
-      bypass?: string;
+      origin: string;
 
       /**
-       * Optional username to use if HTTP proxy requires authentication.
+       * Path to the file with the certificate in PEM format.
        */
-      username?: string;
+      certPath?: string;
 
       /**
-       * Optional password to use if HTTP proxy requires authentication.
+       * Direct value of the certificate in PEM format.
        */
-      password?: string;
-    };
+      cert?: Buffer;
 
-    /**
-     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
-     * If not specified, the HAR is not recorded. Make sure to await
-     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-     * the HAR to be saved.
-     */
-    recordHar?: {
       /**
-       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
-       * `content` policy instead.
+       * Path to the file with the private key in PEM format.
        */
-      omitContent?: boolean;
+      keyPath?: string;
 
       /**
-       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
-       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
-       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
-       * files and to `embed` for all other file extensions.
+       * Direct value of the private key in PEM format.
        */
-      content?: "omit"|"embed"|"attach";
+      key?: Buffer;
 
       /**
-       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
-       * default.
+       * Path to the PFX or PKCS12 encoded private key and certificate chain.
        */
-      path: string;
+      pfxPath?: string;
 
       /**
-       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
-       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
        */
-      mode?: "full"|"minimal";
+      pfx?: Buffer;
 
       /**
-       * A glob or regex pattern to filter requests that are stored in the HAR. When a `baseURL` via the context options was
-       * provided and the passed URL is a path, it gets merged via the
-       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       * Passphrase for the private key (PEM or PFX).
        */
-      urlFilter?: string|RegExp;
-    };
+      passphrase?: string;
+    }>;
 
     /**
-     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
-     * Make sure to await
-     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-     * videos to be saved.
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
      */
-    recordVideo?: {
-      /**
-       * Path to the directory to put videos into.
-       */
-      dir: string;
-
-      /**
-       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
-       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
-       * each page will be scaled down if necessary to fit the specified size.
-       */
-      size?: {
-        /**
-         * Video frame width.
-         */
-        width: number;
-
-        /**
-         * Video frame height.
-         */
-        height: number;
-      };
-    };
+    colorScheme?: null|"light"|"dark"|"no-preference";
 
     /**
-     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
      * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
      * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
      */
-    reducedMotion?: null|"reduce"|"no-preference";
-
-    /**
-     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
-     * `viewport` is set.
-     */
-    screen?: {
-      /**
-       * page width in pixels.
-       */
-      width: number;
-
-      /**
-       * page height in pixels.
-       */
-      height: number;
-    };
-
-    /**
-     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
-     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
-     *   registered.
-     * - `'block'`: Playwright will block all registration of Service Workers.
-     */
-    serviceWorkers?: "allow"|"block";
-
-    /**
-     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
-     * on.
-     */
-    slowMo?: number;
-
-    /**
-     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
-     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
-     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See {@link Locator} to
-     * learn more about the strict mode.
-     */
-    strictSelectors?: boolean;
-
-    /**
-     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
-     * to disable timeout.
-     */
-    timeout?: number;
-
-    /**
-     * Changes the timezone of the context. See
-     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
-     * for a list of supported timezone IDs. Defaults to the system timezone.
-     */
-    timezoneId?: string;
-
-    /**
-     * If specified, traces are saved into this directory.
-     */
-    tracesDir?: string;
-
-    /**
-     * Specific user agent to use in this context.
-     */
-    userAgent?: string;
-
-    /**
-     * @deprecated Use `recordVideo` instead.
-     */
-    videoSize?: {
-      /**
-       * Video frame width.
-       */
-      width: number;
-
-      /**
-       * Video frame height.
-       */
-      height: number;
-    };
-
-    /**
-     * @deprecated Use `recordVideo` instead.
-     */
-    videosPath?: string;
-
-    /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
-     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
-     *
-     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
-     * by the operating system. It makes the execution of the tests non-deterministic.
-     */
-    viewport?: null|{
-      /**
-       * page width in pixels.
-       */
-      width: number;
-
-      /**
-       * page height in pixels.
-       */
-      height: number;
-    };
-  }): Promise<BrowserContext>;
-
-  /**
-   * Returns the browser app instance. You can connect to it via
-   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect),
-   * which requires the major/minor client/server version to match (1.2.3 → is compatible with 1.2.x).
-   *
-   * **Usage**
-   *
-   * Launches browser server that client can connect to. An example of launching a browser executable and connecting to
-   * it later:
-   *
-   * ```js
-   * const { chromium } = require('playwright');  // Or 'webkit' or 'firefox'.
-   *
-   * (async () => {
-   *   const browserServer = await chromium.launchServer();
-   *   const wsEndpoint = browserServer.wsEndpoint();
-   *   // Use web socket endpoint later to establish a connection.
-   *   const browser = await chromium.connect(wsEndpoint);
-   *   // Close browser instance.
-   *   await browserServer.close();
-   * })();
-   * ```
-   *
-   * @param options
-   */
-  launchServer(options?: {
-    /**
-     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
-     *
-     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
-     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
-     */
-    args?: Array<string>;
-
-    /**
-     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary",
-     * "msedge", "msedge-beta", "msedge-dev", "msedge-canary". Read more about using
-     * [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
-     */
-    channel?: string;
+    contrast?: null|"no-preference"|"more";
 
     /**
-     * Enable Chromium sandboxing. Defaults to `false`.
+     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
      */
-    chromiumSandbox?: boolean;
+    deviceScaleFactor?: number;
 
     /**
      * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
-     * `headless` option will be set `false`.
+     * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-headless)
+     * option will be set `false`.
      * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
      */
     devtools?: boolean;
@@ -13653,18 +14924,51 @@ export interface BrowserType<Unused = {}> {
     env?: { [key: string]: string|number|boolean; };
 
     /**
-     * Path to a browser executable to run instead of the bundled one. If `executablePath` is a relative path, then it is
-     * resolved relative to the current working directory. Note that Playwright only works with the bundled Chromium,
-     * Firefox or WebKit, use at your own risk.
+     * Path to a browser executable to run instead of the bundled one. If
+     * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-executable-path)
+     * is a relative path, then it is resolved relative to the current working directory. Note that Playwright only works
+     * with the bundled Chromium, Firefox or WebKit, use at your own risk.
      */
     executablePath?: string;
 
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
+
     /**
      * Firefox user preferences. Learn more about the Firefox user preferences at
      * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
+     *
+     * You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via
+     * `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
      */
     firefoxUserPrefs?: { [key: string]: string|number|boolean; };
 
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     */
+    forcedColors?: null|"active"|"none";
+
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
+
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
+
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
+
     /**
      * Close the browser process on SIGHUP. Defaults to `true`.
      */
@@ -13680,36 +14984,96 @@ export interface BrowserType<Unused = {}> {
      */
     handleSIGTERM?: boolean;
 
+    /**
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about
+     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     */
+    hasTouch?: boolean;
+
     /**
      * Whether to run browser in headless mode. More details for
      * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
-     * [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode). Defaults to `true` unless the
-     * `devtools` option is `true`.
+     * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+     * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+     * `true`.
      */
     headless?: boolean;
 
     /**
-     * Host to use for the web socket. It is optional and if it is omitted, the server will accept connections on the
-     * unspecified IPv6 address (::) when IPv6 is available, or the unspecified IPv4 address (0.0.0.0) otherwise. Consider
-     * hardening it with picking a specific interface.
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
      */
-    host?: string;
+    httpCredentials?: {
+      username: string;
+
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
 
     /**
-     * If `true`, Playwright does not pass its own configurations args and only uses the ones from `args`. If an array is
-     * given, then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
+     * If `true`, Playwright does not pass its own configurations args and only uses the ones from
+     * [`args`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-args). If
+     * an array is given, then filters out the given default arguments. Dangerous option; use with care. Defaults to
+     * `false`.
      */
     ignoreDefaultArgs?: boolean|Array<string>;
 
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     */
+    isMobile?: boolean;
+
+    /**
+     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     */
+    javaScriptEnabled?: boolean;
+
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
+
     /**
      * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
      */
     logger?: Logger;
 
     /**
-     * Port to use for the web socket. Defaults to 0 that picks any available port.
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
      */
-    port?: number;
+    offline?: boolean;
+
+    /**
+     * A list of permissions to grant to all pages in this context. See
+     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+     * for more details. Defaults to none.
+     */
+    permissions?: Array<string>;
 
     /**
      * Network proxy settings.
@@ -13738,1529 +15102,1500 @@ export interface BrowserType<Unused = {}> {
     };
 
     /**
-     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
-     * to disable timeout.
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
      */
-    timeout?: number;
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
 
-    /**
-     * If specified, traces are saved into this directory.
-     */
-    tracesDir?: string;
+      /**
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
+       */
+      content?: "omit"|"embed"|"attach";
 
-    /**
-     * Path at which to serve the Browser Server. For security, this defaults to an unguessable string.
-     *
-     * **NOTE** Any process or web page (including those running in Playwright) with knowledge of the `wsPath` can take
-     * control of the OS user. For this reason, you should use an unguessable token when using this option.
-     */
-    wsPath?: string;
-  }): Promise<BrowserServer>;
+      /**
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
+       */
+      path: string;
 
-  /**
-   * Returns browser name. For example: `'chromium'`, `'webkit'` or `'firefox'`.
-   */
-  name(): string;
-}
+      /**
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+       */
+      mode?: "full"|"minimal";
 
-/**
- * - extends: [EventEmitter]
- *
- * The `CDPSession` instances are used to talk raw Chrome Devtools Protocol:
- * - protocol methods can be called with `session.send` method.
- * - protocol events can be subscribed to with `session.on` method.
- *
- * Useful links:
- * - Documentation on DevTools Protocol can be found here:
- *   [DevTools Protocol Viewer](https://chromedevtools.github.io/devtools-protocol/).
- * - Getting Started with DevTools Protocol:
- *   https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md
- *
- * ```js
- * const client = await page.context().newCDPSession(page);
- * await client.send('Animation.enable');
- * client.on('Animation.animationCreated', () => console.log('Animation created!'));
- * const response = await client.send('Animation.getPlaybackRate');
- * console.log('playback rate is ' + response.playbackRate);
- * await client.send('Animation.setPlaybackRate', {
- *   playbackRate: response.playbackRate / 2
- * });
- * ```
- *
- */
-export interface CDPSession {
-  on: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
-  addListener: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
-  off: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
-  removeListener: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
-  once: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
-  /**
-   * @param method Protocol method name.
-   * @param params Optional method parameters.
-   */
-  send<T extends keyof Protocol.CommandParameters>(
-    method: T,
-    params?: Protocol.CommandParameters[T]
-  ): Promise<Protocol.CommandReturnValues[T]>;
-  /**
-   * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be
-   * used to send messages.
-   */
-  detach(): Promise<void>;
-}
+      /**
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+       */
+      urlFilter?: string|RegExp;
+    };
 
-type DeviceDescriptor = {
-  viewport: ViewportSize;
-  userAgent: string;
-  deviceScaleFactor: number;
-  isMobile: boolean;
-  hasTouch: boolean;
-  defaultBrowserType: 'chromium' | 'firefox' | 'webkit';
-};
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
+      /**
+       * Path to the directory to put videos into.
+       */
+      dir: string;
 
-export namespace errors {
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
 
-/**
- * - extends: [Error]
- *
- * TimeoutError is emitted whenever certain operations are terminated due to timeout, e.g.
- * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) or
- * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch).
- *
- * ```js
- * const playwright = require('playwright');
- *
- * (async () => {
- *   const browser = await playwright.chromium.launch();
- *   const context = await browser.newContext();
- *   const page = await context.newPage();
- *   try {
- *     await page.locator('text=Foo').click({
- *       timeout: 100,
- *     });
- *   } catch (error) {
- *     if (error instanceof playwright.errors.TimeoutError)
- *       console.log('Timeout!');
- *   }
- *   await browser.close();
- * })();
- * ```
- *
- */
-class TimeoutError extends Error {
-}
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
 
-}
+    /**
+     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+     * [`viewport`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-viewport)
+     * is set.
+     */
+    screen?: {
+      /**
+       * page width in pixels.
+       */
+      width: number;
 
-/**
- * The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is
- * used by assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or
- * [switches](https://en.wikipedia.org/wiki/Switch_access).
- *
- * Accessibility is a very platform-specific thing. On different platforms, there are different screen readers that
- * might have wildly different output.
- *
- * Rendering engines of Chromium, Firefox and WebKit have a concept of "accessibility tree", which is then translated
- * into different platform-specific APIs. Accessibility namespace gives access to this Accessibility Tree.
- *
- * Most of the accessibility tree gets filtered out when converting from internal browser AX Tree to Platform-specific
- * AX-Tree or by assistive technologies themselves. By default, Playwright tries to approximate this filtering,
- * exposing only the "interesting" nodes of the tree.
- */
-export interface Accessibility {
-  /**
-   * Captures the current state of the accessibility tree. The returned object represents the root accessible node of
-   * the page.
-   *
-   * **NOTE** The Chromium accessibility tree contains nodes that go unused on most platforms and by most screen
-   * readers. Playwright will discard them as well for an easier to process tree, unless `interestingOnly` is set to
-   * `false`.
-   *
-   * **Usage**
-   *
-   * An example of dumping the entire accessibility tree:
-   *
-   * ```js
-   * const snapshot = await page.accessibility.snapshot();
-   * console.log(snapshot);
-   * ```
-   *
-   * An example of logging the focused node's name:
-   *
-   * ```js
-   * const snapshot = await page.accessibility.snapshot();
-   * const node = findFocusedNode(snapshot);
-   * console.log(node && node.name);
-   *
-   * function findFocusedNode(node) {
-   *   if (node.focused)
-   *     return node;
-   *   for (const child of node.children || []) {
-   *     const foundNode = findFocusedNode(child);
-   *     if (foundNode)
-   *       return foundNode;
-   *   }
-   *   return null;
-   * }
-   * ```
-   *
-   * @deprecated This method is deprecated. Please use other libraries such as [Axe](https://www.deque.com/axe/) if you need to test
-   * page accessibility. See our Node.js [guide](https://playwright.dev/docs/accessibility-testing) for integration with
-   * Axe.
-   * @param options
-   */
-  snapshot(options?: AccessibilitySnapshotOptions): Promise<null|AccessibilityNode>;
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
 
-}
+    /**
+     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+     *   registered.
+     * - `'block'`: Playwright will block all registration of Service Workers.
+     */
+    serviceWorkers?: "allow"|"block";
 
-type AccessibilityNode = {
-  role: string;
-  name: string;
-  value?: string|number;
-  description?: string;
-  keyshortcuts?: string;
-  roledescription?: string;
-  valuetext?: string;
-  disabled?: boolean;
-  expanded?: boolean;
-  focused?: boolean;
-  modal?: boolean;
-  multiline?: boolean;
-  multiselectable?: boolean;
-  readonly?: boolean;
-  required?: boolean;
-  selected?: boolean;
-  checked?: boolean|"mixed";
-  pressed?: boolean|"mixed";
-  level?: number;
-  valuemin?: number;
-  valuemax?: number;
-  autocomplete?: string;
-  haspopup?: string;
-  invalid?: string;
-  orientation?: string;
-  children?: AccessibilityNode[];
-}
+    /**
+     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+     * on.
+     */
+    slowMo?: number;
 
-export const devices: Devices;
+    /**
+     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+     * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
+     */
+    strictSelectors?: boolean;
 
-//@ts-ignore this will be any if electron is not installed
-type ElectronType = typeof import('electron');
+    /**
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
+     * to disable timeout.
+     */
+    timeout?: number;
 
-/**
- * Electron application representation. You can use
- * [electron.launch([options])](https://playwright.dev/docs/api/class-electron#electron-launch) to obtain the
- * application instance. This instance you can control main electron process as well as work with Electron windows:
- *
- * ```js
- * const { _electron: electron } = require('playwright');
- *
- * (async () => {
- *   // Launch Electron app.
- *   const electronApp = await electron.launch({ args: ['main.js'] });
- *
- *   // Evaluation expression in the Electron context.
- *   const appPath = await electronApp.evaluate(async ({ app }) => {
- *     // This runs in the main Electron process, parameter here is always
- *     // the result of the require('electron') in the main app script.
- *     return app.getAppPath();
- *   });
- *   console.log(appPath);
- *
- *   // Get the first window that the app opens, wait if necessary.
- *   const window = await electronApp.firstWindow();
- *   // Print the title.
- *   console.log(await window.title());
- *   // Capture a screenshot.
- *   await window.screenshot({ path: 'intro.png' });
- *   // Direct Electron console to Node terminal.
- *   window.on('console', console.log);
- *   // Click button.
- *   await window.click('text=Click me');
- *   // Exit app.
- *   await electronApp.close();
- * })();
- * ```
- *
- */
-export interface ElectronApplication {
-  /**
-   * Returns the return value of `pageFunction`.
-   *
-   * If the function passed to the
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * returns a [Promise], then
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * would wait for the promise to resolve and return its value.
-   *
-   * If the function passed to the
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * returns a non-[Serializable] value, then
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * returns `undefined`. Playwright also supports transferring some additional values that are not serializable by
-   * `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`.
-   * @param pageFunction Function to be evaluated in the main Electron process.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluate<R, Arg>(pageFunction: PageFunctionOn<ElectronType, Arg, R>, arg: Arg): Promise<R>;
-  /**
-   * Returns the return value of `pageFunction`.
-   *
-   * If the function passed to the
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * returns a [Promise], then
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * would wait for the promise to resolve and return its value.
-   *
-   * If the function passed to the
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * returns a non-[Serializable] value, then
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * returns `undefined`. Playwright also supports transferring some additional values that are not serializable by
-   * `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`.
-   * @param pageFunction Function to be evaluated in the main Electron process.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluate<R>(pageFunction: PageFunctionOn<ElectronType, void, R>, arg?: any): Promise<R>;
+    /**
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
+     */
+    timezoneId?: string;
 
-  /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
-   *
-   * The only difference between
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * and
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * is that
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * returns {@link JSHandle}.
-   *
-   * If the function passed to the
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * returns a [Promise], then
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * would wait for the promise to resolve and return its value.
-   * @param pageFunction Function to be evaluated in the main Electron process.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluateHandle<R, Arg>(pageFunction: PageFunctionOn<ElectronType, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
-  /**
-   * Returns the return value of `pageFunction` as a {@link JSHandle}.
-   *
-   * The only difference between
-   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
-   * and
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * is that
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * returns {@link JSHandle}.
-   *
-   * If the function passed to the
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * returns a [Promise], then
-   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
-   * would wait for the promise to resolve and return its value.
-   * @param pageFunction Function to be evaluated in the main Electron process.
-   * @param arg Optional argument to pass to `pageFunction`.
-   */
-  evaluateHandle<R>(pageFunction: PageFunctionOn<ElectronType, void, R>, arg?: any): Promise<SmartHandle<R>>;
-  /**
-   * This event is issued when the application process has been terminated.
-   */
-  on(event: 'close', listener: () => any): this;
+    /**
+     * If specified, traces are saved into this directory.
+     */
+    tracesDir?: string;
+
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)
+     * instead.
+     */
+    videoSize?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-persistent-context-option-record-video)
+     * instead.
+     */
+    videosPath?: string;
+
+    /**
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     *
+     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+     * by the operating system. It makes the execution of the tests non-deterministic.
+     *
+     */
+    viewport?: null|{
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+  }): Promise<BrowserContext>;
 
   /**
-   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
-   * `console.dir`.
-   *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
+   * Returns the browser app instance. You can connect to it via
+   * [browserType.connect(wsEndpoint[, options])](https://playwright.dev/docs/api/class-browsertype#browser-type-connect),
+   * which requires the major/minor client/server version to match (1.2.3 → is compatible with 1.2.x).
    *
    * **Usage**
    *
+   * Launches browser server that client can connect to. An example of launching a browser executable and connecting to
+   * it later:
+   *
    * ```js
-   * electronApp.on('console', async msg => {
-   *   const values = [];
-   *   for (const arg of msg.args())
-   *     values.push(await arg.jsonValue());
-   *   console.log(...values);
-   * });
-   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * const { chromium } = require('playwright');  // Or 'webkit' or 'firefox'.
+   *
+   * (async () => {
+   *   const browserServer = await chromium.launchServer();
+   *   const wsEndpoint = browserServer.wsEndpoint();
+   *   // Use web socket endpoint later to establish a connection.
+   *   const browser = await chromium.connect(wsEndpoint);
+   *   // Close browser instance.
+   *   await browserServer.close();
+   * })();
    * ```
    *
+   * @param options
    */
-  on(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+  launchServer(options?: {
+    /**
+     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+     *
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
+     */
+    args?: Array<string>;
 
-  /**
-   * This event is issued for every window that is created **and loaded** in Electron. It contains a {@link Page} that
-   * can be used for Playwright automation.
-   */
-  on(event: 'window', listener: (page: Page) => any): this;
+    /**
+     * Browser distribution channel.
+     *
+     * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
+     *
+     * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+     * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+     */
+    channel?: string;
 
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'close', listener: () => any): this;
+    /**
+     * Enable Chromium sandboxing. Defaults to `false`.
+     */
+    chromiumSandbox?: boolean;
 
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+    /**
+     * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
+     * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-server-option-headless) option
+     * will be set `false`.
+     * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
+     */
+    devtools?: boolean;
 
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'window', listener: (page: Page) => any): this;
+    /**
+     * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
+     * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
+     * created in is closed.
+     */
+    downloadsPath?: string;
 
-  /**
-   * This event is issued when the application process has been terminated.
-   */
-  addListener(event: 'close', listener: () => any): this;
+    /**
+     * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
+     */
+    env?: { [key: string]: string|number|boolean; };
 
-  /**
-   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
-   * `console.dir`.
-   *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
-   *
-   * **Usage**
-   *
-   * ```js
-   * electronApp.on('console', async msg => {
-   *   const values = [];
-   *   for (const arg of msg.args())
-   *     values.push(await arg.jsonValue());
-   *   console.log(...values);
-   * });
-   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
-   * ```
-   *
-   */
-  addListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+    /**
+     * Path to a browser executable to run instead of the bundled one. If
+     * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-server-option-executable-path)
+     * is a relative path, then it is resolved relative to the current working directory. Note that Playwright only works
+     * with the bundled Chromium, Firefox or WebKit, use at your own risk.
+     */
+    executablePath?: string;
 
-  /**
-   * This event is issued for every window that is created **and loaded** in Electron. It contains a {@link Page} that
-   * can be used for Playwright automation.
-   */
-  addListener(event: 'window', listener: (page: Page) => any): this;
+    /**
+     * Firefox user preferences. Learn more about the Firefox user preferences at
+     * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
+     *
+     * You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via
+     * `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
+     */
+    firefoxUserPrefs?: { [key: string]: string|number|boolean; };
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'close', listener: () => any): this;
+    /**
+     * Close the browser process on SIGHUP. Defaults to `true`.
+     */
+    handleSIGHUP?: boolean;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+    /**
+     * Close the browser process on Ctrl-C. Defaults to `true`.
+     */
+    handleSIGINT?: boolean;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'window', listener: (page: Page) => any): this;
+    /**
+     * Close the browser process on SIGTERM. Defaults to `true`.
+     */
+    handleSIGTERM?: boolean;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'close', listener: () => any): this;
+    /**
+     * Whether to run browser in headless mode. More details for
+     * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
+     * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+     * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+     * `true`.
+     */
+    headless?: boolean;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+    /**
+     * Host to use for the web socket. It is optional and if it is omitted, the server will accept connections on the
+     * unspecified IPv6 address (::) when IPv6 is available, or the unspecified IPv4 address (0.0.0.0) otherwise. Consider
+     * hardening it with picking a specific interface.
+     */
+    host?: string;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'window', listener: (page: Page) => any): this;
+    /**
+     * If `true`, Playwright does not pass its own configurations args and only uses the ones from
+     * [`args`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-server-option-args). If an array is
+     * given, then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
+     */
+    ignoreDefaultArgs?: boolean|Array<string>;
 
-  /**
-   * This event is issued when the application process has been terminated.
-   */
-  prependListener(event: 'close', listener: () => any): this;
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
 
-  /**
-   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
-   * `console.dir`.
-   *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
-   *
-   * **Usage**
-   *
-   * ```js
-   * electronApp.on('console', async msg => {
-   *   const values = [];
-   *   for (const arg of msg.args())
-   *     values.push(await arg.jsonValue());
-   *   console.log(...values);
-   * });
-   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
-   * ```
-   *
-   */
-  prependListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
+    /**
+     * Port to use for the web socket. Defaults to 0 that picks any available port.
+     */
+    port?: number;
 
-  /**
-   * This event is issued for every window that is created **and loaded** in Electron. It contains a {@link Page} that
-   * can be used for Playwright automation.
-   */
-  prependListener(event: 'window', listener: (page: Page) => any): this;
+    /**
+     * Network proxy settings.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
 
-  /**
-   * Returns the BrowserWindow object that corresponds to the given Playwright page.
-   * @param page Page to retrieve the window for.
-   */
-  browserWindow(page: Page): Promise<JSHandle>;
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
 
-  /**
-   * Closes Electron application.
-   */
-  close(): Promise<void>;
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
 
-  /**
-   * This method returns browser context that can be used for setting up context-wide routing, etc.
-   */
-  context(): BrowserContext;
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
 
-  /**
-   * Convenience method that waits for the first application window to be opened.
-   *
-   * **Usage**
-   *
-   * ```js
-   * const electronApp = await electron.launch({
-   *   args: ['main.js']
-   * });
-   * const window = await electronApp.firstWindow();
-   * // ...
-   * ```
-   *
-   * @param options
-   */
-  firstWindow(options?: {
     /**
-     * Maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The
-     * default value can be changed by using the
-     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout).
+     * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
+     * to disable timeout.
      */
     timeout?: number;
-  }): Promise<Page>;
 
-  /**
-   * Returns the main process for this Electron Application.
-   */
-  process(): ChildProcess;
+    /**
+     * If specified, traces are saved into this directory.
+     */
+    tracesDir?: string;
 
-  /**
-   * This event is issued when the application process has been terminated.
-   */
-  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: () => boolean | Promise<boolean>, timeout?: number } | (() => boolean | Promise<boolean>)): Promise<void>;
+    /**
+     * Path at which to serve the Browser Server. For security, this defaults to an unguessable string.
+     *
+     * **NOTE** Any process or web page (including those running in Playwright) with knowledge of the `wsPath` can take
+     * control of the OS user. For this reason, you should use an unguessable token when using this option.
+     *
+     */
+    wsPath?: string;
+  }): Promise<BrowserServer>;
 
   /**
-   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
-   * `console.dir`.
-   *
-   * The arguments passed into `console.log` are available on the {@link ConsoleMessage} event handler argument.
-   *
-   * **Usage**
-   *
-   * ```js
-   * electronApp.on('console', async msg => {
-   *   const values = [];
-   *   for (const arg of msg.args())
-   *     values.push(await arg.jsonValue());
-   *   console.log(...values);
-   * });
-   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
-   * ```
-   *
+   * Returns browser name. For example: `'chromium'`, `'webkit'` or `'firefox'`.
    */
-  waitForEvent(event: 'console', optionsOrPredicate?: { predicate?: (consoleMessage: ConsoleMessage) => boolean | Promise<boolean>, timeout?: number } | ((consoleMessage: ConsoleMessage) => boolean | Promise<boolean>)): Promise<ConsoleMessage>;
+  name(): string;
+}
 
+/**
+ * The `CDPSession` instances are used to talk raw Chrome Devtools Protocol:
+ * - protocol methods can be called with `session.send` method.
+ * - protocol events can be subscribed to with `session.on` method.
+ *
+ * Useful links:
+ * - Documentation on DevTools Protocol can be found here:
+ *   [DevTools Protocol Viewer](https://chromedevtools.github.io/devtools-protocol/).
+ * - Getting Started with DevTools Protocol:
+ *   https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md
+ *
+ * ```js
+ * const client = await page.context().newCDPSession(page);
+ * await client.send('Animation.enable');
+ * client.on('Animation.animationCreated', () => console.log('Animation created!'));
+ * const response = await client.send('Animation.getPlaybackRate');
+ * console.log('playback rate is ' + response.playbackRate);
+ * await client.send('Animation.setPlaybackRate', {
+ *   playbackRate: response.playbackRate / 2
+ * });
+ * ```
+ *
+ */
+export interface CDPSession {
+  on: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  addListener: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  off: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  removeListener: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
+  once: <T extends keyof Protocol.Events | symbol>(event: T, listener: (payload: T extends symbol ? any : Protocol.Events[T extends keyof Protocol.Events ? T : never]) => void) => this;
   /**
-   * This event is issued for every window that is created **and loaded** in Electron. It contains a {@link Page} that
-   * can be used for Playwright automation.
+   * @param method Protocol method name.
+   * @param params Optional method parameters.
    */
-  waitForEvent(event: 'window', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
-
-
+  send<T extends keyof Protocol.CommandParameters>(
+    method: T,
+    params?: Protocol.CommandParameters[T]
+  ): Promise<Protocol.CommandReturnValues[T]>;
   /**
-   * Convenience method that returns all the opened windows.
+   * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be
+   * used to send messages.
    */
-  windows(): Array<Page>;
-
-  [Symbol.asyncDispose](): Promise<void>;
+  detach(): Promise<void>;
 }
 
-export type AndroidElementInfo = {
-  clazz: string;
-  desc: string;
-  res: string;
-  pkg: string;
-  text: string;
-  bounds: { x: number, y: number, width: number, height: number };
-  checkable: boolean;
-  checked: boolean;
-  clickable: boolean;
-  enabled: boolean;
-  focusable: boolean;
-  focused: boolean;
-  longClickable: boolean;
-  scrollable: boolean;
-  selected: boolean;
-};
-
-export type AndroidSelector = {
-  checkable?: boolean,
-  checked?: boolean,
-  clazz?: string | RegExp,
-  clickable?: boolean,
-  depth?: number,
-  desc?: string | RegExp,
-  enabled?: boolean,
-  focusable?: boolean,
-  focused?: boolean,
-  hasChild?: { selector: AndroidSelector },
-  hasDescendant?: { selector: AndroidSelector, maxDepth?: number },
-  longClickable?: boolean,
-  pkg?: string | RegExp,
-  res?: string | RegExp,
-  scrollable?: boolean,
-  selected?: boolean,
-  text?: string | RegExp,
-};
-
-export type AndroidKey =
-  'Unknown' |
-  'SoftLeft' | 'SoftRight' |
-  'Home' |
-  'Back' |
-  'Call' | 'EndCall' |
-  '0' |  '1' |  '2' |  '3' |  '4' |  '5' |  '6' |  '7' |  '8' |  '9' |
-  'Star' | 'Pound' | '*' | '#' |
-  'DialUp' | 'DialDown' | 'DialLeft' | 'DialRight' | 'DialCenter' |
-  'VolumeUp' | 'VolumeDown' |
-  'ChannelUp' | 'ChannelDown' |
-  'Power' |
-  'Camera' |
-  'Clear' |
-  'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' |
-  'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' |
-  'Comma' | ',' |
-  'Period' | '.' |
-  'AltLeft' | 'AltRight' |
-  'ShiftLeft' | 'ShiftRight' |
-  'Tab' | '\t' |
-  'Space' | ' ' |
-  'Sym' |
-  'Explorer' |
-  'Envelop' |
-  'Enter' | '\n' |
-  'Del' |
-  'Grave' |
-  'Minus' | '-' |
-  'Equals' | '=' |
-  'LeftBracket' | '(' |
-  'RightBracket' | ')' |
-  'Backslash' | '\\' |
-  'Semicolon' | ';' |
-  'Apostrophe' | '`' |
-  'Slash' | '/' |
-  'At' | '@' |
-  'Num' |
-  'HeadsetHook' |
-  'Focus' |
-  'Plus' | '+' |
-  'Menu' |
-  'Notification' |
-  'Search' |
-  'RecentApps' |
-  'AppSwitch' |
-  'Assist' |
-  'Cut' |
-  'Copy' |
-  'Paste';
-
-export const _electron: Electron;
-export const _android: Android;
-
-// This is required to not export everything by default. See https://github.com/Microsoft/TypeScript/issues/19545#issuecomment-340490459
-export {};
-
-
 /**
- * Playwright has **experimental** support for Android automation. This includes Chrome for Android and Android
- * WebView.
- *
- * *Requirements*
- * - Android device or AVD Emulator.
- * - [ADB daemon](https://developer.android.com/studio/command-line/adb) running and authenticated with your device.
- *   Typically running `adb devices` is all you need to do.
- * - [`Chrome 87`](https://play.google.com/store/apps/details?id=com.android.chrome) or newer installed on the
- *   device
- * - "Enable command line on non-rooted devices" enabled in `chrome://flags`.
- *
- * *Known limitations*
- * - Raw USB operation is not yet supported, so you need ADB.
- * - Device needs to be awake to produce screenshots. Enabling "Stay awake" developer mode will help.
- * - We didn't run all the tests against the device, so not everything works.
+ * Whenever a [`WebSocket`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) route is set up with
+ * [page.routeWebSocket(url, handler)](https://playwright.dev/docs/api/class-page#page-route-web-socket) or
+ * [browserContext.routeWebSocket(url, handler)](https://playwright.dev/docs/api/class-browsercontext#browser-context-route-web-socket),
+ * the `WebSocketRoute` object allows to handle the WebSocket, like an actual server would do.
  *
- * *How to run*
+ * **Mocking**
  *
- * An example of the Android automation script would be:
+ * By default, the routed WebSocket will not connect to the server. This way, you can mock entire communication over
+ * the WebSocket. Here is an example that responds to a `"request"` with a `"response"`.
  *
  * ```js
- * const { _android: android } = require('playwright');
+ * await page.routeWebSocket('wss://example.com/ws', ws => {
+ *   ws.onMessage(message => {
+ *     if (message === 'request')
+ *       ws.send('response');
+ *   });
+ * });
+ * ```
  *
- * (async () => {
- *   // Connect to the device.
- *   const [device] = await android.devices();
- *   console.log(`Model: ${device.model()}`);
- *   console.log(`Serial: ${device.serial()}`);
- *   // Take screenshot of the whole device.
- *   await device.screenshot({ path: 'device.png' });
+ * Since we do not call
+ * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server)
+ * inside the WebSocket route handler, Playwright assumes that WebSocket will be mocked, and opens the WebSocket
+ * inside the page automatically.
  *
- *   {
- *     // --------------------- WebView -----------------------
+ * Here is another example that handles JSON messages:
  *
- *     // Launch an application with WebView.
- *     await device.shell('am force-stop org.chromium.webview_shell');
- *     await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
- *     // Get the WebView.
- *     const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+ * ```js
+ * await page.routeWebSocket('wss://example.com/ws', ws => {
+ *   ws.onMessage(message => {
+ *     const json = JSON.parse(message);
+ *     if (json.request === 'question')
+ *       ws.send(JSON.stringify({ response: 'answer' }));
+ *   });
+ * });
+ * ```
+ *
+ * **Intercepting**
  *
- *     // Fill the input box.
- *     await device.fill({
- *       res: 'org.chromium.webview_shell:id/url_field',
- *     }, 'github.com/microsoft/playwright');
- *     await device.press({
- *       res: 'org.chromium.webview_shell:id/url_field',
- *     }, 'Enter');
+ * Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block
+ * them. Calling
+ * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server)
+ * returns a server-side `WebSocketRoute` instance that you can send messages to, or handle incoming messages.
  *
- *     // Work with WebView's page as usual.
- *     const page = await webview.page();
- *     await page.waitForNavigation({ url: /.*microsoft\/playwright.*\/ });
- *     console.log(await page.title());
- *   }
+ * Below is an example that modifies some messages sent by the page to the server. Messages sent from the server to
+ * the page are left intact, relying on the default forwarding.
  *
- *   {
- *     // --------------------- Browser -----------------------
+ * ```js
+ * await page.routeWebSocket('/ws', ws => {
+ *   const server = ws.connectToServer();
+ *   ws.onMessage(message => {
+ *     if (message === 'request')
+ *       server.send('request2');
+ *     else
+ *       server.send(message);
+ *   });
+ * });
+ * ```
  *
- *     // Launch Chrome browser.
- *     await device.shell('am force-stop com.android.chrome');
- *     const context = await device.launchBrowser();
+ * After connecting to the server, all **messages are forwarded** between the page and the server by default.
  *
- *     // Use BrowserContext as usual.
- *     const page = await context.newPage();
- *     await page.goto('https://webkit.org/');
- *     console.log(await page.evaluate(() => window.location.href));
- *     await page.screenshot({ path: 'page.png' });
+ * However, if you call
+ * [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+ * on the original route, messages from the page to the server **will not be forwarded** anymore, but should instead
+ * be handled by the
+ * [`handler`](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message-option-handler).
  *
- *     await context.close();
- *   }
+ * Similarly, calling
+ * [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+ * on the server-side WebSocket will **stop forwarding messages** from the server to the page, and
+ * [`handler`](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message-option-handler) should
+ * take care of them.
  *
- *   // Close the device.
- *   await device.close();
- * })();
+ * The following example blocks some messages in both directions. Since it calls
+ * [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+ * in both directions, there is no automatic forwarding at all.
+ *
+ * ```js
+ * await page.routeWebSocket('/ws', ws => {
+ *   const server = ws.connectToServer();
+ *   ws.onMessage(message => {
+ *     if (message !== 'blocked-from-the-page')
+ *       server.send(message);
+ *   });
+ *   server.onMessage(message => {
+ *     if (message !== 'blocked-from-the-server')
+ *       ws.send(message);
+ *   });
+ * });
  * ```
  *
  */
-export interface Android {
+export interface WebSocketRoute {
   /**
-   * This methods attaches Playwright to an existing Android device. Use
-   * [android.launchServer([options])](https://playwright.dev/docs/api/class-android#android-launch-server) to launch a
-   * new Android server instance.
-   * @param wsEndpoint A browser websocket endpoint to connect to.
+   * This method allows to handle messages that are sent by the WebSocket, either from the page or from the server.
+   *
+   * When called on the original WebSocket route, this method handles messages sent from the page. You can handle this
+   * messages by responding to them with
+   * [webSocketRoute.send(message)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-send),
+   * forwarding them to the server-side connection returned by
+   * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server)
+   * or do something else.
+   *
+   * Once this method is called, messages are not automatically forwarded to the server or to the page - you should do
+   * that manually by calling
+   * [webSocketRoute.send(message)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-send). See
+   * examples at the top for more details.
+   *
+   * Calling this method again will override the handler with a new one.
+   * @param handler Function that will handle messages.
+   */
+  onMessage(handler: (message: string | Buffer) => any): void;
+  /**
+   * Allows to handle [`WebSocket.close`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close).
+   *
+   * By default, closing one side of the connection, either in the page or on the server, will close the other side.
+   * However, when
+   * [webSocketRoute.onClose(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-close)
+   * handler is set up, the default forwarding of closure is disabled, and handler should take care of it.
+   * @param handler Function that will handle WebSocket closure. Received an optional
+   * [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code) and an optional
+   * [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
+   */
+  onClose(handler: (code: number | undefined, reason: string | undefined) => any): void;
+  /**
+   * Closes one side of the WebSocket connection.
    * @param options
    */
-  connect(wsEndpoint: string, options?: {
+  close(options?: {
     /**
-     * Additional HTTP headers to be sent with web socket connect request. Optional.
+     * Optional [close code](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code).
      */
-    headers?: { [key: string]: string; };
+    code?: number;
 
     /**
-     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
-     * on. Defaults to `0`.
+     * Optional [close reason](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason).
      */
-    slowMo?: number;
+    reason?: string;
+  }): Promise<void>;
 
-    /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to `30000` (30 seconds). Pass
-     * `0` to disable timeout.
-     */
-    timeout?: number;
-  }): Promise<AndroidDevice>;
+  /**
+   * By default, routed WebSocket does not connect to the server, so you can mock entire WebSocket communication. This
+   * method connects to the actual WebSocket server, and returns the server-side
+   * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute) instance, giving the ability to send and
+   * receive messages from the server.
+   *
+   * Once connected to the server:
+   * - Messages received from the server will be **automatically forwarded** to the WebSocket in the page, unless
+   *   [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+   *   is called on the server-side `WebSocketRoute`.
+   * - Messages sent by the [`WebSocket.send()`](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send) call
+   *   in the page will be **automatically forwarded** to the server, unless
+   *   [webSocketRoute.onMessage(handler)](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-on-message)
+   *   is called on the original `WebSocketRoute`.
+   *
+   * See examples at the top for more details.
+   */
+  connectToServer(): WebSocketRoute;
 
   /**
-   * Returns the list of detected Android devices.
+   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called
+   * on the result of
+   * [webSocketRoute.connectToServer()](https://playwright.dev/docs/api/class-websocketroute#web-socket-route-connect-to-server),
+   * sends the message to the server. See examples at the top for more details.
+   * @param message Message to send.
+   */
+  send(message: string|Buffer): void;
+
+  /**
+   * URL of the WebSocket created in the page.
+   */
+  url(): string;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+type DeviceDescriptor = {
+  viewport: ViewportSize;
+  userAgent: string;
+  deviceScaleFactor: number;
+  isMobile: boolean;
+  hasTouch: boolean;
+  defaultBrowserType: 'chromium' | 'firefox' | 'webkit';
+};
+
+export namespace errors {
+
+/**
+ * - extends: [Error]
+ *
+ * TimeoutError is emitted whenever certain operations are terminated due to timeout, e.g.
+ * [locator.waitFor([options])](https://playwright.dev/docs/api/class-locator#locator-wait-for) or
+ * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch).
+ *
+ * ```js
+ * const playwright = require('playwright');
+ *
+ * (async () => {
+ *   const browser = await playwright.chromium.launch();
+ *   const context = await browser.newContext();
+ *   const page = await context.newPage();
+ *   try {
+ *     await page.locator('text=Foo').click({
+ *       timeout: 100,
+ *     });
+ *   } catch (error) {
+ *     if (error instanceof playwright.errors.TimeoutError)
+ *       console.log('Timeout!');
+ *   }
+ *   await browser.close();
+ * })();
+ * ```
+ *
+ */
+class TimeoutError extends Error {
+}
+
+}
+
+/**
+ * The Accessibility class provides methods for inspecting Chromium's accessibility tree. The accessibility tree is
+ * used by assistive technology such as [screen readers](https://en.wikipedia.org/wiki/Screen_reader) or
+ * [switches](https://en.wikipedia.org/wiki/Switch_access).
+ *
+ * Accessibility is a very platform-specific thing. On different platforms, there are different screen readers that
+ * might have wildly different output.
+ *
+ * Rendering engines of Chromium, Firefox and WebKit have a concept of "accessibility tree", which is then translated
+ * into different platform-specific APIs. Accessibility namespace gives access to this Accessibility Tree.
+ *
+ * Most of the accessibility tree gets filtered out when converting from internal browser AX Tree to Platform-specific
+ * AX-Tree or by assistive technologies themselves. By default, Playwright tries to approximate this filtering,
+ * exposing only the "interesting" nodes of the tree.
+ */
+export interface Accessibility {
+  /**
+   * Captures the current state of the accessibility tree. The returned object represents the root accessible node of
+   * the page.
+   *
+   * **NOTE** The Chromium accessibility tree contains nodes that go unused on most platforms and by most screen
+   * readers. Playwright will discard them as well for an easier to process tree, unless
+   * [`interestingOnly`](https://playwright.dev/docs/api/class-accessibility#accessibility-snapshot-option-interesting-only)
+   * is set to `false`.
+   *
+   * **Usage**
+   *
+   * An example of dumping the entire accessibility tree:
+   *
+   * ```js
+   * const snapshot = await page.accessibility.snapshot();
+   * console.log(snapshot);
+   * ```
+   *
+   * An example of logging the focused node's name:
+   *
+   * ```js
+   * const snapshot = await page.accessibility.snapshot();
+   * const node = findFocusedNode(snapshot);
+   * console.log(node && node.name);
+   *
+   * function findFocusedNode(node) {
+   *   if (node.focused)
+   *     return node;
+   *   for (const child of node.children || []) {
+   *     const foundNode = findFocusedNode(child);
+   *     if (foundNode)
+   *       return foundNode;
+   *   }
+   *   return null;
+   * }
+   * ```
+   *
+   * @deprecated This method is deprecated. Please use other libraries such as [Axe](https://www.deque.com/axe/) if you need to test
+   * page accessibility. See our Node.js [guide](https://playwright.dev/docs/accessibility-testing) for integration with
+   * Axe.
    * @param options
    */
-  devices(options?: {
-    /**
-     * Optional host to establish ADB server connection. Default to `127.0.0.1`.
-     */
-    host?: string;
+  snapshot(options?: AccessibilitySnapshotOptions): Promise<null|AccessibilityNode>;
 
-    /**
-     * Prevents automatic playwright driver installation on attach. Assumes that the drivers have been installed already.
-     */
-    omitDriverInstall?: boolean;
+}
 
-    /**
-     * Optional port to establish ADB server connection. Default to `5037`.
-     */
-    port?: number;
-  }): Promise<Array<AndroidDevice>>;
+type AccessibilityNode = {
+  role: string;
+  name: string;
+  value?: string|number;
+  description?: string;
+  keyshortcuts?: string;
+  roledescription?: string;
+  valuetext?: string;
+  disabled?: boolean;
+  expanded?: boolean;
+  focused?: boolean;
+  modal?: boolean;
+  multiline?: boolean;
+  multiselectable?: boolean;
+  readonly?: boolean;
+  required?: boolean;
+  selected?: boolean;
+  checked?: boolean|"mixed";
+  pressed?: boolean|"mixed";
+  level?: number;
+  valuemin?: number;
+  valuemax?: number;
+  autocomplete?: string;
+  haspopup?: string;
+  invalid?: string;
+  orientation?: string;
+  children?: AccessibilityNode[];
+}
+
+export const devices: Devices;
 
+//@ts-ignore this will be any if electron is not installed
+type ElectronType = typeof import('electron');
+
+/**
+ * Electron application representation. You can use
+ * [electron.launch([options])](https://playwright.dev/docs/api/class-electron#electron-launch) to obtain the
+ * application instance. This instance you can control main electron process as well as work with Electron windows:
+ *
+ * ```js
+ * const { _electron: electron } = require('playwright');
+ *
+ * (async () => {
+ *   // Launch Electron app.
+ *   const electronApp = await electron.launch({ args: ['main.js'] });
+ *
+ *   // Evaluation expression in the Electron context.
+ *   const appPath = await electronApp.evaluate(async ({ app }) => {
+ *     // This runs in the main Electron process, parameter here is always
+ *     // the result of the require('electron') in the main app script.
+ *     return app.getAppPath();
+ *   });
+ *   console.log(appPath);
+ *
+ *   // Get the first window that the app opens, wait if necessary.
+ *   const window = await electronApp.firstWindow();
+ *   // Print the title.
+ *   console.log(await window.title());
+ *   // Capture a screenshot.
+ *   await window.screenshot({ path: 'intro.png' });
+ *   // Direct Electron console to Node terminal.
+ *   window.on('console', console.log);
+ *   // Click button.
+ *   await window.click('text=Click me');
+ *   // Exit app.
+ *   await electronApp.close();
+ * })();
+ * ```
+ *
+ */
+export interface ElectronApplication {
   /**
-   * Launches Playwright Android server that clients can connect to. See the following example:
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
    *
-   * **Usage**
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a [Promise], then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * would wait for the promise to resolve and return its value.
    *
-   * Server Side:
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a non-[Serializable] value, then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns `undefined`. Playwright also supports transferring some additional values that are not serializable by
+   * `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
+   */
+  evaluate<R, Arg>(pageFunction: PageFunctionOn<ElectronType, Arg, R>, arg: Arg): Promise<R>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
    *
-   * ```js
-   * const { _android } = require('playwright');
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a [Promise], then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * would wait for the promise to resolve and return its value.
    *
-   * (async () => {
-   *   const browserServer = await _android.launchServer({
-   *     // If you have multiple devices connected and want to use a specific one.
-   *     // deviceSerialNumber: '<deviceSerialNumber>',
-   *   });
-   *   const wsEndpoint = browserServer.wsEndpoint();
-   *   console.log(wsEndpoint);
-   * })();
-   * ```
+   * If the function passed to the
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns a non-[Serializable] value, then
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * returns `undefined`. Playwright also supports transferring some additional values that are not serializable by
+   * `JSON`: `-0`, `NaN`, `Infinity`, `-Infinity`.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-option-expression).
+   */
+  evaluate<R>(pageFunction: PageFunctionOn<ElectronType, void, R>, arg?: any): Promise<R>;
+
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
-   * Client Side:
+   * The only difference between
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * and
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * is that
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
-   * ```js
-   * const { _android } = require('playwright');
+   * If the function passed to the
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns a [Promise], then
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R, Arg>(pageFunction: PageFunctionOn<ElectronType, Arg, R>, arg: Arg): Promise<SmartHandle<R>>;
+  /**
+   * Returns the return value of
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression)
+   * as a [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
-   * (async () => {
-   *   const device = await _android.connect('<wsEndpoint>');
+   * The only difference between
+   * [electronApplication.evaluate(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate)
+   * and
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * is that
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns [JSHandle](https://playwright.dev/docs/api/class-jshandle).
    *
-   *   console.log(device.model());
-   *   console.log(device.serial());
-   *   await device.shell('am force-stop com.android.chrome');
-   *   const context = await device.launchBrowser();
+   * If the function passed to the
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * returns a [Promise], then
+   * [electronApplication.evaluateHandle(pageFunction[, arg])](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle)
+   * would wait for the promise to resolve and return its value.
+   * @param pageFunction Function to be evaluated in the main Electron process.
+   * @param arg Optional argument to pass to
+   * [`pageFunction`](https://playwright.dev/docs/api/class-electronapplication#electron-application-evaluate-handle-option-expression).
+   */
+  evaluateHandle<R>(pageFunction: PageFunctionOn<ElectronType, void, R>, arg?: any): Promise<SmartHandle<R>>;
+  /**
+   * This event is issued when the application process has been terminated.
+   */
+  on(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
    *
-   *   const page = await context.newPage();
-   *   await page.goto('https://webkit.org/');
-   *   console.log(await page.evaluate(() => window.location.href));
-   *   await page.screenshot({ path: 'page-chrome-1.png' });
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
    *
-   *   await context.close();
-   * })();
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
    * ```
    *
-   * @param options
    */
-  launchServer(options?: {
-    /**
-     * Optional host to establish ADB server connection. Default to `127.0.0.1`.
-     */
-    adbHost?: string;
-
-    /**
-     * Optional port to establish ADB server connection. Default to `5037`.
-     */
-    adbPort?: number;
-
-    /**
-     * Optional device serial number to launch the browser on. If not specified, it will throw if multiple devices are
-     * connected.
-     */
-    deviceSerialNumber?: string;
-
-    /**
-     * Host to use for the web socket. It is optional and if it is omitted, the server will accept connections on the
-     * unspecified IPv6 address (::) when IPv6 is available, or the unspecified IPv4 address (0.0.0.0) otherwise. Consider
-     * hardening it with picking a specific interface.
-     */
-    host?: string;
-
-    /**
-     * Prevents automatic playwright driver installation on attach. Assumes that the drivers have been installed already.
-     */
-    omitDriverInstall?: boolean;
-
-    /**
-     * Port to use for the web socket. Defaults to 0 that picks any available port.
-     */
-    port?: number;
-
-    /**
-     * Path at which to serve the Android Server. For security, this defaults to an unguessable string.
-     *
-     * **NOTE** Any process or web page (including those running in Playwright) with knowledge of the `wsPath` can take
-     * control of the OS user. For this reason, you should use an unguessable token when using this option.
-     */
-    wsPath?: string;
-  }): Promise<BrowserServer>;
+  on(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
 
   /**
-   * This setting will change the default maximum time for all the methods accepting `timeout` option.
-   * @param timeout Maximum time in milliseconds
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
    */
-  setDefaultTimeout(timeout: number): void;
-}
+  on(event: 'window', listener: (page: Page) => any): this;
 
-/**
- * {@link AndroidDevice} represents a connected device, either real hardware or emulated. Devices can be obtained
- * using [android.devices([options])](https://playwright.dev/docs/api/class-android#android-devices).
- */
-export interface AndroidDevice {
   /**
-   * Emitted when the device connection gets closed.
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
    */
-  on(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+  once(event: 'close', listener: () => any): this;
 
   /**
-   * Emitted when a new WebView instance is detected.
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
    */
-  on(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+  once(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
 
   /**
    * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
    */
-  once(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+  once(event: 'window', listener: (page: Page) => any): this;
 
   /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   * This event is issued when the application process has been terminated.
    */
-  once(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+  addListener(event: 'close', listener: () => any): this;
 
   /**
-   * Emitted when the device connection gets closed.
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
    */
-  addListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+  addListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
 
   /**
-   * Emitted when a new WebView instance is detected.
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
    */
-  addListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+  addListener(event: 'window', listener: (page: Page) => any): this;
 
   /**
    * Removes an event listener added by `on` or `addListener`.
    */
-  removeListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+  removeListener(event: 'close', listener: () => any): this;
 
   /**
    * Removes an event listener added by `on` or `addListener`.
    */
-  removeListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+  removeListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
 
   /**
    * Removes an event listener added by `on` or `addListener`.
    */
-  off(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+  removeListener(event: 'window', listener: (page: Page) => any): this;
 
   /**
    * Removes an event listener added by `on` or `addListener`.
    */
-  off(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+  off(event: 'close', listener: () => any): this;
 
   /**
-   * Emitted when the device connection gets closed.
+   * Removes an event listener added by `on` or `addListener`.
    */
-  prependListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
+  off(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
 
   /**
-   * Emitted when a new WebView instance is detected.
+   * Removes an event listener added by `on` or `addListener`.
    */
-  prependListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
+  off(event: 'window', listener: (page: Page) => any): this;
 
   /**
-   * Disconnects from the device.
+   * This event is issued when the application process has been terminated.
    */
-  close(): Promise<void>;
+  prependListener(event: 'close', listener: () => any): this;
 
   /**
-   * Drags the widget defined by `selector` towards `dest` point.
-   * @param selector Selector to drag.
-   * @param dest Point to drag to.
-   * @param options
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
    */
-  drag(selector: AndroidSelector, dest: {
-    x: number;
-
-    y: number;
-  }, options?: {
-    /**
-     * Optional speed of the drag in pixels per second.
-     */
-    speed?: number;
-
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  prependListener(event: 'console', listener: (consoleMessage: ConsoleMessage) => any): this;
 
   /**
-   * Fills the specific `selector` input box with `text`.
-   * @param selector Selector to fill.
-   * @param text Text to be filled in the input box.
-   * @param options
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
    */
-  fill(selector: AndroidSelector, text: string, options?: {
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  prependListener(event: 'window', listener: (page: Page) => any): this;
 
   /**
-   * Flings the widget defined by `selector` in  the specified `direction`.
-   * @param selector Selector to fling.
-   * @param direction Fling direction.
-   * @param options
+   * Returns the BrowserWindow object that corresponds to the given Playwright page.
+   * @param page Page to retrieve the window for.
    */
-  fling(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", options?: {
-    /**
-     * Optional speed of the fling in pixels per second.
-     */
-    speed?: number;
-
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  browserWindow(page: Page): Promise<JSHandle>;
 
   /**
-   * Returns information about a widget defined by `selector`.
-   * @param selector Selector to return information about.
+   * Closes Electron application.
    */
-  info(selector: AndroidSelector): Promise<AndroidElementInfo>;
+  close(): Promise<void>;
 
   /**
-   * Installs an apk on the device.
-   * @param file Either a path to the apk file, or apk file content.
-   * @param options
+   * This method returns browser context that can be used for setting up context-wide routing, etc.
    */
-  installApk(file: string|Buffer, options?: {
-    /**
-     * Optional arguments to pass to the `shell:cmd package install` call. Defaults to `-r -t -S`.
-     */
-    args?: Array<string>;
-  }): Promise<void>;
+  context(): BrowserContext;
 
   /**
-   * Launches Chrome browser on the device, and returns its persistent context.
+   * Convenience method that waits for the first application window to be opened.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const electronApp = await electron.launch({
+   *   args: ['main.js']
+   * });
+   * const window = await electronApp.firstWindow();
+   * // ...
+   * ```
+   *
    * @param options
    */
-  launchBrowser(options?: {
-    /**
-     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
-     */
-    acceptDownloads?: boolean;
-
-    /**
-     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
-     *
-     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
-     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
-     */
-    args?: Array<string>;
-
-    /**
-     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
-     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
-     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
-     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
-     * or
-     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
-     * it takes the base URL in consideration by using the
-     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
-     * Unset by default. Examples:
-     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
-     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
-     *   `http://localhost:3000/foo/bar.html`
-     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
-     *   `http://localhost:3000/bar.html`
-     */
-    baseURL?: string;
-
-    /**
-     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
-     */
-    bypassCSP?: boolean;
-
-    /**
-     * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
-     */
-    colorScheme?: null|"light"|"dark"|"no-preference";
-
-    /**
-     * Optional package name to launch instead of default Chrome for Android.
-     */
-    command?: string;
-
-    /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
-     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
-     */
-    deviceScaleFactor?: number;
-
-    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
-     */
-    extraHTTPHeaders?: { [key: string]: string; };
-
+  firstWindow(options?: {
     /**
-     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     * Maximum time to wait for in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout. The
+     * default value can be changed by using the
+     * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout).
      */
-    forcedColors?: null|"active"|"none";
-
-    geolocation?: {
-      /**
-       * Latitude between -90 and 90.
-       */
-      latitude: number;
-
-      /**
-       * Longitude between -180 and 180.
-       */
-      longitude: number;
-
-      /**
-       * Non-negative accuracy value. Defaults to `0`.
-       */
-      accuracy?: number;
-    };
+    timeout?: number;
+  }): Promise<Page>;
 
-    /**
-     * Specifies if viewport supports touch events. Defaults to false. Learn more about
-     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
-     */
-    hasTouch?: boolean;
+  /**
+   * Returns the main process for this Electron Application.
+   */
+  process(): ChildProcess;
 
-    /**
-     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
-     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
-     */
-    httpCredentials?: {
-      username: string;
+  /**
+   * This event is issued when the application process has been terminated.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: () => boolean | Promise<boolean>, timeout?: number } | (() => boolean | Promise<boolean>)): Promise<void>;
 
-      password: string;
+  /**
+   * Emitted when JavaScript within the Electron main process calls one of console API methods, e.g. `console.log` or
+   * `console.dir`.
+   *
+   * The arguments passed into `console.log` are available on the
+   * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) event handler argument.
+   *
+   * **Usage**
+   *
+   * ```js
+   * electronApp.on('console', async msg => {
+   *   const values = [];
+   *   for (const arg of msg.args())
+   *     values.push(await arg.jsonValue());
+   *   console.log(...values);
+   * });
+   * await electronApp.evaluate(() => console.log('hello', 5, { foo: 'bar' }));
+   * ```
+   *
+   */
+  waitForEvent(event: 'console', optionsOrPredicate?: { predicate?: (consoleMessage: ConsoleMessage) => boolean | Promise<boolean>, timeout?: number } | ((consoleMessage: ConsoleMessage) => boolean | Promise<boolean>)): Promise<ConsoleMessage>;
 
-      /**
-       * Restrain sending http credentials on specific origin (scheme://host:port).
-       */
-      origin?: string;
+  /**
+   * This event is issued for every window that is created **and loaded** in Electron. It contains a
+   * [Page](https://playwright.dev/docs/api/class-page) that can be used for Playwright automation.
+   */
+  waitForEvent(event: 'window', optionsOrPredicate?: { predicate?: (page: Page) => boolean | Promise<boolean>, timeout?: number } | ((page: Page) => boolean | Promise<boolean>)): Promise<Page>;
 
-      /**
-       * This option only applies to the requests sent from corresponding {@link APIRequestContext} and does not affect
-       * requests sent from the browser. `'always'` - `Authorization` header with basic authentication credentials will be
-       * sent with the each API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response
-       * with `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
-       */
-      send?: "unauthorized"|"always";
-    };
 
-    /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
-     */
-    ignoreHTTPSErrors?: boolean;
+  /**
+   * Convenience method that returns all the opened windows.
+   */
+  windows(): Array<Page>;
 
-    /**
-     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
-     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
-     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
-     */
-    isMobile?: boolean;
+  [Symbol.asyncDispose](): Promise<void>;
+}
 
-    /**
-     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
-     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
-     */
-    javaScriptEnabled?: boolean;
+export type AndroidElementInfo = {
+  clazz: string;
+  desc: string;
+  res: string;
+  pkg: string;
+  text: string;
+  bounds: { x: number, y: number, width: number, height: number };
+  checkable: boolean;
+  checked: boolean;
+  clickable: boolean;
+  enabled: boolean;
+  focusable: boolean;
+  focused: boolean;
+  longClickable: boolean;
+  scrollable: boolean;
+  selected: boolean;
+};
 
-    /**
-     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
-     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
-     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
-     */
-    locale?: string;
+export type AndroidSelector = {
+  checkable?: boolean,
+  checked?: boolean,
+  clazz?: string | RegExp,
+  clickable?: boolean,
+  depth?: number,
+  desc?: string | RegExp,
+  enabled?: boolean,
+  focusable?: boolean,
+  focused?: boolean,
+  hasChild?: { selector: AndroidSelector },
+  hasDescendant?: { selector: AndroidSelector, maxDepth?: number },
+  longClickable?: boolean,
+  pkg?: string | RegExp,
+  res?: string | RegExp,
+  scrollable?: boolean,
+  selected?: boolean,
+  text?: string | RegExp,
+};
 
-    /**
-     * Logger sink for Playwright logging.
-     */
-    logger?: Logger;
+export type AndroidKey =
+  'Unknown' |
+  'SoftLeft' | 'SoftRight' |
+  'Home' |
+  'Back' |
+  'Call' | 'EndCall' |
+  '0' |  '1' |  '2' |  '3' |  '4' |  '5' |  '6' |  '7' |  '8' |  '9' |
+  'Star' | 'Pound' | '*' | '#' |
+  'DialUp' | 'DialDown' | 'DialLeft' | 'DialRight' | 'DialCenter' |
+  'VolumeUp' | 'VolumeDown' |
+  'ChannelUp' | 'ChannelDown' |
+  'Power' |
+  'Camera' |
+  'Clear' |
+  'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' |
+  'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z' |
+  'Comma' | ',' |
+  'Period' | '.' |
+  'AltLeft' | 'AltRight' |
+  'ShiftLeft' | 'ShiftRight' |
+  'Tab' | '\t' |
+  'Space' | ' ' |
+  'Sym' |
+  'Explorer' |
+  'Envelop' |
+  'Enter' | '\n' |
+  'Del' |
+  'Grave' |
+  'Minus' | '-' |
+  'Equals' | '=' |
+  'LeftBracket' | '(' |
+  'RightBracket' | ')' |
+  'Backslash' | '\\' |
+  'Semicolon' | ';' |
+  'Apostrophe' | '`' |
+  'Slash' | '/' |
+  'At' | '@' |
+  'Num' |
+  'HeadsetHook' |
+  'Focus' |
+  'Plus' | '+' |
+  'Menu' |
+  'Notification' |
+  'Search' |
+  'RecentApps' |
+  'AppSwitch' |
+  'Assist' |
+  'Cut' |
+  'Copy' |
+  'Paste';
 
-    /**
-     * Whether to emulate network being offline. Defaults to `false`. Learn more about
-     * [network emulation](https://playwright.dev/docs/emulation#offline).
-     */
-    offline?: boolean;
+export const _electron: Electron;
+export const _android: Android;
+export const _bidiChromium: BrowserType;
+export const _bidiFirefox: BrowserType;
 
-    /**
-     * A list of permissions to grant to all pages in this context. See
-     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
-     * for more details. Defaults to none.
-     */
-    permissions?: Array<string>;
+// This is required to not export everything by default. See https://github.com/Microsoft/TypeScript/issues/19545#issuecomment-340490459
+export {};
 
+
+/**
+ * Playwright has **experimental** support for Android automation. This includes Chrome for Android and Android
+ * WebView.
+ *
+ * *Requirements*
+ * - Android device or AVD Emulator.
+ * - [ADB daemon](https://developer.android.com/studio/command-line/adb) running and authenticated with your device.
+ *   Typically running `adb devices` is all you need to do.
+ * - [`Chrome 87`](https://play.google.com/store/apps/details?id=com.android.chrome) or newer installed on the
+ *   device
+ * - "Enable command line on non-rooted devices" enabled in `chrome://flags`.
+ *
+ * *Known limitations*
+ * - Raw USB operation is not yet supported, so you need ADB.
+ * - Device needs to be awake to produce screenshots. Enabling "Stay awake" developer mode will help.
+ * - We didn't run all the tests against the device, so not everything works.
+ *
+ * *How to run*
+ *
+ * An example of the Android automation script would be:
+ *
+ * ```js
+ * const { _android: android } = require('playwright');
+ *
+ * (async () => {
+ *   // Connect to the device.
+ *   const [device] = await android.devices();
+ *   console.log(`Model: ${device.model()}`);
+ *   console.log(`Serial: ${device.serial()}`);
+ *   // Take screenshot of the whole device.
+ *   await device.screenshot({ path: 'device.png' });
+ *
+ *   {
+ *     // --------------------- WebView -----------------------
+ *
+ *     // Launch an application with WebView.
+ *     await device.shell('am force-stop org.chromium.webview_shell');
+ *     await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+ *     // Get the WebView.
+ *     const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+ *
+ *     // Fill the input box.
+ *     await device.fill({
+ *       res: 'org.chromium.webview_shell:id/url_field',
+ *     }, 'github.com/microsoft/playwright');
+ *     await device.press({
+ *       res: 'org.chromium.webview_shell:id/url_field',
+ *     }, 'Enter');
+ *
+ *     // Work with WebView's page as usual.
+ *     const page = await webview.page();
+ *     await page.waitForNavigation({ url: /.*microsoft\/playwright.*\/ });
+ *     console.log(await page.title());
+ *   }
+ *
+ *   {
+ *     // --------------------- Browser -----------------------
+ *
+ *     // Launch Chrome browser.
+ *     await device.shell('am force-stop com.android.chrome');
+ *     const context = await device.launchBrowser();
+ *
+ *     // Use BrowserContext as usual.
+ *     const page = await context.newPage();
+ *     await page.goto('https://webkit.org/');
+ *     console.log(await page.evaluate(() => window.location.href));
+ *     await page.screenshot({ path: 'page.png' });
+ *
+ *     await context.close();
+ *   }
+ *
+ *   // Close the device.
+ *   await device.close();
+ * })();
+ * ```
+ *
+ */
+export interface Android {
+  /**
+   * This methods attaches Playwright to an existing Android device. Use
+   * [android.launchServer([options])](https://playwright.dev/docs/api/class-android#android-launch-server) to launch a
+   * new Android server instance.
+   * @param wsEndpoint A browser websocket endpoint to connect to.
+   * @param options
+   */
+  connect(wsEndpoint: string, options?: {
     /**
-     * Network proxy settings.
+     * Additional HTTP headers to be sent with web socket connect request. Optional.
      */
-    proxy?: {
-      /**
-       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
-       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
-       */
-      server: string;
-
-      /**
-       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
-       */
-      bypass?: string;
-
-      /**
-       * Optional username to use if HTTP proxy requires authentication.
-       */
-      username?: string;
-
-      /**
-       * Optional password to use if HTTP proxy requires authentication.
-       */
-      password?: string;
-    };
+    headers?: { [key: string]: string; };
 
     /**
-     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
-     * If not specified, the HAR is not recorded. Make sure to await
-     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-     * the HAR to be saved.
+     * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+     * on. Defaults to `0`.
      */
-    recordHar?: {
-      /**
-       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
-       * `content` policy instead.
-       */
-      omitContent?: boolean;
-
-      /**
-       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
-       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
-       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
-       * files and to `embed` for all other file extensions.
-       */
-      content?: "omit"|"embed"|"attach";
-
-      /**
-       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
-       * default.
-       */
-      path: string;
-
-      /**
-       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
-       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
-       */
-      mode?: "full"|"minimal";
-
-      /**
-       * A glob or regex pattern to filter requests that are stored in the HAR. When a `baseURL` via the context options was
-       * provided and the passed URL is a path, it gets merged via the
-       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
-       */
-      urlFilter?: string|RegExp;
-    };
+    slowMo?: number;
 
     /**
-     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
-     * Make sure to await
-     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-     * videos to be saved.
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to `30000` (30 seconds). Pass
+     * `0` to disable timeout.
      */
-    recordVideo?: {
-      /**
-       * Path to the directory to put videos into.
-       */
-      dir: string;
-
-      /**
-       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
-       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
-       * each page will be scaled down if necessary to fit the specified size.
-       */
-      size?: {
-        /**
-         * Video frame width.
-         */
-        width: number;
-
-        /**
-         * Video frame height.
-         */
-        height: number;
-      };
-    };
+    timeout?: number;
+  }): Promise<AndroidDevice>;
 
+  /**
+   * Returns the list of detected Android devices.
+   * @param options
+   */
+  devices(options?: {
     /**
-     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     * Optional host to establish ADB server connection. Default to `127.0.0.1`.
      */
-    reducedMotion?: null|"reduce"|"no-preference";
+    host?: string;
 
     /**
-     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
-     * `viewport` is set.
+     * Prevents automatic playwright driver installation on attach. Assumes that the drivers have been installed already.
      */
-    screen?: {
-      /**
-       * page width in pixels.
-       */
-      width: number;
-
-      /**
-       * page height in pixels.
-       */
-      height: number;
-    };
+    omitDriverInstall?: boolean;
 
     /**
-     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
-     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
-     *   registered.
-     * - `'block'`: Playwright will block all registration of Service Workers.
+     * Optional port to establish ADB server connection. Default to `5037`.
      */
-    serviceWorkers?: "allow"|"block";
+    port?: number;
+  }): Promise<Array<AndroidDevice>>;
 
+  /**
+   * Launches Playwright Android server that clients can connect to. See the following example:
+   *
+   * **Usage**
+   *
+   * Server Side:
+   *
+   * ```js
+   * const { _android } = require('playwright');
+   *
+   * (async () => {
+   *   const browserServer = await _android.launchServer({
+   *     // If you have multiple devices connected and want to use a specific one.
+   *     // deviceSerialNumber: '<deviceSerialNumber>',
+   *   });
+   *   const wsEndpoint = browserServer.wsEndpoint();
+   *   console.log(wsEndpoint);
+   * })();
+   * ```
+   *
+   * Client Side:
+   *
+   * ```js
+   * const { _android } = require('playwright');
+   *
+   * (async () => {
+   *   const device = await _android.connect('<wsEndpoint>');
+   *
+   *   console.log(device.model());
+   *   console.log(device.serial());
+   *   await device.shell('am force-stop com.android.chrome');
+   *   const context = await device.launchBrowser();
+   *
+   *   const page = await context.newPage();
+   *   await page.goto('https://webkit.org/');
+   *   console.log(await page.evaluate(() => window.location.href));
+   *   await page.screenshot({ path: 'page-chrome-1.png' });
+   *
+   *   await context.close();
+   * })();
+   * ```
+   *
+   * @param options
+   */
+  launchServer(options?: {
     /**
-     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
-     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
-     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See {@link Locator} to
-     * learn more about the strict mode.
+     * Optional host to establish ADB server connection. Default to `127.0.0.1`.
      */
-    strictSelectors?: boolean;
+    adbHost?: string;
 
     /**
-     * Changes the timezone of the context. See
-     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
-     * for a list of supported timezone IDs. Defaults to the system timezone.
+     * Optional port to establish ADB server connection. Default to `5037`.
      */
-    timezoneId?: string;
+    adbPort?: number;
 
     /**
-     * Specific user agent to use in this context.
+     * Optional device serial number to launch the browser on. If not specified, it will throw if multiple devices are
+     * connected.
      */
-    userAgent?: string;
+    deviceSerialNumber?: string;
 
     /**
-     * @deprecated Use `recordVideo` instead.
+     * Host to use for the web socket. It is optional and if it is omitted, the server will accept connections on the
+     * unspecified IPv6 address (::) when IPv6 is available, or the unspecified IPv4 address (0.0.0.0) otherwise. Consider
+     * hardening it with picking a specific interface.
      */
-    videoSize?: {
-      /**
-       * Video frame width.
-       */
-      width: number;
+    host?: string;
 
-      /**
-       * Video frame height.
-       */
-      height: number;
-    };
+    /**
+     * Prevents automatic playwright driver installation on attach. Assumes that the drivers have been installed already.
+     */
+    omitDriverInstall?: boolean;
 
     /**
-     * @deprecated Use `recordVideo` instead.
+     * Port to use for the web socket. Defaults to 0 that picks any available port.
      */
-    videosPath?: string;
+    port?: number;
 
     /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
-     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     * Path at which to serve the Android Server. For security, this defaults to an unguessable string.
+     *
+     * **NOTE** Any process or web page (including those running in Playwright) with knowledge of the `wsPath` can take
+     * control of the OS user. For this reason, you should use an unguessable token when using this option.
      *
-     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
-     * by the operating system. It makes the execution of the tests non-deterministic.
      */
-    viewport?: null|{
-      /**
-       * page width in pixels.
-       */
-      width: number;
-
-      /**
-       * page height in pixels.
-       */
-      height: number;
-    };
-  }): Promise<BrowserContext>;
+    wsPath?: string;
+  }): Promise<BrowserServer>;
 
   /**
-   * Performs a long tap on the widget defined by `selector`.
-   * @param selector Selector to tap on.
-   * @param options
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-android#android-set-default-timeout-option-timeout) option.
+   * @param timeout Maximum time in milliseconds
    */
-  longTap(selector: AndroidSelector, options?: {
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  setDefaultTimeout(timeout: number): void;
+}
 
+/**
+ * [AndroidDevice](https://playwright.dev/docs/api/class-androiddevice) represents a connected device, either real
+ * hardware or emulated. Devices can be obtained using
+ * [android.devices([options])](https://playwright.dev/docs/api/class-android#android-devices).
+ */
+export interface AndroidDevice {
   /**
-   * Device model.
+   * Emitted when the device connection gets closed.
    */
-  model(): string;
+  on(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
 
   /**
-   * Launches a process in the shell on the device and returns a socket to communicate with the launched process.
-   * @param command
+   * Emitted when a new WebView instance is detected.
    */
-  open(command: string): Promise<AndroidSocket>;
+  on(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
 
   /**
-   * Pinches the widget defined by `selector` in the closing direction.
-   * @param selector Selector to pinch close.
-   * @param percent The size of the pinch as a percentage of the widget's size.
-   * @param options
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
    */
-  pinchClose(selector: AndroidSelector, percent: number, options?: {
-    /**
-     * Optional speed of the pinch in pixels per second.
-     */
-    speed?: number;
-
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  once(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
 
   /**
-   * Pinches the widget defined by `selector` in the open direction.
-   * @param selector Selector to pinch open.
-   * @param percent The size of the pinch as a percentage of the widget's size.
-   * @param options
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
    */
-  pinchOpen(selector: AndroidSelector, percent: number, options?: {
-    /**
-     * Optional speed of the pinch in pixels per second.
-     */
-    speed?: number;
+  once(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
 
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  /**
+   * Emitted when the device connection gets closed.
+   */
+  addListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
 
   /**
-   * Presses the specific `key` in the widget defined by `selector`.
-   * @param selector Selector to press the key in.
-   * @param key The key to press.
-   * @param options
+   * Emitted when a new WebView instance is detected.
    */
-  press(selector: AndroidSelector, key: AndroidKey, options?: {
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  addListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
 
   /**
-   * Copies a file to the device.
-   * @param file Either a path to the file, or file content.
-   * @param path Path to the file on the device.
-   * @param options
+   * Removes an event listener added by `on` or `addListener`.
    */
-  push(file: string|Buffer, path: string, options?: {
-    /**
-     * Optional file mode, defaults to `644` (`rw-r--r--`).
-     */
-    mode?: number;
-  }): Promise<void>;
+  removeListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
 
   /**
-   * Returns the buffer with the captured screenshot of the device.
-   * @param options
+   * Removes an event listener added by `on` or `addListener`.
    */
-  screenshot(options?: {
-    /**
-     * The file path to save the image to. If `path` is a relative path, then it is resolved relative to the current
-     * working directory. If no path is provided, the image won't be saved to the disk.
-     */
-    path?: string;
-  }): Promise<Buffer>;
+  removeListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
 
   /**
-   * Scrolls the widget defined by `selector` in  the specified `direction`.
-   * @param selector Selector to scroll.
-   * @param direction Scroll direction.
-   * @param percent Distance to scroll as a percentage of the widget's size.
-   * @param options
+   * Removes an event listener added by `on` or `addListener`.
    */
-  scroll(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", percent: number, options?: {
-    /**
-     * Optional speed of the scroll in pixels per second.
-     */
-    speed?: number;
+  off(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
 
-    /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
 
   /**
-   * Device serial number.
+   * Emitted when the device connection gets closed.
    */
-  serial(): string;
+  prependListener(event: 'close', listener: (androidDevice: AndroidDevice) => any): this;
 
   /**
-   * This setting will change the default maximum time for all the methods accepting `timeout` option.
-   * @param timeout Maximum time in milliseconds
+   * Emitted when a new WebView instance is detected.
    */
-  setDefaultTimeout(timeout: number): void;
+  prependListener(event: 'webview', listener: (androidWebView: AndroidWebView) => any): this;
 
   /**
-   * Executes a shell command on the device and returns its output.
-   * @param command Shell command to execute.
+   * Disconnects from the device.
    */
-  shell(command: string): Promise<Buffer>;
+  close(): Promise<void>;
 
   /**
-   * Swipes the widget defined by `selector` in  the specified `direction`.
-   * @param selector Selector to swipe.
-   * @param direction Swipe direction.
-   * @param percent Distance to swipe as a percentage of the widget's size.
+   * Drags the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-drag-option-selector) towards
+   * [`dest`](https://playwright.dev/docs/api/class-androiddevice#android-device-drag-option-dest) point.
+   * @param selector Selector to drag.
+   * @param dest Point to drag to.
    * @param options
    */
-  swipe(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", percent: number, options?: {
+  drag(selector: AndroidSelector, dest: {
+    x: number;
+
+    y: number;
+  }, options?: {
     /**
-     * Optional speed of the swipe in pixels per second.
+     * Optional speed of the drag in pixels per second.
      */
     speed?: number;
 
@@ -15274,16 +16609,14 @@ export interface AndroidDevice {
   }): Promise<void>;
 
   /**
-   * Taps on the widget defined by `selector`.
-   * @param selector Selector to tap on.
+   * Fills the specific
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-fill-option-selector) input box
+   * with [`text`](https://playwright.dev/docs/api/class-androiddevice#android-device-fill-option-text).
+   * @param selector Selector to fill.
+   * @param text Text to be filled in the input box.
    * @param options
    */
-  tap(selector: AndroidSelector, options?: {
-    /**
-     * Optional duration of the tap in milliseconds.
-     */
-    duration?: number;
-
+  fill(selector: AndroidSelector, text: string, options?: {
     /**
      * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
      * by using the
@@ -15294,17 +16627,18 @@ export interface AndroidDevice {
   }): Promise<void>;
 
   /**
-   * Waits for the specific `selector` to either appear or disappear, depending on the `state`.
-   * @param selector Selector to wait for.
+   * Flings the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-fling-option-selector) in  the
+   * specified [`direction`](https://playwright.dev/docs/api/class-androiddevice#android-device-fling-option-direction).
+   * @param selector Selector to fling.
+   * @param direction Fling direction.
    * @param options
    */
-  wait(selector: AndroidSelector, options?: {
+  fling(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", options?: {
     /**
-     * Optional state. Can be either:
-     * - default - wait for element to be present.
-     * - `'gone'` - wait for element to not be present.
+     * Optional speed of the fling in pixels per second.
      */
-    state?: "gone";
+    speed?: number;
 
     /**
      * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
@@ -15316,868 +16650,959 @@ export interface AndroidDevice {
   }): Promise<void>;
 
   /**
-   * Emitted when the device connection gets closed.
+   * Returns information about a widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-info-option-selector).
+   * @param selector Selector to return information about.
    */
-  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: (androidDevice: AndroidDevice) => boolean | Promise<boolean>, timeout?: number } | ((androidDevice: AndroidDevice) => boolean | Promise<boolean>)): Promise<AndroidDevice>;
+  info(selector: AndroidSelector): Promise<AndroidElementInfo>;
 
   /**
-   * Emitted when a new WebView instance is detected.
+   * Installs an apk on the device.
+   * @param file Either a path to the apk file, or apk file content.
+   * @param options
    */
-  waitForEvent(event: 'webview', optionsOrPredicate?: { predicate?: (androidWebView: AndroidWebView) => boolean | Promise<boolean>, timeout?: number } | ((androidWebView: AndroidWebView) => boolean | Promise<boolean>)): Promise<AndroidWebView>;
-
+  installApk(file: string|Buffer, options?: {
+    /**
+     * Optional arguments to pass to the `shell:cmd package install` call. Defaults to `-r -t -S`.
+     */
+    args?: Array<string>;
+  }): Promise<void>;
 
   /**
-   * This method waits until {@link AndroidWebView} matching the `selector` is opened and returns it. If there is
-   * already an open {@link AndroidWebView} matching the `selector`, returns immediately.
-   * @param selector
+   * Launches Chrome browser on the device, and returns its persistent context.
    * @param options
    */
-  webView(selector: {
+  launchBrowser(options?: {
     /**
-     * Optional Package identifier.
+     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
      */
-    pkg?: string;
+    acceptDownloads?: boolean;
 
     /**
-     * Optional webview socket name.
+     * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+     *
+     * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+     * [here](https://peter.sh/experiments/chromium-command-line-switches/).
      */
-    socketName?: string;
-  }, options?: {
+    args?: Array<string>;
+
     /**
-     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
-     * by using the
-     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
-     * method.
+     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+     * or
+     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+     * it takes the base URL in consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Unset by default. Examples:
+     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
      */
-    timeout?: number;
-  }): Promise<AndroidWebView>;
-
-  /**
-   * Currently open WebViews.
-   */
-  webViews(): Array<AndroidWebView>;
-
-  input: AndroidInput;
-
-  [Symbol.asyncDispose](): Promise<void>;
-}
-
-export interface AndroidInput {
-  /**
-   * Performs a drag between `from` and `to` points.
-   * @param from The start point of the drag.
-   * @param to The end point of the drag.
-   * @param steps The number of steps in the drag. Each step takes 5 milliseconds to complete.
-   */
-  drag(from: {
-    x: number;
-
-    y: number;
-  }, to: {
-    x: number;
-
-    y: number;
-  }, steps: number): Promise<void>;
-
-  /**
-   * Presses the `key`.
-   * @param key Key to press.
-   */
-  press(key: AndroidKey): Promise<void>;
-
-  /**
-   * Swipes following the path defined by `segments`.
-   * @param from The point to start swiping from.
-   * @param segments Points following the `from` point in the swipe gesture.
-   * @param steps The number of steps for each segment. Each step takes 5 milliseconds to complete, so 100 steps means half a second
-   * per each segment.
-   */
-  swipe(from: {
-    x: number;
-
-    y: number;
-  }, segments: ReadonlyArray<{
-    x: number;
-
-    y: number;
-  }>, steps: number): Promise<void>;
-
-  /**
-   * Taps at the specified `point`.
-   * @param point The point to tap at.
-   */
-  tap(point: {
-    x: number;
+    baseURL?: string;
 
-    y: number;
-  }): Promise<void>;
+    /**
+     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     */
+    bypassCSP?: boolean;
 
-  /**
-   * Types `text` into currently focused widget.
-   * @param text Text to type.
-   */
-  type(text: string): Promise<void>;
-}
+    /**
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     */
+    colorScheme?: null|"light"|"dark"|"no-preference";
 
-/**
- * {@link AndroidSocket} is a way to communicate with a process launched on the {@link AndroidDevice}. Use
- * [androidDevice.open(command)](https://playwright.dev/docs/api/class-androiddevice#android-device-open) to open a
- * socket.
- */
-export interface AndroidSocket {
-  /**
-   * Emitted when the socket is closed.
-   */
-  on(event: 'close', listener: () => any): this;
+    /**
+     * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    contrast?: null|"no-preference"|"more";
 
-  /**
-   * Emitted when data is available to read from the socket.
-   */
-  on(event: 'data', listener: (buffer: Buffer) => any): this;
+    /**
+     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+     */
+    deviceScaleFactor?: number;
 
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'close', listener: () => any): this;
+    /**
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     */
+    extraHTTPHeaders?: { [key: string]: string; };
 
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'data', listener: (buffer: Buffer) => any): this;
+    /**
+     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     */
+    forcedColors?: null|"active"|"none";
 
-  /**
-   * Emitted when the socket is closed.
-   */
-  addListener(event: 'close', listener: () => any): this;
+    geolocation?: {
+      /**
+       * Latitude between -90 and 90.
+       */
+      latitude: number;
 
-  /**
-   * Emitted when data is available to read from the socket.
-   */
-  addListener(event: 'data', listener: (buffer: Buffer) => any): this;
+      /**
+       * Longitude between -180 and 180.
+       */
+      longitude: number;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'close', listener: () => any): this;
+      /**
+       * Non-negative accuracy value. Defaults to `0`.
+       */
+      accuracy?: number;
+    };
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'data', listener: (buffer: Buffer) => any): this;
+    /**
+     * Specifies if viewport supports touch events. Defaults to false. Learn more about
+     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     */
+    hasTouch?: boolean;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'close', listener: () => any): this;
+    /**
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     */
+    httpCredentials?: {
+      username: string;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'data', listener: (buffer: Buffer) => any): this;
+      password: string;
 
-  /**
-   * Emitted when the socket is closed.
-   */
-  prependListener(event: 'close', listener: () => any): this;
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
 
-  /**
-   * Emitted when data is available to read from the socket.
-   */
-  prependListener(event: 'data', listener: (buffer: Buffer) => any): this;
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
 
-  /**
-   * Closes the socket.
-   */
-  close(): Promise<void>;
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
 
-  /**
-   * Writes some `data` to the socket.
-   * @param data Data to write.
-   */
-  write(data: Buffer): Promise<void>;
+    /**
+     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     */
+    isMobile?: boolean;
 
-  [Symbol.asyncDispose](): Promise<void>;
-}
+    /**
+     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     */
+    javaScriptEnabled?: boolean;
 
-/**
- * {@link AndroidWebView} represents a WebView open on the {@link AndroidDevice}. WebView is usually obtained using
- * [androidDevice.webView(selector[, options])](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view).
- */
-export interface AndroidWebView {
-  /**
-   * Emitted when the WebView is closed.
-   */
-  on(event: 'close', listener: () => any): this;
+    /**
+     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     */
+    locale?: string;
 
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'close', listener: () => any): this;
+    /**
+     * Logger sink for Playwright logging.
+     * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+     */
+    logger?: Logger;
 
-  /**
-   * Emitted when the WebView is closed.
-   */
-  addListener(event: 'close', listener: () => any): this;
+    /**
+     * Whether to emulate network being offline. Defaults to `false`. Learn more about
+     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     */
+    offline?: boolean;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'close', listener: () => any): this;
+    /**
+     * A list of permissions to grant to all pages in this context. See
+     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+     * for more details. Defaults to none.
+     */
+    permissions?: Array<string>;
 
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'close', listener: () => any): this;
+    /**
+     * Optional package name to launch instead of default Chrome for Android.
+     */
+    pkg?: string;
 
-  /**
-   * Emitted when the WebView is closed.
-   */
-  prependListener(event: 'close', listener: () => any): this;
+    /**
+     * Network proxy settings.
+     */
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
 
-  /**
-   * Connects to the WebView and returns a regular Playwright {@link Page} to interact with.
-   */
-  page(): Promise<Page>;
+      /**
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       */
+      bypass?: string;
 
-  /**
-   * WebView process PID.
-   */
-  pid(): number;
+      /**
+       * Optional username to use if HTTP proxy requires authentication.
+       */
+      username?: string;
 
-  /**
-   * WebView package identifier.
-   */
-  pkg(): string;
-}
+      /**
+       * Optional password to use if HTTP proxy requires authentication.
+       */
+      password?: string;
+    };
 
-/**
- * Exposes API that can be used for the Web API testing. This class is used for creating {@link APIRequestContext}
- * instance which in turn can be used for sending web requests. An instance of this class can be obtained via
- * [playwright.request](https://playwright.dev/docs/api/class-playwright#playwright-request). For more information see
- * {@link APIRequestContext}.
- */
-export interface APIRequest {
-  /**
-   * Creates new instances of {@link APIRequestContext}.
-   * @param options
-   */
-  newContext(options?: {
     /**
-     * Methods like
-     * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
-     * take the base URL into consideration by using the
-     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
-     * Examples:
-     * - baseURL: `http://localhost:3000` and sending request to `/bar.html` results in `http://localhost:3000/bar.html`
-     * - baseURL: `http://localhost:3000/foo/` and sending request to `./bar.html` results in
-     *   `http://localhost:3000/foo/bar.html`
-     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
-     *   `http://localhost:3000/bar.html`
+     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+     * If not specified, the HAR is not recorded. Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * the HAR to be saved.
      */
-    baseURL?: string;
+    recordHar?: {
+      /**
+       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+       * `content` policy instead.
+       */
+      omitContent?: boolean;
 
-    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * **Details**
-     *
-     * An array of client certificates to be used. Each certificate object must have both `certPath` and `keyPath` or a
-     * single `pfxPath` to load the client certificate. Optionally, `passphrase` property should be provided if the
-     * certficiate is encrypted. The `origin` property should be provided with an exact match to the request origin that
-     * the certificate is valid for.
-     *
-     * **NOTE** Using Client Certificates in combination with Proxy Servers is not supported.
-     *
-     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
-     * work by replacing `localhost` with `local.playwright`.
-     */
-    clientCertificates?: Array<{
       /**
-       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+       * files and to `embed` for all other file extensions.
        */
-      origin: string;
+      content?: "omit"|"embed"|"attach";
 
       /**
-       * Path to the file with the certificate in PEM format.
+       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+       * default.
        */
-      certPath?: string;
+      path: string;
 
       /**
-       * Path to the file with the private key in PEM format.
+       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
        */
-      keyPath?: string;
+      mode?: "full"|"minimal";
 
       /**
-       * Path to the PFX or PKCS12 encoded private key and certificate chain.
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
+       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
        */
-      pfxPath?: string;
+      urlFilter?: string|RegExp;
+    };
 
+    /**
+     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+     * Make sure to await
+     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+     * videos to be saved.
+     */
+    recordVideo?: {
       /**
-       * Passphrase for the private key (PEM or PFX).
+       * Path to the directory to put videos into.
        */
-      passphrase?: string;
-    }>;
+      dir: string;
+
+      /**
+       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+       * each page will be scaled down if necessary to fit the specified size.
+       */
+      size?: {
+        /**
+         * Video frame width.
+         */
+        width: number;
+
+        /**
+         * Video frame height.
+         */
+        height: number;
+      };
+    };
+
+    /**
+     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     */
+    reducedMotion?: null|"reduce"|"no-preference";
+
+    /**
+     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+     * [`viewport`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-viewport) is
+     * set.
+     */
+    screen?: {
+      /**
+       * page width in pixels.
+       */
+      width: number;
+
+      /**
+       * page height in pixels.
+       */
+      height: number;
+    };
+
+    /**
+     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+     *   registered.
+     * - `'block'`: Playwright will block all registration of Service Workers.
+     */
+    serviceWorkers?: "allow"|"block";
 
     /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+     * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
      */
-    extraHTTPHeaders?: { [key: string]: string; };
+    strictSelectors?: boolean;
 
     /**
-     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
-     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Changes the timezone of the context. See
+     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+     * for a list of supported timezone IDs. Defaults to the system timezone.
      */
-    httpCredentials?: {
-      username: string;
+    timezoneId?: string;
 
-      password: string;
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
 
+    /**
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)
+     * instead.
+     */
+    videoSize?: {
       /**
-       * Restrain sending http credentials on specific origin (scheme://host:port).
+       * Video frame width.
        */
-      origin?: string;
+      width: number;
 
       /**
-       * This option only applies to the requests sent from corresponding {@link APIRequestContext} and does not affect
-       * requests sent from the browser. `'always'` - `Authorization` header with basic authentication credentials will be
-       * sent with the each API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response
-       * with `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       * Video frame height.
        */
-      send?: "unauthorized"|"always";
+      height: number;
     };
 
     /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     * @deprecated Use
+     * [`recordVideo`](https://playwright.dev/docs/api/class-androiddevice#android-device-launch-browser-option-record-video)
+     * instead.
      */
-    ignoreHTTPSErrors?: boolean;
+    videosPath?: string;
 
     /**
-     * Network proxy settings.
+     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+     *
+     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+     * by the operating system. It makes the execution of the tests non-deterministic.
+     *
      */
-    proxy?: {
-      /**
-       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
-       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
-       */
-      server: string;
-
-      /**
-       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
-       */
-      bypass?: string;
-
+    viewport?: null|{
       /**
-       * Optional username to use if HTTP proxy requires authentication.
+       * page width in pixels.
        */
-      username?: string;
+      width: number;
 
       /**
-       * Optional password to use if HTTP proxy requires authentication.
+       * page height in pixels.
        */
-      password?: string;
+      height: number;
     };
+  }): Promise<BrowserContext>;
 
+  /**
+   * Performs a long tap on the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-long-tap-option-selector).
+   * @param selector Selector to tap on.
+   * @param options
+   */
+  longTap(selector: AndroidSelector, options?: {
     /**
-     * Populates context with given storage state. This option can be used to initialize context with logged-in
-     * information obtained via
-     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state)
-     * or
-     * [apiRequestContext.storageState([options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state).
-     * Either a path to the file with saved storage, or the value returned by one of
-     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state)
-     * or
-     * [apiRequestContext.storageState([options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state)
-     * methods.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    storageState?: string|{
-      cookies: Array<{
-        name: string;
-
-        value: string;
-
-        domain: string;
-
-        path: string;
-
-        /**
-         * Unix time in seconds.
-         */
-        expires: number;
-
-        httpOnly: boolean;
-
-        secure: boolean;
-
-        sameSite: "Strict"|"Lax"|"None";
-      }>;
-
-      origins: Array<{
-        origin: string;
+    timeout?: number;
+  }): Promise<void>;
 
-        localStorage: Array<{
-          name: string;
+  /**
+   * Device model.
+   */
+  model(): string;
 
-          value: string;
-        }>;
-      }>;
-    };
+  /**
+   * Launches a process in the shell on the device and returns a socket to communicate with the launched process.
+   * @param command Shell command to execute.
+   */
+  open(command: string): Promise<AndroidSocket>;
 
+  /**
+   * Pinches the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-pinch-close-option-selector) in the
+   * closing direction.
+   * @param selector Selector to pinch close.
+   * @param percent The size of the pinch as a percentage of the widget's size.
+   * @param options
+   */
+  pinchClose(selector: AndroidSelector, percent: number, options?: {
     /**
-     * Maximum time in milliseconds to wait for the response. Defaults to `30000` (30 seconds). Pass `0` to disable
-     * timeout.
+     * Optional speed of the pinch in pixels per second.
      */
-    timeout?: number;
+    speed?: number;
 
     /**
-     * Specific user agent to use in this context.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    userAgent?: string;
-  }): Promise<APIRequestContext>;
-}
+    timeout?: number;
+  }): Promise<void>;
 
-/**
- * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services,
- * prepare environment or the service to your e2e test.
- *
- * Each Playwright browser context has associated with it {@link APIRequestContext} instance which shares cookie
- * storage with the browser context and can be accessed via
- * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) or
- * [page.request](https://playwright.dev/docs/api/class-page#page-request). It is also possible to create a new
- * APIRequestContext instance manually by calling
- * [apiRequest.newContext([options])](https://playwright.dev/docs/api/class-apirequest#api-request-new-context).
- *
- * **Cookie management**
- *
- * {@link APIRequestContext} returned by
- * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) and
- * [page.request](https://playwright.dev/docs/api/class-page#page-request) shares cookie storage with the
- * corresponding {@link BrowserContext}. Each API request will have `Cookie` header populated with the values from the
- * browser context. If the API response contains `Set-Cookie` header it will automatically update {@link
- * BrowserContext} cookies and requests made from the page will pick them up. This means that if you log in using this
- * API, your e2e test will be logged in and vice versa.
- *
- * If you want API requests to not interfere with the browser cookies you should create a new {@link
- * APIRequestContext} by calling
- * [apiRequest.newContext([options])](https://playwright.dev/docs/api/class-apirequest#api-request-new-context). Such
- * `APIRequestContext` object will have its own isolated cookie storage.
- */
-export interface APIRequestContext {
   /**
-   * Sends HTTP(S) [DELETE](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE) request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   * @param url Target URL.
+   * Pinches the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-pinch-open-option-selector) in the
+   * open direction.
+   * @param selector Selector to pinch open.
+   * @param percent The size of the pinch as a percentage of the widget's size.
    * @param options
    */
-  delete(url: string, options?: {
+  pinchOpen(selector: AndroidSelector, percent: number, options?: {
     /**
-     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
-     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
-     * header will be set to `application/octet-stream` if not explicitly set.
+     * Optional speed of the pinch in pixels per second.
      */
-    data?: string|Buffer|Serializable;
+    speed?: number;
 
     /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
-     * codes.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    failOnStatusCode?: boolean;
+    timeout?: number;
+  }): Promise<void>;
 
+  /**
+   * Presses the specific [`key`](https://playwright.dev/docs/api/class-androiddevice#android-device-press-option-key)
+   * in the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-press-option-selector).
+   * @param selector Selector to press the key in.
+   * @param key The key to press.
+   * @param options
+   */
+  press(selector: AndroidSelector, key: AndroidKey, options?: {
     /**
-     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
-     * as this request body. If this parameter is specified `content-type` header will be set to
-     * `application/x-www-form-urlencoded` unless explicitly provided.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    form?: { [key: string]: string|number|boolean; };
+    timeout?: number;
+  }): Promise<void>;
 
+  /**
+   * Copies a file to the device.
+   * @param file Either a path to the file, or file content.
+   * @param path Path to the file on the device.
+   * @param options
+   */
+  push(file: string|Buffer, path: string, options?: {
     /**
-     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
-     * it.
+     * Optional file mode, defaults to `644` (`rw-r--r--`).
      */
-    headers?: { [key: string]: string; };
+    mode?: number;
+  }): Promise<void>;
 
+  /**
+   * Returns the buffer with the captured screenshot of the device.
+   * @param options
+   */
+  screenshot(options?: {
     /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     * The file path to save the image to. If
+     * [`path`](https://playwright.dev/docs/api/class-androiddevice#android-device-screenshot-option-path) is a relative
+     * path, then it is resolved relative to the current working directory. If no path is provided, the image won't be
+     * saved to the disk.
      */
-    ignoreHTTPSErrors?: boolean;
+    path?: string;
+  }): Promise<Buffer>;
 
+  /**
+   * Scrolls the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-scroll-option-selector) in  the
+   * specified
+   * [`direction`](https://playwright.dev/docs/api/class-androiddevice#android-device-scroll-option-direction).
+   * @param selector Selector to scroll.
+   * @param direction Scroll direction.
+   * @param percent Distance to scroll as a percentage of the widget's size.
+   * @param options
+   */
+  scroll(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", percent: number, options?: {
     /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     * Optional speed of the scroll in pixels per second.
      */
-    maxRedirects?: number;
+    speed?: number;
 
     /**
-     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
-     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
-     * explicitly provided. File values can be passed either as
-     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
-     * name, mime-type and its content.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
-      /**
-       * File name
-       */
-      name: string;
+    timeout?: number;
+  }): Promise<void>;
 
-      /**
-       * File type
-       */
-      mimeType: string;
+  /**
+   * Device serial number.
+   */
+  serial(): string;
+
+  /**
+   * This setting will change the default maximum time for all the methods accepting
+   * [`timeout`](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout-option-timeout)
+   * option.
+   * @param timeout Maximum time in milliseconds
+   */
+  setDefaultTimeout(timeout: number): void;
 
-      /**
-       * File content
-       */
-      buffer: Buffer;
-    }; };
+  /**
+   * Executes a shell command on the device and returns its output.
+   * @param command Shell command to execute.
+   */
+  shell(command: string): Promise<Buffer>;
 
+  /**
+   * Swipes the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-swipe-option-selector) in  the
+   * specified [`direction`](https://playwright.dev/docs/api/class-androiddevice#android-device-swipe-option-direction).
+   * @param selector Selector to swipe.
+   * @param direction Swipe direction.
+   * @param percent Distance to swipe as a percentage of the widget's size.
+   * @param options
+   */
+  swipe(selector: AndroidSelector, direction: "down"|"up"|"left"|"right", percent: number, options?: {
     /**
-     * Query parameters to be sent with the URL.
+     * Optional speed of the swipe in pixels per second.
      */
-    params?: { [key: string]: string|number|boolean; };
+    speed?: number;
 
     /**
-     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
     timeout?: number;
-  }): Promise<APIResponse>;
+  }): Promise<void>;
 
   /**
-   * All responses returned by
-   * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
-   * and similar methods are stored in the memory, so that you can later call
-   * [apiResponse.body()](https://playwright.dev/docs/api/class-apiresponse#api-response-body).This method discards all
-   * its resources, calling any method on disposed {@link APIRequestContext} will throw an exception.
+   * Taps on the widget defined by
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-tap-option-selector).
+   * @param selector Selector to tap on.
    * @param options
    */
-  dispose(options?: {
+  tap(selector: AndroidSelector, options?: {
     /**
-     * The reason to be reported to the operations interrupted by the context disposal.
+     * Optional duration of the tap in milliseconds.
      */
-    reason?: string;
+    duration?: number;
+
+    /**
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
+     */
+    timeout?: number;
   }): Promise<void>;
 
   /**
-   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and
-   * update context cookies from the response. The method will automatically follow redirects.
-   *
-   * **Usage**
-   *
-   * JSON objects can be passed directly to the request:
-   *
-   * ```js
-   * await request.fetch('https://example.com/api/createBook', {
-   *   method: 'post',
-   *   data: {
-   *     title: 'Book Title',
-   *     author: 'John Doe',
-   *   }
-   * });
-   * ```
-   *
-   * The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data`
-   * encoding. Use [FormData] to construct request body and pass it to the request as `multipart` parameter:
-   *
-   * ```js
-   * const form = new FormData();
-   * form.set('name', 'John');
-   * form.append('name', 'Doe');
-   * // Send two file fields with the same name.
-   * form.append('file', new File(['console.log(2024);'], 'f1.js', { type: 'text/javascript' }));
-   * form.append('file', new File(['hello'], 'f2.txt', { type: 'text/plain' }));
-   * await request.fetch('https://example.com/api/uploadForm', {
-   *   multipart: form
-   * });
-   * ```
-   *
-   * @param urlOrRequest Target URL or Request to get all parameters from.
+   * Waits for the specific
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-wait-option-selector) to either
+   * appear or disappear, depending on the
+   * [`state`](https://playwright.dev/docs/api/class-androiddevice#android-device-wait-option-state).
+   * @param selector Selector to wait for.
    * @param options
    */
-  fetch(urlOrRequest: string|Request, options?: {
+  wait(selector: AndroidSelector, options?: {
     /**
-     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
-     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
-     * header will be set to `application/octet-stream` if not explicitly set.
+     * Optional state. Can be either:
+     * - default - wait for element to be present.
+     * - `'gone'` - wait for element to not be present.
      */
-    data?: string|Buffer|Serializable;
+    state?: "gone";
 
     /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
-     * codes.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    failOnStatusCode?: boolean;
+    timeout?: number;
+  }): Promise<void>;
 
-    /**
-     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
-     * as this request body. If this parameter is specified `content-type` header will be set to
-     * `application/x-www-form-urlencoded` unless explicitly provided.
-     */
-    form?: { [key: string]: string|number|boolean; };
+  /**
+   * Emitted when the device connection gets closed.
+   */
+  waitForEvent(event: 'close', optionsOrPredicate?: { predicate?: (androidDevice: AndroidDevice) => boolean | Promise<boolean>, timeout?: number } | ((androidDevice: AndroidDevice) => boolean | Promise<boolean>)): Promise<AndroidDevice>;
 
-    /**
-     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
-     * it.
-     */
-    headers?: { [key: string]: string; };
+  /**
+   * Emitted when a new WebView instance is detected.
+   */
+  waitForEvent(event: 'webview', optionsOrPredicate?: { predicate?: (androidWebView: AndroidWebView) => boolean | Promise<boolean>, timeout?: number } | ((androidWebView: AndroidWebView) => boolean | Promise<boolean>)): Promise<AndroidWebView>;
 
-    /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
-     */
-    ignoreHTTPSErrors?: boolean;
 
+  /**
+   * This method waits until [AndroidWebView](https://playwright.dev/docs/api/class-androidwebview) matching the
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view-option-selector) is opened
+   * and returns it. If there is already an open [AndroidWebView](https://playwright.dev/docs/api/class-androidwebview)
+   * matching the
+   * [`selector`](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view-option-selector), returns
+   * immediately.
+   * @param selector
+   * @param options
+   */
+  webView(selector: {
     /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     * Optional Package identifier.
      */
-    maxRedirects?: number;
+    pkg?: string;
 
     /**
-     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     * Optional webview socket name.
      */
-    maxRetries?: number;
-
+    socketName?: string;
+  }, options?: {
     /**
-     * If set changes the fetch method (e.g. [PUT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT) or
-     * [POST](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST)). If not specified, GET method is used.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass `0` to disable timeout. The default value can be changed
+     * by using the
+     * [androidDevice.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-androiddevice#android-device-set-default-timeout)
+     * method.
      */
-    method?: string;
+    timeout?: number;
+  }): Promise<AndroidWebView>;
 
-    /**
-     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
-     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
-     * explicitly provided. File values can be passed either as
-     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
-     * name, mime-type and its content.
-     */
-    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
-      /**
-       * File name
-       */
-      name: string;
+  /**
+   * Currently open WebViews.
+   */
+  webViews(): Array<AndroidWebView>;
 
-      /**
-       * File type
-       */
-      mimeType: string;
+  input: AndroidInput;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+export interface AndroidInput {
+  /**
+   * Performs a drag between [`from`](https://playwright.dev/docs/api/class-androidinput#android-input-drag-option-from)
+   * and [`to`](https://playwright.dev/docs/api/class-androidinput#android-input-drag-option-to) points.
+   * @param from The start point of the drag.
+   * @param to The end point of the drag.
+   * @param steps The number of steps in the drag. Each step takes 5 milliseconds to complete.
+   */
+  drag(from: {
+    x: number;
+
+    y: number;
+  }, to: {
+    x: number;
+
+    y: number;
+  }, steps: number): Promise<void>;
+
+  /**
+   * Presses the [`key`](https://playwright.dev/docs/api/class-androidinput#android-input-press-option-key).
+   * @param key Key to press.
+   */
+  press(key: AndroidKey): Promise<void>;
+
+  /**
+   * Swipes following the path defined by
+   * [`segments`](https://playwright.dev/docs/api/class-androidinput#android-input-swipe-option-segments).
+   * @param from The point to start swiping from.
+   * @param segments Points following the [`from`](https://playwright.dev/docs/api/class-androidinput#android-input-swipe-option-from)
+   * point in the swipe gesture.
+   * @param steps The number of steps for each segment. Each step takes 5 milliseconds to complete, so 100 steps means half a second
+   * per each segment.
+   */
+  swipe(from: {
+    x: number;
+
+    y: number;
+  }, segments: ReadonlyArray<{
+    x: number;
+
+    y: number;
+  }>, steps: number): Promise<void>;
+
+  /**
+   * Taps at the specified [`point`](https://playwright.dev/docs/api/class-androidinput#android-input-tap-option-point).
+   * @param point The point to tap at.
+   */
+  tap(point: {
+    x: number;
+
+    y: number;
+  }): Promise<void>;
+
+  /**
+   * Types [`text`](https://playwright.dev/docs/api/class-androidinput#android-input-type-option-text) into currently
+   * focused widget.
+   * @param text Text to type.
+   */
+  type(text: string): Promise<void>;
+}
+
+/**
+ * [AndroidSocket](https://playwright.dev/docs/api/class-androidsocket) is a way to communicate with a process
+ * launched on the [AndroidDevice](https://playwright.dev/docs/api/class-androiddevice). Use
+ * [androidDevice.open(command)](https://playwright.dev/docs/api/class-androiddevice#android-device-open) to open a
+ * socket.
+ */
+export interface AndroidSocket {
+  /**
+   * Emitted when the socket is closed.
+   */
+  on(event: 'close', listener: () => any): this;
+
+  /**
+   * Emitted when data is available to read from the socket.
+   */
+  on(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: () => any): this;
+
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'data', listener: (buffer: Buffer) => any): this;
+
+  /**
+   * Emitted when the socket is closed.
+   */
+  addListener(event: 'close', listener: () => any): this;
 
-      /**
-       * File content
-       */
-      buffer: Buffer;
-    }; };
+  /**
+   * Emitted when data is available to read from the socket.
+   */
+  addListener(event: 'data', listener: (buffer: Buffer) => any): this;
 
-    /**
-     * Query parameters to be sent with the URL.
-     */
-    params?: { [key: string]: string|number|boolean; };
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: () => any): this;
 
-    /**
-     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
-     */
-    timeout?: number;
-  }): Promise<APIResponse>;
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'data', listener: (buffer: Buffer) => any): this;
 
   /**
-   * Sends HTTP(S) [GET](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET) request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   *
-   * **Usage**
-   *
-   * Request parameters can be configured with `params` option, they will be serialized into the URL search parameters:
-   *
-   * ```js
-   * await request.get('https://example.com/api/getText', {
-   *   params: {
-   *     'isbn': '1234',
-   *     'page': 23,
-   *   }
-   * });
-   * ```
-   *
-   * @param url Target URL.
-   * @param options
+   * Removes an event listener added by `on` or `addListener`.
    */
-  get(url: string, options?: {
-    /**
-     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
-     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
-     * header will be set to `application/octet-stream` if not explicitly set.
-     */
-    data?: string|Buffer|Serializable;
+  off(event: 'close', listener: () => any): this;
 
-    /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
-     * codes.
-     */
-    failOnStatusCode?: boolean;
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'data', listener: (buffer: Buffer) => any): this;
 
-    /**
-     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
-     * as this request body. If this parameter is specified `content-type` header will be set to
-     * `application/x-www-form-urlencoded` unless explicitly provided.
-     */
-    form?: { [key: string]: string|number|boolean; };
+  /**
+   * Emitted when the socket is closed.
+   */
+  prependListener(event: 'close', listener: () => any): this;
 
-    /**
-     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
-     * it.
-     */
-    headers?: { [key: string]: string; };
+  /**
+   * Emitted when data is available to read from the socket.
+   */
+  prependListener(event: 'data', listener: (buffer: Buffer) => any): this;
 
-    /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
-     */
-    ignoreHTTPSErrors?: boolean;
+  /**
+   * Closes the socket.
+   */
+  close(): Promise<void>;
 
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
-     */
-    maxRedirects?: number;
+  /**
+   * Writes some [`data`](https://playwright.dev/docs/api/class-androidsocket#android-socket-write-option-data) to the
+   * socket.
+   * @param data Data to write.
+   */
+  write(data: Buffer): Promise<void>;
 
-    /**
-     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
-     */
-    maxRetries?: number;
+  [Symbol.asyncDispose](): Promise<void>;
+}
 
-    /**
-     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
-     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
-     * explicitly provided. File values can be passed either as
-     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
-     * name, mime-type and its content.
-     */
-    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
-      /**
-       * File name
-       */
-      name: string;
+/**
+ * [AndroidWebView](https://playwright.dev/docs/api/class-androidwebview) represents a WebView open on the
+ * [AndroidDevice](https://playwright.dev/docs/api/class-androiddevice). WebView is usually obtained using
+ * [androidDevice.webView(selector[, options])](https://playwright.dev/docs/api/class-androiddevice#android-device-web-view).
+ */
+export interface AndroidWebView {
+  /**
+   * Emitted when the WebView is closed.
+   */
+  on(event: 'close', listener: () => any): this;
 
-      /**
-       * File type
-       */
-      mimeType: string;
+  /**
+   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
+   */
+  once(event: 'close', listener: () => any): this;
 
-      /**
-       * File content
-       */
-      buffer: Buffer;
-    }; };
+  /**
+   * Emitted when the WebView is closed.
+   */
+  addListener(event: 'close', listener: () => any): this;
 
-    /**
-     * Query parameters to be sent with the URL.
-     */
-    params?: { [key: string]: string|number|boolean; };
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  removeListener(event: 'close', listener: () => any): this;
 
-    /**
-     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
-     */
-    timeout?: number;
-  }): Promise<APIResponse>;
+  /**
+   * Removes an event listener added by `on` or `addListener`.
+   */
+  off(event: 'close', listener: () => any): this;
 
   /**
-   * Sends HTTP(S) [HEAD](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD) request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   * @param url Target URL.
-   * @param options
+   * Emitted when the WebView is closed.
    */
-  head(url: string, options?: {
-    /**
-     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
-     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
-     * header will be set to `application/octet-stream` if not explicitly set.
-     */
-    data?: string|Buffer|Serializable;
+  prependListener(event: 'close', listener: () => any): this;
 
-    /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
-     * codes.
-     */
-    failOnStatusCode?: boolean;
+  /**
+   * Connects to the WebView and returns a regular Playwright [Page](https://playwright.dev/docs/api/class-page) to
+   * interact with.
+   */
+  page(): Promise<Page>;
 
-    /**
-     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
-     * as this request body. If this parameter is specified `content-type` header will be set to
-     * `application/x-www-form-urlencoded` unless explicitly provided.
-     */
-    form?: { [key: string]: string|number|boolean; };
+  /**
+   * WebView process PID.
+   */
+  pid(): number;
 
-    /**
-     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
-     * it.
-     */
-    headers?: { [key: string]: string; };
+  /**
+   * WebView package identifier.
+   */
+  pkg(): string;
+}
 
+/**
+ * Exposes API that can be used for the Web API testing. This class is used for creating
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) instance which in turn can be used for
+ * sending web requests. An instance of this class can be obtained via
+ * [playwright.request](https://playwright.dev/docs/api/class-playwright#playwright-request). For more information see
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext).
+ */
+export interface APIRequest {
+  /**
+   * Creates new instances of [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext).
+   * @param options
+   */
+  newContext(options?: {
     /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     * Methods like
+     * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
+     * take the base URL into consideration by using the
+     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+     * Examples:
+     * - baseURL: `http://localhost:3000` and sending request to `/bar.html` results in `http://localhost:3000/bar.html`
+     * - baseURL: `http://localhost:3000/foo/` and sending request to `./bar.html` results in
+     *   `http://localhost:3000/foo/bar.html`
+     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+     *   `http://localhost:3000/bar.html`
      */
-    ignoreHTTPSErrors?: boolean;
+    baseURL?: string;
 
     /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * **Details**
+     *
+     * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+     * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+     * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+     * with an exact match to the request origin that the certificate is valid for.
+     *
+     * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+     * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+     * does not match any of the domains you plan to visit.
+     *
+     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+     * work by replacing `localhost` with `local.playwright`.
+     *
      */
-    maxRedirects?: number;
+    clientCertificates?: Array<{
+      /**
+       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
+       */
+      origin: string;
 
-    /**
-     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
-     */
-    maxRetries?: number;
+      /**
+       * Path to the file with the certificate in PEM format.
+       */
+      certPath?: string;
+
+      /**
+       * Direct value of the certificate in PEM format.
+       */
+      cert?: Buffer;
 
-    /**
-     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
-     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
-     * explicitly provided. File values can be passed either as
-     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
-     * name, mime-type and its content.
-     */
-    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
       /**
-       * File name
+       * Path to the file with the private key in PEM format.
        */
-      name: string;
+      keyPath?: string;
 
       /**
-       * File type
+       * Direct value of the private key in PEM format.
        */
-      mimeType: string;
+      key?: Buffer;
 
       /**
-       * File content
+       * Path to the PFX or PKCS12 encoded private key and certificate chain.
        */
-      buffer: Buffer;
-    }; };
+      pfxPath?: string;
 
-    /**
-     * Query parameters to be sent with the URL.
-     */
-    params?: { [key: string]: string|number|boolean; };
+      /**
+       * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+       */
+      pfx?: Buffer;
 
-    /**
-     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
-     */
-    timeout?: number;
-  }): Promise<APIResponse>;
+      /**
+       * Passphrase for the private key (PEM or PFX).
+       */
+      passphrase?: string;
+    }>;
 
-  /**
-   * Sends HTTP(S) [PATCH](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH) request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   * @param url Target URL.
-   * @param options
-   */
-  patch(url: string, options?: {
     /**
-     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
-     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
-     * header will be set to `application/octet-stream` if not explicitly set.
+     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
      */
-    data?: string|Buffer|Serializable;
+    extraHTTPHeaders?: { [key: string]: string; };
 
     /**
      * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
@@ -16186,17 +17611,28 @@ export interface APIRequestContext {
     failOnStatusCode?: boolean;
 
     /**
-     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
-     * as this request body. If this parameter is specified `content-type` header will be set to
-     * `application/x-www-form-urlencoded` unless explicitly provided.
+     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
      */
-    form?: { [key: string]: string|number|boolean; };
+    httpCredentials?: {
+      username: string;
 
-    /**
-     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
-     * it.
-     */
-    headers?: { [key: string]: string; };
+      password: string;
+
+      /**
+       * Restrain sending http credentials on specific origin (scheme://host:port).
+       */
+      origin?: string;
+
+      /**
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       */
+      send?: "unauthorized"|"always";
+    };
 
     /**
      * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
@@ -16205,101 +17641,132 @@ export interface APIRequestContext {
 
     /**
      * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects. This can be overwritten for each request
+     * individually.
      */
     maxRedirects?: number;
 
     /**
-     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     * Network proxy settings.
      */
-    maxRetries?: number;
+    proxy?: {
+      /**
+       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+       */
+      server: string;
 
-    /**
-     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
-     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
-     * explicitly provided. File values can be passed either as
-     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
-     * name, mime-type and its content.
-     */
-    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
       /**
-       * File name
+       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
        */
-      name: string;
+      bypass?: string;
 
       /**
-       * File type
+       * Optional username to use if HTTP proxy requires authentication.
        */
-      mimeType: string;
+      username?: string;
 
       /**
-       * File content
+       * Optional password to use if HTTP proxy requires authentication.
        */
-      buffer: Buffer;
-    }; };
+      password?: string;
+    };
 
     /**
-     * Query parameters to be sent with the URL.
+     * Populates context with given storage state. This option can be used to initialize context with logged-in
+     * information obtained via
+     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state)
+     * or
+     * [apiRequestContext.storageState([options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state).
+     * Either a path to the file with saved storage, or the value returned by one of
+     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state)
+     * or
+     * [apiRequestContext.storageState([options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state)
+     * methods.
      */
-    params?: { [key: string]: string|number|boolean; };
+    storageState?: string|{
+      cookies: Array<{
+        name: string;
+
+        value: string;
+
+        domain: string;
+
+        path: string;
+
+        /**
+         * Unix time in seconds.
+         */
+        expires: number;
+
+        httpOnly: boolean;
+
+        secure: boolean;
+
+        sameSite: "Strict"|"Lax"|"None";
+      }>;
+
+      origins: Array<{
+        origin: string;
+
+        localStorage: Array<{
+          name: string;
+
+          value: string;
+        }>;
+      }>;
+    };
 
     /**
-     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     * Maximum time in milliseconds to wait for the response. Defaults to `30000` (30 seconds). Pass `0` to disable
+     * timeout.
      */
     timeout?: number;
-  }): Promise<APIResponse>;
 
+    /**
+     * Specific user agent to use in this context.
+     */
+    userAgent?: string;
+  }): Promise<APIRequestContext>;
+}
+
+/**
+ * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services,
+ * prepare environment or the service to your e2e test.
+ *
+ * Each Playwright browser context has associated with it
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) instance which shares cookie storage
+ * with the browser context and can be accessed via
+ * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) or
+ * [page.request](https://playwright.dev/docs/api/class-page#page-request). It is also possible to create a new
+ * APIRequestContext instance manually by calling
+ * [apiRequest.newContext([options])](https://playwright.dev/docs/api/class-apirequest#api-request-new-context).
+ *
+ * **Cookie management**
+ *
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) returned by
+ * [browserContext.request](https://playwright.dev/docs/api/class-browsercontext#browser-context-request) and
+ * [page.request](https://playwright.dev/docs/api/class-page#page-request) shares cookie storage with the
+ * corresponding [BrowserContext](https://playwright.dev/docs/api/class-browsercontext). Each API request will have
+ * `Cookie` header populated with the values from the browser context. If the API response contains `Set-Cookie`
+ * header it will automatically update [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) cookies
+ * and requests made from the page will pick them up. This means that if you log in using this API, your e2e test will
+ * be logged in and vice versa.
+ *
+ * If you want API requests to not interfere with the browser cookies you should create a new
+ * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) by calling
+ * [apiRequest.newContext([options])](https://playwright.dev/docs/api/class-apirequest#api-request-new-context). Such
+ * `APIRequestContext` object will have its own isolated cookie storage.
+ */
+export interface APIRequestContext {
   /**
-   * Sends HTTP(S) [POST](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST) request and returns its
+   * Sends HTTP(S) [DELETE](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE) request and returns its
    * response. The method will populate request cookies from the context and update context cookies from the response.
    * The method will automatically follow redirects.
-   *
-   * **Usage**
-   *
-   * JSON objects can be passed directly to the request:
-   *
-   * ```js
-   * await request.post('https://example.com/api/createBook', {
-   *   data: {
-   *     title: 'Book Title',
-   *     author: 'John Doe',
-   *   }
-   * });
-   * ```
-   *
-   * To send form data to the server use `form` option. Its value will be encoded into the request body with
-   * `application/x-www-form-urlencoded` encoding (see below how to use `multipart/form-data` form encoding to send
-   * files):
-   *
-   * ```js
-   * await request.post('https://example.com/api/findBook', {
-   *   form: {
-   *     title: 'Book Title',
-   *     author: 'John Doe',
-   *   }
-   * });
-   * ```
-   *
-   * The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data`
-   * encoding. Use [FormData] to construct request body and pass it to the request as `multipart` parameter:
-   *
-   * ```js
-   * const form = new FormData();
-   * form.set('name', 'John');
-   * form.append('name', 'Doe');
-   * // Send two file fields with the same name.
-   * form.append('file', new File(['console.log(2024);'], 'f1.js', { type: 'text/javascript' }));
-   * form.append('file', new File(['hello'], 'f2.txt', { type: 'text/plain' }));
-   * await request.post('https://example.com/api/uploadForm', {
-   *   multipart: form
-   * });
-   * ```
-   *
    * @param url Target URL.
    * @param options
    */
-  post(url: string, options?: {
+  delete(url: string, options?: {
     /**
      * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
      * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
@@ -16318,7 +17785,7 @@ export interface APIRequestContext {
      * as this request body. If this parameter is specified `content-type` header will be set to
      * `application/x-www-form-urlencoded` unless explicitly provided.
      */
-    form?: { [key: string]: string|number|boolean; };
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
     /**
      * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
@@ -16370,7 +17837,7 @@ export interface APIRequestContext {
     /**
      * Query parameters to be sent with the URL.
      */
-    params?: { [key: string]: string|number|boolean; };
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
 
     /**
      * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
@@ -16379,13 +17846,58 @@ export interface APIRequestContext {
   }): Promise<APIResponse>;
 
   /**
-   * Sends HTTP(S) [PUT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT) request and returns its
-   * response. The method will populate request cookies from the context and update context cookies from the response.
-   * The method will automatically follow redirects.
-   * @param url Target URL.
+   * All responses returned by
+   * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
+   * and similar methods are stored in the memory, so that you can later call
+   * [apiResponse.body()](https://playwright.dev/docs/api/class-apiresponse#api-response-body).This method discards all
+   * its resources, calling any method on disposed
+   * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) will throw an exception.
+   * @param options
+   */
+  dispose(options?: {
+    /**
+     * The reason to be reported to the operations interrupted by the context disposal.
+     */
+    reason?: string;
+  }): Promise<void>;
+
+  /**
+   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and
+   * update context cookies from the response. The method will automatically follow redirects.
+   *
+   * **Usage**
+   *
+   * JSON objects can be passed directly to the request:
+   *
+   * ```js
+   * await request.fetch('https://example.com/api/createBook', {
+   *   method: 'post',
+   *   data: {
+   *     title: 'Book Title',
+   *     author: 'John Doe',
+   *   }
+   * });
+   * ```
+   *
+   * The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data`
+   * encoding, by specifiying the `multipart` parameter:
+   *
+   * ```js
+   * const form = new FormData();
+   * form.set('name', 'John');
+   * form.append('name', 'Doe');
+   * // Send two file fields with the same name.
+   * form.append('file', new File(['console.log(2024);'], 'f1.js', { type: 'text/javascript' }));
+   * form.append('file', new File(['hello'], 'f2.txt', { type: 'text/plain' }));
+   * await request.fetch('https://example.com/api/uploadForm', {
+   *   multipart: form
+   * });
+   * ```
+   *
+   * @param urlOrRequest Target URL or Request to get all parameters from.
    * @param options
    */
-  put(url: string, options?: {
+  fetch(urlOrRequest: string|Request, options?: {
     /**
      * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
      * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
@@ -16404,7 +17916,7 @@ export interface APIRequestContext {
      * as this request body. If this parameter is specified `content-type` header will be set to
      * `application/x-www-form-urlencoded` unless explicitly provided.
      */
-    form?: { [key: string]: string|number|boolean; };
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
     /**
      * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
@@ -16429,6 +17941,12 @@ export interface APIRequestContext {
      */
     maxRetries?: number;
 
+    /**
+     * If set changes the fetch method (e.g. [PUT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT) or
+     * [POST](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST)). If not specified, GET method is used.
+     */
+    method?: string;
+
     /**
      * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
      * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
@@ -16456,7 +17974,7 @@ export interface APIRequestContext {
     /**
      * Query parameters to be sent with the URL.
      */
-    params?: { [key: string]: string|number|boolean; };
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
 
     /**
      * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
@@ -16465,767 +17983,625 @@ export interface APIRequestContext {
   }): Promise<APIResponse>;
 
   /**
-   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was
-   * passed to the constructor.
-   * @param options
-   */
-  storageState(options?: {
-    /**
-     * The file path to save the storage state to. If `path` is a relative path, then it is resolved relative to current
-     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
-     */
-    path?: string;
-  }): Promise<{
-    cookies: Array<{
-      name: string;
-
-      value: string;
-
-      domain: string;
-
-      path: string;
-
-      /**
-       * Unix time in seconds.
-       */
-      expires: number;
-
-      httpOnly: boolean;
-
-      secure: boolean;
-
-      sameSite: "Strict"|"Lax"|"None";
-    }>;
-
-    origins: Array<{
-      origin: string;
-
-      localStorage: Array<{
-        name: string;
-
-        value: string;
-      }>;
-    }>;
-  }>;
-
-  [Symbol.asyncDispose](): Promise<void>;
-}
-
-/**
- * {@link APIResponse} class represents responses returned by
- * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
- * and similar methods.
- */
-export interface APIResponse {
-  /**
-   * Returns the buffer with response body.
-   */
-  body(): Promise<Buffer>;
-
-  /**
-   * Disposes the body of this response. If not called then the body will stay in memory until the context closes.
-   */
-  dispose(): Promise<void>;
-
-  /**
-   * An object with all the response HTTP headers associated with this response.
-   */
-  headers(): { [key: string]: string; };
-
-  /**
-   * An array with all the request HTTP headers associated with this response. Header names are not lower-cased. Headers
-   * with multiple entries, such as `Set-Cookie`, appear in the array multiple times.
-   */
-  headersArray(): Array<{
-    /**
-     * Name of the header.
-     */
-    name: string;
-
-    /**
-     * Value of the header.
-     */
-    value: string;
-  }>;
-
-  /**
-   * Returns the JSON representation of response body.
-   *
-   * This method will throw if the response body is not parsable via `JSON.parse`.
-   */
-  json(): Promise<Serializable>;
-
-  /**
-   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
-   */
-  ok(): boolean;
-
-  /**
-   * Contains the status code of the response (e.g., 200 for a success).
-   */
-  status(): number;
-
-  /**
-   * Contains the status text of the response (e.g. usually an "OK" for a success).
-   */
-  statusText(): string;
-
-  /**
-   * Returns the text representation of response body.
-   */
-  text(): Promise<string>;
-
-  /**
-   * Contains the URL of the response.
-   */
-  url(): string;
-
-  [Symbol.asyncDispose](): Promise<void>;
-}
-
-/**
- * - extends: [EventEmitter]
- *
- * A Browser is created via
- * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). An example
- * of using a {@link Browser} to create a {@link Page}:
- *
- * ```js
- * const { firefox } = require('playwright');  // Or 'chromium' or 'webkit'.
- *
- * (async () => {
- *   const browser = await firefox.launch();
- *   const page = await browser.newPage();
- *   await page.goto('https://example.com');
- *   await browser.close();
- * })();
- * ```
- *
- */
-export interface Browser extends EventEmitter {
-  /**
-   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
-   * following:
-   * - Browser application is closed or crashed.
-   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
-   */
-  on(event: 'disconnected', listener: (browser: Browser) => any): this;
-
-  /**
-   * Adds an event listener that will be automatically removed after it is triggered once. See `addListener` for more information about this event.
-   */
-  once(event: 'disconnected', listener: (browser: Browser) => any): this;
-
-  /**
-   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
-   * following:
-   * - Browser application is closed or crashed.
-   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
-   */
-  addListener(event: 'disconnected', listener: (browser: Browser) => any): this;
-
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  removeListener(event: 'disconnected', listener: (browser: Browser) => any): this;
-
-  /**
-   * Removes an event listener added by `on` or `addListener`.
-   */
-  off(event: 'disconnected', listener: (browser: Browser) => any): this;
-
-  /**
-   * Emitted when Browser gets disconnected from the browser application. This might happen because of one of the
-   * following:
-   * - Browser application is closed or crashed.
-   * - The [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close) method was called.
-   */
-  prependListener(event: 'disconnected', listener: (browser: Browser) => any): this;
-
-  /**
-   * Get the browser type (chromium, firefox or webkit) that the browser belongs to.
-   */
-  browserType(): BrowserType;
-
-  /**
-   * In case this browser is obtained using
-   * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch), closes the
-   * browser and all of its pages (if any were opened).
-   *
-   * In case this browser is connected to, clears all created contexts belonging to this browser and disconnects from
-   * the browser server.
-   *
-   * **NOTE** This is similar to force quitting the browser. Therefore, you should call
-   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) on
-   * any {@link BrowserContext}'s you explicitly created earlier with
-   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) **before**
-   * calling [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close).
-   *
-   * The {@link Browser} object itself is considered to be disposed and cannot be used anymore.
-   * @param options
-   */
-  close(options?: {
-    /**
-     * The reason to be reported to the operations interrupted by the browser closure.
-     */
-    reason?: string;
-  }): Promise<void>;
-
-  /**
-   * Returns an array of all open browser contexts. In a newly created browser, this will return zero browser contexts.
+   * Sends HTTP(S) [GET](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
    *
    * **Usage**
    *
-   * ```js
-   * const browser = await pw.webkit.launch();
-   * console.log(browser.contexts().length); // prints `0`
-   *
-   * const context = await browser.newContext();
-   * console.log(browser.contexts().length); // prints `1`
-   * ```
-   *
-   */
-  contexts(): Array<BrowserContext>;
-
-  /**
-   * Indicates that the browser is connected.
-   */
-  isConnected(): boolean;
-
-  /**
-   * **NOTE** CDP Sessions are only supported on Chromium-based browsers.
-   *
-   * Returns the newly created browser session.
-   */
-  newBrowserCDPSession(): Promise<CDPSession>;
-
-  /**
-   * Creates a new browser context. It won't share cookies/cache with other browser contexts.
-   *
-   * **NOTE** If directly using this method to create {@link BrowserContext}s, it is best practice to explicitly close
-   * the returned context via
-   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) when
-   * your code is done with the {@link BrowserContext}, and before calling
-   * [browser.close([options])](https://playwright.dev/docs/api/class-browser#browser-close). This will ensure the
-   * `context` is closed gracefully and any artifacts—like HARs and videos—are fully flushed and saved.
-   *
-   * **Usage**
+   * Request parameters can be configured with `params` option, they will be serialized into the URL search parameters:
    *
    * ```js
-   * (async () => {
-   *   const browser = await playwright.firefox.launch();  // Or 'chromium' or 'webkit'.
-   *   // Create a new incognito browser context.
-   *   const context = await browser.newContext();
-   *   // Create a new page in a pristine context.
-   *   const page = await context.newPage();
-   *   await page.goto('https://example.com');
+   * // Passing params as object
+   * await request.get('https://example.com/api/getText', {
+   *   params: {
+   *     'isbn': '1234',
+   *     'page': 23,
+   *   }
+   * });
    *
-   *   // Gracefully close up everything
-   *   await context.close();
-   *   await browser.close();
-   * })();
+   * // Passing params as URLSearchParams
+   * const searchParams = new URLSearchParams();
+   * searchParams.set('isbn', '1234');
+   * searchParams.append('page', 23);
+   * searchParams.append('page', 24);
+   * await request.get('https://example.com/api/getText', { params: searchParams });
+   *
+   * // Passing params as string
+   * const queryString = 'isbn=1234&page=23&page=24';
+   * await request.get('https://example.com/api/getText', { params: queryString });
    * ```
    *
+   * @param url Target URL.
    * @param options
    */
-  newContext(options?: BrowserContextOptions): Promise<BrowserContext>;
+  get(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
 
-  /**
-   * Creates a new page in a new browser context. Closing this page will close the context as well.
-   *
-   * This is a convenience API that should only be used for the single-page scenarios and short snippets. Production
-   * code and testing frameworks should explicitly create
-   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context) followed by the
-   * [browserContext.newPage()](https://playwright.dev/docs/api/class-browsercontext#browser-context-new-page) to
-   * control their exact life times.
-   * @param options
-   */
-  newPage(options?: {
     /**
-     * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
      */
-    acceptDownloads?: boolean;
+    failOnStatusCode?: boolean;
 
     /**
-     * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
-     * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
-     * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
-     * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
-     * or
-     * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
-     * it takes the base URL in consideration by using the
-     * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
-     * Unset by default. Examples:
-     * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
-     * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
-     *   `http://localhost:3000/foo/bar.html`
-     * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
-     *   `http://localhost:3000/bar.html`
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
      */
-    baseURL?: string;
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
     /**
-     * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
      */
-    bypassCSP?: boolean;
+    headers?: { [key: string]: string; };
 
     /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * **Details**
-     *
-     * An array of client certificates to be used. Each certificate object must have both `certPath` and `keyPath` or a
-     * single `pfxPath` to load the client certificate. Optionally, `passphrase` property should be provided if the
-     * certficiate is encrypted. The `origin` property should be provided with an exact match to the request origin that
-     * the certificate is valid for.
-     *
-     * **NOTE** Using Client Certificates in combination with Proxy Servers is not supported.
-     *
-     * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
-     * work by replacing `localhost` with `local.playwright`.
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
      */
-    clientCertificates?: Array<{
-      /**
-       * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
-       */
-      origin: string;
+    ignoreHTTPSErrors?: boolean;
 
-      /**
-       * Path to the file with the certificate in PEM format.
-       */
-      certPath?: string;
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
+
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
 
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
       /**
-       * Path to the file with the private key in PEM format.
+       * File name
        */
-      keyPath?: string;
+      name: string;
 
       /**
-       * Path to the PFX or PKCS12 encoded private key and certificate chain.
+       * File type
        */
-      pfxPath?: string;
+      mimeType: string;
 
       /**
-       * Passphrase for the private key (PEM or PFX).
+       * File content
        */
-      passphrase?: string;
-    }>;
+      buffer: Buffer;
+    }; };
 
     /**
-     * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+     * Query parameters to be sent with the URL.
      */
-    colorScheme?: null|"light"|"dark"|"no-preference";
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
 
     /**
-     * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
-     * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
      */
-    deviceScaleFactor?: number;
+    timeout?: number;
+  }): Promise<APIResponse>;
 
+  /**
+   * Sends HTTP(S) [HEAD](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  head(url: string, options?: {
     /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
      */
-    extraHTTPHeaders?: { [key: string]: string; };
+    data?: string|Buffer|Serializable;
 
     /**
-     * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
      */
-    forcedColors?: null|"active"|"none";
+    failOnStatusCode?: boolean;
 
-    geolocation?: {
-      /**
-       * Latitude between -90 and 90.
-       */
-      latitude: number;
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
-      /**
-       * Longitude between -180 and 180.
-       */
-      longitude: number;
+    /**
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
+     */
+    headers?: { [key: string]: string; };
 
-      /**
-       * Non-negative accuracy value. Defaults to `0`.
-       */
-      accuracy?: number;
-    };
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
 
     /**
-     * Specifies if viewport supports touch events. Defaults to false. Learn more about
-     * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
      */
-    hasTouch?: boolean;
+    maxRedirects?: number;
 
     /**
-     * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
-     * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
      */
-    httpCredentials?: {
-      username: string;
+    maxRetries?: number;
 
-      password: string;
+    /**
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
+     */
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
+      /**
+       * File name
+       */
+      name: string;
 
       /**
-       * Restrain sending http credentials on specific origin (scheme://host:port).
+       * File type
        */
-      origin?: string;
+      mimeType: string;
 
       /**
-       * This option only applies to the requests sent from corresponding {@link APIRequestContext} and does not affect
-       * requests sent from the browser. `'always'` - `Authorization` header with basic authentication credentials will be
-       * sent with the each API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response
-       * with `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       * File content
        */
-      send?: "unauthorized"|"always";
-    };
+      buffer: Buffer;
+    }; };
 
     /**
-     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     * Query parameters to be sent with the URL.
      */
-    ignoreHTTPSErrors?: boolean;
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
 
     /**
-     * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
-     * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
-     * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
      */
-    isMobile?: boolean;
+    timeout?: number;
+  }): Promise<APIResponse>;
 
+  /**
+   * Sends HTTP(S) [PATCH](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  patch(url: string, options?: {
     /**
-     * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
-     * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
      */
-    javaScriptEnabled?: boolean;
+    data?: string|Buffer|Serializable;
 
     /**
-     * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
-     * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
-     * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
      */
-    locale?: string;
+    failOnStatusCode?: boolean;
 
     /**
-     * Logger sink for Playwright logging.
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
      */
-    logger?: Logger;
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
     /**
-     * Whether to emulate network being offline. Defaults to `false`. Learn more about
-     * [network emulation](https://playwright.dev/docs/emulation#offline).
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
      */
-    offline?: boolean;
+    headers?: { [key: string]: string; };
+
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+     */
+    ignoreHTTPSErrors?: boolean;
+
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
 
     /**
-     * A list of permissions to grant to all pages in this context. See
-     * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
-     * for more details. Defaults to none.
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
      */
-    permissions?: Array<string>;
+    maxRetries?: number;
 
     /**
-     * Network proxy settings to use with this context. Defaults to none.
-     *
-     * **NOTE** For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If
-     * all contexts override the proxy, global proxy will be never used and can be any string, for example `launch({
-     * proxy: { server: 'http://per-context' } })`.
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
      */
-    proxy?: {
-      /**
-       * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
-       * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
-       */
-      server: string;
-
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
       /**
-       * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+       * File name
        */
-      bypass?: string;
+      name: string;
 
       /**
-       * Optional username to use if HTTP proxy requires authentication.
+       * File type
        */
-      username?: string;
+      mimeType: string;
 
       /**
-       * Optional password to use if HTTP proxy requires authentication.
+       * File content
        */
-      password?: string;
-    };
+      buffer: Buffer;
+    }; };
 
     /**
-     * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
-     * If not specified, the HAR is not recorded. Make sure to await
-     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-     * the HAR to be saved.
+     * Query parameters to be sent with the URL.
      */
-    recordHar?: {
-      /**
-       * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
-       * `content` policy instead.
-       */
-      omitContent?: boolean;
-
-      /**
-       * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
-       * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
-       * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
-       * files and to `embed` for all other file extensions.
-       */
-      content?: "omit"|"embed"|"attach";
-
-      /**
-       * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
-       * default.
-       */
-      path: string;
-
-      /**
-       * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
-       * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
-       */
-      mode?: "full"|"minimal";
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
 
-      /**
-       * A glob or regex pattern to filter requests that are stored in the HAR. When a `baseURL` via the context options was
-       * provided and the passed URL is a path, it gets merged via the
-       * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
-       */
-      urlFilter?: string|RegExp;
-    };
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
 
+  /**
+   * Sends HTTP(S) [POST](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * **Usage**
+   *
+   * JSON objects can be passed directly to the request:
+   *
+   * ```js
+   * await request.post('https://example.com/api/createBook', {
+   *   data: {
+   *     title: 'Book Title',
+   *     author: 'John Doe',
+   *   }
+   * });
+   * ```
+   *
+   * To send form data to the server use `form` option. Its value will be encoded into the request body with
+   * `application/x-www-form-urlencoded` encoding (see below how to use `multipart/form-data` form encoding to send
+   * files):
+   *
+   * ```js
+   * await request.post('https://example.com/api/findBook', {
+   *   form: {
+   *     title: 'Book Title',
+   *     author: 'John Doe',
+   *   }
+   * });
+   * ```
+   *
+   * The common way to send file(s) in the body of a request is to upload them as form fields with `multipart/form-data`
+   * encoding. Use [FormData] to construct request body and pass it to the request as `multipart` parameter:
+   *
+   * ```js
+   * const form = new FormData();
+   * form.set('name', 'John');
+   * form.append('name', 'Doe');
+   * // Send two file fields with the same name.
+   * form.append('file', new File(['console.log(2024);'], 'f1.js', { type: 'text/javascript' }));
+   * form.append('file', new File(['hello'], 'f2.txt', { type: 'text/plain' }));
+   * await request.post('https://example.com/api/uploadForm', {
+   *   multipart: form
+   * });
+   * ```
+   *
+   * @param url Target URL.
+   * @param options
+   */
+  post(url: string, options?: {
     /**
-     * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
-     * Make sure to await
-     * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-     * videos to be saved.
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
      */
-    recordVideo?: {
-      /**
-       * Path to the directory to put videos into.
-       */
-      dir: string;
+    data?: string|Buffer|Serializable;
 
-      /**
-       * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
-       * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
-       * each page will be scaled down if necessary to fit the specified size.
-       */
-      size?: {
-        /**
-         * Video frame width.
-         */
-        width: number;
+    /**
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
+     */
+    failOnStatusCode?: boolean;
 
-        /**
-         * Video frame height.
-         */
-        height: number;
-      };
-    };
+    /**
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
+     */
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
     /**
-     * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
-     * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-     * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
      */
-    reducedMotion?: null|"reduce"|"no-preference";
+    headers?: { [key: string]: string; };
 
     /**
-     * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
-     * `viewport` is set.
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
      */
-    screen?: {
-      /**
-       * page width in pixels.
-       */
-      width: number;
+    ignoreHTTPSErrors?: boolean;
 
-      /**
-       * page height in pixels.
-       */
-      height: number;
-    };
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
 
     /**
-     * Whether to allow sites to register Service workers. Defaults to `'allow'`.
-     * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
-     *   registered.
-     * - `'block'`: Playwright will block all registration of Service Workers.
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
      */
-    serviceWorkers?: "allow"|"block";
+    maxRetries?: number;
 
     /**
-     * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
-     *
-     * Populates context with given storage state. This option can be used to initialize context with logged-in
-     * information obtained via
-     * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
      */
-    storageState?: string|{
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
       /**
-       * Cookies to set for context
+       * File name
        */
-      cookies: Array<{
-        name: string;
-
-        value: string;
-
-        /**
-         * Domain and path are required. For the cookie to apply to all subdomains as well, prefix domain with a dot, like
-         * this: ".example.com"
-         */
-        domain: string;
-
-        /**
-         * Domain and path are required
-         */
-        path: string;
-
-        /**
-         * Unix time in seconds.
-         */
-        expires: number;
-
-        httpOnly: boolean;
-
-        secure: boolean;
+      name: string;
 
-        /**
-         * sameSite flag
-         */
-        sameSite: "Strict"|"Lax"|"None";
-      }>;
+      /**
+       * File type
+       */
+      mimeType: string;
 
       /**
-       * localStorage to set for context
+       * File content
        */
-      origins: Array<{
-        origin: string;
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
 
-        localStorage: Array<{
-          name: string;
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
 
-          value: string;
-        }>;
-      }>;
-    };
+  /**
+   * Sends HTTP(S) [PUT](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT) request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   * @param url Target URL.
+   * @param options
+   */
+  put(url: string, options?: {
+    /**
+     * Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string
+     * and `content-type` header will be set to `application/json` if not explicitly set. Otherwise the `content-type`
+     * header will be set to `application/octet-stream` if not explicitly set.
+     */
+    data?: string|Buffer|Serializable;
 
     /**
-     * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
-     * selectors that imply single target DOM element will throw when more than one element matches the selector. This
-     * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See {@link Locator} to
-     * learn more about the strict mode.
+     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status
+     * codes.
      */
-    strictSelectors?: boolean;
+    failOnStatusCode?: boolean;
 
     /**
-     * Changes the timezone of the context. See
-     * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
-     * for a list of supported timezone IDs. Defaults to the system timezone.
+     * Provides an object that will be serialized as html form using `application/x-www-form-urlencoded` encoding and sent
+     * as this request body. If this parameter is specified `content-type` header will be set to
+     * `application/x-www-form-urlencoded` unless explicitly provided.
      */
-    timezoneId?: string;
+    form?: { [key: string]: string|number|boolean; }|FormData;
 
     /**
-     * Specific user agent to use in this context.
+     * Allows to set HTTP headers. These headers will apply to the fetched request as well as any redirects initiated by
+     * it.
      */
-    userAgent?: string;
+    headers?: { [key: string]: string; };
 
     /**
-     * @deprecated Use `recordVideo` instead.
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
      */
-    videoSize?: {
-      /**
-       * Video frame width.
-       */
-      width: number;
+    ignoreHTTPSErrors?: boolean;
 
-      /**
-       * Video frame height.
-       */
-      height: number;
-    };
+    /**
+     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
+     * exceeded. Defaults to `20`. Pass `0` to not follow redirects.
+     */
+    maxRedirects?: number;
 
     /**
-     * @deprecated Use `recordVideo` instead.
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
      */
-    videosPath?: string;
+    maxRetries?: number;
 
     /**
-     * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
-     * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
-     *
-     * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
-     * by the operating system. It makes the execution of the tests non-deterministic.
+     * Provides an object that will be serialized as html form using `multipart/form-data` encoding and sent as this
+     * request body. If this parameter is specified `content-type` header will be set to `multipart/form-data` unless
+     * explicitly provided. File values can be passed either as
+     * [`fs.ReadStream`](https://nodejs.org/api/fs.html#fs_class_fs_readstream) or as file-like object containing file
+     * name, mime-type and its content.
      */
-    viewport?: null|{
+    multipart?: FormData|{ [key: string]: string|number|boolean|ReadStream|{
       /**
-       * page width in pixels.
+       * File name
        */
-      width: number;
+      name: string;
 
       /**
-       * page height in pixels.
+       * File type
        */
-      height: number;
-    };
-  }): Promise<Page>;
+      mimeType: string;
+
+      /**
+       * File content
+       */
+      buffer: Buffer;
+    }; };
+
+    /**
+     * Query parameters to be sent with the URL.
+     */
+    params?: { [key: string]: string|number|boolean; }|URLSearchParams|string;
+
+    /**
+     * Request timeout in milliseconds. Defaults to `30000` (30 seconds). Pass `0` to disable timeout.
+     */
+    timeout?: number;
+  }): Promise<APIResponse>;
 
   /**
-   * **NOTE** This API controls
-   * [Chromium Tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool) which is a low-level
-   * chromium-specific debugging tool. API to control [Playwright Tracing](https://playwright.dev/docs/trace-viewer) could be found
-   * [here](https://playwright.dev/docs/api/class-tracing).
-   *
-   * You can use
-   * [browser.startTracing([page, options])](https://playwright.dev/docs/api/class-browser#browser-start-tracing) and
-   * [browser.stopTracing()](https://playwright.dev/docs/api/class-browser#browser-stop-tracing) to create a trace file
-   * that can be opened in Chrome DevTools performance panel.
-   *
-   * **Usage**
-   *
-   * ```js
-   * await browser.startTracing(page, { path: 'trace.json' });
-   * await page.goto('https://www.google.com');
-   * await browser.stopTracing();
-   * ```
-   *
-   * @param page Optional, if specified, tracing includes screenshots of the given page.
+   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was
+   * passed to the constructor.
    * @param options
    */
-  startTracing(page?: Page, options?: {
+  storageState(options?: {
     /**
-     * specify custom categories to use instead of default.
+     * Set to `true` to include IndexedDB in the storage state snapshot.
      */
-    categories?: Array<string>;
+    indexedDB?: boolean;
 
     /**
-     * A path to write the trace file to.
+     * The file path to save the storage state to. If
+     * [`path`](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-storage-state-option-path) is
+     * a relative path, then it is resolved relative to current working directory. If no path is provided, storage state
+     * is still returned, but won't be saved to the disk.
      */
     path?: string;
+  }): Promise<{
+    cookies: Array<{
+      name: string;
+
+      value: string;
+
+      domain: string;
+
+      path: string;
+
+      /**
+       * Unix time in seconds.
+       */
+      expires: number;
+
+      httpOnly: boolean;
+
+      secure: boolean;
+
+      sameSite: "Strict"|"Lax"|"None";
+    }>;
+
+    origins: Array<{
+      origin: string;
+
+      localStorage: Array<{
+        name: string;
+
+        value: string;
+      }>;
+    }>;
+  }>;
+
+  [Symbol.asyncDispose](): Promise<void>;
+}
+
+/**
+ * [APIResponse](https://playwright.dev/docs/api/class-apiresponse) class represents responses returned by
+ * [apiRequestContext.get(url[, options])](https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-get)
+ * and similar methods.
+ */
+export interface APIResponse {
+  /**
+   * Returns the buffer with response body.
+   */
+  body(): Promise<Buffer>;
+
+  /**
+   * Disposes the body of this response. If not called then the body will stay in memory until the context closes.
+   */
+  dispose(): Promise<void>;
+
+  /**
+   * An object with all the response HTTP headers associated with this response.
+   */
+  headers(): { [key: string]: string; };
 
+  /**
+   * An array with all the response HTTP headers associated with this response. Header names are not lower-cased.
+   * Headers with multiple entries, such as `Set-Cookie`, appear in the array multiple times.
+   */
+  headersArray(): Array<{
     /**
-     * captures screenshots in the trace.
+     * Name of the header.
      */
-    screenshots?: boolean;
-  }): Promise<void>;
+    name: string;
+
+    /**
+     * Value of the header.
+     */
+    value: string;
+  }>;
 
   /**
-   * **NOTE** This API controls
-   * [Chromium Tracing](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool) which is a low-level
-   * chromium-specific debugging tool. API to control [Playwright Tracing](https://playwright.dev/docs/trace-viewer) could be found
-   * [here](https://playwright.dev/docs/api/class-tracing).
+   * Returns the JSON representation of response body.
    *
-   * Returns the buffer with trace data.
+   * This method will throw if the response body is not parsable via `JSON.parse`.
    */
-  stopTracing(): Promise<Buffer>;
+  json(): Promise<Serializable>;
 
   /**
-   * Returns the browser version.
+   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
    */
-  version(): string;
+  ok(): boolean;
+
+  /**
+   * Contains the status code of the response (e.g., 200 for a success).
+   */
+  status(): number;
+
+  /**
+   * Contains the status text of the response (e.g. usually an "OK" for a success).
+   */
+  statusText(): string;
+
+  /**
+   * Returns the text representation of response body.
+   */
+  text(): Promise<string>;
+
+  /**
+   * Contains the URL of the response.
+   */
+  url(): string;
 
   [Symbol.asyncDispose](): Promise<void>;
 }
@@ -17295,8 +18671,8 @@ export interface BrowserServer {
  * Accurately simulating time-dependent behavior is essential for verifying the correctness of applications. Learn
  * more about [clock emulation](https://playwright.dev/docs/clock).
  *
- * Note that clock is installed for the entire {@link BrowserContext}, so the time in all the pages and iframes is
- * controlled by the same clock.
+ * Note that clock is installed for the entire [BrowserContext](https://playwright.dev/docs/api/class-browsercontext),
+ * so the time in all the pages and iframes is controlled by the same clock.
  */
 export interface Clock {
   /**
@@ -17358,6 +18734,19 @@ export interface Clock {
    * await page.clock.pauseAt('2020-02-02');
    * ```
    *
+   * For best results, install the clock before navigating the page and set it to a time slightly before the intended
+   * test time. This ensures that all timers run normally during page loading, preventing the page from getting stuck.
+   * Once the page has fully loaded, you can safely use
+   * [clock.pauseAt(time)](https://playwright.dev/docs/api/class-clock#clock-pause-at) to pause the clock.
+   *
+   * ```js
+   * // Initialize clock with some time before the test time and let the page load
+   * // naturally. `Date.now` will progress as the timers fire.
+   * await page.clock.install({ time: new Date('2024-12-10T08:00:00') });
+   * await page.goto('http://localhost:3333');
+   * await page.clock.pauseAt(new Date('2024-12-10T10:00:00'));
+   * ```
+   *
    * @param time Time to pause at.
    */
   pauseAt(time: number|string|Date): Promise<void>;
@@ -17385,6 +18774,10 @@ export interface Clock {
   /**
    * Makes `Date.now` and `new Date()` return fixed fake time at all times, keeps all the timers running.
    *
+   * Use this method for simple scenarios where you only need to test with a predefined time. For more advanced
+   * scenarios, use [clock.install([options])](https://playwright.dev/docs/api/class-clock#clock-install) instead. Read
+   * docs on [clock emulation](https://playwright.dev/docs/clock) to learn more.
+   *
    * **Usage**
    *
    * ```js
@@ -17398,7 +18791,8 @@ export interface Clock {
   setFixedTime(time: number|string|Date): Promise<void>;
 
   /**
-   * Sets current system time but does not trigger any timers.
+   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for
+   * example switching from summer to winter time, or changing time zones.
    *
    * **Usage**
    *
@@ -17414,7 +18808,7 @@ export interface Clock {
 }
 
 /**
- * {@link ConsoleMessage} objects are dispatched by page via the
+ * [ConsoleMessage](https://playwright.dev/docs/api/class-consolemessage) objects are dispatched by page via the
  * [page.on('console')](https://playwright.dev/docs/api/class-page#page-event-console) event. For each console message
  * logged in the page there will be corresponding event in the Playwright context.
  *
@@ -17475,12 +18869,7 @@ export interface ConsoleMessage {
    */
   text(): string;
 
-  /**
-   * One of the following values: `'log'`, `'debug'`, `'info'`, `'error'`, `'warning'`, `'dir'`, `'dirxml'`, `'table'`,
-   * `'trace'`, `'clear'`, `'startGroup'`, `'startGroupCollapsed'`, `'endGroup'`, `'assert'`, `'profile'`,
-   * `'profileEnd'`, `'count'`, `'timeEnd'`.
-   */
-  type(): string;
+  type(): "log"|"debug"|"info"|"error"|"warning"|"dir"|"dirxml"|"table"|"trace"|"clear"|"startGroup"|"startGroupCollapsed"|"endGroup"|"assert"|"profile"|"profileEnd"|"count"|"timeEnd";
 }
 
 /**
@@ -17527,8 +18916,10 @@ export interface Coverage {
    * Returns coverage is started
    *
    * **NOTE** Anonymous scripts are ones that don't have an associated url. These are scripts that are dynamically
-   * created on the page using `eval` or `new Function`. If `reportAnonymousScripts` is set to `true`, anonymous scripts
-   * will have `__playwright_evaluation_script__` as their URL.
+   * created on the page using `eval` or `new Function`. If
+   * [`reportAnonymousScripts`](https://playwright.dev/docs/api/class-coverage#coverage-start-js-coverage-option-report-anonymous-scripts)
+   * is set to `true`, anonymous scripts will have `__playwright_evaluation_script__` as their URL.
+   *
    * @param options
    */
   startJSCoverage(options?: {
@@ -17547,6 +18938,7 @@ export interface Coverage {
    * Returns the array of coverage reports for all stylesheets
    *
    * **NOTE** CSS Coverage doesn't include dynamically injected style tags without sourceURLs.
+   *
    */
   stopCSSCoverage(): Promise<Array<{
     /**
@@ -17580,6 +18972,7 @@ export interface Coverage {
    *
    * **NOTE** JavaScript Coverage doesn't include anonymous scripts by default. However, scripts with sourceURLs are
    * reported.
+   *
    */
   stopJSCoverage(): Promise<Array<{
     /**
@@ -17617,7 +19010,7 @@ export interface Coverage {
 }
 
 /**
- * {@link Dialog} objects are dispatched by page via the
+ * [Dialog](https://playwright.dev/docs/api/class-dialog) objects are dispatched by page via the
  * [page.on('dialog')](https://playwright.dev/docs/api/class-page#page-event-dialog) event.
  *
  * An example of using `Dialog` class:
@@ -17644,6 +19037,7 @@ export interface Coverage {
  * [dialog.dismiss()](https://playwright.dev/docs/api/class-dialog#dialog-dismiss) the dialog - otherwise the page
  * will [freeze](https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking) waiting for the
  * dialog, and actions like click will never finish.
+ *
  */
 export interface Dialog {
   /**
@@ -17679,7 +19073,7 @@ export interface Dialog {
 }
 
 /**
- * {@link Download} objects are dispatched by page via the
+ * [Download](https://playwright.dev/docs/api/class-download) objects are dispatched by page via the
  * [page.on('download')](https://playwright.dev/docs/api/class-page#page-event-download) event.
  *
  * All the downloaded files belonging to the browser context are deleted when the browser context is closed.
@@ -17815,7 +19209,8 @@ export interface Download {
  */
 export interface Electron {
   /**
-   * Launches electron application specified with the `executablePath`.
+   * Launches electron application specified with the
+   * [`executablePath`](https://playwright.dev/docs/api/class-electron#electron-launch-option-executable-path).
    * @param options
    */
   launch(options?: {
@@ -17835,7 +19230,8 @@ export interface Electron {
     bypassCSP?: boolean;
 
     /**
-     * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
+     * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+     * media feature, supported values are `'light'` and `'dark'`. See
      * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
      * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
      */
@@ -17894,10 +19290,11 @@ export interface Electron {
       origin?: string;
 
       /**
-       * This option only applies to the requests sent from corresponding {@link APIRequestContext} and does not affect
-       * requests sent from the browser. `'always'` - `Authorization` header with basic authentication credentials will be
-       * sent with the each API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response
-       * with `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+       * This option only applies to the requests sent from corresponding
+       * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+       * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+       * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+       * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
        */
       send?: "unauthorized"|"always";
     };
@@ -17954,8 +19351,9 @@ export interface Electron {
       mode?: "full"|"minimal";
 
       /**
-       * A glob or regex pattern to filter requests that are stored in the HAR. When a `baseURL` via the context options was
-       * provided and the passed URL is a path, it gets merged via the
+       * A glob or regex pattern to filter requests that are stored in the HAR. When a
+       * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+       * options was provided and the passed URL is a path, it gets merged via the
        * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
        */
       urlFilter?: string|RegExp;
@@ -18012,7 +19410,7 @@ export interface Electron {
 }
 
 /**
- * {@link FileChooser} objects are dispatched by the page in the
+ * [FileChooser](https://playwright.dev/docs/api/class-filechooser) objects are dispatched by the page in the
  * [page.on('filechooser')](https://playwright.dev/docs/api/class-page#page-event-file-chooser) event.
  *
  * ```js
@@ -18096,11 +19494,12 @@ export interface FileChooser {
 /**
  * FrameLocator represents a view to the `iframe` on the page. It captures the logic sufficient to retrieve the
  * `iframe` and locate elements in that iframe. FrameLocator can be created with either
+ * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame),
  * [page.frameLocator(selector)](https://playwright.dev/docs/api/class-page#page-frame-locator) or
  * [locator.frameLocator(selector)](https://playwright.dev/docs/api/class-locator#locator-frame-locator) method.
  *
  * ```js
- * const locator = page.frameLocator('#my-frame').getByText('Submit');
+ * const locator = page.locator('#my-frame').contentFrame().getByText('Submit');
  * await locator.click();
  * ```
  *
@@ -18111,25 +19510,29 @@ export interface FileChooser {
  *
  * ```js
  * // Throws if there are several frames in DOM:
- * await page.frameLocator('.result-frame').getByRole('button').click();
+ * await page.locator('.result-frame').contentFrame().getByRole('button').click();
  *
  * // Works because we explicitly tell locator to pick the first frame:
- * await page.frameLocator('.result-frame').first().getByRole('button').click();
+ * await page.locator('.result-frame').contentFrame().first().getByRole('button').click();
  * ```
  *
  * **Converting Locator to FrameLocator**
  *
- * If you have a {@link Locator} object pointing to an `iframe` it can be converted to {@link FrameLocator} using
+ * If you have a [Locator](https://playwright.dev/docs/api/class-locator) object pointing to an `iframe` it can be
+ * converted to [FrameLocator](https://playwright.dev/docs/api/class-framelocator) using
  * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame).
  *
  * **Converting FrameLocator to Locator**
  *
- * If you have a {@link FrameLocator} object it can be converted to {@link Locator} pointing to the same `iframe`
- * using [frameLocator.owner()](https://playwright.dev/docs/api/class-framelocator#frame-locator-owner).
+ * If you have a [FrameLocator](https://playwright.dev/docs/api/class-framelocator) object it can be converted to
+ * [Locator](https://playwright.dev/docs/api/class-locator) pointing to the same `iframe` using
+ * [frameLocator.owner()](https://playwright.dev/docs/api/class-framelocator#frame-locator-owner).
  */
 export interface FrameLocator {
   /**
    * Returns locator to the first matching frame.
+   * @deprecated Use [locator.first()](https://playwright.dev/docs/api/class-locator#locator-first) followed by
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame) instead.
    */
   first(): FrameLocator;
 
@@ -18279,12 +19682,15 @@ export interface FrameLocator {
      *
      * **NOTE** Unlike most other attributes, `disabled` is inherited through the DOM hierarchy. Learn more about
      * [`aria-disabled`](https://www.w3.org/TR/wai-aria-1.2/#aria-disabled).
+     *
      */
     disabled?: boolean;
 
     /**
-     * Whether `name` is matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when `name` is a
-     * regular expression. Note that exact match still trims whitespace.
+     * Whether [`name`](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role-option-name) is
+     * matched exactly: case-sensitive and whole-string. Defaults to false. Ignored when
+     * [`name`](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role-option-name) is a regular
+     * expression. Note that exact match still trims whitespace.
      */
     exact?: boolean;
 
@@ -18313,7 +19719,9 @@ export interface FrameLocator {
 
     /**
      * Option to match the [accessible name](https://w3c.github.io/accname/#dfn-accessible-name). By default, matching is
-     * case-insensitive and searches for a substring, use `exact` to control this behavior.
+     * case-insensitive and searches for a substring, use
+     * [`exact`](https://playwright.dev/docs/api/class-framelocator#frame-locator-get-by-role-option-exact) to control
+     * this behavior.
      *
      * Learn more about [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
      */
@@ -18454,6 +19862,8 @@ export interface FrameLocator {
 
   /**
    * Returns locator to the last matching frame.
+   * @deprecated Use [locator.last()](https://playwright.dev/docs/api/class-locator#locator-last) followed by
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame) instead.
    */
   last(): FrameLocator;
 
@@ -18476,8 +19886,8 @@ export interface FrameLocator {
      * `<article><content><div>Playwright</div></content></article>`. However, looking for `content` that has `article
      * div` will fail, because the inner locator must be relative and should not use any elements outside the `content`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     has?: Locator;
 
@@ -18485,8 +19895,8 @@ export interface FrameLocator {
      * Matches elements that do not contain an element that matches an inner locator. Inner locator is queried against the
      * outer one. For example, `article` that does not have `div` matches `<article><span>Playwright</span></article>`.
      *
-     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@link
-     * FrameLocator}s.
+     * Note that outer and inner locators must belong to the same frame. Inner locator must not contain
+     * [FrameLocator](https://playwright.dev/docs/api/class-framelocator)s.
      */
     hasNot?: Locator;
 
@@ -18506,15 +19916,18 @@ export interface FrameLocator {
 
   /**
    * Returns locator to the n-th matching frame. It's zero based, `nth(0)` selects the first frame.
+   * @deprecated Use [locator.nth(index)](https://playwright.dev/docs/api/class-locator#locator-nth) followed by
+   * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame) instead.
    * @param index
    */
   nth(index: number): FrameLocator;
 
   /**
-   * Returns a {@link Locator} object pointing to the same `iframe` as this frame locator.
+   * Returns a [Locator](https://playwright.dev/docs/api/class-locator) object pointing to the same `iframe` as this
+   * frame locator.
    *
-   * Useful when you have a {@link FrameLocator} object obtained somewhere, and later on would like to interact with the
-   * `iframe` element.
+   * Useful when you have a [FrameLocator](https://playwright.dev/docs/api/class-framelocator) object obtained
+   * somewhere, and later on would like to interact with the `iframe` element.
    *
    * For a reverse operation, use
    * [locator.contentFrame()](https://playwright.dev/docs/api/class-locator#locator-content-frame).
@@ -18522,7 +19935,7 @@ export interface FrameLocator {
    * **Usage**
    *
    * ```js
-   * const frameLocator = page.frameLocator('iframe[name="embedded"]');
+   * const frameLocator = page.locator('iframe[name="embedded"]').contentFrame();
    * // ...
    * const locator = frameLocator.owner();
    * await expect(locator).toBeVisible();
@@ -18568,10 +19981,7 @@ export interface FrameLocator {
  * An example to trigger select-all with the keyboard
  *
  * ```js
- * // on Windows and Linux
- * await page.keyboard.press('Control+A');
- * // on macOS
- * await page.keyboard.press('Meta+A');
+ * await page.keyboard.press('ControlOrMeta+A');
  * ```
  *
  */
@@ -18579,9 +19989,10 @@ export interface Keyboard {
   /**
    * Dispatches a `keydown` event.
    *
-   * `key` can specify the intended
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) can specify the intended
    * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
-   * to generate the text for. A superset of the `key` values can be found
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) values can be found
    * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
    *
    * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
@@ -18591,14 +20002,15 @@ export interface Keyboard {
    * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
    * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
    *
-   * Holding down `Shift` will type the text that corresponds to the `key` in the upper case.
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) in the upper case.
    *
-   * If `key` is a single character, it is case-sensitive, so the values `a` and `A` will generate different respective
-   * texts.
+   * If [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
    *
-   * If `key` is a modifier key, `Shift`, `Meta`, `Control`, or `Alt`, subsequent key presses will be sent with that
-   * modifier active. To release the modifier key, use
-   * [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
+   * If [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-down-option-key) is a modifier key, `Shift`,
+   * `Meta`, `Control`, or `Alt`, subsequent key presses will be sent with that modifier active. To release the modifier
+   * key, use [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
    *
    * After the key is pressed once, subsequent calls to
    * [keyboard.down(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-down) will have
@@ -18606,6 +20018,7 @@ export interface Keyboard {
    * use [keyboard.up(key)](https://playwright.dev/docs/api/class-keyboard#keyboard-up).
    *
    * **NOTE** Modifier keys DO influence `keyboard.down`. Holding down `Shift` will type the text in upper case.
+   *
    * @param key Name of the key to press or a character to generate, such as `ArrowLeft` or `a`.
    */
   down(key: string): Promise<void>;
@@ -18621,6 +20034,7 @@ export interface Keyboard {
    *
    * **NOTE** Modifier keys DO NOT effect `keyboard.insertText`. Holding down `Shift` will not type the text in upper
    * case.
+   *
    * @param text Sets input to the specified text value.
    */
   insertText(text: string): Promise<void>;
@@ -18629,9 +20043,10 @@ export interface Keyboard {
    * **NOTE** In most cases, you should use
    * [locator.press(key[, options])](https://playwright.dev/docs/api/class-locator#locator-press) instead.
    *
-   * `key` can specify the intended
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) can specify the intended
    * [keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
-   * to generate the text for. A superset of the `key` values can be found
+   * to generate the text for. A superset of the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) values can be found
    * [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values). Examples of the keys are:
    *
    * `F1` - `F12`, `Digit0`- `Digit9`, `KeyA`- `KeyZ`, `Backquote`, `Minus`, `Equal`, `Backslash`, `Backspace`, `Tab`,
@@ -18641,10 +20056,11 @@ export interface Keyboard {
    * Following modification shortcuts are also supported: `Shift`, `Control`, `Alt`, `Meta`, `ShiftLeft`,
    * `ControlOrMeta`. `ControlOrMeta` resolves to `Control` on Windows and Linux and to `Meta` on macOS.
    *
-   * Holding down `Shift` will type the text that corresponds to the `key` in the upper case.
+   * Holding down `Shift` will type the text that corresponds to the
+   * [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) in the upper case.
    *
-   * If `key` is a single character, it is case-sensitive, so the values `a` and `A` will generate different respective
-   * texts.
+   * If [`key`](https://playwright.dev/docs/api/class-keyboard#keyboard-press-option-key) is a single character, it is
+   * case-sensitive, so the values `a` and `A` will generate different respective texts.
    *
    * Shortcuts such as `key: "Control+o"`, `key: "Control++` or `key: "Control+Shift+T"` are supported as well. When
    * specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
@@ -18696,6 +20112,7 @@ export interface Keyboard {
    * **NOTE** Modifier keys DO NOT effect `keyboard.type`. Holding down `Shift` will not type the text in upper case.
    *
    * **NOTE** For characters that are not on a US keyboard, only an `input` event will be sent.
+   *
    * @param text A text to type into a focused element.
    * @param options
    */
@@ -18757,6 +20174,10 @@ export interface Logger {
 /**
  * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
  *
+ * **NOTE** If you want to debug where the mouse moved, you can use the [Trace viewer](https://playwright.dev/docs/trace-viewer-intro) or
+ * [Playwright Inspector](https://playwright.dev/docs/running-tests). A red dot showing the location of the mouse will be shown for every
+ * mouse action.
+ *
  * Every `page` object has its own Mouse, accessible with
  * [page.mouse](https://playwright.dev/docs/api/class-page#page-mouse).
  *
@@ -18871,6 +20292,7 @@ export interface Mouse {
    *
    * **NOTE** Wheel events may cause scrolling if they are not handled, and this method does not wait for the scrolling
    * to finish before returning.
+   *
    * @param deltaX Pixels to scroll horizontally.
    * @param deltaY Pixels to scroll vertically.
    */
@@ -18878,12 +20300,14 @@ export interface Mouse {
 }
 
 /**
- * This object can be used to launch or connect to Chromium, returning instances of {@link Browser}.
+ * This object can be used to launch or connect to Chromium, returning instances of
+ * [Browser](https://playwright.dev/docs/api/class-browser).
  */
 export const chromium: BrowserType;
 
 /**
- * This object can be used to launch or connect to Firefox, returning instances of {@link Browser}.
+ * This object can be used to launch or connect to Firefox, returning instances of
+ * [Browser](https://playwright.dev/docs/api/class-browser).
  */
 export const firefox: BrowserType;
 
@@ -18899,13 +20323,14 @@ export const request: APIRequest;
 export const selectors: Selectors;
 
 /**
- * This object can be used to launch or connect to WebKit, returning instances of {@link Browser}.
+ * This object can be used to launch or connect to WebKit, returning instances of
+ * [Browser](https://playwright.dev/docs/api/class-browser).
  */
 export const webkit: BrowserType;
 
 /**
- * Whenever the page sends a request for a network resource the following sequence of events are emitted by {@link
- * Page}:
+ * Whenever the page sends a request for a network resource the following sequence of events are emitted by
+ * [Page](https://playwright.dev/docs/api/class-page):
  * - [page.on('request')](https://playwright.dev/docs/api/class-page#page-event-request) emitted when the request is
  *   issued by the page.
  * - [page.on('response')](https://playwright.dev/docs/api/class-page#page-event-response) emitted when/if the
@@ -18951,7 +20376,7 @@ export interface Request {
   };
 
   /**
-   * Returns the {@link Frame} that initiated this request.
+   * Returns the [Frame](https://playwright.dev/docs/api/class-frame) that initiated this request.
    *
    * **Usage**
    *
@@ -19046,9 +20471,10 @@ export interface Request {
   /**
    * Request that was redirected by the server to this one, if any.
    *
-   * When the server responds with a redirect, Playwright creates a new {@link Request} object. The two requests are
-   * connected by `redirectedFrom()` and `redirectedTo()` methods. When multiple server redirects has happened, it is
-   * possible to construct the whole redirect chain by repeatedly calling `redirectedFrom()`.
+   * When the server responds with a redirect, Playwright creates a new
+   * [Request](https://playwright.dev/docs/api/class-request) object. The two requests are connected by
+   * `redirectedFrom()` and `redirectedTo()` methods. When multiple server redirects has happened, it is possible to
+   * construct the whole redirect chain by repeatedly calling `redirectedFrom()`.
    *
    * **Usage**
    *
@@ -19092,12 +20518,13 @@ export interface Request {
   resourceType(): string;
 
   /**
-   * Returns the matching {@link Response} object, or `null` if the response was not received due to error.
+   * Returns the matching [Response](https://playwright.dev/docs/api/class-response) object, or `null` if the response
+   * was not received due to error.
    */
   response(): Promise<null|Response>;
 
   /**
-   * The Service {@link Worker} that is performing the request.
+   * The Service [Worker](https://playwright.dev/docs/api/class-worker) that is performing the request.
    *
    * **Details**
    *
@@ -19213,7 +20640,7 @@ export interface Request {
 }
 
 /**
- * {@link Response} class represents responses which are received by page.
+ * [Response](https://playwright.dev/docs/api/class-response) class represents responses which are received by page.
  */
 export interface Response {
   /**
@@ -19232,7 +20659,7 @@ export interface Response {
   finished(): Promise<null|Error>;
 
   /**
-   * Returns the {@link Frame} that initiated this response.
+   * Returns the [Frame](https://playwright.dev/docs/api/class-frame) that initiated this response.
    */
   frame(): Frame;
 
@@ -19294,7 +20721,7 @@ export interface Response {
   ok(): boolean;
 
   /**
-   * Returns the matching {@link Request} object.
+   * Returns the matching [Request](https://playwright.dev/docs/api/class-request) object.
    */
   request(): Request;
 
@@ -19395,7 +20822,7 @@ export interface Route {
   abort(errorCode?: string): Promise<void>;
 
   /**
-   * Continues route's request with optional overrides.
+   * Sends route's request to the network with optional overrides.
    *
    * **Usage**
    *
@@ -19411,13 +20838,24 @@ export interface Route {
    * });
    * ```
    *
-   * **Details**
+   * **Details**
+   *
+   * The [`headers`](https://playwright.dev/docs/api/class-route#route-continue-option-headers) option applies to both
+   * the routed request and any redirects it initiates. However,
+   * [`url`](https://playwright.dev/docs/api/class-route#route-continue-option-url),
+   * [`method`](https://playwright.dev/docs/api/class-route#route-continue-option-method), and
+   * [`postData`](https://playwright.dev/docs/api/class-route#route-continue-option-post-data) only apply to the
+   * original request and are not carried over to redirected requests.
+   *
+   * [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) will immediately send the
+   * request to the network, other matching handlers won't be invoked. Use
+   * [route.fallback([options])](https://playwright.dev/docs/api/class-route#route-fallback) If you want next matching
+   * handler in the chain to be invoked.
+   *
+   * **NOTE** The `Cookie` header cannot be overridden using this method. If a value is provided, it will be ignored,
+   * and the cookie will be loaded from the browser's cookie store. To set custom cookies, use
+   * [browserContext.addCookies(cookies)](https://playwright.dev/docs/api/class-browsercontext#browser-context-add-cookies).
    *
-   * Note that any overrides such as `url` or `headers` only apply to the request being routed. If this request results
-   * in a redirect, overrides will not be applied to the new redirected request. If you want to propagate a header
-   * through redirects, use the combination of
-   * [route.fetch([options])](https://playwright.dev/docs/api/class-route#route-fetch) and
-   * [route.fulfill([options])](https://playwright.dev/docs/api/class-route#route-fulfill) instead.
    * @param options
    */
   continue(options?: {
@@ -19443,13 +20881,17 @@ export interface Route {
   }): Promise<void>;
 
   /**
+   * Continues route's request with optional overrides. The method is similar to
+   * [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) with the difference that
+   * other matching handlers will be invoked before sending the request.
+   *
+   * **Usage**
+   *
    * When several routes match the given pattern, they run in the order opposite to their registration. That way the
    * last registered route can always override all the previous ones. In the example below, request will be handled by
    * the bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
    * registered route.
    *
-   * **Usage**
-   *
    * ```js
    * await page.route('**\/*', async route => {
    *   // Runs last.
@@ -19505,6 +20947,8 @@ export interface Route {
    * });
    * ```
    *
+   * Use [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) to immediately send the
+   * request to the network, other matching handlers won't be invoked in that case.
    * @param options
    */
   fallback(options?: {
@@ -19547,9 +20991,11 @@ export interface Route {
    *
    * **Details**
    *
-   * Note that `headers` option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply `headers` to the original request, but not to redirects, look into
-   * [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue) instead.
+   * Note that [`headers`](https://playwright.dev/docs/api/class-route#route-fetch-option-headers) option will apply to
+   * the fetched request as well as any redirects initiated by it. If you want to only apply
+   * [`headers`](https://playwright.dev/docs/api/class-route#route-fetch-option-headers) to the original request, but
+   * not to redirects, look into [route.continue([options])](https://playwright.dev/docs/api/class-route#route-continue)
+   * instead.
    * @param options
    */
   fetch(options?: {
@@ -19564,6 +21010,12 @@ export interface Route {
      */
     maxRedirects?: number;
 
+    /**
+     * Maximum number of times network errors should be retried. Currently only `ECONNRESET` error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to `0` - no retries.
+     */
+    maxRetries?: number;
+
     /**
      * If set changes the request method (e.g. GET or POST).
      */
@@ -19640,8 +21092,8 @@ export interface Route {
     path?: string;
 
     /**
-     * {@link APIResponse} to fulfill route's request with. Individual fields of the response (such as headers) can be
-     * overridden using fulfill options.
+     * [APIResponse](https://playwright.dev/docs/api/class-apiresponse) to fulfill route's request with. Individual fields
+     * of the response (such as headers) can be overridden using fulfill options.
      */
     response?: APIResponse;
 
@@ -19741,13 +21193,19 @@ export interface Selectors {
 /**
  * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on
  * the touchscreen can only be used in browser contexts that have been initialized with `hasTouch` set to true.
+ *
+ * This class is limited to emulating tap gestures. For examples of other gestures simulated by manually dispatching
+ * touch events, see the [emulating legacy touch events](https://playwright.dev/docs/touch-events) page.
  */
 export interface Touchscreen {
   /**
-   * Dispatches a `touchstart` and `touchend` event with a single touch at the position (`x`,`y`).
+   * Dispatches a `touchstart` and `touchend` event with a single touch at the position
+   * ([`x`](https://playwright.dev/docs/api/class-touchscreen#touchscreen-tap-option-x),[`y`](https://playwright.dev/docs/api/class-touchscreen#touchscreen-tap-option-y)).
    *
    * **NOTE** [page.tap(selector[, options])](https://playwright.dev/docs/api/class-page#page-tap) the method will throw
-   * if `hasTouch` option of the browser context is false.
+   * if [`hasTouch`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-has-touch) option of the
+   * browser context is false.
+   *
    * @param x X coordinate relative to the main frame's viewport in CSS pixels.
    * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    */
@@ -19758,6 +21216,15 @@ export interface Touchscreen {
  * API for collecting and saving Playwright traces. Playwright traces can be opened in
  * [Trace Viewer](https://playwright.dev/docs/trace-viewer) after Playwright script runs.
  *
+ * **NOTE** You probably want to
+ * [enable tracing in your config file](https://playwright.dev/docs/api/class-testoptions#test-options-trace) instead
+ * of using `context.tracing`.
+ *
+ * The `context.tracing` API captures browser operations and network activity, but it doesn't record test assertions
+ * (like `expect` calls). We recommend
+ * [enabling tracing through Playwright Test configuration](https://playwright.dev/docs/api/class-testoptions#test-options-trace),
+ * which includes those assertions and provides a more complete trace for debugging test failures.
+ *
  * Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
  *
  * ```js
@@ -19766,20 +21233,70 @@ export interface Touchscreen {
  * await context.tracing.start({ screenshots: true, snapshots: true });
  * const page = await context.newPage();
  * await page.goto('https://playwright.dev');
+ * expect(page.url()).toBe('https://playwright.dev');
  * await context.tracing.stop({ path: 'trace.zip' });
  * ```
  *
  */
 export interface Tracing {
+  /**
+   * **NOTE** Use `test.step` instead when available.
+   *
+   * Creates a new group within the trace, assigning any subsequent API calls to this group, until
+   * [tracing.groupEnd()](https://playwright.dev/docs/api/class-tracing#tracing-group-end) is called. Groups can be
+   * nested and will be visible in the trace viewer.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // use test.step instead
+   * await test.step('Log in', async () => {
+   *   // ...
+   * });
+   * ```
+   *
+   * @param name Group name shown in the trace viewer.
+   * @param options
+   */
+  group(name: string, options?: {
+    /**
+     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the
+     * [tracing.group(name[, options])](https://playwright.dev/docs/api/class-tracing#tracing-group) call.
+     */
+    location?: {
+      file: string;
+
+      line?: number;
+
+      column?: number;
+    };
+  }): Promise<void>;
+
+  /**
+   * Closes the last group created by
+   * [tracing.group(name[, options])](https://playwright.dev/docs/api/class-tracing#tracing-group).
+   */
+  groupEnd(): Promise<void>;
+
   /**
    * Start tracing.
    *
+   * **NOTE** You probably want to
+   * [enable tracing in your config file](https://playwright.dev/docs/api/class-testoptions#test-options-trace) instead
+   * of using `Tracing.start`.
+   *
+   * The `context.tracing` API captures browser operations and network activity, but it doesn't record test assertions
+   * (like `expect` calls). We recommend
+   * [enabling tracing through Playwright Test configuration](https://playwright.dev/docs/api/class-testoptions#test-options-trace),
+   * which includes those assertions and provides a more complete trace for debugging test failures.
+   *
    * **Usage**
    *
    * ```js
    * await context.tracing.start({ screenshots: true, snapshots: true });
    * const page = await context.newPage();
    * await page.goto('https://playwright.dev');
+   * expect(page.url()).toBe('https://playwright.dev');
    * await context.tracing.stop({ path: 'trace.zip' });
    * ```
    *
@@ -19788,7 +21305,8 @@ export interface Tracing {
   start(options?: {
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the
-     * `tracesDir` folder specified in
+     * [`tracesDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-traces-dir) directory
+     * specified in
      * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). To specify
      * the final trace zip file name, you need to pass `path` option to
      * [tracing.stop([options])](https://playwright.dev/docs/api/class-tracing#tracing-stop) instead.
@@ -19819,7 +21337,8 @@ export interface Tracing {
   }): Promise<void>;
 
   /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@link BrowserContext}, use
+   * Start a new trace chunk. If you'd like to record multiple traces on the same
+   * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext), use
    * [tracing.start([options])](https://playwright.dev/docs/api/class-tracing#tracing-start) once, and then create
    * multiple trace chunks with
    * [tracing.startChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-start-chunk) and
@@ -19848,7 +21367,8 @@ export interface Tracing {
   startChunk(options?: {
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the
-     * `tracesDir` folder specified in
+     * [`tracesDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-traces-dir) directory
+     * specified in
      * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). To specify
      * the final trace zip file name, you need to pass `path` option to
      * [tracing.stopChunk([options])](https://playwright.dev/docs/api/class-tracing#tracing-stop-chunk) instead.
@@ -19917,7 +21437,8 @@ export interface Video {
 }
 
 /**
- * {@link WebError} class represents an unhandled exception thrown in the page. It is dispatched via the
+ * [WebError](https://playwright.dev/docs/api/class-weberror) class represents an unhandled exception thrown in the
+ * page. It is dispatched via the
  * [browserContext.on('weberror')](https://playwright.dev/docs/api/class-browsercontext#browser-context-event-web-error)
  * event.
  *
@@ -19945,7 +21466,11 @@ export interface WebError {
 }
 
 /**
- * The {@link WebSocket} class represents websocket connections in the page.
+ * The [WebSocket](https://playwright.dev/docs/api/class-websocket) class represents WebSocket connections within a
+ * page. It provides the ability to inspect and manipulate the data being transmitted and received.
+ *
+ * If you want to intercept or modify WebSocket frames, consider using
+ * [WebSocketRoute](https://playwright.dev/docs/api/class-websocketroute).
  */
 export interface WebSocket {
   /**
@@ -20190,759 +21715,802 @@ export interface WebSocket {
 
 }
 
-export interface BrowserContextOptions {
+interface AccessibilitySnapshotOptions {
   /**
-   * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
+   * Prune uninteresting nodes from the tree. Defaults to `true`.
    */
-  acceptDownloads?: boolean;
+  interestingOnly?: boolean;
 
   /**
-   * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
-   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
-   * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
-   * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
-   * or
-   * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
-   * it takes the base URL in consideration by using the
-   * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
-   * Unset by default. Examples:
-   * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
-   * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
-   *   `http://localhost:3000/foo/bar.html`
-   * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
-   *   `http://localhost:3000/bar.html`
+   * The root DOM element for the snapshot. Defaults to the whole page.
    */
-  baseURL?: string;
+  root?: ElementHandle;
+}
 
+export interface LaunchOptions {
   /**
-   * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
+   * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+   *
+   * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
+   * [here](https://peter.sh/experiments/chromium-command-line-switches/).
    */
-  bypassCSP?: boolean;
+  args?: Array<string>;
 
   /**
-   * TLS Client Authentication allows the server to request a client certificate and verify it.
-   *
-   * **Details**
+   * Browser distribution channel.
    *
-   * An array of client certificates to be used. Each certificate object must have both `certPath` and `keyPath` or a
-   * single `pfxPath` to load the client certificate. Optionally, `passphrase` property should be provided if the
-   * certficiate is encrypted. The `origin` property should be provided with an exact match to the request origin that
-   * the certificate is valid for.
+   * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
    *
-   * **NOTE** Using Client Certificates in combination with Proxy Servers is not supported.
+   * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+   * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+   */
+  channel?: string;
+
+  /**
+   * Enable Chromium sandboxing. Defaults to `false`.
+   */
+  chromiumSandbox?: boolean;
+
+  /**
+   * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
+   * [`headless`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-headless) option will be
+   * set `false`.
+   * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
+   */
+  devtools?: boolean;
+
+  /**
+   * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
+   * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
+   * created in is closed.
+   */
+  downloadsPath?: string;
+
+  /**
+   * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
+   */
+  env?: { [key: string]: string|number|boolean; };
+
+  /**
+   * Path to a browser executable to run instead of the bundled one. If
+   * [`executablePath`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-executable-path) is
+   * a relative path, then it is resolved relative to the current working directory. Note that Playwright only works
+   * with the bundled Chromium, Firefox or WebKit, use at your own risk.
+   */
+  executablePath?: string;
+
+  /**
+   * Firefox user preferences. Learn more about the Firefox user preferences at
+   * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
    *
-   * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
-   * work by replacing `localhost` with `local.playwright`.
+   * You can also provide a path to a custom [`policies.json` file](https://mozilla.github.io/policy-templates/) via
+   * `PLAYWRIGHT_FIREFOX_POLICIES_JSON` environment variable.
    */
-  clientCertificates?: Array<{
-    /**
-     * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
-     */
-    origin: string;
+  firefoxUserPrefs?: { [key: string]: string|number|boolean; };
+
+  /**
+   * Close the browser process on SIGHUP. Defaults to `true`.
+   */
+  handleSIGHUP?: boolean;
+
+  /**
+   * Close the browser process on Ctrl-C. Defaults to `true`.
+   */
+  handleSIGINT?: boolean;
 
+  /**
+   * Close the browser process on SIGTERM. Defaults to `true`.
+   */
+  handleSIGTERM?: boolean;
+
+  /**
+   * Whether to run browser in headless mode. More details for
+   * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
+   * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+   * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+   * `true`.
+   */
+  headless?: boolean;
+
+  /**
+   * If `true`, Playwright does not pass its own configurations args and only uses the ones from
+   * [`args`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-args). If an array is given,
+   * then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
+   */
+  ignoreDefaultArgs?: boolean|Array<string>;
+
+  /**
+   * Logger sink for Playwright logging.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+   */
+  logger?: Logger;
+
+  /**
+   * Network proxy settings.
+   */
+  proxy?: {
     /**
-     * Path to the file with the certificate in PEM format.
+     * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+     * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
      */
-    certPath?: string;
+    server: string;
 
     /**
-     * Path to the file with the private key in PEM format.
+     * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
      */
-    keyPath?: string;
+    bypass?: string;
 
     /**
-     * Path to the PFX or PKCS12 encoded private key and certificate chain.
+     * Optional username to use if HTTP proxy requires authentication.
      */
-    pfxPath?: string;
+    username?: string;
 
     /**
-     * Passphrase for the private key (PEM or PFX).
+     * Optional password to use if HTTP proxy requires authentication.
      */
-    passphrase?: string;
-  }>;
+    password?: string;
+  };
 
   /**
-   * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
-   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-   * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+   * on.
    */
-  colorScheme?: null|"light"|"dark"|"no-preference";
+  slowMo?: number;
 
   /**
-   * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
-   * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
+   * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
+   * to disable timeout.
    */
-  deviceScaleFactor?: number;
+  timeout?: number;
 
   /**
-   * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+   * If specified, traces are saved into this directory.
    */
-  extraHTTPHeaders?: { [key: string]: string; };
+  tracesDir?: string;
+}
 
+export interface ConnectOverCDPOptions {
   /**
-   * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
-   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-   * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
+   * @deprecated Use the first argument instead.
    */
-  forcedColors?: null|"active"|"none";
+  endpointURL?: string;
 
-  geolocation?: Geolocation;
+  /**
+   * Additional HTTP headers to be sent with connect request. Optional.
+   */
+  headers?: { [key: string]: string; };
 
   /**
-   * Specifies if viewport supports touch events. Defaults to false. Learn more about
-   * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+   * Logger sink for Playwright logging. Optional.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
    */
-  hasTouch?: boolean;
+  logger?: Logger;
 
   /**
-   * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
-   * origin is specified, the username and password are sent to any servers upon unauthorized responses.
+   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+   * on. Defaults to 0.
    */
-  httpCredentials?: HTTPCredentials;
+  slowMo?: number;
+
+  /**
+   * Maximum time in milliseconds to wait for the connection to be established. Defaults to `30000` (30 seconds). Pass
+   * `0` to disable timeout.
+   */
+  timeout?: number;
+}
+
+export interface ConnectOptions {
+  /**
+   * This option exposes network available on the connecting client to the browser being connected to. Consists of a
+   * list of rules separated by comma.
+   *
+   * Available rules:
+   * 1. Hostname pattern, for example: `example.com`, `*.org:99`, `x.*.y.com`, `*foo.org`.
+   * 1. IP literal, for example: `127.0.0.1`, `0.0.0.0:99`, `[::1]`, `[0:0::1]:99`.
+   * 1. `<loopback>` that matches local loopback interfaces: `localhost`, `*.localhost`, `127.0.0.1`, `[::1]`.
+   *
+   * Some common examples:
+   * 1. `"*"` to expose all network.
+   * 1. `"<loopback>"` to expose localhost network.
+   * 1. `"*.test.internal-domain,*.staging.internal-domain,<loopback>"` to expose test/staging deployments and
+   *    localhost.
+   */
+  exposeNetwork?: string;
+
+  /**
+   * Additional HTTP headers to be sent with web socket connect request. Optional.
+   */
+  headers?: { [key: string]: string; };
+
+  /**
+   * Logger sink for Playwright logging. Optional.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
+   */
+  logger?: Logger;
+
+  /**
+   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
+   * on. Defaults to 0.
+   */
+  slowMo?: number;
+
+  /**
+   * Maximum time in milliseconds to wait for the connection to be established. Defaults to `0` (no timeout).
+   */
+  timeout?: number;
+}
 
+export interface LocatorScreenshotOptions {
   /**
-   * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+   * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
+   * treatment depending on their duration:
+   * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
+   * - infinite animations are canceled to initial state, and then played over after the screenshot.
+   *
+   * Defaults to `"allow"` that leaves animations untouched.
    */
-  ignoreHTTPSErrors?: boolean;
+  animations?: "disabled"|"allow";
 
   /**
-   * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
-   * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
-   * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
+   * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
+   * changed.  Defaults to `"hide"`.
    */
-  isMobile?: boolean;
+  caret?: "hide"|"initial";
 
   /**
-   * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
-   * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+   * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
+   * box `#FF00FF` (customized by
+   * [`maskColor`](https://playwright.dev/docs/api/class-locator#locator-screenshot-option-mask-color)) that completely
+   * covers its bounding box. The mask is also applied to invisible elements, see
+   * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
    */
-  javaScriptEnabled?: boolean;
+  mask?: Array<Locator>;
 
   /**
-   * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
-   * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
-   * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
+   * Specify the color of the overlay box for masked elements, in
+   * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
    */
-  locale?: string;
+  maskColor?: string;
 
   /**
-   * Logger sink for Playwright logging.
+   * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
+   * Defaults to `false`.
    */
-  logger?: Logger;
+  omitBackground?: boolean;
 
   /**
-   * Whether to emulate network being offline. Defaults to `false`. Learn more about
-   * [network emulation](https://playwright.dev/docs/emulation#offline).
+   * The file path to save the image to. The screenshot type will be inferred from file extension. If
+   * [`path`](https://playwright.dev/docs/api/class-locator#locator-screenshot-option-path) is a relative path, then it
+   * is resolved relative to the current working directory. If no path is provided, the image won't be saved to the
+   * disk.
    */
-  offline?: boolean;
+  path?: string;
 
   /**
-   * A list of permissions to grant to all pages in this context. See
-   * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
-   * for more details. Defaults to none.
+   * The quality of the image, between 0-100. Not applicable to `png` images.
    */
-  permissions?: Array<string>;
+  quality?: number;
 
   /**
-   * Network proxy settings to use with this context. Defaults to none.
+   * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
+   * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
+   * screenshots of high-dpi devices will be twice as large or even larger.
    *
-   * **NOTE** For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If
-   * all contexts override the proxy, global proxy will be never used and can be any string, for example `launch({
-   * proxy: { server: 'http://per-context' } })`.
+   * Defaults to `"device"`.
    */
-  proxy?: {
-    /**
-     * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
-     * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
-     */
-    server: string;
-
-    /**
-     * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
-     */
-    bypass?: string;
-
-    /**
-     * Optional username to use if HTTP proxy requires authentication.
-     */
-    username?: string;
-
-    /**
-     * Optional password to use if HTTP proxy requires authentication.
-     */
-    password?: string;
-  };
+  scale?: "css"|"device";
 
   /**
-   * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
-   * If not specified, the HAR is not recorded. Make sure to await
-   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-   * the HAR to be saved.
+   * Text of the stylesheet to apply while making the screenshot. This is where you can hide dynamic elements, make
+   * elements invisible or change their properties to help you creating repeatable screenshots. This stylesheet pierces
+   * the Shadow DOM and applies to the inner frames.
    */
-  recordHar?: {
-    /**
-     * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
-     * `content` policy instead.
-     */
-    omitContent?: boolean;
-
-    /**
-     * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
-     * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
-     * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
-     * files and to `embed` for all other file extensions.
-     */
-    content?: "omit"|"embed"|"attach";
-
-    /**
-     * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
-     * default.
-     */
-    path: string;
-
-    /**
-     * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
-     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
-     */
-    mode?: "full"|"minimal";
-
-    /**
-     * A glob or regex pattern to filter requests that are stored in the HAR. When a `baseURL` via the context options was
-     * provided and the passed URL is a path, it gets merged via the
-     * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
-     */
-    urlFilter?: string|RegExp;
-  };
+  style?: string;
 
   /**
-   * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
-   * Make sure to await
-   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
-   * videos to be saved.
+   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+   * option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
    */
-  recordVideo?: {
-    /**
-     * Path to the directory to put videos into.
-     */
-    dir: string;
-
-    /**
-     * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
-     * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
-     * each page will be scaled down if necessary to fit the specified size.
-     */
-    size?: {
-      /**
-       * Video frame width.
-       */
-      width: number;
-
-      /**
-       * Video frame height.
-       */
-      height: number;
-    };
-  };
+  timeout?: number;
 
   /**
-   * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
-   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-   * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
+   * Specify screenshot type, defaults to `png`.
    */
-  reducedMotion?: null|"reduce"|"no-preference";
+  type?: "png"|"jpeg";
+}
 
+interface ElementHandleWaitForSelectorOptions {
   /**
-   * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
-   * `viewport` is set.
+   * Defaults to `'visible'`. Can be either:
+   * - `'attached'` - wait for element to be present in DOM.
+   * - `'detached'` - wait for element to not be present in DOM.
+   * - `'visible'` - wait for element to have non-empty bounding box and no `visibility:hidden`. Note that element
+   *   without any content or with `display:none` has an empty bounding box and is not considered visible.
+   * - `'hidden'` - wait for element to be either detached from DOM, or have an empty bounding box or
+   *   `visibility:hidden`. This is opposite to the `'visible'` option.
    */
-  screen?: {
-    /**
-     * page width in pixels.
-     */
-    width: number;
-
-    /**
-     * page height in pixels.
-     */
-    height: number;
-  };
+  state?: "attached"|"detached"|"visible"|"hidden";
 
   /**
-   * Whether to allow sites to register Service workers. Defaults to `'allow'`.
-   * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
-   *   registered.
-   * - `'block'`: Playwright will block all registration of Service Workers.
+   * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
+   * element, the call throws an exception.
    */
-  serviceWorkers?: "allow"|"block";
+  strict?: boolean;
 
   /**
-   * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
-   *
-   * Populates context with given storage state. This option can be used to initialize context with logged-in
-   * information obtained via
-   * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
+   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
+   * option in the config, or by using the
+   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
+   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
    */
-  storageState?: string|{
-    /**
-     * Cookies to set for context
-     */
-    cookies: Array<{
-      name: string;
-
-      value: string;
-
-      /**
-       * Domain and path are required. For the cookie to apply to all subdomains as well, prefix domain with a dot, like
-       * this: ".example.com"
-       */
-      domain: string;
-
-      /**
-       * Domain and path are required
-       */
-      path: string;
-
-      /**
-       * Unix time in seconds.
-       */
-      expires: number;
-
-      httpOnly: boolean;
-
-      secure: boolean;
-
-      /**
-       * sameSite flag
-       */
-      sameSite: "Strict"|"Lax"|"None";
-    }>;
-
-    /**
-     * localStorage to set for context
-     */
-    origins: Array<{
-      origin: string;
-
-      localStorage: Array<{
-        name: string;
-
-        value: string;
-      }>;
-    }>;
-  };
+  timeout?: number;
+}
 
+export interface BrowserContextOptions {
   /**
-   * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
-   * selectors that imply single target DOM element will throw when more than one element matches the selector. This
-   * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See {@link Locator} to
-   * learn more about the strict mode.
+   * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
    */
-  strictSelectors?: boolean;
+  acceptDownloads?: boolean;
 
   /**
-   * Changes the timezone of the context. See
-   * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
-   * for a list of supported timezone IDs. Defaults to the system timezone.
+   * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+   * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+   * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+   * or
+   * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+   * it takes the base URL in consideration by using the
+   * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+   * Unset by default. Examples:
+   * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+   * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+   *   `http://localhost:3000/foo/bar.html`
+   * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+   *   `http://localhost:3000/bar.html`
    */
-  timezoneId?: string;
+  baseURL?: string;
 
   /**
-   * Specific user agent to use in this context.
+   * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
    */
-  userAgent?: string;
+  bypassCSP?: boolean;
 
   /**
-   * @deprecated Use `recordVideo` instead.
+   * TLS Client Authentication allows the server to request a client certificate and verify it.
+   *
+   * **Details**
+   *
+   * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+   * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+   * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+   * with an exact match to the request origin that the certificate is valid for.
+   *
+   * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+   * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+   * does not match any of the domains you plan to visit.
+   *
+   * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+   * work by replacing `localhost` with `local.playwright`.
+   *
    */
-  videoSize?: {
+  clientCertificates?: Array<{
     /**
-     * Video frame width.
+     * Exact origin that the certificate is valid for. Origin includes `https` protocol, a hostname and optionally a port.
      */
-    width: number;
+    origin: string;
 
     /**
-     * Video frame height.
+     * Path to the file with the certificate in PEM format.
      */
-    height: number;
-  };
+    certPath?: string;
 
-  /**
-   * @deprecated Use `recordVideo` instead.
-   */
-  videosPath?: string;
+    /**
+     * Direct value of the certificate in PEM format.
+     */
+    cert?: Buffer;
 
-  /**
-   * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
-   * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
-   *
-   * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
-   * by the operating system. It makes the execution of the tests non-deterministic.
-   */
-  viewport?: null|ViewportSize;
-}
+    /**
+     * Path to the file with the private key in PEM format.
+     */
+    keyPath?: string;
 
-export interface ViewportSize {
-  /**
-   * page width in pixels.
-   */
-  width: number;
+    /**
+     * Direct value of the private key in PEM format.
+     */
+    key?: Buffer;
 
-  /**
-   * page height in pixels.
-   */
-  height: number;
-}
+    /**
+     * Path to the PFX or PKCS12 encoded private key and certificate chain.
+     */
+    pfxPath?: string;
 
-export interface HTTPCredentials {
-  username: string;
+    /**
+     * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+     */
+    pfx?: Buffer;
 
-  password: string;
+    /**
+     * Passphrase for the private key (PEM or PFX).
+     */
+    passphrase?: string;
+  }>;
 
   /**
-   * Restrain sending http credentials on specific origin (scheme://host:port).
+   * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+   * media feature, supported values are `'light'` and `'dark'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
    */
-  origin?: string;
+  colorScheme?: null|"light"|"dark"|"no-preference";
 
   /**
-   * This option only applies to the requests sent from corresponding {@link APIRequestContext} and does not affect
-   * requests sent from the browser. `'always'` - `Authorization` header with basic authentication credentials will be
-   * sent with the each API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response
-   * with `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
+   * Emulates `'prefers-contrast'` media feature, supported values are `'no-preference'`, `'more'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
    */
-  send?: "unauthorized"|"always";
-}
+  contrast?: null|"no-preference"|"more";
 
-export interface Geolocation {
   /**
-   * Latitude between -90 and 90.
+   * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+   * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
    */
-  latitude: number;
+  deviceScaleFactor?: number;
 
   /**
-   * Longitude between -180 and 180.
+   * An object containing additional HTTP headers to be sent with every request. Defaults to none.
    */
-  longitude: number;
+  extraHTTPHeaders?: { [key: string]: string; };
 
   /**
-   * Non-negative accuracy value. Defaults to `0`.
+   * Emulates `'forced-colors'` media feature, supported values are `'active'`, `'none'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'none'`.
    */
-  accuracy?: number;
-}
+  forcedColors?: null|"active"|"none";
 
-interface AccessibilitySnapshotOptions {
-  /**
-   * Prune uninteresting nodes from the tree. Defaults to `true`.
-   */
-  interestingOnly?: boolean;
+  geolocation?: Geolocation;
 
   /**
-   * The root DOM element for the snapshot. Defaults to the whole page.
+   * Specifies if viewport supports touch events. Defaults to false. Learn more about
+   * [mobile emulation](https://playwright.dev/docs/emulation#devices).
    */
-  root?: ElementHandle;
-}
+  hasTouch?: boolean;
 
-export interface LaunchOptions {
   /**
-   * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
-   *
-   * Additional arguments to pass to the browser instance. The list of Chromium flags can be found
-   * [here](https://peter.sh/experiments/chromium-command-line-switches/).
+   * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+   * origin is specified, the username and password are sent to any servers upon unauthorized responses.
    */
-  args?: Array<string>;
+  httpCredentials?: HTTPCredentials;
 
   /**
-   * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary",
-   * "msedge", "msedge-beta", "msedge-dev", "msedge-canary". Read more about using
-   * [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+   * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
    */
-  channel?: string;
+  ignoreHTTPSErrors?: boolean;
 
   /**
-   * Enable Chromium sandboxing. Defaults to `false`.
+   * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+   * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+   * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
    */
-  chromiumSandbox?: boolean;
+  isMobile?: boolean;
 
   /**
-   * **Chromium-only** Whether to auto-open a Developer Tools panel for each tab. If this option is `true`, the
-   * `headless` option will be set `false`.
-   * @deprecated Use [debugging tools](https://playwright.dev/docs/debug) instead.
+   * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+   * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
    */
-  devtools?: boolean;
+  javaScriptEnabled?: boolean;
 
   /**
-   * If specified, accepted downloads are downloaded into this directory. Otherwise, temporary directory is created and
-   * is deleted when browser is closed. In either case, the downloads are deleted when the browser context they were
-   * created in is closed.
+   * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+   * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
+   * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
    */
-  downloadsPath?: string;
+  locale?: string;
 
   /**
-   * Specify environment variables that will be visible to the browser. Defaults to `process.env`.
+   * Logger sink for Playwright logging.
+   * @deprecated The logs received by the logger are incomplete. Please use tracing instead.
    */
-  env?: { [key: string]: string|number|boolean; };
+  logger?: Logger;
 
   /**
-   * Path to a browser executable to run instead of the bundled one. If `executablePath` is a relative path, then it is
-   * resolved relative to the current working directory. Note that Playwright only works with the bundled Chromium,
-   * Firefox or WebKit, use at your own risk.
+   * Whether to emulate network being offline. Defaults to `false`. Learn more about
+   * [network emulation](https://playwright.dev/docs/emulation#offline).
    */
-  executablePath?: string;
+  offline?: boolean;
 
   /**
-   * Firefox user preferences. Learn more about the Firefox user preferences at
-   * [`about:config`](https://support.mozilla.org/en-US/kb/about-config-editor-firefox).
+   * A list of permissions to grant to all pages in this context. See
+   * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+   * for more details. Defaults to none.
    */
-  firefoxUserPrefs?: { [key: string]: string|number|boolean; };
+  permissions?: Array<string>;
 
   /**
-   * Close the browser process on SIGHUP. Defaults to `true`.
+   * Network proxy settings to use with this context. Defaults to none.
    */
-  handleSIGHUP?: boolean;
+  proxy?: {
+    /**
+     * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
+     * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
+     */
+    server: string;
 
-  /**
-   * Close the browser process on Ctrl-C. Defaults to `true`.
-   */
-  handleSIGINT?: boolean;
+    /**
+     * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
+     */
+    bypass?: string;
 
-  /**
-   * Close the browser process on SIGTERM. Defaults to `true`.
-   */
-  handleSIGTERM?: boolean;
+    /**
+     * Optional username to use if HTTP proxy requires authentication.
+     */
+    username?: string;
+
+    /**
+     * Optional password to use if HTTP proxy requires authentication.
+     */
+    password?: string;
+  };
 
   /**
-   * Whether to run browser in headless mode. More details for
-   * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
-   * [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode). Defaults to `true` unless the
-   * `devtools` option is `true`.
+   * Enables [HAR](http://www.softwareishard.com/blog/har-12-spec) recording for all pages into `recordHar.path` file.
+   * If not specified, the HAR is not recorded. Make sure to await
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+   * the HAR to be saved.
    */
-  headless?: boolean;
+  recordHar?: {
+    /**
+     * Optional setting to control whether to omit request content from the HAR. Defaults to `false`. Deprecated, use
+     * `content` policy instead.
+     */
+    omitContent?: boolean;
+
+    /**
+     * Optional setting to control resource content management. If `omit` is specified, content is not persisted. If
+     * `attach` is specified, resources are persisted as separate files or entries in the ZIP archive. If `embed` is
+     * specified, content is stored inline the HAR file as per HAR specification. Defaults to `attach` for `.zip` output
+     * files and to `embed` for all other file extensions.
+     */
+    content?: "omit"|"embed"|"attach";
+
+    /**
+     * Path on the filesystem to write the HAR file to. If the file name ends with `.zip`, `content: 'attach'` is used by
+     * default.
+     */
+    path: string;
+
+    /**
+     * When set to `minimal`, only record information necessary for routing from HAR. This omits sizes, timing, page,
+     * cookies, security and other types of HAR information that are not used when replaying from HAR. Defaults to `full`.
+     */
+    mode?: "full"|"minimal";
+
+    /**
+     * A glob or regex pattern to filter requests that are stored in the HAR. When a
+     * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) via the context
+     * options was provided and the passed URL is a path, it gets merged via the
+     * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor. Defaults to none.
+     */
+    urlFilter?: string|RegExp;
+  };
 
   /**
-   * If `true`, Playwright does not pass its own configurations args and only uses the ones from `args`. If an array is
-   * given, then filters out the given default arguments. Dangerous option; use with care. Defaults to `false`.
+   * Enables video recording for all pages into `recordVideo.dir` directory. If not specified videos are not recorded.
+   * Make sure to await
+   * [browserContext.close([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-close) for
+   * videos to be saved.
    */
-  ignoreDefaultArgs?: boolean|Array<string>;
+  recordVideo?: {
+    /**
+     * Path to the directory to put videos into.
+     */
+    dir: string;
+
+    /**
+     * Optional dimensions of the recorded videos. If not specified the size will be equal to `viewport` scaled down to
+     * fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual picture of
+     * each page will be scaled down if necessary to fit the specified size.
+     */
+    size?: {
+      /**
+       * Video frame width.
+       */
+      width: number;
+
+      /**
+       * Video frame height.
+       */
+      height: number;
+    };
+  };
 
   /**
-   * Logger sink for Playwright logging.
+   * Emulates `'prefers-reduced-motion'` media feature, supported values are `'reduce'`, `'no-preference'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'no-preference'`.
    */
-  logger?: Logger;
+  reducedMotion?: null|"reduce"|"no-preference";
 
   /**
-   * Network proxy settings.
+   * Emulates consistent window screen size available inside web page via `window.screen`. Is only used when the
+   * [`viewport`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-viewport) is set.
    */
-  proxy?: {
-    /**
-     * Proxy to be used for all requests. HTTP and SOCKS proxies are supported, for example `http://myproxy.com:3128` or
-     * `socks5://myproxy.com:3128`. Short form `myproxy.com:3128` is considered an HTTP proxy.
-     */
-    server: string;
-
-    /**
-     * Optional comma-separated domains to bypass proxy, for example `".com, chromium.org, .domain.com"`.
-     */
-    bypass?: string;
-
+  screen?: {
     /**
-     * Optional username to use if HTTP proxy requires authentication.
+     * page width in pixels.
      */
-    username?: string;
+    width: number;
 
     /**
-     * Optional password to use if HTTP proxy requires authentication.
+     * page height in pixels.
      */
-    password?: string;
+    height: number;
   };
 
   /**
-   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
-   * on.
+   * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+   * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+   *   registered.
+   * - `'block'`: Playwright will block all registration of Service Workers.
    */
-  slowMo?: number;
+  serviceWorkers?: "allow"|"block";
 
   /**
-   * Maximum time in milliseconds to wait for the browser instance to start. Defaults to `30000` (30 seconds). Pass `0`
-   * to disable timeout.
+   * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
+   *
+   * Populates context with given storage state. This option can be used to initialize context with logged-in
+   * information obtained via
+   * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
    */
-  timeout?: number;
+  storageState?: string|{
+    /**
+     * Cookies to set for context
+     */
+    cookies: Array<{
+      name: string;
 
-  /**
-   * If specified, traces are saved into this directory.
-   */
-  tracesDir?: string;
-}
+      value: string;
 
-export interface ConnectOverCDPOptions {
-  /**
-   * Deprecated, use the first argument instead. Optional.
-   */
-  endpointURL?: string;
+      /**
+       * Domain and path are required. For the cookie to apply to all subdomains as well, prefix domain with a dot, like
+       * this: ".example.com"
+       */
+      domain: string;
 
-  /**
-   * Additional HTTP headers to be sent with connect request. Optional.
-   */
-  headers?: { [key: string]: string; };
+      /**
+       * Domain and path are required
+       */
+      path: string;
 
-  /**
-   * Logger sink for Playwright logging. Optional.
-   */
-  logger?: Logger;
+      /**
+       * Unix time in seconds.
+       */
+      expires: number;
 
-  /**
-   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
-   * on. Defaults to 0.
-   */
-  slowMo?: number;
+      httpOnly: boolean;
 
-  /**
-   * Maximum time in milliseconds to wait for the connection to be established. Defaults to `30000` (30 seconds). Pass
-   * `0` to disable timeout.
-   */
-  timeout?: number;
-}
+      secure: boolean;
 
-export interface ConnectOptions {
-  /**
-   * This option exposes network available on the connecting client to the browser being connected to. Consists of a
-   * list of rules separated by comma.
-   *
-   * Available rules:
-   * 1. Hostname pattern, for example: `example.com`, `*.org:99`, `x.*.y.com`, `*foo.org`.
-   * 1. IP literal, for example: `127.0.0.1`, `0.0.0.0:99`, `[::1]`, `[0:0::1]:99`.
-   * 1. `<loopback>` that matches local loopback interfaces: `localhost`, `*.localhost`, `127.0.0.1`, `[::1]`.
-   *
-   * Some common examples:
-   * 1. `"*"` to expose all network.
-   * 1. `"<loopback>"` to expose localhost network.
-   * 1. `"*.test.internal-domain,*.staging.internal-domain,<loopback>"` to expose test/staging deployments and
-   *    localhost.
-   */
-  exposeNetwork?: string;
+      /**
+       * sameSite flag
+       */
+      sameSite: "Strict"|"Lax"|"None";
+    }>;
 
-  /**
-   * Additional HTTP headers to be sent with web socket connect request. Optional.
-   */
-  headers?: { [key: string]: string; };
+    origins: Array<{
+      origin: string;
 
-  /**
-   * Logger sink for Playwright logging. Optional.
-   */
-  logger?: Logger;
+      /**
+       * localStorage to set for context
+       */
+      localStorage: Array<{
+        name: string;
 
-  /**
-   * Slows down Playwright operations by the specified amount of milliseconds. Useful so that you can see what is going
-   * on. Defaults to 0.
-   */
-  slowMo?: number;
+        value: string;
+      }>;
+    }>;
+  };
 
   /**
-   * Maximum time in milliseconds to wait for the connection to be established. Defaults to `0` (no timeout).
+   * If set to true, enables strict selectors mode for this context. In the strict selectors mode all operations on
+   * selectors that imply single target DOM element will throw when more than one element matches the selector. This
+   * option does not affect any Locator APIs (Locators are always strict). Defaults to `false`. See
+   * [Locator](https://playwright.dev/docs/api/class-locator) to learn more about the strict mode.
    */
-  timeout?: number;
-}
+  strictSelectors?: boolean;
 
-export interface LocatorScreenshotOptions {
   /**
-   * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
-   * treatment depending on their duration:
-   * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
-   * - infinite animations are canceled to initial state, and then played over after the screenshot.
-   *
-   * Defaults to `"allow"` that leaves animations untouched.
+   * Changes the timezone of the context. See
+   * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+   * for a list of supported timezone IDs. Defaults to the system timezone.
    */
-  animations?: "disabled"|"allow";
+  timezoneId?: string;
 
   /**
-   * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
-   * changed.  Defaults to `"hide"`.
+   * Specific user agent to use in this context.
    */
-  caret?: "hide"|"initial";
+  userAgent?: string;
 
   /**
-   * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
-   * box `#FF00FF` (customized by `maskColor`) that completely covers its bounding box.
+   * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.
    */
-  mask?: Array<Locator>;
+  videoSize?: {
+    /**
+     * Video frame width.
+     */
+    width: number;
 
-  /**
-   * Specify the color of the overlay box for masked elements, in
-   * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
-   */
-  maskColor?: string;
+    /**
+     * Video frame height.
+     */
+    height: number;
+  };
 
   /**
-   * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
-   * Defaults to `false`.
+   * @deprecated Use [`recordVideo`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-record-video) instead.
    */
-  omitBackground?: boolean;
+  videosPath?: string;
 
   /**
-   * The file path to save the image to. The screenshot type will be inferred from file extension. If `path` is a
-   * relative path, then it is resolved relative to the current working directory. If no path is provided, the image
-   * won't be saved to the disk.
+   * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+   * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+   *
+   * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+   * by the operating system. It makes the execution of the tests non-deterministic.
+   *
    */
-  path?: string;
+  viewport?: null|ViewportSize;
+}
 
+export interface ViewportSize {
   /**
-   * The quality of the image, between 0-100. Not applicable to `png` images.
+   * page width in pixels.
    */
-  quality?: number;
+  width: number;
 
   /**
-   * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
-   * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
-   * screenshots of high-dpi devices will be twice as large or even larger.
-   *
-   * Defaults to `"device"`.
+   * page height in pixels.
    */
-  scale?: "css"|"device";
+  height: number;
+}
 
-  /**
-   * Text of the stylesheet to apply while making the screenshot. This is where you can hide dynamic elements, make
-   * elements invisible or change their properties to help you creating repeatable screenshots. This stylesheet pierces
-   * the Shadow DOM and applies to the inner frames.
-   */
-  style?: string;
+export interface HTTPCredentials {
+  username: string;
+
+  password: string;
 
   /**
-   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
-   * option in the config, or by using the
-   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
-   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   * Restrain sending http credentials on specific origin (scheme://host:port).
    */
-  timeout?: number;
+  origin?: string;
 
   /**
-   * Specify screenshot type, defaults to `png`.
+   * This option only applies to the requests sent from corresponding
+   * [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) and does not affect requests sent from
+   * the browser. `'always'` - `Authorization` header with basic authentication credentials will be sent with the each
+   * API request. `'unauthorized` - the credentials are only sent when 401 (Unauthorized) response with
+   * `WWW-Authenticate` header is received. Defaults to `'unauthorized'`.
    */
-  type?: "png"|"jpeg";
+  send?: "unauthorized"|"always";
 }
 
-interface ElementHandleWaitForSelectorOptions {
+export interface Geolocation {
   /**
-   * Defaults to `'visible'`. Can be either:
-   * - `'attached'` - wait for element to be present in DOM.
-   * - `'detached'` - wait for element to not be present in DOM.
-   * - `'visible'` - wait for element to have non-empty bounding box and no `visibility:hidden`. Note that element
-   *   without any content or with `display:none` has an empty bounding box and is not considered visible.
-   * - `'hidden'` - wait for element to be either detached from DOM, or have an empty bounding box or
-   *   `visibility:hidden`. This is opposite to the `'visible'` option.
+   * Latitude between -90 and 90.
    */
-  state?: "attached"|"detached"|"visible"|"hidden";
+  latitude: number;
 
   /**
-   * When true, the call requires selector to resolve to a single element. If given selector resolves to more than one
-   * element, the call throws an exception.
+   * Longitude between -180 and 180.
    */
-  strict?: boolean;
+  longitude: number;
 
   /**
-   * Maximum time in milliseconds. Defaults to `0` - no timeout. The default value can be changed via `actionTimeout`
-   * option in the config, or by using the
-   * [browserContext.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-browsercontext#browser-context-set-default-timeout)
-   * or [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout) methods.
+   * Non-negative accuracy value. Defaults to `0`.
    */
-  timeout?: number;
+  accuracy?: number;
 }
 
 export interface Cookie {
@@ -20964,6 +22532,8 @@ export interface Cookie {
   secure: boolean;
 
   sameSite: "Strict"|"Lax"|"None";
+
+  partitionKey?: string;
 }
 
 interface PageWaitForSelectorOptions {
@@ -20995,9 +22565,11 @@ interface PageWaitForSelectorOptions {
 
 interface PageWaitForFunctionOptions {
   /**
-   * If `polling` is `'raf'`, then `pageFunction` is constantly executed in `requestAnimationFrame` callback. If
-   * `polling` is a number, then it is treated as an interval in milliseconds at which the function would be executed.
-   * Defaults to `raf`.
+   * If [`polling`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-polling) is `'raf'`, then
+   * [`pageFunction`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-expression) is constantly
+   * executed in `requestAnimationFrame` callback. If
+   * [`polling`](https://playwright.dev/docs/api/class-page#page-wait-for-function-option-polling) is a number, then it
+   * is treated as an interval in milliseconds at which the function would be executed. Defaults to `raf`.
    */
   polling?: number|"raf";
 
@@ -21060,7 +22632,10 @@ export interface PageScreenshotOptions {
 
   /**
    * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
-   * box `#FF00FF` (customized by `maskColor`) that completely covers its bounding box.
+   * box `#FF00FF` (customized by
+   * [`maskColor`](https://playwright.dev/docs/api/class-page#page-screenshot-option-mask-color)) that completely covers
+   * its bounding box. The mask is also applied to invisible elements, see
+   * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
    */
   mask?: Array<Locator>;
 
@@ -21077,9 +22652,9 @@ export interface PageScreenshotOptions {
   omitBackground?: boolean;
 
   /**
-   * The file path to save the image to. The screenshot type will be inferred from file extension. If `path` is a
-   * relative path, then it is resolved relative to the current working directory. If no path is provided, the image
-   * won't be saved to the disk.
+   * The file path to save the image to. The screenshot type will be inferred from file extension. If
+   * [`path`](https://playwright.dev/docs/api/class-page#page-screenshot-option-path) is a relative path, then it is
+   * resolved relative to the current working directory. If no path is provided, the image won't be saved to the disk.
    */
   path?: string;
 
@@ -21135,14 +22710,22 @@ type Devices = {
   "Galaxy S8 landscape": DeviceDescriptor;
   "Galaxy S9+": DeviceDescriptor;
   "Galaxy S9+ landscape": DeviceDescriptor;
+  "Galaxy S24": DeviceDescriptor;
+  "Galaxy S24 landscape": DeviceDescriptor;
+  "Galaxy A55": DeviceDescriptor;
+  "Galaxy A55 landscape": DeviceDescriptor;
   "Galaxy Tab S4": DeviceDescriptor;
   "Galaxy Tab S4 landscape": DeviceDescriptor;
+  "Galaxy Tab S9": DeviceDescriptor;
+  "Galaxy Tab S9 landscape": DeviceDescriptor;
   "iPad (gen 5)": DeviceDescriptor;
   "iPad (gen 5) landscape": DeviceDescriptor;
   "iPad (gen 6)": DeviceDescriptor;
   "iPad (gen 6) landscape": DeviceDescriptor;
   "iPad (gen 7)": DeviceDescriptor;
   "iPad (gen 7) landscape": DeviceDescriptor;
+  "iPad (gen 11)": DeviceDescriptor;
+  "iPad (gen 11) landscape": DeviceDescriptor;
   "iPad Mini": DeviceDescriptor;
   "iPad Mini landscape": DeviceDescriptor;
   "iPad Pro 11": DeviceDescriptor;
@@ -21161,6 +22744,8 @@ type Devices = {
   "iPhone 8 Plus landscape": DeviceDescriptor;
   "iPhone SE": DeviceDescriptor;
   "iPhone SE landscape": DeviceDescriptor;
+  "iPhone SE (3rd gen)": DeviceDescriptor;
+  "iPhone SE (3rd gen) landscape": DeviceDescriptor;
   "iPhone X": DeviceDescriptor;
   "iPhone X landscape": DeviceDescriptor;
   "iPhone XR": DeviceDescriptor;
diff --git a/packages/playwright-ct-core/.eslintrc.js b/packages/playwright-ct-core/.eslintrc.js
deleted file mode 100644
index 84888f1ae3baf..0000000000000
--- a/packages/playwright-ct-core/.eslintrc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  extends: "../../.eslintrc-with-ts-config.js",
-};
diff --git a/packages/playwright-ct-core/index.d.ts b/packages/playwright-ct-core/index.d.ts
index 9c323ef6df595..f6710ee1f6fe6 100644
--- a/packages/playwright-ct-core/index.d.ts
+++ b/packages/playwright-ct-core/index.d.ts
@@ -52,7 +52,7 @@ export function defineConfig(config: PlaywrightTestConfig): PlaywrightTestConfig
 export function defineConfig<T>(config: PlaywrightTestConfig<T>): PlaywrightTestConfig<T>;
 export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>): PlaywrightTestConfig<T, W>;
 export function defineConfig(config: PlaywrightTestConfig, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig;
-export function defineConfig<T>(config: PlaywrightTestConfig<T>, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig<T>;
-export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig<T, W>;
+export function defineConfig<T>(config: PlaywrightTestConfig<T>, ...configs: PlaywrightTestConfig<T>[]): PlaywrightTestConfig<T>;
+export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>, ...configs: PlaywrightTestConfig<T, W>[]): PlaywrightTestConfig<T, W>;
 
 export { expect, devices, Locator } from 'playwright/test';
diff --git a/packages/playwright-ct-core/index.js b/packages/playwright-ct-core/index.js
index cda6e7ad557e9..1a4f185a3177a 100644
--- a/packages/playwright-ct-core/index.js
+++ b/packages/playwright-ct-core/index.js
@@ -16,7 +16,6 @@
 
 const { test: baseTest, expect, devices, defineConfig: originalDefineConfig } = require('playwright/test');
 const { fixtures } = require('./lib/mount');
-const { clearCacheCommand, runDevServerCommand, findRelatedTestFilesCommand } = require('./lib/cliOverrides');
 const { createPlugin } = require('./lib/vitePlugin');
 
 const defineConfig = (...configs) => {
@@ -29,11 +28,6 @@ const defineConfig = (...configs) => {
       babelPlugins: [
         [require.resolve('./lib/tsxTransform')]
       ],
-      cli: {
-        'clear-cache': clearCacheCommand,
-        'dev-server': runDevServerCommand,
-        'find-related-test-files': findRelatedTestFilesCommand,
-      },
     }
   };
 };
diff --git a/packages/playwright-ct-core/package.json b/packages/playwright-ct-core/package.json
index bb6d1ae01e236..d1f6d13bea7d2 100644
--- a/packages/playwright-ct-core/package.json
+++ b/packages/playwright-ct-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/experimental-ct-core",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright Component Testing Helpers",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     }
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next",
-    "vite": "^5.2.8",
-    "playwright": "1.46.0-next"
+    "playwright-core": "1.55.1",
+    "vite": "^6.3.4",
+    "playwright": "1.55.1"
   }
 }
diff --git a/packages/playwright-ct-core/src/cliOverrides.ts b/packages/playwright-ct-core/src/cliOverrides.ts
deleted file mode 100644
index d57014f6364ae..0000000000000
--- a/packages/playwright-ct-core/src/cliOverrides.ts
+++ /dev/null
@@ -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 { affectedTestFiles, cacheDir } from 'playwright/lib/transform/compilationCache';
-import { buildBundle } from './vitePlugin';
-import { resolveDirs } from './viteUtils';
-import { runDevServer } from './devServer';
-import type { FullConfigInternal } from 'playwright/lib/common/config';
-import { removeFolderAndLogToConsole } from 'playwright/lib/runner/testServer';
-
-export async function clearCacheCommand(config: FullConfigInternal) {
-  const dirs = await resolveDirs(config.configDir, config.config);
-  if (dirs)
-    await removeFolderAndLogToConsole(dirs.outDir);
-  await removeFolderAndLogToConsole(cacheDir);
-}
-
-export async function findRelatedTestFilesCommand(files: string[],  config: FullConfigInternal) {
-  await buildBundle(config.config, config.configDir);
-  return { testFiles: affectedTestFiles(files) };
-}
-
-export async function runDevServerCommand(config: FullConfigInternal) {
-  return await runDevServer(config);
-}
diff --git a/packages/playwright-ct-core/src/devServer.ts b/packages/playwright-ct-core/src/devServer.ts
index 2e1e7c76bf4e2..c715f585a1381 100644
--- a/packages/playwright-ct-core/src/devServer.ts
+++ b/packages/playwright-ct-core/src/devServer.ts
@@ -16,29 +16,31 @@
 
 import fs from 'fs';
 import path from 'path';
+
 import { Watcher } from 'playwright/lib/fsWatcher';
-import { Runner } from 'playwright/lib/runner/runner';
-import type { PluginContext } from 'rollup';
+import { colors } from 'playwright-core/lib/utilsBundle';
+
 import { source as injectedSource } from './generated/indexSource';
-import { createConfig, populateComponentsFromTests, resolveDirs, transformIndexFile, frameworkConfig } from './viteUtils';
+import { createConfig, frameworkConfig, populateComponentsFromTests, resolveDirs, transformIndexFile } from './viteUtils';
+
 import type { ComponentRegistry } from './viteUtils';
-import type { FullConfigInternal } from 'playwright/lib/common/config';
+import type { FullConfig } from 'playwright/test';
+import type { PluginContext } from 'rollup';
 
-export async function runDevServer(config: FullConfigInternal): Promise<() => Promise<void>> {
-  const { registerSourceFile, frameworkPluginFactory } = frameworkConfig(config.config);
-  const runner = new Runner(config);
-  await runner.loadAllTests();
+export async function runDevServer(config: FullConfig): Promise<() => Promise<void>> {
+  const { registerSourceFile, frameworkPluginFactory } = frameworkConfig(config);
   const componentRegistry: ComponentRegistry = new Map();
   await populateComponentsFromTests(componentRegistry);
 
-  const dirs = await resolveDirs(config.configDir, config.config);
+  const configDir = config.configFile ? path.dirname(config.configFile) : config.rootDir;
+  const dirs = await resolveDirs(configDir, config);
   if (!dirs) {
     // eslint-disable-next-line no-console
-    console.log(`Template file playwright/index.html is missing.`);
+    console.log(colors.red(`Component testing template file playwright/index.html is missing and there is no existing Vite server. Component tests will fail.\n`));
     return async () => {};
   }
   const registerSource = injectedSource + '\n' + await fs.promises.readFile(registerSourceFile, 'utf-8');
-  const viteConfig = await createConfig(dirs, config.config, frameworkPluginFactory, false);
+  const viteConfig = await createConfig(dirs, config, frameworkPluginFactory, false);
   viteConfig.plugins.push({
     name: 'playwright:component-index',
 
@@ -57,11 +59,11 @@ export async function runDevServer(config: FullConfigInternal): Promise<() => Pr
   const projectDirs = new Set<string>();
   const projectOutputs = new Set<string>();
   for (const p of config.projects) {
-    projectDirs.add(p.project.testDir);
-    projectOutputs.add(p.project.outputDir);
+    projectDirs.add(p.testDir);
+    projectOutputs.add(p.outputDir);
   }
 
-  const globalWatcher = new Watcher('deep', async () => {
+  const globalWatcher = new Watcher(async () => {
     const registry: ComponentRegistry = new Map();
     await populateComponentsFromTests(registry);
     // compare componentRegistry to registry key sets.
@@ -80,6 +82,6 @@ export async function runDevServer(config: FullConfigInternal): Promise<() => Pr
     if (rootModule)
       devServer.moduleGraph.onFileChange(rootModule.file!);
   });
-  globalWatcher.update([...projectDirs], [...projectOutputs], false);
+  await globalWatcher.update([...projectDirs], [...projectOutputs], false);
   return () => Promise.all([devServer.close(), globalWatcher.close()]).then(() => {});
 }
diff --git a/packages/playwright-ct-core/src/injected/serializers.ts b/packages/playwright-ct-core/src/injected/serializers.ts
index d07be7c1f8cf7..be083e27db72f 100644
--- a/packages/playwright-ct-core/src/injected/serializers.ts
+++ b/packages/playwright-ct-core/src/injected/serializers.ts
@@ -66,6 +66,13 @@ export function transformObject(value: any, mapping: (v: any) => { result: any }
       result.push(transformObject(item, mapping));
     return result;
   }
+  if (value?.__pw_type === 'jsx' && typeof value.type === 'function') {
+    throw new Error([
+      `Component "${value.type.name}" cannot be mounted.`,
+      `Most likely, this component is defined in the test file. Create a test story instead.`,
+      `For more information, see https://playwright.dev/docs/test-components#test-stories.`,
+    ].join('\n'));
+  }
   const result2: any = {};
   for (const [key, prop] of Object.entries(value))
     result2[key] = transformObject(prop, mapping);
diff --git a/packages/playwright-ct-core/src/mount.ts b/packages/playwright-ct-core/src/mount.ts
index a3bcfe064199e..2dc1d88287535 100644
--- a/packages/playwright-ct-core/src/mount.ts
+++ b/packages/playwright-ct-core/src/mount.ts
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-import type { Fixtures, Locator, Page, BrowserContextOptions, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, BrowserContext } from 'playwright/test';
-import type { Component, JsxComponent, MountOptions, ObjectComponentOptions } from '../types/component';
-import type { ContextReuseMode, FullConfigInternal } from '../../playwright/src/common/config';
-import type { ImportRef } from './injected/importRegistry';
 import { wrapObject } from './injected/serializers';
 import { Router } from './router';
+
+import type { ContextReuseMode, FullConfigInternal } from '../../playwright/src/common/config';
 import type { RouterFixture } from '../index';
+import type { ImportRef } from './injected/importRegistry';
+import type { Component, JsxComponent, MountOptions, ObjectComponentOptions } from '../types/component';
+import type { Fixtures, Locator, Page, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions } from 'playwright/test';
+import type { Page as PageImpl } from 'playwright-core/lib/client/page';
 
 let boundCallbacksForMount: Function[] = [];
 
@@ -35,7 +37,6 @@ type TestFixtures = PlaywrightTestArgs & PlaywrightTestOptions & {
 };
 type WorkerFixtures = PlaywrightWorkerArgs & PlaywrightWorkerOptions;
 type BaseTestFixtures = {
-  _contextFactory: (options?: BrowserContextOptions) => Promise<BrowserContext>,
   _optionContextReuseMode: ContextReuseMode
 };
 
@@ -48,20 +49,22 @@ export const fixtures: Fixtures<TestFixtures, WorkerFixtures, BaseTestFixtures>
   page: async ({ page }, use, info) => {
     if (!((info as any)._configInternal as FullConfigInternal).defineConfigWasUsed)
       throw new Error('Component testing requires the use of the defineConfig() in your playwright-ct.config.{ts,js}: https://aka.ms/playwright/ct-define-config');
-    await (page as any)._wrapApiCall(async () => {
+    if (!process.env.PLAYWRIGHT_TEST_BASE_URL)
+      throw new Error('Component testing could not determine the base URL of your component under test. Ensure you have supplied a template playwright/index.html or have set the PLAYWRIGHT_TEST_BASE_URL environment variable.');
+    await (page as PageImpl)._wrapApiCall(async () => {
       await page.exposeFunction('__ctDispatchFunction', (ordinal: number, args: any[]) => {
         boundCallbacksForMount[ordinal](...args);
       });
       await page.goto(process.env.PLAYWRIGHT_TEST_BASE_URL!);
-    }, true);
+    }, { internal: true });
     await use(page);
   },
 
   mount: async ({ page }, use) => {
     await use(async (componentRef: JsxComponent | ImportRef, options?: ObjectComponentOptions & MountOptions) => {
-      const selector = await (page as any)._wrapApiCall(async () => {
+      const selector = await (page as PageImpl)._wrapApiCall(async () => {
         return await innerMount(page, componentRef, options);
-      }, true);
+      }, { internal: true });
       const locator = page.locator(selector);
       return Object.assign(locator, {
         unmount: async () => {
diff --git a/packages/playwright-ct-core/src/router.ts b/packages/playwright-ct-core/src/router.ts
index 50adf8c573b47..5ff746ddf29dc 100644
--- a/packages/playwright-ct-core/src/router.ts
+++ b/packages/playwright-ct-core/src/router.ts
@@ -37,10 +37,20 @@ async function executeRequestHandlers(request: Request, handlers: RequestHandler
   }
 }
 
+function isMswRequestPassthrough(headers: Headers): boolean {
+  if (headers.get('x-msw-intention') === 'bypass')
+    return true;
+  // After MSW v2.6.4
+  // https://github.com/mswjs/msw/commit/2fa98c327acc51189f87789d9155c4ec57be2299
+  if (headers.get('accept')?.includes('msw/passthrough'))
+    return true;
+  return false;
+}
+
 async function globalFetch(...args: Parameters<typeof globalThis.fetch>) {
   if (args[0] && args[0] instanceof Request) {
     const request = args[0];
-    if (request.headers.get('x-msw-intention') === 'bypass') {
+    if (isMswRequestPassthrough(request.headers)) {
       const cookieHeaders = await Promise.all([...currentlyInterceptingInContexts.keys()].map(async context => {
         const cookies = await context.cookies(request.url);
         if (!cookies.length)
@@ -56,7 +66,16 @@ async function globalFetch(...args: Parameters<typeof globalThis.fetch>) {
 
       const headers = new Headers(request.headers);
       headers.set('cookie', cookieHeaders[0]!);
-      headers.delete('x-msw-intention');
+      {
+        // pre 2.6.4
+        headers.delete('x-msw-intention');
+        // post 2.6.4
+        const accept = headers.get('accept')?.split(',').filter(h => !h.includes('msw/')).join(',');
+        if (accept)
+          headers.set('accept', accept);
+        else
+          headers.delete('accept');
+      }
       args[0] = new Request(request.clone(), { headers });
     }
   }
diff --git a/packages/playwright-ct-core/src/tsxTransform.ts b/packages/playwright-ct-core/src/tsxTransform.ts
index 0af7c181b9517..fbf3d0cc182cb 100644
--- a/packages/playwright-ct-core/src/tsxTransform.ts
+++ b/packages/playwright-ct-core/src/tsxTransform.ts
@@ -15,9 +15,11 @@
  */
 
 import path from 'path';
-import type { T, BabelAPI, PluginObj } from 'playwright/src/transform/babelBundle';
-import { types, declare, traverse } from 'playwright/lib/transform/babelBundle';
+
+import { declare, traverse, types } from 'playwright/lib/transform/babelBundle';
 import { setTransformData } from 'playwright/lib/transform/transform';
+
+import type { BabelAPI, PluginObj, T } from 'playwright/lib/transform/babelBundle';
 const t: typeof T = types;
 
 let jsxComponentNames: Set<string>;
diff --git a/packages/playwright-ct-core/src/vitePlugin.ts b/packages/playwright-ct-core/src/vitePlugin.ts
index e4a0a43266518..f932bfd500265 100644
--- a/packages/playwright-ct-core/src/vitePlugin.ts
+++ b/packages/playwright-ct-core/src/vitePlugin.ts
@@ -15,22 +15,29 @@
  */
 
 import fs from 'fs';
-import type http from 'http';
-import type { AddressInfo } from 'net';
 import path from 'path';
-import { assert, calculateSha1, getPlaywrightVersion, isURLAvailable } from 'playwright-core/lib/utils';
-import { debug } from 'playwright-core/lib/utilsBundle';
+
 import { setExternalDependencies } from 'playwright/lib/transform/compilationCache';
+import { resolveHook } from 'playwright/lib/transform/transform';
+import { removeDirAndLogToConsole } from 'playwright/lib/util';
 import { stoppable } from 'playwright/lib/utilsBundle';
-import type { FullConfig, Suite } from 'playwright/types/testReporter';
-import type { PluginContext } from 'rollup';
-import type { Plugin, ResolveFn, ResolvedConfig } from 'vite';
-import type { TestRunnerPlugin } from '../../playwright/src/plugins';
+import { isURLAvailable } from 'playwright-core/lib/utils';
+import { assert, calculateSha1, getPlaywrightVersion } from 'playwright-core/lib/utils';
+import { colors, debug } from 'playwright-core/lib/utilsBundle';
+
+import { runDevServer } from './devServer';
 import { source as injectedSource } from './generated/indexSource';
+import { createConfig, frameworkConfig, hasJSComponents, populateComponentsFromTests, resolveDirs, resolveEndpoint, transformIndexFile } from './viteUtils';
+
 import type { ImportInfo } from './tsxTransform';
 import type { ComponentRegistry } from './viteUtils';
-import { createConfig, frameworkConfig, hasJSComponents, populateComponentsFromTests, resolveDirs, resolveEndpoint, transformIndexFile } from './viteUtils';
-import { resolveHook } from 'playwright/lib/transform/transform';
+import type { TestRunnerPlugin } from '../../playwright/src/plugins';
+import type http from 'http';
+import type { AddressInfo } from 'net';
+import type { FullConfig, Suite } from 'playwright/types/testReporter';
+import type { PluginContext } from 'rollup';
+import type { Plugin, ResolveFn, ResolvedConfig } from 'vite';
+
 
 const log = debug('pw:vite');
 
@@ -73,6 +80,17 @@ export function createPlugin(): TestRunnerPlugin {
     populateDependencies: async () => {
       await buildBundle(config, configDir);
     },
+
+    startDevServer: async () => {
+      return await runDevServer(config);
+    },
+
+    clearCache: async () => {
+      const configDir = config.configFile ? path.dirname(config.configFile) : config.rootDir;
+      const dirs = await resolveDirs(configDir, config);
+      if (dirs)
+        await removeDirAndLogToConsole(dirs.outDir);
+    },
   };
 }
 
@@ -109,7 +127,7 @@ export async function buildBundle(config: FullConfig, configDir: string): Promis
   const dirs = await resolveDirs(configDir, config);
   if (!dirs) {
     // eslint-disable-next-line no-console
-    console.log(`Template file playwright/index.html is missing.`);
+    console.log(colors.red(`Component testing template file playwright/index.html is missing and there is no existing Vite server. Component tests will fail.\n`));
     return null;
   }
 
diff --git a/packages/playwright-ct-core/src/viteUtils.ts b/packages/playwright-ct-core/src/viteUtils.ts
index a9f7020999e90..58bfececc9e21 100644
--- a/packages/playwright-ct-core/src/viteUtils.ts
+++ b/packages/playwright-ct-core/src/viteUtils.ts
@@ -16,13 +16,16 @@
 
 import fs from 'fs';
 import path from 'path';
-import { debug } from 'playwright-core/lib/utilsBundle';
+
 import { getUserData } from 'playwright/lib/transform/compilationCache';
+import { resolveHook } from 'playwright/lib/transform/transform';
+import { debug } from 'playwright-core/lib/utilsBundle';
+
+import type { ImportInfo } from './tsxTransform';
 import type { PlaywrightTestConfig as BasePlaywrightTestConfig } from 'playwright/types/test';
 import type { FullConfig } from 'playwright/types/testReporter';
 import type { InlineConfig, Plugin, TransformResult, UserConfig } from 'vite';
-import type { ImportInfo } from './tsxTransform';
-import { resolveHook } from 'playwright/lib/transform/transform';
+
 
 const log = debug('pw:vite');
 
diff --git a/packages/playwright-ct-core/types/component.d.ts b/packages/playwright-ct-core/types/component.d.ts
index ed5c616bfa4bd..2f488b885e6c5 100644
--- a/packages/playwright-ct-core/types/component.d.ts
+++ b/packages/playwright-ct-core/types/component.d.ts
@@ -27,7 +27,6 @@ export type MountOptions = {
 export type ObjectComponentOptions = {
   props?: Record<string, any>;
   slots?: Record<string, string | string[]>;
-  on?: Record<string, Function>;
 };
 
 export type ObjectComponent = ObjectComponentOptions & {
diff --git a/packages/playwright-ct-react/hooks.d.ts b/packages/playwright-ct-react/hooks.d.ts
index 1093f1a3a3515..f05ad1ffdfbf8 100644
--- a/packages/playwright-ct-react/hooks.d.ts
+++ b/packages/playwright-ct-react/hooks.d.ts
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
+import type React from 'react';
+
 export declare function beforeMount<HooksConfig>(
-  callback: (params: { hooksConfig?: HooksConfig; App: () => JSX.Element }) => Promise<void | JSX.Element>
+  callback: (params: { hooksConfig?: HooksConfig; App: () => React.JSX.Element }) => Promise<void | React.JSX.Element>
 ): void;
 export declare function afterMount<HooksConfig>(
   callback: (params: { hooksConfig?: HooksConfig }) => Promise<void>
diff --git a/packages/playwright-ct-react/index.d.ts b/packages/playwright-ct-react/index.d.ts
index c5e6d6d2da311..d7000c5c85719 100644
--- a/packages/playwright-ct-react/index.d.ts
+++ b/packages/playwright-ct-react/index.d.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import type React from 'react';
+
 import type { TestType, Locator } from '@playwright/experimental-ct-core';
 
 export interface MountOptions<HooksConfig> {
@@ -22,12 +24,12 @@ export interface MountOptions<HooksConfig> {
 
 export interface MountResult extends Locator {
   unmount(): Promise<void>;
-  update(component: JSX.Element): Promise<void>;
+  update(component: React.JSX.Element): Promise<void>;
 }
 
 export const test: TestType<{
   mount<HooksConfig>(
-    component: JSX.Element,
+    component: React.JSX.Element,
     options?: MountOptions<HooksConfig>
   ): Promise<MountResult>;
 }>;
diff --git a/packages/playwright-ct-react/package.json b/packages/playwright-ct-react/package.json
index 295af3f34a305..c9b1a41c7b3c7 100644
--- a/packages/playwright-ct-react/package.json
+++ b/packages/playwright-ct-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/experimental-ct-react",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright Component Testing for React",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@playwright/experimental-ct-core": "1.46.0-next",
+    "@playwright/experimental-ct-core": "1.55.1",
     "@vitejs/plugin-react": "^4.2.1"
   },
   "bin": {
diff --git a/packages/playwright-ct-react/registerSource.mjs b/packages/playwright-ct-react/registerSource.mjs
index e5a14c3db652c..4b233a8dec71b 100644
--- a/packages/playwright-ct-react/registerSource.mjs
+++ b/packages/playwright-ct-react/registerSource.mjs
@@ -33,12 +33,24 @@ function isJsxComponent(component) {
 }
 
 /**
+ * @param {any} type
+ * @returns {boolean} type is Playwright's mock JSX.Fragment
+ */
+function isJsxFragment(type) {
+  return typeof type === 'object' && type?.__pw_jsx_fragment;
+}
+
+/**
+ * Turns the Playwright representation of JSX (see jsx-runtime.js) into React.createElement calls.
  * @param {any} value
  */
 function __pwRender(value) {
   return window.__pwTransformObject(value, v => {
     if (isJsxComponent(v)) {
       const component = v;
+      let type = component.type;
+      if (isJsxFragment(type))
+        type = __pwReact.Fragment;
       const props = component.props ? __pwRender(component.props) : {};
       const key = component.key ? __pwRender(component.key) : undefined;
       const { children, ...propsWithoutChildren } = props;
@@ -47,7 +59,7 @@ function __pwRender(value) {
       const createElementArguments = [propsWithoutChildren];
       if (children)
         createElementArguments.push(children);
-      return { result: __pwReact.createElement(component.type, ...createElementArguments) };
+      return { result: __pwReact.createElement(type, ...createElementArguments) };
     }
   });
 }
diff --git a/packages/playwright-ct-react17/package.json b/packages/playwright-ct-react17/package.json
index 8d0fee116851b..74f8ad0a699e1 100644
--- a/packages/playwright-ct-react17/package.json
+++ b/packages/playwright-ct-react17/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/experimental-ct-react17",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright Component Testing for React",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@playwright/experimental-ct-core": "1.46.0-next",
+    "@playwright/experimental-ct-core": "1.55.1",
     "@vitejs/plugin-react": "^4.2.1"
   },
   "bin": {
diff --git a/packages/playwright-ct-solid/.npmignore b/packages/playwright-ct-solid/.npmignore
deleted file mode 100644
index 62701eb493652..0000000000000
--- a/packages/playwright-ct-solid/.npmignore
+++ /dev/null
@@ -1,12 +0,0 @@
-**/*
-
-!README.md
-!LICENSE
-!cli.js
-!register.d.ts
-!register.mjs
-!registerSource.mjs
-!index.d.ts
-!index.js
-!hooks.d.ts
-!hooks.mjs
diff --git a/packages/playwright-ct-solid/README.md b/packages/playwright-ct-solid/README.md
deleted file mode 100644
index 23ae82312d5c6..0000000000000
--- a/packages/playwright-ct-solid/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-> **BEWARE** This package is EXPERIMENTAL and does not respect semver.
-
-Read more at https://playwright.dev/docs/test-components
diff --git a/packages/playwright-ct-solid/hooks.mjs b/packages/playwright-ct-solid/hooks.mjs
deleted file mode 100644
index b7cea242c41e0..0000000000000
--- a/packages/playwright-ct-solid/hooks.mjs
+++ /dev/null
@@ -1,29 +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.
- */
-
-const __pw_hooks_before_mount = [];
-const __pw_hooks_after_mount = [];
-
-window.__pw_hooks_before_mount = __pw_hooks_before_mount;
-window.__pw_hooks_after_mount = __pw_hooks_after_mount;
-
-export const beforeMount = callback => {
-  __pw_hooks_before_mount.push(callback);
-};
-
-export const afterMount = callback => {
-  __pw_hooks_after_mount.push(callback);
-};
diff --git a/packages/playwright-ct-solid/index.js b/packages/playwright-ct-solid/index.js
deleted file mode 100644
index c2feef7455680..0000000000000
--- a/packages/playwright-ct-solid/index.js
+++ /dev/null
@@ -1,33 +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.
- */
-
-const { test, expect, devices, defineConfig: originalDefineConfig } = require('@playwright/experimental-ct-core');
-const path = require('path');
-
-const defineConfig = (config, ...configs) => {
-  return originalDefineConfig({
-    ...config,
-    '@playwright/test': {
-      packageJSON: require.resolve('./package.json'),
-    },
-    '@playwright/experimental-ct-core': {
-      registerSourceFile: path.join(__dirname, 'registerSource.mjs'),
-      frameworkPluginFactory: () => import('vite-plugin-solid').then(plugin => plugin.default()),
-    },
-  }, ...configs);
-};
-
-module.exports = { test, expect, devices, defineConfig };
diff --git a/packages/playwright-ct-solid/package.json b/packages/playwright-ct-solid/package.json
deleted file mode 100644
index ed469301496e1..0000000000000
--- a/packages/playwright-ct-solid/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "@playwright/experimental-ct-solid",
-  "version": "1.46.0-next",
-  "description": "Playwright Component Testing for Solid",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/microsoft/playwright.git"
-  },
-  "homepage": "https://playwright.dev",
-  "engines": {
-    "node": ">=18"
-  },
-  "author": {
-    "name": "Microsoft Corporation"
-  },
-  "license": "Apache-2.0",
-  "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "default": "./index.js"
-    },
-    "./register": {
-      "types": "./register.d.ts",
-      "default": "./register.mjs"
-    },
-    "./hooks": {
-      "types": "./hooks.d.ts",
-      "default": "./hooks.mjs"
-    },
-    "./package.json": "./package.json"
-  },
-  "dependencies": {
-    "@playwright/experimental-ct-core": "1.46.0-next",
-    "vite-plugin-solid": "^2.7.0"
-  },
-  "devDependencies": {
-    "solid-js": "^1.7.0"
-  },
-  "bin": {
-    "playwright": "cli.js"
-  }
-}
diff --git a/packages/playwright-ct-solid/registerSource.mjs b/packages/playwright-ct-solid/registerSource.mjs
deleted file mode 100644
index d0077dd494d22..0000000000000
--- a/packages/playwright-ct-solid/registerSource.mjs
+++ /dev/null
@@ -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.
- */
-
-// @ts-check
-// This file is injected into the registry as text, no dependencies are allowed.
-
-import { render as __pwSolidRender, createComponent as __pwSolidCreateComponent } from 'solid-js/web';
-import __pwH from 'solid-js/h';
-/** @typedef {import('../playwright-ct-core/types/component').JsxComponent} JsxComponent */
-
-/**
- * @param {any} component
- * @returns {component is JsxComponent}
- */
-function isJsxComponent(component) {
-  return typeof component === 'object' && component && component.__pw_type === 'jsx';
-}
-
-/**
- * @param {any} value
- */
-function __pwCreateComponent(value) {
-  return window.__pwTransformObject(value, v => {
-    if (isJsxComponent(v)) {
-      const component = v;
-      const props = component.props ? __pwCreateComponent(component.props) : {};
-      if (typeof component.type === 'string') {
-        const { children, ...propsWithoutChildren } = props;
-        return { result: __pwH(component.type, propsWithoutChildren, children) };
-      }
-      return { result: __pwSolidCreateComponent(component.type, props) };
-    }
-  });
-}
-
-const __pwUnmountKey = Symbol('unmountKey');
-
-window.playwrightMount = async (component, rootElement, hooksConfig) => {
-  if (!isJsxComponent(component))
-    throw new Error('Object mount notation is not supported');
-
-  let App = () => __pwCreateComponent(component);
-  for (const hook of window.__pw_hooks_before_mount || []) {
-    const wrapper = await hook({ App, hooksConfig });
-    if (wrapper)
-      App = () => wrapper;
-  }
-
-  const unmount = __pwSolidRender(App, rootElement);
-  rootElement[__pwUnmountKey] = unmount;
-
-  for (const hook of window.__pw_hooks_after_mount || [])
-    await hook({ hooksConfig });
-};
-
-window.playwrightUnmount = async rootElement => {
-  const unmount = rootElement[__pwUnmountKey];
-  if (!unmount)
-    throw new Error('Component was not mounted');
-
-  unmount();
-  delete rootElement[__pwUnmountKey];
-};
-
-window.playwrightUpdate = async (rootElement, component) => {
-  if (!isJsxComponent(component))
-    throw new Error('Object mount notation is not supported');
-
-  window.playwrightUnmount(rootElement);
-  window.playwrightMount(component, rootElement, {});
-};
diff --git a/packages/playwright-ct-svelte/index.d.ts b/packages/playwright-ct-svelte/index.d.ts
index 761831f3315d0..7cf427ba5d603 100644
--- a/packages/playwright-ct-svelte/index.d.ts
+++ b/packages/playwright-ct-svelte/index.d.ts
@@ -14,21 +14,24 @@
  * limitations under the License.
  */
 
-import type { SvelteComponent, ComponentProps } from 'svelte/types/runtime';
+import type { ComponentProps, Component, SvelteComponent } from 'svelte';
 import type { TestType, Locator } from '@playwright/experimental-ct-core';
 
-type ComponentSlot = string | string[];
+type ComponentSlot = Snippet | string;
 type ComponentSlots = Record<string, ComponentSlot> & { default?: ComponentSlot };
 type ComponentEvents = Record<string, Function>;
 
-export interface MountOptions<HooksConfig, Component extends SvelteComponent> {
+// TODO: Remove after Svelte has removed S4 fallback TypeScript types for `*.svelte` files
+type InteropComponent = (new (...args: unknown[]) => SvelteComponent) | Component<any, any, any>;
+
+export interface MountOptions<HooksConfig, Component extends InteropComponent> {
   props?: ComponentProps<Component>;
   slots?: ComponentSlots;
   on?: ComponentEvents;
   hooksConfig?: HooksConfig;
 }
 
-export interface MountResult<Component extends SvelteComponent> extends Locator {
+export interface MountResult<Component extends InteropComponent> extends Locator {
   unmount(): Promise<void>;
   update(options: {
     props?: Partial<ComponentProps<Component>>;
@@ -37,8 +40,8 @@ export interface MountResult<Component extends SvelteComponent> extends Locator
 }
 
 export const test: TestType<{
-  mount<HooksConfig, Component extends SvelteComponent = SvelteComponent>(
-    component: new (...args: any[]) => Component,
+  mount<HooksConfig, Component extends InteropComponent = InteropComponent>(
+    component: Component,
     options?: MountOptions<HooksConfig, Component>
   ): Promise<MountResult<Component>>;
 }>;
diff --git a/packages/playwright-ct-svelte/package.json b/packages/playwright-ct-svelte/package.json
index 2b35018c03f60..c38192518d8d0 100644
--- a/packages/playwright-ct-svelte/package.json
+++ b/packages/playwright-ct-svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/experimental-ct-svelte",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright Component Testing for Svelte",
   "repository": {
     "type": "git",
@@ -30,11 +30,11 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@playwright/experimental-ct-core": "1.46.0-next",
-    "@sveltejs/vite-plugin-svelte": "^3.0.1"
+    "@playwright/experimental-ct-core": "1.55.1",
+    "@sveltejs/vite-plugin-svelte": "^5.1.0"
   },
   "devDependencies": {
-    "svelte": "^4.2.8"
+    "svelte": "^5.37.3"
   },
   "bin": {
     "playwright": "cli.js"
diff --git a/packages/playwright-ct-svelte/registerSource.mjs b/packages/playwright-ct-svelte/registerSource.mjs
index 5901458813fb5..1d8f068d0151d 100644
--- a/packages/playwright-ct-svelte/registerSource.mjs
+++ b/packages/playwright-ct-svelte/registerSource.mjs
@@ -17,10 +17,10 @@
 // @ts-check
 
 // This file is injected into the registry as text, no dependencies are allowed.
+import { createRawSnippet } from 'svelte';
+import { asClassComponent } from 'svelte/legacy';
 
-import { detach as __pwDetach, insert as __pwInsert, noop as __pwNoop } from 'svelte/internal';
-
-/** @typedef {import('../playwright-ct-core/types/component').Component} Component */
+/** @typedef {import('../playwright-ct-core/types/component').Component} PlaywrightComponent */
 /** @typedef {import('../playwright-ct-core/types/component').ObjectComponent} ObjectComponent */
 /** @typedef {any} FrameworkComponent */
 /** @typedef {import('svelte').SvelteComponent} SvelteComponent */
@@ -33,36 +33,23 @@ function isObjectComponent(component) {
   return typeof component === 'object' && component && component.__pw_type === 'object-component';
 }
 
-/**
- * TODO: remove this function when the following issue is fixed:
- * https://github.com/sveltejs/svelte/issues/2588
- */
-function __pwCreateSlots(slots) {
-  const svelteSlots = {};
-
-  for (const slotName in slots) {
-    const template = document
-        .createRange()
-        .createContextualFragment(slots[slotName]);
-    svelteSlots[slotName] = [createSlotFn(template)];
-  }
+/** @type {( component: ObjectComponent ) => Record<string, any>} */
+function extractProps(component) {
+  let { props, slots } = component;
 
-  function createSlotFn(element) {
-    return function() {
-      return {
-        c: __pwNoop,
-        m: function mount(target, anchor) {
-          __pwInsert(target, element, anchor);
-        },
-        d: function destroy(detaching) {
-          if (detaching)
-            __pwDetach(element);
-        },
-        l: __pwNoop,
-      };
-    };
-  }
-  return svelteSlots;
+  // Svelte 5 dropped support for the old slot implementation in exchange for prop-based "snippets". Continue
+  // supporting string snippets in Playwright
+  slots = Object.fromEntries(
+    Object.entries(slots ?? {}).map(([key, snippet]) => {
+      if (typeof snippet === "string") {
+        return [key, createRawSnippet(() => ({ render: () => snippet }))];
+      }
+
+      return [key, snippet]
+    })
+  );
+
+  return { ...props, ...slots };
 }
 
 const __pwSvelteComponentKey = Symbol('svelteComponent');
@@ -71,23 +58,20 @@ window.playwrightMount = async (component, rootElement, hooksConfig) => {
   if (!isObjectComponent(component))
     throw new Error('JSX mount notation is not supported');
 
-  const objectComponent = component;
-  const componentCtor = component.type;
+  const componentCtor = asClassComponent(component.type);
+  const props = extractProps(component);
 
   class App extends componentCtor {
     constructor(options = {}) {
       super({
         target: rootElement,
-        props: {
-          ...objectComponent.props,
-          $$slots: __pwCreateSlots(objectComponent.slots),
-          $$scope: {},
-        },
+        props,
         ...options
       });
     }
   }
 
+  /** @type {SvelteComponent | undefined} */
   let svelteComponent;
   for (const hook of window.__pw_hooks_before_mount || [])
     svelteComponent = await hook({ hooksConfig, App });
@@ -97,9 +81,6 @@ window.playwrightMount = async (component, rootElement, hooksConfig) => {
 
   rootElement[__pwSvelteComponentKey] = svelteComponent;
 
-  for (const [key, listener] of Object.entries(objectComponent.on || {}))
-    svelteComponent.$on(key, event => listener(event.detail));
-
   for (const hook of window.__pw_hooks_after_mount || [])
     await hook({ hooksConfig, svelteComponent });
 };
@@ -120,9 +101,5 @@ window.playwrightUpdate = async (rootElement, component) => {
   if (!svelteComponent)
     throw new Error('Component was not mounted');
 
-  for (const [key, listener] of Object.entries(component.on || {}))
-    svelteComponent.$on(key, event => listener(event.detail));
-
-  if (component.props)
-    svelteComponent.$set(component.props);
+  svelteComponent.$set(extractProps(component));
 };
diff --git a/packages/playwright-ct-vue/index.d.ts b/packages/playwright-ct-vue/index.d.ts
index 2d182d4588dc1..822711f4b6660 100644
--- a/packages/playwright-ct-vue/index.d.ts
+++ b/packages/playwright-ct-vue/index.d.ts
@@ -55,7 +55,7 @@ export interface MountResultJsx extends Locator {
 export const test: TestType<{
   mount<HooksConfig>(
     component: JSX.Element,
-    options: MountOptionsJsx<HooksConfig>
+    options?: MountOptionsJsx<HooksConfig>
   ): Promise<MountResultJsx>;
   mount<HooksConfig, Component = unknown>(
     component: Component,
diff --git a/packages/playwright-ct-vue/package.json b/packages/playwright-ct-vue/package.json
index fdda54207ab41..2c077f816c9d7 100644
--- a/packages/playwright-ct-vue/package.json
+++ b/packages/playwright-ct-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/experimental-ct-vue",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "Playwright Component Testing for Vue",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@playwright/experimental-ct-core": "1.46.0-next",
-    "@vitejs/plugin-vue": "^4.2.1"
+    "@playwright/experimental-ct-core": "1.55.1",
+    "@vitejs/plugin-vue": "^5.2.0"
   },
   "bin": {
     "playwright": "cli.js"
diff --git a/packages/playwright-ct-vue/registerSource.mjs b/packages/playwright-ct-vue/registerSource.mjs
index 07ce5298f41ca..33bc74e731594 100644
--- a/packages/playwright-ct-vue/registerSource.mjs
+++ b/packages/playwright-ct-vue/registerSource.mjs
@@ -188,7 +188,7 @@ function __pwWrapFunctions(slots) {
     for (const [key, value] of Object.entries(slots || {}))
       slotsWithRenderFunctions[key] = () => [value];
   } else if (slots?.length) {
-    slots['default'] = () => slots;
+    slotsWithRenderFunctions['default'] = () => slots;
   }
   return slotsWithRenderFunctions;
 }
diff --git a/packages/playwright-ct-vue2/.npmignore b/packages/playwright-ct-vue2/.npmignore
deleted file mode 100644
index 62701eb493652..0000000000000
--- a/packages/playwright-ct-vue2/.npmignore
+++ /dev/null
@@ -1,12 +0,0 @@
-**/*
-
-!README.md
-!LICENSE
-!cli.js
-!register.d.ts
-!register.mjs
-!registerSource.mjs
-!index.d.ts
-!index.js
-!hooks.d.ts
-!hooks.mjs
diff --git a/packages/playwright-ct-vue2/README.md b/packages/playwright-ct-vue2/README.md
deleted file mode 100644
index 23ae82312d5c6..0000000000000
--- a/packages/playwright-ct-vue2/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-> **BEWARE** This package is EXPERIMENTAL and does not respect semver.
-
-Read more at https://playwright.dev/docs/test-components
diff --git a/packages/playwright-ct-vue2/hooks.d.ts b/packages/playwright-ct-vue2/hooks.d.ts
deleted file mode 100644
index 5009f44348d37..0000000000000
--- a/packages/playwright-ct-vue2/hooks.d.ts
+++ /dev/null
@@ -1,37 +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 { ComponentOptions } from 'vue';
-import type { CombinedVueInstance, Vue, VueConstructor } from 'vue/types/vue';
-
-export declare function beforeMount<HooksConfig>(
-  callback: (params: {
-    hooksConfig?: HooksConfig,
-    Vue: VueConstructor<Vue>,
-  }) => Promise<void | ComponentOptions<Vue> & Record<string, unknown>>
-): void;
-export declare function afterMount<HooksConfig>(
-  callback: (params: {
-    hooksConfig?: HooksConfig;
-    instance: CombinedVueInstance<
-      Vue,
-      object,
-      object,
-      object,
-      Record<never, any>
-    >;
-  }) => Promise<void>
-): void;
diff --git a/packages/playwright-ct-vue2/hooks.mjs b/packages/playwright-ct-vue2/hooks.mjs
deleted file mode 100644
index b7cea242c41e0..0000000000000
--- a/packages/playwright-ct-vue2/hooks.mjs
+++ /dev/null
@@ -1,29 +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.
- */
-
-const __pw_hooks_before_mount = [];
-const __pw_hooks_after_mount = [];
-
-window.__pw_hooks_before_mount = __pw_hooks_before_mount;
-window.__pw_hooks_after_mount = __pw_hooks_after_mount;
-
-export const beforeMount = callback => {
-  __pw_hooks_before_mount.push(callback);
-};
-
-export const afterMount = callback => {
-  __pw_hooks_after_mount.push(callback);
-};
diff --git a/packages/playwright-ct-vue2/index.d.ts b/packages/playwright-ct-vue2/index.d.ts
deleted file mode 100644
index 133b4a60f20d4..0000000000000
--- a/packages/playwright-ct-vue2/index.d.ts
+++ /dev/null
@@ -1,66 +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 { TestType, Locator } from '@playwright/experimental-ct-core';
-
-type Slot = string | string[];
-type ComponentSlots = Record<string, Slot> & { default?: Slot };
-
-type ComponentEvents = Record<string, Function>;
-
-// Copied from: https://github.com/vuejs/language-tools/blob/master/packages/vue-component-type-helpers/index.d.ts#L10-L13
-type ComponentProps<T> =
-	T extends new (...angs: any) => { $props: infer P; } ? NonNullable<P> :
-	T extends (props: infer P, ...args: any) => any ? P :
-	{};
-
-export interface MountOptions<HooksConfig, Component> {
-  props?: ComponentProps<Component>;
-  slots?: ComponentSlots;
-  on?: ComponentEvents;
-  hooksConfig?: HooksConfig;
-}
-
-export interface MountOptionsJsx<HooksConfig> {
-  hooksConfig?: HooksConfig;
-}
-
-export interface MountResult<Component> extends Locator {
-  unmount(): Promise<void>;
-  update(options: {
-    props?: Partial<ComponentProps<Component>>;
-    slots?: Partial<ComponentSlots>;
-    on?: Partial<ComponentEvents>;
-  }): Promise<void>;
-}
-
-export interface MountResultJsx extends Locator {
-  unmount(): Promise<void>;
-  update(component: JSX.Element): Promise<void>;
-}
-
-export const test: TestType<{
-  mount<HooksConfig>(
-    component: JSX.Element,
-    options?: MountOptionsJsx<HooksConfig>
-  ): Promise<MountResultJsx>;
-  mount<HooksConfig, Component = unknown>(
-    component: Component,
-    options?: MountOptions<HooksConfig, Component>
-  ): Promise<MountResult<Component>>;
-}>;
-
-export { defineConfig, PlaywrightTestConfig, expect, devices } from '@playwright/experimental-ct-core';
diff --git a/packages/playwright-ct-vue2/index.js b/packages/playwright-ct-vue2/index.js
deleted file mode 100644
index 2eeabb0d08b55..0000000000000
--- a/packages/playwright-ct-vue2/index.js
+++ /dev/null
@@ -1,33 +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.
- */
-
-const { test, expect, devices, defineConfig: originalDefineConfig } = require('@playwright/experimental-ct-core');
-const path = require('path');
-
-const defineConfig = (config, ...configs) => {
-  return originalDefineConfig({
-    ...config,
-    '@playwright/test': {
-      packageJSON: require.resolve('./package.json'),
-    },
-    '@playwright/experimental-ct-core': {
-      registerSourceFile: path.join(__dirname, 'registerSource.mjs'),
-      frameworkPluginFactory: () => import('@vitejs/plugin-vue2').then(plugin => plugin.default()),
-    },
-  }, ...configs);
-};
-
-module.exports = { test, expect, devices, defineConfig };
diff --git a/packages/playwright-ct-vue2/package.json b/packages/playwright-ct-vue2/package.json
deleted file mode 100644
index 70981c4f9b5cb..0000000000000
--- a/packages/playwright-ct-vue2/package.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "@playwright/experimental-ct-vue2",
-  "version": "1.46.0-next",
-  "description": "Playwright Component Testing for Vue2",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/microsoft/playwright.git"
-  },
-  "homepage": "https://playwright.dev",
-  "engines": {
-    "node": ">=18"
-  },
-  "author": {
-    "name": "Microsoft Corporation"
-  },
-  "license": "Apache-2.0",
-  "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "default": "./index.js"
-    },
-    "./register": {
-      "types": "./register.d.ts",
-      "default": "./register.mjs"
-    },
-    "./hooks": {
-      "types": "./hooks.d.ts",
-      "default": "./hooks.mjs"
-    },
-    "./package.json": "./package.json"
-  },
-  "dependencies": {
-    "@playwright/experimental-ct-core": "1.46.0-next",
-    "@vitejs/plugin-vue2": "^2.2.0"
-  },
-  "devDependencies": {
-    "vue": "^2.7.14"
-  },
-  "bin": {
-    "playwright": "cli.js"
-  }
-}
diff --git a/packages/playwright-ct-vue2/registerSource.mjs b/packages/playwright-ct-vue2/registerSource.mjs
deleted file mode 100644
index 19b4d41c085c5..0000000000000
--- a/packages/playwright-ct-vue2/registerSource.mjs
+++ /dev/null
@@ -1,212 +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-check
-
-// This file is injected into the registry as text, no dependencies are allowed.
-
-import __pwVue, { h as __pwH } from 'vue';
-
-/** @typedef {import('../playwright-ct-core/types/component').Component} Component */
-/** @typedef {import('../playwright-ct-core/types/component').JsxComponent} JsxComponent */
-/** @typedef {import('../playwright-ct-core/types/component').ObjectComponent} ObjectComponent */
-/** @typedef {import('vue').Component} FrameworkComponent */
-
-/**
- * @param {any} component
- * @returns {component is ObjectComponent}
- */
-function isObjectComponent(component) {
-  return typeof component === 'object' && component && component.__pw_type === 'object-component';
-}
-
-/**
- * @param {any} component
- * @returns {component is JsxComponent}
- */
-function isJsxComponent(component) {
-  return typeof component === 'object' && component && component.__pw_type === 'jsx';
-}
-
-/**
- * @param {any} child
- */
-function __pwCreateChild(child) {
-  if (Array.isArray(child))
-    return child.map(grandChild => __pwCreateChild(grandChild));
-  if (isJsxComponent(child) || isObjectComponent(child))
-    return __pwCreateWrapper(child);
-  return child;
-}
-
-/**
- * Exists to support fallthrough attributes:
- * https://vuejs.org/guide/components/attrs.html#fallthrough-attributes
- * @param {any} Component
- * @param {string} key
- * @return {boolean}
- */
-function __pwComponentHasKeyInProps(Component, key) {
-  return typeof Component.props === 'object' && Component.props && key in Component.props;
-}
-
-/**
- * @param {JsxComponent} component
- * @returns {any[] | undefined}
- */
-function __pwJsxChildArray(component) {
-  if (!component.props.children)
-    return;
-  if (Array.isArray(component.props.children))
-    return component.props.children;
-  return [component.props.children];
-}
-
-/**
- * @param {Component} component
- */
-function __pwCreateComponent(component) {
-  const isVueComponent = typeof component.type !== 'string';
-
-  /**
-   * @type {(import('vue').VNode | string)[]}
-   */
-  const children = [];
-
-  /** @type {import('vue').VNodeData} */
-  const nodeData = {};
-  nodeData.attrs = {};
-  nodeData.props = {};
-  nodeData.scopedSlots = {};
-  nodeData.on = {};
-
-  if (component.__pw_type === 'jsx') {
-    for (const child of __pwJsxChildArray(component) || []) {
-      if (isJsxComponent(child) && child.type === 'template') {
-        const slotProperty = Object.keys(child.props).find(k => k.startsWith('v-slot:'));
-        const slot = slotProperty ? slotProperty.substring('v-slot:'.length) : 'default';
-        nodeData.scopedSlots[slot] = () => __pwJsxChildArray(child)?.map(c => __pwCreateChild(c));
-      } else {
-        children.push(__pwCreateChild(child));
-      }
-    }
-
-    for (const [key, value] of Object.entries(component.props)) {
-      if (key.startsWith('v-on:')) {
-        const event = key.substring('v-on:'.length);
-        nodeData.on[event] = value;
-      } else {
-        if (isVueComponent && __pwComponentHasKeyInProps(component.type, key))
-          nodeData.props[key] = value;
-        else
-          nodeData.attrs[key] = value;
-      }
-    }
-  }
-
-  if (component.__pw_type === 'object-component') {
-    // Vue test util syntax.
-    for (const [key, value] of Object.entries(component.slots || {})) {
-      const list = (Array.isArray(value) ? value : [value]).map(v => __pwCreateChild(v));
-      if (key === 'default')
-        children.push(...list);
-      else
-        nodeData.scopedSlots[key] = () => list;
-    }
-    nodeData.props = component.props || {};
-    for (const [key, value] of Object.entries(component.on || {}))
-      nodeData.on[key] = value;
-  }
-
-  /** @type {(string|import('vue').VNode)[] | undefined} */
-  let lastArg;
-  if (Object.entries(nodeData.scopedSlots).length) {
-    if (children.length)
-      nodeData.scopedSlots.default = () => children;
-  } else if (children.length) {
-    lastArg = children;
-  }
-
-  return { Component: component.type, nodeData, slots: lastArg };
-}
-
-/**
- * @param {Component} component
- * @returns {import('vue').VNode}
- */
-function __pwCreateWrapper(component) {
-  const { Component, nodeData, slots } = __pwCreateComponent(component);
-  const wrapper = __pwH(Component, nodeData, slots);
-  return wrapper;
-}
-
-const instanceKey = Symbol('instanceKey');
-const wrapperKey = Symbol('wrapperKey');
-
-window.playwrightMount = async (component, rootElement, hooksConfig) => {
-  let options = {};
-  for (const hook of window.__pw_hooks_before_mount || [])
-    options = await hook({ hooksConfig, Vue: __pwVue });
-
-  const instance = new __pwVue({
-    ...options,
-    render: () => {
-      const wrapper = __pwCreateWrapper(component);
-      /** @type {any} */ (rootElement)[wrapperKey] = wrapper;
-      return wrapper;
-    },
-  }).$mount();
-  rootElement.appendChild(instance.$el);
-  /** @type {any} */ (rootElement)[instanceKey] = instance;
-
-  for (const hook of window.__pw_hooks_after_mount || [])
-    await hook({ hooksConfig, instance });
-};
-
-window.playwrightUnmount = async rootElement => {
-  const component = rootElement[instanceKey];
-  if (!component)
-    throw new Error('Component was not mounted');
-  component.$destroy();
-  component.$el.remove();
-  delete rootElement[instanceKey];
-};
-
-window.playwrightUpdate = async (element, options) => {
-  const wrapper = /** @type {any} */(element)[wrapperKey];
-  if (!wrapper)
-    throw new Error('Component was not mounted');
-
-  const component = wrapper.componentInstance;
-  if (!component)
-    throw new Error('Updating a native HTML element is not supported');
-
-  const { nodeData, slots } = __pwCreateComponent(options);
-
-  for (const [name, value] of Object.entries(nodeData.on || {})) {
-    component.$on(name, value);
-    component.$listeners[name] = value;
-  }
-
-  Object.assign(component.$scopedSlots, nodeData.scopedSlots);
-  component.$slots.default = slots;
-
-  for (const [key, value] of Object.entries(nodeData.props || {}))
-    component[key] = value;
-
-  if (!Object.keys(nodeData.props || {}).length)
-    component.$forceUpdate();
-};
diff --git a/packages/playwright-firefox/package.json b/packages/playwright-firefox/package.json
index 4f8d5ce8b1c70..ad1e0272a6e34 100644
--- a/packages/playwright-firefox/package.json
+++ b/packages/playwright-firefox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playwright-firefox",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate Firefox",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
     "install": "node install.js"
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   }
 }
diff --git a/packages/playwright-test-mcp/README.md b/packages/playwright-test-mcp/README.md
new file mode 100644
index 0000000000000..a3c65d33b8905
--- /dev/null
+++ b/packages/playwright-test-mcp/README.md
@@ -0,0 +1 @@
+# 🎭 Experimental
diff --git a/packages/playwright-ct-solid/cli.js b/packages/playwright-test-mcp/cli.js
similarity index 89%
rename from packages/playwright-ct-solid/cli.js
rename to packages/playwright-test-mcp/cli.js
index 9cc834ee95e85..8a49330f8f17c 100755
--- a/packages/playwright-ct-solid/cli.js
+++ b/packages/playwright-test-mcp/cli.js
@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 
-const { program } = require('@playwright/experimental-ct-core/lib/program');
-
+const { program } = require('./lib/program');
 program.parse(process.argv);
+
diff --git a/packages/playwright-test-mcp/package.json b/packages/playwright-test-mcp/package.json
new file mode 100644
index 0000000000000..2ad295098596b
--- /dev/null
+++ b/packages/playwright-test-mcp/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "@playwright/test-runner-mcp",
+  "version": "0.0.1",
+  "private": true,
+  "description": "Experimental MCP server for Playwright Test",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/microsoft/playwright.git"
+  },
+  "homepage": "https://playwright.dev",
+  "engines": {
+    "node": ">=18"
+  },
+  "author": {
+    "name": "Microsoft Corporation"
+  },
+  "license": "Apache-2.0",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./index.mjs",
+      "require": "./index.js",
+      "default": "./index.js"
+    },
+    "./cli": "./cli.js",
+    "./package.json": "./package.json",
+    "./reporter": "./reporter.js"
+  },
+  "bin": {
+    "mcp-server-playwright-test": "cli.js"
+  },
+  "scripts": {},
+  "dependencies": {
+    "commander": "^13.1.0",
+    "playwright": "1.55.1",
+    "playwright-core": "1.55.1"
+  }
+}
diff --git a/packages/playwright-core/src/utils/crypto.ts b/packages/playwright-test-mcp/src/context.ts
similarity index 65%
rename from packages/playwright-core/src/utils/crypto.ts
rename to packages/playwright-test-mcp/src/context.ts
index f3e47f69933a5..aa20aac081cca 100644
--- a/packages/playwright-core/src/utils/crypto.ts
+++ b/packages/playwright-test-mcp/src/context.ts
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-import crypto from 'crypto';
+import { TestRunner } from 'playwright/lib/runner/testRunner';
 
-export function createGuid(): string {
-  return crypto.randomBytes(16).toString('hex');
-}
+import type { ConfigLocation } from 'playwright/lib/common/config';
+
+export class Context {
+  readonly testRunner: TestRunner;
+
+  constructor(configLocation: ConfigLocation) {
+    this.testRunner = new TestRunner(configLocation, {});
+  }
 
-export function calculateSha1(buffer: Buffer | string): string {
-  const hash = crypto.createHash('sha1');
-  hash.update(buffer);
-  return hash.digest('hex');
+  async close() {
+  }
 }
diff --git a/packages/playwright-test-mcp/src/program.ts b/packages/playwright-test-mcp/src/program.ts
new file mode 100644
index 0000000000000..763eb5aa2495d
--- /dev/null
+++ b/packages/playwright-test-mcp/src/program.ts
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import path from 'path';
+import { program } from 'commander';
+import { resolveConfigLocation } from 'playwright/lib/common/configLoader';
+
+import * as mcp from 'playwright/src/mcp/exports.js';
+import { TestServerBackend } from './testServerBackend.js';
+
+program
+    .version('Version 0.0.1')
+    .name('playwright-test-mcp')
+    .option('--config <file>', 'Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"')
+    .option('--host <host>', 'host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.')
+    .option('--port <port>', 'port to listen on for SSE transport.')
+    .action(async options => {
+      const resolvedLocation = resolveConfigLocation(options.config);
+      // eslint-disable-next-line no-console
+      console.error('Test config: ', path.relative(process.cwd(), resolvedLocation.resolvedConfigFile ?? resolvedLocation.configDir));
+      const serverBackendFactory = () => new TestServerBackend(resolvedLocation);
+      await mcp.start(serverBackendFactory, options);
+    });
+
+export { program };
diff --git a/packages/playwright-ct-solid/register.mjs b/packages/playwright-test-mcp/src/streams.ts
similarity index 67%
rename from packages/playwright-ct-solid/register.mjs
rename to packages/playwright-test-mcp/src/streams.ts
index ca6a6a12d9933..d02664e10373d 100644
--- a/packages/playwright-ct-solid/register.mjs
+++ b/packages/playwright-test-mcp/src/streams.ts
@@ -14,8 +14,17 @@
  * limitations under the License.
  */
 
-import { pwRegister } from './registerSource.mjs';
+import { Writable } from 'stream';
 
-export default components => {
-  pwRegister(components);
-};
+export class StringWriteStream extends Writable {
+  private _chunks: string[] = [];
+
+  override _write(chunk: any, encoding: any, callback: any) {
+    this._chunks.push(chunk.toString());
+    callback();
+  }
+
+  content() {
+    return this._chunks.join('');
+  }
+}
diff --git a/packages/playwright-test-mcp/src/testServerBackend.ts b/packages/playwright-test-mcp/src/testServerBackend.ts
new file mode 100644
index 0000000000000..c3a8c5fe166ec
--- /dev/null
+++ b/packages/playwright-test-mcp/src/testServerBackend.ts
@@ -0,0 +1,51 @@
+/**
+ * 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 * as mcp from 'playwright/src/mcp/exports';
+import { Context } from './context';
+import { listTests } from './tools/listTests';
+import { runTests } from './tools/runTests';
+
+import type { ConfigLocation } from 'playwright/lib/common/config';
+import type { Tool } from './tool';
+
+export class TestServerBackend implements mcp.ServerBackend {
+  readonly name = 'Playwright';
+  readonly version = '0.0.1';
+  private _tools: Tool<any>[] = [listTests, runTests];
+  private _context: Context;
+
+  constructor(resolvedLocation: ConfigLocation) {
+    this._context = new Context(resolvedLocation);
+  }
+
+  async initialize() {
+  }
+
+  async listTools(): Promise<mcp.Tool[]> {
+    return this._tools.map(tool => mcp.toMcpTool(tool.schema));
+  }
+
+  async callTool(name: string, args: mcp.CallToolRequest['params']['arguments']): Promise<mcp.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();
+  }
+}
diff --git a/packages/playwright-test-mcp/src/tool.ts b/packages/playwright-test-mcp/src/tool.ts
new file mode 100644
index 0000000000000..28b05159d4c1b
--- /dev/null
+++ b/packages/playwright-test-mcp/src/tool.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 mcp from 'playwright/src/mcp/exports.js';
+
+export type Tool<Input extends z.Schema = z.Schema> = {
+  schema: mcp.ToolSchema<Input>;
+  handle: (context: Context, params: z.output<Input>) => Promise<mcp.CallToolResult>;
+};
+
+export function defineTool<Input extends z.Schema>(tool: Tool<Input>): Tool<Input> {
+  return tool;
+}
diff --git a/packages/playwright-test-mcp/src/tools/listTests.ts b/packages/playwright-test-mcp/src/tools/listTests.ts
new file mode 100644
index 0000000000000..1ebe85de6032f
--- /dev/null
+++ b/packages/playwright-test-mcp/src/tools/listTests.ts
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import path from 'path';
+import { z } from 'zod';
+import { defineTool } from '../tool.js';
+
+import type * as reporterTypes from 'playwright/types/testReporter';
+
+export const listTests = defineTool({
+  schema: {
+    name: 'playwright_test_list_tests',
+    title: 'List tests',
+    description: 'List tests',
+    inputSchema: z.object({}),
+    type: 'readOnly',
+  },
+
+  handle: async (context, params) => {
+    const reporter = new ListModeReporter();
+    await context.testRunner.listTests(reporter, {});
+
+    if (reporter.hasErrors())
+      throw new Error(reporter.content());
+
+    return {
+      content: [{ type: 'text', text: reporter.content() }],
+    };
+  },
+});
+
+class ListModeReporter implements reporterTypes.Reporter {
+  private _lines: string[] = [];
+  private _hasErrors = false;
+
+  onBegin(config: reporterTypes.FullConfig, suite: reporterTypes.Suite): void {
+    this._lines.push(`Listing tests:`);
+    const tests = suite.allTests();
+    const files = new Set<string>();
+    for (const test of tests) {
+      // root, project, file, ...describes, test
+      const [, projectName, , ...titles] = test.titlePath();
+      const location = `${path.relative(config.rootDir, test.location.file)}:${test.location.line}:${test.location.column}`;
+      const projectTitle = projectName ? `[${projectName}] › ` : '';
+      this._lines.push(`  [id=${test.id}] ${projectTitle}${location} › ${titles.join(' › ')}`);
+      files.add(test.location.file);
+    }
+    this._lines.push(`Total: ${tests.length} ${tests.length === 1 ? 'test' : 'tests'} in ${files.size} ${files.size === 1 ? 'file' : 'files'}`);
+  }
+
+  onError(error: reporterTypes.TestError) {
+    this._hasErrors = true;
+    this._lines.push(error.stack || error.message || error.value || '');
+  }
+
+  hasErrors(): boolean {
+    return this._hasErrors;
+  }
+
+  content(): string {
+    return this._lines.join('\n');
+  }
+}
diff --git a/packages/playwright-test-mcp/src/tools/runTests.ts b/packages/playwright-test-mcp/src/tools/runTests.ts
new file mode 100644
index 0000000000000..40fcf860c0fe0
--- /dev/null
+++ b/packages/playwright-test-mcp/src/tools/runTests.ts
@@ -0,0 +1,62 @@
+/**
+ * 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 { noColors } from 'playwright-core/lib/utils';
+import { terminalScreen } from 'playwright/lib/reporters/base';
+import ListReporter from 'playwright/lib/reporters/list';
+
+import { defineTool } from '../tool';
+import { StringWriteStream } from '../streams';
+
+export const runTests = defineTool({
+  schema: {
+    name: 'playwright_test_run_tests',
+    title: 'Run tests',
+    description: 'Run tests',
+    inputSchema: z.object({
+      tests: z.array(z.object({
+        id: z.string().describe('Test ID to run.'),
+        title: z.string().describe('Human readable test title for granting permission to run the test.'),
+      })).optional().describe('Tests to run. All tests are run if not provided.'),
+    }),
+    type: 'readOnly',
+  },
+
+  handle: async (context, params) => {
+    const stream = new StringWriteStream();
+    const screen = {
+      ...terminalScreen,
+      isTTY: false,
+      colors: noColors,
+      stdout: stream as unknown as NodeJS.WriteStream,
+      stderr: stream as unknown as NodeJS.WriteStream,
+    };
+    const configDir = context.testRunner.configLocation.configDir;
+    const reporter = new ListReporter({ configDir, screen });
+    const result = await context.testRunner.runTests(reporter, {
+      testIds: params.tests?.map(test => test.id),
+    });
+    const text = stream.content();
+
+    return {
+      content: [
+        { type: 'text', text },
+      ],
+      isError: result.status !== 'passed',
+    };
+  },
+});
diff --git a/packages/playwright-test/package.json b/packages/playwright-test/package.json
index 6865e972ae21a..14b89f44ea15e 100644
--- a/packages/playwright-test/package.json
+++ b/packages/playwright-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@playwright/test",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
   },
   "scripts": {},
   "dependencies": {
-    "playwright": "1.46.0-next"
+    "playwright": "1.55.1"
   }
 }
diff --git a/packages/playwright-webkit/package.json b/packages/playwright-webkit/package.json
index c8d70d5277620..1bf9f7838e07c 100644
--- a/packages/playwright-webkit/package.json
+++ b/packages/playwright-webkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playwright-webkit",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate WebKit",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
     "install": "node install.js"
   },
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   }
 }
diff --git a/packages/playwright/.eslintrc.js b/packages/playwright/.eslintrc.js
deleted file mode 100644
index b7e707b35ffd1..0000000000000
--- a/packages/playwright/.eslintrc.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  extends: '../../.eslintrc-with-ts-config.js',
-  rules: {
-    '@typescript-eslint/no-floating-promises': 'error',
-  },
-};
diff --git a/packages/playwright/ThirdPartyNotices.txt b/packages/playwright/ThirdPartyNotices.txt
index 21bb22354964c..cdfac862b8b2f 100644
--- a/packages/playwright/ThirdPartyNotices.txt
+++ b/packages/playwright/ThirdPartyNotices.txt
@@ -5,156 +5,227 @@ THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
 This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
 
 -	@ampproject/remapping@2.2.1 (https://github.com/ampproject/remapping)
--	@babel/code-frame@7.22.5 (https://github.com/babel/babel)
--	@babel/code-frame@7.24.2 (https://github.com/babel/babel)
--	@babel/compat-data@7.23.5 (https://github.com/babel/babel)
--	@babel/core@7.24.4 (https://github.com/babel/babel)
--	@babel/generator@7.24.4 (https://github.com/babel/babel)
--	@babel/helper-annotate-as-pure@7.22.5 (https://github.com/babel/babel)
--	@babel/helper-compilation-targets@7.23.6 (https://github.com/babel/babel)
--	@babel/helper-create-class-features-plugin@7.24.4 (https://github.com/babel/babel)
--	@babel/helper-environment-visitor@7.22.20 (https://github.com/babel/babel)
--	@babel/helper-function-name@7.23.0 (https://github.com/babel/babel)
--	@babel/helper-hoist-variables@7.22.5 (https://github.com/babel/babel)
--	@babel/helper-member-expression-to-functions@7.23.0 (https://github.com/babel/babel)
--	@babel/helper-module-imports@7.22.15 (https://github.com/babel/babel)
--	@babel/helper-module-transforms@7.23.3 (https://github.com/babel/babel)
--	@babel/helper-optimise-call-expression@7.22.5 (https://github.com/babel/babel)
--	@babel/helper-plugin-utils@7.24.0 (https://github.com/babel/babel)
--	@babel/helper-replace-supers@7.24.1 (https://github.com/babel/babel)
--	@babel/helper-simple-access@7.22.5 (https://github.com/babel/babel)
--	@babel/helper-skip-transparent-expression-wrappers@7.22.5 (https://github.com/babel/babel)
--	@babel/helper-split-export-declaration@7.22.6 (https://github.com/babel/babel)
--	@babel/helper-string-parser@7.23.4 (https://github.com/babel/babel)
--	@babel/helper-validator-identifier@7.22.20 (https://github.com/babel/babel)
--	@babel/helper-validator-identifier@7.22.5 (https://github.com/babel/babel)
--	@babel/helper-validator-option@7.23.5 (https://github.com/babel/babel)
--	@babel/helpers@7.24.4 (https://github.com/babel/babel)
--	@babel/highlight@7.22.5 (https://github.com/babel/babel)
--	@babel/highlight@7.24.2 (https://github.com/babel/babel)
--	@babel/parser@7.24.4 (https://github.com/babel/babel)
--	@babel/plugin-proposal-decorators@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-proposal-explicit-resource-management@7.24.1 (https://github.com/babel/babel)
+-	@babel/code-frame@7.24.7 (https://github.com/babel/babel)
+-	@babel/code-frame@7.27.1 (https://github.com/babel/babel)
+-	@babel/compat-data@7.28.0 (https://github.com/babel/babel)
+-	@babel/core@7.28.0 (https://github.com/babel/babel)
+-	@babel/generator@7.28.0 (https://github.com/babel/babel)
+-	@babel/helper-annotate-as-pure@7.27.3 (https://github.com/babel/babel)
+-	@babel/helper-compilation-targets@7.27.2 (https://github.com/babel/babel)
+-	@babel/helper-create-class-features-plugin@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-globals@7.28.0 (https://github.com/babel/babel)
+-	@babel/helper-member-expression-to-functions@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-module-imports@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-module-transforms@7.27.3 (https://github.com/babel/babel)
+-	@babel/helper-optimise-call-expression@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-plugin-utils@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-replace-supers@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-skip-transparent-expression-wrappers@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-string-parser@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-validator-identifier@7.24.7 (https://github.com/babel/babel)
+-	@babel/helper-validator-identifier@7.27.1 (https://github.com/babel/babel)
+-	@babel/helper-validator-option@7.27.1 (https://github.com/babel/babel)
+-	@babel/helpers@7.28.2 (https://github.com/babel/babel)
+-	@babel/highlight@7.24.7 (https://github.com/babel/babel)
+-	@babel/parser@7.28.0 (https://github.com/babel/babel)
+-	@babel/plugin-proposal-decorators@7.28.0 (https://github.com/babel/babel)
 -	@babel/plugin-syntax-async-generators@7.8.4 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-generators)
--	@babel/plugin-syntax-class-static-block@7.14.5 (https://github.com/babel/babel)
--	@babel/plugin-syntax-decorators@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-syntax-explicit-resource-management@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-syntax-export-namespace-from@7.8.3 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-export-namespace-from)
--	@babel/plugin-syntax-import-attributes@7.24.1 (https://github.com/babel/babel)
+-	@babel/plugin-syntax-decorators@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-syntax-import-attributes@7.27.1 (https://github.com/babel/babel)
 -	@babel/plugin-syntax-json-strings@7.8.3 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-json-strings)
--	@babel/plugin-syntax-jsx@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-syntax-logical-assignment-operators@7.10.4 (https://github.com/babel/babel)
--	@babel/plugin-syntax-nullish-coalescing-operator@7.8.3 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-nullish-coalescing-operator)
--	@babel/plugin-syntax-numeric-separator@7.10.4 (https://github.com/babel/babel)
+-	@babel/plugin-syntax-jsx@7.27.1 (https://github.com/babel/babel)
 -	@babel/plugin-syntax-object-rest-spread@7.8.3 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-object-rest-spread)
 -	@babel/plugin-syntax-optional-catch-binding@7.8.3 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-catch-binding)
--	@babel/plugin-syntax-optional-chaining@7.8.3 (https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-optional-chaining)
--	@babel/plugin-syntax-private-property-in-object@7.14.5 (https://github.com/babel/babel)
--	@babel/plugin-syntax-typescript@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-class-properties@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-class-static-block@7.24.4 (https://github.com/babel/babel)
--	@babel/plugin-transform-export-namespace-from@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-logical-assignment-operators@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-modules-commonjs@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-nullish-coalescing-operator@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-numeric-separator@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-optional-chaining@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-private-methods@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-private-property-in-object@7.24.1 (https://github.com/babel/babel)
--	@babel/plugin-transform-react-jsx@7.23.4 (https://github.com/babel/babel)
--	@babel/plugin-transform-typescript@7.24.4 (https://github.com/babel/babel)
--	@babel/preset-typescript@7.24.1 (https://github.com/babel/babel)
--	@babel/template@7.24.0 (https://github.com/babel/babel)
--	@babel/traverse@7.24.1 (https://github.com/babel/babel)
--	@babel/types@7.24.0 (https://github.com/babel/babel)
--	@jest/expect-utils@29.5.0 (https://github.com/facebook/jest)
--	@jest/schemas@29.4.3 (https://github.com/facebook/jest)
--	@jest/types@29.5.0 (https://github.com/facebook/jest)
--	@jridgewell/gen-mapping@0.3.5 (https://github.com/jridgewell/gen-mapping)
+-	@babel/plugin-syntax-typescript@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-class-properties@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-class-static-block@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-destructuring@7.28.0 (https://github.com/babel/babel)
+-	@babel/plugin-transform-explicit-resource-management@7.28.0 (https://github.com/babel/babel)
+-	@babel/plugin-transform-export-namespace-from@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-logical-assignment-operators@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-modules-commonjs@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-nullish-coalescing-operator@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-numeric-separator@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-optional-chaining@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-private-methods@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-private-property-in-object@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-react-jsx@7.27.1 (https://github.com/babel/babel)
+-	@babel/plugin-transform-typescript@7.28.0 (https://github.com/babel/babel)
+-	@babel/preset-typescript@7.27.1 (https://github.com/babel/babel)
+-	@babel/template@7.27.2 (https://github.com/babel/babel)
+-	@babel/traverse@7.28.0 (https://github.com/babel/babel)
+-	@babel/types@7.28.2 (https://github.com/babel/babel)
+-	@jest/expect-utils@29.7.0 (https://github.com/jestjs/jest)
+-	@jest/schemas@29.6.3 (https://github.com/jestjs/jest)
+-	@jest/types@29.6.3 (https://github.com/jestjs/jest)
+-	@jridgewell/gen-mapping@0.3.12 (https://github.com/jridgewell/sourcemaps)
 -	@jridgewell/resolve-uri@3.1.1 (https://github.com/jridgewell/resolve-uri)
--	@jridgewell/set-array@1.2.1 (https://github.com/jridgewell/set-array)
--	@jridgewell/sourcemap-codec@1.4.15 (https://github.com/jridgewell/sourcemap-codec)
--	@jridgewell/trace-mapping@0.3.25 (https://github.com/jridgewell/trace-mapping)
--	@sinclair/typebox@0.25.24 (https://github.com/sinclairzx81/typebox)
--	@types/istanbul-lib-coverage@2.0.4 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/istanbul-lib-report@3.0.0 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/istanbul-reports@3.0.1 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/node@20.2.5 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/stack-utils@2.0.1 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/yargs-parser@21.0.0 (https://github.com/DefinitelyTyped/DefinitelyTyped)
--	@types/yargs@17.0.24 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@jridgewell/sourcemap-codec@1.5.4 (https://github.com/jridgewell/sourcemaps)
+-	@jridgewell/trace-mapping@0.3.29 (https://github.com/jridgewell/sourcemaps)
+-	@modelcontextprotocol/sdk@1.17.3 (https://github.com/modelcontextprotocol/typescript-sdk)
+-	@sinclair/typebox@0.27.8 (https://github.com/sinclairzx81/typebox)
+-	@types/istanbul-lib-coverage@2.0.6 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@types/istanbul-lib-report@3.0.3 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@types/istanbul-reports@3.0.4 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@types/node@22.5.4 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@types/stack-utils@2.0.3 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@types/yargs-parser@21.0.3 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	@types/yargs@17.0.33 (https://github.com/DefinitelyTyped/DefinitelyTyped)
+-	accepts@2.0.0 (https://github.com/jshttp/accepts)
+-	ajv@6.12.6 (https://github.com/ajv-validator/ajv)
 -	ansi-colors@4.1.3 (https://github.com/doowb/ansi-colors)
 -	ansi-styles@3.2.1 (https://github.com/chalk/ansi-styles)
 -	ansi-styles@4.3.0 (https://github.com/chalk/ansi-styles)
 -	ansi-styles@5.2.0 (https://github.com/chalk/ansi-styles)
 -	anymatch@3.1.3 (https://github.com/micromatch/anymatch)
 -	binary-extensions@2.2.0 (https://github.com/sindresorhus/binary-extensions)
--	braces@3.0.2 (https://github.com/micromatch/braces)
+-	body-parser@2.2.0 (https://github.com/expressjs/body-parser)
 -	braces@3.0.3 (https://github.com/micromatch/braces)
--	browserslist@4.22.2 (https://github.com/browserslist/browserslist)
+-	browserslist@4.25.1 (https://github.com/browserslist/browserslist)
 -	buffer-from@1.1.2 (https://github.com/LinusU/buffer-from)
--	caniuse-lite@1.0.30001579 (https://github.com/browserslist/caniuse-lite)
+-	bytes@3.1.2 (https://github.com/visionmedia/bytes.js)
+-	call-bind-apply-helpers@1.0.2 (https://github.com/ljharb/call-bind-apply-helpers)
+-	call-bound@1.0.4 (https://github.com/ljharb/call-bound)
+-	caniuse-lite@1.0.30001731 (https://github.com/browserslist/caniuse-lite)
 -	chalk@2.4.2 (https://github.com/chalk/chalk)
 -	chalk@4.1.2 (https://github.com/chalk/chalk)
 -	chokidar@3.6.0 (https://github.com/paulmillr/chokidar)
--	ci-info@3.8.0 (https://github.com/watson/ci-info)
--	codemirror-shadow-1@0.0.1 (https://github.com/codemirror/CodeMirror)
+-	ci-info@3.9.0 (https://github.com/watson/ci-info)
+-	codemirror@5.65.18 (https://github.com/codemirror/CodeMirror)
 -	color-convert@1.9.3 (https://github.com/Qix-/color-convert)
 -	color-convert@2.0.1 (https://github.com/Qix-/color-convert)
 -	color-name@1.1.3 (https://github.com/dfcreative/color-name)
 -	color-name@1.1.4 (https://github.com/colorjs/color-name)
+-	content-disposition@1.0.0 (https://github.com/jshttp/content-disposition)
+-	content-type@1.0.5 (https://github.com/jshttp/content-type)
 -	convert-source-map@2.0.0 (https://github.com/thlorenz/convert-source-map)
--	debug@4.3.4 (https://github.com/debug-js/debug)
--	diff-sequences@29.4.3 (https://github.com/facebook/jest)
--	electron-to-chromium@1.4.638 (https://github.com/kilian/electron-to-chromium)
+-	cookie-signature@1.2.2 (https://github.com/visionmedia/node-cookie-signature)
+-	cookie@0.7.2 (https://github.com/jshttp/cookie)
+-	cors@2.8.5 (https://github.com/expressjs/cors)
+-	cross-spawn@7.0.6 (https://github.com/moxystudio/node-cross-spawn)
+-	debug@4.4.0 (https://github.com/debug-js/debug)
+-	depd@2.0.0 (https://github.com/dougwilson/nodejs-depd)
+-	diff-sequences@29.6.3 (https://github.com/jestjs/jest)
+-	dunder-proto@1.0.1 (https://github.com/es-shims/dunder-proto)
+-	ee-first@1.1.1 (https://github.com/jonathanong/ee-first)
+-	electron-to-chromium@1.5.192 (https://github.com/kilian/electron-to-chromium)
+-	encodeurl@2.0.0 (https://github.com/pillarjs/encodeurl)
 -	enquirer@2.3.6 (https://github.com/enquirer/enquirer)
--	escalade@3.1.1 (https://github.com/lukeed/escalade)
+-	es-define-property@1.0.1 (https://github.com/ljharb/es-define-property)
+-	es-errors@1.3.0 (https://github.com/ljharb/es-errors)
+-	es-object-atoms@1.1.1 (https://github.com/ljharb/es-object-atoms)
+-	escalade@3.2.0 (https://github.com/lukeed/escalade)
+-	escape-html@1.0.3 (https://github.com/component/escape-html)
 -	escape-string-regexp@1.0.5 (https://github.com/sindresorhus/escape-string-regexp)
 -	escape-string-regexp@2.0.0 (https://github.com/sindresorhus/escape-string-regexp)
--	expect@29.5.0 (https://github.com/facebook/jest)
--	fill-range@7.0.1 (https://github.com/jonschlinkert/fill-range)
+-	etag@1.8.1 (https://github.com/jshttp/etag)
+-	eventsource-parser@3.0.3 (https://github.com/rexxars/eventsource-parser)
+-	eventsource@3.0.7 (git://git@github.com/EventSource/eventsource)
+-	express-rate-limit@7.5.1 (https://github.com/express-rate-limit/express-rate-limit)
+-	express@5.1.0 (https://github.com/expressjs/express)
+-	fast-deep-equal@3.1.3 (https://github.com/epoberezkin/fast-deep-equal)
+-	fast-json-stable-stringify@2.1.0 (https://github.com/epoberezkin/fast-json-stable-stringify)
 -	fill-range@7.1.1 (https://github.com/jonschlinkert/fill-range)
+-	finalhandler@2.1.0 (https://github.com/pillarjs/finalhandler)
+-	forwarded@0.2.0 (https://github.com/jshttp/forwarded)
+-	fresh@2.0.0 (https://github.com/jshttp/fresh)
+-	function-bind@1.1.2 (https://github.com/Raynos/function-bind)
 -	gensync@1.0.0-beta.2 (https://github.com/loganfsmyth/gensync)
+-	get-east-asian-width@1.3.0 (https://github.com/sindresorhus/get-east-asian-width)
+-	get-intrinsic@1.3.0 (https://github.com/ljharb/get-intrinsic)
+-	get-proto@1.0.1 (https://github.com/ljharb/get-proto)
 -	glob-parent@5.1.2 (https://github.com/gulpjs/glob-parent)
--	globals@11.12.0 (https://github.com/sindresorhus/globals)
+-	gopd@1.2.0 (https://github.com/ljharb/gopd)
 -	graceful-fs@4.2.11 (https://github.com/isaacs/node-graceful-fs)
 -	has-flag@3.0.0 (https://github.com/sindresorhus/has-flag)
 -	has-flag@4.0.0 (https://github.com/sindresorhus/has-flag)
+-	has-symbols@1.1.0 (https://github.com/inspect-js/has-symbols)
+-	hasown@2.0.2 (https://github.com/inspect-js/hasOwn)
+-	http-errors@2.0.0 (https://github.com/jshttp/http-errors)
+-	iconv-lite@0.6.3 (https://github.com/ashtuchkin/iconv-lite)
+-	inherits@2.0.4 (https://github.com/isaacs/inherits)
+-	ipaddr.js@1.9.1 (https://github.com/whitequark/ipaddr.js)
 -	is-binary-path@2.1.0 (https://github.com/sindresorhus/is-binary-path)
 -	is-extglob@2.1.1 (https://github.com/jonschlinkert/is-extglob)
 -	is-glob@4.0.3 (https://github.com/micromatch/is-glob)
 -	is-number@7.0.0 (https://github.com/jonschlinkert/is-number)
--	jest-diff@29.5.0 (https://github.com/facebook/jest)
--	jest-get-type@29.4.3 (https://github.com/facebook/jest)
--	jest-matcher-utils@29.5.0 (https://github.com/facebook/jest)
--	jest-message-util@29.5.0 (https://github.com/facebook/jest)
--	jest-util@29.5.0 (https://github.com/facebook/jest)
+-	is-promise@4.0.0 (https://github.com/then/is-promise)
+-	isexe@2.0.0 (https://github.com/isaacs/isexe)
+-	jest-diff@29.7.0 (https://github.com/jestjs/jest)
+-	jest-get-type@29.6.3 (https://github.com/jestjs/jest)
+-	jest-matcher-utils@29.7.0 (https://github.com/jestjs/jest)
+-	jest-message-util@29.7.0 (https://github.com/jestjs/jest)
+-	jest-mock@29.7.0 (https://github.com/jestjs/jest)
+-	jest-util@29.7.0 (https://github.com/jestjs/jest)
 -	js-tokens@4.0.0 (https://github.com/lydell/js-tokens)
--	jsesc@2.5.2 (https://github.com/mathiasbynens/jsesc)
+-	jsesc@3.1.0 (https://github.com/mathiasbynens/jsesc)
+-	json-schema-traverse@0.4.1 (https://github.com/epoberezkin/json-schema-traverse)
 -	json5@2.2.3 (https://github.com/json5/json5)
 -	lru-cache@5.1.1 (https://github.com/isaacs/node-lru-cache)
--	micromatch@4.0.5 (https://github.com/micromatch/micromatch)
--	ms@2.1.2 (https://github.com/zeit/ms)
--	node-releases@2.0.14 (https://github.com/chicoxyzzy/node-releases)
+-	math-intrinsics@1.1.0 (https://github.com/es-shims/math-intrinsics)
+-	media-typer@1.1.0 (https://github.com/jshttp/media-typer)
+-	merge-descriptors@2.0.0 (https://github.com/sindresorhus/merge-descriptors)
+-	micromatch@4.0.8 (https://github.com/micromatch/micromatch)
+-	mime-db@1.54.0 (https://github.com/jshttp/mime-db)
+-	mime-types@3.0.1 (https://github.com/jshttp/mime-types)
+-	ms@2.1.3 (https://github.com/vercel/ms)
+-	negotiator@1.0.0 (https://github.com/jshttp/negotiator)
+-	node-releases@2.0.19 (https://github.com/chicoxyzzy/node-releases)
 -	normalize-path@3.0.0 (https://github.com/jonschlinkert/normalize-path)
--	picocolors@1.0.0 (https://github.com/alexeyraspopov/picocolors)
+-	object-assign@4.1.1 (https://github.com/sindresorhus/object-assign)
+-	object-inspect@1.13.4 (https://github.com/inspect-js/object-inspect)
+-	on-finished@2.4.1 (https://github.com/jshttp/on-finished)
+-	once@1.4.0 (https://github.com/isaacs/once)
+-	parseurl@1.3.3 (https://github.com/pillarjs/parseurl)
+-	path-key@3.1.1 (https://github.com/sindresorhus/path-key)
+-	path-to-regexp@8.2.0 (https://github.com/pillarjs/path-to-regexp)
+-	picocolors@1.1.0 (https://github.com/alexeyraspopov/picocolors)
+-	picocolors@1.1.1 (https://github.com/alexeyraspopov/picocolors)
 -	picomatch@2.3.1 (https://github.com/micromatch/picomatch)
--	pirates@4.0.4 (https://github.com/danez/pirates)
--	pretty-format@29.5.0 (https://github.com/facebook/jest)
--	react-is@18.2.0 (https://github.com/facebook/react)
+-	pkce-challenge@5.0.0 (https://github.com/crouchcd/pkce-challenge)
+-	pretty-format@29.7.0 (https://github.com/jestjs/jest)
+-	proxy-addr@2.0.7 (https://github.com/jshttp/proxy-addr)
+-	punycode@2.3.1 (https://github.com/mathiasbynens/punycode.js)
+-	qs@6.14.0 (https://github.com/ljharb/qs)
+-	range-parser@1.2.1 (https://github.com/jshttp/range-parser)
+-	raw-body@3.0.0 (https://github.com/stream-utils/raw-body)
+-	react-is@18.3.1 (https://github.com/facebook/react)
 -	readdirp@3.6.0 (https://github.com/paulmillr/readdirp)
+-	router@2.2.0 (https://github.com/pillarjs/router)
+-	safe-buffer@5.2.1 (https://github.com/feross/safe-buffer)
+-	safer-buffer@2.1.2 (https://github.com/ChALkeR/safer-buffer)
 -	semver@6.3.1 (https://github.com/npm/node-semver)
+-	send@1.2.0 (https://github.com/pillarjs/send)
+-	serve-static@2.2.0 (https://github.com/expressjs/serve-static)
+-	setprototypeof@1.2.0 (https://github.com/wesleytodd/setprototypeof)
+-	shebang-command@2.0.0 (https://github.com/kevva/shebang-command)
+-	shebang-regex@3.0.0 (https://github.com/sindresorhus/shebang-regex)
+-	side-channel-list@1.0.0 (https://github.com/ljharb/side-channel-list)
+-	side-channel-map@1.0.1 (https://github.com/ljharb/side-channel-map)
+-	side-channel-weakmap@1.0.2 (https://github.com/ljharb/side-channel-weakmap)
+-	side-channel@1.1.0 (https://github.com/ljharb/side-channel)
 -	slash@3.0.0 (https://github.com/sindresorhus/slash)
 -	source-map-support@0.5.21 (https://github.com/evanw/node-source-map-support)
 -	source-map@0.6.1 (https://github.com/mozilla/source-map)
 -	stack-utils@2.0.6 (https://github.com/tapjs/stack-utils)
+-	statuses@2.0.1 (https://github.com/jshttp/statuses)
+-	statuses@2.0.2 (https://github.com/jshttp/statuses)
 -	stoppable@1.1.0 (https://github.com/hunterloftis/stoppable)
 -	supports-color@5.5.0 (https://github.com/chalk/supports-color)
 -	supports-color@7.2.0 (https://github.com/chalk/supports-color)
--	to-fast-properties@2.0.0 (https://github.com/sindresorhus/to-fast-properties)
 -	to-regex-range@5.0.1 (https://github.com/micromatch/to-regex-range)
--	update-browserslist-db@1.0.13 (https://github.com/browserslist/update-db)
+-	toidentifier@1.0.1 (https://github.com/component/toidentifier)
+-	type-is@2.0.1 (https://github.com/jshttp/type-is)
+-	undici-types@6.19.8 (https://github.com/nodejs/undici)
+-	unpipe@1.0.0 (https://github.com/stream-utils/unpipe)
+-	update-browserslist-db@1.1.3 (https://github.com/browserslist/update-db)
+-	uri-js@4.4.1 (https://github.com/garycourt/uri-js)
+-	vary@1.1.2 (https://github.com/jshttp/vary)
+-	which@2.0.2 (https://github.com/isaacs/node-which)
+-	wrappy@1.0.2 (https://github.com/npm/wrappy)
 -	yallist@3.1.1 (https://github.com/isaacs/yallist)
+-	zod-to-json-schema@3.24.6 (https://github.com/StefanTerdell/zod-to-json-schema)
+-	zod@3.25.76 (https://github.com/colinhacks/zod)
 
 %% @ampproject/remapping@2.2.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -362,7 +433,7 @@ Apache License
 =========================================
 END OF @ampproject/remapping@2.2.1 AND INFORMATION
 
-%% @babel/code-frame@7.22.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/code-frame@7.24.7 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -387,9 +458,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/code-frame@7.22.5 AND INFORMATION
+END OF @babel/code-frame@7.24.7 AND INFORMATION
 
-%% @babel/code-frame@7.24.2 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/code-frame@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -414,9 +485,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/code-frame@7.24.2 AND INFORMATION
+END OF @babel/code-frame@7.27.1 AND INFORMATION
 
-%% @babel/compat-data@7.23.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/compat-data@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -441,9 +512,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/compat-data@7.23.5 AND INFORMATION
+END OF @babel/compat-data@7.28.0 AND INFORMATION
 
-%% @babel/core@7.24.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/core@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -468,9 +539,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/core@7.24.4 AND INFORMATION
+END OF @babel/core@7.28.0 AND INFORMATION
 
-%% @babel/generator@7.24.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/generator@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -495,9 +566,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/generator@7.24.4 AND INFORMATION
+END OF @babel/generator@7.28.0 AND INFORMATION
 
-%% @babel/helper-annotate-as-pure@7.22.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-annotate-as-pure@7.27.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -522,9 +593,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-annotate-as-pure@7.22.5 AND INFORMATION
+END OF @babel/helper-annotate-as-pure@7.27.3 AND INFORMATION
 
-%% @babel/helper-compilation-targets@7.23.6 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-compilation-targets@7.27.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -549,9 +620,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-compilation-targets@7.23.6 AND INFORMATION
+END OF @babel/helper-compilation-targets@7.27.2 AND INFORMATION
 
-%% @babel/helper-create-class-features-plugin@7.24.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-create-class-features-plugin@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -576,9 +647,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-create-class-features-plugin@7.24.4 AND INFORMATION
+END OF @babel/helper-create-class-features-plugin@7.27.1 AND INFORMATION
 
-%% @babel/helper-environment-visitor@7.22.20 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-globals@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -603,9 +674,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-environment-visitor@7.22.20 AND INFORMATION
+END OF @babel/helper-globals@7.28.0 AND INFORMATION
 
-%% @babel/helper-function-name@7.23.0 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-member-expression-to-functions@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -630,9 +701,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-function-name@7.23.0 AND INFORMATION
+END OF @babel/helper-member-expression-to-functions@7.27.1 AND INFORMATION
 
-%% @babel/helper-hoist-variables@7.22.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-module-imports@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -657,9 +728,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-hoist-variables@7.22.5 AND INFORMATION
+END OF @babel/helper-module-imports@7.27.1 AND INFORMATION
 
-%% @babel/helper-member-expression-to-functions@7.23.0 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-module-transforms@7.27.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -684,9 +755,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-member-expression-to-functions@7.23.0 AND INFORMATION
+END OF @babel/helper-module-transforms@7.27.3 AND INFORMATION
 
-%% @babel/helper-module-imports@7.22.15 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-optimise-call-expression@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -711,9 +782,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-module-imports@7.22.15 AND INFORMATION
+END OF @babel/helper-optimise-call-expression@7.27.1 AND INFORMATION
 
-%% @babel/helper-module-transforms@7.23.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-plugin-utils@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -738,9 +809,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-module-transforms@7.23.3 AND INFORMATION
+END OF @babel/helper-plugin-utils@7.27.1 AND INFORMATION
 
-%% @babel/helper-optimise-call-expression@7.22.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-replace-supers@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -765,9 +836,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-optimise-call-expression@7.22.5 AND INFORMATION
+END OF @babel/helper-replace-supers@7.27.1 AND INFORMATION
 
-%% @babel/helper-plugin-utils@7.24.0 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-skip-transparent-expression-wrappers@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -792,9 +863,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-plugin-utils@7.24.0 AND INFORMATION
+END OF @babel/helper-skip-transparent-expression-wrappers@7.27.1 AND INFORMATION
 
-%% @babel/helper-replace-supers@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-string-parser@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -819,9 +890,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-replace-supers@7.24.1 AND INFORMATION
+END OF @babel/helper-string-parser@7.27.1 AND INFORMATION
 
-%% @babel/helper-simple-access@7.22.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-validator-identifier@7.24.7 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -846,9 +917,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-simple-access@7.22.5 AND INFORMATION
+END OF @babel/helper-validator-identifier@7.24.7 AND INFORMATION
 
-%% @babel/helper-skip-transparent-expression-wrappers@7.22.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-validator-identifier@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -873,9 +944,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-skip-transparent-expression-wrappers@7.22.5 AND INFORMATION
+END OF @babel/helper-validator-identifier@7.27.1 AND INFORMATION
 
-%% @babel/helper-split-export-declaration@7.22.6 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helper-validator-option@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -900,13 +971,14 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-split-export-declaration@7.22.6 AND INFORMATION
+END OF @babel/helper-validator-option@7.27.1 AND INFORMATION
 
-%% @babel/helper-string-parser@7.23.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/helpers@7.28.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
 Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) 2014-present, Facebook, Inc. (ONLY ./src/helpers/regenerator* files)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -927,9 +999,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-string-parser@7.23.4 AND INFORMATION
+END OF @babel/helpers@7.28.2 AND INFORMATION
 
-%% @babel/helper-validator-identifier@7.22.20 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/highlight@7.24.7 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -954,144 +1026,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/helper-validator-identifier@7.22.20 AND INFORMATION
+END OF @babel/highlight@7.24.7 AND INFORMATION
 
-%% @babel/helper-validator-identifier@7.22.5 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/helper-validator-identifier@7.22.5 AND INFORMATION
-
-%% @babel/helper-validator-option@7.23.5 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/helper-validator-option@7.23.5 AND INFORMATION
-
-%% @babel/helpers@7.24.4 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/helpers@7.24.4 AND INFORMATION
-
-%% @babel/highlight@7.22.5 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/highlight@7.22.5 AND INFORMATION
-
-%% @babel/highlight@7.24.2 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/highlight@7.24.2 AND INFORMATION
-
-%% @babel/parser@7.24.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/parser@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (C) 2012-2014 by various contributors (see AUTHORS)
 
@@ -1113,9 +1050,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF @babel/parser@7.24.4 AND INFORMATION
+END OF @babel/parser@7.28.0 AND INFORMATION
 
-%% @babel/plugin-proposal-decorators@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-proposal-decorators@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1140,9 +1077,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-proposal-decorators@7.24.1 AND INFORMATION
+END OF @babel/plugin-proposal-decorators@7.28.0 AND INFORMATION
 
-%% @babel/plugin-proposal-explicit-resource-management@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-async-generators@7.8.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1167,9 +1104,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-proposal-explicit-resource-management@7.24.1 AND INFORMATION
+END OF @babel/plugin-syntax-async-generators@7.8.4 AND INFORMATION
 
-%% @babel/plugin-syntax-async-generators@7.8.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-decorators@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1194,9 +1131,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-async-generators@7.8.4 AND INFORMATION
+END OF @babel/plugin-syntax-decorators@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-class-static-block@7.14.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-import-attributes@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1221,9 +1158,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-class-static-block@7.14.5 AND INFORMATION
+END OF @babel/plugin-syntax-import-attributes@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-decorators@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-json-strings@7.8.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1248,9 +1185,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-decorators@7.24.1 AND INFORMATION
+END OF @babel/plugin-syntax-json-strings@7.8.3 AND INFORMATION
 
-%% @babel/plugin-syntax-explicit-resource-management@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-jsx@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1275,9 +1212,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-explicit-resource-management@7.24.1 AND INFORMATION
+END OF @babel/plugin-syntax-jsx@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-export-namespace-from@7.8.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-object-rest-spread@7.8.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1302,9 +1239,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-export-namespace-from@7.8.3 AND INFORMATION
+END OF @babel/plugin-syntax-object-rest-spread@7.8.3 AND INFORMATION
 
-%% @babel/plugin-syntax-import-attributes@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-optional-catch-binding@7.8.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1329,9 +1266,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-import-attributes@7.24.1 AND INFORMATION
+END OF @babel/plugin-syntax-optional-catch-binding@7.8.3 AND INFORMATION
 
-%% @babel/plugin-syntax-json-strings@7.8.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-syntax-typescript@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1356,9 +1293,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-json-strings@7.8.3 AND INFORMATION
+END OF @babel/plugin-syntax-typescript@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-jsx@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-class-properties@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1383,9 +1320,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-jsx@7.24.1 AND INFORMATION
+END OF @babel/plugin-transform-class-properties@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-logical-assignment-operators@7.10.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-class-static-block@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1410,9 +1347,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-logical-assignment-operators@7.10.4 AND INFORMATION
+END OF @babel/plugin-transform-class-static-block@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-nullish-coalescing-operator@7.8.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-destructuring@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1437,9 +1374,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-nullish-coalescing-operator@7.8.3 AND INFORMATION
+END OF @babel/plugin-transform-destructuring@7.28.0 AND INFORMATION
 
-%% @babel/plugin-syntax-numeric-separator@7.10.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-explicit-resource-management@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1464,9 +1401,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-numeric-separator@7.10.4 AND INFORMATION
+END OF @babel/plugin-transform-explicit-resource-management@7.28.0 AND INFORMATION
 
-%% @babel/plugin-syntax-object-rest-spread@7.8.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-export-namespace-from@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1491,9 +1428,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-object-rest-spread@7.8.3 AND INFORMATION
+END OF @babel/plugin-transform-export-namespace-from@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-optional-catch-binding@7.8.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-logical-assignment-operators@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1518,9 +1455,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-optional-catch-binding@7.8.3 AND INFORMATION
+END OF @babel/plugin-transform-logical-assignment-operators@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-optional-chaining@7.8.3 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-modules-commonjs@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1545,9 +1482,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-optional-chaining@7.8.3 AND INFORMATION
+END OF @babel/plugin-transform-modules-commonjs@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-private-property-in-object@7.14.5 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-nullish-coalescing-operator@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1572,9 +1509,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-private-property-in-object@7.14.5 AND INFORMATION
+END OF @babel/plugin-transform-nullish-coalescing-operator@7.27.1 AND INFORMATION
 
-%% @babel/plugin-syntax-typescript@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-numeric-separator@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1599,9 +1536,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-syntax-typescript@7.24.1 AND INFORMATION
+END OF @babel/plugin-transform-numeric-separator@7.27.1 AND INFORMATION
 
-%% @babel/plugin-transform-class-properties@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-optional-chaining@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1626,9 +1563,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-class-properties@7.24.1 AND INFORMATION
+END OF @babel/plugin-transform-optional-chaining@7.27.1 AND INFORMATION
 
-%% @babel/plugin-transform-class-static-block@7.24.4 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-private-methods@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1653,9 +1590,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-class-static-block@7.24.4 AND INFORMATION
+END OF @babel/plugin-transform-private-methods@7.27.1 AND INFORMATION
 
-%% @babel/plugin-transform-export-namespace-from@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-private-property-in-object@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1680,9 +1617,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-export-namespace-from@7.24.1 AND INFORMATION
+END OF @babel/plugin-transform-private-property-in-object@7.27.1 AND INFORMATION
 
-%% @babel/plugin-transform-logical-assignment-operators@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-react-jsx@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1707,9 +1644,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-logical-assignment-operators@7.24.1 AND INFORMATION
+END OF @babel/plugin-transform-react-jsx@7.27.1 AND INFORMATION
 
-%% @babel/plugin-transform-modules-commonjs@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/plugin-transform-typescript@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1734,9 +1671,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-modules-commonjs@7.24.1 AND INFORMATION
+END OF @babel/plugin-transform-typescript@7.28.0 AND INFORMATION
 
-%% @babel/plugin-transform-nullish-coalescing-operator@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/preset-typescript@7.27.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1761,9 +1698,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-nullish-coalescing-operator@7.24.1 AND INFORMATION
+END OF @babel/preset-typescript@7.27.1 AND INFORMATION
 
-%% @babel/plugin-transform-numeric-separator@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/template@7.27.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1788,9 +1725,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-numeric-separator@7.24.1 AND INFORMATION
+END OF @babel/template@7.27.2 AND INFORMATION
 
-%% @babel/plugin-transform-optional-chaining@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/traverse@7.28.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1815,9 +1752,9 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-optional-chaining@7.24.1 AND INFORMATION
+END OF @babel/traverse@7.28.0 AND INFORMATION
 
-%% @babel/plugin-transform-private-methods@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @babel/types@7.28.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -1842,285 +1779,96 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-private-methods@7.24.1 AND INFORMATION
+END OF @babel/types@7.28.2 AND INFORMATION
 
-%% @babel/plugin-transform-private-property-in-object@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @jest/expect-utils@29.7.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) Meta Platforms, Inc. and affiliates.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-private-property-in-object@7.24.1 AND INFORMATION
+END OF @jest/expect-utils@29.7.0 AND INFORMATION
 
-%% @babel/plugin-transform-react-jsx@7.23.4 NOTICES AND INFORMATION BEGIN HERE
+%% @jest/schemas@29.6.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) Meta Platforms, Inc. and affiliates.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-react-jsx@7.23.4 AND INFORMATION
+END OF @jest/schemas@29.6.3 AND INFORMATION
 
-%% @babel/plugin-transform-typescript@7.24.4 NOTICES AND INFORMATION BEGIN HERE
+%% @jest/types@29.6.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright (c) Meta Platforms, Inc. and affiliates.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF @babel/plugin-transform-typescript@7.24.4 AND INFORMATION
+END OF @jest/types@29.6.3 AND INFORMATION
 
-%% @babel/preset-typescript@7.24.1 NOTICES AND INFORMATION BEGIN HERE
+%% @jridgewell/gen-mapping@0.3.12 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
+Copyright 2024 Justin Ridgewell <justin@ridgewell.name>
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/preset-typescript@7.24.1 AND INFORMATION
-
-%% @babel/template@7.24.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/template@7.24.0 AND INFORMATION
-
-%% @babel/traverse@7.24.1 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/traverse@7.24.1 AND INFORMATION
-
-%% @babel/types@7.24.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014-present Sebastian McKenzie and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF @babel/types@7.24.0 AND INFORMATION
-
-%% @jest/expect-utils@29.5.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) Meta Platforms, Inc. and affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-=========================================
-END OF @jest/expect-utils@29.5.0 AND INFORMATION
-
-%% @jest/schemas@29.4.3 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) Meta Platforms, Inc. and affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-=========================================
-END OF @jest/schemas@29.4.3 AND INFORMATION
-
-%% @jest/types@29.5.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) Meta Platforms, Inc. and affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-=========================================
-END OF @jest/types@29.5.0 AND INFORMATION
-
-%% @jridgewell/gen-mapping@0.3.5 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-Copyright 2022 Justin Ridgewell <jridgewell@google.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
@@ -2133,7 +1881,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF @jridgewell/gen-mapping@0.3.5 AND INFORMATION
+END OF @jridgewell/gen-mapping@0.3.12 AND INFORMATION
 
 %% @jridgewell/resolve-uri@3.1.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -2159,9 +1907,9 @@ SOFTWARE.
 =========================================
 END OF @jridgewell/resolve-uri@3.1.1 AND INFORMATION
 
-%% @jridgewell/set-array@1.2.1 NOTICES AND INFORMATION BEGIN HERE
+%% @jridgewell/sourcemap-codec@1.5.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright 2022 Justin Ridgewell <jridgewell@google.com>
+Copyright 2024 Justin Ridgewell <justin@ridgewell.name>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2181,13 +1929,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF @jridgewell/set-array@1.2.1 AND INFORMATION
+END OF @jridgewell/sourcemap-codec@1.5.4 AND INFORMATION
 
-%% @jridgewell/sourcemap-codec@1.4.15 NOTICES AND INFORMATION BEGIN HERE
+%% @jridgewell/trace-mapping@0.3.29 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License
-
-Copyright (c) 2015 Rich Harris
+Copyright 2024 Justin Ridgewell <justin@ridgewell.name>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2204,14 +1950,16 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF @jridgewell/sourcemap-codec@1.4.15 AND INFORMATION
+END OF @jridgewell/trace-mapping@0.3.29 AND INFORMATION
 
-%% @jridgewell/trace-mapping@0.3.25 NOTICES AND INFORMATION BEGIN HERE
+%% @modelcontextprotocol/sdk@1.17.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright 2022 Justin Ridgewell <justin@ridgewell.name>
+MIT License
+
+Copyright (c) 2024 Anthropic, PBC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2220,8 +1968,8 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -2231,9 +1979,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF @jridgewell/trace-mapping@0.3.25 AND INFORMATION
+END OF @modelcontextprotocol/sdk@1.17.3 AND INFORMATION
 
-%% @sinclair/typebox@0.25.24 NOTICES AND INFORMATION BEGIN HERE
+%% @sinclair/typebox@0.27.8 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 TypeBox: JSON Schema Type Builder with Static Type Resolution for TypeScript 
 
@@ -2259,9 +2007,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF @sinclair/typebox@0.25.24 AND INFORMATION
+END OF @sinclair/typebox@0.27.8 AND INFORMATION
 
-%% @types/istanbul-lib-coverage@2.0.4 NOTICES AND INFORMATION BEGIN HERE
+%% @types/istanbul-lib-coverage@2.0.6 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -2285,13 +2033,13 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/istanbul-lib-coverage@2.0.4 AND INFORMATION
+END OF @types/istanbul-lib-coverage@2.0.6 AND INFORMATION
 
-%% @types/istanbul-lib-report@3.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% @types/istanbul-lib-report@3.0.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-    Copyright (c) Microsoft Corporation. All rights reserved.
+    Copyright (c) Microsoft Corporation.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -2311,9 +2059,9 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/istanbul-lib-report@3.0.0 AND INFORMATION
+END OF @types/istanbul-lib-report@3.0.3 AND INFORMATION
 
-%% @types/istanbul-reports@3.0.1 NOTICES AND INFORMATION BEGIN HERE
+%% @types/istanbul-reports@3.0.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -2337,9 +2085,9 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/istanbul-reports@3.0.1 AND INFORMATION
+END OF @types/istanbul-reports@3.0.4 AND INFORMATION
 
-%% @types/node@20.2.5 NOTICES AND INFORMATION BEGIN HERE
+%% @types/node@22.5.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -2363,9 +2111,9 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/node@20.2.5 AND INFORMATION
+END OF @types/node@22.5.4 AND INFORMATION
 
-%% @types/stack-utils@2.0.1 NOTICES AND INFORMATION BEGIN HERE
+%% @types/stack-utils@2.0.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -2389,9 +2137,9 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/stack-utils@2.0.1 AND INFORMATION
+END OF @types/stack-utils@2.0.3 AND INFORMATION
 
-%% @types/yargs-parser@21.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% @types/yargs-parser@21.0.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -2415,9 +2163,9 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/yargs-parser@21.0.0 AND INFORMATION
+END OF @types/yargs-parser@21.0.3 AND INFORMATION
 
-%% @types/yargs@17.0.24 NOTICES AND INFORMATION BEGIN HERE
+%% @types/yargs@17.0.33 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -2441,7 +2189,61 @@ MIT License
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE
 =========================================
-END OF @types/yargs@17.0.24 AND INFORMATION
+END OF @types/yargs@17.0.33 AND INFORMATION
+
+%% accepts@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF accepts@2.0.0 AND INFORMATION
+
+%% ajv@6.12.6 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF ajv@6.12.6 AND INFORMATION
 
 %% ansi-colors@4.1.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -2545,31 +2347,33 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF binary-extensions@2.2.0 AND INFORMATION
 
-%% braces@3.0.2 NOTICES AND INFORMATION BEGIN HERE
+%% body-parser@2.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+(The MIT License)
 
-Copyright (c) 2014-2018, Jon Schlinkert.
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2014-2015 Douglas Christopher Wilson <doug@somethingdoug.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF braces@3.0.2 AND INFORMATION
+END OF body-parser@2.2.0 AND INFORMATION
 
 %% braces@3.0.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -2597,7 +2401,7 @@ THE SOFTWARE.
 =========================================
 END OF braces@3.0.3 AND INFORMATION
 
-%% browserslist@4.22.2 NOTICES AND INFORMATION BEGIN HERE
+%% browserslist@4.25.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
@@ -2620,7 +2424,7 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF browserslist@4.22.2 AND INFORMATION
+END OF browserslist@4.25.1 AND INFORMATION
 
 %% buffer-from@1.1.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -2648,15 +2452,95 @@ SOFTWARE.
 =========================================
 END OF buffer-from@1.1.2 AND INFORMATION
 
-%% caniuse-lite@1.0.30001579 NOTICES AND INFORMATION BEGIN HERE
+%% bytes@3.1.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Attribution 4.0 International
+(The MIT License)
 
-=======================================================================
+Copyright (c) 2012-2014 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2015 Jed Watson <jed.watson@me.com>
 
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF bytes@3.1.2 AND INFORMATION
+
+%% call-bind-apply-helpers@1.0.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF call-bind-apply-helpers@1.0.2 AND INFORMATION
+
+%% call-bound@1.0.4 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF call-bound@1.0.4 AND INFORMATION
+
+%% caniuse-lite@1.0.30001731 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
 other relationship. Creative Commons makes its licenses and related
 information available on an "as-is" basis. Creative Commons gives no
 warranties regarding its licenses, any material licensed under their
@@ -3046,7 +2930,7 @@ public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
 =========================================
-END OF caniuse-lite@1.0.30001579 AND INFORMATION
+END OF caniuse-lite@1.0.30001731 AND INFORMATION
 
 %% chalk@2.4.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -3102,11 +2986,11 @@ THE SOFTWARE.
 =========================================
 END OF chokidar@3.6.0 AND INFORMATION
 
-%% ci-info@3.8.0 NOTICES AND INFORMATION BEGIN HERE
+%% ci-info@3.9.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2016-2023 Thomas Watson Steen
+Copyright (c) 2016 Thomas Watson Steen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3126,9 +3010,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF ci-info@3.8.0 AND INFORMATION
+END OF ci-info@3.9.0 AND INFORMATION
 
-%% codemirror-shadow-1@0.0.1 NOTICES AND INFORMATION BEGIN HERE
+%% codemirror@5.65.18 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -3152,7 +3036,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF codemirror-shadow-1@0.0.1 AND INFORMATION
+END OF codemirror@5.65.18 AND INFORMATION
 
 %% color-convert@1.9.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -3230,6 +3114,60 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF color-name@1.1.4 AND INFORMATION
 
+%% content-disposition@1.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2017 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF content-disposition@1.0.0 AND INFORMATION
+
+%% content-type@1.0.5 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2015 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF content-type@1.0.5 AND INFORMATION
+
 %% convert-source-map@2.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright 2013 Thorsten Lorenz. 
@@ -3258,71 +3196,93 @@ OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF convert-source-map@2.0.0 AND INFORMATION
 
-%% debug@4.3.4 NOTICES AND INFORMATION BEGIN HERE
+%% cookie-signature@1.2.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 (The MIT License)
 
-Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
-Copyright (c) 2018-2021 Josh Junon
+Copyright (c) 2012–2024 LearnBoost <tj@learnboost.com> and other contributors;
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the 'Software'), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF debug@4.3.4 AND INFORMATION
+END OF cookie-signature@1.2.2 AND INFORMATION
 
-%% diff-sequences@29.4.3 NOTICES AND INFORMATION BEGIN HERE
+%% cookie@0.7.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-MIT License
+(The MIT License)
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) 2012-2014 Roman Shtylman <shtylman@gmail.com>
+Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF diff-sequences@29.4.3 AND INFORMATION
+END OF cookie@0.7.2 AND INFORMATION
 
-%% electron-to-chromium@1.4.638 NOTICES AND INFORMATION BEGIN HERE
+%% cors@2.8.5 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright 2018 Kilian Valkhof
+(The MIT License)
 
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+Copyright (c) 2013 Troy Goode <troygoode@gmail.com>
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF electron-to-chromium@1.4.638 AND INFORMATION
+END OF cors@2.8.5 AND INFORMATION
 
-%% enquirer@2.3.6 NOTICES AND INFORMATION BEGIN HERE
+%% cross-spawn@7.0.6 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2016-present, Jon Schlinkert.
+Copyright (c) 2018 Made With MOXY Lda <hello@moxy.studio>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3342,63 +3302,60 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF enquirer@2.3.6 AND INFORMATION
-
-%% escalade@3.1.1 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF escalade@3.1.1 AND INFORMATION
+END OF cross-spawn@7.0.6 AND INFORMATION
 
-%% escape-string-regexp@1.0.5 NOTICES AND INFORMATION BEGIN HERE
+%% debug@4.4.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+(The MIT License)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) 2014-2017 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2018-2021 Josh Junon
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the 'Software'), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF escape-string-regexp@1.0.5 AND INFORMATION
+END OF debug@4.4.0 AND INFORMATION
 
-%% escape-string-regexp@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% depd@2.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-MIT License
+(The MIT License)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) 2014-2018 Douglas Christopher Wilson
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF escape-string-regexp@2.0.0 AND INFORMATION
+END OF depd@2.0.0 AND INFORMATION
 
-%% expect@29.5.0 NOTICES AND INFORMATION BEGIN HERE
+%% diff-sequences@29.6.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -3422,13 +3379,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF expect@29.5.0 AND INFORMATION
+END OF diff-sequences@29.6.3 AND INFORMATION
 
-%% fill-range@7.0.1 NOTICES AND INFORMATION BEGIN HERE
+%% dunder-proto@1.0.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2014-present, Jon Schlinkert.
+Copyright (c) 2024 ECMAScript Shims
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3437,24 +3394,24 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF fill-range@7.0.1 AND INFORMATION
+END OF dunder-proto@1.0.1 AND INFORMATION
 
-%% fill-range@7.1.1 NOTICES AND INFORMATION BEGIN HERE
+%% ee-first@1.1.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2014-present, Jon Schlinkert.
+Copyright (c) 2014 Jonathan Ong me@jongleberry.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3474,59 +3431,1630 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF fill-range@7.1.1 AND INFORMATION
+END OF ee-first@1.1.1 AND INFORMATION
 
-%% gensync@1.0.0-beta.2 NOTICES AND INFORMATION BEGIN HERE
+%% electron-to-chromium@1.5.192 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-Copyright 2018 Logan Smyth <loganfsmyth@gmail.com>
+Copyright 2018 Kilian Valkhof
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF electron-to-chromium@1.5.192 AND INFORMATION
+
+%% encodeurl@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2016 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF encodeurl@2.0.0 AND INFORMATION
+
+%% enquirer@2.3.6 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2016-present, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF enquirer@2.3.6 AND INFORMATION
+
+%% es-define-property@1.0.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF es-define-property@1.0.1 AND INFORMATION
+
+%% es-errors@1.3.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF es-errors@1.3.0 AND INFORMATION
+
+%% es-object-atoms@1.1.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF es-object-atoms@1.1.1 AND INFORMATION
+
+%% escalade@3.2.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF escalade@3.2.0 AND INFORMATION
+
+%% escape-html@1.0.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2012-2013 TJ Holowaychuk
+Copyright (c) 2015 Andreas Lubbe
+Copyright (c) 2015 Tiancheng "Timothy" Gu
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF escape-html@1.0.3 AND INFORMATION
+
+%% escape-string-regexp@1.0.5 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF escape-string-regexp@1.0.5 AND INFORMATION
+
+%% escape-string-regexp@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF escape-string-regexp@2.0.0 AND INFORMATION
+
+%% etag@1.8.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2016 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF etag@1.8.1 AND INFORMATION
+
+%% eventsource-parser@3.0.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2025 Espen Hovlandsdal <espen@hovlandsdal.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF eventsource-parser@3.0.3 AND INFORMATION
+
+%% eventsource@3.0.7 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License
+
+Copyright (c) EventSource GitHub organisation
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF eventsource@3.0.7 AND INFORMATION
+
+%% express-rate-limit@7.5.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+# MIT License
+
+Copyright 2023 Nathan Friedly, Vedant K
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF express-rate-limit@7.5.1 AND INFORMATION
+
+%% express@5.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2009-2014 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2013-2014 Roman Shtylman <shtylman+expressjs@gmail.com>
+Copyright (c) 2014-2015 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF express@5.1.0 AND INFORMATION
+
+%% fast-deep-equal@3.1.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2017 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF fast-deep-equal@3.1.3 AND INFORMATION
+
+%% fast-json-stable-stringify@2.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+This software is released under the MIT license:
+
+Copyright (c) 2017 Evgeny Poberezkin
+Copyright (c) 2013 James Halliday
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF fast-json-stable-stringify@2.1.0 AND INFORMATION
+
+%% fill-range@7.1.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-present, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF fill-range@7.1.1 AND INFORMATION
+
+%% finalhandler@2.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF finalhandler@2.1.0 AND INFORMATION
+
+%% forwarded@0.2.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2017 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF forwarded@0.2.0 AND INFORMATION
+
+%% fresh@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2012 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2016-2017 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF fresh@2.0.0 AND INFORMATION
+
+%% function-bind@1.1.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2013 Raynos.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF function-bind@1.1.2 AND INFORMATION
+
+%% gensync@1.0.0-beta.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright 2018 Logan Smyth <loganfsmyth@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF gensync@1.0.0-beta.2 AND INFORMATION
+
+%% get-east-asian-width@1.3.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF get-east-asian-width@1.3.0 AND INFORMATION
+
+%% get-intrinsic@1.3.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2020 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF get-intrinsic@1.3.0 AND INFORMATION
+
+%% get-proto@1.0.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2025 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF get-proto@1.0.1 AND INFORMATION
+
+%% glob-parent@5.1.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) 2015, 2019 Elan Shanker
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF glob-parent@5.1.2 AND INFORMATION
+
+%% gopd@1.2.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2022 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF gopd@1.2.0 AND INFORMATION
+
+%% graceful-fs@4.2.11 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF graceful-fs@4.2.11 AND INFORMATION
+
+%% has-flag@3.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF has-flag@3.0.0 AND INFORMATION
+
+%% has-flag@4.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF has-flag@4.0.0 AND INFORMATION
+
+%% has-symbols@1.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2016 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF has-symbols@1.1.0 AND INFORMATION
+
+%% hasown@2.0.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Jordan Harband and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF hasown@2.0.2 AND INFORMATION
+
+%% http-errors@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014 Jonathan Ong me@jongleberry.com
+Copyright (c) 2016 Douglas Christopher Wilson doug@somethingdoug.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF http-errors@2.0.0 AND INFORMATION
+
+%% iconv-lite@0.6.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2011 Alexander Shtuchkin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF iconv-lite@0.6.3 AND INFORMATION
+
+%% inherits@2.0.4 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF inherits@2.0.4 AND INFORMATION
+
+%% ipaddr.js@1.9.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (C) 2011-2017 whitequark <whitequark@whitequark.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF ipaddr.js@1.9.1 AND INFORMATION
+
+%% is-binary-path@2.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2019 Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF is-binary-path@2.1.0 AND INFORMATION
+
+%% is-extglob@2.1.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-2016, Jon Schlinkert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF is-extglob@2.1.1 AND INFORMATION
+
+%% is-glob@4.0.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-2017, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF is-glob@4.0.3 AND INFORMATION
+
+%% is-number@7.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-present, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF is-number@7.0.0 AND INFORMATION
+
+%% is-promise@4.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2014 Forbes Lindesay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF is-promise@4.0.0 AND INFORMATION
+
+%% isexe@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF isexe@2.0.0 AND INFORMATION
+
+%% jest-diff@29.7.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF jest-diff@29.7.0 AND INFORMATION
+
+%% jest-get-type@29.6.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF jest-get-type@29.6.3 AND INFORMATION
+
+%% jest-matcher-utils@29.7.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF jest-matcher-utils@29.7.0 AND INFORMATION
+
+%% jest-message-util@29.7.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF jest-message-util@29.7.0 AND INFORMATION
+
+%% jest-mock@29.7.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF jest-mock@29.7.0 AND INFORMATION
+
+%% jest-util@29.7.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF jest-util@29.7.0 AND INFORMATION
+
+%% js-tokens@4.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014, 2015, 2016, 2017, 2018 Simon Lydell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF js-tokens@4.0.0 AND INFORMATION
+
+%% jsesc@3.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright Mathias Bynens <https://mathiasbynens.be/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF jsesc@3.1.0 AND INFORMATION
+
+%% json-schema-traverse@0.4.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2017 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF json-schema-traverse@0.4.1 AND INFORMATION
+
+%% json5@2.2.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2012-2018 Aseem Kishore, and [others].
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+[others]: https://github.com/json5/json5/contributors
+=========================================
+END OF json5@2.2.3 AND INFORMATION
+
+%% lru-cache@5.1.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF lru-cache@5.1.1 AND INFORMATION
+
+%% math-intrinsics@1.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2024 ECMAScript Shims
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF math-intrinsics@1.1.0 AND INFORMATION
+
+%% media-typer@1.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2017 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF media-typer@1.1.0 AND INFORMATION
+
+%% merge-descriptors@2.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Jonathan Ong <me@jongleberry.com>
+Copyright (c) Douglas Christopher Wilson <doug@somethingdoug.com>
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF merge-descriptors@2.0.0 AND INFORMATION
+
+%% micromatch@4.0.8 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-present, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF micromatch@4.0.8 AND INFORMATION
+
+%% mime-db@1.54.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2015-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF mime-db@1.54.0 AND INFORMATION
+
+%% mime-types@3.0.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF mime-types@3.0.1 AND INFORMATION
+
+%% ms@2.1.3 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2020 Vercel, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF ms@2.1.3 AND INFORMATION
+
+%% negotiator@1.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2012-2014 Federico Romero
+Copyright (c) 2012-2014 Isaac Z. Schlueter
+Copyright (c) 2014-2015 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF negotiator@1.0.0 AND INFORMATION
+
+%% node-releases@2.0.19 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License
+
+Copyright (c) 2017 Sergey Rubanov (https://github.com/chicoxyzzy)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF node-releases@2.0.19 AND INFORMATION
+
+%% normalize-path@3.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014-2018, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 =========================================
-END OF gensync@1.0.0-beta.2 AND INFORMATION
+END OF normalize-path@3.0.0 AND INFORMATION
 
-%% glob-parent@5.1.2 NOTICES AND INFORMATION BEGIN HERE
+%% object-assign@4.1.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The ISC License
+The MIT License (MIT)
 
-Copyright (c) 2015, 2019 Elan Shanker
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 =========================================
-END OF glob-parent@5.1.2 AND INFORMATION
+END OF object-assign@4.1.1 AND INFORMATION
 
-%% globals@11.12.0 NOTICES AND INFORMATION BEGIN HERE
+%% object-inspect@1.13.4 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) 2013 James Halliday
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF globals@11.12.0 AND INFORMATION
+END OF object-inspect@1.13.4 AND INFORMATION
 
-%% graceful-fs@4.2.11 NOTICES AND INFORMATION BEGIN HERE
+%% on-finished@2.4.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2013 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2014 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF on-finished@2.4.1 AND INFORMATION
+
+%% once@1.4.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The ISC License
 
-Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
+Copyright (c) Isaac Z. Schlueter and Contributors
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
@@ -3540,23 +5068,37 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =========================================
-END OF graceful-fs@4.2.11 AND INFORMATION
+END OF once@1.4.0 AND INFORMATION
 
-%% has-flag@3.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% parseurl@1.3.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-MIT License
+(The MIT License)
 
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2014-2017 Douglas Christopher Wilson <doug@somethingdoug.com>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF has-flag@3.0.0 AND INFORMATION
+END OF parseurl@1.3.3 AND INFORMATION
 
-%% has-flag@4.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% path-key@3.1.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -3568,27 +5110,13 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF has-flag@4.0.0 AND INFORMATION
-
-%% is-binary-path@2.1.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2019 Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com), Paul Miller (https://paulmillr.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF is-binary-path@2.1.0 AND INFORMATION
+END OF path-key@3.1.1 AND INFORMATION
 
-%% is-extglob@2.1.1 NOTICES AND INFORMATION BEGIN HERE
+%% path-to-regexp@8.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2014-2016, Jon Schlinkert
+Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3608,13 +5136,53 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF is-extglob@2.1.1 AND INFORMATION
+END OF path-to-regexp@8.2.0 AND INFORMATION
 
-%% is-glob@4.0.3 NOTICES AND INFORMATION BEGIN HERE
+%% picocolors@1.1.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+ISC License
+
+Copyright (c) 2021-2024 Oleksii Raspopov, Kostiantyn Denysov, Anton Verinov
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF picocolors@1.1.0 AND INFORMATION
+
+%% picocolors@1.1.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+ISC License
+
+Copyright (c) 2021-2024 Oleksii Raspopov, Kostiantyn Denysov, Anton Verinov
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF picocolors@1.1.1 AND INFORMATION
+
+%% picomatch@2.3.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2014-2017, Jon Schlinkert.
+Copyright (c) 2017-present, Jon Schlinkert.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3634,13 +5202,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF is-glob@4.0.3 AND INFORMATION
+END OF picomatch@2.3.1 AND INFORMATION
 
-%% is-number@7.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% pkce-challenge@5.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2014-present, Jon Schlinkert.
+Copyright (c) 2019 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3649,20 +5217,20 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF is-number@7.0.0 AND INFORMATION
+END OF pkce-challenge@5.0.0 AND INFORMATION
 
-%% jest-diff@29.5.0 NOTICES AND INFORMATION BEGIN HERE
+%% pretty-format@29.7.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
@@ -3678,21 +5246,136 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF pretty-format@29.7.0 AND INFORMATION
+
+%% proxy-addr@2.0.7 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2016 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF proxy-addr@2.0.7 AND INFORMATION
+
+%% punycode@2.3.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright Mathias Bynens <https://mathiasbynens.be/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF punycode@2.3.1 AND INFORMATION
+
+%% qs@6.14.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+BSD 3-Clause License
+
+Copyright (c) 2014, Nathan LaFreniere and other [contributors](https://github.com/ljharb/qs/graphs/contributors)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=========================================
+END OF qs@6.14.0 AND INFORMATION
+
+%% range-parser@1.2.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2012-2014 TJ Holowaychuk <tj@vision-media.ca>
+Copyright (c) 2015-2016 Douglas Christopher Wilson <doug@somethingdoug.com
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF jest-diff@29.5.0 AND INFORMATION
+END OF range-parser@1.2.1 AND INFORMATION
 
-%% jest-get-type@29.4.3 NOTICES AND INFORMATION BEGIN HERE
+%% raw-body@3.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-MIT License
+The MIT License (MIT)
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) 2013-2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2014-2022 Douglas Christopher Wilson <doug@somethingdoug.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3701,24 +5384,24 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 =========================================
-END OF jest-get-type@29.4.3 AND INFORMATION
+END OF raw-body@3.0.0 AND INFORMATION
 
-%% jest-matcher-utils@29.5.0 NOTICES AND INFORMATION BEGIN HERE
+%% react-is@18.3.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) Facebook, Inc. and its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3738,13 +5421,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF jest-matcher-utils@29.5.0 AND INFORMATION
+END OF react-is@18.3.1 AND INFORMATION
 
-%% jest-message-util@29.5.0 NOTICES AND INFORMATION BEGIN HERE
+%% readdirp@3.6.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) 2012-2019 Thorsten Lorenz, Paul Miller (https://paulmillr.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3764,39 +5447,41 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF jest-message-util@29.5.0 AND INFORMATION
+END OF readdirp@3.6.0 AND INFORMATION
 
-%% jest-util@29.5.0 NOTICES AND INFORMATION BEGIN HERE
+%% router@2.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-MIT License
+(The MIT License)
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) 2013 Roman Shtylman
+Copyright (c) 2014-2022 Douglas Christopher Wilson
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF jest-util@29.5.0 AND INFORMATION
+END OF router@2.2.0 AND INFORMATION
 
-%% js-tokens@4.0.0 NOTICES AND INFORMATION BEGIN HERE
+%% safe-buffer@5.2.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
-Copyright (c) 2014, 2015, 2016, 2017, 2018 Simon Lydell
+Copyright (c) Feross Aboukhadijeh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3816,38 +5501,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 =========================================
-END OF js-tokens@4.0.0 AND INFORMATION
-
-%% jsesc@2.5.2 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-Copyright Mathias Bynens <https://mathiasbynens.be/>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF jsesc@2.5.2 AND INFORMATION
+END OF safe-buffer@5.2.1 AND INFORMATION
 
-%% json5@2.2.3 NOTICES AND INFORMATION BEGIN HERE
+%% safer-buffer@2.1.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) 2012-2018 Aseem Kishore, and [others].
+Copyright (c) 2018 Nikita Skovoroda <chalkerx@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -3866,12 +5526,10 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-[others]: https://github.com/json5/json5/contributors
 =========================================
-END OF json5@2.2.3 AND INFORMATION
+END OF safer-buffer@2.1.2 AND INFORMATION
 
-%% lru-cache@5.1.1 NOTICES AND INFORMATION BEGIN HERE
+%% semver@6.3.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The ISC License
 
@@ -3889,163 +5547,117 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =========================================
-END OF lru-cache@5.1.1 AND INFORMATION
+END OF semver@6.3.1 AND INFORMATION
 
-%% micromatch@4.0.5 NOTICES AND INFORMATION BEGIN HERE
+%% send@1.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+(The MIT License)
 
-Copyright (c) 2014-present, Jon Schlinkert.
+Copyright (c) 2012 TJ Holowaychuk
+Copyright (c) 2014-2022 Douglas Christopher Wilson
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF micromatch@4.0.5 AND INFORMATION
+END OF send@1.2.0 AND INFORMATION
 
-%% ms@2.1.2 NOTICES AND INFORMATION BEGIN HERE
+%% serve-static@2.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+(The MIT License)
 
-Copyright (c) 2016 Zeit, Inc.
+Copyright (c) 2010 Sencha Inc.
+Copyright (c) 2011 LearnBoost
+Copyright (c) 2011 TJ Holowaychuk
+Copyright (c) 2014-2016 Douglas Christopher Wilson
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF ms@2.1.2 AND INFORMATION
+END OF serve-static@2.2.0 AND INFORMATION
 
-%% node-releases@2.0.14 NOTICES AND INFORMATION BEGIN HERE
+%% setprototypeof@1.2.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License
-
-Copyright (c) 2017 Sergey Rubanov (https://github.com/chicoxyzzy)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Copyright (c) 2015, Wes Todd
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-=========================================
-END OF node-releases@2.0.14 AND INFORMATION
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-%% normalize-path@3.0.0 NOTICES AND INFORMATION BEGIN HERE
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =========================================
-The MIT License (MIT)
-
-Copyright (c) 2014-2018, Jon Schlinkert.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+END OF setprototypeof@1.2.0 AND INFORMATION
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+%% shebang-command@2.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-END OF normalize-path@3.0.0 AND INFORMATION
+MIT License
 
-%% picocolors@1.0.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-ISC License
+Copyright (c) Kevin Mårtensson <kevinmartensson@gmail.com> (github.com/kevva)
 
-Copyright (c) 2021 Alexey Raspopov, Kostiantyn Denysov, Anton Verinov
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF picocolors@1.0.0 AND INFORMATION
+END OF shebang-command@2.0.0 AND INFORMATION
 
-%% picomatch@2.3.1 NOTICES AND INFORMATION BEGIN HERE
+%% shebang-regex@3.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2017-present, Jon Schlinkert.
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF picomatch@2.3.1 AND INFORMATION
+END OF shebang-regex@3.0.0 AND INFORMATION
 
-%% pirates@4.0.4 NOTICES AND INFORMATION BEGIN HERE
+%% side-channel-list@1.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) 2016-2018 Ari Porad
+Copyright (c) 2024 Jordan Harband
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4065,13 +5677,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF pirates@4.0.4 AND INFORMATION
+END OF side-channel-list@1.0.0 AND INFORMATION
 
-%% pretty-format@29.5.0 NOTICES AND INFORMATION BEGIN HERE
+%% side-channel-map@1.0.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) 2024 Jordan Harband
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4091,13 +5703,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF pretty-format@29.5.0 AND INFORMATION
+END OF side-channel-map@1.0.1 AND INFORMATION
 
-%% react-is@18.2.0 NOTICES AND INFORMATION BEGIN HERE
+%% side-channel-weakmap@1.0.2 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) Facebook, Inc. and its affiliates.
+Copyright (c) 2019 Jordan Harband
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4117,13 +5729,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================
-END OF react-is@18.2.0 AND INFORMATION
+END OF side-channel-weakmap@1.0.2 AND INFORMATION
 
-%% readdirp@3.6.0 NOTICES AND INFORMATION BEGIN HERE
+%% side-channel@1.1.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 MIT License
 
-Copyright (c) 2012-2019 Thorsten Lorenz, Paul Miller (https://paulmillr.com)
+Copyright (c) 2019 Jordan Harband
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4135,35 +5747,15 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-=========================================
-END OF readdirp@3.6.0 AND INFORMATION
-
-%% semver@6.3.1 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================
-END OF semver@6.3.1 AND INFORMATION
+END OF side-channel@1.1.0 AND INFORMATION
 
 %% slash@3.0.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -4263,6 +5855,60 @@ THE SOFTWARE.
 =========================================
 END OF stack-utils@2.0.6 AND INFORMATION
 
+%% statuses@2.0.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2016 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF statuses@2.0.1 AND INFORMATION
+
+%% statuses@2.0.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2016 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF statuses@2.0.2 AND INFORMATION
+
 %% stoppable@1.1.0 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -4317,21 +5963,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 =========================================
 END OF supports-color@7.2.0 AND INFORMATION
 
-%% to-fast-properties@2.0.0 NOTICES AND INFORMATION BEGIN HERE
-=========================================
-MIT License
-
-Copyright (c) 2014 Petka Antonov
-              2015 Sindre Sorhus
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF to-fast-properties@2.0.0 AND INFORMATION
-
 %% to-regex-range@5.0.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -4358,7 +5989,114 @@ THE SOFTWARE.
 =========================================
 END OF to-regex-range@5.0.1 AND INFORMATION
 
-%% update-browserslist-db@1.0.13 NOTICES AND INFORMATION BEGIN HERE
+%% toidentifier@1.0.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2016 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF toidentifier@1.0.1 AND INFORMATION
+
+%% type-is@2.0.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
+Copyright (c) 2014-2015 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF type-is@2.0.1 AND INFORMATION
+
+%% undici-types@6.19.8 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) Matteo Collina and Undici contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF undici-types@6.19.8 AND INFORMATION
+
+%% unpipe@1.0.0 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF unpipe@1.0.0 AND INFORMATION
+
+%% update-browserslist-db@1.1.3 NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
 
@@ -4381,7 +6119,90 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
-END OF update-browserslist-db@1.0.13 AND INFORMATION
+END OF update-browserslist-db@1.1.3 AND INFORMATION
+
+%% uri-js@4.4.1 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright 2011 Gary Court. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1.	Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2.	Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY GARY COURT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GARY COURT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of Gary Court.
+=========================================
+END OF uri-js@4.4.1 AND INFORMATION
+
+%% vary@1.1.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+(The MIT License)
+
+Copyright (c) 2014-2017 Douglas Christopher Wilson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF vary@1.1.2 AND INFORMATION
+
+%% which@2.0.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF which@2.0.2 AND INFORMATION
+
+%% wrappy@1.0.2 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF wrappy@1.0.2 AND INFORMATION
 
 %% yallist@3.1.1 NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -4403,8 +6224,54 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 =========================================
 END OF yallist@3.1.1 AND INFORMATION
 
+%% zod-to-json-schema@3.24.6 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+ISC License
+
+Copyright (c) 2020, Stefan Terdell
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=========================================
+END OF zod-to-json-schema@3.24.6 AND INFORMATION
+
+%% zod@3.25.76 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2025 Colin McDonnell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF zod@3.25.76 AND INFORMATION
+
 SUMMARY BEGIN HERE
 =========================================
-Total Packages: 151
+Total Packages: 222
 =========================================
 END OF SUMMARY
\ No newline at end of file
diff --git a/packages/playwright/bundles/babel/package-lock.json b/packages/playwright/bundles/babel/package-lock.json
index 0902f0601e76d..eeb420a495b60 100644
--- a/packages/playwright/bundles/babel/package-lock.json
+++ b/packages/playwright/bundles/babel/package-lock.json
@@ -8,35 +8,35 @@
       "name": "babel-bundle",
       "version": "0.0.1",
       "dependencies": {
-        "@babel/code-frame": "^7.24.2",
-        "@babel/core": "^7.24.4",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/parser": "^7.24.4",
-        "@babel/plugin-proposal-decorators": "^7.24.1",
-        "@babel/plugin-proposal-explicit-resource-management": "^7.24.1",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/core": "^7.28.0",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/parser": "^7.28.0",
+        "@babel/plugin-proposal-decorators": "^7.28.0",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-import-attributes": "^7.24.1",
+        "@babel/plugin-syntax-import-attributes": "^7.27.1",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-transform-class-properties": "^7.24.1",
-        "@babel/plugin-transform-class-static-block": "^7.24.4",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-        "@babel/plugin-transform-numeric-separator": "^7.24.1",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1",
-        "@babel/plugin-transform-private-methods": "^7.24.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.1",
-        "@babel/plugin-transform-react-jsx": "^7.23.4",
-        "@babel/preset-typescript": "^7.24.1"
+        "@babel/plugin-transform-class-properties": "^7.27.1",
+        "@babel/plugin-transform-class-static-block": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+        "@babel/plugin-transform-numeric-separator": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1",
+        "@babel/plugin-transform-private-methods": "^7.27.1",
+        "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+        "@babel/plugin-transform-react-jsx": "^7.27.1",
+        "@babel/preset-typescript": "^7.27.1"
       },
       "devDependencies": {
-        "@types/babel__code-frame": "^7.0.4",
-        "@types/babel__core": "^7.20.2",
-        "@types/babel__helper-plugin-utils": "^7.10.1",
-        "@types/babel__traverse": "^7.20.2"
+        "@types/babel__code-frame": "^7.0.6",
+        "@types/babel__core": "^7.20.5",
+        "@types/babel__helper-plugin-utils": "^7.10.3",
+        "@types/babel__traverse": "^7.20.6"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -52,40 +52,44 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
-      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.2",
-        "picocolors": "^1.0.0"
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
-      "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
+      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz",
-      "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
+      "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.4",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.4",
-        "@babel/parser": "^7.24.4",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.27.3",
+        "@babel/helpers": "^7.27.6",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.0",
+        "@babel/types": "^7.28.0",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -101,38 +105,42 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
-      "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
+      "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "@babel/parser": "^7.28.0",
+        "@babel/types": "^7.28.0",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -141,18 +149,17 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz",
-      "integrity": "sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz",
+      "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.27.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -162,69 +169,50 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-      "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
+      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
+      "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -234,32 +222,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
-      "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
+      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@babel/helper-member-expression-to-functions": "^7.27.1",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -268,94 +259,67 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz",
-      "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz",
+      "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0"
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+    "node_modules/@babel/parser": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/types": "^7.28.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -364,28 +328,14 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.1.tgz",
-      "integrity": "sha512-zPEvzFijn+hRvJuX2Vu3KbEBN39LN3f7tW3MQO2LsIs57B26KU+kUc82BdAktS1VCM6libzh45eKGI65lg0cpA==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-decorators": "^7.24.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-explicit-resource-management": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-explicit-resource-management/-/plugin-proposal-explicit-resource-management-7.24.1.tgz",
-      "integrity": "sha512-EKo54CzU3YvAhL4al3BCjBFHauc7dVpwNliedc/MIxoTfm/XREkEST5b8yw/my+2I+Oy7gBowkfLbIrDS/qvOg==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.28.0.tgz",
+      "integrity": "sha512-zOiZqvANjWDUaUS9xMxbMcK/Zccztbe/6ikvUXaG9nsPH3w6qh5UaPGAnirI/WhIbZ8m3OHU0ReyPrknG+ZKeg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-explicit-resource-management": "^7.24.1"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-decorators": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -398,6 +348,7 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -405,26 +356,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.1.tgz",
-      "integrity": "sha512-05RJdO/cCrtVWuAaSn1tS3bH8jbsJa/Y1uD186u6J4C/1mnHFxseeuWpsqr9anvo7TUulev7tm7GDwRV+VuhDw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz",
+      "integrity": "sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -433,37 +371,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-explicit-resource-management": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-explicit-resource-management/-/plugin-syntax-explicit-resource-management-7.24.1.tgz",
-      "integrity": "sha512-WqeBqPTaJ32uBc9X7vvq2EXO9UMPb3BQAKi2TgreCcnr1gDaGzqz7MgazFi/USulU5H/tz33C+rJl0SghlpN/A==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz",
-      "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -476,6 +390,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -484,11 +399,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
-      "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
+      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -497,43 +413,11 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -545,6 +429,7 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -552,23 +437,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
+      "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -577,27 +468,30 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
-      "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz",
+      "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.12.0"
       }
     },
-    "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz",
-      "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==",
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
+      "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -606,29 +500,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz",
-      "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==",
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz",
+      "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.4",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-transform-destructuring": "^7.28.0"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.12.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz",
-      "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -638,12 +532,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz",
-      "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
+      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -653,13 +547,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz",
-      "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
+      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -669,12 +563,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz",
-      "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
+      "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -684,12 +578,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz",
-      "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
+      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -699,13 +593,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz",
-      "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -715,12 +609,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz",
-      "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
+      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -730,14 +625,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz",
-      "integrity": "sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
+      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -747,15 +642,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz",
-      "integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
+      "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.23.3",
-        "@babel/types": "^7.23.4"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -765,14 +661,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz",
-      "integrity": "sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.0.tgz",
+      "integrity": "sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.4",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-typescript": "^7.24.1"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-syntax-typescript": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -782,15 +680,16 @@
       }
     },
     "node_modules/@babel/preset-typescript": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz",
-      "integrity": "sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz",
+      "integrity": "sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-syntax-jsx": "^7.24.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-        "@babel/plugin-transform-typescript": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-syntax-jsx": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+        "@babel/plugin-transform-typescript": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -800,62 +699,58 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
+      "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.0",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.0",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.0",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -866,39 +761,35 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "node_modules/@types/babel__code-frame": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__code-frame/-/babel__code-frame-7.0.4.tgz",
-      "integrity": "sha512-WBxINLlATjvmpCgBbb9tOPrKtcPfu4A/Yz2iRzmdaodfvjAS/Z0WZJClV9/EXvoC9viI3lgUs7B9Uo7G/RmMGg==",
-      "dev": true
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__code-frame/-/babel__code-frame-7.0.6.tgz",
+      "integrity": "sha512-Anitqkl3+KrzcW2k77lRlg/GfLZLWXBuNgbEcIOU6M92yw42vsd3xV/Z/yAHEj8m+KUjL6bWOVOFqX8PFPJ4LA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/babel__core": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.2.tgz",
-      "integrity": "sha512-pNpr1T1xLUc2l3xJKuPtsEky3ybxN3m4fJkknfIpTCTfIZCDW57oAg+EfCgIIp2rvCe0Wn++/FfodDS4YXxBwA==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -917,10 +808,11 @@
       }
     },
     "node_modules/@types/babel__helper-plugin-utils": {
-      "version": "7.10.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.1.tgz",
-      "integrity": "sha512-6RaT7i6r2rT6ouIDZ2Cd6dPkq4wn1F8pLyDO+7wPVsL1dodvORiZORImaD6j9FBcHjPGuERE0hhtwkuPNXsO0A==",
+      "version": "7.10.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__helper-plugin-utils/-/babel__helper-plugin-utils-7.10.3.tgz",
+      "integrity": "sha512-FcLBBPXInqKfULB2nvOBskQPcnSMZ0s1Y2q76u9H1NPPWaLcTeq38xBeKfF/RBUECK333qeaqRdYoPSwW7rTNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/babel__core": "*"
       }
@@ -936,29 +828,19 @@
       }
     },
     "node_modules/@types/babel__traverse": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.2.tgz",
-      "integrity": "sha512-ojlGK1Hsfce93J0+kn3H5R73elidKUaZonirN33GSmgTUMpzI/MIFfSpF3haANe3G1bEBS9/9/QEqwTzwqFsKw==",
+      "version": "7.20.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+      "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/browserslist": {
-      "version": "4.22.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.1.tgz",
+      "integrity": "sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==",
       "funding": [
         {
           "type": "opencollective",
@@ -973,11 +855,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001565",
-        "electron-to-chromium": "^1.4.601",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001726",
+        "electron-to-chromium": "^1.5.173",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -987,9 +870,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001579",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz",
-      "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==",
+      "version": "1.0.30001731",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001731.tgz",
+      "integrity": "sha512-lDdp2/wrOmTRWuoB5DpfNkC0rJDU8DqRa6nYL6HK6sytw70QMopt/NIc/9SM7ylItlBWfACXk0tEn37UWM/+mg==",
       "funding": [
         {
           "type": "opencollective",
@@ -1003,33 +886,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
@@ -1037,11 +895,12 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1053,26 +912,20 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.638",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.638.tgz",
-      "integrity": "sha512-gpmbAG2LbfPKcDaL5m9IKutKjUx4ZRkvGNkgL/8nKqxkXsBVYykVULboWlqCrHsh3razucgDJDuKoWJmGPdItA=="
+      "version": "1.5.192",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.192.tgz",
+      "integrity": "sha512-rP8Ez0w7UNw/9j5eSXCe10o1g/8B1P5SM90PCCMVkIRQn2R0LEHWz4Eh9RnxkniuDe1W0cTSOB3MLlkTGDcuCg==",
+      "license": "ISC"
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -1081,36 +934,22 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json5": {
@@ -1128,24 +967,28 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "license": "MIT"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
     },
     "node_modules/semver": {
       "version": "6.3.1",
@@ -1155,29 +998,10 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -1192,9 +1016,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -1206,7 +1031,8 @@
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "license": "ISC"
     }
   }
 }
diff --git a/packages/playwright/bundles/babel/package.json b/packages/playwright/bundles/babel/package.json
index 27853cf80eb11..379469c6e242d 100644
--- a/packages/playwright/bundles/babel/package.json
+++ b/packages/playwright/bundles/babel/package.json
@@ -2,41 +2,35 @@
   "name": "babel-bundle",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "esbuild": "esbuild ./src/babelBundleImpl.ts --bundle --outdir=../../lib/transform --format=cjs --platform=node --target=ES2019 --external:playwright",
-    "build": "npm run esbuild -- --minify",
-    "watch": "npm run esbuild -- --watch --sourcemap",
-    "generate-license": "node ../../../../utils/generate_third_party_notice.js"
-  },
   "dependencies": {
-    "@babel/code-frame": "^7.24.2",
-    "@babel/core": "^7.24.4",
-    "@babel/helper-plugin-utils": "^7.24.0",
-    "@babel/parser": "^7.24.4",
-    "@babel/plugin-proposal-decorators": "^7.24.1",
-    "@babel/plugin-proposal-explicit-resource-management": "^7.24.1",
+    "@babel/code-frame": "^7.27.1",
+    "@babel/core": "^7.28.0",
+    "@babel/helper-plugin-utils": "^7.27.1",
+    "@babel/parser": "^7.28.0",
+    "@babel/plugin-proposal-decorators": "^7.28.0",
     "@babel/plugin-syntax-async-generators": "^7.8.4",
-    "@babel/plugin-syntax-import-attributes": "^7.24.1",
+    "@babel/plugin-syntax-import-attributes": "^7.27.1",
     "@babel/plugin-syntax-json-strings": "^7.8.3",
     "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
     "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-    "@babel/plugin-transform-class-properties": "^7.24.1",
-    "@babel/plugin-transform-class-static-block": "^7.24.4",
-    "@babel/plugin-transform-export-namespace-from": "^7.24.1",
-    "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-    "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-    "@babel/plugin-transform-numeric-separator": "^7.24.1",
-    "@babel/plugin-transform-optional-chaining": "^7.24.1",
-    "@babel/plugin-transform-private-methods": "^7.24.1",
-    "@babel/plugin-transform-private-property-in-object": "^7.24.1",
-    "@babel/plugin-transform-react-jsx": "^7.23.4",
-    "@babel/preset-typescript": "^7.24.1"
+    "@babel/plugin-transform-class-properties": "^7.27.1",
+    "@babel/plugin-transform-class-static-block": "^7.27.1",
+    "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
+    "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+    "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+    "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
+    "@babel/plugin-transform-numeric-separator": "^7.27.1",
+    "@babel/plugin-transform-optional-chaining": "^7.27.1",
+    "@babel/plugin-transform-private-methods": "^7.27.1",
+    "@babel/plugin-transform-private-property-in-object": "^7.27.1",
+    "@babel/plugin-transform-react-jsx": "^7.27.1",
+    "@babel/preset-typescript": "^7.27.1"
   },
   "devDependencies": {
-    "@types/babel__code-frame": "^7.0.4",
-    "@types/babel__core": "^7.20.2",
-    "@types/babel__helper-plugin-utils": "^7.10.1",
-    "@types/babel__traverse": "^7.20.2"
+    "@types/babel__code-frame": "^7.0.6",
+    "@types/babel__core": "^7.20.5",
+    "@types/babel__helper-plugin-utils": "^7.10.3",
+    "@types/babel__traverse": "^7.20.6"
   }
 }
diff --git a/packages/playwright/bundles/babel/src/babelBundleImpl.ts b/packages/playwright/bundles/babel/src/babelBundleImpl.ts
index f4e44fcea3793..27d94349b6a8a 100644
--- a/packages/playwright/bundles/babel/src/babelBundleImpl.ts
+++ b/packages/playwright/bundles/babel/src/babelBundleImpl.ts
@@ -15,25 +15,28 @@
  */
 
 import path from 'path';
+
+import * as babel from '@babel/core';
+import traverseFunction from '@babel/traverse';
+
 import type { BabelFileResult, NodePath, PluginObj, TransformOptions } from '@babel/core';
-import type { TSExportAssignment, ImportDeclaration } from '@babel/types';
 import type { TemplateBuilder } from '@babel/template';
-import * as babel from '@babel/core';
+import type { ImportDeclaration, TSExportAssignment } from '@babel/types';
 
 export { codeFrameColumns } from '@babel/code-frame';
 export { declare } from '@babel/helper-plugin-utils';
 export { types } from '@babel/core';
-export { parse } from '@babel/parser';
-import traverseFunction from '@babel/traverse';
 export const traverse = traverseFunction;
 
 function babelTransformOptions(isTypeScript: boolean, isModule: boolean, pluginsPrologue: [string, any?][], pluginsEpilogue: [string, any?][]): TransformOptions {
-  const plugins = [];
+  const plugins = [
+    [require('@babel/plugin-syntax-import-attributes'), { deprecatedAssertSyntax: true }],
+  ];
 
   if (isTypeScript) {
     plugins.push(
         [require('@babel/plugin-proposal-decorators'), { version: '2023-05' }],
-        [require('@babel/plugin-proposal-explicit-resource-management')],
+        [require('@babel/plugin-transform-explicit-resource-management')],
         [require('@babel/plugin-transform-class-properties')],
         [require('@babel/plugin-transform-class-static-block')],
         [require('@babel/plugin-transform-numeric-separator')],
@@ -87,8 +90,6 @@ function babelTransformOptions(isTypeScript: boolean, isModule: boolean, plugins
         }
       })
     ]);
-  } else {
-    plugins.push([require('@babel/plugin-syntax-import-attributes'), { deprecatedAssertSyntax: true }]);
   }
 
   return {
@@ -115,16 +116,25 @@ function babelTransformOptions(isTypeScript: boolean, isModule: boolean, plugins
 
 let isTransforming = false;
 
-export function babelTransform(code: string, filename: string, isTypeScript: boolean, isModule: boolean, pluginsPrologue: [string, any?][], pluginsEpilogue: [string, any?][]): BabelFileResult {
+function isTypeScript(filename: string) {
+  return filename.endsWith('.ts') || filename.endsWith('.tsx') || filename.endsWith('.mts') || filename.endsWith('.cts');
+}
+
+export function babelTransform(code: string, filename: string, isModule: boolean, pluginsPrologue: [string, any?][], pluginsEpilogue: [string, any?][]): BabelFileResult | null {
   if (isTransforming)
-    return {};
+    return null;
 
   // Prevent reentry while requiring plugins lazily.
   isTransforming = true;
   try {
-    const options = babelTransformOptions(isTypeScript, isModule, pluginsPrologue, pluginsEpilogue);
-    return babel.transform(code, { filename, ...options })!;
+    const options = babelTransformOptions(isTypeScript(filename), isModule, pluginsPrologue, pluginsEpilogue);
+    return babel.transform(code, { filename, ...options });
   } finally {
     isTransforming = false;
   }
 }
+
+export function babelParse(code: string, filename: string, isModule: boolean): babel.ParseResult {
+  const options = babelTransformOptions(isTypeScript(filename), isModule, [], []);
+  return babel.parse(code, { filename, ...options })!;
+}
diff --git a/packages/playwright/bundles/expect/package-lock.json b/packages/playwright/bundles/expect/package-lock.json
index a6bf58d4d2c05..73375dd81b82c 100644
--- a/packages/playwright/bundles/expect/package-lock.json
+++ b/packages/playwright/bundles/expect/package-lock.json
@@ -8,37 +8,43 @@
       "name": "expect-bundle",
       "version": "0.0.1",
       "dependencies": {
-        "expect": "29.5.0",
-        "jest-matcher-utils": "29.5.0"
+        "@jest/expect-utils": "29.7.0",
+        "jest-get-type": "29.6.3",
+        "jest-matcher-utils": "29.7.0",
+        "jest-message-util": "29.7.0",
+        "jest-mock": "29.7.0",
+        "jest-util": "29.7.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dependencies": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -109,33 +115,33 @@
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
-      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dependencies": {
-        "jest-get-type": "^29.4.3"
+        "jest-get-type": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
-      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dependencies": {
-        "@sinclair/typebox": "^0.25.16"
+        "@sinclair/typebox": "^0.27.8"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "dependencies": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -147,53 +153,56 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.25.24",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
-      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ=="
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
     },
     "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
     },
     "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
     },
     "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.2.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
-      "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ=="
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
     },
     "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
@@ -210,11 +219,11 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -236,9 +245,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
       "funding": [
         {
           "type": "github",
@@ -266,9 +275,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/diff-sequences": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -281,25 +290,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
-      "dependencies": {
-        "@jest/expect-utils": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -329,53 +323,53 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
-      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dependencies": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^29.4.3",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-get-type": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
-      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dependencies": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-message-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
-      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -383,12 +377,25 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
     "node_modules/jest-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dependencies": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -405,17 +412,22 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
         "node": ">=8.6"
       }
     },
+    "node_modules/picocolors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -428,11 +440,11 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
-      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dependencies": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
@@ -452,9 +464,9 @@
       }
     },
     "node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -496,30 +508,37 @@
       "engines": {
         "node": ">=8.0"
       }
+    },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     }
   },
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
-      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "requires": {
-        "@babel/highlight": "^7.22.5"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ=="
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w=="
     },
     "@babel/highlight": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz",
-      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.22.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -574,27 +593,27 @@
       }
     },
     "@jest/expect-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.5.0.tgz",
-      "integrity": "sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
+      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "requires": {
-        "jest-get-type": "^29.4.3"
+        "jest-get-type": "^29.6.3"
       }
     },
     "@jest/schemas": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.4.3.tgz",
-      "integrity": "sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "requires": {
-        "@sinclair/typebox": "^0.25.16"
+        "@sinclair/typebox": "^0.27.8"
       }
     },
     "@jest/types": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.5.0.tgz",
-      "integrity": "sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
       "requires": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
@@ -603,53 +622,56 @@
       }
     },
     "@sinclair/typebox": {
-      "version": "0.25.24",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
-      "integrity": "sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ=="
+      "version": "0.27.8",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
     },
     "@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
     },
     "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "requires": {
         "@types/istanbul-lib-coverage": "*"
       }
     },
     "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "@types/node": {
-      "version": "20.2.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
-      "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ=="
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "requires": {
+        "undici-types": "~6.19.2"
+      }
     },
     "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
     },
     "@types/yargs": {
-      "version": "17.0.24",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
-      "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
     "ansi-styles": {
       "version": "4.3.0",
@@ -660,11 +682,11 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "chalk": {
@@ -677,9 +699,9 @@
       }
     },
     "ci-info": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
+      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ=="
     },
     "color-convert": {
       "version": "2.0.1",
@@ -695,31 +717,19 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "diff-sequences": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
-      "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA=="
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q=="
     },
     "escape-string-regexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
     },
-    "expect": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.5.0.tgz",
-      "integrity": "sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==",
-      "requires": {
-        "@jest/expect-utils": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.5.0",
-        "jest-message-util": "^29.5.0",
-        "jest-util": "^29.5.0"
-      }
-    },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -740,54 +750,64 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "jest-diff": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.5.0.tgz",
-      "integrity": "sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^29.4.3",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       }
     },
     "jest-get-type": {
-      "version": "29.4.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
-      "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg=="
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw=="
     },
     "jest-matcher-utils": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz",
-      "integrity": "sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^29.5.0",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.5.0"
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       }
     },
     "jest-message-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.5.0.tgz",
-      "integrity": "sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.3",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.5.0",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       }
     },
+    "jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "requires": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      }
+    },
     "jest-util": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.5.0.tgz",
-      "integrity": "sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "requires": {
-        "@jest/types": "^29.5.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -801,25 +821,30 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },
+    "picocolors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+    },
     "picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pretty-format": {
-      "version": "29.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.5.0.tgz",
-      "integrity": "sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "requires": {
-        "@jest/schemas": "^29.4.3",
+        "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
         "react-is": "^18.0.0"
       },
@@ -832,9 +857,9 @@
       }
     },
     "react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "slash": {
       "version": "3.0.0",
@@ -864,6 +889,11 @@
       "requires": {
         "is-number": "^7.0.0"
       }
+    },
+    "undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="
     }
   }
 }
diff --git a/packages/playwright/bundles/expect/package.json b/packages/playwright/bundles/expect/package.json
index 11ea4cc42ed10..4597f9e4d908e 100644
--- a/packages/playwright/bundles/expect/package.json
+++ b/packages/playwright/bundles/expect/package.json
@@ -2,14 +2,12 @@
   "name": "expect-bundle",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "esbuild": "esbuild ./src/expectBundleImpl.ts --bundle --outdir=../../lib/common --format=cjs --platform=node --target=ES2019",
-    "build": "npm run esbuild -- --minify",
-    "watch": "npm run esbuild -- --watch --sourcemap",
-    "generate-license": "node ../../../../utils/generate_third_party_notice.js"
-  },
   "dependencies": {
-    "expect": "29.5.0",
-    "jest-matcher-utils": "29.5.0"
+    "@jest/expect-utils": "29.7.0",
+    "jest-get-type": "29.6.3",
+    "jest-matcher-utils": "29.7.0",
+    "jest-message-util": "29.7.0",
+    "jest-mock": "29.7.0",
+    "jest-util": "29.7.0"
   }
 }
diff --git a/packages/playwright/bundles/expect/src/expectBundleImpl.ts b/packages/playwright/bundles/expect/src/expectBundleImpl.ts
index 3eddff13232f4..0ffe8acbd80c2 100644
--- a/packages/playwright/bundles/expect/src/expectBundleImpl.ts
+++ b/packages/playwright/bundles/expect/src/expectBundleImpl.ts
@@ -14,10 +14,35 @@
  * limitations under the License.
  */
 
-import expectLibrary from 'expect';
+import * as mu from 'jest-matcher-utils';
+
+import * as am from '../third_party/asymmetricMatchers';
+import expectLibrary from '../third_party/index';
+
 export const expect = expectLibrary;
+export * as mock from 'jest-mock';
+
+export const asymmetricMatchers = {
+  any: am.any,
+  anything: am.anything,
+  arrayContaining: am.arrayContaining,
+  arrayNotContaining: am.arrayNotContaining,
+  closeTo: am.closeTo,
+  notCloseTo: am.notCloseTo,
+  objectContaining: am.objectContaining,
+  objectNotContaining: am.objectNotContaining,
+  stringContaining: am.stringContaining,
+  stringMatching: am.stringMatching,
+  stringNotContaining: am.stringNotContaining,
+  stringNotMatching: am.stringNotMatching,
+};
+
+export const matcherUtils = {
+  stringify: mu.stringify,
+};
 
 export {
+  EXPECTED_COLOR,
   INVERTED_COLOR,
   RECEIVED_COLOR,
   printReceived,
diff --git a/packages/playwright/bundles/expect/third_party/LICENSE b/packages/playwright/bundles/expect/third_party/LICENSE
new file mode 100644
index 0000000000000..b93be90515ccd
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/playwright/bundles/expect/third_party/asymmetricMatchers.ts b/packages/playwright/bundles/expect/third_party/asymmetricMatchers.ts
new file mode 100644
index 0000000000000..a779f8be35076
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/asymmetricMatchers.ts
@@ -0,0 +1,364 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  equals,
+  getObjectKeys,
+  isA,
+  iterableEquality,
+  subsetEquality,
+} from '@jest/expect-utils';
+import * as matcherUtils from 'jest-matcher-utils';
+import { pluralize } from 'jest-util';
+
+import { getCustomEqualityTesters, getState } from './jestMatchersObject';
+
+import type {
+  AsymmetricMatcher as AsymmetricMatcherInterface,
+  MatcherContext,
+  MatcherState,
+} from './types';
+
+const functionToString = Function.prototype.toString;
+
+function fnNameFor(func: () => unknown) {
+  if (func.name)
+    return func.name;
+
+  const matches = functionToString
+      .call(func)
+      .match(/^(?:async)?\s*function\s*\*?\s*([\w$]+)\s*\(/);
+  return matches ? matches[1] : '<anonymous>';
+}
+
+const utils = Object.freeze({
+  ...matcherUtils,
+  iterableEquality,
+  subsetEquality,
+});
+
+function getPrototype(obj: object) {
+  if (Object.getPrototypeOf)
+    return Object.getPrototypeOf(obj);
+
+  if (obj.constructor.prototype === obj)
+    return null;
+
+  return obj.constructor.prototype;
+}
+
+export function hasProperty(
+  obj: object | null,
+  property: string | symbol,
+): boolean {
+  if (!obj)
+    return false;
+
+  if (Object.prototype.hasOwnProperty.call(obj, property))
+    return true;
+
+  return hasProperty(getPrototype(obj), property);
+}
+
+export abstract class AsymmetricMatcher<T>
+implements AsymmetricMatcherInterface {
+  $$typeof = Symbol.for('jest.asymmetricMatcher');
+
+  constructor(protected sample: T, protected inverse = false) { }
+
+  protected getMatcherContext(): MatcherContext {
+    return {
+      customTesters: getCustomEqualityTesters(),
+
+      dontThrow: () => { },
+      ...getState<MatcherState>(),
+      equals,
+      isNot: this.inverse,
+      utils,
+    };
+  }
+
+  abstract asymmetricMatch(other: unknown): boolean;
+  abstract toString(): string;
+  getExpectedType?(): string;
+  toAsymmetricMatcher?(): string;
+}
+
+class Any extends AsymmetricMatcher<any> {
+  constructor(sample: unknown) {
+    if (typeof sample === 'undefined') {
+      throw new TypeError(
+          'any() expects to be passed a constructor function. ' +
+        'Please pass one or use anything() to match any object.',
+      );
+    }
+    super(sample);
+  }
+
+  asymmetricMatch(other: unknown) {
+    if (this.sample === String)
+      return typeof other === 'string' || other instanceof String;
+
+    if (this.sample === Number)
+      return typeof other === 'number' || other instanceof Number;
+
+    if (this.sample === Function)
+      return typeof other === 'function' || other instanceof Function;
+
+    if (this.sample === Boolean)
+      return typeof other === 'boolean' || other instanceof Boolean;
+
+    if (this.sample === BigInt)
+      return typeof other === 'bigint' || other instanceof BigInt;
+
+    if (this.sample === Symbol)
+      return typeof other === 'symbol' || other instanceof Symbol;
+
+    if (this.sample === Object)
+      return typeof other === 'object';
+
+    return other instanceof this.sample;
+  }
+
+  toString() {
+    return 'Any';
+  }
+
+  override getExpectedType() {
+    if (this.sample === String)
+      return 'string';
+
+    if (this.sample === Number)
+      return 'number';
+
+    if (this.sample === Function)
+      return 'function';
+
+    if (this.sample === Object)
+      return 'object';
+
+    if (this.sample === Boolean)
+      return 'boolean';
+
+    return fnNameFor(this.sample);
+  }
+
+  override toAsymmetricMatcher() {
+    return `Any<${fnNameFor(this.sample)}>`;
+  }
+}
+
+class Anything extends AsymmetricMatcher<void> {
+  asymmetricMatch(other: unknown) {
+    // eslint-disable-next-line eqeqeq
+    return other != null;
+  }
+
+  toString() {
+    return 'Anything';
+  }
+
+  // No getExpectedType method, because it matches either null or undefined.
+
+  override toAsymmetricMatcher() {
+    return 'Anything';
+  }
+}
+
+class ArrayContaining extends AsymmetricMatcher<Array<unknown>> {
+  constructor(sample: Array<unknown>, inverse = false) {
+    super(sample, inverse);
+  }
+
+  asymmetricMatch(other: unknown) {
+    if (!Array.isArray(this.sample)) {
+      throw new Error(
+          `You must provide an array to ${this.toString()}, not '${typeof this
+              .sample}'.`,
+      );
+    }
+
+    const matcherContext = this.getMatcherContext();
+    const result =
+      this.sample.length === 0 ||
+      (Array.isArray(other) &&
+        this.sample.every(item =>
+          other.some(another =>
+            equals(item, another, matcherContext.customTesters),
+          ),
+        ));
+
+    return this.inverse ? !result : result;
+  }
+
+  toString() {
+    return `Array${this.inverse ? 'Not' : ''}Containing`;
+  }
+
+  override getExpectedType() {
+    return 'array';
+  }
+}
+
+class ObjectContaining extends AsymmetricMatcher<
+  Record<string | symbol, unknown>
+> {
+  constructor(sample: Record<string | symbol, unknown>, inverse = false) {
+    super(sample, inverse);
+  }
+
+  asymmetricMatch(other: any) {
+    if (typeof this.sample !== 'object') {
+      throw new Error(
+          `You must provide an object to ${this.toString()}, not '${typeof this
+              .sample}'.`,
+      );
+    }
+
+    let result = true;
+
+    const matcherContext = this.getMatcherContext();
+    const objectKeys = getObjectKeys(this.sample);
+
+    for (const key of objectKeys) {
+      if (
+        !hasProperty(other, key) ||
+        !equals(this.sample[key], other[key], matcherContext.customTesters)
+      ) {
+        result = false;
+        break;
+      }
+    }
+
+    return this.inverse ? !result : result;
+  }
+
+  toString() {
+    return `Object${this.inverse ? 'Not' : ''}Containing`;
+  }
+
+  override getExpectedType() {
+    return 'object';
+  }
+}
+
+class StringContaining extends AsymmetricMatcher<string> {
+  constructor(sample: string, inverse = false) {
+    if (!isA('String', sample))
+      throw new Error('Expected is not a string');
+    super(sample, inverse);
+  }
+
+  asymmetricMatch(other: unknown) {
+    const result = isA<string>('String', other) && other.includes(this.sample);
+
+    return this.inverse ? !result : result;
+  }
+
+  toString() {
+    return `String${this.inverse ? 'Not' : ''}Containing`;
+  }
+
+  override getExpectedType() {
+    return 'string';
+  }
+}
+
+class StringMatching extends AsymmetricMatcher<RegExp> {
+  constructor(sample: string | RegExp, inverse = false) {
+    if (!isA('String', sample) && !isA('RegExp', sample))
+      throw new Error('Expected is not a String or a RegExp');
+    super(new RegExp(sample), inverse);
+  }
+
+  asymmetricMatch(other: unknown) {
+    const result = isA<string>('String', other) && this.sample.test(other);
+
+    return this.inverse ? !result : result;
+  }
+
+  toString() {
+    return `String${this.inverse ? 'Not' : ''}Matching`;
+  }
+
+  override getExpectedType() {
+    return 'string';
+  }
+}
+
+class CloseTo extends AsymmetricMatcher<number> {
+  private readonly precision: number;
+
+  constructor(sample: number, precision = 2, inverse = false) {
+    if (!isA('Number', sample))
+      throw new Error('Expected is not a Number');
+
+    if (!isA('Number', precision))
+      throw new Error('Precision is not a Number');
+
+    super(sample);
+    this.inverse = inverse;
+    this.precision = precision;
+  }
+
+  asymmetricMatch(other: unknown) {
+    if (!isA<number>('Number', other))
+      return false;
+    let result = false;
+    if (other === Infinity && this.sample === Infinity) {
+      result = true; // Infinity - Infinity is NaN
+    } else if (other === -Infinity && this.sample === -Infinity) {
+      result = true; // -Infinity - -Infinity is NaN
+    } else {
+      result =
+        Math.abs(this.sample - other) < Math.pow(10, -this.precision) / 2;
+    }
+    return this.inverse ? !result : result;
+  }
+
+  toString() {
+    return `Number${this.inverse ? 'Not' : ''}CloseTo`;
+  }
+
+  override getExpectedType() {
+    return 'number';
+  }
+
+  override toAsymmetricMatcher(): string {
+    return [
+      this.toString(),
+      this.sample,
+      `(${pluralize('digit', this.precision)})`,
+    ].join(' ');
+  }
+}
+
+export const any = (expectedObject: unknown): Any => new Any(expectedObject);
+export const anything = (): Anything => new Anything();
+export const arrayContaining = (sample: Array<unknown>): ArrayContaining =>
+  new ArrayContaining(sample);
+export const arrayNotContaining = (sample: Array<unknown>): ArrayContaining =>
+  new ArrayContaining(sample, true);
+export const objectContaining = (
+  sample: Record<string, unknown>,
+): ObjectContaining => new ObjectContaining(sample);
+export const objectNotContaining = (
+  sample: Record<string, unknown>,
+): ObjectContaining => new ObjectContaining(sample, true);
+export const stringContaining = (expected: string): StringContaining =>
+  new StringContaining(expected);
+export const stringNotContaining = (expected: string): StringContaining =>
+  new StringContaining(expected, true);
+export const stringMatching = (expected: string | RegExp): StringMatching =>
+  new StringMatching(expected);
+export const stringNotMatching = (expected: string | RegExp): StringMatching =>
+  new StringMatching(expected, true);
+export const closeTo = (expected: number, precision?: number): CloseTo =>
+  new CloseTo(expected, precision);
+export const notCloseTo = (expected: number, precision?: number): CloseTo =>
+  new CloseTo(expected, precision, true);
diff --git a/packages/playwright/bundles/expect/third_party/extractExpectedAssertionsErrors.ts b/packages/playwright/bundles/expect/third_party/extractExpectedAssertionsErrors.ts
new file mode 100644
index 0000000000000..d50c01c69251d
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/extractExpectedAssertionsErrors.ts
@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  EXPECTED_COLOR,
+  RECEIVED_COLOR,
+  matcherHint,
+  pluralize,
+} from 'jest-matcher-utils';
+
+import { getState, setState } from './jestMatchersObject';
+
+import type { Expect, ExpectedAssertionsErrors } from './types';
+
+const resetAssertionsLocalState = () => {
+  setState({
+    assertionCalls: 0,
+    expectedAssertionsNumber: null,
+    isExpectingAssertions: false,
+    numPassingAsserts: 0,
+  });
+};
+
+// Create and format all errors related to the mismatched number of `expect`
+// calls and reset the matcher's state.
+const extractExpectedAssertionsErrors: Expect['extractExpectedAssertionsErrors'] =
+  () => {
+    const result: ExpectedAssertionsErrors = [];
+    const {
+      assertionCalls,
+      expectedAssertionsNumber,
+      expectedAssertionsNumberError,
+      isExpectingAssertions,
+      isExpectingAssertionsError,
+    } = getState();
+
+    resetAssertionsLocalState();
+
+    if (
+      typeof expectedAssertionsNumber === 'number' &&
+      assertionCalls !== expectedAssertionsNumber
+    ) {
+      const numOfAssertionsExpected = EXPECTED_COLOR(
+          pluralize('assertion', expectedAssertionsNumber),
+      );
+
+      expectedAssertionsNumberError!.message =
+        `${matcherHint('.assertions', '', expectedAssertionsNumber.toString(), {
+          isDirectExpectCall: true,
+        })}\n\n` +
+        `Expected ${numOfAssertionsExpected} to be called but received ${RECEIVED_COLOR(
+            pluralize('assertion call', assertionCalls || 0),
+        )}.`;
+
+      result.push({
+        actual: assertionCalls.toString(),
+        error: expectedAssertionsNumberError!,
+        expected: expectedAssertionsNumber.toString(),
+      });
+    }
+    if (isExpectingAssertions && assertionCalls === 0) {
+      const expected = EXPECTED_COLOR('at least one assertion');
+      const received = RECEIVED_COLOR('received none');
+
+      isExpectingAssertionsError!.message = `${matcherHint(
+          '.hasAssertions',
+          '',
+          '',
+          { isDirectExpectCall: true },
+      )}\n\nExpected ${expected} to be called but ${received}.`;
+
+      result.push({
+        actual: 'none',
+        error: isExpectingAssertionsError!,
+        expected: 'at least one',
+      });
+    }
+
+    return result;
+  };
+
+export default extractExpectedAssertionsErrors;
diff --git a/packages/playwright/bundles/expect/third_party/index.ts b/packages/playwright/bundles/expect/third_party/index.ts
new file mode 100644
index 0000000000000..7d5e7bce0e623
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/index.ts
@@ -0,0 +1,465 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { equals, iterableEquality, subsetEquality } from '@jest/expect-utils';
+import * as matcherUtils from 'jest-matcher-utils';
+import { isPromise } from 'jest-util';
+
+import {
+  any,
+  anything,
+  arrayContaining,
+  arrayNotContaining,
+  closeTo,
+  notCloseTo,
+  objectContaining,
+  objectNotContaining,
+  stringContaining,
+  stringMatching,
+  stringNotContaining,
+  stringNotMatching,
+} from './asymmetricMatchers';
+import extractExpectedAssertionsErrors from './extractExpectedAssertionsErrors';
+import {
+  INTERNAL_MATCHER_FLAG,
+  addCustomEqualityTesters,
+  getCustomEqualityTesters,
+  getMatchers,
+  getState,
+  setMatchers,
+  setState,
+} from './jestMatchersObject';
+import matchers from './matchers';
+import spyMatchers from './spyMatchers';
+import toThrowMatchers, {
+  createMatcher as createThrowMatcher,
+} from './toThrowMatchers';
+
+import type {
+  Expect,
+  ExpectationResult,
+  MatcherContext,
+  MatcherState,
+  MatcherUtils,
+  MatchersObject,
+  PromiseMatcherFn,
+  RawMatcherFn,
+  SyncExpectationResult,
+  ThrowingMatcherFn,
+} from './types';
+
+export type { Tester, TesterContext } from '@jest/expect-utils';
+export { AsymmetricMatcher } from './asymmetricMatchers';
+export type {
+  AsymmetricMatchers,
+  AsyncExpectationResult,
+  BaseExpect,
+  Expect,
+  ExpectationResult,
+  MatcherContext,
+  MatcherFunction,
+  MatcherFunctionWithContext,
+  MatcherState,
+  MatcherUtils,
+  Matchers,
+  SyncExpectationResult,
+} from './types';
+
+export class JestAssertionError extends Error {
+  matcherResult?: Omit<SyncExpectationResult, 'message'> & { message: string };
+}
+
+const createToThrowErrorMatchingSnapshotMatcher = function(
+  matcher: RawMatcherFn,
+) {
+  return function(
+    this: MatcherContext,
+    received: any,
+    testNameOrInlineSnapshot?: string,
+  ) {
+    return matcher.apply(this, [received, testNameOrInlineSnapshot, true]);
+  };
+};
+
+const getPromiseMatcher = (name: string, matcher: RawMatcherFn) => {
+  if (name === 'toThrow' || name === 'toThrowError')
+    return createThrowMatcher(name, true);
+  else if (
+    name === 'toThrowErrorMatchingSnapshot' ||
+    name === 'toThrowErrorMatchingInlineSnapshot'
+  )
+    return createToThrowErrorMatchingSnapshotMatcher(matcher);
+
+
+  return null;
+};
+
+export const expect: Expect = (actual: any, ...rest: Array<any>) => {
+  if (rest.length !== 0)
+    throw new Error('Expect takes at most one argument.');
+
+
+  const allMatchers = getMatchers();
+  const expectation: any = {
+    not: {},
+    rejects: { not: {} },
+    resolves: { not: {} },
+  };
+
+  const err = new JestAssertionError();
+
+  Object.keys(allMatchers).forEach(name => {
+    const matcher = allMatchers[name];
+    const promiseMatcher = getPromiseMatcher(name, matcher) || matcher;
+    expectation[name] = makeThrowingMatcher(matcher, false, '', actual);
+    expectation.not[name] = makeThrowingMatcher(matcher, true, '', actual);
+
+    expectation.resolves[name] = makeResolveMatcher(
+        name,
+        promiseMatcher,
+        false,
+        actual,
+        err,
+    );
+    expectation.resolves.not[name] = makeResolveMatcher(
+        name,
+        promiseMatcher,
+        true,
+        actual,
+        err,
+    );
+
+    expectation.rejects[name] = makeRejectMatcher(
+        name,
+        promiseMatcher,
+        false,
+        actual,
+        err,
+    );
+    expectation.rejects.not[name] = makeRejectMatcher(
+        name,
+        promiseMatcher,
+        true,
+        actual,
+        err,
+    );
+  });
+
+  return expectation;
+};
+
+const getMessage = (message?: () => string) =>
+  (message && message()) ||
+  matcherUtils.RECEIVED_COLOR('No message was specified for this matcher.');
+
+const makeResolveMatcher =
+  (
+    matcherName: string,
+    matcher: RawMatcherFn,
+    isNot: boolean,
+    actual: Promise<any>,
+    outerErr: JestAssertionError,
+  ): PromiseMatcherFn =>
+    (...args) => {
+      const options = {
+        isNot,
+        promise: 'resolves',
+      };
+
+      if (!isPromise(actual)) {
+        throw new JestAssertionError(
+            matcherUtils.matcherErrorMessage(
+                matcherUtils.matcherHint(matcherName, undefined, '', options),
+                `${matcherUtils.RECEIVED_COLOR('received')} value must be a promise`,
+                matcherUtils.printWithType(
+                    'Received',
+                    actual,
+                    matcherUtils.printReceived,
+                ),
+            ),
+        );
+      }
+
+      const innerErr = new JestAssertionError();
+
+      return actual.then(
+          result =>
+            makeThrowingMatcher(matcher, isNot, 'resolves', result, innerErr).apply(
+                null,
+                args,
+            ),
+          reason => {
+            outerErr.message =
+            `${matcherUtils.matcherHint(
+                matcherName,
+                undefined,
+                '',
+                options,
+            )}\n\n` +
+            'Received promise rejected instead of resolved\n' +
+            `Rejected to value: ${matcherUtils.printReceived(reason)}`;
+            return Promise.reject(outerErr);
+          },
+      );
+    };
+
+const makeRejectMatcher =
+  (
+    matcherName: string,
+    matcher: RawMatcherFn,
+    isNot: boolean,
+    actual: Promise<any> | (() => Promise<any>),
+    outerErr: JestAssertionError,
+  ): PromiseMatcherFn =>
+    (...args) => {
+      const options = {
+        isNot,
+        promise: 'rejects',
+      };
+
+      const actualWrapper: Promise<any> =
+        typeof actual === 'function' ? actual() : actual;
+
+      if (!isPromise(actualWrapper)) {
+        throw new JestAssertionError(
+            matcherUtils.matcherErrorMessage(
+                matcherUtils.matcherHint(matcherName, undefined, '', options),
+                `${matcherUtils.RECEIVED_COLOR(
+                    'received',
+                )} value must be a promise or a function returning a promise`,
+                matcherUtils.printWithType(
+                    'Received',
+                    actual,
+                    matcherUtils.printReceived,
+                ),
+            ),
+        );
+      }
+
+      const innerErr = new JestAssertionError();
+
+      return actualWrapper.then(
+          result => {
+            outerErr.message =
+            `${matcherUtils.matcherHint(
+                matcherName,
+                undefined,
+                '',
+                options,
+            )}\n\n` +
+            'Received promise resolved instead of rejected\n' +
+            `Resolved to value: ${matcherUtils.printReceived(result)}`;
+            return Promise.reject(outerErr);
+          },
+          reason =>
+            makeThrowingMatcher(matcher, isNot, 'rejects', reason, innerErr).apply(
+                null,
+                args,
+            ),
+      );
+    };
+
+const makeThrowingMatcher = (
+  matcher: RawMatcherFn,
+  isNot: boolean,
+  promise: string,
+  actual: any,
+  err?: JestAssertionError,
+): ThrowingMatcherFn =>
+  function throwingMatcher(...args): any {
+    let throws = true;
+    const utils: MatcherUtils['utils'] = {
+      ...matcherUtils,
+      iterableEquality,
+      subsetEquality,
+    };
+
+    const matcherUtilsThing: MatcherUtils = {
+      customTesters: getCustomEqualityTesters(),
+      // When throws is disabled, the matcher will not throw errors during test
+      // execution but instead add them to the global matcher state. If a
+      // matcher throws, test execution is normally stopped immediately. The
+      // snapshot matcher uses it because we want to log all snapshot
+      // failures in a test.
+      dontThrow: () => (throws = false),
+      equals,
+      utils,
+    };
+
+    const matcherContext: MatcherContext = {
+      ...getState<MatcherState>(),
+      ...matcherUtilsThing,
+      error: err,
+      isNot,
+      promise,
+    };
+
+    const processResult = (
+      result: SyncExpectationResult,
+      asyncError?: JestAssertionError,
+    ) => {
+      _validateResult(result);
+
+      getState().assertionCalls++;
+
+      if ((result.pass && isNot) || (!result.pass && !isNot)) {
+        // XOR
+        const message = getMessage(result.message);
+        let error;
+
+        if (err) {
+          error = err;
+          error.message = message;
+        } else if (asyncError) {
+          error = asyncError;
+          error.message = message;
+        } else {
+          error = new JestAssertionError(message);
+
+          // Try to remove this function from the stack trace frame.
+          // Guard for some environments (browsers) that do not support this feature.
+          if (Error.captureStackTrace)
+            Error.captureStackTrace(error, throwingMatcher);
+
+        }
+        // Passing the result of the matcher with the error so that a custom
+        // reporter could access the actual and expected objects of the result
+        // for example in order to display a custom visual diff
+        error.matcherResult = { ...result, message };
+
+        if (throws)
+          throw error;
+        else
+          getState().suppressedErrors.push(error);
+
+      } else {
+        getState().numPassingAsserts++;
+      }
+    };
+
+    const handleError = (error: Error) => {
+      if (
+        matcher[INTERNAL_MATCHER_FLAG] === true &&
+        !(error instanceof JestAssertionError) &&
+        error.name !== 'PrettyFormatPluginError' &&
+        // Guard for some environments (browsers) that do not support this feature.
+        Error.captureStackTrace
+      ) {
+        // Try to remove this and deeper functions from the stack trace frame.
+        Error.captureStackTrace(error, throwingMatcher);
+      }
+      throw error;
+    };
+
+    let potentialResult: ExpectationResult;
+
+    try {
+      potentialResult =
+        matcher[INTERNAL_MATCHER_FLAG] === true
+          ? matcher.call(matcherContext, actual, ...args)
+          : // It's a trap specifically for inline snapshot to capture this name
+          // in the stack trace, so that it can correctly get the custom matcher
+          // function call.
+          (function __EXTERNAL_MATCHER_TRAP__() {
+            return matcher.call(matcherContext, actual, ...args);
+          })();
+
+      if (isPromise(potentialResult)) {
+        const asyncError = new JestAssertionError();
+        if (Error.captureStackTrace)
+          Error.captureStackTrace(asyncError, throwingMatcher);
+
+
+        return potentialResult
+            .then(aResult => processResult(aResult, asyncError))
+            .catch(handleError);
+      } else {
+        return processResult(potentialResult);
+      }
+    } catch (error: any) {
+      return handleError(error);
+    }
+  };
+
+expect.extend = (matchers: MatchersObject) =>
+  setMatchers(matchers, false, expect);
+
+expect.addEqualityTesters = customTesters =>
+  addCustomEqualityTesters(customTesters);
+
+expect.anything = anything;
+expect.any = any;
+
+expect.not = {
+  arrayContaining: arrayNotContaining,
+  closeTo: notCloseTo,
+  objectContaining: objectNotContaining,
+  stringContaining: stringNotContaining,
+  stringMatching: stringNotMatching,
+};
+
+expect.arrayContaining = arrayContaining;
+expect.closeTo = closeTo;
+expect.objectContaining = objectContaining;
+expect.stringContaining = stringContaining;
+expect.stringMatching = stringMatching;
+
+const _validateResult = (result: any) => {
+  if (
+    typeof result !== 'object' ||
+    typeof result.pass !== 'boolean' ||
+    (result.message &&
+      typeof result.message !== 'string' &&
+      typeof result.message !== 'function')
+  ) {
+    throw new Error(
+        'Unexpected return from a matcher function.\n' +
+      'Matcher functions should ' +
+      'return an object in the following format:\n' +
+      '  {message?: string | function, pass: boolean}\n' +
+      `'${matcherUtils.stringify(result)}' was returned`,
+    );
+  }
+};
+
+function assertions(expected: number): void {
+  const error = new Error();
+  if (Error.captureStackTrace)
+    Error.captureStackTrace(error, assertions);
+
+
+  setState({
+    expectedAssertionsNumber: expected,
+    expectedAssertionsNumberError: error,
+  });
+}
+function hasAssertions(...args: Array<unknown>): void {
+  const error = new Error();
+  if (Error.captureStackTrace)
+    Error.captureStackTrace(error, hasAssertions);
+
+
+  matcherUtils.ensureNoExpected(args[0], '.hasAssertions');
+  setState({
+    isExpectingAssertions: true,
+    isExpectingAssertionsError: error,
+  });
+}
+
+// add default jest matchers
+setMatchers(matchers, true, expect);
+setMatchers(spyMatchers, true, expect);
+setMatchers(toThrowMatchers, true, expect);
+
+expect.assertions = assertions;
+expect.hasAssertions = hasAssertions;
+expect.getState = getState;
+expect.setState = setState;
+expect.extractExpectedAssertionsErrors = extractExpectedAssertionsErrors;
+
+export default expect;
diff --git a/packages/playwright/bundles/expect/third_party/jestMatchersObject.ts b/packages/playwright/bundles/expect/third_party/jestMatchersObject.ts
new file mode 100644
index 0000000000000..30879e11c1f9b
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/jestMatchersObject.ts
@@ -0,0 +1,146 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { getType } from 'jest-get-type';
+
+import { AsymmetricMatcher } from './asymmetricMatchers';
+
+import type {
+  Expect,
+  MatcherState,
+  MatchersObject,
+  SyncExpectationResult,
+} from './types';
+import type { Tester } from '@jest/expect-utils';
+
+// Global matchers object holds the list of available matchers and
+// the state, that can hold matcher specific values that change over time.
+const JEST_MATCHERS_OBJECT = Symbol.for('$$jest-matchers-object');
+
+// Notes a built-in/internal Jest matcher.
+// Jest may override the stack trace of Errors thrown by internal matchers.
+export const INTERNAL_MATCHER_FLAG = Symbol.for('$$jest-internal-matcher');
+
+if (!Object.prototype.hasOwnProperty.call(globalThis, JEST_MATCHERS_OBJECT)) {
+  const defaultState: MatcherState = {
+    assertionCalls: 0,
+    expectedAssertionsNumber: null,
+    isExpectingAssertions: false,
+    numPassingAsserts: 0,
+    suppressedErrors: [], // errors that are not thrown immediately.
+  };
+  Object.defineProperty(globalThis, JEST_MATCHERS_OBJECT, {
+    value: {
+      customEqualityTesters: [],
+      matchers: Object.create(null),
+      state: defaultState,
+    },
+  });
+}
+
+export const getState = <State extends MatcherState = MatcherState>(): State =>
+  (globalThis as any)[JEST_MATCHERS_OBJECT].state;
+
+export const setState = <State extends MatcherState = MatcherState>(
+  state: Partial<State>,
+): void => {
+  Object.assign((globalThis as any)[JEST_MATCHERS_OBJECT].state, state);
+};
+
+export const getMatchers = (): MatchersObject =>
+  (globalThis as any)[JEST_MATCHERS_OBJECT].matchers;
+
+export const setMatchers = (
+  matchers: MatchersObject,
+  isInternal: boolean,
+  expect: Expect,
+): void => {
+  Object.keys(matchers).forEach(key => {
+    const matcher = matchers[key];
+
+    if (typeof matcher !== 'function') {
+      throw new TypeError(
+          `expect.extend: \`${key}\` is not a valid matcher. Must be a function, is "${getType(
+              matcher,
+          )}"`,
+      );
+    }
+
+    Object.defineProperty(matcher, INTERNAL_MATCHER_FLAG, {
+      value: isInternal,
+    });
+
+    if (!isInternal) {
+      // expect is defined
+
+      class CustomMatcher extends AsymmetricMatcher<
+        [unknown, ...Array<unknown>]
+      > {
+        constructor(inverse = false, ...sample: [unknown, ...Array<unknown>]) {
+          super(sample, inverse);
+        }
+
+        asymmetricMatch(other: unknown) {
+          const { pass } = matcher.call(
+              this.getMatcherContext(),
+              other,
+              ...this.sample,
+          ) as SyncExpectationResult;
+
+          return this.inverse ? !pass : pass;
+        }
+
+        toString() {
+          return `${this.inverse ? 'not.' : ''}${key}`;
+        }
+
+        override getExpectedType() {
+          return 'any';
+        }
+
+        override toAsymmetricMatcher() {
+          return `${this.toString()}<${this.sample.map(String).join(', ')}>`;
+        }
+      }
+
+      Object.defineProperty(expect, key, {
+        configurable: true,
+        enumerable: true,
+        value: (...sample: [unknown, ...Array<unknown>]) =>
+          new CustomMatcher(false, ...sample),
+        writable: true,
+      });
+      Object.defineProperty(expect.not, key, {
+        configurable: true,
+        enumerable: true,
+        value: (...sample: [unknown, ...Array<unknown>]) =>
+          new CustomMatcher(true, ...sample),
+        writable: true,
+      });
+    }
+  });
+
+  Object.assign((globalThis as any)[JEST_MATCHERS_OBJECT].matchers, matchers);
+};
+
+export const getCustomEqualityTesters = (): Array<Tester> =>
+  (globalThis as any)[JEST_MATCHERS_OBJECT].customEqualityTesters;
+
+export const addCustomEqualityTesters = (newTesters: Array<Tester>): void => {
+  if (!Array.isArray(newTesters)) {
+    throw new TypeError(
+        `expect.customEqualityTesters: Must be set to an array of Testers. Was given "${getType(
+            newTesters,
+        )}"`,
+    );
+  }
+
+  (globalThis as any)[JEST_MATCHERS_OBJECT].customEqualityTesters.push(
+      ...newTesters,
+  );
+};
diff --git a/packages/playwright/bundles/expect/third_party/matchers.ts b/packages/playwright/bundles/expect/third_party/matchers.ts
new file mode 100644
index 0000000000000..fac0446666f89
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/matchers.ts
@@ -0,0 +1,986 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+/* eslint-disable eqeqeq */
+
+import {
+  arrayBufferEquality,
+  equals,
+  getObjectSubset,
+  getPath,
+  iterableEquality,
+  pathAsArray,
+  sparseArrayEquality,
+  subsetEquality,
+  typeEquality,
+} from '@jest/expect-utils';
+import { getType, isPrimitive } from 'jest-get-type';
+import {
+  DIM_COLOR,
+  EXPECTED_COLOR,
+
+  RECEIVED_COLOR,
+  SUGGEST_TO_CONTAIN_EQUAL,
+  ensureExpectedIsNonNegativeInteger,
+  ensureNoExpected,
+  ensureNumbers,
+  getLabelPrinter,
+  matcherErrorMessage,
+  matcherHint,
+  printDiffOrStringify,
+  printExpected,
+  printReceived,
+  printWithType,
+  stringify
+} from 'jest-matcher-utils';
+
+import {
+  printCloseTo,
+  printExpectedConstructorName,
+  printExpectedConstructorNameNot,
+  printReceivedArrayContainExpectedItem,
+  printReceivedConstructorName,
+  printReceivedConstructorNameNot,
+  printReceivedStringContainExpectedResult,
+  printReceivedStringContainExpectedSubstring,
+} from './print';
+
+import type { MatchersObject } from './types';
+import type { MatcherHintOptions } from 'jest-matcher-utils';
+
+// Omit colon and one or more spaces, so can call getLabelPrinter.
+const EXPECTED_LABEL = 'Expected';
+const RECEIVED_LABEL = 'Received';
+const EXPECTED_VALUE_LABEL = 'Expected value';
+const RECEIVED_VALUE_LABEL = 'Received value';
+
+// The optional property of matcher context is true if undefined.
+const isExpand = (expand?: boolean): boolean => expand !== false;
+
+const toStrictEqualTesters = [
+  iterableEquality,
+  typeEquality,
+  sparseArrayEquality,
+  arrayBufferEquality,
+];
+
+type ContainIterable =
+  | Array<unknown>
+  | Set<unknown>
+  | NodeListOf<Node>
+  | DOMTokenList
+  | HTMLCollectionOf<any>;
+
+const matchers: MatchersObject = {
+  toBe(received: unknown, expected: unknown) {
+    const matcherName = 'toBe';
+    const options: MatcherHintOptions = {
+      comment: 'Object.is equality',
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    const pass = Object.is(received, expected);
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `Expected: not ${printExpected(expected)}`
+      : () => {
+        const expectedType = getType(expected);
+
+        let deepEqualityName = null;
+        if (expectedType !== 'map' && expectedType !== 'set') {
+          // If deep equality passes when referential identity fails,
+          // but exclude map and set until review of their equality logic.
+          if (
+            equals(
+                received,
+                expected,
+                [...this.customTesters, ...toStrictEqualTesters],
+                true,
+            )
+          )
+            deepEqualityName = 'toStrictEqual';
+          else if (
+            equals(received, expected, [
+              ...this.customTesters,
+              iterableEquality,
+            ])
+          )
+            deepEqualityName = 'toEqual';
+
+        }
+
+        return (
+
+          matcherHint(matcherName, undefined, undefined, options) +
+          '\n\n' +
+          (deepEqualityName !== null
+            ? `${DIM_COLOR(
+                `If it should pass with deep equality, replace "${matcherName}" with "${deepEqualityName}"`,
+            )}\n\n`
+            : '') +
+          printDiffOrStringify(
+              expected,
+              received,
+              EXPECTED_LABEL,
+              RECEIVED_LABEL,
+              isExpand(this.expand),
+          )
+        );
+      };
+
+    // Passing the actual and expected objects so that a custom reporter
+    // could access them, for example in order to display a custom visual diff,
+    // or create a different error message
+    return { actual: received, expected, message, name: matcherName, pass };
+  },
+
+  toBeCloseTo(received: number, expected: number, precision = 2) {
+    const matcherName = 'toBeCloseTo';
+    const secondArgument = arguments.length === 3 ? 'precision' : undefined;
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      isNot,
+      promise: this.promise,
+      secondArgument,
+      secondArgumentColor: (arg: string) => arg,
+    };
+
+    if (typeof expected !== 'number') {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${EXPECTED_COLOR('expected')} value must be a number`,
+              printWithType('Expected', expected, printExpected),
+          ),
+      );
+    }
+
+    if (typeof received !== 'number') {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${RECEIVED_COLOR('received')} value must be a number`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    let pass = false;
+    let expectedDiff = 0;
+    let receivedDiff = 0;
+
+    if (received === Infinity && expected === Infinity) {
+      pass = true; // Infinity - Infinity is NaN
+    } else if (received === -Infinity && expected === -Infinity) {
+      pass = true; // -Infinity - -Infinity is NaN
+    } else {
+      expectedDiff = Math.pow(10, -precision) / 2;
+      receivedDiff = Math.abs(expected - received);
+      pass = receivedDiff < expectedDiff;
+    }
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `Expected: not ${printExpected(expected)}\n` +
+        (receivedDiff === 0
+          ? ''
+          : `Received:     ${printReceived(received)}\n` +
+          `\n${printCloseTo(receivedDiff, expectedDiff, precision, isNot)}`)
+      : () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `Expected: ${printExpected(expected)}\n` +
+        `Received: ${printReceived(received)}\n` +
+        '\n' +
+        printCloseTo(receivedDiff, expectedDiff, precision, isNot);
+
+    return { message, pass };
+  },
+
+  toBeDefined(received: unknown, expected: void) {
+    const matcherName = 'toBeDefined';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+
+    const pass = received !== void 0;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      `Received: ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeFalsy(received: unknown, expected: void) {
+    const matcherName = 'toBeFalsy';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+
+    const pass = !received;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      `Received: ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeGreaterThan(received: number | bigint, expected: number | bigint) {
+    const matcherName = 'toBeGreaterThan';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      isNot,
+      promise: this.promise,
+    };
+    ensureNumbers(received, expected, matcherName, options);
+
+    const pass = received > expected;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      `Expected:${isNot ? ' not' : ''} > ${printExpected(expected)}\n` +
+      `Received:${isNot ? '    ' : ''}   ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeGreaterThanOrEqual(received: number | bigint, expected: number | bigint) {
+    const matcherName = 'toBeGreaterThanOrEqual';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      isNot,
+      promise: this.promise,
+    };
+    ensureNumbers(received, expected, matcherName, options);
+
+    const pass = received >= expected;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      `Expected:${isNot ? ' not' : ''} >= ${printExpected(expected)}\n` +
+      `Received:${isNot ? '    ' : ''}    ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeInstanceOf(received: any, expected: Function) {
+    const matcherName = 'toBeInstanceOf';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    if (typeof expected !== 'function') {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${EXPECTED_COLOR('expected')} value must be a function`,
+              printWithType('Expected', expected, printExpected),
+          ),
+      );
+    }
+
+    const pass = received instanceof expected;
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        printExpectedConstructorNameNot('Expected constructor', expected) +
+        (typeof received.constructor === 'function' &&
+          received.constructor !== expected
+          ? printReceivedConstructorNameNot(
+              'Received constructor',
+              received.constructor,
+              expected,
+          )
+          : '')
+      : () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        printExpectedConstructorName('Expected constructor', expected) +
+        (isPrimitive(received) || Object.getPrototypeOf(received) === null
+          ? `\nReceived value has no prototype\nReceived value: ${printReceived(
+              received,
+          )}`
+          : typeof received.constructor !== 'function'
+            ? `\nReceived value: ${printReceived(received)}`
+            : printReceivedConstructorName(
+                'Received constructor',
+                received.constructor,
+            ));
+
+    return { message, pass };
+  },
+
+  toBeLessThan(received: number | bigint, expected: number | bigint) {
+    const matcherName = 'toBeLessThan';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      isNot,
+      promise: this.promise,
+    };
+    ensureNumbers(received, expected, matcherName, options);
+
+    const pass = received < expected;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      `Expected:${isNot ? ' not' : ''} < ${printExpected(expected)}\n` +
+      `Received:${isNot ? '    ' : ''}   ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeLessThanOrEqual(received: number | bigint, expected: number | bigint) {
+    const matcherName = 'toBeLessThanOrEqual';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      isNot,
+      promise: this.promise,
+    };
+    ensureNumbers(received, expected, matcherName, options);
+
+    const pass = received <= expected;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      `Expected:${isNot ? ' not' : ''} <= ${printExpected(expected)}\n` +
+      `Received:${isNot ? '    ' : ''}    ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeNaN(received: any, expected: void) {
+    const matcherName = 'toBeNaN';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+
+    const pass = Number.isNaN(received);
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      `Received: ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeNull(received: unknown, expected: void) {
+    const matcherName = 'toBeNull';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+
+    const pass = received === null;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      `Received: ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeTruthy(received: unknown, expected: void) {
+    const matcherName = 'toBeTruthy';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+
+    const pass = !!received;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      `Received: ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toBeUndefined(received: unknown, expected: void) {
+    const matcherName = 'toBeUndefined';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+
+    const pass = received === void 0;
+
+    const message = () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      `Received: ${printReceived(received)}`;
+
+    return { message, pass };
+  },
+
+  toContain(received: ContainIterable | string, expected: unknown) {
+    const matcherName = 'toContain';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      comment: 'indexOf',
+      isNot,
+      promise: this.promise,
+    };
+
+    if (received == null) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${RECEIVED_COLOR('received')} value must not be null nor undefined`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    if (typeof received === 'string') {
+      const wrongTypeErrorMessage = `${EXPECTED_COLOR(
+          'expected',
+      )} value must be a string if ${RECEIVED_COLOR(
+          'received',
+      )} value is a string`;
+
+      if (typeof expected !== 'string') {
+        throw new Error(
+            matcherErrorMessage(
+                matcherHint(matcherName, received, String(expected), options),
+                wrongTypeErrorMessage,
+
+                printWithType('Expected', expected, printExpected) +
+            '\n' +
+            printWithType('Received', received, printReceived),
+            ),
+        );
+      }
+
+      const index = received.indexOf(String(expected));
+      const pass = index !== -1;
+
+      const message = () => {
+        const labelExpected = `Expected ${typeof expected === 'string' ? 'substring' : 'value'
+        }`;
+        const labelReceived = 'Received string';
+        const printLabel = getLabelPrinter(labelExpected, labelReceived);
+
+        return (
+
+          matcherHint(matcherName, undefined, undefined, options) +
+          '\n\n' +
+          `${printLabel(labelExpected)}${isNot ? 'not ' : ''}${printExpected(
+              expected,
+          )}\n` +
+          `${printLabel(labelReceived)}${isNot ? '    ' : ''}${isNot
+            ? printReceivedStringContainExpectedSubstring(
+                received,
+                index,
+                String(expected).length,
+            )
+            : printReceived(received)
+          }`
+        );
+      };
+
+      return { message, pass };
+    }
+
+    const indexable = Array.from(received);
+    const index = indexable.indexOf(expected);
+    const pass = index !== -1;
+
+    const message = () => {
+      const labelExpected = 'Expected value';
+      const labelReceived = `Received ${getType(received)}`;
+      const printLabel = getLabelPrinter(labelExpected, labelReceived);
+
+      return (
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `${printLabel(labelExpected)}${isNot ? 'not ' : ''}${printExpected(
+            expected,
+        )}\n` +
+        `${printLabel(labelReceived)}${isNot ? '    ' : ''}${isNot && Array.isArray(received)
+          ? printReceivedArrayContainExpectedItem(received, index)
+          : printReceived(received)
+        }` +
+        (!isNot &&
+          indexable.findIndex(item =>
+            equals(item, expected, [...this.customTesters, iterableEquality]),
+          ) !== -1
+          ? `\n\n${SUGGEST_TO_CONTAIN_EQUAL}`
+          : '')
+      );
+    };
+
+    return { message, pass };
+  },
+
+  toContainEqual(received: ContainIterable, expected: unknown) {
+    const matcherName = 'toContainEqual';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      comment: 'deep equality',
+      isNot,
+      promise: this.promise,
+    };
+
+    if (received == null) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${RECEIVED_COLOR('received')} value must not be null nor undefined`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    const index = Array.from(received).findIndex(item =>
+      equals(item, expected, [...this.customTesters, iterableEquality]),
+    );
+    const pass = index !== -1;
+
+    const message = () => {
+      const labelExpected = 'Expected value';
+      const labelReceived = `Received ${getType(received)}`;
+      const printLabel = getLabelPrinter(labelExpected, labelReceived);
+
+      return (
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `${printLabel(labelExpected)}${isNot ? 'not ' : ''}${printExpected(
+            expected,
+        )}\n` +
+        `${printLabel(labelReceived)}${isNot ? '    ' : ''}${isNot && Array.isArray(received)
+          ? printReceivedArrayContainExpectedItem(received, index)
+          : printReceived(received)
+        }`
+      );
+    };
+
+    return { message, pass };
+  },
+
+  toEqual(received: unknown, expected: unknown) {
+    const matcherName = 'toEqual';
+    const options: MatcherHintOptions = {
+      comment: 'deep equality',
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    const pass = equals(received, expected, [
+      ...this.customTesters,
+      iterableEquality,
+    ]);
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `Expected: not ${printExpected(expected)}\n` +
+        (stringify(expected) !== stringify(received)
+          ? `Received:     ${printReceived(received)}`
+          : '')
+      : () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        printDiffOrStringify(
+            expected,
+            received,
+            EXPECTED_LABEL,
+            RECEIVED_LABEL,
+            isExpand(this.expand),
+        );
+
+    // Passing the actual and expected objects so that a custom reporter
+    // could access them, for example in order to display a custom visual diff,
+    // or create a different error message
+    return { actual: received, expected, message, name: matcherName, pass };
+  },
+
+  toHaveLength(received: any, expected: number) {
+    const matcherName = 'toHaveLength';
+    const isNot = this.isNot;
+    const options: MatcherHintOptions = {
+      isNot,
+      promise: this.promise,
+    };
+
+    if (typeof received?.length !== 'number') {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${RECEIVED_COLOR(
+                  'received',
+              )} value must have a length property whose value must be a number`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    ensureExpectedIsNonNegativeInteger(expected, matcherName, options);
+
+    const pass = received.length === expected;
+
+    const message = () => {
+      const labelExpected = 'Expected length';
+      const labelReceivedLength = 'Received length';
+      const labelReceivedValue = `Received ${getType(received)}`;
+      const printLabel = getLabelPrinter(
+          labelExpected,
+          labelReceivedLength,
+          labelReceivedValue,
+      );
+
+      return (
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `${printLabel(labelExpected)}${isNot ? 'not ' : ''}${printExpected(
+            expected,
+        )}\n` +
+        (isNot
+          ? ''
+          : `${printLabel(labelReceivedLength)}${printReceived(
+              received.length,
+          )}\n`) +
+        `${printLabel(labelReceivedValue)}${isNot ? '    ' : ''}${printReceived(
+            received,
+        )}`
+      );
+    };
+
+    return { message, pass };
+  },
+
+  toHaveProperty(
+    received: object,
+    expectedPath: string | Array<string>,
+    expectedValue?: unknown,
+  ) {
+    const matcherName = 'toHaveProperty';
+    const expectedArgument = 'path';
+    const hasValue = arguments.length === 3;
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+      secondArgument: hasValue ? 'value' : '',
+    };
+
+    if (received === null || received === undefined) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, expectedArgument, options),
+              `${RECEIVED_COLOR('received')} value must not be null nor undefined`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    const expectedPathType = getType(expectedPath);
+
+    if (expectedPathType !== 'string' && expectedPathType !== 'array') {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, expectedArgument, options),
+              `${EXPECTED_COLOR('expected')} path must be a string or array`,
+              printWithType('Expected', expectedPath, printExpected),
+          ),
+      );
+    }
+
+    const expectedPathLength =
+      typeof expectedPath === 'string'
+        ? pathAsArray(expectedPath).length
+        : expectedPath.length;
+
+    if (expectedPathType === 'array' && expectedPathLength === 0) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, expectedArgument, options),
+              `${EXPECTED_COLOR('expected')} path must not be an empty array`,
+              printWithType('Expected', expectedPath, printExpected),
+          ),
+      );
+    }
+
+    const result = getPath(received, expectedPath);
+    const { lastTraversedObject, endPropIsDefined, hasEndProp, value } = result;
+    const receivedPath = result.traversedPath;
+    const hasCompletePath = receivedPath.length === expectedPathLength;
+    const receivedValue = hasCompletePath ? result.value : lastTraversedObject;
+
+    const pass =
+      hasValue && endPropIsDefined
+        ? equals(value, expectedValue, [
+          ...this.customTesters,
+          iterableEquality,
+        ])
+        : Boolean(hasEndProp);
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, expectedArgument, options) +
+        '\n\n' +
+        (hasValue
+          ? `Expected path: ${printExpected(expectedPath)}\n\n` +
+          `Expected value: not ${printExpected(expectedValue)}${stringify(expectedValue) !== stringify(receivedValue)
+            ? `\nReceived value:     ${printReceived(receivedValue)}`
+            : ''
+          }`
+          : `Expected path: not ${printExpected(expectedPath)}\n\n` +
+          `Received value: ${printReceived(receivedValue)}`)
+      : () =>
+
+        matcherHint(matcherName, undefined, expectedArgument, options) +
+        '\n\n' +
+        `Expected path: ${printExpected(expectedPath)}\n` +
+        (hasCompletePath
+          ? `\n${printDiffOrStringify(
+              expectedValue,
+              receivedValue,
+              EXPECTED_VALUE_LABEL,
+              RECEIVED_VALUE_LABEL,
+              isExpand(this.expand),
+          )}`
+          : `Received path: ${printReceived(
+              expectedPathType === 'array' || receivedPath.length === 0
+                ? receivedPath
+                : receivedPath.join('.'),
+          )}\n\n${hasValue
+            ? `Expected value: ${printExpected(expectedValue)}\n`
+            : ''
+          }Received value: ${printReceived(receivedValue)}`);
+
+    return { message, pass };
+  },
+
+  toMatch(received: string, expected: string | RegExp) {
+    const matcherName = 'toMatch';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    if (typeof received !== 'string') {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${RECEIVED_COLOR('received')} value must be a string`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    if (
+      !(typeof expected === 'string') &&
+      !(expected && typeof expected.test === 'function')
+    ) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${EXPECTED_COLOR(
+                  'expected',
+              )} value must be a string or regular expression`,
+              printWithType('Expected', expected, printExpected),
+          ),
+      );
+    }
+
+    const pass =
+      typeof expected === 'string'
+        ? received.includes(expected)
+        : new RegExp(expected).test(received);
+
+    const message = pass
+      ? () =>
+        typeof expected === 'string'
+          ?
+          matcherHint(matcherName, undefined, undefined, options) +
+          '\n\n' +
+          `Expected substring: not ${printExpected(expected)}\n` +
+          `Received string:        ${printReceivedStringContainExpectedSubstring(
+              received,
+              received.indexOf(expected),
+              expected.length,
+          )}`
+          :
+          matcherHint(matcherName, undefined, undefined, options) +
+          '\n\n' +
+          `Expected pattern: not ${printExpected(expected)}\n` +
+          `Received string:      ${printReceivedStringContainExpectedResult(
+              received,
+              typeof expected.exec === 'function'
+                ? expected.exec(received)
+                : null,
+          )}`
+      : () => {
+        const labelExpected = `Expected ${typeof expected === 'string' ? 'substring' : 'pattern'
+        }`;
+        const labelReceived = 'Received string';
+        const printLabel = getLabelPrinter(labelExpected, labelReceived);
+
+        return (
+
+          matcherHint(matcherName, undefined, undefined, options) +
+          '\n\n' +
+          `${printLabel(labelExpected)}${printExpected(expected)}\n` +
+          `${printLabel(labelReceived)}${printReceived(received)}`
+        );
+      };
+
+    return { message, pass };
+  },
+
+  toMatchObject(received: object, expected: object) {
+    const matcherName = 'toMatchObject';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    if (typeof received !== 'object' || received === null) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${RECEIVED_COLOR('received')} value must be a non-null object`,
+              printWithType('Received', received, printReceived),
+          ),
+      );
+    }
+
+    if (typeof expected !== 'object' || expected === null) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${EXPECTED_COLOR('expected')} value must be a non-null object`,
+              printWithType('Expected', expected, printExpected),
+          ),
+      );
+    }
+
+    const pass = equals(received, expected, [
+      ...this.customTesters,
+      iterableEquality,
+      subsetEquality,
+    ]);
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `Expected: not ${printExpected(expected)}` +
+        (stringify(expected) !== stringify(received)
+          ? `\nReceived:     ${printReceived(received)}`
+          : '')
+      : () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        printDiffOrStringify(
+            expected,
+            getObjectSubset(received, expected, this.customTesters),
+            EXPECTED_LABEL,
+            RECEIVED_LABEL,
+            isExpand(this.expand),
+        );
+
+    return { message, pass };
+  },
+
+  toStrictEqual(received: unknown, expected: unknown) {
+    const matcherName = 'toStrictEqual';
+    const options: MatcherHintOptions = {
+      comment: 'deep equality',
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    const pass = equals(
+        received,
+        expected,
+        [...this.customTesters, ...toStrictEqualTesters],
+        true,
+    );
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        `Expected: not ${printExpected(expected)}\n` +
+        (stringify(expected) !== stringify(received)
+          ? `Received:     ${printReceived(received)}`
+          : '')
+      : () =>
+
+        matcherHint(matcherName, undefined, undefined, options) +
+        '\n\n' +
+        printDiffOrStringify(
+            expected,
+            received,
+            EXPECTED_LABEL,
+            RECEIVED_LABEL,
+            isExpand(this.expand),
+        );
+
+    // Passing the actual and expected objects so that a custom reporter
+    // could access them, for example in order to display a custom visual diff,
+    // or create a different error message
+    return { actual: received, expected, message, name: matcherName, pass };
+  },
+};
+
+export default matchers;
diff --git a/packages/playwright/bundles/expect/third_party/print.ts b/packages/playwright/bundles/expect/third_party/print.ts
new file mode 100644
index 0000000000000..63cad0f91e6b0
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/print.ts
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import {
+  EXPECTED_COLOR,
+  INVERTED_COLOR,
+  RECEIVED_COLOR,
+  printReceived,
+  stringify,
+} from 'jest-matcher-utils';
+
+// Format substring but do not enclose in double quote marks.
+// The replacement is compatible with pretty-format package.
+const printSubstring = (val: string): string => val.replace(/"|\\/g, '\\$&');
+
+export const printReceivedStringContainExpectedSubstring = (
+  received: string,
+  start: number,
+  length: number, // not end
+): string =>
+  RECEIVED_COLOR(
+      `"${printSubstring(received.slice(0, start))}${INVERTED_COLOR(
+          printSubstring(received.slice(start, start + length)),
+      )}${printSubstring(received.slice(start + length))}"`,
+  );
+
+export const printReceivedStringContainExpectedResult = (
+  received: string,
+  result: RegExpExecArray | null,
+): string =>
+  result === null
+    ? printReceived(received)
+    : printReceivedStringContainExpectedSubstring(
+        received,
+        result.index,
+        result[0].length,
+    );
+
+// The serialized array is compatible with pretty-format package min option.
+// However, items have default stringify depth (instead of depth - 1)
+// so expected item looks consistent by itself and enclosed in the array.
+export const printReceivedArrayContainExpectedItem = (
+  received: Array<unknown>,
+  index: number,
+): string =>
+  RECEIVED_COLOR(
+      `[${received
+          .map((item, i) => {
+            const stringified = stringify(item);
+            return i === index ? INVERTED_COLOR(stringified) : stringified;
+          })
+          .join(', ')}]`,
+  );
+
+export const printCloseTo = (
+  receivedDiff: number,
+  expectedDiff: number,
+  precision: number,
+  isNot: boolean | undefined,
+): string => {
+  const receivedDiffString = stringify(receivedDiff);
+  const expectedDiffString = receivedDiffString.includes('e')
+    ? // toExponential arg is number of digits after the decimal point.
+    expectedDiff.toExponential(0)
+    : 0 <= precision && precision < 20
+      ? // toFixed arg is number of digits after the decimal point.
+      // It may be a value between 0 and 20 inclusive.
+      // Implementations may optionally support a larger range of values.
+      expectedDiff.toFixed(precision + 1)
+      : stringify(expectedDiff);
+
+  return (
+    `Expected precision:  ${isNot ? '    ' : ''}  ${stringify(precision)}\n` +
+    `Expected difference: ${isNot ? 'not ' : ''}< ${EXPECTED_COLOR(
+        expectedDiffString,
+    )}\n` +
+    `Received difference: ${isNot ? '    ' : ''}  ${RECEIVED_COLOR(
+        receivedDiffString,
+    )}`
+  );
+};
+
+export const printExpectedConstructorName = (
+  label: string,
+  expected: Function,
+): string => `${printConstructorName(label, expected, false, true)}\n`;
+
+export const printExpectedConstructorNameNot = (
+  label: string,
+  expected: Function,
+): string => `${printConstructorName(label, expected, true, true)}\n`;
+
+export const printReceivedConstructorName = (
+  label: string,
+  received: Function,
+): string => `${printConstructorName(label, received, false, false)}\n`;
+
+// Do not call function if received is equal to expected.
+export const printReceivedConstructorNameNot = (
+  label: string,
+  received: Function,
+  expected: Function,
+): string =>
+  typeof expected.name === 'string' &&
+  expected.name.length !== 0 &&
+  typeof received.name === 'string' &&
+  received.name.length !== 0
+    ? `${printConstructorName(label, received, true, false)} ${
+      Object.getPrototypeOf(received) === expected
+        ? 'extends'
+        : 'extends … extends'
+    } ${EXPECTED_COLOR(expected.name)}\n`
+    : `${printConstructorName(label, received, false, false)}\n`;
+
+const printConstructorName = (
+  label: string,
+  constructor: Function,
+  isNot: boolean,
+  isExpected: boolean,
+): string =>
+  typeof constructor.name !== 'string'
+    ? `${label} name is not a string`
+    : constructor.name.length === 0
+      ? `${label} name is an empty string`
+      : `${label}: ${!isNot ? '' : isExpected ? 'not ' : '    '}${
+        isExpected
+          ? EXPECTED_COLOR(constructor.name)
+          : RECEIVED_COLOR(constructor.name)
+      }`;
diff --git a/packages/playwright/bundles/expect/third_party/spyMatchers.ts b/packages/playwright/bundles/expect/third_party/spyMatchers.ts
new file mode 100644
index 0000000000000..038351bc06299
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/spyMatchers.ts
@@ -0,0 +1,1187 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { equals, iterableEquality } from '@jest/expect-utils';
+import { getType, isPrimitive } from 'jest-get-type';
+import {
+  DIM_COLOR,
+  EXPECTED_COLOR,
+
+  RECEIVED_COLOR,
+  diff,
+  ensureExpectedIsNonNegativeInteger,
+  ensureNoExpected,
+  matcherErrorMessage,
+  matcherHint,
+  printExpected,
+  printReceived,
+  printWithType,
+  stringify
+} from 'jest-matcher-utils';
+
+import { getCustomEqualityTesters } from './jestMatchersObject';
+
+import type {
+  MatcherFunction,
+  MatchersObject,
+  SyncExpectationResult,
+} from './types';
+import type { MatcherHintOptions } from 'jest-matcher-utils';
+
+/* eslint-disable eqeqeq */
+
+// The optional property of matcher context is true if undefined.
+const isExpand = (expand?: boolean): boolean => expand !== false;
+
+const PRINT_LIMIT = 3;
+
+const NO_ARGUMENTS = 'called with 0 arguments';
+
+const printExpectedArgs = (expected: Array<unknown>): string =>
+  expected.length === 0
+    ? NO_ARGUMENTS
+    : expected.map(arg => printExpected(arg)).join(', ');
+
+const printReceivedArgs = (
+  received: Array<unknown>,
+  expected?: Array<unknown>,
+): string =>
+  received.length === 0
+    ? NO_ARGUMENTS
+    : received
+        .map((arg, i) =>
+          Array.isArray(expected) &&
+          i < expected.length &&
+          isEqualValue(expected[i], arg)
+            ? printCommon(arg)
+            : printReceived(arg),
+        )
+        .join(', ');
+
+const printCommon = (val: unknown) => DIM_COLOR(stringify(val));
+
+const isEqualValue = (expected: unknown, received: unknown): boolean =>
+  equals(expected, received, [...getCustomEqualityTesters(), iterableEquality]);
+
+const isEqualCall = (
+  expected: Array<unknown>,
+  received: Array<unknown>,
+): boolean =>
+  received.length === expected.length && isEqualValue(expected, received);
+
+const isEqualReturn = (expected: unknown, result: any): boolean =>
+  result.type === 'return' && isEqualValue(expected, result.value);
+
+const countReturns = (results: Array<any>): number =>
+  results.reduce(
+      (n: number, result: any) => (result.type === 'return' ? n + 1 : n),
+      0,
+  );
+
+const printNumberOfReturns = (
+  countReturns: number,
+  countCalls: number,
+): string =>
+  `\nNumber of returns: ${printReceived(countReturns)}${countCalls !== countReturns
+    ? `\nNumber of calls:   ${printReceived(countCalls)}`
+    : ''
+  }`;
+
+type PrintLabel = (string: string, isExpectedCall: boolean) => string;
+
+// Given a label, return a function which given a string,
+// right-aligns it preceding the colon in the label.
+const getRightAlignedPrinter = (label: string): PrintLabel => {
+  // Assume that the label contains a colon.
+  const index = label.indexOf(':');
+  const suffix = label.slice(index);
+
+  return (string: string, isExpectedCall: boolean) =>
+    (isExpectedCall
+      ? `->${' '.repeat(Math.max(0, index - 2 - string.length))}`
+      : ' '.repeat(Math.max(index - string.length))) +
+    string +
+    suffix;
+};
+
+type IndexedCall = [number, Array<unknown>];
+
+const printReceivedCallsNegative = (
+  expected: Array<unknown>,
+  indexedCalls: Array<IndexedCall>,
+  isOnlyCall: boolean,
+  iExpectedCall?: number,
+) => {
+  if (indexedCalls.length === 0)
+    return '';
+
+
+  const label = 'Received:     ';
+  if (isOnlyCall)
+    return `${label + printReceivedArgs(indexedCalls[0], expected)}\n`;
+
+
+  const printAligned = getRightAlignedPrinter(label);
+
+  return `Received\n${indexedCalls.reduce(
+      (printed: string, [i, args]: IndexedCall) =>
+        `${printed +
+      printAligned(String(i + 1), i === iExpectedCall) +
+      printReceivedArgs(args, expected)
+        }\n`,
+      '',
+  )}`;
+};
+
+const printExpectedReceivedCallsPositive = (
+  expected: Array<unknown>,
+  indexedCalls: Array<IndexedCall>,
+  expand: boolean,
+  isOnlyCall: boolean,
+  iExpectedCall?: number,
+) => {
+  const expectedLine = `Expected: ${printExpectedArgs(expected)}\n`;
+  if (indexedCalls.length === 0)
+    return expectedLine;
+
+
+  const label = 'Received: ';
+  if (isOnlyCall && (iExpectedCall === 0 || iExpectedCall === undefined)) {
+    const received = indexedCalls[0][1];
+
+    if (isLineDiffableCall(expected, received)) {
+      // Display diff without indentation.
+      const lines = [
+        EXPECTED_COLOR('- Expected'),
+        RECEIVED_COLOR('+ Received'),
+        '',
+      ];
+
+      const length = Math.max(expected.length, received.length);
+      for (let i = 0; i < length; i += 1) {
+        if (i < expected.length && i < received.length) {
+          if (isEqualValue(expected[i], received[i])) {
+            lines.push(`  ${printCommon(received[i])},`);
+            continue;
+          }
+
+          if (isLineDiffableArg(expected[i], received[i])) {
+            const difference = diff(expected[i], received[i], { expand });
+            if (
+              typeof difference === 'string' &&
+              difference.includes('- Expected') &&
+              difference.includes('+ Received')
+            ) {
+              // Omit annotation in case multiple args have diff.
+              lines.push(`${difference.split('\n').slice(3).join('\n')},`);
+              continue;
+            }
+          }
+        }
+
+        if (i < expected.length)
+          lines.push(`${EXPECTED_COLOR(`- ${stringify(expected[i])}`)},`);
+
+        if (i < received.length)
+          lines.push(`${RECEIVED_COLOR(`+ ${stringify(received[i])}`)},`);
+
+      }
+
+      return `${lines.join('\n')}\n`;
+    }
+
+    return `${expectedLine + label + printReceivedArgs(received, expected)}\n`;
+  }
+
+  const printAligned = getRightAlignedPrinter(label);
+
+  return (
+
+    expectedLine +
+    'Received\n' +
+    indexedCalls.reduce((printed: string, [i, received]: IndexedCall) => {
+      const aligned = printAligned(String(i + 1), i === iExpectedCall);
+      return `${printed +
+        ((i === iExpectedCall || iExpectedCall === undefined) &&
+          isLineDiffableCall(expected, received)
+          ? aligned.replace(': ', '\n') +
+          printDiffCall(expected, received, expand)
+          : aligned + printReceivedArgs(received, expected))
+      }\n`;
+    }, '')
+  );
+};
+
+const indentation = 'Received'.replace(/\w/g, ' ');
+
+const printDiffCall = (
+  expected: Array<unknown>,
+  received: Array<unknown>,
+  expand: boolean,
+) =>
+  received
+      .map((arg, i) => {
+        if (i < expected.length) {
+          if (isEqualValue(expected[i], arg))
+            return `${indentation}  ${printCommon(arg)},`;
+
+
+          if (isLineDiffableArg(expected[i], arg)) {
+            const difference = diff(expected[i], arg, { expand });
+
+            if (
+              typeof difference === 'string' &&
+            difference.includes('- Expected') &&
+            difference.includes('+ Received')
+            ) {
+            // Display diff with indentation.
+            // Omit annotation in case multiple args have diff.
+              return `${difference
+                  .split('\n')
+                  .slice(3)
+                  .map(line => indentation + line)
+                  .join('\n')},`;
+            }
+          }
+        }
+
+        // Display + only if received arg has no corresponding expected arg.
+        return `${indentation +
+        (i < expected.length
+          ? `  ${printReceived(arg)}`
+          : RECEIVED_COLOR(`+ ${stringify(arg)}`))
+        },`;
+      })
+      .join('\n');
+
+const isLineDiffableCall = (
+  expected: Array<unknown>,
+  received: Array<unknown>,
+): boolean =>
+  expected.some(
+      (arg, i) => i < received.length && isLineDiffableArg(arg, received[i]),
+  );
+
+// Almost redundant with function in jest-matcher-utils,
+// except no line diff for any strings.
+const isLineDiffableArg = (expected: unknown, received: unknown): boolean => {
+  const expectedType = getType(expected);
+  const receivedType = getType(received);
+
+  if (expectedType !== receivedType)
+    return false;
+
+
+  if (isPrimitive(expected))
+    return false;
+
+
+  if (
+    expectedType === 'date' ||
+    expectedType === 'function' ||
+    expectedType === 'regexp'
+  )
+    return false;
+
+
+  if (expected instanceof Error && received instanceof Error)
+    return false;
+
+
+  if (
+    expectedType === 'object' &&
+    typeof (expected as any).asymmetricMatch === 'function'
+  )
+    return false;
+
+
+  if (
+    receivedType === 'object' &&
+    typeof (received as any).asymmetricMatch === 'function'
+  )
+    return false;
+
+
+  return true;
+};
+
+const printResult = (result: any, expected: unknown) =>
+  result.type === 'throw'
+    ? 'function call threw an error'
+    : result.type === 'incomplete'
+      ? 'function call has not returned yet'
+      : isEqualValue(expected, result.value)
+        ? printCommon(result.value)
+        : printReceived(result.value);
+
+type IndexedResult = [number, any];
+
+// Return either empty string or one line per indexed result,
+// so additional empty line can separate from `Number of returns` which follows.
+const printReceivedResults = (
+  label: string,
+  expected: unknown,
+  indexedResults: Array<IndexedResult>,
+  isOnlyCall: boolean,
+  iExpectedCall?: number,
+) => {
+  if (indexedResults.length === 0)
+    return '';
+
+
+  if (isOnlyCall && (iExpectedCall === 0 || iExpectedCall === undefined))
+    return `${label + printResult(indexedResults[0][1], expected)}\n`;
+
+
+  const printAligned = getRightAlignedPrinter(label);
+
+  return (
+
+    label.replace(':', '').trim() +
+    '\n' +
+    indexedResults.reduce(
+        (printed: string, [i, result]: IndexedResult) =>
+          `${printed +
+        printAligned(String(i + 1), i === iExpectedCall) +
+        printResult(result, expected)
+          }\n`,
+        '',
+    )
+  );
+};
+
+const createToBeCalledMatcher = (
+  matcherName: string,
+): MatcherFunction<[unknown]> =>
+  function(received: any, expected: unknown): SyncExpectationResult {
+    const expectedArgument = '';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+    ensureMockOrSpy(received, matcherName, expectedArgument, options);
+
+    const receivedIsSpy = isSpy(received);
+    const receivedName = receivedIsSpy ? 'spy' : received.getMockName();
+    const count = receivedIsSpy
+      ? received.calls.count()
+      : received.mock.calls.length;
+    const calls = receivedIsSpy
+      ? received.calls.all().map((x: any) => x.args)
+      : received.mock.calls;
+    const pass = count > 0;
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of calls: ${printExpected(0)}\n` +
+        `Received number of calls: ${printReceived(count)}\n\n` +
+        calls
+            .reduce((lines: Array<string>, args: any, i: number) => {
+              if (lines.length < PRINT_LIMIT)
+                lines.push(`${i + 1}: ${printReceivedArgs(args)}`);
+
+
+              return lines;
+            }, [])
+            .join('\n')
+      : () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of calls: >= ${printExpected(1)}\n` +
+        `Received number of calls:    ${printReceived(count)}`;
+
+    return { message, pass };
+  };
+
+const createToReturnMatcher = (
+  matcherName: string,
+): MatcherFunction<[unknown]> =>
+  function(received: any, expected): SyncExpectationResult {
+    const expectedArgument = '';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureNoExpected(expected, matcherName, options);
+    ensureMock(received, matcherName, expectedArgument, options);
+
+    const receivedName = received.getMockName();
+
+    // Count return values that correspond only to calls that returned
+    const count = received.mock.results.reduce(
+        (n: number, result: any) => (result.type === 'return' ? n + 1 : n),
+        0,
+    );
+
+    const pass = count > 0;
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of returns: ${printExpected(0)}\n` +
+        `Received number of returns: ${printReceived(count)}\n\n` +
+        received.mock.results
+            .reduce((lines: Array<string>, result: any, i: number) => {
+              if (result.type === 'return' && lines.length < PRINT_LIMIT)
+                lines.push(`${i + 1}: ${printReceived(result.value)}`);
+
+
+              return lines;
+            }, [])
+            .join('\n') +
+        (received.mock.calls.length !== count
+          ? `\n\nReceived number of calls:   ${printReceived(
+              received.mock.calls.length,
+          )}`
+          : '')
+      : () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of returns: >= ${printExpected(1)}\n` +
+        `Received number of returns:    ${printReceived(count)}` +
+        (received.mock.calls.length !== count
+          ? `\nReceived number of calls:      ${printReceived(
+              received.mock.calls.length,
+          )}`
+          : '');
+
+    return { message, pass };
+  };
+
+const createToBeCalledTimesMatcher = (
+  matcherName: string,
+): MatcherFunction<[number]> =>
+  function(received: any, expected): SyncExpectationResult {
+    const expectedArgument = 'expected';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureExpectedIsNonNegativeInteger(expected, matcherName, options);
+    ensureMockOrSpy(received, matcherName, expectedArgument, options);
+
+    const receivedIsSpy = isSpy(received);
+    const receivedName = receivedIsSpy ? 'spy' : received.getMockName();
+    const count = receivedIsSpy
+      ? received.calls.count()
+      : received.mock.calls.length;
+
+    const pass = count === expected;
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of calls: not ${printExpected(expected)}`
+      : () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of calls: ${printExpected(expected)}\n` +
+        `Received number of calls: ${printReceived(count)}`;
+
+    return { message, pass };
+  };
+
+const createToReturnTimesMatcher = (
+  matcherName: string,
+): MatcherFunction<[number]> =>
+  function(received: any, expected): SyncExpectationResult {
+    const expectedArgument = 'expected';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureExpectedIsNonNegativeInteger(expected, matcherName, options);
+    ensureMock(received, matcherName, expectedArgument, options);
+
+    const receivedName = received.getMockName();
+
+    // Count return values that correspond only to calls that returned
+    const count = received.mock.results.reduce(
+        (n: number, result: any) => (result.type === 'return' ? n + 1 : n),
+        0,
+    );
+
+    const pass = count === expected;
+
+    const message = pass
+      ? () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of returns: not ${printExpected(expected)}` +
+        (received.mock.calls.length !== count
+          ? `\n\nReceived number of calls:       ${printReceived(
+              received.mock.calls.length,
+          )}`
+          : '')
+      : () =>
+
+        matcherHint(matcherName, receivedName, expectedArgument, options) +
+        '\n\n' +
+        `Expected number of returns: ${printExpected(expected)}\n` +
+        `Received number of returns: ${printReceived(count)}` +
+        (received.mock.calls.length !== count
+          ? `\nReceived number of calls:   ${printReceived(
+              received.mock.calls.length,
+          )}`
+          : '');
+
+    return { message, pass };
+  };
+
+const createToBeCalledWithMatcher = (
+  matcherName: string,
+): MatcherFunction<Array<unknown>> =>
+  function(received: any, ...expected): SyncExpectationResult {
+    const expectedArgument = '...expected';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureMockOrSpy(received, matcherName, expectedArgument, options);
+
+    const receivedIsSpy = isSpy(received);
+    const receivedName = receivedIsSpy ? 'spy' : received.getMockName();
+
+    const calls = receivedIsSpy
+      ? received.calls.all().map((x: any) => x.args)
+      : received.mock.calls;
+
+    const pass = calls.some((call: any) => isEqualCall(expected, call));
+
+    const message = pass
+      ? () => {
+        // Some examples of calls that are equal to expected value.
+        const indexedCalls: Array<IndexedCall> = [];
+        let i = 0;
+        while (i < calls.length && indexedCalls.length < PRINT_LIMIT) {
+          if (isEqualCall(expected, calls[i]))
+            indexedCalls.push([i, calls[i]]);
+
+          i += 1;
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `Expected: not ${printExpectedArgs(expected)}\n` +
+          (calls.length === 1 && stringify(calls[0]) === stringify(expected)
+            ? ''
+            : printReceivedCallsNegative(
+                expected,
+                indexedCalls,
+                calls.length === 1,
+            )) +
+          `\nNumber of calls: ${printReceived(calls.length)}`
+        );
+      }
+      : () => {
+        // Some examples of calls that are not equal to expected value.
+        const indexedCalls: Array<IndexedCall> = [];
+        let i = 0;
+        while (i < calls.length && indexedCalls.length < PRINT_LIMIT) {
+          indexedCalls.push([i, calls[i]]);
+          i += 1;
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          printExpectedReceivedCallsPositive(
+              expected,
+              indexedCalls,
+              isExpand(this.expand),
+              calls.length === 1,
+          ) +
+          `\nNumber of calls: ${printReceived(calls.length)}`
+        );
+      };
+
+    return { message, pass };
+  };
+
+const createToReturnWithMatcher = (
+  matcherName: string,
+): MatcherFunction<[unknown]> =>
+  function(received: any, expected): SyncExpectationResult {
+    const expectedArgument = 'expected';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureMock(received, matcherName, expectedArgument, options);
+
+    const receivedName = received.getMockName();
+    const { calls, results } = received.mock;
+
+    const pass = results.some((result: any) => isEqualReturn(expected, result));
+
+    const message = pass
+      ? () => {
+        // Some examples of results that are equal to expected value.
+        const indexedResults: Array<IndexedResult> = [];
+        let i = 0;
+        while (i < results.length && indexedResults.length < PRINT_LIMIT) {
+          if (isEqualReturn(expected, results[i]))
+            indexedResults.push([i, results[i]]);
+
+          i += 1;
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `Expected: not ${printExpected(expected)}\n` +
+          (results.length === 1 &&
+            results[0].type === 'return' &&
+            stringify(results[0].value) === stringify(expected)
+            ? ''
+            : printReceivedResults(
+                'Received:     ',
+                expected,
+                indexedResults,
+                results.length === 1,
+            )) +
+          printNumberOfReturns(countReturns(results), calls.length)
+        );
+      }
+      : () => {
+        // Some examples of results that are not equal to expected value.
+        const indexedResults: Array<IndexedResult> = [];
+        let i = 0;
+        while (i < results.length && indexedResults.length < PRINT_LIMIT) {
+          indexedResults.push([i, results[i]]);
+          i += 1;
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `Expected: ${printExpected(expected)}\n` +
+          printReceivedResults(
+              'Received: ',
+              expected,
+              indexedResults,
+              results.length === 1,
+          ) +
+          printNumberOfReturns(countReturns(results), calls.length)
+        );
+      };
+
+    return { message, pass };
+  };
+
+const createLastCalledWithMatcher = (
+  matcherName: string,
+): MatcherFunction<Array<unknown>> =>
+  function(received: any, ...expected): SyncExpectationResult {
+    const expectedArgument = '...expected';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureMockOrSpy(received, matcherName, expectedArgument, options);
+
+    const receivedIsSpy = isSpy(received);
+    const receivedName = receivedIsSpy ? 'spy' : received.getMockName();
+
+    const calls = receivedIsSpy
+      ? received.calls.all().map((x: any) => x.args)
+      : received.mock.calls;
+    const iLast = calls.length - 1;
+
+    const pass = iLast >= 0 && isEqualCall(expected, calls[iLast]);
+
+    const message = pass
+      ? () => {
+        const indexedCalls: Array<IndexedCall> = [];
+        if (iLast > 0) {
+          // Display preceding call as context.
+          indexedCalls.push([iLast - 1, calls[iLast - 1]]);
+        }
+        indexedCalls.push([iLast, calls[iLast]]);
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `Expected: not ${printExpectedArgs(expected)}\n` +
+          (calls.length === 1 && stringify(calls[0]) === stringify(expected)
+            ? ''
+            : printReceivedCallsNegative(
+                expected,
+                indexedCalls,
+                calls.length === 1,
+                iLast,
+            )) +
+          `\nNumber of calls: ${printReceived(calls.length)}`
+        );
+      }
+      : () => {
+        const indexedCalls: Array<IndexedCall> = [];
+        if (iLast >= 0) {
+          if (iLast > 0) {
+            let i = iLast - 1;
+            // Is there a preceding call that is equal to expected args?
+            while (i >= 0 && !isEqualCall(expected, calls[i]))
+              i -= 1;
+
+            if (i < 0)
+              i = iLast - 1; // otherwise, preceding call
+
+
+            indexedCalls.push([i, calls[i]]);
+          }
+
+          indexedCalls.push([iLast, calls[iLast]]);
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          printExpectedReceivedCallsPositive(
+              expected,
+              indexedCalls,
+              isExpand(this.expand),
+              calls.length === 1,
+              iLast,
+          ) +
+          `\nNumber of calls: ${printReceived(calls.length)}`
+        );
+      };
+
+    return { message, pass };
+  };
+
+const createLastReturnedMatcher = (
+  matcherName: string,
+): MatcherFunction<[unknown]> =>
+  function(received: any, expected): SyncExpectationResult {
+    const expectedArgument = 'expected';
+    const options: MatcherHintOptions = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+    ensureMock(received, matcherName, expectedArgument, options);
+
+    const receivedName = received.getMockName();
+
+    const { calls, results } = received.mock;
+    const iLast = results.length - 1;
+
+    const pass = iLast >= 0 && isEqualReturn(expected, results[iLast]);
+
+    const message = pass
+      ? () => {
+        const indexedResults: Array<IndexedResult> = [];
+        if (iLast > 0) {
+          // Display preceding result as context.
+          indexedResults.push([iLast - 1, results[iLast - 1]]);
+        }
+        indexedResults.push([iLast, results[iLast]]);
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `Expected: not ${printExpected(expected)}\n` +
+          (results.length === 1 &&
+            results[0].type === 'return' &&
+            stringify(results[0].value) === stringify(expected)
+            ? ''
+            : printReceivedResults(
+                'Received:     ',
+                expected,
+                indexedResults,
+                results.length === 1,
+                iLast,
+            )) +
+          printNumberOfReturns(countReturns(results), calls.length)
+        );
+      }
+      : () => {
+        const indexedResults: Array<IndexedResult> = [];
+        if (iLast >= 0) {
+          if (iLast > 0) {
+            let i = iLast - 1;
+            // Is there a preceding result that is equal to expected value?
+            while (i >= 0 && !isEqualReturn(expected, results[i]))
+              i -= 1;
+
+            if (i < 0)
+              i = iLast - 1; // otherwise, preceding result
+
+
+            indexedResults.push([i, results[i]]);
+          }
+
+          indexedResults.push([iLast, results[iLast]]);
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `Expected: ${printExpected(expected)}\n` +
+          printReceivedResults(
+              'Received: ',
+              expected,
+              indexedResults,
+              results.length === 1,
+              iLast,
+          ) +
+          printNumberOfReturns(countReturns(results), calls.length)
+        );
+      };
+
+    return { message, pass };
+  };
+
+const createNthCalledWithMatcher = (
+  matcherName: string,
+): MatcherFunction<[number, ...Array<unknown>]> =>
+  function(received: any, nth, ...expected): SyncExpectationResult {
+    const expectedArgument = 'n';
+    const options: MatcherHintOptions = {
+      expectedColor: (arg: string) => arg,
+      isNot: this.isNot,
+      promise: this.promise,
+      secondArgument: '...expected',
+    };
+    ensureMockOrSpy(received, matcherName, expectedArgument, options);
+
+    if (!Number.isSafeInteger(nth) || nth < 1) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, expectedArgument, options),
+              `${expectedArgument} must be a positive integer`,
+              printWithType(expectedArgument, nth, stringify),
+          ),
+      );
+    }
+
+    const receivedIsSpy = isSpy(received);
+    const receivedName = receivedIsSpy ? 'spy' : received.getMockName();
+
+    const calls = receivedIsSpy
+      ? received.calls.all().map((x: any) => x.args)
+      : received.mock.calls;
+    const length = calls.length;
+    const iNth = nth - 1;
+
+    const pass = iNth < length && isEqualCall(expected, calls[iNth]);
+
+    const message = pass
+      ? () => {
+        // Display preceding and following calls,
+        // in case assertions fails because index is off by one.
+        const indexedCalls: Array<IndexedCall> = [];
+        if (iNth - 1 >= 0)
+          indexedCalls.push([iNth - 1, calls[iNth - 1]]);
+
+        indexedCalls.push([iNth, calls[iNth]]);
+        if (iNth + 1 < length)
+          indexedCalls.push([iNth + 1, calls[iNth + 1]]);
+
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `n: ${nth}\n` +
+          `Expected: not ${printExpectedArgs(expected)}\n` +
+          (calls.length === 1 && stringify(calls[0]) === stringify(expected)
+            ? ''
+            : printReceivedCallsNegative(
+                expected,
+                indexedCalls,
+                calls.length === 1,
+                iNth,
+            )) +
+          `\nNumber of calls: ${printReceived(calls.length)}`
+        );
+      }
+      : () => {
+        // Display preceding and following calls:
+        // * nearest call that is equal to expected args
+        // * otherwise, adjacent call
+        // in case assertions fails because of index, especially off by one.
+        const indexedCalls: Array<IndexedCall> = [];
+        if (iNth < length) {
+          if (iNth - 1 >= 0) {
+            let i = iNth - 1;
+            // Is there a preceding call that is equal to expected args?
+            while (i >= 0 && !isEqualCall(expected, calls[i]))
+              i -= 1;
+
+            if (i < 0)
+              i = iNth - 1; // otherwise, adjacent call
+
+
+            indexedCalls.push([i, calls[i]]);
+          }
+          indexedCalls.push([iNth, calls[iNth]]);
+          if (iNth + 1 < length) {
+            let i = iNth + 1;
+            // Is there a following call that is equal to expected args?
+            while (i < length && !isEqualCall(expected, calls[i]))
+              i += 1;
+
+            if (i >= length)
+              i = iNth + 1; // otherwise, adjacent call
+
+
+            indexedCalls.push([i, calls[i]]);
+          }
+        } else if (length > 0) {
+          // The number of received calls is fewer than the expected number.
+          let i = length - 1;
+          // Is there a call that is equal to expected args?
+          while (i >= 0 && !isEqualCall(expected, calls[i]))
+            i -= 1;
+
+          if (i < 0)
+            i = length - 1; // otherwise, last call
+
+
+          indexedCalls.push([i, calls[i]]);
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `n: ${nth}\n` +
+          printExpectedReceivedCallsPositive(
+              expected,
+              indexedCalls,
+              isExpand(this.expand),
+              calls.length === 1,
+              iNth,
+          ) +
+          `\nNumber of calls: ${printReceived(calls.length)}`
+        );
+      };
+
+    return { message, pass };
+  };
+
+const createNthReturnedWithMatcher = (
+  matcherName: string,
+): MatcherFunction<[number, unknown]> =>
+  function(received: any, nth, expected): SyncExpectationResult {
+    const expectedArgument = 'n';
+    const options: MatcherHintOptions = {
+      expectedColor: (arg: string) => arg,
+      isNot: this.isNot,
+      promise: this.promise,
+      secondArgument: 'expected',
+    };
+    ensureMock(received, matcherName, expectedArgument, options);
+
+    if (!Number.isSafeInteger(nth) || nth < 1) {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, expectedArgument, options),
+              `${expectedArgument} must be a positive integer`,
+              printWithType(expectedArgument, nth, stringify),
+          ),
+      );
+    }
+
+    const receivedName = received.getMockName();
+    const { calls, results } = received.mock;
+    const length = results.length;
+    const iNth = nth - 1;
+
+    const pass = iNth < length && isEqualReturn(expected, results[iNth]);
+
+    const message = pass
+      ? () => {
+        // Display preceding and following results,
+        // in case assertions fails because index is off by one.
+        const indexedResults: Array<IndexedResult> = [];
+        if (iNth - 1 >= 0)
+          indexedResults.push([iNth - 1, results[iNth - 1]]);
+
+        indexedResults.push([iNth, results[iNth]]);
+        if (iNth + 1 < length)
+          indexedResults.push([iNth + 1, results[iNth + 1]]);
+
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `n: ${nth}\n` +
+          `Expected: not ${printExpected(expected)}\n` +
+          (results.length === 1 &&
+            results[0].type === 'return' &&
+            stringify(results[0].value) === stringify(expected)
+            ? ''
+            : printReceivedResults(
+                'Received:     ',
+                expected,
+                indexedResults,
+                results.length === 1,
+                iNth,
+            )) +
+          printNumberOfReturns(countReturns(results), calls.length)
+        );
+      }
+      : () => {
+        // Display preceding and following results:
+        // * nearest result that is equal to expected value
+        // * otherwise, adjacent result
+        // in case assertions fails because of index, especially off by one.
+        const indexedResults: Array<IndexedResult> = [];
+        if (iNth < length) {
+          if (iNth - 1 >= 0) {
+            let i = iNth - 1;
+            // Is there a preceding result that is equal to expected value?
+            while (i >= 0 && !isEqualReturn(expected, results[i]))
+              i -= 1;
+
+            if (i < 0)
+              i = iNth - 1; // otherwise, adjacent result
+
+
+            indexedResults.push([i, results[i]]);
+          }
+          indexedResults.push([iNth, results[iNth]]);
+          if (iNth + 1 < length) {
+            let i = iNth + 1;
+            // Is there a following result that is equal to expected value?
+            while (i < length && !isEqualReturn(expected, results[i]))
+              i += 1;
+
+            if (i >= length)
+              i = iNth + 1; // otherwise, adjacent result
+
+
+            indexedResults.push([i, results[i]]);
+          }
+        } else if (length > 0) {
+          // The number of received calls is fewer than the expected number.
+          let i = length - 1;
+          // Is there a result that is equal to expected value?
+          while (i >= 0 && !isEqualReturn(expected, results[i]))
+            i -= 1;
+
+          if (i < 0)
+            i = length - 1; // otherwise, last result
+
+
+          indexedResults.push([i, results[i]]);
+        }
+
+        return (
+
+          matcherHint(matcherName, receivedName, expectedArgument, options) +
+          '\n\n' +
+          `n: ${nth}\n` +
+          `Expected: ${printExpected(expected)}\n` +
+          printReceivedResults(
+              'Received: ',
+              expected,
+              indexedResults,
+              results.length === 1,
+              iNth,
+          ) +
+          printNumberOfReturns(countReturns(results), calls.length)
+        );
+      };
+
+    return { message, pass };
+  };
+
+const spyMatchers: MatchersObject = {
+  lastCalledWith: createLastCalledWithMatcher('lastCalledWith'),
+  lastReturnedWith: createLastReturnedMatcher('lastReturnedWith'),
+  nthCalledWith: createNthCalledWithMatcher('nthCalledWith'),
+  nthReturnedWith: createNthReturnedWithMatcher('nthReturnedWith'),
+  toBeCalled: createToBeCalledMatcher('toBeCalled'),
+  toBeCalledTimes: createToBeCalledTimesMatcher('toBeCalledTimes'),
+  toBeCalledWith: createToBeCalledWithMatcher('toBeCalledWith'),
+  toHaveBeenCalled: createToBeCalledMatcher('toHaveBeenCalled'),
+  toHaveBeenCalledTimes: createToBeCalledTimesMatcher('toHaveBeenCalledTimes'),
+  toHaveBeenCalledWith: createToBeCalledWithMatcher('toHaveBeenCalledWith'),
+  toHaveBeenLastCalledWith: createLastCalledWithMatcher(
+      'toHaveBeenLastCalledWith',
+  ),
+  toHaveBeenNthCalledWith: createNthCalledWithMatcher(
+      'toHaveBeenNthCalledWith',
+  ),
+  toHaveLastReturnedWith: createLastReturnedMatcher('toHaveLastReturnedWith'),
+  toHaveNthReturnedWith: createNthReturnedWithMatcher('toHaveNthReturnedWith'),
+  toHaveReturned: createToReturnMatcher('toHaveReturned'),
+  toHaveReturnedTimes: createToReturnTimesMatcher('toHaveReturnedTimes'),
+  toHaveReturnedWith: createToReturnWithMatcher('toHaveReturnedWith'),
+  toReturn: createToReturnMatcher('toReturn'),
+  toReturnTimes: createToReturnTimesMatcher('toReturnTimes'),
+  toReturnWith: createToReturnWithMatcher('toReturnWith'),
+};
+
+const isMock = (received: any) =>
+  received != null && received._isMockFunction === true;
+
+const isSpy = (received: any) =>
+  received != null &&
+  received.calls != null &&
+  typeof received.calls.all === 'function' &&
+  typeof received.calls.count === 'function';
+
+const ensureMockOrSpy = (
+  received: any,
+  matcherName: string,
+  expectedArgument: string,
+  options: MatcherHintOptions,
+) => {
+  if (!isMock(received) && !isSpy(received)) {
+    throw new Error(
+        matcherErrorMessage(
+            matcherHint(matcherName, undefined, expectedArgument, options),
+            `${RECEIVED_COLOR('received')} value must be a mock or spy function`,
+            printWithType('Received', received, printReceived),
+        ),
+    );
+  }
+};
+
+const ensureMock = (
+  received: any,
+  matcherName: string,
+  expectedArgument: string,
+  options: MatcherHintOptions,
+) => {
+  if (!isMock(received)) {
+    throw new Error(
+        matcherErrorMessage(
+            matcherHint(matcherName, undefined, expectedArgument, options),
+            `${RECEIVED_COLOR('received')} value must be a mock function`,
+            printWithType('Received', received, printReceived),
+        ),
+    );
+  }
+};
+
+export default spyMatchers;
diff --git a/packages/playwright/bundles/expect/third_party/toThrowMatchers.ts b/packages/playwright/bundles/expect/third_party/toThrowMatchers.ts
new file mode 100644
index 0000000000000..bcb869737996d
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/toThrowMatchers.ts
@@ -0,0 +1,484 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { isError } from '@jest/expect-utils';
+import {
+  EXPECTED_COLOR,
+
+  RECEIVED_COLOR,
+  matcherErrorMessage,
+  matcherHint,
+  printDiffOrStringify,
+  printExpected,
+  printReceived,
+  printWithType
+} from 'jest-matcher-utils';
+import { formatStackTrace, separateMessageFromStack } from 'jest-message-util';
+
+import {
+  printExpectedConstructorName,
+  printExpectedConstructorNameNot,
+  printReceivedConstructorName,
+  printReceivedConstructorNameNot,
+  printReceivedStringContainExpectedResult,
+  printReceivedStringContainExpectedSubstring,
+} from './print';
+
+import type {
+  ExpectationResult,
+  MatcherFunction,
+  MatchersObject,
+  SyncExpectationResult,
+} from './types';
+import type { MatcherHintOptions } from 'jest-matcher-utils';
+
+/* eslint-disable eqeqeq */
+
+const DID_NOT_THROW = 'Received function did not throw';
+
+type Thrown =
+  | {
+    hasMessage: true;
+    isError: true;
+    message: string;
+    value: Error;
+  }
+  | {
+    hasMessage: boolean;
+    isError: false;
+    message: string;
+    value: any;
+  };
+
+const getThrown = (e: any): Thrown => {
+  const hasMessage =
+    e !== null && e !== undefined && typeof e.message === 'string';
+
+  if (hasMessage && typeof e.name === 'string' && typeof e.stack === 'string') {
+    return {
+      hasMessage,
+      isError: true,
+      message: e.message,
+      value: e,
+    };
+  }
+
+  return {
+    hasMessage,
+    isError: false,
+    message: hasMessage ? e.message : String(e),
+    value: e,
+  };
+};
+
+export const createMatcher = (
+  matcherName: string,
+  fromPromise?: boolean,
+): MatcherFunction<[any]> =>
+  function(received, expected): ExpectationResult {
+    const options = {
+      isNot: this.isNot,
+      promise: this.promise,
+    };
+
+    let thrown = null;
+
+    if (fromPromise && isError(received)) {
+      thrown = getThrown(received);
+    } else {
+      if (typeof received !== 'function') {
+        if (!fromPromise) {
+          const placeholder = expected === undefined ? '' : 'expected';
+          throw new Error(
+              matcherErrorMessage(
+                  matcherHint(matcherName, undefined, placeholder, options),
+                  `${RECEIVED_COLOR('received')} value must be a function`,
+                  printWithType('Received', received, printReceived),
+              ),
+          );
+        }
+      } else {
+        try {
+          received();
+        } catch (e) {
+          thrown = getThrown(e);
+        }
+      }
+    }
+
+    if (expected === undefined) {
+      return toThrow(matcherName, options, thrown);
+    } else if (typeof expected === 'function') {
+      return toThrowExpectedClass(matcherName, options, thrown, expected);
+    } else if (typeof expected === 'string') {
+      return toThrowExpectedString(matcherName, options, thrown, expected);
+    } else if (expected !== null && typeof expected.test === 'function') {
+      return toThrowExpectedRegExp(matcherName, options, thrown, expected);
+    } else if (
+      expected !== null &&
+      typeof expected.asymmetricMatch === 'function'
+    ) {
+      return toThrowExpectedAsymmetric(matcherName, options, thrown, expected);
+    } else if (expected !== null && typeof expected === 'object') {
+      return toThrowExpectedObject(matcherName, options, thrown, expected);
+    } else {
+      throw new Error(
+          matcherErrorMessage(
+              matcherHint(matcherName, undefined, undefined, options),
+              `${EXPECTED_COLOR(
+                  'expected',
+              )} value must be a string or regular expression or class or error`,
+              printWithType('Expected', expected, printExpected),
+          ),
+      );
+    }
+  };
+
+const matchers: MatchersObject = {
+  toThrow: createMatcher('toThrow'),
+  toThrowError: createMatcher('toThrowError'),
+};
+
+const toThrowExpectedRegExp = (
+  matcherName: string,
+  options: MatcherHintOptions,
+  thrown: Thrown | null,
+  expected: RegExp,
+): SyncExpectationResult => {
+  const pass = thrown !== null && expected.test(thrown.message);
+
+  const message = pass
+    ? () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected('Expected pattern: not ', expected) +
+      (thrown !== null && thrown.hasMessage
+        ? formatReceived(
+            'Received message:     ',
+            thrown,
+            'message',
+            expected,
+        ) + formatStack(thrown)
+        : formatReceived('Received value:       ', thrown, 'value'))
+    : () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected('Expected pattern: ', expected) +
+      (thrown === null
+        ? `\n${DID_NOT_THROW}`
+        : thrown.hasMessage
+          ? formatReceived('Received message: ', thrown, 'message') +
+          formatStack(thrown)
+          : formatReceived('Received value:   ', thrown, 'value'));
+
+  return { message, pass };
+};
+
+type AsymmetricMatcher = {
+  asymmetricMatch: (received: unknown) => boolean;
+};
+
+const toThrowExpectedAsymmetric = (
+  matcherName: string,
+  options: MatcherHintOptions,
+  thrown: Thrown | null,
+  expected: AsymmetricMatcher,
+): SyncExpectationResult => {
+  const pass = thrown !== null && expected.asymmetricMatch(thrown.value);
+
+  const message = pass
+    ? () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected('Expected asymmetric matcher: not ', expected) +
+      '\n' +
+      (thrown !== null && thrown.hasMessage
+        ? formatReceived('Received name:    ', thrown, 'name') +
+        formatReceived('Received message: ', thrown, 'message') +
+        formatStack(thrown)
+        : formatReceived('Thrown value: ', thrown, 'value'))
+    : () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected('Expected asymmetric matcher: ', expected) +
+      '\n' +
+      (thrown === null
+        ? DID_NOT_THROW
+        : thrown.hasMessage
+          ? formatReceived('Received name:    ', thrown, 'name') +
+          formatReceived('Received message: ', thrown, 'message') +
+          formatStack(thrown)
+          : formatReceived('Thrown value: ', thrown, 'value'));
+
+  return { message, pass };
+};
+
+const toThrowExpectedObject = (
+  matcherName: string,
+  options: MatcherHintOptions,
+  thrown: Thrown | null,
+  expected: Error,
+): SyncExpectationResult => {
+  const expectedMessageAndCause = createMessageAndCause(expected);
+  const thrownMessageAndCause =
+    thrown !== null ? createMessageAndCause(thrown.value) : null;
+  const pass =
+    thrown !== null &&
+    thrown.message === expected.message &&
+    thrownMessageAndCause === expectedMessageAndCause;
+
+  const message = pass
+    ? () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected(
+          `Expected ${messageAndCause(expected)}: not `,
+          expectedMessageAndCause,
+      ) +
+      (thrown !== null && thrown.hasMessage
+        ? formatStack(thrown)
+        : formatReceived('Received value:       ', thrown, 'value'))
+    : () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      (thrown === null
+        ?
+        formatExpected(
+            `Expected ${messageAndCause(expected)}: `,
+            expectedMessageAndCause,
+        ) +
+        '\n' +
+        DID_NOT_THROW
+        : thrown.hasMessage
+          ?
+          printDiffOrStringify(
+              expectedMessageAndCause,
+              thrownMessageAndCause,
+              `Expected ${messageAndCause(expected)}`,
+              `Received ${messageAndCause(thrown.value)}`,
+              true,
+          ) +
+          '\n' +
+          formatStack(thrown)
+          : formatExpected(
+              `Expected ${messageAndCause(expected)}: `,
+              expectedMessageAndCause,
+          ) + formatReceived('Received value:   ', thrown, 'value'));
+
+  return { message, pass };
+};
+
+const toThrowExpectedClass = (
+  matcherName: string,
+  options: MatcherHintOptions,
+  thrown: Thrown | null,
+  expected: Function,
+): SyncExpectationResult => {
+  const pass = thrown !== null && thrown.value instanceof expected;
+
+  const message = pass
+    ? () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      printExpectedConstructorNameNot('Expected constructor', expected) +
+      (thrown !== null &&
+        thrown.value != null &&
+        typeof thrown.value.constructor === 'function' &&
+        thrown.value.constructor !== expected
+        ? printReceivedConstructorNameNot(
+            'Received constructor',
+            thrown.value.constructor,
+            expected,
+        )
+        : '') +
+      '\n' +
+      (thrown !== null && thrown.hasMessage
+        ? formatReceived('Received message: ', thrown, 'message') +
+        formatStack(thrown)
+        : formatReceived('Received value: ', thrown, 'value'))
+    : () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      printExpectedConstructorName('Expected constructor', expected) +
+      (thrown === null
+        ? `\n${DID_NOT_THROW}`
+        : `${thrown.value != null &&
+          typeof thrown.value.constructor === 'function'
+          ? printReceivedConstructorName(
+              'Received constructor',
+              thrown.value.constructor,
+          )
+          : ''
+        }\n${thrown.hasMessage
+          ? formatReceived('Received message: ', thrown, 'message') +
+          formatStack(thrown)
+          : formatReceived('Received value: ', thrown, 'value')
+        }`);
+
+  return { message, pass };
+};
+
+const toThrowExpectedString = (
+  matcherName: string,
+  options: MatcherHintOptions,
+  thrown: Thrown | null,
+  expected: string,
+): SyncExpectationResult => {
+  const pass = thrown !== null && thrown.message.includes(expected);
+
+  const message = pass
+    ? () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected('Expected substring: not ', expected) +
+      (thrown !== null && thrown.hasMessage
+        ? formatReceived(
+            'Received message:       ',
+            thrown,
+            'message',
+            expected,
+        ) + formatStack(thrown)
+        : formatReceived('Received value:         ', thrown, 'value'))
+    : () =>
+
+      matcherHint(matcherName, undefined, undefined, options) +
+      '\n\n' +
+      formatExpected('Expected substring: ', expected) +
+      (thrown === null
+        ? `\n${DID_NOT_THROW}`
+        : thrown.hasMessage
+          ? formatReceived('Received message:   ', thrown, 'message') +
+          formatStack(thrown)
+          : formatReceived('Received value:     ', thrown, 'value'));
+
+  return { message, pass };
+};
+
+const toThrow = (
+  matcherName: string,
+  options: MatcherHintOptions,
+  thrown: Thrown | null,
+): SyncExpectationResult => {
+  const pass = thrown !== null;
+
+  const message = pass
+    ? () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      (thrown !== null && thrown.hasMessage
+        ? formatReceived('Error name:    ', thrown, 'name') +
+        formatReceived('Error message: ', thrown, 'message') +
+        formatStack(thrown)
+        : formatReceived('Thrown value: ', thrown, 'value'))
+    : () =>
+
+      matcherHint(matcherName, undefined, '', options) +
+      '\n\n' +
+      DID_NOT_THROW;
+
+  return { message, pass };
+};
+
+const formatExpected = (label: string, expected: unknown) =>
+  `${label + printExpected(expected)}\n`;
+
+const formatReceived = (
+  label: string,
+  thrown: Thrown | null,
+  key: string,
+  expected?: string | RegExp,
+) => {
+  if (thrown === null)
+    return '';
+
+
+  if (key === 'message') {
+    const message = thrown.message;
+
+    if (typeof expected === 'string') {
+      const index = message.indexOf(expected);
+      if (index !== -1) {
+        return `${label +
+          printReceivedStringContainExpectedSubstring(
+              message,
+              index,
+              expected.length,
+          )
+        }\n`;
+      }
+    } else if (expected instanceof RegExp) {
+      return `${label +
+        printReceivedStringContainExpectedResult(
+            message,
+            typeof expected.exec === 'function' ? expected.exec(message) : null,
+        )
+      }\n`;
+    }
+
+    return `${label + printReceived(message)}\n`;
+  }
+
+  if (key === 'name') {
+    return thrown.isError
+      ? `${label + printReceived(thrown.value.name)}\n`
+      : '';
+  }
+
+  if (key === 'value')
+    return thrown.isError ? '' : `${label + printReceived(thrown.value)}\n`;
+
+
+  return '';
+};
+
+const formatStack = (thrown: Thrown | null) =>
+  thrown === null || !thrown.isError
+    ? ''
+    : formatStackTrace(
+        separateMessageFromStack(thrown.value.stack!).stack,
+        {
+          rootDir: process.cwd(),
+          testMatch: [],
+        },
+        {
+          noStackTrace: false,
+        },
+    );
+
+function createMessageAndCauseMessage(error: Error): string {
+  if (error.cause instanceof Error) {
+    return `{ message: ${error.message}, cause: ${createMessageAndCauseMessage(
+        error.cause,
+    )}}`;
+  }
+
+  return `{ message: ${error.message} }`;
+}
+
+function createMessageAndCause(error: Error) {
+  if (error.cause instanceof Error)
+    return createMessageAndCauseMessage(error);
+
+  return error.message;
+}
+
+function messageAndCause(error: Error) {
+  return error.cause === undefined ? 'message' : 'message and cause';
+}
+
+export default matchers;
diff --git a/packages/playwright/bundles/expect/third_party/types.ts b/packages/playwright/bundles/expect/third_party/types.ts
new file mode 100644
index 0000000000000..65660ff38bf4a
--- /dev/null
+++ b/packages/playwright/bundles/expect/third_party/types.ts
@@ -0,0 +1,353 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import type { INTERNAL_MATCHER_FLAG } from './jestMatchersObject';
+import type { EqualsFunction, Tester } from '@jest/expect-utils';
+import type * as jestMatcherUtils from 'jest-matcher-utils';
+
+export type SyncExpectationResult = {
+  pass: boolean;
+  message(): string;
+};
+
+export type AsyncExpectationResult = Promise<SyncExpectationResult>;
+
+export type ExpectationResult = SyncExpectationResult | AsyncExpectationResult;
+
+export type MatcherFunctionWithContext<
+  Context extends MatcherContext = MatcherContext,
+  Expected extends Array<any> = [] /** TODO should be: extends Array<unknown> = [] */,
+> = (
+  this: Context,
+  actual: unknown,
+  ...expected: Expected
+) => ExpectationResult;
+
+export type MatcherFunction<Expected extends Array<unknown> = []> =
+  MatcherFunctionWithContext<MatcherContext, Expected>;
+
+// TODO should be replaced with `MatcherFunctionWithContext`
+export type RawMatcherFn<Context extends MatcherContext = MatcherContext> = {
+  (this: Context, actual: any, ...expected: Array<any>): ExpectationResult;
+  /** @internal */
+  [INTERNAL_MATCHER_FLAG]?: boolean;
+};
+
+export type MatchersObject = {
+  [name: string]: RawMatcherFn;
+};
+
+export type ThrowingMatcherFn = (actual: any) => void;
+export type PromiseMatcherFn = (actual: any) => Promise<void>;
+
+export interface MatcherUtils {
+  customTesters: Array<Tester>;
+  dontThrow(): void;
+  equals: EqualsFunction;
+  utils: typeof jestMatcherUtils & {
+    iterableEquality: Tester;
+    subsetEquality: Tester;
+  };
+}
+
+export interface MatcherState {
+  assertionCalls: number;
+  currentConcurrentTestName?: () => string | undefined;
+  currentTestName?: string;
+  error?: Error;
+  expand?: boolean;
+  expectedAssertionsNumber: number | null;
+  expectedAssertionsNumberError?: Error;
+  isExpectingAssertions: boolean;
+  isExpectingAssertionsError?: Error;
+  isNot?: boolean;
+  numPassingAsserts: number;
+  promise?: string;
+  suppressedErrors: Array<Error>;
+  testPath?: string;
+}
+
+export type MatcherContext = MatcherUtils & Readonly<MatcherState>;
+
+export type AsymmetricMatcher = {
+  asymmetricMatch(other: unknown): boolean;
+  toString(): string;
+  getExpectedType?(): string;
+  toAsymmetricMatcher?(): string;
+};
+
+export type ExpectedAssertionsErrors = Array<{
+  actual: string | number;
+  error: Error;
+  expected: string;
+}>;
+
+export interface BaseExpect {
+  assertions(numberOfAssertions: number): void;
+  addEqualityTesters(testers: Array<Tester>): void;
+  extend(matchers: MatchersObject): void;
+  extractExpectedAssertionsErrors(): ExpectedAssertionsErrors;
+  getState(): MatcherState;
+  hasAssertions(): void;
+  setState(state: Partial<MatcherState>): void;
+}
+
+export type Expect = {
+  <T = unknown>(actual: T): Matchers<void, T> &
+    Inverse<Matchers<void, T>> &
+    PromiseMatchers<T>;
+} & BaseExpect &
+  AsymmetricMatchers &
+  Inverse<Omit<AsymmetricMatchers, 'any' | 'anything'>>;
+
+type Inverse<Matchers> = {
+  /**
+   * Inverse next matcher. If you know how to test something, `.not` lets you test its opposite.
+   */
+  not: Matchers;
+};
+
+export interface AsymmetricMatchers {
+  any(sample: unknown): AsymmetricMatcher;
+  anything(): AsymmetricMatcher;
+  arrayContaining(sample: Array<unknown>): AsymmetricMatcher;
+  closeTo(sample: number, precision?: number): AsymmetricMatcher;
+  objectContaining(sample: Record<string, unknown>): AsymmetricMatcher;
+  stringContaining(sample: string): AsymmetricMatcher;
+  stringMatching(sample: string | RegExp): AsymmetricMatcher;
+}
+
+type PromiseMatchers<T = unknown> = {
+  /**
+   * Unwraps the reason of a rejected promise so any other matcher can be chained.
+   * If the promise is fulfilled the assertion fails.
+   */
+  rejects: Matchers<Promise<void>, T> & Inverse<Matchers<Promise<void>, T>>;
+  /**
+   * Unwraps the value of a fulfilled promise so any other matcher can be chained.
+   * If the promise is rejected the assertion fails.
+   */
+  resolves: Matchers<Promise<void>, T> & Inverse<Matchers<Promise<void>, T>>;
+};
+
+export interface Matchers<R extends void | Promise<void>, T = unknown> {
+  /**
+   * T is a type param for the benefit of users who extend Matchers. It's
+   * intentionally unused and needs to be named T, not _T, for those users.
+   * This makes sure TypeScript agrees.
+   *
+   * @internal
+   */
+  _unusedT(expected: T): R;
+  /**
+   * Ensures the last call to a mock function was provided specific args.
+   */
+  lastCalledWith(...expected: Array<unknown>): R;
+  /**
+   * Ensure that the last call to a mock function has returned a specified value.
+   */
+  lastReturnedWith(expected?: unknown): R;
+  /**
+   * Ensure that a mock function is called with specific arguments on an Nth call.
+   */
+  nthCalledWith(nth: number, ...expected: Array<unknown>): R;
+  /**
+   * Ensure that the nth call to a mock function has returned a specified value.
+   */
+  nthReturnedWith(nth: number, expected?: unknown): R;
+  /**
+   * Checks that a value is what you expect. It calls `Object.is` to compare values.
+   * Don't use `toBe` with floating-point numbers.
+   */
+  toBe(expected: unknown): R;
+  /**
+   * Ensures that a mock function is called.
+   */
+  toBeCalled(): R;
+  /**
+   * Ensures that a mock function is called an exact number of times.
+   */
+  toBeCalledTimes(expected: number): R;
+  /**
+   * Ensure that a mock function is called with specific arguments.
+   */
+  toBeCalledWith(...expected: Array<unknown>): R;
+  /**
+   * Using exact equality with floating point numbers is a bad idea.
+   * Rounding means that intuitive things fail.
+   * The default for `precision` is 2.
+   */
+  toBeCloseTo(expected: number, precision?: number): R;
+  /**
+   * Ensure that a variable is not undefined.
+   */
+  toBeDefined(): R;
+  /**
+   * When you don't care what a value is, you just want to
+   * ensure a value is false in a boolean context.
+   */
+  toBeFalsy(): R;
+  /**
+   * For comparing floating point numbers.
+   */
+  toBeGreaterThan(expected: number | bigint): R;
+  /**
+   * For comparing floating point numbers.
+   */
+  toBeGreaterThanOrEqual(expected: number | bigint): R;
+  /**
+   * Ensure that an object is an instance of a class.
+   * This matcher uses `instanceof` underneath.
+   */
+  toBeInstanceOf(expected: unknown): R;
+  /**
+   * For comparing floating point numbers.
+   */
+  toBeLessThan(expected: number | bigint): R;
+  /**
+   * For comparing floating point numbers.
+   */
+  toBeLessThanOrEqual(expected: number | bigint): R;
+  /**
+   * Used to check that a variable is NaN.
+   */
+  toBeNaN(): R;
+  /**
+   * This is the same as `.toBe(null)` but the error messages are a bit nicer.
+   * So use `.toBeNull()` when you want to check that something is null.
+   */
+  toBeNull(): R;
+  /**
+   * Use when you don't care what a value is, you just want to ensure a value
+   * is true in a boolean context. In JavaScript, there are six falsy values:
+   * `false`, `0`, `''`, `null`, `undefined`, and `NaN`. Everything else is truthy.
+   */
+  toBeTruthy(): R;
+  /**
+   * Used to check that a variable is undefined.
+   */
+  toBeUndefined(): R;
+  /**
+   * Used when you want to check that an item is in a list.
+   * For testing the items in the list, this uses `===`, a strict equality check.
+   */
+  toContain(expected: unknown): R;
+  /**
+   * Used when you want to check that an item is in a list.
+   * For testing the items in the list, this  matcher recursively checks the
+   * equality of all fields, rather than checking for object identity.
+   */
+  toContainEqual(expected: unknown): R;
+  /**
+   * Used when you want to check that two objects have the same value.
+   * This matcher recursively checks the equality of all fields, rather than checking for object identity.
+   */
+  toEqual(expected: unknown): R;
+  /**
+   * Ensures that a mock function is called.
+   */
+  toHaveBeenCalled(): R;
+  /**
+   * Ensures that a mock function is called an exact number of times.
+   */
+  toHaveBeenCalledTimes(expected: number): R;
+  /**
+   * Ensure that a mock function is called with specific arguments.
+   */
+  toHaveBeenCalledWith(...expected: Array<unknown>): R;
+  /**
+   * Ensure that a mock function is called with specific arguments on an Nth call.
+   */
+  toHaveBeenNthCalledWith(nth: number, ...expected: Array<unknown>): R;
+  /**
+   * If you have a mock function, you can use `.toHaveBeenLastCalledWith`
+   * to test what arguments it was last called with.
+   */
+  toHaveBeenLastCalledWith(...expected: Array<unknown>): R;
+  /**
+   * Use to test the specific value that a mock function last returned.
+   * If the last call to the mock function threw an error, then this matcher will fail
+   * no matter what value you provided as the expected return value.
+   */
+  toHaveLastReturnedWith(expected?: unknown): R;
+  /**
+   * Used to check that an object has a `.length` property
+   * and it is set to a certain numeric value.
+   */
+  toHaveLength(expected: number): R;
+  /**
+   * Use to test the specific value that a mock function returned for the nth call.
+   * If the nth call to the mock function threw an error, then this matcher will fail
+   * no matter what value you provided as the expected return value.
+   */
+  toHaveNthReturnedWith(nth: number, expected?: unknown): R;
+  /**
+   * Use to check if property at provided reference keyPath exists for an object.
+   * For checking deeply nested properties in an object you may use dot notation or an array containing
+   * the keyPath for deep references.
+   *
+   * Optionally, you can provide a value to check if it's equal to the value present at keyPath
+   * on the target object. This matcher uses 'deep equality' (like `toEqual()`) and recursively checks
+   * the equality of all fields.
+   *
+   * @example
+   *
+   * expect(houseForSale).toHaveProperty('kitchen.area', 20);
+   */
+  toHaveProperty(
+    expectedPath: string | Array<string>,
+    expectedValue?: unknown,
+  ): R;
+  /**
+   * Use to test that the mock function successfully returned (i.e., did not throw an error) at least one time
+   */
+  toHaveReturned(): R;
+  /**
+   * Use to ensure that a mock function returned successfully (i.e., did not throw an error) an exact number of times.
+   * Any calls to the mock function that throw an error are not counted toward the number of times the function returned.
+   */
+  toHaveReturnedTimes(expected: number): R;
+  /**
+   * Use to ensure that a mock function returned a specific value.
+   */
+  toHaveReturnedWith(expected?: unknown): R;
+  /**
+   * Check that a string matches a regular expression.
+   */
+  toMatch(expected: string | RegExp): R;
+  /**
+   * Used to check that a JavaScript object matches a subset of the properties of an object
+   */
+  toMatchObject(
+    expected: Record<string, unknown> | Array<Record<string, unknown>>,
+  ): R;
+  /**
+   * Ensure that a mock function has returned (as opposed to thrown) at least once.
+   */
+  toReturn(): R;
+  /**
+   * Ensure that a mock function has returned (as opposed to thrown) a specified number of times.
+   */
+  toReturnTimes(expected: number): R;
+  /**
+   * Ensure that a mock function has returned a specified value at least once.
+   */
+  toReturnWith(expected?: unknown): R;
+  /**
+   * Use to test that objects have the same types as well as structure.
+   */
+  toStrictEqual(expected: unknown): R;
+  /**
+   * Used to test that a function throws when it is called.
+   */
+  toThrow(expected?: unknown): R;
+  /**
+   * If you want to test that a specific error is thrown inside a function.
+   */
+  toThrowError(expected?: unknown): R;
+}
diff --git a/packages/playwright/bundles/mcp/package-lock.json b/packages/playwright/bundles/mcp/package-lock.json
new file mode 100644
index 0000000000000..9c8d24a2ed358
--- /dev/null
+++ b/packages/playwright/bundles/mcp/package-lock.json
@@ -0,0 +1,1051 @@
+{
+  "name": "mcp-bundle",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "mcp-bundle",
+      "version": "0.0.1",
+      "dependencies": {
+        "@modelcontextprotocol/sdk": "^1.17.3",
+        "zod": "^3.25.76",
+        "zod-to-json-schema": "^3.24.6"
+      }
+    },
+    "node_modules/@modelcontextprotocol/sdk": {
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.17.3.tgz",
+      "integrity": "sha512-JPwUKWSsbzx+DLFznf/QZ32Qa+ptfbUlHhRLrBQBAFu9iI1iYvizM4p+zhhRDceSsPutXp4z+R/HPVphlIiclg==",
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^6.12.6",
+        "content-type": "^1.0.5",
+        "cors": "^2.8.5",
+        "cross-spawn": "^7.0.5",
+        "eventsource": "^3.0.2",
+        "eventsource-parser": "^3.0.0",
+        "express": "^5.0.1",
+        "express-rate-limit": "^7.5.0",
+        "pkce-challenge": "^5.0.0",
+        "raw-body": "^3.0.0",
+        "zod": "^3.23.8",
+        "zod-to-json-schema": "^3.24.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz",
+      "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "^3.0.0",
+        "negotiator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/body-parser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.0.tgz",
+      "integrity": "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==",
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "^3.1.2",
+        "content-type": "^1.0.5",
+        "debug": "^4.4.0",
+        "http-errors": "^2.0.0",
+        "iconv-lite": "^0.6.3",
+        "on-finished": "^2.4.1",
+        "qs": "^6.14.0",
+        "raw-body": "^3.0.0",
+        "type-is": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.0.tgz",
+      "integrity": "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
+      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.6.0"
+      }
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+      "license": "MIT"
+    },
+    "node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+      "license": "MIT"
+    },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/eventsource": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-3.0.7.tgz",
+      "integrity": "sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==",
+      "license": "MIT",
+      "dependencies": {
+        "eventsource-parser": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/eventsource-parser": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.3.tgz",
+      "integrity": "sha512-nVpZkTMM9rF6AQ9gPJpFsNAMt48wIzB5TQgiTLdHiuO8XEDhUgZEhqKlZWXbIzo9VmJ/HvysHqEaVeD5v9TPvA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/express": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
+      "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "^2.0.0",
+        "body-parser": "^2.2.0",
+        "content-disposition": "^1.0.0",
+        "content-type": "^1.0.5",
+        "cookie": "^0.7.1",
+        "cookie-signature": "^1.2.1",
+        "debug": "^4.4.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "etag": "^1.8.1",
+        "finalhandler": "^2.1.0",
+        "fresh": "^2.0.0",
+        "http-errors": "^2.0.0",
+        "merge-descriptors": "^2.0.0",
+        "mime-types": "^3.0.0",
+        "on-finished": "^2.4.1",
+        "once": "^1.4.0",
+        "parseurl": "^1.3.3",
+        "proxy-addr": "^2.0.7",
+        "qs": "^6.14.0",
+        "range-parser": "^1.2.1",
+        "router": "^2.2.0",
+        "send": "^1.1.0",
+        "serve-static": "^2.2.0",
+        "statuses": "^2.0.1",
+        "type-is": "^2.0.1",
+        "vary": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/express-rate-limit": {
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz",
+      "integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/express-rate-limit"
+      },
+      "peerDependencies": {
+        "express": ">= 4.11"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "license": "MIT"
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "license": "MIT"
+    },
+    "node_modules/finalhandler": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-2.1.0.tgz",
+      "integrity": "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "on-finished": "^2.4.1",
+        "parseurl": "^1.3.3",
+        "statuses": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-2.0.0.tgz",
+      "integrity": "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-promise": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+      "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "license": "MIT"
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/media-typer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
+      "integrity": "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
+      "integrity": "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.54.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
+      "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-3.0.1.tgz",
+      "integrity": "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "^1.54.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/negotiator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz",
+      "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.2.0.tgz",
+      "integrity": "sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/pkce-challenge": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.0.tgz",
+      "integrity": "sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.20.0"
+      }
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.0.tgz",
+      "integrity": "sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==",
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.6.3",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/router": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz",
+      "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "depd": "^2.0.0",
+        "is-promise": "^4.0.0",
+        "parseurl": "^1.3.3",
+        "path-to-regexp": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/send": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-1.2.0.tgz",
+      "integrity": "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.5",
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "etag": "^1.8.1",
+        "fresh": "^2.0.0",
+        "http-errors": "^2.0.0",
+        "mime-types": "^3.0.1",
+        "ms": "^2.1.3",
+        "on-finished": "^2.4.1",
+        "range-parser": "^1.2.1",
+        "statuses": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/serve-static": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-2.2.0.tgz",
+      "integrity": "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==",
+      "license": "MIT",
+      "dependencies": {
+        "encodeurl": "^2.0.0",
+        "escape-html": "^1.0.3",
+        "parseurl": "^1.3.3",
+        "send": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/setprototypeof": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "license": "ISC"
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/toidentifier": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/type-is": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz",
+      "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==",
+      "license": "MIT",
+      "dependencies": {
+        "content-type": "^1.0.5",
+        "media-typer": "^1.1.0",
+        "mime-types": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
+    },
+    "node_modules/zod": {
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-to-json-schema": {
+      "version": "3.24.6",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz",
+      "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==",
+      "license": "ISC",
+      "peerDependencies": {
+        "zod": "^3.24.1"
+      }
+    }
+  }
+}
diff --git a/packages/playwright/bundles/mcp/package.json b/packages/playwright/bundles/mcp/package.json
new file mode 100644
index 0000000000000..be2ee06a43b55
--- /dev/null
+++ b/packages/playwright/bundles/mcp/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "mcp-bundle",
+  "version": "0.0.1",
+  "private": true,
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.17.3",
+    "zod": "^3.25.76",
+    "zod-to-json-schema": "^3.24.6"
+  }
+}
diff --git a/packages/playwright/bundles/mcp/src/mcpBundleImpl.ts b/packages/playwright/bundles/mcp/src/mcpBundleImpl.ts
new file mode 100644
index 0000000000000..782b3ac8b8403
--- /dev/null
+++ b/packages/playwright/bundles/mcp/src/mcpBundleImpl.ts
@@ -0,0 +1,24 @@
+/**
+ * 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 { Client } from '@modelcontextprotocol/sdk/client/index.js';
+export { Server } from '@modelcontextprotocol/sdk/server/index.js';
+export { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
+export { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+export { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+export { CallToolRequestSchema, ListRootsRequestSchema, ListToolsRequestSchema, PingRequestSchema } from '@modelcontextprotocol/sdk/types.js';
+export { z } from 'zod';
+export { zodToJsonSchema } from 'zod-to-json-schema';
diff --git a/packages/playwright/bundles/utils/build.js b/packages/playwright/bundles/utils/build.js
deleted file mode 100644
index 8c6bd89cf241a..0000000000000
--- a/packages/playwright/bundles/utils/build.js
+++ /dev/null
@@ -1,61 +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-check
-const path = require('path');
-const fs = require('fs');
-const esbuild = require('esbuild');
-
-// Can be removed once source-map-support was is fixed.
-/** @type{import('esbuild').Plugin} */
-let patchSource = {
-  name: 'patch-source-map-support-deprecation',
-  setup(build) {
-    build.onResolve({ filter: /^source-map-support$/ }, () => {
-      const originalPath = require.resolve('source-map-support');
-      const patchedPath = path.join(path.dirname(originalPath), path.basename(originalPath, '.js') + '.pw-patched.js');
-      let sourceFileContent = fs.readFileSync(originalPath, 'utf8');
-      // source-map-support is overwriting __PW_ZONE__ with func in core if source maps are present.
-      const original = `return state.nextPosition.name || originalFunctionName();`;
-      const insertedLine = `if (state.nextPosition.name === 'func') return originalFunctionName() || 'func';`;
-      sourceFileContent = sourceFileContent.replace(original, insertedLine + original);
-      fs.writeFileSync(patchedPath, sourceFileContent);
-      return { path: patchedPath }
-    });
-  },
-};
-
-(async () => {
-  const ctx = await esbuild.context({
-    entryPoints: [path.join(__dirname, 'src/utilsBundleImpl.ts')],
-    external: ['fsevents'],
-    bundle: true,
-    outdir: path.join(__dirname, '../../lib'),
-    plugins: [patchSource],
-    format: 'cjs',
-    platform: 'node',
-    target: 'ES2019',
-    sourcemap: process.argv.includes('--sourcemap'),
-    minify: process.argv.includes('--minify'),
-  });
-  await ctx.rebuild();
-  if (process.argv.includes('--watch'))
-    await ctx.watch();
-  await ctx.dispose();
-})().catch(error => {
-  console.error(error);
-  process.exit(1);
-});
diff --git a/packages/playwright/bundles/utils/package-lock.json b/packages/playwright/bundles/utils/package-lock.json
index fcf9f972feb31..95f4c43dc1d90 100644
--- a/packages/playwright/bundles/utils/package-lock.json
+++ b/packages/playwright/bundles/utils/package-lock.json
@@ -10,8 +10,8 @@
       "dependencies": {
         "chokidar": "3.6.0",
         "enquirer": "2.3.6",
+        "get-east-asian-width": "1.3.0",
         "json5": "2.2.3",
-        "pirates": "4.0.4",
         "source-map-support": "0.5.21",
         "stoppable": "1.1.0"
       },
@@ -146,6 +146,18 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -225,14 +237,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pirates": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
-      "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -376,6 +380,11 @@
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "optional": true
     },
+    "get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ=="
+    },
     "glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -425,11 +434,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
-    "pirates": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz",
-      "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="
-    },
     "readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
diff --git a/packages/playwright/bundles/utils/package.json b/packages/playwright/bundles/utils/package.json
index 69477909c5337..c6f39dd86fa10 100644
--- a/packages/playwright/bundles/utils/package.json
+++ b/packages/playwright/bundles/utils/package.json
@@ -2,17 +2,11 @@
   "name": "utils-bundle",
   "version": "0.0.1",
   "private": true,
-  "scripts": {
-    "esbuild": "node build.js",
-    "build": "npm run esbuild -- --minify",
-    "watch": "npm run esbuild -- --watch --sourcemap",
-    "generate-license": "node ../../../../utils/generate_third_party_notice.js"
-  },
   "dependencies": {
     "chokidar": "3.6.0",
     "enquirer": "2.3.6",
+    "get-east-asian-width": "1.3.0",
     "json5": "2.2.3",
-    "pirates": "4.0.4",
     "source-map-support": "0.5.21",
     "stoppable": "1.1.0"
   },
diff --git a/packages/playwright/bundles/utils/src/utilsBundleImpl.ts b/packages/playwright/bundles/utils/src/utilsBundleImpl.ts
index 7c29c301a8924..6e75f7cf6e3a6 100644
--- a/packages/playwright/bundles/utils/src/utilsBundleImpl.ts
+++ b/packages/playwright/bundles/utils/src/utilsBundleImpl.ts
@@ -17,9 +17,6 @@
 import json5Library from 'json5';
 export const json5 = json5Library;
 
-import * as piratesLibrary from 'pirates';
-export const pirates = piratesLibrary;
-
 import sourceMapSupportLibrary from 'source-map-support';
 export const sourceMapSupport = sourceMapSupportLibrary;
 
@@ -31,3 +28,6 @@ export const enquirer = enquirerLibrary;
 
 import chokidarLibrary from 'chokidar';
 export const chokidar = chokidarLibrary;
+
+import * as getEastAsianWidthLibrary from 'get-east-asian-width';
+export const getEastAsianWidth = getEastAsianWidthLibrary;
diff --git a/packages/playwright/jsx-runtime.js b/packages/playwright/jsx-runtime.js
index d35e5e6e8d089..ff3d79e34eb4c 100644
--- a/packages/playwright/jsx-runtime.js
+++ b/packages/playwright/jsx-runtime.js
@@ -32,7 +32,8 @@ function jsxs(type, props, key) {
   };
 }
 
-const Fragment = {};
+// this is used in <></> notation
+const Fragment = { __pw_jsx_fragment: true };
 
 module.exports = {
   Fragment,
diff --git a/packages/playwright/jsx-runtime.mjs b/packages/playwright/jsx-runtime.mjs
index 742708825e4b8..1dfd5835aa0ec 100644
--- a/packages/playwright/jsx-runtime.mjs
+++ b/packages/playwright/jsx-runtime.mjs
@@ -18,4 +18,4 @@ import jsxRuntime from './jsx-runtime.js';
 
 export const jsx = jsxRuntime.jsx;
 export const jsxs = jsxRuntime.jsxs;
-export const Fragment = jsxRuntime.Fragment;
\ No newline at end of file
+export const Fragment = jsxRuntime.Fragment;
diff --git a/packages/playwright/package.json b/packages/playwright/package.json
index cc705e24a2824..c132d274479b4 100644
--- a/packages/playwright/package.json
+++ b/packages/playwright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playwright",
-  "version": "1.46.0-next",
+  "version": "1.55.1",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -21,15 +21,17 @@
     "./package.json": "./package.json",
     "./lib/common/configLoader": "./lib/common/configLoader.js",
     "./lib/fsWatcher": "./lib/fsWatcher.js",
+    "./lib/mcp": "./lib/mcp/exports.js",
     "./lib/program": "./lib/program.js",
+    "./lib/reporters/base": "./lib/reporters/base.js",
+    "./lib/reporters/list": "./lib/reporters/list.js",
     "./lib/transform/babelBundle": "./lib/transform/babelBundle.js",
     "./lib/transform/compilationCache": "./lib/transform/compilationCache.js",
-    "./lib/runner/runner": "./lib/runner/runner.js",
-    "./lib/runner/testServer": "./lib/runner/testServer.js",
     "./lib/transform/esmLoader": "./lib/transform/esmLoader.js",
     "./lib/transform/transform": "./lib/transform/transform.js",
     "./lib/internalsForTest": "./lib/internalsForTest.js",
     "./lib/plugins": "./lib/plugins/index.js",
+    "./lib/runner/testRunner": "./lib/runner/testRunner.js",
     "./jsx-runtime": {
       "import": "./jsx-runtime.mjs",
       "require": "./jsx-runtime.js",
@@ -58,7 +60,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "1.46.0-next"
+    "playwright-core": "1.55.1"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"
diff --git a/packages/playwright/src/DEPS.list b/packages/playwright/src/DEPS.list
index 200d75de1ad1f..e9b4b2f49362d 100644
--- a/packages/playwright/src/DEPS.list
+++ b/packages/playwright/src/DEPS.list
@@ -8,7 +8,11 @@ common/
 
 [index.ts]
 @testIsomorphic/**
+./prompt.ts
 ./worker/testTracing.ts
 
 [internalsForTest.ts]
 **
+
+[errorContext.ts]
+./transform/babelBundle.ts
diff --git a/packages/playwright/src/common/config.ts b/packages/playwright/src/common/config.ts
index 610382e1757be..660aa77add36f 100644
--- a/packages/playwright/src/common/config.ts
+++ b/packages/playwright/src/common/config.ts
@@ -15,16 +15,17 @@
  */
 
 import fs from 'fs';
-import path from 'path';
 import os from 'os';
-import type { Config, Fixtures, Project, ReporterDescription } from '../../types/test';
-import type { Location } from '../../types/testReporter';
-import type { TestRunnerPluginRegistration } from '../plugins';
+import path from 'path';
+
 import { getPackageJsonPath, mergeObjects } from '../util';
-import type { Matcher } from '../util';
+
+import type { Config, Fixtures, Metadata, Project, ReporterDescription } from '../../types/test';
+import type { TestRunnerPluginRegistration } from '../plugins';
+import type { TestCaseFilter } from '../util';
 import type { ConfigCLIOverrides } from './ipc';
+import type { Location } from '../../types/testReporter';
 import type { FullConfig, FullProject } from '../../types/testReporter';
-import { setTransformConfig } from '../transform/transform';
 
 export type ConfigLocation = {
   resolvedConfigFile?: string;
@@ -35,7 +36,6 @@ export type FixturesWithLocation = {
   fixtures: Fixtures;
   location: Location;
 };
-export type Annotation = { type: string, description?: string };
 
 export const defaultTimeout = 30000;
 
@@ -46,6 +46,9 @@ export class FullConfigInternal {
   readonly webServers: NonNullable<FullConfig['webServer']>[];
   readonly plugins: TestRunnerPluginRegistration[];
   readonly projects: FullProjectInternal[] = [];
+  readonly singleTSConfigPath?: string;
+  readonly captureGitInfo: Config['captureGitInfo'];
+  readonly failOnFlakyTests: boolean;
   cliArgs: string[] = [];
   cliGrep: string | undefined;
   cliGrepInvert: string | undefined;
@@ -53,11 +56,15 @@ export class FullConfigInternal {
   cliProjectFilter?: string[];
   cliListOnly = false;
   cliPassWithNoTests?: boolean;
-  cliFailOnFlakyTests?: boolean;
-  testIdMatcher?: Matcher;
+  cliLastFailed?: boolean;
+  preOnlyTestFilters: TestCaseFilter[] = [];
+  postShardTestFilters: TestCaseFilter[] = [];
   defineConfigWasUsed = false;
 
-  constructor(location: ConfigLocation, userConfig: Config, configCLIOverrides: ConfigCLIOverrides) {
+  globalSetups: string[] = [];
+  globalTeardowns: string[] = [];
+
+  constructor(location: ConfigLocation, userConfig: Config, configCLIOverrides: ConfigCLIOverrides, metadata?: Metadata) {
     if (configCLIOverrides.projects && userConfig.projects)
       throw new Error(`Cannot use --browser option when configuration file defines projects. Specify browserName in the projects instead.`);
 
@@ -69,28 +76,39 @@ export class FullConfigInternal {
     this.configCLIOverrides = configCLIOverrides;
     const privateConfiguration = (userConfig as any)['@playwright/test'];
     this.plugins = (privateConfiguration?.plugins || []).map((p: any) => ({ factory: p }));
+    this.singleTSConfigPath = pathResolve(configDir, userConfig.tsconfig);
+    this.captureGitInfo = userConfig.captureGitInfo;
+    this.failOnFlakyTests = takeFirst(configCLIOverrides.failOnFlakyTests, userConfig.failOnFlakyTests, false);
+
+    this.globalSetups = (Array.isArray(userConfig.globalSetup) ? userConfig.globalSetup : [userConfig.globalSetup]).map(s => resolveScript(s, configDir)).filter(script => script !== undefined);
+    this.globalTeardowns = (Array.isArray(userConfig.globalTeardown) ? userConfig.globalTeardown : [userConfig.globalTeardown]).map(s => resolveScript(s, configDir)).filter(script => script !== undefined);
+
+    // Make sure we reuse same metadata instance between FullConfigInternal instances,
+    // so that plugins such as gitCommitInfoPlugin can populate metadata once.
+    userConfig.metadata = userConfig.metadata || {};
 
     this.config = {
       configFile: resolvedConfigFile,
       rootDir: pathResolve(configDir, userConfig.testDir) || configDir,
       forbidOnly: takeFirst(configCLIOverrides.forbidOnly, userConfig.forbidOnly, false),
       fullyParallel: takeFirst(configCLIOverrides.fullyParallel, userConfig.fullyParallel, false),
-      globalSetup: takeFirst(resolveScript(userConfig.globalSetup, configDir), null),
-      globalTeardown: takeFirst(resolveScript(userConfig.globalTeardown, configDir), null),
-      globalTimeout: takeFirst(configCLIOverrides.globalTimeout, userConfig.globalTimeout, 0),
+      globalSetup: this.globalSetups[0] ?? null,
+      globalTeardown: this.globalTeardowns[0] ?? null,
+      globalTimeout: takeFirst(configCLIOverrides.debug ? 0 : undefined, configCLIOverrides.globalTimeout, userConfig.globalTimeout, 0),
       grep: takeFirst(userConfig.grep, defaultGrep),
       grepInvert: takeFirst(userConfig.grepInvert, null),
-      maxFailures: takeFirst(configCLIOverrides.maxFailures, userConfig.maxFailures, 0),
-      metadata: takeFirst(userConfig.metadata, {}),
+      maxFailures: takeFirst(configCLIOverrides.debug ? 1 : undefined, configCLIOverrides.maxFailures, userConfig.maxFailures, 0),
+      metadata: metadata ?? userConfig.metadata,
       preserveOutput: takeFirst(userConfig.preserveOutput, 'always'),
       reporter: takeFirst(configCLIOverrides.reporter, resolveReporters(userConfig.reporter, configDir), [[defaultReporter]]),
-      reportSlowTests: takeFirst(userConfig.reportSlowTests, { max: 5, threshold: 15000 }),
+      reportSlowTests: takeFirst(userConfig.reportSlowTests, { max: 5, threshold: 300_000 /* 5 minutes */ }),
       quiet: takeFirst(configCLIOverrides.quiet, userConfig.quiet, false),
       projects: [],
       shard: takeFirst(configCLIOverrides.shard, userConfig.shard, null),
       updateSnapshots: takeFirst(configCLIOverrides.updateSnapshots, userConfig.updateSnapshots, 'missing'),
+      updateSourceMethod: takeFirst(configCLIOverrides.updateSourceMethod, userConfig.updateSourceMethod, 'patch'),
       version: require('../../package.json').version,
-      workers: 0,
+      workers: resolveWorkers(takeFirst(configCLIOverrides.debug ? 1 : undefined, configCLIOverrides.workers, userConfig.workers, '50%')),
       webServer: null,
     };
     for (const key in userConfig) {
@@ -100,18 +118,6 @@ export class FullConfigInternal {
 
     (this.config as any)[configInternalSymbol] = this;
 
-    const workers = takeFirst(configCLIOverrides.workers, userConfig.workers, '50%');
-    if (typeof workers === 'string') {
-      if (workers.endsWith('%')) {
-        const cpus = os.cpus().length;
-        this.config.workers = Math.max(1, Math.floor(cpus * (parseInt(workers, 10) / 100)));
-      } else {
-        this.config.workers = parseWorkers(workers);
-      }
-    } else {
-      this.config.workers = workers;
-    }
-
     const webServers = takeFirst(userConfig.webServer, null);
     if (Array.isArray(webServers)) { // multiple web server mode
       // Due to previous choices, this value shows up to the user in globalSetup as part of FullConfig. Arrays are not supported by the old type.
@@ -128,10 +134,6 @@ export class FullConfigInternal {
     this.projects = projectConfigs.map(p => new FullProjectInternal(configDir, userConfig, this, p, this.configCLIOverrides, packageJsonDir));
     resolveProjectDependencies(this.projects);
     this._assignUniqueProjectIds(this.projects);
-    setTransformConfig({
-      babelPlugins: privateConfiguration?.babelPlugins || [],
-      external: userConfig.build?.external || [],
-    });
     this.config.projects = this.projects.map(p => p.project);
   }
 
@@ -158,8 +160,9 @@ export class FullProjectInternal {
   readonly fullyParallel: boolean;
   readonly expect: Project['expect'];
   readonly respectGitIgnore: boolean;
-  readonly snapshotPathTemplate: string;
+  readonly snapshotPathTemplate: string | undefined;
   readonly ignoreSnapshots: boolean;
+  readonly workers: number | undefined;
   id = '';
   deps: FullProjectInternal[] = [];
   teardown: FullProjectInternal | undefined;
@@ -167,8 +170,7 @@ export class FullProjectInternal {
   constructor(configDir: string, config: Config, fullConfig: FullConfigInternal, projectConfig: Project, configCLIOverrides: ConfigCLIOverrides, packageJsonDir: string) {
     this.fullConfig = fullConfig;
     const testDir = takeFirst(pathResolve(configDir, projectConfig.testDir), pathResolve(configDir, config.testDir), fullConfig.configDir);
-    const defaultSnapshotPathTemplate = '{snapshotDir}/{testFileDir}/{testFileName}-snapshots/{arg}{-projectName}{-snapshotSuffix}{ext}';
-    this.snapshotPathTemplate = takeFirst(projectConfig.snapshotPathTemplate, config.snapshotPathTemplate, defaultSnapshotPathTemplate);
+    this.snapshotPathTemplate = takeFirst(projectConfig.snapshotPathTemplate, config.snapshotPathTemplate);
 
     this.project = {
       grep: takeFirst(projectConfig.grep, config.grep, defaultGrep),
@@ -184,7 +186,7 @@ export class FullProjectInternal {
       snapshotDir: takeFirst(pathResolve(configDir, projectConfig.snapshotDir), pathResolve(configDir, config.snapshotDir), testDir),
       testIgnore: takeFirst(projectConfig.testIgnore, config.testIgnore, []),
       testMatch: takeFirst(projectConfig.testMatch, config.testMatch, '**/*.@(spec|test).?(c|m)[jt]s?(x)'),
-      timeout: takeFirst(configCLIOverrides.timeout, projectConfig.timeout, config.timeout, defaultTimeout),
+      timeout: takeFirst(configCLIOverrides.debug ? 0 : undefined, configCLIOverrides.timeout, projectConfig.timeout, config.timeout, defaultTimeout),
       use: mergeObjects(config.use, projectConfig.use, configCLIOverrides.use),
       dependencies: projectConfig.dependencies || [],
       teardown: projectConfig.teardown,
@@ -197,6 +199,9 @@ export class FullProjectInternal {
     }
     this.respectGitIgnore = takeFirst(projectConfig.respectGitIgnore, config.respectGitIgnore, !projectConfig.testDir && !config.testDir);
     this.ignoreSnapshots = takeFirst(configCLIOverrides.ignoreSnapshots,  projectConfig.ignoreSnapshots, config.ignoreSnapshots, false);
+    this.workers = projectConfig.workers ? resolveWorkers(projectConfig.workers) : undefined;
+    if (configCLIOverrides.debug && this.workers)
+      this.workers = 1;
   }
 }
 
@@ -222,12 +227,18 @@ function resolveReporters(reporters: Config['reporter'], rootDir: string): Repor
   });
 }
 
-function parseWorkers(workers: string) {
-  const parsedWorkers = parseInt(workers, 10);
-  if (isNaN(parsedWorkers))
-    throw new Error(`Workers ${workers} must be a number or percentage.`);
-
-  return parsedWorkers;
+function resolveWorkers(workers: string | number): number {
+  if (typeof workers === 'string') {
+    if (workers.endsWith('%')) {
+      const cpus = os.cpus().length;
+      return Math.max(1, Math.floor(cpus * (parseInt(workers, 10) / 100)));
+    }
+    const parsedWorkers = parseInt(workers, 10);
+    if (isNaN(parsedWorkers))
+      throw new Error(`Workers ${workers} must be a number or percentage.`);
+    return parsedWorkers;
+  }
+  return workers;
 }
 
 function resolveProjectDependencies(projects: FullProjectInternal[]) {
@@ -272,7 +283,7 @@ export function toReporters(reporters: BuiltInReporter | ReporterDescription[] |
   return reporters;
 }
 
-export const builtInReporters = ['list', 'line', 'dot', 'json', 'junit', 'null', 'github', 'html', 'blob', 'markdown'] as const;
+export const builtInReporters = ['list', 'line', 'dot', 'json', 'junit', 'null', 'github', 'html', 'blob'] as const;
 export type BuiltInReporter = typeof builtInReporters[number];
 
 export type ContextReuseMode = 'none' | 'when-possible';
@@ -293,4 +304,4 @@ const configInternalSymbol = Symbol('configInternalSymbol');
 
 export function getProjectId(project: FullProject): string {
   return (project as any).__projectId!;
-}
\ No newline at end of file
+}
diff --git a/packages/playwright/src/common/configLoader.ts b/packages/playwright/src/common/configLoader.ts
index 81ea74e8e3ac5..4d35f4087a4e2 100644
--- a/packages/playwright/src/common/configLoader.ts
+++ b/packages/playwright/src/common/configLoader.ts
@@ -14,24 +14,27 @@
  * limitations under the License.
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-import { gracefullyProcessExitDoNotHang, isRegExp } from 'playwright-core/lib/utils';
-import type { ConfigCLIOverrides, SerializedConfig } from './ipc';
-import { requireOrImport } from '../transform/transform';
-import type { Config, Project } from '../../types/test';
+import fs from 'fs';
+import path from 'path';
+
+import { isRegExp } from 'playwright-core/lib/utils';
+
+import { requireOrImport, setSingleTSConfig, setTransformConfig } from '../transform/transform';
 import { errorWithFile, fileIsModule } from '../util';
-import type { ConfigLocation } from './config';
 import { FullConfigInternal } from './config';
+import { configureESMLoader, configureESMLoaderTransformConfig, registerESMLoader } from './esmLoaderHost';
 import { addToCompilationCache } from '../transform/compilationCache';
-import { initializeEsmLoader, registerESMLoader } from './esmLoaderHost';
-import { execArgvWithExperimentalLoaderOptions, execArgvWithoutExperimentalLoaderOptions } from '../transform/esmUtils';
+
+import type { ConfigLocation } from './config';
+import type { ConfigCLIOverrides, SerializedConfig } from './ipc';
+import type { Config, Project } from '../../types/test';
 
 const kDefineConfigWasUsed = Symbol('defineConfigWasUsed');
 export const defineConfig = (...configs: any[]) => {
   let result = configs[0];
   for (let i = 1; i < configs.length; ++i) {
     const config = configs[i];
+    const prevProjects = result.projects;
     result = {
       ...result,
       ...config,
@@ -61,7 +64,7 @@ export const defineConfig = (...configs: any[]) => {
       projectOverrides.set(project.name, project);
 
     const projects = [];
-    for (const project of result.projects || []) {
+    for (const project of prevProjects || []) {
       const projectOverride = projectOverrides.get(project.name);
       if (projectOverride) {
         projects.push({
@@ -87,10 +90,7 @@ export const defineConfig = (...configs: any[]) => {
 export async function deserializeConfig(data: SerializedConfig): Promise<FullConfigInternal> {
   if (data.compilationCache)
     addToCompilationCache(data.compilationCache);
-
-  const config = await loadConfig(data.location, data.configCLIOverrides);
-  await initializeEsmLoader();
-  return config;
+  return await loadConfig(data.location, data.configCLIOverrides, undefined, data.metadata ? JSON.parse(data.metadata) : undefined);
 }
 
 async function loadUserConfig(location: ConfigLocation): Promise<Config> {
@@ -100,10 +100,23 @@ async function loadUserConfig(location: ConfigLocation): Promise<Config> {
   return object as Config;
 }
 
-export async function loadConfig(location: ConfigLocation, overrides?: ConfigCLIOverrides, ignoreProjectDependencies = false): Promise<FullConfigInternal> {
+export async function loadConfig(location: ConfigLocation, overrides?: ConfigCLIOverrides, ignoreProjectDependencies = false, metadata?: Config['metadata']): Promise<FullConfigInternal> {
+  // 0. Setup ESM loader if needed.
+  if (!registerESMLoader()) {
+    // In Node.js < 18, complain if the config file is ESM. Historically, we would restart
+    // the process with --loader, but now we require newer Node.js.
+    if (location.resolvedConfigFile && fileIsModule(location.resolvedConfigFile))
+      throw errorWithFile(location.resolvedConfigFile, `Playwright requires Node.js 18.19 or higher to load esm modules. Please update your version of Node.js.`);
+  }
+
+  // 1. Setup tsconfig; configure ESM loader with tsconfig and compilation cache.
+  setSingleTSConfig(overrides?.tsconfig);
+  await configureESMLoader();
+
+  // 2. Load and validate playwright config.
   const userConfig = await loadUserConfig(location);
   validateConfig(location.resolvedConfigFile || '<default config>', userConfig);
-  const fullConfig = new FullConfigInternal(location, userConfig, overrides || {});
+  const fullConfig = new FullConfigInternal(location, userConfig, overrides || {}, metadata);
   fullConfig.defineConfigWasUsed = !!(userConfig as any)[kDefineConfigWasUsed];
   if (ignoreProjectDependencies) {
     for (const project of fullConfig.projects) {
@@ -111,6 +124,17 @@ export async function loadConfig(location: ConfigLocation, overrides?: ConfigCLI
       project.teardown = undefined;
     }
   }
+
+  // 3. Load transform options from the playwright config.
+  const babelPlugins = (userConfig as any)['@playwright/test']?.babelPlugins || [];
+  const external = userConfig.build?.external || [];
+  setTransformConfig({ babelPlugins, external });
+  if (!overrides?.tsconfig)
+    setSingleTSConfig(fullConfig?.singleTSConfigPath);
+
+  // 4. Send transform options to ESM loader.
+  await configureESMLoaderTransformConfig();
+
   return fullConfig;
 }
 
@@ -126,13 +150,25 @@ function validateConfig(file: string, config: Config) {
   }
 
   if ('globalSetup' in config && config.globalSetup !== undefined) {
-    if (typeof config.globalSetup !== 'string')
+    if (Array.isArray(config.globalSetup)) {
+      config.globalSetup.forEach((item, index) => {
+        if (typeof item !== 'string')
+          throw errorWithFile(file, `config.globalSetup[${index}] must be a string`);
+      });
+    } else if (typeof config.globalSetup !== 'string') {
       throw errorWithFile(file, `config.globalSetup must be a string`);
+    }
   }
 
   if ('globalTeardown' in config && config.globalTeardown !== undefined) {
-    if (typeof config.globalTeardown !== 'string')
+    if (Array.isArray(config.globalTeardown)) {
+      config.globalTeardown.forEach((item, index) => {
+        if (typeof item !== 'string')
+          throw errorWithFile(file, `config.globalTeardown[${index}] must be a string`);
+      });
+    } else if (typeof config.globalTeardown !== 'string') {
       throw errorWithFile(file, `config.globalTeardown must be a string`);
+    }
   }
 
   if ('globalTimeout' in config && config.globalTimeout !== undefined) {
@@ -215,15 +251,15 @@ function validateConfig(file: string, config: Config) {
   }
 
   if ('updateSnapshots' in config && config.updateSnapshots !== undefined) {
-    if (typeof config.updateSnapshots !== 'string' || !['all', 'none', 'missing'].includes(config.updateSnapshots))
-      throw errorWithFile(file, `config.updateSnapshots must be one of "all", "none" or "missing"`);
+    if (typeof config.updateSnapshots !== 'string' || !['all', 'changed', 'missing', 'none'].includes(config.updateSnapshots))
+      throw errorWithFile(file, `config.updateSnapshots must be one of "all", "changed", "missing" or "none"`);
   }
 
-  if ('workers' in config && config.workers !== undefined) {
-    if (typeof config.workers === 'number' && config.workers <= 0)
-      throw errorWithFile(file, `config.workers must be a positive number`);
-    else if (typeof config.workers === 'string' && !config.workers.endsWith('%'))
-      throw errorWithFile(file, `config.workers must be a number or percentage`);
+  if ('tsconfig' in config && config.tsconfig !== undefined) {
+    if (typeof config.tsconfig !== 'string')
+      throw errorWithFile(file, `config.tsconfig must be a string`);
+    if (!fs.existsSync(path.resolve(file, '..', config.tsconfig)))
+      throw errorWithFile(file, `config.tsconfig does not exist`);
   }
 }
 
@@ -284,6 +320,13 @@ function validateProject(file: string, project: Project, title: string) {
     if (typeof project.ignoreSnapshots !== 'boolean')
       throw errorWithFile(file, `${title}.ignoreSnapshots must be a boolean`);
   }
+
+  if ('workers' in project && project.workers !== undefined) {
+    if (typeof project.workers === 'number' && project.workers <= 0)
+      throw errorWithFile(file, `${title}.workers must be a positive number`);
+    else if (typeof project.workers === 'string' && !project.workers.endsWith('%'))
+      throw errorWithFile(file, `${title}.workers must be a number or percentage`);
+  }
 }
 
 export function resolveConfigLocation(configFile: string | undefined): ConfigLocation {
@@ -323,62 +366,11 @@ function resolveConfigFile(configFileOrDirectory: string): string | undefined {
   return configFileOrDirectory!;
 }
 
-export async function loadConfigFromFileRestartIfNeeded(configFile: string | undefined, overrides?: ConfigCLIOverrides, ignoreDeps?: boolean): Promise<FullConfigInternal | null> {
-  const location = resolveConfigLocation(configFile);
-  if (restartWithExperimentalTsEsm(location.resolvedConfigFile))
-    return null;
-  return await loadConfig(location, overrides, ignoreDeps);
+export async function loadConfigFromFile(configFile: string | undefined, overrides?: ConfigCLIOverrides, ignoreDeps?: boolean): Promise<FullConfigInternal> {
+  return await loadConfig(resolveConfigLocation(configFile), overrides, ignoreDeps);
 }
 
 export async function loadEmptyConfigForMergeReports() {
   // Merge reports is "different" for no good reason. It should not pick up local config from the cwd.
   return await loadConfig({ configDir: process.cwd() });
 }
-
-export function restartWithExperimentalTsEsm(configFile: string | undefined, force: boolean = false): boolean {
-  // Opt-out switch.
-  if (process.env.PW_DISABLE_TS_ESM)
-    return false;
-
-  // There are two esm loader APIs:
-  // - Older API that needs a process restart. Available in Node 16, 17, and non-latest 18, 19 and 20.
-  // - Newer API that works in-process. Available in Node 21+ and latest 18, 19 and 20.
-
-  // First check whether we have already restarted with the ESM loader from the older API.
-  if ((globalThis as any).__esmLoaderPortPreV20) {
-    // clear execArgv after restart, so that childProcess.fork in user code does not inherit our loader.
-    process.execArgv = execArgvWithoutExperimentalLoaderOptions();
-    return false;
-  }
-
-  // Now check for the newer API presence.
-  if (!require('node:module').register) {
-    // Older API is experimental, only supported on Node 16+.
-    const nodeVersion = +process.versions.node.split('.')[0];
-    if (nodeVersion < 16)
-      return false;
-
-    // With older API requiring a process restart, do so conditionally on the config.
-    const configIsModule = !!configFile && fileIsModule(configFile);
-    if (!force && !configIsModule)
-      return false;
-
-    const innerProcess = (require('child_process') as typeof import('child_process')).fork(require.resolve('../../cli'), process.argv.slice(2), {
-      env: {
-        ...process.env,
-        PW_TS_ESM_LEGACY_LOADER_ON: '1',
-      },
-      execArgv: execArgvWithExperimentalLoaderOptions(),
-    });
-
-    innerProcess.on('close', (code: number | null) => {
-      if (code !== 0 && code !== null)
-        gracefullyProcessExitDoNotHang(code);
-    });
-    return true;
-  }
-
-  // With the newer API, always enable the ESM loader, because it does not need a restart.
-  registerESMLoader();
-  return false;
-}
diff --git a/packages/playwright/src/common/esmLoaderHost.ts b/packages/playwright/src/common/esmLoaderHost.ts
index 4b38ea6670dea..6a44c241663cf 100644
--- a/packages/playwright/src/common/esmLoaderHost.ts
+++ b/packages/playwright/src/common/esmLoaderHost.ts
@@ -15,27 +15,33 @@
  */
 
 import url from 'url';
+
 import { addToCompilationCache, serializeCompilationCache } from '../transform/compilationCache';
-import { transformConfig } from '../transform/transform';
 import { PortTransport } from '../transform/portTransport';
+import { singleTSConfig, transformConfig } from '../transform/transform';
 
 let loaderChannel: PortTransport | undefined;
-// Node.js < 20
-if ((globalThis as any).__esmLoaderPortPreV20)
-  loaderChannel = createPortTransport((globalThis as any).__esmLoaderPortPreV20);
 
-// Node.js >= 20
-export let esmLoaderRegistered = false;
 export function registerESMLoader() {
+  // Opt-out switch.
+  if (process.env.PW_DISABLE_TS_ESM)
+    return true;
+
+  if (loaderChannel)
+    return true;
+
+  const register = require('node:module').register;
+  if (!register)
+    return false;
+
   const { port1, port2 } = new MessageChannel();
   // register will wait until the loader is initialized.
-  require('node:module').register(url.pathToFileURL(require.resolve('../transform/esmLoader')), {
-    parentURL: url.pathToFileURL(__filename),
+  register(url.pathToFileURL(require.resolve('../transform/esmLoader')), {
     data: { port: port2 },
     transferList: [port2],
   });
   loaderChannel = createPortTransport(port1);
-  esmLoaderRegistered = true;
+  return true;
 }
 
 function createPortTransport(port: MessagePort) {
@@ -67,9 +73,16 @@ export async function incorporateCompilationCache() {
   addToCompilationCache(result.cache);
 }
 
-export async function initializeEsmLoader() {
+export async function configureESMLoader() {
   if (!loaderChannel)
     return;
-  await loaderChannel.send('setTransformConfig', { config: transformConfig() });
+  await loaderChannel.send('setSingleTSConfig', { tsconfig: singleTSConfig() });
   await loaderChannel.send('addToCompilationCache', { cache: serializeCompilationCache() });
 }
+
+export async function configureESMLoaderTransformConfig() {
+  if (!loaderChannel)
+    return;
+  await loaderChannel.send('setSingleTSConfig', { tsconfig: singleTSConfig() });
+  await loaderChannel.send('setTransformConfig', { config: transformConfig() });
+}
diff --git a/packages/playwright/src/common/expectBundle.ts b/packages/playwright/src/common/expectBundle.ts
index 3322c36277db5..4b601b77aeb9c 100644
--- a/packages/playwright/src/common/expectBundle.ts
+++ b/packages/playwright/src/common/expectBundle.ts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-export const expect: typeof import('../../bundles/expect/node_modules/expect/build').expect = require('./expectBundleImpl').expect;
+export const expect: typeof import('../../bundles/expect/third_party/index').expect = require('./expectBundleImpl').expect;
+export const mock: typeof import('../../bundles/expect/node_modules/jest-mock') = require('./expectBundleImpl').mock;
+export const asymmetricMatchers = require('./expectBundleImpl').asymmetricMatchers;
+export const matcherUtils = require('./expectBundleImpl').matcherUtils;
 export const EXPECTED_COLOR: typeof import('../../bundles/expect/node_modules/jest-matcher-utils/build').EXPECTED_COLOR = require('./expectBundleImpl').EXPECTED_COLOR;
 export const INVERTED_COLOR: typeof import('../../bundles/expect/node_modules/jest-matcher-utils/build').INVERTED_COLOR = require('./expectBundleImpl').INVERTED_COLOR;
 export const RECEIVED_COLOR: typeof import('../../bundles/expect/node_modules/jest-matcher-utils/build').RECEIVED_COLOR = require('./expectBundleImpl').RECEIVED_COLOR;
diff --git a/packages/playwright/src/common/fixtures.ts b/packages/playwright/src/common/fixtures.ts
index 6b50947ab5c7a..470741302d733 100644
--- a/packages/playwright/src/common/fixtures.ts
+++ b/packages/playwright/src/common/fixtures.ts
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+import crypto from 'crypto';
+
 import { filterStackFile, formatLocation } from '../util';
-import * as crypto from 'crypto';
+
+import type { FixturesWithLocation } from './config';
 import type { Fixtures } from '../../types/test';
 import type { Location } from '../../types/testReporter';
-import type { FixturesWithLocation } from './config';
 
 export type FixtureScope = 'test' | 'worker';
 type FixtureAuto = boolean | 'all-hooks-included';
@@ -128,7 +130,8 @@ export class FixturePool {
           continue;
         }
       } else if (previous) {
-        options = { auto: previous.auto, scope: previous.scope, option: previous.option, timeout: previous.timeout, customTitle: previous.customTitle, box: previous.box };
+        // Note: deliberately not inheriting "options.box" so that fixture override is visible by default.
+        options = { auto: previous.auto, scope: previous.scope, option: previous.option, timeout: previous.timeout, customTitle: previous.customTitle };
       } else if (!options) {
         options = { auto: false, scope: 'test', option: false, timeout: undefined };
       }
diff --git a/packages/playwright/src/common/globals.ts b/packages/playwright/src/common/globals.ts
index 746e1ec847874..41f912acb8f31 100644
--- a/packages/playwright/src/common/globals.ts
+++ b/packages/playwright/src/common/globals.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { TestInfoImpl } from '../worker/testInfo';
 import type { Suite } from './test';
+import type { TestInfoImpl } from '../worker/testInfo';
 
 let currentTestInfoValue: TestInfoImpl | null = null;
 export function setCurrentTestInfo(testInfo: TestInfoImpl | null) {
diff --git a/packages/playwright/src/common/ipc.ts b/packages/playwright/src/common/ipc.ts
index c1c7b2da25fcf..e4645d1c69948 100644
--- a/packages/playwright/src/common/ipc.ts
+++ b/packages/playwright/src/common/ipc.ts
@@ -15,11 +15,17 @@
  */
 
 import util from 'util';
-import { type SerializedCompilationCache, serializeCompilationCache } from '../transform/compilationCache';
+
+import { serializeCompilationCache } from '../transform/compilationCache';
+
 import type { ConfigLocation, FullConfigInternal } from './config';
 import type { ReporterDescription, TestInfoError, TestStatus } from '../../types/test';
+import type { SerializedCompilationCache  } from '../transform/compilationCache';
+import type { RecoverFromStepErrorResult } from '@testIsomorphic/testServerInterface';
 
 export type ConfigCLIOverrides = {
+  debug?: boolean;
+  failOnFlakyTests?: boolean;
   forbidOnly?: boolean;
   fullyParallel?: boolean;
   globalTimeout?: number;
@@ -33,8 +39,10 @@ export type ConfigCLIOverrides = {
   additionalReporters?: ReporterDescription[];
   shard?: { current: number, total: number };
   timeout?: number;
+  tsconfig?: string;
   ignoreSnapshots?: boolean;
-  updateSnapshots?: 'all'|'none'|'missing';
+  updateSnapshots?: 'all' | 'changed' | 'missing' | 'none';
+  updateSourceMethod?: 'overwrite' | 'patch' | '3way';
   workers?: number | string;
   projects?: { name: string, use?: any }[],
   use?: any;
@@ -44,9 +52,11 @@ export type SerializedConfig = {
   location: ConfigLocation;
   configCLIOverrides: ConfigCLIOverrides;
   compilationCache?: SerializedCompilationCache;
+  metadata?: string;
 };
 
 export type ProcessInitParams = {
+  timeOrigin: number;
   processName: string;
 };
 
@@ -57,6 +67,7 @@ export type WorkerInitParams = {
   projectId: string;
   config: SerializedConfig;
   artifactsDir: string;
+  recoverFromStepErrors: boolean;
 };
 
 export type TestBeginPayload = {
@@ -70,13 +81,16 @@ export type AttachmentPayload = {
   path?: string;
   body?: string;
   contentType: string;
+  stepId?: string;
 };
 
+export type TestInfoErrorImpl = TestInfoError;
+
 export type TestEndPayload = {
   testId: string;
   duration: number;
   status: TestStatus;
-  errors: TestInfoError[];
+  errors: TestInfoErrorImpl[];
   hasNonRetriableError: boolean;
   expectedStatus: TestStatus;
   annotations: { type: string, description?: string }[];
@@ -93,11 +107,21 @@ export type StepBeginPayload = {
   location?: { file: string, line: number, column: number };
 };
 
+export type StepRecoverFromErrorPayload = {
+  testId: string;
+  stepId: string;
+  error: TestInfoErrorImpl;
+};
+
+export type ResumeAfterStepErrorPayload = RecoverFromStepErrorResult;
+
 export type StepEndPayload = {
   testId: string;
   stepId: string;
   wallTime: number;  // milliseconds since unix epoch
-  error?: TestInfoError;
+  error?: TestInfoErrorImpl;
+  suggestedRebaseline?: string;
+  annotations: { type: string, description?: string }[];
 };
 
 export type TestEntry = {
@@ -111,7 +135,7 @@ export type RunPayload = {
 };
 
 export type DonePayload = {
-  fatalErrors: TestInfoError[];
+  fatalErrors: TestInfoErrorImpl[];
   skipTestsDueToSetupFailure: string[];  // test ids
   fatalUnknownTestIds?: string[];
 };
@@ -122,7 +146,7 @@ export type TestOutputPayload = {
 };
 
 export type TeardownErrorsPayload = {
-  fatalErrors: TestInfoError[];
+  fatalErrors: TestInfoErrorImpl[];
 };
 
 export type EnvProducedPayload = [string, string | null][];
@@ -133,6 +157,11 @@ export function serializeConfig(config: FullConfigInternal, passCompilationCache
     configCLIOverrides: config.configCLIOverrides,
     compilationCache: passCompilationCache ? serializeCompilationCache() : undefined,
   };
+
+  try {
+    result.metadata = JSON.stringify(config.config.metadata);
+  } catch (error) {}
+
   return result;
 }
 
diff --git a/packages/playwright/src/common/poolBuilder.ts b/packages/playwright/src/common/poolBuilder.ts
index cc1bc095c99a5..f975efe92f80d 100644
--- a/packages/playwright/src/common/poolBuilder.ts
+++ b/packages/playwright/src/common/poolBuilder.ts
@@ -15,11 +15,12 @@
  */
 
 import { FixturePool } from './fixtures';
+import { formatLocation } from '../util';
+
+import type { FullProjectInternal } from './config';
 import type { LoadError } from './fixtures';
 import type { Suite, TestCase } from './test';
 import type { TestTypeImpl } from './testType';
-import type { FullProjectInternal } from './config';
-import { formatLocation } from '../util';
 import type { TestError } from '../../types/testReporter';
 
 export class PoolBuilder {
diff --git a/packages/playwright/src/common/process.ts b/packages/playwright/src/common/process.ts
index 14ad995fedd3c..904290406d330 100644
--- a/packages/playwright/src/common/process.ts
+++ b/packages/playwright/src/common/process.ts
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-import type { EnvProducedPayload, ProcessInitParams } from './ipc';
-import { startProfiling, stopProfiling } from 'playwright-core/lib/utils';
-import type { TestInfoError } from '../../types/test';
+import { setTimeOrigin, startProfiling, stopProfiling } from 'playwright-core/lib/utils';
+
 import { serializeError } from '../util';
-import { registerESMLoader } from './esmLoaderHost';
-import { execArgvWithoutExperimentalLoaderOptions } from '../transform/esmUtils';
+
+import type { EnvProducedPayload, ProcessInitParams, TestInfoErrorImpl } from './ipc';
 
 export type ProtocolRequest = {
   id: number;
@@ -29,7 +28,7 @@ export type ProtocolRequest = {
 
 export type ProtocolResponse = {
   id?: number;
-  error?: TestInfoError;
+  error?: TestInfoErrorImpl;
   method?: string;
   params?: any;
   result?: any;
@@ -53,13 +52,6 @@ process.on('disconnect', () => gracefullyCloseAndExit(true));
 process.on('SIGINT', () => {});
 process.on('SIGTERM', () => {});
 
-// Clear execArgv immediately, so that the user-code does not inherit our loader.
-process.execArgv = execArgvWithoutExperimentalLoaderOptions();
-
-// Node.js >= 20
-if (process.env.PW_TS_ESM_LOADER_ON)
-  registerESMLoader();
-
 let processRunner: ProcessRunner | undefined;
 let processName: string | undefined;
 const startingEnv = { ...process.env };
@@ -68,6 +60,7 @@ process.on('message', async (message: any) => {
   if (message.method === '__init__') {
     const { processParams, runnerParams, runnerScript } = message.params as { processParams: ProcessInitParams, runnerParams: any, runnerScript: string };
     void startProfiling();
+    setTimeOrigin(processParams.timeOrigin);
     const { create } = require(runnerScript);
     processRunner = create(runnerParams) as ProcessRunner;
     processName = processParams.processName;
@@ -117,6 +110,13 @@ function sendMessageToParent(message: { method: string, params?: any }) {
   try {
     process.send!(message);
   } catch (e) {
+    try {
+      // By default, the IPC messages are serialized as JSON.
+      JSON.stringify(message);
+    } catch {
+      // Always throw serialization errors.
+      throw e;
+    }
     // Can throw when closing.
   }
 }
diff --git a/packages/playwright/src/common/suiteUtils.ts b/packages/playwright/src/common/suiteUtils.ts
index 81dc9d5465d4b..4108a9696ed6d 100644
--- a/packages/playwright/src/common/suiteUtils.ts
+++ b/packages/playwright/src/common/suiteUtils.ts
@@ -15,14 +15,17 @@
 */
 
 import path from 'path';
+
 import { calculateSha1, toPosixPath } from 'playwright-core/lib/utils';
-import type { Suite, TestCase } from './test';
-import type { FullProjectInternal } from './config';
-import type { Matcher, TestFileFilter } from '../util';
+
 import { createFileMatcher } from '../util';
 
+import type { FullProjectInternal } from './config';
+import type { Suite, TestCase } from './test';
+import type { TestCaseFilter, TestFileFilter } from '../util';
+
 
-export function filterSuite(suite: Suite, suiteFilter: (suites: Suite) => boolean, testFilter: (test: TestCase) => boolean) {
+export function filterSuite(suite: Suite, suiteFilter: (suites: Suite) => boolean, testFilter: TestCaseFilter) {
   for (const child of suite.suites) {
     if (!suiteFilter(child))
       filterSuite(child, suiteFilter, testFilter);
@@ -32,7 +35,7 @@ export function filterSuite(suite: Suite, suiteFilter: (suites: Suite) => boolea
   suite._entries = suite._entries.filter(e => entries.has(e)); // Preserve the order.
 }
 
-export function filterTestsRemoveEmptySuites(suite: Suite, filter: (test: TestCase) => boolean): boolean {
+export function filterTestsRemoveEmptySuites(suite: Suite, filter: TestCaseFilter): boolean {
   const filteredSuites = suite.suites.filter(child => filterTestsRemoveEmptySuites(child, filter));
   const filteredTests = suite.tests.filter(filter);
   const entries = new Set([...filteredSuites, ...filteredTests]);
@@ -61,10 +64,9 @@ export function bindFileSuiteToProject(project: FullProjectInternal, suite: Suit
     // Inherit properties from parent suites.
     let inheritedRetries: number | undefined;
     let inheritedTimeout: number | undefined;
-    test.annotations = [];
     for (let parentSuite: Suite | undefined = suite; parentSuite; parentSuite = parentSuite.parent) {
       if (parentSuite._staticAnnotations.length)
-        test.annotations = [...parentSuite._staticAnnotations, ...test.annotations];
+        test.annotations.unshift(...parentSuite._staticAnnotations);
       if (inheritedRetries === undefined && parentSuite._retries !== undefined)
         inheritedRetries = parentSuite._retries;
       if (inheritedTimeout === undefined && parentSuite._timeout !== undefined)
@@ -72,7 +74,6 @@ export function bindFileSuiteToProject(project: FullProjectInternal, suite: Suit
     }
     test.retries = inheritedRetries ?? project.project.retries;
     test.timeout = inheritedTimeout ?? project.project.timeout;
-    test.annotations.push(...test._staticAnnotations);
 
     // Skip annotations imply skipped expectedStatus.
     if (test.annotations.some(a => a.type === 'skip' || a.type === 'fixme'))
@@ -110,7 +111,7 @@ export function filterOnly(suite: Suite) {
   return filterSuiteWithOnlySemantics(suite, suiteFilter, testFilter);
 }
 
-export function filterSuiteWithOnlySemantics(suite: Suite, suiteFilter: (suites: Suite) => boolean, testFilter: (test: TestCase) => boolean) {
+function filterSuiteWithOnlySemantics(suite: Suite, suiteFilter: (suites: Suite) => boolean, testFilter: TestCaseFilter) {
   const onlySuites = suite.suites.filter(child => filterSuiteWithOnlySemantics(child, suiteFilter, testFilter) || suiteFilter(child));
   const onlyTests = suite.tests.filter(testFilter);
   const onlyEntries = new Set([...onlySuites, ...onlyTests]);
@@ -131,12 +132,6 @@ export function filterByFocusedLine(suite: Suite, focusedTestFileLines: TestFile
   return filterSuite(suite, suiteFilter, testFilter);
 }
 
-export function filterByTestIds(suite: Suite, testIdMatcher: Matcher | undefined) {
-  if (!testIdMatcher)
-    return;
-  filterTestsRemoveEmptySuites(suite, test => testIdMatcher(test.id));
-}
-
 function createFileMatcherFromFilter(filter: TestFileFilter) {
   const fileMatcher = createFileMatcher(filter.re || filter.exact || '');
   return (testFileName: string, testLine: number, testColumn: number) =>
diff --git a/packages/playwright/src/common/test.ts b/packages/playwright/src/common/test.ts
index 9cf88dc634f5d..dce6cbcd836ad 100644
--- a/packages/playwright/src/common/test.ts
+++ b/packages/playwright/src/common/test.ts
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-import type { FixturePool } from './fixtures';
-import type * as reporterTypes from '../../types/testReporter';
-import type { TestTypeImpl } from './testType';
 import { rootTestType } from './testType';
-import type { Annotation, FixturesWithLocation, FullProjectInternal } from './config';
-import type { Location, FullProject } from '../../types/testReporter';
 import { computeTestCaseOutcome } from '../isomorphic/teleReceiver';
 
+import type { FixturesWithLocation, FullProjectInternal } from './config';
+import type { FixturePool } from './fixtures';
+import type { TestTypeImpl } from './testType';
+import type { TestAnnotation } from '../../types/test';
+import type * as reporterTypes from '../../types/testReporter';
+import type { FullProject, Location } from '../../types/testReporter';
+
+
 class Base {
   title: string;
   _only = false;
@@ -48,7 +51,7 @@ export class Suite extends Base {
   _timeout: number | undefined;
   _retries: number | undefined;
   // Annotations known statically before running the test, e.g. `test.describe.skip()` or `test.describe({ annotation }, body)`.
-  _staticAnnotations: Annotation[] = [];
+  _staticAnnotations: TestAnnotation[] = [];
   // Explicitly declared tags that are not a part of the title.
   _tags: string[] = [];
   _modifiers: Modifier[] = [];
@@ -56,12 +59,10 @@ export class Suite extends Base {
   _fullProject: FullProjectInternal | undefined;
   _fileId: string | undefined;
   readonly _type: 'root' | 'project' | 'file' | 'describe';
-  readonly _testTypeImpl: TestTypeImpl | undefined;
 
-  constructor(title: string, type: 'root' | 'project' | 'file' | 'describe', testTypeImpl?: TestTypeImpl) {
+  constructor(title: string, type: 'root' | 'project' | 'file' | 'describe') {
     super(title);
     this._type = type;
-    this._testTypeImpl = testTypeImpl;
   }
 
   get type(): 'root' | 'project' | 'file' | 'describe' {
@@ -252,7 +253,7 @@ export class TestCase extends Base implements reporterTypes.TestCase {
 
   expectedStatus: reporterTypes.TestStatus = 'passed';
   timeout = 0;
-  annotations: Annotation[] = [];
+  annotations: TestAnnotation[] = [];
   retries = 0;
   repeatEachIndex = 0;
 
@@ -262,8 +263,6 @@ export class TestCase extends Base implements reporterTypes.TestCase {
   _poolDigest = '';
   _workerHash = '';
   _projectId = '';
-  // Annotations known statically before running the test, e.g. `test.skip()` or `test(title, { annotation }, body)`.
-  _staticAnnotations: Annotation[] = [];
   // Explicitly declared tags that are not a part of the title.
   _tags: string[] = [];
 
@@ -290,7 +289,12 @@ export class TestCase extends Base implements reporterTypes.TestCase {
   }
 
   get tags(): string[] {
-    return this._grepTitle().match(/@[\S]+/g) || [];
+    const titleTags = this._grepBaseTitlePath().join(' ').match(/@[\S]+/g) || [];
+
+    return [
+      ...titleTags,
+      ...this._tags,
+    ];
   }
 
   _serialize(): any {
@@ -306,7 +310,6 @@ export class TestCase extends Base implements reporterTypes.TestCase {
       requireFile: this._requireFile,
       poolDigest: this._poolDigest,
       workerHash: this._workerHash,
-      staticAnnotations: this._staticAnnotations.slice(),
       annotations: this.annotations.slice(),
       tags: this._tags.slice(),
       projectId: this._projectId,
@@ -323,7 +326,6 @@ export class TestCase extends Base implements reporterTypes.TestCase {
     test._requireFile = data.requireFile;
     test._poolDigest = data.poolDigest;
     test._workerHash = data.workerHash;
-    test._staticAnnotations = data.staticAnnotations;
     test.annotations = data.annotations;
     test._tags = data.tags;
     test._projectId = data.projectId;
@@ -351,15 +353,21 @@ export class TestCase extends Base implements reporterTypes.TestCase {
       status: 'skipped',
       steps: [],
       errors: [],
+      annotations: [],
     };
     this.results.push(result);
     return result;
   }
 
-  _grepTitle() {
+  _grepBaseTitlePath(): string[] {
     const path: string[] = [];
     this.parent._collectGrepTitlePath(path);
     path.push(this.title);
+    return path;
+  }
+
+  _grepTitleWithTags(): string {
+    const path = this._grepBaseTitlePath();
     path.push(...this._tags);
     return path.join(' ');
   }
diff --git a/packages/playwright/src/common/testLoader.ts b/packages/playwright/src/common/testLoader.ts
index a85d93545dab8..690a09643d384 100644
--- a/packages/playwright/src/common/testLoader.ts
+++ b/packages/playwright/src/common/testLoader.ts
@@ -16,13 +16,15 @@
 
 import path from 'path';
 import util from 'util';
-import type { TestError } from '../../types/testReporter';
+
+import * as esmLoaderHost from './esmLoaderHost';
 import { isWorkerProcess, setCurrentlyLoadingFileSuite } from './globals';
 import { Suite } from './test';
+import { startCollectingFileDeps, stopCollectingFileDeps } from '../transform/compilationCache';
 import { requireOrImport } from '../transform/transform';
 import { filterStackTrace } from '../util';
-import { startCollectingFileDeps, stopCollectingFileDeps } from '../transform/compilationCache';
-import * as esmLoaderHost from './esmLoaderHost';
+
+import type { TestError } from '../../types/testReporter';
 
 export const defaultTimeout = 30000;
 
@@ -68,7 +70,7 @@ export async function loadTestFile(file: string, rootDir: string, testErrors?: T
     suite.allTests().map(t => files.add(t.location.file));
     if (files.size === 1) {
       // All tests point to one file.
-      const mappedFile = files.values().next().value;
+      const mappedFile = files.values().next().value!;
       if (suite.location.file !== mappedFile) {
         // The file is different, check for a likely source map case.
         if (path.extname(mappedFile) !== path.extname(suite.location.file))
diff --git a/packages/playwright/src/common/testType.ts b/packages/playwright/src/common/testType.ts
index 5c7850a3df07f..b7ab5648f2516 100644
--- a/packages/playwright/src/common/testType.ts
+++ b/packages/playwright/src/common/testType.ts
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
+import { errors } from 'playwright-core';
+import { getPackageManagerExecCommand, monotonicTime, raceAgainstDeadline, currentZone } from 'playwright-core/lib/utils';
+
+import { currentTestInfo, currentlyLoadingFileSuite, setCurrentlyLoadingFileSuite } from './globals';
+import { Suite, TestCase } from './test';
 import { expect } from '../matchers/expect';
-import { currentlyLoadingFileSuite, currentTestInfo, setCurrentlyLoadingFileSuite } from './globals';
-import { TestCase, Suite } from './test';
 import { wrapFunctionWithLocation } from '../transform/transform';
+
 import type { FixturesWithLocation } from './config';
-import type { Fixtures, TestType, TestDetails } from '../../types/test';
+import type { Fixtures, TestDetails, TestStepInfo, TestType } from '../../types/test';
 import type { Location } from '../../types/testReporter';
-import { getPackageManagerExecCommand, zones } from 'playwright-core/lib/utils';
 
 const testTypeSymbol = Symbol('testType');
 
@@ -38,7 +41,7 @@ export class TestTypeImpl {
     test.only = wrapFunctionWithLocation(this._createTest.bind(this, 'only'));
     test.describe = wrapFunctionWithLocation(this._describe.bind(this, 'default'));
     test.describe.only = wrapFunctionWithLocation(this._describe.bind(this, 'only'));
-    test.describe.configure = this._configure.bind(this);
+    test.describe.configure = wrapFunctionWithLocation(this._configure.bind(this));
     test.describe.fixme = wrapFunctionWithLocation(this._describe.bind(this, 'fixme'));
     test.describe.parallel = wrapFunctionWithLocation(this._describe.bind(this, 'parallel'));
     test.describe.parallel.only = wrapFunctionWithLocation(this._describe.bind(this, 'parallel.only'));
@@ -52,9 +55,11 @@ export class TestTypeImpl {
     test.skip = wrapFunctionWithLocation(this._modifier.bind(this, 'skip'));
     test.fixme = wrapFunctionWithLocation(this._modifier.bind(this, 'fixme'));
     test.fail = wrapFunctionWithLocation(this._modifier.bind(this, 'fail'));
+    test.fail.only = wrapFunctionWithLocation(this._createTest.bind(this, 'fail.only'));
     test.slow = wrapFunctionWithLocation(this._modifier.bind(this, 'slow'));
-    test.setTimeout = this._setTimeout.bind(this);
-    test.step = this._step.bind(this);
+    test.setTimeout = wrapFunctionWithLocation(this._setTimeout.bind(this));
+    test.step = this._step.bind(this, 'pass');
+    test.step.skip = this._step.bind(this, 'skip');
     test.use = wrapFunctionWithLocation(this._use.bind(this));
     test.extend = wrapFunctionWithLocation(this._extend.bind(this));
     test.info = () => {
@@ -66,7 +71,7 @@ export class TestTypeImpl {
     this.test = test;
   }
 
-  private _currentSuite(title: string): Suite | undefined {
+  private _currentSuite(location: Location, title: string): Suite | undefined {
     const suite = currentlyLoadingFileSuite();
     if (!suite) {
       throw new Error([
@@ -78,18 +83,12 @@ export class TestTypeImpl {
         `  when one of the dependencies in your package.json depends on @playwright/test.`,
       ].join('\n'));
     }
-    if (suite._testTypeImpl && suite._testTypeImpl !== this) {
-      throw new Error([
-        `Can't call ${title} inside a describe() suite of a different test type.`,
-        `Make sure to use the same "test" function (created by the test.extend() call) for all declarations inside a suite.`,
-      ].join('\n'));
-    }
     return suite;
   }
 
-  private _createTest(type: 'default' | 'only' | 'skip' | 'fixme' | 'fail', location: Location, title: string, fnOrDetails: Function | TestDetails, fn?: Function) {
+  private _createTest(type: 'default' | 'only' | 'skip' | 'fixme' | 'fail' | 'fail.only', location: Location, title: string, fnOrDetails: Function | TestDetails, fn?: Function) {
     throwIfRunningInsideJest();
-    const suite = this._currentSuite('test()');
+    const suite = this._currentSuite(location, 'test()');
     if (!suite)
       return;
 
@@ -103,22 +102,24 @@ export class TestTypeImpl {
       details = fnOrDetails;
     }
 
-    const validatedDetails = validateTestDetails(details);
+    const validatedDetails = validateTestDetails(details, location);
     const test = new TestCase(title, body, this, location);
     test._requireFile = suite._requireFile;
-    test._staticAnnotations.push(...validatedDetails.annotations);
+    test.annotations.push(...validatedDetails.annotations);
     test._tags.push(...validatedDetails.tags);
     suite._addTest(test);
 
-    if (type === 'only')
+    if (type === 'only' || type === 'fail.only')
       test._only = true;
     if (type === 'skip' || type === 'fixme' || type === 'fail')
-      test._staticAnnotations.push({ type });
+      test.annotations.push({ type, location });
+    else if (type === 'fail.only')
+      test.annotations.push({ type: 'fail', location });
   }
 
   private _describe(type: 'default' | 'only' | 'serial' | 'serial.only' | 'parallel' | 'parallel.only' | 'skip' | 'fixme', location: Location, titleOrFn: string | Function, fnOrDetails?: TestDetails | Function, fn?: Function) {
     throwIfRunningInsideJest();
-    const suite = this._currentSuite('test.describe()');
+    const suite = this._currentSuite(location, 'test.describe()');
     if (!suite)
       return;
 
@@ -140,8 +141,8 @@ export class TestTypeImpl {
       body = fn!;
     }
 
-    const validatedDetails = validateTestDetails(details);
-    const child = new Suite(title, 'describe', this);
+    const validatedDetails = validateTestDetails(details, location);
+    const child = new Suite(title, 'describe');
     child._requireFile = suite._requireFile;
     child.location = location;
     child._staticAnnotations.push(...validatedDetails.annotations);
@@ -155,7 +156,7 @@ export class TestTypeImpl {
     if (type === 'parallel' || type === 'parallel.only')
       child._parallelMode = 'parallel';
     if (type === 'skip' || type === 'fixme')
-      child._staticAnnotations.push({ type });
+      child._staticAnnotations.push({ type, location });
 
     for (let parent: Suite | undefined = suite; parent; parent = parent.parent) {
       if (parent._parallelMode === 'serial' && child._parallelMode === 'parallel')
@@ -170,7 +171,7 @@ export class TestTypeImpl {
   }
 
   private _hook(name: 'beforeEach' | 'afterEach' | 'beforeAll' | 'afterAll', location: Location, title: string | Function, fn?: Function) {
-    const suite = this._currentSuite(`test.${name}()`);
+    const suite = this._currentSuite(location, `test.${name}()`);
     if (!suite)
       return;
     if (typeof title === 'function') {
@@ -181,9 +182,9 @@ export class TestTypeImpl {
     suite._hooks.push({ type: name, fn: fn!, title, location });
   }
 
-  private _configure(options: { mode?: 'default' | 'parallel' | 'serial', retries?: number, timeout?: number }) {
+  private _configure(location: Location, options: { mode?: 'default' | 'parallel' | 'serial', retries?: number, timeout?: number }) {
     throwIfRunningInsideJest();
-    const suite = this._currentSuite(`test.describe.configure()`);
+    const suite = this._currentSuite(location, `test.describe.configure()`);
     if (!suite)
       return;
 
@@ -226,7 +227,7 @@ export class TestTypeImpl {
         if (modifierArgs.length >= 1 && !modifierArgs[0])
           return;
         const description = modifierArgs[1];
-        suite._staticAnnotations.push({ type, description });
+        suite._staticAnnotations.push({ type, description, location });
       }
       return;
     }
@@ -236,10 +237,10 @@ export class TestTypeImpl {
       throw new Error(`test.${type}() can only be called inside test, describe block or fixture`);
     if (typeof modifierArgs[0] === 'function')
       throw new Error(`test.${type}() with a function can only be called inside describe block`);
-    testInfo[type](...modifierArgs as [any, any]);
+    testInfo._modifier(type, location, modifierArgs as [any, any]);
   }
 
-  private _setTimeout(timeout: number) {
+  private _setTimeout(location: Location, timeout: number) {
     const suite = currentlyLoadingFileSuite();
     if (suite) {
       suite._timeout = timeout;
@@ -253,22 +254,35 @@ export class TestTypeImpl {
   }
 
   private _use(location: Location, fixtures: Fixtures) {
-    const suite = this._currentSuite(`test.use()`);
+    const suite = this._currentSuite(location, `test.use()`);
     if (!suite)
       return;
     suite._use.push({ fixtures, location });
   }
 
-  async _step<T>(title: string, body: () => Promise<T>, options: { box?: boolean } = {}): Promise<T> {
+  async _step<T>(expectation: 'pass'|'skip', title: string, body: (step: TestStepInfo) => T | Promise<T>, options: {box?: boolean, location?: Location, timeout?: number } = {}): Promise<T> {
     const testInfo = currentTestInfo();
     if (!testInfo)
       throw new Error(`test.step() can only be called from a test`);
-    const step = testInfo._addStep({ category: 'test.step', title, box: options.box });
-    return await zones.run('stepZone', step, async () => {
+    const step = testInfo._addStep({ category: 'test.step', title, location: options.location, box: options.box });
+    return await currentZone().with('stepZone', step).run(async () => {
       try {
-        const result = await body();
+        let result: Awaited<ReturnType<typeof raceAgainstDeadline<T>>> | undefined = undefined;
+        result = await raceAgainstDeadline(async () => {
+          try {
+            return await step.info._runStepBody(expectation === 'skip', body, step.location);
+          } catch (e) {
+            // If the step timed out, the test fixtures will tear down, which in turn
+            // will abort unfinished actions in the step body. Record such errors here.
+            if (result?.timedOut)
+              testInfo._failWithError(e);
+            throw e;
+          }
+        }, options.timeout ? monotonicTime() + options.timeout : 0);
+        if (result.timedOut)
+          throw new errors.TimeoutError(`Step timeout of ${options.timeout}ms exceeded.`);
         step.complete({});
-        return result;
+        return result.result;
       } catch (error) {
         step.complete({ error });
         throw error;
@@ -295,8 +309,9 @@ function throwIfRunningInsideJest() {
   }
 }
 
-function validateTestDetails(details: TestDetails) {
-  const annotations = Array.isArray(details.annotation) ? details.annotation : (details.annotation ? [details.annotation] : []);
+function validateTestDetails(details: TestDetails, location: Location) {
+  const originalAnnotations = Array.isArray(details.annotation) ? details.annotation : (details.annotation ? [details.annotation] : []);
+  const annotations = originalAnnotations.map(annotation => ({ ...annotation, location }));
   const tags = Array.isArray(details.tag) ? details.tag : (details.tag ? [details.tag] : []);
   for (const tag of tags) {
     if (tag[0] !== '@')
diff --git a/packages/playwright/src/fsWatcher.ts b/packages/playwright/src/fsWatcher.ts
index a1c09c343d30b..a6989defcfcd7 100644
--- a/packages/playwright/src/fsWatcher.ts
+++ b/packages/playwright/src/fsWatcher.ts
@@ -15,32 +15,31 @@
  */
 
 import { chokidar } from './utilsBundle';
+
 import type { FSWatcher } from 'chokidar';
 
 export type FSEvent = { event: 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir', file: string };
 
 export class Watcher {
   private _onChange: (events: FSEvent[]) => void;
-  private _watchedFiles: string[] = [];
+  private _watchedPaths: string[] = [];
   private _ignoredFolders: string[] = [];
   private _collector: FSEvent[] = [];
   private _fsWatcher: FSWatcher | undefined;
   private _throttleTimer: NodeJS.Timeout | undefined;
-  private _mode: 'flat' | 'deep';
 
-  constructor(mode: 'flat' | 'deep', onChange: (events: FSEvent[]) => void) {
-    this._mode = mode;
+  constructor(onChange: (events: FSEvent[]) => void) {
     this._onChange = onChange;
   }
 
-  update(watchedFiles: string[], ignoredFolders: string[], reportPending: boolean) {
-    if (JSON.stringify([this._watchedFiles, this._ignoredFolders]) === JSON.stringify(watchedFiles, ignoredFolders))
+  async update(watchedPaths: string[], ignoredFolders: string[], reportPending: boolean) {
+    if (JSON.stringify([this._watchedPaths, this._ignoredFolders]) === JSON.stringify([watchedPaths, ignoredFolders]))
       return;
 
     if (reportPending)
       this._reportEventsIfAny();
 
-    this._watchedFiles = watchedFiles;
+    this._watchedPaths = watchedPaths;
     this._ignoredFolders = ignoredFolders;
     void this._fsWatcher?.close();
     this._fsWatcher = undefined;
@@ -48,20 +47,18 @@ export class Watcher {
     clearTimeout(this._throttleTimer);
     this._throttleTimer = undefined;
 
-    if (!this._watchedFiles.length)
+    if (!this._watchedPaths.length)
       return;
 
     const ignored = [...this._ignoredFolders, '**/node_modules/**'];
-    this._fsWatcher = chokidar.watch(watchedFiles, { ignoreInitial: true, ignored }).on('all', async (event, file) => {
+    this._fsWatcher = chokidar.watch(watchedPaths, { ignoreInitial: true, ignored }).on('all', async (event, file) => {
       if (this._throttleTimer)
         clearTimeout(this._throttleTimer);
-      if (this._mode === 'flat' && event !== 'add' && event !== 'change')
-        return;
-      if (this._mode === 'deep' && event !== 'add' && event !== 'change' && event !== 'unlink' && event !== 'addDir' && event !== 'unlinkDir')
-        return;
       this._collector.push({ event, file });
       this._throttleTimer = setTimeout(() => this._reportEventsIfAny(), 250);
     });
+
+    await new Promise((resolve, reject) => this._fsWatcher!.once('ready', resolve).once('error', reject));
   }
 
   async close() {
diff --git a/packages/playwright/src/index.ts b/packages/playwright/src/index.ts
index 9a159c984ad2d..9277f03632971 100644
--- a/packages/playwright/src/index.ts
+++ b/packages/playwright/src/index.ts
@@ -14,21 +14,31 @@
  * limitations under the License.
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-import type { APIRequestContext, BrowserContext, Browser, BrowserContextOptions, LaunchOptions, Page, Tracing, Video } from 'playwright-core';
+import fs from 'fs';
+import path from 'path';
+
 import * as playwrightLibrary from 'playwright-core';
-import { createGuid, debugMode, addInternalStackPrefix, isString, asLocator, jsonStringifyForceASCII } from 'playwright-core/lib/utils';
-import type { Fixtures, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, ScreenshotMode, TestInfo, TestType, VideoMode } from '../types/test';
-import type { TestInfoImpl } from './worker/testInfo';
+import { setBoxedStackPrefixes, createGuid, currentZone, debugMode, jsonStringifyForceASCII, asLocatorDescription, renderTitleForCall, getActionGroup } from 'playwright-core/lib/utils';
+
+import { currentTestInfo } from './common/globals';
 import { rootTestType } from './common/testType';
+
+import type { Fixtures, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, ScreenshotMode, TestInfo, TestType, VideoMode } from '../types/test';
 import type { ContextReuseMode } from './common/config';
-import type { ClientInstrumentation, ClientInstrumentationListener } from '../../playwright-core/src/client/clientInstrumentation';
-import { currentTestInfo } from './common/globals';
+import type { TestInfoImpl, TestStepInternal } from './worker/testInfo';
+import type { ClientInstrumentationListener } from '../../playwright-core/src/client/clientInstrumentation';
+import type { Playwright as PlaywrightImpl } from '../../playwright-core/src/client/playwright';
+import type { Browser as BrowserImpl } from '../../playwright-core/src/client/browser';
+import type { BrowserContext as BrowserContextImpl } from '../../playwright-core/src/client/browserContext';
+import type { APIRequestContext as APIRequestContextImpl } from '../../playwright-core/src/client/fetch';
+import type { ChannelOwner } from '../../playwright-core/src/client/channelOwner';
+import type { Page as PageImpl } from '../../playwright-core/src/client/page';
+import type { BrowserContext, BrowserContextOptions, LaunchOptions, Page, Tracing } from 'playwright-core';
+
 export { expect } from './matchers/expect';
 export const _baseTest: TestType<{}, {}> = rootTestType.test;
 
-addInternalStackPrefix(path.dirname(require.resolve('../package.json')));
+setBoxedStackPrefixes([path.dirname(require.resolve('../package.json'))]);
 
 if ((process as any)['__pw_initiator__']) {
   const originalStackTraceLimit = Error.stackTraceLimit;
@@ -46,10 +56,11 @@ type TestFixtures = PlaywrightTestArgs & PlaywrightTestOptions & {
   _combinedContextOptions: BrowserContextOptions,
   _setupContextOptions: void;
   _setupArtifacts: void;
-  _contextFactory: (options?: BrowserContextOptions) => Promise<BrowserContext>;
+  _contextFactory: (options?: BrowserContextOptions) => Promise<{ context: BrowserContext, close: () => Promise<void> }>;
 };
 
 type WorkerFixtures = PlaywrightWorkerArgs & PlaywrightWorkerOptions & {
+  playwright: PlaywrightImpl;
   _browserOptions: LaunchOptions;
   _optionContextReuseMode: ContextReuseMode,
   _optionConnectOptions: PlaywrightWorkerOptions['connectOptions'],
@@ -57,41 +68,39 @@ type WorkerFixtures = PlaywrightWorkerArgs & PlaywrightWorkerOptions & {
 };
 
 const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
-  defaultBrowserType: ['chromium', { scope: 'worker', option: true }],
-  browserName: [({ defaultBrowserType }, use) => use(defaultBrowserType), { scope: 'worker', option: true }],
+  defaultBrowserType: ['chromium', { scope: 'worker', option: true, box: true }],
+  browserName: [({ defaultBrowserType }, use) => use(defaultBrowserType), { scope: 'worker', option: true, box: true }],
   playwright: [async ({}, use) => {
     await use(require('playwright-core'));
   }, { scope: 'worker', box: true }],
-  headless: [({ launchOptions }, use) => use(launchOptions.headless ?? true), { scope: 'worker', option: true }],
-  channel: [({ launchOptions }, use) => use(launchOptions.channel), { scope: 'worker', option: true }],
-  launchOptions: [{}, { scope: 'worker', option: true }],
+  headless: [({ launchOptions }, use) => use(launchOptions.headless ?? true), { scope: 'worker', option: true, box: true }],
+  channel: [({ launchOptions }, use) => use(launchOptions.channel), { scope: 'worker', option: true, box: true }],
+  launchOptions: [{}, { scope: 'worker', option: true, box: true }],
   connectOptions: [async ({ _optionConnectOptions }, use) => {
     await use(connectOptionsFromEnv() || _optionConnectOptions);
-  }, { scope: 'worker', option: true }],
-  screenshot: ['off', { scope: 'worker', option: true }],
-  video: ['off', { scope: 'worker', option: true }],
-  trace: ['off', { scope: 'worker', option: true }],
+  }, { scope: 'worker', option: true, box: true }],
+  screenshot: ['off', { scope: 'worker', option: true, box: true }],
+  video: ['off', { scope: 'worker', option: true, box: true }],
+  trace: ['off', { scope: 'worker', option: true, box: true }],
 
   _browserOptions: [async ({ playwright, headless, channel, launchOptions }, use) => {
     const options: LaunchOptions = {
       handleSIGINT: false,
       ...launchOptions,
+      tracesDir: tracing().tracesDir(),
     };
     if (headless !== undefined)
       options.headless = headless;
     if (channel !== undefined)
       options.channel = channel;
-    options.tracesDir = tracing().tracesDir();
 
-    for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit])
-      (browserType as any)._defaultLaunchOptions = options;
+    playwright._defaultLaunchOptions = options;
     await use(options);
-    for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit])
-      (browserType as any)._defaultLaunchOptions = undefined;
+    playwright._defaultLaunchOptions = undefined;
   }, { scope: 'worker', auto: true, box: true }],
 
-  browser: [async ({ playwright, browserName, _browserOptions, connectOptions, _reuseContext }, use, testInfo) => {
-    if (!['chromium', 'firefox', 'webkit'].includes(browserName))
+  browser: [async ({ playwright, browserName, _browserOptions, connectOptions }, use, testInfo) => {
+    if (!['chromium', 'firefox', 'webkit', '_bidiChromium', '_bidiFirefox'].includes(browserName))
       throw new Error(`Unexpected browserName "${browserName}", must be one of "chromium", "firefox" or "webkit"`);
 
     if (connectOptions) {
@@ -99,54 +108,49 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
         ...connectOptions,
         exposeNetwork: connectOptions.exposeNetwork ?? (connectOptions as any)._exposeNetwork,
         headers: {
-          ...(_reuseContext ? { 'x-playwright-reuse-context': '1' } : {}),
           // HTTP headers are ASCII only (not UTF-8).
           'x-playwright-launch-options': jsonStringifyForceASCII(_browserOptions),
           ...connectOptions.headers,
         },
       });
       await use(browser);
-      await (browser as any)._wrapApiCall(async () => {
-        await browser.close({ reason: 'Test ended.' });
-      }, true);
+      await browser.close({ reason: 'Test ended.' });
       return;
     }
 
     const browser = await playwright[browserName].launch();
     await use(browser);
-    await (browser as any)._wrapApiCall(async () => {
-      await browser.close({ reason: 'Test ended.' });
-    }, true);
+    await browser.close({ reason: 'Test ended.' });
   }, { scope: 'worker', timeout: 0 }],
 
-  acceptDownloads: [({ contextOptions }, use) => use(contextOptions.acceptDownloads ?? true), { option: true }],
-  bypassCSP: [({ contextOptions }, use) => use(contextOptions.bypassCSP ?? false), { option: true }],
-  colorScheme: [({ contextOptions }, use) => use(contextOptions.colorScheme === undefined ? 'light' : contextOptions.colorScheme), { option: true }],
-  deviceScaleFactor: [({ contextOptions }, use) => use(contextOptions.deviceScaleFactor), { option: true }],
-  extraHTTPHeaders: [({ contextOptions }, use) => use(contextOptions.extraHTTPHeaders), { option: true }],
-  geolocation: [({ contextOptions }, use) => use(contextOptions.geolocation), { option: true }],
-  hasTouch: [({ contextOptions }, use) => use(contextOptions.hasTouch ?? false), { option: true }],
-  httpCredentials: [({ contextOptions }, use) => use(contextOptions.httpCredentials), { option: true }],
-  ignoreHTTPSErrors: [({ contextOptions }, use) => use(contextOptions.ignoreHTTPSErrors ?? false), { option: true }],
-  isMobile: [({ contextOptions }, use) => use(contextOptions.isMobile ?? false), { option: true }],
-  javaScriptEnabled: [({ contextOptions }, use) => use(contextOptions.javaScriptEnabled ?? true), { option: true }],
-  locale: [({ contextOptions }, use) => use(contextOptions.locale ?? 'en-US'), { option: true }],
-  offline: [({ contextOptions }, use) => use(contextOptions.offline ?? false), { option: true }],
-  permissions: [({ contextOptions }, use) => use(contextOptions.permissions), { option: true }],
-  proxy: [({ contextOptions }, use) => use(contextOptions.proxy), { option: true }],
-  storageState: [({ contextOptions }, use) => use(contextOptions.storageState), { option: true }],
-  clientCertificates: [({ contextOptions }, use) => use(contextOptions.clientCertificates), { option: true }],
-  timezoneId: [({ contextOptions }, use) => use(contextOptions.timezoneId), { option: true }],
-  userAgent: [({ contextOptions }, use) => use(contextOptions.userAgent), { option: true }],
-  viewport: [({ contextOptions }, use) => use(contextOptions.viewport === undefined ? { width: 1280, height: 720 } : contextOptions.viewport), { option: true }],
-  actionTimeout: [0, { option: true }],
-  testIdAttribute: ['data-testid', { option: true }],
-  navigationTimeout: [0, { option: true }],
+  acceptDownloads: [({ contextOptions }, use) => use(contextOptions.acceptDownloads ?? true), { option: true, box: true }],
+  bypassCSP: [({ contextOptions }, use) => use(contextOptions.bypassCSP ?? false), { option: true, box: true }],
+  colorScheme: [({ contextOptions }, use) => use(contextOptions.colorScheme === undefined ? 'light' : contextOptions.colorScheme), { option: true, box: true }],
+  deviceScaleFactor: [({ contextOptions }, use) => use(contextOptions.deviceScaleFactor), { option: true, box: true }],
+  extraHTTPHeaders: [({ contextOptions }, use) => use(contextOptions.extraHTTPHeaders), { option: true, box: true }],
+  geolocation: [({ contextOptions }, use) => use(contextOptions.geolocation), { option: true, box: true }],
+  hasTouch: [({ contextOptions }, use) => use(contextOptions.hasTouch ?? false), { option: true, box: true }],
+  httpCredentials: [({ contextOptions }, use) => use(contextOptions.httpCredentials), { option: true, box: true }],
+  ignoreHTTPSErrors: [({ contextOptions }, use) => use(contextOptions.ignoreHTTPSErrors ?? false), { option: true, box: true }],
+  isMobile: [({ contextOptions }, use) => use(contextOptions.isMobile ?? false), { option: true, box: true }],
+  javaScriptEnabled: [({ contextOptions }, use) => use(contextOptions.javaScriptEnabled ?? true), { option: true, box: true }],
+  locale: [({ contextOptions }, use) => use(contextOptions.locale ?? 'en-US'), { option: true, box: true }],
+  offline: [({ contextOptions }, use) => use(contextOptions.offline ?? false), { option: true, box: true }],
+  permissions: [({ contextOptions }, use) => use(contextOptions.permissions), { option: true, box: true }],
+  proxy: [({ contextOptions }, use) => use(contextOptions.proxy), { option: true, box: true }],
+  storageState: [({ contextOptions }, use) => use(contextOptions.storageState), { option: true, box: true }],
+  clientCertificates: [({ contextOptions }, use) => use(contextOptions.clientCertificates), { option: true, box: true }],
+  timezoneId: [({ contextOptions }, use) => use(contextOptions.timezoneId), { option: true, box: true }],
+  userAgent: [({ contextOptions }, use) => use(contextOptions.userAgent), { option: true, box: true }],
+  viewport: [({ contextOptions }, use) => use(contextOptions.viewport === undefined ? { width: 1280, height: 720 } : contextOptions.viewport), { option: true, box: true }],
+  actionTimeout: [0, { option: true, box: true }],
+  testIdAttribute: ['data-testid', { option: true, box: true }],
+  navigationTimeout: [0, { option: true, box: true }],
   baseURL: [async ({ }, use) => {
     await use(process.env.PLAYWRIGHT_TEST_BASE_URL);
-  }, { option: true }],
-  serviceWorkers: [({ contextOptions }, use) => use(contextOptions.serviceWorkers ?? 'allow'), { option: true }],
-  contextOptions: [{}, { option: true }],
+  }, { option: true, box: true }],
+  serviceWorkers: [({ contextOptions }, use) => use(contextOptions.serviceWorkers ?? 'allow'), { option: true, box: true }],
+  contextOptions: [{}, { option: true, box: true }],
 
   _combinedContextOptions: [async ({
     acceptDownloads,
@@ -228,82 +232,113 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
     if (testIdAttribute)
       playwrightLibrary.selectors.setTestIdAttribute(testIdAttribute);
     testInfo.snapshotSuffix = process.platform;
-    if (debugMode())
-      testInfo.setTimeout(0);
-    for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
-      (browserType as any)._defaultContextOptions = _combinedContextOptions;
-      (browserType as any)._defaultContextTimeout = actionTimeout || 0;
-      (browserType as any)._defaultContextNavigationTimeout = navigationTimeout || 0;
-    }
-    (playwright.request as any)._defaultContextOptions = { ..._combinedContextOptions };
-    (playwright.request as any)._defaultContextOptions.tracesDir = tracing().tracesDir();
-    (playwright.request as any)._defaultContextOptions.timeout = actionTimeout || 0;
+    if (debugMode() === 'inspector')
+      (testInfo as TestInfoImpl)._setDebugMode();
+
+    playwright._defaultContextOptions = _combinedContextOptions;
+    playwright._defaultContextTimeout = actionTimeout || 0;
+    playwright._defaultContextNavigationTimeout = navigationTimeout || 0;
     await use();
-    (playwright.request as any)._defaultContextOptions = undefined;
-    for (const browserType of [playwright.chromium, playwright.firefox, playwright.webkit]) {
-      (browserType as any)._defaultContextOptions = undefined;
-      (browserType as any)._defaultContextTimeout = undefined;
-      (browserType as any)._defaultContextNavigationTimeout = undefined;
-    }
+    playwright._defaultContextOptions = undefined;
+    playwright._defaultContextTimeout = undefined;
+    playwright._defaultContextNavigationTimeout = undefined;
   }, { auto: 'all-hooks-included',  title: 'context configuration', box: true } as any],
 
   _setupArtifacts: [async ({ playwright, screenshot }, use, testInfo) => {
+    // This fixture has a separate zero-timeout slot to ensure that artifact collection
+    // happens even after some fixtures or hooks time out.
+    // Now that default test timeout is known, we can replace zero with an actual value.
+    testInfo.setTimeout(testInfo.project.timeout);
+
     const artifactsRecorder = new ArtifactsRecorder(playwright, tracing().artifactsDir(), screenshot);
     await artifactsRecorder.willStartTest(testInfo as TestInfoImpl);
+
+    const tracingGroupSteps: TestStepInternal[] = [];
     const csiListener: ClientInstrumentationListener = {
-      onApiCallBegin: (apiName: string, params: Record<string, any>, frames: StackFrame[], userData: any, out: { stepId?: string }) => {
+      onApiCallBegin: (data, channel) => {
         const testInfo = currentTestInfo();
-        if (!testInfo || apiName.includes('setTestIdAttribute'))
-          return { userObject: null };
+        // Some special calls do not get into steps.
+        if (!testInfo || data.apiName.includes('setTestIdAttribute') || data.apiName === 'tracing.groupEnd')
+          return;
+        const zone = currentZone().data<TestStepInternal>('stepZone');
+        if (zone && zone.category === 'expect') {
+          // Display the internal locator._expect call under the name of the enclosing expect call,
+          // and connect it to the existing expect step.
+          if (zone.apiName)
+            data.apiName = zone.apiName;
+          if (zone.title)
+            data.title = zone.title;
+          data.stepId = zone.stepId;
+          return;
+        }
+
+        // In the general case, create a step for each api call and connect them through the stepId.
         const step = testInfo._addStep({
-          location: frames[0] as any,
+          location: data.frames[0],
           category: 'pw:api',
-          title: renderApiCall(apiName, params),
-          apiName,
-          params,
-        });
-        userData.userObject = step;
-        out.stepId = step.stepId;
+          title: renderTitle(channel.type, channel.method, channel.params, data.title),
+          apiName: data.apiName,
+          params: channel.params,
+          group: getActionGroup({ type: channel.type, method: channel.method }),
+        }, tracingGroupSteps[tracingGroupSteps.length - 1]);
+        data.userData = step;
+        data.stepId = step.stepId;
+        if (data.apiName === 'tracing.group')
+          tracingGroupSteps.push(step);
+      },
+      onApiCallRecovery: (data, error, recoveryHandlers) => {
+        const step = data.userData as TestStepInternal;
+        if (step)
+          recoveryHandlers.push(() => step.recoverFromStepError(error));
       },
-      onApiCallEnd: (userData: any, error?: Error) => {
-        const step = userData.userObject;
-        step?.complete({ error });
+      onApiCallEnd: data => {
+        // "tracing.group" step will end later, when "tracing.groupEnd" finishes.
+        if (data.apiName === 'tracing.group')
+          return;
+        if (data.apiName === 'tracing.groupEnd') {
+          const step = tracingGroupSteps.pop();
+          step?.complete({ error: data.error });
+          return;
+        }
+        const step = data.userData;
+        step?.complete({ error: data.error });
       },
-      onWillPause: () => {
-        currentTestInfo()?.setTimeout(0);
+      onWillPause: ({ keepTestTimeout }) => {
+        if (!keepTestTimeout)
+          currentTestInfo()?._setDebugMode();
       },
-      runAfterCreateBrowserContext: async (context: BrowserContext) => {
+      runAfterCreateBrowserContext: async (context: BrowserContextImpl) => {
         await artifactsRecorder?.didCreateBrowserContext(context);
         const testInfo = currentTestInfo();
         if (testInfo)
           attachConnectedHeaderIfNeeded(testInfo, context.browser());
       },
-      runAfterCreateRequestContext: async (context: APIRequestContext) => {
+      runAfterCreateRequestContext: async (context: APIRequestContextImpl) => {
         await artifactsRecorder?.didCreateRequestContext(context);
       },
-      runBeforeCloseBrowserContext: async (context: BrowserContext) => {
+      runBeforeCloseBrowserContext: async (context: BrowserContextImpl) => {
         await artifactsRecorder?.willCloseBrowserContext(context);
       },
-      runBeforeCloseRequestContext: async (context: APIRequestContext) => {
+      runBeforeCloseRequestContext: async (context: APIRequestContextImpl) => {
         await artifactsRecorder?.willCloseRequestContext(context);
       },
     };
 
-    const clientInstrumentation = (playwright as any)._instrumentation as ClientInstrumentation;
+    const clientInstrumentation = playwright._instrumentation;
     clientInstrumentation.addListener(csiListener);
 
     await use();
 
     clientInstrumentation.removeListener(csiListener);
     await artifactsRecorder.didFinishTest();
-
-  }, { auto: 'all-hooks-included',  title: 'trace recording', box: true } as any],
+  }, { auto: 'all-hooks-included',  title: 'trace recording', box: true, timeout: 0 } as any],
 
   _contextFactory: [async ({ browser, video, _reuseContext, _combinedContextOptions /** mitigate dep-via-auto lack of traceability */ }, use, testInfo) => {
     const testInfoImpl = testInfo as TestInfoImpl;
     const videoMode = normalizeVideoMode(video);
     const captureVideo = shouldCaptureVideo(videoMode, testInfo) && !_reuseContext;
-    const contexts = new Map<BrowserContext, { pagesWithVideo: Page[] }>();
+    const contexts = new Map<BrowserContext, { close: () => Promise<void>, pagesWithVideo: Page[] }>();
+    let counter = 0;
 
     await use(async options => {
       const hook = testInfoImpl._currentHookType();
@@ -320,54 +355,56 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
           size: typeof video === 'string' ? undefined : video.size,
         }
       } : {};
-      const context = await browser.newContext({ ...videoOptions, ...options });
-      const contextData: { pagesWithVideo: Page[] } = { pagesWithVideo: [] };
-      contexts.set(context, contextData);
-      if (captureVideo)
-        context.on('page', page => contextData.pagesWithVideo.push(page));
+      const context = await browser.newContext({ ...videoOptions, ...options }) as BrowserContextImpl;
 
       if (process.env.PW_CLOCK === 'frozen') {
-        await (context as any)._wrapApiCall(async () => {
+        await context._wrapApiCall(async () => {
           await context.clock.install({ time: 0 });
           await context.clock.pauseAt(1000);
-        }, true);
+        }, { internal: true });
       } else if (process.env.PW_CLOCK === 'realtime') {
-        await (context as any)._wrapApiCall(async () => {
+        await context._wrapApiCall(async () => {
           await context.clock.install({ time: 0 });
-        }, true);
+        }, { internal: true });
       }
 
-      return context;
-    });
-
-    let counter = 0;
-    const closeReason = testInfo.status === 'timedOut' ? 'Test timeout of ' + testInfo.timeout + 'ms exceeded.' : 'Test ended.';
-    await Promise.all([...contexts.keys()].map(async context => {
-      await (context as any)._wrapApiCall(async () => {
+      let closed = false;
+      const close = async () => {
+        if (closed)
+          return;
+        closed = true;
+        const closeReason = testInfo.status === 'timedOut' ? 'Test timeout of ' + testInfo.timeout + 'ms exceeded.' : 'Test ended.';
         await context.close({ reason: closeReason });
-      }, true);
-      const testFailed = testInfo.status !== testInfo.expectedStatus;
-      const preserveVideo = captureVideo && (videoMode === 'on' || (testFailed && videoMode === 'retain-on-failure') || (videoMode === 'on-first-retry' && testInfo.retry === 1));
-      if (preserveVideo) {
-        const { pagesWithVideo: pagesForVideo } = contexts.get(context)!;
-        const videos = pagesForVideo.map(p => p.video()).filter(Boolean) as Video[];
-        await Promise.all(videos.map(async v => {
-          try {
-            const savedPath = testInfo.outputPath(`video${counter ? '-' + counter : ''}.webm`);
-            ++counter;
-            await v.saveAs(savedPath);
-            testInfo.attachments.push({ name: 'video', path: savedPath, contentType: 'video/webm' });
-          } catch (e) {
-            // Silent catch empty videos.
-          }
-        }));
-      }
-    }));
+        const testFailed = testInfo.status !== testInfo.expectedStatus;
+        const preserveVideo = captureVideo && (videoMode === 'on' || (testFailed && videoMode === 'retain-on-failure') || (videoMode === 'on-first-retry' && testInfo.retry === 1));
+        if (preserveVideo) {
+          const { pagesWithVideo: pagesForVideo } = contexts.get(context)!;
+          const videos = pagesForVideo.map(p => p.video()).filter(video => !!video);
+          await Promise.all(videos.map(async v => {
+            try {
+              const savedPath = testInfo.outputPath(`video${counter ? '-' + counter : ''}.webm`);
+              ++counter;
+              await v.saveAs(savedPath);
+              testInfo.attachments.push({ name: 'video', path: savedPath, contentType: 'video/webm' });
+            } catch (e) {
+              // Silent catch empty videos.
+            }
+          }));
+        }
+      };
 
+      const contextData = { close, pagesWithVideo: [] as Page[] };
+      if (captureVideo)
+        context.on('page', page => contextData.pagesWithVideo.push(page));
+      contexts.set(context, contextData);
+      return { context, close };
+    });
+
+    await Promise.all([...contexts.values()].map(data => data.close()));
   }, { scope: 'test',  title: 'context', box: true }],
 
-  _optionContextReuseMode: ['none', { scope: 'worker', option: true }],
-  _optionConnectOptions: [undefined, { scope: 'worker', option: true }],
+  _optionContextReuseMode: ['none', { scope: 'worker', option: true, box: true }],
+  _optionConnectOptions: [undefined, { scope: 'worker', option: true, box: true }],
 
   _reuseContext: [async ({ video, _optionContextReuseMode }, use) => {
     let mode = _optionContextReuseMode;
@@ -377,19 +414,20 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
     await use(reuse);
   }, { scope: 'worker',  title: 'context', box: true }],
 
-  context: async ({ playwright, browser, _reuseContext, _contextFactory }, use, testInfo) => {
-    attachConnectedHeaderIfNeeded(testInfo, browser);
+  context: async ({ browser, _reuseContext, _contextFactory }, use, testInfo) => {
+    const browserImpl = browser as BrowserImpl;
+    attachConnectedHeaderIfNeeded(testInfo, browserImpl);
     if (!_reuseContext) {
-      await use(await _contextFactory());
+      const { context, close } = await _contextFactory();
+      await use(context);
+      await close();
       return;
     }
 
-    const defaultContextOptions = (playwright.chromium as any)._defaultContextOptions as BrowserContextOptions;
-    const context = await (browser as any)._newContextForReuse(defaultContextOptions);
-    (context as any)[kIsReusedContext] = true;
+    const context = await browserImpl._wrapApiCall(() => browserImpl._newContextForReuse(), { internal: true });
     await use(context);
     const closeReason = testInfo.status === 'timedOut' ? 'Test timeout of ' + testInfo.timeout + 'ms exceeded.' : 'Test ended.';
-    await (browser as any)._stopPendingOperations(closeReason);
+    await browserImpl._wrapApiCall(() => browserImpl._disconnectFromReusedContext(closeReason), { internal: true });
   },
 
   page: async ({ context, _reuseContext }, use) => {
@@ -422,15 +460,7 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({
   },
 });
 
-type StackFrame = {
-  file: string,
-  line?: number,
-  column?: number,
-  function?: string,
-};
-
 type ScreenshotOption = PlaywrightWorkerOptions['screenshot'] | undefined;
-type Playwright = PlaywrightWorkerArgs['playwright'];
 
 function normalizeVideoMode(video: VideoMode | 'retry-with-video' | { mode: VideoMode } | undefined): VideoMode {
   if (!video)
@@ -451,8 +481,8 @@ function normalizeScreenshotMode(screenshot: ScreenshotOption): ScreenshotMode {
   return typeof screenshot === 'string' ? screenshot : screenshot.mode;
 }
 
-function attachConnectedHeaderIfNeeded(testInfo: TestInfo, browser: Browser | null) {
-  const connectHeaders: { name: string, value: string }[] | undefined = (browser as any)?._connectHeaders;
+function attachConnectedHeaderIfNeeded(testInfo: TestInfo, browser: BrowserImpl | null) {
+  const connectHeaders: { name: string, value: string }[] | undefined = browser?._connection.headers;
   if (!connectHeaders)
     return;
   for (const header of connectHeaders) {
@@ -488,7 +518,6 @@ function resolveClientCerticates(clientCertificates: ClientCertificates): Client
 }
 
 const kTracingStarted = Symbol('kTracingStarted');
-const kIsReusedContext = Symbol('kReusedContext');
 
 function connectOptionsFromEnv() {
   const wsEndpoint = process.env.PW_TEST_CONNECT_WS_ENDPOINT;
@@ -502,212 +531,249 @@ function connectOptionsFromEnv() {
   };
 }
 
+type SnapshotRecorderMode = 'on' | 'off' | 'only-on-failure' | 'on-first-failure';
+
+class SnapshotRecorder {
+  private _ordinal = 0;
+  private _temporary: string[] = [];
+
+  constructor(
+    private _artifactsRecorder: ArtifactsRecorder,
+    private _mode: SnapshotRecorderMode,
+    private _name: string,
+    private _contentType: string,
+    private _extension: string,
+    private _doSnapshot: (page: PageImpl, path: string) => Promise<void>) {
+  }
+
+  fixOrdinal() {
+    // Since beforeAll(s), test and afterAll(s) reuse the same TestInfo, make sure we do not
+    // overwrite previous screenshots.
+    this._ordinal = this.testInfo.attachments.filter(a => a.name === this._name).length;
+  }
+
+  private shouldCaptureUponFinish() {
+    return this._mode === 'on' ||
+        (this._mode === 'only-on-failure' && this.testInfo._isFailure()) ||
+        (this._mode === 'on-first-failure' && this.testInfo._isFailure() && this.testInfo.retry === 0);
+  }
+
+  async maybeCapture() {
+    if (!this.shouldCaptureUponFinish())
+      return;
+
+    await Promise.all(this._artifactsRecorder._playwright._allPages().map(page => this._snapshotPage(page, false)));
+  }
+
+  async persistTemporary() {
+    if (this.shouldCaptureUponFinish()) {
+      await Promise.all(this._temporary.map(async file => {
+        try {
+          const path = this._createAttachmentPath();
+          await fs.promises.rename(file, path);
+          this._attach(path);
+        } catch {
+        }
+      }));
+    }
+  }
+
+  async captureTemporary(context: BrowserContextImpl) {
+    if (this._mode === 'on' || this._mode === 'only-on-failure' || (this._mode === 'on-first-failure' && this.testInfo.retry === 0))
+      await Promise.all(context.pages().map(page => this._snapshotPage(page, true)));
+  }
+
+  private _attach(screenshotPath: string) {
+    this.testInfo.attachments.push({ name: this._name, path: screenshotPath, contentType: this._contentType });
+  }
+
+  private _createAttachmentPath() {
+    const testFailed = this.testInfo._isFailure();
+    const index = this._ordinal + 1;
+    ++this._ordinal;
+    const path = this.testInfo.outputPath(`test-${testFailed ? 'failed' : 'finished'}-${index}${this._extension}`);
+    return path;
+  }
+
+  private _createTemporaryArtifact(...name: string[]) {
+    const file = path.join(this._artifactsRecorder._artifactsDir, ...name);
+    return file;
+  }
+
+  private async _snapshotPage(page: PageImpl, temporary: boolean) {
+    // Make sure we do not snapshot the same page twice for a single TestInfo,
+    // which is reused between beforeAll(s), test and afterAll(s).
+    if ((page as any)[this.testInfo._uniqueSymbol])
+      return;
+    (page as any)[this.testInfo._uniqueSymbol] = true;
+    try {
+      const path = temporary ? this._createTemporaryArtifact(createGuid() + this._extension) : this._createAttachmentPath();
+      await this._doSnapshot(page, path);
+      if (temporary)
+        this._temporary.push(path);
+      else
+        this._attach(path);
+    } catch {
+      // snapshot may fail, just ignore.
+    }
+  }
+
+  private get testInfo(): TestInfoImpl {
+    return this._artifactsRecorder._testInfo;
+  }
+}
+
 class ArtifactsRecorder {
-  private _testInfo!: TestInfoImpl;
-  private _playwright: Playwright;
-  private _artifactsDir: string;
-  private _screenshotMode: ScreenshotMode;
-  private _screenshotOptions: { mode: ScreenshotMode } & Pick<playwrightLibrary.PageScreenshotOptions, 'fullPage' | 'omitBackground'> | undefined;
-  private _temporaryScreenshots: string[] = [];
-  private _temporaryArtifacts: string[] = [];
-  private _reusedContexts = new Set<BrowserContext>();
-  private _screenshotOrdinal = 0;
-  private _screenshottedSymbol: symbol;
+  _testInfo!: TestInfoImpl;
+  _playwright: PlaywrightImpl;
+  _artifactsDir: string;
   private _startedCollectingArtifacts: symbol;
 
-  constructor(playwright: Playwright, artifactsDir: string, screenshot: ScreenshotOption) {
+  private _screenshotRecorder: SnapshotRecorder;
+  private _pageSnapshot: string | undefined;
+
+  constructor(playwright: PlaywrightImpl, artifactsDir: string, screenshot: ScreenshotOption) {
     this._playwright = playwright;
     this._artifactsDir = artifactsDir;
-    this._screenshotMode = normalizeScreenshotMode(screenshot);
-    this._screenshotOptions = typeof screenshot === 'string' ? undefined : screenshot;
-    this._screenshottedSymbol = Symbol('screenshotted');
+    const screenshotOptions = typeof screenshot === 'string' ? undefined : screenshot;
     this._startedCollectingArtifacts = Symbol('startedCollectingArtifacts');
-  }
 
-  private _createTemporaryArtifact(...name: string[]) {
-    const file = path.join(this._artifactsDir, ...name);
-    this._temporaryArtifacts.push(file);
-    return file;
+    this._screenshotRecorder = new SnapshotRecorder(this, normalizeScreenshotMode(screenshot), 'screenshot', 'image/png', '.png', async (page, path) => {
+      await page._wrapApiCall(async () => {
+        await page.screenshot({ ...screenshotOptions, timeout: 5000, path, caret: 'initial' });
+      }, { internal: true });
+    });
   }
 
   async willStartTest(testInfo: TestInfoImpl) {
     this._testInfo = testInfo;
     testInfo._onDidFinishTestFunction = () => this.didFinishTestFunction();
 
-    // Since beforeAll(s), test and afterAll(s) reuse the same TestInfo, make sure we do not
-    // overwrite previous screenshots.
-    this._screenshotOrdinal = testInfo.attachments.filter(a => a.name === 'screenshot').length;
+    this._screenshotRecorder.fixOrdinal();
 
     // Process existing contexts.
-    for (const browserType of [this._playwright.chromium, this._playwright.firefox, this._playwright.webkit]) {
-      const promises: (Promise<void> | undefined)[] = [];
-      const existingContexts = Array.from((browserType as any)._contexts) as BrowserContext[];
-      for (const context of existingContexts) {
-        if ((context as any)[kIsReusedContext])
-          this._reusedContexts.add(context);
-        else
-          promises.push(this.didCreateBrowserContext(context));
-      }
-      await Promise.all(promises);
-    }
-    {
-      const existingApiRequests: APIRequestContext[] =  Array.from((this._playwright.request as any)._contexts as Set<APIRequestContext>);
-      await Promise.all(existingApiRequests.map(c => this.didCreateRequestContext(c)));
-    }
+    await Promise.all(this._playwright._allContexts().map(context => this.didCreateBrowserContext(context)));
+    const existingApiRequests = Array.from(this._playwright.request._contexts);
+    await Promise.all(existingApiRequests.map(c => this.didCreateRequestContext(c)));
+  }
+
+  async didCreateBrowserContext(context: BrowserContextImpl) {
+    await this._startTraceChunkOnContextCreation(context, context.tracing);
   }
 
-  async didCreateBrowserContext(context: BrowserContext) {
-    await this._startTraceChunkOnContextCreation(context.tracing);
+  async willCloseBrowserContext(context: BrowserContextImpl) {
+    await this._stopTracing(context, context.tracing);
+    await this._screenshotRecorder.captureTemporary(context);
+    await this._takePageSnapshot(context);
   }
 
-  async willCloseBrowserContext(context: BrowserContext) {
-    // When reusing context, we get all previous contexts closed at the start of next test.
-    // Do not record empty traces and useless screenshots for them.
-    if (this._reusedContexts.has(context))
+  private async _takePageSnapshot(context: BrowserContextImpl) {
+    if (process.env.PLAYWRIGHT_NO_COPY_PROMPT)
       return;
-    await this._stopTracing(context.tracing);
-    if (this._screenshotMode === 'on' || this._screenshotMode === 'only-on-failure') {
-      // Capture screenshot for now. We'll know whether we have to preserve them
-      // after the test finishes.
-      await Promise.all(context.pages().map(page => this._screenshotPage(page, true)));
-    }
+    if (this._testInfo.errors.length === 0)
+      return;
+    if (this._pageSnapshot)
+      return;
+    const page = context.pages()[0];
+    if (!page)
+      return;
+
+    try {
+      // TODO: maybe capture snapshot when the error is created, so it's from the right page and right time
+      await page._wrapApiCall(async () => {
+        this._pageSnapshot = await page._snapshotForAI({ timeout: 5000 });
+      }, { internal: true });
+    } catch {}
   }
 
-  async didCreateRequestContext(context: APIRequestContext) {
-    const tracing = (context as any)._tracing as Tracing;
-    await this._startTraceChunkOnContextCreation(tracing);
+  async didCreateRequestContext(context: APIRequestContextImpl) {
+    await this._startTraceChunkOnContextCreation(context, context._tracing);
   }
 
-  async willCloseRequestContext(context: APIRequestContext) {
-    const tracing = (context as any)._tracing as Tracing;
-    await this._stopTracing(tracing);
+  async willCloseRequestContext(context: APIRequestContextImpl) {
+    await this._stopTracing(context, context._tracing);
   }
 
   async didFinishTestFunction() {
-    const captureScreenshots = this._screenshotMode === 'on' || (this._screenshotMode === 'only-on-failure' && this._testInfo._isFailure());
-    if (captureScreenshots)
-      await this._screenshotOnTestFailure();
+    await this._screenshotRecorder.maybeCapture();
   }
 
   async didFinishTest() {
-    const captureScreenshots = this._screenshotMode === 'on' || (this._screenshotMode === 'only-on-failure' && this._testInfo._isFailure());
-    if (captureScreenshots)
-      await this._screenshotOnTestFailure();
+    await this.didFinishTestFunction();
 
-    const leftoverContexts: BrowserContext[] = [];
-    for (const browserType of [this._playwright.chromium, this._playwright.firefox, this._playwright.webkit])
-      leftoverContexts.push(...(browserType as any)._contexts);
-    const leftoverApiRequests: APIRequestContext[] =  Array.from((this._playwright.request as any)._contexts as Set<APIRequestContext>);
+    const leftoverContexts = this._playwright._allContexts();
+    const leftoverApiRequests = Array.from(this._playwright.request._contexts);
 
     // Collect traces/screenshots for remaining contexts.
     await Promise.all(leftoverContexts.map(async context => {
-      await this._stopTracing(context.tracing);
+      await this._stopTracing(context, context.tracing);
     }).concat(leftoverApiRequests.map(async context => {
-      const tracing = (context as any)._tracing as Tracing;
-      await this._stopTracing(tracing);
+      await this._stopTracing(context, context._tracing);
     })));
 
-    // Attach temporary screenshots for contexts closed before collecting the test trace.
-    if (captureScreenshots) {
-      for (const file of this._temporaryScreenshots) {
-        try {
-          const screenshotPath = this._createScreenshotAttachmentPath();
-          await fs.promises.rename(file, screenshotPath);
-          this._attachScreenshot(screenshotPath);
-        } catch {
-        }
-      }
+    await this._screenshotRecorder.persistTemporary();
+
+    const context = leftoverContexts[0];
+    if (context)
+      await this._takePageSnapshot(context);
+
+    if (this._pageSnapshot && this._testInfo.errors.length > 0 && !this._testInfo.attachments.some(a => a.name === 'error-context')) {
+      const lines = [
+        '# Page snapshot',
+        '',
+        '```yaml',
+        this._pageSnapshot,
+        '```',
+      ];
+      const filePath = this._testInfo.outputPath('error-context.md');
+      await fs.promises.writeFile(filePath, lines.join('\n'), 'utf8');
+
+      this._testInfo._attach({
+        name: 'error-context',
+        contentType: 'text/markdown',
+        path: filePath,
+      }, undefined);
     }
   }
 
-  private _createScreenshotAttachmentPath() {
-    const testFailed = this._testInfo._isFailure();
-    const index = this._screenshotOrdinal + 1;
-    ++this._screenshotOrdinal;
-    const screenshotPath = this._testInfo.outputPath(`test-${testFailed ? 'failed' : 'finished'}-${index}.png`);
-    return screenshotPath;
-  }
-
-  private async _screenshotPage(page: Page, temporary: boolean) {
-    if ((page as any)[this._screenshottedSymbol])
-      return;
-    (page as any)[this._screenshottedSymbol] = true;
-    try {
-      const screenshotPath = temporary ? this._createTemporaryArtifact(createGuid() + '.png') : this._createScreenshotAttachmentPath();
-      // Pass caret=initial to avoid any evaluations that might slow down the screenshot
-      // and let the page modify itself from the problematic state it had at the moment of failure.
-      await page.screenshot({ ...this._screenshotOptions, timeout: 5000, path: screenshotPath, caret: 'initial' });
-      if (temporary)
-        this._temporaryScreenshots.push(screenshotPath);
-      else
-        this._attachScreenshot(screenshotPath);
-    } catch {
-      // Screenshot may fail, just ignore.
-    }
-  }
-
-  private _attachScreenshot(screenshotPath: string) {
-    this._testInfo.attachments.push({ name: 'screenshot', path: screenshotPath, contentType: 'image/png' });
-  }
-
-  private async _screenshotOnTestFailure() {
-    const contexts: BrowserContext[] = [];
-    for (const browserType of [this._playwright.chromium, this._playwright.firefox, this._playwright.webkit])
-      contexts.push(...(browserType as any)._contexts);
-    const pages = contexts.map(ctx => ctx.pages()).flat();
-    await Promise.all(pages.map(page => this._screenshotPage(page, false)));
-  }
-
-  private async _startTraceChunkOnContextCreation(tracing: Tracing) {
-    const options = this._testInfo._tracing.traceOptions();
-    if (options) {
-      const title = this._testInfo._tracing.traceTitle();
-      const name = this._testInfo._tracing.generateNextTraceRecordingName();
-      if (!(tracing as any)[kTracingStarted]) {
-        await tracing.start({ ...options, title, name });
-        (tracing as any)[kTracingStarted] = true;
+  private async _startTraceChunkOnContextCreation(channelOwner: ChannelOwner, tracing: Tracing) {
+    await channelOwner._wrapApiCall(async () => {
+      const options = this._testInfo._tracing.traceOptions();
+      if (options) {
+        const title = this._testInfo._tracing.traceTitle();
+        const name = this._testInfo._tracing.generateNextTraceRecordingName();
+        if (!(tracing as any)[kTracingStarted]) {
+          await tracing.start({ ...options, title, name });
+          (tracing as any)[kTracingStarted] = true;
+        } else {
+          await tracing.startChunk({ title, name });
+        }
       } else {
-        await tracing.startChunk({ title, name });
-      }
-    } else {
-      if ((tracing as any)[kTracingStarted]) {
-        (tracing as any)[kTracingStarted] = false;
-        await tracing.stop();
+        if ((tracing as any)[kTracingStarted]) {
+          (tracing as any)[kTracingStarted] = false;
+          await tracing.stop();
+        }
       }
-    }
+    }, { internal: true });
   }
 
-  private async _stopTracing(tracing: Tracing) {
-    if ((tracing as any)[this._startedCollectingArtifacts])
-      return;
-    (tracing as any)[this._startedCollectingArtifacts] = true;
-    if (this._testInfo._tracing.traceOptions() && (tracing as any)[kTracingStarted])
-      await tracing.stopChunk({ path: this._testInfo._tracing.generateNextTraceRecordingPath() });
+  private async _stopTracing(channelOwner: ChannelOwner, tracing: Tracing) {
+    await channelOwner._wrapApiCall(async () => {
+      if ((tracing as any)[this._startedCollectingArtifacts])
+        return;
+      (tracing as any)[this._startedCollectingArtifacts] = true;
+      if (this._testInfo._tracing.traceOptions() && (tracing as any)[kTracingStarted])
+        await tracing.stopChunk({ path: this._testInfo._tracing.maybeGenerateNextTraceRecordingPath() });
+    }, { internal: true });
   }
 }
 
-const paramsToRender = ['url', 'selector', 'text', 'key'];
-
-function renderApiCall(apiName: string, params: any) {
-  const paramsArray = [];
-  if (params) {
-    for (const name of paramsToRender) {
-      if (!(name in params))
-        continue;
-      let value;
-      if (name === 'selector' && isString(params[name]) && params[name].startsWith('internal:')) {
-        const getter = asLocator('javascript', params[name]);
-        apiName = apiName.replace(/^locator\./, 'locator.' + getter + '.');
-        apiName = apiName.replace(/^page\./, 'page.' + getter + '.');
-        apiName = apiName.replace(/^frame\./, 'frame.' + getter + '.');
-      } else {
-        value = params[name];
-        paramsArray.push(value);
-      }
-    }
-  }
-  const paramsText = paramsArray.length ? '(' + paramsArray.join(', ') + ')' : '';
-  return apiName + paramsText;
+function renderTitle(type: string, method: string, params: Record<string, string> | undefined, title?: string) {
+  const prefix = renderTitleForCall({ title, type, method, params });
+  let selector;
+  if (params?.['selector'] && typeof params.selector === 'string')
+    selector = asLocatorDescription('javascript', params.selector);
+  return prefix + (selector ? ` ${selector}` : '');
 }
 
 function tracing() {
diff --git a/packages/playwright/src/internalsForTest.ts b/packages/playwright/src/internalsForTest.ts
index c0d2cbd95f295..129f9e858d3d1 100644
--- a/packages/playwright/src/internalsForTest.ts
+++ b/packages/playwright/src/internalsForTest.ts
@@ -15,6 +15,7 @@
  */
 
 import path from 'path';
+
 import { fileDependenciesForTest } from './transform/compilationCache';
 
 export function fileDependencies() {
diff --git a/packages/playwright/src/isomorphic/teleReceiver.ts b/packages/playwright/src/isomorphic/teleReceiver.ts
index 6391f8a64cb5c..df3e1c84a4ded 100644
--- a/packages/playwright/src/isomorphic/teleReceiver.ts
+++ b/packages/playwright/src/isomorphic/teleReceiver.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import type { Annotation } from '../common/config';
-import type { Metadata } from '../../types/test';
+import type { Metadata, TestAnnotation } from '../../types/test';
 import type * as reporterTypes from '../../types/testReporter';
 import type { ReporterV2 } from '../reporters/reporterV2';
 
@@ -52,6 +51,7 @@ export type JsonProject = {
   testIgnore: JsonPattern[];
   testMatch: JsonPattern[];
   timeout: number;
+  use: { [key: string]: any };
 };
 
 export type JsonSuite = {
@@ -67,14 +67,15 @@ export type JsonTestCase = {
   retries: number;
   tags?: string[];
   repeatEachIndex: number;
-  annotations?: { type: string, description?: string }[];
+  annotations?: TestAnnotation[];
 };
 
 export type JsonTestEnd = {
   testId: string;
   expectedStatus: reporterTypes.TestStatus;
   timeout: number;
-  annotations: { type: string, description?: string }[];
+  // Dropped in 1.52. Kept as empty array for backwards compatibility.
+  annotations: [];
 };
 
 export type JsonTestResultStart = {
@@ -85,14 +86,16 @@ export type JsonTestResultStart = {
   startTime: number;
 };
 
-export type JsonAttachment = Omit<reporterTypes.TestResult['attachments'][0], 'body'> & { base64?: string };
+export type JsonAttachment = Omit<reporterTypes.TestResult['attachments'][0], 'body'> & { base64?: string; };
 
 export type JsonTestResultEnd = {
   id: string;
   duration: number;
   status: reporterTypes.TestStatus;
   errors: reporterTypes.TestError[];
-  attachments: JsonAttachment[];
+  /** No longer emitted, but kept for backwards compatibility */
+  attachments?: JsonAttachment[];
+  annotations?: TestAnnotation[];
 };
 
 export type JsonTestStepStart = {
@@ -108,6 +111,14 @@ export type JsonTestStepEnd = {
   id: string;
   duration: number;
   error?: reporterTypes.TestError;
+  attachments?: number[]; // index of JsonTestResultEnd.attachments
+  annotations?: TestAnnotation[];
+};
+
+export type JsonTestResultOnAttach = {
+  testId: string;
+  resultId: string;
+  attachments: JsonAttachment[];
 };
 
 export type JsonFullResult = {
@@ -116,9 +127,109 @@ export type JsonFullResult = {
   duration: number;
 };
 
-export type JsonEvent = {
-  method: string;
-  params: any
+export type JsonEvent = JsonOnConfigureEvent | JsonOnBlobReportMetadataEvent | JsonOnEndEvent | JsonOnExitEvent | JsonOnProjectEvent | JsonOnBeginEvent | JsonOnTestBeginEvent
+  | JsonOnTestEndEvent | JsonOnStepBeginEvent | JsonOnStepEndEvent | JsonOnAttachEvent | JsonOnErrorEvent | JsonOnStdIOEvent;
+
+export type JsonOnConfigureEvent = {
+  method: 'onConfigure';
+  params: {
+    config: JsonConfig;
+  };
+};
+
+export type JsonOnBlobReportMetadataEvent = {
+  method: 'onBlobReportMetadata';
+  params: BlobReportMetadata;
+};
+
+export type JsonOnProjectEvent = {
+  method: 'onProject';
+  params: {
+    project: JsonProject;
+  };
+};
+
+export type JsonOnBeginEvent = {
+  method: 'onBegin';
+  params: undefined;
+};
+
+export type JsonOnTestBeginEvent = {
+  method: 'onTestBegin';
+  params: {
+    testId: string;
+    result: JsonTestResultStart;
+  };
+};
+
+export type JsonOnTestEndEvent = {
+  method: 'onTestEnd';
+  params: {
+    test: JsonTestEnd;
+    testId?: string;
+    result: JsonTestResultEnd;
+  };
+};
+
+export type JsonOnStepBeginEvent = {
+  method: 'onStepBegin';
+  params: {
+    testId: string;
+    resultId: string;
+    step: JsonTestStepStart;
+  };
+};
+
+export type JsonOnStepEndEvent = {
+  method: 'onStepEnd';
+  params: {
+    testId: string;
+    resultId: string;
+    step: JsonTestStepEnd;
+  };
+};
+
+export type JsonOnAttachEvent = {
+  method: 'onAttach';
+  params: JsonTestResultOnAttach;
+};
+
+export type JsonOnErrorEvent = {
+  method: 'onError';
+  params: {
+    error: reporterTypes.TestError;
+  };
+};
+
+export type JsonOnStdIOEvent = {
+  method: 'onStdIO';
+  params: {
+    type: JsonStdIOType;
+    testId?: string;
+    resultId?: string;
+    data: string;
+    isBase64: boolean;
+  };
+};
+
+export type JsonOnEndEvent = {
+  method: 'onEnd';
+  params: {
+    result: JsonFullResult;
+  };
+};
+
+export type JsonOnExitEvent = {
+  method: 'onExit';
+  params: undefined;
+};
+
+export type BlobReportMetadata = {
+  version: number;
+  userAgent: string;
+  name?: string;
+  shard?: { total: number, current: number };
+  pathSeparator?: string;
 };
 
 type TeleReporterReceiverOptions = {
@@ -133,12 +244,12 @@ export class TeleReporterReceiver {
   public isListing = false;
   private _rootSuite: TeleSuite;
   private _options: TeleReporterReceiverOptions;
-  private _reporter: Partial<ReporterV2>;
+  private _reporter: ReporterV2;
   private _tests = new Map<string, TeleTestCase>();
   private _rootDir!: string;
   private _config!: reporterTypes.FullConfig;
 
-  constructor(reporter: Partial<ReporterV2>, options: TeleReporterReceiverOptions = {}) {
+  constructor(reporter: ReporterV2, options: TeleReporterReceiverOptions = {}) {
     this._rootSuite = new TeleSuite('', 'root');
     this._options = options;
     this._reporter = reporter;
@@ -175,6 +286,10 @@ export class TeleReporterReceiver {
       this._onStepBegin(params.testId, params.resultId, params.step);
       return;
     }
+    if (method === 'onAttach') {
+      this._onAttach(params.testId, params.resultId, params.attachments);
+      return;
+    }
     if (method === 'onStepEnd') {
       this._onStepEnd(params.testId, params.resultId, params.step);
       return;
@@ -231,13 +346,19 @@ export class TeleReporterReceiver {
     const test = this._tests.get(testEndPayload.testId)!;
     test.timeout = testEndPayload.timeout;
     test.expectedStatus = testEndPayload.expectedStatus;
-    test.annotations = testEndPayload.annotations;
     const result = test.results.find(r => r._id === payload.id)!;
     result.duration = payload.duration;
     result.status = payload.status;
     result.errors = payload.errors;
     result.error = result.errors?.[0];
-    result.attachments = this._parseAttachments(payload.attachments);
+    // Attachments are only present here from legacy blobs. These override all _onAttach events
+    if (!!payload.attachments)
+      result.attachments = this._parseAttachments(payload.attachments);
+    if (payload.annotations) {
+      this._absoluteAnnotationLocationsInplace(payload.annotations);
+      result.annotations = payload.annotations;
+      test.annotations = payload.annotations;
+    }
     this._reporter.onTestEnd?.(test, result);
     // Free up the memory as won't see these step ids.
     result._stepMap = new Map();
@@ -249,7 +370,7 @@ export class TeleReporterReceiver {
     const parentStep = payload.parentStepId ? result._stepMap.get(payload.parentStepId) : undefined;
 
     const location = this._absoluteLocation(payload.location);
-    const step = new TeleTestStep(payload, parentStep, location);
+    const step = new TeleTestStep(payload, parentStep, location, result);
     if (parentStep)
       parentStep.steps.push(step);
     else
@@ -262,11 +383,23 @@ export class TeleReporterReceiver {
     const test = this._tests.get(testId)!;
     const result = test.results.find(r => r._id === resultId)!;
     const step = result._stepMap.get(payload.id)!;
+    step._endPayload = payload;
     step.duration = payload.duration;
     step.error = payload.error;
     this._reporter.onStepEnd?.(test, result, step);
   }
 
+  private _onAttach(testId: string, resultId: string, attachments: JsonAttachment[]) {
+    const test = this._tests.get(testId)!;
+    const result = test.results.find(r => r._id === resultId)!;
+    result.attachments.push(...attachments.map(a => ({
+      name: a.name,
+      contentType: a.contentType,
+      path: a.path,
+      body: a.base64 && (globalThis as any).Buffer ? Buffer.from(a.base64, 'base64') : undefined,
+    })));
+  }
+
   private _onError(error: reporterTypes.TestError) {
     this._reporter.onError?.(error);
   }
@@ -323,7 +456,7 @@ export class TeleReporterReceiver {
       dependencies: project.dependencies,
       teardown: project.teardown,
       snapshotDir: this._absolutePath(project.snapshotDir),
-      use: {},
+      use: project.use,
     };
   }
 
@@ -367,9 +500,17 @@ export class TeleReporterReceiver {
     test.retries = payload.retries;
     test.tags = payload.tags ?? [];
     test.annotations = payload.annotations ?? [];
+    this._absoluteAnnotationLocationsInplace(test.annotations);
     return test;
   }
 
+  private _absoluteAnnotationLocationsInplace(annotations: TestAnnotation[]) {
+    for (const annotation of annotations) {
+      if (annotation.location)
+        annotation.location = this._absoluteLocation(annotation.location);
+    }
+  }
+
   private _absoluteLocation(location: reporterTypes.Location): reporterTypes.Location;
   private _absoluteLocation(location?: reporterTypes.Location): reporterTypes.Location | undefined;
   private _absoluteLocation(location: reporterTypes.Location | undefined): reporterTypes.Location | undefined {
@@ -470,7 +611,7 @@ export class TeleTestCase implements reporterTypes.TestCase {
 
   expectedStatus: reporterTypes.TestStatus = 'passed';
   timeout = 0;
-  annotations: Annotation[] = [];
+  annotations: TestAnnotation[] = [];
   retries = 0;
   tags: string[] = [];
   repeatEachIndex = 0;
@@ -512,15 +653,20 @@ class TeleTestStep implements reporterTypes.TestStep {
   parent: reporterTypes.TestStep | undefined;
   duration: number = -1;
   steps: reporterTypes.TestStep[] = [];
+  error: reporterTypes.TestError | undefined;
+
+  private _result: TeleTestResult;
+  _endPayload?: JsonTestStepEnd;
 
   private _startTime: number = 0;
 
-  constructor(payload: JsonTestStepStart, parentStep: reporterTypes.TestStep | undefined, location: reporterTypes.Location | undefined) {
+  constructor(payload: JsonTestStepStart, parentStep: reporterTypes.TestStep | undefined, location: reporterTypes.Location | undefined, result: TeleTestResult) {
     this.title = payload.title;
     this.category = payload.category;
     this.location = location;
     this.parent = parentStep;
     this._startTime = payload.startTime;
+    this._result = result;
   }
 
   titlePath() {
@@ -535,6 +681,14 @@ class TeleTestStep implements reporterTypes.TestStep {
   set startTime(value: Date) {
     this._startTime = +value;
   }
+
+  get attachments() {
+    return this._endPayload?.attachments?.map(index => this._result.attachments[index]) ?? [];
+  }
+
+  get annotations() {
+    return this._endPayload?.annotations ?? [];
+  }
 }
 
 export class TeleTestResult implements reporterTypes.TestResult {
@@ -545,12 +699,13 @@ export class TeleTestResult implements reporterTypes.TestResult {
   stdout: reporterTypes.TestResult['stdout'] = [];
   stderr: reporterTypes.TestResult['stderr'] = [];
   attachments: reporterTypes.TestResult['attachments'] = [];
+  annotations: reporterTypes.TestResult['annotations'] = [];
   status: reporterTypes.TestStatus = 'skipped';
   steps: TeleTestStep[] = [];
   errors: reporterTypes.TestResult['errors'] = [];
   error: reporterTypes.TestResult['error'];
 
-  _stepMap: Map<string, reporterTypes.TestStep> = new Map();
+  _stepMap = new Map<string, TeleTestStep>();
   _id: string;
 
   private _startTime: number = 0;
@@ -588,12 +743,13 @@ export const baseFullConfig: reporterTypes.FullConfig = {
   preserveOutput: 'always',
   projects: [],
   reporter: [[process.env.CI ? 'dot' : 'list']],
-  reportSlowTests: { max: 5, threshold: 15000 },
+  reportSlowTests: { max: 5, threshold: 300_000 /* 5 minutes */ },
   configFile: '',
   rootDir: '',
   quiet: false,
   shard: null,
   updateSnapshots: 'missing',
+  updateSourceMethod: 'patch',
   version: '',
   workers: 0,
   webServer: null,
diff --git a/packages/trace-viewer/src/ui/teleSuiteUpdater.ts b/packages/playwright/src/isomorphic/teleSuiteUpdater.ts
similarity index 84%
rename from packages/trace-viewer/src/ui/teleSuiteUpdater.ts
rename to packages/playwright/src/isomorphic/teleSuiteUpdater.ts
index 0d448ea172364..7c4c14fae7395 100644
--- a/packages/trace-viewer/src/ui/teleSuiteUpdater.ts
+++ b/packages/playwright/src/isomorphic/teleSuiteUpdater.ts
@@ -14,11 +14,25 @@
  * limitations under the License.
  */
 
-import { TeleReporterReceiver, TeleSuite } from '@testIsomorphic/teleReceiver';
-import { statusEx } from '@testIsomorphic/testTree';
-import type { ReporterV2 } from 'playwright/src/reporters/reporterV2';
-import type * as reporterTypes from 'playwright/types/testReporter';
-import type { Progress, TestModel } from './uiModeModel';
+import { TeleReporterReceiver, TeleSuite } from './teleReceiver';
+import { statusEx } from './testTree';
+
+import type * as reporterTypes from '../../types/testReporter';
+import type { ReporterV2 } from '../reporters/reporterV2';
+
+export type TeleSuiteUpdaterProgress = {
+  total: number;
+  passed: number;
+  failed: number;
+  skipped: number;
+};
+
+export type TeleSuiteUpdaterTestModel = {
+  config: reporterTypes.FullConfig;
+  rootSuite: reporterTypes.Suite;
+  loadErrors: reporterTypes.TestError[];
+  progress: TeleSuiteUpdaterProgress;
+};
 
 export type TeleSuiteUpdaterOptions = {
   onUpdate: (force?: boolean) => void,
@@ -30,7 +44,7 @@ export class TeleSuiteUpdater {
   rootSuite: TeleSuite | undefined;
   config: reporterTypes.FullConfig | undefined;
   readonly loadErrors: reporterTypes.TestError[] = [];
-  readonly progress: Progress = {
+  readonly progress: TeleSuiteUpdaterProgress = {
     total: 0,
     passed: 0,
     failed: 0,
@@ -64,6 +78,7 @@ export class TeleSuiteUpdater {
         // To work around that, have a dedicated per-run receiver that will only have
         // suite for a single test run, and hence will have correct total.
         this._lastRunReceiver = new TeleReporterReceiver({
+          version: () => 'v2',
           onBegin: (suite: reporterTypes.Suite) => {
             this._lastRunTestCount = suite.allTests().length;
             this._lastRunReceiver = undefined;
@@ -114,27 +129,20 @@ export class TeleSuiteUpdater {
 
       onError: (error: reporterTypes.TestError) => this._handleOnError(error),
 
-      printsToStdio: () => {
-        return false;
-      },
-
-      onStdOut: () => {},
-      onStdErr: () => {},
-      onExit: () => {},
-      onStepBegin: () => {},
-      onStepEnd: () => {},
+      printsToStdio: () => false,
     };
   }
 
   processGlobalReport(report: any[]) {
     const receiver = new TeleReporterReceiver({
+      version: () => 'v2',
       onConfigure: (c: reporterTypes.FullConfig) => {
         this.config = c;
       },
       onError: (error: reporterTypes.TestError) => this._handleOnError(error)
     });
     for (const message of report)
-      receiver.dispatch(message);
+      void receiver.dispatch(message);
   }
 
   processListReport(report: any[]) {
@@ -144,14 +152,14 @@ export class TeleSuiteUpdater {
     this._testResultsSnapshot = new Map(tests.map(test => [test.id, test.results]));
     this._receiver.reset();
     for (const message of report)
-      this._receiver.dispatch(message);
+      void this._receiver.dispatch(message);
   }
 
   processTestReportEvent(message: any) {
     // The order of receiver dispatches matters here, we want to assign `lastRunTestCount`
     // before we use it.
-    this._lastRunReceiver?.dispatch(message)?.catch(() => {});
-    this._receiver.dispatch(message)?.catch(() => {});
+    this._lastRunReceiver?.dispatch(message)?.catch(() => { });
+    this._receiver.dispatch(message)?.catch(() => { });
   }
 
   private _handleOnError(error: reporterTypes.TestError) {
@@ -160,7 +168,7 @@ export class TeleSuiteUpdater {
     this._options.onUpdate();
   }
 
-  asModel(): TestModel {
+  asModel(): TeleSuiteUpdaterTestModel {
     return {
       rootSuite: this.rootSuite || new TeleSuite('', 'root'),
       config: this.config!,
diff --git a/packages/playwright/src/isomorphic/testServerConnection.ts b/packages/playwright/src/isomorphic/testServerConnection.ts
index 156af26e8cd9b..76c383bd36f76 100644
--- a/packages/playwright/src/isomorphic/testServerConnection.ts
+++ b/packages/playwright/src/isomorphic/testServerConnection.ts
@@ -14,43 +14,87 @@
  * limitations under the License.
  */
 
-import type { TestServerInterface, TestServerInterfaceEvents } from '@testIsomorphic/testServerInterface';
 import * as events from './events';
 
+import type { TestServerInterface, TestServerInterfaceEvents } from '@testIsomorphic/testServerInterface';
+import type * as reporterTypes from '../../types/testReporter';
+
 // -- Reuse boundary -- Everything below this line is reused in the vscode extension.
 
+export interface TestServerTransport {
+  onmessage(listener: (message: string) => void): void;
+  onopen(listener: () => void): void;
+  onerror(listener: () => void): void;
+  onclose(listener: () => void): void;
+
+  send(data: string): void;
+  close(): void;
+}
+
+export class WebSocketTestServerTransport implements TestServerTransport {
+  private _ws: WebSocket;
+
+  constructor(url: string | URL) {
+    this._ws = new WebSocket(url);
+  }
+
+  onmessage(listener: (message: string) => void) {
+    this._ws.addEventListener('message', event => listener(event.data.toString()));
+  }
+
+  onopen(listener: () => void) {
+    this._ws.addEventListener('open', listener);
+  }
+
+  onerror(listener: () => void) {
+    this._ws.addEventListener('error', listener);
+  }
+
+  onclose(listener: () => void) {
+    this._ws.addEventListener('close', listener);
+  }
+
+  send(data: string) {
+    this._ws.send(data);
+  }
+
+  close() {
+    this._ws.close();
+  }
+}
+
 export class TestServerConnection implements TestServerInterface, TestServerInterfaceEvents {
   readonly onClose: events.Event<void>;
   readonly onReport: events.Event<any>;
   readonly onStdio: events.Event<{ type: 'stderr' | 'stdout'; text?: string | undefined; buffer?: string | undefined; }>;
-  readonly onListChanged: events.Event<void>;
   readonly onTestFilesChanged: events.Event<{ testFiles: string[] }>;
   readonly onLoadTraceRequested: events.Event<{ traceUrl: string }>;
+  readonly onRecoverFromStepError: events.Event<{ stepId: string, message: string, location: reporterTypes.Location }>;
 
   private _onCloseEmitter = new events.EventEmitter<void>();
   private _onReportEmitter = new events.EventEmitter<any>();
   private _onStdioEmitter = new events.EventEmitter<{ type: 'stderr' | 'stdout'; text?: string | undefined; buffer?: string | undefined; }>();
-  private _onListChangedEmitter = new events.EventEmitter<void>();
   private _onTestFilesChangedEmitter = new events.EventEmitter<{ testFiles: string[] }>();
   private _onLoadTraceRequestedEmitter = new events.EventEmitter<{ traceUrl: string }>();
+  private _onRecoverFromStepErrorEmitter = new events.EventEmitter<{ stepId: string, message: string, location: reporterTypes.Location }>();
 
   private _lastId = 0;
-  private _ws: WebSocket;
+  private _transport: TestServerTransport;
   private _callbacks = new Map<number, { resolve: (arg: any) => void, reject: (arg: Error) => void }>();
   private _connectedPromise: Promise<void>;
   private _isClosed = false;
 
-  constructor(wsURL: string) {
+  constructor(transport: TestServerTransport) {
     this.onClose = this._onCloseEmitter.event;
     this.onReport = this._onReportEmitter.event;
     this.onStdio = this._onStdioEmitter.event;
-    this.onListChanged = this._onListChangedEmitter.event;
     this.onTestFilesChanged = this._onTestFilesChangedEmitter.event;
     this.onLoadTraceRequested = this._onLoadTraceRequestedEmitter.event;
+    this.onRecoverFromStepError = this._onRecoverFromStepErrorEmitter.event;
 
-    this._ws = new WebSocket(wsURL);
-    this._ws.addEventListener('message', event => {
-      const message = JSON.parse(String(event.data));
+    this._transport = transport;
+    this._transport.onmessage(data => {
+      const message = JSON.parse(data);
       const { id, result, error, method, params } = message;
       if (id) {
         const callback = this._callbacks.get(id);
@@ -65,12 +109,12 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
         this._dispatchEvent(method, params);
       }
     });
-    const pingInterval = setInterval(() => this._sendMessage('ping').catch(() => {}), 30000);
+    const pingInterval = setInterval(() => this._sendMessage('ping').catch(() => { }), 30000);
     this._connectedPromise = new Promise<void>((f, r) => {
-      this._ws.addEventListener('open', () => f());
-      this._ws.addEventListener('error', r);
+      this._transport.onopen(f);
+      this._transport.onerror(r);
     });
-    this._ws.addEventListener('close', () => {
+    this._transport.onclose(() => {
       this._isClosed = true;
       this._onCloseEmitter.fire();
       clearInterval(pingInterval);
@@ -88,14 +132,14 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
     await this._connectedPromise;
     const id = ++this._lastId;
     const message = { id, method, params };
-    this._ws.send(JSON.stringify(message));
+    this._transport.send(JSON.stringify(message));
     return new Promise((resolve, reject) => {
       this._callbacks.set(id, { resolve, reject });
     });
   }
 
   private _sendMessageNoReply(method: string, params?: any) {
-    this._sendMessage(method, params).catch(() => {});
+    this._sendMessage(method, params).catch(() => { });
   }
 
   private _dispatchEvent(method: string, params?: any) {
@@ -103,12 +147,12 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
       this._onReportEmitter.fire(params);
     else if (method === 'stdio')
       this._onStdioEmitter.fire(params);
-    else if (method === 'listChanged')
-      this._onListChangedEmitter.fire(params);
     else if (method === 'testFilesChanged')
       this._onTestFilesChangedEmitter.fire(params);
     else if (method === 'loadTraceRequested')
       this._onLoadTraceRequestedEmitter.fire(params);
+    else if (method === 'recoverFromStepError')
+      this._onRecoverFromStepErrorEmitter.fire(params);
   }
 
   async initialize(params: Parameters<TestServerInterface['initialize']>[0]): ReturnType<TestServerInterface['initialize']> {
@@ -203,9 +247,13 @@ export class TestServerConnection implements TestServerInterface, TestServerInte
     await this._sendMessage('closeGracefully', params);
   }
 
+  async resumeAfterStepError(params: Parameters<TestServerInterface['resumeAfterStepError']>[0]): Promise<void> {
+    await this._sendMessage('resumeAfterStepError', params);
+  }
+
   close() {
     try {
-      this._ws.close();
+      this._transport.close();
     } catch {
     }
   }
diff --git a/packages/playwright/src/isomorphic/testServerInterface.ts b/packages/playwright/src/isomorphic/testServerInterface.ts
index 08214ee723bb8..461b9230b5349 100644
--- a/packages/playwright/src/isomorphic/testServerInterface.ts
+++ b/packages/playwright/src/isomorphic/testServerInterface.ts
@@ -14,20 +14,28 @@
  * limitations under the License.
  */
 
-import type * as reporterTypes from '../../types/testReporter';
 import type { Event } from './events';
 import type { JsonEvent } from './teleReceiver';
+import type * as reporterTypes from '../../types/testReporter';
 
 // -- Reuse boundary -- Everything below this line is reused in the vscode extension.
 
 export type ReportEntry = JsonEvent;
 
+export type RecoverFromStepErrorResult = {
+  stepId: string;
+  status: 'recovered' | 'failed';
+  value?: string | number | boolean | undefined;
+};
+
 export interface TestServerInterface {
   initialize(params: {
     serializer?: string,
     closeOnDisconnect?: boolean,
     interceptStdio?: boolean,
     watchTestDirs?: boolean,
+    populateDependenciesOnList?: boolean,
+    recoverFromStepErrors?: boolean,
   }): Promise<void>;
 
   ping(params: {}): Promise<void>;
@@ -93,9 +101,8 @@ export interface TestServerInterface {
     testIds?: string[];
     headed?: boolean;
     workers?: number | string;
-    timeout?: number,
-    outputDir?: string;
-    updateSnapshots?: 'all' | 'none' | 'missing';
+    updateSnapshots?: 'all' | 'changed' | 'missing' | 'none';
+    updateSourceMethod?: 'overwrite' | 'patch' | '3way';
     reporters?: string[],
     trace?: 'on' | 'off';
     video?: 'on' | 'off';
@@ -113,12 +120,13 @@ export interface TestServerInterface {
   stopTests(params: {}): Promise<void>;
 
   closeGracefully(params: {}): Promise<void>;
+
+  resumeAfterStepError(params: RecoverFromStepErrorResult): Promise<void>;
 }
 
 export interface TestServerInterfaceEvents {
   onReport: Event<any>;
   onStdio: Event<{ type: 'stdout' | 'stderr', text?: string, buffer?: string }>;
-  onListChanged: Event<void>;
   onTestFilesChanged: Event<{ testFiles: string[] }>;
   onLoadTraceRequested: Event<{ traceUrl: string }>;
 }
@@ -126,7 +134,7 @@ export interface TestServerInterfaceEvents {
 export interface TestServerInterfaceEventEmitters {
   dispatchEvent(event: 'report', params: ReportEntry): void;
   dispatchEvent(event: 'stdio', params: { type: 'stdout' | 'stderr', text?: string, buffer?: string }): void;
-  dispatchEvent(event: 'listChanged', params: {}): void;
   dispatchEvent(event: 'testFilesChanged', params: { testFiles: string[] }): void;
   dispatchEvent(event: 'loadTraceRequested', params: { traceUrl: string }): void;
+  dispatchEvent(event: 'recoverFromStepError', params: { stepId: string, message: string, location: reporterTypes.Location }): void;
 }
diff --git a/packages/playwright/src/isomorphic/testTree.ts b/packages/playwright/src/isomorphic/testTree.ts
index 7a9ddc3668141..6f38a99588389 100644
--- a/packages/playwright/src/isomorphic/testTree.ts
+++ b/packages/playwright/src/isomorphic/testTree.ts
@@ -79,14 +79,19 @@ export class TestTree {
 
     const visitSuite = (project: reporterTypes.FullProject, parentSuite: reporterTypes.Suite, parentGroup: GroupItem) => {
       for (const suite of parentSuite.suites) {
-        const title = suite.title || '<anonymous>';
-        let group = parentGroup.children.find(item => item.kind === 'group' && item.title === title) as GroupItem | undefined;
+        if (!suite.title) {
+          // Flatten anonymous describes.
+          visitSuite(project, suite, parentGroup);
+          continue;
+        }
+
+        let group = parentGroup.children.find(item => item.kind === 'group' && item.title === suite.title) as GroupItem | undefined;
         if (!group) {
           group = {
             kind: 'group',
             subKind: 'describe',
-            id: 'suite:' + parentSuite.titlePath().join('\x1e') + '\x1e' + title,  // account for anonymous suites
-            title,
+            id: 'suite:' + parentSuite.titlePath().join('\x1e') + '\x1e' + suite.title,  // account for anonymous suites
+            title: suite.title,
             location: suite.location!,
             duration: 0,
             parent: parentGroup,
diff --git a/packages/playwright/src/transform/esmUtils.ts b/packages/playwright/src/isomorphic/types.d.ts
similarity index 52%
rename from packages/playwright/src/transform/esmUtils.ts
rename to packages/playwright/src/isomorphic/types.d.ts
index 31851f61d3567..5f31b925a2e3f 100644
--- a/packages/playwright/src/transform/esmUtils.ts
+++ b/packages/playwright/src/isomorphic/types.d.ts
@@ -14,20 +14,36 @@
  * limitations under the License.
  */
 
-import url from 'url';
+export type GitCommitInfo = {
+  shortHash: string;
+  hash: string;
+  subject: string;
+  body: string;
+  author: {
+    name: string;
+    email: string;
+    time: number;
+  };
+  committer: {
+    name: string;
+    email: string
+    time: number;
+  };
+  branch: string;
+};
 
-const kExperimentalLoaderOptions = [
-  '--no-warnings',
-  `--experimental-loader=${url.pathToFileURL(require.resolve('playwright/lib/transform/esmLoader')).toString()}`,
-];
+export type CIInfo = {
+  commitHref: string;
+  prHref?: string;
+  prTitle?: string;
+  prBaseHash?: string;
+  buildHref?: string;
+  commitHash?: string;
+  branch?: string;
+};
 
-export function execArgvWithExperimentalLoaderOptions() {
-  return [
-    ...process.execArgv,
-    ...kExperimentalLoaderOptions,
-  ];
-}
-
-export function execArgvWithoutExperimentalLoaderOptions() {
-  return process.execArgv.filter(arg => !kExperimentalLoaderOptions.includes(arg));
-}
+export type MetadataWithCommitInfo = {
+  ci?: CIInfo;
+  gitCommit?: GitCommitInfo;
+  gitDiff?: string;
+};
diff --git a/packages/playwright/src/loader/loaderMain.ts b/packages/playwright/src/loader/loaderMain.ts
index 97befeea9d7c7..50bd380c7c376 100644
--- a/packages/playwright/src/loader/loaderMain.ts
+++ b/packages/playwright/src/loader/loaderMain.ts
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-import type { SerializedConfig } from '../common/ipc';
 import { deserializeConfig } from '../common/configLoader';
+import { incorporateCompilationCache } from '../common/esmLoaderHost';
+import { PoolBuilder } from '../common/poolBuilder';
 import { ProcessRunner } from '../common/process';
-import type { FullConfigInternal } from '../common/config';
 import { loadTestFile } from '../common/testLoader';
-import type { TestError } from '../../types/testReporter';
 import { serializeCompilationCache } from '../transform/compilationCache';
-import { PoolBuilder } from '../common/poolBuilder';
-import { incorporateCompilationCache } from '../common/esmLoaderHost';
+
+import type { TestError } from '../../types/testReporter';
+import type { FullConfigInternal } from '../common/config';
+import type { SerializedConfig } from '../common/ipc';
 
 export class LoaderMain extends ProcessRunner {
   private _serializedConfig: SerializedConfig;
diff --git a/packages/playwright/src/matchers/DEPS.list b/packages/playwright/src/matchers/DEPS.list
index 59b704628dfe0..de39c6b5453af 100644
--- a/packages/playwright/src/matchers/DEPS.list
+++ b/packages/playwright/src/matchers/DEPS.list
@@ -1,4 +1,5 @@
 [*]
 ../common/
 ../util.ts
+../utilsBundle.ts
 ../worker/testInfo.ts
diff --git a/packages/playwright/src/matchers/expect.ts b/packages/playwright/src/matchers/expect.ts
index 3e49360eb79c1..b6e3c0dc2eb92 100644
--- a/packages/playwright/src/matchers/expect.ts
+++ b/packages/playwright/src/matchers/expect.ts
@@ -16,9 +16,13 @@
 
 import {
   captureRawStack,
+  createGuid,
+  currentZone,
+  escapeWithQuotes,
   isString,
   pollAgainstDeadline } from 'playwright-core/lib/utils';
-import type { ExpectZone } from 'playwright-core/lib/utils';
+
+import { ExpectError, isJestError } from './matcherHint';
 import {
   toBeAttached,
   toBeChecked,
@@ -31,13 +35,15 @@ import {
   toBeInViewport,
   toBeOK,
   toBeVisible,
+  toContainClass,
   toContainText,
   toHaveAccessibleDescription,
+  toHaveAccessibleErrorMessage,
   toHaveAccessibleName,
   toHaveAttribute,
+  toHaveCSS,
   toHaveClass,
   toHaveCount,
-  toHaveCSS,
   toHaveId,
   toHaveJSProperty,
   toHaveRole,
@@ -48,19 +54,22 @@ import {
   toHaveValues,
   toPass
 } from './matchers';
-import { toMatchSnapshot, toHaveScreenshot, toHaveScreenshotStepTitle } from './toMatchSnapshot';
-import type { Expect, ExpectMatcherState } from '../../types/test';
-import { currentTestInfo } from '../common/globals';
-import { filteredStackTrace, trimLongString } from '../util';
+import { toMatchAriaSnapshot } from './toMatchAriaSnapshot';
+import { toHaveScreenshot, toHaveScreenshotStepTitle, toMatchSnapshot } from './toMatchSnapshot';
 import {
-  expect as expectLibrary,
   INVERTED_COLOR,
   RECEIVED_COLOR,
+  expect as expectLibrary,
   printReceived,
 } from '../common/expectBundle';
-import { zones } from 'playwright-core/lib/utils';
+import { currentTestInfo } from '../common/globals';
+import { filteredStackTrace } from '../util';
 import { TestInfoImpl } from '../worker/testInfo';
-import { ExpectError } from './matcherHint';
+
+import type { ExpectMatcherStateInternal } from './matchers';
+import type { Expect } from '../../types/test';
+import type { TestStepCategory, TestStepInfoImpl } from '../worker/testInfo';
+
 
 // #region
 // Mirrored from https://github.com/facebook/jest/blob/f13abff8df9a0e1148baf3584bcde6d1b479edc7/packages/expect/src/print.ts
@@ -104,46 +113,47 @@ export const printReceivedStringContainExpectedResult = (
 
 type ExpectMessage = string | { message?: string };
 
-function createMatchers(actual: unknown, info: ExpectMetaInfo): any {
-  return new Proxy(expectLibrary(actual), new ExpectMetaInfoProxyHandler(info));
+function createMatchers(actual: unknown, info: ExpectMetaInfo, prefix: string[]): any {
+  return new Proxy(expectLibrary(actual), new ExpectMetaInfoProxyHandler(info, prefix));
+}
+
+const userMatchersSymbol = Symbol('userMatchers');
+
+function qualifiedMatcherName(qualifier: string[], matcherName: string) {
+  return qualifier.join(':') + '$' + matcherName;
 }
 
-function createExpect(info: ExpectMetaInfo) {
+function createExpect(info: ExpectMetaInfo, prefix: string[], userMatchers: Record<string, Function>) {
   const expectInstance: Expect<{}> = new Proxy(expectLibrary, {
     apply: function(target: any, thisArg: any, argumentsList: [unknown, ExpectMessage?]) {
       const [actual, messageOrOptions] = argumentsList;
       const message = isString(messageOrOptions) ? messageOrOptions : messageOrOptions?.message || info.message;
       const newInfo = { ...info, message };
-      if (newInfo.isPoll) {
+      if (newInfo.poll) {
         if (typeof actual !== 'function')
           throw new Error('`expect.poll()` accepts only function as a first argument');
-        newInfo.generator = actual as any;
+        newInfo.poll.generator = actual as any;
       }
-      return createMatchers(actual, newInfo);
+      return createMatchers(actual, newInfo, prefix);
     },
 
-    get: function(target: any, property: string) {
+    get: function(target: any, property: string | typeof userMatchersSymbol) {
       if (property === 'configure')
         return configure;
 
       if (property === 'extend') {
         return (matchers: any) => {
+          const qualifier = [...prefix, createGuid()];
+
           const wrappedMatchers: any = {};
           for (const [name, matcher] of Object.entries(matchers)) {
-            wrappedMatchers[name] = function(...args: any[]) {
-              const { isNot, promise, utils } = this;
-              const newThis: ExpectMatcherState = {
-                isNot,
-                promise,
-                utils,
-                timeout: currentExpectTimeout()
-              };
-              (newThis as any).equals = throwUnsupportedExpectMatcherError;
-              return (matcher as any).call(newThis, ...args);
-            };
+            wrappedMatchers[name] = wrapPlaywrightMatcherToPassNiceThis(matcher);
+            const key = qualifiedMatcherName(qualifier, name);
+            wrappedMatchers[key] = wrappedMatchers[name];
+            Object.defineProperty(wrappedMatchers[key], 'name', { value: name });
           }
           expectLibrary.extend(wrappedMatchers);
-          return expectInstance;
+          return createExpect(info, qualifier, { ...userMatchers, ...matchers });
         };
       }
 
@@ -153,6 +163,9 @@ function createExpect(info: ExpectMetaInfo) {
         };
       }
 
+      if (property === userMatchersSymbol)
+        return userMatchers;
+
       if (property === 'poll') {
         return (actual: unknown, messageOrOptions?: ExpectMessage & { timeout?: number, intervals?: number[] }) => {
           const poll = isString(messageOrOptions) ? {} : messageOrOptions || {};
@@ -172,18 +185,61 @@ function createExpect(info: ExpectMetaInfo) {
     if ('soft' in configuration)
       newInfo.isSoft = configuration.soft;
     if ('_poll' in configuration) {
-      newInfo.isPoll = !!configuration._poll;
+      newInfo.poll = configuration._poll ? { ...info.poll, generator: () => {} } : undefined;
       if (typeof configuration._poll === 'object') {
-        newInfo.pollTimeout = configuration._poll.timeout;
-        newInfo.pollIntervals = configuration._poll.intervals;
+        newInfo.poll!.timeout = configuration._poll.timeout ?? newInfo.poll!.timeout;
+        newInfo.poll!.intervals = configuration._poll.intervals ?? newInfo.poll!.intervals;
       }
     }
-    return createExpect(newInfo);
+    return createExpect(newInfo, prefix, userMatchers);
   };
 
   return expectInstance;
 }
 
+// Expect wraps matchers, so there is no way to pass this information to the raw Playwright matcher.
+// Rely on sync call sequence to seed each matcher call with the context.
+type MatcherCallContext = {
+  expectInfo: ExpectMetaInfo;
+  testInfo: TestInfoImpl | null;
+  step?: TestStepInfoImpl;
+};
+
+let matcherCallContext: MatcherCallContext | undefined;
+
+function setMatcherCallContext(context: MatcherCallContext) {
+  matcherCallContext = context;
+}
+
+function takeMatcherCallContext(): MatcherCallContext | undefined {
+  try {
+    return matcherCallContext;
+  } finally {
+    // Any subsequent matcher following the first is assumed to be an unsupported legacy asymmetric matcher.
+    // Lacking call context in these scenarios is not particularly important.
+    matcherCallContext = undefined;
+  }
+}
+
+const defaultExpectTimeout = 5000;
+
+function wrapPlaywrightMatcherToPassNiceThis(matcher: any) {
+  return function(this: any, ...args: any[]) {
+    const { isNot, promise, utils } = this;
+    const context = takeMatcherCallContext();
+    const timeout = context?.expectInfo.timeout ?? context?.testInfo?._projectInternal?.expect?.timeout ?? defaultExpectTimeout;
+    const newThis: ExpectMatcherStateInternal = {
+      isNot,
+      promise,
+      utils,
+      timeout,
+      _stepInfo: context?.step,
+    };
+    (newThis as any).equals = throwUnsupportedExpectMatcherError;
+    return matcher.call(newThis, ...args);
+  };
+}
+
 function throwUnsupportedExpectMatcherError() {
   throw new Error('It looks like you are using custom expect matchers that are not compatible with Playwright. See https://aka.ms/playwright/expect-compatibility');
 }
@@ -203,8 +259,10 @@ const customAsyncMatchers = {
   toBeOK,
   toBeVisible,
   toContainText,
+  toContainClass,
   toHaveAccessibleDescription,
   toHaveAccessibleName,
+  toHaveAccessibleErrorMessage,
   toHaveAttribute,
   toHaveClass,
   toHaveCount,
@@ -218,6 +276,7 @@ const customAsyncMatchers = {
   toHaveValue,
   toHaveValues,
   toHaveScreenshot,
+  toMatchAriaSnapshot,
   toPass,
 };
 
@@ -232,24 +291,38 @@ type ExpectMetaInfo = {
   message?: string;
   isNot?: boolean;
   isSoft?: boolean;
-  isPoll?: boolean;
+  poll?: {
+    timeout?: number;
+    intervals?: number[];
+    generator: Generator;
+  };
   timeout?: number;
-  pollTimeout?: number;
-  pollIntervals?: number[];
-  generator?: Generator;
 };
 
 class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
   private _info: ExpectMetaInfo;
+  private _prefix: string[];
 
-  constructor(info: ExpectMetaInfo) {
+  constructor(info: ExpectMetaInfo, prefix: string[]) {
     this._info = { ...info };
+    this._prefix = prefix;
   }
 
   get(target: Object, matcherName: string | symbol, receiver: any): any {
     let matcher = Reflect.get(target, matcherName, receiver);
     if (typeof matcherName !== 'string')
       return matcher;
+
+    let resolvedMatcherName = matcherName;
+    for (let i = this._prefix.length; i > 0; i--) {
+      const qualifiedName = qualifiedMatcherName(this._prefix.slice(0, i), matcherName);
+      if (Reflect.has(target, qualifiedName)) {
+        matcher = Reflect.get(target, qualifiedName, receiver);
+        resolvedMatcherName = qualifiedName;
+        break;
+      }
+    }
+
     if (matcher === undefined)
       throw new Error(`expect: Property '${matcherName}' not found.`);
     if (typeof matcher !== 'function') {
@@ -257,45 +330,72 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
         this._info.isNot = !this._info.isNot;
       return new Proxy(matcher, this);
     }
-    if (this._info.isPoll) {
+    if (this._info.poll) {
       if ((customAsyncMatchers as any)[matcherName] || matcherName === 'resolves' || matcherName === 'rejects')
         throw new Error(`\`expect.poll()\` does not support "${matcherName}" matcher.`);
-      matcher = (...args: any[]) => pollMatcher(matcherName, !!this._info.isNot, this._info.pollIntervals, this._info.pollTimeout ?? currentExpectTimeout(), this._info.generator!, ...args);
+      matcher = (...args: any[]) => pollMatcher(resolvedMatcherName, this._info, this._prefix, ...args);
     }
     return (...args: any[]) => {
       const testInfo = currentTestInfo();
-      // We assume that the matcher will read the current expect timeout the first thing.
-      setCurrentExpectConfigureTimeout(this._info.timeout);
+      setMatcherCallContext({ expectInfo: this._info, testInfo });
       if (!testInfo)
         return matcher.call(target, ...args);
 
       const customMessage = this._info.message || '';
       const argsSuffix = computeArgsSuffix(matcherName, args);
 
-      const defaultTitle = `expect${this._info.isPoll ? '.poll' : ''}${this._info.isSoft ? '.soft' : ''}${this._info.isNot ? '.not' : ''}.${matcherName}${argsSuffix}`;
-      const title = customMessage || defaultTitle;
+      const defaultTitle = `${this._info.poll ? 'poll ' : ''}${this._info.isSoft ? 'soft ' : ''}${this._info.isNot ? 'not ' : ''}${matcherName}${argsSuffix}`;
+      const title = customMessage || `Expect ${escapeWithQuotes(defaultTitle, '"')}`;
+      const apiName = `expect${this._info.poll ? '.poll ' : ''}${this._info.isSoft ? '.soft ' : ''}${this._info.isNot ? '.not' : ''}.${matcherName}${argsSuffix}`;
 
       // This looks like it is unnecessary, but it isn't - we need to filter
       // out all the frames that belong to the test runner from caught runtime errors.
       const stackFrames = filteredStackTrace(captureRawStack());
+      const category = matcherName === 'toPass' || this._info.poll ? 'test.step' : 'expect' as TestStepCategory;
 
-      // Enclose toPass in a step to maintain async stacks, toPass matcher is always async.
+      // toPass and poll matchers can contain other steps, expects and API calls,
+      // so they behave like a retriable step.
       const stepInfo = {
-        category: 'expect',
-        title: trimLongString(title, 1024),
+        category,
+        apiName,
+        title,
         params: args[0] ? { expected: args[0] } : undefined,
         infectParentStepsWithError: this._info.isSoft,
       };
 
       const step = testInfo._addStep(stepInfo);
 
-      const reportStepError = (jestError: ExpectError) => {
-        const error = new ExpectError(jestError, customMessage, stackFrames);
+      const reportStepError = (isAsync: boolean, e: Error | unknown) => {
+        const jestError = isJestError(e) ? e : null;
+        const expectError = jestError ? new ExpectError(jestError, customMessage, stackFrames) : undefined;
+        if (jestError?.matcherResult.suggestedRebaseline) {
+          // NOTE: this is a workaround for the fact that we can't pass the suggested rebaseline
+          // for passing matchers. See toMatchAriaSnapshot for a counterpart.
+          step.complete({ suggestedRebaseline: jestError?.matcherResult.suggestedRebaseline });
+          return;
+        }
+
+        const error = expectError ?? e;
         step.complete({ error });
-        if (this._info.isSoft)
-          testInfo._failWithError(error);
-        else
-          throw error;
+
+        if (!isAsync || !expectError) {
+          if (this._info.isSoft)
+            testInfo._failWithError(error);
+          else
+            throw error;
+          return;
+        }
+
+        // Recoverable async failure.
+        return (async () => {
+          const recoveryResult = await step.recoverFromStepError(expectError);
+          if (recoveryResult.status === 'recovered')
+            return recoveryResult.value as any;
+          if (this._info.isSoft)
+            testInfo._failWithError(expectError);
+          else
+            throw expectError;
+        })();
       };
 
       const finalizer = () => {
@@ -303,42 +403,46 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
       };
 
       try {
+        setMatcherCallContext({ expectInfo: this._info, testInfo, step: step.info });
         const callback = () => matcher.call(target, ...args);
-        // toPass and poll matchers can contain other steps, expects and API calls,
-        // so they behave like a retriable step.
-        const result = (matcherName === 'toPass' || this._info.isPoll) ?
-          zones.run('stepZone', step, callback) :
-          zones.run<ExpectZone, any>('expectZone', { title, stepId: step.stepId }, callback);
+        const result = currentZone().with('stepZone', step).run(callback);
         if (result instanceof Promise)
-          return result.then(finalizer).catch(reportStepError);
+          return result.then(finalizer).catch(reportStepError.bind(null, true));
         finalizer();
         return result;
       } catch (e) {
-        reportStepError(e);
+        void reportStepError(false, e);
       }
     };
   }
 }
 
-async function pollMatcher(matcherName: any, isNot: boolean, pollIntervals: number[] | undefined, timeout: number, generator: () => any, ...args: any[]) {
+async function pollMatcher(qualifiedMatcherName: string, info: ExpectMetaInfo, prefix: string[], ...args: any[]) {
   const testInfo = currentTestInfo();
+  const poll = info.poll!;
+  const timeout = poll.timeout ?? info.timeout ?? testInfo?._projectInternal?.expect?.timeout ?? defaultExpectTimeout;
   const { deadline, timeoutMessage } = testInfo ? testInfo._deadlineForMatcher(timeout) : TestInfoImpl._defaultDeadlineForMatcher(timeout);
 
   const result = await pollAgainstDeadline<Error|undefined>(async () => {
     if (testInfo && currentTestInfo() !== testInfo)
       return { continuePolling: false, result: undefined };
 
-    const value = await generator();
-    let expectInstance = expectLibrary(value) as any;
-    if (isNot)
-      expectInstance = expectInstance.not;
+    const innerInfo: ExpectMetaInfo = {
+      ...info,
+      isSoft: false, // soft is outside of poll, not inside
+      poll: undefined,
+    };
+    const value = await poll.generator();
     try {
-      expectInstance[matcherName].call(expectInstance, ...args);
+      let matchers = createMatchers(value, innerInfo, prefix);
+      if (info.isNot)
+        matchers = matchers.not;
+      matchers[qualifiedMatcherName](...args);
       return { continuePolling: false, result: undefined };
     } catch (error) {
       return { continuePolling: true, result: error };
     }
-  }, deadline, pollIntervals ?? [100, 250, 500, 1000]);
+  }, deadline, poll.intervals ?? [100, 250, 500, 1000]);
 
   if (result.timedOut) {
     const message = result.result ? [
@@ -352,22 +456,6 @@ async function pollMatcher(matcherName: any, isNot: boolean, pollIntervals: numb
   }
 }
 
-let currentExpectConfigureTimeout: number | undefined;
-
-function setCurrentExpectConfigureTimeout(timeout: number | undefined) {
-  currentExpectConfigureTimeout = timeout;
-}
-
-function currentExpectTimeout() {
-  if (currentExpectConfigureTimeout !== undefined)
-    return currentExpectConfigureTimeout;
-  const testInfo = currentTestInfo();
-  let defaultExpectTimeout = testInfo?._projectInternal?.expect?.timeout;
-  if (typeof defaultExpectTimeout === 'undefined')
-    defaultExpectTimeout = 5000;
-  return defaultExpectTimeout;
-}
-
 function computeArgsSuffix(matcherName: string, args: any[]) {
   let value = '';
   if (matcherName === 'toHaveScreenshot')
@@ -375,8 +463,15 @@ function computeArgsSuffix(matcherName: string, args: any[]) {
   return value ? `(${value})` : '';
 }
 
-export const expect: Expect<{}> = createExpect({}).extend(customMatchers);
+export const expect: Expect<{}> = createExpect({}, [], {}).extend(customMatchers);
 
 export function mergeExpects(...expects: any[]) {
-  return expect;
+  let merged = expect;
+  for (const e of expects) {
+    const internals = e[userMatchersSymbol];
+    if (!internals) // non-playwright expects mutate the global expect, so we don't need to do anything special
+      continue;
+    merged = merged.extend(internals);
+  }
+  return merged;
 }
diff --git a/packages/playwright/src/matchers/matcherHint.ts b/packages/playwright/src/matchers/matcherHint.ts
index e8aba2bbffa52..0505f0676caaf 100644
--- a/packages/playwright/src/matchers/matcherHint.ts
+++ b/packages/playwright/src/matchers/matcherHint.ts
@@ -14,45 +14,50 @@
  * limitations under the License.
  */
 
-import { colors } from 'playwright-core/lib/utilsBundle';
+import { stringifyStackFrames } from 'playwright-core/lib/utils';
+
 import type { ExpectMatcherState } from '../../types/test';
-import type { Locator } from 'playwright-core';
 import type { StackFrame } from '@protocol/channels';
-import { stringifyStackFrames } from 'playwright-core/lib/utils';
+import type { Locator } from 'playwright-core';
 
 export const kNoElementsFoundError = '<element(s) not found>';
 
-export function matcherHint(state: ExpectMatcherState, locator: Locator | undefined, matcherName: string, expression: any, actual: any, matcherOptions: any, timeout?: number) {
-  let header = state.utils.matcherHint(matcherName, expression, actual, matcherOptions).replace(/ \/\/ deep equality/, '') + '\n\n';
-  if (timeout)
-    header = colors.red(`Timed out ${timeout}ms waiting for `) + header;
+export function matcherHint(state: ExpectMatcherState, locator: Locator | undefined, matcherName: string, expression: any, actual: any, matcherOptions: any, timeout: number | undefined, expectedReceivedString?: string, preventExtraStatIndent: boolean = false) {
+  let header = state.utils.matcherHint(matcherName, expression, actual, matcherOptions).replace(/ \/\/ deep equality/, '') + ' failed\n\n';
+  // Extra space added after locator and timeout to match Jest's received/expected output
+  const extraSpace = preventExtraStatIndent ? '' : ' ';
   if (locator)
-    header += `Locator: ${String(locator)}\n`;
+    header += `Locator: ${extraSpace}${String(locator)}\n`;
+  if (expectedReceivedString)
+    header += `${expectedReceivedString}\n`;
+  if (timeout)
+    header += `Timeout: ${extraSpace}${timeout}ms\n`;
   return header;
 }
 
 export type MatcherResult<E, A> = {
   name: string;
-  expected: E;
+  expected?: E;
   message: () => string;
   pass: boolean;
   actual?: A;
   log?: string[];
   timeout?: number;
+  suggestedRebaseline?: string;
+};
+
+export type MatcherResultProperty = Omit<MatcherResult<unknown, unknown>, 'message'> & {
+  message: string;
+};
+
+type JestError = Error & {
+  matcherResult: MatcherResultProperty;
 };
 
 export class ExpectError extends Error {
-  matcherResult: {
-    message: string;
-    pass: boolean;
-    name?: string;
-    expected?: any;
-    actual?: any;
-    log?: string[];
-    timeout?: number;
-  };
+  matcherResult: MatcherResultProperty;
 
-  constructor(jestError: ExpectError, customMessage: string, stackFrames: StackFrame[]) {
+  constructor(jestError: JestError, customMessage: string, stackFrames: StackFrame[]) {
     super('');
     // Copy to erase the JestMatcherError constructor name from the console.log(error).
     this.name = jestError.name;
@@ -64,3 +69,7 @@ export class ExpectError extends Error {
     this.stack = this.name + ': ' + this.message + '\n' + stringifyStackFrames(stackFrames).join('\n');
   }
 }
+
+export function isJestError(e: unknown): e is JestError {
+  return e instanceof Error && 'matcherResult' in e;
+}
diff --git a/packages/playwright/src/matchers/matchers.ts b/packages/playwright/src/matchers/matchers.ts
index 08ae8b638563b..bc4e3a7f3e38e 100644
--- a/packages/playwright/src/matchers/matchers.ts
+++ b/packages/playwright/src/matchers/matchers.ts
@@ -14,21 +14,31 @@
  * limitations under the License.
  */
 
-import type { Locator, Page, APIResponse } from 'playwright-core';
-import type { FrameExpectOptions } from 'playwright-core/lib/client/types';
-import { colors } from 'playwright-core/lib/utilsBundle';
-import { expectTypes, callLogText } from '../util';
+import { constructURLBasedOnBaseURL, isRegExp, isString, isTextualMimeType, pollAgainstDeadline, serializeExpectedTextValues } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+
+import { callLogText, expectTypes } from '../util';
 import { toBeTruthy } from './toBeTruthy';
 import { toEqual } from './toEqual';
-import { toExpectedTextValues, toMatchText } from './toMatchText';
-import { constructURLBasedOnBaseURL, isRegExp, isString, isTextualMimeType, pollAgainstDeadline } from 'playwright-core/lib/utils';
+import { toHaveURLWithPredicate } from './toHaveURL';
+import { toMatchText } from './toMatchText';
+import { takeFirst } from '../common/config';
 import { currentTestInfo } from '../common/globals';
 import { TestInfoImpl } from '../worker/testInfo';
+
 import type { ExpectMatcherState } from '../../types/test';
-import { takeFirst } from '../common/config';
+import type { TestStepInfoImpl } from '../worker/testInfo';
+import type { APIResponse, Locator, Frame, Page } from 'playwright-core';
+import type { FrameExpectParams } from 'playwright-core/lib/client/types';
 
-interface LocatorEx extends Locator {
-  _expect(expression: string, options: Omit<FrameExpectOptions, 'expectedValue'> & { expectedValue?: any }): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }>;
+export type ExpectMatcherStateInternal = ExpectMatcherState & { _stepInfo?: TestStepInfoImpl };
+
+export interface LocatorEx extends Locator {
+  _expect(expression: string, options: FrameExpectParams): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }>;
+}
+
+export interface FrameEx extends Frame {
+  _expect(expression: string, options: FrameExpectParams): Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }>;
 }
 
 interface APIResponseEx extends APIResponse {
@@ -42,9 +52,8 @@ export function toBeAttached(
 ) {
   const attached = !options || options.attached === undefined || options.attached;
   const expected = attached ? 'attached' : 'detached';
-  const unexpected = attached ? 'detached' : 'attached';
   const arg = attached ? '' : '{ attached: false }';
-  return toBeTruthy.call(this, 'toBeAttached', locator, 'Locator', expected, unexpected, arg, async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeAttached', locator, 'Locator', expected, arg, async (isNot, timeout) => {
     return await locator._expect(attached ? 'to.be.attached' : 'to.be.detached', { isNot, timeout });
   }, options);
 }
@@ -52,14 +61,25 @@ export function toBeAttached(
 export function toBeChecked(
   this: ExpectMatcherState,
   locator: LocatorEx,
-  options?: { checked?: boolean, timeout?: number },
+  options?: { checked?: boolean, indeterminate?: boolean, timeout?: number },
 ) {
-  const checked = !options || options.checked === undefined || options.checked;
-  const expected = checked ? 'checked' : 'unchecked';
-  const unexpected = checked ? 'unchecked' : 'checked';
-  const arg = checked ? '' : '{ checked: false }';
-  return toBeTruthy.call(this, 'toBeChecked', locator, 'Locator', expected, unexpected, arg, async (isNot, timeout) => {
-    return await locator._expect(checked ? 'to.be.checked' : 'to.be.unchecked', { isNot, timeout });
+  const checked = options?.checked;
+  const indeterminate = options?.indeterminate;
+  const expectedValue = {
+    checked,
+    indeterminate,
+  };
+  let expected: string;
+  let arg: string;
+  if (options?.indeterminate) {
+    expected = 'indeterminate';
+    arg = `{ indeterminate: true }`;
+  } else {
+    expected = options?.checked === false ? 'unchecked' : 'checked';
+    arg = options?.checked === false ? `{ checked: false }` : '';
+  }
+  return toBeTruthy.call(this, 'toBeChecked', locator, 'Locator', expected, arg, async (isNot, timeout) => {
+    return await locator._expect('to.be.checked', { isNot, timeout, expectedValue });
   }, options);
 }
 
@@ -68,7 +88,7 @@ export function toBeDisabled(
   locator: LocatorEx,
   options?: { timeout?: number },
 ) {
-  return toBeTruthy.call(this, 'toBeDisabled', locator, 'Locator', 'disabled', 'enabled', '', async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeDisabled', locator, 'Locator', 'disabled', '', async (isNot, timeout) => {
     return await locator._expect('to.be.disabled', { isNot, timeout });
   }, options);
 }
@@ -80,9 +100,8 @@ export function toBeEditable(
 ) {
   const editable = !options || options.editable === undefined || options.editable;
   const expected = editable ? 'editable' : 'readOnly';
-  const unexpected = editable ? 'readOnly' : 'editable';
   const arg = editable ? '' : '{ editable: false }';
-  return toBeTruthy.call(this, 'toBeEditable', locator, 'Locator', expected, unexpected, arg, async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeEditable', locator, 'Locator', expected, arg, async (isNot, timeout) => {
     return await locator._expect(editable ? 'to.be.editable' : 'to.be.readonly', { isNot, timeout });
   }, options);
 }
@@ -92,7 +111,7 @@ export function toBeEmpty(
   locator: LocatorEx,
   options?: { timeout?: number },
 ) {
-  return toBeTruthy.call(this, 'toBeEmpty', locator, 'Locator', 'empty', 'notEmpty', '', async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeEmpty', locator, 'Locator', 'empty', '', async (isNot, timeout) => {
     return await locator._expect('to.be.empty', { isNot, timeout });
   }, options);
 }
@@ -104,9 +123,8 @@ export function toBeEnabled(
 ) {
   const enabled = !options || options.enabled === undefined || options.enabled;
   const expected = enabled ? 'enabled' : 'disabled';
-  const unexpected = enabled ? 'disabled' : 'enabled';
   const arg = enabled ? '' : '{ enabled: false }';
-  return toBeTruthy.call(this, 'toBeEnabled', locator, 'Locator', expected, unexpected, arg, async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeEnabled', locator, 'Locator', expected, arg, async (isNot, timeout) => {
     return await locator._expect(enabled ? 'to.be.enabled' : 'to.be.disabled', { isNot, timeout });
   }, options);
 }
@@ -116,7 +134,7 @@ export function toBeFocused(
   locator: LocatorEx,
   options?: { timeout?: number },
 ) {
-  return toBeTruthy.call(this, 'toBeFocused', locator, 'Locator', 'focused', 'inactive', '', async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeFocused', locator, 'Locator', 'focused', '', async (isNot, timeout) => {
     return await locator._expect('to.be.focused', { isNot, timeout });
   }, options);
 }
@@ -126,7 +144,7 @@ export function toBeHidden(
   locator: LocatorEx,
   options?: { timeout?: number },
 ) {
-  return toBeTruthy.call(this, 'toBeHidden', locator, 'Locator', 'hidden', 'visible', '', async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeHidden', locator, 'Locator', 'hidden', '', async (isNot, timeout) => {
     return await locator._expect('to.be.hidden', { isNot, timeout });
   }, options);
 }
@@ -138,9 +156,8 @@ export function toBeVisible(
 ) {
   const visible = !options || options.visible === undefined || options.visible;
   const expected = visible ? 'visible' : 'hidden';
-  const unexpected = visible ? 'hidden' : 'visible';
   const arg = visible ? '' : '{ visible: false }';
-  return toBeTruthy.call(this, 'toBeVisible', locator, 'Locator', expected, unexpected, arg, async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeVisible', locator, 'Locator', expected, arg, async (isNot, timeout) => {
     return await locator._expect(visible ? 'to.be.visible' : 'to.be.hidden', { isNot, timeout });
   }, options);
 }
@@ -150,7 +167,7 @@ export function toBeInViewport(
   locator: LocatorEx,
   options?: { timeout?: number, ratio?: number },
 ) {
-  return toBeTruthy.call(this, 'toBeInViewport', locator, 'Locator', 'in viewport', 'outside viewport', '', async (isNot, timeout) => {
+  return toBeTruthy.call(this, 'toBeInViewport', locator, 'Locator', 'in viewport', '', async (isNot, timeout) => {
     return await locator._expect('to.be.in.viewport', { isNot, expectedNumber: options?.ratio, timeout });
   }, options);
 }
@@ -163,12 +180,12 @@ export function toContainText(
 ) {
   if (Array.isArray(expected)) {
     return toEqual.call(this, 'toContainText', locator, 'Locator', async (isNot, timeout) => {
-      const expectedText = toExpectedTextValues(expected, { matchSubstring: true, normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
+      const expectedText = serializeExpectedTextValues(expected, { matchSubstring: true, normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
       return await locator._expect('to.contain.text.array', { expectedText, isNot, useInnerText: options.useInnerText, timeout });
     }, expected, { ...options, contains: true });
   } else {
     return toMatchText.call(this, 'toContainText', locator, 'Locator', async (isNot, timeout) => {
-      const expectedText = toExpectedTextValues([expected], { matchSubstring: true, normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
+      const expectedText = serializeExpectedTextValues([expected], { matchSubstring: true, normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
       return await locator._expect('to.have.text', { expectedText, isNot, useInnerText: options.useInnerText, timeout });
     }, expected, options);
   }
@@ -181,7 +198,7 @@ export function toHaveAccessibleDescription(
   options?: { timeout?: number, ignoreCase?: boolean },
 ) {
   return toMatchText.call(this, 'toHaveAccessibleDescription', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected], { ignoreCase: options?.ignoreCase });
+    const expectedText = serializeExpectedTextValues([expected], { ignoreCase: options?.ignoreCase, normalizeWhiteSpace: true });
     return await locator._expect('to.have.accessible.description', { expectedText, isNot, timeout });
   }, expected, options);
 }
@@ -193,11 +210,23 @@ export function toHaveAccessibleName(
   options?: { timeout?: number, ignoreCase?: boolean },
 ) {
   return toMatchText.call(this, 'toHaveAccessibleName', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected], { ignoreCase: options?.ignoreCase });
+    const expectedText = serializeExpectedTextValues([expected], { ignoreCase: options?.ignoreCase, normalizeWhiteSpace: true });
     return await locator._expect('to.have.accessible.name', { expectedText, isNot, timeout });
   }, expected, options);
 }
 
+export function toHaveAccessibleErrorMessage(
+  this: ExpectMatcherState,
+  locator: LocatorEx,
+  expected: string | RegExp,
+  options?: { timeout?: number; ignoreCase?: boolean },
+) {
+  return toMatchText.call(this, 'toHaveAccessibleErrorMessage', locator, 'Locator', async (isNot, timeout) => {
+    const expectedText = serializeExpectedTextValues([expected], { ignoreCase: options?.ignoreCase, normalizeWhiteSpace: true });
+    return await locator._expect('to.have.accessible.error.message', { expectedText: expectedText, isNot, timeout });
+  }, expected, options);
+}
+
 export function toHaveAttribute(
   this: ExpectMatcherState,
   locator: LocatorEx,
@@ -213,12 +242,12 @@ export function toHaveAttribute(
     }
   }
   if (expected === undefined) {
-    return toBeTruthy.call(this, 'toHaveAttribute', locator, 'Locator', 'have attribute', 'not have attribute', '', async (isNot, timeout) => {
+    return toBeTruthy.call(this, 'toHaveAttribute', locator, 'Locator', 'have attribute', '', async (isNot, timeout) => {
       return await locator._expect('to.have.attribute', { expressionArg: name, isNot, timeout });
     }, options);
   }
   return toMatchText.call(this, 'toHaveAttribute', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected as (string | RegExp)], { ignoreCase: options?.ignoreCase });
+    const expectedText = serializeExpectedTextValues([expected as (string | RegExp)], { ignoreCase: options?.ignoreCase });
     return await locator._expect('to.have.attribute.value', { expressionArg: name, expectedText, isNot, timeout });
   }, expected as (string | RegExp), options);
 }
@@ -231,17 +260,40 @@ export function toHaveClass(
 ) {
   if (Array.isArray(expected)) {
     return toEqual.call(this, 'toHaveClass', locator, 'Locator', async (isNot, timeout) => {
-      const expectedText = toExpectedTextValues(expected);
+      const expectedText = serializeExpectedTextValues(expected);
       return await locator._expect('to.have.class.array', { expectedText, isNot, timeout });
-    }, expected, options);
+    }, expected, options, true);
   } else {
     return toMatchText.call(this, 'toHaveClass', locator, 'Locator', async (isNot, timeout) => {
-      const expectedText = toExpectedTextValues([expected]);
+      const expectedText = serializeExpectedTextValues([expected]);
       return await locator._expect('to.have.class', { expectedText, isNot, timeout });
     }, expected, options);
   }
 }
 
+export function toContainClass(
+  this: ExpectMatcherState,
+  locator: LocatorEx,
+  expected: string | string[],
+  options?: { timeout?: number },
+) {
+  if (Array.isArray(expected)) {
+    if (expected.some(e => isRegExp(e)))
+      throw new Error(`"expected" argument in toContainClass cannot contain RegExp values`);
+    return toEqual.call(this, 'toContainClass', locator, 'Locator', async (isNot, timeout) => {
+      const expectedText = serializeExpectedTextValues(expected);
+      return await locator._expect('to.contain.class.array', { expectedText, isNot, timeout });
+    }, expected, options, true);
+  } else {
+    if (isRegExp(expected))
+      throw new Error(`"expected" argument in toContainClass cannot be a RegExp value`);
+    return toMatchText.call(this, 'toContainClass', locator, 'Locator', async (isNot, timeout) => {
+      const expectedText = serializeExpectedTextValues([expected]);
+      return await locator._expect('to.contain.class', { expectedText, isNot, timeout });
+    }, expected, options);
+  }
+}
+
 export function toHaveCount(
   this: ExpectMatcherState,
   locator: LocatorEx,
@@ -261,7 +313,7 @@ export function toHaveCSS(
   options?: { timeout?: number },
 ) {
   return toMatchText.call(this, 'toHaveCSS', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected]);
+    const expectedText = serializeExpectedTextValues([expected]);
     return await locator._expect('to.have.css', { expressionArg: name, expectedText, isNot, timeout });
   }, expected, options);
 }
@@ -273,7 +325,7 @@ export function toHaveId(
   options?: { timeout?: number },
 ) {
   return toMatchText.call(this, 'toHaveId', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected]);
+    const expectedText = serializeExpectedTextValues([expected]);
     return await locator._expect('to.have.id', { expectedText, isNot, timeout });
   }, expected, options);
 }
@@ -299,7 +351,7 @@ export function toHaveRole(
   if (!isString(expected))
     throw new Error(`"role" argument in toHaveRole must be a string`);
   return toMatchText.call(this, 'toHaveRole', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected]);
+    const expectedText = serializeExpectedTextValues([expected]);
     return await locator._expect('to.have.role', { expectedText, isNot, timeout });
   }, expected, options);
 }
@@ -312,12 +364,12 @@ export function toHaveText(
 ) {
   if (Array.isArray(expected)) {
     return toEqual.call(this, 'toHaveText', locator, 'Locator', async (isNot, timeout) => {
-      const expectedText = toExpectedTextValues(expected, { normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
+      const expectedText = serializeExpectedTextValues(expected, { normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
       return await locator._expect('to.have.text.array', { expectedText, isNot, useInnerText: options?.useInnerText, timeout });
     }, expected, options);
   } else {
     return toMatchText.call(this, 'toHaveText', locator, 'Locator', async (isNot, timeout) => {
-      const expectedText = toExpectedTextValues([expected], { normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
+      const expectedText = serializeExpectedTextValues([expected], { normalizeWhiteSpace: true, ignoreCase: options.ignoreCase });
       return await locator._expect('to.have.text', { expectedText, isNot, useInnerText: options?.useInnerText, timeout });
     }, expected, options);
   }
@@ -330,7 +382,7 @@ export function toHaveValue(
   options?: { timeout?: number },
 ) {
   return toMatchText.call(this, 'toHaveValue', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected]);
+    const expectedText = serializeExpectedTextValues([expected]);
     return await locator._expect('to.have.value', { expectedText, isNot, timeout });
   }, expected, options);
 }
@@ -342,7 +394,7 @@ export function toHaveValues(
   options?: { timeout?: number },
 ) {
   return toEqual.call(this, 'toHaveValues', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues(expected);
+    const expectedText = serializeExpectedTextValues(expected);
     return await locator._expect('to.have.values', { expectedText, isNot, timeout });
   }, expected, options);
 }
@@ -353,26 +405,28 @@ export function toHaveTitle(
   expected: string | RegExp,
   options: { timeout?: number } = {},
 ) {
-  const locator = page.locator(':root') as LocatorEx;
-  return toMatchText.call(this, 'toHaveTitle', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected], { normalizeWhiteSpace: true });
-    return await locator._expect('to.have.title', { expectedText, isNot, timeout });
-  }, expected, options);
+  return toMatchText.call(this, 'toHaveTitle', page, 'Page', async (isNot, timeout) => {
+    const expectedText = serializeExpectedTextValues([expected], { normalizeWhiteSpace: true });
+    return await (page.mainFrame() as FrameEx)._expect('to.have.title', { expectedText, isNot, timeout });
+  }, expected, { receiverLabel: 'page', ...options });
 }
 
 export function toHaveURL(
   this: ExpectMatcherState,
   page: Page,
-  expected: string | RegExp,
-  options?: { ignoreCase?: boolean, timeout?: number },
+  expected: string | RegExp | ((url: URL) => boolean),
+  options?: { ignoreCase?: boolean; timeout?: number },
 ) {
+  // Ports don't support predicates. Keep separate server and client codepaths
+  if (typeof expected === 'function')
+    return toHaveURLWithPredicate.call(this, page, expected, options);
+
   const baseURL = (page.context() as any)._options.baseURL;
   expected = typeof expected === 'string' ? constructURLBasedOnBaseURL(baseURL, expected) : expected;
-  const locator = page.locator(':root') as LocatorEx;
-  return toMatchText.call(this, 'toHaveURL', locator, 'Locator', async (isNot, timeout) => {
-    const expectedText = toExpectedTextValues([expected], { ignoreCase: options?.ignoreCase });
-    return await locator._expect('to.have.url', { expectedText, isNot, timeout });
-  }, expected, options);
+  return toMatchText.call(this, 'toHaveURL', page, 'Page', async (isNot, timeout) => {
+    const expectedText = serializeExpectedTextValues([expected], { ignoreCase: options?.ignoreCase });
+    return await (page.mainFrame() as FrameEx)._expect('to.have.url', { expectedText, isNot, timeout });
+  }, expected, { receiverLabel: 'page', ...options });
 }
 
 export async function toBeOK(
diff --git a/packages/playwright/src/matchers/toBeTruthy.ts b/packages/playwright/src/matchers/toBeTruthy.ts
index 0941ab7a636c5..0c2364c71fce1 100644
--- a/packages/playwright/src/matchers/toBeTruthy.ts
+++ b/packages/playwright/src/matchers/toBeTruthy.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import { expectTypes, callLogText } from '../util';
+import { callLogText, expectTypes } from '../util';
 import { kNoElementsFoundError, matcherHint } from './matcherHint';
+
 import type { MatcherResult } from './matcherHint';
 import type { ExpectMatcherState } from '../../types/test';
 import type { Locator } from 'playwright-core';
@@ -26,7 +27,6 @@ export async function toBeTruthy(
   receiver: Locator,
   receiverType: string,
   expected: string,
-  unexpected: string,
   arg: string,
   query: (isNot: boolean, timeout: number) => Promise<{ matches: boolean, log?: string[], received?: any, timedOut?: boolean }>,
   options: { timeout?: number } = {},
@@ -39,19 +39,35 @@ export async function toBeTruthy(
   };
 
   const timeout = options.timeout ?? this.timeout;
-  const { matches, log, timedOut, received } = await query(!!this.isNot, timeout);
+  const { matches: pass, log, timedOut, received } = await query(!!this.isNot, timeout);
+  if (pass === !this.isNot) {
+    return {
+      name: matcherName,
+      message: () => '',
+      pass,
+      expected
+    };
+  }
+
   const notFound = received === kNoElementsFoundError ? received : undefined;
-  const actual = matches ? expected : unexpected;
+  let printedReceived: string | undefined;
+  let printedExpected: string | undefined;
+  if (pass) {
+    printedExpected = `Expected: not ${expected}`;
+    printedReceived = `Received: ${notFound ? kNoElementsFoundError : expected}`;
+  } else {
+    printedExpected = `Expected: ${expected}`;
+    printedReceived = `Received: ${notFound ? kNoElementsFoundError : received}`;
+  }
   const message = () => {
-    const header = matcherHint(this, receiver, matcherName, 'locator', arg, matcherOptions, timedOut ? timeout : undefined);
+    const header = matcherHint(this, receiver, matcherName, 'locator', arg, matcherOptions, timedOut ? timeout : undefined, `${printedExpected}\n${printedReceived}`);
     const logText = callLogText(log);
-    return matches ? `${header}Expected: not ${expected}\nReceived: ${notFound ? kNoElementsFoundError : expected}${logText}` :
-      `${header}Expected: ${expected}\nReceived: ${notFound ? kNoElementsFoundError : unexpected}${logText}`;
+    return `${header}${logText}`;
   };
   return {
     message,
-    pass: matches,
-    actual,
+    pass,
+    actual: received,
     name: matcherName,
     expected,
     log,
diff --git a/packages/playwright/src/matchers/toEqual.ts b/packages/playwright/src/matchers/toEqual.ts
index 29d3fd4866da4..bfa1e6e04a62e 100644
--- a/packages/playwright/src/matchers/toEqual.ts
+++ b/packages/playwright/src/matchers/toEqual.ts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-import { expectTypes, callLogText } from '../util';
+import { isRegExp } from 'playwright-core/lib/utils';
+
+import { callLogText, expectTypes } from '../util';
 import { matcherHint } from './matcherHint';
+
 import type { MatcherResult } from './matcherHint';
 import type { ExpectMatcherState } from '../../types/test';
 import type { Locator } from 'playwright-core';
@@ -32,6 +35,7 @@ export async function toEqual<T>(
   query: (isNot: boolean, timeout: number) => Promise<{ matches: boolean, received?: any, log?: string[], timedOut?: boolean }>,
   expected: T,
   options: { timeout?: number, contains?: boolean } = {},
+  messagePreventExtraStatIndent?: boolean
 ): Promise<MatcherResult<any, any>> {
   expectTypes(receiver, [receiverType], matcherName);
 
@@ -44,22 +48,50 @@ export async function toEqual<T>(
   const timeout = options.timeout ?? this.timeout;
 
   const { matches: pass, received, log, timedOut } = await query(!!this.isNot, timeout);
+  if (pass === !this.isNot) {
+    return {
+      name: matcherName,
+      message: () => '',
+      pass,
+      expected
+    };
+  }
 
-  const message = pass
-    ? () =>
-      matcherHint(this, receiver, matcherName, 'locator', undefined, matcherOptions, timedOut ? timeout : undefined) +
-      `Expected: not ${this.utils.printExpected(expected)}\n` +
-      `Received: ${this.utils.printReceived(received)}` + callLogText(log)
-    : () =>
-      matcherHint(this, receiver, matcherName, 'locator', undefined, matcherOptions, timedOut ? timeout : undefined) +
-      this.utils.printDiffOrStringify(
-          expected,
-          received,
-          EXPECTED_LABEL,
-          RECEIVED_LABEL,
-          false,
-      ) + callLogText(log);
+  let printedReceived: string | undefined;
+  let printedExpected: string | undefined;
+  let printedDiff: string | undefined;
+  if (pass) {
+    printedExpected = `Expected: not ${this.utils.printExpected(expected)}`;
+    printedReceived = `Received: ${this.utils.printReceived(received)}`;
+  } else if (Array.isArray(expected) && Array.isArray(received)) {
+    const normalizedExpected = expected.map((exp, index) => {
+      const rec = received[index];
+      if (isRegExp(exp))
+        return exp.test(rec) ? rec : exp;
 
+      return exp;
+    });
+    printedDiff = this.utils.printDiffOrStringify(
+        normalizedExpected,
+        received,
+        EXPECTED_LABEL,
+        RECEIVED_LABEL,
+        false,
+    );
+  } else {
+    printedDiff = this.utils.printDiffOrStringify(
+        expected,
+        received,
+        EXPECTED_LABEL,
+        RECEIVED_LABEL,
+        false,
+    );
+  }
+  const message = () => {
+    const details = printedDiff || `${printedExpected}\n${printedReceived}`;
+    const header = matcherHint(this, receiver, matcherName, 'locator', undefined, matcherOptions, timedOut ? timeout : undefined, details, messagePreventExtraStatIndent);
+    return `${header}${callLogText(log)}`;
+  };
   // Passing the actual and expected objects so that a custom reporter
   // could access them, for example in order to display a custom visual diff,
   // or create a different error message
diff --git a/packages/playwright/src/matchers/toHaveURL.ts b/packages/playwright/src/matchers/toHaveURL.ts
new file mode 100644
index 0000000000000..4169e83d1ad8a
--- /dev/null
+++ b/packages/playwright/src/matchers/toHaveURL.ts
@@ -0,0 +1,142 @@
+/**
+ * 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 { urlMatches } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+
+import { printReceivedStringContainExpectedResult } from './expect';
+import {  matcherHint } from './matcherHint';
+import { EXPECTED_COLOR, printReceived } from '../common/expectBundle';
+
+import type { MatcherResult } from './matcherHint';
+import type { ExpectMatcherState } from '../../types/test';
+import type { Page } from 'playwright-core';
+
+export async function toHaveURLWithPredicate(
+  this: ExpectMatcherState,
+  page: Page,
+  expected: (url: URL) => boolean,
+  options?: { ignoreCase?: boolean; timeout?: number },
+): Promise<MatcherResult<string | RegExp, string>> {
+  const matcherName = 'toHaveURL';
+  const expression = 'page';
+  const matcherOptions = {
+    isNot: this.isNot,
+    promise: this.promise,
+  };
+
+  if (typeof expected !== 'function') {
+    throw new Error(
+        [
+          // Always display `expected` in expectation place
+          matcherHint(this, undefined, matcherName, expression, undefined, matcherOptions, undefined, undefined, true),
+          `${colors.bold('Matcher error')}: ${EXPECTED_COLOR('expected')} value must be a string, regular expression, or predicate`,
+          this.utils.printWithType('Expected', expected, this.utils.printExpected),
+        ].join('\n\n'),
+    );
+  }
+
+  const timeout = options?.timeout ?? this.timeout;
+  const baseURL: string | undefined = (page.context() as any)._options.baseURL;
+  let conditionSucceeded = false;
+  let lastCheckedURLString: string | undefined = undefined;
+  try {
+    await page.mainFrame().waitForURL(
+        url => {
+          lastCheckedURLString = url.toString();
+
+          if (options?.ignoreCase) {
+            return (
+              !this.isNot ===
+              urlMatches(
+                  baseURL?.toLocaleLowerCase(),
+                  lastCheckedURLString.toLocaleLowerCase(),
+                  expected,
+              )
+            );
+          }
+
+          return (
+            !this.isNot === urlMatches(baseURL, lastCheckedURLString, expected)
+          );
+        },
+        { timeout },
+    );
+
+    conditionSucceeded = true;
+  } catch (e) {
+    conditionSucceeded = false;
+  }
+
+  if (conditionSucceeded)
+    return { name: matcherName, pass: !this.isNot, message: () => '' };
+
+  return {
+    name: matcherName,
+    pass: this.isNot,
+    message: () =>
+      toHaveURLMessage(
+          this,
+          matcherName,
+          expression,
+          expected,
+          lastCheckedURLString,
+          this.isNot,
+          true,
+          timeout,
+      ),
+    actual: lastCheckedURLString,
+    timeout,
+  };
+}
+
+function toHaveURLMessage(
+  state: ExpectMatcherState,
+  matcherName: string,
+  expression: string,
+  expected: Function,
+  received: string | undefined,
+  pass: boolean,
+  didTimeout: boolean,
+  timeout: number,
+): string {
+  const matcherOptions = {
+    isNot: state.isNot,
+    promise: state.promise,
+  };
+  const receivedString = received || '';
+  const messagePrefix = matcherHint(state, undefined, matcherName, expression, undefined, matcherOptions, didTimeout ? timeout : undefined, undefined, true);
+
+  let printedReceived: string | undefined;
+  let printedExpected: string | undefined;
+  let printedDiff: string | undefined;
+  if (typeof expected === 'function') {
+    printedExpected = `Expected predicate to ${!state.isNot ? 'succeed' : 'fail'}`;
+    printedReceived = `Received string: ${printReceived(receivedString)}`;
+  } else {
+    if (pass) {
+      printedExpected = `Expected pattern: not ${state.utils.printExpected(expected)}`;
+      const formattedReceived = printReceivedStringContainExpectedResult(receivedString, null);
+      printedReceived = `Received string: ${formattedReceived}`;
+    } else {
+      const labelExpected = `Expected ${typeof expected === 'string' ? 'string' : 'pattern'}`;
+      printedDiff = state.utils.printDiffOrStringify(expected, receivedString, labelExpected, 'Received string', false);
+    }
+  }
+
+  const resultDetails = printedDiff ? printedDiff : printedExpected + '\n' + printedReceived;
+  return messagePrefix + resultDetails;
+}
diff --git a/packages/playwright/src/matchers/toMatchAriaSnapshot.ts b/packages/playwright/src/matchers/toMatchAriaSnapshot.ts
new file mode 100644
index 0000000000000..edb7a860ab9c4
--- /dev/null
+++ b/packages/playwright/src/matchers/toMatchAriaSnapshot.ts
@@ -0,0 +1,181 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 { escapeTemplateString, isString } from 'playwright-core/lib/utils';
+
+import {  kNoElementsFoundError, matcherHint } from './matcherHint';
+import { EXPECTED_COLOR } from '../common/expectBundle';
+import { callLogText, fileExistsAsync } from '../util';
+import { printReceivedStringContainExpectedSubstring } from './expect';
+import { currentTestInfo } from '../common/globals';
+
+import type { MatcherResult } from './matcherHint';
+import type { LocatorEx } from './matchers';
+import type { ExpectMatcherState } from '../../types/test';
+import type { MatcherReceived } from '@injected/ariaSnapshot';
+
+
+type ToMatchAriaSnapshotExpected = {
+  name?: string;
+  path?: string;
+  timeout?: number;
+} | string;
+
+export async function toMatchAriaSnapshot(
+  this: ExpectMatcherState,
+  receiver: LocatorEx,
+  expectedParam?: ToMatchAriaSnapshotExpected,
+  options: { timeout?: number } = {},
+): Promise<MatcherResult<string | RegExp, string>> {
+  const matcherName = 'toMatchAriaSnapshot';
+
+  const testInfo = currentTestInfo();
+  if (!testInfo)
+    throw new Error(`toMatchAriaSnapshot() must be called during the test`);
+
+  if (testInfo._projectInternal.ignoreSnapshots)
+    return { pass: !this.isNot, message: () => '', name: 'toMatchAriaSnapshot', expected: '' };
+
+  const updateSnapshots = testInfo.config.updateSnapshots;
+
+  const matcherOptions = {
+    isNot: this.isNot,
+    promise: this.promise,
+  };
+
+  let expected: string;
+  let timeout: number;
+  let expectedPath: string | undefined;
+  if (isString(expectedParam)) {
+    expected = expectedParam;
+    timeout = options.timeout ?? this.timeout;
+  } else {
+    const legacyPath = testInfo._resolveSnapshotPaths('aria', expectedParam?.name, 'dontUpdateSnapshotIndex', '.yml').absoluteSnapshotPath;
+    expectedPath = testInfo._resolveSnapshotPaths('aria', expectedParam?.name, 'updateSnapshotIndex').absoluteSnapshotPath;
+    // in 1.51, we changed the default template to use .aria.yml extension
+    // for backwards compatibility, we check for the legacy .yml extension
+    if (!(await fileExistsAsync(expectedPath)) && await fileExistsAsync(legacyPath))
+      expectedPath = legacyPath;
+    expected = await fs.promises.readFile(expectedPath, 'utf8').catch(() => '');
+    timeout = expectedParam?.timeout ?? this.timeout;
+  }
+
+  const generateMissingBaseline = updateSnapshots === 'missing' && !expected;
+  if (generateMissingBaseline) {
+    if (this.isNot) {
+      const message = `Matchers using ".not" can't generate new baselines`;
+      return { pass: this.isNot, message: () => message, name: 'toMatchAriaSnapshot' };
+    } else {
+      // When generating new baseline, run entire pipeline against impossible match.
+      expected = `- none "Generating new baseline"`;
+    }
+  }
+
+  expected = unshift(expected);
+  const { matches: pass, received, log, timedOut } = await receiver._expect('to.match.aria', { expectedValue: expected, isNot: this.isNot, timeout });
+  const typedReceived = received as MatcherReceived | typeof kNoElementsFoundError;
+
+  const matcherHintWithExpect = (expectedReceivedString: string) => {
+    return matcherHint(this, receiver, matcherName, 'locator', undefined, matcherOptions, timedOut ? timeout : undefined, expectedReceivedString);
+  };
+
+  const notFound = typedReceived === kNoElementsFoundError;
+  if (notFound) {
+    return {
+      pass: this.isNot,
+      message: () => matcherHintWithExpect(`Expected: ${this.utils.printExpected(expected)}\nReceived: ${EXPECTED_COLOR('<element not found>')}`) + callLogText(log),
+      name: 'toMatchAriaSnapshot',
+      expected,
+    };
+  }
+
+  const receivedText = typedReceived.raw;
+  const message = () => {
+    if (pass) {
+      const receivedString = notFound ? receivedText : printReceivedStringContainExpectedSubstring(receivedText, receivedText.indexOf(expected), expected.length);
+      const expectedReceivedString = `Expected: not ${this.utils.printExpected(expected)}\nReceived: ${receivedString}`;
+      return matcherHintWithExpect(expectedReceivedString) + callLogText(log);
+    } else {
+      const labelExpected = `Expected`;
+      const expectedReceivedString = notFound ? `${labelExpected}: ${this.utils.printExpected(expected)}\nReceived: ${receivedText}` : this.utils.printDiffOrStringify(expected, receivedText, labelExpected, 'Received', false);
+      return matcherHintWithExpect(expectedReceivedString) + callLogText(log);
+    }
+  };
+
+  if (!this.isNot) {
+    if ((updateSnapshots === 'all') ||
+        (updateSnapshots === 'changed' && pass === this.isNot) ||
+        generateMissingBaseline) {
+      if (expectedPath) {
+        await fs.promises.mkdir(path.dirname(expectedPath), { recursive: true });
+        await fs.promises.writeFile(expectedPath, typedReceived.regex, 'utf8');
+        const relativePath = path.relative(process.cwd(), expectedPath);
+        if (updateSnapshots === 'missing') {
+          const message = `A snapshot doesn't exist at ${relativePath}, writing actual.`;
+          testInfo._hasNonRetriableError = true;
+          testInfo._failWithError(new Error(message));
+        } else {
+          const message = `A snapshot is generated at ${relativePath}.`;
+          /* eslint-disable no-console */
+          console.log(message);
+        }
+        return { pass: true, message: () => '', name: 'toMatchAriaSnapshot' };
+      } else {
+        const suggestedRebaseline = `\`\n${escapeTemplateString(indent(typedReceived.regex, '{indent}  '))}\n{indent}\``;
+        if (updateSnapshots === 'missing') {
+          const message = 'A snapshot is not provided, generating new baseline.';
+          testInfo._hasNonRetriableError = true;
+          testInfo._failWithError(new Error(message));
+        }
+        // TODO: ideally, we should return "pass: true" here because this matcher passes
+        // when regenerating baselines. However, we can only access suggestedRebaseline in case
+        // of an error, so we fail here and workaround it in the expect implementation.
+        return { pass: false, message: () => '', name: 'toMatchAriaSnapshot', suggestedRebaseline };
+      }
+    }
+  }
+
+  return {
+    name: matcherName,
+    expected,
+    message,
+    pass,
+    actual: received,
+    log,
+    timeout: timedOut ? timeout : undefined,
+  };
+}
+
+function unshift(snapshot: string): string {
+  const lines = snapshot.split('\n');
+  let whitespacePrefixLength = 100;
+  for (const line of lines) {
+    if (!line.trim())
+      continue;
+    const match = line.match(/^(\s*)/);
+    if (match && match[1].length < whitespacePrefixLength)
+      whitespacePrefixLength = match[1].length;
+  }
+  return lines.filter(t => t.trim()).map(line => line.substring(whitespacePrefixLength)).join('\n');
+}
+
+function indent(snapshot: string, indent: string): string {
+  return snapshot.split('\n').map(line => indent + line).join('\n');
+}
diff --git a/packages/playwright/src/matchers/toMatchSnapshot.ts b/packages/playwright/src/matchers/toMatchSnapshot.ts
index 0923a10e82140..d6223063eeadb 100644
--- a/packages/playwright/src/matchers/toMatchSnapshot.ts
+++ b/packages/playwright/src/matchers/toMatchSnapshot.ts
@@ -14,33 +14,26 @@
  * limitations under the License.
  */
 
-import type { Locator, Page } from 'playwright-core';
-import type { ExpectScreenshotOptions, Page as PageEx } from 'playwright-core/lib/client/page';
-import { currentTestInfo } from '../common/globals';
-import type { ImageComparatorOptions, Comparator } from 'playwright-core/lib/utils';
-import { getComparator, sanitizeForFilePath } from 'playwright-core/lib/utils';
-import {
-  addSuffixToFilePath,
-  trimLongString, callLogText,
-  expectTypes,
-  sanitizeFilePathBeforeExtension,
-  windowsFilesystemFriendlyLength } from '../util';
-import { colors } from 'playwright-core/lib/utilsBundle';
 import fs from 'fs';
 import path from 'path';
+
+import { compareBuffersOrStrings, getComparator, isString } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
 import { mime } from 'playwright-core/lib/utilsBundle';
-import type { TestInfoImpl } from '../worker/testInfo';
-import type { ExpectMatcherState } from '../../types/test';
+
+import { addSuffixToFilePath, callLogText, expectTypes } from '../util';
+import {  matcherHint } from './matcherHint';
+import { currentTestInfo } from '../common/globals';
+
 import type { MatcherResult } from './matcherHint';
+import type { ExpectMatcherStateInternal } from './matchers';
 import type { FullProjectInternal } from '../common/config';
+import type { TestInfoImpl, TestStepInfoImpl } from '../worker/testInfo';
+import type { Locator, Page } from 'playwright-core';
+import type { ExpectScreenshotOptions, Page as PageEx } from 'playwright-core/lib/client/page';
+import type { Comparator, ImageComparatorOptions } from 'playwright-core/lib/utils';
 
 type NameOrSegments = string | string[];
-const snapshotNamesSymbol = Symbol('snapshotNames');
-
-type SnapshotNames = {
-  anonymousSnapshotIndex: number;
-  namedSnapshotIndex: { [key: string]: number };
-};
 
 type ImageMatcherResult = MatcherResult<string, string> & { diff?: string };
 
@@ -75,6 +68,7 @@ const NonConfigProperties: (keyof ToHaveScreenshotOptions)[] = [
 
 class SnapshotHelper {
   readonly testInfo: TestInfoImpl;
+  readonly name: string;
   readonly attachmentBaseName: string;
   readonly legacyExpectedPath: string;
   readonly previousPath: string;
@@ -83,7 +77,7 @@ class SnapshotHelper {
   readonly diffPath: string;
   readonly mimeType: string;
   readonly kind: 'Screenshot'|'Snapshot';
-  readonly updateSnapshots: 'all' | 'none' | 'missing';
+  readonly updateSnapshots: 'all' | 'changed' | 'missing' | 'none';
   readonly comparator: Comparator;
   readonly options: Omit<ToHaveScreenshotOptions, '_comparator'> & { comparator?: string };
   readonly matcherName: string;
@@ -91,9 +85,9 @@ class SnapshotHelper {
 
   constructor(
     testInfo: TestInfoImpl,
-    matcherName: string,
+    matcherName: 'toMatchSnapshot' | 'toHaveScreenshot',
     locator: Locator | undefined,
-    anonymousSnapshotExtension: string,
+    anonymousSnapshotExtension: string | undefined,
     configOptions: ToHaveScreenshotConfigOptions,
     nameOrOptions: NameOrSegments | { name?: NameOrSegments } & ToHaveScreenshotOptions,
     optOptions: ToHaveScreenshotOptions,
@@ -108,47 +102,12 @@ class SnapshotHelper {
       name = nameFromOptions;
     }
 
-    let snapshotNames = (testInfo as any)[snapshotNamesSymbol] as SnapshotNames;
-    if (!(testInfo as any)[snapshotNamesSymbol]) {
-      snapshotNames = {
-        anonymousSnapshotIndex: 0,
-        namedSnapshotIndex: {},
-      };
-      (testInfo as any)[snapshotNamesSymbol] = snapshotNames;
-    }
+    this.name = Array.isArray(name) ? name.join(path.sep) : name || '';
+    const resolvedPaths = testInfo._resolveSnapshotPaths(matcherName === 'toHaveScreenshot' ? 'screenshot' : 'snapshot', name, 'updateSnapshotIndex', anonymousSnapshotExtension);
+    this.expectedPath = resolvedPaths.absoluteSnapshotPath;
+    this.attachmentBaseName = resolvedPaths.relativeOutputPath;
 
-    let expectedPathSegments: string[];
-    let outputBasePath: string;
-    if (!name) {
-      // Consider the use case below. We should save actual to different paths.
-      // Therefore we auto-increment |anonymousSnapshotIndex|.
-      //
-      //   expect.toMatchSnapshot('a.png')
-      //   // noop
-      //   expect.toMatchSnapshot('a.png')
-      const fullTitleWithoutSpec = [
-        ...testInfo.titlePath.slice(1),
-        ++snapshotNames.anonymousSnapshotIndex,
-      ].join(' ');
-      // Note: expected path must not ever change for backwards compatibility.
-      expectedPathSegments = [sanitizeForFilePath(trimLongString(fullTitleWithoutSpec)) + '.' + anonymousSnapshotExtension];
-      // Trim the output file paths more aggressively to avoid hitting Windows filesystem limits.
-      const sanitizedName = sanitizeForFilePath(trimLongString(fullTitleWithoutSpec, windowsFilesystemFriendlyLength)) + '.' + anonymousSnapshotExtension;
-      outputBasePath = testInfo._getOutputPath(sanitizedName);
-      this.attachmentBaseName = sanitizedName;
-    } else {
-      // We intentionally do not sanitize user-provided array of segments, assuming
-      // it is a file system path. See https://github.com/microsoft/playwright/pull/9156.
-      // Note: expected path must not ever change for backwards compatibility.
-      expectedPathSegments = Array.isArray(name) ? name : [sanitizeFilePathBeforeExtension(name)];
-      const joinedName = Array.isArray(name) ? name.join(path.sep) : sanitizeFilePathBeforeExtension(trimLongString(name, windowsFilesystemFriendlyLength));
-      snapshotNames.namedSnapshotIndex[joinedName] = (snapshotNames.namedSnapshotIndex[joinedName] || 0) + 1;
-      const index = snapshotNames.namedSnapshotIndex[joinedName];
-      const sanitizedName = index > 1 ? addSuffixToFilePath(joinedName, `-${index - 1}`) : joinedName;
-      outputBasePath = testInfo._getOutputPath(sanitizedName);
-      this.attachmentBaseName = sanitizedName;
-    }
-    this.expectedPath = testInfo.snapshotPath(...expectedPathSegments);
+    const outputBasePath = testInfo._getOutputPath(resolvedPaths.relativeOutputPath);
     this.legacyExpectedPath = addSuffixToFilePath(outputBasePath, '-expected');
     this.previousPath = addSuffixToFilePath(outputBasePath, '-previous');
     this.actualPath = addSuffixToFilePath(outputBasePath, '-actual');
@@ -178,7 +137,7 @@ class SnapshotHelper {
     this.locator = locator;
 
     this.updateSnapshots = testInfo.config.updateSnapshots;
-    this.mimeType = mime.getType(path.basename(this.expectedPath)) ?? 'application/octet-string';
+    this.mimeType = mime.getType(path.basename(this.expectedPath)) ?? 'application/octet-stream';
     this.comparator = getComparator(this.mimeType);
 
     this.testInfo = testInfo;
@@ -199,7 +158,7 @@ class SnapshotHelper {
   }
 
   handleMissingNegated(): ImageMatcherResult {
-    const isWriteMissingMode = this.updateSnapshots === 'all' || this.updateSnapshots === 'missing';
+    const isWriteMissingMode = this.updateSnapshots !== 'none';
     const message = `A snapshot doesn't exist at ${this.expectedPath}${isWriteMissingMode ? ', matchers using ".not" won\'t write them automatically.' : '.'}`;
     // NOTE: 'isNot' matcher implies inversed value.
     return this.createMatcherResult(message, true);
@@ -220,15 +179,15 @@ class SnapshotHelper {
     return this.createMatcherResult(message, true);
   }
 
-  handleMissing(actual: Buffer | string): ImageMatcherResult {
-    const isWriteMissingMode = this.updateSnapshots === 'all' || this.updateSnapshots === 'missing';
+  handleMissing(actual: Buffer | string, step: TestStepInfoImpl | undefined): ImageMatcherResult {
+    const isWriteMissingMode = this.updateSnapshots !== 'none';
     if (isWriteMissingMode)
       writeFileSync(this.expectedPath, actual);
-    this.testInfo.attachments.push({ name: addSuffixToFilePath(this.attachmentBaseName, '-expected'), contentType: this.mimeType, path: this.expectedPath });
+    step?._attachToStep({ name: addSuffixToFilePath(this.attachmentBaseName, '-expected'), contentType: this.mimeType, path: this.expectedPath });
     writeFileSync(this.actualPath, actual);
-    this.testInfo.attachments.push({ name: addSuffixToFilePath(this.attachmentBaseName, '-actual'), contentType: this.mimeType, path: this.actualPath });
+    step?._attachToStep({ name: addSuffixToFilePath(this.attachmentBaseName, '-actual'), contentType: this.mimeType, path: this.actualPath });
     const message = `A snapshot doesn't exist at ${this.expectedPath}${isWriteMissingMode ? ', writing actual.' : '.'}`;
-    if (this.updateSnapshots === 'all') {
+    if (this.updateSnapshots === 'all' || this.updateSnapshots === 'changed') {
       /* eslint-disable no-console */
       console.log(message);
       return this.createMatcherResult(message, true);
@@ -246,37 +205,32 @@ class SnapshotHelper {
     expected: Buffer | string | undefined,
     previous: Buffer | string | undefined,
     diff: Buffer | string | undefined,
-    diffError: string | undefined,
+    header: string,
+    diffError: string,
     log: string[] | undefined,
-    title = `${this.kind} comparison failed:`): ImageMatcherResult {
-    const output = [
-      colors.red(title),
-      '',
-    ];
-    if (diffError)
-      output.push(indent(diffError, '  '));
-
+    step: TestStepInfoImpl | undefined): ImageMatcherResult {
+    const output = [`${header}${indent(diffError, '  ')}`];
+    if (this.name) {
+      output.push('');
+      output.push(`  Snapshot: ${this.name}`);
+    }
     if (expected !== undefined) {
       // Copy the expectation inside the `test-results/` folder for backwards compatibility,
       // so that one can upload `test-results/` directory and have all the data inside.
       writeFileSync(this.legacyExpectedPath, expected);
-      this.testInfo.attachments.push({ name: addSuffixToFilePath(this.attachmentBaseName, '-expected'), contentType: this.mimeType, path: this.expectedPath });
-      output.push(`\nExpected: ${colors.yellow(this.expectedPath)}`);
+      step?._attachToStep({ name: addSuffixToFilePath(this.attachmentBaseName, '-expected'), contentType: this.mimeType, path: this.expectedPath });
     }
     if (previous !== undefined) {
       writeFileSync(this.previousPath, previous);
-      this.testInfo.attachments.push({ name: addSuffixToFilePath(this.attachmentBaseName, '-previous'), contentType: this.mimeType, path: this.previousPath });
-      output.push(`Previous: ${colors.yellow(this.previousPath)}`);
+      step?._attachToStep({ name: addSuffixToFilePath(this.attachmentBaseName, '-previous'), contentType: this.mimeType, path: this.previousPath });
     }
     if (actual !== undefined) {
       writeFileSync(this.actualPath, actual);
-      this.testInfo.attachments.push({ name: addSuffixToFilePath(this.attachmentBaseName, '-actual'), contentType: this.mimeType, path: this.actualPath });
-      output.push(`Received: ${colors.yellow(this.actualPath)}`);
+      step?._attachToStep({ name: addSuffixToFilePath(this.attachmentBaseName, '-actual'), contentType: this.mimeType, path: this.actualPath });
     }
     if (diff !== undefined) {
       writeFileSync(this.diffPath, diff);
-      this.testInfo.attachments.push({ name: addSuffixToFilePath(this.attachmentBaseName, '-diff'), contentType: this.mimeType, path: this.diffPath });
-      output.push(`    Diff: ${colors.yellow(this.diffPath)}`);
+      step?._attachToStep({ name: addSuffixToFilePath(this.attachmentBaseName, '-diff'), contentType: this.mimeType, path: this.diffPath });
     }
 
     if (log?.length)
@@ -293,7 +247,7 @@ class SnapshotHelper {
 }
 
 export function toMatchSnapshot(
-  this: ExpectMatcherState,
+  this: ExpectMatcherStateInternal,
   received: Buffer | string,
   nameOrOptions: NameOrSegments | { name?: NameOrSegments } & ImageComparatorOptions = {},
   optOptions: ImageComparatorOptions = {}
@@ -309,7 +263,7 @@ export function toMatchSnapshot(
 
   const configOptions = testInfo._projectInternal.expect?.toMatchSnapshot || {};
   const helper = new SnapshotHelper(
-      testInfo, 'toMatchSnapshot', undefined, determineFileExtension(received),
+      testInfo, 'toMatchSnapshot', undefined, '.' + determineFileExtension(received),
       configOptions, nameOrOptions, optOptions);
 
   if (this.isNot) {
@@ -320,21 +274,36 @@ export function toMatchSnapshot(
   }
 
   if (!fs.existsSync(helper.expectedPath))
-    return helper.handleMissing(received);
+    return helper.handleMissing(received, this._stepInfo);
 
   const expected = fs.readFileSync(helper.expectedPath);
-  const result = helper.comparator(received, expected, helper.options);
-  if (!result)
-    return helper.handleMatching();
 
   if (helper.updateSnapshots === 'all') {
+    if (!compareBuffersOrStrings(received, expected))
+      return helper.handleMatching();
+    writeFileSync(helper.expectedPath, received);
+    /* eslint-disable no-console */
+    console.log(helper.expectedPath + ' is not the same, writing actual.');
+    return helper.createMatcherResult(helper.expectedPath + ' running with --update-snapshots, writing actual.', true);
+  }
+
+  if (helper.updateSnapshots === 'changed') {
+    const result = helper.comparator(received, expected, helper.options);
+    if (!result)
+      return helper.handleMatching();
     writeFileSync(helper.expectedPath, received);
     /* eslint-disable no-console */
     console.log(helper.expectedPath + ' does not match, writing actual.');
     return helper.createMatcherResult(helper.expectedPath + ' running with --update-snapshots, writing actual.', true);
   }
 
-  return helper.handleDifferent(received, expected, undefined, result.diff, result.errorMessage, undefined);
+  const result = helper.comparator(received, expected, helper.options);
+  if (!result)
+    return helper.handleMatching();
+
+  const receiver = isString(received) ? 'string' : 'Buffer';
+  const header = matcherHint(this, undefined, 'toMatchSnapshot', receiver, undefined, undefined, undefined);
+  return helper.handleDifferent(received, expected, undefined, result.diff, header, result.errorMessage, undefined, this._stepInfo);
 }
 
 export function toHaveScreenshotStepTitle(
@@ -350,7 +319,7 @@ export function toHaveScreenshotStepTitle(
 }
 
 export async function toHaveScreenshot(
-  this: ExpectMatcherState,
+  this: ExpectMatcherStateInternal,
   pageOrLocator: Page | Locator,
   nameOrOptions: NameOrSegments | { name?: NameOrSegments } & ToHaveScreenshotOptions = {},
   optOptions: ToHaveScreenshotOptions = {}
@@ -365,11 +334,12 @@ export async function toHaveScreenshot(
   expectTypes(pageOrLocator, ['Page', 'Locator'], 'toHaveScreenshot');
   const [page, locator] = pageOrLocator.constructor.name === 'Page' ? [(pageOrLocator as PageEx), undefined] : [(pageOrLocator as Locator).page() as PageEx, pageOrLocator as Locator];
   const configOptions = testInfo._projectInternal.expect?.toHaveScreenshot || {};
-  const helper = new SnapshotHelper(testInfo, 'toHaveScreenshot', locator, 'png', configOptions, nameOrOptions, optOptions);
+  const helper = new SnapshotHelper(testInfo, 'toHaveScreenshot', locator, undefined, configOptions, nameOrOptions, optOptions);
   if (!helper.expectedPath.toLowerCase().endsWith('.png'))
     throw new Error(`Screenshot name "${path.basename(helper.expectedPath)}" must have '.png' extension`);
   expectTypes(pageOrLocator, ['Page', 'Locator'], 'toHaveScreenshot');
   const style = await loadScreenshotStyles(helper.options.stylePath);
+  const timeout = helper.options.timeout ?? this.timeout;
   const expectScreenshotOptions: ExpectScreenshotOptions = {
     locator,
     animations: helper.options.animations ?? 'disabled',
@@ -382,7 +352,7 @@ export async function toHaveScreenshot(
     scale: helper.options.scale ?? 'css',
     style,
     isNot: !!this.isNot,
-    timeout: helper.options.timeout ?? this.timeout,
+    timeout,
     comparator: helper.options.comparator,
     maxDiffPixels: helper.options.maxDiffPixels,
     maxDiffPixelRatio: helper.options.maxDiffPixelRatio,
@@ -406,37 +376,50 @@ export async function toHaveScreenshot(
   if (helper.updateSnapshots === 'none' && !hasSnapshot)
     return helper.createMatcherResult(`A snapshot doesn't exist at ${helper.expectedPath}.`, false);
 
+  const receiver = locator ? 'locator' : 'page';
   if (!hasSnapshot) {
     // Regenerate a new screenshot by waiting until two screenshots are the same.
-    const { actual, previous, diff, errorMessage, log } = await page._expectScreenshot(expectScreenshotOptions);
+    const { actual, previous, diff, errorMessage, log, timedOut } = await page._expectScreenshot(expectScreenshotOptions);
     // We tried re-generating new snapshot but failed.
     // This can be due to e.g. spinning animation, so we want to show it as a diff.
-    if (errorMessage)
-      return helper.handleDifferent(actual, undefined, previous, diff, undefined, log, errorMessage);
+    if (errorMessage) {
+      const header = matcherHint(this, locator, 'toHaveScreenshot', receiver, undefined, undefined, timedOut ? timeout : undefined);
+      return helper.handleDifferent(actual, undefined, previous, diff, header, errorMessage, log, this._stepInfo);
+    }
 
     // We successfully generated new screenshot.
-    return helper.handleMissing(actual!);
+    return helper.handleMissing(actual!, this._stepInfo);
   }
 
   // General case:
   // - snapshot exists
   // - regular matcher (i.e. not a `.not`)
-  // - perhaps an 'all' flag to update non-matching screenshots
-  expectScreenshotOptions.expected = await fs.promises.readFile(helper.expectedPath);
-  const { actual, diff, errorMessage, log } = await page._expectScreenshot(expectScreenshotOptions);
-
-  if (!errorMessage)
-    return helper.handleMatching();
+  const expected = await fs.promises.readFile(helper.expectedPath);
+  expectScreenshotOptions.expected = helper.updateSnapshots === 'all' ? undefined : expected;
 
-  if (helper.updateSnapshots === 'all') {
+  const { actual, previous, diff, errorMessage, log, timedOut } = await page._expectScreenshot(expectScreenshotOptions);
+  const writeFiles = () => {
     writeFileSync(helper.expectedPath, actual!);
     writeFileSync(helper.actualPath, actual!);
     /* eslint-disable no-console */
     console.log(helper.expectedPath + ' is re-generated, writing actual.');
     return helper.createMatcherResult(helper.expectedPath + ' running with --update-snapshots, writing actual.', true);
+  };
+
+  if (!errorMessage) {
+    // Screenshot is matching, but is not necessarily the same as the expected.
+    if (helper.updateSnapshots === 'all' && actual && compareBuffersOrStrings(actual, expected)) {
+      console.log(helper.expectedPath + ' is re-generated, writing actual.');
+      return writeFiles();
+    }
+    return helper.handleMatching();
   }
 
-  return helper.handleDifferent(actual, expectScreenshotOptions.expected, undefined, diff, errorMessage, log);
+  if (helper.updateSnapshots === 'changed' || helper.updateSnapshots === 'all')
+    return writeFiles();
+
+  const header = matcherHint(this, undefined, 'toHaveScreenshot', receiver, undefined, undefined, timedOut ? timeout : undefined);
+  return helper.handleDifferent(actual, expectScreenshotOptions.expected, previous, diff, header, errorMessage, log, this._stepInfo);
 }
 
 function writeFileSync(aPath: string, content: Buffer | string) {
diff --git a/packages/playwright/src/matchers/toMatchText.ts b/packages/playwright/src/matchers/toMatchText.ts
index 790b402d2fd78..0320d14f99682 100644
--- a/packages/playwright/src/matchers/toMatchText.ts
+++ b/packages/playwright/src/matchers/toMatchText.ts
@@ -15,28 +15,28 @@
  */
 
 
-import type { ExpectedTextValue } from '@protocol/channels';
-import { isRegExp, isString } from 'playwright-core/lib/utils';
-import { expectTypes, callLogText } from '../util';
+import { colors } from 'playwright-core/lib/utils';
+
+import { callLogText, expectTypes } from '../util';
 import {
   printReceivedStringContainExpectedResult,
   printReceivedStringContainExpectedSubstring
 } from './expect';
-import { EXPECTED_COLOR } from '../common/expectBundle';
-import type { ExpectMatcherState } from '../../types/test';
 import { kNoElementsFoundError, matcherHint } from './matcherHint';
+import { EXPECTED_COLOR } from '../common/expectBundle';
+
 import type { MatcherResult } from './matcherHint';
-import type { Locator } from 'playwright-core';
-import { colors } from 'playwright-core/lib/utilsBundle';
+import type { ExpectMatcherState } from '../../types/test';
+import type { Page, Locator } from 'playwright-core';
 
 export async function toMatchText(
   this: ExpectMatcherState,
   matcherName: string,
-  receiver: Locator,
-  receiverType: string,
+  receiver: Locator | Page,
+  receiverType: 'Locator' | 'Page',
   query: (isNot: boolean, timeout: number) => Promise<{ matches: boolean, received?: string, log?: string[], timedOut?: boolean }>,
   expected: string | RegExp,
-  options: { timeout?: number, matchSubstring?: boolean } = {},
+  options: { timeout?: number, matchSubstring?: boolean, receiverLabel?: string } = {},
 ): Promise<MatcherResult<string | RegExp, string>> {
   expectTypes(receiver, [receiverType], matcherName);
 
@@ -51,7 +51,7 @@ export async function toMatchText(
   ) {
     // Same format as jest's matcherErrorMessage
     throw new Error([
-      matcherHint(this, receiver, matcherName, receiver, expected, matcherOptions),
+      matcherHint(this, receiverType === 'Locator' ? receiver as Locator : undefined, matcherName, options.receiverLabel ?? receiver, expected, matcherOptions, undefined, undefined, true),
       `${colors.bold('Matcher error')}: ${EXPECTED_COLOR('expected',)} value must be a string or regular expression`,
       this.utils.printWithType('Expected', expected, this.utils.printExpected)
     ].join('\n\n'));
@@ -60,29 +60,56 @@ export async function toMatchText(
   const timeout = options.timeout ?? this.timeout;
 
   const { matches: pass, received, log, timedOut } = await query(!!this.isNot, timeout);
+  if (pass === !this.isNot) {
+    return {
+      name: matcherName,
+      message: () => '',
+      pass,
+      expected
+    };
+  }
+
   const stringSubstring = options.matchSubstring ? 'substring' : 'string';
   const receivedString = received || '';
-  const messagePrefix = matcherHint(this, receiver, matcherName, 'locator', undefined, matcherOptions, timedOut ? timeout : undefined);
   const notFound = received === kNoElementsFoundError;
-  const message = () => {
-    if (pass) {
-      if (typeof expected === 'string') {
-        if (notFound)
-          return messagePrefix + `Expected ${stringSubstring}: not ${this.utils.printExpected(expected)}\nReceived: ${received}` + callLogText(log);
-        const printedReceived = printReceivedStringContainExpectedSubstring(receivedString, receivedString.indexOf(expected), expected.length);
-        return messagePrefix + `Expected ${stringSubstring}: not ${this.utils.printExpected(expected)}\nReceived string: ${printedReceived}` + callLogText(log);
+
+  let printedReceived: string | undefined;
+  let printedExpected: string | undefined;
+  let printedDiff: string | undefined;
+  if (pass) {
+    if (typeof expected === 'string') {
+      if (notFound) {
+        printedExpected = `Expected ${stringSubstring}: not ${this.utils.printExpected(expected)}`;
+        printedReceived = `Received: ${received}`;
       } else {
-        if (notFound)
-          return messagePrefix + `Expected pattern: not ${this.utils.printExpected(expected)}\nReceived: ${received}` + callLogText(log);
-        const printedReceived = printReceivedStringContainExpectedResult(receivedString, typeof expected.exec === 'function' ? expected.exec(receivedString) : null);
-        return messagePrefix + `Expected pattern: not ${this.utils.printExpected(expected)}\nReceived string: ${printedReceived}` + callLogText(log);
+        printedExpected = `Expected ${stringSubstring}: not ${this.utils.printExpected(expected)}`;
+        const formattedReceived = printReceivedStringContainExpectedSubstring(receivedString, receivedString.indexOf(expected), expected.length);
+        printedReceived = `Received string: ${formattedReceived}`;
       }
     } else {
-      const labelExpected = `Expected ${typeof expected === 'string' ? stringSubstring : 'pattern'}`;
-      if (notFound)
-        return messagePrefix + `${labelExpected}: ${this.utils.printExpected(expected)}\nReceived: ${received}` + callLogText(log);
-      return messagePrefix + this.utils.printDiffOrStringify(expected, receivedString, labelExpected, 'Received string', false) + callLogText(log);
+      if (notFound) {
+        printedExpected = `Expected pattern: not ${this.utils.printExpected(expected)}`;
+        printedReceived = `Received: ${received}`;
+      } else {
+        printedExpected = `Expected pattern: not ${this.utils.printExpected(expected)}`;
+        const formattedReceived = printReceivedStringContainExpectedResult(receivedString, typeof expected.exec === 'function' ? expected.exec(receivedString) : null);
+        printedReceived = `Received string: ${formattedReceived}`;
+      }
     }
+  } else {
+    const labelExpected = `Expected ${typeof expected === 'string' ? stringSubstring : 'pattern'}`;
+    if (notFound) {
+      printedExpected = `${labelExpected}: ${this.utils.printExpected(expected)}`;
+      printedReceived = `Received: ${received}`;
+    } else {
+      printedDiff = this.utils.printDiffOrStringify(expected, receivedString, labelExpected, 'Received string', false);
+    }
+  }
+
+  const message = () => {
+    const resultDetails = printedDiff ? printedDiff : printedExpected + '\n' + printedReceived;
+    const hints = matcherHint(this, receiverType === 'Locator' ? receiver as Locator : undefined, matcherName, options.receiverLabel ?? 'locator', undefined, matcherOptions, timedOut ? timeout : undefined, resultDetails, true);
+    return hints + callLogText(log);
   };
 
   return {
@@ -95,14 +122,3 @@ export async function toMatchText(
     timeout: timedOut ? timeout : undefined,
   };
 }
-
-export function toExpectedTextValues(items: (string | RegExp)[], options: { matchSubstring?: boolean, normalizeWhiteSpace?: boolean, ignoreCase?: boolean } = {}): ExpectedTextValue[] {
-  return items.map(i => ({
-    string: isString(i) ? i : undefined,
-    regexSource: isRegExp(i) ? i.source : undefined,
-    regexFlags: isRegExp(i) ? i.flags : undefined,
-    matchSubstring: options.matchSubstring,
-    ignoreCase: options.ignoreCase,
-    normalizeWhiteSpace: options.normalizeWhiteSpace,
-  }));
-}
diff --git a/packages/playwright/src/mcp/bundle.ts b/packages/playwright/src/mcp/bundle.ts
new file mode 100644
index 0000000000000..3c594f11b81ed
--- /dev/null
+++ b/packages/playwright/src/mcp/bundle.ts
@@ -0,0 +1,46 @@
+/**
+ * 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.
+ */
+
+const bundle = require('./mcpBundleImpl');
+const zodToJsonSchema: typeof import('zod-to-json-schema').zodToJsonSchema = require('./mcpBundleImpl').zodToJsonSchema;
+const Client: typeof import('@modelcontextprotocol/sdk/client/index.js').Client = bundle.Client;
+const Server: typeof import('@modelcontextprotocol/sdk/server/index.js').Server = bundle.Server;
+const SSEServerTransport: typeof import('@modelcontextprotocol/sdk/server/sse.js').SSEServerTransport = bundle.SSEServerTransport;
+const StdioServerTransport: typeof import('@modelcontextprotocol/sdk/server/stdio.js').StdioServerTransport = bundle.StdioServerTransport;
+const StreamableHTTPServerTransport: typeof import('@modelcontextprotocol/sdk/server/streamableHttp.js').StreamableHTTPServerTransport = bundle.StreamableHTTPServerTransport;
+const CallToolRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').CallToolRequestSchema = bundle.CallToolRequestSchema;
+const ListRootsRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').ListRootsRequestSchema = bundle.ListRootsRequestSchema;
+const ListToolsRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').ListToolsRequestSchema = bundle.ListToolsRequestSchema;
+const PingRequestSchema: typeof import('@modelcontextprotocol/sdk/types.js').PingRequestSchema = bundle.PingRequestSchema;
+const z: typeof import('zod') = bundle.z;
+
+type ToolSchema<Input extends import('zod').Schema> = import('./tool').ToolSchema<Input>;
+
+export {
+  zodToJsonSchema,
+  Client,
+  Server,
+  SSEServerTransport,
+  StdioServerTransport,
+  StreamableHTTPServerTransport,
+  CallToolRequestSchema,
+  ListRootsRequestSchema,
+  ListToolsRequestSchema,
+  PingRequestSchema,
+  z,
+};
+
+export type { ToolSchema };
diff --git a/packages/playwright-ct-vue2/register.d.ts b/packages/playwright/src/mcp/exports.ts
similarity index 78%
rename from packages/playwright-ct-vue2/register.d.ts
rename to packages/playwright/src/mcp/exports.ts
index f88e9be59d3b3..9ca581762fb9f 100644
--- a/packages/playwright-ct-vue2/register.d.ts
+++ b/packages/playwright/src/mcp/exports.ts
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-export default function pwRegister(
-  components: Record<string, any>,
-  options?: {
-    createApp: any,
-    setDevtoolsHook: any,
-    h: any,
-  }
-): void;
+export * from './inProcessTransport.js';
+export * from './proxyBackend.js';
+export * from './server.js';
+export * from './tool.js';
+export * from './transport.js';
diff --git a/packages/playwright/src/mcp/inProcessTransport.ts b/packages/playwright/src/mcp/inProcessTransport.ts
new file mode 100644
index 0000000000000..317cff11003cc
--- /dev/null
+++ b/packages/playwright/src/mcp/inProcessTransport.ts
@@ -0,0 +1,92 @@
+/**
+ * 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);
+  }
+}
diff --git a/packages/playwright/src/mcp/proxyBackend.ts b/packages/playwright/src/mcp/proxyBackend.ts
new file mode 100644
index 0000000000000..529b3bc8e453f
--- /dev/null
+++ b/packages/playwright/src/mcp/proxyBackend.ts
@@ -0,0 +1,131 @@
+/**
+ * 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 'playwright-core/lib/utilsBundle';
+
+import * as mcpBundle from './bundle';
+
+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';
+import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
+
+const errorsDebug = debug('pw:mcp:errors');
+
+export type MCPProvider = {
+  name: string;
+  description: string;
+  connect(): Promise<Transport>;
+};
+
+export class ProxyBackend implements ServerBackend {
+  readonly name: string;
+  readonly version: string;
+
+  private _mcpProviders: MCPProvider[];
+  private _currentClient: Client | undefined;
+  private _contextSwitchTool: Tool;
+  private _roots: Root[] = [];
+
+  constructor(name: string, version: string, mcpProviders: MCPProvider[]) {
+    this.name = name;
+    this.version = version;
+    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: mcpBundle.zodToJsonSchema(mcpBundle.z.object({
+        name: mcpBundle.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 mcpBundle.Client({ name: this.name, version: this.version });
+    client.registerCapabilities({
+      roots: {
+        listRoots: true,
+      },
+    });
+    client.setRequestHandler(mcpBundle.ListRootsRequestSchema, () => ({ roots: this._roots }));
+    client.setRequestHandler(mcpBundle.PingRequestSchema, () => ({}));
+
+    const transport = await factory.connect();
+    await client.connect(transport);
+    this._currentClient = client;
+  }
+}
diff --git a/packages/playwright/src/mcp/server.ts b/packages/playwright/src/mcp/server.ts
new file mode 100644
index 0000000000000..24a3ce17e236c
--- /dev/null
+++ b/packages/playwright/src/mcp/server.ts
@@ -0,0 +1,122 @@
+/**
+ * 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 'playwright-core/lib/utilsBundle';
+import * as mcpBundle from './bundle';
+
+import type { Tool, CallToolResult, CallToolRequest, Root } from '@modelcontextprotocol/sdk/types.js';
+import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { Server } from '@modelcontextprotocol/sdk/server/index.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 {
+  name: string;
+  version: string;
+  initialize?(clientVersion: ClientVersion, roots: Root[]): Promise<void>;
+  listTools(): Promise<Tool[]>;
+  callTool(name: string, args: CallToolRequest['params']['arguments']): Promise<CallToolResult>;
+  serverClosed?(): void;
+}
+
+export type ServerBackendFactory = () => ServerBackend;
+
+export async function connect(serverBackendFactory: ServerBackendFactory, transport: Transport, runHeartbeat: boolean) {
+  const backend = serverBackendFactory();
+  const server = createServer(backend, runHeartbeat);
+  await server.connect(transport);
+}
+
+export function createServer(backend: ServerBackend, runHeartbeat: boolean): Server {
+  let initializedCallback = () => {};
+  const initializedPromise = new Promise<void>(resolve => initializedCallback = resolve);
+  const server = new mcpBundle.Server({ name: backend.name, version: backend.version }, {
+    capabilities: {
+      tools: {},
+    }
+  });
+
+  server.setRequestHandler(mcpBundle.ListToolsRequestSchema, async () => {
+    serverDebug('listTools');
+    await initializedPromise;
+    const tools = await backend.listTools();
+    return { tools };
+  });
+
+  let heartbeatRunning = false;
+  server.setRequestHandler(mcpBundle.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);
+      initializedCallback();
+    } 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();
+  };
+}
diff --git a/packages/playwright/src/mcp/tool.ts b/packages/playwright/src/mcp/tool.ts
new file mode 100644
index 0000000000000..78e39a9a3020b
--- /dev/null
+++ b/packages/playwright/src/mcp/tool.ts
@@ -0,0 +1,42 @@
+/**
+ * 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 './bundle';
+
+import type { z } from 'zod';
+import type * as mcpServer from './server';
+
+export type ToolSchema<Input extends z.Schema> = {
+  name: string;
+  title: string;
+  description: string;
+  type: 'readOnly' | 'destructive';
+  inputSchema: Input;
+};
+
+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,
+    },
+  };
+}
diff --git a/packages/playwright/src/mcp/transport.ts b/packages/playwright/src/mcp/transport.ts
new file mode 100644
index 0000000000000..b4161b692c0f4
--- /dev/null
+++ b/packages/playwright/src/mcp/transport.ts
@@ -0,0 +1,162 @@
+/**
+ * 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 http from 'http';
+import net from 'net';
+import crypto from 'crypto';
+import { debug } from 'playwright-core/lib/utilsBundle';
+
+import * as mcpBundle from './bundle';
+import * as mcpServer from './server';
+
+import type { ServerBackendFactory } from './server.js';
+import type { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
+import type { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+
+export async function start(serverBackendFactory: ServerBackendFactory, options: { host?: string; port?: number }) {
+  if (options.port !== undefined) {
+    const httpServer = await startHttpServer(options);
+    startHttpTransport(httpServer, serverBackendFactory);
+  } else {
+    await startStdioTransport(serverBackendFactory);
+  }
+}
+
+async function startStdioTransport(serverBackendFactory: ServerBackendFactory) {
+  await mcpServer.connect(serverBackendFactory, new mcpBundle.StdioServerTransport(), false);
+}
+
+const testDebug = debug('pw:mcp:test');
+
+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 mcpBundle.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 mcpBundle.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');
+}
+
+function startHttpTransport(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);
+  });
+  const url = httpAddressToString(httpServer.address());
+  const message = [
+    `Listening on ${url}`,
+    'Put this in your client config:',
+    JSON.stringify({
+      'mcpServers': {
+        'playwright': {
+          'url': `${url}/mcp`
+        }
+      }
+    }, 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);
+}
+
+async function startHttpServer(config: { host?: string, port?: number }): Promise<http.Server> {
+  const { host, port } = config;
+  const httpServer = http.createServer();
+  await new Promise<void>((resolve, reject) => {
+    httpServer.on('error', reject);
+    httpServer.listen(port, host, () => {
+      resolve();
+      httpServer.removeListener('error', reject);
+    });
+  });
+  return httpServer;
+}
+
+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}`;
+}
diff --git a/packages/playwright/src/plugins/gitCommitInfoPlugin.ts b/packages/playwright/src/plugins/gitCommitInfoPlugin.ts
index 4c55a3eab33b3..06a67f41eebea 100644
--- a/packages/playwright/src/plugins/gitCommitInfoPlugin.ts
+++ b/packages/playwright/src/plugins/gitCommitInfoPlugin.ts
@@ -14,85 +14,184 @@
  * limitations under the License.
  */
 
-import { createGuid, spawnAsync } from 'playwright-core/lib/utils';
+import * as fs from 'fs';
+
+import { monotonicTime, spawnAsync } from 'playwright-core/lib/utils';
+
 import type { TestRunnerPlugin } from './';
 import type { FullConfig } from '../../types/testReporter';
+import type { FullConfigInternal } from '../common/config';
+import type { GitCommitInfo, CIInfo, MetadataWithCommitInfo } from '../isomorphic/types';
+
+const GIT_OPERATIONS_TIMEOUT_MS = 3000;
+
+export const addGitCommitInfoPlugin = (fullConfig: FullConfigInternal) => {
+  fullConfig.plugins.push({ factory: gitCommitInfoPlugin.bind(null, fullConfig) });
+};
+
+function print(s: string, ...args: any[]) {
+  // eslint-disable-next-line no-console
+  console.log('GitCommitInfo: ' + s, ...args);
+}
 
-const GIT_OPERATIONS_TIMEOUT_MS = 1500;
+function debug(s: string, ...args: any[]) {
+  if (!process.env.DEBUG_GIT_COMMIT_INFO)
+    return;
+  print(s, ...args);
+}
 
-export const gitCommitInfo = (options?: GitCommitInfoPluginOptions): TestRunnerPlugin => {
+const gitCommitInfoPlugin = (fullConfig: FullConfigInternal): TestRunnerPlugin => {
   return {
     name: 'playwright:git-commit-info',
 
     setup: async (config: FullConfig, configDir: string) => {
-      const info = {
-        ...linksFromEnv(),
-        ...options?.info ? options.info : await gitStatusFromCLI(options?.directory || configDir),
-        timestamp: Date.now(),
-      };
-      // Normalize dates
-      const timestamp = info['revision.timestamp'];
-      if (timestamp instanceof Date)
-        info['revision.timestamp'] = timestamp.getTime();
-
-      config.metadata = config.metadata || {};
-      Object.assign(config.metadata, info);
+      const metadata = config.metadata as MetadataWithCommitInfo;
+      const ci = await ciInfo();
+      if (!metadata.ci && ci) {
+        debug('ci info', ci);
+        metadata.ci = ci;
+      }
+
+      if (fullConfig.captureGitInfo?.commit || (fullConfig.captureGitInfo?.commit === undefined && ci)) {
+        const git = await gitCommitInfo(configDir).catch(e => print('failed to get git commit info', e));
+        if (git) {
+          debug('commit info', git);
+          metadata.gitCommit = git;
+        }
+      }
+
+      if (fullConfig.captureGitInfo?.diff || (fullConfig.captureGitInfo?.diff === undefined && ci)) {
+        const diffResult = await gitDiff(configDir, ci).catch(e => print('failed to get git diff', e));
+        if (diffResult) {
+          debug(`diff length ${diffResult.length}`);
+          metadata.gitDiff = diffResult;
+        }
+      }
     },
   };
 };
 
-export interface GitCommitInfoPluginOptions {
-    directory?: string;
-    info?: Info;
+async function ciInfo(): Promise<CIInfo | undefined> {
+  if (process.env.GITHUB_ACTIONS) {
+    let pr: { title: string, number: number, baseHash: string } | undefined;
+    try {
+      const json = JSON.parse(await fs.promises.readFile(process.env.GITHUB_EVENT_PATH!, 'utf8'));
+      pr = { title: json.pull_request.title, number: json.pull_request.number, baseHash: json.pull_request.base.sha };
+    } catch {
+    }
+
+    return {
+      commitHref: `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/commit/${process.env.GITHUB_SHA}`,
+      commitHash: process.env.GITHUB_SHA,
+      prHref: pr ? `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/pull/${pr.number}` : undefined,
+      prTitle: pr?.title,
+      prBaseHash: pr?.baseHash,
+      buildHref: `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`,
+    };
+  }
+
+  if (process.env.GITLAB_CI) {
+    return {
+      commitHref: `${process.env.CI_PROJECT_URL}/-/commit/${process.env.CI_COMMIT_SHA}`,
+      commitHash: process.env.CI_COMMIT_SHA,
+      buildHref: process.env.CI_JOB_URL,
+      branch: process.env.CI_COMMIT_REF_NAME,
+    };
+  }
+
+  if (process.env.JENKINS_URL && process.env.BUILD_URL) {
+    return {
+      commitHref: process.env.BUILD_URL,
+      commitHash: process.env.GIT_COMMIT,
+      branch: process.env.GIT_BRANCH,
+    };
+  }
+
+  // Open to PRs.
 }
 
-export interface Info {
-  'revision.id'?: string;
-  'revision.author'?: string;
-  'revision.email'?: string;
-  'revision.subject'?: string;
-  'revision.timestamp'?: number | Date;
-  'revision.link'?: string;
-  'ci.link'?: string;
+async function gitCommitInfo(gitDir: string): Promise<GitCommitInfo | undefined> {
+  const separator = `---786eec917292---`;
+  const tokens = [
+    '%H',  // commit hash
+    '%h',  // abbreviated commit hash
+    '%s',  // subject
+    '%B',  // raw body (unwrapped subject and body)
+    '%an', // author name
+    '%ae', // author email
+    '%at', // author date, UNIX timestamp
+    '%cn', // committer name
+    '%ce', // committer email
+    '%ct', // committer date, UNIX timestamp
+    '',    // branch
+  ];
+  const output = await runGit(`git log -1 --pretty=format:"${tokens.join(separator)}" && git rev-parse --abbrev-ref HEAD`, gitDir);
+  if (!output)
+    return undefined;
+  const [hash, shortHash, subject, body, authorName, authorEmail, authorTime, committerName, committerEmail, committerTime, branch] = output.split(separator);
+
+  return {
+    shortHash,
+    hash,
+    subject,
+    body,
+    author: {
+      name: authorName,
+      email: authorEmail,
+      time: +authorTime * 1000,
+    },
+    committer: {
+      name: committerName,
+      email: committerEmail,
+      time: +committerTime * 1000,
+    },
+    branch: branch.trim(),
+  };
 }
 
-const linksFromEnv = (): Pick<Info, 'revision.link' | 'ci.link'> => {
-  const out: { 'revision.link'?: string; 'ci.link'?: string; } = {};
-  // Jenkins: https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
-  if (process.env.BUILD_URL)
-    out['ci.link'] = process.env.BUILD_URL;
-  // GitLab: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
-  if (process.env.CI_PROJECT_URL && process.env.CI_COMMIT_SHA)
-    out['revision.link'] = `${process.env.CI_PROJECT_URL}/-/commit/${process.env.CI_COMMIT_SHA}`;
-  if (process.env.CI_JOB_URL)
-    out['ci.link'] = process.env.CI_JOB_URL;
-    // GitHub: https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
-  if (process.env.GITHUB_SERVER_URL && process.env.GITHUB_REPOSITORY && process.env.GITHUB_SHA)
-    out['revision.link'] = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/commit/${process.env.GITHUB_SHA}`;
-  if (process.env.GITHUB_SERVER_URL && process.env.GITHUB_REPOSITORY && process.env.GITHUB_RUN_ID)
-    out['ci.link'] = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
-  return out;
-};
+async function gitDiff(gitDir: string, ci?: CIInfo): Promise<string | undefined> {
+  const diffLimit = 100_000;
+  if (ci?.prBaseHash) {
+    // https://git-scm.com/docs/git-fetch
+    await runGit(`git fetch origin ${ci.prBaseHash} --depth=1 --no-auto-maintenance --no-auto-gc --no-tags --no-recurse-submodules`, gitDir);
+    const diff = await runGit(`git diff ${ci.prBaseHash} HEAD`, gitDir);
+    if (diff)
+      return diff.substring(0, diffLimit);
+  }
 
-export const gitStatusFromCLI = async (gitDir: string): Promise<Info | undefined> => {
-  const separator = `:${createGuid().slice(0, 4)}:`;
-  const { code, stdout } = await spawnAsync(
-      'git',
-      ['show', '-s', `--format=%H${separator}%s${separator}%an${separator}%ae${separator}%ct`, 'HEAD'],
-      { stdio: 'pipe', cwd: gitDir, timeout: GIT_OPERATIONS_TIMEOUT_MS }
-  );
-  if (code)
+  // Do not attempt to diff on CI commit.
+  if (ci)
     return;
-  const showOutput = stdout.trim();
-  const [id, subject, author, email, rawTimestamp] = showOutput.split(separator);
-  let timestamp: number = Number.parseInt(rawTimestamp, 10);
-  timestamp = Number.isInteger(timestamp) ? timestamp * 1000 : 0;
 
-  return {
-    'revision.id': id,
-    'revision.author': author,
-    'revision.email': email,
-    'revision.subject': subject,
-    'revision.timestamp': timestamp,
-  };
-};
+  // Check dirty state first.
+  const uncommitted = await runGit('git diff', gitDir);
+  if (uncommitted === undefined) {
+    // Failed to run git diff.
+    return;
+  }
+  if (uncommitted)
+    return uncommitted.substring(0, diffLimit);
+
+  // Assume non-shallow checkout on local.
+  const diff = await runGit('git diff HEAD~1', gitDir);
+  return diff?.substring(0, diffLimit);
+}
+
+async function runGit(command: string, cwd: string): Promise<string | undefined> {
+  debug(`running "${command}"`);
+  const start = monotonicTime();
+  const result = await spawnAsync(
+      command,
+      [],
+      { stdio: 'pipe', cwd, timeout: GIT_OPERATIONS_TIMEOUT_MS, shell: true }
+  );
+  if (monotonicTime() - start > GIT_OPERATIONS_TIMEOUT_MS) {
+    print(`timeout of ${GIT_OPERATIONS_TIMEOUT_MS}ms exceeded while running "${command}"`);
+    return;
+  }
+  if (result.code)
+    debug(`failure, code=${result.code}\n\n${result.stderr}`);
+  else
+    debug(`success`);
+  return result.code ? undefined : result.stdout.trim();
+}
diff --git a/packages/playwright/src/plugins/index.ts b/packages/playwright/src/plugins/index.ts
index 3502d90966313..7734145468e25 100644
--- a/packages/playwright/src/plugins/index.ts
+++ b/packages/playwright/src/plugins/index.ts
@@ -21,6 +21,8 @@ export interface TestRunnerPlugin {
   name: string;
   setup?(config: FullConfig, configDir: string, reporter: ReporterV2): Promise<void>;
   populateDependencies?(): Promise<void>;
+  startDevServer?(): Promise<() => Promise<void>>;
+  clearCache?(): Promise<void>;
   begin?(suite: Suite): Promise<void>;
   end?(): Promise<void>;
   teardown?(): Promise<void>;
@@ -29,7 +31,7 @@ export interface TestRunnerPlugin {
 export type TestRunnerPluginRegistration = {
   factory: TestRunnerPlugin | (() => TestRunnerPlugin | Promise<TestRunnerPlugin>);
   instance?: TestRunnerPlugin;
+  devServerCleanup?: any;
 };
 
 export { webServer } from './webServerPlugin';
-export { gitCommitInfo } from './gitCommitInfoPlugin';
diff --git a/packages/playwright/src/plugins/webServerPlugin.ts b/packages/playwright/src/plugins/webServerPlugin.ts
index 86f84ad652e91..afd067c855054 100644
--- a/packages/playwright/src/plugins/webServerPlugin.ts
+++ b/packages/playwright/src/plugins/webServerPlugin.ts
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import path from 'path';
 import net from 'net';
+import path from 'path';
 
-import { colors, debug } from 'playwright-core/lib/utilsBundle';
-import { raceAgainstDeadline, launchProcess, monotonicTime, isURLAvailable } from 'playwright-core/lib/utils';
+import { launchProcess, isURLAvailable, monotonicTime, raceAgainstDeadline } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+import { debug } from 'playwright-core/lib/utilsBundle';
 
-import type { FullConfig } from '../../types/testReporter';
 import type { TestRunnerPlugin } from '.';
+import type { FullConfig } from '../../types/testReporter';
 import type { FullConfigInternal } from '../common/config';
 import type { ReporterV2 } from '../reporters/reporterV2';
 
@@ -30,11 +31,13 @@ export type WebServerPluginOptions = {
   url?: string;
   ignoreHTTPSErrors?: boolean;
   timeout?: number;
+  gracefulShutdown?: { signal: 'SIGINT' | 'SIGTERM', timeout?: number };
   reuseExistingServer?: boolean;
   cwd?: string;
   env?: { [key: string]: string; };
   stdout?: 'pipe' | 'ignore';
   stderr?: 'pipe' | 'ignore';
+  name?: string;
 };
 
 const DEFAULT_ENVIRONMENT_VARIABLES = {
@@ -73,7 +76,9 @@ export class WebServerPlugin implements TestRunnerPlugin {
   }
 
   public async teardown() {
+    debugWebServer(`Terminating the WebServer`);
     await this._killProcess?.();
+    debugWebServer(`Terminated the WebServer`);
   }
 
   private async _startProcess(): Promise<void> {
@@ -90,7 +95,7 @@ export class WebServerPlugin implements TestRunnerPlugin {
     }
 
     debugWebServer(`Starting WebServer process ${this._options.command}...`);
-    const { launchedProcess, kill } = await launchProcess({
+    const { launchedProcess, gracefullyClose } = await launchProcess({
       command: this._options.command,
       env: {
         ...DEFAULT_ENVIRONMENT_VARIABLES,
@@ -100,24 +105,43 @@ export class WebServerPlugin implements TestRunnerPlugin {
       cwd: this._options.cwd,
       stdio: 'stdin',
       shell: true,
-      // Reject to indicate that we cannot close the web server gracefully
-      // and should fallback to non-graceful shutdown.
-      attemptToGracefullyClose: () => Promise.reject(),
+      attemptToGracefullyClose: async () => {
+        if (process.platform === 'win32')
+          throw new Error('Graceful shutdown is not supported on Windows');
+        if (!this._options.gracefulShutdown)
+          throw new Error('skip graceful shutdown');
+
+        const { signal, timeout = 0 } = this._options.gracefulShutdown;
+
+        // proper usage of SIGINT is to send it to the entire process group, see https://www.cons.org/cracauer/sigint.html
+        // there's no such convention for SIGTERM, so we decide what we want. signaling the process group for consistency.
+        process.kill(-launchedProcess.pid!, signal);
+
+        return new Promise<void>((resolve, reject) => {
+          const timer = timeout !== 0
+            ? setTimeout(() => reject(new Error(`process didn't close gracefully within timeout`)), timeout)
+            : undefined;
+          launchedProcess.once('close', (...args) => {
+            clearTimeout(timer);
+            resolve();
+          });
+        });
+      },
       log: () => {},
       onExit: code => processExitedReject(new Error(code ? `Process from config.webServer was not able to start. Exit code: ${code}` : 'Process from config.webServer exited early.')),
       tempDirectories: [],
     });
-    this._killProcess = kill;
+    this._killProcess = gracefullyClose;
 
     debugWebServer(`Process started`);
 
-    launchedProcess.stderr!.on('data', line => {
+    launchedProcess.stderr!.on('data', data => {
       if (debugWebServer.enabled || (this._options.stderr === 'pipe' || !this._options.stderr))
-        this._reporter!.onStdErr?.(colors.dim('[WebServer] ') + line.toString());
+        this._reporter!.onStdErr?.(prefixOutputLines(data.toString(), this._options.name));
     });
-    launchedProcess.stdout!.on('data', line => {
+    launchedProcess.stdout!.on('data', data => {
       if (debugWebServer.enabled || this._options.stdout === 'pipe')
-        this._reporter!.onStdOut?.(colors.dim('[WebServer] ') + line.toString());
+        this._reporter!.onStdOut?.(prefixOutputLines(data.toString(), this._options.name));
     });
   }
 
@@ -199,3 +223,14 @@ export const webServerPluginsForConfig = (config: FullConfigInternal): TestRunne
 
   return webServerPlugins;
 };
+
+function prefixOutputLines(output: string, prefixName: string = 'WebServer'): string {
+  const lastIsNewLine = output[output.length - 1] === '\n';
+  let lines = output.split('\n');
+  if (lastIsNewLine)
+    lines.pop();
+  lines = lines.map(line => colors.dim(`[${prefixName}] `) + line);
+  if (lastIsNewLine)
+    lines.push('');
+  return lines.join('\n');
+}
diff --git a/packages/playwright/src/program.ts b/packages/playwright/src/program.ts
index a6c2c5fead766..5e955dbce70e9 100644
--- a/packages/playwright/src/program.ts
+++ b/packages/playwright/src/program.ts
@@ -16,31 +16,44 @@
 
 /* eslint-disable no-console */
 
-import type { Command } from 'playwright-core/lib/utilsBundle';
 import fs from 'fs';
 import path from 'path';
-import { Runner, readLastRunInfo } from './runner/runner';
-import { stopProfiling, startProfiling, gracefullyProcessExitDoNotHang } from 'playwright-core/lib/utils';
-import { serializeError } from './util';
+
+import { program } from 'playwright-core/lib/cli/program';
+import { gracefullyProcessExitDoNotHang, startProfiling, stopProfiling } from 'playwright-core/lib/utils';
+
+import { builtInReporters, defaultReporter, defaultTimeout } from './common/config';
+import { loadConfigFromFile, loadEmptyConfigForMergeReports, resolveConfigLocation } from './common/configLoader';
+export { program } from 'playwright-core/lib/cli/program';
+import { terminalScreen } from './reporters/base';
 import { showHTMLReport } from './reporters/html';
 import { createMergedReport } from './reporters/merge';
-import { loadConfigFromFileRestartIfNeeded, loadEmptyConfigForMergeReports } from './common/configLoader';
+import { filterProjects } from './runner/projectUtils';
+import * as testServer from './runner/testServer';
+import { runWatchModeLoop } from './runner/watchMode';
+import { runAllTestsWithConfig, TestRunner } from './runner/testRunner';
+import { createErrorCollectingReporter } from './runner/reporters';
+
 import type { ConfigCLIOverrides } from './common/ipc';
-import type { FullResult, TestError } from '../types/testReporter';
 import type { TraceMode } from '../types/test';
-import { builtInReporters, defaultReporter, defaultTimeout } from './common/config';
-import { program } from 'playwright-core/lib/cli/program';
-export { program } from 'playwright-core/lib/cli/program';
 import type { ReporterDescription } from '../types/test';
-import { prepareErrorStack } from './reporters/base';
-import * as testServer from './runner/testServer';
-import { clearCacheAndLogToConsole } from './runner/testServer';
+import type { Command } from 'playwright-core/lib/utilsBundle';
 
 function addTestCommand(program: Command) {
   const command = program.command('test [test-filter...]');
   command.description('run tests with Playwright Test');
   const options = testOptions.sort((a, b) => a[0].replace(/-/g, '').localeCompare(b[0].replace(/-/g, '')));
-  options.forEach(([name, description]) => command.option(name, description));
+  options.forEach(([name, { description, choices, preset }]) => {
+    const option = command.createOption(name, description);
+    if (choices)
+      option.choices(choices);
+    if (preset)
+      option.preset(preset);
+    // We don't set the default value here, because we want not specified options to
+    // fall back to the user config, which we haven't parsed yet.
+    command.addOption(option);
+    return command;
+  });
   command.action(async (args, opts) => {
     try {
       await runTests(args, opts);
@@ -60,32 +73,15 @@ Examples:
   $ npx playwright test --project=webkit`);
 }
 
-function addListFilesCommand(program: Command) {
-  const command = program.command('list-files [file-filter...]', { hidden: true });
-  command.description('List files with Playwright Test tests');
-  command.option('-c, --config <file>', `Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"`);
-  command.option('--project <project-name...>', `Only run tests from the specified list of projects, supports '*' wildcard (default: list all projects)`);
-  command.action(async (args, opts) => listTestFiles(opts));
-}
-
 function addClearCacheCommand(program: Command) {
-  const command = program.command('clear-cache', { hidden: true });
+  const command = program.command('clear-cache');
   command.description('clears build and test caches');
   command.option('-c, --config <file>', `Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"`);
   command.action(async opts => {
-    const configInternal = await loadConfigFromFileRestartIfNeeded(opts.config);
-    if (!configInternal)
-      return;
-    await clearCacheAndLogToConsole(configInternal);
-  });
-}
-
-function addFindRelatedTestFilesCommand(program: Command) {
-  const command = program.command('find-related-test-files [source-files...]', { hidden: true });
-  command.description('Returns the list of related tests to the given files');
-  command.option('-c, --config <file>', `Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"`);
-  command.action(async (files, options) => {
-    await withRunnerAndMutedWrite(options.config, runner => runner.findRelatedTestFiles('in-process', files));
+    const runner = new TestRunner(resolveConfigLocation(opts.config), {});
+    const { status } = await runner.clearCache(createErrorCollectingReporter(terminalScreen));
+    const exitCode = status === 'interrupted' ? 130 : (status === 'passed' ? 0 : 1);
+    gracefullyProcessExitDoNotHang(exitCode);
   });
 }
 
@@ -94,17 +90,8 @@ function addDevServerCommand(program: Command) {
   command.description('start dev server');
   command.option('-c, --config <file>', `Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"`);
   command.action(async options => {
-    const configInternal = await loadConfigFromFileRestartIfNeeded(options.config);
-    if (!configInternal)
-      return;
-    const { config } = configInternal;
-    const implementation = (config as any)['@playwright/test']?.['cli']?.['dev-server'];
-    if (implementation) {
-      await implementation(configInternal);
-    } else {
-      console.log(`DevServer is not available in the package you are using. Did you mean to use component testing?`);
-      gracefullyProcessExitDoNotHang(1);
-    }
+    const runner = new TestRunner(resolveConfigLocation(options.config), {});
+    await runner.startDevServer(createErrorCollectingReporter(terminalScreen), 'in-process');
   });
 }
 
@@ -133,7 +120,7 @@ Examples:
 }
 
 function addMergeReportsCommand(program: Command) {
-  const command = program.command('merge-reports [dir]', { hidden: true });
+  const command = program.command('merge-reports [dir]');
   command.description('merge multiple blob reports (for sharded tests) into a single report');
   command.action(async (dir, options) => {
     try {
@@ -157,56 +144,57 @@ async function runTests(args: string[], opts: { [key: string]: any }) {
   await startProfiling();
   const cliOverrides = overridesFromOptions(opts);
 
+  const config = await loadConfigFromFile(opts.config, cliOverrides, opts.deps === false);
+  config.cliArgs = args;
+  config.cliGrep = opts.grep as string | undefined;
+  config.cliOnlyChanged = opts.onlyChanged === true ? 'HEAD' : opts.onlyChanged;
+  config.cliGrepInvert = opts.grepInvert as string | undefined;
+  config.cliListOnly = !!opts.list;
+  config.cliProjectFilter = opts.project || undefined;
+  config.cliPassWithNoTests = !!opts.passWithNoTests;
+  config.cliLastFailed = !!opts.lastFailed;
+
+  // Evaluate project filters against config before starting execution. This enables a consistent error message across run modes
+  filterProjects(config.projects, config.cliProjectFilter);
+
   if (opts.ui || opts.uiHost || opts.uiPort) {
     if (opts.onlyChanged)
       throw new Error(`--only-changed is not supported in UI mode. If you'd like that to change, see https://github.com/microsoft/playwright/issues/15075 for more details.`);
 
-    const status = await testServer.runUIMode(opts.config, {
+    const status = await testServer.runUIMode(opts.config, cliOverrides, {
       host: opts.uiHost,
       port: opts.uiPort ? +opts.uiPort : undefined,
       args,
       grep: opts.grep as string | undefined,
       grepInvert: opts.grepInvert as string | undefined,
       project: opts.project || undefined,
-      headed: opts.headed,
       reporter: Array.isArray(opts.reporter) ? opts.reporter : opts.reporter ? [opts.reporter] : undefined,
-      workers: cliOverrides.workers,
-      timeout: cliOverrides.timeout,
-      outputDir: cliOverrides.outputDir,
-      updateSnapshots: cliOverrides.updateSnapshots,
     });
     await stopProfiling('runner');
-    if (status === 'restarted')
-      return;
     const exitCode = status === 'interrupted' ? 130 : (status === 'passed' ? 0 : 1);
     gracefullyProcessExitDoNotHang(exitCode);
     return;
   }
 
-  const config = await loadConfigFromFileRestartIfNeeded(opts.config, cliOverrides, opts.deps === false);
-  if (!config)
+  if (process.env.PWTEST_WATCH) {
+    if (opts.onlyChanged)
+      throw new Error(`--only-changed is not supported in watch mode. If you'd like that to change, file an issue and let us know about your usecase for it.`);
+
+    const status = await runWatchModeLoop(
+        resolveConfigLocation(opts.config),
+        {
+          projects: opts.project,
+          files: args,
+          grep: opts.grep
+        }
+    );
+    await stopProfiling('runner');
+    const exitCode = status === 'interrupted' ? 130 : (status === 'passed' ? 0 : 1);
+    gracefullyProcessExitDoNotHang(exitCode);
     return;
-
-  if (opts.lastFailed) {
-    const lastRunInfo = await readLastRunInfo(config);
-    config.testIdMatcher = id => lastRunInfo.failedTests.includes(id);
   }
 
-  config.cliArgs = args;
-  config.cliGrep = opts.grep as string | undefined;
-  config.cliOnlyChanged = opts.onlyChanged === true ? 'HEAD' : opts.onlyChanged;
-  config.cliGrepInvert = opts.grepInvert as string | undefined;
-  config.cliListOnly = !!opts.list;
-  config.cliProjectFilter = opts.project || undefined;
-  config.cliPassWithNoTests = !!opts.passWithNoTests;
-  config.cliFailOnFlakyTests = !!opts.failOnFlakyTests;
-
-  const runner = new Runner(config);
-  let status: FullResult['status'];
-  if (process.env.PWTEST_WATCH)
-    status = await runner.watchAllTests();
-  else
-    status = await runner.runAllTests();
+  const status = await runAllTestsWithConfig(config);
   await stopProfiling('runner');
   const exitCode = status === 'interrupted' ? 130 : (status === 'passed' ? 0 : 1);
   gracefullyProcessExitDoNotHang(exitCode);
@@ -215,46 +203,14 @@ async function runTests(args: string[], opts: { [key: string]: any }) {
 async function runTestServer(opts: { [key: string]: any }) {
   const host = opts.host || 'localhost';
   const port = opts.port ? +opts.port : 0;
-  const status = await testServer.runTestServer(opts.config, { host, port });
-  if (status === 'restarted')
-    return;
+  const status = await testServer.runTestServer(opts.config, { }, { host, port });
   const exitCode = status === 'interrupted' ? 130 : (status === 'passed' ? 0 : 1);
   gracefullyProcessExitDoNotHang(exitCode);
 }
 
-export async function withRunnerAndMutedWrite(configFile: string | undefined, callback: (runner: Runner) => Promise<any>) {
-  // Redefine process.stdout.write in case config decides to pollute stdio.
-  const stdoutWrite = process.stdout.write.bind(process.stdout);
-  process.stdout.write = ((a: any, b: any, c: any) => process.stderr.write(a, b, c)) as any;
-  try {
-    const config = await loadConfigFromFileRestartIfNeeded(configFile);
-    if (!config)
-      return;
-    const runner = new Runner(config);
-    const result = await callback(runner);
-    stdoutWrite(JSON.stringify(result, undefined, 2), () => {
-      gracefullyProcessExitDoNotHang(0);
-    });
-  } catch (e) {
-    const error: TestError = serializeError(e);
-    error.location = prepareErrorStack(e.stack).location;
-    stdoutWrite(JSON.stringify({ error }, undefined, 2), () => {
-      gracefullyProcessExitDoNotHang(0);
-    });
-  }
-}
-
-async function listTestFiles(opts: { [key: string]: any }) {
-  await withRunnerAndMutedWrite(opts.config, async runner => {
-    return await runner.listTestFiles();
-  });
-}
-
 async function mergeReports(reportDir: string | undefined, opts: { [key: string]: any }) {
   const configFile = opts.config;
-  const config = configFile ? await loadConfigFromFileRestartIfNeeded(configFile) : await loadEmptyConfigForMergeReports();
-  if (!config)
-    return;
+  const config = configFile ? await loadConfigFromFile(configFile) : await loadEmptyConfigForMergeReports();
 
   const dir = path.resolve(process.cwd(), reportDir || '');
   const dirStat = await fs.promises.stat(dir).catch(e => null);
@@ -273,8 +229,8 @@ async function mergeReports(reportDir: string | undefined, opts: { [key: string]
 }
 
 function overridesFromOptions(options: { [key: string]: any }): ConfigCLIOverrides {
-  const shardPair = options.shard ? options.shard.split('/').map((t: string) => parseInt(t, 10)) : undefined;
   const overrides: ConfigCLIOverrides = {
+    failOnFlakyTests: options.failOnFlakyTests ? true : undefined,
     forbidOnly: options.forbidOnly ? true : undefined,
     fullyParallel: options.fullyParallel ? true : undefined,
     globalTimeout: options.globalTimeout ? parseInt(options.globalTimeout, 10) : undefined,
@@ -284,10 +240,12 @@ function overridesFromOptions(options: { [key: string]: any }): ConfigCLIOverrid
     repeatEach: options.repeatEach ? parseInt(options.repeatEach, 10) : undefined,
     retries: options.retries ? parseInt(options.retries, 10) : undefined,
     reporter: resolveReporterOption(options.reporter),
-    shard: shardPair ? { current: shardPair[0], total: shardPair[1] } : undefined,
+    shard: resolveShardOption(options.shard),
     timeout: options.timeout ? parseInt(options.timeout, 10) : undefined,
+    tsconfig: options.tsconfig ? path.resolve(process.cwd(), options.tsconfig) : undefined,
     ignoreSnapshots: options.ignoreSnapshots ? !!options.ignoreSnapshots : undefined,
-    updateSnapshots: options.updateSnapshots ? 'all' as const : undefined,
+    updateSnapshots: options.updateSnapshots,
+    updateSourceMethod: options.updateSourceMethod,
     workers: options.workers,
   };
 
@@ -307,17 +265,16 @@ function overridesFromOptions(options: { [key: string]: any }): ConfigCLIOverrid
   if (options.headed || options.debug)
     overrides.use = { headless: false };
   if (!options.ui && options.debug) {
-    overrides.maxFailures = 1;
-    overrides.timeout = 0;
-    overrides.workers = 1;
+    overrides.debug = true;
     process.env.PWDEBUG = '1';
   }
   if (!options.ui && options.trace) {
-    if (!kTraceModes.includes(options.trace))
-      throw new Error(`Unsupported trace mode "${options.trace}", must be one of ${kTraceModes.map(mode => `"${mode}"`).join(', ')}`);
     overrides.use = overrides.use || {};
     overrides.use.trace = options.trace;
   }
+  if (overrides.tsconfig && !fs.existsSync(overrides.tsconfig))
+    throw new Error(`--tsconfig "${options.tsconfig}" does not exist`);
+
   return overrides;
 }
 
@@ -327,6 +284,34 @@ function resolveReporterOption(reporter?: string): ReporterDescription[] | undef
   return reporter.split(',').map((r: string) => [resolveReporter(r)]);
 }
 
+function resolveShardOption(shard?: string): ConfigCLIOverrides['shard'] {
+  if (!shard)
+    return undefined;
+
+  const shardPair = shard.split('/');
+
+  if (shardPair.length !== 2) {
+    throw new Error(
+        `--shard "${shard}", expected format is "current/all", 1-based, for example "3/5".`,
+    );
+  }
+
+  const current = parseInt(shardPair[0], 10);
+  const total = parseInt(shardPair[1], 10);
+
+  if (isNaN(total) || total < 1)
+    throw new Error(`--shard "${shard}" total must be a positive number`);
+
+
+  if (isNaN(current) || current < 1 || current > total) {
+    throw new Error(
+        `--shard "${shard}" current must be a positive number, not greater than shard total`,
+    );
+  }
+
+  return { current, total };
+}
+
 function resolveReporter(id: string) {
   if (builtInReporters.includes(id as any))
     return id;
@@ -338,46 +323,48 @@ function resolveReporter(id: string) {
 
 const kTraceModes: TraceMode[] = ['on', 'off', 'on-first-retry', 'on-all-retries', 'retain-on-failure', 'retain-on-first-failure'];
 
-const testOptions: [string, string][] = [
-  ['--browser <browser>', `Browser to use for tests, one of "all", "chromium", "firefox" or "webkit" (default: "chromium")`],
-  ['-c, --config <file>', `Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"`],
-  ['--debug', `Run tests with Playwright Inspector. Shortcut for "PWDEBUG=1" environment variable and "--timeout=0 --max-failures=1 --headed --workers=1" options`],
-  ['--fail-on-flaky-tests', `Fail if any test is flagged as flaky (default: false)`],
-  ['--forbid-only', `Fail if test.only is called (default: false)`],
-  ['--fully-parallel', `Run all tests in parallel (default: false)`],
-  ['--global-timeout <timeout>', `Maximum time this test suite can run in milliseconds (default: unlimited)`],
-  ['-g, --grep <grep>', `Only run tests matching this regular expression (default: ".*")`],
-  ['-gv, --grep-invert <grep>', `Only run tests that do not match this regular expression`],
-  ['--headed', `Run tests in headed browsers (default: headless)`],
-  ['--ignore-snapshots', `Ignore screenshot and snapshot expectations`],
-  ['--last-failed', `Only re-run the failures`],
-  ['--list', `Collect all the tests and report them, but do not run`],
-  ['--max-failures <N>', `Stop after the first N failures`],
-  ['--no-deps', 'Do not run project dependencies'],
-  ['--output <dir>', `Folder for output artifacts (default: "test-results")`],
-  ['--only-changed [ref]', `Only run test files that have been changed between 'HEAD' and 'ref'. Defaults to running all uncommitted changes. Only supports Git.`],
-  ['--pass-with-no-tests', `Makes test run succeed even if no tests were found`],
-  ['--project <project-name...>', `Only run tests from the specified list of projects, supports '*' wildcard (default: run all projects)`],
-  ['--quiet', `Suppress stdio`],
-  ['--repeat-each <N>', `Run each test N times (default: 1)`],
-  ['--reporter <reporter>', `Reporter to use, comma-separated, can be ${builtInReporters.map(name => `"${name}"`).join(', ')} (default: "${defaultReporter}")`],
-  ['--retries <retries>', `Maximum retry count for flaky tests, zero for no retries (default: no retries)`],
-  ['--shard <shard>', `Shard tests and execute only the selected shard, specify in the form "current/all", 1-based, for example "3/5"`],
-  ['--timeout <timeout>', `Specify test timeout threshold in milliseconds, zero for unlimited (default: ${defaultTimeout})`],
-  ['--trace <mode>', `Force tracing mode, can be ${kTraceModes.map(mode => `"${mode}"`).join(', ')}`],
-  ['--ui', `Run tests in interactive UI mode`],
-  ['--ui-host <host>', 'Host to serve UI on; specifying this option opens UI in a browser tab'],
-  ['--ui-port <port>', 'Port to serve UI on, 0 for any free port; specifying this option opens UI in a browser tab'],
-  ['-u, --update-snapshots', `Update snapshots with actual results (default: only create missing snapshots)`],
-  ['-j, --workers <workers>', `Number of concurrent workers or percentage of logical CPU cores, use 1 to run in a single worker (default: 50%)`],
-  ['-x', `Stop after the first failure`],
+// Note: update docs/src/test-cli-js.md when you update this, program is the source of truth.
+
+const testOptions: [string, { description: string, choices?: string[], preset?: string }][] = [
+  /* deprecated */ ['--browser <browser>', { description: `Browser to use for tests, one of "all", "chromium", "firefox" or "webkit" (default: "chromium")` }],
+  ['-c, --config <file>', { description: `Configuration file, or a test directory with optional "playwright.config.{m,c}?{js,ts}"` }],
+  ['--debug', { description: `Run tests with Playwright Inspector. Shortcut for "PWDEBUG=1" environment variable and "--timeout=0 --max-failures=1 --headed --workers=1" options` }],
+  ['--fail-on-flaky-tests', { description: `Fail if any test is flagged as flaky (default: false)` }],
+  ['--forbid-only', { description: `Fail if test.only is called (default: false)` }],
+  ['--fully-parallel', { description: `Run all tests in parallel (default: false)` }],
+  ['--global-timeout <timeout>', { description: `Maximum time this test suite can run in milliseconds (default: unlimited)` }],
+  ['-g, --grep <grep>', { description: `Only run tests matching this regular expression (default: ".*")` }],
+  ['--grep-invert <grep>', { description: `Only run tests that do not match this regular expression` }],
+  ['--headed', { description: `Run tests in headed browsers (default: headless)` }],
+  ['--ignore-snapshots', { description: `Ignore screenshot and snapshot expectations` }],
+  ['--last-failed', { description: `Only re-run the failures` }],
+  ['--list', { description: `Collect all the tests and report them, but do not run` }],
+  ['--max-failures <N>', { description: `Stop after the first N failures` }],
+  ['--no-deps', { description: `Do not run project dependencies` }],
+  ['--output <dir>', { description: `Folder for output artifacts (default: "test-results")` }],
+  ['--only-changed [ref]', { description: `Only run test files that have been changed between 'HEAD' and 'ref'. Defaults to running all uncommitted changes. Only supports Git.` }],
+  ['--pass-with-no-tests', { description: `Makes test run succeed even if no tests were found` }],
+  ['--project <project-name...>', { description: `Only run tests from the specified list of projects, supports '*' wildcard (default: run all projects)` }],
+  ['--quiet', { description: `Suppress stdio` }],
+  ['--repeat-each <N>', { description: `Run each test N times (default: 1)` }],
+  ['--reporter <reporter>', { description: `Reporter to use, comma-separated, can be ${builtInReporters.map(name => `"${name}"`).join(', ')} (default: "${defaultReporter}")` }],
+  ['--retries <retries>', { description: `Maximum retry count for flaky tests, zero for no retries (default: no retries)` }],
+  ['--shard <shard>', { description: `Shard tests and execute only the selected shard, specify in the form "current/all", 1-based, for example "3/5"` }],
+  ['--timeout <timeout>', { description: `Specify test timeout threshold in milliseconds, zero for unlimited (default: ${defaultTimeout})` }],
+  ['--trace <mode>', { description: `Force tracing mode`, choices: kTraceModes as string[] }],
+  ['--tsconfig <path>', { description: `Path to a single tsconfig applicable to all imported files (default: look up tsconfig for each imported file separately)` }],
+  ['--ui', { description: `Run tests in interactive UI mode` }],
+  ['--ui-host <host>', { description: `Host to serve UI on; specifying this option opens UI in a browser tab` }],
+  ['--ui-port <port>', { description: `Port to serve UI on, 0 for any free port; specifying this option opens UI in a browser tab` }],
+  ['-u, --update-snapshots [mode]', { description: `Update snapshots with actual results. Running tests without the flag defaults to "missing"`, choices: ['all', 'changed', 'missing', 'none'], preset: 'changed' }],
+  ['--update-source-method <method>', { description: `Chooses the way source is updated (default: "patch")`, choices: ['overwrite', '3way', 'patch'] }],
+  ['-j, --workers <workers>', { description: `Number of concurrent workers or percentage of logical CPU cores, use 1 to run in a single worker (default: 50%)` }],
+  ['-x', { description: `Stop after the first failure` }],
 ];
 
 addTestCommand(program);
 addShowReportCommand(program);
-addListFilesCommand(program);
 addMergeReportsCommand(program);
 addClearCacheCommand(program);
-addFindRelatedTestFilesCommand(program);
 addDevServerCommand(program);
 addTestServerCommand(program);
diff --git a/packages/playwright/src/reporters/.eslintrc.json b/packages/playwright/src/reporters/.eslintrc.json
deleted file mode 100644
index f919272e77920..0000000000000
--- a/packages/playwright/src/reporters/.eslintrc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "rules": {
-        "no-console": "off"
-    }
-}
\ No newline at end of file
diff --git a/packages/playwright/src/reporters/base.ts b/packages/playwright/src/reporters/base.ts
index c9ce2f7bcd4cd..0277a6dc3fb4a 100644
--- a/packages/playwright/src/reporters/base.ts
+++ b/packages/playwright/src/reporters/base.ts
@@ -14,21 +14,22 @@
  * limitations under the License.
  */
 
-import { colors as realColors, ms as milliseconds, parseStackTraceLine } from 'playwright-core/lib/utilsBundle';
 import path from 'path';
-import type { FullConfig, TestCase, Suite, TestResult, TestError, FullResult, TestStep, Location } from '../../types/testReporter';
-import { getPackageManagerExecCommand } from 'playwright-core/lib/utils';
+
+import { getPackageManagerExecCommand, parseErrorStack } from 'playwright-core/lib/utils';
+import { ms as milliseconds } from 'playwright-core/lib/utilsBundle';
+import { colors as realColors, noColors } from 'playwright-core/lib/utils';
+
+import { ansiRegex, resolveReporterOutputPath, stripAnsiEscapes } from '../util';
+import { getEastAsianWidth } from '../utilsBundle';
+
 import type { ReporterV2 } from './reporterV2';
-import { resolveReporterOutputPath } from '../util';
+import type { FullConfig, FullResult, Location, Suite, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
+import type { Colors } from '@isomorphic/colors';
+
 export type TestResultOutput = { chunk: string | Buffer, type: 'stdout' | 'stderr' };
 export const kOutputSymbol = Symbol('output');
 
-type Annotation = {
-  title: string;
-  message: string;
-  location?: Location;
-};
-
 type ErrorDetails = {
   message: string;
   location?: Location;
@@ -45,20 +46,63 @@ type TestSummary = {
   fatalErrors: TestError[];
 };
 
-export const { isTTY, ttyWidth, colors } = (() => {
-  let isTTY = !!process.stdout.isTTY;
-  let ttyWidth = process.stdout.columns || 0;
+export type CommonReporterOptions = {
+  configDir: string,
+  _mode?: 'list' | 'test' | 'merge',
+  _isTestServer?: boolean,
+  _commandHash?: string,
+};
+
+export type Screen = {
+  resolveFiles: 'cwd' | 'rootDir';
+  colors: Colors;
+  isTTY: boolean;
+  ttyWidth: number;
+  ttyHeight: number;
+  stdout?: NodeJS.WriteStream;
+  stderr?: NodeJS.WriteStream;
+};
+
+export type TerminalScreen = Screen & {
+  stdout: NodeJS.WriteStream;
+  stderr: NodeJS.WriteStream;
+};
+
+const DEFAULT_TTY_WIDTH = 100;
+const DEFAULT_TTY_HEIGHT = 40;
+
+// eslint-disable-next-line no-restricted-properties
+const originalProcessStdout = process.stdout;
+// eslint-disable-next-line no-restricted-properties
+const originalProcessStderr = process.stderr;
+
+// Output goes to terminal.
+export const terminalScreen: TerminalScreen = (() => {
+  let isTTY = !!originalProcessStdout.isTTY;
+  let ttyWidth = originalProcessStdout.columns || 0;
+  let ttyHeight = originalProcessStdout.rows || 0;
   if (process.env.PLAYWRIGHT_FORCE_TTY === 'false' || process.env.PLAYWRIGHT_FORCE_TTY === '0') {
     isTTY = false;
     ttyWidth = 0;
+    ttyHeight = 0;
   } else if (process.env.PLAYWRIGHT_FORCE_TTY === 'true' || process.env.PLAYWRIGHT_FORCE_TTY === '1') {
     isTTY = true;
-    ttyWidth = process.stdout.columns || 100;
+    ttyWidth = originalProcessStdout.columns || DEFAULT_TTY_WIDTH;
+    ttyHeight = originalProcessStdout.rows || DEFAULT_TTY_HEIGHT;
   } else if (process.env.PLAYWRIGHT_FORCE_TTY) {
     isTTY = true;
-    ttyWidth = +process.env.PLAYWRIGHT_FORCE_TTY;
+    const sizeMatch = process.env.PLAYWRIGHT_FORCE_TTY.match(/^(\d+)x(\d+)$/);
+    if (sizeMatch) {
+      ttyWidth = +sizeMatch[1];
+      ttyHeight = +sizeMatch[2];
+    } else {
+      ttyWidth = +process.env.PLAYWRIGHT_FORCE_TTY;
+      ttyHeight = DEFAULT_TTY_HEIGHT;
+    }
     if (isNaN(ttyWidth))
-      ttyWidth = 100;
+      ttyWidth = DEFAULT_TTY_WIDTH;
+    if (isNaN(ttyHeight))
+      ttyHeight = DEFAULT_TTY_HEIGHT;
   }
 
   let useColors = isTTY;
@@ -68,20 +112,43 @@ export const { isTTY, ttyWidth, colors } = (() => {
   else if (process.env.DEBUG_COLORS || process.env.FORCE_COLOR)
     useColors = true;
 
-  const colors = useColors ? realColors : {
-    bold: (t: string) => t,
-    cyan: (t: string) => t,
-    dim: (t: string) => t,
-    gray: (t: string) => t,
-    green: (t: string) => t,
-    red: (t: string) => t,
-    yellow: (t: string) => t,
-    enabled: false,
+  const colors = useColors ? realColors : noColors;
+  return {
+    resolveFiles: 'cwd',
+    isTTY,
+    ttyWidth,
+    ttyHeight,
+    colors,
+    stdout: originalProcessStdout,
+    stderr: originalProcessStderr,
   };
-  return { isTTY, ttyWidth, colors };
 })();
 
-export class BaseReporter implements ReporterV2 {
+// Output does not go to terminal, but colors are controlled with terminal env vars.
+export const nonTerminalScreen: Screen = {
+  colors: terminalScreen.colors,
+  isTTY: false,
+  ttyWidth: 0,
+  ttyHeight: 0,
+  resolveFiles: 'rootDir',
+};
+
+// Internal output for post-processing, should always contain real colors.
+export const internalScreen: Screen = {
+  colors: realColors,
+  isTTY: false,
+  ttyWidth: 0,
+  ttyHeight: 0,
+  resolveFiles: 'rootDir',
+};
+
+export type TerminalReporterOptions = {
+  screen?: TerminalScreen;
+  omitFailures?: boolean;
+};
+
+export class TerminalReporter implements ReporterV2 {
+  screen: TerminalScreen;
   config!: FullConfig;
   suite!: Suite;
   totalTestCount = 0;
@@ -91,7 +158,8 @@ export class BaseReporter implements ReporterV2 {
   private _fatalErrors: TestError[] = [];
   private _failureCount: number = 0;
 
-  constructor(options: { omitFailures?: boolean } = {}) {
+  constructor(options: TerminalReporterOptions = {}) {
+    this.screen = options.screen ?? terminalScreen;
     this._omitFailures = options.omitFailures || false;
   }
 
@@ -123,14 +191,11 @@ export class BaseReporter implements ReporterV2 {
     (result as any)[kOutputSymbol].push(output);
   }
 
-  onTestBegin(test: TestCase, result: TestResult): void {
-  }
-
   onTestEnd(test: TestCase, result: TestResult) {
     if (result.status !== 'skipped' && result.status !== test.expectedStatus)
       ++this._failureCount;
     const projectName = test.titlePath()[1];
-    const relativePath = relativeTestPath(this.config, test);
+    const relativePath = relativeTestPath(this.screen, this.config, test);
     const fileAndProject = (projectName ? `[${projectName}] › ` : '') + relativePath;
     const entry = this.fileDurations.get(fileAndProject) || { duration: 0, workers: new Set() };
     entry.duration += result.duration;
@@ -146,25 +211,12 @@ export class BaseReporter implements ReporterV2 {
     this.result = result;
   }
 
-  onStepBegin(test: TestCase, result: TestResult, step: TestStep): void {
-  }
-
-  onStepEnd(test: TestCase, result: TestResult, step: TestStep): void {
-  }
-
-  async onExit() {
-  }
-
-  printsToStdio() {
-    return true;
-  }
-
   protected fitToScreen(line: string, prefix?: string): string {
-    if (!ttyWidth) {
+    if (!this.screen.ttyWidth) {
       // Guard against the case where we cannot determine available width.
       return line;
     }
-    return fitToWidth(line, ttyWidth, prefix);
+    return fitToWidth(line, this.screen.ttyWidth, prefix);
   }
 
   protected generateStartingMessage() {
@@ -172,7 +224,7 @@ export class BaseReporter implements ReporterV2 {
     const shardDetails = this.config.shard ? `, shard ${this.config.shard.current} of ${this.config.shard.total}` : '';
     if (!this.totalTestCount)
       return '';
-    return '\n' + colors.dim('Running ') + this.totalTestCount + colors.dim(` test${this.totalTestCount !== 1 ? 's' : ''} using `) + jobs + colors.dim(` worker${jobs !== 1 ? 's' : ''}${shardDetails}`);
+    return '\n' + this.screen.colors.dim('Running ') + this.totalTestCount + this.screen.colors.dim(` test${this.totalTestCount !== 1 ? 's' : ''} using `) + jobs + this.screen.colors.dim(` worker${jobs !== 1 ? 's' : ''}${shardDetails}`);
   }
 
   protected getSlowTests(): [string, number][] {
@@ -189,28 +241,28 @@ export class BaseReporter implements ReporterV2 {
   protected generateSummaryMessage({ didNotRun, skipped, expected, interrupted, unexpected, flaky, fatalErrors }: TestSummary) {
     const tokens: string[] = [];
     if (unexpected.length) {
-      tokens.push(colors.red(`  ${unexpected.length} failed`));
+      tokens.push(this.screen.colors.red(`  ${unexpected.length} failed`));
       for (const test of unexpected)
-        tokens.push(colors.red(formatTestHeader(this.config, test, { indent: '    ' })));
+        tokens.push(this.screen.colors.red(this.formatTestHeader(test, { indent: '    ' })));
     }
     if (interrupted.length) {
-      tokens.push(colors.yellow(`  ${interrupted.length} interrupted`));
+      tokens.push(this.screen.colors.yellow(`  ${interrupted.length} interrupted`));
       for (const test of interrupted)
-        tokens.push(colors.yellow(formatTestHeader(this.config, test, { indent: '    ' })));
+        tokens.push(this.screen.colors.yellow(this.formatTestHeader(test, { indent: '    ' })));
     }
     if (flaky.length) {
-      tokens.push(colors.yellow(`  ${flaky.length} flaky`));
+      tokens.push(this.screen.colors.yellow(`  ${flaky.length} flaky`));
       for (const test of flaky)
-        tokens.push(colors.yellow(formatTestHeader(this.config, test, { indent: '    ' })));
+        tokens.push(this.screen.colors.yellow(this.formatTestHeader(test, { indent: '    ' })));
     }
     if (skipped)
-      tokens.push(colors.yellow(`  ${skipped} skipped`));
+      tokens.push(this.screen.colors.yellow(`  ${skipped} skipped`));
     if (didNotRun)
-      tokens.push(colors.yellow(`  ${didNotRun} did not run`));
+      tokens.push(this.screen.colors.yellow(`  ${didNotRun} did not run`));
     if (expected)
-      tokens.push(colors.green(`  ${expected} passed`) + colors.dim(` (${milliseconds(this.result.duration)})`));
+      tokens.push(this.screen.colors.green(`  ${expected} passed`) + this.screen.colors.dim(` (${milliseconds(this.result.duration)})`));
     if (fatalErrors.length && expected + unexpected.length + interrupted.length + flaky.length > 0)
-      tokens.push(colors.red(`  ${fatalErrors.length === 1 ? '1 error was not a part of any test' : fatalErrors.length + ' errors were not a part of any test'}, see above for details`));
+      tokens.push(this.screen.colors.red(`  ${fatalErrors.length === 1 ? '1 error was not a part of any test' : fatalErrors.length + ' errors were not a part of any test'}, see above for details`));
 
     return tokens.join('\n');
   }
@@ -267,111 +319,134 @@ export class BaseReporter implements ReporterV2 {
   }
 
   private _printFailures(failures: TestCase[]) {
-    console.log('');
+    this.writeLine('');
     failures.forEach((test, index) => {
-      console.log(formatFailure(this.config, test, {
-        index: index + 1,
-      }).message);
+      this.writeLine(this.formatFailure(test, index + 1));
     });
   }
 
   private _printSlowTests() {
     const slowTests = this.getSlowTests();
     slowTests.forEach(([file, duration]) => {
-      console.log(colors.yellow('  Slow test file: ') + file + colors.yellow(` (${milliseconds(duration)})`));
+      this.writeLine(this.screen.colors.yellow('  Slow test file: ') + file + this.screen.colors.yellow(` (${milliseconds(duration)})`));
     });
     if (slowTests.length)
-      console.log(colors.yellow('  Consider splitting slow test files to speed up parallel execution'));
+      this.writeLine(this.screen.colors.yellow('  Consider running tests from slow files in parallel. See: https://playwright.dev/docs/test-parallel'));
   }
 
   private _printSummary(summary: string) {
     if (summary.trim())
-      console.log(summary);
+      this.writeLine(summary);
   }
 
   willRetry(test: TestCase): boolean {
     return test.outcome() === 'unexpected' && test.results.length <= test.retries;
   }
+
+  formatTestTitle(test: TestCase, step?: TestStep, omitLocation: boolean = false): string {
+    return formatTestTitle(this.screen, this.config, test, step, omitLocation);
+  }
+
+  formatTestHeader(test: TestCase, options: { indent?: string, index?: number, mode?: 'default' | 'error' } = {}): string {
+    return formatTestHeader(this.screen, this.config, test, options);
+  }
+
+  formatFailure(test: TestCase, index?: number): string {
+    return formatFailure(this.screen, this.config, test, index);
+  }
+
+  formatError(error: TestError): ErrorDetails {
+    return formatError(this.screen, error);
+  }
+
+  writeLine(line?: string) {
+    this.screen.stdout?.write(line ? line + '\n' : '\n');
+  }
 }
 
-export function formatFailure(config: FullConfig, test: TestCase, options: {index?: number, includeStdio?: boolean, includeAttachments?: boolean} = {}): {
-  message: string,
-  annotations: Annotation[]
-} {
-  const { index, includeStdio, includeAttachments = true } = options;
+export function formatFailure(screen: Screen, config: FullConfig, test: TestCase, index?: number): string {
   const lines: string[] = [];
-  const title = formatTestTitle(config, test);
-  const annotations: Annotation[] = [];
-  const header = formatTestHeader(config, test, { indent: '  ', index, mode: 'error' });
-  lines.push(colors.red(header));
+  const header = formatTestHeader(screen, config, test, { indent: '  ', index, mode: 'error' });
+  lines.push(screen.colors.red(header));
   for (const result of test.results) {
     const resultLines: string[] = [];
-    const errors = formatResultFailure(test, result, '    ', colors.enabled);
+    const errors = formatResultFailure(screen, test, result, '    ');
     if (!errors.length)
       continue;
-    const retryLines = [];
     if (result.retry) {
-      retryLines.push('');
-      retryLines.push(colors.gray(separator(`    Retry #${result.retry}`)));
+      resultLines.push('');
+      resultLines.push(screen.colors.gray(separator(screen, `    Retry #${result.retry}`)));
     }
-    resultLines.push(...retryLines);
     resultLines.push(...errors.map(error => '\n' + error.message));
-    if (includeAttachments) {
-      for (let i = 0; i < result.attachments.length; ++i) {
-        const attachment = result.attachments[i];
-        const hasPrintableContent = attachment.contentType.startsWith('text/');
-        if (!attachment.path && !hasPrintableContent)
-          continue;
+    const attachmentGroups = groupAttachments(result.attachments);
+    for (let i = 0; i < attachmentGroups.length; ++i) {
+      const attachment = attachmentGroups[i];
+      if (attachment.name === 'error-context' && attachment.path) {
         resultLines.push('');
-        resultLines.push(colors.cyan(separator(`    attachment #${i + 1}: ${attachment.name} (${attachment.contentType})`)));
-        if (attachment.path) {
-          const relativePath = path.relative(process.cwd(), attachment.path);
-          resultLines.push(colors.cyan(`    ${relativePath}`));
-          // Make this extensible
-          if (attachment.name === 'trace') {
-            const packageManagerCommand = getPackageManagerExecCommand();
-            resultLines.push(colors.cyan(`    Usage:`));
-            resultLines.push('');
-            resultLines.push(colors.cyan(`        ${packageManagerCommand} playwright show-trace ${quotePathIfNeeded(relativePath)}`));
-            resultLines.push('');
-          }
-        } else {
-          if (attachment.contentType.startsWith('text/') && attachment.body) {
-            let text = attachment.body.toString();
-            if (text.length > 300)
-              text = text.slice(0, 300) + '...';
-            for (const line of text.split('\n'))
-              resultLines.push(colors.cyan(`    ${line}`));
-          }
-        }
-        resultLines.push(colors.cyan(separator('   ')));
+        resultLines.push(screen.colors.dim(`    Error Context: ${relativeFilePath(screen, config, attachment.path)}`));
+        continue;
       }
-    }
-    const output = ((result as any)[kOutputSymbol] || []) as TestResultOutput[];
-    if (includeStdio && output.length) {
-      const outputText = output.map(({ chunk, type }) => {
-        const text = chunk.toString('utf8');
-        if (type === 'stderr')
-          return colors.red(stripAnsiEscapes(text));
-        return text;
-      }).join('');
+
+      if (attachment.name.startsWith('_'))
+        continue;
+
+      const hasPrintableContent = attachment.contentType.startsWith('text/');
+      if (!attachment.path && !hasPrintableContent)
+        continue;
+
       resultLines.push('');
-      resultLines.push(colors.gray(separator('--- Test output')) + '\n\n' + outputText + '\n' + separator());
-    }
-    for (const error of errors) {
-      annotations.push({
-        location: error.location,
-        title,
-        message: [header, ...retryLines, error.message].join('\n'),
-      });
+      resultLines.push(screen.colors.dim(separator(screen, `    attachment #${i + 1}: ${screen.colors.bold(attachment.name)} (${attachment.contentType})`)));
+
+      if (attachment.actual?.path) {
+        if (attachment.expected?.path) {
+          const expectedPath = relativeFilePath(screen, config, attachment.expected.path);
+          resultLines.push(screen.colors.dim(`    Expected: ${expectedPath}`));
+        }
+        const actualPath = relativeFilePath(screen, config, attachment.actual.path);
+        resultLines.push(screen.colors.dim(`    Received: ${actualPath}`));
+        if (attachment.previous?.path) {
+          const previousPath = relativeFilePath(screen, config, attachment.previous.path);
+          resultLines.push(screen.colors.dim(`    Previous: ${previousPath}`));
+        }
+        if (attachment.diff?.path) {
+          const diffPath = relativeFilePath(screen, config, attachment.diff.path);
+          resultLines.push(screen.colors.dim(`    Diff:     ${diffPath}`));
+        }
+      } else if (attachment.path) {
+        const relativePath = relativeFilePath(screen, config, attachment.path);
+        resultLines.push(screen.colors.dim(`    ${relativePath}`));
+        // Make this extensible
+        if (attachment.name === 'trace') {
+          const packageManagerCommand = getPackageManagerExecCommand();
+          resultLines.push(screen.colors.dim(`    Usage:`));
+          resultLines.push('');
+          resultLines.push(screen.colors.dim(`        ${packageManagerCommand} playwright show-trace ${quotePathIfNeeded(relativePath)}`));
+          resultLines.push('');
+        }
+      } else {
+        if (attachment.contentType.startsWith('text/') && attachment.body) {
+          let text = attachment.body.toString();
+          if (text.length > 300)
+            text = text.slice(0, 300) + '...';
+          for (const line of text.split('\n'))
+            resultLines.push(screen.colors.dim(`    ${line}`));
+        }
+      }
+      resultLines.push(screen.colors.dim(separator(screen, '   ')));
     }
     lines.push(...resultLines);
   }
   lines.push('');
-  return {
-    message: lines.join('\n'),
-    annotations
-  };
+  return lines.join('\n');
+}
+
+export function formatRetry(screen: Screen, result: TestResult) {
+  const retryLines = [];
+  if (result.retry) {
+    retryLines.push('');
+    retryLines.push(screen.colors.gray(separator(screen, `    Retry #${result.retry}`)));
+  }
+  return retryLines;
 }
 
 function quotePathIfNeeded(path: string): string {
@@ -380,22 +455,22 @@ function quotePathIfNeeded(path: string): string {
   return path;
 }
 
-export function formatResultFailure(test: TestCase, result: TestResult, initialIndent: string, highlightCode: boolean): ErrorDetails[] {
+export function formatResultFailure(screen: Screen, test: TestCase, result: TestResult, initialIndent: string): ErrorDetails[] {
   const errorDetails: ErrorDetails[] = [];
 
   if (result.status === 'passed' && test.expectedStatus === 'failed') {
     errorDetails.push({
-      message: indent(colors.red(`Expected to fail, but passed.`), initialIndent),
+      message: indent(screen.colors.red(`Expected to fail, but passed.`), initialIndent),
     });
   }
   if (result.status === 'interrupted') {
     errorDetails.push({
-      message: indent(colors.red(`Test was interrupted.`), initialIndent),
+      message: indent(screen.colors.red(`Test was interrupted.`), initialIndent),
     });
   }
 
   for (const error of result.errors) {
-    const formattedError = formatError(error, highlightCode);
+    const formattedError = formatError(screen, error);
     errorDetails.push({
       message: indent(formattedError.message, initialIndent),
       location: formattedError.location,
@@ -404,12 +479,14 @@ export function formatResultFailure(test: TestCase, result: TestResult, initialI
   return errorDetails;
 }
 
-export function relativeFilePath(config: FullConfig, file: string): string {
-  return path.relative(config.rootDir, file) || path.basename(file);
+export function relativeFilePath(screen: Screen, config: FullConfig, file: string): string {
+  if (screen.resolveFiles === 'cwd')
+    return path.relative(process.cwd(), file);
+  return path.relative(config.rootDir, file);
 }
 
-function relativeTestPath(config: FullConfig, test: TestCase): string {
-  return relativeFilePath(config, test.location.file);
+function relativeTestPath(screen: Screen, config: FullConfig, test: TestCase): string {
+  return relativeFilePath(screen, config, test.location.file);
 }
 
 export function stepSuffix(step: TestStep | undefined) {
@@ -417,20 +494,22 @@ export function stepSuffix(step: TestStep | undefined) {
   return stepTitles.map(t => t.split('\n')[0]).map(t => ' › ' + t).join('');
 }
 
-export function formatTestTitle(config: FullConfig, test: TestCase, step?: TestStep, omitLocation: boolean = false): string {
+function formatTestTitle(screen: Screen, config: FullConfig, test: TestCase, step?: TestStep, omitLocation: boolean = false): string {
   // root, project, file, ...describes, test
   const [, projectName, , ...titles] = test.titlePath();
   let location;
   if (omitLocation)
-    location = `${relativeTestPath(config, test)}`;
+    location = `${relativeTestPath(screen, config, test)}`;
   else
-    location = `${relativeTestPath(config, test)}:${step?.location?.line ?? test.location.line}:${step?.location?.column ?? test.location.column}`;
+    location = `${relativeTestPath(screen, config, test)}:${test.location.line}:${test.location.column}`;
   const projectTitle = projectName ? `[${projectName}] › ` : '';
-  return `${projectTitle}${location} › ${titles.join(' › ')}${stepSuffix(step)}`;
+  const testTitle = `${projectTitle}${location} › ${titles.join(' › ')}`;
+  const extraTags = test.tags.filter(t => !testTitle.includes(t));
+  return `${testTitle}${stepSuffix(step)}${extraTags.length ? ' ' + extraTags.join(' ') : ''}`;
 }
 
-function formatTestHeader(config: FullConfig, test: TestCase, options: { indent?: string, index?: number, mode?: 'default' | 'error' } = {}): string {
-  const title = formatTestTitle(config, test);
+function formatTestHeader(screen: Screen, config: FullConfig, test: TestCase, options: { indent?: string, index?: number, mode?: 'default' | 'error' } = {}): string {
+  const title = formatTestTitle(screen, config, test);
   const header = `${options.indent || ''}${options.index ? options.index + ') ' : ''}${title}`;
   let fullHeader = header;
 
@@ -453,10 +532,10 @@ function formatTestHeader(config: FullConfig, test: TestCase, options: { indent?
     }
     fullHeader = header + (stepPaths.size === 1 ? stepPaths.values().next().value : '');
   }
-  return separator(fullHeader);
+  return separator(screen, fullHeader);
 }
 
-export function formatError(error: TestError, highlightCode: boolean): ErrorDetails {
+export function formatError(screen: Screen, error: TestError): ErrorDetails {
   const message = error.message || error.value || '';
   const stack = error.stack;
   if (!stack && !error.location)
@@ -471,32 +550,33 @@ export function formatError(error: TestError, highlightCode: boolean): ErrorDeta
 
   if (error.snippet) {
     let snippet = error.snippet;
-    if (!highlightCode)
+    if (!screen.colors.enabled)
       snippet = stripAnsiEscapes(snippet);
     tokens.push('');
     tokens.push(snippet);
   }
 
-  if (parsedStack && parsedStack.stackLines.length) {
-    tokens.push('');
-    tokens.push(colors.dim(parsedStack.stackLines.join('\n')));
-  }
+  if (parsedStack && parsedStack.stackLines.length)
+    tokens.push(screen.colors.dim(parsedStack.stackLines.join('\n')));
 
   let location = error.location;
   if (parsedStack && !location)
     location = parsedStack.location;
 
+  if (error.cause)
+    tokens.push(screen.colors.dim('[cause]: ') + formatError(screen, error.cause).message);
+
   return {
     location,
     message: tokens.join('\n'),
   };
 }
 
-export function separator(text: string = ''): string {
+export function separator(screen: Screen, text: string = ''): string {
   if (text)
     text += ' ';
-  const columns = Math.min(100, ttyWidth || 100);
-  return text + colors.dim('─'.repeat(Math.max(0, columns - text.length)));
+  const columns = Math.min(100, screen.ttyWidth || 100);
+  return text + screen.colors.dim('─'.repeat(Math.max(0, columns - stripAnsiEscapes(text).length)));
 }
 
 function indent(lines: string, tab: string) {
@@ -508,35 +588,38 @@ export function prepareErrorStack(stack: string): {
   stackLines: string[];
   location?: Location;
 } {
-  const lines = stack.split('\n');
-  let firstStackLine = lines.findIndex(line => line.startsWith('    at '));
-  if (firstStackLine === -1)
-    firstStackLine = lines.length;
-  const message = lines.slice(0, firstStackLine).join('\n');
-  const stackLines = lines.slice(firstStackLine);
-  let location: Location | undefined;
-  for (const line of stackLines) {
-    const frame = parseStackTraceLine(line);
-    if (!frame || !frame.file)
-      continue;
-    if (belongsToNodeModules(frame.file))
-      continue;
-    location = { file: frame.file, column: frame.column || 0, line: frame.line || 0 };
-    break;
-  }
-  return { message, stackLines, location };
+  return parseErrorStack(stack, path.sep, !!process.env.PWDEBUGIMPL);
+}
+
+function characterWidth(c: string) {
+  return getEastAsianWidth.eastAsianWidth(c.codePointAt(0)!);
 }
 
-const ansiRegex = new RegExp('([\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~])))', 'g');
-export function stripAnsiEscapes(str: string): string {
-  return str.replace(ansiRegex, '');
+function stringWidth(v: string) {
+  let width = 0;
+  for (const { segment } of new Intl.Segmenter(undefined, { granularity: 'grapheme' }).segment(v))
+    width += characterWidth(segment);
+  return width;
+}
+
+function suffixOfWidth(v: string, width: number) {
+  const segments = [...new Intl.Segmenter(undefined, { granularity: 'grapheme' }).segment(v)];
+  let suffixBegin = v.length;
+  for (const { segment, index } of segments.reverse()) {
+    const segmentWidth = stringWidth(segment);
+    if (segmentWidth > width)
+      break;
+    width -= segmentWidth;
+    suffixBegin = index;
+  }
+  return v.substring(suffixBegin);
 }
 
 // Leaves enough space for the "prefix" to also fit.
-function fitToWidth(line: string, width: number, prefix?: string): string {
+export function fitToWidth(line: string, width: number, prefix?: string): string {
   const prefixLength = prefix ? stripAnsiEscapes(prefix).length : 0;
   width -= prefixLength;
-  if (line.length <= width)
+  if (stringWidth(line) <= width)
     return line;
 
   // Even items are plain text, odd items are control sequences.
@@ -547,22 +630,19 @@ function fitToWidth(line: string, width: number, prefix?: string): string {
       // Include all control sequences to preserve formatting.
       taken.push(parts[i]);
     } else {
-      let part = parts[i].substring(parts[i].length - width);
-      if (part.length < parts[i].length && part.length > 0) {
+      let part = suffixOfWidth(parts[i], width);
+      const wasTruncated = part.length < parts[i].length;
+      if (wasTruncated && parts[i].length > 0) {
         // Add ellipsis if we are truncating.
-        part = '\u2026' + part.substring(1);
+        part = '\u2026' + suffixOfWidth(parts[i], width - 1);
       }
       taken.push(part);
-      width -= part.length;
+      width -= stringWidth(part);
     }
   }
   return taken.reverse().join('');
 }
 
-function belongsToNodeModules(file: string) {
-  return file.includes(`${path.sep}node_modules${path.sep}`);
-}
-
 function resolveFromEnv(name: string): string | undefined {
   const value = process.env[name];
   if (value)
@@ -581,30 +661,69 @@ export function resolveOutputFile(reporterName: string, options: {
       fileName: string,
       outputDir: string,
     }
-  }):  { outputFile: string, outputDir?: string } |undefined {
+  }): { outputFile: string, outputDir?: string } | undefined {
   const name = reporterName.toUpperCase();
-  let outputFile;
-  if (options.outputFile)
+  let outputFile = resolveFromEnv(`PLAYWRIGHT_${name}_OUTPUT_FILE`);
+  if (!outputFile && options.outputFile)
     outputFile = path.resolve(options.configDir, options.outputFile);
-  if (!outputFile)
-    outputFile = resolveFromEnv(`PLAYWRIGHT_${name}_OUTPUT_FILE`);
-  // Return early to avoid deleting outputDir.
   if (outputFile)
     return { outputFile };
 
-  let outputDir;
-  if (options.outputDir)
+  let outputDir = resolveFromEnv(`PLAYWRIGHT_${name}_OUTPUT_DIR`);
+  if (!outputDir && options.outputDir)
     outputDir = path.resolve(options.configDir, options.outputDir);
-  if (!outputDir)
-    outputDir = resolveFromEnv(`PLAYWRIGHT_${name}_OUTPUT_DIR`);
   if (!outputDir && options.default)
     outputDir = resolveReporterOutputPath(options.default.outputDir, options.configDir, undefined);
+  if (!outputDir)
+    outputDir = options.configDir;
+
+  const reportName = process.env[`PLAYWRIGHT_${name}_OUTPUT_NAME`] ?? options.fileName ?? options.default?.fileName;
+  if (!reportName)
+    return undefined;
+  outputFile = path.resolve(outputDir, reportName);
 
-  if (!outputFile) {
-    const reportName = options.fileName ?? process.env[`PLAYWRIGHT_${name}_OUTPUT_NAME`] ?? options.default?.fileName;
-    if (!reportName)
-      return undefined;
-    outputFile = path.resolve(outputDir ?? process.cwd(), reportName);
-  }
   return { outputFile, outputDir };
 }
+
+type TestAttachment = TestResult['attachments'][number];
+
+type TestAttachmentGroup = TestAttachment & {
+  expected?: TestAttachment;
+  actual?: TestAttachment;
+  diff?: TestAttachment;
+  previous?: TestAttachment;
+};
+
+function groupAttachments(attachments: TestResult['attachments']): TestAttachmentGroup[] {
+  const result: TestAttachmentGroup[] = [];
+  const attachmentsByPrefix = new Map<string, TestAttachment>();
+  for (const attachment of attachments) {
+    if (!attachment.path) {
+      result.push(attachment);
+      continue;
+    }
+
+    const match = attachment.name.match(/^(.*)-(expected|actual|diff|previous)(\.[^.]+)?$/);
+    if (!match) {
+      result.push(attachment);
+      continue;
+    }
+
+    const [, name, category] = match;
+    let group: TestAttachmentGroup | undefined = attachmentsByPrefix.get(name);
+    if (!group) {
+      group = { ...attachment, name };
+      attachmentsByPrefix.set(name, group);
+      result.push(group);
+    }
+    if (category === 'expected')
+      group.expected = attachment;
+    else if (category === 'actual')
+      group.actual = attachment;
+    else if (category === 'diff')
+      group.diff = attachment;
+    else if (category === 'previous')
+      group.previous = attachment;
+  }
+  return result;
+}
diff --git a/packages/playwright/src/reporters/blob.ts b/packages/playwright/src/reporters/blob.ts
index 837fe55be0e9c..4d01cc97db2ad 100644
--- a/packages/playwright/src/reporters/blob.ts
+++ b/packages/playwright/src/reporters/blob.ts
@@ -16,42 +16,31 @@
 
 import fs from 'fs';
 import path from 'path';
-import { ManualPromise, calculateSha1, createGuid, getUserAgent, removeFolders, sanitizeForFilePath } from 'playwright-core/lib/utils';
-import { mime } from 'playwright-core/lib/utilsBundle';
 import { Readable } from 'stream';
-import type { EventEmitter } from 'events';
-import type { FullConfig, FullResult, TestResult } from '../../types/testReporter';
-import type { JsonAttachment, JsonEvent } from '../isomorphic/teleReceiver';
-import { TeleReporterEmitter } from './teleEmitter';
+
+import { removeFolders, sanitizeForFilePath } from 'playwright-core/lib/utils';
+import { ManualPromise, calculateSha1, createGuid, getUserAgent } from 'playwright-core/lib/utils';
+import { mime } from 'playwright-core/lib/utilsBundle';
 import { yazl } from 'playwright-core/lib/zipBundle';
-import { resolveOutputFile } from './base';
 
-type BlobReporterOptions = {
-  configDir: string;
-  outputDir?: string;
-  fileName?: string;
-  outputFile?: string;
-  _commandHash: string;
-};
+import { resolveOutputFile, CommonReporterOptions } from './base';
+import { TeleReporterEmitter } from './teleEmitter';
 
-export const currentBlobReportVersion = 2;
+import type { BlobReporterOptions } from '../../types/test';
+import type { FullConfig, FullResult, TestResult } from '../../types/testReporter';
+import type { BlobReportMetadata, JsonAttachment, JsonEvent } from '../isomorphic/teleReceiver';
+import type { EventEmitter } from 'events';
 
-export type BlobReportMetadata = {
-  version: number;
-  userAgent: string;
-  name?: string;
-  shard?: { total: number, current: number };
-  pathSeparator?: string;
-};
+export const currentBlobReportVersion = 2;
 
 export class BlobReporter extends TeleReporterEmitter {
   private readonly _messages: JsonEvent[] = [];
   private readonly _attachments: { originalPath: string, zipEntryPath: string }[] = [];
-  private readonly _options: BlobReporterOptions;
+  private readonly _options: BlobReporterOptions & CommonReporterOptions;
   private readonly _salt: string;
   private _config!: FullConfig;
 
-  constructor(options: BlobReporterOptions) {
+  constructor(options: BlobReporterOptions & CommonReporterOptions) {
     super(message => this._messages.push(message));
     this._options = options;
     if (this._options.fileName && !this._options.fileName.endsWith('.zip'))
diff --git a/packages/playwright/src/reporters/dot.ts b/packages/playwright/src/reporters/dot.ts
index 05d2da1e4ecbb..c2076147db8a1 100644
--- a/packages/playwright/src/reporters/dot.ts
+++ b/packages/playwright/src/reporters/dot.ts
@@ -14,64 +14,61 @@
  * limitations under the License.
  */
 
-import { colors, BaseReporter, formatError } from './base';
-import type { FullResult, TestCase, TestResult, Suite, TestError } from '../../types/testReporter';
+import { TerminalReporter } from './base';
 
-class DotReporter extends BaseReporter {
-  private _counter = 0;
+import type { FullResult, Suite, TestCase, TestError, TestResult } from '../../types/testReporter';
 
-  override printsToStdio() {
-    return true;
-  }
+class DotReporter extends TerminalReporter {
+  private _counter = 0;
 
   override onBegin(suite: Suite) {
     super.onBegin(suite);
-    console.log(this.generateStartingMessage());
+    this.writeLine(this.generateStartingMessage());
   }
 
   override onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     super.onStdOut(chunk, test, result);
     if (!this.config.quiet)
-      process.stdout.write(chunk);
+      this.screen.stdout.write(chunk);
   }
 
   override onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     super.onStdErr(chunk, test, result);
     if (!this.config.quiet)
-      process.stderr.write(chunk);
+      this.screen.stderr.write(chunk);
   }
 
   override onTestEnd(test: TestCase, result: TestResult) {
     super.onTestEnd(test, result);
     if (this._counter === 80) {
-      process.stdout.write('\n');
+      this.screen.stdout.write('\n');
       this._counter = 0;
     }
     ++this._counter;
     if (result.status === 'skipped') {
-      process.stdout.write(colors.yellow('°'));
+      this.screen.stdout.write(this.screen.colors.yellow('°'));
       return;
     }
     if (this.willRetry(test)) {
-      process.stdout.write(colors.gray('×'));
+      this.screen.stdout.write(this.screen.colors.gray('×'));
       return;
     }
     switch (test.outcome()) {
-      case 'expected': process.stdout.write(colors.green('·')); break;
-      case 'unexpected': process.stdout.write(colors.red(result.status === 'timedOut' ? 'T' : 'F')); break;
-      case 'flaky': process.stdout.write(colors.yellow('±')); break;
+      case 'expected': this.screen.stdout.write(this.screen.colors.green('·')); break;
+      case 'unexpected': this.screen.stdout.write(this.screen.colors.red(result.status === 'timedOut' ? 'T' : 'F')); break;
+      case 'flaky': this.screen.stdout.write(this.screen.colors.yellow('±')); break;
     }
   }
 
   override onError(error: TestError): void {
     super.onError(error);
-    console.log('\n' + formatError(error, colors.enabled).message);
+    this.writeLine('\n' + this.formatError(error).message);
     this._counter = 0;
   }
 
   override async onEnd(result: FullResult) {
     await super.onEnd(result);
-    process.stdout.write('\n');
+    this.screen.stdout.write('\n');
     this.epilogue(true);
   }
 }
diff --git a/packages/playwright/src/reporters/empty.ts b/packages/playwright/src/reporters/empty.ts
index 09bd63668c4d8..3bab9bda0fa29 100644
--- a/packages/playwright/src/reporters/empty.ts
+++ b/packages/playwright/src/reporters/empty.ts
@@ -15,49 +15,15 @@
  */
 
 import type { ReporterV2 } from './reporterV2';
-import type { FullConfig, TestCase, TestError, TestResult, FullResult, TestStep, Suite } from '../../types/testReporter';
 
 class EmptyReporter implements ReporterV2 {
-  onConfigure(config: FullConfig) {
-  }
-
-  onBegin(suite: Suite) {
-  }
-
-  onTestBegin(test: TestCase, result: TestResult) {
-  }
-
-  onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
-  }
-
-  onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
-  }
-
-  onTestEnd(test: TestCase, result: TestResult) {
-  }
-
-  async onEnd(result: FullResult) {
-  }
-
-  async onExit() {
-  }
-
-  onError(error: TestError) {
-  }
-
-  onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
-  }
-
-  onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
+  version(): 'v2' {
+    return 'v2';
   }
 
   printsToStdio() {
     return false;
   }
-
-  version(): 'v2' {
-    return 'v2';
-  }
 }
 
 export default EmptyReporter;
diff --git a/packages/playwright/src/reporters/github.ts b/packages/playwright/src/reporters/github.ts
index 85bd4f85252f6..ceac0d89147b5 100644
--- a/packages/playwright/src/reporters/github.ts
+++ b/packages/playwright/src/reporters/github.ts
@@ -14,10 +14,15 @@
  * limitations under the License.
  */
 
-import { ms as milliseconds } from 'playwright-core/lib/utilsBundle';
 import path from 'path';
-import { BaseReporter, formatError, formatFailure, stripAnsiEscapes } from './base';
-import type { TestCase, FullResult, TestError } from '../../types/testReporter';
+
+import { noColors } from 'playwright-core/lib/utils';
+import { ms as milliseconds } from 'playwright-core/lib/utilsBundle';
+
+import { TerminalReporter, formatResultFailure, formatRetry } from './base';
+import { stripAnsiEscapes } from '../util';
+
+import type { FullResult, TestCase, TestError } from '../../types/testReporter';
 
 type GitHubLogType = 'debug' | 'notice' | 'warning' | 'error';
 
@@ -36,7 +41,8 @@ class GitHubLogger {
     const configs = Object.entries(options)
         .map(([key, option]) => `${key}=${option}`)
         .join(',');
-    console.log(stripAnsiEscapes(`::${type} ${configs}::${message}`));
+    // eslint-disable-next-line no-restricted-properties
+    process.stdout.write(stripAnsiEscapes(`::${type} ${configs}::${message}\n`));
   }
 
   debug(message: string, options?: GitHubLogOptions) {
@@ -56,10 +62,15 @@ class GitHubLogger {
   }
 }
 
-export class GitHubReporter extends BaseReporter {
+export class GitHubReporter extends TerminalReporter {
   githubLogger = new GitHubLogger();
 
-  override printsToStdio() {
+  constructor(options: { omitFailures?: boolean } = {}) {
+    super(options);
+    this.screen = { ...this.screen, colors: noColors };
+  }
+
+  printsToStdio() {
     return false;
   }
 
@@ -69,7 +80,7 @@ export class GitHubReporter extends BaseReporter {
   }
 
   override onError(error: TestError) {
-    const errorMessage = formatError(error, false).message;
+    const errorMessage = this.formatError(error).message;
     this.githubLogger.error(errorMessage);
   }
 
@@ -100,22 +111,23 @@ export class GitHubReporter extends BaseReporter {
 
   private _printFailureAnnotations(failures: TestCase[]) {
     failures.forEach((test, index) => {
-      const { annotations } = formatFailure(this.config, test, {
-        index: index + 1,
-        includeStdio: true,
-        includeAttachments: false,
-      });
-      annotations.forEach(({ location, title, message }) => {
-        const options: GitHubLogOptions = {
-          file: workspaceRelativePath(location?.file || test.location.file),
-          title,
-        };
-        if (location) {
-          options.line = location.line;
-          options.col = location.column;
+      const title = this.formatTestTitle(test);
+      const header = this.formatTestHeader(test, { indent: '  ', index: index + 1, mode: 'error' });
+      for (const result of test.results) {
+        const errors = formatResultFailure(this.screen, test, result, '    ');
+        for (const error of errors) {
+          const options: GitHubLogOptions = {
+            file: workspaceRelativePath(error.location?.file || test.location.file),
+            title,
+          };
+          if (error.location) {
+            options.line = error.location.line;
+            options.col = error.location.column;
+          }
+          const message = [header, ...formatRetry(this.screen, result), error.message].join('\n');
+          this.githubLogger.error(message, options);
         }
-        this.githubLogger.error(message, options);
-      });
+      }
     });
   }
 }
diff --git a/packages/playwright/src/reporters/html.ts b/packages/playwright/src/reporters/html.ts
index 7b279a70a196d..5e92291f8b0b1 100644
--- a/packages/playwright/src/reporters/html.ts
+++ b/packages/playwright/src/reporters/html.ts
@@ -14,73 +14,68 @@
  * limitations under the License.
  */
 
-import { open } from 'playwright-core/lib/utilsBundle';
-import { MultiMap, getPackageManagerExecCommand } from 'playwright-core/lib/utils';
 import fs from 'fs';
 import path from 'path';
-import type { TransformCallback } from 'stream';
 import { Transform } from 'stream';
+
+import { HttpServer, MultiMap, assert, calculateSha1, getPackageManagerExecCommand, copyFileAndMakeWritable, gracefullyProcessExitDoNotHang, removeFolders, sanitizeForFilePath, toPosixPath } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+import { open } from 'playwright-core/lib/utilsBundle';
+import { mime } from 'playwright-core/lib/utilsBundle';
+import { yazl } from 'playwright-core/lib/zipBundle';
+
+import { CommonReporterOptions, formatError, formatResultFailure, internalScreen } from './base';
 import { codeFrameColumns } from '../transform/babelBundle';
-import type { FullResult, FullConfig, Location, Suite, TestCase as TestCasePublic, TestResult as TestResultPublic, TestStep as TestStepPublic, TestError } from '../../types/testReporter';
-import { HttpServer, assert, calculateSha1, copyFileAndMakeWritable, gracefullyProcessExitDoNotHang, removeFolders, sanitizeForFilePath, toPosixPath } from 'playwright-core/lib/utils';
-import { colors, formatError, formatResultFailure, stripAnsiEscapes } from './base';
-import { resolveReporterOutputPath } from '../util';
-import type { Metadata } from '../../types/test';
+import { resolveReporterOutputPath, stripAnsiEscapes } from '../util';
+
+import type { ReporterV2 } from './reporterV2';
+import type { HtmlReporterOptions as HtmlReporterConfigOptions, Metadata, TestAnnotation } from '../../types/test';
+import type * as api from '../../types/testReporter';
+import type { HTMLReport, Location, Stats, TestAttachment, TestCase, TestCaseSummary, TestFile, TestFileSummary, TestResult, TestStep } from '@html-reporter/types';
 import type { ZipFile } from 'playwright-core/lib/zipBundle';
-import { yazl } from 'playwright-core/lib/zipBundle';
-import { mime } from 'playwright-core/lib/utilsBundle';
-import type { HTMLReport, Stats, TestAttachment, TestCase, TestCaseSummary, TestFile, TestFileSummary, TestResult, TestStep } from '@html-reporter/types';
-import EmptyReporter from './empty';
+import type { TransformCallback } from 'stream';
 
 type TestEntry = {
   testCase: TestCase;
   testCaseSummary: TestCaseSummary
 };
 
-const htmlReportOptions = ['always', 'never', 'on-failure'];
-type HtmlReportOpenOption = (typeof htmlReportOptions)[number];
+type HtmlReportOpenOption = NonNullable<HtmlReporterConfigOptions['open']>;
+const htmlReportOptions: HtmlReportOpenOption[] = ['always', 'never', 'on-failure'];
 
 const isHtmlReportOption = (type: string): type is HtmlReportOpenOption => {
-  return htmlReportOptions.includes(type);
+  return htmlReportOptions.includes(type as HtmlReportOpenOption);
 };
 
-type HtmlReporterOptions = {
-  configDir: string,
-  outputFolder?: string,
-  open?: HtmlReportOpenOption,
-  host?: string,
-  port?: number,
-  attachmentsBaseURL?: string,
-  _mode?: 'test' | 'list';
-  _isTestServer?: boolean;
-};
-
-class HtmlReporter extends EmptyReporter {
-  private config!: FullConfig;
-  private suite!: Suite;
-  private _options: HtmlReporterOptions;
+class HtmlReporter implements ReporterV2 {
+  private config!: api.FullConfig;
+  private suite!: api.Suite;
+  private _options: HtmlReporterConfigOptions & CommonReporterOptions;
   private _outputFolder!: string;
   private _attachmentsBaseURL!: string;
   private _open: string | undefined;
   private _port: number | undefined;
   private _host: string | undefined;
   private _buildResult: { ok: boolean, singleTestId: string | undefined } | undefined;
-  private _topLevelErrors: TestError[] = [];
+  private _topLevelErrors: api.TestError[] = [];
 
-  constructor(options: HtmlReporterOptions) {
-    super();
+  constructor(options: HtmlReporterConfigOptions & CommonReporterOptions) {
     this._options = options;
   }
 
-  override printsToStdio() {
+  version(): 'v2' {
+    return 'v2';
+  }
+
+  printsToStdio() {
     return false;
   }
 
-  override onConfigure(config: FullConfig) {
+  onConfigure(config: api.FullConfig) {
     this.config = config;
   }
 
-  override onBegin(suite: Suite) {
+  onBegin(suite: api.Suite) {
     const { outputFolder, open, attachmentsBaseURL, host, port } = this._resolveOptions();
     this._outputFolder = outputFolder;
     this._open = open;
@@ -94,12 +89,12 @@ class HtmlReporter extends EmptyReporter {
         if (reportedWarnings.has(key))
           continue;
         reportedWarnings.add(key);
-        console.log(colors.red(`Configuration Error: HTML reporter output folder clashes with the tests output folder:`));
-        console.log(`
+        writeLine(colors.red(`Configuration Error: HTML reporter output folder clashes with the tests output folder:`));
+        writeLine(`
     html reporter folder: ${colors.bold(outputFolder)}
     test results folder: ${colors.bold(project.outputDir)}`);
-        console.log('');
-        console.log(`HTML reporter will clear its output directory prior to being generated, which will lead to the artifact loss.
+        writeLine('');
+        writeLine(`HTML reporter will clear its output directory prior to being generated, which will lead to the artifact loss.
 `);
       }
     }
@@ -122,32 +117,39 @@ class HtmlReporter extends EmptyReporter {
     return !!relativePath && !relativePath.startsWith('..') && !path.isAbsolute(relativePath);
   }
 
-  override onError(error: TestError): void {
+  onError(error: api.TestError): void {
     this._topLevelErrors.push(error);
   }
 
-  override async onEnd(result: FullResult) {
+  async onEnd(result: api.FullResult) {
     const projectSuites = this.suite.suites;
     await removeFolders([this._outputFolder]);
-    const builder = new HtmlBuilder(this.config, this._outputFolder, this._attachmentsBaseURL);
+    let noSnippets: boolean | undefined;
+    if (process.env.PLAYWRIGHT_HTML_NO_SNIPPETS === 'false' || process.env.PLAYWRIGHT_HTML_NO_SNIPPETS === '0')
+      noSnippets = false;
+    else if (process.env.PLAYWRIGHT_HTML_NO_SNIPPETS)
+      noSnippets = true;
+    noSnippets = noSnippets || this._options.noSnippets;
+
+    const builder = new HtmlBuilder(this.config, this._outputFolder, this._attachmentsBaseURL, process.env.PLAYWRIGHT_HTML_TITLE || this._options.title, noSnippets);
     this._buildResult = await builder.build(this.config.metadata, projectSuites, result, this._topLevelErrors);
   }
 
-  override async onExit() {
+  async onExit() {
     if (process.env.CI || !this._buildResult)
       return;
     const { ok, singleTestId } = this._buildResult;
     const shouldOpen = !this._options._isTestServer && (this._open === 'always' || (!ok && this._open === 'on-failure'));
     if (shouldOpen) {
       await showHTMLReport(this._outputFolder, this._host, this._port, singleTestId);
-    } else if (this._options._mode === 'test') {
+    } else if (this._options._mode === 'test' && !this._options._isTestServer) {
       const packageManagerCommand = getPackageManagerExecCommand();
       const relativeReportPath = this._outputFolder === standaloneDefaultFolder() ? '' : ' ' + path.relative(process.cwd(), this._outputFolder);
       const hostArg = this._host ? ` --host ${this._host}` : '';
       const portArg = this._port ? ` --port ${this._port}` : '';
-      console.log('');
-      console.log('To open last HTML report run:');
-      console.log(colors.cyan(`
+      writeLine('');
+      writeLine('To open last HTML report run:');
+      writeLine(colors.cyan(`
   ${packageManagerCommand} playwright show-report${relativeReportPath}${hostArg}${portArg}
 `));
     }
@@ -166,7 +168,7 @@ function getHtmlReportOptionProcessEnv(): HtmlReportOpenOption | undefined {
   if (!htmlOpenEnv)
     return undefined;
   if (!isHtmlReportOption(htmlOpenEnv)) {
-    console.log(colors.red(`Configuration Error: HTML reporter Invalid value for PLAYWRIGHT_HTML_OPEN: ${htmlOpenEnv}. Valid values are: ${htmlReportOptions.join(', ')}`));
+    writeLine(colors.red(`Configuration Error: HTML reporter Invalid value for PLAYWRIGHT_HTML_OPEN: ${htmlOpenEnv}. Valid values are: ${htmlReportOptions.join(', ')}`));
     return undefined;
   }
   return htmlOpenEnv;
@@ -181,15 +183,15 @@ export async function showHTMLReport(reportFolder: string | undefined, host: str
   try {
     assert(fs.statSync(folder).isDirectory());
   } catch (e) {
-    console.log(colors.red(`No report found at "${folder}"`));
+    writeLine(colors.red(`No report found at "${folder}"`));
     gracefullyProcessExitDoNotHang(1);
     return;
   }
   const server = startHtmlReportServer(folder);
   await server.start({ port, host, preferredPort: port ? undefined : 9323 });
   let url = server.urlPrefix('human-readable');
-  console.log('');
-  console.log(colors.cyan(`  Serving HTML report at ${url}. Press Ctrl+C to quit.`));
+  writeLine('');
+  writeLine(colors.cyan(`  Serving HTML report at ${url}. Press Ctrl+C to quit.`));
   if (testId)
     url += `#?testId=${testId}`;
   url = url.replace('0.0.0.0', 'localhost');
@@ -220,30 +222,31 @@ export function startHtmlReportServer(folder: string): HttpServer {
 }
 
 class HtmlBuilder {
-  private _config: FullConfig;
+  private _config: api.FullConfig;
   private _reportFolder: string;
   private _stepsInFile = new MultiMap<string, TestStep>();
   private _dataZipFile: ZipFile;
   private _hasTraces = false;
   private _attachmentsBaseURL: string;
+  private _title: string | undefined;
+  private _noSnippets: boolean;
 
-  constructor(config: FullConfig, outputDir: string, attachmentsBaseURL: string) {
+  constructor(config: api.FullConfig, outputDir: string, attachmentsBaseURL: string, title: string | undefined, noSnippets: boolean = false) {
     this._config = config;
     this._reportFolder = outputDir;
+    this._noSnippets = noSnippets;
     fs.mkdirSync(this._reportFolder, { recursive: true });
     this._dataZipFile = new yazl.ZipFile();
     this._attachmentsBaseURL = attachmentsBaseURL;
+    this._title = title;
   }
 
-  async build(metadata: Metadata, projectSuites: Suite[], result: FullResult, topLevelErrors: TestError[]): Promise<{ ok: boolean, singleTestId: string | undefined }> {
+  async build(metadata: Metadata, projectSuites: api.Suite[], result: api.FullResult, topLevelErrors: api.TestError[]): Promise<{ ok: boolean, singleTestId: string | undefined }> {
     const data = new Map<string, { testFile: TestFile, testFileSummary: TestFileSummary }>();
     for (const projectSuite of projectSuites) {
-      const testDir = projectSuite.project()!.testDir;
       for (const fileSuite of projectSuite.suites) {
         const fileName = this._relativeLocation(fileSuite.location)!.file;
-        // Preserve file ids computed off the testDir.
-        const relativeFile = path.relative(testDir, fileSuite.location!.file);
-        const fileId = calculateSha1(toPosixPath(relativeFile)).slice(0, 20);
+        const fileId = calculateSha1(toPosixPath(fileName)).slice(0, 20);
         let fileEntry = data.get(fileId);
         if (!fileEntry) {
           fileEntry = {
@@ -261,7 +264,8 @@ class HtmlBuilder {
         }
       }
     }
-    createSnippets(this._stepsInFile);
+    if (!this._noSnippets)
+      createSnippets(this._stepsInFile);
 
     let ok = true;
     for (const [fileId, { testFile, testFileSummary }] of data) {
@@ -292,12 +296,13 @@ class HtmlBuilder {
     }
     const htmlReport: HTMLReport = {
       metadata,
+      title: this._title,
       startTime: result.startTime.getTime(),
       duration: result.duration,
       files: [...data.values()].map(e => e.testFileSummary),
       projectNames: projectSuites.map(r => r.project()!.name),
       stats: { ...[...data.values()].reduce((a, e) => addStats(a, e.testFileSummary.stats), emptyStats()) },
-      errors: topLevelErrors.map(error => formatError(error, true).message),
+      errors: topLevelErrors.map(error => formatError(internalScreen, error).message),
     };
     htmlReport.files.sort((f1, f2) => {
       const w1 = f1.stats.unexpected * 1000 + f1.stats.flaky;
@@ -307,6 +312,37 @@ class HtmlBuilder {
 
     this._addDataFile('report.json', htmlReport);
 
+    let singleTestId: string | undefined;
+    if (htmlReport.stats.total === 1) {
+      const testFile: TestFile  = data.values().next().value!.testFile;
+      singleTestId = testFile.tests[0].testId;
+    }
+
+    if (process.env.PW_HMR === '1') {
+      const redirectFile = path.join(this._reportFolder, 'index.html');
+
+      await this._writeReportData(redirectFile);
+
+      async function redirect() {
+        const hmrURL = new URL('http://localhost:44224'); // dev server, port is harcoded in build.js
+        const popup = window.open(hmrURL);
+        const listener = (evt: MessageEvent) => {
+          if (evt.source === popup && evt.data === 'ready') {
+            const element = document.getElementById('playwrightReportBase64');
+            popup!.postMessage(element?.textContent ?? '', hmrURL.origin);
+            window.removeEventListener('message', listener);
+            // This is generally not allowed
+            window.close();
+          }
+        };
+        window.addEventListener('message', listener);
+      }
+
+      fs.appendFileSync(redirectFile, `<script>(${redirect.toString()})()</script>`);
+
+      return { ok, singleTestId };
+    }
+
     // Copy app.
     const appFolder = path.join(require.resolve('playwright-core'), '..', 'lib', 'vite', 'htmlReport');
     await copyFileAndMakeWritable(path.join(appFolder, 'index.html'), path.join(this._reportFolder, 'index.html'));
@@ -329,32 +365,29 @@ class HtmlBuilder {
       }
     }
 
-    // Inline report data.
-    const indexFile = path.join(this._reportFolder, 'index.html');
-    fs.appendFileSync(indexFile, '<script>\nwindow.playwrightReportBase64 = "data:application/zip;base64,');
+    await this._writeReportData(path.join(this._reportFolder, 'index.html'));
+
+
+    return { ok, singleTestId };
+  }
+
+  private async _writeReportData(filePath: string) {
+    fs.appendFileSync(filePath, '<script id="playwrightReportBase64" type="application/zip">data:application/zip;base64,');
     await new Promise(f => {
       this._dataZipFile!.end(undefined, () => {
         this._dataZipFile!.outputStream
             .pipe(new Base64Encoder())
-            .pipe(fs.createWriteStream(indexFile, { flags: 'a' })).on('close', f);
+            .pipe(fs.createWriteStream(filePath, { flags: 'a' })).on('close', f);
       });
     });
-    fs.appendFileSync(indexFile, '";</script>');
-
-    let singleTestId: string | undefined;
-    if (htmlReport.stats.total === 1) {
-      const testFile: TestFile  = data.values().next().value.testFile;
-      singleTestId = testFile.tests[0].testId;
-    }
-
-    return { ok, singleTestId };
+    fs.appendFileSync(filePath, '</script>');
   }
 
   private _addDataFile(fileName: string, data: any) {
     this._dataZipFile.addBuffer(Buffer.from(JSON.stringify(data)), fileName);
   }
 
-  private _processSuite(suite: Suite, projectName: string, path: string[], outTests: TestEntry[]) {
+  private _processSuite(suite: api.Suite, projectName: string, path: string[], outTests: TestEntry[]) {
     const newPath = [...path, suite.title];
     suite.entries().forEach(e => {
       if (e.type === 'test')
@@ -364,7 +397,7 @@ class HtmlBuilder {
     });
   }
 
-  private _createTestEntry(test: TestCasePublic, projectName: string, path: string[]): TestEntry {
+  private _createTestEntry(test: api.TestCase, projectName: string, path: string[]): TestEntry {
     const duration = test.results.reduce((a, r) => a + r.duration, 0);
     const location = this._relativeLocation(test.location)!;
     path = path.slice(1).filter(path => path.length > 0);
@@ -377,8 +410,7 @@ class HtmlBuilder {
         projectName,
         location,
         duration,
-        // Annotations can be pushed directly, with a wrong type.
-        annotations: test.annotations.map(a => ({ type: a.type, description: a.description ? String(a.description) : a.description })),
+        annotations: this._serializeAnnotations(test.annotations),
         tags: test.tags,
         outcome: test.outcome(),
         path,
@@ -391,8 +423,7 @@ class HtmlBuilder {
         projectName,
         location,
         duration,
-        // Annotations can be pushed directly, with a wrong type.
-        annotations: test.annotations.map(a => ({ type: a.type, description: a.description ? String(a.description) : a.description })),
+        annotations: this._serializeAnnotations(test.annotations),
         tags: test.tags,
         outcome: test.outcome(),
         path,
@@ -476,14 +507,33 @@ class HtmlBuilder {
     }).filter(Boolean) as TestAttachment[];
   }
 
-  private _createTestResult(test: TestCasePublic, result: TestResultPublic): TestResult {
+  private _serializeAnnotations(annotations: api.TestCase['annotations']): TestAnnotation[] {
+    // Annotations can be pushed directly, with a wrong type.
+    return annotations.map(a => ({
+      type: a.type,
+      description: a.description === undefined ? undefined : String(a.description),
+      location: a.location ? {
+        file: a.location.file,
+        line: a.location.line,
+        column: a.location.column,
+      } : undefined,
+    }));
+  }
+
+  private _createTestResult(test: api.TestCase, result: api.TestResult): TestResult {
     return {
       duration: result.duration,
       startTime: result.startTime.toISOString(),
       retry: result.retry,
-      steps: dedupeSteps(result.steps).map(s => this._createTestStep(s)),
-      errors: formatResultFailure(test, result, '', true).map(error => error.message),
+      steps: dedupeSteps(result.steps).map(s => this._createTestStep(s, result)),
+      errors: formatResultFailure(internalScreen, test, result, '').map(error => {
+        return {
+          message: error.message,
+          codeframe: error.location ? createErrorCodeframe(error.message, error.location) : undefined
+        };
+      }),
       status: result.status,
+      annotations: this._serializeAnnotations(result.annotations),
       attachments: this._serializeAttachments([
         ...result.attachments,
         ...result.stdout.map(m => stdioAttachment(m, 'stdout')),
@@ -491,23 +541,34 @@ class HtmlBuilder {
     };
   }
 
-  private _createTestStep(dedupedStep: DedupedStep): TestStep {
+  private _createTestStep(dedupedStep: DedupedStep, result: api.TestResult): TestStep {
     const { step, duration, count } = dedupedStep;
-    const result: TestStep = {
-      title: step.title,
+    const skipped = dedupedStep.step.annotations?.find(a => a.type === 'skip');
+    let title = step.title;
+    if (skipped)
+      title = `${title} (skipped${skipped.description ? ': ' + skipped.description : ''})`;
+    const testStep: TestStep = {
+      title,
       startTime: step.startTime.toISOString(),
       duration,
-      steps: dedupeSteps(step.steps).map(s => this._createTestStep(s)),
+      steps: dedupeSteps(step.steps).map(s => this._createTestStep(s, result)),
+      attachments: step.attachments.map(s => {
+        const index = result.attachments.indexOf(s);
+        if (index === -1)
+          throw new Error('Unexpected, attachment not found');
+        return index;
+      }),
       location: this._relativeLocation(step.location),
       error: step.error?.message,
-      count
+      count,
+      skipped: !!skipped,
     };
-    if (result.location)
-      this._stepsInFile.set(result.location.file, result);
-    return result;
+    if (step.location)
+      this._stepsInFile.set(step.location.file, testStep);
+    return testStep;
   }
 
-  private _relativeLocation(location: Location | undefined): Location | undefined {
+  private _relativeLocation(location: api.Location | undefined): api.Location | undefined {
     if (!location)
       return undefined;
     const file = toPosixPath(path.relative(this._config.rootDir, location.file));
@@ -578,23 +639,16 @@ type JsonAttachment = {
 };
 
 function stdioAttachment(chunk: Buffer | string, type: 'stdout' | 'stderr'): JsonAttachment {
-  if (typeof chunk === 'string') {
-    return {
-      name: type,
-      contentType: 'text/plain',
-      body: chunk
-    };
-  }
   return {
     name: type,
-    contentType: 'application/octet-stream',
-    body: chunk
+    contentType: 'text/plain',
+    body: typeof chunk === 'string' ? chunk : chunk.toString('utf-8')
   };
 }
 
-type DedupedStep = { step: TestStepPublic, count: number, duration: number };
+type DedupedStep = { step: api.TestStep, count: number, duration: number };
 
-function dedupeSteps(steps: TestStepPublic[]) {
+function dedupeSteps(steps: api.TestStep[]) {
   const result: DedupedStep[] = [];
   let lastResult = undefined;
   for (const step of steps) {
@@ -641,4 +695,34 @@ function createSnippets(stepsInFile: MultiMap<string, TestStep>) {
   }
 }
 
+function createErrorCodeframe(message: string, location: Location) {
+  let source: string;
+  try {
+    source = fs.readFileSync(location.file, 'utf-8') + '\n//';
+  } catch (e) {
+    return;
+  }
+
+  return codeFrameColumns(
+      source,
+      {
+        start: {
+          line: location.line,
+          column: location.column,
+        },
+      },
+      {
+        highlightCode: false,
+        linesAbove: 100,
+        linesBelow: 100,
+        message: stripAnsiEscapes(message).split('\n')[0] || undefined,
+      }
+  );
+}
+
+function writeLine(line: string) {
+  // eslint-disable-next-line no-restricted-properties
+  process.stdout.write(line + '\n');
+}
+
 export default HtmlReporter;
diff --git a/packages/playwright/src/reporters/internalReporter.ts b/packages/playwright/src/reporters/internalReporter.ts
index 02959ab11bfce..2efb36d9baaf7 100644
--- a/packages/playwright/src/reporters/internalReporter.ts
+++ b/packages/playwright/src/reporters/internalReporter.ts
@@ -15,22 +15,28 @@
  */
 
 import fs from 'fs';
-import { codeFrameColumns } from '../transform/babelBundle';
-import type { FullConfig, TestCase, TestError, TestResult, FullResult, TestStep } from '../../types/testReporter';
-import { Suite } from '../common/test';
-import { colors, prepareErrorStack, relativeFilePath } from './base';
-import type { ReporterV2 } from './reporterV2';
+
 import { monotonicTime } from 'playwright-core/lib/utils';
 
-export class InternalReporter {
+import { internalScreen, prepareErrorStack, relativeFilePath } from './base';
+import { Multiplexer } from './multiplexer';
+import { Suite } from '../common/test';
+import { codeFrameColumns } from '../transform/babelBundle';
+import { wrapReporterAsV2 } from './reporterV2';
+
+import type { AnyReporter, ReporterV2 } from './reporterV2';
+import type { FullConfig, FullResult, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
+
+
+export class InternalReporter implements ReporterV2 {
   private _reporter: ReporterV2;
   private _didBegin = false;
   private _config!: FullConfig;
   private _startTime: Date | undefined;
   private _monotonicStartTime: number | undefined;
 
-  constructor(reporter: ReporterV2) {
-    this._reporter = reporter;
+  constructor(reporters: AnyReporter[]) {
+    this._reporter = new Multiplexer(reporters.map(wrapReporterAsV2));
   }
 
   version(): 'v2' {
@@ -41,29 +47,29 @@ export class InternalReporter {
     this._config = config;
     this._startTime = new Date();
     this._monotonicStartTime = monotonicTime();
-    this._reporter.onConfigure(config);
+    this._reporter.onConfigure?.(config);
   }
 
   onBegin(suite: Suite) {
     this._didBegin = true;
-    this._reporter.onBegin(suite);
+    this._reporter.onBegin?.(suite);
   }
 
   onTestBegin(test: TestCase, result: TestResult) {
-    this._reporter.onTestBegin(test, result);
+    this._reporter.onTestBegin?.(test, result);
   }
 
   onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
-    this._reporter.onStdOut(chunk, test, result);
+    this._reporter.onStdOut?.(chunk, test, result);
   }
 
   onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
-    this._reporter.onStdErr(chunk, test, result);
+    this._reporter.onStdErr?.(chunk, test, result);
   }
 
   onTestEnd(test: TestCase, result: TestResult) {
     this._addSnippetToTestErrors(test, result);
-    this._reporter.onTestEnd(test, result);
+    this._reporter.onTestEnd?.(test, result);
   }
 
   async onEnd(result: { status: FullResult['status'] }) {
@@ -71,7 +77,7 @@ export class InternalReporter {
       // onBegin was not reported, emit it.
       this.onBegin(new Suite('', 'root'));
     }
-    return await this._reporter.onEnd({
+    return await this._reporter.onEnd?.({
       ...result,
       startTime: this._startTime!,
       duration: monotonicTime() - this._monotonicStartTime!,
@@ -79,25 +85,25 @@ export class InternalReporter {
   }
 
   async onExit() {
-    await this._reporter.onExit();
+    await this._reporter.onExit?.();
   }
 
   onError(error: TestError) {
     addLocationAndSnippetToError(this._config, error);
-    this._reporter.onError(error);
+    this._reporter.onError?.(error);
   }
 
   onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
-    this._reporter.onStepBegin(test, result, step);
+    this._reporter.onStepBegin?.(test, result, step);
   }
 
   onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
     this._addSnippetToStepError(test, step);
-    this._reporter.onStepEnd(test, result, step);
+    this._reporter.onStepEnd?.(test, result, step);
   }
 
   printsToStdio() {
-    return this._reporter.printsToStdio();
+    return this._reporter.printsToStdio ? this._reporter.printsToStdio() : true;
   }
 
   private _addSnippetToTestErrors(test: TestCase, result: TestResult) {
@@ -124,7 +130,7 @@ function addLocationAndSnippetToError(config: FullConfig, error: TestError, file
     const codeFrame = codeFrameColumns(source, { start: location }, { highlightCode: true });
     // Convert /var/folders to /private/var/folders on Mac.
     if (!file || fs.realpathSync(file) !== location.file) {
-      tokens.push(colors.gray(`   at `) + `${relativeFilePath(config, location.file)}:${location.line}`);
+      tokens.push(internalScreen.colors.gray(`   at `) + `${relativeFilePath(internalScreen, config, location.file)}:${location.line}`);
       tokens.push('');
     }
     tokens.push(codeFrame);
diff --git a/packages/playwright/src/reporters/json.ts b/packages/playwright/src/reporters/json.ts
index 62a625db5d937..5823746e5028b 100644
--- a/packages/playwright/src/reporters/json.ts
+++ b/packages/playwright/src/reporters/json.ts
@@ -16,45 +16,47 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { FullConfig, TestCase, Suite, TestResult, TestError, TestStep, FullResult, Location, JSONReport, JSONReportSuite, JSONReportSpec, JSONReportTest, JSONReportTestResult, JSONReportTestStep, JSONReportError } from '../../types/testReporter';
-import { formatError, prepareErrorStack, resolveOutputFile } from './base';
-import { MultiMap, toPosixPath } from 'playwright-core/lib/utils';
+
+import { toPosixPath, MultiMap } from 'playwright-core/lib/utils';
+
+import { formatError, nonTerminalScreen, prepareErrorStack, resolveOutputFile, CommonReporterOptions } from './base';
 import { getProjectId } from '../common/config';
-import EmptyReporter from './empty';
 
-type JSONOptions = {
-  outputFile?: string,
-  configDir: string,
-};
+import type { ReporterV2 } from './reporterV2';
+import type { JsonReporterOptions } from '../../types/test';
+import type { FullConfig, FullResult, JSONReport, JSONReportError, JSONReportSpec, JSONReportSuite, JSONReportTest, JSONReportTestResult, JSONReportTestStep, Location, Suite, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
 
-class JSONReporter extends EmptyReporter {
+class JSONReporter implements ReporterV2 {
   config!: FullConfig;
   suite!: Suite;
   private _errors: TestError[] = [];
   private _resolvedOutputFile: string | undefined;
 
-  constructor(options: JSONOptions) {
-    super();
+  constructor(options: JsonReporterOptions & CommonReporterOptions) {
     this._resolvedOutputFile = resolveOutputFile('JSON', options)?.outputFile;
   }
 
-  override printsToStdio() {
+  version(): 'v2' {
+    return 'v2';
+  }
+
+  printsToStdio() {
     return !this._resolvedOutputFile;
   }
 
-  override onConfigure(config: FullConfig) {
+  onConfigure(config: FullConfig) {
     this.config = config;
   }
 
-  override onBegin(suite: Suite) {
+  onBegin(suite: Suite) {
     this.suite = suite;
   }
 
-  override onError(error: TestError): void {
+  onError(error: TestError): void {
     this._errors.push(error);
   }
 
-  override async onEnd(result: FullResult) {
+  async onEnd(result: FullResult) {
     await outputReport(this._serializeReport(result), this._resolvedOutputFile);
   }
 
@@ -197,6 +199,7 @@ class JSONReporter extends EmptyReporter {
     const steps = result.steps.filter(s => s.category === 'test.step');
     const jsonResult: JSONReportTestResult = {
       workerIndex: result.workerIndex,
+      parallelIndex: result.parallelIndex,
       status: result.status,
       duration: result.duration,
       error: result.error,
@@ -206,6 +209,7 @@ class JSONReporter extends EmptyReporter {
       retry: result.retry,
       steps: steps.length ? steps.map(s => this._serializeTestStep(s)) : undefined,
       startTime: result.startTime.toISOString(),
+      annotations: result.annotations,
       attachments: result.attachments.map(a => ({
         name: a.name,
         contentType: a.contentType,
@@ -219,7 +223,7 @@ class JSONReporter extends EmptyReporter {
   }
 
   private _serializeError(error: TestError): JSONReportError {
-    return formatError(error, true);
+    return formatError(nonTerminalScreen, error);
   }
 
   private _serializeTestStep(step: TestStep): JSONReportTestStep {
@@ -239,6 +243,7 @@ async function outputReport(report: JSONReport, resolvedOutputFile: string | und
     await fs.promises.mkdir(path.dirname(resolvedOutputFile), { recursive: true });
     await fs.promises.writeFile(resolvedOutputFile, reportString);
   } else {
+    // eslint-disable-next-line no-console
     console.log(reportString);
   }
 }
diff --git a/packages/playwright/src/reporters/junit.ts b/packages/playwright/src/reporters/junit.ts
index 61cf7e8e997a6..a5304da77a272 100644
--- a/packages/playwright/src/reporters/junit.ts
+++ b/packages/playwright/src/reporters/junit.ts
@@ -16,20 +16,17 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { FullConfig, FullResult, Suite, TestCase } from '../../types/testReporter';
-import { formatFailure, resolveOutputFile, stripAnsiEscapes } from './base';
-import EmptyReporter from './empty';
+
 import { getAsBooleanFromENV } from 'playwright-core/lib/utils';
 
-type JUnitOptions = {
-  outputFile?: string,
-  stripANSIControlSequences?: boolean,
-  includeProjectInTestName?: boolean,
+import { CommonReporterOptions, formatFailure, nonTerminalScreen, resolveOutputFile } from './base';
+import { stripAnsiEscapes } from '../util';
 
-  configDir: string,
-};
+import type { ReporterV2 } from './reporterV2';
+import type { JUnitReporterOptions } from '../../types/test';
+import type { FullConfig, FullResult, Suite, TestCase } from '../../types/testReporter';
 
-class JUnitReporter extends EmptyReporter {
+class JUnitReporter implements ReporterV2 {
   private config!: FullConfig;
   private configDir: string;
   private suite!: Suite;
@@ -41,28 +38,31 @@ class JUnitReporter extends EmptyReporter {
   private stripANSIControlSequences = false;
   private includeProjectInTestName = false;
 
-  constructor(options: JUnitOptions) {
-    super();
+  constructor(options: JUnitReporterOptions & CommonReporterOptions) {
     this.stripANSIControlSequences = getAsBooleanFromENV('PLAYWRIGHT_JUNIT_STRIP_ANSI', !!options.stripANSIControlSequences);
     this.includeProjectInTestName = getAsBooleanFromENV('PLAYWRIGHT_JUNIT_INCLUDE_PROJECT_IN_TEST_NAME', !!options.includeProjectInTestName);
     this.configDir = options.configDir;
     this.resolvedOutputFile = resolveOutputFile('JUNIT', options)?.outputFile;
   }
 
-  override printsToStdio() {
+  version(): 'v2' {
+    return 'v2';
+  }
+
+  printsToStdio() {
     return !this.resolvedOutputFile;
   }
 
-  override onConfigure(config: FullConfig) {
+  onConfigure(config: FullConfig) {
     this.config = config;
   }
 
-  override onBegin(suite: Suite) {
+  onBegin(suite: Suite) {
     this.suite = suite;
     this.timestamp = new Date();
   }
 
-  override async onEnd(result: FullResult) {
+  async onEnd(result: FullResult) {
     const children: XMLEntry[] = [];
     for (const projectSuite of this.suite.suites) {
       for (const fileSuite of projectSuite.suites)
@@ -91,6 +91,7 @@ class JUnitReporter extends EmptyReporter {
       await fs.promises.mkdir(path.dirname(this.resolvedOutputFile), { recursive: true });
       await fs.promises.writeFile(this.resolvedOutputFile, reportString);
     } else {
+      // eslint-disable-next-line no-console
       console.log(reportString);
     }
   }
@@ -185,7 +186,7 @@ class JUnitReporter extends EmptyReporter {
           message: `${path.basename(test.location.file)}:${test.location.line}:${test.location.column} ${test.title}`,
           type: 'FAILURE',
         },
-        text: stripAnsiEscapes(formatFailure(this.config, test).message)
+        text: stripAnsiEscapes(formatFailure(nonTerminalScreen, this.config, test))
       });
     }
 
diff --git a/packages/playwright/src/reporters/line.ts b/packages/playwright/src/reporters/line.ts
index 7d875d0f31e7d..3c34f22308d3e 100644
--- a/packages/playwright/src/reporters/line.ts
+++ b/packages/playwright/src/reporters/line.ts
@@ -14,37 +14,34 @@
  * limitations under the License.
  */
 
-import { colors, BaseReporter, formatError, formatFailure, formatTestTitle } from './base';
-import type { TestCase, Suite, TestResult, FullResult, TestStep, TestError } from '../../types/testReporter';
+import { TerminalReporter } from './base';
 
-class LineReporter extends BaseReporter {
+import type { FullResult, Suite, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
+
+class LineReporter extends TerminalReporter {
   private _current = 0;
   private _failures = 0;
   private _lastTest: TestCase | undefined;
   private _didBegin = false;
 
-  override printsToStdio() {
-    return true;
-  }
-
   override onBegin(suite: Suite) {
     super.onBegin(suite);
     const startingMessage = this.generateStartingMessage();
     if (startingMessage) {
-      console.log(startingMessage);
-      console.log();
+      this.writeLine(startingMessage);
+      this.writeLine();
     }
     this._didBegin = true;
   }
 
   override onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     super.onStdOut(chunk, test, result);
-    this._dumpToStdio(test, chunk, process.stdout);
+    this._dumpToStdio(test, chunk, this.screen.stdout);
   }
 
   override onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     super.onStdErr(chunk, test, result);
-    this._dumpToStdio(test, chunk, process.stderr);
+    this._dumpToStdio(test, chunk, this.screen.stderr);
   }
 
   private _dumpToStdio(test: TestCase | undefined, chunk: string | Buffer, stream: NodeJS.WriteStream) {
@@ -54,33 +51,30 @@ class LineReporter extends BaseReporter {
       stream.write(`\u001B[1A\u001B[2K`);
     if (test && this._lastTest !== test) {
       // Write new header for the output.
-      const title = colors.dim(formatTestTitle(this.config, test));
+      const title = this.screen.colors.dim(this.formatTestTitle(test));
       stream.write(this.fitToScreen(title) + `\n`);
       this._lastTest = test;
     }
 
     stream.write(chunk);
     if (chunk[chunk.length - 1] !== '\n')
-      console.log();
+      this.writeLine();
 
-    console.log();
+    this.writeLine();
   }
 
-  override onTestBegin(test: TestCase, result: TestResult) {
-    super.onTestBegin(test, result);
+  onTestBegin(test: TestCase, result: TestResult) {
     ++this._current;
     this._updateLine(test, result, undefined);
   }
 
-  override onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
-    super.onStepBegin(test, result, step);
-    if (step.category === 'test.step')
+  onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
+    if (this.screen.isTTY && step.category === 'test.step')
       this._updateLine(test, result, step);
   }
 
-  override onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
-    super.onStepEnd(test, result, step);
-    if (step.category === 'test.step')
+  onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
+    if (this.screen.isTTY && step.category === 'test.step')
       this._updateLine(test, result, step.parent);
   }
 
@@ -88,38 +82,36 @@ class LineReporter extends BaseReporter {
     super.onTestEnd(test, result);
     if (!this.willRetry(test) && (test.outcome() === 'flaky' || test.outcome() === 'unexpected' || result.status === 'interrupted')) {
       if (!process.env.PW_TEST_DEBUG_REPORTERS)
-        process.stdout.write(`\u001B[1A\u001B[2K`);
-      console.log(formatFailure(this.config, test, {
-        index: ++this._failures
-      }).message);
-      console.log();
+        this.screen.stdout.write(`\u001B[1A\u001B[2K`);
+      this.writeLine(this.formatFailure(test, ++this._failures));
+      this.writeLine();
     }
   }
 
   private _updateLine(test: TestCase, result: TestResult, step?: TestStep) {
     const retriesPrefix = this.totalTestCount < this._current ? ` (retries)` : ``;
     const prefix = `[${this._current}/${this.totalTestCount}]${retriesPrefix} `;
-    const currentRetrySuffix = result.retry ? colors.yellow(` (retry #${result.retry})`) : '';
-    const title = formatTestTitle(this.config, test, step) + currentRetrySuffix;
+    const currentRetrySuffix = result.retry ? this.screen.colors.yellow(` (retry #${result.retry})`) : '';
+    const title = this.formatTestTitle(test, step) + currentRetrySuffix;
     if (process.env.PW_TEST_DEBUG_REPORTERS)
-      process.stdout.write(`${prefix + title}\n`);
+      this.screen.stdout.write(`${prefix + title}\n`);
     else
-      process.stdout.write(`\u001B[1A\u001B[2K${prefix + this.fitToScreen(title, prefix)}\n`);
+      this.screen.stdout.write(`\u001B[1A\u001B[2K${prefix + this.fitToScreen(title, prefix)}\n`);
   }
 
   override onError(error: TestError): void {
     super.onError(error);
 
-    const message = formatError(error, colors.enabled).message + '\n';
+    const message = this.formatError(error).message + '\n';
     if (!process.env.PW_TEST_DEBUG_REPORTERS && this._didBegin)
-      process.stdout.write(`\u001B[1A\u001B[2K`);
-    process.stdout.write(message);
-    console.log();
+      this.screen.stdout.write(`\u001B[1A\u001B[2K`);
+    this.screen.stdout.write(message);
+    this.writeLine();
   }
 
   override async onEnd(result: FullResult) {
     if (!process.env.PW_TEST_DEBUG_REPORTERS && this._didBegin)
-      process.stdout.write(`\u001B[1A\u001B[2K`);
+      this.screen.stdout.write(`\u001B[1A\u001B[2K`);
     await super.onEnd(result);
     this.epilogue(false);
   }
diff --git a/packages/playwright/src/reporters/list.ts b/packages/playwright/src/reporters/list.ts
index f87a7d4fe8652..9a08476da1267 100644
--- a/packages/playwright/src/reporters/list.ts
+++ b/packages/playwright/src/reporters/list.ts
@@ -14,17 +14,22 @@
  * limitations under the License.
  */
 
+import { getAsBooleanFromENV } from 'playwright-core/lib/utils';
 import { ms as milliseconds } from 'playwright-core/lib/utilsBundle';
-import { colors, BaseReporter, formatError, formatTestTitle, isTTY, stepSuffix, stripAnsiEscapes, ttyWidth } from './base';
+
+import { TerminalReporter, stepSuffix } from './base';
+import { stripAnsiEscapes } from '../util';
+
+import type { ListReporterOptions } from '../../types/test';
 import type { FullResult, Suite, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
-import { getAsBooleanFromENV } from 'playwright-core/lib/utils';
+import type { CommonReporterOptions, TerminalReporterOptions } from './base';
 
 // Allow it in the Visual Studio Code Terminal and the new Windows Terminal
 const DOES_NOT_SUPPORT_UTF8_IN_TERMINAL = process.platform === 'win32' && process.env.TERM_PROGRAM !== 'vscode' && !process.env.WT_SESSION;
 const POSITIVE_STATUS_MARK = DOES_NOT_SUPPORT_UTF8_IN_TERMINAL ? 'ok' : '✓';
 const NEGATIVE_STATUS_MARK = DOES_NOT_SUPPORT_UTF8_IN_TERMINAL ? 'x' : '✘';
 
-class ListReporter extends BaseReporter {
+class ListReporter extends TerminalReporter {
   private _lastRow = 0;
   private _lastColumn = 0;
   private _testRows = new Map<TestCase, number>();
@@ -34,47 +39,41 @@ class ListReporter extends BaseReporter {
   private _needNewLine = false;
   private _printSteps: boolean;
 
-  constructor(options: { printSteps?: boolean } = {}) {
-    super();
-    this._printSteps = getAsBooleanFromENV('PLAYWRIGHT_LIST_PRINT_STEPS', options.printSteps);
-  }
-
-  override printsToStdio() {
-    return true;
+  constructor(options?: ListReporterOptions & CommonReporterOptions & TerminalReporterOptions) {
+    super(options);
+    this._printSteps = getAsBooleanFromENV('PLAYWRIGHT_LIST_PRINT_STEPS', options?.printSteps);
   }
 
   override onBegin(suite: Suite) {
     super.onBegin(suite);
     const startingMessage = this.generateStartingMessage();
     if (startingMessage) {
-      console.log(startingMessage);
-      console.log();
+      this.writeLine(startingMessage);
+      this.writeLine('');
     }
   }
 
-  override onTestBegin(test: TestCase, result: TestResult) {
-    super.onTestBegin(test, result);
-
+  onTestBegin(test: TestCase, result: TestResult) {
     const index = String(this._resultIndex.size + 1);
     this._resultIndex.set(result, index);
 
-    if (!isTTY)
+    if (!this.screen.isTTY)
       return;
     this._maybeWriteNewLine();
     this._testRows.set(test, this._lastRow);
     const prefix = this._testPrefix(index, '');
-    const line = colors.dim(formatTestTitle(this.config, test)) + this._retrySuffix(result);
+    const line = this.screen.colors.dim(this.formatTestTitle(test)) + this._retrySuffix(result);
     this._appendLine(line, prefix);
   }
 
   override onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     super.onStdOut(chunk, test, result);
-    this._dumpToStdio(test, chunk, process.stdout);
+    this._dumpToStdio(test, chunk, this.screen.stdout);
   }
 
   override onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     super.onStdErr(chunk, test, result);
-    this._dumpToStdio(test, chunk, process.stderr);
+    this._dumpToStdio(test, chunk, this.screen.stderr);
   }
 
   private getStepIndex(testIndex: string, result: TestResult, step: TestStep): string {
@@ -88,61 +87,61 @@ class ListReporter extends BaseReporter {
     return stepIndex;
   }
 
-  override onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
-    super.onStepBegin(test, result, step);
+  onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
     if (step.category !== 'test.step')
       return;
     const testIndex = this._resultIndex.get(result) || '';
 
-    if (!isTTY)
+    if (!this.screen.isTTY)
       return;
 
     if (this._printSteps) {
       this._maybeWriteNewLine();
       this._stepRows.set(step, this._lastRow);
       const prefix = this._testPrefix(this.getStepIndex(testIndex, result, step), '');
-      const line = test.title + colors.dim(stepSuffix(step));
+      const line = test.title + this.screen.colors.dim(stepSuffix(step));
       this._appendLine(line, prefix);
     } else {
-      this._updateLine(this._testRows.get(test)!, colors.dim(formatTestTitle(this.config, test, step)) + this._retrySuffix(result), this._testPrefix(testIndex, ''));
+      this._updateOrAppendLine(this._testRows, test, this.screen.colors.dim(this.formatTestTitle(test, step)) + this._retrySuffix(result), this._testPrefix(testIndex, ''));
     }
   }
 
-  override onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
-    super.onStepEnd(test, result, step);
+  onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
     if (step.category !== 'test.step')
       return;
 
     const testIndex = this._resultIndex.get(result) || '';
     if (!this._printSteps) {
-      if (isTTY)
-        this._updateLine(this._testRows.get(test)!, colors.dim(formatTestTitle(this.config, test, step.parent)) + this._retrySuffix(result), this._testPrefix(testIndex, ''));
+      if (this.screen.isTTY)
+        this._updateOrAppendLine(this._testRows, test, this.screen.colors.dim(this.formatTestTitle(test, step.parent)) + this._retrySuffix(result), this._testPrefix(testIndex, ''));
       return;
     }
 
     const index = this.getStepIndex(testIndex, result, step);
-    const title = isTTY ? test.title + colors.dim(stepSuffix(step)) : formatTestTitle(this.config, test, step);
+    const title = this.screen.isTTY ? test.title + this.screen.colors.dim(stepSuffix(step)) : this.formatTestTitle(test, step);
     const prefix = this._testPrefix(index, '');
     let text = '';
     if (step.error)
-      text = colors.red(title);
+      text = this.screen.colors.red(title);
     else
       text = title;
-    text += colors.dim(` (${milliseconds(step.duration)})`);
+    text += this.screen.colors.dim(` (${milliseconds(step.duration)})`);
 
-    this._updateOrAppendLine(this._stepRows.get(step)!, text, prefix);
+    this._updateOrAppendLine(this._stepRows, step, text, prefix);
   }
 
   private _maybeWriteNewLine() {
     if (this._needNewLine) {
       this._needNewLine = false;
-      process.stdout.write('\n');
+      this.screen.stdout.write('\n');
+      ++this._lastRow;
+      this._lastColumn = 0;
     }
   }
 
   private _updateLineCountAndNewLineFlagForOutput(text: string) {
     this._needNewLine = text[text.length - 1] !== '\n';
-    if (!ttyWidth)
+    if (!this.screen.ttyWidth)
       return;
     for (const ch of text) {
       if (ch === '\n') {
@@ -151,7 +150,7 @@ class ListReporter extends BaseReporter {
         continue;
       }
       ++this._lastColumn;
-      if (this._lastColumn > ttyWidth) {
+      if (this._lastColumn > this.screen.ttyWidth) {
         this._lastColumn = 0;
         ++this._lastRow;
       }
@@ -169,7 +168,7 @@ class ListReporter extends BaseReporter {
   override onTestEnd(test: TestCase, result: TestResult) {
     super.onTestEnd(test, result);
 
-    const title = formatTestTitle(this.config, test);
+    const title = this.formatTestTitle(test);
     let prefix = '';
     let text = '';
 
@@ -182,29 +181,32 @@ class ListReporter extends BaseReporter {
     }
 
     if (result.status === 'skipped') {
-      prefix = this._testPrefix(index, colors.green('-'));
+      prefix = this._testPrefix(index, this.screen.colors.green('-'));
       // Do not show duration for skipped.
-      text = colors.cyan(title) + this._retrySuffix(result);
+      text = this.screen.colors.cyan(title) + this._retrySuffix(result);
     } else {
       const statusMark = result.status === 'passed' ? POSITIVE_STATUS_MARK : NEGATIVE_STATUS_MARK;
       if (result.status === test.expectedStatus) {
-        prefix = this._testPrefix(index, colors.green(statusMark));
+        prefix = this._testPrefix(index, this.screen.colors.green(statusMark));
         text = title;
       } else {
-        prefix = this._testPrefix(index, colors.red(statusMark));
-        text = colors.red(title);
+        prefix = this._testPrefix(index, this.screen.colors.red(statusMark));
+        text = this.screen.colors.red(title);
       }
-      text += this._retrySuffix(result) + colors.dim(` (${milliseconds(result.duration)})`);
+      text += this._retrySuffix(result) + this.screen.colors.dim(` (${milliseconds(result.duration)})`);
     }
 
-    this._updateOrAppendLine(this._testRows.get(test)!, text, prefix);
+    this._updateOrAppendLine(this._testRows, test, text, prefix);
   }
 
-  private _updateOrAppendLine(row: number, text: string, prefix: string) {
-    if (isTTY) {
+  private _updateOrAppendLine<T>(entityRowNumbers: Map<T, number>, entity: T, text: string, prefix: string) {
+    const row = entityRowNumbers.get(entity);
+    // Only update the line if we assume that the line is still on the screen
+    if (row !== undefined && this.screen.isTTY && this._lastRow - row < this.screen.ttyHeight) {
       this._updateLine(row, text, prefix);
     } else {
       this._maybeWriteNewLine();
+      entityRowNumbers.set(entity, this._lastRow);
       this._appendLine(text, prefix);
     }
   }
@@ -212,18 +214,19 @@ class ListReporter extends BaseReporter {
   private _appendLine(text: string, prefix: string) {
     const line = prefix + this.fitToScreen(text, prefix);
     if (process.env.PW_TEST_DEBUG_REPORTERS) {
-      process.stdout.write('#' + this._lastRow + ' : ' + line + '\n');
+      this.screen.stdout.write('#' + this._lastRow + ' : ' + line + '\n');
     } else {
-      process.stdout.write(line);
-      process.stdout.write('\n');
+      this.screen.stdout.write(line);
+      this.screen.stdout.write('\n');
     }
     ++this._lastRow;
+    this._lastColumn = 0;
   }
 
   private _updateLine(row: number, text: string, prefix: string) {
     const line = prefix + this.fitToScreen(text, prefix);
     if (process.env.PW_TEST_DEBUG_REPORTERS)
-      process.stdout.write('#' + row + ' : ' + line + '\n');
+      this.screen.stdout.write('#' + row + ' : ' + line + '\n');
     else
       this._updateLineForTTY(row, line);
   }
@@ -231,35 +234,36 @@ class ListReporter extends BaseReporter {
   private _updateLineForTTY(row: number, line: string) {
     // Go up if needed
     if (row !== this._lastRow)
-      process.stdout.write(`\u001B[${this._lastRow - row}A`);
+      this.screen.stdout.write(`\u001B[${this._lastRow - row}A`);
     // Erase line, go to the start
-    process.stdout.write('\u001B[2K\u001B[0G');
-    process.stdout.write(line);
+    this.screen.stdout.write('\u001B[2K\u001B[0G');
+    this.screen.stdout.write(line);
     // Go down if needed.
     if (row !== this._lastRow)
-      process.stdout.write(`\u001B[${this._lastRow - row}E`);
+      this.screen.stdout.write(`\u001B[${this._lastRow - row}E`);
   }
 
   private _testPrefix(index: string, statusMark: string) {
     const statusMarkLength = stripAnsiEscapes(statusMark).length;
-    return '  ' + statusMark + ' '.repeat(3 - statusMarkLength) + colors.dim(index + ' ');
+    const indexLength = Math.ceil(Math.log10(this.totalTestCount + 1));
+    return '  ' + statusMark + ' '.repeat(3 - statusMarkLength) + this.screen.colors.dim(index.padStart(indexLength) + ' ');
   }
 
   private _retrySuffix(result: TestResult) {
-    return (result.retry ? colors.yellow(` (retry #${result.retry})`) : '');
+    return (result.retry ? this.screen.colors.yellow(` (retry #${result.retry})`) : '');
   }
 
   override onError(error: TestError): void {
     super.onError(error);
     this._maybeWriteNewLine();
-    const message = formatError(error, colors.enabled).message + '\n';
+    const message = this.formatError(error).message + '\n';
     this._updateLineCountAndNewLineFlagForOutput(message);
-    process.stdout.write(message);
+    this.screen.stdout.write(message);
   }
 
   override async onEnd(result: FullResult) {
     await super.onEnd(result);
-    process.stdout.write('\n');
+    this.screen.stdout.write('\n');
     this.epilogue(true);
   }
 }
diff --git a/packages/playwright/src/reporters/listModeReporter.ts b/packages/playwright/src/reporters/listModeReporter.ts
new file mode 100644
index 0000000000000..2337067ed039f
--- /dev/null
+++ b/packages/playwright/src/reporters/listModeReporter.ts
@@ -0,0 +1,66 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import path from 'path';
+
+import { formatError, terminalScreen } from './base';
+
+import type { FullConfig, TestError } from '../../types/testReporter';
+import type { Suite } from '../common/test';
+import type { TerminalScreen } from './base';
+import type { ReporterV2 } from './reporterV2';
+
+class ListModeReporter implements ReporterV2 {
+  private config!: FullConfig;
+  private screen: TerminalScreen;
+
+  constructor(options?: { screen?: TerminalScreen }) {
+    this.screen = options?.screen ?? terminalScreen;
+  }
+
+  version(): 'v2' {
+    return 'v2';
+  }
+
+  onConfigure(config: FullConfig) {
+    this.config = config;
+  }
+
+  onBegin(suite: Suite): void {
+    this._writeLine(`Listing tests:`);
+    const tests = suite.allTests();
+    const files = new Set<string>();
+    for (const test of tests) {
+      // root, project, file, ...describes, test
+      const [, projectName, , ...titles] = test.titlePath();
+      const location = `${path.relative(this.config.rootDir, test.location.file)}:${test.location.line}:${test.location.column}`;
+      const projectTitle = projectName ? `[${projectName}] › ` : '';
+      this._writeLine(`  ${projectTitle}${location} › ${titles.join(' › ')}`);
+      files.add(test.location.file);
+    }
+    this._writeLine(`Total: ${tests.length} ${tests.length === 1 ? 'test' : 'tests'} in ${files.size} ${files.size === 1 ? 'file' : 'files'}`);
+  }
+
+  onError(error: TestError) {
+    this.screen.stderr.write('\n' + formatError(terminalScreen, error).message + '\n');
+  }
+
+  private _writeLine(line: string) {
+    this.screen.stdout.write(line + '\n');
+  }
+}
+
+export default ListModeReporter;
diff --git a/packages/playwright/src/reporters/markdown.ts b/packages/playwright/src/reporters/markdown.ts
index a32d7bda428c5..23bc643b1accb 100644
--- a/packages/playwright/src/reporters/markdown.ts
+++ b/packages/playwright/src/reporters/markdown.ts
@@ -16,34 +16,42 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { FullResult, TestCase } from '../../types/testReporter';
-import { resolveReporterOutputPath } from '../util';
-import { BaseReporter, formatTestTitle } from './base';
+
+import type { FullConfig, FullResult, Reporter, Suite, TestCase, TestError } from '@playwright/test/reporter';
 
 type MarkdownReporterOptions = {
-  configDir: string,
+  configDir: string, // TODO: make it public?
   outputFile?: string;
 };
 
-
-class MarkdownReporter extends BaseReporter {
+class MarkdownReporter implements Reporter {
   private _options: MarkdownReporterOptions;
+  private _fatalErrors: TestError[] = [];
+  protected _config!: FullConfig;
+  private _suite!: Suite;
 
   constructor(options: MarkdownReporterOptions) {
-    super();
     this._options = options;
   }
 
-  override printsToStdio() {
+  printsToStdio() {
     return false;
   }
 
-  override async onEnd(result: FullResult) {
-    await super.onEnd(result);
-    const summary = this.generateSummary();
+  onBegin(config: FullConfig, suite: Suite) {
+    this._config = config;
+    this._suite = suite;
+  }
+
+  onError(error: TestError) {
+    this._fatalErrors.push(error);
+  }
+
+  async onEnd(result: FullResult) {
+    const summary = this._generateSummary();
     const lines: string[] = [];
-    if (summary.fatalErrors.length)
-      lines.push(`**${summary.fatalErrors.length} fatal errors, not part of any test**`);
+    if (this._fatalErrors.length)
+      lines.push(`**${this._fatalErrors.length} fatal errors, not part of any test**`);
     if (summary.unexpected.length) {
       lines.push(`**${summary.unexpected.length} failed**`);
       this._printTestList(':x:', summary.unexpected, lines);
@@ -65,19 +73,75 @@ class MarkdownReporter extends BaseReporter {
     const skipped = summary.skipped ? `, ${summary.skipped} skipped` : '';
     const didNotRun = summary.didNotRun ? `, ${summary.didNotRun} did not run` : '';
     lines.push(`**${summary.expected} passed${skipped}${didNotRun}**`);
-    lines.push(`:heavy_check_mark::heavy_check_mark::heavy_check_mark:`);
     lines.push(``);
 
-    const reportFile = resolveReporterOutputPath('report.md', this._options.configDir, this._options.outputFile);
+    await this.publishReport(lines.join('\n'));
+  }
+
+  protected async publishReport(report: string): Promise<void> {
+    const maybeRelativeFile = this._options.outputFile || 'report.md';
+    const reportFile = path.resolve(this._options.configDir, maybeRelativeFile);
     await fs.promises.mkdir(path.dirname(reportFile), { recursive: true });
-    await fs.promises.writeFile(reportFile, lines.join('\n'));
+    await fs.promises.writeFile(reportFile, report);
+  }
+
+  protected _generateSummary() {
+    let didNotRun = 0;
+    let skipped = 0;
+    let expected = 0;
+    const interrupted: TestCase[] = [];
+    const interruptedToPrint: TestCase[] = [];
+    const unexpected: TestCase[] = [];
+    const flaky: TestCase[] = [];
+
+    this._suite.allTests().forEach(test => {
+      switch (test.outcome()) {
+        case 'skipped': {
+          if (test.results.some(result => result.status === 'interrupted')) {
+            if (test.results.some(result => !!result.error))
+              interruptedToPrint.push(test);
+            interrupted.push(test);
+          } else if (!test.results.length || test.expectedStatus !== 'skipped') {
+            ++didNotRun;
+          } else {
+            ++skipped;
+          }
+          break;
+        }
+        case 'expected': ++expected; break;
+        case 'unexpected': unexpected.push(test); break;
+        case 'flaky': flaky.push(test); break;
+      }
+    });
+
+    return {
+      didNotRun,
+      skipped,
+      expected,
+      interrupted,
+      unexpected,
+      flaky,
+    };
   }
 
   private _printTestList(prefix: string, tests: TestCase[], lines: string[], suffix?: string) {
     for (const test of tests)
-      lines.push(`${prefix} ${formatTestTitle(this.config, test)}${suffix || ''}`);
+      lines.push(`${prefix} ${formatTestTitle(this._config.rootDir, test)}${suffix || ''}`);
     lines.push(``);
   }
 }
 
+function formatTestTitle(rootDir: string, test: TestCase): string {
+  // root, project, file, ...describes, test
+  const [, projectName, , ...titles] = test.titlePath();
+  const relativeTestPath = path.relative(rootDir, test.location.file);
+  // intentionally leave out column to prevent writing test.spec.ts:100:5 - GitHub turns that into 💯
+  const location = `${relativeTestPath}:${test.location.line}`;
+  const projectTitle = projectName ? `[${projectName}] › ` : '';
+  const testTitle = `${projectTitle}${location} › ${titles.join(' › ')}`;
+  const extraTags = test.tags.filter(t => !testTitle.includes(t));
+  const formattedTags = extraTags.map(t => `\`${t}\``).join(' ');
+  return `${testTitle}${extraTags.length ? ' ' + formattedTags : ''}`;
+}
+
 export default MarkdownReporter;
diff --git a/packages/playwright/src/reporters/merge.ts b/packages/playwright/src/reporters/merge.ts
index 5eedcac136f3f..b3f6b457ae3a3 100644
--- a/packages/playwright/src/reporters/merge.ts
+++ b/packages/playwright/src/reporters/merge.ts
@@ -16,17 +16,20 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { ReporterDescription } from '../../types/test';
-import type { FullConfigInternal } from '../common/config';
-import type { JsonConfig, JsonEvent, JsonFullResult, JsonLocation, JsonProject, JsonSuite, JsonTestCase, JsonTestResultEnd, JsonTestStepStart } from '../isomorphic/teleReceiver';
-import { TeleReporterReceiver } from '../isomorphic/teleReceiver';
+
+import { ZipFile } from 'playwright-core/lib/utils';
+
+import {  currentBlobReportVersion } from './blob';
+import { Multiplexer } from './multiplexer';
 import { JsonStringInternalizer, StringInternPool } from '../isomorphic/stringInternPool';
+import { TeleReporterReceiver } from '../isomorphic/teleReceiver';
 import { createReporters } from '../runner/reporters';
-import { Multiplexer } from './multiplexer';
-import { ZipFile } from 'playwright-core/lib/utils';
-import { currentBlobReportVersion, type BlobReportMetadata } from './blob';
 import { relativeFilePath } from '../util';
+
+import type { ReporterDescription, TestAnnotation } from '../../types/test';
 import type { TestError } from '../../types/testReporter';
+import type { FullConfigInternal } from '../common/config';
+import type { BlobReportMetadata, JsonAttachment, JsonConfig, JsonEvent, JsonFullResult, JsonLocation, JsonOnConfigureEvent, JsonOnEndEvent, JsonOnProjectEvent, JsonProject, JsonSuite, JsonTestCase } from '../isomorphic/teleReceiver';
 import type * as blobV1 from './versions/blobV1';
 
 type StatusCallback = (message: string) => void;
@@ -161,18 +164,23 @@ async function extractAndParseReports(dir: string, shardFiles: string[], interna
 function findMetadata(events: JsonEvent[], file: string): BlobReportMetadata {
   if (events[0]?.method !== 'onBlobReportMetadata')
     throw new Error(`No metadata event found in ${file}`);
-  const metadata = (events[0].params as BlobReportMetadata);
+  const metadata = events[0].params;
   if (metadata.version > currentBlobReportVersion)
     throw new Error(`Blob report ${file} was created with a newer version of Playwright.`);
   return metadata;
 }
 
-async function mergeEvents(dir: string, shardReportFiles: string[], stringPool: StringInternPool, printStatus: StatusCallback, rootDirOverride: string | undefined) {
+async function mergeEvents(dir: string, shardReportFiles: string[], stringPool: StringInternPool, printStatus: StatusCallback, rootDirOverride: string | undefined): Promise<{
+  prologue: JsonEvent[];
+  reports: ReportData[];
+  epilogue: JsonEvent[];
+  pathSeparatorFromMetadata?: string;
+}> {
   const internalizer = new JsonStringInternalizer(stringPool);
 
-  const configureEvents: JsonEvent[] = [];
-  const projectEvents: JsonEvent[] = [];
-  const endEvents: JsonEvent[] = [];
+  const configureEvents: JsonOnConfigureEvent[] = [];
+  const projectEvents: JsonOnProjectEvent[] = [];
+  const endEvents: JsonOnEndEvent[] = [];
 
   const blobs = await extractAndParseReports(dir, shardReportFiles, internalizer, printStatus);
   // Sort by (report name; shard; file name), so that salt generation below is deterministic when:
@@ -243,7 +251,7 @@ async function mergeEvents(dir: string, shardReportFiles: string[], stringPool:
   };
 }
 
-function mergeConfigureEvents(configureEvents: JsonEvent[], rootDirOverride: string | undefined): JsonEvent {
+function mergeConfigureEvents(configureEvents: JsonOnConfigureEvent[], rootDirOverride: string | undefined): JsonEvent {
   if (!configureEvents.length)
     throw new Error('No configure events found');
   let config: JsonConfig = {
@@ -301,13 +309,13 @@ function mergeConfigs(to: JsonConfig, from: JsonConfig): JsonConfig {
   };
 }
 
-function mergeEndEvents(endEvents: JsonEvent[]): JsonEvent {
+function mergeEndEvents(endEvents: JsonOnEndEvent[]): JsonEvent {
   let startTime = endEvents.length ? 10000000000000 : Date.now();
   let status: JsonFullResult['status'] = 'passed';
   let duration: number = 0;
 
   for (const event of endEvents) {
-    const shardResult: JsonFullResult = event.params.result;
+    const shardResult = event.params.result;
     if (shardResult.status === 'failed')
       status = 'failed';
     else if (shardResult.status === 'timedout' && status !== 'failed')
@@ -336,6 +344,7 @@ async function sortedShardFiles(dir: string) {
 }
 
 function printStatusToStdout(message: string) {
+  // eslint-disable-next-line no-restricted-properties
   process.stdout.write(`${message}\n`);
 }
 
@@ -386,11 +395,12 @@ class IdsPatcher {
       case 'onProject':
         this._onProject(params.project);
         return;
+      case 'onAttach':
       case 'onTestBegin':
       case 'onStepBegin':
       case 'onStepEnd':
       case 'onStdIO':
-        params.testId = this._mapTestId(params.testId);
+        params.testId = params.testId ? this._mapTestId(params.testId) : undefined;
         return;
       case 'onTestEnd':
         params.test.testId = this._mapTestId(params.test.testId);
@@ -443,9 +453,14 @@ class AttachmentPathPatcher {
   }
 
   patchEvent(event: JsonEvent) {
-    if (event.method !== 'onTestEnd')
-      return;
-    for (const attachment of (event.params.result as JsonTestResultEnd).attachments) {
+    if (event.method === 'onAttach')
+      this._patchAttachments(event.params.attachments);
+    else if (event.method === 'onTestEnd')
+      this._patchAttachments(event.params.result.attachments ?? []);
+  }
+
+  private _patchAttachments(attachments: JsonAttachment[]) {
+    for (const attachment of attachments) {
       if (!attachment.path)
         continue;
 
@@ -466,23 +481,40 @@ class PathSeparatorPatcher {
     if (this._from === this._to)
       return;
     if (jsonEvent.method === 'onProject') {
-      this._updateProject(jsonEvent.params.project as JsonProject);
+      this._updateProject(jsonEvent.params.project);
       return;
     }
     if (jsonEvent.method === 'onTestEnd') {
-      const testResult = jsonEvent.params.result as JsonTestResultEnd;
-      testResult.errors.forEach(error => this._updateLocation(error.location));
-      testResult.attachments.forEach(attachment => {
+      const test = jsonEvent.params.test;
+      test.annotations?.forEach(annotation => this._updateAnnotationLocation(annotation));
+      const testResult = jsonEvent.params.result;
+      testResult.annotations?.forEach(annotation => this._updateAnnotationLocation(annotation));
+      testResult.errors.forEach(error => this._updateErrorLocations(error));
+      (testResult.attachments ?? []).forEach(attachment => {
         if (attachment.path)
           attachment.path = this._updatePath(attachment.path);
       });
       return;
     }
     if (jsonEvent.method === 'onStepBegin') {
-      const step = jsonEvent.params.step as JsonTestStepStart;
+      const step = jsonEvent.params.step;
       this._updateLocation(step.location);
       return;
     }
+    if (jsonEvent.method === 'onStepEnd') {
+      const step = jsonEvent.params.step;
+      this._updateErrorLocations(step.error);
+      step.annotations?.forEach(annotation => this._updateAnnotationLocation(annotation));
+      return;
+    }
+    if (jsonEvent.method === 'onAttach') {
+      const attach = jsonEvent.params;
+      attach.attachments.forEach(attachment => {
+        if (attachment.path)
+          attachment.path = this._updatePath(attachment.path);
+      });
+      return;
+    }
   }
 
   private _updateProject(project: JsonProject) {
@@ -497,13 +529,26 @@ class PathSeparatorPatcher {
     if (isFileSuite)
       suite.title = this._updatePath(suite.title);
     for (const entry of suite.entries) {
-      if ('testId' in entry)
+      if ('testId' in entry) {
         this._updateLocation(entry.location);
-      else
+        entry.annotations?.forEach(annotation => this._updateAnnotationLocation(annotation));
+      } else {
         this._updateSuite(entry);
+      }
     }
   }
 
+  private _updateErrorLocations(error: TestError | undefined) {
+    while (error) {
+      this._updateLocation(error.location);
+      error = error.cause;
+    }
+  }
+
+  private _updateAnnotationLocation(annotation: TestAnnotation) {
+    this._updateLocation(annotation.location);
+  }
+
   private _updateLocation(location?: JsonLocation) {
     if (location)
       location.file = this._updatePath(location.file);
@@ -524,7 +569,7 @@ class GlobalErrorPatcher {
   patchEvent(event: JsonEvent) {
     if (event.method !== 'onError')
       return;
-    const error = event.params.error as TestError;
+    const error = event.params.error;
     if (error.message !== undefined)
       error.message = this._prefix + error.message;
     if (error.stack !== undefined)
@@ -572,7 +617,7 @@ class BlobModernizer {
           return { entries: [...newSuites, ...tests], ...remainder };
         };
         const project = event.params.project;
-        project.suites = project.suites.map(modernizeSuite);
+        project.suites = (project.suites as unknown as blobV1.JsonSuite[]).map(modernizeSuite);
       }
       return event;
     });
diff --git a/packages/playwright/src/reporters/multiplexer.ts b/packages/playwright/src/reporters/multiplexer.ts
index bfd91f33508cd..2a11b9358319a 100644
--- a/packages/playwright/src/reporters/multiplexer.ts
+++ b/packages/playwright/src/reporters/multiplexer.ts
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import type { FullConfig, TestCase, TestError, TestResult, FullResult, TestStep } from '../../types/testReporter';
-import type { Suite } from '../common/test';
 import type { ReporterV2 } from './reporterV2';
+import type { FullConfig, FullResult, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
+import type { Suite } from '../common/test';
 
 export class Multiplexer implements ReporterV2 {
   private _reporters: ReporterV2[];
@@ -31,37 +31,37 @@ export class Multiplexer implements ReporterV2 {
 
   onConfigure(config: FullConfig) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onConfigure(config));
+      wrap(() => reporter.onConfigure?.(config));
   }
 
   onBegin(suite: Suite) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onBegin(suite));
+      wrap(() => reporter.onBegin?.(suite));
   }
 
   onTestBegin(test: TestCase, result: TestResult) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onTestBegin(test, result));
+      wrap(() => reporter.onTestBegin?.(test, result));
   }
 
   onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onStdOut(chunk, test, result));
+      wrap(() => reporter.onStdOut?.(chunk, test, result));
   }
 
   onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onStdErr(chunk, test, result));
+      wrap(() => reporter.onStdErr?.(chunk, test, result));
   }
 
   onTestEnd(test: TestCase, result: TestResult) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onTestEnd(test, result));
+      wrap(() => reporter.onTestEnd?.(test, result));
   }
 
   async onEnd(result: FullResult) {
     for (const reporter of this._reporters) {
-      const outResult = await wrapAsync(() => reporter.onEnd(result));
+      const outResult = await wrapAsync(() => reporter.onEnd?.(result));
       if (outResult?.status)
         result.status = outResult.status;
     }
@@ -70,28 +70,28 @@ export class Multiplexer implements ReporterV2 {
 
   async onExit() {
     for (const reporter of this._reporters)
-      await wrapAsync(() => reporter.onExit());
+      await wrapAsync(() => reporter.onExit?.());
   }
 
   onError(error: TestError) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onError(error));
+      wrap(() => reporter.onError?.(error));
   }
 
   onStepBegin(test: TestCase, result: TestResult, step: TestStep) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onStepBegin(test, result, step));
+      wrap(() => reporter.onStepBegin?.(test, result, step));
   }
 
   onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
     for (const reporter of this._reporters)
-      wrap(() => reporter.onStepEnd(test, result, step));
+      wrap(() => reporter.onStepEnd?.(test, result, step));
   }
 
   printsToStdio(): boolean {
     return this._reporters.some(r => {
-      let prints = true;
-      wrap(() => prints = r.printsToStdio());
+      let prints = false;
+      wrap(() => prints = r.printsToStdio ? r.printsToStdio() : true);
       return prints;
     });
   }
@@ -101,6 +101,7 @@ async function wrapAsync<T>(callback: () => T | Promise<T>) {
   try {
     return await callback();
   } catch (e) {
+    // eslint-disable-next-line no-console
     console.error('Error in reporter', e);
   }
 }
@@ -109,6 +110,7 @@ function wrap(callback: () => void) {
   try {
     callback();
   } catch (e) {
+    // eslint-disable-next-line no-console
     console.error('Error in reporter', e);
   }
 }
diff --git a/packages/playwright/src/reporters/reporterV2.ts b/packages/playwright/src/reporters/reporterV2.ts
index 3d640f97c3f44..280ef2bfd2f19 100644
--- a/packages/playwright/src/reporters/reporterV2.ts
+++ b/packages/playwright/src/reporters/reporterV2.ts
@@ -14,24 +14,26 @@
  * limitations under the License.
  */
 
-import type { FullConfig, TestCase, TestError, TestResult, FullResult, TestStep, Reporter, Suite } from '../../types/testReporter';
+import type { FullConfig, FullResult, Reporter, Suite, TestCase, TestError, TestResult, TestStep } from '../../types/testReporter';
 
 export interface ReporterV2 {
-  onConfigure(config: FullConfig): void;
-  onBegin(suite: Suite): void;
-  onTestBegin(test: TestCase, result: TestResult): void;
-  onStdOut(chunk: string | Buffer, test?: TestCase, result?: TestResult): void;
-  onStdErr(chunk: string | Buffer, test?: TestCase, result?: TestResult): void;
-  onTestEnd(test: TestCase, result: TestResult): void;
-  onEnd(result: FullResult): Promise<{ status?: FullResult['status'] } | undefined | void> | void;
-  onExit(): void | Promise<void>;
-  onError(error: TestError): void;
-  onStepBegin(test: TestCase, result: TestResult, step: TestStep): void;
-  onStepEnd(test: TestCase, result: TestResult, step: TestStep): void;
-  printsToStdio(): boolean;
+  onConfigure?(config: FullConfig): void;
+  onBegin?(suite: Suite): void;
+  onTestBegin?(test: TestCase, result: TestResult): void;
+  onStdOut?(chunk: string | Buffer, test?: TestCase, result?: TestResult): void;
+  onStdErr?(chunk: string | Buffer, test?: TestCase, result?: TestResult): void;
+  onTestEnd?(test: TestCase, result: TestResult): void;
+  onEnd?(result: FullResult): Promise<{ status?: FullResult['status'] } | undefined | void> | void;
+  onExit?(): void | Promise<void>;
+  onError?(error: TestError): void;
+  onStepBegin?(test: TestCase, result: TestResult, step: TestStep): void;
+  onStepEnd?(test: TestCase, result: TestResult, step: TestStep): void;
+  printsToStdio?(): boolean;
   version(): 'v2';
 }
 
+export type AnyReporter = ReporterV2 | Reporter;
+
 type StdIOChunk = {
   chunk: string | Buffer;
   test?: TestCase;
diff --git a/packages/playwright/src/reporters/teleEmitter.ts b/packages/playwright/src/reporters/teleEmitter.ts
index 670a8c16c85dc..44fbcec7230d7 100644
--- a/packages/playwright/src/reporters/teleEmitter.ts
+++ b/packages/playwright/src/reporters/teleEmitter.ts
@@ -15,11 +15,15 @@
  */
 
 import path from 'path';
+
 import { createGuid } from 'playwright-core/lib/utils';
-import type * as reporterTypes from '../../types/testReporter';
-import type * as teleReceiver from '../isomorphic/teleReceiver';
+
 import { serializeRegexPatterns } from '../isomorphic/teleReceiver';
+
 import type { ReporterV2 } from './reporterV2';
+import type * as reporterTypes from '../../types/testReporter';
+import type { TestAnnotation } from '../../types/test';
+import type * as teleReceiver from '../isomorphic/teleReceiver';
 
 export type TeleReporterEmitterOptions = {
   omitOutput?: boolean;
@@ -30,6 +34,7 @@ export class TeleReporterEmitter implements ReporterV2 {
   private _messageSink: (message: teleReceiver.JsonEvent) => void;
   private _rootDir!: string;
   private _emitterOptions: TeleReporterEmitterOptions;
+  private _resultKnownAttachmentCounts = new Map<string, number>();
   // In case there is blob reporter and UI mode, make sure one does override
   // the id assigned by the other.
   private readonly _idSymbol = Symbol('id');
@@ -70,9 +75,10 @@ export class TeleReporterEmitter implements ReporterV2 {
     const testEnd: teleReceiver.JsonTestEnd = {
       testId: test.id,
       expectedStatus: test.expectedStatus,
-      annotations: test.annotations,
       timeout: test.timeout,
+      annotations: []
     };
+    this._sendNewAttachments(result, test.id);
     this._messageSink({
       method: 'onTestEnd',
       params: {
@@ -80,6 +86,8 @@ export class TeleReporterEmitter implements ReporterV2 {
         result: this._serializeResultEnd(result),
       }
     });
+
+    this._resultKnownAttachmentCounts.delete((result as any)[this._idSymbol]);
   }
 
   onStepBegin(test: reporterTypes.TestCase, result: reporterTypes.TestResult, step: reporterTypes.TestStep): void {
@@ -95,12 +103,16 @@ export class TeleReporterEmitter implements ReporterV2 {
   }
 
   onStepEnd(test: reporterTypes.TestCase, result: reporterTypes.TestResult, step: reporterTypes.TestStep): void {
+    // Create synthetic onAttach event so we serialize the entire attachment along with the step
+    const resultId = (result as any)[this._idSymbol] as string;
+    this._sendNewAttachments(result, test.id);
+
     this._messageSink({
       method: 'onStepEnd',
       params: {
         testId: test.id,
-        resultId: (result as any)[this._idSymbol],
-        step: this._serializeStepEnd(step)
+        resultId,
+        step: this._serializeStepEnd(step, result)
       }
     });
   }
@@ -145,9 +157,6 @@ export class TeleReporterEmitter implements ReporterV2 {
     });
   }
 
-  async onExit() {
-  }
-
   printsToStdio() {
     return false;
   }
@@ -184,10 +193,17 @@ export class TeleReporterEmitter implements ReporterV2 {
       dependencies: project.dependencies,
       snapshotDir: this._relativePath(project.snapshotDir),
       teardown: project.teardown,
+      use: this._serializeProjectUseOptions(project.use),
     };
     return report;
   }
 
+  private _serializeProjectUseOptions(use: reporterTypes.FullProject['use']): Record<string, any> {
+    return {
+      testIdAttribute: use.testIdAttribute,
+    };
+  }
+
   private _serializeSuite(suite: reporterTypes.Suite): teleReceiver.JsonSuite {
     const result = {
       title: suite.title,
@@ -209,7 +225,7 @@ export class TeleReporterEmitter implements ReporterV2 {
       retries: test.retries,
       tags: test.tags,
       repeatEachIndex: test.repeatEachIndex,
-      annotations: test.annotations,
+      annotations: this._relativeAnnotationLocations(test.annotations),
     };
   }
 
@@ -229,16 +245,35 @@ export class TeleReporterEmitter implements ReporterV2 {
       duration: result.duration,
       status: result.status,
       errors: result.errors,
-      attachments: this._serializeAttachments(result.attachments),
+      annotations: result.annotations?.length ? this._relativeAnnotationLocations(result.annotations) : undefined,
     };
   }
 
+  private _sendNewAttachments(result: reporterTypes.TestResult, testId: string) {
+    const resultId = (result as any)[this._idSymbol] as string;
+    // Track whether this step (or something else since the last step) has added attachments and send them
+    const knownAttachmentCount = this._resultKnownAttachmentCounts.get(resultId) ?? 0;
+    if (result.attachments.length > knownAttachmentCount) {
+      this._messageSink({
+        method: 'onAttach',
+        params: {
+          testId,
+          resultId,
+          attachments: this._serializeAttachments((result.attachments.slice(knownAttachmentCount))),
+        }
+      });
+    }
+
+    this._resultKnownAttachmentCounts.set(resultId, result.attachments.length);
+  }
+
   _serializeAttachments(attachments: reporterTypes.TestResult['attachments']): teleReceiver.JsonAttachment[] {
     return attachments.map(a => {
+      const { body, ...rest } = a;
       return {
-        ...a,
+        ...rest,
         // There is no Buffer in the browser, so there is no point in sending the data there.
-        base64: (a.body && !this._emitterOptions.omitBuffers) ? a.body.toString('base64') : undefined,
+        base64: (body && !this._emitterOptions.omitBuffers) ? body.toString('base64') : undefined,
       };
     });
   }
@@ -254,14 +289,23 @@ export class TeleReporterEmitter implements ReporterV2 {
     };
   }
 
-  private _serializeStepEnd(step: reporterTypes.TestStep): teleReceiver.JsonTestStepEnd {
+  private _serializeStepEnd(step: reporterTypes.TestStep, result: reporterTypes.TestResult): teleReceiver.JsonTestStepEnd {
     return {
       id: (step as any)[this._idSymbol],
       duration: step.duration,
       error: step.error,
+      attachments: step.attachments.length ? step.attachments.map(a => result.attachments.indexOf(a)) : undefined,
+      annotations: step.annotations.length ? this._relativeAnnotationLocations(step.annotations) : undefined,
     };
   }
 
+  private _relativeAnnotationLocations(annotations: TestAnnotation[]): TestAnnotation[] {
+    return annotations.map(annotation => ({
+      ...annotation,
+      location: annotation.location ? this._relativeLocation(annotation.location) : undefined,
+    }));
+  }
+
   private _relativeLocation(location: reporterTypes.Location): reporterTypes.Location;
   private _relativeLocation(location?: reporterTypes.Location): reporterTypes.Location | undefined;
   private _relativeLocation(location: reporterTypes.Location | undefined): reporterTypes.Location | undefined {
diff --git a/packages/playwright/src/runner/DEPS.list b/packages/playwright/src/runner/DEPS.list
index cdf60448442a9..bc1cc6d7634dd 100644
--- a/packages/playwright/src/runner/DEPS.list
+++ b/packages/playwright/src/runner/DEPS.list
@@ -7,6 +7,5 @@
 ../plugins/
 ../util.ts
 ../utilsBundle.ts
-../isomorphic/folders.ts
-../isomorphic/teleReceiver.ts
+../isomorphic/
 ../fsWatcher.ts
diff --git a/packages/playwright/src/runner/dispatcher.ts b/packages/playwright/src/runner/dispatcher.ts
index ad44ce453ee95..5e0525e5410f0 100644
--- a/packages/playwright/src/runner/dispatcher.ts
+++ b/packages/playwright/src/runner/dispatcher.ts
@@ -14,25 +14,32 @@
  * limitations under the License.
  */
 
-import type { TestBeginPayload, TestEndPayload, DonePayload, TestOutputPayload, StepBeginPayload, StepEndPayload, TeardownErrorsPayload, RunPayload, SerializedConfig, AttachmentPayload } from '../common/ipc';
+import { ManualPromise,  eventsHelper } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+
+import { addSuggestedRebaseline } from './rebase';
+import { WorkerHost } from './workerHost';
 import { serializeConfig } from '../common/ipc';
-import type { TestResult, TestStep, TestError } from '../../types/testReporter';
-import type { Suite } from '../common/test';
+
+import type { FailureTracker } from './failureTracker';
 import type { ProcessExitData } from './processHost';
-import type { TestCase } from '../common/test';
-import { ManualPromise, type RegisteredListener, eventsHelper } from 'playwright-core/lib/utils';
-import { WorkerHost } from './workerHost';
 import type { TestGroup } from './testGroups';
+import type { TestError, TestResult, TestStep } from '../../types/testReporter';
 import type { FullConfigInternal } from '../common/config';
+import type { AttachmentPayload, DonePayload, RunPayload, SerializedConfig, StepBeginPayload, StepEndPayload, StepRecoverFromErrorPayload, TeardownErrorsPayload, TestBeginPayload, TestEndPayload, TestOutputPayload } from '../common/ipc';
+import type { Suite } from '../common/test';
+import type { TestCase } from '../common/test';
 import type { ReporterV2 } from '../reporters/reporterV2';
-import type { FailureTracker } from './failureTracker';
-import { colors } from 'playwright-core/lib/utilsBundle';
+import type { RegisteredListener } from 'playwright-core/lib/utils';
+import type { RecoverFromStepErrorResult } from '@testIsomorphic/testServerInterface';
+
 
 export type EnvByProjectId = Map<string, Record<string, string | undefined>>;
 
 export class Dispatcher {
   private _workerSlots: { busy: boolean, worker?: WorkerHost, jobDispatcher?: JobDispatcher }[] = [];
   private _queue: TestGroup[] = [];
+  private _workerLimitPerProjectId = new Map<string, number>();
   private _queuedOrRunningHashCount = new Map<string, number>();
   private _finished = new ManualPromise<void>();
   private _isStopped = true;
@@ -48,38 +55,71 @@ export class Dispatcher {
     this._config = config;
     this._reporter = reporter;
     this._failureTracker = failureTracker;
+    for (const project of config.projects) {
+      if (project.workers)
+        this._workerLimitPerProjectId.set(project.id, project.workers);
+    }
   }
 
-  private async _scheduleJob() {
+  private _findFirstJobToRun() {
+    // Always pick the first job that can be run while respecting the project worker limit.
+    for (let index = 0; index < this._queue.length; index++) {
+      const job = this._queue[index];
+      const projectIdWorkerLimit = this._workerLimitPerProjectId.get(job.projectId);
+      if (!projectIdWorkerLimit)
+        return index;
+      const runningWorkersWithSameProjectId = this._workerSlots.filter(w => w.busy && w.worker && w.worker.projectId() === job.projectId).length;
+      if (runningWorkersWithSameProjectId < projectIdWorkerLimit)
+        return index;
+    }
+    return -1;
+  }
+
+  private _scheduleJob() {
+    // NOTE: keep this method synchronous for easier reasoning.
+
+    // 0. No more running jobs after stop.
+    if (this._isStopped)
+      return;
+
     // 1. Find a job to run.
-    if (this._isStopped || !this._queue.length)
+    const jobIndex = this._findFirstJobToRun();
+    if (jobIndex === -1)
       return;
-    const job = this._queue[0];
+    const job = this._queue[jobIndex];
 
     // 2. Find a worker with the same hash, or just some free worker.
-    let index = this._workerSlots.findIndex(w => !w.busy && w.worker && w.worker.hash() === job.workerHash && !w.worker.didSendStop());
-    if (index === -1)
-      index = this._workerSlots.findIndex(w => !w.busy);
-    // No workers available, bail out.
-    if (index === -1)
+    let workerIndex = this._workerSlots.findIndex(w => !w.busy && w.worker && w.worker.hash() === job.workerHash && !w.worker.didSendStop());
+    if (workerIndex === -1)
+      workerIndex = this._workerSlots.findIndex(w => !w.busy);
+    if (workerIndex === -1) {
+      // No workers available, bail out.
       return;
+    }
 
-    // 3. Claim both the job and the worker, run the job and release the worker.
-    this._queue.shift();
-    this._workerSlots[index].busy = true;
-    await this._startJobInWorker(index, job);
-    this._workerSlots[index].busy = false;
+    // 3. Claim both the job and the worker slot.
+    this._queue.splice(jobIndex, 1);
+    const jobDispatcher = new JobDispatcher(job, this._reporter, this._failureTracker, () => this.stop().catch(() => {}));
+    this._workerSlots[workerIndex].busy = true;
+    this._workerSlots[workerIndex].jobDispatcher = jobDispatcher;
 
-    // 4. Check the "finished" condition.
-    this._checkFinished();
+    // 4. Run the job. This is the only async operation.
+    void this._runJobInWorker(workerIndex, jobDispatcher).then(() => {
 
-    // 5. We got a free worker - perhaps we can immediately start another job?
-    void this._scheduleJob();
+      // 5. Release the worker slot.
+      this._workerSlots[workerIndex].jobDispatcher = undefined;
+      this._workerSlots[workerIndex].busy = false;
+
+      // 6. Check whether we are done or should schedule another job.
+      this._checkFinished();
+      this._scheduleJob();
+    });
   }
 
-  private async _startJobInWorker(index: number, job: TestGroup) {
-    const stopCallback = () => this.stop().catch(() => {});
-    const jobDispatcher = new JobDispatcher(job, this._reporter, this._failureTracker, stopCallback);
+  private async _runJobInWorker(index: number, jobDispatcher: JobDispatcher) {
+    const job = jobDispatcher.job;
+
+    // 0. Perhaps skip the whole job?
     if (jobDispatcher.skipWholeJob())
       return;
 
@@ -92,7 +132,6 @@ export class Dispatcher {
       if (this._isStopped) // Check stopped signal after async hop.
         return;
     }
-    this._workerSlots[index].jobDispatcher = jobDispatcher;
 
     // 2. Start the worker if it is down.
     let startError;
@@ -105,13 +144,12 @@ export class Dispatcher {
         return;
     }
 
-    // 3. Run the job.
+    // 3. Finally, run some tests in the worker! Or fail all of them because of startup error...
     if (startError)
       jobDispatcher.onExit(startError);
     else
       jobDispatcher.runInWorker(worker);
     const result = await jobDispatcher.jobResult;
-    this._workerSlots[index].jobDispatcher = undefined;
     this._updateCounterForWorkerHash(job.workerHash, -1);
 
     // 4. When worker encounters error, we stop it and create a new one.
@@ -121,10 +159,10 @@ export class Dispatcher {
     else if (this._isWorkerRedundant(worker))
       void worker.stop();
 
-    // 5. Possibly schedule a new job with leftover tests and/or retries.
+    // 5. Possibly queue a new job with leftover tests and/or retries.
     if (!this._isStopped && result.newJob) {
       this._queue.unshift(result.newJob);
-      this._updateCounterForWorkerHash(job.workerHash, +1);
+      this._updateCounterForWorkerHash(result.newJob.workerHash, +1);
     }
   }
 
@@ -171,7 +209,7 @@ export class Dispatcher {
       this._workerSlots.push({ busy: false });
     // 2. Schedule enough jobs.
     for (let i = 0; i < this._workerSlots.length; i++)
-      void this._scheduleJob();
+      this._scheduleJob();
     this._checkFinished();
     // 3. More jobs are scheduled when the worker becomes free.
     // 4. Wait for all jobs to finish.
@@ -181,7 +219,8 @@ export class Dispatcher {
   _createWorker(testGroup: TestGroup, parallelIndex: number, loaderData: SerializedConfig) {
     const projectConfig = this._config.projects.find(p => p.id === testGroup.projectId)!;
     const outputDir = projectConfig.project.outputDir;
-    const worker = new WorkerHost(testGroup, parallelIndex, loaderData, this._extraEnvByProjectId.get(testGroup.projectId) || {}, outputDir);
+    const recoverFromStepErrors = this._failureTracker.canRecoverFromStepError();
+    const worker = new WorkerHost(testGroup, parallelIndex, loaderData, recoverFromStepErrors, this._extraEnvByProjectId.get(testGroup.projectId) || {}, outputDir);
     const handleOutput = (params: TestOutputPayload) => {
       const chunk = chunkFromParams(params);
       if (worker.didFail()) {
@@ -198,17 +237,17 @@ export class Dispatcher {
     worker.on('stdOut', (params: TestOutputPayload) => {
       const { chunk, test, result } = handleOutput(params);
       result?.stdout.push(chunk);
-      this._reporter.onStdOut(chunk, test, result);
+      this._reporter.onStdOut?.(chunk, test, result);
     });
     worker.on('stdErr', (params: TestOutputPayload) => {
       const { chunk, test, result } = handleOutput(params);
       result?.stderr.push(chunk);
-      this._reporter.onStdErr(chunk, test, result);
+      this._reporter.onStdErr?.(chunk, test, result);
     });
     worker.on('teardownErrors', (params: TeardownErrorsPayload) => {
       this._failureTracker.onWorkerError();
       for (const error of params.fatalErrors)
-        this._reporter.onError(error);
+        this._reporter.onError?.(error);
     });
     worker.on('exit', () => {
       const producedEnv = this._producedEnvByProjectId.get(testGroup.projectId) || {};
@@ -233,6 +272,10 @@ export class Dispatcher {
 class JobDispatcher {
   jobResult = new ManualPromise<{ newJob?: TestGroup, didFail: boolean }>();
 
+  readonly job: TestGroup;
+  private _reporter: ReporterV2;
+  private _failureTracker: FailureTracker;
+  private _stopCallback: () => void;
   private _listeners: RegisteredListener[] = [];
   private _failedTests = new Set<TestCase>();
   private _failedWithNonRetriableError = new Set<TestCase|Suite>();
@@ -242,8 +285,12 @@ class JobDispatcher {
   private _workerIndex = 0;
   private _currentlyRunning: { test: TestCase, result: TestResult } | undefined;
 
-  constructor(private _job: TestGroup, private _reporter: ReporterV2, private _failureTracker: FailureTracker, private _stopCallback: () => void) {
-    this._remainingByTestId = new Map(this._job.tests.map(e => [e.id, e]));
+  constructor(job: TestGroup, reporter: ReporterV2, failureTracker: FailureTracker, stopCallback: () => void) {
+    this.job = job;
+    this._reporter = reporter;
+    this._failureTracker = failureTracker;
+    this._stopCallback = stopCallback;
+    this._remainingByTestId = new Map(this.job.tests.map(e => [e.id, e]));
   }
 
   private _onTestBegin(params: TestBeginPayload) {
@@ -257,7 +304,7 @@ class JobDispatcher {
     result.parallelIndex = this._parallelIndex;
     result.workerIndex = this._workerIndex;
     result.startTime = new Date(params.startWallTime);
-    this._reporter.onTestBegin(test, result);
+    this._reporter.onTestBegin?.(test, result);
     this._currentlyRunning = { test, result };
   }
 
@@ -280,8 +327,9 @@ class JobDispatcher {
     result.errors = params.errors;
     result.error = result.errors[0];
     result.status = params.status;
+    result.annotations = params.annotations;
+    test.annotations = [...params.annotations]; // last test result wins
     test.expectedStatus = params.expectedStatus;
-    test.annotations = params.annotations;
     test.timeout = params.timeout;
     const isFailure = result.status !== 'skipped' && result.status !== test.expectedStatus;
     if (isFailure)
@@ -319,11 +367,13 @@ class JobDispatcher {
       startTime: new Date(params.wallTime),
       duration: -1,
       steps: [],
+      attachments: [],
+      annotations: [],
       location: params.location,
     };
     steps.set(params.stepId, step);
     (parentStep || result).steps.push(step);
-    this._reporter.onStepBegin(test, result, step);
+    this._reporter.onStepBegin?.(test, result, step);
   }
 
   private _onStepEnd(params: StepEndPayload) {
@@ -335,14 +385,37 @@ class JobDispatcher {
     const { result, steps, test } = data;
     const step = steps.get(params.stepId);
     if (!step) {
-      this._reporter.onStdErr('Internal error: step end without step begin: ' + params.stepId, test, result);
+      this._reporter.onStdErr?.('Internal error: step end without step begin: ' + params.stepId, test, result);
       return;
     }
     step.duration = params.wallTime - step.startTime.getTime();
     if (params.error)
       step.error = params.error;
+    if (params.suggestedRebaseline)
+      addSuggestedRebaseline(step.location!, params.suggestedRebaseline);
+    step.annotations = params.annotations;
     steps.delete(params.stepId);
-    this._reporter.onStepEnd(test, result, step);
+    this._reporter.onStepEnd?.(test, result, step);
+  }
+
+  private _onStepRecoverFromError(resumeAfterStepError: (result: RecoverFromStepErrorResult) => void, params: StepRecoverFromErrorPayload) {
+    const data = this._dataByTestId.get(params.testId);
+    if (!data) {
+      resumeAfterStepError({ stepId: params.stepId, status: 'failed' });
+      return;
+    }
+    const { steps } = data;
+    const step = steps.get(params.stepId);
+    if (!step) {
+      resumeAfterStepError({ stepId: params.stepId, status: 'failed' });
+      return;
+    }
+
+    const testError: TestError = {
+      ...params.error,
+      location: step.location,
+    };
+    this._failureTracker.recoverFromStepError(params.stepId, testError, resumeAfterStepError);
   }
 
   private _onAttach(params: AttachmentPayload) {
@@ -358,6 +431,13 @@ class JobDispatcher {
       body: params.body !== undefined ? Buffer.from(params.body, 'base64') : undefined
     };
     data.result.attachments.push(attachment);
+    if (params.stepId) {
+      const step = data.steps.get(params.stepId);
+      if (step)
+        step.attachments.push(attachment);
+      else
+        this._reporter.onStdErr?.('Internal error: step id not found: ' + params.stepId);
+    }
   }
 
   private _failTestWithErrors(test: TestCase, errors: TestError[]) {
@@ -368,7 +448,7 @@ class JobDispatcher {
       result = runData.result;
     } else {
       result = test._appendTestResult();
-      this._reporter.onTestBegin(test, result);
+      this._reporter.onTestBegin?.(test, result);
     }
     result.errors = [...errors];
     result.error = result.errors[0];
@@ -392,7 +472,7 @@ class JobDispatcher {
       // Let's just fail the test run.
       this._failureTracker.onWorkerError();
       for (const error of errors)
-        this._reporter.onError(error);
+        this._reporter.onError?.(error);
     }
   }
 
@@ -475,7 +555,7 @@ class JobDispatcher {
     }
 
     // This job is over, we will schedule another one.
-    const newJob = remaining.length ? { ...this._job, tests: remaining } : undefined;
+    const newJob = remaining.length ? { ...this.job, tests: remaining } : undefined;
     this._finished({ didFail: true, newJob });
   }
 
@@ -496,18 +576,20 @@ class JobDispatcher {
     this._workerIndex = worker.workerIndex;
 
     const runPayload: RunPayload = {
-      file: this._job.requireFile,
-      entries: this._job.tests.map(test => {
+      file: this.job.requireFile,
+      entries: this.job.tests.map(test => {
         return { testId: test.id, retry: test.results.length };
       }),
     };
     worker.runTestGroup(runPayload);
+    const resumeAfterStepError = worker.resumeAfterStepError.bind(worker);
 
     this._listeners = [
       eventsHelper.addEventListener(worker, 'testBegin', this._onTestBegin.bind(this)),
       eventsHelper.addEventListener(worker, 'testEnd', this._onTestEnd.bind(this)),
       eventsHelper.addEventListener(worker, 'stepBegin', this._onStepBegin.bind(this)),
       eventsHelper.addEventListener(worker, 'stepEnd', this._onStepEnd.bind(this)),
+      eventsHelper.addEventListener(worker, 'stepRecoverFromError', this._onStepRecoverFromError.bind(this, resumeAfterStepError)),
       eventsHelper.addEventListener(worker, 'attach', this._onAttach.bind(this)),
       eventsHelper.addEventListener(worker, 'done', this._onDone.bind(this)),
       eventsHelper.addEventListener(worker, 'exit', this.onExit.bind(this)),
@@ -522,11 +604,11 @@ class JobDispatcher {
     // the whole group to the worker process and report tests in the natural order,
     // with skipped tests mixed in-between non-skipped. This makes
     // for a better reporter experience.
-    const allTestsSkipped = this._job.tests.every(test => test.expectedStatus === 'skipped');
+    const allTestsSkipped = this.job.tests.every(test => test.expectedStatus === 'skipped');
     if (allTestsSkipped && !this._failureTracker.hasReachedMaxFailures()) {
-      for (const test of this._job.tests) {
+      for (const test of this.job.tests) {
         const result = test._appendTestResult();
-        this._reporter.onTestBegin(test, result);
+        this._reporter.onTestBegin?.(test, result);
         result.status = 'skipped';
         this._reportTestEnd(test, result);
       }
@@ -540,13 +622,13 @@ class JobDispatcher {
   }
 
   private _reportTestEnd(test: TestCase, result: TestResult) {
-    this._reporter.onTestEnd(test, result);
+    this._reporter.onTestEnd?.(test, result);
     const hadMaxFailures = this._failureTracker.hasReachedMaxFailures();
     this._failureTracker.onTestEnd(test, result);
     if (this._failureTracker.hasReachedMaxFailures()) {
       this._stopCallback();
       if (!hadMaxFailures)
-        this._reporter.onError({ message: colors.red(`Testing stopped early after ${this._failureTracker.maxFailures()} maximum allowed failures.`) });
+        this._reporter.onError?.({ message: colors.red(`Testing stopped early after ${this._failureTracker.maxFailures()} maximum allowed failures.`) });
     }
   }
 }
diff --git a/packages/playwright/src/runner/failureTracker.ts b/packages/playwright/src/runner/failureTracker.ts
index 6ea8f81a3432d..42481e06ca2ff 100644
--- a/packages/playwright/src/runner/failureTracker.ts
+++ b/packages/playwright/src/runner/failureTracker.ts
@@ -14,27 +14,48 @@
  * limitations under the License.
  */
 
-import type { TestResult } from '../../types/testReporter';
+import type { RecoverFromStepErrorResult } from '@testIsomorphic/testServerInterface';
+import type { TestResult, TestError } from '../../types/testReporter';
 import type { FullConfigInternal } from '../common/config';
 import type { Suite, TestCase } from '../common/test';
 
+export type RecoverFromStepErrorHandler = (stepId: string, error: TestError) => Promise<RecoverFromStepErrorResult>;
+
 export class FailureTracker {
   private _failureCount = 0;
   private _hasWorkerErrors = false;
   private _rootSuite: Suite | undefined;
+  private _recoverFromStepErrorHandler: RecoverFromStepErrorHandler | undefined;
 
   constructor(private _config: FullConfigInternal) {
   }
 
+  canRecoverFromStepError(): boolean {
+    return !!this._recoverFromStepErrorHandler;
+  }
+
+  setRecoverFromStepErrorHandler(recoverFromStepErrorHandler: RecoverFromStepErrorHandler) {
+    this._recoverFromStepErrorHandler = recoverFromStepErrorHandler;
+  }
+
   onRootSuite(rootSuite: Suite) {
     this._rootSuite = rootSuite;
   }
 
   onTestEnd(test: TestCase, result: TestResult) {
-    if (result.status !== 'skipped' && result.status !== test.expectedStatus)
+    // Test is considered failing after the last retry.
+    if (test.outcome() === 'unexpected' && test.results.length > test.retries)
       ++this._failureCount;
   }
 
+  recoverFromStepError(stepId: string, error: TestError, resumeAfterStepError: (result: RecoverFromStepErrorResult) => void) {
+    if (!this._recoverFromStepErrorHandler) {
+      resumeAfterStepError({ stepId, status: 'failed' });
+      return;
+    }
+    void this._recoverFromStepErrorHandler(stepId, error).then(resumeAfterStepError).catch(() => {});
+  }
+
   onWorkerError() {
     this._hasWorkerErrors = true;
   }
@@ -48,7 +69,7 @@ export class FailureTracker {
   }
 
   result(): 'failed' | 'passed' {
-    return this._hasWorkerErrors || this.hasReachedMaxFailures() || this.hasFailedTests() || (this._config.cliFailOnFlakyTests && this.hasFlakyTests()) ? 'failed' : 'passed';
+    return this._hasWorkerErrors || this.hasReachedMaxFailures() || this.hasFailedTests() || (this._config.failOnFlakyTests && this.hasFlakyTests()) ? 'failed' : 'passed';
   }
 
   hasFailedTests() {
@@ -62,4 +83,5 @@ export class FailureTracker {
   maxFailures() {
     return this._config.config.maxFailures;
   }
+
 }
diff --git a/packages/playwright/src/runner/lastRun.ts b/packages/playwright/src/runner/lastRun.ts
new file mode 100644
index 0000000000000..93ffe9205f925
--- /dev/null
+++ b/packages/playwright/src/runner/lastRun.ts
@@ -0,0 +1,77 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 { filterProjects } from './projectUtils';
+
+import type { FullResult, Suite } from '../../types/testReporter';
+import type { FullConfigInternal } from '../common/config';
+import type { ReporterV2 } from '../reporters/reporterV2';
+
+type LastRunInfo = {
+  status: FullResult['status'];
+  failedTests: string[];
+};
+
+export class LastRunReporter implements ReporterV2 {
+  private _config: FullConfigInternal;
+  private _lastRunFile: string | undefined;
+  private _suite: Suite | undefined;
+
+  constructor(config: FullConfigInternal) {
+    this._config = config;
+    const [project] = filterProjects(config.projects, config.cliProjectFilter);
+    if (project)
+      this._lastRunFile = path.join(project.project.outputDir, '.last-run.json');
+  }
+
+  async filterLastFailed() {
+    if (!this._lastRunFile)
+      return;
+    try {
+      const lastRunInfo = JSON.parse(await fs.promises.readFile(this._lastRunFile, 'utf8')) as LastRunInfo;
+      const failedTestIds = new Set(lastRunInfo.failedTests);
+      // Explicitly apply --last-failed filter after sharding.
+      this._config.postShardTestFilters.push(test => failedTestIds.has(test.id));
+    } catch {
+    }
+  }
+
+  version(): 'v2' {
+    return 'v2';
+  }
+
+  printsToStdio() {
+    return false;
+  }
+
+  onBegin(suite: Suite) {
+    this._suite = suite;
+  }
+
+  async onEnd(result: FullResult) {
+    if (!this._lastRunFile || this._config.cliListOnly)
+      return;
+    const lastRunInfo: LastRunInfo = {
+      status: result.status,
+      failedTests: this._suite?.allTests().filter(t => !t.ok()).map(t => t.id) || [],
+    };
+    await fs.promises.mkdir(path.dirname(this._lastRunFile), { recursive: true });
+    await fs.promises.writeFile(this._lastRunFile, JSON.stringify(lastRunInfo, undefined, 2));
+  }
+}
diff --git a/packages/playwright/src/runner/loadUtils.ts b/packages/playwright/src/runner/loadUtils.ts
index 4cac21cd08106..05c5bba7182ee 100644
--- a/packages/playwright/src/runner/loadUtils.ts
+++ b/packages/playwright/src/runner/loadUtils.ts
@@ -15,25 +15,28 @@
  */
 
 import path from 'path';
-import type { FullConfig, Reporter, TestError } from '../../types/testReporter';
+
 import { InProcessLoaderHost, OutOfProcessLoaderHost } from './loaderHost';
-import { Suite } from '../common/test';
-import type { TestCase } from '../common/test';
-import type { FullProjectInternal } from '../common/config';
-import type { FullConfigInternal } from '../common/config';
-import { createFileMatcherFromArguments, createFileFiltersFromArguments, createTitleMatcher, errorWithFile, forceRegExp } from '../util';
-import type { Matcher, TestFileFilter } from '../util';
+import { createFileFiltersFromArguments, createFileMatcherFromArguments, createTitleMatcher, errorWithFile, forceRegExp } from '../util';
 import { buildProjectsClosure, collectFilesForProject, filterProjects } from './projectUtils';
-import type { TestRun } from './tasks';
-import { requireOrImport } from '../transform/transform';
-import { applyRepeatEachIndex, bindFileSuiteToProject, filterByFocusedLine, filterByTestIds, filterOnly, filterTestsRemoveEmptySuites } from '../common/suiteUtils';
-import { createTestGroups, filterForShard, type TestGroup } from './testGroups';
+import {  createTestGroups, filterForShard } from './testGroups';
+import { applyRepeatEachIndex, bindFileSuiteToProject, filterByFocusedLine, filterOnly, filterTestsRemoveEmptySuites } from '../common/suiteUtils';
+import { Suite } from '../common/test';
 import { dependenciesForTestFile } from '../transform/compilationCache';
+import { requireOrImport } from '../transform/transform';
 import { sourceMapSupport } from '../utilsBundle';
-import type { RawSourceMap } from 'source-map';
+
+import type { TestRun } from './tasks';
+import type { TestGroup } from './testGroups';
+import type { FullConfig, Reporter, TestError } from '../../types/testReporter';
+import type { FullProjectInternal } from '../common/config';
+import type { FullConfigInternal } from '../common/config';
+import type { TestCase } from '../common/test';
+import type { Matcher, TestCaseFilter, TestFileFilter } from '../util';
+import type { RawSourceMap } from '../utilsBundle';
 
 
-export async function collectProjectsAndTestFiles(testRun: TestRun, doNotRunTestsOutsideProjectFilter: boolean, additionalFileMatcher?: Matcher) {
+export async function collectProjectsAndTestFiles(testRun: TestRun, doNotRunTestsOutsideProjectFilter: boolean) {
   const config = testRun.config;
   const fsCache = new Map();
   const sourceMapCache = new Map();
@@ -52,8 +55,6 @@ export async function collectProjectsAndTestFiles(testRun: TestRun, doNotRunTest
   for (const [project, files] of allFilesForProject) {
     const matchedFiles = files.filter(file => {
       const hasMatchingSources = sourceMapSources(file, sourceMapCache).some(source => {
-        if (additionalFileMatcher && !additionalFileMatcher(source))
-          return false;
         if (cliFileMatcher && !cliFileMatcher(source))
           return false;
         return true;
@@ -119,7 +120,7 @@ export async function loadFileSuites(testRun: TestRun, mode: 'out-of-process' |
   }
 }
 
-export async function createRootSuite(testRun: TestRun, errors: TestError[], shouldFilterOnly: boolean, additionalFileMatcher?: Matcher): Promise<Suite> {
+export async function createRootSuite(testRun: TestRun, errors: TestError[], shouldFilterOnly: boolean): Promise<Suite> {
   const config = testRun.config;
   // Create root suite, where each child will be a project suite with cloned file suites inside it.
   const rootSuite = new Suite('', 'root');
@@ -136,10 +137,10 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
 
     // Filter file suites for all projects.
     for (const [project, fileSuites] of testRun.projectSuites) {
-      const filteredFileSuites = additionalFileMatcher ? fileSuites.filter(fileSuite => additionalFileMatcher(fileSuite.location!.file)) : fileSuites;
-      const projectSuite = createProjectSuite(project, filteredFileSuites);
+      const projectSuite = createProjectSuite(project, fileSuites);
       projectSuites.set(project, projectSuite);
-      const filteredProjectSuite = filterProjectSuite(projectSuite, { cliFileFilters, cliTitleMatcher, testIdMatcher: config.testIdMatcher });
+
+      const filteredProjectSuite = filterProjectSuite(projectSuite, { cliFileFilters, cliTitleMatcher, testFilters: config.preOnlyTestFilters });
       filteredProjectSuites.set(project, filteredProjectSuite);
     }
   }
@@ -178,8 +179,11 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
   if (config.config.shard) {
     // Create test groups for top-level projects.
     const testGroups: TestGroup[] = [];
-    for (const projectSuite of rootSuite.suites)
-      testGroups.push(...createTestGroups(projectSuite, config.config.workers));
+    for (const projectSuite of rootSuite.suites) {
+      // Split beforeAll-grouped tests into "config.shard.total" groups when needed.
+      // Later on, we'll re-split them between workers by using "config.workers" instead.
+      testGroups.push(...createTestGroups(projectSuite, config.config.shard.total));
+    }
 
     // Shard test groups.
     const testGroupsInThisShard = filterForShard(config.config.shard, testGroups);
@@ -193,6 +197,9 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
     filterTestsRemoveEmptySuites(rootSuite, test => testsInThisShard.has(test));
   }
 
+  if (config.postShardTestFilters.length)
+    filterTestsRemoveEmptySuites(rootSuite, test => config.postShardTestFilters.every(filter => filter(test)));
+
   // Now prepend dependency projects without filtration.
   {
     // Filtering 'only' and sharding might have reduced the number of top-level projects.
@@ -200,8 +207,8 @@ export async function createRootSuite(testRun: TestRun, errors: TestError[], sho
     const projectClosure = new Map(buildProjectsClosure(rootSuite.suites.map(suite => suite._fullProject!)));
 
     // Clone file suites for dependency projects.
-    for (const project of projectClosure.keys()) {
-      if (projectClosure.get(project) === 'dependency')
+    for (const [project, level] of projectClosure.entries()) {
+      if (level === 'dependency')
         rootSuite._prependSuite(buildProjectSuite(project, projectSuites.get(project)!));
     }
   }
@@ -217,7 +224,7 @@ function createProjectSuite(project: FullProjectInternal, fileSuites: Suite[]):
   const grepMatcher = createTitleMatcher(project.project.grep);
   const grepInvertMatcher = project.project.grepInvert ? createTitleMatcher(project.project.grepInvert) : null;
   filterTestsRemoveEmptySuites(projectSuite, (test: TestCase) => {
-    const grepTitle = test._grepTitle();
+    const grepTitle = test._grepTitleWithTags();
     if (grepInvertMatcher?.(grepTitle))
       return false;
     return grepMatcher(grepTitle);
@@ -225,18 +232,18 @@ function createProjectSuite(project: FullProjectInternal, fileSuites: Suite[]):
   return projectSuite;
 }
 
-function filterProjectSuite(projectSuite: Suite, options: { cliFileFilters: TestFileFilter[], cliTitleMatcher?: Matcher, testIdMatcher?: Matcher }): Suite {
+function filterProjectSuite(projectSuite: Suite, options: { cliFileFilters: TestFileFilter[], cliTitleMatcher?: Matcher, testFilters: TestCaseFilter[] }): Suite {
   // Fast path.
-  if (!options.cliFileFilters.length && !options.cliTitleMatcher && !options.testIdMatcher)
+  if (!options.cliFileFilters.length && !options.cliTitleMatcher && !options.testFilters.length)
     return projectSuite;
 
   const result = projectSuite._deepClone();
   if (options.cliFileFilters.length)
     filterByFocusedLine(result, options.cliFileFilters);
-  if (options.testIdMatcher)
-    filterByTestIds(result, options.testIdMatcher);
   filterTestsRemoveEmptySuites(result, (test: TestCase) => {
-    if (options.cliTitleMatcher && !options.cliTitleMatcher(test._grepTitle()))
+    if (!options.testFilters.every(filter => filter(test)))
+      return false;
+    if (options.cliTitleMatcher && !options.cliTitleMatcher(test._grepTitleWithTags()))
       return false;
     return true;
   });
diff --git a/packages/playwright/src/runner/loaderHost.ts b/packages/playwright/src/runner/loaderHost.ts
index cc311e5f6ed29..369cf49a21d70 100644
--- a/packages/playwright/src/runner/loaderHost.ts
+++ b/packages/playwright/src/runner/loaderHost.ts
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-import type { TestError } from '../../types/testReporter';
-import { serializeConfig } from '../common/ipc';
 import { ProcessHost } from './processHost';
+import { incorporateCompilationCache } from '../common/esmLoaderHost';
+import { serializeConfig } from '../common/ipc';
+import { PoolBuilder } from '../common/poolBuilder';
 import { Suite } from '../common/test';
 import { loadTestFile } from '../common/testLoader';
-import type { FullConfigInternal } from '../common/config';
-import { PoolBuilder } from '../common/poolBuilder';
 import { addToCompilationCache } from '../transform/compilationCache';
-import { incorporateCompilationCache, initializeEsmLoader } from '../common/esmLoaderHost';
+
+import type { TestError } from '../../types/testReporter';
+import type { FullConfigInternal } from '../common/config';
+
 
 export class InProcessLoaderHost {
   private _config: FullConfigInternal;
@@ -34,7 +36,6 @@ export class InProcessLoaderHost {
   }
 
   async start(errors: TestError[]) {
-    await initializeEsmLoader();
     return true;
   }
 
diff --git a/packages/playwright/src/runner/processHost.ts b/packages/playwright/src/runner/processHost.ts
index 4c77c17857a22..06882a4d1b2fa 100644
--- a/packages/playwright/src/runner/processHost.ts
+++ b/packages/playwright/src/runner/processHost.ts
@@ -16,12 +16,12 @@
 
 import child_process from 'child_process';
 import { EventEmitter } from 'events';
+
+import { assert, timeOrigin } from 'playwright-core/lib/utils';
 import { debug } from 'playwright-core/lib/utilsBundle';
+
 import type { EnvProducedPayload, ProcessInitParams } from '../common/ipc';
 import type { ProtocolResponse } from '../common/process';
-import { execArgvWithExperimentalLoaderOptions } from '../transform/esmUtils';
-import { assert } from 'playwright-core/lib/utils';
-import { esmLoaderRegistered } from '../common/esmLoaderHost';
 
 export type ProcessExitData = {
   unexpectedly: boolean;
@@ -55,7 +55,6 @@ export class ProcessHost extends EventEmitter {
       env: {
         ...process.env,
         ...this._extraEnv,
-        ...(esmLoaderRegistered ? { PW_TS_ESM_LOADER_ON: '1' } : {}),
       },
       stdio: [
         'ignore',
@@ -63,7 +62,6 @@ export class ProcessHost extends EventEmitter {
         (options.onStdErr && !process.env.PW_RUNNER_DEBUG) ? 'pipe' : 'inherit',
         'ipc',
       ],
-      ...(process.env.PW_TS_ESM_LEGACY_LOADER_ON ? { execArgv: execArgvWithExperimentalLoaderOptions() } : {}),
     });
     this.process.on('exit', async (code, signal) => {
       this._processDidExit = true;
@@ -112,7 +110,8 @@ export class ProcessHost extends EventEmitter {
       return error;
 
     const processParams: ProcessInitParams = {
-      processName: this._processName
+      processName: this._processName,
+      timeOrigin: timeOrigin(),
     };
 
     this.send({
diff --git a/packages/playwright/src/runner/projectUtils.ts b/packages/playwright/src/runner/projectUtils.ts
index 49a6c89d84d2a..b52503c50c495 100644
--- a/packages/playwright/src/runner/projectUtils.ts
+++ b/packages/playwright/src/runner/projectUtils.ts
@@ -16,12 +16,16 @@
 
 import fs from 'fs';
 import path from 'path';
+import { promisify } from 'util';
+
 import { escapeRegExp } from 'playwright-core/lib/utils';
 import { minimatch } from 'playwright-core/lib/utilsBundle';
-import { promisify } from 'util';
-import type { FullProjectInternal } from '../common/config';
+
 import { createFileMatcher } from '../util';
 
+import type { FullProjectInternal } from '../common/config';
+
+
 const readFileAsync = promisify(fs.readFile);
 const readDirAsync = promisify(fs.readdir);
 
diff --git a/packages/playwright/src/runner/rebase.ts b/packages/playwright/src/runner/rebase.ts
new file mode 100644
index 0000000000000..79dd3fa998d8f
--- /dev/null
+++ b/packages/playwright/src/runner/rebase.ts
@@ -0,0 +1,205 @@
+/**
+ * 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 { MultiMap } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+import { diff } from 'playwright-core/lib/utilsBundle';
+
+import { filterProjects } from './projectUtils';
+import { babelParse, traverse, types } from '../transform/babelBundle';
+
+import type { FullConfigInternal } from '../common/config';
+import type { InternalReporter } from '../reporters/internalReporter';
+import type { T } from '../transform/babelBundle';
+const t: typeof T = types;
+
+type Location = {
+  file: string;
+  line: number;
+  column: number;
+};
+
+type Replacement = {
+  // Points to the call expression.
+  location: Location;
+  code: string;
+};
+
+const suggestedRebaselines = new MultiMap<string, Replacement>();
+
+export function addSuggestedRebaseline(location: Location, suggestedRebaseline: string) {
+  suggestedRebaselines.set(location.file, { location, code: suggestedRebaseline });
+}
+
+export function clearSuggestedRebaselines() {
+  suggestedRebaselines.clear();
+}
+
+export async function applySuggestedRebaselines(config: FullConfigInternal, reporter: InternalReporter) {
+  if (config.config.updateSnapshots === 'none')
+    return;
+  if (!suggestedRebaselines.size)
+    return;
+  const [project] = filterProjects(config.projects, config.cliProjectFilter);
+  if (!project)
+    return;
+
+  const patches: string[] = [];
+  const files: string[] = [];
+  const gitCache = new Map<string, string | null>();
+
+  const patchFile = path.join(project.project.outputDir, 'rebaselines.patch');
+
+  for (const fileName of [...suggestedRebaselines.keys()].sort()) {
+    const source = await fs.promises.readFile(fileName, 'utf8');
+    const lines = source.split('\n');
+    const replacements = suggestedRebaselines.get(fileName);
+    const fileNode = babelParse(source, fileName, true);
+    const ranges: { start: number, end: number, oldText: string, newText: string }[] = [];
+
+    traverse(fileNode, {
+      CallExpression: path => {
+        const node = path.node;
+        if (node.arguments.length < 1)
+          return;
+        if (!t.isMemberExpression(node.callee))
+          return;
+        const argument = node.arguments[0];
+        if (!t.isStringLiteral(argument) && !t.isTemplateLiteral(argument))
+          return;
+        const prop = node.callee.property;
+        if (!prop.loc || !argument.start || !argument.end)
+          return;
+        // Replacements are anchored by the location of the call expression.
+        // However, replacement text is meant to only replace the first argument.
+        for (const replacement of replacements) {
+          // In Babel, rows are 1-based, columns are 0-based.
+          if (prop.loc.start.line !== replacement.location.line)
+            continue;
+          if (prop.loc.start.column + 1 !== replacement.location.column)
+            continue;
+          const indent = lines[prop.loc.start.line - 1].match(/^\s*/)![0];
+          const newText = replacement.code.replace(/\{indent\}/g, indent);
+          ranges.push({ start: argument.start, end: argument.end, oldText: source.substring(argument.start, argument.end), newText });
+          // We can have multiple, hopefully equal, replacements for the same location,
+          // for example when a single test runs multiple times because of projects or retries.
+          // Do not apply multiple replacements for the same assertion.
+          break;
+        }
+      }
+    });
+
+    ranges.sort((a, b) => b.start - a.start);
+    let result = source;
+    for (const range of ranges)
+      result = result.substring(0, range.start) + range.newText + result.substring(range.end);
+
+    const relativeName = path.relative(process.cwd(), fileName);
+    files.push(relativeName);
+
+    if (config.config.updateSourceMethod === 'overwrite') {
+      await fs.promises.writeFile(fileName, result);
+    } else if (config.config.updateSourceMethod === '3way') {
+      await fs.promises.writeFile(fileName, applyPatchWithConflictMarkers(source, result));
+    } else {
+      const gitFolder = findGitRoot(path.dirname(fileName), gitCache);
+      const relativeToGit = path.relative(gitFolder || process.cwd(), fileName);
+      patches.push(createPatch(relativeToGit, source, result));
+    }
+  }
+
+  const fileList = files.map(file => '  ' + colors.dim(file)).join('\n');
+  reporter.onStdErr(`\nNew baselines created for:\n\n${fileList}\n`);
+  if (config.config.updateSourceMethod === 'patch') {
+    await fs.promises.mkdir(path.dirname(patchFile), { recursive: true });
+    await fs.promises.writeFile(patchFile, patches.join('\n'));
+    reporter.onStdErr(`\n  ` + colors.cyan('git apply ' + path.relative(process.cwd(), patchFile)) + '\n');
+  }
+}
+
+function createPatch(fileName: string, before: string, after: string) {
+  const file = fileName.replace(/\\/g, '/');
+  const text = diff.createPatch(file, before, after, undefined, undefined, { context: 3 });
+  return [
+    'diff --git a/' + file + ' b/' + file,
+    '--- a/' + file,
+    '+++ b/' + file,
+    ...text.split('\n').slice(4)
+  ].join('\n');
+}
+
+function findGitRoot(dir: string, cache: Map<string, string | null>): string | null {
+  const result = cache.get(dir);
+  if (result !== undefined)
+    return result;
+
+  const gitPath = path.join(dir, '.git');
+  if (fs.existsSync(gitPath) && fs.lstatSync(gitPath).isDirectory()) {
+    cache.set(dir, dir);
+    return dir;
+  }
+
+  const parentDir = path.dirname(dir);
+  if (dir === parentDir) {
+    cache.set(dir, null);
+    return null;
+  }
+
+  const parentResult = findGitRoot(parentDir, cache);
+  cache.set(dir, parentResult);
+  return parentResult;
+}
+
+function applyPatchWithConflictMarkers(oldText: string, newText: string) {
+  const diffResult = diff.diffLines(oldText, newText);
+
+  let result = '';
+  let conflict = false;
+
+  diffResult.forEach(part => {
+    if (part.added) {
+      if (conflict) {
+        result += part.value;
+        result += '>>>>>>> SNAPSHOT\n';
+        conflict = false;
+      } else {
+        result += '<<<<<<< HEAD\n';
+        result += part.value;
+        result += '=======\n';
+        conflict = true;
+      }
+    } else if (part.removed) {
+      result += '<<<<<<< HEAD\n';
+      result += part.value;
+      result += '=======\n';
+      conflict = true;
+    } else {
+      if (conflict) {
+        result += '>>>>>>> SNAPSHOT\n';
+        conflict = false;
+      }
+      result += part.value;
+    }
+  });
+
+  if (conflict)
+    result += '>>>>>>> SNAPSHOT\n';
+  return result;
+}
diff --git a/packages/playwright/src/runner/reporters.ts b/packages/playwright/src/runner/reporters.ts
index 1748292cc0767..043a4df4073ce 100644
--- a/packages/playwright/src/runner/reporters.ts
+++ b/packages/playwright/src/runner/reporters.ts
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-import path from 'path';
-import type { FullConfig, TestError } from '../../types/testReporter';
+import { calculateSha1 } from 'playwright-core/lib/utils';
+
+import { loadReporter } from './loadUtils';
 import { formatError } from '../reporters/base';
+import { BlobReporter } from '../reporters/blob';
 import DotReporter from '../reporters/dot';
 import EmptyReporter from '../reporters/empty';
 import GitHubReporter from '../reporters/github';
@@ -25,14 +27,14 @@ import JSONReporter from '../reporters/json';
 import JUnitReporter from '../reporters/junit';
 import LineReporter from '../reporters/line';
 import ListReporter from '../reporters/list';
-import MarkdownReporter from '../reporters/markdown';
-import type { Suite } from '../common/test';
-import type { BuiltInReporter, FullConfigInternal } from '../common/config';
-import { loadReporter } from './loadUtils';
-import { BlobReporter } from '../reporters/blob';
+import ListModeReporter from '../reporters/listModeReporter';
+import { wrapReporterAsV2 } from '../reporters/reporterV2';
+
 import type { ReporterDescription } from '../../types/test';
-import { type ReporterV2, wrapReporterAsV2 } from '../reporters/reporterV2';
-import { calculateSha1 } from 'playwright-core/lib/utils';
+import type { TestError } from '../../types/testReporter';
+import type { BuiltInReporter, FullConfigInternal } from '../common/config';
+import type { CommonReporterOptions, Screen } from '../reporters/base';
+import type { ReporterV2 } from '../reporters/reporterV2';
 
 export async function createReporters(config: FullConfigInternal, mode: 'list' | 'test' | 'merge', isTestServer: boolean, descriptions?: ReporterDescription[]): Promise<ReporterV2[]> {
   const defaultReporters: { [key in BuiltInReporter]: new(arg: any) => ReporterV2 } = {
@@ -45,7 +47,6 @@ export async function createReporters(config: FullConfigInternal, mode: 'list' |
     junit: JUnitReporter,
     null: EmptyReporter,
     html: HtmlReporter,
-    markdown: MarkdownReporter,
   };
   const reporters: ReporterV2[] = [];
   descriptions ??= config.config.reporter;
@@ -67,14 +68,14 @@ export async function createReporters(config: FullConfigInternal, mode: 'list' |
     reporters.push(wrapReporterAsV2(new reporterConstructor(runOptions)));
   }
 
-  const someReporterPrintsToStdio = reporters.some(r => r.printsToStdio());
+  const someReporterPrintsToStdio = reporters.some(r => r.printsToStdio ? r.printsToStdio() : true);
   if (reporters.length && !someReporterPrintsToStdio) {
     // Add a line/dot/list-mode reporter for convenience.
     // Important to put it first, just in case some other reporter stalls onEnd.
     if (mode === 'list')
       reporters.unshift(new ListModeReporter());
     else if (mode !== 'merge')
-      reporters.unshift(!process.env.CI ? new LineReporter({ omitFailures: true }) : new DotReporter());
+      reporters.unshift(!process.env.CI ? new LineReporter() : new DotReporter());
   }
   return reporters;
 }
@@ -86,7 +87,23 @@ export async function createReporterForTestServer(file: string, messageSink: (me
   }));
 }
 
-function reporterOptions(config: FullConfigInternal, mode: 'list' | 'test' | 'merge', isTestServer: boolean) {
+interface ErrorCollectingReporter extends ReporterV2 {
+  errors(): TestError[];
+}
+
+export function createErrorCollectingReporter(screen: Screen): ErrorCollectingReporter {
+  const errors: TestError[] = [];
+  return {
+    version: () => 'v2',
+    onError(error: TestError) {
+      errors.push(error);
+      screen.stderr?.write(formatError(screen, error).message + '\n');
+    },
+    errors: () => errors,
+  };
+}
+
+function reporterOptions(config: FullConfigInternal, mode: 'list' | 'test' | 'merge', isTestServer: boolean): CommonReporterOptions {
   return {
     configDir: config.configDir,
     _mode: mode,
@@ -113,38 +130,3 @@ function computeCommandHash(config: FullConfigInternal) {
     parts.push(calculateSha1(JSON.stringify(command)).substring(0, 7));
   return parts.join('-');
 }
-
-class ListModeReporter extends EmptyReporter {
-  private config!: FullConfig;
-
-  override onConfigure(config: FullConfig) {
-    this.config = config;
-  }
-
-  override onBegin(suite: Suite): void {
-    // eslint-disable-next-line no-console
-    console.log(`Listing tests:`);
-    const tests = suite.allTests();
-    const files = new Set<string>();
-    for (const test of tests) {
-      // root, project, file, ...describes, test
-      const [, projectName, , ...titles] = test.titlePath();
-      const location = `${path.relative(this.config.rootDir, test.location.file)}:${test.location.line}:${test.location.column}`;
-      const projectTitle = projectName ? `[${projectName}] › ` : '';
-      // eslint-disable-next-line no-console
-      console.log(`  ${projectTitle}${location} › ${titles.join(' › ')}`);
-      files.add(test.location.file);
-    }
-    // eslint-disable-next-line no-console
-    console.log(`Total: ${tests.length} ${tests.length === 1 ? 'test' : 'tests'} in ${files.size} ${files.size === 1 ? 'file' : 'files'}`);
-  }
-
-  override onError(error: TestError) {
-    // eslint-disable-next-line no-console
-    console.error('\n' + formatError(error, false).message);
-  }
-
-  override printsToStdio(): boolean {
-    return true;
-  }
-}
diff --git a/packages/playwright/src/runner/runner.ts b/packages/playwright/src/runner/runner.ts
deleted file mode 100644
index a7fd28ec87ce4..0000000000000
--- a/packages/playwright/src/runner/runner.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Copyright 2019 Google Inc. All rights reserved.
- * Modifications 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 { monotonicTime } from 'playwright-core/lib/utils';
-import type { FullResult, TestError } from '../../types/testReporter';
-import { webServerPluginsForConfig } from '../plugins/webServerPlugin';
-import { collectFilesForProject, filterProjects } from './projectUtils';
-import { createReporters } from './reporters';
-import { TestRun, createTaskRunner, createTaskRunnerForList } from './tasks';
-import type { FullConfigInternal } from '../common/config';
-import { runWatchModeLoop } from './watchMode';
-import type { Suite } from '../common/test';
-import { wrapReporterAsV2 } from '../reporters/reporterV2';
-import { affectedTestFiles } from '../transform/compilationCache';
-
-type ProjectConfigWithFiles = {
-  name: string;
-  testDir: string;
-  use: { testIdAttribute?: string };
-  files: string[];
-};
-
-type ConfigListFilesReport = {
-  projects: ProjectConfigWithFiles[];
-  error?: TestError;
-};
-
-export type FindRelatedTestFilesReport = {
-  testFiles: string[];
-  errors?: TestError[];
-};
-
-export class Runner {
-  private _config: FullConfigInternal;
-
-  constructor(config: FullConfigInternal) {
-    this._config = config;
-  }
-
-  async listTestFiles(projectNames?: string[]): Promise<ConfigListFilesReport> {
-    const projects = filterProjects(this._config.projects, projectNames);
-    const report: ConfigListFilesReport = {
-      projects: [],
-    };
-    for (const project of projects) {
-      report.projects.push({
-        name: project.project.name,
-        testDir: project.project.testDir,
-        use: { testIdAttribute: project.project.use.testIdAttribute },
-        files: await collectFilesForProject(project)
-      });
-    }
-    return report;
-  }
-
-  async runAllTests(): Promise<FullResult['status']> {
-    const config = this._config;
-    const listOnly = config.cliListOnly;
-    const deadline = config.config.globalTimeout ? monotonicTime() + config.config.globalTimeout : 0;
-
-    // Legacy webServer support.
-    webServerPluginsForConfig(config).forEach(p => config.plugins.push({ factory: p }));
-
-    const reporters = await createReporters(config, listOnly ? 'list' : 'test', false);
-    const taskRunner = listOnly ? createTaskRunnerForList(
-        config,
-        reporters,
-        'in-process',
-        { failOnLoadErrors: true }) : createTaskRunner(config, reporters);
-
-    const testRun = new TestRun(config);
-    taskRunner.reporter.onConfigure(config.config);
-
-    const taskStatus = await taskRunner.run(testRun, deadline);
-    let status: FullResult['status'] = testRun.failureTracker.result();
-    if (status === 'passed' && taskStatus !== 'passed')
-      status = taskStatus;
-    const modifiedResult = await taskRunner.reporter.onEnd({ status });
-    if (modifiedResult && modifiedResult.status)
-      status = modifiedResult.status;
-
-    if (!listOnly)
-      await writeLastRunInfo(testRun, status);
-
-    await taskRunner.reporter.onExit();
-
-    // Calling process.exit() might truncate large stdout/stderr output.
-    // See https://github.com/nodejs/node/issues/6456.
-    // See https://github.com/nodejs/node/issues/12921
-    await new Promise<void>(resolve => process.stdout.write('', () => resolve()));
-    await new Promise<void>(resolve => process.stderr.write('', () => resolve()));
-    return status;
-  }
-
-  async loadAllTests(mode: 'in-process' | 'out-of-process' = 'in-process'): Promise<{ status: FullResult['status'], suite?: Suite, errors: TestError[] }> {
-    const config = this._config;
-    const errors: TestError[] = [];
-    const reporters = [wrapReporterAsV2({
-      onError(error: TestError) {
-        errors.push(error);
-      }
-    })];
-    const taskRunner = createTaskRunnerForList(config, reporters, mode, { failOnLoadErrors: true });
-    const testRun = new TestRun(config);
-    taskRunner.reporter.onConfigure(config.config);
-
-    const taskStatus = await taskRunner.run(testRun, 0);
-    let status: FullResult['status'] = testRun.failureTracker.result();
-    if (status === 'passed' && taskStatus !== 'passed')
-      status = taskStatus;
-    const modifiedResult = await taskRunner.reporter.onEnd({ status });
-    if (modifiedResult && modifiedResult.status)
-      status = modifiedResult.status;
-    await taskRunner.reporter.onExit();
-    return { status, suite: testRun.rootSuite, errors };
-  }
-
-  async watchAllTests(): Promise<FullResult['status']> {
-    const config = this._config;
-    webServerPluginsForConfig(config).forEach(p => config.plugins.push({ factory: p }));
-    return await runWatchModeLoop(config);
-  }
-
-  async findRelatedTestFiles(mode: 'in-process' | 'out-of-process', files: string[]): Promise<FindRelatedTestFilesReport>  {
-    const result = await this.loadAllTests(mode);
-    if (result.status !== 'passed' || !result.suite)
-      return { errors: result.errors, testFiles: [] };
-
-    const resolvedFiles = (files as string[]).map(file => path.resolve(process.cwd(), file));
-    const override = (this._config.config as any)['@playwright/test']?.['cli']?.['find-related-test-files'];
-    if (override)
-      return await override(resolvedFiles, this._config);
-    return { testFiles: affectedTestFiles(resolvedFiles) };
-  }
-}
-
-export type LastRunInfo = {
-  status: FullResult['status'];
-  failedTests: string[];
-};
-
-async function writeLastRunInfo(testRun: TestRun, status: FullResult['status']) {
-  const [project] = filterProjects(testRun.config.projects, testRun.config.cliProjectFilter);
-  if (!project)
-    return;
-  const outputDir = project.project.outputDir;
-  await fs.promises.mkdir(outputDir, { recursive: true });
-  const lastRunReportFile = path.join(outputDir, '.last-run.json');
-  const failedTests = testRun.rootSuite?.allTests().filter(t => !t.ok()).map(t => t.id);
-  const lastRunReport = JSON.stringify({ status, failedTests }, undefined, 2);
-  await fs.promises.writeFile(lastRunReportFile, lastRunReport);
-}
-
-export async function readLastRunInfo(config: FullConfigInternal): Promise<LastRunInfo> {
-  const [project] = filterProjects(config.projects, config.cliProjectFilter);
-  if (!project)
-    return { status: 'passed', failedTests: [] };
-  const outputDir = project.project.outputDir;
-  try {
-    const lastRunReportFile = path.join(outputDir, '.last-run.json');
-    return JSON.parse(await fs.promises.readFile(lastRunReportFile, 'utf8')) as LastRunInfo;
-  } catch {
-  }
-  return { status: 'passed', failedTests: [] };
-}
diff --git a/packages/playwright/src/runner/taskRunner.ts b/packages/playwright/src/runner/taskRunner.ts
index 96505bef2abdb..ea0561faaab20 100644
--- a/packages/playwright/src/runner/taskRunner.ts
+++ b/packages/playwright/src/runner/taskRunner.ts
@@ -14,37 +14,35 @@
  * limitations under the License.
  */
 
-import { colors, debug } from 'playwright-core/lib/utilsBundle';
 import { ManualPromise, monotonicTime } from 'playwright-core/lib/utils';
-import type { FullResult, TestError } from '../../types/testReporter';
+import { colors } from 'playwright-core/lib/utils';
+import { debug } from 'playwright-core/lib/utilsBundle';
+
+
 import { SigIntWatcher } from './sigIntWatcher';
 import { serializeError } from '../util';
-import type { ReporterV2 } from '../reporters/reporterV2';
-import { InternalReporter } from '../reporters/internalReporter';
-import { Multiplexer } from '../reporters/multiplexer';
 
-type TaskPhase<Context> = (reporter: ReporterV2, context: Context, errors: TestError[], softErrors: TestError[]) => Promise<void> | void;
-export type Task<Context> = { setup?: TaskPhase<Context>, teardown?: TaskPhase<Context> };
+import type { FullResult, TestError } from '../../types/testReporter';
+import type { InternalReporter } from '../reporters/internalReporter';
+
+type TaskPhase<Context> = (context: Context, errors: TestError[], softErrors: TestError[]) => Promise<void> | void;
+export type Task<Context> = { title: string, setup?: TaskPhase<Context>, teardown?: TaskPhase<Context> };
 
 export class TaskRunner<Context> {
-  private _tasks: { name: string, task: Task<Context> }[] = [];
-  readonly reporter: InternalReporter;
+  private _tasks: Task<Context>[] = [];
+  private _reporter: InternalReporter;
   private _hasErrors = false;
   private _interrupted = false;
   private _isTearDown = false;
   private _globalTimeoutForError: number;
 
-  static create<Context>(reporters: ReporterV2[], globalTimeoutForError: number = 0) {
-    return new TaskRunner<Context>(createInternalReporter(reporters), globalTimeoutForError);
-  }
-
-  private constructor(reporter: InternalReporter, globalTimeoutForError: number) {
-    this.reporter = reporter;
+  constructor(reporter: InternalReporter, globalTimeoutForError: number) {
+    this._reporter = reporter;
     this._globalTimeoutForError = globalTimeoutForError;
   }
 
-  addTask(name: string, task: Task<Context>) {
-    this._tasks.push({ name, task });
+  addTask(task: Task<Context>) {
+    this._tasks.push(task);
   }
 
   async run(context: Context, deadline: number, cancelPromise?: ManualPromise<void>): Promise<FullResult['status']> {
@@ -56,35 +54,35 @@ export class TaskRunner<Context> {
   async runDeferCleanup(context: Context, deadline: number, cancelPromise = new ManualPromise<void>()): Promise<{ status: FullResult['status'], cleanup: () => Promise<FullResult['status']> }> {
     const sigintWatcher = new SigIntWatcher();
     const timeoutWatcher = new TimeoutWatcher(deadline);
-    const teardownRunner = new TaskRunner<Context>(this.reporter, this._globalTimeoutForError);
+    const teardownRunner = new TaskRunner<Context>(this._reporter, this._globalTimeoutForError);
     teardownRunner._isTearDown = true;
 
     let currentTaskName: string | undefined;
 
     const taskLoop = async () => {
-      for (const { name, task } of this._tasks) {
-        currentTaskName = name;
+      for (const task of this._tasks) {
+        currentTaskName = task.title;
         if (this._interrupted)
           break;
-        debug('pw:test:task')(`"${name}" started`);
+        debug('pw:test:task')(`"${task.title}" started`);
         const errors: TestError[] = [];
         const softErrors: TestError[] = [];
         try {
-          teardownRunner._tasks.unshift({ name: `teardown for ${name}`, task: { setup: task.teardown } });
-          await task.setup?.(this.reporter, context, errors, softErrors);
+          teardownRunner._tasks.unshift({ title: `teardown for ${task.title}`, setup: task.teardown });
+          await task.setup?.(context, errors, softErrors);
         } catch (e) {
-          debug('pw:test:task')(`error in "${name}": `, e);
+          debug('pw:test:task')(`error in "${task.title}": `, e);
           errors.push(serializeError(e));
         } finally {
           for (const error of [...softErrors, ...errors])
-            this.reporter.onError?.(error);
+            this._reporter.onError?.(error);
           if (errors.length) {
             if (!this._isTearDown)
               this._interrupted = true;
             this._hasErrors = true;
           }
         }
-        debug('pw:test:task')(`"${name}" finished`);
+        debug('pw:test:task')(`"${task.title}" finished`);
       }
     };
 
@@ -105,7 +103,7 @@ export class TaskRunner<Context> {
     if (sigintWatcher.hadSignal() || cancelPromise?.isDone()) {
       status = 'interrupted';
     } else if (timeoutWatcher.timedOut()) {
-      this.reporter.onError?.({ message: colors.red(`Timed out waiting ${this._globalTimeoutForError / 1000}s for the ${currentTaskName} to run`) });
+      this._reporter.onError?.({ message: colors.red(`Timed out waiting ${this._globalTimeoutForError / 1000}s for the ${currentTaskName} to run`) });
       status = 'timedout';
     } else if (this._hasErrors) {
       status = 'failed';
@@ -146,7 +144,3 @@ class TimeoutWatcher {
     clearTimeout(this._timer);
   }
 }
-
-function createInternalReporter(reporters: ReporterV2[]): InternalReporter {
-  return new InternalReporter(new Multiplexer(reporters));
-}
diff --git a/packages/playwright/src/runner/tasks.ts b/packages/playwright/src/runner/tasks.ts
index 4220291a088fe..ea4123be2417c 100644
--- a/packages/playwright/src/runner/tasks.ts
+++ b/packages/playwright/src/runner/tasks.ts
@@ -17,21 +17,30 @@
 import fs from 'fs';
 import path from 'path';
 import { promisify } from 'util';
+
+import { monotonicTime, removeFolders } from 'playwright-core/lib/utils';
 import { debug } from 'playwright-core/lib/utilsBundle';
-import { removeFolders } from 'playwright-core/lib/utils';
-import { Dispatcher, type EnvByProjectId } from './dispatcher';
-import type { TestRunnerPluginRegistration } from '../plugins';
-import type { ReporterV2 } from '../reporters/reporterV2';
-import { createTestGroups, type TestGroup } from '../runner/testGroups';
-import type { Task } from './taskRunner';
-import { TaskRunner } from './taskRunner';
-import type { FullConfigInternal, FullProjectInternal } from '../common/config';
+
+import { Dispatcher  } from './dispatcher';
+import { FailureTracker } from './failureTracker';
 import { collectProjectsAndTestFiles, createRootSuite, loadFileSuites, loadGlobalHook } from './loadUtils';
-import type { Matcher } from '../util';
-import { Suite } from '../common/test';
 import { buildDependentProjects, buildTeardownToSetupsMap, filterProjects } from './projectUtils';
-import { FailureTracker } from './failureTracker';
+import { applySuggestedRebaselines, clearSuggestedRebaselines } from './rebase';
+import { TaskRunner } from './taskRunner';
 import { detectChangedTestFiles } from './vcs';
+import { Suite } from '../common/test';
+import { createTestGroups } from '../runner/testGroups';
+import { cacheDir } from '../transform/compilationCache';
+import { removeDirAndLogToConsole } from '../util';
+
+import type { TestGroup } from '../runner/testGroups';
+import type { EnvByProjectId } from './dispatcher';
+import type { TestRunnerPluginRegistration } from '../plugins';
+import type { Task } from './taskRunner';
+import type { FullResult } from '../../types/testReporter';
+import type { FullConfigInternal, FullProjectInternal } from '../common/config';
+import type { InternalReporter } from '../reporters/internalReporter';
+import type { ManualPromise } from 'playwright-core/lib/utils';
 
 const readDirAsync = promisify(fs.readdir);
 
@@ -41,97 +50,102 @@ type ProjectWithTestGroups = {
   testGroups: TestGroup[];
 };
 
-export type Phase = {
+type Phase = {
   dispatcher: Dispatcher,
   projects: ProjectWithTestGroups[]
 };
 
 export class TestRun {
   readonly config: FullConfigInternal;
+  readonly reporter: InternalReporter;
   readonly failureTracker: FailureTracker;
   rootSuite: Suite | undefined = undefined;
   readonly phases: Phase[] = [];
   projectFiles: Map<FullProjectInternal, string[]> = new Map();
   projectSuites: Map<FullProjectInternal, Suite[]> = new Map();
 
-  constructor(config: FullConfigInternal) {
+  constructor(config: FullConfigInternal, reporter: InternalReporter) {
     this.config = config;
+    this.reporter = reporter;
     this.failureTracker = new FailureTracker(config);
   }
 }
 
-export function createTaskRunner(config: FullConfigInternal, reporters: ReporterV2[]): TaskRunner<TestRun> {
-  const taskRunner = TaskRunner.create<TestRun>(reporters, config.config.globalTimeout);
-  addGlobalSetupTasks(taskRunner, config);
-  taskRunner.addTask('load tests', createLoadTask('in-process', { filterOnly: true, filterOnlyChanged: true, failOnLoadErrors: true }));
-  addRunTasks(taskRunner, config);
-  return taskRunner;
-}
-
-export function createTaskRunnerForWatchSetup(config: FullConfigInternal, reporters: ReporterV2[]): TaskRunner<TestRun> {
-  const taskRunner = TaskRunner.create<TestRun>(reporters);
-  addGlobalSetupTasks(taskRunner, config);
-  return taskRunner;
-}
-
-export function createTaskRunnerForWatch(config: FullConfigInternal, reporters: ReporterV2[], additionalFileMatcher?: Matcher): TaskRunner<TestRun> {
-  const taskRunner = TaskRunner.create<TestRun>(reporters);
-  taskRunner.addTask('load tests', createLoadTask('out-of-process', { filterOnly: true, filterOnlyChanged: true, failOnLoadErrors: false, doNotRunDepsOutsideProjectFilter: true, additionalFileMatcher }));
-  addRunTasks(taskRunner, config);
-  return taskRunner;
+export async function runTasks(testRun: TestRun, tasks: Task<TestRun>[], globalTimeout?: number, cancelPromise?: ManualPromise<void>) {
+  const deadline = globalTimeout ? monotonicTime() + globalTimeout : 0;
+  const taskRunner = new TaskRunner<TestRun>(testRun.reporter, globalTimeout || 0);
+  for (const task of tasks)
+    taskRunner.addTask(task);
+  testRun.reporter.onConfigure(testRun.config.config);
+  const status = await taskRunner.run(testRun, deadline, cancelPromise);
+  return await finishTaskRun(testRun, status);
 }
 
-export function createTaskRunnerForTestServer(config: FullConfigInternal, reporters: ReporterV2[]): TaskRunner<TestRun> {
-  const taskRunner = TaskRunner.create<TestRun>(reporters);
-  taskRunner.addTask('load tests', createLoadTask('out-of-process', { filterOnly: true, filterOnlyChanged: true, failOnLoadErrors: false, doNotRunDepsOutsideProjectFilter: true }));
-  addRunTasks(taskRunner, config);
-  return taskRunner;
+export async function runTasksDeferCleanup(testRun: TestRun, tasks: Task<TestRun>[]) {
+  const taskRunner = new TaskRunner<TestRun>(testRun.reporter, 0);
+  for (const task of tasks)
+    taskRunner.addTask(task);
+  testRun.reporter.onConfigure(testRun.config.config);
+  const { status, cleanup } = await taskRunner.runDeferCleanup(testRun, 0);
+  return { status: await finishTaskRun(testRun, status), cleanup };
 }
 
-function addGlobalSetupTasks(taskRunner: TaskRunner<TestRun>, config: FullConfigInternal) {
-  if (!config.configCLIOverrides.preserveOutputDir && !process.env.PW_TEST_NO_REMOVE_OUTPUT_DIRS)
-    taskRunner.addTask('clear output', createRemoveOutputDirsTask());
-  for (const plugin of config.plugins)
-    taskRunner.addTask('plugin setup', createPluginSetupTask(plugin));
-  if (config.config.globalSetup || config.config.globalTeardown)
-    taskRunner.addTask('global setup', createGlobalSetupTask());
+async function finishTaskRun(testRun: TestRun, status: FullResult['status']) {
+  if (status === 'passed')
+    status = testRun.failureTracker.result();
+  const modifiedResult = await testRun.reporter.onEnd({ status });
+  if (modifiedResult && modifiedResult.status)
+    status = modifiedResult.status;
+  await testRun.reporter.onExit();
+  return status;
 }
 
-function addRunTasks(taskRunner: TaskRunner<TestRun>, config: FullConfigInternal) {
-  taskRunner.addTask('create phases', createPhasesTask());
-  taskRunner.addTask('report begin', createReportBeginTask());
-  for (const plugin of config.plugins)
-    taskRunner.addTask('plugin begin', createPluginBeginTask(plugin));
-  taskRunner.addTask('test suite', createRunTestsTask());
-  return taskRunner;
+export function createGlobalSetupTasks(config: FullConfigInternal) {
+  const tasks: Task<TestRun>[] = [];
+  if (!config.configCLIOverrides.preserveOutputDir)
+    tasks.push(createRemoveOutputDirsTask());
+  tasks.push(
+      ...createPluginSetupTasks(config),
+      ...config.globalTeardowns.map(file => createGlobalTeardownTask(file, config)).reverse(),
+      ...config.globalSetups.map(file => createGlobalSetupTask(file, config)),
+  );
+  return tasks;
 }
 
-export function createTaskRunnerForList(config: FullConfigInternal, reporters: ReporterV2[], mode: 'in-process' | 'out-of-process', options: { failOnLoadErrors: boolean }): TaskRunner<TestRun> {
-  const taskRunner = TaskRunner.create<TestRun>(reporters, config.config.globalTimeout);
-  taskRunner.addTask('load tests', createLoadTask(mode, { ...options, filterOnly: false, filterOnlyChanged: false }));
-  taskRunner.addTask('report begin', createReportBeginTask());
-  return taskRunner;
+export function createRunTestsTasks(config: FullConfigInternal) {
+  return [
+    createPhasesTask(),
+    createReportBeginTask(),
+    ...config.plugins.map(plugin => createPluginBeginTask(plugin)),
+    createRunTestsTask(),
+  ];
 }
 
-export function createTaskRunnerForListFiles(config: FullConfigInternal, reporters: ReporterV2[]): TaskRunner<TestRun> {
-  const taskRunner = TaskRunner.create<TestRun>(reporters, config.config.globalTimeout);
-  taskRunner.addTask('load tests', createListFilesTask());
-  taskRunner.addTask('report begin', createReportBeginTask());
-  return taskRunner;
+export function createClearCacheTask(config: FullConfigInternal): Task<TestRun> {
+  return {
+    title: 'clear cache',
+    setup: async () => {
+      await removeDirAndLogToConsole(cacheDir);
+      for (const plugin of config.plugins)
+        await plugin.instance?.clearCache?.();
+    },
+  };
 }
 
-function createReportBeginTask(): Task<TestRun> {
+export function createReportBeginTask(): Task<TestRun> {
   return {
-    setup: async (reporter, { rootSuite }) => {
-      reporter.onBegin(rootSuite!);
+    title: 'report begin',
+    setup: async testRun => {
+      testRun.reporter.onBegin?.(testRun.rootSuite!);
     },
     teardown: async ({}) => {},
   };
 }
 
-function createPluginSetupTask(plugin: TestRunnerPluginRegistration): Task<TestRun> {
-  return {
-    setup: async (reporter, { config }) => {
+export function createPluginSetupTasks(config: FullConfigInternal): Task<TestRun>[] {
+  return config.plugins.map(plugin => ({
+    title: 'plugin setup',
+    setup: async ({ reporter }) => {
       if (typeof plugin.factory === 'function')
         plugin.instance = await plugin.factory();
       else
@@ -141,13 +155,14 @@ function createPluginSetupTask(plugin: TestRunnerPluginRegistration): Task<TestR
     teardown: async () => {
       await plugin.instance?.teardown?.();
     },
-  };
+  }));
 }
 
 function createPluginBeginTask(plugin: TestRunnerPluginRegistration): Task<TestRun> {
   return {
-    setup: async (reporter, { rootSuite }) => {
-      await plugin.instance?.begin?.(rootSuite!);
+    title: 'plugin begin',
+    setup: async testRun => {
+      await plugin.instance?.begin?.(testRun.rootSuite!);
     },
     teardown: async () => {
       await plugin.instance?.end?.();
@@ -155,29 +170,43 @@ function createPluginBeginTask(plugin: TestRunnerPluginRegistration): Task<TestR
   };
 }
 
-function createGlobalSetupTask(): Task<TestRun> {
+function createGlobalSetupTask(file: string, config: FullConfigInternal): Task<TestRun> {
+  let title = 'global setup';
+  if (config.globalSetups.length > 1)
+    title += ` (${file})`;
+
   let globalSetupResult: any;
-  let globalSetupFinished = false;
-  let teardownHook: any;
   return {
-    setup: async (reporter, { config }) => {
-      const setupHook = config.config.globalSetup ? await loadGlobalHook(config, config.config.globalSetup) : undefined;
-      teardownHook = config.config.globalTeardown ? await loadGlobalHook(config, config.config.globalTeardown) : undefined;
-      globalSetupResult = setupHook ? await setupHook(config.config) : undefined;
-      globalSetupFinished = true;
+    title,
+    setup: async ({ config }) => {
+      const setupHook = await loadGlobalHook(config, file);
+      globalSetupResult = await setupHook(config.config);
     },
-    teardown: async (reporter, { config }) => {
+    teardown: async () => {
       if (typeof globalSetupResult === 'function')
         await globalSetupResult();
-      if (globalSetupFinished)
-        await teardownHook?.(config.config);
+    },
+  };
+}
+
+function createGlobalTeardownTask(file: string, config: FullConfigInternal): Task<TestRun> {
+  let title = 'global teardown';
+  if (config.globalTeardowns.length > 1)
+    title += ` (${file})`;
+
+  return {
+    title,
+    teardown: async ({ config }) => {
+      const teardownHook = await loadGlobalHook(config, file);
+      await teardownHook(config.config);
     },
   };
 }
 
 function createRemoveOutputDirsTask(): Task<TestRun> {
   return {
-    setup: async (reporter, { config }) => {
+    title: 'clear output',
+    setup: async ({ config }) => {
       const outputDirs = new Set<string>();
       const projects = filterProjects(config.projects, config.cliProjectFilter);
       projects.forEach(p => outputDirs.add(p.project.outputDir));
@@ -199,9 +228,10 @@ function createRemoveOutputDirsTask(): Task<TestRun> {
   };
 }
 
-function createListFilesTask(): Task<TestRun> {
+export function createListFilesTask(): Task<TestRun> {
   return {
-    setup: async (reporter, testRun, errors) => {
+    title: 'load tests',
+    setup: async (testRun, errors) => {
       testRun.rootSuite = await createRootSuite(testRun, errors, false);
       testRun.failureTracker.onRootSuite(testRun.rootSuite);
       await collectProjectsAndTestFiles(testRun, false);
@@ -222,24 +252,27 @@ function createListFilesTask(): Task<TestRun> {
   };
 }
 
-function createLoadTask(mode: 'out-of-process' | 'in-process', options: { filterOnly: boolean, filterOnlyChanged: boolean, failOnLoadErrors: boolean, doNotRunDepsOutsideProjectFilter?: boolean, additionalFileMatcher?: Matcher }): Task<TestRun> {
+export function createLoadTask(mode: 'out-of-process' | 'in-process', options: { filterOnly: boolean, failOnLoadErrors: boolean, doNotRunDepsOutsideProjectFilter?: boolean, populateDependencies?: boolean }): Task<TestRun> {
   return {
-    setup: async (reporter, testRun, errors, softErrors) => {
-      await collectProjectsAndTestFiles(testRun, !!options.doNotRunDepsOutsideProjectFilter, options.additionalFileMatcher);
+    title: 'load tests',
+    setup: async (testRun, errors, softErrors) => {
+      await collectProjectsAndTestFiles(testRun, !!options.doNotRunDepsOutsideProjectFilter);
       await loadFileSuites(testRun, mode, options.failOnLoadErrors ? errors : softErrors);
 
-      let cliOnlyChangedMatcher: Matcher | undefined = undefined;
-      if (testRun.config.cliOnlyChanged && options.filterOnlyChanged) {
+      if (testRun.config.cliOnlyChanged || options.populateDependencies) {
         for (const plugin of testRun.config.plugins)
           await plugin.instance?.populateDependencies?.();
+      }
+
+      if (testRun.config.cliOnlyChanged) {
         const changedFiles = await detectChangedTestFiles(testRun.config.cliOnlyChanged, testRun.config.configDir);
-        cliOnlyChangedMatcher = file => changedFiles.has(file);
+        testRun.config.preOnlyTestFilters.push(test => changedFiles.has(test.location.file));
       }
 
-      testRun.rootSuite = await createRootSuite(testRun, options.failOnLoadErrors ? errors : softErrors, !!options.filterOnly, cliOnlyChangedMatcher);
+      testRun.rootSuite = await createRootSuite(testRun, options.failOnLoadErrors ? errors : softErrors, !!options.filterOnly);
       testRun.failureTracker.onRootSuite(testRun.rootSuite);
       // Fail when no tests.
-      if (options.failOnLoadErrors && !testRun.rootSuite.allTests().length && !testRun.config.cliPassWithNoTests && !testRun.config.config.shard) {
+      if (options.failOnLoadErrors && !testRun.rootSuite.allTests().length && !testRun.config.cliPassWithNoTests && !testRun.config.config.shard && !testRun.config.cliOnlyChanged) {
         if (testRun.config.cliArgs.length) {
           throw new Error([
             `No tests found.`,
@@ -253,9 +286,22 @@ function createLoadTask(mode: 'out-of-process' | 'in-process', options: { filter
   };
 }
 
+export function createApplyRebaselinesTask(): Task<TestRun> {
+  return {
+    title: 'apply rebaselines',
+    setup: async () => {
+      clearSuggestedRebaselines();
+    },
+    teardown: async ({ config, reporter }) => {
+      await applySuggestedRebaselines(config, reporter);
+    },
+  };
+}
+
 function createPhasesTask(): Task<TestRun> {
   return {
-    setup: async (reporter, testRun) => {
+    title: 'create phases',
+    setup: async testRun => {
       let maxConcurrentTestGroups = 0;
 
       const processed = new Set<FullProjectInternal>();
@@ -286,13 +332,13 @@ function createPhasesTask(): Task<TestRun> {
           processed.add(project);
         if (phaseProjects.length) {
           let testGroupsInPhase = 0;
-          const phase: Phase = { dispatcher: new Dispatcher(testRun.config, reporter, testRun.failureTracker), projects: [] };
+          const phase: Phase = { dispatcher: new Dispatcher(testRun.config, testRun.reporter, testRun.failureTracker), projects: [] };
           testRun.phases.push(phase);
           for (const project of phaseProjects) {
             const projectSuite = projectToSuite.get(project)!;
             const testGroups = createTestGroups(projectSuite, testRun.config.config.workers);
             phase.projects.push({ project, projectSuite, testGroups });
-            testGroupsInPhase += testGroups.length;
+            testGroupsInPhase += Math.min(project.workers ?? Number.MAX_SAFE_INTEGER, testGroups.length);
           }
           debug('pw:test:task')(`created phase #${testRun.phases.length} with ${phase.projects.map(p => p.project.project.name).sort()} projects, ${testGroupsInPhase} testGroups`);
           maxConcurrentTestGroups = Math.max(maxConcurrentTestGroups, testGroupsInPhase);
@@ -306,7 +352,8 @@ function createPhasesTask(): Task<TestRun> {
 
 function createRunTestsTask(): Task<TestRun> {
   return {
-    setup: async (reporter, { phases, failureTracker }) => {
+    title: 'test suite',
+    setup: async ({ phases, failureTracker }) => {
       const successfulProjects = new Set<FullProjectInternal>();
       const extraEnvByProjectId: EnvByProjectId = new Map();
       const teardownToSetups = buildTeardownToSetupsMap(phases.map(phase => phase.projects.map(p => p.project)).flat());
@@ -350,9 +397,32 @@ function createRunTestsTask(): Task<TestRun> {
         }
       }
     },
-    teardown: async (reporter, { phases }) => {
+    teardown: async ({ phases }) => {
       for (const { dispatcher } of phases.reverse())
         await dispatcher.stop();
     },
   };
 }
+
+export function createStartDevServerTask(): Task<TestRun> {
+  return {
+    title: 'start dev server',
+    setup: async ({ config }, errors, softErrors) => {
+      if (config.plugins.some(plugin => !!plugin.devServerCleanup)) {
+        errors.push({ message: `DevServer is already running` });
+        return;
+      }
+      for (const plugin of config.plugins)
+        plugin.devServerCleanup = await plugin.instance?.startDevServer?.();
+      if (!config.plugins.some(plugin => !!plugin.devServerCleanup))
+        errors.push({ message: `DevServer is not available in the package you are using. Did you mean to use component testing?` });
+    },
+
+    teardown: async ({ config }) => {
+      for (const plugin of config.plugins) {
+        await plugin.devServerCleanup?.();
+        plugin.devServerCleanup = undefined;
+      }
+    },
+  };
+}
diff --git a/packages/playwright/src/runner/testGroups.ts b/packages/playwright/src/runner/testGroups.ts
index 5a70bc84cc0d7..5743c7044bcb5 100644
--- a/packages/playwright/src/runner/testGroups.ts
+++ b/packages/playwright/src/runner/testGroups.ts
@@ -24,7 +24,7 @@ export type TestGroup = {
   tests: TestCase[];
 };
 
-export function createTestGroups(projectSuite: Suite, workers: number): TestGroup[] {
+export function createTestGroups(projectSuite: Suite, expectedParallelism: number): TestGroup[] {
   // This function groups tests that can be run together.
   // Tests cannot be run together when:
   // - They belong to different projects - requires different workers.
@@ -116,7 +116,7 @@ export function createTestGroups(projectSuite: Suite, workers: number): TestGrou
       result.push(...withRequireFile.parallel.values());
 
       // Tests with beforeAll/afterAll should try to share workers as much as possible.
-      const parallelWithHooksGroupSize = Math.ceil(withRequireFile.parallelWithHooks.tests.length / workers);
+      const parallelWithHooksGroupSize = Math.ceil(withRequireFile.parallelWithHooks.tests.length / expectedParallelism);
       let lastGroup: TestGroup | undefined;
       for (const test of withRequireFile.parallelWithHooks.tests) {
         if (!lastGroup || lastGroup.tests.length >= parallelWithHooksGroupSize) {
diff --git a/packages/playwright/src/runner/testRunner.ts b/packages/playwright/src/runner/testRunner.ts
new file mode 100644
index 0000000000000..a2c1774263370
--- /dev/null
+++ b/packages/playwright/src/runner/testRunner.ts
@@ -0,0 +1,494 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 fs from 'fs';
+import path from 'path';
+
+import { registry } from 'playwright-core/lib/server';
+import { ManualPromise, gracefullyProcessExitDoNotHang } from 'playwright-core/lib/utils';
+
+import { loadConfig } from '../common/configLoader';
+import { Watcher } from '../fsWatcher';
+import { baseFullConfig } from '../isomorphic/teleReceiver';
+import { addGitCommitInfoPlugin } from '../plugins/gitCommitInfoPlugin';
+import { webServerPluginsForConfig } from '../plugins/webServerPlugin';
+import { internalScreen } from '../reporters/base';
+import { InternalReporter } from '../reporters/internalReporter';
+import { affectedTestFiles, collectAffectedTestFiles, dependenciesForTestFile } from '../transform/compilationCache';
+import { serializeError } from '../util';
+import { createErrorCollectingReporter, createReporters } from './reporters';
+import { TestRun, createApplyRebaselinesTask, createClearCacheTask, createGlobalSetupTasks, createListFilesTask, createLoadTask, createPluginSetupTasks, createReportBeginTask, createRunTestsTasks, createStartDevServerTask, runTasks, runTasksDeferCleanup } from './tasks';
+import { LastRunReporter } from './lastRun';
+
+import type * as reporterTypes from '../../types/testReporter';
+import type { ConfigLocation, FullConfigInternal } from '../common/config';
+import type { ConfigCLIOverrides } from '../common/ipc';
+import type { TestRunnerPluginRegistration } from '../plugins';
+import type { AnyReporter } from '../reporters/reporterV2';
+
+export type RecoverFromStepErrorResult = {
+  stepId: string;
+  status: 'recovered' | 'failed';
+  value?: string | number | boolean | undefined;
+};
+
+export const TestRunnerEvent = {
+  TestFilesChanged: 'testFilesChanged',
+  RecoverFromStepError: 'recoverFromStepError',
+} as const;
+
+export type TestRunnerEventMap = {
+  [TestRunnerEvent.TestFilesChanged]: [testFiles: string[]];
+  [TestRunnerEvent.RecoverFromStepError]: [stepId: string, message: string, location: reporterTypes.Location];
+};
+
+export type ListTestsParams = {
+  projects?: string[];
+  locations?: string[];
+  grep?: string;
+  grepInvert?: string;
+};
+
+export type RunTestsParams = {
+  locations?: string[];
+  grep?: string;
+  grepInvert?: string;
+  testIds?: string[];
+  headed?: boolean;
+  workers?: number | string;
+  updateSnapshots?: 'all' | 'changed' | 'missing' | 'none';
+  updateSourceMethod?: 'overwrite' | 'patch' | '3way';
+  reporters?: string[],
+  trace?: 'on' | 'off';
+  video?: 'on' | 'off';
+  projects?: string[];
+  reuseContext?: boolean;
+  connectWsEndpoint?: string;
+};
+
+type FullResultStatus = reporterTypes.FullResult['status'];
+
+export class TestRunner extends EventEmitter<TestRunnerEventMap> {
+  readonly configLocation: ConfigLocation;
+  private _configCLIOverrides: ConfigCLIOverrides;
+
+  private _watcher: Watcher;
+  private _watchedProjectDirs = new Set<string>();
+  private _ignoredProjectOutputs = new Set<string>();
+  private _watchedTestDependencies = new Set<string>();
+
+  private _testRun: { run: Promise<reporterTypes.FullResult['status']>, stop: ManualPromise<void> } | undefined;
+  private _queue = Promise.resolve();
+  private _globalSetup: { cleanup: () => Promise<any> } | undefined;
+  private _devServer: { cleanup: () => Promise<any> } | undefined;
+  private _plugins: TestRunnerPluginRegistration[] | undefined;
+  private _watchTestDirs = false;
+  private _populateDependenciesOnList = false;
+  private _recoverFromStepErrors = false;
+  private _resumeAfterStepErrors: Map<string, ManualPromise<RecoverFromStepErrorResult>> = new Map();
+
+  constructor(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides) {
+    super();
+    this.configLocation = configLocation;
+    this._configCLIOverrides = configCLIOverrides;
+    this._watcher = new Watcher(events => {
+      const collector = new Set<string>();
+      events.forEach(f => collectAffectedTestFiles(f.file, collector));
+      this.emit(TestRunnerEvent.TestFilesChanged, [...collector]);
+    });
+  }
+
+  async initialize(params: {
+    watchTestDirs?: boolean;
+    populateDependenciesOnList?: boolean;
+    recoverFromStepErrors?: boolean;
+  }) {
+    this._watchTestDirs = !!params.watchTestDirs;
+    this._populateDependenciesOnList = !!params.populateDependenciesOnList;
+    this._recoverFromStepErrors = !!params.recoverFromStepErrors;
+  }
+
+  resizeTerminal(params: { cols: number, rows: number }) {
+    /* eslint-disable no-restricted-properties */
+    process.stdout.columns = params.cols;
+    process.stdout.rows = params.rows;
+    process.stderr.columns = params.cols;
+    process.stderr.rows = params.rows;
+    /* eslint-enable no-restricted-properties */
+  }
+
+  hasSomeBrowsers(): boolean {
+    for (const browserName of ['chromium', 'webkit', 'firefox']) {
+      try {
+        registry.findExecutable(browserName)!.executablePathOrDie('javascript');
+        return true;
+      } catch {
+      }
+    }
+    return false;
+  }
+
+  async installBrowsers() {
+    const executables = registry.defaultExecutables();
+    await registry.install(executables, false);
+  }
+
+  async runGlobalSetup(userReporters: AnyReporter[]): Promise<{ status: FullResultStatus }> {
+    await this.runGlobalTeardown();
+
+    const reporter = new InternalReporter(userReporters);
+    const config = await this._loadConfigOrReportError(reporter, this._configCLIOverrides);
+    if (!config)
+      return { status: 'failed' };
+
+    const { status, cleanup } = await runTasksDeferCleanup(new TestRun(config, reporter), [
+      ...createGlobalSetupTasks(config),
+    ]);
+    if (status !== 'passed')
+      await cleanup();
+    else
+      this._globalSetup = { cleanup };
+    return { status };
+  }
+
+  async runGlobalTeardown() {
+    const globalSetup = this._globalSetup;
+    const status = await globalSetup?.cleanup();
+    this._globalSetup = undefined;
+    return { status };
+  }
+
+  async startDevServer(userReporter: AnyReporter, mode: 'in-process' | 'out-of-process'): Promise<{ status: FullResultStatus }> {
+    await this.stopDevServer();
+
+    const reporter = new InternalReporter([userReporter]);
+    const config = await this._loadConfigOrReportError(reporter);
+    if (!config)
+      return { status: 'failed' };
+
+    const { status, cleanup } = await runTasksDeferCleanup(new TestRun(config, reporter), [
+      ...createPluginSetupTasks(config),
+      createLoadTask(mode, { failOnLoadErrors: true, filterOnly: false }),
+      createStartDevServerTask(),
+    ]);
+    if (status !== 'passed')
+      await cleanup();
+    else
+      this._devServer = { cleanup };
+    return { status };
+  }
+
+  async stopDevServer(): Promise<{ status: FullResultStatus }> {
+    const devServer = this._devServer;
+    const status = await devServer?.cleanup();
+    this._devServer = undefined;
+    return { status };
+  }
+
+  async clearCache(userReporter?: AnyReporter): Promise<{ status: FullResultStatus }> {
+    const reporter = new InternalReporter(userReporter ? [userReporter] : []);
+    const config = await this._loadConfigOrReportError(reporter);
+    if (!config)
+      return { status: 'failed' };
+    const status = await runTasks(new TestRun(config, reporter), [
+      ...createPluginSetupTasks(config),
+      createClearCacheTask(config),
+    ]);
+    return { status };
+  }
+
+  async listFiles(userReporter: AnyReporter, projects?: string[]): Promise<{ status: FullResultStatus }> {
+    const reporter = new InternalReporter([userReporter]);
+    const config = await this._loadConfigOrReportError(reporter);
+    if (!config)
+      return { status: 'failed' };
+
+    config.cliProjectFilter = projects?.length ? projects : undefined;
+    const status = await runTasks(new TestRun(config, reporter), [
+      createListFilesTask(),
+      createReportBeginTask(),
+    ]);
+    return { status };
+  }
+
+  async listTests(userReporter: AnyReporter, params: ListTestsParams): Promise<{ status: FullResultStatus }> {
+    let result: { status: FullResultStatus } | undefined;
+    this._queue = this._queue.then(async () => {
+      const { config, status } = await this._innerListTests(userReporter, params);
+      if (config)
+        await this._updateWatchedDirs(config);
+      result = { status };
+    }).catch(printInternalError);
+    await this._queue;
+    return result!;
+  }
+
+  private async _innerListTests(userReporter: AnyReporter, params: ListTestsParams): Promise<{
+    status: reporterTypes.FullResult['status'],
+    config?: FullConfigInternal,
+  }> {
+    const overrides: ConfigCLIOverrides = {
+      ...this._configCLIOverrides,
+      repeatEach: 1,
+      retries: 0,
+    };
+    const reporter = new InternalReporter([userReporter]);
+    const config = await this._loadConfigOrReportError(reporter, overrides);
+    if (!config)
+      return { status: 'failed' };
+
+    config.cliArgs = params.locations || [];
+    config.cliGrep = params.grep;
+    config.cliGrepInvert = params.grepInvert;
+    config.cliProjectFilter = params.projects?.length ? params.projects : undefined;
+    config.cliListOnly = true;
+
+    const status = await runTasks(new TestRun(config, reporter), [
+      createLoadTask('out-of-process', { failOnLoadErrors: false, filterOnly: false, populateDependencies: this._populateDependenciesOnList }),
+      createReportBeginTask(),
+    ]);
+    return { config, status };
+  }
+
+  private async _updateWatchedDirs(config: FullConfigInternal) {
+    this._watchedProjectDirs = new Set();
+    this._ignoredProjectOutputs = new Set();
+    for (const p of config.projects) {
+      this._watchedProjectDirs.add(p.project.testDir);
+      this._ignoredProjectOutputs.add(p.project.outputDir);
+    }
+
+    const result = await resolveCtDirs(config);
+    if (result) {
+      this._watchedProjectDirs.add(result.templateDir);
+      this._ignoredProjectOutputs.add(result.outDir);
+    }
+
+    if (this._watchTestDirs)
+      await this._updateWatcher(false);
+  }
+
+  private async _updateWatcher(reportPending: boolean) {
+    await this._watcher.update([...this._watchedProjectDirs, ...this._watchedTestDependencies], [...this._ignoredProjectOutputs], reportPending);
+  }
+
+  async runTests(userReporter: AnyReporter, params: RunTestsParams): Promise<{ status: FullResultStatus }> {
+    let result: { status: FullResultStatus } = { status: 'passed' };
+    this._queue = this._queue.then(async () => {
+      result = await this._innerRunTests(userReporter, params).catch(e => { printInternalError(e); return { status: 'failed' }; });
+    });
+    await this._queue;
+    return result;
+  }
+
+  private async _innerRunTests(userReporter: AnyReporter, params: RunTestsParams): Promise<{ status: FullResultStatus }> {
+    await this.stopTests();
+    const overrides: ConfigCLIOverrides = {
+      ...this._configCLIOverrides,
+      repeatEach: 1,
+      retries: 0,
+      preserveOutputDir: true,
+      reporter: params.reporters ? params.reporters.map(r => [r]) : undefined,
+      use: {
+        ...this._configCLIOverrides.use,
+        ...(params.trace === 'on' ? { trace: { mode: 'on', sources: false, _live: true } } : {}),
+        ...(params.trace === 'off' ? { trace: 'off' } : {}),
+        ...(params.video === 'on' || params.video === 'off' ? { video: params.video } : {}),
+        ...(params.headed !== undefined ? { headless: !params.headed } : {}),
+        _optionContextReuseMode: params.reuseContext ? 'when-possible' : undefined,
+        _optionConnectOptions: params.connectWsEndpoint ? { wsEndpoint: params.connectWsEndpoint } : undefined,
+      },
+      ...(params.updateSnapshots ? { updateSnapshots: params.updateSnapshots } : {}),
+      ...(params.updateSourceMethod ? { updateSourceMethod: params.updateSourceMethod } : {}),
+      ...(params.workers ? { workers: params.workers } : {}),
+    };
+    if (params.trace === 'on')
+      process.env.PW_LIVE_TRACE_STACKS = '1';
+    else
+      process.env.PW_LIVE_TRACE_STACKS = undefined;
+
+    const config = await this._loadConfigOrReportError(new InternalReporter([userReporter]), overrides);
+    if (!config)
+      return { status: 'failed' };
+
+    config.cliListOnly = false;
+    config.cliPassWithNoTests = true;
+    config.cliArgs = params.locations || [];
+    config.cliGrep = params.grep;
+    config.cliGrepInvert = params.grepInvert;
+    config.cliProjectFilter = params.projects?.length ? params.projects : undefined;
+    config.preOnlyTestFilters = [];
+    if (params.testIds) {
+      const testIdSet = new Set<string>(params.testIds);
+      config.preOnlyTestFilters.push(test => testIdSet.has(test.id));
+    }
+
+    const configReporters = await createReporters(config, 'test', true);
+    const reporter = new InternalReporter([...configReporters, userReporter]);
+    const stop = new ManualPromise();
+    const tasks = [
+      createApplyRebaselinesTask(),
+      createLoadTask('out-of-process', { filterOnly: true, failOnLoadErrors: false, doNotRunDepsOutsideProjectFilter: true }),
+      ...createRunTestsTasks(config),
+    ];
+    const testRun = new TestRun(config, reporter);
+    testRun.failureTracker.setRecoverFromStepErrorHandler(this._recoverFromStepError.bind(this));
+    const run = runTasks(testRun, tasks, 0, stop).then(async status => {
+      this._testRun = undefined;
+      return status;
+    });
+    this._testRun = { run, stop };
+    return { status: await run };
+  }
+
+  private async _recoverFromStepError(stepId: string, error: reporterTypes.TestError): Promise<RecoverFromStepErrorResult> {
+    if (!this._recoverFromStepErrors)
+      return { stepId, status: 'failed' };
+    const recoveryPromise = new ManualPromise<RecoverFromStepErrorResult>();
+    this._resumeAfterStepErrors.set(stepId, recoveryPromise);
+    if (!error?.message || !error?.location)
+      return { stepId, status: 'failed' };
+    this.emit(TestRunnerEvent.RecoverFromStepError, stepId, error.message, error.location);
+    const recoveredResult = await recoveryPromise;
+    if (recoveredResult.stepId !== stepId)
+      return { stepId, status: 'failed' };
+    return recoveredResult;
+  }
+
+  async resumeAfterStepError(params: RecoverFromStepErrorResult): Promise<void> {
+    const recoveryPromise = this._resumeAfterStepErrors.get(params.stepId);
+    if (recoveryPromise)
+      recoveryPromise.resolve(params);
+  }
+
+  async watch(fileNames: string[]) {
+    this._watchedTestDependencies = new Set();
+    for (const fileName of fileNames) {
+      this._watchedTestDependencies.add(fileName);
+      dependenciesForTestFile(fileName).forEach(file => this._watchedTestDependencies.add(file));
+    }
+    await this._updateWatcher(true);
+  }
+
+  async findRelatedTestFiles(files: string[], userReporter?: AnyReporter): Promise<{ testFiles: string[]; errors?: reporterTypes.TestError[]; }> {
+    const errorReporter = createErrorCollectingReporter(internalScreen);
+    const reporter = new InternalReporter(userReporter ? [userReporter, errorReporter] : [errorReporter]);
+    const config = await this._loadConfigOrReportError(reporter);
+    if (!config)
+      return { errors: errorReporter.errors(), testFiles: [] };
+    const status = await runTasks(new TestRun(config, reporter), [
+      ...createPluginSetupTasks(config),
+      createLoadTask('out-of-process', { failOnLoadErrors: true, filterOnly: false, populateDependencies: true }),
+    ]);
+    if (status !== 'passed')
+      return { errors: errorReporter.errors(), testFiles: [] };
+    return { testFiles: affectedTestFiles(files) };
+  }
+
+  async stopTests() {
+    this._testRun?.stop?.resolve();
+    await this._testRun?.run;
+    this._resumeAfterStepErrors.clear();
+  }
+
+  async closeGracefully() {
+    gracefullyProcessExitDoNotHang(0);
+  }
+
+  private async _loadConfig(overrides?: ConfigCLIOverrides): Promise<{ config: FullConfigInternal | null, error?: reporterTypes.TestError }> {
+    try {
+      const config = await loadConfig(this.configLocation, overrides);
+      // Preserve plugin instances between setup and build.
+      if (!this._plugins) {
+        webServerPluginsForConfig(config).forEach(p => config.plugins.push({ factory: p }));
+        addGitCommitInfoPlugin(config);
+        this._plugins = config.plugins || [];
+      } else {
+        config.plugins.splice(0, config.plugins.length, ...this._plugins);
+      }
+      return { config };
+    } catch (e) {
+      return { config: null, error: serializeError(e) };
+    }
+  }
+
+  private async _loadConfigOrReportError(reporter: InternalReporter, overrides?: ConfigCLIOverrides): Promise<FullConfigInternal | null> {
+    const { config, error } = await this._loadConfig(overrides);
+    if (config)
+      return config;
+    // Produce dummy config when it has an error.
+    reporter.onConfigure(baseFullConfig);
+    reporter.onError(error!);
+    await reporter.onEnd({ status: 'failed' });
+    await reporter.onExit();
+    return null;
+  }
+}
+
+function printInternalError(e: Error) {
+  // eslint-disable-next-line no-console
+  console.error('Internal error:', e);
+}
+
+// TODO: remove CT dependency.
+async function resolveCtDirs(config: FullConfigInternal) {
+  const use = config.config.projects[0].use as any;
+  const relativeTemplateDir = use.ctTemplateDir || 'playwright';
+  const templateDir = await fs.promises.realpath(path.normalize(path.join(config.configDir, relativeTemplateDir))).catch(() => undefined);
+  if (!templateDir)
+    return null;
+  const outDir = use.ctCacheDir ? path.resolve(config.configDir, use.ctCacheDir) : path.resolve(templateDir, '.cache');
+  return {
+    outDir,
+    templateDir
+  };
+}
+
+export async function runAllTestsWithConfig(config: FullConfigInternal): Promise<FullResultStatus> {
+  const listOnly = config.cliListOnly;
+
+  addGitCommitInfoPlugin(config);
+
+  // Legacy webServer support.
+  webServerPluginsForConfig(config).forEach(p => config.plugins.push({ factory: p }));
+
+  const reporters = await createReporters(config, listOnly ? 'list' : 'test', false);
+  const lastRun = new LastRunReporter(config);
+  if (config.cliLastFailed)
+    await lastRun.filterLastFailed();
+
+  const reporter = new InternalReporter([...reporters, lastRun]);
+  const tasks = listOnly ? [
+    createLoadTask('in-process', { failOnLoadErrors: true, filterOnly: false }),
+    createReportBeginTask(),
+  ] : [
+    createApplyRebaselinesTask(),
+    ...createGlobalSetupTasks(config),
+    createLoadTask('in-process', { filterOnly: true, failOnLoadErrors: true }),
+    ...createRunTestsTasks(config),
+  ];
+  const status = await runTasks(new TestRun(config, reporter), tasks, config.config.globalTimeout);
+
+  // Calling process.exit() might truncate large stdout/stderr output.
+  // See https://github.com/nodejs/node/issues/6456.
+  // See https://github.com/nodejs/node/issues/12921
+  // eslint-disable-next-line no-restricted-properties
+  await new Promise<void>(resolve => process.stdout.write('', () => resolve()));
+  // eslint-disable-next-line no-restricted-properties
+  await new Promise<void>(resolve => process.stderr.write('', () => resolve()));
+  return status;
+}
diff --git a/packages/playwright/src/runner/testServer.ts b/packages/playwright/src/runner/testServer.ts
index 559f95514a3b2..9461e20e05f25 100644
--- a/packages/playwright/src/runner/testServer.ts
+++ b/packages/playwright/src/runner/testServer.ts
@@ -14,45 +14,44 @@
  * limitations under the License.
  */
 
-import fs from 'fs';
-import path from 'path';
-import { installRootRedirect, openTraceInBrowser, openTraceViewerApp, registry, startTraceViewerServer } from 'playwright-core/lib/server';
+import util from 'util';
+
+import { installRootRedirect, openTraceInBrowser, openTraceViewerApp, startTraceViewerServer } from 'playwright-core/lib/server';
 import { ManualPromise, gracefullyProcessExitDoNotHang, isUnderTest } from 'playwright-core/lib/utils';
-import type { Transport, HttpServer } from 'playwright-core/lib/utils';
-import type * as reporterTypes from '../../types/testReporter';
-import { collectAffectedTestFiles, dependenciesForTestFile } from '../transform/compilationCache';
-import type { ConfigLocation, FullConfigInternal } from '../common/config';
-import { createReporterForTestServer, createReporters } from './reporters';
-import { TestRun, createTaskRunnerForList, createTaskRunnerForTestServer, createTaskRunnerForWatchSetup, createTaskRunnerForListFiles } from './tasks';
-import { open } from 'playwright-core/lib/utilsBundle';
+import { debug, open } from 'playwright-core/lib/utilsBundle';
+
+import { loadConfig, resolveConfigLocation } from '../common/configLoader';
 import ListReporter from '../reporters/list';
+import { createReporterForTestServer } from './reporters';
 import { SigIntWatcher } from './sigIntWatcher';
-import { Watcher } from '../fsWatcher';
-import type { ReportEntry, TestServerInterface, TestServerInterfaceEventEmitters } from '../isomorphic/testServerInterface';
-import { Runner } from './runner';
-import type { ConfigCLIOverrides } from '../common/ipc';
-import { loadConfig, resolveConfigLocation, restartWithExperimentalTsEsm } from '../common/configLoader';
-import { webServerPluginsForConfig } from '../plugins/webServerPlugin';
+import { TestRunner } from './testRunner';
+
 import type { TraceViewerRedirectOptions, TraceViewerServerOptions } from 'playwright-core/lib/server/trace/viewer/traceViewer';
-import type { TestRunnerPluginRegistration } from '../plugins';
-import { serializeError } from '../util';
-import { cacheDir } from '../transform/compilationCache';
-import { baseFullConfig } from '../isomorphic/teleReceiver';
-import { InternalReporter } from '../reporters/internalReporter';
+import type { HttpServer, Transport } from 'playwright-core/lib/utils';
+import type * as reporterTypes from '../../types/testReporter';
+import type { ConfigLocation } from '../common/config';
+import type { ConfigCLIOverrides } from '../common/ipc';
+import type { RecoverFromStepErrorResult, ReportEntry, TestServerInterface, TestServerInterfaceEventEmitters } from '../isomorphic/testServerInterface';
+import type { ReporterV2 } from '../reporters/reporterV2';
 
+const originalDebugLog = debug.log;
+// eslint-disable-next-line no-restricted-properties
 const originalStdoutWrite = process.stdout.write;
+// eslint-disable-next-line no-restricted-properties
 const originalStderrWrite = process.stderr.write;
 
 class TestServer {
   private _configLocation: ConfigLocation;
+  private _configCLIOverrides: ConfigCLIOverrides;
   private _dispatcher: TestServerDispatcher | undefined;
 
-  constructor(configLocation: ConfigLocation) {
+  constructor(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides) {
     this._configLocation = configLocation;
+    this._configCLIOverrides = configCLIOverrides;
   }
 
   async start(options: { host?: string, port?: number }): Promise<HttpServer> {
-    this._dispatcher = new TestServerDispatcher(this._configLocation);
+    this._dispatcher = new TestServerDispatcher(this._configLocation, this._configCLIOverrides);
     return await startTraceViewerServer({ ...options, transport: this._dispatcher.transport });
   }
 
@@ -62,63 +61,87 @@ class TestServer {
   }
 }
 
-class TestServerDispatcher implements TestServerInterface {
-  private _configLocation: ConfigLocation;
-  private _globalWatcher: Watcher;
-  private _testWatcher: Watcher;
-  private _testRun: { run: Promise<reporterTypes.FullResult['status']>, stop: ManualPromise<void> } | undefined;
+export const TestRunnerEvent = {
+  TestFilesChanged: 'testFilesChanged',
+  RecoverFromStepError: 'recoverFromStepError',
+} as const;
+
+export type TestRunnerEventMap = {
+  [TestRunnerEvent.TestFilesChanged]: [testFiles: string[]];
+  [TestRunnerEvent.RecoverFromStepError]: [stepId: string, message: string, location: reporterTypes.Location];
+};
+
+export type ListTestsParams = {
+  projects?: string[];
+  locations?: string[];
+  grep?: string;
+  grepInvert?: string;
+};
+
+export type RunTestsParams = {
+  locations?: string[];
+  grep?: string;
+  grepInvert?: string;
+  testIds?: string[];
+  headed?: boolean;
+  workers?: number | string;
+  updateSnapshots?: 'all' | 'changed' | 'missing' | 'none';
+  updateSourceMethod?: 'overwrite' | 'patch' | '3way';
+  reporters?: string[],
+  trace?: 'on' | 'off';
+  video?: 'on' | 'off';
+  projects?: string[];
+  reuseContext?: boolean;
+  connectWsEndpoint?: string;
+};
+
+export class TestServerDispatcher implements TestServerInterface {
   readonly transport: Transport;
-  private _queue = Promise.resolve();
-  private _globalSetup: { cleanup: () => Promise<any>, report: ReportEntry[] } | undefined;
-  readonly _dispatchEvent: TestServerInterfaceEventEmitters['dispatchEvent'];
-  private _plugins: TestRunnerPluginRegistration[] | undefined;
   private _serializer = require.resolve('./uiModeReporter');
-  private _watchTestDirs = false;
   private _closeOnDisconnect = false;
-  private _devServerHandle: (() => Promise<void>) | undefined;
+  private _testRunner: TestRunner;
+  private _globalSetupReport: ReportEntry[] | undefined;
+  private _devServerReport: ReportEntry[] | undefined;
+  readonly _dispatchEvent: TestServerInterfaceEventEmitters['dispatchEvent'];
 
-  constructor(configLocation: ConfigLocation) {
-    this._configLocation = configLocation;
+  constructor(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides) {
+    this._testRunner = new TestRunner(configLocation, configCLIOverrides);
     this.transport = {
+      onconnect: () => {},
       dispatch: (method, params) => (this as any)[method](params),
       onclose: () => {
         if (this._closeOnDisconnect)
           gracefullyProcessExitDoNotHang(0);
       },
     };
-    this._globalWatcher = new Watcher('deep', () => this._dispatchEvent('listChanged', {}));
-    this._testWatcher = new Watcher('flat', events => {
-      const collector = new Set<string>();
-      events.forEach(f => collectAffectedTestFiles(f.file, collector));
-      this._dispatchEvent('testFilesChanged', { testFiles: [...collector] });
-    });
+
     this._dispatchEvent = (method, params) => this.transport.sendEvent?.(method, params);
+    this._testRunner.on(TestRunnerEvent.TestFilesChanged, testFiles => this._dispatchEvent('testFilesChanged', { testFiles }));
+    this._testRunner.on(TestRunnerEvent.RecoverFromStepError, (stepId, message, location) => this._dispatchEvent('recoverFromStepError', { stepId, message, location }));
   }
 
   private async _wireReporter(messageSink: (message: any) => void) {
     return await createReporterForTestServer(this._serializer, messageSink);
   }
 
-  private async _collectingReporter() {
+  private async _collectingReporter(): Promise<{ reporter: ReporterV2, report: ReportEntry[] }> {
     const report: ReportEntry[] = [];
-    const collectingReporter = await createReporterForTestServer(this._serializer, e => report.push(e));
-    return { collectingReporter, report };
-  }
-
-  private async _collectingInternalReporter() {
-    const { collectingReporter, report } = await this._collectingReporter();
-    return { reporter: new InternalReporter(collectingReporter), report };
+    return {
+      reporter: await createReporterForTestServer(this._serializer, e => report.push(e)),
+      report,
+    };
   }
 
   async initialize(params: Parameters<TestServerInterface['initialize']>[0]): ReturnType<TestServerInterface['initialize']> {
-    if (params.serializer)
-      this._serializer = params.serializer;
-    if (params.closeOnDisconnect)
-      this._closeOnDisconnect = true;
-    if (params.interceptStdio)
-      await this._setInterceptStdio(true);
-    if (params.watchTestDirs)
-      this._watchTestDirs = true;
+    // Note: this method can be called multiple times, for example from a new connection after UI mode reload.
+    this._serializer = params.serializer || require.resolve('./uiModeReporter');
+    this._closeOnDisconnect = !!params.closeOnDisconnect;
+    await this._setInterceptStdio(!!params.interceptStdio);
+    await this._testRunner.initialize({
+      watchTestDirs: !!params.watchTestDirs,
+      populateDependenciesOnList: !!params.populateDependenciesOnList,
+      recoverFromStepErrors: !!params.recoverFromStepErrors,
+    });
   }
 
   async ping() {}
@@ -131,308 +154,134 @@ class TestServerDispatcher implements TestServerInterface {
   }
 
   async resizeTerminal(params: Parameters<TestServerInterface['resizeTerminal']>[0]): ReturnType<TestServerInterface['resizeTerminal']> {
-    process.stdout.columns = params.cols;
-    process.stdout.rows = params.rows;
-    process.stderr.columns = params.cols;
-    process.stderr.columns = params.rows;
+    this._testRunner.resizeTerminal(params);
   }
 
   async checkBrowsers(): Promise<{ hasBrowsers: boolean; }> {
-    return { hasBrowsers: hasSomeBrowsers() };
+    return { hasBrowsers: this._testRunner.hasSomeBrowsers() };
   }
 
   async installBrowsers() {
-    await installBrowsers();
+    await this._testRunner.installBrowsers();
   }
 
   async runGlobalSetup(params: Parameters<TestServerInterface['runGlobalSetup']>[0]): ReturnType<TestServerInterface['runGlobalSetup']> {
     await this.runGlobalTeardown();
 
-    const { config, error } = await this._loadConfig();
-    if (!config) {
-      const { reporter, report } = await this._collectingInternalReporter();
-      // Produce dummy config when it has an error.
-      reporter.onConfigure(baseFullConfig);
-      reporter.onError(error!);
-      await reporter.onExit();
-      return { status: 'failed', report };
-    }
-
-    webServerPluginsForConfig(config).forEach(p => config.plugins.push({ factory: p }));
-    const { collectingReporter, report } = await this._collectingReporter();
-    const listReporter = new ListReporter();
-    const taskRunner = createTaskRunnerForWatchSetup(config, [collectingReporter, listReporter]);
-    taskRunner.reporter.onConfigure(config.config);
-    const testRun = new TestRun(config);
-    const { status, cleanup: globalCleanup } = await taskRunner.runDeferCleanup(testRun, 0);
-    await taskRunner.reporter.onEnd({ status });
-    await taskRunner.reporter.onExit();
-    if (status !== 'passed') {
-      await globalCleanup();
-      return { report, status };
-    }
-    this._globalSetup = { cleanup: globalCleanup, report };
+    const { reporter, report } = await this._collectingReporter();
+    this._globalSetupReport = report;
+    const { status } = await this._testRunner.runGlobalSetup([reporter, new ListReporter()]);
     return { report, status };
   }
 
   async runGlobalTeardown() {
-    const globalSetup = this._globalSetup;
-    const status = await globalSetup?.cleanup();
-    this._globalSetup = undefined;
-    return { status, report: globalSetup?.report || [] };
+    const { status } = await this._testRunner.runGlobalTeardown();
+    const report = this._globalSetupReport || [];
+    this._globalSetupReport = undefined;
+    return { status, report };
   }
 
   async startDevServer(params: Parameters<TestServerInterface['startDevServer']>[0]): ReturnType<TestServerInterface['startDevServer']> {
-    if (this._devServerHandle)
-      return { status: 'failed', report: [] };
-    const { reporter, report } = await this._collectingInternalReporter();
-    const { config, error } = await this._loadConfig();
-    if (!config) {
-      reporter.onError(error!);
-      return { status: 'failed', report };
-    }
-    const devServerCommand = (config.config as any)['@playwright/test']?.['cli']?.['dev-server'];
-    if (!devServerCommand) {
-      reporter.onError({ message: 'No dev-server command found in the configuration' });
-      return { status: 'failed', report };
-    }
-    try {
-      this._devServerHandle = await devServerCommand(config);
-      return { status: 'passed', report };
-    } catch (e) {
-      reporter.onError(serializeError(e));
-      return { status: 'failed', report };
-    }
+    await this.stopDevServer({});
+
+    const { reporter, report } = await this._collectingReporter();
+    const { status } = await this._testRunner.startDevServer(reporter, 'out-of-process');
+    return { report, status };
   }
 
   async stopDevServer(params: Parameters<TestServerInterface['stopDevServer']>[0]): ReturnType<TestServerInterface['stopDevServer']> {
-    if (!this._devServerHandle)
-      return { status: 'failed', report: [] };
-    try {
-      await this._devServerHandle();
-      this._devServerHandle = undefined;
-      return { status: 'passed', report: [] };
-    } catch (e) {
-      const { reporter, report } = await this._collectingInternalReporter();
-      reporter.onError(serializeError(e));
-      return { status: 'failed', report };
-    }
+    const { status } = await this._testRunner.stopDevServer();
+    const report = this._devServerReport || [];
+    this._devServerReport = undefined;
+    return { status, report };
   }
 
   async clearCache(params: Parameters<TestServerInterface['clearCache']>[0]): ReturnType<TestServerInterface['clearCache']> {
-    const { config } = await this._loadConfig();
-    if (config)
-      await clearCacheAndLogToConsole(config);
+    await this._testRunner.clearCache();
   }
 
   async listFiles(params: Parameters<TestServerInterface['listFiles']>[0]): ReturnType<TestServerInterface['listFiles']> {
-    const { config, error } = await this._loadConfig();
-    if (!config) {
-      const { reporter, report } = await this._collectingInternalReporter();
-      reporter.onError(error!);
-      return { status: 'failed', report };
-    }
-
-    const { collectingReporter, report } = await this._collectingReporter();
-    config.cliProjectFilter = params.projects?.length ? params.projects : undefined;
-    const taskRunner = createTaskRunnerForListFiles(config, [collectingReporter]);
-    taskRunner.reporter.onConfigure(config.config);
-    const testRun = new TestRun(config);
-    const status = await taskRunner.run(testRun, 0);
-    await taskRunner.reporter.onEnd({ status });
-    await taskRunner.reporter.onExit();
+    const { reporter, report } = await this._collectingReporter();
+    const { status } = await this._testRunner.listFiles(reporter, params.projects);
     return { report, status };
   }
 
   async listTests(params: Parameters<TestServerInterface['listTests']>[0]): ReturnType<TestServerInterface['listTests']> {
-    let result: Awaited<ReturnType<TestServerInterface['listTests']>>;
-    this._queue = this._queue.then(async () => {
-      result = await this._innerListTests(params);
-    }).catch(printInternalError);
-    await this._queue;
-    return result!;
-  }
-
-  private async _innerListTests(params: Parameters<TestServerInterface['listTests']>[0]): ReturnType<TestServerInterface['listTests']> {
-    const overrides: ConfigCLIOverrides = {
-      repeatEach: 1,
-      retries: 0,
-    };
-    const { config, error } = await this._loadConfig(overrides);
-    if (!config) {
-      const { reporter, report } = await this._collectingInternalReporter();
-      reporter.onError(error!);
-      return { report, status: 'failed' };
-    }
-
-    config.cliArgs = params.locations || [];
-    config.cliGrep = params.grep;
-    config.cliGrepInvert = params.grepInvert;
-    config.cliProjectFilter = params.projects?.length ? params.projects : undefined;
-    config.cliListOnly = true;
-
-    const { collectingReporter, report } = await this._collectingReporter();
-    const taskRunner = createTaskRunnerForList(config, [collectingReporter], 'out-of-process', { failOnLoadErrors: false });
-    const testRun = new TestRun(config);
-    taskRunner.reporter.onConfigure(config.config);
-    const status = await taskRunner.run(testRun, 0);
-    await taskRunner.reporter.onEnd({ status });
-    await taskRunner.reporter.onExit();
-
-    const projectDirs = new Set<string>();
-    const projectOutputs = new Set<string>();
-    for (const p of config.projects) {
-      projectDirs.add(p.project.testDir);
-      projectOutputs.add(p.project.outputDir);
-    }
-
-    const result = await resolveCtDirs(config);
-    if (result) {
-      projectDirs.add(result.templateDir);
-      projectOutputs.add(result.outDir);
-    }
-
-    if (this._watchTestDirs)
-      this._globalWatcher.update([...projectDirs], [...projectOutputs], false);
+    const { reporter, report } = await this._collectingReporter();
+    const { status } = await this._testRunner.listTests(reporter, params);
     return { report, status };
   }
 
   async runTests(params: Parameters<TestServerInterface['runTests']>[0]): ReturnType<TestServerInterface['runTests']> {
-    let result: Awaited<ReturnType<TestServerInterface['runTests']>> = { status: 'passed' };
-    this._queue = this._queue.then(async () => {
-      result = await this._innerRunTests(params).catch(e => { printInternalError(e); return { status: 'failed' }; });
-    });
-    await this._queue;
-    return result;
+    const wireReporter = await this._wireReporter(e => this._dispatchEvent('report', e));
+    const { status } = await this._testRunner.runTests(wireReporter, params);
+    return { status };
   }
 
-  private async _innerRunTests(params: Parameters<TestServerInterface['runTests']>[0]): ReturnType<TestServerInterface['runTests']> {
-    await this.stopTests();
-    const overrides: ConfigCLIOverrides = {
-      repeatEach: 1,
-      retries: 0,
-      preserveOutputDir: true,
-      timeout: params.timeout,
-      reporter: params.reporters ? params.reporters.map(r => [r]) : undefined,
-      use: {
-        trace: params.trace === 'on' ? { mode: 'on', sources: false, _live: true } : (params.trace === 'off' ? 'off' : undefined),
-        video: params.video === 'on' ? 'on' : (params.video === 'off' ? 'off' : undefined),
-        headless: params.headed ? false : undefined,
-        _optionContextReuseMode: params.reuseContext ? 'when-possible' : undefined,
-        _optionConnectOptions: params.connectWsEndpoint ? { wsEndpoint: params.connectWsEndpoint } : undefined,
-      },
-      outputDir: params.outputDir,
-      updateSnapshots: params.updateSnapshots,
-      workers: params.workers,
-    };
-    if (params.trace === 'on')
-      process.env.PW_LIVE_TRACE_STACKS = '1';
-    else
-      process.env.PW_LIVE_TRACE_STACKS = undefined;
-
-    const { config, error } = await this._loadConfig(overrides);
-    if (!config) {
-      const wireReporter = await this._wireReporter(e => this._dispatchEvent('report', e));
-      wireReporter.onError(error!);
-      return { status: 'failed' };
-    }
-
-    const testIdSet = params.testIds ? new Set<string>(params.testIds) : null;
-    config.cliListOnly = false;
-    config.cliPassWithNoTests = true;
-    config.cliArgs = params.locations || [];
-    config.cliGrep = params.grep;
-    config.cliGrepInvert = params.grepInvert;
-    config.cliProjectFilter = params.projects?.length ? params.projects : undefined;
-    config.testIdMatcher = testIdSet ? id => testIdSet.has(id) : undefined;
-
-    const reporters = await createReporters(config, 'test', true);
-    const wireReporter = await this._wireReporter(e => this._dispatchEvent('report', e));
-    reporters.push(wireReporter);
-    const taskRunner = createTaskRunnerForTestServer(config, reporters);
-    const testRun = new TestRun(config);
-    taskRunner.reporter.onConfigure(config.config);
-    const stop = new ManualPromise();
-    const run = taskRunner.run(testRun, 0, stop).then(async status => {
-      await taskRunner.reporter.onEnd({ status });
-      await taskRunner.reporter.onExit();
-      this._testRun = undefined;
-      return status;
-    });
-    this._testRun = { run, stop };
-    return { status: await run };
+  async resumeAfterStepError(params: RecoverFromStepErrorResult): Promise<void> {
+    await this._testRunner.resumeAfterStepError(params);
   }
 
   async watch(params: { fileNames: string[]; }) {
-    const files = new Set<string>();
-    for (const fileName of params.fileNames) {
-      files.add(fileName);
-      dependenciesForTestFile(fileName).forEach(file => files.add(file));
-    }
-    this._testWatcher.update([...files], [], true);
+    await this._testRunner.watch(params.fileNames);
   }
 
   async findRelatedTestFiles(params: Parameters<TestServerInterface['findRelatedTestFiles']>[0]): ReturnType<TestServerInterface['findRelatedTestFiles']> {
-    const { config, error } = await this._loadConfig();
-    if (error)
-      return { testFiles: [], errors: [error] };
-    const runner = new Runner(config!);
-    return runner.findRelatedTestFiles('out-of-process', params.files);
+    return this._testRunner.findRelatedTestFiles(params.files);
   }
 
   async stopTests() {
-    this._testRun?.stop?.resolve();
-    await this._testRun?.run;
+    await this._testRunner.stopTests();
   }
 
   async _setInterceptStdio(intercept: boolean) {
+    /* eslint-disable no-restricted-properties */
     if (process.env.PWTEST_DEBUG)
       return;
     if (intercept) {
-      process.stdout.write = (chunk: string | Buffer) => {
+      if (debug.log === originalDebugLog) {
+        // Only if debug.log hasn't already been tampered with, don't intercept any DEBUG=* logging
+        debug.log = (...args) => {
+          const string = util.format(...args) + '\n';
+          return (originalStderrWrite as any).apply(process.stderr, [string]);
+        };
+      }
+      const stdoutWrite = (chunk: string | Buffer) => {
         this._dispatchEvent('stdio', chunkToPayload('stdout', chunk));
         return true;
       };
-      process.stderr.write = (chunk: string | Buffer) => {
+      const stderrWrite = (chunk: string | Buffer) => {
         this._dispatchEvent('stdio', chunkToPayload('stderr', chunk));
         return true;
       };
+      process.stdout.write = stdoutWrite;
+      process.stderr.write = stderrWrite;
     } else {
+      debug.log = originalDebugLog;
       process.stdout.write = originalStdoutWrite;
       process.stderr.write = originalStderrWrite;
     }
+    /* eslint-enable no-restricted-properties */
   }
 
   async closeGracefully() {
-    gracefullyProcessExitDoNotHang(0);
-  }
-
-  private async _loadConfig(overrides?: ConfigCLIOverrides): Promise<{ config: FullConfigInternal | null, error?: reporterTypes.TestError }> {
-    try {
-      const config = await loadConfig(this._configLocation, overrides);
-      // Preserve plugin instances between setup and build.
-      if (!this._plugins)
-        this._plugins = config.plugins || [];
-      else
-        config.plugins.splice(0, config.plugins.length, ...this._plugins);
-      return { config };
-    } catch (e) {
-      return { config: null, error: serializeError(e) };
-    }
+    await this._testRunner.closeGracefully();
   }
 }
 
-export async function runUIMode(configFile: string | undefined, options: TraceViewerServerOptions & TraceViewerRedirectOptions): Promise<reporterTypes.FullResult['status'] | 'restarted'> {
+export async function runUIMode(configFile: string | undefined, configCLIOverrides: ConfigCLIOverrides, options: TraceViewerServerOptions & TraceViewerRedirectOptions): Promise<reporterTypes.FullResult['status']> {
   const configLocation = resolveConfigLocation(configFile);
-  return await innerRunTestServer(configLocation, options, async (server: HttpServer, cancelPromise: ManualPromise<void>) => {
+  return await innerRunTestServer(configLocation, configCLIOverrides, options, async (server: HttpServer, cancelPromise: ManualPromise<void>) => {
     await installRootRedirect(server, [], { ...options, webApp: 'uiMode.html' });
     if (options.host !== undefined || options.port !== undefined) {
       await openTraceInBrowser(server.urlPrefix('human-readable'));
     } else {
+      const channel = await installedChromiumChannelForUI(configLocation, configCLIOverrides);
       const page = await openTraceViewerApp(server.urlPrefix('precise'), 'chromium', {
         headless: isUnderTest() && process.env.PWTEST_HEADED_FOR_TEST !== '1',
         persistentContextOptions: {
           handleSIGINT: false,
+          channel,
         },
       });
       page.on('close', () => cancelPromise.resolve());
@@ -440,25 +289,37 @@ export async function runUIMode(configFile: string | undefined, options: TraceVi
   });
 }
 
-export async function runTestServer(configFile: string | undefined, options: { host?: string, port?: number }): Promise<reporterTypes.FullResult['status'] | 'restarted'> {
+// Pick first channel that is used by one of the projects, to ensure it is installed on the machine.
+async function installedChromiumChannelForUI(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides) {
+  const config = await loadConfig(configLocation, configCLIOverrides).catch(e => null);
+  if (!config)
+    return undefined;
+  if (config.projects.some(p => (!p.project.use.browserName || p.project.use.browserName === 'chromium') && !p.project.use.channel))
+    return undefined;
+  for (const channel of ['chromium', 'chrome', 'msedge']) {
+    if (config.projects.some(p => p.project.use.channel === channel))
+      return channel;
+  }
+  return undefined;
+}
+
+export async function runTestServer(configFile: string | undefined, configCLIOverrides: ConfigCLIOverrides, options: { host?: string, port?: number }): Promise<reporterTypes.FullResult['status']> {
   const configLocation = resolveConfigLocation(configFile);
-  return await innerRunTestServer(configLocation, options, async server => {
+  return await innerRunTestServer(configLocation, configCLIOverrides, options, async server => {
     // eslint-disable-next-line no-console
     console.log('Listening on ' + server.urlPrefix('precise').replace('http:', 'ws:') + '/' + server.wsGuid());
   });
 }
 
-async function innerRunTestServer(configLocation: ConfigLocation, options: { host?: string, port?: number }, openUI: (server: HttpServer, cancelPromise: ManualPromise<void>, configLocation: ConfigLocation) => Promise<void>): Promise<reporterTypes.FullResult['status'] | 'restarted'> {
-  if (restartWithExperimentalTsEsm(undefined, true))
-    return 'restarted';
-  const testServer = new TestServer(configLocation);
+async function innerRunTestServer(configLocation: ConfigLocation, configCLIOverrides: ConfigCLIOverrides, options: { host?: string, port?: number }, openUI: (server: HttpServer, cancelPromise: ManualPromise<void>) => Promise<void>): Promise<reporterTypes.FullResult['status']> {
+  const testServer = new TestServer(configLocation, configCLIOverrides);
   const cancelPromise = new ManualPromise<void>();
   const sigintWatcher = new SigIntWatcher();
   process.stdin.on('close', () => gracefullyProcessExitDoNotHang(0));
   void sigintWatcher.promise().then(() => cancelPromise.resolve());
   try {
     const server = await testServer.start(options);
-    await openUI(server, cancelPromise, configLocation);
+    await openUI(server, cancelPromise);
     await cancelPromise;
   } finally {
     await testServer.stop();
@@ -474,62 +335,7 @@ type StdioPayload = {
 };
 
 function chunkToPayload(type: 'stdout' | 'stderr', chunk: Buffer | string): StdioPayload {
-  if (chunk instanceof Buffer)
+  if (chunk instanceof Uint8Array)
     return { type, buffer: chunk.toString('base64') };
   return { type, text: chunk };
 }
-
-function hasSomeBrowsers(): boolean {
-  for (const browserName of ['chromium', 'webkit', 'firefox']) {
-    try {
-      registry.findExecutable(browserName)!.executablePathOrDie('javascript');
-      return true;
-    } catch {
-    }
-  }
-  return false;
-}
-
-async function installBrowsers() {
-  const executables = registry.defaultExecutables();
-  await registry.install(executables, false);
-}
-
-function printInternalError(e: Error) {
-  // eslint-disable-next-line no-console
-  console.error('Internal error:', e);
-}
-
-// TODO: remove CT dependency.
-export async function resolveCtDirs(config: FullConfigInternal) {
-  const use = config.config.projects[0].use as any;
-  const relativeTemplateDir = use.ctTemplateDir || 'playwright';
-  const templateDir = await fs.promises.realpath(path.normalize(path.join(config.configDir, relativeTemplateDir))).catch(() => undefined);
-  if (!templateDir)
-    return null;
-  const outDir = use.ctCacheDir ? path.resolve(config.configDir, use.ctCacheDir) : path.resolve(templateDir, '.cache');
-  return {
-    outDir,
-    templateDir
-  };
-}
-
-export async function clearCacheAndLogToConsole(config: FullConfigInternal) {
-  const override = (config.config as any)['@playwright/test']?.['cli']?.['clear-cache'];
-  if (override) {
-    await override(config);
-    return;
-  }
-  await removeFolderAndLogToConsole(cacheDir);
-}
-
-export async function removeFolderAndLogToConsole(folder: string) {
-  try {
-    if (!fs.existsSync(folder))
-      return;
-    // eslint-disable-next-line no-console
-    console.log(`Removing ${await fs.promises.realpath(folder)}`);
-    await fs.promises.rm(folder, { recursive: true, force: true });
-  } catch {
-  }
-}
diff --git a/packages/playwright/src/runner/vcs.ts b/packages/playwright/src/runner/vcs.ts
index 3e5fcfc4e30cf..fcda96131821b 100644
--- a/packages/playwright/src/runner/vcs.ts
+++ b/packages/playwright/src/runner/vcs.ts
@@ -15,9 +15,10 @@
  */
 
 import childProcess from 'child_process';
-import { affectedTestFiles } from '../transform/compilationCache';
 import path from 'path';
 
+import { affectedTestFiles } from '../transform/compilationCache';
+
 export async function detectChangedTestFiles(baseCommit: string, configDir: string): Promise<Set<string>> {
   function gitFileList(command: string) {
     try {
@@ -27,6 +28,18 @@ export async function detectChangedTestFiles(baseCommit: string, configDir: stri
       ).split('\n').filter(Boolean);
     } catch (_error) {
       const error = _error as childProcess.SpawnSyncReturns<string>;
+
+      const unknownRevision = error.output.some(line => line?.includes('unknown revision'));
+      if (unknownRevision) {
+        const isShallowClone = childProcess.execSync('git rev-parse --is-shallow-repository', { encoding: 'utf-8',  stdio: 'pipe', cwd: configDir }).trim() === 'true';
+        if (isShallowClone) {
+          throw new Error([
+            `The repository is a shallow clone and does not have '${baseCommit}' available locally.`,
+            `Note that GitHub Actions checkout is shallow by default: https://github.com/actions/checkout`
+          ].join('\n'));
+        }
+      }
+
       throw new Error([
         `Cannot detect changed files for --only-changed mode:`,
         `git ${command}`,
@@ -42,4 +55,4 @@ export async function detectChangedTestFiles(baseCommit: string, configDir: stri
   const trackedFilesWithChanges = gitFileList(`diff ${baseCommit} --name-only`).map(file => path.join(gitRoot, file));
 
   return new Set(affectedTestFiles([...untrackedFiles, ...trackedFilesWithChanges]));
-}
\ No newline at end of file
+}
diff --git a/packages/playwright/src/runner/watchMode.ts b/packages/playwright/src/runner/watchMode.ts
index 709e39100b118..6b3c7b405db34 100644
--- a/packages/playwright/src/runner/watchMode.ts
+++ b/packages/playwright/src/runner/watchMode.ts
@@ -14,165 +14,202 @@
  * limitations under the License.
  */
 
+import fs from 'fs';
+import path from 'path';
 import readline from 'readline';
-import { createGuid, getPackageManagerExecCommand, ManualPromise } from 'playwright-core/lib/utils';
-import type { FullConfigInternal, FullProjectInternal } from '../common/config';
-import { createFileMatcher, createFileMatcherFromArguments } from '../util';
-import type { Matcher } from '../util';
-import { TestRun, createTaskRunnerForWatch, createTaskRunnerForWatchSetup } from './tasks';
-import { buildProjectsClosure, filterProjects } from './projectUtils';
-import { collectAffectedTestFiles } from '../transform/compilationCache';
-import type { FullResult } from '../../types/testReporter';
-import { chokidar } from '../utilsBundle';
-import type { FSWatcher as CFSWatcher } from 'chokidar';
-import { colors } from 'playwright-core/lib/utilsBundle';
-import { enquirer } from '../utilsBundle';
-import { separator } from '../reporters/base';
+import { EventEmitter } from 'stream';
+
 import { PlaywrightServer } from 'playwright-core/lib/remote/playwrightServer';
-import ListReporter from '../reporters/list';
-
-class FSWatcher {
-  private _dirtyTestFiles = new Map<FullProjectInternal, Set<string>>();
-  private _notifyDirtyFiles: (() => void) | undefined;
-  private _watcher: CFSWatcher | undefined;
-  private _timer: NodeJS.Timeout | undefined;
-
-  async update(config: FullConfigInternal) {
-    const commandLineFileMatcher = config.cliArgs.length ? createFileMatcherFromArguments(config.cliArgs) : () => true;
-    const projects = filterProjects(config.projects, config.cliProjectFilter);
-    const projectClosure = buildProjectsClosure(projects);
-    const projectFilters = new Map<FullProjectInternal, Matcher>();
-    for (const [project, type] of projectClosure) {
-      const testMatch = createFileMatcher(project.project.testMatch);
-      const testIgnore = createFileMatcher(project.project.testIgnore);
-      projectFilters.set(project, file => {
-        if (!file.startsWith(project.project.testDir) || !testMatch(file) || testIgnore(file))
-          return false;
-        return type === 'dependency' || commandLineFileMatcher(file);
-      });
-    }
+import { ManualPromise, createGuid, eventsHelper, getPackageManagerExecCommand } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
 
-    if (this._timer)
-      clearTimeout(this._timer);
-    if (this._watcher)
-      await this._watcher.close();
+import { separator, terminalScreen } from '../reporters/base';
+import { enquirer } from '../utilsBundle';
+import { TestServerDispatcher } from './testServer';
+import { TeleSuiteUpdater } from '../isomorphic/teleSuiteUpdater';
+import { TestServerConnection  } from '../isomorphic/testServerConnection';
+import { stripAnsiEscapes } from '../util';
+import { codeFrameColumns } from '../transform/babelBundle';
 
-    this._watcher = chokidar.watch([...projectClosure.keys()].map(p => p.project.testDir), { ignoreInitial: true }).on('all', async (event, file) => {
-      if (event !== 'add' && event !== 'change')
-        return;
+import type * as reporterTypes from '../../types/testReporter';
+import type { ConfigLocation } from '../common/config';
+import type { TestServerTransport } from '../isomorphic/testServerConnection';
 
-      const testFiles = new Set<string>();
-      collectAffectedTestFiles(file, testFiles);
-      const testFileArray = [...testFiles];
-
-      let hasMatches = false;
-      for (const [project, filter] of projectFilters) {
-        const filteredFiles = testFileArray.filter(filter);
-        if (!filteredFiles.length)
-          continue;
-        let set = this._dirtyTestFiles.get(project);
-        if (!set) {
-          set = new Set();
-          this._dirtyTestFiles.set(project, set);
-        }
-        filteredFiles.map(f => set!.add(f));
-        hasMatches = true;
-      }
+/* eslint-disable no-restricted-properties */
 
-      if (!hasMatches)
-        return;
+class InMemoryTransport extends EventEmitter implements TestServerTransport {
+  public readonly _send: (data: string) => void;
 
-      if (this._timer)
-        clearTimeout(this._timer);
-      this._timer = setTimeout(() => {
-        this._notifyDirtyFiles?.();
-      }, 250);
-    });
+  constructor(send: (data: any) => void) {
+    super();
+    this._send = send;
+  }
 
+  close() {
+    this.emit('close');
   }
 
-  async onDirtyTestFiles(): Promise<void> {
-    if (this._dirtyTestFiles.size)
-      return;
-    await new Promise<void>(f => this._notifyDirtyFiles = f);
+  onclose(listener: () => void): void {
+    this.on('close', listener);
+  }
+
+  onerror(listener: () => void): void {
+    // no-op to fulfil the interface, the user of InMemoryTransport doesn't emit any errors.
   }
 
-  takeDirtyTestFiles(): Map<FullProjectInternal, Set<string>> {
-    const result = this._dirtyTestFiles;
-    this._dirtyTestFiles = new Map();
-    return result;
+  onmessage(listener: (message: string) => void): void {
+    this.on('message', listener);
   }
+
+  onopen(listener: () => void): void {
+    this.on('open', listener);
+  }
+
+  send(data: string): void {
+    this._send(data);
+  }
+}
+
+interface WatchModeOptions {
+  files?: string[];
+  projects?: string[];
+  grep?: string;
 }
 
-export async function runWatchModeLoop(config: FullConfigInternal): Promise<FullResult['status']> {
-  // Reset the settings that don't apply to watch.
-  config.cliPassWithNoTests = true;
-  for (const p of config.projects)
-    p.project.retries = 0;
-
-  // Perform global setup.
-  const testRun = new TestRun(config);
-  const taskRunner = createTaskRunnerForWatchSetup(config, [new ListReporter()]);
-  taskRunner.reporter.onConfigure(config.config);
-  const { status, cleanup: globalCleanup } = await taskRunner.runDeferCleanup(testRun, 0);
-  if (status !== 'passed')
-    await globalCleanup();
-  await taskRunner.reporter.onEnd({ status });
-  await taskRunner.reporter.onExit();
-  if (status !== 'passed')
-    return status;
-
-  // Prepare projects that will be watched, set up watcher.
-  const failedTestIdCollector = new Set<string>();
-  const originalWorkers = config.config.workers;
-  const fsWatcher = new FSWatcher();
-  await fsWatcher.update(config);
-
-  let lastRun: { type: 'changed' | 'regular' | 'failed', failedTestIds?: Set<string>, dirtyTestFiles?: Map<FullProjectInternal, Set<string>> } = { type: 'regular' };
-  let result: FullResult['status'] = 'passed';
-
-  // Enter the watch loop.
-  await runTests(config, failedTestIdCollector);
+export async function runWatchModeLoop(configLocation: ConfigLocation, initialOptions: WatchModeOptions): Promise<reporterTypes.FullResult['status']> {
+  const options: WatchModeOptions = { ...initialOptions };
+  let bufferMode = false;
+
+  const testServerDispatcher = new TestServerDispatcher(configLocation, {});
+  const transport = new InMemoryTransport(
+      async data => {
+        const { id, method, params } = JSON.parse(data);
+        try {
+          const result = await testServerDispatcher.transport.dispatch(method, params);
+          transport.emit('message', JSON.stringify({ id, result }));
+        } catch (e) {
+          transport.emit('message', JSON.stringify({ id, error: String(e) }));
+        }
+      }
+  );
+  testServerDispatcher.transport.sendEvent = (method, params) => {
+    transport.emit('message', JSON.stringify({ method, params }));
+  };
+  const testServerConnection = new TestServerConnection(transport);
+  transport.emit('open');
+
+  const teleSuiteUpdater = new TeleSuiteUpdater({ pathSeparator: path.sep, onUpdate() { } });
+
+  const dirtyTestFiles = new Set<string>();
+  const dirtyTestIds = new Set<string>();
+  let onDirtyTests = new ManualPromise<'changed'>();
+
+  let queue = Promise.resolve();
+  const changedFiles = new Set<string>();
+  testServerConnection.onTestFilesChanged(({ testFiles }) => {
+    testFiles.forEach(file => changedFiles.add(file));
+
+    queue = queue.then(async () => {
+      if (changedFiles.size === 0)
+        return;
+
+      const { report } = await testServerConnection.listTests({ locations: options.files, projects: options.projects, grep: options.grep });
+      teleSuiteUpdater.processListReport(report);
+
+      for (const test of teleSuiteUpdater.rootSuite!.allTests()) {
+        if (changedFiles.has(test.location.file)) {
+          dirtyTestFiles.add(test.location.file);
+          dirtyTestIds.add(test.id);
+        }
+      }
+      changedFiles.clear();
+
+      if (dirtyTestIds.size > 0) {
+        onDirtyTests.resolve('changed');
+        onDirtyTests = new ManualPromise();
+      }
+    });
+  });
+  testServerConnection.onReport(report => teleSuiteUpdater.processTestReportEvent(report));
+  testServerConnection.onRecoverFromStepError(({ stepId, message, location }) => {
+    process.stdout.write(`\nTest error occurred.\n`);
+    process.stdout.write('\n' + createErrorCodeframe(message, location) + '\n');
+    process.stdout.write(`\n${colors.dim('Try recovering from the error. Press')} ${colors.bold('c')} ${colors.dim('to continue or')} ${colors.bold('t')} ${colors.dim('to throw the error')}\n`);
+    readKeyPress(text => {
+      if (text === 'c') {
+        process.stdout.write(`\n${colors.dim('Continuing after recovery...')}\n`);
+        testServerConnection.resumeAfterStepError({ stepId, status: 'recovered', value: undefined }).catch(() => {});
+      } else if (text === 't') {
+        process.stdout.write(`\n${colors.dim('Throwing error...')}\n`);
+        testServerConnection.resumeAfterStepError({ stepId, status: 'failed' }).catch(() => {});
+      }
+      return text;
+    });
+  });
+
+  await testServerConnection.initialize({
+    interceptStdio: false,
+    watchTestDirs: true,
+    populateDependenciesOnList: true,
+    recoverFromStepErrors: !process.env.PWTEST_RECOVERY_DISABLED,
+  });
+  await testServerConnection.runGlobalSetup({});
+
+  const { report } = await testServerConnection.listTests({});
+  teleSuiteUpdater.processListReport(report);
+
+  const projectNames = teleSuiteUpdater.rootSuite!.suites.map(s => s.title);
+
+  let lastRun: { type: 'changed' | 'regular' | 'failed', failedTestIds?: string[], dirtyTestIds?: string[] } = { type: 'regular' };
+  let result: reporterTypes.FullResult['status'] = 'passed';
 
   while (true) {
-    printPrompt();
-    const readCommandPromise = readCommand();
-    await Promise.race([
-      fsWatcher.onDirtyTestFiles(),
-      readCommandPromise,
+    if (bufferMode)
+      printBufferPrompt(dirtyTestFiles, teleSuiteUpdater.config!.rootDir);
+    else
+      printPrompt();
+
+    const waitForCommand = readCommand();
+    const command = await Promise.race([
+      onDirtyTests,
+      waitForCommand.result,
     ]);
-    if (!readCommandPromise.isDone())
-      readCommandPromise.resolve('changed');
+    if (command === 'changed')
+      waitForCommand.dispose();
+    if (bufferMode && command === 'changed')
+      continue;
 
-    const command = await readCommandPromise;
+    const shouldRunChangedFiles = bufferMode ? command === 'run' : command === 'changed';
+    if (shouldRunChangedFiles) {
+      if (dirtyTestIds.size === 0)
+        continue;
 
-    if (command === 'changed') {
-      const dirtyTestFiles = fsWatcher.takeDirtyTestFiles();
-      // Resolve files that depend on the changed files.
-      await runChangedTests(config, failedTestIdCollector, dirtyTestFiles);
-      lastRun = { type: 'changed', dirtyTestFiles };
+      const testIds = [...dirtyTestIds];
+      dirtyTestIds.clear();
+      dirtyTestFiles.clear();
+      await runTests(options, testServerConnection, { testIds, title: 'files changed' });
+      lastRun = { type: 'changed', dirtyTestIds: testIds };
       continue;
     }
 
     if (command === 'run') {
       // All means reset filters.
-      await runTests(config, failedTestIdCollector);
+      await runTests(options, testServerConnection);
       lastRun = { type: 'regular' };
       continue;
     }
 
     if (command === 'project') {
-      const { projectNames } = await enquirer.prompt<{ projectNames: string[] }>({
+      const { selectedProjects } = await enquirer.prompt<{ selectedProjects: string[] }>({
         type: 'multiselect',
-        name: 'projectNames',
+        name: 'selectedProjects',
         message: 'Select projects',
-        choices: config.projects.map(p => ({ name: p.project.name })),
-      }).catch(() => ({ projectNames: null }));
-      if (!projectNames)
+        choices: projectNames,
+      }).catch(() => ({ selectedProjects: null }));
+      if (!selectedProjects)
         continue;
-      config.cliProjectFilter = projectNames.length ? projectNames : undefined;
-      await fsWatcher.update(config);
-      await runTests(config, failedTestIdCollector);
+      options.projects = selectedProjects.length ? selectedProjects : undefined;
+      await runTests(options, testServerConnection);
       lastRun = { type: 'regular' };
       continue;
     }
@@ -186,11 +223,10 @@ export async function runWatchModeLoop(config: FullConfigInternal): Promise<Full
       if (filePattern === null)
         continue;
       if (filePattern.trim())
-        config.cliArgs = filePattern.split(' ');
+        options.files = filePattern.split(' ');
       else
-        config.cliArgs = [];
-      await fsWatcher.update(config);
-      await runTests(config, failedTestIdCollector);
+        options.files = undefined;
+      await runTests(options, testServerConnection);
       lastRun = { type: 'regular' };
       continue;
     }
@@ -204,40 +240,40 @@ export async function runWatchModeLoop(config: FullConfigInternal): Promise<Full
       if (testPattern === null)
         continue;
       if (testPattern.trim())
-        config.cliGrep = testPattern;
+        options.grep = testPattern;
       else
-        config.cliGrep = undefined;
-      await fsWatcher.update(config);
-      await runTests(config, failedTestIdCollector);
+        options.grep = undefined;
+      await runTests(options, testServerConnection);
       lastRun = { type: 'regular' };
       continue;
     }
 
     if (command === 'failed') {
-      config.testIdMatcher = id => failedTestIdCollector.has(id);
-      const failedTestIds = new Set(failedTestIdCollector);
-      await runTests(config, failedTestIdCollector, { title: 'running failed tests' });
-      config.testIdMatcher = undefined;
+      const failedTestIds = teleSuiteUpdater.rootSuite!.allTests().filter(t => !t.ok()).map(t => t.id);
+      await runTests({}, testServerConnection, { title: 'running failed tests', testIds: failedTestIds });
       lastRun = { type: 'failed', failedTestIds };
       continue;
     }
 
     if (command === 'repeat') {
       if (lastRun.type === 'regular') {
-        await runTests(config, failedTestIdCollector, { title: 're-running tests' });
+        await runTests(options, testServerConnection, { title: 're-running tests' });
         continue;
       } else if (lastRun.type === 'changed') {
-        await runChangedTests(config, failedTestIdCollector, lastRun.dirtyTestFiles!, 're-running tests');
+        await runTests(options, testServerConnection, { title: 're-running tests', testIds: lastRun.dirtyTestIds });
       } else if (lastRun.type === 'failed') {
-        config.testIdMatcher = id => lastRun.failedTestIds!.has(id);
-        await runTests(config, failedTestIdCollector, { title: 're-running tests' });
-        config.testIdMatcher = undefined;
+        await runTests({}, testServerConnection, { title: 're-running tests', testIds: lastRun.failedTestIds });
       }
       continue;
     }
 
     if (command === 'toggle-show-browser') {
-      await toggleShowBrowser(config, originalWorkers);
+      await toggleShowBrowser();
+      continue;
+    }
+
+    if (command === 'toggle-buffer-mode') {
+      bufferMode = !bufferMode;
       continue;
     }
 
@@ -250,96 +286,78 @@ export async function runWatchModeLoop(config: FullConfigInternal): Promise<Full
     }
   }
 
-  const cleanupStatus = await globalCleanup();
-  return result === 'passed' ? cleanupStatus : result;
-}
-
-async function runChangedTests(config: FullConfigInternal, failedTestIdCollector: Set<string>, filesByProject: Map<FullProjectInternal, Set<string>>, title?: string) {
-  const testFiles = new Set<string>();
-  for (const files of filesByProject.values())
-    files.forEach(f => testFiles.add(f));
-
-  // Collect all the affected projects, follow project dependencies.
-  // Prepare to exclude all the projects that do not depend on this file, as if they did not exist.
-  const projects = filterProjects(config.projects, config.cliProjectFilter);
-  const projectClosure = buildProjectsClosure(projects);
-  const affectedProjects = affectedProjectsClosure([...projectClosure.keys()], [...filesByProject.keys()]);
-  const affectsAnyDependency = [...affectedProjects].some(p => projectClosure.get(p) === 'dependency');
-
-  // If there are affected dependency projects, do the full run, respect the original CLI.
-  // if there are no affected dependency projects, intersect CLI with dirty files
-  const additionalFileMatcher = affectsAnyDependency ? () => true : (file: string) => testFiles.has(file);
-  await runTests(config, failedTestIdCollector, { additionalFileMatcher, title: title || 'files changed' });
-}
-
-async function runTests(config: FullConfigInternal, failedTestIdCollector: Set<string>, options?: {
-    projectsToIgnore?: Set<FullProjectInternal>,
-    additionalFileMatcher?: Matcher,
-    title?: string,
-  }) {
-  printConfiguration(config, options?.title);
-  const taskRunner = createTaskRunnerForWatch(config, [new ListReporter()], options?.additionalFileMatcher);
-  const testRun = new TestRun(config);
-  taskRunner.reporter.onConfigure(config.config);
-  const taskStatus = await taskRunner.run(testRun, 0);
-  let status: FullResult['status'] = 'passed';
-
-  let hasFailedTests = false;
-  for (const test of testRun.rootSuite?.allTests() || []) {
-    if (test.outcome() === 'unexpected') {
-      failedTestIdCollector.add(test.id);
-      hasFailedTests = true;
-    } else {
-      failedTestIdCollector.delete(test.id);
-    }
-  }
+  const teardown = await testServerConnection.runGlobalTeardown({});
 
-  if (testRun.failureTracker.hasWorkerErrors() || hasFailedTests)
-    status = 'failed';
-  if (status === 'passed' && taskStatus !== 'passed')
-    status = taskStatus;
-  await taskRunner.reporter.onEnd({ status });
-  await taskRunner.reporter.onExit();
+  return result === 'passed' ? teardown.status : result;
 }
 
-function affectedProjectsClosure(projectClosure: FullProjectInternal[], affected: FullProjectInternal[]): Set<FullProjectInternal> {
-  const result = new Set<FullProjectInternal>(affected);
-  for (let i = 0; i < projectClosure.length; ++i) {
-    for (const p of projectClosure) {
-      for (const dep of p.deps) {
-        if (result.has(dep))
-          result.add(p);
-      }
-      if (p.teardown && result.has(p.teardown))
-        result.add(p);
-    }
-  }
-  return result;
-}
+function readKeyPress<T extends string>(handler: (text: string, key: any) => T | undefined): { dispose(): void; result: Promise<T> } {
+  const promise = new ManualPromise<T>();
 
-function readCommand(): ManualPromise<Command> {
-  const result = new ManualPromise<Command>();
   const rl = readline.createInterface({ input: process.stdin, escapeCodeTimeout: 50 });
   readline.emitKeypressEvents(process.stdin, rl);
   if (process.stdin.isTTY)
     process.stdin.setRawMode(true);
 
-  const handler = (text: string, key: any) => {
-    if (text === '\x03' || text === '\x1B' || (key && key.name === 'escape') || (key && key.ctrl && key.name === 'c')) {
-      result.resolve('interrupted');
-      return;
+  const listener = eventsHelper.addEventListener(process.stdin, 'keypress', (text: string, key: any) => {
+    const result = handler(text, key);
+    if (result)
+      promise.resolve(result);
+  });
+
+  const dispose = () => {
+    eventsHelper.removeEventListeners([listener]);
+    rl.close();
+    if (process.stdin.isTTY)
+      process.stdin.setRawMode(false);
+  };
+
+  void promise.finally(dispose);
+
+  return { result: promise, dispose };
+}
+
+const isInterrupt = (text: string, key: any) => text === '\x03' || text === '\x1B' || (key && key.name === 'escape') || (key && key.ctrl && key.name === 'c');
+
+async function runTests(watchOptions: WatchModeOptions, testServerConnection: TestServerConnection, options?: {
+    title?: string,
+    testIds?: string[],
+  }) {
+  printConfiguration(watchOptions, options?.title);
+
+  const waitForDone = readKeyPress((text: string, key: any) => {
+    if (isInterrupt(text, key)) {
+      testServerConnection.stopTestsNoReply({});
+      return 'done';
     }
+  });
+
+  await testServerConnection.runTests({
+    grep: watchOptions.grep,
+    testIds: options?.testIds,
+    locations: watchOptions?.files,
+    projects: watchOptions.projects,
+    connectWsEndpoint,
+    reuseContext: connectWsEndpoint ? true : undefined,
+    workers: connectWsEndpoint ? 1 : undefined,
+    headed: connectWsEndpoint ? true : undefined,
+  }).finally(() => waitForDone.dispose());
+}
+
+function readCommand() {
+  return readKeyPress<Command>((text: string, key: any) => {
+    if (isInterrupt(text, key))
+      return 'interrupted';
     if (process.platform !== 'win32' && key && key.ctrl && key.name === 'z') {
       process.kill(process.ppid, 'SIGTSTP');
       process.kill(process.pid, 'SIGTSTP');
     }
     const name = key?.name;
-    if (name === 'q') {
-      result.resolve('exit');
-      return;
-    }
+    if (name === 'q')
+      return 'exit';
+
     if (name === 'h') {
-      process.stdout.write(`${separator()}
+      process.stdout.write(`${separator(terminalScreen)}
 Run tests
   ${colors.bold('enter')}    ${colors.dim('run tests')}
   ${colors.bold('f')}        ${colors.dim('run failed tests')}
@@ -351,85 +369,109 @@ Change settings
   ${colors.bold('p')}        ${colors.dim('set file filter')}
   ${colors.bold('t')}        ${colors.dim('set title filter')}
   ${colors.bold('s')}        ${colors.dim('toggle show & reuse the browser')}
+  ${colors.bold('b')}        ${colors.dim('toggle buffer mode')}
 `);
       return;
     }
 
     switch (name) {
-      case 'return': result.resolve('run'); break;
-      case 'r': result.resolve('repeat'); break;
-      case 'c': result.resolve('project'); break;
-      case 'p': result.resolve('file'); break;
-      case 't': result.resolve('grep'); break;
-      case 'f': result.resolve('failed'); break;
-      case 's': result.resolve('toggle-show-browser'); break;
+      case 'return': return 'run';
+      case 'r': return 'repeat';
+      case 'c': return 'project';
+      case 'p': return 'file';
+      case 't': return 'grep';
+      case 'f': return 'failed';
+      case 's': return 'toggle-show-browser';
+      case 'b': return 'toggle-buffer-mode';
     }
-  };
-
-  process.stdin.on('keypress', handler);
-  void result.finally(() => {
-    process.stdin.off('keypress', handler);
-    rl.close();
-    if (process.stdin.isTTY)
-      process.stdin.setRawMode(false);
   });
-  return result;
 }
 
 let showBrowserServer: PlaywrightServer | undefined;
-let seq = 0;
+let connectWsEndpoint: string | undefined = undefined;
+let seq = 1;
 
-function printConfiguration(config: FullConfigInternal, title?: string) {
+function printConfiguration(options: WatchModeOptions, title?: string) {
   const packageManagerCommand = getPackageManagerExecCommand();
   const tokens: string[] = [];
   tokens.push(`${packageManagerCommand} playwright test`);
-  tokens.push(...(config.cliProjectFilter || [])?.map(p => colors.blue(`--project ${p}`)));
-  if (config.cliGrep)
-    tokens.push(colors.red(`--grep ${config.cliGrep}`));
-  if (config.cliArgs)
-    tokens.push(...config.cliArgs.map(a => colors.bold(a)));
+  if (options.projects)
+    tokens.push(...options.projects.map(p => colors.blue(`--project ${p}`)));
+  if (options.grep)
+    tokens.push(colors.red(`--grep ${options.grep}`));
+  if (options.files)
+    tokens.push(...options.files.map(a => colors.bold(a)));
   if (title)
     tokens.push(colors.dim(`(${title})`));
-  if (seq)
-    tokens.push(colors.dim(`#${seq}`));
-  ++seq;
+  tokens.push(colors.dim(`#${seq++}`));
   const lines: string[] = [];
-  const sep = separator();
+  const sep = separator(terminalScreen);
   lines.push('\x1Bc' + sep);
   lines.push(`${tokens.join(' ')}`);
   lines.push(`${colors.dim('Show & reuse browser:')} ${colors.bold(showBrowserServer ? 'on' : 'off')}`);
   process.stdout.write(lines.join('\n'));
 }
 
+function printBufferPrompt(dirtyTestFiles: Set<string>, rootDir: string) {
+  const sep = separator(terminalScreen);
+  process.stdout.write('\x1Bc');
+  process.stdout.write(`${sep}\n`);
+
+  if (dirtyTestFiles.size === 0) {
+    process.stdout.write(`${colors.dim('Waiting for file changes. Press')} ${colors.bold('q')} ${colors.dim('to quit or')} ${colors.bold('h')} ${colors.dim('for more options.')}\n\n`);
+    return;
+  }
+
+  process.stdout.write(`${colors.dim(`${dirtyTestFiles.size} test ${dirtyTestFiles.size === 1 ? 'file' : 'files'} changed:`)}\n\n`);
+  for (const file of dirtyTestFiles)
+    process.stdout.write(` · ${path.relative(rootDir, file)}\n`);
+  process.stdout.write(`\n${colors.dim(`Press`)} ${colors.bold('enter')} ${colors.dim('to run')}, ${colors.bold('q')} ${colors.dim('to quit or')} ${colors.bold('h')} ${colors.dim('for more options.')}\n\n`);
+}
+
 function printPrompt() {
-  const sep = separator();
+  const sep = separator(terminalScreen);
   process.stdout.write(`
 ${sep}
 ${colors.dim('Waiting for file changes. Press')} ${colors.bold('enter')} ${colors.dim('to run tests')}, ${colors.bold('q')} ${colors.dim('to quit or')} ${colors.bold('h')} ${colors.dim('for more options.')}
 `);
 }
 
-async function toggleShowBrowser(config: FullConfigInternal, originalWorkers: number) {
+async function toggleShowBrowser() {
   if (!showBrowserServer) {
-    config.config.workers = 1;
     showBrowserServer = new PlaywrightServer({ mode: 'extension', path: '/' + createGuid(), maxConnections: 1 });
-    const wsEndpoint = await showBrowserServer.listen();
-    config.configCLIOverrides.use = {
-      ...config.configCLIOverrides.use,
-      _optionContextReuseMode: 'when-possible',
-      _optionConnectOptions: { wsEndpoint },
-    };
+    connectWsEndpoint = await showBrowserServer.listen();
     process.stdout.write(`${colors.dim('Show & reuse browser:')} ${colors.bold('on')}\n`);
   } else {
-    config.config.workers = originalWorkers;
-    if (config.configCLIOverrides.use) {
-      delete config.configCLIOverrides.use._optionContextReuseMode;
-      delete config.configCLIOverrides.use._optionConnectOptions;
-    }
     await showBrowserServer?.close();
     showBrowserServer = undefined;
+    connectWsEndpoint = undefined;
     process.stdout.write(`${colors.dim('Show & reuse browser:')} ${colors.bold('off')}\n`);
   }
 }
 
-type Command = 'run' | 'failed' | 'repeat' | 'changed' | 'project' | 'file' | 'grep' | 'exit' | 'interrupted' | 'toggle-show-browser';
+type Command = 'run' | 'failed' | 'repeat' | 'changed' | 'project' | 'file' | 'grep' | 'exit' | 'interrupted' | 'toggle-show-browser' | 'toggle-buffer-mode';
+
+function createErrorCodeframe(message: string, location: reporterTypes.Location) {
+  let source: string;
+  try {
+    source = fs.readFileSync(location.file, 'utf-8') + '\n//';
+  } catch (e) {
+    return;
+  }
+
+  return codeFrameColumns(
+      source,
+      {
+        start: {
+          line: location.line,
+          column: location.column,
+        },
+      },
+      {
+        highlightCode: true,
+        linesAbove: 5,
+        linesBelow: 5,
+        message: stripAnsiEscapes(message).split('\n')[0] || undefined,
+      }
+  );
+}
diff --git a/packages/playwright/src/runner/workerHost.ts b/packages/playwright/src/runner/workerHost.ts
index c9029aaff0f43..3879971ef0d1f 100644
--- a/packages/playwright/src/runner/workerHost.ts
+++ b/packages/playwright/src/runner/workerHost.ts
@@ -16,12 +16,17 @@
 
 import fs from 'fs';
 import path from 'path';
-import type { TestGroup } from './testGroups';
-import { stdioChunkToParams } from '../common/ipc';
-import type { RunPayload, SerializedConfig, WorkerInitParams } from '../common/ipc';
+
+import { removeFolders } from 'playwright-core/lib/utils';
+
 import { ProcessHost } from './processHost';
+import { stdioChunkToParams } from '../common/ipc';
 import { artifactsFolderName } from '../isomorphic/folders';
-import { removeFolders } from 'playwright-core/lib/utils';
+
+import type { TestGroup } from './testGroups';
+import type { RunPayload, SerializedConfig, WorkerInitParams } from '../common/ipc';
+import type { RecoverFromStepErrorResult } from '@testIsomorphic/testServerInterface';
+
 
 let lastWorkerIndex = 0;
 
@@ -32,12 +37,12 @@ export class WorkerHost extends ProcessHost {
   private _params: WorkerInitParams;
   private _didFail = false;
 
-  constructor(testGroup: TestGroup, parallelIndex: number, config: SerializedConfig, extraEnv: Record<string, string | undefined>, outputDir: string) {
+  constructor(testGroup: TestGroup, parallelIndex: number, config: SerializedConfig, recoverFromStepErrors: boolean, extraEnv: Record<string, string | undefined>, outputDir: string) {
     const workerIndex = lastWorkerIndex++;
     super(require.resolve('../worker/workerMain.js'), `worker-${workerIndex}`, {
       ...extraEnv,
       FORCE_COLOR: '1',
-      DEBUG_COLORS: '1',
+      DEBUG_COLORS: process.env.DEBUG_COLORS === undefined ? '1' : process.env.DEBUG_COLORS,
     });
     this.workerIndex = workerIndex;
     this.parallelIndex = parallelIndex;
@@ -49,7 +54,8 @@ export class WorkerHost extends ProcessHost {
       repeatEachIndex: testGroup.repeatEachIndex,
       projectId: testGroup.projectId,
       config,
-      artifactsDir: path.join(outputDir, artifactsFolderName(workerIndex))
+      artifactsDir: path.join(outputDir, artifactsFolderName(workerIndex)),
+      recoverFromStepErrors,
     };
   }
 
@@ -75,10 +81,18 @@ export class WorkerHost extends ProcessHost {
     this.sendMessageNoReply({ method: 'runTestGroup', params: runPayload });
   }
 
+  resumeAfterStepError(result: RecoverFromStepErrorResult) {
+    this.sendMessageNoReply({ method: 'resumeAfterStepError', params: result });
+  }
+
   hash() {
     return this._hash;
   }
 
+  projectId() {
+    return this._params.projectId;
+  }
+
   didFail() {
     return this._didFail;
   }
diff --git a/packages/playwright/src/third_party/pirates.ts b/packages/playwright/src/third_party/pirates.ts
new file mode 100644
index 0000000000000..26ee803809c03
--- /dev/null
+++ b/packages/playwright/src/third_party/pirates.ts
@@ -0,0 +1,59 @@
+/**
+ *  MIT License
+ *
+ *  Copyright (c) 2016-2018 Ari Porad
+ *  Modifications copyright (c) Microsoft Corporation.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+import Module from 'module';
+import path from 'path';
+
+export function addHook(transformHook: (code: string, filename: string) => string, shouldTransform: (filename: string) => boolean, extensions: string[]) {
+  // This is a shortened and slightly changed version of https://github.com/danez/pirates.
+  //
+  // We cannot use pirates directly due to https://github.com/microsoft/playwright/issues/35812.
+  // If we overwrite the '.cjs', the following code does not run because there is a custom loader defined:
+  // https://github.com/nodejs/node/blob/b1973550e09d5a2a07c70be5de6e3ae4722ad230/lib/internal/modules/esm/translators.js#L397-L403
+  //
+  // Here we rely on the default '.js' loader to handle '.cjs' files.
+  const extensionsToOverwrite = extensions.filter(e => e !== '.cjs');
+  const allSupportedExtensions = new Set(extensions);
+  const loaders = (Module as any)._extensions;
+  const jsLoader = loaders['.js'];
+  for (const extension of extensionsToOverwrite) {
+    const originalLoader = loaders[extension] || jsLoader;
+    function newLoader(this: any, mod: any, filename: string, ...loaderArgs: any[]) {
+      if (allSupportedExtensions.has(path.extname(filename)) && shouldTransform(filename)) {
+        const oldCompile = mod._compile;
+        function newCompile(this: any, code: string, file: string, ...ignoredArgs: any[]) {
+          // Note: we do not pass |args| downstream to make sure "esm modules" loaded through here
+          // are treated as "commonjs", for example for ".mjs" files.
+          // In theory, we should fix this, but it is a breaking change, even for playwright's own tests.
+          mod._compile = oldCompile;
+          return oldCompile.call(this, transformHook(code, filename), file);
+        }
+        mod._compile = newCompile;
+      }
+      originalLoader.call(this, mod, filename, ...loaderArgs);
+    }
+    loaders[extension] = newLoader;
+  }
+}
diff --git a/packages/playwright/src/third_party/tsconfig-loader.ts b/packages/playwright/src/third_party/tsconfig-loader.ts
index d85ff32100bca..653e9ab081d79 100644
--- a/packages/playwright/src/third_party/tsconfig-loader.ts
+++ b/packages/playwright/src/third_party/tsconfig-loader.ts
@@ -24,8 +24,8 @@
 
 /* eslint-disable */
 
-import * as path from 'path';
-import * as fs from 'fs';
+import path from 'path';
+import fs from 'fs';
 import { json5 } from '../utilsBundle';
 
 /**
@@ -52,51 +52,14 @@ export interface LoadedTsConfig {
   allowJs?: boolean;
 }
 
-export interface TsConfigLoaderParams {
-  cwd: string;
-}
-
-export function tsConfigLoader({ cwd, }: TsConfigLoaderParams): LoadedTsConfig[] {
-  const configPath = resolveConfigPath(cwd);
-
-  if (!configPath)
-    return [];
-
-  const references: LoadedTsConfig[] = [];
-  const config = loadTsConfig(configPath, references);
-  return [config, ...references];
-}
-
-function resolveConfigPath(cwd: string): string | undefined {
-  if (fs.statSync(cwd).isFile()) {
-    return path.resolve(cwd);
+export function loadTsConfig(configPath: string): LoadedTsConfig[] {
+  try {
+    const references: LoadedTsConfig[] = [];
+    const config = innerLoadTsConfig(configPath, references);
+    return [config, ...references];
+  } catch (e) {
+    throw new Error(`Failed to load tsconfig file at ${configPath}:\n${e.message}`);
   }
-
-  const configAbsolutePath = walkForTsConfig(cwd);
-  return configAbsolutePath ? path.resolve(configAbsolutePath) : undefined;
-}
-
-export function walkForTsConfig(
-  directory: string,
-  existsSync: (path: string) => boolean = fs.existsSync
-): string | undefined {
-  const tsconfigPath = path.join(directory, "./tsconfig.json");
-  if (existsSync(tsconfigPath)) {
-    return tsconfigPath;
-  }
-  const jsconfigPath = path.join(directory, "./jsconfig.json");
-  if (existsSync(jsconfigPath)) {
-    return jsconfigPath;
-  }
-
-  const parentDirectory = path.join(directory, "../");
-
-  // If we reached the top
-  if (directory === parentDirectory) {
-    return undefined;
-  }
-
-  return walkForTsConfig(parentDirectory, existsSync);
 }
 
 function resolveConfigFile(baseConfigFile: string, referencedConfigFile: string) {
@@ -110,7 +73,7 @@ function resolveConfigFile(baseConfigFile: string, referencedConfigFile: string)
   return resolvedConfigFile;
 }
 
-function loadTsConfig(
+function innerLoadTsConfig(
   configFilePath: string,
   references: LoadedTsConfig[],
   visited = new Map<string, LoadedTsConfig>(),
@@ -134,7 +97,7 @@ function loadTsConfig(
   const extendsArray = Array.isArray(parsedConfig.extends) ? parsedConfig.extends : (parsedConfig.extends ? [parsedConfig.extends] : []);
   for (const extendedConfig of extendsArray) {
     const extendedConfigPath = resolveConfigFile(configFilePath, extendedConfig);
-    const base = loadTsConfig(extendedConfigPath, references, visited);
+    const base = innerLoadTsConfig(extendedConfigPath, references, visited);
     // Retain result instance, so that caching works.
     Object.assign(result, base, { tsConfigPath: configFilePath });
   }
@@ -158,7 +121,7 @@ function loadTsConfig(
   }
 
   for (const ref of parsedConfig.references || [])
-    references.push(loadTsConfig(resolveConfigFile(configFilePath, ref.path), references, visited));
+    references.push(innerLoadTsConfig(resolveConfigFile(configFilePath, ref.path), references, visited));
 
   if (path.basename(configFilePath) === 'jsconfig.json' && result.allowJs === undefined)
     result.allowJs = true;
diff --git a/packages/playwright/src/transform/DEPS.list b/packages/playwright/src/transform/DEPS.list
index d32b89e112076..91c6162c12a90 100644
--- a/packages/playwright/src/transform/DEPS.list
+++ b/packages/playwright/src/transform/DEPS.list
@@ -1,5 +1,6 @@
 [*]
 ../util.ts
 ../utilsBundle.ts
+../third_party/pirates.ts
 ../third_party/tsconfig-loader.ts
 ../common/globals.ts
diff --git a/packages/playwright/src/transform/babelBundle.ts b/packages/playwright/src/transform/babelBundle.ts
index 2806a05aec656..ce61eecc90a66 100644
--- a/packages/playwright/src/transform/babelBundle.ts
+++ b/packages/playwright/src/transform/babelBundle.ts
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-import type { BabelFileResult } from '../../bundles/babel/node_modules/@types/babel__core';
+import type { BabelFileResult, ParseResult } from '../../bundles/babel/node_modules/@types/babel__core';
 export const codeFrameColumns: typeof import('../../bundles/babel/node_modules/@types/babel__code-frame').codeFrameColumns = require('./babelBundleImpl').codeFrameColumns;
 export const declare: typeof import('../../bundles/babel/node_modules/@types/babel__helper-plugin-utils').declare = require('./babelBundleImpl').declare;
 export const types: typeof import('../../bundles/babel/node_modules/@types/babel__core').types = require('./babelBundleImpl').types;
-export const parse: typeof import('../../bundles/babel/node_modules/@babel/parser/typings/babel-parser').parse = require('./babelBundleImpl').parse;
 export const traverse: typeof import('../../bundles/babel/node_modules/@types/babel__traverse').default = require('./babelBundleImpl').traverse;
 export type BabelPlugin = [string, any?];
-export type BabelTransformFunction = (code: string, filename: string, isTypeScript: boolean, isModule: boolean, pluginsPrefix: BabelPlugin[], pluginsSuffix: BabelPlugin[]) => BabelFileResult;
+export type BabelTransformFunction = (code: string, filename: string, isModule: boolean, pluginsPrefix: BabelPlugin[], pluginsSuffix: BabelPlugin[]) => BabelFileResult | null;
 export const babelTransform: BabelTransformFunction = require('./babelBundleImpl').babelTransform;
-export type { NodePath, types as T, PluginObj } from '../../bundles/babel/node_modules/@types/babel__core';
+export type BabelParseFunction = (code: string, filename: string, isModule: boolean) => ParseResult;
+export const babelParse: BabelParseFunction = require('./babelBundleImpl').babelParse;
+export type { NodePath, PluginObj, types as T } from '../../bundles/babel/node_modules/@types/babel__core';
 export type { BabelAPI } from '../../bundles/babel/node_modules/@types/babel__helper-plugin-utils';
diff --git a/packages/playwright/src/transform/compilationCache.ts b/packages/playwright/src/transform/compilationCache.ts
index 060fc717efc5a..87fb7f5654b95 100644
--- a/packages/playwright/src/transform/compilationCache.ts
+++ b/packages/playwright/src/transform/compilationCache.ts
@@ -17,8 +17,9 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { sourceMapSupport } from '../utilsBundle';
+
 import { isWorkerProcess } from '../common/globals';
+import { sourceMapSupport } from '../utilsBundle';
 
 export type MemoryCache = {
   codePath: string;
@@ -64,13 +65,7 @@ const fileDependencies = new Map<string, Set<string>>();
 // Dependencies resolved by the external bundler.
 const externalDependencies = new Map<string, Set<string>>();
 
-let sourceMapSupportInstalled = false;
-
-export function installSourceMapSupportIfNeeded() {
-  if (sourceMapSupportInstalled)
-    return;
-  sourceMapSupportInstalled = true;
-
+export function installSourceMapSupport() {
   Error.stackTraceLimit = 200;
 
   sourceMapSupport.install({
diff --git a/packages/playwright/src/transform/esmLoader.ts b/packages/playwright/src/transform/esmLoader.ts
index dfe6539942783..d32537be5eb12 100644
--- a/packages/playwright/src/transform/esmLoader.ts
+++ b/packages/playwright/src/transform/esmLoader.ts
@@ -16,9 +16,10 @@
 
 import fs from 'fs';
 import url from 'url';
+
 import { addToCompilationCache, currentFileDepsCollector, serializeCompilationCache, startCollectingFileDeps, stopCollectingFileDeps } from './compilationCache';
-import { transformHook, resolveHook, setTransformConfig, shouldTransform } from './transform';
 import { PortTransport } from './portTransport';
+import { resolveHook, setSingleTSConfig, setTransformConfig, shouldTransform, transformHook } from './transform';
 import { fileIsModule } from '../util';
 
 // Node < 18.6: defaultResolve takes 3 arguments.
@@ -39,12 +40,23 @@ async function resolve(specifier: string, context: { parentURL?: string }, defau
   return result;
 }
 
+// non-js files have undefined
+// some js files have null
+// {module/commonjs}-typescript are changed to {module,commonjs} because we handle typescript ourselves
+const kSupportedFormats = new Map([
+  ['commonjs', 'commonjs'],
+  ['module', 'module'],
+  ['commonjs-typescript', 'commonjs'],
+  ['module-typescript', 'module'],
+  [null, null],
+  [undefined, undefined]
+]);
+
 // Node < 18.6: defaultLoad takes 3 arguments.
 // Node >= 18.6: nextLoad from the chain takes 2 arguments.
 async function load(moduleUrl: string, context: { format?: string }, defaultLoad: Function) {
   // Bail out for wasm, json, etc.
-  // non-js files have context.format === undefined
-  if (context.format !== 'commonjs' && context.format !== 'module' && context.format !== undefined)
+  if (!kSupportedFormats.has(context.format))
     return defaultLoad(moduleUrl, context, defaultLoad);
 
   // Bail for built-in modules.
@@ -60,35 +72,37 @@ async function load(moduleUrl: string, context: { format?: string }, defaultLoad
   const transformed = transformHook(code, filename, moduleUrl);
 
   // Flush the source maps to the main thread, so that errors during import() are source-mapped.
-  if (transformed.serializedCache)
-    await transport?.send('pushToCompilationCache', { cache: transformed.serializedCache });
+  if (transformed.serializedCache) {
+    if (legacyWaitForSourceMaps)
+      await transport?.send('pushToCompilationCache', { cache: transformed.serializedCache });
+    else
+      transport?.post('pushToCompilationCache', { cache: transformed.serializedCache });
+  }
 
   // Output format is required, so we determine it manually when unknown.
   // shortCircuit is required by Node >= 18.6 to designate no more loaders should be called.
   return {
-    format: context.format || (fileIsModule(filename) ? 'module' : 'commonjs'),
+    format: kSupportedFormats.get(context.format) || (fileIsModule(filename) ? 'module' : 'commonjs'),
     source: transformed.code,
     shortCircuit: true,
   };
 }
 
 let transport: PortTransport | undefined;
+let legacyWaitForSourceMaps = false;
 
-// Node.js < 20
-function globalPreload(context: { port: MessagePort }) {
-  transport = createTransport(context.port);
-  return `
-    globalThis.__esmLoaderPortPreV20 = port;
-  `;
-}
-
-// Node.js >= 20
 function initialize(data: { port: MessagePort }) {
   transport = createTransport(data?.port);
+  legacyWaitForSourceMaps = !!process.env.PLAYWRIGHT_WAIT_FOR_SOURCE_MAPS;
 }
 
 function createTransport(port: MessagePort) {
   return new PortTransport(port, async (method, params) => {
+    if (method === 'setSingleTSConfig') {
+      setSingleTSConfig(params.tsconfig);
+      return;
+    }
+
     if (method === 'setTransformConfig') {
       setTransformConfig(params.config);
       return;
@@ -115,4 +129,4 @@ function createTransport(port: MessagePort) {
 }
 
 
-module.exports = { resolve, load, globalPreload, initialize };
+module.exports = { initialize, load, resolve };
diff --git a/packages/playwright/src/transform/portTransport.ts b/packages/playwright/src/transform/portTransport.ts
index f99e39f6ceb5a..a0f4819131b33 100644
--- a/packages/playwright/src/transform/portTransport.ts
+++ b/packages/playwright/src/transform/portTransport.ts
@@ -24,11 +24,6 @@ export class PortTransport {
     port.addEventListener('message', async event => {
       const message = event.data;
       const { id, ackId, method, params, result } = message;
-      if (id) {
-        const result = await handler(method, params);
-        this._port.postMessage({ ackId: id, result });
-        return;
-      }
 
       if (ackId) {
         const callback = this._callbacks.get(ackId);
@@ -37,12 +32,20 @@ export class PortTransport {
         callback?.(result);
         return;
       }
+
+      const handlerResult = await handler(method, params);
+      if (id)
+        this._port.postMessage({ ackId: id, result: handlerResult });
     });
     // Make sure to unref **after** adding a 'message' event listener.
     // https://nodejs.org/api/worker_threads.html#portref
     this._resetRef();
   }
 
+  post(method: string, params: any) {
+    this._port.postMessage({ method, params });
+  }
+
   async send(method: string, params: any) {
     return await new Promise<any>(f => {
       const id = ++this._lastId;
diff --git a/packages/playwright/src/transform/transform.ts b/packages/playwright/src/transform/transform.ts
index 2f6431c4f1268..566e0ff119be1 100644
--- a/packages/playwright/src/transform/transform.ts
+++ b/packages/playwright/src/transform/transform.ts
@@ -14,18 +14,24 @@
  * limitations under the License.
  */
 
-import crypto from 'crypto';
+import fs from 'fs';
+import Module from 'module';
 import path from 'path';
 import url from 'url';
-import { sourceMapSupport, pirates } from '../utilsBundle';
+
+import crypto from 'crypto';
+
+import { loadTsConfig } from '../third_party/tsconfig-loader';
+import { createFileMatcher, fileIsModule, resolveImportSpecifierAfterMapping } from '../util';
+import { sourceMapSupport } from '../utilsBundle';
+import { belongsToNodeModules, currentFileDepsCollector, getFromCompilationCache, installSourceMapSupport } from './compilationCache';
+import { addHook } from '../third_party/pirates';
+
+import type { BabelPlugin, BabelTransformFunction } from './babelBundle';
 import type { Location } from '../../types/testReporter';
 import type { LoadedTsConfig } from '../third_party/tsconfig-loader';
-import { tsConfigLoader } from '../third_party/tsconfig-loader';
-import Module from 'module';
-import type { BabelPlugin, BabelTransformFunction } from './babelBundle';
-import { createFileMatcher, fileIsModule, resolveImportSpecifierExtension } from '../util';
 import type { Matcher } from '../util';
-import { getFromCompilationCache, currentFileDepsCollector, belongsToNodeModules, installSourceMapSupportIfNeeded } from './compilationCache';
+
 
 const version = require('../../package.json').version;
 
@@ -57,6 +63,17 @@ export function transformConfig(): TransformConfig {
   return _transformConfig;
 }
 
+let _singleTSConfigPath: string | undefined;
+let _singleTSConfig: ParsedTsConfigData[] | undefined;
+
+export function setSingleTSConfig(value: string | undefined) {
+  _singleTSConfigPath = value;
+}
+
+export function singleTSConfig(): string | undefined {
+  return _singleTSConfigPath;
+}
+
 function validateTsConfig(tsconfig: LoadedTsConfig): ParsedTsConfigData {
   // When no explicit baseUrl is set, resolve paths relative to the tsconfig file.
   // See https://www.typescriptlang.org/tsconfig#paths
@@ -71,12 +88,47 @@ function validateTsConfig(tsconfig: LoadedTsConfig): ParsedTsConfigData {
 }
 
 function loadAndValidateTsconfigsForFile(file: string): ParsedTsConfigData[] {
-  const cwd = path.dirname(file);
-  if (!cachedTSConfigs.has(cwd)) {
-    const loaded = tsConfigLoader({ cwd });
-    cachedTSConfigs.set(cwd, loaded.map(validateTsConfig));
+  if (_singleTSConfigPath && !_singleTSConfig)
+    _singleTSConfig = loadTsConfig(_singleTSConfigPath).map(validateTsConfig);
+  if (_singleTSConfig)
+    return _singleTSConfig;
+  return loadAndValidateTsconfigsForFolder(path.dirname(file));
+}
+
+function loadAndValidateTsconfigsForFolder(folder: string): ParsedTsConfigData[] {
+  const foldersWithConfig: string[] = [];
+  let currentFolder = path.resolve(folder);
+  let result: ParsedTsConfigData[] | undefined;
+  while (true) {
+    const cached = cachedTSConfigs.get(currentFolder);
+    if (cached) {
+      result = cached;
+      break;
+    }
+
+    foldersWithConfig.push(currentFolder);
+
+    for (const name of ['tsconfig.json', 'jsconfig.json']) {
+      const configPath = path.join(currentFolder, name);
+      if (fs.existsSync(configPath)) {
+        const loaded = loadTsConfig(configPath);
+        result = loaded.map(validateTsConfig);
+        break;
+      }
+    }
+    if (result)
+      break;
+
+    const parentFolder = path.resolve(currentFolder, '../');
+    if (currentFolder === parentFolder)
+      break;
+    currentFolder = parentFolder;
   }
-  return cachedTSConfigs.get(cwd)!;
+
+  result = result || [];
+  for (const folder of foldersWithConfig)
+    cachedTSConfigs.set(folder, result);
+  return result;
 }
 
 const pathSeparator = process.platform === 'win32' ? ';' : ':';
@@ -89,8 +141,13 @@ export function resolveHook(filename: string, specifier: string): string | undef
     return;
 
   if (isRelativeSpecifier(specifier))
-    return resolveImportSpecifierExtension(path.resolve(path.dirname(filename), specifier));
+    return resolveImportSpecifierAfterMapping(path.resolve(path.dirname(filename), specifier), false);
 
+  /**
+   * TypeScript discourages path-mapping into node_modules:
+   * https://www.typescriptlang.org/docs/handbook/modules/reference.html#paths-should-not-point-to-monorepo-packages-or-node_modules-packages
+   * However, if path-mapping doesn't yield a result, TypeScript falls back to the default resolution through node_modules.
+   */
   const isTypeScript = filename.endsWith('.ts') || filename.endsWith('.tsx');
   const tsconfigs = loadAndValidateTsconfigsForFile(filename);
   for (const tsconfig of tsconfigs) {
@@ -132,7 +189,7 @@ export function resolveHook(filename: string, specifier: string): string | undef
         if (value.includes('*'))
           candidate = candidate.replace('*', matchedPartOfSpecifier);
         candidate = path.resolve(tsconfig.pathsBase!, candidate);
-        const existing = resolveImportSpecifierExtension(candidate);
+        const existing = resolveImportSpecifierAfterMapping(candidate, true);
         if (existing) {
           longestPrefixLength = keyPrefix.length;
           pathMatchedByLongestPrefix = existing;
@@ -146,7 +203,7 @@ export function resolveHook(filename: string, specifier: string): string | undef
   if (path.isAbsolute(specifier)) {
     // Handle absolute file paths like `import '/path/to/file'`
     // Do not handle module imports like `import 'fs'`
-    return resolveImportSpecifierExtension(specifier);
+    return resolveImportSpecifierAfterMapping(specifier, false);
   }
 }
 
@@ -163,7 +220,6 @@ export function setTransformData(pluginName: string, value: any) {
 }
 
 export function transformHook(originalCode: string, filename: string, moduleUrl?: string): { code: string, serializedCache?: any } {
-  const isTypeScript = filename.endsWith('.ts') || filename.endsWith('.tsx') || filename.endsWith('.mts') || filename.endsWith('.cts');
   const hasPreprocessor =
       process.env.PW_TEST_SOURCE_TRANSFORM &&
       process.env.PW_TEST_SOURCE_TRANSFORM_SCOPE &&
@@ -181,9 +237,10 @@ export function transformHook(originalCode: string, filename: string, moduleUrl?
 
   const { babelTransform }: { babelTransform: BabelTransformFunction } = require('./babelBundle');
   transformData = new Map<string, any>();
-  const { code, map } = babelTransform(originalCode, filename, isTypeScript, !!moduleUrl, pluginsPrologue, pluginsEpilogue);
-  if (!code)
-    return { code: '', serializedCache };
+  const babelResult = babelTransform(originalCode, filename, !!moduleUrl, pluginsPrologue, pluginsEpilogue);
+  if (!babelResult?.code)
+    return { code: originalCode, serializedCache };
+  const { code, map } = babelResult;
   const added = addToCache!(code, map, transformData);
   return { code, serializedCache: added.serializedCache };
 }
@@ -201,33 +258,41 @@ function calculateHash(content: string, filePath: string, isModule: boolean, plu
 }
 
 export async function requireOrImport(file: string) {
-  const revertBabelRequire = installTransform();
+  installTransformIfNeeded();
   const isModule = fileIsModule(file);
-  try {
-    const esmImport = () => eval(`import(${JSON.stringify(url.pathToFileURL(file))})`);
-    if (isModule)
-      return await esmImport();
-    const result = require(file);
-    const depsCollector = currentFileDepsCollector();
-    if (depsCollector) {
-      const module = require.cache[file];
-      if (module)
-        collectCJSDependencies(module, depsCollector);
-    }
-    return result;
-  } finally {
-    revertBabelRequire();
+  const esmImport = () => eval(`import(${JSON.stringify(url.pathToFileURL(file))})`);
+  if (isModule) {
+    return await esmImport().finally(async () => {
+      // Compilation cache, which includes source maps, is populated in a post task.
+      // When importing a module results in an error, the very next access to `error.stack`
+      // will need source maps. To make sure source maps have arrived, we insert a task
+      // that will be processed after compilation cache and guarantee that
+      // source maps are available, before `error.stack` is accessed.
+      await new Promise(resolve => setTimeout(resolve, 0));
+    });
   }
+  const result = require(file);
+  const depsCollector = currentFileDepsCollector();
+  if (depsCollector) {
+    const module = require.cache[file];
+    if (module)
+      collectCJSDependencies(module, depsCollector);
+  }
+  return result;
 }
 
-function installTransform(): () => void {
-  installSourceMapSupportIfNeeded();
+let transformInstalled = false;
 
-  let reverted = false;
+function installTransformIfNeeded() {
+  if (transformInstalled)
+    return;
+  transformInstalled = true;
+
+  installSourceMapSupport();
 
   const originalResolveFilename = (Module as any)._resolveFilename;
   function resolveFilename(this: any, specifier: string, parent: Module, ...rest: any[]) {
-    if (!reverted && parent) {
+    if (parent) {
       const resolved = resolveHook(parent.filename, specifier);
       if (resolved !== undefined)
         specifier = resolved;
@@ -236,17 +301,10 @@ function installTransform(): () => void {
   }
   (Module as any)._resolveFilename = resolveFilename;
 
-  const revertPirates = pirates.addHook((code: string, filename: string) => {
-    if (!shouldTransform(filename))
-      return code;
+  // Hopefully, one day we can migrate to synchronous loader hooks instead, similar to our esmLoader...
+  addHook((code, filename) => {
     return transformHook(code, filename).code;
-  }, { exts: ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.mts', '.cjs', '.cts'] });
-
-  return () => {
-    reverted = true;
-    (Module as any)._resolveFilename = originalResolveFilename;
-    revertPirates();
-  };
+  }, shouldTransform, ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.mts', '.cjs', '.cts']);
 }
 
 const collectCJSDependencies = (module: Module, dependencies: Set<string>) => {
diff --git a/packages/playwright/src/util.ts b/packages/playwright/src/util.ts
index a4ddce7a3b43b..71aab10048afd 100644
--- a/packages/playwright/src/util.ts
+++ b/packages/playwright/src/util.ts
@@ -15,29 +15,33 @@
  */
 
 import fs from 'fs';
-import type { StackFrame } from '@protocol/channels';
-import util from 'util';
 import path from 'path';
 import url from 'url';
-import { debug, mime, minimatch, parseStackTraceLine } from 'playwright-core/lib/utilsBundle';
-import { formatCallLog } from 'playwright-core/lib/utils';
-import type { TestInfoError } from './../types/test';
+import util from 'util';
+
+import { parseStackFrame, sanitizeForFilePath, calculateSha1, isRegExp, isString, stringifyStackFrames } from 'playwright-core/lib/utils';
+import { colors, debug, mime, minimatch } from 'playwright-core/lib/utilsBundle';
+
 import type { Location } from './../types/testReporter';
-import { calculateSha1, isRegExp, isString, sanitizeForFilePath, stringifyStackFrames } from 'playwright-core/lib/utils';
+import type { TestInfoErrorImpl } from './common/ipc';
+import type { StackFrame } from '@protocol/channels';
 import type { RawStack } from 'playwright-core/lib/utils';
+import type { TestCase } from './common/test';
 
 const PLAYWRIGHT_TEST_PATH = path.join(__dirname, '..');
 const PLAYWRIGHT_CORE_PATH = path.dirname(require.resolve('playwright-core/package.json'));
 
-export function filterStackTrace(e: Error): { message: string, stack: string } {
+export function filterStackTrace(e: Error): { message: string, stack: string, cause?: ReturnType<typeof filterStackTrace> } {
   const name = e.name ? e.name + ': ' : '';
+  const cause = e.cause instanceof Error ? filterStackTrace(e.cause) : undefined;
   if (process.env.PWDEBUGIMPL)
-    return { message: name + e.message, stack: e.stack || '' };
+    return { message: name + e.message, stack: e.stack || '', cause };
 
   const stackLines = stringifyStackFrames(filteredStackTrace(e.stack?.split('\n') || []));
   return {
     message: name + e.message,
-    stack: `${name}${e.message}${stackLines.map(line => '\n' + line).join('')}`
+    stack: `${name}${e.message}${stackLines.map(line => '\n' + line).join('')}`,
+    cause,
   };
 }
 
@@ -52,7 +56,7 @@ export function filterStackFile(file: string) {
 export function filteredStackTrace(rawStack: RawStack): StackFrame[] {
   const frames: StackFrame[] = [];
   for (const line of rawStack) {
-    const frame = parseStackTraceLine(line);
+    const frame = parseStackFrame(line, path.sep, !!process.env.PWDEBUGIMPL);
     if (!frame || !frame.file)
       continue;
     if (!filterStackFile(frame.file))
@@ -62,7 +66,7 @@ export function filteredStackTrace(rawStack: RawStack): StackFrame[] {
   return frames;
 }
 
-export function serializeError(error: Error | any): TestInfoError {
+export function serializeError(error: Error | any): TestInfoErrorImpl {
   if (error instanceof Error)
     return filterStackTrace(error);
   return {
@@ -79,6 +83,8 @@ export type TestFileFilter = {
   column: number | null;
 };
 
+export type TestCaseFilter = (test: TestCase) => boolean;
+
 export function createFileFiltersFromArguments(args: string[]): TestFileFilter[] {
   return args.map(arg => {
     const match = /^(.*?):(\d+):?(\d+)?$/.exec(arg);
@@ -144,7 +150,7 @@ export function createTitleMatcher(patterns: RegExp | RegExp[]): Matcher {
   };
 }
 
-export function mergeObjects<A extends object, B extends object, C extends object>(a: A | undefined | void, b: B | undefined | void, c: B | undefined | void): A & B & C {
+export function mergeObjects<A extends object, B extends object, C extends object>(a: A | undefined | void, b: B | undefined | void, c: C | undefined | void): A & B & C {
   const result = { ...a } as any;
   for (const x of [b, c].filter(Boolean)) {
     for (const [name, value] of Object.entries(x as any)) {
@@ -203,8 +209,8 @@ export function addSuffixToFilePath(filePath: string, suffix: string): string {
   return base + suffix + ext;
 }
 
-export function sanitizeFilePathBeforeExtension(filePath: string): string {
-  const ext = path.extname(filePath);
+export function sanitizeFilePathBeforeExtension(filePath: string, ext?: string): string {
+  ext ??= path.extname(filePath);
   const base = filePath.substring(0, filePath.length - ext.length);
   return sanitizeForFilePath(base) + ext;
 }
@@ -221,7 +227,14 @@ export function getContainedPath(parentPath: string, subPath: string = ''): stri
 
 export const debugTest = debug('pw:test');
 
-export const callLogText = formatCallLog;
+export const callLogText = (log: string[] | undefined) => {
+  if (!log || !log.some(l => !!l))
+    return '';
+  return `
+Call log:
+${colors.dim(log.join('\n'))}
+`;
+};
 
 const folderToPackageJsonPath = new Map<string, string>();
 
@@ -255,7 +268,7 @@ export function resolveReporterOutputPath(defaultValue: string, configDir: strin
   return path.resolve(basePath, defaultValue);
 }
 
-export async function normalizeAndSaveAttachment(outputPath: string, name: string, options: { path?: string, body?: string | Buffer, contentType?: string } = {}): Promise<{ name: string; path?: string | undefined; body?: Buffer | undefined; contentType: string; }> {
+export async function normalizeAndSaveAttachment(outputPath: string, name: string, options: { path?: string, body?: string | Buffer, contentType?: string } = {}): Promise<{ name: string; path?: string; body?: Buffer; contentType: string; }> {
   if (options.path === undefined && options.body === undefined)
     return { name, contentType: 'text/plain' };
   if ((options.path !== undefined ? 1 : 0) + (options.body !== undefined ? 1 : 0) !== 1)
@@ -295,8 +308,23 @@ function folderIsModule(folder: string): boolean {
   return require(packageJsonPath).type === 'module';
 }
 
-// This follows the --moduleResolution=bundler strategy from tsc.
-// https://devblogs.microsoft.com/typescript/announcing-typescript-5-0-beta/#moduleresolution-bundler
+const packageJsonMainFieldCache = new Map<string, string | undefined>();
+
+function getMainFieldFromPackageJson(packageJsonPath: string) {
+  if (!packageJsonMainFieldCache.has(packageJsonPath)) {
+    let mainField: string | undefined;
+    try {
+      mainField = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')).main;
+    } catch {
+    }
+    packageJsonMainFieldCache.set(packageJsonPath, mainField);
+  }
+  return packageJsonMainFieldCache.get(packageJsonPath);
+}
+
+// This method performs "file extension subsitution" to find the ts, js or similar source file
+// based on the import specifier, which might or might not have an extension. See TypeScript docs:
+// https://www.typescriptlang.org/docs/handbook/modules/reference.html#file-extension-substitution.
 const kExtLookups = new Map([
   ['.js', ['.jsx', '.ts', '.tsx']],
   ['.jsx', ['.tsx']],
@@ -304,7 +332,7 @@ const kExtLookups = new Map([
   ['.mjs', ['.mts']],
   ['', ['.js', '.ts', '.jsx', '.tsx', '.cjs', '.mjs', '.cts', '.mts']],
 ]);
-export function resolveImportSpecifierExtension(resolved: string): string | undefined {
+function resolveImportSpecifierExtension(resolved: string): string | undefined {
   if (fileExists(resolved))
     return resolved;
 
@@ -318,13 +346,45 @@ export function resolveImportSpecifierExtension(resolved: string): string | unde
     }
     break;  // Do not try '' when a more specific extension like '.jsx' matched.
   }
+}
+
+// This method resolves directory imports and performs "file extension subsitution".
+// It is intended to be called after the path mapping resolution.
+//
+// Directory imports follow the --moduleResolution=bundler strategy from tsc.
+// https://www.typescriptlang.org/docs/handbook/modules/reference.html#directory-modules-index-file-resolution
+// https://www.typescriptlang.org/docs/handbook/modules/reference.html#bundler
+//
+// See also Node.js "folder as module" behavior:
+// https://nodejs.org/dist/latest-v20.x/docs/api/modules.html#folders-as-modules.
+export function resolveImportSpecifierAfterMapping(resolved: string, afterPathMapping: boolean): string | undefined {
+  const resolvedFile = resolveImportSpecifierExtension(resolved);
+  if (resolvedFile)
+    return resolvedFile;
 
   if (dirExists(resolved)) {
+    const packageJsonPath = path.join(resolved, 'package.json');
+
+    if (afterPathMapping) {
+      // Most notably, the module resolution algorithm is not performed after the path mapping.
+      // This means no node_modules lookup or package.json#exports.
+      //
+      // Only the "folder as module" Node.js behavior is respected:
+      //  - consult `package.json#main`;
+      //  - look for `index.js` or similar.
+      const mainField = getMainFieldFromPackageJson(packageJsonPath);
+      const mainFieldResolved = mainField ? resolveImportSpecifierExtension(path.resolve(resolved, mainField)) : undefined;
+      return mainFieldResolved || resolveImportSpecifierExtension(path.join(resolved, 'index'));
+    }
+
     // If we import a package, let Node.js figure out the correct import based on package.json.
-    if (fileExists(path.join(resolved, 'package.json')))
+    // This also covers the "main" field for "folder as module".
+    if (fileExists(packageJsonPath))
       return resolved;
 
-    // Otherwise, try to find a corresponding index file.
+    // Implement the "folder as module" Node.js behavior.
+    // Note that we do not delegate to Node.js, because we support this for ESM as well,
+    // following the TypeScript "bundler" mode.
     const dirImport = path.join(resolved, 'index');
     return resolveImportSpecifierExtension(dirImport);
   }
@@ -334,6 +394,31 @@ function fileExists(resolved: string) {
   return fs.statSync(resolved, { throwIfNoEntry: false })?.isFile();
 }
 
+export async function fileExistsAsync(resolved: string) {
+  try {
+    const stat = await fs.promises.stat(resolved);
+    return stat.isFile();
+  } catch {
+    return false;
+  }
+}
+
 function dirExists(resolved: string) {
   return fs.statSync(resolved, { throwIfNoEntry: false })?.isDirectory();
 }
+
+export async function removeDirAndLogToConsole(dir: string) {
+  try {
+    if (!fs.existsSync(dir))
+      return;
+    // eslint-disable-next-line no-console
+    console.log(`Removing ${await fs.promises.realpath(dir)}`);
+    await fs.promises.rm(dir, { recursive: true, force: true });
+  } catch {
+  }
+}
+
+export const ansiRegex = new RegExp('([\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~])))', 'g');
+export function stripAnsiEscapes(str: string): string {
+  return str.replace(ansiRegex, '');
+}
diff --git a/packages/playwright/src/utilsBundle.ts b/packages/playwright/src/utilsBundle.ts
index 072e16bb037d6..1e61ccc5cae41 100644
--- a/packages/playwright/src/utilsBundle.ts
+++ b/packages/playwright/src/utilsBundle.ts
@@ -15,8 +15,9 @@
  */
 
 export const json5: typeof import('../bundles/utils/node_modules/json5/lib') = require('./utilsBundleImpl').json5;
-export const pirates: typeof import('../bundles/utils/node_modules/pirates') = require('./utilsBundleImpl').pirates;
 export const sourceMapSupport: typeof import('../bundles/utils/node_modules/@types/source-map-support') = require('./utilsBundleImpl').sourceMapSupport;
 export const stoppable: typeof import('../bundles/utils/node_modules/@types/stoppable') = require('./utilsBundleImpl').stoppable;
 export const enquirer: typeof import('../bundles/utils/node_modules/enquirer') = require('./utilsBundleImpl').enquirer;
 export const chokidar: typeof import('../bundles/utils/node_modules/chokidar') = require('./utilsBundleImpl').chokidar;
+export const getEastAsianWidth: typeof import('../bundles/utils/node_modules/get-east-asian-width') = require('./utilsBundleImpl').getEastAsianWidth;
+export type { RawSourceMap } from '../bundles/utils/node_modules/source-map';
diff --git a/packages/playwright/src/worker/DEPS.list b/packages/playwright/src/worker/DEPS.list
index fb352ac3898e3..1532b16c9f37a 100644
--- a/packages/playwright/src/worker/DEPS.list
+++ b/packages/playwright/src/worker/DEPS.list
@@ -3,3 +3,5 @@
 ../transform/
 ../util.ts
 ../utilBundle.ts
+../matchers/**
+../isomorphic/util.ts
diff --git a/packages/playwright/src/worker/fixtureRunner.ts b/packages/playwright/src/worker/fixtureRunner.ts
index 0d94f40631611..6e236b4486e33 100644
--- a/packages/playwright/src/worker/fixtureRunner.ts
+++ b/packages/playwright/src/worker/fixtureRunner.ts
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-import { formatLocation, filterStackFile } from '../util';
-import { ManualPromise } from 'playwright-core/lib/utils';
+import { escapeWithQuotes, ManualPromise } from 'playwright-core/lib/utils';
+
+import { fixtureParameterNames } from '../common/fixtures';
+import { filterStackFile, formatLocation } from '../util';
+
 import type { TestInfoImpl } from './testInfo';
-import { TimeoutManagerError, type FixtureDescription, type RunnableDescription } from './timeoutManager';
-import { fixtureParameterNames, type FixturePool, type FixtureRegistration, type FixtureScope } from '../common/fixtures';
+import type { FixtureDescription, RunnableDescription } from './timeoutManager';
 import type { WorkerInfo } from '../../types/test';
 import type { Location } from '../../types/testReporter';
+import type { FixturePool, FixtureRegistration, FixtureScope } from '../common/fixtures';
 
 class Fixture {
   runner: FixtureRunner;
@@ -32,7 +35,7 @@ class Fixture {
   private _selfTeardownComplete: Promise<void> | undefined;
   private _setupDescription: FixtureDescription;
   private _teardownDescription: FixtureDescription;
-  private _stepInfo: { category: 'fixture', location?: Location } | undefined;
+  private _stepInfo: { title: string, category: 'fixture', location?: Location, group?: string };
   _deps = new Set<Fixture>();
   _usages = new Set<Fixture>();
 
@@ -40,11 +43,12 @@ class Fixture {
     this.runner = runner;
     this.registration = registration;
     this.value = null;
-    const shouldGenerateStep = !this.registration.box && !this.registration.option;
     const isUserFixture = this.registration.location && filterStackFile(this.registration.location.file);
     const title = this.registration.customTitle || this.registration.name;
     const location = isUserFixture ? this.registration.location : undefined;
-    this._stepInfo = shouldGenerateStep ? { category: 'fixture', location } : undefined;
+    this._stepInfo = { title: `Fixture ${escapeWithQuotes(title, '"')}`, category: 'fixture', location };
+    if (this.registration.box)
+      this._stepInfo.group = isUserFixture ? 'configuration' : 'internal';
     this._setupDescription = {
       title,
       phase: 'setup',
@@ -65,12 +69,8 @@ class Fixture {
       return;
     }
 
-    await testInfo._runAsStage({
-      title: `fixture: ${this.registration.name}`,
-      runnable: { ...runnable, fixture: this._setupDescription },
-      stepInfo: this._stepInfo,
-    }, async () => {
-      await this._setupInternal(testInfo);
+    await testInfo._runAsStep(this._stepInfo, async () => {
+      await testInfo._runWithTimeout({ ...runnable, fixture: this._setupDescription }, () => this._setupInternal(testInfo));
     });
   }
 
@@ -125,38 +125,37 @@ class Fixture {
   }
 
   async teardown(testInfo: TestInfoImpl, runnable: RunnableDescription) {
-    await testInfo._runAsStage({
-      title: `fixture: ${this.registration.name}`,
-      runnable: { ...runnable, fixture: this._teardownDescription },
-      stepInfo: this._stepInfo,
-    }, async () => {
-      await this._teardownInternal();
-    });
-  }
-
-  private async _teardownInternal() {
-    if (typeof this.registration.fn !== 'function')
-      return;
     try {
-      if (this._usages.size !== 0) {
-        // TODO: replace with assert.
-        console.error('Internal error: fixture integrity at', this._teardownDescription.title);  // eslint-disable-line no-console
-        this._usages.clear();
-      }
-      if (this._useFuncFinished) {
-        this._useFuncFinished.resolve();
-        this._useFuncFinished = undefined;
-        await this._selfTeardownComplete;
+      const fixtureRunnable = { ...runnable, fixture: this._teardownDescription };
+      // Do not even start the teardown for a fixture that does not have any
+      // time remaining in the time slot. This avoids cascading timeouts.
+      if (!testInfo._timeoutManager.isTimeExhaustedFor(fixtureRunnable)) {
+        await testInfo._runAsStep(this._stepInfo, async () => {
+          await testInfo._runWithTimeout(fixtureRunnable, () => this._teardownInternal());
+        });
       }
     } finally {
-      this._cleanupInstance();
+      // To preserve fixtures integrity, forcefully cleanup fixtures
+      // that cannnot teardown due to a timeout or an error.
+      for (const dep of this._deps)
+        dep._usages.delete(this);
+      this.runner.instanceForId.delete(this.registration.id);
     }
   }
 
-  _cleanupInstance() {
-    for (const dep of this._deps)
-      dep._usages.delete(this);
-    this.runner.instanceForId.delete(this.registration.id);
+  private async _teardownInternal() {
+    if (typeof this.registration.fn !== 'function')
+      return;
+    if (this._usages.size !== 0) {
+      // TODO: replace with assert.
+      console.error('Internal error: fixture integrity at', this._teardownDescription.title);  // eslint-disable-line no-console
+      this._usages.clear();
+    }
+    if (this._useFuncFinished) {
+      this._useFuncFinished.resolve();
+      this._useFuncFinished = undefined;
+      await this._selfTeardownComplete;
+    }
   }
 
   _collectFixturesInTeardownOrder(scope: FixtureScope, collector: Set<Fixture>) {
@@ -203,27 +202,18 @@ export class FixtureRunner {
     const collector = new Set<Fixture>();
     for (const fixture of fixtures)
       fixture._collectFixturesInTeardownOrder(scope, collector);
-    try {
-      let firstError: Error | undefined;
-      for (const fixture of collector) {
-        try {
-          await fixture.teardown(testInfo, runnable);
-        } catch (error) {
-          if (error instanceof TimeoutManagerError)
-            throw error;
-          firstError = firstError ?? error;
-        }
+    let firstError: Error | undefined;
+    for (const fixture of collector) {
+      try {
+        await fixture.teardown(testInfo, runnable);
+      } catch (error) {
+        firstError = firstError ?? error;
       }
-      if (firstError)
-        throw firstError;
-    } finally {
-      // To preserve fixtures integrity, forcefully cleanup fixtures that did not teardown
-      // due to a timeout in one of them.
-      for (const fixture of collector)
-        fixture._cleanupInstance();
-      if (scope === 'test')
-        this.testScopeClean = true;
     }
+    if (scope === 'test')
+      this.testScopeClean = true;
+    if (firstError)
+      throw firstError;
   }
 
   async resolveParametersForFunction(fn: Function, testInfo: TestInfoImpl, autoFixtures: 'worker' | 'test' | 'all-hooks-only', runnable: RunnableDescription): Promise<object | null> {
@@ -271,9 +261,7 @@ export class FixtureRunner {
       // Do not run the function when fixture setup has already failed.
       return null;
     }
-    await testInfo._runAsStage({ title: 'run function', runnable }, async () => {
-      await fn(params, testInfo);
-    });
+    await testInfo._runWithTimeout(runnable, () => fn(params, testInfo));
   }
 
   private async _setupFixtureForRegistration(registration: FixtureRegistration, testInfo: TestInfoImpl, runnable: RunnableDescription): Promise<Fixture> {
diff --git a/packages/playwright/src/worker/testInfo.ts b/packages/playwright/src/worker/testInfo.ts
index 1e9e1f9c46ee1..78392f136bca0 100644
--- a/packages/playwright/src/worker/testInfo.ts
+++ b/packages/playwright/src/worker/testInfo.ts
@@ -16,51 +16,68 @@
 
 import fs from 'fs';
 import path from 'path';
-import { captureRawStack, monotonicTime, zones, sanitizeForFilePath, stringifyStackFrames } from 'playwright-core/lib/utils';
-import type { TestInfoError, TestInfo, TestStatus, FullProject } from '../../types/test';
-import type { AttachmentPayload, StepBeginPayload, StepEndPayload, WorkerInitParams } from '../common/ipc';
-import type { TestCase } from '../common/test';
+
+import { captureRawStack, monotonicTime, sanitizeForFilePath, stringifyStackFrames, currentZone, createGuid, escapeWithQuotes, ManualPromise } from 'playwright-core/lib/utils';
+
 import { TimeoutManager, TimeoutManagerError, kMaxDeadline } from './timeoutManager';
+import { addSuffixToFilePath, filteredStackTrace, getContainedPath, normalizeAndSaveAttachment, sanitizeFilePathBeforeExtension, serializeError, trimLongString, windowsFilesystemFriendlyLength } from '../util';
+import { TestTracing } from './testTracing';
+import { testInfoError } from './util';
+import { wrapFunctionWithLocation } from '../transform/transform';
+
 import type { RunnableDescription } from './timeoutManager';
-import type { Annotation, FullConfigInternal, FullProjectInternal } from '../common/config';
+import type { FullProject, TestInfo, TestStatus, TestStepInfo, TestAnnotation } from '../../types/test';
 import type { FullConfig, Location } from '../../types/testReporter';
-import { debugTest, filteredStackTrace, formatLocation, getContainedPath, normalizeAndSaveAttachment, serializeError, trimLongString, windowsFilesystemFriendlyLength } from '../util';
-import { TestTracing } from './testTracing';
-import type { Attachment } from './testTracing';
+import type { FullConfigInternal, FullProjectInternal } from '../common/config';
+import type { AttachmentPayload, ResumeAfterStepErrorPayload, StepBeginPayload, StepEndPayload, StepRecoverFromErrorPayload, TestInfoErrorImpl, WorkerInitParams } from '../common/ipc';
+import type { TestCase } from '../common/test';
 import type { StackFrame } from '@protocol/channels';
+import type { RecoverFromStepErrorResult } from '@testIsomorphic/testServerInterface';
 
-export interface TestStepInternal {
-  complete(result: { error?: Error, attachments?: Attachment[] }): void;
-  stepId: string;
+export type TestStepCategory = 'expect' | 'fixture' | 'hook' | 'pw:api' | 'test.step' | 'test.attach';
+
+interface TestStepData {
   title: string;
-  category: 'hook' | 'fixture' | 'test.step' | 'expect' | string;
+  category: TestStepCategory;
   location?: Location;
-  boxedStack?: StackFrame[];
-  steps: TestStepInternal[];
-  endWallTime?: number;
   apiName?: string;
   params?: Record<string, any>;
-  error?: TestInfoError;
   infectParentStepsWithError?: boolean;
   box?: boolean;
-  isStage?: boolean;
+  // steps with any defined group are hidden from the report
+  // 'internal' steps are hidden from the trace
+  group?: string;
 }
 
-export type TestStage = {
-  title: string;
-  stepInfo?: { category: 'hook' | 'fixture', location?: Location };
-  runnable?: RunnableDescription;
-  step?: TestStepInternal;
+export interface TestStepInternal extends TestStepData {
+  recoverFromStepError(error: Error): Promise<RecoverFromStepErrorResult>;
+  complete(result: { error?: Error | unknown, suggestedRebaseline?: string }): void;
+  info: TestStepInfoImpl;
+  attachmentIndices: number[];
+  stepId: string;
+  boxedStack?: StackFrame[];
+  steps: TestStepInternal[];
+  endWallTime?: number;
+  error?: TestInfoErrorImpl;
+}
+
+type SnapshotNames = {
+  lastAnonymousSnapshotIndex: number;
+  lastNamedSnapshotIndex: { [key: string]: number };
 };
 
 export class TestInfoImpl implements TestInfo {
   private _onStepBegin: (payload: StepBeginPayload) => void;
+  private _onStepRecoverFromError: (payload: StepRecoverFromErrorPayload) => void;
   private _onStepEnd: (payload: StepEndPayload) => void;
   private _onAttach: (payload: AttachmentPayload) => void;
+  private _snapshotNames: SnapshotNames = { lastAnonymousSnapshotIndex: 0, lastNamedSnapshotIndex: {} };
+  private _ariaSnapshotNames: SnapshotNames = { lastAnonymousSnapshotIndex: 0, lastNamedSnapshotIndex: {} };
   readonly _timeoutManager: TimeoutManager;
   readonly _startTime: number;
   readonly _startWallTime: number;
   readonly _tracing: TestTracing;
+  readonly _uniqueSymbol;
 
   _wasInterrupted = false;
   _lastStepId = 0;
@@ -68,12 +85,18 @@ export class TestInfoImpl implements TestInfo {
   readonly _projectInternal: FullProjectInternal;
   readonly _configInternal: FullConfigInternal;
   private readonly _steps: TestStepInternal[] = [];
+  private readonly _stepMap = new Map<string, TestStepInternal>();
   _onDidFinishTestFunction: (() => Promise<void>) | undefined;
-  private readonly _stages: TestStage[] = [];
   _hasNonRetriableError = false;
   _hasUnhandledError = false;
   _allowSkips = false;
 
+  // ------------ Main methods ------------
+  skip: (arg?: any, description?: string) => void;
+  fixme: (arg?: any, description?: string) => void;
+  fail: (arg?: any, description?: string) => void;
+  slow: (arg?: any, description?: string) => void;
+
   // ------------ TestInfo fields ------------
   readonly testId: string;
   readonly repeatEachIndex: number;
@@ -91,20 +114,21 @@ export class TestInfoImpl implements TestInfo {
   readonly fn: Function;
   expectedStatus: TestStatus;
   duration: number = 0;
-  readonly annotations: Annotation[] = [];
+  readonly annotations: TestAnnotation[] = [];
   readonly attachments: TestInfo['attachments'] = [];
   status: TestStatus = 'passed';
   snapshotSuffix: string = '';
   readonly outputDir: string;
   readonly snapshotDir: string;
-  errors: TestInfoError[] = [];
+  errors: TestInfoErrorImpl[] = [];
   readonly _attachmentsPush: (...items: TestInfo['attachments']) => number;
+  private _recoverFromStepErrorResults: Map<string, ManualPromise<ResumeAfterStepErrorPayload>> | undefined;
 
-  get error(): TestInfoError | undefined {
+  get error(): TestInfoErrorImpl | undefined {
     return this.errors[0];
   }
 
-  set error(e: TestInfoError | undefined) {
+  set error(e: TestInfoErrorImpl | undefined) {
     if (e === undefined)
       throw new Error('Cannot assign testInfo.error undefined value!');
     this.errors[0] = e;
@@ -138,16 +162,19 @@ export class TestInfoImpl implements TestInfo {
     test: TestCase | undefined,
     retry: number,
     onStepBegin: (payload: StepBeginPayload) => void,
+    onStepRecoverFromError: (payload: StepRecoverFromErrorPayload) => void,
     onStepEnd: (payload: StepEndPayload) => void,
     onAttach: (payload: AttachmentPayload) => void,
   ) {
     this.testId = test?.id ?? '';
     this._onStepBegin = onStepBegin;
+    this._onStepRecoverFromError = onStepRecoverFromError;
     this._onStepEnd = onStepEnd;
     this._onAttach = onAttach;
     this._startTime = monotonicTime();
     this._startWallTime = Date.now();
     this._requireFile = test?._requireFile ?? '';
+    this._uniqueSymbol = Symbol('testInfoUniqueSymbol');
 
     this.repeatEachIndex = workerParams.repeatEachIndex;
     this.retry = retry;
@@ -165,8 +192,11 @@ export class TestInfoImpl implements TestInfo {
     this.tags = test?.tags ?? [];
     this.fn = test?.fn ?? (() => {});
     this.expectedStatus = test?.expectedStatus ?? 'skipped';
+    this._recoverFromStepErrorResults = workerParams.recoverFromStepErrors ? new Map() : undefined;
 
     this._timeoutManager = new TimeoutManager(this.project.timeout);
+    if (configInternal.configCLIOverrides.debug)
+      this._setDebugMode();
 
     this.outputDir = (() => {
       const relativeTestFilePath = path.relative(this.project.testDir, this._requireFile.replace(/\.(spec|test)\.(js|ts|jsx|tsx|mjs|mts|cjs|cts)$/, ''));
@@ -191,14 +221,19 @@ export class TestInfoImpl implements TestInfo {
     this._attachmentsPush = this.attachments.push.bind(this.attachments);
     this.attachments.push = (...attachments: TestInfo['attachments']) => {
       for (const a of attachments)
-        this._attach(a.name, a);
+        this._attach(a, this._parentStep()?.stepId);
       return this.attachments.length;
     };
 
     this._tracing = new TestTracing(this, workerParams.artifactsDir);
+
+    this.skip = wrapFunctionWithLocation((location, ...args) => this._modifier('skip', location, args));
+    this.fixme = wrapFunctionWithLocation((location, ...args) => this._modifier('fixme', location, args));
+    this.fail = wrapFunctionWithLocation((location, ...args) => this._modifier('fail', location, args));
+    this.slow = wrapFunctionWithLocation((location, ...args) => this._modifier('slow', location, args));
   }
 
-  private _modifier(type: 'skip' | 'fail' | 'fixme' | 'slow', modifierArgs: [arg?: any, description?: string]) {
+  _modifier(type: 'skip' | 'fail' | 'fixme' | 'slow', location: Location, modifierArgs: [arg?: any, description?: string]) {
     if (typeof modifierArgs[1] === 'function') {
       throw new Error([
         'It looks like you are calling test.skip() inside the test and pass a callback.',
@@ -213,79 +248,89 @@ export class TestInfoImpl implements TestInfo {
       return;
 
     const description = modifierArgs[1];
-    this.annotations.push({ type, description });
+    this.annotations.push({ type, description, location });
     if (type === 'slow') {
       this._timeoutManager.slow();
     } else if (type === 'skip' || type === 'fixme') {
       this.expectedStatus = 'skipped';
-      throw new SkipError('Test is skipped: ' + (description || ''));
+      throw new TestSkipError('Test is skipped: ' + (description || ''));
     } else if (type === 'fail') {
       if (this.expectedStatus !== 'skipped')
         this.expectedStatus = 'failed';
     }
   }
 
-  private _findLastNonFinishedStep(filter: (step: TestStepInternal) => boolean) {
-    let result: TestStepInternal | undefined;
-    const visit = (step: TestStepInternal) => {
-      if (!step.endWallTime && filter(step))
-        result = step;
-      step.steps.forEach(visit);
-    };
-    this._steps.forEach(visit);
-    return result;
+  private _findLastPredefinedStep(steps: TestStepInternal[]): TestStepInternal | undefined {
+    // Find the deepest predefined step that has not finished yet.
+    for (let i = steps.length - 1; i >= 0; i--) {
+      const child = this._findLastPredefinedStep(steps[i].steps);
+      if (child)
+        return child;
+      if ((steps[i].category === 'hook' || steps[i].category === 'fixture') && !steps[i].endWallTime)
+        return steps[i];
+    }
   }
 
-  private _findLastStageStep() {
-    for (let i = this._stages.length - 1; i >= 0; i--) {
-      if (this._stages[i].step)
-        return this._stages[i].step;
-    }
+  private _parentStep() {
+    return currentZone().data<TestStepInternal>('stepZone') ?? this._findLastPredefinedStep(this._steps);
   }
 
-  _addStep(data: Omit<TestStepInternal, 'complete' | 'stepId' | 'steps'>): TestStepInternal {
+  _addStep(data: Readonly<TestStepData>, parentStep?: TestStepInternal): TestStepInternal {
     const stepId = `${data.category}@${++this._lastStepId}`;
 
-    let parentStep: TestStepInternal | undefined;
-    if (data.isStage) {
-      // Predefined stages form a fixed hierarchy - use the current one as parent.
-      parentStep = this._findLastStageStep();
+    if (data.category === 'hook' || data.category === 'fixture') {
+      // Predefined steps form a fixed hierarchy - use the current one as parent.
+      parentStep = this._findLastPredefinedStep(this._steps);
     } else {
-      parentStep = zones.zoneData<TestStepInternal>('stepZone');
-      if (!parentStep && data.category !== 'test.step') {
-        // API steps (but not test.step calls) can be nested by time, instead of by stack.
-        // However, do not nest chains of route.continue by checking the title.
-        parentStep = this._findLastNonFinishedStep(step => step.title !== data.title);
-      }
-      if (!parentStep) {
-        // If no parent step on stack, assume the current stage as parent.
-        parentStep = this._findLastStageStep();
-      }
+      if (!parentStep)
+        parentStep = this._parentStep();
     }
 
     const filteredStack = filteredStackTrace(captureRawStack());
-    data.boxedStack = parentStep?.boxedStack;
-    if (!data.boxedStack && data.box) {
-      data.boxedStack = filteredStack.slice(1);
-      data.location = data.location || data.boxedStack[0];
+    let boxedStack = parentStep?.boxedStack;
+    let location = data.location;
+    if (!boxedStack && data.box) {
+      boxedStack = filteredStack.slice(1);
+      location = location || boxedStack[0];
     }
-    data.location = data.location || filteredStack[0];
+    location = location || filteredStack[0];
 
     const step: TestStepInternal = {
-      stepId,
       ...data,
+      stepId,
+      group: parentStep?.group ?? data.group,
+      boxedStack,
+      location,
       steps: [],
+      attachmentIndices: [],
+      info: new TestStepInfoImpl(this, stepId, data.title, parentStep?.info),
+      recoverFromStepError: async (error: Error) => {
+        if (!this._recoverFromStepErrorResults)
+          return { stepId, status: 'failed' };
+        const payload: StepRecoverFromErrorPayload = {
+          testId: this.testId,
+          stepId,
+          error: serializeError(error),
+        };
+        this._onStepRecoverFromError(payload);
+        const recoveryPromise = new ManualPromise<RecoverFromStepErrorResult>();
+        this._recoverFromStepErrorResults.set(stepId, recoveryPromise);
+        const recoveryResult = await recoveryPromise;
+        if (recoveryResult.stepId !== stepId)
+          return { stepId, status: 'failed' };
+        return recoveryResult;
+      },
       complete: result => {
         if (step.endWallTime)
           return;
 
         step.endWallTime = Date.now();
         if (result.error) {
-          if (!(result.error as any)[stepSymbol])
+          if (typeof result.error === 'object' && !(result.error as any)?.[stepSymbol])
             (result.error as any)[stepSymbol] = step;
-          const error = serializeError(result.error);
-          if (data.boxedStack)
-            error.stack = `${error.message}\n${stringifyStackFrames(data.boxedStack).join('\n')}`;
+          const error = testInfoError(result.error);
+          if (step.boxedStack)
+            error.stack = `${error.message}\n${stringifyStackFrames(step.boxedStack).join('\n')}`;
           step.error = error;
         }
 
@@ -302,33 +347,61 @@ export class TestInfoImpl implements TestInfo {
           }
         }
 
-        const payload: StepEndPayload = {
-          testId: this.testId,
-          stepId,
-          wallTime: step.endWallTime,
-          error: step.error,
-        };
-        this._onStepEnd(payload);
-        const errorForTrace = step.error ? { name: '', message: step.error.message || '', stack: step.error.stack } : undefined;
-        this._tracing.appendAfterActionForStep(stepId, errorForTrace, result.attachments);
+        if (!step.group) {
+          const payload: StepEndPayload = {
+            testId: this.testId,
+            stepId,
+            wallTime: step.endWallTime,
+            error: step.error,
+            suggestedRebaseline: result.suggestedRebaseline,
+            annotations: step.info.annotations,
+          };
+          this._onStepEnd(payload);
+        }
+        if (step.group !== 'internal') {
+          const errorForTrace = step.error ? { name: '', message: step.error.message || '', stack: step.error.stack } : undefined;
+          const attachments = step.attachmentIndices.map(i => this.attachments[i]);
+          this._tracing.appendAfterActionForStep(stepId, errorForTrace, attachments, step.info.annotations);
+        }
       }
     };
     const parentStepList = parentStep ? parentStep.steps : this._steps;
     parentStepList.push(step);
-    const payload: StepBeginPayload = {
-      testId: this.testId,
-      stepId,
-      parentStepId: parentStep ? parentStep.stepId : undefined,
-      title: data.title,
-      category: data.category,
-      wallTime: Date.now(),
-      location: data.location,
-    };
-    this._onStepBegin(payload);
-    this._tracing.appendBeforeActionForStep(stepId, parentStep?.stepId, data.apiName || data.title, data.params, data.location ? [data.location] : []);
+    this._stepMap.set(stepId, step);
+
+    if (!step.group) {
+      const payload: StepBeginPayload = {
+        testId: this.testId,
+        stepId,
+        parentStepId: parentStep ? parentStep.stepId : undefined,
+        title: step.title,
+        category: step.category,
+        wallTime: Date.now(),
+        location: step.location,
+      };
+      this._onStepBegin(payload);
+    }
+    if (step.group !== 'internal') {
+      this._tracing.appendBeforeActionForStep({
+        stepId,
+        parentId: parentStep?.stepId,
+        title: step.title,
+        category: step.category,
+        params: step.params,
+        stack: step.location ? [step.location] : [],
+        group: step.group,
+      });
+    }
+
     return step;
   }
 
+  resumeAfterStepError(result: ResumeAfterStepErrorPayload) {
+    const recoveryPromise = this._recoverFromStepErrorResults?.get(result.stepId);
+    if (recoveryPromise)
+      recoveryPromise.resolve(result);
+  }
+
   _interrupt() {
     // Mark as interrupted so we can ignore TimeoutError thrown by interrupt() call.
     this._wasInterrupted = true;
@@ -338,41 +411,42 @@ export class TestInfoImpl implements TestInfo {
       this.status = 'interrupted';
   }
 
-  _failWithError(error: Error) {
+  _failWithError(error: Error | unknown) {
     if (this.status === 'passed' || this.status === 'skipped')
       this.status = error instanceof TimeoutManagerError ? 'timedOut' : 'failed';
-    const serialized = serializeError(error);
-    const step = (error as any)[stepSymbol] as TestStepInternal | undefined;
+    const serialized = testInfoError(error);
+    const step: TestStepInternal | undefined = typeof error === 'object' ? (error as any)?.[stepSymbol] : undefined;
     if (step && step.boxedStack)
-      serialized.stack = `${error.name}: ${error.message}\n${stringifyStackFrames(step.boxedStack).join('\n')}`;
+      serialized.stack = `${(error as Error).name}: ${(error as Error).message}\n${stringifyStackFrames(step.boxedStack).join('\n')}`;
     this.errors.push(serialized);
     this._tracing.appendForError(serialized);
   }
 
-  async _runAsStage(stage: TestStage, cb: () => Promise<any>) {
-    if (debugTest.enabled) {
-      const location = stage.runnable?.location ? ` at "${formatLocation(stage.runnable.location)}"` : ``;
-      debugTest(`started stage "${stage.title}"${location}`);
+  async _runAsStep(stepInfo: { title: string, category: 'hook' | 'fixture', location?: Location, group?: string }, cb: () => Promise<any>) {
+    const step = this._addStep(stepInfo);
+    try {
+      await cb();
+      step.complete({});
+    } catch (error) {
+      step.complete({ error });
+      throw error;
     }
-    stage.step = stage.stepInfo ? this._addStep({ ...stage.stepInfo, title: stage.title, isStage: true }) : undefined;
-    this._stages.push(stage);
+  }
 
+  async _runWithTimeout(runnable: RunnableDescription, cb: () => Promise<any>) {
     try {
-      await this._timeoutManager.withRunnable(stage.runnable, async () => {
+      await this._timeoutManager.withRunnable(runnable, async () => {
         try {
           await cb();
         } catch (e) {
-          // Only handle errors directly thrown by the user code.
-          if (!stage.runnable)
-            throw e;
-          if (this._allowSkips && (e instanceof SkipError)) {
+          if (this._allowSkips && (e instanceof TestSkipError)) {
             if (this.status === 'passed')
               this.status = 'skipped';
           } else {
             // Unfortunately, we have to handle user errors and timeout errors differently.
             // Consider the following scenario:
             // - locator.click times out
-            // - all stages containing the test function finish with TimeoutManagerError
+            // - all steps containing the test function finish with TimeoutManagerError
             // - test finishes, the page is closed and this triggers locator.click error
             // - we would like to present the locator.click error to the user
             // - therefore, we need a try/catch inside the "run with timeout" block and capture the error
@@ -381,19 +455,12 @@ export class TestInfoImpl implements TestInfo {
           throw e;
         }
       });
-      stage.step?.complete({});
     } catch (error) {
       // When interrupting, we arrive here with a TimeoutManagerError, but we should not
       // consider it a timeout.
-      if (!this._wasInterrupted && (error instanceof TimeoutManagerError) && stage.runnable)
+      if (!this._wasInterrupted && (error instanceof TimeoutManagerError))
         this._failWithError(error);
-      stage.step?.complete({ error });
       throw error;
-    } finally {
-      if (this._stages[this._stages.length - 1] !== stage)
-        throw new Error(`Internal error: inconsistent stages!`);
-      this._stages.pop();
-      debugTest(`finished stage "${stage.title}"`);
     }
   }
 
@@ -402,33 +469,46 @@ export class TestInfoImpl implements TestInfo {
   }
 
   _currentHookType() {
-    for (let i = this._stages.length - 1; i >= 0; i--) {
-      const type = this._stages[i].runnable?.type;
-      if (type && ['beforeAll', 'afterAll', 'beforeEach', 'afterEach'].includes(type))
-        return type;
-    }
+    const type = this._timeoutManager.currentSlotType();
+    return ['beforeAll', 'afterAll', 'beforeEach', 'afterEach'].includes(type) ? type : undefined;
+  }
+
+  _setDebugMode() {
+    this._timeoutManager.setIgnoreTimeouts();
   }
 
   // ------------ TestInfo methods ------------
 
   async attach(name: string, options: { path?: string, body?: string | Buffer, contentType?: string } = {}) {
-    this._attach(name, await normalizeAndSaveAttachment(this.outputPath(), name, options));
-  }
-
-  private _attach(name: string, attachment: TestInfo['attachments'][0]) {
     const step = this._addStep({
-      title: `attach "${name}"`,
-      category: 'attach',
+      title: `Attach ${escapeWithQuotes(name, '"')}`,
+      category: 'test.attach',
     });
-    this._attachmentsPush(attachment);
+    this._attach(
+        await normalizeAndSaveAttachment(this.outputPath(), name, options),
+        step.group ? undefined : step.stepId
+    );
+    step.complete({});
+  }
+
+  _attach(attachment: TestInfo['attachments'][0], stepId: string | undefined) {
+    const index = this._attachmentsPush(attachment) - 1;
+    if (stepId) {
+      this._stepMap.get(stepId)!.attachmentIndices.push(index);
+    } else {
+      const stepId = `attach@${createGuid()}`;
+      this._tracing.appendBeforeActionForStep({ stepId, title: `Attach ${escapeWithQuotes(attachment.name, '"')}`, category: 'test.attach', stack: [] });
+      this._tracing.appendAfterActionForStep(stepId, undefined, [attachment]);
+    }
+
     this._onAttach({
       testId: this.testId,
       name: attachment.name,
       contentType: attachment.contentType,
       path: attachment.path,
-      body: attachment.body?.toString('base64')
+      body: attachment.body?.toString('base64'),
+      stepId,
     });
-    step.complete({ attachments: [attachment] });
   }
 
   outputPath(...pathSegments: string[]){
@@ -450,14 +530,75 @@ export class TestInfoImpl implements TestInfo {
     return sanitizeForFilePath(trimLongString(fullTitleWithoutSpec));
   }
 
-  snapshotPath(...pathSegments: string[]) {
-    const subPath = path.join(...pathSegments);
-    const parsedSubPath = path.parse(subPath);
+  _resolveSnapshotPaths(kind: 'snapshot' | 'screenshot' | 'aria', name: string | string[] | undefined, updateSnapshotIndex: 'updateSnapshotIndex' | 'dontUpdateSnapshotIndex', anonymousExtension?: string) {
+    // NOTE: snapshot path must not ever change for backwards compatibility!
+
+    const snapshotNames = kind === 'aria' ? this._ariaSnapshotNames : this._snapshotNames;
+    const defaultExtensions = { 'aria': '.aria.yml', 'screenshot': '.png', 'snapshot': '.txt' };
+    const ariaAwareExtname = (filePath: string) => kind === 'aria' && filePath.endsWith('.aria.yml') ? '.aria.yml' : path.extname(filePath);
+
+    let subPath: string;
+    let ext: string;
+    let relativeOutputPath: string;
+
+    if (!name) {
+      // Consider the use case below. We should save actual to different paths, so we use |nextAnonymousSnapshotIndex|.
+      //
+      //   expect.toMatchSnapshot('a.png')
+      //   // noop
+      //   expect.toMatchSnapshot('a.png')
+      const index = snapshotNames.lastAnonymousSnapshotIndex + 1;
+      if (updateSnapshotIndex === 'updateSnapshotIndex')
+        snapshotNames.lastAnonymousSnapshotIndex = index;
+      const fullTitleWithoutSpec = [...this.titlePath.slice(1), index].join(' ');
+      ext = anonymousExtension ?? defaultExtensions[kind];
+      subPath = sanitizeFilePathBeforeExtension(trimLongString(fullTitleWithoutSpec) + ext, ext);
+      // Trim the output file paths more aggressively to avoid hitting Windows filesystem limits.
+      relativeOutputPath = sanitizeFilePathBeforeExtension(trimLongString(fullTitleWithoutSpec, windowsFilesystemFriendlyLength) + ext, ext);
+    } else {
+      if (Array.isArray(name)) {
+        // We intentionally do not sanitize user-provided array of segments,
+        // assuming it is a file system path.
+        // See https://github.com/microsoft/playwright/pull/9156.
+        subPath = path.join(...name);
+        relativeOutputPath = path.join(...name);
+        ext = ariaAwareExtname(subPath);
+      } else {
+        ext = ariaAwareExtname(name);
+        subPath = sanitizeFilePathBeforeExtension(name, ext);
+        // Trim the output file paths more aggressively to avoid hitting Windows filesystem limits.
+        relativeOutputPath = sanitizeFilePathBeforeExtension(trimLongString(name, windowsFilesystemFriendlyLength), ext);
+      }
+      const index = (snapshotNames.lastNamedSnapshotIndex[relativeOutputPath] || 0) + 1;
+      if (updateSnapshotIndex === 'updateSnapshotIndex')
+        snapshotNames.lastNamedSnapshotIndex[relativeOutputPath] = index;
+      if (index > 1)
+        relativeOutputPath = addSuffixToFilePath(relativeOutputPath, `-${index - 1}`);
+    }
+
+    const absoluteSnapshotPath = this._applyPathTemplate(kind, subPath, ext);
+    return { absoluteSnapshotPath, relativeOutputPath };
+  }
+
+  private _applyPathTemplate(kind: 'snapshot' | 'screenshot' | 'aria', relativePath: string, ext: string) {
+    const legacyTemplate = '{snapshotDir}/{testFileDir}/{testFileName}-snapshots/{arg}{-projectName}{-snapshotSuffix}{ext}';
+    let template: string;
+    if (kind === 'screenshot') {
+      template = this._projectInternal.expect?.toHaveScreenshot?.pathTemplate || this._projectInternal.snapshotPathTemplate || legacyTemplate;
+    } else if (kind === 'aria') {
+      const ariaDefaultTemplate = '{snapshotDir}/{testFileDir}/{testFileName}-snapshots/{arg}{ext}';
+      template = this._projectInternal.expect?.toMatchAriaSnapshot?.pathTemplate || this._projectInternal.snapshotPathTemplate || ariaDefaultTemplate;
+    } else {
+      template = this._projectInternal.snapshotPathTemplate || legacyTemplate;
+    }
+
+    const dir = path.dirname(relativePath);
+    const name = path.basename(relativePath, ext);
     const relativeTestFilePath = path.relative(this.project.testDir, this._requireFile);
     const parsedRelativeTestFilePath = path.parse(relativeTestFilePath);
     const projectNamePathSegment = sanitizeForFilePath(this.project.name);
 
-    const snapshotPath = (this._projectInternal.snapshotPathTemplate || '')
+    const snapshotPath = template
         .replace(/\{(.)?testDir\}/g, '$1' + this.project.testDir)
         .replace(/\{(.)?snapshotDir\}/g, '$1' + this.project.snapshotDir)
         .replace(/\{(.)?snapshotSuffix\}/g, this.snapshotSuffix ? '$1' + this.snapshotSuffix : '')
@@ -467,34 +608,95 @@ export class TestInfoImpl implements TestInfo {
         .replace(/\{(.)?testName\}/g, '$1' + this._fsSanitizedTestName())
         .replace(/\{(.)?testFileName\}/g, '$1' + parsedRelativeTestFilePath.base)
         .replace(/\{(.)?testFilePath\}/g, '$1' + relativeTestFilePath)
-        .replace(/\{(.)?arg\}/g, '$1' + path.join(parsedSubPath.dir, parsedSubPath.name))
-        .replace(/\{(.)?ext\}/g, parsedSubPath.ext ? '$1' + parsedSubPath.ext : '');
+        .replace(/\{(.)?arg\}/g, '$1' + path.join(dir, name))
+        .replace(/\{(.)?ext\}/g, ext ? '$1' + ext : '');
 
     return path.normalize(path.resolve(this._configInternal.configDir, snapshotPath));
   }
 
-  skip(...args: [arg?: any, description?: string]) {
-    this._modifier('skip', args);
+  snapshotPath(...name: string[]): string;
+  snapshotPath(name: string, options: { kind: 'snapshot' | 'screenshot' | 'aria' }): string;
+  snapshotPath(...args: any[]) {
+    let name: string[] = args;
+    let kind: 'snapshot' | 'screenshot' | 'aria' = 'snapshot';
+
+    const options = args[args.length - 1];
+    if (options && typeof options === 'object') {
+      kind = options.kind ?? kind;
+      name = args.slice(0, -1);
+    }
+
+    if (!['snapshot', 'screenshot', 'aria'].includes(kind))
+      throw new Error(`testInfo.snapshotPath: unknown kind "${kind}", must be one of "snapshot", "screenshot" or "aria"`);
+
+    // Assume a zero/single path segment corresponds to `toHaveScreenshot(name)`,
+    // while multiple path segments correspond to `toHaveScreenshot([...name])`.
+    return this._resolveSnapshotPaths(kind, name.length <= 1 ? name[0] : name, 'dontUpdateSnapshotIndex').absoluteSnapshotPath;
+  }
+
+  setTimeout(timeout: number) {
+    this._timeoutManager.setTimeout(timeout);
+  }
+}
+
+export class TestStepInfoImpl implements TestStepInfo {
+  annotations: TestAnnotation[] = [];
+
+  private _testInfo: TestInfoImpl;
+  private _stepId: string;
+  private _title: string;
+  private _parentStep?: TestStepInfoImpl;
+
+  skip: (arg?: any, description?: string) => void;
+
+  constructor(testInfo: TestInfoImpl, stepId: string, title: string, parentStep?: TestStepInfoImpl) {
+    this._testInfo = testInfo;
+    this._stepId = stepId;
+    this._title = title;
+    this._parentStep = parentStep;
+    this.skip = wrapFunctionWithLocation((location: Location, ...args: unknown[]) => {
+      // skip();
+      // skip(condition: boolean, description: string);
+      if (args.length > 0 && !args[0])
+        return;
+      const description = args[1] as (string|undefined);
+      this.annotations.push({ type: 'skip', description, location });
+      throw new StepSkipError(description);
+    });
   }
 
-  fixme(...args: [arg?: any, description?: string]) {
-    this._modifier('fixme', args);
+  async _runStepBody<T>(skip: boolean, body: (step: TestStepInfo) => T | Promise<T>, location?: Location) {
+    if (skip) {
+      this.annotations.push({ type: 'skip', location });
+      return undefined as T;
+    }
+    try {
+      return await body(this);
+    } catch (e) {
+      if (e instanceof StepSkipError)
+        return undefined as T;
+      throw e;
+    }
   }
 
-  fail(...args: [arg?: any, description?: string]) {
-    this._modifier('fail', args);
+  _attachToStep(attachment: TestInfo['attachments'][0]): void {
+    this._testInfo._attach(attachment, this._stepId);
   }
 
-  slow(...args: [arg?: any, description?: string]) {
-    this._modifier('slow', args);
+  async attach(name: string, options?: { body?: string | Buffer; contentType?: string; path?: string; }): Promise<void> {
+    this._attachToStep(await normalizeAndSaveAttachment(this._testInfo.outputPath(), name, options));
   }
 
-  setTimeout(timeout: number) {
-    this._timeoutManager.setTimeout(timeout);
+  get titlePath(): string[] {
+    const parent = this._parentStep ?? this._testInfo;
+    return [...parent.titlePath, this._title];
   }
 }
 
-export class SkipError extends Error {
+export class TestSkipError extends Error {
+}
+
+export class StepSkipError extends Error {
 }
 
 const stepSymbol = Symbol('step');
diff --git a/packages/playwright/src/worker/testTracing.ts b/packages/playwright/src/worker/testTracing.ts
index fed7fdde7e982..6707bd83841dd 100644
--- a/packages/playwright/src/worker/testTracing.ts
+++ b/packages/playwright/src/worker/testTracing.ts
@@ -14,21 +14,24 @@
  * limitations under the License.
  */
 
-import type { SerializedError, StackFrame } from '@protocol/channels';
-import type * as trace from '@trace/trace';
-import type EventEmitter from 'events';
 import fs from 'fs';
 import path from 'path';
-import { ManualPromise, calculateSha1, monotonicTime, createGuid, SerializedFS } from 'playwright-core/lib/utils';
+
+import { ManualPromise, SerializedFS, calculateSha1, createGuid, monotonicTime } from 'playwright-core/lib/utils';
 import { yauzl, yazl } from 'playwright-core/lib/zipBundle';
-import type { TestInfo, TestInfoError } from '../../types/test';
+
 import { filteredStackTrace } from '../util';
-import type { TraceMode, PlaywrightWorkerOptions } from '../../types/test';
-import type { TestInfoImpl } from './testInfo';
+
+import type { TestStepCategory, TestInfoImpl } from './testInfo';
+import type { PlaywrightWorkerOptions, TestInfo, TraceMode } from '../../types/test';
+import type { TestInfoErrorImpl } from '../common/ipc';
+import type { SerializedError, StackFrame } from '@protocol/channels';
+import type * as trace from '@trace/trace';
+import type EventEmitter from 'events';
 
 export type Attachment = TestInfo['attachments'][0];
 export const testTraceEntryName = 'test.trace';
-const version: trace.VERSION = 7;
+const version: trace.VERSION = 8;
 let traceOrdinal = 0;
 
 type TraceFixtureValue =  PlaywrightWorkerOptions['trace'] | undefined;
@@ -43,6 +46,7 @@ export class TestTracing {
   private _artifactsDir: string;
   private _tracesDir: string;
   private _contextCreatedEvent: trace.ContextCreatedTraceEvent;
+  private _didFinishTestFunctionAndAfterEachHooks = false;
 
   constructor(testInfo: TestInfoImpl, artifactsDir: string) {
     this._testInfo = testInfo;
@@ -63,9 +67,6 @@ export class TestTracing {
   }
 
   private _shouldCaptureTrace() {
-    if (process.env.PW_TEST_DISABLE_TRACING)
-      return false;
-
     if (this._options?.mode === 'on')
       return true;
 
@@ -110,6 +111,10 @@ export class TestTracing {
     }
   }
 
+  didFinishTestFunctionAndAfterEachHooks() {
+    this._didFinishTestFunctionAndAfterEachHooks = true;
+  }
+
   artifactsDir() {
     return this._artifactsDir;
   }
@@ -130,7 +135,7 @@ export class TestTracing {
     return `${this._testInfo.testId}${retrySuffix}${ordinalSuffix}`;
   }
 
-  generateNextTraceRecordingPath() {
+  private _generateNextTraceRecordingPath() {
     const file = path.join(this._artifactsDir, createGuid() + '.zip');
     this._temporaryTraceFiles.push(file);
     return file;
@@ -140,6 +145,22 @@ export class TestTracing {
     return this._options;
   }
 
+  maybeGenerateNextTraceRecordingPath() {
+    // Forget about traces that should be saved on failure, when no failure happened
+    // during the test and beforeEach/afterEach hooks.
+    // This avoids downloading traces over the wire when not really needed.
+    if (this._didFinishTestFunctionAndAfterEachHooks && this._shouldAbandonTrace())
+      return;
+    return this._generateNextTraceRecordingPath();
+  }
+
+  private _shouldAbandonTrace() {
+    if (!this._options)
+      return true;
+    const testFailed = this._testInfo.status !== this._testInfo.expectedStatus;
+    return !testFailed && (this._options.mode === 'retain-on-failure' || this._options.mode === 'retain-on-first-failure');
+  }
+
   async stopIfNeeded() {
     if (!this._options)
       return;
@@ -148,10 +169,7 @@ export class TestTracing {
     if (error)
       throw error;
 
-    const testFailed = this._testInfo.status !== this._testInfo.expectedStatus;
-    const shouldAbandonTrace = !testFailed && (this._options.mode === 'retain-on-failure' || this._options.mode === 'retain-on-first-failure');
-
-    if (shouldAbandonTrace) {
+    if (this._shouldAbandonTrace()) {
       for (const file of this._temporaryTraceFiles)
         await fs.promises.unlink(file).catch(() => {});
       return;
@@ -210,7 +228,7 @@ export class TestTracing {
 
     await new Promise(f => {
       zipFile.end(undefined, () => {
-        zipFile.outputStream.pipe(fs.createWriteStream(this.generateNextTraceRecordingPath())).on('close', f);
+        zipFile.outputStream.pipe(fs.createWriteStream(this._generateNextTraceRecordingPath())).on('close', f);
       });
     });
 
@@ -219,16 +237,23 @@ export class TestTracing {
     this._testInfo.attachments.push({ name: 'trace', path: tracePath, contentType: 'application/zip' });
   }
 
-  appendForError(error: TestInfoError) {
+  appendForError(error: TestInfoErrorImpl) {
     const rawStack = error.stack?.split('\n') || [];
     const stack = rawStack ? filteredStackTrace(rawStack) : [];
     this._appendTraceEvent({
       type: 'error',
-      message: error.message || String(error.value),
+      message: this._formatError(error),
       stack,
     });
   }
 
+  _formatError(error: TestInfoErrorImpl) {
+    const parts: string[] = [error.message || String(error.value)];
+    if (error.cause)
+      parts.push('[cause]: ' + this._formatError(error.cause));
+    return parts.join('\n');
+  }
+
   appendStdioToTrace(type: 'stdout' | 'stderr', chunk: string | Buffer) {
     this._appendTraceEvent({
       type,
@@ -238,26 +263,29 @@ export class TestTracing {
     });
   }
 
-  appendBeforeActionForStep(callId: string, parentId: string | undefined, apiName: string, params: Record<string, any> | undefined, stack: StackFrame[]) {
+  appendBeforeActionForStep(options: { stepId: string, parentId?: string, title: string, category: TestStepCategory, params?: Record<string, any>, stack: StackFrame[], group?: string }) {
     this._appendTraceEvent({
       type: 'before',
-      callId,
-      parentId,
+      callId: options.stepId,
+      stepId: options.stepId,
+      parentId: options.parentId,
       startTime: monotonicTime(),
       class: 'Test',
-      method: 'step',
-      apiName,
-      params: Object.fromEntries(Object.entries(params || {}).map(([name, value]) => [name, generatePreview(value)])),
-      stack,
+      method: options.category,
+      title: options.title,
+      params: Object.fromEntries(Object.entries(options.params || {}).map(([name, value]) => [name, generatePreview(value)])),
+      stack: options.stack,
+      group: options.group,
     });
   }
 
-  appendAfterActionForStep(callId: string, error?: SerializedError['error'], attachments: Attachment[] = []) {
+  appendAfterActionForStep(callId: string, error?: SerializedError['error'], attachments: Attachment[] = [], annotations?: trace.AfterActionTraceEventAnnotation[]) {
     this._appendTraceEvent({
       type: 'after',
       callId,
       endTime: monotonicTime(),
       attachments: serializeAttachments(attachments),
+      annotations,
       error,
     });
   }
@@ -270,6 +298,8 @@ export class TestTracing {
 }
 
 function serializeAttachments(attachments: Attachment[]): trace.AfterActionTraceEvent['attachments'] {
+  if (attachments.length === 0)
+    return undefined;
   return attachments.filter(a => a.name !== 'trace').map(a => {
     return {
       name: a.name,
@@ -328,7 +358,7 @@ async function mergeTraceFiles(fileName: string, temporaryTraceFiles: string[])
           // Keep the name for test traces so that the last test trace
           // that contains most of the information is kept in the trace.
           // Note the reverse order of the iteration (from new traces to old).
-        } else if (entry.fileName.match(/[\d-]*trace\./)) {
+        } else if (entry.fileName.match(/trace\.[a-z]*$/)) {
           entryName = i + '-' + entry.fileName;
         }
         if (entryNames.has(entryName)) {
diff --git a/packages/playwright/src/worker/timeoutManager.ts b/packages/playwright/src/worker/timeoutManager.ts
index 441a87eca0524..c003342d15806 100644
--- a/packages/playwright/src/worker/timeoutManager.ts
+++ b/packages/playwright/src/worker/timeoutManager.ts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
-import { colors } from 'playwright-core/lib/utilsBundle';
 import { ManualPromise, monotonicTime } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+
+import { debugTest, formatLocation } from '../util';
+
 import type { Location } from '../../types/testReporter';
 
 export type TimeSlot = {
@@ -52,19 +55,30 @@ export const kMaxDeadline = 2147483647; // 2^31-1
 export class TimeoutManager {
   private _defaultSlot: TimeSlot;
   private _running?: Running;
+  private _ignoreTimeouts = false;
 
   constructor(timeout: number) {
     this._defaultSlot = { timeout, elapsed: 0 };
   }
 
+  setIgnoreTimeouts() {
+    this._ignoreTimeouts = true;
+    if (this._running)
+      this._updateTimeout(this._running);
+  }
+
   interrupt() {
     if (this._running)
       this._running.timeoutPromise.reject(this._createTimeoutError(this._running));
   }
 
-  async withRunnable<T>(runnable: RunnableDescription | undefined, cb: () => Promise<T>): Promise<T> {
-    if (!runnable)
-      return await cb();
+  isTimeExhaustedFor(runnable: RunnableDescription) {
+    const slot = runnable.fixture?.slot || runnable.slot || this._defaultSlot;
+    // Note: the "-1" here matches the +1 in _updateTimeout.
+    return slot.timeout > 0 && (slot.elapsed >= slot.timeout - 1);
+  }
+
+  async withRunnable<T>(runnable: RunnableDescription, cb: () => Promise<T>): Promise<T> {
     if (this._running)
       throw new Error(`Internal error: duplicate runnable`);
     const running = this._running = {
@@ -75,7 +89,13 @@ export class TimeoutManager {
       timer: undefined,
       timeoutPromise: new ManualPromise(),
     };
+    let debugTitle = '';
     try {
+      if (debugTest.enabled) {
+        debugTitle = runnable.fixture ? `${runnable.fixture.phase} "${runnable.fixture.title}"` : runnable.type;
+        const location = runnable.location ? ` at "${formatLocation(runnable.location)}"` : ``;
+        debugTest(`started ${debugTitle}${location}`);
+      }
       this._updateTimeout(running);
       return await Promise.race([
         cb(),
@@ -87,6 +107,8 @@ export class TimeoutManager {
       running.timer = undefined;
       running.slot.elapsed += monotonicTime() - running.start;
       this._running = undefined;
+      if (debugTest.enabled)
+        debugTest(`finished ${debugTitle}`);
     }
   }
 
@@ -94,12 +116,15 @@ export class TimeoutManager {
     if (running.timer)
       clearTimeout(running.timer);
     running.timer = undefined;
-    if (!running.slot.timeout) {
+    if (this._ignoreTimeouts || !running.slot.timeout) {
       running.deadline = kMaxDeadline;
       return;
     }
     running.deadline = running.start + (running.slot.timeout - running.slot.elapsed);
-    const timeout = running.deadline - monotonicTime();
+    // Compensate for Node.js troubles with timeouts that can fire too early.
+    // We add an extra millisecond which seems to be enough.
+    // See https://github.com/nodejs/node/issues/26578.
+    const timeout = running.deadline - monotonicTime() + 1;
     if (timeout <= 0)
       running.timeoutPromise.reject(this._createTimeoutError(running));
     else
@@ -119,8 +144,6 @@ export class TimeoutManager {
 
   setTimeout(timeout: number) {
     const slot = this._running ? this._running.slot : this._defaultSlot;
-    if (!slot.timeout)
-      return; // Zero timeout means some debug mode - do not set a timeout.
     slot.timeout = timeout;
     if (this._running)
       this._updateTimeout(this._running);
@@ -130,6 +153,10 @@ export class TimeoutManager {
     return this._running ? this._running.deadline : kMaxDeadline;
   }
 
+  currentSlotType() {
+    return this._running ? this._running.runnable.type : 'test';
+  }
+
   private _createTimeoutError(running: Running): Error {
     let message = '';
     const timeout = running.slot.timeout;
diff --git a/packages/playwright/src/worker/util.ts b/packages/playwright/src/worker/util.ts
new file mode 100644
index 0000000000000..a999050ee9d6a
--- /dev/null
+++ b/packages/playwright/src/worker/util.ts
@@ -0,0 +1,23 @@
+/**
+ * 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 { serializeError } from '../util';
+
+import type { TestInfoErrorImpl } from '../common/ipc';
+
+export function testInfoError(error: Error | any): TestInfoErrorImpl {
+  return serializeError(error);
+}
diff --git a/packages/playwright/src/worker/workerMain.ts b/packages/playwright/src/worker/workerMain.ts
index 26048e6542910..0cfe0f65db068 100644
--- a/packages/playwright/src/worker/workerMain.ts
+++ b/packages/playwright/src/worker/workerMain.ts
@@ -14,24 +14,28 @@
  * limitations under the License.
  */
 
-import { colors } from 'playwright-core/lib/utilsBundle';
-import { debugTest, relativeFilePath, serializeError } from '../util';
-import { type TestBeginPayload, type TestEndPayload, type RunPayload, type DonePayload, type WorkerInitParams, type TeardownErrorsPayload, stdioChunkToParams } from '../common/ipc';
-import { setCurrentTestInfo, setIsWorkerProcess } from '../common/globals';
+import { ManualPromise, gracefullyCloseAll, removeFolders } from 'playwright-core/lib/utils';
+import { colors } from 'playwright-core/lib/utils';
+
 import { deserializeConfig } from '../common/configLoader';
-import type { Suite, TestCase } from '../common/test';
-import type { Annotation, FullConfigInternal, FullProjectInternal } from '../common/config';
+import { setCurrentTestInfo, setIsWorkerProcess } from '../common/globals';
+import { stdioChunkToParams } from '../common/ipc';
+import { debugTest, relativeFilePath } from '../util';
 import { FixtureRunner } from './fixtureRunner';
-import { ManualPromise, gracefullyCloseAll, removeFolders } from 'playwright-core/lib/utils';
-import { SkipError, TestInfoImpl } from './testInfo';
+import { TestSkipError, TestInfoImpl } from './testInfo';
+import { testInfoError } from './util';
+import { inheritFixtureNames } from '../common/fixtures';
+import { PoolBuilder } from '../common/poolBuilder';
 import { ProcessRunner } from '../common/process';
-import { loadTestFile } from '../common/testLoader';
 import { applyRepeatEachIndex, bindFileSuiteToProject, filterTestsRemoveEmptySuites } from '../common/suiteUtils';
-import { PoolBuilder } from '../common/poolBuilder';
-import type { TestInfoError } from '../../types/test';
+import { loadTestFile } from '../common/testLoader';
+
+import type { TimeSlot } from './timeoutManager';
 import type { Location } from '../../types/testReporter';
-import { inheritFixtureNames } from '../common/fixtures';
-import { type TimeSlot, TimeoutManagerError } from './timeoutManager';
+import type { FullConfigInternal, FullProjectInternal } from '../common/config';
+import type { DonePayload, ResumeAfterStepErrorPayload, RunPayload, TeardownErrorsPayload, TestBeginPayload, TestEndPayload, TestInfoErrorImpl, WorkerInitParams } from '../common/ipc';
+import type { Suite, TestCase } from '../common/test';
+import type { TestAnnotation } from '../../types/test';
 
 export class WorkerMain extends ProcessRunner {
   private _params: WorkerInitParams;
@@ -41,7 +45,7 @@ export class WorkerMain extends ProcessRunner {
   private _fixtureRunner: FixtureRunner;
 
   // Accumulated fatal errors that cannot be attributed to a test.
-  private _fatalErrors: TestInfoError[] = [];
+  private _fatalErrors: TestInfoErrorImpl[] = [];
   // Whether we should skip running remaining tests in this suite because
   // of a setup error, usually beforeAll hook.
   private _skipRemainingTestsInSuite: Suite | undefined;
@@ -57,7 +61,7 @@ export class WorkerMain extends ProcessRunner {
   // Suites that had their beforeAll hooks, but not afterAll hooks executed.
   // These suites still need afterAll hooks to be executed for the proper cleanup.
   // Contains dynamic annotations originated by modifiers with a callback, e.g. `test.skip(() => true)`.
-  private _activeSuites = new Map<Suite, Annotation[]>();
+  private _activeSuites = new Map<Suite, TestAnnotation[]>();
 
   constructor(params: WorkerInitParams) {
     super();
@@ -74,16 +78,22 @@ export class WorkerMain extends ProcessRunner {
 
     process.on('unhandledRejection', reason => this.unhandledError(reason));
     process.on('uncaughtException', error => this.unhandledError(error));
-    process.stdout.write = (chunk: string | Buffer) => {
+    // eslint-disable-next-line no-restricted-properties
+    process.stdout.write = (chunk: string | Buffer, cb?: any) => {
       this.dispatchEvent('stdOut', stdioChunkToParams(chunk));
       this._currentTest?._tracing.appendStdioToTrace('stdout', chunk);
+      if (typeof cb === 'function')
+        process.nextTick(cb);
       return true;
     };
 
     if (!process.env.PW_RUNNER_DEBUG) {
-      process.stderr.write = (chunk: string | Buffer) => {
+      // eslint-disable-next-line no-restricted-properties
+      process.stderr.write = (chunk: string | Buffer, cb?: any) => {
         this.dispatchEvent('stdErr', stdioChunkToParams(chunk));
         this._currentTest?._tracing.appendStdioToTrace('stderr', chunk);
+        if (typeof cb === 'function')
+          process.nextTick(cb);
         return true;
       };
     }
@@ -100,19 +110,23 @@ export class WorkerMain extends ProcessRunner {
   override async gracefullyClose() {
     try {
       await this._stop();
+      if (!this._config) {
+        // We never set anything up and we can crash on attempting cleanup
+        return;
+      }
       // Ignore top-level errors, they are already inside TestInfo.errors.
-      const fakeTestInfo = new TestInfoImpl(this._config, this._project, this._params, undefined, 0, () => {}, () => {}, () => {});
+      const fakeTestInfo = new TestInfoImpl(this._config, this._project, this._params, undefined, 0, () => {}, () => {}, () => {}, () => {});
       const runnable = { type: 'teardown' } as const;
       // We have to load the project to get the right deadline below.
-      await fakeTestInfo._runAsStage({ title: 'worker cleanup', runnable }, () => this._loadIfNeeded()).catch(() => {});
+      await fakeTestInfo._runWithTimeout(runnable, () => this._loadIfNeeded()).catch(() => {});
       await this._fixtureRunner.teardownScope('test', fakeTestInfo, runnable).catch(() => {});
       await this._fixtureRunner.teardownScope('worker', fakeTestInfo, runnable).catch(() => {});
       // Close any other browsers launched in this process. This includes anything launched
       // manually in the test/hooks and internal browsers like Playwright Inspector.
-      await fakeTestInfo._runAsStage({ title: 'worker cleanup', runnable }, () => gracefullyCloseAll()).catch(() => {});
+      await fakeTestInfo._runWithTimeout(runnable, () => gracefullyCloseAll()).catch(() => {});
       this._fatalErrors.push(...fakeTestInfo.errors);
     } catch (e) {
-      this._fatalErrors.push(serializeError(e));
+      this._fatalErrors.push(testInfoError(e));
     }
 
     if (this._fatalErrors.length) {
@@ -122,7 +136,7 @@ export class WorkerMain extends ProcessRunner {
     }
   }
 
-  private _appendProcessTeardownDiagnostics(error: TestInfoError) {
+  private _appendProcessTeardownDiagnostics(error: TestInfoErrorImpl) {
     if (!this._lastRunningTests.length)
       return;
     const count = this._totalRunningTests === 1 ? '1 test' : `${this._totalRunningTests} tests`;
@@ -153,7 +167,7 @@ export class WorkerMain extends ProcessRunner {
     // No current test - fatal error.
     if (!this._currentTest) {
       if (!this._fatalErrors.length)
-        this._fatalErrors.push(serializeError(error));
+        this._fatalErrors.push(testInfoError(error));
       void this._stop();
       return;
     }
@@ -185,15 +199,19 @@ export class WorkerMain extends ProcessRunner {
     if (this._config)
       return;
 
-    this._config = await deserializeConfig(this._params.config);
-    this._project = this._config.projects.find(p => p.id === this._params.projectId)!;
+    const config = await deserializeConfig(this._params.config);
+    const project = config.projects.find(p => p.id === this._params.projectId);
+    if (!project)
+      throw new Error(`Project "${this._params.projectId}" not found in the worker process. Make sure project name does not change.`);
+    this._config = config;
+    this._project = project;
     this._poolBuilder = PoolBuilder.createForWorker(this._project);
   }
 
   async runTestGroup(runPayload: RunPayload) {
     this._runFinished = new ManualPromise<void>();
     const entries = new Map(runPayload.entries.map(e => [e.testId, e]));
-    let fatalUnknownTestIds;
+    let fatalUnknownTestIds: string[] | undefined;
     try {
       await this._loadIfNeeded();
       const fileSuite = await loadTestFile(runPayload.file, this._config.config.rootDir);
@@ -224,7 +242,7 @@ export class WorkerMain extends ProcessRunner {
       // In theory, we should run above code without any errors.
       // However, in the case we screwed up, or loadTestFile failed in the worker
       // but not in the runner, let's do a fatal error.
-      this._fatalErrors.push(serializeError(e));
+      this._fatalErrors.push(testInfoError(e));
       void this._stop();
     } finally {
       const donePayload: DonePayload = {
@@ -243,13 +261,18 @@ export class WorkerMain extends ProcessRunner {
     }
   }
 
+  resumeAfterStepError(params: ResumeAfterStepErrorPayload): void {
+    this._currentTest?.resumeAfterStepError(params);
+  }
+
   private async _runTest(test: TestCase, retry: number, nextTest: TestCase | undefined) {
     const testInfo = new TestInfoImpl(this._config, this._project, this._params, test, retry,
         stepBeginPayload => this.dispatchEvent('stepBegin', stepBeginPayload),
+        stepRecoverFromErrorPayload => this.dispatchEvent('stepRecoverFromError', stepRecoverFromErrorPayload),
         stepEndPayload => this.dispatchEvent('stepEnd', stepEndPayload),
         attachment => this.dispatchEvent('attach', attachment));
 
-    const processAnnotation = (annotation: Annotation) => {
+    const processAnnotation = (annotation: TestAnnotation) => {
       testInfo.annotations.push(annotation);
       switch (annotation.type) {
         case 'fixme':
@@ -306,8 +329,9 @@ export class WorkerMain extends ProcessRunner {
     let shouldRunAfterEachHooks = false;
 
     testInfo._allowSkips = true;
-    await testInfo._runAsStage({ title: 'setup and test' }, async () => {
-      await testInfo._runAsStage({ title: 'start tracing', runnable: { type: 'test' } }, async () => {
+
+    await (async () => {
+      await testInfo._runWithTimeout({ type: 'test' }, async () => {
         // Ideally, "trace" would be an config-level option belonging to the
         // test runner instead of a fixture belonging to Playwright.
         // However, for backwards compatibility, we have to read it from a fixture today.
@@ -332,7 +356,7 @@ export class WorkerMain extends ProcessRunner {
       await removeFolders([testInfo.outputDir]);
 
       let testFunctionParams: object | null = null;
-      await testInfo._runAsStage({ title: 'Before Hooks', stepInfo: { category: 'hook' } }, async () => {
+      await testInfo._runAsStep({ title: 'Before Hooks', category: 'hook' }, async () => {
         // Run "beforeAll" hooks, unless already run during previous tests.
         for (const suite of suites)
           await this._runBeforeAllHooksForSuite(suite, testInfo);
@@ -350,12 +374,12 @@ export class WorkerMain extends ProcessRunner {
         return;
       }
 
-      await testInfo._runAsStage({ title: 'test function', runnable: { type: 'test' } }, async () => {
+      await testInfo._runWithTimeout({ type: 'test' }, async () => {
         // Now run the test itself.
         const fn = test.fn; // Extract a variable to get a better stack trace ("myTest" vs "TestCase.myTest [as fn]").
         await fn(testFunctionParams, testInfo);
       });
-    }).catch(() => {});  // Ignore the top-level error, it is already inside TestInfo.errors.
+    })().catch(() => {});  // Ignore the top-level error, it is already inside TestInfo.errors.
 
     // Update duration, so it is available in fixture teardown and afterEach hooks.
     testInfo.duration = testInfo._timeoutManager.defaultSlot().elapsed | 0;
@@ -366,38 +390,31 @@ export class WorkerMain extends ProcessRunner {
     // After hooks get an additional timeout.
     const afterHooksTimeout = calculateMaxTimeout(this._project.project.timeout, testInfo.timeout);
     const afterHooksSlot = { timeout: afterHooksTimeout, elapsed: 0 };
-    await testInfo._runAsStage({ title: 'After Hooks', stepInfo: { category: 'hook' } }, async () => {
+    await testInfo._runAsStep({ title: 'After Hooks', category: 'hook' }, async () => {
       let firstAfterHooksError: Error | undefined;
-      let didTimeoutInAfterHooks = false;
 
       try {
         // Run "immediately upon test function finish" callback.
-        await testInfo._runAsStage({ title: 'on-test-function-finish', runnable: { type: 'test', slot: afterHooksSlot } }, async () => testInfo._onDidFinishTestFunction?.());
+        await testInfo._runWithTimeout({ type: 'test', slot: afterHooksSlot }, async () => testInfo._onDidFinishTestFunction?.());
       } catch (error) {
-        if (error instanceof TimeoutManagerError)
-          didTimeoutInAfterHooks = true;
         firstAfterHooksError = firstAfterHooksError ?? error;
       }
 
       try {
         // Run "afterEach" hooks, unless we failed at beforeAll stage.
-        if (!didTimeoutInAfterHooks && shouldRunAfterEachHooks)
+        if (shouldRunAfterEachHooks)
           await this._runEachHooksForSuites(reversedSuites, 'afterEach', testInfo, afterHooksSlot);
       } catch (error) {
-        if (error instanceof TimeoutManagerError)
-          didTimeoutInAfterHooks = true;
         firstAfterHooksError = firstAfterHooksError ?? error;
       }
 
+      testInfo._tracing.didFinishTestFunctionAndAfterEachHooks();
+
       try {
-        if (!didTimeoutInAfterHooks) {
-          // Teardown test-scoped fixtures. Attribute to 'test' so that users understand
-          // they should probably increase the test timeout to fix this issue.
-          await this._fixtureRunner.teardownScope('test', testInfo, { type: 'test', slot: afterHooksSlot });
-        }
+        // Teardown test-scoped fixtures. Attribute to 'test' so that users understand
+        // they should probably increase the test timeout to fix this issue.
+        await this._fixtureRunner.teardownScope('test', testInfo, { type: 'test', slot: afterHooksSlot });
       } catch (error) {
-        if (error instanceof TimeoutManagerError)
-          didTimeoutInAfterHooks = true;
         firstAfterHooksError = firstAfterHooksError ?? error;
       }
 
@@ -426,7 +443,7 @@ export class WorkerMain extends ProcessRunner {
       // Mark as "cleaned up" early to avoid running cleanup twice.
       this._didRunFullCleanup = true;
 
-      await testInfo._runAsStage({ title: 'Worker Cleanup', stepInfo: { category: 'hook' } }, async () => {
+      await testInfo._runAsStep({ title: 'Worker Cleanup', category: 'hook' }, async () => {
         let firstWorkerCleanupError: Error | undefined;
 
         // Give it more time for the full cleanup.
@@ -459,7 +476,7 @@ export class WorkerMain extends ProcessRunner {
     }
 
     const tracingSlot = { timeout: this._project.project.timeout, elapsed: 0 };
-    await testInfo._runAsStage({ title: 'stop tracing', runnable: { type: 'test', slot: tracingSlot } }, async () => {
+    await testInfo._runWithTimeout({ type: 'test', slot: tracingSlot }, async () => {
       await testInfo._tracing.stopIfNeeded();
     }).catch(() => {});  // Ignore the top-level error, it is already inside TestInfo.errors.
 
@@ -484,7 +501,7 @@ export class WorkerMain extends ProcessRunner {
         continue;
       const fn = async (fixtures: any) => {
         const result = await modifier.fn(fixtures);
-        testInfo[modifier.type](!!result, modifier.description);
+        testInfo._modifier(modifier.type, modifier.location, [!!result, modifier.description]);
       };
       inheritFixtureNames(modifier.fn, fn);
       runnables.push({
@@ -502,17 +519,17 @@ export class WorkerMain extends ProcessRunner {
   private async _runBeforeAllHooksForSuite(suite: Suite, testInfo: TestInfoImpl) {
     if (this._activeSuites.has(suite))
       return;
-    const extraAnnotations: Annotation[] = [];
+    const extraAnnotations: TestAnnotation[] = [];
     this._activeSuites.set(suite, extraAnnotations);
     await this._runAllHooksForSuite(suite, testInfo, 'beforeAll', extraAnnotations);
   }
 
-  private async _runAllHooksForSuite(suite: Suite, testInfo: TestInfoImpl, type: 'beforeAll' | 'afterAll', extraAnnotations?: Annotation[]) {
+  private async _runAllHooksForSuite(suite: Suite, testInfo: TestInfoImpl, type: 'beforeAll' | 'afterAll', extraAnnotations?: TestAnnotation[]) {
     // Always run all the hooks, and capture the first error.
     let firstError: Error | undefined;
     for (const hook of this._collectHooksAndModifiers(suite, type, testInfo)) {
       try {
-        await testInfo._runAsStage({ title: hook.title, stepInfo: { category: 'hook', location: hook.location } }, async () => {
+        await testInfo._runAsStep({ title: hook.title, category: 'hook', location: hook.location }, async () => {
           // Separate time slot for each beforeAll/afterAll hook.
           const timeSlot = { timeout: this._project.project.timeout, elapsed: 0 };
           const runnable = { type: hook.type, slot: timeSlot, location: hook.location };
@@ -533,7 +550,7 @@ export class WorkerMain extends ProcessRunner {
       } catch (error) {
         firstError = firstError ?? error;
         // Skip in beforeAll/modifier prevents others from running.
-        if (type === 'beforeAll' && (error instanceof SkipError))
+        if (type === 'beforeAll' && (error instanceof TestSkipError))
           break;
         if (type === 'beforeAll' && !this._skipRemainingTestsInSuite) {
           // This will inform dispatcher that we should not run more tests from this group
@@ -559,17 +576,19 @@ export class WorkerMain extends ProcessRunner {
     let firstError: Error | undefined;
     const hooks = suites.map(suite => this._collectHooksAndModifiers(suite, type, testInfo)).flat();
     for (const hook of hooks) {
+      const runnable = { type: hook.type, location: hook.location, slot };
+      if (testInfo._timeoutManager.isTimeExhaustedFor(runnable)) {
+        // Do not run hooks that will timeout right away.
+        continue;
+      }
       try {
-        await testInfo._runAsStage({ title: hook.title, stepInfo: { category: 'hook', location: hook.location } }, async () => {
-          const runnable = { type: hook.type, location: hook.location, slot };
+        await testInfo._runAsStep({ title: hook.title, category: 'hook', location: hook.location }, async () => {
           await this._fixtureRunner.resolveParametersAndRunFunction(hook.fn, testInfo, 'test', runnable);
         });
       } catch (error) {
-        if (error instanceof TimeoutManagerError)
-          throw error;
         firstError = firstError ?? error;
         // Skip in modifier prevents others from running.
-        if (error instanceof SkipError)
+        if (error instanceof TestSkipError)
           break;
       }
     }
diff --git a/packages/playwright/types/test.d.ts b/packages/playwright/types/test.d.ts
index c5a3f5d9dd80a..ae1a6ba88b5a2 100644
--- a/packages/playwright/types/test.d.ts
+++ b/packages/playwright/types/test.d.ts
@@ -18,15 +18,21 @@
 import type { APIRequestContext, Browser, BrowserContext, BrowserContextOptions, Page, LaunchOptions, ViewportSize, Geolocation, HTTPCredentials, Locator, APIResponse, PageScreenshotOptions } from 'playwright-core';
 export * from 'playwright-core';
 
+export type BlobReporterOptions = { outputDir?: string, fileName?: string };
+export type ListReporterOptions = { printSteps?: boolean };
+export type JUnitReporterOptions = { outputFile?: string, stripANSIControlSequences?: boolean, includeProjectInTestName?: boolean };
+export type JsonReporterOptions = { outputFile?: string };
+export type HtmlReporterOptions = { outputFolder?: string, open?: 'always' | 'never' | 'on-failure', host?: string, port?: number, attachmentsBaseURL?: string, title?: string, noSnippets?: boolean };
+
 export type ReporterDescription = Readonly<
-  ['blob'] | ['blob', { outputDir?: string, fileName?: string }] |
+  ['blob'] | ['blob', BlobReporterOptions] |
   ['dot'] |
   ['line'] |
-  ['list'] | ['list', { printSteps?: boolean }] |
+  ['list'] | ['list', ListReporterOptions] |
   ['github'] |
-  ['junit'] | ['junit', { outputFile?: string, stripANSIControlSequences?: boolean, includeProjectInTestName?: boolean }] |
-  ['json'] | ['json', { outputFile?: string }] |
-  ['html'] | ['html', { outputFolder?: string, open?: 'always' | 'never' | 'on-failure', host?: string, port?: number, attachmentsBaseURL?: string }] |
+  ['junit'] | ['junit', JUnitReporterOptions] |
+  ['json'] | ['json', JsonReporterOptions] |
+  ['html'] | ['html', HtmlReporterOptions] |
   ['null'] |
   [string] | [string, any]
 >;
@@ -36,13 +42,14 @@ type UseOptions<TestArgs, WorkerArgs> = Partial<WorkerArgs> & Partial<TestArgs>;
 /**
  * Playwright Test supports running multiple test projects at the same time. This is useful for running tests in
  * multiple configurations. For example, consider running tests against multiple browsers. This type describes format
- * of a project in the configuration file, to access resolved configuration parameters at run time use {@link
- * FullProject}.
+ * of a project in the configuration file, to access resolved configuration parameters at run time use
+ * [FullProject](https://playwright.dev/docs/api/class-fullproject).
  *
  * `TestProject` encapsulates configuration specific to a single project. Projects are configured in
  * [testConfig.projects](https://playwright.dev/docs/api/class-testconfig#test-config-projects) specified in the
- * [configuration file](https://playwright.dev/docs/test-configuration). Note that all properties of {@link TestProject} are available in
- * the top-level {@link TestConfig}, in which case they are shared between all projects.
+ * [configuration file](https://playwright.dev/docs/test-configuration). Note that all properties of
+ * [TestProject](https://playwright.dev/docs/api/class-testproject) are available in the top-level
+ * [TestConfig](https://playwright.dev/docs/api/class-testconfig), in which case they are shared between all projects.
  *
  * Here is an example configuration that runs every test in Chromium, Firefox and WebKit, both Desktop and Mobile
  * versions.
@@ -89,7 +96,8 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
   /**
    * Options for all tests in this project, for example
    * [testOptions.browserName](https://playwright.dev/docs/api/class-testoptions#test-options-browser-name). Learn more
-   * about [configuration](https://playwright.dev/docs/test-configuration) and see [available options]{@link TestOptions}.
+   * about [configuration](https://playwright.dev/docs/test-configuration) and see
+   * [available options][TestOptions](https://playwright.dev/docs/api/class-testoptions).
    *
    * ```js
    * // playwright.config.ts
@@ -190,27 +198,49 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
       maxDiffPixelRatio?: number;
 
       /**
-       * See `animations` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot).
-       * Defaults to `"disabled"`.
+       * See [`animations`](https://playwright.dev/docs/api/class-page#page-screenshot-option-animations) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults to `"disabled"`.
        */
       animations?: "allow"|"disabled";
 
       /**
-       * See `caret` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults
-       * to `"hide"`.
+       * See [`caret`](https://playwright.dev/docs/api/class-page#page-screenshot-option-caret) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults to `"hide"`.
        */
       caret?: "hide"|"initial";
 
       /**
-       * See `scale` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults
-       * to `"css"`.
+       * See [`scale`](https://playwright.dev/docs/api/class-page#page-screenshot-option-scale) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults to `"css"`.
        */
       scale?: "css"|"device";
 
       /**
-       * See `style` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot).
+       * See [`style`](https://playwright.dev/docs/api/class-page#page-screenshot-option-style) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot).
        */
       stylePath?: string|Array<string>;
+
+      /**
+       * A template controlling location of the screenshots. See
+       * [testProject.snapshotPathTemplate](https://playwright.dev/docs/api/class-testproject#test-project-snapshot-path-template)
+       * for details.
+       */
+      pathTemplate?: string;
+    };
+
+    /**
+     * Configuration for the
+     * [expect(locator).toMatchAriaSnapshot([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot-2)
+     * method.
+     */
+    toMatchAriaSnapshot?: {
+      /**
+       * A template controlling location of the aria snapshots. See
+       * [testProject.snapshotPathTemplate](https://playwright.dev/docs/api/class-testproject#test-project-snapshot-path-template)
+       * for details.
+       */
+      pathTemplate?: string;
     };
 
     /**
@@ -275,7 +305,7 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
   grep?: RegExp|Array<RegExp>;
 
   /**
-   * Filter to only run tests with a title **not** matching one of the patterns. This is the opposite of
+   * Filter to only run tests with a title **not** matching any of the patterns. This is the opposite of
    * [testProject.grep](https://playwright.dev/docs/api/class-testproject#test-project-grep). Also available globally
    * and in the [command line](https://playwright.dev/docs/test-cli) with the `--grep-invert` option.
    *
@@ -325,6 +355,10 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
 
   /**
    * Project name is visible in the report and during test execution.
+   *
+   * **NOTE** Playwright executes the configuration file multiple times. Do not dynamically produce non-stable values in
+   * your configuration.
+   *
    */
   name?: string;
 
@@ -391,7 +425,7 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
    *
    * The directory for each test can be accessed by
    * [testInfo.snapshotDir](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-dir) and
-   * [testInfo.snapshotPath(...pathSegments)](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path).
+   * [testInfo.snapshotPath(...name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path).
    *
    * This path will serve as the base directory for each test file snapshot directory. Setting `snapshotDir` to
    * `'snapshots'`, the [testInfo.snapshotDir](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-dir)
@@ -401,10 +435,14 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
 
   /**
    * This option configures a template controlling location of snapshots generated by
-   * [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1)
+   * [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1),
+   * [expect(locator).toMatchAriaSnapshot([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot-2)
    * and
    * [expect(value).toMatchSnapshot(name[, options])](https://playwright.dev/docs/api/class-snapshotassertions#snapshot-assertions-to-match-snapshot-1).
    *
+   * You can configure templates for each assertion separately in
+   * [testConfig.expect](https://playwright.dev/docs/api/class-testconfig#test-config-expect).
+   *
    * **Usage**
    *
    * ```js
@@ -413,7 +451,19 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
    *
    * export default defineConfig({
    *   testDir: './tests',
+   *
+   *   // Single template for all assertions
    *   snapshotPathTemplate: '{testDir}/__screenshots__/{testFilePath}/{arg}{ext}',
+   *
+   *   // Assertion-specific templates
+   *   expect: {
+   *     toHaveScreenshot: {
+   *       pathTemplate: '{testDir}/__screenshots__{/projectName}/{testFilePath}/{arg}{ext}',
+   *     },
+   *     toMatchAriaSnapshot: {
+   *       pathTemplate: '{testDir}/__snapshots__/{testFilePath}/{arg}{ext}',
+   *     },
+   *   },
    * });
    * ```
    *
@@ -444,27 +494,27 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
    * ```
    *
    * The list of supported tokens:
-   * - `{arg}` - Relative snapshot path **without extension**. These come from the arguments passed to the
-   *   `toHaveScreenshot()` and `toMatchSnapshot()` calls; if called without arguments, this will be an auto-generated
-   *   snapshot name.
+   * - `{arg}` - Relative snapshot path **without extension**. This comes from the arguments passed to
+   *   `toHaveScreenshot()`, `toMatchAriaSnapshot()` or `toMatchSnapshot()`; if called without arguments, this will be
+   *   an auto-generated snapshot name.
    *   - Value: `foo/bar/baz`
-   * - `{ext}` - snapshot extension (with dots)
+   * - `{ext}` - Snapshot extension (with the leading dot).
    *   - Value: `.png`
    * - `{platform}` - The value of `process.platform`.
    * - `{projectName}` - Project's file-system-sanitized name, if any.
    *   - Value: `''` (empty string).
    * - `{snapshotDir}` - Project's
-   *   [testConfig.snapshotDir](https://playwright.dev/docs/api/class-testconfig#test-config-snapshot-dir).
+   *   [testProject.snapshotDir](https://playwright.dev/docs/api/class-testproject#test-project-snapshot-dir).
    *   - Value: `/home/playwright/tests` (since `snapshotDir` is not provided in config, it defaults to `testDir`)
    * - `{testDir}` - Project's
-   *   [testConfig.testDir](https://playwright.dev/docs/api/class-testconfig#test-config-test-dir).
-   *   - Value: `/home/playwright/tests` (absolute path is since `testDir` is resolved relative to directory with
+   *   [testProject.testDir](https://playwright.dev/docs/api/class-testproject#test-project-test-dir).
+   *   - Value: `/home/playwright/tests` (absolute path since `testDir` is resolved relative to directory with
    *     config)
    * - `{testFileDir}` - Directories in relative path from `testDir` to **test file**.
    *   - Value: `page`
    * - `{testFileName}` - Test file name with extension.
    *   - Value: `page-click.spec.ts`
-   * - `{testFilePath}` - Relative path from `testDir` to **test file**
+   * - `{testFilePath}` - Relative path from `testDir` to **test file**.
    *   - Value: `page/page-click.spec.ts`
    * - `{testName}` - File-system-sanitized test title, including parent describes but excluding file name.
    *   - Value: `suite-test-should-work`
@@ -632,6 +682,47 @@ interface TestProject<TestArgs = {}, WorkerArgs = {}> {
    * option for all projects.
    */
   timeout?: number;
+
+  /**
+   * The maximum number of concurrent worker processes to use for parallelizing tests from this project. Can also be set
+   * as percentage of logical CPU cores, e.g. `'50%'.`
+   *
+   * This could be useful, for example, when all tests from a project share a single resource like a test account, and
+   * therefore cannot be executed in parallel. Limiting workers to one for such a project will prevent simultaneous use
+   * of the shared resource.
+   *
+   * Note that the global [testConfig.workers](https://playwright.dev/docs/api/class-testconfig#test-config-workers)
+   * limit applies to the total number of worker processes. However, Playwright will limit the number of workers used
+   * for this project by the value of
+   * [testProject.workers](https://playwright.dev/docs/api/class-testproject#test-project-workers).
+   *
+   * By default, there is no limit per project. See
+   * [testConfig.workers](https://playwright.dev/docs/api/class-testconfig#test-config-workers) for the default of the
+   * total worker limit.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   workers: 10,  // total workers limit
+   *
+   *   projects: [
+   *     {
+   *       name: 'runs in parallel',
+   *     },
+   *     {
+   *       name: 'one at a time',
+   *       workers: 1,  // workers limit for this project
+   *     },
+   *   ],
+   * });
+   * ```
+   *
+   */
+  workers?: number|string;
 }
 
 export interface Project<TestArgs = {}, WorkerArgs = {}> extends TestProject<TestArgs, WorkerArgs> {
@@ -641,8 +732,8 @@ export interface Project<TestArgs = {}, WorkerArgs = {}> extends TestProject<Tes
  * Runtime representation of the test project configuration. It is accessible in the tests via
  * [testInfo.project](https://playwright.dev/docs/api/class-testinfo#test-info-project) and
  * [workerInfo.project](https://playwright.dev/docs/api/class-workerinfo#worker-info-project) and is passed to the
- * test reporters. To see the format of the project in the Playwright configuration file please see {@link
- * TestProject} instead.
+ * test reporters. To see the format of the project in the Playwright configuration file please see
+ * [TestProject](https://playwright.dev/docs/api/class-testproject) instead.
  */
 export interface FullProject<TestArgs = {}, WorkerArgs = {}> {
   /**
@@ -724,13 +815,15 @@ type LiteralUnion<T extends U, U = string> = T | (U & { zz_IGNORE_ME?: never });
 
 /**
  * Playwright Test provides many options to configure how your tests are collected and executed, for example `timeout`
- * or `testDir`. These options are described in the {@link TestConfig} object in the
- * [configuration file](https://playwright.dev/docs/test-configuration). This type describes format of the configuration file, to access
- * resolved configuration parameters at run time use {@link FullConfig}.
+ * or `testDir`. These options are described in the [TestConfig](https://playwright.dev/docs/api/class-testconfig)
+ * object in the [configuration file](https://playwright.dev/docs/test-configuration). This type describes format of the configuration file,
+ * to access resolved configuration parameters at run time use
+ * [FullConfig](https://playwright.dev/docs/api/class-fullconfig).
  *
  * Playwright Test supports running multiple test projects at the same time. Project-specific options should be put to
- * [testConfig.projects](https://playwright.dev/docs/api/class-testconfig#test-config-projects), but top-level {@link
- * TestConfig} can also define base options shared between all projects.
+ * [testConfig.projects](https://playwright.dev/docs/api/class-testconfig#test-config-projects), but top-level
+ * [TestConfig](https://playwright.dev/docs/api/class-testconfig) can also define base options shared between all
+ * projects.
  *
  * ```js
  * // playwright.config.ts
@@ -747,8 +840,8 @@ type LiteralUnion<T extends U, U = string> = T | (U & { zz_IGNORE_ME?: never });
  */
 interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
   /**
-   * Playwright Test supports running multiple test projects at the same time. See {@link TestProject} for more
-   * information.
+   * Playwright Test supports running multiple test projects at the same time. See
+   * [TestProject](https://playwright.dev/docs/api/class-testproject) for more information.
    *
    * **Usage**
    *
@@ -791,7 +884,8 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
   /**
    * Global options for all tests, for example
    * [testOptions.browserName](https://playwright.dev/docs/api/class-testoptions#test-options-browser-name). Learn more
-   * about [configuration](https://playwright.dev/docs/test-configuration) and see [available options]{@link TestOptions}.
+   * about [configuration](https://playwright.dev/docs/test-configuration) and see
+   * [available options][TestOptions](https://playwright.dev/docs/api/class-testoptions).
    *
    * **Usage**
    *
@@ -837,7 +931,7 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    * export default defineConfig({
    *   webServer: {
    *     command: 'npm run start',
-   *     url: 'http://127.0.0.1:3000',
+   *     url: 'http://localhost:3000',
    *     timeout: 120 * 1000,
    *     reuseExistingServer: !process.env.CI,
    *   },
@@ -868,19 +962,21 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    *   webServer: [
    *     {
    *       command: 'npm run start',
-   *       url: 'http://127.0.0.1:3000',
+   *       url: 'http://localhost:3000',
+   *       name: 'Frontend',
    *       timeout: 120 * 1000,
    *       reuseExistingServer: !process.env.CI,
    *     },
    *     {
    *       command: 'npm run backend',
-   *       url: 'http://127.0.0.1:3333',
+   *       url: 'http://localhost:3333',
+   *       name: 'Backend',
    *       timeout: 120 * 1000,
    *       reuseExistingServer: !process.env.CI,
    *     }
    *   ],
    *   use: {
-   *     baseURL: 'http://127.0.0.1:3000',
+   *     baseURL: 'http://localhost:3000',
    *   },
    * });
    * ```
@@ -912,6 +1008,44 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
     external?: Array<string>;
   };
 
+  /**
+   * These settings control whether git information is captured and stored in the config
+   * [testConfig.metadata](https://playwright.dev/docs/api/class-testconfig#test-config-metadata).
+   *
+   * **Usage**
+   *
+   * ```js
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   captureGitInfo: { commit: true, diff: true }
+   * });
+   * ```
+   *
+   * **Details**
+   * - Capturing `commit` information is useful when you'd like to see it in your HTML (or a third party) report.
+   * - Capturing `diff` information is useful to enrich the report with the actual source diff. This information can
+   *   be used to provide intelligent advice on how to fix the test.
+   *
+   * **NOTE** Default values for these settings depend on the environment. When tests run as a part of CI where it is
+   * safe to obtain git information, the default value is `true`, `false` otherwise.
+   *
+   * **NOTE** The structure of the git commit metadata is subject to change.
+   *
+   */
+  captureGitInfo?: {
+    /**
+     * Whether to capture commit and pull request information such as hash, author, timestamp.
+     */
+    commit?: boolean;
+
+    /**
+     * Whether to capture commit diff.
+     */
+    diff?: boolean;
+  };
+
   /**
    * Configuration for the `expect` assertion library. Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    *
@@ -945,14 +1079,14 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
      */
     toHaveScreenshot?: {
       /**
-       * See `animations` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot).
-       * Defaults to `"disabled"`.
+       * See [`animations`](https://playwright.dev/docs/api/class-page#page-screenshot-option-animations) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults to `"disabled"`.
        */
       animations?: "allow"|"disabled";
 
       /**
-       * See `caret` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults
-       * to `"hide"`.
+       * See [`caret`](https://playwright.dev/docs/api/class-page#page-screenshot-option-caret) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults to `"hide"`.
        */
       caret?: "hide"|"initial";
 
@@ -968,13 +1102,14 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
       maxDiffPixelRatio?: number;
 
       /**
-       * See `scale` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults
-       * to `"css"`.
+       * See [`scale`](https://playwright.dev/docs/api/class-page#page-screenshot-option-scale) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot). Defaults to `"css"`.
        */
       scale?: "css"|"device";
 
       /**
-       * See `style` in [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot).
+       * See [`style`](https://playwright.dev/docs/api/class-page#page-screenshot-option-style) in
+       * [page.screenshot([options])](https://playwright.dev/docs/api/class-page#page-screenshot).
        */
       stylePath?: string|Array<string>;
 
@@ -984,6 +1119,27 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
        * [YIQ color space](https://en.wikipedia.org/wiki/YIQ) and defaults `threshold` value to `0.2`.
        */
       threshold?: number;
+
+      /**
+       * A template controlling location of the screenshots. See
+       * [testConfig.snapshotPathTemplate](https://playwright.dev/docs/api/class-testconfig#test-config-snapshot-path-template)
+       * for details.
+       */
+      pathTemplate?: string;
+    };
+
+    /**
+     * Configuration for the
+     * [expect(locator).toMatchAriaSnapshot([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot-2)
+     * method.
+     */
+    toMatchAriaSnapshot?: {
+      /**
+       * A template controlling location of the aria snapshots. See
+       * [testConfig.snapshotPathTemplate](https://playwright.dev/docs/api/class-testconfig#test-config-snapshot-path-template)
+       * for details.
+       */
+      pathTemplate?: string;
     };
 
     /**
@@ -1027,6 +1183,25 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
     };
   };
 
+  /**
+   * Whether to exit with an error if any tests are marked as flaky. Useful on CI.
+   *
+   * Also available in the [command line](https://playwright.dev/docs/test-cli) with the `--fail-on-flaky-tests` option.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   failOnFlakyTests: !!process.env.CI,
+   * });
+   * ```
+   *
+   */
+  failOnFlakyTests?: boolean;
+
   /**
    * Whether to exit with an error if any tests or groups are marked as
    * [test.only(title[, details, body])](https://playwright.dev/docs/api/class-test#test-only) or
@@ -1070,7 +1245,8 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
 
   /**
    * Path to the global setup file. This file will be required and run before all the tests. It must export a single
-   * function that takes a {@link FullConfig} argument.
+   * function that takes a [FullConfig](https://playwright.dev/docs/api/class-fullconfig) argument. Pass an array of
+   * paths to specify multiple global setup files.
    *
    * Learn more about [global setup and teardown](https://playwright.dev/docs/test-global-setup-teardown).
    *
@@ -1086,12 +1262,13 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    * ```
    *
    */
-  globalSetup?: string;
+  globalSetup?: string|Array<string>;
 
   /**
    * Path to the global teardown file. This file will be required and run after all the tests. It must export a single
    * function. See also
-   * [testConfig.globalSetup](https://playwright.dev/docs/api/class-testconfig#test-config-global-setup).
+   * [testConfig.globalSetup](https://playwright.dev/docs/api/class-testconfig#test-config-global-setup). Pass an array
+   * of paths to specify multiple global teardown files.
    *
    * Learn more about [global setup and teardown](https://playwright.dev/docs/test-global-setup-teardown).
    *
@@ -1107,7 +1284,7 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    * ```
    *
    */
-  globalTeardown?: string;
+  globalTeardown?: string|Array<string>;
 
   /**
    * Maximum time in milliseconds the whole test suite can run. Zero timeout (default) disables this behavior. Useful on
@@ -1211,7 +1388,8 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
   maxFailures?: number;
 
   /**
-   * Metadata that will be put directly to the test report serialized as JSON.
+   * Metadata contains key-value pairs to be included in the report. For example, HTML report will display it as
+   * key-value pairs, and JSON report will include metadata serialized as json.
    *
    * **Usage**
    *
@@ -1220,7 +1398,7 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    * import { defineConfig } from '@playwright/test';
    *
    * export default defineConfig({
-   *   metadata: 'acceptance tests',
+   *   metadata: { title: 'acceptance tests' },
    * });
    * ```
    *
@@ -1366,7 +1544,7 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
     max: number;
 
     /**
-     * Test duration in milliseconds that is considered slow. Defaults to 15 seconds.
+     * Test file duration in milliseconds that is considered slow. Defaults to 5 minutes.
      */
     threshold: number;
   };
@@ -1449,7 +1627,7 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    *
    * The directory for each test can be accessed by
    * [testInfo.snapshotDir](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-dir) and
-   * [testInfo.snapshotPath(...pathSegments)](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path).
+   * [testInfo.snapshotPath(...name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path).
    *
    * This path will serve as the base directory for each test file snapshot directory. Setting `snapshotDir` to
    * `'snapshots'`, the [testInfo.snapshotDir](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-dir)
@@ -1459,10 +1637,14 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
 
   /**
    * This option configures a template controlling location of snapshots generated by
-   * [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1)
+   * [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1),
+   * [expect(locator).toMatchAriaSnapshot([options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot-2)
    * and
    * [expect(value).toMatchSnapshot(name[, options])](https://playwright.dev/docs/api/class-snapshotassertions#snapshot-assertions-to-match-snapshot-1).
    *
+   * You can configure templates for each assertion separately in
+   * [testConfig.expect](https://playwright.dev/docs/api/class-testconfig#test-config-expect).
+   *
    * **Usage**
    *
    * ```js
@@ -1471,7 +1653,19 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    *
    * export default defineConfig({
    *   testDir: './tests',
+   *
+   *   // Single template for all assertions
    *   snapshotPathTemplate: '{testDir}/__screenshots__/{testFilePath}/{arg}{ext}',
+   *
+   *   // Assertion-specific templates
+   *   expect: {
+   *     toHaveScreenshot: {
+   *       pathTemplate: '{testDir}/__screenshots__{/projectName}/{testFilePath}/{arg}{ext}',
+   *     },
+   *     toMatchAriaSnapshot: {
+   *       pathTemplate: '{testDir}/__snapshots__/{testFilePath}/{arg}{ext}',
+   *     },
+   *   },
    * });
    * ```
    *
@@ -1502,27 +1696,27 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    * ```
    *
    * The list of supported tokens:
-   * - `{arg}` - Relative snapshot path **without extension**. These come from the arguments passed to the
-   *   `toHaveScreenshot()` and `toMatchSnapshot()` calls; if called without arguments, this will be an auto-generated
-   *   snapshot name.
+   * - `{arg}` - Relative snapshot path **without extension**. This comes from the arguments passed to
+   *   `toHaveScreenshot()`, `toMatchAriaSnapshot()` or `toMatchSnapshot()`; if called without arguments, this will be
+   *   an auto-generated snapshot name.
    *   - Value: `foo/bar/baz`
-   * - `{ext}` - snapshot extension (with dots)
+   * - `{ext}` - Snapshot extension (with the leading dot).
    *   - Value: `.png`
    * - `{platform}` - The value of `process.platform`.
    * - `{projectName}` - Project's file-system-sanitized name, if any.
    *   - Value: `''` (empty string).
    * - `{snapshotDir}` - Project's
-   *   [testConfig.snapshotDir](https://playwright.dev/docs/api/class-testconfig#test-config-snapshot-dir).
+   *   [testProject.snapshotDir](https://playwright.dev/docs/api/class-testproject#test-project-snapshot-dir).
    *   - Value: `/home/playwright/tests` (since `snapshotDir` is not provided in config, it defaults to `testDir`)
    * - `{testDir}` - Project's
-   *   [testConfig.testDir](https://playwright.dev/docs/api/class-testconfig#test-config-test-dir).
-   *   - Value: `/home/playwright/tests` (absolute path is since `testDir` is resolved relative to directory with
+   *   [testProject.testDir](https://playwright.dev/docs/api/class-testproject#test-project-test-dir).
+   *   - Value: `/home/playwright/tests` (absolute path since `testDir` is resolved relative to directory with
    *     config)
    * - `{testFileDir}` - Directories in relative path from `testDir` to **test file**.
    *   - Value: `page`
    * - `{testFileName}` - Test file name with extension.
    *   - Value: `page-click.spec.ts`
-   * - `{testFilePath}` - Relative path from `testDir` to **test file**
+   * - `{testFilePath}` - Relative path from `testDir` to **test file**.
    *   - Value: `page/page-click.spec.ts`
    * - `{testName}` - File-system-sanitized test title, including parent describes but excluding file name.
    *   - Value: `suite-test-should-work`
@@ -1635,13 +1829,33 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    */
   timeout?: number;
 
+  /**
+   * Path to a single `tsconfig` applicable to all imported files. By default, `tsconfig` for each imported file is
+   * looked up separately. Note that `tsconfig` property has no effect while the configuration file or any of its
+   * dependencies are loaded. Ignored when `--tsconfig` command line option is specified.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   tsconfig: './tsconfig.test.json',
+   * });
+   * ```
+   *
+   */
+  tsconfig?: string;
+
   /**
    * Whether to update expected snapshots with the actual results produced by the test run. Defaults to `'missing'`.
-   * - `'all'` - All tests that are executed will update snapshots that did not match. Matching snapshots will not be
-   *   updated.
-   * - `'none'` - No snapshots are updated.
+   * - `'all'` - All tests that are executed will update snapshots.
+   * - `'changed'` - All tests that are executed will update snapshots that did not match. Matching snapshots will not
+   *   be updated.
    * - `'missing'` - Missing snapshots are created, for example when authoring a new test and running it for the first
    *   time. This is the default.
+   * - `'none'` - No snapshots are updated.
    *
    * Learn more about [snapshots](https://playwright.dev/docs/test-snapshots).
    *
@@ -1657,7 +1871,16 @@ interface TestConfig<TestArgs = {}, WorkerArgs = {}> {
    * ```
    *
    */
-  updateSnapshots?: "all"|"none"|"missing";
+  updateSnapshots?: "all"|"changed"|"missing"|"none";
+
+  /**
+   * Defines how to update snapshots in the source code.
+   * - `'patch'` - Create a unified diff file that can be used to update the source code later. This is the default.
+   * - `'3way'` - Generate merge conflict markers in source code. This allows user to manually pick relevant changes,
+   *   as if they are resolving a merge conflict in the IDE.
+   * - `'overwrite'` - Overwrite the source code with the new snapshot values.
+   */
+  updateSourceMethod?: "overwrite"|"3way"|"patch";
 
   /**
    * The maximum number of concurrent worker processes to use for parallelizing tests. Can also be set as percentage of
@@ -1692,7 +1915,8 @@ export type Metadata = { [key: string]: any };
 /**
  * Resolved configuration which is accessible via
  * [testInfo.config](https://playwright.dev/docs/api/class-testinfo#test-info-config) and is passed to the test
- * reporters. To see the format of Playwright configuration file, please see {@link TestConfig} instead.
+ * reporters. To see the format of Playwright configuration file, please see
+ * [TestConfig](https://playwright.dev/docs/api/class-testconfig) instead.
  */
 export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
   /**
@@ -1772,12 +1996,12 @@ export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
    */
   reportSlowTests: null|{
     /**
-     * The maximum number of slow test files to report. Defaults to `5`.
+     * The maximum number of slow test files to report.
      */
     max: number;
 
     /**
-     * Test duration in milliseconds that is considered slow. Defaults to 15 seconds.
+     * Test file duration in milliseconds that is considered slow.
      */
     threshold: number;
   };
@@ -1805,7 +2029,13 @@ export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
   /**
    * See [testConfig.updateSnapshots](https://playwright.dev/docs/api/class-testconfig#test-config-update-snapshots).
    */
-  updateSnapshots: "all"|"none"|"missing";
+  updateSnapshots: "all"|"changed"|"missing"|"none";
+
+  /**
+   * See
+   * [testConfig.updateSourceMethod](https://playwright.dev/docs/api/class-testconfig#test-config-update-source-method).
+   */
+  updateSourceMethod: "overwrite"|"3way"|"patch";
 
   /**
    * Playwright version.
@@ -1818,307 +2048,565 @@ export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
   workers: number;
 }
 
-export type TestStatus = 'passed' | 'failed' | 'timedOut' | 'skipped' | 'interrupted';
-
-type TestDetailsAnnotation = {
-  type: string;
-  description?: string;
-};
-
-export type TestDetails = {
-  tag?: string | string[];
-  annotation?: TestDetailsAnnotation | TestDetailsAnnotation[];
-}
-
-interface SuiteFunction {
+/**
+ * `TestInfo` contains information about currently running test. It is available to test functions,
+ * [test.beforeEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-before-each),
+ * [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each),
+ * [test.beforeAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-before-all) and
+ * [test.afterAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-all) hooks, and
+ * test-scoped fixtures. `TestInfo` provides utilities to control test execution: attach files, update test timeout,
+ * determine which test is currently running and whether it was retried, etc.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('basic test', async ({ page }, testInfo) => {
+ *   expect(testInfo.title).toBe('basic test');
+ *   await page.screenshot(testInfo.outputPath('screenshot.png'));
+ * });
+ * ```
+ *
+ */
+export interface TestInfo {
   /**
-   * Declares a group of tests.
-   * - `test.describe(title, callback)`
-   * - `test.describe(callback)`
-   * - `test.describe(title, details, callback)`
+   * Returns a path to a snapshot file with the given `name`. Pass
+   * [`kind`](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path-option-kind) to obtain a specific
+   * path:
+   * - `kind: 'screenshot'` for
+   *   [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1);
+   * - `kind: 'aria'` for
+   *   [expect(locator).toMatchAriaSnapshot(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot);
+   * - `kind: 'snapshot'` for
+   *   [expect(value).toMatchSnapshot(name[, options])](https://playwright.dev/docs/api/class-snapshotassertions#snapshot-assertions-to-match-snapshot-1).
    *
    * **Usage**
    *
-   * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
-   * test's title.
-   *
    * ```js
-   * test.describe('two tests', () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
+   * await expect(page).toHaveScreenshot('header.png');
+   * // Screenshot assertion above expects screenshot at this path:
+   * const screenshotPath = test.info().snapshotPath('header.png', { kind: 'screenshot' });
    *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
-   * });
+   * await expect(page.getByRole('main')).toMatchAriaSnapshot({ name: 'main.aria.yml' });
+   * // Aria snapshot assertion above expects snapshot at this path:
+   * const ariaSnapshotPath = test.info().snapshotPath('main.aria.yml', { kind: 'aria' });
+   *
+   * expect('some text').toMatchSnapshot('snapshot.txt');
+   * // Snapshot assertion above expects snapshot at this path:
+   * const snapshotPath = test.info().snapshotPath('snapshot.txt');
+   *
+   * expect('some text').toMatchSnapshot(['dir', 'subdir', 'snapshot.txt']);
+   * // Snapshot assertion above expects snapshot at this path:
+   * const nestedPath = test.info().snapshotPath('dir', 'subdir', 'snapshot.txt');
    * ```
    *
-   * **Anonymous group**
+   * @param name The name of the snapshot or the path segments to define the snapshot file path. Snapshots with the same name in the
+   * same test file are expected to be the same.
    *
-   * You can also declare a test group without a title. This is convenient to give a group of tests a common option with
-   * [test.use(options)](https://playwright.dev/docs/api/class-test#test-use).
+   * When passing [`kind`](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path-option-kind), multiple
+   * name segments are not supported.
+   * @param options
+   */
+  snapshotPath(...name: ReadonlyArray<string>): string;
+  /**
+   * Returns a path to a snapshot file with the given `name`. Pass
+   * [`kind`](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path-option-kind) to obtain a specific
+   * path:
+   * - `kind: 'screenshot'` for
+   *   [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1);
+   * - `kind: 'aria'` for
+   *   [expect(locator).toMatchAriaSnapshot(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-match-aria-snapshot);
+   * - `kind: 'snapshot'` for
+   *   [expect(value).toMatchSnapshot(name[, options])](https://playwright.dev/docs/api/class-snapshotassertions#snapshot-assertions-to-match-snapshot-1).
+   *
+   * **Usage**
    *
    * ```js
-   * test.describe(() => {
-   *   test.use({ colorScheme: 'dark' });
+   * await expect(page).toHaveScreenshot('header.png');
+   * // Screenshot assertion above expects screenshot at this path:
+   * const screenshotPath = test.info().snapshotPath('header.png', { kind: 'screenshot' });
    *
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
+   * await expect(page.getByRole('main')).toMatchAriaSnapshot({ name: 'main.aria.yml' });
+   * // Aria snapshot assertion above expects snapshot at this path:
+   * const ariaSnapshotPath = test.info().snapshotPath('main.aria.yml', { kind: 'aria' });
    *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
-   * });
+   * expect('some text').toMatchSnapshot('snapshot.txt');
+   * // Snapshot assertion above expects snapshot at this path:
+   * const snapshotPath = test.info().snapshotPath('snapshot.txt');
+   *
+   * expect('some text').toMatchSnapshot(['dir', 'subdir', 'snapshot.txt']);
+   * // Snapshot assertion above expects snapshot at this path:
+   * const nestedPath = test.info().snapshotPath('dir', 'subdir', 'snapshot.txt');
    * ```
    *
-   * **Tags**
+   * @param name The name of the snapshot or the path segments to define the snapshot file path. Snapshots with the same name in the
+   * same test file are expected to be the same.
    *
-   * You can tag all tests in a group by providing additional details. Note that each tag must start with `@` symbol.
+   * When passing [`kind`](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-path-option-kind), multiple
+   * name segments are not supported.
+   * @param options
+   */
+  snapshotPath(name: string, options: { kind: 'snapshot' | 'screenshot' | 'aria' }): string;
+  /**
+   * Attach a value or a file from disk to the current test. Some reporters show test attachments. Either
+   * [`path`](https://playwright.dev/docs/api/class-testinfo#test-info-attach-option-path) or
+   * [`body`](https://playwright.dev/docs/api/class-testinfo#test-info-attach-option-body) must be specified, but not
+   * both.
+   *
+   * For example, you can attach a screenshot to the test:
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.describe('two tagged tests', {
-   *   tag: '@smoke',
-   * }, () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test('basic test', async ({ page }, testInfo) => {
+   *   await page.goto('https://playwright.dev');
+   *   const screenshot = await page.screenshot();
+   *   await testInfo.attach('screenshot', { body: screenshot, contentType: 'image/png' });
    * });
    * ```
    *
-   * Learn more about [tagging](https://playwright.dev/docs/test-annotations#tag-tests).
-   *
-   * **Annotations**
-   *
-   * You can annotate all tests in a group by providing additional details.
+   * Or you can attach files returned by your APIs:
    *
    * ```js
    * import { test, expect } from '@playwright/test';
+   * import { download } from './my-custom-helpers';
    *
-   * test.describe('two annotated tests', {
-   *   annotation: {
-   *     type: 'issue',
-   *     description: 'https://github.com/microsoft/playwright/issues/23180',
-   *   },
-   * }, () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test('basic test', async ({}, testInfo) => {
+   *   const tmpPath = await download('a');
+   *   await testInfo.attach('downloaded', { path: tmpPath });
    * });
    * ```
    *
-   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
-   * @param title Group title.
-   * @param details Additional details for all tests in the group.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
-   * declared in this callback will belong to the group.
+   * **NOTE** [testInfo.attach(name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-attach)
+   * automatically takes care of copying attached files to a location that is accessible to reporters. You can safely
+   * remove the attachment after awaiting the attach call.
+   *
+   * @param name Attachment name. The name will also be sanitized and used as the prefix of file name when saving to disk.
+   * @param options
    */
-  (title: string, callback: () => void): void;
-  /**
-   * Declares a group of tests.
-   * - `test.describe(title, callback)`
-   * - `test.describe(callback)`
-   * - `test.describe(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
-   * test's title.
-   *
-   * ```js
-   * test.describe('two tests', () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
-   * });
-   * ```
-   *
-   * **Anonymous group**
-   *
-   * You can also declare a test group without a title. This is convenient to give a group of tests a common option with
-   * [test.use(options)](https://playwright.dev/docs/api/class-test#test-use).
+  attach(name: string, options?: {
+    /**
+     * Attachment body. Mutually exclusive with
+     * [`path`](https://playwright.dev/docs/api/class-testinfo#test-info-attach-option-path).
+     */
+    body?: string|Buffer;
+
+    /**
+     * Content type of this attachment to properly present in the report, for example `'application/json'` or
+     * `'image/png'`. If omitted, content type is inferred based on the
+     * [`path`](https://playwright.dev/docs/api/class-testinfo#test-info-attach-option-path), or defaults to `text/plain`
+     * for [string] attachments and `application/octet-stream` for [Buffer] attachments.
+     */
+    contentType?: string;
+
+    /**
+     * Path on the filesystem to the attached file. Mutually exclusive with
+     * [`body`](https://playwright.dev/docs/api/class-testinfo#test-info-attach-option-body).
+     */
+    path?: string;
+  }): Promise<void>;
+
+  /**
+   * Marks the currently running test as "should fail". Playwright Test runs this test and ensures that it is actually
+   * failing. This is useful for documentation purposes to acknowledge that some functionality is broken until it is
+   * fixed. This is similar to
+   * [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail).
+   */
+  fail(): void;
+
+  /**
+   * Conditionally mark the currently running test as "should fail" with an optional description. This is similar to
+   * [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail).
+   * @param condition Test is marked as "should fail" when the condition is `true`.
+   * @param description Optional description that will be reflected in a test report.
+   */
+  fail(condition: boolean, description?: string): void;
+
+  /**
+   * Mark a test as "fixme", with the intention to fix it. Test is immediately aborted. This is similar to
+   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme).
+   */
+  fixme(): void;
+
+  /**
+   * Conditionally mark the currently running test as "fixme" with an optional description. This is similar to
+   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme).
+   * @param condition Test is marked as "fixme" when the condition is `true`.
+   * @param description Optional description that will be reflected in a test report.
+   */
+  fixme(condition: boolean, description?: string): void;
+
+  /**
+   * Returns a path inside the [testInfo.outputDir](https://playwright.dev/docs/api/class-testinfo#test-info-output-dir)
+   * where the test can safely put a temporary file. Guarantees that tests running in parallel will not interfere with
+   * each other.
    *
    * ```js
-   * test.describe(() => {
-   *   test.use({ colorScheme: 'dark' });
-   *
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
+   * import { test, expect } from '@playwright/test';
+   * import fs from 'fs';
    *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test('example test', async ({}, testInfo) => {
+   *   const file = testInfo.outputPath('dir', 'temporary-file.txt');
+   *   await fs.promises.writeFile(file, 'Put some data to the dir/temporary-file.txt', 'utf8');
    * });
    * ```
    *
-   * **Tags**
+   * > Note that `pathSegments` accepts path segments to the test output directory such as
+   * `testInfo.outputPath('relative', 'path', 'to', 'output')`.
+   * > However, this path must stay within the
+   * [testInfo.outputDir](https://playwright.dev/docs/api/class-testinfo#test-info-output-dir) directory for each test
+   * (i.e. `test-results/a-test-title`), otherwise it will throw.
+   * @param pathSegments Path segments to append at the end of the resulting path.
+   */
+  outputPath(...pathSegments: ReadonlyArray<string>): string;
+
+  /**
+   * Changes the timeout for the currently running test. Zero means no timeout. Learn more about
+   * [various timeouts](https://playwright.dev/docs/test-timeouts).
    *
-   * You can tag all tests in a group by providing additional details. Note that each tag must start with `@` symbol.
+   * Timeout is usually specified in the [configuration file](https://playwright.dev/docs/test-configuration), but it could be useful to
+   * change the timeout in certain scenarios:
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.describe('two tagged tests', {
-   *   tag: '@smoke',
-   * }, () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test.beforeEach(async ({ page }, testInfo) => {
+   *   // Extend timeout for all tests running this hook by 30 seconds.
+   *   testInfo.setTimeout(testInfo.timeout + 30000);
    * });
    * ```
    *
-   * Learn more about [tagging](https://playwright.dev/docs/test-annotations#tag-tests).
+   * @param timeout Timeout in milliseconds.
+   */
+  setTimeout(timeout: number): void;
+
+  /**
+   * Unconditionally skip the currently running test. Test is immediately aborted. This is similar to
+   * [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip).
+   */
+  skip(): void;
+
+  /**
+   * Conditionally skips the currently running test with an optional description. This is similar to
+   * [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip).
+   * @param condition A skip condition. Test is skipped when the condition is `true`.
+   * @param description Optional description that will be reflected in a test report.
+   */
+  skip(condition: boolean, description?: string): void;
+
+  /**
+   * Marks the currently running test as "slow", giving it triple the default timeout. This is similar to
+   * [test.slow([condition, callback, description])](https://playwright.dev/docs/api/class-test#test-slow).
+   */
+  slow(): void;
+
+  /**
+   * Conditionally mark the currently running test as "slow" with an optional description, giving it triple the default
+   * timeout. This is similar to
+   * [test.slow([condition, callback, description])](https://playwright.dev/docs/api/class-test#test-slow).
+   * @param condition Test is marked as "slow" when the condition is `true`.
+   * @param description Optional description that will be reflected in a test report.
+   */
+  slow(condition: boolean, description?: string): void;
+
+  /**
+   * The list of annotations applicable to the current test. Includes annotations from the test, annotations from all
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) groups the
+   * test belongs to and file-level annotations for the test file.
    *
-   * **Annotations**
+   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+   */
+  annotations: Array<{
+    /**
+     * Annotation type, for example `'skip'` or `'fail'`.
+     */
+    type: string;
+
+    /**
+     * Optional description.
+     */
+    description?: string;
+
+    /**
+     * Optional location in the source where the annotation is added.
+     */
+    location?: Location;
+  }>;
+
+  /**
+   * The list of files or buffers attached to the current test. Some reporters show test attachments.
    *
-   * You can annotate all tests in a group by providing additional details.
+   * To add an attachment, use
+   * [testInfo.attach(name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-attach) instead of
+   * directly pushing onto this array.
+   */
+  attachments: Array<{
+    /**
+     * Attachment name.
+     */
+    name: string;
+
+    /**
+     * Content type of this attachment to properly present in the report, for example `'application/json'` or
+     * `'image/png'`.
+     */
+    contentType: string;
+
+    /**
+     * Optional path on the filesystem to the attached file.
+     */
+    path?: string;
+
+    /**
+     * Optional attachment body used instead of a file.
+     */
+    body?: Buffer;
+  }>;
+
+  /**
+   * Column number where the currently running test is declared.
+   */
+  column: number;
+
+  /**
+   * Processed configuration from the [configuration file](https://playwright.dev/docs/test-configuration).
+   */
+  config: FullConfig;
+
+  /**
+   * The number of milliseconds the test took to finish. Always zero before the test finishes, either successfully or
+   * not. Can be used in
+   * [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each) hook.
+   */
+  duration: number;
+
+  /**
+   * First error thrown during test execution, if any. This is equal to the first element in
+   * [testInfo.errors](https://playwright.dev/docs/api/class-testinfo#test-info-errors).
+   */
+  error?: TestInfoError;
+
+  /**
+   * Errors thrown during test execution, if any.
+   */
+  errors: Array<TestInfoError>;
+
+  /**
+   * Expected status for the currently running test. This is usually `'passed'`, except for a few cases:
+   * - `'skipped'` for skipped tests, e.g. with
+   *   [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip);
+   * - `'failed'` for tests marked as failed with
+   *   [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail).
+   *
+   * Expected status is usually compared with the actual
+   * [testInfo.status](https://playwright.dev/docs/api/class-testinfo#test-info-status):
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.describe('two annotated tests', {
-   *   annotation: {
-   *     type: 'issue',
-   *     description: 'https://github.com/microsoft/playwright/issues/23180',
-   *   },
-   * }, () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
+   * test.afterEach(async ({}, testInfo) => {
+   *   if (testInfo.status !== testInfo.expectedStatus)
+   *     console.log(`${testInfo.title} did not run as expected!`);
+   * });
+   * ```
    *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
-   * });
-   * ```
-   *
-   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
-   * @param title Group title.
-   * @param details Additional details for all tests in the group.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
-   * declared in this callback will belong to the group.
    */
-  (callback: () => void): void;
+  expectedStatus: "passed"|"failed"|"timedOut"|"skipped"|"interrupted";
+
   /**
-   * Declares a group of tests.
-   * - `test.describe(title, callback)`
-   * - `test.describe(callback)`
-   * - `test.describe(title, details, callback)`
-   *
-   * **Usage**
+   * Absolute path to a file where the currently running test is declared.
+   */
+  file: string;
+
+  /**
+   * Test function as passed to `test(title, testFunction)`.
+   */
+  fn: Function;
+
+  /**
+   * Line number where the currently running test is declared.
+   */
+  line: number;
+
+  /**
+   * Absolute path to the output directory for this specific test run. Each test run gets its own directory so they
+   * cannot conflict.
+   */
+  outputDir: string;
+
+  /**
+   * The index of the worker between `0` and `workers - 1`. It is guaranteed that workers running at the same time have
+   * a different `parallelIndex`. When a worker is restarted, for example after a failure, the new worker process has
+   * the same `parallelIndex`.
    *
-   * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
-   * test's title.
+   * Also available as `process.env.TEST_PARALLEL_INDEX`. Learn more about
+   * [parallelism and sharding](https://playwright.dev/docs/test-parallel) with Playwright Test.
+   */
+  parallelIndex: number;
+
+  /**
+   * Processed project configuration from the [configuration file](https://playwright.dev/docs/test-configuration).
+   */
+  project: FullProject;
+
+  /**
+   * Specifies a unique repeat index when running in "repeat each" mode. This mode is enabled by passing `--repeat-each`
+   * to the [command line](https://playwright.dev/docs/test-cli).
+   */
+  repeatEachIndex: number;
+
+  /**
+   * Specifies the retry number when the test is retried after a failure. The first test run has
+   * [testInfo.retry](https://playwright.dev/docs/api/class-testinfo#test-info-retry) equal to zero, the first retry has
+   * it equal to one, and so on. Learn more about [retries](https://playwright.dev/docs/test-retries#retries).
    *
    * ```js
-   * test.describe('two tests', () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
+   * import { test, expect } from '@playwright/test';
    *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test.beforeEach(async ({}, testInfo) => {
+   *   // You can access testInfo.retry in any hook or fixture.
+   *   if (testInfo.retry > 0)
+   *     console.log(`Retrying!`);
    * });
-   * ```
-   *
-   * **Anonymous group**
    *
-   * You can also declare a test group without a title. This is convenient to give a group of tests a common option with
-   * [test.use(options)](https://playwright.dev/docs/api/class-test#test-use).
-   *
-   * ```js
-   * test.describe(() => {
-   *   test.use({ colorScheme: 'dark' });
-   *
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test('my test', async ({ page }, testInfo) => {
+   *   // Here we clear some server-side state when retrying.
+   *   if (testInfo.retry)
+   *     await cleanSomeCachesOnTheServer();
+   *   // ...
    * });
    * ```
    *
-   * **Tags**
+   */
+  retry: number;
+
+  /**
+   * Absolute path to the snapshot output directory for this specific test. Each test suite gets its own directory so
+   * they cannot conflict.
    *
-   * You can tag all tests in a group by providing additional details. Note that each tag must start with `@` symbol.
+   * This property does not account for the
+   * [testProject.snapshotPathTemplate](https://playwright.dev/docs/api/class-testproject#test-project-snapshot-path-template)
+   * configuration.
+   */
+  snapshotDir: string;
+
+  /**
+   * **NOTE** Use of [testInfo.snapshotSuffix](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-suffix)
+   * is discouraged. Please use
+   * [testConfig.snapshotPathTemplate](https://playwright.dev/docs/api/class-testconfig#test-config-snapshot-path-template)
+   * to configure snapshot paths.
+   *
+   * Suffix used to differentiate snapshots between multiple test configurations. For example, if snapshots depend on
+   * the platform, you can set `testInfo.snapshotSuffix` equal to `process.platform`. In this case
+   * `expect(value).toMatchSnapshot(snapshotName)` will use different snapshots depending on the platform. Learn more
+   * about [snapshots](https://playwright.dev/docs/test-snapshots).
+   */
+  snapshotSuffix: string;
+
+  /**
+   * Actual status for the currently running test. Available after the test has finished in
+   * [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each) hook and
+   * fixtures.
+   *
+   * Status is usually compared with the
+   * [testInfo.expectedStatus](https://playwright.dev/docs/api/class-testinfo#test-info-expected-status):
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.describe('two tagged tests', {
-   *   tag: '@smoke',
-   * }, () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test.afterEach(async ({}, testInfo) => {
+   *   if (testInfo.status !== testInfo.expectedStatus)
+   *     console.log(`${testInfo.title} did not run as expected!`);
    * });
    * ```
    *
-   * Learn more about [tagging](https://playwright.dev/docs/test-annotations#tag-tests).
+   */
+  status?: "passed"|"failed"|"timedOut"|"skipped"|"interrupted";
+
+  /**
+   * Tags that apply to the test. Learn more about [tags](https://playwright.dev/docs/test-annotations#tag-tests).
    *
-   * **Annotations**
+   * **NOTE** Any changes made to this list while the test is running will not be visible to test reporters.
    *
-   * You can annotate all tests in a group by providing additional details.
+   */
+  tags: Array<string>;
+
+  /**
+   * Test id matching the test case id in the reporter API.
+   */
+  testId: string;
+
+  /**
+   * Timeout in milliseconds for the currently running test. Zero means no timeout. Learn more about
+   * [various timeouts](https://playwright.dev/docs/test-timeouts).
+   *
+   * Timeout is usually specified in the [configuration file](https://playwright.dev/docs/test-configuration)
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.describe('two annotated tests', {
-   *   annotation: {
-   *     type: 'issue',
-   *     description: 'https://github.com/microsoft/playwright/issues/23180',
-   *   },
-   * }, () => {
-   *   test('one', async ({ page }) => {
-   *     // ...
-   *   });
-   *
-   *   test('two', async ({ page }) => {
-   *     // ...
-   *   });
+   * test.beforeEach(async ({ page }, testInfo) => {
+   *   // Extend timeout for all tests running this hook by 30 seconds.
+   *   testInfo.setTimeout(testInfo.timeout + 30000);
    * });
    * ```
    *
-   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
-   * @param title Group title.
-   * @param details Additional details for all tests in the group.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
-   * declared in this callback will belong to the group.
    */
-  (title: string, details: TestDetails, callback: () => void): void;
+  timeout: number;
+
+  /**
+   * The title of the currently running test as passed to `test(title, testFunction)`.
+   */
+  title: string;
+
+  /**
+   * The full title path starting with the test file name.
+   */
+  titlePath: Array<string>;
+
+  /**
+   * The unique index of the worker process that is running the test. When a worker is restarted, for example after a
+   * failure, the new worker process gets a new unique `workerIndex`.
+   *
+   * Also available as `process.env.TEST_WORKER_INDEX`. Learn more about [parallelism and sharding](https://playwright.dev/docs/test-parallel)
+   * with Playwright Test.
+   */
+  workerIndex: number;
 }
 
-interface TestFunction<TestArgs> {
+export type TestStatus = 'passed' | 'failed' | 'timedOut' | 'skipped' | 'interrupted';
+
+export type TestDetailsAnnotation = {
+  type: string;
+  description?: string;
+};
+
+export type TestAnnotation = TestDetailsAnnotation & {
+  location?: Location;
+};
+
+export type TestDetails = {
+  tag?: string | string[];
+  annotation?: TestDetailsAnnotation | TestDetailsAnnotation[];
+}
+
+type TestBody<TestArgs> = (args: TestArgs, testInfo: TestInfo) => Promise<void> | void;
+type ConditionBody<TestArgs> = (args: TestArgs) => boolean;
+
+/**
+ * Playwright Test provides a `test` function to declare tests and `expect` function to write assertions.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('basic test', async ({ page }) => {
+ *   await page.goto('https://playwright.dev/');
+ *   const name = await page.innerText('.navbar__title');
+ *   expect(name).toBe('Playwright');
+ * });
+ * ```
+ *
+ */
+export interface TestType<TestArgs extends {}, WorkerArgs extends {}> {
   /**
    * Declares a test.
    * - `test(title, body)`
@@ -2159,7 +2647,7 @@ interface TestFunction<TestArgs> {
    * Test tags are displayed in the test report, and are available to a custom reporter via `TestCase.tags` property.
    *
    * You can also filter tests by their tags during test execution:
-   * - in the [command line](https://playwright.dev/docs/test-cli#reference);
+   * - in the [command line](https://playwright.dev/docs/test-cli#all-options);
    * - in the config with [testConfig.grep](https://playwright.dev/docs/api/class-testconfig#test-config-grep) and
    *   [testProject.grep](https://playwright.dev/docs/api/class-testproject#test-project-grep);
    *
@@ -2192,9 +2680,10 @@ interface TestFunction<TestArgs> {
    * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
    * @param title Test title.
    * @param details Additional test details.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  (title: string, body: (args: TestArgs, testInfo: TestInfo) => Promise<void> | void): void;
+  (title: string, body: TestBody<TestArgs & WorkerArgs>): void;
   /**
    * Declares a test.
    * - `test(title, body)`
@@ -2235,7 +2724,7 @@ interface TestFunction<TestArgs> {
    * Test tags are displayed in the test report, and are available to a custom reporter via `TestCase.tags` property.
    *
    * You can also filter tests by their tags during test execution:
-   * - in the [command line](https://playwright.dev/docs/test-cli#reference);
+   * - in the [command line](https://playwright.dev/docs/test-cli#all-options);
    * - in the config with [testConfig.grep](https://playwright.dev/docs/api/class-testconfig#test-config-grep) and
    *   [testProject.grep](https://playwright.dev/docs/api/class-testproject#test-project-grep);
    *
@@ -2268,26 +2757,11 @@ interface TestFunction<TestArgs> {
    * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
    * @param title Test title.
    * @param details Additional test details.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  (title: string, details: TestDetails, body: (args: TestArgs, testInfo: TestInfo) => Promise<void> | void): void;
-}
+  (title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
 
-/**
- * Playwright Test provides a `test` function to declare tests and `expect` function to write assertions.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('basic test', async ({ page }) => {
- *   await page.goto('https://playwright.dev/');
- *   const name = await page.innerText('.navbar__title');
- *   expect(name).toBe('Playwright');
- * });
- * ```
- *
- */
-export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue> extends TestFunction<TestArgs & WorkerArgs> {
   /**
    * Declares a focused test. If there are some focused tests or suites, all of them will be run but nothing else.
    * - `test.only(title, body)`
@@ -2304,15 +2778,37 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  only: TestFunction<TestArgs & WorkerArgs>;
+  only(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
   /**
-   * Declares a group of tests.
-   * - `test.describe(title, callback)`
-   * - `test.describe(callback)`
-   * - `test.describe(title, details, callback)`
-   *
+   * Declares a focused test. If there are some focused tests or suites, all of them will be run but nothing else.
+   * - `test.only(title, body)`
+   * - `test.only(title, details, body)`
+   *
+   * **Usage**
+   *
+   * ```js
+   * test.only('focus this test', async ({ page }) => {
+   *   // Run only focused tests in the entire project.
+   * });
+   * ```
+   *
+   * @param title Test title.
+   * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
+   * description.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   */
+  only(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
+
+  /**
+   * Declares a group of tests.
+   * - `test.describe(title, callback)`
+   * - `test.describe(callback)`
+   * - `test.describe(title, details, callback)`
+   *
    * **Usage**
    *
    * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
@@ -2401,571 +2897,1241 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
    * declared in this callback will belong to the group.
    */
-  describe: SuiteFunction & {
+  describe: {
     /**
-   * Declares a focused group of tests. If there are some focused tests or suites, all of them will be run but nothing
-   * else.
-   * - `test.describe.only(title, callback)`
-   * - `test.describe.only(callback)`
-   * - `test.describe.only(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.only('focused group', () => {
-   *   test('in the focused group', async ({ page }) => {
-   *     // This test will run
-   *   });
-   * });
-   * test('not in the focused group', async ({ page }) => {
-   *   // This test will not run
-   * });
-   * ```
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.only(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-only).
-   * Any tests added in this callback will belong to the group.
-   */
-  only: SuiteFunction;
+     * Declares a group of tests.
+     * - `test.describe(title, callback)`
+     * - `test.describe(callback)`
+     * - `test.describe(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
+     * test's title.
+     *
+     * ```js
+     * test.describe('two tests', () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * **Anonymous group**
+     *
+     * You can also declare a test group without a title. This is convenient to give a group of tests a common option with
+     * [test.use(options)](https://playwright.dev/docs/api/class-test#test-use).
+     *
+     * ```js
+     * test.describe(() => {
+     *   test.use({ colorScheme: 'dark' });
+     *
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * **Tags**
+     *
+     * You can tag all tests in a group by providing additional details. Note that each tag must start with `@` symbol.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.describe('two tagged tests', {
+     *   tag: '@smoke',
+     * }, () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * Learn more about [tagging](https://playwright.dev/docs/test-annotations#tag-tests).
+     *
+     * **Annotations**
+     *
+     * You can annotate all tests in a group by providing additional details.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.describe('two annotated tests', {
+     *   annotation: {
+     *     type: 'issue',
+     *     description: 'https://github.com/microsoft/playwright/issues/23180',
+     *   },
+     * }, () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+     * @param title Group title.
+     * @param details Additional details for all tests in the group.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
+     * declared in this callback will belong to the group.
+     */
+    (title: string, callback: () => void): void;
     /**
-   * Declares a skipped test group, similarly to
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in the
-   * skipped group are never run.
-   * - `test.describe.skip(title, callback)`
-   * - `test.describe.skip(title)`
-   * - `test.describe.skip(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.skip('skipped group', () => {
-   *   test('example', async ({ page }) => {
-   *     // This test will not run
-   *   });
-   * });
-   * ```
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.skip(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.skip(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-skip).
-   * Any tests added in this callback will belong to the group, and will not be run.
-   */
-  skip: SuiteFunction;
+     * Declares a group of tests.
+     * - `test.describe(title, callback)`
+     * - `test.describe(callback)`
+     * - `test.describe(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
+     * test's title.
+     *
+     * ```js
+     * test.describe('two tests', () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * **Anonymous group**
+     *
+     * You can also declare a test group without a title. This is convenient to give a group of tests a common option with
+     * [test.use(options)](https://playwright.dev/docs/api/class-test#test-use).
+     *
+     * ```js
+     * test.describe(() => {
+     *   test.use({ colorScheme: 'dark' });
+     *
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * **Tags**
+     *
+     * You can tag all tests in a group by providing additional details. Note that each tag must start with `@` symbol.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.describe('two tagged tests', {
+     *   tag: '@smoke',
+     * }, () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * Learn more about [tagging](https://playwright.dev/docs/test-annotations#tag-tests).
+     *
+     * **Annotations**
+     *
+     * You can annotate all tests in a group by providing additional details.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.describe('two annotated tests', {
+     *   annotation: {
+     *     type: 'issue',
+     *     description: 'https://github.com/microsoft/playwright/issues/23180',
+     *   },
+     * }, () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+     * @param title Group title.
+     * @param details Additional details for all tests in the group.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
+     * declared in this callback will belong to the group.
+     */
+    (callback: () => void): void;
     /**
-   * Declares a test group similarly to
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in
-   * this group are marked as "fixme" and will not be executed.
-   * - `test.describe.fixme(title, callback)`
-   * - `test.describe.fixme(callback)`
-   * - `test.describe.fixme(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.fixme('broken tests that should be fixed', () => {
-   *   test('example', async ({ page }) => {
-   *     // This test will not run
-   *   });
-   * });
-   * ```
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.fixme(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.fixme([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-fixme).
-   * Any tests added in this callback will belong to the group, and will not be run.
-   */
-  fixme: SuiteFunction;
+     * Declares a group of tests.
+     * - `test.describe(title, callback)`
+     * - `test.describe(callback)`
+     * - `test.describe(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * You can declare a group of tests with a title. The title will be visible in the test report as a part of each
+     * test's title.
+     *
+     * ```js
+     * test.describe('two tests', () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * **Anonymous group**
+     *
+     * You can also declare a test group without a title. This is convenient to give a group of tests a common option with
+     * [test.use(options)](https://playwright.dev/docs/api/class-test#test-use).
+     *
+     * ```js
+     * test.describe(() => {
+     *   test.use({ colorScheme: 'dark' });
+     *
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * **Tags**
+     *
+     * You can tag all tests in a group by providing additional details. Note that each tag must start with `@` symbol.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.describe('two tagged tests', {
+     *   tag: '@smoke',
+     * }, () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * Learn more about [tagging](https://playwright.dev/docs/test-annotations#tag-tests).
+     *
+     * **Annotations**
+     *
+     * You can annotate all tests in a group by providing additional details.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.describe('two annotated tests', {
+     *   annotation: {
+     *     type: 'issue',
+     *     description: 'https://github.com/microsoft/playwright/issues/23180',
+     *   },
+     * }, () => {
+     *   test('one', async ({ page }) => {
+     *     // ...
+     *   });
+     *
+     *   test('two', async ({ page }) => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+     * @param title Group title.
+     * @param details Additional details for all tests in the group.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Any tests
+     * declared in this callback will belong to the group.
+     */
+    (title: string, details: TestDetails, callback: () => void): void;
+
     /**
-   * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
-   * the preferred way of configuring the execution mode.
-   *
-   * Declares a group of tests that should always be run serially. If one of the tests fails, all subsequent tests are
-   * skipped. All tests in a group are retried together.
-   *
-   * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
-   * independently.
-   * - `test.describe.serial(title, callback)`
-   * - `test.describe.serial(title)`
-   * - `test.describe.serial(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.serial('group', () => {
-   *   test('runs first', async ({ page }) => {});
-   *   test('runs second', async ({ page }) => {});
-   * });
-   * ```
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.serial(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.serial([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial).
-   * Any tests added in this callback will belong to the group.
-   */
-  serial: SuiteFunction & {
-      /**
-   * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
-   * the preferred way of configuring the execution mode.
-   *
-   * Declares a focused group of tests that should always be run serially. If one of the tests fails, all subsequent
-   * tests are skipped. All tests in a group are retried together. If there are some focused tests or suites, all of
-   * them will be run but nothing else.
-   *
-   * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
-   * independently.
-   * - `test.describe.serial.only(title, callback)`
-   * - `test.describe.serial.only(title)`
-   * - `test.describe.serial.only(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.serial.only('group', () => {
-   *   test('runs first', async ({ page }) => {
-   *   });
-   *   test('runs second', async ({ page }) => {
-   *   });
-   * });
-   * ```
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.serial.only(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.serial.only(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial-only).
-   * Any tests added in this callback will belong to the group.
-   */
-  only: SuiteFunction;
-    };
+     * Declares a focused group of tests. If there are some focused tests or suites, all of them will be run but nothing
+     * else.
+     * - `test.describe.only(title, callback)`
+     * - `test.describe.only(callback)`
+     * - `test.describe.only(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.only('focused group', () => {
+     *   test('in the focused group', async ({ page }) => {
+     *     // This test will run
+     *   });
+     * });
+     * test('not in the focused group', async ({ page }) => {
+     *   // This test will not run
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.only(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-only).
+     * Any tests added in this callback will belong to the group.
+     */
+    only(title: string, callback: () => void): void;
     /**
-   * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
-   * the preferred way of configuring the execution mode.
-   *
-   * Declares a group of tests that could be run in parallel. By default, tests in a single test file run one after
-   * another, but using
-   * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel)
-   * allows them to run in parallel.
-   * - `test.describe.parallel(title, callback)`
-   * - `test.describe.parallel(callback)`
-   * - `test.describe.parallel(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.parallel('group', () => {
-   *   test('runs in parallel 1', async ({ page }) => {});
-   *   test('runs in parallel 2', async ({ page }) => {});
-   * });
-   * ```
-   *
-   * Note that parallel tests are executed in separate processes and cannot share any state or global variables. Each of
-   * the parallel tests executes all relevant hooks.
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.parallel(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel).
-   * Any tests added in this callback will belong to the group.
-   */
-  parallel: SuiteFunction & {
-      /**
-   * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
-   * the preferred way of configuring the execution mode.
-   *
-   * Declares a focused group of tests that could be run in parallel. This is similar to
-   * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel),
-   * but focuses the group. If there are some focused tests or suites, all of them will be run but nothing else.
-   * - `test.describe.parallel.only(title, callback)`
-   * - `test.describe.parallel.only(callback)`
-   * - `test.describe.parallel.only(title, details, callback)`
-   *
-   * **Usage**
-   *
-   * ```js
-   * test.describe.parallel.only('group', () => {
-   *   test('runs in parallel 1', async ({ page }) => {});
-   *   test('runs in parallel 2', async ({ page }) => {});
-   * });
-   * ```
-   *
-   * You can also omit the title.
-   *
-   * ```js
-   * test.describe.parallel.only(() => {
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Group title.
-   * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
-   * details description.
-   * @param callback A callback that is run immediately when calling
-   * [test.describe.parallel.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel-only).
-   * Any tests added in this callback will belong to the group.
-   */
-  only: SuiteFunction;
-    };
+     * Declares a focused group of tests. If there are some focused tests or suites, all of them will be run but nothing
+     * else.
+     * - `test.describe.only(title, callback)`
+     * - `test.describe.only(callback)`
+     * - `test.describe.only(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.only('focused group', () => {
+     *   test('in the focused group', async ({ page }) => {
+     *     // This test will run
+     *   });
+     * });
+     * test('not in the focused group', async ({ page }) => {
+     *   // This test will not run
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.only(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-only).
+     * Any tests added in this callback will belong to the group.
+     */
+    only(callback: () => void): void;
     /**
-   * Configures the enclosing scope. Can be executed either on the top level or inside a describe. Configuration applies
-   * to the entire scope, regardless of whether it run before or after the test declaration.
-   *
-   * Learn more about the execution modes [here](https://playwright.dev/docs/test-parallel).
-   *
-   * **Usage**
-   * - Running tests in parallel.
-   *
-   *   ```js
-   *   // Run all the tests in the file concurrently using parallel workers.
-   *   test.describe.configure({ mode: 'parallel' });
-   *   test('runs in parallel 1', async ({ page }) => {});
-   *   test('runs in parallel 2', async ({ page }) => {});
-   *   ```
-   *
-   * - Running tests serially, retrying from the start.
-   *
-   *   **NOTE** Running serially is not recommended. It is usually better to make your tests isolated, so they can be
-   *   run independently.
-   *
-   *   ```js
-   *   // Annotate tests as inter-dependent.
-   *   test.describe.configure({ mode: 'serial' });
-   *   test('runs first', async ({ page }) => {});
-   *   test('runs second', async ({ page }) => {});
-   *   ```
-   *
-   * - Configuring retries and timeout for each test.
-   *
-   *   ```js
-   *   // Each test in the file will be retried twice and have a timeout of 20 seconds.
-   *   test.describe.configure({ retries: 2, timeout: 20_000 });
-   *   test('runs first', async ({ page }) => {});
-   *   test('runs second', async ({ page }) => {});
-   *   ```
-   *
-   * - Run multiple describes in parallel, but tests inside each describe in order.
-   *
-   *   ```js
-   *   test.describe.configure({ mode: 'parallel' });
-   *
-   *   test.describe('A, runs in parallel with B', () => {
-   *     test.describe.configure({ mode: 'default' });
-   *     test('in order A1', async ({ page }) => {});
-   *     test('in order A2', async ({ page }) => {});
-   *   });
-   *
-   *   test.describe('B, runs in parallel with A', () => {
-   *     test.describe.configure({ mode: 'default' });
-   *     test('in order B1', async ({ page }) => {});
-   *     test('in order B2', async ({ page }) => {});
-   *   });
-   *   ```
-   *
-   * @param options
-   */
-  configure: (options: { mode?: 'default' | 'parallel' | 'serial', retries?: number, timeout?: number }) => void;
-  };
-  /**
-   * Skip a test. Playwright will not run the test past the `test.skip()` call.
-   *
-   * Skipped tests are not supposed to be ever run. If you intent to fix the test, use
-   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
-   * instead.
-   *
-   * To declare a skipped test:
-   * - `test.skip(title, body)`
-   * - `test.skip(title, details, body)`
-   *
-   * To skip a test at runtime:
-   * - `test.skip(condition, description)`
-   * - `test.skip(callback, description)`
-   * - `test.skip()`
-   *
-   * **Usage**
-   *
-   * You can declare a skipped test, and Playwright will not run it.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.skip('never run', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * If your test should be skipped in some configurations, but not all, you can skip the test inside the test body
-   * based on some condition. We recommend passing a `description` argument in this case. Playwright will run the test,
-   * but abort it immediately after the `test.skip` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('Safari-only test', async ({ page, browserName }) => {
-   *   test.skip(browserName !== 'webkit', 'This feature is Safari-only');
-   *   // ...
-   * });
-   * ```
-   *
-   * You can skip all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group based
-   * on some condition with a single `test.skip(callback, description)` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.skip(({ browserName }) => browserName !== 'webkit', 'Safari-only');
-   *
-   * test('Safari-only test 1', async ({ page }) => {
-   *   // ...
-   * });
-   * test('Safari-only test 2', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * You can also call `test.skip()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.skip(title, body)` instead.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('less readable', async ({ page }) => {
-   *   test.skip();
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Test title.
-   * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
-   * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
-   * @param description Optional description that will be reflected in a test report.
-   */
-  skip(title: string, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  /**
-   * Skip a test. Playwright will not run the test past the `test.skip()` call.
-   *
-   * Skipped tests are not supposed to be ever run. If you intent to fix the test, use
-   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
-   * instead.
-   *
-   * To declare a skipped test:
-   * - `test.skip(title, body)`
-   * - `test.skip(title, details, body)`
-   *
-   * To skip a test at runtime:
-   * - `test.skip(condition, description)`
-   * - `test.skip(callback, description)`
-   * - `test.skip()`
-   *
-   * **Usage**
-   *
-   * You can declare a skipped test, and Playwright will not run it.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.skip('never run', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * If your test should be skipped in some configurations, but not all, you can skip the test inside the test body
-   * based on some condition. We recommend passing a `description` argument in this case. Playwright will run the test,
-   * but abort it immediately after the `test.skip` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('Safari-only test', async ({ page, browserName }) => {
-   *   test.skip(browserName !== 'webkit', 'This feature is Safari-only');
-   *   // ...
-   * });
-   * ```
-   *
-   * You can skip all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group based
-   * on some condition with a single `test.skip(callback, description)` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.skip(({ browserName }) => browserName !== 'webkit', 'Safari-only');
-   *
-   * test('Safari-only test 1', async ({ page }) => {
-   *   // ...
-   * });
-   * test('Safari-only test 2', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * You can also call `test.skip()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.skip(title, body)` instead.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('less readable', async ({ page }) => {
-   *   test.skip();
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Test title.
-   * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
-   * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
-   * @param description Optional description that will be reflected in a test report.
-   */
-  skip(title: string, details: TestDetails, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  /**
-   * Skip a test. Playwright will not run the test past the `test.skip()` call.
-   *
-   * Skipped tests are not supposed to be ever run. If you intent to fix the test, use
-   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
-   * instead.
-   *
-   * To declare a skipped test:
-   * - `test.skip(title, body)`
-   * - `test.skip(title, details, body)`
-   *
-   * To skip a test at runtime:
-   * - `test.skip(condition, description)`
-   * - `test.skip(callback, description)`
-   * - `test.skip()`
-   *
-   * **Usage**
-   *
-   * You can declare a skipped test, and Playwright will not run it.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.skip('never run', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * If your test should be skipped in some configurations, but not all, you can skip the test inside the test body
-   * based on some condition. We recommend passing a `description` argument in this case. Playwright will run the test,
-   * but abort it immediately after the `test.skip` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('Safari-only test', async ({ page, browserName }) => {
-   *   test.skip(browserName !== 'webkit', 'This feature is Safari-only');
-   *   // ...
-   * });
-   * ```
-   *
-   * You can skip all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group based
-   * on some condition with a single `test.skip(callback, description)` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.skip(({ browserName }) => browserName !== 'webkit', 'Safari-only');
-   *
-   * test('Safari-only test 1', async ({ page }) => {
-   *   // ...
-   * });
-   * test('Safari-only test 2', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * You can also call `test.skip()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.skip(title, body)` instead.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('less readable', async ({ page }) => {
-   *   test.skip();
-   *   // ...
-   * });
-   * ```
-   *
-   * @param title Test title.
-   * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
-   * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
-   * @param description Optional description that will be reflected in a test report.
-   */
-  skip(): void;
+     * Declares a focused group of tests. If there are some focused tests or suites, all of them will be run but nothing
+     * else.
+     * - `test.describe.only(title, callback)`
+     * - `test.describe.only(callback)`
+     * - `test.describe.only(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.only('focused group', () => {
+     *   test('in the focused group', async ({ page }) => {
+     *     // This test will run
+     *   });
+     * });
+     * test('not in the focused group', async ({ page }) => {
+     *   // This test will not run
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.only(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-only).
+     * Any tests added in this callback will belong to the group.
+     */
+    only(title: string, details: TestDetails, callback: () => void): void;
+
+    /**
+     * Declares a skipped test group, similarly to
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in the
+     * skipped group are never run.
+     * - `test.describe.skip(title, callback)`
+     * - `test.describe.skip(title)`
+     * - `test.describe.skip(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.skip('skipped group', () => {
+     *   test('example', async ({ page }) => {
+     *     // This test will not run
+     *   });
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.skip(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.skip(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-skip).
+     * Any tests added in this callback will belong to the group, and will not be run.
+     */
+    skip(title: string, callback: () => void): void;
+    /**
+     * Declares a skipped test group, similarly to
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in the
+     * skipped group are never run.
+     * - `test.describe.skip(title, callback)`
+     * - `test.describe.skip(title)`
+     * - `test.describe.skip(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.skip('skipped group', () => {
+     *   test('example', async ({ page }) => {
+     *     // This test will not run
+     *   });
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.skip(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.skip(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-skip).
+     * Any tests added in this callback will belong to the group, and will not be run.
+     */
+    skip(callback: () => void): void;
+    /**
+     * Declares a skipped test group, similarly to
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in the
+     * skipped group are never run.
+     * - `test.describe.skip(title, callback)`
+     * - `test.describe.skip(title)`
+     * - `test.describe.skip(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.skip('skipped group', () => {
+     *   test('example', async ({ page }) => {
+     *     // This test will not run
+     *   });
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.skip(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.skip(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-skip).
+     * Any tests added in this callback will belong to the group, and will not be run.
+     */
+    skip(title: string, details: TestDetails, callback: () => void): void;
+
+    /**
+     * Declares a test group similarly to
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in
+     * this group are marked as "fixme" and will not be executed.
+     * - `test.describe.fixme(title, callback)`
+     * - `test.describe.fixme(callback)`
+     * - `test.describe.fixme(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.fixme('broken tests that should be fixed', () => {
+     *   test('example', async ({ page }) => {
+     *     // This test will not run
+     *   });
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.fixme(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.fixme([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-fixme).
+     * Any tests added in this callback will belong to the group, and will not be run.
+     */
+    fixme(title: string, callback: () => void): void;
+    /**
+     * Declares a test group similarly to
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in
+     * this group are marked as "fixme" and will not be executed.
+     * - `test.describe.fixme(title, callback)`
+     * - `test.describe.fixme(callback)`
+     * - `test.describe.fixme(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.fixme('broken tests that should be fixed', () => {
+     *   test('example', async ({ page }) => {
+     *     // This test will not run
+     *   });
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.fixme(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.fixme([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-fixme).
+     * Any tests added in this callback will belong to the group, and will not be run.
+     */
+    fixme(callback: () => void): void;
+    /**
+     * Declares a test group similarly to
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe). Tests in
+     * this group are marked as "fixme" and will not be executed.
+     * - `test.describe.fixme(title, callback)`
+     * - `test.describe.fixme(callback)`
+     * - `test.describe.fixme(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.fixme('broken tests that should be fixed', () => {
+     *   test('example', async ({ page }) => {
+     *     // This test will not run
+     *   });
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.fixme(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.fixme([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-fixme).
+     * Any tests added in this callback will belong to the group, and will not be run.
+     */
+    fixme(title: string, details: TestDetails, callback: () => void): void;
+
+    /**
+     * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+     * the preferred way of configuring the execution mode.
+     *
+     * Declares a group of tests that should always be run serially. If one of the tests fails, all subsequent tests are
+     * skipped. All tests in a group are retried together.
+     *
+     * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+     * independently.
+     *
+     * - `test.describe.serial(title, callback)`
+     * - `test.describe.serial(title)`
+     * - `test.describe.serial(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.serial('group', () => {
+     *   test('runs first', async ({ page }) => {});
+     *   test('runs second', async ({ page }) => {});
+     * });
+     * ```
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.serial(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.serial([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial).
+     * Any tests added in this callback will belong to the group.
+     */
+    serial: {
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a group of tests that should always be run serially. If one of the tests fails, all subsequent tests are
+       * skipped. All tests in a group are retried together.
+       *
+       * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+       * independently.
+       *
+       * - `test.describe.serial(title, callback)`
+       * - `test.describe.serial(title)`
+       * - `test.describe.serial(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.serial('group', () => {
+       *   test('runs first', async ({ page }) => {});
+       *   test('runs second', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.serial(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.serial([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial).
+       * Any tests added in this callback will belong to the group.
+       */
+      (title: string, callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a group of tests that should always be run serially. If one of the tests fails, all subsequent tests are
+       * skipped. All tests in a group are retried together.
+       *
+       * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+       * independently.
+       *
+       * - `test.describe.serial(title, callback)`
+       * - `test.describe.serial(title)`
+       * - `test.describe.serial(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.serial('group', () => {
+       *   test('runs first', async ({ page }) => {});
+       *   test('runs second', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.serial(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.serial([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial).
+       * Any tests added in this callback will belong to the group.
+       */
+      (callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a group of tests that should always be run serially. If one of the tests fails, all subsequent tests are
+       * skipped. All tests in a group are retried together.
+       *
+       * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+       * independently.
+       *
+       * - `test.describe.serial(title, callback)`
+       * - `test.describe.serial(title)`
+       * - `test.describe.serial(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.serial('group', () => {
+       *   test('runs first', async ({ page }) => {});
+       *   test('runs second', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.serial(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.serial([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial).
+       * Any tests added in this callback will belong to the group.
+       */
+      (title: string, details: TestDetails, callback: () => void): void;
+
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a focused group of tests that should always be run serially. If one of the tests fails, all subsequent
+       * tests are skipped. All tests in a group are retried together. If there are some focused tests or suites, all of
+       * them will be run but nothing else.
+       *
+       * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+       * independently.
+       *
+       * - `test.describe.serial.only(title, callback)`
+       * - `test.describe.serial.only(title)`
+       * - `test.describe.serial.only(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.serial.only('group', () => {
+       *   test('runs first', async ({ page }) => {
+       *   });
+       *   test('runs second', async ({ page }) => {
+       *   });
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.serial.only(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.serial.only(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial-only).
+       * Any tests added in this callback will belong to the group.
+       */
+      only(title: string, callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a focused group of tests that should always be run serially. If one of the tests fails, all subsequent
+       * tests are skipped. All tests in a group are retried together. If there are some focused tests or suites, all of
+       * them will be run but nothing else.
+       *
+       * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+       * independently.
+       *
+       * - `test.describe.serial.only(title, callback)`
+       * - `test.describe.serial.only(title)`
+       * - `test.describe.serial.only(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.serial.only('group', () => {
+       *   test('runs first', async ({ page }) => {
+       *   });
+       *   test('runs second', async ({ page }) => {
+       *   });
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.serial.only(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.serial.only(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial-only).
+       * Any tests added in this callback will belong to the group.
+       */
+      only(callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a focused group of tests that should always be run serially. If one of the tests fails, all subsequent
+       * tests are skipped. All tests in a group are retried together. If there are some focused tests or suites, all of
+       * them will be run but nothing else.
+       *
+       * **NOTE** Using serial is not recommended. It is usually better to make your tests isolated, so they can be run
+       * independently.
+       *
+       * - `test.describe.serial.only(title, callback)`
+       * - `test.describe.serial.only(title)`
+       * - `test.describe.serial.only(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.serial.only('group', () => {
+       *   test('runs first', async ({ page }) => {
+       *   });
+       *   test('runs second', async ({ page }) => {
+       *   });
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.serial.only(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.serial.only(title[, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-serial-only).
+       * Any tests added in this callback will belong to the group.
+       */
+      only(title: string, details: TestDetails, callback: () => void): void;
+    };
+
+    /**
+     * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+     * the preferred way of configuring the execution mode.
+     *
+     * Declares a group of tests that could be run in parallel. By default, tests in a single test file run one after
+     * another, but using
+     * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel)
+     * allows them to run in parallel.
+     * - `test.describe.parallel(title, callback)`
+     * - `test.describe.parallel(callback)`
+     * - `test.describe.parallel(title, details, callback)`
+     *
+     * **Usage**
+     *
+     * ```js
+     * test.describe.parallel('group', () => {
+     *   test('runs in parallel 1', async ({ page }) => {});
+     *   test('runs in parallel 2', async ({ page }) => {});
+     * });
+     * ```
+     *
+     * Note that parallel tests are executed in separate processes and cannot share any state or global variables. Each of
+     * the parallel tests executes all relevant hooks.
+     *
+     * You can also omit the title.
+     *
+     * ```js
+     * test.describe.parallel(() => {
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Group title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+     * details description.
+     * @param callback A callback that is run immediately when calling
+     * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel).
+     * Any tests added in this callback will belong to the group.
+     */
+    parallel: {
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a group of tests that could be run in parallel. By default, tests in a single test file run one after
+       * another, but using
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel)
+       * allows them to run in parallel.
+       * - `test.describe.parallel(title, callback)`
+       * - `test.describe.parallel(callback)`
+       * - `test.describe.parallel(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.parallel('group', () => {
+       *   test('runs in parallel 1', async ({ page }) => {});
+       *   test('runs in parallel 2', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * Note that parallel tests are executed in separate processes and cannot share any state or global variables. Each of
+       * the parallel tests executes all relevant hooks.
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.parallel(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel).
+       * Any tests added in this callback will belong to the group.
+       */
+      (title: string, callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a group of tests that could be run in parallel. By default, tests in a single test file run one after
+       * another, but using
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel)
+       * allows them to run in parallel.
+       * - `test.describe.parallel(title, callback)`
+       * - `test.describe.parallel(callback)`
+       * - `test.describe.parallel(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.parallel('group', () => {
+       *   test('runs in parallel 1', async ({ page }) => {});
+       *   test('runs in parallel 2', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * Note that parallel tests are executed in separate processes and cannot share any state or global variables. Each of
+       * the parallel tests executes all relevant hooks.
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.parallel(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel).
+       * Any tests added in this callback will belong to the group.
+       */
+      (callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a group of tests that could be run in parallel. By default, tests in a single test file run one after
+       * another, but using
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel)
+       * allows them to run in parallel.
+       * - `test.describe.parallel(title, callback)`
+       * - `test.describe.parallel(callback)`
+       * - `test.describe.parallel(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.parallel('group', () => {
+       *   test('runs in parallel 1', async ({ page }) => {});
+       *   test('runs in parallel 2', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * Note that parallel tests are executed in separate processes and cannot share any state or global variables. Each of
+       * the parallel tests executes all relevant hooks.
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.parallel(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel).
+       * Any tests added in this callback will belong to the group.
+       */
+      (title: string, details: TestDetails, callback: () => void): void;
+
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a focused group of tests that could be run in parallel. This is similar to
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel),
+       * but focuses the group. If there are some focused tests or suites, all of them will be run but nothing else.
+       * - `test.describe.parallel.only(title, callback)`
+       * - `test.describe.parallel.only(callback)`
+       * - `test.describe.parallel.only(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.parallel.only('group', () => {
+       *   test('runs in parallel 1', async ({ page }) => {});
+       *   test('runs in parallel 2', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.parallel.only(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.parallel.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel-only).
+       * Any tests added in this callback will belong to the group.
+       */
+      only(title: string, callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a focused group of tests that could be run in parallel. This is similar to
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel),
+       * but focuses the group. If there are some focused tests or suites, all of them will be run but nothing else.
+       * - `test.describe.parallel.only(title, callback)`
+       * - `test.describe.parallel.only(callback)`
+       * - `test.describe.parallel.only(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.parallel.only('group', () => {
+       *   test('runs in parallel 1', async ({ page }) => {});
+       *   test('runs in parallel 2', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.parallel.only(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.parallel.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel-only).
+       * Any tests added in this callback will belong to the group.
+       */
+      only(callback: () => void): void;
+      /**
+       * **NOTE** See [test.describe.configure([options])](https://playwright.dev/docs/api/class-test#test-describe-configure) for
+       * the preferred way of configuring the execution mode.
+       *
+       * Declares a focused group of tests that could be run in parallel. This is similar to
+       * [test.describe.parallel([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel),
+       * but focuses the group. If there are some focused tests or suites, all of them will be run but nothing else.
+       * - `test.describe.parallel.only(title, callback)`
+       * - `test.describe.parallel.only(callback)`
+       * - `test.describe.parallel.only(title, details, callback)`
+       *
+       * **Usage**
+       *
+       * ```js
+       * test.describe.parallel.only('group', () => {
+       *   test('runs in parallel 1', async ({ page }) => {});
+       *   test('runs in parallel 2', async ({ page }) => {});
+       * });
+       * ```
+       *
+       * You can also omit the title.
+       *
+       * ```js
+       * test.describe.parallel.only(() => {
+       *   // ...
+       * });
+       * ```
+       *
+       * @param title Group title.
+       * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for
+       * details description.
+       * @param callback A callback that is run immediately when calling
+       * [test.describe.parallel.only([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe-parallel-only).
+       * Any tests added in this callback will belong to the group.
+       */
+      only(title: string, details: TestDetails, callback: () => void): void;
+    };
+
+    /**
+     * Configures the enclosing scope. Can be executed either on the top level or inside a describe. Configuration applies
+     * to the entire scope, regardless of whether it run before or after the test declaration.
+     *
+     * Learn more about the execution modes [here](https://playwright.dev/docs/test-parallel).
+     *
+     * **Usage**
+     * - Running tests in parallel.
+     *
+     *   ```js
+     *   // Run all the tests in the file concurrently using parallel workers.
+     *   test.describe.configure({ mode: 'parallel' });
+     *   test('runs in parallel 1', async ({ page }) => {});
+     *   test('runs in parallel 2', async ({ page }) => {});
+     *   ```
+     *
+     * - Running tests in order, retrying each failed test independently.
+     *
+     *   This is the default mode. It can be useful to set it explicitly to override project configuration that uses
+     *   `fullyParallel`.
+     *
+     *   ```js
+     *   // Tests in this file run in order. Retries, if any, run independently.
+     *   test.describe.configure({ mode: 'default' });
+     *   test('runs first', async ({ page }) => {});
+     *   test('runs second', async ({ page }) => {});
+     *   ```
+     *
+     * - Running tests serially, retrying from the start. If one of the serial tests fails, all subsequent tests are
+     *   skipped.
+     *
+     *   **NOTE** Running serially is not recommended. It is usually better to make your tests isolated, so they can be
+     *   run independently.
+     *
+     *   ```js
+     *   // Annotate tests as inter-dependent.
+     *   test.describe.configure({ mode: 'serial' });
+     *   test('runs first', async ({ page }) => {});
+     *   test('runs second', async ({ page }) => {});
+     *   ```
+     *
+     * - Configuring retries and timeout for each test.
+     *
+     *   ```js
+     *   // Each test in the file will be retried twice and have a timeout of 20 seconds.
+     *   test.describe.configure({ retries: 2, timeout: 20_000 });
+     *   test('runs first', async ({ page }) => {});
+     *   test('runs second', async ({ page }) => {});
+     *   ```
+     *
+     * - Run multiple describes in parallel, but tests inside each describe in order.
+     *
+     *   ```js
+     *   test.describe.configure({ mode: 'parallel' });
+     *
+     *   test.describe('A, runs in parallel with B', () => {
+     *     test.describe.configure({ mode: 'default' });
+     *     test('in order A1', async ({ page }) => {});
+     *     test('in order A2', async ({ page }) => {});
+     *   });
+     *
+     *   test.describe('B, runs in parallel with A', () => {
+     *     test.describe.configure({ mode: 'default' });
+     *     test('in order B1', async ({ page }) => {});
+     *     test('in order B2', async ({ page }) => {});
+     *   });
+     *   ```
+     *
+     * @param options
+     */
+    configure: (options: { mode?: 'default' | 'parallel' | 'serial', retries?: number, timeout?: number }) => void;
+  };
+
   /**
    * Skip a test. Playwright will not run the test past the `test.skip()` call.
    *
-   * Skipped tests are not supposed to be ever run. If you intent to fix the test, use
+   * Skipped tests are not supposed to be ever run. If you intend to fix the test, use
    * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
    * instead.
    *
@@ -3020,7 +4186,7 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * });
    * ```
    *
-   * You can also call `test.skip()` without arguments inside the test body to always mark the test as failed. We
+   * You can also call `test.skip()` without arguments inside the test body to always skip the test. However, we
    * recommend using `test.skip(title, body)` instead.
    *
    * ```js
@@ -3035,17 +4201,18 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "skipped" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "skipped", based on test fixtures. Test or tests are marked as "skipped"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  skip(condition: boolean, description?: string): void;
+  skip(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
   /**
    * Skip a test. Playwright will not run the test past the `test.skip()` call.
    *
-   * Skipped tests are not supposed to be ever run. If you intent to fix the test, use
+   * Skipped tests are not supposed to be ever run. If you intend to fix the test, use
    * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
    * instead.
    *
@@ -3100,7 +4267,7 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * });
    * ```
    *
-   * You can also call `test.skip()` without arguments inside the test body to always mark the test as failed. We
+   * You can also call `test.skip()` without arguments inside the test body to always skip the test. However, we
    * recommend using `test.skip(title, body)` instead.
    *
    * ```js
@@ -3115,153 +4282,80 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "skipped" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "skipped", based on test fixtures. Test or tests are marked as "skipped"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  skip(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
+  skip(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
   /**
-   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
-   * call.
-   *
-   * To declare a "fixme" test:
-   * - `test.fixme(title, body)`
-   * - `test.fixme(title, details, body)`
-   *
-   * To annotate test as "fixme" at runtime:
-   * - `test.fixme(condition, description)`
-   * - `test.fixme(callback, description)`
-   * - `test.fixme()`
-   *
-   * **Usage**
-   *
-   * You can declare a test as to be fixed, and Playwright will not run it.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.fixme('to be fixed', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
-   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
-   * test, but abort it immediately after the `test.fixme` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('to be fixed in Safari', async ({ page, browserName }) => {
-   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
-   *   // ...
-   * });
-   * ```
-   *
-   * You can mark all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
-   *
-   * test('to be fixed in Safari 1', async ({ page }) => {
-   *   // ...
-   * });
-   * test('to be fixed in Safari 2', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.fixme(title, body)` instead.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('less readable', async ({ page }) => {
-   *   test.fixme();
-   *   // ...
-   * });
-   * ```
+   * Skip a test. Playwright will not run the test past the `test.skip()` call.
    *
-   * @param title Test title.
-   * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
-   * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
-   * @param description Optional description that will be reflected in a test report.
-   */
-  fixme(title: string, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  /**
-   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
-   * call.
+   * Skipped tests are not supposed to be ever run. If you intend to fix the test, use
+   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
+   * instead.
    *
-   * To declare a "fixme" test:
-   * - `test.fixme(title, body)`
-   * - `test.fixme(title, details, body)`
+   * To declare a skipped test:
+   * - `test.skip(title, body)`
+   * - `test.skip(title, details, body)`
    *
-   * To annotate test as "fixme" at runtime:
-   * - `test.fixme(condition, description)`
-   * - `test.fixme(callback, description)`
-   * - `test.fixme()`
+   * To skip a test at runtime:
+   * - `test.skip(condition, description)`
+   * - `test.skip(callback, description)`
+   * - `test.skip()`
    *
    * **Usage**
    *
-   * You can declare a test as to be fixed, and Playwright will not run it.
+   * You can declare a skipped test, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fixme('to be fixed', async ({ page }) => {
+   * test.skip('never run', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
-   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
-   * test, but abort it immediately after the `test.fixme` call.
+   * If your test should be skipped in some configurations, but not all, you can skip the test inside the test body
+   * based on some condition. We recommend passing a `description` argument in this case. Playwright will run the test,
+   * but abort it immediately after the `test.skip` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('to be fixed in Safari', async ({ page, browserName }) => {
-   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
+   * test('Safari-only test', async ({ page, browserName }) => {
+   *   test.skip(browserName !== 'webkit', 'This feature is Safari-only');
    *   // ...
    * });
    * ```
    *
-   * You can mark all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
+   * You can skip all tests in a file or
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group based
+   * on some condition with a single `test.skip(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
+   * test.skip(({ browserName }) => browserName !== 'webkit', 'Safari-only');
    *
-   * test('to be fixed in Safari 1', async ({ page }) => {
+   * test('Safari-only test 1', async ({ page }) => {
    *   // ...
    * });
-   * test('to be fixed in Safari 2', async ({ page }) => {
+   * test('Safari-only test 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.fixme(title, body)` instead.
+   * You can also call `test.skip()` without arguments inside the test body to always skip the test. However, we
+   * recommend using `test.skip(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fixme();
+   *   test.skip();
    *   // ...
    * });
    * ```
@@ -3269,76 +4363,80 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "skipped" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "skipped", based on test fixtures. Test or tests are marked as "skipped"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fixme(title: string, details: TestDetails, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
+  skip(): void;
   /**
-   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
-   * call.
+   * Skip a test. Playwright will not run the test past the `test.skip()` call.
    *
-   * To declare a "fixme" test:
-   * - `test.fixme(title, body)`
-   * - `test.fixme(title, details, body)`
+   * Skipped tests are not supposed to be ever run. If you intend to fix the test, use
+   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
+   * instead.
    *
-   * To annotate test as "fixme" at runtime:
-   * - `test.fixme(condition, description)`
-   * - `test.fixme(callback, description)`
-   * - `test.fixme()`
+   * To declare a skipped test:
+   * - `test.skip(title, body)`
+   * - `test.skip(title, details, body)`
+   *
+   * To skip a test at runtime:
+   * - `test.skip(condition, description)`
+   * - `test.skip(callback, description)`
+   * - `test.skip()`
    *
    * **Usage**
    *
-   * You can declare a test as to be fixed, and Playwright will not run it.
+   * You can declare a skipped test, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fixme('to be fixed', async ({ page }) => {
+   * test.skip('never run', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
-   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
-   * test, but abort it immediately after the `test.fixme` call.
+   * If your test should be skipped in some configurations, but not all, you can skip the test inside the test body
+   * based on some condition. We recommend passing a `description` argument in this case. Playwright will run the test,
+   * but abort it immediately after the `test.skip` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('to be fixed in Safari', async ({ page, browserName }) => {
-   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
+   * test('Safari-only test', async ({ page, browserName }) => {
+   *   test.skip(browserName !== 'webkit', 'This feature is Safari-only');
    *   // ...
    * });
    * ```
    *
-   * You can mark all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
+   * You can skip all tests in a file or
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group based
+   * on some condition with a single `test.skip(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
+   * test.skip(({ browserName }) => browserName !== 'webkit', 'Safari-only');
    *
-   * test('to be fixed in Safari 1', async ({ page }) => {
+   * test('Safari-only test 1', async ({ page }) => {
    *   // ...
    * });
-   * test('to be fixed in Safari 2', async ({ page }) => {
+   * test('Safari-only test 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.fixme(title, body)` instead.
+   * You can also call `test.skip()` without arguments inside the test body to always skip the test. However, we
+   * recommend using `test.skip(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fixme();
+   *   test.skip();
    *   // ...
    * });
    * ```
@@ -3346,76 +4444,80 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "skipped" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "skipped", based on test fixtures. Test or tests are marked as "skipped"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fixme(): void;
+  skip(condition: boolean, description?: string): void;
   /**
-   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
-   * call.
+   * Skip a test. Playwright will not run the test past the `test.skip()` call.
    *
-   * To declare a "fixme" test:
-   * - `test.fixme(title, body)`
-   * - `test.fixme(title, details, body)`
+   * Skipped tests are not supposed to be ever run. If you intend to fix the test, use
+   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
+   * instead.
    *
-   * To annotate test as "fixme" at runtime:
-   * - `test.fixme(condition, description)`
-   * - `test.fixme(callback, description)`
-   * - `test.fixme()`
+   * To declare a skipped test:
+   * - `test.skip(title, body)`
+   * - `test.skip(title, details, body)`
+   *
+   * To skip a test at runtime:
+   * - `test.skip(condition, description)`
+   * - `test.skip(callback, description)`
+   * - `test.skip()`
    *
    * **Usage**
    *
-   * You can declare a test as to be fixed, and Playwright will not run it.
+   * You can declare a skipped test, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fixme('to be fixed', async ({ page }) => {
+   * test.skip('never run', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
-   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
-   * test, but abort it immediately after the `test.fixme` call.
+   * If your test should be skipped in some configurations, but not all, you can skip the test inside the test body
+   * based on some condition. We recommend passing a `description` argument in this case. Playwright will run the test,
+   * but abort it immediately after the `test.skip` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('to be fixed in Safari', async ({ page, browserName }) => {
-   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
+   * test('Safari-only test', async ({ page, browserName }) => {
+   *   test.skip(browserName !== 'webkit', 'This feature is Safari-only');
    *   // ...
    * });
    * ```
    *
-   * You can mark all tests in a file or
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
+   * You can skip all tests in a file or
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group based
+   * on some condition with a single `test.skip(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
+   * test.skip(({ browserName }) => browserName !== 'webkit', 'Safari-only');
    *
-   * test('to be fixed in Safari 1', async ({ page }) => {
+   * test('Safari-only test 1', async ({ page }) => {
    *   // ...
    * });
-   * test('to be fixed in Safari 2', async ({ page }) => {
+   * test('Safari-only test 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
-   * recommend using `test.fixme(title, body)` instead.
+   * You can also call `test.skip()` without arguments inside the test body to always skip the test. However, we
+   * recommend using `test.skip(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fixme();
+   *   test.skip();
    *   // ...
    * });
    * ```
@@ -3423,13 +4525,15 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "skipped" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "skipped", based on test fixtures. Test or tests are marked as "skipped"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fixme(condition: boolean, description?: string): void;
+  skip(callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+
   /**
    * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
    * call.
@@ -3500,75 +4604,77 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "fixme" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "fixme", based on test fixtures. Test or tests are marked as "fixme"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fixme(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
+  fixme(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
   /**
-   * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
-   * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
+   * call.
    *
-   * To declare a "failing" test:
-   * - `test.fail(title, body)`
-   * - `test.fail(title, details, body)`
+   * To declare a "fixme" test:
+   * - `test.fixme(title, body)`
+   * - `test.fixme(title, details, body)`
    *
-   * To annotate test as "failing" at runtime:
-   * - `test.fail(condition, description)`
-   * - `test.fail(callback, description)`
-   * - `test.fail()`
+   * To annotate test as "fixme" at runtime:
+   * - `test.fixme(condition, description)`
+   * - `test.fixme(callback, description)`
+   * - `test.fixme()`
    *
    * **Usage**
    *
-   * You can declare a test as failing, so that Playwright ensures it actually fails.
+   * You can declare a test as to be fixed, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail('not yet ready', async ({ page }) => {
+   * test.fixme('to be fixed', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
-   * on some condition. We recommend passing a `description` argument in this case.
+   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
+   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
+   * test, but abort it immediately after the `test.fixme` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('fail in WebKit', async ({ page, browserName }) => {
-   *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+   * test('to be fixed in Safari', async ({ page, browserName }) => {
+   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
    *   // ...
    * });
    * ```
    *
    * You can mark all tests in a file or
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
    *
-   * test('fail in WebKit 1', async ({ page }) => {
+   * test('to be fixed in Safari 1', async ({ page }) => {
    *   // ...
    * });
-   * test('fail in WebKit 2', async ({ page }) => {
+   * test('to be fixed in Safari 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
-   * recommend declaring a failing test with `test.fail(title, body)` instead.
+   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
+   * recommend using `test.fixme(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fail();
+   *   test.fixme();
    *   // ...
    * });
    * ```
@@ -3576,75 +4682,77 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "fixme" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "fixme", based on test fixtures. Test or tests are marked as "fixme"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fail(title: string, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
+  fixme(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
   /**
-   * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
-   * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
+   * call.
    *
-   * To declare a "failing" test:
-   * - `test.fail(title, body)`
-   * - `test.fail(title, details, body)`
+   * To declare a "fixme" test:
+   * - `test.fixme(title, body)`
+   * - `test.fixme(title, details, body)`
    *
-   * To annotate test as "failing" at runtime:
-   * - `test.fail(condition, description)`
-   * - `test.fail(callback, description)`
-   * - `test.fail()`
+   * To annotate test as "fixme" at runtime:
+   * - `test.fixme(condition, description)`
+   * - `test.fixme(callback, description)`
+   * - `test.fixme()`
    *
    * **Usage**
    *
-   * You can declare a test as failing, so that Playwright ensures it actually fails.
+   * You can declare a test as to be fixed, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail('not yet ready', async ({ page }) => {
+   * test.fixme('to be fixed', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
-   * on some condition. We recommend passing a `description` argument in this case.
+   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
+   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
+   * test, but abort it immediately after the `test.fixme` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('fail in WebKit', async ({ page, browserName }) => {
-   *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+   * test('to be fixed in Safari', async ({ page, browserName }) => {
+   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
    *   // ...
    * });
    * ```
    *
    * You can mark all tests in a file or
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
    *
-   * test('fail in WebKit 1', async ({ page }) => {
+   * test('to be fixed in Safari 1', async ({ page }) => {
    *   // ...
    * });
-   * test('fail in WebKit 2', async ({ page }) => {
+   * test('to be fixed in Safari 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
-   * recommend declaring a failing test with `test.fail(title, body)` instead.
+   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
+   * recommend using `test.fixme(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fail();
+   *   test.fixme();
    *   // ...
    * });
    * ```
@@ -3652,75 +4760,77 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "fixme" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "fixme", based on test fixtures. Test or tests are marked as "fixme"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fail(title: string, details: TestDetails, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
+  fixme(): void;
   /**
-   * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
-   * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
+   * call.
    *
-   * To declare a "failing" test:
-   * - `test.fail(title, body)`
-   * - `test.fail(title, details, body)`
+   * To declare a "fixme" test:
+   * - `test.fixme(title, body)`
+   * - `test.fixme(title, details, body)`
    *
-   * To annotate test as "failing" at runtime:
-   * - `test.fail(condition, description)`
-   * - `test.fail(callback, description)`
-   * - `test.fail()`
+   * To annotate test as "fixme" at runtime:
+   * - `test.fixme(condition, description)`
+   * - `test.fixme(callback, description)`
+   * - `test.fixme()`
    *
    * **Usage**
    *
-   * You can declare a test as failing, so that Playwright ensures it actually fails.
+   * You can declare a test as to be fixed, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail('not yet ready', async ({ page }) => {
+   * test.fixme('to be fixed', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
-   * on some condition. We recommend passing a `description` argument in this case.
+   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
+   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
+   * test, but abort it immediately after the `test.fixme` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('fail in WebKit', async ({ page, browserName }) => {
-   *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+   * test('to be fixed in Safari', async ({ page, browserName }) => {
+   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
    *   // ...
    * });
    * ```
    *
    * You can mark all tests in a file or
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
    *
-   * test('fail in WebKit 1', async ({ page }) => {
+   * test('to be fixed in Safari 1', async ({ page }) => {
    *   // ...
    * });
-   * test('fail in WebKit 2', async ({ page }) => {
+   * test('to be fixed in Safari 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
-   * recommend declaring a failing test with `test.fail(title, body)` instead.
+   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
+   * recommend using `test.fixme(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fail();
+   *   test.fixme();
    *   // ...
    * });
    * ```
@@ -3728,75 +4838,77 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "fixme" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "fixme", based on test fixtures. Test or tests are marked as "fixme"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fail(condition: boolean, description?: string): void;
+  fixme(condition: boolean, description?: string): void;
   /**
-   * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
-   * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+   * Mark a test as "fixme", with the intention to fix it. Playwright will not run the test past the `test.fixme()`
+   * call.
    *
-   * To declare a "failing" test:
-   * - `test.fail(title, body)`
-   * - `test.fail(title, details, body)`
+   * To declare a "fixme" test:
+   * - `test.fixme(title, body)`
+   * - `test.fixme(title, details, body)`
    *
-   * To annotate test as "failing" at runtime:
-   * - `test.fail(condition, description)`
-   * - `test.fail(callback, description)`
-   * - `test.fail()`
+   * To annotate test as "fixme" at runtime:
+   * - `test.fixme(condition, description)`
+   * - `test.fixme(callback, description)`
+   * - `test.fixme()`
    *
    * **Usage**
    *
-   * You can declare a test as failing, so that Playwright ensures it actually fails.
+   * You can declare a test as to be fixed, and Playwright will not run it.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail('not yet ready', async ({ page }) => {
+   * test.fixme('to be fixed', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
-   * on some condition. We recommend passing a `description` argument in this case.
+   * If your test should be fixed in some configurations, but not all, you can mark the test as "fixme" inside the test
+   * body based on some condition. We recommend passing a `description` argument in this case. Playwright will run the
+   * test, but abort it immediately after the `test.fixme` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test('fail in WebKit', async ({ page, browserName }) => {
-   *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+   * test('to be fixed in Safari', async ({ page, browserName }) => {
+   *   test.fixme(browserName === 'webkit', 'This feature breaks in Safari for some reason');
    *   // ...
    * });
    * ```
    *
    * You can mark all tests in a file or
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
-   * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+   * "fixme" based on some condition with a single `test.fixme(callback, description)` call.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+   * test.fixme(({ browserName }) => browserName === 'webkit', 'Should figure out the issue');
    *
-   * test('fail in WebKit 1', async ({ page }) => {
+   * test('to be fixed in Safari 1', async ({ page }) => {
    *   // ...
    * });
-   * test('fail in WebKit 2', async ({ page }) => {
+   * test('to be fixed in Safari 2', async ({ page }) => {
    *   // ...
    * });
    * ```
    *
-   * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
-   * recommend declaring a failing test with `test.fail(title, body)` instead.
+   * You can also call `test.fixme()` without arguments inside the test body to always mark the test as failed. We
+   * recommend using `test.fixme(title, body)` instead.
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
    * test('less readable', async ({ page }) => {
-   *   test.fail();
+   *   test.fixme();
    *   // ...
    * });
    * ```
@@ -3804,13 +4916,15 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
-   * "should fail" when the return value is `true`.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   * @param condition Test is marked as "fixme" when the condition is `true`.
+   * @param callback A function that returns whether to mark as "fixme", based on test fixtures. Test or tests are marked as "fixme"
+   * when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fail(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
+  fixme(callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+
   /**
    * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
    * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
@@ -3880,13 +4994,462 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * @param title Test title.
    * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
    * description.
-   * @param body Test body that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
+   * @param body Test body that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    * @param condition Test is marked as "should fail" when the condition is `true`.
    * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
    * "should fail" when the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  fail(): void;
+  fail: {
+    /**
+     * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
+     * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+     *
+     * To declare a "failing" test:
+     * - `test.fail(title, body)`
+     * - `test.fail(title, details, body)`
+     *
+     * To annotate test as "failing" at runtime:
+     * - `test.fail(condition, description)`
+     * - `test.fail(callback, description)`
+     * - `test.fail()`
+     *
+     * **Usage**
+     *
+     * You can declare a test as failing, so that Playwright ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail('not yet ready', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
+     * on some condition. We recommend passing a `description` argument in this case.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('fail in WebKit', async ({ page, browserName }) => {
+     *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+     *   // ...
+     * });
+     * ```
+     *
+     * You can mark all tests in a file or
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
+     * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+     *
+     * test('fail in WebKit 1', async ({ page }) => {
+     *   // ...
+     * });
+     * test('fail in WebKit 2', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
+     * recommend declaring a failing test with `test.fail(title, body)` instead.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('less readable', async ({ page }) => {
+     *   test.fail();
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
+     * description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     * @param condition Test is marked as "should fail" when the condition is `true`.
+     * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
+     * "should fail" when the return value is `true`.
+     * @param description Optional description that will be reflected in a test report.
+     */
+    (title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+    /**
+     * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
+     * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+     *
+     * To declare a "failing" test:
+     * - `test.fail(title, body)`
+     * - `test.fail(title, details, body)`
+     *
+     * To annotate test as "failing" at runtime:
+     * - `test.fail(condition, description)`
+     * - `test.fail(callback, description)`
+     * - `test.fail()`
+     *
+     * **Usage**
+     *
+     * You can declare a test as failing, so that Playwright ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail('not yet ready', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
+     * on some condition. We recommend passing a `description` argument in this case.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('fail in WebKit', async ({ page, browserName }) => {
+     *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+     *   // ...
+     * });
+     * ```
+     *
+     * You can mark all tests in a file or
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
+     * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+     *
+     * test('fail in WebKit 1', async ({ page }) => {
+     *   // ...
+     * });
+     * test('fail in WebKit 2', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
+     * recommend declaring a failing test with `test.fail(title, body)` instead.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('less readable', async ({ page }) => {
+     *   test.fail();
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
+     * description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     * @param condition Test is marked as "should fail" when the condition is `true`.
+     * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
+     * "should fail" when the return value is `true`.
+     * @param description Optional description that will be reflected in a test report.
+     */
+    (title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
+    /**
+     * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
+     * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+     *
+     * To declare a "failing" test:
+     * - `test.fail(title, body)`
+     * - `test.fail(title, details, body)`
+     *
+     * To annotate test as "failing" at runtime:
+     * - `test.fail(condition, description)`
+     * - `test.fail(callback, description)`
+     * - `test.fail()`
+     *
+     * **Usage**
+     *
+     * You can declare a test as failing, so that Playwright ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail('not yet ready', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
+     * on some condition. We recommend passing a `description` argument in this case.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('fail in WebKit', async ({ page, browserName }) => {
+     *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+     *   // ...
+     * });
+     * ```
+     *
+     * You can mark all tests in a file or
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
+     * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+     *
+     * test('fail in WebKit 1', async ({ page }) => {
+     *   // ...
+     * });
+     * test('fail in WebKit 2', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
+     * recommend declaring a failing test with `test.fail(title, body)` instead.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('less readable', async ({ page }) => {
+     *   test.fail();
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
+     * description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     * @param condition Test is marked as "should fail" when the condition is `true`.
+     * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
+     * "should fail" when the return value is `true`.
+     * @param description Optional description that will be reflected in a test report.
+     */
+    (condition: boolean, description?: string): void;
+    /**
+     * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
+     * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+     *
+     * To declare a "failing" test:
+     * - `test.fail(title, body)`
+     * - `test.fail(title, details, body)`
+     *
+     * To annotate test as "failing" at runtime:
+     * - `test.fail(condition, description)`
+     * - `test.fail(callback, description)`
+     * - `test.fail()`
+     *
+     * **Usage**
+     *
+     * You can declare a test as failing, so that Playwright ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail('not yet ready', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
+     * on some condition. We recommend passing a `description` argument in this case.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('fail in WebKit', async ({ page, browserName }) => {
+     *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+     *   // ...
+     * });
+     * ```
+     *
+     * You can mark all tests in a file or
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
+     * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+     *
+     * test('fail in WebKit 1', async ({ page }) => {
+     *   // ...
+     * });
+     * test('fail in WebKit 2', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
+     * recommend declaring a failing test with `test.fail(title, body)` instead.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('less readable', async ({ page }) => {
+     *   test.fail();
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
+     * description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     * @param condition Test is marked as "should fail" when the condition is `true`.
+     * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
+     * "should fail" when the return value is `true`.
+     * @param description Optional description that will be reflected in a test report.
+     */
+    (callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+    /**
+     * Marks a test as "should fail". Playwright runs this test and ensures that it is actually failing. This is useful
+     * for documentation purposes to acknowledge that some functionality is broken until it is fixed.
+     *
+     * To declare a "failing" test:
+     * - `test.fail(title, body)`
+     * - `test.fail(title, details, body)`
+     *
+     * To annotate test as "failing" at runtime:
+     * - `test.fail(condition, description)`
+     * - `test.fail(callback, description)`
+     * - `test.fail()`
+     *
+     * **Usage**
+     *
+     * You can declare a test as failing, so that Playwright ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail('not yet ready', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * If your test fails in some configurations, but not all, you can mark the test as failing inside the test body based
+     * on some condition. We recommend passing a `description` argument in this case.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('fail in WebKit', async ({ page, browserName }) => {
+     *   test.fail(browserName === 'webkit', 'This feature is not implemented for Mac yet');
+     *   // ...
+     * });
+     * ```
+     *
+     * You can mark all tests in a file or
+     * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group as
+     * "should fail" based on some condition with a single `test.fail(callback, description)` call.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail(({ browserName }) => browserName === 'webkit', 'not implemented yet');
+     *
+     * test('fail in WebKit 1', async ({ page }) => {
+     *   // ...
+     * });
+     * test('fail in WebKit 2', async ({ page }) => {
+     *   // ...
+     * });
+     * ```
+     *
+     * You can also call `test.fail()` without arguments inside the test body to always mark the test as failed. We
+     * recommend declaring a failing test with `test.fail(title, body)` instead.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('less readable', async ({ page }) => {
+     *   test.fail();
+     *   // ...
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) for test details
+     * description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     * @param condition Test is marked as "should fail" when the condition is `true`.
+     * @param callback A function that returns whether to mark as "should fail", based on test fixtures. Test or tests are marked as
+     * "should fail" when the return value is `true`.
+     * @param description Optional description that will be reflected in a test report.
+     */
+    (): void;
+
+    /**
+     * You can use `test.fail.only` to focus on a specific test that is expected to fail. This is particularly useful when
+     * debugging a failing test or working on a specific issue.
+     *
+     * To declare a focused "failing" test:
+     * - `test.fail.only(title, body)`
+     * - `test.fail.only(title, details, body)`
+     *
+     * **Usage**
+     *
+     * You can declare a focused failing test, so that Playwright runs only this test and ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail.only('focused failing test', async ({ page }) => {
+     *   // This test is expected to fail
+     * });
+     * test('not in the focused group', async ({ page }) => {
+     *   // This test will not run
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for test
+     * details description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     */
+    only(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+    /**
+     * You can use `test.fail.only` to focus on a specific test that is expected to fail. This is particularly useful when
+     * debugging a failing test or working on a specific issue.
+     *
+     * To declare a focused "failing" test:
+     * - `test.fail.only(title, body)`
+     * - `test.fail.only(title, details, body)`
+     *
+     * **Usage**
+     *
+     * You can declare a focused failing test, so that Playwright runs only this test and ensures it actually fails.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test.fail.only('focused failing test', async ({ page }) => {
+     *   // This test is expected to fail
+     * });
+     * test('not in the focused group', async ({ page }) => {
+     *   // This test will not run
+     * });
+     * ```
+     *
+     * @param title Test title.
+     * @param details See [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) for test
+     * details description.
+     * @param body Test body that takes one or two arguments: an object with fixtures and optional
+     * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+     */
+    only(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
+  }
+
   /**
    * Marks a test as "slow". Slow test will be given triple the default timeout.
    *
@@ -4060,7 +5623,8 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * the return value is `true`.
    * @param description Optional description that will be reflected in a test report.
    */
-  slow(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
+  slow(callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+
   /**
    * Changes the timeout for the test. Zero means no timeout. Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    *
@@ -4077,8 +5641,8 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    *   });
    *   ```
    *
-   * - Changing timeout from a slow `beforeEach` or `afterEach` hook. Note that this affects the test timeout that is
-   *   shared with `beforeEach`/`afterEach` hooks.
+   * - Changing timeout from a slow `beforeEach` hook. Note that this affects the test timeout that is shared with
+   *   `beforeEach` hooks.
    *
    *   ```js
    *   test.beforeEach(async ({ page }, testInfo) => {
@@ -4121,8 +5685,9 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
    * before each test in the group.
    *
-   * You can access all the same {@link Fixtures} as the test body itself, and also the {@link TestInfo} object that
-   * gives a lot of useful information. For example, you can navigate the page before starting the test.
+   * You can access all the same [Fixtures](https://playwright.dev/docs/api/class-fixtures) as the test body itself, and
+   * also the [TestInfo](https://playwright.dev/docs/api/class-testinfo) object that gives a lot of useful information.
+   * For example, you can navigate the page before starting the test.
    *
    * You can use [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each) to
    * teardown any resources set up in `beforeEach`.
@@ -4162,7 +5727,8 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * ```
    *
    * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
+   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
   beforeEach(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
@@ -4172,221 +5738,18 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
    * before each test in the group.
    *
-   * You can access all the same {@link Fixtures} as the test body itself, and also the {@link TestInfo} object that
-   * gives a lot of useful information. For example, you can navigate the page before starting the test.
+   * You can access all the same [Fixtures](https://playwright.dev/docs/api/class-fixtures) as the test body itself, and
+   * also the [TestInfo](https://playwright.dev/docs/api/class-testinfo) object that gives a lot of useful information.
+   * For example, you can navigate the page before starting the test.
    *
    * You can use [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each) to
    * teardown any resources set up in `beforeEach`.
-   * - `test.beforeEach(hookFunction)`
-   * - `test.beforeEach(title, hookFunction)`
-   *
-   * **Details**
-   *
-   * When multiple `beforeEach` hooks are added, they will run in the order of their registration.
-   *
-   * Playwright will continue running all applicable hooks even if some of them have failed.
-   *
-   * **Usage**
-   *
-   * ```js
-   * // example.spec.ts
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.beforeEach(async ({ page }) => {
-   *   console.log(`Running ${test.info().title}`);
-   *   await page.goto('https://my.start.url/');
-   * });
-   *
-   * test('my test', async ({ page }) => {
-   *   expect(page.url()).toBe('https://my.start.url/');
-   * });
-   * ```
-   *
-   * Alternatively, you can declare a hook **with a title**.
-   *
-   * ```js
-   * // example.spec.ts
-   * test.beforeEach('Open start URL', async ({ page }) => {
-   *   console.log(`Running ${test.info().title}`);
-   *   await page.goto('https://my.start.url/');
-   * });
-   * ```
-   *
-   * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   */
-  beforeEach(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
-  /**
-   * Declares an `afterEach` hook that is executed after each test.
-   *
-   * When called in the scope of a test file, runs after each test in the file. When called inside a
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
-   * after each test in the group.
-   *
-   * You can access all the same {@link Fixtures} as the test body itself, and also the {@link TestInfo} object that
-   * gives a lot of useful information. For example, you can check whether the test succeeded or failed.
-   * - `test.afterEach(hookFunction)`
-   * - `test.afterEach(title, hookFunction)`
-   *
-   * **Details**
-   *
-   * When multiple `afterEach` hooks are added, they will run in the order of their registration.
-   *
-   * Playwright will continue running all applicable hooks even if some of them have failed.
-   *
-   * **Usage**
-   *
-   * ```js
-   * // example.spec.ts
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.afterEach(async ({ page }) => {
-   *   console.log(`Finished ${test.info().title} with status ${test.info().status}`);
-   *
-   *   if (test.info().status !== test.info().expectedStatus)
-   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
-   * });
-   *
-   * test('my test', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * Alternatively, you can declare a hook **with a title**.
-   *
-   * ```js
-   * // example.spec.ts
-   * test.afterEach('Status check', async ({ page }) => {
-   *   if (test.info().status !== test.info().expectedStatus)
-   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
-   * });
-   * ```
-   *
-   * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   */
-  afterEach(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
-  /**
-   * Declares an `afterEach` hook that is executed after each test.
-   *
-   * When called in the scope of a test file, runs after each test in the file. When called inside a
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
-   * after each test in the group.
-   *
-   * You can access all the same {@link Fixtures} as the test body itself, and also the {@link TestInfo} object that
-   * gives a lot of useful information. For example, you can check whether the test succeeded or failed.
-   * - `test.afterEach(hookFunction)`
-   * - `test.afterEach(title, hookFunction)`
-   *
-   * **Details**
-   *
-   * When multiple `afterEach` hooks are added, they will run in the order of their registration.
-   *
-   * Playwright will continue running all applicable hooks even if some of them have failed.
-   *
-   * **Usage**
-   *
-   * ```js
-   * // example.spec.ts
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.afterEach(async ({ page }) => {
-   *   console.log(`Finished ${test.info().title} with status ${test.info().status}`);
-   *
-   *   if (test.info().status !== test.info().expectedStatus)
-   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
-   * });
-   *
-   * test('my test', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * Alternatively, you can declare a hook **with a title**.
-   *
-   * ```js
-   * // example.spec.ts
-   * test.afterEach('Status check', async ({ page }) => {
-   *   if (test.info().status !== test.info().expectedStatus)
-   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
-   * });
-   * ```
-   *
-   * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional {@link TestInfo}.
-   */
-  afterEach(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
-  /**
-   * Declares a `beforeAll` hook that is executed once per worker process before all tests.
-   *
-   * When called in the scope of a test file, runs before all tests in the file. When called inside a
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
-   * before all tests in the group.
-   *
-   * You can use [test.afterAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-all) to
-   * teardown any resources set up in `beforeAll`.
-   * - `test.beforeAll(hookFunction)`
-   * - `test.beforeAll(title, hookFunction)`
-   *
-   * **Details**
-   *
-   * When multiple `beforeAll` hooks are added, they will run in the order of their registration.
-   *
-   * Note that worker process is restarted on test failures, and `beforeAll` hook runs again in the new worker. Learn
-   * more about [workers and failures](https://playwright.dev/docs/test-retries).
-   *
-   * Playwright will continue running all applicable hooks even if some of them have failed.
-   *
-   * **Usage**
-   *
-   * ```js
-   * // example.spec.ts
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.beforeAll(async () => {
-   *   console.log('Before tests');
-   * });
-   *
-   * test.afterAll(async () => {
-   *   console.log('After tests');
-   * });
-   *
-   * test('my test', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
-   *
-   * Alternatively, you can declare a hook **with a title**.
-   *
-   * ```js
-   * // example.spec.ts
-   * test.beforeAll('Setup', async () => {
-   *   console.log('Before tests');
-   * });
-   * ```
-   *
-   * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional {@link TestInfo}.
-   */
-  beforeAll(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
-  /**
-   * Declares a `beforeAll` hook that is executed once per worker process before all tests.
-   *
-   * When called in the scope of a test file, runs before all tests in the file. When called inside a
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
-   * before all tests in the group.
-   *
-   * You can use [test.afterAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-all) to
-   * teardown any resources set up in `beforeAll`.
-   * - `test.beforeAll(hookFunction)`
-   * - `test.beforeAll(title, hookFunction)`
+   * - `test.beforeEach(hookFunction)`
+   * - `test.beforeEach(title, hookFunction)`
    *
    * **Details**
    *
-   * When multiple `beforeAll` hooks are added, they will run in the order of their registration.
-   *
-   * Note that worker process is restarted on test failures, and `beforeAll` hook runs again in the new worker. Learn
-   * more about [workers and failures](https://playwright.dev/docs/test-retries).
+   * When multiple `beforeEach` hooks are added, they will run in the order of their registration.
    *
    * Playwright will continue running all applicable hooks even if some of them have failed.
    *
@@ -4396,16 +5759,13 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * // example.spec.ts
    * import { test, expect } from '@playwright/test';
    *
-   * test.beforeAll(async () => {
-   *   console.log('Before tests');
-   * });
-   *
-   * test.afterAll(async () => {
-   *   console.log('After tests');
+   * test.beforeEach(async ({ page }) => {
+   *   console.log(`Running ${test.info().title}`);
+   *   await page.goto('https://my.start.url/');
    * });
    *
    * test('my test', async ({ page }) => {
-   *   // ...
+   *   expect(page.url()).toBe('https://my.start.url/');
    * });
    * ```
    *
@@ -4413,38 +5773,50 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    *
    * ```js
    * // example.spec.ts
-   * test.beforeAll('Setup', async () => {
-   *   console.log('Before tests');
+   * test.beforeEach('Open start URL', async ({ page }) => {
+   *   console.log(`Running ${test.info().title}`);
+   *   await page.goto('https://my.start.url/');
    * });
    * ```
    *
    * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional {@link TestInfo}.
+   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  beforeAll(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
+  beforeEach(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
-   * Declares an `afterAll` hook that is executed once per worker after all tests.
+   * Declares an `afterEach` hook that is executed after each test.
    *
-   * When called in the scope of a test file, runs after all tests in the file. When called inside a
+   * When called in the scope of a test file, runs after each test in the file. When called inside a
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
-   * after all tests in the group.
+   * after each test in the group.
    *
-   * **Details**
+   * You can access all the same [Fixtures](https://playwright.dev/docs/api/class-fixtures) as the test body itself, and
+   * also the [TestInfo](https://playwright.dev/docs/api/class-testinfo) object that gives a lot of useful information.
+   * For example, you can check whether the test succeeded or failed.
+   * - `test.afterEach(hookFunction)`
+   * - `test.afterEach(title, hookFunction)`
    *
-   * When multiple `afterAll` hooks are added, they will run in the order of their registration.
+   * **Details**
    *
-   * Note that worker process is restarted on test failures, and `afterAll` hook runs again in the new worker. Learn
-   * more about [workers and failures](https://playwright.dev/docs/test-retries).
+   * When multiple `afterEach` hooks are added, they will run in the order of their registration.
    *
    * Playwright will continue running all applicable hooks even if some of them have failed.
-   * - `test.afterAll(hookFunction)`
-   * - `test.afterAll(title, hookFunction)`
    *
    * **Usage**
    *
    * ```js
-   * test.afterAll(async () => {
-   *   console.log('Done with tests');
+   * // example.spec.ts
+   * import { test, expect } from '@playwright/test';
+   *
+   * test.afterEach(async ({ page }) => {
+   *   console.log(`Finished ${test.info().title} with status ${test.info().status}`);
+   *
+   *   if (test.info().status !== test.info().expectedStatus)
+   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
+   * });
+   *
+   * test('my test', async ({ page }) => {
    *   // ...
    * });
    * ```
@@ -4452,39 +5824,51 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * Alternatively, you can declare a hook **with a title**.
    *
    * ```js
-   * test.afterAll('Teardown', async () => {
-   *   console.log('Done with tests');
-   *   // ...
+   * // example.spec.ts
+   * test.afterEach('Status check', async ({ page }) => {
+   *   if (test.info().status !== test.info().expectedStatus)
+   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
    * });
    * ```
    *
    * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional {@link TestInfo}.
+   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  afterAll(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
+  afterEach(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
-   * Declares an `afterAll` hook that is executed once per worker after all tests.
+   * Declares an `afterEach` hook that is executed after each test.
    *
-   * When called in the scope of a test file, runs after all tests in the file. When called inside a
+   * When called in the scope of a test file, runs after each test in the file. When called inside a
    * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
-   * after all tests in the group.
+   * after each test in the group.
    *
-   * **Details**
+   * You can access all the same [Fixtures](https://playwright.dev/docs/api/class-fixtures) as the test body itself, and
+   * also the [TestInfo](https://playwright.dev/docs/api/class-testinfo) object that gives a lot of useful information.
+   * For example, you can check whether the test succeeded or failed.
+   * - `test.afterEach(hookFunction)`
+   * - `test.afterEach(title, hookFunction)`
    *
-   * When multiple `afterAll` hooks are added, they will run in the order of their registration.
+   * **Details**
    *
-   * Note that worker process is restarted on test failures, and `afterAll` hook runs again in the new worker. Learn
-   * more about [workers and failures](https://playwright.dev/docs/test-retries).
+   * When multiple `afterEach` hooks are added, they will run in the order of their registration.
    *
    * Playwright will continue running all applicable hooks even if some of them have failed.
-   * - `test.afterAll(hookFunction)`
-   * - `test.afterAll(title, hookFunction)`
    *
    * **Usage**
    *
    * ```js
-   * test.afterAll(async () => {
-   *   console.log('Done with tests');
+   * // example.spec.ts
+   * import { test, expect } from '@playwright/test';
+   *
+   * test.afterEach(async ({ page }) => {
+   *   console.log(`Finished ${test.info().title} with status ${test.info().status}`);
+   *
+   *   if (test.info().status !== test.info().expectedStatus)
+   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
+   * });
+   *
+   * test('my test', async ({ page }) => {
    *   // ...
    * });
    * ```
@@ -4492,624 +5876,758 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
    * Alternatively, you can declare a hook **with a title**.
    *
    * ```js
-   * test.afterAll('Teardown', async () => {
-   *   console.log('Done with tests');
-   *   // ...
+   * // example.spec.ts
+   * test.afterEach('Status check', async ({ page }) => {
+   *   if (test.info().status !== test.info().expectedStatus)
+   *     console.log(`Did not run as expected, ended up at ${page.url()}`);
    * });
    * ```
    *
    * @param title Hook title.
-   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional {@link TestInfo}.
+   * @param hookFunction Hook function that takes one or two arguments: an object with fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  afterAll(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
+  afterEach(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
-   * Specifies options or fixtures to use in a single test file or a
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group. Most
-   * useful to set an option, for example set `locale` to configure `context` fixture.
-   *
-   * **Usage**
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
+   * Declares a `beforeAll` hook that is executed once per worker process before all tests.
    *
-   * test.use({ locale: 'en-US' });
+   * When called in the scope of a test file, runs before all tests in the file. When called inside a
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
+   * before all tests in the group.
    *
-   * test('test with locale', async ({ page }) => {
-   *   // Default context and page have locale as specified
-   * });
-   * ```
+   * You can use [test.afterAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-all) to
+   * teardown any resources set up in `beforeAll`.
+   * - `test.beforeAll(hookFunction)`
+   * - `test.beforeAll(title, hookFunction)`
    *
    * **Details**
    *
-   * `test.use` can be called either in the global scope or inside `test.describe`. It is an error to call it within
-   * `beforeEach` or `beforeAll`.
-   *
-   * It is also possible to override a fixture by providing a function.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test.use({
-   *   locale: async ({}, use) => {
-   *     // Read locale from some configuration file.
-   *     const locale = await fs.promises.readFile('test-locale', 'utf-8');
-   *     await use(locale);
-   *   },
-   * });
+   * When multiple `beforeAll` hooks are added, they will run in the order of their registration.
    *
-   * test('test with locale', async ({ page }) => {
-   *   // Default context and page have locale as specified
-   * });
-   * ```
+   * Note that worker process is restarted on test failures, and `beforeAll` hook runs again in the new worker. Learn
+   * more about [workers and failures](https://playwright.dev/docs/test-retries).
    *
-   * @param options An object with local options.
-   */
-  use(fixtures: Fixtures<{}, {}, TestArgs, WorkerArgs>): void;
-  /**
-   * Declares a test step that is shown in the report.
+   * Playwright will continue running all applicable hooks even if some of them have failed.
    *
    * **Usage**
    *
    * ```js
+   * // example.spec.ts
    * import { test, expect } from '@playwright/test';
    *
-   * test('test', async ({ page }) => {
-   *   await test.step('Log in', async () => {
-   *     // ...
-   *   });
-   *
-   *   await test.step('Outer step', async () => {
-   *     // ...
-   *     // You can nest steps inside each other.
-   *     await test.step('Inner step', async () => {
-   *       // ...
-   *     });
-   *   });
+   * test.beforeAll(async () => {
+   *   console.log('Before tests');
    * });
-   * ```
-   *
-   * **Details**
    *
-   * The method returns the value returned by the step callback.
-   *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   *
-   * test('test', async ({ page }) => {
-   *   const user = await test.step('Log in', async () => {
-   *     // ...
-   *     return 'john';
-   *   });
-   *   expect(user).toBe('john');
+   * test.afterAll(async () => {
+   *   console.log('After tests');
    * });
-   * ```
-   *
-   * **Decorator**
-   *
-   * You can use TypeScript method decorators to turn a method into a step. Each call to the decorated method will show
-   * up as a step in the report.
-   *
-   * ```js
-   * function step(target: Function, context: ClassMethodDecoratorContext) {
-   *   return function replacementMethod(...args: any) {
-   *     const name = this.constructor.name + '.' + (context.name as string);
-   *     return test.step(name, async () => {
-   *       return await target.call(this, ...args);
-   *     });
-   *   };
-   * }
-   *
-   * class LoginPage {
-   *   constructor(readonly page: Page) {}
-   *
-   *   @step
-   *   async login() {
-   *     const account = { username: 'Alice', password: 's3cr3t' };
-   *     await this.page.getByLabel('Username or email address').fill(account.username);
-   *     await this.page.getByLabel('Password').fill(account.password);
-   *     await this.page.getByRole('button', { name: 'Sign in' }).click();
-   *     await expect(this.page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
-   *   }
-   * }
    *
-   * test('example', async ({ page }) => {
-   *   const loginPage = new LoginPage(page);
-   *   await loginPage.login();
+   * test('my test', async ({ page }) => {
+   *   // ...
    * });
    * ```
    *
-   * **Boxing**
-   *
-   * When something inside a step fails, you would usually see the error pointing to the exact action that failed. For
-   * example, consider the following login step:
+   * Alternatively, you can declare a hook **with a title**.
    *
    * ```js
-   * async function login(page) {
-   *   await test.step('login', async () => {
-   *     const account = { username: 'Alice', password: 's3cr3t' };
-   *     await page.getByLabel('Username or email address').fill(account.username);
-   *     await page.getByLabel('Password').fill(account.password);
-   *     await page.getByRole('button', { name: 'Sign in' }).click();
-   *     await expect(page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
-   *   });
-   * }
-   *
-   * test('example', async ({ page }) => {
-   *   await page.goto('https://github.com/login');
-   *   await login(page);
+   * // example.spec.ts
+   * test.beforeAll('Setup', async () => {
+   *   console.log('Before tests');
    * });
    * ```
    *
-   * ```txt
-   * Error: Timed out 5000ms waiting for expect(locator).toBeVisible()
-   *   ... error details omitted ...
+   * @param title Hook title.
+   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   */
+  beforeAll(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
+  /**
+   * Declares a `beforeAll` hook that is executed once per worker process before all tests.
    *
-   *    8 |     await page.getByRole('button', { name: 'Sign in' }).click();
-   * >  9 |     await expect(page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
-   *      |                                                                               ^
-   *   10 |   });
-   * ```
+   * When called in the scope of a test file, runs before all tests in the file. When called inside a
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
+   * before all tests in the group.
+   *
+   * You can use [test.afterAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-all) to
+   * teardown any resources set up in `beforeAll`.
+   * - `test.beforeAll(hookFunction)`
+   * - `test.beforeAll(title, hookFunction)`
    *
-   * As we see above, the test may fail with an error pointing inside the step. If you would like the error to highlight
-   * the "login" step instead of its internals, use the `box` option. An error inside a boxed step points to the step
-   * call site.
+   * **Details**
    *
-   * ```js
-   * async function login(page) {
-   *   await test.step('login', async () => {
-   *     // ...
-   *   }, { box: true });  // Note the "box" option here.
-   * }
-   * ```
+   * When multiple `beforeAll` hooks are added, they will run in the order of their registration.
    *
-   * ```txt
-   * Error: Timed out 5000ms waiting for expect(locator).toBeVisible()
-   *   ... error details omitted ...
+   * Note that worker process is restarted on test failures, and `beforeAll` hook runs again in the new worker. Learn
+   * more about [workers and failures](https://playwright.dev/docs/test-retries).
    *
-   *   14 |   await page.goto('https://github.com/login');
-   * > 15 |   await login(page);
-   *      |         ^
-   *   16 | });
-   * ```
+   * Playwright will continue running all applicable hooks even if some of them have failed.
    *
-   * You can also create a TypeScript decorator for a boxed step, similar to a regular step decorator above:
+   * **Usage**
    *
    * ```js
-   * function boxedStep(target: Function, context: ClassMethodDecoratorContext) {
-   *   return function replacementMethod(...args: any) {
-   *     const name = this.constructor.name + '.' + (context.name as string);
-   *     return test.step(name, async () => {
-   *       return await target.call(this, ...args);
-   *     }, { box: true });  // Note the "box" option here.
-   *   };
-   * }
+   * // example.spec.ts
+   * import { test, expect } from '@playwright/test';
    *
-   * class LoginPage {
-   *   constructor(readonly page: Page) {}
+   * test.beforeAll(async () => {
+   *   console.log('Before tests');
+   * });
    *
-   *   @boxedStep
-   *   async login() {
-   *     // ....
-   *   }
-   * }
+   * test.afterAll(async () => {
+   *   console.log('After tests');
+   * });
    *
-   * test('example', async ({ page }) => {
-   *   const loginPage = new LoginPage(page);
-   *   await loginPage.login();  // <-- Error will be reported on this line.
+   * test('my test', async ({ page }) => {
+   *   // ...
    * });
    * ```
    *
-   * @param title Step name.
-   * @param body Step body.
-   * @param options
-   */
-  step<T>(title: string, body: () => T | Promise<T>, options?: { box?: boolean }): Promise<T>;
-  /**
-   * `expect` function can be used to create test assertions. Read more about [test assertions](https://playwright.dev/docs/test-assertions).
-   *
-   * **Usage**
+   * Alternatively, you can declare a hook **with a title**.
    *
    * ```js
-   * test('example', async ({ page }) => {
-   *   await test.expect(page).toHaveTitle('Title');
+   * // example.spec.ts
+   * test.beforeAll('Setup', async () => {
+   *   console.log('Before tests');
    * });
    * ```
    *
+   * @param title Hook title.
+   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  expect: Expect<{}>;
+  beforeAll(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
-   * Extends the `test` object by defining fixtures and/or options that can be used in the tests.
-   *
-   * **Usage**
+   * Declares an `afterAll` hook that is executed once per worker after all tests.
    *
-   * First define a fixture and/or an option.
+   * When called in the scope of a test file, runs after all tests in the file. When called inside a
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
+   * after all tests in the group.
    *
-   * ```js
-   * import { test as base } from '@playwright/test';
-   * import { TodoPage } from './todo-page';
+   * **Details**
    *
-   * export type Options = { defaultItem: string };
+   * When multiple `afterAll` hooks are added, they will run in the order of their registration.
    *
-   * // Extend basic test by providing a "defaultItem" option and a "todoPage" fixture.
-   * export const test = base.extend<Options & { todoPage: TodoPage }>({
-   *   // Define an option and provide a default value.
-   *   // We can later override it in the config.
-   *   defaultItem: ['Do stuff', { option: true }],
+   * Note that worker process is restarted on test failures, and `afterAll` hook runs again in the new worker. Learn
+   * more about [workers and failures](https://playwright.dev/docs/test-retries).
    *
-   *   // Define a fixture. Note that it can use built-in fixture "page"
-   *   // and a new option "defaultItem".
-   *   todoPage: async ({ page, defaultItem }, use) => {
-   *     const todoPage = new TodoPage(page);
-   *     await todoPage.goto();
-   *     await todoPage.addToDo(defaultItem);
-   *     await use(todoPage);
-   *     await todoPage.removeAll();
-   *   },
-   * });
-   * ```
+   * Playwright will continue running all applicable hooks even if some of them have failed.
+   * - `test.afterAll(hookFunction)`
+   * - `test.afterAll(title, hookFunction)`
    *
-   * Then use the fixture in the test.
+   * **Usage**
    *
    * ```js
-   * // example.spec.ts
-   * import { test } from './my-test';
-   *
-   * test('test 1', async ({ todoPage }) => {
-   *   await todoPage.addToDo('my todo');
+   * test.afterAll(async () => {
+   *   console.log('Done with tests');
    *   // ...
    * });
    * ```
    *
-   * Configure the option in config file.
+   * Alternatively, you can declare a hook **with a title**.
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   * import type { Options } from './my-test';
-   *
-   * export default defineConfig<Options>({
-   *   projects: [
-   *     {
-   *       name: 'shopping',
-   *       use: { defaultItem: 'Buy milk' },
-   *     },
-   *     {
-   *       name: 'wellbeing',
-   *       use: { defaultItem: 'Exercise!' },
-   *     },
-   *   ]
+   * test.afterAll('Teardown', async () => {
+   *   console.log('Done with tests');
+   *   // ...
    * });
    * ```
    *
-   * Learn more about [fixtures](https://playwright.dev/docs/test-fixtures) and [parametrizing tests](https://playwright.dev/docs/test-parameterize).
-   * @param fixtures An object containing fixtures and/or options. Learn more about [fixtures format](https://playwright.dev/docs/test-fixtures).
+   * @param title Hook title.
+   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
    */
-  extend<T extends KeyValue, W extends KeyValue = {}>(fixtures: Fixtures<T, W, TestArgs, WorkerArgs>): TestType<TestArgs & T, WorkerArgs & W>;
+  afterAll(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
-   * Returns information about the currently running test. This method can only be called during the test execution,
-   * otherwise it throws.
+   * Declares an `afterAll` hook that is executed once per worker after all tests.
+   *
+   * When called in the scope of a test file, runs after all tests in the file. When called inside a
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group, runs
+   * after all tests in the group.
+   *
+   * **Details**
+   *
+   * When multiple `afterAll` hooks are added, they will run in the order of their registration.
+   *
+   * Note that worker process is restarted on test failures, and `afterAll` hook runs again in the new worker. Learn
+   * more about [workers and failures](https://playwright.dev/docs/test-retries).
+   *
+   * Playwright will continue running all applicable hooks even if some of them have failed.
+   * - `test.afterAll(hookFunction)`
+   * - `test.afterAll(title, hookFunction)`
    *
    * **Usage**
    *
    * ```js
-   * test('example test', async ({ page }) => {
+   * test.afterAll(async () => {
+   *   console.log('Done with tests');
    *   // ...
-   *   await test.info().attach('screenshot', {
-   *     body: await page.screenshot(),
-   *     contentType: 'image/png',
-   *   });
    * });
    * ```
    *
-   */
-  info(): TestInfo;
-}
-
-type KeyValue = { [key: string]: any };
-export type TestFixture<R, Args extends KeyValue> = (args: Args, use: (r: R) => Promise<void>, testInfo: TestInfo) => any;
-export type WorkerFixture<R, Args extends KeyValue> = (args: Args, use: (r: R) => Promise<void>, workerInfo: WorkerInfo) => any;
-type TestFixtureValue<R, Args extends KeyValue> = Exclude<R, Function> | TestFixture<R, Args>;
-type WorkerFixtureValue<R, Args extends KeyValue> = Exclude<R, Function> | WorkerFixture<R, Args>;
-export type Fixtures<T extends KeyValue = {}, W extends KeyValue = {}, PT extends KeyValue = {}, PW extends KeyValue = {}> = {
-  [K in keyof PW]?: WorkerFixtureValue<PW[K], W & PW> | [WorkerFixtureValue<PW[K], W & PW>, { scope: 'worker', timeout?: number | undefined, title?: string, box?: boolean }];
-} & {
-  [K in keyof PT]?: TestFixtureValue<PT[K], T & W & PT & PW> | [TestFixtureValue<PT[K], T & W & PT & PW>, { scope: 'test', timeout?: number | undefined, title?: string, box?: boolean }];
-} & {
-  [K in Exclude<keyof W, keyof PW>]?: [WorkerFixtureValue<W[K], W & PW>, { scope: 'worker', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
-} & {
-  [K in Exclude<keyof T, keyof PT>]?: TestFixtureValue<T[K], T & W & PT & PW> | [TestFixtureValue<T[K], T & W & PT & PW>, { scope?: 'test', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
-};
-
-type BrowserName = 'chromium' | 'firefox' | 'webkit';
-type BrowserChannel = Exclude<LaunchOptions['channel'], undefined>;
-type ColorScheme = Exclude<BrowserContextOptions['colorScheme'], undefined>;
-type ClientCertificate = Exclude<BrowserContextOptions['clientCertificates'], undefined>[0];
-type ExtraHTTPHeaders = Exclude<BrowserContextOptions['extraHTTPHeaders'], undefined>;
-type Proxy = Exclude<BrowserContextOptions['proxy'], undefined>;
-type StorageState = Exclude<BrowserContextOptions['storageState'], undefined>;
-type ServiceWorkerPolicy = Exclude<BrowserContextOptions['serviceWorkers'], undefined>;
-type ConnectOptions = {
-  /**
-   * A browser websocket endpoint to connect to.
-   */
-  wsEndpoint: string;
-
-  /**
-   * Additional HTTP headers to be sent with web socket connect request.
-   */
-  headers?: { [key: string]: string; };
-
-  /**
-   * This option exposes network available on the connecting client to the browser being connected to.
-   * Consists of a list of rules separated by comma.
+   * Alternatively, you can declare a hook **with a title**.
    *
-   * Available rules:
-   * - Hostname pattern, for example: `example.com`, `*.org:99`, `x.*.y.com`, `*foo.org`.
-   * - IP literal, for example: `127.0.0.1`, `0.0.0.0:99`, `[::1]`, `[0:0::1]:99`.
-   * - `<loopback>` that matches local loopback interfaces: `localhost`, `*.localhost`, `127.0.0.1`, `[::1]`.
-
-   * Some common examples:
-   * - `"*"` to expose all network.
-   * - `"<loopback>"` to expose localhost network.
-   * - `"*.test.internal-domain,*.staging.internal-domain,<loopback>"` to expose test/staging deployments and localhost.
-   */
-  exposeNetwork?: string;
-
-  /**
-   * Timeout in milliseconds for the connection to be established. Optional, defaults to no timeout.
-   */
-  timeout?: number;
-};
-
-/**
- * Playwright Test provides many options to configure test environment, {@link Browser}, {@link BrowserContext} and
- * more.
- *
- * These options are usually provided in the [configuration file](https://playwright.dev/docs/test-configuration) through
- * [testConfig.use](https://playwright.dev/docs/api/class-testconfig#test-config-use) and
- * [testProject.use](https://playwright.dev/docs/api/class-testproject#test-project-use).
- *
- * ```js
- * // playwright.config.ts
- * import { defineConfig } from '@playwright/test';
- * export default defineConfig({
- *   use: {
- *     headless: false,
- *     viewport: { width: 1280, height: 720 },
- *     ignoreHTTPSErrors: true,
- *     video: 'on-first-retry',
- *   },
- * });
- * ```
- *
- * Alternatively, with [test.use(options)](https://playwright.dev/docs/api/class-test#test-use) you can override some
- * options for a file.
- *
- * ```js
- * // example.spec.ts
- * import { test, expect } from '@playwright/test';
- *
- * // Run tests in this file with portrait-like viewport.
- * test.use({ viewport: { width: 600, height: 900 } });
- *
- * test('my portrait test', async ({ page }) => {
- *   // ...
- * });
- * ```
- *
- */
-export interface PlaywrightWorkerOptions {
+   * ```js
+   * test.afterAll('Teardown', async () => {
+   *   console.log('Done with tests');
+   *   // ...
+   * });
+   * ```
+   *
+   * @param title Hook title.
+   * @param hookFunction Hook function that takes one or two arguments: an object with worker fixtures and optional
+   * [TestInfo](https://playwright.dev/docs/api/class-testinfo).
+   */
+  afterAll(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   /**
-   * Name of the browser that runs tests. Defaults to `'chromium'`. Most of the time you should set `browserName` in
-   * your {@link TestConfig}:
+   * Specifies options or fixtures to use in a single test file or a
+   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) group. Most
+   * useful to set an option, for example set `locale` to configure `context` fixture.
    *
    * **Usage**
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig, devices } from '@playwright/test';
+   * import { test, expect } from '@playwright/test';
    *
-   * export default defineConfig({
-   *   use: {
-   *     browserName: 'firefox',
-   *   },
+   * test.use({ locale: 'en-US' });
+   *
+   * test('test with locale', async ({ page }) => {
+   *   // Default context and page have locale as specified
    * });
    * ```
    *
-   */
-  browserName: BrowserName;
-  defaultBrowserType: BrowserName;
-  /**
-   * Whether to run browser in headless mode. More details for
-   * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
-   * [Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode). Defaults to `true` unless the
-   * `devtools` option is `true`.
+   * **Details**
    *
-   * **Usage**
+   * `test.use` can be called either in the global scope or inside `test.describe`. It is an error to call it within
+   * `beforeEach` or `beforeAll`.
+   *
+   * It is also possible to override a fixture by providing a function.
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
+   * import { test, expect } from '@playwright/test';
    *
-   * export default defineConfig({
-   *   use: {
-   *     headless: false
+   * test.use({
+   *   locale: async ({}, use) => {
+   *     // Read locale from some configuration file.
+   *     const locale = await fs.promises.readFile('test-locale', 'utf-8');
+   *     await use(locale);
    *   },
    * });
+   *
+   * test('test with locale', async ({ page }) => {
+   *   // Default context and page have locale as specified
+   * });
    * ```
    *
+   * @param options An object with local options.
    */
-  headless: boolean;
+  use(fixtures: Fixtures<{}, {}, TestArgs, WorkerArgs>): void;
   /**
-   * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary",
-   * "msedge", "msedge-beta", "msedge-dev", "msedge-canary". Read more about using
-   * [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
+   * Declares a test step that is shown in the report.
    *
    * **Usage**
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
+   * import { test, expect } from '@playwright/test';
    *
-   * export default defineConfig({
-   *   projects: [
-   *     {
-   *       name: 'Microsoft Edge',
-   *       use: {
-   *         ...devices['Desktop Edge'],
-   *         channel: 'msedge'
-   *       },
-   *     },
-   *   ]
+   * test('test', async ({ page }) => {
+   *   await test.step('Log in', async () => {
+   *     // ...
+   *   });
+   *
+   *   await test.step('Outer step', async () => {
+   *     // ...
+   *     // You can nest steps inside each other.
+   *     await test.step('Inner step', async () => {
+   *       // ...
+   *     });
+   *   });
    * });
    * ```
    *
-   */
-  channel: BrowserChannel | undefined;
-  /**
-   * Options used to launch the browser, as passed to
-   * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). Specific
-   * options [testOptions.headless](https://playwright.dev/docs/api/class-testoptions#test-options-headless) and
-   * [testOptions.channel](https://playwright.dev/docs/api/class-testoptions#test-options-channel) take priority over
-   * this.
+   * **Details**
    *
-   * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
+   * The method returns the value returned by the step callback.
+   *
+   * ```js
+   * import { test, expect } from '@playwright/test';
+   *
+   * test('test', async ({ page }) => {
+   *   const user = await test.step('Log in', async () => {
+   *     // ...
+   *     return 'john';
+   *   });
+   *   expect(user).toBe('john');
+   * });
+   * ```
+   *
+   * **Decorator**
+   *
+   * You can use TypeScript method decorators to turn a method into a step. Each call to the decorated method will show
+   * up as a step in the report.
+   *
+   * ```js
+   * function step(target: Function, context: ClassMethodDecoratorContext) {
+   *   return function replacementMethod(...args: any) {
+   *     const name = this.constructor.name + '.' + (context.name as string);
+   *     return test.step(name, async () => {
+   *       return await target.call(this, ...args);
+   *     });
+   *   };
+   * }
+   *
+   * class LoginPage {
+   *   constructor(readonly page: Page) {}
+   *
+   *   @step
+   *   async login() {
+   *     const account = { username: 'Alice', password: 's3cr3t' };
+   *     await this.page.getByLabel('Username or email address').fill(account.username);
+   *     await this.page.getByLabel('Password').fill(account.password);
+   *     await this.page.getByRole('button', { name: 'Sign in' }).click();
+   *     await expect(this.page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
+   *   }
+   * }
+   *
+   * test('example', async ({ page }) => {
+   *   const loginPage = new LoginPage(page);
+   *   await loginPage.login();
+   * });
+   * ```
+   *
+   * **Boxing**
+   *
+   * When something inside a step fails, you would usually see the error pointing to the exact action that failed. For
+   * example, consider the following login step:
+   *
+   * ```js
+   * async function login(page) {
+   *   await test.step('login', async () => {
+   *     const account = { username: 'Alice', password: 's3cr3t' };
+   *     await page.getByLabel('Username or email address').fill(account.username);
+   *     await page.getByLabel('Password').fill(account.password);
+   *     await page.getByRole('button', { name: 'Sign in' }).click();
+   *     await expect(page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
+   *   });
+   * }
+   *
+   * test('example', async ({ page }) => {
+   *   await page.goto('https://github.com/login');
+   *   await login(page);
+   * });
+   * ```
+   *
+   * ```txt
+   * Error: Timed out 5000ms waiting for expect(locator).toBeVisible()
+   *   ... error details omitted ...
+   *
+   *    8 |     await page.getByRole('button', { name: 'Sign in' }).click();
+   * >  9 |     await expect(page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
+   *      |                                                                               ^
+   *   10 |   });
+   * ```
+   *
+   * As we see above, the test may fail with an error pointing inside the step. If you would like the error to highlight
+   * the "login" step instead of its internals, use the `box` option. An error inside a boxed step points to the step
+   * call site.
+   *
+   * ```js
+   * async function login(page) {
+   *   await test.step('login', async () => {
+   *     // ...
+   *   }, { box: true });  // Note the "box" option here.
+   * }
+   * ```
+   *
+   * ```txt
+   * Error: Timed out 5000ms waiting for expect(locator).toBeVisible()
+   *   ... error details omitted ...
+   *
+   *   14 |   await page.goto('https://github.com/login');
+   * > 15 |   await login(page);
+   *      |         ^
+   *   16 | });
+   * ```
+   *
+   * You can also create a TypeScript decorator for a boxed step, similar to a regular step decorator above:
+   *
+   * ```js
+   * function boxedStep(target: Function, context: ClassMethodDecoratorContext) {
+   *   return function replacementMethod(...args: any) {
+   *     const name = this.constructor.name + '.' + (context.name as string);
+   *     return test.step(name, async () => {
+   *       return await target.call(this, ...args);
+   *     }, { box: true });  // Note the "box" option here.
+   *   };
+   * }
+   *
+   * class LoginPage {
+   *   constructor(readonly page: Page) {}
+   *
+   *   @boxedStep
+   *   async login() {
+   *     // ....
+   *   }
+   * }
+   *
+   * test('example', async ({ page }) => {
+   *   const loginPage = new LoginPage(page);
+   *   await loginPage.login();  // <-- Error will be reported on this line.
+   * });
+   * ```
+   *
+   * @param title Step name.
+   * @param body Step body.
+   * @param options
+   */
+  step: {
+    /**
+     * Declares a test step that is shown in the report.
+     *
+     * **Usage**
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('test', async ({ page }) => {
+     *   await test.step('Log in', async () => {
+     *     // ...
+     *   });
+     *
+     *   await test.step('Outer step', async () => {
+     *     // ...
+     *     // You can nest steps inside each other.
+     *     await test.step('Inner step', async () => {
+     *       // ...
+     *     });
+     *   });
+     * });
+     * ```
+     *
+     * **Details**
+     *
+     * The method returns the value returned by the step callback.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('test', async ({ page }) => {
+     *   const user = await test.step('Log in', async () => {
+     *     // ...
+     *     return 'john';
+     *   });
+     *   expect(user).toBe('john');
+     * });
+     * ```
+     *
+     * **Decorator**
+     *
+     * You can use TypeScript method decorators to turn a method into a step. Each call to the decorated method will show
+     * up as a step in the report.
+     *
+     * ```js
+     * function step(target: Function, context: ClassMethodDecoratorContext) {
+     *   return function replacementMethod(...args: any) {
+     *     const name = this.constructor.name + '.' + (context.name as string);
+     *     return test.step(name, async () => {
+     *       return await target.call(this, ...args);
+     *     });
+     *   };
+     * }
+     *
+     * class LoginPage {
+     *   constructor(readonly page: Page) {}
+     *
+     *   @step
+     *   async login() {
+     *     const account = { username: 'Alice', password: 's3cr3t' };
+     *     await this.page.getByLabel('Username or email address').fill(account.username);
+     *     await this.page.getByLabel('Password').fill(account.password);
+     *     await this.page.getByRole('button', { name: 'Sign in' }).click();
+     *     await expect(this.page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
+     *   }
+     * }
+     *
+     * test('example', async ({ page }) => {
+     *   const loginPage = new LoginPage(page);
+     *   await loginPage.login();
+     * });
+     * ```
+     *
+     * **Boxing**
+     *
+     * When something inside a step fails, you would usually see the error pointing to the exact action that failed. For
+     * example, consider the following login step:
+     *
+     * ```js
+     * async function login(page) {
+     *   await test.step('login', async () => {
+     *     const account = { username: 'Alice', password: 's3cr3t' };
+     *     await page.getByLabel('Username or email address').fill(account.username);
+     *     await page.getByLabel('Password').fill(account.password);
+     *     await page.getByRole('button', { name: 'Sign in' }).click();
+     *     await expect(page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
+     *   });
+     * }
+     *
+     * test('example', async ({ page }) => {
+     *   await page.goto('https://github.com/login');
+     *   await login(page);
+     * });
+     * ```
+     *
+     * ```txt
+     * Error: Timed out 5000ms waiting for expect(locator).toBeVisible()
+     *   ... error details omitted ...
+     *
+     *    8 |     await page.getByRole('button', { name: 'Sign in' }).click();
+     * >  9 |     await expect(page.getByRole('button', { name: 'View profile and more' })).toBeVisible();
+     *      |                                                                               ^
+     *   10 |   });
+     * ```
+     *
+     * As we see above, the test may fail with an error pointing inside the step. If you would like the error to highlight
+     * the "login" step instead of its internals, use the `box` option. An error inside a boxed step points to the step
+     * call site.
+     *
+     * ```js
+     * async function login(page) {
+     *   await test.step('login', async () => {
+     *     // ...
+     *   }, { box: true });  // Note the "box" option here.
+     * }
+     * ```
+     *
+     * ```txt
+     * Error: Timed out 5000ms waiting for expect(locator).toBeVisible()
+     *   ... error details omitted ...
+     *
+     *   14 |   await page.goto('https://github.com/login');
+     * > 15 |   await login(page);
+     *      |         ^
+     *   16 | });
+     * ```
+     *
+     * You can also create a TypeScript decorator for a boxed step, similar to a regular step decorator above:
+     *
+     * ```js
+     * function boxedStep(target: Function, context: ClassMethodDecoratorContext) {
+     *   return function replacementMethod(...args: any) {
+     *     const name = this.constructor.name + '.' + (context.name as string);
+     *     return test.step(name, async () => {
+     *       return await target.call(this, ...args);
+     *     }, { box: true });  // Note the "box" option here.
+     *   };
+     * }
+     *
+     * class LoginPage {
+     *   constructor(readonly page: Page) {}
+     *
+     *   @boxedStep
+     *   async login() {
+     *     // ....
+     *   }
+     * }
+     *
+     * test('example', async ({ page }) => {
+     *   const loginPage = new LoginPage(page);
+     *   await loginPage.login();  // <-- Error will be reported on this line.
+     * });
+     * ```
+     *
+     * @param title Step name.
+     * @param body Step body.
+     * @param options
+     */
+    <T>(title: string, body: (step: TestStepInfo) => T | Promise<T>, options?: { box?: boolean, location?: Location, timeout?: number }): Promise<T>;
+    /**
+     * Mark a test step as "skip" to temporarily disable its execution, useful for steps that are currently failing and
+     * planned for a near-term fix. Playwright will not run the step. See also
+     * [testStepInfo.skip(condition[, description])](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-skip-2).
+     *
+     * We recommend [testStepInfo.skip()](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-skip-1)
+     * instead.
+     *
+     * **Usage**
+     *
+     * You can declare a skipped step, and Playwright will not run it.
+     *
+     * ```js
+     * import { test, expect } from '@playwright/test';
+     *
+     * test('my test', async ({ page }) => {
+     *   // ...
+     *   await test.step.skip('not yet ready', async () => {
+     *     // ...
+     *   });
+     * });
+     * ```
+     *
+     * @param title Step name.
+     * @param body Step body.
+     * @param options
+     */
+    skip(title: string, body: (step: TestStepInfo) => any | Promise<any>, options?: { box?: boolean, location?: Location, timeout?: number }): Promise<void>;
+  }
+  /**
+   * `expect` function can be used to create test assertions. Read more about [test assertions](https://playwright.dev/docs/test-assertions).
    *
    * **Usage**
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   projects: [
-   *     {
-   *       name: 'chromium',
-   *       use: {
-   *         ...devices['Desktop Chrome'],
-   *         launchOptions: {
-   *           args: ['--start-maximized']
-   *         }
-   *       }
-   *     }
-   *   ]
+   * test('example', async ({ page }) => {
+   *   await test.expect(page).toHaveTitle('Title');
    * });
    * ```
    *
    */
-  launchOptions: Omit<LaunchOptions, 'tracesDir'>;
+  expect: Expect<{}>;
   /**
+   * Extends the `test` object by defining fixtures and/or options that can be used in the tests.
+   *
    * **Usage**
    *
+   * First define a fixture and/or an option.
+   *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
+   * import { test as base } from '@playwright/test';
+   * import { TodoPage } from './todo-page';
    *
-   * export default defineConfig({
-   *   use: {
-   *     connectOptions: {
-   *       wsEndpoint: 'ws://localhost:5678',
-   *     },
+   * export type Options = { defaultItem: string };
+   *
+   * // Extend basic test by providing a "defaultItem" option and a "todoPage" fixture.
+   * export const test = base.extend<Options & { todoPage: TodoPage }>({
+   *   // Define an option and provide a default value.
+   *   // We can later override it in the config.
+   *   defaultItem: ['Do stuff', { option: true }],
+   *
+   *   // Define a fixture. Note that it can use built-in fixture "page"
+   *   // and a new option "defaultItem".
+   *   todoPage: async ({ page, defaultItem }, use) => {
+   *     const todoPage = new TodoPage(page);
+   *     await todoPage.goto();
+   *     await todoPage.addToDo(defaultItem);
+   *     await use(todoPage);
+   *     await todoPage.removeAll();
    *   },
    * });
    * ```
    *
-   * When connect options are specified, default
-   * [fixtures.browser](https://playwright.dev/docs/api/class-fixtures#fixtures-browser),
-   * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) and
-   * [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page) use the remote browser instead of
-   * launching a browser locally, and any launch options like
-   * [testOptions.headless](https://playwright.dev/docs/api/class-testoptions#test-options-headless) or
-   * [testOptions.channel](https://playwright.dev/docs/api/class-testoptions#test-options-channel) are ignored.
-   */
-  connectOptions: ConnectOptions | undefined;
-  /**
-   * Whether to automatically capture a screenshot after each test. Defaults to `'off'`.
-   * - `'off'`: Do not capture screenshots.
-   * - `'on'`: Capture screenshot after each test.
-   * - `'only-on-failure'`: Capture screenshot after each test failure.
-   *
-   * **Usage**
+   * Then use the fixture in the test.
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
+   * // example.spec.ts
+   * import { test } from './my-test';
    *
-   * export default defineConfig({
-   *   use: {
-   *     screenshot: 'only-on-failure',
-   *   },
+   * test('test 1', async ({ todoPage }) => {
+   *   await todoPage.addToDo('my todo');
+   *   // ...
    * });
    * ```
    *
-   * Learn more about [automatic screenshots](https://playwright.dev/docs/test-use-options#recording-options).
-   */
-  screenshot: ScreenshotMode | { mode: ScreenshotMode } & Pick<PageScreenshotOptions, 'fullPage' | 'omitBackground'>;
-  /**
-   * Whether to record trace for each test. Defaults to `'off'`.
-   * - `'off'`: Do not record trace.
-   * - `'on'`: Record trace for each test.
-   * - `'on-first-retry'`: Record trace only when retrying a test for the first time.
-   * - `'on-all-retries'`: Record trace only when retrying a test.
-   * - `'retain-on-failure'`: Record trace for each test. When test run passes, remove the recorded trace.
-   * - `'retain-on-first-failure'`: Record trace for the first run of each test, but not for retries. When test run
-   *   passes, remove the recorded trace.
-   *
-   * For more control, pass an object that specifies `mode` and trace features to enable.
-   *
-   * **Usage**
+   * Configure the option in config file.
    *
    * ```js
    * // playwright.config.ts
    * import { defineConfig } from '@playwright/test';
+   * import type { Options } from './my-test';
    *
-   * export default defineConfig({
-   *   use: {
-   *     trace: 'on-first-retry'
-   *   },
+   * export default defineConfig<Options>({
+   *   projects: [
+   *     {
+   *       name: 'shopping',
+   *       use: { defaultItem: 'Buy milk' },
+   *     },
+   *     {
+   *       name: 'wellbeing',
+   *       use: { defaultItem: 'Exercise!' },
+   *     },
+   *   ]
    * });
    * ```
    *
-   * Learn more about [recording trace](https://playwright.dev/docs/test-use-options#recording-options).
+   * Learn more about [fixtures](https://playwright.dev/docs/test-fixtures) and [parametrizing tests](https://playwright.dev/docs/test-parameterize).
+   * @param fixtures An object containing fixtures and/or options. Learn more about [fixtures format](https://playwright.dev/docs/test-fixtures).
    */
-  trace: TraceMode | /** deprecated */ 'retry-with-trace' | { mode: TraceMode, snapshots?: boolean, screenshots?: boolean, sources?: boolean, attachments?: boolean };
+  extend<T extends {}, W extends {} = {}>(fixtures: Fixtures<T, W, TestArgs, WorkerArgs>): TestType<TestArgs & T, WorkerArgs & W>;
   /**
-   * Whether to record video for each test. Defaults to `'off'`.
-   * - `'off'`: Do not record video.
-   * - `'on'`: Record video for each test.
-   * - `'retain-on-failure'`: Record video for each test, but remove all videos from successful test runs.
-   * - `'on-first-retry'`: Record video only when retrying a test for the first time.
-   *
-   * To control video size, pass an object with `mode` and `size` properties. If video size is not specified, it will be
-   * equal to [testOptions.viewport](https://playwright.dev/docs/api/class-testoptions#test-options-viewport) scaled
-   * down to fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual
-   * picture of each page will be scaled down if necessary to fit the specified size.
+   * Returns information about the currently running test. This method can only be called during the test execution,
+   * otherwise it throws.
    *
    * **Usage**
    *
    * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     video: 'on-first-retry',
-   *   },
+   * test('example test', async ({ page }) => {
+   *   // ...
+   *   await test.info().attach('screenshot', {
+   *     body: await page.screenshot(),
+   *     contentType: 'image/png',
+   *   });
    * });
    * ```
    *
-   * Learn more about [recording video](https://playwright.dev/docs/test-use-options#recording-options).
    */
-  video: VideoMode | /** deprecated */ 'retry-with-video' | { mode: VideoMode, size?: ViewportSize };
+  info(): TestInfo;
 }
 
-export type ScreenshotMode = 'off' | 'on' | 'only-on-failure';
-export type TraceMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry' | 'on-all-retries' | 'retain-on-first-failure';
-export type VideoMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry';
+export type TestFixture<R, Args extends {}> = (args: Args, use: (r: R) => Promise<void>, testInfo: TestInfo) => any;
+export type WorkerFixture<R, Args extends {}> = (args: Args, use: (r: R) => Promise<void>, workerInfo: WorkerInfo) => any;
+type TestFixtureValue<R, Args extends {}> = Exclude<R, Function> | TestFixture<R, Args>;
+type WorkerFixtureValue<R, Args extends {}> = Exclude<R, Function> | WorkerFixture<R, Args>;
+export type Fixtures<T extends {} = {}, W extends {} = {}, PT extends {} = {}, PW extends {} = {}> = {
+  [K in keyof PW]?: WorkerFixtureValue<PW[K], W & PW> | [WorkerFixtureValue<PW[K], W & PW>, { scope: 'worker', timeout?: number | undefined, title?: string, box?: boolean }];
+} & {
+  [K in keyof PT]?: TestFixtureValue<PT[K], T & W & PT & PW> | [TestFixtureValue<PT[K], T & W & PT & PW>, { scope: 'test', timeout?: number | undefined, title?: string, box?: boolean }];
+} & {
+  [K in Exclude<keyof W, keyof PW | keyof PT>]?: [WorkerFixtureValue<W[K], W & PW>, { scope: 'worker', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
+} & {
+  [K in Exclude<keyof T, keyof PW | keyof PT>]?: TestFixtureValue<T[K], T & W & PT & PW> | [TestFixtureValue<T[K], T & W & PT & PW>, { scope?: 'test', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
+};
+
+type BrowserName = 'chromium' | 'firefox' | 'webkit';
+type BrowserChannel = Exclude<LaunchOptions['channel'], undefined>;
+type ColorScheme = Exclude<BrowserContextOptions['colorScheme'], undefined>;
+type ClientCertificate = Exclude<BrowserContextOptions['clientCertificates'], undefined>[0];
+type ExtraHTTPHeaders = Exclude<BrowserContextOptions['extraHTTPHeaders'], undefined>;
+type Proxy = Exclude<BrowserContextOptions['proxy'], undefined>;
+type StorageState = Exclude<BrowserContextOptions['storageState'], undefined>;
+type ServiceWorkerPolicy = Exclude<BrowserContextOptions['serviceWorkers'], undefined>;
+type ConnectOptions = {
+  /**
+   * A browser websocket endpoint to connect to.
+   */
+  wsEndpoint: string;
+
+  /**
+   * Additional HTTP headers to be sent with web socket connect request.
+   */
+  headers?: { [key: string]: string; };
+
+  /**
+   * This option exposes network available on the connecting client to the browser being connected to.
+   * Consists of a list of rules separated by comma.
+   *
+   * Available rules:
+   * - Hostname pattern, for example: `example.com`, `*.org:99`, `x.*.y.com`, `*foo.org`.
+   * - IP literal, for example: `127.0.0.1`, `0.0.0.0:99`, `[::1]`, `[0:0::1]:99`.
+   * - `<loopback>` that matches local loopback interfaces: `localhost`, `*.localhost`, `127.0.0.1`, `[::1]`.
+
+   * Some common examples:
+   * - `"*"` to expose all network.
+   * - `"<loopback>"` to expose localhost network.
+   * - `"*.test.internal-domain,*.staging.internal-domain,<loopback>"` to expose test/staging deployments and localhost.
+   */
+  exposeNetwork?: string;
+
+  /**
+   * Timeout in milliseconds for the connection to be established. Optional, defaults to no timeout.
+   */
+  timeout?: number;
+};
 
 /**
- * Playwright Test provides many options to configure test environment, {@link Browser}, {@link BrowserContext} and
- * more.
+ * Playwright Test provides many options to configure test environment,
+ * [Browser](https://playwright.dev/docs/api/class-browser),
+ * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) and more.
  *
  * These options are usually provided in the [configuration file](https://playwright.dev/docs/test-configuration) through
  * [testConfig.use](https://playwright.dev/docs/api/class-testconfig#test-config-use) and
@@ -5122,99 +6640,55 @@ export type VideoMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry';
  *   use: {
  *     headless: false,
  *     viewport: { width: 1280, height: 720 },
- *     ignoreHTTPSErrors: true,
- *     video: 'on-first-retry',
- *   },
- * });
- * ```
- *
- * Alternatively, with [test.use(options)](https://playwright.dev/docs/api/class-test#test-use) you can override some
- * options for a file.
- *
- * ```js
- * // example.spec.ts
- * import { test, expect } from '@playwright/test';
- *
- * // Run tests in this file with portrait-like viewport.
- * test.use({ viewport: { width: 600, height: 900 } });
- *
- * test('my portrait test', async ({ page }) => {
- *   // ...
- * });
- * ```
- *
- */
-export interface PlaywrightTestOptions {
-  /**
-   * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
-   *
-   * **Usage**
-   *
-   * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     acceptDownloads: false,
-   *   },
-   * });
-   * ```
-   *
-   */
-  acceptDownloads: boolean;
-  /**
-   * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
-   *
-   * **Usage**
-   *
-   * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     bypassCSP: true,
-   *   }
-   * });
-   * ```
-   *
-   */
-  bypassCSP: boolean;
+ *     ignoreHTTPSErrors: true,
+ *     video: 'on-first-retry',
+ *   },
+ * });
+ * ```
+ *
+ * Alternatively, with [test.use(options)](https://playwright.dev/docs/api/class-test#test-use) you can override some
+ * options for a file.
+ *
+ * ```js
+ * // example.spec.ts
+ * import { test, expect } from '@playwright/test';
+ *
+ * // Run tests in this file with portrait-like viewport.
+ * test.use({ viewport: { width: 600, height: 900 } });
+ *
+ * test('my portrait test', async ({ page }) => {
+ *   // ...
+ * });
+ * ```
+ *
+ */
+export interface PlaywrightWorkerOptions {
   /**
-   * Emulates `'prefers-colors-scheme'` media feature, supported values are `'light'`, `'dark'`, `'no-preference'`. See
-   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
-   * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
+   * Name of the browser that runs tests. Defaults to `'chromium'`. Most of the time you should set `browserName` in
+   * your [TestConfig](https://playwright.dev/docs/api/class-testconfig):
    *
    * **Usage**
    *
    * ```js
    * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
+   * import { defineConfig, devices } from '@playwright/test';
    *
    * export default defineConfig({
    *   use: {
-   *     colorScheme: 'dark',
+   *     browserName: 'firefox',
    *   },
    * });
    * ```
    *
    */
-  colorScheme: ColorScheme;
+  browserName: BrowserName;
+  defaultBrowserType: BrowserName;
   /**
-   * TLS Client Authentication allows the server to request a client certificate and verify it.
-   *
-   * **Details**
-   *
-   * An array of client certificates to be used. Each certificate object must have both `certPath` and `keyPath` or a
-   * single `pfxPath` to load the client certificate. Optionally, `passphrase` property should be provided if the
-   * certficiate is encrypted. The `origin` property should be provided with an exact match to the request origin that
-   * the certificate is valid for.
-   *
-   * **NOTE** Using Client Certificates in combination with Proxy Servers is not supported.
-   *
-   * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
-   * work by replacing `localhost` with `local.playwright`.
+   * Whether to run browser in headless mode. More details for
+   * [Chromium](https://developers.google.com/web/updates/2017/04/headless-chrome) and
+   * [Firefox](https://hacks.mozilla.org/2017/12/using-headless-mode-in-firefox/). Defaults to `true` unless the
+   * [`devtools`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-devtools) option is
+   * `true`.
    *
    * **Usage**
    *
@@ -5224,40 +6698,20 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     clientCertificates: [{
-   *       origin: 'https://example.com',
-   *       certPath: './cert.pem',
-   *       keyPath: './key.pem',
-   *       passphrase: 'mysecretpassword',
-   *     }],
+   *     headless: false
    *   },
    * });
    * ```
    *
    */
-  clientCertificates: ClientCertificate[] | undefined;
+  headless: boolean;
   /**
-   * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
-   * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
-   *
-   * **Usage**
+   * Browser distribution channel.
    *
-   * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     viewport: { width: 2560, height: 1440 },
-   *     deviceScaleFactor: 2,
-   *   },
-   * });
-   * ```
+   * Use "chromium" to [opt in to new headless mode](https://playwright.dev/docs/browsers#chromium-new-headless-mode).
    *
-   */
-  deviceScaleFactor: number | undefined;
-  /**
-   * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+   * Use "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge", "msedge-beta", "msedge-dev", or
+   * "msedge-canary" to use branded [Google Chrome and Microsoft Edge](https://playwright.dev/docs/browsers#google-chrome--microsoft-edge).
    *
    * **Usage**
    *
@@ -5266,36 +6720,28 @@ export interface PlaywrightTestOptions {
    * import { defineConfig } from '@playwright/test';
    *
    * export default defineConfig({
-   *   use: {
-   *     extraHTTPHeaders: {
-   *       'X-My-Header': 'value',
+   *   projects: [
+   *     {
+   *       name: 'Microsoft Edge',
+   *       use: {
+   *         ...devices['Desktop Edge'],
+   *         channel: 'msedge'
+   *       },
    *     },
-   *   },
+   *   ]
    * });
    * ```
    *
    */
-  extraHTTPHeaders: ExtraHTTPHeaders | undefined;
+  channel: BrowserChannel | undefined;
   /**
-   * **Usage**
-   *
-   * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     geolocation: { longitude: 12.492507, latitude: 41.889938 },
-   *   },
-   * });
-   * ```
+   * Options used to launch the browser, as passed to
+   * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch). Specific
+   * options [testOptions.headless](https://playwright.dev/docs/api/class-testoptions#test-options-headless) and
+   * [testOptions.channel](https://playwright.dev/docs/api/class-testoptions#test-options-channel) take priority over
+   * this.
    *
-   * Learn more about [geolocation](https://playwright.dev/docs/emulation#color-scheme-and-media).
-   */
-  geolocation: Geolocation | undefined;
-  /**
-   * Specifies if viewport supports touch events. Defaults to false. Learn more about
-   * [mobile emulation](https://playwright.dev/docs/emulation#devices).
+   * **NOTE** Use custom browser args at your own risk, as some of them may break Playwright functionality.
    *
    * **Usage**
    *
@@ -5304,18 +6750,23 @@ export interface PlaywrightTestOptions {
    * import { defineConfig } from '@playwright/test';
    *
    * export default defineConfig({
-   *   use: {
-   *     hasTouch: true
-   *   },
+   *   projects: [
+   *     {
+   *       name: 'chromium',
+   *       use: {
+   *         ...devices['Desktop Chrome'],
+   *         launchOptions: {
+   *           args: ['--start-maximized']
+   *         }
+   *       }
+   *     }
+   *   ]
    * });
    * ```
    *
    */
-  hasTouch: boolean;
+  launchOptions: Omit<LaunchOptions, 'tracesDir'>;
   /**
-   * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
-   * origin is specified, the username and password are sent to any servers upon unauthorized responses.
-   *
    * **Usage**
    *
    * ```js
@@ -5324,18 +6775,28 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     httpCredentials: {
-   *       username: 'user',
-   *       password: 'pass',
+   *     connectOptions: {
+   *       wsEndpoint: 'ws://localhost:5678',
    *     },
    *   },
    * });
    * ```
    *
+   * When connect options are specified, default
+   * [fixtures.browser](https://playwright.dev/docs/api/class-fixtures#fixtures-browser),
+   * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) and
+   * [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page) use the remote browser instead of
+   * launching a browser locally, and any launch options like
+   * [testOptions.headless](https://playwright.dev/docs/api/class-testoptions#test-options-headless) or
+   * [testOptions.channel](https://playwright.dev/docs/api/class-testoptions#test-options-channel) are ignored.
    */
-  httpCredentials: HTTPCredentials | undefined;
+  connectOptions: ConnectOptions | undefined;
   /**
-   * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
+   * Whether to automatically capture a screenshot after each test. Defaults to `'off'`.
+   * - `'off'`: Do not capture screenshots.
+   * - `'on'`: Capture screenshot after each test.
+   * - `'only-on-failure'`: Capture screenshot after each test failure.
+   * - `'on-first-failure'`: Capture screenshot after each test's first failure.
    *
    * **Usage**
    *
@@ -5345,36 +6806,25 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     ignoreHTTPSErrors: true,
+   *     screenshot: 'only-on-failure',
    *   },
    * });
    * ```
    *
+   * Learn more about [automatic screenshots](https://playwright.dev/docs/test-use-options#recording-options).
    */
-  ignoreHTTPSErrors: boolean;
+  screenshot: ScreenshotMode | { mode: ScreenshotMode } & Pick<PageScreenshotOptions, 'fullPage' | 'omitBackground'>;
   /**
-   * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
-   * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
-   * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
-   *
-   * **Usage**
-   *
-   * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     isMobile: false,
-   *   },
-   * });
-   * ```
+   * Whether to record trace for each test. Defaults to `'off'`.
+   * - `'off'`: Do not record trace.
+   * - `'on'`: Record trace for each test.
+   * - `'on-first-retry'`: Record trace only when retrying a test for the first time.
+   * - `'on-all-retries'`: Record trace only when retrying a test.
+   * - `'retain-on-failure'`: Record trace for each test. When test run passes, remove the recorded trace.
+   * - `'retain-on-first-failure'`: Record trace for the first run of each test, but not for retries. When test run
+   *   passes, remove the recorded trace.
    *
-   */
-  isMobile: boolean;
-  /**
-   * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
-   * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
+   * For more control, pass an object that specifies `mode` and trace features to enable.
    *
    * **Usage**
    *
@@ -5384,36 +6834,25 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     javaScriptEnabled: false,
+   *     trace: 'on-first-retry'
    *   },
    * });
    * ```
    *
+   * Learn more about [recording trace](https://playwright.dev/docs/test-use-options#recording-options).
    */
-  javaScriptEnabled: boolean;
+  trace: TraceMode | /** deprecated */ 'retry-with-trace' | { mode: TraceMode, snapshots?: boolean, screenshots?: boolean, sources?: boolean, attachments?: boolean };
   /**
-   * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
-   * `Accept-Language` request header value as well as number and date formatting rules. Defaults to the system default
-   * locale. Learn more about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
-   *
-   * **Usage**
-   *
-   * ```js
-   * // playwright.config.ts
-   * import { defineConfig } from '@playwright/test';
-   *
-   * export default defineConfig({
-   *   use: {
-   *     locale: 'it-IT',
-   *   },
-   * });
-   * ```
+   * Whether to record video for each test. Defaults to `'off'`.
+   * - `'off'`: Do not record video.
+   * - `'on'`: Record video for each test.
+   * - `'retain-on-failure'`: Record video for each test, but remove all videos from successful test runs.
+   * - `'on-first-retry'`: Record video only when retrying a test for the first time.
    *
-   */
-  locale: string | undefined;
-  /**
-   * Whether to emulate network being offline. Defaults to `false`. Learn more about
-   * [network emulation](https://playwright.dev/docs/emulation#offline).
+   * To control video size, pass an object with `mode` and `size` properties. If video size is not specified, it will be
+   * equal to [testOptions.viewport](https://playwright.dev/docs/api/class-testoptions#test-options-viewport) scaled
+   * down to fit into 800x800. If `viewport` is not configured explicitly the video size defaults to 800x450. Actual
+   * picture of each page will be scaled down if necessary to fit the specified size.
    *
    * **Usage**
    *
@@ -5423,17 +6862,61 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     offline: true
+   *     video: 'on-first-retry',
    *   },
    * });
    * ```
    *
+   * Learn more about [recording video](https://playwright.dev/docs/test-use-options#recording-options).
    */
-  offline: boolean;
+  video: VideoMode | /** deprecated */ 'retry-with-video' | { mode: VideoMode, size?: ViewportSize };
+}
+
+export type ScreenshotMode = 'off' | 'on' | 'only-on-failure' | 'on-first-failure';
+export type TraceMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry' | 'on-all-retries' | 'retain-on-first-failure';
+export type VideoMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry';
+
+/**
+ * Playwright Test provides many options to configure test environment,
+ * [Browser](https://playwright.dev/docs/api/class-browser),
+ * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) and more.
+ *
+ * These options are usually provided in the [configuration file](https://playwright.dev/docs/test-configuration) through
+ * [testConfig.use](https://playwright.dev/docs/api/class-testconfig#test-config-use) and
+ * [testProject.use](https://playwright.dev/docs/api/class-testproject#test-project-use).
+ *
+ * ```js
+ * // playwright.config.ts
+ * import { defineConfig } from '@playwright/test';
+ * export default defineConfig({
+ *   use: {
+ *     headless: false,
+ *     viewport: { width: 1280, height: 720 },
+ *     ignoreHTTPSErrors: true,
+ *     video: 'on-first-retry',
+ *   },
+ * });
+ * ```
+ *
+ * Alternatively, with [test.use(options)](https://playwright.dev/docs/api/class-test#test-use) you can override some
+ * options for a file.
+ *
+ * ```js
+ * // example.spec.ts
+ * import { test, expect } from '@playwright/test';
+ *
+ * // Run tests in this file with portrait-like viewport.
+ * test.use({ viewport: { width: 600, height: 900 } });
+ *
+ * test('my portrait test', async ({ page }) => {
+ *   // ...
+ * });
+ * ```
+ *
+ */
+export interface PlaywrightTestOptions {
   /**
-   * A list of permissions to grant to all pages in this context. See
-   * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
-   * for more details. Defaults to none.
+   * Whether to automatically download all the attachments. Defaults to `true` where all the downloads are accepted.
    *
    * **Usage**
    *
@@ -5443,15 +6926,15 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     permissions: ['notifications'],
+   *     acceptDownloads: false,
    *   },
    * });
    * ```
    *
    */
-  permissions: string[] | undefined;
+  acceptDownloads: boolean;
   /**
-   * Network proxy settings.
+   * Toggles bypassing page's Content-Security-Policy. Defaults to `false`.
    *
    * **Usage**
    *
@@ -5461,22 +6944,18 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     proxy: {
-   *       server: 'http://myproxy.com:3128',
-   *       bypass: 'localhost',
-   *     },
-   *   },
+   *     bypassCSP: true,
+   *   }
    * });
    * ```
    *
    */
-  proxy: Proxy | undefined;
+  bypassCSP: boolean;
   /**
-   * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
-   *
-   * Populates context with given storage state. This option can be used to initialize context with logged-in
-   * information obtained via
-   * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
+   * Emulates [prefers-colors-scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme)
+   * media feature, supported values are `'light'` and `'dark'`. See
+   * [page.emulateMedia([options])](https://playwright.dev/docs/api/class-page#page-emulate-media) for more details.
+   * Passing `null` resets emulation to system defaults. Defaults to `'light'`.
    *
    * **Usage**
    *
@@ -5486,33 +6965,29 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     storageState: 'storage-state.json',
+   *     colorScheme: 'dark',
    *   },
    * });
    * ```
    *
-   * **Details**
-   *
-   * When storage state is set up in the config, it is possible to reset storage state for a file:
+   */
+  colorScheme: ColorScheme;
+  /**
+   * TLS Client Authentication allows the server to request a client certificate and verify it.
    *
-   * ```js
-   * // not-signed-in.spec.ts
-   * import { test } from '@playwright/test';
+   * **Details**
    *
-   * // Reset storage state for this file to avoid being authenticated
-   * test.use({ storageState: { cookies: [], origins: [] } });
+   * An array of client certificates to be used. Each certificate object must have either both `certPath` and `keyPath`,
+   * a single `pfxPath`, or their corresponding direct value equivalents (`cert` and `key`, or `pfx`). Optionally,
+   * `passphrase` property should be provided if the certificate is encrypted. The `origin` property should be provided
+   * with an exact match to the request origin that the certificate is valid for.
    *
-   * test('not signed in test', async ({ page }) => {
-   *   // ...
-   * });
-   * ```
+   * Client certificate authentication is only active when at least one client certificate is provided. If you want to
+   * reject all client certificates sent by the server, you need to provide a client certificate with an `origin` that
+   * does not match any of the domains you plan to visit.
    *
-   */
-  storageState: StorageState | undefined;
-  /**
-   * Changes the timezone of the context. See
-   * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
-   * for a list of supported timezone IDs. Defaults to the system timezone.
+   * **NOTE** When using WebKit on macOS, accessing `localhost` will not pick up client certificates. You can make it
+   * work by replacing `localhost` with `local.playwright`.
    *
    * **Usage**
    *
@@ -5522,15 +6997,21 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     timezoneId: 'Europe/Rome',
+   *     clientCertificates: [{
+   *       origin: 'https://example.com',
+   *       certPath: './cert.pem',
+   *       keyPath: './key.pem',
+   *       passphrase: 'mysecretpassword',
+   *     }],
    *   },
    * });
    * ```
    *
    */
-  timezoneId: string | undefined;
+  clientCertificates: ClientCertificate[] | undefined;
   /**
-   * Specific user agent to use in this context.
+   * Specify device scale factor (can be thought of as dpr). Defaults to `1`. Learn more about
+   * [emulating devices with device scale factor](https://playwright.dev/docs/emulation#devices).
    *
    * **Usage**
    *
@@ -5540,19 +7021,16 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     userAgent: 'some custom ua',
+   *     viewport: { width: 2560, height: 1440 },
+   *     deviceScaleFactor: 2,
    *   },
    * });
    * ```
    *
    */
-  userAgent: string | undefined;
+  deviceScaleFactor: number | undefined;
   /**
-   * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
-   * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
-   *
-   * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
-   * by the operating system. It makes the execution of the tests non-deterministic.
+   * An object containing additional HTTP headers to be sent with every request. Defaults to none.
    *
    * **Usage**
    *
@@ -5562,49 +7040,35 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     viewport: { width: 100, height: 100 },
+   *     extraHTTPHeaders: {
+   *       'X-My-Header': 'value',
+   *     },
    *   },
    * });
    * ```
    *
    */
-  viewport: ViewportSize | null;
+  extraHTTPHeaders: ExtraHTTPHeaders | undefined;
   /**
-   * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
-   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
-   * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
-   * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
-   * or
-   * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
-   * it takes the base URL in consideration by using the
-   * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
-   * Unset by default. Examples:
-   * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
-   * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
-   *   `http://localhost:3000/foo/bar.html`
-   * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
-   *   `http://localhost:3000/bar.html`
-   *
    * **Usage**
    *
    * ```js
-   * import { defineConfig, devices } from '@playwright/test';
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
    * export default defineConfig({
    *   use: {
-   *     /* Base URL to use in actions like `await page.goto('/')`. *\/
-   *     baseURL: 'http://localhost:3000',
+   *     geolocation: { longitude: 12.492507, latitude: 41.889938 },
    *   },
    * });
    * ```
    *
+   * Learn more about [geolocation](https://playwright.dev/docs/emulation#color-scheme-and-media).
    */
-  baseURL: string | undefined;
+  geolocation: Geolocation | undefined;
   /**
-   * Options used to create the context, as passed to
-   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context). Specific
-   * options like [testOptions.viewport](https://playwright.dev/docs/api/class-testoptions#test-options-viewport) take
-   * priority over this.
+   * Specifies if viewport supports touch events. Defaults to false. Learn more about
+   * [mobile emulation](https://playwright.dev/docs/emulation#devices).
    *
    * **Usage**
    *
@@ -5614,42 +7078,37 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     contextOptions: {
-   *       reducedMotion: 'reduce',
-   *     },
+   *     hasTouch: true
    *   },
    * });
    * ```
    *
    */
-  contextOptions: BrowserContextOptions;
+  hasTouch: boolean;
   /**
-   * Default timeout for each Playwright action in milliseconds, defaults to 0 (no timeout).
-   *
-   * This is a default timeout for all Playwright actions, same as configured via
-   * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout).
+   * Credentials for [HTTP authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication). If no
+   * origin is specified, the username and password are sent to any servers upon unauthorized responses.
    *
    * **Usage**
    *
    * ```js
-   * import { defineConfig, devices } from '@playwright/test';
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
    * export default defineConfig({
    *   use: {
-   *     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). *\/
-   *     actionTimeout: 0,
+   *     httpCredentials: {
+   *       username: 'user',
+   *       password: 'pass',
+   *     },
    *   },
    * });
    * ```
    *
-   * Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    */
-  actionTimeout: number;
+  httpCredentials: HTTPCredentials | undefined;
   /**
-   * Timeout for each navigation action in milliseconds. Defaults to 0 (no timeout).
-   *
-   * This is a default navigation timeout, same as configured via
-   * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout).
+   * Whether to ignore HTTPS errors when sending network requests. Defaults to `false`.
    *
    * **Usage**
    *
@@ -5659,19 +7118,17 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     navigationTimeout: 3000,
+   *     ignoreHTTPSErrors: true,
    *   },
    * });
    * ```
    *
-   * Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    */
-  navigationTimeout: number;
+  ignoreHTTPSErrors: boolean;
   /**
-   * Whether to allow sites to register Service workers. Defaults to `'allow'`.
-   * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
-   *   registered.
-   * - `'block'`: Playwright will block all registration of Service Workers.
+   * Whether the `meta viewport` tag is taken into account and touch events are enabled. isMobile is a part of device,
+   * so you don't actually need to set it manually. Defaults to `false` and is not supported in Firefox. Learn more
+   * about [mobile emulation](https://playwright.dev/docs/emulation#ismobile).
    *
    * **Usage**
    *
@@ -5681,17 +7138,16 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     serviceWorkers: 'allow'
+   *     isMobile: false,
    *   },
    * });
    * ```
    *
    */
-  serviceWorkers: ServiceWorkerPolicy;
+  isMobile: boolean;
   /**
-   * Custom attribute to be used in
-   * [page.getByTestId(testId)](https://playwright.dev/docs/api/class-page#page-get-by-test-id). `data-testid` is used
-   * by default.
+   * Whether or not to enable JavaScript in the context. Defaults to `true`. Learn more about
+   * [disabling JavaScript](https://playwright.dev/docs/emulation#javascript-enabled).
    *
    * **Usage**
    *
@@ -5701,1444 +7157,1353 @@ export interface PlaywrightTestOptions {
    *
    * export default defineConfig({
    *   use: {
-   *     testIdAttribute: 'pw-test-id',
+   *     javaScriptEnabled: false,
    *   },
    * });
    * ```
    *
    */
-  testIdAttribute: string;
-}
-
-
-/**
- * Playwright Test is based on the concept of the [test fixtures](https://playwright.dev/docs/test-fixtures). Test fixtures are used to
- * establish environment for each test, giving the test everything it needs and nothing else.
- *
- * Playwright Test looks at each test declaration, analyses the set of fixtures the test needs and prepares those
- * fixtures specifically for the test. Values prepared by the fixtures are merged into a single object that is
- * available to the `test`, hooks, annotations and other fixtures as a first parameter.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('basic test', async ({ page }) => {
- *   // ...
- * });
- * ```
- *
- * Given the test above, Playwright Test will set up the `page` fixture before running the test, and tear it down
- * after the test has finished. `page` fixture provides a {@link Page} object that is available to the test.
- *
- * Playwright Test comes with builtin fixtures listed below, and you can add your own fixtures as well. Playwright
- * Test also [provides options]{@link TestOptions} to  configure
- * [fixtures.browser](https://playwright.dev/docs/api/class-fixtures#fixtures-browser),
- * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) and
- * [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page).
- */
-export interface PlaywrightWorkerArgs {
-  playwright: typeof import('playwright-core');
+  javaScriptEnabled: boolean;
   /**
-   * {@link Browser} instance is shared between all tests in the [same worker](https://playwright.dev/docs/test-parallel) - this makes testing
-   * efficient. However, each test runs in an isolated {@link BrowserContext}  and gets a fresh environment.
-   *
-   * Learn how to [configure browser](https://playwright.dev/docs/test-configuration) and see [available options]{@link TestOptions}.
+   * Specify user locale, for example `en-GB`, `de-DE`, etc. Locale will affect `navigator.language` value,
+   * `Accept-Language` request header value as well as number and date formatting rules. Defaults to `en-US`. Learn more
+   * about emulation in our [emulation guide](https://playwright.dev/docs/emulation#locale--timezone).
    *
    * **Usage**
    *
    * ```js
-   * test.beforeAll(async ({ browser }) => {
-   *   const page = await browser.newPage();
-   *   // ...
-   * });
-   * ```
-   *
-   */
-  browser: Browser;
-}
-
-/**
- * Playwright Test is based on the concept of the [test fixtures](https://playwright.dev/docs/test-fixtures). Test fixtures are used to
- * establish environment for each test, giving the test everything it needs and nothing else.
- *
- * Playwright Test looks at each test declaration, analyses the set of fixtures the test needs and prepares those
- * fixtures specifically for the test. Values prepared by the fixtures are merged into a single object that is
- * available to the `test`, hooks, annotations and other fixtures as a first parameter.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('basic test', async ({ page }) => {
- *   // ...
- * });
- * ```
- *
- * Given the test above, Playwright Test will set up the `page` fixture before running the test, and tear it down
- * after the test has finished. `page` fixture provides a {@link Page} object that is available to the test.
- *
- * Playwright Test comes with builtin fixtures listed below, and you can add your own fixtures as well. Playwright
- * Test also [provides options]{@link TestOptions} to  configure
- * [fixtures.browser](https://playwright.dev/docs/api/class-fixtures#fixtures-browser),
- * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) and
- * [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page).
- */
-export interface PlaywrightTestArgs {
-  /**
-   * Isolated {@link BrowserContext} instance, created for each test. Since contexts are isolated between each other,
-   * every test gets a fresh environment, even when multiple tests run in a single {@link Browser} for maximum
-   * efficiency.
-   *
-   * Learn how to [configure context](https://playwright.dev/docs/test-configuration) and see [available options]{@link TestOptions}.
-   *
-   * Default [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page) belongs to this context.
-   *
-   * **Usage**
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
-   * ```js
-   * test('example test', async ({ page, context }) => {
-   *   await context.route('*external.com/*', route => route.abort());
-   *   // ...
+   * export default defineConfig({
+   *   use: {
+   *     locale: 'it-IT',
+   *   },
    * });
    * ```
    *
    */
-  context: BrowserContext;
+  locale: string | undefined;
   /**
-   * Isolated {@link Page} instance, created for each test. Pages are isolated between tests due to
-   * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) isolation.
-   *
-   * This is the most common fixture used in a test.
+   * Whether to emulate network being offline. Defaults to `false`. Learn more about
+   * [network emulation](https://playwright.dev/docs/emulation#offline).
    *
    * **Usage**
    *
    * ```js
-   * import { test, expect } from '@playwright/test';
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
-   * test('basic test', async ({ page }) => {
-   *   await page.goto('/signin');
-   *   await page.getByLabel('User Name').fill('user');
-   *   await page.getByLabel('Password').fill('password');
-   *   await page.getByText('Sign in').click();
-   *   // ...
+   * export default defineConfig({
+   *   use: {
+   *     offline: true
+   *   },
    * });
    * ```
    *
    */
-  page: Page;
+  offline: boolean;
   /**
-   * Isolated {@link APIRequestContext} instance for each test.
+   * A list of permissions to grant to all pages in this context. See
+   * [browserContext.grantPermissions(permissions[, options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-grant-permissions)
+   * for more details. Defaults to none.
    *
    * **Usage**
    *
    * ```js
-   * import { test, expect } from '@playwright/test';
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
-   * test('basic test', async ({ request }) => {
-   *   await request.post('/signin', {
-   *     data: {
-   *       username: 'user',
-   *       password: 'password'
-   *     }
-   *   });
-   *   // ...
+   * export default defineConfig({
+   *   use: {
+   *     permissions: ['notifications'],
+   *   },
    * });
    * ```
    *
    */
-  request: APIRequestContext;
-}
-
-type ExcludeProps<A, B> = {
-  [K in Exclude<keyof A, keyof B>]: A[K];
-};
-type CustomProperties<T> = ExcludeProps<T, PlaywrightTestOptions & PlaywrightWorkerOptions & PlaywrightTestArgs & PlaywrightWorkerArgs>;
-
-export type PlaywrightTestProject<TestArgs = {}, WorkerArgs = {}> = Project<PlaywrightTestOptions & CustomProperties<TestArgs>, PlaywrightWorkerOptions & CustomProperties<WorkerArgs>>;
-export type PlaywrightTestConfig<TestArgs = {}, WorkerArgs = {}> = Config<PlaywrightTestOptions & CustomProperties<TestArgs>, PlaywrightWorkerOptions & CustomProperties<WorkerArgs>>;
-
-type AsymmetricMatcher = Record<string, any>;
-
-interface AsymmetricMatchers {
+  permissions: string[] | undefined;
   /**
-   * `expect.any()` matches any object instance created from the `constructor` or a corresponding primitive type. Use it
-   * inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching.
+   * Network proxy settings.
    *
    * **Usage**
    *
    * ```js
-   * // Match instance of a class.
-   * class Example {}
-   * expect(new Example()).toEqual(expect.any(Example));
-   *
-   * // Match any number.
-   * expect({ prop: 1 }).toEqual({ prop: expect.any(Number) });
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
-   * // Match any string.
-   * expect('abc').toEqual(expect.any(String));
+   * export default defineConfig({
+   *   use: {
+   *     proxy: {
+   *       server: 'http://myproxy.com:3128',
+   *       bypass: 'localhost',
+   *     },
+   *   },
+   * });
    * ```
    *
-   * @param constructor Constructor of the expected object like `ExampleClass`, or a primitive boxed type like `Number`.
    */
-  any(sample: unknown): AsymmetricMatcher;
+  proxy: Proxy | undefined;
   /**
-   * `expect.anything()` matches everything except `null` and `undefined`. Use it inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching.
+   * Learn more about [storage state and auth](https://playwright.dev/docs/auth).
+   *
+   * Populates context with given storage state. This option can be used to initialize context with logged-in
+   * information obtained via
+   * [browserContext.storageState([options])](https://playwright.dev/docs/api/class-browsercontext#browser-context-storage-state).
    *
    * **Usage**
    *
    * ```js
-   * const value = { prop: 1 };
-   * expect(value).toEqual({ prop: expect.anything() });
-   * expect(value).not.toEqual({ otherProp: expect.anything() });
-   * ```
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
-   */
-  anything(): AsymmetricMatcher;
-  /**
-   * `expect.arrayContaining()` matches an array that contains all of the elements in the expected array, in any order.
-   * Note that received array may be a superset of the expected array and contain some extra elements.
+   * export default defineConfig({
+   *   use: {
+   *     storageState: 'storage-state.json',
+   *   },
+   * });
+   * ```
    *
-   * Use this method inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching.
+   * **Details**
    *
-   * **Usage**
+   * When storage state is set up in the config, it is possible to reset storage state for a file:
    *
    * ```js
-   * expect([1, 2, 3]).toEqual(expect.arrayContaining([3, 1]));
-   * expect([1, 2, 3]).not.toEqual(expect.arrayContaining([1, 4]));
+   * // not-signed-in.spec.ts
+   * import { test } from '@playwright/test';
+   *
+   * // Reset storage state for this file to avoid being authenticated
+   * test.use({ storageState: { cookies: [], origins: [] } });
+   *
+   * test('not signed in test', async ({ page }) => {
+   *   // ...
+   * });
    * ```
    *
-   * @param expected Expected array that is a subset of the received value.
    */
-  arrayContaining(sample: Array<unknown>): AsymmetricMatcher;
+  storageState: StorageState | undefined;
   /**
-   * Compares floating point numbers for approximate equality. Use this method inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching. When just comparing two numbers, prefer
-   * [expect(value).toBeCloseTo(expected[, numDigits])](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be-close-to).
+   * Changes the timezone of the context. See
+   * [ICU's metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt?rcl=faee8bc70570192d82d2978a71e2a615788597d1)
+   * for a list of supported timezone IDs. Defaults to the system timezone.
    *
    * **Usage**
    *
    * ```js
-   * expect({ prop: 0.1 + 0.2 }).not.toEqual({ prop: 0.3 });
-   * expect({ prop: 0.1 + 0.2 }).toEqual({ prop: expect.closeTo(0.3, 5) });
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     timezoneId: 'Europe/Rome',
+   *   },
+   * });
    * ```
    *
-   * @param expected Expected value.
-   * @param numDigits The number of decimal digits after the decimal point that must be equal.
    */
-  closeTo(sample: number, precision?: number): AsymmetricMatcher;
+  timezoneId: string | undefined;
   /**
-   * `expect.objectContaining()` matches an object that contains and matches all of the properties in the expected
-   * object. Note that received object may be a superset of the expected object and contain some extra properties.
-   *
-   * Use this method inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching. Object properties can be matchers to further relax the expectation. See examples.
+   * Specific user agent to use in this context.
    *
    * **Usage**
    *
    * ```js
-   * // Assert some of the properties.
-   * expect({ foo: 1, bar: 2 }).toEqual(expect.objectContaining({ foo: 1 }));
-   *
-   * // Matchers can be used on the properties as well.
-   * expect({ foo: 1, bar: 2 }).toEqual(expect.objectContaining({ bar: expect.any(Number) }));
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
    *
-   * // Complex matching of sub-properties.
-   * expect({
-   *   list: [1, 2, 3],
-   *   obj: { prop: 'Hello world!', another: 'some other value' },
-   *   extra: 'extra',
-   * }).toEqual(expect.objectContaining({
-   *   list: expect.arrayContaining([2, 3]),
-   *   obj: expect.objectContaining({ prop: expect.stringContaining('Hello') }),
-   * }));
+   * export default defineConfig({
+   *   use: {
+   *     userAgent: 'some custom ua',
+   *   },
+   * });
    * ```
    *
-   * @param expected Expected object pattern that contains a subset of the properties.
    */
-  objectContaining(sample: Record<string, unknown>): AsymmetricMatcher;
+  userAgent: string | undefined;
   /**
-   * `expect.stringContaining()` matches a string that contains the expected substring. Use this method inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching.
+   * Emulates consistent viewport for each page. Defaults to an 1280x720 viewport. Use `null` to disable the consistent
+   * viewport emulation. Learn more about [viewport emulation](https://playwright.dev/docs/emulation#viewport).
+   *
+   * **NOTE** The `null` value opts out from the default presets, makes viewport depend on the host window size defined
+   * by the operating system. It makes the execution of the tests non-deterministic.
    *
    * **Usage**
    *
    * ```js
-   * expect('Hello world!').toEqual(expect.stringContaining('Hello'));
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     viewport: { width: 100, height: 100 },
+   *   },
+   * });
    * ```
    *
-   * @param expected Expected substring.
    */
-  stringContaining(sample: string): AsymmetricMatcher;
+  viewport: ViewportSize | null;
   /**
-   * `expect.stringMatching()` matches a received string that in turn matches the expected pattern. Use this method
-   * inside
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * to perform pattern matching.
+   * When using [page.goto(url[, options])](https://playwright.dev/docs/api/class-page#page-goto),
+   * [page.route(url, handler[, options])](https://playwright.dev/docs/api/class-page#page-route),
+   * [page.waitForURL(url[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-url),
+   * [page.waitForRequest(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-request),
+   * or
+   * [page.waitForResponse(urlOrPredicate[, options])](https://playwright.dev/docs/api/class-page#page-wait-for-response)
+   * it takes the base URL in consideration by using the
+   * [`URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor for building the corresponding URL.
+   * Unset by default. Examples:
+   * - baseURL: `http://localhost:3000` and navigating to `/bar.html` results in `http://localhost:3000/bar.html`
+   * - baseURL: `http://localhost:3000/foo/` and navigating to `./bar.html` results in
+   *   `http://localhost:3000/foo/bar.html`
+   * - baseURL: `http://localhost:3000/foo` (without trailing slash) and navigating to `./bar.html` results in
+   *   `http://localhost:3000/bar.html`
    *
    * **Usage**
    *
    * ```js
-   * expect('123ms').toEqual(expect.stringMatching(/\d+m?s/));
+   * import { defineConfig, devices } from '@playwright/test';
    *
-   * // Inside another matcher.
-   * expect({
-   *   status: 'passed',
-   *   time: '123ms',
-   * }).toEqual({
-   *   status: expect.stringMatching(/passed|failed/),
-   *   time: expect.stringMatching(/\d+m?s/),
+   * export default defineConfig({
+   *   use: {
+   *     /* Base URL to use in actions like `await page.goto('/')`. *\/
+   *     baseURL: 'http://localhost:3000',
+   *   },
    * });
    * ```
    *
-   * @param expected Pattern that expected string should match.
    */
-  stringMatching(sample: string | RegExp): AsymmetricMatcher;
-}
-
-/**
- * The {@link GenericAssertions} class provides assertion methods that can be used to make assertions about any values
- * in the tests. A new instance of {@link GenericAssertions} is created by calling
- * [expect(value)](https://playwright.dev/docs/api/class-playwrightassertions#playwright-assertions-expect-generic):
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('assert a value', async ({ page }) => {
- *   const value = 1;
- *   expect(value).toBe(2);
- * });
- * ```
- *
- */
-interface GenericAssertions<R> {
+  baseURL: string | undefined;
   /**
-   * Makes the assertion check for the opposite condition. For example, the following code passes:
+   * Options used to create the context, as passed to
+   * [browser.newContext([options])](https://playwright.dev/docs/api/class-browser#browser-new-context). Specific
+   * options like [testOptions.viewport](https://playwright.dev/docs/api/class-testoptions#test-options-viewport) take
+   * priority over this.
+   *
+   * **Usage**
    *
    * ```js
-   * const value = 1;
-   * expect(value).not.toBe(2);
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     contextOptions: {
+   *       reducedMotion: 'reduce',
+   *     },
+   *   },
+   * });
    * ```
    *
    */
-  not: GenericAssertions<R>;
+  contextOptions: BrowserContextOptions;
   /**
-   * Compares value with `expected` by calling `Object.is`. This method compares objects by reference instead of their
-   * contents, similarly to the strict equality operator `===`.
+   * Default timeout for each Playwright action in milliseconds, defaults to 0 (no timeout).
+   *
+   * This is a default timeout for all Playwright actions, same as configured via
+   * [page.setDefaultTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-timeout).
    *
    * **Usage**
    *
    * ```js
-   * const value = { prop: 1 };
-   * expect(value).toBe(value);
-   * expect(value).not.toBe({});
-   * expect(value.prop).toBe(1);
+   * import { defineConfig, devices } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). *\/
+   *     actionTimeout: 0,
+   *   },
+   * });
    * ```
    *
-   * @param expected Expected value.
+   * Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    */
-  toBe(expected: unknown): R;
+  actionTimeout: number;
   /**
-   * Compares floating point numbers for approximate equality. Use this method instead of
-   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be)
-   * when comparing floating point numbers.
+   * Timeout for each navigation action in milliseconds. Defaults to 0 (no timeout).
+   *
+   * This is a default navigation timeout, same as configured via
+   * [page.setDefaultNavigationTimeout(timeout)](https://playwright.dev/docs/api/class-page#page-set-default-navigation-timeout).
    *
    * **Usage**
    *
    * ```js
-   * expect(0.1 + 0.2).not.toBe(0.3);
-   * expect(0.1 + 0.2).toBeCloseTo(0.3, 5);
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     navigationTimeout: 3000,
+   *   },
+   * });
    * ```
    *
-   * @param expected Expected value.
-   * @param numDigits The number of decimal digits after the decimal point that must be equal.
+   * Learn more about [various timeouts](https://playwright.dev/docs/test-timeouts).
    */
-  toBeCloseTo(expected: number, numDigits?: number): R;
+  navigationTimeout: number;
   /**
-   * Ensures that value is not `undefined`.
+   * Whether to allow sites to register Service workers. Defaults to `'allow'`.
+   * - `'allow'`: [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) can be
+   *   registered.
+   * - `'block'`: Playwright will block all registration of Service Workers.
    *
    * **Usage**
    *
    * ```js
-   * const value = null;
-   * expect(value).toBeDefined();
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     serviceWorkers: 'allow'
+   *   },
+   * });
    * ```
    *
    */
-  toBeDefined(): R;
+  serviceWorkers: ServiceWorkerPolicy;
   /**
-   * Ensures that value is false in a boolean context, one of `false`, `0`, `''`, `null`, `undefined` or `NaN`. Use this
-   * method when you don't care about the specific value.
+   * Custom attribute to be used in
+   * [page.getByTestId(testId)](https://playwright.dev/docs/api/class-page#page-get-by-test-id). `data-testid` is used
+   * by default.
    *
    * **Usage**
    *
    * ```js
-   * const value = null;
-   * expect(value).toBeFalsy();
+   * // playwright.config.ts
+   * import { defineConfig } from '@playwright/test';
+   *
+   * export default defineConfig({
+   *   use: {
+   *     testIdAttribute: 'pw-test-id',
+   *   },
+   * });
    * ```
    *
    */
-  toBeFalsy(): R;
+  testIdAttribute: string;
+}
+
+
+/**
+ * Playwright Test is based on the concept of the [test fixtures](https://playwright.dev/docs/test-fixtures). Test fixtures are used to
+ * establish environment for each test, giving the test everything it needs and nothing else.
+ *
+ * Playwright Test looks at each test declaration, analyses the set of fixtures the test needs and prepares those
+ * fixtures specifically for the test. Values prepared by the fixtures are merged into a single object that is
+ * available to the `test`, hooks, annotations and other fixtures as a first parameter.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('basic test', async ({ page }) => {
+ *   // ...
+ * });
+ * ```
+ *
+ * Given the test above, Playwright Test will set up the `page` fixture before running the test, and tear it down
+ * after the test has finished. `page` fixture provides a [Page](https://playwright.dev/docs/api/class-page) object
+ * that is available to the test.
+ *
+ * Playwright Test comes with builtin fixtures listed below, and you can add your own fixtures as well. Playwright
+ * Test also [provides options][TestOptions](https://playwright.dev/docs/api/class-testoptions) to  configure
+ * [fixtures.browser](https://playwright.dev/docs/api/class-fixtures#fixtures-browser),
+ * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) and
+ * [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page).
+ */
+export interface PlaywrightWorkerArgs {
+  playwright: typeof import('playwright-core');
   /**
-   * Ensures that `value > expected` for number or big integer values.
+   * [Browser](https://playwright.dev/docs/api/class-browser) instance is shared between all tests in the
+   * [same worker](https://playwright.dev/docs/test-parallel) - this makes testing efficient. However, each test runs in an isolated
+   * [BrowserContext](https://playwright.dev/docs/api/class-browsercontext)  and gets a fresh environment.
+   *
+   * Learn how to [configure browser](https://playwright.dev/docs/test-configuration) and see
+   * [available options][TestOptions](https://playwright.dev/docs/api/class-testoptions).
    *
    * **Usage**
    *
    * ```js
-   * const value = 42;
-   * expect(value).toBeGreaterThan(1);
+   * test.beforeAll(async ({ browser }) => {
+   *   const page = await browser.newPage();
+   *   // ...
+   * });
    * ```
    *
-   * @param expected The value to compare to.
    */
-  toBeGreaterThan(expected: number | bigint): R;
+  browser: Browser;
+}
+
+/**
+ * Playwright Test is based on the concept of the [test fixtures](https://playwright.dev/docs/test-fixtures). Test fixtures are used to
+ * establish environment for each test, giving the test everything it needs and nothing else.
+ *
+ * Playwright Test looks at each test declaration, analyses the set of fixtures the test needs and prepares those
+ * fixtures specifically for the test. Values prepared by the fixtures are merged into a single object that is
+ * available to the `test`, hooks, annotations and other fixtures as a first parameter.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('basic test', async ({ page }) => {
+ *   // ...
+ * });
+ * ```
+ *
+ * Given the test above, Playwright Test will set up the `page` fixture before running the test, and tear it down
+ * after the test has finished. `page` fixture provides a [Page](https://playwright.dev/docs/api/class-page) object
+ * that is available to the test.
+ *
+ * Playwright Test comes with builtin fixtures listed below, and you can add your own fixtures as well. Playwright
+ * Test also [provides options][TestOptions](https://playwright.dev/docs/api/class-testoptions) to  configure
+ * [fixtures.browser](https://playwright.dev/docs/api/class-fixtures#fixtures-browser),
+ * [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) and
+ * [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page).
+ */
+export interface PlaywrightTestArgs {
   /**
-   * Ensures that `value >= expected` for number or big integer values.
+   * Isolated [BrowserContext](https://playwright.dev/docs/api/class-browsercontext) instance, created for each test.
+   * Since contexts are isolated between each other, every test gets a fresh environment, even when multiple tests run
+   * in a single [Browser](https://playwright.dev/docs/api/class-browser) for maximum efficiency.
+   *
+   * Learn how to [configure context](https://playwright.dev/docs/test-configuration) and see
+   * [available options][TestOptions](https://playwright.dev/docs/api/class-testoptions).
+   *
+   * Default [fixtures.page](https://playwright.dev/docs/api/class-fixtures#fixtures-page) belongs to this context.
    *
    * **Usage**
    *
    * ```js
-   * const value = 42;
-   * expect(value).toBeGreaterThanOrEqual(42);
+   * test('example test', async ({ page, context }) => {
+   *   await context.route('*external.com/*', route => route.abort());
+   *   // ...
+   * });
    * ```
    *
-   * @param expected The value to compare to.
    */
-  toBeGreaterThanOrEqual(expected: number | bigint): R;
+  context: BrowserContext;
   /**
-   * Ensures that value is an instance of a class. Uses `instanceof` operator.
+   * Isolated [Page](https://playwright.dev/docs/api/class-page) instance, created for each test. Pages are isolated
+   * between tests due to [fixtures.context](https://playwright.dev/docs/api/class-fixtures#fixtures-context) isolation.
+   *
+   * This is the most common fixture used in a test.
    *
    * **Usage**
    *
    * ```js
-   * expect(page).toBeInstanceOf(Page);
+   * import { test, expect } from '@playwright/test';
    *
-   * class Example {}
-   * expect(new Example()).toBeInstanceOf(Example);
+   * test('basic test', async ({ page }) => {
+   *   await page.goto('/signin');
+   *   await page.getByLabel('User Name').fill('user');
+   *   await page.getByLabel('Password').fill('password');
+   *   await page.getByText('Sign in').click();
+   *   // ...
+   * });
    * ```
    *
-   * @param expected The class or constructor function.
    */
-  toBeInstanceOf(expected: Function): R;
+  page: Page;
   /**
-   * Ensures that `value < expected` for number or big integer values.
+   * Isolated [APIRequestContext](https://playwright.dev/docs/api/class-apirequestcontext) instance for each test.
    *
    * **Usage**
    *
    * ```js
-   * const value = 42;
-   * expect(value).toBeLessThan(100);
+   * import { test, expect } from '@playwright/test';
+   *
+   * test('basic test', async ({ request }) => {
+   *   await request.post('/signin', {
+   *     data: {
+   *       username: 'user',
+   *       password: 'password'
+   *     }
+   *   });
+   *   // ...
+   * });
    * ```
    *
-   * @param expected The value to compare to.
    */
-  toBeLessThan(expected: number | bigint): R;
+  request: APIRequestContext;
+}
+
+type ExcludeProps<A, B> = {
+  [K in Exclude<keyof A, keyof B>]: A[K];
+};
+type CustomProperties<T> = ExcludeProps<T, PlaywrightTestOptions & PlaywrightWorkerOptions & PlaywrightTestArgs & PlaywrightWorkerArgs>;
+
+export type PlaywrightTestProject<TestArgs = {}, WorkerArgs = {}> = Project<PlaywrightTestOptions & CustomProperties<TestArgs>, PlaywrightWorkerOptions & CustomProperties<WorkerArgs>>;
+export type PlaywrightTestConfig<TestArgs = {}, WorkerArgs = {}> = Config<PlaywrightTestOptions & CustomProperties<TestArgs>, PlaywrightWorkerOptions & CustomProperties<WorkerArgs>>;
+
+type AsymmetricMatcher = Record<string, any>;
+
+interface AsymmetricMatchers {
   /**
-   * Ensures that `value <= expected` for number or big integer values.
+   * `expect.any()` matches any object instance created from the
+   * [`constructor`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-any-option-constructor)
+   * or a corresponding primitive type. Use it inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching.
    *
    * **Usage**
    *
    * ```js
-   * const value = 42;
-   * expect(value).toBeLessThanOrEqual(42);
+   * // Match instance of a class.
+   * class Example {}
+   * expect(new Example()).toEqual(expect.any(Example));
+   *
+   * // Match any number.
+   * expect({ prop: 1 }).toEqual({ prop: expect.any(Number) });
+   *
+   * // Match any string.
+   * expect('abc').toEqual(expect.any(String));
    * ```
    *
-   * @param expected The value to compare to.
+   * @param constructor Constructor of the expected object like `ExampleClass`, or a primitive boxed type like `Number`.
    */
-  toBeLessThanOrEqual(expected: number | bigint): R;
+  any(sample: unknown): AsymmetricMatcher;
   /**
-   * Ensures that value is `NaN`.
+   * `expect.anything()` matches everything except `null` and `undefined`. Use it inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching.
    *
    * **Usage**
    *
    * ```js
-   * const value = NaN;
-   * expect(value).toBeNaN();
+   * const value = { prop: 1 };
+   * expect(value).toEqual({ prop: expect.anything() });
+   * expect(value).not.toEqual({ otherProp: expect.anything() });
    * ```
    *
    */
-  toBeNaN(): R;
+  anything(): AsymmetricMatcher;
   /**
-   * Ensures that value is `null`.
+   * `expect.arrayContaining()` matches an array that contains all of the elements in the expected array, in any order.
+   * Note that received array may be a superset of the expected array and contain some extra elements.
+   *
+   * Use this method inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching.
    *
    * **Usage**
    *
    * ```js
-   * const value = null;
-   * expect(value).toBeNull();
+   * expect([1, 2, 3]).toEqual(expect.arrayContaining([3, 1]));
+   * expect([1, 2, 3]).not.toEqual(expect.arrayContaining([1, 4]));
    * ```
    *
+   * @param expected Expected array that is a subset of the received value.
    */
-  toBeNull(): R;
+  arrayContaining(sample: Array<unknown>): AsymmetricMatcher;
   /**
-   * Ensures that value is true in a boolean context, **anything but** `false`, `0`, `''`, `null`, `undefined` or `NaN`.
-   * Use this method when you don't care about the specific value.
+   * Compares floating point numbers for approximate equality. Use this method inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching. When just comparing two numbers, prefer
+   * [expect(value).toBeCloseTo(expected[, numDigits])](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be-close-to).
    *
    * **Usage**
    *
    * ```js
-   * const value = { example: 'value' };
-   * expect(value).toBeTruthy();
+   * expect({ prop: 0.1 + 0.2 }).not.toEqual({ prop: 0.3 });
+   * expect({ prop: 0.1 + 0.2 }).toEqual({ prop: expect.closeTo(0.3, 5) });
    * ```
    *
+   * @param expected Expected value.
+   * @param numDigits The number of decimal digits after the decimal point that must be equal.
    */
-  toBeTruthy(): R;
+  closeTo(sample: number, precision?: number): AsymmetricMatcher;
   /**
-   * Ensures that value is `undefined`.
+   * `expect.objectContaining()` matches an object that contains and matches all of the properties in the expected
+   * object. Note that received object may be a superset of the expected object and contain some extra properties.
+   *
+   * Use this method inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching. Object properties can be matchers to further relax the expectation. See examples.
    *
    * **Usage**
    *
    * ```js
-   * const value = undefined;
-   * expect(value).toBeUndefined();
+   * // Assert some of the properties.
+   * expect({ foo: 1, bar: 2 }).toEqual(expect.objectContaining({ foo: 1 }));
+   *
+   * // Matchers can be used on the properties as well.
+   * expect({ foo: 1, bar: 2 }).toEqual(expect.objectContaining({ bar: expect.any(Number) }));
+   *
+   * // Complex matching of sub-properties.
+   * expect({
+   *   list: [1, 2, 3],
+   *   obj: { prop: 'Hello world!', another: 'some other value' },
+   *   extra: 'extra',
+   * }).toEqual(expect.objectContaining({
+   *   list: expect.arrayContaining([2, 3]),
+   *   obj: expect.objectContaining({ prop: expect.stringContaining('Hello') }),
+   * }));
    * ```
    *
+   * @param expected Expected object pattern that contains a subset of the properties.
    */
-  toBeUndefined(): R;
+  objectContaining(sample: Record<string, unknown>): AsymmetricMatcher;
   /**
-   * Ensures that string value contains an expected substring. Comparison is case-sensitive.
+   * `expect.stringContaining()` matches a string that contains the expected substring. Use this method inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching.
    *
    * **Usage**
    *
    * ```js
-   * const value = 'Hello, World';
-   * expect(value).toContain('World');
-   * expect(value).toContain(',');
+   * expect('Hello world!').toEqual(expect.stringContaining('Hello'));
    * ```
    *
    * @param expected Expected substring.
    */
-  toContain(expected: string): R;
+  stringContaining(sample: string): AsymmetricMatcher;
   /**
-   * Ensures that value is an `Array` or `Set` and contains an expected item.
+   * `expect.stringMatching()` matches a received string that in turn matches the expected pattern. Use this method
+   * inside
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * to perform pattern matching.
    *
    * **Usage**
    *
    * ```js
-   * const value = [1, 2, 3];
-   * expect(value).toContain(2);
-   * expect(new Set(value)).toContain(2);
+   * expect('123ms').toEqual(expect.stringMatching(/\d+m?s/));
+   *
+   * // Inside another matcher.
+   * expect({
+   *   status: 'passed',
+   *   time: '123ms',
+   * }).toEqual({
+   *   status: expect.stringMatching(/passed|failed/),
+   *   time: expect.stringMatching(/\d+m?s/),
+   * });
    * ```
    *
-   * @param expected Expected value in the collection.
+   * @param expected Pattern that expected string should match.
    */
-  toContain(expected: unknown): R;
+  stringMatching(sample: string | RegExp): AsymmetricMatcher;
+}
+
+/**
+ * The [GenericAssertions](https://playwright.dev/docs/api/class-genericassertions) class provides assertion methods
+ * that can be used to make assertions about any values in the tests. A new instance of
+ * [GenericAssertions](https://playwright.dev/docs/api/class-genericassertions) is created by calling
+ * [expect(value)](https://playwright.dev/docs/api/class-playwrightassertions#playwright-assertions-expect-generic):
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('assert a value', async ({ page }) => {
+ *   const value = 1;
+ *   expect(value).toBe(2);
+ * });
+ * ```
+ *
+ */
+interface GenericAssertions<R> {
   /**
-   * Ensures that value is an `Array` or `Set` and contains an item equal to the expected.
-   *
-   * For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as
-   * performed by
-   * [expect(value).toContain(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-contain-2).
-   *
-   * For primitive values, this method is equivalent to
-   * [expect(value).toContain(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-contain-2).
-   *
-   * **Usage**
+   * Makes the assertion check for the opposite condition. For example, the following code passes:
    *
    * ```js
-   * const value = [
-   *   { example: 1 },
-   *   { another: 2 },
-   *   { more: 3 },
-   * ];
-   * expect(value).toContainEqual({ another: 2 });
-   * expect(new Set(value)).toContainEqual({ another: 2 });
+   * const value = 1;
+   * expect(value).not.toBe(2);
    * ```
    *
-   * @param expected Expected value in the collection.
    */
-  toContainEqual(expected: unknown): R;
+  not: GenericAssertions<R>;
   /**
-   * Compares contents of the value with contents of `expected`, performing "deep equality" check.
-   *
-   * For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as
-   * performed by
-   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be).
-   *
-   * For primitive values, this method is equivalent to
-   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be).
+   * Compares value with
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be-option-expected) by
+   * calling `Object.is`. This method compares objects by reference instead of their contents, similarly to the strict
+   * equality operator `===`.
    *
    * **Usage**
    *
    * ```js
    * const value = { prop: 1 };
-   * expect(value).toEqual({ prop: 1 });
-   * ```
-   *
-   * **Non-strict equality**
-   *
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * performs deep equality check that compares contents of the received and expected values. To ensure two objects
-   * reference the same instance, use
-   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be)
-   * instead.
-   *
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * ignores `undefined` properties and array items, and does not insist on object types being equal. For stricter
-   * matching, use
-   * [expect(value).toStrictEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-strict-equal).
-   *
-   * **Pattern matching**
-   *
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
-   * can be also used to perform pattern matching on objects, arrays and primitive types, with the help of the following
-   * matchers:
-   * - [expect(value).any(constructor)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-any)
-   * - [expect(value).anything()](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-anything)
-   * - [expect(value).arrayContaining(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-array-containing)
-   * - [expect(value).closeTo(expected[, numDigits])](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-close-to)
-   * - [expect(value).objectContaining(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-object-containing)
-   * - [expect(value).stringContaining(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-string-containing)
-   * - [expect(value).stringMatching(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-string-matching)
-   *
-   * Here is an example that asserts some of the values inside a complex object:
-   *
-   * ```js
-   * expect({
-   *   list: [1, 2, 3],
-   *   obj: { prop: 'Hello world!', another: 'some other value' },
-   *   extra: 'extra',
-   * }).toEqual(expect.objectContaining({
-   *   list: expect.arrayContaining([2, 3]),
-   *   obj: expect.objectContaining({ prop: expect.stringContaining('Hello') }),
-   * }));
+   * expect(value).toBe(value);
+   * expect(value).not.toBe({});
+   * expect(value.prop).toBe(1);
    * ```
    *
    * @param expected Expected value.
    */
-  toEqual(expected: unknown): R;
+  toBe(expected: unknown): R;
   /**
-   * Ensures that value has a `.length` property equal to `expected`. Useful for arrays and strings.
+   * Compares floating point numbers for approximate equality. Use this method instead of
+   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be)
+   * when comparing floating point numbers.
    *
    * **Usage**
    *
    * ```js
-   * expect('Hello, World').toHaveLength(12);
-   * expect([1, 2, 3]).toHaveLength(3);
+   * expect(0.1 + 0.2).not.toBe(0.3);
+   * expect(0.1 + 0.2).toBeCloseTo(0.3, 5);
    * ```
    *
-   * @param expected Expected length.
+   * @param expected Expected value.
+   * @param numDigits The number of decimal digits after the decimal point that must be equal.
    */
-  toHaveLength(expected: number): R;
+  toBeCloseTo(expected: number, numDigits?: number): R;
   /**
-   * Ensures that property at provided `keyPath` exists on the object and optionally checks that property is equal to
-   * the `expected`. Equality is checked recursively, similarly to
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal).
+   * Ensures that value is not `undefined`.
    *
    * **Usage**
    *
    * ```js
-   * const value = {
-   *   a: {
-   *     b: [42],
-   *   },
-   *   c: true,
-   * };
-   * expect(value).toHaveProperty('a.b');
-   * expect(value).toHaveProperty('a.b', [42]);
-   * expect(value).toHaveProperty('a.b[0]', 42);
-   * expect(value).toHaveProperty('c');
-   * expect(value).toHaveProperty('c', true);
+   * const value = null;
+   * expect(value).toBeDefined();
    * ```
    *
-   * @param keyPath Path to the property. Use dot notation `a.b` to check nested properties and indexed `a[2]` notation to check nested
-   * array items.
-   * @param expected Optional expected value to compare the property to.
    */
-  toHaveProperty(keyPath: string | Array<string>, value?: unknown): R;
+  toBeDefined(): R;
   /**
-   * Ensures that string value matches a regular expression.
+   * Ensures that value is false in a boolean context, one of `false`, `0`, `''`, `null`, `undefined` or `NaN`. Use this
+   * method when you don't care about the specific value.
    *
    * **Usage**
    *
    * ```js
-   * const value = 'Is 42 enough?';
-   * expect(value).toMatch(/Is \d+ enough/);
+   * const value = null;
+   * expect(value).toBeFalsy();
    * ```
    *
-   * @param expected Regular expression to match against.
    */
-  toMatch(expected: RegExp | string): R;
+  toBeFalsy(): R;
   /**
-   * Compares contents of the value with contents of `expected`, performing "deep equality" check. Allows extra
-   * properties to be present in the value, unlike
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal),
-   * so you can check just a subset of object properties.
-   *
-   * When comparing arrays, the number of items must match, and each item is checked recursively.
+   * Ensures that `value > expected` for number or big integer values.
    *
    * **Usage**
    *
    * ```js
-   * const value = {
-   *   a: 1,
-   *   b: 2,
-   *   c: true,
-   * };
-   * expect(value).toMatchObject({ a: 1, c: true });
-   * expect(value).toMatchObject({ b: 2, c: true });
-   *
-   * expect([{ a: 1, b: 2 }]).toMatchObject([{ a: 1 }]);
+   * const value = 42;
+   * expect(value).toBeGreaterThan(1);
    * ```
    *
-   * @param expected The expected object value to match against.
+   * @param expected The value to compare to.
    */
-  toMatchObject(expected: Record<string, unknown> | Array<unknown>): R;
+  toBeGreaterThan(expected: number | bigint): R;
   /**
-   * Compares contents of the value with contents of `expected` **and** their types.
-   *
-   * Differences from
-   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal):
-   * - Keys with undefined properties are checked. For example, `{ a: undefined, b: 2 }` does not match `{ b: 2 }`.
-   * - Array sparseness is checked. For example, `[, 1]` does not match `[undefined, 1]`.
-   * - Object types are checked to be equal. For example, a class instance with fields `a` and `b` will not equal a
-   *   literal object with fields `a` and `b`.
+   * Ensures that `value >= expected` for number or big integer values.
    *
    * **Usage**
    *
    * ```js
-   * const value = { prop: 1 };
-   * expect(value).toStrictEqual({ prop: 1 });
+   * const value = 42;
+   * expect(value).toBeGreaterThanOrEqual(42);
    * ```
    *
-   * @param expected Expected value.
+   * @param expected The value to compare to.
    */
-  toStrictEqual(expected: unknown): R;
+  toBeGreaterThanOrEqual(expected: number | bigint): R;
   /**
-   * Calls the function and ensures it throws an error.
-   *
-   * Optionally compares the error with `expected`. Allowed expected values:
-   * - Regular expression - error message should **match** the pattern.
-   * - String - error message should **include** the substring.
-   * - Error object - error message should be **equal to** the message property of the object.
-   * - Error class - error object should be an **instance of** the class.
+   * Ensures that value is an instance of a class. Uses `instanceof` operator.
    *
    * **Usage**
    *
    * ```js
-   * expect(() => {
-   *   throw new Error('Something bad');
-   * }).toThrow();
-   *
-   * expect(() => {
-   *   throw new Error('Something bad');
-   * }).toThrow(/something/);
-   *
-   * expect(() => {
-   *   throw new Error('Something bad');
-   * }).toThrow(Error);
+   * expect(page).toBeInstanceOf(Page);
+   *
+   * class Example {}
+   * expect(new Example()).toBeInstanceOf(Example);
    * ```
    *
-   * @param expected Expected error message or error object.
+   * @param expected The class or constructor function.
    */
-  toThrow(error?: unknown): R;
+  toBeInstanceOf(expected: Function): R;
   /**
-   * An alias for
-   * [expect(value).toThrow([expected])](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-throw).
+   * Ensures that `value < expected` for number or big integer values.
    *
    * **Usage**
    *
    * ```js
-   * expect(() => {
-   *   throw new Error('Something bad');
-   * }).toThrowError();
+   * const value = 42;
+   * expect(value).toBeLessThan(100);
    * ```
    *
-   * @param expected Expected error message or error object.
+   * @param expected The value to compare to.
    */
-  toThrowError(error?: unknown): R;
-
-}
-
-type FunctionAssertions = {
+  toBeLessThan(expected: number | bigint): R;
   /**
-   * Retries the callback until all assertions within it pass or the `timeout` value is reached.
-   * The `intervals` parameter can be used to establish the probing frequency or pattern.
+   * Ensures that `value <= expected` for number or big integer values.
    *
    * **Usage**
+   *
    * ```js
-   * await expect(async () => {
-   *   const response = await page.request.get('https://api.example.com');
-   *   expect(response.status()).toBe(200);
-   * }).toPass({
-   *   // Probe, wait 1s, probe, wait 2s, probe, wait 10s, probe, wait 10s, probe
-   *   intervals: [1_000, 2_000, 10_000], // Defaults to [100, 250, 500, 1000].
-   *   timeout: 60_000 // Defaults to 0
-   * });
+   * const value = 42;
+   * expect(value).toBeLessThanOrEqual(42);
    * ```
    *
-   * Note that by default `toPass` does not respect custom expect timeout.
-   *
-   * @param options
-   */
-  toPass(options?: { timeout?: number, intervals?: number[] }): Promise<void>;
-};
-
-type BaseMatchers<R, T> = GenericAssertions<R> & PlaywrightTest.Matchers<R, T> & SnapshotAssertions;
-type AllowedGenericMatchers<R, T> = PlaywrightTest.Matchers<R, T> & Pick<GenericAssertions<R>, 'toBe' | 'toBeDefined' | 'toBeFalsy' | 'toBeNull' | 'toBeTruthy' | 'toBeUndefined'>;
-
-type SpecificMatchers<R, T> =
-  T extends Page ? PageAssertions & AllowedGenericMatchers<R, T> :
-  T extends Locator ? LocatorAssertions & AllowedGenericMatchers<R, T> :
-  T extends APIResponse ? APIResponseAssertions & AllowedGenericMatchers<R, T> :
-  BaseMatchers<R, T> & (T extends Function ? FunctionAssertions : {});
-type AllMatchers<R, T> = PageAssertions & LocatorAssertions & APIResponseAssertions & FunctionAssertions & BaseMatchers<R, T>;
-
-type IfAny<T, Y, N> = 0 extends (1 & T) ? Y : N;
-type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
-type ToUserMatcher<F> = F extends (first: any, ...args: infer Rest) => infer R ? (...args: Rest) => (R extends PromiseLike<infer U> ? Promise<void> : void) : never;
-type ToUserMatcherObject<T, ArgType> = {
-  [K in keyof T as T[K] extends (arg: ArgType, ...rest: any[]) => any ? K : never]: ToUserMatcher<T[K]>;
-};
-
-type MatcherHintColor = (arg: string) => string;
-
-export type MatcherHintOptions = {
-  comment?: string;
-  expectedColor?: MatcherHintColor;
-  isDirectExpectCall?: boolean;
-  isNot?: boolean;
-  promise?: string;
-  receivedColor?: MatcherHintColor;
-  secondArgument?: string;
-  secondArgumentColor?: MatcherHintColor;
-};
-
-export interface ExpectMatcherUtils {
-  matcherHint(matcherName: string, received: unknown, expected: unknown, options?: MatcherHintOptions): string;
-  printDiffOrStringify(expected: unknown, received: unknown, expectedLabel: string, receivedLabel: string, expand: boolean): string;
-  printExpected(value: unknown): string;
-  printReceived(object: unknown): string;
-  printWithType<T>(name: string, value: T, print: (value: T) => string): string;
-  diff(a: unknown, b: unknown): string | null;
-  stringify(object: unknown, maxDepth?: number, maxWidth?: number): string;
-}
-
-export type ExpectMatcherState = {
-  /**
-   * Whether this matcher was called with the negated .not modifier.
-   */
-  isNot: boolean;
-  /**
-   * - 'rejects' if matcher was called with the promise .rejects modifier
-   * - 'resolves' if matcher was called with the promise .resolves modifier
-   * - '' if matcher was not called with a promise modifier
-   */
-  promise: 'rejects' | 'resolves' | '';
-  utils: ExpectMatcherUtils;
-  /**
-   * Timeout in milliseconds for the assertion to be fulfilled.
-   */
-  timeout: number;
-};
-
-export type MatcherReturnType = {
-  message: () => string;
-  pass: boolean;
-  name?: string;
-  expected?: unknown;
-  actual?: any;
-  log?: string[];
-};
-
-type MakeMatchers<R, T, ExtendedMatchers> = {
-  /**
-   * If you know how to test something, `.not` lets you test its opposite.
-   */
-  not: MakeMatchers<R, T, ExtendedMatchers>;
-  /**
-   * Use resolves to unwrap the value of a fulfilled promise so any other
-   * matcher can be chained. If the promise is rejected the assertion fails.
-   */
-  resolves: MakeMatchers<Promise<R>, Awaited<T>, ExtendedMatchers>;
-  /**
-   * Unwraps the reason of a rejected promise so any other matcher can be chained.
-   * If the promise is fulfilled the assertion fails.
+   * @param expected The value to compare to.
    */
-  rejects: MakeMatchers<Promise<R>, any, ExtendedMatchers>;
-} & IfAny<T, AllMatchers<R, T>, SpecificMatchers<R, T> & ToUserMatcherObject<ExtendedMatchers, T>>;
-
-export type Expect<ExtendedMatchers = {}> = {
-  <T = unknown>(actual: T, messageOrOptions?: string | { message?: string }): MakeMatchers<void, T, ExtendedMatchers>;
-  soft: <T = unknown>(actual: T, messageOrOptions?: string | { message?: string }) => MakeMatchers<void, T, ExtendedMatchers>;
-  poll: <T = unknown>(actual: () => T | Promise<T>, messageOrOptions?: string | { message?: string, timeout?: number, intervals?: number[] }) => BaseMatchers<Promise<void>, T> & {
-    /**
-     * If you know how to test something, `.not` lets you test its opposite.
-     */
-     not: BaseMatchers<Promise<void>, T>;
-  };
-  extend<MoreMatchers extends Record<string, (this: ExpectMatcherState, receiver: any, ...args: any[]) => MatcherReturnType | Promise<MatcherReturnType>>>(matchers: MoreMatchers): Expect<ExtendedMatchers & MoreMatchers>;
-  configure: (configuration: {
-    message?: string,
-    timeout?: number,
-    soft?: boolean,
-  }) => Expect<ExtendedMatchers>;
-  getState(): unknown;
-  not: Omit<AsymmetricMatchers, 'any' | 'anything'>;
-} & AsymmetricMatchers;
-
-// --- BEGINGLOBAL ---
-declare global {
-  export namespace PlaywrightTest {
-    export interface Matchers<R, T = unknown> {
-    }
-  }
-}
-// --- ENDGLOBAL ---
-
-/**
- * These tests are executed in Playwright environment that launches the browser
- * and provides a fresh page to each test.
- */
-export const test: TestType<PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;
-export default test;
-
-export const _baseTest: TestType<{}, {}>;
-export const expect: Expect<{}>;
-
-/**
- * Defines Playwright config
- */
-export function defineConfig(config: PlaywrightTestConfig): PlaywrightTestConfig;
-export function defineConfig<T>(config: PlaywrightTestConfig<T>): PlaywrightTestConfig<T>;
-export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>): PlaywrightTestConfig<T, W>;
-export function defineConfig(config: PlaywrightTestConfig, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig;
-export function defineConfig<T>(config: PlaywrightTestConfig<T>, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig<T>;
-export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig<T, W>;
-
-type MergedT<List> = List extends [TestType<infer T, any>, ...(infer Rest)] ? T & MergedT<Rest> : {};
-type MergedW<List> = List extends [TestType<any, infer W>, ...(infer Rest)] ? W & MergedW<Rest> : {};
-type MergedTestType<List> = TestType<MergedT<List>, MergedW<List>>;
-
-/**
- * Merges fixtures
- */
-export function mergeTests<List extends any[]>(...tests: List): MergedTestType<List>;
-
-type MergedExpectMatchers<List> = List extends [Expect<infer M>, ...(infer Rest)] ? M & MergedExpectMatchers<Rest> : {};
-type MergedExpect<List> = Expect<MergedExpectMatchers<List>>;
-
-/**
- * Merges expects
- */
-export function mergeExpects<List extends any[]>(...expects: List): MergedExpect<List>;
-
-// This is required to not export everything by default. See https://github.com/Microsoft/TypeScript/issues/19545#issuecomment-340490459
-export { };
-
-
-
-/**
- * The {@link APIResponseAssertions} class provides assertion methods that can be used to make assertions about the
- * {@link APIResponse} in the tests.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('navigates to login', async ({ page }) => {
- *   // ...
- *   const response = await page.request.get('https://playwright.dev');
- *   await expect(response).toBeOK();
- * });
- * ```
- *
- */
-interface APIResponseAssertions {
+  toBeLessThanOrEqual(expected: number | bigint): R;
   /**
-   * Ensures the response status code is within `200..299` range.
+   * Ensures that value is `NaN`.
    *
    * **Usage**
    *
    * ```js
-   * await expect(response).toBeOK();
+   * const value = NaN;
+   * expect(value).toBeNaN();
    * ```
    *
    */
-  toBeOK(): Promise<void>;
-
+  toBeNaN(): R;
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the response status is not
-   * successful:
+   * Ensures that value is `null`.
+   *
+   * **Usage**
    *
    * ```js
-   * await expect(response).not.toBeOK();
+   * const value = null;
+   * expect(value).toBeNull();
    * ```
    *
    */
-  not: APIResponseAssertions;
-}
-
-/**
- * The {@link LocatorAssertions} class provides assertion methods that can be used to make assertions about the {@link
- * Locator} state in the tests.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('status becomes submitted', async ({ page }) => {
- *   // ...
- *   await page.getByRole('button').click();
- *   await expect(page.locator('.status')).toHaveText('Submitted');
- * });
- * ```
- *
- */
-interface LocatorAssertions {
+  toBeNull(): R;
   /**
-   * Ensures that {@link Locator} points to an element that is
-   * [connected](https://developer.mozilla.org/en-US/docs/Web/API/Node/isConnected) to a Document or a ShadowRoot.
+   * Ensures that value is true in a boolean context, **anything but** `false`, `0`, `''`, `null`, `undefined` or `NaN`.
+   * Use this method when you don't care about the specific value.
    *
    * **Usage**
    *
    * ```js
-   * await expect(page.getByText('Hidden text')).toBeAttached();
-   * ```
-   *
-   * @param options
-   */
-  toBeAttached(options?: {
-    attached?: boolean;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+   * const value = { example: 'value' };
+   * expect(value).toBeTruthy();
+   * ```
+   *
+   */
+  toBeTruthy(): R;
   /**
-   * Ensures the {@link Locator} points to a checked input.
+   * Ensures that value is `undefined`.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByLabel('Subscribe to newsletter');
-   * await expect(locator).toBeChecked();
+   * const value = undefined;
+   * expect(value).toBeUndefined();
    * ```
    *
-   * @param options
    */
-  toBeChecked(options?: {
-    checked?: boolean;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toBeUndefined(): R;
   /**
-   * Ensures the {@link Locator} points to a disabled element. Element is disabled if it has "disabled" attribute or is
-   * disabled via
-   * ['aria-disabled'](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-disabled). Note
-   * that only native control elements such as HTML `button`, `input`, `select`, `textarea`, `option`, `optgroup` can be
-   * disabled by setting "disabled" attribute. "disabled" attribute on other elements is ignored by the browser.
+   * Ensures that string value contains an expected substring. Comparison is case-sensitive.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('button.submit');
-   * await expect(locator).toBeDisabled();
+   * const value = 'Hello, World';
+   * expect(value).toContain('World');
+   * expect(value).toContain(',');
    * ```
    *
-   * @param options
+   * @param expected Expected substring.
    */
-  toBeDisabled(options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toContain(expected: string): R;
   /**
-   * Ensures the {@link Locator} points to an editable element.
+   * Ensures that value is an `Array` or `Set` and contains an expected item.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByRole('textbox');
-   * await expect(locator).toBeEditable();
+   * const value = [1, 2, 3];
+   * expect(value).toContain(2);
+   * expect(new Set(value)).toContain(2);
    * ```
    *
-   * @param options
+   * @param expected Expected value in the collection.
    */
-  toBeEditable(options?: {
-    editable?: boolean;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toContain(expected: unknown): R;
   /**
-   * Ensures the {@link Locator} points to an empty editable element or to a DOM node that has no text.
+   * Ensures that value is an `Array` or `Set` and contains an item equal to the expected.
+   *
+   * For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as
+   * performed by
+   * [expect(value).toContain(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-contain-2).
+   *
+   * For primitive values, this method is equivalent to
+   * [expect(value).toContain(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-contain-2).
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('div.warning');
-   * await expect(locator).toBeEmpty();
+   * const value = [
+   *   { example: 1 },
+   *   { another: 2 },
+   *   { more: 3 },
+   * ];
+   * expect(value).toContainEqual({ another: 2 });
+   * expect(new Set(value)).toContainEqual({ another: 2 });
    * ```
    *
-   * @param options
+   * @param expected Expected value in the collection.
    */
-  toBeEmpty(options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toContainEqual(expected: unknown): R;
   /**
-   * Ensures the {@link Locator} points to an enabled element.
+   * Compares contents of the value with contents of
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal-option-expected),
+   * performing "deep equality" check.
+   *
+   * For objects, this method recursively checks equality of all fields, rather than comparing objects by reference as
+   * performed by
+   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be).
+   *
+   * For primitive values, this method is equivalent to
+   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be).
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('button.submit');
-   * await expect(locator).toBeEnabled();
+   * const value = { prop: 1 };
+   * expect(value).toEqual({ prop: 1 });
    * ```
    *
-   * @param options
+   * **Non-strict equality**
+   *
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * performs deep equality check that compares contents of the received and expected values. To ensure two objects
+   * reference the same instance, use
+   * [expect(value).toBe(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-be)
+   * instead.
+   *
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * ignores `undefined` properties and array items, and does not insist on object types being equal. For stricter
+   * matching, use
+   * [expect(value).toStrictEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-strict-equal).
+   *
+   * **Pattern matching**
+   *
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal)
+   * can be also used to perform pattern matching on objects, arrays and primitive types, with the help of the following
+   * matchers:
+   * - [expect(value).any(constructor)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-any)
+   * - [expect(value).anything()](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-anything)
+   * - [expect(value).arrayContaining(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-array-containing)
+   * - [expect(value).closeTo(expected[, numDigits])](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-close-to)
+   * - [expect(value).objectContaining(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-object-containing)
+   * - [expect(value).stringContaining(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-string-containing)
+   * - [expect(value).stringMatching(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-string-matching)
+   *
+   * Here is an example that asserts some of the values inside a complex object:
+   *
+   * ```js
+   * expect({
+   *   list: [1, 2, 3],
+   *   obj: { prop: 'Hello world!', another: 'some other value' },
+   *   extra: 'extra',
+   * }).toEqual(expect.objectContaining({
+   *   list: expect.arrayContaining([2, 3]),
+   *   obj: expect.objectContaining({ prop: expect.stringContaining('Hello') }),
+   * }));
+   * ```
+   *
+   * @param expected Expected value.
    */
-  toBeEnabled(options?: {
-    enabled?: boolean;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toEqual(expected: unknown): R;
   /**
-   * Ensures the {@link Locator} points to a focused DOM node.
+   * Ensures that value has a `.length` property equal to
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-have-length-option-expected).
+   * Useful for arrays and strings.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByRole('textbox');
-   * await expect(locator).toBeFocused();
+   * expect('Hello, World').toHaveLength(12);
+   * expect([1, 2, 3]).toHaveLength(3);
    * ```
    *
-   * @param options
+   * @param expected Expected length.
    */
-  toBeFocused(options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toHaveLength(expected: number): R;
   /**
-   * Ensures that {@link Locator} either does not resolve to any DOM node, or resolves to a
-   * [non-visible](https://playwright.dev/docs/actionability#visible) one.
+   * Ensures that property at provided `keyPath` exists on the object and optionally checks that property is equal to
+   * the
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-have-property-option-expected).
+   * Equality is checked recursively, similarly to
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal).
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('.my-element');
-   * await expect(locator).toBeHidden();
+   * const value = {
+   *   a: {
+   *     b: [42],
+   *   },
+   *   c: true,
+   * };
+   * expect(value).toHaveProperty('a.b');
+   * expect(value).toHaveProperty('a.b', [42]);
+   * expect(value).toHaveProperty('a.b[0]', 42);
+   * expect(value).toHaveProperty('c');
+   * expect(value).toHaveProperty('c', true);
    * ```
    *
-   * @param options
+   * @param keyPath Path to the property. Use dot notation `a.b` to check nested properties and indexed `a[2]` notation to check nested
+   * array items.
+   * @param expected Optional expected value to compare the property to.
    */
-  toBeHidden(options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toHaveProperty(keyPath: string | Array<string>, value?: unknown): R;
   /**
-   * Ensures the {@link Locator} points to an element that intersects viewport, according to the
-   * [intersection observer API](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API).
+   * Ensures that string value matches a regular expression.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByRole('button');
-   * // Make sure at least some part of element intersects viewport.
-   * await expect(locator).toBeInViewport();
-   * // Make sure element is fully outside of viewport.
-   * await expect(locator).not.toBeInViewport();
-   * // Make sure that at least half of the element intersects viewport.
-   * await expect(locator).toBeInViewport({ ratio: 0.5 });
+   * const value = 'Is 42 enough?';
+   * expect(value).toMatch(/Is \d+ enough/);
    * ```
    *
-   * @param options
+   * @param expected Regular expression to match against.
    */
-  toBeInViewport(options?: {
-    /**
-     * The minimal ratio of the element to intersect viewport. If equals to `0`, then element should intersect viewport at
-     * any positive ratio. Defaults to `0`.
-     */
-    ratio?: number;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
-
+  toMatch(expected: RegExp | string): R;
   /**
-   * Ensures that {@link Locator} points to an attached and [visible](https://playwright.dev/docs/actionability#visible) DOM node.
+   * Compares contents of the value with contents of
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-match-object-option-expected),
+   * performing "deep equality" check. Allows extra properties to be present in the value, unlike
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal),
+   * so you can check just a subset of object properties.
    *
-   * To check that at least one element from the list is visible, use
-   * [locator.first()](https://playwright.dev/docs/api/class-locator#locator-first).
+   * When comparing arrays, the number of items must match, and each item is checked recursively.
    *
    * **Usage**
    *
    * ```js
-   * // A specific element is visible.
-   * await expect(page.getByText('Welcome')).toBeVisible();
-   *
-   * // At least one item in the list is visible.
-   * await expect(page.getByTestId('todo-item').first()).toBeVisible();
+   * const value = {
+   *   a: 1,
+   *   b: 2,
+   *   c: true,
+   * };
+   * expect(value).toMatchObject({ a: 1, c: true });
+   * expect(value).toMatchObject({ b: 2, c: true });
    *
-   * // At least one of the two elements is visible, possibly both.
-   * await expect(
-   *     page.getByRole('button', { name: 'Sign in' })
-   *         .or(page.getByRole('button', { name: 'Sign up' }))
-   *         .first()
-   * ).toBeVisible();
+   * expect([{ a: 1, b: 2 }]).toMatchObject([{ a: 1 }]);
    * ```
    *
-   * @param options
+   * @param expected The expected object value to match against.
    */
-  toBeVisible(options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-
-    visible?: boolean;
-  }): Promise<void>;
-
+  toMatchObject(expected: Record<string, unknown> | Array<unknown>): R;
   /**
-   * Ensures the {@link Locator} points to an element that contains the given text. All nested elements will be
-   * considered when computing the text content of the element. You can use regular expressions for the value as well.
+   * Compares contents of the value with contents of
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-strict-equal-option-expected)
+   * **and** their types.
    *
-   * **Details**
-   *
-   * When `expected` parameter is a string, Playwright will normalize whitespaces and line breaks both in the actual
-   * text and in the expected string before matching. When regular expression is used, the actual text is matched as is.
+   * Differences from
+   * [expect(value).toEqual(expected)](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-equal):
+   * - Keys with undefined properties are checked. For example, `{ a: undefined, b: 2 }` does not match `{ b: 2 }`.
+   * - Array sparseness is checked. For example, `[, 1]` does not match `[undefined, 1]`.
+   * - Object types are checked to be equal. For example, a class instance with fields `a` and `b` will not equal a
+   *   literal object with fields `a` and `b`.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('.title');
-   * await expect(locator).toContainText('substring');
-   * await expect(locator).toContainText(/\d messages/);
+   * const value = { prop: 1 };
+   * expect(value).toStrictEqual({ prop: 1 });
    * ```
    *
-   * If you pass an array as an expected value, the expectations are:
-   * 1. Locator resolves to a list of elements.
-   * 1. Elements from a **subset** of this list contain text from the expected array, respectively.
-   * 1. The matching subset of elements has the same order as the expected array.
-   * 1. Each text value from the expected array is matched by some element from the list.
-   *
-   * For example, consider the following list:
+   * @param expected Expected value.
+   */
+  toStrictEqual(expected: unknown): R;
+  /**
+   * Calls the function and ensures it throws an error.
    *
-   * ```html
-   * <ul>
-   *   <li>Item Text 1</li>
-   *   <li>Item Text 2</li>
-   *   <li>Item Text 3</li>
-   * </ul>
-   * ```
+   * Optionally compares the error with
+   * [`expected`](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-throw-option-expected).
+   * Allowed expected values:
+   * - Regular expression - error message should **match** the pattern.
+   * - String - error message should **include** the substring.
+   * - Error object - error message should be **equal to** the message property of the object.
+   * - Error class - error object should be an **instance of** the class.
    *
-   * Let's see how we can use the assertion:
+   * **Usage**
    *
    * ```js
-   * // ✓ Contains the right items in the right order
-   * await expect(page.locator('ul > li')).toContainText(['Text 1', 'Text 3']);
+   * expect(() => {
+   *   throw new Error('Something bad');
+   * }).toThrow();
    *
-   * // ✖ Wrong order
-   * await expect(page.locator('ul > li')).toContainText(['Text 3', 'Text 2']);
+   * expect(() => {
+   *   throw new Error('Something bad');
+   * }).toThrow(/something/);
    *
-   * // ✖ No item contains this text
-   * await expect(page.locator('ul > li')).toContainText(['Some 33']);
+   * expect(() => {
+   *   throw new Error('Something bad');
+   * }).toThrow(Error);
+   * ```
    *
-   * // ✖ Locator points to the outer list element, not to the list items
-   * await expect(page.locator('ul')).toContainText(['Text 3']);
+   * @param expected Expected error message or error object.
+   */
+  toThrow(error?: unknown): R;
+  /**
+   * An alias for
+   * [expect(value).toThrow([expected])](https://playwright.dev/docs/api/class-genericassertions#generic-assertions-to-throw).
+   *
+   * **Usage**
+   *
+   * ```js
+   * expect(() => {
+   *   throw new Error('Something bad');
+   * }).toThrowError();
    * ```
    *
-   * @param expected Expected substring or RegExp or a list of those.
-   * @param options
+   * @param expected Expected error message or error object.
    */
-  toContainText(expected: string|RegExp|ReadonlyArray<string|RegExp>, options?: {
-    /**
-     * Whether to perform case-insensitive match. `ignoreCase` option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    ignoreCase?: boolean;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
+  toThrowError(error?: unknown): R;
 
-    /**
-     * Whether to use `element.innerText` instead of `element.textContent` when retrieving DOM node text.
-     */
-    useInnerText?: boolean;
-  }): Promise<void>;
+}
 
+type FunctionAssertions = {
   /**
-   * Ensures the {@link Locator} points to an element with a given
-   * [accessible description](https://w3c.github.io/accname/#dfn-accessible-description).
+   * Retries the callback until all assertions within it pass or the `timeout` value is reached.
+   * The `intervals` parameter can be used to establish the probing frequency or pattern.
    *
    * **Usage**
-   *
    * ```js
-   * const locator = page.getByTestId('save-button');
-   * await expect(locator).toHaveAccessibleDescription('Save results to disk');
+   * await expect(async () => {
+   *   const response = await page.request.get('https://api.example.com');
+   *   expect(response.status()).toBe(200);
+   * }).toPass({
+   *   // Probe, wait 1s, probe, wait 2s, probe, wait 10s, probe, wait 10s, probe
+   *   intervals: [1_000, 2_000, 10_000], // Defaults to [100, 250, 500, 1000].
+   *   timeout: 60_000 // Defaults to 0
+   * });
    * ```
    *
-   * @param description Expected accessible description.
+   * Note that by default `toPass` does not respect custom expect timeout.
+   *
    * @param options
    */
-  toHaveAccessibleDescription(description: string|RegExp, options?: {
-    /**
-     * Whether to perform case-insensitive match. `ignoreCase` option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    ignoreCase?: boolean;
+  toPass(options?: { timeout?: number, intervals?: number[] }): Promise<void>;
+};
 
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
+type BaseMatchers<R, T> = GenericAssertions<R> & PlaywrightTest.Matchers<R, T> & SnapshotAssertions;
+type AllowedGenericMatchers<R, T> = PlaywrightTest.Matchers<R, T> & Pick<GenericAssertions<R>, 'toBe' | 'toBeDefined' | 'toBeFalsy' | 'toBeNull' | 'toBeTruthy' | 'toBeUndefined'>;
+
+type SpecificMatchers<R, T> =
+  T extends Page ? PageAssertions & AllowedGenericMatchers<R, T> :
+  T extends Locator ? LocatorAssertions & AllowedGenericMatchers<R, T> :
+  T extends APIResponse ? APIResponseAssertions & AllowedGenericMatchers<R, T> :
+  BaseMatchers<R, T> & (T extends Function ? FunctionAssertions : {});
+type AllMatchers<R, T> = PageAssertions & LocatorAssertions & APIResponseAssertions & FunctionAssertions & BaseMatchers<R, T>;
+
+type IfAny<T, Y, N> = 0 extends (1 & T) ? Y : N;
+type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
+type ToUserMatcher<F, DefaultReturnType> = F extends (first: any, ...args: infer Rest) => infer R ? (...args: Rest) => (R extends PromiseLike<infer U> ? Promise<void> : DefaultReturnType) : never;
+type ToUserMatcherObject<T, DefaultReturnType, ArgType> = {
+  [K in keyof T as T[K] extends (arg: ArgType, ...rest: any[]) => any ? K : never]: ToUserMatcher<T[K], DefaultReturnType>;
+};
+
+type MatcherHintColor = (arg: string) => string;
+
+export type MatcherHintOptions = {
+  comment?: string;
+  expectedColor?: MatcherHintColor;
+  isDirectExpectCall?: boolean;
+  isNot?: boolean;
+  promise?: string;
+  receivedColor?: MatcherHintColor;
+  secondArgument?: string;
+  secondArgumentColor?: MatcherHintColor;
+};
+
+export interface ExpectMatcherUtils {
+  matcherHint(matcherName: string, received: unknown, expected: unknown, options?: MatcherHintOptions): string;
+  printDiffOrStringify(expected: unknown, received: unknown, expectedLabel: string, receivedLabel: string, expand: boolean): string;
+  printExpected(value: unknown): string;
+  printReceived(object: unknown): string;
+  printWithType<T>(name: string, value: T, print: (value: T) => string): string;
+  diff(a: unknown, b: unknown): string | null;
+  stringify(object: unknown, maxDepth?: number, maxWidth?: number): string;
+}
+
+export type ExpectMatcherState = {
+  /**
+   * Whether this matcher was called with the negated .not modifier.
+   */
+  isNot: boolean;
+  /**
+   * - 'rejects' if matcher was called with the promise .rejects modifier
+   * - 'resolves' if matcher was called with the promise .resolves modifier
+   * - '' if matcher was not called with a promise modifier
+   */
+  promise: 'rejects' | 'resolves' | '';
+  utils: ExpectMatcherUtils;
+  /**
+   * Timeout in milliseconds for the assertion to be fulfilled.
+   */
+  timeout: number;
+};
+
+export type MatcherReturnType = {
+  message: () => string;
+  pass: boolean;
+  name?: string;
+  expected?: unknown;
+  actual?: any;
+  log?: string[];
+  timeout?: number;
+};
+
+type MakeMatchers<R, T, ExtendedMatchers> = {
+  /**
+   * If you know how to test something, `.not` lets you test its opposite.
+   */
+  not: MakeMatchers<R, T, ExtendedMatchers>;
+  /**
+   * Use resolves to unwrap the value of a fulfilled promise so any other
+   * matcher can be chained. If the promise is rejected the assertion fails.
+   */
+  resolves: MakeMatchers<Promise<R>, Awaited<T>, ExtendedMatchers>;
+  /**
+   * Unwraps the reason of a rejected promise so any other matcher can be chained.
+   * If the promise is fulfilled the assertion fails.
+   */
+  rejects: MakeMatchers<Promise<R>, any, ExtendedMatchers>;
+} & IfAny<T, AllMatchers<R, T>, SpecificMatchers<R, T> & ToUserMatcherObject<ExtendedMatchers, R, T>>;
+
+type PollMatchers<R, T, ExtendedMatchers> = {
+  /**
+   * If you know how to test something, `.not` lets you test its opposite.
+   */
+  not: PollMatchers<R, T, ExtendedMatchers>;
+} & BaseMatchers<R, T> & ToUserMatcherObject<ExtendedMatchers, R, T>;
+
+export type Expect<ExtendedMatchers = {}> = {
+  <T = unknown>(actual: T, messageOrOptions?: string | { message?: string }): MakeMatchers<void, T, ExtendedMatchers>;
+  soft: <T = unknown>(actual: T, messageOrOptions?: string | { message?: string }) => MakeMatchers<void, T, ExtendedMatchers>;
+  poll: <T = unknown>(actual: () => T | Promise<T>, messageOrOptions?: string | { message?: string, timeout?: number, intervals?: number[] }) => PollMatchers<Promise<void>, T, ExtendedMatchers>;
+  extend<MoreMatchers extends Record<string, (this: ExpectMatcherState, receiver: any, ...args: any[]) => MatcherReturnType | Promise<MatcherReturnType>>>(matchers: MoreMatchers): Expect<ExtendedMatchers & MoreMatchers>;
+  configure: (configuration: {
+    message?: string,
+    timeout?: number,
+    soft?: boolean,
+  }) => Expect<ExtendedMatchers>;
+  getState(): unknown;
+  not: Omit<AsymmetricMatchers, 'any' | 'anything'>;
+} & AsymmetricMatchers;
+
+// --- BEGINGLOBAL ---
+declare global {
+  export namespace PlaywrightTest {
+    export interface Matchers<R, T = unknown> {
+    }
+  }
+}
+// --- ENDGLOBAL ---
+
+/**
+ * These tests are executed in Playwright environment that launches the browser
+ * and provides a fresh page to each test.
+ */
+export const test: TestType<PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;
+export default test;
+
+export const _baseTest: TestType<{}, {}>;
+export const expect: Expect<{}>;
+
+/**
+ * Defines Playwright config
+ */
+export function defineConfig(config: PlaywrightTestConfig): PlaywrightTestConfig;
+export function defineConfig<T>(config: PlaywrightTestConfig<T>): PlaywrightTestConfig<T>;
+export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>): PlaywrightTestConfig<T, W>;
+export function defineConfig(config: PlaywrightTestConfig, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig;
+export function defineConfig<T>(config: PlaywrightTestConfig<T>, ...configs: PlaywrightTestConfig<T>[]): PlaywrightTestConfig<T>;
+export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>, ...configs: PlaywrightTestConfig<T, W>[]): PlaywrightTestConfig<T, W>;
+
+type MergedT<List> = List extends [TestType<infer T, any>, ...(infer Rest)] ? T & MergedT<Rest> : {};
+type MergedW<List> = List extends [TestType<any, infer W>, ...(infer Rest)] ? W & MergedW<Rest> : {};
+type MergedTestType<List> = TestType<MergedT<List>, MergedW<List>>;
+
+/**
+ * Merges fixtures
+ */
+export function mergeTests<List extends any[]>(...tests: List): MergedTestType<List>;
+
+type MergedExpectMatchers<List> = List extends [Expect<infer M>, ...(infer Rest)] ? M & MergedExpectMatchers<Rest> : {};
+type MergedExpect<List> = Expect<MergedExpectMatchers<List>>;
+
+/**
+ * Merges expects
+ */
+export function mergeExpects<List extends any[]>(...expects: List): MergedExpect<List>;
 
-  /**
-   * Ensures the {@link Locator} points to an element with a given
-   * [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
-   *
-   * **Usage**
-   *
-   * ```js
-   * const locator = page.getByTestId('save-button');
-   * await expect(locator).toHaveAccessibleName('Save to disk');
-   * ```
-   *
-   * @param name Expected accessible name.
-   * @param options
-   */
-  toHaveAccessibleName(name: string|RegExp, options?: {
-    /**
-     * Whether to perform case-insensitive match. `ignoreCase` option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    ignoreCase?: boolean;
+// This is required to not export everything by default. See https://github.com/Microsoft/TypeScript/issues/19545#issuecomment-340490459
+export { };
 
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
 
+
+/**
+ * The [APIResponseAssertions](https://playwright.dev/docs/api/class-apiresponseassertions) class provides assertion
+ * methods that can be used to make assertions about the
+ * [APIResponse](https://playwright.dev/docs/api/class-apiresponse) in the tests.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('navigates to login', async ({ page }) => {
+ *   // ...
+ *   const response = await page.request.get('https://playwright.dev');
+ *   await expect(response).toBeOK();
+ * });
+ * ```
+ *
+ */
+interface APIResponseAssertions {
   /**
-   * Ensures the {@link Locator} points to an element with given attribute.
+   * Ensures the response status code is within `200..299` range.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('input');
-   * await expect(locator).toHaveAttribute('type', 'text');
+   * await expect(response).toBeOK();
    * ```
    *
-   * @param name Attribute name.
-   * @param value Expected attribute value.
-   * @param options
    */
-  toHaveAttribute(name: string, value: string|RegExp, options?: {
-    /**
-     * Whether to perform case-insensitive match. `ignoreCase` option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    ignoreCase?: boolean;
-
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  toBeOK(): Promise<void>;
 
   /**
-   * Ensures the {@link Locator} points to an element with given attribute. The method will assert attribute presence.
+   * Makes the assertion check for the opposite condition. For example, this code tests that the response status is not
+   * successful:
    *
    * ```js
-   * const locator = page.locator('input');
-   * // Assert attribute existence.
-   * await expect(locator).toHaveAttribute('disabled');
-   * await expect(locator).not.toHaveAttribute('open');
+   * await expect(response).not.toBeOK();
    * ```
    *
-   * @param name Attribute name.
-   * @param options
    */
-  toHaveAttribute(name: string, options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  not: APIResponseAssertions;
+}
 
+/**
+ * The [LocatorAssertions](https://playwright.dev/docs/api/class-locatorassertions) class provides assertion methods
+ * that can be used to make assertions about the [Locator](https://playwright.dev/docs/api/class-locator) state in the
+ * tests.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('status becomes submitted', async ({ page }) => {
+ *   // ...
+ *   await page.getByRole('button').click();
+ *   await expect(page.locator('.status')).toHaveText('Submitted');
+ * });
+ * ```
+ *
+ */
+interface LocatorAssertions {
   /**
-   * Ensures the {@link Locator} points to an element with given CSS classes. This needs to be a full match or using a
-   * relaxed regular expression.
+   * Ensures that [Locator](https://playwright.dev/docs/api/class-locator) points to an element that is
+   * [connected](https://developer.mozilla.org/en-US/docs/Web/API/Node/isConnected) to a Document or a ShadowRoot.
    *
    * **Usage**
    *
-   * ```html
-   * <div class='selected row' id='component'></div>
-   * ```
-   *
-   * ```js
-   * const locator = page.locator('#component');
-   * await expect(locator).toHaveClass(/selected/);
-   * await expect(locator).toHaveClass('selected row');
-   * ```
-   *
-   * Note that if array is passed as an expected value, entire lists of elements can be asserted:
-   *
    * ```js
-   * const locator = page.locator('list > .component');
-   * await expect(locator).toHaveClass(['component', 'component selected', 'component']);
+   * await expect(page.getByText('Hidden text')).toBeAttached();
    * ```
    *
-   * @param expected Expected class or RegExp or a list of those.
    * @param options
    */
-  toHaveClass(expected: string|RegExp|ReadonlyArray<string|RegExp>, options?: {
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
-     */
-    timeout?: number;
-  }): Promise<void>;
+  toBeAttached(options?: {
+    attached?: boolean;
 
-  /**
-   * Ensures the {@link Locator} resolves to an exact number of DOM nodes.
-   *
-   * **Usage**
-   *
-   * ```js
-   * const list = page.locator('list > .component');
-   * await expect(list).toHaveCount(3);
-   * ```
-   *
-   * @param count Expected count.
-   * @param options
-   */
-  toHaveCount(count: number, options?: {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7146,62 +8511,33 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * Ensures the {@link Locator} resolves to an element with the given computed CSS style.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to a checked input.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByRole('button');
-   * await expect(locator).toHaveCSS('display', 'flex');
+   * const locator = page.getByLabel('Subscribe to newsletter');
+   * await expect(locator).toBeChecked();
    * ```
    *
-   * @param name CSS property name.
-   * @param value CSS property value.
    * @param options
    */
-  toHaveCSS(name: string, value: string|RegExp, options?: {
+  toBeChecked(options?: {
     /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     * Provides state to assert for. Asserts for input to be checked by default. This option can't be used when
+     * [`indeterminate`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-checked-option-indeterminate)
+     * is set to true.
      */
-    timeout?: number;
-  }): Promise<void>;
+    checked?: boolean;
 
-  /**
-   * Ensures the {@link Locator} points to an element with the given DOM Node ID.
-   *
-   * **Usage**
-   *
-   * ```js
-   * const locator = page.getByRole('textbox');
-   * await expect(locator).toHaveId('lastname');
-   * ```
-   *
-   * @param id Element id.
-   * @param options
-   */
-  toHaveId(id: string|RegExp, options?: {
     /**
-     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     * Asserts that the element is in the indeterminate (mixed) state. Only supported for checkboxes and radio buttons.
+     * This option can't be true when
+     * [`checked`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-be-checked-option-checked)
+     * is provided.
      */
-    timeout?: number;
-  }): Promise<void>;
+    indeterminate?: boolean;
 
-  /**
-   * Ensures the {@link Locator} points to an element with given JavaScript property. Note that this property can be of
-   * a primitive type as well as a plain serializable JavaScript object.
-   *
-   * **Usage**
-   *
-   * ```js
-   * const locator = page.locator('.component');
-   * await expect(locator).toHaveJSProperty('loaded', true);
-   * ```
-   *
-   * @param name Property name.
-   * @param value Property value.
-   * @param options
-   */
-  toHaveJSProperty(name: string, value: any, options?: {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7209,23 +8545,22 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * Ensures the {@link Locator} points to an element with a given
-   * [ARIA role](https://www.w3.org/TR/wai-aria-1.2/#roles).
-   *
-   * Note that role is matched as a string, disregarding the ARIA role hierarchy. For example, asserting  a superclass
-   * role `"checkbox"` on an element with a subclass role `"switch"` will fail.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to a disabled element. Element is
+   * disabled if it has "disabled" attribute or is disabled via
+   * ['aria-disabled'](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-disabled). Note
+   * that only native control elements such as HTML `button`, `input`, `select`, `textarea`, `option`, `optgroup` can be
+   * disabled by setting "disabled" attribute. "disabled" attribute on other elements is ignored by the browser.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByTestId('save-button');
-   * await expect(locator).toHaveRole('button');
+   * const locator = page.locator('button.submit');
+   * await expect(locator).toBeDisabled();
    * ```
    *
-   * @param role Required aria role.
    * @param options
    */
-  toHaveRole(role: "alert"|"alertdialog"|"application"|"article"|"banner"|"blockquote"|"button"|"caption"|"cell"|"checkbox"|"code"|"columnheader"|"combobox"|"complementary"|"contentinfo"|"definition"|"deletion"|"dialog"|"directory"|"document"|"emphasis"|"feed"|"figure"|"form"|"generic"|"grid"|"gridcell"|"group"|"heading"|"img"|"insertion"|"link"|"list"|"listbox"|"listitem"|"log"|"main"|"marquee"|"math"|"meter"|"menu"|"menubar"|"menuitem"|"menuitemcheckbox"|"menuitemradio"|"navigation"|"none"|"note"|"option"|"paragraph"|"presentation"|"progressbar"|"radio"|"radiogroup"|"region"|"row"|"rowgroup"|"rowheader"|"scrollbar"|"search"|"searchbox"|"separator"|"slider"|"spinbutton"|"status"|"strong"|"subscript"|"superscript"|"switch"|"tab"|"table"|"tablist"|"tabpanel"|"term"|"textbox"|"time"|"timer"|"toolbar"|"tooltip"|"tree"|"treegrid"|"treeitem", options?: {
+  toBeDisabled(options?: {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7233,89 +8568,19 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * This function will wait until two consecutive locator screenshots yield the same result, and then compare the last
-   * screenshot with the expectation.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an editable element.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByRole('button');
-   * await expect(locator).toHaveScreenshot('image.png');
-   * ```
-   *
-   * Note that screenshot assertions only work with Playwright test runner.
-   * @param name Snapshot name.
-   * @param options
-   */
-  toHaveScreenshot(name: string|ReadonlyArray<string>, options?: {
-    /**
-     * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
-     * treatment depending on their duration:
-     * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
-     * - infinite animations are canceled to initial state, and then played over after the screenshot.
-     *
-     * Defaults to `"disabled"` that disables animations.
-     */
-    animations?: "disabled"|"allow";
-
-    /**
-     * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
-     * changed.  Defaults to `"hide"`.
-     */
-    caret?: "hide"|"initial";
-
-    /**
-     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
-     * box `#FF00FF` (customized by `maskColor`) that completely covers its bounding box.
-     */
-    mask?: Array<Locator>;
-
-    /**
-     * Specify the color of the overlay box for masked elements, in
-     * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
-     */
-    maskColor?: string;
-
-    /**
-     * An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1`. Default is
-     * configurable with `TestConfig.expect`. Unset by default.
-     */
-    maxDiffPixelRatio?: number;
-
-    /**
-     * An acceptable amount of pixels that could be different. Default is configurable with `TestConfig.expect`. Unset by
-     * default.
-     */
-    maxDiffPixels?: number;
-
-    /**
-     * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
-     * Defaults to `false`.
-     */
-    omitBackground?: boolean;
-
-    /**
-     * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
-     * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
-     * screenshots of high-dpi devices will be twice as large or even larger.
-     *
-     * Defaults to `"css"`.
-     */
-    scale?: "css"|"device";
-
-    /**
-     * File name containing the stylesheet to apply while making the screenshot. This is where you can hide dynamic
-     * elements, make elements invisible or change their properties to help you creating repeatable screenshots. This
-     * stylesheet pierces the Shadow DOM and applies to the inner frames.
-     */
-    stylePath?: string|Array<string>;
-
-    /**
-     * An acceptable perceived color difference in the [YIQ color space](https://en.wikipedia.org/wiki/YIQ) between the
-     * same pixel in compared images, between zero (strict) and one (lax), default is configurable with
-     * `TestConfig.expect`. Defaults to `0.2`.
-     */
-    threshold?: number;
+   * const locator = page.getByRole('textbox');
+   * await expect(locator).toBeEditable();
+   * ```
+   *
+   * @param options
+   */
+  toBeEditable(options?: {
+    editable?: boolean;
 
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
@@ -7324,89 +8589,191 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * This function will wait until two consecutive locator screenshots yield the same result, and then compare the last
-   * screenshot with the expectation.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an empty editable element or to a
+   * DOM node that has no text.
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.getByRole('button');
-   * await expect(locator).toHaveScreenshot();
+   * const locator = page.locator('div.warning');
+   * await expect(locator).toBeEmpty();
    * ```
    *
-   * Note that screenshot assertions only work with Playwright test runner.
    * @param options
    */
-  toHaveScreenshot(options?: {
-    /**
-     * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
-     * treatment depending on their duration:
-     * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
-     * - infinite animations are canceled to initial state, and then played over after the screenshot.
-     *
-     * Defaults to `"disabled"` that disables animations.
-     */
-    animations?: "disabled"|"allow";
-
+  toBeEmpty(options?: {
     /**
-     * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
-     * changed.  Defaults to `"hide"`.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    caret?: "hide"|"initial";
+    timeout?: number;
+  }): Promise<void>;
 
-    /**
-     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
-     * box `#FF00FF` (customized by `maskColor`) that completely covers its bounding box.
-     */
-    mask?: Array<Locator>;
+  /**
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an enabled element.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.locator('button.submit');
+   * await expect(locator).toBeEnabled();
+   * ```
+   *
+   * @param options
+   */
+  toBeEnabled(options?: {
+    enabled?: boolean;
 
     /**
-     * Specify the color of the overlay box for masked elements, in
-     * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    maskColor?: string;
+    timeout?: number;
+  }): Promise<void>;
 
+  /**
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to a focused DOM node.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.getByRole('textbox');
+   * await expect(locator).toBeFocused();
+   * ```
+   *
+   * @param options
+   */
+  toBeFocused(options?: {
     /**
-     * An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1`. Default is
-     * configurable with `TestConfig.expect`. Unset by default.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    maxDiffPixelRatio?: number;
+    timeout?: number;
+  }): Promise<void>;
 
+  /**
+   * Ensures that [Locator](https://playwright.dev/docs/api/class-locator) either does not resolve to any DOM node, or
+   * resolves to a [non-visible](https://playwright.dev/docs/actionability#visible) one.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.locator('.my-element');
+   * await expect(locator).toBeHidden();
+   * ```
+   *
+   * @param options
+   */
+  toBeHidden(options?: {
     /**
-     * An acceptable amount of pixels that could be different. Default is configurable with `TestConfig.expect`. Unset by
-     * default.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    maxDiffPixels?: number;
+    timeout?: number;
+  }): Promise<void>;
 
+  /**
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element that intersects viewport,
+   * according to the
+   * [intersection observer API](https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.getByRole('button');
+   * // Make sure at least some part of element intersects viewport.
+   * await expect(locator).toBeInViewport();
+   * // Make sure element is fully outside of viewport.
+   * await expect(locator).not.toBeInViewport();
+   * // Make sure that at least half of the element intersects viewport.
+   * await expect(locator).toBeInViewport({ ratio: 0.5 });
+   * ```
+   *
+   * @param options
+   */
+  toBeInViewport(options?: {
     /**
-     * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
-     * Defaults to `false`.
+     * The minimal ratio of the element to intersect viewport. If equals to `0`, then element should intersect viewport at
+     * any positive ratio. Defaults to `0`.
      */
-    omitBackground?: boolean;
+    ratio?: number;
 
     /**
-     * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
-     * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
-     * screenshots of high-dpi devices will be twice as large or even larger.
-     *
-     * Defaults to `"css"`.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    scale?: "css"|"device";
+    timeout?: number;
+  }): Promise<void>;
 
+  /**
+   * Ensures that [Locator](https://playwright.dev/docs/api/class-locator) points to an attached and
+   * [visible](https://playwright.dev/docs/actionability#visible) DOM node.
+   *
+   * To check that at least one element from the list is visible, use
+   * [locator.first()](https://playwright.dev/docs/api/class-locator#locator-first).
+   *
+   * **Usage**
+   *
+   * ```js
+   * // A specific element is visible.
+   * await expect(page.getByText('Welcome')).toBeVisible();
+   *
+   * // At least one item in the list is visible.
+   * await expect(page.getByTestId('todo-item').first()).toBeVisible();
+   *
+   * // At least one of the two elements is visible, possibly both.
+   * await expect(
+   *     page.getByRole('button', { name: 'Sign in' })
+   *         .or(page.getByRole('button', { name: 'Sign up' }))
+   *         .first()
+   * ).toBeVisible();
+   * ```
+   *
+   * @param options
+   */
+  toBeVisible(options?: {
     /**
-     * File name containing the stylesheet to apply while making the screenshot. This is where you can hide dynamic
-     * elements, make elements invisible or change their properties to help you creating repeatable screenshots. This
-     * stylesheet pierces the Shadow DOM and applies to the inner frames.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    stylePath?: string|Array<string>;
+    timeout?: number;
 
-    /**
-     * An acceptable perceived color difference in the [YIQ color space](https://en.wikipedia.org/wiki/YIQ) between the
-     * same pixel in compared images, between zero (strict) and one (lax), default is configurable with
-     * `TestConfig.expect`. Defaults to `0.2`.
-     */
-    threshold?: number;
+    visible?: boolean;
+  }): Promise<void>;
 
+  /**
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with given CSS classes.
+   * All classes from the asserted value, separated by spaces, must be present in the
+   * [Element.classList](https://developer.mozilla.org/en-US/docs/Web/API/Element/classList) in any order.
+   *
+   * **Usage**
+   *
+   * ```html
+   * <div class='middle selected row' id='component'></div>
+   * ```
+   *
+   * ```js
+   * const locator = page.locator('#component');
+   * await expect(locator).toContainClass('middle selected row');
+   * await expect(locator).toContainClass('selected');
+   * await expect(locator).toContainClass('row middle');
+   * ```
+   *
+   * When an array is passed, the method asserts that the list of elements located matches the corresponding list of
+   * expected class lists. Each element's class attribute is matched against the corresponding class in the array:
+   *
+   * ```html
+   * <div class='list'>
+   *   <div class='component inactive'></div>
+   *   <div class='component active'></div>
+   *   <div class='component inactive'></div>
+   * </div>
+   * ```
+   *
+   * ```js
+   * const locator = page.locator('.list > .component');
+   * await expect(locator).toContainClass(['inactive', 'active', 'inactive']);
+   * ```
+   *
+   * @param expected A string containing expected class names, separated by spaces, or a list of such strings to assert multiple
+   * elements.
+   * @param options
+   */
+  toContainClass(expected: string|ReadonlyArray<string>, options?: {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7414,8 +8781,9 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * Ensures the {@link Locator} points to an element with the given text. All nested elements will be considered when
-   * computing the text content of the element. You can use regular expressions for the value as well.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element that contains the given
+   * text. All nested elements will be considered when computing the text content of the element. You can use regular
+   * expressions for the value as well.
    *
    * **Details**
    *
@@ -7426,48 +8794,111 @@ interface LocatorAssertions {
    *
    * ```js
    * const locator = page.locator('.title');
-   * await expect(locator).toHaveText(/Welcome, Test User/);
-   * await expect(locator).toHaveText(/Welcome, .*\/);
+   * await expect(locator).toContainText('substring');
+   * await expect(locator).toContainText(/\d messages/);
    * ```
    *
    * If you pass an array as an expected value, the expectations are:
    * 1. Locator resolves to a list of elements.
-   * 1. The number of elements equals the number of expected values in the array.
-   * 1. Elements from the list have text matching expected array values, one by one, in order.
+   * 1. Elements from a **subset** of this list contain text from the expected array, respectively.
+   * 1. The matching subset of elements has the same order as the expected array.
+   * 1. Each text value from the expected array is matched by some element from the list.
    *
    * For example, consider the following list:
    *
    * ```html
    * <ul>
-   *   <li>Text 1</li>
-   *   <li>Text 2</li>
-   *   <li>Text 3</li>
+   *   <li>Item Text 1</li>
+   *   <li>Item Text 2</li>
+   *   <li>Item Text 3</li>
    * </ul>
    * ```
    *
    * Let's see how we can use the assertion:
    *
    * ```js
-   * // ✓ Has the right items in the right order
-   * await expect(page.locator('ul > li')).toHaveText(['Text 1', 'Text 2', 'Text 3']);
+   * // ✓ Contains the right items in the right order
+   * await expect(page.locator('ul > li')).toContainText(['Text 1', 'Text 3']);
    *
    * // ✖ Wrong order
-   * await expect(page.locator('ul > li')).toHaveText(['Text 3', 'Text 2', 'Text 1']);
+   * await expect(page.locator('ul > li')).toContainText(['Text 3', 'Text 2']);
+   *
+   * // ✖ No item contains this text
+   * await expect(page.locator('ul > li')).toContainText(['Some 33']);
+   *
+   * // ✖ Locator points to the outer list element, not to the list items
+   * await expect(page.locator('ul')).toContainText(['Text 3']);
+   * ```
+   *
+   * @param expected Expected substring or RegExp or a list of those.
+   * @param options
+   */
+  toContainText(expected: string|RegExp|ReadonlyArray<string|RegExp>, options?: {
+    /**
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-contain-text-option-ignore-case)
+     * option takes precedence over the corresponding regular expression flag if specified.
+     */
+    ignoreCase?: boolean;
+
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+
+    /**
+     * Whether to use `element.innerText` instead of `element.textContent` when retrieving DOM node text.
+     */
+    useInnerText?: boolean;
+  }): Promise<void>;
+
+  /**
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with a given
+   * [accessible description](https://w3c.github.io/accname/#dfn-accessible-description).
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.getByTestId('save-button');
+   * await expect(locator).toHaveAccessibleDescription('Save results to disk');
+   * ```
+   *
+   * @param description Expected accessible description.
+   * @param options
+   */
+  toHaveAccessibleDescription(description: string|RegExp, options?: {
+    /**
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-accessible-description-option-ignore-case)
+     * option takes precedence over the corresponding regular expression flag if specified.
+     */
+    ignoreCase?: boolean;
+
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with a given
+   * [aria errormessage](https://w3c.github.io/aria/#aria-errormessage).
    *
-   * // ✖ Last item does not match
-   * await expect(page.locator('ul > li')).toHaveText(['Text 1', 'Text 2', 'Text']);
+   * **Usage**
    *
-   * // ✖ Locator points to the outer list element, not to the list items
-   * await expect(page.locator('ul')).toHaveText(['Text 1', 'Text 2', 'Text 3']);
+   * ```js
+   * const locator = page.getByTestId('username-input');
+   * await expect(locator).toHaveAccessibleErrorMessage('Username is required.');
    * ```
    *
-   * @param expected Expected string or RegExp or a list of those.
+   * @param errorMessage Expected accessible error message.
    * @param options
    */
-  toHaveText(expected: string|RegExp|ReadonlyArray<string|RegExp>, options?: {
+  toHaveAccessibleErrorMessage(errorMessage: string|RegExp, options?: {
     /**
-     * Whether to perform case-insensitive match. `ignoreCase` option takes precedence over the corresponding regular
-     * expression flag if specified.
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-accessible-error-message-option-ignore-case)
+     * option takes precedence over the corresponding regular expression flag if specified.
      */
     ignoreCase?: boolean;
 
@@ -7475,28 +8906,30 @@ interface LocatorAssertions {
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
     timeout?: number;
-
-    /**
-     * Whether to use `element.innerText` instead of `element.textContent` when retrieving DOM node text.
-     */
-    useInnerText?: boolean;
   }): Promise<void>;
 
   /**
-   * Ensures the {@link Locator} points to an element with the given input value. You can use regular expressions for
-   * the value as well.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with a given
+   * [accessible name](https://w3c.github.io/accname/#dfn-accessible-name).
    *
    * **Usage**
    *
    * ```js
-   * const locator = page.locator('input[type=number]');
-   * await expect(locator).toHaveValue(/[0-9]/);
+   * const locator = page.getByTestId('save-button');
+   * await expect(locator).toHaveAccessibleName('Save to disk');
    * ```
    *
-   * @param value Expected value.
+   * @param name Expected accessible name.
    * @param options
    */
-  toHaveValue(value: string|RegExp, options?: {
+  toHaveAccessibleName(name: string|RegExp, options?: {
+    /**
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-accessible-name-option-ignore-case)
+     * option takes precedence over the corresponding regular expression flag if specified.
+     */
+    ignoreCase?: boolean;
+
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7504,31 +8937,27 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * Ensures the {@link Locator} points to multi-select/combobox (i.e. a `select` with the `multiple` attribute) and the
-   * specified values are selected.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with given attribute.
    *
    * **Usage**
    *
-   * For example, given the following element:
-   *
-   * ```html
-   * <select id="favorite-colors" multiple>
-   *   <option value="R">Red</option>
-   *   <option value="G">Green</option>
-   *   <option value="B">Blue</option>
-   * </select>
-   * ```
-   *
    * ```js
-   * const locator = page.locator('id=favorite-colors');
-   * await locator.selectOption(['R', 'G']);
-   * await expect(locator).toHaveValues([/R/, /G/]);
+   * const locator = page.locator('input');
+   * await expect(locator).toHaveAttribute('type', 'text');
    * ```
    *
-   * @param values Expected options currently selected.
+   * @param name Attribute name.
+   * @param value Expected attribute value.
    * @param options
    */
-  toHaveValues(values: ReadonlyArray<string|RegExp>, options?: {
+  toHaveAttribute(name: string, value: string|RegExp, options?: {
+    /**
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-attribute-option-ignore-case)
+     * option takes precedence over the corresponding regular expression flag if specified.
+     */
+    ignoreCase?: boolean;
+
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7536,77 +8965,98 @@ interface LocatorAssertions {
   }): Promise<void>;
 
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain
-   * text `"error"`:
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with given attribute. The
+   * method will assert attribute presence.
    *
    * ```js
-   * await expect(locator).not.toContainText('error');
+   * const locator = page.locator('input');
+   * // Assert attribute existence.
+   * await expect(locator).toHaveAttribute('disabled');
+   * await expect(locator).not.toHaveAttribute('open');
    * ```
    *
+   * @param name Attribute name.
+   * @param options
    */
-  not: LocatorAssertions;
-}
+  toHaveAttribute(name: string, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
-/**
- * The {@link PageAssertions} class provides assertion methods that can be used to make assertions about the {@link
- * Page} state in the tests.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('navigates to login', async ({ page }) => {
- *   // ...
- *   await page.getByText('Sign in').click();
- *   await expect(page).toHaveURL(/.*\/login/);
- * });
- * ```
- *
- */
-interface PageAssertions {
   /**
-   * This function will wait until two consecutive page screenshots yield the same result, and then compare the last
-   * screenshot with the expectation.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with given CSS classes.
+   * When a string is provided, it must fully match the element's `class` attribute. To match individual classes use
+   * [expect(locator).toContainClass(expected[, options])](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-contain-class).
    *
    * **Usage**
    *
+   * ```html
+   * <div class='middle selected row' id='component'></div>
+   * ```
+   *
    * ```js
-   * await expect(page).toHaveScreenshot('image.png');
+   * const locator = page.locator('#component');
+   * await expect(locator).toHaveClass('middle selected row');
+   * await expect(locator).toHaveClass(/(^|\s)selected(\s|$)/);
    * ```
    *
-   * Note that screenshot assertions only work with Playwright test runner.
-   * @param name Snapshot name.
+   * When an array is passed, the method asserts that the list of elements located matches the corresponding list of
+   * expected class values. Each element's class attribute is matched against the corresponding string or regular
+   * expression in the array:
+   *
+   * ```js
+   * const locator = page.locator('.list > .component');
+   * await expect(locator).toHaveClass(['component', 'component selected', 'component']);
+   * ```
+   *
+   * @param expected Expected class or RegExp or a list of those.
    * @param options
    */
-  toHaveScreenshot(name: string|ReadonlyArray<string>, options?: PageAssertionsToHaveScreenshotOptions): Promise<void>;
+  toHaveClass(expected: string|RegExp|ReadonlyArray<string|RegExp>, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * This function will wait until two consecutive page screenshots yield the same result, and then compare the last
-   * screenshot with the expectation.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) resolves to an exact number of DOM nodes.
    *
    * **Usage**
    *
    * ```js
-   * await expect(page).toHaveScreenshot();
+   * const list = page.locator('list > .component');
+   * await expect(list).toHaveCount(3);
    * ```
    *
-   * Note that screenshot assertions only work with Playwright test runner.
+   * @param count Expected count.
    * @param options
    */
-  toHaveScreenshot(options?: PageAssertionsToHaveScreenshotOptions): Promise<void>;
+  toHaveCount(count: number, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * Ensures the page has the given title.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) resolves to an element with the given computed
+   * CSS style.
    *
    * **Usage**
    *
    * ```js
-   * await expect(page).toHaveTitle(/.*checkout/);
+   * const locator = page.getByRole('button');
+   * await expect(locator).toHaveCSS('display', 'flex');
    * ```
    *
-   * @param titleOrRegExp Expected title or RegExp.
+   * @param name CSS property name.
+   * @param value CSS property value.
    * @param options
    */
-  toHaveTitle(titleOrRegExp: string|RegExp, options?: {
+  toHaveCSS(name: string, value: string|RegExp, options?: {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7614,24 +9064,20 @@ interface PageAssertions {
   }): Promise<void>;
 
   /**
-   * Ensures the page is navigated to the given URL.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with the given DOM Node
+   * ID.
    *
    * **Usage**
    *
    * ```js
-   * await expect(page).toHaveURL(/.*checkout/);
+   * const locator = page.getByRole('textbox');
+   * await expect(locator).toHaveId('lastname');
    * ```
    *
-   * @param urlOrRegExp Expected URL string or RegExp.
+   * @param id Element id.
    * @param options
    */
-  toHaveURL(urlOrRegExp: string|RegExp, options?: {
-    /**
-     * Whether to perform case-insensitive match. `ignoreCase` option takes precedence over the corresponding regular
-     * expression flag if specified.
-     */
-    ignoreCase?: boolean;
-
+  toHaveId(id: string|RegExp, options?: {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
@@ -7639,60 +9085,98 @@ interface PageAssertions {
   }): Promise<void>;
 
   /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't
-   * contain `"error"`:
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with given JavaScript
+   * property. Note that this property can be of a primitive type as well as a plain serializable JavaScript object.
+   *
+   * **Usage**
    *
    * ```js
-   * await expect(page).not.toHaveURL('error');
+   * const locator = page.locator('.component');
+   * await expect(locator).toHaveJSProperty('loaded', true);
    * ```
    *
+   * @param name Property name.
+   * @param value Property value.
+   * @param options
    */
-  not: PageAssertions;
-}
+  toHaveJSProperty(name: string, value: any, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
-/**
- * Playwright provides methods for comparing page and element screenshots with expected values stored in files.
- *
- * ```js
- * expect(screenshot).toMatchSnapshot('landing-page.png');
- * ```
- *
- */
-interface SnapshotAssertions {
   /**
-   * **NOTE** To compare screenshots, use
-   * [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1)
-   * instead.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with a given
+   * [ARIA role](https://www.w3.org/TR/wai-aria-1.2/#roles).
    *
-   * Ensures that passed value, either a [string] or a [Buffer], matches the expected snapshot stored in the test
-   * snapshots directory.
+   * Note that role is matched as a string, disregarding the ARIA role hierarchy. For example, asserting  a superclass
+   * role `"checkbox"` on an element with a subclass role `"switch"` will fail.
    *
    * **Usage**
    *
    * ```js
-   * // Basic usage.
-   * expect(await page.screenshot()).toMatchSnapshot('landing-page.png');
+   * const locator = page.getByTestId('save-button');
+   * await expect(locator).toHaveRole('button');
+   * ```
    *
-   * // Pass options to customize the snapshot comparison and have a generated name.
-   * expect(await page.screenshot()).toMatchSnapshot('landing-page.png', {
-   *   maxDiffPixels: 27, // allow no more than 27 different pixels.
-   * });
+   * @param role Required aria role.
+   * @param options
+   */
+  toHaveRole(role: "alert"|"alertdialog"|"application"|"article"|"banner"|"blockquote"|"button"|"caption"|"cell"|"checkbox"|"code"|"columnheader"|"combobox"|"complementary"|"contentinfo"|"definition"|"deletion"|"dialog"|"directory"|"document"|"emphasis"|"feed"|"figure"|"form"|"generic"|"grid"|"gridcell"|"group"|"heading"|"img"|"insertion"|"link"|"list"|"listbox"|"listitem"|"log"|"main"|"marquee"|"math"|"meter"|"menu"|"menubar"|"menuitem"|"menuitemcheckbox"|"menuitemradio"|"navigation"|"none"|"note"|"option"|"paragraph"|"presentation"|"progressbar"|"radio"|"radiogroup"|"region"|"row"|"rowgroup"|"rowheader"|"scrollbar"|"search"|"searchbox"|"separator"|"slider"|"spinbutton"|"status"|"strong"|"subscript"|"superscript"|"switch"|"tab"|"table"|"tablist"|"tabpanel"|"term"|"textbox"|"time"|"timer"|"toolbar"|"tooltip"|"tree"|"treegrid"|"treeitem", options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
+  /**
+   * This function will wait until two consecutive locator screenshots yield the same result, and then compare the last
+   * screenshot with the expectation.
    *
-   * // Configure image matching threshold.
-   * expect(await page.screenshot()).toMatchSnapshot('landing-page.png', { threshold: 0.3 });
+   * **Usage**
    *
-   * // Bring some structure to your snapshot files by passing file path segments.
-   * expect(await page.screenshot()).toMatchSnapshot(['landing', 'step2.png']);
-   * expect(await page.screenshot()).toMatchSnapshot(['landing', 'step3.png']);
+   * ```js
+   * const locator = page.getByRole('button');
+   * await expect(locator).toHaveScreenshot('image.png');
    * ```
    *
-   * Learn more about [visual comparisons](https://playwright.dev/docs/test-snapshots).
-   *
-   * Note that matching snapshots only work with Playwright test runner.
+   * Note that screenshot assertions only work with Playwright test runner.
    * @param name Snapshot name.
    * @param options
    */
-  toMatchSnapshot(name: string|ReadonlyArray<string>, options?: {
+  toHaveScreenshot(name: string|ReadonlyArray<string>, options?: {
+    /**
+     * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
+     * treatment depending on their duration:
+     * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
+     * - infinite animations are canceled to initial state, and then played over after the screenshot.
+     *
+     * Defaults to `"disabled"` that disables animations.
+     */
+    animations?: "disabled"|"allow";
+
+    /**
+     * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
+     * changed.  Defaults to `"hide"`.
+     */
+    caret?: "hide"|"initial";
+
+    /**
+     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
+     * box `#FF00FF` (customized by
+     * [`maskColor`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-screenshot-1-option-mask-color))
+     * that completely covers its bounding box. The mask is also applied to invisible elements, see
+     * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
+     */
+    mask?: Array<Locator>;
+
+    /**
+     * Specify the color of the overlay box for masked elements, in
+     * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
+     */
+    maskColor?: string;
+
     /**
      * An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1`. Default is
      * configurable with `TestConfig.expect`. Unset by default.
@@ -7703,7 +9187,29 @@ interface SnapshotAssertions {
      * An acceptable amount of pixels that could be different. Default is configurable with `TestConfig.expect`. Unset by
      * default.
      */
-    maxDiffPixels?: number;
+    maxDiffPixels?: number;
+
+    /**
+     * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
+     * Defaults to `false`.
+     */
+    omitBackground?: boolean;
+
+    /**
+     * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
+     * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
+     * screenshots of high-dpi devices will be twice as large or even larger.
+     *
+     * Defaults to `"css"`.
+     */
+    scale?: "css"|"device";
+
+    /**
+     * File name containing the stylesheet to apply while making the screenshot. This is where you can hide dynamic
+     * elements, make elements invisible or change their properties to help you creating repeatable screenshots. This
+     * stylesheet pierces the Shadow DOM and applies to the inner frames.
+     */
+    stylePath?: string|Array<string>;
 
     /**
      * An acceptable perceived color difference in the [YIQ color space](https://en.wikipedia.org/wiki/YIQ) between the
@@ -7711,40 +9217,59 @@ interface SnapshotAssertions {
      * `TestConfig.expect`. Defaults to `0.2`.
      */
     threshold?: number;
-  }): void;
+
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * **NOTE** To compare screenshots, use
-   * [expect(page).toHaveScreenshot([options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-2)
-   * instead.
-   *
-   * Ensures that passed value, either a [string] or a [Buffer], matches the expected snapshot stored in the test
-   * snapshots directory.
+   * This function will wait until two consecutive locator screenshots yield the same result, and then compare the last
+   * screenshot with the expectation.
    *
    * **Usage**
    *
    * ```js
-   * // Basic usage and the file name is derived from the test name.
-   * expect(await page.screenshot()).toMatchSnapshot();
-   *
-   * // Pass options to customize the snapshot comparison and have a generated name.
-   * expect(await page.screenshot()).toMatchSnapshot({
-   *   maxDiffPixels: 27, // allow no more than 27 different pixels.
-   * });
-   *
-   * // Configure image matching threshold and snapshot name.
-   * expect(await page.screenshot()).toMatchSnapshot({
-   *   name: 'landing-page.png',
-   *   threshold: 0.3,
-   * });
+   * const locator = page.getByRole('button');
+   * await expect(locator).toHaveScreenshot();
    * ```
    *
-   * Learn more about [visual comparisons](https://playwright.dev/docs/test-snapshots).
-   *
-   * Note that matching snapshots only work with Playwright test runner.
+   * Note that screenshot assertions only work with Playwright test runner.
    * @param options
    */
-  toMatchSnapshot(options?: {
+  toHaveScreenshot(options?: {
+    /**
+     * When set to `"disabled"`, stops CSS animations, CSS transitions and Web Animations. Animations get different
+     * treatment depending on their duration:
+     * - finite animations are fast-forwarded to completion, so they'll fire `transitionend` event.
+     * - infinite animations are canceled to initial state, and then played over after the screenshot.
+     *
+     * Defaults to `"disabled"` that disables animations.
+     */
+    animations?: "disabled"|"allow";
+
+    /**
+     * When set to `"hide"`, screenshot will hide text caret. When set to `"initial"`, text caret behavior will not be
+     * changed.  Defaults to `"hide"`.
+     */
+    caret?: "hide"|"initial";
+
+    /**
+     * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
+     * box `#FF00FF` (customized by
+     * [`maskColor`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-screenshot-2-option-mask-color))
+     * that completely covers its bounding box. The mask is also applied to invisible elements, see
+     * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
+     */
+    mask?: Array<Locator>;
+
+    /**
+     * Specify the color of the overlay box for masked elements, in
+     * [CSS color format](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value). Default color is pink `#FF00FF`.
+     */
+    maskColor?: string;
+
     /**
      * An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1`. Default is
      * configurable with `TestConfig.expect`. Unset by default.
@@ -7758,9 +9283,26 @@ interface SnapshotAssertions {
     maxDiffPixels?: number;
 
     /**
-     * Snapshot name. If not passed, the test name and ordinals are used when called multiple times.
+     * Hides default white background and allows capturing screenshots with transparency. Not applicable to `jpeg` images.
+     * Defaults to `false`.
      */
-    name?: string|Array<string>;
+    omitBackground?: boolean;
+
+    /**
+     * When set to `"css"`, screenshot will have a single pixel per each css pixel on the page. For high-dpi devices, this
+     * will keep screenshots small. Using `"device"` option will produce a single pixel per each device pixel, so
+     * screenshots of high-dpi devices will be twice as large or even larger.
+     *
+     * Defaults to `"css"`.
+     */
+    scale?: "css"|"device";
+
+    /**
+     * File name containing the stylesheet to apply while making the screenshot. This is where you can hide dynamic
+     * elements, make elements invisible or change their properties to help you creating repeatable screenshots. This
+     * stylesheet pierces the Shadow DOM and applies to the inner frames.
+     */
+    stylePath?: string|Array<string>;
 
     /**
      * An acceptable perceived color difference in the [YIQ color space](https://en.wikipedia.org/wiki/YIQ) between the
@@ -7768,480 +9310,626 @@ interface SnapshotAssertions {
      * `TestConfig.expect`. Defaults to `0.2`.
      */
     threshold?: number;
-  }): void;
-}
 
-/**
- * `TestInfo` contains information about currently running test. It is available to test functions,
- * [test.beforeEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-before-each),
- * [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each),
- * [test.beforeAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-before-all) and
- * [test.afterAll([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-all) hooks, and
- * test-scoped fixtures. `TestInfo` provides utilities to control test execution: attach files, update test timeout,
- * determine which test is currently running and whether it was retried, etc.
- *
- * ```js
- * import { test, expect } from '@playwright/test';
- *
- * test('basic test', async ({ page }, testInfo) => {
- *   expect(testInfo.title).toBe('basic test');
- *   await page.screenshot(testInfo.outputPath('screenshot.png'));
- * });
- * ```
- *
- */
-export interface TestInfo {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
+
   /**
-   * Attach a value or a file from disk to the current test. Some reporters show test attachments. Either `path` or
-   * `body` must be specified, but not both.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with the given text. All
+   * nested elements will be considered when computing the text content of the element. You can use regular expressions
+   * for the value as well.
    *
-   * For example, you can attach a screenshot to the test:
+   * **Details**
+   *
+   * When `expected` parameter is a string, Playwright will normalize whitespaces and line breaks both in the actual
+   * text and in the expected string before matching. When regular expression is used, the actual text is matched as is.
+   *
+   * **Usage**
    *
    * ```js
-   * import { test, expect } from '@playwright/test';
+   * const locator = page.locator('.title');
+   * await expect(locator).toHaveText(/Welcome, Test User/);
+   * await expect(locator).toHaveText(/Welcome, .*\/);
+   * ```
    *
-   * test('basic test', async ({ page }, testInfo) => {
-   *   await page.goto('https://playwright.dev');
-   *   const screenshot = await page.screenshot();
-   *   await testInfo.attach('screenshot', { body: screenshot, contentType: 'image/png' });
-   * });
+   * If you pass an array as an expected value, the expectations are:
+   * 1. Locator resolves to a list of elements.
+   * 1. The number of elements equals the number of expected values in the array.
+   * 1. Elements from the list have text matching expected array values, one by one, in order.
+   *
+   * For example, consider the following list:
+   *
+   * ```html
+   * <ul>
+   *   <li>Text 1</li>
+   *   <li>Text 2</li>
+   *   <li>Text 3</li>
+   * </ul>
    * ```
    *
-   * Or you can attach files returned by your APIs:
+   * Let's see how we can use the assertion:
    *
    * ```js
-   * import { test, expect } from '@playwright/test';
-   * import { download } from './my-custom-helpers';
+   * // ✓ Has the right items in the right order
+   * await expect(page.locator('ul > li')).toHaveText(['Text 1', 'Text 2', 'Text 3']);
    *
-   * test('basic test', async ({}, testInfo) => {
-   *   const tmpPath = await download('a');
-   *   await testInfo.attach('downloaded', { path: tmpPath });
-   * });
+   * // ✖ Wrong order
+   * await expect(page.locator('ul > li')).toHaveText(['Text 3', 'Text 2', 'Text 1']);
+   *
+   * // ✖ Last item does not match
+   * await expect(page.locator('ul > li')).toHaveText(['Text 1', 'Text 2', 'Text']);
+   *
+   * // ✖ Locator points to the outer list element, not to the list items
+   * await expect(page.locator('ul')).toHaveText(['Text 1', 'Text 2', 'Text 3']);
    * ```
    *
-   * **NOTE** [testInfo.attach(name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-attach)
-   * automatically takes care of copying attached files to a location that is accessible to reporters. You can safely
-   * remove the attachment after awaiting the attach call.
-   * @param name Attachment name. The name will also be sanitized and used as the prefix of file name when saving to disk.
+   * @param expected Expected string or RegExp or a list of those.
    * @param options
    */
-  attach(name: string, options?: {
+  toHaveText(expected: string|RegExp|ReadonlyArray<string|RegExp>, options?: {
     /**
-     * Attachment body. Mutually exclusive with `path`.
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-locatorassertions#locator-assertions-to-have-text-option-ignore-case)
+     * option takes precedence over the corresponding regular expression flag if specified.
      */
-    body?: string|Buffer;
+    ignoreCase?: boolean;
 
     /**
-     * Content type of this attachment to properly present in the report, for example `'application/json'` or
-     * `'image/png'`. If omitted, content type is inferred based on the `path`, or defaults to `text/plain` for [string]
-     * attachments and `application/octet-stream` for [Buffer] attachments.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    contentType?: string;
+    timeout?: number;
 
     /**
-     * Path on the filesystem to the attached file. Mutually exclusive with `body`.
+     * Whether to use `element.innerText` instead of `element.textContent` when retrieving DOM node text.
      */
-    path?: string;
+    useInnerText?: boolean;
   }): Promise<void>;
 
   /**
-   * Marks the currently running test as "should fail". Playwright Test runs this test and ensures that it is actually
-   * failing. This is useful for documentation purposes to acknowledge that some functionality is broken until it is
-   * fixed. This is similar to
-   * [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail).
-   */
-  fail(): void;
-
-  /**
-   * Conditionally mark the currently running test as "should fail" with an optional description. This is similar to
-   * [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail).
-   * @param condition Test is marked as "should fail" when the condition is `true`.
-   * @param description Optional description that will be reflected in a test report.
-   */
-  fail(condition: boolean, description?: string): void;
-
-  /**
-   * Mark a test as "fixme", with the intention to fix it. Test is immediately aborted. This is similar to
-   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme).
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to an element with the given input
+   * value. You can use regular expressions for the value as well.
+   *
+   * **Usage**
+   *
+   * ```js
+   * const locator = page.locator('input[type=number]');
+   * await expect(locator).toHaveValue(/[0-9]/);
+   * ```
+   *
+   * @param value Expected value.
+   * @param options
    */
-  fixme(): void;
+  toHaveValue(value: string|RegExp, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * Conditionally mark the currently running test as "fixme" with an optional description. This is similar to
-   * [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme).
-   * @param condition Test is marked as "fixme" when the condition is `true`.
-   * @param description Optional description that will be reflected in a test report.
+   * Ensures the [Locator](https://playwright.dev/docs/api/class-locator) points to multi-select/combobox (i.e. a
+   * `select` with the `multiple` attribute) and the specified values are selected.
+   *
+   * **Usage**
+   *
+   * For example, given the following element:
+   *
+   * ```html
+   * <select id="favorite-colors" multiple>
+   *   <option value="R">Red</option>
+   *   <option value="G">Green</option>
+   *   <option value="B">Blue</option>
+   * </select>
+   * ```
+   *
+   * ```js
+   * const locator = page.locator('id=favorite-colors');
+   * await locator.selectOption(['R', 'G']);
+   * await expect(locator).toHaveValues([/R/, /G/]);
+   * ```
+   *
+   * @param values Expected options currently selected.
+   * @param options
    */
-  fixme(condition: boolean, description?: string): void;
+  toHaveValues(values: ReadonlyArray<string|RegExp>, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * Returns a path inside the [testInfo.outputDir](https://playwright.dev/docs/api/class-testinfo#test-info-output-dir)
-   * where the test can safely put a temporary file. Guarantees that tests running in parallel will not interfere with
-   * each other.
+   * Asserts that the target element matches the given [accessibility snapshot](https://playwright.dev/docs/aria-snapshots).
    *
-   * ```js
-   * import { test, expect } from '@playwright/test';
-   * import fs from 'fs';
+   * **Usage**
    *
-   * test('example test', async ({}, testInfo) => {
-   *   const file = testInfo.outputPath('dir', 'temporary-file.txt');
-   *   await fs.promises.writeFile(file, 'Put some data to the dir/temporary-file.txt', 'utf8');
-   * });
+   * ```js
+   * await page.goto('https://demo.playwright.dev/todomvc/');
+   * await expect(page.locator('body')).toMatchAriaSnapshot(`
+   *   - heading "todos"
+   *   - textbox "What needs to be done?"
+   * `);
    * ```
    *
-   * > Note that `pathSegments` accepts path segments to the test output directory such as
-   * `testInfo.outputPath('relative', 'path', 'to', 'output')`.
-   * > However, this path must stay within the
-   * [testInfo.outputDir](https://playwright.dev/docs/api/class-testinfo#test-info-output-dir) directory for each test
-   * (i.e. `test-results/a-test-title`), otherwise it will throw.
-   * @param pathSegments Path segments to append at the end of the resulting path.
+   * @param expected
+   * @param options
    */
-  outputPath(...pathSegments: ReadonlyArray<string>): string;
+  toMatchAriaSnapshot(expected: string, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * Changes the timeout for the currently running test. Zero means no timeout. Learn more about
-   * [various timeouts](https://playwright.dev/docs/test-timeouts).
+   * Asserts that the target element matches the given [accessibility snapshot](https://playwright.dev/docs/aria-snapshots).
    *
-   * Timeout is usually specified in the [configuration file](https://playwright.dev/docs/test-configuration), but it could be useful to
-   * change the timeout in certain scenarios:
+   * Snapshot is stored in a separate `.aria.yml` file in a location configured by
+   * `expect.toMatchAriaSnapshot.pathTemplate` and/or `snapshotPathTemplate` properties in the configuration file.
    *
-   * ```js
-   * import { test, expect } from '@playwright/test';
+   * **Usage**
    *
-   * test.beforeEach(async ({ page }, testInfo) => {
-   *   // Extend timeout for all tests running this hook by 30 seconds.
-   *   testInfo.setTimeout(testInfo.timeout + 30000);
-   * });
+   * ```js
+   * await expect(page.locator('body')).toMatchAriaSnapshot();
+   * await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'body.aria.yml' });
    * ```
    *
-   * @param timeout Timeout in milliseconds.
+   * @param options
    */
-  setTimeout(timeout: number): void;
+  toMatchAriaSnapshot(options?: {
+    /**
+     * Name of the snapshot to store in the snapshot folder corresponding to this test. Generates sequential names if not
+     * specified.
+     */
+    name?: string;
 
-  /**
-   * Unconditionally skip the currently running test. Test is immediately aborted. This is similar to
-   * [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip).
-   */
-  skip(): void;
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * Conditionally skips the currently running test with an optional description. This is similar to
-   * [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip).
-   * @param condition A skip condition. Test is skipped when the condition is `true`.
-   * @param description Optional description that will be reflected in a test report.
+   * Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain
+   * text `"error"`:
+   *
+   * ```js
+   * await expect(locator).not.toContainText('error');
+   * ```
+   *
    */
-  skip(condition: boolean, description?: string): void;
+  not: LocatorAssertions;
+}
 
+/**
+ * The [PageAssertions](https://playwright.dev/docs/api/class-pageassertions) class provides assertion methods that
+ * can be used to make assertions about the [Page](https://playwright.dev/docs/api/class-page) state in the tests.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('navigates to login', async ({ page }) => {
+ *   // ...
+ *   await page.getByText('Sign in').click();
+ *   await expect(page).toHaveURL(/.*\/login/);
+ * });
+ * ```
+ *
+ */
+interface PageAssertions {
   /**
-   * Marks the currently running test as "slow", giving it triple the default timeout. This is similar to
-   * [test.slow([condition, callback, description])](https://playwright.dev/docs/api/class-test#test-slow).
+   * This function will wait until two consecutive page screenshots yield the same result, and then compare the last
+   * screenshot with the expectation.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await expect(page).toHaveScreenshot('image.png');
+   * ```
+   *
+   * Note that screenshot assertions only work with Playwright test runner.
+   * @param name Snapshot name.
+   * @param options
    */
-  slow(): void;
+  toHaveScreenshot(name: string|ReadonlyArray<string>, options?: PageAssertionsToHaveScreenshotOptions): Promise<void>;
 
   /**
-   * Conditionally mark the currently running test as "slow" with an optional description, giving it triple the default
-   * timeout. This is similar to
-   * [test.slow([condition, callback, description])](https://playwright.dev/docs/api/class-test#test-slow).
-   * @param condition Test is marked as "slow" when the condition is `true`.
-   * @param description Optional description that will be reflected in a test report.
+   * This function will wait until two consecutive page screenshots yield the same result, and then compare the last
+   * screenshot with the expectation.
+   *
+   * **Usage**
+   *
+   * ```js
+   * await expect(page).toHaveScreenshot();
+   * ```
+   *
+   * Note that screenshot assertions only work with Playwright test runner.
+   * @param options
    */
-  slow(condition: boolean, description?: string): void;
+  toHaveScreenshot(options?: PageAssertionsToHaveScreenshotOptions): Promise<void>;
 
   /**
-   * Returns a path to a snapshot file with the given `pathSegments`. Learn more about
-   * [snapshots](https://playwright.dev/docs/test-snapshots).
+   * Ensures the page has the given title.
    *
-   * > Note that `pathSegments` accepts path segments to the snapshot file such as `testInfo.snapshotPath('relative',
-   * 'path', 'to', 'snapshot.png')`.
-   * > However, this path must stay within the snapshots directory for each test file (i.e. `a.spec.js-snapshots`),
-   * otherwise it will throw.
-   * @param pathSegments The name of the snapshot or the path segments to define the snapshot file path. Snapshots with the same name in the
-   * same test file are expected to be the same.
+   * **Usage**
+   *
+   * ```js
+   * await expect(page).toHaveTitle(/.*checkout/);
+   * ```
+   *
+   * @param titleOrRegExp Expected title or RegExp.
+   * @param options
    */
-  snapshotPath(...pathSegments: ReadonlyArray<string>): string;
+  toHaveTitle(titleOrRegExp: string|RegExp, options?: {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
+     */
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * The list of annotations applicable to the current test. Includes annotations from the test, annotations from all
-   * [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe) groups the
-   * test belongs to and file-level annotations for the test file.
+   * Ensures the page is navigated to the given URL.
    *
-   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+   * **Usage**
+   *
+   * ```js
+   * // Check for the page URL to be 'https://playwright.dev/docs/intro' (including query string)
+   * await expect(page).toHaveURL('https://playwright.dev/docs/intro');
+   *
+   * // Check for the page URL to contain 'doc', followed by an optional 's', followed by '/'
+   * await expect(page).toHaveURL(/docs?\//);
+   *
+   * // Check for the predicate to be satisfied
+   * // For example: verify query strings
+   * await expect(page).toHaveURL(url => {
+   *   const params = url.searchParams;
+   *   return params.has('search') && params.has('options') && params.get('id') === '5';
+   * });
+   * ```
+   *
+   * @param url Expected URL string, RegExp, or predicate receiving [URL] to match. When
+   * [`baseURL`](https://playwright.dev/docs/api/class-browser#browser-new-context-option-base-url) is provided via the
+   * context options and the `url` argument is a string, the two values are merged via the
+   * [`new URL()`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) constructor and used for the comparison
+   * against the current browser URL.
+   * @param options
    */
-  annotations: Array<{
+  toHaveURL(url: string|RegExp|((url: URL) => boolean), options?: {
     /**
-     * Annotation type, for example `'skip'` or `'fail'`.
+     * Whether to perform case-insensitive match.
+     * [`ignoreCase`](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-url-option-ignore-case)
+     * option takes precedence over the corresponding regular expression parameter if specified. A provided predicate
+     * ignores this flag.
      */
-    type: string;
+    ignoreCase?: boolean;
 
     /**
-     * Optional description.
+     * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
      */
-    description?: string;
-  }>;
+    timeout?: number;
+  }): Promise<void>;
 
   /**
-   * The list of files or buffers attached to the current test. Some reporters show test attachments.
+   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't
+   * contain `"error"`:
+   *
+   * ```js
+   * await expect(page).not.toHaveURL('error');
+   * ```
    *
-   * To add an attachment, use
-   * [testInfo.attach(name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-attach) instead of
-   * directly pushing onto this array.
    */
-  attachments: Array<{
-    /**
-     * Attachment name.
-     */
-    name: string;
+  not: PageAssertions;
+}
 
+/**
+ * Playwright provides methods for comparing page and element screenshots with expected values stored in files.
+ *
+ * ```js
+ * expect(screenshot).toMatchSnapshot('landing-page.png');
+ * ```
+ *
+ */
+interface SnapshotAssertions {
+  /**
+   * **NOTE** To compare screenshots, use
+   * [expect(page).toHaveScreenshot(name[, options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1)
+   * instead.
+   *
+   * Ensures that passed value, either a [string] or a [Buffer], matches the expected snapshot stored in the test
+   * snapshots directory.
+   *
+   * **Usage**
+   *
+   * ```js
+   * // Basic usage.
+   * expect(await page.screenshot()).toMatchSnapshot('landing-page.png');
+   *
+   * // Pass options to customize the snapshot comparison and have a generated name.
+   * expect(await page.screenshot()).toMatchSnapshot('landing-page.png', {
+   *   maxDiffPixels: 27, // allow no more than 27 different pixels.
+   * });
+   *
+   * // Configure image matching threshold.
+   * expect(await page.screenshot()).toMatchSnapshot('landing-page.png', { threshold: 0.3 });
+   *
+   * // Bring some structure to your snapshot files by passing file path segments.
+   * expect(await page.screenshot()).toMatchSnapshot(['landing', 'step2.png']);
+   * expect(await page.screenshot()).toMatchSnapshot(['landing', 'step3.png']);
+   * ```
+   *
+   * Learn more about [visual comparisons](https://playwright.dev/docs/test-snapshots).
+   *
+   * Note that matching snapshots only work with Playwright test runner.
+   * @param name Snapshot name.
+   * @param options
+   */
+  toMatchSnapshot(name: string|ReadonlyArray<string>, options?: {
     /**
-     * Content type of this attachment to properly present in the report, for example `'application/json'` or
-     * `'image/png'`.
+     * An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1`. Default is
+     * configurable with `TestConfig.expect`. Unset by default.
      */
-    contentType: string;
+    maxDiffPixelRatio?: number;
 
     /**
-     * Optional path on the filesystem to the attached file.
+     * An acceptable amount of pixels that could be different. Default is configurable with `TestConfig.expect`. Unset by
+     * default.
      */
-    path?: string;
+    maxDiffPixels?: number;
 
     /**
-     * Optional attachment body used instead of a file.
+     * An acceptable perceived color difference in the [YIQ color space](https://en.wikipedia.org/wiki/YIQ) between the
+     * same pixel in compared images, between zero (strict) and one (lax), default is configurable with
+     * `TestConfig.expect`. Defaults to `0.2`.
      */
-    body?: Buffer;
-  }>;
-
-  /**
-   * Column number where the currently running test is declared.
-   */
-  column: number;
-
-  /**
-   * Processed configuration from the [configuration file](https://playwright.dev/docs/test-configuration).
-   */
-  config: FullConfig;
-
-  /**
-   * The number of milliseconds the test took to finish. Always zero before the test finishes, either successfully or
-   * not. Can be used in
-   * [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each) hook.
-   */
-  duration: number;
-
-  /**
-   * First error thrown during test execution, if any. This is equal to the first element in
-   * [testInfo.errors](https://playwright.dev/docs/api/class-testinfo#test-info-errors).
-   */
-  error?: TestInfoError;
-
-  /**
-   * Errors thrown during test execution, if any.
-   */
-  errors: Array<TestInfoError>;
-
-  /**
-   * Expected status for the currently running test. This is usually `'passed'`, except for a few cases:
-   * - `'skipped'` for skipped tests, e.g. with
-   *   [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip);
-   * - `'failed'` for tests marked as failed with
-   *   [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail).
+    threshold?: number;
+  }): void;
+
+  /**
+   * **NOTE** To compare screenshots, use
+   * [expect(page).toHaveScreenshot([options])](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-2)
+   * instead.
    *
-   * Expected status is usually compared with the actual
-   * [testInfo.status](https://playwright.dev/docs/api/class-testinfo#test-info-status):
+   * Ensures that passed value, either a [string] or a [Buffer], matches the expected snapshot stored in the test
+   * snapshots directory.
+   *
+   * **Usage**
    *
    * ```js
-   * import { test, expect } from '@playwright/test';
+   * // Basic usage and the file name is derived from the test name.
+   * expect(await page.screenshot()).toMatchSnapshot();
    *
-   * test.afterEach(async ({}, testInfo) => {
-   *   if (testInfo.status !== testInfo.expectedStatus)
-   *     console.log(`${testInfo.title} did not run as expected!`);
+   * // Pass options to customize the snapshot comparison and have a generated name.
+   * expect(await page.screenshot()).toMatchSnapshot({
+   *   maxDiffPixels: 27, // allow no more than 27 different pixels.
+   * });
+   *
+   * // Configure image matching threshold and snapshot name.
+   * expect(await page.screenshot()).toMatchSnapshot({
+   *   name: 'landing-page.png',
+   *   threshold: 0.3,
    * });
    * ```
    *
+   * Learn more about [visual comparisons](https://playwright.dev/docs/test-snapshots).
+   *
+   * Note that matching snapshots only work with Playwright test runner.
+   * @param options
    */
-  expectedStatus: "passed"|"failed"|"timedOut"|"skipped"|"interrupted";
+  toMatchSnapshot(options?: {
+    /**
+     * An acceptable ratio of pixels that are different to the total amount of pixels, between `0` and `1`. Default is
+     * configurable with `TestConfig.expect`. Unset by default.
+     */
+    maxDiffPixelRatio?: number;
+
+    /**
+     * An acceptable amount of pixels that could be different. Default is configurable with `TestConfig.expect`. Unset by
+     * default.
+     */
+    maxDiffPixels?: number;
+
+    /**
+     * Snapshot name. If not passed, the test name and ordinals are used when called multiple times.
+     */
+    name?: string|Array<string>;
+
+    /**
+     * An acceptable perceived color difference in the [YIQ color space](https://en.wikipedia.org/wiki/YIQ) between the
+     * same pixel in compared images, between zero (strict) and one (lax), default is configurable with
+     * `TestConfig.expect`. Defaults to `0.2`.
+     */
+    threshold?: number;
+  }): void;
+}
 
+/**
+ * Represents a location in the source code where [TestCase] or [Suite] is defined.
+ */
+export interface Location {
   /**
-   * Absolute path to a file where the currently running test is declared.
+   * Column number in the source file.
    */
-  file: string;
+  column: number;
 
   /**
-   * Test function as passed to `test(title, testFunction)`.
+   * Path to the source file.
    */
-  fn: Function;
+  file: string;
 
   /**
-   * Line number where the currently running test is declared.
+   * Line number in the source file.
    */
   line: number;
+}
 
+/**
+ * Information about an error thrown during test execution.
+ */
+export interface TestInfoError {
   /**
-   * Absolute path to the output directory for this specific test run. Each test run gets its own directory so they
-   * cannot conflict.
+   * Error cause. Set when there is a
+   * [cause](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause) for the
+   * error. Will be `undefined` if there is no cause or if the cause is not an instance of [Error].
    */
-  outputDir: string;
+  cause?: TestInfoError;
 
   /**
-   * The index of the worker between `0` and `workers - 1`. It is guaranteed that workers running at the same time have
-   * a different `parallelIndex`. When a worker is restarted, for example after a failure, the new worker process has
-   * the same `parallelIndex`.
-   *
-   * Also available as `process.env.TEST_PARALLEL_INDEX`. Learn more about
-   * [parallelism and sharding](https://playwright.dev/docs/test-parallel) with Playwright Test.
+   * Error message. Set when [Error] (or its subclass) has been thrown.
    */
-  parallelIndex: number;
+  message?: string;
 
   /**
-   * Processed project configuration from the [configuration file](https://playwright.dev/docs/test-configuration).
+   * Error stack. Set when [Error] (or its subclass) has been thrown.
    */
-  project: FullProject;
+  stack?: string;
 
   /**
-   * Specifies a unique repeat index when running in "repeat each" mode. This mode is enabled by passing `--repeat-each`
-   * to the [command line](https://playwright.dev/docs/test-cli).
+   * The value that was thrown. Set when anything except the [Error] (or its subclass) has been thrown.
    */
-  repeatEachIndex: number;
+  value?: string;
+}
 
+/**
+ * `TestStepInfo` contains information about currently running test step. It is passed as an argument to the step
+ * function. `TestStepInfo` provides utilities to control test step execution.
+ *
+ * ```js
+ * import { test, expect } from '@playwright/test';
+ *
+ * test('basic test', async ({ page, browserName }) => {
+ *   await test.step('check some behavior', async step => {
+ *     step.skip(browserName === 'webkit', 'The feature is not available in WebKit');
+ *     // ... rest of the step code
+ *   });
+ * });
+ * ```
+ *
+ */
+export interface TestStepInfo {
   /**
-   * Specifies the retry number when the test is retried after a failure. The first test run has
-   * [testInfo.retry](https://playwright.dev/docs/api/class-testinfo#test-info-retry) equal to zero, the first retry has
-   * it equal to one, and so on. Learn more about [retries](https://playwright.dev/docs/test-retries#retries).
+   * Attach a value or a file from disk to the current test step. Some reporters show test step attachments. Either
+   * [`path`](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-attach-option-path) or
+   * [`body`](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-attach-option-body) must be specified,
+   * but not both. Calling this method will attribute the attachment to the step, as opposed to
+   * [testInfo.attach(name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-attach) which stores
+   * all attachments at the test level.
+   *
+   * For example, you can attach a screenshot to the test step:
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.beforeEach(async ({}, testInfo) => {
-   *   // You can access testInfo.retry in any hook or fixture.
-   *   if (testInfo.retry > 0)
-   *     console.log(`Retrying!`);
+   * test('basic test', async ({ page }) => {
+   *   await page.goto('https://playwright.dev');
+   *   await test.step('check page rendering', async step => {
+   *     const screenshot = await page.screenshot();
+   *     await step.attach('screenshot', { body: screenshot, contentType: 'image/png' });
+   *   });
    * });
+   * ```
    *
-   * test('my test', async ({ page }, testInfo) => {
-   *   // Here we clear some server-side state when retrying.
-   *   if (testInfo.retry)
-   *     await cleanSomeCachesOnTheServer();
-   *   // ...
+   * Or you can attach files returned by your APIs:
+   *
+   * ```js
+   * import { test, expect } from '@playwright/test';
+   * import { download } from './my-custom-helpers';
+   *
+   * test('basic test', async ({}) => {
+   *   await test.step('check download behavior', async step => {
+   *     const tmpPath = await download('a');
+   *     await step.attach('downloaded', { path: tmpPath });
+   *   });
    * });
    * ```
    *
-   */
-  retry: number;
-
-  /**
-   * Absolute path to the snapshot output directory for this specific test. Each test suite gets its own directory so
-   * they cannot conflict.
+   * **NOTE**
+   * [testStepInfo.attach(name[, options])](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-attach)
+   * automatically takes care of copying attached files to a location that is accessible to reporters. You can safely
+   * remove the attachment after awaiting the attach call.
    *
-   * This property does not account for the
-   * [testProject.snapshotPathTemplate](https://playwright.dev/docs/api/class-testproject#test-project-snapshot-path-template)
-   * configuration.
+   * @param name Attachment name. The name will also be sanitized and used as the prefix of file name when saving to disk.
+   * @param options
    */
-  snapshotDir: string;
+  attach(name: string, options?: {
+    /**
+     * Attachment body. Mutually exclusive with
+     * [`path`](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-attach-option-path).
+     */
+    body?: string|Buffer;
 
-  /**
-   * **NOTE** Use of [testInfo.snapshotSuffix](https://playwright.dev/docs/api/class-testinfo#test-info-snapshot-suffix)
-   * is discouraged. Please use
-   * [testConfig.snapshotPathTemplate](https://playwright.dev/docs/api/class-testconfig#test-config-snapshot-path-template)
-   * to configure snapshot paths.
-   *
-   * Suffix used to differentiate snapshots between multiple test configurations. For example, if snapshots depend on
-   * the platform, you can set `testInfo.snapshotSuffix` equal to `process.platform`. In this case
-   * `expect(value).toMatchSnapshot(snapshotName)` will use different snapshots depending on the platform. Learn more
-   * about [snapshots](https://playwright.dev/docs/test-snapshots).
-   */
-  snapshotSuffix: string;
+    /**
+     * Content type of this attachment to properly present in the report, for example `'application/json'` or
+     * `'image/png'`. If omitted, content type is inferred based on the
+     * [`path`](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-attach-option-path), or defaults to
+     * `text/plain` for [string] attachments and `application/octet-stream` for [Buffer] attachments.
+     */
+    contentType?: string;
+
+    /**
+     * Path on the filesystem to the attached file. Mutually exclusive with
+     * [`body`](https://playwright.dev/docs/api/class-teststepinfo#test-step-info-attach-option-body).
+     */
+    path?: string;
+  }): Promise<void>;
 
   /**
-   * Actual status for the currently running test. Available after the test has finished in
-   * [test.afterEach([title, hookFunction])](https://playwright.dev/docs/api/class-test#test-after-each) hook and
-   * fixtures.
+   * Abort the currently running step and mark it as skipped. Useful for steps that are currently failing and planned
+   * for a near-term fix.
    *
-   * Status is usually compared with the
-   * [testInfo.expectedStatus](https://playwright.dev/docs/api/class-testinfo#test-info-expected-status):
+   * **Usage**
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.afterEach(async ({}, testInfo) => {
-   *   if (testInfo.status !== testInfo.expectedStatus)
-   *     console.log(`${testInfo.title} did not run as expected!`);
+   * test('my test', async ({ page }) => {
+   *   await test.step('check expectations', async step => {
+   *     step.skip();
+   *     // step body below will not run
+   *     // ...
+   *   });
    * });
    * ```
    *
    */
-  status?: "passed"|"failed"|"timedOut"|"skipped"|"interrupted";
-
-  /**
-   * Tags that apply to the test. Learn more about [tags](https://playwright.dev/docs/test-annotations#tag-tests).
-   *
-   * Note that any changes made to this list while the test is running will not be visible to test reporters.
-   */
-  tags: Array<string>;
-
-  /**
-   * Test id matching the test case id in the reporter API.
-   */
-  testId: string;
+  skip(): void;
 
   /**
-   * Timeout in milliseconds for the currently running test. Zero means no timeout. Learn more about
-   * [various timeouts](https://playwright.dev/docs/test-timeouts).
+   * Conditionally abort the currently running step and mark it as skipped with an optional description. Useful for
+   * steps that should not be executed in some cases.
    *
-   * Timeout is usually specified in the [configuration file](https://playwright.dev/docs/test-configuration)
+   * **Usage**
    *
    * ```js
    * import { test, expect } from '@playwright/test';
    *
-   * test.beforeEach(async ({ page }, testInfo) => {
-   *   // Extend timeout for all tests running this hook by 30 seconds.
-   *   testInfo.setTimeout(testInfo.timeout + 30000);
+   * test('my test', async ({ page, isMobile }) => {
+   *   await test.step('check desktop expectations', async step => {
+   *     step.skip(isMobile, 'not present in the mobile layout');
+   *     // step body below will not run
+   *     // ...
+   *   });
    * });
    * ```
    *
+   * @param condition A skip condition. Test step is skipped when the condition is `true`.
+   * @param description Optional description that will be reflected in a test report.
    */
-  timeout: number;
-
-  /**
-   * The title of the currently running test as passed to `test(title, testFunction)`.
-   */
-  title: string;
+  skip(condition: boolean, description?: string): void;
 
   /**
-   * The full title path starting with the project.
+   * The full title path starting with the test file name, including the step titles. See also
+   * [testInfo.titlePath](https://playwright.dev/docs/api/class-testinfo#test-info-title-path).
    */
   titlePath: Array<string>;
-
-  /**
-   * The unique index of the worker process that is running the test. When a worker is restarted, for example after a
-   * failure, the new worker process gets a new unique `workerIndex`.
-   *
-   * Also available as `process.env.TEST_WORKER_INDEX`. Learn more about [parallelism and sharding](https://playwright.dev/docs/test-parallel)
-   * with Playwright Test.
-   */
-  workerIndex: number;
-}
-
-/**
- * Information about an error thrown during test execution.
- */
-export interface TestInfoError {
-  /**
-   * Error message. Set when [Error] (or its subclass) has been thrown.
-   */
-  message?: string;
-
-  /**
-   * Error stack. Set when [Error] (or its subclass) has been thrown.
-   */
-  stack?: string;
-
-  /**
-   * The value that was thrown. Set when anything except the [Error] (or its subclass) has been thrown.
-   */
-  value?: string;
 }
 
 /**
  * `WorkerInfo` contains information about the worker that is running tests and is available to worker-scoped
- * fixtures. `WorkerInfo` is a subset of {@link TestInfo} that is available in many other places.
+ * fixtures. `WorkerInfo` is a subset of [TestInfo](https://playwright.dev/docs/api/class-testinfo) that is available
+ * in many other places.
  */
 export interface WorkerInfo {
   /**
@@ -8324,7 +10012,10 @@ export interface PageAssertionsToHaveScreenshotOptions {
 
   /**
    * Specify locators that should be masked when the screenshot is taken. Masked elements will be overlaid with a pink
-   * box `#FF00FF` (customized by `maskColor`) that completely covers its bounding box.
+   * box `#FF00FF` (customized by
+   * [`maskColor`](https://playwright.dev/docs/api/class-pageassertions#page-assertions-to-have-screenshot-1-option-mask-color))
+   * that completely covers its bounding box. The mask is also applied to invisible elements, see
+   * [Matching only visible elements](https://playwright.dev/docs/locators#matching-only-visible-elements) to disable that.
    */
   mask?: Array<Locator>;
 
@@ -8397,11 +10088,29 @@ interface TestConfigWebServer {
    */
   env?: { [key: string]: string; };
 
+  /**
+   * How to shut down the process. If unspecified, the process group is forcefully `SIGKILL`ed. If set to `{ signal:
+   * 'SIGTERM', timeout: 500 }`, the process group is sent a `SIGTERM` signal, followed by `SIGKILL` if it doesn't exit
+   * within 500ms. You can also use `SIGINT` as the signal instead. A `0` timeout means no `SIGKILL` will be sent.
+   * Windows doesn't support `SIGTERM` and `SIGINT` signals, so this option is ignored on Windows. Note that shutting
+   * down a Docker container requires `SIGTERM`.
+   */
+  gracefulShutdown?: {
+    signal: "SIGINT"|"SIGTERM";
+
+    timeout: number;
+  };
+
   /**
    * Whether to ignore HTTPS errors when fetching the `url`. Defaults to `false`.
    */
   ignoreHTTPSErrors?: boolean;
 
+  /**
+   * Specifies a custom name for the web server. This name will be prefixed to log messages. Defaults to `[WebServer]`.
+   */
+  name?: string;
+
   /**
    * The port that your http server is expected to appear on. It does wait until it accepts connections. Either `port`
    * or `url` should be specified.
@@ -8417,15 +10126,15 @@ interface TestConfigWebServer {
   reuseExistingServer?: boolean;
 
   /**
-   * If `"pipe"`, it will pipe the stdout of the command to the process stdout. If `"ignore"`, it will ignore the stdout
-   * of the command. Default to `"ignore"`.
+   * Whether to pipe the stderr of the command to the process stderr or ignore it. Defaults to `"pipe"`.
    */
-  stdout?: "pipe"|"ignore";
+  stderr?: "pipe"|"ignore";
 
   /**
-   * Whether to pipe the stderr of the command to the process stderr or ignore it. Defaults to `"pipe"`.
+   * If `"pipe"`, it will pipe the stdout of the command to the process stdout. If `"ignore"`, it will ignore the stdout
+   * of the command. Default to `"ignore"`.
    */
-  stderr?: "pipe"|"ignore";
+  stdout?: "pipe"|"ignore";
 
   /**
    * How long to wait for the process to start up and be available in milliseconds. Defaults to 60000.
diff --git a/packages/playwright/types/testReporter.d.ts b/packages/playwright/types/testReporter.d.ts
index 52073066f0efb..d03244a1ec7b4 100644
--- a/packages/playwright/types/testReporter.d.ts
+++ b/packages/playwright/types/testReporter.d.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription, FullConfig, FullProject } from './test';
-export type { FullConfig, FullProject, TestStatus } from './test';
+import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription, FullConfig, FullProject, Location } from './test';
+export type { FullConfig, FullProject, TestStatus, Location } from './test';
 
 /**
  * Result of the full test run.
@@ -94,18 +94,20 @@ export interface FullResult {
  *
  * Here is a typical order of reporter calls:
  * - [reporter.onBegin(config, suite)](https://playwright.dev/docs/api/class-reporter#reporter-on-begin) is called
- *   once with a root suite that contains all other suites and tests. Learn more about [suites hierarchy]{@link
- *   Suite}.
+ *   once with a root suite that contains all other suites and tests. Learn more about
+ *   [suites hierarchy][Suite](https://playwright.dev/docs/api/class-suite).
  * - [reporter.onTestBegin(test, result)](https://playwright.dev/docs/api/class-reporter#reporter-on-test-begin) is
- *   called for each test run. It is given a {@link TestCase} that is executed, and a {@link TestResult} that is
- *   almost empty. Test result will be populated while the test runs (for example, with steps and stdio) and will
- *   get final `status` once the test finishes.
+ *   called for each test run. It is given a [TestCase](https://playwright.dev/docs/api/class-testcase) that is
+ *   executed, and a [TestResult](https://playwright.dev/docs/api/class-testresult) that is almost empty. Test
+ *   result will be populated while the test runs (for example, with steps and stdio) and will get final `status`
+ *   once the test finishes.
  * - [reporter.onStepBegin(test, result, step)](https://playwright.dev/docs/api/class-reporter#reporter-on-step-begin)
  *   and
  *   [reporter.onStepEnd(test, result, step)](https://playwright.dev/docs/api/class-reporter#reporter-on-step-end)
  *   are called for each executed step inside the test. When steps are executed, test run has not finished yet.
  * - [reporter.onTestEnd(test, result)](https://playwright.dev/docs/api/class-reporter#reporter-on-test-end) is
- *   called when test run has finished. By this time, {@link TestResult} is complete and you can use
+ *   called when test run has finished. By this time, [TestResult](https://playwright.dev/docs/api/class-testresult)
+ *   is complete and you can use
  *   [testResult.status](https://playwright.dev/docs/api/class-testresult#test-result-status),
  *   [testResult.error](https://playwright.dev/docs/api/class-testresult#test-result-error) and more.
  * - [reporter.onEnd(result)](https://playwright.dev/docs/api/class-reporter#reporter-on-end) is called once after
@@ -128,12 +130,13 @@ export interface FullResult {
  * **Merged report API notes**
  *
  * When merging multiple [`blob`](https://playwright.dev/docs/test-reporters#blob-reporter) reports via
- * [`merge-reports`](https://playwright.dev/docs/test-sharding#merge-reports-cli) CLI command, the same {@link Reporter} API is called to
- * produce final reports and all existing reporters should work without any changes. There some subtle differences
- * though which might affect some custom reporters.
- * - Projects from different shards are always kept as separate {@link TestProject} objects. E.g. if project
- *   'Desktop Chrome' was sharded across 5 machines then there will be 5 instances of projects with the same name in
- *   the config passed to
+ * [`merge-reports`](https://playwright.dev/docs/test-sharding#merge-reports-cli) CLI command, the same
+ * [Reporter](https://playwright.dev/docs/api/class-reporter) API is called to produce final reports and all existing
+ * reporters should work without any changes. There some subtle differences though which might affect some custom
+ * reporters.
+ * - Projects from different shards are always kept as separate
+ *   [TestProject](https://playwright.dev/docs/api/class-testproject) objects. E.g. if project 'Desktop Chrome' was
+ *   sharded across 5 machines then there will be 5 instances of projects with the same name in the config passed to
  *   [reporter.onBegin(config, suite)](https://playwright.dev/docs/api/class-reporter#reporter-on-begin).
  */
 export interface Reporter {
@@ -151,8 +154,8 @@ export interface Reporter {
    */
   onEnd?(result: FullResult): Promise<{ status?: FullResult['status'] } | undefined | void> | void;
   /**
-   * Called once before running tests. All tests have been already discovered and put into a hierarchy of {@link
-   * Suite}s.
+   * Called once before running tests. All tests have been already discovered and put into a hierarchy of
+   * [Suite](https://playwright.dev/docs/api/class-suite)s.
    * @param config Resolved configuration.
    * @param suite The root suite that contains all projects, files and test cases.
    */
@@ -288,6 +291,7 @@ export interface JSONReportError {
 
 export interface JSONReportTestResult {
   workerIndex: number;
+  parallelIndex: number;
   status: TestStatus | undefined;
   duration: number;
   error: TestError | undefined;
@@ -303,6 +307,7 @@ export interface JSONReportTestResult {
     body?: string;
     contentType: string;
   }[];
+  annotations: { type: string, description?: string }[];
   errorLocation?: Location;
 }
 
@@ -319,38 +324,18 @@ export type JSONReportSTDIOEntry = { text: string } | { buffer: string };
 export {};
 
 
-/**
- * Represents a location in the source code where {@link TestCase} or {@link Suite} is defined.
- */
-export interface Location {
-  /**
-   * Column number in the source file.
-   */
-  column: number;
-
-  /**
-   * Path to the source file.
-   */
-  file: string;
-
-  /**
-   * Line number in the source file.
-   */
-  line: number;
-}
-
 /**
  * `Suite` is a group of tests. All tests in Playwright Test form the following hierarchy:
- * - Root suite has a child suite for each {@link FullProject}.
+ * - Root suite has a child suite for each [FullProject](https://playwright.dev/docs/api/class-fullproject).
  *   - Project suite #1. Has a child suite for each test file in the project.
  *     - File suite #1
- *       - {@link TestCase} #1
- *       - {@link TestCase} #2
+ *       - [TestCase](https://playwright.dev/docs/api/class-testcase) #1
+ *       - [TestCase](https://playwright.dev/docs/api/class-testcase) #2
  *       - Suite corresponding to a
  *         [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe)
  *         group
- *         - {@link TestCase} #1 in a group
- *         - {@link TestCase} #2 in a group
+ *         - [TestCase](https://playwright.dev/docs/api/class-testcase) #1 in a group
+ *         - [TestCase](https://playwright.dev/docs/api/class-testcase) #2 in a group
  *       - < more test cases ... >
  *     - File suite #2
  *     - < more file suites ... >
@@ -396,7 +381,7 @@ export interface Suite {
   parent?: Suite;
 
   /**
-   * Child suites. See {@link Suite} for the hierarchy of suites.
+   * Child suites. See [Suite](https://playwright.dev/docs/api/class-suite) for the hierarchy of suites.
    */
   suites: Array<Suite>;
 
@@ -453,23 +438,8 @@ export interface TestCase {
   titlePath(): Array<string>;
 
   /**
-   * The list of annotations applicable to the current test. Includes:
-   * - annotations defined on the test or suite via
-   *   [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) and
-   *   [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe);
-   * - annotations implicitly added by methods
-   *   [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip),
-   *   [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
-   *   and
-   *   [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail);
-   * - annotations appended to
-   *   [testInfo.annotations](https://playwright.dev/docs/api/class-testinfo#test-info-annotations) during the test
-   *   execution.
-   *
-   * Annotations are available during test execution through
-   * [testInfo.annotations](https://playwright.dev/docs/api/class-testinfo#test-info-annotations).
-   *
-   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+   * [testResult.annotations](https://playwright.dev/docs/api/class-testresult#test-result-annotations) of the last test
+   * run.
    */
   annotations: Array<{
     /**
@@ -481,6 +451,11 @@ export interface TestCase {
      * Optional description.
      */
     description?: string;
+
+    /**
+     * Optional location in the source where the annotation is added.
+     */
+    location?: Location;
   }>;
 
   /**
@@ -571,6 +546,13 @@ export interface TestCase {
  * Information about an error thrown during test execution.
  */
 export interface TestError {
+  /**
+   * Error cause. Set when there is a
+   * [cause](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause) for the
+   * error. Will be `undefined` if there is no cause or if the cause is not an instance of [Error].
+   */
+  cause?: TestError;
+
   /**
    * Error location in the source code.
    */
@@ -598,9 +580,45 @@ export interface TestError {
 }
 
 /**
- * A result of a single {@link TestCase} run.
+ * A result of a single [TestCase](https://playwright.dev/docs/api/class-testcase) run.
  */
 export interface TestResult {
+  /**
+   * The list of annotations applicable to the current test. Includes:
+   * - annotations defined on the test or suite via
+   *   [test.(call)(title[, details, body])](https://playwright.dev/docs/api/class-test#test-call) and
+   *   [test.describe([title, details, callback])](https://playwright.dev/docs/api/class-test#test-describe);
+   * - annotations implicitly added by methods
+   *   [test.skip([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-skip),
+   *   [test.fixme([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fixme)
+   *   and
+   *   [test.fail([title, details, body, condition, callback, description])](https://playwright.dev/docs/api/class-test#test-fail);
+   * - annotations appended to
+   *   [testInfo.annotations](https://playwright.dev/docs/api/class-testinfo#test-info-annotations) during the test
+   *   execution.
+   *
+   * Annotations are available during test execution through
+   * [testInfo.annotations](https://playwright.dev/docs/api/class-testinfo#test-info-annotations).
+   *
+   * Learn more about [test annotations](https://playwright.dev/docs/test-annotations).
+   */
+  annotations: Array<{
+    /**
+     * Annotation type, for example `'skip'` or `'fail'`.
+     */
+    type: string;
+
+    /**
+     * Optional description.
+     */
+    description?: string;
+
+    /**
+     * Optional location in the source where the annotation is added.
+     */
+    location?: Location;
+  }>;
+
   /**
    * The list of files or buffers attached during the test execution through
    * [testInfo.attachments](https://playwright.dev/docs/api/class-testinfo#test-info-attachments).
@@ -651,7 +669,7 @@ export interface TestResult {
   parallelIndex: number;
 
   /**
-   * When test is retries multiple times, each retry attempt is given a sequential number.
+   * When test is retried multiple times, each retry attempt is given a sequential number.
    *
    * Learn more about [test retries](https://playwright.dev/docs/test-retries#retries).
    */
@@ -701,12 +719,61 @@ export interface TestStep {
    */
   titlePath(): Array<string>;
 
+  /**
+   * The list of annotations applicable to the current test step.
+   */
+  annotations: Array<{
+    /**
+     * Annotation type, for example `'skip'`.
+     */
+    type: string;
+
+    /**
+     * Optional description.
+     */
+    description?: string;
+
+    /**
+     * Optional location in the source where the annotation is added.
+     */
+    location?: Location;
+  }>;
+
+  /**
+   * The list of files or buffers attached in the step execution through
+   * [testInfo.attach(name[, options])](https://playwright.dev/docs/api/class-testinfo#test-info-attach).
+   */
+  attachments: Array<{
+    /**
+     * Attachment name.
+     */
+    name: string;
+
+    /**
+     * Content type of this attachment to properly present in the report, for example `'application/json'` or
+     * `'image/png'`.
+     */
+    contentType: string;
+
+    /**
+     * Optional path on the filesystem to the attached file.
+     */
+    path?: string;
+
+    /**
+     * Optional attachment body used instead of a file.
+     */
+    body?: Buffer;
+  }>;
+
   /**
    * Step category to differentiate steps with different origin and verbosity. Built-in categories are:
-   * - `hook` for fixtures and hooks initialization and teardown
    * - `expect` for expect calls
+   * - `fixture` for fixtures setup and teardown
+   * - `hook` for hooks initialization and teardown
    * - `pw:api` for Playwright API calls.
    * - `test.step` for test.step API calls.
+   * - `test.attach` for test attachmen calls.
    */
   category: string;
 
diff --git a/packages/protocol/src/callMetadata.ts b/packages/protocol/src/callMetadata.d.ts
similarity index 86%
rename from packages/protocol/src/callMetadata.ts
rename to packages/protocol/src/callMetadata.d.ts
index 36e8b828c0fac..f0a26b47ad524 100644
--- a/packages/protocol/src/callMetadata.ts
+++ b/packages/protocol/src/callMetadata.d.ts
@@ -25,13 +25,10 @@ export type CallMetadata = {
   type: string;
   method: string;
   params: any;
-  apiName?: string;
+  title?: string;
   // Client is making an internal call that should not show up in
   // the inspector or trace.
   internal?: boolean;
-  // Service-side is making a call to itself, this metadata does not go
-  // through the dispatcher, so is always excluded from inspector / tracing.
-  isServerSide?: boolean;
   // Test runner step id.
   stepId?: string;
   location?: { file: string, line?: number, column?: number };
diff --git a/packages/protocol/src/channels.ts b/packages/protocol/src/channels.d.ts
similarity index 72%
rename from packages/protocol/src/channels.ts
rename to packages/protocol/src/channels.d.ts
index f3e0a2c35a2d6..9250010ca43d0 100644
--- a/packages/protocol/src/channels.ts
+++ b/packages/protocol/src/channels.d.ts
@@ -17,6 +17,7 @@
 // This file is generated by generate_channels.js, do not edit manually.
 
 import type { CallMetadata } from './callMetadata';
+import type { Progress } from './progress';
 
 export type Binary = Buffer;
 
@@ -40,6 +41,7 @@ export type InitializerTraits<T> =
     T extends BindingCallChannel ? BindingCallInitializer :
     T extends WebSocketChannel ? WebSocketInitializer :
     T extends ResponseChannel ? ResponseInitializer :
+    T extends WebSocketRouteChannel ? WebSocketRouteInitializer :
     T extends RouteChannel ? RouteInitializer :
     T extends RequestChannel ? RequestInitializer :
     T extends ElementHandleChannel ? ElementHandleInitializer :
@@ -51,7 +53,6 @@ export type InitializerTraits<T> =
     T extends EventTargetChannel ? EventTargetInitializer :
     T extends BrowserChannel ? BrowserInitializer :
     T extends BrowserTypeChannel ? BrowserTypeInitializer :
-    T extends SelectorsChannel ? SelectorsInitializer :
     T extends SocksSupportChannel ? SocksSupportInitializer :
     T extends DebugControllerChannel ? DebugControllerInitializer :
     T extends PlaywrightChannel ? PlaywrightInitializer :
@@ -77,6 +78,7 @@ export type EventsTraits<T> =
     T extends BindingCallChannel ? BindingCallEvents :
     T extends WebSocketChannel ? WebSocketEvents :
     T extends ResponseChannel ? ResponseEvents :
+    T extends WebSocketRouteChannel ? WebSocketRouteEvents :
     T extends RouteChannel ? RouteEvents :
     T extends RequestChannel ? RequestEvents :
     T extends ElementHandleChannel ? ElementHandleEvents :
@@ -88,7 +90,6 @@ export type EventsTraits<T> =
     T extends EventTargetChannel ? EventTargetEvents :
     T extends BrowserChannel ? BrowserEvents :
     T extends BrowserTypeChannel ? BrowserTypeEvents :
-    T extends SelectorsChannel ? SelectorsEvents :
     T extends SocksSupportChannel ? SocksSupportEvents :
     T extends DebugControllerChannel ? DebugControllerEvents :
     T extends PlaywrightChannel ? PlaywrightEvents :
@@ -114,6 +115,7 @@ export type EventTargetTraits<T> =
     T extends BindingCallChannel ? BindingCallEventTarget :
     T extends WebSocketChannel ? WebSocketEventTarget :
     T extends ResponseChannel ? ResponseEventTarget :
+    T extends WebSocketRouteChannel ? WebSocketRouteEventTarget :
     T extends RouteChannel ? RouteEventTarget :
     T extends RequestChannel ? RequestEventTarget :
     T extends ElementHandleChannel ? ElementHandleEventTarget :
@@ -125,7 +127,6 @@ export type EventTargetTraits<T> =
     T extends EventTargetChannel ? EventTargetEventTarget :
     T extends BrowserChannel ? BrowserEventTarget :
     T extends BrowserTypeChannel ? BrowserTypeEventTarget :
-    T extends SelectorsChannel ? SelectorsEventTarget :
     T extends SocksSupportChannel ? SocksSupportEventTarget :
     T extends DebugControllerChannel ? DebugControllerEventTarget :
     T extends PlaywrightChannel ? PlaywrightEventTarget :
@@ -147,7 +148,7 @@ export type Metadata = {
     line?: number,
     column?: number,
   },
-  apiName?: string,
+  title?: string,
   internal?: boolean,
   stepId?: string,
 };
@@ -177,6 +178,10 @@ export type SerializedValue = {
   d?: string,
   u?: string,
   bi?: string,
+  ta?: {
+    b: Binary,
+    k: 'i8' | 'ui8' | 'ui8c' | 'i16' | 'ui16' | 'i32' | 'ui32' | 'f32' | 'f64' | 'bi64' | 'bui64',
+  },
   e?: {
     m: string,
     n: string,
@@ -210,6 +215,12 @@ export type ExpectedTextValue = {
   normalizeWhiteSpace?: boolean,
 };
 
+export type SelectorEngine = {
+  name: string,
+  source: string,
+  contentScript?: boolean,
+};
+
 export type AXNode = {
   role: string,
   name: string,
@@ -250,6 +261,8 @@ export type SetNetworkCookie = {
   httpOnly?: boolean,
   secure?: boolean,
   sameSite?: 'Strict' | 'Lax' | 'None',
+  partitionKey?: string,
+  _crHasCrossSiteAncestor?: boolean,
 };
 
 export type NetworkCookie = {
@@ -261,6 +274,8 @@ export type NetworkCookie = {
   httpOnly: boolean,
   secure: boolean,
   sameSite: 'Strict' | 'Lax' | 'None',
+  partitionKey?: string,
+  _crHasCrossSiteAncestor?: boolean,
 };
 
 export type NameValue = {
@@ -268,9 +283,40 @@ export type NameValue = {
   value: string,
 };
 
+export type IndexedDBDatabase = {
+  name: string,
+  version: number,
+  stores: {
+    name: string,
+    autoIncrement: boolean,
+    keyPath?: string,
+    keyPathArray?: string[],
+    records: {
+      key?: any,
+      keyEncoded?: any,
+      value?: any,
+      valueEncoded?: any,
+    }[],
+    indexes: {
+      name: string,
+      keyPath?: string,
+      keyPathArray?: string[],
+      multiEntry: boolean,
+      unique: boolean,
+    }[],
+  }[],
+};
+
+export type SetOriginStorage = {
+  origin: string,
+  localStorage: NameValue[],
+  indexedDB?: IndexedDBDatabase[],
+};
+
 export type OriginStorage = {
   origin: string,
   localStorage: NameValue[],
+  indexedDB?: IndexedDBDatabase[],
 };
 
 export type SerializedError = {
@@ -283,7 +329,7 @@ export type SerializedError = {
 };
 
 export type RecordHarOptions = {
-  path: string,
+  zip?: boolean,
   content?: 'embed' | 'attach' | 'omit',
   mode?: 'full' | 'minimal',
   urlGlob?: string,
@@ -301,6 +347,7 @@ export type FormField = {
   },
 };
 
+export type SDKLanguage = 'javascript' | 'python' | 'java' | 'csharp';
 // ----------- APIRequestContext -----------
 export type APIRequestContextInitializer = {
   tracing: TracingChannel,
@@ -309,15 +356,16 @@ export interface APIRequestContextEventTarget {
 }
 export interface APIRequestContextChannel extends APIRequestContextEventTarget, Channel {
   _type_APIRequestContext: boolean;
-  fetch(params: APIRequestContextFetchParams, metadata?: CallMetadata): Promise<APIRequestContextFetchResult>;
-  fetchResponseBody(params: APIRequestContextFetchResponseBodyParams, metadata?: CallMetadata): Promise<APIRequestContextFetchResponseBodyResult>;
-  fetchLog(params: APIRequestContextFetchLogParams, metadata?: CallMetadata): Promise<APIRequestContextFetchLogResult>;
-  storageState(params?: APIRequestContextStorageStateParams, metadata?: CallMetadata): Promise<APIRequestContextStorageStateResult>;
-  disposeAPIResponse(params: APIRequestContextDisposeAPIResponseParams, metadata?: CallMetadata): Promise<APIRequestContextDisposeAPIResponseResult>;
-  dispose(params: APIRequestContextDisposeParams, metadata?: CallMetadata): Promise<APIRequestContextDisposeResult>;
+  fetch(params: APIRequestContextFetchParams, progress?: Progress): Promise<APIRequestContextFetchResult>;
+  fetchResponseBody(params: APIRequestContextFetchResponseBodyParams, progress?: Progress): Promise<APIRequestContextFetchResponseBodyResult>;
+  fetchLog(params: APIRequestContextFetchLogParams, progress?: Progress): Promise<APIRequestContextFetchLogResult>;
+  storageState(params: APIRequestContextStorageStateParams, progress?: Progress): Promise<APIRequestContextStorageStateResult>;
+  disposeAPIResponse(params: APIRequestContextDisposeAPIResponseParams, progress?: Progress): Promise<APIRequestContextDisposeAPIResponseResult>;
+  dispose(params: APIRequestContextDisposeParams, progress?: Progress): Promise<APIRequestContextDisposeResult>;
 }
 export type APIRequestContextFetchParams = {
   url: string,
+  encodedParams?: string,
   params?: NameValue[],
   method?: string,
   headers?: NameValue[],
@@ -325,13 +373,14 @@ export type APIRequestContextFetchParams = {
   jsonData?: string,
   formData?: NameValue[],
   multipartData?: FormField[],
-  timeout?: number,
+  timeout: number,
   failOnStatusCode?: boolean,
   ignoreHTTPSErrors?: boolean,
   maxRedirects?: number,
   maxRetries?: number,
 };
 export type APIRequestContextFetchOptions = {
+  encodedParams?: string,
   params?: NameValue[],
   method?: string,
   headers?: NameValue[],
@@ -339,7 +388,6 @@ export type APIRequestContextFetchOptions = {
   jsonData?: string,
   formData?: NameValue[],
   multipartData?: FormField[],
-  timeout?: number,
   failOnStatusCode?: boolean,
   ignoreHTTPSErrors?: boolean,
   maxRedirects?: number,
@@ -366,8 +414,12 @@ export type APIRequestContextFetchLogOptions = {
 export type APIRequestContextFetchLogResult = {
   log: string[],
 };
-export type APIRequestContextStorageStateParams = {};
-export type APIRequestContextStorageStateOptions = {};
+export type APIRequestContextStorageStateParams = {
+  indexedDB?: boolean,
+};
+export type APIRequestContextStorageStateOptions = {
+  indexedDB?: boolean,
+};
 export type APIRequestContextStorageStateResult = {
   cookies: NetworkCookie[],
   origins: OriginStorage[],
@@ -424,15 +476,16 @@ export interface LocalUtilsEventTarget {
 }
 export interface LocalUtilsChannel extends LocalUtilsEventTarget, Channel {
   _type_LocalUtils: boolean;
-  zip(params: LocalUtilsZipParams, metadata?: CallMetadata): Promise<LocalUtilsZipResult>;
-  harOpen(params: LocalUtilsHarOpenParams, metadata?: CallMetadata): Promise<LocalUtilsHarOpenResult>;
-  harLookup(params: LocalUtilsHarLookupParams, metadata?: CallMetadata): Promise<LocalUtilsHarLookupResult>;
-  harClose(params: LocalUtilsHarCloseParams, metadata?: CallMetadata): Promise<LocalUtilsHarCloseResult>;
-  harUnzip(params: LocalUtilsHarUnzipParams, metadata?: CallMetadata): Promise<LocalUtilsHarUnzipResult>;
-  connect(params: LocalUtilsConnectParams, metadata?: CallMetadata): Promise<LocalUtilsConnectResult>;
-  tracingStarted(params: LocalUtilsTracingStartedParams, metadata?: CallMetadata): Promise<LocalUtilsTracingStartedResult>;
-  addStackToTracingNoReply(params: LocalUtilsAddStackToTracingNoReplyParams, metadata?: CallMetadata): Promise<LocalUtilsAddStackToTracingNoReplyResult>;
-  traceDiscarded(params: LocalUtilsTraceDiscardedParams, metadata?: CallMetadata): Promise<LocalUtilsTraceDiscardedResult>;
+  zip(params: LocalUtilsZipParams, progress?: Progress): Promise<LocalUtilsZipResult>;
+  harOpen(params: LocalUtilsHarOpenParams, progress?: Progress): Promise<LocalUtilsHarOpenResult>;
+  harLookup(params: LocalUtilsHarLookupParams, progress?: Progress): Promise<LocalUtilsHarLookupResult>;
+  harClose(params: LocalUtilsHarCloseParams, progress?: Progress): Promise<LocalUtilsHarCloseResult>;
+  harUnzip(params: LocalUtilsHarUnzipParams, progress?: Progress): Promise<LocalUtilsHarUnzipResult>;
+  connect(params: LocalUtilsConnectParams, progress?: Progress): Promise<LocalUtilsConnectResult>;
+  tracingStarted(params: LocalUtilsTracingStartedParams, progress?: Progress): Promise<LocalUtilsTracingStartedResult>;
+  addStackToTracingNoReply(params: LocalUtilsAddStackToTracingNoReplyParams, progress?: Progress): Promise<LocalUtilsAddStackToTracingNoReplyResult>;
+  traceDiscarded(params: LocalUtilsTraceDiscardedParams, progress?: Progress): Promise<LocalUtilsTraceDiscardedResult>;
+  globToRegex(params: LocalUtilsGlobToRegexParams, progress?: Progress): Promise<LocalUtilsGlobToRegexResult>;
 }
 export type LocalUtilsZipParams = {
   zipFile: string,
@@ -494,14 +547,13 @@ export type LocalUtilsConnectParams = {
   headers?: any,
   exposeNetwork?: string,
   slowMo?: number,
-  timeout?: number,
+  timeout: number,
   socksProxyRedirectPortForTest?: number,
 };
 export type LocalUtilsConnectOptions = {
   headers?: any,
   exposeNetwork?: string,
   slowMo?: number,
-  timeout?: number,
   socksProxyRedirectPortForTest?: number,
 };
 export type LocalUtilsConnectResult = {
@@ -532,6 +584,18 @@ export type LocalUtilsTraceDiscardedOptions = {
 
 };
 export type LocalUtilsTraceDiscardedResult = void;
+export type LocalUtilsGlobToRegexParams = {
+  glob: string,
+  baseURL?: string,
+  webSocketUrl?: boolean,
+};
+export type LocalUtilsGlobToRegexOptions = {
+  baseURL?: string,
+  webSocketUrl?: boolean,
+};
+export type LocalUtilsGlobToRegexResult = {
+  regex: string,
+};
 
 export interface LocalUtilsEvents {
 }
@@ -542,10 +606,10 @@ export interface RootEventTarget {
 }
 export interface RootChannel extends RootEventTarget, Channel {
   _type_Root: boolean;
-  initialize(params: RootInitializeParams, metadata?: CallMetadata): Promise<RootInitializeResult>;
+  initialize(params: RootInitializeParams, progress?: Progress): Promise<RootInitializeResult>;
 }
 export type RootInitializeParams = {
-  sdkLanguage: 'javascript' | 'python' | 'java' | 'csharp',
+  sdkLanguage: SDKLanguage,
 };
 export type RootInitializeOptions = {
 
@@ -562,10 +626,11 @@ export type PlaywrightInitializer = {
   chromium: BrowserTypeChannel,
   firefox: BrowserTypeChannel,
   webkit: BrowserTypeChannel,
+  _bidiChromium: BrowserTypeChannel,
+  _bidiFirefox: BrowserTypeChannel,
   android: AndroidChannel,
   electron: ElectronChannel,
   utils?: LocalUtilsChannel,
-  selectors: SelectorsChannel,
   preLaunchedBrowser?: BrowserChannel,
   preConnectedAndroidDevice?: AndroidDeviceChannel,
   socksSupport?: SocksSupportChannel,
@@ -574,13 +639,14 @@ export interface PlaywrightEventTarget {
 }
 export interface PlaywrightChannel extends PlaywrightEventTarget, Channel {
   _type_Playwright: boolean;
-  newRequest(params: PlaywrightNewRequestParams, metadata?: CallMetadata): Promise<PlaywrightNewRequestResult>;
+  newRequest(params: PlaywrightNewRequestParams, progress?: Progress): Promise<PlaywrightNewRequestResult>;
 }
 export type PlaywrightNewRequestParams = {
   baseURL?: string,
   userAgent?: string,
   ignoreHTTPSErrors?: boolean,
   extraHTTPHeaders?: NameValue[],
+  failOnStatusCode?: boolean,
   clientCertificates?: {
     origin: string,
     cert?: Binary,
@@ -588,6 +654,7 @@ export type PlaywrightNewRequestParams = {
     passphrase?: string,
     pfx?: Binary,
   }[],
+  maxRedirects?: number,
   httpCredentials?: {
     username: string,
     password: string,
@@ -600,10 +667,9 @@ export type PlaywrightNewRequestParams = {
     username?: string,
     password?: string,
   },
-  timeout?: number,
   storageState?: {
     cookies?: NetworkCookie[],
-    origins?: OriginStorage[],
+    origins?: SetOriginStorage[],
   },
   tracesDir?: string,
 };
@@ -612,6 +678,7 @@ export type PlaywrightNewRequestOptions = {
   userAgent?: string,
   ignoreHTTPSErrors?: boolean,
   extraHTTPHeaders?: NameValue[],
+  failOnStatusCode?: boolean,
   clientCertificates?: {
     origin: string,
     cert?: Binary,
@@ -619,6 +686,7 @@ export type PlaywrightNewRequestOptions = {
     passphrase?: string,
     pfx?: Binary,
   }[],
+  maxRedirects?: number,
   httpCredentials?: {
     username: string,
     password: string,
@@ -631,10 +699,9 @@ export type PlaywrightNewRequestOptions = {
     username?: string,
     password?: string,
   },
-  timeout?: number,
   storageState?: {
     cookies?: NetworkCookie[],
-    origins?: OriginStorage[],
+    origins?: SetOriginStorage[],
   },
   tracesDir?: string,
 };
@@ -670,26 +737,34 @@ export interface DebugControllerEventTarget {
 }
 export interface DebugControllerChannel extends DebugControllerEventTarget, Channel {
   _type_DebugController: boolean;
-  initialize(params: DebugControllerInitializeParams, metadata?: CallMetadata): Promise<DebugControllerInitializeResult>;
-  setReportStateChanged(params: DebugControllerSetReportStateChangedParams, metadata?: CallMetadata): Promise<DebugControllerSetReportStateChangedResult>;
-  resetForReuse(params?: DebugControllerResetForReuseParams, metadata?: CallMetadata): Promise<DebugControllerResetForReuseResult>;
-  navigate(params: DebugControllerNavigateParams, metadata?: CallMetadata): Promise<DebugControllerNavigateResult>;
-  setRecorderMode(params: DebugControllerSetRecorderModeParams, metadata?: CallMetadata): Promise<DebugControllerSetRecorderModeResult>;
-  highlight(params: DebugControllerHighlightParams, metadata?: CallMetadata): Promise<DebugControllerHighlightResult>;
-  hideHighlight(params?: DebugControllerHideHighlightParams, metadata?: CallMetadata): Promise<DebugControllerHideHighlightResult>;
-  resume(params?: DebugControllerResumeParams, metadata?: CallMetadata): Promise<DebugControllerResumeResult>;
-  kill(params?: DebugControllerKillParams, metadata?: CallMetadata): Promise<DebugControllerKillResult>;
-  closeAllBrowsers(params?: DebugControllerCloseAllBrowsersParams, metadata?: CallMetadata): Promise<DebugControllerCloseAllBrowsersResult>;
+  initialize(params: DebugControllerInitializeParams, progress?: Progress): Promise<DebugControllerInitializeResult>;
+  setReportStateChanged(params: DebugControllerSetReportStateChangedParams, progress?: Progress): Promise<DebugControllerSetReportStateChangedResult>;
+  setRecorderMode(params: DebugControllerSetRecorderModeParams, progress?: Progress): Promise<DebugControllerSetRecorderModeResult>;
+  highlight(params: DebugControllerHighlightParams, progress?: Progress): Promise<DebugControllerHighlightResult>;
+  hideHighlight(params?: DebugControllerHideHighlightParams, progress?: Progress): Promise<DebugControllerHideHighlightResult>;
+  resume(params?: DebugControllerResumeParams, progress?: Progress): Promise<DebugControllerResumeResult>;
+  kill(params?: DebugControllerKillParams, progress?: Progress): Promise<DebugControllerKillResult>;
 }
 export type DebugControllerInspectRequestedEvent = {
   selector: string,
   locator: string,
+  ariaSnapshot: string,
 };
 export type DebugControllerSetModeRequestedEvent = {
   mode: string,
 };
 export type DebugControllerStateChangedEvent = {
   pageCount: number,
+  browsers: {
+    id: string,
+    name: string,
+    channel?: string,
+    contexts: {
+      pages: {
+        url: string,
+      }[],
+    }[],
+  }[],
 };
 export type DebugControllerSourceChangedEvent = {
   text: string,
@@ -702,7 +777,7 @@ export type DebugControllerPausedEvent = {
 };
 export type DebugControllerInitializeParams = {
   codegenId: string,
-  sdkLanguage: 'javascript' | 'python' | 'java' | 'csharp',
+  sdkLanguage: SDKLanguage,
 };
 export type DebugControllerInitializeOptions = {
 
@@ -715,29 +790,23 @@ export type DebugControllerSetReportStateChangedOptions = {
 
 };
 export type DebugControllerSetReportStateChangedResult = void;
-export type DebugControllerResetForReuseParams = {};
-export type DebugControllerResetForReuseOptions = {};
-export type DebugControllerResetForReuseResult = void;
-export type DebugControllerNavigateParams = {
-  url: string,
-};
-export type DebugControllerNavigateOptions = {
-
-};
-export type DebugControllerNavigateResult = void;
 export type DebugControllerSetRecorderModeParams = {
   mode: 'inspecting' | 'recording' | 'none',
   testIdAttributeName?: string,
+  generateAutoExpect?: boolean,
 };
 export type DebugControllerSetRecorderModeOptions = {
   testIdAttributeName?: string,
+  generateAutoExpect?: boolean,
 };
 export type DebugControllerSetRecorderModeResult = void;
 export type DebugControllerHighlightParams = {
-  selector: string,
+  selector?: string,
+  ariaTemplate?: string,
 };
 export type DebugControllerHighlightOptions = {
-
+  selector?: string,
+  ariaTemplate?: string,
 };
 export type DebugControllerHighlightResult = void;
 export type DebugControllerHideHighlightParams = {};
@@ -749,9 +818,6 @@ export type DebugControllerResumeResult = void;
 export type DebugControllerKillParams = {};
 export type DebugControllerKillOptions = {};
 export type DebugControllerKillResult = void;
-export type DebugControllerCloseAllBrowsersParams = {};
-export type DebugControllerCloseAllBrowsersOptions = {};
-export type DebugControllerCloseAllBrowsersResult = void;
 
 export interface DebugControllerEvents {
   'inspectRequested': DebugControllerInspectRequestedEvent;
@@ -770,11 +836,11 @@ export interface SocksSupportEventTarget {
 }
 export interface SocksSupportChannel extends SocksSupportEventTarget, Channel {
   _type_SocksSupport: boolean;
-  socksConnected(params: SocksSupportSocksConnectedParams, metadata?: CallMetadata): Promise<SocksSupportSocksConnectedResult>;
-  socksFailed(params: SocksSupportSocksFailedParams, metadata?: CallMetadata): Promise<SocksSupportSocksFailedResult>;
-  socksData(params: SocksSupportSocksDataParams, metadata?: CallMetadata): Promise<SocksSupportSocksDataResult>;
-  socksError(params: SocksSupportSocksErrorParams, metadata?: CallMetadata): Promise<SocksSupportSocksErrorResult>;
-  socksEnd(params: SocksSupportSocksEndParams, metadata?: CallMetadata): Promise<SocksSupportSocksEndResult>;
+  socksConnected(params: SocksSupportSocksConnectedParams, progress?: Progress): Promise<SocksSupportSocksConnectedResult>;
+  socksFailed(params: SocksSupportSocksFailedParams, progress?: Progress): Promise<SocksSupportSocksFailedResult>;
+  socksData(params: SocksSupportSocksDataParams, progress?: Progress): Promise<SocksSupportSocksDataResult>;
+  socksError(params: SocksSupportSocksErrorParams, progress?: Progress): Promise<SocksSupportSocksErrorResult>;
+  socksEnd(params: SocksSupportSocksEndParams, progress?: Progress): Promise<SocksSupportSocksEndResult>;
 }
 export type SocksSupportSocksRequestedEvent = {
   uid: string,
@@ -835,35 +901,6 @@ export interface SocksSupportEvents {
   'socksClosed': SocksSupportSocksClosedEvent;
 }
 
-// ----------- Selectors -----------
-export type SelectorsInitializer = {};
-export interface SelectorsEventTarget {
-}
-export interface SelectorsChannel extends SelectorsEventTarget, Channel {
-  _type_Selectors: boolean;
-  register(params: SelectorsRegisterParams, metadata?: CallMetadata): Promise<SelectorsRegisterResult>;
-  setTestIdAttributeName(params: SelectorsSetTestIdAttributeNameParams, metadata?: CallMetadata): Promise<SelectorsSetTestIdAttributeNameResult>;
-}
-export type SelectorsRegisterParams = {
-  name: string,
-  source: string,
-  contentScript?: boolean,
-};
-export type SelectorsRegisterOptions = {
-  contentScript?: boolean,
-};
-export type SelectorsRegisterResult = void;
-export type SelectorsSetTestIdAttributeNameParams = {
-  testIdAttributeName: string,
-};
-export type SelectorsSetTestIdAttributeNameOptions = {
-
-};
-export type SelectorsSetTestIdAttributeNameResult = void;
-
-export interface SelectorsEvents {
-}
-
 // ----------- BrowserType -----------
 export type BrowserTypeInitializer = {
   executablePath: string,
@@ -873,9 +910,9 @@ export interface BrowserTypeEventTarget {
 }
 export interface BrowserTypeChannel extends BrowserTypeEventTarget, Channel {
   _type_BrowserType: boolean;
-  launch(params: BrowserTypeLaunchParams, metadata?: CallMetadata): Promise<BrowserTypeLaunchResult>;
-  launchPersistentContext(params: BrowserTypeLaunchPersistentContextParams, metadata?: CallMetadata): Promise<BrowserTypeLaunchPersistentContextResult>;
-  connectOverCDP(params: BrowserTypeConnectOverCDPParams, metadata?: CallMetadata): Promise<BrowserTypeConnectOverCDPResult>;
+  launch(params: BrowserTypeLaunchParams, progress?: Progress): Promise<BrowserTypeLaunchResult>;
+  launchPersistentContext(params: BrowserTypeLaunchPersistentContextParams, progress?: Progress): Promise<BrowserTypeLaunchPersistentContextResult>;
+  connectOverCDP(params: BrowserTypeConnectOverCDPParams, progress?: Progress): Promise<BrowserTypeConnectOverCDPResult>;
 }
 export type BrowserTypeLaunchParams = {
   channel?: string,
@@ -883,10 +920,11 @@ export type BrowserTypeLaunchParams = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
-  timeout?: number,
+  timeout: number,
   env?: NameValue[],
   headless?: boolean,
   devtools?: boolean,
@@ -900,6 +938,7 @@ export type BrowserTypeLaunchParams = {
   tracesDir?: string,
   chromiumSandbox?: boolean,
   firefoxUserPrefs?: any,
+  cdpPort?: number,
   slowMo?: number,
 };
 export type BrowserTypeLaunchOptions = {
@@ -908,10 +947,10 @@ export type BrowserTypeLaunchOptions = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
-  timeout?: number,
   env?: NameValue[],
   headless?: boolean,
   devtools?: boolean,
@@ -925,6 +964,7 @@ export type BrowserTypeLaunchOptions = {
   tracesDir?: string,
   chromiumSandbox?: boolean,
   firefoxUserPrefs?: any,
+  cdpPort?: number,
   slowMo?: number,
 };
 export type BrowserTypeLaunchResult = {
@@ -936,10 +976,11 @@ export type BrowserTypeLaunchPersistentContextParams = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
-  timeout?: number,
+  timeout: number,
   env?: NameValue[],
   headless?: boolean,
   devtools?: boolean,
@@ -953,6 +994,7 @@ export type BrowserTypeLaunchPersistentContextParams = {
   tracesDir?: string,
   chromiumSandbox?: boolean,
   firefoxUserPrefs?: any,
+  cdpPort?: number,
   noDefaultViewport?: boolean,
   viewport?: {
     width: number,
@@ -996,6 +1038,7 @@ export type BrowserTypeLaunchPersistentContextParams = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -1004,9 +1047,10 @@ export type BrowserTypeLaunchPersistentContextParams = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   userDataDir: string,
   slowMo?: number,
 };
@@ -1016,10 +1060,10 @@ export type BrowserTypeLaunchPersistentContextOptions = {
   args?: string[],
   ignoreAllDefaultArgs?: boolean,
   ignoreDefaultArgs?: string[],
+  assistantMode?: boolean,
   handleSIGINT?: boolean,
   handleSIGTERM?: boolean,
   handleSIGHUP?: boolean,
-  timeout?: number,
   env?: NameValue[],
   headless?: boolean,
   devtools?: boolean,
@@ -1033,6 +1077,7 @@ export type BrowserTypeLaunchPersistentContextOptions = {
   tracesDir?: string,
   chromiumSandbox?: boolean,
   firefoxUserPrefs?: any,
+  cdpPort?: number,
   noDefaultViewport?: boolean,
   viewport?: {
     width: number,
@@ -1076,6 +1121,7 @@ export type BrowserTypeLaunchPersistentContextOptions = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -1084,24 +1130,25 @@ export type BrowserTypeLaunchPersistentContextOptions = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   slowMo?: number,
 };
 export type BrowserTypeLaunchPersistentContextResult = {
+  browser: BrowserChannel,
   context: BrowserContextChannel,
 };
 export type BrowserTypeConnectOverCDPParams = {
   endpointURL: string,
   headers?: NameValue[],
   slowMo?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type BrowserTypeConnectOverCDPOptions = {
   headers?: NameValue[],
   slowMo?: number,
-  timeout?: number,
 };
 export type BrowserTypeConnectOverCDPResult = {
   browser: BrowserChannel,
@@ -1117,20 +1164,24 @@ export type BrowserInitializer = {
   name: string,
 };
 export interface BrowserEventTarget {
+  on(event: 'context', callback: (params: BrowserContextEvent) => void): this;
   on(event: 'close', callback: (params: BrowserCloseEvent) => void): this;
 }
 export interface BrowserChannel extends BrowserEventTarget, Channel {
   _type_Browser: boolean;
-  close(params: BrowserCloseParams, metadata?: CallMetadata): Promise<BrowserCloseResult>;
-  killForTests(params?: BrowserKillForTestsParams, metadata?: CallMetadata): Promise<BrowserKillForTestsResult>;
-  defaultUserAgentForTest(params?: BrowserDefaultUserAgentForTestParams, metadata?: CallMetadata): Promise<BrowserDefaultUserAgentForTestResult>;
-  newContext(params: BrowserNewContextParams, metadata?: CallMetadata): Promise<BrowserNewContextResult>;
-  newContextForReuse(params: BrowserNewContextForReuseParams, metadata?: CallMetadata): Promise<BrowserNewContextForReuseResult>;
-  stopPendingOperations(params: BrowserStopPendingOperationsParams, metadata?: CallMetadata): Promise<BrowserStopPendingOperationsResult>;
-  newBrowserCDPSession(params?: BrowserNewBrowserCDPSessionParams, metadata?: CallMetadata): Promise<BrowserNewBrowserCDPSessionResult>;
-  startTracing(params: BrowserStartTracingParams, metadata?: CallMetadata): Promise<BrowserStartTracingResult>;
-  stopTracing(params?: BrowserStopTracingParams, metadata?: CallMetadata): Promise<BrowserStopTracingResult>;
+  close(params: BrowserCloseParams, progress?: Progress): Promise<BrowserCloseResult>;
+  killForTests(params?: BrowserKillForTestsParams, progress?: Progress): Promise<BrowserKillForTestsResult>;
+  defaultUserAgentForTest(params?: BrowserDefaultUserAgentForTestParams, progress?: Progress): Promise<BrowserDefaultUserAgentForTestResult>;
+  newContext(params: BrowserNewContextParams, progress?: Progress): Promise<BrowserNewContextResult>;
+  newContextForReuse(params: BrowserNewContextForReuseParams, progress?: Progress): Promise<BrowserNewContextForReuseResult>;
+  disconnectFromReusedContext(params: BrowserDisconnectFromReusedContextParams, progress?: Progress): Promise<BrowserDisconnectFromReusedContextResult>;
+  newBrowserCDPSession(params?: BrowserNewBrowserCDPSessionParams, progress?: Progress): Promise<BrowserNewBrowserCDPSessionResult>;
+  startTracing(params: BrowserStartTracingParams, progress?: Progress): Promise<BrowserStartTracingResult>;
+  stopTracing(params?: BrowserStopTracingParams, progress?: Progress): Promise<BrowserStopTracingResult>;
 }
+export type BrowserContextEvent = {
+  context: BrowserContextChannel,
+};
 export type BrowserCloseEvent = {};
 export type BrowserCloseParams = {
   reason?: string,
@@ -1191,6 +1242,7 @@ export type BrowserNewContextParams = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -1199,9 +1251,10 @@ export type BrowserNewContextParams = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   proxy?: {
     server: string,
     bypass?: string,
@@ -1210,7 +1263,7 @@ export type BrowserNewContextParams = {
   },
   storageState?: {
     cookies?: SetNetworkCookie[],
-    origins?: OriginStorage[],
+    origins?: SetOriginStorage[],
   },
 };
 export type BrowserNewContextOptions = {
@@ -1257,6 +1310,7 @@ export type BrowserNewContextOptions = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -1265,9 +1319,10 @@ export type BrowserNewContextOptions = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   proxy?: {
     server: string,
     bypass?: string,
@@ -1276,7 +1331,7 @@ export type BrowserNewContextOptions = {
   },
   storageState?: {
     cookies?: SetNetworkCookie[],
-    origins?: OriginStorage[],
+    origins?: SetOriginStorage[],
   },
 };
 export type BrowserNewContextResult = {
@@ -1326,6 +1381,7 @@ export type BrowserNewContextForReuseParams = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -1334,9 +1390,10 @@ export type BrowserNewContextForReuseParams = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   proxy?: {
     server: string,
     bypass?: string,
@@ -1345,7 +1402,7 @@ export type BrowserNewContextForReuseParams = {
   },
   storageState?: {
     cookies?: SetNetworkCookie[],
-    origins?: OriginStorage[],
+    origins?: SetOriginStorage[],
   },
 };
 export type BrowserNewContextForReuseOptions = {
@@ -1392,6 +1449,7 @@ export type BrowserNewContextForReuseOptions = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -1400,9 +1458,10 @@ export type BrowserNewContextForReuseOptions = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   proxy?: {
     server: string,
     bypass?: string,
@@ -1411,19 +1470,19 @@ export type BrowserNewContextForReuseOptions = {
   },
   storageState?: {
     cookies?: SetNetworkCookie[],
-    origins?: OriginStorage[],
+    origins?: SetOriginStorage[],
   },
 };
 export type BrowserNewContextForReuseResult = {
   context: BrowserContextChannel,
 };
-export type BrowserStopPendingOperationsParams = {
+export type BrowserDisconnectFromReusedContextParams = {
   reason: string,
 };
-export type BrowserStopPendingOperationsOptions = {
+export type BrowserDisconnectFromReusedContextOptions = {
 
 };
-export type BrowserStopPendingOperationsResult = void;
+export type BrowserDisconnectFromReusedContextResult = void;
 export type BrowserNewBrowserCDPSessionParams = {};
 export type BrowserNewBrowserCDPSessionOptions = {};
 export type BrowserNewBrowserCDPSessionResult = {
@@ -1447,6 +1506,7 @@ export type BrowserStopTracingResult = {
 };
 
 export interface BrowserEvents {
+  'context': BrowserContextEvent;
   'close': BrowserCloseEvent;
 }
 
@@ -1456,7 +1516,7 @@ export interface EventTargetEventTarget {
 }
 export interface EventTargetChannel extends EventTargetEventTarget, Channel {
   _type_EventTarget: boolean;
-  waitForEventInfo(params: EventTargetWaitForEventInfoParams, metadata?: CallMetadata): Promise<EventTargetWaitForEventInfoResult>;
+  waitForEventInfo(params: EventTargetWaitForEventInfoParams, progress?: Progress): Promise<EventTargetWaitForEventInfoResult>;
 }
 export type EventTargetWaitForEventInfoParams = {
   info: {
@@ -1480,6 +1540,64 @@ export type BrowserContextInitializer = {
   isChromium: boolean,
   requestContext: APIRequestContextChannel,
   tracing: TracingChannel,
+  options: {
+    noDefaultViewport?: boolean,
+    viewport?: {
+      width: number,
+      height: number,
+    },
+    screen?: {
+      width: number,
+      height: number,
+    },
+    ignoreHTTPSErrors?: boolean,
+    clientCertificates?: {
+      origin: string,
+      cert?: Binary,
+      key?: Binary,
+      passphrase?: string,
+      pfx?: Binary,
+    }[],
+    javaScriptEnabled?: boolean,
+    bypassCSP?: boolean,
+    userAgent?: string,
+    locale?: string,
+    timezoneId?: string,
+    geolocation?: {
+      longitude: number,
+      latitude: number,
+      accuracy?: number,
+    },
+    permissions?: string[],
+    extraHTTPHeaders?: NameValue[],
+    offline?: boolean,
+    httpCredentials?: {
+      username: string,
+      password: string,
+      origin?: string,
+      send?: 'always' | 'unauthorized',
+    },
+    deviceScaleFactor?: number,
+    isMobile?: boolean,
+    hasTouch?: boolean,
+    colorScheme?: 'dark' | 'light' | 'no-preference' | 'no-override',
+    reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
+    forcedColors?: 'active' | 'none' | 'no-override',
+    acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+    contrast?: 'no-preference' | 'more' | 'no-override',
+    baseURL?: string,
+    recordVideo?: {
+      dir: string,
+      size?: {
+        width: number,
+        height: number,
+      },
+    },
+    strictSelectors?: boolean,
+    serviceWorkers?: 'allow' | 'block',
+    selectorEngines?: SelectorEngine[],
+    testIdAttributeName?: string,
+  },
 };
 export interface BrowserContextEventTarget {
   on(event: 'bindingCall', callback: (params: BrowserContextBindingCallEvent) => void): this;
@@ -1489,6 +1607,7 @@ export interface BrowserContextEventTarget {
   on(event: 'page', callback: (params: BrowserContextPageEvent) => void): this;
   on(event: 'pageError', callback: (params: BrowserContextPageErrorEvent) => void): this;
   on(event: 'route', callback: (params: BrowserContextRouteEvent) => void): this;
+  on(event: 'webSocketRoute', callback: (params: BrowserContextWebSocketRouteEvent) => void): this;
   on(event: 'video', callback: (params: BrowserContextVideoEvent) => void): this;
   on(event: 'backgroundPage', callback: (params: BrowserContextBackgroundPageEvent) => void): this;
   on(event: 'serviceWorker', callback: (params: BrowserContextServiceWorkerEvent) => void): this;
@@ -1496,40 +1615,43 @@ export interface BrowserContextEventTarget {
   on(event: 'requestFailed', callback: (params: BrowserContextRequestFailedEvent) => void): this;
   on(event: 'requestFinished', callback: (params: BrowserContextRequestFinishedEvent) => void): this;
   on(event: 'response', callback: (params: BrowserContextResponseEvent) => void): this;
+  on(event: 'recorderEvent', callback: (params: BrowserContextRecorderEventEvent) => void): this;
 }
 export interface BrowserContextChannel extends BrowserContextEventTarget, EventTargetChannel {
   _type_BrowserContext: boolean;
-  addCookies(params: BrowserContextAddCookiesParams, metadata?: CallMetadata): Promise<BrowserContextAddCookiesResult>;
-  addInitScript(params: BrowserContextAddInitScriptParams, metadata?: CallMetadata): Promise<BrowserContextAddInitScriptResult>;
-  clearCookies(params: BrowserContextClearCookiesParams, metadata?: CallMetadata): Promise<BrowserContextClearCookiesResult>;
-  clearPermissions(params?: BrowserContextClearPermissionsParams, metadata?: CallMetadata): Promise<BrowserContextClearPermissionsResult>;
-  close(params: BrowserContextCloseParams, metadata?: CallMetadata): Promise<BrowserContextCloseResult>;
-  cookies(params: BrowserContextCookiesParams, metadata?: CallMetadata): Promise<BrowserContextCookiesResult>;
-  exposeBinding(params: BrowserContextExposeBindingParams, metadata?: CallMetadata): Promise<BrowserContextExposeBindingResult>;
-  grantPermissions(params: BrowserContextGrantPermissionsParams, metadata?: CallMetadata): Promise<BrowserContextGrantPermissionsResult>;
-  newPage(params?: BrowserContextNewPageParams, metadata?: CallMetadata): Promise<BrowserContextNewPageResult>;
-  setDefaultNavigationTimeoutNoReply(params: BrowserContextSetDefaultNavigationTimeoutNoReplyParams, metadata?: CallMetadata): Promise<BrowserContextSetDefaultNavigationTimeoutNoReplyResult>;
-  setDefaultTimeoutNoReply(params: BrowserContextSetDefaultTimeoutNoReplyParams, metadata?: CallMetadata): Promise<BrowserContextSetDefaultTimeoutNoReplyResult>;
-  setExtraHTTPHeaders(params: BrowserContextSetExtraHTTPHeadersParams, metadata?: CallMetadata): Promise<BrowserContextSetExtraHTTPHeadersResult>;
-  setGeolocation(params: BrowserContextSetGeolocationParams, metadata?: CallMetadata): Promise<BrowserContextSetGeolocationResult>;
-  setHTTPCredentials(params: BrowserContextSetHTTPCredentialsParams, metadata?: CallMetadata): Promise<BrowserContextSetHTTPCredentialsResult>;
-  setNetworkInterceptionPatterns(params: BrowserContextSetNetworkInterceptionPatternsParams, metadata?: CallMetadata): Promise<BrowserContextSetNetworkInterceptionPatternsResult>;
-  setOffline(params: BrowserContextSetOfflineParams, metadata?: CallMetadata): Promise<BrowserContextSetOfflineResult>;
-  storageState(params?: BrowserContextStorageStateParams, metadata?: CallMetadata): Promise<BrowserContextStorageStateResult>;
-  pause(params?: BrowserContextPauseParams, metadata?: CallMetadata): Promise<BrowserContextPauseResult>;
-  recorderSupplementEnable(params: BrowserContextRecorderSupplementEnableParams, metadata?: CallMetadata): Promise<BrowserContextRecorderSupplementEnableResult>;
-  newCDPSession(params: BrowserContextNewCDPSessionParams, metadata?: CallMetadata): Promise<BrowserContextNewCDPSessionResult>;
-  harStart(params: BrowserContextHarStartParams, metadata?: CallMetadata): Promise<BrowserContextHarStartResult>;
-  harExport(params: BrowserContextHarExportParams, metadata?: CallMetadata): Promise<BrowserContextHarExportResult>;
-  createTempFiles(params: BrowserContextCreateTempFilesParams, metadata?: CallMetadata): Promise<BrowserContextCreateTempFilesResult>;
-  updateSubscription(params: BrowserContextUpdateSubscriptionParams, metadata?: CallMetadata): Promise<BrowserContextUpdateSubscriptionResult>;
-  clockFastForward(params: BrowserContextClockFastForwardParams, metadata?: CallMetadata): Promise<BrowserContextClockFastForwardResult>;
-  clockInstall(params: BrowserContextClockInstallParams, metadata?: CallMetadata): Promise<BrowserContextClockInstallResult>;
-  clockPauseAt(params: BrowserContextClockPauseAtParams, metadata?: CallMetadata): Promise<BrowserContextClockPauseAtResult>;
-  clockResume(params?: BrowserContextClockResumeParams, metadata?: CallMetadata): Promise<BrowserContextClockResumeResult>;
-  clockRunFor(params: BrowserContextClockRunForParams, metadata?: CallMetadata): Promise<BrowserContextClockRunForResult>;
-  clockSetFixedTime(params: BrowserContextClockSetFixedTimeParams, metadata?: CallMetadata): Promise<BrowserContextClockSetFixedTimeResult>;
-  clockSetSystemTime(params: BrowserContextClockSetSystemTimeParams, metadata?: CallMetadata): Promise<BrowserContextClockSetSystemTimeResult>;
+  addCookies(params: BrowserContextAddCookiesParams, progress?: Progress): Promise<BrowserContextAddCookiesResult>;
+  addInitScript(params: BrowserContextAddInitScriptParams, progress?: Progress): Promise<BrowserContextAddInitScriptResult>;
+  clearCookies(params: BrowserContextClearCookiesParams, progress?: Progress): Promise<BrowserContextClearCookiesResult>;
+  clearPermissions(params?: BrowserContextClearPermissionsParams, progress?: Progress): Promise<BrowserContextClearPermissionsResult>;
+  close(params: BrowserContextCloseParams, progress?: Progress): Promise<BrowserContextCloseResult>;
+  cookies(params: BrowserContextCookiesParams, progress?: Progress): Promise<BrowserContextCookiesResult>;
+  exposeBinding(params: BrowserContextExposeBindingParams, progress?: Progress): Promise<BrowserContextExposeBindingResult>;
+  grantPermissions(params: BrowserContextGrantPermissionsParams, progress?: Progress): Promise<BrowserContextGrantPermissionsResult>;
+  newPage(params?: BrowserContextNewPageParams, progress?: Progress): Promise<BrowserContextNewPageResult>;
+  registerSelectorEngine(params: BrowserContextRegisterSelectorEngineParams, progress?: Progress): Promise<BrowserContextRegisterSelectorEngineResult>;
+  setTestIdAttributeName(params: BrowserContextSetTestIdAttributeNameParams, progress?: Progress): Promise<BrowserContextSetTestIdAttributeNameResult>;
+  setExtraHTTPHeaders(params: BrowserContextSetExtraHTTPHeadersParams, progress?: Progress): Promise<BrowserContextSetExtraHTTPHeadersResult>;
+  setGeolocation(params: BrowserContextSetGeolocationParams, progress?: Progress): Promise<BrowserContextSetGeolocationResult>;
+  setHTTPCredentials(params: BrowserContextSetHTTPCredentialsParams, progress?: Progress): Promise<BrowserContextSetHTTPCredentialsResult>;
+  setNetworkInterceptionPatterns(params: BrowserContextSetNetworkInterceptionPatternsParams, progress?: Progress): Promise<BrowserContextSetNetworkInterceptionPatternsResult>;
+  setWebSocketInterceptionPatterns(params: BrowserContextSetWebSocketInterceptionPatternsParams, progress?: Progress): Promise<BrowserContextSetWebSocketInterceptionPatternsResult>;
+  setOffline(params: BrowserContextSetOfflineParams, progress?: Progress): Promise<BrowserContextSetOfflineResult>;
+  storageState(params: BrowserContextStorageStateParams, progress?: Progress): Promise<BrowserContextStorageStateResult>;
+  pause(params?: BrowserContextPauseParams, progress?: Progress): Promise<BrowserContextPauseResult>;
+  enableRecorder(params: BrowserContextEnableRecorderParams, progress?: Progress): Promise<BrowserContextEnableRecorderResult>;
+  disableRecorder(params?: BrowserContextDisableRecorderParams, progress?: Progress): Promise<BrowserContextDisableRecorderResult>;
+  newCDPSession(params: BrowserContextNewCDPSessionParams, progress?: Progress): Promise<BrowserContextNewCDPSessionResult>;
+  harStart(params: BrowserContextHarStartParams, progress?: Progress): Promise<BrowserContextHarStartResult>;
+  harExport(params: BrowserContextHarExportParams, progress?: Progress): Promise<BrowserContextHarExportResult>;
+  createTempFiles(params: BrowserContextCreateTempFilesParams, progress?: Progress): Promise<BrowserContextCreateTempFilesResult>;
+  updateSubscription(params: BrowserContextUpdateSubscriptionParams, progress?: Progress): Promise<BrowserContextUpdateSubscriptionResult>;
+  clockFastForward(params: BrowserContextClockFastForwardParams, progress?: Progress): Promise<BrowserContextClockFastForwardResult>;
+  clockInstall(params: BrowserContextClockInstallParams, progress?: Progress): Promise<BrowserContextClockInstallResult>;
+  clockPauseAt(params: BrowserContextClockPauseAtParams, progress?: Progress): Promise<BrowserContextClockPauseAtResult>;
+  clockResume(params?: BrowserContextClockResumeParams, progress?: Progress): Promise<BrowserContextClockResumeResult>;
+  clockRunFor(params: BrowserContextClockRunForParams, progress?: Progress): Promise<BrowserContextClockRunForResult>;
+  clockSetFixedTime(params: BrowserContextClockSetFixedTimeParams, progress?: Progress): Promise<BrowserContextClockSetFixedTimeResult>;
+  clockSetSystemTime(params: BrowserContextClockSetSystemTimeParams, progress?: Progress): Promise<BrowserContextClockSetSystemTimeResult>;
 }
 export type BrowserContextBindingCallEvent = {
   binding: BindingCallChannel,
@@ -1559,6 +1681,9 @@ export type BrowserContextPageErrorEvent = {
 export type BrowserContextRouteEvent = {
   route: RouteChannel,
 };
+export type BrowserContextWebSocketRouteEvent = {
+  webSocketRoute: WebSocketRouteChannel,
+};
 export type BrowserContextVideoEvent = {
   artifact: ArtifactChannel,
 };
@@ -1588,6 +1713,12 @@ export type BrowserContextResponseEvent = {
   response: ResponseChannel,
   page?: PageChannel,
 };
+export type BrowserContextRecorderEventEvent = {
+  event: 'actionAdded' | 'actionUpdated' | 'signalAdded',
+  data: any,
+  page: PageChannel,
+  code: string,
+};
 export type BrowserContextAddCookiesParams = {
   cookies: SetNetworkCookie[],
 };
@@ -1665,20 +1796,20 @@ export type BrowserContextNewPageOptions = {};
 export type BrowserContextNewPageResult = {
   page: PageChannel,
 };
-export type BrowserContextSetDefaultNavigationTimeoutNoReplyParams = {
-  timeout?: number,
+export type BrowserContextRegisterSelectorEngineParams = {
+  selectorEngine: SelectorEngine,
 };
-export type BrowserContextSetDefaultNavigationTimeoutNoReplyOptions = {
-  timeout?: number,
+export type BrowserContextRegisterSelectorEngineOptions = {
+
 };
-export type BrowserContextSetDefaultNavigationTimeoutNoReplyResult = void;
-export type BrowserContextSetDefaultTimeoutNoReplyParams = {
-  timeout?: number,
+export type BrowserContextRegisterSelectorEngineResult = void;
+export type BrowserContextSetTestIdAttributeNameParams = {
+  testIdAttributeName: string,
 };
-export type BrowserContextSetDefaultTimeoutNoReplyOptions = {
-  timeout?: number,
+export type BrowserContextSetTestIdAttributeNameOptions = {
+
 };
-export type BrowserContextSetDefaultTimeoutNoReplyResult = void;
+export type BrowserContextSetTestIdAttributeNameResult = void;
 export type BrowserContextSetExtraHTTPHeadersParams = {
   headers: NameValue[],
 };
@@ -1727,6 +1858,17 @@ export type BrowserContextSetNetworkInterceptionPatternsOptions = {
 
 };
 export type BrowserContextSetNetworkInterceptionPatternsResult = void;
+export type BrowserContextSetWebSocketInterceptionPatternsParams = {
+  patterns: {
+    glob?: string,
+    regexSource?: string,
+    regexFlags?: string,
+  }[],
+};
+export type BrowserContextSetWebSocketInterceptionPatternsOptions = {
+
+};
+export type BrowserContextSetWebSocketInterceptionPatternsResult = void;
 export type BrowserContextSetOfflineParams = {
   offline: boolean,
 };
@@ -1734,8 +1876,12 @@ export type BrowserContextSetOfflineOptions = {
 
 };
 export type BrowserContextSetOfflineResult = void;
-export type BrowserContextStorageStateParams = {};
-export type BrowserContextStorageStateOptions = {};
+export type BrowserContextStorageStateParams = {
+  indexedDB?: boolean,
+};
+export type BrowserContextStorageStateOptions = {
+  indexedDB?: boolean,
+};
 export type BrowserContextStorageStateResult = {
   cookies: NetworkCookie[],
   origins: OriginStorage[],
@@ -1743,9 +1889,10 @@ export type BrowserContextStorageStateResult = {
 export type BrowserContextPauseParams = {};
 export type BrowserContextPauseOptions = {};
 export type BrowserContextPauseResult = void;
-export type BrowserContextRecorderSupplementEnableParams = {
+export type BrowserContextEnableRecorderParams = {
   language?: string,
   mode?: 'inspecting' | 'recording',
+  recorderMode?: 'default' | 'api',
   pauseOnNextStatement?: boolean,
   testIdAttributeName?: string,
   launchOptions?: any,
@@ -1756,9 +1903,10 @@ export type BrowserContextRecorderSupplementEnableParams = {
   handleSIGINT?: boolean,
   omitCallTracking?: boolean,
 };
-export type BrowserContextRecorderSupplementEnableOptions = {
+export type BrowserContextEnableRecorderOptions = {
   language?: string,
   mode?: 'inspecting' | 'recording',
+  recorderMode?: 'default' | 'api',
   pauseOnNextStatement?: boolean,
   testIdAttributeName?: string,
   launchOptions?: any,
@@ -1769,7 +1917,10 @@ export type BrowserContextRecorderSupplementEnableOptions = {
   handleSIGINT?: boolean,
   omitCallTracking?: boolean,
 };
-export type BrowserContextRecorderSupplementEnableResult = void;
+export type BrowserContextEnableRecorderResult = void;
+export type BrowserContextDisableRecorderParams = {};
+export type BrowserContextDisableRecorderOptions = {};
+export type BrowserContextDisableRecorderResult = void;
 export type BrowserContextNewCDPSessionParams = {
   page?: PageChannel,
   frame?: FrameChannel,
@@ -1888,6 +2039,7 @@ export interface BrowserContextEvents {
   'page': BrowserContextPageEvent;
   'pageError': BrowserContextPageErrorEvent;
   'route': BrowserContextRouteEvent;
+  'webSocketRoute': BrowserContextWebSocketRouteEvent;
   'video': BrowserContextVideoEvent;
   'backgroundPage': BrowserContextBackgroundPageEvent;
   'serviceWorker': BrowserContextServiceWorkerEvent;
@@ -1895,6 +2047,7 @@ export interface BrowserContextEvents {
   'requestFailed': BrowserContextRequestFailedEvent;
   'requestFinished': BrowserContextRequestFinishedEvent;
   'response': BrowserContextResponseEvent;
+  'recorderEvent': BrowserContextRecorderEventEvent;
 }
 
 // ----------- Page -----------
@@ -1912,53 +2065,56 @@ export interface PageEventTarget {
   on(event: 'close', callback: (params: PageCloseEvent) => void): this;
   on(event: 'crash', callback: (params: PageCrashEvent) => void): this;
   on(event: 'download', callback: (params: PageDownloadEvent) => void): this;
+  on(event: 'viewportSizeChanged', callback: (params: PageViewportSizeChangedEvent) => void): this;
   on(event: 'fileChooser', callback: (params: PageFileChooserEvent) => void): this;
   on(event: 'frameAttached', callback: (params: PageFrameAttachedEvent) => void): this;
   on(event: 'frameDetached', callback: (params: PageFrameDetachedEvent) => void): this;
   on(event: 'locatorHandlerTriggered', callback: (params: PageLocatorHandlerTriggeredEvent) => void): this;
   on(event: 'route', callback: (params: PageRouteEvent) => void): this;
+  on(event: 'webSocketRoute', callback: (params: PageWebSocketRouteEvent) => void): this;
   on(event: 'video', callback: (params: PageVideoEvent) => void): this;
   on(event: 'webSocket', callback: (params: PageWebSocketEvent) => void): this;
   on(event: 'worker', callback: (params: PageWorkerEvent) => void): this;
 }
 export interface PageChannel extends PageEventTarget, EventTargetChannel {
   _type_Page: boolean;
-  setDefaultNavigationTimeoutNoReply(params: PageSetDefaultNavigationTimeoutNoReplyParams, metadata?: CallMetadata): Promise<PageSetDefaultNavigationTimeoutNoReplyResult>;
-  setDefaultTimeoutNoReply(params: PageSetDefaultTimeoutNoReplyParams, metadata?: CallMetadata): Promise<PageSetDefaultTimeoutNoReplyResult>;
-  addInitScript(params: PageAddInitScriptParams, metadata?: CallMetadata): Promise<PageAddInitScriptResult>;
-  close(params: PageCloseParams, metadata?: CallMetadata): Promise<PageCloseResult>;
-  emulateMedia(params: PageEmulateMediaParams, metadata?: CallMetadata): Promise<PageEmulateMediaResult>;
-  exposeBinding(params: PageExposeBindingParams, metadata?: CallMetadata): Promise<PageExposeBindingResult>;
-  goBack(params: PageGoBackParams, metadata?: CallMetadata): Promise<PageGoBackResult>;
-  goForward(params: PageGoForwardParams, metadata?: CallMetadata): Promise<PageGoForwardResult>;
-  registerLocatorHandler(params: PageRegisterLocatorHandlerParams, metadata?: CallMetadata): Promise<PageRegisterLocatorHandlerResult>;
-  resolveLocatorHandlerNoReply(params: PageResolveLocatorHandlerNoReplyParams, metadata?: CallMetadata): Promise<PageResolveLocatorHandlerNoReplyResult>;
-  unregisterLocatorHandler(params: PageUnregisterLocatorHandlerParams, metadata?: CallMetadata): Promise<PageUnregisterLocatorHandlerResult>;
-  reload(params: PageReloadParams, metadata?: CallMetadata): Promise<PageReloadResult>;
-  expectScreenshot(params: PageExpectScreenshotParams, metadata?: CallMetadata): Promise<PageExpectScreenshotResult>;
-  screenshot(params: PageScreenshotParams, metadata?: CallMetadata): Promise<PageScreenshotResult>;
-  setExtraHTTPHeaders(params: PageSetExtraHTTPHeadersParams, metadata?: CallMetadata): Promise<PageSetExtraHTTPHeadersResult>;
-  setNetworkInterceptionPatterns(params: PageSetNetworkInterceptionPatternsParams, metadata?: CallMetadata): Promise<PageSetNetworkInterceptionPatternsResult>;
-  setViewportSize(params: PageSetViewportSizeParams, metadata?: CallMetadata): Promise<PageSetViewportSizeResult>;
-  keyboardDown(params: PageKeyboardDownParams, metadata?: CallMetadata): Promise<PageKeyboardDownResult>;
-  keyboardUp(params: PageKeyboardUpParams, metadata?: CallMetadata): Promise<PageKeyboardUpResult>;
-  keyboardInsertText(params: PageKeyboardInsertTextParams, metadata?: CallMetadata): Promise<PageKeyboardInsertTextResult>;
-  keyboardType(params: PageKeyboardTypeParams, metadata?: CallMetadata): Promise<PageKeyboardTypeResult>;
-  keyboardPress(params: PageKeyboardPressParams, metadata?: CallMetadata): Promise<PageKeyboardPressResult>;
-  mouseMove(params: PageMouseMoveParams, metadata?: CallMetadata): Promise<PageMouseMoveResult>;
-  mouseDown(params: PageMouseDownParams, metadata?: CallMetadata): Promise<PageMouseDownResult>;
-  mouseUp(params: PageMouseUpParams, metadata?: CallMetadata): Promise<PageMouseUpResult>;
-  mouseClick(params: PageMouseClickParams, metadata?: CallMetadata): Promise<PageMouseClickResult>;
-  mouseWheel(params: PageMouseWheelParams, metadata?: CallMetadata): Promise<PageMouseWheelResult>;
-  touchscreenTap(params: PageTouchscreenTapParams, metadata?: CallMetadata): Promise<PageTouchscreenTapResult>;
-  accessibilitySnapshot(params: PageAccessibilitySnapshotParams, metadata?: CallMetadata): Promise<PageAccessibilitySnapshotResult>;
-  pdf(params: PagePdfParams, metadata?: CallMetadata): Promise<PagePdfResult>;
-  startJSCoverage(params: PageStartJSCoverageParams, metadata?: CallMetadata): Promise<PageStartJSCoverageResult>;
-  stopJSCoverage(params?: PageStopJSCoverageParams, metadata?: CallMetadata): Promise<PageStopJSCoverageResult>;
-  startCSSCoverage(params: PageStartCSSCoverageParams, metadata?: CallMetadata): Promise<PageStartCSSCoverageResult>;
-  stopCSSCoverage(params?: PageStopCSSCoverageParams, metadata?: CallMetadata): Promise<PageStopCSSCoverageResult>;
-  bringToFront(params?: PageBringToFrontParams, metadata?: CallMetadata): Promise<PageBringToFrontResult>;
-  updateSubscription(params: PageUpdateSubscriptionParams, metadata?: CallMetadata): Promise<PageUpdateSubscriptionResult>;
+  addInitScript(params: PageAddInitScriptParams, progress?: Progress): Promise<PageAddInitScriptResult>;
+  close(params: PageCloseParams, progress?: Progress): Promise<PageCloseResult>;
+  emulateMedia(params: PageEmulateMediaParams, progress?: Progress): Promise<PageEmulateMediaResult>;
+  exposeBinding(params: PageExposeBindingParams, progress?: Progress): Promise<PageExposeBindingResult>;
+  goBack(params: PageGoBackParams, progress?: Progress): Promise<PageGoBackResult>;
+  goForward(params: PageGoForwardParams, progress?: Progress): Promise<PageGoForwardResult>;
+  requestGC(params?: PageRequestGCParams, progress?: Progress): Promise<PageRequestGCResult>;
+  registerLocatorHandler(params: PageRegisterLocatorHandlerParams, progress?: Progress): Promise<PageRegisterLocatorHandlerResult>;
+  resolveLocatorHandlerNoReply(params: PageResolveLocatorHandlerNoReplyParams, progress?: Progress): Promise<PageResolveLocatorHandlerNoReplyResult>;
+  unregisterLocatorHandler(params: PageUnregisterLocatorHandlerParams, progress?: Progress): Promise<PageUnregisterLocatorHandlerResult>;
+  reload(params: PageReloadParams, progress?: Progress): Promise<PageReloadResult>;
+  expectScreenshot(params: PageExpectScreenshotParams, progress?: Progress): Promise<PageExpectScreenshotResult>;
+  screenshot(params: PageScreenshotParams, progress?: Progress): Promise<PageScreenshotResult>;
+  setExtraHTTPHeaders(params: PageSetExtraHTTPHeadersParams, progress?: Progress): Promise<PageSetExtraHTTPHeadersResult>;
+  setNetworkInterceptionPatterns(params: PageSetNetworkInterceptionPatternsParams, progress?: Progress): Promise<PageSetNetworkInterceptionPatternsResult>;
+  setWebSocketInterceptionPatterns(params: PageSetWebSocketInterceptionPatternsParams, progress?: Progress): Promise<PageSetWebSocketInterceptionPatternsResult>;
+  setViewportSize(params: PageSetViewportSizeParams, progress?: Progress): Promise<PageSetViewportSizeResult>;
+  keyboardDown(params: PageKeyboardDownParams, progress?: Progress): Promise<PageKeyboardDownResult>;
+  keyboardUp(params: PageKeyboardUpParams, progress?: Progress): Promise<PageKeyboardUpResult>;
+  keyboardInsertText(params: PageKeyboardInsertTextParams, progress?: Progress): Promise<PageKeyboardInsertTextResult>;
+  keyboardType(params: PageKeyboardTypeParams, progress?: Progress): Promise<PageKeyboardTypeResult>;
+  keyboardPress(params: PageKeyboardPressParams, progress?: Progress): Promise<PageKeyboardPressResult>;
+  mouseMove(params: PageMouseMoveParams, progress?: Progress): Promise<PageMouseMoveResult>;
+  mouseDown(params: PageMouseDownParams, progress?: Progress): Promise<PageMouseDownResult>;
+  mouseUp(params: PageMouseUpParams, progress?: Progress): Promise<PageMouseUpResult>;
+  mouseClick(params: PageMouseClickParams, progress?: Progress): Promise<PageMouseClickResult>;
+  mouseWheel(params: PageMouseWheelParams, progress?: Progress): Promise<PageMouseWheelResult>;
+  touchscreenTap(params: PageTouchscreenTapParams, progress?: Progress): Promise<PageTouchscreenTapResult>;
+  accessibilitySnapshot(params: PageAccessibilitySnapshotParams, progress?: Progress): Promise<PageAccessibilitySnapshotResult>;
+  pdf(params: PagePdfParams, progress?: Progress): Promise<PagePdfResult>;
+  snapshotForAI(params: PageSnapshotForAIParams, progress?: Progress): Promise<PageSnapshotForAIResult>;
+  startJSCoverage(params: PageStartJSCoverageParams, progress?: Progress): Promise<PageStartJSCoverageResult>;
+  stopJSCoverage(params?: PageStopJSCoverageParams, progress?: Progress): Promise<PageStopJSCoverageResult>;
+  startCSSCoverage(params: PageStartCSSCoverageParams, progress?: Progress): Promise<PageStartCSSCoverageResult>;
+  stopCSSCoverage(params?: PageStopCSSCoverageParams, progress?: Progress): Promise<PageStopCSSCoverageResult>;
+  bringToFront(params?: PageBringToFrontParams, progress?: Progress): Promise<PageBringToFrontResult>;
+  updateSubscription(params: PageUpdateSubscriptionParams, progress?: Progress): Promise<PageUpdateSubscriptionResult>;
 }
 export type PageBindingCallEvent = {
   binding: BindingCallChannel,
@@ -1970,6 +2126,12 @@ export type PageDownloadEvent = {
   suggestedFilename: string,
   artifact: ArtifactChannel,
 };
+export type PageViewportSizeChangedEvent = {
+  viewportSize?: {
+    width: number,
+    height: number,
+  },
+};
 export type PageFileChooserEvent = {
   element: ElementHandleChannel,
   isMultiple: boolean,
@@ -1986,6 +2148,9 @@ export type PageLocatorHandlerTriggeredEvent = {
 export type PageRouteEvent = {
   route: RouteChannel,
 };
+export type PageWebSocketRouteEvent = {
+  webSocketRoute: WebSocketRouteChannel,
+};
 export type PageVideoEvent = {
   artifact: ArtifactChannel,
 };
@@ -1995,20 +2160,6 @@ export type PageWebSocketEvent = {
 export type PageWorkerEvent = {
   worker: WorkerChannel,
 };
-export type PageSetDefaultNavigationTimeoutNoReplyParams = {
-  timeout?: number,
-};
-export type PageSetDefaultNavigationTimeoutNoReplyOptions = {
-  timeout?: number,
-};
-export type PageSetDefaultNavigationTimeoutNoReplyResult = void;
-export type PageSetDefaultTimeoutNoReplyParams = {
-  timeout?: number,
-};
-export type PageSetDefaultTimeoutNoReplyOptions = {
-  timeout?: number,
-};
-export type PageSetDefaultTimeoutNoReplyResult = void;
 export type PageAddInitScriptParams = {
   source: string,
 };
@@ -2030,12 +2181,14 @@ export type PageEmulateMediaParams = {
   colorScheme?: 'dark' | 'light' | 'no-preference' | 'no-override',
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
+  contrast?: 'no-preference' | 'more' | 'no-override',
 };
 export type PageEmulateMediaOptions = {
   media?: 'screen' | 'print' | 'no-override',
   colorScheme?: 'dark' | 'light' | 'no-preference' | 'no-override',
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
+  contrast?: 'no-preference' | 'more' | 'no-override',
 };
 export type PageEmulateMediaResult = void;
 export type PageExposeBindingParams = {
@@ -2047,27 +2200,28 @@ export type PageExposeBindingOptions = {
 };
 export type PageExposeBindingResult = void;
 export type PageGoBackParams = {
-  timeout?: number,
+  timeout: number,
   waitUntil?: LifecycleEvent,
 };
 export type PageGoBackOptions = {
-  timeout?: number,
   waitUntil?: LifecycleEvent,
 };
 export type PageGoBackResult = {
   response?: ResponseChannel,
 };
 export type PageGoForwardParams = {
-  timeout?: number,
+  timeout: number,
   waitUntil?: LifecycleEvent,
 };
 export type PageGoForwardOptions = {
-  timeout?: number,
   waitUntil?: LifecycleEvent,
 };
 export type PageGoForwardResult = {
   response?: ResponseChannel,
 };
+export type PageRequestGCParams = {};
+export type PageRequestGCOptions = {};
+export type PageRequestGCResult = void;
 export type PageRegisterLocatorHandlerParams = {
   selector: string,
   noWaitAfter?: boolean,
@@ -2094,11 +2248,10 @@ export type PageUnregisterLocatorHandlerOptions = {
 };
 export type PageUnregisterLocatorHandlerResult = void;
 export type PageReloadParams = {
-  timeout?: number,
+  timeout: number,
   waitUntil?: LifecycleEvent,
 };
 export type PageReloadOptions = {
-  timeout?: number,
   waitUntil?: LifecycleEvent,
 };
 export type PageReloadResult = {
@@ -2106,7 +2259,7 @@ export type PageReloadResult = {
 };
 export type PageExpectScreenshotParams = {
   expected?: Binary,
-  timeout?: number,
+  timeout: number,
   isNot: boolean,
   locator?: {
     frame: FrameChannel,
@@ -2131,7 +2284,6 @@ export type PageExpectScreenshotParams = {
 };
 export type PageExpectScreenshotOptions = {
   expected?: Binary,
-  timeout?: number,
   locator?: {
     frame: FrameChannel,
     selector: string,
@@ -2158,10 +2310,11 @@ export type PageExpectScreenshotResult = {
   errorMessage?: string,
   actual?: Binary,
   previous?: Binary,
+  timedOut?: boolean,
   log?: string[],
 };
 export type PageScreenshotParams = {
-  timeout?: number,
+  timeout: number,
   type?: 'png' | 'jpeg',
   quality?: number,
   fullPage?: boolean,
@@ -2178,7 +2331,6 @@ export type PageScreenshotParams = {
   style?: string,
 };
 export type PageScreenshotOptions = {
-  timeout?: number,
   type?: 'png' | 'jpeg',
   quality?: number,
   fullPage?: boolean,
@@ -2215,6 +2367,17 @@ export type PageSetNetworkInterceptionPatternsOptions = {
 
 };
 export type PageSetNetworkInterceptionPatternsResult = void;
+export type PageSetWebSocketInterceptionPatternsParams = {
+  patterns: {
+    glob?: string,
+    regexSource?: string,
+    regexFlags?: string,
+  }[],
+};
+export type PageSetWebSocketInterceptionPatternsOptions = {
+
+};
+export type PageSetWebSocketInterceptionPatternsResult = void;
 export type PageSetViewportSizeParams = {
   viewportSize: {
     width: number,
@@ -2374,6 +2537,15 @@ export type PagePdfOptions = {
 export type PagePdfResult = {
   pdf: Binary,
 };
+export type PageSnapshotForAIParams = {
+  timeout: number,
+};
+export type PageSnapshotForAIOptions = {
+
+};
+export type PageSnapshotForAIResult = {
+  snapshot: string,
+};
 export type PageStartJSCoverageParams = {
   resetOnNavigation?: boolean,
   reportAnonymousScripts?: boolean,
@@ -2437,11 +2609,13 @@ export interface PageEvents {
   'close': PageCloseEvent;
   'crash': PageCrashEvent;
   'download': PageDownloadEvent;
+  'viewportSizeChanged': PageViewportSizeChangedEvent;
   'fileChooser': PageFileChooserEvent;
   'frameAttached': PageFrameAttachedEvent;
   'frameDetached': PageFrameDetachedEvent;
   'locatorHandlerTriggered': PageLocatorHandlerTriggeredEvent;
   'route': PageRouteEvent;
+  'webSocketRoute': PageWebSocketRouteEvent;
   'video': PageVideoEvent;
   'webSocket': PageWebSocketEvent;
   'worker': PageWorkerEvent;
@@ -2460,51 +2634,53 @@ export interface FrameEventTarget {
 }
 export interface FrameChannel extends FrameEventTarget, Channel {
   _type_Frame: boolean;
-  evalOnSelector(params: FrameEvalOnSelectorParams, metadata?: CallMetadata): Promise<FrameEvalOnSelectorResult>;
-  evalOnSelectorAll(params: FrameEvalOnSelectorAllParams, metadata?: CallMetadata): Promise<FrameEvalOnSelectorAllResult>;
-  addScriptTag(params: FrameAddScriptTagParams, metadata?: CallMetadata): Promise<FrameAddScriptTagResult>;
-  addStyleTag(params: FrameAddStyleTagParams, metadata?: CallMetadata): Promise<FrameAddStyleTagResult>;
-  blur(params: FrameBlurParams, metadata?: CallMetadata): Promise<FrameBlurResult>;
-  check(params: FrameCheckParams, metadata?: CallMetadata): Promise<FrameCheckResult>;
-  click(params: FrameClickParams, metadata?: CallMetadata): Promise<FrameClickResult>;
-  content(params?: FrameContentParams, metadata?: CallMetadata): Promise<FrameContentResult>;
-  dragAndDrop(params: FrameDragAndDropParams, metadata?: CallMetadata): Promise<FrameDragAndDropResult>;
-  dblclick(params: FrameDblclickParams, metadata?: CallMetadata): Promise<FrameDblclickResult>;
-  dispatchEvent(params: FrameDispatchEventParams, metadata?: CallMetadata): Promise<FrameDispatchEventResult>;
-  evaluateExpression(params: FrameEvaluateExpressionParams, metadata?: CallMetadata): Promise<FrameEvaluateExpressionResult>;
-  evaluateExpressionHandle(params: FrameEvaluateExpressionHandleParams, metadata?: CallMetadata): Promise<FrameEvaluateExpressionHandleResult>;
-  fill(params: FrameFillParams, metadata?: CallMetadata): Promise<FrameFillResult>;
-  focus(params: FrameFocusParams, metadata?: CallMetadata): Promise<FrameFocusResult>;
-  frameElement(params?: FrameFrameElementParams, metadata?: CallMetadata): Promise<FrameFrameElementResult>;
-  highlight(params: FrameHighlightParams, metadata?: CallMetadata): Promise<FrameHighlightResult>;
-  getAttribute(params: FrameGetAttributeParams, metadata?: CallMetadata): Promise<FrameGetAttributeResult>;
-  goto(params: FrameGotoParams, metadata?: CallMetadata): Promise<FrameGotoResult>;
-  hover(params: FrameHoverParams, metadata?: CallMetadata): Promise<FrameHoverResult>;
-  innerHTML(params: FrameInnerHTMLParams, metadata?: CallMetadata): Promise<FrameInnerHTMLResult>;
-  innerText(params: FrameInnerTextParams, metadata?: CallMetadata): Promise<FrameInnerTextResult>;
-  inputValue(params: FrameInputValueParams, metadata?: CallMetadata): Promise<FrameInputValueResult>;
-  isChecked(params: FrameIsCheckedParams, metadata?: CallMetadata): Promise<FrameIsCheckedResult>;
-  isDisabled(params: FrameIsDisabledParams, metadata?: CallMetadata): Promise<FrameIsDisabledResult>;
-  isEnabled(params: FrameIsEnabledParams, metadata?: CallMetadata): Promise<FrameIsEnabledResult>;
-  isHidden(params: FrameIsHiddenParams, metadata?: CallMetadata): Promise<FrameIsHiddenResult>;
-  isVisible(params: FrameIsVisibleParams, metadata?: CallMetadata): Promise<FrameIsVisibleResult>;
-  isEditable(params: FrameIsEditableParams, metadata?: CallMetadata): Promise<FrameIsEditableResult>;
-  press(params: FramePressParams, metadata?: CallMetadata): Promise<FramePressResult>;
-  querySelector(params: FrameQuerySelectorParams, metadata?: CallMetadata): Promise<FrameQuerySelectorResult>;
-  querySelectorAll(params: FrameQuerySelectorAllParams, metadata?: CallMetadata): Promise<FrameQuerySelectorAllResult>;
-  queryCount(params: FrameQueryCountParams, metadata?: CallMetadata): Promise<FrameQueryCountResult>;
-  selectOption(params: FrameSelectOptionParams, metadata?: CallMetadata): Promise<FrameSelectOptionResult>;
-  setContent(params: FrameSetContentParams, metadata?: CallMetadata): Promise<FrameSetContentResult>;
-  setInputFiles(params: FrameSetInputFilesParams, metadata?: CallMetadata): Promise<FrameSetInputFilesResult>;
-  tap(params: FrameTapParams, metadata?: CallMetadata): Promise<FrameTapResult>;
-  textContent(params: FrameTextContentParams, metadata?: CallMetadata): Promise<FrameTextContentResult>;
-  title(params?: FrameTitleParams, metadata?: CallMetadata): Promise<FrameTitleResult>;
-  type(params: FrameTypeParams, metadata?: CallMetadata): Promise<FrameTypeResult>;
-  uncheck(params: FrameUncheckParams, metadata?: CallMetadata): Promise<FrameUncheckResult>;
-  waitForTimeout(params: FrameWaitForTimeoutParams, metadata?: CallMetadata): Promise<FrameWaitForTimeoutResult>;
-  waitForFunction(params: FrameWaitForFunctionParams, metadata?: CallMetadata): Promise<FrameWaitForFunctionResult>;
-  waitForSelector(params: FrameWaitForSelectorParams, metadata?: CallMetadata): Promise<FrameWaitForSelectorResult>;
-  expect(params: FrameExpectParams, metadata?: CallMetadata): Promise<FrameExpectResult>;
+  evalOnSelector(params: FrameEvalOnSelectorParams, progress?: Progress): Promise<FrameEvalOnSelectorResult>;
+  evalOnSelectorAll(params: FrameEvalOnSelectorAllParams, progress?: Progress): Promise<FrameEvalOnSelectorAllResult>;
+  addScriptTag(params: FrameAddScriptTagParams, progress?: Progress): Promise<FrameAddScriptTagResult>;
+  addStyleTag(params: FrameAddStyleTagParams, progress?: Progress): Promise<FrameAddStyleTagResult>;
+  ariaSnapshot(params: FrameAriaSnapshotParams, progress?: Progress): Promise<FrameAriaSnapshotResult>;
+  blur(params: FrameBlurParams, progress?: Progress): Promise<FrameBlurResult>;
+  check(params: FrameCheckParams, progress?: Progress): Promise<FrameCheckResult>;
+  click(params: FrameClickParams, progress?: Progress): Promise<FrameClickResult>;
+  content(params?: FrameContentParams, progress?: Progress): Promise<FrameContentResult>;
+  dragAndDrop(params: FrameDragAndDropParams, progress?: Progress): Promise<FrameDragAndDropResult>;
+  dblclick(params: FrameDblclickParams, progress?: Progress): Promise<FrameDblclickResult>;
+  dispatchEvent(params: FrameDispatchEventParams, progress?: Progress): Promise<FrameDispatchEventResult>;
+  evaluateExpression(params: FrameEvaluateExpressionParams, progress?: Progress): Promise<FrameEvaluateExpressionResult>;
+  evaluateExpressionHandle(params: FrameEvaluateExpressionHandleParams, progress?: Progress): Promise<FrameEvaluateExpressionHandleResult>;
+  fill(params: FrameFillParams, progress?: Progress): Promise<FrameFillResult>;
+  focus(params: FrameFocusParams, progress?: Progress): Promise<FrameFocusResult>;
+  frameElement(params?: FrameFrameElementParams, progress?: Progress): Promise<FrameFrameElementResult>;
+  resolveSelector(params: FrameResolveSelectorParams, progress?: Progress): Promise<FrameResolveSelectorResult>;
+  highlight(params: FrameHighlightParams, progress?: Progress): Promise<FrameHighlightResult>;
+  getAttribute(params: FrameGetAttributeParams, progress?: Progress): Promise<FrameGetAttributeResult>;
+  goto(params: FrameGotoParams, progress?: Progress): Promise<FrameGotoResult>;
+  hover(params: FrameHoverParams, progress?: Progress): Promise<FrameHoverResult>;
+  innerHTML(params: FrameInnerHTMLParams, progress?: Progress): Promise<FrameInnerHTMLResult>;
+  innerText(params: FrameInnerTextParams, progress?: Progress): Promise<FrameInnerTextResult>;
+  inputValue(params: FrameInputValueParams, progress?: Progress): Promise<FrameInputValueResult>;
+  isChecked(params: FrameIsCheckedParams, progress?: Progress): Promise<FrameIsCheckedResult>;
+  isDisabled(params: FrameIsDisabledParams, progress?: Progress): Promise<FrameIsDisabledResult>;
+  isEnabled(params: FrameIsEnabledParams, progress?: Progress): Promise<FrameIsEnabledResult>;
+  isHidden(params: FrameIsHiddenParams, progress?: Progress): Promise<FrameIsHiddenResult>;
+  isVisible(params: FrameIsVisibleParams, progress?: Progress): Promise<FrameIsVisibleResult>;
+  isEditable(params: FrameIsEditableParams, progress?: Progress): Promise<FrameIsEditableResult>;
+  press(params: FramePressParams, progress?: Progress): Promise<FramePressResult>;
+  querySelector(params: FrameQuerySelectorParams, progress?: Progress): Promise<FrameQuerySelectorResult>;
+  querySelectorAll(params: FrameQuerySelectorAllParams, progress?: Progress): Promise<FrameQuerySelectorAllResult>;
+  queryCount(params: FrameQueryCountParams, progress?: Progress): Promise<FrameQueryCountResult>;
+  selectOption(params: FrameSelectOptionParams, progress?: Progress): Promise<FrameSelectOptionResult>;
+  setContent(params: FrameSetContentParams, progress?: Progress): Promise<FrameSetContentResult>;
+  setInputFiles(params: FrameSetInputFilesParams, progress?: Progress): Promise<FrameSetInputFilesResult>;
+  tap(params: FrameTapParams, progress?: Progress): Promise<FrameTapResult>;
+  textContent(params: FrameTextContentParams, progress?: Progress): Promise<FrameTextContentResult>;
+  title(params?: FrameTitleParams, progress?: Progress): Promise<FrameTitleResult>;
+  type(params: FrameTypeParams, progress?: Progress): Promise<FrameTypeResult>;
+  uncheck(params: FrameUncheckParams, progress?: Progress): Promise<FrameUncheckResult>;
+  waitForTimeout(params: FrameWaitForTimeoutParams, progress?: Progress): Promise<FrameWaitForTimeoutResult>;
+  waitForFunction(params: FrameWaitForFunctionParams, progress?: Progress): Promise<FrameWaitForFunctionResult>;
+  waitForSelector(params: FrameWaitForSelectorParams, progress?: Progress): Promise<FrameWaitForSelectorResult>;
+  expect(params: FrameExpectParams, progress?: Progress): Promise<FrameExpectResult>;
 }
 export type FrameLoadstateEvent = {
   add?: LifecycleEvent,
@@ -2568,14 +2744,23 @@ export type FrameAddStyleTagOptions = {
 export type FrameAddStyleTagResult = {
   element: ElementHandleChannel,
 };
+export type FrameAriaSnapshotParams = {
+  selector: string,
+  timeout: number,
+};
+export type FrameAriaSnapshotOptions = {
+
+};
+export type FrameAriaSnapshotResult = {
+  snapshot: string,
+};
 export type FrameBlurParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameBlurOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameBlurResult = void;
 export type FrameCheckParams = {
@@ -2583,14 +2768,13 @@ export type FrameCheckParams = {
   strict?: boolean,
   force?: boolean,
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type FrameCheckOptions = {
   strict?: boolean,
   force?: boolean,
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type FrameCheckResult = void;
@@ -2604,7 +2788,7 @@ export type FrameClickParams = {
   delay?: number,
   button?: 'left' | 'right' | 'middle',
   clickCount?: number,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type FrameClickOptions = {
@@ -2616,7 +2800,6 @@ export type FrameClickOptions = {
   delay?: number,
   button?: 'left' | 'right' | 'middle',
   clickCount?: number,
-  timeout?: number,
   trial?: boolean,
 };
 export type FrameClickResult = void;
@@ -2629,7 +2812,7 @@ export type FrameDragAndDropParams = {
   source: string,
   target: string,
   force?: boolean,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
   sourcePosition?: Point,
   targetPosition?: Point,
@@ -2637,7 +2820,6 @@ export type FrameDragAndDropParams = {
 };
 export type FrameDragAndDropOptions = {
   force?: boolean,
-  timeout?: number,
   trial?: boolean,
   sourcePosition?: Point,
   targetPosition?: Point,
@@ -2652,7 +2834,7 @@ export type FrameDblclickParams = {
   position?: Point,
   delay?: number,
   button?: 'left' | 'right' | 'middle',
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type FrameDblclickOptions = {
@@ -2662,7 +2844,6 @@ export type FrameDblclickOptions = {
   position?: Point,
   delay?: number,
   button?: 'left' | 'right' | 'middle',
-  timeout?: number,
   trial?: boolean,
 };
 export type FrameDblclickResult = void;
@@ -2671,11 +2852,10 @@ export type FrameDispatchEventParams = {
   strict?: boolean,
   type: string,
   eventInit: SerializedArgument,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameDispatchEventOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameDispatchEventResult = void;
 export type FrameEvaluateExpressionParams = {
@@ -2705,22 +2885,20 @@ export type FrameFillParams = {
   strict?: boolean,
   value: string,
   force?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameFillOptions = {
   strict?: boolean,
   force?: boolean,
-  timeout?: number,
 };
 export type FrameFillResult = void;
 export type FrameFocusParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameFocusOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameFocusResult = void;
 export type FrameFrameElementParams = {};
@@ -2728,6 +2906,15 @@ export type FrameFrameElementOptions = {};
 export type FrameFrameElementResult = {
   element: ElementHandleChannel,
 };
+export type FrameResolveSelectorParams = {
+  selector: string,
+};
+export type FrameResolveSelectorOptions = {
+
+};
+export type FrameResolveSelectorResult = {
+  resolvedSelector: string,
+};
 export type FrameHighlightParams = {
   selector: string,
 };
@@ -2739,23 +2926,21 @@ export type FrameGetAttributeParams = {
   selector: string,
   strict?: boolean,
   name: string,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameGetAttributeOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameGetAttributeResult = {
   value?: string,
 };
 export type FrameGotoParams = {
   url: string,
-  timeout?: number,
+  timeout: number,
   waitUntil?: LifecycleEvent,
   referer?: string,
 };
 export type FrameGotoOptions = {
-  timeout?: number,
   waitUntil?: LifecycleEvent,
   referer?: string,
 };
@@ -2768,7 +2953,7 @@ export type FrameHoverParams = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type FrameHoverOptions = {
@@ -2776,18 +2961,16 @@ export type FrameHoverOptions = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type FrameHoverResult = void;
 export type FrameInnerHTMLParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameInnerHTMLOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameInnerHTMLResult = {
   value: string,
@@ -2795,11 +2978,10 @@ export type FrameInnerHTMLResult = {
 export type FrameInnerTextParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameInnerTextOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameInnerTextResult = {
   value: string,
@@ -2807,11 +2989,10 @@ export type FrameInnerTextResult = {
 export type FrameInputValueParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameInputValueOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameInputValueResult = {
   value: string,
@@ -2819,11 +3000,10 @@ export type FrameInputValueResult = {
 export type FrameIsCheckedParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameIsCheckedOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameIsCheckedResult = {
   value: boolean,
@@ -2831,11 +3011,10 @@ export type FrameIsCheckedResult = {
 export type FrameIsDisabledParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameIsDisabledOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameIsDisabledResult = {
   value: boolean,
@@ -2843,11 +3022,10 @@ export type FrameIsDisabledResult = {
 export type FrameIsEnabledParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameIsEnabledOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameIsEnabledResult = {
   value: boolean,
@@ -2875,11 +3053,10 @@ export type FrameIsVisibleResult = {
 export type FrameIsEditableParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameIsEditableOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameIsEditableResult = {
   value: boolean,
@@ -2890,13 +3067,12 @@ export type FramePressParams = {
   key: string,
   delay?: number,
   noWaitAfter?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FramePressOptions = {
   strict?: boolean,
   delay?: number,
   noWaitAfter?: boolean,
-  timeout?: number,
 };
 export type FramePressResult = void;
 export type FrameQuerySelectorParams = {
@@ -2938,8 +3114,7 @@ export type FrameSelectOptionParams = {
     index?: number,
   }[],
   force?: boolean,
-  timeout?: number,
-  noWaitAfter?: boolean,
+  timeout: number,
 };
 export type FrameSelectOptionOptions = {
   strict?: boolean,
@@ -2951,19 +3126,16 @@ export type FrameSelectOptionOptions = {
     index?: number,
   }[],
   force?: boolean,
-  timeout?: number,
-  noWaitAfter?: boolean,
 };
 export type FrameSelectOptionResult = {
   values: string[],
 };
 export type FrameSetContentParams = {
   html: string,
-  timeout?: number,
+  timeout: number,
   waitUntil?: LifecycleEvent,
 };
 export type FrameSetContentOptions = {
-  timeout?: number,
   waitUntil?: LifecycleEvent,
 };
 export type FrameSetContentResult = void;
@@ -2979,7 +3151,7 @@ export type FrameSetInputFilesParams = {
   directoryStream?: WritableStreamChannel,
   localPaths?: string[],
   streams?: WritableStreamChannel[],
-  timeout?: number,
+  timeout: number,
 };
 export type FrameSetInputFilesOptions = {
   strict?: boolean,
@@ -2992,7 +3164,6 @@ export type FrameSetInputFilesOptions = {
   directoryStream?: WritableStreamChannel,
   localPaths?: string[],
   streams?: WritableStreamChannel[],
-  timeout?: number,
 };
 export type FrameSetInputFilesResult = void;
 export type FrameTapParams = {
@@ -3001,7 +3172,7 @@ export type FrameTapParams = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type FrameTapOptions = {
@@ -3009,18 +3180,16 @@ export type FrameTapOptions = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type FrameTapResult = void;
 export type FrameTextContentParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameTextContentOptions = {
   strict?: boolean,
-  timeout?: number,
 };
 export type FrameTextContentResult = {
   value?: string,
@@ -3035,12 +3204,11 @@ export type FrameTypeParams = {
   strict?: boolean,
   text: string,
   delay?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameTypeOptions = {
   strict?: boolean,
   delay?: number,
-  timeout?: number,
 };
 export type FrameTypeResult = void;
 export type FrameUncheckParams = {
@@ -3048,19 +3216,18 @@ export type FrameUncheckParams = {
   strict?: boolean,
   force?: boolean,
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type FrameUncheckOptions = {
   strict?: boolean,
   force?: boolean,
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type FrameUncheckResult = void;
 export type FrameWaitForTimeoutParams = {
-  timeout: number,
+  waitTimeout: number,
 };
 export type FrameWaitForTimeoutOptions = {
 
@@ -3070,12 +3237,11 @@ export type FrameWaitForFunctionParams = {
   expression: string,
   isFunction?: boolean,
   arg: SerializedArgument,
-  timeout?: number,
+  timeout: number,
   pollingInterval?: number,
 };
 export type FrameWaitForFunctionOptions = {
   isFunction?: boolean,
-  timeout?: number,
   pollingInterval?: number,
 };
 export type FrameWaitForFunctionResult = {
@@ -3084,13 +3250,12 @@ export type FrameWaitForFunctionResult = {
 export type FrameWaitForSelectorParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
   state?: 'attached' | 'detached' | 'visible' | 'hidden',
   omitReturnValue?: boolean,
 };
 export type FrameWaitForSelectorOptions = {
   strict?: boolean,
-  timeout?: number,
   state?: 'attached' | 'detached' | 'visible' | 'hidden',
   omitReturnValue?: boolean,
 };
@@ -3098,7 +3263,7 @@ export type FrameWaitForSelectorResult = {
   element?: ElementHandleChannel,
 };
 export type FrameExpectParams = {
-  selector: string,
+  selector?: string,
   expression: string,
   expressionArg?: any,
   expectedText?: ExpectedTextValue[],
@@ -3106,15 +3271,15 @@ export type FrameExpectParams = {
   expectedValue?: SerializedArgument,
   useInnerText?: boolean,
   isNot: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type FrameExpectOptions = {
+  selector?: string,
   expressionArg?: any,
   expectedText?: ExpectedTextValue[],
   expectedNumber?: number,
   expectedValue?: SerializedArgument,
   useInnerText?: boolean,
-  timeout?: number,
 };
 export type FrameExpectResult = {
   matches: boolean,
@@ -3137,8 +3302,8 @@ export interface WorkerEventTarget {
 }
 export interface WorkerChannel extends WorkerEventTarget, Channel {
   _type_Worker: boolean;
-  evaluateExpression(params: WorkerEvaluateExpressionParams, metadata?: CallMetadata): Promise<WorkerEvaluateExpressionResult>;
-  evaluateExpressionHandle(params: WorkerEvaluateExpressionHandleParams, metadata?: CallMetadata): Promise<WorkerEvaluateExpressionHandleResult>;
+  evaluateExpression(params: WorkerEvaluateExpressionParams, progress?: Progress): Promise<WorkerEvaluateExpressionResult>;
+  evaluateExpressionHandle(params: WorkerEvaluateExpressionHandleParams, progress?: Progress): Promise<WorkerEvaluateExpressionHandleResult>;
 }
 export type WorkerCloseEvent = {};
 export type WorkerEvaluateExpressionParams = {
@@ -3177,13 +3342,12 @@ export interface JSHandleEventTarget {
 }
 export interface JSHandleChannel extends JSHandleEventTarget, Channel {
   _type_JSHandle: boolean;
-  dispose(params?: JSHandleDisposeParams, metadata?: CallMetadata): Promise<JSHandleDisposeResult>;
-  evaluateExpression(params: JSHandleEvaluateExpressionParams, metadata?: CallMetadata): Promise<JSHandleEvaluateExpressionResult>;
-  evaluateExpressionHandle(params: JSHandleEvaluateExpressionHandleParams, metadata?: CallMetadata): Promise<JSHandleEvaluateExpressionHandleResult>;
-  getPropertyList(params?: JSHandleGetPropertyListParams, metadata?: CallMetadata): Promise<JSHandleGetPropertyListResult>;
-  getProperty(params: JSHandleGetPropertyParams, metadata?: CallMetadata): Promise<JSHandleGetPropertyResult>;
-  jsonValue(params?: JSHandleJsonValueParams, metadata?: CallMetadata): Promise<JSHandleJsonValueResult>;
-  objectCount(params?: JSHandleObjectCountParams, metadata?: CallMetadata): Promise<JSHandleObjectCountResult>;
+  dispose(params?: JSHandleDisposeParams, progress?: Progress): Promise<JSHandleDisposeResult>;
+  evaluateExpression(params: JSHandleEvaluateExpressionParams, progress?: Progress): Promise<JSHandleEvaluateExpressionResult>;
+  evaluateExpressionHandle(params: JSHandleEvaluateExpressionHandleParams, progress?: Progress): Promise<JSHandleEvaluateExpressionHandleResult>;
+  getPropertyList(params?: JSHandleGetPropertyListParams, progress?: Progress): Promise<JSHandleGetPropertyListResult>;
+  getProperty(params: JSHandleGetPropertyParams, progress?: Progress): Promise<JSHandleGetPropertyResult>;
+  jsonValue(params?: JSHandleJsonValueParams, progress?: Progress): Promise<JSHandleJsonValueResult>;
 }
 export type JSHandlePreviewUpdatedEvent = {
   preview: string,
@@ -3235,11 +3399,6 @@ export type JSHandleJsonValueOptions = {};
 export type JSHandleJsonValueResult = {
   value: SerializedValue,
 };
-export type JSHandleObjectCountParams = {};
-export type JSHandleObjectCountOptions = {};
-export type JSHandleObjectCountResult = {
-  count: number,
-};
 
 export interface JSHandleEvents {
   'previewUpdated': JSHandlePreviewUpdatedEvent;
@@ -3251,42 +3410,42 @@ export interface ElementHandleEventTarget {
 }
 export interface ElementHandleChannel extends ElementHandleEventTarget, JSHandleChannel {
   _type_ElementHandle: boolean;
-  evalOnSelector(params: ElementHandleEvalOnSelectorParams, metadata?: CallMetadata): Promise<ElementHandleEvalOnSelectorResult>;
-  evalOnSelectorAll(params: ElementHandleEvalOnSelectorAllParams, metadata?: CallMetadata): Promise<ElementHandleEvalOnSelectorAllResult>;
-  boundingBox(params?: ElementHandleBoundingBoxParams, metadata?: CallMetadata): Promise<ElementHandleBoundingBoxResult>;
-  check(params: ElementHandleCheckParams, metadata?: CallMetadata): Promise<ElementHandleCheckResult>;
-  click(params: ElementHandleClickParams, metadata?: CallMetadata): Promise<ElementHandleClickResult>;
-  contentFrame(params?: ElementHandleContentFrameParams, metadata?: CallMetadata): Promise<ElementHandleContentFrameResult>;
-  dblclick(params: ElementHandleDblclickParams, metadata?: CallMetadata): Promise<ElementHandleDblclickResult>;
-  dispatchEvent(params: ElementHandleDispatchEventParams, metadata?: CallMetadata): Promise<ElementHandleDispatchEventResult>;
-  fill(params: ElementHandleFillParams, metadata?: CallMetadata): Promise<ElementHandleFillResult>;
-  focus(params?: ElementHandleFocusParams, metadata?: CallMetadata): Promise<ElementHandleFocusResult>;
-  getAttribute(params: ElementHandleGetAttributeParams, metadata?: CallMetadata): Promise<ElementHandleGetAttributeResult>;
-  hover(params: ElementHandleHoverParams, metadata?: CallMetadata): Promise<ElementHandleHoverResult>;
-  innerHTML(params?: ElementHandleInnerHTMLParams, metadata?: CallMetadata): Promise<ElementHandleInnerHTMLResult>;
-  innerText(params?: ElementHandleInnerTextParams, metadata?: CallMetadata): Promise<ElementHandleInnerTextResult>;
-  inputValue(params?: ElementHandleInputValueParams, metadata?: CallMetadata): Promise<ElementHandleInputValueResult>;
-  isChecked(params?: ElementHandleIsCheckedParams, metadata?: CallMetadata): Promise<ElementHandleIsCheckedResult>;
-  isDisabled(params?: ElementHandleIsDisabledParams, metadata?: CallMetadata): Promise<ElementHandleIsDisabledResult>;
-  isEditable(params?: ElementHandleIsEditableParams, metadata?: CallMetadata): Promise<ElementHandleIsEditableResult>;
-  isEnabled(params?: ElementHandleIsEnabledParams, metadata?: CallMetadata): Promise<ElementHandleIsEnabledResult>;
-  isHidden(params?: ElementHandleIsHiddenParams, metadata?: CallMetadata): Promise<ElementHandleIsHiddenResult>;
-  isVisible(params?: ElementHandleIsVisibleParams, metadata?: CallMetadata): Promise<ElementHandleIsVisibleResult>;
-  ownerFrame(params?: ElementHandleOwnerFrameParams, metadata?: CallMetadata): Promise<ElementHandleOwnerFrameResult>;
-  press(params: ElementHandlePressParams, metadata?: CallMetadata): Promise<ElementHandlePressResult>;
-  querySelector(params: ElementHandleQuerySelectorParams, metadata?: CallMetadata): Promise<ElementHandleQuerySelectorResult>;
-  querySelectorAll(params: ElementHandleQuerySelectorAllParams, metadata?: CallMetadata): Promise<ElementHandleQuerySelectorAllResult>;
-  screenshot(params: ElementHandleScreenshotParams, metadata?: CallMetadata): Promise<ElementHandleScreenshotResult>;
-  scrollIntoViewIfNeeded(params: ElementHandleScrollIntoViewIfNeededParams, metadata?: CallMetadata): Promise<ElementHandleScrollIntoViewIfNeededResult>;
-  selectOption(params: ElementHandleSelectOptionParams, metadata?: CallMetadata): Promise<ElementHandleSelectOptionResult>;
-  selectText(params: ElementHandleSelectTextParams, metadata?: CallMetadata): Promise<ElementHandleSelectTextResult>;
-  setInputFiles(params: ElementHandleSetInputFilesParams, metadata?: CallMetadata): Promise<ElementHandleSetInputFilesResult>;
-  tap(params: ElementHandleTapParams, metadata?: CallMetadata): Promise<ElementHandleTapResult>;
-  textContent(params?: ElementHandleTextContentParams, metadata?: CallMetadata): Promise<ElementHandleTextContentResult>;
-  type(params: ElementHandleTypeParams, metadata?: CallMetadata): Promise<ElementHandleTypeResult>;
-  uncheck(params: ElementHandleUncheckParams, metadata?: CallMetadata): Promise<ElementHandleUncheckResult>;
-  waitForElementState(params: ElementHandleWaitForElementStateParams, metadata?: CallMetadata): Promise<ElementHandleWaitForElementStateResult>;
-  waitForSelector(params: ElementHandleWaitForSelectorParams, metadata?: CallMetadata): Promise<ElementHandleWaitForSelectorResult>;
+  evalOnSelector(params: ElementHandleEvalOnSelectorParams, progress?: Progress): Promise<ElementHandleEvalOnSelectorResult>;
+  evalOnSelectorAll(params: ElementHandleEvalOnSelectorAllParams, progress?: Progress): Promise<ElementHandleEvalOnSelectorAllResult>;
+  boundingBox(params?: ElementHandleBoundingBoxParams, progress?: Progress): Promise<ElementHandleBoundingBoxResult>;
+  check(params: ElementHandleCheckParams, progress?: Progress): Promise<ElementHandleCheckResult>;
+  click(params: ElementHandleClickParams, progress?: Progress): Promise<ElementHandleClickResult>;
+  contentFrame(params?: ElementHandleContentFrameParams, progress?: Progress): Promise<ElementHandleContentFrameResult>;
+  dblclick(params: ElementHandleDblclickParams, progress?: Progress): Promise<ElementHandleDblclickResult>;
+  dispatchEvent(params: ElementHandleDispatchEventParams, progress?: Progress): Promise<ElementHandleDispatchEventResult>;
+  fill(params: ElementHandleFillParams, progress?: Progress): Promise<ElementHandleFillResult>;
+  focus(params?: ElementHandleFocusParams, progress?: Progress): Promise<ElementHandleFocusResult>;
+  getAttribute(params: ElementHandleGetAttributeParams, progress?: Progress): Promise<ElementHandleGetAttributeResult>;
+  hover(params: ElementHandleHoverParams, progress?: Progress): Promise<ElementHandleHoverResult>;
+  innerHTML(params?: ElementHandleInnerHTMLParams, progress?: Progress): Promise<ElementHandleInnerHTMLResult>;
+  innerText(params?: ElementHandleInnerTextParams, progress?: Progress): Promise<ElementHandleInnerTextResult>;
+  inputValue(params?: ElementHandleInputValueParams, progress?: Progress): Promise<ElementHandleInputValueResult>;
+  isChecked(params?: ElementHandleIsCheckedParams, progress?: Progress): Promise<ElementHandleIsCheckedResult>;
+  isDisabled(params?: ElementHandleIsDisabledParams, progress?: Progress): Promise<ElementHandleIsDisabledResult>;
+  isEditable(params?: ElementHandleIsEditableParams, progress?: Progress): Promise<ElementHandleIsEditableResult>;
+  isEnabled(params?: ElementHandleIsEnabledParams, progress?: Progress): Promise<ElementHandleIsEnabledResult>;
+  isHidden(params?: ElementHandleIsHiddenParams, progress?: Progress): Promise<ElementHandleIsHiddenResult>;
+  isVisible(params?: ElementHandleIsVisibleParams, progress?: Progress): Promise<ElementHandleIsVisibleResult>;
+  ownerFrame(params?: ElementHandleOwnerFrameParams, progress?: Progress): Promise<ElementHandleOwnerFrameResult>;
+  press(params: ElementHandlePressParams, progress?: Progress): Promise<ElementHandlePressResult>;
+  querySelector(params: ElementHandleQuerySelectorParams, progress?: Progress): Promise<ElementHandleQuerySelectorResult>;
+  querySelectorAll(params: ElementHandleQuerySelectorAllParams, progress?: Progress): Promise<ElementHandleQuerySelectorAllResult>;
+  screenshot(params: ElementHandleScreenshotParams, progress?: Progress): Promise<ElementHandleScreenshotResult>;
+  scrollIntoViewIfNeeded(params: ElementHandleScrollIntoViewIfNeededParams, progress?: Progress): Promise<ElementHandleScrollIntoViewIfNeededResult>;
+  selectOption(params: ElementHandleSelectOptionParams, progress?: Progress): Promise<ElementHandleSelectOptionResult>;
+  selectText(params: ElementHandleSelectTextParams, progress?: Progress): Promise<ElementHandleSelectTextResult>;
+  setInputFiles(params: ElementHandleSetInputFilesParams, progress?: Progress): Promise<ElementHandleSetInputFilesResult>;
+  tap(params: ElementHandleTapParams, progress?: Progress): Promise<ElementHandleTapResult>;
+  textContent(params?: ElementHandleTextContentParams, progress?: Progress): Promise<ElementHandleTextContentResult>;
+  type(params: ElementHandleTypeParams, progress?: Progress): Promise<ElementHandleTypeResult>;
+  uncheck(params: ElementHandleUncheckParams, progress?: Progress): Promise<ElementHandleUncheckResult>;
+  waitForElementState(params: ElementHandleWaitForElementStateParams, progress?: Progress): Promise<ElementHandleWaitForElementStateResult>;
+  waitForSelector(params: ElementHandleWaitForSelectorParams, progress?: Progress): Promise<ElementHandleWaitForSelectorResult>;
 }
 export type ElementHandleEvalOnSelectorParams = {
   selector: string,
@@ -3322,13 +3481,12 @@ export type ElementHandleBoundingBoxResult = {
 export type ElementHandleCheckParams = {
   force?: boolean,
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type ElementHandleCheckOptions = {
   force?: boolean,
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type ElementHandleCheckResult = void;
@@ -3340,7 +3498,7 @@ export type ElementHandleClickParams = {
   delay?: number,
   button?: 'left' | 'right' | 'middle',
   clickCount?: number,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type ElementHandleClickOptions = {
@@ -3351,7 +3509,6 @@ export type ElementHandleClickOptions = {
   delay?: number,
   button?: 'left' | 'right' | 'middle',
   clickCount?: number,
-  timeout?: number,
   trial?: boolean,
 };
 export type ElementHandleClickResult = void;
@@ -3366,7 +3523,7 @@ export type ElementHandleDblclickParams = {
   position?: Point,
   delay?: number,
   button?: 'left' | 'right' | 'middle',
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type ElementHandleDblclickOptions = {
@@ -3375,7 +3532,6 @@ export type ElementHandleDblclickOptions = {
   position?: Point,
   delay?: number,
   button?: 'left' | 'right' | 'middle',
-  timeout?: number,
   trial?: boolean,
 };
 export type ElementHandleDblclickResult = void;
@@ -3390,11 +3546,10 @@ export type ElementHandleDispatchEventResult = void;
 export type ElementHandleFillParams = {
   value: string,
   force?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type ElementHandleFillOptions = {
   force?: boolean,
-  timeout?: number,
 };
 export type ElementHandleFillResult = void;
 export type ElementHandleFocusParams = {};
@@ -3413,14 +3568,13 @@ export type ElementHandleHoverParams = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type ElementHandleHoverOptions = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type ElementHandleHoverResult = void;
@@ -3477,12 +3631,11 @@ export type ElementHandleOwnerFrameResult = {
 export type ElementHandlePressParams = {
   key: string,
   delay?: number,
-  timeout?: number,
+  timeout: number,
   noWaitAfter?: boolean,
 };
 export type ElementHandlePressOptions = {
   delay?: number,
-  timeout?: number,
   noWaitAfter?: boolean,
 };
 export type ElementHandlePressResult = void;
@@ -3506,7 +3659,7 @@ export type ElementHandleQuerySelectorAllResult = {
   elements: ElementHandleChannel[],
 };
 export type ElementHandleScreenshotParams = {
-  timeout?: number,
+  timeout: number,
   type?: 'png' | 'jpeg',
   quality?: number,
   omitBackground?: boolean,
@@ -3521,7 +3674,6 @@ export type ElementHandleScreenshotParams = {
   style?: string,
 };
 export type ElementHandleScreenshotOptions = {
-  timeout?: number,
   type?: 'png' | 'jpeg',
   quality?: number,
   omitBackground?: boolean,
@@ -3539,10 +3691,10 @@ export type ElementHandleScreenshotResult = {
   binary: Binary,
 };
 export type ElementHandleScrollIntoViewIfNeededParams = {
-  timeout?: number,
+  timeout: number,
 };
 export type ElementHandleScrollIntoViewIfNeededOptions = {
-  timeout?: number,
+
 };
 export type ElementHandleScrollIntoViewIfNeededResult = void;
 export type ElementHandleSelectOptionParams = {
@@ -3554,8 +3706,7 @@ export type ElementHandleSelectOptionParams = {
     index?: number,
   }[],
   force?: boolean,
-  timeout?: number,
-  noWaitAfter?: boolean,
+  timeout: number,
 };
 export type ElementHandleSelectOptionOptions = {
   elements?: ElementHandleChannel[],
@@ -3566,19 +3717,16 @@ export type ElementHandleSelectOptionOptions = {
     index?: number,
   }[],
   force?: boolean,
-  timeout?: number,
-  noWaitAfter?: boolean,
 };
 export type ElementHandleSelectOptionResult = {
   values: string[],
 };
 export type ElementHandleSelectTextParams = {
   force?: boolean,
-  timeout?: number,
+  timeout: number,
 };
 export type ElementHandleSelectTextOptions = {
   force?: boolean,
-  timeout?: number,
 };
 export type ElementHandleSelectTextResult = void;
 export type ElementHandleSetInputFilesParams = {
@@ -3591,7 +3739,7 @@ export type ElementHandleSetInputFilesParams = {
   directoryStream?: WritableStreamChannel,
   localPaths?: string[],
   streams?: WritableStreamChannel[],
-  timeout?: number,
+  timeout: number,
 };
 export type ElementHandleSetInputFilesOptions = {
   payloads?: {
@@ -3603,21 +3751,19 @@ export type ElementHandleSetInputFilesOptions = {
   directoryStream?: WritableStreamChannel,
   localPaths?: string[],
   streams?: WritableStreamChannel[],
-  timeout?: number,
 };
 export type ElementHandleSetInputFilesResult = void;
 export type ElementHandleTapParams = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type ElementHandleTapOptions = {
   force?: boolean,
   modifiers?: ('Alt' | 'Control' | 'ControlOrMeta' | 'Meta' | 'Shift')[],
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type ElementHandleTapResult = void;
@@ -3629,43 +3775,40 @@ export type ElementHandleTextContentResult = {
 export type ElementHandleTypeParams = {
   text: string,
   delay?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type ElementHandleTypeOptions = {
   delay?: number,
-  timeout?: number,
 };
 export type ElementHandleTypeResult = void;
 export type ElementHandleUncheckParams = {
   force?: boolean,
   position?: Point,
-  timeout?: number,
+  timeout: number,
   trial?: boolean,
 };
 export type ElementHandleUncheckOptions = {
   force?: boolean,
   position?: Point,
-  timeout?: number,
   trial?: boolean,
 };
 export type ElementHandleUncheckResult = void;
 export type ElementHandleWaitForElementStateParams = {
   state: 'visible' | 'hidden' | 'stable' | 'enabled' | 'disabled' | 'editable',
-  timeout?: number,
+  timeout: number,
 };
 export type ElementHandleWaitForElementStateOptions = {
-  timeout?: number,
+
 };
 export type ElementHandleWaitForElementStateResult = void;
 export type ElementHandleWaitForSelectorParams = {
   selector: string,
   strict?: boolean,
-  timeout?: number,
+  timeout: number,
   state?: 'attached' | 'detached' | 'visible' | 'hidden',
 };
 export type ElementHandleWaitForSelectorOptions = {
   strict?: boolean,
-  timeout?: number,
   state?: 'attached' | 'detached' | 'visible' | 'hidden',
 };
 export type ElementHandleWaitForSelectorResult = {
@@ -3691,8 +3834,8 @@ export interface RequestEventTarget {
 }
 export interface RequestChannel extends RequestEventTarget, Channel {
   _type_Request: boolean;
-  response(params?: RequestResponseParams, metadata?: CallMetadata): Promise<RequestResponseResult>;
-  rawRequestHeaders(params?: RequestRawRequestHeadersParams, metadata?: CallMetadata): Promise<RequestRawRequestHeadersResult>;
+  response(params?: RequestResponseParams, progress?: Progress): Promise<RequestResponseResult>;
+  rawRequestHeaders(params?: RequestRawRequestHeadersParams, progress?: Progress): Promise<RequestRawRequestHeadersResult>;
 }
 export type RequestResponseParams = {};
 export type RequestResponseOptions = {};
@@ -3716,10 +3859,10 @@ export interface RouteEventTarget {
 }
 export interface RouteChannel extends RouteEventTarget, Channel {
   _type_Route: boolean;
-  redirectNavigationRequest(params: RouteRedirectNavigationRequestParams, metadata?: CallMetadata): Promise<RouteRedirectNavigationRequestResult>;
-  abort(params: RouteAbortParams, metadata?: CallMetadata): Promise<RouteAbortResult>;
-  continue(params: RouteContinueParams, metadata?: CallMetadata): Promise<RouteContinueResult>;
-  fulfill(params: RouteFulfillParams, metadata?: CallMetadata): Promise<RouteFulfillResult>;
+  redirectNavigationRequest(params: RouteRedirectNavigationRequestParams, progress?: Progress): Promise<RouteRedirectNavigationRequestResult>;
+  abort(params: RouteAbortParams, progress?: Progress): Promise<RouteAbortResult>;
+  continue(params: RouteContinueParams, progress?: Progress): Promise<RouteContinueResult>;
+  fulfill(params: RouteFulfillParams, progress?: Progress): Promise<RouteFulfillResult>;
 }
 export type RouteRedirectNavigationRequestParams = {
   url: string,
@@ -3730,7 +3873,6 @@ export type RouteRedirectNavigationRequestOptions = {
 export type RouteRedirectNavigationRequestResult = void;
 export type RouteAbortParams = {
   errorCode?: string,
-  requestUrl: string,
 };
 export type RouteAbortOptions = {
   errorCode?: string,
@@ -3741,7 +3883,6 @@ export type RouteContinueParams = {
   method?: string,
   headers?: NameValue[],
   postData?: Binary,
-  requestUrl: string,
   isFallback: boolean,
 };
 export type RouteContinueOptions = {
@@ -3757,7 +3898,6 @@ export type RouteFulfillParams = {
   body?: string,
   isBase64?: boolean,
   fetchResponseUid?: string,
-  requestUrl: string,
 };
 export type RouteFulfillOptions = {
   status?: number,
@@ -3771,6 +3911,93 @@ export type RouteFulfillResult = void;
 export interface RouteEvents {
 }
 
+// ----------- WebSocketRoute -----------
+export type WebSocketRouteInitializer = {
+  url: string,
+};
+export interface WebSocketRouteEventTarget {
+  on(event: 'messageFromPage', callback: (params: WebSocketRouteMessageFromPageEvent) => void): this;
+  on(event: 'messageFromServer', callback: (params: WebSocketRouteMessageFromServerEvent) => void): this;
+  on(event: 'closePage', callback: (params: WebSocketRouteClosePageEvent) => void): this;
+  on(event: 'closeServer', callback: (params: WebSocketRouteCloseServerEvent) => void): this;
+}
+export interface WebSocketRouteChannel extends WebSocketRouteEventTarget, Channel {
+  _type_WebSocketRoute: boolean;
+  connect(params?: WebSocketRouteConnectParams, progress?: Progress): Promise<WebSocketRouteConnectResult>;
+  ensureOpened(params?: WebSocketRouteEnsureOpenedParams, progress?: Progress): Promise<WebSocketRouteEnsureOpenedResult>;
+  sendToPage(params: WebSocketRouteSendToPageParams, progress?: Progress): Promise<WebSocketRouteSendToPageResult>;
+  sendToServer(params: WebSocketRouteSendToServerParams, progress?: Progress): Promise<WebSocketRouteSendToServerResult>;
+  closePage(params: WebSocketRouteClosePageParams, progress?: Progress): Promise<WebSocketRouteClosePageResult>;
+  closeServer(params: WebSocketRouteCloseServerParams, progress?: Progress): Promise<WebSocketRouteCloseServerResult>;
+}
+export type WebSocketRouteMessageFromPageEvent = {
+  message: string,
+  isBase64: boolean,
+};
+export type WebSocketRouteMessageFromServerEvent = {
+  message: string,
+  isBase64: boolean,
+};
+export type WebSocketRouteClosePageEvent = {
+  code?: number,
+  reason?: string,
+  wasClean: boolean,
+};
+export type WebSocketRouteCloseServerEvent = {
+  code?: number,
+  reason?: string,
+  wasClean: boolean,
+};
+export type WebSocketRouteConnectParams = {};
+export type WebSocketRouteConnectOptions = {};
+export type WebSocketRouteConnectResult = void;
+export type WebSocketRouteEnsureOpenedParams = {};
+export type WebSocketRouteEnsureOpenedOptions = {};
+export type WebSocketRouteEnsureOpenedResult = void;
+export type WebSocketRouteSendToPageParams = {
+  message: string,
+  isBase64: boolean,
+};
+export type WebSocketRouteSendToPageOptions = {
+
+};
+export type WebSocketRouteSendToPageResult = void;
+export type WebSocketRouteSendToServerParams = {
+  message: string,
+  isBase64: boolean,
+};
+export type WebSocketRouteSendToServerOptions = {
+
+};
+export type WebSocketRouteSendToServerResult = void;
+export type WebSocketRouteClosePageParams = {
+  code?: number,
+  reason?: string,
+  wasClean: boolean,
+};
+export type WebSocketRouteClosePageOptions = {
+  code?: number,
+  reason?: string,
+};
+export type WebSocketRouteClosePageResult = void;
+export type WebSocketRouteCloseServerParams = {
+  code?: number,
+  reason?: string,
+  wasClean: boolean,
+};
+export type WebSocketRouteCloseServerOptions = {
+  code?: number,
+  reason?: string,
+};
+export type WebSocketRouteCloseServerResult = void;
+
+export interface WebSocketRouteEvents {
+  'messageFromPage': WebSocketRouteMessageFromPageEvent;
+  'messageFromServer': WebSocketRouteMessageFromServerEvent;
+  'closePage': WebSocketRouteClosePageEvent;
+  'closeServer': WebSocketRouteCloseServerEvent;
+}
+
 export type ResourceTiming = {
   startTime: number,
   domainLookupStart: number,
@@ -3796,11 +4023,11 @@ export interface ResponseEventTarget {
 }
 export interface ResponseChannel extends ResponseEventTarget, Channel {
   _type_Response: boolean;
-  body(params?: ResponseBodyParams, metadata?: CallMetadata): Promise<ResponseBodyResult>;
-  securityDetails(params?: ResponseSecurityDetailsParams, metadata?: CallMetadata): Promise<ResponseSecurityDetailsResult>;
-  serverAddr(params?: ResponseServerAddrParams, metadata?: CallMetadata): Promise<ResponseServerAddrResult>;
-  rawResponseHeaders(params?: ResponseRawResponseHeadersParams, metadata?: CallMetadata): Promise<ResponseRawResponseHeadersResult>;
-  sizes(params?: ResponseSizesParams, metadata?: CallMetadata): Promise<ResponseSizesResult>;
+  body(params?: ResponseBodyParams, progress?: Progress): Promise<ResponseBodyResult>;
+  securityDetails(params?: ResponseSecurityDetailsParams, progress?: Progress): Promise<ResponseSecurityDetailsResult>;
+  serverAddr(params?: ResponseServerAddrParams, progress?: Progress): Promise<ResponseServerAddrResult>;
+  rawResponseHeaders(params?: ResponseRawResponseHeadersParams, progress?: Progress): Promise<ResponseRawResponseHeadersResult>;
+  sizes(params?: ResponseSizesParams, progress?: Progress): Promise<ResponseSizesResult>;
 }
 export type ResponseBodyParams = {};
 export type ResponseBodyOptions = {};
@@ -3898,8 +4125,8 @@ export interface BindingCallEventTarget {
 }
 export interface BindingCallChannel extends BindingCallEventTarget, Channel {
   _type_BindingCall: boolean;
-  reject(params: BindingCallRejectParams, metadata?: CallMetadata): Promise<BindingCallRejectResult>;
-  resolve(params: BindingCallResolveParams, metadata?: CallMetadata): Promise<BindingCallResolveResult>;
+  reject(params: BindingCallRejectParams, progress?: Progress): Promise<BindingCallRejectResult>;
+  resolve(params: BindingCallResolveParams, progress?: Progress): Promise<BindingCallResolveResult>;
 }
 export type BindingCallRejectParams = {
   error: SerializedError,
@@ -3930,8 +4157,8 @@ export interface DialogEventTarget {
 }
 export interface DialogChannel extends DialogEventTarget, Channel {
   _type_Dialog: boolean;
-  accept(params: DialogAcceptParams, metadata?: CallMetadata): Promise<DialogAcceptResult>;
-  dismiss(params?: DialogDismissParams, metadata?: CallMetadata): Promise<DialogDismissResult>;
+  accept(params: DialogAcceptParams, progress?: Progress): Promise<DialogAcceptResult>;
+  dismiss(params?: DialogDismissParams, progress?: Progress): Promise<DialogDismissResult>;
 }
 export type DialogAcceptParams = {
   promptText?: string,
@@ -3953,10 +4180,12 @@ export interface TracingEventTarget {
 }
 export interface TracingChannel extends TracingEventTarget, Channel {
   _type_Tracing: boolean;
-  tracingStart(params: TracingTracingStartParams, metadata?: CallMetadata): Promise<TracingTracingStartResult>;
-  tracingStartChunk(params: TracingTracingStartChunkParams, metadata?: CallMetadata): Promise<TracingTracingStartChunkResult>;
-  tracingStopChunk(params: TracingTracingStopChunkParams, metadata?: CallMetadata): Promise<TracingTracingStopChunkResult>;
-  tracingStop(params?: TracingTracingStopParams, metadata?: CallMetadata): Promise<TracingTracingStopResult>;
+  tracingStart(params: TracingTracingStartParams, progress?: Progress): Promise<TracingTracingStartResult>;
+  tracingStartChunk(params: TracingTracingStartChunkParams, progress?: Progress): Promise<TracingTracingStartChunkResult>;
+  tracingGroup(params: TracingTracingGroupParams, progress?: Progress): Promise<TracingTracingGroupResult>;
+  tracingGroupEnd(params?: TracingTracingGroupEndParams, progress?: Progress): Promise<TracingTracingGroupEndResult>;
+  tracingStopChunk(params: TracingTracingStopChunkParams, progress?: Progress): Promise<TracingTracingStopChunkResult>;
+  tracingStop(params?: TracingTracingStopParams, progress?: Progress): Promise<TracingTracingStopResult>;
 }
 export type TracingTracingStartParams = {
   name?: string,
@@ -3982,6 +4211,25 @@ export type TracingTracingStartChunkOptions = {
 export type TracingTracingStartChunkResult = {
   traceName: string,
 };
+export type TracingTracingGroupParams = {
+  name: string,
+  location?: {
+    file: string,
+    line?: number,
+    column?: number,
+  },
+};
+export type TracingTracingGroupOptions = {
+  location?: {
+    file: string,
+    line?: number,
+    column?: number,
+  },
+};
+export type TracingTracingGroupResult = void;
+export type TracingTracingGroupEndParams = {};
+export type TracingTracingGroupEndOptions = {};
+export type TracingTracingGroupEndResult = void;
 export type TracingTracingStopChunkParams = {
   mode: 'archive' | 'discard' | 'entries',
 };
@@ -4007,13 +4255,13 @@ export interface ArtifactEventTarget {
 }
 export interface ArtifactChannel extends ArtifactEventTarget, Channel {
   _type_Artifact: boolean;
-  pathAfterFinished(params?: ArtifactPathAfterFinishedParams, metadata?: CallMetadata): Promise<ArtifactPathAfterFinishedResult>;
-  saveAs(params: ArtifactSaveAsParams, metadata?: CallMetadata): Promise<ArtifactSaveAsResult>;
-  saveAsStream(params?: ArtifactSaveAsStreamParams, metadata?: CallMetadata): Promise<ArtifactSaveAsStreamResult>;
-  failure(params?: ArtifactFailureParams, metadata?: CallMetadata): Promise<ArtifactFailureResult>;
-  stream(params?: ArtifactStreamParams, metadata?: CallMetadata): Promise<ArtifactStreamResult>;
-  cancel(params?: ArtifactCancelParams, metadata?: CallMetadata): Promise<ArtifactCancelResult>;
-  delete(params?: ArtifactDeleteParams, metadata?: CallMetadata): Promise<ArtifactDeleteResult>;
+  pathAfterFinished(params?: ArtifactPathAfterFinishedParams, progress?: Progress): Promise<ArtifactPathAfterFinishedResult>;
+  saveAs(params: ArtifactSaveAsParams, progress?: Progress): Promise<ArtifactSaveAsResult>;
+  saveAsStream(params?: ArtifactSaveAsStreamParams, progress?: Progress): Promise<ArtifactSaveAsStreamResult>;
+  failure(params?: ArtifactFailureParams, progress?: Progress): Promise<ArtifactFailureResult>;
+  stream(params?: ArtifactStreamParams, progress?: Progress): Promise<ArtifactStreamResult>;
+  cancel(params?: ArtifactCancelParams, progress?: Progress): Promise<ArtifactCancelResult>;
+  delete(params?: ArtifactDeleteParams, progress?: Progress): Promise<ArtifactDeleteResult>;
 }
 export type ArtifactPathAfterFinishedParams = {};
 export type ArtifactPathAfterFinishedOptions = {};
@@ -4058,8 +4306,8 @@ export interface StreamEventTarget {
 }
 export interface StreamChannel extends StreamEventTarget, Channel {
   _type_Stream: boolean;
-  read(params: StreamReadParams, metadata?: CallMetadata): Promise<StreamReadResult>;
-  close(params?: StreamCloseParams, metadata?: CallMetadata): Promise<StreamCloseResult>;
+  read(params: StreamReadParams, progress?: Progress): Promise<StreamReadResult>;
+  close(params?: StreamCloseParams, progress?: Progress): Promise<StreamCloseResult>;
 }
 export type StreamReadParams = {
   size?: number,
@@ -4083,8 +4331,8 @@ export interface WritableStreamEventTarget {
 }
 export interface WritableStreamChannel extends WritableStreamEventTarget, Channel {
   _type_WritableStream: boolean;
-  write(params: WritableStreamWriteParams, metadata?: CallMetadata): Promise<WritableStreamWriteResult>;
-  close(params?: WritableStreamCloseParams, metadata?: CallMetadata): Promise<WritableStreamCloseResult>;
+  write(params: WritableStreamWriteParams, progress?: Progress): Promise<WritableStreamWriteResult>;
+  close(params?: WritableStreamCloseParams, progress?: Progress): Promise<WritableStreamCloseResult>;
 }
 export type WritableStreamWriteParams = {
   binary: Binary,
@@ -4107,8 +4355,8 @@ export interface CDPSessionEventTarget {
 }
 export interface CDPSessionChannel extends CDPSessionEventTarget, Channel {
   _type_CDPSession: boolean;
-  send(params: CDPSessionSendParams, metadata?: CallMetadata): Promise<CDPSessionSendResult>;
-  detach(params?: CDPSessionDetachParams, metadata?: CallMetadata): Promise<CDPSessionDetachResult>;
+  send(params: CDPSessionSendParams, progress?: Progress): Promise<CDPSessionSendResult>;
+  detach(params?: CDPSessionDetachParams, progress?: Progress): Promise<CDPSessionDetachResult>;
 }
 export type CDPSessionEventEvent = {
   method: string,
@@ -4138,14 +4386,14 @@ export interface ElectronEventTarget {
 }
 export interface ElectronChannel extends ElectronEventTarget, Channel {
   _type_Electron: boolean;
-  launch(params: ElectronLaunchParams, metadata?: CallMetadata): Promise<ElectronLaunchResult>;
+  launch(params: ElectronLaunchParams, progress?: Progress): Promise<ElectronLaunchResult>;
 }
 export type ElectronLaunchParams = {
   executablePath?: string,
   args?: string[],
   cwd?: string,
   env?: NameValue[],
-  timeout?: number,
+  timeout: number,
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
   bypassCSP?: boolean,
   colorScheme?: 'dark' | 'light' | 'no-preference' | 'no-override',
@@ -4163,7 +4411,6 @@ export type ElectronLaunchParams = {
   ignoreHTTPSErrors?: boolean,
   locale?: string,
   offline?: boolean,
-  recordHar?: RecordHarOptions,
   recordVideo?: {
     dir: string,
     size?: {
@@ -4174,13 +4421,14 @@ export type ElectronLaunchParams = {
   strictSelectors?: boolean,
   timezoneId?: string,
   tracesDir?: string,
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
 };
 export type ElectronLaunchOptions = {
   executablePath?: string,
   args?: string[],
   cwd?: string,
   env?: NameValue[],
-  timeout?: number,
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
   bypassCSP?: boolean,
   colorScheme?: 'dark' | 'light' | 'no-preference' | 'no-override',
@@ -4198,7 +4446,6 @@ export type ElectronLaunchOptions = {
   ignoreHTTPSErrors?: boolean,
   locale?: string,
   offline?: boolean,
-  recordHar?: RecordHarOptions,
   recordVideo?: {
     dir: string,
     size?: {
@@ -4209,6 +4456,8 @@ export type ElectronLaunchOptions = {
   strictSelectors?: boolean,
   timezoneId?: string,
   tracesDir?: string,
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
 };
 export type ElectronLaunchResult = {
   electronApplication: ElectronApplicationChannel,
@@ -4227,10 +4476,10 @@ export interface ElectronApplicationEventTarget {
 }
 export interface ElectronApplicationChannel extends ElectronApplicationEventTarget, EventTargetChannel {
   _type_ElectronApplication: boolean;
-  browserWindow(params: ElectronApplicationBrowserWindowParams, metadata?: CallMetadata): Promise<ElectronApplicationBrowserWindowResult>;
-  evaluateExpression(params: ElectronApplicationEvaluateExpressionParams, metadata?: CallMetadata): Promise<ElectronApplicationEvaluateExpressionResult>;
-  evaluateExpressionHandle(params: ElectronApplicationEvaluateExpressionHandleParams, metadata?: CallMetadata): Promise<ElectronApplicationEvaluateExpressionHandleResult>;
-  updateSubscription(params: ElectronApplicationUpdateSubscriptionParams, metadata?: CallMetadata): Promise<ElectronApplicationUpdateSubscriptionResult>;
+  browserWindow(params: ElectronApplicationBrowserWindowParams, progress?: Progress): Promise<ElectronApplicationBrowserWindowResult>;
+  evaluateExpression(params: ElectronApplicationEvaluateExpressionParams, progress?: Progress): Promise<ElectronApplicationEvaluateExpressionResult>;
+  evaluateExpressionHandle(params: ElectronApplicationEvaluateExpressionHandleParams, progress?: Progress): Promise<ElectronApplicationEvaluateExpressionHandleResult>;
+  updateSubscription(params: ElectronApplicationUpdateSubscriptionParams, progress?: Progress): Promise<ElectronApplicationUpdateSubscriptionResult>;
 }
 export type ElectronApplicationCloseEvent = {};
 export type ElectronApplicationConsoleEvent = {
@@ -4294,8 +4543,7 @@ export interface AndroidEventTarget {
 }
 export interface AndroidChannel extends AndroidEventTarget, Channel {
   _type_Android: boolean;
-  devices(params: AndroidDevicesParams, metadata?: CallMetadata): Promise<AndroidDevicesResult>;
-  setDefaultTimeoutNoReply(params: AndroidSetDefaultTimeoutNoReplyParams, metadata?: CallMetadata): Promise<AndroidSetDefaultTimeoutNoReplyResult>;
+  devices(params: AndroidDevicesParams, progress?: Progress): Promise<AndroidDevicesResult>;
 }
 export type AndroidDevicesParams = {
   host?: string,
@@ -4310,13 +4558,6 @@ export type AndroidDevicesOptions = {
 export type AndroidDevicesResult = {
   devices: AndroidDeviceChannel[],
 };
-export type AndroidSetDefaultTimeoutNoReplyParams = {
-  timeout: number,
-};
-export type AndroidSetDefaultTimeoutNoReplyOptions = {
-
-};
-export type AndroidSetDefaultTimeoutNoReplyResult = void;
 
 export interface AndroidEvents {
 }
@@ -4329,8 +4570,8 @@ export interface AndroidSocketEventTarget {
 }
 export interface AndroidSocketChannel extends AndroidSocketEventTarget, Channel {
   _type_AndroidSocket: boolean;
-  write(params: AndroidSocketWriteParams, metadata?: CallMetadata): Promise<AndroidSocketWriteResult>;
-  close(params?: AndroidSocketCloseParams, metadata?: CallMetadata): Promise<AndroidSocketCloseResult>;
+  write(params: AndroidSocketWriteParams, progress?: Progress): Promise<AndroidSocketWriteResult>;
+  close(params?: AndroidSocketCloseParams, progress?: Progress): Promise<AndroidSocketCloseResult>;
 }
 export type AndroidSocketDataEvent = {
   data: Binary,
@@ -4364,31 +4605,30 @@ export interface AndroidDeviceEventTarget {
 }
 export interface AndroidDeviceChannel extends AndroidDeviceEventTarget, EventTargetChannel {
   _type_AndroidDevice: boolean;
-  wait(params: AndroidDeviceWaitParams, metadata?: CallMetadata): Promise<AndroidDeviceWaitResult>;
-  fill(params: AndroidDeviceFillParams, metadata?: CallMetadata): Promise<AndroidDeviceFillResult>;
-  tap(params: AndroidDeviceTapParams, metadata?: CallMetadata): Promise<AndroidDeviceTapResult>;
-  drag(params: AndroidDeviceDragParams, metadata?: CallMetadata): Promise<AndroidDeviceDragResult>;
-  fling(params: AndroidDeviceFlingParams, metadata?: CallMetadata): Promise<AndroidDeviceFlingResult>;
-  longTap(params: AndroidDeviceLongTapParams, metadata?: CallMetadata): Promise<AndroidDeviceLongTapResult>;
-  pinchClose(params: AndroidDevicePinchCloseParams, metadata?: CallMetadata): Promise<AndroidDevicePinchCloseResult>;
-  pinchOpen(params: AndroidDevicePinchOpenParams, metadata?: CallMetadata): Promise<AndroidDevicePinchOpenResult>;
-  scroll(params: AndroidDeviceScrollParams, metadata?: CallMetadata): Promise<AndroidDeviceScrollResult>;
-  swipe(params: AndroidDeviceSwipeParams, metadata?: CallMetadata): Promise<AndroidDeviceSwipeResult>;
-  info(params: AndroidDeviceInfoParams, metadata?: CallMetadata): Promise<AndroidDeviceInfoResult>;
-  screenshot(params?: AndroidDeviceScreenshotParams, metadata?: CallMetadata): Promise<AndroidDeviceScreenshotResult>;
-  inputType(params: AndroidDeviceInputTypeParams, metadata?: CallMetadata): Promise<AndroidDeviceInputTypeResult>;
-  inputPress(params: AndroidDeviceInputPressParams, metadata?: CallMetadata): Promise<AndroidDeviceInputPressResult>;
-  inputTap(params: AndroidDeviceInputTapParams, metadata?: CallMetadata): Promise<AndroidDeviceInputTapResult>;
-  inputSwipe(params: AndroidDeviceInputSwipeParams, metadata?: CallMetadata): Promise<AndroidDeviceInputSwipeResult>;
-  inputDrag(params: AndroidDeviceInputDragParams, metadata?: CallMetadata): Promise<AndroidDeviceInputDragResult>;
-  launchBrowser(params: AndroidDeviceLaunchBrowserParams, metadata?: CallMetadata): Promise<AndroidDeviceLaunchBrowserResult>;
-  open(params: AndroidDeviceOpenParams, metadata?: CallMetadata): Promise<AndroidDeviceOpenResult>;
-  shell(params: AndroidDeviceShellParams, metadata?: CallMetadata): Promise<AndroidDeviceShellResult>;
-  installApk(params: AndroidDeviceInstallApkParams, metadata?: CallMetadata): Promise<AndroidDeviceInstallApkResult>;
-  push(params: AndroidDevicePushParams, metadata?: CallMetadata): Promise<AndroidDevicePushResult>;
-  setDefaultTimeoutNoReply(params: AndroidDeviceSetDefaultTimeoutNoReplyParams, metadata?: CallMetadata): Promise<AndroidDeviceSetDefaultTimeoutNoReplyResult>;
-  connectToWebView(params: AndroidDeviceConnectToWebViewParams, metadata?: CallMetadata): Promise<AndroidDeviceConnectToWebViewResult>;
-  close(params?: AndroidDeviceCloseParams, metadata?: CallMetadata): Promise<AndroidDeviceCloseResult>;
+  wait(params: AndroidDeviceWaitParams, progress?: Progress): Promise<AndroidDeviceWaitResult>;
+  fill(params: AndroidDeviceFillParams, progress?: Progress): Promise<AndroidDeviceFillResult>;
+  tap(params: AndroidDeviceTapParams, progress?: Progress): Promise<AndroidDeviceTapResult>;
+  drag(params: AndroidDeviceDragParams, progress?: Progress): Promise<AndroidDeviceDragResult>;
+  fling(params: AndroidDeviceFlingParams, progress?: Progress): Promise<AndroidDeviceFlingResult>;
+  longTap(params: AndroidDeviceLongTapParams, progress?: Progress): Promise<AndroidDeviceLongTapResult>;
+  pinchClose(params: AndroidDevicePinchCloseParams, progress?: Progress): Promise<AndroidDevicePinchCloseResult>;
+  pinchOpen(params: AndroidDevicePinchOpenParams, progress?: Progress): Promise<AndroidDevicePinchOpenResult>;
+  scroll(params: AndroidDeviceScrollParams, progress?: Progress): Promise<AndroidDeviceScrollResult>;
+  swipe(params: AndroidDeviceSwipeParams, progress?: Progress): Promise<AndroidDeviceSwipeResult>;
+  info(params: AndroidDeviceInfoParams, progress?: Progress): Promise<AndroidDeviceInfoResult>;
+  screenshot(params?: AndroidDeviceScreenshotParams, progress?: Progress): Promise<AndroidDeviceScreenshotResult>;
+  inputType(params: AndroidDeviceInputTypeParams, progress?: Progress): Promise<AndroidDeviceInputTypeResult>;
+  inputPress(params: AndroidDeviceInputPressParams, progress?: Progress): Promise<AndroidDeviceInputPressResult>;
+  inputTap(params: AndroidDeviceInputTapParams, progress?: Progress): Promise<AndroidDeviceInputTapResult>;
+  inputSwipe(params: AndroidDeviceInputSwipeParams, progress?: Progress): Promise<AndroidDeviceInputSwipeResult>;
+  inputDrag(params: AndroidDeviceInputDragParams, progress?: Progress): Promise<AndroidDeviceInputDragResult>;
+  launchBrowser(params: AndroidDeviceLaunchBrowserParams, progress?: Progress): Promise<AndroidDeviceLaunchBrowserResult>;
+  open(params: AndroidDeviceOpenParams, progress?: Progress): Promise<AndroidDeviceOpenResult>;
+  shell(params: AndroidDeviceShellParams, progress?: Progress): Promise<AndroidDeviceShellResult>;
+  installApk(params: AndroidDeviceInstallApkParams, progress?: Progress): Promise<AndroidDeviceInstallApkResult>;
+  push(params: AndroidDevicePushParams, progress?: Progress): Promise<AndroidDevicePushResult>;
+  connectToWebView(params: AndroidDeviceConnectToWebViewParams, progress?: Progress): Promise<AndroidDeviceConnectToWebViewResult>;
+  close(params?: AndroidDeviceCloseParams, progress?: Progress): Promise<AndroidDeviceCloseResult>;
 }
 export type AndroidDeviceCloseEvent = {};
 export type AndroidDeviceWebViewAddedEvent = {
@@ -4398,112 +4638,104 @@ export type AndroidDeviceWebViewRemovedEvent = {
   socketName: string,
 };
 export type AndroidDeviceWaitParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   state?: 'gone',
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceWaitOptions = {
   state?: 'gone',
-  timeout?: number,
 };
 export type AndroidDeviceWaitResult = void;
 export type AndroidDeviceFillParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   text: string,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceFillOptions = {
-  timeout?: number,
+
 };
 export type AndroidDeviceFillResult = void;
 export type AndroidDeviceTapParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   duration?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceTapOptions = {
   duration?: number,
-  timeout?: number,
 };
 export type AndroidDeviceTapResult = void;
 export type AndroidDeviceDragParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   dest: Point,
   speed?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceDragOptions = {
   speed?: number,
-  timeout?: number,
 };
 export type AndroidDeviceDragResult = void;
 export type AndroidDeviceFlingParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   direction: 'up' | 'down' | 'left' | 'right',
   speed?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceFlingOptions = {
   speed?: number,
-  timeout?: number,
 };
 export type AndroidDeviceFlingResult = void;
 export type AndroidDeviceLongTapParams = {
-  selector: AndroidSelector,
-  timeout?: number,
+  androidSelector: AndroidSelector,
+  timeout: number,
 };
 export type AndroidDeviceLongTapOptions = {
-  timeout?: number,
+
 };
 export type AndroidDeviceLongTapResult = void;
 export type AndroidDevicePinchCloseParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   percent: number,
   speed?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDevicePinchCloseOptions = {
   speed?: number,
-  timeout?: number,
 };
 export type AndroidDevicePinchCloseResult = void;
 export type AndroidDevicePinchOpenParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   percent: number,
   speed?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDevicePinchOpenOptions = {
   speed?: number,
-  timeout?: number,
 };
 export type AndroidDevicePinchOpenResult = void;
 export type AndroidDeviceScrollParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   direction: 'up' | 'down' | 'left' | 'right',
   percent: number,
   speed?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceScrollOptions = {
   speed?: number,
-  timeout?: number,
 };
 export type AndroidDeviceScrollResult = void;
 export type AndroidDeviceSwipeParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
   direction: 'up' | 'down' | 'left' | 'right',
   percent: number,
   speed?: number,
-  timeout?: number,
+  timeout: number,
 };
 export type AndroidDeviceSwipeOptions = {
   speed?: number,
-  timeout?: number,
 };
 export type AndroidDeviceSwipeResult = void;
 export type AndroidDeviceInfoParams = {
-  selector: AndroidSelector,
+  androidSelector: AndroidSelector,
 };
 export type AndroidDeviceInfoOptions = {
 
@@ -4598,6 +4830,7 @@ export type AndroidDeviceLaunchBrowserParams = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -4606,9 +4839,10 @@ export type AndroidDeviceLaunchBrowserParams = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   pkg?: string,
   args?: string[],
   proxy?: {
@@ -4662,6 +4896,7 @@ export type AndroidDeviceLaunchBrowserOptions = {
   reducedMotion?: 'reduce' | 'no-preference' | 'no-override',
   forcedColors?: 'active' | 'none' | 'no-override',
   acceptDownloads?: 'accept' | 'deny' | 'internal-browser-default',
+  contrast?: 'no-preference' | 'more' | 'no-override',
   baseURL?: string,
   recordVideo?: {
     dir: string,
@@ -4670,9 +4905,10 @@ export type AndroidDeviceLaunchBrowserOptions = {
       height: number,
     },
   },
-  recordHar?: RecordHarOptions,
   strictSelectors?: boolean,
   serviceWorkers?: 'allow' | 'block',
+  selectorEngines?: SelectorEngine[],
+  testIdAttributeName?: string,
   pkg?: string,
   args?: string[],
   proxy?: {
@@ -4720,13 +4956,6 @@ export type AndroidDevicePushOptions = {
   mode?: number,
 };
 export type AndroidDevicePushResult = void;
-export type AndroidDeviceSetDefaultTimeoutNoReplyParams = {
-  timeout: number,
-};
-export type AndroidDeviceSetDefaultTimeoutNoReplyOptions = {
-
-};
-export type AndroidDeviceSetDefaultTimeoutNoReplyResult = void;
 export type AndroidDeviceConnectToWebViewParams = {
   socketName: string,
 };
@@ -4763,10 +4992,10 @@ export type AndroidSelector = {
   focusable?: boolean,
   focused?: boolean,
   hasChild?: {
-    selector: AndroidSelector,
+    androidSelector: AndroidSelector,
   },
   hasDescendant?: {
-    selector: AndroidSelector,
+    androidSelector: AndroidSelector,
     maxDepth?: number,
   },
   longClickable?: boolean,
@@ -4804,8 +5033,8 @@ export interface JsonPipeEventTarget {
 }
 export interface JsonPipeChannel extends JsonPipeEventTarget, Channel {
   _type_JsonPipe: boolean;
-  send(params: JsonPipeSendParams, metadata?: CallMetadata): Promise<JsonPipeSendResult>;
-  close(params?: JsonPipeCloseParams, metadata?: CallMetadata): Promise<JsonPipeCloseResult>;
+  send(params: JsonPipeSendParams, progress?: Progress): Promise<JsonPipeSendResult>;
+  close(params?: JsonPipeCloseParams, progress?: Progress): Promise<JsonPipeCloseResult>;
 }
 export type JsonPipeMessageEvent = {
   message: any,
@@ -4828,3 +5057,4 @@ export interface JsonPipeEvents {
   'message': JsonPipeMessageEvent;
   'closed': JsonPipeClosedEvent;
 }
+
diff --git a/packages/protocol/src/progress.d.ts b/packages/protocol/src/progress.d.ts
new file mode 100644
index 0000000000000..6e8001629bf07
--- /dev/null
+++ b/packages/protocol/src/progress.d.ts
@@ -0,0 +1,42 @@
+/**
+ * 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 { CallMetadata } from './callMetadata';
+
+// Most server operations are run inside a Progress instance, which is conceptually
+// similar to a cancellation token.
+//
+// Each method that takes a Progress must result in one of the three outcomes:
+//   - It finishes successfully, returning a value, before the Progress is aborted.
+//   - It throws some error, before the Progress is aborted.
+//   - It throws the Progress's aborted error, because the Progress was aborted before
+//     the method could finish.
+//
+// As a rule of thumb, the above is achieved by:
+//   - Passing the Progress instance when awaiting other methods.
+//   - Using `progress.race()` when awaiting other methods that do not take a Progress argument.
+//     In this case, it is important that awaited method has no side effects, for example
+//     it is a read-only browser protocol call.
+//   - In rare cases, when the awaited method does not take a Progress argument,
+//     but it does have side effects such as creating a page - a proper try/catch/finally
+//     should be used to cleanup. Whether the cleanup is awaited or not depends on the method details.
+//     For the trickiest cases, look at `raceUncancellableOperationWithCleanup()` helper method.
+export interface Progress {
+  log(message: string): void;
+  race<T>(promise: Promise<T> | Promise<T>[]): Promise<T>;
+  wait(timeout: number): Promise<void>;
+  metadata: CallMetadata;
+}
diff --git a/packages/protocol/src/protocol.yml b/packages/protocol/src/protocol.yml
index 4c25212c57017..080251712ae74 100644
--- a/packages/protocol/src/protocol.yml
+++ b/packages/protocol/src/protocol.yml
@@ -16,8 +16,8 @@ StackFrame:
   type: object
   properties:
     file: string
-    line: number
-    column: number
+    line: int
+    column: int
     function: string?
 
 # This object can be send with any rpc call in the "metadata" field.
@@ -29,9 +29,9 @@ Metadata:
       type: object?
       properties:
         file: string
-        line: number?
-        column: number?
-    apiName: string?
+        line: int?
+        column: int?
+    title: string?
     internal: boolean?
     # Test runner step id.
     stepId: string?
@@ -39,7 +39,7 @@ Metadata:
 ClientSideCallMetadata:
   type: object
   properties:
-    id: number
+    id: int
     stack:
       type: array?
       items: StackFrame
@@ -47,24 +47,24 @@ ClientSideCallMetadata:
 Point:
   type: object
   properties:
-    x: number
-    y: number
+    x: float
+    y: float
 
 
 Rect:
   type: object
   properties:
-    x: number
-    y: number
-    width: number
-    height: number
+    x: float
+    y: float
+    width: float
+    height: float
 
 
 SerializedValue:
   type: object
   # Exactly one of the properties must be present.
   properties:
-    n: number?
+    n: float?
     b: boolean?
     s: string?
     v:
@@ -82,6 +82,25 @@ SerializedValue:
     u: string?
     # String representation of BigInt.
     bi: string?
+    # Typed array.
+    ta:
+      type: object?
+      properties:
+        b: binary
+        k:
+          type: enum
+          literals:
+          - i8
+          - ui8
+          - ui8c
+          - i16
+          - ui16
+          - i32
+          - ui32
+          - f32
+          - f64
+          - bi64
+          - bui64
     # Serialized Error object.
     e:
       type: object?
@@ -107,11 +126,11 @@ SerializedValue:
           k: string
           v: SerializedValue
     # An index in the handles array from SerializedArgument.
-    h: number?
+    h: int?
     # Index of the object in value-type for circular reference resolution.
-    id: number?
+    id: int?
     # Ref to the object in value-type for circular reference resolution.
-    ref: number?
+    ref: int?
 
 
 # Represents a value with handle references.
@@ -135,13 +154,21 @@ ExpectedTextValue:
     normalizeWhiteSpace: boolean?
 
 
+SelectorEngine:
+  type: object
+  properties:
+    name: string
+    source: string
+    contentScript: boolean?
+
+
 AXNode:
   type: object
   properties:
     role: string
     name: string
     valueString: string?
-    valueNumber: number?
+    valueNumber: float?
     description: string?
     keyshortcuts: string?
     roledescription: string?
@@ -167,9 +194,9 @@ AXNode:
       - pressed
       - released
       - mixed
-    level: number?
-    valuemin: number?
-    valuemax: number?
+    level: int?
+    valuemin: float?
+    valuemax: float?
     autocomplete: string?
     haspopup: string?
     invalid: string?
@@ -187,7 +214,7 @@ SetNetworkCookie:
     url: string?
     domain: string?
     path: string?
-    expires: number?
+    expires: float?
     httpOnly: boolean?
     secure: boolean?
     sameSite:
@@ -196,6 +223,8 @@ SetNetworkCookie:
       - Strict
       - Lax
       - None
+    partitionKey: string?
+    _crHasCrossSiteAncestor: boolean?
 
 
 NetworkCookie:
@@ -205,7 +234,7 @@ NetworkCookie:
     value: string
     domain: string
     path: string
-    expires: number
+    expires: float
     httpOnly: boolean
     secure: boolean
     sameSite:
@@ -214,6 +243,8 @@ NetworkCookie:
       - Strict
       - Lax
       - None
+    partitionKey: string?
+    _crHasCrossSiteAncestor: boolean?
 
 
 NameValue:
@@ -222,6 +253,54 @@ NameValue:
     name: string
     value: string
 
+IndexedDBDatabase:
+  type: object
+  properties:
+    name: string
+    version: int
+    stores:
+      type: array
+      items:
+        type: object
+        properties:
+          name: string
+          autoIncrement: boolean
+          keyPath: string?
+          keyPathArray:
+            type: array?
+            items: string
+          records:
+            type: array
+            items:
+              type: object
+              properties:
+                key: json?
+                keyEncoded: json?
+                value: json?
+                valueEncoded: json?
+          indexes:
+            type: array
+            items:
+              type: object
+              properties:
+                name: string
+                keyPath: string?
+                keyPathArray:
+                  type: array?
+                  items: string
+                multiEntry: boolean
+                unique: boolean
+
+SetOriginStorage:
+  type: object
+  properties:
+    origin: string
+    localStorage:
+      type: array
+      items: NameValue
+    indexedDB:
+      type: array?
+      items: IndexedDBDatabase
 
 OriginStorage:
   type: object
@@ -230,7 +309,9 @@ OriginStorage:
     localStorage:
       type: array
       items: NameValue
-
+    indexedDB:
+      type: array?
+      items: IndexedDBDatabase
 
 SerializedError:
   type: object
@@ -247,7 +328,7 @@ SerializedError:
 RecordHarOptions:
   type: object
   properties:
-    path: string
+    zip: boolean?
     content:
       type: enum?
       literals:
@@ -276,6 +357,14 @@ FormField:
         mimeType: string?
         buffer: binary
 
+SDKLanguage:
+  type: enum
+  literals:
+  - javascript
+  - python
+  - java
+  - csharp
+
 APIRequestContext:
   type: interface
 
@@ -285,8 +374,10 @@ APIRequestContext:
   commands:
 
     fetch:
+      title: '{method} "{url}"'
       parameters:
         url: string
+        encodedParams: string?
         params:
           type: array?
           items: NameValue
@@ -302,21 +393,24 @@ APIRequestContext:
         multipartData:
           type: array?
           items: FormField
-        timeout: number?
+        timeout: float
         failOnStatusCode: boolean?
         ignoreHTTPSErrors: boolean?
-        maxRedirects: number?
-        maxRetries: number?
+        maxRedirects: int?
+        maxRetries: int?
       returns:
         response: APIResponse
 
     fetchResponseBody:
+      title: Get response body
+      group: getter
       parameters:
         fetchUid: string
       returns:
         binary: binary?
 
     fetchLog:
+      internal: true
       parameters:
         fetchUid: string
       returns:
@@ -325,6 +419,9 @@ APIRequestContext:
           items: string
 
     storageState:
+      title: Get storage state
+      parameters:
+        indexedDB: boolean?
       returns:
         cookies:
           type: array
@@ -334,10 +431,12 @@ APIRequestContext:
           items: OriginStorage
 
     disposeAPIResponse:
+      internal: true
       parameters:
         fetchUid: string
 
     dispose:
+      internal: true
       parameters:
         reason: string?
 
@@ -347,7 +446,7 @@ APIResponse:
   properties:
     fetchUid: string
     url: string
-    status: number
+    status: int
     statusText: string
     headers:
       type: array
@@ -403,10 +502,11 @@ LaunchOptions:
     ignoreDefaultArgs:
       type: array?
       items: string
+    assistantMode: boolean?
     handleSIGINT: boolean?
     handleSIGTERM: boolean?
     handleSIGHUP: boolean?
-    timeout: number?
+    timeout: float
     env:
       type: array?
       items: NameValue
@@ -423,6 +523,7 @@ LaunchOptions:
     tracesDir: string?
     chromiumSandbox: boolean?
     firefoxUserPrefs: json?
+    cdpPort: int?
 
 
 ContextOptions:
@@ -432,13 +533,13 @@ ContextOptions:
     viewport:
       type: object?
       properties:
-        width: number
-        height: number
+        width: int
+        height: int
     screen:
       type: object?
       properties:
-        width: number
-        height: number
+        width: int
+        height: int
     ignoreHTTPSErrors: boolean?
     clientCertificates:
       type: array?
@@ -458,9 +559,9 @@ ContextOptions:
     geolocation:
       type: object?
       properties:
-        longitude: number
-        latitude: number
-        accuracy: number?
+        longitude: float
+        latitude: float
+        accuracy: float?
     permissions:
       type: array?
       items: string
@@ -479,7 +580,7 @@ ContextOptions:
           literals:
           - always
           - unauthorized
-    deviceScaleFactor: number?
+    deviceScaleFactor: float?
     isMobile: boolean?
     hasTouch: boolean?
     colorScheme:
@@ -507,6 +608,12 @@ ContextOptions:
       - accept
       - deny
       - internal-browser-default
+    contrast:
+      type: enum?
+      literals:
+      - no-preference
+      - more
+      - no-override
     baseURL: string?
     recordVideo:
       type: object?
@@ -515,15 +622,19 @@ ContextOptions:
         size:
           type: object?
           properties:
-            width: number
-            height: number
-    recordHar: RecordHarOptions?
+            width: int
+            height: int
     strictSelectors: boolean?
     serviceWorkers:
       type: enum?
       literals:
       - allow
       - block
+    selectorEngines:
+      type: array?
+      items: SelectorEngine
+    testIdAttributeName: string?
+
 
 LocalUtils:
   type: interface
@@ -542,14 +653,14 @@ LocalUtils:
               viewport:
                 type: object
                 properties:
-                  width: number
-                  height: number
+                  width: int
+                  height: int
               screen:
                 type: object?
                 properties:
-                  width: number
-                  height: number
-              deviceScaleFactor: number
+                  width: int
+                  height: int
+              deviceScaleFactor: float
               isMobile: boolean
               hasTouch: boolean
               defaultBrowserType:
@@ -562,6 +673,7 @@ LocalUtils:
   commands:
 
     zip:
+      internal: true
       parameters:
         zipFile: string
         entries:
@@ -576,6 +688,7 @@ LocalUtils:
         includeSources: boolean
 
     harOpen:
+      internal: true
       parameters:
         file: string
       returns:
@@ -583,6 +696,7 @@ LocalUtils:
         error: string?
 
     harLookup:
+      internal: true
       parameters:
         harId: string
         url: string
@@ -602,29 +716,32 @@ LocalUtils:
           - noentry
         message: string?
         redirectURL: string?
-        status: number?
+        status: int?
         headers:
           type: array?
           items: NameValue
         body: binary?
 
     harClose:
+      internal: true
       parameters:
         harId: string
 
     harUnzip:
+      internal: true
       parameters:
         zipFile: string
         harFile: string
 
     connect:
+      internal: true
       parameters:
         wsEndpoint: string
         headers: json?
         exposeNetwork: string?
-        slowMo: number?
-        timeout: number?
-        socksProxyRedirectPortForTest: number?
+        slowMo: float?
+        timeout: float
+        socksProxyRedirectPortForTest: int?
       returns:
         pipe: JsonPipe
         headers:
@@ -632,6 +749,7 @@ LocalUtils:
           items: NameValue
 
     tracingStarted:
+      internal: true
       parameters:
         tracesDir: string?
         traceName: string
@@ -639,27 +757,33 @@ LocalUtils:
         stacksId: string
 
     addStackToTracingNoReply:
+      internal: true
       parameters:
         callData: ClientSideCallMetadata
 
     traceDiscarded:
+      internal: true
       parameters:
         stacksId: string
 
+    globToRegex:
+      internal: true
+      parameters:
+        glob: string
+        baseURL: string?
+        webSocketUrl: boolean?
+      returns:
+        regex: string
+
 Root:
   type: interface
 
   commands:
 
     initialize:
+      internal: true
       parameters:
-        sdkLanguage:
-          type: enum
-          literals:
-          - javascript
-          - python
-          - java
-          - csharp
+        sdkLanguage: SDKLanguage
       returns:
         playwright: Playwright
 
@@ -670,10 +794,11 @@ Playwright:
     chromium: BrowserType
     firefox: BrowserType
     webkit: BrowserType
+    _bidiChromium: BrowserType
+    _bidiFirefox: BrowserType
     android: Android
     electron: Electron
     utils: LocalUtils?
-    selectors: Selectors
     # Only present when connecting remotely via BrowserType.connect() method.
     preLaunchedBrowser: Browser?
     # Only present when connecting remotely via Android.connect() method.
@@ -683,6 +808,7 @@ Playwright:
 
   commands:
     newRequest:
+      title: Create request context
       parameters:
         baseURL: string?
         userAgent: string?
@@ -690,6 +816,7 @@ Playwright:
         extraHTTPHeaders:
           type: array?
           items: NameValue
+        failOnStatusCode: boolean?
         clientCertificates:
           type: array?
           items:
@@ -700,6 +827,7 @@ Playwright:
               key: binary?
               passphrase: string?
               pfx: binary?
+        maxRedirects: int?
         httpCredentials:
           type: object?
           properties:
@@ -718,7 +846,6 @@ Playwright:
             bypass: string?
             username: string?
             password: string?
-        timeout: number?
         storageState:
           type: object?
           properties:
@@ -727,7 +854,7 @@ Playwright:
               items: NetworkCookie
             origins:
               type: array?
-              items: OriginStorage
+              items: SetOriginStorage
         tracesDir: string?
 
       returns:
@@ -746,9 +873,9 @@ RecorderSource:
       items:
         type: object
         properties:
-          line: number
+          line: int
           type: string
-    revealLine: number?
+    revealLine: int?
     group: string?
 
 DebugController:
@@ -756,27 +883,18 @@ DebugController:
 
   commands:
     initialize:
+      internal: true
       parameters:
         codegenId: string
-        sdkLanguage:
-          type: enum
-          literals:
-          - javascript
-          - python
-          - java
-          - csharp
+        sdkLanguage: SDKLanguage
 
     setReportStateChanged:
+      internal: true
       parameters:
         enabled: boolean
 
-    resetForReuse:
-
-    navigate:
-      parameters:
-        url: string
-
     setRecorderMode:
+      internal: true
       parameters:
         mode:
           type: enum
@@ -785,24 +903,29 @@ DebugController:
             - recording
             - none
         testIdAttributeName: string?
+        generateAutoExpect: boolean?
 
     highlight:
+      internal: true
       parameters:
-        selector: string
+        selector: string?
+        ariaTemplate: string?
 
     hideHighlight:
+      internal: true
 
     resume:
+      internal: true
 
     kill:
-
-    closeAllBrowsers:
+      internal: true
 
   events:
     inspectRequested:
       parameters:
         selector: string
         locator: string
+        ariaSnapshot: string
 
     setModeRequested:
       parameters:
@@ -810,7 +933,26 @@ DebugController:
 
     stateChanged:
       parameters:
-        pageCount: number
+        pageCount: int
+        browsers:
+          type: array
+          items:
+            type: object
+            properties:
+              id: string
+              name: string
+              channel: string?
+              contexts:
+                type: array
+                items:
+                  type: object
+                  properties:
+                    pages:
+                      type: array
+                      items:
+                        type: object
+                        properties:
+                          url: string
 
     sourceChanged:
       parameters:
@@ -830,27 +972,32 @@ SocksSupport:
 
   commands:
     socksConnected:
+      internal: true
       parameters:
         uid: string
         host: string
-        port: number
+        port: int
 
     socksFailed:
+      internal: true
       parameters:
         uid: string
         errorCode: string
 
     socksData:
+      internal: true
       parameters:
         uid: string
         data: binary
 
     socksError:
+      internal: true
       parameters:
         uid: string
         error: string
 
     socksEnd:
+      internal: true
       parameters:
         uid: string
 
@@ -859,7 +1006,7 @@ SocksSupport:
       parameters:
         uid: string
         host: string
-        port: number
+        port: int
 
     socksData:
       parameters:
@@ -870,20 +1017,6 @@ SocksSupport:
       parameters:
         uid: string
 
-Selectors:
-  type: interface
-
-  commands:
-
-    register:
-      parameters:
-        name: string
-        source: string
-        contentScript: boolean?
-
-    setTestIdAttributeName:
-      parameters:
-        testIdAttributeName: string
 
 BrowserType:
   type: interface
@@ -895,29 +1028,33 @@ BrowserType:
   commands:
 
     launch:
+      title: Launch browser
       parameters:
         $mixin: LaunchOptions
-        slowMo: number?
+        slowMo: float?
       returns:
         browser: Browser
 
     launchPersistentContext:
+      title: Launch persistent context
       parameters:
         $mixin1: LaunchOptions
         $mixin2: ContextOptions
         userDataDir: string
-        slowMo: number?
+        slowMo: float?
       returns:
+        browser: Browser
         context: BrowserContext
 
     connectOverCDP:
+      title: Connect over CDP
       parameters:
         endpointURL: string
         headers:
           type: array?
           items: NameValue
-        slowMo: number?
-        timeout: number?
+        slowMo: float?
+        timeout: float
       returns:
         browser: Browser
         defaultContext: BrowserContext?
@@ -932,16 +1069,22 @@ Browser:
   commands:
 
     close:
+      title: Close browser
       parameters:
         reason: string?
+      flags:
+        pausesBeforeAction: true
 
     killForTests:
+      internal: true
 
     defaultUserAgentForTest:
+      internal: true
       returns:
         userAgent: string
 
     newContext:
+      title: Create context
       parameters:
         $mixin: ContextOptions
         proxy:
@@ -959,11 +1102,12 @@ Browser:
               items: SetNetworkCookie
             origins:
               type: array?
-              items: OriginStorage
+              items: SetOriginStorage
       returns:
         context: BrowserContext
 
     newContextForReuse:
+      internal: true
       parameters:
         $mixin: ContextOptions
         proxy:
@@ -981,19 +1125,24 @@ Browser:
               items: SetNetworkCookie
             origins:
               type: array?
-              items: OriginStorage
+              items: SetOriginStorage
       returns:
         context: BrowserContext
 
-    stopPendingOperations:
+    disconnectFromReusedContext:
+      internal: true
       parameters:
         reason: string
 
     newBrowserCDPSession:
+      title: Create CDP session
+      group: configuration
       returns:
         session: CDPSession
 
     startTracing:
+      title: Start browser tracing
+      group: configuration
       parameters:
         page: Page?
         screenshots: boolean?
@@ -1002,12 +1151,17 @@ Browser:
           items: string
 
     stopTracing:
+      title: Stop browser tracing
+      group: configuration
       returns:
         artifact: Artifact
 
-
   events:
 
+    context:
+      parameters:
+        context: BrowserContext
+
     close:
 
 ConsoleMessage:
@@ -1022,8 +1176,8 @@ ConsoleMessage:
       type: object
       properties:
         url: string
-        lineNumber: number
-        columnNumber: number
+        lineNumber: int
+        columnNumber: int
 
 
 EventTarget:
@@ -1031,6 +1185,7 @@ EventTarget:
 
   commands:
     waitForEventInfo:
+      title: Wait for event "{info.event}"
       parameters:
         info:
           type: object
@@ -1057,20 +1212,30 @@ BrowserContext:
     isChromium: boolean
     requestContext: APIRequestContext
     tracing: Tracing
+    options:
+      type: object
+      properties:
+        $mixin: ContextOptions
 
   commands:
 
     addCookies:
+      title: Add cookies
+      group: configuration
       parameters:
         cookies:
           type: array
           items: SetNetworkCookie
 
     addInitScript:
+      title: Add init script
+      group: configuration
       parameters:
         source: string
 
     clearCookies:
+      title: Clear cookies
+      group: configuration
       parameters:
         name: string?
         nameRegexSource: string?
@@ -1083,12 +1248,19 @@ BrowserContext:
         pathRegexFlags: string?
 
     clearPermissions:
+      title: Clear permissions
+      group: configuration
 
     close:
+      title: Close context
       parameters:
         reason: string?
+      flags:
+        pausesBeforeAction: true
 
     cookies:
+      title: Get cookies
+      group: getter
       parameters:
         urls:
           type: array
@@ -1099,11 +1271,15 @@ BrowserContext:
           items: NetworkCookie
 
     exposeBinding:
+      title: Expose binding
+      group: configuration
       parameters:
         name: string
         needsHandle: boolean?
 
     grantPermissions:
+      title: Grant permissions
+      group: configuration
       parameters:
         permissions:
           type: array
@@ -1111,33 +1287,42 @@ BrowserContext:
         origin: string?
 
     newPage:
+      title: Create page
       returns:
         page: Page
 
-    setDefaultNavigationTimeoutNoReply:
+    registerSelectorEngine:
+      internal: true
       parameters:
-        timeout: number?
+        selectorEngine: SelectorEngine
 
-    setDefaultTimeoutNoReply:
+    setTestIdAttributeName:
+      internal: true
       parameters:
-        timeout: number?
+        testIdAttributeName: string
 
     setExtraHTTPHeaders:
+      title: Set extra HTTP headers
+      group: configuration
       parameters:
         headers:
           type: array
           items: NameValue
 
     setGeolocation:
+      title: Set geolocation
+      group: configuration
       parameters:
         geolocation:
           type: object?
           properties:
-            longitude: number
-            latitude: number
-            accuracy: number?
+            longitude: float
+            latitude: float
+            accuracy: float?
 
     setHTTPCredentials:
+      title: Set HTTP credentials
+      group: configuration
       parameters:
         httpCredentials:
           type: object?
@@ -1147,6 +1332,21 @@ BrowserContext:
             origin: string?
 
     setNetworkInterceptionPatterns:
+      title: Route requests
+      group: route
+      parameters:
+        patterns:
+          type: array
+          items:
+            type: object
+            properties:
+              glob: string?
+              regexSource: string?
+              regexFlags: string?
+
+    setWebSocketInterceptionPatterns:
+      title: Route WebSockets
+      group: route
       parameters:
         patterns:
           type: array
@@ -1158,10 +1358,14 @@ BrowserContext:
               regexFlags: string?
 
     setOffline:
+      title: Set offline mode
       parameters:
         offline: boolean
 
     storageState:
+      title: Get storage state
+      parameters:
+        indexedDB: boolean?
       returns:
         cookies:
           type: array
@@ -1171,10 +1375,10 @@ BrowserContext:
           items: OriginStorage
 
     pause:
-      experimental: True
+      title: Pause
 
-    recorderSupplementEnable:
-      experimental: True
+    enableRecorder:
+      internal: true
       parameters:
         language: string?
         mode:
@@ -1182,6 +1386,11 @@ BrowserContext:
           literals:
           - inspecting
           - recording
+        recorderMode:
+          type: enum?
+          literals:
+          - default
+          - api
         pauseOnNextStatement: boolean?
         testIdAttributeName: string?
         launchOptions: json?
@@ -1192,7 +1401,12 @@ BrowserContext:
         handleSIGINT: boolean?
         omitCallTracking: boolean?
 
+    disableRecorder:
+      internal: true
+
     newCDPSession:
+      title: Create CDP session
+      group: configuration
       parameters:
         page: Page?
         frame: Frame?
@@ -1200,6 +1414,7 @@ BrowserContext:
         session: CDPSession
 
     harStart:
+      internal: true
       parameters:
         page: Page?
         options: RecordHarOptions
@@ -1207,12 +1422,14 @@ BrowserContext:
         harId: string
 
     harExport:
+      internal: true
       parameters:
         harId: string?
       returns:
         artifact: Artifact
 
     createTempFiles:
+      internal: true
       parameters:
         rootDirName: string?
         items:
@@ -1221,7 +1438,7 @@ BrowserContext:
             type: object
             properties:
               name: string
-              lastModifiedMs: number?
+              lastModifiedMs: float?
       returns:
         rootDir: WritableStream?
         writableStreams:
@@ -1229,6 +1446,7 @@ BrowserContext:
           items: WritableStream
 
     updateSubscription:
+      internal: true
       parameters:
         event:
           type: enum
@@ -1242,35 +1460,42 @@ BrowserContext:
         enabled: boolean
 
     clockFastForward:
+      title: Fast forward clock "{ticksNumber|ticksString}"
       parameters:
-        ticksNumber: number?
+        ticksNumber: float?
         ticksString: string?
 
     clockInstall:
+      title: Install clock "{timeNumber|timeString}"
       parameters:
-        timeNumber: number?
+        timeNumber: float?
         timeString: string?
 
     clockPauseAt:
+      title: Pause clock "{timeNumber|timeString}"
       parameters:
-        timeNumber: number?
+        timeNumber: float?
         timeString: string?
 
     clockResume:
+      title: Resume clock
 
     clockRunFor:
+      title: Run clock "{ticksNumber|ticksString}"
       parameters:
-        ticksNumber: number?
+        ticksNumber: float?
         ticksString: string?
 
     clockSetFixedTime:
+      title: Set fixed time "{timeNumber|timeString}"
       parameters:
-        timeNumber: number?
+        timeNumber: float?
         timeString: string?
 
     clockSetSystemTime:
+      title: Set system time "{timeNumber|timeString}"
       parameters:
-        timeNumber: number?
+        timeNumber: float?
         timeString: string?
 
   events:
@@ -1303,6 +1528,10 @@ BrowserContext:
       parameters:
         route: Route
 
+    webSocketRoute:
+      parameters:
+        webSocketRoute: WebSocketRoute
+
     video:
       parameters:
         artifact: Artifact
@@ -1324,14 +1553,14 @@ BrowserContext:
       parameters:
         request: Request
         failureText: string?
-        responseEndTiming: number
+        responseEndTiming: float
         page: Page?
 
     requestFinished:
       parameters:
         request: Request
         response: Response?
-        responseEndTiming: number
+        responseEndTiming: float
         page: Page?
 
     response:
@@ -1339,6 +1568,18 @@ BrowserContext:
         response: Response
         page: Page?
 
+    recorderEvent:
+      parameters:
+        event:
+          type: enum
+          literals:
+          - actionAdded
+          - actionUpdated
+          - signalAdded
+        data: json
+        page: Page
+        code: string
+
 Page:
   type: interface
 
@@ -1349,31 +1590,29 @@ Page:
     viewportSize:
       type: object?
       properties:
-        width: number
-        height: number
+        width: int
+        height: int
     isClosed: boolean
     opener: Page?
 
   commands:
 
-    setDefaultNavigationTimeoutNoReply:
-      parameters:
-        timeout: number?
-
-    setDefaultTimeoutNoReply:
-      parameters:
-        timeout: number?
-
     addInitScript:
+      title: Add init script
+      group: configuration
       parameters:
         source: string
 
     close:
+      title: Close page
       parameters:
         runBeforeUnload: boolean?
         reason: string?
+      flags:
+        pausesBeforeAction: true
 
     emulateMedia:
+      title: Emulate media
       parameters:
         media:
           type: enum?
@@ -1400,64 +1639,87 @@ Page:
           - active
           - none
           - no-override
+        contrast:
+          type: enum?
+          literals:
+          - no-preference
+          - more
+          - no-override
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     exposeBinding:
+      title: Expose binding
+      group: configuration
       parameters:
         name: string
         needsHandle: boolean?
 
     goBack:
+      title: Go back
       parameters:
-        timeout: number?
+        timeout: float
         waitUntil: LifecycleEvent?
       returns:
         response: Response?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     goForward:
+      title: Go forward
       parameters:
-        timeout: number?
+        timeout: float
         waitUntil: LifecycleEvent?
       returns:
         response: Response?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
+
+    requestGC:
+      title: Request garbage collection
+      group: configuration
 
     registerLocatorHandler:
+      title: Register locator handler
       parameters:
         selector: string
         noWaitAfter: boolean?
       returns:
-        uid: number
+        uid: int
 
     resolveLocatorHandlerNoReply:
+      internal: true
       parameters:
-        uid: number
+        uid: int
         remove: boolean?
 
     unregisterLocatorHandler:
+      title: Unregister locator handler
       parameters:
-        uid: number
+        uid: int
 
     reload:
+      title: Reload
       parameters:
-        timeout: number?
+        timeout: float
         waitUntil: LifecycleEvent?
       returns:
         response: Response?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     expectScreenshot:
+      title: Expect screenshot
       parameters:
         expected: binary?
-        timeout: number?
+        timeout: float
         isNot: boolean
         locator:
           type: object?
@@ -1465,9 +1727,9 @@ Page:
             frame: Frame
             selector: string
         comparator: string?
-        maxDiffPixels: number?
-        maxDiffPixelRatio: number?
-        threshold: number?
+        maxDiffPixels: int?
+        maxDiffPixelRatio: float?
+        threshold: float?
         fullPage: boolean?
         clip: Rect?
         $mixin: CommonScreenshotOptions
@@ -1476,21 +1738,24 @@ Page:
         errorMessage: string?
         actual: binary?
         previous: binary?
+        timedOut: boolean?
         log:
           type: array?
           items: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     screenshot:
+      title: Screenshot
       parameters:
-        timeout: number?
+        timeout: float
         type:
           type: enum?
           literals:
           - png
           - jpeg
-        quality: number?
+        quality: int?
         fullPage: boolean?
         clip: Rect?
         $mixin: CommonScreenshotOptions
@@ -1498,14 +1763,32 @@ Page:
         binary: binary
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     setExtraHTTPHeaders:
+      title: Set extra HTTP headers
+      group: configuration
       parameters:
         headers:
           type: array
           items: NameValue
 
     setNetworkInterceptionPatterns:
+      title: Route requests
+      group: route
+      parameters:
+        patterns:
+          type: array
+          items:
+            type: object
+            properties:
+              glob: string?
+              regexSource: string?
+              regexFlags: string?
+
+    setWebSocketInterceptionPatterns:
+      title: Route WebSockets
+      group: route
       parameters:
         patterns:
           type: array
@@ -1517,62 +1800,77 @@ Page:
               regexFlags: string?
 
     setViewportSize:
+      title: Set viewport size
       parameters:
         viewportSize:
           type: object
           properties:
-            width: number
-            height: number
+            width: int
+            height: int
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     keyboardDown:
+      title: Key down "{key}"
       parameters:
         key: string
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     keyboardUp:
+      title: Key up "{key}"
       parameters:
         key: string
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     keyboardInsertText:
+      title: Insert "{text}"
       parameters:
         text: string
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     keyboardType:
+      title: Type "{text}"
       parameters:
         text: string
-        delay: number?
+        delay: float?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     keyboardPress:
+      title: Press "{key}"
       parameters:
         key: string
-        delay: number?
+        delay: float?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     mouseMove:
+      title: Mouse move
       parameters:
-        x: number
-        y: number
-        steps: number?
+        x: float
+        y: float
+        steps: int?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     mouseDown:
+      title: Mouse down
       parameters:
         button:
           type: enum?
@@ -1580,12 +1878,14 @@ Page:
           - left
           - right
           - middle
-        clickCount: number?
+        clickCount: int?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     mouseUp:
+      title: Mouse up
       parameters:
         button:
           type: enum?
@@ -1593,44 +1893,53 @@ Page:
           - left
           - right
           - middle
-        clickCount: number?
+        clickCount: int?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     mouseClick:
+      title: Click
       parameters:
-        x: number
-        y: number
-        delay: number?
+        x: float
+        y: float
+        delay: float?
         button:
           type: enum?
           literals:
           - left
           - right
           - middle
-        clickCount: number?
+        clickCount: int?
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     mouseWheel:
+      title: Mouse wheel
       parameters:
-        deltaX: number
-        deltaY: number
+        deltaX: float
+        deltaY: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     touchscreenTap:
+      title: Tap
       parameters:
-        x: number
-        y: number
+        x: float
+        y: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     accessibilitySnapshot:
+      title: Accessibility snapshot
+      group: getter
       parameters:
         interestingOnly: boolean?
         root: ElementHandle?
@@ -1638,8 +1947,9 @@ Page:
         rootAXNode: AXNode?
 
     pdf:
+      title: PDF
       parameters:
-        scale: number?
+        scale: float?
         displayHeaderFooter: boolean?
         headerTemplate: string?
         footerTemplate: string?
@@ -1662,12 +1972,23 @@ Page:
       returns:
         pdf: binary
 
+    snapshotForAI:
+      internal: true
+      parameters:
+        timeout: float
+      returns:
+        snapshot: string
+
     startJSCoverage:
+      title: Start JS coverage
+      group: configuration
       parameters:
         resetOnNavigation: boolean?
         reportAnonymousScripts: boolean?
 
     stopJSCoverage:
+      title: Stop JS coverage
+      group: configuration
       returns:
         entries:
           type: array
@@ -1689,15 +2010,19 @@ Page:
                       items:
                         type: object
                         properties:
-                          startOffset: number
-                          endOffset: number
-                          count: number
+                          startOffset: int
+                          endOffset: int
+                          count: int
 
     startCSSCoverage:
+      title: Start CSS coverage
+      group: configuration
       parameters:
         resetOnNavigation: boolean?
 
     stopCSSCoverage:
+      title: Stop CSS coverage
+      group: configuration
       returns:
         entries:
           type: array
@@ -1711,12 +2036,14 @@ Page:
                 items:
                   type: object
                   properties:
-                    start: number
-                    end: number
+                    start: int
+                    end: int
 
     bringToFront:
+      title: Bring to front
 
     updateSubscription:
+      internal: true
       parameters:
         event:
           type: enum
@@ -1746,6 +2073,14 @@ Page:
         suggestedFilename: string
         artifact: Artifact
 
+    viewportSizeChanged:
+      parameters:
+        viewportSize:
+          type: object?
+          properties:
+            width: int
+            height: int
+
     fileChooser:
       parameters:
         element: ElementHandle
@@ -1761,12 +2096,16 @@ Page:
 
     locatorHandlerTriggered:
       parameters:
-        uid: number
+        uid: int
 
     route:
       parameters:
         route: Route
 
+    webSocketRoute:
+      parameters:
+        webSocketRoute: WebSocketRoute
+
     video:
       parameters:
         artifact: Artifact
@@ -1795,6 +2134,7 @@ Frame:
   commands:
 
     evalOnSelector:
+      title: Evaluate
       parameters:
         selector: string
         strict: boolean?
@@ -1805,8 +2145,10 @@ Frame:
         value: SerializedValue
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     evalOnSelectorAll:
+      title: Evaluate
       parameters:
         selector: string
         expression: string
@@ -1816,8 +2158,10 @@ Frame:
         value: SerializedValue
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     addScriptTag:
+      title: Add script tag
       parameters:
         url: string?
         content: string?
@@ -1826,8 +2170,10 @@ Frame:
         element: ElementHandle
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     addStyleTag:
+      title: Add style tag
       parameters:
         url: string?
         content: string?
@@ -1835,23 +2181,38 @@ Frame:
         element: ElementHandle
       flags:
         snapshot: true
+        pausesBeforeAction: true
+
+    ariaSnapshot:
+      title: Aria snapshot
+      parameters:
+        selector: string
+        timeout: float
+      returns:
+        snapshot: string
+      flags:
+        snapshot: true
+        pausesBeforeAction: true
 
     blur:
+      title: Blur
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     check:
+      title: Check
       parameters:
         selector: string
         strict: boolean?
         force: boolean?
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -1859,6 +2220,7 @@ Frame:
         pausesBeforeInput: true
 
     click:
+      title: Click
       parameters:
         selector: string
         strict: boolean?
@@ -1875,15 +2237,15 @@ Frame:
             - Meta
             - Shift
         position: Point?
-        delay: number?
+        delay: float?
         button:
           type: enum?
           literals:
           - left
           - right
           - middle
-        clickCount: number?
-        timeout: number?
+        clickCount: int?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -1891,15 +2253,20 @@ Frame:
         pausesBeforeInput: true
 
     content:
+      title: Get content
       returns:
         value: string
+      flags:
+        snapshot: true
+        pausesBeforeAction: true
 
     dragAndDrop:
+      title: Drag and drop
       parameters:
         source: string
         target: string
         force: boolean?
-        timeout: number?
+        timeout: float
         trial: boolean?
         sourcePosition: Point?
         targetPosition: Point?
@@ -1910,6 +2277,7 @@ Frame:
         pausesBeforeInput: true
 
     dblclick:
+      title: Double click
       parameters:
         selector: string
         strict: boolean?
@@ -1925,14 +2293,14 @@ Frame:
             - Meta
             - Shift
         position: Point?
-        delay: number?
+        delay: float?
         button:
           type: enum?
           literals:
           - left
           - right
           - middle
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -1940,17 +2308,20 @@ Frame:
         pausesBeforeInput: true
 
     dispatchEvent:
+      title: Dispatch "{type}"
       parameters:
         selector: string
         strict: boolean?
         type: string
         eventInit: SerializedArgument
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     evaluateExpression:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -1959,8 +2330,10 @@ Frame:
         value: SerializedValue
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     evaluateExpressionHandle:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -1969,51 +2342,70 @@ Frame:
         handle: JSHandle
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     fill:
+      title: Fill "{value}"
       parameters:
         selector: string
         strict: boolean?
         value: string
         force: boolean?
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     focus:
+      title: Focus
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     frameElement:
+      title: Get frame element
+      group: getter
       returns:
         element: ElementHandle
 
+    resolveSelector:
+      internal: true
+      parameters:
+        selector: string
+      returns:
+        resolvedSelector: string
+
     highlight:
+      title: Highlight element
+      group: configuration
       parameters:
         selector: string
 
     getAttribute:
+      title: Get attribute "{name}"
+      group: getter
       parameters:
         selector: string
         strict: boolean?
         name: string
-        timeout: number?
+        timeout: float
       returns:
         value: string?
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     goto:
+      title: Navigate to "{url}"
       parameters:
         url: string
-        timeout: number?
+        timeout: float
         waitUntil: LifecycleEvent?
         referer: string?
       returns:
@@ -2021,8 +2413,10 @@ Frame:
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     hover:
+      title: Hover
       parameters:
         selector: string
         strict: boolean?
@@ -2038,7 +2432,7 @@ Frame:
             - Meta
             - Shift
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2046,128 +2440,169 @@ Frame:
         pausesBeforeInput: true
 
     innerHTML:
+      title: Get HTML
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     innerText:
+      title: Get inner text
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     inputValue:
+      title: Get input value
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isChecked:
+      title: Is checked
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isDisabled:
+      title: Is disabled
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isEnabled:
+      title: Is enabled
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isHidden:
+      title: Is hidden
+      group: getter
       parameters:
+        # Note: compared to other isFoo methods, isHidden is a one-shot operation without a timeout.
         selector: string
         strict: boolean?
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isVisible:
+      title: Is visible
+      group: getter
       parameters:
+        # Note: compared to other isFoo methods, isVisible is a one-shot operation without a timeout.
         selector: string
         strict: boolean?
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isEditable:
+      title: Is editable
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     press:
+      title: Press "{key}"
       parameters:
         selector: string
         strict: boolean?
         key: string
-        delay: number?
+        delay: float?
         noWaitAfter: boolean?
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     querySelector:
+      title: Query selector
       parameters:
         selector: string
         strict: boolean?
       returns:
         element: ElementHandle?
+      flags:
+        snapshot: true
 
     querySelectorAll:
+      title: Query selector all
       parameters:
         selector: string
       returns:
         elements:
           type: array
           items: ElementHandle
+      flags:
+        snapshot: true
 
     queryCount:
+      title: Query count
       parameters:
         selector: string
       returns:
-        value: number
+        value: int
+      flags:
+        snapshot: true
+        pausesBeforeAction: true
 
     selectOption:
+      title: Select option
       parameters:
         selector: string
         strict: boolean?
@@ -2182,10 +2617,9 @@ Frame:
               valueOrLabel: string?
               value: string?
               label: string?
-              index: number?
+              index: int?
         force: boolean?
-        timeout: number?
-        noWaitAfter: boolean?
+        timeout: float
       returns:
         values:
           type: array
@@ -2196,14 +2630,17 @@ Frame:
         pausesBeforeInput: true
 
     setContent:
+      title: Set content
       parameters:
         html: string
-        timeout: number?
+        timeout: float
         waitUntil: LifecycleEvent?
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     setInputFiles:
+      title: Set input files
       parameters:
         selector: string
         strict: boolean?
@@ -2224,13 +2661,14 @@ Frame:
         streams:
           type: array?
           items: WritableStream
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     tap:
+      title: Tap
       parameters:
         selector: string
         strict: boolean?
@@ -2246,7 +2684,7 @@ Frame:
             - Meta
             - Shift
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2254,38 +2692,45 @@ Frame:
         pausesBeforeInput: true
 
     textContent:
+      title: Get text content
+      group: getter
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
       returns:
         value: string?
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     title:
+      title: Get page title
+      group: getter
       returns:
         value: string
 
     type:
+      title: Type "{text}"
       parameters:
         selector: string
         strict: boolean?
         text: string
-        delay: number?
-        timeout: number?
+        delay: float?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     uncheck:
+      title: Uncheck
       parameters:
         selector: string
         strict: boolean?
         force: boolean?
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2293,29 +2738,33 @@ Frame:
         pausesBeforeInput: true
 
     waitForTimeout:
+      title: Wait for timeout
       parameters:
-        timeout: number
+        waitTimeout: float
       flags:
         snapshot: true
 
     waitForFunction:
+      title: Wait for function
       parameters:
         expression: string
         isFunction: boolean?
         arg: SerializedArgument
-        timeout: number?
+        timeout: float
         # When present, polls on interval. Otherwise, polls on raf.
-        pollingInterval: number?
+        pollingInterval: float?
       returns:
         handle: JSHandle
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     waitForSelector:
+      title: Wait for selector
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
         state:
           type: enum?
           literals:
@@ -2330,18 +2779,19 @@ Frame:
         snapshot: true
 
     expect:
+      title: Expect "{expression}"
       parameters:
-        selector: string
+        selector: string?
         expression: string
         expressionArg: json?
         expectedText:
           type: array?
           items: ExpectedTextValue
-        expectedNumber: number?
+        expectedNumber: float?
         expectedValue: SerializedArgument?
         useInnerText: boolean?
         isNot: boolean
-        timeout: number?
+        timeout: float
       returns:
         matches: boolean
         received: SerializedValue?
@@ -2351,6 +2801,7 @@ Frame:
           items: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
   events:
 
@@ -2380,6 +2831,7 @@ Worker:
   commands:
 
     evaluateExpression:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -2388,6 +2840,7 @@ Worker:
         value: SerializedValue
 
     evaluateExpressionHandle:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -2409,8 +2862,10 @@ JSHandle:
   commands:
 
     dispose:
+      internal: true
 
     evaluateExpression:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -2419,8 +2874,10 @@ JSHandle:
         value: SerializedValue
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     evaluateExpressionHandle:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -2429,8 +2886,11 @@ JSHandle:
         handle: JSHandle
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     getPropertyList:
+      title: Get property list
+      group: getter
       returns:
         properties:
           type: array
@@ -2441,19 +2901,19 @@ JSHandle:
               value: JSHandle
 
     getProperty:
+      title: Get JS property
+      group: getter
       parameters:
         name: string
       returns:
         handle: JSHandle
 
     jsonValue:
+      title: Get JSON value
+      group: getter
       returns:
         value: SerializedValue
 
-    objectCount:
-      returns:
-        count: number
-
   events:
 
     previewUpdated:
@@ -2470,6 +2930,7 @@ ElementHandle:
   commands:
 
     evalOnSelector:
+      title: Evaluate
       parameters:
         selector: string
         strict: boolean?
@@ -2480,8 +2941,10 @@ ElementHandle:
         value: SerializedValue
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     evalOnSelectorAll:
+      title: Evaluate
       parameters:
         selector: string
         expression: string
@@ -2491,16 +2954,22 @@ ElementHandle:
         value: SerializedValue
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     boundingBox:
+      title: Get bounding box
       returns:
         value: Rect?
+      flags:
+        snapshot: true
+        pausesBeforeAction: true
 
     check:
+      title: Check
       parameters:
         force: boolean?
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2508,6 +2977,7 @@ ElementHandle:
         pausesBeforeInput: true
 
     click:
+      title: Click
       parameters:
         force: boolean?
         noWaitAfter: boolean?
@@ -2522,15 +2992,15 @@ ElementHandle:
             - Meta
             - Shift
         position: Point?
-        delay: number?
+        delay: float?
         button:
           type: enum?
           literals:
           - left
           - right
           - middle
-        clickCount: number?
-        timeout: number?
+        clickCount: int?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2538,10 +3008,13 @@ ElementHandle:
         pausesBeforeInput: true
 
     contentFrame:
+      title: Get content frame
+      group: getter
       returns:
         frame: Frame?
 
     dblclick:
+      title: Double click
       parameters:
         force: boolean?
         modifiers:
@@ -2555,14 +3028,14 @@ ElementHandle:
             - Meta
             - Shift
         position: Point?
-        delay: number?
+        delay: float?
         button:
           type: enum?
           literals:
           - left
           - right
           - middle
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2570,35 +3043,46 @@ ElementHandle:
         pausesBeforeInput: true
 
     dispatchEvent:
+      title: Dispatch event
       parameters:
         type: string
         eventInit: SerializedArgument
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     fill:
+      title: Fill "{value}"
       parameters:
         value: string
         force: boolean?
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     focus:
+      title: Focus
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     getAttribute:
+      title: Get attribute
+      group: getter
       parameters:
         name: string
       returns:
         value: string?
+      flags:
+        snapshot: true
+        pausesBeforeAction: true
 
     hover:
+      title: Hover
       parameters:
         force: boolean?
         modifiers:
@@ -2612,7 +3096,7 @@ ElementHandle:
             - Meta
             - Shift
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2620,68 +3104,98 @@ ElementHandle:
         pausesBeforeInput: true
 
     innerHTML:
+      title: Get HTML
+      group: getter
       returns:
         value: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     innerText:
+      title: Get inner text
+      group: getter
       returns:
         value: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     inputValue:
+      title: Get input value
+      group: getter
       returns:
         value: string
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isChecked:
+      title: Is checked
+      group: getter
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isDisabled:
+      title: Is disabled
+      group: getter
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isEditable:
+      title: Is editable
+      group: getter
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isEnabled:
+      title: Is enabled
+      group: getter
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isHidden:
+      title: Is hidden
+      group: getter
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     isVisible:
+      title: Is visible
+      group: getter
       returns:
         value: boolean
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     ownerFrame:
+      title: Get owner frame
+      group: getter
       returns:
         frame: Frame?
 
     press:
+      title: Press "{key}"
       parameters:
         key: string
-        delay: number?
-        timeout: number?
+        delay: float?
+        timeout: float
         noWaitAfter: boolean?
       flags:
         slowMo: true
@@ -2689,43 +3203,54 @@ ElementHandle:
         pausesBeforeInput: true
 
     querySelector:
+      title: Query selector
       parameters:
         selector: string
         strict: boolean?
       returns:
         element: ElementHandle?
+      flags:
+        snapshot: true
 
     querySelectorAll:
+      title: Query selector all
       parameters:
         selector: string
       returns:
         elements:
           type: array
           items: ElementHandle
+      flags:
+        snapshot: true
 
     screenshot:
+      title: Screenshot
       parameters:
-        timeout: number?
+        timeout: float
         type:
           type: enum?
           literals:
           - png
           - jpeg
-        quality: number?
+        quality: int?
         $mixin: CommonScreenshotOptions
       returns:
         binary: binary
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     scrollIntoViewIfNeeded:
+      title: Scroll into view
       parameters:
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     selectOption:
+      title: Select option
       parameters:
         elements:
           type: array?
@@ -2738,10 +3263,9 @@ ElementHandle:
               valueOrLabel: string?
               value: string?
               label: string?
-              index: number?
+              index: int?
         force: boolean?
-        timeout: number?
-        noWaitAfter: boolean?
+        timeout: float
       returns:
         values:
           type: array
@@ -2752,14 +3276,17 @@ ElementHandle:
         pausesBeforeInput: true
 
     selectText:
+      title: Select text
       parameters:
         force: boolean?
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
+        pausesBeforeAction: true
 
     setInputFiles:
+      title: Set input files
       parameters:
         # Only one of payloads, localPaths and streams should be present.
         payloads:
@@ -2778,13 +3305,14 @@ ElementHandle:
         streams:
           type: array?
           items: WritableStream
-        timeout: number?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     tap:
+      title: Tap
       parameters:
         force: boolean?
         modifiers:
@@ -2798,7 +3326,7 @@ ElementHandle:
             - Meta
             - Shift
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2806,26 +3334,31 @@ ElementHandle:
         pausesBeforeInput: true
 
     textContent:
+      title: Get text content
+      group: getter
       returns:
         value: string?
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     type:
+      title: Type
       parameters:
         text: string
-        delay: number?
-        timeout: number?
+        delay: float?
+        timeout: float
       flags:
         slowMo: true
         snapshot: true
         pausesBeforeInput: true
 
     uncheck:
+      title: Uncheck
       parameters:
         force: boolean?
         position: Point?
-        timeout: number?
+        timeout: float
         trial: boolean?
       flags:
         slowMo: true
@@ -2833,6 +3366,7 @@ ElementHandle:
         pausesBeforeInput: true
 
     waitForElementState:
+      title: Wait for state
       parameters:
         state:
           type: enum
@@ -2843,15 +3377,17 @@ ElementHandle:
           - enabled
           - disabled
           - editable
-        timeout: number?
+        timeout: float
       flags:
         snapshot: true
+        pausesBeforeAction: true
 
     waitForSelector:
+      title: Wait for selector
       parameters:
         selector: string
         strict: boolean?
-        timeout: number?
+        timeout: float
         state:
           type: enum?
           literals:
@@ -2884,10 +3420,12 @@ Request:
   commands:
 
     response:
+      internal: true
       returns:
         response: Response?
 
     rawRequestHeaders:
+      internal: true
       returns:
         headers:
           type: array
@@ -2903,15 +3441,19 @@ Route:
   commands:
 
     redirectNavigationRequest:
+      internal: true
       parameters:
         url: string
 
     abort:
+      title: Abort request
+      group: route
       parameters:
         errorCode: string?
-        requestUrl: string
 
     continue:
+      title: Continue request
+      group: route
       parameters:
         url: string?
         method: string?
@@ -2919,32 +3461,101 @@ Route:
           type: array?
           items: NameValue
         postData: binary?
-        requestUrl: string
         isFallback: boolean
 
     fulfill:
+      title: Fulfill request
+      group: route
       parameters:
         # default is 200
-        status: number?
+        status: int?
         headers:
           type: array?
           items: NameValue
         body: string?
         isBase64: boolean?
         fetchResponseUid: string?
-        requestUrl: string
+
+
+WebSocketRoute:
+  type: interface
+
+  initializer:
+    url: string
+
+  commands:
+
+    connect:
+      title: Connect WebSocket to server
+      group: route
+
+    ensureOpened:
+      internal: true
+
+    sendToPage:
+      title: Send WebSocket message
+      group: route
+      parameters:
+        message: string
+        isBase64: boolean
+
+    sendToServer:
+      title: Send WebSocket message
+      group: route
+      parameters:
+        message: string
+        isBase64: boolean
+
+    closePage:
+      internal: true
+      parameters:
+        code: int?
+        reason: string?
+        wasClean: boolean
+
+    closeServer:
+      internal: true
+      parameters:
+        code: int?
+        reason: string?
+        wasClean: boolean
+
+  events:
+
+    messageFromPage:
+      parameters:
+        message: string
+        isBase64: boolean
+
+    messageFromServer:
+      parameters:
+        message: string
+        isBase64: boolean
+
+    closePage:
+      parameters:
+        code: int?
+        reason: string?
+        wasClean: boolean
+
+    closeServer:
+      parameters:
+        code: int?
+        reason: string?
+        wasClean: boolean
+
 
 ResourceTiming:
   type: object
   properties:
-    startTime: number
-    domainLookupStart: number
-    domainLookupEnd: number
-    connectStart: number
-    secureConnectionStart: number
-    connectEnd: number
-    requestStart: number
-    responseStart: number
+    startTime: float
+    domainLookupStart: float
+    domainLookupEnd: float
+    connectStart: float
+    secureConnectionStart: float
+    connectEnd: float
+    requestStart: float
+    responseStart: float
 
 Response:
   type: interface
@@ -2952,7 +3563,7 @@ Response:
   initializer:
     request: Request
     url: string
-    status: number
+    status: int
     statusText: string
     headers:
       type: array
@@ -2964,24 +3575,30 @@ Response:
   commands:
 
     body:
+      title: Get response body
+      group: getter
       returns:
         binary: binary
 
     securityDetails:
+      internal: true
       returns:
         value: SecurityDetails?
 
     serverAddr:
+      internal: true
       returns:
         value: RemoteAddr?
 
     rawResponseHeaders:
+      internal: true
       returns:
         headers:
           type: array
           items: NameValue
 
     sizes:
+      internal: true
       returns:
         sizes: RequestSizes
 
@@ -2992,23 +3609,23 @@ SecurityDetails:
     issuer: string?
     protocol: string?
     subjectName: string?
-    validFrom: number?
-    validTo: number?
+    validFrom: float?
+    validTo: float?
 
 RequestSizes:
   type: object
   properties:
-    requestBodySize: number
-    requestHeadersSize: number
-    responseBodySize: number
-    responseHeadersSize: number
+    requestBodySize: int
+    requestHeadersSize: int
+    responseBodySize: int
+    responseHeadersSize: int
 
 
 RemoteAddr:
   type: object
   properties:
     ipAddress: string
-    port: number
+    port: int
 
 
 WebSocket:
@@ -3024,12 +3641,12 @@ WebSocket:
 
     frameSent:
       parameters:
-        opcode: number
+        opcode: int
         data: string
 
     frameReceived:
       parameters:
-        opcode: number
+        opcode: int
         data: string
 
     socketError:
@@ -3053,10 +3670,12 @@ BindingCall:
   commands:
 
     reject:
+      internal: true
       parameters:
         error: SerializedError
 
     resolve:
+      internal: true
       parameters:
         result: SerializedArgument
 
@@ -3074,11 +3693,12 @@ Dialog:
   commands:
 
     accept:
+      title: Accept dialog
       parameters:
         promptText: string?
 
     dismiss:
-
+      title: Dismiss dialog
 
 Tracing:
   type: interface
@@ -3086,6 +3706,8 @@ Tracing:
   commands:
 
     tracingStart:
+      title: Start tracing
+      group: configuration
       parameters:
         name: string?
         snapshots: boolean?
@@ -3093,13 +3715,31 @@ Tracing:
         live: boolean?
 
     tracingStartChunk:
+      title: Start tracing
+      group: configuration
       parameters:
         name: string?
         title: string?
       returns:
         traceName: string
 
+    tracingGroup:
+      title: Trace "{name}"
+      parameters:
+        name: string
+        location:
+          type: object?
+          properties:
+            file: string
+            line: int?
+            column: int?
+
+    tracingGroupEnd:
+      title: Group end
+
     tracingStopChunk:
+      title: Stop tracing
+      group: configuration
       parameters:
         mode:
           type: enum
@@ -3117,6 +3757,8 @@ Tracing:
           items: NameValue
 
     tracingStop:
+      title: Stop tracing
+      group: configuration
 
 
 Artifact:
@@ -3128,30 +3770,37 @@ Artifact:
   commands:
 
     pathAfterFinished:
+      internal: true
       returns:
         value: string
 
     # Blocks path/failure/delete/context.close until saved to the local |path|.
     saveAs:
+      internal: true
       parameters:
         path: string
 
     # Blocks path/failure/delete/context.close until the stream is closed.
     saveAsStream:
+      internal: true
       returns:
         stream: Stream
 
     failure:
+      internal: true
       returns:
         error: string?
 
     stream:
+      internal: true
       returns:
         stream: Stream
 
     cancel:
+      internal: true
 
     delete:
+      internal: true
 
 
 Stream:
@@ -3160,12 +3809,14 @@ Stream:
   commands:
 
     read:
+      internal: true
       parameters:
-        size: number?
+        size: int?
       returns:
         binary: binary
 
     close:
+      internal: true
 
 
 WritableStream:
@@ -3174,10 +3825,12 @@ WritableStream:
   commands:
 
     write:
+      internal: true
       parameters:
         binary: binary
 
     close:
+      internal: true
 
 
 CDPSession:
@@ -3186,6 +3839,8 @@ CDPSession:
   commands:
 
     send:
+      title: Send CDP command
+      group: configuration
       parameters:
         method: string
         params: json?
@@ -3193,6 +3848,8 @@ CDPSession:
         result: json
 
     detach:
+      title: Detach CDP session
+      group: configuration
 
   events:
 
@@ -3208,6 +3865,7 @@ Electron:
   commands:
 
     launch:
+      title: Launch electron
       parameters:
         executablePath: string?
         args:
@@ -3217,7 +3875,7 @@ Electron:
         env:
           type: array?
           items: NameValue
-        timeout: number?
+        timeout: float
         acceptDownloads:
           type: enum?
           literals:
@@ -3238,9 +3896,9 @@ Electron:
         geolocation:
           type: object?
           properties:
-            longitude: number
-            latitude: number
-            accuracy: number?
+            longitude: float
+            latitude: float
+            accuracy: float?
         httpCredentials:
           type: object?
           properties:
@@ -3250,7 +3908,6 @@ Electron:
         ignoreHTTPSErrors: boolean?
         locale: string?
         offline: boolean?
-        recordHar: RecordHarOptions?
         recordVideo:
           type: object?
           properties:
@@ -3258,11 +3915,15 @@ Electron:
             size:
               type: object?
               properties:
-                width: number
-                height: number
+                width: int
+                height: int
         strictSelectors: boolean?
         timezoneId: string?
         tracesDir: string?
+        selectorEngines:
+          type: array?
+          items: SelectorEngine
+        testIdAttributeName: string?
 
       returns:
         electronApplication: ElectronApplication
@@ -3279,12 +3940,14 @@ ElectronApplication:
   commands:
 
     browserWindow:
+      internal: true
       parameters:
         page: Page
       returns:
         handle: JSHandle
 
     evaluateExpression:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -3293,6 +3956,7 @@ ElectronApplication:
         value: SerializedValue
 
     evaluateExpressionHandle:
+      title: Evaluate
       parameters:
         expression: string
         isFunction: boolean?
@@ -3301,6 +3965,7 @@ ElectronApplication:
         handle: JSHandle
 
     updateSubscription:
+      internal: true
       parameters:
         event:
           type: enum
@@ -3320,28 +3985,27 @@ Android:
   commands:
 
     devices:
+      internal: true
       parameters:
         host: string?
-        port: number?
+        port: int?
         omitDriverInstall: boolean?
       returns:
         devices:
           type: array
           items: AndroidDevice
 
-    setDefaultTimeoutNoReply:
-      parameters:
-        timeout: number
-
 AndroidSocket:
   type: interface
 
   commands:
     write:
+      internal: true
       parameters:
         data: binary
 
     close:
+      internal: true
 
   events:
     data:
@@ -3360,36 +4024,41 @@ AndroidDevice:
 
   commands:
     wait:
+      title: Wait
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
         state:
           type: enum?
           literals:
           - gone
-        timeout: number?
+        timeout: float
 
     fill:
+      title: Fill "{text}"
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
         text: string
-        timeout: number?
+        timeout: float
 
     tap:
+      title: Tap
       parameters:
-        selector: AndroidSelector
-        duration: number?
-        timeout: number?
+        androidSelector: AndroidSelector
+        duration: float?
+        timeout: float
 
     drag:
+      title: Drag
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
         dest: Point
-        speed: number?
-        timeout: number?
+        speed: float?
+        timeout: float
 
     fling:
+      title: Fling
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
         direction:
           type: enum
           literals:
@@ -3397,31 +4066,35 @@ AndroidDevice:
           - down
           - left
           - right
-        speed: number?
-        timeout: number?
+        speed: float?
+        timeout: float
 
     longTap:
+      title: Long tap
       parameters:
-        selector: AndroidSelector
-        timeout: number?
+        androidSelector: AndroidSelector
+        timeout: float
 
     pinchClose:
+      title: Pinch close
       parameters:
-        selector: AndroidSelector
-        percent: number
-        speed: number?
-        timeout: number?
+        androidSelector: AndroidSelector
+        percent: float
+        speed: float?
+        timeout: float
 
     pinchOpen:
+      title: Pinch open
       parameters:
-        selector: AndroidSelector
-        percent: number
-        speed: number?
-        timeout: number?
+        androidSelector: AndroidSelector
+        percent: float
+        speed: float?
+        timeout: float
 
     scroll:
+      title: Scroll
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
         direction:
           type: enum
           literals:
@@ -3429,13 +4102,14 @@ AndroidDevice:
           - down
           - left
           - right
-        percent: number
-        speed: number?
-        timeout: number?
+        percent: float
+        speed: float?
+        timeout: float
 
     swipe:
+      title: Swipe
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
         direction:
           type: enum
           literals:
@@ -3443,46 +4117,54 @@ AndroidDevice:
           - down
           - left
           - right
-        percent: number
-        speed: number?
-        timeout: number?
+        percent: float
+        speed: float?
+        timeout: float
 
     info:
+      internal: true
       parameters:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
       returns:
         info: AndroidElementInfo
 
     screenshot:
+      title: Screenshot
       returns:
         binary: binary
 
     inputType:
+      title: Type
       parameters:
         text: string
 
     inputPress:
+      title: Press
       parameters:
         key: string
 
     inputTap:
+      title: Tap
       parameters:
         point: Point
 
     inputSwipe:
+      title: Swipe
       parameters:
         segments:
           type: array
           items: Point
-        steps: number
+        steps: int
 
     inputDrag:
+      title: Drag
       parameters:
         from: Point
         to: Point
-        steps: number
+        steps: int
 
     launchBrowser:
+      title: Launch browser
       parameters:
         $mixin: ContextOptions
         pkg: string?
@@ -3501,18 +4183,22 @@ AndroidDevice:
         context: BrowserContext
 
     open:
+      title: Open app
       parameters:
         command: string
       returns:
         socket: AndroidSocket
 
     shell:
+      title: Execute shell command
+      group: configuration
       parameters:
         command: string
       returns:
         result: binary
 
     installApk:
+      title: Install apk
       parameters:
         file: binary
         args:
@@ -3520,22 +4206,21 @@ AndroidDevice:
           items: string
 
     push:
+      title: Push
       parameters:
         file: binary
         path: string
-        mode: number?
-
-    setDefaultTimeoutNoReply:
-      parameters:
-        timeout: number
+        mode: int?
 
     connectToWebView:
+      title: Connect to Web View
       parameters:
         socketName: string
       returns:
         context: BrowserContext
 
     close:
+      internal: true
 
   events:
     close:
@@ -3552,7 +4237,7 @@ AndroidDevice:
 AndroidWebView:
   type: object
   properties:
-    pid: number
+    pid: int
     pkg: string
     socketName: string
 
@@ -3564,7 +4249,7 @@ AndroidSelector:
     checked: boolean?
     clazz: string?
     clickable: boolean?
-    depth: number?
+    depth: int?
     desc: string?
     enabled: boolean?
     focusable: boolean?
@@ -3572,12 +4257,12 @@ AndroidSelector:
     hasChild:
       type: object?
       properties:
-        selector: AndroidSelector
+        androidSelector: AndroidSelector
     hasDescendant:
       type: object?
       properties:
-        selector: AndroidSelector
-        maxDepth: number?
+        androidSelector: AndroidSelector
+        maxDepth: int?
     longClickable: boolean?
     pkg: string?
     res: string?
@@ -3614,10 +4299,12 @@ JsonPipe:
 
   commands:
     send:
+      internal: true
       parameters:
         message: json
 
     close:
+      internal: true
 
   events:
 
diff --git a/packages/recorder/index.html b/packages/recorder/index.html
index 6b60af64c2007..c6acfd6178791 100644
--- a/packages/recorder/index.html
+++ b/packages/recorder/index.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" translate="no">
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/packages/recorder/package.json b/packages/recorder/package.json
index 8482a7a7db77f..97e52eb9a5b7d 100644
--- a/packages/recorder/package.json
+++ b/packages/recorder/package.json
@@ -3,9 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build && tsc",
-    "preview": "vite preview"
+  "dependencies": {
+    "yaml": "^2.6.0"
   }
 }
diff --git a/packages/playwright-core/src/server/recorder/recorderActions.ts b/packages/recorder/src/actions.d.ts
similarity index 63%
rename from packages/playwright-core/src/server/recorder/recorderActions.ts
rename to packages/recorder/src/actions.d.ts
index 3c9720cbc42e1..4f1a9bb353198 100644
--- a/packages/playwright-core/src/server/recorder/recorderActions.ts
+++ b/packages/recorder/src/actions.d.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Point } from '../../common/types';
+type Point = { x: number, y: number };
 
 export type ActionName =
   'check' |
@@ -30,35 +30,39 @@ export type ActionName =
   'assertText' |
   'assertValue' |
   'assertChecked' |
-  'assertVisible';
+  'assertVisible' |
+  'assertSnapshot';
 
 export type ActionBase = {
   name: ActionName,
   signals: Signal[],
+  ariaSnapshot?: string,
+  preconditionSelector?: string,
 };
 
-export type ClickAction = ActionBase & {
-  name: 'click',
+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 = ActionBase & {
+export type CheckAction = ActionWithSelector & {
   name: 'check',
-  selector: string,
 };
 
-export type UncheckAction = ActionBase & {
+export type UncheckAction = ActionWithSelector & {
   name: 'uncheck',
-  selector: string,
 };
 
-export type FillAction = ActionBase & {
+export type FillAction = ActionWithSelector & {
   name: 'fill',
-  selector: string,
   text: string,
 };
 
@@ -76,51 +80,50 @@ export type ClosesPageAction = ActionBase & {
   name: 'closePage',
 };
 
-export type PressAction = ActionBase & {
+export type PressAction = ActionWithSelector & {
   name: 'press',
-  selector: string,
   key: string,
   modifiers: number,
 };
 
-export type SelectAction = ActionBase & {
+export type SelectAction = ActionWithSelector & {
   name: 'select',
-  selector: string,
   options: string[],
 };
 
-export type SetInputFilesAction = ActionBase & {
+export type SetInputFilesAction = ActionWithSelector & {
   name: 'setInputFiles',
-  selector: string,
   files: string[],
 };
 
-export type AssertTextAction = ActionBase & {
+export type AssertTextAction = ActionWithSelector & {
   name: 'assertText',
-  selector: string,
   text: string,
   substring: boolean,
 };
 
-export type AssertValueAction = ActionBase & {
+export type AssertValueAction = ActionWithSelector & {
   name: 'assertValue',
-  selector: string,
   value: string,
 };
 
-export type AssertCheckedAction = ActionBase & {
+export type AssertCheckedAction = ActionWithSelector & {
   name: 'assertChecked',
-  selector: string,
   checked: boolean,
 };
 
-export type AssertVisibleAction = ActionBase & {
+export type AssertVisibleAction = ActionWithSelector & {
   name: 'assertVisible',
-  selector: string,
 };
 
-export type Action = ClickAction | CheckAction | ClosesPageAction | OpenPageAction | UncheckAction | FillAction | NavigateAction | PressAction | SelectAction | SetInputFilesAction | AssertTextAction | AssertValueAction | AssertCheckedAction | AssertVisibleAction;
-export type AssertAction = AssertCheckedAction | AssertValueAction | AssertTextAction | AssertVisibleAction;
+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.
 
@@ -149,13 +152,22 @@ export type DialogSignal = BaseSignal & {
 
 export type Signal = NavigationSignal | PopupSignal | DownloadSignal | DialogSignal;
 
-type FrameDescriptionMainFrame = {
-  isMainFrame: true;
+export type FrameDescription = {
+  pageGuid: string;
+  pageAlias: string;
+  framePath: string[];
 };
 
-type FrameDescriptionChildFrame = {
-  isMainFrame: false;
-  selectorsChain: string[];
+export type ActionInContext = {
+  frame: FrameDescription;
+  description?: string;
+  action: Action;
+  startTime: number;
+  endTime?: number;
 };
 
-export type FrameDescription = { pageAlias: string } & (FrameDescriptionMainFrame | FrameDescriptionChildFrame);
+export type SignalInContext = {
+  frame: FrameDescription;
+  signal: Signal;
+  timestamp: number;
+};
diff --git a/packages/recorder/src/callLog.tsx b/packages/recorder/src/callLog.tsx
index c47b1ac323d51..eafc9f9826816 100644
--- a/packages/recorder/src/callLog.tsx
+++ b/packages/recorder/src/callLog.tsx
@@ -17,7 +17,7 @@
 import './callLog.css';
 import * as React from 'react';
 import type { CallLog } from './recorderTypes';
-import { msToString } from '@web/uiUtils';
+import { clsx, msToString } from '@web/uiUtils';
 import { asLocator } from '@isomorphic/locatorGenerators';
 import type { Language } from '@isomorphic/locatorGenerators';
 
@@ -53,9 +53,9 @@ export const CallLogView: React.FC<CallLogProps> = ({
         titlePrefix = callLog.title + '(';
         titleSuffix = ')';
       }
-      return <div className={`call-log-call ${callLog.status}`} key={callLog.id}>
+      return <div className={clsx('call-log-call', callLog.status)} key={callLog.id}>
         <div className='call-log-call-header'>
-          <span className={`codicon codicon-chevron-${isExpanded ? 'down' : 'right'}`} style={{ cursor: 'pointer' }}onClick={() => {
+          <span className={clsx('codicon', `codicon-chevron-${isExpanded ? 'down' : 'right'}`)} style={{ cursor: 'pointer' }}onClick={() => {
             const newOverrides = new Map(expandOverrides);
             newOverrides.set(callLog.id, !isExpanded);
             setExpandOverrides(newOverrides);
@@ -64,7 +64,7 @@ export const CallLogView: React.FC<CallLogProps> = ({
           { callLog.params.url ? <span className='call-log-details'><span className='call-log-url' title={callLog.params.url}>{callLog.params.url}</span></span> : undefined }
           { locator ? <span className='call-log-details'><span className='call-log-selector' title={`page.${locator}`}>{`page.${locator}`}</span></span> : undefined }
           { titleSuffix }
-          <span className={'codicon ' + iconClass(callLog)}></span>
+          <span className={clsx('codicon', iconClass(callLog))}></span>
           { typeof callLog.duration === 'number' ? <span className='call-log-time'>— {msToString(callLog.duration)}</span> : undefined}
         </div>
         { (isExpanded ? callLog.messages : []).map((message, i) => {
diff --git a/packages/recorder/src/index.tsx b/packages/recorder/src/index.tsx
index 9d55f8608a5ba..5956eab72502a 100644
--- a/packages/recorder/src/index.tsx
+++ b/packages/recorder/src/index.tsx
@@ -17,11 +17,10 @@
 import '@web/common.css';
 import { applyTheme } from '@web/theme';
 import '@web/third_party/vscode/codicon.css';
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
+import * as ReactDOM from 'react-dom/client';
 import { Main } from './main';
 
 (async () => {
   applyTheme();
-  ReactDOM.render(<Main/>, document.querySelector('#root'));
+  ReactDOM.createRoot(document.querySelector('#root')!).render(<Main/>);
 })();
diff --git a/packages/recorder/src/main.tsx b/packages/recorder/src/main.tsx
index 5980716d1effc..d705b8e3ace6e 100644
--- a/packages/recorder/src/main.tsx
+++ b/packages/recorder/src/main.tsx
@@ -19,25 +19,35 @@ import * as React from 'react';
 import { Recorder } from './recorder';
 import './recorder.css';
 
-export const Main: React.FC = ({
-}) => {
+export const Main: React.FC = ({}) => {
   const [sources, setSources] = React.useState<Source[]>([]);
   const [paused, setPaused] = React.useState(false);
   const [log, setLog] = React.useState(new Map<string, CallLog>());
   const [mode, setMode] = React.useState<Mode>('none');
 
-  window.playwrightSetMode = setMode;
-  window.playwrightSetSources = setSources;
-  window.playwrightSetPaused = setPaused;
-  window.playwrightUpdateLogs = callLogs => {
-    const newLog = new Map<string, CallLog>(log);
-    for (const callLog of callLogs) {
-      callLog.reveal = !log.has(callLog.id);
-      newLog.set(callLog.id, callLog);
-    }
-    setLog(newLog);
-  };
+  React.useLayoutEffect(() => {
+    window.playwrightSetMode = setMode;
+    window.playwrightSetSources = sources => {
+      setSources(sources);
+      window.playwrightSourcesEchoForTest = sources;
+    };
+    window.playwrightSetPageURL = url => {
+      document.title = url
+        ? `Playwright Inspector - ${url}`
+        : `Playwright Inspector`;
+    };
+    window.playwrightSetPaused = setPaused;
+    window.playwrightUpdateLogs = callLogs => {
+      setLog(log => {
+        const newLog = new Map<string, CallLog>(log);
+        for (const callLog of callLogs) {
+          callLog.reveal = !log.has(callLog.id);
+          newLog.set(callLog.id, callLog);
+        }
+        return newLog;
+      });
+    };
+  }, []);
 
-  window.playwrightSourcesEchoForTest = sources;
   return <Recorder sources={sources} paused={paused} log={log} mode={mode} />;
 };
diff --git a/packages/recorder/src/recorder.css b/packages/recorder/src/recorder.css
index fa7ce623db315..defde39efb01c 100644
--- a/packages/recorder/src/recorder.css
+++ b/packages/recorder/src/recorder.css
@@ -57,3 +57,20 @@ body.dark-mode .recorder .toolbar-button.toggled.circle-large-filled {
 .recorder .selector-input {
   flex: auto;
 }
+
+.setting {
+  display: flex;
+  align-items: center;
+}
+
+.setting label {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  cursor: pointer;
+}
+
+.setting input {
+  margin-right: 5px;
+  flex-shrink: 0;
+}
diff --git a/packages/recorder/src/recorder.tsx b/packages/recorder/src/recorder.tsx
index 3b47c7d085417..de464bec8a83e 100644
--- a/packages/recorder/src/recorder.tsx
+++ b/packages/recorder/src/recorder.tsx
@@ -14,26 +14,23 @@
   limitations under the License.
 */
 
-import type { CallLog, Mode, Source } from './recorderTypes';
+import type { CallLog, ElementInfo, Mode, Source } from './recorderTypes';
 import { CodeMirrorWrapper } from '@web/components/codeMirrorWrapper';
+import type { SourceHighlight } from '@web/components/codeMirrorWrapper';
 import { SplitView } from '@web/components/splitView';
 import { TabbedPane } from '@web/components/tabbedPane';
 import { Toolbar } from '@web/components/toolbar';
+import { emptySource, SourceChooser } from '@web/components/sourceChooser';
 import { ToolbarButton, ToolbarSeparator } from '@web/components/toolbarButton';
 import * as React from 'react';
 import { CallLogView } from './callLog';
 import './recorder.css';
 import { asLocator } from '@isomorphic/locatorGenerators';
-import { toggleTheme } from '@web/theme';
-import { copy } from '@web/uiUtils';
-
-declare global {
-  interface Window {
-    playwrightSetFileIfNeeded: (file: string) => void;
-    playwrightSetSelector: (selector: string, focus?: boolean) => void;
-    dispatch(data: any): Promise<void>;
-  }
-}
+import { useDarkModeSetting } from '@web/theme';
+import { copy, useSetting } from '@web/uiUtils';
+import yaml from 'yaml';
+import { parseAriaSnapshot } from '@isomorphic/ariaSnapshot';
+import { Dialog } from '@web/components/dialog';
 
 export interface RecorderProps {
   sources: Source[],
@@ -48,37 +45,39 @@ export const Recorder: React.FC<RecorderProps> = ({
   log,
   mode,
 }) => {
-  const [fileId, setFileId] = React.useState<string | undefined>();
-  const [selectedTab, setSelectedTab] = React.useState<string>('log');
+  const [selectedFileId, setSelectedFileId] = React.useState<string | undefined>();
+  const [selectedTab, setSelectedTab] = useSetting<string>('recorderPropertiesTab', 'log');
+  const [ariaSnapshot, setAriaSnapshot] = React.useState<string | undefined>();
+  const [ariaSnapshotErrors, setAriaSnapshotErrors] = React.useState<SourceHighlight[]>();
+  const [settingsOpen, setSettingsOpen] = React.useState(false);
+  const [darkMode, setDarkMode] = useDarkModeSetting();
+  const [autoExpect, setAutoExpect] = useSetting<boolean>('autoExpect', false);
+  const settingsButtonRef = React.useRef<HTMLButtonElement>(null);
+  window.playwrightSelectSource = selectedSourceId => setSelectedFileId(selectedSourceId);
 
   React.useEffect(() => {
-    if (!fileId && sources.length > 0)
-      setFileId(sources[0].id);
-  }, [fileId, sources]);
-
-  const source: Source = sources.find(s => s.id === fileId) || {
-    id: 'default',
-    isRecorded: false,
-    text: '',
-    language: 'javascript',
-    label: '',
-    highlight: []
-  };
+    window.dispatch({ event: 'setAutoExpect', params: { autoExpect } });
+  }, [autoExpect]);
+
+  const source = React.useMemo(() => {
+    const source = sources.find(s => s.id === selectedFileId);
+    return source ?? emptySource();
+  }, [sources, selectedFileId]);
 
   const [locator, setLocator] = React.useState('');
-  window.playwrightSetSelector = (selector: string, focus?: boolean) => {
+  window.playwrightElementPicked = (elementInfo: ElementInfo, userGesture?: boolean) => {
     const language = source.language;
-    if (focus)
+    setLocator(asLocator(language, elementInfo.selector));
+    setAriaSnapshot(elementInfo.ariaSnapshot);
+    setAriaSnapshotErrors([]);
+    if (userGesture && selectedTab !== 'locator' && selectedTab !== 'aria')
       setSelectedTab('locator');
-    setLocator(asLocator(language, selector));
-  };
 
-  window.playwrightSetFileIfNeeded = (value: string) => {
-    const newSource = sources.find(s => s.id === value);
-    // Do not forcefully switch between two recorded sources, because
-    // user did explicitly choose one.
-    if (newSource && !newSource.isRecorded || !source.isRecorded)
-      setFileId(value);
+    if (mode === 'inspecting' && selectedTab === 'aria') {
+      // Keep exploring aria.
+    } else {
+      window.dispatch({ event: 'setMode', params: { mode: mode === 'inspecting' ? 'standby' : 'recording' } }).catch(() => { });
+    }
   };
 
   const messagesEndRef = React.useRef<HTMLDivElement>(null);
@@ -87,7 +86,7 @@ export const Recorder: React.FC<RecorderProps> = ({
   }, [messagesEndRef]);
 
 
-  React.useEffect(() => {
+  React.useLayoutEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       switch (event.key) {
         case 'F8':
@@ -109,10 +108,29 @@ export const Recorder: React.FC<RecorderProps> = ({
   }, [paused]);
 
   const onEditorChange = React.useCallback((selector: string) => {
-    if (mode === 'none')
+    if (mode === 'none' || mode === 'inspecting')
       window.dispatch({ event: 'setMode', params: { mode: 'standby' } });
     setLocator(selector);
-    window.dispatch({ event: 'selectorUpdated', params: { selector } });
+    window.dispatch({ event: 'highlightRequested', params: { selector } });
+  }, [mode]);
+
+  const onAriaEditorChange = React.useCallback((ariaSnapshot: string) => {
+    if (mode === 'none' || mode === 'inspecting')
+      window.dispatch({ event: 'setMode', params: { mode: 'standby' } });
+    const { fragment, errors } = parseAriaSnapshot(yaml, ariaSnapshot, { prettyErrors: false });
+    const highlights = errors.map(error => {
+      const highlight: SourceHighlight = {
+        message: error.message,
+        line: error.range[1].line,
+        column: error.range[1].col,
+        type: 'subtle-error',
+      };
+      return highlight;
+    });
+    setAriaSnapshotErrors(highlights);
+    setAriaSnapshot(ariaSnapshot);
+    if (!errors.length)
+      window.dispatch({ event: 'highlightRequested', params: { ariaTemplate: fragment } });
   }, [mode]);
 
   return <div className='recorder'>
@@ -131,6 +149,7 @@ export const Recorder: React.FC<RecorderProps> = ({
           'assertingText': 'recording-inspecting',
           'assertingVisibility': 'recording-inspecting',
           'assertingValue': 'recording-inspecting',
+          'assertingSnapshot': 'recording-inspecting',
         }[mode];
         window.dispatch({ event: 'setMode', params: { mode: newMode } }).catch(() => { });
       }}></ToolbarButton>
@@ -143,68 +162,84 @@ export const Recorder: React.FC<RecorderProps> = ({
       <ToolbarButton icon='symbol-constant' title='Assert value' toggled={mode === 'assertingValue'} disabled={mode === 'none' || mode === 'standby' || mode === 'inspecting'} onClick={() => {
         window.dispatch({ event: 'setMode', params: { mode: mode === 'assertingValue' ? 'recording' : 'assertingValue' } });
       }}></ToolbarButton>
+      <ToolbarButton icon='gist' title='Assert snapshot' toggled={mode === 'assertingSnapshot'} disabled={mode === 'none' || mode === 'standby' || mode === 'inspecting'} onClick={() => {
+        window.dispatch({ event: 'setMode', params: { mode: mode === 'assertingSnapshot' ? 'recording' : 'assertingSnapshot' } });
+      }}></ToolbarButton>
       <ToolbarSeparator />
       <ToolbarButton icon='files' title='Copy' disabled={!source || !source.text} onClick={() => {
         copy(source.text);
       }}></ToolbarButton>
-      <ToolbarButton icon='debug-continue' title='Resume (F8)' disabled={!paused} onClick={() => {
+      <ToolbarButton icon='debug-continue' title='Resume (F8)' ariaLabel='Resume' disabled={!paused} onClick={() => {
         window.dispatch({ event: 'resume' });
       }}></ToolbarButton>
-      <ToolbarButton icon='debug-pause' title='Pause (F8)' disabled={paused} onClick={() => {
+      <ToolbarButton icon='debug-pause' title='Pause (F8)' ariaLabel='Pause' disabled={paused} onClick={() => {
         window.dispatch({ event: 'pause' });
       }}></ToolbarButton>
-      <ToolbarButton icon='debug-step-over' title='Step over (F10)' disabled={!paused} onClick={() => {
+      <ToolbarButton icon='debug-step-over' title='Step over (F10)' ariaLabel='Step over' disabled={!paused} onClick={() => {
         window.dispatch({ event: 'step' });
       }}></ToolbarButton>
       <div style={{ flex: 'auto' }}></div>
       <div>Target:</div>
-      <select className='recorder-chooser' hidden={!sources.length} value={fileId} onChange={event => {
-        setFileId(event.target.selectedOptions[0].value);
-        window.dispatch({ event: 'fileChanged', params: { file: event.target.selectedOptions[0].value } });
-      }}>{renderSourceOptions(sources)}</select>
+      <SourceChooser fileId={source.id} sources={sources} setFileId={fileId => {
+        setSelectedFileId(fileId);
+        window.dispatch({ event: 'fileChanged', params: { fileId } });
+      }} />
       <ToolbarButton icon='clear-all' title='Clear' disabled={!source || !source.text} onClick={() => {
         window.dispatch({ event: 'clear' });
       }}></ToolbarButton>
-      <ToolbarButton icon='color-mode' title='Toggle color mode' toggled={false} onClick={() => toggleTheme()}></ToolbarButton>
+      <ToolbarButton
+        ref={settingsButtonRef}
+        icon='settings-gear'
+        title='Settings'
+        onClick={() => setSettingsOpen(current => !current)}
+      />
+      <Dialog
+        style={{ padding: '4px 8px' }}
+        open={settingsOpen}
+        width={200}
+        verticalOffset={8}
+        requestClose={() => setSettingsOpen(false)}
+        anchor={settingsButtonRef}
+        dataTestId='settings-dialog'
+      >
+        <div key='dark-mode-setting' className='setting'>
+          <input type='checkbox' id='dark-mode-setting' checked={darkMode} onChange={() => setDarkMode(!darkMode)} />
+          <label htmlFor='dark-mode-setting'>Dark mode</label>
+        </div>
+        <div key='auto-expect-setting' className='setting' title='Automatically generate assertions while recording'>
+          <input type='checkbox' id='auto-expect-setting' checked={autoExpect} onChange={() => {
+            window.dispatch({ event: 'setAutoExpect', params: { autoExpect: !autoExpect } });
+            setAutoExpect(!autoExpect);
+          }} />
+          <label htmlFor='auto-expect-setting'>Generate assertions</label>
+        </div>
+      </Dialog>
     </Toolbar>
-    <SplitView sidebarSize={200}>
-      <CodeMirrorWrapper text={source.text} language={source.language} highlight={source.highlight} revealLine={source.revealLine} readOnly={true} lineNumbers={true}/>
-      <TabbedPane
-        rightToolbar={selectedTab === 'locator' ? [<ToolbarButton icon='files' title='Copy' onClick={() => copy(locator)} />] : []}
+    <SplitView
+      sidebarSize={200}
+      main={<CodeMirrorWrapper text={source.text} highlighter={source.language} highlight={source.highlight} revealLine={source.revealLine} readOnly={true} lineNumbers={true} />}
+      sidebar={<TabbedPane
+        rightToolbar={selectedTab === 'locator' || selectedTab === 'aria' ? [<ToolbarButton key={1} icon='files' title='Copy' onClick={() => copy((selectedTab === 'locator' ? locator : ariaSnapshot) || '')} />] : []}
         tabs={[
           {
             id: 'locator',
             title: 'Locator',
-            render: () => <CodeMirrorWrapper text={locator} language={source.language} readOnly={false} focusOnChange={true} onChange={onEditorChange} wrapLines={true}/>
+            render: () => <CodeMirrorWrapper text={locator} placeholder='Type locator to inspect' highlighter={source.language} focusOnChange={true} onChange={onEditorChange} wrapLines={true} />
           },
           {
             id: 'log',
             title: 'Log',
-            render: () => <CallLogView language={source.language} log={Array.from(log.values())}/>
+            render: () => <CallLogView language={source.language} log={Array.from(log.values())} />
+          },
+          {
+            id: 'aria',
+            title: 'Aria',
+            render: () => <CodeMirrorWrapper text={ariaSnapshot || ''} placeholder='Type aria template to match' highlighter={'yaml'} onChange={onAriaEditorChange} highlight={ariaSnapshotErrors} wrapLines={true} />
           },
         ]}
         selectedTab={selectedTab}
         setSelectedTab={setSelectedTab}
-      />
-    </SplitView>
+      />}
+    />
   </div>;
 };
-
-function renderSourceOptions(sources: Source[]): React.ReactNode {
-  const transformTitle = (title: string): string => title.replace(/.*[/\\]([^/\\]+)/, '$1');
-  const renderOption = (source: Source): React.ReactNode => (
-    <option key={source.id} value={source.id}>{transformTitle(source.label)}</option>
-  );
-
-  const hasGroup = sources.some(s => s.group);
-  if (hasGroup) {
-    const groups = new Set(sources.map(s => s.group));
-    return [...groups].filter(Boolean).map(group => (
-      <optgroup label={group} key={group}>
-        {sources.filter(s => s.group === group).map(source => renderOption(source))}
-      </optgroup>
-    ));
-  }
-
-  return sources.map(source => renderOption(source));
-}
diff --git a/packages/recorder/src/recorderTypes.ts b/packages/recorder/src/recorderTypes.d.ts
similarity index 82%
rename from packages/recorder/src/recorderTypes.ts
rename to packages/recorder/src/recorderTypes.d.ts
index c56984ad6d60b..2f5b0ffe4e817 100644
--- a/packages/recorder/src/recorderTypes.ts
+++ b/packages/recorder/src/recorderTypes.d.ts
@@ -15,6 +15,7 @@
 */
 
 import type { Language } from '../../playwright-core/src/utils/isomorphic/locatorGenerators';
+import type { AriaTemplateNode } from '@isomorphic/ariaSnapshot';
 
 export type Point = { x: number; y: number };
 
@@ -26,7 +27,13 @@ export type Mode =
   | 'recording-inspecting'
   | 'standby'
   | 'assertingVisibility'
-  | 'assertingValue';
+  | 'assertingValue'
+  | 'assertingSnapshot';
+
+export type ElementInfo = {
+  selector: string;
+  ariaSnapshot: string;
+};
 
 export type EventData = {
   event:
@@ -35,8 +42,8 @@ export type EventData = {
     | 'step'
     | 'pause'
     | 'setMode'
-    | 'selectorUpdated'
-    | 'fileChanged';
+    | 'highlightRequested'
+    | 'languageChanged';
   params: any;
 };
 
@@ -48,6 +55,7 @@ export type UIState = {
   mode: Mode;
   actionPoint?: Point;
   actionSelector?: string;
+  ariaTemplate?: AriaTemplateNode;
   language: Language;
   testIdAttributeName: string;
   overlay: OverlayState;
@@ -94,10 +102,11 @@ declare global {
     playwrightSetMode: (mode: Mode) => void;
     playwrightSetPaused: (paused: boolean) => void;
     playwrightSetSources: (sources: Source[]) => void;
+    playwrightSelectSource: (sourceId: string) => void;
+    playwrightSetPageURL: (url: string | undefined) => void;
     playwrightSetOverlayVisible: (visible: boolean) => void;
     playwrightUpdateLogs: (callLogs: CallLog[]) => void;
-    playwrightSetFileIfNeeded: (file: string) => void;
-    playwrightSetSelector: (selector: string, focus?: boolean) => void;
+    playwrightElementPicked: (elementInfo: ElementInfo, userGesture?: boolean) => void;
     playwrightSourcesEchoForTest: Source[];
     dispatch(data: any): Promise<void>;
   }
diff --git a/packages/recorder/tsconfig.json b/packages/recorder/tsconfig.json
index 10f4bfcf2f27f..4defa85f64dd4 100644
--- a/packages/recorder/tsconfig.json
+++ b/packages/recorder/tsconfig.json
@@ -5,11 +5,11 @@
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "allowJs": true,
     "skipLibCheck": false,
-    "esModuleInterop": false,
+    "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
@@ -19,9 +19,11 @@
     "paths": {
       "@isomorphic/*": ["../playwright-core/src/utils/isomorphic/*"],
       "@protocol/*": ["../protocol/src/*"],
+      "@recorder/*": ["../recorder/src/*"],
+      "@testIsomorphic/*": ["../playwright/src/isomorphic/*"],
       "@web/*": ["../web/src/*"],
     }
   },
-  "include": ["src"],
+  "include": ["src", "../web/src"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/recorder/tsconfig.node.json b/packages/recorder/tsconfig.node.json
index e993792cb12c9..a336f895aab52 100644
--- a/packages/recorder/tsconfig.node.json
+++ b/packages/recorder/tsconfig.node.json
@@ -2,7 +2,8 @@
   "compilerOptions": {
     "composite": true,
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true
   },
   "include": ["vite.config.ts"]
 }
diff --git a/packages/recorder/vite.config.ts b/packages/recorder/vite.config.ts
index a72a43f203731..b26956d0425b3 100644
--- a/packages/recorder/vite.config.ts
+++ b/packages/recorder/vite.config.ts
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+import path from 'path';
+
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
-import * as path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
diff --git a/packages/trace-viewer/.gitignore b/packages/trace-viewer/.gitignore
index a547bf36d8d11..9c0fa8b1165c4 100644
--- a/packages/trace-viewer/.gitignore
+++ b/packages/trace-viewer/.gitignore
@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+public/sw.bundle.js
diff --git a/packages/trace-viewer/bundle.ts b/packages/trace-viewer/bundle.ts
index eaf09a6cc3da1..38375f8d7606a 100644
--- a/packages/trace-viewer/bundle.ts
+++ b/packages/trace-viewer/bundle.ts
@@ -28,4 +28,4 @@ export function bundle(): Plugin {
       },
     },
   };
-}
\ No newline at end of file
+}
diff --git a/packages/trace-viewer/index.html b/packages/trace-viewer/index.html
index bdd822dc0a672..a131ab208638c 100644
--- a/packages/trace-viewer/index.html
+++ b/packages/trace-viewer/index.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" translate="no">
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -30,8 +30,25 @@
       <p>For more information, please see the <a href="https://aka.ms/playwright/trace-viewer-file-protocol">docs</a>.</p>
     </dialog>
     <script>
-      if (!/^https?:/.test(window.location.protocol))
-        document.getElementById("fallback-error").show();
+      if (!/^https?:/.test(window.location.protocol)) {
+        const fallbackErrorDialog = document.getElementById('fallback-error');
+        const isTraceViewerInsidePlaywrightReport = window.location.protocol === 'file:' && window.location.pathname.endsWith('/trace/index.html');
+        // Best-effort to show the report path in the dialog.
+        if (isTraceViewerInsidePlaywrightReport) {
+          const reportPath = (() => {
+            const base = window.location.pathname.replace(/\/trace\/index\.html$/, '');
+            if (navigator.platform === 'Win32')
+              return base.replace(/^\//, '').replace(/\//g, '\\\\');
+            return base;
+          })();
+          const reportLink = document.createElement('div');
+          const command = `npx playwright show-report ${reportPath}`;
+          reportLink.innerHTML = `You can open the report via <code>${command}</code> from your Playwright project. <button type="button">Copy Command</button>`;
+          fallbackErrorDialog.insertBefore(reportLink, fallbackErrorDialog.children[1]);
+          reportLink.querySelector('button').addEventListener('click', () => navigator.clipboard.writeText(command));
+        }
+        fallbackErrorDialog.show();
+      }
     </script>
   </body>
 </html>
diff --git a/packages/trace-viewer/package.json b/packages/trace-viewer/package.json
index e1b745bf83e78..57a3dfd4094f3 100644
--- a/packages/trace-viewer/package.json
+++ b/packages/trace-viewer/package.json
@@ -3,10 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build && tsc",
-    "build-sw": "vite --config vite.sw.config.ts build && tsc",
-    "preview": "vite preview"
+  "dependencies": {
+    "yaml": "^2.6.0"
   }
 }
diff --git a/packages/trace-viewer/src/DEPS.list b/packages/trace-viewer/src/DEPS.list
index f2614cff83c8a..f52c0a024e556 100644
--- a/packages/trace-viewer/src/DEPS.list
+++ b/packages/trace-viewer/src/DEPS.list
@@ -3,3 +3,6 @@
 @trace/**
 @web/**
 ui/
+
+[sw-main.ts]
+sw/**
diff --git a/packages/trace-viewer/src/embedded.tsx b/packages/trace-viewer/src/embedded.tsx
deleted file mode 100644
index 8f0a09e560c2d..0000000000000
--- a/packages/trace-viewer/src/embedded.tsx
+++ /dev/null
@@ -1,61 +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 '@web/common.css';
-import { applyTheme } from '@web/theme';
-import '@web/third_party/vscode/codicon.css';
-import React from 'react';
-import * as ReactDOM from 'react-dom';
-import { EmbeddedWorkbenchLoader } from './ui/embeddedWorkbenchLoader';
-
-(async () => {
-  applyTheme();
-
-  // workaround to send keystrokes back to vscode webview to keep triggering key bindings there
-  const handleKeyEvent = (e: KeyboardEvent) => {
-    if (!e.isTrusted)
-      return;
-    window.parent?.postMessage({
-      type: e.type,
-      key: e.key,
-      keyCode: e.keyCode,
-      code: e.code,
-      shiftKey: e.shiftKey,
-      altKey: e.altKey,
-      ctrlKey: e.ctrlKey,
-      metaKey: e.metaKey,
-      repeat: e.repeat,
-    }, '*');
-  };
-  window.addEventListener('keydown', handleKeyEvent);
-  window.addEventListener('keyup', handleKeyEvent);
-
-  if (window.location.protocol !== 'file:') {
-    if (!navigator.serviceWorker)
-      throw new Error(`Service workers are not supported.\nMake sure to serve the Trace Viewer (${window.location}) via HTTPS or localhost.`);
-    navigator.serviceWorker.register('sw.bundle.js');
-    if (!navigator.serviceWorker.controller) {
-      await new Promise<void>(f => {
-        navigator.serviceWorker.oncontrollerchange = () => f();
-      });
-    }
-
-    // Keep SW running.
-    setInterval(function() { fetch('ping'); }, 10000);
-  }
-
-  ReactDOM.render(<EmbeddedWorkbenchLoader />, document.querySelector('#root'));
-})();
diff --git a/packages/trace-viewer/src/index.tsx b/packages/trace-viewer/src/index.tsx
index 3f17856254818..671a2235ae2c6 100644
--- a/packages/trace-viewer/src/index.tsx
+++ b/packages/trace-viewer/src/index.tsx
@@ -17,14 +17,16 @@
 import '@web/common.css';
 import { applyTheme } from '@web/theme';
 import '@web/third_party/vscode/codicon.css';
-import React from 'react';
-import * as ReactDOM from 'react-dom';
+import * as ReactDOM from 'react-dom/client';
 import { WorkbenchLoader } from './ui/workbenchLoader';
+import { LiveWorkbenchLoader } from './ui/liveWorkbenchLoader';
 
 (async () => {
+  const queryParams = new URLSearchParams(window.location.search);
+
   applyTheme();
   if (window.location.protocol !== 'file:') {
-    if (window.location.href.includes('isUnderTest=true'))
+    if (queryParams.get('isUnderTest') === 'true')
       await new Promise(f => setTimeout(f, 1000));
     if (!navigator.serviceWorker)
       throw new Error(`Service workers are not supported.\nMake sure to serve the Trace Viewer (${window.location}) via HTTPS or localhost.`);
@@ -39,5 +41,8 @@ import { WorkbenchLoader } from './ui/workbenchLoader';
     setInterval(function() { fetch('ping'); }, 10000);
   }
 
-  ReactDOM.render(<WorkbenchLoader/>, document.querySelector('#root'));
+  const trace = queryParams.get('trace');
+  const traceIsLive = trace?.endsWith('.json');
+  const workbench = traceIsLive ? <LiveWorkbenchLoader traceJson={trace!} /> : <WorkbenchLoader/>;
+  ReactDOM.createRoot(document.querySelector('#root')!).render(workbench);
 })();
diff --git a/packages/trace-viewer/src/multimap.ts b/packages/trace-viewer/src/multimap.ts
deleted file mode 100644
index 18777d29e5fdd..0000000000000
--- a/packages/trace-viewer/src/multimap.ts
+++ /dev/null
@@ -1,82 +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 MultiMap<K, V> {
-  private _map: Map<K, V[]>;
-
-  constructor() {
-    this._map = new Map<K, V[]>();
-  }
-
-  set(key: K, value: V) {
-    let values = this._map.get(key);
-    if (!values) {
-      values = [];
-      this._map.set(key, values);
-    }
-    values.push(value);
-  }
-
-  get(key: K): V[] {
-    return this._map.get(key) || [];
-  }
-
-  has(key: K): boolean {
-    return this._map.has(key);
-  }
-
-  delete(key: K, value: V) {
-    const values = this._map.get(key);
-    if (!values)
-      return;
-    if (values.includes(value))
-      this._map.set(key, values.filter(v => value !== v));
-  }
-
-  deleteAll(key: K) {
-    this._map.delete(key);
-  }
-
-  hasValue(key: K, value: V): boolean {
-    const values = this._map.get(key);
-    if (!values)
-      return false;
-    return values.includes(value);
-  }
-
-  get size(): number {
-    return this._map.size;
-  }
-
-  [Symbol.iterator](): Iterator<[K, V[]]> {
-    return this._map[Symbol.iterator]();
-  }
-
-  keys(): IterableIterator<K> {
-    return this._map.keys();
-  }
-
-  values(): Iterable<V> {
-    const result: V[] = [];
-    for (const key of this.keys())
-      result.push(...this.get(key));
-    return result;
-  }
-
-  clear() {
-    this._map.clear();
-  }
-}
diff --git a/packages/playwright-ct-vue2/register.mjs b/packages/trace-viewer/src/sw-main.ts
similarity index 84%
rename from packages/playwright-ct-vue2/register.mjs
rename to packages/trace-viewer/src/sw-main.ts
index ca6a6a12d9933..5d11452851d44 100644
--- a/packages/playwright-ct-vue2/register.mjs
+++ b/packages/trace-viewer/src/sw-main.ts
@@ -14,8 +14,4 @@
  * limitations under the License.
  */
 
-import { pwRegister } from './registerSource.mjs';
-
-export default components => {
-  pwRegister(components);
-};
+import './sw/main';
diff --git a/packages/trace-viewer/src/sw/DEPS.list b/packages/trace-viewer/src/sw/DEPS.list
new file mode 100644
index 0000000000000..047840f50927c
--- /dev/null
+++ b/packages/trace-viewer/src/sw/DEPS.list
@@ -0,0 +1,2 @@
+[*]
+@isomorphic/**
diff --git a/packages/trace-viewer/src/sw/lruCache.ts b/packages/trace-viewer/src/sw/lruCache.ts
new file mode 100644
index 0000000000000..2d5eae8542497
--- /dev/null
+++ b/packages/trace-viewer/src/sw/lruCache.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export class LRUCache<K, V> {
+  private _maxSize: number;
+  private _map: Map<K, { value: V, size: number }>;
+  private _size: number;
+
+  constructor(maxSize: number) {
+    this._maxSize = maxSize;
+    this._map = new Map();
+    this._size = 0;
+  }
+
+  getOrCompute(key: K, compute: () => { value: V, size: number }): V {
+    if (this._map.has(key)) {
+      const result = this._map.get(key)!;
+      // reinserting makes this the least recently used entry
+      this._map.delete(key);
+      this._map.set(key, result);
+      return result.value;
+    }
+
+    const result = compute();
+
+    while (this._map.size && this._size + result.size > this._maxSize) {
+      const [firstKey, firstValue] = this._map.entries().next().value!;
+      this._size -= firstValue.size;
+      this._map.delete(firstKey);
+    }
+
+    this._map.set(key, result);
+    this._size += result.size;
+    return result.value;
+  }
+}
diff --git a/packages/trace-viewer/src/sw.ts b/packages/trace-viewer/src/sw/main.ts
similarity index 66%
rename from packages/trace-viewer/src/sw.ts
rename to packages/trace-viewer/src/sw/main.ts
index 14d26c2a36c3b..cdce3261feac0 100644
--- a/packages/trace-viewer/src/sw.ts
+++ b/packages/trace-viewer/src/sw/main.ts
@@ -18,7 +18,7 @@ import { splitProgress } from './progress';
 import { unwrapPopoutUrl } from './snapshotRenderer';
 import { SnapshotServer } from './snapshotServer';
 import { TraceModel } from './traceModel';
-import { FetchTraceModelBackend, ZipTraceModelBackend } from './traceModelBackends';
+import { FetchTraceModelBackend, TraceViewerServer, ZipTraceModelBackend } from './traceModelBackends';
 import { TraceVersionError } from './traceModernizer';
 
 // @ts-ignore
@@ -36,22 +36,25 @@ const scopePath = new URL(self.registration.scope).pathname;
 
 const loadedTraces = new Map<string, { traceModel: TraceModel, snapshotServer: SnapshotServer }>();
 
-const clientIdToTraceUrls = new Map<string, Set<string>>();
+const clientIdToTraceUrls = new Map<string, { limit: number | undefined, traceUrls: Set<string>, traceViewerServer: TraceViewerServer }>();
 
-async function loadTrace(traceUrl: string, traceFileName: string | null, clientId: string, progress: (done: number, total: number) => undefined): Promise<TraceModel> {
+async function loadTrace(traceUrl: string, traceFileName: string | null, client: any | undefined, limit: number | undefined, progress: (done: number, total: number) => undefined): Promise<TraceModel> {
   await gc();
-  let set = clientIdToTraceUrls.get(clientId);
-  if (!set) {
-    set = new Set();
-    clientIdToTraceUrls.set(clientId, set);
+  const clientId = client?.id ?? '';
+  let data = clientIdToTraceUrls.get(clientId);
+  if (!data) {
+    const clientURL = new URL(client?.url ?? self.registration.scope);
+    const traceViewerServerBaseUrl = new URL(clientURL.searchParams.get('server') ?? '../', clientURL);
+    data = { limit, traceUrls: new Set(), traceViewerServer: new TraceViewerServer(traceViewerServerBaseUrl) };
+    clientIdToTraceUrls.set(clientId, data);
   }
-  set.add(traceUrl);
+  data.traceUrls.add(traceUrl);
 
   const traceModel = new TraceModel();
   try {
     // Allow 10% to hop from sw to page.
     const [fetchProgress, unzipProgress] = splitProgress(progress, [0.5, 0.4, 0.1]);
-    const backend = traceUrl.endsWith('json') ? new FetchTraceModelBackend(traceUrl) : new ZipTraceModelBackend(traceUrl, fetchProgress);
+    const backend = traceUrl.endsWith('json') ? new FetchTraceModelBackend(traceUrl, data.traceViewerServer) : new ZipTraceModelBackend(traceUrl, data.traceViewerServer, fetchProgress);
     await traceModel.load(backend, unzipProgress);
   } catch (error: any) {
     // eslint-disable-next-line no-console
@@ -75,6 +78,12 @@ async function doFetch(event: FetchEvent): Promise<Response> {
   if (event.request.url.startsWith('chrome-extension://'))
     return fetch(event.request);
 
+  if (event.request.headers.get('x-pw-serviceworker') === 'forward') {
+    const request = new Request(event.request);
+    request.headers.delete('x-pw-serviceworker');
+    return fetch(request);
+  }
+
   const request = event.request;
   const client = await self.clients.get(event.clientId);
 
@@ -97,7 +106,8 @@ async function doFetch(event: FetchEvent): Promise<Response> {
 
     if (relativePath === '/contexts') {
       try {
-        const traceModel = await loadTrace(traceUrl!, url.searchParams.get('traceFileName'), event.clientId, (done: number, total: number) => {
+        const limit = url.searchParams.has('limit') ? +url.searchParams.get('limit')! : undefined;
+        const traceModel = await loadTrace(traceUrl!, url.searchParams.get('traceFileName'), client, limit, (done: number, total: number) => {
           client.postMessage({ method: 'progress', params: { done, total } });
         });
         return new Response(JSON.stringify(traceModel!.contextEntries), {
@@ -116,32 +126,52 @@ async function doFetch(event: FetchEvent): Promise<Response> {
       const { snapshotServer } = loadedTraces.get(traceUrl!) || {};
       if (!snapshotServer)
         return new Response(null, { status: 404 });
-      return snapshotServer.serveSnapshotInfo(relativePath, url.searchParams);
+      const pageOrFrameId = relativePath.substring('/snapshotInfo/'.length);
+      return snapshotServer.serveSnapshotInfo(pageOrFrameId, url.searchParams);
     }
 
     if (relativePath.startsWith('/snapshot/')) {
       const { snapshotServer } = loadedTraces.get(traceUrl!) || {};
       if (!snapshotServer)
         return new Response(null, { status: 404 });
-      const response = snapshotServer.serveSnapshot(relativePath, url.searchParams, url.href);
+      const pageOrFrameId = relativePath.substring('/snapshot/'.length);
+      const response = snapshotServer.serveSnapshot(pageOrFrameId, url.searchParams, url.href);
       if (isDeployedAsHttps)
         response.headers.set('Content-Security-Policy', 'upgrade-insecure-requests');
       return response;
     }
 
+    if (relativePath.startsWith('/closest-screenshot/')) {
+      const { snapshotServer } = loadedTraces.get(traceUrl!) || {};
+      if (!snapshotServer)
+        return new Response(null, { status: 404 });
+      const pageOrFrameId = relativePath.substring('/closest-screenshot/'.length);
+      return snapshotServer.serveClosestScreenshot(pageOrFrameId, url.searchParams);
+    }
+
     if (relativePath.startsWith('/sha1/')) {
-      const download = url.searchParams.has('download');
       // Sha1 for sources is based on the file path, can't load it of a random model.
       const sha1 = relativePath.slice('/sha1/'.length);
       for (const trace of loadedTraces.values()) {
         const blob = await trace.traceModel.resourceForSha1(sha1);
         if (blob)
-          return new Response(blob, { status: 200, headers: download ? downloadHeadersForAttachment(trace.traceModel, sha1) : undefined });
+          return new Response(blob, { status: 200, headers: downloadHeaders(url.searchParams) });
       }
       return new Response(null, { status: 404 });
     }
 
-    // Fallback to network.
+    if (relativePath.startsWith('/file/')) {
+      const path = url.searchParams.get('path')!;
+      const traceViewerServer = clientIdToTraceUrls.get(event.clientId ?? '')?.traceViewerServer;
+      if (!traceViewerServer)
+        throw new Error('client is not initialized');
+      const response = await traceViewerServer.readFile(path);
+      if (!response)
+        return new Response(null, { status: 404 });
+      return response;
+    }
+
+    // Fallback for static assets.
     return fetch(event.request);
   }
 
@@ -157,14 +187,15 @@ async function doFetch(event: FetchEvent): Promise<Response> {
   return snapshotServer.serveResource(lookupUrls, request.method, snapshotUrl);
 }
 
-function downloadHeadersForAttachment(traceModel: TraceModel, sha1: string): Headers | undefined {
-  const attachment = traceModel.attachmentForSha1(sha1);
-  if (!attachment)
+function downloadHeaders(searchParams: URLSearchParams): Headers | undefined {
+  const name = searchParams.get('dn');
+  const contentType = searchParams.get('dct');
+  if (!name)
     return;
   const headers = new Headers();
-  headers.set('Content-Disposition', `attachment; filename="attachment"; filename*=UTF-8''${encodeURIComponent(attachment.name)}`);
-  if (attachment.contentType)
-    headers.set('Content-Type', attachment.contentType);
+  headers.set('Content-Disposition', `attachment; filename="attachment"; filename*=UTF-8''${encodeURIComponent(name)}`);
+  if (contentType)
+    headers.set('Content-Type', contentType);
   return headers;
 }
 
@@ -172,12 +203,18 @@ async function gc() {
   const clients = await self.clients.matchAll();
   const usedTraces = new Set<string>();
 
-  for (const [clientId, traceUrls] of clientIdToTraceUrls) {
+  for (const [clientId, data] of clientIdToTraceUrls) {
     // @ts-ignore
-    if (!clients.find(c => c.id === clientId))
+    if (!clients.find(c => c.id === clientId)) {
       clientIdToTraceUrls.delete(clientId);
-    else
-      traceUrls.forEach(url => usedTraces.add(url));
+      continue;
+    }
+    if (data.limit !== undefined) {
+      const ordered = [...data.traceUrls];
+      // Leave the newest requested traces.
+      data.traceUrls = new Set(ordered.slice(ordered.length - data.limit));
+    }
+    data.traceUrls.forEach(url => usedTraces.add(url));
   }
 
   for (const traceUrl of loadedTraces.keys()) {
diff --git a/packages/trace-viewer/src/progress.ts b/packages/trace-viewer/src/sw/progress.ts
similarity index 100%
rename from packages/trace-viewer/src/progress.ts
rename to packages/trace-viewer/src/sw/progress.ts
diff --git a/packages/trace-viewer/src/snapshotRenderer.ts b/packages/trace-viewer/src/sw/snapshotRenderer.ts
similarity index 51%
rename from packages/trace-viewer/src/snapshotRenderer.ts
rename to packages/trace-viewer/src/sw/snapshotRenderer.ts
index 730cab4d1911f..a0980ac7b1bd4 100644
--- a/packages/trace-viewer/src/snapshotRenderer.ts
+++ b/packages/trace-viewer/src/sw/snapshotRenderer.ts
@@ -14,7 +14,20 @@
  * limitations under the License.
  */
 
+import { escapeHTMLAttribute, escapeHTML } from '@isomorphic/stringUtils';
+
 import type { FrameSnapshot, NodeNameAttributesChildNodesSnapshot, NodeSnapshot, RenderedFrameSnapshot, ResourceSnapshot, SubtreeReferenceSnapshot } from '@trace/snapshot';
+import type { PageEntry } from '../types/entries';
+import type { LRUCache } from './lruCache';
+
+function findClosest<T>(items: T[], metric: (v: T) => number, target: number) {
+  return items.find((item, index) => {
+    if (index === items.length - 1)
+      return true;
+    const next = items[index + 1];
+    return Math.abs(metric(item) - target) < Math.abs(metric(next) - target);
+  });
+}
 
 function isNodeNameAttributesChildNodesSnapshot(n: NodeSnapshot): n is NodeNameAttributesChildNodesSnapshot {
   return Array.isArray(n) && typeof n[0] === 'string';
@@ -25,19 +38,23 @@ function isSubtreeReferenceSnapshot(n: NodeSnapshot): n is SubtreeReferenceSnaps
 }
 
 export class SnapshotRenderer {
+  private _htmlCache: LRUCache<SnapshotRenderer, string>;
   private _snapshots: FrameSnapshot[];
   private _index: number;
   readonly snapshotName: string | undefined;
   private _resources: ResourceSnapshot[];
   private _snapshot: FrameSnapshot;
   private _callId: string;
+  private _screencastFrames: PageEntry['screencastFrames'];
 
-  constructor(resources: ResourceSnapshot[], snapshots: FrameSnapshot[], index: number) {
+  constructor(htmlCache: LRUCache<SnapshotRenderer, string>, resources: ResourceSnapshot[], snapshots: FrameSnapshot[], screencastFrames: PageEntry['screencastFrames'], index: number) {
+    this._htmlCache = htmlCache;
     this._resources = resources;
     this._snapshots = snapshots;
     this._index = index;
     this._snapshot = snapshots[index];
     this._callId = snapshots[index].callId;
+    this._screencastFrames = screencastFrames;
     this.snapshotName = snapshots[index].snapshotName;
   }
 
@@ -49,90 +66,97 @@ export class SnapshotRenderer {
     return this._snapshots[this._index].viewport;
   }
 
+  closestScreenshot(): string | undefined {
+    const { wallTime, timestamp } = this.snapshot();
+    const closestFrame = (wallTime && this._screencastFrames[0]?.frameSwapWallTime)
+      ? findClosest(this._screencastFrames, frame => frame.frameSwapWallTime!, wallTime)
+      : findClosest(this._screencastFrames, frame => frame.timestamp, timestamp);
+    return closestFrame?.sha1;
+  }
+
   render(): RenderedFrameSnapshot {
-    const visit = (n: NodeSnapshot, snapshotIndex: number, parentTag: string | undefined, parentAttrs: [string, string][] | undefined): string => {
+    const result: string[] = [];
+    const visit = (n: NodeSnapshot, snapshotIndex: number, parentTag: string | undefined, parentAttrs: [string, string][] | undefined) => {
       // Text node.
       if (typeof n === 'string') {
         // Best-effort Electron support: rewrite custom protocol in url() links in stylesheets.
         // Old snapshotter was sending lower-case.
         if (parentTag === 'STYLE' || parentTag === 'style')
-          return rewriteURLsInStyleSheetForCustomProtocol(n);
-        return escapeText(n);
+          result.push(escapeURLsInStyleSheet(rewriteURLsInStyleSheetForCustomProtocol(n)));
+        else
+          result.push(escapeHTML(n));
+        return;
       }
 
-      if (!(n as any)._string) {
-        if (isSubtreeReferenceSnapshot(n)) {
-          // Node reference.
-          const referenceIndex = snapshotIndex - n[0][0];
-          if (referenceIndex >= 0 && referenceIndex <= snapshotIndex) {
-            const nodes = snapshotNodes(this._snapshots[referenceIndex]);
-            const nodeIndex = n[0][1];
-            if (nodeIndex >= 0 && nodeIndex < nodes.length)
-              (n as any)._string = visit(nodes[nodeIndex], referenceIndex, parentTag, parentAttrs);
+      if (isSubtreeReferenceSnapshot(n)) {
+        // Node reference.
+        const referenceIndex = snapshotIndex - n[0][0];
+        if (referenceIndex >= 0 && referenceIndex <= snapshotIndex) {
+          const nodes = snapshotNodes(this._snapshots[referenceIndex]);
+          const nodeIndex = n[0][1];
+          if (nodeIndex >= 0 && nodeIndex < nodes.length)
+            return visit(nodes[nodeIndex], referenceIndex, parentTag, parentAttrs);
+        }
+      } else if (isNodeNameAttributesChildNodesSnapshot(n)) {
+        const [name, nodeAttrs, ...children] = n;
+        // Element node.
+        // Note that <noscript> will not be rendered by default in the trace viewer, because
+        // JS is enabled. So rename it to <x-noscript>.
+        const nodeName = name === 'NOSCRIPT' ? 'X-NOSCRIPT' : name;
+        const attrs = Object.entries(nodeAttrs || {});
+        result.push('<', nodeName);
+        const kCurrentSrcAttribute = '__playwright_current_src__';
+        const isFrame = nodeName === 'IFRAME' || nodeName === 'FRAME';
+        const isAnchor = nodeName === 'A';
+        const isImg = nodeName === 'IMG';
+        const isImgWithCurrentSrc = isImg && attrs.some(a => a[0] === kCurrentSrcAttribute);
+        const isSourceInsidePictureWithCurrentSrc = nodeName === 'SOURCE' && parentTag === 'PICTURE' && parentAttrs?.some(a => a[0] === kCurrentSrcAttribute);
+        for (const [attr, value] of attrs) {
+          let attrName = attr;
+          if (isFrame && attr.toLowerCase() === 'src') {
+            // Never set relative URLs as <iframe src> - they start fetching frames immediately.
+            attrName = '__playwright_src__';
           }
-        } else if (isNodeNameAttributesChildNodesSnapshot(n)) {
-          const [name, nodeAttrs, ...children] = n;
-          // Element node.
-          // Note that <noscript> will not be rendered by default in the trace viewer, because
-          // JS is enabled. So rename it to <x-noscript>.
-          const nodeName = name === 'NOSCRIPT' ? 'X-NOSCRIPT' : name;
-          const attrs = Object.entries(nodeAttrs || {});
-          const builder: string[] = [];
-          builder.push('<', nodeName);
-          const kCurrentSrcAttribute = '__playwright_current_src__';
-          const isFrame = nodeName === 'IFRAME' || nodeName === 'FRAME';
-          const isAnchor = nodeName === 'A';
-          const isImg = nodeName === 'IMG';
-          const isImgWithCurrentSrc = isImg && attrs.some(a => a[0] === kCurrentSrcAttribute);
-          const isSourceInsidePictureWithCurrentSrc = nodeName === 'SOURCE' && parentTag === 'PICTURE' && parentAttrs?.some(a => a[0] === kCurrentSrcAttribute);
-          for (const [attr, value] of attrs) {
-            let attrName = attr;
-            if (isFrame && attr.toLowerCase() === 'src') {
-              // Never set relative URLs as <iframe src> - they start fetching frames immediately.
-              attrName = '__playwright_src__';
-            }
-            if (isImg && attr === kCurrentSrcAttribute) {
-              // Render currentSrc for images, so that trace viewer does not accidentally
-              // resolve srcset to a different source.
-              attrName = 'src';
-            }
-            if (['src', 'srcset'].includes(attr.toLowerCase()) && (isImgWithCurrentSrc || isSourceInsidePictureWithCurrentSrc)) {
-              // Disable actual <img src>, <img srcset>, <source src> and <source srcset> if
-              // we will be using the currentSrc instead.
-              attrName = '_' + attrName;
-            }
-            let attrValue = value;
-            if (isAnchor && attr.toLowerCase() === 'href')
-              attrValue = 'link://' + value;
-            else if (attr.toLowerCase() === 'href' || attr.toLowerCase() === 'src' || attr === kCurrentSrcAttribute)
-              attrValue = rewriteURLForCustomProtocol(value);
-            builder.push(' ', attrName, '="', escapeAttribute(attrValue), '"');
+          if (isImg && attr === kCurrentSrcAttribute) {
+            // Render currentSrc for images, so that trace viewer does not accidentally
+            // resolve srcset to a different source.
+            attrName = 'src';
           }
-          builder.push('>');
-          for (const child of children)
-            builder.push(visit(child, snapshotIndex, nodeName, attrs));
-          if (!autoClosing.has(nodeName))
-            builder.push('</', nodeName, '>');
-          (n as any)._string = builder.join('');
-        } else {
-          // Why are we here? Let's not throw, just in case.
-          (n as any)._string = '';
+          if (['src', 'srcset'].includes(attr.toLowerCase()) && (isImgWithCurrentSrc || isSourceInsidePictureWithCurrentSrc)) {
+            // Disable actual <img src>, <img srcset>, <source src> and <source srcset> if
+            // we will be using the currentSrc instead.
+            attrName = '_' + attrName;
+          }
+          let attrValue = value;
+          if (isAnchor && attr.toLowerCase() === 'href')
+            attrValue = 'link://' + value;
+          else if (attr.toLowerCase() === 'href' || attr.toLowerCase() === 'src' || attr === kCurrentSrcAttribute)
+            attrValue = rewriteURLForCustomProtocol(value);
+          result.push(' ', attrName, '="', escapeHTMLAttribute(attrValue), '"');
         }
+        result.push('>');
+        for (const child of children)
+          visit(child, snapshotIndex, nodeName, attrs);
+        if (!autoClosing.has(nodeName))
+          result.push('</', nodeName, '>');
+        return;
+      } else {
+        // Why are we here? Let's not throw, just in case.
+        return;
       }
-      return (n as any)._string;
     };
 
     const snapshot = this._snapshot;
-    let html = visit(snapshot.html, this._index, undefined, undefined);
-    if (!html)
-      return { html: '', pageId: snapshot.pageId, frameId: snapshot.frameId, index: this._index };
-
-    // Hide the document in order to prevent flickering. We will unhide once script has processed shadow.
-    const prefix = snapshot.doctype ? `<!DOCTYPE ${snapshot.doctype}>` : '';
-    html = prefix + [
-      '<style>*,*::before,*::after { visibility: hidden }</style>',
-      `<script>${snapshotScript(this._callId, this.snapshotName)}</script>`
-    ].join('') + html;
+    const html = this._htmlCache.getOrCompute(this, () => {
+      visit(snapshot.html, this._index, undefined, undefined);
+      const prefix = snapshot.doctype ? `<!DOCTYPE ${snapshot.doctype}>` : '';
+      const html = prefix + [
+        // Hide the document in order to prevent flickering. We will unhide once script has processed shadow.
+        '<style>*,*::before,*::after { visibility: hidden }</style>',
+        `<script>${snapshotScript(this.viewport(), this._callId, this.snapshotName)}</script>`
+      ].join('') + result.join('');
+      return { value: html, size: html.length };
+    });
 
     return { html, pageId: snapshot.pageId, frameId: snapshot.frameId, index: this._index };
   }
@@ -193,14 +217,6 @@ export class SnapshotRenderer {
 }
 
 const autoClosing = new Set(['AREA', 'BASE', 'BR', 'COL', 'COMMAND', 'EMBED', 'HR', 'IMG', 'INPUT', 'KEYGEN', 'LINK', 'MENUITEM', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR']);
-const escaped = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', '\'': '&#39;' };
-
-function escapeAttribute(s: string): string {
-  return s.replace(/[&<>"']/ug, char => (escaped as any)[char]);
-}
-function escapeText(s: string): string {
-  return s.replace(/[&<]/ug, char => (escaped as any)[char]);
-}
 
 function snapshotNodes(snapshot: FrameSnapshot): NodeSnapshot[] {
   if (!(snapshot as any)._nodes) {
@@ -221,8 +237,41 @@ function snapshotNodes(snapshot: FrameSnapshot): NodeSnapshot[] {
   return (snapshot as any)._nodes;
 }
 
-function snapshotScript(...targetIds: (string | undefined)[]) {
-  function applyPlaywrightAttributes(unwrapPopoutUrl: (url: string) => string, ...targetIds: (string | undefined)[]) {
+type ViewportSize = { width: number, height: number };
+type BoundingRect = { left: number, top: number, right: number, bottom: number };
+type FrameBoundingRectsInfo = {
+  viewport: ViewportSize;
+  frames: WeakMap<Element, {
+    boundingRect: BoundingRect;
+    scrollLeft: number;
+    scrollTop: number;
+  }>;
+};
+
+declare global {
+  interface Window {
+    __playwright_frame_bounding_rects__: FrameBoundingRectsInfo;
+  }
+}
+
+function snapshotScript(viewport: ViewportSize, ...targetIds: (string | undefined)[]) {
+  function applyPlaywrightAttributes(unwrapPopoutUrl: (url: string) => string, viewport: ViewportSize, ...targetIds: (string | undefined)[]) {
+    const searchParams = new URLSearchParams(location.search);
+    const shouldPopulateCanvasFromScreenshot = searchParams.has('shouldPopulateCanvasFromScreenshot');
+    const isUnderTest = searchParams.has('isUnderTest');
+
+    // info to recursively compute canvas position relative to the top snapshot frame.
+    // Before rendering each iframe, its parent extracts the '__playwright_canvas_render_info__' attribute
+    // value and keeps in this variable. It can then remove the attribute and render the element,
+    // which will eventually trigger the same process inside the iframe recursively.
+    // When there's a canvas to render, we iterate over its ancestor frames to compute
+    // its position relative to the top snapshot frame.
+    const frameBoundingRectsInfo = {
+      viewport,
+      frames: new WeakMap(),
+    };
+    window['__playwright_frame_bounding_rects__'] = frameBoundingRectsInfo;
+
     const kPointerWarningTitle = 'Recorded click position in absolute coordinates did not' +
         ' match the center of the clicked element. This is likely due to a difference between' +
         ' the test runner and the trace viewer operating systems.';
@@ -230,6 +279,11 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
     const scrollTops: Element[] = [];
     const scrollLefts: Element[] = [];
     const targetElements: Element[] = [];
+    const canvasElements: HTMLCanvasElement[] = [];
+
+    let topSnapshotWindow: Window = window;
+    while (topSnapshotWindow !== topSnapshotWindow.parent && !topSnapshotWindow.location.pathname.match(/\/page@[a-z0-9]+$/))
+      topSnapshotWindow = topSnapshotWindow.parent;
 
     const visit = (root: Document | ShadowRoot) => {
       // Collect all scrolled elements for later use.
@@ -252,6 +306,23 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
         (element as HTMLOptionElement).selected = element.getAttribute('__playwright_selected_') === 'true';
         element.removeAttribute('__playwright_selected_');
       }
+      for (const element of root.querySelectorAll(`[__playwright_popover_open_]`)) {
+        try {
+          (element as HTMLElement).showPopover();
+        } catch {
+        }
+        element.removeAttribute('__playwright_popover_open_');
+      }
+      for (const element of root.querySelectorAll(`[__playwright_dialog_open_]`)) {
+        try {
+          if (element.getAttribute('__playwright_dialog_open_') === 'modal')
+            (element as HTMLDialogElement).showModal();
+          else
+            (element as HTMLDialogElement).show();
+        } catch {
+        }
+        element.removeAttribute('__playwright_dialog_open_');
+      }
 
       for (const targetId of targetIds) {
         for (const target of root.querySelectorAll(`[__playwright_target__="${targetId}"]`)) {
@@ -263,6 +334,11 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
       }
 
       for (const iframe of root.querySelectorAll('iframe, frame')) {
+        const boundingRectJson = iframe.getAttribute('__playwright_bounding_rect__');
+        iframe.removeAttribute('__playwright_bounding_rect__');
+        const boundingRect = boundingRectJson ? JSON.parse(boundingRectJson) : undefined;
+        if (boundingRect)
+          frameBoundingRectsInfo.frames.set(iframe, { boundingRect, scrollLeft: 0, scrollTop: 0 });
         const src = iframe.getAttribute('__playwright_src__');
         if (!src) {
           iframe.setAttribute('src', 'data:text/html,<body style="background: #ddd"></body>');
@@ -305,6 +381,8 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
         }
         (root as any).adoptedStyleSheets = adoptedSheets;
       }
+
+      canvasElements.push(...root.querySelectorAll('canvas'));
     };
 
     const onLoad = () => {
@@ -312,19 +390,25 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
       for (const element of scrollTops) {
         element.scrollTop = +element.getAttribute('__playwright_scroll_top_')!;
         element.removeAttribute('__playwright_scroll_top_');
+        if (frameBoundingRectsInfo.frames.has(element))
+          frameBoundingRectsInfo.frames.get(element)!.scrollTop = element.scrollTop;
       }
       for (const element of scrollLefts) {
         element.scrollLeft = +element.getAttribute('__playwright_scroll_left_')!;
         element.removeAttribute('__playwright_scroll_left_');
+        if (frameBoundingRectsInfo.frames.has(element))
+          frameBoundingRectsInfo.frames.get(element)!.scrollLeft = element.scrollTop;
       }
 
       document.styleSheets[0].disabled = true;
 
       const search = new URL(window.location.href).searchParams;
+      const isTopFrame = window === topSnapshotWindow;
 
       if (search.get('pointX') && search.get('pointY')) {
         const pointX = +search.get('pointX')!;
         const pointY = +search.get('pointY')!;
+        const hasInputTarget = search.has('hasInputTarget');
         const hasTargetElements = targetElements.length > 0;
         const roots = document.documentElement ? [document.documentElement] : [];
         for (const target of (hasTargetElements ? targetElements : roots)) {
@@ -349,7 +433,8 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
             pointElement.style.left = centerX + 'px';
             pointElement.style.top = centerY + 'px';
             // "Warning symbol" indicates that action point is not 100% correct.
-            if (Math.abs(centerX - pointX) >= 10 || Math.abs(centerY - pointY) >= 10) {
+            // Note that action point is relative to the top frame, so we can only compare in the top frame.
+            if (isTopFrame && (Math.abs(centerX - pointX) >= 10 || Math.abs(centerY - pointY) >= 10)) {
               const warningElement = document.createElement('x-pw-pointer-warning');
               warningElement.textContent = '⚠';
               warningElement.style.fontSize = '19px';
@@ -359,15 +444,112 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
               pointElement.appendChild(warningElement);
               pointElement.setAttribute('title', kPointerWarningTitle);
             }
-          } else {
+            document.documentElement.appendChild(pointElement);
+          } else if (isTopFrame && !hasInputTarget) {
             // For actions without a target element, e.g. page.mouse.move(),
-            // show the point at the recorder location.
+            // show the point at the recorded location, which is relative to the top frame.
             pointElement.style.left = pointX + 'px';
             pointElement.style.top = pointY + 'px';
+            document.documentElement.appendChild(pointElement);
           }
-          document.documentElement.appendChild(pointElement);
         }
       }
+
+      if (canvasElements.length > 0) {
+        function drawCheckerboard(context: CanvasRenderingContext2D, canvas: HTMLCanvasElement) {
+          function createCheckerboardPattern() {
+            const pattern = document.createElement('canvas');
+            pattern.width = pattern.width / Math.floor(pattern.width / 24);
+            pattern.height = pattern.height / Math.floor(pattern.height / 24);
+            const context = pattern.getContext('2d')!;
+            context.fillStyle = 'lightgray';
+            context.fillRect(0, 0, pattern.width, pattern.height);
+            context.fillStyle = 'white';
+            context.fillRect(0, 0, pattern.width / 2, pattern.height / 2);
+            context.fillRect(pattern.width / 2, pattern.height / 2, pattern.width, pattern.height);
+            return context.createPattern(pattern, 'repeat')!;
+          }
+
+          context.fillStyle = createCheckerboardPattern();
+          context.fillRect(0, 0, canvas.width, canvas.height);
+        }
+
+        const img = new Image();
+        img.onload = () => {
+          for (const canvas of canvasElements) {
+            const context = canvas.getContext('2d')!;
+
+            const boundingRectAttribute = canvas.getAttribute('__playwright_bounding_rect__');
+            canvas.removeAttribute('__playwright_bounding_rect__');
+            if (!boundingRectAttribute)
+              continue;
+
+            let boundingRect: { left: number, top: number, right: number, bottom: number };
+            try {
+              boundingRect = JSON.parse(boundingRectAttribute);
+            } catch (e) {
+              continue;
+            }
+
+            let currWindow: Window = window;
+            while (currWindow !== topSnapshotWindow) {
+              const iframe = currWindow.frameElement!;
+              currWindow = currWindow.parent;
+
+              const iframeInfo = currWindow['__playwright_frame_bounding_rects__']?.frames.get(iframe);
+              if (!iframeInfo?.boundingRect)
+                break;
+
+              const leftOffset = iframeInfo.boundingRect.left - iframeInfo.scrollLeft;
+              const topOffset = iframeInfo.boundingRect.top - iframeInfo.scrollTop;
+
+              boundingRect.left += leftOffset;
+              boundingRect.top += topOffset;
+              boundingRect.right += leftOffset;
+              boundingRect.bottom += topOffset;
+            }
+
+            const { width, height } = topSnapshotWindow['__playwright_frame_bounding_rects__'].viewport;
+
+            boundingRect.left = boundingRect.left / width;
+            boundingRect.top = boundingRect.top / height;
+            boundingRect.right = boundingRect.right / width;
+            boundingRect.bottom = boundingRect.bottom / height;
+
+            const partiallyUncaptured = boundingRect.right > 1 || boundingRect.bottom > 1;
+            const fullyUncaptured = boundingRect.left > 1 || boundingRect.top > 1;
+            if (fullyUncaptured) {
+              canvas.title = `Playwright couldn't capture canvas contents because it's located outside the viewport.`;
+              continue;
+            }
+
+            drawCheckerboard(context, canvas);
+
+            if (shouldPopulateCanvasFromScreenshot) {
+              context.drawImage(img, boundingRect.left * img.width, boundingRect.top * img.height, (boundingRect.right - boundingRect.left) * img.width, (boundingRect.bottom - boundingRect.top) * img.height, 0, 0, canvas.width, canvas.height);
+
+              if (partiallyUncaptured)
+                canvas.title = `Playwright couldn't capture full canvas contents because it's located partially outside the viewport.`;
+              else
+                canvas.title = `Canvas contents are displayed on a best-effort basis based on viewport screenshots taken during test execution.`;
+            } else {
+              canvas.title = 'Canvas content display is disabled.';
+            }
+
+            if (isUnderTest)
+              // eslint-disable-next-line no-console
+              console.log(`canvas drawn:`, JSON.stringify([boundingRect.left, boundingRect.top, (boundingRect.right - boundingRect.left), (boundingRect.bottom - boundingRect.top)].map(v => Math.floor(v * 100))));
+          }
+        };
+        img.onerror = () => {
+          for (const canvas of canvasElements) {
+            const context = canvas.getContext('2d')!;
+            drawCheckerboard(context, canvas);
+            canvas.title = `Playwright couldn't show canvas contents because the screenshot failed to load.`;
+          }
+        };
+        img.src = location.href.replace('/snapshot', '/closest-screenshot');
+      }
     };
 
     const onDOMContentLoaded = () => visit(document);
@@ -376,7 +558,7 @@ function snapshotScript(...targetIds: (string | undefined)[]) {
     window.addEventListener('DOMContentLoaded', onDOMContentLoaded);
   }
 
-  return `\n(${applyPlaywrightAttributes.toString()})(${unwrapPopoutUrl.toString()}${targetIds.map(id => `, "${id}"`).join('')})`;
+  return `\n(${applyPlaywrightAttributes.toString()})(${unwrapPopoutUrl.toString()}, ${JSON.stringify(viewport)}${targetIds.map(id => `, "${id}"`).join('')})`;
 }
 
 
@@ -436,6 +618,21 @@ function rewriteURLsInStyleSheetForCustomProtocol(text: string): string {
   });
 }
 
+// url() inside a <style> tag can mess up with html parsing, so we encode some of them.
+// As an example, the following url will close the </style> tag:
+// url('data:image/svg+xml,<svg><defs><style>.a{fill:none}</style></defs><g class="a"></g></svg>')
+const urlToEscapeRegex1 = /url\(\s*'([^']*)'\s*\)/ig;
+const urlToEscapeRegex2 = /url\(\s*"([^"]*)"\s*\)/ig;
+function escapeURLsInStyleSheet(text: string): string {
+  const replacer = (match: string, url: string) => {
+    // Conservatively encode only urls with a closing tag.
+    if (url.includes('</'))
+      return match.replace(url, encodeURI(url));
+    return match;
+  };
+  return text.replace(urlToEscapeRegex1, replacer).replace(urlToEscapeRegex2, replacer);
+}
+
 // <base>/snapshot.html?r=<snapshotUrl> is used for "pop out snapshot" feature.
 export function unwrapPopoutUrl(url: string) {
   const u = new URL(url);
diff --git a/packages/trace-viewer/src/snapshotServer.ts b/packages/trace-viewer/src/sw/snapshotServer.ts
similarity index 77%
rename from packages/trace-viewer/src/snapshotServer.ts
rename to packages/trace-viewer/src/sw/snapshotServer.ts
index f1820d9df8e7d..64a86935402f7 100644
--- a/packages/trace-viewer/src/snapshotServer.ts
+++ b/packages/trace-viewer/src/sw/snapshotServer.ts
@@ -31,28 +31,39 @@ export class SnapshotServer {
     this._resourceLoader = resourceLoader;
   }
 
-  serveSnapshot(pathname: string, searchParams: URLSearchParams, snapshotUrl: string): Response {
-    const snapshot = this._snapshot(pathname.substring('/snapshot'.length), searchParams);
+  serveSnapshot(pageOrFrameId: string, searchParams: URLSearchParams, snapshotUrl: string): Response {
+    const snapshot = this._snapshot(pageOrFrameId, searchParams);
     if (!snapshot)
       return new Response(null, { status: 404 });
+
     const renderedSnapshot = snapshot.render();
     this._snapshotIds.set(snapshotUrl, snapshot);
-    return new Response(renderedSnapshot.html, { status: 200, headers: { 'Content-Type': 'text/html' } });
+    return new Response(renderedSnapshot.html, { status: 200, headers: { 'Content-Type': 'text/html; charset=utf-8' } });
+  }
+
+  async serveClosestScreenshot(pageOrFrameId: string, searchParams: URLSearchParams): Promise<Response> {
+    const snapshot = this._snapshot(pageOrFrameId, searchParams);
+    const sha1 = snapshot?.closestScreenshot();
+    if (!sha1)
+      return new Response(null, { status: 404 });
+    return new Response(await this._resourceLoader(sha1));
   }
 
-  serveSnapshotInfo(pathname: string, searchParams: URLSearchParams): Response {
-    const snapshot = this._snapshot(pathname.substring('/snapshotInfo'.length), searchParams);
+  serveSnapshotInfo(pageOrFrameId: string, searchParams: URLSearchParams): Response {
+    const snapshot = this._snapshot(pageOrFrameId, searchParams);
     return this._respondWithJson(snapshot ? {
       viewport: snapshot.viewport(),
-      url: snapshot.snapshot().frameUrl
+      url: snapshot.snapshot().frameUrl,
+      timestamp: snapshot.snapshot().timestamp,
+      wallTime: snapshot.snapshot().wallTime,
     } : {
       error: 'No snapshot found'
     });
   }
 
-  private _snapshot(pathname: string, params: URLSearchParams) {
+  private _snapshot(pageOrFrameId: string, params: URLSearchParams) {
     const name = params.get('name')!;
-    return this._snapshotStorage.snapshotByName(pathname.slice(1), name);
+    return this._snapshotStorage.snapshotByName(pageOrFrameId, name);
   }
 
   private _respondWithJson(object: any): Response {
@@ -85,7 +96,9 @@ export class SnapshotServer {
       contentType = `${contentType}; charset=utf-8`;
 
     const headers = new Headers();
-    headers.set('Content-Type', contentType);
+    // "x-unknown" in the har means "no content type".
+    if (contentType !== 'x-unknown')
+      headers.set('Content-Type', contentType);
     for (const { name, value } of resource.response.headers)
       headers.set(name, value);
     headers.delete('Content-Encoding');
diff --git a/packages/trace-viewer/src/snapshotStorage.ts b/packages/trace-viewer/src/sw/snapshotStorage.ts
similarity index 62%
rename from packages/trace-viewer/src/snapshotStorage.ts
rename to packages/trace-viewer/src/sw/snapshotStorage.ts
index 9f4aea60c2a53..d08fba647001a 100644
--- a/packages/trace-viewer/src/snapshotStorage.ts
+++ b/packages/trace-viewer/src/sw/snapshotStorage.ts
@@ -14,22 +14,27 @@
  * limitations under the License.
  */
 
-import type { FrameSnapshot, ResourceSnapshot } from '@trace/snapshot';
 import { rewriteURLForCustomProtocol, SnapshotRenderer } from './snapshotRenderer';
+import { LRUCache } from './lruCache';
+
+import type { FrameSnapshot, ResourceSnapshot } from '@trace/snapshot';
+import type { PageEntry } from '../types/entries';
+
 
 export class SnapshotStorage {
-  private _resources: ResourceSnapshot[] = [];
   private _frameSnapshots = new Map<string, {
     raw: FrameSnapshot[],
-    renderers: SnapshotRenderer[]
+    renderers: SnapshotRenderer[],
   }>();
+  private _cache = new LRUCache<SnapshotRenderer, string>(100_000_000);  // 100MB per each trace
+  private _contextToResources = new Map<string, ResourceSnapshot[]>();
 
-  addResource(resource: ResourceSnapshot): void {
+  addResource(contextId: string, resource: ResourceSnapshot): void {
     resource.request.url = rewriteURLForCustomProtocol(resource.request.url);
-    this._resources.push(resource);
+    this._ensureResourcesForContext(contextId).push(resource);
   }
 
-  addFrameSnapshot(snapshot: FrameSnapshot) {
+  addFrameSnapshot(contextId: string, snapshot: FrameSnapshot, screencastFrames: PageEntry['screencastFrames']) {
     for (const override of snapshot.resourceOverrides)
       override.url = rewriteURLForCustomProtocol(override.url);
     let frameSnapshots = this._frameSnapshots.get(snapshot.frameId);
@@ -43,7 +48,8 @@ export class SnapshotStorage {
         this._frameSnapshots.set(snapshot.pageId, frameSnapshots);
     }
     frameSnapshots.raw.push(snapshot);
-    const renderer = new SnapshotRenderer(this._resources, frameSnapshots.raw, frameSnapshots.raw.length - 1);
+    const resources = this._ensureResourcesForContext(contextId);
+    const renderer = new SnapshotRenderer(this._cache, resources, frameSnapshots.raw, screencastFrames, frameSnapshots.raw.length - 1);
     frameSnapshots.renderers.push(renderer);
     return renderer;
   }
@@ -59,6 +65,16 @@ export class SnapshotStorage {
 
   finalize() {
     // Resources are not necessarily sorted in the trace file, so sort them now.
-    this._resources.sort((a, b) => (a._monotonicTime || 0) - (b._monotonicTime || 0));
+    for (const resources of this._contextToResources.values())
+      resources.sort((a, b) => (a._monotonicTime || 0) - (b._monotonicTime || 0));
+  }
+
+  private _ensureResourcesForContext(contextId: string): ResourceSnapshot[] {
+    let resources = this._contextToResources.get(contextId);
+    if (!resources) {
+      resources = [];
+      this._contextToResources.set(contextId, resources);
+    }
+    return resources;
   }
 }
diff --git a/packages/trace-viewer/src/traceModel.ts b/packages/trace-viewer/src/sw/traceModel.ts
similarity index 81%
rename from packages/trace-viewer/src/traceModel.ts
rename to packages/trace-viewer/src/sw/traceModel.ts
index 54a77b5aa87c3..dc18e4e6cb544 100644
--- a/packages/trace-viewer/src/traceModel.ts
+++ b/packages/trace-viewer/src/sw/traceModel.ts
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import type * as trace from '@trace/trace';
-import { parseClientSideCallMetadata } from '../../../packages/playwright-core/src/utils/isomorphic/traceUtils';
-import type { ContextEntry } from './entries';
-import { createEmptyContext } from './entries';
+import { parseClientSideCallMetadata } from '@isomorphic/traceUtils';
+
 import { SnapshotStorage } from './snapshotStorage';
 import { TraceModernizer } from './traceModernizer';
 
+import type { ContextEntry } from '../types/entries';
+
 export interface TraceModelBackend {
   entryNames(): Promise<string[]>;
   hasEntry(entryName: string): Promise<boolean>;
@@ -34,7 +34,6 @@ export class TraceModel {
   contextEntries: ContextEntry[] = [];
   private _snapshotStorage: SnapshotStorage | undefined;
   private _backend!: TraceModelBackend;
-  private _attachments = new Map<string, trace.AfterActionTraceEventAttachment>();
   private _resourceToContentType = new Map<string, string>();
 
   constructor() {
@@ -46,7 +45,7 @@ export class TraceModel {
     const ordinals: string[] = [];
     let hasSource = false;
     for (const entryName of await this._backend.entryNames()) {
-      const match = entryName.match(/(.+)\.trace/);
+      const match = entryName.match(/(.+)\.trace$/);
       if (match)
         ordinals.push(match[1] || '');
       if (entryName.includes('src@'))
@@ -64,7 +63,7 @@ export class TraceModel {
       const contextEntry = createEmptyContext();
       contextEntry.traceUrl = backend.traceURL();
       contextEntry.hasSource = hasSource;
-      const modernizer = new TraceModernizer(contextEntry, this._snapshotStorage, this._attachments);
+      const modernizer = new TraceModernizer(contextEntry, this._snapshotStorage);
 
       const trace = await this._backend.readText(ordinal + '.trace') || '';
       modernizer.appendTrace(trace);
@@ -75,6 +74,7 @@ export class TraceModel {
       unzipProgress(++done, total);
 
       contextEntry.actions = modernizer.actions().sort((a1, a2) => a1.startTime - a2.startTime);
+
       if (!backend.isLive()) {
         // Terminate actions w/o after event gracefully.
         // This would close after hooks event that has not been closed because
@@ -107,7 +107,7 @@ export class TraceModel {
       this.contextEntries.push(contextEntry);
     }
 
-    this._snapshotStorage!.finalize();
+    this._snapshotStorage.finalize();
   }
 
   async hasEntry(filename: string): Promise<boolean> {
@@ -116,13 +116,11 @@ export class TraceModel {
 
   async resourceForSha1(sha1: string): Promise<Blob | undefined> {
     const blob = await this._backend.readBlob('resources/' + sha1);
-    if (!blob)
-      return;
-    return new Blob([blob], { type: this._resourceToContentType.get(sha1) || 'application/octet-stream' });
-  }
-
-  attachmentForSha1(sha1: string): trace.AfterActionTraceEventAttachment | undefined {
-    return this._attachments.get(sha1);
+    const contentType = this._resourceToContentType.get(sha1);
+    // "x-unknown" in the har means "no content type".
+    if (!blob || contentType === undefined || contentType === 'x-unknown')
+      return blob;
+    return new Blob([blob], { type: contentType });
   }
 
   storage(): SnapshotStorage {
@@ -136,3 +134,27 @@ function stripEncodingFromContentType(contentType: string) {
     return charset[1];
   return contentType;
 }
+
+function createEmptyContext(): ContextEntry {
+  return {
+    origin: 'testRunner',
+    traceUrl: '',
+    startTime: Number.MAX_SAFE_INTEGER,
+    wallTime: Number.MAX_SAFE_INTEGER,
+    endTime: 0,
+    browserName: '',
+    options: {
+      deviceScaleFactor: 1,
+      isMobile: false,
+      viewport: { width: 1280, height: 800 },
+    },
+    pages: [],
+    resources: [],
+    actions: [],
+    events: [],
+    errors: [],
+    stdio: [],
+    hasSource: false,
+    contextId: '',
+  };
+}
diff --git a/packages/trace-viewer/src/traceModelBackends.ts b/packages/trace-viewer/src/sw/traceModelBackends.ts
similarity index 76%
rename from packages/trace-viewer/src/traceModelBackends.ts
rename to packages/trace-viewer/src/sw/traceModelBackends.ts
index 19c5fc2deec52..91aad60c9a57d 100644
--- a/packages/trace-viewer/src/traceModelBackends.ts
+++ b/packages/trace-viewer/src/sw/traceModelBackends.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import type zip from '@zip.js/zip.js';
 // @ts-ignore
 import * as zipImport from '@zip.js/zip.js/lib/zip-no-worker-inflate.js';
+
+import type * as zip from '@zip.js/zip.js';
 import type { TraceModelBackend } from './traceModel';
 
 const zipjs = zipImport as typeof zip;
@@ -28,11 +28,11 @@ export class ZipTraceModelBackend implements TraceModelBackend {
   private _entriesPromise: Promise<Map<string, zip.Entry>>;
   private _traceURL: string;
 
-  constructor(traceURL: string, progress: Progress) {
+  constructor(traceURL: string, server: TraceViewerServer, progress: Progress) {
     this._traceURL = traceURL;
     zipjs.configure({ baseURL: self.location.href } as any);
     this._zipReader = new zipjs.ZipReader(
-        new zipjs.HttpReader(formatUrl(traceURL), { mode: 'cors', preventHeadRequest: true } as any),
+        new zipjs.HttpReader(formatUrl(traceURL, server), { mode: 'cors', preventHeadRequest: true } as any),
         { useWebWorkers: false });
     this._entriesPromise = this._zipReader.getEntries({ onprogress: progress }).then(entries => {
       const map = new Map<string, zip.Entry>();
@@ -83,12 +83,16 @@ export class ZipTraceModelBackend implements TraceModelBackend {
 
 export class FetchTraceModelBackend implements TraceModelBackend {
   private _entriesPromise: Promise<Map<string, string>>;
-  private _traceURL: string;
-
-  constructor(traceURL: string) {
-    this._traceURL = traceURL;
-    this._entriesPromise = fetch('/trace/file?path=' + encodeURIComponent(traceURL)).then(async response => {
-      const json = JSON.parse(await response.text());
+  private _path: string;
+  private _server: TraceViewerServer;
+
+  constructor(path: string, server: TraceViewerServer) {
+    this._path  = path;
+    this._server = server;
+    this._entriesPromise = server.readFile(path).then(async response => {
+      if (!response)
+        throw new Error('File not found');
+      const json = await response.json();
       const entries = new Map<string, string>();
       for (const entry of json.entries)
         entries.set(entry.name, entry.path);
@@ -101,7 +105,7 @@ export class FetchTraceModelBackend implements TraceModelBackend {
   }
 
   traceURL(): string {
-    return this._traceURL;
+    return this._path;
   }
 
   async entryNames(): Promise<string[]> {
@@ -129,14 +133,31 @@ export class FetchTraceModelBackend implements TraceModelBackend {
     const fileName = entries.get(entryName);
     if (!fileName)
       return;
-    return fetch('/trace/file?path=' + encodeURIComponent(fileName));
+    return this._server.readFile(fileName);
   }
 }
 
-function formatUrl(trace: string) {
-  let url = trace.startsWith('http') || trace.startsWith('blob') ? trace : `file?path=${encodeURIComponent(trace)}`;
+function formatUrl(trace: string, server: TraceViewerServer) {
+  let url = trace.startsWith('http') || trace.startsWith('blob') ? trace : server.getFileURL(trace).toString();
   // Dropbox does not support cors.
   if (url.startsWith('https://www.dropbox.com/'))
     url = 'https://dl.dropboxusercontent.com/' + url.substring('https://www.dropbox.com/'.length);
   return url;
 }
+
+export class TraceViewerServer {
+  constructor(private readonly baseUrl: URL) {}
+
+  getFileURL(path: string): URL {
+    const url = new URL('trace/file', this.baseUrl);
+    url.searchParams.set('path', path);
+    return url;
+  }
+
+  async readFile(path: string): Promise<Response | undefined> {
+    const response = await fetch(this.getFileURL(path));
+    if (response.status === 404)
+      return;
+    return response;
+  }
+}
diff --git a/packages/trace-viewer/src/traceModernizer.ts b/packages/trace-viewer/src/sw/traceModernizer.ts
similarity index 84%
rename from packages/trace-viewer/src/traceModernizer.ts
rename to packages/trace-viewer/src/sw/traceModernizer.ts
index e7c65ac41fca1..d1e683ebb4968 100644
--- a/packages/trace-viewer/src/traceModernizer.ts
+++ b/packages/trace-viewer/src/sw/traceModernizer.ts
@@ -19,7 +19,9 @@ import type * as traceV3 from './versions/traceV3';
 import type * as traceV4 from './versions/traceV4';
 import type * as traceV5 from './versions/traceV5';
 import type * as traceV6 from './versions/traceV6';
-import type { ActionEntry, ContextEntry, PageEntry } from './entries';
+import type * as traceV7 from './versions/traceV7';
+import type * as traceV8 from './versions/traceV8';
+import type { ActionEntry, ContextEntry, PageEntry } from '../types/entries';
 import type { SnapshotStorage } from './snapshotStorage';
 
 export class TraceVersionError extends Error {
@@ -29,22 +31,22 @@ export class TraceVersionError extends Error {
   }
 }
 
-const latestVersion: trace.VERSION = 7;
+// 6 => 10/2023 ~1.40
+// 7 => 05/2024 ~1.45
+const latestVersion: trace.VERSION = 8;
 
 export class TraceModernizer {
   private _contextEntry: ContextEntry;
   private _snapshotStorage: SnapshotStorage;
-  private _attachments: Map<string, trace.AfterActionTraceEventAttachment>;
   private _actionMap = new Map<string, ActionEntry>();
   private _version: number | undefined;
   private _pageEntries = new Map<string, PageEntry>();
   private _jsHandles = new Map<string, { preview: string }>();
   private _consoleObjects = new Map<string, { type: string, text: string, location: { url: string, lineNumber: number, columnNumber: number }, args?: { preview: string, value: string }[] }>();
 
-  constructor(contextEntry: ContextEntry, snapshotStorage: SnapshotStorage, attachments: Map<string, trace.AfterActionTraceEventAttachment>) {
+  constructor(contextEntry: ContextEntry, snapshotStorage: SnapshotStorage) {
     this._contextEntry = contextEntry;
     this._snapshotStorage = snapshotStorage;
-    this._attachments = attachments;
   }
 
   appendTrace(trace: string) {
@@ -60,6 +62,7 @@ export class TraceModernizer {
     let pageEntry = this._pageEntries.get(pageId);
     if (!pageEntry) {
       pageEntry = {
+        pageId,
         screencastFrames: [],
       };
       this._pageEntries.set(pageId, pageEntry);
@@ -93,6 +96,7 @@ export class TraceModernizer {
         contextEntry.sdkLanguage = event.sdkLanguage;
         contextEntry.options = event.options;
         contextEntry.testIdAttributeName = event.testIdAttributeName;
+        contextEntry.contextId = event.contextId ?? '';
         break;
       }
       case 'screencast-frame': {
@@ -127,10 +131,9 @@ export class TraceModernizer {
         existing!.result = event.result;
         existing!.error = event.error;
         existing!.attachments = event.attachments;
+        existing!.annotations = event.annotations;
         if (event.point)
           existing!.point = event.point;
-        for (const attachment of event.attachments?.filter(a => a.sha1) || [])
-          this._attachments.set(attachment.sha1!, attachment);
         break;
       }
       case 'action': {
@@ -158,11 +161,11 @@ export class TraceModernizer {
         break;
       }
       case 'resource-snapshot':
-        this._snapshotStorage.addResource(event.snapshot);
+        this._snapshotStorage.addResource(this._contextEntry.contextId, event.snapshot);
         contextEntry.resources.push(event.snapshot);
         break;
       case 'frame-snapshot':
-        this._snapshotStorage.addFrameSnapshot(event.snapshot);
+        this._snapshotStorage.addFrameSnapshot(this._contextEntry.contextId, event.snapshot, this._pageEntry(event.snapshot.pageId).screencastFrames);
         break;
     }
     // Make sure there is a page entry for each page, even without screencast frames,
@@ -188,10 +191,9 @@ export class TraceModernizer {
   }
 
   private _modernize(event: any): trace.TraceEvent[] {
-    // In trace 6->7 we also need to modernize context-options event.
-    let version = this._version || event.version;
-    if (version === undefined)
-      return [event];
+    // First record does not have this._version, but should have a version in the event entry itself.
+    // Test traces before 7 (including 6) did not have version in the first entry, run the modernizer for 6=>*.
+    let version = this._version ?? event.version ?? 6;
     let events = [event];
     for (; version < latestVersion; ++version)
       events = (this as any)[`_modernize_${version}_to_${version + 1}`].call(this, events);
@@ -377,33 +379,59 @@ export class TraceModernizer {
     return result;
   }
 
-  _modernize_6_to_7(events: traceV6.TraceEvent[]): trace.TraceEvent[] {
-    const result: trace.TraceEvent[] = [];
+  _modernize_6_to_7(events: traceV6.TraceEvent[]): traceV7.TraceEvent[] {
+    const result: traceV7.TraceEvent[] = [];
     if (!this._processedContextCreatedEvent() && events[0].type !== 'context-options') {
-      const event: trace.ContextCreatedTraceEvent = {
+      const event: traceV7.ContextCreatedTraceEvent = {
         type: 'context-options',
         origin: 'testRunner',
-        version: 7,
+        version: 6,
         browserName: '',
         options: {},
-        platform: process.platform,
+        platform: 'unknown',
         wallTime: 0,
         monotonicTime: 0,
         sdkLanguage: 'javascript',
+        contextId: '',
       };
       result.push(event);
     }
+
     for (const event of events) {
       if (event.type === 'context-options') {
-        result.push({ ...event, monotonicTime: 0, origin: 'library' });
+        result.push({ ...event, monotonicTime: 0, origin: 'library', contextId: '' });
         continue;
       }
-      // Take wall and monotonic time from the first event.
-      if (!this._contextEntry.wallTime && event.type === 'before')
-        this._contextEntry.wallTime = event.wallTime;
-      if (!this._contextEntry.startTime && event.type === 'before')
-        this._contextEntry.startTime = event.startTime;
-      result.push(event);
+      if (event.type === 'before' || event.type === 'action') {
+        // Take wall and monotonic time from the first event.
+        if (!this._contextEntry.wallTime)
+          this._contextEntry.wallTime = event.wallTime;
+        const eventAsV6 = event as traceV6.BeforeActionTraceEvent;
+        const eventAsV7 = event as traceV7.BeforeActionTraceEvent;
+        eventAsV7.stepId = `${eventAsV6.apiName}@${eventAsV6.wallTime}`;
+        result.push(eventAsV7);
+      } else {
+        result.push(event);
+      }
+    }
+    return result;
+  }
+
+  _modernize_7_to_8(events: traceV7.TraceEvent[]): traceV8.TraceEvent[] {
+    const result: traceV8.TraceEvent[] = [];
+    for (const event of events) {
+      if (event.type === 'before' || event.type === 'action') {
+        const eventAsV7 = event as traceV7.BeforeActionTraceEvent;
+        const eventAsV8 = event as traceV8.BeforeActionTraceEvent;
+        if (eventAsV7.apiName) {
+          eventAsV8.title = eventAsV7.apiName;
+          delete (eventAsV8 as any).apiName;
+        }
+        eventAsV8.stepId = eventAsV7.stepId ?? eventAsV7.callId;
+        result.push(eventAsV8);
+      } else {
+        result.push(event);
+      }
     }
     return result;
   }
diff --git a/packages/trace-viewer/src/versions/traceV3.ts b/packages/trace-viewer/src/sw/versions/traceV3.ts
similarity index 97%
rename from packages/trace-viewer/src/versions/traceV3.ts
rename to packages/trace-viewer/src/sw/versions/traceV3.ts
index fea10264a7a4b..a9cb7d77046d3 100644
--- a/packages/trace-viewer/src/versions/traceV3.ts
+++ b/packages/trace-viewer/src/sw/versions/traceV3.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Entry as ResourceSnapshot } from '../../../trace/src/har';
+import type { Entry as ResourceSnapshot } from '@trace/har';
 
 type SerializedValue = {
   n?: number,
diff --git a/packages/trace-viewer/src/versions/traceV4.ts b/packages/trace-viewer/src/sw/versions/traceV4.ts
similarity index 98%
rename from packages/trace-viewer/src/versions/traceV4.ts
rename to packages/trace-viewer/src/sw/versions/traceV4.ts
index 982bea14920ff..722604f0ad434 100644
--- a/packages/trace-viewer/src/versions/traceV4.ts
+++ b/packages/trace-viewer/src/sw/versions/traceV4.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Entry as ResourceSnapshot } from '../../../trace/src/har';
+import type { Entry as ResourceSnapshot } from '@trace/har';
 
 type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl';
 type Point = { x: number, y: number };
diff --git a/packages/trace-viewer/src/versions/traceV5.ts b/packages/trace-viewer/src/sw/versions/traceV5.ts
similarity index 98%
rename from packages/trace-viewer/src/versions/traceV5.ts
rename to packages/trace-viewer/src/sw/versions/traceV5.ts
index 8024330ebdda1..54d54459cec2d 100644
--- a/packages/trace-viewer/src/versions/traceV5.ts
+++ b/packages/trace-viewer/src/sw/versions/traceV5.ts
@@ -15,7 +15,7 @@
  */
 
 
-import type { Entry as ResourceSnapshot } from '../../../trace/src/har';
+import type { Entry as ResourceSnapshot } from '@trace/har';
 
 type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl';
 type Point = { x: number, y: number };
diff --git a/packages/trace-viewer/src/versions/traceV6.ts b/packages/trace-viewer/src/sw/versions/traceV6.ts
similarity index 98%
rename from packages/trace-viewer/src/versions/traceV6.ts
rename to packages/trace-viewer/src/sw/versions/traceV6.ts
index 2bbbd447b32af..1b069a20b2681 100644
--- a/packages/trace-viewer/src/versions/traceV6.ts
+++ b/packages/trace-viewer/src/sw/versions/traceV6.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Entry as ResourceSnapshot } from '../../../trace/src/har';
+import type { Entry as ResourceSnapshot } from '@trace/har';
 
 type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl';
 type Point = { x: number, y: number };
diff --git a/packages/trace-viewer/src/sw/versions/traceV7.ts b/packages/trace-viewer/src/sw/versions/traceV7.ts
new file mode 100644
index 0000000000000..2388321417170
--- /dev/null
+++ b/packages/trace-viewer/src/sw/versions/traceV7.ts
@@ -0,0 +1,260 @@
+/**
+ * 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 { Entry as ResourceSnapshot } from '@trace/har';
+
+type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl';
+type Point = { x: number, y: number };
+export type Size = { width: number, height: number };
+
+type StackFrame = {
+  file: string,
+  line: number,
+  column: number,
+  function?: string,
+};
+
+type Binary = Buffer;
+
+type SerializedValue = {
+  n?: number,
+  b?: boolean,
+  s?: string,
+  v?: 'null' | 'undefined' | 'NaN' | 'Infinity' | '-Infinity' | '-0',
+  d?: string,
+  u?: string,
+  bi?: string,
+  ta?: {
+    b: Binary,
+    k: 'i8' | 'ui8' | 'ui8c' | 'i16' | 'ui16' | 'i32' | 'ui32' | 'f32' | 'f64' | 'bi64' | 'bui64',
+  },
+  e?: {
+    m: string,
+    n: string,
+    s: string,
+  },
+  r?: {
+    p: string,
+    f: string,
+  },
+  a?: SerializedValue[],
+  o?: {
+    k: string,
+    v: SerializedValue,
+  }[],
+  h?: number,
+  id?: number,
+  ref?: number,
+};
+
+type SerializedError = {
+  error?: {
+    message: string,
+    name: string,
+    stack?: string,
+  },
+  value?: SerializedValue,
+};
+
+// Text node.
+type TextNodeSnapshot = string;
+// Subtree reference, "x snapshots ago, node #y". Could point to a text node.
+// Only nodes that are not references are counted, starting from zero, using post-order traversal.
+type SubtreeReferenceSnapshot = [ [number, number] ];
+// Node name, and optional attributes and child nodes.
+type NodeNameAttributesChildNodesSnapshot = [ string ] | [ string, Record<string, string>, ...NodeSnapshot[] ];
+
+type NodeSnapshot =
+  TextNodeSnapshot |
+  SubtreeReferenceSnapshot |
+  NodeNameAttributesChildNodesSnapshot;
+
+type ResourceOverride = {
+  url: string,
+  sha1?: string,
+  ref?: number
+};
+
+type FrameSnapshot = {
+  snapshotName?: string,
+  callId: string,
+  pageId: string,
+  frameId: string,
+  frameUrl: string,
+  timestamp: number,
+  wallTime?: number,
+  collectionTime: number,
+  doctype?: string,
+  html: NodeSnapshot,
+  resourceOverrides: ResourceOverride[],
+  viewport: { width: number, height: number },
+  isMainFrame: boolean,
+};
+
+type BrowserContextEventOptions = {
+  baseURL?: string,
+  viewport?: Size,
+  deviceScaleFactor?: number,
+  isMobile?: boolean,
+  userAgent?: string,
+};
+
+export type ContextCreatedTraceEvent = {
+  version: number,
+  type: 'context-options',
+  origin: 'testRunner' | 'library',
+  browserName: string,
+  channel?: string,
+  platform: string,
+  wallTime: number,
+  monotonicTime: number,
+  title?: string,
+  options: BrowserContextEventOptions,
+  sdkLanguage?: Language,
+  testIdAttributeName?: string,
+  contextId?: string,
+};
+
+export type ScreencastFrameTraceEvent = {
+  type: 'screencast-frame',
+  pageId: string,
+  sha1: string,
+  width: number,
+  height: number,
+  timestamp: number,
+  frameSwapWallTime?: number,
+};
+
+export type BeforeActionTraceEvent = {
+  type: 'before',
+  callId: string;
+  startTime: number;
+  apiName: string;
+  class: string;
+  method: string;
+  params: Record<string, any>;
+  stepId?: string;
+  beforeSnapshot?: string;
+  stack?: StackFrame[];
+  pageId?: string;
+  parentId?: string;
+};
+
+export type InputActionTraceEvent = {
+  type: 'input',
+  callId: string;
+  inputSnapshot?: string;
+  point?: Point;
+};
+
+export type AfterActionTraceEventAttachment = {
+  name: string;
+  contentType: string;
+  path?: string;
+  sha1?: string;
+  base64?: string;
+};
+
+export type AfterActionTraceEventAnnotation = {
+  type: string,
+  description?: string
+};
+
+export type AfterActionTraceEvent = {
+  type: 'after',
+  callId: string;
+  endTime: number;
+  afterSnapshot?: string;
+  error?: SerializedError['error'];
+  attachments?: AfterActionTraceEventAttachment[];
+  annotations?: AfterActionTraceEventAnnotation[];
+  result?: any;
+  point?: Point;
+};
+
+export type LogTraceEvent = {
+  type: 'log',
+  callId: string;
+  time: number;
+  message: string;
+};
+
+export type EventTraceEvent = {
+  type: 'event',
+  time: number;
+  class: string;
+  method: string;
+  params: any;
+  pageId?: string;
+};
+
+export type ConsoleMessageTraceEvent = {
+  type: 'console';
+  time: number;
+  pageId?: string;
+  messageType: string,
+  text: string,
+  args?: { preview: string, value: any }[],
+  location: {
+    url: string,
+    lineNumber: number,
+    columnNumber: number,
+  },
+};
+
+export type ResourceSnapshotTraceEvent = {
+  type: 'resource-snapshot',
+  snapshot: ResourceSnapshot,
+};
+
+export type FrameSnapshotTraceEvent = {
+  type: 'frame-snapshot',
+  snapshot: FrameSnapshot,
+};
+
+export type ActionTraceEvent = {
+  type: 'action',
+} & Omit<BeforeActionTraceEvent, 'type'>
+  & Omit<AfterActionTraceEvent, 'type'>
+  & Omit<InputActionTraceEvent, 'type'>;
+
+export type StdioTraceEvent = {
+  type: 'stdout' | 'stderr';
+  timestamp: number;
+  text?: string;
+  base64?: string;
+};
+
+export type ErrorTraceEvent = {
+  type: 'error';
+  message: string;
+  stack?: StackFrame[];
+};
+
+export type TraceEvent =
+    ContextCreatedTraceEvent |
+    ScreencastFrameTraceEvent |
+    ActionTraceEvent |
+    BeforeActionTraceEvent |
+    InputActionTraceEvent |
+    AfterActionTraceEvent |
+    EventTraceEvent |
+    LogTraceEvent |
+    ConsoleMessageTraceEvent |
+    ResourceSnapshotTraceEvent |
+    FrameSnapshotTraceEvent |
+    StdioTraceEvent |
+    ErrorTraceEvent;
diff --git a/packages/trace-viewer/src/sw/versions/traceV8.ts b/packages/trace-viewer/src/sw/versions/traceV8.ts
new file mode 100644
index 0000000000000..233a68b5d03b2
--- /dev/null
+++ b/packages/trace-viewer/src/sw/versions/traceV8.ts
@@ -0,0 +1,260 @@
+/**
+ * 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 { Entry as ResourceSnapshot } from '@trace/har';
+
+type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl';
+type Point = { x: number, y: number };
+type Size = { width: number, height: number };
+
+type StackFrame = {
+  file: string,
+  line: number,
+  column: number,
+  function?: string,
+};
+
+type Binary = Buffer;
+
+type SerializedValue = {
+  n?: number,
+  b?: boolean,
+  s?: string,
+  v?: 'null' | 'undefined' | 'NaN' | 'Infinity' | '-Infinity' | '-0',
+  d?: string,
+  u?: string,
+  bi?: string,
+  ta?: {
+    b: Binary,
+    k: 'i8' | 'ui8' | 'ui8c' | 'i16' | 'ui16' | 'i32' | 'ui32' | 'f32' | 'f64' | 'bi64' | 'bui64',
+  },
+  e?: {
+    m: string,
+    n: string,
+    s: string,
+  },
+  r?: {
+    p: string,
+    f: string,
+  },
+  a?: SerializedValue[],
+  o?: {
+    k: string,
+    v: SerializedValue,
+  }[],
+  h?: number,
+  id?: number,
+  ref?: number,
+};
+
+type SerializedError = {
+  error?: {
+    message: string,
+    name: string,
+    stack?: string,
+  },
+  value?: SerializedValue,
+};
+
+// Text node.
+type TextNodeSnapshot = string;
+// Subtree reference, "x snapshots ago, node #y". Could point to a text node.
+// Only nodes that are not references are counted, starting from zero, using post-order traversal.
+type SubtreeReferenceSnapshot = [ [number, number] ];
+// Node name, and optional attributes and child nodes.
+type NodeNameAttributesChildNodesSnapshot = [ string ] | [ string, Record<string, string>, ...NodeSnapshot[] ];
+
+type NodeSnapshot =
+  TextNodeSnapshot |
+  SubtreeReferenceSnapshot |
+  NodeNameAttributesChildNodesSnapshot;
+
+type ResourceOverride = {
+  url: string,
+  sha1?: string,
+  ref?: number
+};
+
+type FrameSnapshot = {
+  snapshotName?: string,
+  callId: string,
+  pageId: string,
+  frameId: string,
+  frameUrl: string,
+  timestamp: number,
+  wallTime?: number,
+  collectionTime: number,
+  doctype?: string,
+  html: NodeSnapshot,
+  resourceOverrides: ResourceOverride[],
+  viewport: { width: number, height: number },
+  isMainFrame: boolean,
+};
+
+type BrowserContextEventOptions = {
+  baseURL?: string,
+  viewport?: Size,
+  deviceScaleFactor?: number,
+  isMobile?: boolean,
+  userAgent?: string,
+};
+
+export type ContextCreatedTraceEvent = {
+  version: number,
+  type: 'context-options',
+  origin: 'testRunner' | 'library',
+  browserName: string,
+  channel?: string,
+  platform: string,
+  wallTime: number,
+  monotonicTime: number,
+  title?: string,
+  options: BrowserContextEventOptions,
+  sdkLanguage?: Language,
+  testIdAttributeName?: string,
+  contextId?: string,
+};
+
+export type ScreencastFrameTraceEvent = {
+  type: 'screencast-frame',
+  pageId: string,
+  sha1: string,
+  width: number,
+  height: number,
+  timestamp: number,
+  frameSwapWallTime?: number,
+};
+
+export type BeforeActionTraceEvent = {
+  type: 'before',
+  callId: string;
+  startTime: number;
+  title?: string;
+  class: string;
+  method: string;
+  params: Record<string, any>;
+  stepId?: string;
+  beforeSnapshot?: string;
+  stack?: StackFrame[];
+  pageId?: string;
+  parentId?: string;
+};
+
+export type InputActionTraceEvent = {
+  type: 'input',
+  callId: string;
+  inputSnapshot?: string;
+  point?: Point;
+};
+
+export type AfterActionTraceEventAttachment = {
+  name: string;
+  contentType: string;
+  path?: string;
+  sha1?: string;
+  base64?: string;
+};
+
+export type AfterActionTraceEventAnnotation = {
+  type: string,
+  description?: string
+};
+
+export type AfterActionTraceEvent = {
+  type: 'after',
+  callId: string;
+  endTime: number;
+  afterSnapshot?: string;
+  error?: SerializedError['error'];
+  attachments?: AfterActionTraceEventAttachment[];
+  annotations?: AfterActionTraceEventAnnotation[];
+  result?: any;
+  point?: Point;
+};
+
+export type LogTraceEvent = {
+  type: 'log',
+  callId: string;
+  time: number;
+  message: string;
+};
+
+export type EventTraceEvent = {
+  type: 'event',
+  time: number;
+  class: string;
+  method: string;
+  params: any;
+  pageId?: string;
+};
+
+export type ConsoleMessageTraceEvent = {
+  type: 'console';
+  time: number;
+  pageId?: string;
+  messageType: string,
+  text: string,
+  args?: { preview: string, value: any }[],
+  location: {
+    url: string,
+    lineNumber: number,
+    columnNumber: number,
+  },
+};
+
+export type ResourceSnapshotTraceEvent = {
+  type: 'resource-snapshot',
+  snapshot: ResourceSnapshot,
+};
+
+export type FrameSnapshotTraceEvent = {
+  type: 'frame-snapshot',
+  snapshot: FrameSnapshot,
+};
+
+export type ActionTraceEvent = {
+  type: 'action',
+} & Omit<BeforeActionTraceEvent, 'type'>
+  & Omit<AfterActionTraceEvent, 'type'>
+  & Omit<InputActionTraceEvent, 'type'>;
+
+export type StdioTraceEvent = {
+  type: 'stdout' | 'stderr';
+  timestamp: number;
+  text?: string;
+  base64?: string;
+};
+
+export type ErrorTraceEvent = {
+  type: 'error';
+  message: string;
+  stack?: StackFrame[];
+};
+
+export type TraceEvent =
+    ContextCreatedTraceEvent |
+    ScreencastFrameTraceEvent |
+    ActionTraceEvent |
+    BeforeActionTraceEvent |
+    InputActionTraceEvent |
+    AfterActionTraceEvent |
+    EventTraceEvent |
+    LogTraceEvent |
+    ConsoleMessageTraceEvent |
+    ResourceSnapshotTraceEvent |
+    FrameSnapshotTraceEvent |
+    StdioTraceEvent |
+    ErrorTraceEvent;
diff --git a/packages/trace-viewer/src/third_party/devtools.ts b/packages/trace-viewer/src/third_party/devtools.ts
new file mode 100644
index 0000000000000..cc033302400bc
--- /dev/null
+++ b/packages/trace-viewer/src/third_party/devtools.ts
@@ -0,0 +1,285 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Modifications copyright (c) Microsoft Corporation.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*
+ * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
+ * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import type { Entry } from '@trace/har';
+
+// The following function is derived from Chromium's source code
+// https://github.com/ChromeDevTools/devtools-frontend/blob/83cbe41b4107e188a1f66fdf6ea3a9cca42587c6/front_end/panels/network/NetworkLogView.ts#L2363
+export async function generateCurlCommand(resource: Entry): Promise<string> {
+  const platform = navigator.platform.includes('Win') ? 'win' : 'unix';
+  let command: string[] = [];
+  // Most of these headers are derived from the URL and are automatically added by cURL.
+  // The |Accept-Encoding| header is ignored to prevent decompression errors. crbug.com/1015321
+  const ignoredHeaders =
+    new Set<string>(['accept-encoding', 'host', 'method', 'path', 'scheme', 'version', 'authority', 'protocol']);
+
+  function escapeStringWin(str: string): string {
+    /* Always escape the " characters so that we can use caret escaping.
+
+   Because cmd.exe parser and MS Crt arguments parsers use some of the
+   same escape characters, they can interact with each other in
+   horrible ways, the order of operations is critical.
+
+   Replace \ with \\ first because it is an escape character for certain
+   conditions in both parsers.
+
+   Replace all " with \" to ensure the first parser does not remove it.
+
+   Then escape all characters we are not sure about with ^ to ensure it
+   gets to MS Crt parser safely.
+
+   The % character is special because MS Crt parser will try and look for
+   ENV variables and fill them in its place. We cannot escape them with %
+   and cannot escape them with ^ (because it's cmd.exe's escape not MS Crt
+   parser); So we can get cmd.exe parser to escape the character after it,
+   if it is followed by a valid beginning character of an ENV variable.
+   This ensures we do not try and double escape another ^ if it was placed
+   by the previous replace.
+
+   Lastly we replace new lines with ^ and TWO new lines because the first
+   new line is there to enact the escape command the second is the character
+   to escape (in this case new line).
+  */
+    const encapsChars = '^"';
+    return encapsChars +
+      str.replace(/\\/g, '\\\\')
+          .replace(/"/g, '\\"')
+          .replace(/[^a-zA-Z0-9\s_\-:=+~'\/.',?;()*`]/g, '^$&')
+          .replace(/%(?=[a-zA-Z0-9_])/g, '%^')
+          .replace(/\r?\n/g, '^\n\n') +
+      encapsChars;
+  }
+
+  function escapeStringPosix(str: string): string {
+    function escapeCharacter(x: string): string {
+      const code = x.charCodeAt(0);
+      let hexString = code.toString(16);
+      // Zero pad to four digits to comply with ANSI-C Quoting:
+      // http://www.gnu.org/software/bash/manual/html_node/ANSI_002dC-Quoting.html
+      while (hexString.length < 4)
+        hexString = '0' + hexString;
+
+
+      return '\\u' + hexString;
+    }
+
+    if (/[\0-\x1F\x7F-\x9F!]|\'/.test(str)) {
+      // Use ANSI-C quoting syntax.
+      return '$\'' +
+        str.replace(/\\/g, '\\\\')
+            .replace(/\'/g, '\\\'')
+            .replace(/\n/g, '\\n')
+            .replace(/\r/g, '\\r')
+            .replace(/[\0-\x1F\x7F-\x9F!]/g, escapeCharacter) +
+        '\'';
+    }
+    // Use single quote syntax.
+    return '\'' + str + '\'';
+  }
+
+  // cURL command expected to run on the same platform that DevTools run
+  // (it may be different from the inspected page platform).
+  const escapeString = platform === 'win' ? escapeStringWin : escapeStringPosix;
+
+  command.push(escapeString(resource.request.url).replace(/[[{}\]]/g, '\\$&'));
+
+  let inferredMethod = 'GET';
+  const data = [];
+  const formData = await fetchRequestPostData(resource);
+  if (formData) {
+    // Note that formData is not necessarily urlencoded because it might for example
+    // come from a fetch request made with an explicitly unencoded body.
+    data.push('--data-raw ' + escapeString(formData));
+    ignoredHeaders.add('content-length');
+    inferredMethod = 'POST';
+  }
+
+  if (resource.request.method !== inferredMethod)
+    command.push('-X ' + escapeString(resource.request.method));
+
+
+  const requestHeaders = resource.request.headers;
+  for (let i = 0; i < requestHeaders.length; i++) {
+    const header = requestHeaders[i];
+    const name = header.name.replace(/^:/, '');  // Translate SPDY v3 headers to HTTP headers.
+    if (ignoredHeaders.has(name.toLowerCase()))
+      continue;
+
+    if (header.value.trim()) {
+      command.push('-H ' + escapeString(name + ': ' + header.value));
+    } else {
+      // A header passed with -H with no value or only whitespace as its
+      // value tells curl to not set the header at all. To post an empty
+      // header, you have to terminate it with a semicolon.
+      command.push('-H ' + escapeString(name + ';'));
+    }
+  }
+  command = command.concat(data);
+
+  return 'curl ' + command.join(command.length >= 3 ? (platform === 'win' ? ' ^\n  ' : ' \\\n  ') : ' ');
+}
+
+const enum FetchStyle {
+  BROWSER = 0,
+  NODE_JS = 1,
+}
+
+export async function generateFetchCall(resource: Entry, style: FetchStyle = FetchStyle.BROWSER): Promise<string> {
+  const ignoredHeaders = new Set<string>([
+    // Internal headers
+    'method',
+    'path',
+    'scheme',
+    'version',
+
+    // Unsafe headers
+    // Keep this list synchronized with src/net/http/http_util.cc
+    'accept-charset',
+    'accept-encoding',
+    'access-control-request-headers',
+    'access-control-request-method',
+    'connection',
+    'content-length',
+    'cookie',
+    'cookie2',
+    'date',
+    'dnt',
+    'expect',
+    'host',
+    'keep-alive',
+    'origin',
+    'referer',
+    'te',
+    'trailer',
+    'transfer-encoding',
+    'upgrade',
+    'via',
+    // TODO(phistuck) - remove this once crbug.com/571722 is fixed.
+    'user-agent',
+  ]);
+
+  const credentialHeaders = new Set<string>(['cookie', 'authorization']);
+
+  const url = JSON.stringify(resource.request.url);
+
+  const requestHeaders = resource.request.headers;
+  const headerData: Headers = requestHeaders.reduce((result, header) => {
+    const name = header.name;
+
+    if (!ignoredHeaders.has(name.toLowerCase()) && !name.includes(':'))
+      result.append(name, header.value);
+
+
+    return result;
+  }, new Headers());
+
+  const headers: HeadersInit = {};
+  for (const headerArray of headerData)
+    headers[headerArray[0]] = headerArray[1];
+
+
+  const credentials = resource.request.cookies.length ||
+          requestHeaders.some(({ name }) => credentialHeaders.has(name.toLowerCase())) ?
+    'include' :
+    'omit';
+
+  const referrerHeader = requestHeaders.find(({ name }) => name.toLowerCase() === 'referer');
+
+  const referrer = referrerHeader ? referrerHeader.value : void 0;
+
+  const requestBody = await fetchRequestPostData(resource);
+
+  const fetchOptions: RequestInit = {
+    headers: Object.keys(headers).length ? headers : void 0,
+    referrer,
+    body: requestBody,
+    method: resource.request.method,
+    mode: 'cors',
+  };
+
+  if (style === FetchStyle.NODE_JS) {
+    const cookieHeader = requestHeaders.find(header => header.name.toLowerCase() === 'cookie');
+    const extraHeaders: HeadersInit = {};
+    // According to https://www.npmjs.com/package/node-fetch#class-request the
+    // following properties are not implemented in Node.js.
+    delete fetchOptions.mode;
+    if (cookieHeader)
+      extraHeaders['cookie'] = cookieHeader.value;
+
+    if (referrer) {
+      delete fetchOptions.referrer;
+      extraHeaders['Referer'] = referrer;
+    }
+    if (Object.keys(extraHeaders).length) {
+      fetchOptions.headers = {
+        ...headers,
+        ...extraHeaders,
+      };
+    }
+  } else {
+    fetchOptions.credentials = credentials;
+  }
+
+  const options = JSON.stringify(fetchOptions, null, 2);
+  return `fetch(${url}, ${options});`;
+}
+
+async function fetchRequestPostData(resource: Entry) {
+  return resource.request.postData?._sha1 ? await fetch(`sha1/${resource.request.postData._sha1}`).then(r => r.text()) : resource.request.postData?.text;
+}
diff --git a/packages/trace-viewer/src/entries.ts b/packages/trace-viewer/src/types/entries.ts
similarity index 72%
rename from packages/trace-viewer/src/entries.ts
rename to packages/trace-viewer/src/types/entries.ts
index bca5751ab2712..a28efe402675e 100644
--- a/packages/trace-viewer/src/entries.ts
+++ b/packages/trace-viewer/src/types/entries.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import type { Language } from '../../playwright-core/src/utils/isomorphic/locatorGenerators';
+import type { Language } from '../../../playwright-core/src/utils/isomorphic/locatorGenerators';
 import type { ResourceSnapshot } from '@trace/snapshot';
 import type * as trace from '@trace/trace';
 
+// *Entry structures are used to pass the trace between the sw and the page.
+
 export type ContextEntry = {
   origin: 'testRunner'|'library';
   traceUrl: string;
@@ -38,12 +40,15 @@ export type ContextEntry = {
   stdio: trace.StdioTraceEvent[];
   errors: trace.ErrorTraceEvent[];
   hasSource: boolean;
+  contextId: string;
 };
 
 export type PageEntry = {
+  pageId: string,
   screencastFrames: {
     sha1: string,
     timestamp: number,
+    frameSwapWallTime?: number,
     width: number,
     height: number,
   }[];
@@ -52,26 +57,3 @@ export type PageEntry = {
 export type ActionEntry = trace.ActionTraceEvent & {
   log: { time: number, message: string }[];
 };
-
-export function createEmptyContext(): ContextEntry {
-  return {
-    origin: 'testRunner',
-    traceUrl: '',
-    startTime: Number.MAX_SAFE_INTEGER,
-    wallTime: Number.MAX_SAFE_INTEGER,
-    endTime: 0,
-    browserName: '',
-    options: {
-      deviceScaleFactor: 1,
-      isMobile: false,
-      viewport: { width: 1280, height: 800 },
-    },
-    pages: [],
-    resources: [],
-    actions: [],
-    events: [],
-    errors: [],
-    stdio: [],
-    hasSource: false,
-  };
-}
diff --git a/packages/trace-viewer/src/ui/DEPS.list b/packages/trace-viewer/src/ui/DEPS.list
index 3fab0da95b08b..af02e8bfad41a 100644
--- a/packages/trace-viewer/src/ui/DEPS.list
+++ b/packages/trace-viewer/src/ui/DEPS.list
@@ -6,3 +6,5 @@
 ../entries.ts
 ../geometry.ts
 ../../../playwright/src/isomorphic/**
+../third_party/devtools.ts
+./shared/**
\ No newline at end of file
diff --git a/packages/trace-viewer/src/ui/actionList.css b/packages/trace-viewer/src/ui/actionList.css
index 10e3c39f98522..41864228d66bb 100644
--- a/packages/trace-viewer/src/ui/actionList.css
+++ b/packages/trace-viewer/src/ui/actionList.css
@@ -14,12 +14,33 @@
   limitations under the License.
 */
 
-.action-title {
+.action-title > .hbox {
+  align-items: center;
+}
+
+.action-title-line {
   display: block;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
+.action-title-selector {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  color: var(--vscode-tab-inactiveForeground);
+  margin-top: -8px;
+}
+
+.action-title-method {
+  white-space: pre;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.action-title-param {
+  color: var(--vscode-editorBracketHighlight-foreground1);
+}
+
 .action-location {
   display: flex;
   flex: none;
@@ -41,6 +62,10 @@
   color: var(--vscode-editorCodeLens-foreground);
 }
 
+.action-skipped {
+  margin-right: 4px;
+}
+
 .action-icon {
   flex: none;
   display: flex;
@@ -70,13 +95,20 @@
   flex: none;
 }
 
-.action-selector {
+.action-parameter {
   display: inline;
   flex: none;
   padding-left: 5px;
+}
+
+.action-locator-parameter {
   color: var(--vscode-charts-orange);
 }
 
+.action-generic-parameter {
+  color: var(--vscode-charts-purple);
+}
+
 .action-url {
   display: inline;
   flex: none;
diff --git a/packages/trace-viewer/src/ui/actionList.tsx b/packages/trace-viewer/src/ui/actionList.tsx
index 3935447e7dd04..4b162a170a1b6 100644
--- a/packages/trace-viewer/src/ui/actionList.tsx
+++ b/packages/trace-viewer/src/ui/actionList.tsx
@@ -14,17 +14,20 @@
   limitations under the License.
 */
 
-import type { ActionTraceEvent } from '@trace/trace';
-import { msToString } from '@web/uiUtils';
+import type { ActionTraceEvent, AfterActionTraceEventAttachment } from '@trace/trace';
+import { clsx, msToString } from '@web/uiUtils';
 import * as React from 'react';
 import './actionList.css';
 import * as modelUtil from './modelUtil';
-import { asLocator } from '@isomorphic/locatorGenerators';
-import type { Language } from '@isomorphic/locatorGenerators';
+import { asLocatorDescription, type Language } from '@isomorphic/locatorGenerators';
 import type { TreeState } from '@web/components/treeView';
 import { TreeView } from '@web/components/treeView';
 import type { ActionTraceEventInContext, ActionTreeItem } from './modelUtil';
-import type { Boundaries } from '../geometry';
+import type { Boundaries } from './geometry';
+import { ToolbarButton } from '@web/components/toolbarButton';
+import { testStatusIcon } from './testUtils';
+import { methodMetainfo } from '@isomorphic/protocolMetainfo';
+import { formatProtocolParam } from '@isomorphic/protocolFormatter';
 
 export interface ActionListProps {
   actions: ActionTraceEventInContext[],
@@ -32,9 +35,10 @@ export interface ActionListProps {
   selectedTime: Boundaries | undefined,
   setSelectedTime: (time: Boundaries | undefined) => void,
   sdkLanguage: Language | undefined;
-  onSelected: (action: ActionTraceEventInContext) => void,
-  onHighlighted: (action: ActionTraceEventInContext | undefined) => void,
-  revealConsole: () => void,
+  onSelected?: (action: ActionTraceEventInContext) => void,
+  onHighlighted?: (action: ActionTraceEventInContext | undefined) => void,
+  revealConsole?: () => void,
+  revealAttachment(attachment: AfterActionTraceEventAttachment): void,
   isLive?: boolean,
 }
 
@@ -49,6 +53,7 @@ export const ActionList: React.FC<ActionListProps> = ({
   onSelected,
   onHighlighted,
   revealConsole,
+  revealAttachment,
   isLive,
 }) => {
   const [treeState, setTreeState] = React.useState<TreeState>({ expandedItems: new Map() });
@@ -59,6 +64,30 @@ export const ActionList: React.FC<ActionListProps> = ({
     return { selectedItem };
   }, [itemMap, selectedAction]);
 
+  const isError = React.useCallback((item: ActionTreeItem) => {
+    return !!item.action?.error?.message;
+  }, []);
+
+  const onAccepted = React.useCallback((item: ActionTreeItem) => {
+    return setSelectedTime({ minimum: item.action!.startTime, maximum: item.action!.endTime });
+  }, [setSelectedTime]);
+
+  const render = React.useCallback((item: ActionTreeItem) => {
+    return renderAction(item.action!, { sdkLanguage, revealConsole, revealAttachment, isLive, showDuration: true, showBadges: true });
+  }, [isLive, revealConsole, revealAttachment, sdkLanguage]);
+
+  const isVisible = React.useCallback((item: ActionTreeItem) => {
+    return !selectedTime || !item.action || (item.action!.startTime <= selectedTime.maximum && item.action!.endTime >= selectedTime.minimum);
+  }, [selectedTime]);
+
+  const onSelectedAction = React.useCallback((item: ActionTreeItem) => {
+    onSelected?.(item.action!);
+  }, [onSelected]);
+
+  const onHighlightedAction = React.useCallback((item: ActionTreeItem | undefined) => {
+    onHighlighted?.(item?.action);
+  }, [onHighlighted]);
+
   return <div className='vbox'>
     {selectedTime && <div className='action-list-show-all' onClick={() => setSelectedTime(undefined)}><span className='codicon codicon-triangle-left'></span>Show all</div>}
     <ActionTreeView
@@ -67,12 +96,12 @@ export const ActionList: React.FC<ActionListProps> = ({
       treeState={treeState}
       setTreeState={setTreeState}
       selectedItem={selectedItem}
-      onSelected={item => onSelected(item.action!)}
-      onHighlighted={item => onHighlighted(item?.action)}
-      onAccepted={item => setSelectedTime({ minimum: item.action!.startTime, maximum: item.action!.endTime })}
-      isError={item => !!item.action?.error?.message}
-      isVisible={item => !selectedTime || (item.action!.startTime <= selectedTime.maximum && item.action!.endTime >= selectedTime.minimum)}
-      render={item => renderAction(item.action!, { sdkLanguage, revealConsole, isLive, showDuration: true, showBadges: true })}
+      onSelected={onSelectedAction}
+      onHighlighted={onHighlightedAction}
+      onAccepted={onAccepted}
+      isError={isError}
+      isVisible={isVisible}
+      render={render}
     />
   </div>;
 };
@@ -82,14 +111,18 @@ export const renderAction = (
   options: {
     sdkLanguage?: Language,
     revealConsole?: () => void,
+    revealAttachment?(attachment: AfterActionTraceEventAttachment): void,
     isLive?: boolean,
     showDuration?: boolean,
     showBadges?: boolean,
   }) => {
-  const { sdkLanguage, revealConsole, isLive, showDuration, showBadges } = options;
+  const { sdkLanguage, revealConsole, revealAttachment, isLive, showDuration, showBadges } = options;
   const { errors, warnings } = modelUtil.stats(action);
-  const locator = action.params.selector ? asLocator(sdkLanguage || 'javascript', action.params.selector) : undefined;
+  const showAttachments = !!action.attachments?.length && !!revealAttachment;
 
+  const locator = action.params.selector ? asLocatorDescription(sdkLanguage || 'javascript', action.params.selector) : undefined;
+
+  const isSkipped = action.class === 'Test' && action.method === 'test.step' && action.annotations?.some(a => a.type === 'skip');
   let time: string = '';
   if (action.endTime)
     time = msToString(action.endTime - action.startTime);
@@ -97,27 +130,58 @@ export const renderAction = (
     time = 'Timed out';
   else if (!isLive)
     time = '-';
-  return <>
-    <div className='action-title' title={action.apiName}>
-      <span>{action.apiName}</span>
-      {locator && <div className='action-selector' title={locator}>{locator}</div>}
-      {action.method === 'goto' && action.params.url && <div className='action-url' title={action.params.url}>{action.params.url}</div>}
-      {action.class === 'APIRequestContext' && action.params.url && <div className='action-url' title={action.params.url}>{excludeOrigin(action.params.url)}</div>}
+  const { elements, title } = renderTitleForCall(action);
+  return <div className='action-title vbox'>
+    <div className='hbox'>
+      <span className='action-title-method' title={title}>{elements}</span>
+      {(showDuration || showBadges || showAttachments || isSkipped) && <div className='spacer'></div>}
+      {showAttachments && <ToolbarButton icon='attach' title='Open Attachment' onClick={() => revealAttachment(action.attachments![0])} />}
+      {showDuration && !isSkipped && <div className='action-duration'>{time || <span className='codicon codicon-loading'></span>}</div>}
+      {isSkipped && <span className={clsx('action-skipped', 'codicon', testStatusIcon('skipped'))} title='skipped'></span>}
+      {showBadges && <div className='action-icons' onClick={() => revealConsole?.()}>
+        {!!errors && <div className='action-icon'><span className='codicon codicon-error'></span><span className='action-icon-value'>{errors}</span></div>}
+        {!!warnings && <div className='action-icon'><span className='codicon codicon-warning'></span><span className='action-icon-value'>{warnings}</span></div>}
+      </div>}
     </div>
-    {(showDuration || showBadges) && <div className='spacer'></div>}
-    {showDuration && <div className='action-duration'>{time || <span className='codicon codicon-loading'></span>}</div>}
-    {showBadges && <div className='action-icons' onClick={() => revealConsole?.()}>
-      {!!errors && <div className='action-icon'><span className='codicon codicon-error'></span><span className='action-icon-value'>{errors}</span></div>}
-      {!!warnings && <div className='action-icon'><span className='codicon codicon-warning'></span><span className='action-icon-value'>{warnings}</span></div>}
-    </div>}
-  </>;
+    {locator && <div className='action-title-selector' title={locator}>{locator}</div>}
+  </div>;
 };
 
-function excludeOrigin(url: string): string {
-  try {
-    const urlObject = new URL(url);
-    return urlObject.pathname + urlObject.search;
-  } catch (error) {
-    return url;
+export function renderTitleForCall(action: ActionTraceEvent): { elements: React.ReactNode[], title: string } {
+  const titleFormat = action.title ?? methodMetainfo.get(action.class + '.' + action.method)?.title ?? action.method;
+
+  const elements: React.ReactNode[] = [];
+  const title: string[] = [];
+  let currentIndex = 0;
+  const regex = /\{([^}]+)\}/g;
+  let match;
+
+  while ((match = regex.exec(titleFormat)) !== null) {
+    const [fullMatch, quotedText] = match;
+    const chunk = titleFormat.slice(currentIndex, match.index);
+
+    elements.push(chunk);
+    title.push(chunk);
+
+    const param = formatProtocolParam(action.params, quotedText);
+    if (param === undefined) {
+      elements.push(fullMatch);
+      title.push(fullMatch);
+    } else if (match.index === 0) {
+      elements.push(param);
+      title.push(param);
+    } else {
+      elements.push(<span className='action-title-param'>{param}</span>);
+      title.push(param);
+    }
+    currentIndex = match.index + fullMatch.length;
   }
-}
\ No newline at end of file
+
+  if (currentIndex < titleFormat.length) {
+    const chunk = titleFormat.slice(currentIndex);
+    elements.push(chunk);
+    title.push(chunk);
+  }
+
+  return { elements, title: title.join('') };
+}
diff --git a/packages/trace-viewer/src/ui/contextSelector.css b/packages/trace-viewer/src/ui/annotationsTab.css
similarity index 65%
rename from packages/trace-viewer/src/ui/contextSelector.css
rename to packages/trace-viewer/src/ui/annotationsTab.css
index 7f11adaaa0bbf..c32cc6f63b8da 100644
--- a/packages/trace-viewer/src/ui/contextSelector.css
+++ b/packages/trace-viewer/src/ui/annotationsTab.css
@@ -14,17 +14,15 @@
   limitations under the License.
 */
 
-.context-selector {
-  min-width: 38px;
-  border: 1px solid transparent;
-  border-radius: 0;
-  padding: 0 13px 0 5px;
-  position: relative;
-  height: 22px;
-  align-self: center;
-  margin-right: 20px;
-  background: rgba(222, 222, 222, 0.3);
-  color: white;
-  border-radius: 3px;
-  outline: none !important;
+.annotations-tab {
+  flex: auto;
+  line-height: 24px;
+  white-space: pre;
+  overflow: auto;
+  user-select: text;
+}
+
+.annotation-item {
+  margin: 4px 8px;
+  text-wrap: wrap;
 }
diff --git a/packages/trace-viewer/src/ui/annotationsTab.tsx b/packages/trace-viewer/src/ui/annotationsTab.tsx
new file mode 100644
index 0000000000000..2a107c048c4b1
--- /dev/null
+++ b/packages/trace-viewer/src/ui/annotationsTab.tsx
@@ -0,0 +1,38 @@
+/**
+ * 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 * as React from 'react';
+import './annotationsTab.css';
+import { PlaceholderPanel } from './placeholderPanel';
+import { linkifyText } from '@web/renderUtils';
+import type { TestAnnotation } from '@playwright/test';
+
+export const AnnotationsTab: React.FunctionComponent<{
+  annotations: TestAnnotation[],
+}> = ({ annotations }) => {
+
+  if (!annotations.length)
+    return <PlaceholderPanel text='No annotations' />;
+
+  return <div className='annotations-tab'>
+    {annotations.map((annotation, i) => {
+      return <div className='annotation-item' key={`annotation-${i}`}>
+        <span style={{ fontWeight: 'bold' }}>{annotation.type}</span>
+        {annotation.description && <span>: {linkifyText(annotation.description)}</span>}
+      </div>;
+    })}
+  </div>;
+};
diff --git a/packages/trace-viewer/src/ui/attachmentsTab.css b/packages/trace-viewer/src/ui/attachmentsTab.css
index 66a94121b5ad8..7d487bb3f246c 100644
--- a/packages/trace-viewer/src/ui/attachmentsTab.css
+++ b/packages/trace-viewer/src/ui/attachmentsTab.css
@@ -26,19 +26,25 @@
   padding-left: 6px;
   font-weight: bold;
   text-transform: uppercase;
-  font-size: 10px;
+  font-size: 12px;
   color: var(--vscode-sideBarTitle-foreground);
   line-height: 24px;
 }
 
 .attachments-section:not(:first-child) {
   border-top: 1px solid var(--vscode-panel-border);
+  margin-top: 10px;
 }
 
 .attachment-item {
   margin: 4px 8px;
 }
 
+.attachment-title-highlight {
+  text-decoration: underline var(--vscode-terminal-findMatchBackground);
+  text-decoration-thickness: 1.5px;
+}
+
 .attachment-item img {
   flex: none;
   min-width: 200px;
@@ -49,3 +55,11 @@
 a.codicon-cloud-download:hover{
   background-color: var(--vscode-list-inactiveSelectionBackground)
 }
+
+.yellow-flash {
+  animation: yellowflash-bg 2s;
+}
+@keyframes yellowflash-bg {
+  from { background: var(--vscode-peekViewEditor-matchHighlightBackground); }
+  to   { background: transparent; }
+}
diff --git a/packages/trace-viewer/src/ui/attachmentsTab.tsx b/packages/trace-viewer/src/ui/attachmentsTab.tsx
index 22f63e3ba57be..fbe67b6d933a6 100644
--- a/packages/trace-viewer/src/ui/attachmentsTab.tsx
+++ b/packages/trace-viewer/src/ui/attachmentsTab.tsx
@@ -17,25 +17,36 @@
 import * as React from 'react';
 import './attachmentsTab.css';
 import { ImageDiffView } from '@web/shared/imageDiffView';
-import type { MultiTraceModel } from './modelUtil';
+import type { Attachment, MultiTraceModel } from './modelUtil';
 import { PlaceholderPanel } from './placeholderPanel';
 import type { AfterActionTraceEventAttachment } from '@trace/trace';
-import { CodeMirrorWrapper } from '@web/components/codeMirrorWrapper';
+import { CodeMirrorWrapper, lineHeight } from '@web/components/codeMirrorWrapper';
 import { isTextualMimeType } from '@isomorphic/mimeType';
 import { Expandable } from '@web/components/expandable';
-
-type Attachment = AfterActionTraceEventAttachment & { traceUrl: string };
+import { linkifyText } from '@web/renderUtils';
+import { clsx, useFlash } from '@web/uiUtils';
 
 type ExpandableAttachmentProps = {
   attachment: Attachment;
+  reveal?: any;
 };
 
-const ExpandableAttachment: React.FunctionComponent<ExpandableAttachmentProps> = ({ attachment }) => {
+const ExpandableAttachment: React.FunctionComponent<ExpandableAttachmentProps> = ({ attachment, reveal }) => {
   const [expanded, setExpanded] = React.useState(false);
   const [attachmentText, setAttachmentText] = React.useState<string | null>(null);
   const [placeholder, setPlaceholder] = React.useState<string | null>(null);
+  const [flash, triggerFlash] = useFlash();
+  const ref = React.useRef<HTMLSpanElement>(null);
 
   const isTextAttachment = isTextualMimeType(attachment.contentType);
+  const hasContent = !!attachment.sha1 || !!attachment.path;
+
+  React.useEffect(() => {
+    if (reveal) {
+      ref.current?.scrollIntoView({ behavior: 'smooth' });
+      return triggerFlash();
+    }
+  }, [reveal, triggerFlash]);
 
   React.useEffect(() => {
     if (expanded && attachmentText === null && placeholder === null) {
@@ -49,38 +60,43 @@ const ExpandableAttachment: React.FunctionComponent<ExpandableAttachmentProps> =
     }
   }, [expanded, attachmentText, placeholder, attachment]);
 
-  const title = <>
-    {attachment.name} <a style={{ marginLeft: 5 }} href={attachmentURL(attachment) + '&download'}>download</a>
-  </>;
+  const snippetHeight = React.useMemo(() => {
+    const lineCount = attachmentText ? attachmentText.split('\n').length : 0;
+    return Math.min(Math.max(5, lineCount), 20) * lineHeight;
+  }, [attachmentText]);
 
-  if (!isTextAttachment)
+  const title = <span style={{ marginLeft: 5 }} ref={ref} aria-label={attachment.name}>
+    <span>{linkifyText(attachment.name)}</span>
+    {hasContent && <a style={{ marginLeft: 5 }} href={downloadURL(attachment)}>download</a>}
+  </span>;
+
+  if (!isTextAttachment || !hasContent)
     return <div style={{ marginLeft: 20 }}>{title}</div>;
 
-  return <>
+  return <div className={clsx(flash && 'yellow-flash')}>
     <Expandable title={title} expanded={expanded} setExpanded={setExpanded} expandOnTitleClick={true}>
       {placeholder && <i>{placeholder}</i>}
     </Expandable>
-    {expanded && attachmentText !== null && <CodeMirrorWrapper
-      text={attachmentText}
-      readOnly
-      lineNumbers={true}
-      wrapLines={false}>
-    </CodeMirrorWrapper>}
-  </>;
+    {expanded && attachmentText !== null && <div className='vbox' style={{ height: snippetHeight }}>
+      <CodeMirrorWrapper
+        text={attachmentText}
+        readOnly
+        mimeType={attachment.contentType}
+        linkify={true}
+        lineNumbers={true}
+        wrapLines={false}>
+      </CodeMirrorWrapper>
+    </div>}
+  </div>;
 };
 
 export const AttachmentsTab: React.FunctionComponent<{
   model: MultiTraceModel | undefined,
-}> = ({ model }) => {
+  revealedAttachment?: [AfterActionTraceEventAttachment, number],
+}> = ({ model, revealedAttachment }) => {
   const { diffMap, screenshots, attachments } = React.useMemo(() => {
-    const attachments = new Set<Attachment>();
+    const attachments = new Set(model?.visibleAttachments ?? []);
     const screenshots = new Set<Attachment>();
-
-    for (const action of model?.actions || []) {
-      const traceUrl = action.context.traceUrl;
-      for (const attachment of action.attachments || [])
-        attachments.add({ ...attachment, traceUrl });
-    }
     const diffMap = new Map<string, { expected: Attachment | undefined, actual: Attachment | undefined, diff: Attachment | undefined }>();
 
     for (const attachment of attachments) {
@@ -93,8 +109,8 @@ export const AttachmentsTab: React.FunctionComponent<{
         const entry = diffMap.get(name) || { expected: undefined, actual: undefined, diff: undefined };
         entry[type] = attachment;
         diffMap.set(name, entry);
-      }
-      if (attachment.contentType.startsWith('image/')) {
+        attachments.delete(attachment);
+      } else if (attachment.contentType.startsWith('image/')) {
         screenshots.add(attachment);
         attachments.delete(attachment);
       }
@@ -109,11 +125,11 @@ export const AttachmentsTab: React.FunctionComponent<{
     {[...diffMap.values()].map(({ expected, actual, diff }) => {
       return <>
         {expected && actual && <div className='attachments-section'>Image diff</div>}
-        {expected && actual && <ImageDiffView diff={{
+        {expected && actual && <ImageDiffView noTargetBlank={true} diff={{
           name: 'Image diff',
-          expected: { attachment: { ...expected, path: attachmentURL(expected) }, title: 'Expected' },
-          actual: { attachment: { ...actual, path: attachmentURL(actual) } },
-          diff: diff ? { attachment: { ...diff, path: attachmentURL(diff) } } : undefined,
+          expected: { attachment: { ...expected, path: downloadURL(expected) }, title: 'Expected' },
+          actual: { attachment: { ...actual, path: downloadURL(actual) } },
+          diff: diff ? { attachment: { ...diff, path: downloadURL(diff) } } : undefined,
         }} />}
       </>;
     })}
@@ -122,20 +138,42 @@ export const AttachmentsTab: React.FunctionComponent<{
       const url = attachmentURL(a);
       return <div className='attachment-item' key={`screenshot-${i}`}>
         <div><img draggable='false' src={url} /></div>
-        <div><a target='_blank' href={url}>{a.name}</a></div>
+        <div><a target='_blank' href={url} rel='noreferrer'>{a.name}</a></div>
       </div>;
     })}
     {attachments.size ? <div className='attachments-section'>Attachments</div> : undefined}
     {[...attachments.values()].map((a, i) => {
-      return <div className='attachment-item' key={`attachment-${i}`}>
-        <ExpandableAttachment attachment={a} />
+      return <div className='attachment-item' key={attachmentKey(a, i)}>
+        <ExpandableAttachment
+          attachment={a}
+          reveal={(!!revealedAttachment && isEqualAttachment(a, revealedAttachment[0])) ? revealedAttachment : undefined}
+        />
       </div>;
     })}
   </div>;
 };
 
-function attachmentURL(attachment: Attachment) {
-  if (attachment.sha1)
-    return 'sha1/' + attachment.sha1 + '?trace=' + encodeURIComponent(attachment.traceUrl);
-  return 'file?path=' + encodeURIComponent(attachment.path!);
+function isEqualAttachment(a: Attachment, b: AfterActionTraceEventAttachment): boolean {
+  return a.name === b.name && a.path === b.path && a.sha1 === b.sha1;
+}
+
+export function attachmentURL(attachment: Attachment, queryParams: Record<string, string> = {}) {
+  const params = new URLSearchParams(queryParams);
+  if (attachment.sha1) {
+    params.set('trace', attachment.traceUrl);
+    return 'sha1/' + attachment.sha1 + '?' + params.toString();
+  }
+  params.set('path', attachment.path!);
+  return 'file?' + params.toString();
+}
+
+function downloadURL(attachment: Attachment) {
+  const params = { dn: attachment.name } as Record<string, string>;
+  if (attachment.contentType)
+    params.dct = attachment.contentType;
+  return attachmentURL(attachment, params);
+}
+
+function attachmentKey(attachment: Attachment, index: number) {
+  return index + '-' + (attachment.sha1 ? `sha1-` + attachment.sha1 : `path-` + attachment.path);
 }
diff --git a/packages/trace-viewer/src/ui/browserFrame.css b/packages/trace-viewer/src/ui/browserFrame.css
index 9293e1a1d82bf..e4fbdfdd4c432 100644
--- a/packages/trace-viewer/src/ui/browserFrame.css
+++ b/packages/trace-viewer/src/ui/browserFrame.css
@@ -34,6 +34,16 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  display: flex;
+  align-items: center;
+}
+
+.browser-frame-address-bar > button {
+  visibility: hidden;
+}
+
+.browser-frame-address-bar:hover > button {
+  visibility: visible;
 }
 
 .browser-frame-menu-bar {
diff --git a/packages/trace-viewer/src/ui/browserFrame.tsx b/packages/trace-viewer/src/ui/browserFrame.tsx
index 53cece1c8f265..20dac3e1343f0 100644
--- a/packages/trace-viewer/src/ui/browserFrame.tsx
+++ b/packages/trace-viewer/src/ui/browserFrame.tsx
@@ -16,17 +16,26 @@
 
 import './browserFrame.css';
 import * as React from 'react';
+import { CopyToClipboard } from './copyToClipboard';
 
 export const BrowserFrame: React.FunctionComponent<{
   url?: string,
-}> = ({ url }) => {
+}> = ({ url }): React.ReactElement => {
   return <div className='browser-frame-header'>
     <div style={{ whiteSpace: 'nowrap' }}>
       <span className='browser-frame-dot' style={{ backgroundColor: 'rgb(242, 95, 88)' }}></span>
       <span className='browser-frame-dot' style={{ backgroundColor: 'rgb(251, 190, 60)' }}></span>
       <span className='browser-frame-dot' style={{ backgroundColor: 'rgb(88, 203, 66)' }}></span>
     </div>
-    <div className='browser-frame-address-bar' title={url || 'about:blank'}>{url || 'about:blank'}</div>
+    <div
+      className='browser-frame-address-bar'
+      title={url || 'about:blank'}
+    >
+      {url || 'about:blank'}
+      {url && (
+        <CopyToClipboard value={url} />
+      )}
+    </div>
     <div style={{ marginLeft: 'auto' }}>
       <div>
         <span className='browser-frame-menu-bar'></span>
diff --git a/packages/trace-viewer/src/ui/callTab.css b/packages/trace-viewer/src/ui/callTab.css
index 3bca9f71411b9..f57f3f1529938 100644
--- a/packages/trace-viewer/src/ui/callTab.css
+++ b/packages/trace-viewer/src/ui/callTab.css
@@ -36,6 +36,8 @@
 
 .call-section {
   padding-left: 6px;
+  padding-top: 2px;
+  margin-top: 2px;
   font-weight: bold;
   text-transform: uppercase;
   font-size: 10px;
@@ -53,18 +55,18 @@
   align-items: center;
   text-overflow: ellipsis;
   overflow: hidden;
-  line-height: 18px;
+  line-height: 20px;
   white-space: nowrap;
 }
 
-.call-line .copy-icon {
+.call-line:not(:hover) .toolbar-button.copy {
   display: none;
-  margin-left: 5px;
 }
 
-.call-line:hover .copy-icon {
-  display: block;
-  cursor: pointer;
+.call-line .toolbar-button.copy {
+  margin-left: 5px;
+  margin-top: -2px;
+  margin-bottom: -2px;
 }
 
 .call-value {
diff --git a/packages/trace-viewer/src/ui/callTab.tsx b/packages/trace-viewer/src/ui/callTab.tsx
index b7cd7a8581d91..94f1938ebf1e5 100644
--- a/packages/trace-viewer/src/ui/callTab.tsx
+++ b/packages/trace-viewer/src/ui/callTab.tsx
@@ -16,7 +16,7 @@
 
 import type { SerializedValue } from '@protocol/channels';
 import type { ActionTraceEvent } from '@trace/trace';
-import { msToString } from '@web/uiUtils';
+import { clsx, msToString } from '@web/uiUtils';
 import * as React from 'react';
 import './callTab.css';
 import { CopyToClipboard } from './copyToClipboard';
@@ -27,51 +27,67 @@ import type { ActionTraceEventInContext } from './modelUtil';
 
 export const CallTab: React.FunctionComponent<{
   action: ActionTraceEventInContext | undefined,
+  startTimeOffset: number,
   sdkLanguage: Language | undefined,
-}> = ({ action, sdkLanguage }) => {
+}> = ({ action, startTimeOffset, sdkLanguage }) => {
+  // We never need the waitForEventInfo (`info`).
+  const paramKeys = React.useMemo(() => Object.keys(action?.params ?? {}).filter(name => name !== 'info'), [action]);
+
   if (!action)
     return <PlaceholderPanel text='No action selected' />;
-  const params = { ...action.params };
-  // Strip down the waitForEventInfo data, we never need it.
-  delete params.info;
-  const paramKeys = Object.keys(params);
-  const timeMillis = action.startTime + (action.context.wallTime - action.context.startTime);
-  const wallTime = new Date(timeMillis).toLocaleString();
-  const duration = action.endTime ? msToString(action.endTime - action.startTime) : 'Timed Out';
 
-  return <div className='call-tab'>
-    <div className='call-line'>{action.apiName}</div>
-    {<>
+  // Calculate execution time relative to the test runner's start time
+  const startTimeMillis = action.startTime - startTimeOffset;
+  const startTime = msToString(startTimeMillis);
+
+  return (
+    <div className='call-tab'>
+      <div className='call-line'>{action.title}</div>
       <div className='call-section'>Time</div>
-      {wallTime && <div className='call-line'>wall time:<span className='call-value datetime' title={wallTime}>{wallTime}</span></div>}
-      <div className='call-line'>duration:<span className='call-value datetime' title={duration}>{duration}</span></div>
-    </>}
-    { !!paramKeys.length && <div className='call-section'>Parameters</div> }
-    {
-      !!paramKeys.length && paramKeys.map((name, index) => renderProperty(propertyToString(action, name, params[name], sdkLanguage), 'param-' + index))
-    }
-    { !!action.result && <div className='call-section'>Return value</div> }
-    {
-      !!action.result && Object.keys(action.result).map((name, index) =>
-        renderProperty(propertyToString(action, name, action.result[name], sdkLanguage), 'result-' + index)
-      )
-    }
-  </div>;
+      <DateTimeCallLine name='start:' value={startTime} />
+      <DateTimeCallLine name='duration:' value={renderDuration(action)} />
+      {
+        !!paramKeys.length && <>
+          <div className='call-section'>Parameters</div>
+          {paramKeys.map(name => renderProperty(propertyToString(action, name, action.params[name], sdkLanguage)))}
+        </>
+      }
+      {
+        !!action.result && <>
+          <div className='call-section'>Return value</div>
+          {Object.keys(action.result).map(name =>
+            renderProperty(propertyToString(action, name, action.result[name], sdkLanguage))
+          )}
+        </>
+      }
+    </div>
+  );
 };
 
+const DateTimeCallLine: React.FC<{ name: string, value: string }> = ({ name, value }) => <div className='call-line'>{name}<span className='call-value datetime' title={value}>{value}</span></div>;
+
 type Property = {
   name: string;
   type: 'string' | 'number' | 'object' | 'locator' | 'handle' | 'bigint' | 'boolean' | 'symbol' | 'undefined' | 'function';
   text: string;
 };
 
-function renderProperty(property: Property, key: string) {
+function renderDuration(action: ActionTraceEventInContext): string {
+  if (action.endTime)
+    return msToString(action.endTime - action.startTime);
+  else if (!!action.error)
+    return 'Timed Out';
+  else
+    return 'Running';
+}
+
+function renderProperty(property: Property) {
   let text = property.text.replace(/\n/g, '↵');
   if (property.type === 'string')
     text = `"${text}"`;
   return (
-    <div key={key} className='call-line'>
-      {property.name}:<span className={`call-value ${property.type}`} title={property.text}>{text}</span>
+    <div key={property.name} className='call-line'>
+      {property.name}:<span className={clsx('call-value', property.type)} title={property.text}>{text}</span>
       { ['string', 'number', 'object', 'locator'].includes(property.type) &&
         <CopyToClipboard value={property.text} />
       }
diff --git a/packages/trace-viewer/src/ui/clickPointer.tsx b/packages/trace-viewer/src/ui/clickPointer.tsx
new file mode 100644
index 0000000000000..862f6522eab38
--- /dev/null
+++ b/packages/trace-viewer/src/ui/clickPointer.tsx
@@ -0,0 +1,48 @@
+/**
+ * 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 function ClickPointer({ point }: { point: { x: number; y: number } }) {
+  return (
+    <div
+      style={{
+        position: 'fixed',
+        backgroundColor: '#f44336',
+        width: '20px',
+        height: '20px',
+        borderRadius: '10px',
+        margin: '-10px 0 0 -10px',
+        zIndex: 2147483646,
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        left: `${point.x}px`,
+        top: `${point.y}px`,
+      }}
+    >
+      <div
+        style={{
+          fontSize: '19px',
+          color: 'white',
+          marginTop: '-3.5px',
+          userSelect: 'none'
+        }}
+        title='Click positions on screenshots are inaccurate.'
+      >
+        ⚠
+      </div>
+    </div>
+  );
+}
diff --git a/packages/trace-viewer/src/ui/codegen.ts b/packages/trace-viewer/src/ui/codegen.ts
new file mode 100644
index 0000000000000..2d77177a0a863
--- /dev/null
+++ b/packages/trace-viewer/src/ui/codegen.ts
@@ -0,0 +1,302 @@
+/**
+ * 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 { Language } from '@isomorphic/locatorGenerators';
+import type * as har from '@trace/har';
+
+interface APIRequestCodegen {
+  generatePlaywrightRequestCall(request: har.Request, body: string | undefined): string;
+}
+
+class JSCodeGen implements APIRequestCodegen {
+  generatePlaywrightRequestCall(request: har.Request, body: string | undefined): string {
+    let method = request.method.toLowerCase();
+    const url = new URL(request.url);
+    const urlParam = `${url.origin}${url.pathname}`;
+    const options: any = {};
+    if (!['delete', 'get', 'head', 'post', 'put', 'patch'].includes(method)) {
+      options.method = method;
+      method = 'fetch';
+    }
+    if (url.searchParams.size)
+      options.params = Object.fromEntries(url.searchParams.entries());
+    if (body)
+      options.data = body;
+    if (request.headers.length)
+      options.headers = Object.fromEntries(request.headers.map(header => [header.name, header.value]));
+
+    const params = [`'${urlParam}'`];
+    const hasOptions = Object.keys(options).length > 0;
+    if (hasOptions)
+      params.push(this.prettyPrintObject(options));
+    return `await page.request.${method}(${params.join(', ')});`;
+  }
+
+  private prettyPrintObject(obj: any, indent = 2, level = 0): string {
+    // Handle null and undefined
+    if (obj === null)
+      return 'null';
+    if (obj === undefined)
+      return 'undefined';
+
+    // Handle primitive types
+    if (typeof obj !== 'object') {
+      if (typeof obj === 'string')
+        return this.stringLiteral(obj);
+      return String(obj);
+    }
+
+    // Handle arrays
+    if (Array.isArray(obj)) {
+      if (obj.length === 0)
+        return '[]';
+      const spaces = ' '.repeat(level * indent);
+      const nextSpaces = ' '.repeat((level + 1) * indent);
+
+      const items = obj.map(item =>
+        `${nextSpaces}${this.prettyPrintObject(item, indent, level + 1)}`
+      ).join(',\n');
+
+      return `[\n${items}\n${spaces}]`;
+    }
+
+    // Handle regular objects
+    if (Object.keys(obj).length === 0)
+      return '{}';
+    const spaces = ' '.repeat(level * indent);
+    const nextSpaces = ' '.repeat((level + 1) * indent);
+
+    const entries = Object.entries(obj).map(([key, value]) => {
+      const formattedValue = this.prettyPrintObject(value, indent, level + 1);
+      // Handle keys that need quotes
+      const formattedKey = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key) ?
+        key :
+        this.stringLiteral(key);
+      return `${nextSpaces}${formattedKey}: ${formattedValue}`;
+    }).join(',\n');
+
+    return `{\n${entries}\n${spaces}}`;
+  }
+
+  private stringLiteral(v: string): string {
+    v = v.replace(/\\/g, '\\\\').replace(/'/g, '\\\'');
+    if (v.includes('\n') || v.includes('\r') || v.includes('\t'))
+      return '`' + v + '`';
+    return `'${v}'`;
+  }
+}
+
+class PythonCodeGen implements APIRequestCodegen {
+  generatePlaywrightRequestCall(request: har.Request, body: string | undefined): string {
+    const url = new URL(request.url);
+    const urlParam = `${url.origin}${url.pathname}`;
+    const params: string[] = [`"${urlParam}"`];
+
+
+    let method = request.method.toLowerCase();
+    if (!['delete', 'get', 'head', 'post', 'put', 'patch'].includes(method)) {
+      params.push(`method="${method}"`);
+      method = 'fetch';
+    }
+
+    if (url.searchParams.size)
+      params.push(`params=${this.prettyPrintObject(Object.fromEntries(url.searchParams.entries()))}`);
+    if (body)
+      params.push(`data=${this.prettyPrintObject(body)}`);
+    if (request.headers.length)
+      params.push(`headers=${this.prettyPrintObject(Object.fromEntries(request.headers.map(header => [header.name, header.value])))}`);
+
+    const paramsString = params.length === 1 ? params[0] : `\n${params.map(p => this.indent(p, 2)).join(',\n')}\n`;
+    return `await page.request.${method}(${paramsString})`;
+  }
+
+  private indent(v: string, level: number): string {
+    return v.split('\n').map(s => ' '.repeat(level) + s).join('\n');
+  }
+
+  private prettyPrintObject(obj: any, indent = 2, level = 0): string {
+    // Handle null and undefined
+    if (obj === null)
+      return 'None';
+    if (obj === undefined)
+      return 'None';
+
+    // Handle primitive types
+    if (typeof obj !== 'object') {
+      if (typeof obj === 'string')
+        return this.stringLiteral(obj);
+      if (typeof obj === 'boolean')
+        return obj ? 'True' : 'False';
+      return String(obj);
+    }
+
+    // Handle arrays
+    if (Array.isArray(obj)) {
+      if (obj.length === 0)
+        return '[]';
+      const spaces = ' '.repeat(level * indent);
+      const nextSpaces = ' '.repeat((level + 1) * indent);
+
+      const items = obj.map(item =>
+        `${nextSpaces}${this.prettyPrintObject(item, indent, level + 1)}`
+      ).join(',\n');
+
+      return `[\n${items}\n${spaces}]`;
+    }
+
+    // Handle regular objects
+    if (Object.keys(obj).length === 0)
+      return '{}';
+    const spaces = ' '.repeat(level * indent);
+    const nextSpaces = ' '.repeat((level + 1) * indent);
+
+    const entries = Object.entries(obj).map(([key, value]) => {
+      const formattedValue = this.prettyPrintObject(value, indent, level + 1);
+      return `${nextSpaces}${this.stringLiteral(key)}: ${formattedValue}`;
+    }).join(',\n');
+
+    return `{\n${entries}\n${spaces}}`;
+  }
+
+  private stringLiteral(v: string): string {
+    return JSON.stringify(v);
+  }
+}
+
+class CSharpCodeGen implements APIRequestCodegen {
+  generatePlaywrightRequestCall(request: har.Request, body: string | undefined): string {
+    const url = new URL(request.url);
+    const urlParam = `${url.origin}${url.pathname}`;
+    const options: any = {};
+
+    const initLines: string[] = [];
+
+    let method = request.method.toLowerCase();
+    if (!['delete', 'get', 'head', 'post', 'put', 'patch'].includes(method)) {
+      options.Method = method;
+      method = 'fetch';
+    }
+
+    if (url.searchParams.size)
+      options.Params = Object.fromEntries(url.searchParams.entries());
+    if (body)
+      options.Data = body;
+    if (request.headers.length)
+      options.Headers = Object.fromEntries(request.headers.map(header => [header.name, header.value]));
+
+    const params = [`"${urlParam}"`];
+    const hasOptions = Object.keys(options).length > 0;
+    if (hasOptions)
+      params.push(this.prettyPrintObject(options));
+
+    return `${initLines.join('\n')}${initLines.length ? '\n' : ''}await request.${this.toFunctionName(method)}(${params.join(', ')});`;
+  }
+
+  private toFunctionName(method: string): string {
+    return method[0].toUpperCase() + method.slice(1) + 'Async';
+  }
+
+  private prettyPrintObject(obj: any, indent = 2, level = 0): string {
+    // Handle null and undefined
+    if (obj === null)
+      return 'null';
+    if (obj === undefined)
+      return 'null';
+
+    // Handle primitive types
+    if (typeof obj !== 'object') {
+      if (typeof obj === 'string')
+        return this.stringLiteral(obj);
+      if (typeof obj === 'boolean')
+        return obj ? 'true' : 'false';
+      return String(obj);
+    }
+
+    // Handle arrays
+    if (Array.isArray(obj)) {
+      if (obj.length === 0)
+        return 'new object[] {}';
+      const spaces = ' '.repeat(level * indent);
+      const nextSpaces = ' '.repeat((level + 1) * indent);
+
+      const items = obj.map(item =>
+        `${nextSpaces}${this.prettyPrintObject(item, indent, level + 1)}`
+      ).join(',\n');
+
+      return `new object[] {\n${items}\n${spaces}}`;
+    }
+
+    // Handle regular objects
+    if (Object.keys(obj).length === 0)
+      return 'new {}';
+    const spaces = ' '.repeat(level * indent);
+    const nextSpaces = ' '.repeat((level + 1) * indent);
+
+    const entries = Object.entries(obj).map(([key, value]) => {
+      const formattedValue = this.prettyPrintObject(value, indent, level + 1);
+      const formattedKey = level === 0 ? key : `[${this.stringLiteral(key)}]`;
+      return `${nextSpaces}${formattedKey} = ${formattedValue}`;
+    }).join(',\n');
+
+    return `new() {\n${entries}\n${spaces}}`;
+  }
+
+  private stringLiteral(v: string): string {
+    return JSON.stringify(v);
+  }
+}
+
+class JavaCodeGen implements APIRequestCodegen {
+  generatePlaywrightRequestCall(request: har.Request, body: string | undefined): string {
+    const url = new URL(request.url);
+    const params = [`"${url.origin}${url.pathname}"`];
+
+    const options: string[] = [];
+
+    let method = request.method.toLowerCase();
+    if (!['delete', 'get', 'head', 'post', 'put', 'patch'].includes(method)) {
+      options.push(`setMethod("${method}")`);
+      method = 'fetch';
+    }
+
+    for (const [key, value] of url.searchParams)
+      options.push(`setQueryParam(${this.stringLiteral(key)}, ${this.stringLiteral(value)})`);
+    if (body)
+      options.push(`setData(${this.stringLiteral(body)})`);
+    for (const header of request.headers)
+      options.push(`setHeader(${this.stringLiteral(header.name)}, ${this.stringLiteral(header.value)})`);
+
+    if (options.length > 0)
+      params.push(`RequestOptions.create()\n  .${options.join('\n  .')}\n`);
+    return `request.${method}(${params.join(', ')});`;
+  }
+
+  private stringLiteral(v: string): string {
+    return JSON.stringify(v);
+  }
+}
+
+export function getAPIRequestCodeGen(language: Language): APIRequestCodegen {
+  if (language === 'javascript')
+    return new JSCodeGen();
+  if (language === 'python')
+    return new PythonCodeGen();
+  if (language === 'csharp')
+    return new CSharpCodeGen();
+  if (language === 'java')
+    return new JavaCodeGen();
+  throw new Error('Unsupported language: ' + language);
+}
diff --git a/packages/trace-viewer/src/ui/consoleTab.css b/packages/trace-viewer/src/ui/consoleTab.css
index 3c31395001cdc..391b181beee8d 100644
--- a/packages/trace-viewer/src/ui/consoleTab.css
+++ b/packages/trace-viewer/src/ui/consoleTab.css
@@ -83,3 +83,16 @@
 .console-line .codicon.status-warning::after {
   background-color: var(--vscode-list-warningForeground);
 }
+
+.console-repeat {
+  display: inline-block;
+  padding: 0 2px;
+  font-size: 12px;
+  line-height: 18px;
+  border-radius: 6px;
+  background-color: #8c959f;
+  color: white;
+  margin-right: 10px;
+  flex: none;
+  font-weight: 600;
+}
diff --git a/packages/trace-viewer/src/ui/consoleTab.tsx b/packages/trace-viewer/src/ui/consoleTab.tsx
index 882419ae384d4..d8e9ec51e0811 100644
--- a/packages/trace-viewer/src/ui/consoleTab.tsx
+++ b/packages/trace-viewer/src/ui/consoleTab.tsx
@@ -19,14 +19,15 @@ import * as React from 'react';
 import './consoleTab.css';
 import type * as modelUtil from './modelUtil';
 import { ListView } from '@web/components/listView';
-import type { Boundaries } from '../geometry';
-import { msToString } from '@web/uiUtils';
+import type { Boundaries } from './geometry';
+import { clsx, msToString } from '@web/uiUtils';
 import { ansi2html } from '@web/ansi2html';
 import { PlaceholderPanel } from './placeholderPanel';
 
 export type ConsoleEntry = {
   browserMessage?: {
     body: JSX.Element[];
+    bodyString: string;
     location: string;
   },
   browserError?: channels.SerializedError;
@@ -36,6 +37,7 @@ export type ConsoleEntry = {
   isError: boolean;
   isWarning: boolean;
   timestamp: number;
+  repeat: number;
 };
 
 type ConsoleTabModel = {
@@ -50,16 +52,38 @@ export function useConsoleTabModel(model: modelUtil.MultiTraceModel | undefined,
     if (!model)
       return { entries: [] };
     const entries: ConsoleEntry[] = [];
-    for (const event of model.events) {
+    function addEntry(entry: Omit<ConsoleEntry, 'repeat'>) {
+      const lastEntry = entries[entries.length - 1];
+      const isSameAsLast =
+        lastEntry
+        && entry.browserMessage?.bodyString === lastEntry.browserMessage?.bodyString
+        && entry.browserMessage?.location === lastEntry.browserMessage?.location
+        && entry.browserError === lastEntry.browserError
+        && entry.nodeMessage?.html === lastEntry.nodeMessage?.html
+        && entry.isError === lastEntry.isError
+        && entry.isWarning === lastEntry.isWarning
+        && entry.timestamp - lastEntry.timestamp < 1000;
+      if (isSameAsLast)
+        lastEntry.repeat++;
+      else
+        entries.push({ ...entry, repeat: 1 });
+    }
+    const logEvents = [...model.events, ...model.stdio].sort((a, b) => {
+      const aTimestamp = 'time' in a ? a.time : a.timestamp;
+      const bTimestamp = 'time' in b ? b.time : b.timestamp;
+      return aTimestamp - bTimestamp;
+    });
+    for (const event of logEvents) {
       if (event.type === 'console') {
         const body = event.args && event.args.length ? format(event.args) : formatAnsi(event.text);
         const url = event.location.url;
         const filename = url ? url.substring(url.lastIndexOf('/') + 1) : '<anonymous>';
         const location = `${filename}:${event.location.lineNumber}`;
 
-        entries.push({
+        addEntry({
           browserMessage: {
             body,
+            bodyString: event.text,
             location,
           },
           isError: event.messageType === 'error',
@@ -68,29 +92,28 @@ export function useConsoleTabModel(model: modelUtil.MultiTraceModel | undefined,
         });
       }
       if (event.type === 'event' && event.method === 'pageError') {
-        entries.push({
+        addEntry({
           browserError: event.params.error,
           isError: true,
           isWarning: false,
           timestamp: event.time,
         });
       }
+      if (event.type === 'stderr' || event.type === 'stdout') {
+        let html = '';
+        if (event.text)
+          html = ansi2html(event.text.trim()) || '';
+        if (event.base64)
+          html = ansi2html(atob(event.base64).trim()) || '';
+
+        addEntry({
+          nodeMessage: { html },
+          isError: event.type === 'stderr',
+          isWarning: false,
+          timestamp: event.timestamp,
+        });
+      }
     }
-    for (const event of model.stdio) {
-      let html = '';
-      if (event.text)
-        html = ansi2html(event.text.trim()) || '';
-      if (event.base64)
-        html = ansi2html(atob(event.base64).trim()) || '';
-
-      entries.push({
-        nodeMessage: { html },
-        isError: event.type === 'stderr',
-        isWarning: false,
-        timestamp: event.timestamp,
-      });
-    }
-    entries.sort((a, b) => a.timestamp - b.timestamp);
     return { entries };
   }, [model]);
 
@@ -106,9 +129,9 @@ export function useConsoleTabModel(model: modelUtil.MultiTraceModel | undefined,
 export const ConsoleTab: React.FunctionComponent<{
   boundaries: Boundaries,
   consoleModel: ConsoleTabModel,
-  selectedTime: Boundaries | undefined,
-  onEntryHovered: (entry: ConsoleEntry | undefined) => void,
-  onAccepted: (entry: ConsoleEntry) => void,
+  selectedTime?: Boundaries | undefined,
+  onEntryHovered?: (entry: ConsoleEntry | undefined) => void,
+  onAccepted?: (entry: ConsoleEntry) => void,
 }> = ({ consoleModel, boundaries, onEntryHovered, onAccepted }) => {
   if (!consoleModel.entries.length)
     return <PlaceholderPanel text='No console entries' />;
@@ -124,8 +147,8 @@ export const ConsoleTab: React.FunctionComponent<{
       render={entry => {
         const timestamp = msToString(entry.timestamp - boundaries.minimum);
         const timestampElement = <span className='console-time'>{timestamp}</span>;
-        const errorSuffix = entry.isError ? ' status-error' : entry.isWarning ? ' status-warning' : ' status-none';
-        const statusElement = entry.browserMessage || entry.browserError ? <span className={'codicon codicon-browser' + errorSuffix} title='Browser message'></span> : <span className={'codicon codicon-file' + errorSuffix} title='Runner message'></span>;
+        const errorSuffix = entry.isError ? 'status-error' : entry.isWarning ? 'status-warning' : 'status-none';
+        const statusElement = entry.browserMessage || entry.browserError ? <span className={clsx('codicon', 'codicon-browser', errorSuffix)} title='Browser message'></span> : <span className={clsx('codicon', 'codicon-file', errorSuffix)} title='Runner message'></span>;
         let locationText: string | undefined;
         let messageBody: JSX.Element[] | string | undefined;
         let messageInnerHTML: string | undefined;
@@ -154,6 +177,7 @@ export const ConsoleTab: React.FunctionComponent<{
           {timestampElement}
           {statusElement}
           {locationText && <span className='console-location'>{locationText}</span>}
+          {entry.repeat > 1 && <span className='console-repeat'>{entry.repeat}</span>}
           {messageBody && <span className='console-line-message'>{messageBody}</span>}
           {messageInnerHTML && <span className='console-line-message' dangerouslySetInnerHTML={{ __html: messageInnerHTML }}></span>}
           {messageStack && <div className='console-stack'>{messageStack}</div>}
@@ -176,43 +200,44 @@ function format(args: { preview: string, value: any }[]): JSX.Element[] {
   let match;
   const formatted: JSX.Element[] = [];
   let tokens: JSX.Element[] = [];
-  formatted.push(<span>{tokens}</span>);
+  formatted.push(<span key={formatted.length + 1}>{tokens}</span>);
   let formatIndex = 0;
   while ((match = regex.exec(messageFormat)) !== null) {
     const text = messageFormat.substring(formatIndex, match.index);
-    tokens.push(<span>{text}</span>);
+    tokens.push(<span key={tokens.length + 1}>{text}</span>);
     formatIndex = match.index + 2;
     const specifier = match[0][1];
     if (specifier === '%') {
-      tokens.push(<span>%</span>);
+      tokens.push(<span key={tokens.length + 1}>%</span>);
     } else if (specifier === 's' || specifier === 'o' || specifier === 'O' || specifier === 'd' || specifier === 'i' || specifier === 'f') {
       const value = tail[argIndex++];
       const styleObject: any = {};
       if (typeof value?.value !== 'string')
         styleObject['color'] = 'var(--vscode-debugTokenExpression-number)';
-      tokens.push(<span style={styleObject}>{value?.preview || ''}</span>);
+      tokens.push(<span key={tokens.length + 1} style={styleObject}>{value?.preview || ''}</span>);
     } else if (specifier === 'c') {
       tokens = [];
       const format = tail[argIndex++];
       const styleObject = format ? parseCSSStyle(format.preview) : {};
-      formatted.push(<span style={styleObject}>{tokens}</span>);
+      formatted.push(<span key={formatted.length + 1} style={styleObject}>{tokens}</span>);
     }
   }
   if (formatIndex < messageFormat.length)
-    tokens.push(<span>{messageFormat.substring(formatIndex)}</span>);
+    tokens.push(<span key={tokens.length + 1}>{messageFormat.substring(formatIndex)}</span>);
   for (; argIndex < tail.length; argIndex++) {
     const value = tail[argIndex];
     const styleObject: any = {};
     if (tokens.length)
-      tokens.push(<span> </span>);
+      tokens.push(<span key={tokens.length + 1}> </span>);
     if (typeof value?.value !== 'string')
       styleObject['color'] = 'var(--vscode-debugTokenExpression-number)';
-    tokens.push(<span style={styleObject}>{value?.preview || ''}</span>);
+    tokens.push(<span key={tokens.length + 1} style={styleObject}>{value?.preview || ''}</span>);
   }
   return formatted;
 }
 
 function formatAnsi(text: string): JSX.Element[] {
+  // eslint-disable-next-line react/jsx-key
   return [<span dangerouslySetInnerHTML={{ __html: ansi2html(text.trim()) }}></span>];
 }
 
diff --git a/packages/trace-viewer/src/ui/contextSelector.tsx b/packages/trace-viewer/src/ui/contextSelector.tsx
deleted file mode 100644
index 2021b6217cf36..0000000000000
--- a/packages/trace-viewer/src/ui/contextSelector.tsx
+++ /dev/null
@@ -1,40 +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 * as React from 'react';
-import './contextSelector.css';
-
-export const ContextSelector: React.FunctionComponent<{
-  debugNames: string[],
-  debugName: string,
-  onChange: (debugName: string) => void,
-}> = ({ debugNames, debugName, onChange }) => {
-  return (
-    <select
-      className='context-selector'
-      style={{
-        visibility: debugNames.length <= 1 ? 'hidden' : 'visible',
-      }}
-      value={debugName}
-      onChange={e => {
-        const newIndex = e.target.selectedIndex;
-        onChange(debugNames[newIndex]);
-      }}
-    >
-      {debugNames.map(debugName => <option value={debugName} key={debugName}>{debugName}</option>)}
-    </select>
-  );
-};
diff --git a/packages/trace-viewer/embedded.html b/packages/trace-viewer/src/ui/copyToClipboard.css
similarity index 63%
rename from packages/trace-viewer/embedded.html
rename to packages/trace-viewer/src/ui/copyToClipboard.css
index 7d0fd2f17525e..08e6d26da1cfc 100644
--- a/packages/trace-viewer/embedded.html
+++ b/packages/trace-viewer/src/ui/copyToClipboard.css
@@ -1,4 +1,4 @@
-<!--
+/*
   Copyright (c) Microsoft Corporation.
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,16 +12,11 @@
   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.
--->
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Playwright Trace Viewer for VS Code</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/embedded.tsx"></script>
-  </body>
-</html>
+*/
+
+.copy-to-clipboard-text-button {
+  background-color: var(--vscode-editor-inactiveSelectionBackground);
+  border: none;
+  padding: 4px 12px;
+  cursor: pointer;
+}
\ No newline at end of file
diff --git a/packages/trace-viewer/src/ui/copyToClipboard.tsx b/packages/trace-viewer/src/ui/copyToClipboard.tsx
index 2c5d21aa0d5d8..8f3f8cb448b00 100644
--- a/packages/trace-viewer/src/ui/copyToClipboard.tsx
+++ b/packages/trace-viewer/src/ui/copyToClipboard.tsx
@@ -15,23 +15,47 @@
  */
 
 import * as React from 'react';
+import { ToolbarButton } from '@web/components/toolbarButton';
+import './copyToClipboard.css';
 
 export const CopyToClipboard: React.FunctionComponent<{
-  value: string,
+  value: string | (() => Promise<string>),
   description?: string,
 }> = ({ value, description }) => {
-  const [iconClassName, setIconClassName] = React.useState('codicon-clippy');
+  const [icon, setIcon] = React.useState('copy');
 
   const handleCopy = React.useCallback(() => {
-    navigator.clipboard.writeText(value).then(() => {
-      setIconClassName('codicon-check');
-      setTimeout(() => {
-        setIconClassName('codicon-clippy');
-      }, 3000);
+    const valuePromise = typeof value === 'function' ? value() : Promise.resolve(value);
+    valuePromise.then(value => {
+      navigator.clipboard.writeText(value).then(() => {
+        setIcon('check');
+        setTimeout(() => {
+          setIcon('copy');
+        }, 3000);
+      }, () => {
+        setIcon('close');
+      });
     }, () => {
-      setIconClassName('codicon-close');
+      setIcon('close');
     });
 
   }, [value]);
-  return <span title={description ? description : 'Copy'} className={`copy-icon codicon ${iconClassName}`} onClick={handleCopy}/>;
-};
\ No newline at end of file
+  return <ToolbarButton title={description ? description : 'Copy'} icon={icon} onClick={handleCopy}/>;
+};
+
+export const CopyToClipboardTextButton: React.FunctionComponent<{
+  value: string | (() => Promise<string>),
+  description: string,
+  copiedDescription?: React.ReactNode,
+  style?: React.CSSProperties,
+}> = ({ value, description, copiedDescription = description, style }) => {
+  const [copied, setCopied] = React.useState(false);
+  const handleCopy = React.useCallback(async () => {
+    const valueToCopy = typeof value === 'function' ? await value() : value;
+    await navigator.clipboard.writeText(valueToCopy);
+    setCopied(true);
+    setTimeout(() => setCopied(false), 3000);
+  }, [value]);
+
+  return <ToolbarButton style={style} title={description} onClick={handleCopy} className='copy-to-clipboard-text-button'>{copied ? copiedDescription : description}</ToolbarButton>;
+};
diff --git a/packages/trace-viewer/src/ui/defaultSettingsView.tsx b/packages/trace-viewer/src/ui/defaultSettingsView.tsx
new file mode 100644
index 0000000000000..03e1a018f0a6c
--- /dev/null
+++ b/packages/trace-viewer/src/ui/defaultSettingsView.tsx
@@ -0,0 +1,62 @@
+/**
+ * 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 * as React from 'react';
+import { SettingsView } from './settingsView';
+import { useDarkModeSetting } from '@web/theme';
+import { useSetting } from '@web/uiUtils';
+import type { ActionGroup } from '@isomorphic/protocolFormatter';
+
+/**
+ * A view of the collection of standard settings used between various applications
+ */
+export const DefaultSettingsView: React.FC<{}> = () => {
+  const [
+    shouldPopulateCanvasFromScreenshot,
+    setShouldPopulateCanvasFromScreenshot,
+  ] = useSetting('shouldPopulateCanvasFromScreenshot', false);
+  const [actionsFilter, setActionsFilter] = useSetting<ActionGroup[]>('actionsFilter', []);
+  const [darkMode, setDarkMode] = useDarkModeSetting();
+
+  return (
+    <SettingsView
+      settings={[
+        { value: darkMode, set: setDarkMode, name: 'Dark mode' },
+        {
+          value: shouldPopulateCanvasFromScreenshot,
+          set: setShouldPopulateCanvasFromScreenshot,
+          name: 'Display canvas content',
+          title: 'Attempt to display the captured canvas appearance in the snapshot preview. May not be accurate.',
+        },
+        {
+          value: actionsFilter.includes('getter'),
+          set: value => setActionsFilter(value ? [...actionsFilter, 'getter'] : actionsFilter.filter(a => a !== 'getter')),
+          name: 'Show getter actions',
+        },
+        {
+          value: actionsFilter.includes('route'),
+          set: value => setActionsFilter(value ? [...actionsFilter, 'route'] : actionsFilter.filter(a => a !== 'route')),
+          name: 'Show route actions',
+        },
+        {
+          value: actionsFilter.includes('configuration'),
+          set: value => setActionsFilter(value ? [...actionsFilter, 'configuration'] : actionsFilter.filter(a => a !== 'configuration')),
+          name: 'Show configuration actions',
+        },
+      ]}
+    />
+  );
+};
diff --git a/packages/trace-viewer/src/ui/embeddedWorkbenchLoader.css b/packages/trace-viewer/src/ui/embeddedWorkbenchLoader.css
deleted file mode 100644
index 227435532281a..0000000000000
--- a/packages/trace-viewer/src/ui/embeddedWorkbenchLoader.css
+++ /dev/null
@@ -1,68 +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.
-*/
-
-.empty-state {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex: auto;
-  flex-direction: column;
-  background-color: var(--vscode-editor-background);
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 100;
-  line-height: 24px;
-}
-
-body .empty-state {
-  background: rgba(255, 255, 255, 0.8);
-}
-
-body.dark-mode .empty-state {
-  background: rgba(0, 0, 0, 0.8);
-}
-
-.empty-state .title {
-  font-size: 24px;
-  font-weight: bold;
-  margin-bottom: 30px;
-}
-
-.progress {
-  flex: none;
-  width: 100%;
-  height: 3px;
-  z-index: 10;
-}
-
-.inner-progress {
-  background-color: var(--vscode-progressBar-background);
-  height: 100%;
-}
-
-.workbench-loader {
-  contain: size;
-}
-
-/* Limit to a reasonable minimum viewport */
-html, body {
-  min-width: 550px;
-  min-height: 450px;
-  overflow: auto;
-}
diff --git a/packages/trace-viewer/src/ui/embeddedWorkbenchLoader.tsx b/packages/trace-viewer/src/ui/embeddedWorkbenchLoader.tsx
deleted file mode 100644
index 17a2211c41644..0000000000000
--- a/packages/trace-viewer/src/ui/embeddedWorkbenchLoader.tsx
+++ /dev/null
@@ -1,96 +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 * as React from 'react';
-import type { ContextEntry } from '../entries';
-import { MultiTraceModel } from './modelUtil';
-import './embeddedWorkbenchLoader.css';
-import { Workbench } from './workbench';
-import { currentTheme, toggleTheme } from '@web/theme';
-
-function openPage(url: string, target?: string) {
-  if (url)
-    window.parent!.postMessage({ command: 'openExternal', params: { url, target } }, '*');
-}
-
-export const EmbeddedWorkbenchLoader: React.FunctionComponent = () => {
-  const [traceURLs, setTraceURLs] = React.useState<string[]>([]);
-  const [model, setModel] = React.useState<MultiTraceModel>(emptyModel);
-  const [progress, setProgress] = React.useState<{ done: number, total: number }>({ done: 0, total: 0 });
-  const [processingErrorMessage, setProcessingErrorMessage] = React.useState<string | null>(null);
-
-  React.useEffect(() => {
-    window.addEventListener('message', async ({ data: { method, params } }) => {
-      if (method === 'loadTraceRequested') {
-        setTraceURLs(params.traceUrl ? [params.traceUrl] : []);
-        setProcessingErrorMessage(null);
-      } else if (method === 'applyTheme') {
-        if (currentTheme() !== params.theme)
-          toggleTheme();
-      }
-    });
-    // notify vscode that it is now listening to its messages
-    window.parent!.postMessage({ type: 'loaded' }, '*');
-  }, []);
-
-  React.useEffect(() => {
-    (async () => {
-      if (traceURLs.length) {
-        const swListener = (event: any) => {
-          if (event.data.method === 'progress')
-            setProgress(event.data.params);
-        };
-        navigator.serviceWorker.addEventListener('message', swListener);
-        setProgress({ done: 0, total: 1 });
-        const contextEntries: ContextEntry[] = [];
-        for (let i = 0; i < traceURLs.length; i++) {
-          const url = traceURLs[i];
-          const params = new URLSearchParams();
-          params.set('trace', url);
-          const response = await fetch(`contexts?${params.toString()}`);
-          if (!response.ok) {
-            setProcessingErrorMessage((await response.json()).error);
-            return;
-          }
-          contextEntries.push(...(await response.json()));
-        }
-        navigator.serviceWorker.removeEventListener('message', swListener);
-        const model = new MultiTraceModel(contextEntries);
-        setProgress({ done: 0, total: 0 });
-        setModel(model);
-      } else {
-        setModel(emptyModel);
-      }
-    })();
-  }, [traceURLs]);
-
-  React.useEffect(() => {
-    if (processingErrorMessage)
-      window.parent?.postMessage({ method: 'showErrorMessage', params: { message: processingErrorMessage } }, '*');
-  }, [processingErrorMessage]);
-
-  return <div className='vbox workbench-loader'>
-    <div className='progress'>
-      <div className='inner-progress' style={{ width: progress.total ? (100 * progress.done / progress.total) + '%' : 0 }}></div>
-    </div>
-    <Workbench model={model} openPage={openPage} />
-    {!traceURLs.length && <div className='empty-state'>
-      <div className='title'>Select test to see the trace</div>
-    </div>}
-  </div>;
-};
-
-export const emptyModel = new MultiTraceModel([]);
diff --git a/packages/trace-viewer/src/ui/errorsTab.tsx b/packages/trace-viewer/src/ui/errorsTab.tsx
index 71b6059c294ab..3b67545af86ff 100644
--- a/packages/trace-viewer/src/ui/errorsTab.tsx
+++ b/packages/trace-viewer/src/ui/errorsTab.tsx
@@ -20,61 +20,142 @@ import type * as modelUtil from './modelUtil';
 import { PlaceholderPanel } from './placeholderPanel';
 import { renderAction } from './actionList';
 import type { Language } from '@isomorphic/locatorGenerators';
+import { CopyToClipboardTextButton } from './copyToClipboard';
+import { useAsyncMemo } from '@web/uiUtils';
+import { attachmentURL } from './attachmentsTab';
+import { copyPrompt, stripAnsiEscapes } from '@web/shared/prompts';
+import { MetadataWithCommitInfo } from '@testIsomorphic/types';
+import { calculateSha1 } from './sourceTab';
 import type { StackFrame } from '@protocol/channels';
 
-type ErrorDescription = {
-  action?: modelUtil.ActionTraceEventInContext;
-  stack?: StackFrame[];
+const CopyPromptButton: React.FC<{ prompt: string }> = ({ prompt }) => {
+  return (
+    <CopyToClipboardTextButton
+      value={prompt}
+      description='Copy prompt'
+      copiedDescription={<>Copied <span className='codicon codicon-copy' style={{ marginLeft: '5px' }}/></>}
+      style={{ width: '120px', justifyContent: 'center' }}
+    />
+  );
 };
 
 type ErrorsTabModel = {
-  errors: Map<string, ErrorDescription>;
+  errors: Map<string, modelUtil.ErrorDescription>;
 };
 
 export function useErrorsTabModel(model: modelUtil.MultiTraceModel | undefined): ErrorsTabModel {
   return React.useMemo(() => {
     if (!model)
       return { errors: new Map() };
-    const errors = new Map<string, ErrorDescription>();
+    const errors = new Map<string, modelUtil.ErrorDescription>();
     for (const error of model.errorDescriptors)
       errors.set(error.message, error);
     return { errors };
   }, [model]);
 }
 
+function ErrorView({ message, error, sdkLanguage, revealInSource }: { message: string, error: modelUtil.ErrorDescription, sdkLanguage: Language, revealInSource: (error: modelUtil.ErrorDescription) => void }) {
+  let location: string | undefined;
+  let longLocation: string | undefined;
+  const stackFrame = error.stack?.[0];
+  if (stackFrame) {
+    const file = stackFrame.file.replace(/.*[/\\](.*)/, '$1');
+    location = file + ':' + stackFrame.line;
+    longLocation = stackFrame.file + ':' + stackFrame.line;
+  }
+
+  return <div style={{ display: 'flex', flexDirection: 'column', overflowX: 'clip' }}>
+    <div className='hbox' style={{
+      alignItems: 'center',
+      padding: '5px 10px',
+      minHeight: 36,
+      fontWeight: 'bold',
+      color: 'var(--vscode-errorForeground)',
+      flex: 0,
+    }}>
+      {error.action && renderAction(error.action, { sdkLanguage })}
+      {location && <div className='action-location'>
+        @ <span title={longLocation} onClick={() => revealInSource(error)}>{location}</span>
+      </div>}
+    </div>
+
+    <ErrorMessage error={message} />
+  </div>;
+}
+
 export const ErrorsTab: React.FunctionComponent<{
   errorsModel: ErrorsTabModel,
+  model?: modelUtil.MultiTraceModel,
+  wallTime: number,
   sdkLanguage: Language,
-  revealInSource: (error: ErrorDescription) => void,
-}> = ({ errorsModel, sdkLanguage, revealInSource }) => {
+  revealInSource: (error: modelUtil.ErrorDescription) => void,
+  testRunMetadata: MetadataWithCommitInfo | undefined,
+}> = ({ errorsModel, model, sdkLanguage, revealInSource, wallTime, testRunMetadata }) => {
+  const errorContext = useAsyncMemo(async () => {
+    const attachment = model?.attachments.find(a => a.name === 'error-context');
+    if (!attachment)
+      return;
+    return await fetch(attachmentURL(attachment)).then(r => r.text());
+  }, [model], undefined);
+
+  const buildCodeFrame = React.useCallback(async (error: modelUtil.ErrorDescription) => {
+    const location = error.stack?.[0];
+    if (!location)
+      return;
+
+    let response = await fetch(`sha1/src@${await calculateSha1(location.file)}.txt`);
+    if (response.status === 404)
+      response = await fetch(`file?path=${encodeURIComponent(location.file)}`);
+    if (response.status >= 400)
+      return;
+
+    const source = await response.text();
+
+    return codeFrame({
+      source,
+      message: stripAnsiEscapes(error.message).split('\n')[0] || undefined,
+      location,
+      linesAbove: 100,
+      linesBelow: 100,
+    });
+  }, []);
+
+  const prompt = useAsyncMemo(
+      () => copyPrompt(
+          {
+            testInfo: model?.title ?? '',
+            metadata: testRunMetadata,
+            errorContext,
+            errors: model?.errorDescriptors ?? [],
+            buildCodeFrame
+          }
+      ),
+      [errorContext, testRunMetadata, model, buildCodeFrame],
+      undefined
+  );
+
   if (!errorsModel.errors.size)
     return <PlaceholderPanel text='No errors' />;
 
   return <div className='fill' style={{ overflow: 'auto' }}>
+    <span style={{ position: 'absolute', right: '5px', top: '5px', zIndex: 1 }}>
+      {prompt && <CopyPromptButton prompt={prompt} />}
+    </span>
     {[...errorsModel.errors.entries()].map(([message, error]) => {
-      let location: string | undefined;
-      let longLocation: string | undefined;
-      const stackFrame = error.stack?.[0];
-      if (stackFrame) {
-        const file = stackFrame.file.replace(/.*[/\\](.*)/, '$1');
-        location = file + ':' + stackFrame.line;
-        longLocation = stackFrame.file + ':' + stackFrame.line;
-      }
-      return <div key={message}>
-        <div className='hbox' style={{
-          alignItems: 'center',
-          padding: '5px 10px',
-          minHeight: 36,
-          fontWeight: 'bold',
-          color: 'var(--vscode-errorForeground)',
-        }}>
-          {error.action && renderAction(error.action, { sdkLanguage })}
-          {location && <div className='action-location'>
-            @ <span title={longLocation} onClick={() => revealInSource(error)}>{location}</span>
-          </div>}
-        </div>
-        <ErrorMessage error={message} />
-      </div>;
+      const errorId = `error-${wallTime}-${message}`;
+      return <ErrorView key={errorId} message={message} error={error} revealInSource={revealInSource} sdkLanguage={sdkLanguage} />;
     })}
   </div>;
 };
+
+function codeFrame({ source, message, location, linesAbove, linesBelow }: { source: string, message?: string, location: StackFrame, linesAbove: number, linesBelow: number }): string {
+  const lines = source.split('\n').slice();
+  const start = Math.max(0, location.line - linesAbove - 1);
+  const end = Math.min(lines.length, location.line + linesBelow);
+  const scope = lines.slice(start, end);
+  const lineNumberWidth = String(end).length;
+  const frame = scope.map((line, index) => `${(start + index + 1) === location.line ? '> ' : '  '}${(start + index + 1).toString().padEnd(lineNumberWidth, ' ')} | ${line}`);
+  if (message)
+    frame.splice(location.line - start, 0, `${' '.repeat(lineNumberWidth + 2)} | ${' '.repeat(location.column - 2)} ^ ${message}`);
+  return frame.join('\n');
+}
diff --git a/packages/trace-viewer/src/ui/filmStrip.tsx b/packages/trace-viewer/src/ui/filmStrip.tsx
index a0818c10edd67..dd8a0cb0ac15d 100644
--- a/packages/trace-viewer/src/ui/filmStrip.tsx
+++ b/packages/trace-viewer/src/ui/filmStrip.tsx
@@ -15,10 +15,10 @@
 */
 
 import './filmStrip.css';
-import type { Boundaries, Size } from '../geometry';
+import type { Boundaries, Size } from './geometry';
 import * as React from 'react';
 import { useMeasure, upperBound } from '@web/uiUtils';
-import type { PageEntry } from '../entries';
+import type { PageEntry } from '../types/entries';
 import type { ActionTraceEventInContext, MultiTraceModel } from './modelUtil';
 import { renderAction } from './actionList';
 import type { Language } from '@isomorphic/locatorGenerators';
diff --git a/packages/trace-viewer/src/geometry.ts b/packages/trace-viewer/src/ui/geometry.ts
similarity index 100%
rename from packages/trace-viewer/src/geometry.ts
rename to packages/trace-viewer/src/ui/geometry.ts
diff --git a/packages/trace-viewer/src/ui/inspectorTab.tsx b/packages/trace-viewer/src/ui/inspectorTab.tsx
index 7b3a90b709a32..f7392234ecb50 100644
--- a/packages/trace-viewer/src/ui/inspectorTab.tsx
+++ b/packages/trace-viewer/src/ui/inspectorTab.tsx
@@ -15,31 +15,67 @@
  */
 
 import { CodeMirrorWrapper } from '@web/components/codeMirrorWrapper';
-import type { Language } from '@web/components/codeMirrorWrapper';
+import type { SourceHighlight } from '@web/components/codeMirrorWrapper';
 import { ToolbarButton } from '@web/components/toolbarButton';
 import { copy } from '@web/uiUtils';
 import * as React from 'react';
+import type { HighlightedElement } from './snapshotTab';
 import './sourceTab.css';
+import { parseAriaSnapshot } from '@isomorphic/ariaSnapshot';
+import yaml from 'yaml';
+import type { Language } from '@isomorphic/locatorGenerators';
 
 export const InspectorTab: React.FunctionComponent<{
   sdkLanguage: Language,
   setIsInspecting: (isInspecting: boolean) => void,
-  highlightedLocator: string,
-  setHighlightedLocator: (locator: string) => void,
-}> = ({ sdkLanguage, setIsInspecting, highlightedLocator, setHighlightedLocator }) => {
-  return <div className='vbox' style={{ backgroundColor: 'var(--vscode-sideBar-background)' }}>
-    <div style={{ margin: '10px 0px 10px 10px', color: 'var(--vscode-editorCodeLens-foreground)', flex: 'none' }}>Locator</div>
-    <div style={{ margin: '0 10px 10px', flex: 'auto' }}>
-      <CodeMirrorWrapper text={highlightedLocator} language={sdkLanguage} focusOnChange={true} isFocused={true} wrapLines={true} onChange={text => {
+  highlightedElement: HighlightedElement,
+  setHighlightedElement: (element: HighlightedElement) => void,
+}> = ({ sdkLanguage, setIsInspecting, highlightedElement, setHighlightedElement }) => {
+  const [ariaSnapshotErrors, setAriaSnapshotErrors] = React.useState<SourceHighlight[]>();
+  const onAriaEditorChange = React.useCallback((ariaSnapshot: string) => {
+    const { errors } = parseAriaSnapshot(yaml, ariaSnapshot, { prettyErrors: false });
+    const highlights = errors.map(error => {
+      const highlight: SourceHighlight = {
+        message: error.message,
+        line: error.range[1].line,
+        column: error.range[1].col,
+        type: 'subtle-error',
+      };
+      return highlight;
+    });
+    setAriaSnapshotErrors(highlights);
+    setHighlightedElement({ ...highlightedElement, ariaSnapshot, lastEdited: 'ariaSnapshot' });
+    setIsInspecting(false);
+  }, [highlightedElement, setHighlightedElement, setIsInspecting]);
+
+  return <div style={{ flex: 'auto', backgroundColor: 'var(--vscode-sideBar-background)', padding: '0 10px 10px 10px', overflow: 'auto' }}>
+    <div className='hbox' style={{ lineHeight: '28px', color: 'var(--vscode-editorCodeLens-foreground)' }}>
+      <div style={{ flex: 'auto'  }}>Locator</div>
+      <ToolbarButton icon='files' title='Copy locator' onClick={() => {
+        copy(highlightedElement.locator || '');
+      }}></ToolbarButton>
+    </div>
+    <div style={{ height: 50 }}>
+      <CodeMirrorWrapper text={highlightedElement.locator || ''} highlighter={sdkLanguage} isFocused={true} wrapLines={true} onChange={text => {
         // Updating text needs to go first - react can squeeze a render between the state updates.
-        setHighlightedLocator(text);
+        setHighlightedElement({ ...highlightedElement, locator: text, lastEdited: 'locator' });
         setIsInspecting(false);
-      }}></CodeMirrorWrapper>
+      }} />
     </div>
-    <div style={{ position: 'absolute', right: 5, top: 5 }}>
-      <ToolbarButton icon='files' title='Copy locator' onClick={() => {
-        copy(highlightedLocator);
+
+    <div className='hbox' style={{ lineHeight: '28px', color: 'var(--vscode-editorCodeLens-foreground)' }}>
+      <div style={{ flex: 'auto'  }}>Aria snapshot</div>
+      <ToolbarButton icon='files' title='Copy snapshot' onClick={() => {
+        copy(highlightedElement.ariaSnapshot || '');
       }}></ToolbarButton>
     </div>
+    <div style={{ height: 150 }}>
+      <CodeMirrorWrapper
+        text={highlightedElement.ariaSnapshot || ''}
+        highlighter='yaml'
+        wrapLines={false}
+        highlight={ariaSnapshotErrors}
+        onChange={onAriaEditorChange} />
+    </div>
   </div>;
 };
diff --git a/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsx b/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsx
new file mode 100644
index 0000000000000..ba44a66c30e93
--- /dev/null
+++ b/packages/trace-viewer/src/ui/liveWorkbenchLoader.tsx
@@ -0,0 +1,61 @@
+/*
+  Copyright (c) Microsoft Corporation.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import * as React from 'react';
+import { MultiTraceModel } from './modelUtil';
+import './workbenchLoader.css';
+import { Workbench } from './workbench';
+
+import type { ContextEntry } from '../types/entries';
+
+export const LiveWorkbenchLoader: React.FC<{ traceJson: string }> = ({ traceJson }) => {
+  const [model, setModel] = React.useState<MultiTraceModel | undefined>(undefined);
+  const [counter, setCounter] = React.useState(0);
+  const pollTimer = React.useRef<NodeJS.Timeout | null>(null);
+
+  React.useEffect(() => {
+    if (pollTimer.current)
+      clearTimeout(pollTimer.current);
+
+    // Start polling running test.
+    pollTimer.current = setTimeout(async () => {
+      try {
+        const model = await loadSingleTraceFile(traceJson);
+        setModel(model);
+      } catch {
+        const model = new MultiTraceModel([]);
+        setModel(model);
+      } finally {
+        setCounter(counter + 1);
+      }
+    }, 500);
+    return () => {
+      if (pollTimer.current)
+        clearTimeout(pollTimer.current);
+    };
+  }, [traceJson, counter]);
+
+  return <Workbench model={model} isLive={true} />;
+};
+
+async function loadSingleTraceFile(traceJson: string): Promise<MultiTraceModel> {
+  const params = new URLSearchParams();
+  params.set('trace', traceJson);
+  params.set('limit', '1');
+  const response = await fetch(`contexts?${params.toString()}`);
+  const contextEntries = await response.json() as ContextEntry[];
+  return new MultiTraceModel(contextEntries);
+}
diff --git a/packages/trace-viewer/src/ui/logTab.tsx b/packages/trace-viewer/src/ui/logTab.tsx
index be0469ab91998..89bf177461474 100644
--- a/packages/trace-viewer/src/ui/logTab.tsx
+++ b/packages/trace-viewer/src/ui/logTab.tsx
@@ -58,11 +58,12 @@ export const LogTab: React.FunctionComponent<{
 
   return <LogList
     name='log'
+    ariaLabel='Log entries'
     items={entries}
     render={entry => <div className='log-list-item'>
       <span className='log-list-duration'>{entry.time}</span>
       {entry.message}
     </div>}
-    noHighlightOnHover={true}
+    notSelectable={true}
   />;
 };
diff --git a/packages/trace-viewer/src/ui/metadataView.tsx b/packages/trace-viewer/src/ui/metadataView.tsx
index 5b50a7f08167b..9d2e1c207cda4 100644
--- a/packages/trace-viewer/src/ui/metadataView.tsx
+++ b/packages/trace-viewer/src/ui/metadataView.tsx
@@ -24,9 +24,12 @@ export const MetadataView: React.FunctionComponent<{
 }> = ({ model }) => {
   if (!model)
     return <></>;
-  return <div className='metadata-view vbox'>
+
+  const wallTime = model.wallTime !== undefined ? new Date(model.wallTime).toLocaleString(undefined, { timeZoneName: 'short' }) : undefined;
+
+  return <div className='vbox' style={{ flexShrink: 0 }}>
     <div className='call-section' style={{ paddingTop: 2 }}>Time</div>
-    {!!model.wallTime && <div className='call-line'>start time:<span className='call-value datetime' title={new Date(model.wallTime).toLocaleString()}>{new Date(model.wallTime).toLocaleString()}</span></div>}
+    {!!wallTime && <div className='call-line'>start time:<span className='call-value datetime' title={wallTime}>{wallTime}</span></div>}
     <div className='call-line'>duration:<span className='call-value number' title={msToString(model.endTime - model.startTime)}>{msToString(model.endTime - model.startTime)}</span></div>
     <div className='call-section'>Browser</div>
     <div className='call-line'>engine:<span className='call-value string' title={model.browserName}>{model.browserName}</span></div>
diff --git a/packages/trace-viewer/src/ui/modelUtil.ts b/packages/trace-viewer/src/ui/modelUtil.ts
index 309b210eabbd9..cd5ed0a168945 100644
--- a/packages/trace-viewer/src/ui/modelUtil.ts
+++ b/packages/trace-viewer/src/ui/modelUtil.ts
@@ -14,22 +14,27 @@
  * limitations under the License.
  */
 
+import { getActionGroup } from '@isomorphic/protocolFormatter';
+
 import type { Language } from '@isomorphic/locatorGenerators';
 import type { ResourceSnapshot } from '@trace/snapshot';
 import type * as trace from '@trace/trace';
 import type { ActionTraceEvent } from '@trace/trace';
-import type { ContextEntry, PageEntry } from '../entries';
+import type { ActionEntry, ContextEntry, PageEntry } from '../types/entries';
 import type { StackFrame } from '@protocol/channels';
+import type { ActionGroup } from '@isomorphic/protocolFormatter';
 
 const contextSymbol = Symbol('context');
-const nextInContextSymbol = Symbol('next');
-const prevInListSymbol = Symbol('prev');
+const nextInContextSymbol = Symbol('nextInContext');
+const prevByEndTimeSymbol = Symbol('prevByEndTime');
+const nextByStartTimeSymbol = Symbol('nextByStartTime');
 const eventsSymbol = Symbol('events');
 
 export type SourceLocation = {
   file: string;
   line: number;
-  source: SourceModel;
+  column: number;
+  source?: SourceModel;
 };
 
 export type SourceModel = {
@@ -37,9 +42,8 @@ export type SourceModel = {
   content: string | undefined;
 };
 
-export type ActionTraceEventInContext = ActionTraceEvent & {
+export type ActionTraceEventInContext = ActionEntry & {
   context: ContextEntry;
-  log: { time: number, message: string }[];
 };
 
 export type ActionTreeItem = {
@@ -49,12 +53,14 @@ export type ActionTreeItem = {
   action?: ActionTraceEventInContext;
 };
 
-type ErrorDescription = {
+export type ErrorDescription = {
   action?: ActionTraceEventInContext;
   stack?: StackFrame[];
   message: string;
 };
 
+export type Attachment = trace.AfterActionTraceEventAttachment & { traceUrl: string };
+
 export class MultiTraceModel {
   readonly startTime: number;
   readonly endTime: number;
@@ -66,6 +72,8 @@ export class MultiTraceModel {
   readonly options: trace.BrowserContextEventOptions;
   readonly pages: PageEntry[];
   readonly actions: ActionTraceEventInContext[];
+  readonly attachments: Attachment[];
+  readonly visibleAttachments: Attachment[];
   readonly events: (trace.EventTraceEvent | trace.ConsoleMessageTraceEvent)[];
   readonly stdio: trace.StdioTraceEvent[];
   readonly errors: trace.ErrorTraceEvent[];
@@ -101,6 +109,8 @@ export class MultiTraceModel {
     this.hasSource = contexts.some(c => c.hasSource);
     this.hasStepData = contexts.some(context => context.origin === 'testRunner');
     this.resources = [...contexts.map(c => c.resources)].flat();
+    this.attachments = this.actions.flatMap(action => action.attachments?.map(attachment => ({ ...attachment, traceUrl: action.context.traceUrl })) ?? []);
+    this.visibleAttachments = this.attachments.filter(attachment => !attachment.name.startsWith('_'));
 
     this.events.sort((a1, a2) => a1.time - a2.time);
     this.resources.sort((a1, a2) => a1._monotonicTime! - a2._monotonicTime!);
@@ -113,6 +123,14 @@ export class MultiTraceModel {
     return this.actions.findLast(a => a.error);
   }
 
+  filteredActions(actionsFilter: ActionGroup[]) {
+    const filter = new Set<string>(actionsFilter);
+    return this.actions.filter(action => {
+      const group = action.group ?? getActionGroup({ type: action.class, method: action.method });
+      return !group || filter.has(group);
+    });
+  }
+
   private _errorDescriptorsFromActions(): ErrorDescription[] {
     const errors: ErrorDescription[] = [];
     for (const action of this.actions || []) {
@@ -128,16 +146,10 @@ export class MultiTraceModel {
   }
 
   private _errorDescriptorsFromTestRunner(): ErrorDescription[] {
-    const errors: ErrorDescription[] = [];
-    for (const error of this.errors || []) {
-      if (!error.message)
-        continue;
-      errors.push({
-        stack: error.stack,
-        message: error.message
-      });
-    }
-    return errors;
+    return this.errors.filter(e => !!e.message).map((error, i) => ({
+      stack: error.stack,
+      message: error.message,
+    }));
   }
 }
 
@@ -150,9 +162,9 @@ function indexModel(context: ContextEntry) {
   }
   let lastNonRouteAction = undefined;
   for (let i = context.actions.length - 1; i >= 0; i--) {
-    const action = context.actions[i] as any;
-    action[nextInContextSymbol] = lastNonRouteAction;
-    if (!action.apiName.includes('route.'))
+    const action = context.actions[i] as ActionTraceEvent;
+    (action as any)[nextInContextSymbol] = lastNonRouteAction;
+    if (action.class !== 'Route')
       lastNonRouteAction = action;
   }
   for (const event of context.events)
@@ -186,6 +198,18 @@ function mergeActionsAndUpdateTiming(contexts: ContextEntry[]) {
     const actions = mergeActionsAndUpdateTimingSameTrace(contexts);
     result.push(...actions);
   }
+
+  result.sort((a1, a2) => {
+    if (a2.parentId === a1.callId)
+      return 1;
+    if (a1.parentId === a2.callId)
+      return -1;
+    return a1.endTime - a2.endTime;
+  });
+
+  for (let i = 1; i < result.length; ++i)
+    (result[i] as any)[prevByEndTimeSymbol] = result[i - 1];
+
   result.sort((a1, a2) => {
     if (a2.parentId === a1.callId)
       return -1;
@@ -194,8 +218,8 @@ function mergeActionsAndUpdateTiming(contexts: ContextEntry[]) {
     return a1.startTime - a2.startTime;
   });
 
-  for (let i = 1; i < result.length; ++i)
-    (result[i] as any)[prevInListSymbol] = result[i - 1];
+  for (let i = 0; i + 1 < result.length; ++i)
+    (result[i] as any)[nextByStartTimeSymbol] = result[i + 1];
 
   return result;
 }
@@ -211,6 +235,8 @@ function makeCallIdsUniqueAcrossTraceFiles(contexts: ContextEntry[], traceFileId
   }
 }
 
+let lastTmpStepId = 0;
+
 function mergeActionsAndUpdateTimingSameTrace(contexts: ContextEntry[]): ActionTraceEventInContext[] {
   const map = new Map<string, ActionTraceEventInContext>();
 
@@ -224,18 +250,10 @@ function mergeActionsAndUpdateTimingSameTrace(contexts: ContextEntry[]): ActionT
     }).flat();
   }
 
-  // Library actions are replaced with corresponding test runner steps. Matching with
-  // the test runner steps enables us to find parent steps.
-  // - In the newer versions the actions are matched by explicit step id stored in the
-  //   library context actions.
-  // - In the older versions the step id is not stored and the match is perfomed based on
-  //   action name and wallTime.
-  const matchByStepId = libraryContexts.some(c => c.actions.some(a => !!a.stepId));
-
   for (const context of libraryContexts) {
     for (const action of context.actions) {
-      const key = matchByStepId ? action.stepId! : `${action.apiName}@${(action as any).wallTime}`;
-      map.set(key, { ...action, context });
+      // Never merge stepless events.
+      map.set(action.stepId || `tmp-step@${++lastTmpStepId}`, { ...action, context });
     }
   }
 
@@ -243,23 +261,26 @@ function mergeActionsAndUpdateTimingSameTrace(contexts: ContextEntry[]): ActionT
   // Step aka test runner contexts have startTime/endTime as client-side times.
   // Adjust startTime/endTime on the library contexts to align them with the test
   // runner steps.
-  const delta = monotonicTimeDeltaBetweenLibraryAndRunner(testRunnerContexts, map, matchByStepId);
+  const delta = monotonicTimeDeltaBetweenLibraryAndRunner(testRunnerContexts, map);
   if (delta)
     adjustMonotonicTime(libraryContexts, delta);
 
   const nonPrimaryIdToPrimaryId = new Map<string, string>();
   for (const context of testRunnerContexts) {
     for (const action of context.actions) {
-      const key = matchByStepId ? action.callId : `${action.apiName}@${(action as any).wallTime}`;
-      const existing = map.get(key);
+      const existing = action.stepId && map.get(action.stepId);
       if (existing) {
         nonPrimaryIdToPrimaryId.set(action.callId, existing.callId);
         if (action.error)
           existing.error = action.error;
         if (action.attachments)
           existing.attachments = action.attachments;
+        if (action.annotations)
+          existing.annotations = action.annotations;
         if (action.parentId)
           existing.parentId = nonPrimaryIdToPrimaryId.get(action.parentId) ?? action.parentId;
+        if (action.group)
+          existing.group = action.group;
         // For the events that are present in the test runner context, always take
         // their time from the test runner context to preserve client side order.
         existing.startTime = action.startTime;
@@ -268,7 +289,7 @@ function mergeActionsAndUpdateTimingSameTrace(contexts: ContextEntry[]): ActionT
       }
       if (action.parentId)
         action.parentId = nonPrimaryIdToPrimaryId.get(action.parentId) ?? action.parentId;
-      map.set(key, { ...action, context });
+      map.set(action.stepId || `tmp-step@${++lastTmpStepId}`, { ...action, context });
     }
   }
   return [...map.values()];
@@ -299,7 +320,7 @@ function adjustMonotonicTime(contexts: ContextEntry[], monotonicTimeDelta: numbe
   }
 }
 
-function monotonicTimeDeltaBetweenLibraryAndRunner(nonPrimaryContexts: ContextEntry[], libraryActions: Map<string, ActionTraceEventInContext>, matchByStepId: boolean) {
+function monotonicTimeDeltaBetweenLibraryAndRunner(nonPrimaryContexts: ContextEntry[], libraryActions: Map<string, ActionTraceEventInContext>) {
   // We cannot rely on wall time or monotonic time to be the in sync
   // between library and test runner contexts. So we find first action
   // that is present in both runner and library contexts and use it
@@ -309,8 +330,7 @@ function monotonicTimeDeltaBetweenLibraryAndRunner(nonPrimaryContexts: ContextEn
     for (const action of context.actions) {
       if (!action.startTime)
         continue;
-      const key = matchByStepId ? action.stepId! : `${action.apiName}@${(action as any).wallTime}`;
-      const libraryAction = libraryActions.get(key);
+      const libraryAction = action.stepId ? libraryActions.get(action.stepId) : undefined;
       if (libraryAction)
         return action.startTime - libraryAction.startTime;
     }
@@ -339,10 +359,6 @@ export function buildActionTree(actions: ActionTraceEventInContext[]): { rootIte
   return { rootItem, itemMap };
 }
 
-export function idForAction(action: ActionTraceEvent) {
-  return `${action.pageId || 'none'}:${action.callId}`;
-}
-
 export function context(action: ActionTraceEvent | trace.EventTraceEvent | ResourceSnapshot): ContextEntry {
   return (action as any)[contextSymbol];
 }
@@ -351,8 +367,12 @@ function nextInContext(action: ActionTraceEvent): ActionTraceEvent {
   return (action as any)[nextInContextSymbol];
 }
 
-export function prevInList(action: ActionTraceEvent): ActionTraceEvent {
-  return (action as any)[prevInListSymbol];
+export function previousActionByEndTime(action: ActionTraceEvent): ActionTraceEvent {
+  return (action as any)[prevByEndTimeSymbol];
+}
+
+export function nextActionByStartTime(action: ActionTraceEvent): ActionTraceEvent {
+  return (action as any)[nextByStartTimeSymbol];
 }
 
 export function stats(action: ActionTraceEvent): { errors: number, warnings: number } {
diff --git a/packages/trace-viewer/src/ui/networkFilters.css b/packages/trace-viewer/src/ui/networkFilters.css
new file mode 100644
index 0000000000000..836c7102c9bc4
--- /dev/null
+++ b/packages/trace-viewer/src/ui/networkFilters.css
@@ -0,0 +1,46 @@
+/*
+  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.
+*/
+
+.network-filters {
+  display: flex;
+  gap: 16px;
+  background-color: var(--vscode-sideBar-background);
+  padding: 4px 8px;
+  min-height: 32px;
+}
+
+.network-filters input[type="search"] {
+  padding: 0 5px;
+}
+
+.network-filters-resource-types {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.network-filters-resource-type {
+  cursor: pointer;
+  border-radius: 2px;
+  padding: 3px 8px;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.network-filters-resource-type.selected {
+  background-color: var(--vscode-list-inactiveSelectionBackground);
+}
diff --git a/packages/trace-viewer/src/ui/networkFilters.tsx b/packages/trace-viewer/src/ui/networkFilters.tsx
new file mode 100644
index 0000000000000..a88332e7c65f0
--- /dev/null
+++ b/packages/trace-viewer/src/ui/networkFilters.tsx
@@ -0,0 +1,57 @@
+/**
+ * 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 './networkFilters.css';
+
+const resourceTypes = ['All', 'Fetch', 'HTML', 'JS', 'CSS', 'Font', 'Image'] as const;
+export type ResourceType = typeof resourceTypes[number];
+
+export type FilterState = {
+  searchValue: string;
+  resourceType: ResourceType;
+};
+
+export const defaultFilterState: FilterState = { searchValue: '', resourceType: 'All' };
+
+export const NetworkFilters = ({ filterState, onFilterStateChange }: {
+  filterState: FilterState,
+  onFilterStateChange: (filterState: FilterState) => void,
+}) => {
+  return (
+    <div className='network-filters'>
+      <input
+        type='search'
+        placeholder='Filter network'
+        spellCheck={false}
+        value={filterState.searchValue}
+        onChange={e => onFilterStateChange({ ...filterState, searchValue: e.target.value })}
+      />
+
+      <div className='network-filters-resource-types'>
+        {resourceTypes.map(resourceType => (
+          <div
+            key={resourceType}
+            title={resourceType}
+            onClick={() => onFilterStateChange({ ...filterState, resourceType })}
+            className={`network-filters-resource-type ${filterState.resourceType === resourceType ? 'selected' : ''}`}
+          >
+            {resourceType}
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
diff --git a/packages/trace-viewer/src/ui/networkResourceDetails.css b/packages/trace-viewer/src/ui/networkResourceDetails.css
index ce0648b8c21db..b3f7a5c04f01f 100644
--- a/packages/trace-viewer/src/ui/networkResourceDetails.css
+++ b/packages/trace-viewer/src/ui/networkResourceDetails.css
@@ -16,6 +16,7 @@
 
 .network-request-details-tab {
   width: 100%;
+  height: 100%;
   user-select: text;
   line-height: 24px;
   margin-left: 10px;
@@ -48,6 +49,22 @@
   overflow: hidden;
 }
 
+.network-font-preview {
+  font-family: font-preview;
+  font-size: 30px;
+  line-height: 40px;
+  padding: 16px;
+  padding-left: 6px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  text-align: center;
+}
+
+.network-font-preview-error {
+  margin-top: 8px;
+  text-align: center;
+}
+
 .tab-network .toolbar {
   min-height: 30px !important;
   background-color: initial !important;
@@ -61,3 +78,52 @@
 .tab-network .tabbed-pane-tab.selected {
   font-weight: bold;
 }
+
+.copy-request-dropdown {
+  .copy-request-dropdown-toggle {
+    margin-right: 14px;
+    width: 135px;
+  }
+
+  &:not(:hover) .copy-request-dropdown-menu {
+    display: none;
+  }
+
+  .copy-request-dropdown-menu {
+    position: absolute;
+    display: flex;
+    flex-direction: column;
+    width: 135px;
+    z-index: 10;
+    background-color: var(--vscode-list-dropBackground);
+
+    button {
+      padding: 8px;
+      text-align: left;
+    }
+  }
+}
+
+.green-circle::before,
+.red-circle::before,
+.yellow-circle::before {
+  content: "";
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  border-radius: 6px;
+  margin-right: 2px;
+  align-self: center;
+}
+
+.green-circle::before {
+  background-color: var(--vscode-charts-green);
+}
+
+.red-circle::before {
+  background-color: var(--vscode-charts-red);
+}
+
+.yellow-circle::before {
+  background-color: var(--vscode-charts-yellow);
+}
diff --git a/packages/trace-viewer/src/ui/networkResourceDetails.tsx b/packages/trace-viewer/src/ui/networkResourceDetails.tsx
index e7b1bad4b6847..5c87cb8d75faa 100644
--- a/packages/trace-viewer/src/ui/networkResourceDetails.tsx
+++ b/packages/trace-viewer/src/ui/networkResourceDetails.tsx
@@ -19,23 +19,49 @@ import * as React from 'react';
 import './networkResourceDetails.css';
 import { TabbedPane } from '@web/components/tabbedPane';
 import { CodeMirrorWrapper } from '@web/components/codeMirrorWrapper';
-import type { Language } from '@web/components/codeMirrorWrapper';
 import { ToolbarButton } from '@web/components/toolbarButton';
+import { generateCurlCommand, generateFetchCall } from '../third_party/devtools';
+import { CopyToClipboardTextButton } from './copyToClipboard';
+import { getAPIRequestCodeGen } from './codegen';
+import type { Language } from '@isomorphic/locatorGenerators';
+import { msToString, useAsyncMemo } from '@web/uiUtils';
+import type { Entry } from '@trace/har';
+
+type RequestBody = { text: string, mimeType?: string } | null;
+
 
 export const NetworkResourceDetails: React.FunctionComponent<{
   resource: ResourceSnapshot;
+  sdkLanguage: Language;
+  startTimeOffset: number;
   onClose: () => void;
-}> = ({ resource, onClose }) => {
+}> = ({ resource, sdkLanguage, startTimeOffset, onClose }) => {
   const [selectedTab, setSelectedTab] = React.useState('request');
 
+  const requestBody = useAsyncMemo<RequestBody>(async () => {
+    if (resource.request.postData) {
+      const requestContentTypeHeader = resource.request.headers.find(q => q.name.toLowerCase() === 'content-type');
+      const requestContentType = requestContentTypeHeader ? requestContentTypeHeader.value : '';
+      if (resource.request.postData._sha1) {
+        const response = await fetch(`sha1/${resource.request.postData._sha1}`);
+        return { text: formatBody(await response.text(), requestContentType), mimeType: requestContentType };
+      } else {
+        return { text: formatBody(resource.request.postData.text, requestContentType), mimeType: requestContentType };
+      }
+    } else {
+      return null;
+    }
+  }, [resource], null);
+
   return <TabbedPane
     dataTestId='network-request-details'
-    leftToolbar={[<ToolbarButton icon='close' title='Close' onClick={onClose}></ToolbarButton>]}
+    leftToolbar={[<ToolbarButton key='close' icon='close' title='Close' onClick={onClose} />]}
+    rightToolbar={[<CopyDropdown key='dropdown' requestBody={requestBody} resource={resource} sdkLanguage={sdkLanguage} />]}
     tabs={[
       {
         id: 'request',
         title: 'Request',
-        render: () => <RequestTab resource={resource}/>,
+        render: () => <RequestTab resource={resource} startTimeOffset={startTimeOffset} requestBody={requestBody} />,
       },
       {
         id: 'response',
@@ -52,43 +78,58 @@ export const NetworkResourceDetails: React.FunctionComponent<{
     setSelectedTab={setSelectedTab} />;
 };
 
-const RequestTab: React.FunctionComponent<{
-  resource: ResourceSnapshot;
-}> = ({ resource }) => {
-  const [requestBody, setRequestBody] = React.useState<{ text: string, language?: Language } | null>(null);
 
-  React.useEffect(() => {
-    const readResources = async  () => {
-      if (resource.request.postData) {
-        const requestContentTypeHeader = resource.request.headers.find(q => q.name === 'Content-Type');
-        const requestContentType = requestContentTypeHeader ? requestContentTypeHeader.value : '';
-        const language = mimeTypeToHighlighter(requestContentType);
-        if (resource.request.postData._sha1) {
-          const response = await fetch(`sha1/${resource.request.postData._sha1}`);
-          setRequestBody({ text: formatBody(await response.text(), requestContentType), language });
-        } else {
-          setRequestBody({ text: formatBody(resource.request.postData.text, requestContentType), language });
-        }
-      } else {
-        setRequestBody(null);
-      }
-    };
-    readResources();
-  }, [resource]);
+const CopyDropdown: React.FC<{
+  resource: Entry,
+  sdkLanguage: Language,
+  requestBody: RequestBody,
+}> = ({ resource, sdkLanguage, requestBody }) => {
+  const copiedDescription = <><span className='codicon codicon-check' style={{ marginRight: '5px' }} /> Copied </>;
+  const copyAsPlaywright = async () => getAPIRequestCodeGen(sdkLanguage).generatePlaywrightRequestCall(resource.request, requestBody?.text);
+  return (
+    <div className='copy-request-dropdown'>
+      <ToolbarButton className='copy-request-dropdown-toggle'>
+        <span className='codicon codicon-copy' style={{ marginRight: '5px' }}/>
+        Copy request
+        <span className='codicon codicon-chevron-down' style={{ marginLeft: '5px' }}/>
+      </ToolbarButton>
+
+      <div className='copy-request-dropdown-menu'>
+        <CopyToClipboardTextButton description='Copy as cURL' copiedDescription={copiedDescription} value={() => generateCurlCommand(resource)}/>
+        <CopyToClipboardTextButton description='Copy as Fetch' copiedDescription={copiedDescription} value={() => generateFetchCall(resource)}/>
+        <CopyToClipboardTextButton description='Copy as Playwright' copiedDescription={copiedDescription} value={copyAsPlaywright}/>
+      </div>
+    </div>
+  );
+};
 
+const RequestTab: React.FunctionComponent<{
+  resource: ResourceSnapshot;
+  startTimeOffset: number;
+  requestBody: RequestBody,
+}> = ({ resource, startTimeOffset, requestBody }) => {
   return <div className='network-request-details-tab'>
     <div className='network-request-details-header'>General</div>
     <div className='network-request-details-url'>{`URL: ${resource.request.url}`}</div>
     <div className='network-request-details-general'>{`Method: ${resource.request.method}`}</div>
-    <div className='network-request-details-general'>{`Status Code: ${
-      resource.response.status >= 200 && resource.response.status < 400
-        ? `🟢 ${resource.response.status} ${resource.response.statusText}`
-        : `🔴 ${resource.response.status} ${resource.response.statusText}`
-    }`}</div>
+    {resource.response.status !== -1 && <div className='network-request-details-general' style={{ display: 'flex' }}>
+      Status Code: <span className={statusClass(resource.response.status)} style={{ display: 'inline-flex' }}>
+        {`${resource.response.status} ${resource.response.statusText}`}
+      </span></div>}
+    {resource.request.queryString.length ? <>
+      <div className='network-request-details-header'>Query String Parameters</div>
+      <div className='network-request-details-headers'>
+        {resource.request.queryString.map(param => `${param.name}: ${param.value}`).join('\n')}
+      </div>
+    </> : null}
     <div className='network-request-details-header'>Request Headers</div>
     <div className='network-request-details-headers'>{resource.request.headers.map(pair => `${pair.name}: ${pair.value}`).join('\n')}</div>
+    <div className='network-request-details-header'>Time</div>
+    <div className='network-request-details-general'>{`Start: ${msToString(startTimeOffset)}`}</div>
+    <div className='network-request-details-general'>{`Duration: ${msToString(resource.time)}`}</div>
+
     {requestBody && <div className='network-request-details-header'>Request Body</div>}
-    {requestBody && <CodeMirrorWrapper text={requestBody.text} language={requestBody.language} readOnly lineNumbers={true}/>}
+    {requestBody && <CodeMirrorWrapper text={requestBody.text} mimeType={requestBody.mimeType} readOnly lineNumbers={true}/>}
   </div>;
 };
 
@@ -104,12 +145,13 @@ const ResponseTab: React.FunctionComponent<{
 const BodyTab: React.FunctionComponent<{
   resource: ResourceSnapshot;
 }> = ({ resource }) => {
-  const [responseBody, setResponseBody] = React.useState<{ dataUrl?: string, text?: string, language?: Language } | null>(null);
+  const [responseBody, setResponseBody] = React.useState<{ dataUrl?: string, text?: string, mimeType?: string, font?: BufferSource } | null>(null);
 
   React.useEffect(() => {
     const readResources = async  () => {
       if (resource.response.content._sha1) {
         const useBase64 = resource.response.content.mimeType.includes('image');
+        const isFont = resource.response.content.mimeType.includes('font');
         const response = await fetch(`sha1/${resource.response.content._sha1}`);
         if (useBase64) {
           const blob = await response.blob();
@@ -117,11 +159,15 @@ const BodyTab: React.FunctionComponent<{
           const eventPromise = new Promise<any>(f => reader.onload = f);
           reader.readAsDataURL(blob);
           setResponseBody({ dataUrl: (await eventPromise).target.result });
+        } else if (isFont) {
+          const font = await response.arrayBuffer();
+          setResponseBody({ font });
         } else {
           const formattedBody = formatBody(await response.text(), resource.response.content.mimeType);
-          const language = mimeTypeToHighlighter(resource.response.content.mimeType);
-          setResponseBody({ text: formattedBody, language });
+          setResponseBody({ text: formattedBody, mimeType: resource.response.content.mimeType });
         }
+      } else {
+        setResponseBody(null);
       }
     };
 
@@ -130,11 +176,56 @@ const BodyTab: React.FunctionComponent<{
 
   return <div className='network-request-details-tab'>
     {!resource.response.content._sha1 && <div>Response body is not available for this request.</div>}
+    {responseBody && responseBody.font && <FontPreview font={responseBody.font} />}
     {responseBody && responseBody.dataUrl && <img draggable='false' src={responseBody.dataUrl} />}
-    {responseBody && responseBody.text && <CodeMirrorWrapper text={responseBody.text} language={responseBody.language} readOnly lineNumbers={true}/>}
+    {responseBody && responseBody.text && <CodeMirrorWrapper text={responseBody.text} mimeType={responseBody.mimeType} readOnly lineNumbers={true}/>}
   </div>;
 };
 
+const FontPreview: React.FunctionComponent<{
+  font: BufferSource;
+}> = ({ font }) => {
+  const [isError, setIsError] = React.useState(false);
+
+  React.useEffect(() => {
+    let fontFace: FontFace;
+    try {
+      // note: constant font family name will lead to bugs
+      // when displaying two font previews.
+      fontFace = new FontFace('font-preview', font);
+      if (fontFace.status === 'loaded')
+        document.fonts.add(fontFace);
+      if (fontFace.status === 'error')
+        setIsError(true);
+    } catch {
+      setIsError(true);
+    }
+
+    return () => {
+      document.fonts.delete(fontFace);
+    };
+  }, [font]);
+
+  if (isError)
+    return <div className='network-font-preview-error'>Could not load font preview</div>;
+
+  return <div className='network-font-preview'>
+    ABCDEFGHIJKLM<br />
+    NOPQRSTUVWXYZ<br />
+    abcdefghijklm<br />
+    nopqrstuvwxyz<br />
+    1234567890
+  </div>;
+};
+
+function statusClass(statusCode: number): string {
+  if (statusCode < 300 || statusCode === 304)
+    return 'green-circle';
+  if (statusCode < 400)
+    return 'yellow-circle';
+  return 'red-circle';
+}
+
 function formatBody(body: string | null, contentType: string): string {
   if (body === null)
     return 'Loading...';
@@ -156,12 +247,3 @@ function formatBody(body: string | null, contentType: string): string {
 
   return bodyStr;
 }
-
-function mimeTypeToHighlighter(mimeType: string): Language | undefined {
-  if (mimeType.includes('javascript') || mimeType.includes('json'))
-    return 'javascript';
-  if (mimeType.includes('html'))
-    return 'html';
-  if (mimeType.includes('css'))
-    return 'css';
-}
diff --git a/packages/trace-viewer/src/ui/networkTab.tsx b/packages/trace-viewer/src/ui/networkTab.tsx
index 311af733a95e1..29624df2feb82 100644
--- a/packages/trace-viewer/src/ui/networkTab.tsx
+++ b/packages/trace-viewer/src/ui/networkTab.tsx
@@ -16,7 +16,7 @@
 
 import type { Entry } from '@trace/har';
 import * as React from 'react';
-import type { Boundaries } from '../geometry';
+import type { Boundaries } from './geometry';
 import './networkTab.css';
 import { NetworkResourceDetails } from './networkResourceDetails';
 import { bytesToString, msToString } from '@web/uiUtils';
@@ -24,7 +24,9 @@ import { PlaceholderPanel } from './placeholderPanel';
 import { context, type MultiTraceModel } from './modelUtil';
 import { GridView, type RenderedGridCell } from '@web/components/gridView';
 import { SplitView } from '@web/components/splitView';
-import type { ContextEntry } from '../entries';
+import type { ContextEntry } from '../types/entries';
+import { NetworkFilters, defaultFilterState, type FilterState, type ResourceType } from './networkFilters';
+import type { Language } from '@isomorphic/locatorGenerators';
 
 type NetworkTabModel = {
   resources: Entry[],
@@ -64,47 +66,61 @@ export function useNetworkTabModel(model: MultiTraceModel | undefined, selectedT
 export const NetworkTab: React.FunctionComponent<{
   boundaries: Boundaries,
   networkModel: NetworkTabModel,
-  onEntryHovered: (entry: Entry | undefined) => void,
-}> = ({ boundaries, networkModel, onEntryHovered }) => {
+  onEntryHovered?: (entry: Entry | undefined) => void,
+  sdkLanguage: Language,
+}> = ({ boundaries, networkModel, onEntryHovered, sdkLanguage }) => {
   const [sorting, setSorting] = React.useState<Sorting | undefined>(undefined);
   const [selectedEntry, setSelectedEntry] = React.useState<RenderedEntry | undefined>(undefined);
+  const [filterState, setFilterState] = React.useState(defaultFilterState);
 
   const { renderedEntries } = React.useMemo(() => {
-    const renderedEntries = networkModel.resources.map(entry => renderEntry(entry, boundaries, networkModel.contextIdMap));
+    const renderedEntries = networkModel.resources.map(entry => renderEntry(entry, boundaries, networkModel.contextIdMap)).filter(filterEntry(filterState));
     if (sorting)
       sort(renderedEntries, sorting);
     return { renderedEntries };
-  }, [networkModel.resources, networkModel.contextIdMap, sorting, boundaries]);
+  }, [networkModel.resources, networkModel.contextIdMap, filterState, sorting, boundaries]);
 
   const [columnWidths, setColumnWidths] = React.useState<Map<ColumnName, number>>(() => {
     return new Map(allColumns().map(column => [column, columnWidth(column)]));
   });
 
+  const onFilterStateChange = React.useCallback((newFilterState: FilterState) => {
+    setFilterState(newFilterState);
+    setSelectedEntry(undefined);
+  }, []);
+
   if (!networkModel.resources.length)
     return <PlaceholderPanel text='No network calls' />;
 
   const grid = <NetworkGridView
     name='network'
+    ariaLabel='Network requests'
     items={renderedEntries}
     selectedItem={selectedEntry}
     onSelected={item => setSelectedEntry(item)}
-    onHighlighted={item => onEntryHovered(item?.resource)}
+    onHighlighted={item => onEntryHovered?.(item?.resource)}
     columns={visibleColumns(!!selectedEntry, renderedEntries)}
     columnTitle={columnTitle}
     columnWidths={columnWidths}
     setColumnWidths={setColumnWidths}
-    isError={item => item.status.code >= 400}
+    isError={item => item.status.code >= 400 || item.status.code === -1}
     isInfo={item => !!item.route}
     render={(item, column) => renderCell(item, column)}
     sorting={sorting}
     setSorting={setSorting}
   />;
   return <>
+    <NetworkFilters filterState={filterState} onFilterStateChange={onFilterStateChange} />
     {!selectedEntry && grid}
-    {selectedEntry && <SplitView sidebarSize={columnWidths.get('name')!} sidebarIsFirst={true} orientation='horizontal' settingName='networkResourceDetails'>
-      <NetworkResourceDetails resource={selectedEntry.resource} onClose={() => setSelectedEntry(undefined)} />
-      {grid}
-    </SplitView>}
+    {selectedEntry &&
+      <SplitView
+        sidebarSize={columnWidths.get('name')!}
+        sidebarIsFirst={true}
+        orientation='horizontal'
+        settingName='networkResourceDetails'
+        main={<NetworkResourceDetails resource={selectedEntry.resource} sdkLanguage={sdkLanguage} startTimeOffset={selectedEntry.start} onClose={() => setSelectedEntry(undefined)} />}
+        sidebar={grid}
+      />}
   </>;
 };
 
@@ -253,6 +269,8 @@ const renderEntry = (resource: Entry, boundaries: Boundaries, contextIdGenerator
     resourceName = url.pathname.substring(url.pathname.lastIndexOf('/') + 1);
     if (!resourceName)
       resourceName = url.host;
+    if (url.search)
+      resourceName += url.search;
   } catch {
     resourceName = resource.request.url;
   }
@@ -340,3 +358,21 @@ function comparator(sortBy: ColumnName) {
   if (sortBy === 'contextId')
     return (a: RenderedEntry, b: RenderedEntry) => a.contextId.localeCompare(b.contextId);
 }
+
+const resourceTypePredicates: Record<ResourceType, (contentType: string) => boolean> = {
+  'All': () => true,
+  'Fetch': contentType => contentType === 'application/json',
+  'HTML': contentType => contentType === 'text/html',
+  'CSS': contentType => contentType === 'text/css',
+  'JS': contentType => contentType.includes('javascript'),
+  'Font': contentType => contentType.includes('font'),
+  'Image': contentType => contentType.includes('image'),
+};
+
+function filterEntry({ searchValue, resourceType }: FilterState) {
+  return (entry: RenderedEntry) => {
+    const typePredicate = resourceTypePredicates[resourceType];
+
+    return typePredicate(entry.contentType) && entry.name.url.toLowerCase().includes(searchValue.toLowerCase());
+  };
+}
diff --git a/packages/trace-viewer/src/ui/settingsToolbarButton.tsx b/packages/trace-viewer/src/ui/settingsToolbarButton.tsx
new file mode 100644
index 0000000000000..d4474007767d9
--- /dev/null
+++ b/packages/trace-viewer/src/ui/settingsToolbarButton.tsx
@@ -0,0 +1,52 @@
+/*
+  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 * as React from 'react';
+import { Dialog } from '@web/components/dialog';
+import { ToolbarButton } from '@web/components/toolbarButton';
+import { DefaultSettingsView } from './defaultSettingsView';
+
+export const SettingsToolbarButton: React.FC<{}> = () => {
+  const hostingRef = React.useRef<HTMLButtonElement>(null);
+
+  const [open, setOpen] = React.useState(false);
+
+  return (
+    <>
+      <ToolbarButton
+        ref={hostingRef}
+        icon='settings-gear'
+        title='Settings'
+        onClick={() => setOpen(current => !current)}
+      />
+      <Dialog
+        style={{
+          backgroundColor: 'var(--vscode-sideBar-background)',
+          padding: '4px 8px'
+        }}
+        open={open}
+        width={200}
+        // TODO: Temporary spacing until design of toolbar buttons is revisited
+        verticalOffset={8}
+        requestClose={() => setOpen(false)}
+        anchor={hostingRef}
+        dataTestId='settings-toolbar-dialog'
+      >
+        <DefaultSettingsView />
+      </Dialog>
+    </>
+  );
+};
diff --git a/packages/trace-viewer/src/ui/settingsView.css b/packages/trace-viewer/src/ui/settingsView.css
index 3ac8597e35dae..4142b6897e694 100644
--- a/packages/trace-viewer/src/ui/settingsView.css
+++ b/packages/trace-viewer/src/ui/settingsView.css
@@ -15,25 +15,27 @@
 */
 
 .settings-view {
+  display: flex;
   flex: none;
-  margin-top: 4px;
+  padding: 4px 0px;
+  row-gap: 8px;
+  user-select: none;
 }
 
-.settings-view .setting label {
+.settings-view .setting {
   display: flex;
-  flex-direction: row;
   align-items: center;
-  margin: 4px 2px;
 }
 
-.settings-view .setting:first-of-type label {
-  margin-top: 2px;
-}
+.settings-view .setting label {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
 
-.settings-view .setting:last-of-type label {
-  margin-bottom: 2px;
+  cursor: pointer;
 }
 
 .settings-view .setting input {
   margin-right: 5px;
+  flex-shrink: 0;
 }
diff --git a/packages/trace-viewer/src/ui/settingsView.tsx b/packages/trace-viewer/src/ui/settingsView.tsx
index 57c058c2486cc..69439e773c996 100644
--- a/packages/trace-viewer/src/ui/settingsView.tsx
+++ b/packages/trace-viewer/src/ui/settingsView.tsx
@@ -15,20 +15,35 @@
  */
 
 import * as React from 'react';
-import type { Setting } from '@web/uiUtils';
 import './settingsView.css';
 
+export type Setting<T> = {
+  value: T;
+  set: (value: T) => void;
+  name: string;
+  title?: string;
+};
+
 export const SettingsView: React.FunctionComponent<{
-  settings: Setting<boolean>[],
+  settings: Setting<boolean>[];
 }> = ({ settings }) => {
-  return <div className='vbox settings-view'>
-    {settings.map(([value, set, title]) => {
-      return <div key={title} className='setting'>
-        <label>
-          <input type='checkbox' checked={value} onClick={() => set(!value)}/>
-          {title}
-        </label>
-      </div>;
-    })}
-  </div>;
+  return (
+    <div className='vbox settings-view'>
+      {settings.map(({ value, set, name, title }) => {
+        const labelId = `setting-${name}`;
+
+        return (
+          <div key={name} className='setting' title={title}>
+            <input
+              type='checkbox'
+              id={labelId}
+              checked={value}
+              onChange={() => set(!value)}
+            />
+            <label htmlFor={labelId}>{name}</label>
+          </div>
+        );
+      })}
+    </div>
+  );
 };
diff --git a/packages/trace-viewer/src/ui/snapshotTab.css b/packages/trace-viewer/src/ui/snapshotTab.css
index 591c545f22796..926685dc81882 100644
--- a/packages/trace-viewer/src/ui/snapshotTab.css
+++ b/packages/trace-viewer/src/ui/snapshotTab.css
@@ -15,12 +15,8 @@
 */
 
 .snapshot-tab {
-  display: flex;
-  flex: auto;
-  flex-direction: column;
   align-items: stretch;
   outline: none;
-  --browser-frame-header-height: 40px;
   overflow: hidden;
 }
 
@@ -28,6 +24,10 @@
   background-color: var(--vscode-sideBar-background);
 }
 
+.snapshot-tab .toolbar .pick-locator {
+  margin: 0 4px;
+}
+
 .snapshot-controls {
   flex: none;
   background-color: var(--vscode-sideBar-background);
@@ -69,6 +69,7 @@
   margin: 1px;
   padding: 10px;
   position: relative;
+  --browser-frame-header-height: 40px;
 }
 
 .snapshot-container {
@@ -102,29 +103,6 @@ iframe.snapshot-visible[name=snapshot] {
   padding: 50px;
 }
 
-.popout-icon {
-  position: absolute;
-  top: 0;
-  right: 0;
-  color: var(--vscode-sideBarTitle-foreground);
-  font-size: 14px;
-  z-index: 100;
-  width: 24px;
-  height: 24px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-decoration: none;
-}
-
-.popout-icon:not(.popout-disabled):hover {
-  color: var(--vscode-foreground);
-}
-
-.popout-icon.popout-disabled {
-  opacity: var(--vscode-disabledForeground);
-}
-
 .snapshot-tab .cm-wrapper {
   line-height: 23px;
   margin-right: 4px;
diff --git a/packages/trace-viewer/src/ui/snapshotTab.tsx b/packages/trace-viewer/src/ui/snapshotTab.tsx
index 4bc2abc9ebc76..858abfa9a9573 100644
--- a/packages/trace-viewer/src/ui/snapshotTab.tsx
+++ b/packages/trace-viewer/src/ui/snapshotTab.tsx
@@ -17,80 +17,96 @@
 import './snapshotTab.css';
 import * as React from 'react';
 import type { ActionTraceEvent } from '@trace/trace';
-import { context, prevInList } from './modelUtil';
+import { context, type MultiTraceModel, nextActionByStartTime, previousActionByEndTime } from './modelUtil';
 import { Toolbar } from '@web/components/toolbar';
 import { ToolbarButton } from '@web/components/toolbarButton';
-import { useMeasure } from '@web/uiUtils';
+import { clsx, useMeasure, useSetting } from '@web/uiUtils';
 import { InjectedScript } from '@injected/injectedScript';
 import { Recorder } from '@injected/recorder/recorder';
-import ConsoleAPI from '@injected/consoleApi';
 import { asLocator } from '@isomorphic/locatorGenerators';
 import type { Language } from '@isomorphic/locatorGenerators';
 import { locatorOrSelectorAsSelector } from '@isomorphic/locatorParser';
 import { TabbedPaneTab } from '@web/components/tabbedPane';
 import { BrowserFrame } from './browserFrame';
+import type { ElementInfo } from '@recorder/recorderTypes';
+import { parseAriaSnapshot } from '@isomorphic/ariaSnapshot';
+import yaml from 'yaml';
 
-export const SnapshotTab: React.FunctionComponent<{
+export type HighlightedElement = {
+  locator?: string,
+  ariaSnapshot?: string
+  lastEdited: 'locator' | 'ariaSnapshot' | 'none';
+};
+
+export const SnapshotTabsView: React.FunctionComponent<{
   action: ActionTraceEvent | undefined,
+  model?: MultiTraceModel,
   sdkLanguage: Language,
   testIdAttributeName: string,
   isInspecting: boolean,
   setIsInspecting: (isInspecting: boolean) => void,
-  highlightedLocator: string,
-  setHighlightedLocator: (locator: string) => void,
-  openPage?: (url: string, target?: string) => Window | any,
-}> = ({ action, sdkLanguage, testIdAttributeName, isInspecting, setIsInspecting, highlightedLocator, setHighlightedLocator, openPage }) => {
-  const [measure, ref] = useMeasure<HTMLDivElement>();
+  highlightedElement: HighlightedElement,
+  setHighlightedElement: (element: HighlightedElement) => void,
+}> = ({ action, sdkLanguage, testIdAttributeName, isInspecting, setIsInspecting, highlightedElement, setHighlightedElement }) => {
   const [snapshotTab, setSnapshotTab] = React.useState<'action'|'before'|'after'>('action');
 
-  type Snapshot = { action: ActionTraceEvent, snapshotName: string, point?: { x: number, y: number } };
-  const { snapshots } = React.useMemo(() => {
-    if (!action)
-      return { snapshots: {} };
-
-    // if the action has no beforeSnapshot, use the last available afterSnapshot.
-    let beforeSnapshot: Snapshot | undefined = action.beforeSnapshot ? { action, snapshotName: action.beforeSnapshot } : undefined;
-    let a = action;
-    while (!beforeSnapshot && a) {
-      a = prevInList(a);
-      beforeSnapshot = a?.afterSnapshot ? { action: a, snapshotName: a?.afterSnapshot } : undefined;
-    }
-    const afterSnapshot: Snapshot | undefined = action.afterSnapshot ? { action, snapshotName: action.afterSnapshot } : beforeSnapshot;
-    const actionSnapshot: Snapshot | undefined = action.inputSnapshot ? { action, snapshotName: action.inputSnapshot } : afterSnapshot;
-    if (actionSnapshot)
-      actionSnapshot.point = action.point;
-    return { snapshots: { action: actionSnapshot, before: beforeSnapshot, after: afterSnapshot } };
-  }, [action]);
+  const [shouldPopulateCanvasFromScreenshot] = useSetting('shouldPopulateCanvasFromScreenshot', false);
 
+  const snapshots = React.useMemo(() => {
+    return collectSnapshots(action);
+  }, [action]);
   const { snapshotInfoUrl, snapshotUrl, popoutUrl } = React.useMemo(() => {
     const snapshot = snapshots[snapshotTab];
-    if (!snapshot)
-      return { snapshotUrl: kBlankSnapshotUrl };
-
-    const params = new URLSearchParams();
-    params.set('trace', context(snapshot.action).traceUrl);
-    params.set('name', snapshot.snapshotName);
-    if (snapshot.point) {
-      params.set('pointX', String(snapshot.point.x));
-      params.set('pointY', String(snapshot.point.y));
-    }
-    const snapshotUrl = new URL(`snapshot/${snapshot.action.pageId}?${params.toString()}`, window.location.href).toString();
-    const snapshotInfoUrl = new URL(`snapshotInfo/${snapshot.action.pageId}?${params.toString()}`, window.location.href).toString();
-
-    const popoutParams = new URLSearchParams();
-    popoutParams.set('r', snapshotUrl);
-    popoutParams.set('trace', context(snapshot.action).traceUrl);
-    if (snapshot.point) {
-      popoutParams.set('pointX', String(snapshot.point.x));
-      popoutParams.set('pointY', String(snapshot.point.y));
-    }
-    const popoutUrl = new URL(`snapshot.html?${popoutParams.toString()}`, window.location.href).toString();
-    return { snapshots, snapshotInfoUrl, snapshotUrl, popoutUrl };
-  }, [snapshots, snapshotTab]);
+    return snapshot ? extendSnapshot(snapshot, shouldPopulateCanvasFromScreenshot) : { snapshotInfoUrl: undefined, snapshotUrl: undefined, popoutUrl: undefined };
+  }, [snapshots, snapshotTab, shouldPopulateCanvasFromScreenshot]);
+
+  const snapshotUrls = React.useMemo((): SnapshotUrls | undefined => snapshotInfoUrl !== undefined ? { snapshotInfoUrl, snapshotUrl, popoutUrl } : undefined, [snapshotInfoUrl, snapshotUrl, popoutUrl]);
 
+  return <div className='snapshot-tab vbox'>
+    <Toolbar>
+      <ToolbarButton className='pick-locator' title='Pick locator' icon='target' toggled={isInspecting} onClick={() => setIsInspecting(!isInspecting)} />
+      {['action', 'before', 'after'].map(tab => {
+        return <TabbedPaneTab
+          key={tab}
+          id={tab}
+          title={renderTitle(tab)}
+          selected={snapshotTab === tab}
+          onSelect={() => setSnapshotTab(tab as 'action' | 'before' | 'after')}
+        ></TabbedPaneTab>;
+      })}
+      <div style={{ flex: 'auto' }}></div>
+      <ToolbarButton icon='link-external' title='Open snapshot in a new tab' disabled={!snapshotUrls?.popoutUrl} onClick={() => {
+        const win = window.open(snapshotUrls?.popoutUrl || '', '_blank');
+        win?.addEventListener('DOMContentLoaded', () => {
+          const injectedScript = new InjectedScript(win as any, { isUnderTest, sdkLanguage, testIdAttributeName, stableRafCount: 1, browserName: 'chromium', customEngines: [] });
+          injectedScript.consoleApi.install();
+        });
+      }} />
+    </Toolbar>
+    <SnapshotView
+      snapshotUrls={snapshotUrls}
+      sdkLanguage={sdkLanguage}
+      testIdAttributeName={testIdAttributeName}
+      isInspecting={isInspecting}
+      setIsInspecting={setIsInspecting}
+      highlightedElement={highlightedElement}
+      setHighlightedElement={setHighlightedElement}
+    />
+  </div>;
+};
+
+export const SnapshotView: React.FunctionComponent<{
+  snapshotUrls: SnapshotUrls | undefined,
+  sdkLanguage: Language,
+  testIdAttributeName: string,
+  isInspecting: boolean,
+  setIsInspecting: (isInspecting: boolean) => void,
+  highlightedElement: HighlightedElement,
+  setHighlightedElement: (element: HighlightedElement) => void,
+}> = ({ snapshotUrls, sdkLanguage, testIdAttributeName, isInspecting, setIsInspecting, highlightedElement, setHighlightedElement }) => {
   const iframeRef0 = React.useRef<HTMLIFrameElement>(null);
   const iframeRef1 = React.useRef<HTMLIFrameElement>(null);
-  const [snapshotInfo, setSnapshotInfo] = React.useState({ viewport: kDefaultViewport, url: '' });
+  const [snapshotInfo, setSnapshotInfo] = React.useState<SnapshotInfo>({ viewport: kDefaultViewport, url: '' });
   const loadingRef = React.useRef({ iteration: 0, visibleIframe: 0 });
 
   React.useEffect(() => {
@@ -99,15 +115,7 @@ export const SnapshotTab: React.FunctionComponent<{
       const newVisibleIframe = 1 - loadingRef.current.visibleIframe;
       loadingRef.current.iteration = thisIteration;
 
-      const newSnapshotInfo = { url: '', viewport: kDefaultViewport };
-      if (snapshotInfoUrl) {
-        const response = await fetch(snapshotInfoUrl);
-        const info = await response.json();
-        if (!info.error) {
-          newSnapshotInfo.url = info.url;
-          newSnapshotInfo.viewport = info.viewport;
-        }
-      }
+      const newSnapshotInfo = await fetchSnapshotInfo(snapshotUrls?.snapshotInfoUrl);
 
       // Interrupted by another load - bail out.
       if (loadingRef.current.iteration !== thisIteration)
@@ -122,6 +130,7 @@ export const SnapshotTab: React.FunctionComponent<{
           iframe.addEventListener('error', loadedCallback);
 
           // Try preventing history entry from being created.
+          const snapshotUrl = snapshotUrls?.snapshotUrl || kBlankSnapshotUrl;
           if (iframe.contentWindow)
             iframe.contentWindow.location.replace(snapshotUrl);
           else
@@ -141,21 +150,10 @@ export const SnapshotTab: React.FunctionComponent<{
       loadingRef.current.visibleIframe = newVisibleIframe;
       setSnapshotInfo(newSnapshotInfo);
     })();
-  }, [snapshotUrl, snapshotInfoUrl]);
-
-  const windowHeaderHeight = 40;
-  const snapshotContainerSize = {
-    width: snapshotInfo.viewport.width,
-    height: snapshotInfo.viewport.height + windowHeaderHeight,
-  };
-  const scale = Math.min(measure.width / snapshotContainerSize.width, measure.height / snapshotContainerSize.height, 1);
-  const translate = {
-    x: (measure.width - snapshotContainerSize.width) / 2,
-    y: (measure.height - snapshotContainerSize.height) / 2,
-  };
+  }, [snapshotUrls]);
 
   return <div
-    className='snapshot-tab'
+    className='vbox'
     tabIndex={0}
     onKeyDown={event => {
       if (event.key === 'Escape') {
@@ -168,50 +166,52 @@ export const SnapshotTab: React.FunctionComponent<{
       isInspecting={isInspecting}
       sdkLanguage={sdkLanguage}
       testIdAttributeName={testIdAttributeName}
-      highlightedLocator={highlightedLocator}
-      setHighlightedLocator={setHighlightedLocator}
+      highlightedElement={highlightedElement}
+      setHighlightedElement={setHighlightedElement}
       iframe={iframeRef0.current}
       iteration={loadingRef.current.iteration} />
     <InspectModeController
       isInspecting={isInspecting}
       sdkLanguage={sdkLanguage}
       testIdAttributeName={testIdAttributeName}
-      highlightedLocator={highlightedLocator}
-      setHighlightedLocator={setHighlightedLocator}
+      highlightedElement={highlightedElement}
+      setHighlightedElement={setHighlightedElement}
       iframe={iframeRef1.current}
       iteration={loadingRef.current.iteration} />
-    <Toolbar>
-      {['action', 'before', 'after'].map(tab => {
-        return <TabbedPaneTab
-          id={tab}
-          title={renderTitle(tab)}
-          selected={snapshotTab === tab}
-          onSelect={() => setSnapshotTab(tab as 'action' | 'before' | 'after')}
-        ></TabbedPaneTab>;
-      })}
-      <div style={{ flex: 'auto' }}></div>
-      <ToolbarButton icon='link-external' title='Open snapshot in a new tab' disabled={!popoutUrl} onClick={() => {
-        if (!openPage)
-          openPage = window.open;
-        const win = openPage(popoutUrl || '', '_blank');
-        win?.addEventListener('DOMContentLoaded', () => {
-          const injectedScript = new InjectedScript(win as any, false, sdkLanguage, testIdAttributeName, 1, 'chromium', []);
-          new ConsoleAPI(injectedScript);
-        });
-      }}></ToolbarButton>
-    </Toolbar>
-    <div ref={ref} className='snapshot-wrapper'>
-      <div className='snapshot-container' style={{
-        width: snapshotContainerSize.width + 'px',
-        height: snapshotContainerSize.height + 'px',
-        transform: `translate(${translate.x}px, ${translate.y}px) scale(${scale})`,
-      }}>
-        <BrowserFrame url={snapshotInfo.url} />
-        <div className='snapshot-switcher'>
-          <iframe ref={iframeRef0} name='snapshot' title='DOM Snapshot' className={loadingRef.current.visibleIframe === 0 ? 'snapshot-visible' : ''}></iframe>
-          <iframe ref={iframeRef1} name='snapshot' title='DOM Snapshot' className={loadingRef.current.visibleIframe === 1 ? 'snapshot-visible' : ''}></iframe>
-        </div>
+    <SnapshotWrapper snapshotInfo={snapshotInfo}>
+      <div className='snapshot-switcher'>
+        <iframe ref={iframeRef0} name='snapshot' title='DOM Snapshot' className={clsx(loadingRef.current.visibleIframe === 0 && 'snapshot-visible')}></iframe>
+        <iframe ref={iframeRef1} name='snapshot' title='DOM Snapshot' className={clsx(loadingRef.current.visibleIframe === 1 && 'snapshot-visible')}></iframe>
       </div>
+    </SnapshotWrapper>
+  </div>;
+};
+
+const SnapshotWrapper: React.FunctionComponent<React.PropsWithChildren<{
+  snapshotInfo: SnapshotInfo,
+}>> = ({ snapshotInfo, children }) => {
+  const [measure, ref] = useMeasure<HTMLDivElement>();
+
+  const windowHeaderHeight = 40;
+  const snapshotContainerSize = {
+    width: snapshotInfo.viewport.width,
+    height: snapshotInfo.viewport.height + windowHeaderHeight,
+  };
+
+  const scale = Math.min(measure.width / snapshotContainerSize.width, measure.height / snapshotContainerSize.height, 1);
+  const translate = {
+    x: (measure.width - snapshotContainerSize.width) / 2,
+    y: (measure.height - snapshotContainerSize.height) / 2,
+  };
+
+  return <div ref={ref} className='snapshot-wrapper'>
+    <div className='snapshot-container' style={{
+      width: snapshotContainerSize.width + 'px',
+      height: snapshotContainerSize.height + 'px',
+      transform: `translate(${translate.x}px, ${translate.y}px) scale(${scale})`,
+    }}>
+      <BrowserFrame url={snapshotInfo.url} />
+      {children}
     </div>
   </div>;
 };
@@ -231,30 +231,42 @@ export const InspectModeController: React.FunctionComponent<{
   isInspecting: boolean,
   sdkLanguage: Language,
   testIdAttributeName: string,
-  highlightedLocator: string,
-  setHighlightedLocator: (locator: string) => void,
+  highlightedElement: HighlightedElement,
+  setHighlightedElement: (element: HighlightedElement) => void,
   iteration: number,
-}> = ({ iframe, isInspecting, sdkLanguage, testIdAttributeName, highlightedLocator, setHighlightedLocator, iteration }) => {
+}> = ({ iframe, isInspecting, sdkLanguage, testIdAttributeName, highlightedElement, setHighlightedElement, iteration }) => {
   React.useEffect(() => {
+    const highlightedAriaSnapshot = highlightedElement.lastEdited === 'ariaSnapshot' ? highlightedElement.ariaSnapshot : undefined;
+    const highlightedLocator = highlightedElement.lastEdited === 'locator' ? highlightedElement.locator : undefined;
+    const forceRecorders = !!highlightedAriaSnapshot || !!highlightedLocator || isInspecting;
+
     const recorders: { recorder: Recorder, frameSelector: string }[] = [];
     const isUnderTest = new URLSearchParams(window.location.search).get('isUnderTest') === 'true';
     try {
-      createRecorders(recorders, sdkLanguage, testIdAttributeName, isUnderTest, '', iframe?.contentWindow);
+      createRecorders(recorders, forceRecorders, sdkLanguage, testIdAttributeName, isUnderTest, '', iframe?.contentWindow);
     } catch {
       // Potential cross-origin exceptions.
     }
 
+    const parsedSnapshot = highlightedAriaSnapshot ? parseAriaSnapshot(yaml, highlightedAriaSnapshot) : undefined;
+    const fullSelector = highlightedLocator ? locatorOrSelectorAsSelector(sdkLanguage, highlightedLocator, testIdAttributeName) : undefined;
     for (const { recorder, frameSelector } of recorders) {
-      const actionSelector = locatorOrSelectorAsSelector(sdkLanguage, highlightedLocator, testIdAttributeName);
+      const actionSelector = fullSelector?.startsWith(frameSelector) ? fullSelector.substring(frameSelector.length).trim() : undefined;
+      const ariaTemplate = parsedSnapshot?.errors.length === 0 ? parsedSnapshot.fragment : undefined;
       recorder.setUIState({
         mode: isInspecting ? 'inspecting' : 'none',
-        actionSelector: actionSelector.startsWith(frameSelector) ? actionSelector.substring(frameSelector.length).trim() : undefined,
+        actionSelector,
+        ariaTemplate,
         language: sdkLanguage,
         testIdAttributeName,
         overlay: { offsetX: 0 },
       }, {
-        async setSelector(selector: string) {
-          setHighlightedLocator(asLocator(sdkLanguage, frameSelector + selector));
+        async elementPicked(elementInfo: ElementInfo) {
+          setHighlightedElement({
+            locator: asLocator(sdkLanguage, frameSelector + elementInfo.selector),
+            ariaSnapshot: elementInfo.ariaSnapshot,
+            lastEdited: 'none',
+          });
         },
         highlightUpdated() {
           for (const r of recorders) {
@@ -264,28 +276,154 @@ export const InspectModeController: React.FunctionComponent<{
         }
       });
     }
-  }, [iframe, isInspecting, highlightedLocator, setHighlightedLocator, sdkLanguage, testIdAttributeName, iteration]);
+  }, [iframe, isInspecting, highlightedElement, setHighlightedElement, sdkLanguage, testIdAttributeName, iteration]);
   return <></>;
 };
 
-function createRecorders(recorders: { recorder: Recorder, frameSelector: string }[], sdkLanguage: Language, testIdAttributeName: string, isUnderTest: boolean, parentFrameSelector: string, frameWindow: Window | null | undefined) {
+function createRecorders(recorders: { recorder: Recorder, frameSelector: string }[], force: boolean, sdkLanguage: Language, testIdAttributeName: string, isUnderTest: boolean, parentFrameSelector: string, frameWindow: Window | null | undefined) {
   if (!frameWindow)
     return;
   const win = frameWindow as any;
-  if (!win._recorder) {
-    const injectedScript = new InjectedScript(frameWindow as any, isUnderTest, sdkLanguage, testIdAttributeName, 1, 'chromium', []);
+  if (!win._recorder && force) {
+    const injectedScript = new InjectedScript(frameWindow as any, { isUnderTest, sdkLanguage, testIdAttributeName, stableRafCount: 1, browserName: 'chromium', customEngines: [] });
     const recorder = new Recorder(injectedScript);
     win._injectedScript = injectedScript;
     win._recorder = { recorder, frameSelector: parentFrameSelector };
+    if (isUnderTest) {
+      (window as any)._weakRecordersForTest = (window as any)._weakRecordersForTest || new Set();
+      (window as any)._weakRecordersForTest.add(new WeakRef(recorder));
+    }
   }
-  recorders.push(win._recorder);
+  if (win._recorder)
+    recorders.push(win._recorder);
 
   for (let i = 0; i < frameWindow.frames.length; ++i) {
     const childFrame = frameWindow.frames[i];
     const frameSelector = childFrame.frameElement ? win._injectedScript.generateSelectorSimple(childFrame.frameElement, { omitInternalEngines: true, testIdAttributeName }) + ' >> internal:control=enter-frame >> ' : '';
-    createRecorders(recorders, sdkLanguage, testIdAttributeName, isUnderTest, parentFrameSelector + frameSelector, childFrame);
+    createRecorders(recorders, force, sdkLanguage, testIdAttributeName, isUnderTest, parentFrameSelector + frameSelector, childFrame);
+  }
+}
+
+export type Snapshot = {
+  action: ActionTraceEvent;
+  snapshotName: string;
+  point?: { x: number, y: number };
+  hasInputTarget?: boolean;
+};
+
+export type SnapshotInfo = {
+  url: string;
+  viewport: { width: number, height: number };
+  timestamp?: number;
+  wallTime?: undefined;
+};
+
+export type Snapshots = {
+  action?: Snapshot;
+  before?: Snapshot;
+  after?: Snapshot;
+};
+
+export type SnapshotUrls = {
+  snapshotInfoUrl: string;
+  snapshotUrl: string;
+  popoutUrl: string;
+};
+
+export function collectSnapshots(action: ActionTraceEvent | undefined): Snapshots {
+  if (!action)
+    return {};
+
+  let beforeSnapshot: Snapshot | undefined = action.beforeSnapshot ? { action, snapshotName: action.beforeSnapshot } : undefined;
+  if (!beforeSnapshot) {
+    // If the action has no beforeSnapshot, use the last available afterSnapshot.
+    for (let a = previousActionByEndTime(action); a; a = previousActionByEndTime(a)) {
+      if (a.endTime <= action.startTime && a.afterSnapshot) {
+        beforeSnapshot = { action: a, snapshotName: a.afterSnapshot };
+        break;
+      }
+    }
+  }
+
+  let afterSnapshot: Snapshot | undefined = action.afterSnapshot ? { action, snapshotName: action.afterSnapshot } : undefined;
+  if (!afterSnapshot) {
+    let last: ActionTraceEvent | undefined;
+    // - For test.step, we want to use the snapshot of the last nested action.
+    // - For a regular action, we use snapshot of any overlapping in time action
+    //   as a best effort.
+    // - If there are no "nested" actions, use the beforeSnapshot which works best
+    //   for simple `expect(a).toBe(b);` case. Also if the action doesn't have
+    //   afterSnapshot, it likely doesn't have its own beforeSnapshot either,
+    //   and we calculated it above from a previous action.
+    for (let a = nextActionByStartTime(action); a && a.startTime <= action.endTime; a = nextActionByStartTime(a)) {
+      if (a.endTime > action.endTime || !a.afterSnapshot)
+        continue;
+      if (last && last.endTime > a.endTime)
+        continue;
+      last = a;
+    }
+    if (last)
+      afterSnapshot = { action: last, snapshotName: last.afterSnapshot! };
+    else
+      afterSnapshot = beforeSnapshot;
+  }
+
+  const actionSnapshot: Snapshot | undefined = action.inputSnapshot ? { action, snapshotName: action.inputSnapshot, hasInputTarget: true } : afterSnapshot;
+  if (actionSnapshot)
+    actionSnapshot.point = action.point;
+  return { action: actionSnapshot, before: beforeSnapshot, after: afterSnapshot };
+}
+
+const isUnderTest = new URLSearchParams(window.location.search).has('isUnderTest');
+const serverParam = new URLSearchParams(window.location.search).get('server');
+
+export function extendSnapshot(snapshot: Snapshot, shouldPopulateCanvasFromScreenshot: boolean): SnapshotUrls {
+  const params = new URLSearchParams();
+  params.set('trace', context(snapshot.action).traceUrl);
+  params.set('name', snapshot.snapshotName);
+  if (isUnderTest)
+    params.set('isUnderTest', 'true');
+  if (snapshot.point) {
+    params.set('pointX', String(snapshot.point.x));
+    params.set('pointY', String(snapshot.point.y));
+    if (snapshot.hasInputTarget)
+      params.set('hasInputTarget', '1');
+  }
+  if (shouldPopulateCanvasFromScreenshot)
+    params.set('shouldPopulateCanvasFromScreenshot', '1');
+
+  const snapshotUrl = new URL(`snapshot/${snapshot.action.pageId}?${params.toString()}`, window.location.href).toString();
+  const snapshotInfoUrl = new URL(`snapshotInfo/${snapshot.action.pageId}?${params.toString()}`, window.location.href).toString();
+
+  const popoutParams = new URLSearchParams();
+  popoutParams.set('r', snapshotUrl);
+  if (serverParam)
+    popoutParams.set('server', serverParam);
+  popoutParams.set('trace', context(snapshot.action).traceUrl);
+  if (snapshot.point) {
+    popoutParams.set('pointX', String(snapshot.point.x));
+    popoutParams.set('pointY', String(snapshot.point.y));
+    if (snapshot.hasInputTarget)
+      params.set('hasInputTarget', '1');
+  }
+  const popoutUrl = new URL(`snapshot.html?${popoutParams.toString()}`, window.location.href).toString();
+  return { snapshotInfoUrl, snapshotUrl, popoutUrl };
+}
+
+export async function fetchSnapshotInfo(snapshotInfoUrl: string | undefined) {
+  const result = { url: '', viewport: kDefaultViewport, timestamp: undefined, wallTime: undefined };
+  if (snapshotInfoUrl) {
+    const response = await fetch(snapshotInfoUrl);
+    const info = await response.json();
+    if (!info.error) {
+      result.url = info.url;
+      result.viewport = info.viewport;
+      result.timestamp = info.timestamp;
+      result.wallTime = info.wallTime;
+    }
   }
+  return result;
 }
 
-const kDefaultViewport = { width: 1280, height: 720 };
+export const kDefaultViewport = { width: 1280, height: 720 };
 const kBlankSnapshotUrl = 'data:text/html,<body style="background: #ddd"></body>';
diff --git a/packages/trace-viewer/src/ui/sourceTab.css b/packages/trace-viewer/src/ui/sourceTab.css
index e4e43d80b6928..3b9a8261c888c 100644
--- a/packages/trace-viewer/src/ui/sourceTab.css
+++ b/packages/trace-viewer/src/ui/sourceTab.css
@@ -23,21 +23,15 @@
 }
 
 .source-tab-file-name {
-  height: 24px;
-  margin-left: 8px;
+  padding-left: 8px;
+  height: 100%;
   display: flex;
   align-items: center;
-  background-color: var(--vscode-breadcrumb-background);
-  box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px;
-  z-index: 10;
+  flex: 1 1 auto;
 }
 
-.source-tab-file-name .copy-icon.codicon {
-  display: block;
-  cursor: pointer;
+.source-tab-file-name div {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-
-.source-copy-to-clipboard {
-  display: block;
-  padding-left: 4px;
-}
\ No newline at end of file
diff --git a/packages/trace-viewer/src/ui/sourceTab.tsx b/packages/trace-viewer/src/ui/sourceTab.tsx
index f8952849cbe1c..4b03fd8c1553e 100644
--- a/packages/trace-viewer/src/ui/sourceTab.tsx
+++ b/packages/trace-viewer/src/ui/sourceTab.tsx
@@ -24,45 +24,33 @@ import type { SourceHighlight } from '@web/components/codeMirrorWrapper';
 import type { SourceLocation, SourceModel } from './modelUtil';
 import type { StackFrame } from '@protocol/channels';
 import { CopyToClipboard } from './copyToClipboard';
+import { ToolbarButton } from '@web/components/toolbarButton';
+import { Toolbar } from '@web/components/toolbar';
 
-export const SourceTab: React.FunctionComponent<{
-  stack: StackFrame[] | undefined,
-  stackFrameLocation: 'bottom' | 'right',
-  sources: Map<string, SourceModel>,
-  rootDir?: string,
-  fallbackLocation?: SourceLocation,
-}> = ({ stack, sources, rootDir, fallbackLocation, stackFrameLocation }) => {
-  const [lastStack, setLastStack] = React.useState<StackFrame[] | undefined>();
-  const [selectedFrame, setSelectedFrame] = React.useState<number>(0);
-
-  React.useEffect(() => {
-    if (lastStack !== stack) {
-      setLastStack(stack);
-      setSelectedFrame(0);
-    }
-  }, [stack, lastStack, setLastStack, setSelectedFrame]);
-
-  const { source, highlight, targetLine, fileName } = useAsyncMemo<{ source: SourceModel, targetLine?: number, fileName?: string, highlight: SourceHighlight[] }>(async () => {
+function useSources(stack: StackFrame[] | undefined, selectedFrame: number, sources: Map<string, SourceModel>, rootDir?: string, fallbackLocation?: SourceLocation) {
+  return useAsyncMemo<{ source: SourceModel, targetLine?: number, fileName?: string, highlight: SourceHighlight[], location?: SourceLocation }>(async () => {
     const actionLocation = stack?.[selectedFrame];
-    const shouldUseFallback = !actionLocation?.file;
-    if (shouldUseFallback && !fallbackLocation)
+    const location = actionLocation?.file ? actionLocation : fallbackLocation;
+    if (!location)
       return { source: { file: '', errors: [], content: undefined }, targetLine: 0, highlight: [] };
 
-    const file = shouldUseFallback ? fallbackLocation!.file : actionLocation.file;
+    const file = location.file;
     let source = sources.get(file);
     // Fallback location can fall outside the sources model.
     if (!source) {
-      source = { errors: fallbackLocation?.source?.errors || [], content: undefined };
+      source = { errors: fallbackLocation?.source?.errors || [], content: fallbackLocation?.source?.content };
       sources.set(file, source);
     }
 
-    const targetLine = shouldUseFallback ? fallbackLocation?.line || source.errors[0]?.line || 0 : actionLocation.line;
+    const targetLine = location?.line || source.errors[0]?.line || 0;
     const fileName = rootDir && file.startsWith(rootDir) ? file.substring(rootDir.length + 1) : file;
     const highlight: SourceHighlight[] = source.errors.map(e => ({ type: 'error', line: e.line, message: e.message }));
     highlight.push({ line: targetLine, type: 'running' });
 
     // After the source update, but before the test run, don't trust the cache.
-    if (source.content === undefined || shouldUseFallback) {
+    if (fallbackLocation?.source?.content !== undefined) {
+      source.content = fallbackLocation.source.content;
+    } else if (source.content === undefined || (location === fallbackLocation)) {
       const sha1 = await calculateSha1(file);
       try {
         let response = await fetch(`sha1/src@${sha1}.txt`);
@@ -76,25 +64,60 @@ export const SourceTab: React.FunctionComponent<{
         source.content = `<Unable to read "${file}">`;
       }
     }
-    return { source, highlight, targetLine, fileName };
+    return { source, highlight, targetLine, fileName, location };
   }, [stack, selectedFrame, rootDir, fallbackLocation], { source: { errors: [], content: 'Loading\u2026' }, highlight: [] });
+}
+
+export const SourceTab: React.FunctionComponent<{
+  stack?: StackFrame[],
+  stackFrameLocation: 'bottom' | 'right',
+  sources: Map<string, SourceModel>,
+  rootDir?: string,
+  fallbackLocation?: SourceLocation,
+  onOpenExternally?: (location: SourceLocation) => void,
+}> = ({ stack, sources, rootDir, fallbackLocation, stackFrameLocation, onOpenExternally }) => {
+  const [lastStack, setLastStack] = React.useState<StackFrame[] | undefined>();
+  const [selectedFrame, setSelectedFrame] = React.useState<number>(0);
+
+  React.useEffect(() => {
+    if (lastStack !== stack) {
+      setLastStack(stack);
+      setSelectedFrame(0);
+    }
+  }, [stack, lastStack, setLastStack, setSelectedFrame]);
+
+  const { source, highlight, targetLine, fileName, location } = useSources(stack, selectedFrame, sources, rootDir, fallbackLocation);
+
+  const openExternally = React.useCallback(() => {
+    if (!location)
+      return;
+    if (onOpenExternally) {
+      onOpenExternally(location);
+    } else {
+      // This should open an external protocol handler instead of actually navigating away.
+      window.location.href = `vscode://file//${location.file}:${location.line}`;
+    }
+  }, [onOpenExternally, location]);
 
   const showStackFrames = (stack?.length ?? 0) > 1;
+  const shortFileName = getFileName(fileName);
 
-  return <SplitView sidebarSize={200} orientation={stackFrameLocation === 'bottom' ? 'vertical' : 'horizontal'} sidebarHidden={!showStackFrames}>
-    <div className='vbox' data-testid='source-code'>
-      {fileName && (
-        <div className='source-tab-file-name'>
-          {fileName}
-          <span className='source-copy-to-clipboard'>
-            <CopyToClipboard description='Copy filename' value={getFileName(fileName, targetLine)}/>
-          </span>
+  return <SplitView
+    sidebarSize={200}
+    orientation={stackFrameLocation === 'bottom' ? 'vertical' : 'horizontal'}
+    sidebarHidden={!showStackFrames}
+    main={<div className='vbox' data-testid='source-code'>
+      { fileName && <Toolbar>
+        <div className='source-tab-file-name' title={fileName}>
+          <div>{shortFileName}</div>
         </div>
-      )}
-      <CodeMirrorWrapper text={source.content || ''} language='javascript' highlight={highlight} revealLine={targetLine} readOnly={true} lineNumbers={true} />
-    </div>
-    <StackTraceView stack={stack} selectedFrame={selectedFrame} setSelectedFrame={setSelectedFrame} />
-  </SplitView>;
+        <CopyToClipboard description='Copy filename' value={shortFileName}/>
+        {location && <ToolbarButton icon='link-external' title='Open in VS Code' onClick={openExternally}></ToolbarButton>}
+      </Toolbar> }
+      <CodeMirrorWrapper text={source.content || ''} highlighter='javascript' highlight={highlight} revealLine={targetLine} readOnly={true} lineNumbers={true} dataTestId='source-code-mirror'/>
+    </div>}
+    sidebar={<StackTraceView stack={stack} selectedFrame={selectedFrame} setSelectedFrame={setSelectedFrame} />}
+  />;
 };
 
 export async function calculateSha1(text: string): Promise<string> {
@@ -109,10 +132,9 @@ export async function calculateSha1(text: string): Promise<string> {
   return hexCodes.join('');
 }
 
-function getFileName(fullPath?: string, lineNum?: number): string {
+function getFileName(fullPath?: string): string {
   if (!fullPath)
     return '';
   const pathSep = fullPath?.includes('/') ? '/' : '\\';
-  const fileName = fullPath?.split(pathSep).pop() ?? '';
-  return lineNum ? `${fileName}:${lineNum}` : fileName;
+  return fullPath?.split(pathSep).pop() ?? '';
 }
diff --git a/packages/trace-viewer/src/ui/stackTrace.tsx b/packages/trace-viewer/src/ui/stackTrace.tsx
index 6a0bad1672742..f0e79cd673b53 100644
--- a/packages/trace-viewer/src/ui/stackTrace.tsx
+++ b/packages/trace-viewer/src/ui/stackTrace.tsx
@@ -29,6 +29,7 @@ export const StackTraceView: React.FunctionComponent<{
   const frames = stack || [];
   return <StackFrameListView
     name='stack-trace'
+    ariaLabel='Stack trace'
     items={frames}
     selectedItem={frames[selectedFrame]}
     render={frame => {
diff --git a/packages/trace-viewer/src/ui/tag.tsx b/packages/trace-viewer/src/ui/tag.tsx
index 29ba1546bac9e..057d70ac66d03 100644
--- a/packages/trace-viewer/src/ui/tag.tsx
+++ b/packages/trace-viewer/src/ui/tag.tsx
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
+import { clsx } from '@web/uiUtils';
 import './tag.css';
 
-export const TagView: React.FC<{ tag: string, style?: React.CSSProperties, onClick?: (e: React.MouseEvent) => void }> = ({ tag, style, onClick }) => {
+export const TagView = ({ tag, style, onClick }: { tag: string, style?: React.CSSProperties, onClick?: (e: React.MouseEvent) => void }) => {
   return <span
-    className={`tag tag-color-${tagNameToColor(tag)}`}
+    className={clsx('tag', `tag-color-${tagNameToColor(tag)}`)}
     onClick={onClick}
     style={{ margin: '6px 0 0 6px', ...style }}
     title={`Click to filter by tag: ${tag}`}
diff --git a/packages/trace-viewer/src/ui/timeline.tsx b/packages/trace-viewer/src/ui/timeline.tsx
index 1471220aa246e..e4010f972c287 100644
--- a/packages/trace-viewer/src/ui/timeline.tsx
+++ b/packages/trace-viewer/src/ui/timeline.tsx
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { msToString, useMeasure } from '@web/uiUtils';
+import { useSetting, clsx, msToString, useMeasure } from '@web/uiUtils';
 import { GlassPane } from '@web/shared/glassPane';
 import * as React from 'react';
-import type { Boundaries } from '../geometry';
+import type { Boundaries } from './geometry';
 import { FilmStrip } from './filmStrip';
 import type { FilmStripPreviewPoint } from './filmStrip';
 import type { ActionTraceEventInContext, MultiTraceModel } from './modelUtil';
@@ -25,6 +25,7 @@ import './timeline.css';
 import type { Language } from '@isomorphic/locatorGenerators';
 import type { Entry } from '@trace/har';
 import type { ConsoleEntry } from './consoleTab';
+import type { ActionGroup } from '@isomorphic/protocolFormatter';
 
 type TimelineBar = {
   action?: ActionTraceEventInContext;
@@ -53,6 +54,7 @@ export const Timeline: React.FunctionComponent<{
   const [measure, ref] = useMeasure<HTMLDivElement>();
   const [dragWindow, setDragWindow] = React.useState<{ startX: number, endX: number, pivot?: number, type: 'resize' | 'move' } | undefined>();
   const [previewPoint, setPreviewPoint] = React.useState<FilmStripPreviewPoint | undefined>();
+  const [actionsFilter] = useSetting<ActionGroup[]>('actionsFilter', []);
 
   const { offsets, curtainLeft, curtainRight } = React.useMemo(() => {
     let activeWindow = selectedTime || boundaries;
@@ -67,9 +69,11 @@ export const Timeline: React.FunctionComponent<{
     return { offsets: calculateDividerOffsets(measure.width, boundaries), curtainLeft, curtainRight };
   }, [selectedTime, boundaries, dragWindow, measure]);
 
+  const actions = React.useMemo(() => model?.filteredActions(actionsFilter), [model, actionsFilter]);
+
   const bars = React.useMemo(() => {
     const bars: TimelineBar[] = [];
-    for (const entry of model?.actions || []) {
+    for (const entry of actions || []) {
       if (entry.class === 'Test')
         continue;
       bars.push({
@@ -110,7 +114,7 @@ export const Timeline: React.FunctionComponent<{
     }
 
     return bars;
-  }, [model, consoleEntries, boundaries, measure]);
+  }, [model, actions, consoleEntries, boundaries, measure]);
 
   React.useMemo(() => {
     for (const bar of bars) {
@@ -154,7 +158,7 @@ export const Timeline: React.FunctionComponent<{
       return;
     const x = event.clientX - ref.current.getBoundingClientRect().left;
     const time = positionToTime(measure.width, boundaries, x);
-    const action = model?.actions.findLast(action => action.startTime <= time);
+    const action = actions?.findLast(action => action.startTime <= time);
 
     if (!event.buttons) {
       setDragWindow(undefined);
@@ -192,7 +196,7 @@ export const Timeline: React.FunctionComponent<{
     const time2 = positionToTime(measure.width, boundaries, newDragWindow.endX);
     if (time1 !== time2)
       setSelectedTime({ minimum: Math.min(time1, time2), maximum: Math.max(time1, time2) });
-  }, [boundaries, dragWindow, measure, model, onSelected, ref, setSelectedTime]);
+  }, [boundaries, dragWindow, measure, actions, onSelected, ref, setSelectedTime]);
 
   const onGlassPaneMouseUp = React.useCallback(() => {
     setPreviewPoint(undefined);
@@ -204,22 +208,22 @@ export const Timeline: React.FunctionComponent<{
       setSelectedTime({ minimum: Math.min(time1, time2), maximum: Math.max(time1, time2) });
     } else {
       const time = positionToTime(measure.width, boundaries, dragWindow.startX);
-      const action = model?.actions.findLast(action => action.startTime <= time);
+      const action = actions?.findLast(action => action.startTime <= time);
       if (action)
         onSelected(action);
       setSelectedTime(undefined);
     }
     setDragWindow(undefined);
-  }, [boundaries, dragWindow, measure, model, setSelectedTime, onSelected]);
+  }, [boundaries, dragWindow, measure, actions, setSelectedTime, onSelected]);
 
   const onMouseMove = React.useCallback((event: React.MouseEvent) => {
     if (!ref.current)
       return;
     const x = event.clientX - ref.current.getBoundingClientRect().left;
     const time = positionToTime(measure.width, boundaries, x);
-    const action = model?.actions.findLast(action => action.startTime <= time);
+    const action = actions?.findLast(action => action.startTime <= time);
     setPreviewPoint({ x, clientY: event.clientY, action, sdkLanguage });
-  }, [boundaries, measure, model, ref, sdkLanguage]);
+  }, [boundaries, measure, actions, ref, sdkLanguage]);
 
   const onMouseLeave = React.useCallback(() => {
     setPreviewPoint(undefined);
@@ -252,11 +256,12 @@ export const Timeline: React.FunctionComponent<{
       <div className='timeline-bars'>{
         bars.map((bar, index) => {
           return <div key={index}
-            className={'timeline-bar' + (bar.action ? ' action' : '')
-                                      + (bar.resource ? ' network' : '')
-                                      + (bar.consoleMessage ? ' console-message' : '')
-                                      + (bar.active ? ' active' : '')
-                                      + (bar.error ? ' error' : '')}
+            className={clsx('timeline-bar',
+                bar.action && 'action',
+                bar.resource && 'network',
+                bar.consoleMessage && 'console-message',
+                bar.active && 'active',
+                bar.error && 'error')}
             style={{
               left: bar.leftPosition,
               width: Math.max(5, bar.rightPosition - bar.leftPosition),
diff --git a/packages/trace-viewer/src/ui/uiModeFiltersView.tsx b/packages/trace-viewer/src/ui/uiModeFiltersView.tsx
index a6cff6ecf8025..8ed0f47982965 100644
--- a/packages/trace-viewer/src/ui/uiModeFiltersView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeFiltersView.tsx
@@ -20,7 +20,7 @@ import '@web/third_party/vscode/codicon.css';
 import { settings } from '@web/uiUtils';
 import React from 'react';
 import './uiModeFiltersView.css';
-import type { TestModel } from './uiModeModel';
+import type { TeleSuiteUpdaterTestModel } from '@testIsomorphic/teleSuiteUpdater';
 
 export const FiltersView: React.FC<{
   filterText: string;
@@ -29,7 +29,7 @@ export const FiltersView: React.FC<{
   setStatusFilters: (filters: Map<string, boolean>) => void;
   projectFilters: Map<string, boolean>;
   setProjectFilters: (filters: Map<string, boolean>) => void;
-  testModel: TestModel | undefined,
+  testModel: TeleSuiteUpdaterTestModel | undefined,
   runTests: () => void;
 }> = ({ filterText, setFilterText, statusFilters, setStatusFilters, projectFilters, setProjectFilters, testModel, runTests }) => {
   const [expanded, setExpanded] = React.useState(false);
@@ -58,11 +58,11 @@ export const FiltersView: React.FC<{
       <span className='filter-label'>Projects:</span> {projectsLine}
     </div>
     {expanded && <div className='hbox' style={{ marginLeft: 14, maxHeight: 200, overflowY: 'auto' }}>
-      <div className='filter-list'>
+      <div className='filter-list' role='list' data-testid='status-filters'>
         {[...statusFilters.entries()].map(([status, value]) => {
-          return <div className='filter-entry'>
+          return <div className='filter-entry' key={status} role='listitem'>
             <label>
-              <input type='checkbox' checked={value} onClick={() => {
+              <input type='checkbox' checked={value} onChange={() => {
                 const copy = new Map(statusFilters);
                 copy.set(status, !copy.get(status));
                 setStatusFilters(copy);
@@ -72,11 +72,11 @@ export const FiltersView: React.FC<{
           </div>;
         })}
       </div>
-      <div className='filter-list'>
+      <div className='filter-list' role='list' data-testid='project-filters'>
         {[...projectFilters.entries()].map(([projectName, value]) => {
-          return <div className='filter-entry'>
+          return <div className='filter-entry' key={projectName}  role='listitem'>
             <label>
-              <input type='checkbox' checked={value} onClick={() => {
+              <input type='checkbox' checked={value} onChange={() => {
                 const copy = new Map(projectFilters);
                 copy.set(projectName, !copy.get(projectName));
                 setProjectFilters(copy);
diff --git a/packages/trace-viewer/src/ui/uiModeTestListView.css b/packages/trace-viewer/src/ui/uiModeTestListView.css
index ae6fd624ee520..335daecfb1ad1 100644
--- a/packages/trace-viewer/src/ui/uiModeTestListView.css
+++ b/packages/trace-viewer/src/ui/uiModeTestListView.css
@@ -14,28 +14,28 @@
   limitations under the License.
 */
 
-.ui-mode-list-item {
+.ui-mode-tree-item {
   flex: auto;
 }
 
-.ui-mode-list-item-title {
+.ui-mode-tree-item-title {
   flex: auto;
   text-overflow: ellipsis;
   overflow: hidden;
 }
 
-.ui-mode-list-item-time {
+.ui-mode-tree-item-time {
   flex: none;
   color: var(--vscode-editorCodeLens-foreground);
   margin: 0 4px;
   user-select: none;
 }
 
-.tests-list-view .list-view-entry.selected .ui-mode-list-item-time,
-.tests-list-view .list-view-entry.highlighted .ui-mode-list-item-time {
+.tests-tree-view .tree-view-entry.selected .ui-mode-tree-item-time,
+.tests-tree-view .tree-view-entry.highlighted .ui-mode-tree-item-time {
   display: none;
 }
 
-.tests-list-view .list-view-entry:not(.highlighted):not(.selected) .toolbar-button:not(.toggled) {
+.tests-tree-view .tree-view-entry:not(.highlighted):not(.selected) .toolbar-button:not(.toggled) {
   display: none;
 }
diff --git a/packages/trace-viewer/src/ui/uiModeTestListView.tsx b/packages/trace-viewer/src/ui/uiModeTestListView.tsx
index 70574341d967b..1d6ddd850c6c9 100644
--- a/packages/trace-viewer/src/ui/uiModeTestListView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeTestListView.tsx
@@ -27,10 +27,10 @@ import type * as reporterTypes from 'playwright/types/testReporter';
 import React from 'react';
 import type { SourceLocation } from './modelUtil';
 import { testStatusIcon } from './testUtils';
-import type { TestModel } from './uiModeModel';
 import './uiModeTestListView.css';
 import type { TestServerConnection } from '@testIsomorphic/testServerConnection';
 import { TagView } from './tag';
+import type { TeleSuiteUpdaterTestModel } from '@testIsomorphic/teleSuiteUpdater';
 
 const TestTreeView = TreeView<TreeItem>;
 
@@ -38,20 +38,23 @@ export const TestListView: React.FC<{
   filterText: string,
   testTree: TestTree,
   testServerConnection: TestServerConnection | undefined,
-  testModel?: TestModel,
+  testModel?: TeleSuiteUpdaterTestModel,
   runTests: (mode: 'bounce-if-busy' | 'queue-if-busy', testIds: Set<string>) => void,
-  runningState?: { testIds: Set<string>, itemSelectedByUser?: boolean },
+  runningState?: { testIds: Set<string>, itemSelectedByUser?: boolean, completed?: boolean },
   watchAll: boolean,
   watchedTreeIds: { value: Set<string> },
   setWatchedTreeIds: (ids: { value: Set<string> }) => void,
   isLoading?: boolean,
   onItemSelected: (item: { treeItem?: TreeItem, testCase?: reporterTypes.TestCase, testFile?: SourceLocation }) => void,
   requestedCollapseAllCount: number,
-  setFilterText: (text: string) => void;
-}> = ({ filterText, testModel, testServerConnection, testTree, runTests, runningState, watchAll, watchedTreeIds, setWatchedTreeIds, isLoading, onItemSelected, requestedCollapseAllCount, setFilterText }) => {
+  requestedExpandAllCount: number,
+  setFilterText: (text: string) => void,
+  onRevealSource: () => void,
+}> = ({ filterText, testModel, testServerConnection, testTree, runTests, runningState, watchAll, watchedTreeIds, setWatchedTreeIds, isLoading, onItemSelected, requestedCollapseAllCount, requestedExpandAllCount, setFilterText, onRevealSource }) => {
   const [treeState, setTreeState] = React.useState<TreeState>({ expandedItems: new Map() });
   const [selectedTreeItemId, setSelectedTreeItemId] = React.useState<string | undefined>();
   const [collapseAllCount, setCollapseAllCount] = React.useState(requestedCollapseAllCount);
+  const [expandAllCount, setExpandAllCount] = React.useState(requestedExpandAllCount);
 
   // Look for a first failure within the run batch to select it.
   React.useEffect(() => {
@@ -66,6 +69,16 @@ export const TestListView: React.FC<{
       return;
     }
 
+    if (expandAllCount !== requestedExpandAllCount) {
+      treeState.expandedItems.clear();
+      for (const item of testTree.flatTreeItems())
+        treeState.expandedItems.set(item.id, true);
+      setExpandAllCount(requestedExpandAllCount);
+      setSelectedTreeItemId(undefined);
+      setTreeState({ ...treeState });
+      return;
+    }
+
     if (!runningState || runningState.itemSelectedByUser)
       return;
     let selectedTreeItem: TreeItem | undefined;
@@ -84,32 +97,27 @@ export const TestListView: React.FC<{
 
     if (selectedTreeItem)
       setSelectedTreeItemId(selectedTreeItem.id);
-  }, [runningState, setSelectedTreeItemId, testTree, collapseAllCount, setCollapseAllCount, requestedCollapseAllCount, treeState, setTreeState]);
+  }, [runningState, setSelectedTreeItemId, testTree, collapseAllCount, setCollapseAllCount, requestedCollapseAllCount, expandAllCount, setExpandAllCount, requestedExpandAllCount, treeState, setTreeState]);
 
-  // Compute selected item.
-  const { selectedTreeItem } = React.useMemo(() => {
+  // Compute selected item
+  const selectedTreeItem = React.useMemo(() => {
+    if (!selectedTreeItemId)
+      return undefined;
+    return testTree.treeItemById(selectedTreeItemId);
+  }, [selectedTreeItemId, testTree]);
+
+  // Handle selection effects separately
+  React.useEffect(() => {
     if (!testModel)
-      return { selectedTreeItem: undefined };
-    const selectedTreeItem = selectedTreeItemId ? testTree.treeItemById(selectedTreeItemId) : undefined;
-    let testFile: SourceLocation | undefined;
-    if (selectedTreeItem) {
-      testFile = {
-        file: selectedTreeItem.location.file,
-        line: selectedTreeItem.location.line,
-        source: {
-          errors: testModel.loadErrors.filter(e => e.location?.file === selectedTreeItem.location.file).map(e => ({ line: e.location!.line, message: e.message! })),
-          content: undefined,
-        }
-      };
-    }
+      return;
+    const testFile = itemLocation(selectedTreeItem, testModel);
     let selectedTest: reporterTypes.TestCase | undefined;
     if (selectedTreeItem?.kind === 'test')
       selectedTest = selectedTreeItem.test;
     else if (selectedTreeItem?.kind === 'case' && selectedTreeItem.tests.length === 1)
       selectedTest = selectedTreeItem.tests[0];
     onItemSelected({ treeItem: selectedTreeItem, testCase: selectedTest, testFile });
-    return { selectedTreeItem };
-  }, [onItemSelected, selectedTreeItemId, testModel, testTree]);
+  }, [testModel, selectedTreeItem, onItemSelected]);
 
   // Update watch all.
   React.useEffect(() => {
@@ -156,15 +164,18 @@ export const TestListView: React.FC<{
     rootItem={testTree.rootItem}
     dataTestId='test-tree'
     render={treeItem => {
-      return <div className='hbox ui-mode-list-item'>
-        <div className='ui-mode-list-item-title'>
-          <span title={treeItem.title}>{treeItem.title}</span>
+      const prefixId = treeItem.id.replace(/[^\w\d-_]/g, '-');
+      const labelId = prefixId + '-label';
+      const timeId = prefixId + '-time';
+      return <div className='hbox ui-mode-tree-item' aria-labelledby={`${labelId} ${timeId}`}>
+        <div id={labelId} className='ui-mode-tree-item-title'>
+          <span>{treeItem.title}</span>
           {treeItem.kind === 'case' ? treeItem.tags.map(tag => <TagView key={tag} tag={tag.slice(1)} onClick={e => handleTagClick(e, tag)} />) : null}
         </div>
-        {!!treeItem.duration && treeItem.status !== 'skipped' && <div className='ui-mode-list-item-time'>{msToString(treeItem.duration)}</div>}
+        {!!treeItem.duration && treeItem.status !== 'skipped' && <div id={timeId} className='ui-mode-tree-item-time'>{msToString(treeItem.duration)}</div>}
         <Toolbar noMinHeight={true} noShadow={true}>
-          <ToolbarButton icon='play' title='Run' onClick={() => runTreeItem(treeItem)} disabled={!!runningState}></ToolbarButton>
-          <ToolbarButton icon='go-to-file' title='Open in VS Code' onClick={() => testServerConnection?.openNoReply({ location: treeItem.location })} style={(treeItem.kind === 'group' && treeItem.subKind === 'folder') ? { visibility: 'hidden' } : {}}></ToolbarButton>
+          <ToolbarButton icon='play' title='Run' onClick={() => runTreeItem(treeItem)} disabled={!!runningState && !runningState.completed}></ToolbarButton>
+          <ToolbarButton icon='go-to-file' title='Show source' onClick={onRevealSource} style={(treeItem.kind === 'group' && treeItem.subKind === 'folder') ? { visibility: 'hidden' } : {}}></ToolbarButton>
           {!watchAll && <ToolbarButton icon='eye' title='Watch' onClick={() => {
             if (watchedTreeIds.value.has(treeItem.id))
               watchedTreeIds.value.delete(treeItem.id);
@@ -176,6 +187,7 @@ export const TestListView: React.FC<{
       </div>;
     }}
     icon={treeItem => testStatusIcon(treeItem.status)}
+    title={treeItem => treeItem.title}
     selectedItem={selectedTreeItem}
     onAccepted={runTreeItem}
     onSelected={treeItem => {
@@ -187,3 +199,17 @@ export const TestListView: React.FC<{
     autoExpandDepth={filterText ? 5 : 1}
     noItemsMessage={isLoading ? 'Loading\u2026' : 'No tests'} />;
 };
+
+function itemLocation(item: TreeItem | undefined, model: TeleSuiteUpdaterTestModel | undefined): SourceLocation | undefined {
+  if (!item || !model)
+    return;
+  return {
+    file: item.location.file,
+    line: item.location.line,
+    column: item.location.column,
+    source: {
+      errors: model.loadErrors.filter(e => e.location?.file === item.location.file).map(e => ({ line: e.location!.line, message: e.message! })),
+      content: undefined,
+    }
+  };
+}
diff --git a/packages/trace-viewer/src/ui/uiModeTraceView.tsx b/packages/trace-viewer/src/ui/uiModeTraceView.tsx
index d26f0c34736cc..7c4a964a56086 100644
--- a/packages/trace-viewer/src/ui/uiModeTraceView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeTraceView.tsx
@@ -16,23 +16,23 @@
 
 import { artifactsFolderName } from '@testIsomorphic/folders';
 import type { TreeItem } from '@testIsomorphic/testTree';
-import type { ActionTraceEvent } from '@trace/trace';
 import '@web/common.css';
 import '@web/third_party/vscode/codicon.css';
 import type * as reporterTypes from 'playwright/types/testReporter';
 import React from 'react';
-import type { ContextEntry } from '../entries';
+import type { ContextEntry } from '../types/entries';
 import type { SourceLocation } from './modelUtil';
-import { idForAction, MultiTraceModel } from './modelUtil';
+import { MultiTraceModel } from './modelUtil';
 import { Workbench } from './workbench';
-import { type Setting } from '@web/uiUtils';
 
 export const TraceView: React.FC<{
-  showRouteActionsSetting: Setting<boolean>,
   item: { treeItem?: TreeItem, testFile?: SourceLocation, testCase?: reporterTypes.TestCase },
   rootDir?: string,
-}> = ({ showRouteActionsSetting, item, rootDir }) => {
-  const [model, setModel] = React.useState<{ model: MultiTraceModel, isLive: boolean } | undefined>();
+  onOpenExternally?: (location: SourceLocation) => void,
+  revealSource?: boolean,
+  pathSeparator: string,
+}> = ({ item, rootDir, onOpenExternally, revealSource, pathSeparator }) => {
+  const [model, setModel] = React.useState<{ model: MultiTraceModel, isLive: boolean } | undefined>(undefined);
   const [counter, setCounter] = React.useState(0);
   const pollTimer = React.useRef<NodeJS.Timeout | null>(null);
 
@@ -41,12 +41,6 @@ export const TraceView: React.FC<{
     return { outputDir };
   }, [item]);
 
-  // Preserve user selection upon live-reloading trace model by persisting the action id.
-  // This avoids auto-selection of the last action every time we reload the model.
-  const [selectedActionId, setSelectedActionId] = React.useState<string | undefined>();
-  const onSelectionChanged = React.useCallback((action: ActionTraceEvent) => setSelectedActionId(idForAction(action)), [setSelectedActionId]);
-  const initialSelection = selectedActionId ? model?.model.actions.find(a => idForAction(a) === selectedActionId) : undefined;
-
   React.useEffect(() => {
     if (pollTimer.current)
       clearTimeout(pollTimer.current);
@@ -69,14 +63,21 @@ export const TraceView: React.FC<{
       return;
     }
 
-    const traceLocation = `${outputDir}/${artifactsFolderName(result!.workerIndex)}/traces/${item.testCase?.id}.json`;
+    const traceLocation = [
+      outputDir,
+      artifactsFolderName(result!.workerIndex),
+      'traces',
+      `${item.testCase?.id}.json`
+    ].join(pathSeparator);
     // Start polling running test.
     pollTimer.current = setTimeout(async () => {
       try {
         const model = await loadSingleTraceFile(traceLocation);
         setModel({ model, isLive: true });
       } catch {
-        setModel(undefined);
+        const model = new MultiTraceModel([]);
+        model.errorDescriptors.push(...result.errors.flatMap(error => !!error.message ? [{ message: error.message }] : []));
+        setModel({ model, isLive: false });
       } finally {
         setCounter(counter + 1);
       }
@@ -85,19 +86,20 @@ export const TraceView: React.FC<{
       if (pollTimer.current)
         clearTimeout(pollTimer.current);
     };
-  }, [outputDir, item, setModel, counter, setCounter]);
+  }, [outputDir, item, setModel, counter, setCounter, pathSeparator]);
 
   return <Workbench
     key='workbench'
-    showRouteActionsSetting={showRouteActionsSetting}
     model={model?.model}
     showSourcesFirst={true}
     rootDir={rootDir}
-    initialSelection={initialSelection}
-    onSelectionChanged={onSelectionChanged}
     fallbackLocation={item.testFile}
     isLive={model?.isLive}
-    status={item.treeItem?.status} />;
+    status={item.treeItem?.status}
+    annotations={item.testCase?.annotations ?? []}
+    onOpenExternally={onOpenExternally}
+    revealSource={revealSource}
+  />;
 };
 
 const outputDirForTestCase = (testCase: reporterTypes.TestCase): string | undefined => {
@@ -111,6 +113,7 @@ const outputDirForTestCase = (testCase: reporterTypes.TestCase): string | undefi
 async function loadSingleTraceFile(url: string): Promise<MultiTraceModel> {
   const params = new URLSearchParams();
   params.set('trace', url);
+  params.set('limit', '1');
   const response = await fetch(`contexts?${params.toString()}`);
   const contextEntries = await response.json() as ContextEntry[];
   return new MultiTraceModel(contextEntries);
diff --git a/packages/trace-viewer/src/ui/uiModeView.css b/packages/trace-viewer/src/ui/uiModeView.css
index f7463aaaac2b8..de89b911c33b7 100644
--- a/packages/trace-viewer/src/ui/uiModeView.css
+++ b/packages/trace-viewer/src/ui/uiModeView.css
@@ -24,7 +24,7 @@
 }
 
 .ui-mode-sidebar > .settings-view {
-  margin: 0 0 3px 23px;
+  margin: 0 0 8px 23px;
 }
 
 .ui-mode-sidebar input[type=search] {
diff --git a/packages/trace-viewer/src/ui/uiModeView.tsx b/packages/trace-viewer/src/ui/uiModeView.tsx
index 5bff9543aab52..4375018765aea 100644
--- a/packages/trace-viewer/src/ui/uiModeView.tsx
+++ b/packages/trace-viewer/src/ui/uiModeView.tsx
@@ -18,8 +18,7 @@ import '@web/third_party/vscode/codicon.css';
 import '@web/common.css';
 import React from 'react';
 import { TeleSuite } from '@testIsomorphic/teleReceiver';
-import { TeleSuiteUpdater } from './teleSuiteUpdater';
-import type { Progress } from './uiModeModel';
+import { TeleSuiteUpdater, type TeleSuiteUpdaterProgress, type TeleSuiteUpdaterTestModel } from '@testIsomorphic/teleSuiteUpdater';
 import type { TeleTestCase } from '@testIsomorphic/teleReceiver';
 import type * as reporterTypes from 'playwright/types/testReporter';
 import { SplitView } from '@web/components/splitView';
@@ -29,17 +28,15 @@ import { ToolbarButton } from '@web/components/toolbarButton';
 import { Toolbar } from '@web/components/toolbar';
 import type { XtermDataSource } from '@web/components/xtermWrapper';
 import { XtermWrapper } from '@web/components/xtermWrapper';
-import { useDarkModeSetting } from '@web/theme';
-import { settings, useSetting } from '@web/uiUtils';
+import { clsx, settings, useSetting } from '@web/uiUtils';
 import { statusEx, TestTree } from '@testIsomorphic/testTree';
 import type { TreeItem  } from '@testIsomorphic/testTree';
-import { TestServerConnection } from '@testIsomorphic/testServerConnection';
-import { pathSeparator } from './uiModeModel';
-import type { TestModel } from './uiModeModel';
+import { TestServerConnection, WebSocketTestServerTransport } from '@testIsomorphic/testServerConnection';
 import { FiltersView } from './uiModeFiltersView';
 import { TestListView } from './uiModeTestListView';
 import { TraceView } from './uiModeTraceView';
 import { SettingsView } from './settingsView';
+import { DefaultSettingsView } from './defaultSettingsView';
 
 let xtermSize = { cols: 80, rows: 24 };
 const xtermDataSource: XtermDataSource = {
@@ -50,20 +47,19 @@ const xtermDataSource: XtermDataSource = {
 };
 
 const searchParams = new URLSearchParams(window.location.search);
-const guid = searchParams.get('ws');
-const wsURL = new URL(`../${guid}`, window.location.toString());
-wsURL.protocol = (window.location.protocol === 'https:' ? 'wss:' : 'ws:');
+const testServerBaseUrl = new URL(searchParams.get('server') ?? '../', window.location.href);
+const wsURL = new URL(searchParams.get('ws')!, testServerBaseUrl);
+wsURL.protocol = (wsURL.protocol === 'https:' ? 'wss:' : 'ws:');
 const queryParams = {
   args: searchParams.getAll('arg'),
   grep: searchParams.get('grep') || undefined,
   grepInvert: searchParams.get('grepInvert') || undefined,
   projects: searchParams.getAll('project'),
   workers: searchParams.get('workers') || undefined,
-  timeout: searchParams.has('timeout') ? +searchParams.get('timeout')! : undefined,
   headed: searchParams.has('headed'),
-  outputDir: searchParams.get('outputDir') || undefined,
   updateSnapshots: (searchParams.get('updateSnapshots') as 'all' | 'none' | 'missing' | undefined) || undefined,
   reporters: searchParams.has('reporter') ? searchParams.getAll('reporter') : undefined,
+  pathSeparator: searchParams.get('pathSeparator') || '/',
 };
 if (queryParams.updateSnapshots && !['all', 'none', 'missing'].includes(queryParams.updateSnapshots))
   queryParams.updateSnapshots = undefined;
@@ -74,62 +70,48 @@ export const UIModeView: React.FC<{}> = ({
 }) => {
   const [filterText, setFilterText] = React.useState<string>('');
   const [isShowingOutput, setIsShowingOutput] = React.useState<boolean>(false);
+  const [outputContainsError, setOutputContainsError] = React.useState(false);
   const [statusFilters, setStatusFilters] = React.useState<Map<string, boolean>>(new Map([
     ['passed', false],
     ['failed', false],
     ['skipped', false],
   ]));
   const [projectFilters, setProjectFilters] = React.useState<Map<string, boolean>>(new Map());
-  const [testModel, setTestModel] = React.useState<TestModel>();
-  const [progress, setProgress] = React.useState<Progress & { total: number } | undefined>();
+  const [testModel, setTestModel] = React.useState<TeleSuiteUpdaterTestModel>();
+  const [progress, setProgress] = React.useState<TeleSuiteUpdaterProgress & { total: number } | undefined>();
   const [selectedItem, setSelectedItem] = React.useState<{ treeItem?: TreeItem, testFile?: SourceLocation, testCase?: reporterTypes.TestCase }>({});
   const [visibleTestIds, setVisibleTestIds] = React.useState<Set<string>>(new Set());
   const [isLoading, setIsLoading] = React.useState<boolean>(false);
-  const [runningState, setRunningState] = React.useState<{ testIds: Set<string>, itemSelectedByUser?: boolean } | undefined>();
+  const [runningState, setRunningState] = React.useState<{ testIds: Set<string>, itemSelectedByUser?: boolean, completed?: boolean } | undefined>();
+  const isRunningTest = runningState && !runningState.completed;
+
   const [watchAll, setWatchAll] = useSetting<boolean>('watch-all', false);
   const [watchedTreeIds, setWatchedTreeIds] = React.useState<{ value: Set<string> }>({ value: new Set() });
   const commandQueue = React.useRef(Promise.resolve());
   const runTestBacklog = React.useRef<Set<string>>(new Set());
   const [collapseAllCount, setCollapseAllCount] = React.useState(0);
+  const [expandAllCount, setExpandAllCount] = React.useState(0);
   const [isDisconnected, setIsDisconnected] = React.useState(false);
   const [hasBrowsers, setHasBrowsers] = React.useState(true);
   const [testServerConnection, setTestServerConnection] = React.useState<TestServerConnection>();
+  const [teleSuiteUpdater, setTeleSuiteUpdater] = React.useState<TeleSuiteUpdater>();
   const [settingsVisible, setSettingsVisible] = React.useState(false);
   const [testingOptionsVisible, setTestingOptionsVisible] = React.useState(false);
+  const [revealSource, setRevealSource] = React.useState(false);
+  const onRevealSource = React.useCallback(() => setRevealSource(true), [setRevealSource]);
 
-  const [runWorkers, setRunWorkers] = React.useState(queryParams.workers);
-  const singleWorkerSetting = React.useMemo(() => {
-    return [
-      runWorkers === '1',
-      (value: boolean) => {
-        // When started with `--workers=1`, the setting allows to undo that.
-        // Otherwise, fallback to the cli `--workers=X` argument.
-        setRunWorkers(value ? '1' : (queryParams.workers === '1' ? undefined : queryParams.workers));
-      },
-      'Single worker',
-    ] as const;
-  }, [runWorkers, setRunWorkers]);
-
-  const [runHeaded, setRunHeaded] = React.useState(queryParams.headed);
-  const showBrowserSetting = React.useMemo(() => [runHeaded, setRunHeaded, 'Show browser'] as const, [runHeaded, setRunHeaded]);
-
-  const [runUpdateSnapshots, setRunUpdateSnapshots] = React.useState(queryParams.updateSnapshots);
-  const updateSnapshotsSetting = React.useMemo(() => {
-    return [
-      runUpdateSnapshots === 'all',
-      (value: boolean) => setRunUpdateSnapshots(value ? 'all' : 'missing'),
-      'Update snapshots',
-    ] as const;
-  }, [runUpdateSnapshots, setRunUpdateSnapshots]);
-
-  const [, , showRouteActionsSetting] = useSetting('show-route-actions', true, 'Show route actions');
-
-  const darkModeSetting = useDarkModeSetting();
+  const showTestingOptions = false;
+  const [singleWorker, setSingleWorker] = React.useState(false);
+  const [showBrowser, setShowBrowser] = React.useState(false);
+  const [updateSnapshots, setUpdateSnapshots] = React.useState(false);
 
   const inputRef = React.useRef<HTMLInputElement>(null);
 
   const reloadTests = React.useCallback(() => {
-    setTestServerConnection(new TestServerConnection(wsURL.toString()));
+    setTestServerConnection(prevConnection => {
+      prevConnection?.close();
+      return new TestServerConnection(new WebSocketTestServerTransport(wsURL));
+    });
   }, []);
 
   // Load tests on startup.
@@ -151,6 +133,9 @@ export const UIModeView: React.FC<{}> = ({
         } else {
           xtermDataSource.write(params.text!);
         }
+
+        if (params.type === 'stderr')
+          setOutputContainsError(true);
       }),
       testServerConnection.onClose(() => setIsDisconnected(true))
     ];
@@ -185,24 +170,12 @@ export const UIModeView: React.FC<{}> = ({
       },
       onError: error => {
         xtermDataSource.write((error.stack || error.value || '') + '\n');
+        setOutputContainsError(true);
       },
-      pathSeparator,
+      pathSeparator: queryParams.pathSeparator,
     });
 
-    const updateList = async () => {
-      commandQueue.current = commandQueue.current.then(async () => {
-        setIsLoading(true);
-        try {
-          const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert });
-          teleSuiteUpdater.processListReport(result.report);
-        } catch (e) {
-          // eslint-disable-next-line no-console
-          console.log(e);
-        } finally {
-          setIsLoading(false);
-        }
-      });
-    };
+    setTeleSuiteUpdater(teleSuiteUpdater);
 
     setTestModel(undefined);
     setIsLoading(true);
@@ -221,7 +194,6 @@ export const UIModeView: React.FC<{}> = ({
         const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert });
         teleSuiteUpdater.processListReport(result.report);
 
-        testServerConnection.onListChanged(updateList);
         testServerConnection.onReport(params => {
           teleSuiteUpdater.processTestReportEvent(params);
         });
@@ -254,36 +226,36 @@ export const UIModeView: React.FC<{}> = ({
         newFilter.set(projectSuite.title, !!selectedProjects?.includes(projectSuite.title));
     }
     if (!selectedProjects && newFilter.size && ![...newFilter.values()].includes(true))
-      newFilter.set(newFilter.entries().next().value[0], true);
+      newFilter.set(newFilter.entries().next().value![0], true);
     if (projectFilters.size !== newFilter.size || [...projectFilters].some(([k, v]) => newFilter.get(k) !== v))
       setProjectFilters(newFilter);
   }, [projectFilters, testModel]);
 
   // Update progress.
   React.useEffect(() => {
-    if (runningState && testModel?.progress)
+    if (isRunningTest && testModel?.progress)
       setProgress(testModel.progress);
     else if (!testModel)
       setProgress(undefined);
-  }, [testModel, runningState]);
+  }, [testModel, isRunningTest]);
 
   // Test tree is built from the model and filters.
   const { testTree } = React.useMemo(() => {
     if (!testModel)
-      return { testTree: new TestTree('', new TeleSuite('', 'root'), [], projectFilters, pathSeparator) };
-    const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, pathSeparator);
-    testTree.filterTree(filterText, statusFilters, runningState?.testIds);
+      return { testTree: new TestTree('', new TeleSuite('', 'root'), [], projectFilters, queryParams.pathSeparator) };
+    const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, queryParams.pathSeparator);
+    testTree.filterTree(filterText, statusFilters, isRunningTest ? runningState?.testIds : undefined);
     testTree.sortAndPropagateStatus();
     testTree.shortenRoot();
     testTree.flattenForSingleProject();
     setVisibleTestIds(testTree.testIds());
     return { testTree };
-  }, [filterText, testModel, statusFilters, projectFilters, setVisibleTestIds, runningState]);
+  }, [filterText, testModel, statusFilters, projectFilters, setVisibleTestIds, runningState, isRunningTest]);
 
   const runTests = React.useCallback((mode: 'queue-if-busy' | 'bounce-if-busy', testIds: Set<string>) => {
     if (!testServerConnection || !testModel)
       return;
-    if (mode === 'bounce-if-busy' && runningState)
+    if (mode === 'bounce-if-busy' && isRunningTest)
       return;
 
     runTestBacklog.current = new Set([...runTestBacklog.current, ...testIds]);
@@ -316,11 +288,9 @@ export const UIModeView: React.FC<{}> = ({
         grepInvert: queryParams.grepInvert,
         testIds: [...testIds],
         projects: [...projectFilters].filter(([_, v]) => v).map(([p]) => p),
-        workers: runWorkers,
-        timeout: queryParams.timeout,
-        headed: runHeaded,
-        outputDir: queryParams.outputDir,
-        updateSnapshots: runUpdateSnapshots,
+        ...(singleWorker ? { workers: '1' } : {}),
+        ...(showBrowser ? { headed: true } : {}),
+        ...(updateSnapshots ? { updateSnapshots: 'all' } : {}),
         reporters: queryParams.reporters,
         trace: 'on',
       });
@@ -330,15 +300,36 @@ export const UIModeView: React.FC<{}> = ({
           test.results = [];
       }
       setTestModel({ ...testModel });
-      setRunningState(undefined);
+      setRunningState(oldState => oldState ? ({ ...oldState, completed: true }) : undefined);
     });
-  }, [projectFilters, runningState, testModel, testServerConnection, runWorkers, runHeaded, runUpdateSnapshots]);
+  }, [projectFilters, isRunningTest, testModel, testServerConnection, singleWorker, showBrowser, updateSnapshots]);
 
-  // Watch implementation.
   React.useEffect(() => {
-    if (!testServerConnection)
+    if (!testServerConnection || !teleSuiteUpdater)
       return;
-    const disposable = testServerConnection.onTestFilesChanged(params => {
+    const disposable = testServerConnection.onTestFilesChanged(async params => {
+      // fetch the new list of tests
+      commandQueue.current = commandQueue.current.then(async () => {
+        setIsLoading(true);
+        try {
+          const result = await testServerConnection.listTests({ projects: queryParams.projects, locations: queryParams.args, grep: queryParams.grep, grepInvert: queryParams.grepInvert });
+          teleSuiteUpdater.processListReport(result.report);
+        } catch (e) {
+          // eslint-disable-next-line no-console
+          console.log(e);
+        } finally {
+          setIsLoading(false);
+        }
+      });
+      await commandQueue.current;
+
+      if (params.testFiles.length === 0)
+        return;
+
+      // run affected watched tests
+      const testModel = teleSuiteUpdater.asModel();
+      const testTree = new TestTree('', testModel.rootSuite, testModel.loadErrors, projectFilters, queryParams.pathSeparator);
+
       const testIds: string[] = [];
       const set = new Set(params.testFiles);
       if (watchAll) {
@@ -361,7 +352,7 @@ export const UIModeView: React.FC<{}> = ({
       runTests('queue-if-busy', new Set(testIds));
     });
     return () => disposable.dispose();
-  }, [runTests, testServerConnection, testTree, watchAll, watchedTreeIds]);
+  }, [runTests, testServerConnection, watchAll, watchedTreeIds, teleSuiteUpdater, projectFilters]);
 
   // Shortcuts.
   React.useEffect(() => {
@@ -385,7 +376,6 @@ export const UIModeView: React.FC<{}> = ({
     };
   }, [runTests, reloadTests, testServerConnection, visibleTestIds, isShowingOutput]);
 
-  const isRunningTest = !!runningState;
   const dialogRef = React.useRef<HTMLDialogElement>(null);
   const openInstallDialog = React.useCallback((e: React.MouseEvent) => {
     e.preventDefault();
@@ -423,27 +413,41 @@ export const UIModeView: React.FC<{}> = ({
       <div className='title'>UI Mode disconnected</div>
       <div><a href='#' onClick={() => window.location.href = '/'}>Reload the page</a> to reconnect</div>
     </div>}
-    <SplitView sidebarSize={250} minSidebarSize={150} orientation='horizontal' sidebarIsFirst={true} settingName='testListSidebar'>
-      <div className='vbox'>
-        <div className={'vbox' + (isShowingOutput ? '' : ' hidden')}>
+    <SplitView
+      sidebarSize={250}
+      minSidebarSize={150}
+      orientation='horizontal'
+      sidebarIsFirst={true}
+      settingName='testListSidebar'
+      main={<div className='vbox'>
+        <div className={clsx('vbox', !isShowingOutput && 'hidden')}>
           <Toolbar>
             <div className='section-title' style={{ flex: 'none' }}>Output</div>
-            <ToolbarButton icon='circle-slash' title='Clear output' onClick={() => xtermDataSource.clear()}></ToolbarButton>
+            <ToolbarButton icon='circle-slash' title='Clear output' onClick={() => { xtermDataSource.clear(); setOutputContainsError(false); }}></ToolbarButton>
             <div className='spacer'></div>
             <ToolbarButton icon='close' title='Close' onClick={() => setIsShowingOutput(false)}></ToolbarButton>
           </Toolbar>
           <XtermWrapper source={xtermDataSource}></XtermWrapper>
         </div>
-        <div className={'vbox' + (isShowingOutput ? ' hidden' : '')}>
-          <TraceView showRouteActionsSetting={showRouteActionsSetting} item={selectedItem} rootDir={testModel?.config?.rootDir} />
+        <div className={clsx('vbox', isShowingOutput && 'hidden')}>
+          <TraceView
+            pathSeparator={queryParams.pathSeparator}
+            item={selectedItem}
+            rootDir={testModel?.config?.rootDir}
+            revealSource={revealSource}
+            onOpenExternally={location => testServerConnection?.openNoReply({ location: { file: location.file, line: location.line, column: location.column } })}
+          />
         </div>
-      </div>
-      <div className='vbox ui-mode-sidebar'>
+      </div>}
+      sidebar={<div className='vbox ui-mode-sidebar'>
         <Toolbar noShadow={true} noMinHeight={true}>
           <img src='playwright-logo.svg' alt='Playwright logo' />
           <div className='section-title'>Playwright</div>
           <ToolbarButton icon='refresh' title='Reload' onClick={() => reloadTests()} disabled={isRunningTest || isLoading}></ToolbarButton>
-          <ToolbarButton icon='terminal' title={'Toggle output — ' + (isMac ? '⌃`' : 'Ctrl + `')} toggled={isShowingOutput} onClick={() => { setIsShowingOutput(!isShowingOutput); }} />
+          <div style={{ position: 'relative' }}>
+            <ToolbarButton icon={'terminal'} title={'Toggle output — ' + (isMac ? '⌃`' : 'Ctrl + `')} toggled={isShowingOutput} onClick={() => { setIsShowingOutput(!isShowingOutput); }} />
+            {outputContainsError && <div title='Output contains error' style={{ position: 'absolute', top: 2, right: 2, width: 7, height: 7, borderRadius: '50%', backgroundColor: 'var(--vscode-notificationsErrorIcon-foreground)' }} />}
+          </div>
           {!hasBrowsers && <ToolbarButton icon='lightbulb-autofix' style={{ color: 'var(--vscode-list-warningForeground)' }} title='Playwright browsers are missing' onClick={openInstallDialog} />}
         </Toolbar>
         <FiltersView
@@ -472,6 +476,9 @@ export const UIModeView: React.FC<{}> = ({
           <ToolbarButton icon='collapse-all' title='Collapse all' onClick={() => {
             setCollapseAllCount(collapseAllCount + 1);
           }} />
+          <ToolbarButton icon='expand-all' title='Expand all' onClick={() => {
+            setExpandAllCount(expandAllCount + 1);
+          }} />
         </Toolbar>
         <TestListView
           filterText={filterText}
@@ -486,21 +493,25 @@ export const UIModeView: React.FC<{}> = ({
           setWatchedTreeIds={setWatchedTreeIds}
           isLoading={isLoading}
           requestedCollapseAllCount={collapseAllCount}
+          requestedExpandAllCount={expandAllCount}
           setFilterText={setFilterText}
+          onRevealSource={onRevealSource}
         />
-        <Toolbar noShadow={true} noMinHeight={true} className='settings-toolbar' onClick={() => setTestingOptionsVisible(!testingOptionsVisible)}>
-          <span
-            className={`codicon codicon-${testingOptionsVisible ? 'chevron-down' : 'chevron-right'}`}
-            style={{ marginLeft: 5 }}
-            title={testingOptionsVisible ? 'Hide Testing Options' : 'Show Testing Options'}
-          />
-          <div className='section-title'>Testing Options</div>
-        </Toolbar>
-        {testingOptionsVisible && <SettingsView settings={[
-          singleWorkerSetting,
-          showBrowserSetting,
-          updateSnapshotsSetting,
-        ]} />}
+        {showTestingOptions && <>
+          <Toolbar noShadow={true} noMinHeight={true} className='settings-toolbar' onClick={() => setTestingOptionsVisible(!testingOptionsVisible)}>
+            <span
+              className={`codicon codicon-${testingOptionsVisible ? 'chevron-down' : 'chevron-right'}`}
+              style={{ marginLeft: 5 }}
+              title={testingOptionsVisible ? 'Hide Testing Options' : 'Show Testing Options'}
+            />
+            <div className='section-title'>Testing Options</div>
+          </Toolbar>
+          {testingOptionsVisible && <SettingsView settings={[
+            { value: singleWorker, set: setSingleWorker, name: 'Single worker' },
+            { value: showBrowser, set: setShowBrowser, name: 'Show browser' },
+            { value: updateSnapshots, set: setUpdateSnapshots, name: 'Update snapshots' },
+          ]} />}
+        </>}
         <Toolbar noShadow={true} noMinHeight={true} className='settings-toolbar' onClick={() => setSettingsVisible(!settingsVisible)}>
           <span
             className={`codicon codicon-${settingsVisible ? 'chevron-down' : 'chevron-right'}`}
@@ -509,11 +520,9 @@ export const UIModeView: React.FC<{}> = ({
           />
           <div className='section-title'>Settings</div>
         </Toolbar>
-        {settingsVisible && <SettingsView settings={[
-          darkModeSetting,
-          showRouteActionsSetting,
-        ]} />}
+        {settingsVisible && <DefaultSettingsView />}
       </div>
-    </SplitView>
+      }
+    />
   </div>;
 };
diff --git a/packages/trace-viewer/src/ui/workbench.tsx b/packages/trace-viewer/src/ui/workbench.tsx
index 2755262045271..9c0a3fccc34d0 100644
--- a/packages/trace-viewer/src/ui/workbench.tsx
+++ b/packages/trace-viewer/src/ui/workbench.tsx
@@ -23,115 +23,153 @@ import { ErrorsTab, useErrorsTabModel } from './errorsTab';
 import type { ConsoleEntry } from './consoleTab';
 import { ConsoleTab, useConsoleTabModel } from './consoleTab';
 import type * as modelUtil from './modelUtil';
-import type { ActionTraceEventInContext, MultiTraceModel } from './modelUtil';
-import type { StackFrame } from '@protocol/channels';
 import { NetworkTab, useNetworkTabModel } from './networkTab';
-import { SnapshotTab } from './snapshotTab';
+import { SnapshotTabsView } from './snapshotTab';
 import { SourceTab } from './sourceTab';
 import { TabbedPane } from '@web/components/tabbedPane';
 import type { TabbedPaneTabModel } from '@web/components/tabbedPane';
 import { Timeline } from './timeline';
 import { MetadataView } from './metadataView';
 import { AttachmentsTab } from './attachmentsTab';
-import type { Boundaries } from '../geometry';
+import { AnnotationsTab } from './annotationsTab';
+import type { Boundaries } from './geometry';
 import { InspectorTab } from './inspectorTab';
 import { ToolbarButton } from '@web/components/toolbarButton';
-import { useSetting, msToString, type Setting } from '@web/uiUtils';
+import { useSetting, msToString, clsx } from '@web/uiUtils';
 import type { Entry } from '@trace/har';
 import './workbench.css';
 import { testStatusIcon, testStatusText } from './testUtils';
 import type { UITestStatus } from './testUtils';
-import { SettingsView } from './settingsView';
+import type { AfterActionTraceEventAttachment } from '@trace/trace';
+import type { HighlightedElement } from './snapshotTab';
+import type { TestAnnotation } from '@playwright/test';
+import { MetadataWithCommitInfo } from '@testIsomorphic/types';
+import type { ActionGroup } from '@isomorphic/protocolFormatter';
 
 export const Workbench: React.FunctionComponent<{
-  model?: MultiTraceModel,
+  model?: modelUtil.MultiTraceModel,
   showSourcesFirst?: boolean,
   rootDir?: string,
   fallbackLocation?: modelUtil.SourceLocation,
-  initialSelection?: ActionTraceEventInContext,
-  onSelectionChanged?: (action: ActionTraceEventInContext) => void,
   isLive?: boolean,
+  hideTimeline?: boolean,
   status?: UITestStatus,
+  annotations?: TestAnnotation[];
   inert?: boolean,
-  showRouteActionsSetting?: Setting<boolean>,
-  openPage?: (url: string, target?: string) => Window | any,
-}> = ({ showRouteActionsSetting, model, showSourcesFirst, rootDir, fallbackLocation, initialSelection, onSelectionChanged, isLive, status, inert, openPage }) => {
-  const [selectedAction, setSelectedActionImpl] = React.useState<ActionTraceEventInContext | undefined>(undefined);
-  const [revealedStack, setRevealedStack] = React.useState<StackFrame[] | undefined>(undefined);
-  const [highlightedAction, setHighlightedAction] = React.useState<ActionTraceEventInContext | undefined>();
+  onOpenExternally?: (location: modelUtil.SourceLocation) => void,
+  revealSource?: boolean,
+  testRunMetadata?: MetadataWithCommitInfo,
+}> = ({ model, showSourcesFirst, rootDir, fallbackLocation, isLive, hideTimeline, status, annotations, inert, onOpenExternally, revealSource, testRunMetadata }) => {
+  const [selectedCallId, setSelectedCallId] = React.useState<string | undefined>(undefined);
+  const [revealedError, setRevealedError] = React.useState<modelUtil.ErrorDescription | undefined>(undefined);
+  const [revealedAttachment, setRevealedAttachment] = React.useState<[attachment: AfterActionTraceEventAttachment, renderCounter: number] | undefined>(undefined);
+  const [highlightedCallId, setHighlightedCallId] = React.useState<string | undefined>();
   const [highlightedEntry, setHighlightedEntry] = React.useState<Entry | undefined>();
   const [highlightedConsoleMessage, setHighlightedConsoleMessage] = React.useState<ConsoleEntry | undefined>();
   const [selectedNavigatorTab, setSelectedNavigatorTab] = React.useState<string>('actions');
   const [selectedPropertiesTab, setSelectedPropertiesTab] = useSetting<string>('propertiesTab', showSourcesFirst ? 'source' : 'call');
-  const [isInspecting, setIsInspecting] = React.useState(false);
-  const [highlightedLocator, setHighlightedLocator] = React.useState<string>('');
-  const activeAction = model ? highlightedAction || selectedAction : undefined;
+  const [isInspecting, setIsInspectingState] = React.useState(false);
+  const [highlightedElement, setHighlightedElement] = React.useState<HighlightedElement>({ lastEdited: 'none' });
   const [selectedTime, setSelectedTime] = React.useState<Boundaries | undefined>();
   const [sidebarLocation, setSidebarLocation] = useSetting<'bottom' | 'right'>('propertiesSidebarLocation', 'bottom');
-  const [, , showRouteActionsSettingInternal] = useSetting(showRouteActionsSetting ? undefined : 'show-route-actions', true, 'Show route actions');
+  const [actionsFilter] = useSetting<ActionGroup[]>('actionsFilter', []);
 
-  const showSettings = !showRouteActionsSetting;
-  showRouteActionsSetting ||= showRouteActionsSettingInternal;
-  const showRouteActions = showRouteActionsSetting[0];
+  const setSelectedAction = React.useCallback((action: modelUtil.ActionTraceEventInContext | undefined) => {
+    setSelectedCallId(action?.callId);
+    setRevealedError(undefined);
+  }, []);
 
-  const filteredActions = React.useMemo(() => {
-    return (model?.actions || []).filter(action => showRouteActions || action.class !== 'Route');
-  }, [model, showRouteActions]);
+  const actions = React.useMemo(() => model?.filteredActions(actionsFilter), [model, actionsFilter]);
 
-  const setSelectedAction = React.useCallback((action: ActionTraceEventInContext | undefined) => {
-    setSelectedActionImpl(action);
-    setRevealedStack(action?.stack);
-  }, [setSelectedActionImpl, setRevealedStack]);
+  const highlightedAction = React.useMemo(() => {
+    return actions?.find(a => a.callId === highlightedCallId);
+  }, [actions, highlightedCallId]);
 
-  const sources = React.useMemo(() => model?.sources || new Map(), [model]);
+  const setHighlightedAction = React.useCallback((highlightedAction: modelUtil.ActionTraceEventInContext | undefined) => {
+    setHighlightedCallId(highlightedAction?.callId);
+  }, []);
+
+  const sources = React.useMemo(() => model?.sources || new Map<string, modelUtil.SourceModel>(), [model]);
 
   React.useEffect(() => {
     setSelectedTime(undefined);
+    setRevealedError(undefined);
   }, [model]);
 
-  React.useEffect(() => {
-    if (selectedAction && model?.actions.includes(selectedAction))
-      return;
+  const selectedAction = React.useMemo(() => {
+    if (selectedCallId) {
+      const action = actions?.find(a => a.callId === selectedCallId);
+      if (action)
+        return action;
+    }
+
     const failedAction = model?.failedAction();
-    if (initialSelection && model?.actions.includes(initialSelection)) {
-      setSelectedAction(initialSelection);
-    } else if (failedAction) {
-      setSelectedAction(failedAction);
-    } else if (model?.actions.length) {
+    if (failedAction)
+      return failedAction;
+
+    if (actions?.length) {
       // Select the last non-after hooks item.
-      let index = model.actions.length - 1;
-      for (let i = 0; i < model.actions.length; ++i) {
-        if (model.actions[i].apiName === 'After Hooks' && i) {
+      let index = actions.length - 1;
+      for (let i = 0; i < actions.length; ++i) {
+        if (actions[i].title === 'After Hooks' && i) {
           index = i - 1;
           break;
         }
       }
-      setSelectedAction(model.actions[index]);
+      return actions[index];
     }
-  }, [model, selectedAction, setSelectedAction, initialSelection]);
+  }, [model, actions, selectedCallId]);
+
+  const activeAction = React.useMemo(() => {
+    return highlightedAction || selectedAction;
+  }, [selectedAction, highlightedAction]);
+
+  const revealedStack = React.useMemo(() => {
+    if (revealedError)
+      return revealedError.stack;
+    return activeAction?.stack;
+  }, [activeAction, revealedError]);
 
-  const onActionSelected = React.useCallback((action: ActionTraceEventInContext) => {
+  const onActionSelected = React.useCallback((action: modelUtil.ActionTraceEventInContext) => {
     setSelectedAction(action);
-    onSelectionChanged?.(action);
-  }, [setSelectedAction, onSelectionChanged]);
+    setHighlightedAction(undefined);
+  }, [setSelectedAction, setHighlightedAction]);
 
   const selectPropertiesTab = React.useCallback((tab: string) => {
     setSelectedPropertiesTab(tab);
     if (tab !== 'inspector')
-      setIsInspecting(false);
+      setIsInspectingState(false);
   }, [setSelectedPropertiesTab]);
 
-  const locatorPicked = React.useCallback((locator: string) => {
-    setHighlightedLocator(locator);
+  const setIsInspecting = React.useCallback((value: boolean) => {
+    if (!isInspecting && value)
+      selectPropertiesTab('inspector');
+    setIsInspectingState(value);
+  }, [setIsInspectingState, selectPropertiesTab, isInspecting]);
+
+  const elementPicked = React.useCallback((element: HighlightedElement) => {
+    setHighlightedElement(element);
     selectPropertiesTab('inspector');
   }, [selectPropertiesTab]);
 
+  const revealAttachment = React.useCallback((attachment: AfterActionTraceEventAttachment) => {
+    selectPropertiesTab('attachments');
+    setRevealedAttachment(currentValue => {
+      if (!currentValue)
+        return [attachment, 0];
+      const revealCounter = currentValue[1];
+      return [attachment, revealCounter + 1];
+    });
+  }, [selectPropertiesTab]);
+
+  React.useEffect(() => {
+    if (revealSource)
+      selectPropertiesTab('source');
+  }, [revealSource, selectPropertiesTab]);
+
   const consoleModel = useConsoleTabModel(model, selectedTime);
   const networkModel = useNetworkTabModel(model, selectedTime);
   const errorsModel = useErrorsTabModel(model);
-  const attachments = React.useMemo(() => {
-    return model?.actions.map(a => a.attachments || []).flat() || [];
-  }, [model]);
 
   const sdkLanguage = model?.sdkLanguage || 'javascript';
 
@@ -141,13 +179,13 @@ export const Workbench: React.FunctionComponent<{
     render: () => <InspectorTab
       sdkLanguage={sdkLanguage}
       setIsInspecting={setIsInspecting}
-      highlightedLocator={highlightedLocator}
-      setHighlightedLocator={setHighlightedLocator} />,
+      highlightedElement={highlightedElement}
+      setHighlightedElement={setHighlightedElement} />,
   };
   const callTab: TabbedPaneTabModel = {
     id: 'call',
     title: 'Call',
-    render: () => <CallTab action={activeAction} sdkLanguage={sdkLanguage} />
+    render: () => <CallTab action={activeAction} startTimeOffset={model?.startTime ?? 0} sdkLanguage={sdkLanguage} />
   };
   const logTab: TabbedPaneTabModel = {
     id: 'log',
@@ -158,23 +196,33 @@ export const Workbench: React.FunctionComponent<{
     id: 'errors',
     title: 'Errors',
     errorCount: errorsModel.errors.size,
-    render: () => <ErrorsTab errorsModel={errorsModel} sdkLanguage={sdkLanguage} revealInSource={error => {
+    render: () => <ErrorsTab errorsModel={errorsModel} model={model} testRunMetadata={testRunMetadata} sdkLanguage={sdkLanguage} revealInSource={error => {
       if (error.action)
         setSelectedAction(error.action);
       else
-        setRevealedStack(error.stack);
+        setRevealedError(error);
       selectPropertiesTab('source');
-    }} />
+    }} wallTime={model?.wallTime ?? 0} />
   };
+
+  // Fallback location w/o action stands for file / test.
+  // Render error count on Source tab for that case.
+  let fallbackSourceErrorCount: number | undefined = undefined;
+  if (!selectedAction && fallbackLocation)
+    fallbackSourceErrorCount = fallbackLocation.source?.errors.length;
+
   const sourceTab: TabbedPaneTabModel = {
     id: 'source',
     title: 'Source',
+    errorCount: fallbackSourceErrorCount,
     render: () => <SourceTab
       stack={revealedStack}
       sources={sources}
       rootDir={rootDir}
       stackFrameLocation={sidebarLocation === 'bottom' ? 'right' : 'bottom'}
-      fallbackLocation={fallbackLocation} />
+      fallbackLocation={fallbackLocation}
+      onOpenExternally={onOpenExternally}
+    />
   };
   const consoleTab: TabbedPaneTabModel = {
     id: 'console',
@@ -192,13 +240,13 @@ export const Workbench: React.FunctionComponent<{
     id: 'network',
     title: 'Network',
     count: networkModel.resources.length,
-    render: () => <NetworkTab boundaries={boundaries} networkModel={networkModel} onEntryHovered={setHighlightedEntry}/>
+    render: () => <NetworkTab boundaries={boundaries} networkModel={networkModel} onEntryHovered={setHighlightedEntry} sdkLanguage={model?.sdkLanguage ?? 'javascript'} />
   };
   const attachmentsTab: TabbedPaneTabModel = {
     id: 'attachments',
     title: 'Attachments',
-    count: attachments.length,
-    render: () => <AttachmentsTab model={model} />
+    count: model?.visibleAttachments.length,
+    render: () => <AttachmentsTab model={model} revealedAttachment={revealedAttachment} />
   };
 
   const tabs: TabbedPaneTabModel[] = [
@@ -211,6 +259,17 @@ export const Workbench: React.FunctionComponent<{
     sourceTab,
     attachmentsTab,
   ];
+
+  if (annotations !== undefined) {
+    const annotationsTab: TabbedPaneTabModel = {
+      id: 'annotations',
+      title: 'Annotations',
+      count: annotations.length,
+      render: () => <AnnotationsTab annotations={annotations} />
+    };
+    tabs.push(annotationsTab);
+  }
+
   if (showSourcesFirst) {
     const sourceTabIndex = tabs.indexOf(sourceTab);
     tabs.splice(sourceTabIndex, 1);
@@ -239,19 +298,20 @@ export const Workbench: React.FunctionComponent<{
     title: 'Actions',
     component: <div className='vbox'>
       {status && <div className='workbench-run-status'>
-        <span className={`codicon ${testStatusIcon(status)}`}></span>
+        <span className={clsx('codicon', testStatusIcon(status))}></span>
         <div>{testStatusText(status)}</div>
         <div className='spacer'></div>
         <div className='workbench-run-duration'>{time ? msToString(time) : ''}</div>
       </div>}
       <ActionList
         sdkLanguage={sdkLanguage}
-        actions={filteredActions}
+        actions={actions || []}
         selectedAction={model ? selectedAction : undefined}
         selectedTime={selectedTime}
         setSelectedTime={setSelectedTime}
         onSelected={onActionSelected}
         onHighlighted={setHighlightedAction}
+        revealAttachment={revealAttachment}
         revealConsole={() => selectPropertiesTab('console')}
         isLive={isLive}
       />
@@ -262,14 +322,9 @@ export const Workbench: React.FunctionComponent<{
     title: 'Metadata',
     component: <MetadataView model={model}/>
   };
-  const settingsTab: TabbedPaneTabModel = {
-    id: 'settings',
-    title: 'Settings',
-    component: <SettingsView settings={[showRouteActionsSetting]}/>,
-  };
 
   return <div className='vbox workbench' {...(inert ? { inert: 'true' } : {})}>
-    <Timeline
+    {!hideTimeline && <Timeline
       model={model}
       consoleEntries={consoleModel.entries}
       boundaries={boundaries}
@@ -280,35 +335,36 @@ export const Workbench: React.FunctionComponent<{
       sdkLanguage={sdkLanguage}
       selectedTime={selectedTime}
       setSelectedTime={setSelectedTime}
-    />
-    <SplitView sidebarSize={250} orientation={sidebarLocation === 'bottom' ? 'vertical' : 'horizontal'} settingName='propertiesSidebar'>
-      <SplitView sidebarSize={250} orientation='horizontal' sidebarIsFirst={true} settingName='actionListSidebar'>
-        <SnapshotTab
+    />}
+    <SplitView
+      sidebarSize={250}
+      orientation={sidebarLocation === 'bottom' ? 'vertical' : 'horizontal'} settingName='propertiesSidebar'
+      main={<SplitView
+        sidebarSize={250}
+        orientation='horizontal'
+        sidebarIsFirst
+        settingName='actionListSidebar'
+        main={<SnapshotTabsView
           action={activeAction}
+          model={model}
           sdkLanguage={sdkLanguage}
           testIdAttributeName={model?.testIdAttributeName || 'data-testid'}
           isInspecting={isInspecting}
           setIsInspecting={setIsInspecting}
-          highlightedLocator={highlightedLocator}
-          setHighlightedLocator={locatorPicked}
-          openPage={openPage} />
-        <TabbedPane
-          tabs={showSettings ? [actionsTab, metadataTab, settingsTab] : [actionsTab, metadataTab]}
-          selectedTab={selectedNavigatorTab}
-          setSelectedTab={setSelectedNavigatorTab}
-        />
-      </SplitView>
-      <TabbedPane
+          highlightedElement={highlightedElement}
+          setHighlightedElement={elementPicked} />}
+        sidebar={
+          <TabbedPane
+            tabs={[actionsTab, metadataTab]}
+            selectedTab={selectedNavigatorTab}
+            setSelectedTab={setSelectedNavigatorTab}
+          />
+        }
+      />}
+      sidebar={<TabbedPane
         tabs={tabs}
         selectedTab={selectedPropertiesTab}
         setSelectedTab={selectPropertiesTab}
-        leftToolbar={[
-          <ToolbarButton title='Pick locator' icon='target' toggled={isInspecting} onClick={() => {
-            if (!isInspecting)
-              selectPropertiesTab('inspector');
-            setIsInspecting(!isInspecting);
-          }} />
-        ]}
         rightToolbar={[
           sidebarLocation === 'bottom' ?
             <ToolbarButton title='Dock to right' icon='layout-sidebar-right-off' onClick={() => {
@@ -319,7 +375,7 @@ export const Workbench: React.FunctionComponent<{
             }} />
         ]}
         mode={sidebarLocation === 'bottom' ? 'default' : 'select'}
-      />
-    </SplitView>
+      />}
+    />
   </div>;
 };
diff --git a/packages/trace-viewer/src/ui/workbenchLoader.css b/packages/trace-viewer/src/ui/workbenchLoader.css
index 5adb0401ae44a..950f1da237044 100644
--- a/packages/trace-viewer/src/ui/workbenchLoader.css
+++ b/packages/trace-viewer/src/ui/workbenchLoader.css
@@ -65,17 +65,40 @@ body.dark-mode .drop-target {
   cursor: pointer;
 }
 
-.progress {
-  flex: none;
+.progress-dialog {
+  width: 400px;
+  inset: 0;
+  border: none;
+  outline: none;
+  background-color: var(--vscode-sideBar-background);
+}
+
+.progress-dialog::backdrop {
+  background-color: rgba(0, 0, 0, 0.4);
+}
+
+.progress-content {
+  padding: 16px;
+}
+
+.progress-content .title {
+  /* This is set in common.css */
+  background-color: unset;
+  font-size: 18px;
+  font-weight: bold;
+  padding: 0;
+}
+
+.progress-wrapper {
+  background-color: var(--vscode-commandCenter-activeBackground);
   width: 100%;
-  height: 3px;
-  margin-top: -3px;
-  z-index: 10;
+  margin-top: 16px;
+  margin-bottom: 8px;
 }
 
 .inner-progress {
   background-color: var(--vscode-progressBar-background);
-  height: 100%;
+  height: 4px;
 }
 
 .header {
diff --git a/packages/trace-viewer/src/ui/workbenchLoader.tsx b/packages/trace-viewer/src/ui/workbenchLoader.tsx
index 0260df0d7aac2..747ffa4e3f9b8 100644
--- a/packages/trace-viewer/src/ui/workbenchLoader.tsx
+++ b/packages/trace-viewer/src/ui/workbenchLoader.tsx
@@ -14,14 +14,14 @@
   limitations under the License.
 */
 
-import { ToolbarButton } from '@web/components/toolbarButton';
 import * as React from 'react';
-import type { ContextEntry } from '../entries';
+import type { ContextEntry } from '../types/entries';
 import { MultiTraceModel } from './modelUtil';
 import './workbenchLoader.css';
-import { toggleTheme } from '@web/theme';
 import { Workbench } from './workbench';
-import { TestServerConnection } from '@testIsomorphic/testServerConnection';
+import { TestServerConnection, WebSocketTestServerTransport } from '@testIsomorphic/testServerConnection';
+import { SettingsToolbarButton } from './settingsToolbarButton';
+import { Dialog } from '@web/components/dialog';
 
 export const WorkbenchLoader: React.FunctionComponent<{
 }> = () => {
@@ -33,6 +33,7 @@ export const WorkbenchLoader: React.FunctionComponent<{
   const [dragOver, setDragOver] = React.useState<boolean>(false);
   const [processingErrorMessage, setProcessingErrorMessage] = React.useState<string | null>(null);
   const [fileForLocalModeError, setFileForLocalModeError] = React.useState<string | null>(null);
+  const [showProgressDialog, setShowProgressDialog] = React.useState<boolean>(false);
 
   const processTraceFiles = React.useCallback((files: FileList) => {
     const blobUrls = [];
@@ -72,6 +73,23 @@ export const WorkbenchLoader: React.FunctionComponent<{
     document.addEventListener('paste', listener);
     return () => document.removeEventListener('paste', listener);
   });
+  React.useEffect(() => {
+    const listener = (e: MessageEvent) => {
+      const { method, params } = e.data;
+
+      if (method !== 'load' || !(params?.trace instanceof Blob))
+        return;
+
+      const traceFile = new File([params.trace], 'trace.zip', { type: 'application/zip' });
+      const dataTransfer = new DataTransfer();
+
+      dataTransfer.items.add(traceFile);
+
+      processTraceFiles(dataTransfer.files);
+    };
+    window.addEventListener('message', listener);
+    return () => window.removeEventListener('message', listener);
+  });
 
   const handleDropEvent = React.useCallback((event: React.DragEvent<HTMLDivElement>) => {
     event.preventDefault();
@@ -102,7 +120,7 @@ export const WorkbenchLoader: React.FunctionComponent<{
       const guid = new URLSearchParams(window.location.search).get('ws');
       const wsURL = new URL(`../${guid}`, window.location.toString());
       wsURL.protocol = (window.location.protocol === 'https:' ? 'wss:' : 'ws:');
-      const testServerConnection = new TestServerConnection(wsURL.toString());
+      const testServerConnection = new TestServerConnection(new WebSocketTestServerTransport(wsURL));
       testServerConnection.onLoadTraceRequested(async params => {
         setTraceURLs(params.traceUrl ? [params.traceUrl] : []);
         setDragOver(false);
@@ -131,6 +149,7 @@ export const WorkbenchLoader: React.FunctionComponent<{
           params.set('trace', url);
           if (uploadedTraceNames.length)
             params.set('traceFileName', uploadedTraceNames[i]);
+          params.set('limit', String(traceURLs.length));
           const response = await fetch(`contexts?${params.toString()}`);
           if (!response.ok) {
             if (!isServer)
@@ -150,6 +169,20 @@ export const WorkbenchLoader: React.FunctionComponent<{
     })();
   }, [isServer, traceURLs, uploadedTraceNames]);
 
+  const showLoading = progress.done !== progress.total && progress.total !== 0;
+
+  React.useEffect(() => {
+    if (showLoading) {
+      const timeout = setTimeout(() => {
+        setShowProgressDialog(true);
+      }, 200);
+
+      return () => clearTimeout(timeout);
+    } else {
+      setShowProgressDialog(false);
+    }
+  }, [showLoading]);
+
   const showFileUploadDropArea = !!(!isServer && !dragOver && !fileForLocalModeError && (!traceURLs.length || processingErrorMessage));
 
   return <div className='vbox workbench-loader' onDragOver={event => { event.preventDefault(); setDragOver(true); }}>
@@ -160,10 +193,7 @@ export const WorkbenchLoader: React.FunctionComponent<{
       <div className='product'>Playwright</div>
       {model.title && <div className='title'>{model.title}</div>}
       <div className='spacer'></div>
-      <ToolbarButton icon='color-mode' title='Toggle color mode' toggled={false} onClick={() => toggleTheme()}></ToolbarButton>
-    </div>
-    <div className='progress'>
-      <div className='inner-progress' style={{ width: progress.total ? (100 * progress.done / progress.total) + '%' : 0 }}></div>
+      <SettingsToolbarButton />
     </div>
     <Workbench model={model} inert={showFileUploadDropArea} />
     {fileForLocalModeError && <div className='drop-target'>
@@ -174,6 +204,14 @@ export const WorkbenchLoader: React.FunctionComponent<{
         <div>3. Drop the trace from the download shelf into the page</div>
       </div>
     </div>}
+    <Dialog open={showProgressDialog} isModal={true} className='progress-dialog'>
+      <div className='progress-content'>
+        <div className='title' role='heading' aria-level={1}>Loading Playwright Trace...</div>
+        <div className='progress-wrapper'>
+          <div className='inner-progress' style={{ width: progress.total ? (100 * progress.done / progress.total) + '%' : 0 }}></div>
+        </div>
+      </div>
+    </Dialog>
     {showFileUploadDropArea && <div className='drop-target'>
       <div className='processing-error' role='alert'>{processingErrorMessage}</div>
       <div className='title' role='heading' aria-level={1}>Drop Playwright Trace to load</div>
diff --git a/packages/trace-viewer/src/uiMode.tsx b/packages/trace-viewer/src/uiMode.tsx
index 8e9e286e00dfb..5dac2082e81ee 100644
--- a/packages/trace-viewer/src/uiMode.tsx
+++ b/packages/trace-viewer/src/uiMode.tsx
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import '@web/common.css';
 import { applyTheme } from '@web/theme';
 import '@web/third_party/vscode/codicon.css';
-import * as ReactDOM from 'react-dom';
+import * as ReactDOM from 'react-dom/client';
 import { UIModeView } from './ui/uiModeView';
 
 (async () => {
@@ -39,5 +38,5 @@ import { UIModeView } from './ui/uiModeView';
     setInterval(function() { fetch('ping'); }, 10000);
   }
 
-  ReactDOM.render(<UIModeView></UIModeView>, document.querySelector('#root'));
+  ReactDOM.createRoot(document.querySelector('#root')!).render(<UIModeView/>);
 })();
diff --git a/packages/trace-viewer/tsconfig.json b/packages/trace-viewer/tsconfig.json
index 41b2ed39480db..f2303555a185b 100644
--- a/packages/trace-viewer/tsconfig.json
+++ b/packages/trace-viewer/tsconfig.json
@@ -9,14 +9,14 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "module": "ESNext",
-    "moduleResolution": "Node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
     "baseUrl": ".",
     "paths": {
-      "@injected/*": ["../playwright-core/src/server/injected/*"],
+      "@injected/*": ["../injected/src/*"],
       "@isomorphic/*": ["../playwright-core/src/utils/isomorphic/*"],
       "@protocol/*": ["../protocol/src/*"],
       "@recorder/*": ["../recorder/src/*"],
@@ -30,6 +30,6 @@
     },
     "useUnknownInCatchVariables": false,
   },
-  "include": ["src"],
+  "include": ["src", "../web/src"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/trace-viewer/uiMode.html b/packages/trace-viewer/uiMode.html
index 668d60efd5eca..0307c89ac6815 100644
--- a/packages/trace-viewer/uiMode.html
+++ b/packages/trace-viewer/uiMode.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" translate="no">
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/packages/trace-viewer/vite.config.ts b/packages/trace-viewer/vite.config.ts
index 13310ca0f7606..071cfee6238e8 100644
--- a/packages/trace-viewer/vite.config.ts
+++ b/packages/trace-viewer/vite.config.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
+import path from 'path';
+
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+
 import { bundle } from './bundle';
-import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -26,9 +28,12 @@ export default defineConfig({
     react(),
     bundle()
   ],
+  define: {
+    'process.env': {},
+  },
   resolve: {
     alias: {
-      '@injected': path.resolve(__dirname, '../playwright-core/src/server/injected'),
+      '@injected': path.resolve(__dirname, '../injected/src'),
       '@isomorphic': path.resolve(__dirname, '../playwright-core/src/utils/isomorphic'),
       '@protocol': path.resolve(__dirname, '../protocol/src'),
       '@testIsomorphic': path.resolve(__dirname, '../playwright/src/isomorphic'),
@@ -38,13 +43,11 @@ export default defineConfig({
   },
   build: {
     outDir: path.resolve(__dirname, '../playwright-core/lib/vite/traceViewer'),
-    // Output dir is shared with vite.sw.config.ts, clearing it here is racy.
-    emptyOutDir: false,
+    emptyOutDir: true,
     rollupOptions: {
       input: {
         index: path.resolve(__dirname, 'index.html'),
         uiMode: path.resolve(__dirname, 'uiMode.html'),
-        embedded: path.resolve(__dirname, 'embedded.html'),
         snapshot: path.resolve(__dirname, 'snapshot.html'),
       },
       output: {
diff --git a/packages/trace-viewer/vite.sw.config.ts b/packages/trace-viewer/vite.sw.config.ts
index c0dba9f12441a..1db95936440c4 100644
--- a/packages/trace-viewer/vite.sw.config.ts
+++ b/packages/trace-viewer/vite.sw.config.ts
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
+import path from 'path';
+
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+
 import { bundle } from './bundle';
-import path from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -35,17 +37,18 @@ export default defineConfig({
       '@web': path.resolve(__dirname, '../web/src'),
     },
   },
+  publicDir: false,
   build: {
-    outDir: path.resolve(__dirname, '../playwright-core/lib/vite/traceViewer'),
-    // Output dir is shared with vite.config.ts, clearing it here is racy.
+    // outputs into the public dir, where the build of vite.config.ts will pick it up
+    outDir: path.resolve(__dirname, 'public'),
     emptyOutDir: false,
     rollupOptions: {
       input: {
-        sw: path.resolve(__dirname, 'src/sw.ts'),
+        sw: path.resolve(__dirname, 'src/sw-main.ts'),
       },
       output: {
-        entryFileNames: info => '[name].bundle.js',
-        assetFileNames: () => '[name].[hash][extname]',
+        entryFileNames: info => 'sw.bundle.js',
+        assetFileNames: () => 'sw.[hash][extname]',
         manualChunks: undefined,
       },
     },
diff --git a/packages/trace/src/snapshot.ts b/packages/trace/src/snapshot.ts
index 7df465b8b04e0..43d002f616860 100644
--- a/packages/trace/src/snapshot.ts
+++ b/packages/trace/src/snapshot.ts
@@ -44,6 +44,7 @@ export type FrameSnapshot = {
   frameId: string,
   frameUrl: string,
   timestamp: number,
+  wallTime?: number,
   collectionTime: number,
   doctype?: string,
   html: NodeSnapshot,
diff --git a/packages/trace/src/trace.ts b/packages/trace/src/trace.ts
index 0e1c5327a11b7..e8ce55602a448 100644
--- a/packages/trace/src/trace.ts
+++ b/packages/trace/src/trace.ts
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import type { Point, SerializedError, StackFrame } from '@protocol/channels';
-import type { Language } from '../../playwright-core/src/utils/isomorphic/locatorGenerators';
 import type { FrameSnapshot, ResourceSnapshot } from './snapshot';
+import type { Language } from '../../playwright-core/src/utils/isomorphic/locatorGenerators';
+import type { Point, SerializedError, StackFrame } from '@protocol/channels';
 
 export type Size = { width: number, height: number };
 
-// Make sure you add _modernize_N_to_N1(event: any) to traceModel.ts.
-export type VERSION = 7;
+// Make sure you add _modernize_N_to_N1(event: any) to traceModernizer.ts.
+export type VERSION = 8;
 
 export type BrowserContextEventOptions = {
   baseURL?: string,
@@ -44,6 +44,7 @@ export type ContextCreatedTraceEvent = {
   options: BrowserContextEventOptions,
   sdkLanguage?: Language,
   testIdAttributeName?: string,
+  contextId?: string,
 };
 
 export type ScreencastFrameTraceEvent = {
@@ -53,13 +54,14 @@ export type ScreencastFrameTraceEvent = {
   width: number,
   height: number,
   timestamp: number,
+  frameSwapWallTime?: number,
 };
 
 export type BeforeActionTraceEvent = {
   type: 'before',
   callId: string;
   startTime: number;
-  apiName: string;
+  title?: string;
   class: string;
   method: string;
   params: Record<string, any>;
@@ -68,6 +70,7 @@ export type BeforeActionTraceEvent = {
   stack?: StackFrame[];
   pageId?: string;
   parentId?: string;
+  group?: string;
 };
 
 export type InputActionTraceEvent = {
@@ -85,6 +88,11 @@ export type AfterActionTraceEventAttachment = {
   base64?: string;
 };
 
+export type AfterActionTraceEventAnnotation = {
+  type: string,
+  description?: string
+};
+
 export type AfterActionTraceEvent = {
   type: 'after',
   callId: string;
@@ -92,6 +100,7 @@ export type AfterActionTraceEvent = {
   afterSnapshot?: string;
   error?: SerializedError['error'];
   attachments?: AfterActionTraceEventAttachment[];
+  annotations?: AfterActionTraceEventAnnotation[];
   result?: any;
   point?: Point;
 };
diff --git a/packages/web/package.json b/packages/web/package.json
index 3898ac1bbbdf6..0465fdf4c4a16 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "scripts": {},
   "dependencies": {
-    "codemirror-shadow-1": "0.0.1",
+    "codemirror": "5.65.18",
     "xterm": "^5.1.0",
     "xterm-addon-fit": "^0.7.0"
   }
diff --git a/packages/web/playwright.config.ts b/packages/web/playwright.config.ts
index 8169cfa66114a..7b32fcf6b228f 100644
--- a/packages/web/playwright.config.ts
+++ b/packages/web/playwright.config.ts
@@ -15,12 +15,12 @@
  */
 
 import { devices, defineConfig } from '@playwright/experimental-ct-react';
+
 import type { ReporterDescription } from '@playwright/test';
 
 const reporters = () => {
   const result: ReporterDescription[] = process.env.CI ? [
-    ['html'],
-    ['blob'],
+    ['blob', { fileName: `${process.env.PWTEST_BOT_NAME}.zip` }],
   ] : [
     ['html']
   ];
diff --git a/packages/web/src/ansi2html.ts b/packages/web/src/ansi2html.ts
index 210d1210bc6fb..827e081ae3922 100644
--- a/packages/web/src/ansi2html.ts
+++ b/packages/web/src/ansi2html.ts
@@ -14,11 +14,16 @@
   limitations under the License.
 */
 
-export function ansi2html(text: string): string {
+export function ansi2html(text: string, defaultColors?: { bg: string, fg: string }): string {
   const regex = /(\x1b\[(\d+(;\d+)*)m)|([^\x1b]+)/g;
   const tokens: string[] = [];
   let match;
   let style: any = {};
+
+  let reverse = false;
+  let fg: string | undefined = defaultColors?.fg;
+  let bg: string | undefined = defaultColors?.bg;
+
   while ((match = regex.exec(text)) !== null) {
     const [, , codeStr, , text] = match;
     if (codeStr) {
@@ -26,13 +31,31 @@ export function ansi2html(text: string): string {
       switch (code) {
         case 0: style = {}; break;
         case 1: style['font-weight'] = 'bold'; break;
+        case 2: style['opacity'] = '0.8'; break;
         case 3: style['font-style'] = 'italic'; break;
         case 4: style['text-decoration'] = 'underline'; break;
+        case 7:
+          reverse = true;
+          break;
         case 8: style.display = 'none'; break;
         case 9: style['text-decoration'] = 'line-through'; break;
-        case 22: style = { ...style, 'font-weight': undefined, 'font-style': undefined, 'text-decoration': undefined }; break;
-        case 23: style = { ...style, 'font-weight': undefined, 'font-style': undefined }; break;
-        case 24: style = { ...style, 'text-decoration': undefined }; break;
+        case 22:
+          delete style['font-weight'];
+          delete style['font-style'];
+          delete style['opacity'];
+          delete style['text-decoration'];
+          break;
+        case 23:
+          delete style['font-weight'];
+          delete style['font-style'];
+          delete style['opacity'];
+          break;
+        case 24:
+          delete style['text-decoration'];
+          break;
+        case 27:
+          reverse = false;
+          break;
         case 30:
         case 31:
         case 32:
@@ -40,8 +63,12 @@ export function ansi2html(text: string): string {
         case 34:
         case 35:
         case 36:
-        case 37: style.color = ansiColors[code - 30]; break;
-        case 39: style = { ...style, color: undefined }; break;
+        case 37:
+          fg = ansiColors[code - 30];
+          break;
+        case 39:
+          fg = defaultColors?.fg;
+          break;
         case 40:
         case 41:
         case 42:
@@ -49,8 +76,12 @@ export function ansi2html(text: string): string {
         case 44:
         case 45:
         case 46:
-        case 47: style['background-color'] = ansiColors[code - 40]; break;
-        case 49: style = { ...style, 'background-color': undefined }; break;
+        case 47:
+          bg = ansiColors[code - 40];
+          break;
+        case 49:
+          bg = defaultColors?.bg;
+          break;
         case 53: style['text-decoration'] = 'overline'; break;
         case 90:
         case 91:
@@ -59,7 +90,9 @@ export function ansi2html(text: string): string {
         case 94:
         case 95:
         case 96:
-        case 97: style.color = brightAnsiColors[code - 90]; break;
+        case 97:
+          fg = brightAnsiColors[code - 90];
+          break;
         case 100:
         case 101:
         case 102:
@@ -67,10 +100,19 @@ export function ansi2html(text: string): string {
         case 104:
         case 105:
         case 106:
-        case 107: style['background-color'] = brightAnsiColors[code - 100]; break;
+        case 107:
+          bg = brightAnsiColors[code - 100];
+          break;
       }
     } else if (text) {
-      tokens.push(`<span style="${styleBody(style)}">${escapeHTML(text)}</span>`);
+      const styleCopy = { ...style };
+      const color = reverse ? bg : fg;
+      if (color !== undefined)
+        styleCopy['color'] = color;
+      const backgroundColor = reverse ? fg : bg;
+      if (backgroundColor !== undefined)
+        styleCopy['background-color'] = backgroundColor;
+      tokens.push(`<span style="${styleBody(styleCopy)}">${escapeHTML(text)}</span>`);
     }
   }
   return tokens.join('');
diff --git a/packages/web/src/assets/playwright-logo.svg b/packages/web/src/assets/playwright-logo.svg
new file mode 100644
index 0000000000000..7b3ca7d6c99bc
--- /dev/null
+++ b/packages/web/src/assets/playwright-logo.svg
@@ -0,0 +1,9 @@
+<svg width="400" height="400" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M136.444 221.556C123.558 225.213 115.104 231.625 109.535 238.032C114.869 233.364 122.014 229.08 131.652 226.348C141.51 223.554 149.92 223.574 156.869 224.915V219.481C150.941 218.939 144.145 219.371 136.444 221.556ZM108.946 175.876L61.0895 188.484C61.0895 188.484 61.9617 189.716 63.5767 191.36L104.153 180.668C104.153 180.668 103.578 188.077 98.5847 194.705C108.03 187.559 108.946 175.876 108.946 175.876ZM149.005 288.347C81.6582 306.486 46.0272 228.438 35.2396 187.928C30.2556 169.229 28.0799 155.067 27.5 145.928C27.4377 144.979 27.4665 144.179 27.5336 143.446C24.04 143.657 22.3674 145.473 22.7077 150.721C23.2876 159.855 25.4633 174.016 30.4473 192.721C41.2301 233.225 76.8659 311.273 144.213 293.134C158.872 289.185 169.885 281.992 178.152 272.81C170.532 279.692 160.995 285.112 149.005 288.347ZM161.661 128.11V132.903H188.077C187.535 131.206 186.989 129.677 186.447 128.11H161.661Z" fill="#2D4552"/>
+<path d="M193.981 167.584C205.861 170.958 212.144 179.287 215.465 186.658L228.711 190.42C228.711 190.42 226.904 164.623 203.57 157.995C181.741 151.793 168.308 170.124 166.674 172.496C173.024 167.972 182.297 164.268 193.981 167.584ZM299.422 186.777C277.573 180.547 264.145 198.916 262.535 201.255C268.89 196.736 278.158 193.031 289.837 196.362C301.698 199.741 307.976 208.06 311.307 215.436L324.572 219.212C324.572 219.212 322.736 193.41 299.422 186.777ZM286.262 254.795L176.072 223.99C176.072 223.99 177.265 230.038 181.842 237.869L274.617 263.805C282.255 259.386 286.262 254.795 286.262 254.795ZM209.867 321.102C122.618 297.71 133.166 186.543 147.284 133.865C153.097 112.156 159.073 96.0203 164.029 85.204C161.072 84.5953 158.623 86.1529 156.203 91.0746C150.941 101.747 144.212 119.124 137.7 143.45C123.586 196.127 113.038 307.29 200.283 330.682C241.406 341.699 273.442 324.955 297.323 298.659C274.655 319.19 245.714 330.701 209.867 321.102Z" fill="#2D4552"/>
+<path d="M161.661 262.296V239.863L99.3324 257.537C99.3324 257.537 103.938 230.777 136.444 221.556C146.302 218.762 154.713 218.781 161.661 220.123V128.11H192.869C189.471 117.61 186.184 109.526 183.423 103.909C178.856 94.612 174.174 100.775 163.545 109.665C156.059 115.919 137.139 129.261 108.668 136.933C80.1966 144.61 57.179 142.574 47.5752 140.911C33.9601 138.562 26.8387 135.572 27.5049 145.928C28.0847 155.062 30.2605 169.224 35.2445 187.928C46.0272 228.433 81.663 306.481 149.01 288.342C166.602 283.602 179.019 274.233 187.626 262.291H161.661V262.296ZM61.0848 188.484L108.946 175.876C108.946 175.876 107.551 194.288 89.6087 199.018C71.6614 203.743 61.0848 188.484 61.0848 188.484Z" fill="#E2574C"/>
+<path d="M341.786 129.174C329.345 131.355 299.498 134.072 262.612 124.185C225.716 114.304 201.236 97.0224 191.537 88.8994C177.788 77.3834 171.74 69.3802 165.788 81.4857C160.526 92.163 153.797 109.54 147.284 133.866C133.171 186.543 122.623 297.706 209.867 321.098C297.093 344.47 343.53 242.92 357.644 190.238C364.157 165.917 367.013 147.5 367.799 135.625C368.695 122.173 359.455 126.078 341.786 129.174ZM166.497 172.756C166.497 172.756 180.246 151.372 203.565 158C226.899 164.628 228.706 190.425 228.706 190.425L166.497 172.756ZM223.42 268.713C182.403 256.698 176.077 223.99 176.077 223.99L286.262 254.796C286.262 254.791 264.021 280.578 223.42 268.713ZM262.377 201.495C262.377 201.495 276.107 180.126 299.422 186.773C322.736 193.411 324.572 219.208 324.572 219.208L262.377 201.495Z" fill="#2EAD33"/>
+<path d="M139.88 246.04L99.3324 257.532C99.3324 257.532 103.737 232.44 133.607 222.496L110.647 136.33L108.663 136.933C80.1918 144.611 57.1742 142.574 47.5704 140.911C33.9554 138.563 26.834 135.572 27.5001 145.929C28.08 155.063 30.2557 169.224 35.2397 187.929C46.0225 228.433 81.6583 306.481 149.005 288.342L150.989 287.719L139.88 246.04ZM61.0848 188.485L108.946 175.876C108.946 175.876 107.551 194.288 89.6087 199.018C71.6615 203.743 61.0848 188.485 61.0848 188.485Z" fill="#D65348"/>
+<path d="M225.27 269.163L223.415 268.712C182.398 256.698 176.072 223.99 176.072 223.99L232.89 239.872L262.971 124.281L262.607 124.185C225.711 114.304 201.232 97.0224 191.532 88.8994C177.783 77.3834 171.735 69.3802 165.783 81.4857C160.526 92.163 153.797 109.54 147.284 133.866C133.171 186.543 122.623 297.706 209.867 321.097L211.655 321.5L225.27 269.163ZM166.497 172.756C166.497 172.756 180.246 151.372 203.565 158C226.899 164.628 228.706 190.425 228.706 190.425L166.497 172.756Z" fill="#1D8D22"/>
+<path d="M141.946 245.451L131.072 248.537C133.641 263.019 138.169 276.917 145.276 289.195C146.513 288.922 147.74 288.687 149 288.342C152.302 287.451 155.364 286.348 158.312 285.145C150.371 273.361 145.118 259.789 141.946 245.451ZM137.7 143.451C132.112 164.307 127.113 194.326 128.489 224.436C130.952 223.367 133.554 222.371 136.444 221.551L138.457 221.101C136.003 188.939 141.308 156.165 147.284 133.866C148.799 128.225 150.318 122.978 151.832 118.085C149.393 119.637 146.767 121.228 143.776 122.867C141.759 129.093 139.722 135.898 137.7 143.451Z" fill="#C04B41"/>
+</svg>
diff --git a/packages/web/src/components/codeMirrorModule.tsx b/packages/web/src/components/codeMirrorModule.tsx
index 56686c45b65cb..f398032f02e8b 100644
--- a/packages/web/src/components/codeMirrorModule.tsx
+++ b/packages/web/src/components/codeMirrorModule.tsx
@@ -15,14 +15,18 @@
 */
 
 // @ts-ignore
-import codemirror from 'codemirror-shadow-1';
+import codemirror from 'codemirror';
 import type codemirrorType from 'codemirror';
-import 'codemirror-shadow-1/lib/codemirror.css';
-import 'codemirror-shadow-1/mode/css/css';
-import 'codemirror-shadow-1/mode/htmlmixed/htmlmixed';
-import 'codemirror-shadow-1/mode/javascript/javascript';
-import 'codemirror-shadow-1/mode/python/python';
-import 'codemirror-shadow-1/mode/clike/clike';
+import 'codemirror/lib/codemirror.css';
+import 'codemirror/mode/css/css';
+import 'codemirror/mode/htmlmixed/htmlmixed';
+import 'codemirror/mode/javascript/javascript';
+import 'codemirror/mode/python/python';
+import 'codemirror/mode/clike/clike';
+import 'codemirror/mode/markdown/markdown';
+import 'codemirror/addon/display/placeholder';
+import 'codemirror/addon/mode/simple';
+import 'codemirror/mode/yaml/yaml';
 
 export type CodeMirror = typeof codemirrorType;
 export default codemirror;
diff --git a/packages/web/src/components/codeMirrorWrapper.css b/packages/web/src/components/codeMirrorWrapper.css
index 1e79c182743d3..59a519005e274 100644
--- a/packages/web/src/components/codeMirrorWrapper.css
+++ b/packages/web/src/components/codeMirrorWrapper.css
@@ -33,7 +33,8 @@
   color: var(--vscode-debugTokenExpression-number);
 }
 
-.CodeMirror span.cm-keyword {
+.CodeMirror span.cm-keyword,
+.CodeMirror span.cm-builtin {
   color: var(--vscode-debugTokenExpression-name);
 }
 
@@ -162,15 +163,25 @@ body.dark-mode .CodeMirror span.cm-type {
   /* Intentionally empty. */
 }
 
-.CodeMirror .source-line-error-underline {
-  text-decoration: underline wavy var(--vscode-errorForeground);
-  position: relative;
-  top: -12px;
-}
-
 .CodeMirror .source-line-error-widget {
   background-color: var(--vscode-inputValidation-errorBackground);
   white-space: pre-wrap;
   margin: 3px 10px;
   padding: 5px;
 }
+
+.CodeMirror span.cm-link, span.cm-linkified {
+  color: var(--vscode-textLink-foreground);
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.CodeMirror .source-line-error-underline {
+  text-decoration: underline;
+  text-decoration-color: var(--vscode-errorForeground);
+  text-decoration-style: wavy;
+}
+
+.CodeMirror-placeholder {
+  color: var(--vscode-input-placeholderForeground) !important;
+}
diff --git a/packages/web/src/components/codeMirrorWrapper.spec.tsx b/packages/web/src/components/codeMirrorWrapper.spec.tsx
index 3fb630ae5d03a..81e8f81d3c367 100644
--- a/packages/web/src/components/codeMirrorWrapper.spec.tsx
+++ b/packages/web/src/components/codeMirrorWrapper.spec.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { expect, test } from '@playwright/experimental-ct-react';
 import { CodeMirrorWrapper } from './codeMirrorWrapper';
 
@@ -70,27 +69,27 @@ class Program
 `;
 
 test('highlight JavaScript', async ({ mount }) => {
-  const component = await mount(<CodeMirrorWrapper text={javascriptSnippet} language='javascript' />);
+  const component = await mount(<CodeMirrorWrapper text={javascriptSnippet} highlighter='javascript' />);
   await expect(component.locator('text="async"').first()).toHaveClass('cm-keyword');
 });
 
 test('highlight Python', async ({ mount }) => {
-  const component = await mount(<CodeMirrorWrapper text={pythonSnippet} language='python' />);
+  const component = await mount(<CodeMirrorWrapper text={pythonSnippet} highlighter='python' />);
   await expect(component.locator('text="async"').first()).toHaveClass('cm-keyword');
 });
 
 test('highlight Java', async ({ mount }) => {
-  const component = await mount(<CodeMirrorWrapper text={javaSnippet} language='java' />);
+  const component = await mount(<CodeMirrorWrapper text={javaSnippet} highlighter='java' />);
   await expect(component.locator('text="public"').first()).toHaveClass('cm-keyword');
 });
 
 test('highlight C#', async ({ mount }) => {
-  const component = await mount(<CodeMirrorWrapper text={csharpSnippet} language='csharp' />);
+  const component = await mount(<CodeMirrorWrapper text={csharpSnippet} highlighter='csharp' />);
   await expect(component.locator('text="public"').first()).toHaveClass('cm-keyword');
 });
 
 test('highlight lines', async ({ mount }) => {
-  const component = await mount(<CodeMirrorWrapper text={javascriptSnippet} language='javascript' highlight={[
+  const component = await mount(<CodeMirrorWrapper text={javascriptSnippet} highlighter='javascript' highlight={[
     { line: 4, type: 'running' },
     { line: 5, type: 'paused' },
     { line: 6, type: 'error' },
diff --git a/packages/web/src/components/codeMirrorWrapper.tsx b/packages/web/src/components/codeMirrorWrapper.tsx
index 738f0cfff1b4a..53a7814740919 100644
--- a/packages/web/src/components/codeMirrorWrapper.tsx
+++ b/packages/web/src/components/codeMirrorWrapper.tsx
@@ -18,19 +18,24 @@ import './codeMirrorWrapper.css';
 import * as React from 'react';
 import type { CodeMirror } from './codeMirrorModule';
 import { ansi2html } from '../ansi2html';
-import { useMeasure } from '../uiUtils';
+import { useMeasure, kWebLinkRe } from '../uiUtils';
 
 export type SourceHighlight = {
   line: number;
-  type: 'running' | 'paused' | 'error';
+  column?: number;
+  type: 'running' | 'paused' | 'error' | 'subtle-error';
   message?: string;
 };
 
-export type Language = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl' | 'html' | 'css';
+type CodeMirrorHighlighter = 'javascript' | 'python' | 'java' | 'csharp' | 'jsonl' | 'html' | 'css' | 'markdown' | 'yaml';
+
+export const lineHeight = 20;
 
 export interface SourceProps {
   text: string;
-  language?: Language;
+  highlighter?: CodeMirrorHighlighter;
+  mimeType?: string;
+  linkify?: boolean;
   readOnly?: boolean;
   // 1-based
   highlight?: SourceHighlight[];
@@ -40,11 +45,15 @@ export interface SourceProps {
   focusOnChange?: boolean;
   wrapLines?: boolean;
   onChange?: (text: string) => void;
+  dataTestId?: string;
+  placeholder?: string;
 }
 
 export const CodeMirrorWrapper: React.FC<SourceProps> = ({
   text,
-  language,
+  highlighter,
+  mimeType,
+  linkify,
   readOnly,
   highlight,
   revealLine,
@@ -53,40 +62,37 @@ export const CodeMirrorWrapper: React.FC<SourceProps> = ({
   focusOnChange,
   wrapLines,
   onChange,
+  dataTestId,
+  placeholder,
 }) => {
   const [measure, codemirrorElement] = useMeasure<HTMLDivElement>();
   const [modulePromise] = React.useState<Promise<CodeMirror>>(import('./codeMirrorModule').then(m => m.default));
-  const codemirrorRef = React.useRef<{ cm: CodeMirror.Editor, highlight?: SourceHighlight[], widgets?: CodeMirror.LineWidget[] } | null>(null);
+  const codemirrorRef = React.useRef<{
+    cm: CodeMirror.Editor,
+    highlight?: SourceHighlight[],
+    widgets?: CodeMirror.LineWidget[],
+    markers?: CodeMirror.TextMarker[],
+  } | null>(null);
   const [codemirror, setCodemirror] = React.useState<CodeMirror.Editor>();
 
   React.useEffect(() => {
     (async () => {
       // Always load the module first.
       const CodeMirror = await modulePromise;
+      defineCustomMode(CodeMirror);
 
       const element = codemirrorElement.current;
       if (!element)
         return;
 
-      let mode = '';
-      if (language === 'javascript')
-        mode = 'javascript';
-      if (language === 'python')
-        mode = 'python';
-      if (language === 'java')
-        mode = 'text/x-java';
-      if (language === 'csharp')
-        mode = 'text/x-csharp';
-      if (language === 'html')
-        mode = 'htmlmixed';
-      if (language === 'css')
-        mode = 'css';
+      const mode = highlighterToMode(highlighter) || mimeTypeToMode(mimeType) || (linkify ? 'text/linkified' : '');
 
       if (codemirrorRef.current
         && mode === codemirrorRef.current.cm.getOption('mode')
         && !!readOnly === codemirrorRef.current.cm.getOption('readOnly')
         && lineNumbers === codemirrorRef.current.cm.getOption('lineNumbers')
-        && wrapLines === codemirrorRef.current.cm.getOption('lineWrapping')) {
+        && wrapLines === codemirrorRef.current.cm.getOption('lineWrapping')
+        && placeholder === codemirrorRef.current.cm.getOption('placeholder')) {
         // No need to re-create codemirror.
         return;
       }
@@ -99,6 +105,7 @@ export const CodeMirrorWrapper: React.FC<SourceProps> = ({
         readOnly: !!readOnly,
         lineNumbers,
         lineWrapping: wrapLines,
+        placeholder,
       });
       codemirrorRef.current = { cm };
       if (isFocused)
@@ -106,7 +113,7 @@ export const CodeMirrorWrapper: React.FC<SourceProps> = ({
       setCodemirror(cm);
       return cm;
     })();
-  }, [modulePromise, codemirror, codemirrorElement, language, lineNumbers, wrapLines, readOnly, isFocused]);
+  }, [modulePromise, codemirror, codemirrorElement, highlighter, mimeType, linkify, lineNumbers, wrapLines, readOnly, isFocused, placeholder]);
 
   React.useEffect(() => {
     if (codemirrorRef.current)
@@ -137,26 +144,36 @@ export const CodeMirrorWrapper: React.FC<SourceProps> = ({
       // Error widgets.
       for (const w of codemirrorRef.current!.widgets || [])
         codemirror.removeLineWidget(w);
+      for (const m of codemirrorRef.current!.markers || [])
+        m.clear();
       const widgets: CodeMirror.LineWidget[] = [];
+      const markers: CodeMirror.TextMarker[] = [];
       for (const h of highlight || []) {
-        if (h.type !== 'error')
+        if (h.type !== 'subtle-error' && h.type !== 'error')
           continue;
 
         const line = codemirrorRef.current?.cm.getLine(h.line - 1);
         if (line) {
-          const underlineWidgetElement = document.createElement('div');
-          underlineWidgetElement.className = 'source-line-error-underline';
-          underlineWidgetElement.innerHTML = '&nbsp;'.repeat(line.length || 1);
-          widgets.push(codemirror.addLineWidget(h.line, underlineWidgetElement, { above: true, coverGutter: false }));
+          const attributes: Record<string, string> = {};
+          attributes['title'] = h.message || '';
+          markers.push(codemirror.markText(
+              { line: h.line - 1, ch: 0 },
+              { line: h.line - 1, ch: h.column || line.length },
+              { className: 'source-line-error-underline', attributes }));
         }
 
-        const errorWidgetElement = document.createElement('div');
-        errorWidgetElement.innerHTML = ansi2html(h.message || '');
-        errorWidgetElement.className = 'source-line-error-widget';
-        widgets.push(codemirror.addLineWidget(h.line, errorWidgetElement, { above: true, coverGutter: false }));
+        if (h.type === 'error') {
+          const errorWidgetElement = document.createElement('div');
+          errorWidgetElement.innerHTML = ansi2html(h.message || '');
+          errorWidgetElement.className = 'source-line-error-widget';
+          widgets.push(codemirror.addLineWidget(h.line, errorWidgetElement, { above: true, coverGutter: false }));
+        }
       }
+
+      // Error markers.
       codemirrorRef.current!.highlight = highlight;
       codemirrorRef.current!.widgets = widgets;
+      codemirrorRef.current!.markers = markers;
     }
 
     // Line-less locations have line = 0, but they mean to reveal the file.
@@ -175,5 +192,70 @@ export const CodeMirrorWrapper: React.FC<SourceProps> = ({
     };
   }, [codemirror, text, highlight, revealLine, focusOnChange, onChange]);
 
-  return <div className='cm-wrapper' ref={codemirrorElement}></div>;
+  return <div data-testid={dataTestId} className='cm-wrapper' ref={codemirrorElement} onClick={onCodeMirrorClick}></div>;
 };
+
+function onCodeMirrorClick(event: React.MouseEvent) {
+  if (!(event.target instanceof HTMLElement))
+    return;
+  let url: string | undefined;
+  if (event.target.classList.contains('cm-linkified')) {
+    // 'text/linkified' custom mode
+    url = event.target.textContent!;
+  } else if (event.target.classList.contains('cm-link') && event.target.nextElementSibling?.classList.contains('cm-url')) {
+    // 'markdown' mode
+    url = event.target.nextElementSibling.textContent!.slice(1, -1);
+  }
+  if (url) {
+    event.preventDefault();
+    event.stopPropagation();
+    window.open(url, '_blank');
+  }
+}
+
+let customModeDefined = false;
+function defineCustomMode(cm: CodeMirror) {
+  if (customModeDefined)
+    return;
+  customModeDefined = true;
+  (cm as any).defineSimpleMode('text/linkified', {
+    start: [
+      { regex: kWebLinkRe, token: 'linkified' },
+    ],
+  });
+}
+
+function mimeTypeToMode(mimeType: string | undefined): string | undefined {
+  if (!mimeType)
+    return;
+  if (mimeType.includes('javascript') || mimeType.includes('json'))
+    return 'javascript';
+  if (mimeType.includes('python'))
+    return 'python';
+  if (mimeType.includes('csharp'))
+    return 'text/x-csharp';
+  if (mimeType.includes('java'))
+    return 'text/x-java';
+  if (mimeType.includes('markdown'))
+    return 'markdown';
+  if (mimeType.includes('html') || mimeType.includes('svg'))
+    return 'htmlmixed';
+  if (mimeType.includes('css'))
+    return 'css';
+}
+
+function highlighterToMode(highlighter: CodeMirrorHighlighter | undefined): string | undefined {
+  if (!highlighter)
+    return;
+  return {
+    javascript: 'javascript',
+    jsonl: 'javascript',
+    python: 'python',
+    csharp: 'text/x-csharp',
+    java: 'text/x-java',
+    markdown: 'markdown',
+    html: 'htmlmixed',
+    css: 'css',
+    yaml: 'yaml',
+  }[highlighter];
+}
diff --git a/packages/web/src/components/dialog.tsx b/packages/web/src/components/dialog.tsx
new file mode 100644
index 0000000000000..9c73b509eae60
--- /dev/null
+++ b/packages/web/src/components/dialog.tsx
@@ -0,0 +1,165 @@
+/*
+  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 * as React from 'react';
+
+export interface DialogProps {
+  className?: string;
+  style?: React.CSSProperties;
+  open: boolean;
+  isModal?: boolean;
+  width?: number;
+  verticalOffset?: number;
+  requestClose?: () => void;
+  anchor?: React.RefObject<HTMLElement>;
+  dataTestId?: string;
+}
+
+export const Dialog: React.FC<React.PropsWithChildren<DialogProps>> = ({
+  className,
+  style: externalStyle,
+  open,
+  isModal,
+  width,
+  verticalOffset,
+  requestClose,
+  anchor,
+  dataTestId,
+  children,
+}) => {
+  const dialogRef = React.useRef<HTMLDialogElement>(null);
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const [_, setRecalculateDimensionsCount] = React.useState(0);
+
+  let style: React.CSSProperties | undefined = externalStyle;
+
+  if (anchor?.current) {
+    const bounds = anchor.current.getBoundingClientRect();
+
+    style = {
+      position: 'fixed',
+      margin: 0,
+      top: bounds.bottom + (verticalOffset ?? 0),
+      left: buildTopLeftCoord(bounds, width ?? 0),
+      width,
+      zIndex: 1,
+      ...externalStyle
+    };
+  }
+
+  React.useEffect(() => {
+    const onClick = (event: MouseEvent) => {
+      if (!dialogRef.current || !(event.target instanceof Node))
+        return;
+
+      if (!dialogRef.current.contains(event.target))
+        requestClose?.();
+    };
+
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'Escape')
+        requestClose?.();
+    };
+
+    if (open) {
+      document.addEventListener('mousedown', onClick);
+      document.addEventListener('keydown', onKeyDown);
+
+      return () => {
+        document.removeEventListener('mousedown', onClick);
+        document.removeEventListener('keydown', onKeyDown);
+      };
+    }
+
+    return () => {};
+  }, [open, requestClose]);
+
+  React.useEffect(() => {
+    const onResize = () => setRecalculateDimensionsCount(count => count + 1);
+
+    window.addEventListener('resize', onResize);
+
+    return () => {
+      window.removeEventListener('resize', onResize);
+    };
+  }, []);
+
+  React.useLayoutEffect(() => {
+    if (!dialogRef.current)
+      return;
+
+    if (open) {
+      if (isModal)
+        dialogRef.current.showModal();
+      else
+        dialogRef.current.show();
+    } else {
+      dialogRef.current.close();
+    }
+  }, [open, isModal]);
+
+  return (
+    <dialog ref={dialogRef} style={style} className={className} data-testid={dataTestId}>
+      {children}
+    </dialog>
+  );
+};
+
+const buildTopLeftCoord = (bounds: DOMRect, width: number): number => {
+  const leftAlignCoord = buildTopLeftCoordWithAlignment(bounds, width, 'left');
+
+  if (leftAlignCoord.inBounds)
+    return leftAlignCoord.value;
+
+  const rightAlignCoord = buildTopLeftCoordWithAlignment(
+      bounds,
+      width,
+      'right'
+  );
+
+  if (rightAlignCoord.inBounds)
+    return rightAlignCoord.value;
+
+  return leftAlignCoord.value;
+};
+
+const buildTopLeftCoordWithAlignment = (
+  bounds: DOMRect,
+  width: number,
+  alignment: 'left' | 'right'
+): {
+  value: number;
+  inBounds: boolean;
+} => {
+  const maxLeft = document.documentElement.clientWidth;
+
+  if (alignment === 'left') {
+    const value = bounds.left;
+
+    return {
+      value,
+      inBounds: value + width <= maxLeft,
+    };
+  } else {
+    const value = bounds.right - width;
+
+    return {
+      value,
+      inBounds: bounds.right - width >= 0,
+    };
+  }
+};
diff --git a/packages/web/src/components/errorMessage.tsx b/packages/web/src/components/errorMessage.tsx
index c9f4500ece277..a37f28e2ec2dd 100644
--- a/packages/web/src/components/errorMessage.tsx
+++ b/packages/web/src/components/errorMessage.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ansi2html } from '@web/ansi2html';
+import { ansi2html } from '../ansi2html';
 import * as React from 'react';
 import './errorMessage.css';
 
diff --git a/packages/web/src/components/expandable.spec.tsx b/packages/web/src/components/expandable.spec.tsx
index ad69f33aed020..9536004bec3bd 100644
--- a/packages/web/src/components/expandable.spec.tsx
+++ b/packages/web/src/components/expandable.spec.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { expect, test } from '@playwright/experimental-ct-react';
 import { Expandable } from './expandable';
 
diff --git a/packages/web/src/components/expandable.tsx b/packages/web/src/components/expandable.tsx
index cb3a9b22545ca..a837bd0a0c0e7 100644
--- a/packages/web/src/components/expandable.tsx
+++ b/packages/web/src/components/expandable.tsx
@@ -16,6 +16,7 @@
 
 import * as React from 'react';
 import './expandable.css';
+import { clsx } from '../uiUtils';
 
 export const Expandable: React.FunctionComponent<React.PropsWithChildren<{
   title: JSX.Element | string,
@@ -23,14 +24,20 @@ export const Expandable: React.FunctionComponent<React.PropsWithChildren<{
   expanded: boolean,
   expandOnTitleClick?: boolean,
 }>> = ({ title, children, setExpanded, expanded, expandOnTitleClick }) => {
-  return <div className={'expandable' + (expanded ? ' expanded' : '')}>
-    <div className='expandable-title' onClick={() => expandOnTitleClick && setExpanded(!expanded)}>
+  const id = React.useId();
+  return <div className={clsx('expandable', expanded && 'expanded')}>
+    <div
+      role='button'
+      aria-expanded={expanded}
+      aria-controls={id}
+      className='expandable-title'
+      onClick={() => expandOnTitleClick && setExpanded(!expanded)}>
       <div
-        className={'codicon codicon-' + (expanded ? 'chevron-down' : 'chevron-right')}
+        className={clsx('codicon', expanded ? 'codicon-chevron-down' : 'codicon-chevron-right')}
         style={{ cursor: 'pointer', color: 'var(--vscode-foreground)', marginLeft: '5px' }}
         onClick={() => !expandOnTitleClick && setExpanded(!expanded)} />
       {title}
     </div>
-    { expanded && <div style={{ marginLeft: 25 }}>{children}</div> }
+    { expanded && <div id={id} role='region' style={{ marginLeft: 25 }}>{children}</div> }
   </div>;
 };
diff --git a/packages/web/src/components/gridView.tsx b/packages/web/src/components/gridView.tsx
index 43a40d55b44ff..58942e5527be7 100644
--- a/packages/web/src/components/gridView.tsx
+++ b/packages/web/src/components/gridView.tsx
@@ -18,7 +18,7 @@ import * as React from 'react';
 import { ListView } from './listView';
 import type { ListViewProps } from './listView';
 import './gridView.css';
-import { ResizeView } from '@web/shared/resizeView';
+import { ResizeView } from '../shared/resizeView';
 
 export type Sorting<T> = { by: keyof T, negate: boolean };
 
@@ -76,6 +76,7 @@ export function GridView<T>(model: GridViewProps<T>) {
       <div className='grid-view-header'>
         {model.columns.map((column, i) => {
           return <div
+            key={model.columnTitle(column)}
             className={'grid-view-header-cell ' + sortingHeader(column, model.sorting)}
             style={{
               width: i < model.columns.length - 1 ? model.columnWidths.get(column) : undefined,
@@ -91,12 +92,14 @@ export function GridView<T>(model: GridViewProps<T>) {
       <ListView
         name={model.name}
         items={model.items}
+        ariaLabel={model.ariaLabel}
         id={model.id}
         render={(item, index) => {
           return <>
             {model.columns.map((column, i) => {
               const { body, title } = model.render(item, column, index);
               return <div
+                key={model.columnTitle(column)}
                 className={`grid-view-cell grid-view-column-${String(column)}`}
                 title={title}
                 style={{
@@ -108,20 +111,17 @@ export function GridView<T>(model: GridViewProps<T>) {
           </>;
         }}
         icon={model.icon}
-        indent={model.indent}
         isError={model.isError}
         isWarning={model.isWarning}
         isInfo={model.isInfo}
         selectedItem={model.selectedItem}
         onAccepted={model.onAccepted}
         onSelected={model.onSelected}
-        onLeftArrow={model.onLeftArrow}
-        onRightArrow={model.onRightArrow}
         onHighlighted={model.onHighlighted}
         onIconClicked={model.onIconClicked}
         noItemsMessage={model.noItemsMessage}
         dataTestId={model.dataTestId}
-        noHighlightOnHover={model.noHighlightOnHover}
+        notSelectable={model.notSelectable}
       ></ListView>
     </div>
   </div>;
diff --git a/packages/web/src/components/listView.css b/packages/web/src/components/listView.css
index cc8c76933266a..3b7791b83d47e 100644
--- a/packages/web/src/components/listView.css
+++ b/packages/web/src/components/listView.css
@@ -34,6 +34,10 @@
   padding-left: 5px;
 }
 
+.list-view-content.not-selectable > .list-view-entry {
+  cursor: inherit;
+}
+
 .list-view-entry.highlighted:not(.selected) {
   background-color: var(--vscode-list-inactiveSelectionBackground) !important;
 }
diff --git a/packages/web/src/components/listView.tsx b/packages/web/src/components/listView.tsx
index df8a2deca0cb5..fcf0a461e5ab6 100644
--- a/packages/web/src/components/listView.tsx
+++ b/packages/web/src/components/listView.tsx
@@ -16,6 +16,7 @@
 
 import * as React from 'react';
 import './listView.css';
+import { clsx, scrollIntoViewIfNeeded } from '../uiUtils';
 
 export type ListViewProps<T> = {
   name: string,
@@ -23,20 +24,18 @@ export type ListViewProps<T> = {
   id?: (item: T, index: number) => string,
   render: (item: T, index: number) => React.ReactNode,
   icon?: (item: T, index: number) => string | undefined,
-  indent?: (item: T, index: number) => number | undefined,
   isError?: (item: T, index: number) => boolean,
   isWarning?: (item: T, index: number) => boolean,
   isInfo?: (item: T, index: number) => boolean,
+  ariaLabel?: string,
   selectedItem?: T,
   onAccepted?: (item: T, index: number) => void,
   onSelected?: (item: T, index: number) => void,
-  onLeftArrow?: (item: T, index: number) => void,
-  onRightArrow?: (item: T, index: number) => void,
   onHighlighted?: (item: T | undefined) => void,
   onIconClicked?: (item: T, index: number) => void,
   noItemsMessage?: string,
   dataTestId?: string,
-  noHighlightOnHover?: boolean,
+  notSelectable?: boolean,
 };
 
 const scrollPositions = new Map<string, number>();
@@ -50,17 +49,15 @@ export function ListView<T>({
   isError,
   isWarning,
   isInfo,
-  indent,
   selectedItem,
   onAccepted,
   onSelected,
-  onLeftArrow,
-  onRightArrow,
   onHighlighted,
   onIconClicked,
   noItemsMessage,
   dataTestId,
-  noHighlightOnHover,
+  notSelectable,
+  ariaLabel,
 }: ListViewProps<T>) {
   const itemListRef = React.useRef<HTMLDivElement>(null);
   const [highlightedItem, setHighlightedItem] = React.useState<any>();
@@ -85,30 +82,21 @@ export function ListView<T>({
       itemListRef.current.scrollTop = scrollPositions.get(name) || 0;
   }, [name]);
 
-  return <div className={`list-view vbox ` + name + '-list-view' } role={items.length > 0 ? 'list' : undefined} data-testid={dataTestId || (name + '-list')}>
+  return <div className={clsx(`list-view vbox`, name + '-list-view')} role={items.length > 0 ? 'list' : undefined} aria-label={ariaLabel}>
     <div
-      className='list-view-content'
+      className={clsx('list-view-content', notSelectable && 'not-selectable')}
       tabIndex={0}
       onKeyDown={event => {
         if (selectedItem && event.key === 'Enter') {
           onAccepted?.(selectedItem, items.indexOf(selectedItem));
           return;
         }
-        if (event.key !== 'ArrowDown' &&  event.key !== 'ArrowUp' && event.key !== 'ArrowLeft' &&  event.key !== 'ArrowRight')
+        if (event.key !== 'ArrowDown' &&  event.key !== 'ArrowUp')
           return;
 
         event.stopPropagation();
         event.preventDefault();
 
-        if (selectedItem && event.key === 'ArrowLeft') {
-          onLeftArrow?.(selectedItem, items.indexOf(selectedItem));
-          return;
-        }
-        if (selectedItem && event.key === 'ArrowRight') {
-          onRightArrow?.(selectedItem, items.indexOf(selectedItem));
-          return;
-        }
-
         const index = selectedItem ? items.indexOf(selectedItem) : -1;
         let newIndex = index;
         if (event.key === 'ArrowDown') {
@@ -128,28 +116,29 @@ export function ListView<T>({
         scrollIntoViewIfNeeded(element || undefined);
         onHighlighted?.(undefined);
         onSelected?.(items[newIndex], newIndex);
+        setHighlightedItem(undefined);
       }}
       ref={itemListRef}
     >
       {noItemsMessage && items.length === 0 && <div className='list-view-empty'>{noItemsMessage}</div>}
       {items.map((item, index) => {
-        const selectedSuffix = selectedItem === item ? ' selected' : '';
-        const highlightedSuffix = !noHighlightOnHover && highlightedItem === item ? ' highlighted' : '';
-        const errorSuffix = isError?.(item, index) ? ' error' : '';
-        const warningSuffix = isWarning?.(item, index) ? ' warning' : '';
-        const infoSuffix = isInfo?.(item, index) ? ' info' : '';
-        const indentation = indent?.(item, index) || 0;
         const rendered = render(item, index);
         return <div
           key={id?.(item, index) || index}
           onDoubleClick={() => onAccepted?.(item, index)}
           role='listitem'
-          className={'list-view-entry' + selectedSuffix + highlightedSuffix + errorSuffix + warningSuffix + infoSuffix}
+          className={clsx(
+              'list-view-entry',
+              selectedItem === item && 'selected',
+              !notSelectable && highlightedItem === item && 'highlighted',
+              isError?.(item, index) && 'error',
+              isWarning?.(item, index) && 'warning',
+              isInfo?.(item, index) && 'info')}
+          aria-selected={selectedItem === item}
           onClick={() => onSelected?.(item, index)}
           onMouseEnter={() => setHighlightedItem(item)}
           onMouseLeave={() => setHighlightedItem(undefined)}
         >
-          {indentation ? new Array(indentation).fill(0).map(() => <div className='list-view-indent'></div>) : undefined}
           {icon && <div
             className={'codicon ' + (icon(item, index) || 'codicon-blank')}
             style={{ minWidth: 16, marginRight: 4 }}
@@ -169,12 +158,3 @@ export function ListView<T>({
     </div>
   </div>;
 }
-
-function scrollIntoViewIfNeeded(element: Element | undefined) {
-  if (!element)
-    return;
-  if ((element as any)?.scrollIntoViewIfNeeded)
-    (element as any).scrollIntoViewIfNeeded(false);
-  else
-    element?.scrollIntoView();
-}
diff --git a/packages/trace-viewer/src/ui/uiModeModel.ts b/packages/web/src/components/sourceChooser.css
similarity index 57%
rename from packages/trace-viewer/src/ui/uiModeModel.ts
rename to packages/web/src/components/sourceChooser.css
index 97952cfbfdedf..60ac74bf85445 100644
--- a/packages/trace-viewer/src/ui/uiModeModel.ts
+++ b/packages/web/src/components/sourceChooser.css
@@ -1,12 +1,9 @@
 /*
   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.
@@ -14,20 +11,10 @@
   limitations under the License.
 */
 
-import type * as reporterTypes from 'playwright/types/testReporter';
-
-export type Progress = {
-  total: number;
-  passed: number;
-  failed: number;
-  skipped: number;
-};
-
-export type TestModel = {
-  config: reporterTypes.FullConfig;
-  rootSuite: reporterTypes.Suite;
-  loadErrors: reporterTypes.TestError[];
-  progress: Progress;
-};
-
-export const pathSeparator = navigator.userAgent.toLowerCase().includes('windows') ? '\\' : '/';
+.source-chooser {
+  border: none;
+  background: none;
+  outline: none;
+  color: var(--vscode-sideBarTitle-foreground);
+  min-width: 100px;
+}
diff --git a/packages/web/src/components/sourceChooser.tsx b/packages/web/src/components/sourceChooser.tsx
new file mode 100644
index 0000000000000..091dce8f98959
--- /dev/null
+++ b/packages/web/src/components/sourceChooser.tsx
@@ -0,0 +1,62 @@
+/**
+ * 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 * as React from 'react';
+import type { Source } from '@recorder/recorderTypes';
+
+export const SourceChooser: React.FC<{
+  sources: Source[],
+  fileId: string | undefined,
+  setFileId: (fileId: string) => void,
+}> = ({ sources, fileId, setFileId }) => {
+  return <select className='source-chooser' hidden={!sources.length} title='Source chooser' value={fileId} onChange={event => {
+    setFileId(event.target.selectedOptions[0].value);
+  }}>{renderSourceOptions(sources)}</select>;
+};
+
+function renderSourceOptions(sources: Source[]): React.ReactNode {
+  const transformTitle = (title: string): string => title.replace(/.*[/\\]([^/\\]+)/, '$1');
+  const renderOption = (source: Source): React.ReactNode => (
+    <option key={source.id} value={source.id}>{transformTitle(source.label)}</option>
+  );
+
+  const sourcesByGroups = new Map<string, Source[]>();
+  for (const source of sources) {
+    let list = sourcesByGroups.get(source.group || 'Debugger');
+    if (!list) {
+      list = [];
+      sourcesByGroups.set(source.group || 'Debugger', list);
+    }
+    list.push(source);
+  }
+
+  return [...sourcesByGroups.entries()].map(([group, sources]) => (
+    <optgroup label={group} key={group}>
+      {sources.filter(s => (s.group || 'Debugger') === group).map(source => renderOption(source))}
+    </optgroup>
+  ));
+}
+
+export function emptySource(): Source {
+  return {
+    id: 'default',
+    isRecorded: false,
+    text: '',
+    language: 'javascript',
+    label: '',
+    highlight: []
+  };
+}
diff --git a/packages/web/src/components/splitView.spec.tsx b/packages/web/src/components/splitView.spec.tsx
index 605205059ec45..ca11520912f4c 100644
--- a/packages/web/src/components/splitView.spec.tsx
+++ b/packages/web/src/components/splitView.spec.tsx
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { expect, test } from '@playwright/experimental-ct-react';
 import { SplitView } from './splitView';
 
 test.use({ viewport: { width: 500, height: 500 } });
 
 test('should render', async ({ mount }) => {
-  const component = await mount(<SplitView sidebarSize={100}>
-    <div id='main' style={{ border: '1px solid red', flex: 'auto' }}>main</div>
-    <div id='sidebar' style={{ border: '1px solid blue', flex: 'auto' }}>sidebar</div>
-  </SplitView>);
+  const component = await mount(
+      <SplitView
+        sidebarSize={100}
+        main={<div id='main' style={{ border: '1px solid red', flex: 'auto' }}>main</div>}
+        sidebar={<div id='sidebar' style={{ border: '1px solid blue', flex: 'auto' }}>sidebar</div>}
+      />);
   const mainBox = await component.locator('#main').boundingBox();
   const sidebarBox = await component.locator('#sidebar').boundingBox();
   expect.soft(mainBox).toEqual({ x: 0, y: 0, width: 500, height: 400 });
@@ -32,10 +33,13 @@ test('should render', async ({ mount }) => {
 });
 
 test('should render sidebar first', async ({ mount }) => {
-  const component = await mount(<SplitView sidebarSize={100} sidebarIsFirst={true}>
-    <div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>
-    <div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>
-  </SplitView>);
+  const component = await mount(
+      <SplitView
+        sidebarSize={100}
+        sidebarIsFirst
+        main={<div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>}
+        sidebar={<div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>}
+      />);
   const mainBox = await component.locator('#main').boundingBox();
   const sidebarBox = await component.locator('#sidebar').boundingBox();
   expect.soft(mainBox).toEqual({ x: 0, y: 100, width: 500, height: 400 });
@@ -43,10 +47,14 @@ test('should render sidebar first', async ({ mount }) => {
 });
 
 test('should render horizontal split', async ({ mount }) => {
-  const component = await mount(<SplitView sidebarSize={100} sidebarIsFirst={true} orientation={'horizontal'}>
-    <div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>
-    <div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>
-  </SplitView>);
+  const component = await mount(
+      <SplitView
+        sidebarSize={100}
+        sidebarIsFirst
+        orientation='horizontal'
+        main={<div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>}
+        sidebar={<div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>}
+      />);
   const mainBox = await component.locator('#main').boundingBox();
   const sidebarBox = await component.locator('#sidebar').boundingBox();
   expect.soft(mainBox).toEqual({ x: 100, y: 0, width: 400, height: 500 });
@@ -54,19 +62,25 @@ test('should render horizontal split', async ({ mount }) => {
 });
 
 test('should hide sidebar', async ({ mount }) => {
-  const component = await mount(<SplitView sidebarSize={100} orientation={'horizontal'} sidebarHidden={true}>
-    <div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>
-    <div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>
-  </SplitView>);
+  const component = await mount(
+      <SplitView
+        sidebarSize={100}
+        orientation={'horizontal'}
+        sidebarHidden
+        main={<div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>}
+        sidebar={<div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>}
+      />);
   const mainBox = await component.locator('#main').boundingBox();
   expect.soft(mainBox).toEqual({ x: 0, y: 0, width: 500, height: 500 });
 });
 
 test('drag resize', async ({ page, mount }) => {
-  const component = await mount(<SplitView sidebarSize={100}>
-    <div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>
-    <div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>
-  </SplitView>);
+  const component = await mount(
+      <SplitView
+        sidebarSize={100}
+        main={<div id='main' style={{ border: '1px solid blue', flex: 'auto' }}>main</div>}
+        sidebar={<div id='sidebar' style={{ border: '1px solid red', flex: 'auto' }}>sidebar</div>}
+      />);
   await page.mouse.move(25, 400);
   await page.mouse.down();
   await page.mouse.move(25, 100);
@@ -76,4 +90,3 @@ test('drag resize', async ({ page, mount }) => {
   expect.soft(mainBox).toEqual({ x: 0, y: 0, width: 500, height: 100 });
   expect.soft(sidebarBox).toEqual({ x: 0, y: 101, width: 500, height: 399 });
 });
-
diff --git a/packages/web/src/components/splitView.tsx b/packages/web/src/components/splitView.tsx
index a252996e735bb..d2d0fbbd0f859 100644
--- a/packages/web/src/components/splitView.tsx
+++ b/packages/web/src/components/splitView.tsx
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 
-import { useMeasure, useSetting } from '../uiUtils';
+import { clsx, useMeasure, useSetting } from '../uiUtils';
 import './splitView.css';
 import * as React from 'react';
 
@@ -25,21 +25,27 @@ export type SplitViewProps = {
   orientation?: 'vertical' | 'horizontal';
   minSidebarSize?: number;
   settingName?: string;
+
+  sidebar: React.ReactNode;
+  main: React.ReactNode;
 };
 
 const kMinSize = 50;
 
-export const SplitView: React.FC<React.PropsWithChildren<SplitViewProps>> = ({
+export const SplitView: React.FC<SplitViewProps> = ({
   sidebarSize,
   sidebarHidden = false,
   sidebarIsFirst = false,
   orientation = 'vertical',
   minSidebarSize = kMinSize,
   settingName,
-  children
+  sidebar,
+  main,
 }) => {
-  const [hSize, setHSize] = useSetting<number>(settingName ? settingName + '.' + orientation + ':size' : undefined, Math.max(minSidebarSize, sidebarSize) * window.devicePixelRatio);
-  const [vSize, setVSize] = useSetting<number>(settingName ? settingName + '.' + orientation + ':size' : undefined, Math.max(minSidebarSize, sidebarSize) * window.devicePixelRatio);
+  const defaultSize = Math.max(minSidebarSize, sidebarSize) * window.devicePixelRatio;
+  const [hSize, setHSize] = useSetting<number>(settingName ? settingName + '.' + orientation + ':size' : undefined, defaultSize);
+  const [vSize, setVSize] = useSetting<number>(settingName ? settingName + '.' + orientation + ':size' : undefined, defaultSize);
+
   const [resizing, setResizing] = React.useState<{ offset: number, size: number } | null>(null);
   const [measure, ref] = useMeasure<HTMLDivElement>();
 
@@ -54,7 +60,6 @@ export const SplitView: React.FC<React.PropsWithChildren<SplitViewProps>> = ({
       size = measure.width - 10;
   }
 
-  const childrenArray = React.Children.toArray(children);
   document.body.style.userSelect = resizing ? 'none' : 'inherit';
   let resizerStyle: any = {};
   if (orientation === 'vertical') {
@@ -69,10 +74,10 @@ export const SplitView: React.FC<React.PropsWithChildren<SplitViewProps>> = ({
       resizerStyle = { right: resizing ? 0 : size - 4, left: resizing ? 0 : undefined, width: resizing ? 'initial' : 8 };
   }
 
-  return <div className={'split-view ' + orientation + (sidebarIsFirst ? ' sidebar-first' : '') } ref={ref}>
-    <div className='split-view-main'>{childrenArray[0]}</div>
-    { !sidebarHidden && <div style={{ flexBasis: size }} className='split-view-sidebar'>{childrenArray[1]}</div> }
-    { !sidebarHidden && <div
+  return <div className={clsx('split-view', orientation, sidebarIsFirst && 'sidebar-first')} ref={ref}>
+    <div className='split-view-main'>{main}</div>
+    {!sidebarHidden && <div style={{ flexBasis: size }} className='split-view-sidebar'>{sidebar}</div>}
+    {!sidebarHidden && <div
       style={resizerStyle}
       className='split-view-resizer'
       onMouseDown={event => setResizing({ offset: orientation === 'vertical' ? event.clientY : event.clientX, size })}
@@ -94,6 +99,6 @@ export const SplitView: React.FC<React.PropsWithChildren<SplitViewProps>> = ({
             setHSize(size * window.devicePixelRatio);
         }
       }}
-    ></div> }
+    ></div>}
   </div>;
 };
diff --git a/packages/web/src/components/tabbedPane.tsx b/packages/web/src/components/tabbedPane.tsx
index d8c557f4c365b..95b0fa540ce42 100644
--- a/packages/web/src/components/tabbedPane.tsx
+++ b/packages/web/src/components/tabbedPane.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { clsx } from '../uiUtils';
 import './tabbedPane.css';
 import { Toolbar } from './toolbar';
 import * as React from 'react';
@@ -31,11 +32,14 @@ export const TabbedPane: React.FunctionComponent<{
   tabs: TabbedPaneTabModel[],
   leftToolbar?: React.ReactElement[],
   rightToolbar?: React.ReactElement[],
-  selectedTab: string,
-  setSelectedTab: (tab: string) => void,
+  selectedTab?: string,
+  setSelectedTab?: (tab: string) => void,
   dataTestId?: string,
   mode?: 'default' | 'select',
 }> = ({ tabs, selectedTab, setSelectedTab, leftToolbar, rightToolbar, dataTestId, mode }) => {
+  const id = React.useId();
+  if (!selectedTab)
+    selectedTab = tabs[0].id;
   if (!mode)
     mode = 'default';
   return <div className='tabbed-pane' data-testid={dataTestId}>
@@ -44,33 +48,31 @@ export const TabbedPane: React.FunctionComponent<{
         { leftToolbar && <div style={{ flex: 'none', display: 'flex', margin: '0 4px', alignItems: 'center' }}>
           {...leftToolbar}
         </div>}
-        {mode === 'default' && <div style={{ flex: 'auto', display: 'flex', height: '100%', overflow: 'hidden' }}>
+        {mode === 'default' && <div style={{ flex: 'auto', display: 'flex', height: '100%', overflow: 'hidden' }} role='tablist'>
           {[...tabs.map(tab => (
             <TabbedPaneTab
+              key={tab.id}
               id={tab.id}
+              ariaControls={`${id}-${tab.id}`}
               title={tab.title}
               count={tab.count}
               errorCount={tab.errorCount}
               selected={selectedTab === tab.id}
               onSelect={setSelectedTab}
-            ></TabbedPaneTab>)),
+            />)),
           ]}
         </div>}
-        {mode === 'select' && <div style={{ flex: 'auto', display: 'flex', height: '100%', overflow: 'hidden' }}>
-          <select style={{ width: '100%', background: 'none', cursor: 'pointer' }} onChange={e => {
-            setSelectedTab(tabs[e.currentTarget.selectedIndex].id);
+        {mode === 'select' && <div style={{ flex: 'auto', display: 'flex', height: '100%', overflow: 'hidden' }} role='tablist'>
+          <select style={{ width: '100%', background: 'none', cursor: 'pointer' }} value={selectedTab} onChange={e => {
+            setSelectedTab?.(tabs[e.currentTarget.selectedIndex].id);
           }}>
             {tabs.map(tab => {
               let suffix = '';
-              if (tab.count === 1)
-                suffix = ' 🔵';
-              else if (tab.count)
-                suffix = ` 🔵✖️${tab.count}`;
-              if (tab.errorCount === 1)
-                suffix = ` 🔴`;
-              else if (tab.errorCount)
-                suffix = ` 🔴✖️${tab.errorCount}`;
-              return <option value={tab.id} selected={tab.id === selectedTab}>{tab.title}{suffix}</option>;
+              if (tab.count)
+                suffix = ` (${tab.count})`;
+              if (tab.errorCount)
+                suffix = ` (${tab.errorCount})`;
+              return <option key={tab.id} value={tab.id} role='tab' aria-controls={`${id}-${tab.id}`}>{tab.title}{suffix}</option>;
             })}
           </select>
         </div>}
@@ -82,9 +84,9 @@ export const TabbedPane: React.FunctionComponent<{
         tabs.map(tab => {
           const className = 'tab-content tab-' + tab.id;
           if (tab.component)
-            return <div key={tab.id} className={className} style={{ display: selectedTab === tab.id ? 'inherit' : 'none' }}>{tab.component}</div>;
+            return <div key={tab.id} id={`${id}-${tab.id}`} role='tabpanel' aria-label={tab.title} className={className} style={{ display: selectedTab === tab.id ? 'inherit' : 'none' }}>{tab.component}</div>;
           if (selectedTab === tab.id)
-            return <div key={tab.id} className={className}>{tab.render!()}</div>;
+            return <div key={tab.id} id={`${id}-${tab.id}`} role='tabpanel' aria-label={tab.title} className={className}>{tab.render!()}</div>;
         })
       }
     </div>
@@ -97,12 +99,14 @@ export const TabbedPaneTab: React.FunctionComponent<{
   count?: number,
   errorCount?: number,
   selected?: boolean,
-  onSelect: (id: string) => void
-}> = ({ id, title, count, errorCount, selected, onSelect }) => {
-  return <div className={'tabbed-pane-tab ' + (selected ? 'selected' : '')}
-    onClick={() => onSelect(id)}
+  onSelect?: (id: string) => void,
+  ariaControls?: string,
+}> = ({ id, title, count, errorCount, selected, onSelect, ariaControls }) => {
+  return <div className={clsx('tabbed-pane-tab', selected && 'selected')}
+    onClick={() => onSelect?.(id)}
+    role='tab'
     title={title}
-    key={id}>
+    aria-controls={ariaControls}>
     <div className='tabbed-pane-tab-label'>{title}</div>
     {!!count && <div className='tabbed-pane-tab-counter'>{count}</div>}
     {!!errorCount && <div className='tabbed-pane-tab-counter error'>{errorCount}</div>}
diff --git a/packages/web/src/components/toolbar.css b/packages/web/src/components/toolbar.css
index 8c58f96f65fb3..08e3614e34710 100644
--- a/packages/web/src/components/toolbar.css
+++ b/packages/web/src/components/toolbar.css
@@ -24,6 +24,10 @@
   padding-right: 4px;
 }
 
+.toolbar.toolbar-sidebar-background {
+  background-color: var(--vscode-sideBar-background);
+}
+
 .toolbar:after {
   content: '';
   display: block;
@@ -59,6 +63,10 @@
   margin: 2px;
 }
 
+.toolbar option {
+  background-color: var(--vscode-tab-activeBackground)
+}
+
 .toolbar input, .toolbar select {
   border: none;
   color: var(--vscode-input-foreground);
diff --git a/packages/web/src/components/toolbar.tsx b/packages/web/src/components/toolbar.tsx
index 023fad0232d48..32a4227d7ffea 100644
--- a/packages/web/src/components/toolbar.tsx
+++ b/packages/web/src/components/toolbar.tsx
@@ -14,12 +14,14 @@
   limitations under the License.
 */
 
+import { clsx } from '../uiUtils';
 import './toolbar.css';
 import * as React from 'react';
 
 type ToolbarProps = {
   noShadow?: boolean;
   noMinHeight?: boolean;
+  sidebarBackground?: boolean;
   className?: string;
   onClick?: (e: React.MouseEvent) => void;
 };
@@ -29,7 +31,8 @@ export const Toolbar: React.FC<React.PropsWithChildren<ToolbarProps>> = ({
   children,
   noMinHeight,
   className,
+  sidebarBackground,
   onClick,
 }) => {
-  return <div className={'toolbar' + (noShadow ? ' no-shadow' : '') + (noMinHeight ? ' no-min-height' : '') + ' ' + (className || '')} onClick={onClick}>{children}</div>;
+  return <div className={clsx('toolbar', noShadow && 'no-shadow', noMinHeight && 'no-min-height', className, sidebarBackground && 'toolbar-sidebar-background')} onClick={onClick}>{children}</div>;
 };
diff --git a/packages/web/src/components/toolbarButton.tsx b/packages/web/src/components/toolbarButton.tsx
index d644106eef483..c7d0230b98f20 100644
--- a/packages/web/src/components/toolbarButton.tsx
+++ b/packages/web/src/components/toolbarButton.tsx
@@ -17,18 +17,21 @@
 import './toolbarButton.css';
 import '../third_party/vscode/codicon.css';
 import * as React from 'react';
+import { clsx } from '../uiUtils';
 
 export interface ToolbarButtonProps {
-  title: string,
+  title?: string,
   icon?: string,
   disabled?: boolean,
   toggled?: boolean,
-  onClick: (e: React.MouseEvent) => void,
+  onClick?: (e: React.MouseEvent) => void,
   style?: React.CSSProperties,
   testId?: string,
+  className?: string,
+  ariaLabel?: string,
 }
 
-export const ToolbarButton: React.FC<React.PropsWithChildren<ToolbarButtonProps>> = ({
+export const ToolbarButton = React.forwardRef<HTMLButtonElement, React.PropsWithChildren<ToolbarButtonProps>>(function ToolbarButton({
   children,
   title = '',
   icon,
@@ -37,24 +40,25 @@ export const ToolbarButton: React.FC<React.PropsWithChildren<ToolbarButtonProps>
   onClick = () => {},
   style,
   testId,
-}) => {
-  let className = `toolbar-button ${icon}`;
-  if (toggled)
-    className += ' toggled';
+  className,
+  ariaLabel,
+}, ref) {
   return <button
-    className={className}
+    ref={ref}
+    className={clsx(className, 'toolbar-button', icon, toggled && 'toggled')}
     onMouseDown={preventDefault}
     onClick={onClick}
     onDoubleClick={preventDefault}
     title={title}
     disabled={!!disabled}
     style={style}
-    data-testId={testId}
+    data-testid={testId}
+    aria-label={ariaLabel || title}
   >
     {icon && <span className={`codicon codicon-${icon}`} style={children ? { marginRight: 5 } : {}}></span>}
     {children}
   </button>;
-};
+});
 
 export const ToolbarSeparator: React.FC<{ style?: React.CSSProperties }> = ({
   style,
diff --git a/packages/web/src/components/treeView.css b/packages/web/src/components/treeView.css
new file mode 100644
index 0000000000000..26b27ceb9f5ba
--- /dev/null
+++ b/packages/web/src/components/treeView.css
@@ -0,0 +1,96 @@
+/*
+  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.
+*/
+
+.tree-view-content {
+  display: flex;
+  flex-direction: column;
+  flex: auto;
+  position: relative;
+  user-select: none;
+  overflow: hidden auto;
+  outline: 1px solid transparent;
+}
+
+.tree-view-entry {
+  display: flex;
+  flex: none;
+  cursor: pointer;
+  align-items: center;
+  white-space: nowrap;
+  line-height: 28px;
+  padding-left: 5px;
+}
+
+.tree-view-content.not-selectable > .tree-view-entry {
+  cursor: inherit;
+}
+
+.tree-view-entry.highlighted:not(.selected) {
+  background-color: var(--vscode-list-inactiveSelectionBackground) !important;
+}
+
+.tree-view-entry.selected {
+  z-index: 10;
+}
+
+.tree-view-indent {
+  min-width: 16px;
+}
+
+.tree-view-content:focus .tree-view-entry.selected {
+  background-color: var(--vscode-list-activeSelectionBackground);
+  color: var(--vscode-list-activeSelectionForeground);
+  outline: 1px solid var(--vscode-focusBorder);
+}
+
+.tree-view-content .tree-view-entry.selected {
+  background-color: var(--vscode-list-inactiveSelectionBackground);
+}
+
+.tree-view-content:focus .tree-view-entry.selected * {
+  color: var(--vscode-list-activeSelectionForeground) !important;
+  background-color: transparent !important;
+}
+
+.tree-view-content:focus .tree-view-entry.selected .codicon {
+  color: var(--vscode-list-activeSelectionForeground) !important;
+}
+
+.tree-view-content:focus .tree-view-entry.selected button.eye.toggled {
+  border-radius: 6px;
+  outline: 1px solid var(--vscode-button-foreground);
+}
+
+.tree-view-empty {
+  flex: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.tree-view-entry.error {
+  color: var(--vscode-list-errorForeground);
+  background-color: var(--vscode-inputValidation-errorBackground);
+}
+
+.tree-view-entry.warning {
+  color: var(--vscode-list-warningForeground);
+  background-color: var(--vscode-inputValidation-warningBackground);
+}
+
+.tree-view-entry.info {
+  background-color: var(--vscode-inputValidation-infoBackground);
+}
diff --git a/packages/web/src/components/treeView.tsx b/packages/web/src/components/treeView.tsx
index 8341056779bdb..f478ba402512a 100644
--- a/packages/web/src/components/treeView.tsx
+++ b/packages/web/src/components/treeView.tsx
@@ -15,7 +15,8 @@
 */
 
 import * as React from 'react';
-import { ListView } from './listView';
+import { clsx, scrollIntoViewIfNeeded } from '../uiUtils';
+import './treeView.css';
 
 export type TreeItem = {
   id: string,
@@ -31,6 +32,7 @@ export type TreeViewProps<T> = {
   name: string,
   rootItem: T,
   render: (item: T) => React.ReactNode,
+  title?: (item: T) => string,
   icon?: (item: T) => string | undefined,
   isError?: (item: T) => boolean,
   isVisible?: (item: T) => boolean,
@@ -45,12 +47,13 @@ export type TreeViewProps<T> = {
   autoExpandDepth?: number,
 };
 
-const TreeListView = ListView<TreeItem>;
+const scrollPositions = new Map<string, number>();
 
 export function TreeView<T extends TreeItem>({
   name,
   rootItem,
   render,
+  title,
   icon,
   isError,
   isVisible,
@@ -65,113 +68,285 @@ export function TreeView<T extends TreeItem>({
   autoExpandDepth,
 }: TreeViewProps<T>) {
   const treeItems = React.useMemo(() => {
-    return flattenTree<T>(rootItem, selectedItem, treeState.expandedItems, autoExpandDepth || 0);
-  }, [rootItem, selectedItem, treeState, autoExpandDepth]);
-
-  // Filter visible items.
-  const visibleItems = React.useMemo(() => {
-    if (!isVisible)
-      return [...treeItems.keys()];
-    const cachedVisible = new Map<TreeItem, boolean>();
-    const visit = (item: TreeItem): boolean => {
-      const cachedResult = cachedVisible.get(item);
-      if (cachedResult !== undefined)
-        return cachedResult;
-
-      let hasVisibleChildren = item.children.some(child => visit(child));
-      for (const child of item.children) {
-        const result = visit(child);
-        hasVisibleChildren = hasVisibleChildren || result;
-      }
-      const result = isVisible(item as T) || hasVisibleChildren;
-      cachedVisible.set(item, result);
-      return result;
+    return indexTree<T>(rootItem, selectedItem, treeState.expandedItems, autoExpandDepth || 0, isVisible);
+  }, [rootItem, selectedItem, treeState, autoExpandDepth, isVisible]);
+
+  const itemListRef = React.useRef<HTMLDivElement>(null);
+  const [highlightedItem, setHighlightedItem] = React.useState<any>();
+  const [isKeyboardNavigation, setIsKeyboardNavigation] = React.useState(false);
+
+  React.useEffect(() => {
+    onHighlighted?.(highlightedItem);
+  }, [onHighlighted, highlightedItem]);
+
+  React.useEffect(() => {
+    const treeElem = itemListRef.current;
+    if (!treeElem)
+      return;
+    const saveScrollPosition = () => {
+      scrollPositions.set(name, treeElem.scrollTop);
     };
-    for (const item of treeItems.keys())
-      visit(item);
-    const result: T[] = [];
-    for (const item of treeItems.keys()) {
-      if (isVisible(item))
-        result.push(item);
-    }
-    return result;
-  }, [treeItems, isVisible]);
-
-  return <TreeListView
-    name={name}
-    items={visibleItems}
-    id={item => item.id}
-    dataTestId={dataTestId || (name + '-tree')}
-    render={item => {
-      const rendered = render(item as T);
-      return <>
-        {icon && <div className={'codicon ' + (icon(item as T) || 'blank')} style={{ minWidth: 16, marginRight: 4 }}></div>}
-        {typeof rendered === 'string' ? <div style={{ textOverflow: 'ellipsis', overflow: 'hidden' }}>{rendered}</div> : rendered}
-      </>;
-    }}
-    icon={item => {
-      const expanded = treeItems.get(item as T)!.expanded;
-      if (typeof expanded === 'boolean')
-        return expanded ? 'codicon-chevron-down' : 'codicon-chevron-right';
-    }}
-    isError={item => isError?.(item as T) || false}
-    indent={item => treeItems.get(item as T)!.depth}
-    selectedItem={selectedItem}
-    onAccepted={item => onAccepted?.(item as T)}
-    onSelected={item => onSelected?.(item as T)}
-    onHighlighted={item => onHighlighted?.(item as T)}
-    onLeftArrow={item => {
-      const { expanded, parent } = treeItems.get(item as T)!;
-      if (expanded) {
-        treeState.expandedItems.set(item.id, false);
-        setTreeState({ ...treeState });
-      } else if (parent) {
-        onSelected?.(parent as T);
-      }
-    }}
-    onRightArrow={item => {
-      if (item.children.length) {
-        treeState.expandedItems.set(item.id, true);
-        setTreeState({ ...treeState });
+    treeElem.addEventListener('scroll', saveScrollPosition, { passive: true });
+    return () => treeElem.removeEventListener('scroll', saveScrollPosition);
+  }, [name]);
+
+  React.useEffect(() => {
+    if (itemListRef.current)
+      itemListRef.current.scrollTop = scrollPositions.get(name) || 0;
+  }, [name]);
+
+  const toggleExpanded = React.useCallback((item: T) => {
+    const { expanded } = treeItems.get(item)!;
+    if (expanded) {
+      // Move nested selection up.
+      for (let i: TreeItem | undefined = selectedItem; i; i = i.parent) {
+        if (i === item) {
+          onSelected?.(item as T);
+          break;
+        }
       }
-    }}
-    onIconClicked={item => {
-      const { expanded } = treeItems.get(item as T)!;
-      if (expanded) {
-        // Move nested selection up.
-        for (let i: TreeItem | undefined = selectedItem; i; i = i.parent) {
-          if (i === item) {
-            onSelected?.(item as T);
-            break;
+      treeState.expandedItems.set(item.id, false);
+    } else {
+      treeState.expandedItems.set(item.id, true);
+    }
+    setTreeState({ ...treeState });
+  }, [treeItems, selectedItem, onSelected, treeState, setTreeState]);
+
+  return <div className={clsx(`tree-view vbox`, name + '-tree-view')} role={'tree'} data-testid={dataTestId || (name + '-tree')}>
+    <div
+      className={clsx('tree-view-content')}
+      tabIndex={0}
+      onKeyDown={event => {
+        if (selectedItem && event.key === 'Enter') {
+          onAccepted?.(selectedItem);
+          return;
+        }
+        if (event.key !== 'ArrowDown' &&  event.key !== 'ArrowUp' && event.key !== 'ArrowLeft' &&  event.key !== 'ArrowRight')
+          return;
+
+        event.stopPropagation();
+        event.preventDefault();
+
+        if (selectedItem && event.key === 'ArrowLeft') {
+          const { expanded, parent } = treeItems.get(selectedItem)!;
+          if (expanded) {
+            treeState.expandedItems.set(selectedItem.id, false);
+            setTreeState({ ...treeState });
+          } else if (parent) {
+            onSelected?.(parent as T);
           }
+          return;
         }
-        treeState.expandedItems.set(item.id, false);
-      } else {
-        treeState.expandedItems.set(item.id, true);
-      }
-      setTreeState({ ...treeState });
-    }}
-    noItemsMessage={noItemsMessage} />;
+        if (selectedItem && event.key === 'ArrowRight') {
+          if (selectedItem.children.length) {
+            treeState.expandedItems.set(selectedItem.id, true);
+            setTreeState({ ...treeState });
+          }
+          return;
+        }
+
+        let newSelectedItem: T | undefined = selectedItem;
+        if (event.key === 'ArrowDown') {
+          if (selectedItem) {
+            const itemData = treeItems.get(selectedItem)!;
+            newSelectedItem = itemData.next as T;
+          } else if (treeItems.size) {
+            const itemList = [...treeItems.keys()];
+            newSelectedItem = itemList[0];
+          }
+        }
+        if (event.key === 'ArrowUp') {
+          if (selectedItem) {
+            const itemData = treeItems.get(selectedItem)!;
+            newSelectedItem = itemData.prev as T;
+          } else if (treeItems.size) {
+            const itemList = [...treeItems.keys()];
+            newSelectedItem = itemList[itemList.length - 1];
+          }
+        }
+
+        // scrollIntoViewIfNeeded(element || undefined);
+        onHighlighted?.(undefined);
+        if (newSelectedItem) {
+          setIsKeyboardNavigation(true);
+          onSelected?.(newSelectedItem);
+        }
+        setHighlightedItem(undefined);
+      }}
+      ref={itemListRef}
+    >
+      {noItemsMessage && treeItems.size === 0 && <div className='tree-view-empty'>{noItemsMessage}</div>}
+      {rootItem.children.map(child => {
+        const itemData = treeItems.get(child as T);
+        return itemData && <TreeItemHeader
+          key={child.id}
+          item={child as T}
+          treeItems={treeItems}
+          selectedItem={selectedItem}
+          onSelected={onSelected}
+          onAccepted={onAccepted}
+          isError={isError}
+          toggleExpanded={toggleExpanded}
+          highlightedItem={highlightedItem}
+          setHighlightedItem={setHighlightedItem}
+          render={render}
+          icon={icon}
+          title={title}
+          isKeyboardNavigation={isKeyboardNavigation}
+          setIsKeyboardNavigation={setIsKeyboardNavigation} />;
+      })}
+    </div>
+  </div>;
+}
+
+type TreeItemHeaderProps<T> = {
+  item: T,
+  treeItems: Map<T, TreeItemData>,
+  selectedItem: T | undefined,
+  onSelected?: (item: T) => void,
+  toggleExpanded: (item: T) => void,
+  highlightedItem: T | undefined,
+  isError?: (item: T) => boolean,
+  onAccepted?: (item: T) => void,
+  setHighlightedItem: (item: T | undefined) => void,
+  render: (item: T) => React.ReactNode,
+  title?: (item: T) => string,
+  icon?: (item: T) => string | undefined,
+  isKeyboardNavigation: boolean,
+  setIsKeyboardNavigation: (value: boolean) => void,
+};
+
+export function TreeItemHeader<T extends TreeItem>({
+  item,
+  treeItems,
+  selectedItem,
+  onSelected,
+  highlightedItem,
+  setHighlightedItem,
+  isError,
+  onAccepted,
+  toggleExpanded,
+  render,
+  title,
+  icon,
+  isKeyboardNavigation,
+  setIsKeyboardNavigation }: TreeItemHeaderProps<T>) {
+  const groupId = React.useId();
+  const itemRef = React.useRef(null);
+
+  React.useEffect(() => {
+    if (selectedItem === item && isKeyboardNavigation && itemRef.current) {
+      scrollIntoViewIfNeeded(itemRef.current);
+      setIsKeyboardNavigation(false);
+    }
+  }, [item, selectedItem, isKeyboardNavigation, setIsKeyboardNavigation]);
+
+  const itemData = treeItems.get(item)!;
+  const indentation = itemData.depth;
+  const expanded = itemData.expanded;
+  let expandIcon = 'codicon-blank';
+  if (typeof expanded === 'boolean')
+    expandIcon = expanded ? 'codicon-chevron-down' : 'codicon-chevron-right';
+  const rendered = render(item);
+  const children = expanded && item.children.length ? item.children as T[] : [];
+  const titled = title?.(item);
+  const iconed = icon?.(item) || 'codicon-blank';
+
+  return <div ref={itemRef} role='treeitem' aria-selected={item === selectedItem} aria-expanded={expanded} aria-controls={groupId} title={titled} className='vbox' style={{ flex: 'none' }}>
+    <div
+      onDoubleClick={() => onAccepted?.(item)}
+      className={clsx(
+          'tree-view-entry',
+          selectedItem === item && 'selected',
+          highlightedItem === item && 'highlighted',
+          isError?.(item) && 'error')}
+      onClick={() => onSelected?.(item)}
+      onMouseEnter={() => setHighlightedItem(item)}
+      onMouseLeave={() => setHighlightedItem(undefined)}
+    >
+      {indentation ? new Array(indentation).fill(0).map((_, i) => <div key={'indent-' + i} className='tree-view-indent'></div>) : undefined}
+      <div
+        aria-hidden='true'
+        className={'codicon ' + expandIcon}
+        style={{ minWidth: 16, marginRight: 4 }}
+        onDoubleClick={e => {
+          e.preventDefault();
+          e.stopPropagation();
+        }}
+        onClick={e => {
+          e.stopPropagation();
+          e.preventDefault();
+          toggleExpanded(item);
+        }}
+      />
+      {icon && <div className={'codicon ' + iconed} style={{ minWidth: 16, marginRight: 4 }} aria-label={'[' + iconed.replace('codicon', 'icon') + ']'}></div>}
+      {typeof rendered === 'string' ? <div style={{ textOverflow: 'ellipsis', overflow: 'hidden' }}>{rendered}</div> : rendered}
+    </div>
+    {!!children.length && <div id={groupId} role='group'>
+      {children.map(child => {
+        const itemData = treeItems.get(child);
+        return itemData && <TreeItemHeader
+          key={child.id}
+          item={child}
+          treeItems={treeItems}
+          selectedItem={selectedItem}
+          onSelected={onSelected}
+          onAccepted={onAccepted}
+          isError={isError}
+          toggleExpanded={toggleExpanded}
+          highlightedItem={highlightedItem}
+          setHighlightedItem={setHighlightedItem}
+          render={render}
+          title={title}
+          icon={icon}
+          isKeyboardNavigation={isKeyboardNavigation}
+          setIsKeyboardNavigation={setIsKeyboardNavigation} />;
+      })}
+    </div>}
+  </div>;
 }
 
 type TreeItemData = {
-  depth: number,
-  expanded: boolean | undefined,
-  parent: TreeItem | null,
+  depth: number;
+  expanded: boolean | undefined;
+  parent: TreeItem | null;
+  next: TreeItem | null;
+  prev: TreeItem | null;
 };
 
-function flattenTree<T extends TreeItem>(rootItem: T, selectedItem: T | undefined, expandedItems: Map<string, boolean | undefined>, autoExpandDepth: number): Map<T, TreeItemData> {
+function indexTree<T extends TreeItem>(
+  rootItem: T,
+  selectedItem: T | undefined,
+  expandedItems: Map<string, boolean | undefined>,
+  autoExpandDepth: number,
+  isVisible: (item: T) => boolean = () => true): Map<T, TreeItemData> {
+  if (!isVisible(rootItem))
+    return new Map();
+
   const result = new Map<T, TreeItemData>();
   const temporaryExpanded = new Set<string>();
   for (let item: TreeItem | undefined = selectedItem?.parent; item; item = item.parent)
     temporaryExpanded.add(item.id);
+  let lastItem: T | null = null;
 
   const appendChildren = (parent: T, depth: number) => {
     for (const item of parent.children as T[]) {
+      if (!isVisible(item))
+        continue;
       const expandState = temporaryExpanded.has(item.id) || expandedItems.get(item.id);
       const autoExpandMatches = autoExpandDepth > depth && result.size < 25 && expandState !== false;
       const expanded = item.children.length ? expandState ?? autoExpandMatches : undefined;
-      result.set(item, { depth, expanded, parent: rootItem === parent ? null : parent });
+      const itemData: TreeItemData = {
+        depth,
+        expanded,
+        parent: rootItem === parent ? null : parent,
+        next: null,
+        prev: lastItem,
+      };
+      if (lastItem)
+        result.get(lastItem)!.next = item;
+      lastItem = item;
+      result.set(item, itemData);
       if (expanded)
         appendChildren(item, depth + 1);
     }
diff --git a/packages/web/src/components/xtermWrapper.tsx b/packages/web/src/components/xtermWrapper.tsx
index 70a3e47114360..9293c558d0326 100644
--- a/packages/web/src/components/xtermWrapper.tsx
+++ b/packages/web/src/components/xtermWrapper.tsx
@@ -19,8 +19,8 @@ import './xtermWrapper.css';
 import type { ITheme, Terminal } from 'xterm';
 import type { FitAddon } from 'xterm-addon-fit';
 import type { XtermModule } from './xtermModule';
-import { currentTheme, addThemeListener, removeThemeListener } from '@web/theme';
-import { useMeasure } from '@web/uiUtils';
+import { currentTheme, addThemeListener, removeThemeListener } from '../theme';
+import { useMeasure } from '../uiUtils';
 
 export type XtermDataSource = {
   pending: (string | Uint8Array)[];
diff --git a/packages/html-reporter/src/renderUtils.tsx b/packages/web/src/renderUtils.tsx
similarity index 82%
rename from packages/html-reporter/src/renderUtils.tsx
rename to packages/web/src/renderUtils.tsx
index e8d92dc609232..71deb5af533b9 100644
--- a/packages/html-reporter/src/renderUtils.tsx
+++ b/packages/web/src/renderUtils.tsx
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-export function linkifyText(description: string) {
-  const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
-  const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
+import { kWebLinkRe } from './uiUtils';
 
+export function linkifyText(description: string) {
   const result = [];
   let currentIndex = 0;
   let match;
 
-  while ((match = WEB_LINK_REGEX.exec(description)) !== null) {
+  while ((match = kWebLinkRe.exec(description)) !== null) {
     const stringBeforeMatch = description.substring(currentIndex, match.index);
     if (stringBeforeMatch)
       result.push(stringBeforeMatch);
diff --git a/packages/web/src/shared/imageDiffView.spec.tsx b/packages/web/src/shared/imageDiffView.spec.tsx
index 79d256096d08a..4fefaa1083105 100644
--- a/packages/web/src/shared/imageDiffView.spec.tsx
+++ b/packages/web/src/shared/imageDiffView.spec.tsx
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import React from 'react';
 import { test, expect } from '@playwright/experimental-ct-react';
 import type { ImageDiff } from './imageDiffView';
 import { ImageDiffView } from './imageDiffView';
diff --git a/packages/web/src/shared/imageDiffView.tsx b/packages/web/src/shared/imageDiffView.tsx
index f6721876f99a4..6f0028bca9336 100644
--- a/packages/web/src/shared/imageDiffView.tsx
+++ b/packages/web/src/shared/imageDiffView.tsx
@@ -59,12 +59,15 @@ const checkerboardStyle: React.CSSProperties = {
 };
 
 export const ImageDiffView: React.FC<{
- diff: ImageDiff,
-}> = ({ diff }) => {
+  diff: ImageDiff,
+  noTargetBlank?: boolean,
+  hideDetails?: boolean,
+}> = ({ diff, noTargetBlank, hideDetails }) => {
   const [mode, setMode] = React.useState<'diff' | 'actual' | 'expected' | 'slider' | 'sxs'>(diff.diff ? 'diff' : 'actual');
   const [showSxsDiff, setShowSxsDiff] = React.useState<boolean>(false);
 
   const [expectedImage, setExpectedImage] = React.useState<HTMLImageElement | null>(null);
+  const [expectedImageTitle, setExpectedImageTitle] = React.useState<string>('Expected');
   const [actualImage, setActualImage] = React.useState<HTMLImageElement | null>(null);
   const [diffImage, setDiffImage] = React.useState<HTMLImageElement | null>(null);
   const [measure, ref] = useMeasure<HTMLDivElement>();
@@ -72,6 +75,7 @@ export const ImageDiffView: React.FC<{
   React.useEffect(() => {
     (async () => {
       setExpectedImage(await loadImage(diff.expected?.attachment.path));
+      setExpectedImageTitle(diff.expected?.title || 'Expected');
       setActualImage(await loadImage(diff.actual?.attachment.path));
       setDiffImage(await loadImage(diff.diff?.attachment.path));
     })();
@@ -97,31 +101,31 @@ export const ImageDiffView: React.FC<{
       <div data-testid='test-result-image-mismatch-tabs' style={{ display: 'flex', margin: '10px 0 20px' }}>
         {diff.diff && <div style={{ ...modeStyle, fontWeight: mode === 'diff' ? 600 : 'initial' }} onClick={() => setMode('diff')}>Diff</div>}
         <div style={{ ...modeStyle, fontWeight: mode === 'actual' ? 600 : 'initial' }} onClick={() => setMode('actual')}>Actual</div>
-        <div style={{ ...modeStyle, fontWeight: mode === 'expected' ? 600 : 'initial' }} onClick={() => setMode('expected')}>Expected</div>
+        <div style={{ ...modeStyle, fontWeight: mode === 'expected' ? 600 : 'initial' }} onClick={() => setMode('expected')}>{expectedImageTitle}</div>
         <div style={{ ...modeStyle, fontWeight: mode === 'sxs' ? 600 : 'initial' }} onClick={() => setMode('sxs')}>Side by side</div>
         <div style={{ ...modeStyle, fontWeight: mode === 'slider' ? 600 : 'initial' }} onClick={() => setMode('slider')}>Slider</div>
       </div>
       <div style={{ display: 'flex', justifyContent: 'center', flex: 'auto', minHeight: fitHeight + 60 }}>
-        {diff.diff && mode === 'diff' && <ImageWithSize image={diffImage} alt='Diff' canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
-        {diff.diff && mode === 'actual' && <ImageWithSize image={actualImage}  alt='Actual' canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
-        {diff.diff && mode === 'expected' && <ImageWithSize image={expectedImage}  alt='Expected' canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
-        {diff.diff && mode === 'slider' && <ImageDiffSlider expectedImage={expectedImage} actualImage={actualImage} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale} />}
+        {diff.diff && mode === 'diff' && <ImageWithSize image={diffImage} alt='Diff' hideSize={hideDetails} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
+        {diff.diff && mode === 'actual' && <ImageWithSize image={actualImage}  alt='Actual' hideSize={hideDetails} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
+        {diff.diff && mode === 'expected' && <ImageWithSize image={expectedImage}  alt={expectedImageTitle} hideSize={hideDetails} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
+        {diff.diff && mode === 'slider' && <ImageDiffSlider expectedImage={expectedImage} actualImage={actualImage} hideSize={hideDetails} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale} expectedTitle={expectedImageTitle} />}
         {diff.diff && mode === 'sxs' && <div style={{ display: 'flex' }}>
-          <ImageWithSize image={expectedImage} title='Expected' canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
-          <ImageWithSize image={showSxsDiff ? diffImage : actualImage} title={showSxsDiff ? 'Diff' : 'Actual'} onClick={() => setShowSxsDiff(!showSxsDiff)} canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
+          <ImageWithSize image={expectedImage} title={expectedImageTitle} hideSize={hideDetails} canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
+          <ImageWithSize image={showSxsDiff ? diffImage : actualImage} title={showSxsDiff ? 'Diff' : 'Actual'} onClick={() => setShowSxsDiff(!showSxsDiff)} hideSize={hideDetails} canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
         </div>}
-        {!diff.diff && mode === 'actual' && <ImageWithSize image={actualImage} title='Actual' canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
-        {!diff.diff && mode === 'expected' && <ImageWithSize image={expectedImage} title='Expected' canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
+        {!diff.diff && mode === 'actual' && <ImageWithSize image={actualImage} title='Actual' hideSize={hideDetails} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
+        {!diff.diff && mode === 'expected' && <ImageWithSize image={expectedImage} title={expectedImageTitle} hideSize={hideDetails} canvasWidth={fitWidth} canvasHeight={fitHeight} scale={scale}/>}
         {!diff.diff && mode === 'sxs' && <div style={{ display: 'flex' }}>
-          <ImageWithSize image={expectedImage} title='Expected' canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
+          <ImageWithSize image={expectedImage} title={expectedImageTitle} canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
           <ImageWithSize image={actualImage} title='Actual' canvasWidth={sxsScale * imageWidth} canvasHeight={sxsScale * imageHeight} scale={sxsScale} />
         </div>}
       </div>
-      <div style={{ alignSelf: 'start', lineHeight: '18px' }}>
-        <div>{diff.diff && <a target='_blank' href={diff.diff.attachment.path}>{diff.diff.attachment.name}</a>}</div>
-        <div><a target='_blank' href={diff.actual!.attachment.path}>{diff.actual!.attachment.name}</a></div>
-        <div><a target='_blank' href={diff.expected!.attachment.path}>{diff.expected!.attachment.name}</a></div>
-      </div>
+      {!hideDetails && <div style={{ alignSelf: 'start', lineHeight: '18px', marginLeft: '15px' }}>
+        <div>{diff.diff && <a target='_blank' href={diff.diff.attachment.path} rel='noreferrer'>{diff.diff.attachment.name}</a>}</div>
+        <div><a target={noTargetBlank ? '' : '_blank'} href={diff.actual!.attachment.path} rel='noreferrer'>{diff.actual!.attachment.name}</a></div>
+        <div><a target={noTargetBlank ? '' : '_blank'} href={diff.expected!.attachment.path} rel='noreferrer'>{diff.expected!.attachment.name}</a></div>
+      </div>}
     </>}
   </div>;
 };
@@ -132,7 +136,9 @@ export const ImageDiffSlider: React.FC<{
   canvasWidth: number,
   canvasHeight: number,
   scale: number,
-}> = ({ expectedImage, actualImage, canvasWidth, canvasHeight, scale }) => {
+  expectedTitle: string,
+  hideSize?: boolean,
+}> = ({ expectedImage, actualImage, canvasWidth, canvasHeight, scale, expectedTitle, hideSize }) => {
   const absoluteStyle: React.CSSProperties = {
     position: 'absolute',
     top: 0,
@@ -143,7 +149,7 @@ export const ImageDiffSlider: React.FC<{
   const sameSize = expectedImage.naturalWidth === actualImage.naturalWidth && expectedImage.naturalHeight === actualImage.naturalHeight;
 
   return <div style={{ flex: 'none', display: 'flex', alignItems: 'center', flexDirection: 'column', userSelect: 'none' }}>
-    <div style={{ margin: 5 }}>
+    {!hideSize && <div style={{ margin: 5 }}>
       {!sameSize && <span style={{ flex: 'none', margin: '0 5px' }}>Expected </span>}
       <span>{expectedImage.naturalWidth}</span>
       <span style={{ flex: 'none', margin: '0 5px' }}>x</span>
@@ -152,7 +158,7 @@ export const ImageDiffSlider: React.FC<{
       {!sameSize && <span>{actualImage.naturalWidth}</span>}
       {!sameSize && <span style={{ flex: 'none', margin: '0 5px' }}>x</span>}
       {!sameSize && <span>{actualImage.naturalHeight}</span>}
-    </div>
+    </div>}
     <div style={{ position: 'relative', width: canvasWidth, height: canvasHeight, margin: 15, ...checkerboardStyle }}>
       <ResizeView
         orientation={'horizontal'}
@@ -160,7 +166,7 @@ export const ImageDiffSlider: React.FC<{
         setOffsets={offsets => setSlider(offsets[0])}
         resizerColor={'#57606a80'}
         resizerWidth={6}></ResizeView>
-      <img alt='Expected' style={{
+      <img alt={expectedTitle} style={{
         width: expectedImage.naturalWidth * scale,
         height: expectedImage.naturalHeight * scale,
       }} draggable='false' src={expectedImage.src} />
@@ -178,18 +184,19 @@ const ImageWithSize: React.FunctionComponent<{
   image: HTMLImageElement,
   title?: string,
   alt?: string,
+  hideSize?: boolean,
   canvasWidth: number,
   canvasHeight: number,
   scale: number,
   onClick?: () => void;
-}> = ({ image, title, alt, canvasWidth, canvasHeight, scale, onClick }) => {
+}> = ({ image, title, alt, hideSize, canvasWidth, canvasHeight, scale, onClick }) => {
   return <div style={{ flex: 'none', display: 'flex', alignItems: 'center', flexDirection: 'column' }}>
-    <div style={{ margin: 5 }}>
+    {!hideSize && <div style={{ margin: 5 }}>
       {title && <span style={{ flex: 'none', margin: '0 5px' }}>{title}</span>}
       <span>{image.naturalWidth}</span>
       <span style={{ flex: 'none', margin: '0 5px' }}>x</span>
       <span>{image.naturalHeight}</span>
-    </div>
+    </div>}
     <div style={{ display: 'flex', flex: 'none', width: canvasWidth, height: canvasHeight, margin: 15, ...checkerboardStyle }}>
       <img
         width={image.naturalWidth * scale}
diff --git a/packages/web/src/shared/prompts.ts b/packages/web/src/shared/prompts.ts
new file mode 100644
index 0000000000000..1abe7cfcc0c0d
--- /dev/null
+++ b/packages/web/src/shared/prompts.ts
@@ -0,0 +1,124 @@
+/**
+ * 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 { MetadataWithCommitInfo } from '@testIsomorphic/types';
+
+const fixTestInstructions = `
+# Instructions
+
+- Following Playwright test failed.
+- Explain why, be concise, respect Playwright best practices.
+- Provide a snippet of code with the fix, if possible.
+`.trimStart();
+
+export async function copyPrompt<ErrorInfo extends { message: string }>({
+  testInfo,
+  metadata,
+  errorContext,
+
+  errors,
+  buildCodeFrame,
+  stdout,
+  stderr,
+}: {
+  testInfo: string;
+  metadata: MetadataWithCommitInfo | undefined;
+  errorContext: string | undefined;
+
+  errors: ErrorInfo[];
+  buildCodeFrame(error: ErrorInfo): Promise<string | undefined>;
+  stdout?: string;
+  stderr?: string;
+}) {
+  const meaningfulSingleLineErrors = new Set(errors.filter(e => e.message && !e.message.includes('\n')).map(e => e.message!));
+  for (const error of errors) {
+    for (const singleLineError of meaningfulSingleLineErrors.keys()) {
+      if (error.message?.includes(singleLineError))
+        meaningfulSingleLineErrors.delete(singleLineError);
+    }
+  }
+
+  const meaningfulErrors = errors.filter(error => {
+    if (!error.message)
+      return false;
+
+    // Skip errors that are just a single line - they are likely to already be the error message.
+    if (!error.message.includes('\n') && !meaningfulSingleLineErrors.has(error.message))
+      return false;
+
+    return true;
+  });
+
+  if (!meaningfulErrors.length)
+    return undefined;
+
+  const lines = [
+    fixTestInstructions,
+    `# Test info`,
+    '',
+    testInfo,
+  ];
+
+  if (stdout)
+    lines.push('', '# Stdout', '', '```', stripAnsiEscapes(stdout), '```');
+
+  if (stderr)
+    lines.push('', '# Stderr', '', '```', stripAnsiEscapes(stderr), '```');
+
+  lines.push('', '# Error details');
+
+  for (const error of meaningfulErrors) {
+    lines.push(
+        '',
+        '```',
+        stripAnsiEscapes(error.message || ''),
+        '```',
+    );
+  }
+
+  if (errorContext)
+    lines.push(errorContext);
+
+  const codeFrame = await buildCodeFrame(meaningfulErrors[meaningfulErrors.length - 1]);
+  if (codeFrame) {
+    lines.push(
+        '',
+        '# Test source',
+        '',
+        '```ts',
+        codeFrame,
+        '```',
+    );
+  }
+
+  if (metadata?.gitDiff) {
+    lines.push(
+        '',
+        '# Local changes',
+        '',
+        '```diff',
+        metadata.gitDiff,
+        '```',
+    );
+  }
+
+  return lines.join('\n');
+}
+
+const ansiRegex = new RegExp('([\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~])))', 'g');
+export function stripAnsiEscapes(str: string): string {
+  return str.replace(ansiRegex, '');
+}
diff --git a/packages/web/src/shared/resizeView.tsx b/packages/web/src/shared/resizeView.tsx
index 401867f2234b8..9a11d7060f155 100644
--- a/packages/web/src/shared/resizeView.tsx
+++ b/packages/web/src/shared/resizeView.tsx
@@ -82,6 +82,7 @@ export const ResizeView: React.FC<{
     />}
     {offsets.map((offset, index) => {
       return <div
+        key={index}
         style={{
           ...dividerStyle,
           top: orientation === 'horizontal' ? 0 : offset,
diff --git a/packages/web/src/theme.ts b/packages/web/src/theme.ts
index 5ea2f6556682a..3d84b8123b0b3 100644
--- a/packages/web/src/theme.ts
+++ b/packages/web/src/theme.ts
@@ -15,12 +15,19 @@
  */
 
 import React from 'react';
-import { type Setting, settings } from './uiUtils';
+
+import { settings } from './uiUtils';
+
+declare global {
+  interface Document {
+    playwrightThemeInitialized?: boolean;
+  }
+}
 
 export function applyTheme() {
-  if ((document as any).playwrightThemeInitialized)
+  if (document.playwrightThemeInitialized)
     return;
-  (document as any).playwrightThemeInitialized = true;
+  document.playwrightThemeInitialized = true;
   document!.defaultView!.addEventListener('focus', (event: any) => {
     if (event.target.document.nodeType === Node.DOCUMENT_NODE)
       document.body.classList.remove('inactive');
@@ -29,9 +36,11 @@ export function applyTheme() {
     document.body.classList.add('inactive');
   }, false);
 
-  const currentTheme = settings.getString('theme', 'light-mode');
   const prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)');
-  if (currentTheme === 'dark-mode' || prefersDarkScheme.matches)
+  const defaultTheme = prefersDarkScheme.matches ? 'dark-mode' : 'light-mode';
+
+  const currentTheme = settings.getString('theme', defaultTheme);
+  if (currentTheme === 'dark-mode')
     document.body.classList.add('dark-mode');
 }
 
@@ -39,12 +48,8 @@ type Theme = 'dark-mode' | 'light-mode';
 
 const listeners = new Set<(theme: Theme) => void>();
 export function toggleTheme() {
-  const oldTheme = settings.getString('theme', 'light-mode');
-  let newTheme: Theme;
-  if (oldTheme === 'dark-mode')
-    newTheme = 'light-mode';
-  else
-    newTheme = 'dark-mode';
+  const oldTheme = currentTheme();
+  const newTheme = oldTheme === 'dark-mode' ? 'light-mode' : 'dark-mode';
 
   if (oldTheme)
     document.body.classList.remove(oldTheme);
@@ -66,12 +71,12 @@ export function currentTheme(): Theme {
   return document.body.classList.contains('dark-mode') ? 'dark-mode' : 'light-mode';
 }
 
-export function useDarkModeSetting() {
+export function useDarkModeSetting(): [boolean, (value: boolean) => void] {
   const [theme, setTheme] = React.useState(currentTheme() === 'dark-mode');
   return [theme, (value: boolean) => {
     const current = currentTheme() === 'dark-mode';
     if (current !== value)
       toggleTheme();
     setTheme(value);
-  }, 'Dark mode'] as Setting<boolean>;
+  }];
 }
diff --git a/packages/web/src/third_party/vscode/codicon.css b/packages/web/src/third_party/vscode/codicon.css
index d1bc9ece139b8..41360ce21d643 100644
--- a/packages/web/src/third_party/vscode/codicon.css
+++ b/packages/web/src/third_party/vscode/codicon.css
@@ -9,21 +9,20 @@
 }
 
 .codicon {
-	font: normal normal normal 16px/1 codicon;
-	flex: none;
-	display: inline-block;
-	text-decoration: none;
-	text-rendering: auto;
-	text-align: center;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
+  font: normal normal normal 16px/1 codicon;
+  flex: none;
+  display: inline-block;
+  text-decoration: none;
+  text-rendering: auto;
+  text-align: center;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
-.codicon-blank:before { content: '\2003'; }
 .codicon-add:before { content: '\ea60'; }
 .codicon-plus:before { content: '\ea60'; }
 .codicon-gist-new:before { content: '\ea60'; }
@@ -39,6 +38,7 @@
 .codicon-record-keys:before { content: '\ea65'; }
 .codicon-keyboard:before { content: '\ea65'; }
 .codicon-tag:before { content: '\ea66'; }
+.codicon-git-pull-request-label:before { content: '\ea66'; }
 .codicon-tag-add:before { content: '\ea66'; }
 .codicon-tag-remove:before { content: '\ea66'; }
 .codicon-person:before { content: '\ea67'; }
@@ -74,6 +74,7 @@
 .codicon-debug-breakpoint:before { content: '\ea71'; }
 .codicon-debug-breakpoint-disabled:before { content: '\ea71'; }
 .codicon-debug-hint:before { content: '\ea71'; }
+.codicon-terminal-decoration-success:before { content: '\ea71'; }
 .codicon-primitive-square:before { content: '\ea72'; }
 .codicon-edit:before { content: '\ea73'; }
 .codicon-pencil:before { content: '\ea73'; }
@@ -185,7 +186,6 @@
 .codicon-check:before { content: '\eab2'; }
 .codicon-checklist:before { content: '\eab3'; }
 .codicon-chevron-down:before { content: '\eab4'; }
-.codicon-drop-down-button:before { content: '\eab4'; }
 .codicon-chevron-left:before { content: '\eab5'; }
 .codicon-chevron-right:before { content: '\eab6'; }
 .codicon-chevron-up:before { content: '\eab7'; }
@@ -193,9 +193,10 @@
 .codicon-chrome-maximize:before { content: '\eab9'; }
 .codicon-chrome-minimize:before { content: '\eaba'; }
 .codicon-chrome-restore:before { content: '\eabb'; }
-.codicon-circle:before { content: '\eabc'; }
 .codicon-circle-outline:before { content: '\eabc'; }
+.codicon-circle:before { content: '\eabc'; }
 .codicon-debug-breakpoint-unverified:before { content: '\eabc'; }
+.codicon-terminal-decoration-incomplete:before { content: '\eabc'; }
 .codicon-circle-slash:before { content: '\eabd'; }
 .codicon-circuit-board:before { content: '\eabe'; }
 .codicon-clear-all:before { content: '\eabf'; }
@@ -207,7 +208,6 @@
 .codicon-collapse-all:before { content: '\eac5'; }
 .codicon-color-mode:before { content: '\eac6'; }
 .codicon-comment-discussion:before { content: '\eac7'; }
-.codicon-compare-changes:before { content: '\eafd'; }
 .codicon-credit-card:before { content: '\eac9'; }
 .codicon-dash:before { content: '\eacc'; }
 .codicon-dashboard:before { content: '\eacd'; }
@@ -231,6 +231,7 @@
 .codicon-diff-removed:before { content: '\eadf'; }
 .codicon-diff-renamed:before { content: '\eae0'; }
 .codicon-diff:before { content: '\eae1'; }
+.codicon-diff-sidebyside:before { content: '\eae1'; }
 .codicon-discard:before { content: '\eae2'; }
 .codicon-editor-layout:before { content: '\eae3'; }
 .codicon-empty-window:before { content: '\eae4'; }
@@ -259,6 +260,7 @@
 .codicon-gist:before { content: '\eafb'; }
 .codicon-git-commit:before { content: '\eafc'; }
 .codicon-git-compare:before { content: '\eafd'; }
+.codicon-compare-changes:before { content: '\eafd'; }
 .codicon-git-merge:before { content: '\eafe'; }
 .codicon-github-action:before { content: '\eaff'; }
 .codicon-github-alt:before { content: '\eb00'; }
@@ -271,13 +273,11 @@
 .codicon-horizontal-rule:before { content: '\eb07'; }
 .codicon-hubot:before { content: '\eb08'; }
 .codicon-inbox:before { content: '\eb09'; }
-.codicon-issue-closed:before { content: '\eba4'; }
 .codicon-issue-reopened:before { content: '\eb0b'; }
 .codicon-issues:before { content: '\eb0c'; }
 .codicon-italic:before { content: '\eb0d'; }
 .codicon-jersey:before { content: '\eb0e'; }
 .codicon-json:before { content: '\eb0f'; }
-.codicon-bracket:before { content: '\eb0f'; }
 .codicon-kebab-vertical:before { content: '\eb10'; }
 .codicon-key:before { content: '\eb11'; }
 .codicon-law:before { content: '\eb12'; }
@@ -295,6 +295,7 @@
 .codicon-megaphone:before { content: '\eb1e'; }
 .codicon-mention:before { content: '\eb1f'; }
 .codicon-milestone:before { content: '\eb20'; }
+.codicon-git-pull-request-milestone:before { content: '\eb20'; }
 .codicon-mortar-board:before { content: '\eb21'; }
 .codicon-move:before { content: '\eb22'; }
 .codicon-multiple-windows:before { content: '\eb23'; }
@@ -355,7 +356,6 @@
 .codicon-star-half:before { content: '\eb5a'; }
 .codicon-symbol-class:before { content: '\eb5b'; }
 .codicon-symbol-color:before { content: '\eb5c'; }
-.codicon-symbol-customcolor:before { content: '\eb5c'; }
 .codicon-symbol-constant:before { content: '\eb5d'; }
 .codicon-symbol-enum-member:before { content: '\eb5e'; }
 .codicon-symbol-field:before { content: '\eb5f'; }
@@ -407,6 +407,7 @@
 .codicon-debug-stackframe-active:before { content: '\eb89'; }
 .codicon-circle-small-filled:before { content: '\eb8a'; }
 .codicon-debug-stackframe-dot:before { content: '\eb8a'; }
+.codicon-terminal-decoration-mark:before { content: '\eb8a'; }
 .codicon-debug-stackframe:before { content: '\eb8b'; }
 .codicon-debug-stackframe-focused:before { content: '\eb8b'; }
 .codicon-debug-breakpoint-unsupported:before { content: '\eb8c'; }
@@ -414,14 +415,17 @@
 .codicon-debug-reverse-continue:before { content: '\eb8e'; }
 .codicon-debug-step-back:before { content: '\eb8f'; }
 .codicon-debug-restart-frame:before { content: '\eb90'; }
+.codicon-debug-alt:before { content: '\eb91'; }
 .codicon-call-incoming:before { content: '\eb92'; }
 .codicon-call-outgoing:before { content: '\eb93'; }
 .codicon-menu:before { content: '\eb94'; }
 .codicon-expand-all:before { content: '\eb95'; }
 .codicon-feedback:before { content: '\eb96'; }
+.codicon-git-pull-request-reviewer:before { content: '\eb96'; }
 .codicon-group-by-ref-type:before { content: '\eb97'; }
 .codicon-ungroup-by-ref-type:before { content: '\eb98'; }
 .codicon-account:before { content: '\eb99'; }
+.codicon-git-pull-request-assignee:before { content: '\eb99'; }
 .codicon-bell-dot:before { content: '\eb9a'; }
 .codicon-debug-console:before { content: '\eb9b'; }
 .codicon-library:before { content: '\eb9c'; }
@@ -430,10 +434,10 @@
 .codicon-sync-ignored:before { content: '\eb9f'; }
 .codicon-pinned:before { content: '\eba0'; }
 .codicon-github-inverted:before { content: '\eba1'; }
-.codicon-debug-alt:before { content: '\eb91'; }
 .codicon-server-process:before { content: '\eba2'; }
 .codicon-server-environment:before { content: '\eba3'; }
 .codicon-pass:before { content: '\eba4'; }
+.codicon-issue-closed:before { content: '\eba4'; }
 .codicon-stop-circle:before { content: '\eba5'; }
 .codicon-play-circle:before { content: '\eba6'; }
 .codicon-record:before { content: '\eba7'; }
@@ -466,7 +470,7 @@
 .codicon-debug-rerun:before { content: '\ebc0'; }
 .codicon-workspace-trusted:before { content: '\ebc1'; }
 .codicon-workspace-untrusted:before { content: '\ebc2'; }
-.codicon-workspace-unspecified:before { content: '\ebc3'; }
+.codicon-workspace-unknown:before { content: '\ebc3'; }
 .codicon-terminal-cmd:before { content: '\ebc4'; }
 .codicon-terminal-debian:before { content: '\ebc5'; }
 .codicon-terminal-linux:before { content: '\ebc6'; }
@@ -500,6 +504,7 @@
 .codicon-graph-line:before { content: '\ebe2'; }
 .codicon-graph-scatter:before { content: '\ebe3'; }
 .codicon-pie-chart:before { content: '\ebe4'; }
+.codicon-bracket:before { content: '\eb0f'; }
 .codicon-bracket-dot:before { content: '\ebe5'; }
 .codicon-bracket-error:before { content: '\ebe6'; }
 .codicon-lock-small:before { content: '\ebe7'; }
@@ -519,20 +524,26 @@
 .codicon-layout-statusbar:before { content: '\ebf5'; }
 .codicon-layout-menubar:before { content: '\ebf6'; }
 .codicon-layout-centered:before { content: '\ebf7'; }
-.codicon-layout-sidebar-right-off:before { content: '\ec00'; }
-.codicon-layout-panel-off:before { content: '\ec01'; }
-.codicon-layout-sidebar-left-off:before { content: '\ec02'; }
 .codicon-target:before { content: '\ebf8'; }
 .codicon-indent:before { content: '\ebf9'; }
 .codicon-record-small:before { content: '\ebfa'; }
 .codicon-error-small:before { content: '\ebfb'; }
+.codicon-terminal-decoration-error:before { content: '\ebfb'; }
 .codicon-arrow-circle-down:before { content: '\ebfc'; }
 .codicon-arrow-circle-left:before { content: '\ebfd'; }
 .codicon-arrow-circle-right:before { content: '\ebfe'; }
 .codicon-arrow-circle-up:before { content: '\ebff'; }
+.codicon-layout-sidebar-right-off:before { content: '\ec00'; }
+.codicon-layout-panel-off:before { content: '\ec01'; }
+.codicon-layout-sidebar-left-off:before { content: '\ec02'; }
+.codicon-blank:before { content: '\ec03'; }
 .codicon-heart-filled:before { content: '\ec04'; }
 .codicon-map:before { content: '\ec05'; }
+.codicon-map-horizontal:before { content: '\ec05'; }
+.codicon-fold-horizontal:before { content: '\ec05'; }
 .codicon-map-filled:before { content: '\ec06'; }
+.codicon-map-horizontal-filled:before { content: '\ec06'; }
+.codicon-fold-horizontal-filled:before { content: '\ec06'; }
 .codicon-circle-small:before { content: '\ec07'; }
 .codicon-bell-slash:before { content: '\ec08'; }
 .codicon-bell-slash-dot:before { content: '\ec09'; }
@@ -544,3 +555,42 @@
 .codicon-send:before { content: '\ec0f'; }
 .codicon-sparkle:before { content: '\ec10'; }
 .codicon-insert:before { content: '\ec11'; }
+.codicon-mic:before { content: '\ec12'; }
+.codicon-thumbsdown-filled:before { content: '\ec13'; }
+.codicon-thumbsup-filled:before { content: '\ec14'; }
+.codicon-coffee:before { content: '\ec15'; }
+.codicon-snake:before { content: '\ec16'; }
+.codicon-game:before { content: '\ec17'; }
+.codicon-vr:before { content: '\ec18'; }
+.codicon-chip:before { content: '\ec19'; }
+.codicon-piano:before { content: '\ec1a'; }
+.codicon-music:before { content: '\ec1b'; }
+.codicon-mic-filled:before { content: '\ec1c'; }
+.codicon-repo-fetch:before { content: '\ec1d'; }
+.codicon-copilot:before { content: '\ec1e'; }
+.codicon-lightbulb-sparkle:before { content: '\ec1f'; }
+.codicon-robot:before { content: '\ec20'; }
+.codicon-sparkle-filled:before { content: '\ec21'; }
+.codicon-diff-single:before { content: '\ec22'; }
+.codicon-diff-multiple:before { content: '\ec23'; }
+.codicon-surround-with:before { content: '\ec24'; }
+.codicon-share:before { content: '\ec25'; }
+.codicon-git-stash:before { content: '\ec26'; }
+.codicon-git-stash-apply:before { content: '\ec27'; }
+.codicon-git-stash-pop:before { content: '\ec28'; }
+.codicon-vscode:before { content: '\ec29'; }
+.codicon-vscode-insiders:before { content: '\ec2a'; }
+.codicon-code-oss:before { content: '\ec2b'; }
+.codicon-run-coverage:before { content: '\ec2c'; }
+.codicon-run-all-coverage:before { content: '\ec2d'; }
+.codicon-coverage:before { content: '\ec2e'; }
+.codicon-github-project:before { content: '\ec2f'; }
+.codicon-map-vertical:before { content: '\ec30'; }
+.codicon-fold-vertical:before { content: '\ec30'; }
+.codicon-map-vertical-filled:before { content: '\ec31'; }
+.codicon-fold-vertical-filled:before { content: '\ec31'; }
+.codicon-go-to-search:before { content: '\ec32'; }
+.codicon-percentage:before { content: '\ec33'; }
+.codicon-sort-percentage:before { content: '\ec33'; }
+.codicon-attach:before { content: '\ec34'; }
+.codicon-git-fetch:before { content: '\f101'; }
diff --git a/packages/web/src/third_party/vscode/codicon.ttf b/packages/web/src/third_party/vscode/codicon.ttf
index c4a33a4d5669d..27ee4c68caef1 100644
Binary files a/packages/web/src/third_party/vscode/codicon.ttf and b/packages/web/src/third_party/vscode/codicon.ttf differ
diff --git a/packages/web/src/uiUtils.ts b/packages/web/src/uiUtils.ts
index 9901a24bde2b6..ed070fcfbcfb9 100644
--- a/packages/web/src/uiUtils.ts
+++ b/packages/web/src/uiUtils.ts
@@ -16,6 +16,8 @@
 
 import React from 'react';
 
+import type { EffectCallback } from 'react';
+
 // Recalculates the value when dependencies change.
 export function useAsyncMemo<T>(fn: () => Promise<T>, deps: React.DependencyList, initialValue: T, resetValue?: T) {
   const [value, setValue] = React.useState<T>(initialValue);
@@ -43,6 +45,11 @@ export function useMeasure<T extends Element>() {
     const target = ref.current;
     if (!target)
       return;
+
+    const bounds = target.getBoundingClientRect();
+
+    setMeasure(new DOMRect(0, 0, bounds.width, bounds.height));
+
     const resizeObserver = new ResizeObserver((entries: any) => {
       const entry = entries[entries.length - 1];
       if (entry && entry.contentRect)
@@ -139,30 +146,44 @@ export function copy(text: string) {
   textArea.remove();
 }
 
-export type Setting<T> = readonly [T, (value: T) => void, string];
-
-export function useSetting<S>(name: string | undefined, defaultValue: S, title?: string): [S, React.Dispatch<React.SetStateAction<S>>, Setting<S>] {
+export function useSetting<S>(name: string | undefined, defaultValue: S): [S, React.Dispatch<React.SetStateAction<S>>] {
   if (name)
     defaultValue = settings.getObject(name, defaultValue);
   const [value, setValue] = React.useState<S>(defaultValue);
   const setValueWrapper = React.useCallback((value: React.SetStateAction<S>) => {
     if (name)
       settings.setObject(name, value);
-    setValue(value);
+    else
+      setValue(value);
   }, [name, setValue]);
-  const setting = [value, setValueWrapper, title || name || ''] as Setting<S>;
-  return [value, setValueWrapper, setting];
+
+  React.useEffect(() => {
+    if (name) {
+      const onStoreChange = () => setValue(settings.getObject(name, defaultValue));
+      settings.onChangeEmitter.addEventListener(name, onStoreChange);
+      return () => settings.onChangeEmitter.removeEventListener(name, onStoreChange);
+    }
+  }, [defaultValue, name]);
+  return [value, setValueWrapper];
+}
+
+declare global {
+  interface Window {
+    saveSettings?(): void;
+  }
 }
 
 export class Settings {
+  onChangeEmitter = new EventTarget();
+
   getString(name: string, defaultValue: string): string {
     return localStorage[name] || defaultValue;
   }
 
   setString(name: string, value: string) {
     localStorage[name] = value;
-    if ((window as any).saveSettings)
-      (window as any).saveSettings();
+    this.onChangeEmitter.dispatchEvent(new Event(name));
+    window.saveSettings?.();
   }
 
   getObject<T>(name: string, defaultValue: T): T {
@@ -177,9 +198,64 @@ export class Settings {
 
   setObject<T>(name: string, value: T) {
     localStorage[name] = JSON.stringify(value);
-    if ((window as any).saveSettings)
-      (window as any).saveSettings();
+    this.onChangeEmitter.dispatchEvent(new Event(name));
+    window.saveSettings?.();
   }
 }
 
 export const settings = new Settings();
+
+// inspired by https://www.npmjs.com/package/clsx
+export function clsx(...classes: (string | undefined | false)[]) {
+  return classes.filter(Boolean).join(' ');
+}
+
+export async function sha1(str: string): Promise<string> {
+  const buffer = new TextEncoder().encode(str);
+  return Array.from(new Uint8Array(await crypto.subtle.digest('SHA-1', buffer))).map(b => b.toString(16).padStart(2, '0')).join('');
+}
+
+export function scrollIntoViewIfNeeded(element: Element | undefined) {
+  if (!element)
+    return;
+  if ((element as any)?.scrollIntoViewIfNeeded)
+    (element as any).scrollIntoViewIfNeeded(false);
+  else
+    element?.scrollIntoView();
+}
+
+const kControlCodesRe = '\\u0000-\\u0020\\u007f-\\u009f';
+export const kWebLinkRe = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|www\\.)[^\\s' + kControlCodesRe + '"]{2,}[^\\s' + kControlCodesRe + '"\')}\\],:;.!?]', 'ug');
+
+/**
+ * Manages flash animation state.
+ * Calling `trigger` will turn `flash` to true for a second, and then back to false.
+ * If `trigger` is called while a flash is ongoing, the ongoing flash will be cancelled and after 50ms a new flash is started.
+ * @returns [flash, trigger]
+ */
+export function useFlash(): [boolean, EffectCallback] {
+  const [flash, setFlash] = React.useState(false);
+  const trigger = React.useCallback<React.EffectCallback>(() => {
+    const timeouts: any[] = [];
+    setFlash(currentlyFlashing => {
+      timeouts.push(setTimeout(() => setFlash(false), 1000));
+      if (!currentlyFlashing)
+        return true;
+
+      timeouts.push(setTimeout(() => setFlash(true), 50));
+      return false;
+    });
+    return () => timeouts.forEach(clearTimeout);
+  }, [setFlash]);
+  return [flash, trigger];
+}
+
+export function useCookies() {
+  const cookies = React.useMemo(() => {
+    return document.cookie.split('; ').filter(v => v.includes('=')).map(kv => {
+      const separator = kv.indexOf('=');
+      return [kv.substring(0, separator), kv.substring(separator + 1)];
+    });
+  }, []);
+  return cookies;
+}
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
deleted file mode 100644
index 2621e5234e0aa..0000000000000
--- a/tests/.eslintrc.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  extends: '../.eslintrc.js',
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "notice"],
-  parserOptions: {
-    ecmaVersion: 9,
-    sourceType: "module",
-    project: path.join(__dirname, 'tsconfig.json'),
-  },
-  rules: {
-    '@typescript-eslint/no-floating-promises': 'error',
-    "@typescript-eslint/no-unnecessary-boolean-literal-compare": 2,
-  },
-};
diff --git a/tests/android/androidTest.ts b/tests/android/androidTest.ts
index 7bfff3fbf337d..b11ca339d6418 100644
--- a/tests/android/androidTest.ts
+++ b/tests/android/androidTest.ts
@@ -19,23 +19,32 @@ import type { PageTestFixtures, PageWorkerFixtures } from '../page/pageTestApi';
 import type { AndroidDevice, BrowserContext } from 'playwright-core';
 export { expect } from '@playwright/test';
 
-type AndroidWorkerFixtures = PageWorkerFixtures & {
+type AndroidTestFixtures = {
   androidDevice: AndroidDevice;
+};
+
+type AndroidWorkerFixtures = PageWorkerFixtures & {
+  androidDeviceWorker: AndroidDevice;
   androidContext: BrowserContext;
 };
 
-export const androidTest = baseTest.extend<PageTestFixtures, AndroidWorkerFixtures>({
-  androidDevice: [async ({ playwright }, run) => {
+async function closeAllActivities(device: AndroidDevice) {
+  await device.shell('am force-stop com.google.android.googlequicksearchbox');
+  await device.shell('am force-stop org.chromium.webview_shell');
+  await device.shell('am force-stop com.android.chrome');
+}
+
+export const androidTest = baseTest.extend<PageTestFixtures & AndroidTestFixtures, AndroidWorkerFixtures>({
+  androidDeviceWorker: [async ({ playwright }, run) => {
     const device = (await playwright._android.devices())[0];
-    await device.shell('am force-stop org.chromium.webview_shell');
-    await device.shell('am force-stop com.android.chrome');
+    await closeAllActivities(device);
     device.setDefaultTimeout(90000);
     await run(device);
     await device.close();
   }, { scope: 'worker' }],
 
-  browserVersion: [async ({ androidDevice }, run) => {
-    const browserVersion = (await androidDevice.shell('dumpsys package com.android.chrome'))
+  browserVersion: [async ({ androidDeviceWorker }, run) => {
+    const browserVersion = (await androidDeviceWorker.shell('dumpsys package com.android.chrome'))
         .toString('utf8')
         .split('\n')
         .find(line => line.includes('versionName='))!
@@ -52,9 +61,16 @@ export const androidTest = baseTest.extend<PageTestFixtures, AndroidWorkerFixtur
   isElectron: [false, { scope: 'worker' }],
   electronMajorVersion: [0, { scope: 'worker' }],
   isWebView2: [false, { scope: 'worker' }],
+  isHeadlessShell: [false, { scope: 'worker' }],
+
+  androidDevice: async ({ androidDeviceWorker }, use) => {
+    await closeAllActivities(androidDeviceWorker);
+    await use(androidDeviceWorker);
+    await closeAllActivities(androidDeviceWorker);
+  },
 
-  androidContext: [async ({ androidDevice }, run) => {
-    const context = await androidDevice.launchBrowser();
+  androidContext: [async ({ androidDeviceWorker }, run) => {
+    const context = await androidDeviceWorker.launchBrowser();
     const [page] = context.pages();
     await page.goto('data:text/html,Default page');
     await run(context);
@@ -66,5 +82,6 @@ export const androidTest = baseTest.extend<PageTestFixtures, AndroidWorkerFixtur
       await androidContext.pages()[1].close();
     const page = await androidContext.newPage();
     await run(page);
+    await androidContext.clearCookies();
   },
 });
diff --git a/tests/android/browser.spec.ts b/tests/android/browser.spec.ts
index d1b54206b98d2..61595a8795e7d 100644
--- a/tests/android/browser.spec.ts
+++ b/tests/android/browser.spec.ts
@@ -17,10 +17,6 @@
 import fs from 'fs';
 import { androidTest as test, expect } from './androidTest';
 
-test.afterAll(async ({ androidDevice }) => {
-  await androidDevice.shell('am force-stop com.android.chrome');
-});
-
 test('androidDevice.model', async function({ androidDevice }) {
   expect(androidDevice.model()).toContain('sdk_gphone');
   expect(androidDevice.model()).toContain('x86_64');
diff --git a/tests/android/device.spec.ts b/tests/android/device.spec.ts
index 1288e7320b709..8b750ca1153e1 100644
--- a/tests/android/device.spec.ts
+++ b/tests/android/device.spec.ts
@@ -15,7 +15,6 @@
  */
 
 import fs from 'fs';
-import { join } from 'path';
 import { PNG } from 'playwright-core/lib/utilsBundle';
 import { androidTest as test, expect } from './androidTest';
 
@@ -55,40 +54,7 @@ test('androidDevice.push', async function({ androidDevice }) {
 });
 
 test('androidDevice.fill', async function({ androidDevice }) {
-  test.fixme(true, 'Hangs on the bots');
-
   await androidDevice.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
-  await androidDevice.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'Hello');
+  await androidDevice.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'Hello', { timeout: test.info().timeout });
   expect((await androidDevice.info({ res: 'org.chromium.webview_shell:id/url_field' })).text).toBe('Hello');
 });
-
-test('androidDevice.options.omitDriverInstall', async function({ playwright }) {
-  test.skip(true, 'Android._driverPromise gets cached and is in a closed state. Its stored inside the androidDevice worker fixture.');
-  const devices = await playwright._android.devices({ omitDriverInstall: true });
-
-  const androidDevice = devices[0];
-  await androidDevice.shell(`cmd package uninstall com.microsoft.playwright.androiddriver`);
-  await androidDevice.shell(`cmd package uninstall com.microsoft.playwright.androiddriver.test`);
-
-  await androidDevice.shell('am start -a android.intent.action.VIEW -d about:blank com.android.chrome');
-
-  let fillStatus = '';
-  androidDevice.fill({ res: 'com.android.chrome:id/url_bar' }, 'Hello').then(() => {
-    fillStatus = 'success';
-  }).catch(() => {
-    fillStatus = 'error';
-  });
-
-  // install and start driver
-  for (const file of ['android-driver.apk', 'android-driver-target.apk']) {
-    const filePath =  join(require.resolve('playwright-core'), '..', 'bin', file);
-    await androidDevice.installApk(await fs.promises.readFile(filePath));
-  }
-  androidDevice.shell('am instrument -w com.microsoft.playwright.androiddriver.test/androidx.test.runner.AndroidJUnitRunner').catch(e => console.error(e));
-
-  // wait for finishing fill operation
-  while (!fillStatus)
-    await new Promise(f => setTimeout(f, 200));
-
-  expect(fillStatus).toBe('success');
-});
diff --git a/tests/android/launch-server.spec.ts b/tests/android/launch-server.spec.ts
index 80c9760f2ea00..21c01b8e4d159 100644
--- a/tests/android/launch-server.spec.ts
+++ b/tests/android/launch-server.spec.ts
@@ -153,3 +153,15 @@ test('android.launchServer should terminate WS connection when device gets disco
     await new Promise(f => forwardingServer.close(f));
   }
 });
+
+test('android.launchServer should be able to launch browser', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36911' } }, async ({ playwright }) => {
+  const browserServer = await playwright._android.launchServer();
+  const device = await playwright._android.connect(browserServer.wsEndpoint());
+  const context = await device.launchBrowser();
+  const [page] = context.pages();
+  await page.goto('data:text/html,<title>Hello world!</title>');
+  expect(await page.title()).toBe('Hello world!');
+  await context.close();
+  await device.close();
+  await browserServer.close();
+});
diff --git a/tests/android/playwright.config.ts b/tests/android/playwright.config.ts
index 4bfeecf186120..e26923000fdb5 100644
--- a/tests/android/playwright.config.ts
+++ b/tests/android/playwright.config.ts
@@ -16,6 +16,7 @@
 
 import { config as loadEnv } from 'dotenv';
 loadEnv({ path: path.join(__dirname, '..', '..', '.env') });
+process.env.PWTEST_UNDER_TEST = '1';
 
 import type { Config, PlaywrightTestOptions, PlaywrightWorkerOptions } from '@playwright/test';
 import * as path from 'path';
diff --git a/tests/android/webview.spec.ts b/tests/android/webview.spec.ts
index 46e0e385a05fe..b5ead3a695c44 100644
--- a/tests/android/webview.spec.ts
+++ b/tests/android/webview.spec.ts
@@ -16,13 +16,7 @@
 
 import { androidTest as test, expect } from './androidTest';
 
-test.afterEach(async ({ androidDevice }) => {
-  await androidDevice.shell('am force-stop org.chromium.webview_shell');
-  await androidDevice.shell('am force-stop com.android.chrome');
-});
-
 test('androidDevice.webView', async function({ androidDevice }) {
-  test.slow();
   expect(androidDevice.webViews().length).toBe(0);
   await androidDevice.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
   const webview = await androidDevice.webView({ pkg: 'org.chromium.webview_shell' });
@@ -48,14 +42,12 @@ test('should navigate page internally', async function({ androidDevice }) {
 });
 
 test('should navigate page externally', async function({ androidDevice }) {
-  test.fixme(true, 'Hangs on the bots');
-
   expect(androidDevice.webViews().length).toBe(0);
   await androidDevice.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
   const webview = await androidDevice.webView({ pkg: 'org.chromium.webview_shell' });
   const page = await webview.page();
 
-  await androidDevice.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'data:text/html,<title>Hello world!</title>');
+  await androidDevice.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'data:text/html,<title>Hello world!</title>', { timeout: test.info().timeout });
   await Promise.all([
     page.waitForNavigation(),
     androidDevice.press({ res: 'org.chromium.webview_shell:id/url_field' }, 'Enter')
@@ -64,7 +56,6 @@ test('should navigate page externally', async function({ androidDevice }) {
 });
 
 test('select webview from socketName', async function({ androidDevice }) {
-  test.slow();
   const context = await androidDevice.launchBrowser();
   const newPage = await context.newPage();
   await newPage.goto('about:blank');
@@ -77,4 +68,39 @@ test('select webview from socketName', async function({ androidDevice }) {
 
   await newPage.close();
   await context.close();
-});
\ No newline at end of file
+});
+
+// Requires a newer WebView version with
+// https://chromium-review.googlesource.com/c/chromium/src/+/6411892
+test.fail('should be able to receive webView cookies', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/35392',
+  }
+}, async function({ androidDevice, server }) {
+  expect(androidDevice.webViews().length).toBe(0);
+  server.setRoute('/cookies', (req, res) => {
+    res.setHeader('Set-Cookie', 'cookie1=value1; Path=/; HttpOnly');
+    res.setHeader('Content-Type', 'text/html');
+    res.end('<html><body>hello world</body></html>');
+  });
+  await androidDevice.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+  const webview = await androidDevice.webView({ pkg: 'org.chromium.webview_shell' });
+  const page = await webview.page();
+  await page.goto(server.CROSS_PROCESS_PREFIX + '/cookies');
+  const cookies = await page.context().cookies();
+  expect(cookies.length).toBe(1);
+  expect(cookies).toEqual([
+    {
+      name: 'cookie1',
+      value: 'value1',
+      domain: new URL(server.CROSS_PROCESS_PREFIX).hostname,
+      path: '/',
+      expires: -1,
+      httpOnly: true,
+      secure: false,
+      sameSite: 'Lax'
+    }
+  ]);
+  await page.context().clearCookies();
+});
diff --git a/tests/assets/blob-1.52.zip b/tests/assets/blob-1.52.zip
new file mode 100644
index 0000000000000..5b1d5cf4a5b9d
Binary files /dev/null and b/tests/assets/blob-1.52.zip differ
diff --git a/tests/assets/cached/bfcached.html b/tests/assets/cached/bfcached.html
new file mode 100644
index 0000000000000..8c12b001cd4dd
--- /dev/null
+++ b/tests/assets/cached/bfcached.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel='stylesheet' href='./one-style.css'>
+<div>BFCached</div>
+<script>
+  window.didShow = new Promise(f => window.addEventListener('pageshow', event => {
+    console.log(event);
+    window._persisted = !!event.persisted;
+    window._event = event;
+    f({ persisted: !!event.persisted });
+  }));
+</script>
diff --git a/tests/assets/client-certificates/README.md b/tests/assets/client-certificates/README.md
index b0ee78e707aa5..2c73bd92f38f1 100644
--- a/tests/assets/client-certificates/README.md
+++ b/tests/assets/client-certificates/README.md
@@ -1,60 +1,7 @@
 # Client Certificate test-certificates
 
-## Server
+Regenerate all certificates by running:
 
-```bash
-openssl req \
-	-x509 \
-	-newkey rsa:4096 \
-	-keyout server/server_key.pem \
-	-out server/server_cert.pem \
-	-nodes \
-	-days 365 \
-	-subj "/CN=localhost/O=Client\ Certificate\ Demo" \
-	-addext "subjectAltName=DNS:localhost,DNS:local.playwright"
 ```
-
-## Trusted client-certificate (server signed/valid)
-
-```
-mkdir -p client/trusted
-# generate server-signed (valid) certifcate
-openssl req \
-	-newkey rsa:4096 \
-	-keyout client/trusted/key.pem \
-	-out client/trusted/csr.pem \
-	-nodes \
-	-days 365 \
-	-subj "/CN=Alice"
-
-# sign with server_cert.pem
-openssl x509 \
-	-req \
-	-in client/trusted/csr.pem \
-	-CA server/server_cert.pem \
-	-CAkey server/server_key.pem \
-	-out client/trusted/cert.pem \
-	-set_serial 01 \
-	-days 365
-```
-
-## Self-signed certificate (invalid)
-
-```
-mkdir -p client/self-signed
-openssl req \
-	-newkey rsa:4096 \
-	-keyout client/self-signed/key.pem \
-	-out client/self-signed/csr.pem \
-	-nodes \
-	-days 365 \
-	-subj "/CN=Bob"
-
-# sign with self-signed/key.pem
-openssl x509 \
-	-req \
-	-in client/self-signed/csr.pem \
-	-signkey client/self-signed/key.pem \
-	-out client/self-signed/cert.pem \
-	-days 365
+bash generate.sh
 ```
diff --git a/tests/assets/client-certificates/client/localhost/localhost.csr b/tests/assets/client-certificates/client/localhost/localhost.csr
new file mode 100644
index 0000000000000..cbf60ba43c49f
--- /dev/null
+++ b/tests/assets/client-certificates/client/localhost/localhost.csr
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEizCCAnMCAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAuxTIfOTWJzsLSYT/RXu6eUYe95oFA0gMM6pdQAws
+U08ufU8S68UzBIAb6zdwDqM6LD5FqLrwaTsUW73dKefb003EgA19L3sZTHSwnSv9
+g9+rnKw/8EA+1thFo7h3EfdWkO/nuxnPfEnHu5oxMk/mCu+hdjfgh01mxc00PIO/
+wioxZtuhzKNIUu+qQAj70Dwbkzy3Zb1QAnj+02AUYnrVTYhusmP4pjrfYgAWU1x4
+WN+XTSI27LnQHE8t8OxuICFwqEEPcJg4pCFNQgmO0gcRDbd4U7JgQ0xMXZ9na9k0
+f1GOgtjKsz5IIDrAwLnrIOEXiIYlNaQ/v28BrlWytaOHGFKmDxAbGXHz1WuftmR1
+vYQivC5fkXU3+QKWoGPZaLIhA7/ZOMSVgoo+Rv+mS6Mze/6LphatUMcI1oYX4ZBY
+FrsVsAeAO/FPZDcwVct0bdPCRRFBQpgl6DxMyItHMexNHwURi4YHwhYiBBe+Njc1
+tTh6dniA11MUVC5WmKME7CxgXxHVXE4MYcf/w1x4sOnxHneb1bCa8jOPELRc6byR
+8mk23fbBP42EPkrgpCtLhbHgskLKobLFav43xaIiYFn744U7rbINI+5RfJ8BH5Kw
+CB5RlAsymPxwDNcPXyyyeHEEUAQmtnJPrGPSGMN/QODgCWRXEvY556NGx0D5riu7
+MXkCAwEAAaAyMDAGCSqGSIb3DQEJDjEjMCEwHwYDVR0RBBgwFoIJbG9jYWxob3N0
+ggkxMjcuMC4wLjEwDQYJKoZIhvcNAQELBQADggIBAEYqpx28FFRHqXfyumTkkFb/
+hrlUD9qKUYSdjpsPLFRUYiLofNlYhCtEFEuHyLkNHqLO5Z6E7yOpm/HvdXY0eBQy
+tK0verggKXy8MnpLVtsFOf4DgenTwFRG3NbNk2/KynwiAwJ0iwOdDfAmwrzYFLeR
+uXysPE0lGJu277akuo/PDg3QEY44iDJgI4rqtY25sR8J23M9Roa5qN4bdaXl6l10
+UJhdugTG90gRFmmUVLLRa21A3j4m7pvWHu7zYJN7ylS/NQ6ZEnpNno7Ie6MLzrm6
+h8MOSoxtmrXi0e3aYf7PC3u3YLAjyUzHicgMdXk8SjtUXi6l3U5hU+6WBeOKKmwa
+vi+FUpRfnutkWpinNqikmMw0Sqy+bpXwbwgm2oD6driiMneBCT37gW/IyUPWVxzg
+dVgeQIt3i8SMwnGUrzfVo/gqjq4qFBpzS3h9jPPrMYQN2LQdmyo13R9UH26cLGE1
+cgVmqUKa11kX8353wfA36JuW5yGv2yaK4V1kwFISznMvk5AGdOHONdZOrN4sLIIY
+7Npqp5AO1KdoYcNVptCA4n6mN/30fTmA/W1ajsKcfIn5RlmvdgpooKoEgaU/X9RL
+d2ydIpijWbQqm+nF9skpO4jIFPfuQj6mMXCPWtsvbpHCoo0iMHHWfVFcpvsXGYN2
+6ji5z3opVapp1m5uTmcA
+-----END CERTIFICATE REQUEST-----
diff --git a/tests/assets/client-certificates/client/localhost/localhost.ext b/tests/assets/client-certificates/client/localhost/localhost.ext
new file mode 100644
index 0000000000000..d4d02272657ad
--- /dev/null
+++ b/tests/assets/client-certificates/client/localhost/localhost.ext
@@ -0,0 +1 @@
+subjectAltName=DNS:localhost,DNS:127.0.0.1
diff --git a/tests/assets/client-certificates/client/localhost/localhost.key b/tests/assets/client-certificates/client/localhost/localhost.key
new file mode 100644
index 0000000000000..7f6adba534a6d
--- /dev/null
+++ b/tests/assets/client-certificates/client/localhost/localhost.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC7FMh85NYnOwtJ
+hP9Fe7p5Rh73mgUDSAwzql1ADCxTTy59TxLrxTMEgBvrN3AOozosPkWouvBpOxRb
+vd0p59vTTcSADX0vexlMdLCdK/2D36ucrD/wQD7W2EWjuHcR91aQ7+e7Gc98Sce7
+mjEyT+YK76F2N+CHTWbFzTQ8g7/CKjFm26HMo0hS76pACPvQPBuTPLdlvVACeP7T
+YBRietVNiG6yY/imOt9iABZTXHhY35dNIjbsudAcTy3w7G4gIXCoQQ9wmDikIU1C
+CY7SBxENt3hTsmBDTExdn2dr2TR/UY6C2MqzPkggOsDAuesg4ReIhiU1pD+/bwGu
+VbK1o4cYUqYPEBsZcfPVa5+2ZHW9hCK8Ll+RdTf5ApagY9losiEDv9k4xJWCij5G
+/6ZLozN7/oumFq1QxwjWhhfhkFgWuxWwB4A78U9kNzBVy3Rt08JFEUFCmCXoPEzI
+i0cx7E0fBRGLhgfCFiIEF742NzW1OHp2eIDXUxRULlaYowTsLGBfEdVcTgxhx//D
+XHiw6fEed5vVsJryM48QtFzpvJHyaTbd9sE/jYQ+SuCkK0uFseCyQsqhssVq/jfF
+oiJgWfvjhTutsg0j7lF8nwEfkrAIHlGUCzKY/HAM1w9fLLJ4cQRQBCa2ck+sY9IY
+w39A4OAJZFcS9jnno0bHQPmuK7sxeQIDAQABAoICAA5XaYcpg8E+JX9dUrRg58qk
+NXuFsxytSUIsrTlbtYotZ8LzbN/mHiMaLwm5Fj4JBUye+XgV3Jg0jzr5MxsjSxbH
+v2iRoCcjqKzTxTZHSQfy/ZTlH4GrayXNLol+eqJF87zopzsQn3dHsKgRCfRxa5Er
+DZWicvPsWxSOxpJdBzY7Rc48yAqH+eNhvAtspOExumtvHCAQgzGtVNufYfCque9X
+piTGxSj5GmbI2u1JCXDGszKWjN9Y3ztMVplBhq+v4JMFacmX4b+zTdjiIrC3GfeT
+OQYxhm+iSbhjn+oEnKGl/ubI98EF5UGTP3OGzR+YIdW1cuTJ0pk6SUa0Cx8hihmR
+rnUgxbXjR/sB383ES4kYVT+tm/a8PIvPd1gu4j28sNRXGgVZ8GU76Y2ZITm3eoDr
+7PzVWsTe+vbxBXenlcmzO9rj91yK0eDBaJnwAIPxHGFxTkQkx3T2nnWStkHrvT6h
+15fHITgKWE+K2FMCIJQj5gIT3qGnZxZDLIgmyowVV9ZXuI2XchehD+L7nVsMhsby
+yIITglz1miYgy7zVL0oolIXuE0eQ4xAZlu1D5wjAQy/VzyB7OYY6bTErC0EmXjNS
+3QAYsI+Kn7YgjNJJNuJ5cC2S8nHNJ2uTJ54KWeA5s1Ry8B5kJrMGZxCT6Uk3POcG
+Ry5BxOczToKIgXeqm4IBAoIBAQDcvNBNXANexHn4r3yXgmL9IH4QXHAJ3h7tO6Ng
+zZh4K5VmoxSJ82CWQkJrs827F1kE2T9Mq6YPvXrh5VlKZjR+II2ZG7KqT00SULDy
+kSgG8OU/2+DWhyoQ6nt1RhXKDz0s4SjHwkeKwBFexTHf5ed+TILPfnPJIUX89gxV
+4EKL+EsqOsT6CMS7gruUuaA29VGVDneBw9KxKD9IdNXDrbot0DhidIYW1QkCed9g
+tnb2QvJrQmTkupUDI+HdWqOfpcBHwf9FIEI1q6cJtpVYSuaZfZX7hbvSHsTt9rwt
+b6gkiuPBy6qoXP1LWHc093tSzXEk1CWy0F4cCPi4r7UWqmWtAoIBAQDY95LGRUTn
+RKRSl2C5uZnsME5G/6XkqVcGhP5TOnT3/li/NLESZDaF+4iEhEh4M1oWVqShq4ps
+S98baYebriZDMmBm8L1YM63N+fhiI3q1+TF26f7zk6XPFQr88WIli58JmrK02EXG
+4XG/GBtzqfsnueBnwBGz5iE8phXqWyPs1/3qGyK+BHnUqnr3BAZpg8aw2PEjMzoC
+ChfLMzSJZRGDNp7sslkMJ9H9CXoMZsG5YJkQp7aSBD1SI5rJ2q7JC3PmOR913CgU
+0DDhxyJhD77aTEwrZOByaHq8F8KxZ8cl+YRl/tnWu7Gwa2pfjnC9DCk1ARCuDcSg
+OW7JTtsd3zx9AoIBAH17uM7BaAkPmGcPG7zlmnBbcE7MvcReSSaDqLT3K53k6OGY
+A60Idff1YtznMiUReMGQ3rMvQQ/hn2Gbh88Lmvu4dcZ8QG0g96dZx72dVyva9ff/
+fyl1XSyQn+5jES/0ycohlZU5lIID/dvqLhgiEh9yT0q1kAzepXLQTOLkwe/gDprL
+Hf8lzPDruMcrXzDe9KnPt5BFShj70D3YbUz4DcbNf8A4jaGdKaoGrj3EfIwyMq1W
+6RQ+HUfTtiqnxCyVhWFFn2Aknn70Pdj/upaevciz4/dAZy1j4H+GrCMIPoXHjwI0
+Tae4dSXH/LxXk/vWXmOZVnT4jwdQ8lPLTx67b2ECggEAK5t20IrTknflXwQ12J5J
+JYN/+B0hxpeSeij4xNmW8NEaHTQF8uBZZQxtH9VGi4ImtR6s8CF+LM4DBYtsSgny
+fsb9QTNZmwSoBiIbnf3rh++R1YiqSWJ/jON51eTeCRXK3S9Og7KEM7jUF8hMnC6p
+4A4n4DJmXHYAcCQhe3zd95hh3E+f5/kWU3wAQu14LHTj1l+D98MwAYDtz1V3VbYO
+kwTDZGdkJmFKf0UMVrnAbfXQTdyngSmA+aVWUwO05Yt7u+X3QMUC+UvuxzIy4rc7
+cLytAnu/8L63DF7qLqXhDOzdg3J5bgNDb2Xnd1U1q4lqLtEL/S+fOWTRs3w55gMc
+MQKCAQA0tO3yakIOlizE7qlJye2n2Y/q0nSx1iFlKqEe1ja0O7/t+UzfklBiaDhA
+NAqYOiUsDsL/vf76KQ0uE/v0No/36SKvBuQxozdNEGlZHf7CnsrIg1w9llrJgkYA
+1FoSHgHCbC84+dUoonjYg9vx3Lsszw5O1bmwqTBaGSSglIr3f+a3zxtQUquxNEPS
+advAKAdvXsNECj2cMkv3mxSokGQtd/s/rpvxJ8zi5nq5ig80Gfe/6GJpwJnC+sLr
++tn38FNfk5pKXk8jBXjyLtMNDb2iJbiTa1iX1P76Ae2jtexSd2gELNu7oWbotb/O
+DjCwHSmcSUmAmx7IXfoyRQuKLeRw
+-----END PRIVATE KEY-----
diff --git a/tests/assets/client-certificates/client/localhost/localhost.pem b/tests/assets/client-certificates/client/localhost/localhost.pem
new file mode 100644
index 0000000000000..5c1a675055bf4
--- /dev/null
+++ b/tests/assets/client-certificates/client/localhost/localhost.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFKDCCAxCgAwIBAgIBATANBgkqhkiG9w0BAQsFADA2MRIwEAYDVQQDDAlsb2Nh
+bGhvc3QxIDAeBgNVBAoMF0NsaWVudCBDZXJ0aWZpY2F0ZSBEZW1vMB4XDTI1MDcy
+MTE1NTYxOVoXDTM1MDcxOTE1NTYxOVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuxTIfOTWJzsLSYT/RXu6eUYe
+95oFA0gMM6pdQAwsU08ufU8S68UzBIAb6zdwDqM6LD5FqLrwaTsUW73dKefb003E
+gA19L3sZTHSwnSv9g9+rnKw/8EA+1thFo7h3EfdWkO/nuxnPfEnHu5oxMk/mCu+h
+djfgh01mxc00PIO/wioxZtuhzKNIUu+qQAj70Dwbkzy3Zb1QAnj+02AUYnrVTYhu
+smP4pjrfYgAWU1x4WN+XTSI27LnQHE8t8OxuICFwqEEPcJg4pCFNQgmO0gcRDbd4
+U7JgQ0xMXZ9na9k0f1GOgtjKsz5IIDrAwLnrIOEXiIYlNaQ/v28BrlWytaOHGFKm
+DxAbGXHz1WuftmR1vYQivC5fkXU3+QKWoGPZaLIhA7/ZOMSVgoo+Rv+mS6Mze/6L
+phatUMcI1oYX4ZBYFrsVsAeAO/FPZDcwVct0bdPCRRFBQpgl6DxMyItHMexNHwUR
+i4YHwhYiBBe+Njc1tTh6dniA11MUVC5WmKME7CxgXxHVXE4MYcf/w1x4sOnxHneb
+1bCa8jOPELRc6byR8mk23fbBP42EPkrgpCtLhbHgskLKobLFav43xaIiYFn744U7
+rbINI+5RfJ8BH5KwCB5RlAsymPxwDNcPXyyyeHEEUAQmtnJPrGPSGMN/QODgCWRX
+EvY556NGx0D5riu7MXkCAwEAAaNjMGEwHwYDVR0RBBgwFoIJbG9jYWxob3N0ggkx
+MjcuMC4wLjEwHQYDVR0OBBYEFIE6kbIR0PlzaJuZg52JqXuFFQHBMB8GA1UdIwQY
+MBaAFPHaEfjJoIftSkHTb8mwme27LtifMA0GCSqGSIb3DQEBCwUAA4ICAQB7E57H
+19qUD4DjLxJGAVpDphD8mZg9aR7bUd6laXZ12VQnn3+OrF+6JjJ2TIr8ssRkkzc6
+rMhRqob+DxeB94JqlFQDmwP37wJXnuTtuGj71NHQal15b5ZB28fFdwWgUlYECWyg
+sYeMK5HMnNDziniRnjPoKU6f8urmUW2G8N2SOufnRar/StY/8u24IFh/vDTVJKWB
+a22pVk/PIx6JcErfMx0OJdoIUZd/C9DT/a7t+Pt+t3EPVNM2fcjs9aMcg6tlU6Tp
+YwHMzkFQYmcrp2QEhwy23z2E+wnLbeHTULDsHVOLudUGDcSgkW48bPNTOtZTysQ+
+P4mJf+Ju2HC/EwuVrOa14uuay9c+hC1Q1gsGbLZB8NE6jOX5QYN2a7iiUEdCdufo
+wWIXEC+2dJiEji3ehwJp0q4jK15X0IOIfxLH4PholORH659DdCfpm7YAjoaPE9nr
+28MMd9Lj6zWmfyeb5p0IUDpkreL2huxjXHJkmSm4dcxDxLqsP6KSPlhrPvjAVUqw
+5M/jUarDAHaPLNlwqcqWODb891FIyRmc6YHtSRGujMyfJ8LRS2f9rHeyM3m2jMHf
+8EahOgyQ8nvSs/a42VS97IHkGl6qufK7ZUq/VMhQRb+KbaIDN5TLtNwEQ1I40Bm9
+UOoSX/uP1PstOZvf9gnYto8sf75B+PxO692uYw==
+-----END CERTIFICATE-----
diff --git a/tests/assets/client-certificates/client/self-signed/cert.pem b/tests/assets/client-certificates/client/self-signed/cert.pem
index 3c0771794b4e0..d14ac95b2cb13 100644
--- a/tests/assets/client-certificates/client/self-signed/cert.pem
+++ b/tests/assets/client-certificates/client/self-signed/cert.pem
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEyzCCArOgAwIBAgIUYps4gh4MqFYg8zqQhHYL7zYfbLkwDQYJKoZIhvcNAQEL
-BQAwDjEMMAoGA1UEAwwDQm9iMB4XDTI0MDcxOTEyNDc0MFoXDTI1MDcxOTEyNDc0
+MIIEyzCCArOgAwIBAgIUUo60oaPj20QM6oeGSn+2CT5j7GYwDQYJKoZIhvcNAQEL
+BQAwDjEMMAoGA1UEAwwDQm9iMB4XDTI1MDcyMTE1NTYyMFoXDTM1MDcxOTE1NTYy
 MFowDjEMMAoGA1UEAwwDQm9iMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEA179eTsqcc1c3AOQHzCZEyYLPta2CCAscUFqcEZ9vWvjW0uzOv9TDlB33Unov
-jch4CElZOBhzTadVsbmnYKpxwyVU89WCuQKvedz4k1vu7S1YryfNbmS8PWbnQ4ds
-9NB7SgJNHZILvx9DXuWeFEyzRIo1984z4HheBzrkf791LqpYKaKziANUo8h8t0dm
-TX/boOz8cEnQNwtTC0ZX3aD0obG/UAhr/22ZGPo/E659fh4ptyYX2LrIUHGy+Eux
-nJ9Y4cTqa88Ee6K6AkDiT/AoNQNxE4X++jqLuie8j/ZYpI1Oll38GwKVOyy1msRL
-toGmISNwkMIQDGABrJlxgpP4QQAQ+08v9srzXOlkdxdr7OCP81r+ccBXiSQEe7BA
-kdJ8l98l5dprJ++GJ+SZcV4+/iGR0dKU2IdAG5HiKZIFn6ch9Ux+UMqeGaYCpkHr
-TiietHwcXgtVBlE0jFmB/HspmI/O0abK+grMmueaH7XtTI8YHnw0mUpL8+yp7mfA
-7zFusgFgyiBPXeD/NQgg8vja67k++d1VGoXm2xr+5WPQCSbgQoMkkOBMLHWJTefd
-6F4Z5M+oI0VwYbf6eQW246wJgpCHSPR0Vdijd6MAGRWKUuLfDsA9+12iGbKvwJ2e
-nJlStft2V2LZcjBfdIMbigW1aSVNN5w6m6YVrQPry3WPkWcCAwEAAaMhMB8wHQYD
-VR0OBBYEFPxKWTFQJSg4HD2qjxL0dnXX/z4qMA0GCSqGSIb3DQEBCwUAA4ICAQBz
-4H1d5eGRU9bekUvi7LbZ5CP/I6w6PL/9AlXqO3BZKxplK7fYGHd3uqyDorJEsvjV
-hxwvFlEnS0JIU3nRzhJU/h4Yaivf1WLRFwGZ4TPBjX9KFU27exFWD3rppazkWybJ
-i4WuEdP3TJMdKLcNTtXWUDroDOgPlS66u6oZ+mUyUROil+B+fgQgVDhjRc5fvRgZ
-Lng8wuejCo3ExQyxkwn2G5guyIimgHmOQghPtLO5xlc67Z4GPUZ1m4tC+BCiFO4D
-YIXl3QiIpmU7Pss39LLKMGXXAgLRqyMzqE52lsznu18v5vDLfTaRH4u/wjzULhXz
-SrV1IUJmhgEXta4EeDmPH0itgKtkbwjgCOD7drrFrJq/EnvIaJ5cpxiI1pFmYD8g
-VVD7/KT/CyT1Uz1dI8QaP/JX8XEgtMJaSkPfjPErIViN9rh9ECCNLgFyv7Y0Plar
-A6YlvdyV1Rta/BHndf5Hqz9QWNhbFCMQRGVQNEcoKwpFyjAE9SXoKJvFIK/w5WXu
-qKzIYA26QXE3p734Xu1n8QiFJIyltVHbyUlD0k06194t5a2WK+/eDeReIsk0QOI8
-FGqhyPZ7YjR5tSZTmgljtViqBO5AA23QOVFqtjOUrjXP5pTbPJel99Z/FTkqSwvB
-Rt4OX7HfuokWQDTT0TMn5jVtJyi54cH7f9MmsNJ23g==
+AgEAzQMXYOZz3ILrbF9qpDng2pw2wJf1UFopehwaYyu7riWJ9+ADrhSnCSFBM3Sc
+MBc/8dIR6etWwci8QwJ/MtvIU0yx4llq+53G+19Bc1teC6q/b4QCRDIcTGxOZoR+
+jfYZVjPODEyJ5y5MZIo34ZP4bu+JnpT4W7+uojm3jOoyNPqXMcc70uAhfSKG+Jfr
+wZKteA4T5VKFytVcWgh4v03z8zTYeW3kD4lCsongBz6yu2dn3D6XMROnxiPwi+IR
+QqX1pwnJ0UA3CTeOHEw1jA3koxWIIg44PWaPaCj9Udrhf4ew00XLPWVZP8T5rVf8
+yUfecWQCR7FueJFqoLhPMMFi17rYmGZUvw3/YkXBjay4Q9e+G2WS3Xk8u+I1sCuV
+BJNBRv9DqtMC9D/N9NI8GkLrXwZmk82SXG+cQ0TSkNUHYI/03YKoqsn5H8PsG7Tc
++Y2Ca6TaCWims7lvOg7U0E6lu2h5NGcdWHFPJ9qfe+xho/yfYYwGqEKanGAu1kd5
+SbIaX6/YiM5/Pp/96MeRNrB9kLzDnZTNuGtdCawVFgbkWmfX2Z6/a0d6SvZGDzBx
+xTVZRB0my01E1FP53MS8YRH98HUjGEwNRVq2e1W+aXldKppgZ85GZD3l2YTeuI0i
+PJCDUzQiaWzFtWc8s13YQ1HLCOyOXF7QqMyNCiLGb4xQ56kCAwEAAaMhMB8wHQYD
+VR0OBBYEFMqdCDxkZm8HxNI4MLLveAVTdH7UMA0GCSqGSIb3DQEBCwUAA4ICAQAB
+MKd3WEJ8zI51FuyeTcMq6L1zk2vmKTFg6T7HZJhNZoD1AYvvsKJ8mrqeSwhxqjlE
+0H2FGLY+Z8Fw3+TE1QuvTuz3gwRI+yzBEyqi/fEGCGrhOVcWaXGgLCtWG+BA4Su8
+HenK97/n3OnXUnBozRPZMH02IaLrOiEGbpaabXKCCabpm5U1oGq437e3SeAeIL7U
+WxuHhHBx0yo9j7ACaCL6mz8xpk8NaRZpPy22MTlrPKwbOK2eYf3Jy5fHa/f6edTs
+KqZewI7t4oe/OqKdjyTgGYkjTE3Xcmo2T/fmcAeEP3HJX267kCzBi5J3McwonWxD
+N8zz9qKSf5YGQy140eEOTjjESwlPz6zfrTW92YdCIr63k9UCDL2HGQTRSxB6g4BQ
+loVzKS9/BKhulGqvSGvEoj6D+qG/PgFlBtJoE71X+vSIxvdbnOVmOi/l+NGNuP1Z
+nwnDtZWp4BKshhSKvqeOI+EyNMQ4FL20S4w8T+LR873jKrbd2MEuAsJiygWh+/ZJ
+haHTEhFxvH/a4i8gb/SGZlFB6oyPJ+XM5kZo4fcp7PnzxhYrIaEpPq+AR/3657hm
+AajXpS5lTCkNJc85QeHHj/0geDsOvfK4XUj2lgaJ0gXpgsoxnSCSq6Xox6ZqAVON
+0ra1KkGBTQH+5DxJ2Gp1UBaucrLYZTfXuJ8fPYeeNQ==
 -----END CERTIFICATE-----
diff --git a/tests/assets/client-certificates/client/self-signed/csr.pem b/tests/assets/client-certificates/client/self-signed/csr.pem
index 4c99e13490132..283dd45a689b7 100644
--- a/tests/assets/client-certificates/client/self-signed/csr.pem
+++ b/tests/assets/client-certificates/client/self-signed/csr.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEUzCCAjsCAQAwDjEMMAoGA1UEAwwDQm9iMIICIjANBgkqhkiG9w0BAQEFAAOC
-Ag8AMIICCgKCAgEA179eTsqcc1c3AOQHzCZEyYLPta2CCAscUFqcEZ9vWvjW0uzO
-v9TDlB33Unovjch4CElZOBhzTadVsbmnYKpxwyVU89WCuQKvedz4k1vu7S1YryfN
-bmS8PWbnQ4ds9NB7SgJNHZILvx9DXuWeFEyzRIo1984z4HheBzrkf791LqpYKaKz
-iANUo8h8t0dmTX/boOz8cEnQNwtTC0ZX3aD0obG/UAhr/22ZGPo/E659fh4ptyYX
-2LrIUHGy+EuxnJ9Y4cTqa88Ee6K6AkDiT/AoNQNxE4X++jqLuie8j/ZYpI1Oll38
-GwKVOyy1msRLtoGmISNwkMIQDGABrJlxgpP4QQAQ+08v9srzXOlkdxdr7OCP81r+
-ccBXiSQEe7BAkdJ8l98l5dprJ++GJ+SZcV4+/iGR0dKU2IdAG5HiKZIFn6ch9Ux+
-UMqeGaYCpkHrTiietHwcXgtVBlE0jFmB/HspmI/O0abK+grMmueaH7XtTI8YHnw0
-mUpL8+yp7mfA7zFusgFgyiBPXeD/NQgg8vja67k++d1VGoXm2xr+5WPQCSbgQoMk
-kOBMLHWJTefd6F4Z5M+oI0VwYbf6eQW246wJgpCHSPR0Vdijd6MAGRWKUuLfDsA9
-+12iGbKvwJ2enJlStft2V2LZcjBfdIMbigW1aSVNN5w6m6YVrQPry3WPkWcCAwEA
-AaAAMA0GCSqGSIb3DQEBCwUAA4ICAQCb07d2IjUy1PeHCj/2k/z9FrZSo6K3c8y6
-b/u/MZ0AXPKLPDSo7UYpOJ8Z2cBiJ8jQapjTSEL8POUYqcvCmP55R6u68KmvINHo
-+Ly7pP+xPrbA4Q0WmPnz37hQn+I1he0GuEQyjZZqUln9zwp67TsWNKxKtCH+1j8M
-Ltzx6kuHCdPtDUtv291yhVRqvbjiDs+gzdQYNJtAkUbHwHFxu8oZhg8QZGyXYMN8
-TGoQ1LTezFZXJtX69K7WnrDGrjsgB6EMvwkqAFSYNH0LFvI0xo13OOgXr9mrwohA
-76uZtjXL9B15EqrMce6mdUZi46QJuQ2avTi57Lz+fqvsBYdQO89VcFSmqu2nfspN
-QZDrooyjHrlls8MpoBd8fde9oT4uA4/d9SJtuHUnjgGN7Qr7eTruWXL8wVMwFnvL
-igWE4detO9y2gpRLq6uEqzWYMGtN9PXJCGU8C8m9E2EBUKMrT/bpNbboatLcgRrW
-acj0BRVqoVzk1sRq7Sa6ejywqgARvIhTehg6DqdMdcENCPQ7rxDRu5PSDM8/mwIj
-0KYl8d2PlECB4ofRyLcy17BZzjP6hSnkGzcFk0/bChZOSIRnwvKbvfXnB45hhPk8
-XwT/6UNSwC2STP3gtOmLqrWj+OE0gy0AkDMvP3UnQVGMUvgfYg+N4ROCVtlqzxe9
-W65c05Mm1g==
+Ag8AMIICCgKCAgEAzQMXYOZz3ILrbF9qpDng2pw2wJf1UFopehwaYyu7riWJ9+AD
+rhSnCSFBM3ScMBc/8dIR6etWwci8QwJ/MtvIU0yx4llq+53G+19Bc1teC6q/b4QC
+RDIcTGxOZoR+jfYZVjPODEyJ5y5MZIo34ZP4bu+JnpT4W7+uojm3jOoyNPqXMcc7
+0uAhfSKG+JfrwZKteA4T5VKFytVcWgh4v03z8zTYeW3kD4lCsongBz6yu2dn3D6X
+MROnxiPwi+IRQqX1pwnJ0UA3CTeOHEw1jA3koxWIIg44PWaPaCj9Udrhf4ew00XL
+PWVZP8T5rVf8yUfecWQCR7FueJFqoLhPMMFi17rYmGZUvw3/YkXBjay4Q9e+G2WS
+3Xk8u+I1sCuVBJNBRv9DqtMC9D/N9NI8GkLrXwZmk82SXG+cQ0TSkNUHYI/03YKo
+qsn5H8PsG7Tc+Y2Ca6TaCWims7lvOg7U0E6lu2h5NGcdWHFPJ9qfe+xho/yfYYwG
+qEKanGAu1kd5SbIaX6/YiM5/Pp/96MeRNrB9kLzDnZTNuGtdCawVFgbkWmfX2Z6/
+a0d6SvZGDzBxxTVZRB0my01E1FP53MS8YRH98HUjGEwNRVq2e1W+aXldKppgZ85G
+ZD3l2YTeuI0iPJCDUzQiaWzFtWc8s13YQ1HLCOyOXF7QqMyNCiLGb4xQ56kCAwEA
+AaAAMA0GCSqGSIb3DQEBCwUAA4ICAQAn/ZI7IkBUEfhZHefwtF+QHCyxSEKvqwHq
+fSqKVdarBPz8Ik8m3icj8R/DcS3y5jgzx3x8bXQoDpgsAQgeb825NRv2wAQAGoH1
+8vh204lTyjqzrgtK7eQeQDc7fjeigIkxQsAK9zk4BaFUWp0wEC0RLVAgvlQTl7vu
+n1jSSrhK8tvGy62/cIxZfwD0bAMHlW4m1A4fUuSGWQX2KldgA8tnmT6wx0If/nKb
+VB68AMbyMHUeb32v9wEvx2nHlwMjqNFeg7vYyJXOfBdDILUl+OTBoQY1X+jSx5iM
+txTzmA8Hcgx0Fq+BnbQuZCLqFpNWEfenAtQtaAFuJwMiKCf6kgbqkDVShJkmt+vC
+j3dcsVMZDsdMk4qRpiJhaTQOYmsMGCj4uoDpFGjwPoUwlDkjYgHAAsm9uCkshc+m
+WZO7I6Z3Tbi3XskJvAMc3dTWjtc6nApEtr/mn8LcETfOp7RRSfjllj6ijWUrVwUy
+BpzU9C/zLTkhFX0DVDCIV+jEefF8JPfzSKLgXyRbInTz1/6/sKXtswXW0NjzqLMI
+C9ggMBhOiDv9KJn3G/mY4CqIfo9KMzF+++4t+wdXTir8DWNlMUAn1vlBwxZAgKCM
+GonVExBU0VIGCpyTRLkesEHnPMgybP6gLzP3++54x288OS5JwuPPtkDcsBHUjTq8
+HxTJvUul/Q==
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/assets/client-certificates/client/self-signed/key.pem b/tests/assets/client-certificates/client/self-signed/key.pem
index 70d5e3dd0140b..c3ddd1a916b18 100644
--- a/tests/assets/client-certificates/client/self-signed/key.pem
+++ b/tests/assets/client-certificates/client/self-signed/key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQDXv15OypxzVzcA
-5AfMJkTJgs+1rYIICxxQWpwRn29a+NbS7M6/1MOUHfdSei+NyHgISVk4GHNNp1Wx
-uadgqnHDJVTz1YK5Aq953PiTW+7tLVivJ81uZLw9ZudDh2z00HtKAk0dkgu/H0Ne
-5Z4UTLNEijX3zjPgeF4HOuR/v3UuqlgporOIA1SjyHy3R2ZNf9ug7PxwSdA3C1ML
-RlfdoPShsb9QCGv/bZkY+j8Trn1+Him3JhfYushQcbL4S7Gcn1jhxOprzwR7oroC
-QOJP8Cg1A3EThf76Oou6J7yP9likjU6WXfwbApU7LLWaxEu2gaYhI3CQwhAMYAGs
-mXGCk/hBABD7Ty/2yvNc6WR3F2vs4I/zWv5xwFeJJAR7sECR0nyX3yXl2msn74Yn
-5JlxXj7+IZHR0pTYh0AbkeIpkgWfpyH1TH5Qyp4ZpgKmQetOKJ60fBxeC1UGUTSM
-WYH8eymYj87Rpsr6Csya55ofte1MjxgefDSZSkvz7KnuZ8DvMW6yAWDKIE9d4P81
-CCDy+NrruT753VUahebbGv7lY9AJJuBCgySQ4EwsdYlN593oXhnkz6gjRXBht/p5
-BbbjrAmCkIdI9HRV2KN3owAZFYpS4t8OwD37XaIZsq/AnZ6cmVK1+3ZXYtlyMF90
-gxuKBbVpJU03nDqbphWtA+vLdY+RZwIDAQABAoICAETxu6J0LuDQ+xvGwxMjG5JF
-wjitlMMbQdYPzpX3HC+3G3dWA4/b3xAjL1jlAPNPH8SOI/vAHICxO7pKuMk0Tpxs
-/qPZFCgpSogn7CuzEjwq5I88qfJgMKNyke7LhS8KvItfBuOvOx+9Ttsxh323MQZz
-IGHrPDq8XFf1IvYL6deaygesHbEWV2Lre6daIsAbXsUjVlxPykD81nHg7c0+VU6i
-rZ9WwaRjkqwftC6G8UVvQCdt/erdbYv/eZDNJ5oEdfPX6I3BHw6fZs+3ilq/RSoD
-yovRozS1ptc7QY/DynnzSizVJe4/ug6p7/LgTc2pyrwGRj+MNHKv73kHo/V1cbxF
-fBJCpxlfcGcEP27BkENiTKyRQEF1bjStw+UUKygrRXLm3MDtAVX8TrDERta4LAeW
-XvPiJbSOwWk2yYCs62RyKl+T1no7alIvc6SUy8rvKKm+AihjaTsxTeACC1cBc41m
-5HMz1dqdUWcB5jbnPsV+27dNK1/zIC+e0OXtoSXvS+IbQXo/awHJyXv5ClgldbB9
-hESFTYz/uI6ftuTM6coHQfASLgmnq0fOd1gyqO6Jr9ZSvxcPNheGpyzN3I3o5i2j
-LTYJdX3AoI5rQ5d7/GS2qIwWf0q8rxQnq1/34ABWD0umSa9tenCXkl7FIB4drwPB
-4n7n+SL7rhmv0vFKIjepAoIBAQD19MuggpKRHicmNH2EzPOyahttuhnB7Le7j6FC
-afuYUBFNcxww+L34GMRhmQZrGIYmuQ3QV4RjYh2bowEEX+F5R1V90iBtYQL1P73a
-jYtTfaJn0t62EBSC//w2rtaRJPgGhbXbnyid64J0ujRFCelej8FRJdBV342ctRAL
-0RazxQ/KcTRl9pncALxGhnSsBElZlDtZd/dWnWBDZ/fg/C97VV9ZQLcpyGvL516i
-GpB8BQsHiIe9Jt5flZvcKB7z/KItGzPB4WK6dpV8t/FeQiUpZXkQlqO03XaZT4NP
-AEGH3rKIRMpP7TORYFhbYrZwov3kzLaggax2wGPTkfMFNlTjAoIBAQDgjsYfShkz
-6Dl1UTYBrDMy9pakJbC6qmd0KOKX+4XH/Dc1mOzR8NGgoY7xWXFUlozgntKKnJda
-M6GfOt/dxc0Sq7moYzA7Jv4+9hNdU3jX5YrqAbcaSFj6k4yauO2BKCBahQo8qseY
-a3N5f0gp+5ftTMvOTwGw3JRJFJq0/DvKWAYLIaJ0Oo77zGs0vxa1Aqob10MloXt5
-DMwjazWujntTzTJY1vsfsBHa8OEObMwiftqnmn6L4Qprd3AzQkaNlZEsvERyLfFq
-1pu4EsDJJGdVfpZYfo+6vTglLXFBLEUQmh4/018Mw4O4pGgCVMj/wict/gTViQGC
-qSj+IOThsTytAoIBAHu3L3nEU/8EwMJ54q0a/nW+458U3gHqlRyWCZJDhxc9Jwbj
-IMoNRFj39Ef3VgAmrMvrh2RFsUTgRG5V1pwhsmNzmzAXstHx2zALaO73BZ7wcfFx
-Yy8G9ZpTMsU6upj1lICLX0diTmbo4IzgYIxdiPJUsvOjZqDbOvsZJEIdYSL5u5Cj
-0qx7FzdPc2SyGxuvaEnTwuqk6le5/4LIWCnmD+gksDpP0BIHSxmcfsBhRk3rp3mZ
-llVxqKdBtM1PrQojCFxR833RZfzOyzCZwaIc+V5SOUw7yYqfXxmMokrpoQy72ueq
-Wm1LrgWxBaCqDYSop7cftbkUoPB2o3/3SNtVUesCggEAReqOKy3R/QRf53QaoZiw
-9DwsmP0XMndd8J/ONU3d0G9p7SkpCxC05BOJQwH7NEAPqtwoZ3nr8ezDdKVLEGzG
-tfp7ur7vRGuWm5nYW6Viqa3Re5x/GxLNiW8pRv8vC5inwidMEamGraE++eQ0XsXz
-/rF7f0fAGgYDsWFV7eXe49hWQV7+iru0yxdRhcG9WyxyNGrogC3wGLdwU9LMiwXX
-xjbMZzbAR5R1arq3B9u+Dzt57tc+cWTm7qDocT1AZFLeOZSApyBA22foYf6MwdOw
-zMC2JOV68MR7V6/3ZDhZZJrnsi2omXvCZlnh/F/TmTYlJr/BV47pxnnOxpkNSmv5
-nQKCAQBRqrsUVO7NOgR1sVX7YDaekQiJKS6Vq/7y2gR4FoLm/MMzNZQgGo9afmKg
-F2hSv6tuoqc33Wm0FnoSEMaI8ky0qgA5kwXvhfQ6pDf/2zASFBwjwhTyJziDlhum
-iwWe1F7lNaVNpxAXzJBaBTWvHznuM42cGv5bbPBSRuIRniGsyn/zYMrISWgL+h/Q
-fsQ2rfPSqollPw+IUPN0mX+1zg6PFxaR4HM9UrRX7cnRKG20GIDPodsUl8IMg+SO
-M5YG/UqDD10hfeEutvQIvl0oJraBWT34cqUZLVpUwJzf1be7zl9MzHGcym/ni7lX
-dg6m3MAyZ1IXjHlogOdmGvnq07/w
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDNAxdg5nPcguts
+X2qkOeDanDbAl/VQWil6HBpjK7uuJYn34AOuFKcJIUEzdJwwFz/x0hHp61bByLxD
+An8y28hTTLHiWWr7ncb7X0FzW14Lqr9vhAJEMhxMbE5mhH6N9hlWM84MTInnLkxk
+ijfhk/hu74melPhbv66iObeM6jI0+pcxxzvS4CF9Iob4l+vBkq14DhPlUoXK1Vxa
+CHi/TfPzNNh5beQPiUKyieAHPrK7Z2fcPpcxE6fGI/CL4hFCpfWnCcnRQDcJN44c
+TDWMDeSjFYgiDjg9Zo9oKP1R2uF/h7DTRcs9ZVk/xPmtV/zJR95xZAJHsW54kWqg
+uE8wwWLXutiYZlS/Df9iRcGNrLhD174bZZLdeTy74jWwK5UEk0FG/0Oq0wL0P830
+0jwaQutfBmaTzZJcb5xDRNKQ1Qdgj/Tdgqiqyfkfw+wbtNz5jYJrpNoJaKazuW86
+DtTQTqW7aHk0Zx1YcU8n2p977GGj/J9hjAaoQpqcYC7WR3lJshpfr9iIzn8+n/3o
+x5E2sH2QvMOdlM24a10JrBUWBuRaZ9fZnr9rR3pK9kYPMHHFNVlEHSbLTUTUU/nc
+xLxhEf3wdSMYTA1FWrZ7Vb5peV0qmmBnzkZkPeXZhN64jSI8kINTNCJpbMW1Zzyz
+XdhDUcsI7I5cXtCozI0KIsZvjFDnqQIDAQABAoICAAN6aFLBqijNNFEM/95MKJVQ
+5eln0pbDxtUeZbC1yNv8IU56J5nUGh7gqG5m7bDvrgssXxcuwdStEwuYft+2JJyM
+Li7qyTK+YyY34CCExfBQ++k4jkDJsFr4Ee7xk8OVD6o7nATvpf3M9mkUwryyIdqA
++B7fhGSrGHuCWuu6O/KT502GBazu1kadF7jfO/XXZxfEtl/zQdeWfdf9sY2+VPOU
++5C41XARijcE+Y7p6IafKx8MlUxU+ulUygOXiOcucV/dfcXt7tkaTxAKF3T6Nd0x
+8/Ku9tOM2kVAP8b8HYwIOW7mLdvrbKOVNA61sdFY5axbD+JXP2pufiZ+pgJL36FF
+SDQIW5M3aH7CSa1i3i4MP49jWomhTNwseVrXsDuGCKVqgIR5LZwpS4VOHLAILkCh
+cIEDnoMS9YPuQdENIIxKyZGGHaeJ+LRb4w+szvtmu55Kp+N7AubPfoypPrx7a8LN
+8/0/w731DS6nTICYXXzzGoB3cefb3nsBNaH1+edffPTZOYlFZ9ElFjIs/xvWCSy4
+qYwQ1cW4DslIiVD62wm8Df2yr/5J6znfU01RXQ4GWfmDNFBdYsQO/8JEy6UZEvCy
+tFZ1gseD9K69O4XZSEKRKIvv8+1Y/CwD0ppIOYCIycTKn87GXFmsjbuj8tghmHp4
+TUi3EUvrw8mQMi5QBa5BAoIBAQD8JzdNy4ietoT8UUWqBT+ZSURPWeQN1esbncYU
+b9viBIznnjjFFr5JdYa5k3rxM+bTRq47NRt+r0HOvyJWUFJcI6tbgmGtW+rmM2kB
+hq6ekTJleLz+/cjNSjWD14avNORPz/ozZMlcz52NEl31pdniuDbueeNgyh+CkJtH
+BS8s8mMVZ+3NtafZ1ilGn/RP+n21C1J8Kcxd/1srtfcpybzAQiSYul2DlKVPGvqO
+XpLyt42/cyc7a3MyXtms2XhJ62fDK24Qptp6KJNTzqdtY+KP/iOW0SUgxf+JpC87
+W2NJW7tqyyaebn7KO1lGs9y03KzwaLZvy2RaBfjQnxS8uXzpAoIBAQDQI8QHNtr5
+nHYSzLZJMhJkP641wQWo4ODfkWxtEMqTyOXrVw3L8HMdA03Nmf9jnCv5awYYA3j0
+PmSL3PdM36d3VsAyyxMBN4HrH2Z94oTnoKmDfXjB3prhPYgO6aosSvE8rw1N055o
+757p9vAA5w9apBBLNdcm3cjUm2ZKeocL4wnFjOW63CtcFEouE4R7C32rauEu9Bdg
+dAXciBmOrHtihJUQrpMfyfN2fVSLbO4SoFy7ZHq5YKFk4MzNIp/cENwRIqdcLvOz
+o++RSbwptRtkd/HZCFSh/4gEPRLe/k5gGErS9ZqpeSMfV++IdBMqC0Sx3UpyXuue
+FOhIvnLpJlzBAoIBAGjcDh2mBLyr/oXHbocUA6zFUUkGgtZWHZ2wcQ1Sr0hAyDAS
+Fl2v5ZY677oA4OGpydYW0KICpdp7G4zU43ytjnKOytYVVHV5gigVPRfLYJbEnwaf
+vUj1VSo6MCMR4ArAnimqvcvdn/eex1BBUR20yPWF0iI+QhagN5ZeeJSCTWoNqrLe
+M4CWiKUIcMXUAw+3hctiV/0WjMySQuHcnFqecIYre3igF/9+M3jAKW5HWijhuGrj
+gm8tcgyCcVd2YJWs9cuuJel62eRvN0Vk7S+KmE91SmuPsjb84BXnV1UB3jpFkZ0J
+upesL8H+CFRku+Xi13Bqu2OmW6csUJrBbShGovECggEBAKGk9SupJXyvT1+gTn0f
+/vqOHiyvAEc8hkf6t5sobDtDzZPs4tEcpznEBBuF2rqwYdJtlKj3oWsGPa4FaKXy
+GCvtWozX+6V5R1Oj6kQftJnyw1NUEYF28Q+2asEyJTAK77jyNkHX9HGIjwEi/xek
+Wt9JBUJzyOjtW3gKS/HRoKnRpBghKZTqQl5bf5SzIbMxpGKJOeLuPG1zDc5MgJS2
+TYigcOgovCf2/jZqdUtmyKn8kqgSC+GGMzGWCFfT6RTOnypLoHBOIoPD8F0ER7aY
+aXKoWFH2T0wUmLy59brrA1FL7GhTx86QPn+sGmH9y5hecfY0ZwnVv+TgVdmQ1stN
+OMECggEBAOXDX319Dmo0ydAPYyngK4/slOetGaJmz8looU8a2R2+Ko/VMTZDmJhf
+P0vS74g3U7sukRjmYzUY1mPj27CDURvk1ENam9KPOQ59ws/TaHaJ7tobjUXVQ93/
+OREkrlCuqbEqJJzQ01mCWIbmDnGvJwD87rW6YwmI9Rs+kjZxNLj+IW4CqpY36q9A
+HwaUZLXc2q0W1CqLmFYF5HotvSFIAYHWuClEmM2NI9+0VItarBz6AwCnVXwKbJLC
+irXlllX+63uloTDR5W1ymy2hTUrhE1jgh9DR4106QSVDiEWqme/BAWmUoyuN/zms
+v3/WVVAXEcIowL3T4jzJ0RLdf1qE8Bc=
 -----END PRIVATE KEY-----
diff --git a/tests/assets/client-certificates/client/trusted/cert-legacy.pfx b/tests/assets/client-certificates/client/trusted/cert-legacy.pfx
new file mode 100644
index 0000000000000..9f06aa35c82f0
Binary files /dev/null and b/tests/assets/client-certificates/client/trusted/cert-legacy.pfx differ
diff --git a/tests/assets/client-certificates/client/trusted/cert.pem b/tests/assets/client-certificates/client/trusted/cert.pem
index 76d1e1a54310e..3430d063c71a3 100644
--- a/tests/assets/client-certificates/client/trusted/cert.pem
+++ b/tests/assets/client-certificates/client/trusted/cert.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
 MIIFAzCCAuugAwIBAgIBATANBgkqhkiG9w0BAQsFADA2MRIwEAYDVQQDDAlsb2Nh
-bGhvc3QxIDAeBgNVBAoMF0NsaWVudCBDZXJ0aWZpY2F0ZSBEZW1vMB4XDTI0MDcx
-OTEyNDczN1oXDTI1MDcxOTEyNDczN1owEDEOMAwGA1UEAwwFQWxpY2UwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCac3+4rNmH4/N1s4HqR2X168tgS/aA
-6sHW5at8mWRnq54Nm11RvnK55jHQYVAdBgJy5M07w0wakp8inxzlY95wqxBimYG6
-3Un/1p7mX9FkB4LNISCc6j/s/Ufv85MXPbn0S5rm9UcQO9cINJb1RP1YgDDLN5cx
-Mz6X4nyofN8H6Lhvh4JDdBw4DfDEFERkVfF+bkZ7YW4XHEChgzm3RxCF0eeGzIXG
-rkkK9AsSdJAhOvTlHPFCQKXTYZhsL5+3Ma4RnWnDWvLTHx6KzoU+twTM2mYhhQuQ
-gQpnmDHxGge8kGeHGtfdgAjtVJTE57xF/shP0JU+tuIV8NNhQ/vEmhL0Wa093/Ev
-pTVp0EUEuDh9ORRH5K5M4bKJyU4XX5noiht6yOn00uaoJcWduUAWsU+cDSvDTMw8
-1opWWm0QIAV3G2yuRSkumHAKqvQLeyeyiKz+OEhyEiZ7EZNExPD0TSpApSTU6aCT
-UAvPYGQ59VjsMHTuJ9r4wKIYaDvfL+t72vg2vTQma5cTOBJfIdxH9blFTjEnToH3
-LX8t0XndQ2RkiRnIze2p2jUShxo/lWCjCw+2Iaw0A0fNUK1BbOrFRPq1u7AnEuMJ
-t7HF50MloItM97R9vofDwgDIzlX/PzlVRcn1WCo8Fr/0EXxPPreX0YDIp1ANQ8fS
-v7bKb2vQIxWuCQIDAQABo0IwQDAdBgNVHQ4EFgQUVJVRJJ2k/Z4r0M1AXe6agyD4
-uCwwHwYDVR0jBBgwFoAUEHtrxWCk96Ehr60E0HBuwLk2i+IwDQYJKoZIhvcNAQEL
-BQADggIBAGEvSkxhxRKmlvKG8wCXop2OaUUAOG16+T96vd+aFYaJNlfGoPvqv4Lw
-qaHztVktnRrJ//fpNWOsdxkE1uPU4uyGjl2KbyH81JvkE6A3OX0P4B01n8lcimY2
-j3oje6KjORUouYVsypD1VcwfWJgsE3U2Txv5srD8BoemVWgWbWjfyim4kk8C5zlf
-tWEazVAaI4MWecqtU4P5gIEomCI7MG9ebxYp5oQhRxeOndOYdUbSzAkZj50gXFA1
-+TNkvuhTFlJF0F7qIFVJSJTmJ+6E5B4ddbkyUYwbOdO+P8mz5N5mSljE+EiIQTxo
-AwbG8cSivMy/jI3h048tCUONAJzcSWCF4k1r9Qr6xbyW2ud2GmKiFCEYJkYTsMWV
-fM/RujTHlGvJ2+bQK5HiNyW0tO9znW9kaoxolu1YBvTh2492v3agK7nALyGGgdo1
-/nN/ikgkQiyaCpZwFeooJv1YFU5aDhR9RjIIJ9UbJ8FdAv8Xd00E3viunLTvqqXK
-RVMokw+tFQTEzjKofKWYArPDjB9LUbN+vQbumKalis3+NlJ3WolYPrCg55tqt1o3
-zXi+xv7120cJFouilRFwrafNFV6F+pRMkMmiWopMnoVJPVXcoqyJRcsmO62uslhg
-BLFgAH4H/14drYrgWIMz0no78RInEz0z507zwLkWk5d9W9pJ/4Rf
+bGhvc3QxIDAeBgNVBAoMF0NsaWVudCBDZXJ0aWZpY2F0ZSBEZW1vMB4XDTI1MDcy
+MTE1NTYxOFoXDTM1MDcxOTE1NTYxOFowEDEOMAwGA1UEAwwFQWxpY2UwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC4ggn74iAHLgOWOiOvB2CPe+Hr7W6S
+TYJLZOoqPdh7mv7QGm8cYxfD+26p13aEaW4/qn45losWdEPPy2ZiVIF+kcOP0R4A
+qsB0w9UHT4WSzCWtDqs8ywDMJ6tHge0++8S1bTpdutn/m8DPnKtkD9RQUzLFmGDO
++mB08Xu+egTzJvURbHXRJ27E+CXUXLEHbAJd8EKjJiQYXhcj4lzUXOUg+xkpPAGe
+1dgQ6BDkv3xq/81S9NTIT5YriHEm6egi9AFJLZbbZtCpRQm1MDMq7zfD7oL6ECLG
+rJ/aaxLEM49gMdw2SscYHotVxX2OMAKgN/ytB18L/mIQ4pOWp3HJQ+nks9Zu1V8c
+g7Pz5pWwjqoncbyUaBi3vGsitAot3cyLXbN9hH8zQB8QqGyNLvqQnCJOBlYxOPA8
+M8NQGDThWKspcix0LhkmnYsWWt3+KEGEpFRcJCEthm/DAd1GImP7/dg1/btT/zOs
+IIkIoCyBwznuR4M4XoNTbIBsiTnO/6PjOdTrjLVX7vMueTjdbCgK3VeOuwetbZ7a
+Z/hvMJCjJ4wuM3l2ZyfEQlP4gJLJS3Fw2PRsySZJl9JyEzwTqYVosDF5SF8uw0HI
+cFaliZCqBbgYfOiQzjIX/GiHZdor1ZrhAbO/MpSxuxGzxF7Em4n+4p816NnC9S2J
+bHRetkM9P1adHwIDAQABo0IwQDAdBgNVHQ4EFgQUXhGloOgfXb0tY7HZZGil/d11
+bcwwHwYDVR0jBBgwFoAU8doR+Mmgh+1KQdNvybCZ7bsu2J8wDQYJKoZIhvcNAQEL
+BQADggIBADNVu8YodDjB0474ztGSjV8WO0x984WQpGG6VPIt9xnnswNM8aOZVMNC
+AS12BjgviutSBUbL40xYNlytnqP0KtlgZSNpPVTGMAOoGttbgV7w46+hyBgV4hYs
+PsYrxMU1/4hTW/aGnNXpWJ4VwOESknSqUudzfy1mNVaEuPoL97SCvPrlKPU6El1a
+Wmove/QTKsbsjWaahqE59uClQ6CBcWbxpN5CLyIVM4c/UrsoXdwRewgXl19YFRzR
+l6LXBPid4UPQqdE6XIxgsNpoTDwAyxSRMPydlulJD5sSTaXHB7h63DsT9mEydjR3
+jPjhNZL5ADtDes3/UhfpXDbb8MudXdbdsHNswEl5ewAOdRXAuoaJuQ2TOnhz+cO0
+oaq9X3YaWjl8SwdvZrLIHLG3jEAQYEXDR+dEtT6vs7HmReMrYhGGoCEVrjSZAaeO
+9bQoSe0m8xbuSV19e5A+LZv3bcPcVOe91x/wnjVb98KRQcSQXCBE3yT5Oav/OLKZ
+TrdRkKe1yyPMHJiicn3pffdXuG6mIJC8HgYhvJEX/wkWf1BiyRd44dD1cgI1Ttt1
+pQoapJCmjA0XHtr15o4TW6hmnrmOOYTOVCCug8h1bWscBedMgdR5Qm+umbUiuC3N
+N6mxD49Sc40NCeDboX87rDiObhOXAAFsiE9o39z/tPToVa3TsJsA
 -----END CERTIFICATE-----
diff --git a/tests/assets/client-certificates/client/trusted/cert.pfx b/tests/assets/client-certificates/client/trusted/cert.pfx
new file mode 100644
index 0000000000000..391dea7b8a311
Binary files /dev/null and b/tests/assets/client-certificates/client/trusted/cert.pfx differ
diff --git a/tests/assets/client-certificates/client/trusted/csr.pem b/tests/assets/client-certificates/client/trusted/csr.pem
index 8ead6da3d1c78..fc930ea7cd1bd 100644
--- a/tests/assets/client-certificates/client/trusted/csr.pem
+++ b/tests/assets/client-certificates/client/trusted/csr.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIEVTCCAj0CAQAwEDEOMAwGA1UEAwwFQWxpY2UwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCac3+4rNmH4/N1s4HqR2X168tgS/aA6sHW5at8mWRnq54N
-m11RvnK55jHQYVAdBgJy5M07w0wakp8inxzlY95wqxBimYG63Un/1p7mX9FkB4LN
-ISCc6j/s/Ufv85MXPbn0S5rm9UcQO9cINJb1RP1YgDDLN5cxMz6X4nyofN8H6Lhv
-h4JDdBw4DfDEFERkVfF+bkZ7YW4XHEChgzm3RxCF0eeGzIXGrkkK9AsSdJAhOvTl
-HPFCQKXTYZhsL5+3Ma4RnWnDWvLTHx6KzoU+twTM2mYhhQuQgQpnmDHxGge8kGeH
-GtfdgAjtVJTE57xF/shP0JU+tuIV8NNhQ/vEmhL0Wa093/EvpTVp0EUEuDh9ORRH
-5K5M4bKJyU4XX5noiht6yOn00uaoJcWduUAWsU+cDSvDTMw81opWWm0QIAV3G2yu
-RSkumHAKqvQLeyeyiKz+OEhyEiZ7EZNExPD0TSpApSTU6aCTUAvPYGQ59VjsMHTu
-J9r4wKIYaDvfL+t72vg2vTQma5cTOBJfIdxH9blFTjEnToH3LX8t0XndQ2RkiRnI
-ze2p2jUShxo/lWCjCw+2Iaw0A0fNUK1BbOrFRPq1u7AnEuMJt7HF50MloItM97R9
-vofDwgDIzlX/PzlVRcn1WCo8Fr/0EXxPPreX0YDIp1ANQ8fSv7bKb2vQIxWuCQID
-AQABoAAwDQYJKoZIhvcNAQELBQADggIBAGgf3EC8WL3RGmuGA+d/4wd1jNfrfU6n
-xjnDwdEEX0TQZGGPjh5xvoCK76yZPkO6+z0IYSepEmWBS27HJKl7nuoOvS7MjQyJ
-C+3Bdk3ToCeQjmNBlRBKsUw5ftTU902oMl5BptHGj1KGjYBLAkPdXb44wXSVKJ8q
-ihFhWlovsva6GDoUorksU3vOwijdlGzTANQHJGFncgrRud9ATavpGS3KVxR73R3A
-aBbu3Qw+QIfu8Qx5eBJp8CbMrpAmjfuq17STvqr5bC10Fnn4NegrnHOQG9JcK02+
-5Bn3+9X/n1mue7aohIdErLEiDMSqMOwFfrJeaH6YM1G4QkWyqGugtmHsWOUf0nlU
-nkH1krvfw9rb6b+03c4A6GSeHnbX5ufFDSf5gaR6Wy7c0jBnoxVbtBLH2zXlrd0k
-iRQG7C6XZzGMS7hb7GL7+bkRy9kWjmDL7z7Fp+EgzKhNmzuWII3E9X9va33HoQ/Q
-UdK3JVToxRQg6XRKOxL9+U/+8i6U8lxObLWkWh2cypZqbz5qJxa+2u5JYO/KEoHZ
-G963UX7XWezR98vZuTc1XHGZtBDMrjjDd7Kmb4/i/xBPeWwseeGtzFy9z2pnEnkL
-uKE4C8wUNpzUUlsn4LneZXObIoErE7FqAAlVFujVe7iaJBmXoUXZR36drbfiaODK
-vwAGyrYHaOlR
+A4ICDwAwggIKAoICAQC4ggn74iAHLgOWOiOvB2CPe+Hr7W6STYJLZOoqPdh7mv7Q
+Gm8cYxfD+26p13aEaW4/qn45losWdEPPy2ZiVIF+kcOP0R4AqsB0w9UHT4WSzCWt
+Dqs8ywDMJ6tHge0++8S1bTpdutn/m8DPnKtkD9RQUzLFmGDO+mB08Xu+egTzJvUR
+bHXRJ27E+CXUXLEHbAJd8EKjJiQYXhcj4lzUXOUg+xkpPAGe1dgQ6BDkv3xq/81S
+9NTIT5YriHEm6egi9AFJLZbbZtCpRQm1MDMq7zfD7oL6ECLGrJ/aaxLEM49gMdw2
+SscYHotVxX2OMAKgN/ytB18L/mIQ4pOWp3HJQ+nks9Zu1V8cg7Pz5pWwjqoncbyU
+aBi3vGsitAot3cyLXbN9hH8zQB8QqGyNLvqQnCJOBlYxOPA8M8NQGDThWKspcix0
+LhkmnYsWWt3+KEGEpFRcJCEthm/DAd1GImP7/dg1/btT/zOsIIkIoCyBwznuR4M4
+XoNTbIBsiTnO/6PjOdTrjLVX7vMueTjdbCgK3VeOuwetbZ7aZ/hvMJCjJ4wuM3l2
+ZyfEQlP4gJLJS3Fw2PRsySZJl9JyEzwTqYVosDF5SF8uw0HIcFaliZCqBbgYfOiQ
+zjIX/GiHZdor1ZrhAbO/MpSxuxGzxF7Em4n+4p816NnC9S2JbHRetkM9P1adHwID
+AQABoAAwDQYJKoZIhvcNAQELBQADggIBACpScaAoLAs9DuTcI5Y4dbHf7LwF4Zxx
+UgPNzE1HB1Pr6NaHRiOWrlCtDEB5UwHrr0oZuRTqSEGg3Pe5Z2QtPG/sdFgfm4BP
+29o6qo0CXiEVBwU7/K0/lL2/0a7uSbD0Tkw9d6Bgik7/Z5rzXZIi2vtUcrOtHskP
+C+Z9w3vH9a+RnUeo52mCnRi4SaiSEnD5jvhmgaI9iF+k5pYBiMrKRj5W/F1QCkf4
+7OuSK97xN0eG/I4Oxgzi/qt51ySCYZbqoh7dIpwi/a4UsK8kdzDDI1M3J7bU07cO
+CJRfr0EETqCQw/gAKoag3tRFNvWQB6Z9G3Ev5jeaCLpcc32NlpN5xH3VW8A0Zb81
+dn5BXkPSxjwJaD0a3cLFkfgrasoe7ZMmHrVpQDw+9USuGCYXMPzNZLEeTFbrRkUn
+sqi30e28E1H69zVWj+OKzCWEH/azVlfaoVbwM+njUJDe5V09KvFtI7aZYmvLxbUX
+4ifoRUVoKedyKnueVmoIG57lF2VzeEhX5YjCngxIg+YuE99HkMQAZSlS6uJcVM92
+tsC/+pYECBk8ukenbxmKXROl3u4p2M1iCSL/8EOVROuyjnuzCXJZOpNptdpX4ZgL
+kHP1erq7/U8ZU8HviUsfMoisagx8dA8uj/4fk0jfNxOJqlZL9eJhpgBfYHqmAz3h
+m+PQVw96eeoK
 -----END CERTIFICATE REQUEST-----
diff --git a/tests/assets/client-certificates/client/trusted/key.pem b/tests/assets/client-certificates/client/trusted/key.pem
index d60201e5a1e94..a11cdc8a7cc76 100644
--- a/tests/assets/client-certificates/client/trusted/key.pem
+++ b/tests/assets/client-certificates/client/trusted/key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJRAIBADANBgkqhkiG9w0BAQEFAASCCS4wggkqAgEAAoICAQCac3+4rNmH4/N1
-s4HqR2X168tgS/aA6sHW5at8mWRnq54Nm11RvnK55jHQYVAdBgJy5M07w0wakp8i
-nxzlY95wqxBimYG63Un/1p7mX9FkB4LNISCc6j/s/Ufv85MXPbn0S5rm9UcQO9cI
-NJb1RP1YgDDLN5cxMz6X4nyofN8H6Lhvh4JDdBw4DfDEFERkVfF+bkZ7YW4XHECh
-gzm3RxCF0eeGzIXGrkkK9AsSdJAhOvTlHPFCQKXTYZhsL5+3Ma4RnWnDWvLTHx6K
-zoU+twTM2mYhhQuQgQpnmDHxGge8kGeHGtfdgAjtVJTE57xF/shP0JU+tuIV8NNh
-Q/vEmhL0Wa093/EvpTVp0EUEuDh9ORRH5K5M4bKJyU4XX5noiht6yOn00uaoJcWd
-uUAWsU+cDSvDTMw81opWWm0QIAV3G2yuRSkumHAKqvQLeyeyiKz+OEhyEiZ7EZNE
-xPD0TSpApSTU6aCTUAvPYGQ59VjsMHTuJ9r4wKIYaDvfL+t72vg2vTQma5cTOBJf
-IdxH9blFTjEnToH3LX8t0XndQ2RkiRnIze2p2jUShxo/lWCjCw+2Iaw0A0fNUK1B
-bOrFRPq1u7AnEuMJt7HF50MloItM97R9vofDwgDIzlX/PzlVRcn1WCo8Fr/0EXxP
-PreX0YDIp1ANQ8fSv7bKb2vQIxWuCQIDAQABAoICAAyXg/8rYGS6ydt7sgjGn2Jo
-QeFs8ADcoscBXHTBELV/AVi8pOQIMdREFyWU+XIUTljNnInVxzuXXo/1BucQuE7Z
-M3HGcBQq/GB2P+gqQaj1D83neIAyfNm2YIoIgqJvbtyi2VMhBhUlu8c4emIuqLTx
-Zoj61EG3ms/JMD6QR6Keb4LwOkeDjNVpFYr22AiSFSkolmhyrgYGUKKaTzdI/Ojc
-DxMnU3S6OsxAzzJG/IUpCFQxgt3S5XIRT9rqGwxVaYqYGcpKfOeHbvcEFUriouqM
-l6z96s5yJsYBW3j7lUvjPf1+y8CMMq4eqi5PckMGnZAcQj6lrFL7mlAgucLyiL7w
-o30seXvzoEQXlHxi/tnoZMWaBbntA6TV8t0ap7TMADPPSrXhXt+GIQt6tDTdYd8y
-9VxGAQA0s6FhdURVp0zYtTGrsFTLyHZjC0TFxsvOdRrQL3XbsQxPUCH86Z3hQt9d
-drgxPDJJo/4UUYOX7MAyE3H7zW7qSQ8tNSXPHewff0ItpcrUvBxa8cD95DGB3kws
-0Ns1ulGqOLMPZM3/MUYlDk0PEK1ClBqC1B78mkMpJe5qTYBaFg7S540X4E5Nrq5V
-5VK4QTsBGm9Xks4///psGwmstCVZAZDCyMbW3NOFtzOxsVqi027xknl7UEtfwNFf
-c8tp0CaxZhW8/YTXUtnxAoIBAQDSR/Ux4tfDp84Tyf5N8JaxY1iYA1sor4SQnoSE
-r0/J2UXQpZjNpCT/fOjBT19jJCWQUxUf3M6PE0i40VMcJgtQE9alTTz3iCCUokv+
-IcVxrS+7rdvQGPItoIIZDSKGlAJHoIsMnqGAHpks588ptgPC/FEiNX2nae2CrGRS
-jVcPOLA+St6qGEwPyaSKXjERwSQ9bHLIuKbMDs2+YpPOSp9iLKaW11UQYxF3Uxti
-pVRq5bbqlKFOxxp4PaTZRusWpdWJ1kmpmEpZg6PiUQVeOoOy+hCbLq3KW1aaTc3x
-UcYrbA2hW5vP0u4x4QNPayd8MNEsGHBClObOtD64Vz3lsMFdAoIBAQC8CBoP6Tzy
-1uGNmAOc9ipQwAcTAzPnOH+ouKBwB/5ji/RPrwGCOqjbapmriKtYxW2JOqbTzbze
-+WvGwgfoPo16FZocDMrD90lQdFmfcgnHFZgXZe2k8zr3YTvXdkCCRkthrl9tKN94
-IuNL5K4wMIiPy08B7+dMxnKP4E8C8czzcyrXpdfy/gfu7UQGETYswjmLL1vOr1OE
-WaalbJn/5GDzKKLkcx+Xr4zgHzbyCXb/K+LvawGk0MQMTtbRkphNC2yNejNjQd8F
-wmccFK4LG9JqdjVhKiDiYIKe5ocWDcZ28sBuKyFxOthOywP6tnALIjQgXamsLIZj
-GhCG3g3dAfidAoIBAQDQM7EhgKHztl1DmLczgmgiIORiNsh2gzp1Wo6JNW+Bwp/u
-k1e1HLYJRSrL5APlDLAosypyTtUyMnzJiXCJqV2AHvRi3RPlXqIrqHonmFZ/VGOz
-ptPCukBnTsohdbDeoQOU2e9zQklTqngtTyP9/5q/38WRYncUYLxqqrf2SL2Pc6iF
-NOo8biw5YYSJ//MDykFQk+Ueuj1kQ7AQtlf0ZExlDyKurWwq+nwbsmymAl6QLPws
-TZddgaPCs/5Zp28zEGVawZJT2labRMzqUyBGiRdHCXORwukON9uKkki7jCTzb1wb
-jLG8VvPC7TCy3LzOqSMiTtwwAHB671o+eRrvJlB9AoIBAQCb2J85Vtj0cZPLFxbP
-jtytxytV386yM4rjnfskQAviGErrjKLUfKgeDHHH0eQrFJ/gIOPLI3gK23Iv7/w7
-yzTZ3nO4EgYxfJGghH8P/6YJA2Xm5s2cbRkPluDRiaqYD4lFMhDX2gu2eDwqWCTj
-viZCAIHAmkX8xXKIu6LhTubPVUJKMKQXO+P5bWB3IubjHCwzp5IRchHn3aKY87WE
-eZa9k43HiX/C6nb6AAU7gQrHHmnehLN9FqeXh/TXCQkAuppDfOiAuUUPcfyiMqW6
-gVnacZV2rkNJPjKlX27RoaNATZ2e8lKqldpZHD11HKcrIzNPLDKIiPLtytmt3vhg
-mNSlAoIBAQDMN3FoQfV+Tlky5xt87ImsajdIhf7JI35hq6Zb4+vwR7/vofbzoomS
-+fuivH1+1skQIuEn41G4uwZps9NPRm5sWrjOo869DYPn5Nm8qTGqv/GD28OQQClB
-3/vcwrn5limm3pbQg+z+67fFmorSyLHcZ+ky60lWeE9uXCsVjt7eH6B+Rhs9Jafg
-MbWRZ1C3Gezb1J42XVZ8hczn6r+qmWFTbSY4RzNBqd83motWXIgtybJIV4LB4t06
-JkVNCotSicw0vtZk95AfjQksemAq2fFzJfASxtw8IE/WHW4jtvfZ9PPWDt9U83ll
-Y+eu85cike5J4vnz8uG04yt7rXjIrUav
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC4ggn74iAHLgOW
+OiOvB2CPe+Hr7W6STYJLZOoqPdh7mv7QGm8cYxfD+26p13aEaW4/qn45losWdEPP
+y2ZiVIF+kcOP0R4AqsB0w9UHT4WSzCWtDqs8ywDMJ6tHge0++8S1bTpdutn/m8DP
+nKtkD9RQUzLFmGDO+mB08Xu+egTzJvURbHXRJ27E+CXUXLEHbAJd8EKjJiQYXhcj
+4lzUXOUg+xkpPAGe1dgQ6BDkv3xq/81S9NTIT5YriHEm6egi9AFJLZbbZtCpRQm1
+MDMq7zfD7oL6ECLGrJ/aaxLEM49gMdw2SscYHotVxX2OMAKgN/ytB18L/mIQ4pOW
+p3HJQ+nks9Zu1V8cg7Pz5pWwjqoncbyUaBi3vGsitAot3cyLXbN9hH8zQB8QqGyN
+LvqQnCJOBlYxOPA8M8NQGDThWKspcix0LhkmnYsWWt3+KEGEpFRcJCEthm/DAd1G
+ImP7/dg1/btT/zOsIIkIoCyBwznuR4M4XoNTbIBsiTnO/6PjOdTrjLVX7vMueTjd
+bCgK3VeOuwetbZ7aZ/hvMJCjJ4wuM3l2ZyfEQlP4gJLJS3Fw2PRsySZJl9JyEzwT
+qYVosDF5SF8uw0HIcFaliZCqBbgYfOiQzjIX/GiHZdor1ZrhAbO/MpSxuxGzxF7E
+m4n+4p816NnC9S2JbHRetkM9P1adHwIDAQABAoICACBW8qcKoHCBuTE4qY6BLYSY
+wyWWLT5JhZ/vZTfYNTydEzKon3cLS1wXkvMECAr3a9KO8KbpYyGhaU1fqmdrxnLH
+2842ahrV0vvkY09vucrcK3Jk0tDKCC7AeT4EYPAcMwNVzNgm6xTpWOdK36OfPqiB
+nLGTnsxIiGWW+giN3JY96tCOASySy9CMah0JziGt5dBPT27HPaZjv4yTnY+/ZI3e
+VS+sC+CqPL/h3SwrAATFJ1j1/uHJSVoCBUs7zmtp91u7OOjl4Yb5ydTPSPiqi0y1
+XpG0CFRoZ3BiOhzXqLbEpoOBodnxaJy1C+fDNIKerZQqaZdxlAC/pfzPBpuvYqxe
+RRPV85+AXZ5nosSoqjPprKDfDrLfwnEAJIXtZjDQvJ1mA49Tbtx30rzk3u36BU7v
+4JXBTcCiaxhPw4MlPzCYKXXL8B02m8vC/RYZO29YHytERbAAMd4uUfGU0lOKWi6W
+CEHXYTjbqSDuytpuxT9InLVxEC+u+h9CxAi3FpawLmu5ELW5qA5yMHRoyYOCKUDO
+EsjV/qDSo6T1kkYZ0qj4Ya9DeVWgMRekn9TWZmzeYMzDnZtAp1OscmcETFH28xo0
+iuxQiStWEZaGdxD5njF+0GHtlECxMmPx03IH9bCxt6GU1aFCdfvhzqtovze4OCI2
+SJOxeJRAoom/LcCBQgCBAoIBAQDZygQguNUxwkaEpwsUhAstwse9SwY2fisNQTbU
+Lj1rbvCDlOADrthIBsb9jpsUyqow9UbeB+mq13xrFz7BfmQ0Bf2+3P8mV0IxwmvE
+mg8Wbi8pkYoet4yzSc2f8yHCvAsejFFWNU7/7JB0gpeRxXJTjdgoTiLEop5cus8r
+SmBzCphzOMM8iUV/ByOgIAEOU3bo2GuSRbEEJ0kA1bd/l12uT7tApT+0umo/OPRR
+yYEIexuIa7fean7ZHf31GbQdJm9vgoi+ar0mZg9yHSiqlOnghWVheEeNVGH+XgFt
+4qQkbTW8Ie0Am88uT+3fbxIZHbJ4GkPnKwc+klN5p2efxmlfAoIBAQDY4TOoj2zf
+Uvu8E1KboCiGjfHvvm3UhYVVUVqoctHQihSOQSThmKCGv025K4iSvxfC77XfuJv8
+ZC14TT176VvSZVrV4vZDod572/co5WyEGqaVfqwqjBmCWAODT+IgmIZrDfDRLIkC
+4cQObd8DkzzdP8msqp731UlrEZvOkh9XW4rwBmFXeBqgDKDgM7Zge4Clu6lWABxT
+BnGv00OjqRGd6IH1+tDTm0w0qNkXzZ3UDAuwVEHBjMJnPr7t9LEi5e3AluspjoF9
+Ie/KtQQ6D6guYtdRZismg3CGlnGwcf/yjS1YEVTqyybY52M9N3aHDVlPesn1BWO7
+UKQgHbPQq6RBAoIBAQCQv+n6bZ6VEdCYvgVpP1HGulzS/RhGA5lNl/h/EbSUwQlu
+CvbQu9bYGFkNkUiVixWOsJbHX274s3voGW0GYaDryseZoXyb2QcP126VHufEOrtx
+319zhv8m8niORKQ9r4mcZhpxN8En6+0e4uUmZ5rS2cW/FB+bnZGvhCHJXge4rmQg
+wKtSgtID2ZTeCidphCPWInFsqJE8d3fX7DOnw8zp2+hS0QIEdpnDJ3GLImh2YIwu
+IZn1Y8anO33c95Z0gWUzMgj8tii9arv9Vk//ADZpmX+GRtEXp+vxij1c8XOzGjrK
+ram969DJsSoihMn8k3ZYyOw0qq6H8e01QARpdw/1AoIBAE/9Bxt1And/WJ7uFXqW
+YDv4IDIG7uUB9cIYxjH4Xw/lzV0GA788ln/8EINp3e4Zkn7wAAkqQkWdAPQssK+B
+yr7XaOAX3DHngnH2F7s6moJCfgwG8yKiF0pugaUtkj3pYzIaqyXKoiGw+KlFtonQ
+BROo0g3fw8+uF2zoyqkuVWbXuW97Ou2Su2cqIS9vgyUkh7cYdoTkd43bg5SQe5Lh
+6UBvH3eEcP6KeVm2qJLR4BLz+l+nQ7VJ3+1KRArpQ2eWm9B7GPJzv6hSGumNR6jO
+W334MGeyIdoLgjXxSK8F7JsdnIqtob8S/BnlhUFvskRvFPBuXgwDV9wfCtlZexdM
+JsECggEAJy5r3YTLiNFqXiwIyZ+GFQYlyhYAH75tP6yaF5Sr6FaDDaGTQxtMgp+V
+UAOZIOHQAWpjQtgnjJAYLyDgkhVWJqQILBC3V1GHj6Kr+3avyV4cGuqP7wxsS2kt
+vUY9emtg0dil/8l6IL3DzjXhRI8+00FZSvcueQYVgv+fv1zPx3T/RuUp8x4E0lq1
+YmlLjgi1EznRu1YW1IczsGwBQDpghKnf2E0tUn9wUr1Kb8k0uOVdzUZETvJjWYeD
++GwoR5lW/BhSIwE4zeK66RY18n7GOIS7y7Yvn4onr3j3geqIKAEjQrlBkQlPkhfd
+21eLmxOuln98Q3na7ftpAWQdyjcE6Q==
 -----END PRIVATE KEY-----
diff --git a/tests/assets/client-certificates/generate.sh b/tests/assets/client-certificates/generate.sh
new file mode 100755
index 0000000000000..98f858f4f4376
--- /dev/null
+++ b/tests/assets/client-certificates/generate.sh
@@ -0,0 +1,86 @@
+# Client Certificate test-certificates
+
+cd "$(dirname "$0")"
+
+## Server
+
+openssl req \
+	-x509 \
+	-newkey rsa:4096 \
+	-keyout server/server_key.pem \
+	-out server/server_cert.pem \
+	-nodes \
+	-days 3650 \
+	-subj "/CN=localhost/O=Client\ Certificate\ Demo" \
+	-addext "subjectAltName=DNS:localhost,DNS:local.playwright"
+
+## Trusted client-certificate (server signed/valid)
+
+mkdir -p client/trusted
+# generate server-signed (valid) certificate
+openssl req \
+	-newkey rsa:4096 \
+	-keyout client/trusted/key.pem \
+	-out client/trusted/csr.pem \
+	-nodes \
+	-days 3650 \
+	-subj "/CN=Alice"
+
+# sign with server_cert.pem
+openssl x509 \
+	-req \
+	-in client/trusted/csr.pem \
+	-CA server/server_cert.pem \
+	-CAkey server/server_key.pem \
+	-out client/trusted/cert.pem \
+	-set_serial 01 \
+	-days 3650
+# create pfx
+openssl pkcs12 -export -out client/trusted/cert.pfx -inkey client/trusted/key.pem -in client/trusted/cert.pem -passout pass:secure
+
+## Trusted certificate for localhost (server signed/valid)
+
+mkdir -p client/localhost
+
+# generate server-signed (valid) certificate
+openssl req \
+	-newkey rsa:4096 \
+	-keyout client/localhost/localhost.key \
+	-out client/localhost/localhost.csr \
+	-nodes \
+	-days 3650 \
+	-subj "/CN=localhost" \
+  -addext "subjectAltName=DNS:localhost,DNS:127.0.0.1"
+
+# put extensions
+echo "subjectAltName=DNS:localhost,DNS:127.0.0.1" > client/localhost/localhost.ext
+
+# sign with server_cert.pem
+openssl x509 \
+	-req \
+	-in client/localhost/localhost.csr \
+	-CA server/server_cert.pem \
+	-CAkey server/server_key.pem \
+	-set_serial 01 \
+	-out client/localhost/localhost.pem \
+	-days 3650 \
+  -extfile client/localhost/localhost.ext
+
+## Self-signed certificate (invalid)
+
+mkdir -p client/self-signed
+openssl req \
+	-newkey rsa:4096 \
+	-keyout client/self-signed/key.pem \
+	-out client/self-signed/csr.pem \
+	-nodes \
+	-days 3650 \
+	-subj "/CN=Bob"
+
+# sign with self-signed/key.pem
+openssl x509 \
+	-req \
+	-in client/self-signed/csr.pem \
+	-signkey client/self-signed/key.pem \
+	-out client/self-signed/cert.pem \
+	-days 3650
diff --git a/tests/assets/client-certificates/server/server_cert.pem b/tests/assets/client-certificates/server/server_cert.pem
index 52d8f531429b1..18ee3d8051dfc 100644
--- a/tests/assets/client-certificates/server/server_cert.pem
+++ b/tests/assets/client-certificates/server/server_cert.pem
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFdTCCA12gAwIBAgIUNPWupe2xcu8YYG1ozoqk9viqDJswDQYJKoZIhvcNAQEL
+MIIFdTCCA12gAwIBAgIUFhAlW/DnHoHOFg2CXKBAvwYN4BIwDQYJKoZIhvcNAQEL
 BQAwNjESMBAGA1UEAwwJbG9jYWxob3N0MSAwHgYDVQQKDBdDbGllbnQgQ2VydGlm
-aWNhdGUgRGVtbzAeFw0yNDA3MTkxMjQ3MzNaFw0yNTA3MTkxMjQ3MzNaMDYxEjAQ
+aWNhdGUgRGVtbzAeFw0yNTA3MjExNTU2MThaFw0zNTA3MTkxNTU2MThaMDYxEjAQ
 BgNVBAMMCWxvY2FsaG9zdDEgMB4GA1UECgwXQ2xpZW50IENlcnRpZmljYXRlIERl
-bW8wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+K5JWhlfvI47ZL/Az
-L0xnOl+cMelr2BqH+7XS8187SbvluhFfFkq/7V7rwgsHI64sn8pgRCOnqKWV6jtb
-651dGzn7Nby6InmyOQzF4VwfSVWQ6BYXgXuryS9Gm0gi8sOL1Ji/jV49n1gzLyIx
-LNhd7NG2DCCedTHJnxyz4xq8MWhI/qI85iWJqcHhxkDb8wtH1Vd6nd/ZRVDbjgTv
-PH3EDK7JqmnYG9+x4Jz0yEhvV7jL3gNu2mIyttvm7oRna9oHgaKFUJt4BCfPbT5U
-3ipvcq29hdD5/5QIDzTWcExTnklolg5xpFext1+3KPSppESxcfBBNoL3h1B8ZcZa
-lEMC/IoFUIDJQj5gmSn4okwMWIxgf+AL0609MKEqQ2FavOsvBmhHcQsqLk4MO/v0
-NGFv1/xGe4tUkX4han6ykf1+sqzupJT5qnUONmvghb2SpIt83o4j4KHVzZwk8JK0
-N6hN7JEjXQwSKCh3b0FFg+kPAe12d6BBcsNzEYmt2C1KNPbXMX84zIkgPN01XMg6
-kdCdjP6DH7CK+brW9qQufOqYpd3eNhJyeBm+oP3PhnhEiMTIO8X2GdSN5Rxozgxl
-VIj/QWhLV64r5AqPr/Vpd1vcsxrg3aS5CASmoWQmTPuhEZptRtrkPkGw7k9NPZ34
-lnRenvKJ9e3DXhXRMqeYUY6wjwIDAQABo3sweTAdBgNVHQ4EFgQUEHtrxWCk96Eh
-r60E0HBuwLk2i+IwHwYDVR0jBBgwFoAUEHtrxWCk96Ehr60E0HBuwLk2i+IwDwYD
+bW8wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYDbBlM8ILtq2xKLFU
+ZwU4n7+0VHsO0skCfyNwpSZndbArjJUd/ZgFyCy5RK5Cg23KtXSMgkU6QlXOWvIr
+WJ/1wAkH9tuef/JDo9NJ00jBeua7HjdudNAsz6WwXSZC+a6DhA7nVHNwuyqq1SyH
+g5tuSP294EwfbEhXhaDyfXyBa4PaEmyjD2+O1NHSZ1AuUhblcUelKkZbykMvwCb7
+gJVXxlm/SN0K4vOVq80dBknr785562hDFGoXFX9hd2uPCQKbWGdMca+MmRWwNM2B
+CuxVoUl/Ooqmr7AdZ62lhpcqCd+todWC5GzrxwZjcIwt5P7MDvd+Ktmc8ePcZhp3
+L3ddlxXNgfi+c9OnZaz1QVgEn1YlDAmHvQtj9H+v2mmawyyRycjmhIpV/eaXaJvW
+A2wq+O2OERl056IjjzcXHrD6DOk7IjlTwQ87AMU4mNrCzW1LLd428OxQdGv2I4/b
+nq+0snOJOrTk65upybJYMGKUuTRqfEQgv5d/923VUISC69uTq+0zVFxG3pyMJR2D
+O+6xinBkp0Gk+ft9L4aaBAYXyUmi+PRSfdTfUk3yQkYefC55QTDDRK2rb7JiQqzr
+xhJ2vBar0TqXShQKKlMaOWHd+1U2ZjuyzboDDPeACoAmUVY2IHs+P8Dem0fwuKNd
+TF4jZkVQIWWLfTzzghOelmy9mwIDAQABo3sweTAdBgNVHQ4EFgQU8doR+Mmgh+1K
+QdNvybCZ7bsu2J8wHwYDVR0jBBgwFoAU8doR+Mmgh+1KQdNvybCZ7bsu2J8wDwYD
 VR0TAQH/BAUwAwEB/zAmBgNVHREEHzAdgglsb2NhbGhvc3SCEGxvY2FsLnBsYXl3
-cmlnaHQwDQYJKoZIhvcNAQELBQADggIBALP4kOAP21ZusbEH89VkZT3MkGlZuDQP
-LyTYdLzT3EzN//2+lBDmJfpIPLL/K3sNEVSzNppa6tcCXiVNes/xJM7tHRhTOJ31
-HinSsib2r6DZ6SitQJWmD5FoAdkp9qdG8mA/5vOiwiVKKFV2/Z3i+3iUI/ZnEhUq
-uUA1I3TI5LAQzgWLwYu1jSEM1EbH6uQiZ8AmXLVO4GQnVQdbyarWHxIy+zsg+MJN
-fxIG/phDpkt1mI3SkAdpWRWjCKESQhrIcRUtu5eVk0lho6ttHODXF8bM7iWLoRc7
-rpcllI4HXHoXQqQkZHRa7KwTf0YVwwQbXTecZONWXwE9Ej5R5IcZzja5FWCSstsb
-ULNW0JVxGBE7j5aOjxasYAbRexDmlfEdLvnp6bctZuvMvuBxrB+x5HSEZl6bVnbC
-nvtoslylQJM1bwlZdCqJm04JXe1787HDBef2gABv27BjvG/zn89L5ipogZCrGpl6
-P9qs0eSERHuSrm3eHUVgXSQ1nbvOpk7RPFbsbp/npc1NbEDBdAMoXhLP9A+ytxLq
-TF+w08nfCF6yJJ3jTkvABo10UH6zcPnfH3Ys7JYsHRbcloMfn+mc88KrTaCO+VZx
-qjhFcz+zDu/AbtJkDJtxX2X7jNL0pzWS+9H8jFTrd3ta8XrJiSFq2VMxEU6R0IHk
-2Ct10prMWB/3
+cmlnaHQwDQYJKoZIhvcNAQELBQADggIBAH1/6Sp4dW96yvwi9ptgVRYfRSRWfYYy
+2nU6kJ1DPOW7hTPf2wLf6Z2KqiJXn8tECHfM4pnPSgDhtZHDDHAu9l7Diqzk/NIl
+AblRs++4vSKdnCx1uh3EFLjIMmHa/cRUzfuR+oGfri3v7jgTBV6UJJQ0pMqIDk/P
+VEOWWukllru40M8Rwy4F6LmpwIWMtNDxmhtXSbQJ6TZn+isNSoaWgHjQmayrVyXZ
+OcNYuR8M/ECvnufuIOW53+hhwG1X0jEoBdXqqXbTKcGjA+yLHp008AAB5DNQblYm
+FJ4N0v6eYLhOO0u3n0b/ZsqUkZx2h38tlZoAdJNqy+d4TE3WbGRNgNJrTjAOzpPL
+cQ5RNr3dDsUDFPnCoK3LUf9BWerARoDt+bbrM/VqvWH/0uqaU0/vo8IchSyQ9wGv
+SwrWLJU32HQUJ2VQP/m4ADf3X2Ozj+e8bBf7XPPD8KDyL4aR0KuYzrsOnhFlBkHD
+PtNjc7SgiE7AZe1WOEmhBQcr+vI6S8qFTurTntCBkvrFgYBAIIhK2XwFN5sFtByr
+GCB67NQMp37g2qFNYi8EmKQvPLpAcC3Je5PvHFSj2y9Z14FclGoxjU50SlH9/A5I
+iHGcIVjCv9NhNDFAwakF/sTnrpT/FIS7tm9GwoJGWCdYg4pl72WYCW6hJBG+XY7G
+t3jt9TP8623D
 -----END CERTIFICATE-----
diff --git a/tests/assets/client-certificates/server/server_key.pem b/tests/assets/client-certificates/server/server_key.pem
index ff6a3fc117bae..3a762bde7ce22 100644
--- a/tests/assets/client-certificates/server/server_key.pem
+++ b/tests/assets/client-certificates/server/server_key.pem
@@ -1,52 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC+K5JWhlfvI47Z
-L/AzL0xnOl+cMelr2BqH+7XS8187SbvluhFfFkq/7V7rwgsHI64sn8pgRCOnqKWV
-6jtb651dGzn7Nby6InmyOQzF4VwfSVWQ6BYXgXuryS9Gm0gi8sOL1Ji/jV49n1gz
-LyIxLNhd7NG2DCCedTHJnxyz4xq8MWhI/qI85iWJqcHhxkDb8wtH1Vd6nd/ZRVDb
-jgTvPH3EDK7JqmnYG9+x4Jz0yEhvV7jL3gNu2mIyttvm7oRna9oHgaKFUJt4BCfP
-bT5U3ipvcq29hdD5/5QIDzTWcExTnklolg5xpFext1+3KPSppESxcfBBNoL3h1B8
-ZcZalEMC/IoFUIDJQj5gmSn4okwMWIxgf+AL0609MKEqQ2FavOsvBmhHcQsqLk4M
-O/v0NGFv1/xGe4tUkX4han6ykf1+sqzupJT5qnUONmvghb2SpIt83o4j4KHVzZwk
-8JK0N6hN7JEjXQwSKCh3b0FFg+kPAe12d6BBcsNzEYmt2C1KNPbXMX84zIkgPN01
-XMg6kdCdjP6DH7CK+brW9qQufOqYpd3eNhJyeBm+oP3PhnhEiMTIO8X2GdSN5Rxo
-zgxlVIj/QWhLV64r5AqPr/Vpd1vcsxrg3aS5CASmoWQmTPuhEZptRtrkPkGw7k9N
-PZ34lnRenvKJ9e3DXhXRMqeYUY6wjwIDAQABAoICABfDfxpj2EowUdHvDR+AShZe
-M4Njs00AKLSUbjCpq91PRfUbjr8onHemVGW2jkU6nrHB1/q2mRQC3YpBxmAirbvs
-Qo8TNH24ACgWu/NgSXA5bEFa1yPh0M/zKH60uctwNaJcEyhgpIWjy1Q+EBJADduS
-09PhaRQUBgAxa1dJSlZ5ABSbCS/9/HPa7Djn2sQBd4fm73MJlmbipAuDkDdLAlZE
-1XSq4GYaeZYTQNnPy0lql1OWbyxjisDWm90cMhxwXELy3pm1LHBPaKAhgRf+2SOr
-G23i8m3DE778E3i2eLs8POUeVzi5NiIljYboTcaDGfhoigLEKpJ+7L5Ww3YfL85Q
-xk00Y0b+cYNrlJ3vCpflDXJunZ1gJHLDTixJeVMpXnMSi01+bSb8D/PTcbG3fZ0U
-y4f2G0M+gf+m3EMMD96yerPf6jhGlTqY+eMyNVwNVk4BIG+D/8nf13keAF4kVbPJ
-QMidnCNbu8ZiC12HqLyv3YZlseXPIkhpbYEhsj58sbG4Tms+mG/zPlTZjroIEdAX
-nwI1aoG+NAbe+WSH/P4SvIMi1o/fWoXBtb+t7uy1AG/Xbu414WED7iwvxtqJRQj5
-rhrqryWTGQKY1zVJIOxwZP0f5gSIkEITyE+rO6o6pbAZFX7N0aMIvksBkEN5mdoV
-RWzxfSVNGMWooRD5d3TZAoIBAQD1dvgOsLYP8lUfkKglLTqHQe3x75BVDR9zdTIt
-tQh9UIbyovPFdLcXrHHJMBVMPTRGeRNpjCT5BNSNbidrmAxYN7YXuSA4uy3bubNU
-76km5kmL2Ji+5u+qMm9Xycyqn30rLH9hT+9c/MVuPW6CNmETKX9+v9zb1v//RrBS
-2ZNAWjJcBYv/rS/vKsW9yH/DbM21eSeokUqpkejOk1UxVZEcb9vt8VF8p+jO1wv3
-+UgI4Gfkf3sjEL1m/hBvH5Z49RHTFj4npeK6Lko4NLLazU2904jbHxppH51UNH1j
-xp8Is+iNwW2qCOve8kSUUUjxLn4n45D2d+5qOqQTtsMWXHanAoIBAQDGVQ6UZqvo
-djfcULq0Jub1xpBfxIAg7jSY7aZ6H0YlG7KgpVTd2TUEEKgErxtfYufjtLjjWb/d
-lMG7UpkM5B4tFnpRDmvevltCqGsM3qi3AtPnzavgz2TAQy7qd2gJc8glE965LOfb
-l+mGzE4SzeFJ9WS7sUDf4WnX2xjt3OA0VCvcBRNIwCnEvXu81XLKZL6etBx6zdCt
-whWHIiqa4wkjuWEwvbeH4aWsh8gFY3E5mbvDdMFtyGWvTK8OGivl3CkdQxM+MOJD
-3aAEBTr0M7tSMy5IKewASlAWZEVpFFPIyiyMCTI0XcEgA7ewHw/F3c7cstgVktjm
-OYZytZPF0ZvZAoIBAB5+z0aT8ap9gtHPGPS1b8YKDNO33YiTfsrLTpabHRjkfj96
-uypW28BXLjO+g4bbO7ldpWnBfX5qeTWw77jQRQhYs4iy+SvTJVlc8siklbE9fvme
-ySs+aZwNdAPGEGVKNzS77H9cfPJifOy7ORV4SAsnZq2KjJfLWDaQw6snWMHv8r23
-+rKjA4eFGtf/JtBSniPjj2fD1TDH7dJsP3NHnCWaSAqBpowEGEpKMTR3hdmEd6PN
-qrCqjb1T5xrHI9yXJcXBx6sJUueqhJIDCg1g4D2rIB+I97EDunoRo1pX/L4KC+RA
-ma08OoGSO67pglRkYEv4W7QjJj2QV34TgJ0wk5UCggEALINom0wT5z+pN+xyiv50
-NdNUEfpzW3C7I1urUpt0Td3SkJWq34Phj0EBxNNcTGNRclzcZkJ9eojpllZqfWcx
-kqMJ3ulisoJ8zxAnvqK2sSSUVOFnYzSJA1HQ1NTp570xvYihI2R9wV5uDlAKcdP9
-bXEDI9Ebo2PfMpA9Hx3EwFnn4iDNfDWM6lgwzmgFtIE5+zqnbbSF0onN9R9o+oxc
-P8Val+rspzWwznFHJlZ0Uh478xlgVHh2wgpu+7ZKBfQM0kF8ryefkOXMBTr7SVXX
-BBLyn0Wxbzs+kFf+8B+c0mL17pQdzX0BXGMZNhEypBEtXYFSWD02Ky3cDCDOwsZR
-uQKCAQAKQtsUSO80N/kzsWuSxHhuLMTvNZfiE/qK1Mz5Rw1qXxMXfYNFZbU/MqW7
-5DLd4Kn7s3v1UlBn2tbLGLzghnHYRxT9kxF7ZnY6HZv2IrEUjE2I2YTTCQr/Q7Z5
-gRBQb5z+vJbKOYnlSHurTexKmuTjgJ/y/jRQiQABccVj1w5lIm1SPoxpdKzSFyWt
-0NVmff9VetoiWKJYldPBTOmqPUytuBZyX5fJ4pPixwgAns6ZaqJtVNyMZkZ/GoDk
-XP2CvB/HyMiS7vXK5QJYYumk7oyC15H6eDChITNPV3VGH2QqcdEvDLT81W+JZ2mX
-8ynLaTs3oV3BjQya9pAUyzIX5L67
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDYDbBlM8ILtq2x
+KLFUZwU4n7+0VHsO0skCfyNwpSZndbArjJUd/ZgFyCy5RK5Cg23KtXSMgkU6QlXO
+WvIrWJ/1wAkH9tuef/JDo9NJ00jBeua7HjdudNAsz6WwXSZC+a6DhA7nVHNwuyqq
+1SyHg5tuSP294EwfbEhXhaDyfXyBa4PaEmyjD2+O1NHSZ1AuUhblcUelKkZbykMv
+wCb7gJVXxlm/SN0K4vOVq80dBknr785562hDFGoXFX9hd2uPCQKbWGdMca+MmRWw
+NM2BCuxVoUl/Ooqmr7AdZ62lhpcqCd+todWC5GzrxwZjcIwt5P7MDvd+Ktmc8ePc
+Zhp3L3ddlxXNgfi+c9OnZaz1QVgEn1YlDAmHvQtj9H+v2mmawyyRycjmhIpV/eaX
+aJvWA2wq+O2OERl056IjjzcXHrD6DOk7IjlTwQ87AMU4mNrCzW1LLd428OxQdGv2
+I4/bnq+0snOJOrTk65upybJYMGKUuTRqfEQgv5d/923VUISC69uTq+0zVFxG3pyM
+JR2DO+6xinBkp0Gk+ft9L4aaBAYXyUmi+PRSfdTfUk3yQkYefC55QTDDRK2rb7Ji
+QqzrxhJ2vBar0TqXShQKKlMaOWHd+1U2ZjuyzboDDPeACoAmUVY2IHs+P8Dem0fw
+uKNdTF4jZkVQIWWLfTzzghOelmy9mwIDAQABAoICADF+KUt1qN0QEwgDX2QLWYnY
+Jo1D0RDbPorg3xh97KdEsX+4a6x8HGguq/ghAJ5iBzOpj7JkYUFwUsG72cAORE6C
+mE8HwNW1T6UpEUzXJtKTuelhiac3AT1SsA0PuaUcF1svVE6v7OYFKkgKH3JHtsJz
+3BS0HhwQrR3HkdAa6PuoyoKZN+O+tHqOzCYb3qVNzsruwU/XuFhspCl7JjL1CMEb
+whFsup400UIXIhylBSgUPkN1puO++HKjTRPhzHTuxncZsEg1vtZBd1NvNSh7fRo8
+oV6Q5ZQ7qOeDiabihxxtOJ1I9mVOuJjmddMvxBz7WVcbkpyHamRmkSE7DpMA/6G4
+I6MI7pF1jEkPjvZRVfC9irpd+uFtlmCgjTloFUtGIS9wPmEzbtHsAPWvWQAgbv/A
+BDw9SumA/cPEjjhD0jAdPczTxLZk86yr9UZou5WLmuCZJD3zozdZ/7HM5OvhGf7z
+vXqpIwxulU8uOxB7qVh2FTkArP1CxMPNASsaTzSIVmT4+G2NBaakHT3lCS+47XK/
+DJXc97w38cN/4WCxf5vRbeytS+ruDVWU0Ez0mqzYEo0xyWNcyjlWJfmamgI9Vfml
+wdhdYq/CQrrXi5VoYkTKfJl+Bp1HC+rvLjTWLH8tiWty+DHxmkwTedjPulukrBGp
+Uw9zMan3IxXsX8BanP2RAoIBAQDw4QNiFKYnCKhawyqgDrbtWtQjUPWP3DkSPSfE
+iWEkIwvH2tJpmmkvt+bSzXLLWv0tO2oTn88zmtIanptGbijjPZqhHuB1f6Di+h3A
+ZEFye586WlhCqZCw5RDCXw0Wj5ZQREHazO3txSOHvJxtbwW1Sqf6clGJs6Sq/Mk0
+pw9Cl5jtLELPL3dwQrtRjVpfK1WWh14E5XSFjHRXvWGMWdje1EN+Lf5V27a7W7SD
+elYqhn5NOKU237UB7cnXsvTndf8zsyx4BmBNO2BirU2B/MikK/LMR3BbJkp3rhMI
+eLkgKsN8kf7L4ZABcX1iUr0WxDfrPLxUsuvzb1FAgMpLIsSpAoIBAQDlnblRmqDz
+qsZdZJE2E6PQ7ELCz3b4g6ftMVOyYhptFZqDfku7T1MEdedeHr66pfh1BXgDSYwg
+hnGx8tPmaAZ+ZxghczhADLw1mUXiZ36xIlWVRaVatCCUquVent0PPytUlkPvy37Z
+qIXBAmQNIUorZMVJzeN45073KmZFZfAUXqSx8N0ObBh34oVDx7xgVSQvQyEssR8e
+VsvWWxKY6zrkFeFtonb6A5EDS8R9rmCdGqH0FCGQRo0pP4bT2iXxp40KLeJdZdmy
+nHOEHWtif7/hbaR6w7DLzmWbY5VHKzIFfVkoeoOuQPxYs2ds1mz3ywYKbXXNDcwD
+VMk6mtkqKxajAoIBAArgLfXstr/GbUuDylXltC6tTiy2CBBRwiXnqvb9uOwXxP1m
+DOAFv8AOzpYv/oHd/tZe+2AddA6BbAEVri8U5DW2X1fs+/dyJsJ4xoUcQbQ4jqzk
+zV1dKJJEFWihQAcHvqKrIkoNvKRipUMIqgtq2tgfocv2A2ZzPPkXZsJA1LiN/bKf
+r/iIzRy9dpWtCyqG21trizwvW/53o/0eKNxcZiVRciatTvFzdSGqd1EEYgWTgvpb
+l2IN4a9PnDBn/RTCSB5+dYCJ0SlLiAOMjZZT4n8/GLxOcW08Ilqa+nMEeF9Sbvcd
+5GIyMf1OsXmSAMWZYGj3mg088thP61w9NGUGEdkCggEBAMpwSFa98XFi+wiUBcKb
+hi5IXoPKzaVEzeS9PIFlJM9P4K5VxwcZZKPmH1pH2PhOI8NoUurzCOwUHGE7Kb9V
+r4P5+LhlEQ7HK5hFzetSO8yH7NRyVtqlPKRWF2tYvKUYmGc3JCZiTzAu99228ebx
+lqazbY0oTIjnxiL76rb8rLIIz0NijEKO4vOvbrbXfimgZwqUMMdqUXk6JPSTzs2r
+dnxpHhq+xg6e3lb9kfsMpnlcZbT/mqfMy9+19nUJO7LWee6jjZOynEBw1xd/qJFq
++A0T0ZO6vECzc7mQDqh0WOGmJdkeSsJy4QiDA4hddCzzfhvrbZSfuWKmedOFejlH
+S+kCggEAXxTOwID/U/8d6DnLLQzX1d9S5VPiKS+Jminvl6LzmGBojn0K1+nQXLNT
+c+EIURlHNuK3aR6dR/iSXiffjHzVAeu0FOSg3wTONowmyTB8LQamIt5Gx5vR3ptq
+4hhv2SSgagpJfSiBKzt3D1/Ls+GPIiRhEMNh6RTTvEK90neNNE5SLfPHFsBzAVmA
+VdlaM/mpudP5KCB4LQAGSjzEWYZpJuhBdoNd5guxb3044FcLA7quVQcANWKnXZxh
+7iHegXE37s7suS8tVscfNAXKccBBGsigba+knnhRQ0M9hlKZLlAAFD+qMHpkTYxJ
+dvQgA6dBjtYg5cQMHNbnfT3j3WzyQg==
 -----END PRIVATE KEY-----
diff --git a/tests/assets/codicon.css b/tests/assets/codicon.css
new file mode 100644
index 0000000000000..41360ce21d643
--- /dev/null
+++ b/tests/assets/codicon.css
@@ -0,0 +1,596 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+@font-face {
+	font-family: "codicon";
+	src: url("codicon.ttf") format("truetype");
+}
+
+.codicon {
+  font: normal normal normal 16px/1 codicon;
+  flex: none;
+  display: inline-block;
+  text-decoration: none;
+  text-rendering: auto;
+  text-align: center;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.codicon-add:before { content: '\ea60'; }
+.codicon-plus:before { content: '\ea60'; }
+.codicon-gist-new:before { content: '\ea60'; }
+.codicon-repo-create:before { content: '\ea60'; }
+.codicon-lightbulb:before { content: '\ea61'; }
+.codicon-light-bulb:before { content: '\ea61'; }
+.codicon-repo:before { content: '\ea62'; }
+.codicon-repo-delete:before { content: '\ea62'; }
+.codicon-gist-fork:before { content: '\ea63'; }
+.codicon-repo-forked:before { content: '\ea63'; }
+.codicon-git-pull-request:before { content: '\ea64'; }
+.codicon-git-pull-request-abandoned:before { content: '\ea64'; }
+.codicon-record-keys:before { content: '\ea65'; }
+.codicon-keyboard:before { content: '\ea65'; }
+.codicon-tag:before { content: '\ea66'; }
+.codicon-git-pull-request-label:before { content: '\ea66'; }
+.codicon-tag-add:before { content: '\ea66'; }
+.codicon-tag-remove:before { content: '\ea66'; }
+.codicon-person:before { content: '\ea67'; }
+.codicon-person-follow:before { content: '\ea67'; }
+.codicon-person-outline:before { content: '\ea67'; }
+.codicon-person-filled:before { content: '\ea67'; }
+.codicon-git-branch:before { content: '\ea68'; }
+.codicon-git-branch-create:before { content: '\ea68'; }
+.codicon-git-branch-delete:before { content: '\ea68'; }
+.codicon-source-control:before { content: '\ea68'; }
+.codicon-mirror:before { content: '\ea69'; }
+.codicon-mirror-public:before { content: '\ea69'; }
+.codicon-star:before { content: '\ea6a'; }
+.codicon-star-add:before { content: '\ea6a'; }
+.codicon-star-delete:before { content: '\ea6a'; }
+.codicon-star-empty:before { content: '\ea6a'; }
+.codicon-comment:before { content: '\ea6b'; }
+.codicon-comment-add:before { content: '\ea6b'; }
+.codicon-alert:before { content: '\ea6c'; }
+.codicon-warning:before { content: '\ea6c'; }
+.codicon-search:before { content: '\ea6d'; }
+.codicon-search-save:before { content: '\ea6d'; }
+.codicon-log-out:before { content: '\ea6e'; }
+.codicon-sign-out:before { content: '\ea6e'; }
+.codicon-log-in:before { content: '\ea6f'; }
+.codicon-sign-in:before { content: '\ea6f'; }
+.codicon-eye:before { content: '\ea70'; }
+.codicon-eye-unwatch:before { content: '\ea70'; }
+.codicon-eye-watch:before { content: '\ea70'; }
+.codicon-circle-filled:before { content: '\ea71'; }
+.codicon-primitive-dot:before { content: '\ea71'; }
+.codicon-close-dirty:before { content: '\ea71'; }
+.codicon-debug-breakpoint:before { content: '\ea71'; }
+.codicon-debug-breakpoint-disabled:before { content: '\ea71'; }
+.codicon-debug-hint:before { content: '\ea71'; }
+.codicon-terminal-decoration-success:before { content: '\ea71'; }
+.codicon-primitive-square:before { content: '\ea72'; }
+.codicon-edit:before { content: '\ea73'; }
+.codicon-pencil:before { content: '\ea73'; }
+.codicon-info:before { content: '\ea74'; }
+.codicon-issue-opened:before { content: '\ea74'; }
+.codicon-gist-private:before { content: '\ea75'; }
+.codicon-git-fork-private:before { content: '\ea75'; }
+.codicon-lock:before { content: '\ea75'; }
+.codicon-mirror-private:before { content: '\ea75'; }
+.codicon-close:before { content: '\ea76'; }
+.codicon-remove-close:before { content: '\ea76'; }
+.codicon-x:before { content: '\ea76'; }
+.codicon-repo-sync:before { content: '\ea77'; }
+.codicon-sync:before { content: '\ea77'; }
+.codicon-clone:before { content: '\ea78'; }
+.codicon-desktop-download:before { content: '\ea78'; }
+.codicon-beaker:before { content: '\ea79'; }
+.codicon-microscope:before { content: '\ea79'; }
+.codicon-vm:before { content: '\ea7a'; }
+.codicon-device-desktop:before { content: '\ea7a'; }
+.codicon-file:before { content: '\ea7b'; }
+.codicon-file-text:before { content: '\ea7b'; }
+.codicon-more:before { content: '\ea7c'; }
+.codicon-ellipsis:before { content: '\ea7c'; }
+.codicon-kebab-horizontal:before { content: '\ea7c'; }
+.codicon-mail-reply:before { content: '\ea7d'; }
+.codicon-reply:before { content: '\ea7d'; }
+.codicon-organization:before { content: '\ea7e'; }
+.codicon-organization-filled:before { content: '\ea7e'; }
+.codicon-organization-outline:before { content: '\ea7e'; }
+.codicon-new-file:before { content: '\ea7f'; }
+.codicon-file-add:before { content: '\ea7f'; }
+.codicon-new-folder:before { content: '\ea80'; }
+.codicon-file-directory-create:before { content: '\ea80'; }
+.codicon-trash:before { content: '\ea81'; }
+.codicon-trashcan:before { content: '\ea81'; }
+.codicon-history:before { content: '\ea82'; }
+.codicon-clock:before { content: '\ea82'; }
+.codicon-folder:before { content: '\ea83'; }
+.codicon-file-directory:before { content: '\ea83'; }
+.codicon-symbol-folder:before { content: '\ea83'; }
+.codicon-logo-github:before { content: '\ea84'; }
+.codicon-mark-github:before { content: '\ea84'; }
+.codicon-github:before { content: '\ea84'; }
+.codicon-terminal:before { content: '\ea85'; }
+.codicon-console:before { content: '\ea85'; }
+.codicon-repl:before { content: '\ea85'; }
+.codicon-zap:before { content: '\ea86'; }
+.codicon-symbol-event:before { content: '\ea86'; }
+.codicon-error:before { content: '\ea87'; }
+.codicon-stop:before { content: '\ea87'; }
+.codicon-variable:before { content: '\ea88'; }
+.codicon-symbol-variable:before { content: '\ea88'; }
+.codicon-array:before { content: '\ea8a'; }
+.codicon-symbol-array:before { content: '\ea8a'; }
+.codicon-symbol-module:before { content: '\ea8b'; }
+.codicon-symbol-package:before { content: '\ea8b'; }
+.codicon-symbol-namespace:before { content: '\ea8b'; }
+.codicon-symbol-object:before { content: '\ea8b'; }
+.codicon-symbol-method:before { content: '\ea8c'; }
+.codicon-symbol-function:before { content: '\ea8c'; }
+.codicon-symbol-constructor:before { content: '\ea8c'; }
+.codicon-symbol-boolean:before { content: '\ea8f'; }
+.codicon-symbol-null:before { content: '\ea8f'; }
+.codicon-symbol-numeric:before { content: '\ea90'; }
+.codicon-symbol-number:before { content: '\ea90'; }
+.codicon-symbol-structure:before { content: '\ea91'; }
+.codicon-symbol-struct:before { content: '\ea91'; }
+.codicon-symbol-parameter:before { content: '\ea92'; }
+.codicon-symbol-type-parameter:before { content: '\ea92'; }
+.codicon-symbol-key:before { content: '\ea93'; }
+.codicon-symbol-text:before { content: '\ea93'; }
+.codicon-symbol-reference:before { content: '\ea94'; }
+.codicon-go-to-file:before { content: '\ea94'; }
+.codicon-symbol-enum:before { content: '\ea95'; }
+.codicon-symbol-value:before { content: '\ea95'; }
+.codicon-symbol-ruler:before { content: '\ea96'; }
+.codicon-symbol-unit:before { content: '\ea96'; }
+.codicon-activate-breakpoints:before { content: '\ea97'; }
+.codicon-archive:before { content: '\ea98'; }
+.codicon-arrow-both:before { content: '\ea99'; }
+.codicon-arrow-down:before { content: '\ea9a'; }
+.codicon-arrow-left:before { content: '\ea9b'; }
+.codicon-arrow-right:before { content: '\ea9c'; }
+.codicon-arrow-small-down:before { content: '\ea9d'; }
+.codicon-arrow-small-left:before { content: '\ea9e'; }
+.codicon-arrow-small-right:before { content: '\ea9f'; }
+.codicon-arrow-small-up:before { content: '\eaa0'; }
+.codicon-arrow-up:before { content: '\eaa1'; }
+.codicon-bell:before { content: '\eaa2'; }
+.codicon-bold:before { content: '\eaa3'; }
+.codicon-book:before { content: '\eaa4'; }
+.codicon-bookmark:before { content: '\eaa5'; }
+.codicon-debug-breakpoint-conditional-unverified:before { content: '\eaa6'; }
+.codicon-debug-breakpoint-conditional:before { content: '\eaa7'; }
+.codicon-debug-breakpoint-conditional-disabled:before { content: '\eaa7'; }
+.codicon-debug-breakpoint-data-unverified:before { content: '\eaa8'; }
+.codicon-debug-breakpoint-data:before { content: '\eaa9'; }
+.codicon-debug-breakpoint-data-disabled:before { content: '\eaa9'; }
+.codicon-debug-breakpoint-log-unverified:before { content: '\eaaa'; }
+.codicon-debug-breakpoint-log:before { content: '\eaab'; }
+.codicon-debug-breakpoint-log-disabled:before { content: '\eaab'; }
+.codicon-briefcase:before { content: '\eaac'; }
+.codicon-broadcast:before { content: '\eaad'; }
+.codicon-browser:before { content: '\eaae'; }
+.codicon-bug:before { content: '\eaaf'; }
+.codicon-calendar:before { content: '\eab0'; }
+.codicon-case-sensitive:before { content: '\eab1'; }
+.codicon-check:before { content: '\eab2'; }
+.codicon-checklist:before { content: '\eab3'; }
+.codicon-chevron-down:before { content: '\eab4'; }
+.codicon-chevron-left:before { content: '\eab5'; }
+.codicon-chevron-right:before { content: '\eab6'; }
+.codicon-chevron-up:before { content: '\eab7'; }
+.codicon-chrome-close:before { content: '\eab8'; }
+.codicon-chrome-maximize:before { content: '\eab9'; }
+.codicon-chrome-minimize:before { content: '\eaba'; }
+.codicon-chrome-restore:before { content: '\eabb'; }
+.codicon-circle-outline:before { content: '\eabc'; }
+.codicon-circle:before { content: '\eabc'; }
+.codicon-debug-breakpoint-unverified:before { content: '\eabc'; }
+.codicon-terminal-decoration-incomplete:before { content: '\eabc'; }
+.codicon-circle-slash:before { content: '\eabd'; }
+.codicon-circuit-board:before { content: '\eabe'; }
+.codicon-clear-all:before { content: '\eabf'; }
+.codicon-clippy:before { content: '\eac0'; }
+.codicon-close-all:before { content: '\eac1'; }
+.codicon-cloud-download:before { content: '\eac2'; }
+.codicon-cloud-upload:before { content: '\eac3'; }
+.codicon-code:before { content: '\eac4'; }
+.codicon-collapse-all:before { content: '\eac5'; }
+.codicon-color-mode:before { content: '\eac6'; }
+.codicon-comment-discussion:before { content: '\eac7'; }
+.codicon-credit-card:before { content: '\eac9'; }
+.codicon-dash:before { content: '\eacc'; }
+.codicon-dashboard:before { content: '\eacd'; }
+.codicon-database:before { content: '\eace'; }
+.codicon-debug-continue:before { content: '\eacf'; }
+.codicon-debug-disconnect:before { content: '\ead0'; }
+.codicon-debug-pause:before { content: '\ead1'; }
+.codicon-debug-restart:before { content: '\ead2'; }
+.codicon-debug-start:before { content: '\ead3'; }
+.codicon-debug-step-into:before { content: '\ead4'; }
+.codicon-debug-step-out:before { content: '\ead5'; }
+.codicon-debug-step-over:before { content: '\ead6'; }
+.codicon-debug-stop:before { content: '\ead7'; }
+.codicon-debug:before { content: '\ead8'; }
+.codicon-device-camera-video:before { content: '\ead9'; }
+.codicon-device-camera:before { content: '\eada'; }
+.codicon-device-mobile:before { content: '\eadb'; }
+.codicon-diff-added:before { content: '\eadc'; }
+.codicon-diff-ignored:before { content: '\eadd'; }
+.codicon-diff-modified:before { content: '\eade'; }
+.codicon-diff-removed:before { content: '\eadf'; }
+.codicon-diff-renamed:before { content: '\eae0'; }
+.codicon-diff:before { content: '\eae1'; }
+.codicon-diff-sidebyside:before { content: '\eae1'; }
+.codicon-discard:before { content: '\eae2'; }
+.codicon-editor-layout:before { content: '\eae3'; }
+.codicon-empty-window:before { content: '\eae4'; }
+.codicon-exclude:before { content: '\eae5'; }
+.codicon-extensions:before { content: '\eae6'; }
+.codicon-eye-closed:before { content: '\eae7'; }
+.codicon-file-binary:before { content: '\eae8'; }
+.codicon-file-code:before { content: '\eae9'; }
+.codicon-file-media:before { content: '\eaea'; }
+.codicon-file-pdf:before { content: '\eaeb'; }
+.codicon-file-submodule:before { content: '\eaec'; }
+.codicon-file-symlink-directory:before { content: '\eaed'; }
+.codicon-file-symlink-file:before { content: '\eaee'; }
+.codicon-file-zip:before { content: '\eaef'; }
+.codicon-files:before { content: '\eaf0'; }
+.codicon-filter:before { content: '\eaf1'; }
+.codicon-flame:before { content: '\eaf2'; }
+.codicon-fold-down:before { content: '\eaf3'; }
+.codicon-fold-up:before { content: '\eaf4'; }
+.codicon-fold:before { content: '\eaf5'; }
+.codicon-folder-active:before { content: '\eaf6'; }
+.codicon-folder-opened:before { content: '\eaf7'; }
+.codicon-gear:before { content: '\eaf8'; }
+.codicon-gift:before { content: '\eaf9'; }
+.codicon-gist-secret:before { content: '\eafa'; }
+.codicon-gist:before { content: '\eafb'; }
+.codicon-git-commit:before { content: '\eafc'; }
+.codicon-git-compare:before { content: '\eafd'; }
+.codicon-compare-changes:before { content: '\eafd'; }
+.codicon-git-merge:before { content: '\eafe'; }
+.codicon-github-action:before { content: '\eaff'; }
+.codicon-github-alt:before { content: '\eb00'; }
+.codicon-globe:before { content: '\eb01'; }
+.codicon-grabber:before { content: '\eb02'; }
+.codicon-graph:before { content: '\eb03'; }
+.codicon-gripper:before { content: '\eb04'; }
+.codicon-heart:before { content: '\eb05'; }
+.codicon-home:before { content: '\eb06'; }
+.codicon-horizontal-rule:before { content: '\eb07'; }
+.codicon-hubot:before { content: '\eb08'; }
+.codicon-inbox:before { content: '\eb09'; }
+.codicon-issue-reopened:before { content: '\eb0b'; }
+.codicon-issues:before { content: '\eb0c'; }
+.codicon-italic:before { content: '\eb0d'; }
+.codicon-jersey:before { content: '\eb0e'; }
+.codicon-json:before { content: '\eb0f'; }
+.codicon-kebab-vertical:before { content: '\eb10'; }
+.codicon-key:before { content: '\eb11'; }
+.codicon-law:before { content: '\eb12'; }
+.codicon-lightbulb-autofix:before { content: '\eb13'; }
+.codicon-link-external:before { content: '\eb14'; }
+.codicon-link:before { content: '\eb15'; }
+.codicon-list-ordered:before { content: '\eb16'; }
+.codicon-list-unordered:before { content: '\eb17'; }
+.codicon-live-share:before { content: '\eb18'; }
+.codicon-loading:before { content: '\eb19'; }
+.codicon-location:before { content: '\eb1a'; }
+.codicon-mail-read:before { content: '\eb1b'; }
+.codicon-mail:before { content: '\eb1c'; }
+.codicon-markdown:before { content: '\eb1d'; }
+.codicon-megaphone:before { content: '\eb1e'; }
+.codicon-mention:before { content: '\eb1f'; }
+.codicon-milestone:before { content: '\eb20'; }
+.codicon-git-pull-request-milestone:before { content: '\eb20'; }
+.codicon-mortar-board:before { content: '\eb21'; }
+.codicon-move:before { content: '\eb22'; }
+.codicon-multiple-windows:before { content: '\eb23'; }
+.codicon-mute:before { content: '\eb24'; }
+.codicon-no-newline:before { content: '\eb25'; }
+.codicon-note:before { content: '\eb26'; }
+.codicon-octoface:before { content: '\eb27'; }
+.codicon-open-preview:before { content: '\eb28'; }
+.codicon-package:before { content: '\eb29'; }
+.codicon-paintcan:before { content: '\eb2a'; }
+.codicon-pin:before { content: '\eb2b'; }
+.codicon-play:before { content: '\eb2c'; }
+.codicon-run:before { content: '\eb2c'; }
+.codicon-plug:before { content: '\eb2d'; }
+.codicon-preserve-case:before { content: '\eb2e'; }
+.codicon-preview:before { content: '\eb2f'; }
+.codicon-project:before { content: '\eb30'; }
+.codicon-pulse:before { content: '\eb31'; }
+.codicon-question:before { content: '\eb32'; }
+.codicon-quote:before { content: '\eb33'; }
+.codicon-radio-tower:before { content: '\eb34'; }
+.codicon-reactions:before { content: '\eb35'; }
+.codicon-references:before { content: '\eb36'; }
+.codicon-refresh:before { content: '\eb37'; }
+.codicon-regex:before { content: '\eb38'; }
+.codicon-remote-explorer:before { content: '\eb39'; }
+.codicon-remote:before { content: '\eb3a'; }
+.codicon-remove:before { content: '\eb3b'; }
+.codicon-replace-all:before { content: '\eb3c'; }
+.codicon-replace:before { content: '\eb3d'; }
+.codicon-repo-clone:before { content: '\eb3e'; }
+.codicon-repo-force-push:before { content: '\eb3f'; }
+.codicon-repo-pull:before { content: '\eb40'; }
+.codicon-repo-push:before { content: '\eb41'; }
+.codicon-report:before { content: '\eb42'; }
+.codicon-request-changes:before { content: '\eb43'; }
+.codicon-rocket:before { content: '\eb44'; }
+.codicon-root-folder-opened:before { content: '\eb45'; }
+.codicon-root-folder:before { content: '\eb46'; }
+.codicon-rss:before { content: '\eb47'; }
+.codicon-ruby:before { content: '\eb48'; }
+.codicon-save-all:before { content: '\eb49'; }
+.codicon-save-as:before { content: '\eb4a'; }
+.codicon-save:before { content: '\eb4b'; }
+.codicon-screen-full:before { content: '\eb4c'; }
+.codicon-screen-normal:before { content: '\eb4d'; }
+.codicon-search-stop:before { content: '\eb4e'; }
+.codicon-server:before { content: '\eb50'; }
+.codicon-settings-gear:before { content: '\eb51'; }
+.codicon-settings:before { content: '\eb52'; }
+.codicon-shield:before { content: '\eb53'; }
+.codicon-smiley:before { content: '\eb54'; }
+.codicon-sort-precedence:before { content: '\eb55'; }
+.codicon-split-horizontal:before { content: '\eb56'; }
+.codicon-split-vertical:before { content: '\eb57'; }
+.codicon-squirrel:before { content: '\eb58'; }
+.codicon-star-full:before { content: '\eb59'; }
+.codicon-star-half:before { content: '\eb5a'; }
+.codicon-symbol-class:before { content: '\eb5b'; }
+.codicon-symbol-color:before { content: '\eb5c'; }
+.codicon-symbol-constant:before { content: '\eb5d'; }
+.codicon-symbol-enum-member:before { content: '\eb5e'; }
+.codicon-symbol-field:before { content: '\eb5f'; }
+.codicon-symbol-file:before { content: '\eb60'; }
+.codicon-symbol-interface:before { content: '\eb61'; }
+.codicon-symbol-keyword:before { content: '\eb62'; }
+.codicon-symbol-misc:before { content: '\eb63'; }
+.codicon-symbol-operator:before { content: '\eb64'; }
+.codicon-symbol-property:before { content: '\eb65'; }
+.codicon-wrench:before { content: '\eb65'; }
+.codicon-wrench-subaction:before { content: '\eb65'; }
+.codicon-symbol-snippet:before { content: '\eb66'; }
+.codicon-tasklist:before { content: '\eb67'; }
+.codicon-telescope:before { content: '\eb68'; }
+.codicon-text-size:before { content: '\eb69'; }
+.codicon-three-bars:before { content: '\eb6a'; }
+.codicon-thumbsdown:before { content: '\eb6b'; }
+.codicon-thumbsup:before { content: '\eb6c'; }
+.codicon-tools:before { content: '\eb6d'; }
+.codicon-triangle-down:before { content: '\eb6e'; }
+.codicon-triangle-left:before { content: '\eb6f'; }
+.codicon-triangle-right:before { content: '\eb70'; }
+.codicon-triangle-up:before { content: '\eb71'; }
+.codicon-twitter:before { content: '\eb72'; }
+.codicon-unfold:before { content: '\eb73'; }
+.codicon-unlock:before { content: '\eb74'; }
+.codicon-unmute:before { content: '\eb75'; }
+.codicon-unverified:before { content: '\eb76'; }
+.codicon-verified:before { content: '\eb77'; }
+.codicon-versions:before { content: '\eb78'; }
+.codicon-vm-active:before { content: '\eb79'; }
+.codicon-vm-outline:before { content: '\eb7a'; }
+.codicon-vm-running:before { content: '\eb7b'; }
+.codicon-watch:before { content: '\eb7c'; }
+.codicon-whitespace:before { content: '\eb7d'; }
+.codicon-whole-word:before { content: '\eb7e'; }
+.codicon-window:before { content: '\eb7f'; }
+.codicon-word-wrap:before { content: '\eb80'; }
+.codicon-zoom-in:before { content: '\eb81'; }
+.codicon-zoom-out:before { content: '\eb82'; }
+.codicon-list-filter:before { content: '\eb83'; }
+.codicon-list-flat:before { content: '\eb84'; }
+.codicon-list-selection:before { content: '\eb85'; }
+.codicon-selection:before { content: '\eb85'; }
+.codicon-list-tree:before { content: '\eb86'; }
+.codicon-debug-breakpoint-function-unverified:before { content: '\eb87'; }
+.codicon-debug-breakpoint-function:before { content: '\eb88'; }
+.codicon-debug-breakpoint-function-disabled:before { content: '\eb88'; }
+.codicon-debug-stackframe-active:before { content: '\eb89'; }
+.codicon-circle-small-filled:before { content: '\eb8a'; }
+.codicon-debug-stackframe-dot:before { content: '\eb8a'; }
+.codicon-terminal-decoration-mark:before { content: '\eb8a'; }
+.codicon-debug-stackframe:before { content: '\eb8b'; }
+.codicon-debug-stackframe-focused:before { content: '\eb8b'; }
+.codicon-debug-breakpoint-unsupported:before { content: '\eb8c'; }
+.codicon-symbol-string:before { content: '\eb8d'; }
+.codicon-debug-reverse-continue:before { content: '\eb8e'; }
+.codicon-debug-step-back:before { content: '\eb8f'; }
+.codicon-debug-restart-frame:before { content: '\eb90'; }
+.codicon-debug-alt:before { content: '\eb91'; }
+.codicon-call-incoming:before { content: '\eb92'; }
+.codicon-call-outgoing:before { content: '\eb93'; }
+.codicon-menu:before { content: '\eb94'; }
+.codicon-expand-all:before { content: '\eb95'; }
+.codicon-feedback:before { content: '\eb96'; }
+.codicon-git-pull-request-reviewer:before { content: '\eb96'; }
+.codicon-group-by-ref-type:before { content: '\eb97'; }
+.codicon-ungroup-by-ref-type:before { content: '\eb98'; }
+.codicon-account:before { content: '\eb99'; }
+.codicon-git-pull-request-assignee:before { content: '\eb99'; }
+.codicon-bell-dot:before { content: '\eb9a'; }
+.codicon-debug-console:before { content: '\eb9b'; }
+.codicon-library:before { content: '\eb9c'; }
+.codicon-output:before { content: '\eb9d'; }
+.codicon-run-all:before { content: '\eb9e'; }
+.codicon-sync-ignored:before { content: '\eb9f'; }
+.codicon-pinned:before { content: '\eba0'; }
+.codicon-github-inverted:before { content: '\eba1'; }
+.codicon-server-process:before { content: '\eba2'; }
+.codicon-server-environment:before { content: '\eba3'; }
+.codicon-pass:before { content: '\eba4'; }
+.codicon-issue-closed:before { content: '\eba4'; }
+.codicon-stop-circle:before { content: '\eba5'; }
+.codicon-play-circle:before { content: '\eba6'; }
+.codicon-record:before { content: '\eba7'; }
+.codicon-debug-alt-small:before { content: '\eba8'; }
+.codicon-vm-connect:before { content: '\eba9'; }
+.codicon-cloud:before { content: '\ebaa'; }
+.codicon-merge:before { content: '\ebab'; }
+.codicon-export:before { content: '\ebac'; }
+.codicon-graph-left:before { content: '\ebad'; }
+.codicon-magnet:before { content: '\ebae'; }
+.codicon-notebook:before { content: '\ebaf'; }
+.codicon-redo:before { content: '\ebb0'; }
+.codicon-check-all:before { content: '\ebb1'; }
+.codicon-pinned-dirty:before { content: '\ebb2'; }
+.codicon-pass-filled:before { content: '\ebb3'; }
+.codicon-circle-large-filled:before { content: '\ebb4'; }
+.codicon-circle-large:before { content: '\ebb5'; }
+.codicon-circle-large-outline:before { content: '\ebb5'; }
+.codicon-combine:before { content: '\ebb6'; }
+.codicon-gather:before { content: '\ebb6'; }
+.codicon-table:before { content: '\ebb7'; }
+.codicon-variable-group:before { content: '\ebb8'; }
+.codicon-type-hierarchy:before { content: '\ebb9'; }
+.codicon-type-hierarchy-sub:before { content: '\ebba'; }
+.codicon-type-hierarchy-super:before { content: '\ebbb'; }
+.codicon-git-pull-request-create:before { content: '\ebbc'; }
+.codicon-run-above:before { content: '\ebbd'; }
+.codicon-run-below:before { content: '\ebbe'; }
+.codicon-notebook-template:before { content: '\ebbf'; }
+.codicon-debug-rerun:before { content: '\ebc0'; }
+.codicon-workspace-trusted:before { content: '\ebc1'; }
+.codicon-workspace-untrusted:before { content: '\ebc2'; }
+.codicon-workspace-unknown:before { content: '\ebc3'; }
+.codicon-terminal-cmd:before { content: '\ebc4'; }
+.codicon-terminal-debian:before { content: '\ebc5'; }
+.codicon-terminal-linux:before { content: '\ebc6'; }
+.codicon-terminal-powershell:before { content: '\ebc7'; }
+.codicon-terminal-tmux:before { content: '\ebc8'; }
+.codicon-terminal-ubuntu:before { content: '\ebc9'; }
+.codicon-terminal-bash:before { content: '\ebca'; }
+.codicon-arrow-swap:before { content: '\ebcb'; }
+.codicon-copy:before { content: '\ebcc'; }
+.codicon-person-add:before { content: '\ebcd'; }
+.codicon-filter-filled:before { content: '\ebce'; }
+.codicon-wand:before { content: '\ebcf'; }
+.codicon-debug-line-by-line:before { content: '\ebd0'; }
+.codicon-inspect:before { content: '\ebd1'; }
+.codicon-layers:before { content: '\ebd2'; }
+.codicon-layers-dot:before { content: '\ebd3'; }
+.codicon-layers-active:before { content: '\ebd4'; }
+.codicon-compass:before { content: '\ebd5'; }
+.codicon-compass-dot:before { content: '\ebd6'; }
+.codicon-compass-active:before { content: '\ebd7'; }
+.codicon-azure:before { content: '\ebd8'; }
+.codicon-issue-draft:before { content: '\ebd9'; }
+.codicon-git-pull-request-closed:before { content: '\ebda'; }
+.codicon-git-pull-request-draft:before { content: '\ebdb'; }
+.codicon-debug-all:before { content: '\ebdc'; }
+.codicon-debug-coverage:before { content: '\ebdd'; }
+.codicon-run-errors:before { content: '\ebde'; }
+.codicon-folder-library:before { content: '\ebdf'; }
+.codicon-debug-continue-small:before { content: '\ebe0'; }
+.codicon-beaker-stop:before { content: '\ebe1'; }
+.codicon-graph-line:before { content: '\ebe2'; }
+.codicon-graph-scatter:before { content: '\ebe3'; }
+.codicon-pie-chart:before { content: '\ebe4'; }
+.codicon-bracket:before { content: '\eb0f'; }
+.codicon-bracket-dot:before { content: '\ebe5'; }
+.codicon-bracket-error:before { content: '\ebe6'; }
+.codicon-lock-small:before { content: '\ebe7'; }
+.codicon-azure-devops:before { content: '\ebe8'; }
+.codicon-verified-filled:before { content: '\ebe9'; }
+.codicon-newline:before { content: '\ebea'; }
+.codicon-layout:before { content: '\ebeb'; }
+.codicon-layout-activitybar-left:before { content: '\ebec'; }
+.codicon-layout-activitybar-right:before { content: '\ebed'; }
+.codicon-layout-panel-left:before { content: '\ebee'; }
+.codicon-layout-panel-center:before { content: '\ebef'; }
+.codicon-layout-panel-justify:before { content: '\ebf0'; }
+.codicon-layout-panel-right:before { content: '\ebf1'; }
+.codicon-layout-panel:before { content: '\ebf2'; }
+.codicon-layout-sidebar-left:before { content: '\ebf3'; }
+.codicon-layout-sidebar-right:before { content: '\ebf4'; }
+.codicon-layout-statusbar:before { content: '\ebf5'; }
+.codicon-layout-menubar:before { content: '\ebf6'; }
+.codicon-layout-centered:before { content: '\ebf7'; }
+.codicon-target:before { content: '\ebf8'; }
+.codicon-indent:before { content: '\ebf9'; }
+.codicon-record-small:before { content: '\ebfa'; }
+.codicon-error-small:before { content: '\ebfb'; }
+.codicon-terminal-decoration-error:before { content: '\ebfb'; }
+.codicon-arrow-circle-down:before { content: '\ebfc'; }
+.codicon-arrow-circle-left:before { content: '\ebfd'; }
+.codicon-arrow-circle-right:before { content: '\ebfe'; }
+.codicon-arrow-circle-up:before { content: '\ebff'; }
+.codicon-layout-sidebar-right-off:before { content: '\ec00'; }
+.codicon-layout-panel-off:before { content: '\ec01'; }
+.codicon-layout-sidebar-left-off:before { content: '\ec02'; }
+.codicon-blank:before { content: '\ec03'; }
+.codicon-heart-filled:before { content: '\ec04'; }
+.codicon-map:before { content: '\ec05'; }
+.codicon-map-horizontal:before { content: '\ec05'; }
+.codicon-fold-horizontal:before { content: '\ec05'; }
+.codicon-map-filled:before { content: '\ec06'; }
+.codicon-map-horizontal-filled:before { content: '\ec06'; }
+.codicon-fold-horizontal-filled:before { content: '\ec06'; }
+.codicon-circle-small:before { content: '\ec07'; }
+.codicon-bell-slash:before { content: '\ec08'; }
+.codicon-bell-slash-dot:before { content: '\ec09'; }
+.codicon-comment-unresolved:before { content: '\ec0a'; }
+.codicon-git-pull-request-go-to-changes:before { content: '\ec0b'; }
+.codicon-git-pull-request-new-changes:before { content: '\ec0c'; }
+.codicon-search-fuzzy:before { content: '\ec0d'; }
+.codicon-comment-draft:before { content: '\ec0e'; }
+.codicon-send:before { content: '\ec0f'; }
+.codicon-sparkle:before { content: '\ec10'; }
+.codicon-insert:before { content: '\ec11'; }
+.codicon-mic:before { content: '\ec12'; }
+.codicon-thumbsdown-filled:before { content: '\ec13'; }
+.codicon-thumbsup-filled:before { content: '\ec14'; }
+.codicon-coffee:before { content: '\ec15'; }
+.codicon-snake:before { content: '\ec16'; }
+.codicon-game:before { content: '\ec17'; }
+.codicon-vr:before { content: '\ec18'; }
+.codicon-chip:before { content: '\ec19'; }
+.codicon-piano:before { content: '\ec1a'; }
+.codicon-music:before { content: '\ec1b'; }
+.codicon-mic-filled:before { content: '\ec1c'; }
+.codicon-repo-fetch:before { content: '\ec1d'; }
+.codicon-copilot:before { content: '\ec1e'; }
+.codicon-lightbulb-sparkle:before { content: '\ec1f'; }
+.codicon-robot:before { content: '\ec20'; }
+.codicon-sparkle-filled:before { content: '\ec21'; }
+.codicon-diff-single:before { content: '\ec22'; }
+.codicon-diff-multiple:before { content: '\ec23'; }
+.codicon-surround-with:before { content: '\ec24'; }
+.codicon-share:before { content: '\ec25'; }
+.codicon-git-stash:before { content: '\ec26'; }
+.codicon-git-stash-apply:before { content: '\ec27'; }
+.codicon-git-stash-pop:before { content: '\ec28'; }
+.codicon-vscode:before { content: '\ec29'; }
+.codicon-vscode-insiders:before { content: '\ec2a'; }
+.codicon-code-oss:before { content: '\ec2b'; }
+.codicon-run-coverage:before { content: '\ec2c'; }
+.codicon-run-all-coverage:before { content: '\ec2d'; }
+.codicon-coverage:before { content: '\ec2e'; }
+.codicon-github-project:before { content: '\ec2f'; }
+.codicon-map-vertical:before { content: '\ec30'; }
+.codicon-fold-vertical:before { content: '\ec30'; }
+.codicon-map-vertical-filled:before { content: '\ec31'; }
+.codicon-fold-vertical-filled:before { content: '\ec31'; }
+.codicon-go-to-search:before { content: '\ec32'; }
+.codicon-percentage:before { content: '\ec33'; }
+.codicon-sort-percentage:before { content: '\ec33'; }
+.codicon-attach:before { content: '\ec34'; }
+.codicon-git-fetch:before { content: '\f101'; }
diff --git a/tests/assets/codicon.ttf b/tests/assets/codicon.ttf
new file mode 100644
index 0000000000000..27ee4c68caef1
Binary files /dev/null and b/tests/assets/codicon.ttf differ
diff --git a/tests/assets/detect-touch.html b/tests/assets/detect-touch.html
deleted file mode 100644
index 80a4123fbd970..0000000000000
--- a/tests/assets/detect-touch.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Detect Touch Test</title>
-    <script src='modernizr.js'></script>
-  </head>
-  <body style="font-size:30vmin">
-    <script>
-      document.body.textContent = Modernizr.touchevents ? 'YES' : 'NO';
-    </script>
-  </body>
-</html>
diff --git a/tests/assets/es6/.eslintrc b/tests/assets/es6/.eslintrc
deleted file mode 100644
index 1903e176f51a8..0000000000000
--- a/tests/assets/es6/.eslintrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "parserOptions": {
-        "sourceType": "module"
-    }
-}
\ No newline at end of file
diff --git a/tests/assets/simple-extension/content-script.js b/tests/assets/extension-mv3-simple/content-script.js
similarity index 100%
rename from tests/assets/simple-extension/content-script.js
rename to tests/assets/extension-mv3-simple/content-script.js
diff --git a/tests/assets/simple-extension/index.js b/tests/assets/extension-mv3-simple/index.js
similarity index 63%
rename from tests/assets/simple-extension/index.js
rename to tests/assets/extension-mv3-simple/index.js
index a0bb3f4eae75a..1523a8364294b 100644
--- a/tests/assets/simple-extension/index.js
+++ b/tests/assets/extension-mv3-simple/index.js
@@ -1,2 +1,2 @@
 // Mock script for background extension
-window.MAGIC = 42;
+globalThis.MAGIC = 42;
diff --git a/tests/assets/simple-extension/manifest.json b/tests/assets/extension-mv3-simple/manifest.json
similarity index 80%
rename from tests/assets/simple-extension/manifest.json
rename to tests/assets/extension-mv3-simple/manifest.json
index da2cd082edb64..39b77fc21d1a0 100644
--- a/tests/assets/simple-extension/manifest.json
+++ b/tests/assets/extension-mv3-simple/manifest.json
@@ -2,7 +2,7 @@
   "name": "Simple extension",
   "version": "0.1",
   "background": {
-    "scripts": ["index.js"]
+    "service_worker": "index.js"
   },
   "content_scripts": [{
     "matches": ["<all_urls>"],
@@ -10,5 +10,5 @@
     "js": ["content-script.js"]
   }],
   "permissions": ["background", "activeTab"],
-  "manifest_version": 2
+  "manifest_version": 3
 }
diff --git a/tests/assets/extension-mv3-with-logging/background.js b/tests/assets/extension-mv3-with-logging/background.js
new file mode 100644
index 0000000000000..3780fa3f212d2
--- /dev/null
+++ b/tests/assets/extension-mv3-with-logging/background.js
@@ -0,0 +1,5 @@
+console.log("Service worker script loaded");
+
+chrome.runtime.onInstalled.addListener(() => {
+  console.log("Extension installed");
+});
\ No newline at end of file
diff --git a/tests/assets/extension-mv3-with-logging/content.js b/tests/assets/extension-mv3-with-logging/content.js
new file mode 100644
index 0000000000000..e718206c2a9c3
--- /dev/null
+++ b/tests/assets/extension-mv3-with-logging/content.js
@@ -0,0 +1 @@
+console.log("Test console log from a third-party execution context");
diff --git a/tests/assets/extension-mv3-with-logging/manifest.json b/tests/assets/extension-mv3-with-logging/manifest.json
new file mode 100644
index 0000000000000..429dc77980182
--- /dev/null
+++ b/tests/assets/extension-mv3-with-logging/manifest.json
@@ -0,0 +1,17 @@
+{
+    "manifest_version": 3,
+    "name": "Console Log Extension",
+    "version": "1.0",
+    "background": {
+      "service_worker": "background.js"
+    },
+    "permissions": [
+      "tabs"
+    ],
+    "content_scripts": [
+      {
+        "matches": ["<all_urls>"],
+        "js": ["content.js"]
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/tests/assets/input/background-fixed.html b/tests/assets/input/background-fixed.html
new file mode 100644
index 0000000000000..5093939a5baaa
--- /dev/null
+++ b/tests/assets/input/background-fixed.html
@@ -0,0 +1,16 @@
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5">
+<style>
+
+body {
+    background: #fff url("/pptr.png") no-repeat center 30px;
+    background-attachment: fixed;
+    margin-top: 36px;
+}
+
+</style>
+</head>
+<body>
+  <div style="height: 3000px; background-color: antiquewhite;">tall</div>
+  <button>Click me</button>
+</body>
diff --git a/tests/assets/input/handle-locator.html b/tests/assets/input/handle-locator.html
index a42849e951cc8..5b164d5c7a082 100644
--- a/tests/assets/input/handle-locator.html
+++ b/tests/assets/input/handle-locator.html
@@ -57,7 +57,7 @@
         };
 
         if (interstitial.classList.contains('timeout'))
-          builtinSetTimeout(closeInterstitial, 3000);
+          window.builtins.setTimeout(closeInterstitial, 3000);
         else
           closeInterstitial();
       });
diff --git a/tests/assets/input/keyboard.html b/tests/assets/input/keyboard.html
index fd962c7518d66..049ed439bea53 100644
--- a/tests/assets/input/keyboard.html
+++ b/tests/assets/input/keyboard.html
@@ -10,13 +10,13 @@
       let textarea = document.querySelector('textarea');
       textarea.focus();
       textarea.addEventListener('keydown', event => {
-        log('Keydown:', event.key, event.code, event.which, modifiers(event));
+        log('Keydown:', event.key, event.code, getLocation(event), modifiers(event));
       });
       textarea.addEventListener('keypress', event => {
-        log('Keypress:', event.key, event.code, event.which, event.charCode, modifiers(event));
+        log('Keypress:', event.key, event.code, getLocation(event), event.charCode, modifiers(event));
       });
       textarea.addEventListener('keyup', event => {
-        log('Keyup:', event.key, event.code, event.which, modifiers(event));
+        log('Keyup:', event.key, event.code, getLocation(event), modifiers(event));
       });
       function modifiers(event) {
         let m = [];
@@ -28,6 +28,15 @@
           m.push('Shift')
         return '[' + m.join(' ') + ']';
       }
+      function getLocation(event) {
+        switch (event.location) {
+          case KeyboardEvent.DOM_KEY_LOCATION_STANDARD: return 'STANDARD';
+          case KeyboardEvent.DOM_KEY_LOCATION_LEFT: return 'LEFT';
+          case KeyboardEvent.DOM_KEY_LOCATION_RIGHT: return 'RIGHT';
+          case KeyboardEvent.DOM_KEY_LOCATION_NUMPAD: return 'NUMPAD';
+          default: return 'Unknown: ' + event.location;
+        };
+      }
       function log(...args) {
         console.log.apply(console, args);
         result += args.join(' ') + '\n';
diff --git a/tests/assets/modernizr.html b/tests/assets/modernizr.html
deleted file mode 100644
index 5096ffba74789..0000000000000
--- a/tests/assets/modernizr.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<script src='modernizr.js'></script>
-<body></body>
-<script>
-const report = {};
-for (const name in Modernizr) {
-  if (name.startsWith('_'))
-    continue;
-  if (['on', 'testAllProps', 'testProp', 'addTest', 'prefixed'].includes(name))
-    continue;
-  let value = Modernizr[name];
-  report[name] = value;
-}
-
-report['devicemotion2'] = 'ondevicemotion' in window;
-report['deviceorientation2'] = 'orientation' in window;
-report['deviceorientation3'] = 'ondeviceorientation' in window;
-
-document.body.style.whiteSpace = 'pre';
-document.body.textContent = JSON.stringify(report, undefined, 4);
-window.report = JSON.parse(document.body.textContent);
-</script>
diff --git a/tests/assets/modernizr.js b/tests/assets/modernizr.js
deleted file mode 100644
index 1a03ac53b556c..0000000000000
--- a/tests/assets/modernizr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! modernizr 3.6.0 (Custom Build) | MIT *
- * https://modernizr.com/download/?-MessageChannel-adownload-ambientlight-animation-apng-appearance-applicationcache-arrow-atobbtoa-audio-audioloop-audiopreload-backdropfilter-backgroundblendmode-backgroundcliptext-backgroundsize-batteryapi-bdi-beacon-bgpositionshorthand-bgpositionxy-bgrepeatspace_bgrepeatround-bgsizecover-blobconstructor-bloburls-blobworkers-borderimage-borderradius-boxshadow-boxsizing-canvas-canvasblending-canvastext-canvaswinding-capture-checked-classlist-contains-contenteditable-contextmenu-cookies-cors-createelementattrs_createelement_attrs-cryptography-cssall-cssanimations-csscalc-csschunit-csscolumns-cssescape-cssexunit-cssfilters-cssgradients-cssgrid_cssgridlegacy-csshyphens_softhyphens_softhyphensfind-cssinvalid-cssmask-csspointerevents-csspositionsticky-csspseudoanimations-csspseudotransitions-cssreflections-cssremunit-cssresize-cssscrollbar-csstransforms-csstransforms3d-csstransformslevel2-csstransitions-cssvalid-cssvhunit-cssvmaxunit-cssvminunit-cssvwunit-cubicbezierrange-customelements-customevent-customprotocolhandler-dart-datachannel-datalistelem-dataset-datauri-dataview-dataworkers-details-devicemotion_deviceorientation-directory-display_runin-displaytable-documentfragment-ellipsis-emoji-es5-es5array-es5date-es5function-es5object-es5string-es5syntax-es5undefined-es6array-es6collections-es6math-es6number-es6object-es6string-eventlistener-eventsource-exiforientation-fetch-fileinput-filereader-filesystem-flash-flexbox-flexboxlegacy-flexboxtweener-flexwrap-focuswithin-fontface-forcetouch-formattribute-formvalidation-framed-fullscreen-gamepads-generatedcontent-generators-geolocation-getrandomvalues-getusermedia-hairline-hashchange-hidden-hiddenscroll-history-hovermq-hsla-htmlimports-ie8compat-imgcrossorigin-indexeddb-indexeddbblob-inlinesvg-input-inputformaction-inputformenctype-inputformmethod-inputformtarget-inputtypes-intl-jpeg2000-jpegxr-json-lastchild-ligatures-localizednumber-localstorage-lowbandwidth-lowbattery-matchmedia-mathml-mediaqueries-microdata-multiplebgs-mutationobserver-notification-nthchild-objectfit-olreversed-oninput-opacity-outputelem-overflowscrolling-pagevisibility-passiveeventlisteners-peerconnection-performance-picture-placeholder-pointerevents-pointerlock-pointermq-postmessage-preserve3d-progressbar_meter-promises-proximity-queryselector-quotamanagement-regions-requestanimationframe-requestautocomplete-rgba-ruby-sandbox-scriptasync-scriptdefer-scrollsnappoints-seamless-search-serviceworker-sessionstorage-shapes-sharedworkers-siblinggeneral-sizes-smil-speechrecognition-speechsynthesis-srcdoc-srcset-strictmode-stylescoped-subpixelfont-supports-svg-svgasimg-svgclippaths-svgfilters-svgforeignobject-target-template-templatestrings-textalignlast-textareamaxlength-textshadow-texttrackapi_track-time-todataurljpeg_todataurlpng_todataurlwebp-touchevents-transferables-typedarrays-unicode-unicoderange-unknownelements-urlparser-urlsearchparams-userdata-userselect-variablefonts-vibrate-video-videoautoplay-videocrossorigin-videoloop-videopreload-vml-webaudio-webgl-webglextensions-webintents-webp-webpalpha-webpanimation-webplossless_webp_lossless-websockets-websocketsbinary-websqldatabase-webworkers-willchange-wrapflow-xdomainrequest-xhr2-xhrresponsetype-xhrresponsetypearraybuffer-xhrresponsetypeblob-xhrresponsetypedocument-xhrresponsetypejson-xhrresponsetypetext-setclasses !*/
-!function(window,document,undefined){function is(A,e){return typeof A===e}function testRunner(){var A,e,t,n,r,o,i;for(var d in tests)if(tests.hasOwnProperty(d)){if(A=[],e=tests[d],e.name&&(A.push(e.name.toLowerCase()),e.options&&e.options.aliases&&e.options.aliases.length))for(t=0;t<e.options.aliases.length;t++)A.push(e.options.aliases[t].toLowerCase());for(n=is(e.fn,"function")?e.fn():e.fn,r=0;r<A.length;r++)o=A[r],i=o.split("."),1===i.length?Modernizr[i[0]]=n:(!Modernizr[i[0]]||Modernizr[i[0]]instanceof Boolean||(Modernizr[i[0]]=new Boolean(Modernizr[i[0]])),Modernizr[i[0]][i[1]]=n),classes.push((n?"":"no-")+i.join("-"))}}function setClasses(A){var e=docElement.className,t=Modernizr._config.classPrefix||"";if(isSVG&&(e=e.baseVal),Modernizr._config.enableJSClass){var n=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");e=e.replace(n,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(e+=" "+t+A.join(" "+t),isSVG?docElement.className.baseVal=e:docElement.className=e)}function createElement(){return"function"!=typeof document.createElement?document.createElement(arguments[0]):isSVG?document.createElementNS.call(document,"http://www.w3.org/2000/svg",arguments[0]):document.createElement.apply(document,arguments)}function getBody(){var A=document.body;return A||(A=createElement(isSVG?"svg":"body"),A.fake=!0),A}function contains(A,e){return!!~(""+A).indexOf(e)}function computedStyle(A,e,t){var n;if("getComputedStyle"in window){n=getComputedStyle.call(window,A,e);var r=window.console;if(null!==n)t&&(n=n.getPropertyValue(t));else if(r){var o=r.error?"error":"log";r[o].call(r,"getComputedStyle returning null, its possible modernizr test results are inaccurate")}}else n=!e&&A.currentStyle&&A.currentStyle[t];return n}function roundedEquals(A,e){return A-1===e||A===e||A+1===e}function injectElementWithStyles(A,e,t,n){var r,o,i,d,a="modernizr",s=createElement("div"),l=getBody();if(parseInt(t,10))for(;t--;)i=createElement("div"),i.id=n?n[t]:a+(t+1),s.appendChild(i);return r=createElement("style"),r.type="text/css",r.id="s"+a,(l.fake?l:s).appendChild(r),l.appendChild(s),r.styleSheet?r.styleSheet.cssText=A:r.appendChild(document.createTextNode(A)),s.id=a,l.fake&&(l.style.background="",l.style.overflow="hidden",d=docElement.style.overflow,docElement.style.overflow="hidden",docElement.appendChild(l)),o=e(s,A),l.fake?(l.parentNode.removeChild(l),docElement.style.overflow=d,docElement.offsetHeight):s.parentNode.removeChild(s),!!o}function addTest(A,e){if("object"==typeof A)for(var t in A)hasOwnProp(A,t)&&addTest(t,A[t]);else{A=A.toLowerCase();var n=A.split("."),r=Modernizr[n[0]];if(2==n.length&&(r=r[n[1]]),"undefined"!=typeof r)return Modernizr;e="function"==typeof e?e():e,1==n.length?Modernizr[n[0]]=e:(!Modernizr[n[0]]||Modernizr[n[0]]instanceof Boolean||(Modernizr[n[0]]=new Boolean(Modernizr[n[0]])),Modernizr[n[0]][n[1]]=e),setClasses([(e&&0!=e?"":"no-")+n.join("-")]),Modernizr._trigger(A,e)}return Modernizr}function cssToDOM(A){return A.replace(/([a-z])-([a-z])/g,function(A,e,t){return e+t.toUpperCase()}).replace(/^-/,"")}function fnBind(A,e){return function(){return A.apply(e,arguments)}}function testDOMProps(A,e,t){var n;for(var r in A)if(A[r]in e)return t===!1?A[r]:(n=e[A[r]],is(n,"function")?fnBind(n,t||e):n);return!1}function domToCSS(A){return A.replace(/([A-Z])/g,function(A,e){return"-"+e.toLowerCase()}).replace(/^ms-/,"-ms-")}function nativeTestProps(A,e){var t=A.length;if("CSS"in window&&"supports"in window.CSS){for(;t--;)if(window.CSS.supports(domToCSS(A[t]),e))return!0;return!1}if("CSSSupportsRule"in window){for(var n=[];t--;)n.push("("+domToCSS(A[t])+":"+e+")");return n=n.join(" or "),injectElementWithStyles("@supports ("+n+") { #modernizr { position: absolute; } }",function(A){return"absolute"==computedStyle(A,null,"position")})}return undefined}function testProps(A,e,t,n){function r(){i&&(delete mStyle.style,delete mStyle.modElem)}if(n=is(n,"undefined")?!1:n,!is(t,"undefined")){var o=nativeTestProps(A,t);if(!is(o,"undefined"))return o}for(var i,d,a,s,l,c=["modernizr","tspan","samp"];!mStyle.style&&c.length;)i=!0,mStyle.modElem=createElement(c.shift()),mStyle.style=mStyle.modElem.style;for(a=A.length,d=0;a>d;d++)if(s=A[d],l=mStyle.style[s],contains(s,"-")&&(s=cssToDOM(s)),mStyle.style[s]!==undefined){if(n||is(t,"undefined"))return r(),"pfx"==e?s:!0;try{mStyle.style[s]=t}catch(u){}if(mStyle.style[s]!=l)return r(),"pfx"==e?s:!0}return r(),!1}function testPropsAll(A,e,t,n,r){var o=A.charAt(0).toUpperCase()+A.slice(1),i=(A+" "+cssomPrefixes.join(o+" ")+o).split(" ");return is(e,"string")||is(e,"undefined")?testProps(i,e,n,r):(i=(A+" "+domPrefixes.join(o+" ")+o).split(" "),testDOMProps(i,e,t))}function detectDeleteDatabase(A,e){var t=A.deleteDatabase(e);t.onsuccess=function(){addTest("indexeddb.deletedatabase",!0)},t.onerror=function(){addTest("indexeddb.deletedatabase",!1)}}function testAllProps(A,e,t){return testPropsAll(A,undefined,undefined,e,t)}var classes=[],tests=[],ModernizrProto={_version:"3.6.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(A,e){var t=this;setTimeout(function(){e(t[A])},0)},addTest:function(A,e,t){tests.push({name:A,fn:e,options:t})},addAsyncTest:function(A){tests.push({name:null,fn:A})}},Modernizr=function(){};Modernizr.prototype=ModernizrProto,Modernizr=new Modernizr,Modernizr.addTest("history",function(){var A=navigator.userAgent;return-1===A.indexOf("Android 2.")&&-1===A.indexOf("Android 4.0")||-1===A.indexOf("Mobile Safari")||-1!==A.indexOf("Chrome")||-1!==A.indexOf("Windows Phone")||"file:"===location.protocol?window.history&&"pushState"in window.history:!1}),Modernizr.addTest("ie8compat",!window.addEventListener&&!!document.documentMode&&7===document.documentMode),Modernizr.addTest("applicationcache","applicationCache"in window),Modernizr.addTest("blobconstructor",function(){try{return!!new Blob}catch(A){return!1}},{aliases:["blob-constructor"]}),Modernizr.addTest("cookies",function(){try{document.cookie="cookietest=1";var A=-1!=document.cookie.indexOf("cookietest=");return document.cookie="cookietest=1; expires=Thu, 01-Jan-1970 00:00:01 GMT",A}catch(e){return!1}}),Modernizr.addTest("cors","XMLHttpRequest"in window&&"withCredentials"in new XMLHttpRequest),Modernizr.addTest("customelements","customElements"in window),Modernizr.addTest("customprotocolhandler",function(){if(!navigator.registerProtocolHandler)return!1;try{navigator.registerProtocolHandler("thisShouldFail")}catch(A){return A instanceof TypeError}return!1}),Modernizr.addTest("customevent","CustomEvent"in window&&"function"==typeof window.CustomEvent),Modernizr.addTest("dataview","undefined"!=typeof DataView&&"getFloat64"in DataView.prototype),Modernizr.addTest("eventlistener","addEventListener"in window),Modernizr.addTest("geolocation","geolocation"in navigator),Modernizr.addTest("json","JSON"in window&&"parse"in JSON&&"stringify"in JSON),Modernizr.addTest("messagechannel","MessageChannel"in window),Modernizr.addTest("notification",function(){if(!window.Notification||!window.Notification.requestPermission)return!1;if("granted"===window.Notification.permission)return!0;try{new window.Notification("")}catch(A){if("TypeError"===A.name)return!1}return!0}),Modernizr.addTest("postmessage","postMessage"in window),Modernizr.addTest("queryselector","querySelector"in document&&"querySelectorAll"in document),Modernizr.addTest("serviceworker","serviceWorker"in navigator),Modernizr.addTest("svg",!!document.createElementNS&&!!document.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect),Modernizr.addTest("templatestrings",function(){var supports;try{eval("``"),supports=!0}catch(e){}return!!supports}),Modernizr.addTest("typedarrays","ArrayBuffer"in window);var supports=!1;try{supports="WebSocket"in window&&2===window.WebSocket.CLOSING}catch(e){}Modernizr.addTest("websockets",supports),Modernizr.addTest("xdomainrequest","XDomainRequest"in window),Modernizr.addTest("webaudio",function(){var A="webkitAudioContext"in window,e="AudioContext"in window;return Modernizr._config.usePrefixes?A||e:e});var CSS=window.CSS;Modernizr.addTest("cssescape",CSS?"function"==typeof CSS.escape:!1),Modernizr.addTest("focuswithin",function(){try{document.querySelector(":focus-within")}catch(A){return!1}return!0});var newSyntax="CSS"in window&&"supports"in window.CSS,oldSyntax="supportsCSS"in window;Modernizr.addTest("supports",newSyntax||oldSyntax),Modernizr.addTest("target",function(){var A=window.document;if(!("querySelectorAll"in A))return!1;try{return A.querySelectorAll(":target"),!0}catch(e){return!1}}),Modernizr.addTest("microdata","getItems"in document),Modernizr.addTest("mutationobserver",!!window.MutationObserver||!!window.WebKitMutationObserver),Modernizr.addTest("passiveeventlisteners",function(){var A=!1;try{var e=Object.defineProperty({},"passive",{get:function(){A=!0}});window.addEventListener("test",null,e)}catch(t){}return A}),Modernizr.addTest("picture","HTMLPictureElement"in window),Modernizr.addTest("es5array",function(){return!!(Array.prototype&&Array.prototype.every&&Array.prototype.filter&&Array.prototype.forEach&&Array.prototype.indexOf&&Array.prototype.lastIndexOf&&Array.prototype.map&&Array.prototype.some&&Array.prototype.reduce&&Array.prototype.reduceRight&&Array.isArray)}),Modernizr.addTest("es5date",function(){var A="2013-04-12T06:06:37.307Z",e=!1;try{e=!!Date.parse(A)}catch(t){}return!!(Date.now&&Date.prototype&&Date.prototype.toISOString&&Date.prototype.toJSON&&e)}),Modernizr.addTest("es5function",function(){return!(!Function.prototype||!Function.prototype.bind)}),Modernizr.addTest("beacon","sendBeacon"in navigator),Modernizr.addTest("lowbandwidth",function(){var A=navigator.connection||{type:0};return 3==A.type||4==A.type||/^[23]g$/.test(A.type)}),Modernizr.addTest("eventsource","EventSource"in window),Modernizr.addTest("fetch","fetch"in window),Modernizr.addTest("xhrresponsetype",function(){if("undefined"==typeof XMLHttpRequest)return!1;var A=new XMLHttpRequest;return A.open("get","/",!0),"response"in A}()),Modernizr.addTest("xhr2","XMLHttpRequest"in window&&"withCredentials"in new XMLHttpRequest),Modernizr.addTest("speechsynthesis","SpeechSynthesisUtterance"in window),Modernizr.addTest("localstorage",function(){var A="modernizr";try{return localStorage.setItem(A,A),localStorage.removeItem(A),!0}catch(e){return!1}}),Modernizr.addTest("sessionstorage",function(){var A="modernizr";try{return sessionStorage.setItem(A,A),sessionStorage.removeItem(A),!0}catch(e){return!1}}),Modernizr.addTest("websqldatabase","openDatabase"in window),Modernizr.addTest("es5object",function(){return!!(Object.keys&&Object.create&&Object.getPrototypeOf&&Object.getOwnPropertyNames&&Object.isSealed&&Object.isFrozen&&Object.isExtensible&&Object.getOwnPropertyDescriptor&&Object.defineProperty&&Object.defineProperties&&Object.seal&&Object.freeze&&Object.preventExtensions)}),Modernizr.addTest("svgfilters",function(){var A=!1;try{A="SVGFEColorMatrixElement"in window&&2==SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_SATURATE}catch(e){}return A}),Modernizr.addTest("strictmode",function(){"use strict";return!this}()),Modernizr.addTest("es5string",function(){return!(!String.prototype||!String.prototype.trim)}),Modernizr.addTest("es5syntax",function(){var value,obj,stringAccess,getter,setter,reservedWords,zeroWidthChars;try{return stringAccess=eval('"foobar"[3] === "b"'),getter=eval("({ get x(){ return 1 } }).x === 1"),eval("({ set x(v){ value = v; } }).x = 1"),setter=1===value,eval("obj = ({ if: 1 })"),reservedWords=1===obj["if"],zeroWidthChars=eval("_‌‍ = true"),stringAccess&&getter&&setter&&reservedWords&&zeroWidthChars}catch(ignore){return!1}}),Modernizr.addTest("es5undefined",function(){var A,e;try{e=window.undefined,window.undefined=12345,A="undefined"==typeof window.undefined,window.undefined=e}catch(t){return!1}return A}),Modernizr.addTest("es5",function(){return!!(Modernizr.es5array&&Modernizr.es5date&&Modernizr.es5function&&Modernizr.es5object&&Modernizr.strictmode&&Modernizr.es5string&&Modernizr.json&&Modernizr.es5syntax&&Modernizr.es5undefined)}),Modernizr.addTest("es6array",!!(Array.prototype&&Array.prototype.copyWithin&&Array.prototype.fill&&Array.prototype.find&&Array.prototype.findIndex&&Array.prototype.keys&&Array.prototype.entries&&Array.prototype.values&&Array.from&&Array.of)),Modernizr.addTest("arrow",function(){try{eval("()=>{}")}catch(e){return!1}return!0}),Modernizr.addTest("es6collections",!!(window.Map&&window.Set&&window.WeakMap&&window.WeakSet)),Modernizr.addTest("generators",function(){try{new Function("function* test() {}")()}catch(A){return!1}return!0}),Modernizr.addTest("es6math",!!(Math&&Math.clz32&&Math.cbrt&&Math.imul&&Math.sign&&Math.log10&&Math.log2&&Math.log1p&&Math.expm1&&Math.cosh&&Math.sinh&&Math.tanh&&Math.acosh&&Math.asinh&&Math.atanh&&Math.hypot&&Math.trunc&&Math.fround)),Modernizr.addTest("es6number",!!(Number.isFinite&&Number.isInteger&&Number.isSafeInteger&&Number.isNaN&&Number.parseInt&&Number.parseFloat&&Number.isInteger(Number.MAX_SAFE_INTEGER)&&Number.isInteger(Number.MIN_SAFE_INTEGER)&&Number.isFinite(Number.EPSILON))),Modernizr.addTest("es6object",!!(Object.assign&&Object.is&&Object.setPrototypeOf)),Modernizr.addTest("promises",function(){return"Promise"in window&&"resolve"in window.Promise&&"reject"in window.Promise&&"all"in window.Promise&&"race"in window.Promise&&function(){var A;return new window.Promise(function(e){A=e}),"function"==typeof A}()}),Modernizr.addTest("es6string",!!(String.fromCodePoint&&String.raw&&String.prototype.codePointAt&&String.prototype.repeat&&String.prototype.startsWith&&String.prototype.endsWith&&String.prototype.includes)),Modernizr.addTest("devicemotion","DeviceMotionEvent"in window),Modernizr.addTest("deviceorientation","DeviceOrientationEvent"in window),Modernizr.addTest("filereader",!!(window.File&&window.FileList&&window.FileReader)),Modernizr.addTest("urlparser",function(){var A;try{return A=new URL("http://modernizr.com/"),"http://modernizr.com/"===A.href}catch(e){return!1}}),Modernizr.addTest("urlsearchparams","URLSearchParams"in window),Modernizr.addTest("framed",window.location!=top.location),Modernizr.addTest("webworkers","Worker"in window);var docElement=document.documentElement;Modernizr.addTest("contextmenu","contextMenu"in docElement&&"HTMLMenuItemElement"in window),Modernizr.addTest("cssall","all"in docElement.style),Modernizr.addTest("willchange","willChange"in docElement.style),Modernizr.addTest("classlist","classList"in docElement),Modernizr.addTest("documentfragment",function(){return"createDocumentFragment"in document&&"appendChild"in docElement}),Modernizr.addTest("contains",is(String.prototype.contains,"function"));var isSVG="svg"===docElement.nodeName.toLowerCase();Modernizr.addTest("audio",function(){var A=createElement("audio"),e=!1;try{e=!!A.canPlayType,e&&(e=new Boolean(e),e.ogg=A.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,""),e.mp3=A.canPlayType('audio/mpeg; codecs="mp3"').replace(/^no$/,""),e.opus=A.canPlayType('audio/ogg; codecs="opus"')||A.canPlayType('audio/webm; codecs="opus"').replace(/^no$/,""),e.wav=A.canPlayType('audio/wav; codecs="1"').replace(/^no$/,""),e.m4a=(A.canPlayType("audio/x-m4a;")||A.canPlayType("audio/aac;")).replace(/^no$/,""))}catch(t){}return e}),Modernizr.addTest("canvas",function(){var A=createElement("canvas");return!(!A.getContext||!A.getContext("2d"))}),Modernizr.addTest("canvastext",function(){return Modernizr.canvas===!1?!1:"function"==typeof createElement("canvas").getContext("2d").fillText}),Modernizr.addTest("contenteditable",function(){if("contentEditable"in docElement){var A=createElement("div");return A.contentEditable=!0,"true"===A.contentEditable}}),Modernizr.addTest("emoji",function(){if(!Modernizr.canvastext)return!1;var A=window.devicePixelRatio||1,e=12*A,t=createElement("canvas"),n=t.getContext("2d");return n.fillStyle="#f00",n.textBaseline="top",n.font="32px Arial",n.fillText("🐨",0,0),0!==n.getImageData(e,e,1,1).data[0]}),Modernizr.addTest("olreversed","reversed"in createElement("ol")),Modernizr.addTest("userdata",!!createElement("div").addBehavior),Modernizr.addTest("video",function(){var A=createElement("video"),e=!1;try{e=!!A.canPlayType,e&&(e=new Boolean(e),e.ogg=A.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,""),e.h264=A.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,""),e.webm=A.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,""),e.vp9=A.canPlayType('video/webm; codecs="vp9"').replace(/^no$/,""),e.hls=A.canPlayType('application/x-mpegURL; codecs="avc1.42E01E"').replace(/^no$/,""))}catch(t){}return e}),Modernizr.addTest("vml",function(){var A,e=createElement("div"),t=!1;return isSVG||(e.innerHTML='<v:shape id="vml_flag1" adj="1" />',A=e.firstChild,"style"in A&&(A.style.behavior="url(#default#VML)"),t=A?"object"==typeof A.adj:!0),t}),Modernizr.addTest("webanimations","animate"in createElement("div")),Modernizr.addTest("webgl",function(){var A=createElement("canvas"),e="probablySupportsContext"in A?"probablySupportsContext":"supportsContext";return e in A?A[e]("webgl")||A[e]("experimental-webgl"):"WebGLRenderingContext"in window}),Modernizr.addTest("adownload",!window.externalHost&&"download"in createElement("a")),Modernizr.addTest("audioloop","loop"in createElement("audio")),Modernizr.addTest("canvasblending",function(){if(Modernizr.canvas===!1)return!1;var A=createElement("canvas").getContext("2d");try{A.globalCompositeOperation="screen"}catch(e){}return"screen"===A.globalCompositeOperation});var canvas=createElement("canvas");Modernizr.addTest("todataurljpeg",function(){return!!Modernizr.canvas&&0===canvas.toDataURL("image/jpeg").indexOf("data:image/jpeg")}),Modernizr.addTest("todataurlpng",function(){return!!Modernizr.canvas&&0===canvas.toDataURL("image/png").indexOf("data:image/png")}),Modernizr.addTest("todataurlwebp",function(){var A=!1;try{A=!!Modernizr.canvas&&0===canvas.toDataURL("image/webp").indexOf("data:image/webp")}catch(e){}return A}),Modernizr.addTest("canvaswinding",function(){if(Modernizr.canvas===!1)return!1;var A=createElement("canvas").getContext("2d");return A.rect(0,0,10,10),A.rect(2,2,6,6),A.isPointInPath(5,5,"evenodd")===!1}),Modernizr.addTest("bgpositionshorthand",function(){var A=createElement("a"),e=A.style,t="right 10px bottom 10px";return e.cssText="background-position: "+t+";",e.backgroundPosition===t}),Modernizr.addTest("multiplebgs",function(){var A=createElement("a").style;return A.cssText="background:url(https://),url(https://),red url(https://)",/(url\s*\(.*?){3}/.test(A.background)}),Modernizr.addTest("csspointerevents",function(){var A=createElement("a").style;return A.cssText="pointer-events:auto","auto"===A.pointerEvents}),Modernizr.addTest("cssremunit",function(){var A=createElement("a").style;try{A.fontSize="3rem"}catch(e){}return/rem/.test(A.fontSize)}),Modernizr.addTest("rgba",function(){var A=createElement("a").style;return A.cssText="background-color:rgba(150,255,150,.5)",(""+A.backgroundColor).indexOf("rgba")>-1}),Modernizr.addTest("preserve3d",function(){var A,e,t=window.CSS,n=!1;return t&&t.supports&&t.supports("(transform-style: preserve-3d)")?!0:(A=createElement("a"),e=createElement("a"),A.style.cssText="display: block; transform-style: preserve-3d; transform-origin: right; transform: rotateY(40deg);",e.style.cssText="display: block; width: 9px; height: 1px; background: #000; transform-origin: right; transform: rotateY(40deg);",A.appendChild(e),docElement.appendChild(A),n=e.getBoundingClientRect(),docElement.removeChild(A),n=n.width&&n.width<4)}),Modernizr.addTest("createelementattrs",function(){try{return"test"==createElement('<input name="test" />').getAttribute("name")}catch(A){return!1}},{aliases:["createelement-attrs"]}),Modernizr.addTest("dataset",function(){var A=createElement("div");return A.setAttribute("data-a-b","c"),!(!A.dataset||"c"!==A.dataset.aB)}),Modernizr.addTest("hidden","hidden"in createElement("a")),Modernizr.addTest("outputelem","value"in createElement("output")),Modernizr.addTest("progressbar",createElement("progress").max!==undefined),Modernizr.addTest("meter",createElement("meter").max!==undefined),Modernizr.addTest("ruby",function(){function A(A,e){var t;return window.getComputedStyle?t=document.defaultView.getComputedStyle(A,null).getPropertyValue(e):A.currentStyle&&(t=A.currentStyle[e]),t}function e(){docElement.removeChild(t),t=null,n=null,r=null}var t=createElement("ruby"),n=createElement("rt"),r=createElement("rp"),o="display",i="fontSize";return t.appendChild(r),t.appendChild(n),docElement.appendChild(t),"none"==A(r,o)||"ruby"==A(t,o)&&"ruby-text"==A(n,o)||"6pt"==A(r,i)&&"6pt"==A(n,i)?(e(),!0):(e(),!1)}),Modernizr.addTest("template","content"in createElement("template")),Modernizr.addTest("srcset","srcset"in createElement("img")),Modernizr.addTest("time","valueAsDate"in createElement("time")),Modernizr.addTest("texttrackapi","function"==typeof createElement("video").addTextTrack),Modernizr.addTest("track","kind"in createElement("track")),Modernizr.addTest("unknownelements",function(){var A=createElement("a");return A.innerHTML="<xyz></xyz>",1===A.childNodes.length}),Modernizr.addTest("inputformaction",!!("formAction"in createElement("input")),{aliases:["input-formaction"]}),Modernizr.addTest("inputformenctype",!!("formEnctype"in createElement("input")),{aliases:["input-formenctype"]}),Modernizr.addTest("inputformmethod",!!("formMethod"in createElement("input"))),Modernizr.addTest("inputformtarget",!!("formtarget"in createElement("input")),{aliases:["input-formtarget"]}),Modernizr.addTest("scriptasync","async"in createElement("script")),Modernizr.addTest("scriptdefer","defer"in createElement("script")),Modernizr.addTest("stylescoped","scoped"in createElement("style")),Modernizr.addTest("capture","capture"in createElement("input")),Modernizr.addTest("fileinput",function(){if(navigator.userAgent.match(/(Android (1.0|1.1|1.5|1.6|2.0|2.1))|(Windows Phone (OS 7|8.0))|(XBLWP)|(ZuneWP)|(w(eb)?OSBrowser)|(webOS)|(Kindle\/(1.0|2.0|2.5|3.0))/))return!1;var A=createElement("input");return A.type="file",!A.disabled}),Modernizr.addTest("formattribute",function(){var A,e=createElement("form"),t=createElement("input"),n=createElement("div"),r="formtest"+(new Date).getTime(),o=!1;e.id=r;try{t.setAttribute("form",r)}catch(i){document.createAttribute&&(A=document.createAttribute("form"),A.nodeValue=r,t.setAttributeNode(A))}return n.appendChild(e),n.appendChild(t),docElement.appendChild(n),o=e.elements&&1===e.elements.length&&t.form==e,n.parentNode.removeChild(n),o}),Modernizr.addTest("placeholder","placeholder"in createElement("input")&&"placeholder"in createElement("textarea")),Modernizr.addTest("sandbox","sandbox"in createElement("iframe")),Modernizr.addTest("inlinesvg",function(){var A=createElement("div");return A.innerHTML="<svg/>","http://www.w3.org/2000/svg"==("undefined"!=typeof SVGRect&&A.firstChild&&A.firstChild.namespaceURI)}),Modernizr.addTest("textareamaxlength",!!("maxLength"in createElement("textarea"))),Modernizr.addTest("videocrossorigin","crossOrigin"in createElement("video")),Modernizr.addAsyncTest(function(){if(Modernizr.webglextensions=!1,Modernizr.webgl){var A,e,t;try{A=createElement("canvas"),e=A.getContext("webgl")||A.getContext("experimental-webgl"),t=e.getSupportedExtensions()}catch(n){return}e!==undefined&&(Modernizr.webglextensions=new Boolean(!0));for(var r=-1,o=t.length;++r<o;)Modernizr.webglextensions[t[r]]=!0;A=undefined}}),Modernizr.addTest("seamless","seamless"in createElement("iframe")),Modernizr.addTest("srcdoc","srcdoc"in createElement("iframe")),Modernizr.addTest("imgcrossorigin","crossOrigin"in createElement("img"));var hasEvent=function(){function A(A,t){var n;return A?(t&&"string"!=typeof t||(t=createElement(t||"div")),A="on"+A,n=A in t,!n&&e&&(t.setAttribute||(t=createElement("div")),t.setAttribute(A,""),n="function"==typeof t[A],t[A]!==undefined&&(t[A]=undefined),t.removeAttribute(A)),n):!1}var e=!("onblur"in document.documentElement);return A}();ModernizrProto.hasEvent=hasEvent,Modernizr.addTest("hashchange",function(){return hasEvent("hashchange",window)===!1?!1:document.documentMode===undefined||document.documentMode>7}),Modernizr.addTest("inputsearchevent",hasEvent("search")),Modernizr.addTest("ambientlight",hasEvent("devicelight",window));var inputElem=createElement("input"),inputattrs="autocomplete autofocus list placeholder max min multiple pattern required step".split(" "),attrs={};Modernizr.input=function(A){for(var e=0,t=A.length;t>e;e++)attrs[A[e]]=!!(A[e]in inputElem);return attrs.list&&(attrs.list=!(!createElement("datalist")||!window.HTMLDataListElement)),attrs}(inputattrs),Modernizr.addTest("datalistelem",Modernizr.input.list);var inputtypes="search tel url email datetime date month week time datetime-local number range color".split(" "),inputs={};Modernizr.inputtypes=function(A){for(var e,t,n,r=A.length,o="1)",i=0;r>i;i++)inputElem.setAttribute("type",e=A[i]),n="text"!==inputElem.type&&"style"in inputElem,n&&(inputElem.value=o,inputElem.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(e)&&inputElem.style.WebkitAppearance!==undefined?(docElement.appendChild(inputElem),t=document.defaultView,n=t.getComputedStyle&&"textfield"!==t.getComputedStyle(inputElem,null).WebkitAppearance&&0!==inputElem.offsetHeight,docElement.removeChild(inputElem)):/^(search|tel)$/.test(e)||(n=/^(url|email)$/.test(e)?inputElem.checkValidity&&inputElem.checkValidity()===!1:inputElem.value!=o)),inputs[A[i]]=!!n;return inputs}(inputtypes),Modernizr.addTest("videoloop","loop"in createElement("video"));var prefixes=ModernizrProto._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):["",""];ModernizrProto._prefixes=prefixes,Modernizr.addTest("csscalc",function(){var A="width:",e="calc(10px);",t=createElement("a");return t.style.cssText=A+prefixes.join(e+A),!!t.style.length}),Modernizr.addTest("cubicbezierrange",function(){var A=createElement("a");return A.style.cssText=prefixes.join("transition-timing-function:cubic-bezier(1,0,0,1.1); "),!!A.style.length}),Modernizr.addTest("cssgradients",function(){for(var A,e="background-image:",t="gradient(linear,left top,right bottom,from(#9f9),to(white));",n="",r=0,o=prefixes.length-1;o>r;r++)A=0===r?"to ":"",n+=e+prefixes[r]+"linear-gradient("+A+"left top, #9f9, white);";Modernizr._config.usePrefixes&&(n+=e+"-webkit-"+t);var i=createElement("a"),d=i.style;return d.cssText=n,(""+d.backgroundImage).indexOf("gradient")>-1}),Modernizr.addTest("opacity",function(){var A=createElement("a").style;return A.cssText=prefixes.join("opacity:.55;"),/^0.55$/.test(A.opacity)}),Modernizr.addTest("csspositionsticky",function(){var A="position:",e="sticky",t=createElement("a"),n=t.style;return n.cssText=A+prefixes.join(e+";"+A).slice(0,-A.length),-1!==n.position.indexOf(e)});var modElem={elem:createElement("modernizr")};Modernizr._q.push(function(){delete modElem.elem}),Modernizr.addTest("csschunit",function(){var A,e=modElem.elem.style;try{e.fontSize="3ch",A=-1!==e.fontSize.indexOf("ch")}catch(t){A=!1}return A}),Modernizr.addTest("cssexunit",function(){var A,e=modElem.elem.style;try{e.fontSize="3ex",A=-1!==e.fontSize.indexOf("ex")}catch(t){A=!1}return A}),Modernizr.addTest("hsla",function(){var A=createElement("a").style;return A.cssText="background-color:hsla(120,40%,100%,.5)",contains(A.backgroundColor,"rgba")||contains(A.backgroundColor,"hsla")}),Modernizr.addTest("videopreload","preload"in createElement("video")),Modernizr.addTest("getUserMedia","mediaDevices"in navigator&&"getUserMedia"in navigator.mediaDevices),Modernizr.addTest("websocketsbinary",function(){var A,e="https:"==location.protocol?"wss":"ws";if("WebSocket"in window){if(A="binaryType"in WebSocket.prototype)return A;try{return!!new WebSocket(e+"://.").binaryType}catch(t){}}return!1}),Modernizr.addTest("atobbtoa","atob"in window&&"btoa"in window,{aliases:["atob-btoa"]}),Modernizr.addTest("sharedworkers","SharedWorker"in window),Modernizr.addTest("bdi",function(){var A=createElement("div"),e=createElement("bdi");e.innerHTML="&#1573;",A.appendChild(e),docElement.appendChild(A);var t="rtl"===computedStyle(e,null,"direction");return docElement.removeChild(A),t});var testXhrType=function(A){if("undefined"==typeof XMLHttpRequest)return!1;var e=new XMLHttpRequest;e.open("get","/",!0);try{e.responseType=A}catch(t){return!1}return"response"in e&&e.responseType==A};Modernizr.addTest("xhrresponsetypearraybuffer",testXhrType("arraybuffer")),Modernizr.addTest("xhrresponsetypeblob",testXhrType("blob")),Modernizr.addTest("xhrresponsetypedocument",testXhrType("document")),Modernizr.addTest("xhrresponsetypejson",testXhrType("json")),Modernizr.addTest("xhrresponsetypetext",testXhrType("text"));var toStringFn={}.toString;Modernizr.addTest("svgclippaths",function(){return!!document.createElementNS&&/SVGClipPath/.test(toStringFn.call(document.createElementNS("http://www.w3.org/2000/svg","clipPath")))}),Modernizr.addTest("svgforeignobject",function(){return!!document.createElementNS&&/SVGForeignObject/.test(toStringFn.call(document.createElementNS("http://www.w3.org/2000/svg","foreignObject")))}),Modernizr.addTest("smil",function(){return!!document.createElementNS&&/SVGAnimate/.test(toStringFn.call(document.createElementNS("http://www.w3.org/2000/svg","animate")))});var testStyles=ModernizrProto.testStyles=injectElementWithStyles;Modernizr.addTest("hiddenscroll",function(){return testStyles("#modernizr {width:100px;height:100px;overflow:scroll}",function(A){return A.offsetWidth===A.clientWidth})}),Modernizr.addTest("mathml",function(){var A;return testStyles("#modernizr{position:absolute;display:inline-block}",function(e){e.innerHTML+="<math><mfrac><mi>xx</mi><mi>yy</mi></mfrac></math>",A=e.offsetHeight>e.offsetWidth}),A}),Modernizr.addTest("touchevents",function(){var A;if("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)A=!0;else{var e=["@media (",prefixes.join("touch-enabled),("),"heartz",")","{#modernizr{top:9px;position:absolute}}"].join("");testStyles(e,function(e){A=9===e.offsetTop})}return A}),Modernizr.addTest("unicoderange",function(){return Modernizr.testStyles('@font-face{font-family:"unicodeRange";src:local("Arial");unicode-range:U+0020,U+002E}#modernizr span{font-size:20px;display:inline-block;font-family:"unicodeRange",monospace}#modernizr .mono{font-family:monospace}',function(A){for(var e=[".",".","m","m"],t=0;t<e.length;t++){var n=createElement("span");n.innerHTML=e[t],n.className=t%2?"mono":"",A.appendChild(n),e[t]=n.clientWidth}return e[0]!==e[1]&&e[2]===e[3]})}),Modernizr.addTest("unicode",function(){var A,e=createElement("span"),t=createElement("span");return testStyles("#modernizr{font-family:Arial,sans;font-size:300em;}",function(n){e.innerHTML=isSVG?"妇":"&#5987;",t.innerHTML=isSVG?"☆":"&#9734;",n.appendChild(e),n.appendChild(t),A="offsetWidth"in e&&e.offsetWidth!==t.offsetWidth}),A}),Modernizr.addTest("checked",function(){return testStyles("#modernizr {position:absolute} #modernizr input {margin-left:10px} #modernizr :checked {margin-left:20px;display:block}",function(A){var e=createElement("input");return e.setAttribute("type","checkbox"),e.setAttribute("checked","checked"),A.appendChild(e),20===e.offsetLeft})}),testStyles("#modernizr{display: table; direction: ltr}#modernizr div{display: table-cell; padding: 10px}",function(A){var e,t=A.childNodes;e=t[0].offsetLeft<t[1].offsetLeft,Modernizr.addTest("displaytable",e,{aliases:["display-table"]})},2);var blacklist=function(){var A=navigator.userAgent,e=A.match(/w(eb)?osbrowser/gi),t=A.match(/windows phone/gi)&&A.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9;return e||t}();blacklist?Modernizr.addTest("fontface",!1):testStyles('@font-face {font-family:"font";src:url("https://")}',function(A,e){var t=document.getElementById("smodernizr"),n=t.sheet||t.styleSheet,r=n?n.cssRules&&n.cssRules[0]?n.cssRules[0].cssText:n.cssText||"":"",o=/src/i.test(r)&&0===r.indexOf(e.split(" ")[0]);Modernizr.addTest("fontface",o);
-}),testStyles('#modernizr{font:0/0 a}#modernizr:after{content:":)";visibility:hidden;font:7px/1 a}',function(A){Modernizr.addTest("generatedcontent",A.offsetHeight>=6)}),Modernizr.addTest("hairline",function(){return testStyles("#modernizr {border:.5px solid transparent}",function(A){return 1===A.offsetHeight})}),Modernizr.addTest("cssinvalid",function(){return testStyles("#modernizr input{height:0;border:0;padding:0;margin:0;width:10px} #modernizr input:invalid{width:50px}",function(A){var e=createElement("input");return e.required=!0,A.appendChild(e),e.clientWidth>10})}),testStyles("#modernizr div {width:100px} #modernizr :last-child{width:200px;display:block}",function(A){Modernizr.addTest("lastchild",A.lastChild.offsetWidth>A.firstChild.offsetWidth)},2),testStyles("#modernizr div {width:1px} #modernizr div:nth-child(2n) {width:2px;}",function(A){for(var e=A.getElementsByTagName("div"),t=!0,n=0;5>n;n++)t=t&&e[n].offsetWidth===n%2+1;Modernizr.addTest("nthchild",t)},5),testStyles("#modernizr{overflow: scroll; width: 40px; height: 40px; }#"+prefixes.join("scrollbar{width:10px} #modernizr::").split("#").slice(1).join("#")+"scrollbar{width:10px}",function(A){Modernizr.addTest("cssscrollbar","scrollWidth"in A&&30==A.scrollWidth)}),Modernizr.addTest("siblinggeneral",function(){return testStyles("#modernizr div {width:100px} #modernizr div ~ div {width:200px;display:block}",function(A){return 200==A.lastChild.offsetWidth},2)}),testStyles("#modernizr{position: absolute; top: -10em; visibility:hidden; font: normal 10px arial;}#subpixel{float: left; font-size: 33.3333%;}",function(A){var e=A.firstChild;e.innerHTML="This is a text written in Arial",Modernizr.addTest("subpixelfont",window.getComputedStyle?"44px"!==window.getComputedStyle(e,null).getPropertyValue("width"):!1)},1,["subpixel"]),Modernizr.addTest("cssvalid",function(){return testStyles("#modernizr input{height:0;border:0;padding:0;margin:0;width:10px} #modernizr input:valid{width:50px}",function(A){var e=createElement("input");return A.appendChild(e),e.clientWidth>10})}),testStyles("#modernizr { height: 50vh; }",function(A){var e=parseInt(window.innerHeight/2,10),t=parseInt(computedStyle(A,null,"height"),10);Modernizr.addTest("cssvhunit",roundedEquals(t,e))}),testStyles("#modernizr1{width: 50vmax}#modernizr2{width:50px;height:50px;overflow:scroll}#modernizr3{position:fixed;top:0;left:0;bottom:0;right:0}",function(A){var e=A.childNodes[2],t=A.childNodes[1],n=A.childNodes[0],r=parseInt((t.offsetWidth-t.clientWidth)/2,10),o=n.clientWidth/100,i=n.clientHeight/100,d=parseInt(50*Math.max(o,i),10),a=parseInt(computedStyle(e,null,"width"),10);Modernizr.addTest("cssvmaxunit",roundedEquals(d,a)||roundedEquals(d,a-r))},3),testStyles("#modernizr1{width: 50vm;width:50vmin}#modernizr2{width:50px;height:50px;overflow:scroll}#modernizr3{position:fixed;top:0;left:0;bottom:0;right:0}",function(A){var e=A.childNodes[2],t=A.childNodes[1],n=A.childNodes[0],r=parseInt((t.offsetWidth-t.clientWidth)/2,10),o=n.clientWidth/100,i=n.clientHeight/100,d=parseInt(50*Math.min(o,i),10),a=parseInt(computedStyle(e,null,"width"),10);Modernizr.addTest("cssvminunit",roundedEquals(d,a)||roundedEquals(d,a-r))},3),testStyles("#modernizr { width: 50vw; }",function(A){var e=parseInt(window.innerWidth/2,10),t=parseInt(computedStyle(A,null,"width"),10);Modernizr.addTest("cssvwunit",roundedEquals(t,e))}),Modernizr.addTest("details",function(){var A,e=createElement("details");return"open"in e?(testStyles("#modernizr details{display:block}",function(t){t.appendChild(e),e.innerHTML="<summary>a</summary>b",A=e.offsetHeight,e.open=!0,A=A!=e.offsetHeight}),A):!1}),Modernizr.addTest("oninput",function(){var A,e=createElement("input");if(e.setAttribute("oninput","return"),hasEvent("oninput",docElement)||"function"==typeof e.oninput)return!0;try{var t=document.createEvent("KeyboardEvent");A=!1;var n=function(e){A=!0,e.preventDefault(),e.stopPropagation()};t.initKeyEvent("keypress",!0,!0,window,!1,!1,!1,!1,0,"e".charCodeAt(0)),docElement.appendChild(e),e.addEventListener("input",n,!1),e.focus(),e.dispatchEvent(t),e.removeEventListener("input",n,!1),docElement.removeChild(e)}catch(r){A=!1}return A}),Modernizr.addTest("formvalidation",function(){var A=createElement("form");if(!("checkValidity"in A&&"addEventListener"in A))return!1;if("reportValidity"in A)return!0;var e,t=!1;return Modernizr.formvalidationapi=!0,A.addEventListener("submit",function(A){(!window.opera||window.operamini)&&A.preventDefault(),A.stopPropagation()},!1),A.innerHTML='<input name="modTest" required="required" /><button></button>',testStyles("#modernizr form{position:absolute;top:-99999em}",function(n){n.appendChild(A),e=A.getElementsByTagName("input")[0],e.addEventListener("invalid",function(A){t=!0,A.preventDefault(),A.stopPropagation()},!1),Modernizr.formvalidationmessage=!!e.validationMessage,A.getElementsByTagName("button")[0].click()}),t}),Modernizr.addTest("localizednumber",function(){if(!Modernizr.inputtypes.number)return!1;if(!Modernizr.formvalidation)return!1;var A,e=createElement("div"),t=getBody(),n=function(){return docElement.insertBefore(t,docElement.firstElementChild||docElement.firstChild)}();e.innerHTML='<input type="number" value="1.0" step="0.1"/>';var r=e.childNodes[0];n.appendChild(e),r.focus();try{document.execCommand("SelectAll",!1),document.execCommand("InsertText",!1,"1,1")}catch(o){}return A="number"===r.type&&1.1===r.valueAsNumber&&r.checkValidity(),n.removeChild(e),t.fake&&n.parentNode.removeChild(n),A});var mq=function(){var A=window.matchMedia||window.msMatchMedia;return A?function(e){var t=A(e);return t&&t.matches||!1}:function(A){var e=!1;return injectElementWithStyles("@media "+A+" { #modernizr { position: absolute; } }",function(A){e="absolute"==(window.getComputedStyle?window.getComputedStyle(A,null):A.currentStyle).position}),e}}();ModernizrProto.mq=mq,Modernizr.addTest("mediaqueries",mq("only all"));var hasOwnProp;!function(){var A={}.hasOwnProperty;hasOwnProp=is(A,"undefined")||is(A.call,"undefined")?function(A,e){return e in A&&is(A.constructor.prototype[e],"undefined")}:function(e,t){return A.call(e,t)}}(),ModernizrProto._l={},ModernizrProto.on=function(A,e){this._l[A]||(this._l[A]=[]),this._l[A].push(e),Modernizr.hasOwnProperty(A)&&setTimeout(function(){Modernizr._trigger(A,Modernizr[A])},0)},ModernizrProto._trigger=function(A,e){if(this._l[A]){var t=this._l[A];setTimeout(function(){var A,n;for(A=0;A<t.length;A++)(n=t[A])(e)},0),delete this._l[A]}},Modernizr._q.push(function(){ModernizrProto.addTest=addTest}),addTest("htmlimports","import"in createElement("link")),Modernizr.addAsyncTest(function(){var A=new Image;A.onerror=function(){addTest("exiforientation",!1,{aliases:["exif-orientation"]})},A.onload=function(){addTest("exiforientation",2!==A.width,{aliases:["exif-orientation"]})},A.src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/4QAiRXhpZgAASUkqAAgAAAABABIBAwABAAAABgASAAAAAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAABAAIDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD+/iiiigD/2Q=="}),Modernizr.addAsyncTest(function(){var A,e,t=function(A){docElement.contains(A)||docElement.appendChild(A)},n=function(A){A.fake&&A.parentNode&&A.parentNode.removeChild(A)},r=function(A,e){var t=!!A;if(t&&(t=new Boolean(t),t.blocked="blocked"===A),addTest("flash",function(){return t}),e&&s.contains(e)){for(;e.parentNode!==s;)e=e.parentNode;s.removeChild(e)}};try{e="ActiveXObject"in window&&"Pan"in new window.ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(o){}if(A=!("plugins"in navigator&&"Shockwave Flash"in navigator.plugins||e),A||isSVG)r(!1);else{var i,d,a=createElement("embed"),s=getBody();if(a.type="application/x-shockwave-flash",s.appendChild(a),!("Pan"in a||e))return t(s),r("blocked",a),void n(s);i=function(){return t(s),docElement.contains(s)?(docElement.contains(a)?(d=a.style.cssText,""!==d?r("blocked",a):r(!0,a)):r("blocked"),void n(s)):(s=document.body||s,a=createElement("embed"),a.type="application/x-shockwave-flash",s.appendChild(a),setTimeout(i,1e3))},setTimeout(i,10)}}),Modernizr.addAsyncTest(function(){function A(){clearTimeout(e),window.removeEventListener("deviceproximity",A),addTest("proximity",!0)}var e,t=300;"ondeviceproximity"in window&&"onuserproximity"in window?(window.addEventListener("deviceproximity",A),e=setTimeout(function(){window.removeEventListener("deviceproximity",A),addTest("proximity",!1)},t)):addTest("proximity",!1)}),Modernizr.addAsyncTest(function(){function A(t){clearTimeout(e);var r=t!==undefined&&"loadeddata"===t.type?!0:!1;n.removeEventListener("loadeddata",A,!1),addTest("audiopreload",r),n.parentNode&&n.parentNode.removeChild(n)}var e,t=300,n=createElement("audio"),r=n.style;if(!(Modernizr.audio&&"preload"in n))return void addTest("audiopreload",!1);r.position="absolute",r.height=0,r.width=0;try{if(Modernizr.audio.mp3)n.src="data:audio/mpeg;base64,//MUxAAB6AXgAAAAAPP+c6nf//yi/6f3//MUxAMAAAIAAAjEcH//0fTX6C9Lf//0//MUxA4BeAIAAAAAAKX2/6zv//+IlR4f//MUxBMCMAH8AAAAABYWalVMQU1FMy45//MUxBUB0AH0AAAAADkuM1VVVVVVVVVV//MUxBgBUATowAAAAFVVVVVVVVVVVVVV";else if(Modernizr.audio.m4a)n.src="data:audio/x-m4a;base64,AAAAGGZ0eXBNNEEgAAACAGlzb21pc28yAAAACGZyZWUAAAAfbWRhdN4EAABsaWJmYWFjIDEuMjgAAAFoAQBHAAACiG1vb3YAAABsbXZoZAAAAAB8JbCAfCWwgAAAA+gAAAAYAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAG0dHJhawAAAFx0a2hkAAAAD3wlsIB8JbCAAAAAAQAAAAAAAAAYAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAABUG1kaWEAAAAgbWRoZAAAAAB8JbCAfCWwgAAArEQAAAQAVcQAAAAAAC1oZGxyAAAAAAAAAABzb3VuAAAAAAAAAAAAAAAAU291bmRIYW5kbGVyAAAAAPttaW5mAAAAEHNtaGQAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAL9zdGJsAAAAW3N0c2QAAAAAAAAAAQAAAEttcDRhAAAAAAAAAAEAAAAAAAAAAAACABAAAAAArEQAAAAAACdlc2RzAAAAAAMZAAEABBFAFQAAAAABftAAAAAABQISCAYBAgAAABhzdHRzAAAAAAAAAAEAAAABAAAEAAAAABxzdHNjAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAUc3RzegAAAAAAAAAXAAAAAQAAABRzdGNvAAAAAAAAAAEAAAAoAAAAYHVkdGEAAABYbWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAraWxzdAAAACOpdG9vAAAAG2RhdGEAAAABAAAAAExhdmY1Mi42NC4y";else if(Modernizr.audio.ogg)n.src="data:audio/ogg;base64,T2dnUwACAAAAAAAAAAD/QwAAAAAAAM2LVKsBHgF2b3JiaXMAAAAAAUSsAAAAAAAAgLsAAAAAAAC4AU9nZ1MAAAAAAAAAAAAA/0MAAAEAAADmvOe6Dy3/////////////////MgN2b3JiaXMdAAAAWGlwaC5PcmcgbGliVm9yYmlzIEkgMjAwNzA2MjIAAAAAAQV2b3JiaXMfQkNWAQAAAQAYY1QpRplS0kqJGXOUMUaZYpJKiaWEFkJInXMUU6k515xrrLm1IIQQGlNQKQWZUo5SaRljkCkFmVIQS0kldBI6J51jEFtJwdaYa4tBthyEDZpSTCnElFKKQggZU4wpxZRSSkIHJXQOOuYcU45KKEG4nHOrtZaWY4updJJK5yRkTEJIKYWSSgelU05CSDWW1lIpHXNSUmpB6CCEEEK2IIQNgtCQVQAAAQDAQBAasgoAUAAAEIqhGIoChIasAgAyAAAEoCiO4iiOIzmSY0kWEBqyCgAAAgAQAADAcBRJkRTJsSRL0ixL00RRVX3VNlVV9nVd13Vd13UgNGQVAAABAEBIp5mlGiDCDGQYCA1ZBQAgAAAARijCEANCQ1YBAAABAABiKDmIJrTmfHOOg2Y5aCrF5nRwItXmSW4q5uacc845J5tzxjjnnHOKcmYxaCa05pxzEoNmKWgmtOacc57E5kFrqrTmnHPGOaeDcUYY55xzmrTmQWo21uaccxa0pjlqLsXmnHMi5eZJbS7V5pxzzjnnnHPOOeecc6oXp3NwTjjnnHOi9uZabkIX55xzPhmne3NCOOecc84555xzzjnnnHOC0JBVAAAQAABBGDaGcacgSJ+jgRhFiGnIpAfdo8MkaAxyCqlHo6ORUuoglFTGSSmdIDRkFQAACAAAIYQUUkghhRRSSCGFFFKIIYYYYsgpp5yCCiqppKKKMsoss8wyyyyzzDLrsLPOOuwwxBBDDK20EktNtdVYY62555xrDtJaaa211koppZRSSikIDVkFAIAAABAIGWSQQUYhhRRSiCGmnHLKKaigAkJDVgEAgAAAAgAAADzJc0RHdERHdERHdERHdETHczxHlERJlERJtEzL1ExPFVXVlV1b1mXd9m1hF3bd93Xf93Xj14VhWZZlWZZlWZZlWZZlWZZlWYLQkFUAAAgAAIAQQgghhRRSSCGlGGPMMeegk1BCIDRkFQAACAAgAAAAwFEcxXEkR3IkyZIsSZM0S7M8zdM8TfREURRN01RFV3RF3bRF2ZRN13RN2XRVWbVdWbZt2dZtX5Zt3/d93/d93/d93/d93/d1HQgNWQUASAAA6EiOpEiKpEiO4ziSJAGhIasAABkAAAEAKIqjOI7jSJIkSZakSZ7lWaJmaqZneqqoAqEhqwAAQAAAAQAAAAAAKJriKabiKaLiOaIjSqJlWqKmaq4om7Lruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7rui4QGrIKAJAAANCRHMmRHEmRFEmRHMkBQkNWAQAyAAACAHAMx5AUybEsS9M8zdM8TfRET/RMTxVd0QVCQ1YBAIAAAAIAAAAAADAkw1IsR3M0SZRUS7VUTbVUSxVVT1VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVTVN0zRNIDRkJQAABADAYo3B5SAhJSXl3hDCEJOeMSYhtV4hBJGS3jEGFYOeMqIMct5C4xCDHggNWREARAEAAMYgxxBzyDlHqZMSOeeodJQa5xyljlJnKcWYYs0oldhSrI1zjlJHraOUYiwtdpRSjanGAgAAAhwAAAIshEJDVgQAUQAAhDFIKaQUYow5p5xDjCnnmHOGMeYcc44556B0UirnnHROSsQYc445p5xzUjonlXNOSiehAACAAAcAgAALodCQFQFAnACAQZI8T/I0UZQ0TxRFU3RdUTRd1/I81fRMU1U90VRVU1Vt2VRVWZY8zzQ901RVzzRV1VRVWTZVVZZFVdVt03V123RV3ZZt2/ddWxZ2UVVt3VRd2zdV1/Zd2fZ9WdZ1Y/I8VfVM03U903Rl1XVtW3VdXfdMU5ZN15Vl03Vt25VlXXdl2fc103Rd01Vl2XRd2XZlV7ddWfZ903WF35VlX1dlWRh2XfeFW9eV5XRd3VdlVzdWWfZ9W9eF4dZ1YZk8T1U903RdzzRdV3VdX1dd19Y105Rl03Vt2VRdWXZl2fddV9Z1zzRl2XRd2zZdV5ZdWfZ9V5Z13XRdX1dlWfhVV/Z1WdeV4dZt4Tdd1/dVWfaFV5Z14dZ1Ybl1XRg+VfV9U3aF4XRl39eF31luXTiW0XV9YZVt4VhlWTl+4ViW3feVZXRdX1ht2RhWWRaGX/id5fZ943h1XRlu3efMuu8Mx++k+8rT1W1jmX3dWWZfd47hGDq/8OOpqq+brisMpywLv+3rxrP7vrKMruv7qiwLvyrbwrHrvvP8vrAso+z6wmrLwrDatjHcvm4sv3Acy2vryjHrvlG2dXxfeArD83R1XXlmXcf2dXTjRzh+ygAAgAEHAIAAE8pAoSErAoA4AQCPJImiZFmiKFmWKIqm6LqiaLqupGmmqWmeaVqaZ5qmaaqyKZquLGmaaVqeZpqap5mmaJqua5qmrIqmKcumasqyaZqy7LqybbuubNuiacqyaZqybJqmLLuyq9uu7Oq6pFmmqXmeaWqeZ5qmasqyaZquq3meanqeaKqeKKqqaqqqraqqLFueZ5qa6KmmJ4qqaqqmrZqqKsumqtqyaaq2bKqqbbuq7Pqybeu6aaqybaqmLZuqatuu7OqyLNu6L2maaWqeZ5qa55mmaZqybJqqK1uep5qeKKqq5ommaqqqLJumqsqW55mqJ4qq6omea5qqKsumatqqaZq2bKqqLZumKsuubfu+68qybqqqbJuqauumasqybMu+78qq7oqmKcumqtqyaaqyLduy78uyrPuiacqyaaqybaqqLsuybRuzbPu6aJqybaqmLZuqKtuyLfu6LNu678qub6uqrOuyLfu67vqucOu6MLyybPuqrPq6K9u6b+sy2/Z9RNOUZVM1bdtUVVl2Zdn2Zdv2fdE0bVtVVVs2TdW2ZVn2fVm2bWE0Tdk2VVXWTdW0bVmWbWG2ZeF2Zdm3ZVv2ddeVdV/XfePXZd3murLty7Kt+6qr+rbu+8Jw667wCgAAGHAAAAgwoQwUGrISAIgCAACMYYwxCI1SzjkHoVHKOecgZM5BCCGVzDkIIZSSOQehlJQy5yCUklIIoZSUWgshlJRSawUAABQ4AAAE2KApsThAoSErAYBUAACD41iW55miatqyY0meJ4qqqaq27UiW54miaaqqbVueJ4qmqaqu6+ua54miaaqq6+q6aJqmqaqu67q6Lpqiqaqq67qyrpumqqquK7uy7Oumqqqq68quLPvCqrquK8uybevCsKqu68qybNu2b9y6ruu+7/vCka3rui78wjEMRwEA4AkOAEAFNqyOcFI0FlhoyEoAIAMAgDAGIYMQQgYhhJBSSiGllBIAADDgAAAQYEIZKDRkRQAQJwAAGEMppJRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkgppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkqppJRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoplVJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSCgCQinAAkHowoQwUGrISAEgFAACMUUopxpyDEDHmGGPQSSgpYsw5xhyUklLlHIQQUmktt8o5CCGk1FJtmXNSWosx5hgz56SkFFvNOYdSUoux5ppr7qS0VmuuNedaWqs115xzzbm0FmuuOdecc8sx15xzzjnnGHPOOeecc84FAOA0OACAHtiwOsJJ0VhgoSErAYBUAAACGaUYc8456BBSjDnnHIQQIoUYc845CCFUjDnnHHQQQqgYc8w5CCGEkDnnHIQQQgghcw466CCEEEIHHYQQQgihlM5BCCGEEEooIYQQQgghhBA6CCGEEEIIIYQQQgghhFJKCCGEEEIJoZRQAABggQMAQIANqyOcFI0FFhqyEgAAAgCAHJagUs6EQY5Bjw1BylEzDUJMOdGZYk5qMxVTkDkQnXQSGWpB2V4yCwAAgCAAIMAEEBggKPhCCIgxAABBiMwQCYVVsMCgDBoc5gHAA0SERACQmKBIu7iALgNc0MVdB0IIQhCCWBxAAQk4OOGGJ97whBucoFNU6iAAAAAAAAwA4AEA4KAAIiKaq7C4wMjQ2ODo8AgAAAAAABYA+AAAOD6AiIjmKiwuMDI0Njg6PAIAAAAAAAAAAICAgAAAAAAAQAAAAICAT2dnUwAE7AwAAAAAAAD/QwAAAgAAADuydfsFAQEBAQEACg4ODg==";else{if(!Modernizr.audio.wav)return void addTest("audiopreload",!1);n.src="data:audio/wav;base64,UklGRvwZAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YdgZAAAAAAEA/v8CAP//AAABAP////8DAPz/BAD9/wEAAAAAAAAAAAABAP7/AgD//wAAAQD//wAAAQD//wAAAQD+/wIA//8AAAAAAAD//wIA/v8BAAAA//8BAAAA//8BAP//AQAAAP//AQD//wEAAAD//wEA//8BAP//AQD//wEA//8BAP//AQD+/wMA/f8DAP3/AgD+/wIA/////wMA/f8CAP7/AgD+/wMA/f8CAP7/AgD//wAAAAAAAAAAAQD+/wIA/v8CAP7/AwD9/wIA/v8BAAEA/v8CAP7/AQAAAAAAAAD//wEAAAD//wIA/f8DAP7/AQD//wEAAAD//wEA//8CAP7/AQD//wIA/v8CAP7/AQAAAAAAAAD//wEAAAAAAAAA//8BAP//AgD9/wQA+/8FAPz/AgAAAP//AgD+/wEAAAD//wIA/v8CAP3/BAD8/wQA/P8DAP7/AwD8/wQA/P8DAP7/AQAAAAAA//8BAP//AgD+/wEAAAD//wIA/v8BAP//AQD//wEAAAD//wEA//8BAAAAAAAAAP//AgD+/wEAAAAAAAAAAAD//wEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AgD+/wIA/v8BAP//AQABAP7/AQD//wIA/v8CAP3/AwD/////AgD9/wMA/v8BAP//AQAAAP//AQD//wEA//8BAP//AAABAP//AAABAP//AQD//wAAAAACAP3/AwD9/wIA//8BAP//AQD//wEA//8BAP//AgD9/wMA/v8AAAIA/f8CAAAA/v8EAPv/BAD9/wIAAAD+/wQA+v8HAPr/BAD+/wEAAAD//wIA/f8EAPz/BAD7/wUA/P8EAPz/AwD+/wEAAAD//wEAAAAAAP//AgD8/wUA+/8FAPz/AwD9/wIA//8AAAEA/v8CAP//AQD//wAAAAABAP//AgD9/wMA/f8EAPz/AwD+/wAAAwD7/wUA/P8DAP7/AQAAAP//AgD+/wEAAQD+/wIA/v8BAAEA/v8CAP7/AQAAAP//AgD9/wMA/f8DAP7/AgD+/wEAAAAAAAEA//8AAAEA/v8DAP3/AgD//wEA//8BAP7/AwD9/wMA/v8BAP//AQAAAP//AgD9/wMA/v8BAP//AQAAAP//AgD+/wEAAQD+/wIA/////wIA//8AAAEA/f8DAP//AAABAP////8DAP3/AwD+/wEA//8BAP//AQAAAAAA//8BAP//AQD//wEA//8BAP//AAAAAAEA//8BAP7/AgD//wEA//8AAAAAAAAAAAAAAAD//wIA/v8BAAAA//8BAAEA/v8BAAAA//8DAPz/AwD+/wIA/v8CAP3/AwD+/wEAAAD//wEA//8BAAAA//8BAAAA/v8EAPv/BAD+/wAAAAABAP7/AgD//wAAAAABAP7/AgD//wAAAAAAAAAAAAABAP3/BAD8/wQA/f8BAAAAAAABAP7/AgD+/wIA/v8CAP7/AgD+/wIA/v8BAAAAAAD//wIA/f8DAP7/AAABAP//AAACAPz/BAD9/wIA//8AAP//AwD9/wMA/P8EAP3/AwD9/wIA//8BAP//AQD+/wMA/f8DAP7/AAABAP//AQAAAP//AQD//wIA/f8DAP7/AQAAAP//AQAAAAAA//8CAP7/AQABAP7/AgD+/wEAAQD+/wIA/v8CAP////8CAP7/AgD//wAAAAABAP7/AwD9/wIAAAD+/wMA/f8CAP//AQD+/wMA/f8CAP//AAACAPz/BQD6/wUA/v///wIA/v8CAP3/BAD7/wYA+v8FAPz/AwD/////AgD+/wEAAAD//wEAAAD//wIA/f8DAP7/AQAAAP//AgD//wAA//8BAAAAAAAAAP//AQD//wEA//8AAAIA/f8DAP3/AgAAAP//AQD//wEA//8AAAEA//8BAP////8CAP//AAABAP3/BAD9/wIA/v8BAAEA//8BAP7/AgD//wEA//8AAAEA//8BAP//AAAAAAEA//8BAP7/AgD//wEA//8AAAAAAQD+/wIA/v8BAAAAAAD//wIA/v8BAAAAAAAAAAAAAQD+/wMA/f8CAP//AQD//wIA/f8DAP7/AQD//wEA//8CAP7/AAABAP7/AwD9/wMA/v8AAAEA//8BAAAAAAD//wIA/v8BAAAA//8CAP7/AgD+/wEA//8CAP7/AgD//wAAAAAAAAAAAQD//wEA/v8DAPz/BQD8/wIA//8AAAEAAAD//wEA//8BAP//AQAAAAAA//8BAP//AgD+/wEAAAAAAP//AQD+/wMA/////wEA/v8CAP//AQD//wEA//8AAAEA//8BAAAA/v8EAPz/AwD+/wEAAAAAAAAA//8CAP7/AQD//wEA//8BAP//AAABAP7/AwD9/wIA//8BAP//AQD//wEA//8AAAEA/v8EAPv/BAD9/wIA//8BAP7/AwD9/wIA//8AAAEA//8BAP//AQD//wAAAQD//wEAAAD+/wMA/v8AAAIA/f8DAP7/AQD//wAAAQD+/wMA/f8CAP//AAABAP7/AgD+/wMA/f8CAP7/AQABAP7/AgD+/wIA/v8CAP7/AwD8/wMA//8AAAEA//8AAAAAAAABAP//AQD//wAAAQD//wIA/f8DAP3/AwD+/wAAAgD9/wIA//8AAAEAAAD+/wMA/P8FAPv/BAD9/wIA//8AAP//AgD+/wIA/v8BAAAAAAD//wEAAAAAAP//AQD//wEA//8BAP//AAABAP7/AwD9/wIA//8BAP//AAABAP//AQD//wAAAQD//wEA//8BAP//AAABAAAA//8BAP7/AwD9/wMA/f8DAP3/AgD//wEA//8BAP7/AgD//wAAAgD8/wQA/f8CAP//AQD+/wMA/f8CAP7/AgD//wAAAAAAAAAAAAABAP7/AwD9/wIA/v8DAP3/AwD9/wIA/v8DAPz/BQD7/wQA/f8CAP7/AwD9/wMA/f8CAP//AQAAAP7/AwD+/wEA//8AAAEAAAAAAP//AAABAP//AQAAAP7/AwD9/wMA/f8CAP//AQD//wEA//8AAAIA/f8CAAAA//8BAAAA//8BAAAA/v8EAPv/BAD9/wIA//8AAAEA/v8CAP//AAABAP//AAABAP//AAABAP7/AwD8/wQA/f8CAAAA/v8DAP3/AwD9/wMA/v8BAAAA//8BAAAA//8CAP7/AQAAAAAAAAAAAAAA//8CAP7/AgD+/wIA/v8CAP7/AgD//wAAAQD//wAAAQD//wAAAQD//wAAAQD+/wIA//8AAAAAAQD+/wMA/f8CAP//AQD//wEA//8AAAEA/v8DAP3/AgD//wAAAAABAP7/AwD9/wIA//8AAAEA/v8DAP3/AgD//wAAAAABAP7/AwD8/wMA/v8CAP//AAD//wIA/v8CAP7/AQABAP7/AQAAAP//AgD/////AQD//wEAAAD//wEA/v8EAPv/BAD9/wMA/v8BAAAA//8BAAEA/P8GAPr/BQD8/wMA/v8BAAAA//8CAP7/AQABAP3/BAD7/wYA+/8EAPz/AwD//wEA//8BAP7/BAD8/wMA/v8AAAIA/v8BAAAA//8BAAAA//8BAAAA//8CAP3/AwD+/wAAAgD8/wUA/P8DAP7/AAABAAAAAAD//wEAAAD//wIA/f8DAP7/AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA/f8EAPz/AwD/////AgD+/wIA/f8DAP7/AgD+/wEA//8CAP7/AQD//wEAAAAAAP//AQAAAP//AgD9/wMA/v8BAAAA//8BAP//AQAAAP//AAACAP3/BAD7/wQA/v8BAAAA//8BAP//AQAAAP//AQAAAP7/BAD7/wUA+/8EAP3/AgD//wAAAQD+/wIA//8AAAEA/v8CAP//AQD+/wEAAAAAAAAAAAD//wEA//8CAP3/AwD9/wIA//8AAAAAAAAAAAAA//8BAP//AgD+/wEA//8CAP7/AQAAAP//AgD/////AgD/////AgD+/wIA//8AAP//AQABAP7/AgD9/wMA/v8CAP////8BAAAAAAAAAAAA//8CAP////8DAPz/AwD+/wEAAAAAAP//AQD//wEAAAD//wEAAAD+/wQA+/8FAPz/AgAAAP//AgD9/wMA/v8BAAAAAAD//wEAAAD//wIA/v8BAAAAAAD//wIA/v8BAAAA//8BAAAA//8CAP7/AQD//wEA//8BAAAA//8BAP//AAABAP//AQAAAP7/AgD//wEA//8AAAAAAQD+/wMA/P8EAP7///8DAPz/BQD8/wEAAQD+/wMA/v8AAAEA//8BAP//AQD//wEA/v8CAP//AQD//wAAAAABAAAA//8BAP//AQAAAAAA//8BAP//AgD+/wAAAQD//wIA/f8CAP//AQAAAP7/AwD9/wMA/v8BAP//AAABAP//AgD9/wIA//8BAAAA//8BAAAA//8CAP3/AwD+/wEAAAD+/wQA/P8DAP7/AAACAP7/AQAAAP//AQAAAP//AQAAAP//AgD9/wIAAAD//wIA/f8DAP7/AQD//wEA//8CAP7/AQD//wAAAQD//wEA//8AAAAAAQD//wEAAAD9/wUA+/8FAPz/AgD//wAAAQD//wAAAQD+/wMA/f8BAAEA/v8CAP7/AgD+/wIA/v8BAAAAAAAAAAAAAAD//wIA/v8CAP////8CAP7/AgD+/wIA/v8CAP7/AQAAAP//AQAAAP//AQD//wAAAQD//wAAAQD+/wMA/f8CAAAA/v8DAP3/AgAAAP//AQAAAP7/AwD9/wMA/v8BAP//AQD//wEAAAD+/wMA/f8CAAAA/v8CAP//AAAAAAEA//8AAAEA/v8DAP3/AwD9/wIA//8BAP//AgD8/wQA/v8BAAAA/v8CAP//AQD//wAAAAAAAAEA/f8EAPz/BAD9/wIA//8AAAAAAAABAP//AAAAAAAAAAABAP3/BAD9/wIA/v8BAAEA//8AAAAA//8CAP7/AgD9/wQA+/8FAPv/BQD8/wMA/f8DAP3/AwD+/wAAAgD9/wMA/f8CAAAA/v8EAPv/BQD7/wUA/P8DAP///v8DAP3/BAD8/wMA/f8DAP7/AQD//wEAAAD//wEA/v8CAAAA/v8CAP7/AgD//wAAAAAAAAAAAQD+/wIA//8AAAEA/v8DAPz/BAD9/wIA//8AAP//AgD//wEA/v8BAAAAAQD//wAAAAAAAAEA//8AAAEA//8BAP//AAABAP//AQD+/wIA/v8DAPz/BAD8/wQA/f8BAAAAAQD+/wMA/P8DAP//AAAAAAAAAAD//wMA+/8FAP3/AQABAP3/BAD8/wMA/v8BAAAA//8CAP3/AwD+/wEAAQD9/wMA/f8EAPz/BAD7/wQA/v8BAAEA/f8DAP7/AQAAAP//AgD+/wEAAAD//wIA/v8CAP7/AgD+/wEAAQD//wEA/v8CAP7/BAD7/wQA/f8CAAAA//8AAAAAAAABAP//AQD+/wEAAQD+/wMA/f8BAAEA/v8DAPz/AwD/////AwD8/wQA/P8DAP7/AgD//wAA//8BAAAAAAAAAP//AgD+/wEAAAD//wIA/v8BAAAA//8CAP3/AgD//wAAAQD+/wIA/v8BAAAA//8CAP7/AgD+/wEA//8CAP3/BAD7/wQA/v8BAAAA//8AAAEAAAD//wIA/f8DAP7/AgD+/wIA/v8CAP7/AgD+/wEAAAAAAP//AgD9/wMA/v8BAP//AgD9/wMA/v8AAAEA//8BAP//AQD//wEA//8AAAEA/v8EAPz/AgD//wAAAQAAAP//AAABAP//AQD//wEAAAD//wEA//8BAAEA/f8DAP7/AQABAP3/AwD+/wIA/////wEAAAAAAAAAAAD//wIA/v8CAP////8CAP7/AgD//wAA//8CAP3/BAD9/wAAAgD9/wMA/v8BAP//AQAAAP//AQAAAP//AgD9/wMA/f8EAPz/AwD+/wEAAAAAAAAAAAD//wIA/f8EAP3/AAABAAAA//8CAP7/AQAAAP//AQAAAAAA//8BAP//AQAAAP//AQAAAP//AQAAAP//AgD9/wMA/v8BAP//AQAAAP//AQD//wIA/v8CAP3/BAD9/wEAAAD//wEAAQD9/wMA/f8CAAAA/v8DAP3/AgD//wAAAQD+/wIA/v8CAP7/AQAAAP//AgD+/wEAAAAAAP//AwD7/wUA/f8BAAEA/v8BAAEA/v8DAP3/AgD//wEA//8BAP//AQD//wEA//8CAP3/BAD7/wQA/////wIA/v8AAAIA/v8CAP3/BAD7/wUA/P8DAP3/AwD9/wMA/v8AAAIA/v8CAP7/AgD+/wIA//8AAAEA/v8CAP7/AgD//wAAAAD//wEAAAAAAAAA//8BAP7/BAD7/wUA/P8CAAAA//8BAP//AQAAAP//AgD9/wMA/v8BAAAA//8BAAAA//8CAP3/AwD+/wEA//8CAP3/AwD+/wAAAwD8/wIAAAD//wIA/////wIA/v8CAP7/AgD+/wEAAAAAAAAAAAAAAP//AgD+/wIA//8AAAAA//8CAP7/AgD+/wEA//8CAP3/AwD9/wMA/v8BAP7/AwD9/wMA/f8CAP//AQD+/wIA//8BAP//AQD+/wMA/v8BAAAA//8BAAAA//8CAP7/AQAAAP//AgD+/wIA/v8CAP//AAAAAAEA//8BAP//AAABAAAA//8BAP//AQD//wEA//8BAP//AQAAAP//AQD//wEAAAD//wIA/f8CAAAA//8BAAAA//8BAP//AAABAP//AQD//wAAAAAAAAEA/v8CAP//AQD//wAAAAABAP7/AwD9/wIAAAD+/wIA//8BAP//AgD9/wMA/f8DAP7/AgD+/wEAAAAAAAEA/v8CAP7/AgD//wAAAAAAAAAAAAAAAP//AgD/////AgD9/wQA/f8BAAAAAAAAAAEA/f8DAP////8DAP3/AQABAP7/AgD//wAAAQD+/wMA/f8CAP7/AQABAP7/AwD7/wYA+v8FAP3/AQABAP7/AgD+/wMA/f8CAP7/AwD+/wEA//8BAP//AQAAAP7/BQD5/wcA+v8FAPz/AwD+/wIA/v8BAAAA//8DAPv/BQD8/wMA/////wEAAAAAAAAAAAD//wIA/f8DAP7/AQAAAP//AQAAAP//AgD+/wIA/v8BAAEA/f8EAPz/AwD+/wEA//8CAP7/AQD//wEA//8CAP7/AQAAAP//AgD+/wEAAAAAAAAAAAAAAAAAAAD//wIA/f8EAPz/AwD+/wEA//8CAP7/AgD+/wEAAQD+/wEAAQD+/wIA/////wIA//8AAAAAAAAAAAAAAAD//wEAAAAAAP//AgD9/wMA/v8BAP//AQAAAP//AQD//wEA//8BAP//AQD//wEA//8BAP//AQAAAP7/AwD9/wMA/v8BAP7/AwD9/wMA/v8BAP//AAABAP//AQD//wAAAAABAP//AAAAAAAAAQD//wEA/v8CAAAA/v8EAPv/BAD9/wIAAAD+/wMA/P8DAP//AAAAAP//AQD//wIA/f8DAP3/AwD9/wMA/v8BAAAA//8BAAAA//8CAP3/AwD9/wQA+/8FAPv/BQD8/wMA/v8BAAAA//8BAP//AgD+/wEAAAD//wIA/v8BAAEA/f8DAP3/AgAAAP//AQD//wAAAQD//wEA//8BAP//AQD//wEA/v8DAP3/AgAAAP7/AwD9/wIAAAD//wEAAAD//wIA/f8DAP7/AgD9/wQA+/8FAPz/AgAAAP//AgD9/wIA//8BAP//AQD//wEA//8BAP//AQD//wIA/f8DAP3/AgD//wAAAQD+/wIA/v8BAAEA/v8CAP7/AgD+/wMA/P8DAP//AAABAP7/AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA/v8CAP3/BAD8/wMA/v8BAAAAAAD//wEAAAAAAAAAAAD//wEAAAAAAAAA//8BAP//AgD+/wEA//8CAP3/AwD9/wMA/f8EAPv/BAD+/wAAAQD//wEA//8BAP//AAABAP//AQD//wEAAAD//wEA//8BAP//AgD9/wMA/v8AAAIA/f8DAP7/AAACAP3/AwD+/wEA//8BAP//AQAAAP//AQAAAP7/AwD9/wMA/v8AAAEA//8BAP//AAAAAAEA//8AAAEA/v8CAP//AAAAAAEA/v8DAPz/BAD9/wEAAQD+/wEAAQD9/wQA/P8DAP7/AQAAAAAAAAAAAAAAAAAAAAAAAQD+/wIA/////wIA/v8BAAAA//8BAP//AQD//wEA//8BAAAA/v8EAPz/AwD///7/BAD8/wMA/////wIA/v8CAP////8CAP7/AgD+/wIA/v8CAP////8CAP7/AwD9/wIA/v8CAP//AAABAP7/AwD9/wEAAQD+/wMA/f8CAP//AAAAAAEA/v8DAPz/BAD9/wIA/v8CAP7/AgD//wAAAAD//wIA/v8CAP7/AQAAAAAA//8CAP7/AgD+/wIA/v8CAP7/AwD8/wUA+v8GAPv/AwD//wAAAAAAAAAA//8DAPv/BQD9/wAAAgD9/wMA/v8BAP//AQAAAP//AgD9/wMA/v8BAAAA//8BAAAAAAAAAP//AQAAAAAAAAD//wEA//8CAP3/AwD+/wAAAgD+/wEAAAD//wIA/v8CAP7/AgD/////AwD8/wUA/P8CAP//AQD//wIA/f8DAP3/AwD+/wAAAQD+/wMA/f8DAP3/AgD//wAAAQD//wEA//8BAP7/AwD+/wEA//8AAAEA//8CAPz/BAD9/wIA//8AAAEA/v8DAPz/BAD9/wIA//8AAAEA/v8CAP7/AgD//wEA/f8EAPz/BAD+////AgD//wAAAQD//wAAAQD//wEA//8BAP7/AwD+/wEA"}}catch(o){return void addTest("audiopreload",!1)}n.setAttribute("preload","auto"),n.style.cssText="display:none",docElement.appendChild(n),setTimeout(function(){n.addEventListener("loadeddata",A,!1),e=setTimeout(A,t)},0)}),Modernizr.addAsyncTest(function(){var A=new Image;A.onload=A.onerror=function(){addTest("jpeg2000",1==A.width)},A.src="data:image/jp2;base64,/0//UQAyAAAAAAABAAAAAgAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAEBwEBBwEBBwEBBwEB/1IADAAAAAEAAAQEAAH/XAAEQED/ZAAlAAFDcmVhdGVkIGJ5IE9wZW5KUEVHIHZlcnNpb24gMi4wLjD/kAAKAAAAAABYAAH/UwAJAQAABAQAAf9dAAUBQED/UwAJAgAABAQAAf9dAAUCQED/UwAJAwAABAQAAf9dAAUDQED/k8+kEAGvz6QQAa/PpBABr994EAk//9k="}),Modernizr.addAsyncTest(function(){var A=new Image;A.onload=A.onerror=function(){addTest("jpegxr",1==A.width,{aliases:["jpeg-xr"]})},A.src="data:image/vnd.ms-photo;base64,SUm8AQgAAAAFAAG8AQAQAAAASgAAAIC8BAABAAAAAQAAAIG8BAABAAAAAQAAAMC8BAABAAAAWgAAAMG8BAABAAAAHwAAAAAAAAAkw91vA07+S7GFPXd2jckNV01QSE9UTwAZAYBxAAAAABP/gAAEb/8AAQAAAQAAAA=="}),Modernizr.addAsyncTest(function(){var A,e,t,n=createElement("img"),r="sizes"in n;!r&&"srcset"in n?(e="data:image/gif;base64,R0lGODlhAgABAPAAAP///wAAACH5BAAAAAAALAAAAAACAAEAAAICBAoAOw==",A="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",t=function(){addTest("sizes",2==n.width)},n.onload=t,n.onerror=t,n.setAttribute("sizes","9px"),n.srcset=A+" 1w,"+e+" 8w",n.src=A):addTest("sizes",r)}),Modernizr.addAsyncTest(function(){var A=new Image;A.onerror=function(){addTest("webpalpha",!1,{aliases:["webp-alpha"]})},A.onload=function(){addTest("webpalpha",1==A.width,{aliases:["webp-alpha"]})},A.src="data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA=="}),Modernizr.addAsyncTest(function(){var A=new Image;A.onerror=function(){addTest("webpanimation",!1,{aliases:["webp-animation"]})},A.onload=function(){addTest("webpanimation",1==A.width,{aliases:["webp-animation"]})},A.src="data:image/webp;base64,UklGRlIAAABXRUJQVlA4WAoAAAASAAAAAAAAAAAAQU5JTQYAAAD/////AABBTk1GJgAAAAAAAAAAAAAAAAAAAGQAAABWUDhMDQAAAC8AAAAQBxAREYiI/gcA"}),Modernizr.addAsyncTest(function(){var A=new Image;A.onerror=function(){addTest("webplossless",!1,{aliases:["webp-lossless"]})},A.onload=function(){addTest("webplossless",1==A.width,{aliases:["webp-lossless"]})},A.src="data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA="}),Modernizr.addAsyncTest(function(){function A(A,e,t){function n(e){var n=e&&"load"===e.type?1==r.width:!1,o="webp"===A;addTest(A,o&&n?new Boolean(n):n),t&&t(e)}var r=new Image;r.onerror=n,r.onload=n,r.src=e}var e=[{uri:"data:image/webp;base64,UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoBAAEAAwA0JaQAA3AA/vuUAAA=",name:"webp"},{uri:"data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA==",name:"webp.alpha"},{uri:"data:image/webp;base64,UklGRlIAAABXRUJQVlA4WAoAAAASAAAAAAAAAAAAQU5JTQYAAAD/////AABBTk1GJgAAAAAAAAAAAAAAAAAAAGQAAABWUDhMDQAAAC8AAAAQBxAREYiI/gcA",name:"webp.animation"},{uri:"data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=",name:"webp.lossless"}],t=e.shift();A(t.name,t.uri,function(t){if(t&&"load"===t.type)for(var n=0;n<e.length;n++)A(e[n].name,e[n].uri)})}),Modernizr.addTest("hovermq",mq("(hover)")),Modernizr.addTest("pointermq",mq("(pointer:coarse),(pointer:fine),(pointer:none)")),Modernizr.addTest("svgasimg",document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1")),Modernizr.addAsyncTest(function(){if(!Modernizr.canvas)return!1;var A=new Image,e=createElement("canvas"),t=e.getContext("2d");A.onload=function(){addTest("apng",function(){return"undefined"==typeof e.getContext?!1:(t.drawImage(A,0,0),0===t.getImageData(0,0,1,1).data[3])})},A.src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACGFjVEwAAAABAAAAAcMq2TYAAAANSURBVAiZY2BgYPgPAAEEAQB9ssjfAAAAGmZjVEwAAAAAAAAAAQAAAAEAAAAAAAAAAAD6A+gBAbNU+2sAAAARZmRBVAAAAAEImWNgYGBgAAAABQAB6MzFdgAAAABJRU5ErkJggg=="}),Modernizr.addAsyncTest(function(){function A(){addTest("blobworkers",!1),e()}function e(){d&&n.revokeObjectURL(d),i&&i.terminate(),a&&clearTimeout(a)}try{var t=window.BlobBuilder,n=window.URL;Modernizr._config.usePrefix&&(t=t||window.MozBlobBuilder||window.WebKitBlobBuilder||window.MSBlobBuilder||window.OBlobBuilder,n=n||window.MozURL||window.webkitURL||window.MSURL||window.OURL);var r,o,i,d,a,s="Modernizr",l="this.onmessage=function(e){postMessage(e.data)}";try{r=new Blob([l],{type:"text/javascript"})}catch(c){}r||(o=new t,o.append(l),r=o.getBlob()),d=n.createObjectURL(r),i=new Worker(d),i.onmessage=function(A){addTest("blobworkers",s===A.data),e()},i.onerror=A,a=setTimeout(A,200),i.postMessage(s)}catch(c){A()}}),Modernizr.addAsyncTest(function(){try{var A="Modernizr",e=new Worker("data:text/javascript;base64,dGhpcy5vbm1lc3NhZ2U9ZnVuY3Rpb24oZSl7cG9zdE1lc3NhZ2UoZS5kYXRhKX0=");e.onmessage=function(t){e.terminate(),addTest("dataworkers",A===t.data),e=null},e.onerror=function(){addTest("dataworkers",!1),e=null},setTimeout(function(){addTest("dataworkers",!1)},200),e.postMessage(A)}catch(t){setTimeout(function(){addTest("dataworkers",!1)},0)}}),Modernizr.addAsyncTest(function(){function A(){var A=new Image;A.onerror=function(){addTest("datauri",!0),Modernizr.datauri=new Boolean(!0),Modernizr.datauri.over32kb=!1},A.onload=function(){addTest("datauri",!0),Modernizr.datauri=new Boolean(!0),Modernizr.datauri.over32kb=1==A.width&&1==A.height};for(var e="R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";e.length<33e3;)e="\r\n"+e;A.src="data:image/gif;base64,"+e}-1!==navigator.userAgent.indexOf("MSIE 7.")&&setTimeout(function(){addTest("datauri",!1)},10);var e=new Image;e.onerror=function(){addTest("datauri",!1)},e.onload=function(){1==e.width&&1==e.height?A():addTest("datauri",!1)},e.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw=="}),Modernizr.addAsyncTest(function(){function A(i){r++,clearTimeout(e);var d=i&&"playing"===i.type||0!==o.currentTime;return!d&&n>r?void(e=setTimeout(A,t)):(o.removeEventListener("playing",A,!1),addTest("videoautoplay",d),void(o.parentNode&&o.parentNode.removeChild(o)))}var e,t=200,n=5,r=0,o=createElement("video"),i=o.style;if(!(Modernizr.video&&"autoplay"in o))return void addTest("videoautoplay",!1);i.position="absolute",i.height=0,i.width=0;try{if(Modernizr.video.ogg)o.src="data:video/ogg;base64,T2dnUwACAAAAAAAAAABmnCATAAAAAHDEixYBKoB0aGVvcmEDAgEAAQABAAAQAAAQAAAAAAAFAAAAAQAAAAAAAAAAAGIAYE9nZ1MAAAAAAAAAAAAAZpwgEwEAAAACrA7TDlj///////////////+QgXRoZW9yYSsAAABYaXBoLk9yZyBsaWJ0aGVvcmEgMS4xIDIwMDkwODIyIChUaHVzbmVsZGEpAQAAABoAAABFTkNPREVSPWZmbXBlZzJ0aGVvcmEtMC4yOYJ0aGVvcmG+zSj3uc1rGLWpSUoQc5zmMYxSlKQhCDGMYhCEIQhAAAAAAAAAAAAAEW2uU2eSyPxWEvx4OVts5ir1aKtUKBMpJFoQ/nk5m41mUwl4slUpk4kkghkIfDwdjgajQYC8VioUCQRiIQh8PBwMhgLBQIg4FRba5TZ5LI/FYS/Hg5W2zmKvVoq1QoEykkWhD+eTmbjWZTCXiyVSmTiSSCGQh8PB2OBqNBgLxWKhQJBGIhCHw8HAyGAsFAiDgUCw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDAwPEhQUFQ0NDhESFRUUDg4PEhQVFRUOEBETFBUVFRARFBUVFRUVEhMUFRUVFRUUFRUVFRUVFRUVFRUVFRUVEAwLEBQZGxwNDQ4SFRwcGw4NEBQZHBwcDhATFhsdHRwRExkcHB4eHRQYGxwdHh4dGxwdHR4eHh4dHR0dHh4eHRALChAYKDM9DAwOExo6PDcODRAYKDlFOA4RFh0zV1A+EhYlOkRtZ00YIzdAUWhxXDFATldneXhlSFxfYnBkZ2MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEhIVGRoaGhoSFBYaGhoaGhUWGRoaGhoaGRoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhESFh8kJCQkEhQYIiQkJCQWGCEkJCQkJB8iJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQREhgvY2NjYxIVGkJjY2NjGBo4Y2NjY2MvQmNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRISEhUXGBkbEhIVFxgZGxwSFRcYGRscHRUXGBkbHB0dFxgZGxwdHR0YGRscHR0dHhkbHB0dHR4eGxwdHR0eHh4REREUFxocIBERFBcaHCAiERQXGhwgIiUUFxocICIlJRcaHCAiJSUlGhwgIiUlJSkcICIlJSUpKiAiJSUlKSoqEBAQFBgcICgQEBQYHCAoMBAUGBwgKDBAFBgcICgwQEAYHCAoMEBAQBwgKDBAQEBgICgwQEBAYIAoMEBAQGCAgAfF5cdH1e3Ow/L66wGmYnfIUbwdUTe3LMRbqON8B+5RJEvcGxkvrVUjTMrsXYhAnIwe0dTJfOYbWrDYyqUrz7dw/JO4hpmV2LsQQvkUeGq1BsZLx+cu5iV0e0eScJ91VIQYrmqfdVSK7GgjOU0oPaPOu5IcDK1mNvnD+K8LwS87f8Jx2mHtHnUkTGAurWZlNQa74ZLSFH9oF6FPGxzLsjQO5Qe0edcpttd7BXBSqMCL4k/4tFrHIPuEQ7m1/uIWkbDMWVoDdOSuRQ9286kvVUlQjzOE6VrNguN4oRXYGkgcnih7t13/9kxvLYKQezwLTrO44sVmMPgMqORo1E0sm1/9SludkcWHwfJwTSybR4LeAz6ugWVgRaY8mV/9SluQmtHrzsBtRF/wPY+X0JuYTs+ltgrXAmlk10xQHmTu9VSIAk1+vcvU4ml2oNzrNhEtQ3CysNP8UeR35wqpKUBdGdZMSjX4WVi8nJpdpHnbhzEIdx7mwf6W1FKAiucMXrWUWVjyRf23chNtR9mIzDoT/6ZLYailAjhFlZuvPtSeZ+2oREubDoWmT3TguY+JHPdRVSLKxfKH3vgNqJ/9emeEYikGXDFNzaLjvTeGAL61mogOoeG3y6oU4rW55ydoj0lUTSR/mmRhPmF86uwIfzp3FtiufQCmppaHDlGE0r2iTzXIw3zBq5hvaTldjG4CPb9wdxAme0SyedVKczJ9AtYbgPOzYKJvZZImsN7ecrxWZg5dR6ZLj/j4qpWsIA+vYwE+Tca9ounMIsrXMB4Stiib2SPQtZv+FVIpfEbzv8ncZoLBXc3YBqTG1HsskTTotZOYTG+oVUjLk6zhP8bg4RhMUNtfZdO7FdpBuXzhJ5Fh8IKlJG7wtD9ik8rWOJxy6iQ3NwzBpQ219mlyv+FLicYs2iJGSE0u2txzed++D61ZWCiHD/cZdQVCqkO2gJpdpNaObhnDfAPrT89RxdWFZ5hO3MseBSIlANppdZNIV/Rwe5eLTDvkfWKzFnH+QJ7m9QWV1KdwnuIwTNtZdJMoXBf74OhRnh2t+OTGL+AVUnIkyYY+QG7g9itHXyF3OIygG2s2kud679ZWKqSFa9n3IHD6MeLv1lZ0XyduRhiDRtrNnKoyiFVLcBm0ba5Yy3fQkDh4XsFE34isVpOzpa9nR8iCpS4HoxG2rJpnRhf3YboVa1PcRouh5LIJv/uQcPNd095ickTaiGBnWLKVWRc0OnYTSyex/n2FofEPnDG8y3PztHrzOLK1xo6RAml2k9owKajOC0Wr4D5x+3nA0UEhK2m198wuBHF3zlWWVKWLN1CHzLClUfuoYBcx4b1llpeBKmbayaR58njtE9onD66lUcsg0Spm2snsb+8HaJRn4dYcLbCuBuYwziB8/5U1C1DOOz2gZjSZtrLJk6vrLF3hwY4Io9xuT/ruUFRSBkNtUzTOWhjh26irLEPx4jPZL3Fo3QrReoGTTM21xYTT9oFdhTUIvjqTkfkvt0bzgVUjq/hOYY8j60IaO/0AzRBtqkTS6R5ellZd5uKdzzhb8BFlDdAcrwkE0rbXTOPB+7Y0FlZO96qFL4Ykg21StJs8qIW7h16H5hGiv8V2Cflau7QVDepTAHa6Lgt6feiEvJDM21StJsmOH/hynURrKxvUpQ8BH0JF7BiyG2qZpnL/7AOU66gt+reLEXY8pVOCQvSsBtqZTNM8bk9ohRcwD18o/WVkbvrceVKRb9I59IEKysjBeTMmmbA21xu/6iHadLRxuIzkLpi8wZYmmbbWi32RVAUjruxWlJ//iFxE38FI9hNKOoCdhwf5fDe4xZ81lgREhK2m1j78vW1CqkuMu/AjBNK210kzRUX/B+69cMMUG5bYrIeZxVSEZISmkzbXOi9yxwIfPgdsov7R71xuJ7rFcACjG/9PzApqFq7wEgzNJm2suWESPuwrQvejj7cbnQxMkxpm21lUYJL0fKmogPPqywn7e3FvB/FCNxPJ85iVUkCE9/tLKx31G4CgNtWTTPFhMvlu8G4/TrgaZttTChljfNJGgOT2X6EqpETy2tYd9cCBI4lIXJ1/3uVUllZEJz4baqGF64yxaZ+zPLYwde8Uqn1oKANtUrSaTOPHkhvuQP3bBlEJ/LFe4pqQOHUI8T8q7AXx3fLVBgSCVpMba55YxN3rv8U1Dv51bAPSOLlZWebkL8vSMGI21lJmmeVxPRwFlZF1CpqCN8uLwymaZyjbXHCRytogPN3o/n74CNykfT+qqRv5AQlHcRxYrC5KvGmbbUwmZY/29BvF6C1/93x4WVglXDLFpmbapmF89HKTogRwqqSlGbu+oiAkcWFbklC6Zhf+NtTLFpn8oWz+HsNRVSgIxZWON+yVyJlE5tq/+GWLTMutYX9ekTySEQPLVNQQ3OfycwJBM0zNtZcse7CvcKI0V/zh16Dr9OSA21MpmmcrHC+6pTAPHPwoit3LHHqs7jhFNRD6W8+EBGoSEoaZttTCZljfduH/fFisn+dRBGAZYtMzbVMwvul/T/crK1NQh8gN0SRRa9cOux6clC0/mDLFpmbarmF8/e6CopeOLCNW6S/IUUg3jJIYiAcDoMcGeRbOvuTPjXR/tyo79LK3kqqkbxkkMRAOB0GODPItnX3Jnxro/25Ud+llbyVVSN4ySGIgHA6DHBnkWzr7kz410f7cqO/Syt5KqpFVJwn6gBEvBM0zNtZcpGOEPiysW8vvRd2R0f7gtjhqUvXL+gWVwHm4XJDBiMpmmZtrLfPwd/IugP5+fKVSysH1EXreFAcEhelGmbbUmZY4Xdo1vQWVnK19P4RuEnbf0gQnR+lDCZlivNM22t1ESmopPIgfT0duOfQrsjgG4tPxli0zJmF5trdL1JDUIUT1ZXSqQDeR4B8mX3TrRro/2McGeUvLtwo6jIEKMkCUXWsLyZROd9P/rFYNtXPBli0z398iVUlVKAjFlY437JXImUTm2r/4ZYtMy61hf16RPJIU9nZ1MABAwAAAAAAAAAZpwgEwIAAABhp658BScAAAAAAADnUFBQXIDGXLhwtttNHDhw5OcpQRMETBEwRPduylKVB0HRdF0A";else{
-if(!Modernizr.video.h264)return void addTest("videoautoplay",!1);o.src="data:video/mp4;base64,AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAAAs1tZGF0AAACrgYF//+q3EXpvebZSLeWLNgg2SPu73gyNjQgLSBjb3JlIDE0OCByMjYwMSBhMGNkN2QzIC0gSC4yNjQvTVBFRy00IEFWQyBjb2RlYyAtIENvcHlsZWZ0IDIwMDMtMjAxNSAtIGh0dHA6Ly93d3cudmlkZW9sYW4ub3JnL3gyNjQuaHRtbCAtIG9wdGlvbnM6IGNhYmFjPTEgcmVmPTMgZGVibG9jaz0xOjA6MCBhbmFseXNlPTB4MzoweDExMyBtZT1oZXggc3VibWU9NyBwc3k9MSBwc3lfcmQ9MS4wMDowLjAwIG1peGVkX3JlZj0xIG1lX3JhbmdlPTE2IGNocm9tYV9tZT0xIHRyZWxsaXM9MSA4eDhkY3Q9MSBjcW09MCBkZWFkem9uZT0yMSwxMSBmYXN0X3Bza2lwPTEgY2hyb21hX3FwX29mZnNldD0tMiB0aHJlYWRzPTEgbG9va2FoZWFkX3RocmVhZHM9MSBzbGljZWRfdGhyZWFkcz0wIG5yPTAgZGVjaW1hdGU9MSBpbnRlcmxhY2VkPTAgYmx1cmF5X2NvbXBhdD0wIGNvbnN0cmFpbmVkX2ludHJhPTAgYmZyYW1lcz0zIGJfcHlyYW1pZD0yIGJfYWRhcHQ9MSBiX2JpYXM9MCBkaXJlY3Q9MSB3ZWlnaHRiPTEgb3Blbl9nb3A9MCB3ZWlnaHRwPTIga2V5aW50PTI1MCBrZXlpbnRfbWluPTEwIHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcmM9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcHN0ZXA9NCBpcF9yYXRpbz0xLjQwIGFxPTE6MS4wMACAAAAAD2WIhAA3//728P4FNjuZQQAAAu5tb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAAZAABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACGHRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAEAAAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAgAAAAIAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAGQAAAAAAAEAAAAAAZBtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAACgAAAAEAFXEAAAAAAAtaGRscgAAAAAAAAAAdmlkZQAAAAAAAAAAAAAAAFZpZGVvSGFuZGxlcgAAAAE7bWluZgAAABR2bWhkAAAAAQAAAAAAAAAAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAAA+3N0YmwAAACXc3RzZAAAAAAAAAABAAAAh2F2YzEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAgACAEgAAABIAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY//8AAAAxYXZjQwFkAAr/4QAYZ2QACqzZX4iIhAAAAwAEAAADAFA8SJZYAQAGaOvjyyLAAAAAGHN0dHMAAAAAAAAAAQAAAAEAAAQAAAAAHHN0c2MAAAAAAAAAAQAAAAEAAAABAAAAAQAAABRzdHN6AAAAAAAAAsUAAAABAAAAFHN0Y28AAAAAAAAAAQAAADAAAABidWR0YQAAAFptZXRhAAAAAAAAACFoZGxyAAAAAAAAAABtZGlyYXBwbAAAAAAAAAAAAAAAAC1pbHN0AAAAJal0b28AAAAdZGF0YQAAAAEAAAAATGF2ZjU2LjQwLjEwMQ=="}}catch(d){return void addTest("videoautoplay",!1)}o.setAttribute("autoplay",""),i.cssText="display:none",docElement.appendChild(o),setTimeout(function(){o.addEventListener("playing",A,!1),e=setTimeout(A,t)},0)});var omPrefixes="Moz O ms Webkit",domPrefixes=ModernizrProto._config.usePrefixes?omPrefixes.toLowerCase().split(" "):[];ModernizrProto._domPrefixes=domPrefixes,Modernizr.addTest("pointerevents",function(){var A=!1,e=domPrefixes.length;for(A=Modernizr.hasEvent("pointerdown");e--&&!A;)hasEvent(domPrefixes[e]+"pointerdown")&&(A=!0);return A}),Modernizr.addTest("fileinputdirectory",function(){var A=createElement("input"),e="directory";if(A.type="file",e in A)return!0;for(var t=0,n=domPrefixes.length;n>t;t++)if(domPrefixes[t]+e in A)return!0;return!1});var cssomPrefixes=ModernizrProto._config.usePrefixes?omPrefixes.split(" "):[];ModernizrProto._cssomPrefixes=cssomPrefixes;var atRule=function(A){var e,t=prefixes.length,n=window.CSSRule;if("undefined"==typeof n)return undefined;if(!A)return!1;if(A=A.replace(/^@/,""),e=A.replace(/-/g,"_").toUpperCase()+"_RULE",e in n)return"@"+A;for(var r=0;t>r;r++){var o=prefixes[r],i=o.toUpperCase()+"_"+e;if(i in n)return"@-"+o.toLowerCase()+"-"+A}return!1};ModernizrProto.atRule=atRule;var mStyle={style:modElem.elem.style};Modernizr._q.unshift(function(){delete mStyle.style});var testProp=ModernizrProto.testProp=function(A,e,t){return testProps([A],undefined,e,t)};Modernizr.addTest("textshadow",testProp("textShadow","1px 1px")),ModernizrProto.testAllProps=testPropsAll;var prefixed=ModernizrProto.prefixed=function(A,e,t){return 0===A.indexOf("@")?atRule(A):(-1!=A.indexOf("-")&&(A=cssToDOM(A)),e?testPropsAll(A,e,t):testPropsAll(A,"pfx"))};Modernizr.addAsyncTest(function(){var A;try{A=prefixed("indexedDB",window)}catch(e){}if(A){var t="modernizr-"+Math.random(),n=A.open(t);n.onerror=function(){n.error&&"InvalidStateError"===n.error.name?addTest("indexeddb",!1):(addTest("indexeddb",!0),detectDeleteDatabase(A,t))},n.onsuccess=function(){addTest("indexeddb",!0),detectDeleteDatabase(A,t)}}else addTest("indexeddb",!1)}),Modernizr.addAsyncTest(function(){var A,e,t,n,r="detect-blob-support",o=!1;try{A=prefixed("indexedDB",window)}catch(i){}if(!Modernizr.indexeddb||!Modernizr.indexeddb.deletedatabase)return!1;try{A.deleteDatabase(r).onsuccess=function(){e=A.open(r,1),e.onupgradeneeded=function(){e.result.createObjectStore("store")},e.onsuccess=function(){t=e.result;try{n=t.transaction("store","readwrite").objectStore("store").put(new Blob,"key"),n.onsuccess=function(){o=!0},n.onerror=function(){o=!1}}catch(i){o=!1}finally{addTest("indexeddbblob",o),t.close(),A.deleteDatabase(r)}}}}catch(i){addTest("indexeddbblob",!1)}}),Modernizr.addTest("batteryapi",!!prefixed("battery",navigator),{aliases:["battery-api"]});var crypto=prefixed("crypto",window);Modernizr.addTest("crypto",!!prefixed("subtle",crypto)),Modernizr.addTest("dart",!!prefixed("startDart",navigator)),Modernizr.addTest("forcetouch",function(){return hasEvent(prefixed("mouseforcewillbegin",window,!1),window)?MouseEvent.WEBKIT_FORCE_AT_MOUSE_DOWN&&MouseEvent.WEBKIT_FORCE_AT_FORCE_MOUSE_DOWN:!1}),Modernizr.addTest("fullscreen",!(!prefixed("exitFullscreen",document,!1)&&!prefixed("cancelFullScreen",document,!1))),Modernizr.addTest("gamepads",!!prefixed("getGamepads",navigator)),Modernizr.addTest("intl",!!prefixed("Intl",window)),Modernizr.addTest("pagevisibility",!!prefixed("hidden",document,!1)),Modernizr.addTest("performance",!!prefixed("performance",window)),Modernizr.addTest("pointerlock",!!prefixed("exitPointerLock",document)),Modernizr.addTest("quotamanagement",function(){var A=prefixed("temporaryStorage",navigator),e=prefixed("persistentStorage",navigator);return!(!A||!e)}),Modernizr.addTest("requestanimationframe",!!prefixed("requestAnimationFrame",window),{aliases:["raf"]}),Modernizr.addTest("vibrate",!!prefixed("vibrate",navigator)),Modernizr.addTest("webintents",!!prefixed("startActivity",navigator)),Modernizr.addTest("lowbattery",function(){var A=.2,e=prefixed("battery",navigator);return!!(e&&!e.charging&&e.level<=A)});var crypto=prefixed("crypto",window),supportsGetRandomValues;if(crypto&&"getRandomValues"in crypto&&"Uint32Array"in window){var array=new Uint32Array(10),values=crypto.getRandomValues(array);supportsGetRandomValues=values&&is(values[0],"number")}Modernizr.addTest("getrandomvalues",!!supportsGetRandomValues),Modernizr.addTest("backgroundblendmode",prefixed("backgroundBlendMode","text")),Modernizr.addTest("objectfit",!!prefixed("objectFit"),{aliases:["object-fit"]}),Modernizr.addTest("regions",function(){if(isSVG)return!1;var A=prefixed("flowFrom"),e=prefixed("flowInto"),t=!1;if(!A||!e)return t;var n=createElement("iframe"),r=createElement("div"),o=createElement("div"),i=createElement("div"),d="modernizr_flow_for_regions_check";o.innerText="M",r.style.cssText="top: 150px; left: 150px; padding: 0px;",i.style.cssText="width: 50px; height: 50px; padding: 42px;",i.style[A]=d,r.appendChild(o),r.appendChild(i),docElement.appendChild(r);var a,s,l=o.getBoundingClientRect();return o.style[e]=d,a=o.getBoundingClientRect(),s=parseInt(a.left-l.left,10),docElement.removeChild(r),42==s?t=!0:(docElement.appendChild(n),l=n.getBoundingClientRect(),n.style[e]=d,a=n.getBoundingClientRect(),l.height>0&&l.height!==a.height&&0===a.height&&(t=!0)),o=i=r=n=undefined,t}),Modernizr.addTest("wrapflow",function(){var A=prefixed("wrapFlow");if(!A||isSVG)return!1;var e=A.replace(/([A-Z])/g,function(A,e){return"-"+e.toLowerCase()}).replace(/^ms-/,"-ms-"),t=createElement("div"),n=createElement("div"),r=createElement("span");n.style.cssText="position: absolute; left: 50px; width: 100px; height: 20px;"+e+":end;",r.innerText="X",t.appendChild(n),t.appendChild(r),docElement.appendChild(t);var o=r.offsetLeft;return docElement.removeChild(t),n=r=t=undefined,150==o}),Modernizr.addTest("speechrecognition",!!prefixed("SpeechRecognition",window)),Modernizr.addTest("filesystem",!!prefixed("requestFileSystem",window)),Modernizr.addTest("requestautocomplete",!!prefixed("requestAutocomplete",createElement("form")));var url=prefixed("URL",window,!1);url=url&&window[url],Modernizr.addTest("bloburls",url&&"revokeObjectURL"in url&&"createObjectURL"in url),Modernizr.addAsyncTest(function(){function A(){addTest("transferables",!1),e()}function e(){d&&URL.revokeObjectURL(d),a&&a.terminate(),r&&clearTimeout(r)}var t=!!(Modernizr.blobconstructor&&Modernizr.bloburls&&Modernizr.webworkers&&Modernizr.typedarrays);if(!t)return addTest("transferables",!1);try{var n,r,o='var hello = "world"',i=new Blob([o],{type:"text/javascript"}),d=URL.createObjectURL(i),a=new Worker(d);a.onerror=A,r=setTimeout(A,200),n=new ArrayBuffer(1),a.postMessage(n,[n]),addTest("transferables",0===n.byteLength),e()}catch(s){A()}}),Modernizr.addTest("peerconnection",!!prefixed("RTCPeerConnection",window)),Modernizr.addTest("datachannel",function(){if(!Modernizr.peerconnection)return!1;for(var A=0,e=domPrefixes.length;e>A;A++){var t=window[domPrefixes[A]+"RTCPeerConnection"];if(t){var n=new t(null);return"createDataChannel"in n}}return!1}),Modernizr.addTest("matchmedia",!!prefixed("matchMedia",window)),ModernizrProto.testAllProps=testAllProps,Modernizr.addTest("ligatures",testAllProps("fontFeatureSettings",'"liga" 1')),Modernizr.addTest("cssanimations",testAllProps("animationName","a",!0)),Modernizr.addTest("csspseudoanimations",function(){var A=!1;if(!Modernizr.cssanimations||!window.getComputedStyle)return A;var e=["@",Modernizr._prefixes.join("keyframes csspseudoanimations { from { font-size: 10px; } }@").replace(/\@$/,""),'#modernizr:before { content:" "; font-size:5px;',Modernizr._prefixes.join("animation:csspseudoanimations 1ms infinite;"),"}"].join("");return Modernizr.testStyles(e,function(e){A="10px"===window.getComputedStyle(e,":before").getPropertyValue("font-size")}),A}),Modernizr.addTest("appearance",testAllProps("appearance")),Modernizr.addTest("backdropfilter",testAllProps("backdropFilter")),Modernizr.addTest("backgroundcliptext",function(){return testAllProps("backgroundClip","text")}),Modernizr.addTest("bgpositionxy",function(){return testAllProps("backgroundPositionX","3px",!0)&&testAllProps("backgroundPositionY","5px",!0)}),Modernizr.addTest("bgrepeatround",testAllProps("backgroundRepeat","round")),Modernizr.addTest("bgrepeatspace",testAllProps("backgroundRepeat","space")),Modernizr.addTest("backgroundsize",testAllProps("backgroundSize","100%",!0)),Modernizr.addTest("bgsizecover",testAllProps("backgroundSize","cover")),Modernizr.addTest("borderimage",testAllProps("borderImage","url() 1",!0)),Modernizr.addTest("borderradius",testAllProps("borderRadius","0px",!0)),Modernizr.addTest("boxshadow",testAllProps("boxShadow","1px 1px",!0)),Modernizr.addTest("boxsizing",testAllProps("boxSizing","border-box",!0)&&(document.documentMode===undefined||document.documentMode>7)),function(){Modernizr.addTest("csscolumns",function(){var A=!1,e=testAllProps("columnCount");try{A=!!e,A&&(A=new Boolean(A))}catch(t){}return A});for(var A,e,t=["Width","Span","Fill","Gap","Rule","RuleColor","RuleStyle","RuleWidth","BreakBefore","BreakAfter","BreakInside"],n=0;n<t.length;n++)A=t[n].toLowerCase(),e=testAllProps("column"+t[n]),("breakbefore"===A||"breakafter"===A||"breakinside"==A)&&(e=e||testAllProps(t[n])),Modernizr.addTest("csscolumns."+A,e)}(),Modernizr.addTest("cssgridlegacy",testAllProps("grid-columns","10px",!0)),Modernizr.addTest("cssgrid",testAllProps("grid-template-rows","none",!0)),Modernizr.addTest("displayrunin",testAllProps("display","run-in"),{aliases:["display-runin"]}),Modernizr.addTest("ellipsis",testAllProps("textOverflow","ellipsis")),Modernizr.addTest("cssfilters",function(){if(Modernizr.supports)return testAllProps("filter","blur(2px)");var A=createElement("a");return A.style.cssText=prefixes.join("filter:blur(2px); "),!!A.style.length&&(document.documentMode===undefined||document.documentMode>9)}),Modernizr.addTest("flexbox",testAllProps("flexBasis","1px",!0)),Modernizr.addTest("flexboxlegacy",testAllProps("boxDirection","reverse",!0)),Modernizr.addTest("flexboxtweener",testAllProps("flexAlign","end",!0)),Modernizr.addTest("flexwrap",testAllProps("flexWrap","wrap",!0)),Modernizr.addAsyncTest(function(){function A(){function t(){try{var A=createElement("div"),e=createElement("span"),t=A.style,n=0,r=0,o=!1,i=document.body.firstElementChild||document.body.firstChild;return A.appendChild(e),e.innerHTML="Bacon ipsum dolor sit amet jerky velit in culpa hamburger et. Laborum dolor proident, enim dolore duis commodo et strip steak. Salami anim et, veniam consectetur dolore qui tenderloin jowl velit sirloin. Et ad culpa, fatback cillum jowl ball tip ham hock nulla short ribs pariatur aute. Pig pancetta ham bresaola, ut boudin nostrud commodo flank esse cow tongue culpa. Pork belly bresaola enim pig, ea consectetur nisi. Fugiat officia turkey, ea cow jowl pariatur ullamco proident do laborum velit sausage. Magna biltong sint tri-tip commodo sed bacon, esse proident aliquip. Ullamco ham sint fugiat, velit in enim sed mollit nulla cow ut adipisicing nostrud consectetur. Proident dolore beef ribs, laborum nostrud meatball ea laboris rump cupidatat labore culpa. Shankle minim beef, velit sint cupidatat fugiat tenderloin pig et ball tip. Ut cow fatback salami, bacon ball tip et in shank strip steak bresaola. In ut pork belly sed mollit tri-tip magna culpa veniam, short ribs qui in andouille ham consequat. Dolore bacon t-bone, velit short ribs enim strip steak nulla. Voluptate labore ut, biltong swine irure jerky. Cupidatat excepteur aliquip salami dolore. Ball tip strip steak in pork dolor. Ad in esse biltong. Dolore tenderloin exercitation ad pork loin t-bone, dolore in chicken ball tip qui pig. Ut culpa tongue, sint ribeye dolore ex shank voluptate hamburger. Jowl et tempor, boudin pork chop labore ham hock drumstick consectetur tri-tip elit swine meatball chicken ground round. Proident shankle mollit dolore. Shoulder ut duis t-bone quis reprehenderit. Meatloaf dolore minim strip steak, laboris ea aute bacon beef ribs elit shank in veniam drumstick qui. Ex laboris meatball cow tongue pork belly. Ea ball tip reprehenderit pig, sed fatback boudin dolore flank aliquip laboris eu quis. Beef ribs duis beef, cow corned beef adipisicing commodo nisi deserunt exercitation. Cillum dolor t-bone spare ribs, ham hock est sirloin. Brisket irure meatloaf in, boudin pork belly sirloin ball tip. Sirloin sint irure nisi nostrud aliqua. Nostrud nulla aute, enim officia culpa ham hock. Aliqua reprehenderit dolore sunt nostrud sausage, ea boudin pork loin ut t-bone ham tempor. Tri-tip et pancetta drumstick laborum. Ham hock magna do nostrud in proident. Ex ground round fatback, venison non ribeye in.",document.body.insertBefore(A,i),t.cssText="position:absolute;top:0;left:0;width:5em;text-align:justify;text-justification:newspaper;",n=e.offsetHeight,r=e.offsetWidth,t.cssText="position:absolute;top:0;left:0;width:5em;text-align:justify;text-justification:newspaper;"+prefixes.join("hyphens:auto; "),o=e.offsetHeight!=n||e.offsetWidth!=r,document.body.removeChild(A),A.removeChild(e),o}catch(d){return!1}}function n(A,e){try{var t=createElement("div"),n=createElement("span"),r=t.style,o=0,i=!1,d=!1,a=!1,s=document.body.firstElementChild||document.body.firstChild;return r.cssText="position:absolute;top:0;left:0;overflow:visible;width:1.25em;",t.appendChild(n),document.body.insertBefore(t,s),n.innerHTML="mm",o=n.offsetHeight,n.innerHTML="m"+A+"m",d=n.offsetHeight>o,e?(n.innerHTML="m<br />m",o=n.offsetWidth,n.innerHTML="m"+A+"m",a=n.offsetWidth>o):a=!0,d===!0&&a===!0&&(i=!0),document.body.removeChild(t),t.removeChild(n),i}catch(l){return!1}}function r(A){try{var e,t=createElement("input"),n=createElement("div"),r="lebowski",o=!1,i=document.body.firstElementChild||document.body.firstChild;n.innerHTML=r+A+r,document.body.insertBefore(n,i),document.body.insertBefore(t,n),t.setSelectionRange?(t.focus(),t.setSelectionRange(0,0)):t.createTextRange&&(e=t.createTextRange(),e.collapse(!0),e.moveEnd("character",0),e.moveStart("character",0),e.select());try{window.find?o=window.find(r+r):(e=window.self.document.body.createTextRange(),o=e.findText(r+r))}catch(d){o=!1}return document.body.removeChild(n),document.body.removeChild(t),o}catch(d){return!1}}return document.body||document.getElementsByTagName("body")[0]?(addTest("csshyphens",function(){if(!testAllProps("hyphens","auto",!0))return!1;try{return t()}catch(A){return!1}}),addTest("softhyphens",function(){try{return n("&#173;",!0)&&n("&#8203;",!1)}catch(A){return!1}}),void addTest("softhyphensfind",function(){try{return r("&#173;")&&r("&#8203;")}catch(A){return!1}})):void setTimeout(A,e)}var e=300;setTimeout(A,e)}),Modernizr.addTest("cssmask",testAllProps("maskRepeat","repeat-x",!0)),Modernizr.addTest("overflowscrolling",testAllProps("overflowScrolling","touch",!0)),Modernizr.addTest("cssreflections",testAllProps("boxReflect","above",!0)),Modernizr.addTest("cssresize",testAllProps("resize","both",!0)),Modernizr.addTest("scrollsnappoints",testAllProps("scrollSnapType")),Modernizr.addTest("shapes",testAllProps("shapeOutside","content-box",!0)),Modernizr.addTest("textalignlast",testAllProps("textAlignLast")),Modernizr.addTest("csstransforms",function(){return-1===navigator.userAgent.indexOf("Android 2.")&&testAllProps("transform","scale(1)",!0)}),Modernizr.addTest("csstransforms3d",function(){return!!testAllProps("perspective","1px",!0)}),Modernizr.addTest("csstransformslevel2",function(){return testAllProps("translate","45px",!0)}),Modernizr.addTest("csstransitions",testAllProps("transition","all",!0)),Modernizr.addTest("csspseudotransitions",function(){var A=!1;if(!Modernizr.csstransitions||!window.getComputedStyle)return A;var e='#modernizr:before { content:" "; font-size:5px;'+Modernizr._prefixes.join("transition:0s 100s;")+"}#modernizr.trigger:before { font-size:10px; }";return Modernizr.testStyles(e,function(e){window.getComputedStyle(e,":before").getPropertyValue("font-size"),e.className+="trigger",A="5px"===window.getComputedStyle(e,":before").getPropertyValue("font-size")}),A}),Modernizr.addTest("userselect",testAllProps("userSelect","none",!0)),Modernizr.addTest("variablefonts",testAllProps("fontVariationSettings")),testRunner(),setClasses(classes),delete ModernizrProto.addTest,delete ModernizrProto.addAsyncTest;for(var i=0;i<Modernizr._q.length;i++)Modernizr._q[i]();window.Modernizr=Modernizr}(window,document);
\ No newline at end of file
diff --git a/tests/assets/modernizr/README.md b/tests/assets/modernizr/README.md
new file mode 100644
index 0000000000000..2a986d23d44a1
--- /dev/null
+++ b/tests/assets/modernizr/README.md
@@ -0,0 +1,18 @@
+# Playwright Modernizr tests
+
+## Rolling Modernizr
+
+- [modernizr.com](modernizr.com) isn't getting updated anymore, see [here](https://github.com/Modernizr/Modernizr/issues/2490) and [here](https://github.com/Modernizr/Modernizr/commit/db96bdaff995a1d4abccb0dc69c77db7b47ad614). It only contains version 3.6.
+- This is why we build it from source ourselves, using `roll.sh` (they recommend it).
+
+## Updating expectations
+
+1. Serve `tests/assets/modernizr/index.html` from a remote (localhost results will be different) https origin (e.g. https://pages.github.com).
+1. Navigate to `https://your-domain.com/tests/assets/modernizr/index.html`
+
+Do this with:
+
+- Safari Technology Preview
+- Apple iPhone
+
+Make sure to change the updated file's name.
diff --git a/tests/assets/modernizr/index.html b/tests/assets/modernizr/index.html
new file mode 100644
index 0000000000000..9a345c195f59e
--- /dev/null
+++ b/tests/assets/modernizr/index.html
@@ -0,0 +1,26 @@
+<script src='modernizr.js'></script>
+<body></body>
+<script>
+function serialize(value) {
+  if (typeof value !== 'object')
+    return value;
+  const copy = {};
+  for (const key in value) {
+    if (typeof value[key] === 'function')
+      continue;
+    if (key.startsWith('_'))
+      continue;
+    copy[key] = serialize(value[key]);
+  }
+  return copy;
+}
+const report = serialize(Modernizr);
+
+report['devicemotion2'] = 'ondevicemotion' in window;
+report['deviceorientation2'] = 'orientation' in window;
+report['deviceorientation3'] = 'ondeviceorientation' in window;
+
+document.body.style.whiteSpace = 'pre';
+document.body.textContent = JSON.stringify(report, undefined, 2);
+window.report = JSON.parse(document.body.textContent);
+</script>
diff --git a/tests/assets/modernizr/mobile-safari-14-1.json b/tests/assets/modernizr/mobile-safari-18.json
similarity index 66%
rename from tests/assets/modernizr/mobile-safari-14-1.json
rename to tests/assets/modernizr/mobile-safari-18.json
index a67ccfb232597..cd2822a65caeb 100644
--- a/tests/assets/modernizr/mobile-safari-14-1.json
+++ b/tests/assets/modernizr/mobile-safari-18.json
@@ -11,293 +11,400 @@
     "required": true,
     "step": true
   },
-  "inputtypes": {
-    "search": true,
-    "tel": true,
-    "url": true,
-    "email": true,
-    "datetime": false,
-    "date": true,
-    "month": true,
-    "week": true,
-    "time": true,
-    "datetime-local": true,
-    "number": true,
-    "range": true,
-    "color": true
+  "adownload": true,
+  "aping": true,
+  "areaping": true,
+  "ambientlight": false,
+  "applicationcache": false,
+  "audio": {
+    "ogg": "",
+    "mp3": "probably",
+    "opus": "probably",
+    "wav": "probably",
+    "m4a": "maybe"
   },
-  "htmlimports": false,
-  "history": true,
-  "ie8compat": false,
-  "applicationcache": true,
+  "audioloop": true,
+  "webaudio": true,
+  "batteryapi": false,
+  "battery-api": false,
+  "lowbattery": false,
   "blobconstructor": true,
   "blob-constructor": true,
-  "cookies": true,
+  "broadcastchannel": true,
+  "canvas": true,
+  "canvasblending": true,
+  "todataurljpeg": true,
+  "todataurlpng": true,
+  "todataurlwebp": false,
+  "canvaswinding": true,
+  "canvastext": true,
+  "clipboard": {
+    "read": true,
+    "readtext": true,
+    "write": true,
+    "writetext": true
+  },
+  "contenteditable": true,
+  "contextmenu": false,
   "cors": true,
-  "customelements": true,
-  "customprotocolhandler": false,
-  "customevent": true,
-  "dataview": true,
-  "eventlistener": true,
-  "geolocation": true,
-  "json": true,
-  "messagechannel": true,
-  "notification": false,
-  "postmessage": true,
-  "queryselector": true,
-  "serviceworker": true,
-  "svg": true,
-  "templatestrings": true,
-  "typedarrays": true,
-  "websockets": true,
-  "xdomainrequest": false,
-  "webaudio": true,
+  "crypto": true,
+  "getrandomvalues": true,
+  "cssall": true,
+  "cssanimations": true,
+  "appearance": true,
+  "aspectratio": true,
+  "backdropfilter": true,
+  "backgroundblendmode": true,
+  "backgroundcliptext": true,
+  "bgpositionshorthand": true,
+  "bgpositionxy": true,
+  "bgrepeatround": true,
+  "bgrepeatspace": true,
+  "backgroundsize": true,
+  "bgsizecover": true,
+  "borderimage": true,
+  "borderradius": true,
+  "boxdecorationbreak": true,
+  "boxshadow": true,
+  "boxsizing": true,
+  "csscalc": true,
+  "checked": true,
+  "csschunit": true,
+  "csscolumns": {
+    "width": true,
+    "span": true,
+    "fill": true,
+    "gap": true,
+    "rule": true,
+    "rulecolor": true,
+    "rulestyle": true,
+    "rulewidth": true,
+    "breakbefore": true,
+    "breakafter": true,
+    "breakinside": true
+  },
+  "cssgridlegacy": false,
+  "cssgrid": true,
+  "cubicbezierrange": true,
+  "customproperties": true,
+  "displayrunin": false,
+  "display-runin": false,
+  "displaytable": true,
+  "display-table": true,
+  "ellipsis": true,
   "cssescape": true,
-  "focuswithin": true,
+  "cssexunit": true,
   "supports": true,
+  "cssfilters": true,
+  "flexbox": true,
+  "flexboxlegacy": true,
+  "flexboxtweener": false,
+  "flexgap": true,
+  "flexwrap": true,
+  "focusvisible": true,
+  "focuswithin": true,
+  "fontdisplay": true,
+  "fontface": true,
+  "generatedcontent": true,
+  "cssgradients": true,
+  "hairline": true,
+  "hsla": true,
+  "cssinvalid": true,
+  "lastchild": true,
+  "cssmask": true,
+  "mediaqueries": true,
+  "multiplebgs": true,
+  "nthchild": true,
+  "objectfit": true,
+  "object-fit": true,
+  "opacity": true,
+  "overflowscrolling": true,
+  "csspointerevents": true,
+  "csspositionsticky": true,
+  "csspseudoanimations": true,
+  "csstransitions": true,
+  "csspseudotransitions": true,
+  "cssreflections": true,
+  "regions": false,
+  "cssremunit": true,
+  "cssresize": true,
+  "rgba": true,
+  "cssscrollbar": false,
+  "scrollsnappoints": true,
+  "shapes": true,
+  "siblinggeneral": true,
+  "subpixelfont": true,
   "target": true,
+  "textalignlast": true,
+  "textdecoration": {
+    "line": true,
+    "style": true,
+    "color": true,
+    "skip": true,
+    "skipink": true
+  },
+  "textshadow": true,
+  "csstransforms": true,
+  "csstransforms3d": true,
+  "csstransformslevel2": true,
+  "preserve3d": true,
+  "userselect": true,
+  "cssvalid": true,
+  "variablefonts": true,
+  "cssvhunit": true,
+  "cssvmaxunit": false,
+  "cssvminunit": true,
+  "cssvwunit": true,
+  "willchange": true,
+  "wrapflow": false,
+  "customelements": true,
+  "customprotocolhandler": false,
+  "dart": false,
+  "dataview": true,
+  "classlist": true,
+  "createelementattrs": false,
+  "createelement-attrs": false,
+  "dataset": true,
+  "documentfragment": true,
+  "hidden": true,
+  "intersectionobserver": true,
   "microdata": false,
   "mutationobserver": true,
   "passiveeventlisteners": true,
+  "shadowroot": true,
+  "shadowrootlegacy": false,
+  "bdi": true,
+  "details": true,
+  "outputelem": true,
   "picture": true,
+  "progressbar": true,
+  "meter": true,
+  "ruby": true,
+  "template": true,
+  "time": false,
+  "texttrackapi": true,
+  "track": true,
+  "unknownelements": true,
+  "emoji": true,
   "es5array": true,
   "es5date": true,
   "es5function": true,
-  "beacon": true,
-  "lowbandwidth": false,
-  "eventsource": true,
-  "fetch": true,
-  "xhrresponsetype": true,
-  "xhr2": true,
-  "speechsynthesis": true,
-  "localstorage": true,
-  "sessionstorage": true,
-  "websqldatabase": true,
   "es5object": true,
-  "svgfilters": true,
   "strictmode": true,
   "es5string": true,
+  "json": true,
   "es5syntax": true,
   "es5undefined": true,
   "es5": true,
   "es6array": true,
   "arrow": true,
+  "es6class": true,
   "es6collections": true,
   "generators": true,
   "es6math": true,
   "es6number": true,
   "es6object": true,
   "promises": true,
+  "restparameters": true,
+  "spreadarray": true,
+  "stringtemplate": true,
   "es6string": true,
+  "es6symbol": true,
+  "es7array": true,
+  "restdestructuringarray": true,
+  "restdestructuringobject": true,
+  "spreadobject": true,
+  "es8object": true,
+  "customevent": true,
   "devicemotion": true,
-  "devicemotion2": true,
   "deviceorientation": true,
-  "deviceorientation2": true,
-  "deviceorientation3": true,
+  "eventlistener": true,
+  "forcetouch": false,
+  "hashchange": true,
+  "oninput": true,
+  "pointerevents": true,
+  "proximity": false,
   "filereader": true,
-  "urlparser": true,
-  "urlsearchparams": true,
-  "framed": false,
-  "webworkers": true,
-  "contextmenu": false,
-  "cssall": true,
-  "willchange": true,
-  "classlist": true,
-  "documentfragment": true,
-  "contains": false,
-  "audio": true,
-  "canvas": true,
-  "canvastext": true,
-  "contenteditable": true,
-  "emoji": false,
-  "olreversed": true,
-  "userdata": false,
-  "video": true,
-  "vml": false,
-  "webanimations": true,
-  "webgl": true,
-  "adownload": true,
-  "audioloop": true,
-  "canvasblending": true,
-  "todataurljpeg": true,
-  "todataurlpng": true,
-  "todataurlwebp": false,
-  "canvaswinding": true,
-  "bgpositionshorthand": true,
-  "multiplebgs": true,
-  "csspointerevents": true,
-  "cssremunit": true,
-  "rgba": true,
-  "preserve3d": true,
-  "createelementattrs": false,
-  "createelement-attrs": false,
-  "dataset": true,
-  "hidden": true,
-  "outputelem": true,
-  "progressbar": true,
-  "meter": true,
-  "ruby": true,
-  "template": true,
+  "filesystem": false,
+  "flash": false,
+  "fullscreen": false,
+  "gamepads": true,
+  "geolocation": true,
+  "hiddenscroll": true,
+  "history": true,
+  "htmlimports": false,
+  "ie8compat": false,
+  "sandbox": true,
+  "seamless": false,
+  "srcdoc": true,
+  "imgcrossorigin": true,
+  "lazyloading": true,
+  "sizes": true,
   "srcset": true,
-  "time": false,
-  "texttrackapi": true,
-  "track": true,
-  "unknownelements": true,
+  "capture": true,
+  "fileinput": true,
+  "fileinputdirectory": true,
   "inputformaction": true,
   "input-formaction": true,
+  "formattribute": true,
   "inputformenctype": true,
   "input-formenctype": true,
   "inputformmethod": true,
-  "inputformtarget": false,
-  "input-formtarget": false,
-  "scriptasync": true,
-  "scriptdefer": true,
-  "stylescoped": false,
-  "capture": true,
-  "fileinput": true,
-  "formattribute": true,
+  "inputformnovalidate": true,
+  "input-formnovalidate": true,
+  "inputformtarget": true,
+  "input-formtarget": true,
+  "inputtypes": {
+    "search": true,
+    "tel": true,
+    "url": true,
+    "email": true,
+    "datetime": false,
+    "date": true,
+    "month": true,
+    "week": true,
+    "time": true,
+    "datetime-local": true,
+    "number": true,
+    "range": true,
+    "color": true
+  },
+  "formvalidation": true,
+  "localizednumber": false,
+  "inputsearchevent": false,
   "placeholder": true,
-  "sandbox": true,
-  "inlinesvg": true,
-  "textareamaxlength": true,
-  "videocrossorigin": true,
-  "webglextensions": true,
-  "seamless": false,
-  "srcdoc": true,
-  "imgcrossorigin": true,
-  "hashchange": true,
-  "inputsearchevent": true,
-  "ambientlight": false,
-  "datalistelem": true,
-  "videoloop": true,
-  "csscalc": true,
-  "cubicbezierrange": true,
-  "cssgradients": true,
-  "opacity": true,
-  "csspositionsticky": true,
-  "csschunit": true,
-  "cssexunit": true,
-  "hsla": true,
-  "videopreload": true,
-  "getusermedia": true,
-  "websocketsbinary": true,
-  "atobbtoa": true,
-  "atob-btoa": true,
-  "sharedworkers": true,
-  "bdi": true,
+  "requestautocomplete": false,
+  "intl": true,
+  "ligatures": true,
+  "olreversed": true,
+  "mathml": true,
+  "mediasource": false,
+  "hovermq": false,
+  "pointermq": true,
+  "messagechannel": true,
+  "beacon": true,
+  "effectivetype": false,
+  "lowbandwidth": false,
+  "eventsource": true,
+  "fetch": true,
   "xhrresponsetypearraybuffer": true,
   "xhrresponsetypeblob": true,
   "xhrresponsetypedocument": true,
   "xhrresponsetypejson": true,
   "xhrresponsetypetext": true,
-  "svgclippaths": true,
-  "svgforeignobject": true,
-  "smil": true,
-  "hiddenscroll": true,
-  "mathml": true,
-  "touchevents": true,
-  "unicoderange": true,
-  "unicode": true,
-  "checked": true,
-  "displaytable": true,
-  "display-table": true,
-  "fontface": true,
-  "generatedcontent": true,
-  "hairline": true,
-  "cssinvalid": true,
-  "lastchild": true,
-  "nthchild": true,
-  "cssscrollbar": false,
-  "siblinggeneral": true,
-  "subpixelfont": true,
-  "cssvalid": true,
-  "cssvhunit": false,
-  "cssvmaxunit": false,
-  "cssvminunit": true,
-  "cssvwunit": true,
-  "details": true,
-  "oninput": true,
-  "formvalidation": true,
-  "localizednumber": false,
-  "mediaqueries": true,
-  "flash": false,
-  "proximity": false,
-  "sizes": true,
-  "hovermq": false,
-  "pointermq": true,
-  "svgasimg": true,
-  "pointerevents": true,
-  "fileinputdirectory": true,
-  "textshadow": true,
-  "batteryapi": false,
-  "battery-api": false,
-  "crypto": true,
-  "dart": false,
-  "forcetouch": false,
-  "fullscreen": false,
-  "gamepads": true,
-  "intl": true,
+  "xhrresponsetype": true,
+  "xhr2": true,
+  "notification": false,
   "pagevisibility": true,
   "performance": true,
   "pointerlock": false,
-  "quotamanagement": false,
+  "postmessage": {
+    "structuredclones": true
+  },
+  "proxy": true,
+  "queryselector": true,
+  "prefetch": false,
   "requestanimationframe": true,
   "raf": true,
-  "vibrate": false,
-  "webintents": false,
-  "lowbattery": false,
-  "getrandomvalues": true,
-  "backgroundblendmode": true,
-  "objectfit": true,
-  "object-fit": true,
-  "regions": false,
-  "wrapflow": false,
+  "scriptasync": true,
+  "scriptdefer": true,
+  "scrolltooptions": true,
+  "serviceworker": true,
   "speechrecognition": true,
-  "filesystem": false,
-  "requestautocomplete": false,
+  "speechsynthesis": true,
+  "cookies": true,
+  "localstorage": true,
+  "quotamanagement": false,
+  "sessionstorage": true,
+  "userdata": false,
+  "websqldatabase": true,
+  "stylescoped": false,
+  "svg": true,
+  "svgasimg": true,
+  "svgclippaths": true,
+  "svgfilters": true,
+  "svgforeignobject": true,
+  "inlinesvg": true,
+  "smil": true,
+  "textareamaxlength": true,
+  "textencoder": true,
+  "textdecoder": true,
+  "typedarrays": true,
+  "unicoderange": true,
   "bloburls": true,
-  "transferables": true,
+  "urlparser": true,
+  "urlsearchparams": true,
+  "vibrate": false,
+  "video": {
+    "ogg": "",
+    "h264": "probably",
+    "h265": "",
+    "webm": "probably",
+    "vp9": "probably",
+    "hls": "probably",
+    "av1": ""
+  },
+  "videocrossorigin": true,
+  "videoloop": true,
+  "videopreload": true,
+  "vml": false,
+  "webintents": false,
+  "webanimations": true,
+  "publickeycredential": true,
+  "webgl": true,
+  "webglextensions": {
+    "ANGLE_instanced_arrays": true,
+    "EXT_blend_minmax": true,
+    "EXT_clip_control": true,
+    "EXT_color_buffer_half_float": true,
+    "EXT_depth_clamp": true,
+    "EXT_frag_depth": true,
+    "EXT_polygon_offset_clamp": true,
+    "EXT_shader_texture_lod": true,
+    "EXT_texture_filter_anisotropic": true,
+    "EXT_texture_mirror_clamp_to_edge": true,
+    "EXT_sRGB": true,
+    "KHR_parallel_shader_compile": true,
+    "OES_element_index_uint": true,
+    "OES_fbo_render_mipmap": true,
+    "OES_standard_derivatives": true,
+    "OES_texture_float": true,
+    "OES_texture_half_float": true,
+    "OES_texture_half_float_linear": true,
+    "OES_vertex_array_object": true,
+    "WEBGL_blend_func_extended": true,
+    "WEBGL_color_buffer_float": true,
+    "WEBGL_compressed_texture_astc": true,
+    "WEBGL_compressed_texture_etc": true,
+    "WEBGL_compressed_texture_etc1": true,
+    "WEBGL_compressed_texture_pvrtc": true,
+    "WEBKIT_WEBGL_compressed_texture_pvrtc": true,
+    "WEBGL_debug_renderer_info": true,
+    "WEBGL_debug_shaders": true,
+    "WEBGL_depth_texture": true,
+    "WEBGL_draw_buffers": true,
+    "WEBGL_lose_context": true,
+    "WEBGL_multi_draw": true,
+    "WEBGL_polygon_mode": true
+  },
   "peerconnection": true,
-  "datachannel": false,
+  "datachannel": true,
+  "getusermedia": true,
+  "mediastream": true,
+  "websockets": true,
+  "websocketsbinary": true,
+  "atobbtoa": true,
+  "atob-btoa": true,
+  "framed": false,
   "matchmedia": true,
-  "ligatures": true,
-  "cssanimations": true,
-  "csspseudoanimations": true,
-  "appearance": true,
-  "backdropfilter": true,
-  "backgroundcliptext": true,
-  "bgpositionxy": true,
-  "bgrepeatround": true,
-  "bgrepeatspace": true,
-  "backgroundsize": true,
-  "bgsizecover": true,
-  "borderimage": true,
-  "borderradius": true,
-  "boxshadow": true,
-  "boxsizing": true,
-  "csscolumns": true,
-  "cssgridlegacy": false,
-  "cssgrid": true,
-  "displayrunin": false,
-  "display-runin": false,
-  "ellipsis": true,
-  "cssfilters": true,
-  "flexbox": true,
-  "flexboxlegacy": true,
-  "flexboxtweener": false,
-  "flexwrap": true,
-  "cssmask": true,
-  "overflowscrolling": true,
-  "cssreflections": true,
-  "cssresize": true,
-  "scrollsnappoints": true,
-  "shapes": true,
-  "textalignlast": true,
-  "csstransforms": true,
-  "csstransforms3d": true,
-  "csstransformslevel2": true,
-  "csstransitions": true,
-  "csspseudotransitions": true,
-  "userselect": true,
-  "variablefonts": true
+  "pushmanager": false,
+  "resizeobserver": true,
+  "workertypeoption": true,
+  "sharedworkers": true,
+  "webworkers": true,
+  "transferables": true,
+  "xdomainrequest": false,
+  "devicemotion2": true,
+  "deviceorientation2": true,
+  "deviceorientation3": true
 }
\ No newline at end of file
diff --git a/tests/assets/modernizr/modernizr.js b/tests/assets/modernizr/modernizr.js
new file mode 100644
index 0000000000000..b8f4e2e65e59b
--- /dev/null
+++ b/tests/assets/modernizr/modernizr.js
@@ -0,0 +1,4147 @@
+(()=>{var j=(e,A)=>()=>(A||e((A={exports:{}}).exports,A),A.exports);var Y=j((exports,module)=>{(function(scriptGlobalObject,window,document,undefined){var tests=[],ModernizrProto={_version:"4.0.0-alpha",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,A){var t=this;setTimeout(function(){A(t[e])},0)},addTest:function(e,A,t){tests.push({name:e,fn:A,options:t})},addAsyncTest:function(e){tests.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=ModernizrProto,Modernizr=new Modernizr;var classes=[];function is(e,A){return typeof e===A}function testRunner(){var e,A,t,r,n,o,a;for(var l in tests)if(tests.hasOwnProperty(l)){if(e=[],A=tests[l],A.name&&(e.push(A.name.toLowerCase()),A.options&&A.options.aliases&&A.options.aliases.length))for(t=0;t<A.options.aliases.length;t++)e.push(A.options.aliases[t].toLowerCase());for(r=is(A.fn,"function")?A.fn():A.fn,n=0;n<e.length;n++)o=e[n],a=o.split("."),a.length===1?Modernizr[a[0]]=r:((!Modernizr[a[0]]||Modernizr[a[0]]&&!(Modernizr[a[0]]instanceof Boolean))&&(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=r),classes.push((r?"":"no-")+a.join("-"))}}var docElement=document.documentElement,isSVG=docElement.nodeName.toLowerCase()==="svg";function setClasses(e){var A=docElement.className,t=Modernizr._config.classPrefix||"";if(isSVG&&(A=A.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");A=A.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(e.length>0&&(A+=" "+t+e.join(" "+t)),isSVG?docElement.className.baseVal=A:docElement.className=A)}var hasOwnProp;(function(){var e={}.hasOwnProperty;!is(e,"undefined")&&!is(e.call,"undefined")?hasOwnProp=function(A,t){return e.call(A,t)}:hasOwnProp=function(A,t){return t in A&&is(A.constructor.prototype[t],"undefined")}})(),ModernizrProto._l={},ModernizrProto.on=function(e,A){this._l[e]||(this._l[e]=[]),this._l[e].push(A),Modernizr.hasOwnProperty(e)&&setTimeout(function(){Modernizr._trigger(e,Modernizr[e])},0)},ModernizrProto._trigger=function(e,A){if(this._l[e]){var t=this._l[e];setTimeout(function(){var r,n;for(r=0;r<t.length;r++)n=t[r],n(A)},0),delete this._l[e]}};function addTest(e,A){if(typeof e=="object")for(var t in e)hasOwnProp(e,t)&&addTest(t,e[t]);else{e=e.toLowerCase();var r=e.split("."),n=Modernizr[r[0]];if(r.length===2&&(n=n[r[1]]),typeof n<"u")return Modernizr;A=typeof A=="function"?A():A,r.length===1?Modernizr[r[0]]=A:(Modernizr[r[0]]&&!(Modernizr[r[0]]instanceof Boolean)&&(Modernizr[r[0]]=new Boolean(Modernizr[r[0]])),Modernizr[r[0]][r[1]]=A),setClasses([(A&&A!==!1?"":"no-")+r.join("-")]),Modernizr._trigger(e,A)}return Modernizr}Modernizr._q.push(function(){ModernizrProto.addTest=addTest});var omPrefixes="Moz O ms Webkit",cssomPrefixes=ModernizrProto._config.usePrefixes?omPrefixes.split(" "):[];ModernizrProto._cssomPrefixes=cssomPrefixes;var atRule=function(e){var A=prefixes.length,t=window.CSSRule,r;if(typeof t>"u")return undefined;if(!e)return!1;if(e=e.replace(/^@/,""),r=e.replace(/-/g,"_").toUpperCase()+"_RULE",r in t)return"@"+e;for(var n=0;n<A;n++){var o=prefixes[n],a=o.toUpperCase()+"_"+r;if(a in t)return"@-"+o.toLowerCase()+"-"+e}return!1};ModernizrProto.atRule=atRule;var domPrefixes=ModernizrProto._config.usePrefixes?omPrefixes.toLowerCase().split(" "):[];ModernizrProto._domPrefixes=domPrefixes;function createElement(){return typeof document.createElement!="function"?document.createElement(arguments[0]):isSVG?document.createElementNS.call(document,"http://www.w3.org/2000/svg",arguments[0]):document.createElement.apply(document,arguments)}var hasEvent=function(){var e=!("onblur"in docElement);function A(t,r){var n;return t?((!r||typeof r=="string")&&(r=createElement(r||"div")),t="on"+t,n=t in r,!n&&e&&(r.setAttribute||(r=createElement("div")),r.setAttribute(t,""),n=typeof r[t]=="function",r[t]!==undefined&&(r[t]=undefined),r.removeAttribute(t)),n):!1}return A}();ModernizrProto.hasEvent=hasEvent;var html5;if(!isSVG){(function(e,A){var t="3.7.3",r=e.html5||{},n=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,o=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,a,l="_html5shiv",s=0,f={},u;(function(){try{var d=A.createElement("a");d.innerHTML="<xyz></xyz>",a="hidden"in d,u=d.childNodes.length==1||function(){A.createElement("a");var c=A.createDocumentFragment();return typeof c.cloneNode>"u"||typeof c.createDocumentFragment>"u"||typeof c.createElement>"u"}()}catch{a=!0,u=!0}})();function m(d,c){var p=d.createElement("p"),w=d.getElementsByTagName("head")[0]||d.documentElement;return p.innerHTML="x<style>"+c+"</style>",w.insertBefore(p.lastChild,w.firstChild)}function g(){var d=h.elements;return typeof d=="string"?d.split(" "):d}function P(d,c){var p=h.elements;typeof p!="string"&&(p=p.join(" ")),typeof d!="string"&&(d=d.join(" ")),h.elements=p+" "+d,z(c)}function M(d){var c=f[d[l]];return c||(c={},s++,d[l]=s,f[s]=c),c}function b(d,c,p){if(c||(c=A),u)return c.createElement(d);p||(p=M(c));var w;return p.cache[d]?w=p.cache[d].cloneNode():o.test(d)?w=(p.cache[d]=p.createElem(d)).cloneNode():w=p.createElem(d),w.canHaveChildren&&!n.test(d)&&!w.tagUrn?p.frag.appendChild(w):w}function k(d,c){if(d||(d=A),u)return d.createDocumentFragment();c=c||M(d);for(var p=c.frag.cloneNode(),w=0,v=g(),E=v.length;w<E;w++)p.createElement(v[w]);return p}function q(d,c){c.cache||(c.cache={},c.createElem=d.createElement,c.createFrag=d.createDocumentFragment,c.frag=c.createFrag()),d.createElement=function(p){return h.shivMethods?b(p,d,c):c.createElem(p)},d.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+g().join().replace(/[\w\-:]+/g,function(p){return c.createElem(p),c.frag.createElement(p),'c("'+p+'")'})+");return n}")(h,c.frag)}function z(d){d||(d=A);var c=M(d);return h.shivCSS&&!a&&!c.hasCSS&&(c.hasCSS=!!m(d,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),u||q(d,c),d}var h={elements:r.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:t,shivCSS:r.shivCSS!==!1,supportsUnknownElements:u,shivMethods:r.shivMethods!==!1,type:"default",shivDocument:z,createElement:b,createDocumentFragment:k,addElements:P};e.html5=h,z(A);var U=/^$|\b(?:all|print)\b/,T="html5shiv",V=!u&&function(){var d=A.documentElement;return!(typeof A.namespaces>"u"||typeof A.parentWindow>"u"||typeof d.applyElement>"u"||typeof d.removeNode>"u"||typeof e.attachEvent>"u")}();function F(d){for(var c,p=d.getElementsByTagName("*"),w=p.length,v=RegExp("^(?:"+g().join("|")+")$","i"),E=[];w--;)c=p[w],v.test(c.nodeName)&&E.push(c.applyElement(W(c)));return E}function W(d){for(var c,p=d.attributes,w=p.length,v=d.ownerDocument.createElement(T+":"+d.nodeName);w--;)c=p[w],c.specified&&v.setAttribute(c.nodeName,c.nodeValue);return v.style.cssText=d.style.cssText,v}function G(d){for(var c,p=d.split("{"),w=p.length,v=RegExp("(^|[\\s,>+~])("+g().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),E="$1"+T+"\\:$2";w--;)c=p[w]=p[w].split("}"),c[c.length-1]=c[c.length-1].replace(v,E),p[w]=c.join("}");return p.join("{")}function Z(d){for(var c=d.length;c--;)d[c].removeNode()}function S(d){var c,p,w=M(d),v=d.namespaces,E=d.parentWindow;if(!V||d.printShived)return d;typeof v[T]>"u"&&v.add(T);function I(){clearTimeout(w._removeSheetTimer),c&&c.removeNode(!0),c=null}return E.attachEvent("onbeforeprint",function(){I();for(var Q,x,D,R=d.styleSheets,B=[],y=R.length,C=Array(y);y--;)C[y]=R[y];for(;D=C.pop();)if(!D.disabled&&U.test(D.media)){try{Q=D.imports,x=Q.length}catch{x=0}for(y=0;y<x;y++)C.push(Q[y]);try{B.push(D.cssText)}catch{}}B=G(B.reverse().join("")),p=F(d),c=m(d,B)}),E.attachEvent("onafterprint",function(){Z(p),clearTimeout(w._removeSheetTimer),w._removeSheetTimer=setTimeout(I,500)}),d.printShived=!0,d}h.type+=" print",h.shivPrint=S,S(A),typeof module=="object"&&module.exports&&(module.exports=h)})(typeof window<"u"?window:this,document)}var err=function(){},warn=function(){};window.console&&(err=function(){var e=console.error?"error":"log";window.console[e].apply(window.console,Array.prototype.slice.call(arguments))},warn=function(){var e=console.warn?"warn":"log";window.console[e].apply(window.console,Array.prototype.slice.call(arguments))}),ModernizrProto.load=function(){"yepnope"in window?(warn(`yepnope.js (aka Modernizr.load) is no longer included as part of Modernizr. yepnope appears to be available on the page, so we\u2019ll use it to handle this call to Modernizr.load, but please update your code to use yepnope directly.
+ See http://github.com/Modernizr/Modernizr/issues/1182 for more information.`),window.yepnope.apply(window,[].slice.call(arguments,0))):err("yepnope.js (aka Modernizr.load) is no longer included as part of Modernizr. Get it from http://yepnopejs.com. See http://github.com/Modernizr/Modernizr/issues/1182 for more information.")};function getBody(){var e=document.body;return e||(e=createElement(isSVG?"svg":"body"),e.fake=!0),e}function injectElementWithStyles(e,A,t,r){var n="modernizr",o,a,l,s,f=createElement("div"),u=getBody();if(parseInt(t,10))for(;t--;)l=createElement("div"),l.id=r?r[t]:n+(t+1),f.appendChild(l);return o=createElement("style"),o.type="text/css",o.id="s"+n,(u.fake?u:f).appendChild(o),u.appendChild(f),o.styleSheet?o.styleSheet.cssText=e:o.appendChild(document.createTextNode(e)),f.id=n,u.fake&&(u.style.background="",u.style.overflow="hidden",s=docElement.style.overflow,docElement.style.overflow="hidden",docElement.appendChild(u)),a=A(f,e),u.fake&&u.parentNode?(u.parentNode.removeChild(u),docElement.style.overflow=s,docElement.offsetHeight):f.parentNode.removeChild(f),!!a}function computedStyle(e,A,t){var r;if("getComputedStyle"in window){r=getComputedStyle.call(window,e,A);var n=window.console;if(r!==null)t&&(r=r.getPropertyValue(t));else if(n){var o=n.error?"error":"log";n[o].call(n,"getComputedStyle returning null, its possible modernizr test results are inaccurate")}}else r=!A&&e.currentStyle&&e.currentStyle[t];return r}var mq=function(){var e=window.matchMedia||window.msMatchMedia;return e?function(A){var t=e(A);return t&&t.matches||!1}:function(A){var t=!1;return injectElementWithStyles("@media "+A+" { #modernizr { position: absolute; } }",function(r){t=computedStyle(r,null,"position")==="absolute"}),t}}();ModernizrProto.mq=mq;function contains(e,A){return!!~(""+e).indexOf(A)}var modElem={elem:createElement("modernizr")};Modernizr._q.push(function(){delete modElem.elem});var mStyle={style:modElem.elem.style};Modernizr._q.unshift(function(){delete mStyle.style});function domToCSS(e){return e.replace(/([A-Z])/g,function(A,t){return"-"+t.toLowerCase()}).replace(/^ms-/,"-ms-")}function nativeTestProps(e,A){var t=e.length;if("CSS"in window&&"supports"in window.CSS){for(;t--;)if(window.CSS.supports(domToCSS(e[t]),A))return!0;return!1}else if("CSSSupportsRule"in window){for(var r=[];t--;)r.push("("+domToCSS(e[t])+":"+A+")");return r=r.join(" or "),injectElementWithStyles("@supports ("+r+") { #modernizr { position: absolute; } }",function(n){return computedStyle(n,null,"position")==="absolute"})}return undefined}function cssToDOM(e){return e.replace(/([a-z])-([a-z])/g,function(A,t,r){return t+r.toUpperCase()}).replace(/^-/,"")}function testProps(e,A,t,r){if(r=is(r,"undefined")?!1:r,!is(t,"undefined")){var n=nativeTestProps(e,t);if(!is(n,"undefined"))return n}for(var o,a,l,s,f,u=["modernizr","tspan","samp"];!mStyle.style&&u.length;)o=!0,mStyle.modElem=createElement(u.shift()),mStyle.style=mStyle.modElem.style;function m(){o&&(delete mStyle.style,delete mStyle.modElem)}for(l=e.length,a=0;a<l;a++)if(s=e[a],f=mStyle.style[s],contains(s,"-")&&(s=cssToDOM(s)),mStyle.style[s]!==undefined)if(!r&&!is(t,"undefined")){try{mStyle.style[s]=t}catch{}if(mStyle.style[s]!==f)return m(),A==="pfx"?s:!0}else return m(),A==="pfx"?s:!0;return m(),!1}function fnBind(e,A){return function(){return e.apply(A,arguments)}}function testDOMProps(e,A,t){var r;for(var n in e)if(e[n]in A)return t===!1?e[n]:(r=A[e[n]],is(r,"function")?fnBind(r,t||A):r);return!1}function testPropsAll(e,A,t,r,n){var o=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+cssomPrefixes.join(o+" ")+o).split(" ");return is(A,"string")||is(A,"undefined")?testProps(a,A,r,n):(a=(e+" "+domPrefixes.join(o+" ")+o).split(" "),testDOMProps(a,A,t))}ModernizrProto.testAllProps=testPropsAll;var prefixed=ModernizrProto.prefixed=function(e,A,t){return e.indexOf("@")===0?atRule(e):(e.indexOf("-")!==-1&&(e=cssToDOM(e)),A?testPropsAll(e,A,t):testPropsAll(e,"pfx"))},prefixes=ModernizrProto._config.usePrefixes?" -webkit- -moz- -o- -ms- ".split(" "):["",""];ModernizrProto._prefixes=prefixes;var prefixedCSS=ModernizrProto.prefixedCSS=function(e){var A=prefixed(e);return A&&domToCSS(A)};function testAllProps(e,A,t){return testPropsAll(e,undefined,undefined,A,t)}ModernizrProto.testAllProps=testAllProps;var testProp=ModernizrProto.testProp=function(e,A,t){return testProps([e],undefined,A,t)},testStyles=ModernizrProto.testStyles=injectElementWithStyles;Modernizr.addTest("adownload",!window.externalHost&&"download"in createElement("a"));Modernizr.addTest("aping",!window.externalHost&&"ping"in createElement("a"));Modernizr.addTest("areaping",!window.externalHost&&"ping"in createElement("area"));Modernizr.addTest("ambientlight",hasEvent("devicelight",window));Modernizr.addTest("applicationcache","applicationCache"in window);(function(){var e=createElement("audio");Modernizr.addTest("audio",function(){var A=!1;try{A=!!e.canPlayType,A&&(A=new Boolean(A))}catch{}return A});try{e.canPlayType&&(Modernizr.addTest("audio.ogg",e.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,"")),Modernizr.addTest("audio.mp3",e.canPlayType('audio/mpeg; codecs="mp3"').replace(/^no$/,"")),Modernizr.addTest("audio.opus",e.canPlayType('audio/ogg; codecs="opus"')||e.canPlayType('audio/webm; codecs="opus"').replace(/^no$/,"")),Modernizr.addTest("audio.wav",e.canPlayType('audio/wav; codecs="1"').replace(/^no$/,"")),Modernizr.addTest("audio.m4a",(e.canPlayType("audio/x-m4a;")||e.canPlayType("audio/aac;")).replace(/^no$/,"")))}catch{}})();Modernizr.addAsyncTest(function(){var e,A=200,t=5,r=0,n=createElement("audio"),o=n.style;function a(l){r++,clearTimeout(e);var s=l&&l.type==="playing"||n.currentTime!==0;if(!s&&r<t){e=setTimeout(a,A);return}n.removeEventListener("playing",a,!1),addTest("audioautoplay",s),n.parentNode&&n.parentNode.removeChild(n)}if(!Modernizr.audio||!("autoplay"in n)){addTest("audioautoplay",!1);return}o.position="absolute",o.height=0,o.width=0;try{if(Modernizr.audio.mp3)n.src="data:audio/mpeg;base64,/+MYxAAAAANIAUAAAASEEB/jwOFM/0MM/90b/+RhST//w4NFwOjf///PZu////9lns5GFDv//l9GlUIEEIAAAgIg8Ir/JGq3/+MYxDsLIj5QMYcoAP0dv9HIjUcH//yYSg+CIbkGP//8w0bLVjUP///3Z0x5QCAv/yLjwtGKTEFNRTMuOTeqqqqqqqqqqqqq/+MYxEkNmdJkUYc4AKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq";else if(Modernizr.audio.wav)n.src="data:audio/wav;base64,UklGRjQAAABXQVZFZm10IBAAAAABAAEAEAAAABAAAAABAAgAZGF0YRAAAAB/f39/f39/f39/f39/f39/";else{addTest("audioautoplay",!1);return}}catch{addTest("audioautoplay",!1);return}n.setAttribute("autoplay",""),o.cssText="display:none",docElement.appendChild(n),setTimeout(function(){n.addEventListener("playing",a,!1),e=setTimeout(a,A)},0)});Modernizr.addTest("audioloop","loop"in createElement("audio"));Modernizr.addAsyncTest(function(){var e,A=300,t=createElement("audio"),r=t.style;function n(o){clearTimeout(e);var a=o!==undefined&&o.type==="loadeddata";t.removeEventListener("loadeddata",n,!1),addTest("audiopreload",a),t.parentNode&&t.parentNode.removeChild(t)}if(!Modernizr.audio||!("preload"in t)){addTest("audiopreload",!1);return}r.position="absolute",r.height=0,r.width=0;try{if(Modernizr.audio.mp3)t.src="data:audio/mpeg;base64,//MUxAAB6AXgAAAAAPP+c6nf//yi/6f3//MUxAMAAAIAAAjEcH//0fTX6C9Lf//0//MUxA4BeAIAAAAAAKX2/6zv//+IlR4f//MUxBMCMAH8AAAAABYWalVMQU1FMy45//MUxBUB0AH0AAAAADkuM1VVVVVVVVVV//MUxBgBUATowAAAAFVVVVVVVVVVVVVV";else if(Modernizr.audio.m4a)t.src="data:audio/x-m4a;base64,AAAAGGZ0eXBNNEEgAAACAGlzb21pc28yAAAACGZyZWUAAAAfbWRhdN4EAABsaWJmYWFjIDEuMjgAAAFoAQBHAAACiG1vb3YAAABsbXZoZAAAAAB8JbCAfCWwgAAAA+gAAAAYAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAG0dHJhawAAAFx0a2hkAAAAD3wlsIB8JbCAAAAAAQAAAAAAAAAYAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAABUG1kaWEAAAAgbWRoZAAAAAB8JbCAfCWwgAAArEQAAAQAVcQAAAAAAC1oZGxyAAAAAAAAAABzb3VuAAAAAAAAAAAAAAAAU291bmRIYW5kbGVyAAAAAPttaW5mAAAAEHNtaGQAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAL9zdGJsAAAAW3N0c2QAAAAAAAAAAQAAAEttcDRhAAAAAAAAAAEAAAAAAAAAAAACABAAAAAArEQAAAAAACdlc2RzAAAAAAMZAAEABBFAFQAAAAABftAAAAAABQISCAYBAgAAABhzdHRzAAAAAAAAAAEAAAABAAAEAAAAABxzdHNjAAAAAAAAAAEAAAABAAAAAQAAAAEAAAAUc3RzegAAAAAAAAAXAAAAAQAAABRzdGNvAAAAAAAAAAEAAAAoAAAAYHVkdGEAAABYbWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAraWxzdAAAACOpdG9vAAAAG2RhdGEAAAABAAAAAExhdmY1Mi42NC4y";else if(Modernizr.audio.ogg)t.src="data:audio/ogg;base64,T2dnUwACAAAAAAAAAAD/QwAAAAAAAM2LVKsBHgF2b3JiaXMAAAAAAUSsAAAAAAAAgLsAAAAAAAC4AU9nZ1MAAAAAAAAAAAAA/0MAAAEAAADmvOe6Dy3/////////////////MgN2b3JiaXMdAAAAWGlwaC5PcmcgbGliVm9yYmlzIEkgMjAwNzA2MjIAAAAAAQV2b3JiaXMfQkNWAQAAAQAYY1QpRplS0kqJGXOUMUaZYpJKiaWEFkJInXMUU6k515xrrLm1IIQQGlNQKQWZUo5SaRljkCkFmVIQS0kldBI6J51jEFtJwdaYa4tBthyEDZpSTCnElFKKQggZU4wpxZRSSkIHJXQOOuYcU45KKEG4nHOrtZaWY4updJJK5yRkTEJIKYWSSgelU05CSDWW1lIpHXNSUmpB6CCEEEK2IIQNgtCQVQAAAQDAQBAasgoAUAAAEIqhGIoChIasAgAyAAAEoCiO4iiOIzmSY0kWEBqyCgAAAgAQAADAcBRJkRTJsSRL0ixL00RRVX3VNlVV9nVd13Vd13UgNGQVAAABAEBIp5mlGiDCDGQYCA1ZBQAgAAAARijCEANCQ1YBAAABAABiKDmIJrTmfHOOg2Y5aCrF5nRwItXmSW4q5uacc845J5tzxjjnnHOKcmYxaCa05pxzEoNmKWgmtOacc57E5kFrqrTmnHPGOaeDcUYY55xzmrTmQWo21uaccxa0pjlqLsXmnHMi5eZJbS7V5pxzzjnnnHPOOeecc6oXp3NwTjjnnHOi9uZabkIX55xzPhmne3NCOOecc84555xzzjnnnHOC0JBVAAAQAABBGDaGcacgSJ+jgRhFiGnIpAfdo8MkaAxyCqlHo6ORUuoglFTGSSmdIDRkFQAACAAAIYQUUkghhRRSSCGFFFKIIYYYYsgpp5yCCiqppKKKMsoss8wyyyyzzDLrsLPOOuwwxBBDDK20EktNtdVYY62555xrDtJaaa211koppZRSSikIDVkFAIAAABAIGWSQQUYhhRRSiCGmnHLKKaigAkJDVgEAgAAAAgAAADzJc0RHdERHdERHdERHdETHczxHlERJlERJtEzL1ExPFVXVlV1b1mXd9m1hF3bd93Xf93Xj14VhWZZlWZZlWZZlWZZlWZZlWYLQkFUAAAgAAIAQQgghhRRSSCGlGGPMMeegk1BCIDRkFQAACAAgAAAAwFEcxXEkR3IkyZIsSZM0S7M8zdM8TfREURRN01RFV3RF3bRF2ZRN13RN2XRVWbVdWbZt2dZtX5Zt3/d93/d93/d93/d93/d1HQgNWQUASAAA6EiOpEiKpEiO4ziSJAGhIasAABkAAAEAKIqjOI7jSJIkSZakSZ7lWaJmaqZneqqoAqEhqwAAQAAAAQAAAAAAKJriKabiKaLiOaIjSqJlWqKmaq4om7Lruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7ruq7rui4QGrIKAJAAANCRHMmRHEmRFEmRHMkBQkNWAQAyAAACAHAMx5AUybEsS9M8zdM8TfRET/RMTxVd0QVCQ1YBAIAAAAIAAAAAADAkw1IsR3M0SZRUS7VUTbVUSxVVT1VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVTVN0zRNIDRkJQAABADAYo3B5SAhJSXl3hDCEJOeMSYhtV4hBJGS3jEGFYOeMqIMct5C4xCDHggNWREARAEAAMYgxxBzyDlHqZMSOeeodJQa5xyljlJnKcWYYs0oldhSrI1zjlJHraOUYiwtdpRSjanGAgAAAhwAAAIshEJDVgQAUQAAhDFIKaQUYow5p5xDjCnnmHOGMeYcc44556B0UirnnHROSsQYc445p5xzUjonlXNOSiehAACAAAcAgAALodCQFQFAnACAQZI8T/I0UZQ0TxRFU3RdUTRd1/I81fRMU1U90VRVU1Vt2VRVWZY8zzQ901RVzzRV1VRVWTZVVZZFVdVt03V123RV3ZZt2/ddWxZ2UVVt3VRd2zdV1/Zd2fZ9WdZ1Y/I8VfVM03U903Rl1XVtW3VdXfdMU5ZN15Vl03Vt25VlXXdl2fc103Rd01Vl2XRd2XZlV7ddWfZ903WF35VlX1dlWRh2XfeFW9eV5XRd3VdlVzdWWfZ9W9eF4dZ1YZk8T1U903RdzzRdV3VdX1dd19Y105Rl03Vt2VRdWXZl2fddV9Z1zzRl2XRd2zZdV5ZdWfZ9V5Z13XRdX1dlWfhVV/Z1WdeV4dZt4Tdd1/dVWfaFV5Z14dZ1Ybl1XRg+VfV9U3aF4XRl39eF31luXTiW0XV9YZVt4VhlWTl+4ViW3feVZXRdX1ht2RhWWRaGX/id5fZ943h1XRlu3efMuu8Mx++k+8rT1W1jmX3dWWZfd47hGDq/8OOpqq+brisMpywLv+3rxrP7vrKMruv7qiwLvyrbwrHrvvP8vrAso+z6wmrLwrDatjHcvm4sv3Acy2vryjHrvlG2dXxfeArD83R1XXlmXcf2dXTjRzh+ygAAgAEHAIAAE8pAoSErAoA4AQCPJImiZFmiKFmWKIqm6LqiaLqupGmmqWmeaVqaZ5qmaaqyKZquLGmaaVqeZpqap5mmaJqua5qmrIqmKcumasqyaZqy7LqybbuubNuiacqyaZqybJqmLLuyq9uu7Oq6pFmmqXmeaWqeZ5qmasqyaZquq3meanqeaKqeKKqqaqqqraqqLFueZ5qa6KmmJ4qqaqqmrZqqKsumqtqyaaq2bKqqbbuq7Pqybeu6aaqybaqmLZuqatuu7OqyLNu6L2maaWqeZ5qa55mmaZqybJqqK1uep5qeKKqq5ommaqqqLJumqsqW55mqJ4qq6omea5qqKsumatqqaZq2bKqqLZumKsuubfu+68qybqqqbJuqauumasqybMu+78qq7oqmKcumqtqyaaqyLduy78uyrPuiacqyaaqybaqqLsuybRuzbPu6aJqybaqmLZuqKtuyLfu6LNu678qub6uqrOuyLfu67vqucOu6MLyybPuqrPq6K9u6b+sy2/Z9RNOUZVM1bdtUVVl2Zdn2Zdv2fdE0bVtVVVs2TdW2ZVn2fVm2bWE0Tdk2VVXWTdW0bVmWbWG2ZeF2Zdm3ZVv2ddeVdV/XfePXZd3murLty7Kt+6qr+rbu+8Jw667wCgAAGHAAAAgwoQwUGrISAIgCAACMYYwxCI1SzjkHoVHKOecgZM5BCCGVzDkIIZSSOQehlJQy5yCUklIIoZSUWgshlJRSawUAABQ4AAAE2KApsThAoSErAYBUAACD41iW55miatqyY0meJ4qqqaq27UiW54miaaqqbVueJ4qmqaqu6+ua54miaaqq6+q6aJqmqaqu67q6Lpqiqaqq67qyrpumqqquK7uy7Oumqqqq68quLPvCqrquK8uybevCsKqu68qybNu2b9y6ruu+7/vCka3rui78wjEMRwEA4AkOAEAFNqyOcFI0FlhoyEoAIAMAgDAGIYMQQgYhhJBSSiGllBIAADDgAAAQYEIZKDRkRQAQJwAAGEMppJRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkgppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkqppJRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoplVJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSSimllFJKKaWUUkoppZRSCgCQinAAkHowoQwUGrISAEgFAACMUUopxpyDEDHmGGPQSSgpYsw5xhyUklLlHIQQUmktt8o5CCGk1FJtmXNSWosx5hgz56SkFFvNOYdSUoux5ppr7qS0VmuuNedaWqs115xzzbm0FmuuOdecc8sx15xzzjnnGHPOOeecc84FAOA0OACAHtiwOsJJ0VhgoSErAYBUAAACGaUYc8456BBSjDnnHIQQIoUYc845CCFUjDnnHHQQQqgYc8w5CCGEkDnnHIQQQgghcw466CCEEEIHHYQQQgihlM5BCCGEEEooIYQQQgghhBA6CCGEEEIIIYQQQgghhFJKCCGEEEIJoZRQAABggQMAQIANqyOcFI0FFhqyEgAAAgCAHJagUs6EQY5Bjw1BylEzDUJMOdGZYk5qMxVTkDkQnXQSGWpB2V4yCwAAgCAAIMAEEBggKPhCCIgxAABBiMwQCYVVsMCgDBoc5gHAA0SERACQmKBIu7iALgNc0MVdB0IIQhCCWBxAAQk4OOGGJ97whBucoFNU6iAAAAAAAAwA4AEA4KAAIiKaq7C4wMjQ2ODo8AgAAAAAABYA+AAAOD6AiIjmKiwuMDI0Njg6PAIAAAAAAAAAAICAgAAAAAAAQAAAAICAT2dnUwAE7AwAAAAAAAD/QwAAAgAAADuydfsFAQEBAQEACg4ODg==";else if(Modernizr.audio.wav)t.src="data:audio/wav;base64,UklGRvwZAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YdgZAAAAAAEA/v8CAP//AAABAP////8DAPz/BAD9/wEAAAAAAAAAAAABAP7/AgD//wAAAQD//wAAAQD//wAAAQD+/wIA//8AAAAAAAD//wIA/v8BAAAA//8BAAAA//8BAP//AQAAAP//AQD//wEAAAD//wEA//8BAP//AQD//wEA//8BAP//AQD+/wMA/f8DAP3/AgD+/wIA/////wMA/f8CAP7/AgD+/wMA/f8CAP7/AgD//wAAAAAAAAAAAQD+/wIA/v8CAP7/AwD9/wIA/v8BAAEA/v8CAP7/AQAAAAAAAAD//wEAAAD//wIA/f8DAP7/AQD//wEAAAD//wEA//8CAP7/AQD//wIA/v8CAP7/AQAAAAAAAAD//wEAAAAAAAAA//8BAP//AgD9/wQA+/8FAPz/AgAAAP//AgD+/wEAAAD//wIA/v8CAP3/BAD8/wQA/P8DAP7/AwD8/wQA/P8DAP7/AQAAAAAA//8BAP//AgD+/wEAAAD//wIA/v8BAP//AQD//wEAAAD//wEA//8BAAAAAAAAAP//AgD+/wEAAAAAAAAAAAD//wEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AgD+/wIA/v8BAP//AQABAP7/AQD//wIA/v8CAP3/AwD/////AgD9/wMA/v8BAP//AQAAAP//AQD//wEA//8BAP//AAABAP//AAABAP//AQD//wAAAAACAP3/AwD9/wIA//8BAP//AQD//wEA//8BAP//AgD9/wMA/v8AAAIA/f8CAAAA/v8EAPv/BAD9/wIAAAD+/wQA+v8HAPr/BAD+/wEAAAD//wIA/f8EAPz/BAD7/wUA/P8EAPz/AwD+/wEAAAD//wEAAAAAAP//AgD8/wUA+/8FAPz/AwD9/wIA//8AAAEA/v8CAP//AQD//wAAAAABAP//AgD9/wMA/f8EAPz/AwD+/wAAAwD7/wUA/P8DAP7/AQAAAP//AgD+/wEAAQD+/wIA/v8BAAEA/v8CAP7/AQAAAP//AgD9/wMA/f8DAP7/AgD+/wEAAAAAAAEA//8AAAEA/v8DAP3/AgD//wEA//8BAP7/AwD9/wMA/v8BAP//AQAAAP//AgD9/wMA/v8BAP//AQAAAP//AgD+/wEAAQD+/wIA/////wIA//8AAAEA/f8DAP//AAABAP////8DAP3/AwD+/wEA//8BAP//AQAAAAAA//8BAP//AQD//wEA//8BAP//AAAAAAEA//8BAP7/AgD//wEA//8AAAAAAAAAAAAAAAD//wIA/v8BAAAA//8BAAEA/v8BAAAA//8DAPz/AwD+/wIA/v8CAP3/AwD+/wEAAAD//wEA//8BAAAA//8BAAAA/v8EAPv/BAD+/wAAAAABAP7/AgD//wAAAAABAP7/AgD//wAAAAAAAAAAAAABAP3/BAD8/wQA/f8BAAAAAAABAP7/AgD+/wIA/v8CAP7/AgD+/wIA/v8BAAAAAAD//wIA/f8DAP7/AAABAP//AAACAPz/BAD9/wIA//8AAP//AwD9/wMA/P8EAP3/AwD9/wIA//8BAP//AQD+/wMA/f8DAP7/AAABAP//AQAAAP//AQD//wIA/f8DAP7/AQAAAP//AQAAAAAA//8CAP7/AQABAP7/AgD+/wEAAQD+/wIA/v8CAP////8CAP7/AgD//wAAAAABAP7/AwD9/wIAAAD+/wMA/f8CAP//AQD+/wMA/f8CAP//AAACAPz/BQD6/wUA/v///wIA/v8CAP3/BAD7/wYA+v8FAPz/AwD/////AgD+/wEAAAD//wEAAAD//wIA/f8DAP7/AQAAAP//AgD//wAA//8BAAAAAAAAAP//AQD//wEA//8AAAIA/f8DAP3/AgAAAP//AQD//wEA//8AAAEA//8BAP////8CAP//AAABAP3/BAD9/wIA/v8BAAEA//8BAP7/AgD//wEA//8AAAEA//8BAP//AAAAAAEA//8BAP7/AgD//wEA//8AAAAAAQD+/wIA/v8BAAAAAAD//wIA/v8BAAAAAAAAAAAAAQD+/wMA/f8CAP//AQD//wIA/f8DAP7/AQD//wEA//8CAP7/AAABAP7/AwD9/wMA/v8AAAEA//8BAAAAAAD//wIA/v8BAAAA//8CAP7/AgD+/wEA//8CAP7/AgD//wAAAAAAAAAAAQD//wEA/v8DAPz/BQD8/wIA//8AAAEAAAD//wEA//8BAP//AQAAAAAA//8BAP//AgD+/wEAAAAAAP//AQD+/wMA/////wEA/v8CAP//AQD//wEA//8AAAEA//8BAAAA/v8EAPz/AwD+/wEAAAAAAAAA//8CAP7/AQD//wEA//8BAP//AAABAP7/AwD9/wIA//8BAP//AQD//wEA//8AAAEA/v8EAPv/BAD9/wIA//8BAP7/AwD9/wIA//8AAAEA//8BAP//AQD//wAAAQD//wEAAAD+/wMA/v8AAAIA/f8DAP7/AQD//wAAAQD+/wMA/f8CAP//AAABAP7/AgD+/wMA/f8CAP7/AQABAP7/AgD+/wIA/v8CAP7/AwD8/wMA//8AAAEA//8AAAAAAAABAP//AQD//wAAAQD//wIA/f8DAP3/AwD+/wAAAgD9/wIA//8AAAEAAAD+/wMA/P8FAPv/BAD9/wIA//8AAP//AgD+/wIA/v8BAAAAAAD//wEAAAAAAP//AQD//wEA//8BAP//AAABAP7/AwD9/wIA//8BAP//AAABAP//AQD//wAAAQD//wEA//8BAP//AAABAAAA//8BAP7/AwD9/wMA/f8DAP3/AgD//wEA//8BAP7/AgD//wAAAgD8/wQA/f8CAP//AQD+/wMA/f8CAP7/AgD//wAAAAAAAAAAAAABAP7/AwD9/wIA/v8DAP3/AwD9/wIA/v8DAPz/BQD7/wQA/f8CAP7/AwD9/wMA/f8CAP//AQAAAP7/AwD+/wEA//8AAAEAAAAAAP//AAABAP//AQAAAP7/AwD9/wMA/f8CAP//AQD//wEA//8AAAIA/f8CAAAA//8BAAAA//8BAAAA/v8EAPv/BAD9/wIA//8AAAEA/v8CAP//AAABAP//AAABAP//AAABAP7/AwD8/wQA/f8CAAAA/v8DAP3/AwD9/wMA/v8BAAAA//8BAAAA//8CAP7/AQAAAAAAAAAAAAAA//8CAP7/AgD+/wIA/v8CAP7/AgD//wAAAQD//wAAAQD//wAAAQD//wAAAQD+/wIA//8AAAAAAQD+/wMA/f8CAP//AQD//wEA//8AAAEA/v8DAP3/AgD//wAAAAABAP7/AwD9/wIA//8AAAEA/v8DAP3/AgD//wAAAAABAP7/AwD8/wMA/v8CAP//AAD//wIA/v8CAP7/AQABAP7/AQAAAP//AgD/////AQD//wEAAAD//wEA/v8EAPv/BAD9/wMA/v8BAAAA//8BAAEA/P8GAPr/BQD8/wMA/v8BAAAA//8CAP7/AQABAP3/BAD7/wYA+/8EAPz/AwD//wEA//8BAP7/BAD8/wMA/v8AAAIA/v8BAAAA//8BAAAA//8BAAAA//8CAP3/AwD+/wAAAgD8/wUA/P8DAP7/AAABAAAAAAD//wEAAAD//wIA/f8DAP7/AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA/f8EAPz/AwD/////AgD+/wIA/f8DAP7/AgD+/wEA//8CAP7/AQD//wEAAAAAAP//AQAAAP//AgD9/wMA/v8BAAAA//8BAP//AQAAAP//AAACAP3/BAD7/wQA/v8BAAAA//8BAP//AQAAAP//AQAAAP7/BAD7/wUA+/8EAP3/AgD//wAAAQD+/wIA//8AAAEA/v8CAP//AQD+/wEAAAAAAAAAAAD//wEA//8CAP3/AwD9/wIA//8AAAAAAAAAAAAA//8BAP//AgD+/wEA//8CAP7/AQAAAP//AgD/////AgD/////AgD+/wIA//8AAP//AQABAP7/AgD9/wMA/v8CAP////8BAAAAAAAAAAAA//8CAP////8DAPz/AwD+/wEAAAAAAP//AQD//wEAAAD//wEAAAD+/wQA+/8FAPz/AgAAAP//AgD9/wMA/v8BAAAAAAD//wEAAAD//wIA/v8BAAAAAAD//wIA/v8BAAAA//8BAAAA//8CAP7/AQD//wEA//8BAAAA//8BAP//AAABAP//AQAAAP7/AgD//wEA//8AAAAAAQD+/wMA/P8EAP7///8DAPz/BQD8/wEAAQD+/wMA/v8AAAEA//8BAP//AQD//wEA/v8CAP//AQD//wAAAAABAAAA//8BAP//AQAAAAAA//8BAP//AgD+/wAAAQD//wIA/f8CAP//AQAAAP7/AwD9/wMA/v8BAP//AAABAP//AgD9/wIA//8BAAAA//8BAAAA//8CAP3/AwD+/wEAAAD+/wQA/P8DAP7/AAACAP7/AQAAAP//AQAAAP//AQAAAP//AgD9/wIAAAD//wIA/f8DAP7/AQD//wEA//8CAP7/AQD//wAAAQD//wEA//8AAAAAAQD//wEAAAD9/wUA+/8FAPz/AgD//wAAAQD//wAAAQD+/wMA/f8BAAEA/v8CAP7/AgD+/wIA/v8BAAAAAAAAAAAAAAD//wIA/v8CAP////8CAP7/AgD+/wIA/v8CAP7/AQAAAP//AQAAAP//AQD//wAAAQD//wAAAQD+/wMA/f8CAAAA/v8DAP3/AgAAAP//AQAAAP7/AwD9/wMA/v8BAP//AQD//wEAAAD+/wMA/f8CAAAA/v8CAP//AAAAAAEA//8AAAEA/v8DAP3/AwD9/wIA//8BAP//AgD8/wQA/v8BAAAA/v8CAP//AQD//wAAAAAAAAEA/f8EAPz/BAD9/wIA//8AAAAAAAABAP//AAAAAAAAAAABAP3/BAD9/wIA/v8BAAEA//8AAAAA//8CAP7/AgD9/wQA+/8FAPv/BQD8/wMA/f8DAP3/AwD+/wAAAgD9/wMA/f8CAAAA/v8EAPv/BQD7/wUA/P8DAP///v8DAP3/BAD8/wMA/f8DAP7/AQD//wEAAAD//wEA/v8CAAAA/v8CAP7/AgD//wAAAAAAAAAAAQD+/wIA//8AAAEA/v8DAPz/BAD9/wIA//8AAP//AgD//wEA/v8BAAAAAQD//wAAAAAAAAEA//8AAAEA//8BAP//AAABAP//AQD+/wIA/v8DAPz/BAD8/wQA/f8BAAAAAQD+/wMA/P8DAP//AAAAAAAAAAD//wMA+/8FAP3/AQABAP3/BAD8/wMA/v8BAAAA//8CAP3/AwD+/wEAAQD9/wMA/f8EAPz/BAD7/wQA/v8BAAEA/f8DAP7/AQAAAP//AgD+/wEAAAD//wIA/v8CAP7/AgD+/wEAAQD//wEA/v8CAP7/BAD7/wQA/f8CAAAA//8AAAAAAAABAP//AQD+/wEAAQD+/wMA/f8BAAEA/v8DAPz/AwD/////AwD8/wQA/P8DAP7/AgD//wAA//8BAAAAAAAAAP//AgD+/wEAAAD//wIA/v8BAAAA//8CAP3/AgD//wAAAQD+/wIA/v8BAAAA//8CAP7/AgD+/wEA//8CAP3/BAD7/wQA/v8BAAAA//8AAAEAAAD//wIA/f8DAP7/AgD+/wIA/v8CAP7/AgD+/wEAAAAAAP//AgD9/wMA/v8BAP//AgD9/wMA/v8AAAEA//8BAP//AQD//wEA//8AAAEA/v8EAPz/AgD//wAAAQAAAP//AAABAP//AQD//wEAAAD//wEA//8BAAEA/f8DAP7/AQABAP3/AwD+/wIA/////wEAAAAAAAAAAAD//wIA/v8CAP////8CAP7/AgD//wAA//8CAP3/BAD9/wAAAgD9/wMA/v8BAP//AQAAAP//AQAAAP//AgD9/wMA/f8EAPz/AwD+/wEAAAAAAAAAAAD//wIA/f8EAP3/AAABAAAA//8CAP7/AQAAAP//AQAAAAAA//8BAP//AQAAAP//AQAAAP//AQAAAP//AgD9/wMA/v8BAP//AQAAAP//AQD//wIA/v8CAP3/BAD9/wEAAAD//wEAAQD9/wMA/f8CAAAA/v8DAP3/AgD//wAAAQD+/wIA/v8CAP7/AQAAAP//AgD+/wEAAAAAAP//AwD7/wUA/f8BAAEA/v8BAAEA/v8DAP3/AgD//wEA//8BAP//AQD//wEA//8CAP3/BAD7/wQA/////wIA/v8AAAIA/v8CAP3/BAD7/wUA/P8DAP3/AwD9/wMA/v8AAAIA/v8CAP7/AgD+/wIA//8AAAEA/v8CAP7/AgD//wAAAAD//wEAAAAAAAAA//8BAP7/BAD7/wUA/P8CAAAA//8BAP//AQAAAP//AgD9/wMA/v8BAAAA//8BAAAA//8CAP3/AwD+/wEA//8CAP3/AwD+/wAAAwD8/wIAAAD//wIA/////wIA/v8CAP7/AgD+/wEAAAAAAAAAAAAAAP//AgD+/wIA//8AAAAA//8CAP7/AgD+/wEA//8CAP3/AwD9/wMA/v8BAP7/AwD9/wMA/f8CAP//AQD+/wIA//8BAP//AQD+/wMA/v8BAAAA//8BAAAA//8CAP7/AQAAAP//AgD+/wIA/v8CAP//AAAAAAEA//8BAP//AAABAAAA//8BAP//AQD//wEA//8BAP//AQAAAP//AQD//wEAAAD//wIA/f8CAAAA//8BAAAA//8BAP//AAABAP//AQD//wAAAAAAAAEA/v8CAP//AQD//wAAAAABAP7/AwD9/wIAAAD+/wIA//8BAP//AgD9/wMA/f8DAP7/AgD+/wEAAAAAAAEA/v8CAP7/AgD//wAAAAAAAAAAAAAAAP//AgD/////AgD9/wQA/f8BAAAAAAAAAAEA/f8DAP////8DAP3/AQABAP7/AgD//wAAAQD+/wMA/f8CAP7/AQABAP7/AwD7/wYA+v8FAP3/AQABAP7/AgD+/wMA/f8CAP7/AwD+/wEA//8BAP//AQAAAP7/BQD5/wcA+v8FAPz/AwD+/wIA/v8BAAAA//8DAPv/BQD8/wMA/////wEAAAAAAAAAAAD//wIA/f8DAP7/AQAAAP//AQAAAP//AgD+/wIA/v8BAAEA/f8EAPz/AwD+/wEA//8CAP7/AQD//wEA//8CAP7/AQAAAP//AgD+/wEAAAAAAAAAAAAAAAAAAAD//wIA/f8EAPz/AwD+/wEA//8CAP7/AgD+/wEAAQD+/wEAAQD+/wIA/////wIA//8AAAAAAAAAAAAAAAD//wEAAAAAAP//AgD9/wMA/v8BAP//AQAAAP//AQD//wEA//8BAP//AQD//wEA//8BAP//AQAAAP7/AwD9/wMA/v8BAP7/AwD9/wMA/v8BAP//AAABAP//AQD//wAAAAABAP//AAAAAAAAAQD//wEA/v8CAAAA/v8EAPv/BAD9/wIAAAD+/wMA/P8DAP//AAAAAP//AQD//wIA/f8DAP3/AwD9/wMA/v8BAAAA//8BAAAA//8CAP3/AwD9/wQA+/8FAPv/BQD8/wMA/v8BAAAA//8BAP//AgD+/wEAAAD//wIA/v8BAAEA/f8DAP3/AgAAAP//AQD//wAAAQD//wEA//8BAP//AQD//wEA/v8DAP3/AgAAAP7/AwD9/wIAAAD//wEAAAD//wIA/f8DAP7/AgD9/wQA+/8FAPz/AgAAAP//AgD9/wIA//8BAP//AQD//wEA//8BAP//AQD//wIA/f8DAP3/AgD//wAAAQD+/wIA/v8BAAEA/v8CAP7/AgD+/wMA/P8DAP//AAABAP7/AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA/v8CAP3/BAD8/wMA/v8BAAAAAAD//wEAAAAAAAAAAAD//wEAAAAAAAAA//8BAP//AgD+/wEA//8CAP3/AwD9/wMA/f8EAPv/BAD+/wAAAQD//wEA//8BAP//AAABAP//AQD//wEAAAD//wEA//8BAP//AgD9/wMA/v8AAAIA/f8DAP7/AAACAP3/AwD+/wEA//8BAP//AQAAAP//AQAAAP7/AwD9/wMA/v8AAAEA//8BAP//AAAAAAEA//8AAAEA/v8CAP//AAAAAAEA/v8DAPz/BAD9/wEAAQD+/wEAAQD9/wQA/P8DAP7/AQAAAAAAAAAAAAAAAAAAAAAAAQD+/wIA/////wIA/v8BAAAA//8BAP//AQD//wEA//8BAAAA/v8EAPz/AwD///7/BAD8/wMA/////wIA/v8CAP////8CAP7/AgD+/wIA/v8CAP////8CAP7/AwD9/wIA/v8CAP//AAABAP7/AwD9/wEAAQD+/wMA/f8CAP//AAAAAAEA/v8DAPz/BAD9/wIA/v8CAP7/AgD//wAAAAD//wIA/v8CAP7/AQAAAAAA//8CAP7/AgD+/wIA/v8CAP7/AwD8/wUA+v8GAPv/AwD//wAAAAAAAAAA//8DAPv/BQD9/wAAAgD9/wMA/v8BAP//AQAAAP//AgD9/wMA/v8BAAAA//8BAAAAAAAAAP//AQAAAAAAAAD//wEA//8CAP3/AwD+/wAAAgD+/wEAAAD//wIA/v8CAP7/AgD/////AwD8/wUA/P8CAP//AQD//wIA/f8DAP3/AwD+/wAAAQD+/wMA/f8DAP3/AgD//wAAAQD//wEA//8BAP7/AwD+/wEA//8AAAEA//8CAPz/BAD9/wIA//8AAAEA/v8DAPz/BAD9/wIA//8AAAEA/v8CAP7/AgD//wEA/f8EAPz/BAD+////AgD//wAAAQD//wAAAQD//wEA//8BAP7/AwD+/wEA";else{addTest("audiopreload",!1);return}}catch{addTest("audiopreload",!1);return}t.setAttribute("preload","auto"),t.style.cssText="display:none",docElement.appendChild(t),setTimeout(function(){t.addEventListener("loadeddata",n,!1),e=setTimeout(n,A)},0)});Modernizr.addTest("webaudio",function(){var e="webkitAudioContext"in window,A="AudioContext"in window;return Modernizr._config.usePrefixes&&e||A});Modernizr.addTest("batteryapi",!!prefixed("battery",navigator)||!!prefixed("getBattery",navigator),{aliases:["battery-api"]});Modernizr.addTest("lowbattery",function(){var e=.2,A=prefixed("battery",navigator);return!!(A&&!A.charging&&A.level<=e)});Modernizr.addTest("blobconstructor",function(){try{return!!new Blob}catch{return!1}},{aliases:["blob-constructor"]});Modernizr.addTest("broadcastchannel","BroadcastChannel"in window);Modernizr.addTest("canvas",function(){var e=createElement("canvas");return!!(e.getContext&&e.getContext("2d"))});Modernizr.addTest("canvasblending",function(){if(Modernizr.canvas===!1)return!1;var e=createElement("canvas").getContext("2d");try{e.globalCompositeOperation="screen"}catch{}return e.globalCompositeOperation==="screen"});var canvas=createElement("canvas");Modernizr.addTest("todataurljpeg",function(){var e=!1;try{e=!!Modernizr.canvas&&canvas.toDataURL("image/jpeg").indexOf("data:image/jpeg")===0}catch{}return e}),Modernizr.addTest("todataurlpng",function(){var e=!1;try{e=!!Modernizr.canvas&&canvas.toDataURL("image/png").indexOf("data:image/png")===0}catch{}return e}),Modernizr.addTest("todataurlwebp",function(){var e=!1;try{e=!!Modernizr.canvas&&canvas.toDataURL("image/webp").indexOf("data:image/webp")===0}catch{}return e});Modernizr.addTest("canvaswinding",function(){if(Modernizr.canvas===!1)return!1;var e=createElement("canvas").getContext("2d");return e.rect(0,0,10,10),e.rect(2,2,6,6),e.isPointInPath(5,5,"evenodd")===!1});Modernizr.addTest("canvastext",function(){return Modernizr.canvas===!1?!1:typeof createElement("canvas").getContext("2d").fillText=="function"});Modernizr.addAsyncTest(function(){var e,A=["read","readText","write","writeText"];if(navigator.clipboard){addTest("clipboard",!0);for(var t=0;t<A.length;t++)navigator.clipboard[A[t]]?e=!0:e=!1,addTest("clipboard."+A[t].toLowerCase(),e)}else addTest("clipboard",!1)});Modernizr.addTest("contenteditable",function(){if("contentEditable"in docElement){var e=createElement("div");return e.contentEditable=!0,e.contentEditable==="true"}});Modernizr.addTest("contextmenu","contextMenu"in docElement&&"HTMLMenuItemElement"in window);Modernizr.addTest("cors","XMLHttpRequest"in window&&"withCredentials"in new XMLHttpRequest);var crypto=prefixed("crypto",window);Modernizr.addTest("crypto",!!prefixed("subtle",crypto));var crypto=prefixed("crypto",window),supportsGetRandomValues;if(crypto&&"getRandomValues"in crypto&&"Uint32Array"in window){var array=new Uint32Array(10),values=crypto.getRandomValues(array);supportsGetRandomValues=values&&is(values[0],"number")}Modernizr.addTest("getrandomvalues",!!supportsGetRandomValues);Modernizr.addTest("cssall","all"in docElement.style);Modernizr.addTest("cssanimations",testAllProps("animationName","a",!0));Modernizr.addTest("appearance",testAllProps("appearance"));Modernizr.addTest("aspectratio",function(){if(typeof CSS!="object"&&typeof CSS.supports=="function")return CSS.supports("aspect-ratio","1 / 1");var e=createElement("p"),A=e.style;return"aspectRatio"in A?(A.cssText="aspect-ratio:1 / 1",e.remove(),A.aspectRatio==="1 / 1"):(e.remove(),!1)});Modernizr.addTest("backdropfilter",testAllProps("backdropFilter"));Modernizr.addTest("backgroundblendmode",prefixed("backgroundBlendMode","text"));Modernizr.addTest("backgroundcliptext",function(){return testAllProps("backgroundClip","text")});Modernizr.addTest("bgpositionshorthand",function(){var e=createElement("a"),A=e.style,t="right 10px bottom 10px";return A.cssText="background-position: "+t+";",A.backgroundPosition===t});Modernizr.addTest("bgpositionxy",function(){return testAllProps("backgroundPositionX","3px",!0)&&testAllProps("backgroundPositionY","5px",!0)});Modernizr.addTest("bgrepeatround",testAllProps("backgroundRepeat","round")),Modernizr.addTest("bgrepeatspace",testAllProps("backgroundRepeat","space"));Modernizr.addTest("backgroundsize",testAllProps("backgroundSize","100%",!0));Modernizr.addTest("bgsizecover",testAllProps("backgroundSize","cover"));Modernizr.addTest("borderimage",testAllProps("borderImage","url() 1",!0));Modernizr.addTest("borderradius",testAllProps("borderRadius","0px",!0));Modernizr.addTest("boxdecorationbreak",testAllProps("boxDecorationBreak","slice"));Modernizr.addTest("boxshadow",testAllProps("boxShadow","1px 1px",!0));Modernizr.addTest("boxsizing",testAllProps("boxSizing","border-box",!0)&&(document.documentMode===undefined||document.documentMode>7));Modernizr.addTest("csscalc",function(){var e="width:",A="calc(10px);",t=createElement("a");return t.style.cssText=e+prefixes.join(A+e),!!t.style.length});Modernizr.addTest("checked",function(){return testStyles("#modernizr {position:absolute} #modernizr input {margin-left:10px} #modernizr :checked {margin-left:20px;display:block}",function(e){var A=createElement("input");return A.setAttribute("type","checkbox"),A.setAttribute("checked","checked"),e.appendChild(A),A.offsetLeft===20})});Modernizr.addTest("csschunit",function(){var e=modElem.elem.style,A;try{e.fontSize="3ch",A=e.fontSize.indexOf("ch")!==-1}catch{A=!1}return A});(function(){Modernizr.addTest("csscolumns",function(){var n=!1,o=testAllProps("columnCount");try{n=!!o,n&&(n=new Boolean(n))}catch{}return n});for(var e=["Width","Span","Fill","Gap","Rule","RuleColor","RuleStyle","RuleWidth","BreakBefore","BreakAfter","BreakInside"],A,t,r=0;r<e.length;r++)A=e[r].toLowerCase(),t=testAllProps("column"+e[r]),(A==="breakbefore"||A==="breakafter"||A==="breakinside")&&(t=t||testAllProps(e[r])),Modernizr.addTest("csscolumns."+A,t)})();Modernizr.addTest("cssgridlegacy",testAllProps("grid-columns","10px",!0)),Modernizr.addTest("cssgrid",testAllProps("grid-template-rows","none",!0));Modernizr.addTest("cubicbezierrange",function(){var e=createElement("a");return e.style.cssText=prefixes.join("transition-timing-function:cubic-bezier(1,0,0,1.1); "),!!e.style.length});var supportsFn=window.CSS&&window.CSS.supports.bind(window.CSS)||window.supportsCSS;Modernizr.addTest("customproperties",!!supportsFn&&(supportsFn("--f:0")||supportsFn("--f",0)));Modernizr.addTest("displayrunin",testAllProps("display","run-in"),{aliases:["display-runin"]});testStyles("#modernizr{display: table; direction: ltr}#modernizr div{display: table-cell; padding: 10px}",function(e){var A,t=e.childNodes;A=t[0].offsetLeft<t[1].offsetLeft,Modernizr.addTest("displaytable",A,{aliases:["display-table"]})},2);Modernizr.addTest("ellipsis",testAllProps("textOverflow","ellipsis"));var CSS=window.CSS;Modernizr.addTest("cssescape",CSS?typeof CSS.escape=="function":!1);Modernizr.addTest("cssexunit",function(){var e=modElem.elem.style,A;try{e.fontSize="3ex",A=e.fontSize.indexOf("ex")!==-1}catch{A=!1}return A});var newSyntax="CSS"in window&&"supports"in window.CSS,oldSyntax="supportsCSS"in window;Modernizr.addTest("supports",newSyntax||oldSyntax);Modernizr.addTest("cssfilters",function(){if(Modernizr.supports)return testAllProps("filter","blur(2px)");var e=createElement("a");return e.style.cssText=prefixes.join("filter:blur(2px); "),!!e.style.length&&(document.documentMode===undefined||document.documentMode>9)});Modernizr.addTest("flexbox",testAllProps("flexBasis","1px",!0));Modernizr.addTest("flexboxlegacy",testAllProps("boxDirection","reverse",!0));Modernizr.addTest("flexboxtweener",testAllProps("flexAlign","end",!0));Modernizr.addTest("flexgap",function(){var e=createElement("div");e.style.display="flex",e.style.flexDirection="column",e.style.rowGap="1px",e.appendChild(createElement("div")),e.appendChild(createElement("div")),docElement.appendChild(e);var A=e.scrollHeight===1;return e.parentNode.removeChild(e),A});Modernizr.addTest("flexwrap",testAllProps("flexWrap","wrap",!0));Modernizr.addTest("focusvisible",function(){try{document.querySelector(":focus-visible")}catch{return!1}return!0});Modernizr.addTest("focuswithin",function(){try{document.querySelector(":focus-within")}catch{return!1}return!0});Modernizr.addTest("fontDisplay",testProp("font-display"));var unsupportedUserAgent=function(){var e=navigator.userAgent,A=e.match(/w(eb)?osbrowser/gi),t=e.match(/windows phone/gi)&&e.match(/iemobile\/([0-9])+/gi)&&parseFloat(RegExp.$1)>=9;return A||t}();unsupportedUserAgent?Modernizr.addTest("fontface",!1):testStyles('@font-face {font-family:"font";src:url("https://")}',function(e,A){var t=document.getElementById("smodernizr"),r=t.sheet||t.styleSheet,n=r?r.cssRules&&r.cssRules[0]?r.cssRules[0].cssText:r.cssText||"":"",o=/src/i.test(n)&&n.indexOf(A.split(" ")[0])===0;Modernizr.addTest("fontface",o)});testStyles('#modernizr{font:0/0 a}#modernizr:after{content:":)";visibility:hidden;font:7px/1 a}',function(e){Modernizr.addTest("generatedcontent",e.offsetHeight>=6)});Modernizr.addTest("cssgradients",function(){for(var e="background-image:",A="gradient(linear,left top,right bottom,from(#9f9),to(white));",t="",r,n=0,o=prefixes.length-1;n<o;n++)r=n===0?"to ":"",t+=e+prefixes[n]+"linear-gradient("+r+"left top, #9f9, white);";Modernizr._config.usePrefixes&&(t+=e+"-webkit-"+A);var a=createElement("a"),l=a.style;return l.cssText=t,(""+l.backgroundImage).indexOf("gradient")>-1});Modernizr.addTest("hairline",function(){return testStyles("#modernizr {border:.5px solid transparent}",function(e){return e.offsetHeight===1})});Modernizr.addTest("hsla",function(){var e=createElement("a").style;return e.cssText="background-color:hsla(120,40%,100%,.5)",contains(e.backgroundColor,"rgba")||contains(e.backgroundColor,"hsla")});Modernizr.addAsyncTest(function(){var e=300;setTimeout(A,e);function A(){if(!document.body&&!document.getElementsByTagName("body")[0]){setTimeout(A,e);return}function t(){try{var o=createElement("div"),a=createElement("span"),l=o.style,s=0,f=0,u=!1,m=document.body.firstElementChild||document.body.firstChild;return o.lang="en",o.appendChild(a),a.innerHTML="Bacon ipsum dolor sit amet jerky velit in culpa hamburger et. Laborum dolor proident, enim dolore duis commodo et strip steak. Salami anim et, veniam consectetur dolore qui tenderloin jowl velit sirloin. Et ad culpa, fatback cillum jowl ball tip ham hock nulla short ribs pariatur aute. Pig pancetta ham bresaola, ut boudin nostrud commodo flank esse cow tongue culpa. Pork belly bresaola enim pig, ea consectetur nisi. Fugiat officia turkey, ea cow jowl pariatur ullamco proident do laborum velit sausage. Magna biltong sint tri-tip commodo sed bacon, esse proident aliquip. Ullamco ham sint fugiat, velit in enim sed mollit nulla cow ut adipisicing nostrud consectetur. Proident dolore beef ribs, laborum nostrud meatball ea laboris rump cupidatat labore culpa. Shankle minim beef, velit sint cupidatat fugiat tenderloin pig et ball tip. Ut cow fatback salami, bacon ball tip et in shank strip steak bresaola. In ut pork belly sed mollit tri-tip magna culpa veniam, short ribs qui in andouille ham consequat. Dolore bacon t-bone, velit short ribs enim strip steak nulla. Voluptate labore ut, biltong swine irure jerky. Cupidatat excepteur aliquip salami dolore. Ball tip strip steak in pork dolor. Ad in esse biltong. Dolore tenderloin exercitation ad pork loin t-bone, dolore in chicken ball tip qui pig. Ut culpa tongue, sint ribeye dolore ex shank voluptate hamburger. Jowl et tempor, boudin pork chop labore ham hock drumstick consectetur tri-tip elit swine meatball chicken ground round. Proident shankle mollit dolore. Shoulder ut duis t-bone quis reprehenderit. Meatloaf dolore minim strip steak, laboris ea aute bacon beef ribs elit shank in veniam drumstick qui. Ex laboris meatball cow tongue pork belly. Ea ball tip reprehenderit pig, sed fatback boudin dolore flank aliquip laboris eu quis. Beef ribs duis beef, cow corned beef adipisicing commodo nisi deserunt exercitation. Cillum dolor t-bone spare ribs, ham hock est sirloin. Brisket irure meatloaf in, boudin pork belly sirloin ball tip. Sirloin sint irure nisi nostrud aliqua. Nostrud nulla aute, enim officia culpa ham hock. Aliqua reprehenderit dolore sunt nostrud sausage, ea boudin pork loin ut t-bone ham tempor. Tri-tip et pancetta drumstick laborum. Ham hock magna do nostrud in proident. Ex ground round fatback, venison non ribeye in.",document.body.insertBefore(o,m),l.cssText="position:absolute;top:0;left:0;width:5em;text-align:justify;text-justify:newspaper;",s=a.offsetHeight,f=a.offsetWidth,l.cssText="position:absolute;top:0;left:0;width:5em;text-align:justify;text-justify:newspaper;"+prefixes.join("hyphens:auto; "),u=a.offsetHeight!==s||a.offsetWidth!==f,document.body.removeChild(o),o.removeChild(a),u}catch{return!1}}function r(o,a){try{var l=createElement("div"),s=createElement("span"),f=l.style,u=0,m=!1,g=!1,P=!1,M=document.body.firstElementChild||document.body.firstChild;return f.cssText="position:absolute;top:0;left:0;overflow:visible;width:1.25em;",l.appendChild(s),document.body.insertBefore(l,M),s.innerHTML="mm",u=s.offsetHeight,s.innerHTML="m"+o+"m",g=s.offsetHeight>u,a?(s.innerHTML="m<br />m",u=s.offsetWidth,s.innerHTML="m"+o+"m",P=s.offsetWidth>u):P=!0,g===!0&&P===!0&&(m=!0),document.body.removeChild(l),l.removeChild(s),m}catch{return!1}}function n(o){try{var a=createElement("input"),l=createElement("div"),s="lebowski",f=!1,u,m=document.body.firstElementChild||document.body.firstChild;a.style.cssText="position:fixed;top:0;",l.style.cssText="position:fixed;top:0;",l.innerHTML=s+o+s,document.body.insertBefore(l,m),document.body.insertBefore(a,l),a.setSelectionRange?(a.focus(),a.setSelectionRange(0,0)):a.createTextRange&&(u=a.createTextRange(),u.collapse(!0),u.moveEnd("character",0),u.moveStart("character",0),u.select());try{window.find?f=window.find(s+s):(u=window.self.document.body.createTextRange(),f=u.findText(s+s))}catch{f=!1}return document.body.removeChild(l),document.body.removeChild(a),f}catch{return!1}}addTest("csshyphens",function(){if(!testAllProps("hyphens","auto",!0))return!1;try{return t()}catch{return!1}}),addTest("softhyphens",function(){try{return r("&#173;",!0)&&r("&#8203;",!1)}catch{return!1}}),addTest("softhyphensfind",function(){try{return n("&#173;")&&n("&#8203;")}catch{return!1}})}});Modernizr.addTest("cssinvalid",function(){return testStyles("#modernizr input{height:0;border:0;padding:0;margin:0;width:10px} #modernizr input:invalid{width:50px}",function(e){var A=createElement("input");return A.required=!0,e.appendChild(A),A.clientWidth>10})});testStyles("#modernizr div {width:100px} #modernizr :last-child{width:200px;display:block}",function(e){Modernizr.addTest("lastchild",e.lastChild.offsetWidth>e.firstChild.offsetWidth)},2);Modernizr.addTest("cssmask",testAllProps("maskRepeat","repeat-x",!0));Modernizr.addTest("mediaqueries",mq("only all"));Modernizr.addTest("multiplebgs",function(){var e=createElement("a").style;return e.cssText="background:url(https://),url(https://),red url(https://)",/(url\s*\(.*?){3}/.test(e.background)});testStyles("#modernizr div {width:1px} #modernizr div:nth-child(2n) {width:2px;}",function(e){var A=e.getElementsByTagName("div"),t=A[0].offsetWidth===A[2].offsetWidth&&A[1].offsetWidth===A[3].offsetWidth&&A[0].offsetWidth!==A[1].offsetWidth;Modernizr.addTest("nthchild",t)},4);Modernizr.addTest("objectfit",!!prefixed("objectFit"),{aliases:["object-fit"]});Modernizr.addTest("opacity",function(){var e=createElement("a").style;return e.cssText=prefixes.join("opacity:.55;"),/^0.55$/.test(e.opacity)});Modernizr.addTest("overflowscrolling",testAllProps("overflowScrolling","touch",!0));Modernizr.addTest("csspointerevents",function(){var e=createElement("a").style;return e.cssText="pointer-events:auto",e.pointerEvents==="auto"});Modernizr.addTest("csspositionsticky",function(){var e="position:",A="sticky",t=createElement("a"),r=t.style;return r.cssText=e+prefixes.join(A+";"+e).slice(0,-e.length),r.position.indexOf(A)!==-1});Modernizr.addTest("csspseudoanimations",function(){var e=!1;if(!Modernizr.cssanimations)return e;var A=["@",prefixes.join("keyframes csspseudoanimations { from { font-size: 10px; } }@").replace(/\@$/,""),'#modernizr:before { content:" "; font-size:5px;',prefixes.join("animation:csspseudoanimations 1ms infinite;"),"}"].join("");return testStyles(A,function(t){e=computedStyle(t,":before","font-size")==="10px"}),e});Modernizr.addTest("csstransitions",testAllProps("transition","all",!0));Modernizr.addTest("csspseudotransitions",function(){var e=!1;if(!Modernizr.csstransitions)return e;var A='#modernizr:before { content:" "; font-size:5px;'+prefixes.join("transition:0s 100s;")+"}#modernizr.trigger:before { font-size:10px; }";return testStyles(A,function(t){computedStyle(t,":before","font-size"),t.className+="trigger",e=computedStyle(t,":before","font-size")==="5px"}),e});Modernizr.addTest("cssreflections",testAllProps("boxReflect","above",!0));Modernizr.addTest("regions",function(){if(isSVG)return!1;var e=prefixed("flowFrom"),A=prefixed("flowInto"),t=!1;if(!e||!A)return t;var r=createElement("iframe"),n=createElement("div"),o=createElement("div"),a=createElement("div"),l="modernizr_flow_for_regions_check";o.innerText="M",n.style.cssText="top: 150px; left: 150px; padding: 0px;",a.style.cssText="width: 50px; height: 50px; padding: 42px;",a.style[e]=l,n.appendChild(o),n.appendChild(a),docElement.appendChild(n);var s,f,u=o.getBoundingClientRect();return o.style[A]=l,s=o.getBoundingClientRect(),f=parseInt(s.left-u.left,10),docElement.removeChild(n),f===42?t=!0:(docElement.appendChild(r),u=r.getBoundingClientRect(),r.style[A]=l,s=r.getBoundingClientRect(),u.height>0&&u.height!==s.height&&s.height===0&&(t=!0)),o=a=n=r=undefined,t});Modernizr.addTest("cssremunit",function(){var e=createElement("a").style;try{e.fontSize="3rem"}catch{}return/rem/.test(e.fontSize)});Modernizr.addTest("cssresize",testAllProps("resize","both",!0));Modernizr.addTest("rgba",function(){var e=createElement("a").style;return e.cssText="background-color:rgba(150,255,150,.5)",(""+e.backgroundColor).indexOf("rgba")>-1});testStyles("#modernizr{overflow: scroll; width: 40px; height: 40px; }#"+prefixes.join("scrollbar{width:10px} #modernizr::").split("#").slice(1).join("#")+"scrollbar{width:10px}",function(e){Modernizr.addTest("cssscrollbar","scrollWidth"in e&&e.scrollWidth===30)});Modernizr.addTest("scrollsnappoints",testAllProps("scrollSnapType"));Modernizr.addTest("shapes",testAllProps("shapeOutside","content-box",!0));Modernizr.addTest("siblinggeneral",function(){return testStyles("#modernizr div {width:100px} #modernizr div ~ div {width:200px;display:block}",function(e){return e.lastChild.offsetWidth===200},2)});testStyles("#modernizr{position: absolute; top: -10em; visibility:hidden; font: normal 10px arial;}#subpixel{float: left; font-size: 33.3333%;}",function(e){var A=e.firstChild;A.innerHTML="This is a text written in Arial",Modernizr.addTest("subpixelfont",computedStyle(A,null,"width")!=="44px")},1,["subpixel"]);Modernizr.addTest("target",function(){var e=window.document;if(!("querySelectorAll"in e))return!1;try{return e.querySelectorAll(":target"),!0}catch{return!1}});Modernizr.addTest("textalignlast",testAllProps("textAlignLast"));(function(){Modernizr.addTest("textdecoration",function(){var n=!1,o=testAllProps("textDecoration");try{n=!!o,n&&(n=new Boolean(n))}catch{}return n});for(var e=["Line","Style","Color","Skip","SkipInk"],A,t,r=0;r<e.length;r++)A=e[r].toLowerCase(),t=testAllProps("textDecoration"+e[r]),Modernizr.addTest("textdecoration."+A,t)})();Modernizr.addTest("textshadow",testProp("textShadow","1px 1px"));Modernizr.addTest("csstransforms",function(){return navigator.userAgent.indexOf("Android 2.")===-1&&testAllProps("transform","scale(1)",!0)});Modernizr.addTest("csstransforms3d",function(){return!!testAllProps("perspective","1px",!0)});Modernizr.addTest("csstransformslevel2",function(){return testAllProps("translate","45px",!0)});Modernizr.addTest("preserve3d",function(){var e,A,t=window.CSS,r=!1;return t&&t.supports&&t.supports("(transform-style: preserve-3d)")?!0:(e=createElement("a"),A=createElement("a"),e.style.cssText="display: block; transform-style: preserve-3d; transform-origin: right; transform: rotateY(40deg);",A.style.cssText="display: block; width: 9px; height: 1px; background: #000; transform-origin: right; transform: rotateY(40deg);",e.appendChild(A),docElement.appendChild(e),r=A.getBoundingClientRect(),docElement.removeChild(e),r=r.width&&r.width<4,r)});Modernizr.addTest("userselect",testAllProps("userSelect","none",!0));Modernizr.addTest("cssvalid",function(){return testStyles("#modernizr input{height:0;border:0;padding:0;margin:0;width:10px} #modernizr input:valid{width:50px}",function(e){var A=createElement("input");return e.appendChild(A),A.clientWidth>10})});Modernizr.addTest("variablefonts",testAllProps("fontVariationSettings"));testStyles("#modernizr { height: 50vh; max-height: 10px; }",function(e){var A=parseInt(computedStyle(e,null,"height"),10);Modernizr.addTest("cssvhunit",A===10)});function roundedEquals(e,A){return e-1===A||e===A||e+1===A}testStyles("#modernizr1{width: 50vmax}#modernizr2{width:50px;height:50px;overflow:scroll}#modernizr3{position:fixed;top:0;left:0;bottom:0;right:0}",function(e){var A=e.childNodes[2],t=e.childNodes[1],r=e.childNodes[0],n=parseInt((t.offsetWidth-t.clientWidth)/2,10),o=r.clientWidth/100,a=r.clientHeight/100,l=parseInt(Math.max(o,a)*50,10),s=parseInt(computedStyle(A,null,"width"),10);Modernizr.addTest("cssvmaxunit",roundedEquals(l,s)||roundedEquals(l,s-n))},3);testStyles("#modernizr1{width: 50vm;width:50vmin}#modernizr2{width:50px;height:50px;overflow:scroll}#modernizr3{position:fixed;top:0;left:0;bottom:0;right:0}",function(e){var A=e.childNodes[2],t=e.childNodes[1],r=e.childNodes[0],n=parseInt((t.offsetWidth-t.clientWidth)/2,10),o=r.clientWidth/100,a=r.clientHeight/100,l=parseInt(Math.min(o,a)*50,10),s=parseInt(computedStyle(A,null,"width"),10);Modernizr.addTest("cssvminunit",roundedEquals(l,s)||roundedEquals(l,s-n))},3);testStyles("#modernizr { width: 50vw; }",function(e){var A=parseInt(window.innerWidth/2,10),t=parseInt(computedStyle(e,null,"width"),10);Modernizr.addTest("cssvwunit",roundedEquals(t,A))});Modernizr.addTest("willchange","willChange"in docElement.style);Modernizr.addTest("wrapflow",function(){var e=prefixed("wrapFlow");if(!e||isSVG)return!1;var A=e.replace(/([A-Z])/g,function(a,l){return"-"+l.toLowerCase()}).replace(/^ms-/,"-ms-"),t=createElement("div"),r=createElement("div"),n=createElement("span");r.style.cssText="position: absolute; left: 50px; width: 100px; height: 20px;"+A+":end;",n.innerText="X",t.appendChild(r),t.appendChild(n),docElement.appendChild(t);var o=n.offsetLeft;return docElement.removeChild(t),r=n=t=undefined,o===150});Modernizr.addTest("customelements","customElements"in window);Modernizr.addTest("customprotocolhandler",function(){if(!navigator.registerProtocolHandler)return!1;try{navigator.registerProtocolHandler("thisShouldFail")}catch(e){return e instanceof TypeError}return!1});Modernizr.addTest("dart",!!prefixed("startDart",navigator));Modernizr.addTest("dataview",typeof DataView<"u"&&"getFloat64"in DataView.prototype);Modernizr.addTest("classlist","classList"in docElement);Modernizr.addTest("createelementattrs",function(){try{return createElement('<input name="test" />').getAttribute("name")==="test"}catch{return!1}},{aliases:["createelement-attrs"]});Modernizr.addTest("dataset",function(){var e=createElement("div");return e.setAttribute("data-a-b","c"),!!(e.dataset&&e.dataset.aB==="c")});Modernizr.addTest("documentfragment",function(){return"createDocumentFragment"in document&&"appendChild"in docElement});Modernizr.addTest("hidden","hidden"in createElement("a"));Modernizr.addTest("intersectionobserver","IntersectionObserver"in window);Modernizr.addTest("microdata","getItems"in document);Modernizr.addTest("mutationobserver",!!window.MutationObserver||!!window.WebKitMutationObserver);Modernizr.addTest("passiveeventlisteners",function(){var e=!1;try{var A=Object.defineProperty({},"passive",{get:function(){e=!0}}),t=function(){};window.addEventListener("testPassiveEventSupport",t,A),window.removeEventListener("testPassiveEventSupport",t,A)}catch{}return e});Modernizr.addTest("shadowroot","attachShadow"in createElement("div"));Modernizr.addTest("shadowrootlegacy","createShadowRoot"in createElement("div"));Modernizr.addTest("bdi",function(){var e=createElement("div"),A=createElement("bdi");A.innerHTML="&#1573;",e.appendChild(A),docElement.appendChild(e);var t=computedStyle(A,null,"direction")==="rtl";return docElement.removeChild(e),t});Modernizr.addTest("details",function(){var e=createElement("details"),A;return"open"in e?(testStyles("#modernizr details{display:block}",function(t){t.appendChild(e),e.innerHTML="<summary>a</summary>b",A=e.offsetHeight,e.open=!0,A=A!==e.offsetHeight}),A):!1});Modernizr.addTest("outputelem","value"in createElement("output"));Modernizr.addTest("picture","HTMLPictureElement"in window);Modernizr.addTest("progressbar",createElement("progress").max!==undefined),Modernizr.addTest("meter",createElement("meter").max!==undefined);Modernizr.addTest("ruby",function(){var e=createElement("ruby"),A=createElement("rt"),t=createElement("rp");if(e.appendChild(t),e.appendChild(A),docElement.appendChild(e),computedStyle(t,null,"display")==="none"||computedStyle(e,null,"display")==="ruby"&&computedStyle(A,null,"display")==="ruby-text"||computedStyle(t,null,"fontSize")==="6pt"&&computedStyle(A,null,"fontSize")==="6pt")return r(),!0;return r(),!1;function r(){docElement.removeChild(e),e=null,A=null,t=null}});Modernizr.addTest("template","content"in createElement("template"));Modernizr.addTest("time","valueAsDate"in createElement("time"));Modernizr.addTest("texttrackapi",typeof createElement("video").addTextTrack=="function"),Modernizr.addTest("track","kind"in createElement("track"));Modernizr.addTest("unknownelements",function(){var e=createElement("a");return e.innerHTML="<xyz></xyz>",e.childNodes.length===1});Modernizr.addTest("emoji",function(){if(!Modernizr.canvastext)return!1;var e=createElement("canvas"),A=e.getContext("2d"),t=A.webkitBackingStorePixelRatio||A.mozBackingStorePixelRatio||A.msBackingStorePixelRatio||A.oBackingStorePixelRatio||A.backingStorePixelRatio||1,r=12*t;return A.fillStyle="#f00",A.textBaseline="top",A.font="32px Arial",A.fillText("\u{1F428}",0,0),A.getImageData(r,r,1,1).data[0]!==0});Modernizr.addTest("es5array",function(){return!!(Array.prototype&&Array.prototype.every&&Array.prototype.filter&&Array.prototype.forEach&&Array.prototype.indexOf&&Array.prototype.lastIndexOf&&Array.prototype.map&&Array.prototype.some&&Array.prototype.reduce&&Array.prototype.reduceRight&&Array.isArray)});Modernizr.addTest("es5date",function(){var e="2013-04-12T06:06:37.307Z",A=!1;try{A=!!Date.parse(e)}catch{}return!!(Date.now&&Date.prototype&&Date.prototype.toISOString&&Date.prototype.toJSON&&A)});Modernizr.addTest("es5function",function(){return!!(Function.prototype&&Function.prototype.bind)});Modernizr.addTest("es5object",function(){return!!(Object.keys&&Object.create&&Object.getPrototypeOf&&Object.getOwnPropertyNames&&Object.isSealed&&Object.isFrozen&&Object.isExtensible&&Object.getOwnPropertyDescriptor&&Object.defineProperty&&Object.defineProperties&&Object.seal&&Object.freeze&&Object.preventExtensions)});Modernizr.addTest("strictmode",function(){"use strict";return!this}());Modernizr.addTest("es5string",function(){return!!(String.prototype&&String.prototype.trim)});Modernizr.addTest("json","JSON"in window&&"parse"in JSON&&"stringify"in JSON);Modernizr.addTest("es5syntax",function(){var value,obj,stringAccess,getter,setter,reservedWords,zeroWidthChars;try{return stringAccess=eval('"foobar"[3] === "b"'),getter=eval("({ get x(){ return 1 } }).x === 1"),eval("({ set x(v){ value = v; } }).x = 1"),setter=value===1,eval("obj = ({ if: 1 })"),reservedWords=obj.if===1,zeroWidthChars=eval("_\u200C\u200D = true"),stringAccess&&getter&&setter&&reservedWords&&zeroWidthChars}catch(e){return!1}});Modernizr.addTest("es5undefined",function(){var e,A;try{A=window.undefined,window.undefined=12345,e=typeof window.undefined>"u",window.undefined=A}catch{return!1}return e});Modernizr.addTest("es5",function(){return!!(Modernizr.es5array&&Modernizr.es5date&&Modernizr.es5function&&Modernizr.es5object&&Modernizr.strictmode&&Modernizr.es5string&&Modernizr.json&&Modernizr.es5syntax&&Modernizr.es5undefined)});Modernizr.addTest("es6array",!!(Array.prototype&&Array.prototype.copyWithin&&Array.prototype.fill&&Array.prototype.find&&Array.prototype.findIndex&&Array.prototype.keys&&Array.prototype.entries&&Array.prototype.values&&Array.from&&Array.of));Modernizr.addTest("arrow",function(){try{eval("()=>{}")}catch(e){return!1}return!0});Modernizr.addTest("es6class",function(){try{eval("class A{}")}catch(e){return!1}return!0});Modernizr.addTest("es6collections",!!(window.Map&&window.Set&&window.WeakMap&&window.WeakSet));Modernizr.addTest("generators",function(){try{new Function("function* test() {}")()}catch{return!1}return!0});Modernizr.addTest("es6math",!!(Math&&Math.clz32&&Math.cbrt&&Math.imul&&Math.sign&&Math.log10&&Math.log2&&Math.log1p&&Math.expm1&&Math.cosh&&Math.sinh&&Math.tanh&&Math.acosh&&Math.asinh&&Math.atanh&&Math.hypot&&Math.trunc&&Math.fround));Modernizr.addTest("es6number",!!(Number.isFinite&&Number.isInteger&&Number.isSafeInteger&&Number.isNaN&&Number.parseInt&&Number.parseFloat&&Number.isInteger(Number.MAX_SAFE_INTEGER)&&Number.isInteger(Number.MIN_SAFE_INTEGER)&&Number.isFinite(Number.EPSILON)));Modernizr.addTest("es6object",!!(Object.assign&&Object.is&&Object.setPrototypeOf));Modernizr.addTest("promises",function(){return"Promise"in window&&"resolve"in window.Promise&&"reject"in window.Promise&&"all"in window.Promise&&"race"in window.Promise&&function(){var e;return new window.Promise(function(A){e=A}),typeof e=="function"}()});Modernizr.addTest("restparameters",function(){try{eval("function f(...rest) {}")}catch(e){return!1}return!0});Modernizr.addTest("spreadarray",function(){try{eval("(function f(){})(...[1])")}catch(e){return!1}return!0});Modernizr.addTest("stringtemplate",function(){try{return eval("(function(){var a=1; return `-${a}-`;})()")==="-1-"}catch(e){return!1}});Modernizr.addTest("es6string",!!(String.fromCodePoint&&String.raw&&String.prototype.codePointAt&&String.prototype.repeat&&String.prototype.startsWith&&String.prototype.endsWith&&String.prototype.includes));Modernizr.addTest("es6symbol",!!(typeof Symbol=="function"&&Symbol.for&&Symbol.hasInstance&&Symbol.isConcatSpreadable&&Symbol.iterator&&Symbol.keyFor&&Symbol.match&&Symbol.prototype&&Symbol.replace&&Symbol.search&&Symbol.species&&Symbol.split&&Symbol.toPrimitive&&Symbol.toStringTag&&Symbol.unscopables));Modernizr.addTest("es7array",!!(Array.prototype&&Array.prototype.includes));Modernizr.addTest("restdestructuringarray",function(){try{eval("var [...rest]=[1]")}catch(e){return!1}return!0}),Modernizr.addTest("restdestructuringobject",function(){try{eval("var {...rest}={a:1}")}catch(e){return!1}return!0});Modernizr.addTest("spreadobject",function(){try{eval("var a={...{b:1}}")}catch(e){return!1}return!0});Modernizr.addTest("es8object",!!(Object.entries&&Object.values));Modernizr.addTest("customevent","CustomEvent"in window&&typeof window.CustomEvent=="function");Modernizr.addTest("devicemotion","DeviceMotionEvent"in window),Modernizr.addTest("deviceorientation","DeviceOrientationEvent"in window);Modernizr.addTest("eventlistener","addEventListener"in window);Modernizr.addTest("forcetouch",function(){return hasEvent(prefixed("mouseforcewillbegin",window,!1),window)?MouseEvent.WEBKIT_FORCE_AT_MOUSE_DOWN&&MouseEvent.WEBKIT_FORCE_AT_FORCE_MOUSE_DOWN:!1});Modernizr.addTest("hashchange",function(){return hasEvent("hashchange",window)===!1?!1:document.documentMode===undefined||document.documentMode>7});Modernizr.addTest("oninput",function(){var e=createElement("input"),A;if(e.setAttribute("oninput","return"),e.style.cssText="position:fixed;top:0;",hasEvent("oninput",docElement)||typeof e.oninput=="function")return!0;try{var t=document.createEvent("KeyboardEvent");A=!1;var r=function(n){A=!0,n.preventDefault(),n.stopPropagation()};t.initKeyEvent("keypress",!0,!0,window,!1,!1,!1,!1,0,"e".charCodeAt(0)),docElement.appendChild(e),e.addEventListener("input",r,!1),e.focus(),e.dispatchEvent(t),e.removeEventListener("input",r,!1),docElement.removeChild(e)}catch{A=!1}return A});var domPrefixesAll=[""].concat(domPrefixes);ModernizrProto._domPrefixesAll=domPrefixesAll;Modernizr.addTest("pointerevents",function(){for(var e=0,A=domPrefixesAll.length;e<A;e++)if(hasEvent(domPrefixesAll[e]+"pointerdown"))return!0;return!1});Modernizr.addAsyncTest(function(){var e,A=300;function t(){clearTimeout(e),window.removeEventListener("deviceproximity",t),addTest("proximity",!0)}"ondeviceproximity"in window&&"onuserproximity"in window?(window.addEventListener("deviceproximity",t),e=setTimeout(function(){window.removeEventListener("deviceproximity",t),addTest("proximity",!1)},A)):addTest("proximity",!1)});Modernizr.addTest("filereader",!!(window.File&&window.FileList&&window.FileReader));Modernizr.addTest("filesystem",!!prefixed("requestFileSystem",window));Modernizr.addAsyncTest(function(){var e=function(f){docElement.contains(f)||docElement.appendChild(f)},A=function(f){f.fake&&f.parentNode&&f.parentNode.removeChild(f)},t=function(f,u){var m=!!f;if(m&&(m=new Boolean(m),m.blocked=f==="blocked"),addTest("flash",function(){return m}),u&&a.contains(u)){for(;u.parentNode!==a;)u=u.parentNode;a.removeChild(u)}},r,n;try{n="ActiveXObject"in window&&"Pan"in new window.ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch{}if(r=!("plugins"in navigator&&"Shockwave Flash"in navigator.plugins||n),r||isSVG)t(!1);else{var o=createElement("embed"),a=getBody(),l,s;if(o.type="application/x-shockwave-flash",a.appendChild(o),!("Pan"in o)&&!n){e(a),t("blocked",o),A(a);return}l=function(){if(e(a),!docElement.contains(a))return a=document.body||a,o=createElement("embed"),o.type="application/x-shockwave-flash",a.appendChild(o),setTimeout(l,1e3);docElement.contains(o)?(s=o.style.cssText,t(s!==""?"blocked":!0,o)):t("blocked"),A(a)},setTimeout(l,10)}});Modernizr.addTest("fullscreen",!!(prefixed("exitFullscreen",document,!1)||prefixed("cancelFullScreen",document,!1)));Modernizr.addTest("gamepads",!!prefixed("getGamepads",navigator));Modernizr.addTest("geolocation","geolocation"in navigator);Modernizr.addTest("hiddenscroll",function(){return testStyles("#modernizr {width:100px;height:100px;overflow:scroll}",function(e){return e.offsetWidth===e.clientWidth})});Modernizr.addTest("history",function(){var e=navigator.userAgent;return!e||(e.indexOf("Android 2.")!==-1||e.indexOf("Android 4.0")!==-1)&&e.indexOf("Mobile Safari")!==-1&&e.indexOf("Chrome")===-1&&e.indexOf("Windows Phone")===-1&&location.protocol!=="file:"?!1:window.history&&"pushState"in window.history});Modernizr.addTest("htmlimports","import"in createElement("link"));Modernizr.addTest("ie8compat",!window.addEventListener&&!!document.documentMode&&document.documentMode===7);Modernizr.addTest("sandbox","sandbox"in createElement("iframe"));Modernizr.addTest("seamless","seamless"in createElement("iframe"));Modernizr.addTest("srcdoc","srcdoc"in createElement("iframe"));Modernizr.addAsyncTest(function(){if(!Modernizr.canvas)return!1;var e=new Image,A=createElement("canvas"),t=A.getContext("2d");e.onload=function(){addTest("apng",function(){return typeof A.getContext>"u"?!1:(t.drawImage(e,0,0),t.getImageData(0,0,1,1).data[3]===0)})},e.src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACGFjVEwAAAABAAAAAcMq2TYAAAANSURBVAiZY2BgYPgPAAEEAQB9ssjfAAAAGmZjVEwAAAAAAAAAAQAAAAEAAAAAAAAAAAD6A+gBAbNU+2sAAAARZmRBVAAAAAEImWNgYGBgAAAABQAB6MzFdgAAAABJRU5ErkJggg=="});Modernizr.addAsyncTest(function(){var e=new Image;e.onload=e.onerror=function(){addTest("avif",e.width===1)},e.src="data:image/avif;base64,AAAAIGZ0eXBhdmlmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAAEcbWV0YQAAAAAAAABIaGRscgAAAAAAAAAAcGljdAAAAAAAAAAAAAAAAGNhdmlmIC0gaHR0cHM6Ly9naXRodWIuY29tL2xpbmstdS9jYXZpZgAAAAAeaWxvYwAAAAAEQAABAAEAAAAAAUQAAQAAABcAAAAqaWluZgEAAAAAAAABAAAAGmluZmUCAAAAAAEAAGF2MDFJbWFnZQAAAAAOcGl0bQAAAAAAAQAAAHJpcHJwAAAAUmlwY28AAAAQcGFzcAAAAAEAAAABAAAAFGlzcGUAAAAAAAAAAQAAAAEAAAAQcGl4aQAAAAADCAgIAAAAFmF2MUOBAAwACggYAAYICGgIIAAAABhpcG1hAAAAAAAAAAEAAQUBAoMDhAAAAB9tZGF0CggYAAYICGgIIBoFHiAAAEQiBACwDoA="});Modernizr.addTest("imgcrossorigin","crossOrigin"in createElement("img"));Modernizr.addAsyncTest(function(){var e=new Image;e.onerror=function(){addTest("exiforientation",!1,{aliases:["exif-orientation"]})},e.onload=function(){addTest("exiforientation",e.width!==2,{aliases:["exif-orientation"]})},e.src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/4QAiRXhpZgAASUkqAAgAAAABABIBAwABAAAABgASAAAAAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAABAAIDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD+/iiiigD/2Q=="});Modernizr.addAsyncTest(function(){var e=new Image;e.onload=e.onerror=function(){addTest("jpeg2000",e.width===1)},e.src="data:image/jp2;base64,/0//UQAyAAAAAAABAAAAAgAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAEBwEBBwEBBwEBBwEB/1IADAAAAAEAAAQEAAH/XAAEQED/ZAAlAAFDcmVhdGVkIGJ5IE9wZW5KUEVHIHZlcnNpb24gMi4wLjD/kAAKAAAAAABYAAH/UwAJAQAABAQAAf9dAAUBQED/UwAJAgAABAQAAf9dAAUCQED/UwAJAwAABAQAAf9dAAUDQED/k8+kEAGvz6QQAa/PpBABr994EAk//9k="});Modernizr.addAsyncTest(function(){var e=new Image;e.onload=e.onerror=function(){addTest("jpegxr",e.width===1,{aliases:["jpeg-xr"]})},e.src="data:image/vnd.ms-photo;base64,SUm8AQgAAAAFAAG8AQAQAAAASgAAAIC8BAABAAAAAQAAAIG8BAABAAAAAQAAAMC8BAABAAAAWgAAAMG8BAABAAAAHwAAAAAAAAAkw91vA07+S7GFPXd2jckNV01QSE9UTwAZAYBxAAAAABP/gAAEb/8AAQAAAQAAAA=="});Modernizr.addTest("lazyloading","loading"in HTMLImageElement.prototype);Modernizr.addAsyncTest(function(){var e,A,t,r=createElement("img"),n="sizes"in r;!n&&"srcset"in r?(A="data:image/gif;base64,R0lGODlhAgABAPAAAP///wAAACH5BAAAAAAALAAAAAACAAEAAAICBAoAOw==",e="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",t=function(){addTest("sizes",r.width===2)},r.onload=t,r.onerror=t,r.setAttribute("sizes","9px"),r.srcset=e+" 1w,"+A+" 8w",r.src=e):addTest("sizes",n)});Modernizr.addTest("srcset","srcset"in createElement("img"));Modernizr.addAsyncTest(function(){var e=new Image;e.onerror=function(){addTest("webpalpha",!1,{aliases:["webp-alpha"]})},e.onload=function(){addTest("webpalpha",e.width===1,{aliases:["webp-alpha"]})},e.src="data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA=="});Modernizr.addAsyncTest(function(){var e=new Image;e.onerror=function(){addTest("webpanimation",!1,{aliases:["webp-animation"]})},e.onload=function(){addTest("webpanimation",e.width===1,{aliases:["webp-animation"]})},e.src="data:image/webp;base64,UklGRlIAAABXRUJQVlA4WAoAAAASAAAAAAAAAAAAQU5JTQYAAAD/////AABBTk1GJgAAAAAAAAAAAAAAAAAAAGQAAABWUDhMDQAAAC8AAAAQBxAREYiI/gcA"});Modernizr.addAsyncTest(function(){var e=new Image;e.onerror=function(){addTest("webplossless",!1,{aliases:["webp-lossless"]})},e.onload=function(){addTest("webplossless",e.width===1,{aliases:["webp-lossless"]})},e.src="data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA="});Modernizr.addAsyncTest(function(){var e=[{uri:"data:image/webp;base64,UklGRiQAAABXRUJQVlA4IBgAAAAwAQCdASoBAAEAAwA0JaQAA3AA/vuUAAA=",name:"webp"},{uri:"data:image/webp;base64,UklGRkoAAABXRUJQVlA4WAoAAAAQAAAAAAAAAAAAQUxQSAwAAAABBxAR/Q9ERP8DAABWUDggGAAAADABAJ0BKgEAAQADADQlpAADcAD++/1QAA==",name:"webp.alpha"},{uri:"data:image/webp;base64,UklGRlIAAABXRUJQVlA4WAoAAAASAAAAAAAAAAAAQU5JTQYAAAD/////AABBTk1GJgAAAAAAAAAAAAAAAAAAAGQAAABWUDhMDQAAAC8AAAAQBxAREYiI/gcA",name:"webp.animation"},{uri:"data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA=",name:"webp.lossless"}],A=e.shift();function t(r,n,o){var a=new Image;function l(s){var f=s&&s.type==="load"?a.width===1:!1,u=r==="webp";addTest(r,u&&f?new Boolean(f):f),o&&o(s)}a.onerror=l,a.onload=l,a.src=n}t(A.name,A.uri,function(r){if(r&&r.type==="load")for(var n=0;n<e.length;n++)t(e[n].name,e[n].uri)})});Modernizr.addTest("capture","capture"in createElement("input"));Modernizr.addTest("fileinput",function(){var e=navigator.userAgent;if(e.match(/(Android (1.0|1.1|1.5|1.6|2.0|2.1))|(Windows Phone (OS 7|8.0))|(XBLWP)|(ZuneWP)|(w(eb)?OSBrowser)|(webOS)|(Kindle\/(1.0|2.0|2.5|3.0))/)||e.match(/\swv\).+(chrome)\/([\w\.]+)/i))return!1;var A=createElement("input");return A.type="file",!A.disabled});Modernizr.addTest("fileinputdirectory",function(){var e=createElement("input"),A="directory";e.type="file";for(var t=0,r=domPrefixesAll.length;t<r;t++)if(domPrefixesAll[t]+A in e)return!0;return!1});Modernizr.addTest("inputformaction","formAction"in createElement("input"),{aliases:["input-formaction"]});Modernizr.addTest("formattribute",function(){var e=createElement("form"),A=createElement("input"),t=createElement("div"),r="formtest"+new Date().getTime(),n,o=!1;e.id=r;try{A.setAttribute("form",r)}catch{document.createAttribute&&(n=document.createAttribute("form"),n.nodeValue=r,A.setAttributeNode(n))}return t.appendChild(e),t.appendChild(A),docElement.appendChild(t),o=e.elements&&e.elements.length===1&&A.form===e,t.parentNode.removeChild(t),o});Modernizr.addTest("inputformenctype","formEnctype"in createElement("input"),{aliases:["input-formenctype"]});Modernizr.addTest("inputformmethod","formMethod"in createElement("input"));Modernizr.addTest("inputformnovalidate","formNoValidate"in createElement("input"),{aliases:["input-formnovalidate"]});Modernizr.addTest("inputformtarget","formTarget"in createElement("input"),{aliases:["input-formtarget"]});var inputElem=createElement("input");var inputattrs="autocomplete autofocus list placeholder max min multiple pattern required step".split(" "),attrs={};Modernizr.input=function(e){for(var A=0,t=e.length;A<t;A++)attrs[e[A]]=e[A]in inputElem;return attrs.list&&(attrs.list=!!(createElement("datalist")&&window.HTMLDataListElement)),attrs}(inputattrs);(function(){for(var e=["search","tel","url","email","datetime","date","month","week","time","datetime-local","number","range","color"],A="1)",t,r,n,o=0;o<e.length;o++)inputElem.setAttribute("type",t=e[o]),n=inputElem.type!=="text"&&"style"in inputElem,n&&(inputElem.value=A,inputElem.style.cssText="position:absolute;visibility:hidden;",/^range$/.test(t)&&inputElem.style.WebkitAppearance!==undefined?(docElement.appendChild(inputElem),r=document.defaultView,n=r.getComputedStyle&&r.getComputedStyle(inputElem,null).WebkitAppearance!=="textfield"&&inputElem.offsetHeight!==0,docElement.removeChild(inputElem)):/^(search|tel)$/.test(t)||(/^(url|email)$/.test(t)?n=inputElem.checkValidity&&inputElem.checkValidity()===!1:n=inputElem.value!==A)),Modernizr.addTest("inputtypes."+t,!!n)})();Modernizr.addTest("formvalidation",function(){var e=createElement("form");if(!("checkValidity"in e)||!("addEventListener"in e))return!1;if("reportValidity"in e)return!0;var A=!1,t;return Modernizr.formvalidationapi=!0,e.addEventListener("submit",function(r){(!window.opera||window.operamini)&&r.preventDefault(),r.stopPropagation()},!1),e.innerHTML='<input name="modTest" required="required" /><button></button>',testStyles("#modernizr form{position:absolute;top:-99999em}",function(r){r.appendChild(e),t=e.getElementsByTagName("input")[0],t.addEventListener("invalid",function(n){A=!0,n.preventDefault(),n.stopPropagation()},!1),Modernizr.formvalidationmessage=!!t.validationMessage,e.getElementsByTagName("button")[0].click()}),A});Modernizr.addTest("localizednumber",function(){if(!Modernizr.inputtypes.number||!Modernizr.formvalidation)return!1;var e=getBody(),A=createElement("div"),t=e.firstElementChild||e.firstChild,r;e.insertBefore(A,t),A.innerHTML='<input type="number" value="1.0" step="0.1" style="position: fixed; top: 0;" />';var n=A.childNodes[0];e.appendChild(A),n.focus();try{document.execCommand("SelectAll",!1),document.execCommand("InsertText",!1,"1,1")}catch{}return r=n.type==="number"&&n.valueAsNumber===1.1&&n.checkValidity(),e.removeChild(A),e.fake&&e.parentNode&&e.parentNode.removeChild(e),r});Modernizr.addTest("inputsearchevent",hasEvent("search"));Modernizr.addTest("placeholder","placeholder"in createElement("input")&&"placeholder"in createElement("textarea"));Modernizr.addTest("requestautocomplete",!!prefixed("requestAutocomplete",createElement("form")));Modernizr.addTest("intl",!!prefixed("Intl",window));Modernizr.addTest("ligatures",testAllProps("fontFeatureSettings",'"liga" 1'));Modernizr.addTest("olreversed","reversed"in createElement("ol"));Modernizr.addTest("mathml",function(){var e;return testStyles("#modernizr{position:absolute;display:inline-block}",function(A){A.innerHTML+="<math><mfrac><mi>xx</mi><mi>yy</mi></mfrac></math>",e=A.offsetHeight>A.offsetWidth}),e});Modernizr.addTest("mediasource","MediaSource"in window);Modernizr.addTest("hovermq",mq("(hover)"));Modernizr.addTest("pointermq",mq("(pointer:coarse),(pointer:fine),(pointer:none)"));Modernizr.addTest("messagechannel","MessageChannel"in window);Modernizr.addTest("beacon","sendBeacon"in navigator);Modernizr.addTest("effectiveType",function(){var e=navigator.connection||{effectiveType:0};return e.effectiveType!==0});Modernizr.addTest("lowbandwidth",function(){var e=navigator.connection||{type:0,effectiveType:0};return e.type===3||e.type===4||/^[23]g$/.test(e.effectiveType)});Modernizr.addTest("eventsource","EventSource"in window);Modernizr.addTest("fetch","fetch"in window);var testXhrType=function(e){if(typeof XMLHttpRequest>"u")return!1;var A=new XMLHttpRequest;A.open("get","/",!0);try{A.responseType=e}catch{return!1}return"response"in A&&A.responseType===e};Modernizr.addTest("xhrresponsetypearraybuffer",testXhrType("arraybuffer"));Modernizr.addTest("xhrresponsetypeblob",testXhrType("blob"));Modernizr.addTest("xhrresponsetypedocument",testXhrType("document"));Modernizr.addTest("xhrresponsetypejson",testXhrType("json"));Modernizr.addTest("xhrresponsetypetext",testXhrType("text"));Modernizr.addTest("xhrresponsetype",function(){if(typeof XMLHttpRequest>"u")return!1;var e=new XMLHttpRequest;return e.open("get","/",!0),"response"in e}());Modernizr.addTest("xhr2","XMLHttpRequest"in window&&"withCredentials"in new XMLHttpRequest);Modernizr.addTest("notification",function(){if(!window.Notification||!window.Notification.requestPermission)return!1;if(window.Notification.permission==="granted")return!0;try{new window.Notification("")}catch(e){if(e.name==="TypeError")return!1}return!0});Modernizr.addTest("pagevisibility",!!prefixed("hidden",document,!1));Modernizr.addTest("performance",!!prefixed("performance",window));Modernizr.addTest("pointerlock",!!prefixed("exitPointerLock",document));var bool=!0;try{window.postMessage({toString:function(){bool=!1}},"*")}catch(e){}Modernizr.addTest("postmessage",new Boolean("postMessage"in window)),Modernizr.addTest("postmessage.structuredclones",bool);Modernizr.addTest("proxy","Proxy"in window);Modernizr.addTest("queryselector","querySelector"in document&&"querySelectorAll"in document);Modernizr.addTest("prefetch",function(){if(document.documentMode===11)return!0;var e=createElement("link").relList;return!e||!e.supports?!1:e.supports("prefetch")});Modernizr.addTest("requestanimationframe",!!prefixed("requestAnimationFrame",window),{aliases:["raf"]});Modernizr.addTest("scriptasync","async"in createElement("script"));Modernizr.addTest("scriptdefer","defer"in createElement("script"));Modernizr.addTest("scrolltooptions",function(){var e=getBody(),A=window.pageYOffset,t=e.clientHeight<=window.innerHeight;if(t){var r=createElement("div");r.style.height=window.innerHeight-e.clientHeight+1+"px",r.style.display="block",e.appendChild(r)}window.scrollTo({top:1});var n=window.pageYOffset!==0;return t&&e.removeChild(r),window.scrollTo(0,A),n});Modernizr.addTest("serviceworker","serviceWorker"in navigator);Modernizr.addTest("speechrecognition",function(){try{return!!prefixed("SpeechRecognition",window)}catch{return!1}});Modernizr.addTest("speechsynthesis",function(){try{return"SpeechSynthesisUtterance"in window}catch{return!1}});Modernizr.addTest("cookies",function(){try{document.cookie="cookietest=1";var e=document.cookie.indexOf("cookietest=")!==-1;return document.cookie="cookietest=1; expires=Thu, 01-Jan-1970 00:00:01 GMT",e}catch{return!1}});Modernizr.addAsyncTest(function(){var e;try{e=prefixed("indexedDB",window)}catch{}if(e){var A="modernizr-"+Math.random(),t;try{t=e.open(A)}catch{addTest("indexeddb",!1);return}t.onerror=function(r){t.error&&(t.error.name==="InvalidStateError"||t.error.name==="UnknownError")?(addTest("indexeddb",!1),r.preventDefault()):(addTest("indexeddb",!0),detectDeleteDatabase(e,A))},t.onsuccess=function(){addTest("indexeddb",!0),detectDeleteDatabase(e,A)}}else addTest("indexeddb",!1)});function detectDeleteDatabase(e,A){var t=e.deleteDatabase(A);t.onsuccess=function(){addTest("indexeddb.deletedatabase",!0)},t.onerror=function(){addTest("indexeddb.deletedatabase",!1)}}Modernizr.addAsyncTest(function(){var e,A="detect-blob-support",t=!1,r,n,o;try{e=prefixed("indexedDB",window)}catch{}if(!(Modernizr.indexeddb&&Modernizr.indexeddb.deletedatabase))return!1;try{e.deleteDatabase(A).onsuccess=function(){r=e.open(A,1),r.onupgradeneeded=function(){r.result.createObjectStore("store")},r.onsuccess=function(){n=r.result;try{o=n.transaction("store","readwrite").objectStore("store").put(new Blob,"key"),o.onsuccess=function(){t=!0},o.onerror=function(){t=!1}}catch{t=!1}finally{addTest("indexeddbblob",t),n.close(),e.deleteDatabase(A)}}}}catch{addTest("indexeddbblob",!1)}});Modernizr.addAsyncTest(function(){Modernizr.on("indexeddb",function(e){e&&addTest("indexeddb2","getAll"in IDBIndex.prototype)})});Modernizr.addTest("localstorage",function(){var e="modernizr";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch{return!1}});Modernizr.addTest("quotamanagement",function(){var e=prefixed("temporaryStorage",navigator),A=prefixed("persistentStorage",navigator);return!!(e&&A)});Modernizr.addTest("sessionstorage",function(){var e="modernizr";try{return sessionStorage.setItem(e,e),sessionStorage.removeItem(e),!0}catch{return!1}});Modernizr.addTest("userdata",!!createElement("div").addBehavior);Modernizr.addTest("websqldatabase","openDatabase"in window);Modernizr.addTest("stylescoped","scoped"in createElement("style"));Modernizr.addTest("svg",!!document.createElementNS&&!!document.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect);Modernizr.addTest("svgasimg",document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1"));var toStringFn={}.toString;Modernizr.addTest("svgclippaths",function(){return!!document.createElementNS&&/SVGClipPath/.test(toStringFn.call(document.createElementNS("http://www.w3.org/2000/svg","clipPath")))});Modernizr.addTest("svgfilters",function(){var e=!1;try{e="SVGFEColorMatrixElement"in window&&SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_SATURATE===2}catch{}return e});Modernizr.addTest("svgforeignobject",function(){return!!document.createElementNS&&/SVGForeignObject/.test(toStringFn.call(document.createElementNS("http://www.w3.org/2000/svg","foreignObject")))});Modernizr.addTest("inlinesvg",function(){var e=createElement("div");return e.innerHTML="<svg/>",(typeof SVGRect<"u"&&e.firstChild&&e.firstChild.namespaceURI)==="http://www.w3.org/2000/svg"});Modernizr.addTest("smil",function(){return!!document.createElementNS&&/SVGAnimate/.test(toStringFn.call(document.createElementNS("http://www.w3.org/2000/svg","animate")))});Modernizr.addTest("textareamaxlength","maxLength"in createElement("textarea"));Modernizr.addTest("textencoder",!!(window.TextEncoder&&window.TextEncoder.prototype.encode)),Modernizr.addTest("textdecoder",!!(window.TextDecoder&&window.TextDecoder.prototype.decode));Modernizr.addTest("typedarrays","ArrayBuffer"in window);Modernizr.addTest("unicoderange",function(){return testStyles('@font-face{font-family:"unicodeRange";src:local("Arial");unicode-range:U+0020,U+002E}#modernizr span{font-size:20px;display:inline-block;font-family:"unicodeRange",monospace}#modernizr .mono{font-family:monospace}',function(e){for(var A=[".",".","m","m"],t=0;t<A.length;t++){var r=createElement("span");r.innerHTML=A[t],r.className=t%2?"mono":"",e.appendChild(r),A[t]=r.clientWidth}return A[0]!==A[1]&&A[2]===A[3]})});var url=prefixed("URL",window,!1);url=url&&window[url],Modernizr.addTest("bloburls",url&&"revokeObjectURL"in url&&"createObjectURL"in url);Modernizr.addAsyncTest(function(){navigator.userAgent.indexOf("MSIE 7.")!==-1&&setTimeout(function(){Modernizr.addTest("datauri",new Boolean(!1))},10);var e=new Image;e.onerror=function(){Modernizr.addTest("datauri",new Boolean(!1))},e.onload=function(){e.width===1&&e.height===1?A():Modernizr.addTest("datauri",new Boolean(!1))},e.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";function A(){var t=new Image;t.onerror=function(){Modernizr.addTest("datauri",new Boolean(!0)),Modernizr.addTest("datauri.over32kb",!1)},t.onload=function(){Modernizr.addTest("datauri",new Boolean(!0)),Modernizr.addTest("datauri.over32kb",t.width===1&&t.height===1)};for(var r="R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";r.length<33e3;)r=`\r
+`+r;t.src="data:image/gif;base64,"+r}});Modernizr.addTest("urlparser",function(){var e;try{return e=new URL("http://modernizr.com/"),e.href==="http://modernizr.com/"}catch{return!1}});Modernizr.addTest("urlsearchparams","URLSearchParams"in window);Modernizr.addTest("vibrate",!!prefixed("vibrate",navigator));(function(){var e=createElement("video");Modernizr.addTest("video",function(){var A=!1;try{A=!!e.canPlayType,A&&(A=new Boolean(A))}catch{}return A});try{e.canPlayType&&(Modernizr.addTest("video.ogg",e.canPlayType('video/ogg; codecs="theora"').replace(/^no$/,"")),Modernizr.addTest("video.h264",e.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/,"")),Modernizr.addTest("video.h265",e.canPlayType('video/mp4; codecs="hev1"').replace(/^no$/,"")),Modernizr.addTest("video.webm",e.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/,"")),Modernizr.addTest("video.vp9",e.canPlayType('video/webm; codecs="vp9"').replace(/^no$/,"")),Modernizr.addTest("video.hls",e.canPlayType('application/x-mpegURL; codecs="avc1.42E01E"').replace(/^no$/,"")),Modernizr.addTest("video.av1",e.canPlayType('video/mp4; codecs="av01"').replace(/^no$/,"")))}catch{}})();Modernizr.addAsyncTest(function(){var e,A=200,t=5,r=0,n=createElement("video"),o=n.style;function a(l){r++,clearTimeout(e);var s=l&&l.type==="playing"||n.currentTime!==0;if(!s&&r<t){e=setTimeout(a,A);return}n.removeEventListener("playing",a,!1),addTest("videoautoplay",s),n.parentNode&&n.parentNode.removeChild(n)}if(!Modernizr.video||!("autoplay"in n)){addTest("videoautoplay",!1);return}o.position="absolute",o.height=0,o.width=0;try{if(Modernizr.video.ogg)n.src="data:video/ogg;base64,T2dnUwACAAAAAAAAAABmnCATAAAAAHDEixYBKoB0aGVvcmEDAgEAAQABAAAQAAAQAAAAAAAFAAAAAQAAAAAAAAAAAGIAYE9nZ1MAAAAAAAAAAAAAZpwgEwEAAAACrA7TDlj///////////////+QgXRoZW9yYSsAAABYaXBoLk9yZyBsaWJ0aGVvcmEgMS4xIDIwMDkwODIyIChUaHVzbmVsZGEpAQAAABoAAABFTkNPREVSPWZmbXBlZzJ0aGVvcmEtMC4yOYJ0aGVvcmG+zSj3uc1rGLWpSUoQc5zmMYxSlKQhCDGMYhCEIQhAAAAAAAAAAAAAEW2uU2eSyPxWEvx4OVts5ir1aKtUKBMpJFoQ/nk5m41mUwl4slUpk4kkghkIfDwdjgajQYC8VioUCQRiIQh8PBwMhgLBQIg4FRba5TZ5LI/FYS/Hg5W2zmKvVoq1QoEykkWhD+eTmbjWZTCXiyVSmTiSSCGQh8PB2OBqNBgLxWKhQJBGIhCHw8HAyGAsFAiDgUCw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDAwPEhQUFQ0NDhESFRUUDg4PEhQVFRUOEBETFBUVFRARFBUVFRUVEhMUFRUVFRUUFRUVFRUVFRUVFRUVFRUVEAwLEBQZGxwNDQ4SFRwcGw4NEBQZHBwcDhATFhsdHRwRExkcHB4eHRQYGxwdHh4dGxwdHR4eHh4dHR0dHh4eHRALChAYKDM9DAwOExo6PDcODRAYKDlFOA4RFh0zV1A+EhYlOkRtZ00YIzdAUWhxXDFATldneXhlSFxfYnBkZ2MTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTExMTEhIVGRoaGhoSFBYaGhoaGhUWGRoaGhoaGRoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhESFh8kJCQkEhQYIiQkJCQWGCEkJCQkJB8iJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQREhgvY2NjYxIVGkJjY2NjGBo4Y2NjY2MvQmNjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRUVFRISEhUXGBkbEhIVFxgZGxwSFRcYGRscHRUXGBkbHB0dFxgZGxwdHR0YGRscHR0dHhkbHB0dHR4eGxwdHR0eHh4REREUFxocIBERFBcaHCAiERQXGhwgIiUUFxocICIlJRcaHCAiJSUlGhwgIiUlJSkcICIlJSUpKiAiJSUlKSoqEBAQFBgcICgQEBQYHCAoMBAUGBwgKDBAFBgcICgwQEAYHCAoMEBAQBwgKDBAQEBgICgwQEBAYIAoMEBAQGCAgAfF5cdH1e3Ow/L66wGmYnfIUbwdUTe3LMRbqON8B+5RJEvcGxkvrVUjTMrsXYhAnIwe0dTJfOYbWrDYyqUrz7dw/JO4hpmV2LsQQvkUeGq1BsZLx+cu5iV0e0eScJ91VIQYrmqfdVSK7GgjOU0oPaPOu5IcDK1mNvnD+K8LwS87f8Jx2mHtHnUkTGAurWZlNQa74ZLSFH9oF6FPGxzLsjQO5Qe0edcpttd7BXBSqMCL4k/4tFrHIPuEQ7m1/uIWkbDMWVoDdOSuRQ9286kvVUlQjzOE6VrNguN4oRXYGkgcnih7t13/9kxvLYKQezwLTrO44sVmMPgMqORo1E0sm1/9SludkcWHwfJwTSybR4LeAz6ugWVgRaY8mV/9SluQmtHrzsBtRF/wPY+X0JuYTs+ltgrXAmlk10xQHmTu9VSIAk1+vcvU4ml2oNzrNhEtQ3CysNP8UeR35wqpKUBdGdZMSjX4WVi8nJpdpHnbhzEIdx7mwf6W1FKAiucMXrWUWVjyRf23chNtR9mIzDoT/6ZLYailAjhFlZuvPtSeZ+2oREubDoWmT3TguY+JHPdRVSLKxfKH3vgNqJ/9emeEYikGXDFNzaLjvTeGAL61mogOoeG3y6oU4rW55ydoj0lUTSR/mmRhPmF86uwIfzp3FtiufQCmppaHDlGE0r2iTzXIw3zBq5hvaTldjG4CPb9wdxAme0SyedVKczJ9AtYbgPOzYKJvZZImsN7ecrxWZg5dR6ZLj/j4qpWsIA+vYwE+Tca9ounMIsrXMB4Stiib2SPQtZv+FVIpfEbzv8ncZoLBXc3YBqTG1HsskTTotZOYTG+oVUjLk6zhP8bg4RhMUNtfZdO7FdpBuXzhJ5Fh8IKlJG7wtD9ik8rWOJxy6iQ3NwzBpQ219mlyv+FLicYs2iJGSE0u2txzed++D61ZWCiHD/cZdQVCqkO2gJpdpNaObhnDfAPrT89RxdWFZ5hO3MseBSIlANppdZNIV/Rwe5eLTDvkfWKzFnH+QJ7m9QWV1KdwnuIwTNtZdJMoXBf74OhRnh2t+OTGL+AVUnIkyYY+QG7g9itHXyF3OIygG2s2kud679ZWKqSFa9n3IHD6MeLv1lZ0XyduRhiDRtrNnKoyiFVLcBm0ba5Yy3fQkDh4XsFE34isVpOzpa9nR8iCpS4HoxG2rJpnRhf3YboVa1PcRouh5LIJv/uQcPNd095ickTaiGBnWLKVWRc0OnYTSyex/n2FofEPnDG8y3PztHrzOLK1xo6RAml2k9owKajOC0Wr4D5x+3nA0UEhK2m198wuBHF3zlWWVKWLN1CHzLClUfuoYBcx4b1llpeBKmbayaR58njtE9onD66lUcsg0Spm2snsb+8HaJRn4dYcLbCuBuYwziB8/5U1C1DOOz2gZjSZtrLJk6vrLF3hwY4Io9xuT/ruUFRSBkNtUzTOWhjh26irLEPx4jPZL3Fo3QrReoGTTM21xYTT9oFdhTUIvjqTkfkvt0bzgVUjq/hOYY8j60IaO/0AzRBtqkTS6R5ellZd5uKdzzhb8BFlDdAcrwkE0rbXTOPB+7Y0FlZO96qFL4Ykg21StJs8qIW7h16H5hGiv8V2Cflau7QVDepTAHa6Lgt6feiEvJDM21StJsmOH/hynURrKxvUpQ8BH0JF7BiyG2qZpnL/7AOU66gt+reLEXY8pVOCQvSsBtqZTNM8bk9ohRcwD18o/WVkbvrceVKRb9I59IEKysjBeTMmmbA21xu/6iHadLRxuIzkLpi8wZYmmbbWi32RVAUjruxWlJ//iFxE38FI9hNKOoCdhwf5fDe4xZ81lgREhK2m1j78vW1CqkuMu/AjBNK210kzRUX/B+69cMMUG5bYrIeZxVSEZISmkzbXOi9yxwIfPgdsov7R71xuJ7rFcACjG/9PzApqFq7wEgzNJm2suWESPuwrQvejj7cbnQxMkxpm21lUYJL0fKmogPPqywn7e3FvB/FCNxPJ85iVUkCE9/tLKx31G4CgNtWTTPFhMvlu8G4/TrgaZttTChljfNJGgOT2X6EqpETy2tYd9cCBI4lIXJ1/3uVUllZEJz4baqGF64yxaZ+zPLYwde8Uqn1oKANtUrSaTOPHkhvuQP3bBlEJ/LFe4pqQOHUI8T8q7AXx3fLVBgSCVpMba55YxN3rv8U1Dv51bAPSOLlZWebkL8vSMGI21lJmmeVxPRwFlZF1CpqCN8uLwymaZyjbXHCRytogPN3o/n74CNykfT+qqRv5AQlHcRxYrC5KvGmbbUwmZY/29BvF6C1/93x4WVglXDLFpmbapmF89HKTogRwqqSlGbu+oiAkcWFbklC6Zhf+NtTLFpn8oWz+HsNRVSgIxZWON+yVyJlE5tq/+GWLTMutYX9ekTySEQPLVNQQ3OfycwJBM0zNtZcse7CvcKI0V/zh16Dr9OSA21MpmmcrHC+6pTAPHPwoit3LHHqs7jhFNRD6W8+EBGoSEoaZttTCZljfduH/fFisn+dRBGAZYtMzbVMwvul/T/crK1NQh8gN0SRRa9cOux6clC0/mDLFpmbarmF8/e6CopeOLCNW6S/IUUg3jJIYiAcDoMcGeRbOvuTPjXR/tyo79LK3kqqkbxkkMRAOB0GODPItnX3Jnxro/25Ud+llbyVVSN4ySGIgHA6DHBnkWzr7kz410f7cqO/Syt5KqpFVJwn6gBEvBM0zNtZcpGOEPiysW8vvRd2R0f7gtjhqUvXL+gWVwHm4XJDBiMpmmZtrLfPwd/IugP5+fKVSysH1EXreFAcEhelGmbbUmZY4Xdo1vQWVnK19P4RuEnbf0gQnR+lDCZlivNM22t1ESmopPIgfT0duOfQrsjgG4tPxli0zJmF5trdL1JDUIUT1ZXSqQDeR4B8mX3TrRro/2McGeUvLtwo6jIEKMkCUXWsLyZROd9P/rFYNtXPBli0z398iVUlVKAjFlY437JXImUTm2r/4ZYtMy61hf16RPJIU9nZ1MABAwAAAAAAAAAZpwgEwIAAABhp658BScAAAAAAADnUFBQXIDGXLhwtttNHDhw5OcpQRMETBEwRPduylKVB0HRdF0A";else if(Modernizr.video.h264)n.src="data:video/mp4;base64,AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAAAs1tZGF0AAACrgYF//+q3EXpvebZSLeWLNgg2SPu73gyNjQgLSBjb3JlIDE0OCByMjYwMSBhMGNkN2QzIC0gSC4yNjQvTVBFRy00IEFWQyBjb2RlYyAtIENvcHlsZWZ0IDIwMDMtMjAxNSAtIGh0dHA6Ly93d3cudmlkZW9sYW4ub3JnL3gyNjQuaHRtbCAtIG9wdGlvbnM6IGNhYmFjPTEgcmVmPTMgZGVibG9jaz0xOjA6MCBhbmFseXNlPTB4MzoweDExMyBtZT1oZXggc3VibWU9NyBwc3k9MSBwc3lfcmQ9MS4wMDowLjAwIG1peGVkX3JlZj0xIG1lX3JhbmdlPTE2IGNocm9tYV9tZT0xIHRyZWxsaXM9MSA4eDhkY3Q9MSBjcW09MCBkZWFkem9uZT0yMSwxMSBmYXN0X3Bza2lwPTEgY2hyb21hX3FwX29mZnNldD0tMiB0aHJlYWRzPTEgbG9va2FoZWFkX3RocmVhZHM9MSBzbGljZWRfdGhyZWFkcz0wIG5yPTAgZGVjaW1hdGU9MSBpbnRlcmxhY2VkPTAgYmx1cmF5X2NvbXBhdD0wIGNvbnN0cmFpbmVkX2ludHJhPTAgYmZyYW1lcz0zIGJfcHlyYW1pZD0yIGJfYWRhcHQ9MSBiX2JpYXM9MCBkaXJlY3Q9MSB3ZWlnaHRiPTEgb3Blbl9nb3A9MCB3ZWlnaHRwPTIga2V5aW50PTI1MCBrZXlpbnRfbWluPTEwIHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcmM9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcHN0ZXA9NCBpcF9yYXRpbz0xLjQwIGFxPTE6MS4wMACAAAAAD2WIhAA3//728P4FNjuZQQAAAu5tb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAAZAABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACGHRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAEAAAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAgAAAAIAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAGQAAAAAAAEAAAAAAZBtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAACgAAAAEAFXEAAAAAAAtaGRscgAAAAAAAAAAdmlkZQAAAAAAAAAAAAAAAFZpZGVvSGFuZGxlcgAAAAE7bWluZgAAABR2bWhkAAAAAQAAAAAAAAAAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAAA+3N0YmwAAACXc3RzZAAAAAAAAAABAAAAh2F2YzEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAgACAEgAAABIAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY//8AAAAxYXZjQwFkAAr/4QAYZ2QACqzZX4iIhAAAAwAEAAADAFA8SJZYAQAGaOvjyyLAAAAAGHN0dHMAAAAAAAAAAQAAAAEAAAQAAAAAHHN0c2MAAAAAAAAAAQAAAAEAAAABAAAAAQAAABRzdHN6AAAAAAAAAsUAAAABAAAAFHN0Y28AAAAAAAAAAQAAADAAAABidWR0YQAAAFptZXRhAAAAAAAAACFoZGxyAAAAAAAAAABtZGlyYXBwbAAAAAAAAAAAAAAAAC1pbHN0AAAAJal0b28AAAAdZGF0YQAAAAEAAAAATGF2ZjU2LjQwLjEwMQ==";else{addTest("videoautoplay",!1);return}}catch{addTest("videoautoplay",!1);return}n.setAttribute("autoplay",""),o.cssText="display:none",docElement.appendChild(n),setTimeout(function(){n.addEventListener("playing",a,!1),e=setTimeout(a,A)},0)});Modernizr.addTest("videocrossorigin","crossOrigin"in createElement("video"));Modernizr.addTest("videoloop","loop"in createElement("video"));Modernizr.addTest("videopreload","preload"in createElement("video"));Modernizr.addTest("vml",function(){var e=createElement("div"),A=!1,t;return isSVG||(e.innerHTML='<v:shape id="vml_flag1" adj="1" />',t=e.firstChild,"style"in t&&(t.style.behavior="url(#default#VML)"),A=t?typeof t.adj=="object":!0),A});Modernizr.addTest("webintents",!!prefixed("startActivity",navigator));Modernizr.addTest("webanimations","animate"in createElement("div"));Modernizr.addTest("publicKeyCredential",function(){return!!window.PublicKeyCredential});Modernizr.addTest("webgl",function(){return"WebGLRenderingContext"in window});Modernizr.addAsyncTest(function(){if(Modernizr.webglextensions=!1,!!Modernizr.webgl){var e,A,t;try{e=createElement("canvas"),A=e.getContext("webgl")||e.getContext("experimental-webgl"),t=A.getSupportedExtensions()}catch{return}A!==undefined&&(Modernizr.webglextensions=new Boolean(!0));for(var r=-1,n=t.length;++r<n;)Modernizr.webglextensions[t[r]]=!0;e=undefined}});Modernizr.addTest("peerconnection",!!prefixed("RTCPeerConnection",window));Modernizr.addTest("datachannel",function(){if(!Modernizr.peerconnection)return!1;for(var e=0,A=domPrefixesAll.length;e<A;e++){var t=window[domPrefixesAll[e]+"RTCPeerConnection"];if(t)try{var r=new t({});return"createDataChannel"in r}catch{}}return!1});Modernizr.addTest("getUserMedia","mediaDevices"in navigator&&"getUserMedia"in navigator.mediaDevices);Modernizr.addTest("mediastream",typeof MediaRecorder<"u");var supports=!1;try{supports="WebSocket"in window&&window.WebSocket.CLOSING===2}catch(e){}Modernizr.addTest("websockets",supports);Modernizr.addTest("websocketsbinary",function(){var e=location.protocol==="https:"?"wss":"ws",A;if("WebSocket"in window){if(A="binaryType"in WebSocket.prototype,A)return A;try{return!!new WebSocket(e+"://.").binaryType}catch{}}return!1});Modernizr.addTest("atobbtoa","atob"in window&&"btoa"in window,{aliases:["atob-btoa"]});Modernizr.addTest("framed",window.location!==top.location);Modernizr.addTest("matchmedia",!!prefixed("matchMedia",window));Modernizr.addTest("pushmanager","PushManager"in window);Modernizr.addTest("resizeobserver","ResizeObserver"in window);Modernizr.addTest("workertypeoption",function(){if("Worker"in window){var e=!1,A={get type(){return e=!0,"module"}},t="var message='hello'",r=new Blob([t],{type:"text/javascript"}),n=URL.createObjectURL(r);try{return new Worker(n,A).terminate(),e}catch{return!1}}else return!1});Modernizr.addAsyncTest(function(){try{var e=window.BlobBuilder,A=window.URL;Modernizr._config.usePrefix&&(e=e||window.MozBlobBuilder||window.WebKitBlobBuilder||window.MSBlobBuilder||window.OBlobBuilder,A=A||window.MozURL||window.webkitURL||window.MSURL||window.OURL);var t="Modernizr",r,n,o,a,l,s="this.onmessage=function(e){postMessage(e.data)}";try{r=new Blob([s],{type:"text/javascript"})}catch{}r||(n=new e,n.append(s),r=n.getBlob()),a=A.createObjectURL(r),o=new Worker(a),o.onmessage=function(m){addTest("blobworkers",t===m.data),u()},o.onerror=f,l=setTimeout(f,200),o.postMessage(t)}catch{f()}function f(){addTest("blobworkers",!1),u()}function u(){a&&A.revokeObjectURL(a),o&&o.terminate(),l&&clearTimeout(l)}});Modernizr.addAsyncTest(function(){try{var e="Modernizr",A=new Worker("data:text/javascript;base64,dGhpcy5vbm1lc3NhZ2U9ZnVuY3Rpb24oZSl7cG9zdE1lc3NhZ2UoZS5kYXRhKX0=");A.onmessage=function(t){A.terminate(),addTest("dataworkers",e===t.data),A=null},A.onerror=function(){addTest("dataworkers",!1),A=null},setTimeout(function(){addTest("dataworkers",!1)},200),A.postMessage(e)}catch{setTimeout(function(){addTest("dataworkers",!1)},0)}});Modernizr.addTest("sharedworkers","SharedWorker"in window);Modernizr.addTest("webworkers","Worker"in window);Modernizr.addAsyncTest(function(){var e=!!(Modernizr.blobconstructor&&Modernizr.bloburls&&Modernizr.webworkers&&Modernizr.typedarrays);if(!e)return addTest("transferables",!1);try{var A,t='var hello = "world"',r=new Blob([t],{type:"text/javascript"}),n=URL.createObjectURL(r),o=new Worker(n),a;o.onerror=l,a=setTimeout(l,200),A=new ArrayBuffer(1),o.postMessage(A,[A]),addTest("transferables",A.byteLength===0),s()}catch{l()}function l(){addTest("transferables",!1),s()}function s(){n&&URL.revokeObjectURL(n),o&&o.terminate(),a&&clearTimeout(a)}});Modernizr.addTest("xdomainrequest","XDomainRequest"in window),testRunner(),setClasses(classes),delete ModernizrProto.addTest,delete ModernizrProto.addAsyncTest;for(var i=0;i<Modernizr._q.length;i++)Modernizr._q[i]();scriptGlobalObject.Modernizr=Modernizr})(window,window,document)});Y();})();
+/*!
+ * modernizr v4.0.0-alpha
+ * Build https://modernizr.com/download?-adownload-ambientlight-aping-apng-appearance-applicationcache-areaping-arrow-aspectratio-atobbtoa-audio-audioautoplay-audioloop-audiopreload-avif-backdropfilter-backgroundblendmode-backgroundcliptext-backgroundsize-batteryapi-bdi-beacon-bgpositionshorthand-bgpositionxy-bgrepeatspace_bgrepeatround-bgsizecover-blobconstructor-bloburls-blobworkers-borderimage-borderradius-boxdecorationbreak-boxshadow-boxsizing-broadcastchannel-canvas-canvasblending-canvastext-canvaswinding-capture-checked-classlist-clipboard-connectioneffectivetype-contenteditable-contextmenu-cookies-cors-createelementattrs_createelement_attrs-cryptography-cssall-cssanimations-csscalc-csschunit-csscolumns-cssescape-cssexunit-cssfilters-cssgradients-cssgrid_cssgridlegacy-csshyphens_softhyphens_softhyphensfind-cssinvalid-cssmask-csspointerevents-csspositionsticky-csspseudoanimations-csspseudotransitions-cssreflections-cssremunit-cssresize-cssscrollbar-csstransforms-csstransforms3d-csstransformslevel2-csstransitions-cssvalid-cssvhunit-cssvmaxunit-cssvminunit-cssvwunit-cubicbezierrange-customelements-customevent-customproperties-customprotocolhandler-dart-datachannel-dataset-datauri-dataview-dataworkers-details-devicemotion_deviceorientation-directory-display_runin-displaytable-documentfragment-ellipsis-emoji-es5-es5array-es5date-es5function-es5object-es5string-es5syntax-es5undefined-es6array-es6class-es6collections-es6math-es6number-es6object-es6string-es6symbol-es7array-es8object-eventlistener-eventsource-exiforientation-fetch-fileinput-filereader-filesystem-flash-flexbox-flexboxlegacy-flexboxtweener-flexgap-flexwrap-focusvisible-focuswithin-fontdisplay-fontface-forcetouch-formattribute-formvalidation-framed-fullscreen-gamepads-generatedcontent-generators-geolocation-getrandomvalues-getusermedia-hairline-hashchange-hidden-hiddenscroll-history-hovermq-hsla-htmlimports-ie8compat-imgcrossorigin-indexeddb-indexeddb2-indexeddbblob-inlinesvg-input-inputformaction-inputformenctype-inputformmethod-inputformnovalidate-inputformtarget-inputsearchevent-inputtypes-intersectionobserver-intl-jpeg2000-jpegxr-json-lastchild-lazyloading-ligatures-localizednumber-localstorage-lowbandwidth-lowbattery-matchmedia-mathml-mediaqueries-mediarecorder-mediasource-messagechannel-microdata-multiplebgs-mutationobserver-notification-nthchild-objectfit-olreversed-oninput-opacity-outputelem-overflowscrolling-pagevisibility-passiveeventlisteners-peerconnection-performance-picture-placeholder-pointerevents-pointerlock-pointermq-postmessage-prefetch-preserve3d-progressbar_meter-promises-proximity-proxy-publickeycredential-pushmanager-queryselector-quotamanagement-regions-requestanimationframe-requestautocomplete-resizeobserver-restdestructuringarray_restdestructuringobject-restparameters-rgba-ruby-sandbox-scriptasync-scriptdefer-scrollsnappoints-scrolltooptions-seamless-serviceworker-sessionstorage-shadowroot-shadowrootlegacy-shapes-sharedworkers-siblinggeneral-sizes-smil-speechrecognition-speechsynthesis-spreadarray-spreadobject-srcdoc-srcset-strictmode-stringtemplate-stylescoped-subpixelfont-supports-svg-svgasimg-svgclippaths-svgfilters-svgforeignobject-target-template-textalignlast-textareamaxlength-textdecoration-textencoder_textdecoder-textshadow-texttrackapi_track-time-todataurljpeg_todataurlpng_todataurlwebp-transferables-typedarrays-unicoderange-unknownelements-urlparser-urlsearchparams-userdata-userselect-variablefonts-vibrate-video-videoautoplay-videocrossorigin-videoloop-videopreload-vml-webanimations-webaudio-webgl-webglextensions-webintents-webp-webpalpha-webpanimation-webplossless_webp_lossless-websockets-websocketsbinary-websqldatabase-webworkers-willchange-workertypeoption-wrapflow-xdomainrequest-xhr2-xhrresponsetype-xhrresponsetypearraybuffer-xhrresponsetypeblob-xhrresponsetypedocument-xhrresponsetypejson-xhrresponsetypetext-addtest-atrule-domprefixes-hasevent-load-mq-prefixed-prefixedcss-prefixes-printshiv-setclasses-testallprops-testprop-teststyles-dontmin
+ *
+ * Copyright (c)
+ *  Faruk Ates
+ *  Paul Irish
+ *  Alex Sexton
+ *  Ryan Seddon
+ *  Patrick Kettner
+ *  Stu Cox
+ *  Richard Herrera
+ *  Veeck
+
+ * MIT License
+ */
+/**
+ * @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+ */
+/*!
+{
+  "name": "a[download] Attribute",
+  "property": "adownload",
+  "caniuse": "download",
+  "tags": ["media", "attribute"],
+  "builderAliases": ["a_download"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://developers.whatwg.org/links.html#downloading-resources"
+  }]
+}
+!*/
+/*!
+{
+  "name": "a[ping] Attribute",
+  "property": "aping",
+  "caniuse": "ping",
+  "tags": ["media", "attribute"],
+  "builderAliases": ["a_ping"],
+  "authors": ["Hélio Correia (@heliocorreia)"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/dev/links.html#ping"
+  }]
+}
+!*/
+/*!
+{
+  "name": "area[ping] Attribute",
+  "property": "areaping",
+  "caniuse": "ping",
+  "tags": ["media", "attribute"],
+  "builderAliases": ["area_ping"],
+  "authors": ["Hélio Correia (@heliocorreia)"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/dev/links.html#ping"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Ambient Light Events",
+  "property": "ambientlight",
+  "caniuse": "ambient-light",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/ambient-light/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Application Cache",
+  "property": "applicationcache",
+  "caniuse": "offline-apps",
+  "tags": ["storage", "offline"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/docs/HTML/Using_the_application_cache"
+  }],
+  "polyfills": ["html5gears"]
+}
+!*/
+/*!
+{
+  "name": "HTML5 Audio Element",
+  "property": "audio",
+  "caniuse": "audio",
+  "tags": ["html5", "audio", "media"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/En/Media_formats_supported_by_the_audio_and_video_elements"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Audio Autoplay",
+  "property": "audioautoplay",
+  "authors": ["Jordy van Dortmont"],
+  "tags": ["audio"],
+  "async": true
+}
+!*/
+/*!
+{
+  "name": "Audio Loop Attribute",
+  "property": "audioloop",
+  "tags": ["audio", "media"]
+}
+!*/
+/*!
+{
+  "name": "Audio Preload",
+  "property": "audiopreload",
+  "tags": ["audio", "media"],
+  "async": true,
+  "warnings": ["This test is very large – only include it if you absolutely need it"]
+}
+!*/
+/*!
+{
+  "name": "Web Audio API",
+  "property": "webaudio",
+  "caniuse": "audio-api",
+  "polyfills": ["dynamicaudiojs", "audiolibjs"],
+  "tags": ["audio", "media"],
+  "builderAliases": ["audio_webaudio_api"],
+  "authors": ["Addy Osmani"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://webaudio.github.io/web-audio-api/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Battery API",
+  "property": "batteryapi",
+  "aliases": ["battery-api"],
+  "builderAliases": ["battery_api"],
+  "tags": ["battery", "device", "media"],
+  "authors": ["Paul Sayre", "Alex Bradley (@abrad1212)"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/DOM/window.navigator.mozBattery"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Low Battery Level",
+  "property": "lowbattery",
+  "tags": ["battery", "hardware", "mobile"],
+  "builderAliases": ["battery_level"],
+  "authors": ["Paul Sayre"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Navigator/battery"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Blob constructor",
+  "property": "blobconstructor",
+  "aliases": ["blob-constructor"],
+  "builderAliases": ["blob_constructor"],
+  "caniuse": "blobbuilder",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/FileAPI/#constructorBlob"
+  }],
+  "polyfills": ["blobjs"]
+}
+!*/
+/*!
+{
+  "name": "Broadcast Channel",
+  "property": "broadcastchannel",
+  "authors": ["Alex Neises (@AlexNeises)"],
+  "caniuse": "broadcastchannel",
+  "tags": ["performance", "broadcastchannel"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/BroadcastChannel"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Canvas",
+  "property": "canvas",
+  "caniuse": "canvas",
+  "tags": ["canvas", "graphics"],
+  "polyfills": ["excanvas", "slcanvas"]
+}
+!*/
+/*!
+{
+  "name": "canvas blending support",
+  "property": "canvasblending",
+  "caniuse": "canvas-blending",
+  "tags": ["canvas"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://drafts.fxtf.org/compositing-1/"
+  }, {
+    "name": "Article",
+    "href": "https://web.archive.org/web/20171003232921/http://blogs.adobe.com/webplatform/2013/01/28/blending-features-in-canvas/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "canvas.toDataURL type support",
+  "property": ["todataurljpeg", "todataurlpng", "todataurlwebp"],
+  "tags": ["canvas"],
+  "builderAliases": ["canvas_todataurl_type"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement.toDataURL"
+  }]
+}
+!*/
+/*!
+{
+  "name": "canvas winding support",
+  "property": "canvaswinding",
+  "tags": ["canvas"],
+  "notes": [{
+    "name": "Article",
+    "href": "https://web.archive.org/web/20170825024655/http://blogs.adobe.com/webplatform/2013/01/30/winding-rules-in-canvas/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Canvas text",
+  "property": "canvastext",
+  "caniuse": "canvas-text",
+  "tags": ["canvas", "graphics"],
+  "polyfills": ["canvastext"]
+}
+!*/
+/*!
+{
+  "name": "Clipboard API",
+  "property": "clipboard",
+  "tags": ["clipboard"],
+  "authors": ["Markel Ferro (@MarkelFe)"],
+  "async": true,
+  "warnings": ["It may return false in non-HTTPS connections as the API is only available in secure contexts"],
+  "notes": [{
+    "name": "MDN Docs Clipboard Object",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Clipboard"
+  }, {
+    "name": "MDN Docs Clipboard API",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Clipboard_API"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Content Editable",
+  "property": "contenteditable",
+  "caniuse": "contenteditable",
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/interaction.html#contenteditable"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Context menus",
+  "property": "contextmenu",
+  "caniuse": "menu",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/html5/interactive-elements.html#context-menus"
+  }, {
+    "name": "thewebrocks.com Demo",
+    "href": "http://thewebrocks.com/demos/context-menu/"
+  }],
+  "polyfills": ["jquery-contextmenu"]
+}
+!*/
+/*!
+{
+  "name": "Cross-Origin Resource Sharing",
+  "property": "cors",
+  "caniuse": "cors",
+  "authors": ["Theodoor van Donge"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/HTTP/Access_control_CORS"
+  }],
+  "polyfills": ["pmxdr", "ppx", "flxhr"]
+}
+!*/
+/*!
+{
+  "name": "Web Cryptography",
+  "property": "cryptography",
+  "caniuse": "cryptography",
+  "tags": ["crypto"],
+  "authors": ["roblarsen"],
+  "notes": [{
+    "name": "W3C Editor's Draft Spec",
+    "href": "https://www.w3.org/TR/WebCryptoAPI/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "getRandomValues",
+  "property": "getrandomvalues",
+  "caniuse": "getrandomvalues",
+  "tags": ["crypto"],
+  "authors": ["komachi"],
+  "notes": [{
+    "name": "W3C Editor’s Draft Spec",
+    "href": "https://w3c.github.io/webcrypto/#Crypto-interface-methods"
+  }]
+}
+!*/
+/*!
+{
+  "name": "cssall",
+  "property": "cssall",
+  "notes": [{
+    "name": "Spec",
+    "href": "https://drafts.csswg.org/css-cascade/#all-shorthand"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Animations",
+  "property": "cssanimations",
+  "caniuse": "css-animation",
+  "polyfills": ["transformie", "csssandpaper"],
+  "tags": ["css"],
+  "warnings": ["Android < 4 will pass this test, but can only animate a single property at a time"],
+  "notes": [{
+    "name": "Article: 'Dispelling the Android CSS animation myths'",
+    "href": "https://web.archive.org/web/20180602074607/https://daneden.me/2011/12/14/putting-up-with-androids-bullshit/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Appearance",
+  "property": "appearance",
+  "caniuse": "css-appearance",
+  "tags": ["css"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-appearance"
+  }, {
+    "name": "CSS-Tricks CSS Almanac: appearance",
+    "href": "https://css-tricks.com/almanac/properties/a/appearance/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "aspectratio css property",
+  "property": "aspectratio",
+  "tags": ["css aspectratio", "aspect-ratio"],
+  "builderAliases": ["aspectratio"],
+  "caniuse":"mdn-css_properties_aspect-ratio",
+  "authors": ["Debadutta Panda"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/aspect-ratio"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Backdrop Filter",
+  "property": "backdropfilter",
+  "authors": ["Brian Seward"],
+  "tags": ["css"],
+  "caniuse": "css-backdrop-filter",
+  "notes": [{
+    "name": "W3C Editor’s Draft Spec",
+    "href": "https://drafts.fxtf.org/filters-2/#BackdropFilterProperty"
+  }, {
+    "name": "WebKit Blog introduction + Demo",
+    "href": "https://www.webkit.org/blog/3632/introducing-backdrop-filters/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Background Blend Mode",
+  "property": "backgroundblendmode",
+  "caniuse": "css-backgroundblendmode",
+  "tags": ["css"],
+  "notes": [{
+    "name": "CSS Blend Modes could be the next big thing in Web Design",
+    "href": "https://medium.com/@bennettfeely/css-blend-modes-could-be-the-next-big-thing-in-web-design-6b51bf53743a"
+  }, {
+    "name": "Demo",
+    "href": "https://bennettfeely.com/gradients/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Background Clip Text",
+  "property": "backgroundcliptext",
+  "authors": ["ausi"],
+  "tags": ["css"],
+  "notes": [{
+    "name": "CSS Tricks Article",
+    "href": "https://css-tricks.com/image-under-text/"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/background-clip"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/199"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Background Position Shorthand",
+  "property": "bgpositionshorthand",
+  "caniuse": "css-background-offsets",
+  "tags": ["css"],
+  "builderAliases": ["css_backgroundposition_shorthand"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/CSS/background-position"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-background/#background-position"
+  }, {
+    "name": "Demo",
+    "href": "https://jsfiddle.net/Blink/bBXvt/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Background Position XY",
+  "property": "bgpositionxy",
+  "tags": ["css"],
+  "builderAliases": ["css_backgroundposition_xy"],
+  "authors": ["Allan Lei", "Brandom Aaron"],
+  "notes": [{
+    "name": "Demo",
+    "href": "https://jsfiddle.net/allanlei/R8AYS/"
+  }, {
+    "name": "Adapted From",
+    "href": "https://github.com/brandonaaron/jquery-cssHooks/blob/master/bgpos.js"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Background Repeat",
+  "property": ["bgrepeatspace", "bgrepeatround"],
+  "tags": ["css"],
+  "builderAliases": ["css_backgroundrepeat"],
+  "authors": ["Ryan Seddon"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/background-repeat"
+  }, {
+    "name": "Test Page",
+    "href": "https://jsbin.com/uzesun/"
+  }, {
+    "name": "Demo",
+    "href": "https://jsfiddle.net/ryanseddon/yMLTQ/6/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Background Size",
+  "property": "backgroundsize",
+  "tags": ["css"],
+  "knownBugs": ["This will false positive in Opera Mini - https://github.com/Modernizr/Modernizr/issues/396"],
+  "notes": [{
+    "name": "Related Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/396"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Background Size Cover",
+  "property": "bgsizecover",
+  "tags": ["css"],
+  "builderAliases": ["css_backgroundsizecover"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/CSS/background-size"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Border Image",
+  "property": "borderimage",
+  "caniuse": "border-image",
+  "polyfills": ["css3pie"],
+  "knownBugs": ["Android < 2.0 is true, but has a broken implementation"],
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "Border Radius",
+  "property": "borderradius",
+  "caniuse": "border-radius",
+  "polyfills": ["css3pie"],
+  "tags": ["css"],
+  "notes": [{
+    "name": "Comprehensive Compat Chart",
+    "href": "https://muddledramblings.com/table-of-css3-border-radius-compliance"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Box Decoration Break",
+  "property": "boxdecorationbreak",
+  "caniuse": "css-boxdecorationbreak",
+  "tags": ["css"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/box-decoration-break"
+  }, {
+    "name": "Demo",
+    "href": "https://jsbin.com/xojoro/edit?css,output"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Box Shadow",
+  "property": "boxshadow",
+  "caniuse": "css-boxshadow",
+  "tags": ["css"],
+  "knownBugs": [
+    "WebOS false positives on this test.",
+    "The Kindle Silk browser false positives"
+  ]
+}
+!*/
+/*!
+{
+  "name": "Box Sizing",
+  "property": "boxsizing",
+  "caniuse": "css3-boxsizing",
+  "polyfills": ["borderboxmodel", "boxsizingpolyfill", "borderbox"],
+  "tags": ["css"],
+  "builderAliases": ["css_boxsizing"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/box-sizing"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/248"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Calc",
+  "property": "csscalc",
+  "caniuse": "calc",
+  "tags": ["css"],
+  "builderAliases": ["css_calc"],
+  "authors": ["@calvein"]
+}
+!*/
+/*!
+{
+  "name": "CSS :checked pseudo-selector",
+  "caniuse": "css-sel3",
+  "property": "checked",
+  "tags": ["css"],
+  "notes": [{
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/pull/879"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Font ch Units",
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "property": "csschunit",
+  "caniuse": "ch-unit",
+  "tags": ["css"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-values/#font-relative-lengths"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Columns",
+  "property": "csscolumns",
+  "caniuse": "multicolumn",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Grid (old & new)",
+  "property": ["cssgrid", "cssgridlegacy"],
+  "authors": ["Faruk Ates"],
+  "tags": ["css"],
+  "notes": [{
+    "name": "The new, standardized CSS Grid",
+    "href": "https://www.w3.org/TR/css3-grid-layout/"
+  }, {
+    "name": "The _old_ CSS Grid (legacy)",
+    "href": "https://www.w3.org/TR/2011/WD-css3-grid-layout-20110407/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Cubic Bezier Range",
+  "property": "cubicbezierrange",
+  "tags": ["css"],
+  "builderAliases": ["css_cubicbezierrange"],
+  "authors": ["@calvein"],
+  "warnings": ["In old versions (pre-2013) cubic-bezier values can't be > 1 due to Webkit [bug #45761](https://bugs.webkit.org/show_bug.cgi?id=45761)"],
+  "notes": [{
+    "name": "Comprehensive Compat Chart",
+    "href": "https://muddledramblings.com/table-of-css3-border-radius-compliance/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Custom Properties",
+  "property": "customproperties",
+  "caniuse": "css-variables",
+  "tags": ["css"],
+  "builderAliases": ["css_customproperties"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/--*"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://drafts.csswg.org/css-variables/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Display run-in",
+  "property": "display-runin",
+  "authors": ["alanhogan"],
+  "tags": ["css"],
+  "builderAliases": ["css_displayrunin"],
+  "notes": [{
+    "name": "CSS Tricks Article",
+    "href": "https://web.archive.org/web/20111204150927/http://css-tricks.com:80/596-run-in/"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/198"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Display table",
+  "property": "displaytable",
+  "caniuse": "css-table",
+  "authors": ["scottjehl"],
+  "tags": ["css"],
+  "builderAliases": ["css_displaytable"],
+  "notes": [{
+    "name": "Detects for all additional table display values",
+    "href": "https://pastebin.com/Gk9PeVaQ"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS text-overflow ellipsis",
+  "property": "ellipsis",
+  "caniuse": "text-overflow",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS.escape()",
+  "property": "cssescape",
+  "polyfills": ["css-escape"],
+  "tags": ["css", "cssom"]
+}
+!*/
+/*!
+{
+  "name": "CSS Font ex Units",
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "property": "cssexunit",
+  "caniuse": "mdn-css_types_length_ex",
+  "tags": ["css"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-values/#font-relative-lengths"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Supports",
+  "property": "supports",
+  "caniuse": "css-featurequeries",
+  "tags": ["css"],
+  "builderAliases": ["css_supports"],
+  "notes": [{
+    "name": "W3C Spec (The @supports rule)",
+    "href": "https://dev.w3.org/csswg/css3-conditional/#at-supports"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/648"
+  }, {
+    "name": "W3C Spec (The CSSSupportsRule interface)",
+    "href": "https://dev.w3.org/csswg/css3-conditional/#the-csssupportsrule-interface"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Filters",
+  "property": "cssfilters",
+  "caniuse": "css-filters",
+  "polyfills": ["polyfilter"],
+  "tags": ["css"],
+  "builderAliases": ["css_filters"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/filter"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Flexbox",
+  "property": "flexbox",
+  "caniuse": "flexbox",
+  "tags": ["css"],
+  "notes": [{
+    "name": "The _new_ flexbox",
+    "href": "https://www.w3.org/TR/css-flexbox-1/"
+  }],
+  "warnings": [
+    "A `true` result for this detect does not imply that the `flex-wrap` property is supported; see the `flexwrap` detect."
+  ]
+}
+!*/
+/*!
+{
+  "name": "Flexbox (legacy)",
+  "property": "flexboxlegacy",
+  "tags": ["css"],
+  "polyfills": ["flexie"],
+  "notes": [{
+    "name": "The _old_ flexbox",
+    "href": "https://www.w3.org/TR/2009/WD-css3-flexbox-20090723/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Flexbox (tweener)",
+  "property": "flexboxtweener",
+  "tags": ["css"],
+  "polyfills": ["flexie"],
+  "notes": [{
+    "name": "The _inbetween_ flexbox",
+    "href": "https://www.w3.org/TR/2011/WD-css3-flexbox-20111129/"
+  }],
+  "warnings": ["This represents an old syntax, not the latest standard syntax."]
+}
+!*/
+/*!
+{
+  "name": "Flex Gap",
+  "property": "flexgap",
+  "caniuse": "flexbox-gap",
+  "tags": ["css", "flexbox"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css-align-3/#gaps"
+  }],
+  "authors": ["Chris Smith (@chris13524)"]
+}
+!*/
+/*!
+{
+  "name": "Flex Line Wrapping",
+  "property": "flexwrap",
+  "tags": ["css", "flexbox"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css-flexbox-1/"
+  }],
+  "warnings": [
+    "Does not imply a modern implementation – see documentation."
+  ]
+}
+!*/
+/*!
+{
+  "name": "CSS :focus-visible pseudo-selector",
+  "caniuse": "css-focus-visible",
+  "property": "focusvisible",  
+  "authors": ["@esaborit4code"],
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS :focus-within pseudo-selector",
+  "caniuse": "css-focus-within",
+  "property": "focuswithin",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "Font Display",
+  "property": "fontdisplay",
+  "authors": ["Patrick Kettner"],
+  "caniuse": "css-font-rendering-controls",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://drafts.csswg.org/css-fonts-4/#font-display-desc"
+  }, {
+    "name": "`font-display` for the masses",
+    "href": "https://css-tricks.com/font-display-masses/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "@font-face",
+  "property": "fontface",
+  "authors": ["Diego Perini", "Mat Marquis"],
+  "tags": ["css"],
+  "knownBugs": [
+    "False Positive: WebOS https://github.com/Modernizr/Modernizr/issues/342",
+    "False Positive: WP7 https://github.com/Modernizr/Modernizr/issues/538"
+  ],
+  "notes": [{
+    "name": "@font-face detection routine by Diego Perini",
+    "href": "http://javascript.nwbox.com/CSSSupport/"
+  }, {
+    "name": "Filament Group @font-face compatibility research",
+    "href": "https://docs.google.com/presentation/d/1n4NyG4uPRjAA8zn_pSQ_Ket0RhcWC6QlZ6LMjKeECo0/edit#slide=id.p"
+  }, {
+    "name": "Filament Grunticon/@font-face device testing results",
+    "href": "https://docs.google.com/spreadsheet/ccc?key=0Ag5_yGvxpINRdHFYeUJPNnZMWUZKR2ItMEpRTXZPdUE#gid=0"
+  }, {
+    "name": "CSS fonts on Android",
+    "href": "https://stackoverflow.com/questions/3200069/css-fonts-on-android"
+  }, {
+    "name": "@font-face and Android",
+    "href": "http://archivist.incutio.com/viewlist/css-discuss/115960"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Generated Content",
+  "property": "generatedcontent",
+  "tags": ["css"],
+  "warnings": ["Android may not return correct height for anything below 7px in old versions #738"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-selectors/#gen-content"
+  }, {
+    "name": "MDN Docs on :before",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/::before"
+  }, {
+    "name": "MDN Docs on :after",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/::after"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Gradients",
+  "caniuse": "css-gradients",
+  "property": "cssgradients",
+  "tags": ["css"],
+  "knownBugs": ["False-positives on webOS (https://github.com/Modernizr/Modernizr/issues/202)"],
+  "notes": [{
+    "name": "Webkit Gradient Syntax",
+    "href": "https://webkit.org/blog/175/introducing-css-gradients/"
+  }, {
+    "name": "Linear Gradient Syntax",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/linear-gradient"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://drafts.csswg.org/css-images-3/#gradients"
+  }]
+}
+!*/
+/*! {
+  "name": "CSS Hairline",
+  "property": "hairline",
+  "tags": ["css"],
+  "authors": ["strarsis"],
+  "notes": [{
+    "name": "Blog post about CSS retina hairlines",
+    "href": "http://dieulot.net/css-retina-hairline"
+  }, {
+    "name": "Derived from",
+    "href": "https://gist.github.com/dieulot/520a49463f6058fbc8d1"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS HSLA Colors",
+  "caniuse": "css3-colors",
+  "property": "hsla",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Hyphens",
+  "caniuse": "css-hyphens",
+  "property": ["csshyphens", "softhyphens", "softhyphensfind"],
+  "tags": ["css"],
+  "builderAliases": ["css_hyphens"],
+  "async": true,
+  "authors": ["David Newton"],
+  "warnings": [
+    "These tests currently require document.body to be present",
+    "If loading Hyphenator.js via yepnope, be cautious of issue 158: https://github.com/mnater/hyphenator/issues/158",
+    "This is very large – only include it if you absolutely need it"
+  ],
+  "notes": [{
+    "name": "The Current State of Hyphenation on the Web.",
+    "href": "https://davidnewton.ca/the-current-state-of-hyphenation-on-the-web"
+  }, {
+    "name": "Hyphenation Test Page",
+    "href": "https://web.archive.org/web/20150319125549/http://davidnewton.ca/demos/hyphenation/test.html"
+  }, {
+    "name": "Hyphenation is Language Specific",
+    "href": "https://code.google.com/p/hyphenator/source/diff?spec=svn975&r=975&format=side&path=/trunk/Hyphenator.js#sc_svn975_313"
+  }, {
+    "name": "Related Modernizr Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/312"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS :invalid pseudo-class",
+  "property": "cssinvalid",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/:invalid"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS :last-child pseudo-selector",
+  "caniuse": "css-sel3",
+  "property": "lastchild",
+  "tags": ["css"],
+  "builderAliases": ["css_lastchild"],
+  "notes": [{
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/pull/304"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Mask",
+  "caniuse": "css-masks",
+  "property": "cssmask",
+  "tags": ["css"],
+  "builderAliases": ["css_mask"],
+  "notes": [{
+    "name": "Webkit blog on CSS Masks",
+    "href": "https://webkit.org/blog/181/css-masks/"
+  }, {
+    "name": "Safari Docs",
+    "href": "https://developer.apple.com/library/archive/documentation/InternetWeb/Conceptual/SafariVisualEffectsProgGuide/Masks/Masks.html"
+  }, {
+    "name": "CSS SVG mask",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/mask"
+  }, {
+    "name": "Combine with clippaths for awesomeness",
+    "href": "https://web.archive.org/web/20150508193041/http://generic.cx:80/for/webkit/test.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Media Queries",
+  "caniuse": "css-mediaqueries",
+  "property": "mediaqueries",
+  "tags": ["css"],
+  "builderAliases": ["css_mediaqueries"]
+}
+!*/
+/*!
+{
+  "name": "CSS Multiple Backgrounds",
+  "caniuse": "multibackgrounds",
+  "property": "multiplebgs",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS :nth-child pseudo-selector",
+  "caniuse": "css-sel3",
+  "property": "nthchild",
+  "tags": ["css"],
+  "notes": [{
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/pull/685"
+  }, {
+    "name": "Sitepoint :nth-child documentation",
+    "href": "https://www.sitepoint.com/atoz-css-screencast-nth-child/"
+  }],
+  "authors": ["@emilchristensen"],
+  "knownBugs": ["Known false negative in Safari 3.1 and Safari 3.2.2"]
+}
+!*/
+/*!
+{
+  "name": "CSS Object Fit",
+  "caniuse": "object-fit",
+  "property": "objectfit",
+  "tags": ["css"],
+  "builderAliases": ["css_objectfit"],
+  "notes": [{
+    "name": "Opera Article on Object Fit",
+    "href": "https://dev.opera.com/articles/css3-object-fit-object-position/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Opacity",
+  "caniuse": "css-opacity",
+  "property": "opacity",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Overflow Scrolling",
+  "property": "overflowscrolling",
+  "tags": ["css"],
+  "builderAliases": ["css_overflow_scrolling"],
+  "notes": [{
+    "name": "Article on iOS overflow scrolling",
+    "href": "https://css-tricks.com/snippets/css/momentum-scrolling-on-ios-overflow-elements/"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-overflow-scrolling"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Pointer Events",
+  "caniuse": "pointer-events",
+  "property": "csspointerevents",
+  "authors": ["ausi"],
+  "tags": ["css"],
+  "builderAliases": ["css_pointerevents"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/pointer-events"
+  }, {
+    "name": "Test Project Page",
+    "href": "https://ausi.github.com/Feature-detection-technique-for-pointer-events/"
+  }, {
+    "name": "Test Project Wiki",
+    "href": "https://github.com/ausi/Feature-detection-technique-for-pointer-events/wiki"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/80"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS position: sticky",
+  "property": "csspositionsticky",
+  "tags": ["css"],
+  "builderAliases": ["css_positionsticky"],
+  "notes": [{
+    "name": "Chrome bug report",
+    "href": "https://bugs.chromium.org/p/chromium/issues/detail?id=322972"
+  }],
+  "warnings": ["using position:sticky on anything but top aligned elements is buggy in Chrome < 37 and iOS <=7+"]
+}
+!*/
+/*!
+{
+  "name": "CSS Generated Content Animations",
+  "property": "csspseudoanimations",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Transitions",
+  "property": "csstransitions",
+  "caniuse": "css-transitions",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Generated Content Transitions",
+  "property": "csspseudotransitions",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Reflections",
+  "caniuse": "css-reflections",
+  "property": "cssreflections",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Regions",
+  "caniuse": "css-regions",
+  "authors": ["Mihai Balan"],
+  "property": "regions",
+  "tags": ["css"],
+  "builderAliases": ["css_regions"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-regions/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Font rem Units",
+  "caniuse": "rem",
+  "authors": ["nsfmc"],
+  "property": "cssremunit",
+  "tags": ["css"],
+  "builderAliases": ["css_remunit"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-values/#relative0"
+  }, {
+    "name": "Font Size with rem by Jonathan Snook",
+    "href": "https://snook.ca/archives/html_and_css/font-size-with-rem"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS UI Resize",
+  "property": "cssresize",
+  "caniuse": "css-resize",
+  "tags": ["css"],
+  "builderAliases": ["css_resize"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-ui/#resize"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/CSS/resize"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS rgba",
+  "caniuse": "css3-colors",
+  "property": "rgba",
+  "tags": ["css"],
+  "notes": [{
+    "name": "CSSTricks Tutorial",
+    "href": "https://css-tricks.com/rgba-browser-support/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Stylable Scrollbars",
+  "property": "cssscrollbar",
+  "tags": ["css"],
+  "builderAliases": ["css_scrollbars"]
+}
+!*/
+/*!
+{
+  "name": "Scroll Snap Points",
+  "property": "scrollsnappoints",
+  "caniuse": "css-snappoints",
+  "notes": [{
+    "name": "Setting native-like scrolling offsets in CSS with Scrolling Snap Points",
+    "href": "http://generatedcontent.org/post/66817675443/setting-native-like-scrolling-offsets-in-css-with"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Scroll_Snap_Points"
+  }],
+  "polyfills": ["scrollsnap"]
+}
+!*/
+/*!
+{
+  "name": "CSS Shapes",
+  "property": "shapes",
+  "tags": ["css"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css-shapes"
+  }, {
+    "name": "Examples from Adobe",
+    "href": "https://web.archive.org/web/20171230010236/http://webplatform.adobe.com:80/shapes"
+  }, {
+    "name": "Examples from CSS-Tricks",
+    "href": "https://css-tricks.com/examples/ShapesOfCSS/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS general sibling selector",
+  "caniuse": "css-sel3",
+  "property": "siblinggeneral",
+  "tags": ["css"],
+  "notes": [{
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/pull/889"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Subpixel Fonts",
+  "property": "subpixelfont",
+  "tags": ["css"],
+  "builderAliases": ["css_subpixelfont"],
+  "authors": ["@derSchepp", "@gerritvanaaken", "@rodneyrehm", "@yatil", "@ryanseddon"],
+  "notes": [{
+    "name": "Origin Test",
+    "href": "https://github.com/gerritvanaaken/subpixeldetect"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS :target pseudo-class",
+  "caniuse": "css-sel3",
+  "property": "target",
+  "tags": ["css"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/:target"
+  }],
+  "authors": ["@zachleat"],
+  "warnings": ["Opera Mini supports :target but doesn't update the hash for anchor links."]
+}
+!*/
+/*!
+{
+  "name": "CSS text-align-last",
+  "property": "textalignlast",
+  "caniuse": "css-text-align-last",
+  "tags": ["css"],
+  "warnings": ["IE does not support the 'start' or 'end' values."],
+  "notes": [{
+    "name": "Quirksmode",
+    "href": "https://www.quirksmode.org/css/text/textalignlast.html"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/text-align-last"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS textDecoration",
+  "property": "textdecoration",
+  "caniuse": "text-decoration",
+  "tags": ["css"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css-text-decor-3/#line-decoration"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS textshadow",
+  "property": "textshadow",
+  "caniuse": "css-textshadow",
+  "tags": ["css"],
+  "knownBugs": ["FF3.0 will false positive on this test"]
+}
+!*/
+/*!
+{
+  "name": "CSS Transforms",
+  "property": "csstransforms",
+  "caniuse": "transforms2d",
+  "tags": ["css"]
+}
+!*/
+/*!
+{
+  "name": "CSS Transforms 3D",
+  "property": "csstransforms3d",
+  "caniuse": "transforms3d",
+  "tags": ["css"],
+  "knownBugs": [
+    "Chrome may occasionally fail this test on some systems; more info: https://bugs.chromium.org/p/chromium/issues/detail?id=129004, however, the issue has since been closed (marked as fixed)."
+  ]
+}
+!*/
+/*!
+{
+  "name": "CSS Transforms Level 2",
+  "property": "csstransformslevel2",
+  "authors": ["rupl"],
+  "tags": ["css"],
+  "notes": [{
+    "name": "CSSWG Draft Spec",
+    "href": "https://drafts.csswg.org/css-transforms-2/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS Transform Style preserve-3d",
+  "property": "preserve3d",
+  "authors": ["denyskoch", "aFarkas"],
+  "tags": ["css"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/transform-style"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/1748"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS user-select",
+  "property": "userselect",
+  "caniuse": "user-select-none",
+  "authors": ["ryan seddon"],
+  "tags": ["css"],
+  "builderAliases": ["css_userselect"],
+  "notes": [{
+    "name": "Related Modernizr Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/250"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS :valid pseudo-class",
+  "property": "cssvalid",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/CSS/:valid"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Variable Open Type Fonts",
+  "property": "variablefonts",
+  "authors": ["Patrick Kettner"],
+  "tags": ["css"],
+  "notes": [{
+    "name": "Variable fonts on the web",
+    "href": "https://webkit.org/blog/7051/variable-fonts-on-the-web/"
+  }, {
+    "name": "Variable fonts for responsive design",
+    "href": "https://alistapart.com/blog/post/variable-fonts-for-responsive-design"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS vh unit",
+  "property": "cssvhunit",
+  "caniuse": "viewport-units",
+  "tags": ["css"],
+  "builderAliases": ["css_vhunit"],
+  "notes": [{
+    "name": "Related Modernizr Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/572"
+  }, {
+    "name": "Similar JSFiddle",
+    "href": "https://jsfiddle.net/FWeinb/etnYC/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS vmax unit",
+  "property": "cssvmaxunit",
+  "caniuse": "viewport-units",
+  "tags": ["css"],
+  "builderAliases": ["css_vmaxunit"],
+  "notes": [{
+    "name": "Related Modernizr Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/572"
+  }, {
+    "name": "JSFiddle Example",
+    "href": "https://jsfiddle.net/glsee/JDsWQ/4/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS vmin unit",
+  "property": "cssvminunit",
+  "caniuse": "viewport-units",
+  "tags": ["css"],
+  "builderAliases": ["css_vminunit"],
+  "notes": [{
+    "name": "Related Modernizr Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/572"
+  }, {
+    "name": "JSFiddle Example",
+    "href": "https://jsfiddle.net/glsee/JRmdq/8/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS vw unit",
+  "property": "cssvwunit",
+  "caniuse": "viewport-units",
+  "tags": ["css"],
+  "builderAliases": ["css_vwunit"],
+  "notes": [{
+    "name": "Related Modernizr Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/572"
+  }, {
+    "name": "JSFiddle Example",
+    "href": "https://jsfiddle.net/FWeinb/etnYC/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "will-change",
+  "property": "willchange",
+  "caniuse": "will-change",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://drafts.csswg.org/css-will-change/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "CSS wrap-flow",
+  "property": "wrapflow",
+  "tags": ["css"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/css3-exclusions"
+  }, {
+    "name": "Example by Louie Rootfield",
+    "href": "https://webdesign.tutsplus.com/tutorials/css-exclusions--cms-28087"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Custom Elements API",
+  "property": "customelements",
+  "caniuse": "custom-elementsv1",
+  "tags": ["customelements"],
+  "polyfills": ["customelements"],
+  "notes": [{
+    "name": "Specs for Custom Elements",
+    "href": "https://www.w3.org/TR/custom-elements/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Custom protocol handler",
+  "property": "customprotocolhandler",
+  "authors": ["Ben Schwarz"],
+  "builderAliases": ["custom_protocol_handler"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/dev/system-state.html#custom-handlers"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/navigator.registerProtocolHandler"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Dart",
+  "property": "dart",
+  "authors": ["Theodoor van Donge"],
+  "notes": [{
+    "name": "Language website",
+    "href": "https://www.dartlang.org/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "DataView",
+  "property": "dataview",
+  "authors": ["Addy Osmani"],
+  "builderAliases": ["dataview_api"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/JavaScript_typed_arrays/DataView"
+  }],
+  "polyfills": ["jdataview"]
+}
+!*/
+/*!
+{
+  "name": "classList",
+  "caniuse": "classlist",
+  "property": "classlist",
+  "tags": ["dom"],
+  "builderAliases": ["dataview_api"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/DOM/element.classList"
+  }]
+}
+!*/
+/*!
+{
+  "name": "createElement with Attributes",
+  "property": ["createelementattrs", "createelement-attrs"],
+  "tags": ["dom"],
+  "builderAliases": ["dom_createElement_attrs"],
+  "authors": ["James A. Rosen"],
+  "notes": [{
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/258"
+  }]
+}
+!*/
+/*!
+{
+  "name": "dataset API",
+  "caniuse": "dataset",
+  "property": "dataset",
+  "tags": ["dom"],
+  "builderAliases": ["dom_dataset"],
+  "authors": ["@phiggins42"]
+}
+!*/
+/*!
+{
+  "name": "Document Fragment",
+  "property": "documentfragment",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-B63ED1A3"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/DocumentFragment"
+  }, {
+    "name": "QuirksMode Compatibility Tables",
+    "href": "https://www.quirksmode.org/m/w3c_core.html#t112"
+  }],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "knownBugs": ["false-positive on Blackberry 9500, see QuirksMode note"],
+  "tags": ["dom"]
+}
+!*/
+/*!
+{
+  "name": "[hidden] Attribute",
+  "property": "hidden",
+  "tags": ["dom"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/dev/interaction.html#the-hidden-attribute"
+  }, {
+    "name": "original implementation of detect code",
+    "href": "https://github.com/aFarkas/html5shiv/blob/bf4fcc4/src/html5shiv.js#L38"
+  }],
+  "polyfills": ["html5shiv"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"]
+}
+!*/
+/*!
+{
+  "name": "Intersection Observer",
+  "property": "intersectionobserver",
+  "caniuse": "intersectionobserver",
+  "tags": ["dom"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/IntersectionObserver/"
+  }, {
+    "name": "IntersectionObserver polyfill",
+    "href": "https://github.com/w3c/IntersectionObserver/tree/master/polyfill"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/docs/Web/API/Intersection_Observer_API"
+  }]
+}
+!*/
+/*!
+{
+  "name": "microdata",
+  "property": "microdata",
+  "tags": ["dom"],
+  "builderAliases": ["dom_microdata"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/microdata/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "DOM4 MutationObserver",
+  "property": "mutationobserver",
+  "caniuse": "mutationobserver",
+  "tags": ["dom"],
+  "authors": ["Karel Sedláček (@ksdlck)"],
+  "polyfills": ["mutationobservers"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/MutationObserver"
+  }]
+}
+!*/
+/*!
+{
+  "property": "passiveeventlisteners",
+  "caniuse": "passive-event-listener",
+  "tags": ["dom"],
+  "authors": ["Rick Byers"],
+  "name": "Passive event listeners",
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://dom.spec.whatwg.org/#dom-addeventlisteneroptions-passive"
+  }, {
+    "name": "WICG explainer",
+    "href": "https://github.com/WICG/EventListenerOptions/blob/gh-pages/explainer.md"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Shadow DOM API",
+  "property": "shadowroot",
+  "caniuse": "shadowdomv1",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/ShadowRoot"
+  }],
+  "authors": ["Kevin Coyle (@kevin-coyle-unipro)", "Pascal Lim (@pascalim)"],
+  "tags": ["dom"]
+}
+!*/
+/*!
+{
+  "name": "Shadow DOM API (Legacy)",
+  "property": "shadowrootlegacy",
+  "caniuse": "shadowdom",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Element/createShadowRoot"
+  }],
+  "authors": ["Kevin Coyle (@kevin-coyle-unipro)", "Pascal Lim (@pascalim)"],
+  "tags": ["dom"]
+}
+!*/
+/*!
+{
+  "name": "bdi Element",
+  "property": "bdi",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/bdi"
+  }]
+}
+!*/
+/*!
+{
+  "name": "details Element",
+  "caniuse": "details",
+  "property": "details",
+  "tags": ["elem"],
+  "builderAliases": ["elem_details"],
+  "authors": ["@mathias"],
+  "notes": [{
+    "name": "Mathias' Original",
+    "href": "https://mathiasbynens.be/notes/html5-details-jquery#comment-35"
+  }]
+}
+!*/
+/*!
+{
+  "name": "output Element",
+  "property": "outputelem",
+  "tags": ["elem"],
+  "builderAliases": ["elem_output"],
+  "notes": [{
+    "name": "WhatWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/form-elements.html#the-output-element"
+  }]
+}
+!*/
+/*!
+{
+  "name": "picture Element",
+  "property": "picture",
+  "tags": ["elem"],
+  "authors": ["Scott Jehl", "Mat Marquis"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/embedded-content.html#embedded-content"
+  }, {
+    "name": "Relevant spec issue",
+    "href": "https://github.com/ResponsiveImagesCG/picture-element/issues/87"
+  }]
+}
+!*/
+/*!
+{
+  "name": "progress Element",
+  "caniuse": "progress",
+  "property": ["progressbar", "meter"],
+  "tags": ["elem"],
+  "builderAliases": ["elem_progress_meter"],
+  "authors": ["Stefan Wallin"]
+}
+!*/
+/*!
+{
+  "name": "ruby, rp, rt Elements",
+  "caniuse": "ruby",
+  "property": "ruby",
+  "tags": ["elem"],
+  "builderAliases": ["elem_ruby"],
+  "authors": ["Cătălin Mariș"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/text-level-semantics.html#the-ruby-element"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Template Tag",
+  "property": "template",
+  "caniuse": "template",
+  "tags": ["elem"],
+  "notes": [{
+    "name": "HTML5Rocks Article",
+    "href": "https://www.html5rocks.com/en/tutorials/webcomponents/template/"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://web.archive.org/web/20171130222649/http://www.w3.org/TR/html5/scripting-1.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "time Element",
+  "property": "time",
+  "tags": ["elem"],
+  "builderAliases": ["elem_time"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/text-level-semantics.html#the-time-element"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Track element and Timed Text Track",
+  "property": ["texttrackapi", "track"],
+  "tags": ["elem"],
+  "builderAliases": ["elem_track"],
+  "authors": ["Addy Osmani"],
+  "notes": [{
+    "name": "W3C Spec (Track Element)",
+    "href": "https://web.archive.org/web/20121119095019/http://www.w3.org/TR/html5/the-track-element.html#the-track-element"
+  }, {
+    "name": "W3C Spec (Track API)",
+    "href": "https://web.archive.org/web/20121119094620/http://www.w3.org/TR/html5/media-elements.html#text-track-api"
+  }],
+  "warnings": ["While IE10 has implemented the track element, IE10 does not expose the underlying APIs to create timed text tracks by JS (really sad)"]
+}
+!*/
+/*!
+{
+  "name": "Unknown Elements",
+  "property": "unknownelements",
+  "tags": ["elem"],
+  "notes": [{
+    "name": "The Story of the HTML5 Shiv",
+    "href": "https://www.paulirish.com/2011/the-history-of-the-html5-shiv/"
+  }, {
+    "name": "original implementation of detect code",
+    "href": "https://github.com/aFarkas/html5shiv/blob/bf4fcc4/src/html5shiv.js#L36"
+  }],
+  "polyfills": ["html5shiv"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"]
+}
+!*/
+/*!
+{
+  "name": "Emoji",
+  "property": "emoji"
+}
+!*/
+/*!
+{
+  "name": "ES5 Array",
+  "property": "es5array",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "polyfills": ["es5shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES5 Date",
+  "property": "es5date",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "polyfills": ["es5shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES5 Function",
+  "property": "es5function",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "polyfills": ["es5shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES5 Object",
+  "property": "es5object",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "polyfills": ["es5shim", "es5sham"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES5 Strict Mode",
+  "property": "strictmode",
+  "caniuse": "use-strict",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "authors": ["@kangax"],
+  "tags": ["es5"],
+  "builderAliases": ["es5_strictmode"]
+}
+!*/
+/*!
+{
+  "name": "ES5 String",
+  "property": "es5string",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "polyfills": ["es5shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "JSON",
+  "property": "json",
+  "caniuse": "json",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Glossary/JSON"
+  }],
+  "polyfills": ["json2"]
+}
+!*/
+/*!
+{
+  "name": "ES5 Syntax",
+  "property": "es5syntax",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }, {
+    "name": "original implementation of detect code",
+    "href": "https://kangax.github.io/compat-table/es5/"
+  }],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "warnings": ["This detect uses `eval()`, so CSP may be a problem."],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES5 Immutable Undefined",
+  "property": "es5undefined",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }, {
+    "name": "original implementation of detect code",
+    "href": "https://kangax.github.io/compat-table/es5/"
+  }],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES5",
+  "property": "es5",
+  "caniuse": "es5",
+  "notes": [{
+    "name": "ECMAScript 5.1 Language Specification",
+    "href": "https://www.ecma-international.org/ecma-262/5.1/"
+  }],
+  "polyfills": ["es5shim", "es5sham"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es5"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Array",
+  "property": "es6array",
+  "notes": [{
+    "name": "ECMAScript 6 specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/index.html"
+  }, {
+    "name": "Last ECMAScript specification",
+    "href": "https://www.ecma-international.org/ecma-262/index.html"
+  }],
+  "polyfills": ["es6shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Arrow Functions",
+  "property": "arrow",
+  "authors": ["Vincent Riemer"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Class",
+  "property": "es6class",
+  "notes": [{
+    "name": "ECMAScript 6 language specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/#sec-class-definitions"
+  }],
+  "caniuse": "es6-class",
+  "authors": ["dabretin"],
+  "tags": ["es6"],
+  "builderAliases": ["class"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Collections",
+  "property": "es6collections",
+  "notes": [{
+    "name": "ECMAScript 6 specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/index.html"
+  }, {
+    "name": "Last ECMAScript specification",
+    "href": "https://www.ecma-international.org/ecma-262/index.html"
+  }],
+  "polyfills": ["es6shim", "weakmap"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Generators",
+  "property": "generators",
+  "authors": ["Michael Kachanovskyi"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Math",
+  "property": "es6math",
+  "notes": [{
+    "name": "ECMAScript 6 specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/index.html"
+  }, {
+    "name": "Last ECMAScript specification",
+    "href": "https://www.ecma-international.org/ecma-262/index.html"
+  }],
+  "polyfills": ["es6shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Number",
+  "property": "es6number",
+  "notes": [{
+    "name": "ECMAScript 6 specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/index.html"
+  }, {
+    "name": "Last ECMAScript specification",
+    "href": "https://www.ecma-international.org/ecma-262/index.html"
+  }],
+  "polyfills": ["es6shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Object",
+  "property": "es6object",
+  "notes": [{
+    "name": "ECMAScript 6 specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/index.html"
+  }, {
+    "name": "Last ECMAScript specification",
+    "href": "https://www.ecma-international.org/ecma-262/index.html"
+  }],
+  "polyfills": ["es6shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Promises",
+  "property": "promises",
+  "caniuse": "promises",
+  "polyfills": ["es6promises"],
+  "authors": ["Krister Kari", "Jake Archibald"],
+  "tags": ["es6"],
+  "notes": [{
+    "name": "The ES6 promises spec",
+    "href": "https://github.com/domenic/promises-unwrapping"
+  }, {
+    "name": "Chromium dashboard - ES6 Promises",
+    "href": "https://www.chromestatus.com/features/5681726336532480"
+  }, {
+    "name": "JavaScript Promises: an Introduction",
+    "href": "https://developers.google.com/web/fundamentals/primers/promises/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "ES6 Rest parameters",
+  "property": "restparameters",
+  "notes": [{
+    "name": "ECMAScript 6 language specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/#sec-function-definitions"
+  }],
+  "caniuse": "rest",
+  "authors": ["dabretin"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Spread array",
+  "property": "spreadarray",
+  "notes": [{
+    "name": "ECMAScript Specification",
+    "href": "https://tc39.es/ecma262/#sec-array-initializer"
+  },
+  {
+    "name": "Article",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax"
+  }],
+  "caniuse": "mdn-javascript_operators_spread_spread_in_arrays",
+  "authors": ["dabretin"],
+  "warnings": ["not for object literals (implemented in ES7)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Template Strings",
+  "property": "stringtemplate",
+  "caniuse": "template-literals",
+  "builderAliases": ["templatestrings"],
+  "notes": [{
+    "name": "ECMAScript 6 draft specification",
+    "href": "https://tc39wiki.calculist.org/es6/template-strings/"
+  }],
+  "authors": ["dabretin"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 String",
+  "property": "es6string",
+  "notes": [{
+    "name": "ECMAScript 6 Specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/index.html"
+  }, {
+    "name": "Last ECMAScript Specification",
+    "href": "https://www.ecma-international.org/ecma-262/index.html"
+  }],
+  "polyfills": ["es6shim"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["es6"]
+}
+!*/
+/*!
+{
+  "name": "ES6 Symbol",
+  "property": "es6symbol",
+  "caniuse": "mdn-javascript_builtins_symbol",
+  "notes": [{
+    "name": "Official ECMAScript 6 specification",
+    "href": "https://www.ecma-international.org/ecma-262/6.0/#sec-symbol-constructor"
+  },{
+    "name": "MDN web docs",
+    "href": "https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Symbol"
+  }],
+  "polyfills": ["es6symbol"],
+  "authors": ["buhichan (@buhichan)"],
+  "tags": ["es6","symbol"]
+}
+!*/
+/*!
+{
+  "name": "ES7 Array",
+  "property": "es7array",
+  "notes": [{
+    "name": "ECMAScript array Specification",
+    "href": "https://tc39.es/ecma262/#sec-array.prototype.includes"
+  }],
+  "authors": ["dabretin"],
+  "tags": ["es7"]
+}
+!*/
+/*!
+{
+  "name": "ES7 Rest destructuring",
+  "property": ["restdestructuringarray", "restdestructuringobject"],
+  "caniuse" : "destructuring%20assignment",
+  "notes": [{
+    "name": "ECMAScript Destructuring Assignment Specification",
+    "href": "https://tc39.es/ecma262/#sec-destructuring-assignment"
+  }],
+  "authors": ["dabretin"],
+  "tags": ["es7"]
+}
+!*/
+/*!
+{
+  "name": "ES7 Spread object",
+  "property": "spreadobject",
+  "notes": [{
+    "name": "ECMAScript array Specification",
+    "href": "http://www.ecma-international.org/ecma-262/#sec-object-initializer"
+  }],
+  "authors": ["dabretin"],
+  "tags": ["es7"]
+}
+!*/
+/*!
+{
+  "name": "ES8 Object",
+  "property": "es8object",
+  "notes": [{
+    "name": "ECMAScript specification: Object.entries",
+    "href": "https://www.ecma-international.org/ecma-262/#sec-object.entries"
+  }, {
+    "name": "ECMAScript specification: Object.values",
+    "href": "https://www.ecma-international.org/ecma-262/#sec-object.values"
+  }],
+  "caniuse": "object-entries,object-values",
+  "authors": ["dabretin"],
+  "tags": ["es8"]
+}
+!*/
+/*!
+{
+  "name": "CustomEvent",
+  "property": "customevent",
+  "tags": ["customevent"],
+  "authors": ["Alberto Elias"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/DOM-Level-3-Events/#interface-CustomEvent"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/docs/Web/API/CustomEvent"
+  }],
+  "polyfills": ["eventlistener"]
+}
+!*/
+/*!
+{
+  "name": "Orientation and Motion Events",
+  "property": ["devicemotion", "deviceorientation"],
+  "caniuse": "deviceorientation",
+  "notes": [{
+    "name": "W3C Editor's Draft Spec",
+    "href": "https://w3c.github.io/deviceorientation/"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Detecting_device_orientation"
+  }],
+  "authors": ["Shi Chuan"],
+  "tags": ["event"],
+  "builderAliases": ["event_deviceorientation_motion"]
+}
+!*/
+/*!
+{
+  "name": "Event Listener",
+  "property": "eventlistener",
+  "caniuse": "addeventlistener",
+  "authors": ["Andrew Betts (@triblondon)"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-Registration-interfaces"
+  }],
+  "polyfills": ["eventlistener"]
+}
+!*/
+/*!
+{
+  "name": "Force Touch Events",
+  "property": "forcetouch",
+  "authors": ["Kraig Walker"],
+  "notes": [{
+    "name": "Responding to Force Touch Events from JavaScript",
+    "href": "https://developer.apple.com/library/archive/documentation/AppleApplications/Conceptual/SafariJSProgTopics/RespondingtoForceTouchEventsfromJavaScript.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Hashchange event",
+  "property": "hashchange",
+  "caniuse": "hashchange",
+  "tags": ["history"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onhashchange"
+  }],
+  "polyfills": [
+    "jquery-hashchange",
+    "moo-historymanager",
+    "jquery-ajaxy",
+    "hasher",
+    "shistory"
+  ]
+}
+!*/
+/*!
+{
+  "name": "onInput Event",
+  "property": "oninput",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers.oninput"
+  }, {
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/input.html#common-input-element-attributes"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/210"
+  }],
+  "authors": ["Patrick Kettner"],
+  "tags": ["event"]
+}
+!*/
+/*!
+{
+  "name": "DOM Pointer Events API",
+  "property": "pointerevents",
+  "caniuse": "pointer",
+  "tags": ["input"],
+  "authors": ["Stu Cox"],
+  "notes": [{
+    "name": "W3C Spec (Pointer Events)",
+    "href": "https://www.w3.org/TR/pointerevents/"
+  }, {
+    "name": "W3C Spec (Pointer Events Level 2)",
+    "href": "https://www.w3.org/TR/pointerevents2/"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/PointerEvent"
+  }],
+  "warnings": ["This property name now refers to W3C DOM PointerEvents: https://github.com/Modernizr/Modernizr/issues/548#issuecomment-12812099"],
+  "polyfills": ["pep"]
+}
+!*/
+/*!
+{
+  "name": "Proximity API",
+  "property": "proximity",
+  "authors": ["Cătălin Mariș"],
+  "tags": ["events", "proximity"],
+  "caniuse": "proximity",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Proximity_Events"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/proximity/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "File API",
+  "property": "filereader",
+  "caniuse": "fileapi",
+  "notes": [{
+    "name": "W3C Working Draft Spec",
+    "href": "https://www.w3.org/TR/FileAPI/"
+  }],
+  "tags": ["file"],
+  "builderAliases": ["file_api"],
+  "knownBugs": ["Will fail in Safari 5 due to its lack of support for the standards defined FileReader object"]
+}
+!*/
+/*!
+{
+  "name": "Filesystem API",
+  "property": "filesystem",
+  "caniuse": "filesystem",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/file-system-api/"
+  }],
+  "authors": ["Eric Bidelman (@ebidel)"],
+  "tags": ["file"],
+  "builderAliases": ["file_filesystem"],
+  "knownBugs": ["The API will be present in Chrome incognito, but will throw an exception. See crbug.com/93417"]
+}
+!*/
+/*!
+{
+  "name": "Flash",
+  "property": "flash",
+  "tags": ["flash"],
+  "polyfills": ["shumway"]
+}
+!*/
+/*!
+{
+  "name": "Fullscreen API",
+  "property": "fullscreen",
+  "caniuse": "fullscreen",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/API/Fullscreen"
+  }],
+  "polyfills": ["screenfulljs"],
+  "builderAliases": ["fullscreen_api"]
+}
+!*/
+/*!
+{
+  "name": "GamePad API",
+  "property": "gamepads",
+  "caniuse": "gamepad",
+  "authors": ["Eric Bidelman"],
+  "tags": ["media"],
+  "warnings": ["In new browsers it may return false in non-HTTPS connections"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/gamepad/"
+  }, {
+    "name": "HTML5 Rocks Tutorial",
+    "href": "https://www.html5rocks.com/en/tutorials/doodles/gamepad/#toc-featuredetect"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Geolocation API",
+  "property": "geolocation",
+  "caniuse": "geolocation",
+  "tags": ["media"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/WebAPI/Using_geolocation"
+  }],
+  "polyfills": [
+    "joshuabell-polyfill",
+    "webshims",
+    "geo-location-javascript",
+    "geolocation-api-polyfill"
+  ]
+}
+!*/
+/*!
+{
+  "name": "Hidden Scrollbar",
+  "property": "hiddenscroll",
+  "authors": ["Oleg Korsunsky"],
+  "tags": ["overlay"],
+  "notes": [{
+    "name": "Overlay Scrollbar description",
+    "href": "https://developer.apple.com/library/mac/releasenotes/MacOSX/WhatsNewInOSX/Articles/MacOSX10_7.html#//apple_ref/doc/uid/TP40010355-SW39"
+  }, {
+    "name": "Video example of overlay scrollbars",
+    "href": "https://gfycat.com/FoolishMeaslyAtlanticsharpnosepuffer"
+  }]
+}
+!*/
+/*!
+{
+  "name": "History API",
+  "property": "history",
+  "caniuse": "history",
+  "tags": ["history"],
+  "authors": ["Hay Kranen", "Alexander Farkas"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/html51/browsers.html#the-history-interface"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/window.history"
+  }],
+  "polyfills": ["historyjs", "html5historyapi"]
+}
+!*/
+/*!
+{
+  "name": "HTML Imports",
+  "property": "htmlimports",
+  "tags": ["html", "import"],
+  "polyfills": ["polymer-htmlimports"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/webcomponents/spec/imports/"
+  }, {
+    "name": "HTML Imports - #include for the web",
+    "href": "https://www.html5rocks.com/en/tutorials/webcomponents/imports/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "IE8 compat mode",
+  "property": "ie8compat",
+  "authors": ["Erich Ocean"]
+}
+!*/
+/*!
+{
+  "name": "iframe[sandbox] Attribute",
+  "property": "sandbox",
+  "caniuse": "iframe-sandbox",
+  "tags": ["iframe"],
+  "builderAliases": ["iframe_sandbox"],
+  "notes": [
+  {
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/embedded-content.html#attr-iframe-sandbox"
+  }],
+  "knownBugs": ["False-positive on Firefox < 29"]
+}
+!*/
+/*!
+{
+  "name": "iframe[seamless] Attribute",
+  "property": "seamless",
+  "tags": ["iframe"],
+  "builderAliases": ["iframe_seamless"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/embedded-content.html#attr-iframe-seamless"
+  }]
+}
+!*/
+/*!
+{
+  "name": "iframe[srcdoc] Attribute",
+  "property": "srcdoc",
+  "caniuse": "iframe-srcdoc",
+  "tags": ["iframe"],
+  "builderAliases": ["iframe_srcdoc"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/embedded-content.html#attr-iframe-srcdoc"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Animated PNG",
+  "async": true,
+  "property": "apng",
+  "caniuse": "apng",
+  "tags": ["image"],
+  "builderAliases": ["img_apng"],
+  "notes": [{
+    "name": "Wikipedia Article",
+    "href": "https://en.wikipedia.org/wiki/APNG"
+  }]
+}
+!*/
+/*!
+{
+  "name": "AVIF",
+  "async": true,
+  "property": "avif",
+  "caniuse": "avif",
+  "tags": ["image"],
+  "authors": ["Markel Ferro (@MarkelFe)"],
+  "polyfills": ["avifjs"],
+  "notes": [{
+    "name": "Avif Spec",
+    "href": "https://aomediacodec.github.io/av1-avif/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Image crossOrigin",
+  "property": "imgcrossorigin",
+  "tags": ["image"],
+  "notes": [{
+    "name": "Cross Domain Images and the Tainted Canvas",
+    "href": "https://blog.codepen.io/2013/10/08/cross-domain-images-tainted-canvas/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "EXIF Orientation",
+  "property": "exiforientation",
+  "tags": ["image"],
+  "builderAliases": ["exif_orientation"],
+  "async": true,
+  "authors": ["Paul Sayre"],
+  "notes": [{
+    "name": "Article by Dave Perrett",
+    "href": "https://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/"
+  }, {
+    "name": "Article by Calvin Hass",
+    "href": "https://www.impulseadventure.com/photo/exif-orientation.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "JPEG 2000",
+  "async": true,
+  "aliases": ["jpeg-2000", "jpg2"],
+  "property": "jpeg2000",
+  "caniuse": "jpeg2000",
+  "tags": ["image"],
+  "authors": ["@eric_wvgg"],
+  "notes": [{
+    "name": "Wikipedia Article",
+    "href": "https://en.wikipedia.org/wiki/JPEG_2000"
+  }]
+}
+!*/
+/*!
+{
+  "name": "JPEG XR (extended range)",
+  "async": true,
+  "aliases": ["jpeg-xr"],
+  "property": "jpegxr",
+  "tags": ["image"],
+  "notes": [{
+    "name": "Wikipedia Article",
+    "href": "https://en.wikipedia.org/wiki/JPEG_XR"
+  }]
+}
+!*/
+/*!
+{
+  "name": "image and iframe native lazy loading",
+  "property": "lazyloading",
+  "caniuse": "loading-lazy-attr",
+  "tags": ["image", "lazy", "loading"],
+  "notes": [{
+    "name": "Native image lazy-loading for the web",
+    "href": "https://addyosmani.com/blog/lazy-loading/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "sizes attribute",
+  "async": true,
+  "property": "sizes",
+  "tags": ["image"],
+  "authors": ["Mat Marquis"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element"
+  }, {
+    "name": "Srcset and sizes",
+    "href": "https://ericportis.com/posts/2014/srcset-sizes/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "srcset attribute",
+  "property": "srcset",
+  "caniuse": "srcset",
+  "tags": ["image"],
+  "notes": [{
+    "name": "Smashing Magazine Article",
+    "href": "https://www.smashingmagazine.com/2013/08/webkit-implements-srcset-and-why-its-a-good-thing/"
+  }, {
+    "name": "Generate multi-resolution images for srcset with Grunt",
+    "href": "https://addyosmani.com/blog/generate-multi-resolution-images-for-srcset-with-grunt/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Webp Alpha",
+  "async": true,
+  "property": "webpalpha",
+  "aliases": ["webp-alpha"],
+  "tags": ["image"],
+  "authors": ["Krister Kari", "Rich Bradshaw", "Ryan Seddon", "Paul Irish"],
+  "notes": [{
+    "name": "WebP Info",
+    "href": "https://developers.google.com/speed/webp/"
+  }, {
+    "name": "Article about WebP support",
+    "href": "https://optimus.keycdn.com/support/webp-support/"
+  }, {
+    "name": "Chromium WebP announcement",
+    "href": "https://blog.chromium.org/2011/11/lossless-and-transparency-encoding-in.html?m=1"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Webp Animation",
+  "async": true,
+  "property": "webpanimation",
+  "aliases": ["webp-animation"],
+  "tags": ["image"],
+  "authors": ["Krister Kari", "Rich Bradshaw", "Ryan Seddon", "Paul Irish"],
+  "notes": [{
+    "name": "WebP Info",
+    "href": "https://developers.google.com/speed/webp/"
+  }, {
+    "name": "Chromium blog - Chrome 32 Beta: Animated WebP images and faster Chrome for Android touch input",
+    "href": "https://blog.chromium.org/2013/11/chrome-32-beta-animated-webp-images-and.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Webp Lossless",
+  "async": true,
+  "property": ["webplossless", "webp-lossless"],
+  "tags": ["image"],
+  "authors": ["@amandeep", "Rich Bradshaw", "Ryan Seddon", "Paul Irish"],
+  "notes": [{
+    "name": "Webp Info",
+    "href": "https://developers.google.com/speed/webp/"
+  }, {
+    "name": "Webp Lossless Spec",
+    "href": "https://developers.google.com/speed/webp/docs/webp_lossless_bitstream_specification"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Webp",
+  "async": true,
+  "property": "webp",
+  "caniuse": "webp",
+  "tags": ["image"],
+  "builderAliases": ["img_webp"],
+  "authors": ["Krister Kari", "@amandeep", "Rich Bradshaw", "Ryan Seddon", "Paul Irish"],
+  "notes": [{
+    "name": "Webp Info",
+    "href": "https://developers.google.com/speed/webp/"
+  }, {
+    "name": "Chromium blog - Chrome 32 Beta: Animated WebP images and faster Chrome for Android touch input",
+    "href": "https://blog.chromium.org/2013/11/chrome-32-beta-animated-webp-images-and.html"
+  }, {
+    "name": "Webp Lossless Spec",
+    "href": "https://developers.google.com/speed/webp/docs/webp_lossless_bitstream_specification"
+  }, {
+    "name": "Article about WebP support",
+    "href": "https://optimus.keycdn.com/support/webp-support/"
+  }, {
+    "name": "Chromium WebP announcement",
+    "href": "https://blog.chromium.org/2011/11/lossless-and-transparency-encoding-in.html?m=1"
+  }]
+}
+!*/
+/*!
+{
+  "name": "input[capture] Attribute",
+  "property": "capture",
+  "tags": ["video", "image", "audio", "media", "attribute"],
+  "notes": [{
+    "name": "W3C Draft Spec",
+    "href": "https://www.w3.org/TR/html-media-capture/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "input[file] Attribute",
+  "property": "fileinput",
+  "caniuse": "forms",
+  "tags": ["file", "forms", "input"],
+  "builderAliases": ["forms_fileinput"]
+}
+!*/
+/*!
+{
+  "name": "input[directory] Attribute",
+  "property": "directory",
+  "authors": ["silverwind"],
+  "tags": ["file", "input", "attribute"]
+}
+!*/
+/*!
+{
+  "name": "input formaction",
+  "property": "inputformaction",
+  "aliases": ["input-formaction"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-formaction"
+  }, {
+    "name": "Wufoo demo",
+    "href": "https://www.wufoo.com/html5/formaction-attribute/"
+  }],
+  "polyfills": ["webshims"]
+}
+!*/
+/*!
+{
+  "name": "input[form] Attribute",
+  "property": "formattribute",
+  "tags": ["attribute", "forms", "input"],
+  "builderAliases": ["forms_formattribute"]
+}
+!*/
+/*!
+{
+  "name": "input formenctype",
+  "property": "inputformenctype",
+  "aliases": ["input-formenctype"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-formenctype"
+  }, {
+    "name": "Wufoo demo",
+    "href": "https://www.wufoo.com/html5/formenctype-attribute/"
+  }],
+  "polyfills": ["html5formshim"]
+}
+!*/
+/*!
+{
+  "name": "input formmethod",
+  "property": "inputformmethod",
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-formmethod"
+  }, {
+    "name": "Wufoo demo",
+    "href": "https://www.wufoo.com/html5/formmethod-attribute/"
+  }],
+  "polyfills": ["webshims"]
+}
+!*/
+/*!
+{
+  "name": "input formnovalidate",
+  "property": "inputformnovalidate",
+  "aliases": ["input-formnovalidate"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-formnovalidate"
+  }, {
+    "name": "Wufoo demo",
+    "href": "https://www.wufoo.com/html5/formnovalidate-attribute/"
+  }],
+  "polyfills": ["html5formshim"]
+}
+!*/
+/*!
+{
+  "name": "input formtarget",
+  "property": "inputformtarget",
+  "aliases": ["input-formtarget"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-formtarget"
+  }, {
+    "name": "Wufoo demo",
+    "href": "https://www.wufoo.com/html5/formtarget-attribute/"
+  }],
+  "polyfills": ["html5formshim"]
+}
+!*/
+/*!
+{
+  "name": "Input attributes",
+  "property": "input",
+  "tags": ["forms"],
+  "authors": ["Mike Taylor"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/input.html#input-type-attr-summary"
+  }],
+  "knownBugs": ["Some blackberry devices report false positive for input.multiple"]
+}
+!*/
+/*!
+{
+  "name": "Form input types",
+  "property": "inputtypes",
+  "caniuse": "forms",
+  "tags": ["forms"],
+  "authors": ["Mike Taylor"],
+  "polyfills": [
+    "jquerytools",
+    "webshims",
+    "h5f",
+    "webforms2",
+    "nwxforms",
+    "fdslider",
+    "html5slider",
+    "galleryhtml5forms",
+    "jscolor",
+    "html5formshim",
+    "selectedoptionsjs",
+    "formvalidationjs"
+  ]
+}
+!*/
+/*!
+{
+  "name": "Form Validation",
+  "property": "formvalidation",
+  "tags": ["forms", "validation", "attribute"],
+  "builderAliases": ["forms_validation"]
+}
+!*/
+/*!
+{
+  "name": "input[type=\"number\"] Localization",
+  "property": "localizednumber",
+  "tags": ["forms", "localization", "attribute"],
+  "authors": ["Peter Janes"],
+  "notes": [{
+    "name": "Webkit Bug Tracker Listing",
+    "href": "https://bugs.webkit.org/show_bug.cgi?id=42484"
+  }, {
+    "name": "Based on This",
+    "href": "https://trac.webkit.org/browser/trunk/LayoutTests/fast/forms/script-tests/input-number-keyoperation.js?rev=80096#L9"
+  }],
+  "knownBugs": ["Only ever returns true if the browser/OS is configured to use comma as a decimal separator. This is probably fine for most use cases."]
+}
+!*/
+/*!
+{
+  "name": "input[search] search event",
+  "property": "inputsearchevent",
+  "tags": ["input","search"],
+  "authors": ["Calvin Webster"],
+  "notes": [{
+    "name": "Wufoo demo",
+    "href": "https://www.wufoo.com/html5/search-type/"
+  }, {
+    "name": "CSS Tricks",
+    "href": "https://css-tricks.com/webkit-html5-search-inputs/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "placeholder attribute",
+  "property": "placeholder",
+  "tags": ["forms", "attribute"],
+  "builderAliases": ["forms_placeholder"]
+}
+!*/
+/*!
+{
+  "name": "form#requestAutocomplete()",
+  "property": "requestautocomplete",
+  "tags": ["form", "forms", "requestAutocomplete", "payments"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://wiki.whatwg.org/wiki/RequestAutocomplete"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Internationalization API",
+  "property": "intl",
+  "caniuse": "internationalization",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl"
+  }, {
+    "name": "ECMAScript spec",
+    "href": "https://www.ecma-international.org/ecma-402/1.0/"
+  }]
+}
+ !*/
+/*!
+{
+  "name": "Font Ligatures",
+  "property": "ligatures",
+  "caniuse": "font-feature",
+  "notes": [{
+    "name": "Cross-browser Web Fonts",
+    "href": "https://www.sitepoint.com/cross-browser-web-fonts-part-3/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Reverse Ordered Lists",
+  "property": "olreversed",
+  "notes": [{
+    "name": "Impressive Webs article",
+    "href": "https://www.impressivewebs.com/reverse-ordered-lists-html5/"
+  }],
+  "builderAliases": ["lists_reversed"]
+}
+!*/
+/*!
+{
+  "name": "MathML",
+  "property": "mathml",
+  "caniuse": "mathml",
+  "authors": ["Addy Osmani", "Davide P. Cervone", "David Carlisle"],
+  "knownBugs": ["Firefox < 4 will likely return a false, however it does support MathML inside XHTML documents"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/Math/"
+  }],
+  "polyfills": ["mathjax"]
+}
+!*/
+/*!
+{
+  "name": "Media Source Extensions API",
+  "caniuse": "mediasource",
+  "property": "mediasource",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Media_Source_Extensions_API"
+  }],
+  "builderAliases": ["media_source_extension_api"]
+}
+!*/
+/*!
+{
+  "name": "Hover Media Query",
+  "property": "hovermq",
+  "tags": ["mediaquery"]
+}
+!*/
+/*!
+{
+  "name": "Pointer Media Query",
+  "property": "pointermq",
+  "tags": ["mediaquery"]
+}
+!*/
+/*!
+{
+  "name": "Message Channel",
+  "property": "messagechannel",
+  "authors": ["Raju Konga (@kongaraju)"],
+  "caniuse": "channel-messaging",
+  "tags": ["performance", "messagechannel"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/2011/WD-webmessaging-20110317/#message-channels"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API/Using_channel_messaging"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Beacon API",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/navigator.sendBeacon"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/beacon/"
+  }],
+  "property": "beacon",
+  "caniuse": "beacon",
+  "tags": ["beacon", "network"],
+  "authors": ["Cătălin Mariș"]
+}
+!*/
+/*!
+{
+  "name": "Connection Effective Type",
+  "notes": [{
+    "name": "MDN documentation",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/NetworkInformation/effectiveType"
+  }],
+  "property": "connectioneffectivetype",
+  "builderAliases": ["network_connection"],
+  "tags": ["network"]
+}
+!*/
+/*!
+{
+  "name": "Low Bandwidth Connection",
+  "property": "lowbandwidth",
+  "tags": ["network"],
+  "builderAliases": ["network_connection"]
+}
+!*/
+/*!
+{
+  "name": "Server Sent Events",
+  "property": "eventsource",
+  "tags": ["network"],
+  "builderAliases": ["network_eventsource"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/server-sent-events.html#server-sent-events"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Fetch API",
+  "property": "fetch",
+  "tags": ["network"],
+  "caniuse": "fetch",
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://fetch.spec.whatwg.org/"
+  }],
+  "polyfills": ["fetch"]
+}
+!*/
+/*!
+{
+  "name": "XHR responseType='arraybuffer'",
+  "property": "xhrresponsetypearraybuffer",
+  "tags": ["network"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://xhr.spec.whatwg.org/#the-responsetype-attribute"
+  }]
+}
+!*/
+/*!
+{
+  "name": "XHR responseType='blob'",
+  "property": "xhrresponsetypeblob",
+  "tags": ["network"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://xhr.spec.whatwg.org/#the-responsetype-attribute"
+  }]
+}
+!*/
+/*!
+{
+  "name": "XHR responseType='document'",
+  "property": "xhrresponsetypedocument",
+  "tags": ["network"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://xhr.spec.whatwg.org/#the-responsetype-attribute"
+  }]
+}
+!*/
+/*!
+{
+  "name": "XHR responseType='json'",
+  "property": "xhrresponsetypejson",
+  "tags": ["network"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://xhr.spec.whatwg.org/#the-responsetype-attribute"
+  }, {
+    "name": "Explanation of xhr.responseType='json'",
+    "href": "https://mathiasbynens.be/notes/xhr-responsetype-json"
+  }]
+}
+!*/
+/*!
+{
+  "name": "XHR responseType='text'",
+  "property": "xhrresponsetypetext",
+  "tags": ["network"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://xhr.spec.whatwg.org/#the-responsetype-attribute"
+  }]
+}
+!*/
+/*!
+{
+  "name": "XHR responseType",
+  "property": "xhrresponsetype",
+  "tags": ["network"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://xhr.spec.whatwg.org/#the-responsetype-attribute"
+  }]
+}
+!*/
+/*!
+{
+  "name": "XML HTTP Request Level 2 XHR2",
+  "property": "xhr2",
+  "caniuse": "xhr2",
+  "tags": ["network"],
+  "builderAliases": ["network_xhr2"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/XMLHttpRequest2/"
+  }, {
+    "name": "Details on Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/385"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Notification",
+  "property": "notification",
+  "caniuse": "notifications",
+  "authors": ["Theodoor van Donge", "Hendrik Beskow"],
+  "notes": [{
+    "name": "HTML5 Rocks Tutorial",
+    "href": "https://www.html5rocks.com/en/tutorials/notifications/quick/"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/notifications/"
+  }, {
+    "name": "Changes in Chrome to Notifications API due to Service Worker Push Notifications",
+    "href": "https://developers.google.com/web/updates/2015/05/Notifying-you-of-notificiation-changes"
+  }],
+  "knownBugs": ["Possibility of false-positive on Chrome for Android if permissions we're granted for a website prior to Chrome 44."],
+  "polyfills": ["desktop-notify", "html5-notifications"]
+}
+!*/
+/*!
+{
+  "name": "Page Visibility API",
+  "property": "pagevisibility",
+  "caniuse": "pagevisibility",
+  "tags": ["performance"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/DOM/Using_the_Page_Visibility_API"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/2011/WD-page-visibility-20110602/"
+  }, {
+    "name": "HTML5 Rocks Tutorial",
+    "href": "https://www.html5rocks.com/en/tutorials/pagevisibility/intro/"
+  }],
+  "polyfills": ["visibilityjs", "visiblyjs", "jquery-visibility"]
+}
+!*/
+/*!
+{
+  "name": "Navigation Timing API",
+  "property": "performance",
+  "caniuse": "nav-timing",
+  "tags": ["performance"],
+  "authors": ["Scott Murphy (@uxder)"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/navigation-timing/"
+  }, {
+    "name": "HTML5 Rocks Tutorial",
+    "href": "https://www.html5rocks.com/en/tutorials/webperformance/basics/"
+  }],
+  "polyfills": ["perfnow"]
+}
+!*/
+/*!
+{
+  "name": "Pointer Lock API",
+  "property": "pointerlock",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/API/Pointer_Lock_API"
+  }],
+  "builderAliases": ["pointerlock_api"]
+}
+!*/
+/*!
+{
+  "name": "postMessage",
+  "property": "postmessage",
+  "caniuse": "x-doc-messaging",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/webmessaging/#crossDocumentMessages"
+  }],
+  "polyfills": ["easyxdm", "postmessage-jquery"],
+  "knownBugs": [
+    "structuredclones - Android 2&3 can not send a structured clone of dates, filelists or regexps.",
+    "Some old WebKit versions have bugs."
+  ],
+  "warnings": ["To be safe you should stick with object, array, number and pixeldata."]
+}
+!*/
+/*!
+{
+  "name": "Proxy Object",
+  "property": "proxy",
+  "caniuse": "proxy",
+  "authors": ["Brock Beaudry"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy"
+  }],
+  "polyfills": [
+    "harmony-reflect"
+  ]
+}
+!*/
+/*!
+{
+  "name": "QuerySelector",
+  "property": "queryselector",
+  "caniuse": "queryselector",
+  "tags": ["queryselector"],
+  "authors": ["Andrew Betts (@triblondon)"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/selectors-api/#queryselectorall"
+  }],
+  "polyfills": ["css-selector-engine"]
+}
+!*/
+/*!
+{
+  "name": "rel=prefetch",
+  "property": "prefetch",
+  "caniuse": "link-rel-prefetch",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/resource-hints/#prefetch"
+  }, {
+    "name": "Related Github Issue",
+    "href": "https://github.com/Modernizr/Modernizr/issues/2536"
+  }]
+}
+!*/
+/*!
+{
+  "name": "requestAnimationFrame",
+  "property": "requestanimationframe",
+  "aliases": ["raf"],
+  "caniuse": "requestanimationframe",
+  "tags": ["animation"],
+  "authors": ["Addy Osmani"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/animation-timing/"
+  }],
+  "polyfills": ["raf"]
+}
+!*/
+/*!
+{
+  "name": "script[async]",
+  "property": "scriptasync",
+  "caniuse": "script-async",
+  "tags": ["script"],
+  "builderAliases": ["script_async"],
+  "authors": ["Theodoor van Donge"]
+}
+!*/
+/*!
+{
+  "name": "script[defer]",
+  "property": "scriptdefer",
+  "caniuse": "script-defer",
+  "tags": ["script"],
+  "builderAliases": ["script_defer"],
+  "authors": ["Theodoor van Donge"],
+  "warnings": ["Browser implementation of the `defer` attribute vary: https://stackoverflow.com/questions/3952009/defer-attribute-chrome#answer-3982619"],
+  "knownBugs": ["False positive in Opera 12"]
+}
+!*/
+/*!
+{
+  "name": "scrollToOptions dictionary",
+  "property": "scrolltooptions",
+  "caniuse": "mdn-api_scrolltooptions",
+  "notes": [{
+    "name": "MDN docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Window/scrollTo"
+  }],
+  "authors": ["Oliver Tušla (@asmarcz)", "Chris Smith (@chris13524)"]
+}
+!*/
+/*!
+{
+  "name": "ServiceWorker API",
+  "property": "serviceworker",
+  "caniuse": "serviceworkers",
+  "notes": [{
+    "name": "ServiceWorkers Explained",
+    "href": "https://github.com/slightlyoff/ServiceWorker/blob/master/explainer.md"
+  }]
+}
+!*/
+/*!
+{
+  "property": "speechrecognition",
+  "caniuse": "speech-recognition",
+  "tags": ["input", "speech"],
+  "authors": ["Cătălin Mariș"],
+  "name": "Speech Recognition API",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/speech-api/speechapi.html#speechreco-section"
+  }, {
+    "name": "Introduction to the Web Speech API",
+    "href": "https://developers.google.com/web/updates/2013/01/Voice-Driven-Web-Apps-Introduction-to-the-Web-Speech-API"
+  }]
+}
+!*/
+/*!
+{
+  "property": "speechsynthesis",
+  "caniuse": "speech-synthesis",
+  "tags": ["input", "speech"],
+  "authors": ["Cătălin Mariș"],
+  "name": "Speech Synthesis API",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/speech-api/speechapi.html#tts-section"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Cookies",
+  "property": "cookies",
+  "tags": ["storage"],
+  "authors": ["tauren"]
+}
+!*/
+/*!
+{
+  "name": "IndexedDB",
+  "property": "indexeddb",
+  "caniuse": "indexeddb",
+  "tags": ["storage"],
+  "polyfills": ["indexeddb"],
+  "async": true
+}
+!*/
+/*!
+{
+  "name": "IndexedDB Blob",
+  "property": "indexeddbblob",
+  "tags": ["storage"]
+}
+!*/
+/*!
+{
+  "name": "IndexedDB 2.0",
+  "property": "indexeddb2",
+  "tags": ["storage"],
+  "caniuse": "indexeddb2",
+  "authors": ["Tan Zhen Yong (@Xenonym)"],
+  "polyfills": ["indexeddb"],
+  "async": true
+}
+!*/
+/*!
+{
+  "name": "Local Storage",
+  "property": "localstorage",
+  "caniuse": "namevalue-storage",
+  "tags": ["storage"],
+  "polyfills": [
+    "joshuabell-polyfill",
+    "cupcake",
+    "storagepolyfill",
+    "amplifyjs",
+    "yui-cacheoffline"
+  ]
+}
+!*/
+/*!
+{
+  "name": "Quota Storage Management API",
+  "property": "quotamanagement",
+  "tags": ["storage"],
+  "builderAliases": ["quota_management_api"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/quota-api/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Session Storage",
+  "property": "sessionstorage",
+  "tags": ["storage"],
+  "polyfills": ["joshuabell-polyfill", "cupcake", "storagepolyfill"]
+}
+!*/
+/*!
+{
+  "name": "IE User Data API",
+  "property": "userdata",
+  "tags": ["storage"],
+  "authors": ["@stereobooster"],
+  "notes": [{
+    "name": "MSDN Documentation",
+    "href": "https://msdn.microsoft.com/en-us/library/ms531424.aspx"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Web SQL Database",
+  "property": "websqldatabase",
+  "caniuse": "sql-storage",
+  "tags": ["storage"]
+}
+!*/
+/*!
+{
+  "name": "style[scoped]",
+  "property": "stylescoped",
+  "caniuse": "style-scoped",
+  "tags": ["dom"],
+  "builderAliases": ["style_scoped"],
+  "authors": ["Cătălin Mariș"],
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://html.spec.whatwg.org/multipage/semantics.html#attr-style-scoped"
+  }],
+  "polyfills": ["scoped-styles"]
+}
+!*/
+/*!
+{
+  "name": "SVG",
+  "property": "svg",
+  "caniuse": "svg",
+  "tags": ["svg"],
+  "authors": ["Erik Dahlstrom"],
+  "polyfills": [
+    "svgweb",
+    "raphael",
+    "canvg",
+    "svg-boilerplate",
+    "sie",
+    "fabricjs"
+  ]
+}
+!*/
+/*!
+{
+  "name": "SVG as an <img> tag source",
+  "property": "svgasimg",
+  "caniuse": "svg-img",
+  "tags": ["svg"],
+  "aliases": ["svgincss"],
+  "authors": ["Chris Coyier"],
+  "notes": [{
+    "name": "HTML5 Spec",
+    "href": "https://www.w3.org/TR/html5/embedded-content-0.html#the-img-element"
+  }]
+}
+!*/
+/*!
+{
+  "name": "SVG clip paths",
+  "property": "svgclippaths",
+  "tags": ["svg"],
+  "notes": [{
+    "name": "Demo",
+    "href": "http://srufaculty.sru.edu/david.dailey/svg/newstuff/clipPath4.svg"
+  }]
+}
+!*/
+/*!
+{
+  "name": "SVG filters",
+  "property": "svgfilters",
+  "caniuse": "svg-filters",
+  "tags": ["svg"],
+  "builderAliases": ["svg_filters"],
+  "authors": ["Erik Dahlstrom"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/SVG11/filters.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "SVG foreignObject",
+  "property": "svgforeignobject",
+  "tags": ["svg"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/SVG11/extend.html"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Inline SVG",
+  "property": "inlinesvg",
+  "caniuse": "svg-html5",
+  "tags": ["svg"],
+  "notes": [{
+    "name": "Test page",
+    "href": "https://paulirish.com/demo/inline-svg"
+  }, {
+    "name": "Test page and results",
+    "href": "https://codepen.io/eltonmesquita/full/GgXbvo/"
+  }],
+  "polyfills": ["inline-svg-polyfill"],
+  "knownBugs": ["False negative on some Chromia browsers."]
+}
+!*/
+/*!
+{
+  "name": "SVG SMIL animation",
+  "property": "smil",
+  "caniuse": "svg-smil",
+  "tags": ["svg"],
+  "notes": [{
+  "name": "W3C Spec",
+  "href": "https://www.w3.org/AudioVideo/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "textarea maxlength",
+  "property": "textareamaxlength",
+  "aliases": ["textarea-maxlength"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea"
+  }],
+  "polyfills": ["maxlength"]
+}
+!*/
+/*!
+{
+  "name": "Text Encoding/Decoding",
+  "property": ["textencoder", "textdecoder"],
+  "caniuse" : "textencoder",
+  "notes": [{
+    "name": "MDN TextEncoder Doc",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/TextEncoder"
+  }, {
+    "name": "MDN TextDecoder Doc",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/TextDecoder"
+  }],
+  "authors": ["dabretin"]
+}
+!*/
+/*!
+{
+  "name": "Typed arrays",
+  "property": "typedarrays",
+  "caniuse": "typedarrays",
+  "tags": ["js"],
+  "authors": ["Stanley Stuart (@fivetanley)"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/JavaScript/Typed_arrays"
+  }, {
+    "name": "Kronos spec",
+    "href": "http://www.ecma-international.org/ecma-262/6.0/#sec-typedarray-objects"
+  }],
+  "polyfills": ["joshuabell-polyfill"]
+}
+!*/
+/*!
+{
+  "name": "Unicode Range",
+  "property": "unicoderange",
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/2013/CR-css-fonts-3-20131003/#descdef-unicode-range"
+  }, {
+    "name": "24 Way article",
+    "href": "https://24ways.org/2011/creating-custom-font-stacks-with-unicode-range"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Blob URLs",
+  "property": "bloburls",
+  "caniuse": "bloburls",
+  "notes": [{
+    "name": "W3C Working Draft Spec",
+    "href": "https://www.w3.org/TR/FileAPI/#creating-revoking"
+  }],
+  "tags": ["file", "url"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"]
+}
+!*/
+/*!
+{
+  "name": "Data URI",
+  "property": "datauri",
+  "caniuse": "datauri",
+  "tags": ["url"],
+  "builderAliases": ["url_data_uri"],
+  "async": true,
+  "notes": [{
+    "name": "Wikipedia article",
+    "href": "https://en.wikipedia.org/wiki/Data_URI_scheme"
+  }],
+  "warnings": ["Support in Internet Explorer 8 is limited to images and linked resources like CSS files, not HTML files"]
+}
+!*/
+/*!
+{
+  "name": "URL parser",
+  "property": "urlparser",
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://url.spec.whatwg.org/"
+  }],
+  "polyfills": ["urlparser"],
+  "authors": ["Ron Waldon (@jokeyrhyme)"],
+  "tags": ["url"]
+}
+!*/
+/*!
+{
+  "property": "urlsearchparams",
+  "caniuse": "urlsearchparams",
+  "tags": ["querystring", "url"],
+  "authors": ["Cătălin Mariș"],
+  "name": "URLSearchParams API",
+  "notes": [{
+    "name": "WHATWG Spec",
+    "href": "https://url.spec.whatwg.org/#interface-urlsearchparams"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Vibration API",
+  "property": "vibrate",
+  "caniuse": "vibration",
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en/DOM/window.navigator.mozVibrate"
+  }, {
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/vibration/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "HTML5 Video",
+  "property": "video",
+  "caniuse": "video",
+  "tags": ["html5", "video", "media"],
+  "knownBugs": ["Without QuickTime, `Modernizr.video.h264` will be `undefined`; https://github.com/Modernizr/Modernizr/issues/546"],
+  "polyfills": [
+    "html5media",
+    "mediaelementjs",
+    "videojs",
+    "leanbackplayer",
+    "videoforeverybody"
+  ]
+}
+!*/
+/*!
+{
+  "name": "Video Autoplay",
+  "property": "videoautoplay",
+  "tags": ["video"],
+  "async": true,
+  "warnings": ["This test is very large – only include it if you absolutely need it"],
+  "knownBugs": ["crashes with an alert on iOS7 when added to homescreen"]
+}
+!*/
+/*!
+{
+  "name": "Video crossOrigin",
+  "property": "videocrossorigin",
+  "caniuse": "cors",
+  "authors": ["Florian Mailliet"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Video Loop Attribute",
+  "property": "videoloop",
+  "tags": ["video", "media"]
+}
+!*/
+/*!
+{
+  "name": "Video Preload Attribute",
+  "property": "videopreload",
+  "tags": ["video", "media"]
+}
+!*/
+/*!
+{
+  "name": "VML",
+  "property": "vml",
+  "tags": ["vml"],
+  "authors": ["Craig Andrews (@candrews)"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/NOTE-VML"
+  }, {
+    "name": "MSDN Documentation",
+    "href": "https://docs.microsoft.com/en-us/windows/desktop/VML/msdn-online-vml-introduction"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Web Intents",
+  "property": "webintents",
+  "authors": ["Eric Bidelman"],
+  "notes": [{
+    "name": "Web Intents project site",
+    "href": "http://www.webintents.org/"
+  }],
+  "builderAliases": ["web_intents"]
+}
+!*/
+/*!
+{
+  "name": "Web Animation API",
+  "property": "webanimations",
+  "caniuse": "web-animation",
+  "tags": ["webanimations"],
+  "polyfills": ["webanimationsjs"],
+  "notes": [{
+    "name": "Introducing Web Animations",
+    "href": "https://birtles.wordpress.com/2013/06/26/introducing-web-animations/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "PublicKeyCredential",
+  "notes": [
+    {
+      "name": "MDN Documentation",
+      "href": "https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredential"
+    },
+    {
+      "name": "Google Developers solution",
+      "href": "https://developers.google.com/web/updates/2018/03/webauthn-credential-management#the_solution"
+    }
+  ],
+  "property": "publickeycredential",
+  "tags": ["webauthn", "web authentication"],
+  "authors": ["Eric Delia"]
+}
+!*/
+/*!
+{
+  "name": "WebGL",
+  "property": "webgl",
+  "caniuse": "webgl",
+  "tags": ["webgl", "graphics"],
+  "polyfills": ["jebgl", "cwebgl", "iewebgl"]
+}
+!*/
+/*!
+{
+  "name": "WebGL Extensions",
+  "property": "webglextensions",
+  "tags": ["webgl", "graphics"],
+  "builderAliases": ["webgl_extensions"],
+  "async": true,
+  "authors": ["Ilmari Heikkinen"],
+  "notes": [{
+    "name": "Kronos extensions registry",
+    "href": "https://www.khronos.org/registry/webgl/extensions/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "RTC Peer Connection",
+  "property": "peerconnection",
+  "caniuse": "rtcpeerconnection",
+  "tags": ["webrtc"],
+  "authors": ["Ankur Oberoi"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/webrtc/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "RTC Data Channel",
+  "property": "datachannel",
+  "notes": [{
+    "name": "HTML5 Rocks Tutorial",
+    "href": "https://www.html5rocks.com/en/tutorials/webrtc/datachannels/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "getUserMedia",
+  "property": "getusermedia",
+  "caniuse": "stream",
+  "tags": ["webrtc"],
+  "authors": ["Eric Bidelman", "Masataka Yakura"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://w3c.github.io/mediacapture-main/#dom-mediadevices-getusermedia"
+  }]
+}
+!*/
+/*!
+{
+  "name": "MediaStream Recording API",
+  "property": "mediarecorder",
+  "caniuse": "mediarecorder",
+  "tags": ["mediarecorder", "media"],
+  "authors": ["Onkar Dahale"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/MediaStream_Recording_API"
+  }]
+}
+!*/
+/*!
+{
+  "name": "WebSockets Support",
+  "property": "websockets",
+  "authors": ["Phread (@fearphage)", "Mike Sherov (@mikesherov)", "Burak Yigit Kaya (@BYK)"],
+  "caniuse": "websockets",
+  "tags": ["html5"],
+  "knownBugs": ["This test will reject any old version of WebSockets even if it is not prefixed such as in Safari 5.1"],
+  "notes": [{
+    "name": "CLOSING State and Spec",
+    "href": "https://www.w3.org/TR/websockets/#the-websocket-interface"
+  }],
+  "polyfills": [
+    "sockjs",
+    "socketio",
+    "websocketjs",
+    "atmosphere",
+    "graceful-websocket",
+    "portal",
+    "datachannel"
+  ]
+}
+!*/
+/*!
+{
+  "name": "Binary WebSockets",
+  "property": "websocketsbinary",
+  "tags": ["websockets"],
+  "builderAliases": ["websockets_binary"]
+}
+!*/
+/*!
+{
+  "name": "Base 64 encoding/decoding",
+  "property": "atobbtoa",
+  "builderAliases": ["atob-btoa"],
+  "caniuse": "atob-btoa",
+  "tags": ["atob", "base64", "WindowBase64", "btoa"],
+  "authors": ["Christian Ulbrich"],
+  "notes": [{
+    "name": "WindowBase64",
+    "href": "https://www.w3.org/TR/html5/webappapis.html#windowbase64"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/atob"
+  }],
+  "polyfills": ["base64js"]
+}
+!*/
+/*!
+{
+  "name": "Framed window",
+  "property": "framed",
+  "tags": ["window"],
+  "builderAliases": ["window_framed"]
+}
+!*/
+/*!
+{
+  "name": "matchMedia",
+  "property": "matchmedia",
+  "caniuse": "matchmedia",
+  "tags": ["matchmedia"],
+  "authors": ["Alberto Elias"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://drafts.csswg.org/cssom-view/#the-mediaquerylist-interface"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Window.matchMedia"
+  }],
+  "polyfills": ["matchmediajs"]
+}
+!*/
+/*!
+{
+  "name": "PushManager",
+  "property": "pushmanager",
+  "caniuse": "mdn-api_pushmanager",
+  "authors": ["Dawid Kulpa (@dawidkulpa)"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/PushManager"
+  }]
+}
+!*/
+/*!
+{
+  "name": "ResizeObserver",
+  "property": "resizeobserver",
+  "caniuse": "resizeobserver",
+  "tags": ["ResizeObserver"],
+  "authors": ["Christian Andersson"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/resize-observer/"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver"
+  }, {
+    "name": "Web.dev Article",
+    "href": "https://web.dev/resize-observer/"
+  }, {
+    "name": "Digital Ocean tutorial",
+    "href": "https://www.digitalocean.com/community/tutorials/js-resize-observer"
+  }]
+}
+!*/
+/*!
+{
+  "name": "worker type option test",
+  "property": "workertypeoption",
+  "caniuse":"mdn-api_worker_worker_ecmascript_modules",
+  "tags": ["web worker type options", "web worker"],
+  "builderAliases": ["worker_type_options"],
+  "authors": ["Debadutta Panda"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Worker/Worker"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Workers from Blob URIs",
+  "property": "blobworkers",
+  "tags": ["performance", "workers"],
+  "builderAliases": ["workers_blobworkers"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/workers/"
+  }],
+  "warnings": ["This test may output garbage to console."],
+  "authors": ["Jussi Kalliokoski"],
+  "async": true
+}
+!*/
+/*!
+{
+  "name": "Workers from Data URIs",
+  "property": "dataworkers",
+  "tags": ["performance", "workers"],
+  "builderAliases": ["workers_dataworkers"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/workers/"
+  }],
+  "warnings": ["This test may output garbage to console."],
+  "authors": ["Jussi Kalliokoski"],
+  "async": true
+}
+!*/
+/*!
+{
+  "name": "Shared Workers",
+  "property": "sharedworkers",
+  "caniuse": "sharedworkers",
+  "tags": ["performance", "workers"],
+  "builderAliases": ["workers_sharedworkers"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/workers/"
+  }]
+}
+!*/
+/*!
+{
+  "name": "Web Workers",
+  "property": "webworkers",
+  "caniuse": "webworkers",
+  "tags": ["performance", "workers"],
+  "notes": [{
+    "name": "W3C Spec",
+    "href": "https://www.w3.org/TR/workers/"
+  }, {
+    "name": "HTML5 Rocks Tutorial",
+    "href": "https://www.html5rocks.com/en/tutorials/workers/basics/"
+  }, {
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers"
+  }],
+  "polyfills": ["fakeworker", "html5shims"]
+}
+!*/
+/*!
+{
+  "name": "Transferables Objects",
+  "property": "transferables",
+  "tags": ["performance", "workers"],
+  "builderAliases": ["transferables"],
+  "notes": [{
+    "name": "Transferable Objects: Lightning Fast!",
+    "href": "https://developers.google.com/web/updates/2011/12/Transferable-Objects-Lightning-Fast"
+  }],
+  "async": true
+}
+!*/
+/*!
+{
+  "name": "XDomainRequest",
+  "property": "xdomainrequest",
+  "tags": ["cors", "xdomainrequest", "ie9", "ie8"],
+  "authors": ["Ivan Pan (@hypotenuse)"],
+  "notes": [{
+    "name": "MDN Docs",
+    "href": "https://developer.mozilla.org/en-US/docs/Web/API/XDomainRequest"
+  }]
+}
+!*/
diff --git a/tests/assets/modernizr/roll.sh b/tests/assets/modernizr/roll.sh
new file mode 100644
index 0000000000000..8e6dd5c651fd1
--- /dev/null
+++ b/tests/assets/modernizr/roll.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+MODERNIZR_VERSION="44fa7b07c367a1814e8699e3a2f15c53fbe32df7"
+
+cd "$(dirname "$0")"
+
+rm -rf Modernizr
+git clone https://github.com/Modernizr/Modernizr
+cd Modernizr
+git checkout $MODERNIZR_VERSION
+npm ci
+
+# Modernizr minifier is not working, hence we minify with ESBuild.
+./bin/modernizr --config lib/config-all.json 
+npx esbuild --bundle modernizr.js --minify --outfile=../modernizr.js
+
+cd ..
+rm -rf Modernizr
diff --git a/tests/assets/modernizr/safari-14-1.json b/tests/assets/modernizr/safari-18.json
similarity index 64%
rename from tests/assets/modernizr/safari-14-1.json
rename to tests/assets/modernizr/safari-18.json
index 5be7c70bcce6c..e4f4aa48b35e2 100644
--- a/tests/assets/modernizr/safari-14-1.json
+++ b/tests/assets/modernizr/safari-18.json
@@ -11,293 +11,406 @@
     "required": true,
     "step": true
   },
-  "inputtypes": {
-    "search": true,
-    "tel": true,
-    "url": true,
-    "email": true,
-    "datetime": false,
-    "date": true,
-    "month": false,
-    "week": false,
-    "time": true,
-    "datetime-local": true,
-    "number": true,
-    "range": true,
-    "color": true
+  "adownload": true,
+  "aping": true,
+  "areaping": true,
+  "ambientlight": false,
+  "applicationcache": false,
+  "audio": {
+    "ogg": "",
+    "mp3": "probably",
+    "opus": "probably",
+    "wav": "probably",
+    "m4a": "maybe"
   },
-  "htmlimports": false,
-  "history": true,
-  "ie8compat": false,
-  "applicationcache": true,
+  "audioloop": true,
+  "webaudio": true,
+  "batteryapi": false,
+  "battery-api": false,
+  "lowbattery": false,
   "blobconstructor": true,
   "blob-constructor": true,
-  "cookies": true,
+  "broadcastchannel": true,
+  "canvas": true,
+  "canvasblending": true,
+  "todataurljpeg": true,
+  "todataurlpng": true,
+  "todataurlwebp": false,
+  "canvaswinding": true,
+  "canvastext": true,
+  "clipboard": {
+    "read": true,
+    "readtext": true,
+    "write": true,
+    "writetext": true
+  },
+  "contenteditable": true,
+  "contextmenu": false,
   "cors": true,
-  "customelements": true,
-  "customprotocolhandler": false,
-  "customevent": true,
-  "dataview": true,
-  "eventlistener": true,
-  "geolocation": true,
-  "json": true,
-  "messagechannel": true,
-  "notification": true,
-  "postmessage": true,
-  "queryselector": true,
-  "serviceworker": true,
-  "svg": true,
-  "templatestrings": true,
-  "typedarrays": true,
-  "websockets": true,
-  "xdomainrequest": false,
-  "webaudio": true,
+  "crypto": true,
+  "getrandomvalues": true,
+  "cssall": true,
+  "cssanimations": true,
+  "appearance": true,
+  "aspectratio": true,
+  "backdropfilter": true,
+  "backgroundblendmode": true,
+  "backgroundcliptext": true,
+  "bgpositionshorthand": true,
+  "bgpositionxy": true,
+  "bgrepeatround": true,
+  "bgrepeatspace": true,
+  "backgroundsize": true,
+  "bgsizecover": true,
+  "borderimage": true,
+  "borderradius": true,
+  "boxdecorationbreak": true,
+  "boxshadow": true,
+  "boxsizing": true,
+  "csscalc": true,
+  "checked": true,
+  "csschunit": true,
+  "csscolumns": {
+    "width": true,
+    "span": true,
+    "fill": true,
+    "gap": true,
+    "rule": true,
+    "rulecolor": true,
+    "rulestyle": true,
+    "rulewidth": true,
+    "breakbefore": true,
+    "breakafter": true,
+    "breakinside": true
+  },
+  "cssgridlegacy": false,
+  "cssgrid": true,
+  "cubicbezierrange": true,
+  "customproperties": true,
+  "displayrunin": false,
+  "display-runin": false,
+  "displaytable": true,
+  "display-table": true,
+  "ellipsis": true,
   "cssescape": true,
-  "focuswithin": true,
+  "cssexunit": true,
   "supports": true,
+  "cssfilters": true,
+  "flexbox": true,
+  "flexboxlegacy": true,
+  "flexboxtweener": false,
+  "flexgap": true,
+  "flexwrap": true,
+  "focusvisible": true,
+  "focuswithin": true,
+  "fontdisplay": true,
+  "fontface": true,
+  "generatedcontent": true,
+  "cssgradients": true,
+  "hairline": true,
+  "hsla": true,
+  "cssinvalid": true,
+  "lastchild": true,
+  "cssmask": true,
+  "mediaqueries": true,
+  "multiplebgs": true,
+  "nthchild": true,
+  "objectfit": true,
+  "object-fit": true,
+  "opacity": true,
+  "overflowscrolling": false,
+  "csspointerevents": true,
+  "csspositionsticky": true,
+  "csspseudoanimations": true,
+  "csstransitions": true,
+  "csspseudotransitions": true,
+  "cssreflections": true,
+  "regions": false,
+  "cssremunit": true,
+  "cssresize": true,
+  "rgba": true,
+  "cssscrollbar": true,
+  "scrollsnappoints": true,
+  "shapes": true,
+  "siblinggeneral": true,
+  "subpixelfont": true,
   "target": true,
+  "textalignlast": true,
+  "textdecoration": {
+    "line": true,
+    "style": true,
+    "color": true,
+    "skip": true,
+    "skipink": true
+  },
+  "textshadow": true,
+  "csstransforms": true,
+  "csstransforms3d": true,
+  "csstransformslevel2": true,
+  "preserve3d": true,
+  "userselect": true,
+  "cssvalid": true,
+  "variablefonts": true,
+  "cssvhunit": true,
+  "cssvmaxunit": true,
+  "cssvminunit": true,
+  "cssvwunit": true,
+  "willchange": true,
+  "wrapflow": false,
+  "customelements": true,
+  "customprotocolhandler": false,
+  "dart": false,
+  "dataview": true,
+  "classlist": true,
+  "createelementattrs": false,
+  "createelement-attrs": false,
+  "dataset": true,
+  "documentfragment": true,
+  "hidden": true,
+  "intersectionobserver": true,
   "microdata": false,
   "mutationobserver": true,
   "passiveeventlisteners": true,
+  "shadowroot": true,
+  "shadowrootlegacy": false,
+  "bdi": true,
+  "details": true,
+  "outputelem": true,
   "picture": true,
+  "progressbar": true,
+  "meter": true,
+  "ruby": true,
+  "template": true,
+  "time": false,
+  "texttrackapi": true,
+  "track": true,
+  "unknownelements": true,
+  "emoji": true,
   "es5array": true,
   "es5date": true,
   "es5function": true,
-  "beacon": true,
-  "lowbandwidth": false,
-  "eventsource": true,
-  "fetch": true,
-  "xhrresponsetype": true,
-  "xhr2": true,
-  "speechsynthesis": true,
-  "localstorage": true,
-  "sessionstorage": true,
-  "websqldatabase": true,
   "es5object": true,
-  "svgfilters": true,
   "strictmode": true,
   "es5string": true,
+  "json": true,
   "es5syntax": true,
   "es5undefined": true,
   "es5": true,
   "es6array": true,
   "arrow": true,
+  "es6class": true,
   "es6collections": true,
   "generators": true,
   "es6math": true,
   "es6number": true,
   "es6object": true,
   "promises": true,
+  "restparameters": true,
+  "spreadarray": true,
+  "stringtemplate": true,
   "es6string": true,
-  "devicemotion": false,
-  "devicemotion2": false,
-  "deviceorientation": false,
-  "deviceorientation2": false,
-  "deviceorientation3": false,
+  "es6symbol": true,
+  "es7array": true,
+  "restdestructuringarray": true,
+  "restdestructuringobject": true,
+  "spreadobject": true,
+  "es8object": true,
+  "customevent": true,
+  "devicemotion": true,
+  "deviceorientation": true,
+  "eventlistener": true,
+  "forcetouch": false,
+  "hashchange": true,
+  "oninput": true,
+  "pointerevents": true,
+  "proximity": false,
   "filereader": true,
-  "urlparser": true,
-  "urlsearchparams": true,
-  "framed": false,
-  "webworkers": true,
-  "contextmenu": false,
-  "cssall": true,
-  "willchange": true,
-  "classlist": true,
-  "documentfragment": true,
-  "contains": false,
-  "audio": true,
-  "canvas": true,
-  "canvastext": true,
-  "contenteditable": true,
-  "emoji": true,
-  "olreversed": true,
-  "userdata": false,
-  "video": true,
-  "vml": false,
-  "webanimations": true,
-  "webgl": true,
-  "adownload": true,
-  "audioloop": true,
-  "canvasblending": true,
-  "todataurljpeg": true,
-  "todataurlpng": true,
-  "todataurlwebp": false,
-  "canvaswinding": true,
-  "bgpositionshorthand": true,
-  "multiplebgs": true,
-  "csspointerevents": true,
-  "cssremunit": true,
-  "rgba": true,
-  "preserve3d": true,
-  "createelementattrs": false,
-  "createelement-attrs": false,
-  "dataset": true,
-  "hidden": true,
-  "outputelem": true,
-  "progressbar": true,
-  "meter": true,
-  "ruby": true,
-  "template": true,
+  "filesystem": false,
+  "flash": false,
+  "fullscreen": true,
+  "gamepads": true,
+  "geolocation": true,
+  "hiddenscroll": true,
+  "history": true,
+  "htmlimports": false,
+  "ie8compat": false,
+  "sandbox": true,
+  "seamless": false,
+  "srcdoc": true,
+  "imgcrossorigin": true,
+  "lazyloading": true,
+  "sizes": true,
   "srcset": true,
-  "time": false,
-  "texttrackapi": true,
-  "track": true,
-  "unknownelements": true,
+  "capture": false,
+  "fileinput": true,
+  "fileinputdirectory": true,
   "inputformaction": true,
   "input-formaction": true,
+  "formattribute": true,
   "inputformenctype": true,
   "input-formenctype": true,
   "inputformmethod": true,
-  "inputformtarget": false,
-  "input-formtarget": false,
-  "scriptasync": true,
-  "scriptdefer": true,
-  "stylescoped": false,
-  "capture": false,
-  "fileinput": true,
-  "formattribute": true,
+  "inputformnovalidate": true,
+  "input-formnovalidate": true,
+  "inputformtarget": true,
+  "input-formtarget": true,
+  "inputtypes": {
+    "search": true,
+    "tel": true,
+    "url": true,
+    "email": true,
+    "datetime": false,
+    "date": true,
+    "month": false,
+    "week": false,
+    "time": true,
+    "datetime-local": true,
+    "number": true,
+    "range": true,
+    "color": true
+  },
+  "formvalidation": true,
+  "localizednumber": false,
+  "inputsearchevent": false,
   "placeholder": true,
-  "sandbox": true,
-  "inlinesvg": true,
-  "textareamaxlength": true,
-  "videocrossorigin": true,
-  "webglextensions": true,
-  "seamless": false,
-  "srcdoc": true,
-  "imgcrossorigin": true,
-  "hashchange": true,
-  "inputsearchevent": true,
-  "ambientlight": false,
-  "datalistelem": true,
-  "videoloop": true,
-  "csscalc": true,
-  "cubicbezierrange": true,
-  "cssgradients": true,
-  "opacity": true,
-  "csspositionsticky": true,
-  "csschunit": true,
-  "cssexunit": true,
-  "hsla": true,
-  "videopreload": true,
-  "getusermedia": true,
-  "websocketsbinary": true,
-  "atobbtoa": true,
-  "atob-btoa": true,
-  "sharedworkers": true,
-  "bdi": true,
+  "requestautocomplete": false,
+  "intl": true,
+  "ligatures": true,
+  "olreversed": true,
+  "mathml": true,
+  "mediasource": true,
+  "hovermq": true,
+  "pointermq": true,
+  "messagechannel": true,
+  "beacon": true,
+  "effectivetype": false,
+  "lowbandwidth": false,
+  "eventsource": true,
+  "fetch": true,
   "xhrresponsetypearraybuffer": true,
   "xhrresponsetypeblob": true,
   "xhrresponsetypedocument": true,
   "xhrresponsetypejson": true,
   "xhrresponsetypetext": true,
-  "svgclippaths": true,
-  "svgforeignobject": true,
-  "smil": true,
-  "hiddenscroll": true,
-  "mathml": true,
-  "touchevents": false,
-  "unicoderange": true,
-  "unicode": true,
-  "checked": true,
-  "displaytable": true,
-  "display-table": true,
-  "fontface": true,
-  "generatedcontent": true,
-  "hairline": true,
-  "cssinvalid": true,
-  "lastchild": true,
-  "nthchild": true,
-  "cssscrollbar": true,
-  "siblinggeneral": true,
-  "subpixelfont": true,
-  "cssvalid": true,
-  "cssvhunit": true,
-  "cssvmaxunit": true,
-  "cssvminunit": true,
-  "cssvwunit": true,
-  "details": true,
-  "oninput": true,
-  "formvalidation": true,
-  "localizednumber": false,
-  "mediaqueries": true,
-  "flash": false,
-  "proximity": false,
-  "sizes": true,
-  "hovermq": true,
-  "pointermq": true,
-  "svgasimg": true,
-  "pointerevents": true,
-  "fileinputdirectory": true,
-  "textshadow": true,
-  "batteryapi": false,
-  "battery-api": false,
-  "crypto": true,
-  "dart": false,
-  "forcetouch": false,
-  "fullscreen": true,
-  "gamepads": true,
-  "intl": true,
+  "xhrresponsetype": true,
+  "xhr2": true,
+  "notification": true,
   "pagevisibility": true,
   "performance": true,
   "pointerlock": true,
-  "quotamanagement": false,
+  "postmessage": {
+    "structuredclones": true
+  },
+  "proxy": true,
+  "queryselector": true,
+  "prefetch": false,
   "requestanimationframe": true,
   "raf": true,
-  "vibrate": false,
-  "webintents": false,
-  "lowbattery": false,
-  "getrandomvalues": true,
-  "backgroundblendmode": true,
-  "objectfit": true,
-  "object-fit": true,
-  "regions": false,
-  "wrapflow": false,
+  "scriptasync": true,
+  "scriptdefer": true,
+  "scrolltooptions": false,
+  "serviceworker": true,
   "speechrecognition": true,
-  "filesystem": false,
-  "requestautocomplete": false,
+  "speechsynthesis": true,
+  "cookies": true,
+  "localstorage": true,
+  "quotamanagement": false,
+  "sessionstorage": true,
+  "userdata": false,
+  "websqldatabase": true,
+  "stylescoped": false,
+  "svg": true,
+  "svgasimg": true,
+  "svgclippaths": true,
+  "svgfilters": true,
+  "svgforeignobject": true,
+  "inlinesvg": true,
+  "smil": true,
+  "textareamaxlength": true,
+  "textencoder": true,
+  "textdecoder": true,
+  "typedarrays": true,
+  "unicoderange": true,
   "bloburls": true,
-  "transferables": true,
+  "urlparser": true,
+  "urlsearchparams": true,
+  "vibrate": false,
+  "video": {
+    "ogg": "",
+    "h264": "probably",
+    "h265": "",
+    "webm": "probably",
+    "vp9": "probably",
+    "hls": "probably",
+    "av1": ""
+  },
+  "videocrossorigin": true,
+  "videoloop": true,
+  "videopreload": true,
+  "vml": false,
+  "webintents": false,
+  "webanimations": true,
+  "publickeycredential": true,
+  "webgl": true,
+  "webglextensions": {
+    "ANGLE_instanced_arrays": true,
+    "EXT_blend_minmax": true,
+    "EXT_clip_control": true,
+    "EXT_color_buffer_half_float": true,
+    "EXT_depth_clamp": true,
+    "EXT_float_blend": true,
+    "EXT_frag_depth": true,
+    "EXT_polygon_offset_clamp": true,
+    "EXT_shader_texture_lod": true,
+    "EXT_texture_compression_bptc": true,
+    "EXT_texture_compression_rgtc": true,
+    "EXT_texture_filter_anisotropic": true,
+    "EXT_texture_mirror_clamp_to_edge": true,
+    "EXT_sRGB": true,
+    "KHR_parallel_shader_compile": true,
+    "OES_element_index_uint": true,
+    "OES_fbo_render_mipmap": true,
+    "OES_standard_derivatives": true,
+    "OES_texture_float": true,
+    "OES_texture_float_linear": true,
+    "OES_texture_half_float": true,
+    "OES_texture_half_float_linear": true,
+    "OES_vertex_array_object": true,
+    "WEBGL_blend_func_extended": true,
+    "WEBGL_color_buffer_float": true,
+    "WEBGL_compressed_texture_astc": true,
+    "WEBGL_compressed_texture_etc": true,
+    "WEBGL_compressed_texture_etc1": true,
+    "WEBGL_compressed_texture_pvrtc": true,
+    "WEBKIT_WEBGL_compressed_texture_pvrtc": true,
+    "WEBGL_compressed_texture_s3tc": true,
+    "WEBGL_compressed_texture_s3tc_srgb": true,
+    "WEBGL_debug_renderer_info": true,
+    "WEBGL_debug_shaders": true,
+    "WEBGL_depth_texture": true,
+    "WEBGL_draw_buffers": true,
+    "WEBGL_lose_context": true,
+    "WEBGL_multi_draw": true,
+    "WEBGL_polygon_mode": true
+  },
   "peerconnection": true,
-  "datachannel": false,
+  "datachannel": true,
+  "getusermedia": true,
+  "mediastream": true,
+  "websockets": true,
+  "websocketsbinary": true,
+  "atobbtoa": true,
+  "atob-btoa": true,
+  "framed": false,
   "matchmedia": true,
-  "ligatures": true,
-  "cssanimations": true,
-  "csspseudoanimations": true,
-  "appearance": true,
-  "backdropfilter": true,
-  "backgroundcliptext": true,
-  "bgpositionxy": true,
-  "bgrepeatround": true,
-  "bgrepeatspace": true,
-  "backgroundsize": true,
-  "bgsizecover": true,
-  "borderimage": true,
-  "borderradius": true,
-  "boxshadow": true,
-  "boxsizing": true,
-  "csscolumns": true,
-  "cssgridlegacy": false,
-  "cssgrid": true,
-  "displayrunin": false,
-  "display-runin": false,
-  "ellipsis": true,
-  "cssfilters": true,
-  "flexbox": true,
-  "flexboxlegacy": true,
-  "flexboxtweener": false,
-  "flexwrap": true,
-  "cssmask": true,
-  "overflowscrolling": false,
-  "cssreflections": true,
-  "cssresize": true,
-  "scrollsnappoints": true,
-  "shapes": true,
-  "textalignlast": true,
-  "csstransforms": true,
-  "csstransforms3d": true,
-  "csstransformslevel2": true,
-  "csstransitions": true,
-  "csspseudotransitions": true,
-  "userselect": true,
-  "variablefonts": true
-}
+  "pushmanager": true,
+  "resizeobserver": true,
+  "workertypeoption": true,
+  "sharedworkers": true,
+  "webworkers": true,
+  "transferables": true,
+  "xdomainrequest": false,
+  "devicemotion2": true,
+  "deviceorientation2": false,
+  "deviceorientation3": true
+}
\ No newline at end of file
diff --git a/tests/assets/network-tab/font.woff2 b/tests/assets/network-tab/font.woff2
new file mode 100644
index 0000000000000..ceba03549a59b
Binary files /dev/null and b/tests/assets/network-tab/font.woff2 differ
diff --git a/tests/assets/network-tab/image.png b/tests/assets/network-tab/image.png
new file mode 100644
index 0000000000000..3942859ccc78c
Binary files /dev/null and b/tests/assets/network-tab/image.png differ
diff --git a/tests/assets/network-tab/network.html b/tests/assets/network-tab/network.html
new file mode 100644
index 0000000000000..2544a7bf9d0cf
--- /dev/null
+++ b/tests/assets/network-tab/network.html
@@ -0,0 +1,47 @@
+<html>
+  <head>
+    <link rel='stylesheet' href='style.css'>
+    <style>
+      @font-face {
+        font-family: 'font';
+        src: url('font.woff2') format('woff2');
+      }
+
+      body {
+        font-family: 'font';
+      }
+    </style>
+    <script src='script.js'></script>
+    <script>
+      const body = JSON.stringify({
+        data: {
+          key: 'value',
+          array: ['value-1', 'value-2'],
+        },
+      });
+      const fetches = [
+        fetch('/api/endpoint'),
+        fetch('/call-with-query-params?param1=value1&param1=value2&param2=value2'),
+        fetch('/post-data-1', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body,
+        }),
+        fetch('/post-data-2', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body,
+        }),
+      ];
+      window.donePromise = Promise.all(fetches.map(f => f.then(r => r.body()).then(() => null).catch(e => {})));
+    </script>
+    <script></script>
+    <script>
+
+    </script>
+  </head>
+  <body>
+    <h1>Network Tab Test</h1>
+    <img src="image.png" >
+  </body>
+</html>
diff --git a/tests/assets/network-tab/script.js b/tests/assets/network-tab/script.js
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/assets/network-tab/style.css b/tests/assets/network-tab/style.css
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/assets/redirectloop1.html b/tests/assets/redirectloop1.html
index 27fab61ca8f79..d542c4e9e4290 100644
--- a/tests/assets/redirectloop1.html
+++ b/tests/assets/redirectloop1.html
@@ -1,8 +1,9 @@
 <script>
   setTimeout(() => {
+    const depth = new URLSearchParams(window.location.hash).get('depth') ?? '10';
     const iter = window.localStorage.iter || '';
     window.localStorage.iter = iter + 'a';
-    if (iter.length === 10)
+    if (iter.length === +depth)
       return;
     window.location.href = window.location.href.replace('loop1', 'loop2');
   }, 1);
diff --git a/tests/assets/rgb.avif b/tests/assets/rgb.avif
new file mode 100644
index 0000000000000..d79bff8a21b9d
Binary files /dev/null and b/tests/assets/rgb.avif differ
diff --git a/tests/assets/screenshots/canvas.html b/tests/assets/screenshots/canvas.html
index 011148c5fff15..a0ebc55829002 100644
--- a/tests/assets/screenshots/canvas.html
+++ b/tests/assets/screenshots/canvas.html
@@ -7,4 +7,7 @@
   ctx.fillRect(25, 25, 100, 100);
   ctx.clearRect(45, 45, 60, 60);
   ctx.strokeRect(50, 50, 50, 50);
+
+  if (location.hash.includes('canvas-on-edge'))
+    canvas.style.marginTop = '90vh';
 </script>
diff --git a/tests/assets/serviceworkers/bug-33561/index.html b/tests/assets/serviceworkers/bug-33561/index.html
new file mode 100644
index 0000000000000..b29d3f2e3457b
--- /dev/null
+++ b/tests/assets/serviceworkers/bug-33561/index.html
@@ -0,0 +1,4 @@
+<script>
+  window.registrationPromise = navigator.serviceWorker.register('sw.js');
+  window.activationPromise = new Promise(resolve => navigator.serviceWorker.oncontrollerchange = resolve);
+</script>
diff --git a/tests/assets/serviceworkers/bug-33561/sw.js b/tests/assets/serviceworkers/bug-33561/sw.js
new file mode 100644
index 0000000000000..83a661dc45846
--- /dev/null
+++ b/tests/assets/serviceworkers/bug-33561/sw.js
@@ -0,0 +1,14 @@
+// sw.js
+self.addEventListener('install', (event) => {
+  self.skipWaiting();
+});
+
+self.addEventListener('activate', (event) => {
+  event.waitUntil(self.clients.claim());
+});
+
+self.addEventListener('fetch', (event) => {
+  // IMPORTANT: we have to have a "fetch" listener
+  // to trigger the issue.
+  console.log('Fetching:', event.request.url);
+});
diff --git a/tests/assets/to-do-notifications/LICENSE b/tests/assets/to-do-notifications/LICENSE
new file mode 100644
index 0000000000000..3bbbc1ee92562
--- /dev/null
+++ b/tests/assets/to-do-notifications/LICENSE
@@ -0,0 +1,116 @@
+CC0 1.0 Universal
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited
+to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display, communicate,
+  and translate a Work;
+
+  ii. moral rights retained by the original author(s) and/or performer(s);
+
+  iii. publicity and privacy rights pertaining to a person's image or likeness
+  depicted in a Work;
+
+  iv. rights protecting against unfair competition in regards to a Work,
+  subject to the limitations in paragraph 4(a), below;
+
+  v. rights protecting the extraction, dissemination, use and reuse of data in
+  a Work;
+
+  vi. database rights (such as those arising under Directive 96/9/EC of the
+  European Parliament and of the Council of 11 March 1996 on the legal
+  protection of databases, and under any national implementation thereof,
+  including any amended or successor version of such directive); and
+
+  vii. other similar, equivalent or corresponding rights throughout the world
+  based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+  a. No trademark or patent rights held by Affirmer are waived, abandoned,
+  surrendered, licensed or otherwise affected by this document.
+
+  b. Affirmer offers the Work as-is and makes no representations or warranties
+  of any kind concerning the Work, express, implied, statutory or otherwise,
+  including without limitation warranties of title, merchantability, fitness
+  for a particular purpose, non infringement, or the absence of latent or
+  other defects, accuracy, or the present or absence of errors, whether or not
+  discoverable, all to the greatest extent permissible under applicable law.
+
+  c. Affirmer disclaims responsibility for clearing rights of other persons
+  that may apply to the Work or any use thereof, including without limitation
+  any person's Copyright and Related Rights in the Work. Further, Affirmer
+  disclaims responsibility for obtaining any necessary consents, permissions
+  or other rights required for any use of the Work.
+
+  d. Affirmer understands and acknowledges that Creative Commons is not a
+  party to this document and has no duty or obligation with respect to this
+  CC0 or use of the Work.
+
+For more information, please see
+<http://creativecommons.org/publicdomain/zero/1.0/>
\ No newline at end of file
diff --git a/tests/assets/to-do-notifications/README.md b/tests/assets/to-do-notifications/README.md
new file mode 100644
index 0000000000000..5bd8b1d38cd06
--- /dev/null
+++ b/tests/assets/to-do-notifications/README.md
@@ -0,0 +1 @@
+Source: https://github.com/mdn/dom-examples/tree/main/to-do-notifications
diff --git a/tests/assets/to-do-notifications/index.html b/tests/assets/to-do-notifications/index.html
new file mode 100644
index 0000000000000..e9cd52c7b8fc2
--- /dev/null
+++ b/tests/assets/to-do-notifications/index.html
@@ -0,0 +1,108 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=380">
+    <script src="scripts/todo.js"></script>
+	<title>To-do list with Notifications</title>
+	<link href="style/style.css" type="text/css" rel="stylesheet">
+</head>
+<body>
+
+<h1>To-do list</h1>
+
+<div class="task-box">
+
+<ul id="task-list">
+
+</ul>
+
+</div>
+
+<div class="form-box">
+<h2>Add new to-do item.</h2>
+
+<form id="task-form" action="index.html">
+  <div class="full-width"><label for="title">Task title:</label><input type="text" id="title" required></div>
+  <div class="half-width"><label for="deadline-hours">Hours (hh):</label><input type="number" id="deadline-hours" required></div>
+  <div class="half-width"><label for="deadline-minutes">Mins (mm):</label><input type="number" id="deadline-minutes" required></div>
+  <div class="third-width"><label for="deadline-day">Day:</label>
+        <select id="deadline-day" required>
+          <option value="01">01</option>
+          <option value="02">02</option>
+          <option value="03">03</option>
+          <option value="04">04</option>
+          <option value="05">05</option>
+          <option value="06">06</option>
+          <option value="07">07</option>
+          <option value="08">08</option>
+          <option value="09">09</option>
+          <option value="10">10</option>
+          <option value="11">11</option>
+          <option value="12">12</option>
+          <option value="13">13</option>
+          <option value="14">14</option>
+          <option value="15">15</option>
+          <option value="16">16</option>
+          <option value="17">17</option>
+          <option value="18">18</option>
+          <option value="19">19</option>
+          <option value="20">20</option>
+          <option value="21">21</option>
+          <option value="22">22</option>
+          <option value="23">23</option>
+          <option value="24">24</option>
+          <option value="25">25</option>
+          <option value="26">26</option>
+          <option value="27">27</option>
+          <option value="28">28</option>
+          <option value="29">29</option>
+          <option value="30">30</option>
+          <option value="31">31</option>
+        </select></div>
+
+  <div class="third-width"><label for="deadline-month">Month:</label>
+       <select id="deadline-month" required>
+         <option value="January">January</option>
+         <option value="February">February</option>
+         <option value="March">March</option>
+         <option value="April">April</option>
+         <option value="May">May</option>
+         <option value="June">June</option>
+         <option value="July">July</option>
+         <option value="August">August</option>
+         <option value="September">September</option>
+         <option value="October">October</option>
+         <option value="November">November</option>
+         <option value="December">December</option>
+       </select></div>
+
+  <div class="third-width"><label for="deadline-year">Year:</label>
+       <select id="deadline-year" required>
+	 <option value="2025">2025</option>
+         <option value="2024">2024</option>
+         <option value="2023">2023</option>
+         <option value="2022">2022</option>
+         <option value="2021">2021</option>
+         <option value="2020">2020</option>
+         <option value="2019">2019</option>
+         <option value="2018">2018</option>
+       </select></div>
+
+  <div><input type="submit" id="submit" value="Add Task"></div>
+  <div></div>
+</form>
+</div>
+
+<div id="toolbar">
+  <ul id="notifications">
+
+  </ul>
+
+  <button id="enable">
+    Enable notifications
+  </button>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/assets/to-do-notifications/manifest.webapp b/tests/assets/to-do-notifications/manifest.webapp
new file mode 100644
index 0000000000000..fe48e2e423fd5
--- /dev/null
+++ b/tests/assets/to-do-notifications/manifest.webapp
@@ -0,0 +1,18 @@
+{
+  "version": "0.1",
+  "name": "To-do list",
+  "description": "Store to-do items on your device, and be notified when the deadlines are up.",
+  "launch_path": "/to-do-notifications/index.html",
+  "icons": {
+    "128": "/to-do-notifications/img/icon-128.png"
+  },
+  "developer": {
+    "name": "Chris Mills",
+    "url": "http://chrisdavidmills.github.io/to-do-notifications/"
+  },
+  "permissions": {
+    "desktop-notification": {
+      "description": "Needed for creating system notifications."
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/assets/to-do-notifications/scripts/todo.js b/tests/assets/to-do-notifications/scripts/todo.js
new file mode 100644
index 0000000000000..52fee476a9545
--- /dev/null
+++ b/tests/assets/to-do-notifications/scripts/todo.js
@@ -0,0 +1,354 @@
+window.onload = () => {
+  const MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+
+  // Hold an instance of a db object for us to store the IndexedDB data in
+  let db;
+
+  // Create a reference to the notifications list in the bottom of the app; we will write database messages into this list by
+  // appending list items as children of this element
+  const note = document.getElementById('notifications');
+
+  // All other UI elements we need for the app
+  const taskList = document.getElementById('task-list');
+  const taskForm = document.getElementById('task-form');
+  const title = document.getElementById('title');
+  const hours = document.getElementById('deadline-hours');
+  const minutes = document.getElementById('deadline-minutes');
+  const day = document.getElementById('deadline-day');
+  const month = document.getElementById('deadline-month');
+  const year = document.getElementById('deadline-year');
+  const notificationBtn = document.getElementById('enable');
+
+  // Do an initial check to see what the notification permission state is
+  if (Notification.permission === 'denied' || Notification.permission === 'default') {
+    notificationBtn.style.display = 'block';
+  } else {
+    notificationBtn.style.display = 'none';
+  }
+
+  note.appendChild(createListItem('App initialised.'));
+
+  // Let us open our database
+  const DBOpenRequest = window.indexedDB.open('toDoList', 4);
+
+  // Register two event handlers to act on the database being opened successfully, or not
+  DBOpenRequest.onerror = (event) => {
+    note.appendChild(createListItem('Error loading database.'));
+  };
+
+  DBOpenRequest.onsuccess = (event) => {
+    note.appendChild(createListItem('Database initialised.'));
+
+    // Store the result of opening the database in the db variable. This is used a lot below
+    db = DBOpenRequest.result;
+
+    // Run the displayData() function to populate the task list with all the to-do list data already in the IndexedDB
+    displayData();
+  };
+
+  // This event handles the event whereby a new version of the database needs to be created
+  // Either one has not been created before, or a new version number has been submitted via the
+  // window.indexedDB.open line above
+  //it is only implemented in recent browsers
+  DBOpenRequest.onupgradeneeded = (event) => {
+    db = event.target.result;
+
+    db.onerror = (event) => {
+      note.appendChild(createListItem('Error loading database.'));
+    };
+
+    // Create an objectStore for this database
+    const objectStore = db.createObjectStore('toDoList', { keyPath: 'taskTitle' });
+
+    // Define what data items the objectStore will contain
+    objectStore.createIndex('hours', 'hours', { unique: false });
+    objectStore.createIndex('minutes', 'minutes', { unique: false });
+    objectStore.createIndex('day', 'day', { unique: false });
+    objectStore.createIndex('month', 'month', { unique: false });
+    objectStore.createIndex('year', 'year', { unique: false });
+
+    objectStore.createIndex('notified', 'notified', { unique: false });
+
+    note.appendChild(createListItem('Object store created.'));
+  };
+
+  function displayData() {
+    // First clear the content of the task list so that you don't get a huge long list of duplicate stuff each time
+    // the display is updated.
+    while (taskList.firstChild) {
+      taskList.removeChild(taskList.lastChild);
+    }
+
+    // Open our object store and then get a cursor list of all the different data items in the IDB to iterate through
+    const objectStore = db.transaction('toDoList').objectStore('toDoList');
+    objectStore.openCursor().onsuccess = (event) => {
+      const cursor = event.target.result;
+      // Check if there are no (more) cursor items to iterate through
+      if (!cursor) {
+        // No more items to iterate through, we quit.
+        note.appendChild(createListItem('Entries all displayed.'));
+        return;
+      }
+      
+      // Check which suffix the deadline day of the month needs
+      const { hours, minutes, day, month, year, notified, taskTitle } = cursor.value;
+      const ordDay = ordinal(day);
+
+      // Build the to-do list entry and put it into the list item.
+      const toDoText = `${taskTitle} — ${hours}:${minutes}, ${month} ${ordDay} ${year}.`;
+      const listItem = createListItem(toDoText);
+
+      if (notified === 'yes') {
+        listItem.style.textDecoration = 'line-through';
+        listItem.style.color = 'rgba(255, 0, 0, 0.5)';
+      }
+
+      // Put the item item inside the task list
+      taskList.appendChild(listItem);
+
+      // Create a delete button inside each list item,
+      const deleteButton = document.createElement('button');
+      listItem.appendChild(deleteButton);
+      deleteButton.textContent = 'X';
+      
+      // Set a data attribute on our delete button to associate the task it relates to.
+      deleteButton.setAttribute('data-task', taskTitle);
+      
+      // Associate action (deletion) when clicked
+      deleteButton.onclick = (event) => {
+        deleteItem(event);
+      };
+
+      // continue on to the next item in the cursor
+      cursor.continue();
+    };
+  };
+
+  // Add listener for clicking the submit button
+  taskForm.addEventListener('submit', addData, false);
+
+  function addData(e) {
+    // Prevent default, as we don't want the form to submit in the conventional way
+    e.preventDefault();
+
+    // Stop the form submitting if any values are left empty.
+    // This should never happen as there is the required attribute
+    if (title.value === '' || hours.value === null || minutes.value === null || day.value === '' || month.value === '' || year.value === null) {
+      note.appendChild(createListItem('Data not submitted — form incomplete.'));
+      return;
+    }
+    
+    // Grab the values entered into the form fields and store them in an object ready for being inserted into the IndexedDB
+    const newItem = [
+      { taskTitle: title.value, hours: hours.value, minutes: minutes.value, day: day.value, month: month.value, year: year.value, notified: 'no' },
+    ];
+
+    // Open a read/write DB transaction, ready for adding the data
+    const transaction = db.transaction(['toDoList'], 'readwrite');
+
+    // Report on the success of the transaction completing, when everything is done
+    transaction.oncomplete = () => {
+      note.appendChild(createListItem('Transaction completed: database modification finished.'));
+
+      // Update the display of data to show the newly added item, by running displayData() again.
+      displayData();
+    };
+
+    // Handler for any unexpected error
+    transaction.onerror = () => {
+      note.appendChild(createListItem(`Transaction not opened due to error: ${transaction.error}`));
+    };
+
+    // Call an object store that's already been added to the database
+    const objectStore = transaction.objectStore('toDoList');
+    console.log(objectStore.indexNames);
+    console.log(objectStore.keyPath);
+    console.log(objectStore.name);
+    console.log(objectStore.transaction);
+    console.log(objectStore.autoIncrement);
+
+    // Make a request to add our newItem object to the object store
+    const objectStoreRequest = objectStore.add(newItem[0]);
+    objectStoreRequest.onsuccess = (event) => {
+
+      // Report the success of our request
+      // (to detect whether it has been successfully
+      // added to the database, you'd look at transaction.oncomplete)
+      note.appendChild(createListItem('Request successful.'));
+
+      // Clear the form, ready for adding the next entry
+      title.value = '';
+      hours.value = null;
+      minutes.value = null;
+      day.value = 01;
+      month.value = 'January';
+      year.value = 2020;
+    };
+  };
+
+  function deleteItem(event) {
+    // Retrieve the name of the task we want to delete
+    const dataTask = event.target.getAttribute('data-task');
+
+    // Open a database transaction and delete the task, finding it by the name we retrieved above
+    const transaction = db.transaction(['toDoList'], 'readwrite');
+    transaction.objectStore('toDoList').delete(dataTask);
+
+    // Report that the data item has been deleted
+    transaction.oncomplete = () => {
+      // Delete the parent of the button, which is the list item, so it is no longer displayed
+      event.target.parentNode.parentNode.removeChild(event.target.parentNode);
+      note.appendChild(createListItem(`Task "${dataTask}" deleted.`));
+    };
+  };
+
+  // Check whether the deadline for each task is up or not, and responds appropriately
+  function checkDeadlines() {
+    // First of all check whether notifications are enabled or denied
+    if (Notification.permission === 'denied' || Notification.permission === 'default') {
+      notificationBtn.style.display = 'block';
+    } else {
+      notificationBtn.style.display = 'none';
+    }
+
+    // Grab the current time and date
+    const now = new Date();
+
+    // From the now variable, store the current minutes, hours, day of the month, month, year and seconds
+    const minuteCheck = now.getMinutes();
+    const hourCheck = now.getHours();
+    const dayCheck = now.getDate(); // Do not use getDay() that returns the day of the week, 1 to 7
+    const monthCheck = now.getMonth();
+    const yearCheck = now.getFullYear(); // Do not use getYear() that is deprecated.
+
+    // Open a new transaction
+    const objectStore = db.transaction(['toDoList'], 'readwrite').objectStore('toDoList');
+    
+    // Open a cursor to iterate through all the data items in the IndexedDB
+    objectStore.openCursor().onsuccess = (event) => {
+      const cursor = event.target.result;
+      if (!cursor) return;
+      const { hours, minutes, day, month, year, notified, taskTitle } = cursor.value;
+
+      // convert the month names we have installed in the IDB into a month number that JavaScript will understand.
+      // The JavaScript date object creates month values as a number between 0 and 11.
+      const monthNumber = MONTHS.indexOf(month);
+      if (monthNumber === -1) throw new Error('Incorrect month entered in database.');
+
+      // Check if the current hours, minutes, day, month and year values match the stored values for each task.
+      // The parseInt() function transforms the value from a string to a number for comparison
+      // (taking care of leading zeros, and removing spaces and underscores from the string).
+      let matched = parseInt(hours) === hourCheck;
+      matched &&= parseInt(minutes) === minuteCheck;
+      matched &&= parseInt(day) === dayCheck;
+      matched &&= parseInt(monthNumber) === monthCheck;
+      matched &&= parseInt(year) === yearCheck;
+      if (matched && notified === 'no') {
+        // If the numbers all do match, run the createNotification() function to create a system notification
+        // but only if the permission is set
+        if (Notification.permission === 'granted') {
+          createNotification(taskTitle);
+        }
+      }
+
+      // Move on to the next cursor item
+      cursor.continue();
+    };
+  };
+
+  // Ask for permission when the 'Enable notifications' button is clicked
+  function askNotificationPermission() {
+    // Function to actually ask the permissions
+    function handlePermission(permission) {
+      // Whatever the user answers, we make sure Chrome stores the information
+      if (!Reflect.has(Notification, 'permission')) {
+        Notification.permission = permission;
+      }
+
+      // Set the button to shown or hidden, depending on what the user answers
+      if (Notification.permission === 'denied' || Notification.permission === 'default') {
+        notificationBtn.style.display = 'block';
+      } else {
+        notificationBtn.style.display = 'none';
+      }
+    };
+
+    // Check if the browser supports notifications
+    if (!Reflect.has(window, 'Notification')) {
+      console.log('This browser does not support notifications.');
+    } else {
+      if (checkNotificationPromise()) {
+        Notification.requestPermission().then(handlePermission);
+      } else {
+        Notification.requestPermission(handlePermission);
+      }
+    }
+  };
+
+  // Check whether browser supports the promise version of requestPermission()
+  // Safari only supports the old callback-based version
+  function checkNotificationPromise() {
+    try {
+      Notification.requestPermission().then();
+    } catch(e) {
+      return false;
+    }
+
+    return true;
+  };
+
+  // Wire up notification permission functionality to 'Enable notifications' button
+  notificationBtn.addEventListener('click', askNotificationPermission);
+
+  function createListItem(contents) {
+    const listItem = document.createElement('li');
+    listItem.textContent = contents;
+    return listItem;
+  };
+
+  // Create a notification with the given title
+  function createNotification(title) {
+    // Create and show the notification
+    const img = '/to-do-notifications/img/icon-128.png';
+    const text = `HEY! Your task "${title}" is now overdue.`;
+    const notification = new Notification('To do list', { body: text, icon: img });
+
+    // We need to update the value of notified to 'yes' in this particular data object, so the
+    // notification won't be set off on it again
+
+    // First open up a transaction
+    const objectStore = db.transaction(['toDoList'], 'readwrite').objectStore('toDoList');
+
+    // Get the to-do list object that has this title as its title
+    const objectStoreTitleRequest = objectStore.get(title);
+
+    objectStoreTitleRequest.onsuccess = () => {
+      // Grab the data object returned as the result
+      const data = objectStoreTitleRequest.result;
+
+      // Update the notified value in the object to 'yes'
+      data.notified = 'yes';
+
+      // Create another request that inserts the item back into the database
+      const updateTitleRequest = objectStore.put(data);
+
+      // When this new request succeeds, run the displayData() function again to update the display
+      updateTitleRequest.onsuccess = () => {
+        displayData();
+      };
+    };
+  };
+
+  // Using a setInterval to run the checkDeadlines() function every second
+  setInterval(checkDeadlines, 1000);
+}
+
+// Helper function returning the day of the month followed by an ordinal (st, nd, or rd)
+function ordinal(day) {
+  const n = day.toString();
+  const last = n.slice(-1);
+  if (last === '1' && n !== '11') return `${n}st`;
+  if (last === '2' && n !== '12') return `${n}nd`;
+  if (last === '3' && n !== '13') return `${n}rd`;
+  return `${n}th`;
+};
\ No newline at end of file
diff --git a/tests/assets/to-do-notifications/style/style.css b/tests/assets/to-do-notifications/style/style.css
new file mode 100644
index 0000000000000..c08ff299ac9cc
--- /dev/null
+++ b/tests/assets/to-do-notifications/style/style.css
@@ -0,0 +1,248 @@
+/* Basic set up + sizing for containers */
+
+html,
+body {
+  margin: 0;
+}
+
+html {
+  width: 100%;
+  height: 100%;
+  font-size: 10px;
+  font-family: Georgia, "Times New Roman", Times, serif;
+  background: #111;
+}
+
+body {
+  width: 50rem;
+  position: relative;
+  background: #d88;
+  margin: 0 auto;
+  border-left: 2px solid #d33;
+  border-right: 2px solid #d33;
+}
+
+h1,
+h2 {
+  text-align: center;
+  background: #d88;
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+h1 {
+  font-size: 6rem;
+  margin: 0;
+  background: #d66;
+}
+
+h2 {
+  font-size: 2.4rem;
+}
+
+/* Bottom toolbar styling  */
+
+#toolbar {
+  position: relative;
+  height: 6rem;
+  width: 100%;
+  background: #d66;
+  border-top: 2px solid #d33;
+  border-bottom: 2px solid #d33;
+}
+
+#enable,
+input[type="submit"] {
+  line-height: 1.8;
+  font-size: 1.3rem;
+  border-radius: 5px;
+  border: 1px solid black;
+  color: black;
+  text-shadow: 1px 1px 1px black;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  box-shadow:
+    inset 0px 5px 3px rgba(255, 255, 255, 0.2),
+    inset 0px -5px 3px rgba(0, 0, 0, 0.2);
+}
+
+#enable {
+  position: absolute;
+  bottom: 0.3rem;
+  right: 0.3rem;
+}
+
+#notifications {
+  margin: 0;
+  position: relative;
+  padding: 0.3rem;
+  background: #ddd;
+  position: absolute;
+  top: 0rem;
+  left: 0rem;
+  height: 5.4rem;
+  width: 50%;
+  overflow: auto;
+  line-height: 1.2;
+}
+
+#notifications li {
+  margin-left: 1.5rem;
+}
+
+/* New item form styling */
+
+.form-box {
+  background: #d66;
+  width: 85%;
+  padding: 1rem;
+  margin: 2rem auto;
+  box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.7);
+}
+
+form div {
+  margin-bottom: 1rem;
+}
+
+form .full-width {
+  margin: 1rem auto 2rem;
+  width: 100%;
+}
+
+form .half-width {
+  width: 50%;
+  float: left;
+}
+
+form .third-width {
+  width: 33%;
+  float: left;
+}
+
+form div label {
+  width: 10rem;
+  float: left;
+  padding-right: 1rem;
+  font-size: 1.6rem;
+  line-height: 1.6;
+}
+
+form .full-width input {
+  width: 30rem;
+}
+
+form .half-width input {
+  width: 8.75rem;
+}
+
+form .third-width select {
+  width: 13.5rem;
+}
+
+form div input[type="submit"] {
+  clear: both;
+  width: 20rem;
+  display: block;
+  height: 3rem;
+  margin: 0 auto;
+  position: relative;
+  top: 0.5rem;
+}
+
+/* || tasks box */
+
+.task-box {
+  width: 85%;
+  padding: 1rem;
+  margin: 2rem auto;
+  font-size: 1.8rem;
+}
+
+.task-box ul {
+  margin: 0;
+  padding: 0;
+}
+
+.task-box li {
+  list-style-type: none;
+  padding: 1rem;
+  border-bottom: 2px solid #d33;
+}
+
+.task-box li:last-child {
+  border-bottom: none;
+}
+
+.task-box li:last-child {
+  margin-bottom: 0rem;
+}
+
+.task-box button {
+  margin-left: 2rem;
+  font-size: 1.6rem;
+  border: 1px solid #eee;
+  border-radius: 5px;
+  box-shadow: inset 0 -2px 5px rgba(0, 0, 0, 0.5) 1px 1px 1px black;
+}
+
+/* setting cursor for interactive controls */
+
+button,
+input[type="submit"],
+select {
+  cursor: pointer;
+}
+
+/* media query for small screens */
+
+@media (max-width: 32rem) {
+  body {
+    width: 100%;
+    border-left: none;
+    border-right: none;
+  }
+
+  form div {
+    clear: both;
+  }
+
+  form .full-width {
+    margin: 1rem auto;
+  }
+
+  form .half-width {
+    width: 100%;
+    float: none;
+  }
+
+  form .third-width {
+    width: 100%;
+    float: none;
+  }
+
+  form div label {
+    width: 36%;
+    padding-left: 1rem;
+  }
+
+  form input,
+  form select,
+  form label {
+    line-height: 2.5rem;
+    font-size: 2rem;
+  }
+
+  form .full-width input {
+    width: 50%;
+  }
+
+  form .half-width input {
+    width: 50%;
+  }
+
+  form .third-width select {
+    width: 50%;
+  }
+
+  #enable {
+    right: 1rem;
+  }
+}
\ No newline at end of file
diff --git a/tests/assets/trace-remote-time-diff.zip b/tests/assets/trace-remote-time-diff.zip
new file mode 100644
index 0000000000000..e7d7c54c35c8c
Binary files /dev/null and b/tests/assets/trace-remote-time-diff.zip differ
diff --git a/tests/bidi/README.md b/tests/bidi/README.md
new file mode 100644
index 0000000000000..91e11248610b8
--- /dev/null
+++ b/tests/bidi/README.md
@@ -0,0 +1,26 @@
+## Running Bidi tests
+
+To run Playwright tests with Bidi:
+
+```sh
+git clone https://github.com/microsoft/playwright.git
+cd playwright
+npm run build # call `npm run watch` for watch mode
+npx playwright install chromium
+npm run biditest -- --project='moz-firefox-*'
+```
+
+To install beta channel of Firefox, run the following command in the project root:
+```sh
+npx -y @puppeteer/browsers install firefox@beta
+```
+After that you need to pass custom firefox binary path to the test runner via `BIDI_FFPATH`:
+```sh
+BIDI_FFPATH='/Users/myself/playwright/firefox/mac_arm-beta_138.0b5/Firefox.app/Contents/MacOS/firefox' npm run biditest -- --project='moz-firefox-*'
+```
+
+For custom Chromium path use `BIDI_CRPATH`.
+
+```sh
+BIDI_CRPATH='/Users/myself/Downloads/chrome-mac-arm64/Google Chrome for Testing.app/Contents/MacOS/Google Chrome for Testing'
+```
diff --git a/tests/bidi/csvReporter.ts b/tests/bidi/csvReporter.ts
new file mode 100644
index 0000000000000..54eee194ba7ca
--- /dev/null
+++ b/tests/bidi/csvReporter.ts
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type {
+  FullConfig, FullResult, Reporter, Suite
+} from '@playwright/test/reporter';
+import { stripAnsi } from '../config/utils';
+import fs from 'fs';
+import path from 'path';
+
+
+type ReporterOptions = {
+  outputFile?: string,
+  configDir: string,
+};
+
+class CsvReporter implements Reporter {
+  private _suite: Suite;
+  private _options: ReporterOptions;
+  private _pendingWrite: Promise<void>;
+
+  constructor(options: ReporterOptions) {
+    this._options = options;
+  }
+
+  onBegin(config: FullConfig, suite: Suite) {
+    this._suite = suite;
+  }
+
+  onEnd(result: FullResult) {
+    const rows = [['Test Name', 'Expected Status', 'Status', 'Error Message']];
+    for (const project of this._suite.suites) {
+      for (const file of project.suites) {
+        for (const test of file.allTests()) {
+          // Report fixme tests as failing.
+          const fixme = test.annotations.find(a => a.type === 'fixme');
+          if (test.ok() && !fixme)
+            continue;
+          const row = [];
+          const [, , , ...titles] = test.titlePath();
+          row.push(csvEscape(`${file.title} › ${titles.join(' › ')}`));
+          row.push(test.expectedStatus);
+          row.push(test.outcome());
+          if (fixme) {
+            row.push('fixme' + (fixme.description ? `: ${fixme.description}` : ''));
+          } else {
+            const result = test.results.find(r => r.error);
+            const errorMessage = stripAnsi(result?.error?.message.replace(/\s+/g, ' ').trim().substring(0, 1024));
+            row.push(csvEscape(errorMessage ?? ''));
+          }
+          rows.push(row);
+        }
+      }
+    }
+    const csv = rows.map(r => r.join(',')).join('\n');
+    const reportFile = path.resolve(this._options.configDir, this._options.outputFile || 'test-results.csv');
+    this._pendingWrite = (async () => {
+      await fs.promises.mkdir(path.dirname(reportFile), { recursive: true });
+      await fs.promises.writeFile(reportFile, csv);
+    })();
+  }
+
+  async onExit() {
+    await this._pendingWrite;
+  }
+
+  printsToStdio(): boolean {
+    return false;
+  }
+}
+
+function csvEscape(str) {
+  if (str.includes('"') || str.includes(',') || str.includes('\n'))
+    return `"${str.replace(/"/g, '""')}"`;
+  return str;
+}
+
+export default CsvReporter;
diff --git a/tests/bidi/expectationReporter.ts b/tests/bidi/expectationReporter.ts
new file mode 100644
index 0000000000000..d88875f031d87
--- /dev/null
+++ b/tests/bidi/expectationReporter.ts
@@ -0,0 +1,90 @@
+/**
+ * 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 {
+  FullConfig, FullResult, Reporter, Suite, TestCase
+} from '@playwright/test/reporter';
+import fs from 'fs';
+import { parseBidiExpectations as parseExpectations, projectExpectationPath } from './expectationUtil';
+import type { TestExpectation } from './expectationUtil';
+
+type ReporterOptions = {
+  rebase?: boolean;
+};
+
+class ExpectationReporter implements Reporter {
+  private _suite: Suite;
+  private _options: ReporterOptions;
+  private _pendingUpdates: Promise<void>[] = [];
+
+  constructor(options: ReporterOptions) {
+    this._options = options;
+  }
+
+  onBegin(config: FullConfig, suite: Suite) {
+    this._suite = suite;
+  }
+
+  onEnd(result: FullResult) {
+    if (!this._options.rebase)
+      return;
+    for (const project of this._suite.suites)
+      this._pendingUpdates.push(this._updateProjectExpectations(project));
+  }
+
+  async onExit() {
+    await Promise.all(this._pendingUpdates);
+  }
+
+  private async _updateProjectExpectations(project: Suite) {
+    const outputFile = projectExpectationPath(project.title);
+    const expectations = await parseExpectations(project.title);
+    for (const test of project.allTests()) {
+      const outcome = getOutcome(test);
+      // Strip root and project names.
+      const key = test.titlePath().slice(2).join(' › ');
+      if (outcome === 'timeout')
+        expectations.set(key, outcome);
+      else if (expectations.has(key) && test.outcome() !== 'skipped')
+        expectations.delete(key); // Remove tests that no longer timeout.
+    }
+    const keys = Array.from(expectations.keys());
+    keys.sort();
+    const results = keys.map(key => `${key} [${expectations.get(key)}]`);
+    console.log('Writing new expectations to', outputFile);
+    await fs.promises.writeFile(outputFile, results.join('\n'));
+  }
+
+  printsToStdio(): boolean {
+    return false;
+  }
+}
+
+function getOutcome(test: TestCase): TestExpectation {
+  if (test.results.length === 0)
+    return 'unknown';
+  if (test.results.every(r => r.status === 'timedOut'))
+    return 'timeout';
+  if (test.outcome() === 'expected')
+    return 'pass';
+  if (test.outcome() === 'unexpected')
+    return 'fail';
+  if (test.outcome() === 'flaky')
+    return 'flaky';
+  return 'unknown';
+}
+
+export default ExpectationReporter;
diff --git a/tests/bidi/expectationUtil.ts b/tests/bidi/expectationUtil.ts
new file mode 100644
index 0000000000000..a9f093c46f095
--- /dev/null
+++ b/tests/bidi/expectationUtil.ts
@@ -0,0 +1,57 @@
+/**
+ * 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 type { TestInfo } from 'playwright/test';
+
+export type TestExpectation = 'unknown' | 'flaky' | 'pass' | 'fail' | 'timeout';
+
+type ShouldSkipPredicate = (info: TestInfo) => boolean;
+
+export async function createSkipTestPredicate(projectName: string): Promise<ShouldSkipPredicate> {
+  if (!process.env.PWTEST_USE_BIDI_EXPECTATIONS)
+    return () => false;
+  const expectationsMap = await parseBidiExpectations(projectName);
+  return (info: TestInfo) => {
+    const key = info.titlePath.join(' › ');
+    const expectation = expectationsMap.get(key);
+    return expectation === 'timeout';
+  };
+}
+
+export async function parseBidiExpectations(projectName: string): Promise<Map<string, TestExpectation>> {
+  const filePath = projectExpectationPath(projectName);
+  try {
+    await fs.promises.access(filePath);
+  } catch (e) {
+    return new Map();
+  }
+  const content = await fs.promises.readFile(filePath);
+  const pairs = content.toString().split('\n').map(line => {
+    const match = /(?<titlePath>.+) \[(?<expectation>[^\]]+)\]$/.exec(line);
+    if (!match) {
+      console.error('Bad expectation line: ' + line);
+      return undefined;
+    }
+    return [match.groups!.titlePath, match.groups!.expectation];
+  }).filter(Boolean) as [string, TestExpectation][];
+  return new Map(pairs);
+}
+
+export function projectExpectationPath(project: string): string {
+  return path.join(__dirname, 'expectations', project + '.txt');
+}
diff --git a/tests/bidi/expectations/bidi-chromium-library.txt b/tests/bidi/expectations/bidi-chromium-library.txt
new file mode 100644
index 0000000000000..aad83691f69b1
--- /dev/null
+++ b/tests/bidi/expectations/bidi-chromium-library.txt
@@ -0,0 +1,221 @@
+library/beforeunload.spec.ts › should access page after beforeunload [timeout]
+library/beforeunload.spec.ts › should run beforeunload if asked for @smoke [timeout]
+library/browsercontext-events.spec.ts › console event should work in immediately closed popup [timeout]
+library/browsercontext-events.spec.ts › console event should work in popup 2 [timeout]
+library/browsercontext-events.spec.ts › dialog event should work in immediately closed popup [timeout]
+library/browsercontext-events.spec.ts › dialog event should work in popup [timeout]
+library/browsercontext-events.spec.ts › dialog event should work with inline script tag [timeout]
+library/browsercontext-events.spec.ts › weberror event should work [timeout]
+library/browsercontext-locale.spec.ts › should format number in workers [timeout]
+library/browsercontext-page-event.spec.ts › should not hang on ctrl-click during provisional load [timeout]
+library/browsercontext-proxy.spec.ts › should proxy local network requests › by default › link-local [timeout]
+library/browsercontext-proxy.spec.ts › should proxy local network requests › with other bypasses › link-local [timeout]
+library/browsercontext-proxy.spec.ts › should use proxy for https urls [timeout]
+library/browsercontext-service-worker-policy.spec.ts › block › blocks service worker registration [timeout]
+library/browsercontext-user-agent.spec.ts › custom user agent for download [timeout]
+library/browsercontext-viewport-mobile.spec.ts › mobile viewport › should fire orientationchange event [timeout]
+library/browsertype-connect.spec.ts › launchServer only › should be able to reconnect to a browser 12 times without warnings [timeout]
+library/browsertype-connect.spec.ts › launchServer only › should properly disconnect when connection closes from the server side [timeout]
+library/browsertype-connect.spec.ts › launchServer only › should work with cluster [timeout]
+library/browsertype-connect.spec.ts › launchServer › disconnected event should be emitted when browser is closed or server is closed [timeout]
+library/browsertype-connect.spec.ts › launchServer › disconnected event should have browser as argument [timeout]
+library/browsertype-connect.spec.ts › launchServer › setInputFiles should preserve lastModified timestamp [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to connect 20 times to a single server without warnings [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to connect two browsers at the same time [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to connect when the wsEndpoint is passed as an option [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to reconnect to a browser [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to visit ipv6 [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to visit ipv6 through localhost [timeout]
+library/browsertype-connect.spec.ts › launchServer › should connect over http [timeout]
+library/browsertype-connect.spec.ts › launchServer › should connect over wss [timeout]
+library/browsertype-connect.spec.ts › launchServer › should emit close events on pages and contexts [timeout]
+library/browsertype-connect.spec.ts › launchServer › should error when saving download after deletion [timeout]
+library/browsertype-connect.spec.ts › launchServer › should filter launch options [timeout]
+library/browsertype-connect.spec.ts › launchServer › should fulfill with global fetch result [timeout]
+library/browsertype-connect.spec.ts › launchServer › should handle exceptions during connect [timeout]
+library/browsertype-connect.spec.ts › launchServer › should ignore page.pause when headed [timeout]
+library/browsertype-connect.spec.ts › launchServer › should not throw on close after disconnect [timeout]
+library/browsertype-connect.spec.ts › launchServer › should properly disconnect when connection closes from the client side [timeout]
+library/browsertype-connect.spec.ts › launchServer › should record trace with sources [timeout]
+library/browsertype-connect.spec.ts › launchServer › should reject navigation when browser closes [timeout]
+library/browsertype-connect.spec.ts › launchServer › should reject waitForEvent before browser.close finishes [timeout]
+library/browsertype-connect.spec.ts › launchServer › should reject waitForEvent before browser.onDisconnect fires [timeout]
+library/browsertype-connect.spec.ts › launchServer › should reject waitForSelector when browser closes [timeout]
+library/browsertype-connect.spec.ts › launchServer › should respect selectors [timeout]
+library/browsertype-connect.spec.ts › launchServer › should save download [timeout]
+library/browsertype-connect.spec.ts › launchServer › should save har [timeout]
+library/browsertype-connect.spec.ts › launchServer › should saveAs videos from remote browser [timeout]
+library/browsertype-connect.spec.ts › launchServer › should set the browser connected state [timeout]
+library/browsertype-connect.spec.ts › launchServer › should support slowmo option [timeout]
+library/browsertype-connect.spec.ts › launchServer › should terminate network waiters [timeout]
+library/browsertype-connect.spec.ts › launchServer › should throw when calling waitForNavigation after disconnect [timeout]
+library/browsertype-connect.spec.ts › launchServer › should throw when used after isConnected returns false [timeout]
+library/browsertype-connect.spec.ts › launchServer › should upload large file [timeout]
+library/channels.spec.ts › should work with the domain module [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › serviceWorker(), and fromServiceWorker() work [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › setExtraHTTPHeaders [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › setOffline [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should intercept only serviceworker request, not page [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should intercept service worker importScripts [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should intercept service worker requests (main and within) [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should report failure (due to content-type) of main service worker request [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should report failure (due to redirect) of main service worker request [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should report intercepted service worker requests in HAR [timeout]
+library/chromium/chromium.spec.ts › http credentials › httpCredentials [timeout]
+library/chromium/chromium.spec.ts › serviceWorkers() should return current workers [timeout]
+library/chromium/chromium.spec.ts › should close service worker together with the context [timeout]
+library/chromium/chromium.spec.ts › should create a worker from a service worker [timeout]
+library/chromium/chromium.spec.ts › should create a worker from service worker with noop routing [timeout]
+library/chromium/chromium.spec.ts › should emit new service worker on update [timeout]
+library/chromium/connect-over-cdp.spec.ts › should send default User-Agent header with connect request [timeout]
+library/chromium/connect-over-cdp.spec.ts › should send extra headers with connect request [timeout]
+library/chromium/oopif.spec.ts › should emit filechooser event for iframe [timeout]
+library/defaultbrowsercontext-2.spec.ts › should handle exception [timeout]
+library/download.spec.ts › download event › should be able to cancel pending downloads [timeout]
+library/download.spec.ts › download event › should close the context without awaiting the download [timeout]
+library/download.spec.ts › download event › should create subdirectories when saving to non-existent user-specified path [timeout]
+library/download.spec.ts › download event › should delete downloads on browser gone [timeout]
+library/download.spec.ts › download event › should delete downloads on context destruction [timeout]
+library/download.spec.ts › download event › should delete file [timeout]
+library/download.spec.ts › download event › should download large binary.zip [timeout]
+library/download.spec.ts › download event › should emit download event from nested iframes [timeout]
+library/download.spec.ts › download event › should error when saving after deletion [timeout]
+library/download.spec.ts › download event › should error when saving with downloads disabled [timeout]
+library/download.spec.ts › download event › should expose stream [timeout]
+library/download.spec.ts › download event › should not fail explicitly to cancel a download even if that is already finished [timeout]
+library/download.spec.ts › download event › should report alt-click downloads [timeout]
+library/download.spec.ts › download event › should report download path within page.on('download', …) handler for Blobs [timeout]
+library/download.spec.ts › download event › should report download path within page.on('download', …) handler for Files [timeout]
+library/download.spec.ts › download event › should report download when navigation turns into download @smoke [timeout]
+library/download.spec.ts › download event › should report downloads for download attribute [timeout]
+library/download.spec.ts › download event › should report downloads with acceptDownloads: false [timeout]
+library/download.spec.ts › download event › should report downloads with acceptDownloads: true [timeout]
+library/download.spec.ts › download event › should report new window downloads [timeout]
+library/download.spec.ts › download event › should report non-navigation downloads [timeout]
+library/download.spec.ts › download event › should report proper download url when download is from download attribute [timeout]
+library/download.spec.ts › download event › should save to overwritten filepath [timeout]
+library/download.spec.ts › download event › should save to two different paths with multiple saveAs calls [timeout]
+library/download.spec.ts › download event › should save to user-specified path without updating original path [timeout]
+library/download.spec.ts › download event › should throw if browser dies [timeout]
+library/download.spec.ts › download event › should work with Cross-Origin-Opener-Policy [timeout]
+library/download.spec.ts › should be able to download a PDF file [timeout]
+library/download.spec.ts › should be able to download a inline PDF file via navigation [timeout]
+library/download.spec.ts › should convert navigation to a resource with unsupported mime type into download [timeout]
+library/download.spec.ts › should download even if there is no "attachment" value [timeout]
+library/download.spec.ts › should download links with data url [timeout]
+library/download.spec.ts › should download successfully when routing [timeout]
+library/download.spec.ts › should save to user-specified path [timeout]
+library/downloads-path.spec.ts › downloads path › should delete downloads when context closes [timeout]
+library/downloads-path.spec.ts › downloads path › should keep downloadsPath folder [timeout]
+library/downloads-path.spec.ts › downloads path › should report downloads in downloadsPath folder [timeout]
+library/downloads-path.spec.ts › downloads path › should report downloads in downloadsPath folder with a relative path [timeout]
+library/geolocation.spec.ts › should isolate contexts [timeout]
+library/geolocation.spec.ts › should use context options [timeout]
+library/geolocation.spec.ts › should use context options for popup [timeout]
+library/geolocation.spec.ts › should work @smoke [timeout]
+library/geolocation.spec.ts › watchPosition should be notified [timeout]
+library/headful.spec.ts › should click background tab [timeout]
+library/headful.spec.ts › should close browsercontext with pending beforeunload dialog [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should assert navigation [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should await popup [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should check [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should check a radio button [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should check with keyboard [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should click [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should click after same-document navigation [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should click button with nested div [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should emit single keyup on ArrowDown [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should fill [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should fill [contentEditable] [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should fill japanese text [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should fill textarea [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should fill textarea with new lines at the end [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should ignore AltGraph [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should ignore programmatic events [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should make a positioned click on a canvas [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should middle click [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should not target selector preview by text regexp [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should press [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should record ArrowDown [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should record omnibox navigations after performAction [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should record omnibox navigations after recordAction [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should record slider [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should select [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should select with size attribute [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should uncheck [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should update selected element after pressing Tab [timeout]
+library/inspector/cli-codegen-1.spec.ts › cli codegen › should work with TrustedTypes [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › click should emit events in order [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should check input with chaining id [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should clear files [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should contain close page [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should contain open page [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should contain second page [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should download files [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should fill tricky characters [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should handle dialogs [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should handle history.postData [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should not clash pages [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should not lead to an error if html gets clicked [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should record navigations after identical pushState [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should record open in a new tab with url [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should reset hover model on action when element detaches [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should update active model on action [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should update hover model on action [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should upload a single file [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should upload multiple files [timeout]
+library/inspector/cli-codegen-2.spec.ts › should --test-id-attribute [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should assert value [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should assert value on disabled input [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should assert value on disabled select [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should assert visibility [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should click locator.first [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should click locator.nth [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should consume contextmenu events, despite a custom context menu [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should consume pointer events [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators with id attribute [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators with name attribute [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators with special characters in name attribute [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators with testId [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators with title attribute [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate getByAltText [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate getByLabel [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate getByLabel without regex [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate getByPlaceholder [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate getByTestId [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate role locators undef frame locators [timeout]
+library/inspector/pause.spec.ts › pause › should highlight locators with custom testId [timeout]
+library/inspector/pause.spec.ts › pause › should highlight on explore [timeout]
+library/inspector/pause.spec.ts › pause › should highlight on explore (csharp) [timeout]
+library/inspector/pause.spec.ts › pause › should highlight pointer, only in main frame [timeout]
+library/page-event-crash.spec.ts › should be able to close context when page crashes [timeout]
+library/page-event-crash.spec.ts › should cancel navigation when page crashes [timeout]
+library/page-event-crash.spec.ts › should cancel waitForEvent when page crashes [timeout]
+library/page-event-crash.spec.ts › should emit crash event when page crashes [timeout]
+library/page-event-crash.spec.ts › should throw on any action after page crashes [timeout]
+library/popup.spec.ts › should use viewport size from window features [timeout]
+library/shared-worker.spec.ts › should survive shared worker restart [timeout]
+library/slowmo.spec.ts › slowMo › Frame SlowMo setInputFiles [timeout]
+library/slowmo.spec.ts › slowMo › Page SlowMo reload [timeout]
+library/slowmo.spec.ts › slowMo › Page SlowMo setInputFiles [timeout]
+library/snapshotter.spec.ts › snapshots › should capture snapshot target [timeout]
+library/trace-viewer.spec.ts › should serve css without content-type [timeout]
+library/tracing.spec.ts › should collect trace with resources, but no js [timeout]
+library/unroute-behavior.spec.ts › context.unroute should not wait for pending handlers to complete [timeout]
+library/unroute-behavior.spec.ts › context.unrouteAll should not wait for pending handlers to complete if behavior is ignoreErrors [timeout]
+library/unroute-behavior.spec.ts › context.unrouteAll should wait for pending handlers to complete [timeout]
+library/video.spec.ts › screencast › should expose video path [timeout]
+library/video.spec.ts › screencast › should expose video path blank page [timeout]
+library/video.spec.ts › screencast › should expose video path blank popup [timeout]
+library/video.spec.ts › screencast › should work with relative path for recordVideo.dir [timeout]
+library/video.spec.ts › screencast › should work with weird screen resolution [timeout]
+library/web-socket.spec.ts › should emit binary frame events [timeout]
+library/web-socket.spec.ts › should emit close events [timeout]
+library/web-socket.spec.ts › should emit error [timeout]
+library/web-socket.spec.ts › should emit frame events [timeout]
+library/web-socket.spec.ts › should filter out the close events when the server closes with a message [timeout]
+library/web-socket.spec.ts › should not have stray error events [timeout]
+library/web-socket.spec.ts › should pass self as argument to close event [timeout]
+library/web-socket.spec.ts › should reject waitForEvent on page close [timeout]
+library/web-socket.spec.ts › should reject waitForEvent on socket close [timeout]
\ No newline at end of file
diff --git a/tests/bidi/expectations/bidi-chromium-page.txt b/tests/bidi/expectations/bidi-chromium-page.txt
new file mode 100644
index 0000000000000..d02e876e2486b
--- /dev/null
+++ b/tests/bidi/expectations/bidi-chromium-page.txt
@@ -0,0 +1,71 @@
+page/expect-timeout.spec.ts › should not print timed out error message when page closes [timeout]
+page/frame-hierarchy.spec.ts › should refuse to display x-frame-options:deny iframe [timeout]
+page/frame-hierarchy.spec.ts › should send "framenavigated" when navigating on anchor URLs [timeout]
+page/locator-is-visible.spec.ts › isVisible during navigation should not throw [timeout]
+page/locator-misc-1.spec.ts › should upload the file [timeout]
+page/page-click.spec.ts › should click in a nested transformed iframe [timeout]
+page/page-click.spec.ts › should click in a transformed iframe [timeout]
+page/page-click.spec.ts › should click the button with fixed position inside an iframe [timeout]
+page/page-dialog.spec.ts › should handle multiple alerts [timeout]
+page/page-dialog.spec.ts › should handle multiple confirms [timeout]
+page/page-event-console.spec.ts › should trigger correct Log [timeout]
+page/page-event-network.spec.ts › should resolve responses after a navigation [timeout]
+page/page-event-pageerror.spec.ts › should contain sourceURL [timeout]
+page/page-event-pageerror.spec.ts › should contain the Error.name property [timeout]
+page/page-event-pageerror.spec.ts › should emit error from unhandled rejects [timeout]
+page/page-event-pageerror.spec.ts › should fire [timeout]
+page/page-event-pageerror.spec.ts › should handle object [timeout]
+page/page-event-pageerror.spec.ts › should handle odd values [timeout]
+page/page-event-pageerror.spec.ts › should handle window [timeout]
+page/page-event-pageerror.spec.ts › should not receive console message for pageError [timeout]
+page/page-event-pageerror.spec.ts › should support an empty Error.name property [timeout]
+page/page-event-popup.spec.ts › should be able to capture alert [timeout]
+page/page-expose-function.spec.ts › exposeBinding(handle) should work with element handles [timeout]
+page/page-expose-function.spec.ts › should be callable from-inside addInitScript [timeout]
+page/page-expose-function.spec.ts › should not result in unhandled rejection [timeout]
+page/page-goto.spec.ts › should work with anchor navigation [timeout]
+page/page-history.spec.ts › page.goBack during renderer-initiated navigation [timeout]
+page/page-history.spec.ts › page.reload should work with data url [timeout]
+page/page-keyboard.spec.ts › should send proper codes while typing with shift [timeout]
+page/page-set-input-files.spec.ts › input event.composed should be true and cross shadow dom boundary [timeout]
+page/page-set-input-files.spec.ts › input should trigger events when files changed second time [timeout]
+page/page-set-input-files.spec.ts › should accept single file [timeout]
+page/page-set-input-files.spec.ts › should be able to read selected file [timeout]
+page/page-set-input-files.spec.ts › should be able to reset selected files with empty file list [timeout]
+page/page-set-input-files.spec.ts › should emit event addListener/removeListener [timeout]
+page/page-set-input-files.spec.ts › should emit event after navigation [timeout]
+page/page-set-input-files.spec.ts › should emit event for iframe [timeout]
+page/page-set-input-files.spec.ts › should emit event on/off [timeout]
+page/page-set-input-files.spec.ts › should emit event once [timeout]
+page/page-set-input-files.spec.ts › should emit event via prepend [timeout]
+page/page-set-input-files.spec.ts › should not accept multiple files for single-file input [timeout]
+page/page-set-input-files.spec.ts › should not throw when filechooser belongs to iframe [timeout]
+page/page-set-input-files.spec.ts › should preserve lastModified timestamp [timeout]
+page/page-set-input-files.spec.ts › should return the same file chooser when there are many watchdogs simultaneously [timeout]
+page/page-set-input-files.spec.ts › should set from memory [timeout]
+page/page-set-input-files.spec.ts › should trigger listener added before navigation [timeout]
+page/page-set-input-files.spec.ts › should work @smoke [timeout]
+page/page-set-input-files.spec.ts › should work for "multiple" [timeout]
+page/page-set-input-files.spec.ts › should work for "webkitdirectory" [timeout]
+page/page-set-input-files.spec.ts › should work for single file pick [timeout]
+page/page-set-input-files.spec.ts › should work when file input is attached to DOM [timeout]
+page/page-set-input-files.spec.ts › should work when file input is not attached to DOM [timeout]
+page/page-set-input-files.spec.ts › should work with CSP [timeout]
+page/page-set-input-files.spec.ts › should work with no timeout [timeout]
+page/page-wait-for-url.spec.ts › should work with commit and about:blank [timeout]
+page/retarget.spec.ts › setInputFiles should work with label [timeout]
+page/workers.spec.ts › Page.workers @smoke [timeout]
+page/workers.spec.ts › should attribute network activity for worker inside iframe to the iframe [timeout]
+page/workers.spec.ts › should clear upon cross-process navigation [timeout]
+page/workers.spec.ts › should clear upon navigation [timeout]
+page/workers.spec.ts › should dispatch console messages when page has workers [timeout]
+page/workers.spec.ts › should emit created and destroyed events [timeout]
+page/workers.spec.ts › should evaluate [timeout]
+page/workers.spec.ts › should have JSHandles for console logs [timeout]
+page/workers.spec.ts › should not report console logs from workers twice [timeout]
+page/workers.spec.ts › should report console logs [timeout]
+page/workers.spec.ts › should report errors [timeout]
+page/workers.spec.ts › should report network activity [timeout]
+page/workers.spec.ts › should report network activity on worker creation [timeout]
+page/workers.spec.ts › should support extra http headers [timeout]
+page/workers.spec.ts › should support offline [timeout]
\ No newline at end of file
diff --git a/tests/bidi/expectations/moz-firefox-nightly-library.txt b/tests/bidi/expectations/moz-firefox-nightly-library.txt
new file mode 100644
index 0000000000000..e0d301763a88c
--- /dev/null
+++ b/tests/bidi/expectations/moz-firefox-nightly-library.txt
@@ -0,0 +1,152 @@
+library/browsercontext-credentials.spec.ts › should fail with wrong credentials [timeout]
+library/browsercontext-credentials.spec.ts › should fail without credentials [timeout]
+library/browsercontext-credentials.spec.ts › should work with setHTTPCredentials [timeout]
+library/browsercontext-events.spec.ts › dialog event should work in immediately closed popup [timeout]
+library/browsercontext-events.spec.ts › dialog event should work in popup [timeout]
+library/browsercontext-har.spec.ts › should change document URL after redirected navigation [timeout]
+library/browsercontext-har.spec.ts › should goBack to redirected navigation [timeout]
+library/browsercontext-har.spec.ts › should goForward to redirected navigation [timeout]
+library/browsercontext-har.spec.ts › should ignore boundary when matching multipart/form-data body [timeout]
+library/browsercontext-har.spec.ts › should record overridden requests to har [timeout]
+library/browsercontext-har.spec.ts › should reload redirected navigation [timeout]
+library/browsercontext-locale.spec.ts › should format number in popups [timeout]
+library/browsercontext-network-event.spec.ts › should reject response.finished if context closes [timeout]
+library/browsercontext-page-event.spec.ts › should have about:blank for empty url with domcontentloaded [timeout]
+library/browsercontext-proxy.spec.ts › should use proxy for https urls [timeout]
+library/browsercontext-service-worker-policy.spec.ts › block › blocks service worker registration [timeout]
+library/browsercontext-timezone-id.spec.ts › should work for multiple pages sharing same process [timeout]
+library/browsertype-connect.spec.ts › launchServer › should be able to connect 20 times to a single server without warnings [timeout]
+library/browsertype-connect.spec.ts › launchServer › should error when saving download after deletion [timeout]
+library/browsertype-connect.spec.ts › launchServer › should save download [timeout]
+library/browsertype-connect.spec.ts › launchServer › should saveAs videos from remote browser [timeout]
+library/browsertype-connect.spec.ts › run-server › should saveAs videos from remote browser [timeout]
+library/browsertype-connect.spec.ts › run-server › should save download [timeout]
+library/browsertype-connect.spec.ts › run-server › should error when saving download after deletion [timeout]
+library/capabilities.spec.ts › should not crash when clicking a label with a <input type="file"/> [timeout]
+library/channels.spec.ts › should work with the domain module [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › serviceWorker(), and fromServiceWorker() work [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › setExtraHTTPHeaders [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › setOffline [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should intercept only serviceworker request, not page [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should intercept service worker importScripts [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should intercept service worker requests (main and within) [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should produce network events, routing, and annotations for Service Worker [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should produce network events, routing, and annotations for Service Worker (advanced) [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should report failure (due to content-type) of main service worker request [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should report failure (due to redirect) of main service worker request [timeout]
+library/chromium/chromium.spec.ts › PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 › should report intercepted service worker requests in HAR [timeout]
+library/chromium/chromium.spec.ts › http credentials › httpCredentials [timeout]
+library/chromium/chromium.spec.ts › serviceWorkers() should return current workers [timeout]
+library/chromium/chromium.spec.ts › should close service worker together with the context [timeout]
+library/chromium/chromium.spec.ts › should create a worker from a service worker [timeout]
+library/chromium/chromium.spec.ts › should create a worker from service worker with noop routing [timeout]
+library/chromium/chromium.spec.ts › should emit new service worker on update [timeout]
+library/chromium/connect-over-cdp.spec.ts › should send default User-Agent header with connect request [timeout]
+library/chromium/connect-over-cdp.spec.ts › should send extra headers with connect request [timeout]
+library/chromium/launcher.spec.ts › should report console messages from content script [timeout]
+library/chromium/launcher.spec.ts › should return background pages [timeout]
+library/chromium/launcher.spec.ts › should return background pages when recording video [timeout]
+library/chromium/launcher.spec.ts › should support request/response events when using backgroundPage() [timeout]
+library/defaultbrowsercontext-1.spec.ts › should support acceptDownloads option [timeout]
+library/defaultbrowsercontext-2.spec.ts › should handle exception [timeout]
+library/defaultbrowsercontext-2.spec.ts › should support geolocation and permissions options [timeout]
+library/download.spec.ts › download event › should emit download event from nested iframes [timeout]
+library/download.spec.ts › download event › should report downloads with acceptDownloads: false [timeout]
+library/download.spec.ts › download event › should report downloads with acceptDownloads: true [timeout]
+library/download.spec.ts › download event › should report proper download url when download is from download attribute [timeout]
+library/download.spec.ts › download event › should report downloads for download attribute [timeout]
+library/download.spec.ts › download event › should save to user-specified path without updating original path [timeout]
+library/download.spec.ts › download event › should save to two different paths with multiple saveAs calls [timeout]
+library/download.spec.ts › download event › should save to overwritten filepath [timeout]
+library/download.spec.ts › download event › should create subdirectories when saving to non-existent user-specified path [timeout]
+library/download.spec.ts › download event › should error when saving with downloads disabled [timeout]
+library/download.spec.ts › download event › should error when saving after deletion [timeout]
+library/download.spec.ts › download event › should report non-navigation downloads [timeout]
+library/download.spec.ts › download event › should report download path within page.on('download', …) handler for Files [timeout]
+library/download.spec.ts › download event › should report download path within page.on('download', …) handler for Blobs [timeout]
+library/download.spec.ts › download event › should report alt-click downloads [timeout]
+library/download.spec.ts › download event › should report new window downloads [timeout]
+library/download.spec.ts › download event › should delete file [timeout]
+library/download.spec.ts › download event › should expose stream [timeout]
+library/download.spec.ts › download event › should delete downloads on context destruction [timeout]
+library/download.spec.ts › download event › should delete downloads on browser gone [timeout]
+library/download.spec.ts › download event › should close the context without awaiting the download [timeout]
+library/download.spec.ts › download event › should throw if browser dies [timeout]
+library/download.spec.ts › download event › should download large binary.zip [timeout]
+library/download.spec.ts › download event › should be able to cancel pending downloads [timeout]
+library/download.spec.ts › download event › should not fail explicitly to cancel a download even if that is already finished [timeout]
+library/download.spec.ts › download event › should report downloads with interception [timeout]
+library/download.spec.ts › download event › should report download when navigation turns into download @smoke [timeout]
+library/download.spec.ts › download event › should work with Cross-Origin-Opener-Policy [timeout]
+library/download.spec.ts › should be able to download a PDF file [timeout]
+library/download.spec.ts › should be able to download a inline PDF file via response interception [timeout]
+library/download.spec.ts › should be able to download a inline PDF file via navigation [timeout]
+library/download.spec.ts › should save to user-specified path [timeout]
+library/download.spec.ts › should download even if there is no "attachment" value [timeout]
+library/download.spec.ts › should download links with data url [timeout]
+library/download.spec.ts › should download successfully when routing [timeout]
+library/downloads-path.spec.ts › downloads path › should keep downloadsPath folder [timeout]
+library/downloads-path.spec.ts › downloads path › should delete downloads when context closes [timeout]
+library/downloads-path.spec.ts › downloads path › should report downloads in downloadsPath folder [timeout]
+library/downloads-path.spec.ts › downloads path › should report downloads in downloadsPath folder with a relative path [timeout]
+library/downloads-path.spec.ts › downloads path › should accept downloads in persistent context [timeout]
+library/downloads-path.spec.ts › downloads path › should delete downloads when persistent context closes [timeout]
+library/download.spec.ts › should convert navigation to a resource with unsupported mime type into download [timeout]
+library/fetch-proxy.spec.ts › context request should pick up proxy credentials [timeout]
+library/geolocation.spec.ts › should isolate contexts [timeout]
+library/geolocation.spec.ts › should use context options [timeout]
+library/geolocation.spec.ts › should use context options for popup [timeout]
+library/geolocation.spec.ts › should work @smoke [timeout]
+library/geolocation.spec.ts › watchPosition should be notified [timeout]
+library/har.spec.ts › should record failed request overrides [timeout]
+library/har.spec.ts › should record request overrides [timeout]
+library/headful.spec.ts › should click bottom row w/ infobar in OOPIF [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should --test-id-attribute [timeout]
+library/inspector/cli-codegen-2.spec.ts › cli codegen › should not clash pages [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators (1) [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators (2) [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators (3) [timeout]
+library/inspector/cli-codegen-3.spec.ts › cli codegen › should generate frame locators (4) [timeout]
+library/page-clock.spec.ts › popup › should run time before popup [timeout]
+library/page-clock.spec.ts › popup › should tick after popup [timeout]
+library/page-clock.spec.ts › popup › should tick before popup [timeout]
+library/page-event-crash.spec.ts › should emit crash event when page crashes [timeout]
+library/page-event-crash.spec.ts › should throw on any action after page crashes [timeout]
+library/page-event-crash.spec.ts › should cancel waitForEvent when page crashes [timeout]
+library/page-event-crash.spec.ts › should cancel navigation when page crashes [timeout]
+library/page-event-crash.spec.ts › should be able to close context when page crashes [timeout]
+library/popup.spec.ts › should not throw when click closes popup [timeout]
+library/popup.spec.ts › should use viewport size from window features [timeout]
+library/trace-viewer.spec.ts › should serve css without content-type [timeout]
+library/unroute-behavior.spec.ts › context.unroute should not wait for pending handlers to complete [timeout]
+library/unroute-behavior.spec.ts › context.unrouteAll should not wait for pending handlers to complete if behavior is ignoreErrors [timeout]
+library/unroute-behavior.spec.ts › context.unrouteAll should wait for pending handlers to complete [timeout]
+library/video.spec.ts › screencast › saveAs should throw when no video frames [timeout]
+library/video.spec.ts › screencast › should be 800x450 by default [timeout]
+library/video.spec.ts › screencast › should be 800x600 with null viewport [timeout]
+library/video.spec.ts › screencast › should capture css transformation [timeout]
+library/video.spec.ts › screencast › should capture navigation [timeout]
+library/video.spec.ts › screencast › should capture static page [timeout]
+library/video.spec.ts › screencast › should continue recording main page after popup closes [timeout]
+library/video.spec.ts › screencast › should delete video [timeout]
+library/video.spec.ts › screencast › should emulate an iphone [timeout]
+library/video.spec.ts › screencast › should expose video path [timeout]
+library/video.spec.ts › screencast › should expose video path blank page [timeout]
+library/video.spec.ts › screencast › should expose video path blank popup [timeout]
+library/video.spec.ts › screencast › should work for popups [timeout]
+library/video.spec.ts › screencast › should scale frames down to the requested size  [timeout]
+library/video.spec.ts › screencast › should use viewport scaled down to fit into 800x800 as default size [timeout]
+library/video.spec.ts › screencast › should work with old options [timeout]
+library/video.spec.ts › screencast › should work with relative path for recordVideo.dir [timeout]
+library/video.spec.ts › screencast › should work with video+trace [timeout]
+library/video.spec.ts › screencast › should work with weird screen resolution [timeout]
+library/video.spec.ts › should saveAs video [timeout]
+library/web-socket.spec.ts › should emit binary frame events [timeout]
+library/web-socket.spec.ts › should emit close events [timeout]
+library/web-socket.spec.ts › should emit error [timeout]
+library/web-socket.spec.ts › should emit frame events [timeout]
+library/web-socket.spec.ts › should filter out the close events when the server closes with a message [timeout]
+library/web-socket.spec.ts › should not have stray error events [timeout]
+library/web-socket.spec.ts › should pass self as argument to close event [timeout]
+library/web-socket.spec.ts › should reject waitForEvent on page close [timeout]
+library/web-socket.spec.ts › should reject waitForEvent on socket close [timeout]
\ No newline at end of file
diff --git a/tests/bidi/expectations/moz-firefox-nightly-page.txt b/tests/bidi/expectations/moz-firefox-nightly-page.txt
new file mode 100644
index 0000000000000..a28f0715df20a
--- /dev/null
+++ b/tests/bidi/expectations/moz-firefox-nightly-page.txt
@@ -0,0 +1,65 @@
+page/frame-hierarchy.spec.ts › should send "framenavigated" when navigating on anchor URLs [timeout]
+page/interception.spec.ts › should disable memory cache when intercepting [timeout]
+page/interception.spec.ts › should intercept worker requests when enabled after worker creation [timeout]
+page/page-add-init-script.spec.ts › init script should run only once in popup [timeout]
+page/page-basic.spec.ts › page.close should work with window.close [timeout]
+page/page-basic.spec.ts › should provide access to the opener page [timeout]
+page/page-basic.spec.ts › should return null if parent page has been closed [timeout]
+page/page-event-console.spec.ts › should trigger correct Log [timeout]
+page/page-event-pageerror.spec.ts › should contain sourceURL [timeout]
+page/page-event-pageerror.spec.ts › should contain the Error.name property [timeout]
+page/page-event-pageerror.spec.ts › should fire [timeout]
+page/page-event-pageerror.spec.ts › should handle object [timeout]
+page/page-event-pageerror.spec.ts › should handle odd values [timeout]
+page/page-event-pageerror.spec.ts › should handle window [timeout]
+page/page-event-pageerror.spec.ts › should not receive console message for pageError [timeout]
+page/page-event-pageerror.spec.ts › should support an empty Error.name property [timeout]
+page/page-event-popup.spec.ts › should be able to capture alert [timeout]
+page/page-event-popup.spec.ts › should work @smoke [timeout]
+page/page-event-request.spec.ts › should report navigation requests and responses handled by service worker [timeout]
+page/page-event-request.spec.ts › should report navigation requests and responses handled by service worker with routing [timeout]
+page/page-filechooser.spec.ts › should upload multiple large files [timeout]
+page/page-filechooser.spec.ts › should emit event once [timeout]
+page/page-filechooser.spec.ts › should emit event via prepend [timeout]
+page/page-filechooser.spec.ts › should emit event for iframe [timeout]
+page/page-filechooser.spec.ts › should emit event on/off [timeout]
+page/page-filechooser.spec.ts › should emit event addListener/removeListener [timeout]
+page/page-filechooser.spec.ts › should work when file input is attached to DOM [timeout]
+page/page-filechooser.spec.ts › should work when file input is not attached to DOM [timeout]
+page/page-filechooser.spec.ts › should not throw when filechooser belongs to iframe [timeout]
+page/page-filechooser.spec.ts › should work with no timeout [timeout]
+page/page-filechooser.spec.ts › should return the same file chooser when there are many watchdogs simultaneously [timeout]
+page/page-filechooser.spec.ts › should accept single file [timeout]
+page/page-filechooser.spec.ts › should be able to read selected file [timeout]
+page/page-filechooser.spec.ts › should be able to reset selected files with empty file list [timeout]
+page/page-filechooser.spec.ts › should work for single file pick [timeout]
+page/page-filechooser.spec.ts › should work for "multiple" [timeout]
+page/page-filechooser.spec.ts › should work for "webkitdirectory" [timeout]
+page/page-filechooser.spec.ts › should emit event after navigation [timeout]
+page/page-filechooser.spec.ts › should trigger listener added before navigation [timeout]
+page/page-goto.spec.ts › should fail when server returns 204 [timeout]
+page/page-goto.spec.ts › should work with anchor navigation [timeout]
+page/page-history.spec.ts › should reload proper page [timeout]
+page/page-network-response.spec.ts › should reject response.finished if context closes [timeout]
+page/page-request-continue.spec.ts › should not throw if request was cancelled by the page [timeout]
+page/page-route.spec.ts › should not throw if request was cancelled by the page [timeout]
+page/page-set-input-files.spec.ts › should upload a file after popup [timeout]
+page/page-wait-for-function.spec.ts › should fail with ReferenceError on wrong page [timeout]
+page/page-wait-for-function.spec.ts › should fail with predicate throwing on first call [timeout]
+page/page-wait-for-function.spec.ts › should not be called after finishing unsuccessfully [timeout]
+page/page-wait-for-load-state.spec.ts › should wait for load state of about:blank popup  [timeout]
+page/page-wait-for-load-state.spec.ts › should wait for load state of empty url popup [timeout]
+page/page-wait-for-load-state.spec.ts › should work with pages that have loaded before being connected to [timeout]
+page/page-wait-for-navigation.spec.ts › should work with url match for same document navigations [timeout]
+page/page-wait-for-url.spec.ts › should work with url match for same document navigations [timeout]
+page/workers.spec.ts › Page.workers @smoke [timeout]
+page/workers.spec.ts › should attribute network activity for worker inside iframe to the iframe [timeout]
+page/workers.spec.ts › should clear upon cross-process navigation [timeout]
+page/workers.spec.ts › should clear upon navigation [timeout]
+page/workers.spec.ts › should dispatch console messages when page has workers [timeout]
+page/workers.spec.ts › should emit created and destroyed events [timeout]
+page/workers.spec.ts › should evaluate [timeout]
+page/workers.spec.ts › should report errors [timeout]
+page/workers.spec.ts › should report network activity [timeout]
+page/workers.spec.ts › should support extra http headers [timeout]
+page/workers.spec.ts › should support offline [timeout]
\ No newline at end of file
diff --git a/tests/bidi/playwright.config.ts b/tests/bidi/playwright.config.ts
new file mode 100644
index 0000000000000..d8c7e651056b6
--- /dev/null
+++ b/tests/bidi/playwright.config.ts
@@ -0,0 +1,135 @@
+/**
+ * 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 { config as loadEnv } from 'dotenv';
+loadEnv({ path: path.join(__dirname, '..', '..', '.env'), override: true });
+process.env.PWTEST_UNDER_TEST = '1';
+
+import { type Config, type PlaywrightTestOptions, type PlaywrightWorkerOptions, type ReporterDescription } from '@playwright/test';
+import * as path from 'path';
+import type { TestModeWorkerOptions } from '../config/testModeFixtures';
+
+const headed = process.argv.includes('--headed');
+const trace = !!process.env.PWTEST_TRACE;
+const hasDebugOutput = process.env.DEBUG?.includes('pw:');
+
+function firefoxUserPrefs() {
+  const defaultPrefs = {
+    'network.proxy.allow_hijacking_localhost': true,
+    'network.proxy.testing_localhost_is_secure_when_hijacked': true,
+  };
+  const prefsString = process.env.PWTEST_FIREFOX_USER_PREFS;
+  if (!prefsString)
+    return defaultPrefs;
+  return { ...defaultPrefs, ...JSON.parse(prefsString) };
+}
+process.env.PLAYWRIGHT_PROXY_BYPASS_FOR_TESTING = '<-loopback>';
+
+const outputDir = path.join(__dirname, '..', '..', 'test-results');
+const testDir = path.join(__dirname, '..');
+const reporters = () => {
+  const result: ReporterDescription[] = process.env.CI ? [
+    hasDebugOutput ? ['list'] : ['dot'],
+    ['json', { outputFile: path.join(outputDir, 'report.json') }],
+    ['blob', { fileName: `${process.env.PWTEST_BOT_NAME}.zip` }],
+    ['./csvReporter', { outputFile: path.join(outputDir, 'report.csv') }],
+  ] : [
+    ['html', { open: 'on-failure' }],
+    ['./csvReporter', { outputFile: path.join(outputDir, 'report.csv') }],
+    ['./expectationReporter', { rebase: false }],
+  ];
+  return result;
+};
+
+const config: Config<PlaywrightWorkerOptions & PlaywrightTestOptions & TestModeWorkerOptions> = {
+  testDir,
+  outputDir,
+  expect: {
+    timeout: 10000,
+  },
+  maxFailures: 0,
+  timeout: 15 * 1000,
+  globalTimeout: 90 * 60 * 1000,
+  workers: process.env.CI ? 2 : undefined,
+  fullyParallel: !process.env.CI,
+  forbidOnly: !!process.env.CI,
+  retries: 0, // No retries even on CI for now.
+  reporter: reporters(),
+  projects: [],
+};
+
+type BrowserName = '_bidiChromium' | '_bidiFirefox';
+
+const getExecutablePath = (browserName: BrowserName) => {
+  if (browserName === '_bidiChromium')
+    return process.env.BIDI_CRPATH;
+  if (browserName === '_bidiFirefox')
+    return process.env.BIDI_FFPATH;
+};
+
+const browserToChannels = {
+  '_bidiChromium': ['bidi-chromium', 'bidi-chrome-canary', 'bidi-chrome-stable'],
+  '_bidiFirefox': ['moz-firefox', 'moz-firefox-beta', 'moz-firefox-nightly'],
+};
+
+for (const [key, channels] of Object.entries(browserToChannels)) {
+  const browserName: any = key;
+  const executablePath = getExecutablePath(browserName);
+  if (executablePath && !process.env.TEST_WORKER_INDEX)
+    console.error(`Using executable at ${executablePath}`);
+  for (const channel of channels) {
+    const testIgnore: RegExp[] = [
+      /library\/debug-controller/,
+      /library\/inspector/,
+      /library\/trace-viewer.spec.ts/,
+      /library\/tracing.spec.ts/,
+      /page\/page-leaks.spec.ts/,
+    ];
+    if (browserName.toLowerCase().includes('firefox'))
+      testIgnore.push(/chromium/);
+    if (browserName.toLowerCase().includes('chromium'))
+      testIgnore.push(/firefox/);
+    for (const folder of ['library', 'page']) {
+      config.projects.push({
+        name: `${channel}-${folder}`,
+        testDir: path.join(testDir, folder),
+        testIgnore,
+        snapshotPathTemplate: `{testDir}/{testFileDir}/{testFileName}-snapshots/{arg}-${channel}{ext}`,
+        use: {
+          browserName,
+          headless: !headed,
+          channel: channel === 'bidi-chromium' ? undefined : channel,
+          video: 'off',
+          launchOptions: {
+            executablePath,
+            firefoxUserPrefs: firefoxUserPrefs(),
+          },
+          trace: trace ? 'on' : undefined,
+        },
+        metadata: {
+          platform: process.platform,
+          docker: !!process.env.INSIDE_DOCKER,
+          headless: !headed,
+          browserName,
+          channel,
+          trace: !!trace,
+        },
+      });
+    }
+  }
+}
+
+export default config;
diff --git a/tests/components/ct-react-vite/package.json b/tests/components/ct-react-vite/package.json
index 2379d26af2438..ed183f899bf0e 100644
--- a/tests/components/ct-react-vite/package.json
+++ b/tests/components/ct-react-vite/package.json
@@ -2,6 +2,7 @@
   "name": "ct-react-vite",
   "private": true,
   "version": "0.0.0",
+  "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
diff --git a/tests/components/ct-react-vite/playwright.config.ts b/tests/components/ct-react-vite/playwright.config.ts
index 63d909ae2717b..42db0226d1c8c 100644
--- a/tests/components/ct-react-vite/playwright.config.ts
+++ b/tests/components/ct-react-vite/playwright.config.ts
@@ -15,7 +15,8 @@
  */
 
 import { defineConfig, devices } from '@playwright/experimental-ct-react';
-import { resolve } from 'path';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
 export default defineConfig({
   testDir: 'tests',
@@ -30,7 +31,7 @@ export default defineConfig({
       },
       resolve: {
         alias: {
-          '@': resolve(__dirname, './src'),
+          '@': path.resolve(path.dirname(fileURLToPath(import.meta.url)), './src'),
         }
       }
     }
diff --git a/tests/components/ct-react-vite/src/components/Fetcher.tsx b/tests/components/ct-react-vite/src/components/Fetcher.tsx
index 5c489ec8bbb79..2f1322d148c3d 100644
--- a/tests/components/ct-react-vite/src/components/Fetcher.tsx
+++ b/tests/components/ct-react-vite/src/components/Fetcher.tsx
@@ -20,7 +20,7 @@ export default function Fetcher() {
   }, [fetched, setFetched, setData]);
 
   return <div>
-    <div data-testId='name'>{data.name}</div>
+    <div data-testid='name'>{data.name}</div>
     <button onClick={() => {
       setFetched(false);
       setData({ name: '<none>' });
diff --git a/tests/components/ct-react-vite/tests/render.spec.tsx b/tests/components/ct-react-vite/tests/render.spec.tsx
index 1d82d21b3aa98..b7d0e61b29e2d 100644
--- a/tests/components/ct-react-vite/tests/render.spec.tsx
+++ b/tests/components/ct-react-vite/tests/render.spec.tsx
@@ -2,6 +2,7 @@ import { test, expect } from '@playwright/experimental-ct-react';
 import Button from '@/components/Button';
 import EmptyFragment from '@/components/EmptyFragment';
 import { ComponentAsProp } from '@/components/ComponentAsProp';
+import DefaultChildren from '@/components/DefaultChildren';
 
 test('render props', async ({ mount }) => {
   const component = await mount(<Button title="Submit" />);
@@ -31,3 +32,22 @@ test('render an empty component', async ({ mount, page }) => {
   expect(await component.textContent()).toBe('');
   await expect(component).toHaveText('');
 });
+
+function MyInlineComponent({ value }: { value: string }) {
+  return <>Hello {value}</>;
+}
+
+test('render inline component with an error', async ({ mount }) => {
+  await expect(mount(<MyInlineComponent value="Max" />)).rejects.toThrow('Component "MyInlineComponent" cannot be mounted.');
+});
+
+test('render inline component with an error if its nested', async ({ mount }) => {
+  await expect(mount(<DefaultChildren>
+    <MyInlineComponent value="Max" />
+  </DefaultChildren>)).rejects.toThrow('Component "MyInlineComponent" cannot be mounted.');
+});
+
+test('render Fragment shorthand notation', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32853' } }, async ({ mount }) => {
+  const component = await mount(<>Learn React</>);
+  await expect(component).toContainText('Learn React');
+});
diff --git a/tests/components/ct-react17/tests/render.spec.tsx b/tests/components/ct-react17/tests/render.spec.tsx
index ec9405c82feee..46e3ea9abf121 100644
--- a/tests/components/ct-react17/tests/render.spec.tsx
+++ b/tests/components/ct-react17/tests/render.spec.tsx
@@ -31,6 +31,7 @@ test('render an empty component', async ({ mount, page }) => {
 const testWithServer = test.extend(serverFixtures);
 testWithServer(
   'components routing should go through context',
+  // @ts-ignore "serverFixtures" are imported from the impl without any types
   async ({ mount, context, server }) => {
     server.setRoute('/hello', (req: any, res: any) => {
       res.write('served via server');
diff --git a/tests/components/ct-solid/.gitignore b/tests/components/ct-solid/.gitignore
deleted file mode 100644
index f06235c460c2d..0000000000000
--- a/tests/components/ct-solid/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-dist
diff --git a/tests/components/ct-solid/README.md b/tests/components/ct-solid/README.md
deleted file mode 100644
index 434f7bb9df876..0000000000000
--- a/tests/components/ct-solid/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## Usage
-
-Those templates dependencies are maintained via [pnpm](https://pnpm.io) via `pnpm up -Lri`.
-
-This is the reason you see a `pnpm-lock.yaml`. That being said, any package manager will work. This file can be safely be removed once you clone a template.
-
-```bash
-$ npm install # or pnpm install or yarn install
-```
-
-### Learn more on the [Solid Website](https://solidjs.com) and come chat with us on our [Discord](https://discord.com/invite/solidjs)
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm dev` or `npm start`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br>
-
-### `npm run build`
-
-Builds the app for production to the `dist` folder.<br>
-It correctly bundles Solid in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-## Deployment
-
-You can deploy the `dist` folder to any static host provider (netlify, surge, now, etc.)
diff --git a/tests/components/ct-solid/index.html b/tests/components/ct-solid/index.html
deleted file mode 100644
index 48c59fc1242d3..0000000000000
--- a/tests/components/ct-solid/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <link rel="shortcut icon" type="image/ico" href="/src/assets/favicon.ico" />
-    <title>Solid App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-
-    <script src="/src/index.tsx" type="module"></script>
-  </body>
-</html>
diff --git a/tests/components/ct-solid/package.json b/tests/components/ct-solid/package.json
deleted file mode 100644
index ace8169dae7ce..0000000000000
--- a/tests/components/ct-solid/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "ct-solid",
-  "version": "0.0.0",
-  "description": "",
-  "scripts": {
-    "start": "vite",
-    "dev": "vite",
-    "build": "vite build",
-    "serve": "vite preview",
-    "typecheck": "tsc --noEmit"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@solidjs/router": "^0.8.2",
-    "solid-js": "^1.7.3"
-  },
-  "devDependencies": {
-    "typescript": "^5.2.2",
-    "vite": "^5.2.8",
-    "vite-plugin-solid": "^2.6.1"
-  }
-}
diff --git a/tests/components/ct-solid/playwright.config.ts b/tests/components/ct-solid/playwright.config.ts
deleted file mode 100644
index 5ae803d3f98b3..0000000000000
--- a/tests/components/ct-solid/playwright.config.ts
+++ /dev/null
@@ -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 { defineConfig, devices } from '@playwright/experimental-ct-solid';
-import { resolve } from 'path';
-
-export default defineConfig({
-  testDir: 'tests',
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  reporter: process.env.CI ? 'html' : 'line',
-  use: {
-    trace: 'on-first-retry',
-    ctViteConfig: {
-      resolve: {
-        alias: {
-          '@': resolve(__dirname, './src'),
-        }
-      }
-    }
-  },
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-  ],
-});
diff --git a/tests/components/ct-solid/playwright/index.html b/tests/components/ct-solid/playwright/index.html
deleted file mode 100644
index 1985b43bc1d47..0000000000000
--- a/tests/components/ct-solid/playwright/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <title>Solid App</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="./index.tsx"></script>
-  </body>
-</html>
diff --git a/tests/components/ct-solid/playwright/index.tsx b/tests/components/ct-solid/playwright/index.tsx
deleted file mode 100644
index de3eea3285f5a..0000000000000
--- a/tests/components/ct-solid/playwright/index.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { beforeMount, afterMount } from '@playwright/experimental-ct-solid/hooks';
-import { Router } from "@solidjs/router";
-import '../src/assets/index.css';
-
-export type HooksConfig = {
-  route?: string;
-  routing?: boolean;
-}
-
-beforeMount<HooksConfig>(async ({ hooksConfig, App }) => {
-  console.log(`Before mount: ${JSON.stringify(hooksConfig)}`);
-
-  if (hooksConfig?.routing)
-    return <Router><App /></Router>;
-});
-
-afterMount<HooksConfig>(async () => {
-  console.log(`After mount`);
-});
diff --git a/tests/components/ct-solid/src/App.tsx b/tests/components/ct-solid/src/App.tsx
deleted file mode 100644
index c57cd5642d990..0000000000000
--- a/tests/components/ct-solid/src/App.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Routes, Route, A } from "@solidjs/router"
-import logo from './assets/logo.svg';
-import LoginPage from './pages/LoginPage';
-import DashboardPage from './pages/DashboardPage';
-
-export default function App() {
-  return <>
-    <header>
-      <img src={logo} alt="logo" width={125} height={125} />
-      <A href="/">Login</A>
-      <A href="/dashboard">Dashboard</A>
-    </header>
-    <Routes>
-      <Route path="/">
-        <Route path="/" component={LoginPage} />
-        <Route path="dashboard" component={DashboardPage} />
-      </Route>
-    </Routes>
-  </>
-};
diff --git a/tests/components/ct-solid/src/assets/favicon.ico b/tests/components/ct-solid/src/assets/favicon.ico
deleted file mode 100644
index b836b2bccac65..0000000000000
Binary files a/tests/components/ct-solid/src/assets/favicon.ico and /dev/null differ
diff --git a/tests/components/ct-solid/src/assets/index.css b/tests/components/ct-solid/src/assets/index.css
deleted file mode 100644
index 97495c44b8634..0000000000000
--- a/tests/components/ct-solid/src/assets/index.css
+++ /dev/null
@@ -1,20 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #e3e3e3;
-    background-color: #1b1b1d;
-  }
-}
diff --git a/tests/components/ct-solid/src/assets/logo.svg b/tests/components/ct-solid/src/assets/logo.svg
deleted file mode 100644
index 025aa303c5e3a..0000000000000
--- a/tests/components/ct-solid/src/assets/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 166 155.3"><path d="M163 35S110-4 69 5l-3 1c-6 2-11 5-14 9l-2 3-15 26 26 5c11 7 25 10 38 7l46 9 18-30z" fill="#76b3e1"/><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="27.5" y1="3" x2="152" y2="63.5"><stop offset=".1" stop-color="#76b3e1"/><stop offset=".3" stop-color="#dcf2fd"/><stop offset="1" stop-color="#76b3e1"/></linearGradient><path d="M163 35S110-4 69 5l-3 1c-6 2-11 5-14 9l-2 3-15 26 26 5c11 7 25 10 38 7l46 9 18-30z" opacity=".3" fill="url(#a)"/><path d="M52 35l-4 1c-17 5-22 21-13 35 10 13 31 20 48 15l62-21S92 26 52 35z" fill="#518ac8"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="95.8" y1="32.6" x2="74" y2="105.2"><stop offset="0" stop-color="#76b3e1"/><stop offset=".5" stop-color="#4377bb"/><stop offset="1" stop-color="#1f3b77"/></linearGradient><path d="M52 35l-4 1c-17 5-22 21-13 35 10 13 31 20 48 15l62-21S92 26 52 35z" opacity=".3" fill="url(#b)"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="18.4" y1="64.2" x2="144.3" y2="149.8"><stop offset="0" stop-color="#315aa9"/><stop offset=".5" stop-color="#518ac8"/><stop offset="1" stop-color="#315aa9"/></linearGradient><path d="M134 80a45 45 0 00-48-15L24 85 4 120l112 19 20-36c4-7 3-15-2-23z" fill="url(#c)"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="75.2" y1="74.5" x2="24.4" y2="260.8"><stop offset="0" stop-color="#4377bb"/><stop offset=".5" stop-color="#1a336b"/><stop offset="1" stop-color="#1a336b"/></linearGradient><path d="M114 115a45 45 0 00-48-15L4 120s53 40 94 30l3-1c17-5 23-21 13-34z" fill="url(#d)"/></svg>
\ No newline at end of file
diff --git a/tests/components/ct-solid/src/components/Button.tsx b/tests/components/ct-solid/src/components/Button.tsx
deleted file mode 100644
index 6569070a967c8..0000000000000
--- a/tests/components/ct-solid/src/components/Button.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { JSX } from "solid-js";
-
-type ButtonProps = {
-  title: string;
-  onClick?(props: string): void;
-  className?: string;
-} & Omit<JSX.ButtonHTMLAttributes<HTMLButtonElement>, 'onClick'>;
-
-export default function Button({ onClick, title, ...attributes }: ButtonProps) {
-  return <button {...attributes} onClick={() => onClick?.('hello')}>
-    {title}
-  </button>
-}
diff --git a/tests/components/ct-solid/src/components/CheckChildrenProp.tsx b/tests/components/ct-solid/src/components/CheckChildrenProp.tsx
deleted file mode 100644
index 113a44ced92d7..0000000000000
--- a/tests/components/ct-solid/src/components/CheckChildrenProp.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { type ParentProps } from 'solid-js';
-
-type DefaultChildrenProps = ParentProps<{}>;
-
-export default function CheckChildrenProp(props: DefaultChildrenProps) {
-  return <>{'children' in props ? props.children : 'No Children'}</>
-}
diff --git a/tests/components/ct-solid/src/components/Counter.tsx b/tests/components/ct-solid/src/components/Counter.tsx
deleted file mode 100644
index 12725c5638387..0000000000000
--- a/tests/components/ct-solid/src/components/Counter.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { createSignal } from "solid-js";
-
- type CounterProps = {
-   count?: number;
-   onClick?(props: string): void;
-   children?: any;
- }
-
- let _remountCount = 1;
-
- export default function Counter(props: CounterProps) {
-  const [remountCount, setRemountCount] = createSignal(_remountCount++);
-  return <button onClick={() => props.onClick?.('hello')}>
-     <span data-testid="props">{props.count}</span>
-     <span data-testid="remount-count">{remountCount()}</span>
-     { props.children }
-   </button>
- }
- 
\ No newline at end of file
diff --git a/tests/components/ct-solid/src/components/DefaultChildren.tsx b/tests/components/ct-solid/src/components/DefaultChildren.tsx
deleted file mode 100644
index 691b6a080615c..0000000000000
--- a/tests/components/ct-solid/src/components/DefaultChildren.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-type DefaultChildrenProps = {
-  children?: any;
-}
-
-export default function DefaultChildren(props: DefaultChildrenProps) {
-  return <div>
-    <h1>Welcome!</h1>
-    <main>
-      {props.children}
-    </main>
-    <footer>
-      Thanks for visiting.
-    </footer>
-  </div>
-}
diff --git a/tests/components/ct-solid/src/components/EmptyFragment.tsx b/tests/components/ct-solid/src/components/EmptyFragment.tsx
deleted file mode 100644
index b424841462281..0000000000000
--- a/tests/components/ct-solid/src/components/EmptyFragment.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-export default function EmptyFragment(props: unknown) {
-  Object.assign(window, { props });
-  return <>{[]}</>;
-}
diff --git a/tests/components/ct-solid/src/components/MultiRoot.tsx b/tests/components/ct-solid/src/components/MultiRoot.tsx
deleted file mode 100644
index f29e397c0fe54..0000000000000
--- a/tests/components/ct-solid/src/components/MultiRoot.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-export default function MultiRoot() {
-  return <>
-    <div>root 1</div>
-    <div>root 2</div>
-  </>
-}
diff --git a/tests/components/ct-solid/src/components/MultipleChildren.tsx b/tests/components/ct-solid/src/components/MultipleChildren.tsx
deleted file mode 100644
index 283f88a18939d..0000000000000
--- a/tests/components/ct-solid/src/components/MultipleChildren.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-type MultipleChildrenProps = {
-  children?: [any, any, any];
-}
-
-export default function MultipleChildren(props: MultipleChildrenProps) {
-  return <div>
-  <header>
-    {props.children?.at(0)}
-  </header>
-  <main>
-    {props.children?.at(1)}
-  </main>
-  <footer>
-    {props.children?.at(2)}
-  </footer>
-</div>
-}
diff --git a/tests/components/ct-solid/src/index.tsx b/tests/components/ct-solid/src/index.tsx
deleted file mode 100644
index 15976a07a61bf..0000000000000
--- a/tests/components/ct-solid/src/index.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-/* @refresh reload */
-import { render } from 'solid-js/web';
-import { Router } from "@solidjs/router";
-import App from './App';
-import './assets/index.css';
-
-render(() => <Router><App /></Router>, document.getElementById('root')!);
diff --git a/tests/components/ct-solid/src/pages/DashboardPage.tsx b/tests/components/ct-solid/src/pages/DashboardPage.tsx
deleted file mode 100644
index 64307e87f34d3..0000000000000
--- a/tests/components/ct-solid/src/pages/DashboardPage.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function DashboardPage() {
-  return <main>Dashboard</main>
-}
diff --git a/tests/components/ct-solid/src/pages/LoginPage.tsx b/tests/components/ct-solid/src/pages/LoginPage.tsx
deleted file mode 100644
index 96adc431edb51..0000000000000
--- a/tests/components/ct-solid/src/pages/LoginPage.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function LoginPage() {
-  return <main>Login</main>
-}
diff --git a/tests/components/ct-solid/tests/callbacks.spec.tsx b/tests/components/ct-solid/tests/callbacks.spec.tsx
deleted file mode 100644
index 3b4559d084e1b..0000000000000
--- a/tests/components/ct-solid/tests/callbacks.spec.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-solid';
-import Button from '@/components/Button';
-import DefaultChildren from '@/components/DefaultChildren';
-
-test('execute callback when the button is clicked', async ({ mount }) => {
-  const messages: string[] = [];
-  const component = await mount(
-    <Button
-      title="Submit"
-      onClick={(data) => {
-        messages.push(data);
-      }}
-    />
-  );
-  await component.click();
-  expect(messages).toEqual(['hello']);
-});
-
-test('execute callback when a child node is clicked', async ({ mount }) => {
-  let clickFired = false;
-  const component = await mount(
-    <DefaultChildren>
-      <span onClick={() => (clickFired = true)}>Main Content</span>
-    </DefaultChildren>
-  );
-  await component.getByText('Main Content').click();
-  expect(clickFired).toBeTruthy();
-});
diff --git a/tests/components/ct-solid/tests/children.spec.tsx b/tests/components/ct-solid/tests/children.spec.tsx
deleted file mode 100644
index ebf80fe803396..0000000000000
--- a/tests/components/ct-solid/tests/children.spec.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-solid';
-import Button from '@/components/Button';
-import DefaultChildren from '@/components/DefaultChildren';
-import MultipleChildren from '@/components/MultipleChildren';
-import CheckChildrenProp from '@/components/CheckChildrenProp'
-
-test('render a default child', async ({ mount }) => {
-  const component = await mount(
-    <DefaultChildren>Main Content</DefaultChildren>
-  );
-  await expect(component).toContainText('Main Content');
-});
-
-test('render multiple children', async ({ mount }) => {
-  const component = await mount(
-    <DefaultChildren>
-      <div data-testid="one">One</div>
-      <div data-testid="two">Two</div>
-    </DefaultChildren>
-  );
-  await expect(component.getByTestId('one')).toContainText('One');
-  await expect(component.getByTestId('two')).toContainText('Two');
-});
-
-test('render a component as child', async ({ mount }) => {
-  const component = await mount(
-    <DefaultChildren>
-      <Button title="Submit" />
-    </DefaultChildren>
-  );
-  await expect(component).toContainText('Submit');
-});
-
-test('render named children', async ({ mount }) => {
-  const component = await mount(
-    <MultipleChildren>
-      <div>Header</div>
-      <div>Main Content</div>
-      <div>Footer</div>
-    </MultipleChildren>
-  );
-  await expect(component).toContainText('Header');
-  await expect(component).toContainText('Main Content');
-  await expect(component).toContainText('Footer');
-});
-
-test('render string as child', async ({ mount }) => {
-  const component = await mount(<DefaultChildren>{'string'}</DefaultChildren>);
-  await expect(component).toContainText('string');
-});
-
-test('render array as child', async ({ mount }) => {
-  const component = await mount(<DefaultChildren>{[<h4>{[4]}</h4>,[[<p>[2,3]</p>]]]}</DefaultChildren>);
-  await expect(component.getByRole('heading', { level: 4 })).toHaveText('4');
-  await expect(component.getByRole('paragraph')).toHaveText('[2,3]');
-});
-
-test('render number as child', async ({ mount }) => {
-  const component = await mount(<DefaultChildren>{1337}</DefaultChildren>);
-  await expect(component).toContainText('1337');
-});
-
-test('absence of children when children prop is not provided', async ({ mount }) => {
-  const component = await mount(<CheckChildrenProp />);
-  await expect(component).toContainText('No Children');
-});
diff --git a/tests/components/ct-solid/tests/render.spec.tsx b/tests/components/ct-solid/tests/render.spec.tsx
deleted file mode 100644
index 199e5f4f03e4c..0000000000000
--- a/tests/components/ct-solid/tests/render.spec.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-solid';
-import Button from '@/components/Button';
-import EmptyFragment from '@/components/EmptyFragment';
-
-test('render props', async ({ mount }) => {
-  const component = await mount(<Button title="Submit" />);
-  await expect(component).toContainText('Submit');
-});
-
-test('render attributes', async ({ mount }) => {
-  const component = await mount(<Button className="primary" title="Submit" />);
-  await expect(component).toHaveClass('primary');
-});
-
-test('render an empty component', async ({ mount, page }) => {
-  const component = await mount(<EmptyFragment />);
-  expect(await page.evaluate(() => 'props' in window && window.props)).toEqual({});
-  expect(await component.allTextContents()).toEqual(['']);
-  expect(await component.textContent()).toBe('');
-  await expect(component).toHaveText('');
-});
diff --git a/tests/components/ct-solid/tests/solid-router.spec.tsx b/tests/components/ct-solid/tests/solid-router.spec.tsx
deleted file mode 100644
index 60f8f24367896..0000000000000
--- a/tests/components/ct-solid/tests/solid-router.spec.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-solid';
-import App from '@/App';
-import type { HooksConfig } from '../playwright';
-
-test('navigate to a page by clicking a link', async ({ page, mount }) => {
-  const component = await mount<HooksConfig>(<App />, {
-    hooksConfig: { routing: true },
-  });
-  await expect(component.getByRole('main')).toHaveText('Login');
-  await expect(page).toHaveURL('/');
-  await component.getByRole('link', { name: 'Dashboard' }).click();
-  await expect(component.getByRole('main')).toHaveText('Dashboard');
-  await expect(page).toHaveURL('/dashboard');
-});
diff --git a/tests/components/ct-solid/tests/unmount.spec.tsx b/tests/components/ct-solid/tests/unmount.spec.tsx
deleted file mode 100644
index b62dd0bc556af..0000000000000
--- a/tests/components/ct-solid/tests/unmount.spec.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-solid';
-import Button from '@/components/Button';
-import MultiRoot from '@/components/MultiRoot';
-
-test('unmount', async ({ page, mount }) => {
-  const component = await mount(<Button title="Submit" />);
-  await expect(page.locator('#root')).toContainText('Submit');
-  await component.unmount();
-  await expect(page.locator('#root')).not.toContainText('Submit');
-});
-
-test('unmount a multi root component', async ({ mount, page }) => {
-  const component = await mount(<MultiRoot />);
-  await expect(page.locator('#root')).toContainText('root 1');
-  await expect(page.locator('#root')).toContainText('root 2');
-  await component.unmount();
-  await expect(page.locator('#root')).not.toContainText('root 1');
-  await expect(page.locator('#root')).not.toContainText('root 2');
-});
-
-test('unmount twice throws an error', async ({ mount }) => {
-  const component = await mount(<Button title="Submit" />);
-  await component.unmount();
-  await expect(component.unmount()).rejects.toThrowError('Component was not mounted');
-});
-
-test('mount then unmount then mount', async ({ mount }) => {
-  let component = await mount(<Button title="Submit" />);
-  await component.unmount();
-  component = await mount(<Button title="Save" />);
-  await expect(component).toContainText('Save');
-});
diff --git a/tests/components/ct-solid/tests/update.spec.tsx b/tests/components/ct-solid/tests/update.spec.tsx
deleted file mode 100644
index 930e93b1b39c2..0000000000000
--- a/tests/components/ct-solid/tests/update.spec.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-solid';
-import Counter from '@/components/Counter';
-import DefaultChildren from '@/components/DefaultChildren';
-
-test('update props without remounting', async ({ mount }) => {
-  const component = await mount(<Counter count={9001} />);
-  await expect(component.getByTestId('props')).toContainText('9001');
-
-  await component.update(<Counter count={1337} />);
-  await expect(component).not.toContainText('9001');
-  await expect(component.getByTestId('props')).toContainText('1337');
-
-  /**
-   * Ideally toContainText('2') should be toContainText('1')
-   * However it seems impossible to update the props, slots or events of a rendered component
-   */
-  await expect(component.getByTestId('remount-count')).toContainText('2');
-});
-
-test('update child props without remounting', async ({ mount }) => {
-  const component = await mount(<DefaultChildren><Counter count={9001} /></DefaultChildren>);
-  await expect(component.getByTestId('props')).toContainText('9001');
-
-  await component.update(<DefaultChildren><Counter count={1337} /></DefaultChildren>);
-  await expect(component).not.toContainText('9001');
-  await expect(component.getByTestId('props')).toContainText('1337');
-
-  /**
-   * Ideally toContainText('2') should be toContainText('1')
-   * However it seems impossible to update the props, slots or events of a rendered component
-   */
-  await expect(component.getByTestId('remount-count')).toContainText('2');
-});
-
-test('update callbacks without remounting', async ({ mount }) => {
-  const component = await mount(<Counter />);
-
-  const messages: string[] = [];
-  await component.update(
-    <Counter
-      onClick={(message) => {
-        messages.push(message);
-      }}
-    />
-  );
-  await component.click();
-  expect(messages).toEqual(['hello']);
-
-  /**
-   * Ideally toContainText('2') should be toContainText('1')
-   * However it seems impossible to update the props, slots or events of a rendered component
-   */
-  await expect(component.getByTestId('remount-count')).toContainText('2');
-});
-
-test('update child callbacks without remounting', async ({ mount }) => {
-  const component = await mount(<DefaultChildren><Counter /></DefaultChildren>);
-
-  const messages: string[] = [];
-  await component.update(
-    <DefaultChildren>
-      <Counter
-        onClick={(message) => {
-          messages.push(message);
-        }}
-      />
-    </DefaultChildren>
-  );
-  await component.getByRole('button').click();
-  expect(messages).toEqual(['hello']);
-
-  /**
-   * Ideally toContainText('2') should be toContainText('1')
-   * However it seems impossible to update the props, slots or events of a rendered component
-   */
-  await expect(component.getByTestId('remount-count')).toContainText('2');
-});
-
-test('update children without remounting', async ({ mount }) => {
-  const component = await mount(<Counter>Default Slot</Counter>);
-  await expect(component).toContainText('Default Slot');
-
-  await component.update(<Counter>Test Slot</Counter>);
-  await expect(component).not.toContainText('Default Slot');
-  await expect(component).toContainText('Test Slot');
-
-  /**
-   * Ideally toContainText('2') should be toContainText('1')
-   * However it seems impossible to update the props, slots or events of a rendered component
-   */
-  await expect(component.getByTestId('remount-count')).toContainText('2');
-});
-
-test('update grandchild without remounting', async ({ mount }) => {
-  const component = await mount(
-    <DefaultChildren>
-      <Counter>Default Slot</Counter>
-    </DefaultChildren>
-  );
-  await expect(component.getByRole('button')).toContainText('Default Slot');
-
-  await component.update(
-    <DefaultChildren>
-      <Counter>Test Slot</Counter>
-    </DefaultChildren>
-  );
-  await expect(component.getByRole('button')).not.toContainText('Default Slot');
-  await expect(component.getByRole('button')).toContainText('Test Slot');
-
-  /**
-   * Ideally toContainText('2') should be toContainText('1')
-   * However it seems impossible to update the props, slots or events of a rendered component
-   */
-  await expect(component.getByTestId('remount-count')).toContainText('2');
-});
diff --git a/tests/components/ct-solid/tsconfig.json b/tests/components/ct-solid/tsconfig.json
deleted file mode 100644
index c353ff128ae91..0000000000000
--- a/tests/components/ct-solid/tsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "strict": true,
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vite/client"],
-    "noEmit": true,
-    "isolatedModules": true,
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"],
-      "*": ["_"],
-    }
-  }
-}
diff --git a/tests/components/ct-solid/vite.config.ts b/tests/components/ct-solid/vite.config.ts
deleted file mode 100644
index 9ff59a172211a..0000000000000
--- a/tests/components/ct-solid/vite.config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { defineConfig } from 'vite';
-import solidPlugin from 'vite-plugin-solid';
-
-export default defineConfig({
-  plugins: [solidPlugin()],
-  server: {
-    port: 3000,
-  },
-  build: {
-    target: 'esnext',
-  },
-});
diff --git a/tests/components/ct-svelte-vite/package.json b/tests/components/ct-svelte-vite/package.json
index 46a33b4f31de8..a82358e11cfb7 100644
--- a/tests/components/ct-svelte-vite/package.json
+++ b/tests/components/ct-svelte-vite/package.json
@@ -10,14 +10,13 @@
     "typecheck": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@tsconfig/svelte": "^5.0.2",
-    "svelte-check": "^3.6.2",
-    "tslib": "^2.6.2",
+    "@sveltejs/vite-plugin-svelte": "^5.1.0",
+    "@tsconfig/svelte": "^5.0.4",
+    "svelte-check": "^4.3.1",
     "typescript": "^5.3.3",
-    "vite": "^5.2.8"
+    "vite": "^6.3.4"
   },
   "dependencies": {
-    "svelte": "^4.2.8"
+    "svelte": "^5.37.3"
   }
 }
diff --git a/tests/components/ct-svelte-vite/src/App.svelte b/tests/components/ct-svelte-vite/src/App.svelte
index 93a64258b016f..78f04211bd2bb 100644
--- a/tests/components/ct-svelte-vite/src/App.svelte
+++ b/tests/components/ct-svelte-vite/src/App.svelte
@@ -3,7 +3,7 @@ import { onMount, onDestroy } from 'svelte';
 import LoginPage from './pages/LoginPage.svelte';
 import DashboardPage from './pages/DashboardPage.svelte';
 
-let path = '';
+let path = '/';
 function updatePath() {
   path = window.location.pathname;
 }
diff --git a/tests/components/ct-svelte-vite/src/components/Button.svelte b/tests/components/ct-svelte-vite/src/components/Button.svelte
index 2011c48b6b4cc..2fdaca299befd 100644
--- a/tests/components/ct-svelte-vite/src/components/Button.svelte
+++ b/tests/components/ct-svelte-vite/src/components/Button.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
-  import { createEventDispatcher } from "svelte";
-  export let title: string;
-  const dispatch = createEventDispatcher();
+  const { title, onsubmit } = $props();
 </script>
  
-<button on:click={() => dispatch('submit', 'hello')}>{title}</button>
+<button onclick={() => onsubmit('hello')}>{title}</button>
\ No newline at end of file
diff --git a/tests/components/ct-svelte-vite/src/components/Counter.svelte b/tests/components/ct-svelte-vite/src/components/Counter.svelte
index 0362e2ac53a55..284f12cd35d80 100644
--- a/tests/components/ct-svelte-vite/src/components/Counter.svelte
+++ b/tests/components/ct-svelte-vite/src/components/Counter.svelte
@@ -1,14 +1,10 @@
 <script lang="ts">
 import { update, remountCount } from '../store'
-import { createEventDispatcher } from "svelte";
-export let count: number;
-const dispatch = createEventDispatcher();
+const { count, onsubmit } = $props();
 update();
 </script>
 
-<button on:click={() => dispatch('submit', 'hello')}>
+<button onclick={() => onsubmit('hello')}>
   <span data-testid="props">{count}</span>
   <span data-testid="remount-count">{remountCount}</span>
-  <slot name="main" />
-  <slot />
 </button>
diff --git a/tests/components/ct-svelte-vite/src/components/DefaultSlot.svelte b/tests/components/ct-svelte-vite/src/components/DefaultSlot.svelte
index 201dda6ce3f33..7eba923f3b70a 100644
--- a/tests/components/ct-svelte-vite/src/components/DefaultSlot.svelte
+++ b/tests/components/ct-svelte-vite/src/components/DefaultSlot.svelte
@@ -1,7 +1,11 @@
+<script>
+const { children } = $props()
+</script>
+
 <div>
   <h1>Welcome!</h1>
   <main>
-    <slot />
+    {@render children()}
   </main>
   <footer>
     Thanks for visiting.
diff --git a/tests/components/ct-svelte-vite/src/components/NamedSlots.svelte b/tests/components/ct-svelte-vite/src/components/NamedSlots.svelte
index 5f0d988af511e..e095a50dcf1b0 100644
--- a/tests/components/ct-svelte-vite/src/components/NamedSlots.svelte
+++ b/tests/components/ct-svelte-vite/src/components/NamedSlots.svelte
@@ -1,11 +1,15 @@
+<script>
+const { header, main, footer } = $props()
+</script>
+
 <div>
   <header>
-    <slot name="header" />
+    {@render header()}
   </header>
   <main>
-    <slot name="main" />
+    {@render main()}
   </main>
   <footer>
-    <slot name="footer" />
+    {@render footer()}
   </footer>
 </div>
diff --git a/tests/components/ct-svelte-vite/src/svelte.d.ts b/tests/components/ct-svelte-vite/src/svelte.d.ts
deleted file mode 100644
index 393ff5ef70f5b..0000000000000
--- a/tests/components/ct-svelte-vite/src/svelte.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-declare module '*.svelte' {
-  import type { ComponentType } from 'svelte';
-  const component: ComponentType;
-  export default component;
-}
diff --git a/tests/components/ct-svelte-vite/tests/events.spec.ts b/tests/components/ct-svelte-vite/tests/events.spec.ts
index f2f2593515464..002229d6bde63 100644
--- a/tests/components/ct-svelte-vite/tests/events.spec.ts
+++ b/tests/components/ct-svelte-vite/tests/events.spec.ts
@@ -6,9 +6,7 @@ test('emit an submit event when the button is clicked', async ({ mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
-    },
-    on: {
-      submit: (data: string) => messages.push(data),
+      onsubmit: (data: string) => messages.push(data),
     },
   });
   await component.click();
diff --git a/tests/components/ct-svelte-vite/tests/render.spec.ts b/tests/components/ct-svelte-vite/tests/render.spec.ts
index bf830dd7152a8..c28618a666ff0 100644
--- a/tests/components/ct-svelte-vite/tests/render.spec.ts
+++ b/tests/components/ct-svelte-vite/tests/render.spec.ts
@@ -8,6 +8,7 @@ test('render props', async ({ mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await expect(component).toContainText('Submit');
diff --git a/tests/components/ct-svelte-vite/tests/slots.spec.ts b/tests/components/ct-svelte-vite/tests/slots.spec.ts
index 4d6823abe75a5..949a51e74761b 100644
--- a/tests/components/ct-svelte-vite/tests/slots.spec.ts
+++ b/tests/components/ct-svelte-vite/tests/slots.spec.ts
@@ -2,10 +2,10 @@ import { test, expect } from '@playwright/experimental-ct-svelte';
 import DefaultSlot from '@/components/DefaultSlot.svelte';
 import NamedSlots from '@/components/NamedSlots.svelte';
 
-test('render a default slot', async ({ mount }) => {
+test('render main children slot', async ({ mount }) => {
   const component = await mount(DefaultSlot, {
     slots: {
-      default: 'Main Content',
+      children: 'Main Content',
     },
   });
   await expect(component).toContainText('Main Content');
diff --git a/tests/components/ct-svelte-vite/tests/unmount.spec.ts b/tests/components/ct-svelte-vite/tests/unmount.spec.ts
index 946fc659e55e6..a3ec17c04b3f4 100644
--- a/tests/components/ct-svelte-vite/tests/unmount.spec.ts
+++ b/tests/components/ct-svelte-vite/tests/unmount.spec.ts
@@ -6,6 +6,7 @@ test('unmount', async ({ page, mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await expect(page.locator('#root')).toContainText('Submit');
@@ -26,6 +27,7 @@ test('unmount twice throws an error', async ({ mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await component.unmount();
@@ -36,12 +38,14 @@ test('mount then unmount then mount', async ({ mount }) => {
   let component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await component.unmount();
   component = await mount(Button, {
     props: {
       title: 'Save',
+      onsubmit: () => {},
     },
   });
   await expect(component).toContainText('Save');
diff --git a/tests/components/ct-svelte-vite/tests/update.spec.ts b/tests/components/ct-svelte-vite/tests/update.spec.ts
index 358204edfaed6..96bfb37915958 100644
--- a/tests/components/ct-svelte-vite/tests/update.spec.ts
+++ b/tests/components/ct-svelte-vite/tests/update.spec.ts
@@ -3,12 +3,17 @@ import Counter from '@/components/Counter.svelte';
 
 test('update props without remounting', async ({ mount }) => {
   const component = await mount(Counter, {
-    props: { count: 9001 },
+    props: {
+      count: 9001,
+      onsubmit: () => {},
+    },
   });
   await expect(component.getByTestId('props')).toContainText('9001');
 
   await component.update({
-    props: { count: 1337 },
+    props: {
+      count: 1337,
+    },
   });
   await expect(component).not.toContainText('9001');
   await expect(component.getByTestId('props')).toContainText('1337');
@@ -21,9 +26,9 @@ test('update event listeners without remounting', async ({ mount }) => {
 
   const messages: string[] = [];
   await component.update({
-    on: {
-      submit: (data: string) => messages.push(data),
-    },
+    props: {
+      onsubmit: (data: string) => messages.push(data),
+    }
   });
   await component.click();
   expect(messages).toEqual(['hello']);
diff --git a/tests/components/ct-svelte/package.json b/tests/components/ct-svelte/package.json
index 65a27f16811b1..fc2e6779861a7 100644
--- a/tests/components/ct-svelte/package.json
+++ b/tests/components/ct-svelte/package.json
@@ -19,6 +19,6 @@
     "sirv-cli": "^2.0.0"
   },
   "dependencies": {
-    "svelte": "^4.2.8"
+    "svelte": "^5.37.3"
   }
 }
diff --git a/tests/components/ct-svelte/src/App.svelte b/tests/components/ct-svelte/src/App.svelte
index 93a64258b016f..78f04211bd2bb 100644
--- a/tests/components/ct-svelte/src/App.svelte
+++ b/tests/components/ct-svelte/src/App.svelte
@@ -3,7 +3,7 @@ import { onMount, onDestroy } from 'svelte';
 import LoginPage from './pages/LoginPage.svelte';
 import DashboardPage from './pages/DashboardPage.svelte';
 
-let path = '';
+let path = '/';
 function updatePath() {
   path = window.location.pathname;
 }
diff --git a/tests/components/ct-svelte/src/components/Button.svelte b/tests/components/ct-svelte/src/components/Button.svelte
index 8c46efd1f2549..2fdaca299befd 100644
--- a/tests/components/ct-svelte/src/components/Button.svelte
+++ b/tests/components/ct-svelte/src/components/Button.svelte
@@ -1,7 +1,5 @@
-<script>
-import { createEventDispatcher } from "svelte";
-export let title;
-const dispatch = createEventDispatcher();
+<script lang="ts">
+  const { title, onsubmit } = $props();
 </script>
-    
-<button on:click={() => dispatch('submit', 'hello')}>{title}</button>
+ 
+<button onclick={() => onsubmit('hello')}>{title}</button>
\ No newline at end of file
diff --git a/tests/components/ct-svelte/src/components/Counter.svelte b/tests/components/ct-svelte/src/components/Counter.svelte
index 38674bb6c365e..284f12cd35d80 100644
--- a/tests/components/ct-svelte/src/components/Counter.svelte
+++ b/tests/components/ct-svelte/src/components/Counter.svelte
@@ -1,14 +1,10 @@
-<script>
+<script lang="ts">
 import { update, remountCount } from '../store'
-import { createEventDispatcher } from "svelte";
-export let count;
-const dispatch = createEventDispatcher();
+const { count, onsubmit } = $props();
 update();
 </script>
 
-<button on:click={() => dispatch('submit', 'hello')}>
+<button onclick={() => onsubmit('hello')}>
   <span data-testid="props">{count}</span>
   <span data-testid="remount-count">{remountCount}</span>
-  <slot name="main" />
-  <slot />
 </button>
diff --git a/tests/components/ct-svelte/src/components/DefaultSlot.svelte b/tests/components/ct-svelte/src/components/DefaultSlot.svelte
index 201dda6ce3f33..7eba923f3b70a 100644
--- a/tests/components/ct-svelte/src/components/DefaultSlot.svelte
+++ b/tests/components/ct-svelte/src/components/DefaultSlot.svelte
@@ -1,7 +1,11 @@
+<script>
+const { children } = $props()
+</script>
+
 <div>
   <h1>Welcome!</h1>
   <main>
-    <slot />
+    {@render children()}
   </main>
   <footer>
     Thanks for visiting.
diff --git a/tests/components/ct-svelte/src/components/NamedSlots.svelte b/tests/components/ct-svelte/src/components/NamedSlots.svelte
index 5f0d988af511e..e095a50dcf1b0 100644
--- a/tests/components/ct-svelte/src/components/NamedSlots.svelte
+++ b/tests/components/ct-svelte/src/components/NamedSlots.svelte
@@ -1,11 +1,15 @@
+<script>
+const { header, main, footer } = $props()
+</script>
+
 <div>
   <header>
-    <slot name="header" />
+    {@render header()}
   </header>
   <main>
-    <slot name="main" />
+    {@render main()}
   </main>
   <footer>
-    <slot name="footer" />
+    {@render footer()}
   </footer>
 </div>
diff --git a/tests/components/ct-svelte/tests/events.spec.ts b/tests/components/ct-svelte/tests/events.spec.ts
index f2f2593515464..002229d6bde63 100644
--- a/tests/components/ct-svelte/tests/events.spec.ts
+++ b/tests/components/ct-svelte/tests/events.spec.ts
@@ -6,9 +6,7 @@ test('emit an submit event when the button is clicked', async ({ mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
-    },
-    on: {
-      submit: (data: string) => messages.push(data),
+      onsubmit: (data: string) => messages.push(data),
     },
   });
   await component.click();
diff --git a/tests/components/ct-svelte/tests/render.spec.ts b/tests/components/ct-svelte/tests/render.spec.ts
index 3c0ada7a61949..e1d9939e25bf0 100644
--- a/tests/components/ct-svelte/tests/render.spec.ts
+++ b/tests/components/ct-svelte/tests/render.spec.ts
@@ -1,22 +1,17 @@
 import { test, expect } from '@playwright/experimental-ct-svelte';
 import Button from '@/components/Button.svelte';
-import Component from '@/components/Component.svelte';
 import Empty from '@/components/Empty.svelte';
 
 test('render props', async ({ mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await expect(component).toContainText('Submit');
 });
 
-test('render a component without options', async ({ mount }) => {
-  const component = await mount(Component);
-  await expect(component).toContainText('test');
-});
-
 test('get textContent of the empty component', async ({ mount }) => {
   const component = await mount(Empty);
   expect(await component.allTextContents()).toEqual(['']);
diff --git a/tests/components/ct-svelte/tests/slots.spec.ts b/tests/components/ct-svelte/tests/slots.spec.ts
index 4d6823abe75a5..949a51e74761b 100644
--- a/tests/components/ct-svelte/tests/slots.spec.ts
+++ b/tests/components/ct-svelte/tests/slots.spec.ts
@@ -2,10 +2,10 @@ import { test, expect } from '@playwright/experimental-ct-svelte';
 import DefaultSlot from '@/components/DefaultSlot.svelte';
 import NamedSlots from '@/components/NamedSlots.svelte';
 
-test('render a default slot', async ({ mount }) => {
+test('render main children slot', async ({ mount }) => {
   const component = await mount(DefaultSlot, {
     slots: {
-      default: 'Main Content',
+      children: 'Main Content',
     },
   });
   await expect(component).toContainText('Main Content');
diff --git a/tests/components/ct-svelte/tests/unmount.spec.ts b/tests/components/ct-svelte/tests/unmount.spec.ts
index c0ac0f678507d..391a72ecc5eb9 100644
--- a/tests/components/ct-svelte/tests/unmount.spec.ts
+++ b/tests/components/ct-svelte/tests/unmount.spec.ts
@@ -6,6 +6,7 @@ test('unmount', async ({ page, mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await expect(page.locator('#root')).toContainText('Submit');
@@ -26,6 +27,7 @@ test('unmount twice throws an error', async ({ mount }) => {
   const component = await mount(Button, {
     props: {
       title: 'Submit',
+      onsubmit: () => {},
     },
   });
   await component.unmount();
diff --git a/tests/components/ct-svelte/tests/update.spec.ts b/tests/components/ct-svelte/tests/update.spec.ts
index 358204edfaed6..96bfb37915958 100644
--- a/tests/components/ct-svelte/tests/update.spec.ts
+++ b/tests/components/ct-svelte/tests/update.spec.ts
@@ -3,12 +3,17 @@ import Counter from '@/components/Counter.svelte';
 
 test('update props without remounting', async ({ mount }) => {
   const component = await mount(Counter, {
-    props: { count: 9001 },
+    props: {
+      count: 9001,
+      onsubmit: () => {},
+    },
   });
   await expect(component.getByTestId('props')).toContainText('9001');
 
   await component.update({
-    props: { count: 1337 },
+    props: {
+      count: 1337,
+    },
   });
   await expect(component).not.toContainText('9001');
   await expect(component.getByTestId('props')).toContainText('1337');
@@ -21,9 +26,9 @@ test('update event listeners without remounting', async ({ mount }) => {
 
   const messages: string[] = [];
   await component.update({
-    on: {
-      submit: (data: string) => messages.push(data),
-    },
+    props: {
+      onsubmit: (data: string) => messages.push(data),
+    }
   });
   await component.click();
   expect(messages).toEqual(['hello']);
diff --git a/tests/components/ct-vue-cli/package.json b/tests/components/ct-vue-cli/package.json
index 6abe7531cb8b9..1c3653d027537 100644
--- a/tests/components/ct-vue-cli/package.json
+++ b/tests/components/ct-vue-cli/package.json
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "core-js": "^3.8.3",
-    "vue": "3.2.36",
-    "vue-router": "^4.1.5"
+    "vue": "^3.2.36",
+    "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.2",
@@ -20,7 +20,7 @@
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-plugin-router": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
-    "@vue/tsconfig": "^0.1.3",
+    "@vue/tsconfig": "^0.7.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3"
   },
diff --git a/tests/components/ct-vue-cli/tsconfig.app.json b/tests/components/ct-vue-cli/tsconfig.app.json
index 5e1fc21721d9f..4d8e68abb83de 100644
--- a/tests/components/ct-vue-cli/tsconfig.app.json
+++ b/tests/components/ct-vue-cli/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.web.json",
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
   "include": ["src/**/*", "src/**/*.vue"],
   "exclude": ["src/**/*.spec.*/*"],
   "compilerOptions": {
diff --git a/tests/components/ct-vue-cli/tsconfig.config.json b/tests/components/ct-vue-cli/tsconfig.config.json
index d554caf51bd61..4c52107addaa7 100644
--- a/tests/components/ct-vue-cli/tsconfig.config.json
+++ b/tests/components/ct-vue-cli/tsconfig.config.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@vue/tsconfig/tsconfig.node.json",
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
   "include": ["playwright.config.*"],
   "compilerOptions": {
     "composite": true,
diff --git a/tests/components/ct-vue-vite/package.json b/tests/components/ct-vue-vite/package.json
index 608a128763af7..025ff5d1560c6 100644
--- a/tests/components/ct-vue-vite/package.json
+++ b/tests/components/ct-vue-vite/package.json
@@ -1,6 +1,7 @@
 {
   "name": "ct-vue-vite",
   "version": "0.0.0",
+  "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -12,8 +13,9 @@
     "vue-router": "^4.1.5"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.1.0",
+    "@vitejs/plugin-vue": "^5.2.0",
     "@vue/tsconfig": "^0.5.1",
+    "typescript": "5.6.2",
     "vite": "^5.2.8",
     "vue-tsc": "^2.0.21"
   }
diff --git a/tests/components/ct-vue-vite/playwright.config.ts b/tests/components/ct-vue-vite/playwright.config.ts
index c95f2ff33871d..18067fda8d507 100644
--- a/tests/components/ct-vue-vite/playwright.config.ts
+++ b/tests/components/ct-vue-vite/playwright.config.ts
@@ -15,7 +15,8 @@
  */
 
 import { defineConfig, devices } from '@playwright/experimental-ct-vue';
-import { resolve } from 'path';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
 export default defineConfig({
   testDir: 'tests',
@@ -27,7 +28,7 @@ export default defineConfig({
     ctViteConfig: {
       resolve: {
         alias: {
-          '@': resolve(__dirname, './src'),
+          '@': path.resolve(path.dirname(fileURLToPath(import.meta.url)), './src'),
         }
       }
     }
diff --git a/tests/components/ct-vue-vite/src/components/SlotDefaultValue.vue b/tests/components/ct-vue-vite/src/components/SlotDefaultValue.vue
new file mode 100644
index 0000000000000..c5944a3f8a9b9
--- /dev/null
+++ b/tests/components/ct-vue-vite/src/components/SlotDefaultValue.vue
@@ -0,0 +1,3 @@
+<template>
+  <slot>default value</slot>
+</template>
diff --git a/tests/components/ct-vue-vite/tests/slots/slots.spec.js b/tests/components/ct-vue-vite/tests/slots/slots.spec.js
index a33c9dac920fa..7d36d9733b375 100644
--- a/tests/components/ct-vue-vite/tests/slots/slots.spec.js
+++ b/tests/components/ct-vue-vite/tests/slots/slots.spec.js
@@ -2,6 +2,7 @@ import { test, expect } from '@playwright/experimental-ct-vue';
 import DefaultSlot from '@/components/DefaultSlot.vue';
 import NamedSlots from '@/components/NamedSlots.vue';
 import Button from '@/components/Button.vue';
+import SlotDefaultValue from "@/components/SlotDefaultValue.vue";
 
 test('render a default slot', async ({ mount }) => {
   const component = await mount(DefaultSlot, {
@@ -49,3 +50,13 @@ test('render a component with a named slot', async ({ mount }) => {
   await expect(component).toContainText('Main Content');
   await expect(component).toContainText('Footer');
 });
+
+test('updating default slot should work', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32809' } }, async ({ mount }) => {
+  const slots = { default: 'foo' };
+
+  const component = await mount(SlotDefaultValue, { slots });
+  await expect(component).toHaveText('foo');
+
+  await component.update({ slots });
+  await expect(component).toHaveText('foo');
+});
diff --git a/tests/components/ct-vue-vite/tests/slots/slots.spec.ts b/tests/components/ct-vue-vite/tests/slots/slots.spec.ts
index a33c9dac920fa..7d36d9733b375 100644
--- a/tests/components/ct-vue-vite/tests/slots/slots.spec.ts
+++ b/tests/components/ct-vue-vite/tests/slots/slots.spec.ts
@@ -2,6 +2,7 @@ import { test, expect } from '@playwright/experimental-ct-vue';
 import DefaultSlot from '@/components/DefaultSlot.vue';
 import NamedSlots from '@/components/NamedSlots.vue';
 import Button from '@/components/Button.vue';
+import SlotDefaultValue from "@/components/SlotDefaultValue.vue";
 
 test('render a default slot', async ({ mount }) => {
   const component = await mount(DefaultSlot, {
@@ -49,3 +50,13 @@ test('render a component with a named slot', async ({ mount }) => {
   await expect(component).toContainText('Main Content');
   await expect(component).toContainText('Footer');
 });
+
+test('updating default slot should work', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32809' } }, async ({ mount }) => {
+  const slots = { default: 'foo' };
+
+  const component = await mount(SlotDefaultValue, { slots });
+  await expect(component).toHaveText('foo');
+
+  await component.update({ slots });
+  await expect(component).toHaveText('foo');
+});
diff --git a/tests/components/ct-vue-vite/tsconfig.node.json b/tests/components/ct-vue-vite/tsconfig.node.json
deleted file mode 100644
index 43cc10531336c..0000000000000
--- a/tests/components/ct-vue-vite/tsconfig.node.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.dom.json",
-  "include": ["vite.config.*", "playwright.config.*"],
-  "compilerOptions": {
-    "composite": true,
-    "types": ["node"],
-    "ignoreDeprecations": "5.0"
-  }
-}
\ No newline at end of file
diff --git a/tests/components/ct-vue2-cli/.gitignore b/tests/components/ct-vue2-cli/.gitignore
deleted file mode 100644
index 7e2a946d8ee19..0000000000000
--- a/tests/components/ct-vue2-cli/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-.DS_Store
-node_modules
-/dist
-*.tsbuildinfo
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/tests/components/ct-vue2-cli/README.md b/tests/components/ct-vue2-cli/README.md
deleted file mode 100644
index c9a7da714eda3..0000000000000
--- a/tests/components/ct-vue2-cli/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# ct-vue2-cli
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Lints and fixes files
-```
-npm run lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
diff --git a/tests/components/ct-vue2-cli/babel.config.js b/tests/components/ct-vue2-cli/babel.config.js
deleted file mode 100644
index e9558405fdcc0..0000000000000
--- a/tests/components/ct-vue2-cli/babel.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
diff --git a/tests/components/ct-vue2-cli/package.json b/tests/components/ct-vue2-cli/package.json
deleted file mode 100644
index 472d30f92b239..0000000000000
--- a/tests/components/ct-vue2-cli/package.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "name": "ct-vue2-cli",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "typecheck": "tsc --noEmit --project tsconfig.test.json"
-  },
-  "dependencies": {
-    "core-js": "^3.8.3",
-    "vue": "^2.7.13",
-    "vue-router": "^3.6.5"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.23.2",
-    "@babel/eslint-parser": "^7.22.15",
-    "@vue/cli-plugin-babel": "~5.0.0",
-    "@vue/cli-plugin-eslint": "~5.0.0",
-    "@vue/cli-service": "~5.0.0",
-    "@vue/tsconfig": "^0.1.3",
-    "eslint": "^7.32.0",
-    "eslint-plugin-vue": "^8.0.3"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "parserOptions": {
-      "parser": "@babel/eslint-parser"
-    },
-    "rules": {}
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
diff --git a/tests/components/ct-vue2-cli/playwright.config.ts b/tests/components/ct-vue2-cli/playwright.config.ts
deleted file mode 100644
index 307bc9726d368..0000000000000
--- a/tests/components/ct-vue2-cli/playwright.config.ts
+++ /dev/null
@@ -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 { defineConfig, devices } from '@playwright/experimental-ct-vue2';
-import { resolve } from 'path';
-
-export default defineConfig({
-  testDir: 'tests',
-  forbidOnly: !!process.env.CI,
-  retries: process.env.CI ? 2 : 0,
-  reporter: process.env.CI ? 'html' : 'line',
-  use: {
-    trace: 'on-first-retry',
-    ctViteConfig: {
-      resolve: {
-        alias: {
-          '@': resolve(__dirname, './src'),
-        }
-      }
-    }
-  },
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-  ],
-});
diff --git a/tests/components/ct-vue2-cli/playwright/index.html b/tests/components/ct-vue2-cli/playwright/index.html
deleted file mode 100644
index 9ee6c8206eb9d..0000000000000
--- a/tests/components/ct-vue2-cli/playwright/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="./index.js"></script>
-  </body>
-</html>
diff --git a/tests/components/ct-vue2-cli/playwright/index.js b/tests/components/ct-vue2-cli/playwright/index.js
deleted file mode 100644
index f5bd21d70d054..0000000000000
--- a/tests/components/ct-vue2-cli/playwright/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { beforeMount, afterMount } from '@playwright/experimental-ct-vue2/hooks';
-import Router from 'vue-router';
-import { router } from '../src/router';
-import '../src/assets/index.css';
-
-beforeMount(async ({ Vue, hooksConfig }) => {
-  console.log(`Before mount: ${JSON.stringify(hooksConfig)}`);
-
-  if (hooksConfig?.routing) {
-    Vue.use(Router);
-    return { router }
-  }
-});
-
-afterMount(async ({ instance }) => {
-  console.log(`After mount el: ${instance.$el.constructor.name}`);
-});
diff --git a/tests/components/ct-vue2-cli/public/favicon.ico b/tests/components/ct-vue2-cli/public/favicon.ico
deleted file mode 100644
index df36fcfb72584..0000000000000
Binary files a/tests/components/ct-vue2-cli/public/favicon.ico and /dev/null differ
diff --git a/tests/components/ct-vue2-cli/public/index.html b/tests/components/ct-vue2-cli/public/index.html
deleted file mode 100644
index 3e5a139621971..0000000000000
--- a/tests/components/ct-vue2-cli/public/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
diff --git a/tests/components/ct-vue2-cli/src/App.vue b/tests/components/ct-vue2-cli/src/App.vue
deleted file mode 100644
index c2209eb5d7956..0000000000000
--- a/tests/components/ct-vue2-cli/src/App.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-  <div id="app">
-    <header>
-      <img alt="Vue logo" src="./assets/logo.png" width="60" height="60">
-      <router-link to="/">Login</router-link>
-      <router-link to="/dashboard">Dashboard</router-link>
-    </header>
-    <router-view />
-  </div>
-</template>
\ No newline at end of file
diff --git a/tests/components/ct-vue2-cli/src/assets/index.css b/tests/components/ct-vue2-cli/src/assets/index.css
deleted file mode 100644
index 97495c44b8634..0000000000000
--- a/tests/components/ct-vue2-cli/src/assets/index.css
+++ /dev/null
@@ -1,20 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #e3e3e3;
-    background-color: #1b1b1d;
-  }
-}
diff --git a/tests/components/ct-vue2-cli/src/assets/logo.png b/tests/components/ct-vue2-cli/src/assets/logo.png
deleted file mode 100644
index f3d2503fc2a44..0000000000000
Binary files a/tests/components/ct-vue2-cli/src/assets/logo.png and /dev/null differ
diff --git a/tests/components/ct-vue2-cli/src/components/Button.vue b/tests/components/ct-vue2-cli/src/components/Button.vue
deleted file mode 100644
index 8bf2f3b71b588..0000000000000
--- a/tests/components/ct-vue2-cli/src/components/Button.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<template>
-  <button @click="$emit('submit', 'hello')">{{ title }}</button>
-</template>
-
-<script lang="ts">
-export default {
-  name: 'ButtonButton',
-  props: ['title']
-}
-</script>
diff --git a/tests/components/ct-vue2-cli/src/components/Component.vue b/tests/components/ct-vue2-cli/src/components/Component.vue
deleted file mode 100644
index 133c8e26707c9..0000000000000
--- a/tests/components/ct-vue2-cli/src/components/Component.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
- <div>test</div>
-</template>
diff --git a/tests/components/ct-vue2-cli/src/components/Counter.vue b/tests/components/ct-vue2-cli/src/components/Counter.vue
deleted file mode 100644
index a048a43535630..0000000000000
--- a/tests/components/ct-vue2-cli/src/components/Counter.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <button @click="$emit('submit', 'hello')">
-    <span data-testid="props">{{ count }}</span>
-    <span data-testid="remount-count">{{ remountCount }}</span>
-    <slot name="main" />
-    <slot />
-  </button>
- </template>
-
-<script lang="ts">
-  let remountCount = 0;
-  
-  export default {
-    name: 'Button',
-    props: ['count'],
-    data() {
-      return { remountCount }
-    },
-    beforeCreate() {
-      remountCount++;
-    },
-  }
-</script>
diff --git a/tests/components/ct-vue2-cli/src/components/DefaultSlot.vue b/tests/components/ct-vue2-cli/src/components/DefaultSlot.vue
deleted file mode 100644
index 287b84beafaa7..0000000000000
--- a/tests/components/ct-vue2-cli/src/components/DefaultSlot.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <div>
-    <h1>Welcome!</h1>
-    <main>
-      <slot />
-    </main>
-    <footer>
-      Thanks for visiting.
-    </footer>
-  </div>
-</template>
diff --git a/tests/components/ct-vue2-cli/src/components/EmptyTemplate.vue b/tests/components/ct-vue2-cli/src/components/EmptyTemplate.vue
deleted file mode 100644
index 9b4c59695ec37..0000000000000
--- a/tests/components/ct-vue2-cli/src/components/EmptyTemplate.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts" setup>
-  import { useSlots } from 'vue';
-  const slots = useSlots();
-  Object.assign(window, { slots });
-</script>
-<template>
-</template>
-
diff --git a/tests/components/ct-vue2-cli/src/components/NamedSlots.vue b/tests/components/ct-vue2-cli/src/components/NamedSlots.vue
deleted file mode 100644
index 582608df32fc4..0000000000000
--- a/tests/components/ct-vue2-cli/src/components/NamedSlots.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div>
-    <header>
-      <slot name="header" />
-    </header>
-    <main>
-      <slot name="main" />
-    </main>
-    <footer>
-      <slot name="footer" />
-    </footer>
-  </div>
-</template>
diff --git a/tests/components/ct-vue2-cli/src/main.js b/tests/components/ct-vue2-cli/src/main.js
deleted file mode 100644
index b92d6e3e04738..0000000000000
--- a/tests/components/ct-vue2-cli/src/main.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Vue from 'vue';
-import Router from 'vue-router';
-import App from './App.vue';
-import { router } from './router';
-import './assets/index.css';
-
-Vue.config.productionTip = false;
-
-Vue.use(Router);
-
-new Vue({
-  router,
-  render: h => h(App),
-}).$mount('#app');
diff --git a/tests/components/ct-vue2-cli/src/pages/DashboardPage.vue b/tests/components/ct-vue2-cli/src/pages/DashboardPage.vue
deleted file mode 100644
index 0dcf8cc990a48..0000000000000
--- a/tests/components/ct-vue2-cli/src/pages/DashboardPage.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <main>Dashboard</main>
-</template>
diff --git a/tests/components/ct-vue2-cli/src/pages/LoginPage.vue b/tests/components/ct-vue2-cli/src/pages/LoginPage.vue
deleted file mode 100644
index aaa18be8ab3ac..0000000000000
--- a/tests/components/ct-vue2-cli/src/pages/LoginPage.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <main>Login</main>
-</template>
diff --git a/tests/components/ct-vue2-cli/src/router/index.js b/tests/components/ct-vue2-cli/src/router/index.js
deleted file mode 100644
index 3e5680ca8e4f8..0000000000000
--- a/tests/components/ct-vue2-cli/src/router/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Router from 'vue-router';
-import LoginPage from '../pages/LoginPage.vue';
-import DashboardPage from '../pages/DashboardPage.vue';
-
-export const router = new Router({
-  mode: 'history',
-  base: '/',
-  routes: [
-    { path: '/', component: LoginPage },
-    { path: '/dashboard', component: DashboardPage }
-  ]
-});
diff --git a/tests/components/ct-vue2-cli/src/shims-vue.d.ts b/tests/components/ct-vue2-cli/src/shims-vue.d.ts
deleted file mode 100644
index 8f6f410263712..0000000000000
--- a/tests/components/ct-vue2-cli/src/shims-vue.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module '*.vue' {
-  import Vue from 'vue';
-  export default Vue;
-}
diff --git a/tests/components/ct-vue2-cli/tests/events/events.spec.ts b/tests/components/ct-vue2-cli/tests/events/events.spec.ts
deleted file mode 100644
index 71c4c958a9d80..0000000000000
--- a/tests/components/ct-vue2-cli/tests/events/events.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-
-test('emit an submit event when the button is clicked', async ({ mount }) => {
-  const messages: string[] = [];
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit',
-    },
-    on: {
-      submit: (data: string) => messages.push(data),
-    },
-  });
-  await component.click();
-  expect(messages).toEqual(['hello']);
-});
diff --git a/tests/components/ct-vue2-cli/tests/events/events.spec.tsx b/tests/components/ct-vue2-cli/tests/events/events.spec.tsx
deleted file mode 100644
index 9d31d708fb180..0000000000000
--- a/tests/components/ct-vue2-cli/tests/events/events.spec.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-import DefaultSlot from '@/components/DefaultSlot.vue';
-
-test('emit an submit event when the button is clicked', async ({ mount }) => {
-  const messages: string[] = [];
-  const component = await mount(
-    <Button
-      title="Submit"
-      v-on:submit={(data: string) => {
-        messages.push(data);
-      }}
-    />
-  );
-  await component.click();
-  expect(messages).toEqual(['hello']);
-});
-
-test('emit a event when a slot is clicked', async ({ mount }) => {
-  let clickFired = false;
-  const component = await mount(
-    <DefaultSlot>
-      <span v-on:click={() => (clickFired = true)}>Main Content</span>
-    </DefaultSlot>
-  );
-  await component.getByText('Main Content').click();
-  expect(clickFired).toBeTruthy();
-});
diff --git a/tests/components/ct-vue2-cli/tests/render/render.spec.ts b/tests/components/ct-vue2-cli/tests/render/render.spec.ts
deleted file mode 100644
index dcb3284f3c64a..0000000000000
--- a/tests/components/ct-vue2-cli/tests/render/render.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-import Component from '@/components/Component.vue';
-import EmptyTemplate from '@/components/EmptyTemplate.vue';
-
-test('render props', async ({ mount }) => {
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit',
-    },
-  });
-  await expect(component).toContainText('Submit');
-});
-
-test('render a component without options', async ({ mount }) => {
-  const component = await mount(Component);
-  await expect(component).toContainText('test');
-});
-
-test('get textContent of the empty template', async ({ mount }) => {
-  const component = await mount(EmptyTemplate);
-  expect(await component.allTextContents()).toEqual(['']);
-  expect(await component.textContent()).toBe('');
-  await expect(component).toHaveText('');
-});
diff --git a/tests/components/ct-vue2-cli/tests/render/render.spec.tsx b/tests/components/ct-vue2-cli/tests/render/render.spec.tsx
deleted file mode 100644
index 699269545ddaa..0000000000000
--- a/tests/components/ct-vue2-cli/tests/render/render.spec.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-import EmptyTemplate from '@/components/EmptyTemplate.vue';
-
-test('render props', async ({ mount }) => {
-  const component = await mount(<Button title="Submit" />);
-  await expect(component).toContainText('Submit');
-});
-
-test('render attributes', async ({ mount }) => {
-  const component = await mount(<Button class="primary" title="Submit" />);
-  await expect(component).toHaveClass('primary');
-});
-
-test('render an empty component', async ({ page, mount }) => {
-  const component = await mount(<EmptyTemplate />);
-  expect(await page.evaluate(() => 'slots' in window && window.slots)).toEqual({});
-  expect(await component.allTextContents()).toEqual(['']);
-  expect(await component.textContent()).toBe('');
-  await expect(component).toHaveText('');
-});
diff --git a/tests/components/ct-vue2-cli/tests/slots/slots.spec.ts b/tests/components/ct-vue2-cli/tests/slots/slots.spec.ts
deleted file mode 100644
index afc121007496f..0000000000000
--- a/tests/components/ct-vue2-cli/tests/slots/slots.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import DefaultSlot from '@/components/DefaultSlot.vue';
-import NamedSlots from '@/components/NamedSlots.vue';
-
-test('render a default slot', async ({ mount }) => {
-  const component = await mount(DefaultSlot, {
-    slots: {
-      default: 'Main Content',
-    },
-  });
-  await expect(component).toContainText('Main Content');
-});
-
-test('render a component with multiple slots', async ({ mount }) => {
-  const component = await mount(DefaultSlot, {
-    slots: {
-      default: ['one', 'two'],
-    },
-  });
-  await expect(component).toContainText('one');
-  await expect(component).toContainText('two');
-});
-
-test('render a component with a named slot', async ({ mount }) => {
-  const component = await mount(NamedSlots, {
-    slots: {
-      header: 'Header',
-      main: 'Main Content',
-      footer: 'Footer',
-    },
-  });
-  await expect(component).toContainText('Header');
-  await expect(component).toContainText('Main Content');
-  await expect(component).toContainText('Footer');
-});
diff --git a/tests/components/ct-vue2-cli/tests/slots/slots.spec.tsx b/tests/components/ct-vue2-cli/tests/slots/slots.spec.tsx
deleted file mode 100644
index cde13ca16a86c..0000000000000
--- a/tests/components/ct-vue2-cli/tests/slots/slots.spec.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-import DefaultSlot from '@/components/DefaultSlot.vue';
-import NamedSlots from '@/components/NamedSlots.vue';
-
-test('render a default slot', async ({ mount }) => {
-  const component = await mount(<DefaultSlot>Main Content</DefaultSlot>);
-  await expect(component).toContainText('Main Content');
-});
-
-test('render a component as slot', async ({ mount }) => {
-  const component = await mount(
-    <DefaultSlot>
-      <Button title="Submit" />
-    </DefaultSlot>
-  );
-  await expect(component).toContainText('Submit');
-});
-
-test('render a component with multiple slots', async ({ mount }) => {
-  const component = await mount(
-    <DefaultSlot>
-      <div data-testid="one">One</div>
-      <div data-testid="two">Two</div>
-    </DefaultSlot>
-  );
-  await expect(component.getByTestId('one')).toContainText('One');
-  await expect(component.getByTestId('two')).toContainText('Two');
-});
-
-test('render a component with a named slot', async ({ mount }) => {
-  const component = await mount(
-    <NamedSlots>
-      <template v-slot:header>Header</template>
-      <template v-slot:main>Main Content</template>
-      <template v-slot:footer>Footer</template>
-    </NamedSlots>
-  );
-  await expect(component).toContainText('Header');
-  await expect(component).toContainText('Main Content');
-  await expect(component).toContainText('Footer');
-});
-
-test('render array as child', async ({ mount }) => {
-  const component = await mount(<DefaultSlot>{[<h4>{[4]}</h4>,[[<p>[2,3]</p>]]]}</DefaultSlot>);
-  await expect(component.getByRole('heading', { level: 4 })).toHaveText('4');
-  await expect(component.getByRole('paragraph')).toHaveText('[2,3]');
-});
diff --git a/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.ts b/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.ts
deleted file mode 100644
index d110f443589f1..0000000000000
--- a/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-
-test('unmount', async ({ page, mount }) => {
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit',
-    },
-  });
-  await expect(page.locator('#root')).toContainText('Submit');
-  await component.unmount();
-  await expect(page.locator('#root')).not.toContainText('Submit');
-});
-
-test('unmount twice throws an error', async ({ mount }) => {
-  const component = await mount(Button, {
-    props: {
-      title: 'Submit',
-    },
-  });
-  await component.unmount();
-  await expect(component.unmount()).rejects.toThrowError('Component was not mounted');
-});
-
-test('mount then unmount then mount', async ({ mount }) => {
-  let component = await mount(Button, {
-    props: {
-      title: 'Submit',
-    },
-  });
-  await component.unmount();
-  component = await mount(Button, {
-    props: {
-      title: 'Save',
-    },
-  });
-  await expect(component).toContainText('Save');
-});
diff --git a/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.tsx b/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.tsx
deleted file mode 100644
index 683aa31bdaa33..0000000000000
--- a/tests/components/ct-vue2-cli/tests/unmount/unmount.spec.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Button from '@/components/Button.vue';
-
-test('unmount', async ({ page, mount }) => {
-  const component = await mount(<Button title="Submit" />);
-  await expect(page.locator('#root')).toContainText('Submit');
-  await component.unmount();
-  await expect(page.locator('#root')).not.toContainText('Submit');
-});
-
-test('unmount twice throws an error', async ({ mount }) => {
-  const component = await mount(<Button title="Submit" />);
-  await component.unmount();
-  await expect(component.unmount()).rejects.toThrowError('Component was not mounted');
-});
-
-test('mount then unmount then mount', async ({ mount }) => {
-  let component = await mount(<Button title="Submit" />);
-  await component.unmount();
-  component = await mount(<Button title="Save" />);
-  await expect(component).toContainText('Save');
-});
diff --git a/tests/components/ct-vue2-cli/tests/update/update.spec.ts b/tests/components/ct-vue2-cli/tests/update/update.spec.ts
deleted file mode 100644
index 0c45587b8f693..0000000000000
--- a/tests/components/ct-vue2-cli/tests/update/update.spec.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Counter from '@/components/Counter.vue';
-
-test('update props without remounting', async ({ mount }) => {
-  const component = await mount(Counter, {
-    props: { count: 9001 },
-  });
-  await expect(component.getByTestId('props')).toContainText('9001');
-
-  await component.update({
-    props: { count: 1337 },
-  });
-  await expect(component).not.toContainText('9001');
-  await expect(component.getByTestId('props')).toContainText('1337');
-
-  await expect(component.getByTestId('remount-count')).toContainText('1');
-});
-
-test('update event listeners without remounting', async ({ mount }) => {
-  const component = await mount(Counter);
-
-  const messages: string[] = [];
-  await component.update({
-    on: {
-      submit: (data: string) => messages.push(data),
-    },
-  });
-  await component.click();
-  expect(messages).toEqual(['hello']);
-
-  await expect(component.getByTestId('remount-count')).toContainText('1');
-});
-
-test('update slots without remounting', async ({ mount }) => {
-  const component = await mount(Counter, {
-    slots: { default: 'Default Slot' },
-  });
-  await expect(component).toContainText('Default Slot');
-
-  await component.update({
-    slots: { main: 'Test Slot' },
-  });
-  await expect(component).not.toContainText('Default Slot');
-  await expect(component).toContainText('Test Slot');
-
-  await component.update({
-    slots: { default: 'Default Slot' },
-  });
-  await expect(component).toContainText('Default Slot');
-
-  await expect(component.getByTestId('remount-count')).toContainText('1');
-});
diff --git a/tests/components/ct-vue2-cli/tests/update/update.spec.tsx b/tests/components/ct-vue2-cli/tests/update/update.spec.tsx
deleted file mode 100644
index f9f7cf9c61a7a..0000000000000
--- a/tests/components/ct-vue2-cli/tests/update/update.spec.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import Counter from '@/components/Counter.vue';
-
-test('update props without remounting', async ({ mount }) => {
-  const component = await mount(<Counter count={9001} />);
-  await expect(component.getByTestId('props')).toContainText('9001');
-
-  await component.update(<Counter count={1337} />);
-  await expect(component).not.toContainText('9001');
-  await expect(component.getByTestId('props')).toContainText('1337');
-
-  await expect(component.getByTestId('remount-count')).toContainText('1');
-});
-
-test('update event listeners without remounting', async ({ mount }) => {
-  const messages: string[] = [];
-  const component = await mount(<Counter />);
-
-  await component.update(
-    <Counter
-      v-on:submit={(count: string) => {
-        messages.push(count);
-      }}
-    />
-  );
-  await component.click();
-  expect(messages).toEqual(['hello']);
-
-  await expect(component.getByTestId('remount-count')).toContainText('1');
-});
-
-test('update slots without remounting', async ({ mount }) => {
-  const component = await mount(<Counter>Default Slot</Counter>);
-  await expect(component).toContainText('Default Slot');
-
-  await component.update(
-    <Counter>
-      <template v-slot:main>Test Slot</template>
-    </Counter>
-  );
-  await expect(component).not.toContainText('Default Slot');
-  await expect(component).toContainText('Test Slot');
-
-  await expect(component.getByTestId('remount-count')).toContainText('1');
-});
-
-test('throw error when updating a native html element', async ({ mount }) => {
-  const component = await mount(<div id="1337"></div>);
-  
-  await expect(async () => {
-    await component.update(<div id="9001"></div>);
-  }).rejects.toThrowError('Updating a native HTML element is not supported');
-});
diff --git a/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.ts b/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.ts
deleted file mode 100644
index 53615f8f01257..0000000000000
--- a/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import App from '@/App.vue';
-
-test('navigate to a page by clicking a link', async ({ page, mount }) => {
-  const component = await mount(App, {
-    hooksConfig: { routing: true },
-  });
-  await expect(component.getByRole('main')).toHaveText('Login');
-  await expect(page).toHaveURL('/');
-  await component.getByRole('link', { name: 'Dashboard' }).click();
-  await expect(component.getByRole('main')).toHaveText('Dashboard');
-  await expect(page).toHaveURL('/dashboard');
-});
diff --git a/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.tsx b/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.tsx
deleted file mode 100644
index 1a6ac3a2a1c75..0000000000000
--- a/tests/components/ct-vue2-cli/tests/vue-router/vue-router.spec.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { test, expect } from '@playwright/experimental-ct-vue2';
-import App from '@/App.vue';
-
-test('navigate to a page by clicking a link', async ({ page, mount }) => {
-  const component = await mount(<App />, {
-    hooksConfig: { routing: true },
-  });
-  await expect(component.getByRole('main')).toHaveText('Login');
-  await expect(page).toHaveURL('/');
-  await component.getByRole('link', { name: 'Dashboard' }).click();
-  await expect(component.getByRole('main')).toHaveText('Dashboard');
-  await expect(page).toHaveURL('/dashboard');
-});
diff --git a/tests/components/ct-vue2-cli/tsconfig.app.json b/tests/components/ct-vue2-cli/tsconfig.app.json
deleted file mode 100644
index 2222a73314935..0000000000000
--- a/tests/components/ct-vue2-cli/tsconfig.app.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.web.json",
-  "include": ["src/**/*", "src/**/*.vue"],
-  "compilerOptions": {
-    "composite": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["./src/*"],
-      "*": ["_"],
-    }
-  }
-}
diff --git a/tests/components/ct-vue2-cli/tsconfig.config.json b/tests/components/ct-vue2-cli/tsconfig.config.json
deleted file mode 100644
index d554caf51bd61..0000000000000
--- a/tests/components/ct-vue2-cli/tsconfig.config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "@vue/tsconfig/tsconfig.node.json",
-  "include": ["playwright.config.*"],
-  "compilerOptions": {
-    "composite": true,
-    "types": ["node"]
-  }
-}
diff --git a/tests/components/ct-vue2-cli/tsconfig.json b/tests/components/ct-vue2-cli/tsconfig.json
deleted file mode 100644
index 536e033e835eb..0000000000000
--- a/tests/components/ct-vue2-cli/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.config.json"
-    },
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.test.json"
-    }
-  ]
-}
diff --git a/tests/components/ct-vue2-cli/tsconfig.test.json b/tests/components/ct-vue2-cli/tsconfig.test.json
deleted file mode 100644
index b87d76b5ca973..0000000000000
--- a/tests/components/ct-vue2-cli/tsconfig.test.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.app.json",
-  "include": ["tests/**/*", "src/shims-vue.d.ts"],
-  "compilerOptions": {
-    "allowJs": true,
-    "composite": true,
-    "lib": [],
-    "types": ["node"],
-    "ignoreDeprecations": "5.0"
-  }
-}
diff --git a/tests/components/ct-vue2-cli/vue.config.js b/tests/components/ct-vue2-cli/vue.config.js
deleted file mode 100644
index 910e297e0f534..0000000000000
--- a/tests/components/ct-vue2-cli/vue.config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const { defineConfig } = require('@vue/cli-service')
-module.exports = defineConfig({
-  transpileDependencies: true
-})
diff --git a/tests/config/baseTest.ts b/tests/config/baseTest.ts
index b585f28e565ba..b24a8f0b1d259 100644
--- a/tests/config/baseTest.ts
+++ b/tests/config/baseTest.ts
@@ -22,6 +22,7 @@ import type { ServerFixtures, ServerWorkerOptions } from './serverFixtures';
 import { serverFixtures } from './serverFixtures';
 import { platformTest } from './platformFixtures';
 import { testModeTest } from './testModeFixtures';
+import type { Builtins } from '../../packages/injected/src/utilityScript';
 
 export const base = test;
 
@@ -44,13 +45,6 @@ export function step<This extends Object, Args extends any[], Return>(
 
 declare global {
   interface Window {
-    builtinSetTimeout: WindowOrWorkerGlobalScope['setTimeout'],
-    builtinClearTimeout: WindowOrWorkerGlobalScope['setTimeout'],
-    builtinSetInterval: WindowOrWorkerGlobalScope['setInterval'],
-    builtinClearInterval: WindowOrWorkerGlobalScope['clearInterval'],
-    builtinRequestAnimationFrame: AnimationFrameProvider['requestAnimationFrame'],
-    builtinCancelAnimationFrame: AnimationFrameProvider['cancelAnimationFrame'],
-    builtinPerformance: WindowOrWorkerGlobalScope['performance'],
-    builtinDate: typeof Date,
+    builtins: Builtins;
   }
 }
diff --git a/tests/config/browserTest.ts b/tests/config/browserTest.ts
index 01b574f10522c..45cf6fba67b85 100644
--- a/tests/config/browserTest.ts
+++ b/tests/config/browserTest.ts
@@ -16,14 +16,18 @@
 
 import * as fs from 'fs';
 import * as os from 'os';
-import type { PageTestFixtures, PageWorkerFixtures } from '../page/pageTestApi';
 import * as path from 'path';
-import type { BrowserContext, BrowserContextOptions, BrowserType, Page } from 'playwright-core';
-import { removeFolders } from '../../packages/playwright-core/lib/utils/fileUtils';
 import { baseTest } from './baseTest';
-import { type RemoteServerOptions, type PlaywrightServer, RunServer, RemoteServer } from './remoteServer';
-import type { Log } from '../../packages/trace/src/har';
+import { RunServer, RemoteServer } from './remoteServer';
+import { removeFolders } from '../../packages/playwright-core/lib/server/utils/fileUtils';
 import { parseHar } from '../config/utils';
+import { createSkipTestPredicate } from '../bidi/expectationUtil';
+
+import type { PageTestFixtures, PageWorkerFixtures } from '../page/pageTestApi';
+import type { RemoteServerOptions, PlaywrightServer } from './remoteServer';
+import type { BrowserContext, BrowserContextOptions, BrowserType, Page } from 'playwright-core';
+import type { Log } from '../../packages/trace/src/har';
+import type { TestInfo } from '@playwright/test';
 
 export type BrowserTestWorkerFixtures = PageWorkerFixtures & {
   browserVersion: string;
@@ -33,6 +37,9 @@ export type BrowserTestWorkerFixtures = PageWorkerFixtures & {
   browserType: BrowserType;
   isAndroid: boolean;
   isElectron: boolean;
+  isHeadlessShell: boolean;
+  nodeVersion: { major: number, minor: number, patch: number };
+  bidiTestSkipPredicate: (info: TestInfo) => boolean;
 };
 
 interface StartRemoteServer {
@@ -46,6 +53,7 @@ type BrowserTestTestFixtures = PageTestFixtures & {
   startRemoteServer: StartRemoteServer;
   contextFactory: (options?: BrowserContextOptions) => Promise<BrowserContext>;
   pageWithHar(options?: { outputPath?: string, content?: 'embed' | 'attach' | 'omit', omitContent?: boolean }): Promise<{ context: BrowserContext, page: Page, getLog: () => Promise<Log>, getZip: () => Promise<Map<string, Buffer>> }>
+  autoSkipBidiTest: void;
 };
 
 const test = baseTest.extend<BrowserTestTestFixtures, BrowserTestWorkerFixtures>({
@@ -58,26 +66,22 @@ const test = baseTest.extend<BrowserTestTestFixtures, BrowserTestWorkerFixtures>
     await run(playwright[browserName]);
   }, { scope: 'worker' }],
 
-  allowsThirdParty: [async ({ browserName, browserMajorVersion, channel }, run) => {
-    if (browserName === 'firefox' && !channel)
-      await run(browserMajorVersion >= 103);
-    else if (browserName === 'firefox' && channel === 'firefox-beta')
-      await run(browserMajorVersion < 103 || browserMajorVersion >= 110);
+  allowsThirdParty: [async ({ browserName }, run) => {
+    if (browserName === 'firefox' || browserName as any === '_bidiFirefox')
+      await run(true);
     else
       await run(false);
   }, { scope: 'worker' }],
 
-  defaultSameSiteCookieValue: [async ({ browserName, browserMajorVersion, channel, isLinux }, run) => {
-    if (browserName === 'chromium')
+  defaultSameSiteCookieValue: [async ({ browserName, platform, macVersion }, run) => {
+    if (browserName === 'chromium' || browserName as any === '_bidiChromium')
       await run('Lax');
-    else if (browserName === 'webkit' && isLinux)
+    else if (browserName === 'webkit' && platform === 'linux')
       await run('Lax');
-    else if (browserName === 'webkit' && !isLinux)
+    else if (browserName === 'webkit')
+      await run('None'); // Windows + older macOS
+    else if (browserName === 'firefox' || browserName as any === '_bidiFirefox')
       await run('None');
-    else if (browserName === 'firefox' && channel === 'firefox-beta')
-      await run(browserMajorVersion >= 103 && browserMajorVersion < 110 ? 'Lax' : 'None');
-    else if (browserName === 'firefox' && channel !== 'firefox-beta')
-      await run(browserMajorVersion >= 103 ? 'None' : 'Lax');
     else
       throw new Error('unknown browser - ' + browserName);
   }, { scope: 'worker' }],
@@ -86,13 +90,25 @@ const test = baseTest.extend<BrowserTestTestFixtures, BrowserTestWorkerFixtures>
     await run(Number(browserVersion.split('.')[0]));
   }, { scope: 'worker' }],
 
+  nodeVersion: [async ({}, use) => {
+    const [major, minor, patch] = process.versions.node.split('.');
+    await use({ major: +major, minor: +minor, patch: +patch });
+  }, { scope: 'worker' }],
+
   isAndroid: [false, { scope: 'worker' }],
   isElectron: [false, { scope: 'worker' }],
   electronMajorVersion: [0, { scope: 'worker' }],
   isWebView2: [false, { scope: 'worker' }],
 
+  isHeadlessShell: [async ({ browserName, channel, headless }, use) => {
+    await use(browserName === 'chromium' && (channel === 'chromium-headless-shell' || channel === 'chromium-tip-of-tree-headless-shell' || (!channel && headless)));
+  }, { scope: 'worker' }],
+
   contextFactory: async ({ _contextFactory }: any, run) => {
-    await run(_contextFactory);
+    await run(async options => {
+      const { context } = await _contextFactory(options);
+      return context;
+    });
   },
 
   createUserDataDir: async ({ mode }, run) => {
@@ -126,14 +142,14 @@ const test = baseTest.extend<BrowserTestTestFixtures, BrowserTestWorkerFixtures>
       await persistentContext.close();
   },
 
-  startRemoteServer: async ({ childProcess, browserType }, run) => {
+  startRemoteServer: async ({ childProcess, browserType, channel }, run) => {
     let server: PlaywrightServer | undefined;
     const fn = async (kind: 'launchServer' | 'run-server', options?: RemoteServerOptions) => {
       if (server)
         throw new Error('can only start one remote server');
       if (kind === 'launchServer') {
         const remoteServer = new RemoteServer();
-        await remoteServer._start(childProcess, browserType, options);
+        await remoteServer._start(childProcess, browserType, channel, options);
         server = remoteServer;
       } else {
         const runServer = new RunServer();
@@ -169,7 +185,17 @@ const test = baseTest.extend<BrowserTestTestFixtures, BrowserTestWorkerFixtures>
       };
     };
     await use(pageWithHar);
-  }
+  },
+
+  bidiTestSkipPredicate: [async ({ }, run) => {
+    const filter = await createSkipTestPredicate(test.info().project.name);
+    await run(filter);
+  }, { scope: 'worker' }],
+
+  autoSkipBidiTest: [async ({ bidiTestSkipPredicate }, run) => {
+    test.fixme(bidiTestSkipPredicate(test.info()), 'marked as timeout in bidi expectations');
+    await run();
+  }, { auto: true, scope: 'test' }],
 });
 
 export const playwrightTest = test;
diff --git a/tests/config/commonFixtures.ts b/tests/config/commonFixtures.ts
index 57f1d76373de1..e28feed7b226f 100644
--- a/tests/config/commonFixtures.ts
+++ b/tests/config/commonFixtures.ts
@@ -107,7 +107,10 @@ export class TestChildProcess {
 
   constructor(params: TestChildParams) {
     this.params = params;
-    this.process = spawn(params.command[0], params.command.slice(1), {
+    // See https://nodejs.org/api/deprecations.html#DEP0190
+    const command = params.shell ? params.command.join(' ') : params.command[0];
+    const args = params.shell ? [] : params.command.slice(1);
+    this.process = spawn(command, args, {
       env: {
         ...process.env,
         ...params.env,
diff --git a/tests/config/comparator.ts b/tests/config/comparator.ts
index 3376da3e80c66..16ca27aaa9770 100644
--- a/tests/config/comparator.ts
+++ b/tests/config/comparator.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { getComparator } from '../../packages/playwright-core/lib/utils/comparators';
+import { getComparator } from '../../packages/playwright-core/lib/server/utils/comparators';
 
 const pngComparator = getComparator('image/png');
 type ComparatorResult = { diff?: Buffer; errorMessage: string; } | null;
diff --git a/tests/config/debugControllerBackend.ts b/tests/config/debugControllerBackend.ts
index 9f67d44e50d34..5b927e53ca0bd 100644
--- a/tests/config/debugControllerBackend.ts
+++ b/tests/config/debugControllerBackend.ts
@@ -153,6 +153,8 @@ export class Backend extends EventEmitter {
   }
 
   private _send(method: string, params: any = {}): Promise<any> {
+    if (this._transport.isClosed())
+      throw new Error('Transport is closed');
     return new Promise((fulfill, reject) => {
       const id = ++Backend._lastId;
       const command = { id, guid: 'DebugController', method, params, metadata: {} };
diff --git a/tests/config/ghaMarkdownReporter.ts b/tests/config/ghaMarkdownReporter.ts
new file mode 100644
index 0000000000000..c1b390646f675
--- /dev/null
+++ b/tests/config/ghaMarkdownReporter.ts
@@ -0,0 +1,150 @@
+/**
+ * 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 { context, getOctokit } from '@actions/github';
+import * as core from '@actions/core';
+
+import MarkdownReporter from '../../packages/playwright/src/reporters/markdown';
+
+import type { MetadataWithCommitInfo } from 'playwright/src/isomorphic/types';
+import type { IssueCommentEdge, Repository } from '@octokit/graphql-schema';
+
+function getGithubToken() {
+  const token = process.env.GITHUB_TOKEN || core.getInput('github-token');
+  if (!token) {
+    core.setFailed('Missing "github-token" input');
+    throw new Error('Missing "github-token" input');
+  }
+  return token;
+}
+
+const octokit = getOctokit(getGithubToken());
+
+class GHAMarkdownReporter extends MarkdownReporter {
+  override async publishReport(report: string) {
+    core.info('Publishing report to PR.');
+    const { prNumber, prHref } = this.pullRequestFromMetadata();
+    if (!prNumber) {
+      core.info(`No PR number found, skipping GHA comment. PR href: ${prHref}`);
+      return;
+    }
+    core.info(`Posting comment to PR ${prHref}`);
+
+    const prNodeId = await this.collapsePreviousComments(prNumber);
+    if (!prNodeId) {
+      core.warning(`No PR node ID found, skipping GHA comment. PR href: ${prHref}`);
+      return;
+    }
+    await this.addNewReportComment(prNodeId, report);
+  }
+
+  private async collapsePreviousComments(prNumber: number) {
+    const { owner, repo } = context.repo;
+    const data = await octokit.graphql<{ repository: Repository }>(`
+      query {
+        repository(owner: "${owner}", name: "${repo}") {
+          pullRequest(number: ${prNumber}) {
+            id
+            comments(last: 100) {
+              nodes {
+                id
+                body
+                author {
+                  __typename
+                  login
+                }
+              }
+            }
+          }
+        }
+      }
+    `);
+    const comments = data.repository.pullRequest?.comments.nodes?.filter(comment =>
+      comment?.author?.__typename === 'Bot' &&
+      comment?.author?.login === 'github-actions' &&
+      comment.body?.includes(this._magicComment()));
+    const prId = data.repository.pullRequest?.id;
+    if (!comments?.length)
+      return prId;
+    const mutations = comments.map((comment, i) =>
+      `m${i}: minimizeComment(input: { subjectId: "${comment!.id}", classifier: OUTDATED }) { clientMutationId }`);
+    await octokit.graphql(`
+      mutation {
+        ${mutations.join('\n')}
+      }
+    `);
+    return prId;
+  }
+
+  private _magicComment() {
+    return `<!-- Generated by Playwright markdown reporter for ${this._workflowRunName()} in job ${process.env.GITHUB_JOB} -->`;
+  }
+
+  private _workflowRunName() {
+    // When used via 'workflow_run' event.
+    const workflowRunName = context.payload.workflow_run?.name;
+    if (workflowRunName)
+      return workflowRunName;
+    // When used via 'pull_request'/'push' event.
+    // This is the name of the workflow file, e.g. 'ci.yml' or name if set.
+    return process.env.GITHUB_WORKFLOW;
+  }
+
+  private async addNewReportComment(prNodeId: string, report: string) {
+    const reportUrl = process.env.HTML_REPORT_URL;
+    const mergeWorkflowUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+
+    const body = formatComment([
+      this._magicComment(),
+      `### ${reportUrl ? `[Test results](${reportUrl})` : 'Test results'} for "${this._workflowRunName()}"`,
+      report,
+      '',
+      '---',
+      '',
+      `Merge [workflow run](${mergeWorkflowUrl}).`
+    ]);
+
+    const response = await octokit.graphql<{ addComment: { commentEdge: IssueCommentEdge } }>(`
+      mutation {
+        addComment(input: {subjectId: "${prNodeId}", body: """${body}"""}) {
+          commentEdge {
+            node {
+              ... on IssueComment {
+                url
+              }
+            }
+          }
+        }
+      }
+    `);
+    core.info(`Posted comment:  ${response.addComment.commentEdge.node?.url}`);
+  }
+
+  private pullRequestFromMetadata() {
+    const metadata = this._config.metadata as MetadataWithCommitInfo;
+    const prHref = metadata.ci?.prHref;
+    return { prNumber: parseInt(prHref?.split('/').pop() ?? '', 10), prHref };
+  }
+}
+
+function formatComment(lines: string[]) {
+  let body = lines.join('\n');
+  if (body.length > 65535)
+    body = body.substring(0, 65000) + `... ${body.length - 65000} more characters`;
+  return body;
+}
+
+export default GHAMarkdownReporter;
diff --git a/tests/config/platformFixtures.ts b/tests/config/platformFixtures.ts
index 34d340f7183cb..3bc8ec52cd48a 100644
--- a/tests/config/platformFixtures.ts
+++ b/tests/config/platformFixtures.ts
@@ -15,12 +15,14 @@
  */
 
 import { test } from '@playwright/test';
+import os from 'os';
 
 export type PlatformWorkerFixtures = {
   platform: 'win32' | 'darwin' | 'linux';
   isWindows: boolean;
   isMac: boolean;
   isLinux: boolean;
+  macVersion: number; // major only, 11 or later, zero if not mac
 };
 
 function platform(): 'win32' | 'darwin' | 'linux' {
@@ -33,9 +35,16 @@ function platform(): 'win32' | 'darwin' | 'linux' {
   return process.platform as 'win32' | 'darwin' | 'linux';
 }
 
+function macVersion() {
+  if (process.platform !== 'darwin')
+    return 0;
+  return +os.release().split('.')[0] - 9;
+}
+
 export const platformTest = test.extend<{}, PlatformWorkerFixtures>({
   platform: [platform(), { scope: 'worker' }],
   isWindows: [platform() === 'win32', { scope: 'worker' }],
   isMac: [platform() === 'darwin', { scope: 'worker' }],
   isLinux: [platform() === 'linux', { scope: 'worker' }],
+  macVersion: [macVersion(), { scope: 'worker' }],
 });
diff --git a/tests/config/proxy.ts b/tests/config/proxy.ts
index 08546c9283bb3..e1ac6ab5a3cbb 100644
--- a/tests/config/proxy.ts
+++ b/tests/config/proxy.ts
@@ -15,19 +15,29 @@
  */
 
 import type { IncomingMessage } from 'http';
-import type { Socket } from 'net';
 import type { ProxyServer } from '../third_party/proxy';
 import { createProxy } from '../third_party/proxy';
+import net from 'net';
+import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from 'playwright-core/src/server/utils/socksProxy';
+import { SocksProxy } from '../../packages/playwright-core/lib/server/utils/socksProxy';
+
+// Certain browsers perform telemetry requests which we want to ignore.
+const kConnectHostsToIgnore = new Set([
+  'www.bing.com:443',
+  'www.google.com:443',
+]);
 
 export class TestProxy {
+  readonly HOST: string;
   readonly PORT: number;
   readonly URL: string;
 
   connectHosts: string[] = [];
   requestUrls: string[] = [];
+  wsUrls: string[] = [];
 
   private readonly _server: ProxyServer;
-  private readonly _sockets = new Set<Socket>();
+  private readonly _sockets = new Set<net.Socket>();
   private _handlers: { event: string, handler: (...args: any[]) => void }[] = [];
 
   static async create(port: number): Promise<TestProxy> {
@@ -39,6 +49,7 @@ export class TestProxy {
   private constructor(port: number) {
     this.PORT = port;
     this.URL = `http://localhost:${port}`;
+    this.HOST = new URL(this.URL).host;
     this._server = createProxy();
     this._server.on('connection', socket => this._onSocket(socket));
   }
@@ -51,18 +62,40 @@ export class TestProxy {
     await new Promise(x => this._server.close(x));
   }
 
-  forwardTo(port: number, options?: { allowConnectRequests: boolean }) {
+  forwardTo(port: number, options?: { allowConnectRequests?: boolean, prefix?: string, preserveHostname?: boolean }) {
     this._prependHandler('request', (req: IncomingMessage) => {
       this.requestUrls.push(req.url);
-      const url = new URL(req.url);
-      url.host = `localhost:${port}`;
+      const url = new URL(req.url, `http://${req.headers.host}`);
+      if (options?.preserveHostname)
+        url.port = '' + port;
+      else
+        url.host = `127.0.0.1:${port}`;
+      if (options?.prefix)
+        url.pathname = url.pathname.replace(options.prefix, '');
       req.url = url.toString();
     });
     this._prependHandler('connect', (req: IncomingMessage) => {
       if (!options?.allowConnectRequests)
         return;
+      if (kConnectHostsToIgnore.has(req.url))
+        return;
       this.connectHosts.push(req.url);
-      req.url = `localhost:${port}`;
+      req.url = `127.0.0.1:${port}`;
+    });
+    this._prependHandler('upgrade', (req: IncomingMessage) => {
+      this.wsUrls.push(req.url);
+      const url = new URL(req.url, `http://${req.headers.host}`);
+      if (options?.preserveHostname)
+        url.port = '' + port;
+      else
+        url.host = `127.0.0.1:${port}`;
+      if (options?.prefix)
+        url.pathname = url.pathname.replace(options.prefix, '');
+      if (url.protocol === 'ws:')
+        url.protocol = 'http:';
+      else if (url.protocol === 'wss:')
+        url.protocol = 'https:';
+      req.url = url.toString();
     });
   }
 
@@ -90,7 +123,7 @@ export class TestProxy {
     this._server.prependListener(event, handler);
   }
 
-  private _onSocket(socket: Socket) {
+  private _onSocket(socket: net.Socket) {
     this._sockets.add(socket);
     // ECONNRESET and HPE_INVALID_EOF_STATE are legit errors given
     // that tab closing aborts outgoing connections to the server.
@@ -100,5 +133,46 @@ export class TestProxy {
     });
     socket.once('close', () => this._sockets.delete(socket));
   }
+}
 
+export async function setupSocksForwardingServer({
+  port, forwardPort, allowedTargetPort
+}: {
+  port: number, forwardPort: number, allowedTargetPort: number
+}) {
+  const connectHosts = [];
+  const connections = new Map<string, net.Socket>();
+  const socksProxy = new SocksProxy();
+  socksProxy.setPattern('*');
+  socksProxy.addListener(SocksProxy.Events.SocksRequested, async (payload: SocksSocketRequestedPayload) => {
+    if (!['127.0.0.1', 'fake-localhost-127-0-0-1.nip.io', 'localhost'].includes(payload.host) || payload.port !== allowedTargetPort) {
+      socksProxy.sendSocketError({ uid: payload.uid, error: 'ECONNREFUSED' });
+      return;
+    }
+    const target = new net.Socket();
+    target.on('error', error => socksProxy.sendSocketError({ uid: payload.uid, error: error.toString() }));
+    target.on('end', () => socksProxy.sendSocketEnd({ uid: payload.uid }));
+    target.on('data', data => socksProxy.sendSocketData({ uid: payload.uid, data }));
+    target.setKeepAlive(false);
+    target.connect(forwardPort, '127.0.0.1');
+    target.on('connect', () => {
+      connections.set(payload.uid, target);
+      if (!connectHosts.includes(`${payload.host}:${payload.port}`))
+        connectHosts.push(`${payload.host}:${payload.port}`);
+      socksProxy.socketConnected({ uid: payload.uid, host: target.localAddress, port: target.localPort });
+    });
+  });
+  socksProxy.addListener(SocksProxy.Events.SocksData, async (payload: SocksSocketDataPayload) => {
+    connections.get(payload.uid)?.write(payload.data);
+  });
+  socksProxy.addListener(SocksProxy.Events.SocksClosed, (payload: SocksSocketClosedPayload) => {
+    connections.get(payload.uid)?.destroy();
+    connections.delete(payload.uid);
+  });
+  await socksProxy.listen(port, '127.0.0.1');
+  return {
+    closeProxyServer: () => socksProxy.close(),
+    proxyServerAddr: `socks5://127.0.0.1:${port}`,
+    connectHosts,
+  };
 }
diff --git a/tests/config/remote-server-impl.js b/tests/config/remote-server-impl.js
index baf6d946b99a1..e77ed89395214 100644
--- a/tests/config/remote-server-impl.js
+++ b/tests/config/remote-server-impl.js
@@ -2,7 +2,8 @@ const fs = require('fs');
 const cluster = require('cluster');
 
 async function start() {
-  const { browserTypeName, launchOptions, stallOnClose, disconnectOnSIGHUP, exitOnFile, exitOnWarning, startStopAndRunHttp } = JSON.parse(process.argv[2]);
+  /** @type {import("./remoteServer").RemoteServerOptions} */
+  const { browserTypeName, launchOptions, stallOnClose, disconnectOnSIGHUP, exitOnFile, exitOnWarning, startStopAndRunHttp, existingBrowser } = JSON.parse(process.argv[2]);
   if (stallOnClose) {
     launchOptions.__testHookGracefullyClose = () => {
       console.log(`(stalled=>true)`);
@@ -25,7 +26,15 @@ async function start() {
     return;
   }
 
-  const browserServer = await playwright[browserTypeName].launchServer(launchOptions);
+  let browserServer;
+  if (existingBrowser) {
+    const browser = await playwright[browserTypeName].launch(launchOptions);
+    const page = await browser.newPage();
+    await page.setContent(existingBrowser.content);
+    browserServer = await browser._launchServer();
+  } else {
+    browserServer = await playwright[browserTypeName].launchServer(launchOptions);
+  }
   if (disconnectOnSIGHUP)
     process.on('SIGHUP', () => browserServer._disconnectForTest());
 
diff --git a/tests/config/remoteServer.ts b/tests/config/remoteServer.ts
index 04305f31a4fc6..2e9ec35d2a161 100644
--- a/tests/config/remoteServer.ts
+++ b/tests/config/remoteServer.ts
@@ -35,7 +35,6 @@ export class RunServer implements PlaywrightServer {
       command,
       env: {
         ...process.env,
-        PWTEST_UNDER_TEST: '1',
         ...env,
       },
     });
@@ -69,6 +68,8 @@ export type RemoteServerOptions = {
   inCluster?: boolean;
   url?: string;
   startStopAndRunHttp?: boolean;
+  sharedBrowser?: boolean;
+  existingBrowser?: { content: string };
 };
 
 export class RemoteServer implements PlaywrightServer {
@@ -80,29 +81,31 @@ export class RemoteServer implements PlaywrightServer {
   _browser: Browser | undefined;
   _wsEndpoint!: string;
 
-  async _start(childProcess: CommonFixtures['childProcess'], browserType: BrowserType, remoteServerOptions: RemoteServerOptions = {}) {
+  async _start(childProcess: CommonFixtures['childProcess'], browserType: BrowserType, channel: string, remoteServerOptions: RemoteServerOptions = {}) {
     this._browserType = browserType;
-    const browserOptions = (browserType as any)._defaultLaunchOptions;
+    const browserOptions = (browserType as any)._playwright._defaultLaunchOptions;
     // Copy options to prevent a large JSON string when launching subprocess.
     // Otherwise, we get `Error: spawn ENAMETOOLONG` on Windows.
     const launchOptions: Parameters<BrowserType['launchServer']>[0] = {
       args: browserOptions.args,
       headless: browserOptions.headless,
       channel: browserOptions.channel,
+      executablePath: browserOptions.executablePath,
       handleSIGINT: true,
       handleSIGTERM: true,
       handleSIGHUP: true,
-      executablePath: browserOptions.channel ? undefined : browserOptions.executablePath || browserType.executablePath(),
       logger: undefined,
     };
+    if (remoteServerOptions.sharedBrowser)
+      (launchOptions as any)._sharedBrowser = true;
     const options = {
       browserTypeName: browserType.name(),
+      channel,
       launchOptions,
       ...remoteServerOptions,
     };
     this._process = childProcess({
       command: ['node', path.join(__dirname, 'remote-server-impl.js'), JSON.stringify(options)],
-      env: { ...process.env, PWTEST_UNDER_TEST: '1' },
     });
 
     let index = 0;
diff --git a/tests/config/serverFixtures.ts b/tests/config/serverFixtures.ts
index a156f2ac5fec8..12dad5d99b539 100644
--- a/tests/config/serverFixtures.ts
+++ b/tests/config/serverFixtures.ts
@@ -18,9 +18,9 @@ import type { Fixtures } from '@playwright/test';
 import path from 'path';
 import { TestServer } from './testserver';
 import { TestProxy } from './proxy';
-import type { SocksSocketRequestedPayload } from '../../packages/playwright-core/src/common/socksProxy';
+import type { SocksSocketRequestedPayload } from 'playwright-core/src/server/utils/socksProxy';
 
-import { SocksProxy } from '../../packages/playwright-core/lib/common/socksProxy';
+import { SocksProxy } from '../../packages/playwright-core/lib/server/utils/socksProxy';
 
 export type ServerWorkerOptions = {
   loopback?: string;
@@ -51,7 +51,7 @@ export const serverFixtures: Fixtures<ServerFixtures, ServerWorkerOptions> = {
 
     const socksServer = new MockSocksServer();
     const socksPort = port + 2;
-    await socksServer.listen(socksPort, 'localhost');
+    await socksServer.listen(socksPort);
 
     const proxyPort = port + 3;
     const proxyServer = await TestProxy.create(proxyPort);
@@ -124,7 +124,7 @@ export class MockSocksServer {
     });
   }
 
-  async listen(port: number, hostname: string) {
+  async listen(port: number, hostname?: string) {
     await this._socksProxy.listen(port, hostname);
   }
 
diff --git a/tests/config/testMode.ts b/tests/config/testMode.ts
index 06329496f9ba5..02623b6dce5bc 100644
--- a/tests/config/testMode.ts
+++ b/tests/config/testMode.ts
@@ -30,7 +30,6 @@ export class DriverTestMode implements TestMode {
   async setup() {
     this._impl = await start({
       NODE_OPTIONS: undefined,  // Hide driver process while debugging.
-      PWTEST_UNDER_TEST: 1,
     });
     return this._impl.playwright;
   }
diff --git a/tests/config/testModeFixtures.ts b/tests/config/testModeFixtures.ts
index 6b6feff7c2913..b247b562999a7 100644
--- a/tests/config/testModeFixtures.ts
+++ b/tests/config/testModeFixtures.ts
@@ -17,7 +17,6 @@
 import { test } from '@playwright/test';
 import type { TestModeName } from './testMode';
 import { DefaultTestMode, DriverTestMode } from './testMode';
-import * as playwrightLibrary from 'playwright-core';
 
 export type TestModeWorkerOptions = {
   mode: TestModeName;
@@ -42,15 +41,13 @@ export const testModeTest = test.extend<TestModeTestFixtures, TestModeWorkerOpti
       'service-grid': new DefaultTestMode(),
       'driver': new DriverTestMode(),
     }[mode];
-    require('playwright-core/lib/utils').setUnderTest();
     const playwright = await testMode.setup();
-    playwright._setSelectors(playwrightLibrary.selectors);
     await run(playwright);
     await testMode.teardown();
   }, { scope: 'worker' }],
 
   toImplInWorkerScope: [async ({ playwright }, use) => {
-    await use((playwright as any)._toImpl);
+    await use((playwright as any)._connection.toImpl);
   }, { scope: 'worker' }],
 
   toImpl: async ({ toImplInWorkerScope: toImplWorker, mode }, use, testInfo) => {
diff --git a/tests/config/testserver/index.ts b/tests/config/testserver/index.ts
index 0596960f6bd55..ddd334e90e650 100644
--- a/tests/config/testserver/index.ts
+++ b/tests/config/testserver/index.ts
@@ -20,17 +20,22 @@ import type http from 'http';
 import mime from 'mime';
 import type net from 'net';
 import path from 'path';
-import url from 'url';
 import util from 'util';
+import type stream from 'stream';
 import ws from 'ws';
 import zlib, { gzip } from 'zlib';
-import { createHttpServer, createHttpsServer } from '../../../packages/playwright-core/lib/utils/network';
+import { createHttpServer, createHttpsServer } from '../../../packages/playwright-core/lib/server/utils/network';
 
 const fulfillSymbol = Symbol('fulfil callback');
 const rejectSymbol = Symbol('reject callback');
 
 const gzipAsync = util.promisify(gzip.bind(zlib));
 
+type UpgradeActions = {
+  doUpgrade: () => void;
+  socket: stream.Duplex;
+};
+
 export class TestServer {
   private _server: http.Server;
   private _wsServer: ws.WebSocketServer;
@@ -44,14 +49,17 @@ export class TestServer {
   private _extraHeaders = new Map<string, object>();
   private _gzipRoutes = new Set<string>();
   private _requestSubscribers = new Map<string, Promise<any>>();
+  private _upgradeCallback: (actions: UpgradeActions) => void | undefined;
   readonly PORT: number;
   readonly PREFIX: string;
   readonly CROSS_PROCESS_PREFIX: string;
   readonly EMPTY_PAGE: string;
+  readonly HOST: string;
+  readonly HOSTNAME: string;
 
   static async create(dirPath: string, port: number, loopback?: string): Promise<TestServer> {
     const server = new TestServer(dirPath, port, loopback);
-    await new Promise(x => server._server.once('listening', x));
+    await server.waitUntilReady();
     return server;
   }
 
@@ -61,7 +69,7 @@ export class TestServer {
       cert: await fs.promises.readFile(path.join(__dirname, 'cert.pem')),
       passphrase: 'aaaa',
     });
-    await new Promise(x => server._server.once('listening', x));
+    await server.waitUntilReady();
     return server;
   }
 
@@ -73,7 +81,17 @@ export class TestServer {
     this._server.on('connection', socket => this._onSocket(socket));
     this._wsServer = new ws.WebSocketServer({ noServer: true });
     this._server.on('upgrade', async (request, socket, head) => {
-      const pathname = url.parse(request.url!).path;
+      const doUpgrade = () => {
+        this._wsServer.handleUpgrade(request, socket, head, ws => {
+          // Next emit is only for our internal 'connection' listeners.
+          this._wsServer.emit('connection', ws, request);
+        });
+      };
+      if (this._upgradeCallback) {
+        this._upgradeCallback({ doUpgrade, socket });
+        return;
+      }
+      const pathname = new URL(request.url, 'http://localhost').pathname;
       if (pathname === '/ws-401') {
         socket.write('HTTP/1.1 401 Unauthorized\r\n\r\nUnauthorized body');
         socket.destroy();
@@ -86,10 +104,7 @@ export class TestServer {
         socket.destroy();
         return;
       }
-      this._wsServer.handleUpgrade(request, socket, head, ws => {
-        // Next emit is only for our internal 'connection' listeners.
-        this._wsServer.emit('connection', ws, request);
-      });
+      doUpgrade();
     });
     this._server.listen(port);
     this._dirPath = dirPath;
@@ -105,6 +120,12 @@ export class TestServer {
     this.PREFIX = `${protocol}://${same_origin}:${port}`;
     this.CROSS_PROCESS_PREFIX = `${protocol}://${cross_origin}:${port}`;
     this.EMPTY_PAGE = `${protocol}://${same_origin}:${port}/empty.html`;
+    this.HOST = new URL(this.EMPTY_PAGE).host;
+    this.HOSTNAME = new URL(this.EMPTY_PAGE).hostname;
+  }
+
+  async waitUntilReady() {
+    await new Promise(x => this._server.once('listening', x));
   }
 
   _onSocket(socket: net.Socket) {
@@ -177,6 +198,9 @@ export class TestServer {
     this._csp.clear();
     this._extraHeaders.clear();
     this._gzipRoutes.clear();
+    this._upgradeCallback = undefined;
+    this._wsServer.removeAllListeners('connection');
+    this._server.closeAllConnections();
     const error = new Error('Static Server has been reset');
     for (const subscriber of this._requestSubscribers.values())
       subscriber[rejectSymbol].call(null, error);
@@ -197,10 +221,11 @@ export class TestServer {
       });
       request.on('end', () => resolve(Buffer.concat(chunks)));
     });
-    const path = url.parse(request.url!).path;
-    this.debugServer(`request ${request.method} ${path}`);
-    if (this._auths.has(path)) {
-      const auth = this._auths.get(path)!;
+    const url = new URL(request.url, 'http://localhost');
+    const pathWithSearch = url.pathname + url.search;
+    this.debugServer(`request ${request.method} ${pathWithSearch}`);
+    if (this._auths.has(pathWithSearch)) {
+      const auth = this._auths.get(pathWithSearch)!;
       const credentials = Buffer.from((request.headers.authorization || '').split(' ')[1] || '', 'base64').toString();
       this.debugServer(`request credentials ${credentials}`);
       this.debugServer(`actual credentials ${auth.username}:${auth.password}`);
@@ -212,11 +237,11 @@ export class TestServer {
       }
     }
     // Notify request subscriber.
-    if (this._requestSubscribers.has(path)) {
-      this._requestSubscribers.get(path)![fulfillSymbol].call(null, request);
-      this._requestSubscribers.delete(path);
+    if (this._requestSubscribers.has(pathWithSearch)) {
+      this._requestSubscribers.get(pathWithSearch)![fulfillSymbol].call(null, request);
+      this._requestSubscribers.delete(pathWithSearch);
     }
-    const handler = this._routes.get(path);
+    const handler = this._routes.get(pathWithSearch);
     if (handler)
       handler.call(null, request, response);
     else
@@ -230,7 +255,7 @@ export class TestServer {
   }
 
   private async _serveFile(request: http.IncomingMessage, response: http.ServerResponse, filePath?: string): Promise<void> {
-    let pathName = url.parse(request.url!).path;
+    let pathName = new URL(request.url, 'http://localhost').pathname;
     if (!filePath) {
       if (pathName === '/')
         pathName = '/index.html';
@@ -293,6 +318,14 @@ export class TestServer {
     });
   }
 
+  waitForUpgrade() {
+    return new Promise<UpgradeActions>(fulfill => this._upgradeCallback = fulfill);
+  }
+
+  waitForWebSocket() {
+    return new Promise<ws.WebSocket>(fulfill => this._wsServer.once('connection', (ws, req) => fulfill(ws)));
+  }
+
   sendOnWebSocketConnection(data) {
     this.onceWebSocketConnection(ws => ws.send(data));
   }
diff --git a/tests/config/traceViewerFixtures.ts b/tests/config/traceViewerFixtures.ts
index b389f0c07c29b..6d839675bae83 100644
--- a/tests/config/traceViewerFixtures.ts
+++ b/tests/config/traceViewerFixtures.ts
@@ -31,72 +31,113 @@ type BaseWorkerFixtures = {
 
 export type TraceViewerFixtures = {
   showTraceViewer: (trace: string[], options?: {host?: string, port?: number}) => Promise<TraceViewerPage>;
-  runAndTrace: (body: () => Promise<void>) => Promise<TraceViewerPage>;
+  runAndTrace: (body: () => Promise<void>, optsOverrides?: Parameters<BrowserContext['tracing']['start']>[0]) => Promise<TraceViewerPage>;
 };
 
 class TraceViewerPage {
   actionTitles: Locator;
+  actionsTree: Locator;
   callLines: Locator;
   consoleLines: Locator;
   logLines: Locator;
   errorMessages: Locator;
   consoleLineMessages: Locator;
   consoleStacks: Locator;
-  stackFrames: Locator;
   networkRequests: Locator;
   metadataTab: Locator;
   snapshotContainer: Locator;
+  sourceCodeTab: Locator;
+
+  settingsDialog: Locator;
+  darkModeSetting: Locator;
+  displayCanvasContentSetting: Locator;
 
   constructor(public page: Page) {
     this.actionTitles = page.locator('.action-title');
+    this.actionsTree = page.getByTestId('actions-tree');
     this.callLines = page.locator('.call-tab .call-line');
-    this.logLines = page.getByTestId('log-list').locator('.list-view-entry');
-    this.consoleLines = page.locator('.console-line');
+    this.logLines = page.getByRole('list', { name: 'Log entries' }).getByRole('listitem');
+    this.consoleLines = page.getByRole('tabpanel', { name: 'Console' }).getByRole('listitem');
     this.consoleLineMessages = page.locator('.console-line-message');
     this.errorMessages = page.locator('.error-message');
     this.consoleStacks = page.locator('.console-stack');
-    this.stackFrames = page.getByTestId('stack-trace-list').locator('.list-view-entry');
-    this.networkRequests = page.getByTestId('network-list').locator('.list-view-entry');
+    this.networkRequests = page.getByRole('list', { name: 'Network requests' }).getByRole('listitem');
     this.snapshotContainer = page.locator('.snapshot-container iframe.snapshot-visible[name=snapshot]');
-    this.metadataTab = page.locator('.metadata-view');
+    this.metadataTab = page.getByRole('tabpanel', { name: 'Metadata' });
+    this.sourceCodeTab = page.getByRole('tabpanel', { name: 'Source' });
+
+    this.settingsDialog = page.getByTestId('settings-toolbar-dialog');
+    this.darkModeSetting = page.locator('.setting').getByText('Dark mode');
+    this.displayCanvasContentSetting = page.locator('.setting').getByText('Display canvas content');
+  }
+
+  @step
+  async showAllActions() {
+    await this.page.getByRole('button', { name: 'Settings' }).click();
+    await this.page.locator('.setting').getByText('Show route actions').click();
+    await this.page.locator('.setting').getByText('Show getter actions').click();
+    await this.page.locator('.setting').getByText('Show configuration actions').click();
+    await this.page.getByRole('button', { name: 'Settings' }).click();
   }
 
-  async actionIconsText(action: string) {
-    const entry = await this.page.waitForSelector(`.list-view-entry:has-text("${action}")`);
-    await entry.waitForSelector('.action-icon-value:visible');
-    return await entry.$$eval('.action-icon-value:visible', ee => ee.map(e => e.textContent));
+  stackFrames(options: { selected?: boolean } = {}) {
+    const entry = this.page.getByRole('list', { name: 'Stack trace' }).getByRole('listitem');
+    if (options.selected)
+      return entry.locator(':scope.selected');
+    return entry;
   }
 
-  async actionIcons(action: string) {
-    return await this.page.waitForSelector(`.list-view-entry:has-text("${action}") .action-icons`);
+  actionIconsText(action: string) {
+    const entry = this.actionsTree.getByRole('treeitem', { name: action });
+    return entry.locator('.action-icon-value').filter({ visible: true });
   }
 
+  actionIcons(action: string) {
+    return this.actionsTree.getByRole('treeitem', { name: action }).locator('.action-icons').filter({ visible: true });
+  }
+
+  @step
+  async expandAction(title: string) {
+    await this.actionsTree.getByRole('treeitem', { name: title }).locator('.codicon-chevron-right').click();
+  }
+
+  @step
   async selectAction(title: string, ordinal: number = 0) {
-    await this.page.locator(`.action-title:has-text("${title}")`).nth(ordinal).click();
+    await this.actionsTree.getByTitle(title).nth(ordinal).click();
+  }
+
+  @step
+  async hoverAction(title: string, ordinal: number = 0) {
+    await this.actionsTree.getByRole('treeitem', { name: title }).nth(ordinal).hover();
   }
 
+  @step
   async selectSnapshot(name: string) {
-    await this.page.click(`.snapshot-tab .tabbed-pane-tab-label:has-text("${name}")`);
+    await this.page.getByRole('tab', { name }).click();
   }
 
   async showErrorsTab() {
-    await this.page.click('text="Errors"');
+    await this.page.getByRole('tab', { name: 'Errors' }).click();
   }
 
   async showConsoleTab() {
-    await this.page.click('text="Console"');
+    await this.page.getByRole('tab', { name: 'Console' }).click();
   }
 
   async showSourceTab() {
-    await this.page.click('text="Source"');
+    await this.page.getByRole('tab', { name: 'Source' }).click();
   }
 
   async showNetworkTab() {
-    await this.page.click('text="Network"');
+    await this.page.getByRole('tab', { name: 'Network' }).click();
   }
 
   async showMetadataTab() {
-    await this.page.click('text="Metadata"');
+    await this.page.getByRole('tab', { name: 'Metadata' }).click();
+  }
+
+  async showSettings() {
+    await this.page.getByRole('button', { name: 'Settings' }).click();
   }
 
   @step
@@ -114,7 +155,7 @@ export const traceViewerFixtures: Fixtures<TraceViewerFixtures, {}, BaseTestFixt
     const contextImpls: any[] = [];
     await use(async (traces: string[], { host, port } = {}) => {
       const pageImpl = await runTraceViewerApp(traces, browserName, { headless, host, port });
-      const contextImpl = pageImpl.context();
+      const contextImpl = pageImpl.browserContext;
       const browser = await playwright.chromium.connectOverCDP(contextImpl._browser.options.wsEndpoint);
       browsers.push(browser);
       contextImpls.push(contextImpl);
@@ -127,9 +168,9 @@ export const traceViewerFixtures: Fixtures<TraceViewerFixtures, {}, BaseTestFixt
   },
 
   runAndTrace: async ({ context, showTraceViewer }, use, testInfo) => {
-    await use(async (body: () => Promise<void>) => {
+    await use(async (body: () => Promise<void>, optsOverrides = {}) => {
       const traceFile = testInfo.outputPath('trace.zip');
-      await context.tracing.start({ snapshots: true, screenshots: true, sources: true });
+      await context.tracing.start({ snapshots: true, screenshots: true, sources: true, ...optsOverrides });
       await body();
       await context.tracing.stop({ path: traceFile });
       return showTraceViewer([traceFile]);
diff --git a/tests/config/utils.ts b/tests/config/utils.ts
index 88cff686b3375..be598b5f7ae03 100644
--- a/tests/config/utils.ts
+++ b/tests/config/utils.ts
@@ -15,14 +15,16 @@
  */
 
 import type { Frame, Page } from 'playwright-core';
-import { ZipFile } from '../../packages/playwright-core/lib/utils/zipFile';
-import type { TraceModelBackend } from '../../packages/trace-viewer/src/traceModel';
+import { ZipFile } from '../../packages/playwright-core/lib/server/utils/zipFile';
+import type { TraceModelBackend } from '../../packages/trace-viewer/src/sw/traceModel';
 import type { StackFrame } from '../../packages/protocol/src/channels';
 import { parseClientSideCallMetadata } from '../../packages/playwright-core/lib/utils/isomorphic/traceUtils';
-import { TraceModel } from '../../packages/trace-viewer/src/traceModel';
+import { TraceModel } from '../../packages/trace-viewer/src/sw/traceModel';
 import type { ActionTreeItem } from '../../packages/trace-viewer/src/ui/modelUtil';
 import { buildActionTree, MultiTraceModel } from '../../packages/trace-viewer/src/ui/modelUtil';
 import type { ActionTraceEvent, ConsoleMessageTraceEvent, EventTraceEvent, TraceEvent } from '@trace/trace';
+import style from 'ansi-styles';
+import { renderTitleForCall } from '../../packages/playwright-core/lib/utils/isomorphic/protocolFormatter';
 
 export async function attachFrame(page: Page, frameId: string, url: string): Promise<Frame> {
   const handle = await page.evaluateHandle(async ({ frameId, url }) => {
@@ -60,7 +62,7 @@ export function expectedSSLError(browserName: string, platform: string): RegExp
     else if (platform === 'win32')
       return /SSL peer certificate or SSH remote key was not OK/;
     else
-      return /Unacceptable TLS certificate/;
+      return /Unacceptable TLS certificate|Operation was cancelled/;
   }
   return /SSL_ERROR_UNKNOWN/;
 }
@@ -150,29 +152,31 @@ export async function parseTraceRaw(file: string): Promise<{ events: any[], reso
   return {
     events,
     resources,
-    actions: actionObjects.map(a => a.apiName),
+    actions: actionObjects.map(a => renderTitleForCall({ ...a, type: a.class })),
     actionObjects,
     stacks,
   };
 }
 
-export async function parseTrace(file: string): Promise<{ resources: Map<string, Buffer>, events: (EventTraceEvent | ConsoleMessageTraceEvent)[], actions: ActionTraceEvent[], apiNames: string[], traceModel: TraceModel, model: MultiTraceModel, actionTree: string[], errors: string[] }> {
+export async function parseTrace(file: string): Promise<{ resources: Map<string, Buffer>, events: (EventTraceEvent | ConsoleMessageTraceEvent)[], actions: ActionTraceEvent[], titles: string[], traceModel: TraceModel, model: MultiTraceModel, actionTree: string[], errors: string[] }> {
   const backend = new TraceBackend(file);
   const traceModel = new TraceModel();
   await traceModel.load(backend, () => {});
   const model = new MultiTraceModel(traceModel.contextEntries);
-  const { rootItem } = buildActionTree(model.actions);
+  const actions = model.filteredActions([]);
+  const { rootItem } = buildActionTree(actions);
   const actionTree: string[] = [];
   const visit = (actionItem: ActionTreeItem, indent: string) => {
-    actionTree.push(`${indent}${actionItem.action?.apiName || actionItem.id}`);
+    const title = renderTitleForCall({ ...actionItem.action, type: actionItem.action.class });
+    actionTree.push(`${indent}${title || actionItem.id}`);
     for (const child of actionItem.children)
       visit(child, indent + '  ');
   };
   rootItem.children.forEach(a => visit(a, ''));
   return {
-    apiNames: model.actions.map(a => a.apiName),
+    titles: actions.map(a => renderTitleForCall({ ...a, type: a.class })),
     resources: backend.entries,
-    actions: model.actions,
+    actions,
     events: model.events,
     errors: model.errors.map(e => e.message),
     model,
@@ -207,6 +211,40 @@ export function stripAnsi(str: string): string {
   return str.replace(ansiRegex, '');
 }
 
+export function ansi2Markup(text: string): string {
+  return text.replace(ansiRegex, match => {
+    switch (match) {
+      case style.inverse.open:
+        return '<i>';
+      case style.inverse.close:
+        return '</i>';
+
+      case style.bold.open:
+        return '<b>';
+      case style.dim.open:
+        return '<d>';
+      case style.green.open:
+        return '<g>';
+      case style.red.open:
+        return '<r>';
+      case style.yellow.open:
+        return '<y>';
+      case style.bgYellow.open:
+        return '<Y>';
+
+      case style.bold.close:
+      case style.dim.close:
+      case style.green.close:
+      case style.red.close:
+      case style.yellow.close:
+      case style.bgYellow.close:
+        return '</>';
+
+      default:
+        return match; // unexpected escape sequence
+    }
+  });
+}
 
 class TraceBackend implements TraceModelBackend {
   private _fileName: string;
diff --git a/tests/electron/electron-app.js b/tests/electron/electron-app.js
index 0e688711994a6..da709b60a196d 100644
--- a/tests/electron/electron-app.js
+++ b/tests/electron/electron-app.js
@@ -1,6 +1,10 @@
+const assert = require('node:assert/strict');
 const { app, protocol } = require('electron');
 const path = require('path');
 
+assert(process.env.PWTEST_ELECTRON_USER_DATA_DIR, 'PWTEST_ELECTRON_USER_DATA_DIR env var is not set');
+app.setPath('appData', process.env.PWTEST_ELECTRON_USER_DATA_DIR);
+
 app.on('window-all-closed', e => e.preventDefault());
 
 app.whenReady().then(() => {
diff --git a/tests/electron/electron-tracing.spec.ts b/tests/electron/electron-tracing.spec.ts
index 91ebab78c9e23..ffb650645a7d5 100644
--- a/tests/electron/electron-tracing.spec.ts
+++ b/tests/electron/electron-tracing.spec.ts
@@ -28,9 +28,9 @@ test('should record trace', async ({ newWindow, server, runAndTrace }) => {
     expect(await window.evaluate('result')).toBe('Clicked');
   });
   await expect(traceViewer.actionTitles).toHaveText([
-    /page.goto/,
-    /page.click/,
-    /page.evaluate/,
+    /Navigate/,
+    /Click/,
+    /Evaluate/,
   ]);
 });
 
@@ -42,7 +42,7 @@ test('should support custom protocol', async ({ electronApp, newWindow, server,
   const traceViewer = await runAndTrace(async () => {
     await window.click('button');
   });
-  const frame = await traceViewer.snapshotFrame('page.click');
+  const frame = await traceViewer.snapshotFrame('Click');
   await expect(frame.locator('button')).toHaveCSS('color', 'rgb(255, 0, 0)');
   await expect(frame.locator('button')).toHaveCSS('font-weight', '700');
 });
diff --git a/tests/electron/electronTest.ts b/tests/electron/electronTest.ts
index 33210e91168f6..b2105017a0d56 100644
--- a/tests/electron/electronTest.ts
+++ b/tests/electron/electronTest.ts
@@ -15,17 +15,21 @@
  */
 
 import { baseTest } from '../config/baseTest';
-import * as path from 'path';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
 import type { ElectronApplication, Page, Electron } from '@playwright/test';
 import type { PageTestFixtures, PageWorkerFixtures } from '../page/pageTestApi';
 import type { TraceViewerFixtures } from '../config/traceViewerFixtures';
 import { traceViewerFixtures } from '../config/traceViewerFixtures';
+import { removeFolders } from '../../packages/playwright-core/lib/server/utils/fileUtils';
 export { expect } from '@playwright/test';
 
 type ElectronTestFixtures = PageTestFixtures & {
   electronApp: ElectronApplication;
   launchElectronApp: (appFile: string, args?: string[], options?: Parameters<Electron['launch']>[0]) => Promise<ElectronApplication>;
   newWindow: () => Promise<Page>;
+  createUserDataDir: () => Promise<string>;
 };
 
 export const electronTest = baseTest.extend<TraceViewerFixtures>(traceViewerFixtures).extend<ElectronTestFixtures, PageWorkerFixtures>({
@@ -35,13 +39,34 @@ export const electronTest = baseTest.extend<TraceViewerFixtures>(traceViewerFixt
   isAndroid: [false, { scope: 'worker' }],
   isElectron: [true, { scope: 'worker' }],
   isWebView2: [false, { scope: 'worker' }],
+  isHeadlessShell: [false, { scope: 'worker' }],
 
-  launchElectronApp: async ({ playwright }, use) => {
+  createUserDataDir: async ({ mode }, run) => {
+    const dirs: string[] = [];
+    // We do not put user data dir in testOutputPath,
+    // because we do not want to upload them as test result artifacts.
+    await run(async () => {
+      const dir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-test-'));
+      dirs.push(dir);
+      return dir;
+    });
+    await removeFolders(dirs);
+  },
+
+  launchElectronApp: async ({ playwright, createUserDataDir }, use) => {
     // This env prevents 'Electron Security Policy' console message.
     process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
     const apps: ElectronApplication[] = [];
     await use(async (appFile: string, args: string[] = [], options?: Parameters<Electron['launch']>[0]) => {
-      const app = await playwright._electron.launch({ ...options, args: [path.join(__dirname, appFile), ...args] });
+      const userDataDir = await createUserDataDir();
+      const app = await playwright._electron.launch({
+        ...options,
+        args: [path.join(__dirname, appFile), ...args],
+        env: {
+          ...process.env,
+          PWTEST_ELECTRON_USER_DATA_DIR: userDataDir,
+        }
+      });
       apps.push(app);
       return app;
     });
diff --git a/tests/electron/globalSetup.ts b/tests/electron/globalSetup.ts
index c50f710c9653e..3b4021b8afb6f 100644
--- a/tests/electron/globalSetup.ts
+++ b/tests/electron/globalSetup.ts
@@ -15,7 +15,7 @@
  */
 
 import assert from 'assert';
-import { spawnAsync } from '../../packages/playwright-core/lib/utils/spawnAsync';
+import { spawnAsync } from '../../packages/playwright-core/lib/server/utils/spawnAsync';
 
 export default async () => {
   const result = await spawnAsync('npx', ['electron', require.resolve('./electron-print-chromium-version.js'), '--no-sandbox'], {
diff --git a/tests/electron/playwright.config.ts b/tests/electron/playwright.config.ts
index 89bb677718c8d..9866c2aaf1015 100644
--- a/tests/electron/playwright.config.ts
+++ b/tests/electron/playwright.config.ts
@@ -16,6 +16,7 @@
 
 import { config as loadEnv } from 'dotenv';
 loadEnv({ path: path.join(__dirname, '..', '..', '.env') });
+process.env.PWTEST_UNDER_TEST = '1';
 
 import type { Config, PlaywrightTestOptions, PlaywrightWorkerOptions } from '@playwright/test';
 import * as path from 'path';
diff --git a/tests/expect/assertionCounts.test.ts b/tests/expect/assertionCounts.test.ts
new file mode 100644
index 0000000000000..ebaae506c9b44
--- /dev/null
+++ b/tests/expect/assertionCounts.test.ts
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+test.describe('.assertions()', () => {
+  test('does not throw', () => {
+    expectUnderTest.assertions(2);
+    expectUnderTest('a').not.toBe('b');
+    expectUnderTest('a').toBe('a');
+  });
+
+  test('redeclares different assertion count', () => {
+    expectUnderTest.assertions(3);
+    expectUnderTest('a').not.toBe('b');
+    expectUnderTest('a').toBe('a');
+    expectUnderTest.assertions(2);
+  });
+  test('expects no assertions', () => {
+    expectUnderTest.assertions(0);
+  });
+});
+
+test.describe('.hasAssertions()', () => {
+  test('does not throw if there is an assertion', () => {
+    expectUnderTest.hasAssertions();
+    expectUnderTest('a').toBe('a');
+  });
+
+  test('throws if expected is not undefined', () => {
+    expect(() =>
+      (expectUnderTest as any).hasAssertions(2)
+    ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>)[.not].hasAssertions()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>2</>`);
+  });
+});
+
+test.describe('numPassingAsserts', () => {
+  test.skip('verify the default value of numPassingAsserts', () => {
+    const { numPassingAsserts } = expectUnderTest.getState();
+    expect(numPassingAsserts).toBe(0);
+  });
+
+  test('verify the resetting of numPassingAsserts after a test', () => {
+    expect('a').toBe('a');
+    expect('a').toBe('a');
+    // reset state
+    expectUnderTest.extractExpectedAssertionsErrors();
+    const { numPassingAsserts } = expectUnderTest.getState();
+    expect(numPassingAsserts).toBe(0);
+  });
+
+  test.skip('verify the correctness of numPassingAsserts count for passing test', () => {
+    expect('a').toBe('a');
+    expect('a').toBe('a');
+    const { numPassingAsserts } = expectUnderTest.getState();
+    expect(numPassingAsserts).toBe(2);
+  });
+
+  test.skip('verify the correctness of numPassingAsserts count for failing test', () => {
+    expect('a').toBe('a');
+    try {
+      expect('a').toBe('b');
+    } catch (error) { }
+    const { numPassingAsserts } = expectUnderTest.getState();
+    expect(numPassingAsserts).toBe(1);
+  });
+});
diff --git a/tests/expect/asymmetricMatchers.test.ts b/tests/expect/asymmetricMatchers.test.ts
new file mode 100644
index 0000000000000..ec0c40dbecbc7
--- /dev/null
+++ b/tests/expect/asymmetricMatchers.test.ts
@@ -0,0 +1,519 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test } from '../playwright-test/stable-test-runner';
+import { expect as expectUnderTest, asymmetricMatchers } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+const {
+  any,
+  anything,
+  arrayContaining,
+  arrayNotContaining,
+  closeTo,
+  notCloseTo,
+  objectContaining,
+  objectNotContaining,
+  stringContaining,
+  stringMatching,
+  stringNotContaining,
+  stringNotMatching,
+} = asymmetricMatchers;
+
+test('Any.asymmetricMatch()', () => {
+  class Thing {}
+
+  [
+    any(String).asymmetricMatch('jest'),
+    any(Number).asymmetricMatch(1),
+    any(Function).asymmetricMatch(() => {}),
+    any(Boolean).asymmetricMatch(true),
+    any(BigInt).asymmetricMatch(1n),
+    any(Symbol).asymmetricMatch(Symbol()),
+    any(Object).asymmetricMatch({}),
+    any(Object).asymmetricMatch(null),
+    any(Array).asymmetricMatch([]),
+    any(Thing).asymmetricMatch(new Thing()),
+  ].forEach(test => {
+    expectUnderTest(test).toBe(true);
+  });
+});
+
+test('Any.asymmetricMatch() on primitive wrapper classes', () => {
+  [
+
+    any(String).asymmetricMatch(new String('jest')),
+
+    any(Number).asymmetricMatch(new Number(1)),
+
+    any(Function).asymmetricMatch(new Function('() => {}')),
+
+    any(Boolean).asymmetricMatch(new Boolean(true)),
+    any(BigInt).asymmetricMatch(Object(1n)),
+    any(Symbol).asymmetricMatch(Object(Symbol())),
+  ].forEach(test => {
+    expectUnderTest(test).toBe(true);
+  });
+});
+
+test('Any.toAsymmetricMatcher()', () => {
+  expectUnderTest(any(Number).toAsymmetricMatcher()).toBe('Any<Number>');
+});
+
+test('Any.toAsymmetricMatcher() with function name', () => {
+  [
+    ['someFunc', function someFunc() {}],
+    ['$someFunc', function $someFunc() {}],
+    [
+      '$someFunc2',
+      (function() {
+        function $someFunc2() {}
+        Object.defineProperty($someFunc2, 'name', { value: '' });
+        return $someFunc2;
+      })(),
+    ],
+    [
+      '$someAsyncFunc',
+      (function() {
+        async function $someAsyncFunc() {}
+        Object.defineProperty($someAsyncFunc, 'name', { value: '' });
+        return $someAsyncFunc;
+      })(),
+    ],
+    [
+      '$someGeneratorFunc',
+      (function() {
+        function* $someGeneratorFunc() {}
+        Object.defineProperty($someGeneratorFunc, 'name', { value: '' });
+        return $someGeneratorFunc;
+      })(),
+    ],
+    [
+      '$someFuncWithFakeToString',
+      (function() {
+        function $someFuncWithFakeToString() {}
+        $someFuncWithFakeToString.toString = () => 'Fake to string';
+        return $someFuncWithFakeToString;
+      })(),
+    ],
+  ].forEach(([name, fn]) => {
+    expectUnderTest(any(fn).toAsymmetricMatcher()).toBe(`Any<${name}>`);
+  });
+});
+
+test('Any throws when called with empty constructor', () => {
+  // @ts-expect-error: Testing runtime error
+  expectUnderTest(() => any()).toThrow(
+      'any() expects to be passed a constructor function. Please pass one or use anything() to match any object.',
+  );
+});
+
+test('Anything matches any type', () => {
+  [
+    anything().asymmetricMatch('jest'),
+    anything().asymmetricMatch(1),
+    anything().asymmetricMatch(() => {}),
+    anything().asymmetricMatch(true),
+    anything().asymmetricMatch({}),
+    anything().asymmetricMatch([]),
+  ].forEach(test => {
+    expectUnderTest(test).toBe(true);
+  });
+});
+
+test('Anything does not match null and undefined', () => {
+  [
+    anything().asymmetricMatch(null),
+    anything().asymmetricMatch(undefined),
+  ].forEach(test => {
+    expectUnderTest(test).toBe(false);
+  });
+});
+
+test('Anything.toAsymmetricMatcher()', () => {
+  expectUnderTest(anything().toAsymmetricMatcher()).toBe('Anything');
+});
+
+test('ArrayContaining matches', () => {
+  [
+    arrayContaining([]).asymmetricMatch('jest'),
+    arrayContaining(['foo']).asymmetricMatch(['foo']),
+    arrayContaining(['foo']).asymmetricMatch(['foo', 'bar']),
+    arrayContaining([]).asymmetricMatch({}),
+  ].forEach(test => {
+    expectUnderTest(test).toEqual(true);
+  });
+});
+
+test('ArrayContaining does not match', () => {
+  expectUnderTest(arrayContaining(['foo']).asymmetricMatch(['bar'])).toBe(false);
+});
+
+test('ArrayContaining throws for non-arrays', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    arrayContaining('foo').asymmetricMatch([]);
+  }).toThrow("You must provide an array to ArrayContaining, not 'string'.");
+});
+
+test('ArrayNotContaining matches', () => {
+  expectUnderTest(arrayNotContaining(['foo']).asymmetricMatch(['bar'])).toBe(true);
+});
+
+test('ArrayNotContaining does not match', () => {
+  [
+    arrayNotContaining([]).asymmetricMatch('jest'),
+    arrayNotContaining(['foo']).asymmetricMatch(['foo']),
+    arrayNotContaining(['foo']).asymmetricMatch(['foo', 'bar']),
+    arrayNotContaining([]).asymmetricMatch({}),
+  ].forEach(test => {
+    expectUnderTest(test).toEqual(false);
+  });
+});
+
+test('ArrayNotContaining throws for non-arrays', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    arrayNotContaining('foo').asymmetricMatch([]);
+  }).toThrow("You must provide an array to ArrayNotContaining, not 'string'.");
+});
+
+test('ObjectContaining matches', () => {
+  const foo = Symbol('foo');
+  [
+    objectContaining({}).asymmetricMatch('jest'),
+    objectContaining({ foo: 'foo' }).asymmetricMatch({ foo: 'foo', jest: 'jest' }),
+    objectContaining({ foo: undefined }).asymmetricMatch({ foo: undefined }),
+    objectContaining({ first: objectContaining({ second: {} }) }).asymmetricMatch({
+      first: { second: {} },
+    }),
+    objectContaining({ foo: Buffer.from('foo') }).asymmetricMatch({
+      foo: Buffer.from('foo'),
+      jest: 'jest',
+    }),
+    objectContaining({ [foo]: 'foo' }).asymmetricMatch({ [foo]: 'foo' }),
+  ].forEach(test => {
+    expectUnderTest(test).toEqual(true);
+  });
+});
+
+test('ObjectContaining does not match', () => {
+  const foo = Symbol('foo');
+  const bar = Symbol('bar');
+  [
+    objectContaining({ foo: 'foo' }).asymmetricMatch({ bar: 'bar' }),
+    objectContaining({ foo: 'foo' }).asymmetricMatch({ foo: 'foox' }),
+    objectContaining({ foo: undefined }).asymmetricMatch({}),
+    objectContaining({
+      answer: 42,
+      foo: { bar: 'baz', foobar: 'qux' },
+    }).asymmetricMatch({ foo: { bar: 'baz' } }),
+    objectContaining({ [foo]: 'foo' }).asymmetricMatch({ [bar]: 'bar' }),
+  ].forEach(test => {
+    expectUnderTest(test).toEqual(false);
+  });
+});
+
+test('ObjectContaining matches defined properties', () => {
+  const definedPropertyObject = {};
+  Object.defineProperty(definedPropertyObject, 'foo', { get: () => 'bar' });
+  expectUnderTest(
+      objectContaining({ foo: 'bar' }).asymmetricMatch(definedPropertyObject),
+  ).toBe(true);
+});
+
+test('ObjectContaining matches prototype properties', () => {
+  const prototypeObject = { foo: 'bar' };
+  let obj;
+
+  if (Object.create) {
+    obj = Object.create(prototypeObject);
+  } else {
+    function Foo() {}
+    Foo.prototype = prototypeObject;
+    Foo.prototype.constructor = Foo;
+    obj = new (Foo as any)();
+  }
+  expectUnderTest(objectContaining({ foo: 'bar' }).asymmetricMatch(obj)).toBe(true);
+});
+
+test('ObjectContaining throws for non-objects', () => {
+  // @ts-expect-error: Testing runtime error
+  expectUnderTest(() => objectContaining(1337).asymmetricMatch()).toThrow(
+      "You must provide an object to ObjectContaining, not 'number'.",
+  );
+});
+
+test('ObjectContaining does not mutate the sample', () => {
+  const sample = { foo: { bar: {} } };
+  const sample_json = JSON.stringify(sample);
+  expectUnderTest({ foo: { bar: {} } }).toEqual(expectUnderTest.objectContaining(sample));
+
+  expectUnderTest(JSON.stringify(sample)).toEqual(sample_json);
+});
+
+test('ObjectNotContaining matches', () => {
+  const foo = Symbol('foo');
+  const bar = Symbol('bar');
+  [
+    objectContaining({}).asymmetricMatch(null),
+    objectContaining({}).asymmetricMatch(undefined),
+    objectNotContaining({ [foo]: 'foo' }).asymmetricMatch({ [bar]: 'bar' }),
+    objectNotContaining({ foo: 'foo' }).asymmetricMatch({ bar: 'bar' }),
+    objectNotContaining({ foo: 'foo' }).asymmetricMatch({ foo: 'foox' }),
+    objectNotContaining({ foo: undefined }).asymmetricMatch({}),
+    objectNotContaining({
+      first: objectNotContaining({ second: {} }),
+    }).asymmetricMatch({ first: { second: {} } }),
+    objectNotContaining({ first: { second: {}, third: {} } }).asymmetricMatch({
+      first: { second: {} },
+    }),
+    objectNotContaining({ first: { second: {} } }).asymmetricMatch({
+      first: { second: {}, third: {} },
+    }),
+    objectNotContaining({ foo: 'foo', jest: 'jest' }).asymmetricMatch({
+      foo: 'foo',
+    }),
+  ].forEach(test => {
+    expectUnderTest(test).toEqual(true);
+  });
+});
+
+test('ObjectNotContaining does not match', () => {
+  [
+    objectNotContaining({}).asymmetricMatch('jest'),
+    objectNotContaining({ foo: 'foo' }).asymmetricMatch({
+      foo: 'foo',
+      jest: 'jest',
+    }),
+    objectNotContaining({ foo: undefined }).asymmetricMatch({ foo: undefined }),
+    objectNotContaining({ first: { second: {} } }).asymmetricMatch({
+      first: { second: {} },
+    }),
+    objectNotContaining({
+      first: objectContaining({ second: {} }),
+    }).asymmetricMatch({ first: { second: {} } }),
+    objectNotContaining({}).asymmetricMatch(null),
+    objectNotContaining({}).asymmetricMatch(undefined),
+    objectNotContaining({}).asymmetricMatch({}),
+  ].forEach(test => {
+    expectUnderTest(test).toEqual(false);
+  });
+});
+
+test('ObjectNotContaining inverts ObjectContaining', () => {
+  (
+    [
+      [{}, null],
+      [{ foo: 'foo' }, { foo: 'foo', jest: 'jest' }],
+      [{ foo: 'foo', jest: 'jest' }, { foo: 'foo' }],
+      [{ foo: undefined }, { foo: undefined }],
+      [{ foo: undefined }, {}],
+      [{ first: { second: {} } }, { first: { second: {} } }],
+      [{ first: objectContaining({ second: {} }) }, { first: { second: {} } }],
+      [{ first: objectNotContaining({ second: {} }) }, { first: { second: {} } }],
+      [{}, { foo: undefined }],
+    ] as const
+  ).forEach(([sample, received]) => {
+    expectUnderTest(objectNotContaining(sample).asymmetricMatch(received)).toEqual(
+        !objectContaining(sample).asymmetricMatch(received),
+    );
+  });
+});
+
+test('ObjectNotContaining throws for non-objects', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    objectNotContaining(1337).asymmetricMatch();
+  }).toThrow(
+      "You must provide an object to ObjectNotContaining, not 'number'.",
+  );
+});
+
+test('StringContaining matches string against string', () => {
+  expectUnderTest(stringContaining('en*').asymmetricMatch('queen*')).toBe(true);
+  expectUnderTest(stringContaining('en').asymmetricMatch('queue')).toBe(false);
+});
+
+test('StringContaining throws if expected value is not string', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    stringContaining([1]).asymmetricMatch('queen');
+  }).toThrow('Expected is not a string');
+});
+
+test('StringContaining returns false if received value is not string', () => {
+  expectUnderTest(stringContaining('en*').asymmetricMatch(1)).toBe(false);
+});
+
+test('StringNotContaining matches string against string', () => {
+  expectUnderTest(stringNotContaining('en*').asymmetricMatch('queen*')).toBe(false);
+  expectUnderTest(stringNotContaining('en').asymmetricMatch('queue')).toBe(true);
+});
+
+test('StringNotContaining throws if expected value is not string', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    stringNotContaining([1]).asymmetricMatch('queen');
+  }).toThrow('Expected is not a string');
+});
+
+test('StringNotContaining returns true if received value is not string', () => {
+  expectUnderTest(stringNotContaining('en*').asymmetricMatch(1)).toBe(true);
+});
+
+test('StringMatching matches string against regexp', () => {
+  expectUnderTest(stringMatching(/en/).asymmetricMatch('queen')).toBe(true);
+  expectUnderTest(stringMatching(/en/).asymmetricMatch('queue')).toBe(false);
+});
+
+test('StringMatching matches string against string', () => {
+  expectUnderTest(stringMatching('en').asymmetricMatch('queen')).toBe(true);
+  expectUnderTest(stringMatching('en').asymmetricMatch('queue')).toBe(false);
+});
+
+test('StringMatching throws if expected value is neither string nor regexp', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    stringMatching([1]).asymmetricMatch('queen');
+  }).toThrow('Expected is not a String or a RegExp');
+});
+
+test('StringMatching returns false if received value is not string', () => {
+  expectUnderTest(stringMatching('en').asymmetricMatch(1)).toBe(false);
+});
+
+test('StringMatching returns false even if coerced non-string received value matches pattern', () => {
+  expectUnderTest(stringMatching('null').asymmetricMatch(null)).toBe(false);
+});
+
+test('StringNotMatching matches string against regexp', () => {
+  expectUnderTest(stringNotMatching(/en/).asymmetricMatch('queen')).toBe(false);
+  expectUnderTest(stringNotMatching(/en/).asymmetricMatch('queue')).toBe(true);
+});
+
+test('StringNotMatching matches string against string', () => {
+  expectUnderTest(stringNotMatching('en').asymmetricMatch('queen')).toBe(false);
+  expectUnderTest(stringNotMatching('en').asymmetricMatch('queue')).toBe(true);
+});
+
+test('StringNotMatching throws if expected value is neither string nor regexp', () => {
+  expectUnderTest(() => {
+    // @ts-expect-error: Testing runtime error
+    stringNotMatching([1]).asymmetricMatch('queen');
+  }).toThrow('Expected is not a String or a RegExp');
+});
+
+test('StringNotMatching returns true if received value is not string', () => {
+  expectUnderTest(stringNotMatching('en').asymmetricMatch(1)).toBe(true);
+});
+
+test.describe('closeTo', () => {
+  [
+    [0, 0],
+    [0, 0.001],
+    [1.23, 1.229],
+    [1.23, 1.226],
+    [1.23, 1.225],
+    [1.23, 1.234],
+    [Infinity, Infinity],
+    [-Infinity, -Infinity],
+  ].forEach(([expected, received]) => {
+    test(`${expected} closeTo ${received} return true`, () => {
+      expectUnderTest(closeTo(expected).asymmetricMatch(received)).toBe(true);
+    });
+    test(`${expected} notCloseTo ${received} return false`, () => {
+      expectUnderTest(notCloseTo(expected).asymmetricMatch(received)).toBe(false);
+    });
+  });
+
+  [
+    [0, 0.01],
+    [1, 1.23],
+    [1.23, 1.2249999],
+    [Infinity, -Infinity],
+    [Infinity, 1.23],
+    [-Infinity, -1.23],
+  ].forEach(([expected, received]) => {
+    test(`${expected} closeTo ${received} return false`, () => {
+      expectUnderTest(closeTo(expected).asymmetricMatch(received)).toBe(false);
+    });
+    test(`${expected} notCloseTo ${received} return true`, () => {
+      expectUnderTest(notCloseTo(expected).asymmetricMatch(received)).toBe(true);
+    });
+  });
+
+  [
+    [0, 0.1, 0],
+    [0, 0.0001, 3],
+    [0, 0.000004, 5],
+    [2.0000002, 2, 5],
+  ].forEach(([expected, received, precision]) => {
+    test(`${expected} closeTo ${received} with precision ${precision} return true`, () => {
+      expectUnderTest(closeTo(expected, precision).asymmetricMatch(received)).toBe(
+          true,
+      );
+    });
+    test(`${expected} notCloseTo ${received} with precision ${precision} return false`, () => {
+      expectUnderTest(
+          notCloseTo(expected, precision).asymmetricMatch(received),
+      ).toBe(false);
+    });
+  });
+
+  [
+    [3.141592e-7, 3e-7, 8],
+    [56789, 51234, -4],
+  ].forEach(([expected, received, precision]) => {
+    test(`${expected} closeTo ${received} with precision ${precision} return false`, () => {
+      expectUnderTest(closeTo(expected, precision).asymmetricMatch(received)).toBe(
+          false,
+      );
+    });
+    test(`${expected} notCloseTo ${received} with precision ${precision} return true`, () => {
+      expectUnderTest(
+          notCloseTo(expected, precision).asymmetricMatch(received),
+      ).toBe(true);
+    });
+  });
+
+  test('closeTo throw if expected is not number', () => {
+    expectUnderTest(() => {
+      // @ts-expect-error: Testing runtime error
+      closeTo('a');
+    }).toThrow('Expected is not a Number');
+  });
+
+  test('notCloseTo throw if expected is not number', () => {
+    expectUnderTest(() => {
+      // @ts-expect-error: Testing runtime error
+      notCloseTo('a');
+    }).toThrow('Expected is not a Number');
+  });
+
+  test('closeTo throw if precision is not number', () => {
+    expectUnderTest(() => {
+      // @ts-expect-error: Testing runtime error
+      closeTo(1, 'a');
+    }).toThrow('Precision is not a Number');
+  });
+
+  test('notCloseTo throw if precision is not number', () => {
+    expectUnderTest(() => {
+      // @ts-expect-error: Testing runtime error
+      notCloseTo(1, 'a');
+    }).toThrow('Precision is not a Number');
+  });
+
+  test('closeTo return false if received is not number', () => {
+    expectUnderTest(closeTo(1).asymmetricMatch('a')).toBe(false);
+  });
+
+  test('notCloseTo return false if received is not number', () => {
+    expectUnderTest(notCloseTo(1).asymmetricMatch('a')).toBe(false);
+  });
+});
diff --git a/tests/expect/customEqualityTesters.test.ts b/tests/expect/customEqualityTesters.test.ts
new file mode 100644
index 0000000000000..2909c1091e874
--- /dev/null
+++ b/tests/expect/customEqualityTesters.test.ts
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest, mock } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+class Volume {
+  public amount: number;
+  public unit: 'L' | 'mL';
+
+  constructor(amount: number, unit: 'L' | 'mL') {
+    this.amount = amount;
+    this.unit = unit;
+  }
+
+  toString(): string {
+    return `[Volume ${this.amount}${this.unit}]`;
+  }
+
+  equals(other: Volume): boolean {
+    if (this.unit === other.unit)
+      return this.amount === other.amount;
+    else if (this.unit === 'L' && other.unit === 'mL')
+      return this.amount * 1000 === other.amount;
+    else
+      return this.amount === other.amount * 1000;
+
+  }
+}
+
+function createVolume(amount: number, unit: 'L' | 'mL' = 'L') {
+  return new Volume(amount, unit);
+}
+
+function isVolume(a: unknown): a is Volume {
+  return a instanceof Volume;
+}
+
+const areVolumesEqual = (
+  a: unknown,
+  b: unknown,
+): boolean | undefined => {
+  const isAVolume = isVolume(a);
+  const isBVolume = isVolume(b);
+
+  if (isAVolume && isBVolume)
+    return a.equals(b);
+  else if (isAVolume !== isBVolume)
+    return false;
+  else
+    return undefined;
+
+};
+
+function* toIterator<T>(array: Array<T>): Iterator<T> {
+  for (const obj of array)
+    yield obj;
+
+}
+
+expectUnderTest.extend({
+  toEqualVolume(expected: Volume, actual: Volume) {
+    const result = this.equals(expected, actual, this.customTesters);
+
+    return {
+      message: () =>
+        `Expected Volume object: ${expected.toString()}. Actual Volume object: ${actual.toString()}`,
+      pass: result,
+    };
+  },
+});
+
+// Create Volumes with different specifications but the same value for use in
+// tests. Without the custom tester, these volumes would not be equal because
+// their properties have different values. However, with our custom tester they
+// are equal.
+const volume1 = createVolume(1, 'L');
+const volume2 = createVolume(1000, 'mL');
+
+const volumeArg1 = createVolume(1, 'L');
+const volumeArg2 = createVolume(1000, 'mL');
+const volumeArg3 = createVolume(2, 'L');
+const volumeArg4 = createVolume(2000, 'mL');
+
+const volumeReturn1 = createVolume(2, 'L');
+const volumeReturn2 = createVolume(2000, 'mL');
+
+const testArgs = [volumeArg1, volumeArg2, [volumeArg3, volumeArg4]];
+// Swap the order of args to assert custom tester sees these volumes as equal
+const expectedArgs = [volumeArg2, volumeArg1, [volumeArg4, volumeArg3]];
+
+expectUnderTest.addEqualityTesters([areVolumesEqual]);
+
+test.describe('with custom equality testers', () => {
+  test('basic matchers customTesters do not apply to still do not pass different Volume objects', () => {
+    expectUnderTest(volume1).not.toBe(volume2);
+    expectUnderTest([volume1]).not.toContain(volume2);
+  });
+
+  test('basic matchers pass different Volume objects', () => {
+    expectUnderTest(volume1).toEqual(volume1);
+    expectUnderTest(volume1).toEqual(volume2);
+    expectUnderTest([volume1, volume2]).toEqual([volume2, volume1]);
+    expectUnderTest(new Map([['key', volume1]])).toEqual(new Map([['key', volume2]]));
+    expectUnderTest(new Set([volume1])).toEqual(new Set([volume2]));
+    expectUnderTest(toIterator([volume1, volume2])).toEqual(
+        toIterator([volume2, volume1]),
+    );
+    expectUnderTest([volume1]).toContainEqual(volume2);
+    expectUnderTest({ a: volume1 }).toHaveProperty('a', volume2);
+    expectUnderTest({ a: volume1, b: undefined }).toStrictEqual({
+      a: volume2,
+      b: undefined,
+    });
+    expectUnderTest({ a: 1, b: { c: volume1 } }).toMatchObject({
+      a: 1,
+      b: { c: volume2 },
+    });
+  });
+
+  test('asymmetric matchers pass different Volume objects', () => {
+    expectUnderTest([volume1]).toEqual(expectUnderTest.arrayContaining([volume2]));
+    expectUnderTest({ a: 1, b: { c: volume1 } }).toEqual(
+        expectUnderTest.objectContaining({ b: { c: volume2 } }),
+    );
+  });
+
+  test('spy matchers pass different Volume objects', () => {
+    const mockFn = mock.fn<(...args: Array<unknown>) => unknown>(
+        () => volumeReturn1,
+    );
+    mockFn(...testArgs);
+
+    expectUnderTest(mockFn).toHaveBeenCalledWith(...expectedArgs);
+    expectUnderTest(mockFn).toHaveBeenLastCalledWith(...expectedArgs);
+    expectUnderTest(mockFn).toHaveBeenNthCalledWith(1, ...expectedArgs);
+
+    expectUnderTest(mockFn).toHaveReturnedWith(volumeReturn2);
+    expectUnderTest(mockFn).toHaveLastReturnedWith(volumeReturn2);
+    expectUnderTest(mockFn).toHaveNthReturnedWith(1, volumeReturn2);
+  });
+
+  test('custom matchers pass different Volume objects', () => {
+    (expectUnderTest as any)(volume1).toEqualVolume(volume2);
+  });
+
+  test('toBe recommends toStrictEqual even with different Volume objects', () => {
+    expectUnderTest(() => expectUnderTest(volume1).toBe(volume2)).toThrow('toStrictEqual');
+  });
+
+  test('toBe recommends toEqual even with different Volume objects', () => {
+    expectUnderTest(() => expectUnderTest({ a: undefined, b: volume1 }).toBe({ b: volume2 })).toThrow(
+        'toEqual',
+    );
+  });
+
+  test('toContains recommends toContainEquals even with different Volume objects', () => {
+    expectUnderTest(() => expectUnderTest([volume1]).toContain(volume2)).toThrow(
+        'toContainEqual',
+    );
+  });
+
+  test('toMatchObject error shows Volume objects as equal', () => {
+    expect(() =>
+      expectUnderTest({ a: 1, b: volume1 }).toMatchObject({ a: 2, b: volume2 })
+    ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": 2,</>
+<r>+   "a": 1,</>
+<d>    "b": Volume {</>
+<d>      "amount": 1000,</>
+<d>      "unit": "mL",</>
+<d>    },</>
+<d>  }</>`);
+  });
+
+  test('iterableEquality still properly detects cycles', () => {
+    const a = new Set();
+    a.add(volume1);
+    a.add(a);
+
+    const b = new Set();
+    b.add(volume2);
+    b.add(b);
+
+    expectUnderTest(a).toEqual(b);
+  });
+});
diff --git a/tests/expect/customEqualityTestersRecursive.test.ts b/tests/expect/customEqualityTestersRecursive.test.ts
new file mode 100644
index 0000000000000..34c5813a8dc2e
--- /dev/null
+++ b/tests/expect/customEqualityTestersRecursive.test.ts
@@ -0,0 +1,246 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest, mock } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+// Test test file demonstrates and tests the capability of recursive custom
+// testers that call `equals` within their tester logic. These testers should
+// receive the array of custom testers and be able to pass it into equals
+
+const CONNECTION_PROP = '__connection';
+type DbConnection = number;
+let DbConnectionId = 0;
+
+class Author {
+  public name: string;
+  public [CONNECTION_PROP]: DbConnection;
+
+  constructor(name: string) {
+    this.name = name;
+    this[CONNECTION_PROP] = DbConnectionId++;
+  }
+}
+
+class Book {
+  public name: string;
+  public authors: Array<Author>;
+  public [CONNECTION_PROP]: DbConnection;
+
+  constructor(name: string, authors: Array<Author>) {
+    this.name = name;
+    this.authors = authors;
+    this[CONNECTION_PROP] = DbConnectionId++;
+  }
+}
+
+const areAuthorsEqual = (a: unknown, b: unknown) => {
+  const isAAuthor = a instanceof Author;
+  const isBAuthor = b instanceof Author;
+
+  if (isAAuthor && isBAuthor)
+    return a.name === b.name;
+  else if (isAAuthor !== isBAuthor)
+    return false;
+  else
+    return undefined;
+
+};
+
+const areBooksEqual = function(
+  a: unknown,
+  b: unknown,
+  customTesters: [],
+) {
+  const isABook = a instanceof Book;
+  const isBBook = b instanceof Book;
+
+  if (isABook && isBBook) {
+    return (
+      a.name === b.name && this.equals(a.authors, b.authors, customTesters)
+    );
+  } else if (isABook !== isBBook) {
+    return false;
+  } else {
+    return undefined;
+  }
+};
+
+function* toIterator<T>(array: Array<T>): Iterator<T> {
+  for (const obj of array)
+    yield obj;
+
+}
+
+expectUnderTest.extend({
+  toEqualBook(expected: Book, actual: Book) {
+    const result = this.equals(expected, actual, this.customTesters);
+
+    return {
+      message: () =>
+        `Expected Book object: ${expected.name}. Actual Book object: ${actual.name}`,
+      pass: result,
+    };
+  },
+});
+
+// Create books with the same name and authors for use in tests. Without the
+// custom tester, these books would not be equal because their DbConnections
+// would have different values. However, with our custom tester they are equal.
+const book1 = new Book('Book 1', [
+  new Author('Author 1'),
+  new Author('Author 2'),
+]);
+const book1b = new Book('Book 1', [
+  new Author('Author 1'),
+  new Author('Author 2'),
+]);
+
+const bookArg1a = new Book('Book Arg 1', [
+  new Author('Author Arg 1'),
+  new Author('Author Arg 2'),
+]);
+const bookArg1b = new Book('Book Arg 1', [
+  new Author('Author Arg 1'),
+  new Author('Author Arg 2'),
+]);
+const bookArg2a = new Book('Book Arg 2', [
+  new Author('Author Arg 3'),
+  new Author('Author Arg 4'),
+]);
+const bookArg2b = new Book('Book Arg 2', [
+  new Author('Author Arg 3'),
+  new Author('Author Arg 4'),
+]);
+
+const bookReturn1a = new Book('Book Return 1', [
+  new Author('Author Return 1'),
+  new Author('Author Return 2'),
+]);
+const bookReturn1b = new Book('Book Return 1', [
+  new Author('Author Return 1'),
+  new Author('Author Return 2'),
+]);
+
+const testArgs = [bookArg1a, bookArg1b, [bookArg2a, bookArg2b]];
+// Swap the order of args to assert custom tester works correctly and ignores
+// DbConnection differences
+const expectedArgs = [bookArg1b, bookArg1a, [bookArg2b, bookArg2a]];
+
+expectUnderTest.addEqualityTesters([areAuthorsEqual, areBooksEqual]);
+
+test.describe('with custom equality testers', () => {
+  test('exposes an equality function to custom testers', () => {
+    const runTestSymbol = Symbol('run this test');
+
+    expectUnderTest.addEqualityTesters([
+      function dummyTester() {
+        return undefined;
+      },
+    ]);
+
+    expectUnderTest(() =>
+      expectUnderTest(runTestSymbol).toEqual(runTestSymbol),
+    ).not.toThrow();
+  });
+
+  test('basic matchers customTesters do not apply to still do not pass different Book objects', () => {
+    expectUnderTest(book1).not.toBe(book1b);
+    expectUnderTest([book1]).not.toContain(book1b);
+  });
+
+  test('basic matchers pass different Book objects', () => {
+    expectUnderTest(book1).toEqual(book1);
+    expectUnderTest(book1).toEqual(book1b);
+    expectUnderTest([book1, book1b]).toEqual([book1b, book1]);
+    expectUnderTest(new Map([['key', book1]])).toEqual(new Map([['key', book1b]]));
+    expectUnderTest(new Set([book1])).toEqual(new Set([book1b]));
+    expectUnderTest(toIterator([book1, book1b])).toEqual(toIterator([book1b, book1]));
+    expectUnderTest([book1]).toContainEqual(book1b);
+    expectUnderTest({ a: book1 }).toHaveProperty('a', book1b);
+    expectUnderTest({ a: book1, b: undefined }).toStrictEqual({
+      a: book1b,
+      b: undefined,
+    });
+    expectUnderTest({ a: 1, b: { c: book1 } }).toMatchObject({
+      a: 1,
+      b: { c: book1b },
+    });
+  });
+
+  test('asymmetric matchers pass different Book objects', () => {
+    expectUnderTest([book1]).toEqual(expect.arrayContaining([book1b]));
+    expectUnderTest({ a: 1, b: { c: book1 } }).toEqual(
+        expect.objectContaining({ b: { c: book1b } }),
+    );
+  });
+
+  test('spy matchers pass different Book objects', () => {
+    const mockFn = mock.fn<(...args: Array<unknown>) => unknown>(
+        () => bookReturn1a,
+    );
+    mockFn(...testArgs);
+
+    expectUnderTest(mockFn).toHaveBeenCalledWith(...expectedArgs);
+    expectUnderTest(mockFn).toHaveBeenLastCalledWith(...expectedArgs);
+    expectUnderTest(mockFn).toHaveBeenNthCalledWith(1, ...expectedArgs);
+
+    expectUnderTest(mockFn).toHaveReturnedWith(bookReturn1b);
+    expectUnderTest(mockFn).toHaveLastReturnedWith(bookReturn1b);
+    expectUnderTest(mockFn).toHaveNthReturnedWith(1, bookReturn1b);
+  });
+
+  test('custom matchers pass different Book objects', () => {
+    (expectUnderTest as any)(book1).toEqualBook(book1b);
+  });
+
+  test('toBe recommends toStrictEqual even with different Book objects', () => {
+    expectUnderTest(() => expectUnderTest(book1).toBe(book1b)).toThrow('toStrictEqual');
+  });
+
+  test('toBe recommends toEqual even with different Book objects', () => {
+    expectUnderTest(() => expectUnderTest({ a: undefined, b: book1 }).toBe({ b: book1b })).toThrow(
+        'toEqual',
+    );
+  });
+
+  test('toContains recommends toContainEquals even with different Book objects', () => {
+    expectUnderTest(() => expectUnderTest([book1]).toContain(book1b)).toThrow('toContainEqual');
+  });
+
+  test('toMatchObject error shows Book objects as equal', () => {
+    expect(() =>
+      expectUnderTest({ a: 1, b: book1 }).toMatchObject({ a: 2, b: book1b })
+    ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<y>@@ -1,7 +1,7 @@</>
+<d>  Object {</>
+<g>-   "a": 2,</>
+<r>+   "a": 1,</>
+<d>    "b": Book {</>
+<d>      "__connection": 5,</>
+<d>      "authors": Array [</>
+<d>        Author {</>
+<d>          "__connection": 3,</>`);
+  });
+
+  test('iterableEquality still properly detects cycles', () => {
+    const a = new Set();
+    a.add(book1);
+    a.add(a);
+
+    const b = new Set();
+    b.add(book1b);
+    b.add(b);
+
+    expectUnderTest(a).toEqual(b);
+  });
+});
diff --git a/tests/expect/extend.test.ts b/tests/expect/extend.test.ts
new file mode 100644
index 0000000000000..94b879bb4010c
--- /dev/null
+++ b/tests/expect/extend.test.ts
@@ -0,0 +1,247 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+expectUnderTest.extend({
+  toBeDivisibleBy(actual: number, expected: number) {
+    const pass = actual % expected === 0;
+    const message: () => string = pass
+      ? () =>
+        `expected ${this.utils.printReceived(
+            actual,
+        )} not to be divisible by ${expected}`
+      : () =>
+        `expected ${this.utils.printReceived(
+            actual,
+        )} to be divisible by ${expected}`;
+
+    return { message, pass };
+  },
+  toBeSymbol(actual: symbol, expected: symbol) {
+    const pass = actual === expected;
+    const message = () =>
+      `expected ${actual.toString()} to be Symbol ${expected.toString()}`;
+
+    return { message, pass };
+  },
+  toBeWithinRange(actual: number, floor: number, ceiling: number) {
+    const pass = actual >= floor && actual <= ceiling;
+    const message = pass
+      ? () =>
+        `expected ${this.utils.printReceived(
+            actual,
+        )} not to be within range ${floor} - ${ceiling}`
+      : () =>
+        `expected ${this.utils.printReceived(
+            actual,
+        )} to be within range ${floor} - ${ceiling}`;
+
+    return { message, pass };
+  },
+});
+
+const expectUnderTestAsAny = expectUnderTest as any;
+
+test('is available globally when matcher is unary', () => {
+  expectUnderTestAsAny(15).toBeDivisibleBy(5);
+  expectUnderTestAsAny(15).toBeDivisibleBy(3);
+  expectUnderTestAsAny(15).not.toBeDivisibleBy(6);
+
+  expect(() =>
+    expectUnderTestAsAny(15).toBeDivisibleBy(2),
+  ).toThrowErrorMatchingSnapshot(`expected <r>15</> to be divisible by 2`);
+});
+
+test('is available globally when matcher is variadic', () => {
+  expectUnderTestAsAny(15).toBeWithinRange(10, 20);
+  expectUnderTestAsAny(15).not.toBeWithinRange(6, 10);
+
+  expect(() =>
+    expectUnderTestAsAny(15).toBeWithinRange(1, 3),
+  ).toThrowErrorMatchingSnapshot(`expected <r>15</> to be within range 1 - 3`);
+});
+
+test.skip('exposes matcherUtils in context', () => {
+  // expectUnderTest.extend({
+  //   shouldNotError(_actual: unknown) {
+  //     const pass: boolean = this.equals(
+  //         this.utils,
+  //         Object.assign(matcherUtils, {
+  //           iterableEquality,
+  //           subsetEquality,
+  //         }),
+  //     );
+  //     const message = pass
+  //       ? () => 'expected this.utils to be defined in an extend call'
+  //       : () => 'expected this.utils not to be defined in an extend call';
+
+  //     return { message, pass };
+  //   },
+  // });
+
+  // expectUnderTestAsAny('test').shouldNotError();
+});
+
+test('is ok if there is no message specified', () => {
+  expectUnderTest.extend({
+    toFailWithoutMessage(_expected: unknown) {
+      return { message: () => '', pass: false };
+    },
+  });
+
+  expect(() =>
+    expectUnderTestAsAny(true).toFailWithoutMessage(),
+  ).toThrowErrorMatchingSnapshot(`<r>No message was specified for this matcher.</>`);
+});
+
+test('exposes an equality function to custom matchers', () => {
+  expectUnderTest.extend({
+    toBeOne(_expected: unknown) {
+      return { message: () => '', pass: !!this.equals(1, 1) };
+    },
+  });
+
+  expect(() => expectUnderTestAsAny('test').toBeOne()).not.toThrow();
+});
+
+test('defines asymmetric unary matchers', () => {
+  expect(() =>
+    expectUnderTest({ value: 2 }).toEqual({ value: expectUnderTestAsAny.toBeDivisibleBy(2) }),
+  ).not.toThrow();
+  expect(() =>
+    expectUnderTest({ value: 3 }).toEqual({ value: expectUnderTestAsAny.toBeDivisibleBy(2) }),
+  ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "value": toBeDivisibleBy<2>,</>
+<r>+   "value": 3,</>
+<d>  }</>`);
+});
+
+test('defines asymmetric unary matchers that can be prefixed by not', () => {
+  expect(() =>
+    expectUnderTest({ value: 2 }).toEqual({ value: expectUnderTestAsAny.not.toBeDivisibleBy(2) }),
+  ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "value": not.toBeDivisibleBy<2>,</>
+<r>+   "value": 2,</>
+<d>  }</>`);
+  expect(() =>
+    expectUnderTest({ value: 3 }).toEqual({ value: expectUnderTestAsAny.not.toBeDivisibleBy(2) }),
+  ).not.toThrow();
+});
+
+test('defines asymmetric variadic matchers', () => {
+  expect(() =>
+    expectUnderTest({ value: 2 }).toEqual({ value: expectUnderTestAsAny.toBeWithinRange(1, 3) }),
+  ).not.toThrow();
+  expect(() =>
+    expectUnderTest({ value: 3 }).toEqual({ value: expectUnderTestAsAny.toBeWithinRange(4, 11) }),
+  ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "value": toBeWithinRange<4, 11>,</>
+<r>+   "value": 3,</>
+<d>  }</>`);
+});
+
+test('defines asymmetric variadic matchers that can be prefixed by not', () => {
+  expect(() =>
+    expectUnderTest({ value: 2 }).toEqual({
+      value: expectUnderTestAsAny.not.toBeWithinRange(1, 3),
+    }),
+  ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "value": not.toBeWithinRange<1, 3>,</>
+<r>+   "value": 2,</>
+<d>  }</>`);
+  expect(() =>
+    expectUnderTest({ value: 3 }).toEqual({
+      value: expectUnderTestAsAny.not.toBeWithinRange(5, 7),
+    }),
+  ).not.toThrow();
+});
+
+test('prints the Symbol into the error message', () => {
+  const foo = Symbol('foo');
+  const bar = Symbol('bar');
+
+  expect(() =>
+    expectUnderTest({ a: foo }).toEqual({
+      a: expectUnderTestAsAny.toBeSymbol(bar),
+    }),
+  ).toThrowErrorMatchingSnapshot(`<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": toBeSymbol<Symbol(bar)>,</>
+<r>+   "a": Symbol(foo),</>
+<d>  }</>`);
+});
+
+test('allows overriding existing extension', () => {
+  expectUnderTest.extend({
+    toAllowOverridingExistingMatcher(_expected: unknown) {
+      return { message: () => '', pass: _expected === 'bar' };
+    },
+  });
+
+  expectUnderTestAsAny('foo').not.toAllowOverridingExistingMatcher();
+
+  expectUnderTest.extend({
+    toAllowOverridingExistingMatcher(_expected: unknown) {
+      return { message: () => '', pass: _expected === 'foo' };
+    },
+  });
+
+  expectUnderTestAsAny('foo').toAllowOverridingExistingMatcher();
+});
+
+test('throws descriptive errors for invalid matchers', () => {
+  expect(() =>
+    expectUnderTest.extend({
+      default: undefined,
+    }),
+  ).toThrow(
+      'expect.extend: `default` is not a valid matcher. Must be a function, is "undefined"',
+  );
+  expect(() =>
+    expectUnderTest.extend({
+      // @ts-expect-error: Testing runtime error
+      default: 42,
+    }),
+  ).toThrow(
+      'expect.extend: `default` is not a valid matcher. Must be a function, is "number"',
+  );
+  expect(() =>
+    expectUnderTest.extend({
+      // @ts-expect-error: Testing runtime error
+      default: 'foobar',
+    }),
+  ).toThrow(
+      'expect.extend: `default` is not a valid matcher. Must be a function, is "string"',
+  );
+});
diff --git a/tests/expect/fixtures.ts b/tests/expect/fixtures.ts
new file mode 100644
index 0000000000000..502f9571b01e2
--- /dev/null
+++ b/tests/expect/fixtures.ts
@@ -0,0 +1,108 @@
+/*
+  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 { ansi2Markup } from 'tests/config/utils';
+import { expect as baseExpect } from '../playwright-test/stable-test-runner';
+import { test } from '../playwright-test/stable-test-runner';
+export { test } from '../playwright-test/stable-test-runner';
+
+const ordinals = new Map<string, number>();
+const snapshotFiles = new Set<string>();
+
+function checkExpectation(unformatted: string, inlineExpected?: string) {
+  const actual = ansi2Markup(unformatted);
+  const file = test.info().file.replace('.test.ts', '.snapshots.js');
+  const fullKey = test.info().titlePath.join('|');
+  const ordinal = ordinals.get(fullKey) || 0;
+  ordinals.set(fullKey, ordinal + 1);
+
+  const key = test.info().titlePath.slice(1).join(' ') + (ordinal ? ` #${ordinal}` : '');
+
+  if (!inlineExpected && test.info().config.updateSnapshots === 'all') {
+    if (!snapshotFiles.has(file)) {
+      fs.writeFileSync(file, '');
+      snapshotFiles.add(file);
+    }
+    const line = `module.exports[${JSON.stringify(key)}] = \`${actual.replace(/\\/g, '\\\\').replace(/`/g, '\\`')}\`;\n\n`;
+    fs.appendFileSync(file, line);
+    return { message: () => '', pass: true };
+  }
+
+  let expected: string;
+  if (inlineExpected) {
+    expected = inlineExpected;
+  } else {
+    const data = require(file);
+    expected = data[key];
+  }
+
+  let pass: boolean;
+  let matcherResult: any;
+  try {
+    baseExpect(actual).toBe(expected);
+    pass = true;
+  } catch (e: any) {
+    matcherResult = e.matcherResult;
+    pass = false;
+  }
+
+  const expectOptions = {
+    isNot: this.isNot,
+  };
+
+  const message = pass
+    ? () => this.utils.matcherHint('toBe', actual, expected, expectOptions) +
+        '\n\n' +
+        `Expected: ${this.isNot ? 'not' : ''}${this.utils.printExpected(expected)}\n` +
+        (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '')
+    : () =>  this.utils.matcherHint('toBe', actual, expected, expectOptions) +
+        '\n\n' +
+        `Expected: ${this.utils.printExpected(expected)}\n` +
+        (matcherResult ? `Received: ${this.utils.printReceived(matcherResult.actual)}` : '');
+
+  return {
+    name: 'toThrowErrorMatching',
+    expected,
+    message,
+    pass,
+    actual: matcherResult?.actual,
+  };
+}
+
+export const expect = baseExpect.extend({
+  toMatchSnapshot(message: string, expected?: string) {
+    return checkExpectation.call(this, message, expected);
+  },
+
+  toThrowErrorMatchingSnapshot(callback: () => any, expected?: string) {
+    try {
+      callback();
+    } catch (e) {
+      return checkExpectation.call(this, e.message, expected);
+    }
+    throw new Error('Expected function to throw, but it did not');
+  },
+
+  async toThrowErrorMatchingSnapshotAsync(callback: () => Promise<any>, expected?: string) {
+    try {
+      await callback();
+    } catch (e) {
+      return checkExpectation.call(this, e.message, expected);
+    }
+    throw new Error('Expected function to throw, but it did not');
+  }
+});
diff --git a/tests/expect/matchers.snapshots.js b/tests/expect/matchers.snapshots.js
new file mode 100644
index 0000000000000..0f8a5a5030d63
--- /dev/null
+++ b/tests/expect/matchers.snapshots.js
@@ -0,0 +1,3614 @@
+module.exports[".rejects fails non-promise value \"a\""] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has type:  string
+Received has value: <r>"a"</>`;
+
+module.exports[".rejects fails non-promise value [1]"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has type:  array
+Received has value: <r>[1]</>`;
+
+module.exports[".rejects fails non-promise value [Function anonymous]"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has type:  function
+Received has value: <r>[Function anonymous]</>`;
+
+module.exports[".rejects fails non-promise value {\"a\": 1}"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has type:  object
+Received has value: <r>{"a": 1}</>`;
+
+module.exports[".rejects fails non-promise value 4"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has type:  number
+Received has value: <r>4</>`;
+
+module.exports[".rejects fails non-promise value null"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has value: <r>null</>`;
+
+module.exports[".rejects fails non-promise value true"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has type:  boolean
+Received has value: <r>true</>`;
+
+module.exports[".rejects fails non-promise value undefined"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise or a function returning a promise
+
+Received has value: <r>undefined</>`;
+
+module.exports[".rejects fails for promise that resolves"] = `<d>expect(</><r>received</><d>).</>rejects<d>.</>toBe<d>()</>
+
+Received promise resolved instead of rejected
+Resolved to value: <r>4</>`;
+
+module.exports[".resolves fails non-promise value \"a\" synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  string
+Received has value: <r>"a"</>`;
+
+module.exports[".resolves fails non-promise value \"a\""] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  string
+Received has value: <r>"a"</>`;
+
+module.exports[".resolves fails non-promise value [1] synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  array
+Received has value: <r>[1]</>`;
+
+module.exports[".resolves fails non-promise value [1]"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  array
+Received has value: <r>[1]</>`;
+
+module.exports[".resolves fails non-promise value [Function anonymous] synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  function
+Received has value: <r>[Function anonymous]</>`;
+
+module.exports[".resolves fails non-promise value [Function anonymous]"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  function
+Received has value: <r>[Function anonymous]</>`;
+
+module.exports[".resolves fails non-promise value {\"a\": 1} synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  object
+Received has value: <r>{"a": 1}</>`;
+
+module.exports[".resolves fails non-promise value {\"a\": 1}"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  object
+Received has value: <r>{"a": 1}</>`;
+
+module.exports[".resolves fails non-promise value 4 synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  number
+Received has value: <r>4</>`;
+
+module.exports[".resolves fails non-promise value 4"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  number
+Received has value: <r>4</>`;
+
+module.exports[".resolves fails non-promise value null synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has value: <r>null</>`;
+
+module.exports[".resolves fails non-promise value null"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has value: <r>null</>`;
+
+module.exports[".resolves fails non-promise value true synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  boolean
+Received has value: <r>true</>`;
+
+module.exports[".resolves fails non-promise value true"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has type:  boolean
+Received has value: <r>true</>`;
+
+module.exports[".resolves fails non-promise value undefined synchronously"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has value: <r>undefined</>`;
+
+module.exports[".resolves fails non-promise value undefined"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>not<d>.</>toBeDefined<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a promise
+
+Received has value: <r>undefined</>`;
+
+module.exports[".resolves fails for promise that rejects"] = `<d>expect(</><r>received</><d>).</>resolves<d>.</>toBe<d>()</>
+
+Received promise rejected instead of resolved
+Rejected to value: <r>4</>`;
+
+module.exports[".toBe() fails for: 1 and 2 (0)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>2</>
+Received: <r>1</>`;
+
+module.exports[".toBe() fails for: true and false (1)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>false</>
+Received: <r>true</>`;
+
+module.exports[".toBe() fails for: [Function anonymous] and [Function anonymous] (2)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>[Function anonymous]</>
+Received: serializes to the same string`;
+
+module.exports[".toBe() fails for: {} and {} (3)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<d>If it should pass with deep equality, replace "toBe" with "toStrictEqual"</>
+
+Expected: <g>{}</>
+Received: serializes to the same string`;
+
+module.exports[".toBe() fails for: {\"a\": 1} and {\"a\": 1} (4)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<d>If it should pass with deep equality, replace "toBe" with "toStrictEqual"</>
+
+Expected: <g>{"a": 1}</>
+Received: serializes to the same string`;
+
+module.exports[".toBe() fails for: {\"a\": 1} and {\"a\": 5} (5)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": 5,</>
+<r>+   "a": 1,</>
+<d>  }</>`;
+
+module.exports[".toBe() fails for: {\"a\": [Function a], \"b\": 2} and {\"a\": Any<Function>, \"b\": 2} (6)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<d>If it should pass with deep equality, replace "toBe" with "toStrictEqual"</>
+
+Expected: <g>{"a": Any<Function>, "b": 2}</>
+Received: <r>{"a": [Function a], "b": 2}</>`;
+
+module.exports[".toBe() fails for: {\"a\": undefined, \"b\": 2} and {\"b\": 2} (7)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<d>If it should pass with deep equality, replace "toBe" with "toEqual"</>
+
+<g>- Expected  - 0</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<r>+   "a": undefined,</>
+<d>    "b": 2,</>
+<d>  }</>`;
+
+module.exports[".toBe() fails for: 2020-02-20T00:00:00.000Z and 2020-02-20T00:00:00.000Z (8)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<d>If it should pass with deep equality, replace "toBe" with "toStrictEqual"</>
+
+Expected: <g>2020-02-20T00:00:00.000Z</>
+Received: serializes to the same string`;
+
+module.exports[".toBe() fails for: 2020-02-21T00:00:00.000Z and 2020-02-20T00:00:00.000Z (9)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>2020-02-20T00:00:00.000Z</>
+Received: <r>2020-02-21T00:00:00.000Z</>`;
+
+module.exports[".toBe() fails for: /received/ and /expected/ (10)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>/expected/</>
+Received: <r>/received/</>`;
+
+module.exports[".toBe() fails for: Symbol(received) and Symbol(expected) (11)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>Symbol(expected)</>
+Received: <r>Symbol(received)</>`;
+
+module.exports[".toBe() fails for: [Error: received] and [Error: expected] (12)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>[Error: expected]</>
+Received: <r>[Error: received]</>`;
+
+module.exports[".toBe() fails for: \"abc\" and \"cde\" (13)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>"cde"</>
+Received: <r>"abc"</>`;
+
+module.exports[".toBe() fails for: \"painless JavaScript testing\" and \"delightful JavaScript testing\" (14)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>"<i>delightful</i> JavaScript testing"</>
+Received: <r>"<i>painless</i> JavaScript testing"</>`;
+
+module.exports[".toBe() fails for: \"\" and \"compare one-line string to empty string\" (15)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>"compare one-line string to empty string"</>
+Received: <r>""</>`;
+
+module.exports[".toBe() fails for: \"with \ntrailing space\" and \"without trailing space\" (16)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 2</>
+
+<g>- with<i>out</i> trailing space</>
+<r>+ with<Y> </></>
+<r>+ trailing space</>`;
+
+module.exports[".toBe() fails for: \"four\n4\nline\nstring\" and \"3\nline\nstring\" (17)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 2</>
+
+<g>- 3</>
+<r>+ four</>
+<r>+ 4</>
+<d>  line</>
+<d>  string</>`;
+
+module.exports[".toBe() fails for: [] and [] (18)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<d>If it should pass with deep equality, replace "toBe" with "toStrictEqual"</>
+
+Expected: <g>[]</>
+Received: serializes to the same string`;
+
+module.exports[".toBe() fails for: null and undefined (19)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>undefined</>
+Received: <r>null</>`;
+
+module.exports[".toBe() fails for: -0 and 0 (20)"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: <g>0</>
+Received: <r>-0</>`;
+
+module.exports[".toBe() fails for 'false' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>false</>`;
+
+module.exports[".toBe() fails for '1' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>1</>`;
+
+module.exports[".toBe() fails for '\"a\"' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>"a"</>`;
+
+module.exports[".toBe() fails for 'undefined' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>undefined</>`;
+
+module.exports[".toBe() fails for 'null' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>null</>`;
+
+module.exports[".toBe() fails for '{}' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>{}</>`;
+
+module.exports[".toBe() fails for '[]' with '.not'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+Expected: not <g>[]</>`;
+
+module.exports[".toBe() does not crash on circular references"] = `<d>expect(</><r>received</><d>).</>toBe<d>(</><g>expected</><d>) // Object.is equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 3</>
+
+<g>- Object {}</>
+<r>+ Object {</>
+<r>+   "circular": [Circular],</>
+<r>+ }</>`;
+
+module.exports[".toStrictEqual() matches the expected snapshot when it fails"] = `<d>expect(</><r>received</><d>).</>toStrictEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 4</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "test": TestClassA {</>
+<g>-     "a": 1,</>
+<g>-     "b": 2,</>
+<g>-   },</>
+<r>+   "test": 2,</>
+<d>  }</>`;
+
+module.exports[".toStrictEqual() matches the expected snapshot when it fails #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toStrictEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"test": {"a": 1, "b": 2}}</>
+`;
+
+module.exports[".toStrictEqual() displays substring diff"] = `<d>expect(</><r>received</><d>).</>toStrictEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>"<i>Another caveat is that</i> Jest will not typecheck your tests."</>
+Received: <r>"<i>Because TypeScript support in Babel is just transpilation,</i> Jest will not type<i>-</i>check your tests<i> as they run</i>."</>`;
+
+module.exports[".toStrictEqual() displays substring diff for multiple lines"] = `<d>expect(</><r>received</><d>).</>toStrictEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 7</>
+<r>+ Received  + 7</>
+
+<g>-     6<i>9</i> |<Y> </></>
+<r>+     6<i>8</i> |<Y> </></>
+<g>-     <i>70</i> | test('assert.doesNotThrow', () => {</>
+<r>+     <i>69</i> | test('assert.doesNotThrow', () => {</>
+<g>-   > 7<i>1</i> |   assert.doesNotThrow(() => {</>
+<r>+   > 7<i>0</i> |   assert.doesNotThrow(() => {</>
+<d>         |          ^</>
+<g>-     7<i>2</i> |     throw Error('err!');</>
+<r>+     7<i>1</i> |     throw Error('err!');</>
+<g>-     7<i>3</i> |   });</>
+<r>+     7<i>2</i> |   });</>
+<g>-     7<i>4</i> | });</>
+<r>+     7<i>3</i> | });</>
+<g>-     at Object.doesNotThrow (__tests__/assertionError.test.js:7<i>1</i>:10)</>
+<r>+     at Object.doesNotThrow (__tests__/assertionError.test.js:7<i>0</i>:10)</>`;
+
+module.exports[".toEqual() {pass: false} expect(true).toEqual(false (0))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>false</>
+Received: <r>true</>`;
+
+module.exports[".toEqual() {pass: false} expect(1).toEqual(2 (1))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>2</>
+Received: <r>1</>`;
+
+module.exports[".toEqual() {pass: false} expect(0).toEqual(-0 (2))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>-0</>
+Received: <r>0</>`;
+
+module.exports[".toEqual() {pass: false} expect(0).toEqual(5e-324 (3))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>5e-324</>
+Received: <r>0</>`;
+
+module.exports[".toEqual() {pass: false} expect(5e-324).toEqual(0 (4))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>0</>
+Received: <r>5e-324</>`;
+
+module.exports[".toEqual() {pass: false} expect(0).toEqual({} (5))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>{}</>
+Received: <r>0</>`;
+
+module.exports[".toEqual() {pass: false} expect({}).toEqual(0 (6))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>0</>
+Received: <r>{}</>`;
+
+module.exports[".toEqual() {pass: false} expect({}).toEqual({} (7))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>{}</>
+Received: serializes to the same string`;
+
+module.exports[".toEqual() {pass: false} expect(\"abc\").toEqual({\"0\": \"a\", \"1\": \"b\", \"2\": \"c\"} (8))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>{"0": "a", "1": "b", "2": "c"}</>
+Received: <r>"abc"</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"0\": \"a\", \"1\": \"b\", \"2\": \"c\"}).toEqual(\"abc\" (9))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>"abc"</>
+Received: <r>{"0": "a", "1": "b", "2": "c"}</>`;
+
+module.exports[".toEqual() {pass: false} expect(/abc/gsy).toEqual(/abc/g (10))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>/abc/g</>
+Received: <r>/abc/gsy</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"a\": 1}).toEqual({\"a\": 2} (11))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": 2,</>
+<r>+   "a": 1,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"a\": 5}).toEqual({\"b\": 6} (12))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "b": 6,</>
+<r>+   "a": 5,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"foo\": {\"bar\": 1}}).toEqual({\"foo\": {}} (13))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 3</>
+
+<d>  Object {</>
+<g>-   "foo": Object {},</>
+<r>+   "foo": Object {</>
+<r>+     "bar": 1,</>
+<r>+   },</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"getterAndSetter\": {}}).toEqual({\"getterAndSetter\": {\"foo\": \"bar\"}} (14))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "getterAndSetter": Object {</>
+<g>-     "foo": "bar",</>
+<g>-   },</>
+<r>+   "getterAndSetter": Object {},</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"frozenGetterAndSetter\": {}}).toEqual({\"frozenGetterAndSetter\": {\"foo\": \"bar\"}} (15))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "frozenGetterAndSetter": Object {</>
+<g>-     "foo": "bar",</>
+<g>-   },</>
+<r>+   "frozenGetterAndSetter": Object {},</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"getter\": {}}).toEqual({\"getter\": {\"foo\": \"bar\"}} (16))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "getter": Object {</>
+<g>-     "foo": "bar",</>
+<g>-   },</>
+<r>+   "getter": Object {},</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"frozenGetter\": {}}).toEqual({\"frozenGetter\": {\"foo\": \"bar\"}} (17))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "frozenGetter": Object {</>
+<g>-     "foo": "bar",</>
+<g>-   },</>
+<r>+   "frozenGetter": Object {},</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"setter\": undefined}).toEqual({\"setter\": {\"foo\": \"bar\"}} (18))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "setter": Object {</>
+<g>-     "foo": "bar",</>
+<g>-   },</>
+<r>+   "setter": undefined,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"frozenSetter\": undefined}).toEqual({\"frozenSetter\": {\"foo\": \"bar\"}} (19))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "frozenSetter": Object {</>
+<g>-     "foo": "bar",</>
+<g>-   },</>
+<r>+   "frozenSetter": undefined,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(\"banana\").toEqual(\"apple\" (20))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>"apple"</>
+Received: <r>"banana"</>`;
+
+module.exports[".toEqual() {pass: false} expect(\"1 234,57 $\").toEqual(\"1 234,57 $\" (21))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>"1<i> </i>234,57<i> </i>$"</>
+Received: <r>"1<i> </i>234,57<i> </i>$"</>`;
+
+module.exports[".toEqual() {pass: false} expect(\"type TypeName<T> = T extends Function ? \\\"function\\\" : \\\"object\\\";\").toEqual(\"type TypeName<T> = T extends Function\n? \\\"function\\\"\n: \\\"object\\\";\" (22))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<g>- type TypeName<T> = T extends Function</>
+<g>- ? "function"</>
+<g>- : "object";</>
+<r>+ type TypeName<T> = T extends Function<i> </i>? "function"<i> </i>: "object";</>`;
+
+module.exports[".toEqual() {pass: false} expect(null).toEqual(undefined (23))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>undefined</>
+Received: <r>null</>`;
+
+module.exports[".toEqual() {pass: false} expect([1]).toEqual([2] (24))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<g>-   2,</>
+<r>+   1,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect([1, 2]).toEqual([2, 1] (25))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<g>-   2,</>
+<d>    1,</>
+<r>+   2,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.List [1]).toEqual(Immutable.List [2] (26))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.List [</>
+<g>-   2,</>
+<r>+   1,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.List [1, 2]).toEqual(Immutable.List [2, 1] (27))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.List [</>
+<g>-   2,</>
+<d>    1,</>
+<r>+   2,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect(Map {}).toEqual(Set {} (28))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>Set {}</>
+Received: <r>Map {}</>`;
+
+module.exports[".toEqual() {pass: false} expect(Set {1, 2}).toEqual(Set {} (29))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 4</>
+
+<g>- Set {}</>
+<r>+ Set {</>
+<r>+   1,</>
+<r>+   2,</>
+<r>+ }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Set {1, 2}).toEqual(Set {1, 2, 3} (30))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 0</>
+
+<d>  Set {</>
+<d>    1,</>
+<d>    2,</>
+<g>-   3,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Set {[1], [2]}).toEqual(Set {[1], [2], [3]} (31))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 0</>
+
+<y>@@ -3,9 +3,6 @@</>
+<d>      1,</>
+<d>    ],</>
+<d>    Array [</>
+<d>      2,</>
+<d>    ],</>
+<g>-   Array [</>
+<g>-     3,</>
+<g>-   ],</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Set {[1], [2]}).toEqual(Set {[1], [2], [2]} (32))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 0</>
+
+<y>@@ -3,9 +3,6 @@</>
+<d>      1,</>
+<d>    ],</>
+<d>    Array [</>
+<d>      2,</>
+<d>    ],</>
+<g>-   Array [</>
+<g>-     2,</>
+<g>-   ],</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Set {Set {1}, Set {2}}).toEqual(Set {Set {1}, Set {3}} (33))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Set {</>
+<d>    Set {</>
+<d>      1,</>
+<d>    },</>
+<d>    Set {</>
+<g>-     3,</>
+<r>+     2,</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.Set [1, 2]).toEqual(Immutable.Set [] (34))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 4</>
+
+<g>- Immutable.Set []</>
+<r>+ Immutable.Set [</>
+<r>+   1,</>
+<r>+   2,</>
+<r>+ ]</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.Set [1, 2]).toEqual(Immutable.Set [1, 2, 3] (35))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 0</>
+
+<d>  Immutable.Set [</>
+<d>    1,</>
+<d>    2,</>
+<g>-   3,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.OrderedSet [1, 2]).toEqual(Immutable.OrderedSet [2, 1] (36))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.OrderedSet [</>
+<g>-   2,</>
+<d>    1,</>
+<r>+   2,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect(Map {1 => \"one\", 2 => \"two\"}).toEqual(Map {1 => \"one\"} (37))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 0</>
+<r>+ Received  + 1</>
+
+<d>  Map {</>
+<d>    1 => "one",</>
+<r>+   2 => "two",</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Map {\"a\" => 0}).toEqual(Map {\"b\" => 0} (38))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Map {</>
+<g>-   "b" => 0,</>
+<r>+   "a" => 0,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Map {\"v\" => 1}).toEqual(Map {\"v\" => 2} (39))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Map {</>
+<g>-   "v" => 2,</>
+<r>+   "v" => 1,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Map {[\"v\"] => 1}).toEqual(Map {[\"v\"] => 2} (40))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Map {</>
+<d>    Array [</>
+<d>      "v",</>
+<g>-   ] => 2,</>
+<r>+   ] => 1,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Map {[1] => Map {[1] => \"one\"}}).toEqual(Map {[1] => Map {[1] => \"two\"}} (41))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<y>@@ -2,8 +2,8 @@</>
+<d>    Array [</>
+<d>      1,</>
+<d>    ] => Map {</>
+<d>      Array [</>
+<d>        1,</>
+<g>-     ] => "two",</>
+<r>+     ] => "one",</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.Map {\"a\": 0}).toEqual(Immutable.Map {\"b\": 0} (42))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.Map {</>
+<g>-   "b": 0,</>
+<r>+   "a": 0,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.Map {\"v\": 1}).toEqual(Immutable.Map {\"v\": 2} (43))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.Map {</>
+<g>-   "v": 2,</>
+<r>+   "v": 1,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.OrderedMap {1: \"one\", 2: \"two\"}).toEqual(Immutable.OrderedMap {2: \"two\", 1: \"one\"} (44))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.OrderedMap {</>
+<g>-   2: "two",</>
+<d>    1: "one",</>
+<r>+   2: "two",</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(Immutable.Map {\"1\": Immutable.Map {\"2\": {\"a\": 99}}}).toEqual(Immutable.Map {\"1\": Immutable.Map {\"2\": {\"a\": 11}}} (45))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Immutable.Map {</>
+<d>    "1": Immutable.Map {</>
+<d>      "2": Object {</>
+<g>-       "a": 11,</>
+<r>+       "a": 99,</>
+<d>      },</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect([97, 98, 99]).toEqual([97, 98, 100] (46))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Uint8Array [</>
+<d>    97,</>
+<d>    98,</>
+<g>-   100,</>
+<r>+   99,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"a\": 1, \"b\": 2}).toEqual(ObjectContaining {\"a\": 2} (47))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 2</>
+<r>+ Received  + 3</>
+
+<g>- ObjectContaining {</>
+<g>-   "a": 2,</>
+<r>+ Object {</>
+<r>+   "a": 1,</>
+<r>+   "b": 2,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect(false).toEqual(ObjectContaining {\"a\": 2} (48))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>ObjectContaining {"a": 2}</>
+Received: <r>false</>`;
+
+module.exports[".toEqual() {pass: false} expect([1, 3]).toEqual(ArrayContaining [1, 2] (49))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>ArrayContaining [1, 2]</>
+Received: <r>[1, 3]</>`;
+
+module.exports[".toEqual() {pass: false} expect(1).toEqual(ArrayContaining [1, 2] (50))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>ArrayContaining [1, 2]</>
+Received: <r>1</>`;
+
+module.exports[".toEqual() {pass: false} expect(\"abd\").toEqual(StringContaining \"bc\" (51))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>StringContaining "bc"</>
+Received: <r>"abd"</>`;
+
+module.exports[".toEqual() {pass: false} expect(\"abd\").toEqual(StringMatching /bc/i (52))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>StringMatching /bc/i</>
+Received: <r>"abd"</>`;
+
+module.exports[".toEqual() {pass: false} expect(undefined).toEqual(Anything (53))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>Anything</>
+Received: <r>undefined</>`;
+
+module.exports[".toEqual() {pass: false} expect(undefined).toEqual(Any<Function> (54))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>Any<Function></>
+Received: <r>undefined</>`;
+
+module.exports[".toEqual() {pass: false} expect(\"Eve\").toEqual({\"asymmetricMatch\": [Function asymmetricMatch]} (55))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>{"asymmetricMatch": [Function asymmetricMatch]}</>
+Received: <r>"Eve"</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"target\": {\"nodeType\": 1, \"value\": \"a\"}}).toEqual({\"target\": {\"nodeType\": 1, \"value\": \"b\"}} (56))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<d>    "target": Object {</>
+<d>      "nodeType": 1,</>
+<g>-     "value": "b",</>
+<r>+     "value": "a",</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({\"nodeName\": \"div\", \"nodeType\": 1}).toEqual({\"nodeName\": \"p\", \"nodeType\": 1} (57))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "nodeName": "p",</>
+<r>+   "nodeName": "div",</>
+<d>    "nodeType": 1,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect({Symbol(foo): 1, Symbol(bar): 2}).toEqual({Symbol(foo): Any<Number>, Symbol(bar): 1} (58))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<d>    Symbol(foo): Any<Number>,</>
+<g>-   Symbol(bar): 1,</>
+<r>+   Symbol(bar): 2,</>
+<d>  }</>`;
+
+module.exports[".toEqual() {pass: false} expect([, , 1, ]).toEqual([, , 2, ] (59))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<d>    undefined,</>
+<d>    undefined,</>
+<g>-   2,</>
+<r>+   1,</>
+<d>    undefined,</>
+<d>  ]</>`;
+
+module.exports[".toEqual() {pass: false} expect([]).toEqual([] (60))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>[]</>
+Received: serializes to the same string`;
+
+module.exports[".toEqual() {pass: false} expect([]).toEqual([1] (61))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<g>- Array [</>
+<g>-   1,</>
+<g>- ]</>
+<r>+ Array []</>`;
+
+module.exports[".toEqual() {pass: false} expect([]).toEqual([] (62))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>[]</>
+Received: serializes to the same string`;
+
+module.exports[".toEqual() {pass: false} expect([]).toEqual([] (63))"] = `<d>expect(</><r>received</><d>).</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: <g>[]</>
+Received: serializes to the same string`;
+
+module.exports[".toEqual() {pass: true} expect(true).not.toEqual(true) (0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>true</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(1).not.toEqual(1) (1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>1</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(NaN).not.toEqual(NaN) (2)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>NaN</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(0).not.toEqual(0) (3)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>0</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(0).not.toEqual(0) (4)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>0</>
+`;
+
+module.exports[".toEqual() {pass: true} expect({}).not.toEqual({}) (5)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(\"abc\").not.toEqual(\"abc\") (6)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>"abc"</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(\"abc\").not.toEqual(\"abc\") (7)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>"abc"</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(\"abc\").not.toEqual(\"abc\") (8)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>"abc"</>
+`;
+
+module.exports[".toEqual() {pass: true} expect([1]).not.toEqual([1]) (9)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect([1, 2]).not.toEqual([1, 2]) (10)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1, 2]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.List [1]).not.toEqual(Immutable.List [1]) (11)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.List [1]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.List [1, 2]).not.toEqual(Immutable.List [1, 2]) (12)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.List [1, 2]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect({}).not.toEqual({}) (13)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 99}).not.toEqual({\"a\": 99}) (14)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 99}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Set {}).not.toEqual(Set {}) (15)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Set {1, 2}).not.toEqual(Set {1, 2}) (16)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {1, 2}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Set {1, 2}).not.toEqual(Set {2, 1}) (17)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {2, 1}</>
+Received:     <r>Set {1, 2}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Set {[1], [2]}).not.toEqual(Set {[2], [1]}) (18)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {[2], [1]}</>
+Received:     <r>Set {[1], [2]}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Set {Set {[1]}, Set {[2]}}).not.toEqual(Set {Set {[2]}, Set {[1]}}) (19)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {Set {[2]}, Set {[1]}}</>
+Received:     <r>Set {Set {[1]}, Set {[2]}}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Set {[1], [2], [3], [3]}).not.toEqual(Set {[3], [3], [2], [1]}) (20)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {[3], [3], [2], [1]}</>
+Received:     <r>Set {[1], [2], [3], [3]}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Set {{\"a\": 1}, {\"b\": 2}}).not.toEqual(Set {{\"b\": 2}, {\"a\": 1}}) (21)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Set {{"b": 2}, {"a": 1}}</>
+Received:     <r>Set {{"a": 1}, {"b": 2}}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Set []).not.toEqual(Immutable.Set []) (22)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Set []</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Set [1, 2]).not.toEqual(Immutable.Set [1, 2]) (23)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Set [1, 2]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Set [1, 2]).not.toEqual(Immutable.Set [2, 1]) (24)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Set [2, 1]</>
+Received:     <r>Immutable.Set [1, 2]</>`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.OrderedSet []).not.toEqual(Immutable.OrderedSet []) (25)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.OrderedSet []</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.OrderedSet [1, 2]).not.toEqual(Immutable.OrderedSet [1, 2]) (26)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.OrderedSet [1, 2]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Map {}).not.toEqual(Map {}) (27)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Map {1 => \"one\", 2 => \"two\"}).not.toEqual(Map {1 => \"one\", 2 => \"two\"}) (28)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {1 => "one", 2 => "two"}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Map {1 => \"one\", 2 => \"two\"}).not.toEqual(Map {2 => \"two\", 1 => \"one\"}) (29)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {2 => "two", 1 => "one"}</>
+Received:     <r>Map {1 => "one", 2 => "two"}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Map {[1] => \"one\", [2] => \"two\", [3] => \"three\", [3] => \"four\"}).not.toEqual(Map {[3] => \"three\", [3] => \"four\", [2] => \"two\", [1] => \"one\"}) (30)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {[3] => "three", [3] => "four", [2] => "two", [1] => "one"}</>
+Received:     <r>Map {[1] => "one", [2] => "two", [3] => "three", [3] => "four"}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Map {[1] => Map {[1] => \"one\"}, [2] => Map {[2] => \"two\"}}).not.toEqual(Map {[2] => Map {[2] => \"two\"}, [1] => Map {[1] => \"one\"}}) (31)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {[2] => Map {[2] => "two"}, [1] => Map {[1] => "one"}}</>
+Received:     <r>Map {[1] => Map {[1] => "one"}, [2] => Map {[2] => "two"}}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Map {[1] => \"one\", [2] => \"two\"}).not.toEqual(Map {[2] => \"two\", [1] => \"one\"}) (32)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {[2] => "two", [1] => "one"}</>
+Received:     <r>Map {[1] => "one", [2] => "two"}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Map {{\"a\": 1} => \"one\", {\"b\": 2} => \"two\"}).not.toEqual(Map {{\"b\": 2} => \"two\", {\"a\": 1} => \"one\"}) (33)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {{"b": 2} => "two", {"a": 1} => "one"}</>
+Received:     <r>Map {{"a": 1} => "one", {"b": 2} => "two"}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Map {1 => [\"one\"], 2 => [\"two\"]}).not.toEqual(Map {2 => [\"two\"], 1 => [\"one\"]}) (34)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Map {2 => ["two"], 1 => ["one"]}</>
+Received:     <r>Map {1 => ["one"], 2 => ["two"]}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Map {}).not.toEqual(Immutable.Map {}) (35)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Map {}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Map {1: \"one\", 2: \"two\"}).not.toEqual(Immutable.Map {1: \"one\", 2: \"two\"}) (36)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Map {1: "one", 2: "two"}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Map {1: \"one\", 2: \"two\"}).not.toEqual(Immutable.Map {2: \"two\", 1: \"one\"}) (37)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Map {2: "two", 1: "one"}</>
+Received:     <r>Immutable.Map {1: "one", 2: "two"}</>`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.OrderedMap {1: \"one\", 2: \"two\"}).not.toEqual(Immutable.OrderedMap {1: \"one\", 2: \"two\"}) (38)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.OrderedMap {1: "one", 2: "two"}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect(Immutable.Map {\"1\": Immutable.Map {\"2\": {\"a\": 99}}}).not.toEqual(Immutable.Map {\"1\": Immutable.Map {\"2\": {\"a\": 99}}}) (39)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Immutable.Map {"1": Immutable.Map {"2": {"a": 99}}}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect([97, 98, 99]).not.toEqual([97, 98, 99]) (40)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[97, 98, 99]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": 2}).not.toEqual(ObjectContaining {\"a\": 1}) (41)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>ObjectContaining {"a": 1}</>
+Received:     <r>{"a": 1, "b": 2}</>`;
+
+module.exports[".toEqual() {pass: true} expect([1, 2, 3]).not.toEqual(ArrayContaining [2, 3]) (42)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>ArrayContaining [2, 3]</>
+Received:     <r>[1, 2, 3]</>`;
+
+module.exports[".toEqual() {pass: true} expect(\"abcd\").not.toEqual(StringContaining \"bc\") (43)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>StringContaining "bc"</>
+Received:     <r>"abcd"</>`;
+
+module.exports[".toEqual() {pass: true} expect(\"abcd\").not.toEqual(StringMatching /bc/) (44)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>StringMatching /bc/</>
+Received:     <r>"abcd"</>`;
+
+module.exports[".toEqual() {pass: true} expect(true).not.toEqual(Anything) (45)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Anything</>
+Received:     <r>true</>`;
+
+module.exports[".toEqual() {pass: true} expect([Function anonymous]).not.toEqual(Any<Function>) (46)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>Any<Function></>
+Received:     <r>[Function anonymous]</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": [Function b], \"c\": true}).not.toEqual({\"a\": 1, \"b\": Any<Function>, \"c\": Anything}) (47)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1, "b": Any<Function>, "c": Anything}</>
+Received:     <r>{"a": 1, "b": [Function b], "c": true}</>`;
+
+module.exports[".toEqual() {pass: true} expect(\"Alice\").not.toEqual({\"asymmetricMatch\": [Function asymmetricMatch]}) (48)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"asymmetricMatch": [Function asymmetricMatch]}</>
+Received:     <r>"Alice"</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"nodeName\": \"div\", \"nodeType\": 1}).not.toEqual({\"nodeName\": \"div\", \"nodeType\": 1}) (49)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"nodeName": "div", "nodeType": 1}</>
+`;
+
+module.exports[".toEqual() {pass: true} expect({Symbol(foo): 1, Symbol(bar): 2}).not.toEqual({Symbol(foo): Any<Number>, Symbol(bar): 2}) (50)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{Symbol(foo): Any<Number>, Symbol(bar): 2}</>
+Received:     <r>{Symbol(foo): 1, Symbol(bar): 2}</>`;
+
+module.exports[".toEqual() {pass: true} expect([, , 1, ]).not.toEqual([, , 1, ]) (51)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[, , 1, ]</>
+`;
+
+module.exports[".toEqual() {pass: true} expect([, , 1, , ]).not.toEqual([, , 1, undefined, ]) (52)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[, , 1, undefined, ]</>
+Received:     <r>[, , 1, , ]</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": [Function b]}).not.toEqual({\"a\": 1, \"b\": optionalFn<>}) (53)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1, "b": optionalFn<>}</>
+Received:     <r>{"a": 1, "b": [Function b]}</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": optionalFn<>}).not.toEqual({\"a\": 1, \"b\": [Function b]}) (54)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1, "b": [Function b]}</>
+Received:     <r>{"a": 1, "b": optionalFn<>}</>`;
+
+module.exports[".toEqual() {pass: true} expect([1, [Function anonymous]]).not.toEqual([1, optionalFn<>]) (55)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1, optionalFn<>]</>
+Received:     <r>[1, [Function anonymous]]</>`;
+
+module.exports[".toEqual() {pass: true} expect([1, optionalFn<>]).not.toEqual([1, [Function anonymous]]) (56)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1, [Function anonymous]]</>
+Received:     <r>[1, optionalFn<>]</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": undefined}).not.toEqual({\"a\": 1, \"b\": optionalFn<>}) (57)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1, "b": optionalFn<>}</>
+Received:     <r>{"a": 1, "b": undefined}</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": optionalFn<>}).not.toEqual({\"a\": 1, \"b\": undefined}) (58)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1, "b": undefined}</>
+Received:     <r>{"a": 1, "b": optionalFn<>}</>`;
+
+module.exports[".toEqual() {pass: true} expect([1, undefined]).not.toEqual([1, optionalFn<>]) (59)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1, optionalFn<>]</>
+Received:     <r>[1, undefined]</>`;
+
+module.exports[".toEqual() {pass: true} expect([1, optionalFn<>]).not.toEqual([1, undefined]) (60)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1, undefined]</>
+Received:     <r>[1, optionalFn<>]</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1}).not.toEqual({\"a\": 1, \"b\": optionalFn<>}) (61)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1, "b": optionalFn<>}</>
+Received:     <r>{"a": 1}</>`;
+
+module.exports[".toEqual() {pass: true} expect({\"a\": 1, \"b\": optionalFn<>}).not.toEqual({\"a\": 1}) (62)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>{"a": 1}</>
+Received:     <r>{"a": 1, "b": optionalFn<>}</>`;
+
+module.exports[".toEqual() {pass: true} expect([1]).not.toEqual([1, optionalFn<>]) (63)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1, optionalFn<>]</>
+Received:     <r>[1]</>`;
+
+module.exports[".toEqual() {pass: true} expect([1, optionalFn<>]).not.toEqual([1]) (64)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected: not <g>[1]</>
+Received:     <r>[1, optionalFn<>]</>`;
+
+module.exports[".toBeInstanceOf() passing Map {} and [Function Map] (0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Map</>
+`;
+
+module.exports[".toBeInstanceOf() passing [] and [Function Array] (1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Array</>
+`;
+
+module.exports[".toBeInstanceOf() passing {} and [Function A] (2)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>A</>
+`;
+
+module.exports[".toBeInstanceOf() passing {} and [Function B] (3)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>B</>
+Received constructor:     <r>C</> extends <g>B</>
+`;
+
+module.exports[".toBeInstanceOf() passing {} and [Function B] (4)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>B</>
+Received constructor:     <r>E</> extends … extends <g>B</>
+`;
+
+module.exports[".toBeInstanceOf() passing {} and [Function anonymous] (5)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor name is an empty string
+Received constructor: <r>SubHasNameProp</>
+`;
+
+module.exports[".toBeInstanceOf() passing {} and [Function B] (6)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>B</>
+Received constructor name is not a string
+`;
+
+module.exports[".toBeInstanceOf() passing {} and [Function name() {}] (7)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor name is not a string
+`;
+
+module.exports[".toBeInstanceOf() failing \"a\" and [Function String] (0)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>String</>
+
+Received value has no prototype
+Received value: <r>"a"</>`;
+
+module.exports[".toBeInstanceOf() failing 1 and [Function Number] (1)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Number</>
+
+Received value has no prototype
+Received value: <r>1</>`;
+
+module.exports[".toBeInstanceOf() failing true and [Function Boolean] (2)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Boolean</>
+
+Received value has no prototype
+Received value: <r>true</>`;
+
+module.exports[".toBeInstanceOf() failing {} and [Function B] (3)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>B</>
+Received constructor: <r>A</>
+`;
+
+module.exports[".toBeInstanceOf() failing {} and [Function A] (4)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>A</>
+
+Received value has no prototype
+Received value: <r>{}</>`;
+
+module.exports[".toBeInstanceOf() failing undefined and [Function String] (5)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>String</>
+
+Received value has no prototype
+Received value: <r>undefined</>`;
+
+module.exports[".toBeInstanceOf() failing null and [Function String] (6)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>String</>
+
+Received value has no prototype
+Received value: <r>null</>`;
+
+module.exports[".toBeInstanceOf() failing /\\w+/ and [Function anonymous] (7)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor name is an empty string
+Received constructor: <r>RegExp</>
+`;
+
+module.exports[".toBeInstanceOf() failing {} and [Function RegExp] (8)"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>RegExp</>
+Received constructor name is an empty string
+`;
+
+module.exports[".toBeInstanceOf() throws if constructor is not a function"] = `<d>expect(</><r>received</><d>).</>toBeInstanceOf<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a function
+
+Expected has type:  number
+Expected has value: <g>4</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() does not accept arguments"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has value: <g>null</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() does not accept arguments #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has value: <g>null</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '{}' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>{}</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '{}' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>{}</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '[]' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>[]</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '[]' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>[]</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'true' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>true</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'true' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>true</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '1' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>1</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '1' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>1</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '\"a\"' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>"a"</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '\"a\"' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>"a"</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '0.5' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>0.5</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '0.5' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>0.5</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'Map {}' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>Map {}</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'Map {}' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>Map {}</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '[Function anonymous]' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>[Function anonymous]</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '[Function anonymous]' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>[Function anonymous]</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'Infinity' is truthy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeTruthy<d>()</>
+
+Received: <r>Infinity</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'Infinity' is truthy #1"] = `<d>expect(</><r>received</><d>).</>toBeFalsy<d>()</>
+
+Received: <r>Infinity</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'false' is falsy"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+Received: <r>false</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'false' is falsy #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+Received: <r>false</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'null' is falsy"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+Received: <r>null</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'null' is falsy #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+Received: <r>null</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'NaN' is falsy"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+Received: <r>NaN</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'NaN' is falsy #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+Received: <r>NaN</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '0' is falsy"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+Received: <r>0</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '0' is falsy #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+Received: <r>0</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '\"\"' is falsy"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+Received: <r>""</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() '\"\"' is falsy #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+Received: <r>""</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'undefined' is falsy"] = `<d>expect(</><r>received</><d>).</>toBeTruthy<d>()</>
+
+Received: <r>undefined</>`;
+
+module.exports[".toBeTruthy(), .toBeFalsy() 'undefined' is falsy #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeFalsy<d>()</>
+
+Received: <r>undefined</>`;
+
+module.exports[".toBeNaN() {pass: true} expect(NaN).toBeNaN()"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeNaN<d>()</>
+
+Received: <r>NaN</>`;
+
+module.exports[".toBeNaN() {pass: true} expect(NaN).toBeNaN() #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeNaN<d>()</>
+
+Received: <r>NaN</>`;
+
+module.exports[".toBeNaN() {pass: true} expect(NaN).toBeNaN() #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeNaN<d>()</>
+
+Received: <r>NaN</>`;
+
+module.exports[".toBeNaN() {pass: true} expect(NaN).toBeNaN() #3"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeNaN<d>()</>
+
+Received: <r>NaN</>`;
+
+module.exports[".toBeNaN() throws"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>1</>`;
+
+module.exports[".toBeNaN() throws #1"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>""</>`;
+
+module.exports[".toBeNaN() throws #2"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>null</>`;
+
+module.exports[".toBeNaN() throws #3"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>undefined</>`;
+
+module.exports[".toBeNaN() throws #4"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>{}</>`;
+
+module.exports[".toBeNaN() throws #5"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>[]</>`;
+
+module.exports[".toBeNaN() throws #6"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>0.2</>`;
+
+module.exports[".toBeNaN() throws #7"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>0</>`;
+
+module.exports[".toBeNaN() throws #8"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>Infinity</>`;
+
+module.exports[".toBeNaN() throws #9"] = `<d>expect(</><r>received</><d>).</>toBeNaN<d>()</>
+
+Received: <r>-Infinity</>`;
+
+module.exports[".toBeNull() fails for '{}'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>{}</>`;
+
+module.exports[".toBeNull() fails for '[]'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>[]</>`;
+
+module.exports[".toBeNull() fails for 'true'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>true</>`;
+
+module.exports[".toBeNull() fails for '1'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>1</>`;
+
+module.exports[".toBeNull() fails for '\"a\"'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>"a"</>`;
+
+module.exports[".toBeNull() fails for '0.5'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>0.5</>`;
+
+module.exports[".toBeNull() fails for 'Map {}'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>Map {}</>`;
+
+module.exports[".toBeNull() fails for '[Function anonymous]'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>[Function anonymous]</>`;
+
+module.exports[".toBeNull() fails for 'Infinity'"] = `<d>expect(</><r>received</><d>).</>toBeNull<d>()</>
+
+Received: <r>Infinity</>`;
+
+module.exports[".toBeNull() fails for null with .not"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeNull<d>()</>
+
+Received: <r>null</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '{}' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>{}</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '{}' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>{}</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '[]' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>[]</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '[]' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>[]</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() 'true' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>true</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() 'true' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>true</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '1' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>1</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '1' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>1</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '\"a\"' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>"a"</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '\"a\"' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>"a"</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '0.5' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>0.5</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '0.5' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>0.5</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() 'Map {}' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>Map {}</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() 'Map {}' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>Map {}</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '[Function anonymous]' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>[Function anonymous]</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() '[Function anonymous]' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>[Function anonymous]</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() 'Infinity' is defined"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeDefined<d>()</>
+
+Received: <r>Infinity</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() 'Infinity' is defined #1"] = `<d>expect(</><r>received</><d>).</>toBeUndefined<d>()</>
+
+Received: <r>Infinity</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() undefined is undefined"] = `<d>expect(</><r>received</><d>).</>toBeDefined<d>()</>
+
+Received: <r>undefined</>`;
+
+module.exports[".toBeDefined(), .toBeUndefined() undefined is undefined #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeUndefined<d>()</>
+
+Received: <r>undefined</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>2</>
+Received:   <r>1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>2</>
+Received:       <r>1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>1</>
+Received:       <r>2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>1</>
+Received:   <r>2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>2</>
+Received:    <r>1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>2</>
+Received:        <r>1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>1</>
+Received:        <r>2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [1, 2] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>1</>
+Received:    <r>2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>Infinity</>
+Received:   <r>-Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>Infinity</>
+Received:       <r>-Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>-Infinity</>
+Received:       <r>Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>-Infinity</>
+Received:   <r>Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>Infinity</>
+Received:    <r>-Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>Infinity</>
+Received:        <r>-Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>-Infinity</>
+Received:        <r>Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [-Infinity, Infinity] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>-Infinity</>
+Received:    <r>Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>1.7976931348623157e+308</>
+Received:   <r>5e-324</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>1.7976931348623157e+308</>
+Received:       <r>5e-324</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>5e-324</>
+Received:       <r>1.7976931348623157e+308</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>5e-324</>
+Received:   <r>1.7976931348623157e+308</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>1.7976931348623157e+308</>
+Received:    <r>5e-324</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>1.7976931348623157e+308</>
+Received:        <r>5e-324</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>5e-324</>
+Received:        <r>1.7976931348623157e+308</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [5e-324, 1.7976931348623157e+308] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>5e-324</>
+Received:    <r>1.7976931348623157e+308</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>34</>
+Received:   <r>17</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>34</>
+Received:       <r>17</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>17</>
+Received:       <r>34</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>17</>
+Received:   <r>34</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>34</>
+Received:    <r>17</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>34</>
+Received:        <r>17</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>17</>
+Received:        <r>34</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [17, 34] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>17</>
+Received:    <r>34</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>7</>
+Received:   <r>3</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>7</>
+Received:       <r>3</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>3</>
+Received:       <r>7</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>3</>
+Received:   <r>7</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>7</>
+Received:    <r>3</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>7</>
+Received:        <r>3</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>3</>
+Received:        <r>7</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [3, 7] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>3</>
+Received:    <r>7</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>18</>
+Received:   <r>9</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>18</>
+Received:       <r>9</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>9</>
+Received:       <r>18</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>9</>
+Received:   <r>18</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>18</>
+Received:    <r>9</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>18</>
+Received:        <r>9</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>9</>
+Received:        <r>18</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [9, 18] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>9</>
+Received:    <r>18</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2]"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: > <g>0.2</>
+Received:   <r>0.1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: not < <g>0.2</>
+Received:       <r>0.1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThan<d>(</><g>expected</><d>)</>
+
+Expected: not > <g>0.1</>
+Received:       <r>0.2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #3"] = `<d>expect(</><r>received</><d>).</>toBeLessThan<d>(</><g>expected</><d>)</>
+
+Expected: < <g>0.1</>
+Received:   <r>0.2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #4"] = `<d>expect(</><r>received</><d>).</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: >= <g>0.2</>
+Received:    <r>0.1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>0.2</>
+Received:        <r>0.1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #6"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>0.1</>
+Received:        <r>0.2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() throws: [0.1, 0.2] #7"] = `<d>expect(</><r>received</><d>).</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: <= <g>0.1</>
+Received:    <r>0.2</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1, 1]"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>1</>
+Received:        <r>1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1, 1] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>1</>
+Received:        <r>1</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [5e-324, 5e-324]"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>5e-324</>
+Received:        <r>5e-324</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [5e-324, 5e-324] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>5e-324</>
+Received:        <r>5e-324</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1.7976931348623157e+308, 1.7976931348623157e+308]"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>1.7976931348623157e+308</>
+Received:        <r>1.7976931348623157e+308</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [1.7976931348623157e+308, 1.7976931348623157e+308] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>1.7976931348623157e+308</>
+Received:        <r>1.7976931348623157e+308</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [Infinity, Infinity]"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>Infinity</>
+Received:        <r>Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [Infinity, Infinity] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>Infinity</>
+Received:        <r>Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [-Infinity, -Infinity]"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeGreaterThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not >= <g>-Infinity</>
+Received:        <r>-Infinity</>`;
+
+module.exports[".toBeGreaterThan(), .toBeLessThan(), .toBeGreaterThanOrEqual(), .toBeLessThanOrEqual() equal numbers: [-Infinity, -Infinity] #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeLessThanOrEqual<d>(</><g>expected</><d>)</>
+
+Expected: not <= <g>-Infinity</>
+Received:        <r>-Infinity</>`;
+
+module.exports[".toContain(), .toContainEqual() '[1, 2, 3, 4]' contains '1'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: not <g>1</>
+Received array:     <r>[<i>1</i>, 2, 3, 4]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[\"a\", \"b\", \"c\", \"d\"]' contains '\"a\"'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: not <g>"a"</>
+Received array:     <r>[<i>"a"</i>, "b", "c", "d"]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[undefined, null]' contains 'null'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: not <g>null</>
+Received array:     <r>[undefined, <i>null</i>]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[undefined, null]' contains 'undefined'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: not <g>undefined</>
+Received array:     <r>[<i>undefined</i>, null]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[Symbol(a)]' contains 'Symbol(a)'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: not <g>Symbol(a)</>
+Received array:     <r>[<i>Symbol(a)</i>]</>`;
+
+module.exports[".toContain(), .toContainEqual() '\"abcdef\"' contains '\"abc\"'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected substring: not <g>"abc"</>
+Received string:        <r>"<i>abc</i>def"</>`;
+
+module.exports[".toContain(), .toContainEqual() '\"11112111\"' contains '\"2\"'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected substring: not <g>"2"</>
+Received string:        <r>"1111<i>2</i>111"</>`;
+
+module.exports[".toContain(), .toContainEqual() 'Set {\"abc\", \"def\"}' contains '\"abc\"'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: not <g>"abc"</>
+Received set:       <r>Set {"abc", "def"}</>`;
+
+module.exports[".toContain(), .toContainEqual() '[0, 1]' contains '1'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value:  not <g>1</>
+Received object:     <r>[0, 1]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[1, 2, 3]' does not contain '4'"] = `<d>expect(</><r>received</><d>).</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: <g>4</>
+Received array: <r>[1, 2, 3]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[null, undefined]' does not contain '1'"] = `<d>expect(</><r>received</><d>).</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: <g>1</>
+Received array: <r>[null, undefined]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[{}, []]' does not contain '[]'"] = `<d>expect(</><r>received</><d>).</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: <g>[]</>
+Received array: <r>[{}, []]</>
+
+<d>Looks like you wanted to test for object/array equality with the stricter \`toContain\` matcher. You probably need to use \`toContainEqual\` instead.</>`;
+
+module.exports[".toContain(), .toContainEqual() '[{}, []]' does not contain '{}'"] = `<d>expect(</><r>received</><d>).</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+Expected value: <g>{}</>
+Received array: <r>[{}, []]</>
+
+<d>Looks like you wanted to test for object/array equality with the stricter \`toContain\` matcher. You probably need to use \`toContainEqual\` instead.</>`;
+
+module.exports[".toContain(), .toContainEqual() error cases"] = `<d>expect(</><r>received</><d>).</>toContain<d>(</><g>expected</><d>) // indexOf</>
+
+<b>Matcher error</>: <r>received</> value must not be null nor undefined
+
+Received has value: <r>null</>`;
+
+module.exports[".toContain(), .toContainEqual() error cases #1"] = `<d>expect(</><r>-0</><d>).</>toContain<d>(</><g>0</><d>) // indexOf</>
+
+<b>Matcher error</>: <g>expected</> value must be a string if <r>received</> value is a string
+
+Expected has type:  number
+Expected has value: <g>-0</>
+Received has type:  string
+Received has value: <r>"-0"</>`;
+
+module.exports[".toContain(), .toContainEqual() error cases #2"] = `<d>expect(</><r>null</><d>).</>toContain<d>(</><g>null</><d>) // indexOf</>
+
+<b>Matcher error</>: <g>expected</> value must be a string if <r>received</> value is a string
+
+Expected has value: <g>null</>
+Received has type:  string
+Received has value: <r>"null"</>`;
+
+module.exports[".toContain(), .toContainEqual() error cases #3"] = `<d>expect(</><r>undefined</><d>).</>toContain<d>(</><g>undefined</><d>) // indexOf</>
+
+<b>Matcher error</>: <g>expected</> value must be a string if <r>received</> value is a string
+
+Expected has value: <g>undefined</>
+Received has type:  string
+Received has value: <r>"undefined"</>`;
+
+module.exports[".toContain(), .toContainEqual() error cases #4"] = `<d>expect(</><r>false</><d>).</>toContain<d>(</><g>false</><d>) // indexOf</>
+
+<b>Matcher error</>: <g>expected</> value must be a string if <r>received</> value is a string
+
+Expected has type:  boolean
+Expected has value: <g>false</>
+Received has type:  string
+Received has value: <r>"false"</>`;
+
+module.exports[".toContain(), .toContainEqual() '[1, 2, 3, 4]' contains a value equal to '1'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>1</>
+Received array:     <r>[<i>1</i>, 2, 3, 4]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[\"a\", \"b\", \"c\", \"d\"]' contains a value equal to '\"a\"'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>"a"</>
+Received array:     <r>[<i>"a"</i>, "b", "c", "d"]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[undefined, null]' contains a value equal to 'null'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>null</>
+Received array:     <r>[undefined, <i>null</i>]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[undefined, null]' contains a value equal to 'undefined'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>undefined</>
+Received array:     <r>[<i>undefined</i>, null]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[Symbol(a)]' contains a value equal to 'Symbol(a)'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>Symbol(a)</>
+Received array:     <r>[<i>Symbol(a)</i>]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[{\"a\": \"b\"}, {\"a\": \"c\"}]' contains a value equal to '{\"a\": \"b\"}'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>{"a": "b"}</>
+Received array:     <r>[<i>{"a": "b"}</i>, {"a": "c"}]</>`;
+
+module.exports[".toContain(), .toContainEqual() 'Set {1, 2, 3, 4}' contains a value equal to '1'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: not <g>1</>
+Received set:       <r>Set {1, 2, 3, 4}</>`;
+
+module.exports[".toContain(), .toContainEqual() '[0, 1]' contains a value equal to '1'"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value:  not <g>1</>
+Received object:     <r>[0, 1]</>`;
+
+module.exports[".toContain(), .toContainEqual() '[{\"a\": \"b\"}, {\"a\": \"c\"}]' does not contain a value equal to'{\"a\": \"d\"}'"] = `<d>expect(</><r>received</><d>).</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+Expected value: <g>{"a": "d"}</>
+Received array: <r>[{"a": "b"}, {"a": "c"}]</>`;
+
+module.exports[".toContain(), .toContainEqual() error cases for toContainEqual"] = `<d>expect(</><r>received</><d>).</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
+
+<b>Matcher error</>: <r>received</> value must not be null nor undefined
+
+Received has value: <r>null</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(0).toBeCloseTo(0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>0</>
+`;
+
+module.exports[".toBeCloseTo {pass: true} expect(0).toBeCloseTo(0.001)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>0.001</>
+Received:     <r>0</>
+
+Expected precision:        2
+Expected difference: not < <g>0.005</>
+Received difference:       <r>0.001</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(1.23).toBeCloseTo(1.229)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>1.229</>
+Received:     <r>1.23</>
+
+Expected precision:        2
+Expected difference: not < <g>0.005</>
+Received difference:       <r>0.0009999999999998899</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(1.23).toBeCloseTo(1.226)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>1.226</>
+Received:     <r>1.23</>
+
+Expected precision:        2
+Expected difference: not < <g>0.005</>
+Received difference:       <r>0.0040000000000000036</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(1.23).toBeCloseTo(1.225)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>1.225</>
+Received:     <r>1.23</>
+
+Expected precision:        2
+Expected difference: not < <g>0.005</>
+Received difference:       <r>0.004999999999999893</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(1.23).toBeCloseTo(1.234)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>1.234</>
+Received:     <r>1.23</>
+
+Expected precision:        2
+Expected difference: not < <g>0.005</>
+Received difference:       <r>0.0040000000000000036</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(Infinity).toBeCloseTo(Infinity)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Infinity</>
+`;
+
+module.exports[".toBeCloseTo {pass: true} expect(-Infinity).toBeCloseTo(-Infinity)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: not <g>-Infinity</>
+`;
+
+module.exports[".toBeCloseTo {pass: false} expect(0).toBeCloseTo(0.01)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: <g>0.01</>
+Received: <r>0</>
+
+Expected precision:    2
+Expected difference: < <g>0.005</>
+Received difference:   <r>0.01</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(1).toBeCloseTo(1.23)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: <g>1.23</>
+Received: <r>1</>
+
+Expected precision:    2
+Expected difference: < <g>0.005</>
+Received difference:   <r>0.22999999999999998</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(1.23).toBeCloseTo(1.2249999)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: <g>1.2249999</>
+Received: <r>1.23</>
+
+Expected precision:    2
+Expected difference: < <g>0.005</>
+Received difference:   <r>0.005000099999999952</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(Infinity).toBeCloseTo(-Infinity)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: <g>-Infinity</>
+Received: <r>Infinity</>
+
+Expected precision:    2
+Expected difference: < <g>0.005</>
+Received difference:   <r>Infinity</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(Infinity).toBeCloseTo(1.23)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: <g>1.23</>
+Received: <r>Infinity</>
+
+Expected precision:    2
+Expected difference: < <g>0.005</>
+Received difference:   <r>Infinity</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(-Infinity).toBeCloseTo(-1.23)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+Expected: <g>-1.23</>
+Received: <r>-Infinity</>
+
+Expected precision:    2
+Expected difference: < <g>0.005</>
+Received difference:   <r>Infinity</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(3.141592e-7).toBeCloseTo(3e-7, 8)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+Expected: <g>3e-7</>
+Received: <r>3.141592e-7</>
+
+Expected precision:    8
+Expected difference: < <g>5e-9</>
+Received difference:   <r>1.4159200000000025e-8</>`;
+
+module.exports[".toBeCloseTo {pass: false} expect(56789).toBeCloseTo(51234, -4)"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+Expected: <g>51234</>
+Received: <r>56789</>
+
+Expected precision:    -4
+Expected difference: < <g>5000</>
+Received difference:   <r>5555</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(0).toBeCloseTo(0.1, 0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+Expected: not <g>0.1</>
+Received:     <r>0</>
+
+Expected precision:        0
+Expected difference: not < <g>0.5</>
+Received difference:       <r>0.1</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(0).toBeCloseTo(0.0001, 3)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+Expected: not <g>0.0001</>
+Received:     <r>0</>
+
+Expected precision:        3
+Expected difference: not < <g>0.0005</>
+Received difference:       <r>0.0001</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(0).toBeCloseTo(0.000004, 5)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+Expected: not <g>0.000004</>
+Received:     <r>0</>
+
+Expected precision:        5
+Expected difference: not < <g>0.000005</>
+Received difference:       <r>0.000004</>`;
+
+module.exports[".toBeCloseTo {pass: true} expect(2.0000002).toBeCloseTo(2, 5)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+Expected: not <g>2</>
+Received:     <r>2.0000002</>
+
+Expected precision:        5
+Expected difference: not < <g>5e-6</>
+Received difference:       <r>2.0000000011677344e-7</>`;
+
+module.exports[".toBeCloseTo throws: Matcher error promise empty isNot false received"] = `<d>expect(</><r>received</><d>).</>toBeCloseTo<d>(</><g>expected</><d>, </>precision<d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a number
+
+Received has type:  string
+Received has value: <r>""</>`;
+
+module.exports[".toBeCloseTo throws: Matcher error promise empty isNot true expected"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCloseTo<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a number
+
+Expected has value: <g>undefined</>`;
+
+module.exports[".toBeCloseTo throws: Matcher error promise rejects isNot false expected"] = `callback is not a function`;
+
+module.exports[".toBeCloseTo throws: Matcher error promise rejects isNot true received"] = `callback is not a function`;
+
+module.exports[".toBeCloseTo throws: Matcher error promise resolves isNot false received"] = `callback is not a function`;
+
+module.exports[".toBeCloseTo throws: Matcher error promise resolves isNot true expected"] = `callback is not a function`;
+
+module.exports[".toMatch() {pass: true} expect(foo).toMatch(foo)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatch<d>(</><g>expected</><d>)</>
+
+Expected substring: not <g>"foo"</>
+Received string:        <r>"<i>foo</i>"</>`;
+
+module.exports[".toMatch() {pass: true} expect(Foo bar).toMatch(/^foo/i)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatch<d>(</><g>expected</><d>)</>
+
+Expected pattern: not <g>/^foo/i</>
+Received string:      <r>"<i>Foo</i> bar"</>`;
+
+module.exports[".toMatch() throws: [bar, foo]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"foo"</>
+Received string:    <r>"bar"</>`;
+
+module.exports[".toMatch() throws: [bar, /foo/]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/foo/</>
+Received string:  <r>"bar"</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [1, \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has type:  number
+Received has value: <r>1</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [{}, \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has type:  object
+Received has value: <r>{}</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [[], \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has type:  array
+Received has value: <r>[]</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [true, \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has type:  boolean
+Received has value: <r>true</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [/foo/i, \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has type:  regexp
+Received has value: <r>/foo/i</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [[Function anonymous], \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has type:  function
+Received has value: <r>[Function anonymous]</>`;
+
+module.exports[".toMatch() throws if non String actual value passed: [undefined, \"foo\"]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a string
+
+Received has value: <r>undefined</>`;
+
+module.exports[".toMatch() throws if non String/RegExp expected value passed: [\"foo\", 1]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression
+
+Expected has type:  number
+Expected has value: <g>1</>`;
+
+module.exports[".toMatch() throws if non String/RegExp expected value passed: [\"foo\", {}]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports[".toMatch() throws if non String/RegExp expected value passed: [\"foo\", []]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports[".toMatch() throws if non String/RegExp expected value passed: [\"foo\", true]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports[".toMatch() throws if non String/RegExp expected value passed: [\"foo\", [Function anonymous]]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports[".toMatch() throws if non String/RegExp expected value passed: [\"foo\", undefined]"] = `<d>expect(</><r>received</><d>).</>toMatch<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression
+
+Expected has value: <g>undefined</>`;
+
+module.exports[".toHaveLength {pass: true} expect([1, 2]).toHaveLength(2)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: not <g>2</>
+Received array:      <r>[1, 2]</>`;
+
+module.exports[".toHaveLength {pass: true} expect([]).toHaveLength(0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: not <g>0</>
+Received array:      <r>[]</>`;
+
+module.exports[".toHaveLength {pass: true} expect([\"a\", \"b\"]).toHaveLength(2)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: not <g>2</>
+Received array:      <r>["a", "b"]</>`;
+
+module.exports[".toHaveLength {pass: true} expect(\"abc\").toHaveLength(3)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: not <g>3</>
+Received string:     <r>"abc"</>`;
+
+module.exports[".toHaveLength {pass: true} expect(\"\").toHaveLength(0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: not <g>0</>
+Received string:     <r>""</>`;
+
+module.exports[".toHaveLength {pass: true} expect([Function anonymous]).toHaveLength(0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length:   not <g>0</>
+Received function:     <r>[Function anonymous]</>`;
+
+module.exports[".toHaveLength {pass: false} expect([1, 2]).toHaveLength(3)"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: <g>3</>
+Received length: <r>2</>
+Received array:  <r>[1, 2]</>`;
+
+module.exports[".toHaveLength {pass: false} expect([]).toHaveLength(1)"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: <g>1</>
+Received length: <r>0</>
+Received array:  <r>[]</>`;
+
+module.exports[".toHaveLength {pass: false} expect([\"a\", \"b\"]).toHaveLength(99)"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: <g>99</>
+Received length: <r>2</>
+Received array:  <r>["a", "b"]</>`;
+
+module.exports[".toHaveLength {pass: false} expect(\"abc\").toHaveLength(66)"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: <g>66</>
+Received length: <r>3</>
+Received string: <r>"abc"</>`;
+
+module.exports[".toHaveLength {pass: false} expect(\"\").toHaveLength(1)"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+Expected length: <g>1</>
+Received length: <r>0</>
+Received string: <r>""</>`;
+
+module.exports[".toHaveLength error cases"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must have a length property whose value must be a number
+
+Received has type:  object
+Received has value: <r>{"a": 9}</>`;
+
+module.exports[".toHaveLength error cases #1"] = `<d>expect(</><r>received</><d>).</>toHaveLength<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must have a length property whose value must be a number
+
+Received has type:  number
+Received has value: <r>0</>`;
+
+module.exports[".toHaveLength error cases #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must have a length property whose value must be a number
+
+Received has value: <r>undefined</>`;
+
+module.exports[".toHaveLength matcher error expected length not number"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveLength<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"3"</>`;
+
+module.exports[".toHaveLength matcher error expected length number Infinity"] = `callback is not a function`;
+
+module.exports[".toHaveLength matcher error expected length number NaN"] = `callback is not a function`;
+
+module.exports[".toHaveLength matcher error expected length number float"] = `callback is not a function`;
+
+module.exports[".toHaveLength matcher error expected length number negative integer"] = `callback is not a function`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a.b.c.d', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a,b,c,d', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["a", "b", "c", "d"]</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a.b.c.d\": 1}).toHaveProperty('a.b.c.d', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["a.b.c.d"]</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": [1, 2, 3]}}).toHaveProperty('a,b,1', 2)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["a", "b", 1]</>
+
+Expected value: not <g>2</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": [1, 2, 3]}}).toHaveProperty('a,b,1', Any<Number>)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["a", "b", 1]</>
+
+Expected value: not <g>Any<Number></>
+Received value:     <r>2</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": 0}).toHaveProperty('a', 0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a"</>
+
+Expected value: not <g>0</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": undefined}}).toHaveProperty('a.b', undefined)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b"</>
+
+Expected value: not <g>undefined</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": {\"c\": 5}}}).toHaveProperty('a.b', {\"c\": 5})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b"</>
+
+Expected value: not <g>{"c": 5}</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": [{\"c\": [{\"d\": 1}]}]}}).toHaveProperty('a.b[0].c[0].d', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b[0].c[0].d"</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": [{\"c\": {\"d\": [{\"e\": 1}, {\"f\": 2}]}}]}}).toHaveProperty('a.b[0].c.d[1].f', 2)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b[0].c.d[1].f"</>
+
+Expected value: not <g>2</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": [[{\"c\": [{\"d\": 1}]}]]}}).toHaveProperty('a.b[0][0].c[0].d', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b[0][0].c[0].d"</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"property\": 1}).toHaveProperty('property', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"property"</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"val\": undefined}).toHaveProperty('a', undefined)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a"</>
+
+Expected value: not <g>undefined</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"val\": undefined}).toHaveProperty('b', \"b\")"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"b"</>
+
+Expected value: not <g>"b"</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"val\": undefined}).toHaveProperty('setter', undefined)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"setter"</>
+
+Expected value: not <g>undefined</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"val\": true}).toHaveProperty('a', undefined)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a"</>
+
+Expected value: not <g>undefined</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"val\": true}).toHaveProperty('c', \"c\")"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"c"</>
+
+Expected value: not <g>"c"</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"val\": true}).toHaveProperty('val', true)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"val"</>
+
+Expected value: not <g>true</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"nodeName\": \"DIV\"}).toHaveProperty('nodeType', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"nodeType"</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect(\"\").toHaveProperty('length', 0)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"length"</>
+
+Expected value: not <g>0</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect([Function memoized]).toHaveProperty('memo', [])"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"memo"</>
+
+Expected value: not <g>[]</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"\": 1}).toHaveProperty('', 1)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>""</>
+
+Expected value: not <g>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a.b.ttt.d', 1)  (0)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.ttt.d"</>
+Received path: <r>"a.b"</>
+
+Expected value: <g>1</>
+Received value: <r>{"c": {"d": 1}}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a.b.c.d', 2)  (1)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+
+Expected value: <g>2</>
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a.b.c.d\": 1}).toHaveProperty('a.b.c.d', 2)  (2)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+Received path: <r>[]</>
+
+Expected value: <g>2</>
+Received value: <r>{"a.b.c.d": 1}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a.b.c.d\": 1}).toHaveProperty('a.b.c.d', 2)  (3)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["a.b.c.d"]</>
+
+Expected value: <g>2</>
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"children\": [\"\\\"That cartoon\\\"\"], \"props\": null, \"type\": \"p\"}).toHaveProperty('children,0', \"\\\"That cat cartoon\\\"\")  (4)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["children", 0]</>
+
+Expected value: <g>"\\"That <i>cat </i>cartoon\\""</>
+Received value: <r>"\\"That cartoon\\""</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"children\": [\"Roses are red.\nViolets are blue.\nTesting with Jest is good for you.\"], \"props\": null, \"type\": \"pre\"}).toHaveProperty('children,0', \"Roses are red, violets are blue.\nTesting with Jest\nIs good for you.\")  (5)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["children", 0]</>
+
+<g>- Expected value  - 3</>
+<r>+ Received value  + 3</>
+
+<g>- Roses are red<i>, v</i>iolets are blue.</>
+<r>+ Roses are red<i>.</i></>
+<r>+ <i>V</i>iolets are blue.</>
+<g>- Testing with Jest</>
+<g>- <i>I</i>s good for you.</>
+<r>+ Testing with Jest<i> i</i>s good for you.</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a,b,c,d', 2)  (6)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>["a", "b", "c", "d"]</>
+
+Expected value: <g>2</>
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": {}}}}).toHaveProperty('a.b.c.d', 1)  (7)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+Received path: <r>"a.b.c"</>
+
+Expected value: <g>1</>
+Received value: <r>{}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": 1}).toHaveProperty('a.b.c.d', 5)  (8)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+Received path: <r>"a"</>
+
+Expected value: <g>5</>
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({}).toHaveProperty('a', \"test\")  (9)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a"</>
+Received path: <r>[]</>
+
+Expected value: <g>"test"</>
+Received value: <r>{}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": 3}}).toHaveProperty('a.b', undefined)  (10)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b"</>
+
+Expected value: <g>undefined</>
+Received value: <r>3</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(1).toHaveProperty('a.b.c', \"test\")  (11)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c"</>
+Received path: <r>[]</>
+
+Expected value: <g>"test"</>
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(\"abc\").toHaveProperty('a.b.c', {\"a\": 5})  (12)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b.c"</>
+Received path: <r>[]</>
+
+Expected value: <g>{"a": 5}</>
+Received value: <r>"abc"</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": 5}}}).toHaveProperty('a.b', {\"c\": 4})  (13)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b"</>
+
+<g>- Expected value  - 1</>
+<r>+ Received value  + 1</>
+
+<d>  Object {</>
+<g>-   "c": 4,</>
+<r>+   "c": 5,</>
+<d>  }</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"val\": undefined}).toHaveProperty('a', \"a\")  (14)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a"</>
+
+Expected value: <g>"a"</>
+Received value: <r>undefined</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"val\": undefined}).toHaveProperty('b', undefined)  (15)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"b"</>
+
+Expected value: <g>undefined</>
+Received value: <r>"b"</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {}}).toHaveProperty('a.b', undefined)  (16)"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>, </><g>value</><d>)</>
+
+Expected path: <g>"a.b"</>
+Received path: <r>"a"</>
+
+Expected value: <g>undefined</>
+Received value: <r>{}</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a.b.c.d')"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: not <g>"a.b.c.d"</>
+
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": {\"c\": {\"d\": 1}}}}).toHaveProperty('a,b,c,d')"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: not <g>["a", "b", "c", "d"]</>
+
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a.b.c.d\": 1}).toHaveProperty('a.b.c.d')"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: not <g>["a.b.c.d"]</>
+
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": [1, 2, 3]}}).toHaveProperty('a,b,1')"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: not <g>["a", "b", 1]</>
+
+Received value: <r>2</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": 0}).toHaveProperty('a')"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: not <g>"a"</>
+
+Received value: <r>0</>`;
+
+module.exports[".toHaveProperty() {pass: true} expect({\"a\": {\"b\": undefined}}).toHaveProperty('a.b')"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: not <g>"a.b"</>
+
+Received value: <r>undefined</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": {}}}}).toHaveProperty('a.b.c.d')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+Received path: <r>"a.b.c"</>
+
+Received value: <r>{}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": {\"b\": {\"c\": {}}}}).toHaveProperty('.a.b.c')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>".a.b.c"</>
+Received path: <r>[]</>
+
+Received value: <r>{"a": {"b": {"c": {}}}}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"a\": 1}).toHaveProperty('a.b.c.d')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"a.b.c.d"</>
+Received path: <r>"a"</>
+
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({}).toHaveProperty('a')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"a"</>
+Received path: <r>[]</>
+
+Received value: <r>{}</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(1).toHaveProperty('a.b.c')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"a.b.c"</>
+Received path: <r>[]</>
+
+Received value: <r>1</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(\"abc\").toHaveProperty('a.b.c')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"a.b.c"</>
+Received path: <r>[]</>
+
+Received value: <r>"abc"</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(false).toHaveProperty('key')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"key"</>
+Received path: <r>[]</>
+
+Received value: <r>false</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(0).toHaveProperty('key')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"key"</>
+Received path: <r>[]</>
+
+Received value: <r>0</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(\"\").toHaveProperty('key')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"key"</>
+Received path: <r>[]</>
+
+Received value: <r>""</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect(Symbol()).toHaveProperty('key')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"key"</>
+Received path: <r>[]</>
+
+Received value: <r>Symbol()</>`;
+
+module.exports[".toHaveProperty() {pass: false} expect({\"key\": 1}).toHaveProperty('not')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+Expected path: <g>"not"</>
+Received path: <r>[]</>
+
+Received value: <r>{"key": 1}</>`;
+
+module.exports[".toHaveProperty() {error} expect(null).toHaveProperty('a.b')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must not be null nor undefined
+
+Received has value: <r>null</>`;
+
+module.exports[".toHaveProperty() {error} expect(undefined).toHaveProperty('a')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must not be null nor undefined
+
+Received has value: <r>undefined</>`;
+
+module.exports[".toHaveProperty() {error} expect({\"a\": {\"b\": {}}}).toHaveProperty('undefined')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+<b>Matcher error</>: <g>expected</> path must be a string or array
+
+Expected has value: <g>undefined</>`;
+
+module.exports[".toHaveProperty() {error} expect({\"a\": {\"b\": {}}}).toHaveProperty('null')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+<b>Matcher error</>: <g>expected</> path must be a string or array
+
+Expected has value: <g>null</>`;
+
+module.exports[".toHaveProperty() {error} expect({\"a\": {\"b\": {}}}).toHaveProperty('1')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+<b>Matcher error</>: <g>expected</> path must be a string or array
+
+Expected has type:  number
+Expected has value: <g>1</>`;
+
+module.exports[".toHaveProperty() {error} expect({}).toHaveProperty('')"] = `<d>expect(</><r>received</><d>).</>toHaveProperty<d>(</><g>path</><d>)</>
+
+<b>Matcher error</>: <g>expected</> path must not be an empty array
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toMatchObject() circular references simple circular references {pass: true} expect({\"a\": \"hello\", \"ref\": [Circular]}).toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{}</>
+Received:     <r>{"a": "hello", "ref": [Circular]}</>`;
+
+module.exports["toMatchObject() circular references simple circular references {pass: true} expect({\"a\": \"hello\", \"ref\": [Circular]}).toMatchObject({\"a\": \"hello\", \"ref\": [Circular]})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "hello", "ref": [Circular]}</>`;
+
+module.exports["toMatchObject() circular references simple circular references {pass: false} expect({}).toMatchObject({\"a\": \"hello\", \"ref\": [Circular]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 4</>
+<r>+ Received  + 1</>
+
+<g>- Object {</>
+<g>-   "a": "hello",</>
+<g>-   "ref": [Circular],</>
+<g>- }</>
+<r>+ Object {}</>`;
+
+module.exports["toMatchObject() circular references simple circular references {pass: false} expect({\"a\": \"hello\", \"ref\": [Circular]}).toMatchObject({\"a\": \"world\", \"ref\": [Circular]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "world",</>
+<r>+   "a": "hello",</>
+<d>    "ref": [Circular],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() circular references simple circular references {pass: false} expect({\"ref\": \"not a ref\"}).toMatchObject({\"a\": \"hello\", \"ref\": [Circular]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 2</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "hello",</>
+<g>-   "ref": [Circular],</>
+<r>+   "ref": "not a ref",</>
+<d>  }</>`;
+
+module.exports["toMatchObject() circular references transitive circular references {pass: true} expect({\"a\": \"hello\", \"nestedObj\": {\"parentObj\": [Circular]}}).toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{}</>
+Received:     <r>{"a": "hello", "nestedObj": {"parentObj": [Circular]}}</>`;
+
+module.exports["toMatchObject() circular references transitive circular references {pass: true} expect({\"a\": \"hello\", \"nestedObj\": {\"parentObj\": [Circular]}}).toMatchObject({\"a\": \"hello\", \"nestedObj\": {\"parentObj\": [Circular]}})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "hello", "nestedObj": {"parentObj": [Circular]}}</>`;
+
+module.exports["toMatchObject() circular references transitive circular references {pass: false} expect({}).toMatchObject({\"a\": \"hello\", \"nestedObj\": {\"parentObj\": [Circular]}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 6</>
+<r>+ Received  + 1</>
+
+<g>- Object {</>
+<g>-   "a": "hello",</>
+<g>-   "nestedObj": Object {</>
+<g>-     "parentObj": [Circular],</>
+<g>-   },</>
+<g>- }</>
+<r>+ Object {}</>`;
+
+module.exports["toMatchObject() circular references transitive circular references {pass: false} expect({\"a\": \"world\", \"nestedObj\": {\"parentObj\": [Circular]}}).toMatchObject({\"a\": \"hello\", \"nestedObj\": {\"parentObj\": [Circular]}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "hello",</>
+<r>+   "a": "world",</>
+<d>    "nestedObj": Object {</>
+<d>      "parentObj": [Circular],</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports["toMatchObject() circular references transitive circular references {pass: false} expect({\"nestedObj\": {\"parentObj\": \"not the parent ref\"}}).toMatchObject({\"a\": \"hello\", \"nestedObj\": {\"parentObj\": [Circular]}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 2</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "hello",</>
+<d>    "nestedObj": Object {</>
+<g>-     "parentObj": [Circular],</>
+<r>+     "parentObj": "not the parent ref",</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"c\": \"d\"}).toMatchObject({\"a\": \"b\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "b"}</>
+Received:     <r>{"a": "b", "c": "d"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"c\": \"d\"}).toMatchObject({\"a\": \"b\", \"c\": \"d\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "b", "c": "d"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"t\": {\"x\": {\"r\": \"r\"}, \"z\": \"z\"}}).toMatchObject({\"a\": \"b\", \"t\": {\"z\": \"z\"}})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "b", "t": {"z": "z"}}</>
+Received:     <r>{"a": "b", "t": {"x": {"r": "r"}, "z": "z"}}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"t\": {\"x\": {\"r\": \"r\"}, \"z\": \"z\"}}).toMatchObject({\"t\": {\"x\": {\"r\": \"r\"}}})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"t": {"x": {"r": "r"}}}</>
+Received:     <r>{"a": "b", "t": {"x": {"r": "r"}, "z": "z"}}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": [3, 4, 5], \"b\": \"b\"}).toMatchObject({\"a\": [3, 4, 5]})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": [3, 4, 5]}</>
+Received:     <r>{"a": [3, 4, 5], "b": "b"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": [3, 4, 5, \"v\"], \"b\": \"b\"}).toMatchObject({\"a\": [3, 4, 5, \"v\"]})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": [3, 4, 5, "v"]}</>
+Received:     <r>{"a": [3, 4, 5, "v"], "b": "b"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": 1, \"c\": 2}).toMatchObject({\"a\": Any<Number>})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": Any<Number>}</>
+Received:     <r>{"a": 1, "c": 2}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": {\"x\": \"x\", \"y\": \"y\"}}).toMatchObject({\"a\": {\"x\": Any<String>}})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": {"x": Any<String>}}</>
+Received:     <r>{"a": {"x": "x", "y": "y"}}</>`;
+
+module.exports["toMatchObject() {pass: true} expect(Set {1, 2}).toMatchObject(Set {1, 2})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>`;
+
+module.exports["toMatchObject() {pass: true} expect(Set {1, 2}).toMatchObject(Set {2, 1})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Set {2, 1}</>
+Received:     <r>Set {1, 2}</>`;
+
+module.exports["toMatchObject() {pass: true} expect(2015-11-30T00:00:00.000Z).toMatchObject(2015-11-30T00:00:00.000Z)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>2015-11-30T00:00:00.000Z</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": 2015-11-30T00:00:00.000Z, \"b\": \"b\"}).toMatchObject({\"a\": 2015-11-30T00:00:00.000Z})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": 2015-11-30T00:00:00.000Z}</>
+Received:     <r>{"a": 2015-11-30T00:00:00.000Z, "b": "b"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": null, \"b\": \"b\"}).toMatchObject({\"a\": null})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": null}</>
+Received:     <r>{"a": null, "b": "b"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": undefined, \"b\": \"b\"}).toMatchObject({\"a\": undefined})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": undefined}</>
+Received:     <r>{"a": undefined, "b": "b"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": [{\"a\": \"a\", \"b\": \"b\"}]}).toMatchObject({\"a\": [{\"a\": \"a\"}]})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": [{"a": "a"}]}</>
+Received:     <r>{"a": [{"a": "a", "b": "b"}]}</>`;
+
+module.exports["toMatchObject() {pass: true} expect([1, 2]).toMatchObject([1, 2])"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>[1, 2]</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": undefined}).toMatchObject({\"a\": undefined})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": undefined}</>`;
+
+module.exports["toMatchObject() {pass: true} expect([]).toMatchObject([])"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>[]</>`;
+
+module.exports["toMatchObject() {pass: true} expect([Error: foo]).toMatchObject([Error: foo])"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>[Error: foo]</>`;
+
+module.exports["toMatchObject() {pass: true} expect([Error: bar]).toMatchObject({\"message\": \"bar\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"message": "bar"}</>
+Received:     <r>[Error: bar]</>`;
+
+module.exports["toMatchObject() {pass: true} expect({}).toMatchObject({\"a\": undefined, \"b\": \"b\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": undefined, "b": "b"}</>
+Received:     <r>{}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\"}).toMatchObject({\"a\": \"b\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "b"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"c\": \"d\", Symbol(jest): \"jest\"}).toMatchObject({\"a\": \"b\", Symbol(jest): \"jest\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "b", Symbol(jest): "jest"}</>
+Received:     <r>{"a": "b", "c": "d", Symbol(jest): "jest"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"c\": \"d\", Symbol(jest): \"jest\"}).toMatchObject({\"a\": \"b\", \"c\": \"d\", Symbol(jest): \"jest\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": "b", "c": "d", Symbol(jest): "jest"}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({}).toMatchObject({\"a\": undefined, \"b\": \"b\", \"c\": \"c\"})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"a": undefined, "b": "b", "c": "c"}</>
+Received:     <r>{}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({}).toMatchObject({\"d\": 4})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"d": 4}</>
+Received:     <r>{}</>`;
+
+module.exports["toMatchObject() {pass: true} expect({\"a\": \"b\", \"toString\": [Function toString]}).toMatchObject({\"toString\": Any<Function>})"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: not <g>{"toString": Any<Function>}</>
+Received:     <r>{"a": "b", "toString": [Function toString]}</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\", \"c\": \"d\"}).toMatchObject({\"e\": \"b\"})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 2</>
+
+<d>  Object {</>
+<g>-   "e": "b",</>
+<r>+   "a": "b",</>
+<r>+   "c": "d",</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\", \"c\": \"d\"}).toMatchObject({\"a\": \"b!\", \"c\": \"d\"})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "b!",</>
+<r>+   "a": "b",</>
+<d>    "c": "d",</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"a\", \"c\": \"d\"}).toMatchObject({\"a\": Any<Number>})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": Any<Number>,</>
+<r>+   "a": "a",</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\", \"t\": {\"x\": {\"r\": \"r\"}, \"z\": \"z\"}}).toMatchObject({\"a\": \"b\", \"t\": {\"z\": [3]}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<d>    "a": "b",</>
+<d>    "t": Object {</>
+<g>-     "z": Array [</>
+<g>-       3,</>
+<g>-     ],</>
+<r>+     "z": "z",</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\", \"t\": {\"x\": {\"r\": \"r\"}, \"z\": \"z\"}}).toMatchObject({\"t\": {\"l\": {\"r\": \"r\"}}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 2</>
+
+<d>  Object {</>
+<d>    "t": Object {</>
+<g>-     "l": Object {</>
+<r>+     "x": Object {</>
+<d>        "r": "r",</>
+<d>      },</>
+<r>+     "z": "z",</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": [3, 4, 5], \"b\": \"b\"}).toMatchObject({\"a\": [3, 4, 5, 6]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 0</>
+
+<d>  Object {</>
+<d>    "a": Array [</>
+<d>      3,</>
+<d>      4,</>
+<d>      5,</>
+<g>-     6,</>
+<d>    ],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": [3, 4, 5], \"b\": \"b\"}).toMatchObject({\"a\": [3, 4]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 0</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<d>    "a": Array [</>
+<d>      3,</>
+<d>      4,</>
+<r>+     5,</>
+<d>    ],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": [3, 4, \"v\"], \"b\": \"b\"}).toMatchObject({\"a\": [\"v\"]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 0</>
+<r>+ Received  + 2</>
+
+<d>  Object {</>
+<d>    "a": Array [</>
+<r>+     3,</>
+<r>+     4,</>
+<d>      "v",</>
+<d>    ],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": [3, 4, 5], \"b\": \"b\"}).toMatchObject({\"a\": {\"b\": 4}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 5</>
+
+<d>  Object {</>
+<g>-   "a": Object {</>
+<g>-     "b": 4,</>
+<g>-   },</>
+<r>+   "a": Array [</>
+<r>+     3,</>
+<r>+     4,</>
+<r>+     5,</>
+<r>+   ],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": [3, 4, 5], \"b\": \"b\"}).toMatchObject({\"a\": {\"b\": Any<String>}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 5</>
+
+<d>  Object {</>
+<g>-   "a": Object {</>
+<g>-     "b": Any<String>,</>
+<g>-   },</>
+<r>+   "a": Array [</>
+<r>+     3,</>
+<r>+     4,</>
+<r>+     5,</>
+<r>+   ],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect([1, 2]).toMatchObject([1, 3])"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<d>    1,</>
+<g>-   3,</>
+<r>+   2,</>
+<d>  ]</>`;
+
+module.exports["toMatchObject() {pass: false} expect([0]).toMatchObject([-0])"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<g>-   -0,</>
+<r>+   0,</>
+<d>  ]</>`;
+
+module.exports["toMatchObject() {pass: false} expect(Set {1, 2}).toMatchObject(Set {2})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 0</>
+<r>+ Received  + 1</>
+
+<d>  Set {</>
+<r>+   1,</>
+<d>    2,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect(2015-11-30T00:00:00.000Z).toMatchObject(2015-10-10T00:00:00.000Z)"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: <g>2015-10-10T00:00:00.000Z</>
+Received: <r>2015-11-30T00:00:00.000Z</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": 2015-11-30T00:00:00.000Z, \"b\": \"b\"}).toMatchObject({\"a\": 2015-10-10T00:00:00.000Z})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": 2015-10-10T00:00:00.000Z,</>
+<r>+   "a": 2015-11-30T00:00:00.000Z,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": null, \"b\": \"b\"}).toMatchObject({\"a\": \"4\"})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "4",</>
+<r>+   "a": null,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": null, \"b\": \"b\"}).toMatchObject({\"a\": undefined})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": undefined,</>
+<r>+   "a": null,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": undefined}).toMatchObject({\"a\": null})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": null,</>
+<r>+   "a": undefined,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": [{\"a\": \"a\", \"b\": \"b\"}]}).toMatchObject({\"a\": [{\"a\": \"c\"}]})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<d>    "a": Array [</>
+<d>      Object {</>
+<g>-       "a": "c",</>
+<r>+       "a": "a",</>
+<d>      },</>
+<d>    ],</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": 1, \"b\": 1, \"c\": 1, \"d\": {\"e\": {\"f\": 555}}}).toMatchObject({\"d\": {\"e\": {\"f\": 222}}})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<d>    "d": Object {</>
+<d>      "e": Object {</>
+<g>-       "f": 222,</>
+<r>+       "f": 555,</>
+<d>      },</>
+<d>    },</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({}).toMatchObject({\"a\": undefined})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 3</>
+<r>+ Received  + 1</>
+
+<g>- Object {</>
+<g>-   "a": undefined,</>
+<g>- }</>
+<r>+ Object {}</>`;
+
+module.exports["toMatchObject() {pass: false} expect([1, 2, 3]).toMatchObject([2, 3, 1])"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<r>+   1,</>
+<d>    2,</>
+<d>    3,</>
+<g>-   1,</>
+<d>  ]</>`;
+
+module.exports["toMatchObject() {pass: false} expect([1, 2, 3]).toMatchObject([1, 2, 2])"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Array [</>
+<d>    1,</>
+<d>    2,</>
+<g>-   2,</>
+<r>+   3,</>
+<d>  ]</>`;
+
+module.exports["toMatchObject() {pass: false} expect([Error: foo]).toMatchObject([Error: bar])"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+Expected: <g>[Error: bar]</>
+Received: <r>[Error: foo]</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\"}).toMatchObject({\"c\": \"d\"})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "c": "d",</>
+<r>+   "a": "b",</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\", \"c\": \"d\", Symbol(jest): \"jest\"}).toMatchObject({\"a\": \"c\", Symbol(jest): Any<String>})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<g>-   "a": "c",</>
+<r>+   "a": "b",</>
+<d>    Symbol(jest): Any<String>,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() {pass: false} expect({\"a\": \"b\"}).toMatchObject({\"toString\": Any<Function>})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 0</>
+<r>+ Received  + 1</>
+
+<d>  Object {</>
+<r>+   "a": "b",</>
+<d>    "toString": Any<Function>,</>
+<d>  }</>`;
+
+module.exports["toMatchObject() throws expect(null).toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a non-null object
+
+Received has value: <r>null</>`;
+
+module.exports["toMatchObject() throws expect(4).toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a non-null object
+
+Received has type:  number
+Received has value: <r>4</>`;
+
+module.exports["toMatchObject() throws expect(\"44\").toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a non-null object
+
+Received has type:  string
+Received has value: <r>"44"</>`;
+
+module.exports["toMatchObject() throws expect(true).toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a non-null object
+
+Received has type:  boolean
+Received has value: <r>true</>`;
+
+module.exports["toMatchObject() throws expect(undefined).toMatchObject({})"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a non-null object
+
+Received has value: <r>undefined</>`;
+
+module.exports["toMatchObject() throws expect({}).toMatchObject(null)"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-null object
+
+Expected has value: <g>null</>`;
+
+module.exports["toMatchObject() throws expect({}).toMatchObject(4)"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-null object
+
+Expected has type:  number
+Expected has value: <g>4</>`;
+
+module.exports["toMatchObject() throws expect({}).toMatchObject(\"some string\")"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-null object
+
+Expected has type:  string
+Expected has value: <g>"some string"</>`;
+
+module.exports["toMatchObject() throws expect({}).toMatchObject(true)"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-null object
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toMatchObject() throws expect({}).toMatchObject(undefined)"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-null object
+
+Expected has value: <g>undefined</>`;
+
+module.exports["toMatchObject() does not match properties up in the prototype chain"] = `<d>expect(</><r>received</><d>).</>toMatchObject<d>(</><g>expected</><d>)</>
+
+<g>- Expected  - 1</>
+<r>+ Received  + 0</>
+
+<d>  Object {</>
+<d>    "other": "child",</>
+<g>-   "ref": [Circular],</>
+<d>  }</>`;
+
diff --git a/tests/expect/matchers.test.ts b/tests/expect/matchers.test.ts
new file mode 100644
index 0000000000000..8824039bab7fa
--- /dev/null
+++ b/tests/expect/matchers.test.ts
@@ -0,0 +1,2338 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest, matcherUtils } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+import Immutable from 'immutable';
+
+const { stringify } = matcherUtils;
+
+const expectUnderTestAsAny = expectUnderTest as any;
+
+expectUnderTest.extend({
+  optionalFn(fn) {
+    const pass = fn === undefined || typeof fn === 'function';
+    return { message: () => 'expect either a function or undefined', pass };
+  },
+});
+
+test('should throw if passed two arguments', () => {
+  expect(() => expectUnderTestAsAny('foo', 'bar')).toThrow(
+      new Error('Expect takes at most one argument.'),
+  );
+});
+
+test.describe('.rejects', () => {
+  test('should reject', async () => {
+    await expectUnderTest(Promise.reject(4)).rejects.toBe(4);
+    await expectUnderTest(Promise.reject(4)).rejects.not.toBe(5);
+    await expectUnderTest(Promise.reject(4.2)).rejects.toBeCloseTo(4.2, 5);
+    await expectUnderTest(Promise.reject(3)).rejects.not.toBeCloseTo(4.2, 5);
+    await expectUnderTest(Promise.reject({ a: 1, b: 2 })).rejects.toMatchObject({
+      a: 1,
+    });
+    await expectUnderTest(Promise.reject({ a: 1, b: 2 })).rejects.not.toMatchObject({
+      c: 1,
+    });
+    await expectUnderTest(
+        Promise.reject(new Error('rejectMessage')),
+    ).rejects.toMatchObject({ message: 'rejectMessage' });
+    await expectUnderTest(Promise.reject(new Error())).rejects.toThrow();
+  });
+
+  test('should reject with toThrow', async () => {
+    async function fn() {
+      throw new Error('some error');
+    }
+    await expectUnderTest(fn()).rejects.toThrow('some error');
+  });
+
+  test('should reject async function to toThrow', async () => {
+    await expectUnderTest(async () => {
+      throw new Error('Test');
+    }).rejects.toThrow('Test');
+  });
+
+  ['a', [1], () => { }, { a: 1 }].forEach(value => {
+    test(`fails non-promise value ${stringify(value)} synchronously`, () => {
+      let error;
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        expectUnderTest(value).rejects.toBe(111);
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+    });
+
+    test(`fails non-promise value ${stringify(value)}`, async () => {
+      let error;
+      try {
+        await expectUnderTest(value).rejects.toBeDefined();
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+
+  [4, null, true, undefined].forEach(value => {
+    test(`fails non-promise value ${stringify(value)} synchronously`, () => {
+      let error;
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        expectUnderTest(value).rejects.not.toBe(111);
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+    });
+
+    test(`fails non-promise value ${stringify(value)}`, async () => {
+      let error;
+      try {
+        await expectUnderTest(value).rejects.not.toBeDefined();
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+
+  test('fails for promise that resolves', async () => {
+    let error;
+    try {
+      await expectUnderTest(Promise.resolve(4)).rejects.toBe(4);
+    } catch (e) {
+      error = e;
+    }
+    expect(error).toBeDefined();
+    expect(error.message).toMatchSnapshot();
+  });
+});
+
+test.describe('.resolves', () => {
+  test('should resolve', async () => {
+    await expectUnderTest(Promise.resolve(4)).resolves.toBe(4);
+    await expectUnderTest(Promise.resolve(4)).resolves.not.toBe(5);
+    await expectUnderTest(Promise.resolve(4.2)).resolves.toBeCloseTo(4.2, 5);
+    await expectUnderTest(Promise.resolve(3)).resolves.not.toBeCloseTo(4.2, 5);
+    await expectUnderTest(Promise.resolve({ a: 1, b: 2 })).resolves.toMatchObject({
+      a: 1,
+    });
+    await expectUnderTest(Promise.resolve({ a: 1, b: 2 })).resolves.not.toMatchObject({
+      c: 1,
+    });
+    await expectUnderTest(
+        Promise.resolve(() => {
+          throw new Error();
+        }),
+    ).resolves.toThrow();
+  });
+
+  ['a', [1], () => { }, { a: 1 }].forEach(value => {
+    test(`fails non-promise value ${stringify(value)} synchronously`, () => {
+      let error;
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        expectUnderTest(value).resolves.toBeDefined();
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test(`fails non-promise value ${stringify(value)}`, async () => {
+      let error;
+      try {
+        await expectUnderTest(value).resolves.toBeDefined();
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+
+  [4, null, true, undefined].forEach(value => {
+    test(`fails non-promise value ${stringify(value)} synchronously`, () => {
+      let error;
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        expectUnderTest(value).resolves.not.toBeDefined();
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test(`fails non-promise value ${stringify(value)}`, async () => {
+      let error;
+      try {
+        await expectUnderTest(value).resolves.not.toBeDefined();
+      } catch (e) {
+        error = e;
+      }
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+
+  test('fails for promise that rejects', async () => {
+    let error;
+    try {
+      await expectUnderTest(Promise.reject(4)).resolves.toBe(4);
+    } catch (e) {
+      error = e;
+    }
+    expect(error).toBeDefined();
+    expect(error.message).toMatchSnapshot();
+  });
+});
+
+test.describe('.toBe()', () => {
+  test('does not throw', () => {
+    expectUnderTest('a').not.toBe('b');
+    expectUnderTest('a').toBe('a');
+    expectUnderTest(1).not.toBe(2);
+    expectUnderTest(1).toBe(1);
+    expectUnderTest(null).not.toBe(undefined);
+    expectUnderTest(null).toBe(null);
+    expectUnderTest(undefined).toBe(undefined);
+    expectUnderTest(NaN).toBe(NaN);
+    expectUnderTest(BigInt(1)).not.toBe(BigInt(2));
+    expectUnderTest(BigInt(1)).not.toBe(1);
+    expectUnderTest(BigInt(1)).toBe(BigInt(1));
+  });
+
+  [
+    [1, 2],
+    [true, false],
+    [() => { }, () => { }],
+    [{}, {}],
+    [{ a: 1 }, { a: 1 }],
+    [{ a: 1 }, { a: 5 }],
+    [
+      { a: () => { }, b: 2 },
+      { a: expect.any(Function), b: 2 },
+    ],
+    [{ a: undefined, b: 2 }, { b: 2 }],
+    [new Date('2020-02-20'), new Date('2020-02-20')],
+    [new Date('2020-02-21'), new Date('2020-02-20')],
+    [/received/, /expected/],
+    [Symbol('received'), Symbol('expected')],
+    [new Error('received'), new Error('expected')],
+    ['abc', 'cde'],
+    ['painless JavaScript testing', 'delightful JavaScript testing'],
+    ['', 'compare one-line string to empty string'],
+    ['with \ntrailing space', 'without trailing space'],
+    ['four\n4\nline\nstring', '3\nline\nstring'],
+    [[], []],
+    [null, undefined],
+    [-0, +0],
+  ].forEach(([a, b]: [a: any, b: any], index) => {
+    test(`fails for: ${stringify(a)} and ${stringify(b)} (${index})`, () => {
+      expect(() => expectUnderTest(a).toBe(b)).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [BigInt(1), BigInt(2)],
+    [{ a: BigInt(1) }, { a: BigInt(1) }],
+  ].forEach(([a, b]) => {
+    test(`fails for: ${stringify(a)} and ${stringify(b)}`, () => {
+      expect(() => expectUnderTest(a).toBe(b)).toThrow('toBe');
+    });
+  });
+
+  [false, 1, 'a', undefined, null, {}, []].forEach(v => {
+    test(`fails for '${stringify(v)}' with '.not'`, () => {
+      expect(() => expectUnderTest(v).not.toBe(v)).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [BigInt(1), BigInt('1')].forEach((v, index) => {
+    test(`fails for '${stringify(v)}' with '.not' (${index})}`, () => {
+      expect(() => expectUnderTest(v).not.toBe(v)).toThrow('toBe');
+    });
+  });
+
+  test('does not crash on circular references', () => {
+    const obj: any = {};
+    obj.circular = obj;
+
+    expect(() => expectUnderTest(obj).toBe({})).toThrowErrorMatchingSnapshot();
+  });
+
+  test('assertion error matcherResult property contains matcher name, expected and actual values', () => {
+    const actual = { a: 1 };
+    const expected = { a: 2 };
+    try {
+      expectUnderTest(actual).toBe(expected);
+    } catch (error) {
+      expect(error.matcherResult).toEqual(
+          expect.objectContaining({
+            actual,
+            expected,
+            name: 'toBe',
+          }),
+      );
+    }
+  });
+});
+
+test.describe('.toStrictEqual()', () => {
+  class TestClassA {
+    constructor(public a, public b) { }
+  }
+
+  class TestClassB {
+    constructor(public a, public b) { }
+  }
+
+  const TestClassC = class Child extends TestClassA {
+    constructor(a, b) {
+      super(a, b);
+    }
+  };
+
+  const TestClassD = class Child extends TestClassB {
+    constructor(a, b) {
+      super(a, b);
+    }
+  };
+
+  test('does not ignore keys with undefined values', () => {
+    expect({
+      a: undefined,
+      b: 2,
+    }).not.toStrictEqual({ b: 2 });
+  });
+
+  test('does not ignore keys with undefined values inside an array', () => {
+    expect([{ a: undefined }]).not.toStrictEqual([{}]);
+  });
+
+  test('does not ignore keys with undefined values deep inside an object', () => {
+    expect([{ a: [{ a: undefined }] }]).not.toStrictEqual([{ a: [{}] }]);
+  });
+
+  test('does not consider holes as undefined in sparse arrays', () => {
+
+    expect([, , , 1, , ,]).not.toStrictEqual([, , , 1, undefined, ,]);
+  });
+
+  test('passes when comparing same type', () => {
+    expect({
+      test: new TestClassA(1, 2),
+    }).toStrictEqual({ test: new TestClassA(1, 2) });
+  });
+
+  test('matches the expected snapshot when it fails', () => {
+    expect(() =>
+      expectUnderTest({
+        test: 2,
+      }).toStrictEqual({ test: new TestClassA(1, 2) }),
+    ).toThrowErrorMatchingSnapshot();
+
+    expect(() =>
+      expectUnderTest({
+        test: new TestClassA(1, 2),
+      }).not.toStrictEqual({ test: new TestClassA(1, 2) }),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  test('displays substring diff', () => {
+    const expected =
+      'Another caveat is that Jest will not typecheck your tests.';
+    const received =
+      'Because TypeScript support in Babel is just transpilation, Jest will not type-check your tests as they run.';
+    expect(() =>
+      expectUnderTest(received).toStrictEqual(expected),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  test('displays substring diff for multiple lines', () => {
+    const expected = [
+      '    69 | ',
+      "    70 | test('assert.doesNotThrow', () => {",
+      '  > 71 |   assert.doesNotThrow(() => {',
+      '       |          ^',
+      "    72 |     throw Error('err!');",
+      '    73 |   });',
+      '    74 | });',
+      '    at Object.doesNotThrow (__tests__/assertionError.test.js:71:10)',
+    ].join('\n');
+    const received = [
+      '    68 | ',
+      "    69 | test('assert.doesNotThrow', () => {",
+      '  > 70 |   assert.doesNotThrow(() => {',
+      '       |          ^',
+      "    71 |     throw Error('err!');",
+      '    72 |   });',
+      '    73 | });',
+      '    at Object.doesNotThrow (__tests__/assertionError.test.js:70:10)',
+    ].join('\n');
+    expect(() =>
+      expectUnderTest(received).toStrictEqual(expected),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  test('does not pass for different types', () => {
+    expect({
+      test: new TestClassA(1, 2),
+    }).not.toStrictEqual({ test: new TestClassB(1, 2) });
+  });
+
+  test('does not simply compare constructor names', () => {
+    const c = new TestClassC(1, 2);
+    const d = new TestClassD(1, 2);
+    expect(c.constructor.name).toEqual(d.constructor.name);
+    expect({ test: c }).not.toStrictEqual({ test: d });
+  });
+
+
+  test('passes for matching sparse arrays', () => {
+    expect([, 1]).toStrictEqual([, 1]);
+  });
+
+  test('does not pass when sparseness of arrays do not match', () => {
+    expect([, 1]).not.toStrictEqual([undefined, 1]);
+    expect([undefined, 1]).not.toStrictEqual([, 1]);
+    expect([, , , 1]).not.toStrictEqual([, 1]);
+  });
+
+  test('does not pass when equally sparse arrays have different values', () => {
+    expect([, 1]).not.toStrictEqual([, 2]);
+  });
+
+  test('does not pass when ArrayBuffers are not equal', () => {
+    expect(Uint8Array.from([1, 2]).buffer).not.toStrictEqual(
+        Uint8Array.from([0, 0]).buffer,
+    );
+    expect(Uint8Array.from([2, 1]).buffer).not.toStrictEqual(
+        Uint8Array.from([2, 2]).buffer,
+    );
+    expect(Uint8Array.from([]).buffer).not.toStrictEqual(
+        Uint8Array.from([1]).buffer,
+    );
+  });
+
+  test('passes for matching buffers', () => {
+    expect(Uint8Array.from([1]).buffer).toStrictEqual(
+        Uint8Array.from([1]).buffer,
+    );
+    expect(Uint8Array.from([]).buffer).toStrictEqual(
+        Uint8Array.from([]).buffer,
+    );
+    expect(Uint8Array.from([9, 3]).buffer).toStrictEqual(
+        Uint8Array.from([9, 3]).buffer,
+    );
+  });
+
+  test('fails for missing keys even if backed by an asymmetric matcher accepting them', () => {
+    // issue 12463
+    expect({ a: 1 }).not.toStrictEqual({ a: 1, b: expectUnderTestAsAny.optionalFn() });
+    expect({ a: 1, b: expectUnderTestAsAny.optionalFn() }).not.toStrictEqual({ a: 1 });
+    expect([1]).not.toStrictEqual([1, expectUnderTestAsAny.optionalFn()]);
+    expect([1, expectUnderTestAsAny.optionalFn()]).not.toStrictEqual([1]);
+  });
+
+  test('passes if keys are present and asymmetric matcher accept them', () => {
+    // issue 12463
+    // with a proper function
+    expect({ a: 1, b: () => { } }).toStrictEqual({
+      a: 1,
+      b: expectUnderTestAsAny.optionalFn(),
+    });
+    expect({ a: 1, b: expectUnderTestAsAny.optionalFn() }).toStrictEqual({
+      a: 1,
+      b: () => { },
+    });
+    expect([1, () => { }]).toStrictEqual([1, expectUnderTestAsAny.optionalFn()]);
+    expect([1, expectUnderTestAsAny.optionalFn()]).toStrictEqual([1, () => { }]);
+    // with undefined
+    expect({ a: 1, b: undefined }).toStrictEqual({
+      a: 1,
+      b: expectUnderTestAsAny.optionalFn(),
+    });
+    expect({ a: 1, b: expectUnderTestAsAny.optionalFn() }).toStrictEqual({
+      a: 1,
+      b: undefined,
+    });
+    expect([1, undefined]).toStrictEqual([1, expectUnderTestAsAny.optionalFn()]);
+    expect([1, expectUnderTestAsAny.optionalFn()]).toStrictEqual([1, undefined]);
+  });
+
+});
+
+test.describe('.toEqual()', () => {
+
+  [
+    [true, false],
+    [1, 2],
+    [0, -0],
+    [0, Number.MIN_VALUE], // issues/7941
+    [Number.MIN_VALUE, 0],
+    [0, new Number(0)],
+    [new Number(0), 0],
+    [new Number(0), new Number(1)],
+    ['abc', new String('abc')],
+    [new String('abc'), 'abc'],
+    // @ts-ignore
+    [/abc/gsy, /abc/g],
+    [{ a: 1 }, { a: 2 }],
+    [{ a: 5 }, { b: 6 }],
+    [Object.freeze({ foo: { bar: 1 } }), { foo: {} }],
+    [
+      {
+        get getterAndSetter() {
+          return {};
+        },
+        set getterAndSetter(value) {
+          throw new Error('noo');
+        },
+      },
+      { getterAndSetter: { foo: 'bar' } },
+    ],
+    [
+      Object.freeze({
+        get frozenGetterAndSetter() {
+          return {};
+        },
+        set frozenGetterAndSetter(value) {
+          throw new Error('noo');
+        },
+      }),
+      { frozenGetterAndSetter: { foo: 'bar' } },
+    ],
+    [
+      {
+        get getter() {
+          return {};
+        },
+      },
+      { getter: { foo: 'bar' } },
+    ],
+    [
+      Object.freeze({
+        get frozenGetter() {
+          return {};
+        },
+      }),
+      { frozenGetter: { foo: 'bar' } },
+    ],
+    [
+      {
+
+        set setter(value) {
+          throw new Error('noo');
+        },
+      },
+      { setter: { foo: 'bar' } },
+    ],
+    [
+      Object.freeze({
+
+        set frozenSetter(value) {
+          throw new Error('noo');
+        },
+      }),
+      { frozenSetter: { foo: 'bar' } },
+    ],
+    ['banana', 'apple'],
+    ['1\u{00A0}234,57\u{00A0}$', '1 234,57 $'], // issues/6881
+    [
+      'type TypeName<T> = T extends Function ? "function" : "object";',
+      'type TypeName<T> = T extends Function\n? "function"\n: "object";',
+    ],
+    [null, undefined],
+    [[1], [2]],
+    [
+      [1, 2],
+      [2, 1],
+    ],
+    [Immutable.List([1]), Immutable.List([2])],
+    [Immutable.List([1, 2]), Immutable.List([2, 1])],
+    [new Map(), new Set()],
+    [new Set([1, 2]), new Set()],
+    [new Set([1, 2]), new Set([1, 2, 3])],
+    [new Set([[1], [2]]), new Set([[1], [2], [3]])],
+    [new Set([[1], [2]]), new Set([[1], [2], [2]])],
+    [
+      new Set([new Set([1]), new Set([2])]),
+      new Set([new Set([1]), new Set([3])]),
+    ],
+    [Immutable.Set([1, 2]), Immutable.Set()],
+    [Immutable.Set([1, 2]), Immutable.Set([1, 2, 3])],
+    [Immutable.OrderedSet([1, 2]), Immutable.OrderedSet([2, 1])],
+    [
+      new Map([
+        [1, 'one'],
+        [2, 'two'],
+      ]),
+      new Map([[1, 'one']]),
+    ],
+    [new Map([['a', 0]]), new Map([['b', 0]])],
+    [new Map([['v', 1]]), new Map([['v', 2]])],
+    [new Map([[['v'], 1]]), new Map([[['v'], 2]])],
+    [
+      new Map([[[1], new Map([[[1], 'one']])]]),
+      new Map([[[1], new Map([[[1], 'two']])]]),
+    ],
+    [Immutable.Map({ a: 0 }), Immutable.Map({ b: 0 })],
+    [Immutable.Map({ v: 1 }), Immutable.Map({ v: 2 })],
+    [
+      Immutable.OrderedMap().set(1, 'one').set(2, 'two'),
+      Immutable.OrderedMap().set(2, 'two').set(1, 'one'),
+    ],
+    [
+      Immutable.Map({ 1: Immutable.Map({ 2: { a: 99 } }) }),
+      Immutable.Map({ 1: Immutable.Map({ 2: { a: 11 } }) }),
+    ],
+    [new Uint8Array([97, 98, 99]), new Uint8Array([97, 98, 100])],
+    [{ a: 1, b: 2 }, expectUnderTest.objectContaining({ a: 2 })],
+    [false, expectUnderTest.objectContaining({ a: 2 })],
+    [[1, 3], expectUnderTest.arrayContaining([1, 2])],
+    [1, expectUnderTest.arrayContaining([1, 2])],
+    ['abd', expectUnderTest.stringContaining('bc')],
+    ['abd', expectUnderTest.stringMatching(/bc/i)],
+    [undefined, expectUnderTest.anything()],
+    [undefined, expectUnderTest.any(Function)],
+    [
+      'Eve',
+      {
+        asymmetricMatch: function asymmetricMatch(who) {
+          return who === 'Alice' || who === 'Bob';
+        },
+      },
+    ],
+    [
+      {
+        target: {
+          nodeType: 1,
+          value: 'a',
+        },
+      },
+      {
+        target: {
+          nodeType: 1,
+          value: 'b',
+        },
+      },
+    ],
+    [
+      {
+        nodeName: 'div',
+        nodeType: 1,
+      },
+      {
+        nodeName: 'p',
+        nodeType: 1,
+      },
+    ],
+    [
+      {
+        [Symbol.for('foo')]: 1,
+        [Symbol.for('bar')]: 2,
+      },
+      {
+        [Symbol.for('foo')]: expectUnderTest.any(Number),
+        [Symbol.for('bar')]: 1,
+      },
+    ],
+    [
+
+      [, , 1, ,],
+
+      [, , 2, ,],
+    ],
+    [
+      Object.assign([], { 4294967295: 1 }),
+      Object.assign([], { 4294967295: 2 }), // issue 11056
+    ],
+    [
+
+      Object.assign([], { ['-0']: 1 }),
+
+      Object.assign([], { ['0']: 1 }), // issue 11056: also check (-0, 0)
+    ],
+    [
+      Object.assign([], { a: 1 }),
+      Object.assign([], { b: 1 }), // issue 11056: also check strings
+    ],
+    [
+      Object.assign([], { [Symbol()]: 1 }),
+      Object.assign([], { [Symbol()]: 1 }), // issue 11056: also check symbols
+    ],
+  ].forEach(([a, b], index) => {
+    test(`{pass: false} expect(${stringify(a)}).toEqual(${stringify(
+        b,
+    )} (${index}))`, () => {
+      expect(() => expectUnderTest(a).toEqual(b)).toThrowErrorMatchingSnapshot();
+      expectUnderTest(a).not.toEqual(b);
+    });
+  });
+
+  [
+    [BigInt(1), BigInt(2)],
+    [BigInt(1), 1],
+  ].forEach(([a, b]) => {
+    test(`{pass: false} expect(${stringify(a)}).toEqual(${stringify(
+        b,
+    )})`, () => {
+      expect(() => expectUnderTest(a).toEqual(b)).toThrow('toEqual');
+      expectUnderTest(a).not.toEqual(b);
+    });
+  });
+
+  [
+    [true, true],
+    [1, 1],
+    [NaN, NaN],
+    [0, Number(0)],
+    [Number(0), 0],
+    [new Number(0), new Number(0)],
+    ['abc', 'abc'],
+    [String('abc'), 'abc'],
+    ['abc', String('abc')],
+    [[1], [1]],
+    [
+      [1, 2],
+      [1, 2],
+    ],
+    [Immutable.List([1]), Immutable.List([1])],
+    [Immutable.List([1, 2]), Immutable.List([1, 2])],
+    [{}, {}],
+    [{ a: 99 }, { a: 99 }],
+    [new Set(), new Set()],
+    [new Set([1, 2]), new Set([1, 2])],
+    [new Set([1, 2]), new Set([2, 1])],
+    [new Set([[1], [2]]), new Set([[2], [1]])],
+    [
+      new Set([new Set([[1]]), new Set([[2]])]),
+      new Set([new Set([[2]]), new Set([[1]])]),
+    ],
+    [new Set([[1], [2], [3], [3]]), new Set([[3], [3], [2], [1]])],
+    [new Set([{ a: 1 }, { b: 2 }]), new Set([{ b: 2 }, { a: 1 }])],
+    [Immutable.Set(), Immutable.Set()],
+    [Immutable.Set([1, 2]), Immutable.Set([1, 2])],
+    [Immutable.Set([1, 2]), Immutable.Set([2, 1])],
+    [Immutable.OrderedSet(), Immutable.OrderedSet()],
+    [Immutable.OrderedSet([1, 2]), Immutable.OrderedSet([1, 2])],
+    [new Map(), new Map()],
+    [
+      new Map([
+        [1, 'one'],
+        [2, 'two'],
+      ]),
+      new Map([
+        [1, 'one'],
+        [2, 'two'],
+      ]),
+    ],
+    [
+      new Map([
+        [1, 'one'],
+        [2, 'two'],
+      ]),
+      new Map([
+        [2, 'two'],
+        [1, 'one'],
+      ]),
+    ],
+    [
+      new Map([
+        [[1], 'one'],
+        [[2], 'two'],
+        [[3], 'three'],
+        [[3], 'four'],
+      ]),
+      new Map([
+        [[3], 'three'],
+        [[3], 'four'],
+        [[2], 'two'],
+        [[1], 'one'],
+      ]),
+    ],
+    [
+      new Map([
+        [[1], new Map([[[1], 'one']])],
+        [[2], new Map([[[2], 'two']])],
+      ]),
+      new Map([
+        [[2], new Map([[[2], 'two']])],
+        [[1], new Map([[[1], 'one']])],
+      ]),
+    ],
+    [
+      new Map([
+        [[1], 'one'],
+        [[2], 'two'],
+      ]),
+      new Map([
+        [[2], 'two'],
+        [[1], 'one'],
+      ]),
+    ],
+    [
+      new Map([
+        [{ a: 1 }, 'one'],
+        [{ b: 2 }, 'two'],
+      ]),
+      new Map([
+        [{ b: 2 }, 'two'],
+        [{ a: 1 }, 'one'],
+      ]),
+    ],
+    [
+      new Map([
+        [1, ['one']],
+        [2, ['two']],
+      ]),
+      new Map([
+        [2, ['two']],
+        [1, ['one']],
+      ]),
+    ],
+    [Immutable.Map(), Immutable.Map()],
+    [
+      Immutable.Map().set(1, 'one').set(2, 'two'),
+      Immutable.Map().set(1, 'one').set(2, 'two'),
+    ],
+    [
+      Immutable.Map().set(1, 'one').set(2, 'two'),
+      Immutable.Map().set(2, 'two').set(1, 'one'),
+    ],
+    [
+      Immutable.OrderedMap().set(1, 'one').set(2, 'two'),
+      Immutable.OrderedMap().set(1, 'one').set(2, 'two'),
+    ],
+    [
+      Immutable.Map({ 1: Immutable.Map({ 2: { a: 99 } }) }),
+      Immutable.Map({ 1: Immutable.Map({ 2: { a: 99 } }) }),
+    ],
+    [new Uint8Array([97, 98, 99]), new Uint8Array([97, 98, 99])],
+    [{ a: 1, b: 2 }, expectUnderTest.objectContaining({ a: 1 })],
+    [[1, 2, 3], expectUnderTest.arrayContaining([2, 3])],
+    ['abcd', expectUnderTest.stringContaining('bc')],
+    ['abcd', expectUnderTest.stringMatching('bc')],
+    [true, expectUnderTest.anything()],
+    [() => { }, expectUnderTest.any(Function)],
+    [
+      {
+        a: 1,
+        b: function b() { },
+        c: true,
+      },
+      {
+        a: 1,
+        b: expectUnderTest.any(Function),
+        c: expectUnderTest.anything(),
+      },
+    ],
+    [
+      'Alice',
+      {
+        asymmetricMatch: function asymmetricMatch(who) {
+          return who === 'Alice' || who === 'Bob';
+        },
+      },
+    ],
+    [
+      {
+        nodeName: 'div',
+        nodeType: 1,
+      },
+      {
+        nodeName: 'div',
+        nodeType: 1,
+      },
+    ],
+    [
+      {
+        [Symbol.for('foo')]: 1,
+        [Symbol.for('bar')]: 2,
+      },
+      {
+        [Symbol.for('foo')]: expectUnderTest.any(Number),
+        [Symbol.for('bar')]: 2,
+      },
+    ],
+    [
+
+      [, , 1, ,],
+
+      [, , 1, ,],
+    ],
+    [
+
+      [, , 1, , ,],
+
+      [, , 1, undefined, ,], // same length but hole replaced by undefined
+    ],
+    // issue 12463 - "matcher" vs "proper function"
+    [
+      { a: 1, b: () => { } },
+      { a: 1, b: expectUnderTestAsAny.optionalFn() },
+    ],
+    [
+      { a: 1, b: expectUnderTestAsAny.optionalFn() },
+      { a: 1, b: () => { } },
+    ],
+    [
+      [1, () => { }],
+      [1, expectUnderTestAsAny.optionalFn()],
+    ],
+    [
+      [1, expectUnderTestAsAny.optionalFn()],
+      [1, () => { }],
+    ],
+    // issue 12463 - "matcher" vs "undefined"
+    [
+      { a: 1, b: undefined },
+      { a: 1, b: expectUnderTestAsAny.optionalFn() },
+    ],
+    [
+      { a: 1, b: expectUnderTestAsAny.optionalFn() },
+      { a: 1, b: undefined },
+    ],
+    [
+      [1, undefined],
+      [1, expectUnderTestAsAny.optionalFn()],
+    ],
+    [
+      [1, expectUnderTestAsAny.optionalFn()],
+      [1, undefined],
+    ],
+    // issue 12463 - "matcher" vs "missing"
+    [{ a: 1 }, { a: 1, b: expectUnderTestAsAny.optionalFn() }],
+    [{ a: 1, b: expectUnderTestAsAny.optionalFn() }, { a: 1 }],
+    [[1], [1, expectUnderTestAsAny.optionalFn()]],
+    [[1, expectUnderTestAsAny.optionalFn()], [1]],
+  ].forEach(([a, b], index) => {
+    test(`{pass: true} expect(${stringify(a)}).not.toEqual(${stringify(
+        b,
+    )}) (${index})`, () => {
+      expectUnderTest(a).toEqual(b);
+      expect(() => expectUnderTest(a).not.toEqual(b)).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [BigInt(1), BigInt(1)],
+    [BigInt(0), BigInt('0')],
+    [[BigInt(1)], [BigInt(1)]],
+    [
+      [BigInt(1), 2],
+      [BigInt(1), 2],
+    ],
+    [Immutable.List([BigInt(1)]), Immutable.List([BigInt(1)])],
+    [{ a: BigInt(99) }, { a: BigInt(99) }],
+    [new Set([BigInt(1), BigInt(2)]), new Set([BigInt(1), BigInt(2)])],
+  ].forEach(([a, b]) => {
+    test(`{pass: true} expect(${stringify(a)}).not.toEqual(${stringify(
+        b,
+    )})`, () => {
+      expectUnderTest(a).toEqual(b);
+      expect(() => expectUnderTest(a).not.toEqual(b)).toThrow('toEqual');
+    });
+  });
+
+  test('assertion error matcherResult property contains matcher name, expected and actual values', () => {
+    const actual = { a: 1 };
+    const expected = { a: 2 };
+    try {
+      expectUnderTest(actual).toEqual(expected);
+    } catch (error) {
+      expect(error.matcherResult).toEqual(
+          expect.objectContaining({
+            actual,
+            expected,
+            name: 'toEqual',
+          }),
+      );
+    }
+  });
+
+  test('symbol based keys in arrays are processed correctly', () => {
+    const mySymbol = Symbol('test');
+    const actual1 = [];
+    actual1[mySymbol] = 3;
+    const actual2 = [];
+    actual2[mySymbol] = 4;
+    const expected = [];
+    expected[mySymbol] = 3;
+
+    expect(actual1).toEqual(expected);
+    expect(actual2).not.toEqual(expected);
+  });
+
+  test('non-enumerable members should be skipped during equal', () => {
+    const actual = {
+      x: 3,
+    };
+    Object.defineProperty(actual, 'test', {
+      enumerable: false,
+      value: 5,
+    });
+    expect(actual).toEqual({ x: 3 });
+  });
+
+  test('non-enumerable symbolic members should be skipped during equal', () => {
+    const actual = {
+      x: 3,
+    };
+    const mySymbol = Symbol('test');
+    Object.defineProperty(actual, mySymbol, {
+      enumerable: false,
+      value: 5,
+    });
+    expect(actual).toEqual({ x: 3 });
+  });
+
+  test.describe('cyclic object equality', () => {
+    test('properties with the same circularity are equal', () => {
+      const a: any = {};
+      a.x = a;
+      const b: any = {};
+      b.x = b;
+      expect(a).toEqual(b);
+      expect(b).toEqual(a);
+
+      const c: any = {};
+      c.x = a;
+      const d: any = {};
+      d.x = b;
+      expect(c).toEqual(d);
+      expect(d).toEqual(c);
+    });
+
+    test('properties with different circularity are not equal', () => {
+      const a: any = {};
+      a.x = { y: a };
+      const b: any = {};
+      const bx: any = {};
+      b.x = bx;
+      bx.y = bx;
+      expect(a).not.toEqual(b);
+      expect(b).not.toEqual(a);
+
+      const c: any = {};
+      c.x = a;
+      const d: any = {};
+      d.x = b;
+      expect(c).not.toEqual(d);
+      expect(d).not.toEqual(c);
+    });
+
+    test('are not equal if circularity is not on the same property', () => {
+      const a: any = {};
+      const b: any = {};
+      a.a = a;
+      b.a = {};
+      b.a.a = a;
+      expect(a).not.toEqual(b);
+      expect(b).not.toEqual(a);
+
+      const c: any = {};
+      c.x = { x: c };
+      const d: any = {};
+      d.x = d;
+      expect(c).not.toEqual(d);
+      expect(d).not.toEqual(c);
+    });
+  });
+
+});
+
+test.describe('.toBeInstanceOf()', () => {
+  class A { }
+  class B { }
+  class C extends B { }
+  class D extends C { }
+  class E extends D { }
+
+  class SubHasStaticNameMethod extends B {
+    constructor() {
+      super();
+    }
+    static name() { }
+  }
+
+  class HasStaticNameMethod {
+    constructor() { }
+    static name() { }
+  }
+
+  function DefinesNameProp() { }
+  Object.defineProperty(DefinesNameProp, 'name', {
+    configurable: true,
+    enumerable: false,
+    value: '',
+    writable: true,
+  });
+  // @ts-ignore
+  class SubHasNameProp extends DefinesNameProp { }
+
+  [
+    [new Map(), Map],
+    [[], Array],
+    [new A(), A],
+    [new C(), B], // C extends B
+    [new E(), B], // E extends … extends B
+    [new SubHasNameProp(), DefinesNameProp], // omit extends
+    [new SubHasStaticNameMethod(), B], // Received
+    [new HasStaticNameMethod(), HasStaticNameMethod], // Expected
+  ].forEach(([a, b], index) => {
+    test(`passing ${stringify(a)} and ${stringify(b)} (${index})`, () => {
+      expect(() =>
+        expectUnderTest(a).not.toBeInstanceOf(b),
+      ).toThrowErrorMatchingSnapshot();
+
+      expectUnderTest(a).toBeInstanceOf(b);
+    });
+  });
+
+  [
+    ['a', String],
+    [1, Number],
+    [true, Boolean],
+    [new A(), B],
+    [Object.create(null), A],
+    [undefined, String],
+    [null, String],
+    [/\w+/, function() { }],
+    [new DefinesNameProp(), RegExp],
+  ].forEach(([a, b], index) => {
+    test(`failing ${stringify(a)} and ${stringify(b)} (${index})`, () => {
+      expect(() =>
+        expectUnderTest(a).toBeInstanceOf(b),
+      ).toThrowErrorMatchingSnapshot();
+
+      expectUnderTest(a).not.toBeInstanceOf(b);
+    });
+  });
+
+  test('throws if constructor is not a function', () => {
+    expect(() =>
+      expectUnderTest({}).toBeInstanceOf(4),
+    ).toThrowErrorMatchingSnapshot();
+  });
+});
+
+test.describe('.toBeTruthy(), .toBeFalsy()', () => {
+  test('does not accept arguments', () => {
+    expect(() => expectUnderTestAsAny(0).toBeTruthy(null)).toThrowErrorMatchingSnapshot();
+
+    expect(() =>
+      expectUnderTestAsAny(0).not.toBeFalsy(null),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  [{}, [], true, 1, 'a', 0.5, new Map(), () => { }, Infinity].forEach(v => {
+    test(`'${stringify(v)}' is truthy`, () => {
+      expectUnderTest(v).toBeTruthy();
+      expectUnderTest(v).not.toBeFalsy();
+
+      expect(() =>
+        expectUnderTest(v).not.toBeTruthy(),
+      ).toThrowErrorMatchingSnapshot();
+
+      expect(() => expectUnderTest(v).toBeFalsy()).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [BigInt(1)].forEach(v => {
+    test(`'${stringify(v)}' is truthy`, () => {
+      expectUnderTest(v).toBeTruthy();
+      expectUnderTest(v).not.toBeFalsy();
+
+      expect(() => expectUnderTest(v).not.toBeTruthy()).toThrow('toBeTruthy');
+
+      expect(() => expectUnderTest(v).toBeFalsy()).toThrow('toBeFalsy');
+    });
+  });
+
+  [false, null, NaN, 0, '', undefined].forEach(v => {
+    test(`'${stringify(v)}' is falsy`, () => {
+      expectUnderTest(v).toBeFalsy();
+      expectUnderTest(v).not.toBeTruthy();
+
+      expect(() => expectUnderTest(v).toBeTruthy()).toThrowErrorMatchingSnapshot();
+
+      expect(() =>
+        expectUnderTest(v).not.toBeFalsy(),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [BigInt(0)].forEach(v => {
+    test(`'${stringify(v)}' is falsy`, () => {
+      expectUnderTest(v).toBeFalsy();
+      expectUnderTest(v).not.toBeTruthy();
+
+      expect(() => expectUnderTest(v).toBeTruthy()).toThrow('toBeTruthy');
+
+      expect(() => expectUnderTest(v).not.toBeFalsy()).toThrow('toBeFalsy');
+    });
+  });
+});
+
+test.describe('.toBeNaN()', () => {
+  test('{pass: true} expect(NaN).toBeNaN()', () => {
+    [NaN, Math.sqrt(-1), Infinity - Infinity, 0 / 0].forEach(v => {
+      expectUnderTest(v).toBeNaN();
+
+      expect(() => expectUnderTest(v).not.toBeNaN()).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  test('throws', () => {
+    [1, '', null, undefined, {}, [], 0.2, 0, Infinity, -Infinity].forEach(v => {
+      expect(() => expectUnderTest(v).toBeNaN()).toThrowErrorMatchingSnapshot();
+
+      expectUnderTest(v).not.toBeNaN();
+    });
+  });
+});
+
+test.describe('.toBeNull()', () => {
+  [{}, [], true, 1, 'a', 0.5, new Map(), () => { }, Infinity].forEach(v => {
+    test(`fails for '${stringify(v)}'`, () => {
+      expectUnderTest(v).not.toBeNull();
+
+      expect(() => expectUnderTest(v).toBeNull()).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  test('fails for null with .not', () => {
+    expect(() =>
+      expectUnderTest(null).not.toBeNull(),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  test('pass for null', () => {
+    expectUnderTest(null).toBeNull();
+  });
+});
+
+test.describe('.toBeDefined(), .toBeUndefined()', () => {
+  [{}, [], true, 1, 'a', 0.5, new Map(), () => { }, Infinity].forEach(v => {
+    test(`'${stringify(v)}' is defined`, () => {
+      expectUnderTest(v).toBeDefined();
+      expectUnderTest(v).not.toBeUndefined();
+
+      expect(() =>
+        expectUnderTest(v).not.toBeDefined(),
+      ).toThrowErrorMatchingSnapshot();
+
+      expect(() =>
+        expectUnderTest(v).toBeUndefined(),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [BigInt(1)].forEach(v => {
+    test(`'${stringify(v)}' is defined`, () => {
+      expectUnderTest(v).toBeDefined();
+      expectUnderTest(v).not.toBeUndefined();
+
+      expect(() => expectUnderTest(v).not.toBeDefined()).toThrow('toBeDefined');
+
+      expect(() => expectUnderTest(v).toBeUndefined()).toThrow('toBeUndefined');
+    });
+  });
+
+  test('undefined is undefined', () => {
+    expectUnderTest(undefined).toBeUndefined();
+    expectUnderTest(undefined).not.toBeDefined();
+
+    expect(() =>
+      expectUnderTest(undefined).toBeDefined(),
+    ).toThrowErrorMatchingSnapshot();
+
+    expect(() =>
+      expectUnderTest(undefined).not.toBeUndefined(),
+    ).toThrowErrorMatchingSnapshot();
+  });
+});
+
+test.describe(
+    '.toBeGreaterThan(), .toBeLessThan(), ' +
+  '.toBeGreaterThanOrEqual(), .toBeLessThanOrEqual()',
+    () => {
+      [
+        [1, 2],
+        [-Infinity, Infinity],
+        [Number.MIN_VALUE, Number.MAX_VALUE],
+        [0x11, 0x22],
+        [0b11, 0b111],
+        [0o11, 0o22],
+        [0.1, 0.2],
+      ].forEach(([small, big]) => {
+        test(`{pass: true} expect(${small}).toBeLessThan(${big})`, () => {
+          expectUnderTest(small).toBeLessThan(big);
+        });
+
+        test(`{pass: false} expect(${big}).toBeLessThan(${small})`, () => {
+          expectUnderTest(big).not.toBeLessThan(small);
+        });
+
+        test(`{pass: true} expect(${big}).toBeGreaterThan(${small})`, () => {
+          expectUnderTest(big).toBeGreaterThan(small);
+        });
+
+        test(`{pass: false} expect(${small}).toBeGreaterThan(${big})`, () => {
+          expectUnderTest(small).not.toBeGreaterThan(big);
+        });
+
+        test(`{pass: true} expect(${small}).toBeLessThanOrEqual(${big})`, () => {
+          expectUnderTest(small).toBeLessThanOrEqual(big);
+        });
+
+        test(`{pass: false} expect(${big}).toBeLessThanOrEqual(${small})`, () => {
+          expectUnderTest(big).not.toBeLessThanOrEqual(small);
+        });
+
+        test(`{pass: true} expect(${big}).toBeGreaterThanOrEqual(${small})`, () => {
+          expectUnderTest(big).toBeGreaterThanOrEqual(small);
+        });
+
+        test(`{pass: false} expect(${small}).toBeGreaterThanOrEqual(${big})`, () => {
+          expectUnderTest(small).not.toBeGreaterThanOrEqual(big);
+        });
+
+        test(`throws: [${small}, ${big}]`, () => {
+          expect(() =>
+            expectUnderTest(small).toBeGreaterThan(big),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(small).not.toBeLessThan(big),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(big).not.toBeGreaterThan(small),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(big).toBeLessThan(small),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(small).toBeGreaterThanOrEqual(big),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(small).not.toBeLessThanOrEqual(big),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(big).not.toBeGreaterThanOrEqual(small),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(big).toBeLessThanOrEqual(small),
+          ).toThrowErrorMatchingSnapshot();
+        });
+      });
+
+      test('can compare BigInt to Numbers', () => {
+        const a = BigInt(2);
+        expectUnderTest(a).toBeGreaterThan(1);
+        expectUnderTest(a).toBeGreaterThanOrEqual(2);
+        expectUnderTest(2).toBeLessThanOrEqual(a);
+        expectUnderTest(a).toBeLessThan(3);
+        expectUnderTest(a).toBeLessThanOrEqual(2);
+      });
+      [
+        [BigInt(1), BigInt(2)],
+        [BigInt(0x11), BigInt(0x22)],
+        [-1, BigInt(2)],
+      ].forEach(([small, big]) => {
+        test(`{pass: true} expect(${stringify(small)}).toBeLessThan(${stringify(
+            big,
+        )})`, () => {
+          expectUnderTest(small).toBeLessThan(big);
+        });
+
+        test(`{pass: false} expect(${stringify(big)}).toBeLessThan(${stringify(
+            small,
+        )})`, () => {
+          expectUnderTest(big).not.toBeLessThan(small);
+        });
+
+        test(`{pass: true} expect(${stringify(big)}).toBeGreaterThan(${stringify(
+            small,
+        )})`, () => {
+          expectUnderTest(big).toBeGreaterThan(small);
+        });
+
+        test(`{pass: false} expect(${stringify(small)}).toBeGreaterThan(${stringify(
+            big,
+        )})`, () => {
+          expectUnderTest(small).not.toBeGreaterThan(big);
+        });
+
+        test(`{pass: true} expect(${stringify(
+            small,
+        )}).toBeLessThanOrEqual(${stringify(big)})`, () => {
+          expectUnderTest(small).toBeLessThanOrEqual(big);
+        });
+
+        test(`{pass: false} expect(${stringify(
+            big,
+        )}).toBeLessThanOrEqual(${stringify(small)})`, () => {
+          expectUnderTest(big).not.toBeLessThanOrEqual(small);
+        });
+
+        test(`{pass: true} expect(${stringify(
+            big,
+        )}).toBeGreaterThanOrEqual(${stringify(small)})`, () => {
+          expectUnderTest(big).toBeGreaterThanOrEqual(small);
+        });
+
+        test(`{pass: false} expect(${stringify(
+            small,
+        )}).toBeGreaterThanOrEqual(${stringify(big)})`, () => {
+          expectUnderTest(small).not.toBeGreaterThanOrEqual(big);
+        });
+
+        test(`throws: [${stringify(small)}, ${stringify(big)}]`, () => {
+          expect(() => expectUnderTest(small).toBeGreaterThan(big)).toThrow(
+              'toBeGreaterThan',
+          );
+
+          expect(() => expectUnderTest(small).not.toBeLessThan(big)).toThrow(
+              'toBeLessThan',
+          );
+
+          expect(() => expectUnderTest(big).not.toBeGreaterThan(small)).toThrow(
+              'toBeGreaterThan',
+          );
+
+          expect(() => expectUnderTest(big).toBeLessThan(small)).toThrow(
+              'toBeLessThan',
+          );
+
+          expect(() => expectUnderTest(small).toBeGreaterThanOrEqual(big)).toThrow(
+              'toBeGreaterThanOrEqual',
+          );
+
+          expect(() => expectUnderTest(small).not.toBeLessThanOrEqual(big)).toThrow(
+              'toBeLessThanOrEqual',
+          );
+
+          expect(() => expectUnderTest(big).not.toBeGreaterThanOrEqual(small)).toThrow(
+              'toBeGreaterThanOrEqual',
+          );
+
+          expect(() => expectUnderTest(big).toBeLessThanOrEqual(small)).toThrow(
+              'toBeLessThanOrEqual',
+          );
+        });
+      });
+
+      [
+        [1, 1],
+        [Number.MIN_VALUE, Number.MIN_VALUE],
+        [Number.MAX_VALUE, Number.MAX_VALUE],
+        [Infinity, Infinity],
+        [-Infinity, -Infinity],
+      ].forEach(([n1, n2]) => {
+        test(`equal numbers: [${n1}, ${n2}]`, () => {
+          expectUnderTest(n1).toBeGreaterThanOrEqual(n2);
+          expectUnderTest(n1).toBeLessThanOrEqual(n2);
+
+          expect(() =>
+            expectUnderTest(n1).not.toBeGreaterThanOrEqual(n2),
+          ).toThrowErrorMatchingSnapshot();
+
+          expect(() =>
+            expectUnderTest(n1).not.toBeLessThanOrEqual(n2),
+          ).toThrowErrorMatchingSnapshot();
+        });
+      });
+
+      [
+        [BigInt(1), BigInt(1)],
+        [BigInt(Number.MAX_SAFE_INTEGER), BigInt(Number.MAX_SAFE_INTEGER)],
+      ].forEach(([n1, n2], index) => {
+        test(`equal numbers: [${n1}, ${n2}] (${index})`, () => {
+          expectUnderTest(n1).toBeGreaterThanOrEqual(n2);
+          expectUnderTest(n1).toBeLessThanOrEqual(n2);
+
+          expect(() => expectUnderTest(n1).not.toBeGreaterThanOrEqual(n2)).toThrow(
+              'toBeGreaterThanOrEqual',
+          );
+
+          expect(() => expectUnderTest(n1).not.toBeLessThanOrEqual(n2)).toThrow(
+              'toBeLessThanOrEqual',
+          );
+        });
+      });
+    },
+);
+
+test.describe('.toContain(), .toContainEqual()', () => {
+  const typedArray = new Int8Array(2);
+  typedArray[0] = 0;
+  typedArray[1] = 1;
+
+  test('iterable', () => {
+    // different node versions print iterable differently, so we can't
+    // use snapshots here.
+    const iterable = {
+      *[Symbol.iterator]() {
+        yield 1;
+        yield 2;
+        yield 3;
+      },
+    };
+
+    expectUnderTest(iterable).toContain(2);
+    expectUnderTest(iterable).toContainEqual(2);
+    expect(() => expectUnderTest(iterable).not.toContain(1)).toThrow('toContain');
+    expect(() => expectUnderTest(iterable).not.toContainEqual(1)).toThrow(
+        'toContainEqual',
+    );
+  });
+
+  [
+    [[1, 2, 3, 4], 1],
+    [['a', 'b', 'c', 'd'], 'a'],
+    [[undefined, null], null],
+    [[undefined, null], undefined],
+    [[Symbol.for('a')], Symbol.for('a')],
+    ['abcdef', 'abc'],
+    ['11112111', '2'],
+    [new Set(['abc', 'def']), 'abc'],
+    [typedArray, 1],
+  ].forEach(([list, v]) => {
+    test(`'${stringify(list)}' contains '${stringify(v)}'`, () => {
+      expectUnderTest(list).toContain(v);
+
+      expect(() =>
+        expectUnderTest(list).not.toContain(v),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [[BigInt(1), BigInt(2), BigInt(3), BigInt(4)], BigInt(1)],
+    [[1, 2, 3, BigInt(3), 4], BigInt(3)],
+  ].forEach(([list, v]) => {
+    test(`'${stringify(list)}' contains '${stringify(v)}'`, () => {
+      expectUnderTest(list).toContain(v);
+
+      expect(() => expectUnderTest(list).not.toContain(v)).toThrow('toContain');
+    });
+  });
+
+  [
+    [[1, 2, 3], 4],
+    [[null, undefined], 1],
+    [[{}, []], []],
+    [[{}, []], {}],
+  ].forEach(([list, v]) => {
+    test(`'${stringify(list)}' does not contain '${stringify(v)}'`, () => {
+      expectUnderTest(list).not.toContain(v);
+
+      expect(() =>
+        expectUnderTest(list).toContain(v),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [[[BigInt(1), BigInt(2), BigInt(3)], 3]].forEach(([list, v]) => {
+    test(`'${stringify(list)}' does not contain '${stringify(v)}'`, () => {
+      expectUnderTest(list).not.toContain(v);
+
+      expect(() => expectUnderTest(list).toContain(v)).toThrow('toContain');
+    });
+  });
+
+  test('error cases', () => {
+    expect(() => expectUnderTest(null).toContain(1)).toThrowErrorMatchingSnapshot();
+    expect(() => expectUnderTest('-0').toContain(-0)).toThrowErrorMatchingSnapshot();
+    expect(() =>
+      expectUnderTest('null').toContain(null),
+    ).toThrowErrorMatchingSnapshot();
+    expect(() =>
+      expectUnderTest('undefined').toContain(undefined),
+    ).toThrowErrorMatchingSnapshot();
+    expect(() =>
+      expectUnderTest('false').toContain(false),
+    ).toThrowErrorMatchingSnapshot();
+    expect(() => expectUnderTest('1').toContain(BigInt(1))).toThrow('toContain');
+  });
+
+  [
+    [[1, 2, 3, 4], 1],
+    [['a', 'b', 'c', 'd'], 'a'],
+    [[undefined, null], null],
+    [[undefined, null], undefined],
+    [[Symbol.for('a')], Symbol.for('a')],
+    [[{ a: 'b' }, { a: 'c' }], { a: 'b' }],
+    [new Set([1, 2, 3, 4]), 1],
+    [typedArray, 1],
+  ].forEach(([list, v]) => {
+    test(`'${stringify(list)}' contains a value equal to '${stringify(
+        v,
+    )}'`, () => {
+      expectUnderTest(list).toContainEqual(v);
+      expect(() =>
+        expectUnderTest(list).not.toContainEqual(v),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [[[{ a: 'b' }, { a: 'c' }], { a: 'd' }]].forEach(([list, v]) => {
+    test(`'${stringify(list)}' does not contain a value equal to'${stringify(
+        v,
+    )}'`, () => {
+      expectUnderTest(list).not.toContainEqual(v);
+
+      expect(() =>
+        expectUnderTest(list).toContainEqual(v),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  test('error cases for toContainEqual', () => {
+    expect(() =>
+      expectUnderTest(null).toContainEqual(1),
+    ).toThrowErrorMatchingSnapshot();
+  });
+});
+
+test.describe('.toBeCloseTo', () => {
+  [
+    [0, 0],
+    [0, 0.001],
+    [1.23, 1.229],
+    [1.23, 1.226],
+    [1.23, 1.225],
+    [1.23, 1.234],
+    [Infinity, Infinity],
+    [-Infinity, -Infinity],
+  ].forEach(([n1, n2]) => {
+    test(`{pass: true} expect(${n1}).toBeCloseTo(${n2})`, () => {
+      expectUnderTest(n1).toBeCloseTo(n2);
+
+      expect(() =>
+        expectUnderTest(n1).not.toBeCloseTo(n2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [0, 0.01],
+    [1, 1.23],
+    [1.23, 1.2249999],
+    [Infinity, -Infinity],
+    [Infinity, 1.23],
+    [-Infinity, -1.23],
+  ].forEach(([n1, n2]) => {
+    test(`{pass: false} expect(${n1}).toBeCloseTo(${n2})`, () => {
+      expectUnderTest(n1).not.toBeCloseTo(n2);
+
+      expect(() =>
+        expectUnderTest(n1).toBeCloseTo(n2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [3.141592e-7, 3e-7, 8],
+    [56789, 51234, -4],
+  ].forEach(([n1, n2, p]) => {
+    test(`{pass: false} expect(${n1}).toBeCloseTo(${n2}, ${p})`, () => {
+      expectUnderTest(n1).not.toBeCloseTo(n2, p);
+
+      expect(() =>
+        expectUnderTest(n1).toBeCloseTo(n2, p),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [0, 0.1, 0],
+    [0, 0.0001, 3],
+    [0, 0.000004, 5],
+    [2.0000002, 2, 5],
+  ].forEach(([n1, n2, p]) => {
+    test(`{pass: true} expect(${n1}).toBeCloseTo(${n2}, ${p})`, () => {
+      expectUnderTest(n1).toBeCloseTo(n2, p);
+
+      expect(() =>
+        expectUnderTest(n1).not.toBeCloseTo(n2, p),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  test.describe('throws: Matcher error', () => {
+    test('promise empty isNot false received', () => {
+      const precision = 3;
+      const expected = 0;
+      const received = '';
+      expect(() => {
+        expectUnderTest(received).toBeCloseTo(expected, precision);
+      }).toThrowErrorMatchingSnapshot();
+    });
+
+    test('promise empty isNot true expected', () => {
+      const received = 0.1;
+      // expected is undefined
+      expect(() => {
+        expectUnderTestAsAny(received).not.toBeCloseTo();
+      }).toThrowErrorMatchingSnapshot();
+    });
+
+    test('promise rejects isNot false expected', () => {
+      const expected = '0';
+      const received = Promise.reject(0.01);
+      return expect(
+          expectUnderTestAsAny(received).rejects.toBeCloseTo(expected),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+
+    test('promise rejects isNot true received', () => {
+      const expected = 0;
+      const received = Promise.reject(Symbol('0.1'));
+      return expect(
+          expectUnderTest(received).rejects.not.toBeCloseTo(expected),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+
+    test('promise resolves isNot false received', () => {
+      const precision = 3;
+      const expected = 0;
+      const received = Promise.resolve(false);
+      return expect(
+          expectUnderTest(received).resolves.toBeCloseTo(expected, precision),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+
+    test('promise resolves isNot true expected', () => {
+      const precision = 3;
+      const expected = null;
+      const received = Promise.resolve(0.1);
+      return expect(
+          expectUnderTest(received).resolves.not.toBeCloseTo(expected, precision),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+  });
+});
+
+test.describe('.toMatch()', () => {
+  [
+    ['foo', 'foo'],
+    ['Foo bar', /^foo/i],
+  ].forEach(([n1, n2]) => {
+    test(`{pass: true} expect(${n1}).toMatch(${n2})`, () => {
+      expectUnderTest(n1).toMatch(n2);
+
+      expect(() =>
+        expectUnderTest(n1).not.toMatch(n2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    ['bar', 'foo'],
+    ['bar', /foo/],
+  ].forEach(([n1, n2]) => {
+    test(`throws: [${n1}, ${n2}]`, () => {
+      expect(() => expectUnderTest(n1).toMatch(n2)).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [1, 'foo'],
+    [{}, 'foo'],
+    [[], 'foo'],
+    [true, 'foo'],
+    [/foo/i, 'foo'],
+    [() => { }, 'foo'],
+    [undefined, 'foo'],
+  ].forEach(([n1, n2]) => {
+    test(
+        'throws if non String actual value passed:' +
+      ` [${stringify(n1)}, ${stringify(n2)}]`,
+        () => {
+          // @ts-ignore
+          expect(() => expectUnderTest(n1).toMatch(n2)).toThrowErrorMatchingSnapshot();
+        },
+    );
+  });
+
+  [
+    ['foo', 1],
+    ['foo', {}],
+    ['foo', []],
+    ['foo', true],
+    ['foo', () => { }],
+    ['foo', undefined],
+  ].forEach(([n1, n2]) => {
+    test(
+        'throws if non String/RegExp expected value passed:' +
+      ` [${stringify(n1)}, ${stringify(n2)}]`,
+        () => {
+          // @ts-ignore
+          expect(() => expectUnderTest(n1).toMatch(n2)).toThrowErrorMatchingSnapshot();
+        },
+    );
+  });
+
+  test('escapes strings properly', () => {
+    expectUnderTest('this?: throws').toMatch('this?: throws');
+  });
+
+  test('does not maintain RegExp state between calls', () => {
+    const regex = /[f]\d+/gi;
+    expectUnderTest('f123').toMatch(regex);
+    expectUnderTest('F456').toMatch(regex);
+    expectUnderTest(regex.lastIndex).toBe(0);
+  });
+});
+
+test.describe('.toHaveLength', () => {
+  [
+    [[1, 2], 2],
+    [[], 0],
+    [['a', 'b'], 2],
+    ['abc', 3],
+    ['', 0],
+    [() => { }, 0],
+  ].forEach(([received, length]) => {
+    test(`{pass: true} expect(${stringify(
+        received,
+    )}).toHaveLength(${length})`, () => {
+      expectUnderTestAsAny(received).toHaveLength(length);
+      expect(() =>
+        expectUnderTestAsAny(received).not.toHaveLength(length),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [[1, 2], 3],
+    [[], 1],
+    [['a', 'b'], 99],
+    ['abc', 66],
+    ['', 1],
+  ].forEach(([received, length]) => {
+    test(`{pass: false} expect(${stringify(
+        received,
+    )}).toHaveLength(${length})`, () => {
+      expectUnderTestAsAny(received).not.toHaveLength(length);
+      expect(() =>
+        expectUnderTestAsAny(received).toHaveLength(length),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  test('error cases', () => {
+    expect(() =>
+      expectUnderTest({ a: 9 }).toHaveLength(1),
+    ).toThrowErrorMatchingSnapshot();
+    expect(() => expectUnderTest(0).toHaveLength(1)).toThrowErrorMatchingSnapshot();
+    expect(() =>
+      expectUnderTest(undefined).not.toHaveLength(1),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  test.describe('matcher error expected length', () => {
+    test('not number', () => {
+      const expected = '3';
+      const received = 'abc';
+      expect(() => {
+        expectUnderTestAsAny(received).not.toHaveLength(expected);
+      }).toThrowErrorMatchingSnapshot();
+    });
+
+    test('number Infinity', () => {
+      const expected = Infinity;
+      const received = Promise.reject('abc');
+      return expect(
+          expectUnderTest(received).rejects.toHaveLength(expected),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+
+    test('number NaN', () => {
+      const expected = NaN;
+      const received = Promise.reject('abc');
+      return expect(
+          expectUnderTest(received).rejects.not.toHaveLength(expected),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+
+    test('number float', () => {
+      const expected = 0.5;
+      const received = Promise.resolve('abc');
+      return expect(
+          expectUnderTest(received).resolves.toHaveLength(expected),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+
+    test('number negative integer', () => {
+      const expected = -3;
+      const received = Promise.resolve('abc');
+      return expect(
+          expectUnderTest(received).resolves.not.toHaveLength(expected),
+      // @ts-ignore
+      ).rejects.toThrowErrorMatchingSnapshotAsync();
+    });
+  });
+});
+
+test.describe('.toHaveProperty()', () => {
+  class Foo {
+    val: any;
+    get a() {
+      return undefined;
+    }
+    get b() {
+      return 'b';
+    }
+
+    set setter(val) {
+      this.val = val;
+    }
+  }
+
+  class Foo2 extends Foo {
+    get c() {
+      return 'c';
+    }
+  }
+  const foo2 = new Foo2();
+  foo2.setter = true;
+
+  function E(nodeName) {
+    this.nodeName = nodeName.toUpperCase();
+  }
+  E.prototype.nodeType = 1;
+
+  const memoized = function() { };
+  memoized.memo = [];
+
+  const pathDiff = ['children', 0];
+
+  const receivedDiffSingle = {
+    children: ['"That cartoon"'],
+    props: null,
+    type: 'p',
+  };
+  const valueDiffSingle = '"That cat cartoon"';
+
+  const receivedDiffMultiple = {
+    children: [
+      'Roses are red.\nViolets are blue.\nTesting with Jest is good for you.',
+    ],
+    props: null,
+    type: 'pre',
+  };
+  const valueDiffMultiple =
+    'Roses are red, violets are blue.\nTesting with Jest\nIs good for you.';
+
+  [
+    [{ a: { b: { c: { d: 1 } } } }, 'a.b.c.d', 1],
+    [{ a: { b: { c: { d: 1 } } } }, ['a', 'b', 'c', 'd'], 1],
+    [{ 'a.b.c.d': 1 }, ['a.b.c.d'], 1],
+    [{ a: { b: [1, 2, 3] } }, ['a', 'b', 1], 2],
+    [{ a: { b: [1, 2, 3] } }, ['a', 'b', 1], expect.any(Number)],
+    [{ a: 0 }, 'a', 0],
+    [{ a: { b: undefined } }, 'a.b', undefined],
+    [{ a: { b: { c: 5 } } }, 'a.b', { c: 5 }],
+    [{ a: { b: [{ c: [{ d: 1 }] }] } }, 'a.b[0].c[0].d', 1],
+    [{ a: { b: [{ c: { d: [{ e: 1 }, { f: 2 }] } }] } }, 'a.b[0].c.d[1].f', 2],
+    [{ a: { b: [[{ c: [{ d: 1 }] }]] } }, 'a.b[0][0].c[0].d', 1],
+    [Object.assign(Object.create(null), { property: 1 }), 'property', 1],
+    [new Foo(), 'a', undefined],
+    [new Foo(), 'b', 'b'],
+    [new Foo(), 'setter', undefined],
+    [foo2, 'a', undefined],
+    [foo2, 'c', 'c'],
+    [foo2, 'val', true],
+    [new E('div'), 'nodeType', 1],
+    ['', 'length', 0],
+    [memoized, 'memo', []],
+    [{ '': 1 }, '', 1],
+  ].forEach(([obj, keyPath, value]) => {
+    test(`{pass: true} expect(${stringify(
+        obj,
+    )}).toHaveProperty('${keyPath}', ${stringify(value)})`, () => {
+      expectUnderTestAsAny(obj).toHaveProperty(keyPath, value);
+      expect(() =>
+        expectUnderTestAsAny(obj).not.toHaveProperty(keyPath, value),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [{ a: { b: { c: { d: 1 } } } }, 'a.b.ttt.d', 1],
+    [{ a: { b: { c: { d: 1 } } } }, 'a.b.c.d', 2],
+    [{ 'a.b.c.d': 1 }, 'a.b.c.d', 2],
+    [{ 'a.b.c.d': 1 }, ['a.b.c.d'], 2],
+    [receivedDiffSingle, pathDiff, valueDiffSingle],
+    [receivedDiffMultiple, pathDiff, valueDiffMultiple],
+    [{ a: { b: { c: { d: 1 } } } }, ['a', 'b', 'c', 'd'], 2],
+    [{ a: { b: { c: {} } } }, 'a.b.c.d', 1],
+    [{ a: 1 }, 'a.b.c.d', 5],
+    [{}, 'a', 'test'],
+    [{ a: { b: 3 } }, 'a.b', undefined],
+    [1, 'a.b.c', 'test'],
+    ['abc', 'a.b.c', { a: 5 }],
+    [{ a: { b: { c: 5 } } }, 'a.b', { c: 4 }],
+    [new Foo(), 'a', 'a'],
+    [new Foo(), 'b', undefined],
+    [{ a: {} }, 'a.b', undefined],
+  ].forEach(([obj, keyPath, value], index) => {
+    test(`{pass: false} expect(${stringify(
+        obj,
+    )}).toHaveProperty('${keyPath}', ${stringify(value)})  (${index})`, () => {
+      expect(() =>
+        expectUnderTestAsAny(obj).toHaveProperty(keyPath, value),
+      ).toThrowErrorMatchingSnapshot();
+      expectUnderTestAsAny(obj).not.toHaveProperty(keyPath, value);
+    });
+  });
+
+  [
+    [{ a: { b: { c: { d: 1 } } } }, 'a.b.c.d'],
+    [{ a: { b: { c: { d: 1 } } } }, ['a', 'b', 'c', 'd']],
+    [{ 'a.b.c.d': 1 }, ['a.b.c.d']],
+    [{ a: { b: [1, 2, 3] } }, ['a', 'b', 1]],
+    [{ a: 0 }, 'a'],
+    [{ a: { b: undefined } }, 'a.b'],
+  ].forEach(([obj, keyPath]) => {
+    test(`{pass: true} expect(${stringify(
+        obj,
+    )}).toHaveProperty('${keyPath}')`, () => {
+      expectUnderTestAsAny(obj).toHaveProperty(keyPath);
+      expect(() =>
+        expectUnderTestAsAny(obj).not.toHaveProperty(keyPath),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  [
+    [{ a: { b: { c: {} } } }, 'a.b.c.d'],
+    [{ a: { b: { c: {} } } }, '.a.b.c'],
+    [{ a: 1 }, 'a.b.c.d'],
+    [{}, 'a'],
+    [1, 'a.b.c'],
+    ['abc', 'a.b.c'],
+    [false, 'key'],
+    [0, 'key'],
+    ['', 'key'],
+    [Symbol(), 'key'],
+    [Object.assign(Object.create(null), { key: 1 }), 'not'],
+  ].forEach(([obj, keyPath]) => {
+    test(`{pass: false} expect(${stringify(
+        obj,
+    )}).toHaveProperty('${keyPath}')`, () => {
+      expect(() =>
+        expectUnderTest(obj).toHaveProperty(keyPath),
+      ).toThrowErrorMatchingSnapshot();
+      expectUnderTest(obj).not.toHaveProperty(keyPath);
+    });
+  });
+
+  [
+    [null, 'a.b'],
+    [undefined, 'a'],
+    [{ a: { b: {} } }, undefined],
+    [{ a: { b: {} } }, null],
+    [{ a: { b: {} } }, 1],
+    [{}, []], // Residue: pass must be initialized
+  ].forEach(([obj, keyPath]) => {
+    test(`{error} expect(${stringify(
+        obj,
+    )}).toHaveProperty('${keyPath}')`, () => {
+      expect(() =>
+        expectUnderTestAsAny(obj).toHaveProperty(keyPath),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+});
+
+test.describe('toMatchObject()', () => {
+  class Foo {
+    get a() {
+      return undefined;
+    }
+    get b() {
+      return 'b';
+    }
+  }
+
+  class Sub extends Foo {
+    get c() {
+      return 'c';
+    }
+  }
+
+  const withDefineProperty = (obj, key, val) => {
+    Object.defineProperty(obj, key, {
+      get() {
+        return val;
+      },
+    });
+
+    return obj;
+  };
+
+  const testNotToMatchSnapshots = tuples => {
+    tuples.forEach(([n1, n2]) => {
+      test(`{pass: true} expect(${stringify(n1)}).toMatchObject(${stringify(
+          n2,
+      )})`, () => {
+        expectUnderTest(n1).toMatchObject(n2);
+        expect(() =>
+          expectUnderTest(n1).not.toMatchObject(n2),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    });
+  };
+
+  const testToMatchSnapshots = tuples => {
+    tuples.forEach(([n1, n2]) => {
+      test(`{pass: false} expect(${stringify(n1)}).toMatchObject(${stringify(
+          n2,
+      )})`, () => {
+        expectUnderTest(n1).not.toMatchObject(n2);
+        expect(() =>
+          expectUnderTest(n1).toMatchObject(n2),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    });
+  };
+
+  test.describe('circular references', () => {
+    test.describe('simple circular references', () => {
+      const circularObjA1: any = { a: 'hello' };
+      circularObjA1.ref = circularObjA1;
+
+      const circularObjB: any = { a: 'world' };
+      circularObjB.ref = circularObjB;
+
+      const circularObjA2: any = { a: 'hello' };
+      circularObjA2.ref = circularObjA2;
+
+      const primitiveInsteadOfRef: any = {};
+      primitiveInsteadOfRef.ref = 'not a ref';
+
+      testNotToMatchSnapshots([
+        [circularObjA1, {}],
+        [circularObjA2, circularObjA1],
+      ]);
+
+      testToMatchSnapshots([
+        [{}, circularObjA1],
+        [circularObjA1, circularObjB],
+        [primitiveInsteadOfRef, circularObjA1],
+      ]);
+    });
+
+    test.describe('transitive circular references', () => {
+      const transitiveCircularObjA1: any = { a: 'hello' };
+      transitiveCircularObjA1.nestedObj = { parentObj: transitiveCircularObjA1 };
+
+      const transitiveCircularObjA2: any = { a: 'hello' };
+      transitiveCircularObjA2.nestedObj = {
+        parentObj: transitiveCircularObjA2,
+      };
+
+      const transitiveCircularObjB: any = { a: 'world' };
+      transitiveCircularObjB.nestedObj = {
+        parentObj: transitiveCircularObjB,
+      };
+
+      const primitiveInsteadOfRef: any = {};
+      primitiveInsteadOfRef.nestedObj = {
+        parentObj: 'not the parent ref',
+      };
+
+      testNotToMatchSnapshots([
+        [transitiveCircularObjA1, {}],
+        [transitiveCircularObjA2, transitiveCircularObjA1],
+      ]);
+
+      testToMatchSnapshots([
+        [{}, transitiveCircularObjA1],
+        [transitiveCircularObjB, transitiveCircularObjA1],
+        [primitiveInsteadOfRef, transitiveCircularObjA1],
+      ]);
+    });
+  });
+
+  testNotToMatchSnapshots([
+    [{ a: 'b', c: 'd' }, { a: 'b' }],
+    [
+      { a: 'b', c: 'd' },
+      { a: 'b', c: 'd' },
+    ],
+    [
+      { a: 'b', t: { x: { r: 'r' }, z: 'z' } },
+      { a: 'b', t: { z: 'z' } },
+    ],
+    [{ a: 'b', t: { x: { r: 'r' }, z: 'z' } }, { t: { x: { r: 'r' } } }],
+    [{ a: [3, 4, 5], b: 'b' }, { a: [3, 4, 5] }],
+    [{ a: [3, 4, 5, 'v'], b: 'b' }, { a: [3, 4, 5, 'v'] }],
+    [{ a: 1, c: 2 }, { a: expectUnderTest.any(Number) }],
+    [{ a: { x: 'x', y: 'y' } }, { a: { x: expectUnderTest.any(String) } }],
+    [new Set([1, 2]), new Set([1, 2])],
+    [new Set([1, 2]), new Set([2, 1])],
+    [new Date('2015-11-30'), new Date('2015-11-30')],
+    [{ a: new Date('2015-11-30'), b: 'b' }, { a: new Date('2015-11-30') }],
+    [{ a: null, b: 'b' }, { a: null }],
+    [{ a: undefined, b: 'b' }, { a: undefined }],
+    [{ a: [{ a: 'a', b: 'b' }] }, { a: [{ a: 'a' }] }],
+    [
+      [1, 2],
+      [1, 2],
+    ],
+    [{ a: undefined }, { a: undefined }],
+    [[], []],
+    [new Error('foo'), new Error('foo')],
+    [new Error('bar'), { message: 'bar' }],
+    [new Foo(), { a: undefined, b: 'b' }],
+    [Object.assign(Object.create(null), { a: 'b' }), { a: 'b' }],
+    [
+      { a: 'b', c: 'd', [Symbol.for('jest')]: 'jest' },
+      { a: 'b', [Symbol.for('jest')]: 'jest' },
+    ],
+    [
+      { a: 'b', c: 'd', [Symbol.for('jest')]: 'jest' },
+      { a: 'b', c: 'd', [Symbol.for('jest')]: 'jest' },
+    ],
+    // These snapshots will show {} as the object because the properties
+    // are not enumerable. We will need to somehow make the serialization of
+    // these keys a little smarter before reporting accurately.
+    [new Sub(), { a: undefined, b: 'b', c: 'c' }],
+    [withDefineProperty(new Sub(), 'd', 4), { d: 4 }],
+    [{ a: 'b', toString() { } }, { toString: expectUnderTest.any(Function) }],
+  ]);
+
+  testToMatchSnapshots([
+    [{ a: 'b', c: 'd' }, { e: 'b' }],
+    [
+      { a: 'b', c: 'd' },
+      { a: 'b!', c: 'd' },
+    ],
+    [{ a: 'a', c: 'd' }, { a: expectUnderTest.any(Number) }],
+    [
+      { a: 'b', t: { x: { r: 'r' }, z: 'z' } },
+      { a: 'b', t: { z: [3] } },
+    ],
+    [{ a: 'b', t: { x: { r: 'r' }, z: 'z' } }, { t: { l: { r: 'r' } } }],
+    [{ a: [3, 4, 5], b: 'b' }, { a: [3, 4, 5, 6] }],
+    [{ a: [3, 4, 5], b: 'b' }, { a: [3, 4] }],
+    [{ a: [3, 4, 'v'], b: 'b' }, { a: ['v'] }],
+    [{ a: [3, 4, 5], b: 'b' }, { a: { b: 4 } }],
+    [{ a: [3, 4, 5], b: 'b' }, { a: { b: expectUnderTest.any(String) } }],
+    [
+      [1, 2],
+      [1, 3],
+    ],
+    [[0], [-0]],
+    [new Set([1, 2]), new Set([2])],
+    [new Date('2015-11-30'), new Date('2015-10-10')],
+    [{ a: new Date('2015-11-30'), b: 'b' }, { a: new Date('2015-10-10') }],
+    [{ a: null, b: 'b' }, { a: '4' }],
+    [{ a: null, b: 'b' }, { a: undefined }],
+    [{ a: undefined }, { a: null }],
+    [{ a: [{ a: 'a', b: 'b' }] }, { a: [{ a: 'c' }] }],
+    [{ a: 1, b: 1, c: 1, d: { e: { f: 555 } } }, { d: { e: { f: 222 } } }],
+    [{}, { a: undefined }],
+    [
+      [1, 2, 3],
+      [2, 3, 1],
+    ],
+    [
+      [1, 2, 3],
+      [1, 2, 2],
+    ],
+    [new Error('foo'), new Error('bar')],
+    [Object.assign(Object.create(null), { a: 'b' }), { c: 'd' }],
+    [
+      { a: 'b', c: 'd', [Symbol.for('jest')]: 'jest' },
+      { a: 'c', [Symbol.for('jest')]: expect.any(String) },
+    ],
+    [{ a: 'b' }, { toString: expectUnderTest.any(Function) }],
+  ]);
+
+  [
+    [null, {}],
+    [4, {}],
+    ['44', {}],
+    [true, {}],
+    [undefined, {}],
+    [{}, null],
+    [{}, 4],
+    [{}, 'some string'],
+    [{}, true],
+    [{}, undefined],
+  ].forEach(([n1, n2]: [any, any, string]) => {
+    test(`throws expect(${stringify(n1)}).toMatchObject(${stringify(
+        n2,
+    )})`, () => {
+      expect(() =>
+        expectUnderTest(n1).toMatchObject(n2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+
+  test('does not match properties up in the prototype chain', () => {
+    const a: any = {};
+    a.ref = a;
+
+    const b = Object.create(a);
+    b.other = 'child';
+
+    const matcher: any = { other: 'child' };
+    matcher.ref = matcher;
+
+    expectUnderTest(b).not.toMatchObject(matcher);
+    expect(() =>
+      expectUnderTest(b).toMatchObject(matcher),
+    ).toThrowErrorMatchingSnapshot();
+  });
+
+  test('toMatchObject ignores symbol key properties', () => {
+    // issue 13638
+    const sym = Symbol('foo');
+    const sym2 = Symbol('foo2');
+    expectUnderTestAsAny({}).not.toMatchObject({ [sym]: true });
+    expectUnderTestAsAny({ [sym]: true }).not.toMatchObject({ [sym2]: true });
+    expectUnderTestAsAny({ [sym]: true }).not.toMatchObject({ [sym]: false });
+    expectUnderTestAsAny({ example: 10, [sym]: true }).not.toMatchObject({
+      example: 12,
+      [sym]: true,
+    });
+    expectUnderTestAsAny({ [sym]: true }).toMatchObject({ [sym]: true });
+    expectUnderTestAsAny({ example: 10, [sym]: true }).toMatchObject({
+      example: 10,
+      [sym]: true,
+    });
+  });
+});
diff --git a/tests/expect/spyMatchers.snapshots.js b/tests/expect/spyMatchers.snapshots.js
new file mode 100644
index 0000000000000..720620fae6eaf
--- /dev/null
+++ b/tests/expect/spyMatchers.snapshots.js
@@ -0,0 +1,2600 @@
+module.exports["toBeCalled works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toBeCalled<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toBeCalled passes when called"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalled<d>()</>
+
+Expected number of calls: <g>0</>
+Received number of calls: <r>1</>
+
+1: <r>"arg0"</>, <r>"arg1"</>, <r>"arg2"</>`;
+
+module.exports["toBeCalled .not passes when called"] = `<d>expect(</><r>spy</><d>).</>toBeCalled<d>()</>
+
+Expected number of calls: >= <g>1</>
+Received number of calls:    <r>0</>`;
+
+module.exports["toBeCalled fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>toBeCalled<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toBeCalled .not fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalled<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toBeCalled includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toBeCalled<d>()</>
+
+Expected number of calls: <g>0</>
+Received number of calls: <r>1</>
+
+1: called with 0 arguments`;
+
+module.exports["toHaveBeenCalled works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalled<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveBeenCalled passes when called"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalled<d>()</>
+
+Expected number of calls: <g>0</>
+Received number of calls: <r>1</>
+
+1: <r>"arg0"</>, <r>"arg1"</>, <r>"arg2"</>`;
+
+module.exports["toHaveBeenCalled .not passes when called"] = `<d>expect(</><r>spy</><d>).</>toHaveBeenCalled<d>()</>
+
+Expected number of calls: >= <g>1</>
+Received number of calls:    <r>0</>`;
+
+module.exports["toHaveBeenCalled fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalled<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toHaveBeenCalled .not fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalled<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toHaveBeenCalled includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toHaveBeenCalled<d>()</>
+
+Expected number of calls: <g>0</>
+Received number of calls: <r>1</>
+
+1: called with 0 arguments`;
+
+module.exports["toBeCalledTimes .not works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toBeCalledTimes only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toBeCalledTimes only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toBeCalledTimes only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toBeCalledTimes only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toBeCalledTimes only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toBeCalledTimes only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toBeCalledTimes .not only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toBeCalledTimes .not only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toBeCalledTimes .not only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toBeCalledTimes .not only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toBeCalledTimes .not only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toBeCalledTimes .not only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toBeCalledTimes passes if function called equal to expected times"] = `<d>expect(</><r>spy</><d>).</>not<d>.</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: not <g>2</>`;
+
+module.exports["toBeCalledTimes .not passes if function called more than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: <g>2</>
+Received number of calls: <r>3</>`;
+
+module.exports["toBeCalledTimes .not passes if function called less than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: <g>2</>
+Received number of calls: <r>1</>`;
+
+module.exports["toBeCalledTimes includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toBeCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: <g>2</>
+Received number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledTimes .not works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveBeenCalledTimes only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toHaveBeenCalledTimes only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toHaveBeenCalledTimes only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toHaveBeenCalledTimes only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toHaveBeenCalledTimes only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toHaveBeenCalledTimes only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toHaveBeenCalledTimes .not only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toHaveBeenCalledTimes .not only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toHaveBeenCalledTimes .not only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toHaveBeenCalledTimes .not only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toHaveBeenCalledTimes .not only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toHaveBeenCalledTimes .not only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toHaveBeenCalledTimes passes if function called equal to expected times"] = `<d>expect(</><r>spy</><d>).</>not<d>.</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: not <g>2</>`;
+
+module.exports["toHaveBeenCalledTimes .not passes if function called more than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: <g>2</>
+Received number of calls: <r>3</>`;
+
+module.exports["toHaveBeenCalledTimes .not passes if function called less than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: <g>2</>
+Received number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledTimes includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toHaveBeenCalledTimes<d>(</><g>expected</><d>)</>
+
+Expected number of calls: <g>2</>
+Received number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["lastCalledWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>0</>`;
+
+module.exports["lastCalledWith works with arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with arguments that don't match in number of arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <d>"bar"</>, <r>"plop"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with arguments that don't match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>Any<String></>, <g>Any<Number></>
+Received: <d>"foo"</>, <r>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with arguments that don't match with matchers even when argument is undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>Any<String></>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with arguments that don't match in size even if one is an optional matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>optionalFn<></>
+Received: <d>"foo"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with arguments that match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with arguments that match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Any<String></>, <g>Any<String></>
+Received:     <r>0</>, <r>["foo", "bar"]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with trailing undefined arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with trailing undefined arguments if requested by the match query"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with trailing undefined arguments when explicitly requested as optional by matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>optionalFn<></>
+Received:     <r>0</>, <r>["foo", undefined]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Map {</>
+<g>-   "a" => "b",</>
+<g>-   "b" => "a",</>
+<r>+   1 => 2,</>
+<r>+   2 => 1,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Set {</>
+<g>-   3,</>
+<g>-   4,</>
+<r>+   1,</>
+<r>+   2,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with Immutable.js objects"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>, <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["lastCalledWith works with many arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+Received
+       2:     <d>"foo"</>, <r>"bar1"</>
+->     3:     <d>"foo"</>, <d>"bar"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["lastCalledWith works with many arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received
+       2: <d>"foo"</>, <r>"bar2"</>
+->     3: <d>"foo"</>, <r>"bar3"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["lastCalledWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>lastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveBeenLastCalledWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>0</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that don't match in number of arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <d>"bar"</>, <r>"plop"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that don't match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>Any<String></>, <g>Any<Number></>
+Received: <d>"foo"</>, <r>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that don't match with matchers even when argument is undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>Any<String></>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that don't match in size even if one is an optional matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>optionalFn<></>
+Received: <d>"foo"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with arguments that match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Any<String></>, <g>Any<String></>
+Received:     <r>0</>, <r>["foo", "bar"]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with trailing undefined arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with trailing undefined arguments if requested by the match query"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with trailing undefined arguments when explicitly requested as optional by matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>optionalFn<></>
+Received:     <r>0</>, <r>["foo", undefined]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Map {</>
+<g>-   "a" => "b",</>
+<g>-   "b" => "a",</>
+<r>+   1 => 2,</>
+<r>+   2 => 1,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Set {</>
+<g>-   3,</>
+<g>-   4,</>
+<r>+   1,</>
+<r>+   2,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with Immutable.js objects"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>, <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenLastCalledWith works with many arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+Received
+       2:     <d>"foo"</>, <r>"bar1"</>
+->     3:     <d>"foo"</>, <d>"bar"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toHaveBeenLastCalledWith works with many arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received
+       2: <d>"foo"</>, <r>"bar2"</>
+->     3: <d>"foo"</>, <r>"bar3"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toHaveBeenLastCalledWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toHaveBeenLastCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["nthCalledWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>0</>`;
+
+module.exports["nthCalledWith works with arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with arguments that don't match in number of arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <d>"bar"</>, <r>"plop"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with arguments that don't match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>Any<String></>, <g>Any<Number></>
+Received: <d>"foo"</>, <r>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with arguments that don't match with matchers even when argument is undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>Any<String></>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with arguments that don't match in size even if one is an optional matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>optionalFn<></>
+Received: <d>"foo"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with arguments that match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with arguments that match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Any<String></>, <g>Any<String></>
+Received:     <r>0</>, <r>["foo", "bar"]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with trailing undefined arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with trailing undefined arguments if requested by the match query"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with trailing undefined arguments when explicitly requested as optional by matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>optionalFn<></>
+Received:     <r>0</>, <r>["foo", undefined]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Map {</>
+<g>-   "a" => "b",</>
+<g>-   "b" => "a",</>
+<r>+   1 => 2,</>
+<r>+   2 => 1,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Set {1, 2}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Set {</>
+<g>-   3,</>
+<g>-   4,</>
+<r>+   1,</>
+<r>+   2,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with Immutable.js objects"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>, <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["nthCalledWith works with three calls"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo1"</>, <g>"bar"</>
+Received
+->     1:     <d>"foo1"</>, <d>"bar"</>
+       2:     <r>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["nthCalledWith positive throw matcher error for n that is not positive integer"] = `<d>expect(</><r>received</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0`;
+
+module.exports["nthCalledWith positive throw matcher error for n that is not integer"] = `<d>expect(</><r>received</><d>).</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0.1`;
+
+module.exports["nthCalledWith negative throw matcher error for n that is not integer"] = `<d>expect(</><r>received</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: Infinity`;
+
+module.exports["nthCalledWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>nthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveBeenNthCalledWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>0</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that don't match in number of arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <d>"bar"</>, <r>"plop"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that don't match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>Any<String></>, <g>Any<Number></>
+Received: <d>"foo"</>, <r>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that don't match with matchers even when argument is undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>Any<String></>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that don't match in size even if one is an optional matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>, <g>optionalFn<></>
+Received: <d>"foo"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with arguments that match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Any<String></>, <g>Any<String></>
+Received:     <r>0</>, <r>["foo", "bar"]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with trailing undefined arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with trailing undefined arguments if requested by the match query"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with trailing undefined arguments when explicitly requested as optional by matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>optionalFn<></>
+Received:     <r>0</>, <r>["foo", undefined]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Map {</>
+<g>-   "a" => "b",</>
+<g>-   "b" => "a",</>
+<r>+   1 => 2,</>
+<r>+   2 => 1,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Set {1, 2}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Set {</>
+<g>-   3,</>
+<g>-   4,</>
+<r>+   1,</>
+<r>+   2,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with Immutable.js objects"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>, <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenNthCalledWith works with three calls"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo1"</>, <g>"bar"</>
+Received
+->     1:     <d>"foo1"</>, <d>"bar"</>
+       2:     <r>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toHaveBeenNthCalledWith positive throw matcher error for n that is not positive integer"] = `<d>expect(</><r>received</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0`;
+
+module.exports["toHaveBeenNthCalledWith positive throw matcher error for n that is not integer"] = `<d>expect(</><r>received</><d>).</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0.1`;
+
+module.exports["toHaveBeenNthCalledWith negative throw matcher error for n that is not integer"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: Infinity`;
+
+module.exports["toHaveBeenNthCalledWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toHaveBeenNthCalledWith<d>(</>n<d>, </><g>...expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toBeCalledWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>0</>`;
+
+module.exports["toBeCalledWith works with arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with arguments that don't match in number of arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <d>"bar"</>, <r>"plop"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with arguments that don't match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>Any<String></>, <g>Any<Number></>
+Received: <d>"foo"</>, <r>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with arguments that don't match with matchers even when argument is undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>Any<String></>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with arguments that don't match in size even if one is an optional matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>optionalFn<></>
+Received: <d>"foo"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with arguments that match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with arguments that match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Any<String></>, <g>Any<String></>
+Received:     <r>0</>, <r>["foo", "bar"]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with trailing undefined arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with trailing undefined arguments if requested by the match query"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with trailing undefined arguments when explicitly requested as optional by matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>optionalFn<></>
+Received:     <r>0</>, <r>["foo", undefined]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Map {</>
+<g>-   "a" => "b",</>
+<g>-   "b" => "a",</>
+<r>+   1 => 2,</>
+<r>+   2 => 1,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Set {</>
+<g>-   3,</>
+<g>-   4,</>
+<r>+   1,</>
+<r>+   2,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with Immutable.js objects"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>, <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toBeCalledWith works with many arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+Received
+       3:     <d>"foo"</>, <d>"bar"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toBeCalledWith works with many arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received
+       1: <d>"foo"</>, <r>"bar1"</>
+       2: <d>"foo"</>, <r>"bar2"</>
+       3: <d>"foo"</>, <r>"bar3"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toBeCalledWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toBeCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock or spy function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveBeenCalledWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>0</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <r>"bar1"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that don't match in number of arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received: <d>"foo"</>, <d>"bar"</>, <r>"plop"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that don't match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>Any<String></>, <g>Any<Number></>
+Received: <d>"foo"</>, <r>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that don't match with matchers even when argument is undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>Any<String></>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that don't match in size even if one is an optional matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>optionalFn<></>
+Received: <d>"foo"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with arguments that match with matchers"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Any<String></>, <g>Any<String></>
+Received:     <r>0</>, <r>["foo", "bar"]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with trailing undefined arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>
+Received: <d>"foo"</>, <r>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with trailing undefined arguments if requested by the match query"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>undefined</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with trailing undefined arguments when explicitly requested as optional by matcher"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>optionalFn<></>
+Received:     <r>0</>, <r>["foo", undefined]</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Map {</>
+<g>-   "a" => "b",</>
+<g>-   "b" => "a",</>
+<r>+   1 => 2,</>
+<r>+   2 => 1,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+<g>- Expected</>
+<r>+ Received</>
+
+<d>  Set {</>
+<g>-   3,</>
+<g>-   4,</>
+<r>+   1,</>
+<r>+   2,</>
+<d>  }</>,
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with Immutable.js objects"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>, <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toHaveBeenCalledWith works with many arguments"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+Received
+       3:     <d>"foo"</>, <d>"bar"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toHaveBeenCalledWith works with many arguments that don't match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: <g>"foo"</>, <g>"bar"</>
+Received
+       1: <d>"foo"</>, <r>"bar1"</>
+       2: <d>"foo"</>, <r>"bar2"</>
+       3: <d>"foo"</>, <r>"bar3"</>
+
+Number of calls: <r>3</>`;
+
+module.exports["toHaveBeenCalledWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toHaveBeenCalledWith<d>(</><g>...expected</><d>)</>
+
+Expected: not <g>"foo"</>, <g>"bar"</>
+
+Number of calls: <r>1</>`;
+
+module.exports["toReturn .not works only on mock.fn"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturn<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toReturn throw matcher error if received is spy"] = `<d>expect(</><r>received</><d>).</>toReturn<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function spy]</>`;
+
+module.exports["toReturn passes when returned"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturn<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>1</>
+
+1: <r>42</>`;
+
+module.exports["toReturn passes when undefined is returned"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturn<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>1</>
+
+1: <r>undefined</>`;
+
+module.exports["toReturn passes when at least one call does not throw"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturn<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>2</>
+
+1: <r>42</>
+3: <r>42</>
+
+Received number of calls:   <r>3</>`;
+
+module.exports["toReturn .not passes when not returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturn<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>`;
+
+module.exports["toReturn .not passes when all calls throw"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturn<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>
+Received number of calls:      <r>2</>`;
+
+module.exports["toReturn .not passes when a call throws undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturn<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>
+Received number of calls:      <r>1</>`;
+
+module.exports["toReturn fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>toReturn<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toReturn .not fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturn<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toReturn includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toReturn<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>1</>
+
+1: <r>42</>`;
+
+module.exports["toReturn incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturn<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>
+Received number of calls:      <r>4</>`;
+
+module.exports["toHaveReturned .not works only on mock.fn"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturned<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveReturned throw matcher error if received is spy"] = `<d>expect(</><r>received</><d>).</>toHaveReturned<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function spy]</>`;
+
+module.exports["toHaveReturned passes when returned"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturned<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>1</>
+
+1: <r>42</>`;
+
+module.exports["toHaveReturned passes when undefined is returned"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturned<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>1</>
+
+1: <r>undefined</>`;
+
+module.exports["toHaveReturned passes when at least one call does not throw"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturned<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>2</>
+
+1: <r>42</>
+3: <r>42</>
+
+Received number of calls:   <r>3</>`;
+
+module.exports["toHaveReturned .not passes when not returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturned<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>`;
+
+module.exports["toHaveReturned .not passes when all calls throw"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturned<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>
+Received number of calls:      <r>2</>`;
+
+module.exports["toHaveReturned .not passes when a call throws undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturned<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>
+Received number of calls:      <r>1</>`;
+
+module.exports["toHaveReturned fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>toHaveReturned<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toHaveReturned .not fails with any argument passed"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturned<d>()</>
+
+<b>Matcher error</>: this matcher must not have an expected argument
+
+Expected has type:  number
+Expected has value: <g>555</>`;
+
+module.exports["toHaveReturned includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>not<d>.</>toHaveReturned<d>()</>
+
+Expected number of returns: <g>0</>
+Received number of returns: <r>1</>
+
+1: <r>42</>`;
+
+module.exports["toHaveReturned incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturned<d>()</>
+
+Expected number of returns: >= <g>1</>
+Received number of returns:    <r>0</>
+Received number of calls:      <r>4</>`;
+
+module.exports["toReturnTimes throw matcher error if received is spy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function spy]</>`;
+
+module.exports["toReturnTimes only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toReturnTimes only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toReturnTimes only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toReturnTimes only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toReturnTimes only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toReturnTimes only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toReturnTimes .not only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toReturnTimes .not only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toReturnTimes .not only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toReturnTimes .not only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toReturnTimes .not only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toReturnTimes .not only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toReturnTimes passes if function returned equal to expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>`;
+
+module.exports["toReturnTimes calls that return undefined are counted as returns"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>`;
+
+module.exports["toReturnTimes .not passes if function returned more than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>2</>
+Received number of returns: <r>3</>`;
+
+module.exports["toReturnTimes .not passes if function called less than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>2</>
+Received number of returns: <r>1</>`;
+
+module.exports["toReturnTimes calls that throw are not counted"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>3</>
+Received number of returns: <r>2</>
+Received number of calls:   <r>3</>`;
+
+module.exports["toReturnTimes calls that throw undefined are not counted"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>
+
+Received number of calls:       <r>3</>`;
+
+module.exports["toReturnTimes includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>1</>
+Received number of returns: <r>2</>`;
+
+module.exports["toReturnTimes incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>
+
+Received number of calls:       <r>4</>`;
+
+module.exports["toHaveReturnedTimes throw matcher error if received is spy"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function spy]</>`;
+
+module.exports["toHaveReturnedTimes only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toHaveReturnedTimes only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toHaveReturnedTimes only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toHaveReturnedTimes only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toHaveReturnedTimes only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toHaveReturnedTimes only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toHaveReturnedTimes .not only accepts a number argument"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  object
+Expected has value: <g>{}</>`;
+
+module.exports["toHaveReturnedTimes .not only accepts a number argument #1"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  array
+Expected has value: <g>[]</>`;
+
+module.exports["toHaveReturnedTimes .not only accepts a number argument #2"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  boolean
+Expected has value: <g>true</>`;
+
+module.exports["toHaveReturnedTimes .not only accepts a number argument #3"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  string
+Expected has value: <g>"a"</>`;
+
+module.exports["toHaveReturnedTimes .not only accepts a number argument #4"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  map
+Expected has value: <g>Map {}</>`;
+
+module.exports["toHaveReturnedTimes .not only accepts a number argument #5"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a non-negative integer
+
+Expected has type:  function
+Expected has value: <g>[Function anonymous]</>`;
+
+module.exports["toHaveReturnedTimes passes if function returned equal to expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>`;
+
+module.exports["toHaveReturnedTimes calls that return undefined are counted as returns"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>`;
+
+module.exports["toHaveReturnedTimes .not passes if function returned more than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>2</>
+Received number of returns: <r>3</>`;
+
+module.exports["toHaveReturnedTimes .not passes if function called less than expected times"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>2</>
+Received number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedTimes calls that throw are not counted"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>3</>
+Received number of returns: <r>2</>
+Received number of calls:   <r>3</>`;
+
+module.exports["toHaveReturnedTimes calls that throw undefined are not counted"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>
+
+Received number of calls:       <r>3</>`;
+
+module.exports["toHaveReturnedTimes includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: <g>1</>
+Received number of returns: <r>2</>`;
+
+module.exports["toHaveReturnedTimes incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedTimes<d>(</><g>expected</><d>)</>
+
+Expected number of returns: not <g>2</>
+
+Received number of calls:       <r>4</>`;
+
+module.exports["lastReturnedWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["lastReturnedWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["lastReturnedWith works with argument that does not match"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received: <r>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with argument that does match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>undefined</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Map {"a" => "b", "b" => "a"}</>
+Received: <r>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Set {3, 4}</>
+Received: <r>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with Immutable.js objects directly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith works with Immutable.js objects indirectly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["lastReturnedWith a call that throws is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["lastReturnedWith a call that throws undefined is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["lastReturnedWith returnedWith works with more calls than the limit"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received
+       5: <r>"foo5"</>
+->     6: <r>"foo6"</>
+
+Number of returns: <r>6</>`;
+
+module.exports["lastReturnedWith returnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received
+       3: function call has not returned yet
+->     4: function call has not returned yet
+
+Number of returns: <r>0</>
+Number of calls:   <r>4</>`;
+
+module.exports["lastReturnedWith lastReturnedWith works with three calls"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>"foo3"</>
+Received
+       2:     <r>"foo2"</>
+->     3:     <d>"foo3"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["lastReturnedWith lastReturnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>0</>
+Received
+       3: function call has not returned yet
+->     4: function call has not returned yet
+
+Number of returns: <r>0</>
+Number of calls:   <r>4</>`;
+
+module.exports["lastReturnedWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>lastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toHaveLastReturnedWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveLastReturnedWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toHaveLastReturnedWith works with argument that does not match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received: <r>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with argument that does match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>undefined</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Map {"a" => "b", "b" => "a"}</>
+Received: <r>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Set {3, 4}</>
+Received: <r>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with Immutable.js objects directly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith works with Immutable.js objects indirectly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveLastReturnedWith a call that throws is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toHaveLastReturnedWith a call that throws undefined is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toHaveLastReturnedWith returnedWith works with more calls than the limit"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received
+       5: <r>"foo5"</>
+->     6: <r>"foo6"</>
+
+Number of returns: <r>6</>`;
+
+module.exports["toHaveLastReturnedWith returnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received
+       3: function call has not returned yet
+->     4: function call has not returned yet
+
+Number of returns: <r>0</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveLastReturnedWith lastReturnedWith works with three calls"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>"foo3"</>
+Received
+       2:     <r>"foo2"</>
+->     3:     <d>"foo3"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["toHaveLastReturnedWith lastReturnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>0</>
+Received
+       3: function call has not returned yet
+->     4: function call has not returned yet
+
+Number of returns: <r>0</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveLastReturnedWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toHaveLastReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["nthReturnedWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["nthReturnedWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["nthReturnedWith works with argument that does not match"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"bar"</>
+Received: <r>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with argument that does match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>undefined</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>Map {"a" => "b", "b" => "a"}</>
+Received: <r>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>Set {3, 4}</>
+Received: <r>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with Immutable.js objects directly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith works with Immutable.js objects indirectly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["nthReturnedWith a call that throws is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["nthReturnedWith a call that throws undefined is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["nthReturnedWith nthReturnedWith works with three calls"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo1"</>
+Received
+->     1:     <d>"foo1"</>
+       2:     <r>"foo2"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["nthReturnedWith nthReturnedWith should replace 1st, 2nd, 3rd with first, second, third"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"bar1"</>
+Received
+->     1: <r>"foo1"</>
+       2: <r>"foo2"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["nthReturnedWith nthReturnedWith should replace 1st, 2nd, 3rd with first, second, third #1"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo1"</>
+Received
+->     1:     <d>"foo1"</>
+       2:     <r>"foo2"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["nthReturnedWith nthReturnedWith positive throw matcher error for n that is not positive integer"] = `<d>expect(</><r>received</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0`;
+
+module.exports["nthReturnedWith nthReturnedWith should reject nth value greater than number of calls"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 4
+Expected: <g>"foo"</>
+Received
+       3: <d>"foo"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["nthReturnedWith nthReturnedWith positive throw matcher error for n that is not integer"] = `<d>expect(</><r>received</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0.1`;
+
+module.exports["nthReturnedWith nthReturnedWith negative throw matcher error for n that is not number"] = `<d>expect(</><r>received</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has value: undefined`;
+
+module.exports["nthReturnedWith nthReturnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>6</>
+Received
+->     1: function call has not returned yet
+       2: function call has not returned yet
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["nthReturnedWith nthReturnedWith incomplete recursive calls are handled properly #1"] = `<d>expect(</><r>jest.fn()</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 2
+Expected: <g>3</>
+Received
+       1: function call has not returned yet
+->     2: function call has not returned yet
+       3: <r>1</>
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["nthReturnedWith nthReturnedWith incomplete recursive calls are handled properly #2"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 3
+Expected: not <g>1</>
+Received
+       2:     function call has not returned yet
+->     3:     <d>1</>
+       4:     <r>0</>
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["nthReturnedWith nthReturnedWith incomplete recursive calls are handled properly #3"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 4
+Expected: not <g>0</>
+Received
+       3:     <r>1</>
+->     4:     <d>0</>
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["nthReturnedWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>nthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toHaveNthReturnedWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveNthReturnedWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toHaveNthReturnedWith works with argument that does not match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"bar"</>
+Received: <r>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with argument that does match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>undefined</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>Map {"a" => "b", "b" => "a"}</>
+Received: <r>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>Set {3, 4}</>
+Received: <r>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with Immutable.js objects directly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith works with Immutable.js objects indirectly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveNthReturnedWith a call that throws is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toHaveNthReturnedWith a call that throws undefined is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith works with three calls"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo1"</>
+Received
+->     1:     <d>"foo1"</>
+       2:     <r>"foo2"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith should replace 1st, 2nd, 3rd with first, second, third"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"bar1"</>
+Received
+->     1: <r>"foo1"</>
+       2: <r>"foo2"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith should replace 1st, 2nd, 3rd with first, second, third #1"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: not <g>"foo1"</>
+Received
+->     1:     <d>"foo1"</>
+       2:     <r>"foo2"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith positive throw matcher error for n that is not positive integer"] = `<d>expect(</><r>received</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith should reject nth value greater than number of calls"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 4
+Expected: <g>"foo"</>
+Received
+       3: <d>"foo"</>
+
+Number of returns: <r>3</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith positive throw matcher error for n that is not integer"] = `<d>expect(</><r>received</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has type:  number
+n has value: 0.1`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith negative throw matcher error for n that is not number"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+<b>Matcher error</>: n must be a positive integer
+
+n has value: undefined`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>6</>
+Received
+->     1: function call has not returned yet
+       2: function call has not returned yet
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith incomplete recursive calls are handled properly #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 2
+Expected: <g>3</>
+Received
+       1: function call has not returned yet
+->     2: function call has not returned yet
+       3: <r>1</>
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith incomplete recursive calls are handled properly #2"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 3
+Expected: not <g>1</>
+Received
+       2:     function call has not returned yet
+->     3:     <d>1</>
+       4:     <r>0</>
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveNthReturnedWith nthReturnedWith incomplete recursive calls are handled properly #3"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 4
+Expected: not <g>0</>
+Received
+       3:     <r>1</>
+->     4:     <d>0</>
+
+Number of returns: <r>2</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveNthReturnedWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toHaveNthReturnedWith<d>(</>n<d>, </><g>expected</><d>)</>
+
+n: 1
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toReturnWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toReturnWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toReturnWith works with argument that does not match"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received: <r>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with argument that does match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>undefined</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Map {"a" => "b", "b" => "a"}</>
+Received: <r>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Set {3, 4}</>
+Received: <r>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with Immutable.js objects directly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith works with Immutable.js objects indirectly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toReturnWith a call that throws is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toReturnWith a call that throws undefined is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toReturnWith returnedWith works with more calls than the limit"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received
+       1: <r>"foo1"</>
+       2: <r>"foo2"</>
+       3: <r>"foo3"</>
+
+Number of returns: <r>6</>`;
+
+module.exports["toReturnWith returnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received
+       1: function call has not returned yet
+       2: function call has not returned yet
+       3: function call has not returned yet
+
+Number of returns: <r>0</>
+Number of calls:   <r>4</>`;
+
+module.exports["toReturnWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toReturnWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toHaveReturnedWith works only on spies or mock.fn"] = `<d>expect(</><r>received</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <r>received</> value must be a mock function
+
+Received has type:  function
+Received has value: <r>[Function fn]</>`;
+
+module.exports["toHaveReturnedWith works when not called"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
+module.exports["toHaveReturnedWith works with argument that does not match"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received: <r>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with argument that does match"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>"foo"</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with undefined"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>undefined</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with Map"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with Map #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Map {"a" => "b", "b" => "a"}</>
+Received: <r>Map {1 => 2, 2 => 1}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with Set"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with Set #1"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>Set {3, 4}</>
+Received: <r>Set {1, 2}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with Immutable.js objects directly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith works with Immutable.js objects indirectly created"] = `<d>expect(</><r>jest.fn()</><d>).</>not<d>.</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: not <g>Immutable.Map {"a": {"b": "c"}}</>
+
+Number of returns: <r>1</>`;
+
+module.exports["toHaveReturnedWith a call that throws is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toHaveReturnedWith a call that throws undefined is not considered to have returned"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received: function call threw an error
+
+Number of returns: <r>0</>
+Number of calls:   <r>1</>`;
+
+module.exports["toHaveReturnedWith returnedWith works with more calls than the limit"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"bar"</>
+Received
+       1: <r>"foo1"</>
+       2: <r>"foo2"</>
+       3: <r>"foo3"</>
+
+Number of returns: <r>6</>`;
+
+module.exports["toHaveReturnedWith returnedWith incomplete recursive calls are handled properly"] = `<d>expect(</><r>jest.fn()</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>undefined</>
+Received
+       1: function call has not returned yet
+       2: function call has not returned yet
+       3: function call has not returned yet
+
+Number of returns: <r>0</>
+Number of calls:   <r>4</>`;
+
+module.exports["toHaveReturnedWith includes the custom mock name in the error message"] = `<d>expect(</><r>named-mock</><d>).</>toHaveReturnedWith<d>(</><g>expected</><d>)</>
+
+Expected: <g>"foo"</>
+
+Number of returns: <r>0</>`;
+
diff --git a/tests/expect/spyMatchers.test.ts b/tests/expect/spyMatchers.test.ts
new file mode 100644
index 0000000000000..bb3b58107b3bb
--- /dev/null
+++ b/tests/expect/spyMatchers.test.ts
@@ -0,0 +1,1499 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest, mock } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+import Immutable from 'immutable';
+
+const expectUnderTestAsAny = expectUnderTest as any;
+
+expectUnderTest.extend({
+  optionalFn(fn?: unknown) {
+    const pass = fn === undefined || typeof fn === 'function';
+    return { message: () => 'expect either a function or undefined', pass };
+  },
+});
+
+
+// Given a Jest mock function, return a minimal mock of a spy.
+const createSpy = (fn: mock.Mock) => {
+  const spy = function() { };
+
+  spy.calls = {
+    all() {
+      return fn.mock.calls.map(args => ({ args }));
+    },
+    count() {
+      return fn.mock.calls.length;
+    },
+  };
+
+  return spy;
+};
+
+for (const called of ['toBeCalled', 'toHaveBeenCalled']) {
+  test.describe(called, () => {
+    test('works only on spies or mock.fn', () => {
+      const fn = function fn() { };
+
+      expect(() => expectUnderTest(fn)[called]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('passes when called', () => {
+      const fn = mock.fn();
+      fn('arg0', 'arg1', 'arg2');
+      expectUnderTest(createSpy(fn))[called]();
+      expectUnderTest(fn)[called]();
+      expect(() => expectUnderTest(fn).not[called]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes when called', () => {
+      const fn = mock.fn();
+      const spy = createSpy(fn);
+
+      expectUnderTest(spy).not[called]();
+      expectUnderTest(fn).not[called]();
+      expect(() => expectUnderTest(spy)[called]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('fails with any argument passed', () => {
+      const fn = mock.fn();
+
+      fn();
+      expect(() => expectUnderTest(fn)[called](555)).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not fails with any argument passed', () => {
+      const fn = mock.fn();
+
+      expect(() =>
+        expectUnderTest(fn).not[called](555),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('includes the custom mock name in the error message', () => {
+      const fn = mock.fn().mockName('named-mock');
+
+      fn();
+      expectUnderTest(fn)[called]();
+      expect(() => expectUnderTest(fn).not[called]()).toThrowErrorMatchingSnapshot();
+    });
+  });
+}
+
+for (const calledTimes of ['toBeCalledTimes', 'toHaveBeenCalledTimes']) {
+  test.describe(calledTimes, () => {
+    test('.not works only on spies or mock.fn', () => {
+      const fn = function fn() { };
+
+      expect(() =>
+        expectUnderTest(fn).not[calledTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('only accepts a number argument', () => {
+      const fn = mock.fn();
+      fn();
+      expectUnderTest(fn)[calledTimes](1);
+
+      [{}, [], true, 'a', new Map(), () => { }].forEach(value => {
+        expect(() =>
+          expectUnderTest(fn)[calledTimes](value),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test('.not only accepts a number argument', () => {
+      const fn = mock.fn();
+      expectUnderTest(fn).not[calledTimes](1);
+
+      [{}, [], true, 'a', new Map(), () => { }].forEach(value => {
+        expect(() =>
+          expectUnderTest(fn).not[calledTimes](value),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test('passes if function called equal to expected times', () => {
+      const fn = mock.fn();
+      fn();
+      fn();
+
+      const spy = createSpy(fn);
+      expectUnderTest(spy)[calledTimes](2);
+      expectUnderTest(fn)[calledTimes](2);
+
+      expect(() =>
+        expectUnderTest(spy).not[calledTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes if function called more than expected times', () => {
+      const fn = mock.fn();
+      fn();
+      fn();
+      fn();
+
+      const spy = createSpy(fn);
+      expectUnderTest(spy)[calledTimes](3);
+      expectUnderTest(spy).not[calledTimes](2);
+
+      expectUnderTest(fn)[calledTimes](3);
+      expectUnderTest(fn).not[calledTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn)[calledTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes if function called less than expected times', () => {
+      const fn = mock.fn();
+      fn();
+
+      const spy = createSpy(fn);
+      expectUnderTest(spy)[calledTimes](1);
+      expectUnderTest(spy).not[calledTimes](2);
+
+      expectUnderTest(fn)[calledTimes](1);
+      expectUnderTest(fn).not[calledTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn)[calledTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('includes the custom mock name in the error message', () => {
+      const fn = mock.fn().mockName('named-mock');
+      fn();
+
+      expect(() =>
+        expectUnderTest(fn)[calledTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+}
+
+for (const calledWith of [
+  'lastCalledWith',
+  'toHaveBeenLastCalledWith',
+  'nthCalledWith',
+  'toHaveBeenNthCalledWith',
+  'toBeCalledWith',
+  'toHaveBeenCalledWith',
+]) {
+  test.describe(calledWith, () => {
+    function isToHaveNth(
+      calledWith: string,
+    ): calledWith is 'nthCalledWith' | 'toHaveBeenNthCalledWith' {
+      return (
+        calledWith === 'nthCalledWith' || calledWith === 'toHaveBeenNthCalledWith'
+      );
+    }
+
+    test('works only on spies or mock.fn', () => {
+      const fn = function fn() { };
+
+      if (isToHaveNth(calledWith)) {
+        expect(() =>
+          expectUnderTest(fn)[calledWith](3),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expect(() => expectUnderTest(fn)[calledWith]()).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works when not called', () => {
+      const fn = mock.fn();
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn)).not[calledWith](1, 'foo', 'bar');
+        expectUnderTest(fn).not[calledWith](1, 'foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, 'foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn)).not[calledWith]('foo', 'bar');
+        expectUnderTest(fn).not[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with no arguments', () => {
+      const fn = mock.fn();
+      fn();
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn))[calledWith](1);
+        expectUnderTest(fn)[calledWith](1);
+      } else {
+        expectUnderTest(createSpy(fn))[calledWith]();
+        expectUnderTest(fn)[calledWith]();
+      }
+    });
+
+    test("works with arguments that don't match", () => {
+      const fn = mock.fn();
+      fn('foo', 'bar1');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn)).not[calledWith](1, 'foo', 'bar');
+        expectUnderTest(fn).not[calledWith](1, 'foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, 'foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn)).not[calledWith]('foo', 'bar');
+        expectUnderTest(fn).not[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test("works with arguments that don't match in number of arguments", () => {
+      const fn = mock.fn();
+      fn('foo', 'bar', 'plop');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn)).not[calledWith](1, 'foo', 'bar');
+        expectUnderTest(fn).not[calledWith](1, 'foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, 'foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn)).not[calledWith]('foo', 'bar');
+        expectUnderTest(fn).not[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test("works with arguments that don't match with matchers", () => {
+      const fn = mock.fn();
+      fn('foo', 'bar');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn)).not[calledWith](
+            1,
+            expectUnderTest.any(String),
+            expectUnderTest.any(Number),
+        );
+        expectUnderTest(fn).not[calledWith](
+            1,
+            expectUnderTest.any(String),
+            expectUnderTest.any(Number),
+        );
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith](
+              1,
+              expectUnderTest.any(String),
+              expectUnderTest.any(Number),
+          ),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn)).not[calledWith](
+            expectUnderTest.any(String),
+            expectUnderTest.any(Number),
+        );
+        expectUnderTest(fn).not[calledWith](
+            expectUnderTest.any(String),
+            expectUnderTest.any(Number),
+        );
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith](
+              expectUnderTest.any(String),
+              expectUnderTest.any(Number),
+          ),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test("works with arguments that don't match with matchers even when argument is undefined", () => {
+      const fn = mock.fn();
+      fn('foo', undefined);
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn)).not[calledWith](
+            1,
+            'foo',
+            expectUnderTest.any(String),
+        );
+        expectUnderTest(fn).not[calledWith](1, 'foo', expectUnderTest.any(String));
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, 'foo', expectUnderTest.any(String)),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn)).not[calledWith]('foo', expectUnderTest.any(String));
+        expectUnderTest(fn).not[calledWith]('foo', expectUnderTest.any(String));
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo', expectUnderTest.any(String)),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test("works with arguments that don't match in size even if one is an optional matcher", () => {
+      // issue 12463
+      const fn = mock.fn();
+      fn('foo');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn).not[calledWith](1, 'foo', expectUnderTestAsAny.optionalFn());
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, 'foo', expectUnderTestAsAny.optionalFn()),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn).not[calledWith]('foo', expectUnderTestAsAny.optionalFn());
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo', expectUnderTestAsAny.optionalFn()),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with arguments that match', () => {
+      const fn = mock.fn();
+      fn('foo', 'bar');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn))[calledWith](1, 'foo', 'bar');
+        expectUnderTest(fn)[calledWith](1, 'foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, 'foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn))[calledWith]('foo', 'bar');
+        expectUnderTest(fn)[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with arguments that match with matchers', () => {
+      const fn = mock.fn();
+      fn('foo', 'bar');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(createSpy(fn))[calledWith](
+            1,
+            expectUnderTest.any(String),
+            expectUnderTest.any(String),
+        );
+        expectUnderTest(fn)[calledWith](
+            1,
+            expectUnderTest.any(String),
+            expectUnderTest.any(String),
+        );
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](
+              1,
+              expectUnderTest.any(String),
+              expectUnderTest.any(String),
+          ),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(createSpy(fn))[calledWith](
+            expectUnderTest.any(String),
+            expectUnderTest.any(String),
+        );
+        expectUnderTest(fn)[calledWith](
+            expectUnderTest.any(String),
+            expectUnderTest.any(String),
+        );
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](
+              expectUnderTest.any(String),
+              expectUnderTest.any(String),
+          ),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with trailing undefined arguments', () => {
+      const fn = mock.fn();
+      fn('foo', undefined);
+
+      if (isToHaveNth(calledWith)) {
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, 'foo'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with trailing undefined arguments if requested by the match query', () => {
+      const fn = mock.fn();
+      fn('foo', undefined);
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn)[calledWith](1, 'foo', undefined);
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, 'foo', undefined),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[calledWith]('foo', undefined);
+        expect(() =>
+          expectUnderTest(fn).not[calledWith]('foo', undefined),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with trailing undefined arguments when explicitly requested as optional by matcher', () => {
+      // issue 12463
+      const fn = mock.fn();
+      fn('foo', undefined);
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn)[calledWith](1, 'foo', expectUnderTestAsAny.optionalFn());
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, 'foo', expectUnderTestAsAny.optionalFn()),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[calledWith]('foo', expectUnderTestAsAny.optionalFn());
+        expect(() =>
+          expectUnderTest(fn).not[calledWith]('foo', expectUnderTestAsAny.optionalFn()),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Map', () => {
+      const fn = mock.fn();
+
+      const m1 = new Map([
+        [1, 2],
+        [2, 1],
+      ]);
+      const m2 = new Map([
+        [1, 2],
+        [2, 1],
+      ]);
+      const m3 = new Map([
+        ['a', 'b'],
+        ['b', 'a'],
+      ]);
+
+      fn(m1);
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn)[calledWith](1, m2);
+        expectUnderTest(fn).not[calledWith](1, m3);
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, m2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, m3),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[calledWith](m2);
+        expectUnderTest(fn).not[calledWith](m3);
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](m2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[calledWith](m3),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Set', () => {
+      const fn = mock.fn();
+
+      const s1 = new Set([1, 2]);
+      const s2 = new Set([1, 2]);
+      const s3 = new Set([3, 4]);
+
+      fn(s1);
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn)[calledWith](1, s2);
+        expectUnderTest(fn).not[calledWith](1, s3);
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, s2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[calledWith](1, s3),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[calledWith](s2);
+        expectUnderTest(fn).not[calledWith](s3);
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](s2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[calledWith](s3),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Immutable.js objects', () => {
+      const fn = mock.fn();
+      const directlyCreated = Immutable.Map([['a', { b: 'c' }]]);
+      const indirectlyCreated = Immutable.Map().set('a', { b: 'c' });
+      fn(directlyCreated, indirectlyCreated);
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn)[calledWith](1, indirectlyCreated, directlyCreated);
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, indirectlyCreated, directlyCreated),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[calledWith](indirectlyCreated, directlyCreated);
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](indirectlyCreated, directlyCreated),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    if (!isToHaveNth(calledWith)) {
+      test('works with many arguments', () => {
+        const fn = mock.fn();
+        fn('foo1', 'bar');
+        fn('foo', 'bar1');
+        fn('foo', 'bar');
+
+        expectUnderTest(fn)[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      });
+
+      test("works with many arguments that don't match", () => {
+        const fn = mock.fn();
+        fn('foo', 'bar1');
+        fn('foo', 'bar2');
+        fn('foo', 'bar3');
+
+        expectUnderTest(fn).not[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    }
+
+    if (isToHaveNth(calledWith)) {
+      test('works with three calls', () => {
+        const fn = mock.fn();
+        fn('foo1', 'bar');
+        fn('foo', 'bar1');
+        fn('foo', 'bar');
+
+        expectUnderTest(fn)[calledWith](1, 'foo1', 'bar');
+        expectUnderTest(fn)[calledWith](2, 'foo', 'bar1');
+        expectUnderTest(fn)[calledWith](3, 'foo', 'bar');
+
+        expect(() => {
+          expectUnderTest(fn).not[calledWith](1, 'foo1', 'bar');
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('positive throw matcher error for n that is not positive integer', async () => {
+        const fn = mock.fn();
+        fn('foo1', 'bar');
+
+        expect(() => {
+          expectUnderTest(fn)[calledWith](0, 'foo1', 'bar');
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('positive throw matcher error for n that is not integer', async () => {
+        const fn = mock.fn();
+        fn('foo1', 'bar');
+
+        expect(() => {
+          expectUnderTest(fn)[calledWith](0.1, 'foo1', 'bar');
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('negative throw matcher error for n that is not integer', async () => {
+        const fn = mock.fn();
+        fn('foo1', 'bar');
+
+        expect(() => {
+          expectUnderTest(fn).not[calledWith](Infinity, 'foo1', 'bar');
+        }).toThrowErrorMatchingSnapshot();
+      });
+    }
+
+    test('includes the custom mock name in the error message', () => {
+      const fn = mock.fn().mockName('named-mock');
+      fn('foo', 'bar');
+
+      if (isToHaveNth(calledWith)) {
+        expectUnderTest(fn)[calledWith](1, 'foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith](1, 'foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[calledWith]('foo', 'bar');
+
+        expect(() =>
+          expectUnderTest(fn).not[calledWith]('foo', 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+  });
+}
+
+for (const returned of ['toReturn', 'toHaveReturned']) {
+  test.describe(returned, () => {
+    test('.not works only on mock.fn', () => {
+      const fn = function fn() { };
+
+      expect(() => expectUnderTest(fn).not[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('throw matcher error if received is spy', () => {
+      const spy = createSpy(mock.fn());
+
+      expect(() => expectUnderTest(spy)[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('passes when returned', () => {
+      const fn = mock.fn(() => 42);
+      fn();
+      expectUnderTest(fn)[returned]();
+      expect(() => expectUnderTest(fn).not[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('passes when undefined is returned', () => {
+      const fn = mock.fn(() => undefined);
+      fn();
+      expectUnderTest(fn)[returned]();
+      expect(() => expectUnderTest(fn).not[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('passes when at least one call does not throw', () => {
+      const fn = mock.fn((causeError: boolean) => {
+        if (causeError)
+          throw new Error('Error!');
+
+
+        return 42;
+      });
+
+      fn(false);
+
+      try {
+        fn(true);
+      } catch {
+        // ignore error
+      }
+
+      fn(false);
+
+      expectUnderTest(fn)[returned]();
+      expect(() => expectUnderTest(fn).not[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes when not returned', () => {
+      const fn = mock.fn();
+
+      expectUnderTest(fn).not[returned]();
+      expect(() => expectUnderTest(fn)[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes when all calls throw', () => {
+      const fn = mock.fn(() => {
+        throw new Error('Error!');
+      });
+
+      try {
+        fn();
+      } catch {
+        // ignore error
+      }
+
+      try {
+        fn();
+      } catch {
+        // ignore error
+      }
+
+      expectUnderTest(fn).not[returned]();
+      expect(() => expectUnderTest(fn)[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes when a call throws undefined', () => {
+      const fn = mock.fn(() => {
+
+        throw undefined;
+      });
+
+      try {
+        fn();
+      } catch {
+        // ignore error
+      }
+
+      expectUnderTest(fn).not[returned]();
+      expect(() => expectUnderTest(fn)[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('fails with any argument passed', () => {
+      const fn = mock.fn();
+
+      fn();
+      expect(() => expectUnderTest(fn)[returned](555)).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not fails with any argument passed', () => {
+      const fn = mock.fn();
+
+      expect(() =>
+        expectUnderTest(fn).not[returned](555),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('includes the custom mock name in the error message', () => {
+      const fn = mock.fn(() => 42).mockName('named-mock');
+      fn();
+      expectUnderTest(fn)[returned]();
+      expect(() => expectUnderTest(fn).not[returned]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('incomplete recursive calls are handled properly', () => {
+      // sums up all integers from 0 -> value, using recursion
+      const fn: mock.Mock<(value: number) => number> = mock.fn(value => {
+        if (value === 0) {
+          // Before returning from the base case of recursion, none of the
+          // calls have returned yet.
+          expectUnderTest(fn).not[returned]();
+          expect(() => expectUnderTest(fn)[returned]()).toThrowErrorMatchingSnapshot();
+          return 0;
+        } else {
+          return value + fn(value - 1);
+        }
+      });
+
+      fn(3);
+    });
+  });
+}
+
+for (const returnedTimes of ['toReturnTimes', 'toHaveReturnedTimes']) {
+  test.describe(returnedTimes, () => {
+    test('throw matcher error if received is spy', () => {
+      const spy = createSpy(mock.fn());
+
+      expect(() =>
+        expectUnderTest(spy).not[returnedTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('only accepts a number argument', () => {
+      const fn = mock.fn(() => 42);
+      fn();
+      expectUnderTest(fn)[returnedTimes](1);
+
+      [{}, [], true, 'a', new Map(), () => { }].forEach(value => {
+        expect(() =>
+          expectUnderTest(fn)[returnedTimes](value),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test('.not only accepts a number argument', () => {
+      const fn = mock.fn(() => 42);
+      expectUnderTest(fn).not[returnedTimes](2);
+
+      [{}, [], true, 'a', new Map(), () => { }].forEach(value => {
+        expect(() =>
+          expectUnderTest(fn).not[returnedTimes](value),
+        ).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test('passes if function returned equal to expected times', () => {
+      const fn = mock.fn(() => 42);
+      fn();
+      fn();
+
+      expectUnderTest(fn)[returnedTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn).not[returnedTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('calls that return undefined are counted as returns', () => {
+      const fn = mock.fn(() => undefined);
+      fn();
+      fn();
+
+      expectUnderTest(fn)[returnedTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn).not[returnedTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes if function returned more than expected times', () => {
+      const fn = mock.fn(() => 42);
+      fn();
+      fn();
+      fn();
+
+      expectUnderTest(fn)[returnedTimes](3);
+      expectUnderTest(fn).not[returnedTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn)[returnedTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('.not passes if function called less than expected times', () => {
+      const fn = mock.fn(() => 42);
+      fn();
+
+      expectUnderTest(fn)[returnedTimes](1);
+      expectUnderTest(fn).not[returnedTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn)[returnedTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('calls that throw are not counted', () => {
+      const fn = mock.fn((causeError: boolean) => {
+        if (causeError)
+          throw new Error('Error!');
+
+
+        return 42;
+      });
+
+      fn(false);
+
+      try {
+        fn(true);
+      } catch {
+      // ignore error
+      }
+
+      fn(false);
+
+      expectUnderTest(fn).not[returnedTimes](3);
+
+      expect(() =>
+        expectUnderTest(fn)[returnedTimes](3),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('calls that throw undefined are not counted', () => {
+      const fn = mock.fn((causeError: boolean) => {
+        if (causeError)
+
+          throw undefined;
+
+
+        return 42;
+      });
+
+      fn(false);
+
+      try {
+        fn(true);
+      } catch {
+      // ignore error
+      }
+
+      fn(false);
+
+      expectUnderTest(fn)[returnedTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn).not[returnedTimes](2),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('includes the custom mock name in the error message', () => {
+      const fn = mock.fn(() => 42).mockName('named-mock');
+      fn();
+      fn();
+
+      expectUnderTest(fn)[returnedTimes](2);
+
+      expect(() =>
+        expectUnderTest(fn)[returnedTimes](1),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('incomplete recursive calls are handled properly', () => {
+    // sums up all integers from 0 -> value, using recursion
+      const fn: mock.Mock<(value: number) => number> = mock.fn(value => {
+        if (value === 0) {
+          return 0;
+        } else {
+          const recursiveResult = fn(value - 1);
+
+          if (value === 2) {
+          // Only 2 of the recursive calls have returned at this point
+            expectUnderTest(fn)[returnedTimes](2);
+            expect(() =>
+              expectUnderTest(fn).not[returnedTimes](2),
+            ).toThrowErrorMatchingSnapshot();
+          }
+
+          return value + recursiveResult;
+        }
+      });
+
+      fn(3);
+    });
+  });
+}
+
+for (const returnedWith of [
+  'lastReturnedWith',
+  'toHaveLastReturnedWith',
+  'nthReturnedWith',
+  'toHaveNthReturnedWith',
+  'toReturnWith',
+  'toHaveReturnedWith',
+]) {
+  test.describe(returnedWith, () => {
+    function isToHaveNth(
+      returnedWith: string,
+    ): returnedWith is 'nthReturnedWith' | 'toHaveNthReturnedWith' {
+      return (
+        returnedWith === 'nthReturnedWith' ||
+        returnedWith === 'toHaveNthReturnedWith'
+      );
+    }
+
+    function isToHaveLast(
+      returnedWith: string,
+    ): returnedWith is 'lastReturnedWith' | 'toHaveLastReturnedWith' {
+      return (
+        returnedWith === 'lastReturnedWith' ||
+        returnedWith === 'toHaveLastReturnedWith'
+      );
+    }
+    test('works only on spies or mock.fn', () => {
+      const fn = function fn() { };
+
+      expect(() => expectUnderTest(fn)[returnedWith]()).toThrowErrorMatchingSnapshot();
+    });
+
+    test('works when not called', () => {
+      const fn = mock.fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn).not[returnedWith](1, 'foo');
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, 'foo'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn).not[returnedWith]('foo');
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith]('foo'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with no arguments', () => {
+      const fn = mock.fn();
+      fn();
+
+      if (isToHaveNth(returnedWith))
+        expectUnderTest(fn)[returnedWith](1);
+      else
+        expectUnderTest(fn)[returnedWith]();
+
+    });
+
+    test('works with argument that does not match', () => {
+      const fn = mock.fn(() => 'foo');
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn).not[returnedWith](1, 'bar');
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, 'bar'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn).not[returnedWith]('bar');
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith]('bar'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with argument that does match', () => {
+      const fn = mock.fn(() => 'foo');
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn)[returnedWith](1, 'foo');
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](1, 'foo'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[returnedWith]('foo');
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith]('foo'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with undefined', () => {
+      const fn = mock.fn(() => undefined);
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn)[returnedWith](1, undefined);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](1, undefined),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[returnedWith](undefined);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](undefined),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Map', () => {
+      const m1 = new Map([
+        [1, 2],
+        [2, 1],
+      ]);
+      const m2 = new Map([
+        [1, 2],
+        [2, 1],
+      ]);
+      const m3 = new Map([
+        ['a', 'b'],
+        ['b', 'a'],
+      ]);
+
+      const fn = mock.fn(() => m1);
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn)[returnedWith](1, m2);
+        expectUnderTest(fn).not[returnedWith](1, m3);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](1, m2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, m3),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[returnedWith](m2);
+        expectUnderTest(fn).not[returnedWith](m3);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](m2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](m3),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Set', () => {
+      const s1 = new Set([1, 2]);
+      const s2 = new Set([1, 2]);
+      const s3 = new Set([3, 4]);
+
+      const fn = mock.fn(() => s1);
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn)[returnedWith](1, s2);
+        expectUnderTest(fn).not[returnedWith](1, s3);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](1, s2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, s3),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[returnedWith](s2);
+        expectUnderTest(fn).not[returnedWith](s3);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](s2),
+        ).toThrowErrorMatchingSnapshot();
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](s3),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Immutable.js objects directly created', () => {
+      const directlyCreated = Immutable.Map([['a', { b: 'c' }]]);
+      const fn = mock.fn(() => directlyCreated);
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn)[returnedWith](1, directlyCreated);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](1, directlyCreated),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[returnedWith](directlyCreated);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](directlyCreated),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('works with Immutable.js objects indirectly created', () => {
+      const indirectlyCreated = Immutable.Map().set('a', { b: 'c' });
+      const fn = mock.fn(() => indirectlyCreated);
+      fn();
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn)[returnedWith](1, indirectlyCreated);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](1, indirectlyCreated),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn)[returnedWith](indirectlyCreated);
+
+        expect(() =>
+          expectUnderTest(fn).not[returnedWith](indirectlyCreated),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('a call that throws is not considered to have returned', () => {
+      const fn = mock.fn(() => {
+        throw new Error('Error!');
+      });
+
+      try {
+        fn();
+      } catch {
+        // ignore error
+      }
+
+      if (isToHaveNth(returnedWith)) {
+        // It doesn't matter what return value is tested if the call threw
+        expectUnderTest(fn).not[returnedWith](1, 'foo');
+        expectUnderTest(fn).not[returnedWith](1, null);
+        expectUnderTest(fn).not[returnedWith](1, undefined);
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, undefined),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        // It doesn't matter what return value is tested if the call threw
+        expectUnderTest(fn).not[returnedWith]('foo');
+        expectUnderTest(fn).not[returnedWith](null);
+        expectUnderTest(fn).not[returnedWith](undefined);
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](undefined),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    test('a call that throws undefined is not considered to have returned', () => {
+      const fn = mock.fn(() => {
+
+        throw undefined;
+      });
+
+      try {
+        fn();
+      } catch {
+        // ignore error
+      }
+
+      if (isToHaveNth(returnedWith)) {
+        // It doesn't matter what return value is tested if the call threw
+        expectUnderTest(fn).not[returnedWith](1, 'foo');
+        expectUnderTest(fn).not[returnedWith](1, null);
+        expectUnderTest(fn).not[returnedWith](1, undefined);
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, undefined),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        // It doesn't matter what return value is tested if the call threw
+        expectUnderTest(fn).not[returnedWith]('foo');
+        expectUnderTest(fn).not[returnedWith](null);
+        expectUnderTest(fn).not[returnedWith](undefined);
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](undefined),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+
+    if (!isToHaveNth(returnedWith)) {
+      test.describe('returnedWith', () => {
+        test('works with more calls than the limit', () => {
+          const fn = mock.fn<() => string>();
+          fn.mockReturnValueOnce('foo1');
+          fn.mockReturnValueOnce('foo2');
+          fn.mockReturnValueOnce('foo3');
+          fn.mockReturnValueOnce('foo4');
+          fn.mockReturnValueOnce('foo5');
+          fn.mockReturnValueOnce('foo6');
+
+          fn();
+          fn();
+          fn();
+          fn();
+          fn();
+          fn();
+
+          expectUnderTest(fn).not[returnedWith]('bar');
+
+          expect(() => {
+            expectUnderTest(fn)[returnedWith]('bar');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('incomplete recursive calls are handled properly', () => {
+          // sums up all integers from 0 -> value, using recursion
+          const fn: mock.Mock<(value: number) => number> = mock.fn(value => {
+            if (value === 0) {
+              // Before returning from the base case of recursion, none of the
+              // calls have returned yet.
+              // This test ensures that the incomplete calls are not incorrectly
+              // interpreted as have returned undefined
+              expectUnderTest(fn).not[returnedWith](undefined);
+              expect(() =>
+                expectUnderTest(fn)[returnedWith](undefined),
+              ).toThrowErrorMatchingSnapshot();
+
+              return 0;
+            } else {
+              return value + fn(value - 1);
+            }
+          });
+
+          fn(3);
+        });
+      });
+    }
+
+    if (isToHaveNth(returnedWith)) {
+      test.describe('nthReturnedWith', () => {
+        test('works with three calls', () => {
+          const fn = mock.fn<() => string>();
+          fn.mockReturnValueOnce('foo1');
+          fn.mockReturnValueOnce('foo2');
+          fn.mockReturnValueOnce('foo3');
+          fn();
+          fn();
+          fn();
+
+          expectUnderTest(fn)[returnedWith](1, 'foo1');
+          expectUnderTest(fn)[returnedWith](2, 'foo2');
+          expectUnderTest(fn)[returnedWith](3, 'foo3');
+
+          expect(() => {
+            expectUnderTest(fn).not[returnedWith](1, 'foo1');
+            expectUnderTest(fn).not[returnedWith](2, 'foo2');
+            expectUnderTest(fn).not[returnedWith](3, 'foo3');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('should replace 1st, 2nd, 3rd with first, second, third', async () => {
+          const fn = mock.fn<() => string>();
+          fn.mockReturnValueOnce('foo1');
+          fn.mockReturnValueOnce('foo2');
+          fn.mockReturnValueOnce('foo3');
+          fn();
+          fn();
+          fn();
+
+          expect(() => {
+            expectUnderTest(fn)[returnedWith](1, 'bar1');
+            expectUnderTest(fn)[returnedWith](2, 'bar2');
+            expectUnderTest(fn)[returnedWith](3, 'bar3');
+          }).toThrowErrorMatchingSnapshot();
+
+          expect(() => {
+            expectUnderTest(fn).not[returnedWith](1, 'foo1');
+            expectUnderTest(fn).not[returnedWith](2, 'foo2');
+            expectUnderTest(fn).not[returnedWith](3, 'foo3');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('positive throw matcher error for n that is not positive integer', async () => {
+          const fn = mock.fn(() => 'foo');
+          fn();
+
+          expect(() => {
+            expectUnderTest(fn)[returnedWith](0, 'foo');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('should reject nth value greater than number of calls', async () => {
+          const fn = mock.fn(() => 'foo');
+          fn();
+          fn();
+          fn();
+
+          expect(() => {
+            expectUnderTest(fn)[returnedWith](4, 'foo');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('positive throw matcher error for n that is not integer', async () => {
+          const fn = mock.fn<(a: string) => string>(() => 'foo');
+          fn('foo');
+
+          expect(() => {
+            expectUnderTest(fn)[returnedWith](0.1, 'foo');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('negative throw matcher error for n that is not number', async () => {
+          const fn = mock.fn<(a: string) => string>(() => 'foo');
+          fn('foo');
+
+          expect(() => {
+            // @ts-expect-error: Testing runtime error
+            expectUnderTest(fn).not[returnedWith]();
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('incomplete recursive calls are handled properly', () => {
+          // sums up all integers from 0 -> value, using recursion
+          const fn: mock.Mock<(value: number) => number> = mock.fn(value => {
+            if (value === 0) {
+              return 0;
+            } else {
+              const recursiveResult = fn(value - 1);
+
+              if (value === 2) {
+                // Only 2 of the recursive calls have returned at this point
+                expectUnderTest(fn).not[returnedWith](1, 6);
+                expectUnderTest(fn).not[returnedWith](2, 3);
+                expectUnderTest(fn)[returnedWith](3, 1);
+                expectUnderTest(fn)[returnedWith](4, 0);
+
+                expect(() =>
+                  expectUnderTest(fn)[returnedWith](1, 6),
+                ).toThrowErrorMatchingSnapshot();
+                expect(() =>
+                  expectUnderTest(fn)[returnedWith](2, 3),
+                ).toThrowErrorMatchingSnapshot();
+                expect(() =>
+                  expectUnderTest(fn).not[returnedWith](3, 1),
+                ).toThrowErrorMatchingSnapshot();
+                expect(() =>
+                  expectUnderTest(fn).not[returnedWith](4, 0),
+                ).toThrowErrorMatchingSnapshot();
+              }
+
+              return value + recursiveResult;
+            }
+          });
+
+          fn(3);
+        });
+      });
+    }
+
+    if (isToHaveLast(returnedWith)) {
+      test.describe('lastReturnedWith', () => {
+        test('works with three calls', () => {
+          const fn = mock.fn<() => string>();
+          fn.mockReturnValueOnce('foo1');
+          fn.mockReturnValueOnce('foo2');
+          fn.mockReturnValueOnce('foo3');
+          fn();
+          fn();
+          fn();
+
+          expectUnderTest(fn)[returnedWith]('foo3');
+
+          expect(() => {
+            expectUnderTest(fn).not[returnedWith]('foo3');
+          }).toThrowErrorMatchingSnapshot();
+        });
+
+        test('incomplete recursive calls are handled properly', () => {
+          // sums up all integers from 0 -> value, using recursion
+          const fn: mock.Mock<(value: number) => number> = mock.fn(value => {
+            if (value === 0) {
+              // Before returning from the base case of recursion, none of the
+              // calls have returned yet.
+              expectUnderTest(fn).not[returnedWith](0);
+              expect(() =>
+                expectUnderTest(fn)[returnedWith](0),
+              ).toThrowErrorMatchingSnapshot();
+              return 0;
+            } else {
+              return value + fn(value - 1);
+            }
+          });
+
+          fn(3);
+        });
+      });
+    }
+
+    test('includes the custom mock name in the error message', () => {
+      const fn = mock.fn().mockName('named-mock');
+
+      if (isToHaveNth(returnedWith)) {
+        expectUnderTest(fn).not[returnedWith](1, 'foo');
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith](1, 'foo'),
+        ).toThrowErrorMatchingSnapshot();
+      } else {
+        expectUnderTest(fn).not[returnedWith]('foo');
+
+        expect(() =>
+          expectUnderTest(fn)[returnedWith]('foo'),
+        ).toThrowErrorMatchingSnapshot();
+      }
+    });
+  });
+}
diff --git a/tests/expect/stacktrace.test.ts b/tests/expect/stacktrace.test.ts
new file mode 100644
index 0000000000000..6f5cf8bcc7c73
--- /dev/null
+++ b/tests/expect/stacktrace.test.ts
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+const expectUnderTestAsAny = expectUnderTest as any;
+
+expectUnderTest.extend({
+  toCustomMatch(callback: () => unknown, expected: unknown) {
+    const actual = callback();
+
+    if (actual !== expected) {
+      return {
+        message: () => `Expected "${expected}" but got "${actual}"`,
+        pass: false,
+      };
+    }
+
+    return {
+      message: () => '',
+      pass: true,
+    };
+  },
+  toMatchPredicate(received: unknown, expected: (a: unknown) => void) {
+    expected(received);
+    return {
+      message: () => '',
+      pass: true,
+    };
+  },
+});
+
+test('stack trace points to correct location when using matchers', () => {
+  try {
+    expectUnderTest(true).toBe(false);
+  } catch (error: any) {
+    expect(error.stack).toContain('stacktrace.test.ts:');
+  }
+});
+
+test('stack trace points to correct location when using nested matchers', () => {
+  try {
+    expectUnderTestAsAny(true).toMatchPredicate((value: unknown) => {
+      expectUnderTest(value).toBe(false);
+    });
+  } catch (error: any) {
+    expect(error.stack).toContain('stacktrace.test.ts:');
+  }
+});
+
+test('stack trace points to correct location when throwing from a custom matcher', () => {
+  try {
+    expectUnderTestAsAny(() => {
+      const foo = () => bar();
+      const bar = () => baz();
+      const baz = () => {
+        throw new Error('Expected');
+      };
+
+      foo();
+    }).toCustomMatch('bar');
+  } catch (error: any) {
+    expect(error.stack).toContain('stacktrace.test.ts:');
+  }
+});
diff --git a/tests/expect/symbolInObjects.test.ts b/tests/expect/symbolInObjects.test.ts
new file mode 100644
index 0000000000000..011d87e72db10
--- /dev/null
+++ b/tests/expect/symbolInObjects.test.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { test } from './fixtures';
+import { expect as expectUnderTest } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+test.describe('Symbol in objects', () => {
+  test('should compare objects with Symbol keys', () => {
+    const sym = Symbol('foo');
+    const obj1 = { [sym]: 'one' };
+    const obj2 = { [sym]: 'two' };
+    const obj3 = { [sym]: 'one' };
+
+    expectUnderTest(obj1).toEqual(obj3);
+    expectUnderTest(obj1).not.toEqual(obj2);
+  });
+
+  test('should compare objects with mixed keys and Symbol', () => {
+    const sym = Symbol('foo2');
+    const obj1 = { foo: 2, [sym]: 'one' };
+    const obj2 = { foo: 2, [sym]: 'two' };
+    const obj3 = { foo: 2, [sym]: 'one' };
+
+    expectUnderTest(obj1).toEqual(obj3);
+    expectUnderTest(obj1).not.toEqual(obj2);
+  });
+
+  test('should compare objects with different Symbol keys', () => {
+    const sym = Symbol('foo');
+    const sym2 = Symbol('foo');
+    const obj1 = { [sym]: 'one' };
+    const obj2 = { [sym2]: 'one' };
+    const obj3 = { [sym]: 'one' };
+
+    expectUnderTest(obj1).toEqual(obj3);
+    expectUnderTest(obj1).not.toEqual(obj2);
+  });
+});
diff --git a/tests/expect/toThrowMatchers.snapshots.js b/tests/expect/toThrowMatchers.snapshots.js
new file mode 100644
index 0000000000000..c1243e0f0ba80
--- /dev/null
+++ b/tests/expect/toThrowMatchers.snapshots.js
@@ -0,0 +1,456 @@
+module.exports["toThrowError substring did not throw at all"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"apple"</>
+
+Received function did not throw`;
+
+module.exports["toThrowError substring threw, but message did not match (error)"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"banana"</>
+Received message:   <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError substring threw, but message did not match (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"Server Error"</>
+Received value:     <r>""</>
+`;
+
+module.exports["toThrowError substring threw, but message should not match (error)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected substring: not <g>"array"</>
+Received message:       <r>"Invalid <i>array</i> length"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError substring threw, but message should not match (non-error truthy)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected substring: not <g>"Server Error"</>
+Received value:         <r>"Internal Server Error"</>
+`;
+
+module.exports["toThrowError regexp did not throw at all"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/apple/</>
+
+Received function did not throw`;
+
+module.exports["toThrowError regexp threw, but message did not match (error)"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/banana/</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError regexp threw, but message did not match (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/^[123456789]\\d*/</>
+Received value:   <r>0</>
+`;
+
+module.exports["toThrowError regexp threw, but message should not match (error)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected pattern: not <g>/ array /</>
+Received message:     <r>"Invalid<i> array </i>length"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError regexp threw, but message should not match (non-error truthy)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected pattern: not <g>/^[123456789]\\d*/</>
+Received value:       <r>404</>
+`;
+
+module.exports["toThrowError error class did not throw at all"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Err</>
+
+Received function did not throw`;
+
+module.exports["toThrowError error class threw, but class did not match (error)"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Err2</>
+Received constructor: <r>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError error class threw, but class did not match (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Err2</>
+
+Received value: <r>undefined</>
+`;
+
+module.exports["toThrowError error class threw, but class should not match (error)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError error class threw, but class should not match (error subclass)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Err</>
+Received constructor:     <r>SubErr</> extends <g>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError error class threw, but class should not match (error subsubclass)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Err</>
+Received constructor:     <r>SubSubErr</> extends … extends <g>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError error-message fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected message: <g>"apple"</>
+Received message: <r>"banana"</>
+`;
+
+module.exports["toThrowError error-message fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected message: not <g>"Invalid array length"</>
+`;
+
+module.exports["toThrowError error-message fail multiline diff highlight incorrect expected space"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+<g>- Expected message  - 1</>
+<r>+ Received message  + 1</>
+
+<g>- There is no route defined for key Settings.<i> </i></>
+<r>+ There is no route defined for key Settings.</>
+<d>  Must be one of: 'Home'</>
+`;
+
+module.exports["toThrowError asymmetric any-Class fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>Any<Err2></>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError asymmetric any-Class fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>Any<Err></>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError asymmetric anything fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>Anything</>
+
+Thrown value: <r>null</>
+`;
+
+module.exports["toThrowError asymmetric anything fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>Anything</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError asymmetric no-symbol fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>{"asymmetricMatch": [Function asymmetricMatch]}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError asymmetric no-symbol fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>{"asymmetricMatch": [Function asymmetricMatch]}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError asymmetric objectContaining fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>ObjectContaining {"name": "NotError"}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError asymmetric objectContaining fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>ObjectContaining {"name": "Error"}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrowError promise/async throws if Error-like object is returned did not throw at all"] = `callback is not a function`;
+
+module.exports["toThrowError promise/async throws if Error-like object is returned threw, but class did not match"] = `callback is not a function`;
+
+module.exports["toThrowError promise/async throws if Error-like object is returned threw, but should not have"] = `callback is not a function`;
+
+module.exports["toThrowError expected is undefined threw, but should not have (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>()</>
+
+Thrown value: <r>null</>
+`;
+
+module.exports["toThrowError invalid arguments"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrowError<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression or class or error
+
+Expected has type:  number
+Expected has value: <g>111</>`;
+
+module.exports["toThrowError invalid actual"] = `<d>expect(</><r>received</><d>).</>toThrowError<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a function
+
+Received has type:  string
+Received has value: <r>"a string"</>`;
+
+module.exports["toThrow substring did not throw at all"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"apple"</>
+
+Received function did not throw`;
+
+module.exports["toThrow substring threw, but message did not match (error)"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"banana"</>
+Received message:   <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow substring threw, but message did not match (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected substring: <g>"Server Error"</>
+Received value:     <r>""</>
+`;
+
+module.exports["toThrow substring threw, but message should not match (error)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected substring: not <g>"array"</>
+Received message:       <r>"Invalid <i>array</i> length"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow substring threw, but message should not match (non-error truthy)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected substring: not <g>"Server Error"</>
+Received value:         <r>"Internal Server Error"</>
+`;
+
+module.exports["toThrow regexp did not throw at all"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/apple/</>
+
+Received function did not throw`;
+
+module.exports["toThrow regexp threw, but message did not match (error)"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/banana/</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow regexp threw, but message did not match (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected pattern: <g>/^[123456789]\\d*/</>
+Received value:   <r>0</>
+`;
+
+module.exports["toThrow regexp threw, but message should not match (error)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected pattern: not <g>/ array /</>
+Received message:     <r>"Invalid<i> array </i>length"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow regexp threw, but message should not match (non-error truthy)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected pattern: not <g>/^[123456789]\\d*/</>
+Received value:       <r>404</>
+`;
+
+module.exports["toThrow error class did not throw at all"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Err</>
+
+Received function did not throw`;
+
+module.exports["toThrow error class threw, but class did not match (error)"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Err2</>
+Received constructor: <r>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow error class threw, but class did not match (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected constructor: <g>Err2</>
+
+Received value: <r>undefined</>
+`;
+
+module.exports["toThrow error class threw, but class should not match (error)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow error class threw, but class should not match (error subclass)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Err</>
+Received constructor:     <r>SubErr</> extends <g>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow error class threw, but class should not match (error subsubclass)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected constructor: not <g>Err</>
+Received constructor:     <r>SubSubErr</> extends … extends <g>Err</>
+
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow error-message fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected message: <g>"apple"</>
+Received message: <r>"banana"</>
+`;
+
+module.exports["toThrow error-message fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected message: not <g>"Invalid array length"</>
+`;
+
+module.exports["toThrow error-message fail multiline diff highlight incorrect expected space"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+<g>- Expected message  - 1</>
+<r>+ Received message  + 1</>
+
+<g>- There is no route defined for key Settings.<i> </i></>
+<r>+ There is no route defined for key Settings.</>
+<d>  Must be one of: 'Home'</>
+`;
+
+module.exports["toThrow asymmetric any-Class fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>Any<Err2></>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow asymmetric any-Class fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>Any<Err></>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow asymmetric anything fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>Anything</>
+
+Thrown value: <r>null</>
+`;
+
+module.exports["toThrow asymmetric anything fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>Anything</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow asymmetric no-symbol fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>{"asymmetricMatch": [Function asymmetricMatch]}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow asymmetric no-symbol fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>{"asymmetricMatch": [Function asymmetricMatch]}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow asymmetric objectContaining fail isNot false"] = `<d>expect(</><r>received</><d>).</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: <g>ObjectContaining {"name": "NotError"}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow asymmetric objectContaining fail isNot true"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+Expected asymmetric matcher: not <g>ObjectContaining {"name": "Error"}</>
+
+Received name:    <r>"Error"</>
+Received message: <r>"apple"</>
+
+      <d>at expectUnderTest (</>packages/expect/src/__tests__/toThrowMatchers-test.js<d>:24:74)</>`;
+
+module.exports["toThrow promise/async throws if Error-like object is returned did not throw at all"] = `callback is not a function`;
+
+module.exports["toThrow promise/async throws if Error-like object is returned threw, but class did not match"] = `callback is not a function`;
+
+module.exports["toThrow promise/async throws if Error-like object is returned threw, but should not have"] = `callback is not a function`;
+
+module.exports["toThrow expected is undefined threw, but should not have (non-error falsey)"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>()</>
+
+Thrown value: <r>null</>
+`;
+
+module.exports["toThrow invalid arguments"] = `<d>expect(</><r>received</><d>).</>not<d>.</>toThrow<d>(</><g>expected</><d>)</>
+
+<b>Matcher error</>: <g>expected</> value must be a string or regular expression or class or error
+
+Expected has type:  number
+Expected has value: <g>111</>`;
+
+module.exports["toThrow invalid actual"] = `<d>expect(</><r>received</><d>).</>toThrow<d>()</>
+
+<b>Matcher error</>: <r>received</> value must be a function
+
+Received has type:  string
+Received has value: <r>"a string"</>`;
+
diff --git a/tests/expect/toThrowMatchers.test.ts b/tests/expect/toThrowMatchers.test.ts
new file mode 100644
index 0000000000000..bc64d13240d85
--- /dev/null
+++ b/tests/expect/toThrowMatchers.test.ts
@@ -0,0 +1,591 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { test, expect } from './fixtures';
+import { expect as expectUnderTest } from '../../packages/playwright/bundles/expect/src/expectBundleImpl';
+
+const expectUnderTestAsAny = expectUnderTest as any;
+
+// Custom Error class because node versions have different stack trace strings.
+class CustomError extends Error {
+  constructor(message?: string) {
+    super(message);
+    this.name = 'Error';
+    this.stack =
+      'Error\n' +
+      '  at expectUnderTest' +
+      ' (packages/expect/src/__tests__/toThrowMatchers-test.js:24:74)';
+  }
+}
+
+for (const toThrow of ['toThrowError', 'toThrow'] as const) {
+  test.describe(toThrow, () => {
+    class Err extends CustomError {}
+    class Err2 extends CustomError {}
+
+    test('to throw or not to throw', () => {
+      expectUnderTest(() => {
+        throw new CustomError('apple');
+      })[toThrow]();
+      expectUnderTest(() => {}).not[toThrow]();
+    });
+
+    test.describe('substring', () => {
+      test('passes', () => {
+        expectUnderTest(() => {
+          throw new CustomError('apple');
+        })[toThrow]('apple');
+        expectUnderTest(() => {
+          throw new CustomError('banana');
+        }).not[toThrow]('apple');
+        expectUnderTest(() => {}).not[toThrow]('apple');
+      });
+
+      test('did not throw at all', () => {
+        expect(() =>
+          expectUnderTest(() => {})[toThrow]('apple'),
+        ).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message did not match (error)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new CustomError('apple');
+          })[toThrow]('banana');
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message did not match (non-error falsey)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+
+            throw '';
+          })[toThrow]('Server Error');
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('properly escapes strings when matching against errors', () => {
+        expectUnderTest(() => {
+          throw new TypeError('"this"? throws.');
+        })[toThrow]('"this"? throws.');
+      });
+
+      test('threw, but message should not match (error)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new CustomError('Invalid array length');
+          }).not[toThrow]('array');
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message should not match (non-error truthy)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+
+            throw 'Internal Server Error';
+          }).not[toThrow]('Server Error');
+        }).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test.describe('regexp', () => {
+      test('passes', () => {
+        expectUnderTest(() => {
+          throw new CustomError('apple');
+        })[toThrow](/apple/);
+        expectUnderTest(() => {
+          throw new CustomError('banana');
+        }).not[toThrow](/apple/);
+        expectUnderTest(() => {}).not[toThrow](/apple/);
+      });
+
+      test('did not throw at all', () => {
+        expect(() =>
+          expectUnderTest(() => {})[toThrow](/apple/),
+        ).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message did not match (error)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new CustomError('apple');
+          })[toThrow](/banana/);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message did not match (non-error falsey)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+
+            throw 0;
+          })[toThrow](/^[123456789]\d*/);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message should not match (error)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new CustomError('Invalid array length');
+          }).not[toThrow](/ array /);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but message should not match (non-error truthy)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+
+            throw 404;
+          }).not[toThrow](/^[123456789]\d*/);
+        }).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test.describe('error class', () => {
+      class SubErr extends Err {
+        constructor(message?: string) {
+          super(message);
+          // In a carefully written error subclass,
+          // name property is equal to constructor name.
+          this.name = this.constructor.name;
+        }
+      }
+
+      class SubSubErr extends SubErr {
+        constructor(message?: string) {
+          super(message);
+          // In a carefully written error subclass,
+          // name property is equal to constructor name.
+          this.name = this.constructor.name;
+        }
+      }
+
+      test('passes', () => {
+        expectUnderTest(() => {
+          throw new Err();
+        })[toThrow](Err);
+        expectUnderTest(() => {
+          throw new Err();
+        })[toThrow](CustomError);
+        expectUnderTest(() => {
+          throw new Err();
+        }).not[toThrow](Err2);
+        expectUnderTest(() => {}).not[toThrow](Err);
+      });
+
+      test('did not throw at all', () => {
+        expect(() =>
+          expect(() => {})[toThrow](Err),
+        ).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but class did not match (error)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new Err('apple');
+          })[toThrow](Err2);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but class did not match (non-error falsey)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+
+            throw undefined;
+          })[toThrow](Err2);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but class should not match (error)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new Err('apple');
+          }).not[toThrow](Err);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but class should not match (error subclass)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new SubErr('apple');
+          }).not[toThrow](Err);
+        }).toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but class should not match (error subsubclass)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+            throw new SubSubErr('apple');
+          }).not[toThrow](Err);
+        }).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test.describe('error-message', () => {
+      // Received message in report if object has message property.
+      class ErrorMessage {
+        // not extending Error!
+        constructor(public message: string) {}
+      }
+      const expected = new ErrorMessage('apple');
+
+      test.describe('pass', () => {
+        test('isNot false', () => {
+          expectUnderTest(() => {
+            throw new ErrorMessage('apple');
+          })[toThrow](expected);
+        });
+
+        test('isNot true', () => {
+          expectUnderTest(() => {
+            throw new ErrorMessage('banana');
+          }).not[toThrow](expected);
+        });
+      });
+
+      test.describe('fail', () => {
+        test('isNot false', () => {
+          expect(() =>
+            expectUnderTest(() => {
+              throw new ErrorMessage('banana');
+            })[toThrow](expected),
+          ).toThrowErrorMatchingSnapshot();
+        });
+
+        test('isNot true', () => {
+          const message = 'Invalid array length';
+          expect(() =>
+            expectUnderTest(() => {
+              throw new ErrorMessage(message);
+            }).not[toThrow]({ message }),
+          ).toThrowErrorMatchingSnapshot();
+        });
+
+        test('multiline diff highlight incorrect expected space', () => {
+          // jest/issues/2673
+          const a =
+            "There is no route defined for key Settings. \nMust be one of: 'Home'";
+          const b =
+            "There is no route defined for key Settings.\nMust be one of: 'Home'";
+          expect(() =>
+            expectUnderTest(() => {
+              throw new ErrorMessage(b);
+            })[toThrow]({ message: a }),
+          ).toThrowErrorMatchingSnapshot();
+        });
+      });
+    });
+
+    test.describe('error message and cause', () => {
+      const errorA = new Error('A');
+      const errorB = new Error('B', { cause: errorA });
+      const expected = new Error('good', { cause: errorB });
+
+      test.describe('pass', () => {
+        test('isNot false', () => {
+          expectUnderTest(() => {
+            throw new Error('good', { cause: errorB });
+          })[toThrow](expected);
+        });
+
+        test('isNot true, incorrect message', () => {
+          expectUnderTest(() => {
+            throw new Error('bad', { cause: errorB });
+          }).not[toThrow](expected);
+        });
+
+        test('isNot true, incorrect cause', () => {
+          expectUnderTest(() => {
+            throw new Error('good', { cause: errorA });
+          }).not[toThrow](expected);
+        });
+      });
+
+      test.describe('fail', () => {
+        test('isNot false, incorrect message', () => {
+          expect(() =>
+            expectUnderTest(() => {
+              throw new Error('bad', { cause: errorB });
+            })[toThrow](expected),
+          ).toThrow(
+              /^(?=.*Expected message and cause: ).*Received message and cause: /s,
+          );
+        });
+
+        test('isNot true, incorrect cause', () => {
+          expect(() =>
+            expectUnderTest(() => {
+              throw new Error('good', { cause: errorA });
+            })[toThrow](expected),
+          ).toThrow(
+              /^(?=.*Expected message and cause: ).*Received message and cause: /s,
+          );
+        });
+      });
+    });
+
+    test.describe('asymmetric', () => {
+      test.describe('any-Class', () => {
+        test.describe('pass', () => {
+          test('isNot false', () => {
+            expectUnderTest(() => {
+              throw new Err('apple');
+            })[toThrow](expect.any(Err));
+          });
+
+          test('isNot true', () => {
+            expectUnderTest(() => {
+              throw new Err('apple');
+            }).not[toThrow](expect.any(Err2));
+          });
+        });
+
+        test.describe('fail', () => {
+          test('isNot false', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new Err('apple');
+              })[toThrow](expect.any(Err2)),
+            ).toThrowErrorMatchingSnapshot();
+          });
+
+          test('isNot true', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new Err('apple');
+              }).not[toThrow](expect.any(Err)),
+            ).toThrowErrorMatchingSnapshot();
+          });
+        });
+      });
+
+      test.describe('anything', () => {
+        test.describe('pass', () => {
+          test('isNot false', () => {
+            expectUnderTest(() => {
+              throw new CustomError('apple');
+            })[toThrow](expect.anything());
+          });
+
+          test('isNot true', () => {
+            expectUnderTest(() => {}).not[toThrow](expect.anything());
+            expectUnderTest(() => {
+
+              throw null;
+            }).not[toThrow](expect.anything());
+          });
+        });
+
+        test.describe('fail', () => {
+          test('isNot false', () => {
+            expect(() =>
+              expectUnderTest(() => {
+
+                throw null;
+              })[toThrow](expect.anything()),
+            ).toThrowErrorMatchingSnapshot();
+          });
+
+          test('isNot true', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new CustomError('apple');
+              }).not[toThrow](expect.anything()),
+            ).toThrowErrorMatchingSnapshot();
+          });
+        });
+      });
+
+      test.describe('no-symbol', () => {
+        // Test serialization of asymmetric matcher which has no property:
+        // this.$$typeof = Symbol.for('jest.asymmetricMatcher')
+        const matchError = {
+          asymmetricMatch(received: Error | null | undefined) {
+            return (
+              received !== null &&
+              received !== undefined &&
+              received.name === 'Error'
+            );
+          },
+        };
+        const matchNotError = {
+          asymmetricMatch(received: Error | null | undefined) {
+            return (
+              received !== null &&
+              received !== undefined &&
+              received.name !== 'Error'
+            );
+          },
+        };
+
+        test.describe('pass', () => {
+          test('isNot false', () => {
+            expectUnderTest(() => {
+              throw new CustomError('apple');
+            })[toThrow](matchError);
+          });
+
+          test('isNot true', () => {
+            expectUnderTest(() => {
+              throw new CustomError('apple');
+            }).not[toThrow](matchNotError);
+          });
+        });
+
+        test.describe('fail', () => {
+          test('isNot false', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new CustomError('apple');
+              })[toThrow](matchNotError),
+            ).toThrowErrorMatchingSnapshot();
+          });
+
+          test('isNot true', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new CustomError('apple');
+              }).not[toThrow](matchError),
+            ).toThrowErrorMatchingSnapshot();
+          });
+        });
+      });
+
+      test.describe('objectContaining', () => {
+        const matchError = expect.objectContaining({
+          name: 'Error',
+        });
+        const matchNotError = expect.objectContaining({
+          name: 'NotError',
+        });
+
+        test.describe('pass', () => {
+          test('isNot false', () => {
+            expectUnderTest(() => {
+              throw new CustomError('apple');
+            })[toThrow](matchError);
+          });
+
+          test('isNot true', () => {
+            expectUnderTest(() => {
+              throw new CustomError('apple');
+            }).not[toThrow](matchNotError);
+          });
+        });
+
+        test.describe('fail', () => {
+          test('isNot false', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new CustomError('apple');
+              })[toThrow](matchNotError),
+            ).toThrowErrorMatchingSnapshot();
+          });
+
+          test('isNot true', () => {
+            expect(() =>
+              expectUnderTest(() => {
+                throw new CustomError('apple');
+              }).not[toThrow](matchError),
+            ).toThrowErrorMatchingSnapshot();
+          });
+        });
+      });
+    });
+
+    test.describe('promise/async throws if Error-like object is returned', () => {
+      const asyncFn = async (shouldThrow?: boolean, resolve?: boolean) => {
+        let err;
+        if (shouldThrow)
+          err = new Err('async apple');
+
+        if (resolve)
+          return Promise.resolve(err || 'apple');
+        else
+          return Promise.reject(err || 'apple');
+      };
+
+      test('passes', async () => {
+        await expectUnderTest(Promise.reject(new Error())).rejects[toThrow]();
+
+        await expectUnderTest(asyncFn(true)).rejects[toThrow]();
+        await expectUnderTest(asyncFn(true)).rejects[toThrow](Err);
+        await expectUnderTest(asyncFn(true)).rejects[toThrow](Error);
+        await expectUnderTest(asyncFn(true)).rejects[toThrow]('apple');
+        await expectUnderTest(asyncFn(true)).rejects[toThrow](/app/);
+
+        await expectUnderTest(asyncFn(true)).rejects.not[toThrow](Err2);
+        await expectUnderTest(asyncFn(true)).rejects.not[toThrow]('banana');
+        await expectUnderTest(asyncFn(true)).rejects.not[toThrow](/banana/);
+
+        await expectUnderTest(asyncFn(true, true)).resolves[toThrow]();
+
+        await expectUnderTest(asyncFn(false, true)).resolves.not[toThrow]();
+        await expectUnderTest(asyncFn(false, true)).resolves.not[toThrow](Error);
+        await expectUnderTest(asyncFn(false, true)).resolves.not[toThrow]('apple');
+        await expectUnderTest(asyncFn(false, true)).resolves.not[toThrow](/apple/);
+        await expectUnderTest(asyncFn(false, true)).resolves.not[toThrow]('banana');
+        await expectUnderTest(asyncFn(false, true)).resolves.not[toThrow](/banana/);
+
+        await expectUnderTest(asyncFn()).rejects.not[toThrow]();
+        await expectUnderTest(asyncFn()).rejects.not[toThrow](Error);
+        await expectUnderTest(asyncFn()).rejects.not[toThrow]('apple');
+        await expectUnderTest(asyncFn()).rejects.not[toThrow](/apple/);
+        await expectUnderTest(asyncFn()).rejects.not[toThrow]('banana');
+        await expectUnderTest(asyncFn()).rejects.not[toThrow](/banana/);
+
+        // Works with nested functions inside promises
+        await expectUnderTest(
+            Promise.reject(() => {
+              throw new Error();
+            }),
+        ).rejects[toThrow]();
+        await expectUnderTest(Promise.reject(() => {})).rejects.not[toThrow]();
+      });
+
+      test('did not throw at all', async () => {
+        await expectUnderTestAsAny(
+            expectUnderTest(asyncFn()).rejects[toThrow](),
+        ).rejects.toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but class did not match', async () => {
+        await expectUnderTestAsAny(
+            expectUnderTest(asyncFn(true)).rejects[toThrow](Err2),
+        ).rejects.toThrowErrorMatchingSnapshot();
+      });
+
+      test('threw, but should not have', async () => {
+        await expectUnderTestAsAny(
+            expectUnderTest(asyncFn(true)).rejects.not[toThrow](),
+        ).rejects.toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test.describe('expected is undefined', () => {
+      test('threw, but should not have (non-error falsey)', () => {
+        expect(() => {
+          expectUnderTest(() => {
+
+            throw null;
+          }).not[toThrow]();
+        }).toThrowErrorMatchingSnapshot();
+      });
+    });
+
+    test('invalid arguments', () => {
+      expect(() =>
+        expectUnderTest(() => {}).not[toThrow](111),
+      ).toThrowErrorMatchingSnapshot();
+    });
+
+    test('invalid actual', () => {
+      expect(() =>
+        expectUnderTest('a string')[toThrow](),
+      ).toThrowErrorMatchingSnapshot();
+    });
+  });
+}
diff --git a/tests/image_tools/fixtures.spec.ts b/tests/image_tools/fixtures.spec.ts
index d67a279715220..22a23a9eefbbf 100644
--- a/tests/image_tools/fixtures.spec.ts
+++ b/tests/image_tools/fixtures.spec.ts
@@ -16,7 +16,7 @@
 
 import { test, expect } from '../playwright-test/stable-test-runner';
 import { PNG } from 'playwright-core/lib/utilsBundle';
-import { compare } from 'playwright-core/lib/image_tools/compare';
+import { compare } from 'playwright-core/lib/server/utils/image_tools/compare';
 import fs from 'fs';
 import path from 'path';
 
diff --git a/tests/image_tools/unit.spec.ts b/tests/image_tools/unit.spec.ts
index f565a5d0a066b..8d68cc28c0add 100644
--- a/tests/image_tools/unit.spec.ts
+++ b/tests/image_tools/unit.spec.ts
@@ -15,9 +15,9 @@
  */
 
 import { test } from '../playwright-test/stable-test-runner';
-import { ssim, FastStats } from 'playwright-core/lib/image_tools/stats';
-import { ImageChannel } from 'playwright-core/lib/image_tools/imageChannel';
-import { srgb2xyz, xyz2lab, colorDeltaE94 } from 'playwright-core/lib/image_tools/colorUtils';
+import { ssim, FastStats } from 'playwright-core/lib/server/utils/image_tools/stats';
+import { ImageChannel } from 'playwright-core/lib/server/utils/image_tools/imageChannel';
+import { srgb2xyz, xyz2lab, colorDeltaE94 } from 'playwright-core/lib/server/utils/image_tools/colorUtils';
 import referenceSSIM from 'ssim.js';
 import { randomPNG, assertEqual, grayChannel } from './utils';
 
diff --git a/tests/image_tools/utils.ts b/tests/image_tools/utils.ts
index 2587411d61240..a3d933c9d94e8 100644
--- a/tests/image_tools/utils.ts
+++ b/tests/image_tools/utils.ts
@@ -15,7 +15,7 @@
  */
 
 import { PNG } from 'playwright-core/lib/utilsBundle';
-import { ImageChannel } from 'playwright-core/lib/image_tools/imageChannel';
+import { ImageChannel } from 'playwright-core/lib/server/utils/image_tools/imageChannel';
 
 // mulberry32
 export function createRandom(seed) {
diff --git a/tests/installation/globalSetup.ts b/tests/installation/globalSetup.ts
index 7714f35226e74..d875f8b215eb7 100644
--- a/tests/installation/globalSetup.ts
+++ b/tests/installation/globalSetup.ts
@@ -16,8 +16,8 @@
 
 import path from 'path';
 import fs from 'fs';
-import { spawnAsync } from '../../packages/playwright-core/lib/utils/spawnAsync';
-import { removeFolders } from '../../packages/playwright-core/lib/utils/fileUtils';
+import { spawnAsync } from '../../packages/playwright-core/lib/server/utils/spawnAsync';
+import { removeFolders } from '../../packages/playwright-core/lib/server/utils/fileUtils';
 import { TMP_WORKSPACES } from './npmTest';
 
 const PACKAGE_BUILDER_SCRIPT = path.join(__dirname, '..', '..', 'utils', 'pack_package.js');
diff --git a/tests/installation/npmTest.ts b/tests/installation/npmTest.ts
index 01110d3c38aae..fef212c0ca4e9 100644
--- a/tests/installation/npmTest.ts
+++ b/tests/installation/npmTest.ts
@@ -22,8 +22,8 @@ import debugLogger from 'debug';
 import { Registry }  from './registry';
 import type { CommonFixtures, CommonWorkerFixtures } from '../config/commonFixtures';
 import { commonFixtures } from '../config/commonFixtures';
-import { removeFolders } from '../../packages/playwright-core/lib/utils/fileUtils';
-import { spawnAsync } from '../../packages/playwright-core/lib/utils/spawnAsync';
+import { removeFolders } from '../../packages/playwright-core/lib/server/utils/fileUtils';
+import { spawnAsync } from '../../packages/playwright-core/lib/server/utils/spawnAsync';
 import type { SpawnOptions } from 'child_process';
 
 export const TMP_WORKSPACES = path.join(os.platform() === 'darwin' ? '/tmp' : os.tmpdir(), 'pwt', 'workspaces');
@@ -31,16 +31,22 @@ export const TMP_WORKSPACES = path.join(os.platform() === 'darwin' ? '/tmp' : os
 const debug = debugLogger('itest');
 
 const expect = _expect.extend({
-  toHaveLoggedSoftwareDownload(received: any, browsers: ('chromium' | 'firefox' | 'webkit' | 'ffmpeg')[]) {
+  toHaveLoggedSoftwareDownload(received: string, browsers: ('chromium' | 'chromium-headless-shell' | 'firefox' | 'webkit' | 'winldd' |'ffmpeg')[]) {
     if (typeof received !== 'string')
       throw new Error(`Expected argument to be a string.`);
 
     const downloaded = new Set();
-    for (const [, browser] of received.matchAll(/^.*(chromium|firefox|webkit|ffmpeg).*playwright build v\d+\)? downloaded.*$/img))
-      downloaded.add(browser.toLowerCase());
+    let index = 0;
+    while (true) {
+      const match = received.substring(index).match(/(chromium|chromium headless shell|firefox|webkit|winldd|ffmpeg)[\s\d\.]+\(?playwright build v\d+\)? downloaded/im);
+      if (!match)
+        break;
+      downloaded.add(match[1].replace(/\s/g, '-').toLowerCase());
+      index += match.index + 1;
+    }
 
-    const expected = browsers;
-    if (expected.length === downloaded.size && expected.every(browser => downloaded.has(browser))) {
+    const expected = new Set(browsers);
+    if (expected.size === downloaded.size && [...expected].every(browser => downloaded.has(browser))) {
       return {
         pass: true,
         message: () => 'Expected not to download browsers, but did.'
@@ -69,7 +75,7 @@ type NPMTestFixtures = {
   _auto: void;
   _browsersPath: string;
   tmpWorkspace: string;
-  installedSoftwareOnDisk: () => Promise<string[]>;
+  checkInstalledSoftwareOnDisk: (browsers: string[]) => Promise<void>;
   writeFiles: (nameToContents: Record<string, string>) => Promise<void>;
   exec: (cmd: string, ...argsAndOrOptions: ArgsOrOptions) => Promise<string>;
   tsc: (args: string) => Promise<string>;
@@ -101,6 +107,8 @@ export const test = _test
         const npmLines = [
           `registry = ${registry.url()}/`,
           `cache = ${testInfo.outputPath('npm_cache')}`,
+          // Required after https://github.com/npm/cli/pull/8185.
+          'replace-registry-host=never',
         ];
         if (!allowGlobalInstall) {
           yarnLines.push(`prefix "${testInfo.outputPath('npm_global')}"`);
@@ -128,7 +136,7 @@ export const test = _test
       tmpWorkspace: async ({}, use) => {
         // We want a location that won't have a node_modules dir anywhere along its path
         const tmpWorkspace = path.join(TMP_WORKSPACES, path.basename(test.info().outputDir));
-        await fs.promises.mkdir(tmpWorkspace);
+        await fs.promises.mkdir(tmpWorkspace, { recursive: true });
         debug(`Workspace Folder: ${tmpWorkspace}`);
         await use(tmpWorkspace);
       },
@@ -140,19 +148,21 @@ export const test = _test
         await use(registry);
         await registry.shutdown();
       },
-      installedSoftwareOnDisk: async ({ isolateBrowsers, _browsersPath }, use) => {
-        if (!isolateBrowsers)
-          throw new Error(`Test that checks browser installation must set "isolateBrowsers" to true`);
-        await use(async () => fs.promises.readdir(_browsersPath).catch(() => []).then(files => files.map(f => f.split('-')[0]).filter(f => !f.startsWith('.'))));
+      checkInstalledSoftwareOnDisk: async ({ isolateBrowsers, _browsersPath }, use) => {
+        await use(async expected => {
+          if (!isolateBrowsers)
+            throw new Error(`Test that checks browser installation must set "isolateBrowsers" to true`);
+          const actual = await fs.promises.readdir(_browsersPath).catch(() => []).then(files => files.map(f => f.split('-')[0].replace(/_/g, '-')).filter(f => !f.startsWith('.')));
+          expect(new Set(actual)).toEqual(new Set(expected));
+        });
       },
       exec: async ({ tmpWorkspace, _browsersPath, isolateBrowsers }, use, testInfo) => {
         await use(async (cmd: string, ...argsAndOrOptions: [] | [...string[]] | [...string[], ExecOptions] | [ExecOptions]) => {
-          let args: string[] = [];
           let options: ExecOptions = {};
           if (typeof argsAndOrOptions[argsAndOrOptions.length - 1] === 'object')
             options = argsAndOrOptions.pop() as ExecOptions;
 
-          args = argsAndOrOptions as string[];
+          const command = [cmd, ...argsAndOrOptions].join(' ');
 
           let result!: {stdout: string, stderr: string, code: number | null, error?: Error};
           const cwd = options.cwd ?? tmpWorkspace;
@@ -165,11 +175,10 @@ export const test = _test
             ...(isolateBrowsers ? { PLAYWRIGHT_BROWSERS_PATH: _browsersPath } : {}),
             ...options.env,
           };
-          await test.step(`exec: ${[cmd, ...args].join(' ')}`, async () => {
-            result = await spawnAsync(cmd, args, { shell: true, cwd, env });
+          await test.step(`exec: ${command}`, async () => {
+            result = await spawnAsync(command, { shell: true, cwd, env });
           });
 
-          const command = [cmd, ...args].join(' ');
           const stdio = result.stdout + result.stderr;
           const commandEnv = Object.entries(env).map(e => `${e[0]}=${e[1]}`).join(' ');
           const fullCommand = `cd ${cwd} && ${commandEnv} ${command}`;
diff --git a/tests/installation/npx-global.spec.ts b/tests/installation/npx-global.spec.ts
index 4a7a5b47f588b..0df4d4829b025 100755
--- a/tests/installation/npx-global.spec.ts
+++ b/tests/installation/npx-global.spec.ts
@@ -17,26 +17,26 @@ import { test, expect } from './npmTest';
 
 test.use({ isolateBrowsers: true, allowGlobalInstall: true });
 
-test('npx playwright --help should not download browsers', async ({ exec, installedSoftwareOnDisk }) => {
+test('npx playwright --help should not download browsers', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   const result = await exec('npx playwright --help');
   expect(result).toHaveLoggedSoftwareDownload([]);
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([]);
   expect(result).not.toContain(`To avoid unexpected behavior, please install your dependencies first`);
 });
 
-test('npx playwright codegen', async ({ exec, installedSoftwareOnDisk }) => {
+test('npx playwright codegen', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   const stdio = await exec('npx playwright codegen', { expectToExitWithError: true });
   expect(stdio).toHaveLoggedSoftwareDownload([]);
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([]);
   expect(stdio).toContain(`Please run the following command to download new browsers`);
 });
 
-test('npx playwright install global', async ({ exec, installedSoftwareOnDisk }) => {
+test('npx playwright install global', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   test.skip(process.platform === 'win32', 'isLikelyNpxGlobal() does not work in this setup on our bots');
 
   const result = await exec('npx playwright install');
-  expect(result).toHaveLoggedSoftwareDownload(['chromium', 'ffmpeg', 'firefox', 'webkit']);
-  expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg', 'firefox', 'webkit']);
+  expect(result).toHaveLoggedSoftwareDownload(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit']);
+  await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit']);
   expect(result).not.toContain(`Please run the following command to download new browsers`);
   expect(result).toContain(`To avoid unexpected behavior, please install your dependencies first`);
 });
diff --git a/tests/installation/playwright-cdn.spec.ts b/tests/installation/playwright-cdn.spec.ts
index e1e438ecdce10..1ebb49a01a598 100644
--- a/tests/installation/playwright-cdn.spec.ts
+++ b/tests/installation/playwright-cdn.spec.ts
@@ -19,9 +19,9 @@ import net from 'net';
 import type { AddressInfo } from 'net';
 
 const CDNS = [
-  'https://playwright.azureedge.net',
-  'https://playwright-akamai.azureedge.net',
-  'https://playwright-verizon.azureedge.net',
+  'https://cdn.playwright.dev/dbazure/download/playwright', // ESRP
+  'https://playwright.download.prss.microsoft.com/dbazure/download/playwright', // ESRP Fallback
+  'https://cdn.playwright.dev',
 ];
 
 const DL_STAT_BLOCK = /^.*from url: (.*)$\n^.*to location: (.*)$\n^.*response status code: (.*)$\n^.*total bytes: (\d+)$\n^.*download complete, size: (\d+)$\n^.*SUCCESS downloading (\w+) .*$/gm;
@@ -37,12 +37,14 @@ const parsedDownloads = (rawLogs: string) => {
 
 test.use({ isolateBrowsers: true });
 
+const extraInstalledSoftware = process.platform === 'win32' ? ['winldd' as const] : [];
+
 for (const cdn of CDNS) {
-  test(`playwright cdn failover should work (${cdn})`, async ({ exec, installedSoftwareOnDisk }) => {
+  test(`playwright cdn failover should work (${cdn})`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
     await exec('npm i playwright');
     const result = await exec('npx playwright install', { env: { PW_TEST_CDN_THAT_SHOULD_WORK: cdn, DEBUG: 'pw:install' } });
-    expect(result).toHaveLoggedSoftwareDownload(['chromium', 'ffmpeg', 'firefox', 'webkit']);
-    expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg', 'firefox', 'webkit']);
+    expect(result).toHaveLoggedSoftwareDownload(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
+    await checkInstalledSoftwareOnDisk((['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]));
     const dls = parsedDownloads(result);
     for (const software of ['chromium', 'ffmpeg', 'firefox', 'webkit'])
       expect(dls).toContainEqual({ status: 200, name: software, url: expect.stringContaining(cdn) });
@@ -70,6 +72,64 @@ test(`playwright cdn should race with a timeout`, async ({ exec }) => {
   }
 });
 
+test(`playwright cdn should not timeout on redirect`, {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34686' }
+}, async ({ exec }) => {
+  const server = http.createServer(async (req, res) => {
+    if (req.url !== '/foo.zip') {
+      res.writeHead(307, {
+        'Connection': 'keep-alive',
+        'location': `http://127.0.0.1:${(server.address() as AddressInfo).port}/foo.zip`,
+      });
+      res.flushHeaders();
+      // Keep the connection open, the client is expected to close it.
+      return;
+    }
+    const emptyZip = Buffer.from([
+      0x50, 0x4B, 0x05, 0x06, // EOCD
+      0x00, 0x00,             // Disk number
+      0x00, 0x00,             // Central dir start disk
+      0x00, 0x00,             // Central dir records on this disk
+      0x00, 0x00,             // Total central dir records
+      0x00, 0x00, 0x00, 0x00, // Central dir size
+      0x00, 0x00, 0x00, 0x00, // Offset of start of central dir
+      0x00, 0x00              // ZIP comment length
+    ]);
+    res.socket.setNoDelay(true);
+    res.writeHead(200, {
+      'Content-Type': 'application/zip',
+      'Content-Disposition': 'attachment; filename="empty.zip"',
+      'Content-Length': emptyZip.length,
+    });
+    res.flushHeaders();
+    // Send one byte at a time in small intervals (< 1000ms) during 2 seconds
+    // to keep the second connection slow but alive.
+    for (let i = 0; i < emptyZip.length; i ++) {
+      res.write(emptyZip.subarray(i, i + 1));
+      await new Promise(resolve => setTimeout(resolve, 2000 / emptyZip.length));
+    }
+    res.end();
+  });
+  await new Promise<void>(resolve => server.listen(0, resolve));
+
+  try {
+    await exec('npm i playwright');
+    const result = await exec('npx playwright install chromium', {
+      env: {
+        PLAYWRIGHT_DOWNLOAD_HOST: `http://127.0.0.1:${(server.address() as AddressInfo).port}`,
+        DEBUG: 'pw:install',
+        PLAYWRIGHT_DOWNLOAD_CONNECTION_TIMEOUT: '1000',
+      },
+      expectToExitWithError: true
+    });
+    // Steps after the extraction will fail, but the download should succeed without timeouts.
+    expect(result).toContain(`pw:install SUCCESS downloading Chromium`);
+    expect(result).not.toContain(`timed out after 1000ms`);
+  } finally {
+    await new Promise(resolve => server.close(resolve));
+  }
+});
+
 test(`npx playwright install should not hang when CDN closes the connection`, async ({ exec }) => {
   let retryCount = 0;
   const server = http.createServer((req, res) => {
@@ -90,8 +150,8 @@ test(`npx playwright install should not hang when CDN closes the connection`, as
       },
       expectToExitWithError: true
     });
-    expect(retryCount).toBe(3);
-    expect([...result.matchAll(/Download failed: server closed connection/g)]).toHaveLength(3);
+    expect(retryCount).toBe(5);
+    expect([...result.matchAll(/Download failed: server closed connection/g)]).toHaveLength(5);
   } finally {
     await new Promise(resolve => server.close(resolve));
   }
@@ -120,8 +180,8 @@ test(`npx playwright install should not hang when CDN TCP connection stalls`, as
       },
       expectToExitWithError: true
     });
-    expect(retryCount).toBe(3);
-    expect([...result.matchAll(/timed out after/g)]).toHaveLength(3);
+    expect(retryCount).toBe(5);
+    expect([...result.matchAll(/timed out after/g)]).toHaveLength(5);
   } finally {
     for (const socket of socketsToDestroy)
       socket.destroy();
diff --git a/tests/installation/playwright-cli-install-should-work.spec.ts b/tests/installation/playwright-cli-install-should-work.spec.ts
index e056e611389a4..4e068a2412d1c 100755
--- a/tests/installation/playwright-cli-install-should-work.spec.ts
+++ b/tests/installation/playwright-cli-install-should-work.spec.ts
@@ -14,23 +14,37 @@
  * limitations under the License.
  */
 import { test, expect } from './npmTest';
+import { chromium } from '@playwright/test';
 import path from 'path';
+import { TestProxy } from '../config/proxy';
 
 test.use({ isolateBrowsers: true });
 
-test('install command should work', async ({ exec, installedSoftwareOnDisk }) => {
+const extraInstalledSoftware = process.platform === 'win32' ? ['winldd' as const] : [];
+
+test('install command should work', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   await exec('npm i playwright');
 
   await test.step('playwright install chromium', async () => {
     const result = await exec('npx playwright install chromium');
-    expect(result).toHaveLoggedSoftwareDownload(['chromium', 'ffmpeg']);
-    expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg']);
+    expect(result).toHaveLoggedSoftwareDownload(['chromium', 'chromium-headless-shell', 'ffmpeg', ...extraInstalledSoftware]);
+    await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', ...extraInstalledSoftware]);
   });
 
   await test.step('playwright install', async () => {
     const result = await exec('npx playwright install');
     expect(result).toHaveLoggedSoftwareDownload(['firefox', 'webkit']);
-    expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg', 'firefox', 'webkit']);
+    await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
+  });
+
+  await test.step('playwright install --list', async () => {
+    const result = await exec('npx playwright install --list');
+    expect.soft(result).toMatch(/Playwright version: \d+\.\d+/);
+    expect.soft(result).toMatch(/chromium-\d+/);
+    expect.soft(result).toMatch(/chromium_headless_shell-\d+/);
+    expect.soft(result).toMatch(/ffmpeg-\d+/);
+    expect.soft(result).toMatch(/firefox-\d+/);
+    expect.soft(result).toMatch(/webkit-\d+/);
   });
 
   await exec('node sanity.js playwright', { env: { PLAYWRIGHT_BROWSERS_PATH: '0' } });
@@ -47,12 +61,28 @@ test('install command should work', async ({ exec, installedSoftwareOnDisk }) =>
   }
 });
 
-test('should be able to remove browsers', async ({ exec, installedSoftwareOnDisk }) => {
+test('install command should work with proxy', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36650' } }, async ({ exec, checkInstalledSoftwareOnDisk }) => {
+  await exec('npm i playwright');
+  const proxy = await TestProxy.create(8947 + test.info().workerIndex * 4);
+  proxy.forwardTo(443, { preserveHostname: true });
+  await test.step('playwright install chromium', async () => {
+    const result = await exec('npx playwright install chromium', {
+      env: {
+        HTTPS_PROXY: proxy.URL,
+      }
+    });
+    expect(result).toHaveLoggedSoftwareDownload(['chromium', 'chromium-headless-shell', 'ffmpeg', ...extraInstalledSoftware]);
+    await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', ...extraInstalledSoftware]);
+  });
+  await proxy.stop();
+});
+
+test('should be able to remove browsers', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   await exec('npm i playwright');
   await exec('npx playwright install chromium');
-  expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg']);
+  await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', ...extraInstalledSoftware]);
   await exec('npx playwright uninstall');
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([...extraInstalledSoftware]);
 });
 
 test('should print the right install command without browsers', async ({ exec }) => {
@@ -90,8 +120,51 @@ test('subsequent installs works', async ({ exec }) => {
   await exec('node --unhandled-rejections=strict', path.join('node_modules', '@playwright', 'browser-chromium', 'install.js'));
 });
 
-test('install playwright-chromium should work', async ({ exec, installedSoftwareOnDisk }) => {
+test('install playwright-chromium should work', async ({ exec }) => {
   await exec('npm i playwright-chromium');
   await exec('npx playwright install chromium');
   await exec('node sanity.js playwright-chromium chromium');
 });
+
+test('should print error if recording video without ffmpeg', async ({ exec, writeFiles }) => {
+  await exec('npm i playwright');
+
+  await writeFiles({
+    'launch.js': `
+      const playwright = require('playwright');
+      (async () => {
+        const browser = await playwright.chromium.launch({ executablePath: ${JSON.stringify(chromium.executablePath())} });
+        try {
+          const context = await browser.newContext({ recordVideo: { dir: 'videos' } });
+          const page = await context.newPage();
+        } finally {
+          await browser.close();
+        }
+      })().catch(e => {
+        console.error(e);
+        process.exit(1);
+      });
+    `,
+    'launchPersistentContext.js': `
+      const playwright = require('playwright');
+      process.on('unhandledRejection', (e) => console.error('unhandledRejection', e));
+      (async () => {
+        const context = await playwright.chromium.launchPersistentContext('', { executablePath: ${JSON.stringify(chromium.executablePath())}, recordVideo: { dir: 'videos' } });
+      })().catch(e => {
+        console.error(e);
+        process.exit(1);
+      });
+    `,
+  });
+
+  await test.step('BrowserType.launch', async () => {
+    const result = await exec('node', 'launch.js', { expectToExitWithError: true });
+    expect(result).toContain(`browserContext.newPage: Executable doesn't exist at`);
+  });
+
+  await test.step('BrowserType.launchPersistentContext', async () => {
+    const result = await exec('node', 'launchPersistentContext.js', { expectToExitWithError: true });
+    expect(result).not.toContain('unhandledRejection');
+    expect(result).toContain(`browserType.launchPersistentContext: Executable doesn't exist at`);
+  });
+});
diff --git a/tests/installation/playwright-cli.spec.ts b/tests/installation/playwright-cli.spec.ts
index 02e65a0fe8e2b..1dad9f1b6d140 100755
--- a/tests/installation/playwright-cli.spec.ts
+++ b/tests/installation/playwright-cli.spec.ts
@@ -16,39 +16,69 @@
 import { test, expect } from './npmTest';
 import path from 'path';
 import fs from 'fs';
+import os from 'os';
 
 test('cli should work', async ({ exec, tmpWorkspace }) => {
   await exec('npm i playwright');
   await exec('npx playwright install chromium');
 
   await test.step('codegen without arguments', async () => {
-    const result = await exec('npx playwright codegen', {
+    const outputFile = test.info().outputPath('codegen.output');
+    await exec(`npx playwright codegen --output=${outputFile}`, {
       env: {
         PWTEST_CLI_IS_UNDER_TEST: '1',
-        PWTEST_CLI_AUTO_EXIT_WHEN: '@playwright/test',
+        PWTEST_CLI_EXIT_AFTER_TIMEOUT: '10000',
       }
     });
-    expect(result).toContain(`{ page }`);
+    const contents = fs.readFileSync(outputFile, 'utf-8');
+    expect(contents).toContain(`@playwright/test`);
+    expect(contents).toContain(`{ page }`);
+  });
+
+  await test.step('codegen with user data dir', async () => {
+    const userDataDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-test-custom-user-data-dir'));
+    const outputFile = test.info().outputPath('codegen.output');
+
+    try {
+      await exec(`npx playwright codegen  --output=${outputFile} --user-data-dir ${userDataDir} about:blank`, {
+        env: {
+          PWTEST_CLI_IS_UNDER_TEST: '1',
+          PWTEST_CLI_EXIT_AFTER_TIMEOUT: '10000',
+        }
+      });
+      expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
+      const contents = fs.readFileSync(outputFile, 'utf-8');
+      expect(contents).toContain(`goto('about:blank')`);
+      expect(contents).toContain(`{ page }`);
+    } finally {
+      fs.rmSync(userDataDir, { recursive: true });
+    }
   });
 
   await test.step('codegen --target=javascript', async () => {
-    const result = await exec('npx playwright codegen --target=javascript', {
+    const outputFile = test.info().outputPath('codegen.output');
+    await exec(`npx playwright codegen --target=javascript --output=${outputFile}`, {
       env: {
         PWTEST_CLI_IS_UNDER_TEST: '1',
-        PWTEST_CLI_AUTO_EXIT_WHEN: 'context.close',
+        PWTEST_CLI_EXIT_AFTER_TIMEOUT: '10000',
       }
     });
-    expect(result).toContain(`playwright`);
+    const contents = fs.readFileSync(outputFile, 'utf-8');
+    expect(contents).toContain(`context.close`);
+    expect(contents).toContain(`playwright`);
   });
 
   await test.step('codegen --target=python', async () => {
-    const result = await exec('npx playwright codegen --target=python', {
+    const outputFile = test.info().outputPath('codegen.output');
+    await exec(`npx playwright codegen --target=python --output=${outputFile}`, {
       env: {
         PWTEST_CLI_IS_UNDER_TEST: '1',
-        PWTEST_CLI_AUTO_EXIT_WHEN: 'chromium.launch',
+        PWTEST_CLI_EXIT_AFTER_TIMEOUT: '10000',
       },
     });
-    expect(result).toContain(`browser.close`);
+    const contents = fs.readFileSync(outputFile, 'utf-8');
+    expect(contents).toContain(`chromium.launch`);
+    expect(contents).toContain(`browser.close`);
   });
 
   await test.step('screenshot', async () => {
diff --git a/tests/installation/playwright-packages-install-behavior.spec.ts b/tests/installation/playwright-packages-install-behavior.spec.ts
index 24d8c058a5a30..2474d889ebb59 100755
--- a/tests/installation/playwright-packages-install-behavior.spec.ts
+++ b/tests/installation/playwright-packages-install-behavior.spec.ts
@@ -18,16 +18,18 @@ import { test, expect } from './npmTest';
 
 test.use({ isolateBrowsers: true });
 
+const extraInstalledSoftware = process.platform === 'win32' ? ['winldd' as const] : [];
+
 for (const browser of ['chromium', 'firefox', 'webkit']) {
-  test(`playwright-${browser} should work`, async ({ exec, installedSoftwareOnDisk }) => {
+  test(`playwright-${browser} should work`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
     const pkg = `playwright-${browser}`;
     const result = await exec('npm i --foreground-scripts', pkg);
     const browserName = pkg.split('-')[1];
-    const expectedSoftware = [browserName];
+    const expectedSoftware = [browserName, ...extraInstalledSoftware];
     if (browserName === 'chromium')
-      expectedSoftware.push('ffmpeg');
+      expectedSoftware.push('chromium-headless-shell', 'ffmpeg');
     expect(result).toHaveLoggedSoftwareDownload(expectedSoftware as any);
-    expect(await installedSoftwareOnDisk()).toEqual(expectedSoftware);
+    await checkInstalledSoftwareOnDisk(expectedSoftware);
     expect(result).not.toContain(`To avoid unexpected behavior, please install your dependencies first`);
     await exec('node sanity.js', pkg, browser);
     await exec('node', `esm-${pkg}.mjs`);
@@ -35,57 +37,75 @@ for (const browser of ['chromium', 'firefox', 'webkit']) {
 }
 
 for (const browser of ['chromium', 'firefox', 'webkit']) {
-  test(`@playwright/browser-${browser} should work`, async ({ exec, installedSoftwareOnDisk }) => {
+  test(`@playwright/browser-${browser} should work`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
     const pkg = `@playwright/browser-${browser}`;
-    const expectedSoftware = [browser];
+    const expectedSoftware = [browser, ...extraInstalledSoftware];
     if (browser === 'chromium')
-      expectedSoftware.push('ffmpeg');
+      expectedSoftware.push('chromium-headless-shell', 'ffmpeg');
 
     const result1 = await exec('npm i --foreground-scripts', pkg);
     expect(result1).toHaveLoggedSoftwareDownload(expectedSoftware as any);
-    expect(await installedSoftwareOnDisk()).toEqual(expectedSoftware);
+    await checkInstalledSoftwareOnDisk(expectedSoftware);
     expect(result1).not.toContain(`To avoid unexpected behavior, please install your dependencies first`);
 
     const result2 = await exec('npm i --foreground-scripts playwright');
     expect(result2).toHaveLoggedSoftwareDownload([]);
-    expect(await installedSoftwareOnDisk()).toEqual(expectedSoftware);
+    await checkInstalledSoftwareOnDisk(expectedSoftware);
 
     await exec('node sanity.js playwright', browser);
     await exec('node browser-only.js', pkg);
   });
 }
 
-test(`playwright-core should work`, async ({ exec, installedSoftwareOnDisk }) => {
+test(`playwright-core should work`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
   const result1 = await exec('npm i --foreground-scripts playwright-core');
   expect(result1).toHaveLoggedSoftwareDownload([]);
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([]);
   const stdio = await exec('npx playwright-core', 'test', '-c', '.', { expectToExitWithError: true });
   expect(stdio).toContain(`Please install @playwright/test package`);
 });
 
-test(`playwright should work`, async ({ exec, installedSoftwareOnDisk }) => {
+test(`playwright should work`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
   const result1 = await exec('npm i --foreground-scripts playwright');
   expect(result1).toHaveLoggedSoftwareDownload([]);
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([]);
 
   const result2 = await exec('npx playwright install');
-  expect(result2).toHaveLoggedSoftwareDownload(['chromium', 'ffmpeg', 'firefox', 'webkit']);
-  expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg', 'firefox', 'webkit']);
+  expect(result2).toHaveLoggedSoftwareDownload(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
+  await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
 
   await exec('node sanity.js playwright chromium firefox webkit');
   await exec('node esm-playwright.mjs');
 });
 
-test('@playwright/test should work', async ({ exec, installedSoftwareOnDisk }) => {
+test(`playwright should work with chromium --no-shell`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
+  const result1 = await exec('npm i --foreground-scripts playwright');
+  expect(result1).toHaveLoggedSoftwareDownload([]);
+  await checkInstalledSoftwareOnDisk([]);
+  const result2 = await exec('npx playwright install chromium --no-shell');
+  expect(result2).toHaveLoggedSoftwareDownload(['chromium', 'ffmpeg', ...extraInstalledSoftware]);
+  await checkInstalledSoftwareOnDisk(['chromium', 'ffmpeg', ...extraInstalledSoftware]);
+});
+
+test(`playwright should work with chromium --only-shell`, async ({ exec, checkInstalledSoftwareOnDisk }) => {
+  const result1 = await exec('npm i --foreground-scripts playwright');
+  expect(result1).toHaveLoggedSoftwareDownload([]);
+  await checkInstalledSoftwareOnDisk([]);
+  const result2 = await exec('npx playwright install --only-shell');
+  expect(result2).toHaveLoggedSoftwareDownload(['chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
+  await checkInstalledSoftwareOnDisk(['chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
+});
+
+test('@playwright/test should work', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   const result1 = await exec('npm i --foreground-scripts @playwright/test');
   expect(result1).toHaveLoggedSoftwareDownload([]);
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([]);
 
   await exec('npx playwright test -c . sample.spec.js', { expectToExitWithError: true, message: 'should not be able to run tests without installing browsers' });
 
   const result2 = await exec('npx playwright install');
-  expect(result2).toHaveLoggedSoftwareDownload(['chromium', 'ffmpeg', 'firefox', 'webkit']);
-  expect(await installedSoftwareOnDisk()).toEqual(['chromium', 'ffmpeg', 'firefox', 'webkit']);
+  expect(result2).toHaveLoggedSoftwareDownload(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
+  await checkInstalledSoftwareOnDisk(['chromium', 'chromium-headless-shell', 'ffmpeg', 'firefox', 'webkit', ...extraInstalledSoftware]);
 
   await exec('node sanity.js @playwright/test chromium firefox webkit');
   await exec('node', 'esm-playwright-test.mjs');
diff --git a/tests/installation/playwright-test-plugin.spec.ts b/tests/installation/playwright-test-plugin.spec.ts
index 5762b49900bb2..fe4d24cd934b0 100755
--- a/tests/installation/playwright-test-plugin.spec.ts
+++ b/tests/installation/playwright-test-plugin.spec.ts
@@ -26,7 +26,6 @@ function patchPackageJsonForPreReleaseIfNeeded(tmpWorkspace: string) {
   // Workaround per https://stackoverflow.com/questions/71479750/npm-install-pre-release-versions-for-peer-dependency.
   const pkg = JSON.parse(fs.readFileSync(path.resolve(tmpWorkspace, 'package.json'), 'utf-8'));
   if (pkg.dependencies['@playwright/test'].match(/\d+\.\d+-\w+/)) {
-    console.log(`Setting overrides in package.json to make pre-release version of peer dependency work.`);
     pkg.overrides = { '@playwright/test': '$@playwright/test' };
     fs.writeFileSync(path.resolve(tmpWorkspace, 'package.json'), JSON.stringify(pkg, null, 2));
   }
diff --git a/tests/installation/playwright.config.ts b/tests/installation/playwright.config.ts
index 25ca82017b809..f61efa87ffc17 100644
--- a/tests/installation/playwright.config.ts
+++ b/tests/installation/playwright.config.ts
@@ -38,7 +38,7 @@ export default defineConfig({
   outputDir,
   testIgnore: '**\/fixture-scripts/**',
   timeout: 5 * 60 * 1000,
-  retries: 0,
+  retries: process.env.CI ? 3 : 0,
   reporter: reporters(),
   forbidOnly: !!process.env.CI,
   workers: 1,
diff --git a/tests/installation/registry.ts b/tests/installation/registry.ts
index c9214edb56100..fd3194a039515 100644
--- a/tests/installation/registry.ts
+++ b/tests/installation/registry.ts
@@ -19,8 +19,8 @@ import type { Server } from 'http';
 import type http from 'http';
 import https from 'https';
 import path from 'path';
-import { spawnAsync } from '../../packages/playwright-core/lib/utils/spawnAsync';
-import { createHttpServer } from '../../packages/playwright-core/lib/utils/network';
+import { spawnAsync } from '../../packages/playwright-core/lib/server/utils/spawnAsync';
+import { createHttpServer } from '../../packages/playwright-core/lib/server/utils/network';
 
 const kPublicNpmRegistry = 'https://registry.npmjs.org';
 const kContentTypeAbbreviatedMetadata = 'application/vnd.npm.install-v1+json';
diff --git a/tests/installation/skip-browser-download.spec.ts b/tests/installation/skip-browser-download.spec.ts
index 7cf9cdf602217..21d4443dca597 100755
--- a/tests/installation/skip-browser-download.spec.ts
+++ b/tests/installation/skip-browser-download.spec.ts
@@ -17,10 +17,10 @@ import { test, expect } from './npmTest';
 
 test.use({ isolateBrowsers: true });
 
-test('should skip browser installs', async ({ exec, installedSoftwareOnDisk }) => {
+test('should skip browser installs', async ({ exec, checkInstalledSoftwareOnDisk }) => {
   const result = await exec('npm i --foreground-scripts playwright @playwright/browser-firefox', { env: { PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1' } });
   expect(result).toHaveLoggedSoftwareDownload([]);
-  expect(await installedSoftwareOnDisk()).toEqual([]);
+  await checkInstalledSoftwareOnDisk([]);
   expect(result).toContain(`Skipping browsers download because`);
 
   if (process.platform === 'linux') {
diff --git a/tests/installation/validate-dependencies.spec.ts b/tests/installation/validate-dependencies.spec.ts
index 26b27c76e3520..ae9ff15590684 100644
--- a/tests/installation/validate-dependencies.spec.ts
+++ b/tests/installation/validate-dependencies.spec.ts
@@ -58,7 +58,7 @@ test('should validate dependencies correctly if skipped during install', async (
         DEBUG: 'pw:install',
       },
     });
-    expect(result).toContain(`validating host requirements for "chromium"`);
+    expect(result).toContain(`validating host requirements for "chromium-headless-shell"`);
     expect(result).not.toContain(`validating host requirements for "firefox"`);
     expect(result).not.toContain(`validating host requirements for "webkit"`);
   });
diff --git a/tests/library/beforeunload.spec.ts b/tests/library/beforeunload.spec.ts
index 9f0982eea7654..05134bd429332 100644
--- a/tests/library/beforeunload.spec.ts
+++ b/tests/library/beforeunload.spec.ts
@@ -104,3 +104,25 @@ it('should not stall on evaluate when dismissing beforeunload', async ({ page, s
   ]);
 });
 
+it('should not stall on click when dismissing beforeunload', async ({ page, server }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33806' });
+
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`<a href="${server.PREFIX}/frames/one-frame.html">click me</a>`);
+
+  await page.evaluate(() => {
+    window.onbeforeunload = () => false;
+  });
+  page.on('dialog', async dialog => {
+    await dialog.dismiss();
+  });
+
+  await page.getByRole('link').click({ noWaitAfter: true });
+  await page.evaluate(() => {
+    window.onbeforeunload = null;
+  });
+
+  // This line should not timeout.
+  await page.getByRole('link').click({ timeout: 5000 });
+  await expect(page).toHaveURL(server.PREFIX + '/frames/one-frame.html');
+});
diff --git a/tests/library/browser.spec.ts b/tests/library/browser.spec.ts
index 17bdc142131d0..19d47f871a4ea 100644
--- a/tests/library/browser.spec.ts
+++ b/tests/library/browser.spec.ts
@@ -62,3 +62,11 @@ test('should dispatch page.on(close) upon browser.close and reject evaluate', as
   const error = await promise;
   expect(error.message).toContain(kTargetClosedErrorMessage);
 });
+
+test('newContext should not leave a context upon failure', async ({ browser, toImpl }) => {
+  const error = await browser.newContext({
+    __testHookBeforeSetStorageState: () => Promise.reject(new Error('Oh my')),
+  } as any).catch(e => e);
+  expect(error.message).toContain('Oh my');
+  await expect.poll(() => toImpl(browser).contexts().length).toBe(0);
+});
diff --git a/tests/library/browsercontext-add-cookies.spec.ts b/tests/library/browsercontext-add-cookies.spec.ts
index e0ef92a00d244..8dceb50122ec0 100644
--- a/tests/library/browsercontext-add-cookies.spec.ts
+++ b/tests/library/browsercontext-add-cookies.spec.ts
@@ -65,6 +65,72 @@ it('should add cookies with empty value', async ({ context, page, server }) => {
   expect(await page.evaluate(() => document.cookie)).toEqual('marker=');
 });
 
+it('should set cookies with SameSite attribute and no secure attribute', async ({ context, browserName, isWindows, isLinux, defaultSameSiteCookieValue }) => {
+  // Use domain instead of URL to ensure that the `secure` attribute is not set.
+  await context.addCookies([{
+    domain: 'foo.com',
+    path: '/',
+    name: 'same-site-unset',
+    value: '1',
+  }, {
+    domain: 'foo.com',
+    path: '/',
+    name: 'same-site-none',
+    value: '1',
+    sameSite: 'None',
+  }, {
+    domain: 'foo.com',
+    path: '/',
+    name: 'same-site-lax',
+    value: '1',
+    sameSite: 'Lax',
+  }, {
+    domain: 'foo.com',
+    path: '/',
+    name: 'same-site-strict',
+    value: '1',
+    sameSite: 'Strict',
+  }]);
+  const cookies = new Set(await context.cookies(['https://foo.com']));
+  expect(cookies).toEqual(new Set([{
+    name: 'same-site-unset',
+    value: '1',
+    domain: 'foo.com',
+    path: '/',
+    expires: -1,
+    httpOnly: false,
+    secure: false,
+    sameSite: defaultSameSiteCookieValue,
+  }, ...(browserName === 'chromium' || (browserName === 'webkit' && isLinux) ? [] : [{
+    name: 'same-site-none',
+    value: '1',
+    domain: 'foo.com',
+    path: '/',
+    expires: -1,
+    httpOnly: false,
+    secure: false,
+    sameSite: 'None',
+  }]), {
+    name: 'same-site-lax',
+    value: '1',
+    domain: 'foo.com',
+    path: '/',
+    expires: -1,
+    httpOnly: false,
+    secure: false,
+    sameSite: (browserName === 'webkit' && isWindows) ? 'None' : 'Lax',
+  }, {
+    name: 'same-site-strict',
+    value: '1',
+    domain: 'foo.com',
+    path: '/',
+    expires: -1,
+    httpOnly: false,
+    secure: false,
+    sameSite: (browserName === 'webkit' && isWindows) ? 'None' : 'Strict',
+  }]));
+});
+
 it('should roundtrip cookie', async ({ context, page, server }) => {
   await page.goto(server.EMPTY_PAGE);
   // @see https://en.wikipedia.org/wiki/Year_2038_problem
@@ -234,7 +300,7 @@ it('should set cookie with reasonable defaults', async ({ context, server, defau
   expect(cookies.sort((a, b) => a.name.localeCompare(b.name))).toEqual([{
     name: 'defaults',
     value: '123456',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/',
     expires: -1,
     httpOnly: false,
@@ -246,7 +312,7 @@ it('should set cookie with reasonable defaults', async ({ context, server, defau
 it('should set a cookie with a path', async ({ context, page, server, browserName, isWindows }) => {
   await page.goto(server.PREFIX + '/grid.html');
   await context.addCookies([{
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/grid.html',
     name: 'gridcookie',
     value: 'GRID',
@@ -255,7 +321,7 @@ it('should set a cookie with a path', async ({ context, page, server, browserNam
   expect(await context.cookies()).toEqual([{
     name: 'gridcookie',
     value: 'GRID',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/grid.html',
     expires: -1,
     httpOnly: false,
@@ -357,75 +423,6 @@ it('should set cookies for a frame', async ({ context, page, server }) => {
   expect(await page.frames()[1].evaluate('document.cookie')).toBe('frame-cookie=value');
 });
 
-it('should(not) block third party cookies', async ({ context, page, server, browserName, allowsThirdParty }) => {
-  await page.goto(server.EMPTY_PAGE);
-  await page.evaluate(src => {
-    let fulfill!: (value: unknown) => void;
-    const promise = new Promise(x => fulfill = x);
-    const iframe = document.createElement('iframe');
-    document.body.appendChild(iframe);
-    iframe.onload = fulfill;
-    iframe.src = src;
-    return promise;
-  }, server.CROSS_PROCESS_PREFIX + '/grid.html');
-  await page.frames()[1].evaluate(`document.cookie = 'username=John Doe'`);
-  await page.waitForTimeout(2000);
-  const cookies = await context.cookies(server.CROSS_PROCESS_PREFIX + '/grid.html');
-  if (allowsThirdParty) {
-    expect(cookies).toEqual([
-      {
-        'domain': '127.0.0.1',
-        'expires': -1,
-        'httpOnly': false,
-        'name': 'username',
-        'path': '/',
-        'sameSite': 'None',
-        'secure': false,
-        'value': 'John Doe'
-      }
-    ]);
-  } else {
-    expect(cookies).toEqual([]);
-  }
-});
-
-it('should not block third party SameSite=None cookies', async ({ contextFactory, httpsServer, browserName }) => {
-  it.skip(browserName === 'webkit', 'No third party cookies in WebKit');
-  it.skip(process.env.PW_CLOCK === 'frozen');
-  const context = await contextFactory({
-    ignoreHTTPSErrors: true,
-  });
-  const page = await context.newPage();
-
-  httpsServer.setRoute('/empty.html', (req, res) => {
-    res.writeHead(200, {
-      'Content-Type': 'text/html'
-    });
-    res.end(`<iframe src="${httpsServer.CROSS_PROCESS_PREFIX}/grid.html"></iframe>`);
-  });
-
-  httpsServer.setRoute('/grid.html', (req, res) => {
-    res.writeHead(200, {
-      'Set-Cookie': ['a=b; Path=/; Max-Age=3600; SameSite=None; Secure'],
-      'Content-Type': 'text/html'
-    });
-    res.end(`Hello world
-    <script>
-    setTimeout(() => fetch('/json'), 1000);
-    </script>`);
-  });
-
-  const cookie = new Promise(f => {
-    httpsServer.setRoute('/json', (req, res) => {
-      f(req.headers.cookie);
-      res.end();
-    });
-  });
-
-  await page.goto(httpsServer.EMPTY_PAGE);
-  expect(await cookie).toBe('a=b');
-});
-
 it('should allow unnamed cookies', async ({ page, context, server, browserName, platform }) => {
   server.setRoute('/cookies', (req, res) => {
     res.write(req.headers.cookie ?? 'undefined-on-server');
@@ -462,8 +459,8 @@ it('should set secure cookies on secure WebSocket', async ({ contextFactory, htt
   const context = await contextFactory({ ignoreHTTPSErrors: true });
   const page = await context.newPage();
   await page.goto(httpsServer.EMPTY_PAGE);
-  await context.addCookies([{ domain: 'localhost', path: '/', name: 'foo', value: 'bar', secure: true }]);
-  await page.evaluate(port => new WebSocket(`wss://localhost:${port}/ws`), httpsServer.PORT);
+  await context.addCookies([{ domain: new URL(httpsServer.PREFIX).hostname, path: '/', name: 'foo', value: 'bar', secure: true }]);
+  await page.evaluate(hostname => new WebSocket(`wss://${hostname}/ws`), httpsServer.HOST);
   const headers = await receivedWebSocketHeaders;
   expect(headers.cookie).toBe('foo=bar');
 });
diff --git a/tests/library/browsercontext-add-init-script.spec.ts b/tests/library/browsercontext-add-init-script.spec.ts
index f37202022572a..53aafd2b0e7ab 100644
--- a/tests/library/browsercontext-add-init-script.spec.ts
+++ b/tests/library/browsercontext-add-init-script.spec.ts
@@ -66,3 +66,15 @@ it('should work with browser context scripts for already created pages', async (
   await page.goto(server.PREFIX + '/tamperable.html');
   expect(await page.evaluate(() => (window as any)['result'])).toBe(123);
 });
+
+it('init script should run only once in popup', async ({ context }) => {
+  await context.addInitScript(() => {
+    window['callCount'] = (window['callCount'] || 0) + 1;
+  });
+  const page = await context.newPage();
+  const [popup] = await Promise.all([
+    page.waitForEvent('popup'),
+    page.evaluate(() => window.open('about:blank')),
+  ]);
+  expect(await popup.evaluate('callCount')).toEqual(1);
+});
diff --git a/tests/library/browsercontext-basic.spec.ts b/tests/library/browsercontext-basic.spec.ts
index f075184cf95ed..0ba6a3a6524ab 100644
--- a/tests/library/browsercontext-basic.spec.ts
+++ b/tests/library/browsercontext-basic.spec.ts
@@ -23,12 +23,14 @@ import type { Page } from '@playwright/test';
 it('should create new context @smoke', async function({ browser }) {
   expect(browser.contexts().length).toBe(0);
   const context = await browser.newContext();
-  expect(browser.contexts().length).toBe(1);
-  expect(browser.contexts().indexOf(context) !== -1).toBe(true);
+  expect(browser.contexts()).toEqual([context]);
   expect(browser).toBe(context.browser());
+  const context2 = await browser.newContext();
+  expect(browser.contexts()).toEqual([context, context2]);
   await context.close();
-  expect(browser.contexts().length).toBe(0);
+  expect(browser.contexts()).toEqual([context2]);
   expect(browser).toBe(context.browser());
+  await context2.close();
 });
 
 it('should be able to click across browser contexts', async function({ browser }) {
@@ -254,7 +256,7 @@ it('should be able to navigate after disabling javascript', async ({ browser, se
 });
 
 it('should not hang on promises after disabling javascript', async ({ browserName, contextFactory }) => {
-  it.fixme(browserName === 'webkit' || browserName === 'firefox');
+  it.fixme(browserName === 'firefox');
   const context = await contextFactory({ javaScriptEnabled: false });
   const page = await context.newPage();
   expect(await page.evaluate(() => 1)).toBe(1);
@@ -291,6 +293,34 @@ it('should work with offline option', async ({ browser, server, browserName }) =
   await context.close();
 });
 
+it('fetch with keepalive should throw when offline', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35701' },
+}, async ({ contextFactory, server }) => {
+  const context = await contextFactory();
+  const page = await context.newPage();
+  await page.goto(server.EMPTY_PAGE);
+
+  const url = server.PREFIX + '/fetch';
+  server.setRoute('/fetch', (req, res) => {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify('hello'));
+  });
+
+  const okResponse = await page.evaluate(url => fetch(url, { cache: 'no-store', keepalive: true }).then(response => response.json()), url);
+  expect(okResponse).toEqual('hello');
+
+  await context.setOffline(true);
+  const offlineResponse = await page.evaluate(async url => {
+    try {
+      const response = await fetch(url, { cache: 'no-store', keepalive: true });
+      return await response.json();
+    } catch {
+      return 'error';
+    }
+  }, url);
+  expect(offlineResponse).toEqual('error');
+});
+
 it('should emulate navigator.onLine', async ({ browser, server }) => {
   const context = await browser.newContext();
   const page = await context.newPage();
@@ -342,3 +372,24 @@ it('default user agent', async ({ launchPersistent, browser, page, mode }) => {
   const { userAgent } = await (browser as any)._channel.defaultUserAgentForTest();
   expect(await page.evaluate(() => navigator.userAgent)).toBe(userAgent);
 });
+
+it('should create two pages in parallel in various contexts', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34586' }
+}, async ({ browser }) => {
+  const context1 = await browser.newContext();
+  const context2 = await browser.newContext();
+  await Promise.all([
+    context1.newPage(),
+    context1.newPage(),
+    context2.newPage(),
+    context2.newPage(),
+  ]);
+  await context1.close();
+  await context2.close();
+  const context3 = await browser.newContext();
+  await Promise.all([
+    context3.newPage(),
+    context3.newPage(),
+  ]);
+  await context3.close();
+});
diff --git a/tests/library/browsercontext-cookies-third-party.spec.ts b/tests/library/browsercontext-cookies-third-party.spec.ts
new file mode 100644
index 0000000000000..41d8b74f6911e
--- /dev/null
+++ b/tests/library/browsercontext-cookies-third-party.spec.ts
@@ -0,0 +1,606 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 { contextTest, expect } from '../config/browserTest';
+
+import type { Page, BrowserContext, Cookie } from 'playwright';
+import type { TestServer } from '../config/testserver';
+
+type TestUrls = {
+  origin1: string;
+  origin2: string;
+  read_origin1: string;
+  read_origin2_origin1: string;
+  read_origin1_origin1: string;
+  read_origin1_origin2_origin1: string;
+  set_origin1: string;
+  set_origin2_origin1: string;
+  set_origin1_origin2_origin1: string;
+};
+
+const test = contextTest.extend<{ urls: TestUrls }>({
+  urls: async ({ httpsServer }, run) => {
+    const origin1 = httpsServer.PREFIX;
+    const origin2 = httpsServer.CROSS_PROCESS_PREFIX;
+    await run({
+      origin1,
+      origin2,
+      read_origin1: origin1 + '/read-cookie.html',
+      read_origin2_origin1: origin2 + '/frame-read-cookie.html',
+      read_origin1_origin1: origin1 + '/frame-read-cookie.html',
+      read_origin1_origin2_origin1: origin1 + '/nested-frame-read-cookie.html',
+      set_origin1: origin1 + '/set-cookie.html',
+      set_origin2_origin1: origin2 + '/frame-set-cookie.html',
+      set_origin1_origin2_origin1: origin1 + '/nested-frame-set-cookie.html',
+    });
+  },
+});
+
+test.use({
+  ignoreHTTPSErrors: true,
+});
+
+/**
+ * origin1:
+ *   top-level-partitioned=value
+ *   top-level-non-partitioned=value
+ *
+ * origin2:
+ *   origin1:
+ *     frame-partitioned=value
+ *     frame-non-partitioned=value
+ *
+ * origin1:
+ *   origin2:
+ *     origin1:
+ *       frame-partitioned=value
+ *       frame-non-partitioned=value
+ *
+ * origin1 = httpsServer.PREFIX
+ * origin2 = httpsServer.CROSS_PROCESS_PREFIX
+ */
+function addCommonCookieHandlers(httpsServer: TestServer, urls: TestUrls) {
+  // '/set-cookie.html' handlers are added in the tests.
+  httpsServer.setRoute('/read-cookie.html', (req, res) => {
+    res.setHeader('Content-Type', 'text/html');
+    const cookies = req.headers.cookie?.split(';').map(c => c.trim()).sort().join('; ');
+    res.end(`Received cookie: ${cookies}`);
+  });
+  httpsServer.setRoute('/frame-set-cookie.html', (req, res) => {
+    res.setHeader('Content-Type', 'text/html');
+    res.end(`<iframe src='${urls.origin1}/set-cookie.html'></iframe>`);
+  });
+  httpsServer.setRoute('/frame-read-cookie.html', (req, res) => {
+    res.setHeader('Content-Type', 'text/html');
+    res.end(`<iframe src='${urls.origin1}/read-cookie.html'></iframe>`);
+  });
+  // Nested cross-origin iframe:
+  //   main frame: (origin1 or origin2) -> iframe1: origin2 -> iframe2: origin1
+  httpsServer.setRoute('/nested-frame-set-cookie.html', (req, res) => {
+    res.setHeader('Content-Type', 'text/html');
+    res.end(`<iframe src='${urls.origin2}/frame-set-cookie.html'></iframe>`);
+  });
+  httpsServer.setRoute('/nested-frame-read-cookie.html', (req, res) => {
+    res.setHeader('Content-Type', 'text/html');
+    res.end(`<iframe src='${urls.origin2}/frame-read-cookie.html'></iframe>`);
+  });
+}
+
+function findCookie(cookies: Cookie[], name: string) {
+  const result = cookies.find(cookie => cookie.name === name);
+  expect(result, `Cookie ${name} not found in ${JSON.stringify(cookies, null, 2)}`).toBeTruthy();
+  return result;
+}
+
+function expectPartitionKey(cookies: Cookie[], name: string, partitionKey: string) {
+  const cookie = findCookie(cookies, name);
+  if (partitionKey !== cookie.partitionKey)
+    throw new Error(`Cookie ${name} has partitionKey ${cookie.partitionKey} but expected ${partitionKey}.`);
+}
+
+async function runNonPartitionedTest(page: Page, httpsServer: TestServer, browserName: string, isMac: boolean, isLinux: boolean, urls: TestUrls) {
+  addCommonCookieHandlers(httpsServer, urls);
+  httpsServer.setRoute('/set-cookie.html', (req, res) => {
+    res.setHeader('Set-Cookie', `${req.headers.referer ? 'frame' : 'top-level'}=value; SameSite=None; Path=/; Secure;`);
+    res.setHeader('Content-Type', 'text/html');
+    res.end();
+  });
+
+  await page.goto(urls.set_origin1);
+  await page.goto(urls.read_origin1);
+  expect(await page.locator('body').textContent()).toBe('Received cookie: top-level=value');
+
+  await page.goto(urls.read_origin2_origin1);
+  const frameBody = page.locator('iframe').contentFrame().locator('body');
+
+  // WebKit does not support third-party cookies without a 'Partition' attribute.
+  if (browserName === 'webkit' && isMac)
+    await expect(frameBody).toHaveText('Received cookie: undefined');
+  else
+    await expect(frameBody).toHaveText('Received cookie: top-level=value');
+
+  // Set cookie and do second navigation.
+  await page.goto(urls.set_origin2_origin1);
+  await page.goto(urls.read_origin2_origin1);
+  const expectedThirdParty = browserName === 'webkit' && isMac ?
+    'Received cookie: undefined' : browserName === 'webkit' && isLinux ?
+      'Received cookie: top-level=value' :
+      'Received cookie: frame=value; top-level=value';
+  await expect(frameBody).toHaveText(expectedThirdParty, { timeout: 1000 });
+
+  // Check again the top-level cookie.
+  await page.goto(urls.read_origin1);
+  const expectedTopLevel = browserName === 'webkit' && (isMac || isLinux) ?
+    'Received cookie: top-level=value' :
+    'Received cookie: frame=value; top-level=value';
+  expect(await page.locator('body').textContent()).toBe(expectedTopLevel);
+
+  return {
+    expectedTopLevel,
+    expectedThirdParty,
+  };
+}
+
+test(`third party non-partitioned cookies`, async ({ page, browserName, httpsServer, isMac, isLinux, urls }) => {
+  await runNonPartitionedTest(page, httpsServer, browserName, isMac, isLinux, urls);
+});
+
+test(`save/load third party non-partitioned cookies`, async ({ page, browserName, httpsServer, isMac, isLinux, browser, urls }) => {
+  // Run the test to populate the cookies.
+  const { expectedTopLevel, expectedThirdParty } = await runNonPartitionedTest(page, httpsServer, browserName, isMac, isLinux, urls);
+
+  async function checkCookies(page: Page) {
+    // Check top-level cookie first.
+    await page.goto(urls.read_origin1);
+    expect.soft(await page.locator('body').textContent()).toBe(expectedTopLevel);
+
+    // Check third-party cookie.
+    await page.goto(urls.read_origin2_origin1);
+    const frameBody = page.locator('iframe').contentFrame().locator('body');
+    await expect.soft(frameBody).toHaveText(expectedThirdParty);
+  }
+
+  await checkCookies(page);
+
+  await test.step('export via cookies/addCookies', async () => {
+    const cookies = await page.context().cookies();
+    const context2 = await browser.newContext();
+    await context2.addCookies(cookies);
+    const page2 = await context2.newPage();
+    await checkCookies(page2);
+  });
+
+  await test.step('export via storageState', async () => {
+    const storageState = await page.context().storageState();
+    const context3 = await browser.newContext({ storageState });
+    const page3 = await context3.newPage();
+    await checkCookies(page3);
+  });
+});
+
+async function runPartitionedTest(page: Page, httpsServer: TestServer, browserName: string, isMac: boolean, urls: TestUrls) {
+  addCommonCookieHandlers(httpsServer, urls);
+  httpsServer.setRoute('/set-cookie.html', (req, res) => {
+    res.setHeader('Set-Cookie', [
+      `${req.headers.referer ? 'frame' : 'top-level'}-partitioned=value; SameSite=None; Path=/; Secure; Partitioned;`,
+      `${req.headers.referer ? 'frame' : 'top-level'}-non-partitioned=value; SameSite=None; Path=/; Secure;`
+    ]);
+    res.end();
+  });
+
+  await page.goto(urls.set_origin1);
+  await page.goto(urls.read_origin1);
+  expect(await page.locator('body').textContent()).toBe('Received cookie: top-level-non-partitioned=value; top-level-partitioned=value');
+
+  await page.goto(urls.read_origin2_origin1);
+  const frameBody = page.locator('iframe').contentFrame().locator('body');
+
+  // Firefox cookie partitioning is disabled in Firefox.
+  // TODO: reenable cookie partitioning?
+  if (browserName === 'firefox') {
+    await expect(frameBody).toHaveText('Received cookie: top-level-non-partitioned=value; top-level-partitioned=value');
+    return;
+  }
+
+  // Linux and Windows WebKit builds do not partition third-party cookies at all.
+  if (browserName === 'webkit' && !isMac) {
+    await expect(frameBody).toHaveText('Received cookie: top-level-non-partitioned=value; top-level-partitioned=value');
+    return;
+  }
+
+  if (browserName === 'webkit') {
+    // WebKit will only send 'Partitioned' third-party cookies exactly matching the partition.
+    await expect(frameBody).toHaveText('Received cookie: undefined');
+  } else {
+    // For non-partitioned cookies, the cookie is sent to the iframe right away,
+    // if third-party cookies are supported by the browser.
+    await expect(frameBody).toHaveText('Received cookie: top-level-non-partitioned=value');
+  }
+
+  // First navigation:
+  // - no cookie sent, as it was only set on the top-level site
+  // - sets the third-party cookie for the top-level context
+  // Second navigation:
+  // - sends the cookie as it was just set for the (top-level site, iframe url) partition.
+  await page.goto(urls.set_origin2_origin1);
+  await page.goto(urls.read_origin2_origin1);
+  if (browserName === 'webkit')
+    await expect(frameBody).toHaveText('Received cookie: undefined');
+  else
+    await expect(frameBody).toHaveText('Received cookie: frame-non-partitioned=value; frame-partitioned=value; top-level-non-partitioned=value');
+}
+
+test(`third party 'Partitioned;' cookies`, async ({ page, browserName, httpsServer, isMac, urls }) => {
+  await runPartitionedTest(page, httpsServer, browserName, isMac, urls);
+});
+
+test(`save/load third party 'Partitioned;' cookies`, async ({ page, browserName, httpsServer, isMac, browser, urls }) => {
+  test.fixme(browserName === 'firefox', 'Firefox cookie partitioning is disabled in Firefox.');
+  test.fixme(browserName === 'webkit' && !isMac, 'Linux and Windows WebKit builds do not partition third-party cookies at all.');
+
+  await runPartitionedTest(page, httpsServer, browserName, isMac, urls);
+
+  async function checkCookies(page: Page) {
+    {
+      // Check top-level cookie first.
+      await page.goto(urls.read_origin1);
+      const expectedTopLevel = browserName === 'webkit' && isMac ?
+        'Received cookie: top-level-non-partitioned=value; top-level-partitioned=value' :
+        'Received cookie: frame-non-partitioned=value; top-level-non-partitioned=value; top-level-partitioned=value';
+      expect.soft(await page.locator('body').textContent()).toBe(expectedTopLevel);
+    }
+    {
+      // Check third-party cookie.
+      await page.goto(urls.read_origin2_origin1);
+      const frameBody = page.locator('iframe').contentFrame().locator('body');
+      const expectedThirdParty = browserName === 'webkit' ?
+        'Received cookie: undefined' :
+        'Received cookie: frame-non-partitioned=value; frame-partitioned=value; top-level-non-partitioned=value';
+      await expect.soft(frameBody).toHaveText(expectedThirdParty, { timeout: 1000 });
+    }
+    {
+      await page.goto(urls.read_origin1_origin2_origin1); // read-origin1-origin2-origin1.html
+      const frameBody = page.locator('iframe').contentFrame().locator('iframe').contentFrame().locator('body');
+      const expectedThirdParty = browserName === 'webkit' ?
+        'Received cookie: top-level-non-partitioned=value; top-level-partitioned=value' :
+        'Received cookie: frame-non-partitioned=value; top-level-non-partitioned=value';
+      await expect.soft(frameBody).toHaveText(expectedThirdParty, { timeout: 1000 });
+    }
+  }
+
+  await checkCookies(page);
+
+  function checkStorageCookies(cookies: Cookie[]) {
+    const expectedTopLevelPartitioned = browserName === 'webkit' && isMac ?
+      undefined :
+      'https://localhost';
+    expectPartitionKey(cookies, 'top-level-partitioned', expectedTopLevelPartitioned);
+    expectPartitionKey(cookies, 'top-level-non-partitioned', undefined);
+    if (browserName === 'webkit' && isMac) {
+      expect(cookies.find(cookie => cookie.name === 'frame-partitioned')).toBeUndefined();
+      expect(cookies.find(cookie => cookie.name === 'frame-non-partitioned')).toBeUndefined();
+    } else {
+      expectPartitionKey(cookies, 'frame-partitioned', 'https://127.0.0.1');
+      expectPartitionKey(cookies, 'frame-non-partitioned', undefined);
+    }
+  }
+  checkStorageCookies(await page.context().cookies());
+  checkStorageCookies((await page.context().storageState()).cookies);
+
+  await test.step('export via cookies/addCookies', async () => {
+    const cookies = await page.context().cookies();
+    const context2 = await browser.newContext();
+    await context2.addCookies(cookies);
+    const page2 = await context2.newPage();
+    await checkCookies(page2);
+  });
+
+  await test.step('export via storageState', async () => {
+    const storageState = await page.context().storageState();
+    const context3 = await browser.newContext({ storageState });
+    const page3 = await context3.newPage();
+    await checkCookies(page3);
+  });
+});
+
+test(`add 'Partitioned;' cookie via API`, async ({ page, context, browserName, httpsServer, isMac, urls }) => {
+  addCommonCookieHandlers(httpsServer, urls);
+
+  await context.addCookies([
+    {
+      name: 'top-level-partitioned',
+      value: 'value',
+      domain: httpsServer.HOSTNAME,
+      path: '/',
+      expires: -1,
+      httpOnly: false,
+      secure: true,
+      sameSite: 'None',
+      partitionKey: 'https://localhost',
+      _crHasCrossSiteAncestor: false
+    } as any,
+    {
+      name: 'top-level-non-partitioned',
+      value: 'value',
+      domain: httpsServer.HOSTNAME,
+      path: '/',
+      expires: -1,
+      httpOnly: false,
+      secure: true,
+      sameSite: 'None'
+    },
+    {
+      name: 'frame-partitioned',
+      value: 'value',
+      domain: httpsServer.HOSTNAME,
+      path: '/',
+      expires: -1,
+      httpOnly: false,
+      secure: true,
+      sameSite: 'None',
+      partitionKey: 'https://127.0.0.1',
+      _crHasCrossSiteAncestor: true
+    } as any,
+    {
+      name: 'frame-non-partitioned',
+      value: 'value',
+      domain: httpsServer.HOSTNAME,
+      path: '/',
+      expires: -1,
+      httpOnly: false,
+      secure: true,
+      sameSite: 'None'
+    }
+  ]);
+
+  async function checkCookies(page: Page) {
+    {
+      // Check top-level cookie first.
+      await page.goto(urls.read_origin1);
+      const expectedTopLevel = browserName === 'webkit' || browserName === 'firefox' ?
+        'Received cookie: frame-non-partitioned=value; frame-partitioned=value; top-level-non-partitioned=value; top-level-partitioned=value' :
+        'Received cookie: frame-non-partitioned=value; top-level-non-partitioned=value; top-level-partitioned=value';
+      expect.soft(await page.locator('body').textContent()).toBe(expectedTopLevel);
+    }
+    {
+      // Check third-party cookie.
+      await page.goto(urls.read_origin2_origin1);
+      const frameBody = page.locator('iframe').contentFrame().locator('body');
+      const expectedThirdParty = browserName === 'webkit' && isMac ?
+        'Received cookie: undefined' : browserName === 'chromium' ?
+          'Received cookie: frame-non-partitioned=value; frame-partitioned=value; top-level-non-partitioned=value' :
+          // Firefox and WebKit on Linux/Windows do not partition third-party cookies.
+          'Received cookie: frame-non-partitioned=value; frame-partitioned=value; top-level-non-partitioned=value; top-level-partitioned=value';
+      await expect.soft(frameBody).toHaveText(expectedThirdParty, { timeout: 1000 });
+    }
+    {
+      await page.goto(urls.read_origin1_origin2_origin1); // read-origin1-origin2-origin1.html
+      const frameBody = page.locator('iframe').contentFrame().locator('iframe').contentFrame().locator('body');
+      const expectedThirdParty = browserName === 'webkit' || browserName === 'firefox' ?
+        'Received cookie: frame-non-partitioned=value; frame-partitioned=value; top-level-non-partitioned=value; top-level-partitioned=value' :
+        'Received cookie: frame-non-partitioned=value; top-level-non-partitioned=value';
+      await expect.soft(frameBody).toHaveText(expectedThirdParty, { timeout: 1000 });
+    }
+  }
+
+  await checkCookies(page);
+});
+
+
+test(`same origin third party 'Partitioned;' cookie with different origin intermediate iframe`, async ({ page, httpsServer, browser, urls }) => {
+  addCommonCookieHandlers(httpsServer, urls);
+  httpsServer.setRoute('/set-cookie.html', (req, res) => {
+    res.setHeader('Set-Cookie', [
+      `${req.headers.referer ? 'frame' : 'top-level'}-partitioned=value; SameSite=None; Path=/; Secure; Partitioned;`,
+      `${req.headers.referer ? 'frame' : 'top-level'}-non-partitioned=value; SameSite=None; Path=/; Secure;`
+    ]);
+    res.end();
+  });
+  // main frame: origin1 -> iframe1: origin2 -> iframe2: origin1
+  // In this case the cookie in iframe2 is a third-party partitioned cookie, even though
+  // it's the same origin as the main frame.
+  await page.goto(urls.set_origin1_origin2_origin1);
+
+  async function checkCookies(page: Page) {
+    await page.goto(urls.read_origin1_origin2_origin1);
+    const frameBody = page.locator('iframe').contentFrame().locator('iframe').contentFrame().locator('body');
+    await expect.soft(frameBody).toHaveText('Received cookie: frame-non-partitioned=value; frame-partitioned=value');
+  }
+
+  await checkCookies(page);
+
+  await test.step('export via cookies/addCookies', async () => {
+    const cookies = await page.context().cookies();
+    const context2 = await browser.newContext();
+    await context2.addCookies(cookies);
+    const page2 = await context2.newPage();
+    await checkCookies(page2);
+  });
+
+  await test.step('export via storageState', async () => {
+    const storageState = await page.context().storageState();
+    const context3 = await browser.newContext({ storageState });
+    const page3 = await context3.newPage();
+    await checkCookies(page3);
+  });
+});
+
+test(`top level 'Partitioned;' cookie and same origin iframe`, async ({ page, browserName, httpsServer, browser, urls }) => {
+  addCommonCookieHandlers(httpsServer, urls);
+  httpsServer.setRoute('/set-cookie.html', (req, res) => {
+    res.setHeader('Set-Cookie', [
+      `${req.headers.referer ? 'frame' : 'top-level'}=value; SameSite=None; Path=/; Secure; Partitioned;`,
+      `${req.headers.referer ? 'frame' : 'top-level'}-non-partitioned=value; SameSite=None; Path=/; Secure;`
+    ]);
+    res.end();
+  });
+
+  // Same origin iframe cookies are partitioned the same way as top-level cookies.
+  await page.goto(urls.set_origin1);
+  await page.context().storageState({ path: '/tmp/state2.json' });
+
+  async function checkCookies(page: Page) {
+    {
+      // Check top-level cookie first.
+      await page.goto(urls.read_origin1);
+      expect.soft(await page.locator('body').textContent()).toBe('Received cookie: top-level-non-partitioned=value; top-level=value');
+    }
+    {
+      // Same origin iframe.
+      await page.goto(urls.read_origin1_origin1);
+      const frameBody = page.locator('iframe').contentFrame().locator('body');
+      await expect.soft(frameBody).toHaveText('Received cookie: top-level-non-partitioned=value; top-level=value', { timeout: 1000 });
+    }
+    {
+      // Check third-party cookie.
+      // main frame: origin1 -> iframe1: origin2 -> iframe2: origin1
+      await page.goto(urls.read_origin1_origin2_origin1);
+      const frameBody = page.locator('iframe').contentFrame().locator('iframe').contentFrame().locator('body');
+      const expectedThirdParty = browserName === 'chromium'
+        ? 'Received cookie: top-level-non-partitioned=value'
+        : 'Received cookie: top-level-non-partitioned=value; top-level=value';
+      await expect.soft(frameBody).toHaveText(expectedThirdParty, { timeout: 1000 });
+    }
+  }
+
+  await checkCookies(page);
+
+  await test.step('export via cookies/addCookies', async () => {
+    const cookies = await page.context().cookies();
+    const context2 = await browser.newContext();
+    await context2.addCookies(cookies);
+    const page2 = await context2.newPage();
+    await checkCookies(page2);
+  });
+
+  await test.step('export via storageState', async () => {
+    const storageState = await page.context().storageState();
+    const context3 = await browser.newContext({ storageState });
+    const page3 = await context3.newPage();
+    await checkCookies(page3);
+  });
+});
+
+test('should be able to send third party cookies via an iframe', async ({ browser, httpsServer, browserName, isMac }) => {
+  test.fixme(browserName === 'webkit' && isMac);
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/16937' });
+
+  const context = await browser.newContext({
+    ignoreHTTPSErrors: true,
+  });
+  try {
+    const page = await context.newPage();
+    await page.goto(httpsServer.EMPTY_PAGE);
+    await context.addCookies([{
+      domain: new URL(httpsServer.CROSS_PROCESS_PREFIX).hostname,
+      path: '/',
+      name: 'cookie1',
+      value: 'yes',
+      httpOnly: true,
+      secure: true,
+      sameSite: 'None'
+    }]);
+    const [response] = await Promise.all([
+      httpsServer.waitForRequest('/grid.html'),
+      page.setContent(`<iframe src="${httpsServer.CROSS_PROCESS_PREFIX}/grid.html"></iframe>`)
+    ]);
+    expect(response.headers['cookie']).toBe('cookie1=yes');
+  } finally {
+    await context.close();
+  }
+});
+
+test('should(not) block third party cookies - persistent context', async ({ httpsServer, launchPersistent, allowsThirdParty }) => {
+  const { page, context } = await launchPersistent();
+  await testThirdPartyCookiesAreBlocked(page, context, httpsServer, allowsThirdParty);
+});
+
+test('should(not) block third party cookies - ephemeral context', async ({ page, context, httpsServer, allowsThirdParty }) => {
+  await testThirdPartyCookiesAreBlocked(page, context, httpsServer, allowsThirdParty);
+});
+
+async function testThirdPartyCookiesAreBlocked(page: Page, context: BrowserContext, server: TestServer, allowsThirdParty: boolean) {
+  await page.goto(server.EMPTY_PAGE);
+  await page.evaluate(src => {
+    let fulfill;
+    const promise = new Promise(x => fulfill = x);
+    const iframe = document.createElement('iframe');
+    document.body.appendChild(iframe);
+    iframe.onload = fulfill;
+    iframe.src = src;
+    return promise;
+  }, server.CROSS_PROCESS_PREFIX + '/grid.html');
+  const documentCookie = await page.frames()[1].evaluate(() => {
+    document.cookie = 'username=John Doe';
+    return document.cookie;
+  });
+  await page.waitForTimeout(2000);
+  expect(documentCookie).toBe(allowsThirdParty ? 'username=John Doe' : '');
+  const cookies = await context.cookies(server.CROSS_PROCESS_PREFIX + '/grid.html');
+  if (allowsThirdParty) {
+    expect(cookies).toEqual([
+      {
+        'domain': '127.0.0.1',
+        'expires': -1,
+        'httpOnly': false,
+        'name': 'username',
+        'path': '/',
+        'sameSite': 'None',
+        'secure': false,
+        'value': 'John Doe'
+      }
+    ]);
+  } else {
+    expect(cookies).toEqual([]);
+  }
+}
+
+test('should not block third party SameSite=None cookies', async ({ contextFactory, httpsServer, browserName }) => {
+  test.skip(browserName === 'webkit', 'No third party cookies in WebKit');
+  test.skip(process.env.PW_CLOCK === 'frozen');
+  const context = await contextFactory({
+    ignoreHTTPSErrors: true,
+  });
+  const page = await context.newPage();
+
+  httpsServer.setRoute('/empty.html', (req, res) => {
+    res.writeHead(200, {
+      'Content-Type': 'text/html'
+    });
+    res.end(`<iframe src="${httpsServer.CROSS_PROCESS_PREFIX}/grid.html"></iframe>`);
+  });
+
+  httpsServer.setRoute('/grid.html', (req, res) => {
+    res.writeHead(200, {
+      'Set-Cookie': ['a=b; Path=/; Max-Age=3600; SameSite=None; Secure'],
+      'Content-Type': 'text/html'
+    });
+    res.end(`Hello world
+    <script>
+    setTimeout(() => fetch('/json'), 1000);
+    </script>`);
+  });
+
+  const cookie = new Promise(f => {
+    httpsServer.setRoute('/json', (req, res) => {
+      f(req.headers.cookie);
+      res.end();
+    });
+  });
+
+  await page.goto(httpsServer.EMPTY_PAGE);
+  expect(await cookie).toBe('a=b');
+});
diff --git a/tests/library/browsercontext-cookies.spec.ts b/tests/library/browsercontext-cookies.spec.ts
index df923ef3ff529..15962d68f2f64 100644
--- a/tests/library/browsercontext-cookies.spec.ts
+++ b/tests/library/browsercontext-cookies.spec.ts
@@ -31,7 +31,7 @@ it('should get a cookie @smoke', async ({ context, page, server, defaultSameSite
   expect(await context.cookies()).toEqual([{
     name: 'username',
     value: 'John Doe',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/',
     expires: -1,
     httpOnly: false,
@@ -55,7 +55,7 @@ it('should get a non-session cookie', async ({ context, page, server, defaultSam
   expect(cookies[0]).toEqual({
     name: 'username',
     value: 'John Doe',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/',
     // We will check this separately.
     expires: expect.anything(),
@@ -122,7 +122,7 @@ it('should get multiple cookies', async ({ context, page, server, defaultSameSit
     {
       name: 'password',
       value: '1234',
-      domain: 'localhost',
+      domain: server.HOSTNAME,
       path: '/',
       expires: -1,
       httpOnly: false,
@@ -132,7 +132,7 @@ it('should get multiple cookies', async ({ context, page, server, defaultSameSit
     {
       name: 'username',
       value: 'John Doe',
-      domain: 'localhost',
+      domain: server.HOSTNAME,
       path: '/',
       expires: -1,
       httpOnly: false,
@@ -321,36 +321,7 @@ it('should add cookies with an expiration', async ({ context }) => {
   }])).rejects.toThrow(/Cookie should have a valid expires/);
 });
 
-it('should be able to send third party cookies via an iframe', async ({ browser, httpsServer, browserName, isMac }) => {
-  it.fixme(browserName === 'webkit' && isMac);
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/16937' });
-
-  const context = await browser.newContext({
-    ignoreHTTPSErrors: true,
-  });
-  try {
-    const page = await context.newPage();
-    await page.goto(httpsServer.EMPTY_PAGE);
-    await context.addCookies([{
-      domain: new URL(httpsServer.CROSS_PROCESS_PREFIX).hostname,
-      path: '/',
-      name: 'cookie1',
-      value: 'yes',
-      httpOnly: true,
-      secure: true,
-      sameSite: 'None'
-    }]);
-    const [response] = await Promise.all([
-      httpsServer.waitForRequest('/grid.html'),
-      page.setContent(`<iframe src="${httpsServer.CROSS_PROCESS_PREFIX}/grid.html"></iframe>`)
-    ]);
-    expect(response.headers['cookie']).toBe('cookie1=yes');
-  } finally {
-    await context.close();
-  }
-});
-
-it('should support requestStorageAccess', async ({ page, server, channel, browserName, isMac, isLinux, isWindows }) => {
+it('should support requestStorageAccess', async ({ page, server, channel, browserName, isMac, isLinux, isWindows, macVersion }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17285' });
   it.skip(browserName === 'chromium', 'requestStorageAccess API is not available in Chromium');
   it.skip(channel === 'firefox-beta', 'hasStorageAccess returns true, but no cookie is sent');
@@ -406,7 +377,6 @@ it('should support requestStorageAccess', async ({ page, server, channel, browse
 
 it('should parse cookie with large Max-Age correctly', async ({ server, page, defaultSameSiteCookieValue, browserName, platform }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30305' });
-  it.fixme(browserName === 'webkit' && platform === 'linux', 'https://github.com/microsoft/playwright/issues/30305');
 
   server.setRoute('/foobar', (req, res) => {
     res.setHeader('set-cookie', [
@@ -421,7 +391,7 @@ it('should parse cookie with large Max-Age correctly', async ({ server, page, de
     {
       name: 'cookie1',
       value: 'value1',
-      domain: 'localhost',
+      domain: server.HOSTNAME,
       path: '/',
       expires: expect.any(Number),
       httpOnly: false,
@@ -430,3 +400,34 @@ it('should parse cookie with large Max-Age correctly', async ({ server, page, de
     },
   ]);
 });
+
+it('iframe should inherit cookies from parent', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35439' } }, async ({ page, isLinux, browserName }) => {
+  it.fixme(browserName === 'webkit' && isLinux, 'https://bugs.webkit.org/show_bug.cgi?id=291194');
+
+  await page.route('**/*', async (route, request) => {
+    if (request.url().includes('sub.example.test')) {
+      await route.fulfill({
+        body: `
+            <p id="result"></p>
+            <script>document.getElementById('result').textContent = document.cookie || 'no cookies';</script>
+        `,
+        contentType: 'text/html',
+      });
+      return;
+    }
+    await route.fulfill({
+      headers: { 'set-cookie': 'testCookie=value; SameSite=Lax; Domain=example.test' },
+      contentType: 'text/html',
+      body: `
+          <p id="result"></p>
+          <script>document.getElementById('result').textContent = document.cookie || 'no cookies';</script>
+          <iframe src="http://sub.example.test"></iframe>
+      `
+    });
+  });
+
+  await page.goto('http://example.test');
+
+  await expect(page.locator('body')).toContainText('testCookie=value');
+  await expect(page.frameLocator('iframe').locator('body')).toContainText('testCookie=value');
+});
diff --git a/tests/library/browsercontext-credentials.spec.ts b/tests/library/browsercontext-credentials.spec.ts
index cc991e0e5acac..20e285c568252 100644
--- a/tests/library/browsercontext-credentials.spec.ts
+++ b/tests/library/browsercontext-credentials.spec.ts
@@ -17,38 +17,37 @@
 
 import { browserTest as base, expect } from '../config/browserTest';
 
-const it = base.extend<{ isChromiumHeadedLike: boolean }>({
-  isChromiumHeadedLike: async ({ browserName, headless }, use) => {
-    const isChromiumHeadedLike = browserName === 'chromium' && (!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW);
-    await use(isChromiumHeadedLike);
+const it = base.extend<{ failsOn401: boolean }>({
+  failsOn401: async ({ browserName, isHeadlessShell }, use) => {
+    await use(browserName === 'chromium' && !isHeadlessShell);
   },
 });
 
-it('should fail without credentials', async ({ browser, server, isChromiumHeadedLike }) => {
-  it.fail(isChromiumHeadedLike);
-
+it('should fail without credentials', async ({ browser, server, failsOn401 }) => {
   server.setAuth('/empty.html', 'user', 'pass');
   const context = await browser.newContext();
   const page = await context.newPage();
-  try {
-    const response = await page.goto(server.EMPTY_PAGE);
-    expect(response!.status()).toBe(401);
-  } finally {
-    await context.close();
-  }
+  const responseOrError = await page.goto(server.EMPTY_PAGE).catch(e => e);
+  if (failsOn401)
+    expect(responseOrError.message).toContain('net::ERR_INVALID_AUTH_CREDENTIALS');
+  else
+    expect(responseOrError.status()).toBe(401);
 });
 
-it('should work with setHTTPCredentials', async ({ browser, server, isChromiumHeadedLike }) => {
-  it.fail(isChromiumHeadedLike);
-
+it('should work with setHTTPCredentials', async ({ browser, server, failsOn401 }) => {
   server.setAuth('/empty.html', 'user', 'pass');
   const context = await browser.newContext();
   const page = await context.newPage();
-  let response = await page.goto(server.EMPTY_PAGE);
-  expect(response!.status()).toBe(401);
+
+  let responseOrError = await page.goto(server.EMPTY_PAGE).catch(e => e);
+  if (failsOn401)
+    expect(responseOrError.message).toContain('net::ERR_INVALID_AUTH_CREDENTIALS');
+  else
+    expect(responseOrError.status()).toBe(401);
+
   await context.setHTTPCredentials({ username: 'user', password: 'pass' });
-  response = await page.reload();
-  expect(response!.status()).toBe(200);
+  responseOrError = await page.reload();
+  expect(responseOrError.status()).toBe(200);
   await context.close();
 });
 
@@ -109,20 +108,21 @@ it('should work with correct credentials and matching origin case insensitive',
   await context.close();
 });
 
-it('should fail with correct credentials and mismatching scheme', async ({ browser, server, isChromiumHeadedLike }) => {
-  it.fail(isChromiumHeadedLike);
+it('should fail with correct credentials and mismatching scheme', async ({ browser, server, failsOn401 }) => {
   server.setAuth('/empty.html', 'user', 'pass');
   const context = await browser.newContext({
     httpCredentials: { username: 'user', password: 'pass', origin: server.PREFIX.replace('http://', 'https://') }
   });
   const page = await context.newPage();
-  const response = await page.goto(server.EMPTY_PAGE);
-  expect(response!.status()).toBe(401);
+  const responseOrError = await page.goto(server.EMPTY_PAGE).catch(e => e);
+  if (failsOn401)
+    expect(responseOrError.message).toContain('net::ERR_INVALID_AUTH_CREDENTIALS');
+  else
+    expect(responseOrError.status()).toBe(401);
   await context.close();
 });
 
-it('should fail with correct credentials and mismatching hostname', async ({ browser, server, isChromiumHeadedLike }) => {
-  it.fail(isChromiumHeadedLike);
+it('should fail with correct credentials and mismatching hostname', async ({ browser, server, failsOn401 }) => {
   server.setAuth('/empty.html', 'user', 'pass');
   const hostname = new URL(server.PREFIX).hostname;
   const origin = server.PREFIX.replace(hostname, 'mismatching-hostname');
@@ -130,20 +130,25 @@ it('should fail with correct credentials and mismatching hostname', async ({ bro
     httpCredentials: { username: 'user', password: 'pass', origin: origin }
   });
   const page = await context.newPage();
-  const response = await page.goto(server.EMPTY_PAGE);
-  expect(response!.status()).toBe(401);
+  const responseOrError = await page.goto(server.EMPTY_PAGE).catch(e => e);
+  if (failsOn401)
+    expect(responseOrError.message).toContain('net::ERR_INVALID_AUTH_CREDENTIALS');
+  else
+    expect(responseOrError.status()).toBe(401);
   await context.close();
 });
 
-it('should fail with correct credentials and mismatching port', async ({ browser, server, isChromiumHeadedLike }) => {
-  it.fail(isChromiumHeadedLike);
+it('should fail with correct credentials and mismatching port', async ({ browser, server, failsOn401 }) => {
   server.setAuth('/empty.html', 'user', 'pass');
   const origin = server.PREFIX.replace(server.PORT.toString(), (server.PORT + 1).toString());
   const context = await browser.newContext({
     httpCredentials: { username: 'user', password: 'pass', origin: origin }
   });
   const page = await context.newPage();
-  const response = await page.goto(server.EMPTY_PAGE);
-  expect(response!.status()).toBe(401);
+  const responseOrError = await page.goto(server.EMPTY_PAGE).catch(e => e);
+  if (failsOn401)
+    expect(responseOrError.message).toContain('net::ERR_INVALID_AUTH_CREDENTIALS');
+  else
+    expect(responseOrError.status()).toBe(401);
   await context.close();
 });
diff --git a/tests/library/browsercontext-events.spec.ts b/tests/library/browsercontext-events.spec.ts
index f197436bdcc46..2879459666ee9 100644
--- a/tests/library/browsercontext-events.spec.ts
+++ b/tests/library/browsercontext-events.spec.ts
@@ -15,6 +15,7 @@
  */
 
 import { browserTest as test, expect } from '../config/browserTest';
+import type { ElementHandle } from 'playwright-core';
 
 test('console event should work @smoke', async ({ page }) => {
   const [, message] = await Promise.all([
@@ -26,6 +27,17 @@ test('console event should work @smoke', async ({ page }) => {
   expect(message.page()).toBe(page);
 });
 
+test('console event should work with element handles', async ({ page }) => {
+  await page.setContent('<body>hello</body>');
+  const [message] = await Promise.all([
+    page.context().waitForEvent('console'),
+    page.evaluate(() => console.log(document.body)),
+  ]);
+  const body = message.args()[0];
+  expect(await body.evaluate(x => x.nodeName)).toBe('BODY');
+  await (body as ElementHandle).click();
+});
+
 test('console event should work in popup', async ({ page }) => {
   const [, message, popup] = await Promise.all([
     page.evaluate(() => {
@@ -46,7 +58,7 @@ test('console event should work in popup 2', async ({ page, browserName }) => {
   const [, message, popup] = await Promise.all([
     page.evaluate(async () => {
       const win = window.open('javascript:console.log("hello")')!;
-      await new Promise(f => window.builtinSetTimeout(f, 0));
+      await new Promise(f => window.builtins.setTimeout(f, 0));
       win.close();
     }),
     page.context().waitForEvent('console', msg => msg.type() === 'log'),
diff --git a/tests/library/browsercontext-expose-function.spec.ts b/tests/library/browsercontext-expose-function.spec.ts
index 4786cabeded7a..c242c8582e06b 100644
--- a/tests/library/browsercontext-expose-function.spec.ts
+++ b/tests/library/browsercontext-expose-function.spec.ts
@@ -66,11 +66,11 @@ it('should be callable from-inside addInitScript', async ({ context, server }) =
   await context.addInitScript('window["woof"]("context")');
   const page = await context.newPage();
   await page.evaluate('undefined');
-  expect(args).toEqual(['context']);
+  await expect.poll(() => args).toEqual(['context']);
   args = [];
   await page.addInitScript('window["woof"]("page")');
   await page.reload();
-  expect(args).toEqual(['context', 'page']);
+  await expect.poll(() => args).toEqual(['context', 'page']);
 });
 
 it('exposeBindingHandle should work', async ({ context }) => {
diff --git a/tests/library/browsercontext-fetch.spec.ts b/tests/library/browsercontext-fetch.spec.ts
index f8c0327c7df92..07139c5484020 100644
--- a/tests/library/browsercontext-fetch.spec.ts
+++ b/tests/library/browsercontext-fetch.spec.ts
@@ -121,23 +121,99 @@ it('should add session cookies to request', async ({ context, server }) => {
   expect(req.headers.cookie).toEqual('username=John Doe');
 });
 
+it('should filter cookies by domain', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36069' }
+}, async ({ context, server }) => {
+  await context.addCookies([{
+    name: 'first',
+    value: '1',
+    domain: 'playwright.dev',
+    path: '/',
+    expires: -1,
+    httpOnly: false,
+    secure: false,
+    sameSite: 'Lax',
+  }, {
+    name: 'second',
+    value: '2',
+    domain: '.playwright.dev',
+    path: '/',
+    expires: -1,
+    httpOnly: false,
+    secure: false,
+    sameSite: 'Lax',
+  }]);
+  const [req] = await Promise.all([
+    server.waitForRequest('/simple.json'),
+    context.request.get(`http://my.playwright.dev:${server.PORT}/simple.json`, {
+      __testHookLookup
+    } as any),
+  ]);
+  expect(req.headers.cookie).toEqual('second=2');
+});
+
 for (const method of ['fetch', 'delete', 'get', 'head', 'patch', 'post', 'put'] as const) {
-  it(`${method} should support queryParams`, async ({ context, server }) => {
+  it(`${method} should support params passed as object`, async ({ context, server }) => {
     const url = new URL(server.EMPTY_PAGE);
-    url.searchParams.set('p1', 'v1');
+    url.searchParams.set('param1', 'value1');
     url.searchParams.set('парам2', 'знач2');
-    const [request] = await Promise.all([
+
+    const [request, response] = await Promise.all([
       server.waitForRequest(url.pathname + url.search),
-      context.request[method](server.EMPTY_PAGE + '?p1=foo', {
+      context.request[method](server.EMPTY_PAGE, {
         params: {
-          'p1': 'v1',
+          'param1': 'value1',
           'парам2': 'знач2',
         }
       }),
     ]);
-    const params = new URLSearchParams(request.url!.substr(request.url!.indexOf('?')));
-    expect(params.get('p1')).toEqual('v1');
-    expect(params.get('парам2')).toEqual('знач2');
+
+    const requestParams = new URLSearchParams(request.url.slice(request.url.indexOf('?')));
+    expect(requestParams.get('param1')).toEqual('value1');
+    expect(requestParams.get('парам2')).toBe('знач2');
+
+    const responseParams = new URL(response.url()).searchParams;
+    expect(responseParams.get('param1')).toEqual('value1');
+    expect(responseParams.get('парам2')).toBe('знач2');
+  });
+
+  it(`${method} should support params passed as URLSearchParams`, async ({ context, server }) => {
+    const url = new URL(server.EMPTY_PAGE);
+    const searchParams = new URLSearchParams();
+    searchParams.append('param1', 'value1');
+    searchParams.append('param1', 'value2');
+    searchParams.set('парам2', 'знач2');
+
+    const [request, response] = await Promise.all([
+      server.waitForRequest(url.pathname + '?' + searchParams),
+      context.request[method](server.EMPTY_PAGE, { params: searchParams }),
+    ]);
+
+    const requestParams = new URLSearchParams(request.url.slice(request.url.indexOf('?')));
+    expect(requestParams.getAll('param1')).toEqual(['value1', 'value2']);
+    expect(requestParams.get('парам2')).toBe('знач2');
+
+    const responseParams = new URL(response.url()).searchParams;
+    expect(responseParams.getAll('param1')).toEqual(['value1', 'value2']);
+    expect(responseParams.get('парам2')).toBe('знач2');
+  });
+
+  it(`${method} should support params passed as string`, async ({ context, server }) => {
+    const url = new URL(server.EMPTY_PAGE);
+    const params = '?param1=value1&param1=value2&парам2=знач2';
+
+    const [request, response] = await Promise.all([
+      server.waitForRequest(url.pathname + encodeURI(params)),
+      context.request[method](server.EMPTY_PAGE, { params }),
+    ]);
+
+    const requestParams = new URLSearchParams(request.url.slice(request.url.indexOf('?')));
+    expect(requestParams.getAll('param1')).toEqual(['value1', 'value2']);
+    expect(requestParams.get('парам2')).toBe('знач2');
+
+    const responseParams = new URL(response.url()).searchParams;
+    expect(responseParams.getAll('param1')).toEqual(['value1', 'value2']);
+    expect(responseParams.get('парам2')).toBe('знач2');
   });
 
   it(`${method} should support failOnStatusCode`, async ({ context, server }) => {
@@ -145,6 +221,8 @@ for (const method of ['fetch', 'delete', 'get', 'head', 'patch', 'post', 'put']
       failOnStatusCode: true
     }).catch(e => e);
     expect(error.message).toContain('404 Not Found');
+    if (method !== 'head')
+      expect(error.message).toContain('Response text:\nFile not found:');
   });
 
   it(`${method}should support ignoreHTTPSErrors option`, async ({ context, httpsServer }) => {
@@ -233,7 +311,7 @@ it('should add cookies from Set-Cookie header', async ({ context, page, server }
   expect((await page.evaluate(() => document.cookie)).split(';').map(s => s.trim()).sort()).toEqual(['foo=bar', 'session=value']);
 });
 
-it('should preserve cookie order from Set-Cookie header', async ({ context, page, server }) => {
+it('should preserve cookie order from Set-Cookie header', async ({ context, page, server, browserName, isLinux }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23390' });
   server.setRoute('/setcookie.html', (req, res) => {
     res.setHeader('Set-Cookie', ['cookie.0=foo', 'cookie.1=bar']);
@@ -361,7 +439,7 @@ it('should handle cookies on redirects', async ({ context, server, browserName,
       'sameSite': (browserName === 'webkit' && isWindows) ? 'None' : 'Lax',
       'name': 'r2',
       'value': 'v2',
-      'domain': 'localhost',
+      'domain': server.HOSTNAME,
       'path': '/a/b',
       'expires': -1,
       'httpOnly': false,
@@ -371,7 +449,7 @@ it('should handle cookies on redirects', async ({ context, server, browserName,
       'sameSite': (browserName === 'webkit' && isWindows) ? 'None' : 'Lax',
       'name': 'r1',
       'value': 'v1',
-      'domain': 'localhost',
+      'domain': server.HOSTNAME,
       'path': '/',
       'expires': -1,
       'httpOnly': false,
@@ -799,7 +877,7 @@ it('should support timeout option', async function({ context, server }) {
   });
 
   const error = await context.request.get(server.PREFIX + '/slow', { timeout: 10 }).catch(e => e);
-  expect(error.message).toContain(`Request timed out after 10ms`);
+  expect(error.message).toContain(`apiRequestContext.get: Timeout 10ms exceeded`);
 });
 
 it('should support a timeout of 0', async function({ context, server }) {
@@ -830,12 +908,12 @@ it('should respect timeout after redirects', async function({ context, server })
 
   context.setDefaultTimeout(100);
   const error = await context.request.get(server.PREFIX + '/redirect').catch(e => e);
-  expect(error.message).toContain(`Request timed out after 100ms`);
+  expect(error.message).toContain(`apiRequestContext.get: Timeout 100ms exceeded`);
 });
 
-it('should not hang on a brotli encoded Range request', async ({ context, server }) => {
+it('should not hang on a brotli encoded Range request', async ({ context, server, nodeVersion }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/18190' });
-  it.skip(+process.versions.node.split('.')[0] < 18);
+  it.skip(nodeVersion.major < 18);
 
   const encodedRequestPayload = zlib.brotliCompressSync(Buffer.from('A'));
   server.setRoute('/brotli', (req, res) => {
@@ -913,6 +991,22 @@ it('should support application/x-www-form-urlencoded', async function({ context,
   expect(params.get('file')).toBe('f.js');
 });
 
+it('should support application/x-www-form-urlencoded with param lists', async function({ context, page, server }) {
+  const form = new FormData();
+  form.append('foo', '1');
+  form.append('foo', '2');
+  const [req] = await Promise.all([
+    server.waitForRequest('/empty.html'),
+    context.request.post(server.EMPTY_PAGE, { form })
+  ]);
+  expect(req.method).toBe('POST');
+  expect(req.headers['content-type']).toBe('application/x-www-form-urlencoded');
+  const body = (await req.postBody).toString('utf8');
+  const params = new URLSearchParams(body);
+  expect(req.headers['content-length']).toBe(String(params.toString().length));
+  expect(params.getAll('foo')).toEqual(['1', '2']);
+});
+
 it('should encode to application/json by default', async function({ context, page, server }) {
   const data = {
     firstName: 'John',
@@ -1031,10 +1125,9 @@ it('should support multipart/form-data and keep the order', async function({ con
   expect(response.status()).toBe(200);
 });
 
-it('should support repeating names in multipart/form-data', async function({ context, server }) {
+it('should support repeating names in multipart/form-data', async function({ context, server, nodeVersion }) {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28070' });
-  const nodeVersion = +process.versions.node.split('.')[0];
-  it.skip(nodeVersion < 20, 'File is not available in Node.js < 20. FormData is not available in Node.js < 18');
+  it.skip(nodeVersion.major < 20, 'File is not available in Node.js < 20. FormData is not available in Node.js < 18');
   const postBodyPromise = new Promise<string>(resolve => {
     server.setRoute('/empty.html', async (req, res) => {
       resolve((await req.postBody).toString('utf-8'));
@@ -1121,7 +1214,7 @@ it('should send secure cookie over http for localhost', async ({ page, server })
   expect(serverRequest.headers.cookie).toBe('a=v');
 });
 
-it('should accept bool and numeric params', async ({ page, server }) => {
+it('should accept bool and numeric params and filter out undefined', async ({ page, server }) => {
   let request;
   const url = new URL(server.EMPTY_PAGE);
   url.searchParams.set('str', 's');
@@ -1138,6 +1231,7 @@ it('should accept bool and numeric params', async ({ page, server }) => {
       'num': 10,
       'bool': true,
       'bool2': false,
+      'none': undefined,
     }
   });
   const params = new URLSearchParams(request!.url.substr(request!.url.indexOf('?')));
@@ -1145,6 +1239,7 @@ it('should accept bool and numeric params', async ({ page, server }) => {
   expect(params.get('num')).toEqual('10');
   expect(params.get('bool')).toEqual('true');
   expect(params.get('bool2')).toEqual('false');
+  expect(params.has('none')).toBe(false);
 });
 
 it('should abort requests when browser context closes', async ({ contextFactory, server }) => {
@@ -1288,7 +1383,7 @@ it('should not work after context dispose', async ({ context, server }) => {
   expect(await context.request.get(server.EMPTY_PAGE).catch(e => e.message)).toContain('Test ended.');
 });
 
-it('should retrty ECONNRESET', {
+it('should retry on ECONNRESET', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30978' }
 }, async ({ context, server }) => {
   let requestCount = 0;
diff --git a/tests/library/browsercontext-har.spec.ts b/tests/library/browsercontext-har.spec.ts
index 4a7834013ae8f..6e64045902508 100644
--- a/tests/library/browsercontext-har.spec.ts
+++ b/tests/library/browsercontext-har.spec.ts
@@ -17,7 +17,7 @@
 import { browserTest as it, expect } from '../config/browserTest';
 import fs from 'fs';
 import path from 'path';
-import extractZip from '../../packages/playwright-core/bundles/zip/node_modules/extract-zip';
+import extractZip from '../../packages/playwright-core/bundles/zip/src/third_party/extract-zip';
 
 it('should context.routeFromHAR, matching the method and following redirects', async ({ context, asset }) => {
   const path = asset('har-fulfill.har');
@@ -556,4 +556,4 @@ it('should ignore aborted requests', async ({ contextFactory, server }) => {
     const result = await Promise.race([evalPromise, page2.waitForTimeout(1000).then(() => 'timeout')]);
     expect(result).toBe('timeout');
   }
-});
\ No newline at end of file
+});
diff --git a/tests/library/browsercontext-network-event.spec.ts b/tests/library/browsercontext-network-event.spec.ts
index 14684d82c0820..45d42c41bfb16 100644
--- a/tests/library/browsercontext-network-event.spec.ts
+++ b/tests/library/browsercontext-network-event.spec.ts
@@ -144,3 +144,23 @@ it('should not fire events for favicon or favicon redirects', async ({ context,
   expect(events).not.toEqual(expect.arrayContaining([expect.stringContaining(favicon)]));
   expect(events).not.toEqual(expect.arrayContaining([expect.stringContaining(hashedFaviconUrl)]));
 });
+
+it('should reject response.finished if context closes', async ({ page, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+  server.setRoute('/get', (req, res) => {
+    // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
+    // from server.
+    res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+    res.write('hello ');
+  });
+  // send request and wait for server response
+  const [pageResponse] = await Promise.all([
+    page.waitForEvent('response'),
+    page.evaluate(() => fetch('./get', { method: 'GET' })),
+  ]);
+
+  const finishPromise = pageResponse.finished().catch(e => e);
+  await page.context().close();
+  const error = await finishPromise;
+  expect(error.message).toContain('closed');
+});
diff --git a/tests/library/browsercontext-page-event.spec.ts b/tests/library/browsercontext-page-event.spec.ts
index b851dd0ce9b1e..15e2b661638ca 100644
--- a/tests/library/browsercontext-page-event.spec.ts
+++ b/tests/library/browsercontext-page-event.spec.ts
@@ -171,8 +171,6 @@ it('should work with Shift-clicking', async ({ browser, server, browserName }) =
 });
 
 it('should work with Ctrl-clicking', async ({ browser, server, browserName }) => {
-  it.fixme(browserName === 'firefox', 'Reports an opener in this case.');
-
   const context = await browser.newContext();
   const page = await context.newPage();
   await page.goto(server.EMPTY_PAGE);
@@ -181,22 +179,6 @@ it('should work with Ctrl-clicking', async ({ browser, server, browserName }) =>
     context.waitForEvent('page'),
     page.click('a', { modifiers: ['ControlOrMeta'] }),
   ]);
-  expect(await popup.opener()).toBe(null);
+  expect(await popup.opener()).toBe(browserName === 'firefox' ? page : null);
   await context.close();
 });
-
-it('should not hang on ctrl-click during provisional load', async ({ context, page, server, isWindows, browserName, isLinux }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/11595' });
-  it.skip(browserName === 'chromium', 'Chromium does not dispatch renderer messages while navigation is provisional.');
-  it.fixme(browserName === 'webkit' && isWindows, 'Timesout while trying to click');
-  it.fixme(browserName === 'webkit' && isLinux, 'Timesout while trying to click');
-  await page.goto(server.EMPTY_PAGE);
-  await page.setContent('<a href="/one-style.html">yo</a>');
-  server.setRoute('/slow.html', () => {});
-  const [popup] = await Promise.all([
-    context.waitForEvent('page'),
-    server.waitForRequest('/slow.html').then(() => page.click('a', { modifiers: ['ControlOrMeta'] })),
-    page.evaluate(url => setTimeout(() => location.href = url, 0), server.CROSS_PROCESS_PREFIX + '/slow.html'),
-  ]);
-  expect(popup).toBeTruthy();
-});
diff --git a/tests/library/browsercontext-proxy.spec.ts b/tests/library/browsercontext-proxy.spec.ts
index d56bce09720f6..6cf894f7b4003 100644
--- a/tests/library/browsercontext-proxy.spec.ts
+++ b/tests/library/browsercontext-proxy.spec.ts
@@ -18,42 +18,13 @@ import { browserTest as it, expect } from '../config/browserTest';
 
 it.skip(({ mode }) => mode.startsWith('service'));
 
-it.use({
-  launchOptions: async ({ launchOptions }, use) => {
-    await use({
-      ...launchOptions,
-      proxy: { server: 'per-context' }
-    });
-  }
-});
-
-
 it.beforeEach(({ server }) => {
   server.setRoute('/target.html', async (req, res) => {
     res.end('<html><title>Served by the proxy</title></html>');
   });
 });
 
-it('should throw for missing global proxy on Chromium Windows', async ({ browserName, platform, browserType, server }) => {
-  it.skip(browserName !== 'chromium' || platform !== 'win32');
-
-  let browser;
-  try {
-    browser = await browserType.launch({
-      proxy: undefined,
-    });
-    const error = await browser.newContext({ proxy: { server: `localhost:${server.PORT}` } }).catch(e => e);
-    expect(error.toString()).toContain('Browser needs to be launched with the global proxy');
-  } finally {
-    await browser.close();
-  }
-});
-
 it('should work when passing the proxy only on the context level', async ({ browserName, platform, browserType, server, proxyServer }) => {
-  // Currently an upstream bug in the network stack of Chromium which leads that
-  // the wrong proxy gets used in the BrowserContext.
-  it.fixme(browserName === 'chromium' && platform === 'win32');
-
   proxyServer.forwardTo(server.PORT);
   let browser;
   try {
@@ -61,7 +32,7 @@ it('should work when passing the proxy only on the context level', async ({ brow
       proxy: undefined,
     });
     const context = await browser.newContext({
-      proxy: { server: `localhost:${proxyServer.PORT}` }
+      proxy: { server: proxyServer.HOST }
     });
 
     const page = await context.newPage();
@@ -84,7 +55,7 @@ it('should throw for bad server value', async ({ contextFactory }) => {
 it('should use proxy', async ({ contextFactory, server, proxyServer }) => {
   proxyServer.forwardTo(server.PORT);
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}` }
+    proxy: { server: proxyServer.HOST }
   });
   const page = await context.newPage();
   await page.goto('http://non-existent.com/target.html');
@@ -93,13 +64,50 @@ it('should use proxy', async ({ contextFactory, server, proxyServer }) => {
   await context.close();
 });
 
+it('should send secure cookies to subdomain.localhost', async ({ contextFactory, browserName, server, isWindows, proxyServer }) => {
+  proxyServer.forwardTo(server.PORT);
+  const context = await contextFactory({
+    proxy: { server: proxyServer.HOST },
+  });
+  server.setRoute('/set-cookie.html', async (req, res) => {
+    res.setHeader('Set-Cookie', [`non-secure=1; HttpOnly`, `secure=1; HttpOnly; Secure`]);
+    res.end();
+  });
+  server.setRoute('/read-cookie.html', async (req, res) => {
+    res.setHeader('Content-Type', `text/html`);
+    res.end(`<div>Cookie: ${req.headers.cookie.split(';').map(c => c.trim()).sort().join('; ')}</div>`);
+  });
+
+  const page = await context.newPage();
+
+  await page.goto(`http://subdomain.localhost/set-cookie.html`);
+
+  const cookies = await context.cookies('http://subdomain.localhost');
+  expect(cookies.map(({ name, domain }) => ({ name, domain }))).toEqual([
+    {
+      name: 'non-secure',
+      domain: 'subdomain.localhost',
+    },
+    ...((browserName === 'webkit') && !isWindows ? [] : [{
+      name: 'secure',
+      domain: 'subdomain.localhost',
+    }]),
+  ]);
+
+  await page.goto(`http://subdomain.localhost/read-cookie.html`);
+  await expect(page.locator('div')).toHaveText(browserName === 'webkit' ? 'Cookie: non-secure=1' : 'Cookie: non-secure=1; secure=1');
+
+  await context.close();
+});
 
-it('should set cookie for top-level domain', async ({ contextFactory, server, proxyServer, browserName, isLinux }) => {
+it('should set cookie for top-level domain', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/18362' }
+}, async ({ contextFactory, server, proxyServer, browserName, isLinux }) => {
   it.fixme(browserName === 'webkit' && isLinux);
 
   proxyServer.forwardTo(server.PORT, { allowConnectRequests: true });
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}` }
+    proxy: { server: proxyServer.HOST }
   });
   server.setRoute('/empty.html', (req, res) => {
     res.setHeader('Set-Cookie', `name=val; Domain=codes; Path=/;`);
@@ -142,7 +150,7 @@ it.describe('should proxy local network requests', () => {
           const url = `http://${params.target}:55555${path}`;
           proxyServer.forwardTo(server.PORT);
           const context = await contextFactory({
-            proxy: { server: `localhost:${proxyServer.PORT}`, bypass: additionalBypass ? '1.non.existent.domain.for.the.test' : undefined }
+            proxy: { server: proxyServer.HOST, bypass: additionalBypass ? '1.non.existent.domain.for.the.test' : undefined }
           });
 
           const page = await context.newPage();
@@ -166,7 +174,6 @@ it.describe('should proxy local network requests', () => {
 
 it('should use ipv6 proxy', async ({ contextFactory, server, proxyServer, browserName }) => {
   it.fail(browserName === 'firefox', 'page.goto: NS_ERROR_UNKNOWN_HOST');
-  it.fail(!!process.env.INSIDE_DOCKER, 'docker does not support IPv6 by default');
   proxyServer.forwardTo(server.PORT);
   const context = await contextFactory({
     proxy: { server: `[0:0:0:0:0:0:0:1]:${proxyServer.PORT}` }
@@ -181,7 +188,7 @@ it('should use ipv6 proxy', async ({ contextFactory, server, proxyServer, browse
 it('should use proxy twice', async ({ contextFactory, server, proxyServer }) => {
   proxyServer.forwardTo(server.PORT);
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}` }
+    proxy: { server: proxyServer.HOST }
   });
   const page = await context.newPage();
   await page.goto('http://non-existent.com/target.html');
@@ -195,7 +202,7 @@ it('should use proxy twice', async ({ contextFactory, server, proxyServer }) =>
 it('should use proxy for second page', async ({ contextFactory, server, proxyServer }) => {
   proxyServer.forwardTo(server.PORT);
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}` }
+    proxy: { server: proxyServer.HOST }
   });
 
   const page = await context.newPage();
@@ -219,7 +226,7 @@ it('should use proxy for https urls', async ({ contextFactory, httpsServer, prox
   proxyServer.forwardTo(httpsServer.PORT, { allowConnectRequests: true });
   const context = await contextFactory({
     ignoreHTTPSErrors: true,
-    proxy: { server: `localhost:${proxyServer.PORT}` }
+    proxy: { server: proxyServer.HOST }
   });
   const page = await context.newPage();
   await page.goto('https://non-existent.com/target.html');
@@ -262,7 +269,7 @@ it('should authenticate', async ({ contextFactory, server, proxyServer }) => {
     return !!auth;
   });
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}`, username: 'user', password: 'secret' }
+    proxy: { server: proxyServer.HOST, username: 'user', password: 'secret' }
   });
   const page = await context.newPage();
   await page.goto('http://non-existent.com/target.html');
@@ -280,7 +287,7 @@ it('should authenticate with empty password', async ({ contextFactory, server, p
     return !!auth;
   });
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}`, username: 'user', password: '' }
+    proxy: { server: proxyServer.HOST, username: 'user', password: '' }
   });
   const page = await context.newPage();
   await page.goto('http://non-existent.com/target.html');
@@ -298,7 +305,7 @@ it('should isolate proxy credentials between contexts', async ({ contextFactory,
   });
   {
     const context = await contextFactory({
-      proxy: { server: `localhost:${proxyServer.PORT}`, username: 'user1', password: 'secret1' }
+      proxy: { server: proxyServer.HOST, username: 'user1', password: 'secret1' }
     });
     const page = await context.newPage();
     await page.goto('http://non-existent.com/target.html');
@@ -309,7 +316,7 @@ it('should isolate proxy credentials between contexts', async ({ contextFactory,
   auth = undefined;
   {
     const context = await contextFactory({
-      proxy: { server: `localhost:${proxyServer.PORT}`, username: 'user2', password: 'secret2' }
+      proxy: { server: proxyServer.HOST, username: 'user2', password: 'secret2' }
     });
     const page = await context.newPage();
     await page.goto('http://non-existent.com/target.html');
@@ -326,7 +333,7 @@ it('should exclude patterns', async ({ contextFactory, server, proxyServer }) =>
   //
   // @see https://gist.github.com/CollinChaffin/24f6c9652efb3d6d5ef2f5502720ef00
   const context = await contextFactory({
-    proxy: { server: `localhost:${proxyServer.PORT}`, bypass: '1.non.existent.domain.for.the.test, 2.non.existent.domain.for.the.test, .another.test' }
+    proxy: { server: proxyServer.HOST, bypass: '1.non.existent.domain.for.the.test, 2.non.existent.domain.for.the.test, .another.test' }
   });
 
   const nonFaviconUrls = () => {
diff --git a/tests/library/browsercontext-reuse.spec.ts b/tests/library/browsercontext-reuse.spec.ts
index 14590a3ae33cb..602f323522be8 100644
--- a/tests/library/browsercontext-reuse.spec.ts
+++ b/tests/library/browsercontext-reuse.spec.ts
@@ -15,274 +15,405 @@
  */
 
 import { browserTest, expect } from '../config/browserTest';
-import type { BrowserContext } from '@playwright/test';
-
-const test = browserTest.extend<{ reusedContext: () => Promise<BrowserContext> }>({
-  reusedContext: async ({ browserType, browser }, use) => {
-    await use(async () => {
-      const defaultContextOptions = (browserType as any)._defaultContextOptions;
-      const context = await (browser as any)._newContextForReuse(defaultContextOptions);
-      return context;
-    });
-  },
-});
+import { verifyViewport } from '../config/utils';
+import type { Browser, BrowserServer, BrowserContext, Page, BrowserContextOptions, BrowserType } from '@playwright/test';
 
-test('should re-add binding after reset', async ({ reusedContext }) => {
-  let context = await reusedContext();
+class LaunchScenario {
+  private _browserType: BrowserType;
+  private _browser: Browser | undefined;
+  private _context: BrowserContext | undefined;
 
-  await context.exposeFunction('add', function(a, b) {
-    return Promise.resolve(a - b);
-  });
-  let page = await context.newPage();
-  expect(await page.evaluate('add(7, 6)')).toBe(1);
+  constructor(browserType: BrowserType) {
+    this._browserType = browserType;
+  }
 
-  context = await reusedContext();
-  await context.exposeFunction('add', function(a, b) {
-    return Promise.resolve(a + b);
-  });
+  async browser() {
+    if (!this._browser)
+      this._browser = await this._browserType.launch();
+    return this._browser;
+  }
+
+  async reusedContext(options?: BrowserContextOptions): Promise<BrowserContext> {
+    const browser = await this.browser();
+    if (this._context)
+      await (browser as any)._disconnectFromReusedContext('reusedContext');
+    const defaultContextOptions = (this._browserType as any)._playwright._defaultContextOptions;
+    this._context = await (browser as any)._newContextForReuse({ ...defaultContextOptions, ...options });
+    return this._context;
+  }
+
+  async close() {
+    await this._browser?.close();
+  }
+}
+
+class ConnectScenario {
+  private _browserType: BrowserType;
+  private _server: BrowserServer | undefined;
+  private _browser: Browser | undefined;
+
+  constructor(browserType: BrowserType) {
+    this._browserType = browserType;
+  }
+
+  async server() {
+    if (!this._server)
+      this._server = await this._browserType.launchServer();
+    return this._server;
+  }
+
+  async reusedContext(options?: BrowserContextOptions): Promise<BrowserContext> {
+    const server = await this.server();
+    if (this._browser)
+      await this._browser.close();
+    this._browser = await this._browserType.connect(server.wsEndpoint());
+    const defaultContextOptions = (this._browserType as any)._playwright._defaultContextOptions;
+    return await (this._browser as any)._newContextForReuse({ ...defaultContextOptions, ...options });
+  }
 
-  page = context.pages()[0];
-  expect(await page.evaluate('add(5, 6)')).toBe(11);
-  await page.reload();
-  expect(await page.evaluate('add(5, 6)')).toBe(11);
+  async close() {
+    await this._browser?.close();
+    await this._server?.close();
+  }
+}
+
+const test = browserTest.extend<{ scenario: 'launch' | 'connect', reusedContext: (options?: BrowserContextOptions) => Promise<BrowserContext> }>({
+  scenario: 'launch',
+  reusedContext: async ({ scenario, browserType }, use) => {
+    const instance = scenario === 'launch' ?  new LaunchScenario(browserType) : new ConnectScenario(browserType);
+    await use(options => instance.reusedContext(options));
+    await instance.close();
+  },
 });
 
-test('should reset serviceworker', async ({ reusedContext, server }) => {
-  server.setRoute('/page.html', (req, res) => {
-    res.setHeader('Content-Type', 'text/html');
-    res.end(`
-      <title>Page Title</title>
-      <script>
-        navigator.serviceWorker.register('sw.js');
-      </script>
-    `);
-  });
-  server.setRoute('/sw.js', (req, res) => {
-    res.setHeader('Content-Type', 'application/javascript');
-    res.end(`
-      self.addEventListener('fetch', event => {
-        const blob = new Blob(['<title>Wrong Title</title>'], { type : 'text/html' });
-        const response = new Response(blob, { status: 200 , statusText: 'OK' });
-        event.respondWith(response);
-      });
+for (const scenario of ['launch', 'connect'] as const) {
+  test.describe('reuse ' + scenario, () => {
+    test.skip(({ mode }) => mode !== 'default' && scenario === 'connect');
+    test.use({ scenario });
 
-      self.addEventListener('activate', event => {
-        event.waitUntil(clients.claim());
+    test('should re-add binding after reset', async ({ reusedContext }) => {
+      let context = await reusedContext();
+
+      await context.exposeFunction('add', function(a, b) {
+        return Promise.resolve(a - b);
       });
-    `);
-  });
+      let page = await context.newPage();
+      expect(await page.evaluate('add(7, 6)')).toBe(1);
 
-  let context = await reusedContext();
-  let page = await context.newPage();
-  await page.goto(server.PREFIX + '/page.html');
-  await expect(page).toHaveTitle('Page Title');
+      context = await reusedContext();
+      await context.exposeFunction('add', function(a, b) {
+        return Promise.resolve(a + b);
+      });
 
-  context = await reusedContext();
-  page = context.pages()[0];
-  await page.goto(server.PREFIX + '/page.html');
-  await expect(page).toHaveTitle('Page Title');
-});
+      page = context.pages()[0];
+      expect(await page.evaluate('add(5, 6)')).toBe(11);
+      await page.reload();
+      expect(await page.evaluate('add(5, 6)')).toBe(11);
+    });
 
-test('should reset serviceworker that hangs in importScripts', async ({ reusedContext, server }) => {
-  server.setRoute('/page.html', (req, res) => {
-    res.setHeader('Content-Type', 'text/html');
-    res.end(`
-      <title>Page Title</title>
-      <script>
-        navigator.serviceWorker.register('sw.js');
-      </script>
-    `);
-  });
-  server.setRoute('/sw.js', (req, res) => {
-    res.setHeader('Content-Type', 'application/javascript');
-    res.end(`
-      importScripts('helper.js');
-
-      self.addEventListener('fetch', event => {
-        const blob = new Blob(['<title>Wrong Title</title>'], { type : 'text/html' });
-        const response = new Response(blob, { status: 200 , statusText: 'OK' });
-        event.respondWith(response);
+    test('should reset serviceworker', async ({ reusedContext, server }) => {
+      server.setRoute('/page.html', (req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.end(`
+          <title>Page Title</title>
+          <script>
+            navigator.serviceWorker.register('sw.js');
+          </script>
+        `);
       });
+      server.setRoute('/sw.js', (req, res) => {
+        res.setHeader('Content-Type', 'application/javascript');
+        res.end(`
+          self.addEventListener('fetch', event => {
+            const blob = new Blob(['<title>Wrong Title</title>'], { type : 'text/html' });
+            const response = new Response(blob, { status: 200 , statusText: 'OK' });
+            event.respondWith(response);
+          });
+
+          self.addEventListener('activate', event => {
+            event.waitUntil(clients.claim());
+          });
+        `);
+      });
+
+      let context = await reusedContext();
+      let page = await context.newPage();
+      await page.goto(server.PREFIX + '/page.html');
+      await expect(page).toHaveTitle('Page Title');
 
-      self.addEventListener('activate', event => {
-        event.waitUntil(clients.claim());
+      context = await reusedContext();
+      page = context.pages()[0];
+      await page.goto(server.PREFIX + '/page.html');
+      await expect(page).toHaveTitle('Page Title');
+    });
+
+    test('should reset serviceworker that hangs in importScripts', async ({ reusedContext, server }) => {
+      server.setRoute('/page.html', (req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.end(`
+          <title>Page Title</title>
+          <script>
+            navigator.serviceWorker.register('sw.js');
+          </script>
+        `);
+      });
+      server.setRoute('/sw.js', (req, res) => {
+        res.setHeader('Content-Type', 'application/javascript');
+        res.end(`
+          importScripts('helper.js');
+
+          self.addEventListener('fetch', event => {
+            const blob = new Blob(['<title>Wrong Title</title>'], { type : 'text/html' });
+            const response = new Response(blob, { status: 200 , statusText: 'OK' });
+            event.respondWith(response);
+          });
+
+          self.addEventListener('activate', event => {
+            event.waitUntil(clients.claim());
+          });
+        `);
+      });
+      server.setRoute('/helper.js', (req, res) => {
+        res.setHeader('Content-Type', 'application/javascript');
+        // Sending excessive content length makes importScripts hang for
+        // 5 seconds in Chromium, 6 seconds in Firefox and long time in WebKit.
+        res.setHeader('Content-Length', 1000);
+        res.end(`1`);
       });
-    `);
-  });
-  server.setRoute('/helper.js', (req, res) => {
-    res.setHeader('Content-Type', 'application/javascript');
-    // Sending excessive content length makes importScripts hang for
-    // 5 seconds in Chromium, 6 seconds in Firefox and long time in WebKit.
-    res.setHeader('Content-Length', 1000);
-    res.end(`1`);
-  });
 
-  let context = await reusedContext();
-  let page = await context.newPage();
-  await page.goto(server.PREFIX + '/page.html');
-  await expect(page).toHaveTitle('Page Title');
+      let context = await reusedContext();
+      let page = await context.newPage();
+      await page.goto(server.PREFIX + '/page.html');
+      await expect(page).toHaveTitle('Page Title');
 
-  context = await reusedContext();
-  page = context.pages()[0];
-  await page.goto(server.PREFIX + '/page.html');
-  await expect(page).toHaveTitle('Page Title');
-});
+      context = await reusedContext();
+      page = context.pages()[0];
+      await page.goto(server.PREFIX + '/page.html');
+      await expect(page).toHaveTitle('Page Title');
+    });
 
-test('should not cache resources', async ({ reusedContext, server }) => {
-  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/19926' });
-  const requestCountMap = new Map<string, number>();
-  server.setRoute('/page.html', (req, res) => {
-    res.setHeader('Content-Type', 'text/html');
-    res.setHeader(`Cache-Control`, `max-age=3600`);
-    const requestCount = requestCountMap.get(req.url) || 0;
-    res.end(`
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="UTF-8">
-        <title>Count: ${requestCount}</title>
-        <link rel="stylesheet" href="style.css">
-        <script>
-          fetch('simple.json').then(() => {});
-        </script>
-      </head>
-    </html>
-    `);
-    requestCountMap.set(req.url, requestCount + 1);
-  });
-  server.setRoute('/style.css', (req, res) => {
-    res.setHeader('Content-Type', 'text/css');
-    res.setHeader(`Cache-Control`, `max-age=3600`);
-    res.end(`body { background-color: red; }`);
-    requestCountMap.set(req.url, (requestCountMap.get(req.url) || 0) + 1);
-  });
-  server.setRoute('/simple.json', (req, res) => {
-    res.setHeader(`Cache-Control`, `max-age=3600`);
-    res.setHeader('Content-Type', 'application/json');
-    res.end(`{ "foo": "bar" }`);
-    requestCountMap.set(req.url, (requestCountMap.get(req.url) || 0) + 1);
-  });
+    test('should not cache resources', async ({ reusedContext, server }) => {
+      test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/19926' });
+      const requestCountMap = new Map<string, number>();
+      server.setRoute('/page.html', (req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.setHeader(`Cache-Control`, `max-age=3600`);
+        const requestCount = requestCountMap.get(req.url) || 0;
+        res.end(`
+        <!DOCTYPE html>
+        <html>
+          <head>
+            <meta charset="UTF-8">
+            <title>Count: ${requestCount}</title>
+            <link rel="stylesheet" href="style.css">
+            <script>
+              fetch('simple.json').then(() => {});
+            </script>
+          </head>
+        </html>
+        `);
+        requestCountMap.set(req.url, requestCount + 1);
+      });
+      server.setRoute('/style.css', (req, res) => {
+        res.setHeader('Content-Type', 'text/css');
+        res.setHeader(`Cache-Control`, `max-age=3600`);
+        res.end(`body { background-color: red; }`);
+        requestCountMap.set(req.url, (requestCountMap.get(req.url) || 0) + 1);
+      });
+      server.setRoute('/simple.json', (req, res) => {
+        res.setHeader(`Cache-Control`, `max-age=3600`);
+        res.setHeader('Content-Type', 'application/json');
+        res.end(`{ "foo": "bar" }`);
+        requestCountMap.set(req.url, (requestCountMap.get(req.url) || 0) + 1);
+      });
 
-  {
-    const context = await reusedContext();
-    const page = await context.newPage();
-    await page.goto(server.PREFIX + '/page.html');
-    await expect(page).toHaveTitle('Count: 0');
-    expect(requestCountMap.get('/page.html')).toBe(1);
-    expect(requestCountMap.get('/style.css')).toBe(1);
-    expect(requestCountMap.get('/simple.json')).toBe(1);
-  }
-  {
-    const context = await reusedContext();
-    const page = context.pages()[0];
-    await page.goto(server.PREFIX + '/page.html');
-    await expect(page).toHaveTitle('Count: 1');
-    expect(requestCountMap.get('/page.html')).toBe(2);
-    expect(requestCountMap.get('/style.css')).toBe(2);
-    expect(requestCountMap.get('/simple.json')).toBe(2);
-  }
-});
+      {
+        const context = await reusedContext();
+        const page = await context.newPage();
+        await page.goto(server.PREFIX + '/page.html');
+        await expect(page).toHaveTitle('Count: 0');
+        expect(requestCountMap.get('/page.html')).toBe(1);
+        expect(requestCountMap.get('/style.css')).toBe(1);
+        expect(requestCountMap.get('/simple.json')).toBe(1);
+      }
+      {
+        const context = await reusedContext();
+        const page = context.pages()[0];
+        await page.goto(server.PREFIX + '/page.html');
+        await expect(page).toHaveTitle('Count: 1');
+        expect(requestCountMap.get('/page.html')).toBe(2);
+        expect(requestCountMap.get('/style.css')).toBe(2);
+        expect(requestCountMap.get('/simple.json')).toBe(2);
+      }
+    });
 
-test('should ignore binding from beforeunload', async ({ reusedContext }) => {
-  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22803' });
+    test('should ignore binding from beforeunload', async ({ reusedContext }) => {
+      test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22803' });
 
-  let context = await reusedContext();
+      let context = await reusedContext();
 
-  let called = false;
-  await context.exposeFunction('binding', () => called = true);
+      let called = false;
+      await context.exposeFunction('binding', () => called = true);
 
-  let page = await context.newPage();
-  await page.evaluate(() => {
-    window.addEventListener('beforeunload', () => window['binding']());
-  });
+      let page = await context.newPage();
+      await page.evaluate(() => {
+        window.addEventListener('beforeunload', () => window['binding']());
+      });
 
-  context = await reusedContext();
-  page = context.pages()[0];
-  await page.setContent('hello');
+      context = await reusedContext();
+      page = context.pages()[0];
+      await page.setContent('hello');
 
-  expect(called).toBe(false);
-});
+      expect(called).toBe(false);
+    });
 
-test('should reset mouse position', async ({ reusedContext, browserName, platform }) => {
-  // Note: this test only reproduces the issue locally when run with --repeat-each=20.
-  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22432' });
-  test.fixme(browserName === 'chromium' && platform !== 'darwin', 'chromium keeps hover on linux/win');
-
-  const pageContent = `
-    <style>
-      div { height: 30px; background: blue; }
-      div:hover { background: red; }
-      html, body { margin: 0; padding: 0; }
-    </style>
-    <div id=one>one</div>
-    <div id=two>two</div>
-  `;
-
-  let context = await reusedContext();
-  let page = await context.newPage();
-  await page.setContent(pageContent);
-  await expect(page.locator('#one')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
-  await expect(page.locator('#two')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
-
-  await page.mouse.move(10, 45);
-  await expect(page.locator('#one')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
-  await expect(page.locator('#two')).toHaveCSS('background-color', 'rgb(255, 0, 0)');
-
-  context = await reusedContext();
-  page = context.pages()[0];
-  await page.setContent(pageContent);
-  await expect(page.locator('#one')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
-  await expect(page.locator('#two')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
-});
+    test('should reset mouse position', {
+      annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22432' },
+    }, async ({ reusedContext, browserName, platform }) => {
+      // Note: this test only reproduces the issue locally when run with --repeat-each=20.
+
+      const pageContent = `
+        <style>
+          div { height: 30px; background: blue; }
+          div:hover { background: red; }
+          html, body { margin: 0; padding: 0; }
+        </style>
+        <div id=filler>one</div>
+        <div id=one>one</div>
+        <div id=two>two</div>
+      `;
+
+      let context = await reusedContext();
+      let page = await context.newPage();
+      await page.setContent(pageContent);
+      await expect(page.locator('#one')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
+      await expect(page.locator('#two')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
+
+      await page.mouse.move(10, 75);
+      await expect(page.locator('#one')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
+      await expect(page.locator('#two')).toHaveCSS('background-color', 'rgb(255, 0, 0)');
+
+      context = await reusedContext();
+      page = context.pages()[0];
+      await page.setContent(pageContent);
+      await expect(page.locator('#one')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
+      await expect(page.locator('#two')).toHaveCSS('background-color', 'rgb(0, 0, 255)');
+    });
 
-test('should reset tracing', async ({ reusedContext, trace }, testInfo) => {
-  test.skip(trace === 'on');
+    test('should reset tracing', async ({ reusedContext, trace }, testInfo) => {
+      test.skip(trace === 'on');
 
-  let context = await reusedContext();
-  await context.tracing.start();
+      let context = await reusedContext();
+      await context.tracing.start();
 
-  let page = await context.newPage();
-  await page.evaluate('1 + 1');
+      let page = await context.newPage();
+      await page.evaluate('1 + 1');
 
-  context = await reusedContext();
-  page = context.pages()[0];
-  await page.evaluate('2 + 2');
+      context = await reusedContext();
+      page = context.pages()[0];
+      await page.evaluate('2 + 2');
 
-  const error = await context.tracing.stopChunk({ path: testInfo.outputPath('trace.zip') }).catch(e => e);
-  expect(error.message).toContain('Must start tracing before stopping');
-});
+      const error = await context.tracing.stopChunk({ path: testInfo.outputPath('trace.zip') }).catch(e => e);
+      expect(error.message).toContain('Must start tracing before stopping');
+    });
 
-test('should work with clock emulation', async ({ reusedContext, trace }, testInfo) => {
-  let context = await reusedContext();
+    test('should work with clock emulation', async ({ reusedContext, trace }, testInfo) => {
+      let context = await reusedContext();
 
-  let page = await context.newPage();
-  await page.clock.setFixedTime(new Date('2020-01-01T00:00:00.000Z'));
-  expect(await page.evaluate('new Date().toISOString()')).toBe('2020-01-01T00:00:00.000Z');
+      let page = await context.newPage();
+      await page.clock.setFixedTime(new Date('2020-01-01T00:00:00.000Z'));
+      expect(await page.evaluate('new Date().toISOString()')).toBe('2020-01-01T00:00:00.000Z');
 
-  context = await reusedContext();
-  page = context.pages()[0];
-  await page.clock.setFixedTime(new Date('2020-01-01T00:00:00Z'));
-  expect(await page.evaluate('new Date().toISOString()')).toBe('2020-01-01T00:00:00.000Z');
-});
+      context = await reusedContext();
+      page = context.pages()[0];
+      await page.clock.setFixedTime(new Date('2020-01-01T00:00:00Z'));
+      expect(await page.evaluate('new Date().toISOString()')).toBe('2020-01-01T00:00:00.000Z');
+    });
 
-test('should continue issuing events after closing the reused page', async ({ reusedContext, server }) => {
-  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/24574' });
-
-  {
-    const context = await reusedContext();
-    const page = await context.newPage();
-    await Promise.all([
-      page.waitForRequest(server.PREFIX + '/one-style.css'),
-      page.goto(server.PREFIX + '/one-style.html'),
-    ]);
-    await page.close();
-  }
-  {
-    const context = await reusedContext();
-    const page = context.pages()[0];
-    await Promise.all([
-      page.waitForRequest(server.PREFIX + '/one-style.css', { timeout: 10000 }),
-      page.goto(server.PREFIX + '/one-style.html'),
-    ]);
-  }
-});
+    test('should continue issuing events after closing the reused page', async ({ reusedContext, server }) => {
+      test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/24574' });
+
+      {
+        const context = await reusedContext();
+        const page = await context.newPage();
+        await Promise.all([
+          page.waitForRequest(server.PREFIX + '/one-style.css'),
+          page.goto(server.PREFIX + '/one-style.html'),
+        ]);
+        await page.close();
+      }
+      {
+        const context = await reusedContext();
+        const page = context.pages()[0];
+        await Promise.all([
+          page.waitForRequest(server.PREFIX + '/one-style.css', { timeout: 10000 }),
+          page.goto(server.PREFIX + '/one-style.html'),
+        ]);
+      }
+    });
+
+    test('should work with routeWebSocket', {
+      annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36480' },
+    }, async ({ reusedContext, server }, testInfo) => {
+      async function setup(page: Page, suffix: string) {
+        await page.routeWebSocket(/ws1/, ws => {
+          ws.onMessage(message => {
+            ws.send('page-mock-' + suffix);
+          });
+        });
+        await page.context().routeWebSocket(/.*/, ws => {
+          const server = ws.connectToServer();
+          ws.onMessage(message => {
+            ws.send('context-mock-' + suffix);
+          });
+          server.onMessage(message => ws.send(message));
+        });
+        await page.goto('about:blank');
+        await page.evaluate(host => {
+          window.log = [];
+          (window as any).ws1 = new WebSocket('ws://' + host + '/ws1');
+          (window as any).ws1.addEventListener('message', event => window.log.push(`ws1:${event.data}`));
+          (window as any).ws = new WebSocket('ws://' + host + '/ws');
+          (window as any).ws.addEventListener('message', event => window.log.push(`ws:${event.data}`));
+        }, server.HOST);
+      }
+
+      let context = await reusedContext();
+      let page = await context.newPage();
+      const wsPromise = server.waitForWebSocket();
+      await setup(page, 'before');
+      const ws = await wsPromise;
+      await page.evaluate(() => (window as any).ws1.send('request'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-before`]);
+      await page.evaluate(() => (window as any).ws.send('request'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-before`, `ws:context-mock-before`]);
+      ws.send('hi');
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-before`, `ws:context-mock-before`, `ws:hi`]);
+
+      context = await reusedContext();
+      page = context.pages()[0];
+      const newWSPromise = server.waitForWebSocket();
+      await setup(page, 'after');
+      const newWS = await newWSPromise;
+      await page.evaluate(() => (window as any).ws1.send('request'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-after`]);
+      await page.evaluate(() => (window as any).ws.send('request'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-after`, `ws:context-mock-after`]);
+      newWS.send('hello');
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-after`, `ws:context-mock-after`, `ws:hello`]);
+    });
+
+    test('should update viewport and media', async ({ reusedContext }) => {
+      let context = await reusedContext({ viewport: { width: 800, height: 600 }, colorScheme: 'dark' });
+      let page = await context.newPage();
+      expect(await page.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches)).toBe(true);
+      await verifyViewport(page, 800, 600);
+      await page.close();
+
+      context = await reusedContext({ viewport: { width: 600, height: 800 }, colorScheme: 'light' });
+      page = await context.newPage();
+      expect(await page.evaluate(() => matchMedia('(prefers-color-scheme: light)').matches)).toBe(true);
+      await verifyViewport(page, 600, 800);
+    });
+  });
+}
diff --git a/tests/library/browsercontext-route.spec.ts b/tests/library/browsercontext-route.spec.ts
index 25d965c1b6846..f3ff5538883aa 100644
--- a/tests/library/browsercontext-route.spec.ts
+++ b/tests/library/browsercontext-route.spec.ts
@@ -170,7 +170,7 @@ it('should use Set-Cookie header in future requests', async ({ contextFactory, s
     sameSite: defaultSameSiteCookieValue,
     name: 'name',
     value: 'value',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/',
     expires: -1,
     httpOnly: false,
diff --git a/tests/library/browsercontext-service-worker-policy.spec.ts b/tests/library/browsercontext-service-worker-policy.spec.ts
index 213cf1461aa6d..1923a2dc4e6b3 100644
--- a/tests/library/browsercontext-service-worker-policy.spec.ts
+++ b/tests/library/browsercontext-service-worker-policy.spec.ts
@@ -29,4 +29,12 @@ it.describe('block', () => {
       page.goto(server.PREFIX + '/serviceworkers/empty/sw.html'),
     ]);
   });
+
+  it('should not throw error on about:blank', async ({ page }) => {
+    it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32292' });
+    const errors = [];
+    page.on('pageerror', error => errors.push(error));
+    await page.goto('about:blank');
+    expect(errors).toEqual([]);
+  });
 });
diff --git a/tests/library/browsercontext-storage-state.spec.ts b/tests/library/browsercontext-storage-state.spec.ts
index 89bb84d2c391e..4f4fca6cee201 100644
--- a/tests/library/browsercontext-storage-state.spec.ts
+++ b/tests/library/browsercontext-storage-state.spec.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { attachFrame } from 'tests/config/utils';
 import { browserTest as it, expect } from '../config/browserTest';
 import fs from 'fs';
 
@@ -73,6 +74,25 @@ it('should set local storage', async ({ contextFactory }) => {
   await context.close();
 });
 
+it('should report good error if the url is not valid', async ({ contextFactory }) => {
+  const error = await contextFactory({
+    storageState: {
+      cookies: [],
+      origins: [
+        {
+          origin: 'foo',
+          localStorage: [{
+            name: 'name1',
+            value: 'value1'
+          }]
+        },
+      ]
+    }
+  }).catch(e => e);
+  expect(error.message).toContain('browser.newContext: Error setting storage state:');
+  expect(error.message).toContain('foo');
+});
+
 it('should round-trip through the file', async ({ contextFactory }, testInfo) => {
   const context = await contextFactory();
   const page1 = await context.newPage();
@@ -80,14 +100,34 @@ it('should round-trip through the file', async ({ contextFactory }, testInfo) =>
     route.fulfill({ body: '<html></html>' }).catch(() => {});
   });
   await page1.goto('https://www.example.com');
-  await page1.evaluate(() => {
+  await page1.evaluate(async () => {
     localStorage['name1'] = 'value1';
     document.cookie = 'username=John Doe';
+
+    await new Promise((resolve, reject) => {
+      const openRequest = indexedDB.open('db', 42);
+      openRequest.onupgradeneeded = () => {
+        openRequest.result.createObjectStore('store', { keyPath: 'name' });
+        openRequest.result.createObjectStore('store2');
+      };
+      openRequest.onsuccess = () => {
+        const transaction = openRequest.result.transaction(['store', 'store2'], 'readwrite');
+        transaction
+            .objectStore('store')
+            .put({ name: 'foo', date: new Date(0), null: null });
+        transaction
+            .objectStore('store2')
+            .put(new TextEncoder().encode('bar'), 'foo');
+        transaction.addEventListener('complete', resolve);
+        transaction.addEventListener('error', reject);
+      };
+    });
+
     return document.cookie;
   });
 
   const path = testInfo.outputPath('storage-state.json');
-  const state = await context.storageState({ path });
+  const state = await context.storageState({ path, indexedDB: true });
   const written = await fs.promises.readFile(path, 'utf8');
   expect(JSON.stringify(state, undefined, 2)).toBe(written);
 
@@ -101,6 +141,27 @@ it('should round-trip through the file', async ({ contextFactory }, testInfo) =>
   expect(localStorage).toEqual({ name1: 'value1' });
   const cookie = await page2.evaluate('document.cookie');
   expect(cookie).toEqual('username=John Doe');
+  const idbValues = await page2.evaluate(() => new Promise((resolve, reject) => {
+    const openRequest = indexedDB.open('db', 42);
+    openRequest.addEventListener('success', async () => {
+      const db = openRequest.result;
+      const transaction = db.transaction(['store', 'store2'], 'readonly');
+      const request1 = transaction.objectStore('store').get('foo');
+      const request2 = transaction.objectStore('store2').get('foo');
+
+      const [result1, result2] = await Promise.all([request1, request2].map(request => new Promise((resolve, reject) => {
+        request.addEventListener('success', () => resolve(request.result));
+        request.addEventListener('error', () => reject(request.error));
+      })));
+
+      resolve([result1, new TextDecoder().decode(result2 as any)]);
+    });
+    openRequest.addEventListener('error', () => reject(openRequest.error));
+  }));
+  expect(idbValues).toEqual([
+    { name: 'foo', date: new Date(0), null: null },
+    'bar'
+  ]);
   await context2.close();
 });
 
@@ -203,13 +264,13 @@ it('should handle missing file', async ({ contextFactory }, testInfo) => {
   expect(error.message).toContain(`Error reading storage state from ${file}:\nENOENT`);
 });
 
-it('should handle malformed file', async ({ contextFactory }, testInfo) => {
+it('should handle malformed file', async ({ contextFactory, nodeVersion }, testInfo) => {
   const file = testInfo.outputPath('state.json');
   fs.writeFileSync(file, 'not-json', 'utf-8');
   const error = await contextFactory({
     storageState: file,
   }).catch(e => e);
-  if (+process.versions.node.split('.')[0] > 18)
+  if (nodeVersion.major > 18)
     expect(error.message).toContain(`Error reading storage state from ${file}:\nUnexpected token 'o', \"not-json\" is not valid JSON`);
   else
     expect(error.message).toContain(`Error reading storage state from ${file}:\nUnexpected token o in JSON at position 1`);
@@ -275,3 +336,167 @@ it('should work when service worker is intefering', async ({ page, context, serv
   const storageState = await context.storageState();
   expect(storageState.origins[0].localStorage[0]).toEqual({ name: 'foo', value: 'bar' });
 });
+
+it('should set local storage in third-party context', async ({ contextFactory, server }) => {
+  const context = await contextFactory({
+    storageState: {
+      cookies: [],
+      origins: [
+        {
+          origin: server.CROSS_PROCESS_PREFIX,
+          localStorage: [{
+            name: 'name1',
+            value: 'value1'
+          }]
+        },
+      ]
+    }
+  });
+  const page = await context.newPage();
+  await page.goto(server.EMPTY_PAGE);
+  const frame = await attachFrame(page, 'frame1', server.CROSS_PROCESS_PREFIX + '/empty.html');
+
+  const localStorage = await frame.evaluate('window.localStorage');
+  expect(localStorage).toEqual({ name1: 'value1' });
+  await context.close();
+});
+
+it('should roundtrip local storage in third-party context', async ({ page, contextFactory, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+  const frame = await attachFrame(page, 'frame1', server.CROSS_PROCESS_PREFIX + '/empty.html');
+  await frame.evaluate(() => window.localStorage.setItem('name1', 'value1'));
+  const storageState = await page.context().storageState();
+
+  const context2 = await contextFactory({ storageState });
+  const page2 = await context2.newPage();
+  await page2.goto(server.EMPTY_PAGE);
+  const frame2 = await attachFrame(page2, 'frame1', server.CROSS_PROCESS_PREFIX + '/empty.html');
+
+  const localStorage = await frame2.evaluate('window.localStorage');
+  expect(localStorage).toEqual({ name1: 'value1' });
+  await context2.close();
+});
+
+it('should support IndexedDB', async ({ page, server, contextFactory }) => {
+  await page.goto(server.PREFIX + '/to-do-notifications/index.html');
+
+  await expect(page.locator('#notifications')).toMatchAriaSnapshot(`
+    - list:
+      - listitem: Database initialised.
+  `);
+  await page.getByLabel('Task title').fill('Pet the cat');
+  await page.getByLabel('Hours').fill('1');
+  await page.getByLabel('Mins').fill('1');
+  await page.getByText('Add Task').click();
+  await expect(page.locator('#notifications')).toMatchAriaSnapshot(`
+    - list:
+      - listitem: "Transaction completed: database modification finished."
+  `);
+
+  const storageState = await page.context().storageState({ indexedDB: true });
+  expect(storageState.origins).toEqual([
+    {
+      origin: server.PREFIX,
+      localStorage: [],
+      indexedDB: [
+        {
+          name: 'toDoList',
+          version: 4,
+          stores: [
+            {
+              name: 'toDoList',
+              autoIncrement: false,
+              keyPath: 'taskTitle',
+              records: [
+                {
+                  value: {
+                    day: '01',
+                    hours: '1',
+                    minutes: '1',
+                    month: 'January',
+                    notified: 'no',
+                    taskTitle: 'Pet the cat',
+                    year: '2025',
+                  },
+                },
+              ],
+              indexes: [
+                {
+                  name: 'day',
+                  keyPath: 'day',
+                  multiEntry: false,
+                  unique: false,
+                },
+                {
+                  name: 'hours',
+                  keyPath: 'hours',
+                  multiEntry: false,
+                  unique: false,
+                },
+                {
+                  name: 'minutes',
+                  keyPath: 'minutes',
+                  multiEntry: false,
+                  unique: false,
+                },
+                {
+                  name: 'month',
+                  keyPath: 'month',
+                  multiEntry: false,
+                  unique: false,
+                },
+                {
+                  name: 'notified',
+                  keyPath: 'notified',
+                  multiEntry: false,
+                  unique: false,
+                },
+                {
+                  name: 'year',
+                  keyPath: 'year',
+                  multiEntry: false,
+                  unique: false,
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  ]);
+
+  const context = await contextFactory({ storageState });
+  expect(await context.storageState({ indexedDB: true })).toEqual(storageState);
+
+  const recreatedPage = await context.newPage();
+  await recreatedPage.goto(server.PREFIX + '/to-do-notifications/index.html');
+  await expect(recreatedPage.locator('#task-list')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - text: /Pet the cat/
+  `);
+
+  expect(await context.storageState()).toEqual({ cookies: [], origins: [] });
+});
+
+it('should support empty indexedDB', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35760' } }, async ({ page, server, contextFactory }) => {
+  await page.goto(server.EMPTY_PAGE);
+  await page.evaluate(() => new Promise<void>(resolve => {
+    const openRequest = indexedDB.open('unused-db');
+    openRequest.onsuccess = () => resolve();
+    openRequest.onerror = () => resolve();
+  }));
+  const storageState = await page.context().storageState({ indexedDB: true });
+  expect(storageState.origins).toEqual([{
+    origin: server.PREFIX,
+    localStorage: [],
+    indexedDB: [{
+      name: 'unused-db',
+      version: 1,
+      stores: [],
+    }]
+  }]);
+
+  const context = await contextFactory({ storageState });
+  expect(await context.storageState({ indexedDB: true })).toEqual(storageState);
+});
diff --git a/tests/library/browsercontext-viewport-mobile.spec.ts b/tests/library/browsercontext-viewport-mobile.spec.ts
index 8160d5601e314..58c85d1a07070 100644
--- a/tests/library/browsercontext-viewport-mobile.spec.ts
+++ b/tests/library/browsercontext-viewport-mobile.spec.ts
@@ -54,12 +54,11 @@ it.describe('mobile viewport', () => {
     }
   });
 
-  it('should be detectable by Modernizr', async ({ playwright, browser, server }) => {
+  it('should be detectable', async ({ playwright, browser }) => {
     const iPhone = playwright.devices['iPhone 6'];
     const context = await browser.newContext({ ...iPhone });
     const page = await context.newPage();
-    await page.goto(server.PREFIX + '/detect-touch.html');
-    expect(await page.evaluate(() => document.body.textContent!.trim())).toBe('YES');
+    expect(await page.evaluate(() => 'ontouchstart' in window || !!window.TouchEvent)).toBe(true);
     await context.close();
   });
 
@@ -67,8 +66,7 @@ it.describe('mobile viewport', () => {
     const context = await browser.newContext({ viewport: { width: 800, height: 600 }, hasTouch: true });
     const page = await context.newPage();
     await page.goto(server.EMPTY_PAGE);
-    await page.addScriptTag({ url: server.PREFIX + '/modernizr.js' });
-    expect(await page.evaluate(() => (window as any)['Modernizr'].touchevents)).toBe(true);
+    expect(await page.evaluate(() => 'ontouchstart' in window || !!window.TouchEvent)).toBe(true);
     await context.close();
   });
 
@@ -156,7 +154,7 @@ it.describe('mobile viewport', () => {
     await desktopPage.close();
   });
 
-  it('mouse should work with mobile viewports and cross process navigations', async ({ browser, server, browserName }) => {
+  it('mouse should work with mobile viewports and cross process navigations', async ({ browser, server }) => {
     // @see https://crbug.com/929806
     const context = await browser.newContext({ viewport: { width: 360, height: 640 }, isMobile: true });
     const page = await context.newPage();
@@ -190,7 +188,22 @@ it.describe('mobile viewport', () => {
     await context.close();
   });
 
-  it('view scale should reset after navigation', async ({ browser, browserName }) => {
+  it('should scroll mobile page with background-attachment: fixed', {
+    annotation: [
+      { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31551' },
+      { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23573' },
+    ]
+  }, async ({ playwright, browser, server }) => {
+    const iPhone = playwright.devices['iPhone 12'];
+    const context = await browser.newContext({ ...iPhone });
+    const page = await context.newPage();
+    await page.goto(server.PREFIX + '/input/background-fixed.html');
+    await page.getByRole('button').click();
+    expect(await page.evaluate(() => window.scrollY)).toBeGreaterThan(1000);
+    await context.close();
+  });
+
+  it('view scale should reset after navigation', async ({ browser }) => {
     it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/26876' });
     const context = await browser.newContext({
       viewport: { width: 390, height: 664 },
diff --git a/tests/library/browsercontext-viewport.spec.ts b/tests/library/browsercontext-viewport.spec.ts
index 360cc5815df9d..1a9a1a27ba479 100644
--- a/tests/library/browsercontext-viewport.spec.ts
+++ b/tests/library/browsercontext-viewport.spec.ts
@@ -19,7 +19,7 @@ import { devices } from '@playwright/test';
 import { contextTest as it, expect } from '../config/browserTest';
 import { browserTest } from '../config/browserTest';
 import { verifyViewport } from '../config/utils';
-import * as os from 'os';
+import { deviceDescriptors } from 'packages/playwright-core/lib/server/deviceDescriptors';
 
 it('should get the proper default viewport size', async ({ page, server }) => {
   await verifyViewport(page, 1280, 720);
@@ -47,6 +47,14 @@ it('should return correct outerWidth and outerHeight', async ({ page }) => {
   expect(size.outerHeight >= size.innerHeight).toBeTruthy();
 });
 
+it('landscape viewport should have width larger than height', async () => {
+  for (const device in deviceDescriptors) {
+    const configuration = deviceDescriptors[device];
+    if (device.includes('landscape') || device.includes('Landscape'))
+      expect(configuration.viewport.width).toBeGreaterThan(configuration.viewport.height);
+  }
+});
+
 it('should emulate device width', async ({ page, server }) => {
   expect(page.viewportSize()).toEqual({ width: 1280, height: 720 });
   await page.setViewportSize({ width: 300, height: 300 });
@@ -93,11 +101,9 @@ it('should emulate availWidth and availHeight', async ({ page }) => {
   expect(await page.evaluate(() => window.screen.availHeight)).toBe(600);
 });
 
-it('should not have touch by default', async ({ page, server }) => {
+it('should not have touch by default', async ({ page, server, browserName, platform }) => {
   await page.goto(server.PREFIX + '/mobile.html');
   expect(await page.evaluate(() => 'ontouchstart' in window)).toBe(false);
-  await page.goto(server.PREFIX + '/detect-touch.html');
-  expect(await page.evaluate(() => document.body.textContent.trim())).toBe('NO');
 });
 
 it('should throw on tap if hasTouch is not enabled', async ({ page }) => {
@@ -142,7 +148,9 @@ browserTest('should report null viewportSize when given null viewport', async ({
   await context.close();
 });
 
-browserTest('should drag with high dpi', async ({ browser, server }) => {
+browserTest('should drag with high dpi', async ({ browser, server, headless }) => {
+  browserTest.fixme(!headless, 'Flaky on all browser in headed');
+
   const page = await browser.newPage({ deviceScaleFactor: 2 });
   await page.goto(server.PREFIX + '/drag-n-drop.html');
   await page.hover('#source');
@@ -178,10 +186,9 @@ browserTest('should be able to get correct orientation angle on non-mobile devic
   await context.close();
 });
 
-it('should set window.screen.orientation.type for mobile devices', async ({ contextFactory, browserName, server, isMac }) => {
+it('should set window.screen.orientation.type for mobile devices', async ({ contextFactory, browserName, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31151' });
   it.skip(browserName === 'firefox', 'Firefox does not support mobile emulation');
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS 12 is frozen and does not support orientation.type override');
   const context = await contextFactory(devices['iPhone 14']);
   const page = await context.newPage();
   await page.goto(server.PREFIX + '/index.html');
diff --git a/tests/library/browsertype-basic.spec.ts b/tests/library/browsertype-basic.spec.ts
index 83be2cb87d74e..b0bc16f328b02 100644
--- a/tests/library/browsertype-basic.spec.ts
+++ b/tests/library/browsertype-basic.spec.ts
@@ -21,7 +21,7 @@ import { playwrightTest as test, expect } from '../config/browserTest';
 test('browserType.executablePath should work', async ({ browserType, channel, mode }) => {
   test.skip(!!channel, 'We skip browser download when testing a channel');
   test.skip(mode.startsWith('service'));
-  test.skip(!!(browserType as any)._defaultLaunchOptions.executablePath, 'Skip with custom executable path');
+  test.skip(!!(browserType as any)._playwright._defaultLaunchOptions.executablePath, 'Skip with custom executable path');
 
   const executablePath = browserType.executablePath();
   expect(fs.existsSync(executablePath)).toBe(true);
diff --git a/tests/library/browsertype-connect.spec.ts b/tests/library/browsertype-connect.spec.ts
index 4a3cdb1efa90e..98dcc6e80703f 100644
--- a/tests/library/browsertype-connect.spec.ts
+++ b/tests/library/browsertype-connect.spec.ts
@@ -16,17 +16,16 @@
  */
 
 import fs from 'fs';
-import os from 'os';
 import type http from 'http';
 import type net from 'net';
 import * as path from 'path';
-import { getUserAgent, getPlaywrightVersion } from '../../packages/playwright-core/lib/utils/userAgent';
+import { getUserAgent, getPlaywrightVersion } from '../../packages/playwright-core/lib/server/utils/userAgent';
 import WebSocket from 'ws';
 import { expect, playwrightTest } from '../config/browserTest';
 import { parseTrace, suppressCertificateWarning } from '../config/utils';
 import formidable from 'formidable';
 import type { Browser, ConnectOptions } from 'playwright-core';
-import { createHttpServer } from '../../packages/playwright-core/lib/utils/network';
+import { createHttpServer } from '../../packages/playwright-core/lib/server/utils/network';
 import { kTargetClosedErrorMessage } from '../config/errors';
 import { RunServer } from '../config/remoteServer';
 
@@ -41,7 +40,7 @@ const test = playwrightTest.extend<ExtraFixtures>({
     await use(async (wsEndpoint, options = {}, redirectPortForTest): Promise<Browser> => {
       (options as any).__testHookRedirectPortForwarding = redirectPortForTest;
       options.headers = {
-        'x-playwright-launch-options': JSON.stringify((browserType as any)._defaultLaunchOptions || {}),
+        'x-playwright-launch-options': JSON.stringify((browserType as any)._playwright._defaultLaunchOptions || {}),
         ...options.headers,
       };
       browser = await browserType.connect(wsEndpoint, options);
@@ -54,7 +53,8 @@ const test = playwrightTest.extend<ExtraFixtures>({
     const server = createHttpServer((req: http.IncomingMessage, res: http.ServerResponse) => {
       res.end('<html><body>from-dummy-server</body></html>');
     });
-    await new Promise<void>(resolve => server.listen(0, resolve));
+    // Only listen on IPv4 to check that we don't try to connect to it via IPv6.
+    await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
     await use((server.address() as net.AddressInfo).port);
     await new Promise<Error>(resolve => server.close(resolve));
   },
@@ -170,16 +170,19 @@ for (const kind of ['launchServer', 'run-server'] as const) {
       await browser.close();
     });
 
-    test('should ignore page.pause when headed', async ({ connect, startRemoteServer, browserType }) => {
-      const headless = (browserType as any)._defaultLaunchOptions.headless;
-      (browserType as any)._defaultLaunchOptions.headless = false;
+    test('should ignore page.pause when headed', async ({ connect, startRemoteServer, browserType, channel }) => {
+      test.skip(channel === 'chromium-headless-shell', 'shell is never headed');
+
+      const headless = (browserType as any)._playwright._defaultLaunchOptions.headless;
+      (browserType as any)._playwright._defaultLaunchOptions.headless = false;
       const remoteServer = await startRemoteServer(kind);
       const browser = await connect(remoteServer.wsEndpoint());
       const browserContext = await browser.newContext();
       const page = await browserContext.newPage();
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await browser.close();
-      (browserType as any)._defaultLaunchOptions.headless = headless;
+      (browserType as any)._playwright._defaultLaunchOptions.headless = headless;
     });
 
     test('should be able to visit ipv6 through localhost', async ({ connect, startRemoteServer, ipV6ServerPort }) => {
@@ -499,6 +502,9 @@ for (const kind of ['launchServer', 'run-server'] as const) {
       await new Promise(r => setTimeout(r, 1000));
       await context.close();
 
+      test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36685' });
+      expect(fs.readdirSync(videosPath), 'recordVideo.dir might be unaccessible in server mode, so /tmp/artifacts should be used').toHaveLength(0);
+
       const savedAsPath = testInfo.outputPath('my-video.webm');
       await page.video().saveAs(savedAsPath);
       expect(fs.existsSync(savedAsPath)).toBeTruthy();
@@ -596,7 +602,7 @@ for (const kind of ['launchServer', 'run-server'] as const) {
       const browser = await browserType.connect({
         wsEndpoint: remoteServer.wsEndpoint(),
         headers: {
-          'x-playwright-launch-options': JSON.stringify((browserType as any)._defaultLaunchOptions || {}),
+          'x-playwright-launch-options': JSON.stringify((browserType as any)._playwright._defaultLaunchOptions || {}),
         },
       });
       const page = await browser.newPage();
@@ -627,14 +633,14 @@ for (const kind of ['launchServer', 'run-server'] as const) {
 
     test('should filter launch options', async ({ connect, startRemoteServer, server, browserType }, testInfo) => {
       const tracesDir = testInfo.outputPath('traces');
-      const oldTracesDir = (browserType as any)._defaultLaunchOptions.tracesDir;
-      (browserType as any)._defaultLaunchOptions.tracesDir = tracesDir;
+      const oldTracesDir = (browserType as any)._playwright._defaultTracesDir;
+      (browserType as any)._playwright._defaultTracesDir = tracesDir;
       const remoteServer = await startRemoteServer(kind);
       const browser = await connect(remoteServer.wsEndpoint());
       const page = await browser.newPage();
       await page.goto(server.EMPTY_PAGE);
       await browser.close();
-      (browserType as any)._defaultLaunchOptions.tracesDir = oldTracesDir;
+      (browserType as any)._playwright._defaultTracesDir = oldTracesDir;
       expect(fs.existsSync(tracesDir)).toBe(false);
     });
 
@@ -678,9 +684,8 @@ for (const kind of ['launchServer', 'run-server'] as const) {
       expect(await response.json()).toEqual({ 'foo': 'bar' });
     });
 
-    test('should upload large file', async ({ connect, startRemoteServer, server, browserName, isMac, mode }, testInfo) => {
+    test('should upload large file', async ({ connect, startRemoteServer, server, mode }, testInfo) => {
       test.skip(mode.startsWith('service'), 'Take it easy on service');
-      test.skip(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen and does not have corresponding protocol features.');
       test.slow();
       const remoteServer = await startRemoteServer(kind);
       const browser = await connect(remoteServer.wsEndpoint());
@@ -762,7 +767,6 @@ for (const kind of ['launchServer', 'run-server'] as const) {
     });
 
     test.describe('socks proxy', () => {
-      test.fixme(({ platform, browserName }) => browserName === 'webkit' && platform === 'win32');
       test.skip(({ mode }) => mode !== 'default');
       test.skip(kind === 'launchServer', 'not supported yet');
 
@@ -792,9 +796,23 @@ for (const kind of ['launchServer', 'run-server'] as const) {
         const remoteServer = await startRemoteServer(kind);
         const browser = await connect(remoteServer.wsEndpoint(), { _exposeNetwork: '*' } as any, dummyServerPort);
         const page = await browser.newPage();
-        await page.goto(`http://127.0.0.1:${examplePort}/foo.html`);
-        expect(await page.content()).toContain('from-dummy-server');
-        expect(reachedOriginalTarget).toBe(false);
+        {
+          await page.setContent('empty');
+          await page.goto(`http://127.0.0.1:${examplePort}/foo.html`);
+          expect(await page.content()).toContain('from-dummy-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          await page.setContent('empty');
+          await page.goto(`http://localhost:${examplePort}/foo.html`);
+          expect(await page.content()).toContain('from-dummy-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          const error = await page.goto(`http://[::1]:${examplePort}/foo.html`).catch(() => 'failed');
+          expect(error).toBe('failed');
+          expect(reachedOriginalTarget).toBe(false);
+        }
       });
 
       test('should proxy ipv6 localhost requests @smoke', async ({ startRemoteServer, server, browserName, connect, platform, ipV6ServerPort }, testInfo) => {
@@ -809,15 +827,26 @@ for (const kind of ['launchServer', 'run-server'] as const) {
         const remoteServer = await startRemoteServer(kind);
         const browser = await connect(remoteServer.wsEndpoint(), { exposeNetwork: '*' }, ipV6ServerPort);
         const page = await browser.newPage();
-        await page.goto(`http://[::1]:${examplePort}/foo.html`);
-        expect(await page.content()).toContain('from-ipv6-server');
-        const page2 = await browser.newPage();
-        await page2.goto(`http://localhost:${examplePort}/foo.html`);
-        expect(await page2.content()).toContain('from-ipv6-server');
-        expect(reachedOriginalTarget).toBe(false);
+        {
+          await page.setContent('empty');
+          await page.goto(`http://[::1]:${examplePort}/foo.html`);
+          expect(await page.content()).toContain('from-ipv6-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          await page.setContent('empty');
+          await page.goto(`http://localhost:${examplePort}/foo.html`);
+          expect(await page.content()).toContain('from-ipv6-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          const error = await page.goto(`http://127.0.0.1:${examplePort}/foo.html`).catch(() => 'failed');
+          expect(error).toBe('failed');
+          expect(reachedOriginalTarget).toBe(false);
+        }
       });
 
-      test('should proxy localhost requests from fetch api', async ({ startRemoteServer, server, browserName, connect, channel, platform, dummyServerPort }, workerInfo) => {
+      test('should proxy requests from fetch api', async ({ startRemoteServer, server, browserName, connect, channel, platform, dummyServerPort }, workerInfo) => {
         test.skip(browserName === 'webkit' && platform === 'darwin', 'no localhost proxying');
 
         let reachedOriginalTarget = false;
@@ -829,10 +858,54 @@ for (const kind of ['launchServer', 'run-server'] as const) {
         const remoteServer = await startRemoteServer(kind);
         const browser = await connect(remoteServer.wsEndpoint(), { exposeNetwork: '*' }, dummyServerPort);
         const page = await browser.newPage();
-        const response = await page.request.get(`http://127.0.0.1:${examplePort}/foo.html`);
-        expect(response.status()).toBe(200);
-        expect(await response.text()).toContain('from-dummy-server');
-        expect(reachedOriginalTarget).toBe(false);
+        {
+          const response = await page.request.get(`http://localhost:${examplePort}/foo.html`);
+          expect(response.status()).toBe(200);
+          expect(await response.text()).toContain('from-dummy-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          const response = await page.request.get(`http://127.0.0.1:${examplePort}/foo.html`);
+          expect(response.status()).toBe(200);
+          expect(await response.text()).toContain('from-dummy-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          const error = await page.request.get(`http://[::1]:${examplePort}/foo.html`).catch(e => 'failed');
+          expect(error).toBe('failed');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+      });
+
+      test('should proxy requests from fetch api over ipv6', async ({ startRemoteServer, server, browserName, connect, channel, platform, ipV6ServerPort }, workerInfo) => {
+        test.skip(browserName === 'webkit' && platform === 'darwin', 'no localhost proxying');
+
+        let reachedOriginalTarget = false;
+        server.setRoute('/foo.html', async (req, res) => {
+          reachedOriginalTarget = true;
+          res.end('<html><body></body></html>');
+        });
+        const examplePort = 20_000 + workerInfo.workerIndex * 3;
+        const remoteServer = await startRemoteServer(kind);
+        const browser = await connect(remoteServer.wsEndpoint(), { exposeNetwork: '*' }, ipV6ServerPort);
+        const page = await browser.newPage();
+        {
+          const response = await page.request.get(`http://localhost:${examplePort}/foo.html`);
+          expect(response.status()).toBe(200);
+          expect(await response.text()).toContain('from-ipv6-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          const response = await page.request.get(`http://[::1]:${examplePort}/foo.html`);
+          expect(response.status()).toBe(200);
+          expect(await response.text()).toContain('from-ipv6-server');
+          expect(reachedOriginalTarget).toBe(false);
+        }
+        {
+          const error = await page.request.get(`http://127.0.0.1:${examplePort}/foo.html`).catch(e => 'failed');
+          expect(error).toBe('failed');
+          expect(reachedOriginalTarget).toBe(false);
+        }
       });
 
       test('should proxy local.playwright requests', async ({ connect, server, dummyServerPort, startRemoteServer }, workerInfo) => {
@@ -967,6 +1040,20 @@ test.describe('launchServer only', () => {
       });
     }
   });
+
+  test('cannot launch another browser', async ({ connect, startRemoteServer }) => {
+    const remoteServer = await startRemoteServer('launchServer');
+    const browser = await connect(remoteServer.wsEndpoint()) as any;
+    await expect(browser._parent.launch({ timeout: 0 })).rejects.toThrowError('Launching more browsers is not allowed.');
+  });
+
+  test('should work with existing browser', async ({ connect, startRemoteServer, mode }) => {
+    test.skip(mode === 'driver', 'Driver mode does not support browserType.launchServer');
+    const remoteServer = await startRemoteServer('launchServer', { existingBrowser: { content: 'hello world' } });
+    const browser = await connect(remoteServer.wsEndpoint());
+    const page = browser.contexts()[0].pages()[0];
+    expect(await page.content()).toContain('hello world');
+  });
 });
 
 test('should refuse connecting when versions do not match', async ({ connect, childProcess }) => {
@@ -978,3 +1065,14 @@ test('should refuse connecting when versions do not match', async ({ connect, ch
   expect(error.message).toContain('server version: v1.2');
   expect(error.message).toContain('client version: v' + getPlaywrightVersion(true));
 });
+
+test('should timeout after redirect when connecting over http', async ({ connect, server }) => {
+  server.setRedirect('/connect/json', '/connect/slow');
+  let aborted = false;
+  server.setRoute('/connect/slow', (req, res) => {
+    req.socket.on('close', () => aborted = true);
+  });
+  const error = await connect(`${server.PREFIX}/connect`, { timeout: 2000, headers: { 'Connection': 'Close' } }).catch(e => e);
+  expect(error.message).toContain('Timeout 2000ms exceeded.');
+  await expect.poll(() => aborted).toBe(true);
+});
diff --git a/tests/library/browsertype-launch-selenium.spec.ts b/tests/library/browsertype-launch-selenium.spec.ts
index d46ca0c5f81ec..b757e5b2aec53 100644
--- a/tests/library/browsertype-launch-selenium.spec.ts
+++ b/tests/library/browsertype-launch-selenium.spec.ts
@@ -45,7 +45,7 @@ test.beforeAll(() => {
 test('selenium grid 3.141.59 standalone chromium', async ({ browserName, childProcess, waitForPort, browserType }, testInfo) => {
   test.skip(browserName !== 'chromium');
 
-  const port = testInfo.workerIndex + 15123;
+  const port = (testInfo.workerIndex * 5) + 15123;
   const grid = childProcess({
     command: ['java', `-Dwebdriver.chrome.driver=${chromeDriver}`, '-jar', standalone_3_141_59, '-config', writeSeleniumConfig(testInfo, port)],
     cwd: __dirname,
@@ -68,7 +68,7 @@ test('selenium grid 3.141.59 standalone chromium', async ({ browserName, childPr
 test('selenium grid 3.141.59 hub + node chromium', async ({ browserName, childProcess, waitForPort, browserType }, testInfo) => {
   test.skip(browserName !== 'chromium');
 
-  const port = testInfo.workerIndex + 15123;
+  const port = (testInfo.workerIndex * 5) + 15123;
   const hub = childProcess({
     command: ['java', '-jar', standalone_3_141_59, '-role', 'hub', '-port', String(port)],
     cwd: __dirname,
@@ -101,7 +101,7 @@ test('selenium grid 3.141.59 hub + node chromium', async ({ browserName, childPr
 test('selenium grid 4.8.3 standalone chromium', async ({ browserName, childProcess, waitForPort, browserType }, testInfo) => {
   test.skip(browserName !== 'chromium');
 
-  const port = testInfo.workerIndex + 15123;
+  const port = (testInfo.workerIndex * 5) + 15123;
   const grid = childProcess({
     command: ['java', `-Dwebdriver.chrome.driver=${chromeDriver}`, '-jar', selenium_4_8_3, 'standalone', '--config', writeSeleniumConfig(testInfo, port)],
     cwd: __dirname,
@@ -124,7 +124,7 @@ test('selenium grid 4.8.3 standalone chromium', async ({ browserName, childProce
 test('selenium grid 4.8.3 hub + node chromium', async ({ browserName, childProcess, waitForPort, browserType }, testInfo) => {
   test.skip(browserName !== 'chromium');
 
-  const port = testInfo.workerIndex + 15123;
+  const port = (testInfo.workerIndex * 5) + 15123;
   const hub = childProcess({
     command: ['java', '-jar', selenium_4_8_3, 'hub', '--port', String(port)],
     cwd: __dirname,
@@ -156,7 +156,7 @@ test('selenium grid 4.8.3 hub + node chromium', async ({ browserName, childProce
 test('selenium grid 4.8.3 standalone chromium broken driver', async ({ browserName, childProcess, waitForPort, browserType }, testInfo) => {
   test.skip(browserName !== 'chromium');
 
-  const port = testInfo.workerIndex + 15123;
+  const port = (testInfo.workerIndex * 5) + 15123;
   const grid = childProcess({
     command: ['java', `-Dwebdriver.chrome.driver=${brokenDriver}`, '-jar', selenium_4_8_3, 'standalone', '--config', writeSeleniumConfig(testInfo, port)],
     cwd: __dirname,
@@ -181,7 +181,7 @@ test('selenium grid 3.141.59 standalone non-chromium', async ({ browserName, bro
 test('selenium grid 3.141.59 standalone chromium through run-driver', async ({ browserName, childProcess, waitForPort }, testInfo) => {
   test.skip(browserName !== 'chromium');
 
-  const port = testInfo.workerIndex + 15123;
+  const port = (testInfo.workerIndex * 5) + 15123;
   const grid = childProcess({
     command: ['java', `-Dwebdriver.chrome.driver=${chromeDriver}`, '-jar', standalone_3_141_59, '-config', writeSeleniumConfig(testInfo, port)],
     cwd: __dirname,
diff --git a/tests/library/browsertype-launch-server.spec.ts b/tests/library/browsertype-launch-server.spec.ts
index f56d9d500e4d1..fed973dde57d1 100644
--- a/tests/library/browsertype-launch-server.spec.ts
+++ b/tests/library/browsertype-launch-server.spec.ts
@@ -26,6 +26,10 @@ it.describe('launch server', () => {
     await browserServer.close();
   });
 
+  it('should validate options', async ({ browserType }) => {
+    await expect(browserType.launchServer({ channel: null })).rejects.toThrow(/channel: expected string, got object/);
+  });
+
   it('should work with host', async ({ browserType }) => {
     const host = '0.0.0.0';
     const browserServer = await browserType.launchServer({ host });
diff --git a/tests/library/browsertype-launch.spec.ts b/tests/library/browsertype-launch.spec.ts
index 011bc8a50d865..5e1c202f0cadc 100644
--- a/tests/library/browsertype-launch.spec.ts
+++ b/tests/library/browsertype-launch.spec.ts
@@ -24,7 +24,7 @@ it('should reject all promises when browser is closed', async ({ browserType })
   const page = await (await browser.newContext()).newPage();
   let error: Error | undefined;
   const neverResolves = page.evaluate(() => new Promise(r => {})).catch(e => error = e);
-  await page.evaluate(() => new Promise(f => window.builtinSetTimeout(f, 0)));
+  await page.evaluate(() => new Promise(f => window.builtins.setTimeout(f, 0)));
   await browser.close();
   await neverResolves;
   // WebKit under task-set -c 1 is giving browser, rest are giving target.
@@ -130,9 +130,8 @@ it('should be callable twice', async ({ browserType }) => {
   await browser.close();
 });
 
-it('should allow await using', async ({ browserType }) => {
-  const nodeVersion = +process.versions.node.split('.')[0];
-  it.skip(nodeVersion < 18);
+it('should allow await using', async ({ browserType, nodeVersion }) => {
+  it.skip(nodeVersion.major < 18);
 
   let b: Browser;
   let c: BrowserContext;
diff --git a/tests/library/capabilities.spec.ts b/tests/library/capabilities.spec.ts
index 60f09d49e9dc6..7332b70985f41 100644
--- a/tests/library/capabilities.spec.ts
+++ b/tests/library/capabilities.spec.ts
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-import os from 'os';
 import url from 'url';
 import { contextTest as it, expect } from '../config/browserTest';
-import { hostPlatform } from '../../packages/playwright-core/src/utils/hostPlatform';
+import { hostPlatform } from '../../packages/playwright-core/src/server/utils/hostPlatform';
 
-it('SharedArrayBuffer should work @smoke', async function({ contextFactory, httpsServer, isMac, browserName }) {
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS 12 is frozen and does not support SharedArrayBuffer');
+it('SharedArrayBuffer should work @smoke', async function({ contextFactory, httpsServer }) {
   const context = await contextFactory({ ignoreHTTPSErrors: true });
   const page = await context.newPage();
   httpsServer.setRoute('/sharedarraybuffer', (req, res) => {
@@ -32,22 +30,21 @@ it('SharedArrayBuffer should work @smoke', async function({ contextFactory, http
   expect(await page.evaluate(() => typeof SharedArrayBuffer)).toBe('function');
 });
 
-it('Web Assembly should work @smoke', async ({ page, server, browserName, platform }) => {
-  it.fixme(browserName === 'webkit' && platform === 'win32', 'Windows JIT is disabled: https://bugs.webkit.org/show_bug.cgi?id=273854');
+it('Web Assembly should work @smoke', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/wasm/table2.html');
   expect(await page.evaluate('loadTable()')).toBe('42, 83');
 });
 
 it('WebSocket should work @smoke', async ({ page, server }) => {
   server.sendOnWebSocketConnection('incoming');
-  const value = await page.evaluate(port => {
+  const value = await page.evaluate(host => {
     let cb;
     const result = new Promise(f => cb = f);
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('message', data => { ws.close(); cb(data.data); });
     ws.addEventListener('error', error => cb('Error'));
     return result;
-  }, server.PORT);
+  }, server.HOST);
   expect(value).toBe('incoming');
 });
 
@@ -65,13 +62,9 @@ it('should respect CSP @smoke', async ({ page, server }) => {
   expect(await page.evaluate(() => window['testStatus'])).toBe('SUCCESS');
 });
 
-it('should play video @smoke', async ({ page, asset, browserName, platform, mode }) => {
-  // TODO: the test passes on Windows locally but fails on GitHub Action bot,
-  // apparently due to a Media Pack issue in the Windows Server.
-  // Also the test is very flaky on Linux WebKit.
-  it.fixme(browserName === 'webkit' && platform !== 'darwin');
-  it.fixme(browserName === 'firefox', 'https://github.com/microsoft/playwright/issues/5721');
-  it.fixme(browserName === 'webkit' && platform === 'darwin' && parseInt(os.release(), 10) === 20, 'Does not work on BigSur');
+it('should play video @smoke', async ({ page, asset, browserName, isWindows, isLinux, mode }) => {
+  it.skip(browserName === 'webkit' && isWindows, 'passes locally but fails on GitHub Action bot, apparently due to a Media Pack issue in the Windows Server');
+  it.fixme(browserName === 'firefox' && isLinux, 'https://github.com/microsoft/playwright/issues/5721');
   it.skip(mode.startsWith('service'));
 
   // Safari only plays mp4 so we test WebKit with an .mp4 clip.
@@ -84,9 +77,8 @@ it('should play video @smoke', async ({ page, asset, browserName, platform, mode
   await page.$eval('video', v => v.pause());
 });
 
-it('should play webm video @smoke', async ({ page, asset, browserName, platform, mode }) => {
-  it.fixme(browserName === 'webkit' && platform === 'darwin' && parseInt(os.release(), 10) === 20, 'Does not work on BigSur');
-  it.fixme(browserName === 'webkit' && platform === 'win32');
+it('should play webm video @smoke', async ({ page, asset, browserName, platform, macVersion, mode }) => {
+  it.skip(browserName === 'webkit' && platform === 'win32', 'not supported');
   it.skip(mode.startsWith('service'));
 
   const absolutePath = asset('video_webm.html');
@@ -98,8 +90,6 @@ it('should play webm video @smoke', async ({ page, asset, browserName, platform,
 });
 
 it('should play audio @smoke', async ({ page, server, browserName, platform }) => {
-  it.fixme(browserName === 'firefox' && platform === 'win32', 'https://github.com/microsoft/playwright/issues/10887');
-  it.fixme(browserName === 'firefox' && platform === 'linux', 'https://github.com/microsoft/playwright/issues/10887');
   it.fixme(browserName === 'webkit' && platform === 'win32', 'https://github.com/microsoft/playwright/issues/10892');
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`<audio src="${server.PREFIX}/example.mp3"></audio>`);
@@ -109,8 +99,7 @@ it('should play audio @smoke', async ({ page, server, browserName, platform }) =
   expect(await page.$eval('audio', e => e.currentTime)).toBeGreaterThan(0.2);
 });
 
-it('should support webgl @smoke', async ({ page, browserName, platform }) => {
-  it.fixme(browserName === 'chromium' && platform === 'darwin' && os.arch() === 'arm64', 'SwiftShader is not available on macOS-arm64 - https://github.com/microsoft/playwright/issues/28216');
+it('should support webgl @smoke', async ({ page }) => {
   const hasWebGL = await page.evaluate(() => {
     const canvas = document.createElement('canvas');
     return !!canvas.getContext('webgl');
@@ -118,11 +107,8 @@ it('should support webgl @smoke', async ({ page, browserName, platform }) => {
   expect(hasWebGL).toBe(true);
 });
 
-it('should support webgl 2 @smoke', async ({ page, browserName, headless, isWindows, platform }) => {
-  it.skip(browserName === 'webkit', 'WebKit doesn\'t have webgl2 enabled yet upstream.');
+it('should support webgl 2 @smoke', async ({ page, browserName, isWindows }) => {
   it.fixme(browserName === 'firefox' && isWindows);
-  it.fixme(browserName === 'chromium' && !headless, 'chromium doesn\'t like webgl2 when running under xvfb');
-  it.fixme(browserName === 'chromium' && platform === 'darwin' && os.arch() === 'arm64', 'SwiftShader is not available on macOS-arm64 - https://github.com/microsoft/playwright/issues/28216');
 
   const hasWebGL2 = await page.evaluate(() => {
     const canvas = document.createElement('canvas');
@@ -133,21 +119,21 @@ it('should support webgl 2 @smoke', async ({ page, browserName, headless, isWind
 
 it('should not crash on page with mp4 @smoke', async ({ page, server, platform, browserName }) => {
   it.fixme(browserName === 'webkit' && platform === 'win32', 'https://github.com/microsoft/playwright/issues/11009, times out in setContent');
-  it.fixme(browserName === 'firefox', 'https://bugzilla.mozilla.org/show_bug.cgi?id=1697004');
   await page.setContent(`<video><source src="${server.PREFIX}/movie.mp4"/></video>`);
   await page.waitForTimeout(1000);
 });
 
 it('should not crash on showDirectoryPicker', async ({ page, server, browserName, browserMajorVersion }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/7339' });
-  it.skip(browserName === 'chromium' && browserMajorVersion < 99, 'Fixed in Chromium r956769');
   it.skip(browserName !== 'chromium', 'showDirectoryPicker is only available in Chromium');
   await page.goto(server.EMPTY_PAGE);
+  // "User activation is required to show a file picker." - so we click first.
+  await page.locator('body').click();
   page.evaluate(async () => {
     const dir = await (window as any).showDirectoryPicker();
     return dir.name;
     // In headless it throws (aborted), in headed it stalls (Test ended) and waits for the picker to be accepted.
-  }).catch(e => expect(e.message).toMatch(/((DOMException|AbortError): The user aborted a request|Test ended)/));
+  }).catch(e => expect(e.message).toMatch(/((DOMException|AbortError): .*The user aborted a request|Test ended)/));
   // The dialog will not be accepted, so we just wait for some time to
   // to give the browser a chance to crash.
   await page.waitForTimeout(3_000);
@@ -155,7 +141,6 @@ it('should not crash on showDirectoryPicker', async ({ page, server, browserName
 
 it('should not crash on storage.getDirectory()', async ({ page, server, browserName, isMac }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/18235' });
-  it.skip(browserName === 'firefox', 'navigator.storage.getDirectory is not a function');
   await page.goto(server.EMPTY_PAGE);
   const error = await page.evaluate(async () => {
     const dir = await navigator.storage.getDirectory();
@@ -240,9 +225,8 @@ it('make sure that XMLHttpRequest upload events are emitted correctly', async ({
   expect(events).toEqual(['loadstart', 'progress', 'load', 'loadend']);
 });
 
-it('loading in HTMLImageElement.prototype', async ({ page, server, browserName, isMac }) => {
+it('loading in HTMLImageElement.prototype', async ({ page, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22738' });
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 21, 'macOS 11 is frozen');
   await page.goto(server.EMPTY_PAGE);
   const defined = await page.evaluate(() => 'loading' in HTMLImageElement.prototype);
   expect(defined).toBeTruthy();
@@ -257,9 +241,8 @@ it('window.GestureEvent in WebKit', async ({ page, server, browserName }) => {
   expect(type).toBe(browserName === 'webkit' ? 'function' : 'undefined');
 });
 
-it('requestFullscreen', async ({ page, server, browserName, headless, isLinux }) => {
+it('requestFullscreen', async ({ page, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22832' });
-  it.fixme(browserName === 'chromium' && headless, 'fullscreenchange is not fired in headless Chromium');
   await page.goto(server.EMPTY_PAGE);
   await page.evaluate(() => {
     const result = new Promise(resolve => document.addEventListener('fullscreenchange', resolve));
@@ -275,7 +258,7 @@ it('requestFullscreen', async ({ page, server, browserName, headless, isLinux })
   expect(await page.evaluate(() => !!document.fullscreenElement)).toBeFalsy();
 });
 
-it('should send no Content-Length header for GET requests with a Content-Type', async ({ page, server, browserName }) => {
+it('should send no Content-Length header for GET requests with a Content-Type', async ({ page, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22569' });
   await page.goto(server.EMPTY_PAGE);
   const [request] = await Promise.all([
@@ -290,7 +273,6 @@ it('should send no Content-Length header for GET requests with a Content-Type',
 
 it('Intl.ListFormat should work', async ({ page, server, browserName }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23978' });
-  it.skip(browserName === 'webkit' && hostPlatform.startsWith('ubuntu20.04'), 'libicu is too old and WebKit disables Intl.ListFormat by default then');
   await page.goto(server.EMPTY_PAGE);
   const formatted = await page.evaluate(() => {
     const data = ['first', 'second', 'third'];
@@ -399,3 +381,106 @@ it('service worker should register in an iframe', async ({ page, server }) => {
   });
   expect(response).toBe('responseFromServiceWorker');
 });
+
+it('should be able to render avif images', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/32673',
+  }
+}, async ({ page, server, browserName, platform }) => {
+  it.fixme(browserName === 'webkit' && platform === 'win32');
+  it.skip(browserName === 'webkit' && hostPlatform.startsWith('ubuntu20.04'), 'Ubuntu 20.04 is frozen');
+  it.skip(browserName === 'webkit' && hostPlatform.startsWith('debian11'), 'Debian 11 is too old');
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`<img src="${server.PREFIX}/rgb.avif" onerror="window.error = true">`);
+  await expect.poll(() => page.locator('img').boundingBox()).toEqual(expect.objectContaining({
+    width: 128,
+    height: 128,
+  }));
+  expect(await page.evaluate(() => (window as any).error)).toBe(undefined);
+});
+
+it('should not crash when clicking a label with a <input type="file"/>', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/33257'
+  }
+}, async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <label>
+        A second file
+        <input type="file" />
+      </label>
+    </form>
+  `);
+  const fileChooserPromise = page.waitForEvent('filechooser');
+  await page.getByText('A second file').click();
+  const fileChooser = await fileChooserPromise;
+  expect(fileChooser.page()).toBe(page);
+});
+
+it('should not crash when clicking a color input', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/33864'
+  }
+}, async ({ page }) => {
+
+  await page.setContent('<input type="color">');
+  const input = page.locator('input');
+
+  await expect(input).toBeVisible();
+  await input.click();
+  await expect(input).toBeVisible();
+});
+
+it('should not auto play audio', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/33590'
+  }
+}, async ({ page, browserName, isWindows }) => {
+  it.fixme(browserName === 'webkit' && isWindows);
+  it.skip(process.env.PW_CLOCK === 'frozen', 'no way to inject real setTimeout');
+  await page.route('**/*', async route => {
+    await route.fulfill({
+      status: 200,
+      contentType: 'text/html',
+      body: `
+      <script>
+        async function onLoad() {
+          const log = document.getElementById('log');
+          const audioContext = new AudioContext();
+          const gainNode = new GainNode(audioContext);
+          gainNode.connect(audioContext.destination);
+          gainNode.gain.value = 0.025;
+          const sineNode = new OscillatorNode(audioContext);
+          sineNode.connect(gainNode);
+          sineNode.start();
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+          log.innerHTML = 'State: ' + audioContext.state;
+        }
+      </script>
+      <body onload="onLoad()">
+      <div id="log"></div>
+      </body>`,
+    });
+  });
+  await page.goto('http://127.0.0.1/audio.html');
+  await expect(page.locator('#log')).toHaveText('State: suspended');
+});
+
+it('should not crash on feature detection for PublicKeyCredential', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/35433'
+  }
+}, async ({ page, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+  await page.evaluate(async () => {
+    await PublicKeyCredential.getClientCapabilities();
+    await PublicKeyCredential.isConditionalMediationAvailable();
+    await PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable();
+  });
+});
diff --git a/tests/library/channels.spec.ts b/tests/library/channels.spec.ts
index 44ad5e09431f5..827f9fe0b9ec2 100644
--- a/tests/library/channels.spec.ts
+++ b/tests/library/channels.spec.ts
@@ -45,13 +45,14 @@ it('should scope context handles', async ({ browserType, server, expectScopeStat
       { _guid: 'android', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [
         { _guid: 'browser', objects: [] }
       ] },
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   };
   expectScopeState(browser, GOLDEN_PRECONDITION);
@@ -67,6 +68,8 @@ it('should scope context handles', async ({ browserType, server, expectScopeStat
       { _guid: 'android', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [
         { _guid: 'browser', objects: [
           { _guid: 'browser-context', objects: [
@@ -84,7 +87,6 @@ it('should scope context handles', async ({ browserType, server, expectScopeStat
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   });
 
@@ -103,13 +105,14 @@ it('should scope CDPSession handles', async ({ browserType, browserName, expectS
       { _guid: 'android', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [
         { _guid: 'browser', objects: [] }
       ] },
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   };
   expectScopeState(browserType, GOLDEN_PRECONDITION);
@@ -121,6 +124,8 @@ it('should scope CDPSession handles', async ({ browserType, browserName, expectS
       { _guid: 'android', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [
         { _guid: 'browser', objects: [
           { _guid: 'cdp-session', objects: [] },
@@ -129,7 +134,6 @@ it('should scope CDPSession handles', async ({ browserType, browserName, expectS
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   });
 
@@ -147,10 +151,11 @@ it('should scope browser handles', async ({ browserType, expectScopeState }) =>
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   };
   expectScopeState(browserType, GOLDEN_PRECONDITION);
@@ -163,6 +168,8 @@ it('should scope browser handles', async ({ browserType, expectScopeState }) =>
       { _guid: 'android', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [
         {
           _guid: 'browser', objects: [
@@ -177,7 +184,6 @@ it('should scope browser handles', async ({ browserType, expectScopeState }) =>
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   });
 
@@ -199,6 +205,8 @@ it('should not generate dispatchers for subresources w/o listeners', async ({ pa
       { _guid: 'android', objects: [] },
       { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
+      { _guid: 'browser-type', objects: [] },
       { _guid: 'browser-type', objects: [
         {
           _guid: 'browser', objects: [
@@ -220,12 +228,11 @@ it('should not generate dispatchers for subresources w/o listeners', async ({ pa
       { _guid: 'electron', objects: [] },
       { _guid: 'localUtils', objects: [] },
       { _guid: 'Playwright', objects: [] },
-      { _guid: 'selectors', objects: [] },
     ]
   });
 });
 
-it('should work with the domain module', async ({ browserType, server, browserName }) => {
+it('should work with the domain module', async ({ browserType, server, browserName, channel }) => {
   const local = domain.create();
   local.run(() => { });
   let err;
@@ -241,14 +248,14 @@ it('should work with the domain module', async ({ browserType, server, browserNa
   let callback;
   const result = new Promise(f => callback = f);
   page.on('websocket', ws => ws.on('socketerror', callback));
-  void page.evaluate(port => {
-    new WebSocket('ws://localhost:' + port + '/bogus-ws');
-  }, server.PORT);
+  void page.evaluate(host => {
+    new WebSocket('ws://' + host + '/bogus-ws');
+  }, server.HOST);
   const message = await result;
   if (browserName === 'firefox')
     expect(message).toBe('CLOSE_ABNORMAL');
   else
-    expect(message).toContain(': 400');
+    expect(message).toContain(channel?.includes('msedge') ? '' : ': 400');
 
   await browser.close();
 
@@ -278,6 +285,14 @@ it('exposeFunction should not leak', async ({ page, expectScopeState, server })
         '_guid': 'browser-type',
         'objects': [],
       },
+      {
+        '_guid': 'browser-type',
+        'objects': [],
+      },
+      {
+        '_guid': 'browser-type',
+        'objects': [],
+      },
       {
         '_guid': 'browser-type',
         'objects': [
@@ -331,10 +346,6 @@ it('exposeFunction should not leak', async ({ page, expectScopeState, server })
         '_guid': 'Playwright',
         'objects': [],
       },
-      {
-        '_guid': 'selectors',
-        'objects': [],
-      },
     ],
   });
 });
diff --git a/tests/library/chromium/bfcache.spec.ts b/tests/library/chromium/bfcache.spec.ts
new file mode 100644
index 0000000000000..c60f4befaf475
--- /dev/null
+++ b/tests/library/chromium/bfcache.spec.ts
@@ -0,0 +1,37 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 { contextTest as test, expect } from '../../config/browserTest';
+
+test.use({
+  launchOptions: async ({ launchOptions }, use) => {
+    await use({ ...launchOptions, ignoreDefaultArgs: ['--disable-back-forward-cache'] });
+  }
+});
+
+test('bindings should work after restoring from bfcache', async ({ page, server }) => {
+  await page.exposeFunction('add', (a, b) => a + b);
+
+  await page.goto(server.PREFIX + '/cached/bfcached.html');
+  expect(await page.evaluate('window.add(1, 2)')).toBe(3);
+
+  await page.setContent(`<a href='about:blank'}>click me</a>`);
+  await page.click('a');
+
+  await page.goBack({ waitUntil: 'commit' });
+  await page.evaluate('window.didShow');
+  expect(await page.evaluate('window.add(2, 3)')).toBe(5);
+});
diff --git a/tests/library/chromium/chromium.spec.ts b/tests/library/chromium/chromium.spec.ts
index 61aa811dca936..f254ad3cf044e 100644
--- a/tests/library/chromium/chromium.spec.ts
+++ b/tests/library/chromium/chromium.spec.ts
@@ -629,4 +629,34 @@ test.describe('PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1', () => {
     const req = await requestPromise;
     expect(req.headers['x-custom-header']).toBe('custom!');
   });
-});
\ No newline at end of file
+});
+
+test('should throw when connecting twice to an already running persistent context (--remote-debugging-port)', async ({ browserType, createUserDataDir, platform, isHeadlessShell }) => {
+  test.skip(isHeadlessShell, 'Headless shell does not create a ProcessSingleton');
+  test.fixme(platform === 'win32', 'Windows does not print something to the console when the profile is already in use by another instance of Chromium.');
+  const userDataDir = await createUserDataDir();
+  const browser = await browserType.launchPersistentContext(userDataDir, {
+    cdpPort: 9222,
+  } as any);
+  try {
+    const error = await browserType.launchPersistentContext(userDataDir, {
+      cdpPort: 9223,
+    } as any).catch(e => e);
+    expect(error.message).toContain('This usually means that the profile is already in use by another instance of Chromium.');
+  } finally {
+    await browser.close();
+  }
+});
+
+test('should throw when connecting twice to an already running persistent context (--remote-debugging-pipe)', async ({ browserType, createUserDataDir, platform, isHeadlessShell }) => {
+  test.skip(isHeadlessShell, 'Headless shell does not create a ProcessSingleton');
+  test.fixme(platform === 'win32', 'Windows does not print something to the console when the profile is already in use by another instance of Chromium.');
+  const userDataDir = await createUserDataDir();
+  const browser = await browserType.launchPersistentContext(userDataDir);
+  try {
+    const error = await browserType.launchPersistentContext(userDataDir).catch(e => e);
+    expect(error.message).toContain('This usually means that the profile is already in use by another instance of Chromium.');
+  } finally {
+    await browser.close();
+  }
+});
diff --git a/tests/library/chromium/connect-over-cdp.spec.ts b/tests/library/chromium/connect-over-cdp.spec.ts
index a473539e8e178..b5347e2ab74bf 100644
--- a/tests/library/chromium/connect-over-cdp.spec.ts
+++ b/tests/library/chromium/connect-over-cdp.spec.ts
@@ -18,8 +18,9 @@
 import { playwrightTest as test, expect } from '../../config/browserTest';
 import http from 'http';
 import fs from 'fs';
-import { getUserAgent } from '../../../packages/playwright-core/lib/utils/userAgent';
+import { getUserAgent } from '../../../packages/playwright-core/lib/server/utils/userAgent';
 import { suppressCertificateWarning } from '../../config/utils';
+import type { Frame } from '../../../packages/playwright-core/lib/server/frames';
 
 test.skip(({ mode }) => mode === 'service2');
 
@@ -271,6 +272,30 @@ test('should send extra headers with connect request', async ({ browserType, ser
   }
 });
 
+test('should keep URL parameters when adding json/version', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/36097'
+  }
+}, async ({ browserType, server }) => {
+  await Promise.all([
+    server.waitForRequest('/browser/json/version/?foo=bar'),
+    browserType.connectOverCDP(`http://localhost:${server.PORT}/browser/?foo=bar`).catch(() => {})
+  ]);
+});
+
+test('should append /json/version with a slash if there isnt one', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/36378'
+  }
+}, async ({ browserType, server }) => {
+  await Promise.all([
+    server.waitForRequest('/browser/json/version/?foo=bar'),
+    browserType.connectOverCDP(`http://localhost:${server.PORT}/browser?foo=bar`).catch(() => {})
+  ]);
+});
+
 test('should send default User-Agent header with connect request', async ({ browserType, server }, testInfo) => {
   {
     const [request] = await Promise.all([
@@ -409,13 +434,13 @@ test('should connect to an existing cdp session when passed as a first argument'
   }
 });
 
-test('should use proxy with connectOverCDP', async ({ browserType, server, mode }, testInfo) => {
+test('should use proxy with connectOverCDP', async ({ browserType, server }, testInfo) => {
   server.setRoute('/target.html', async (req, res) => {
     res.end('<html><title>Served by the proxy</title></html>');
   });
   const port = 9339 + testInfo.workerIndex;
   const browserServer = await browserType.launch({
-    args: ['--remote-debugging-port=' + port, ...(process.platform === 'win32' ? ['--proxy-server=some-value'] : [])]
+    args: ['--remote-debugging-port=' + port]
   });
   try {
     const cdpBrowser = await browserType.connectOverCDP(`http://127.0.0.1:${port}/`);
@@ -537,3 +562,31 @@ test('should print custom ws close error', async ({ browserType, server }) => {
   const error = await browserType.connectOverCDP(`ws://localhost:${server.PORT}/ws`).catch(e => e);
   expect(error.message).toContain(`Browser logs:\n\nOh my!\n`);
 });
+
+test('should not reuse utility worlds between two clients', async ({ browserType, toImpl }, testInfo) => {
+  const port = 9339 + testInfo.workerIndex;
+  const browserServer = await browserType.launch({
+    args: ['--remote-debugging-port=' + port]
+  });
+  try {
+    const browser1 = await browserType.connectOverCDP(`http://127.0.0.1:${port}/`);
+    const context1 = browser1.contexts()[0];
+    expect(context1.pages().length).toBe(0);
+    const page1 = await context1.newPage();
+    const frameImpl1 = toImpl(page1.mainFrame()) as Frame;
+    await frameImpl1.evaluateExpression('window.foo = 42', { world: 'utility' });
+
+    const browser2 = await browserType.connectOverCDP(`http://127.0.0.1:${port}/`);
+    const context2 = browser2.contexts()[0];
+    const page2 = context2.pages()[0];
+    const frameImpl2 = toImpl(page2.mainFrame()) as Frame;
+    const result = await frameImpl2.evaluateExpression('window.foo', { world: 'utility' });
+
+    await browser1.close();
+    await browser2.close();
+
+    expect(result).toBeUndefined();
+  } finally {
+    await browserServer.close();
+  }
+});
diff --git a/tests/library/chromium/css-coverage.spec.ts b/tests/library/chromium/css-coverage.spec.ts
index 229f8baaa1af1..105558754e246 100644
--- a/tests/library/chromium/css-coverage.spec.ts
+++ b/tests/library/chromium/css-coverage.spec.ts
@@ -135,7 +135,7 @@ it('should work with a recently loaded stylesheet', async function({ page, serve
     link.href = url;
     document.head.appendChild(link);
     await new Promise(x => link.onload = x);
-    await new Promise(f => window.builtinRequestAnimationFrame(f));
+    await new Promise(f => window.builtins.requestAnimationFrame(f));
   }, server.PREFIX + '/csscoverage/stylesheet1.css');
   const coverage = await page.coverage.stopCSSCoverage();
   expect(coverage.length).toBe(1);
diff --git a/tests/library/chromium/extensions.spec.ts b/tests/library/chromium/extensions.spec.ts
new file mode 100644
index 0000000000000..ef6782da43b68
--- /dev/null
+++ b/tests/library/chromium/extensions.spec.ts
@@ -0,0 +1,120 @@
+/**
+ * Copyright 2019 Google Inc. All rights reserved.
+ * Modifications 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 { BrowserType, BrowserContext } from 'playwright-core';
+import { playwrightTest as base, expect } from '../../config/browserTest';
+
+const it = base.extend<{
+  launchPersistentContext: (extensionPath: string, options?: Parameters<BrowserType['launchPersistentContext']>[1]) => Promise<BrowserContext>;
+      }>({
+        launchPersistentContext: async ({ browserType }, use) => {
+          const browsers: BrowserContext[] = [];
+          await use(async (extensionPath, options = {}) => {
+            const extensionOptions = {
+              ...options,
+              args: [
+                `--disable-extensions-except=${extensionPath}`,
+                `--load-extension=${extensionPath}`,
+              ],
+            };
+            return await browserType.launchPersistentContext('', extensionOptions);
+          });
+          await Promise.all(browsers.map(browser => browser.close()));
+        }
+      });
+
+it.skip(({ isHeadlessShell }) => isHeadlessShell, 'Headless Shell has no support for extensions');
+
+it.describe('MV3', () => {
+  it.skip(({ channel }) => channel?.startsWith('chrome'), '--load-extension is not supported in Chrome anymore. https://groups.google.com/a/chromium.org/g/chromium-extensions/c/1-g8EFx2BBY/m/S0ET5wPjCAAJ');
+
+  it('should give access to the service worker', async ({ launchPersistentContext, asset }) => {
+    const extensionPath = asset('extension-mv3-simple');
+    const context = await launchPersistentContext(extensionPath);
+    const serviceWorkers = context.serviceWorkers();
+    const serviceWorker = serviceWorkers.length ? serviceWorkers[0] : await context.waitForEvent('serviceworker');
+    expect(serviceWorker).toBeTruthy();
+    expect(context.serviceWorkers()).toContain(serviceWorker);
+    await expect.poll(() => serviceWorker.evaluate(() => (globalThis as any).MAGIC)).toBe(42);
+    await context.close();
+    expect(context.backgroundPages().length).toBe(0);
+  });
+
+  it('should give access to the service worker when recording video', async ({ launchPersistentContext, asset }, testInfo) => {
+    const extensionPath = asset('extension-mv3-simple');
+    const context = await launchPersistentContext(extensionPath, {
+      recordVideo: {
+        dir: testInfo.outputPath(''),
+      }
+    });
+    const serviceWorkers = context.serviceWorkers();
+    const serviceWorker = serviceWorkers.length ? serviceWorkers[0] : await context.waitForEvent('serviceworker');
+    expect(serviceWorker).toBeTruthy();
+    expect(context.serviceWorkers()).toContain(serviceWorker);
+    await expect.poll(() => serviceWorker.evaluate(() => (globalThis as any).MAGIC)).toBe(42);
+    await context.close();
+  });
+
+  it('should support request/response events in the service worker', async ({ launchPersistentContext, asset, server }) => {
+    it.fixme(true, 'Waiting for https://issues.chromium.org/u/1/issues/407795731 getting fixed.');
+    process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS = '1';
+    server.setRoute('/empty.html', (req, res) => {
+      res.writeHead(200, { 'Content-Type': 'text/html', 'x-response-foobar': 'BarFoo' });
+      res.end(`<span>hello world!</span>`);
+    });
+    const extensionPath = asset('extension-mv3-simple');
+    const context = await launchPersistentContext(extensionPath);
+    const serviceWorkers = context.serviceWorkers();
+    const serviceWorker = serviceWorkers.length ? serviceWorkers[0] : await context.waitForEvent('serviceworker');
+    expect(serviceWorker.url()).toMatch(/chrome-extension\:\/\/.*/);
+    const [request, response] = await Promise.all([
+      context.waitForEvent('request'),
+      context.waitForEvent('response'),
+      serviceWorker.evaluate(url => fetch(url, {
+        method: 'POST',
+        body: 'foobar',
+        headers: { 'X-FOOBAR': 'KEKBAR' }
+      }), server.EMPTY_PAGE),
+    ]);
+    expect(request.url()).toBe(server.EMPTY_PAGE);
+    expect(request.method()).toBe('POST');
+    expect(await request.allHeaders()).toEqual(expect.objectContaining({ 'x-foobar': 'KEKBAR' }));
+    expect(request.postData()).toBe('foobar');
+
+    expect(response.status()).toBe(200);
+    expect(response.url()).toBe(server.EMPTY_PAGE);
+    expect(response.request()).toBe(request);
+    expect(await response.text()).toBe('<span>hello world!</span>');
+    expect(await response.allHeaders()).toEqual(expect.objectContaining({ 'x-response-foobar': 'BarFoo' }));
+
+    await context.close();
+    delete process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS;
+  });
+
+  it('should report console messages from content script', {
+    annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32762' }
+  }, async ({ launchPersistentContext, asset, server }) => {
+    const extensionPath = asset('extension-mv3-with-logging');
+    const context = await launchPersistentContext(extensionPath);
+    const page = await context.newPage();
+    const consolePromise = page.waitForEvent('console', e => e.text().includes('Test console log from a third-party execution context'));
+    await page.goto(server.EMPTY_PAGE);
+    const message = await consolePromise;
+    expect(message.text()).toContain('Test console log from a third-party execution context');
+    await context.close();
+  });
+});
diff --git a/tests/library/chromium/js-coverage.spec.ts b/tests/library/chromium/js-coverage.spec.ts
index 860304d51ca4c..18f21b70fd9d5 100644
--- a/tests/library/chromium/js-coverage.spec.ts
+++ b/tests/library/chromium/js-coverage.spec.ts
@@ -47,8 +47,10 @@ it('shouldn\'t ignore eval() scripts if reportAnonymousScripts is true', async f
   await page.coverage.startJSCoverage({ reportAnonymousScripts: true });
   await page.goto(server.PREFIX + '/jscoverage/eval.html');
   const coverage = await page.coverage.stopJSCoverage();
-  expect(coverage.find(entry => entry.url === '').source).toBe('console.log("foo")');
-  expect(coverage.length).toBe(2);
+  expect(coverage).toContainEqual(expect.objectContaining({
+    url: '',
+    source: 'console.log("foo")',
+  }));
 });
 
 it('should report multiple scripts', async function({ page, server }) {
diff --git a/tests/library/chromium/launcher.spec.ts b/tests/library/chromium/launcher.spec.ts
index eb0fc997adce5..4d03dd2e4ae9a 100644
--- a/tests/library/chromium/launcher.spec.ts
+++ b/tests/library/chromium/launcher.spec.ts
@@ -52,100 +52,6 @@ it('should open devtools when "devtools: true" option is given', async ({ browse
   await browser.close();
 });
 
-it('should return background pages', async ({ browserType, createUserDataDir, asset }) => {
-  const userDataDir = await createUserDataDir();
-  const extensionPath = asset('simple-extension');
-  const extensionOptions = {
-    headless: false,
-    args: [
-      `--disable-extensions-except=${extensionPath}`,
-      `--load-extension=${extensionPath}`,
-    ],
-  };
-  const context = await browserType.launchPersistentContext(userDataDir, extensionOptions);
-  const backgroundPages = context.backgroundPages();
-  const backgroundPage = backgroundPages.length
-    ? backgroundPages[0]
-    : await context.waitForEvent('backgroundpage');
-  expect(backgroundPage).toBeTruthy();
-  expect(context.backgroundPages()).toContain(backgroundPage);
-  expect(context.pages()).not.toContain(backgroundPage);
-  await context.close();
-  expect(context.pages().length).toBe(0);
-  expect(context.backgroundPages().length).toBe(0);
-});
-
-it('should return background pages when recording video', async ({ browserType, createUserDataDir, asset }, testInfo) => {
-  const userDataDir = await createUserDataDir();
-  const extensionPath = asset('simple-extension');
-  const extensionOptions = {
-    headless: false,
-    args: [
-      `--disable-extensions-except=${extensionPath}`,
-      `--load-extension=${extensionPath}`,
-    ],
-    recordVideo: {
-      dir: testInfo.outputPath(''),
-    },
-  };
-  const context = await browserType.launchPersistentContext(userDataDir, extensionOptions);
-  const backgroundPages = context.backgroundPages();
-  const backgroundPage = backgroundPages.length
-    ? backgroundPages[0]
-    : await context.waitForEvent('backgroundpage');
-  expect(backgroundPage).toBeTruthy();
-  expect(context.backgroundPages()).toContain(backgroundPage);
-  expect(context.pages()).not.toContain(backgroundPage);
-  await context.close();
-});
-
-it('should support request/response events when using backgroundPage()', async ({ browserType, createUserDataDir, asset, server }) => {
-  server.setRoute('/empty.html', (req, res) => {
-    res.writeHead(200, { 'Content-Type': 'text/html', 'x-response-foobar': 'BarFoo' });
-    res.end(`<span>hello world!</span>`);
-  });
-  const userDataDir = await createUserDataDir();
-  const extensionPath = asset('simple-extension');
-  const extensionOptions = {
-    headless: false,
-    args: [
-      `--disable-extensions-except=${extensionPath}`,
-      `--load-extension=${extensionPath}`,
-    ],
-  };
-  const context = await browserType.launchPersistentContext(userDataDir, extensionOptions);
-  const backgroundPages = context.backgroundPages();
-  const backgroundPage = backgroundPages.length
-    ? backgroundPages[0]
-    : await context.waitForEvent('backgroundpage');
-  await backgroundPage.waitForURL(/chrome-extension\:\/\/.*/);
-  const [request, response, contextRequest, contextResponse] = await Promise.all([
-    backgroundPage.waitForEvent('request'),
-    backgroundPage.waitForEvent('response'),
-    context.waitForEvent('request'),
-    context.waitForEvent('response'),
-    backgroundPage.evaluate(url => fetch(url, {
-      method: 'POST',
-      body: 'foobar',
-      headers: { 'X-FOOBAR': 'KEKBAR' }
-    }), server.EMPTY_PAGE),
-  ]);
-  expect(request).toBe(contextRequest);
-  expect(response).toBe(contextResponse);
-  expect(request.url()).toBe(server.EMPTY_PAGE);
-  expect(request.method()).toBe('POST');
-  expect(await request.allHeaders()).toEqual(expect.objectContaining({ 'x-foobar': 'KEKBAR' }));
-  expect(request.postData()).toBe('foobar');
-
-  expect(response.status()).toBe(200);
-  expect(response.url()).toBe(server.EMPTY_PAGE);
-  expect(response.request()).toBe(request);
-  expect(await response.text()).toBe('<span>hello world!</span>');
-  expect(await response.allHeaders()).toEqual(expect.objectContaining({ 'x-response-foobar': 'BarFoo' }));
-
-  await context.close();
-});
-
 it('should not create pages automatically', async ({ browserType }) => {
   const browser = await browserType.launch();
   const browserSession = await browser.newBrowserCDPSession();
diff --git a/tests/library/chromium/oopif.spec.ts b/tests/library/chromium/oopif.spec.ts
index 5324e6d15500b..c062239a609e1 100644
--- a/tests/library/chromium/oopif.spec.ts
+++ b/tests/library/chromium/oopif.spec.ts
@@ -25,14 +25,14 @@ it.use({
 
 it('should report oopif frames', async function({ page, browser, server }) {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
 });
 
 it('should handle oopif detach', async function({ page, browser, server }) {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   const frame = page.frames()[1];
   expect(await frame.evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
@@ -46,20 +46,20 @@ it('should handle oopif detach', async function({ page, browser, server }) {
 it('should handle remote -> local -> remote transitions', async function({ page, browser, server }) {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
   await Promise.all([
     page.frames()[1].waitForNavigation(),
     page.evaluate('goLocal()'),
   ]);
   expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.PREFIX + '/grid.html');
-  expect(await countOOPIFs(browser)).toBe(0);
+  await assertOOPIFCount(browser, 0);
   await Promise.all([
     page.frames()[1].waitForNavigation(),
     page.evaluate('goRemote()'),
   ]);
   expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
 });
 
 it('should get the proper viewport', async ({ page, browser, server }) => {
@@ -68,7 +68,7 @@ it('should get the proper viewport', async ({ page, browser, server }) => {
   expect(page.viewportSize()).toEqual({ width: 1280, height: 720 });
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const oopif = page.frames()[1];
   expect(await oopif.evaluate(() => screen.width)).toBe(1280);
   expect(await oopif.evaluate(() => screen.height)).toBe(720);
@@ -86,7 +86,7 @@ it('should get the proper viewport', async ({ page, browser, server }) => {
 it('should expose function', async ({ page, browser, server }) => {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const oopif = page.frames()[1];
   await page.exposeFunction('mul', (a: number, b: number) => a * b);
   const result = await oopif.evaluate(async function() {
@@ -98,7 +98,7 @@ it('should expose function', async ({ page, browser, server }) => {
 it('should emulate media', async ({ page, browser, server }) => {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const oopif = page.frames()[1];
   expect(await oopif.evaluate(() => matchMedia('(prefers-color-scheme: dark)').matches)).toBe(false);
   await page.emulateMedia({ colorScheme: 'dark' });
@@ -108,7 +108,7 @@ it('should emulate media', async ({ page, browser, server }) => {
 it('should emulate offline', async ({ page, browser, server }) => {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const oopif = page.frames()[1];
   expect(await oopif.evaluate(() => navigator.onLine)).toBe(true);
   await page.context().setOffline(true);
@@ -125,7 +125,7 @@ it('should support context options', async ({ browser, server, playwright }) =>
     page.goto(server.PREFIX + '/dynamic-oopif.html'),
   ]);
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const oopif = page.frames()[1];
 
   expect(await oopif.evaluate(() => 'ontouchstart' in window)).toBe(true);
@@ -145,7 +145,7 @@ it('should respect route', async ({ page, browser, server }) => {
   });
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(intercepted).toBe(true);
 });
 
@@ -153,14 +153,14 @@ it('should take screenshot', async ({ page, browser, server }) => {
   await page.setViewportSize({ width: 500, height: 500 });
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   expect(page.frames().length).toBe(2);
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(await page.screenshot()).toMatchSnapshot('screenshot-oopif.png');
 });
 
 it('should load oopif iframes with subresources and route', async function({ page, browser, server }) {
   await page.route('**/*', route => route.continue());
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
 });
 
 it('should report main requests', async function({ page, browser, server }) {
@@ -192,7 +192,7 @@ it('should report main requests', async function({ page, browser, server }) {
   const grandChild = child.childFrames()[0];
   await grandChild.waitForLoadState('domcontentloaded');
 
-  expect(await countOOPIFs(browser)).toBe(2);
+  await assertOOPIFCount(browser, 2);
   expect(requestFrames[0]).toBe(main);
   expect(finishedFrames[0]).toBe(main);
   expect(requestFrames[1]).toBe(child);
@@ -205,7 +205,7 @@ it('should support exposeFunction', async function({ page, browser, server }) {
   await page.context().exposeFunction('dec', (a: number) => a - 1);
   await page.exposeFunction('inc', (a: number) => a + 1);
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   expect(await page.frames()[0].evaluate(() => (window as any)['inc'](3))).toBe(4);
   expect(await page.frames()[1].evaluate(() => (window as any)['inc'](4))).toBe(5);
@@ -217,7 +217,7 @@ it('should support addInitScript', async function({ page, browser, server }) {
   await page.context().addInitScript(() => (window as any)['bar'] = 17);
   await page.addInitScript(() => (window as any)['foo'] = 42);
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   expect(await page.frames()[0].evaluate(() => (window as any)['foo'])).toBe(42);
   expect(await page.frames()[1].evaluate(() => (window as any)['foo'])).toBe(42);
@@ -227,12 +227,13 @@ it('should support addInitScript', async function({ page, browser, server }) {
 // @see https://github.com/microsoft/playwright/issues/1240
 it('should click a button when it overlays oopif', async function({ page, browser, server }) {
   await page.goto(server.PREFIX + '/button-overlay-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   await page.click('button');
   expect(await page.evaluate(() => (window as any)['BUTTON_CLICKED'])).toBe(true);
 });
 
-it('should report google.com frame with headed', async ({ browserType, server }) => {
+it('should report google.com frame with headed', async ({ browserType, server, channel }) => {
+  it.skip(channel === 'chromium-headless-shell', 'Headless Shell does not support headed mode');
   // @see https://github.com/GoogleChrome/puppeteer/issues/2548
   // https://google.com is isolated by default in Chromium embedder.
   const browser = await browserType.launch({ headless: false });
@@ -248,7 +249,7 @@ it('should report google.com frame with headed', async ({ browserType, server })
     return new Promise(x => frame.onload = x);
   });
   await page.waitForSelector('iframe[src="https://google.com/"]');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const urls = page.frames().map(frame => frame.url());
   expect(urls).toEqual([
     server.EMPTY_PAGE,
@@ -260,24 +261,24 @@ it('should report google.com frame with headed', async ({ browserType, server })
 it('ElementHandle.boundingBox() should work', async function({ page, browser, server }) {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
   await page.$eval('iframe', iframe => {
-    iframe.style.width = '500px';
-    iframe.style.height = '500px';
+    iframe.style.width = '520px';
+    iframe.style.height = '520px';
     iframe.style.marginLeft = '42px';
     iframe.style.marginTop = '17px';
   });
   await page.frames()[1].goto(page.frames()[1].url());
 
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const handle1 = await page.frames()[1].$('.box:nth-of-type(13)');
-  expect(await handle1!.boundingBox()).toEqual({ x: 100 + 42, y: 50 + 17, width: 50, height: 50 });
+  await expect.poll(() => handle1!.boundingBox()).toEqual({ x: 100 + 42, y: 50 + 17, width: 50, height: 50 });
 
   await Promise.all([
     page.frames()[1].waitForNavigation(),
     page.evaluate('goLocal()'),
   ]);
-  expect(await countOOPIFs(browser)).toBe(0);
+  await assertOOPIFCount(browser, 0);
   const handle2 = await page.frames()[1].$('.box:nth-of-type(13)');
-  expect(await handle2!.boundingBox()).toEqual({ x: 100 + 42, y: 50 + 17, width: 50, height: 50 });
+  await expect.poll(() => handle2!.boundingBox()).toEqual({ x: 100 + 42, y: 50 + 17, width: 50, height: 50 });
 });
 
 it('should click', async function({ page, browser, server }) {
@@ -290,16 +291,26 @@ it('should click', async function({ page, browser, server }) {
   });
   await page.frames()[1].goto(page.frames()[1].url());
 
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   const handle1 = (await page.frames()[1].$('.box:nth-of-type(13)'))!;
   await handle1.evaluate(div => div.addEventListener('click', () => (window as any)['_clicked'] = true, false));
   await handle1.click();
   expect(await handle1.evaluate(() => (window as any)['_clicked'])).toBe(true);
 });
 
+it('contentFrame should work', async ({ page, browser, server }) => {
+  await page.goto(server.PREFIX + '/dynamic-oopif.html');
+  expect(page.frames().length).toBe(2);
+  await assertOOPIFCount(browser, 1);
+  expect(await page.locator('iframe').contentFrame().locator('div').count()).toBe(200);
+  const oopif = await page.$('iframe');
+  const content = await oopif.contentFrame();
+  expect(await content.locator('div').count()).toBe(200);
+});
+
 it('should allow cdp sessions on oopifs', async function({ page, browser, server }) {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
 
@@ -316,7 +327,7 @@ it('should emit filechooser event for iframe', async ({ page, server, browser })
   // Add listener before OOPIF is created.
   const chooserPromise = page.waitForEvent('filechooser');
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   const frame = page.frames()[1];
   await frame.setContent(`<input type=file>`);
@@ -330,7 +341,7 @@ it('should emit filechooser event for iframe', async ({ page, server, browser })
 it('should be able to click in iframe', async ({ page, server, browser }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28023' });
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   expect(page.frames().length).toBe(2);
   const frame = page.frames()[1];
   await frame.setContent(`<button onclick="console.log('clicked')">OK</button>`);
@@ -343,7 +354,7 @@ it('should be able to click in iframe', async ({ page, server, browser }) => {
 
 it('should not throw on exposeFunction when oopif detaches', async ({ page, browser, server }) => {
   await page.goto(server.PREFIX + '/dynamic-oopif.html');
-  expect(await countOOPIFs(browser)).toBe(1);
+  await assertOOPIFCount(browser, 1);
   await Promise.all([
     page.exposeFunction('myFunc', () => 2022),
     page.evaluate(() => document.querySelector('iframe')!.remove()),
@@ -360,6 +371,29 @@ it('should intercept response body from oopif', async function({ page, browser,
   expect(await response.text()).toBeTruthy();
 });
 
+it.fail('should allow to re-connect to OOPIFs with CDP when iframes were there already', async ({ browserType, server }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36095' });
+
+  const cdpPort = 10123 + it.info().parallelIndex * 4;
+  const hostBrowser = await browserType.launch({ cdpPort } as any);
+  const hostPage = await hostBrowser.newPage();
+  await hostPage.goto(server.PREFIX + '/dynamic-oopif.html');
+
+  const browser = await browserType.connectOverCDP(`http://localhost:${cdpPort}`);
+  const page = browser.contexts()[0].pages()[0];
+  // can be fixed by reloading first
+  // await page.reload();
+  expect(page.frames().length).toBe(2);
+  await assertOOPIFCount(browser, 1);
+  expect(await page.frames()[1].evaluate(() => '' + location.href)).toBe(server.CROSS_PROCESS_PREFIX + '/grid.html');
+});
+
+async function assertOOPIFCount(browser: Browser, count: number) {
+  if (browser.browserType().name() !== 'chromium')
+    return;
+  expect(await countOOPIFs(browser)).toBe(count);
+}
+
 async function countOOPIFs(browser: Browser) {
   const browserSession = await browser.newBrowserCDPSession();
   const oopifs = [];
diff --git a/tests/library/chromium/tracing.spec.ts b/tests/library/chromium/tracing.spec.ts
index a39f21ba274f6..f933ebbe2ce06 100644
--- a/tests/library/chromium/tracing.spec.ts
+++ b/tests/library/chromium/tracing.spec.ts
@@ -17,6 +17,7 @@
 import { browserTest as it, expect } from '../../config/browserTest';
 import fs from 'fs';
 import path from 'path';
+import { rafraf } from '../../page/pageTest';
 
 it('should output a trace', async ({ browser, server }, testInfo) => {
   let warning = null;
@@ -49,11 +50,16 @@ it('should create directories as needed', async ({ browser, server }, testInfo)
 it('should run with custom categories if provided', async ({ browser }, testInfo) => {
   const page = await browser.newPage();
   const outputTraceFile = testInfo.outputPath(path.join(`trace.json`));
-  await browser.startTracing(page, { path: outputTraceFile, categories: ['disabled-by-default-v8.cpu_profiler.hires'] });
+  await browser.startTracing(page, { path: outputTraceFile, categories: ['disabled-by-default-cc.debug'] });
+  await rafraf(page);
   await browser.stopTracing();
 
   const traceJson = JSON.parse(fs.readFileSync(outputTraceFile).toString());
-  expect(traceJson.metadata['trace-config']).toContain('disabled-by-default-v8.cpu_profiler.hires');
+  expect(
+      // NOTE: trace-config is deprecated as per http://crrev.com/c/6628182
+      traceJson.metadata['trace-config']?.includes('disabled-by-default-cc.debug') ||
+      traceJson.traceEvents.filter(event => event.cat === 'disabled-by-default-cc.debug').length > 0
+  ).toBe(true);
   await page.close();
 });
 
@@ -94,6 +100,7 @@ it('should support a buffer without a path', async ({ browser, server }) => {
   const page = await browser.newPage();
   await browser.startTracing(page, { screenshots: true });
   await page.goto(server.PREFIX + '/grid.html');
+  await rafraf(page);
   const trace = await browser.stopTracing();
   expect(trace.toString()).toContain('screenshot');
   await page.close();
diff --git a/tests/library/client-certificates.spec.ts b/tests/library/client-certificates.spec.ts
index 9f055a678b68d..b7546c47eea25 100644
--- a/tests/library/client-certificates.spec.ts
+++ b/tests/library/client-certificates.spec.ts
@@ -15,11 +15,15 @@
  */
 
 import fs from 'fs';
+import tls from 'tls';
+import type https from 'https';
+import zlib from 'zlib';
 import type http2 from 'http2';
 import type http from 'http';
 import { expect, playwrightTest as base } from '../config/browserTest';
 import type net from 'net';
 import type { BrowserContextOptions } from 'packages/playwright-test';
+import { setupSocksForwardingServer } from '../config/proxy';
 const { createHttpsServer, createHttp2Server } = require('../../packages/playwright-core/lib/utils');
 
 type TestOptions = {
@@ -63,8 +67,8 @@ const test = base.extend<TestOptions>({
         }
         res.end(parts.map(({ key, value }) => `<div data-testid="${key}">${value}</div>`).join(''));
       });
-      await new Promise<void>(f => server.listen(0, 'localhost', () => f()));
-      const host = options?.useFakeLocalhost ? 'local.playwright' : 'localhost';
+      await new Promise<void>(f => server.listen(0, '127.0.0.1', () => f()));
+      const host = options?.useFakeLocalhost ? 'local.playwright' : '127.0.0.1';
       return `https://${host}:${(server.address() as net.AddressInfo).port}/`;
     });
     if (server)
@@ -72,17 +76,6 @@ const test = base.extend<TestOptions>({
   },
 });
 
-test.use({
-  launchOptions: async ({ launchOptions }, use) => {
-    await use({
-      ...launchOptions,
-      proxy: { server: 'per-context' }
-    });
-  }
-});
-
-test.skip(({ mode }) => mode !== 'default');
-
 const kDummyFileName = __filename;
 const kValidationSubTests: [BrowserContextOptions, string][] = [
   [{ clientCertificates: [{ origin: 'test' }] }, 'None of cert, key, passphrase or pfx is specified'],
@@ -95,14 +88,6 @@ const kValidationSubTests: [BrowserContextOptions, string][] = [
       passphrase: kDummyFileName,
     }]
   }, 'pfx is specified together with cert, key or passphrase'],
-  [{
-    proxy: { server: 'http://localhost:8080' },
-    clientCertificates: [{
-      origin: 'test',
-      certPath: kDummyFileName,
-      keyPath: kDummyFileName,
-    }]
-  }, 'Cannot specify both proxy and clientCertificates'],
 ];
 
 test.describe('fetch', () => {
@@ -113,7 +98,7 @@ test.describe('fetch', () => {
 
   test('should fail with no client certificates provided', async ({ playwright, startCCServer }) => {
     const serverURL = await startCCServer();
-    const request = await playwright.request.newContext();
+    const request = await playwright.request.newContext({ ignoreHTTPSErrors: true });
     const response = await request.get(serverURL);
     expect(response.status()).toBe(401);
     expect(await response.text()).toContain('Sorry, but you need to provide a client certificate to continue.');
@@ -122,6 +107,7 @@ test.describe('fetch', () => {
 
   test('should keep supporting http', async ({ playwright, server, asset }) => {
     const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(server.PREFIX).origin,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
@@ -138,6 +124,7 @@ test.describe('fetch', () => {
   test('should throw with untrusted client certs', async ({ playwright, startCCServer, asset }) => {
     const serverURL = await startCCServer();
     const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/self-signed/cert.pem'),
@@ -154,6 +141,7 @@ test.describe('fetch', () => {
   test('pass with trusted client certificates', async ({ playwright, startCCServer, asset }) => {
     const serverURL = await startCCServer();
     const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
@@ -167,9 +155,103 @@ test.describe('fetch', () => {
     await request.dispose();
   });
 
+  test('pass with trusted client certificates in pfx format', async ({ playwright, startCCServer, asset }) => {
+    const serverURL = await startCCServer();
+    const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfxPath: asset('client-certificates/client/trusted/cert.pfx'),
+        passphrase: 'secure'
+      }],
+    });
+    const response = await request.get(serverURL);
+    expect(response.url()).toBe(serverURL);
+    expect(response.status()).toBe(200);
+    expect(await response.text()).toContain('Hello Alice, your certificate was issued by localhost!');
+    await request.dispose();
+  });
+
+  test('pass with trusted client certificates and when a http proxy is used', async ({ playwright, startCCServer, proxyServer, asset }) => {
+    const serverURL = await startCCServer();
+    proxyServer.forwardTo(parseInt(new URL(serverURL).port, 10), { allowConnectRequests: true });
+    const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+      proxy: { server: `localhost:${proxyServer.PORT}` }
+    });
+    expect(proxyServer.connectHosts).toEqual([]);
+    const response = await request.get(serverURL);
+    expect(proxyServer.connectHosts).toEqual([new URL(serverURL).host]);
+    expect(response.url()).toBe(serverURL);
+    expect(response.status()).toBe(200);
+    expect(await response.text()).toContain('Hello Alice, your certificate was issued by localhost!');
+    await request.dispose();
+  });
+
+  test('pass with trusted client certificates and when a socks proxy is used', async ({ playwright, startCCServer, asset }) => {
+    const serverURL = await startCCServer();
+    const serverPort = parseInt(new URL(serverURL).port, 10);
+    const { proxyServerAddr, closeProxyServer, connectHosts } = await setupSocksForwardingServer({
+      port: test.info().workerIndex + 2048 + 2,
+      forwardPort: serverPort,
+      allowedTargetPort: serverPort,
+    });
+    const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+      proxy: { server: proxyServerAddr }
+    });
+    expect(connectHosts).toEqual([]);
+    const response = await request.get(serverURL);
+    expect(connectHosts).toEqual([new URL(serverURL).host]);
+    expect(response.url()).toBe(serverURL);
+    expect(response.status()).toBe(200);
+    expect(await response.text()).toContain('Hello Alice, your certificate was issued by localhost!');
+    await request.dispose();
+    await closeProxyServer();
+  });
+
+  test('should throw a http error if the pfx passphrase is incorect', async ({ playwright, startCCServer, asset, browserName }) => {
+    const serverURL = await startCCServer();
+    const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfxPath: asset('client-certificates/client/trusted/cert.pfx'),
+        passphrase: 'this-password-is-incorrect'
+      }],
+    });
+    await expect(request.get(serverURL)).rejects.toThrow('mac verify failure');
+    await request.dispose();
+  });
+
+  test('should fail with matching certificates in legacy pfx format', async ({ playwright, startCCServer, asset, browserName }) => {
+    const serverURL = await startCCServer();
+    const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfxPath: asset('client-certificates/client/trusted/cert-legacy.pfx'),
+        passphrase: 'secure'
+      }],
+    });
+    await expect(request.get(serverURL)).rejects.toThrow('Unsupported TLS certificate');
+    await request.dispose();
+  });
+
   test('should work in the browser with request interception', async ({ browser, playwright, startCCServer, asset }) => {
     const serverURL = await startCCServer();
     const request = await playwright.request.newContext({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
@@ -209,9 +291,10 @@ test.describe('browser', () => {
     await page.close();
   });
 
-  test('should fail with no client certificates', async ({ browser, startCCServer, asset, browserName }) => {
-    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && process.platform === 'darwin' });
+  test('should fail with no client certificates', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
     const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: 'https://not-matching.com',
         certPath: asset('client-certificates/client/trusted/cert.pem'),
@@ -223,9 +306,10 @@ test.describe('browser', () => {
     await page.close();
   });
 
-  test('should fail with self-signed client certificates', async ({ browser, startCCServer, asset, browserName }) => {
-    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && process.platform === 'darwin' });
+  test('should fail with self-signed client certificates', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
     const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/self-signed/cert.pem'),
@@ -237,23 +321,383 @@ test.describe('browser', () => {
     await page.close();
   });
 
-  test('should pass with matching certificates', async ({ browser, startCCServer, asset, browserName }) => {
-    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && process.platform === 'darwin' });
+  test('should pass with matching certificates', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+    });
+    await page.goto(serverURL);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+  });
+
+  test('should pass with matching certificates when passing as content', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        cert: await fs.promises.readFile(asset('client-certificates/client/trusted/cert.pem')),
+        key: await fs.promises.readFile(asset('client-certificates/client/trusted/key.pem')),
+      }],
+    });
+    await page.goto(serverURL);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+  });
+
+  test('should pass with matching certificates and when a http proxy is used', async ({ browser, startCCServer, asset, browserName, proxyServer, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    proxyServer.forwardTo(parseInt(new URL(serverURL).port, 10), { allowConnectRequests: true });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+      proxy: { server: `localhost:${proxyServer.PORT}` }
+    });
+    expect(proxyServer.connectHosts).toEqual([]);
+    await page.goto(serverURL);
+    const host = browserName === 'webkit' && isMac ? 'localhost' : '127.0.0.1';
+    expect([...new Set(proxyServer.connectHosts)]).toEqual([`${host}:${new URL(serverURL).port}`]);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+  });
+
+  test('should pass with matching certificates and when a http proxy is used from env', async ({ mode, browser, startCCServer, asset, browserName, proxyServer, isMac }) => {
+    test.skip(mode !== 'default', 'Out of process transport does not allow us to set env vars dynamically');
+    process.env.HTTPS_PROXY = `http://localhost:${proxyServer.PORT}`;
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    proxyServer.forwardTo(parseInt(new URL(serverURL).port, 10), { allowConnectRequests: true });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+    });
+    expect(proxyServer.connectHosts).toEqual([]);
+    await page.goto(serverURL);
+    const host = browserName === 'webkit' && isMac ? 'localhost' : '127.0.0.1';
+    expect([...new Set(proxyServer.connectHosts)]).toEqual([`${host}:${new URL(serverURL).port}`]);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+    delete process.env.HTTPS_PROXY;
+  });
+
+  test('should pass with matching certificates and when a http proxy is used from config but env is there', async ({ browser, startCCServer, asset, browserName, proxyServer, isMac }) => {
+    process.env.HTTPS_PROXY = `http://this-should-not-taken-into-account:4242`;
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    proxyServer.forwardTo(parseInt(new URL(serverURL).port, 10), { allowConnectRequests: true });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+      proxy: { server: `localhost:${proxyServer.PORT}` }
+    });
+    expect(proxyServer.connectHosts).toEqual([]);
+    await page.goto(serverURL);
+    const host = browserName === 'webkit' && isMac ? 'localhost' : '127.0.0.1';
+    expect([...new Set(proxyServer.connectHosts)]).toEqual([`${host}:${new URL(serverURL).port}`]);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+    delete process.env.HTTPS_PROXY;
+  });
+
+  test('should pass with matching certificates and when a socks proxy is used', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    const serverPort = parseInt(new URL(serverURL).port, 10);
+    const { proxyServerAddr, closeProxyServer, connectHosts } = await setupSocksForwardingServer({
+      port: test.info().workerIndex + 2048 + 2,
+      forwardPort: serverPort,
+      allowedTargetPort: serverPort,
+    });
     const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
         keyPath: asset('client-certificates/client/trusted/key.pem'),
       }],
+      proxy: { server: proxyServerAddr }
     });
+    expect(connectHosts).toEqual([]);
     await page.goto(serverURL);
+    const host = browserName === 'webkit' && isMac ? 'localhost' : '127.0.0.1';
+    expect(connectHosts).toEqual([`${host}:${serverPort}`]);
     await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
     await page.close();
+    await closeProxyServer();
   });
 
-  test('should pass with matching certificates and trailing slash', async ({ browser, startCCServer, asset, browserName }) => {
-    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && process.platform === 'darwin' });
+  test('should not hang on tls errors during TLS 1.2 handshake', async ({ browser, asset, platform, browserName }) => {
+    for (const tlsVersion of ['TLSv1.3', 'TLSv1.2'] as const) {
+      await test.step(`TLS version: ${tlsVersion}`, async () => {
+        const server = tls.createServer({
+          key: fs.readFileSync(asset('client-certificates/server/server_key.pem')),
+          cert: fs.readFileSync(asset('client-certificates/server/server_cert.pem')),
+          ca: [
+            fs.readFileSync(asset('client-certificates/server/server_cert.pem')),
+          ],
+          requestCert: true,
+          rejectUnauthorized: true,
+          minVersion: tlsVersion,
+          maxVersion: tlsVersion,
+          SNICallback: (servername, cb) => {
+            // Always reject the connection by passing an error
+            cb(new Error('Connection rejected'), null);
+          }
+        }, () => {
+          // Do nothing
+        });
+        const serverURL = await new Promise<string>(resolve => {
+          server.listen(0, 'localhost', () => {
+            const host = browserName === 'webkit' && platform === 'darwin' ? 'local.playwright' : 'localhost';
+            resolve(`https://${host}:${(server.address() as net.AddressInfo).port}/`);
+          });
+        });
+        const page = await browser.newPage({
+          ignoreHTTPSErrors: true,
+          clientCertificates: [{
+            origin: new URL(serverURL).origin,
+            certPath: asset('client-certificates/client/self-signed/cert.pem'),
+            keyPath: asset('client-certificates/client/self-signed/key.pem'),
+          }],
+        });
+        await page.goto(serverURL);
+        await expect(page.getByText('Playwright client-certificate error: Client network socket disconnected before secure TLS connection was established')).toBeVisible();
+        await page.close();
+        await new Promise<void>(resolve => server.close(() => resolve()));
+      });
+    }
+  });
+
+  test('should pass with matching certificates in pfx format', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
     const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfxPath: asset('client-certificates/client/trusted/cert.pfx'),
+        passphrase: 'secure'
+      }],
+    });
+    await page.goto(serverURL);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+  });
+
+  test('should handle TLS renegotiation with client certificates', async ({ browser, asset, browserName, platform }) => {
+    const server: https.Server = createHttpsServer({
+      key: fs.readFileSync(asset('client-certificates/server/server_key.pem')),
+      cert: fs.readFileSync(asset('client-certificates/server/server_cert.pem')),
+      ca: [fs.readFileSync(asset('client-certificates/server/server_cert.pem'))],
+      requestCert: false, // Initially don't request client cert
+      rejectUnauthorized: false,
+      // TLSv1.3 does not support renegotiation
+      minVersion: 'TLSv1.2',
+      maxVersion: 'TLSv1.2',
+    });
+
+    server.on('request', async (req, res) => {
+      if (!req.socket)
+        return;
+      const renegotiate = () => new Promise<void>((resolve, reject) => {
+        (req.socket as tls.TLSSocket).renegotiate({
+          requestCert: true,
+          rejectUnauthorized: false
+        }, err => {
+          if (err)
+            reject(err);
+          else
+            resolve();
+        });
+      });
+      if (req.url === '/') {
+        res.writeHead(200, { 'Content-Type': 'text/html', 'connection': 'close' });
+        res.end();
+      } else if (req.url === '/from-fetch-api') {
+        res.writeHead(200, {
+          'Content-Type': 'text/plain',
+          'Transfer-Encoding': 'chunked'
+        });
+        res.flushHeaders();
+
+        await new Promise<void>(resolve => req.once('data', data => {
+          res.write(`server received: ${data.toString()}\n`);
+          resolve();
+        }));
+
+        await renegotiate();
+        for (let i = 0; i < 4; i++) {
+          res.write(`${i}-from-server\n`);
+          // Best-effort to trigger a new chunk
+          await new Promise<void>(resolve => setTimeout(resolve, 100));
+        }
+        res.end('server closed the connection');
+      } else if (req.url === '/style.css') {
+        res.writeHead(200, {
+          'Content-Type': 'text/css',
+          'Content-Encoding': 'gzip',
+          'Transfer-Encoding': 'chunked'
+        });
+        res.flushHeaders();
+
+        await renegotiate();
+
+        const stylesheet = `
+          button {
+            background-color: red;
+          }
+        `;
+
+        const stylesheetBuffer = await new Promise<Buffer>((resolve, reject) => {
+          zlib.gzip(stylesheet, (err, buffer) => {
+            if (err)
+              reject(err);
+            else
+              resolve(buffer);
+          });
+        });
+        for (let i = 0; i < stylesheetBuffer.length; i += 100) {
+          res.write(stylesheetBuffer.slice(i, i + 100));
+          // Best-effort to trigger a new chunk
+          await new Promise<void>(resolve => setTimeout(resolve, 20));
+        }
+        res.end();
+      } else {
+        res.writeHead(404);
+        res.end();
+      }
+    });
+
+    await new Promise<void>(resolve => server.listen(0, 'localhost', resolve));
+    const port = (server.address() as net.AddressInfo).port;
+    const origin = 'https://' + (browserName === 'webkit' && platform === 'darwin' ? 'local.playwright' : 'localhost');
+    const serverUrl = `${origin}:${port}`;
+
+    const context = await browser.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin,
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+    });
+
+    const page = await context.newPage();
+
+    await test.step('fetch API', async () => {
+      await page.goto(serverUrl);
+      const response = await page.evaluate(async () => {
+        const response = await fetch('/from-fetch-api', {
+          method: 'POST',
+          body: 'client-request-payload'
+        });
+        return await response.text();
+      });
+      expect(response).toBe([
+        'server received: client-request-payload',
+        '0-from-server',
+        '1-from-server',
+        '2-from-server',
+        '3-from-server',
+        'server closed the connection'
+      ].join('\n'));
+    });
+
+    await test.step('Gzip encoded CSS Stylesheet', async () => {
+      await page.goto(serverUrl);
+      // The <link> would throw with net::ERR_INVALID_CHUNKED_ENCODING
+      await page.setContent(`
+        <button>Click me</button>
+        <link rel="stylesheet" href="/style.css">
+      `);
+      await expect(page.locator('button')).toHaveCSS('background-color', /* red */'rgb(255, 0, 0)');
+    });
+
+    await context.close();
+    await new Promise<void>(resolve => server.close(() => resolve()));
+  });
+
+  test('should pass with matching certificates in pfx format when passing as content', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfx: await fs.promises.readFile(asset('client-certificates/client/trusted/cert.pfx')),
+        passphrase: 'secure'
+      }],
+    });
+    await page.goto(serverURL);
+    await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
+    await page.close();
+  });
+
+  test('should fail with matching certificates in legacy pfx format', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    await expect(browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfxPath: asset('client-certificates/client/trusted/cert-legacy.pfx'),
+        passphrase: 'secure'
+      }],
+    })).rejects.toThrow('Unsupported TLS certificate');
+  });
+
+  test('should throw a http error if the pfx passphrase is incorect', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    await expect(browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        pfxPath: asset('client-certificates/client/trusted/cert.pfx'),
+        passphrase: 'this-password-is-incorrect'
+      }],
+    })).rejects.toThrow('Failed to load client certificate: mac verify failure');
+  });
+
+  test('should pass with matching certificates on context APIRequestContext instance', async ({ browser, startCCServer, asset, browserName }) => {
+    const serverURL = await startCCServer();
+    const baseOptions = {
+      certPath: asset('client-certificates/client/trusted/cert.pem'),
+      keyPath: asset('client-certificates/client/trusted/key.pem'),
+    };
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: new URL(serverURL).origin,
+        ...baseOptions,
+      }, {
+        origin: new URL(serverURL).origin.replace('localhost', '127.0.0.1'),
+        ...baseOptions,
+      }],
+    });
+    for (const url of [serverURL, serverURL.replace('localhost', '127.0.0.1')]) {
+      const response = await page.request.get(url);
+      expect(response.status()).toBe(200);
+      expect(await response.text()).toContain('Hello Alice, your certificate was issued by localhost!');
+    }
+    await page.close();
+  });
+
+  test('should pass with matching certificates and trailing slash', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
+    const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: serverURL,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
@@ -274,34 +718,31 @@ test.describe('browser', () => {
       }],
     });
     await page.goto(browserName === 'webkit' && platform === 'darwin' ? httpsServer.EMPTY_PAGE.replace('localhost', 'local.playwright') : httpsServer.EMPTY_PAGE);
-    await expect(page.getByText('Playwright client-certificate error')).toBeVisible();
+    await expect(page.getByText('Playwright client-certificate error: self-signed certificate')).toBeVisible();
     await page.close();
   });
 
-  test('support http2', async ({ browser, startCCServer, asset, browserName }) => {
-    test.skip(browserName === 'webkit' && process.platform === 'darwin', 'WebKit on macOS doesn\n proxy localhost');
-    const enableHTTP1FallbackWhenUsingHttp2 = browserName === 'webkit' && process.platform === 'linux';
-    const serverURL = await startCCServer({ http2: true, enableHTTP1FallbackWhenUsingHttp2 });
+  test('support http2', async ({ browser, startCCServer, asset, browserName, isMac }) => {
+    test.skip(browserName === 'webkit' && isMac, 'WebKit on macOS doesn\n proxy localhost');
+    const serverURL = await startCCServer({ http2: true });
     const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
         keyPath: asset('client-certificates/client/trusted/key.pem'),
       }],
     });
-    // TODO: We should investigate why http2 is not supported in WebKit on Linux.
-    // https://bugs.webkit.org/show_bug.cgi?id=276990
-    const expectedProtocol = enableHTTP1FallbackWhenUsingHttp2 ? 'http/1.1' : 'h2';
     {
-      await page.goto(serverURL.replace('localhost', 'local.playwright'));
+      await page.goto(serverURL.replace('127.0.0.1', 'local.playwright'));
       await expect(page.getByTestId('message')).toHaveText('Sorry, but you need to provide a client certificate to continue.');
-      await expect(page.getByTestId('alpn-protocol')).toHaveText(expectedProtocol);
+      await expect(page.getByTestId('alpn-protocol')).toHaveText('h2');
       await expect(page.getByTestId('servername')).toHaveText('local.playwright');
     }
     {
       await page.goto(serverURL);
       await expect(page.getByTestId('message')).toHaveText('Hello Alice, your certificate was issued by localhost!');
-      await expect(page.getByTestId('alpn-protocol')).toHaveText(expectedProtocol);
+      await expect(page.getByTestId('alpn-protocol')).toHaveText('h2');
     }
     await page.close();
   });
@@ -311,6 +752,7 @@ test.describe('browser', () => {
     const serverURL = await startCCServer({ http2: true, enableHTTP1FallbackWhenUsingHttp2: true });
     const browser = await browserType.launch({ args: ['--disable-http2'] });
     const page = await browser.newPage({
+      ignoreHTTPSErrors: true,
       clientCertificates: [{
         origin: new URL(serverURL).origin,
         certPath: asset('client-certificates/client/trusted/cert.pem'),
@@ -318,7 +760,7 @@ test.describe('browser', () => {
       }],
     });
     {
-      await page.goto(serverURL.replace('localhost', 'local.playwright'));
+      await page.goto(serverURL.replace('127.0.0.1', 'local.playwright'));
       await expect(page.getByTestId('message')).toHaveText('Sorry, but you need to provide a client certificate to continue.');
       await expect(page.getByTestId('alpn-protocol')).toHaveText('http/1.1');
     }
@@ -330,12 +772,10 @@ test.describe('browser', () => {
     await browser.close();
   });
 
-  test('should return target connection errors when using http2', async ({ browser, startCCServer, asset, browserName }) => {
-    test.skip(browserName === 'webkit' && process.platform === 'darwin', 'WebKit on macOS doesn\n proxy localhost');
-    test.fixme(browserName === 'webkit' && process.platform === 'linux', 'WebKit on Linux does not support http2 https://bugs.webkit.org/show_bug.cgi?id=276990');
-    test.skip(+process.versions.node.split('.')[0] < 20, 'http2.performServerHandshake is not supported in older Node.js versions');
+  test('should return target connection errors when using http2', async ({ browser, startCCServer, asset, browserName, isMac, nodeVersion }) => {
+    test.skip(browserName === 'webkit' && isMac, 'WebKit on macOS does not proxy localhost');
+    test.skip(nodeVersion.major < 20, 'http2.performServerHandshake is not supported in older Node.js versions');
 
-    process.env.PWTEST_UNSUPPORTED_CUSTOM_CA = asset('empty.html');
     const serverURL = await startCCServer({ http2: true });
     const page = await browser.newPage({
       clientCertificates: [{
@@ -349,6 +789,39 @@ test.describe('browser', () => {
     await page.close();
   });
 
+  test('should handle rejected certificate in handshake with HTTP/2', async ({ browser, asset, browserName, platform }) => {
+    const server: http2.Http2SecureServer = createHttp2Server({
+      key: fs.readFileSync(asset('client-certificates/server/server_key.pem')),
+      cert: fs.readFileSync(asset('client-certificates/server/server_cert.pem')),
+      ca: [fs.readFileSync(asset('client-certificates/server/server_cert.pem'))],
+      requestCert: true,
+    }, async (req: http2.Http2ServerRequest, res: http2.Http2ServerResponse) => {
+      res.writeHead(200, { 'Content-Type': 'text/html' });
+      res.end('Hello world');
+    });
+
+    await new Promise<void>(resolve => server.listen(0, 'localhost', resolve));
+    const port = (server.address() as net.AddressInfo).port;
+    const serverUrl = 'https://' + (browserName === 'webkit' && platform === 'darwin' ? 'local.playwright' : 'localhost') + ':' + port;
+
+    const context = await browser.newContext({
+      ignoreHTTPSErrors: true,
+      clientCertificates: [{
+        origin: 'https://just-there-that-the-client-certificates-proxy-server-is-getting-launched.com',
+        certPath: asset('client-certificates/client/trusted/cert.pem'),
+        keyPath: asset('client-certificates/client/trusted/key.pem'),
+      }],
+    });
+
+    const page = await context.newPage();
+
+    // This was triggering an unhandled error before.
+    await page.goto(serverUrl).catch(() => {});
+
+    await context.close();
+    await new Promise<void>(resolve => server.close(() => resolve()));
+  });
+
   test.describe('persistentContext', () => {
     test('validate input', async ({ launchPersistent }) => {
       test.slow();
@@ -356,9 +829,10 @@ test.describe('browser', () => {
         await expect(launchPersistent(contextOptions)).rejects.toThrow(expected);
     });
 
-    test('should pass with matching certificates', async ({ launchPersistent, startCCServer, asset, browserName }) => {
-      const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && process.platform === 'darwin' });
+    test('should pass with matching certificates', async ({ launchPersistent, startCCServer, asset, browserName, isMac }) => {
+      const serverURL = await startCCServer({ useFakeLocalhost: browserName === 'webkit' && isMac });
       const { page } = await launchPersistent({
+        ignoreHTTPSErrors: true,
         clientCertificates: [{
           origin: new URL(serverURL).origin,
           certPath: asset('client-certificates/client/trusted/cert.pem'),
diff --git a/tests/library/css-parser.spec.ts b/tests/library/css-parser.spec.ts
index 3bf8a742e678b..e6ff046579ad4 100644
--- a/tests/library/css-parser.spec.ts
+++ b/tests/library/css-parser.spec.ts
@@ -77,7 +77,8 @@ it('should throw on malformed css', async () => {
     } catch (e) {
       error = e;
     }
-    expect(error.message).toContain(`while parsing selector "${selector}"`);
+    expect(error.message).toContain(`while parsing css selector "${selector}"`);
+    expect(error.message).toContain(`Did you mean to CSS.escape it?`);
   }
 
   expectError('');
diff --git a/tests/library/debug-controller.spec.ts b/tests/library/debug-controller.spec.ts
index 2da0ee1bf3744..115ace0cb4020 100644
--- a/tests/library/debug-controller.spec.ts
+++ b/tests/library/debug-controller.spec.ts
@@ -16,12 +16,13 @@
 
 import { expect, playwrightTest as baseTest } from '../config/browserTest';
 import { PlaywrightServer } from '../../packages/playwright-core/lib/remote/playwrightServer';
-import { createGuid } from '../../packages/playwright-core/lib/utils/crypto';
+import { createGuid } from '../../packages/playwright-core/lib/server/utils/crypto';
 import { Backend } from '../config/debugControllerBackend';
 import type { Browser, BrowserContext } from '@playwright/test';
 import type * as channels from '@protocol/channels';
+import { roundBox } from '../page/pageTest';
 
-type BrowserWithReuse = Browser & { _newContextForReuse: () => Promise<BrowserContext> };
+type BrowserWithReuse = Browser & { newContextForReuse: () => Promise<BrowserContext> };
 type Fixtures = {
   wsEndpoint: string;
   backend: channels.DebugControllerChannel;
@@ -30,8 +31,9 @@ type Fixtures = {
 };
 
 const test = baseTest.extend<Fixtures>({
-  wsEndpoint: async ({ }, use) => {
-    process.env.PW_DEBUG_CONTROLLER_HEADLESS = '1';
+  wsEndpoint: async ({ headless }, use) => {
+    if (headless)
+      process.env.PW_DEBUG_CONTROLLER_HEADLESS = '1';
     const server = new PlaywrightServer({ mode: 'extension', path: '/' + createGuid(), maxConnections: Number.MAX_VALUE, enableSocksProxy: false });
     const wsEndpoint = await server.listen();
     await use(wsEndpoint);
@@ -49,11 +51,18 @@ const test = baseTest.extend<Fixtures>({
     await use(async () => {
       const browser = await browserType.connect(wsEndpoint, {
         headers: {
-          'x-playwright-launch-options': JSON.stringify((browserType as any)._defaultLaunchOptions),
-          'x-playwright-reuse-context': '1',
+          'x-playwright-launch-options': JSON.stringify((browserType as any)._playwright._defaultLaunchOptions),
         },
       }) as BrowserWithReuse;
       browsers.push(browser);
+
+      let context: BrowserContext | undefined;
+      browser.newContextForReuse = async () => {
+        if (context)
+          await (browser as any)._disconnectFromReusedContext('reusedContext');
+        context = await (browser as any)._newContextForReuse();
+        return context;
+      };
       return browser;
     });
     for (const browser of browsers)
@@ -65,16 +74,16 @@ const test = baseTest.extend<Fixtures>({
 });
 
 test.slow(true, 'All controller tests are slow');
-test.skip(({ mode }) => mode.startsWith('service'));
+test.skip(({ mode }) => mode.startsWith('service') || mode === 'driver');
 
 test('should pick element', async ({ backend, connectedBrowser }) => {
   const events = [];
   backend.on('inspectRequested', event => events.push(event));
 
-  await backend.setRecorderMode({ mode: 'inspecting' });
+  const context = await connectedBrowser.newContextForReuse();
+  const page = await context.newPage();
 
-  const context = await connectedBrowser._newContextForReuse();
-  const [page] = context.pages();
+  await backend.setRecorderMode({ mode: 'inspecting' });
 
   await page.setContent('<button>Submit</button>');
   await page.getByRole('button').click();
@@ -82,9 +91,11 @@ test('should pick element', async ({ backend, connectedBrowser }) => {
 
   expect(events).toEqual([
     {
+      ariaSnapshot: '- button "Submit"',
       selector: 'internal:role=button[name=\"Submit\"i]',
       locator: 'getByRole(\'button\', { name: \'Submit\' })',
     }, {
+      ariaSnapshot: '- button "Submit"',
       selector: 'internal:role=button[name=\"Submit\"i]',
       locator: 'getByRole(\'button\', { name: \'Submit\' })',
     },
@@ -96,15 +107,16 @@ test('should pick element', async ({ backend, connectedBrowser }) => {
   expect(events).toHaveLength(2);
 });
 
-test('should report pages', async ({ backend, connectedBrowser }) => {
+test('should report pages', async ({ backend, connectedBrowser, browserName, channel }) => {
   const events = [];
   backend.on('stateChanged', event => events.push(event));
   await backend.setReportStateChanged({ enabled: true });
 
-  const context = await connectedBrowser._newContextForReuse();
+  const context = await connectedBrowser.newContextForReuse();
   const page1 = await context.newPage();
   const page2 = await context.newPage();
   await page1.close();
+  await page2.goto('data:text/html,Foo');
   await page2.close();
 
   await backend.setReportStateChanged({ enabled: false });
@@ -114,44 +126,91 @@ test('should report pages', async ({ backend, connectedBrowser }) => {
   expect(events).toEqual([
     {
       pageCount: 1,
+      browsers: [{
+        id: expect.any(String),
+        name: browserName,
+        channel,
+        contexts: [{
+          pages: [
+            { url: 'about:blank' }
+          ]
+        }]
+      }]
     }, {
       pageCount: 2,
+      browsers: [{
+        id: expect.any(String),
+        name: browserName,
+        channel,
+        contexts: [{
+          pages: [
+            { url: 'about:blank' },
+            { url: 'about:blank' }
+          ]
+        }]
+      }]
     }, {
       pageCount: 1,
+      browsers: [{
+        id: expect.any(String),
+        name: browserName,
+        channel,
+        contexts: [{
+          pages: [
+            { url: 'about:blank' }
+          ]
+        }]
+      }]
+    }, {
+      pageCount: 1,
+      browsers: [{
+        id: expect.any(String),
+        name: browserName,
+        channel,
+        contexts: [{
+          pages: [
+            { url: 'data:text/html,Foo' }
+          ]
+        }]
+      }]
     }, {
       pageCount: 0,
+      browsers: [{
+        id: expect.any(String),
+        name: browserName,
+        channel,
+        contexts: [{
+          pages: []
+        }]
+      }]
     }
   ]);
 });
 
-test('should navigate all', async ({ backend, connectedBrowser }) => {
-  const context = await connectedBrowser._newContextForReuse();
-  const page1 = await context.newPage();
-  const page2 = await context.newPage();
-
-  await backend.navigate({ url: 'data:text/plain,Hello world' });
-
-  expect(await page1.evaluate(() => window.location.href)).toBe('data:text/plain,Hello world');
-  expect(await page2.evaluate(() => window.location.href)).toBe('data:text/plain,Hello world');
-});
-
 test('should reset for reuse', async ({ backend, connectedBrowser }) => {
-  const context = await connectedBrowser._newContextForReuse();
+  const context = await connectedBrowser.newContextForReuse();
   const page1 = await context.newPage();
   const page2 = await context.newPage();
-  await backend.navigate({ url: 'data:text/plain,Hello world' });
+  await page1.goto('data:text/plain,Hello world');
+  await page2.goto('data:text/plain,Hello world');
 
-  const context2 = await connectedBrowser._newContextForReuse();
+  const context2 = await connectedBrowser.newContextForReuse();
+  expect(context2.pages().length).toBe(1);
+  expect(context2.pages()[0]).not.toBe(page1);
   expect(await context2.pages()[0].evaluate(() => window.location.href)).toBe('about:blank');
+  // Note: ideally, `page1` would be unaccessible, because it was disposed.
+  // However, we currently do not check that, and since it keeps the same guid, sending
+  // messages to the server keeps working.
   expect(await page1.evaluate(() => window.location.href)).toBe('about:blank');
   expect(await page2.evaluate(() => window.location.href).catch(e => e.message)).toContain('Target page, context or browser has been closed');
 });
 
 test('should highlight all', async ({ backend, connectedBrowser }) => {
-  const context = await connectedBrowser._newContextForReuse();
+  const context = await connectedBrowser.newContextForReuse();
   const page1 = await context.newPage();
   const page2 = await context.newPage();
-  await backend.navigate({ url: 'data:text/html,<button>Submit</button>' });
+  await page1.goto('data:text/html,<button>Submit</button>');
+  await page2.goto('data:text/html,<button>Submit</button>');
   await backend.highlight({ selector: 'button' });
   await expect(page1.getByText('locator(\'button\')')).toBeVisible();
   await expect(page2.getByText('locator(\'button\')')).toBeVisible();
@@ -166,7 +225,7 @@ test('should record', async ({ backend, connectedBrowser }) => {
 
   await backend.setRecorderMode({ mode: 'recording' });
 
-  const context = await connectedBrowser._newContextForReuse();
+  const context = await connectedBrowser.newContextForReuse();
   const [page] = context.pages();
 
   await page.setContent('<button>Submit</button>');
@@ -188,9 +247,9 @@ test('test', async ({ page }) => {
   await page.getByRole('button', { name: 'Submit' }).click();
 });`
   });
-  const length = events.length;
   // No events after mode disabled
   await backend.setRecorderMode({ mode: 'none' });
+  const length = events.length;
   await page.getByRole('button').click();
   expect(events).toHaveLength(length);
 });
@@ -203,7 +262,7 @@ test('should record custom data-testid', async ({ backend, connectedBrowser }) =
   backend.on('sourceChanged', event => events.push(event));
 
   // 1. "Show browser" (or "run test").
-  const context = await connectedBrowser._newContextForReuse();
+  const context = await connectedBrowser.newContextForReuse();
   const page = await context.newPage();
   await page.setContent(`<div data-custom-id='one'>One</div>`);
 
@@ -232,7 +291,7 @@ test('test', async ({ page }) => {
 
 test('should reset routes before reuse', async ({ server, connectedBrowserFactory }) => {
   const browser1 = await connectedBrowserFactory();
-  const context1 = await browser1._newContextForReuse();
+  const context1 = await browser1.newContextForReuse();
   await context1.route(server.PREFIX + '/title.html', route => route.fulfill({ body: '<title>Hello</title>', contentType: 'text/html' }));
   const page1 = await context1.newPage();
   await page1.route(server.PREFIX + '/consolelog.html', route => route.fulfill({ body: '<title>World</title>', contentType: 'text/html' }));
@@ -244,7 +303,7 @@ test('should reset routes before reuse', async ({ server, connectedBrowserFactor
   await browser1.close();
 
   const browser2 = await connectedBrowserFactory();
-  const context2 = await browser2._newContextForReuse();
+  const context2 = await browser2.newContextForReuse();
   const page2 = await context2.newPage();
 
   await page2.goto(server.PREFIX + '/title.html');
@@ -253,3 +312,89 @@ test('should reset routes before reuse', async ({ server, connectedBrowserFactor
   await expect(page2).toHaveTitle('console.log test');
   await browser2.close();
 });
+
+test('should highlight inside iframe', async ({ backend, connectedBrowser }, testInfo) => {
+  testInfo.annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33146' });
+
+  const context = await connectedBrowser.newContextForReuse();
+  const page = await context.newPage();
+  await page.goto(`data:text/html,<div>bar</div><iframe srcdoc="<div>bar</div>"/>`);
+
+
+  await page.frameLocator('iframe').getByText('bar').highlight();
+
+  const highlight = page.frameLocator('iframe').locator('x-pw-highlight');
+  await expect(highlight).not.toHaveCount(0);
+  await backend.hideHighlight();
+  await expect(highlight).toHaveCount(0);
+
+  await backend.highlight({ selector: `frameLocator('iframe').getByText('bar')` });
+  await expect(highlight).not.toHaveCount(0);
+
+  await backend.highlight({ selector: `frameLocator('iframe').frameLocator('iframe').getByText('bar')` });
+  await expect(highlight).toHaveCount(0);
+
+  await backend.highlight({ selector: `getByText('bar')` });
+  await expect(highlight).toHaveCount(1);
+  await expect(page.locator('x-pw-highlight')).toHaveCount(1);
+});
+
+test('should highlight aria template', async ({ backend, connectedBrowser }, testInfo) => {
+  const context = await connectedBrowser.newContextForReuse();
+  const page = await context.newPage();
+  await page.goto(`data:text/html,<button>Submit</button>`);
+
+  const button = page.getByRole('button');
+  const highlight = page.locator('x-pw-highlight');
+
+  await backend.highlight({ ariaTemplate: `- button "Submit2"` });
+  await expect(highlight).toHaveCount(0);
+
+  await backend.highlight({ ariaTemplate: `- button "Submit"` });
+  const box1 = roundBox(await button.boundingBox());
+  const box2 = roundBox(await highlight.boundingBox());
+  expect(box1).toEqual(box2);
+});
+
+test('should report error in aria template', async ({ backend }) => {
+  const error = await backend.highlight({ ariaTemplate: `- button "Submit` }).catch(e => e);
+  expect(error.message).toContain('Unterminated string:');
+});
+
+test('should work with browser._launchServer', async ({ browserType }) => {
+  const browser = await browserType.launch();
+  const server = await (browser as any)._launchServer({ _debugController: true });
+
+  const backend = new Backend();
+  const connectionString = new URL(server.wsEndpoint());
+  connectionString.searchParams.set('debug-controller', '');
+  await backend.connect(connectionString.toString());
+  await backend.initialize();
+  await backend.channel.setReportStateChanged({ enabled: true });
+  const pageCounts: number[] = [];
+  backend.channel.on('stateChanged', event => pageCounts.push(event.pageCount));
+
+  const page = await browser.newPage();
+  await page.close();
+  // this test shares an instance of Playwright with other tests, so we can't assert on the precise number of pages
+  expect(pageCounts.length).toBeGreaterThanOrEqual(2);
+
+  await server.close();
+  await browser.close();
+});
+
+test('should not work with browser._launchServer(_debugController: false)', async ({ browserType }) => {
+  const browser = await browserType.launch();
+  const server = await (browser as any)._launchServer({ _debugController: false });
+
+  const backend = new Backend();
+  const connectionString = new URL(server.wsEndpoint());
+  connectionString.searchParams.set('debug-controller', '');
+  await expect(async () => {
+    await backend.connect(connectionString.toString());
+    await backend.initialize();
+  }).rejects.toThrow();
+
+  await server.close();
+  await browser.close();
+});
diff --git a/tests/library/defaultbrowsercontext-1.spec.ts b/tests/library/defaultbrowsercontext-1.spec.ts
index 3aa7357d2f22e..72d355ca9287a 100644
--- a/tests/library/defaultbrowsercontext-1.spec.ts
+++ b/tests/library/defaultbrowsercontext-1.spec.ts
@@ -19,7 +19,13 @@ import { playwrightTest as it, expect } from '../config/browserTest';
 import { verifyViewport } from '../config/utils';
 import fs from 'fs';
 
-it('context.cookies() should work @smoke', async ({ server, launchPersistent, defaultSameSiteCookieValue }) => {
+function maybeFilterCookies(channel: string | undefined, cookies: any[]) {
+  if (channel?.startsWith('msedge'))
+    return cookies.filter(c => !c.domain.endsWith('microsoft.com'));
+  return cookies;
+}
+
+it('context.cookies() should work @smoke', async ({ server, launchPersistent, defaultSameSiteCookieValue, channel }) => {
   const { page } = await launchPersistent();
   await page.goto(server.EMPTY_PAGE);
   const documentCookie = await page.evaluate(() => {
@@ -27,10 +33,10 @@ it('context.cookies() should work @smoke', async ({ server, launchPersistent, de
     return document.cookie;
   });
   expect(documentCookie).toBe('username=John Doe');
-  expect(await page.context().cookies()).toEqual([{
+  expect(maybeFilterCookies(channel, await page.context().cookies())).toEqual([{
     name: 'username',
     value: 'John Doe',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/',
     expires: -1,
     httpOnly: false,
@@ -39,7 +45,7 @@ it('context.cookies() should work @smoke', async ({ server, launchPersistent, de
   }]);
 });
 
-it('context.addCookies() should work', async ({ server, launchPersistent, browserName, isWindows }) => {
+it('context.addCookies() should work', async ({ server, launchPersistent, browserName, isWindows, channel }) => {
   const { page } = await launchPersistent();
   await page.goto(server.EMPTY_PAGE);
   await page.context().addCookies([{
@@ -49,10 +55,10 @@ it('context.addCookies() should work', async ({ server, launchPersistent, browse
     sameSite: 'Lax',
   }]);
   expect(await page.evaluate(() => document.cookie)).toBe('username=John Doe');
-  expect(await page.context().cookies()).toEqual([{
+  expect(maybeFilterCookies(channel, await page.context().cookies())).toEqual([{
     name: 'username',
     value: 'John Doe',
-    domain: 'localhost',
+    domain: server.HOSTNAME,
     path: '/',
     expires: -1,
     httpOnly: false,
@@ -61,7 +67,7 @@ it('context.addCookies() should work', async ({ server, launchPersistent, browse
   }]);
 });
 
-it('context.clearCookies() should work', async ({ server, launchPersistent }) => {
+it('context.clearCookies() should work', async ({ server, launchPersistent, channel }) => {
   const { page } = await launchPersistent();
   await page.goto(server.EMPTY_PAGE);
   await page.context().addCookies([{
@@ -76,47 +82,10 @@ it('context.clearCookies() should work', async ({ server, launchPersistent }) =>
   expect(await page.evaluate('document.cookie')).toBe('cookie1=1; cookie2=2');
   await page.context().clearCookies();
   await page.reload();
-  expect(await page.context().cookies([])).toEqual([]);
+  expect(maybeFilterCookies(channel, await page.context().cookies([]))).toEqual([]);
   expect(await page.evaluate('document.cookie')).toBe('');
 });
 
-it('should(not) block third party cookies', async ({ server, launchPersistent, browserName, allowsThirdParty }) => {
-  const { page, context } = await launchPersistent();
-  await page.goto(server.EMPTY_PAGE);
-  await page.evaluate(src => {
-    let fulfill;
-    const promise = new Promise(x => fulfill = x);
-    const iframe = document.createElement('iframe');
-    document.body.appendChild(iframe);
-    iframe.onload = fulfill;
-    iframe.src = src;
-    return promise;
-  }, server.CROSS_PROCESS_PREFIX + '/grid.html');
-  const documentCookie = await page.frames()[1].evaluate(() => {
-    document.cookie = 'username=John Doe';
-    return document.cookie;
-  });
-  await page.waitForTimeout(2000);
-  expect(documentCookie).toBe(allowsThirdParty ? 'username=John Doe' : '');
-  const cookies = await context.cookies(server.CROSS_PROCESS_PREFIX + '/grid.html');
-  if (allowsThirdParty) {
-    expect(cookies).toEqual([
-      {
-        'domain': '127.0.0.1',
-        'expires': -1,
-        'httpOnly': false,
-        'name': 'username',
-        'path': '/',
-        'sameSite': 'None',
-        'secure': false,
-        'value': 'John Doe'
-      }
-    ]);
-  } else {
-    expect(cookies).toEqual([]);
-  }
-});
-
 it('should support viewport option', async ({ launchPersistent }) => {
   const { page, context } = await launchPersistent({ viewport: { width: 456, height: 789 } });
   await verifyViewport(page, 456, 789);
diff --git a/tests/library/defaultbrowsercontext-2.spec.ts b/tests/library/defaultbrowsercontext-2.spec.ts
index 3552f94e97c34..6576dbb5bf6be 100644
--- a/tests/library/defaultbrowsercontext-2.spec.ts
+++ b/tests/library/defaultbrowsercontext-2.spec.ts
@@ -51,6 +51,12 @@ it('should support forcedColors option', async ({ launchPersistent, browserName
   expect(await page.evaluate(() => matchMedia('(forced-colors: none)').matches)).toBe(false);
 });
 
+it('should support contrast option', async ({ launchPersistent }) => {
+  const { page } = await launchPersistent({ contrast: 'more' });
+  expect.soft(await page.evaluate(() => matchMedia('(prefers-contrast: more)').matches)).toBe(true);
+  expect.soft(await page.evaluate(() => matchMedia('(prefers-contrast: no-preference)').matches)).toBe(false);
+});
+
 it('should support timezoneId option', async ({ launchPersistent, browserName }) => {
   const { page } = await launchPersistent({ locale: 'en-US', timezoneId: 'America/Jamaica' });
   expect(await page.evaluate(() => new Date(1479579154987).toString())).toBe('Sat Nov 19 2016 13:12:34 GMT-0500 (Eastern Standard Time)');
@@ -95,6 +101,13 @@ it('should accept userDataDir', async ({ createUserDataDir, browserType }) => {
   expect(fs.readdirSync(userDataDir).length).toBeGreaterThan(0);
 });
 
+it('should accept relative userDataDir', async ({ createUserDataDir, browserType }) => {
+  const userDataDir = await createUserDataDir();
+  const context = await browserType.launchPersistentContext(path.relative(process.cwd(), path.join(userDataDir, 'foobar')));
+  expect(fs.readdirSync(path.join(userDataDir, 'foobar')).length).toBeGreaterThan(0);
+  await context.close();
+});
+
 it('should restore state from userDataDir', async ({ browserType, server, createUserDataDir, isMac, browserName }) => {
   it.slow();
 
@@ -144,7 +157,7 @@ it('should have passed URL when launching with ignoreDefaultArgs: true', async (
   it.skip(mode !== 'default');
 
   const userDataDir = await createUserDataDir();
-  const args = toImpl(browserType)._defaultArgs((browserType as any)._defaultLaunchOptions, 'persistent', userDataDir, 0).filter(a => a !== 'about:blank');
+  const args = toImpl(browserType).defaultArgs((browserType as any)._playwright._defaultLaunchOptions, 'persistent', userDataDir, 0).filter(a => a !== 'about:blank');
   const options = {
     args: browserName === 'firefox' ? [...args, '-new-tab', server.EMPTY_PAGE] : [...args, server.EMPTY_PAGE],
     ignoreDefaultArgs: true,
@@ -196,8 +209,6 @@ it('coverage should work', async ({ server, launchPersistent, browserName }) =>
 });
 
 it('should respect selectors', async ({ playwright, launchPersistent }) => {
-  const { page } = await launchPersistent();
-
   const defaultContextCSS = () => ({
     query(root, selector) {
       return root.querySelector(selector);
@@ -208,6 +219,7 @@ it('should respect selectors', async ({ playwright, launchPersistent }) => {
   });
   await playwright.selectors.register('defaultContextCSS', defaultContextCSS);
 
+  const { page } = await launchPersistent();
   await page.setContent(`<div>hello</div>`);
   expect(await page.innerHTML('css=div')).toBe('hello');
   expect(await page.innerHTML('defaultContextCSS=div')).toBe('hello');
@@ -240,3 +252,32 @@ it('user agent is up to date', async ({ launchPersistent, browser, mode }) => {
   expect(await page.evaluate(() => navigator.userAgent)).toBe(userAgent);
   await context.close();
 });
+
+it('dialog.accept should work', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35663' }
+}, async ({ launchPersistent, mode }) => {
+  it.skip(mode !== 'default');
+  const { context, page } = await launchPersistent();
+  await page.goto('data:text/html,<html><title>Title</title><button onclick="alert(\'Alert\')">Button</button></html>');
+  let shown = false;
+  page.on('dialog', dialog => {
+    shown = true;
+    void dialog.accept();
+  });
+  await page.getByRole('button', { name: 'Button' }).click();
+  expect(shown).toBe(true);
+  await context.close();
+});
+
+it('exposes browser', async ({ launchPersistent }) => {
+  const { context } = await launchPersistent();
+  const browser = context.browser();
+  expect(browser.version()).toBeTruthy();
+  const page = await browser.newPage();
+  await page.goto('data:text/html,<html><title>Title</title></html>');
+  expect(await page.title()).toBe('Title');
+  await browser.close();
+  expect(context.pages().length).toBe(0);
+  // Next line should not throw.
+  await context.close();
+});
diff --git a/tests/library/download.spec.ts b/tests/library/download.spec.ts
index 9e6fb2b8e5adc..0c9572febeaec 100644
--- a/tests/library/download.spec.ts
+++ b/tests/library/download.spec.ts
@@ -51,7 +51,8 @@ it.describe('download event', () => {
     });
   });
 
-  it('should report download when navigation turns into download @smoke', async ({ browser, server, browserName, mode }) => {
+  it('should report download when navigation turns into download @smoke', async ({ browser, server, browserName, browserMajorVersion }) => {
+    it.skip(browserName === 'chromium' && browserMajorVersion < 140, 'old chromium throws net::ERR_ABORTED, depends on https://chromium-review.googlesource.com/c/chromium/src/+/6696011');
     const page = await browser.newPage();
     const [download, responseOrError] = await Promise.all([
       page.waitForEvent('download'),
@@ -62,22 +63,17 @@ it.describe('download event', () => {
     const path = await download.path();
     expect(fs.existsSync(path)).toBeTruthy();
     expect(fs.readFileSync(path).toString()).toBe('Hello world');
-    if (browserName === 'chromium') {
-      expect(responseOrError instanceof Error).toBeTruthy();
-      expect(responseOrError.message).toContain('net::ERR_ABORTED');
-      expect(page.url()).toBe('about:blank');
-    } else if (browserName === 'webkit') {
-      expect(responseOrError instanceof Error).toBeTruthy();
-      expect(responseOrError.message).toContain('Download is starting');
+
+    expect(responseOrError instanceof Error).toBeTruthy();
+    expect(responseOrError.message).toContain('Download is starting');
+
+    if (browserName !== 'firefox')
       expect(page.url()).toBe('about:blank');
-    } else {
-      expect(responseOrError instanceof Error).toBeTruthy();
-      expect(responseOrError.message).toContain('Download is starting');
-    }
     await page.close();
   });
 
-  it('should work with Cross-Origin-Opener-Policy', async ({ browser, server, browserName }) => {
+  it('should work with Cross-Origin-Opener-Policy', async ({ browser, server, browserName, browserMajorVersion }) => {
+    it.skip(browserName === 'chromium' && browserMajorVersion < 140, 'old chromium throws net::ERR_ABORTED, depends on https://chromium-review.googlesource.com/c/chromium/src/+/6696011');
     const page = await browser.newPage();
     const [download, responseOrError] = await Promise.all([
       page.waitForEvent('download'),
@@ -88,18 +84,10 @@ it.describe('download event', () => {
     const path = await download.path();
     expect(fs.existsSync(path)).toBeTruthy();
     expect(fs.readFileSync(path).toString()).toBe('Hello world');
-    if (browserName === 'chromium') {
-      expect(responseOrError instanceof Error).toBeTruthy();
-      expect(responseOrError.message).toContain('net::ERR_ABORTED');
+    expect(responseOrError instanceof Error).toBeTruthy();
+    expect(responseOrError.message).toContain('Download is starting');
+    if (browserName !== 'firefox')
       expect(page.url()).toBe('about:blank');
-    } else if (browserName === 'webkit') {
-      expect(responseOrError instanceof Error).toBeTruthy();
-      expect(responseOrError.message).toContain('Download is starting');
-      expect(page.url()).toBe('about:blank');
-    } else {
-      expect(responseOrError instanceof Error).toBeTruthy();
-      expect(responseOrError.message).toContain('Download is starting');
-    }
     await page.close();
   });
 
@@ -305,10 +293,8 @@ it.describe('download event', () => {
   });
 
   it('should report alt-click downloads', async ({ browser, server, browserName }) => {
-    it.fixme(browserName === 'firefox');
+    it.skip(browserName === 'firefox', 'Firefox does not download on alt-click.');
 
-    // Firefox does not download on alt-click by default.
-    // Our WebKit embedder does not download on alt-click, although Safari does.
     server.setRoute('/download', (req, res) => {
       res.setHeader('Content-Type', 'application/octet-stream');
       res.end(`Hello world`);
@@ -638,8 +624,9 @@ it('should be able to download a inline PDF file via response interception', asy
   await page.close();
 });
 
-it('should be able to download a inline PDF file via navigation', async ({ browser, server, asset, browserName, headless }) => {
-  it.fixme(((!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW) && browserName === 'chromium'));
+it('should be able to download a inline PDF file via navigation', async ({ browser, server, asset, browserName, isHeadlessShell }) => {
+  it.skip(browserName === 'chromium' && !isHeadlessShell, 'We expect PDF Viewer to open up in headed Chromium');
+
   const page = await browser.newPage();
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`
diff --git a/tests/library/emulation-focus.spec.ts b/tests/library/emulation-focus.spec.ts
index 27ad72127edd3..5af6cc7d156ab 100644
--- a/tests/library/emulation-focus.spec.ts
+++ b/tests/library/emulation-focus.spec.ts
@@ -101,11 +101,11 @@ it('should change document.activeElement', async ({ page, server }) => {
   expect(active).toEqual(['INPUT', 'TEXTAREA']);
 });
 
-it('should not affect screenshots', async ({ page, server, browserName, headless, isWindows }) => {
+it('should not affect screenshots', async ({ page, server, browserName, headless, isWindows, isLinux, isHeadlessShell, channel }) => {
   it.skip(browserName === 'webkit' && isWindows && !headless, 'WebKit/Windows/headed has a larger minimal viewport. See https://github.com/microsoft/playwright/issues/22616');
+  it.skip(browserName === 'webkit' && isLinux && !headless, 'WebKit headed has a larger minimal viewport on gtk4.');
   it.skip(browserName === 'firefox' && !headless, 'Firefox headed produces a different image');
-  const isChromiumHeadlessNew = browserName === 'chromium' && !!headless && !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW;
-  it.fixme(isChromiumHeadlessNew, 'Times out with --headless=new');
+  it.fixme(browserName === 'chromium' && !isHeadlessShell && channel !== 'chromium-tip-of-tree', 'https://github.com/microsoft/playwright/issues/33330');
 
   const page2 = await page.context().newPage();
   await Promise.all([
@@ -199,8 +199,9 @@ browserTest('should not fire blur events when interacting with more than one pag
   expect(await page2.evaluate(() => !!window['gotBlur'])).toBe(false);
 });
 
-browserTest('should trigger hover state concurrently', async ({ browserType, browserName }) => {
+browserTest('should trigger hover state concurrently', async ({ browserType, browserName, headless }) => {
   browserTest.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27969' });
+  browserTest.skip(!headless, 'headed messes up with hover');
   browserTest.fixme(browserName === 'firefox');
 
   const browser1 = await browserType.launch();
diff --git a/tests/library/emulation-focus.spec.ts-snapshots/grid-cell-0-moz-firefox-nightly.png b/tests/library/emulation-focus.spec.ts-snapshots/grid-cell-0-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..d54343f74699c
Binary files /dev/null and b/tests/library/emulation-focus.spec.ts-snapshots/grid-cell-0-moz-firefox-nightly.png differ
diff --git a/tests/library/emulation-focus.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png b/tests/library/emulation-focus.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..7b164933553a5
Binary files /dev/null and b/tests/library/emulation-focus.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png differ
diff --git a/tests/library/events/add-listeners.spec.ts b/tests/library/events/add-listeners.spec.ts
new file mode 100644
index 0000000000000..7f339ca039025
--- /dev/null
+++ b/tests/library/events/add-listeners.spec.ts
@@ -0,0 +1,103 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test.describe('EventEmitter tests', () => {
+  test('should work', () => {
+    const events_new_listener_emitted = [];
+    const listeners_new_listener_emitted = [];
+
+    const ee = new EventEmitter();
+
+    ee.on('newListener', function(event, listener) {
+      if (event !== 'newListener') {
+        events_new_listener_emitted.push(event);
+        listeners_new_listener_emitted.push(listener);
+      }
+    });
+
+    const hello = (a, b) => {
+      expect(a).toEqual('a');
+      expect(b).toEqual('b');
+    };
+
+    ee.once('newListener', (name, listener) => {
+      expect(name).toEqual('hello');
+      expect(listener).toEqual(hello);
+
+      const listeners = ee.listeners('hello');
+      expect(Array.isArray(listeners)).toBeTruthy();
+      expect(listeners).toHaveLength(0);
+    });
+
+    ee.on('hello', hello);
+    ee.once('foo', () => { throw new Error('foo error'); });
+
+    expect(Array.isArray(events_new_listener_emitted)).toBeTruthy();
+    expect(events_new_listener_emitted).toHaveLength(2);
+    expect(events_new_listener_emitted[0]).toEqual('hello');
+    expect(events_new_listener_emitted[1]).toEqual('foo');
+
+    expect(Array.isArray(listeners_new_listener_emitted)).toBeTruthy();
+    expect(listeners_new_listener_emitted).toHaveLength(2);
+    expect(listeners_new_listener_emitted[0]).toEqual(hello);
+    expect(listeners_new_listener_emitted[1]).toThrow();
+
+    ee.emit('hello', 'a', 'b');
+  });
+
+  test('set max listeners test', () => {
+    const f = new EventEmitter();
+    f.setMaxListeners(0);
+  });
+
+  test('Listener order', () => {
+    const listen1 = function() {};
+    const listen2 = function() {};
+    const ee = new EventEmitter();
+
+    ee.once('newListener', function() {
+      const listeners = ee.listeners('hello');
+      expect(Array.isArray(listeners)).toBeTruthy();
+      expect(listeners).toHaveLength(0);
+      ee.once('newListener', function() {
+        const listeners = ee.listeners('hello');
+        expect(Array.isArray(listeners)).toBeTruthy();
+        expect(listeners).toHaveLength(0);
+      });
+      ee.on('hello', listen2);
+    });
+    ee.on('hello', listen1);
+    const listeners = ee.listeners('hello');
+    expect(Array.isArray(listeners)).toBeTruthy();
+    expect(listeners).toHaveLength(2);
+    expect(listeners[0]).toEqual(listen2);
+    expect(listeners[1]).toEqual(listen1);
+  });
+
+  test('listener type check', () => {
+    const ee = new EventEmitter();
+    expect(() => ee.on('foo', null)).toThrow('The "listener" argument must be of type Function. Received type object');
+  });
+});
diff --git a/tests/library/events/check-listener-leaks.spec.ts b/tests/library/events/check-listener-leaks.spec.ts
new file mode 100644
index 0000000000000..e309b4080f94a
--- /dev/null
+++ b/tests/library/events/check-listener-leaks.spec.ts
@@ -0,0 +1,89 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import events from 'events';
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+import * as common from './utils';
+
+test('defaultMaxListeners', () => {
+  const e = new EventEmitter();
+
+  for (let i = 0; i < 10; i++)
+    e.on('default', common.mustNotCall());
+
+
+  expect(e._events['default']).not.toHaveProperty('warned');
+  e.on('default', common.mustNotCall());
+  expect(e._events['default'].hasOwnProperty('warned')).toBeTruthy();
+
+  e.setMaxListeners(5);
+  for (let i = 0; i < 5; i++)
+    e.on('specific', common.mustNotCall());
+
+  expect(e._events['specific']).not.toHaveProperty('warned');
+  e.on('specific', common.mustNotCall());
+  expect(e._events['specific'].hasOwnProperty('warned')).toBeTruthy();
+
+  // only one
+  e.setMaxListeners(1);
+  e.on('only one', common.mustNotCall());
+  expect(e._events['only one']).not.toHaveProperty('warned');
+  e.on('only one', common.mustNotCall());
+  expect(e._events['only one'].hasOwnProperty('warned')).toBeTruthy();
+
+  // unlimited
+  e.setMaxListeners(0);
+  for (let i = 0; i < 1000; i++)
+    e.on('unlimited', common.mustNotCall());
+
+  expect(e._events['unlimited']).not.toHaveProperty('warned');
+});
+
+test('process-wide', () => {
+  events.EventEmitter.defaultMaxListeners = 42;
+  const e = new EventEmitter();
+
+  for (let i = 0; i < 42; ++i)
+    e.on('fortytwo', common.mustNotCall());
+
+  expect(e._events['fortytwo']).not.toHaveProperty('warned');
+  e.on('fortytwo', common.mustNotCall());
+  expect(e._events['fortytwo'].hasOwnProperty('warned')).toBeTruthy();
+  delete e._events['fortytwo'].warned;
+
+  events.EventEmitter.defaultMaxListeners = 44;
+  e.on('fortytwo', common.mustNotCall());
+  expect(e._events['fortytwo']).not.toHaveProperty('warned');
+  e.on('fortytwo', common.mustNotCall());
+  expect(e._events['fortytwo'].hasOwnProperty('warned')).toBeTruthy();
+});
+
+test('_maxListeners still has precedence over defaultMaxListeners', () => {
+  events.EventEmitter.defaultMaxListeners = 42;
+  const e = new EventEmitter();
+  e.setMaxListeners(1);
+  e.on('uno', common.mustNotCall());
+  expect(e._events['uno']).not.toHaveProperty('warned');
+  e.on('uno', common.mustNotCall());
+  expect(e._events['uno'].hasOwnProperty('warned')).toBeTruthy();
+});
diff --git a/tests/library/events/events-list.spec.ts b/tests/library/events/events-list.spec.ts
new file mode 100644
index 0000000000000..27f3badb70271
--- /dev/null
+++ b/tests/library/events/events-list.spec.ts
@@ -0,0 +1,55 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test.describe('EventEmitter', () => {
+  test('should maintain event names correctly', () => {
+    const e = new EventEmitter();
+    const m = () => {};
+    e.on('foo', function() {});
+    expect(e.eventNames().length).toBe(1);
+    expect(e.eventNames()[0]).toBe('foo');
+
+    e.on('bar', m);
+    expect(e.eventNames().length).toBe(2);
+    expect(e.eventNames()[0]).toBe('foo');
+    expect(e.eventNames()[1]).toBe('bar');
+
+    e.removeListener('bar', m);
+    expect(e.eventNames().length).toBe(1);
+    expect(e.eventNames()[0]).toBe('foo');
+
+    if (typeof Symbol !== 'undefined') {
+      const s = Symbol('s');
+      e.on(s, m);
+      expect(e.eventNames().length).toBe(2);
+      expect(e.eventNames()[0]).toBe('foo');
+      expect(e.eventNames()[1]).toBe(s);
+
+      e.removeListener(s, m);
+      expect(e.eventNames().length).toBe(1);
+      expect(e.eventNames()[0]).toBe('foo');
+    }
+  });
+});
diff --git a/tests/library/events/listener-count.spec.ts b/tests/library/events/listener-count.spec.ts
new file mode 100644
index 0000000000000..4161fea2f1f90
--- /dev/null
+++ b/tests/library/events/listener-count.spec.ts
@@ -0,0 +1,38 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('Listener count test', () => {
+  const emitter = new EventEmitter();
+  emitter.on('foo', () => {});
+  emitter.on('foo', () => {});
+  emitter.on('baz', () => {});
+  // Allow any type
+  emitter.on(123, () => {});
+
+  expect(emitter.listenerCount('foo')).toEqual(2);
+  expect(emitter.listenerCount('bar')).toEqual(0);
+  expect(emitter.listenerCount('baz')).toEqual(1);
+  expect(emitter.listenerCount(123)).toEqual(1);
+});
diff --git a/tests/library/events/listeners-side-effects.spec.ts b/tests/library/events/listeners-side-effects.spec.ts
new file mode 100644
index 0000000000000..bdf1a0f997bbe
--- /dev/null
+++ b/tests/library/events/listeners-side-effects.spec.ts
@@ -0,0 +1,61 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { test, expect } from '@playwright/test';
+import { EventEmitter } from './utils';
+
+test('listeners empty check', () => {
+  const e = new EventEmitter();
+  let fl;  // foo listeners
+
+  fl = e.listeners('foo');
+
+  expect(Array.isArray(fl)).toBeTruthy();
+  expect(fl).toHaveLength(0);
+  expect(e._events instanceof Object).toBeFalsy();
+  expect(Object.keys(e._events)).toHaveLength(0);
+
+  const fail = () => expect(true).toBe(false);
+  e.on('foo', fail);
+  fl = e.listeners('foo');
+
+  expect(e._events.foo).toBe(fail);
+  expect(Array.isArray(fl)).toBeTruthy();
+  expect(fl).toHaveLength(1);
+  expect(fl[0]).toBe(fail);
+
+  e.listeners('bar');
+
+  const pass = () => expect(true).toBe(true);
+  e.on('foo', pass);
+  fl = e.listeners('foo');
+
+  expect(Array.isArray(e._events.foo)).toBeTruthy();
+  expect(e._events.foo).toHaveLength(2);
+  expect(e._events.foo[0]).toBe(fail);
+  expect(e._events.foo[1]).toBe(pass);
+
+  expect(Array.isArray(fl)).toBeTruthy();
+  expect(fl).toHaveLength(2);
+  expect(fl[0]).toBe(fail);
+  expect(fl[1]).toBe(pass);
+});
diff --git a/tests/library/events/listeners.spec.ts b/tests/library/events/listeners.spec.ts
new file mode 100644
index 0000000000000..dbc7566fa19b3
--- /dev/null
+++ b/tests/library/events/listeners.spec.ts
@@ -0,0 +1,154 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+const listener = () => {};
+const listener2 = () => {};
+const listener3 = () => { return 0; };
+const listener4 = () => { return 1; };
+
+class TestStream extends EventEmitter {}
+
+test('EventEmitter listeners with one listener', () => {
+  const ee = new EventEmitter();
+  ee.on('foo', listener);
+  const fooListeners = ee.listeners('foo');
+
+  const listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(1);
+  expect(listeners[0]).toEqual(listener);
+
+  void ee.removeAllListeners('foo');
+  expect<Array<any>>(ee.listeners('foo')).toHaveLength(0);
+
+  expect(Array.isArray(fooListeners)).toBeTruthy();
+  expect(fooListeners).toHaveLength(1);
+  expect(fooListeners[0]).toEqual(listener);
+});
+
+test('Array copy modification does not modify orig', () => {
+  const ee = new EventEmitter();
+  ee.on('foo', listener);
+
+  const eeListenersCopy = ee.listeners('foo');
+  expect(Array.isArray(eeListenersCopy)).toBeTruthy();
+  expect(eeListenersCopy).toHaveLength(1);
+  expect(eeListenersCopy[0]).toEqual(listener);
+
+  eeListenersCopy.push(listener2);
+  const listeners = ee.listeners('foo');
+
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(1);
+  expect(listeners[0]).toEqual(listener);
+
+  expect(eeListenersCopy).toHaveLength(2);
+  expect(eeListenersCopy[0]).toEqual(listener);
+  expect(eeListenersCopy[1]).toEqual(listener2);
+});
+
+test('Modify array copy after multiple adds', () => {
+  const ee = new EventEmitter();
+  ee.on('foo', listener);
+  const eeListenersCopy = ee.listeners('foo');
+  ee.on('foo', listener2);
+
+  const listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(2);
+  expect(listeners[0]).toEqual(listener);
+  expect(listeners[1]).toEqual(listener2);
+
+  expect(Array.isArray(eeListenersCopy)).toBeTruthy();
+  expect(eeListenersCopy).toHaveLength(1);
+  expect(eeListenersCopy[0]).toEqual(listener);
+});
+
+test('listeners and once', () => {
+  const ee = new EventEmitter();
+  ee.once('foo', listener);
+  const listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(1);
+  expect(listeners[0]).toEqual(listener);
+});
+
+test('listeners with conflicting types', () => {
+  const ee = new EventEmitter();
+  ee.on('foo', listener);
+  ee.once('foo', listener2);
+
+  const listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(2);
+  expect(listeners[0]).toEqual(listener);
+  expect(listeners[1]).toEqual(listener2);
+});
+
+test('EventEmitter with no members', () => {
+  const ee = new EventEmitter();
+  ee._events = undefined;
+  const listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+});
+
+test('listeners on prototype', () => {
+  const s = new TestStream();
+  const listeners = s.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+});
+
+test('raw listeners', () => {
+  const ee = new EventEmitter();
+  ee.on('foo', listener);
+  const wrappedListener = ee.rawListeners('foo');
+  expect(wrappedListener).toHaveLength(1);
+  expect(wrappedListener[0]).toEqual(listener);
+
+  ee.once('foo', listener);
+  const wrappedListeners = ee.rawListeners('foo');
+  expect(wrappedListeners).toHaveLength(2);
+  expect(wrappedListeners[0]).toEqual(listener);
+  expect(wrappedListeners[1].listener).toEqual(listener);
+
+  ee.emit('foo');
+  expect(wrappedListeners).toHaveLength(2);
+  expect(wrappedListeners[1].listener).toEqual(listener);
+});
+
+test('raw listeners order', () => {
+  const ee = new EventEmitter();
+  ee.once('foo', listener3);
+  ee.on('foo', listener4);
+  const rawListeners = ee.rawListeners('foo');
+  expect(rawListeners).toHaveLength(2);
+  expect(rawListeners[0]()).toEqual(0);
+
+  const rawListener = ee.rawListeners('foo');
+  expect(rawListener).toHaveLength(1);
+  expect(rawListener[0]()).toEqual(1);
+});
diff --git a/tests/library/events/max-listeners.spec.ts b/tests/library/events/max-listeners.spec.ts
new file mode 100644
index 0000000000000..424120978f15b
--- /dev/null
+++ b/tests/library/events/max-listeners.spec.ts
@@ -0,0 +1,43 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH the SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('emit maxListeners on e', () => {
+  const e = new EventEmitter();
+  e.on('maxListeners', () => {});
+
+  // Should not corrupt the 'maxListeners' queue.
+  e.setMaxListeners(42);
+
+  const throwsObjs = [NaN, -1, 'and even this'];
+  const maxError = /^The value of \"n\" is out of range. It must be a non-negative number./;
+
+  for (const obj of throwsObjs) {
+    expect(() => {
+      e.setMaxListeners(obj);
+    }).toThrow(maxError);
+  }
+
+  e.emit('maxListeners');
+});
diff --git a/tests/library/events/method-names.spec.ts b/tests/library/events/method-names.spec.ts
new file mode 100644
index 0000000000000..72b512baf87c4
--- /dev/null
+++ b/tests/library/events/method-names.spec.ts
@@ -0,0 +1,40 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('EventEmitter prototype test', () => {
+  const ee = new EventEmitter();
+  // eslint-disable-next-line no-proto
+  expect((ee as any).__proto__.constructor.name).toEqual('EventEmitter');
+  expect(ee.on).toEqual(ee.addListener);  // Same method.
+  expect(ee.off).toEqual(ee.removeListener);  // Same method.
+
+  Object.getOwnPropertyNames(ee).forEach(name => {
+    if (name === 'constructor' || name === 'on' || name === 'off')
+      return;
+    if (typeof ee[name] !== 'function')
+      return;
+    expect(ee[name].name).toEqual(name);
+  });
+});
diff --git a/tests/library/events/modify-in-emit.spec.ts b/tests/library/events/modify-in-emit.spec.ts
new file mode 100644
index 0000000000000..a364bdbde16c9
--- /dev/null
+++ b/tests/library/events/modify-in-emit.spec.ts
@@ -0,0 +1,93 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { test, expect } from '@playwright/test';
+import { EventEmitter } from './utils';
+
+let callbacks_called = [];
+const e = new EventEmitter();
+
+const callback1 = () => {
+  callbacks_called.push('callback1');
+  e.on('foo', callback2);
+  e.on('foo', callback3);
+  e.removeListener('foo', callback1);
+};
+
+const callback2 = () => {
+  callbacks_called.push('callback2');
+  e.removeListener('foo', callback2);
+};
+
+const callback3 = () => {
+  callbacks_called.push('callback3');
+  e.removeListener('foo', callback3);
+};
+
+test('add and remove listeners', () => {
+  e.on('foo', callback1);
+  expect(e.listeners('foo')).toHaveLength(1);
+
+  e.emit('foo');
+  expect(e.listeners('foo')).toHaveLength(2);
+  expect(Array.isArray(callbacks_called)).toBeTruthy();
+  expect(callbacks_called).toHaveLength(1);
+  expect(callbacks_called[0]).toEqual('callback1');
+
+  e.emit('foo');
+  expect(e.listeners('foo')).toHaveLength(0);
+  expect(Array.isArray(callbacks_called)).toBeTruthy();
+  expect(callbacks_called).toHaveLength(3);
+  expect(callbacks_called[0]).toEqual('callback1');
+  expect(callbacks_called[1]).toEqual('callback2');
+  expect(callbacks_called[2]).toEqual('callback3');
+
+  e.emit('foo');
+  expect(e.listeners('foo')).toHaveLength(0);
+  expect(Array.isArray(callbacks_called)).toBeTruthy();
+  expect(callbacks_called).toHaveLength(3);
+  expect(callbacks_called[0]).toEqual('callback1');
+  expect(callbacks_called[1]).toEqual('callback2');
+  expect(callbacks_called[2]).toEqual('callback3');
+
+  e.on('foo', callback1);
+  e.on('foo', callback2);
+  expect(e.listeners('foo')).toHaveLength(2);
+  void e.removeAllListeners('foo');
+  expect(e.listeners('foo')).toHaveLength(0);
+});
+
+test('removing callbacks in emit', () => {
+  // Verify that removing callbacks while in emit allows emits to propagate to
+  // all listeners
+  callbacks_called = [];
+
+  e.on('foo', callback2);
+  e.on('foo', callback3);
+  expect(e.listeners('foo')).toHaveLength(2);
+  e.emit('foo');
+  expect(Array.isArray(callbacks_called)).toBeTruthy();
+  expect(callbacks_called).toHaveLength(2);
+  expect(callbacks_called[0]).toEqual('callback2');
+  expect(callbacks_called[1]).toEqual('callback3');
+  expect(e.listeners('foo')).toHaveLength(0);
+});
diff --git a/tests/library/events/num-args.spec.ts b/tests/library/events/num-args.spec.ts
new file mode 100644
index 0000000000000..4125cc6ecf6d2
--- /dev/null
+++ b/tests/library/events/num-args.spec.ts
@@ -0,0 +1,62 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('should work', () => {
+  const e = new EventEmitter();
+  const num_args_emitted = [];
+
+  e.on('numArgs', (...args) => {
+    const numArgs = args.length;
+    num_args_emitted.push(numArgs);
+  });
+
+  e.on('foo', function() {
+    num_args_emitted.push(arguments.length);
+  });
+
+  e.on('foo', function() {
+    num_args_emitted.push(arguments.length);
+  });
+
+  e.emit('numArgs');
+  e.emit('numArgs', null);
+  e.emit('numArgs', null, null);
+  e.emit('numArgs', null, null, null);
+  e.emit('numArgs', null, null, null, null);
+  e.emit('numArgs', null, null, null, null, null);
+
+  e.emit('foo', null, null, null, null);
+
+  expect(Array.isArray(num_args_emitted)).toBeTruthy();
+  expect(num_args_emitted).toHaveLength(8);
+  expect(num_args_emitted[0]).toEqual(0);
+  expect(num_args_emitted[1]).toEqual(1);
+  expect(num_args_emitted[2]).toEqual(2);
+  expect(num_args_emitted[3]).toEqual(3);
+  expect(num_args_emitted[4]).toEqual(4);
+  expect(num_args_emitted[5]).toEqual(5);
+  expect(num_args_emitted[6]).toEqual(4);
+  expect(num_args_emitted[6]).toEqual(4);
+});
diff --git a/tests/library/events/once.spec.ts b/tests/library/events/once.spec.ts
new file mode 100644
index 0000000000000..0e7f5aebfcb10
--- /dev/null
+++ b/tests/library/events/once.spec.ts
@@ -0,0 +1,84 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { test, expect } from '@playwright/test';
+import { EventEmitter } from './utils';
+import * as common from './utils';
+
+test('should work', () => {
+  const e = new EventEmitter();
+
+  e.once('hello', common.mustCall());
+
+  e.emit('hello', 'a', 'b');
+  e.emit('hello', 'a', 'b');
+  e.emit('hello', 'a', 'b');
+  e.emit('hello', 'a', 'b');
+
+  const remove = () => {
+    expect(false).toBe(true);
+  };
+
+  e.once('foo', remove);
+  e.removeListener('foo', remove);
+  e.emit('foo');
+
+  e.once('e', common.mustCall(() => {
+    e.emit('e');
+  }));
+
+  e.once('e', common.mustCall());
+
+  e.emit('e');
+
+  // Verify that the listener must be a function
+  expect(() => {
+    const ee = new EventEmitter();
+
+    ee.once('foo', null);
+  }).toThrow(TypeError);
+});
+
+test('once() has different code paths based on the number of arguments being emitted', () => {
+  // Verify that all of the cases are covered.
+  const maxArgs = 4;
+
+  for (let i = 0; i <= maxArgs; i++) {
+    const ee = new EventEmitter();
+    const args: any[] = ['foo'];
+
+    for (let j = 0; j < i; j++)
+      args.push(j);
+
+    ee.once('foo', common.mustCall((...params) => {
+      const restArgs = args.slice(1);
+      expect(Array.isArray(params)).toBeTruthy();
+      expect(params).toHaveLength(restArgs.length);
+      for (let index = 0; index < params.length; index++) {
+        const param = params[index];
+        expect(param).toEqual(restArgs[index]);
+      }
+    }));
+
+    EventEmitter.prototype.emit.apply(ee, args);
+  }
+});
diff --git a/tests/library/events/prepend.spec.ts b/tests/library/events/prepend.spec.ts
new file mode 100644
index 0000000000000..2e2de78999983
--- /dev/null
+++ b/tests/library/events/prepend.spec.ts
@@ -0,0 +1,52 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('EventEmitter functionality', () => {
+  const myEE = new EventEmitter();
+  let m = 0;
+  // This one comes last.
+  myEE.on('foo', () => {
+    expect(m).toEqual(2);
+  });
+
+  // This one comes second.
+  myEE.prependListener('foo', () => {
+    expect(m++).toEqual(1);
+  });
+
+  // This one comes first.
+  myEE.prependOnceListener('foo', () => {
+    expect(m++).toEqual(0);
+  });
+
+  myEE.emit('foo');
+});
+
+test('Verify that the listener must be a function', () => {
+  expect(() => {
+    const ee = new EventEmitter();
+    ee.prependOnceListener('foo', null);
+  }).toThrow(TypeError);
+});
diff --git a/tests/library/events/remove-all-listeners-wait.spec.ts b/tests/library/events/remove-all-listeners-wait.spec.ts
new file mode 100644
index 0000000000000..dbc141d6d8a39
--- /dev/null
+++ b/tests/library/events/remove-all-listeners-wait.spec.ts
@@ -0,0 +1,80 @@
+/**
+ * Copyright 2018 Google Inc. All rights reserved.
+ * Modifications 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 { ManualPromise } from '../../../packages/playwright-core/lib/utils/isomorphic/manualPromise';
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('should not throw with ignoreErrors', async () => {
+  const ee = new EventEmitter();
+  const releaseHandler = new ManualPromise();
+  ee.on('console', async () => {
+    await releaseHandler;
+    throw new Error('Error in console handler');
+  });
+  ee.emit('console');
+  await ee.removeAllListeners('console', { behavior: 'ignoreErrors' });
+  releaseHandler.resolve();
+});
+
+test('should wait', async () => {
+  const ee = new EventEmitter();
+  const releaseHandler = new ManualPromise();
+  let value = 0;
+  ee.on('console', async () => {
+    await releaseHandler;
+    value = 42;
+  });
+  ee.emit('console');
+  const removePromise = ee.removeAllListeners('console', { behavior: 'wait' });
+  releaseHandler.resolve();
+  await removePromise;
+  expect(value).toBe(42);
+});
+
+test('should wait all', async () => {
+  const ee = new EventEmitter();
+  const releaseHandler = new ManualPromise();
+  const values = [];
+  ee.on('a', async () => {
+    await releaseHandler;
+    values.push(42);
+  });
+  ee.on('b', async () => {
+    await releaseHandler;
+    values.push(43);
+  });
+  ee.emit('a');
+  ee.emit('b');
+  const removePromise = ee.removeAllListeners(undefined, { behavior: 'wait' });
+  releaseHandler.resolve();
+  await removePromise;
+  expect(values).toEqual([42, 43]);
+});
+
+test('wait should throw', async () => {
+  const ee = new EventEmitter();
+  const releaseHandler = new ManualPromise();
+  ee.on('console', async () => {
+    await releaseHandler;
+    throw new Error('Error in handler');
+  });
+  ee.emit('console');
+  const removePromise = ee.removeAllListeners('console', { behavior: 'wait' });
+  releaseHandler.resolve();
+  await expect(removePromise).rejects.toThrow('Error in handler');
+});
diff --git a/tests/library/events/remove-all-listeners.spec.ts b/tests/library/events/remove-all-listeners.spec.ts
new file mode 100644
index 0000000000000..b00f747628a97
--- /dev/null
+++ b/tests/library/events/remove-all-listeners.spec.ts
@@ -0,0 +1,136 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+import * as common from './utils';
+
+let wrappers: any[];
+
+const expectWrapper = expected => {
+  const entry: any = { expected };
+  wrappers.push(entry);
+  return name => {
+    entry.actual = entry.actual || [];
+    entry.actual.push(name);
+  };
+};
+
+test.beforeEach(() => {
+  wrappers = [];
+});
+
+test.afterEach(() => {
+  for (const wrapper of wrappers) {
+    const sortedActual = wrapper.actual.sort();
+    const sortedExpected = wrapper.expected.sort();
+    expect(sortedActual).toEqual(sortedExpected);
+  }
+});
+
+test('listeners', () => {
+  const ee = new EventEmitter();
+  const noop = () => { };
+  ee.on('foo', noop);
+  ee.on('bar', noop);
+  ee.on('baz', noop);
+  ee.on('baz', noop);
+  const fooListeners = ee.listeners('foo');
+  const barListeners = ee.listeners('bar');
+  const bazListeners = ee.listeners('baz');
+  ee.on('removeListener', expectWrapper(['bar', 'baz', 'baz']));
+  void ee.removeAllListeners('bar');
+  void ee.removeAllListeners('baz');
+
+  let listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(1);
+  expect(listeners[0]).toEqual(noop);
+
+  listeners = ee.listeners('bar');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+  listeners = ee.listeners('baz');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+
+  expect(fooListeners.length).toEqual(1);
+  expect(fooListeners[0]).toEqual(noop);
+  expect(barListeners.length).toEqual(1);
+  expect(barListeners[0]).toEqual(noop);
+  expect(bazListeners.length).toEqual(2);
+  expect(bazListeners[0]).toEqual(noop);
+  expect(bazListeners[1]).toEqual(noop);
+
+  expect(ee.listeners('bar')).not.toEqual(barListeners);
+  expect(ee.listeners('baz')).not.toEqual(bazListeners);
+});
+
+test('removeAllListeners removes all listeners', () => {
+  const ee = new EventEmitter();
+  ee.on('foo', () => { });
+  ee.on('bar', () => { });
+  ee.on('removeListener', expectWrapper(['foo', 'bar', 'removeListener']));
+  ee.on('removeListener', expectWrapper(['foo', 'bar']));
+  void ee.removeAllListeners();
+
+  let listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+  listeners = ee.listeners('bar');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+});
+
+test('removeAllListeners with no event type', () => {
+  const ee = new EventEmitter();
+  ee.on('removeListener', common.mustNotCall());
+  // Check for regression where removeAllListeners() throws when
+  // there exists a 'removeListener' listener, but there exists
+  // no listeners for the provided event type.
+  (ee as any).removeAllListeners(ee, 'foo');
+});
+
+test('listener count after removeAllListeners', () => {
+  const ee = new EventEmitter();
+  let expectLength = 2;
+  ee.on('removeListener', () => {
+    expect(expectLength--).toEqual(ee.listeners('baz').length);
+  });
+  ee.on('baz', () => { });
+  ee.on('baz', () => { });
+  ee.on('baz', () => { });
+  expect(ee.listeners('baz').length).toEqual(expectLength + 1);
+  void ee.removeAllListeners('baz');
+  expect(ee.listeners('baz').length).toEqual(0);
+});
+
+test('removeAllListeners returns EventEmitter', () => {
+  const ee = new EventEmitter();
+  expect(ee).toEqual(ee.removeAllListeners());
+});
+
+test('removeAllListeners on undefined _events', () => {
+  const ee = new EventEmitter();
+  ee._events = undefined;
+  expect(ee).toEqual(ee.removeAllListeners());
+});
diff --git a/tests/library/events/remove-listeners.spec.ts b/tests/library/events/remove-listeners.spec.ts
new file mode 100644
index 0000000000000..012128c51988a
--- /dev/null
+++ b/tests/library/events/remove-listeners.spec.ts
@@ -0,0 +1,188 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+import * as common from './utils';
+
+const listener1 = () => {};
+const listener2 = () => {};
+
+test.beforeEach(() => common.beforeEach());
+test.afterEach(() => common.afterEach());
+
+test('First test', () => {
+  const ee = new EventEmitter();
+  ee.on('hello', listener1);
+  ee.on('removeListener', common.mustCall((name, cb) => {
+    expect(name).toEqual('hello');
+    expect(cb).toEqual(listener1);
+  }));
+  ee.removeListener('hello', listener1);
+  const listeners = ee.listeners('hello');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners).toHaveLength(0);
+});
+
+test('Second test', () => {
+  const ee = new EventEmitter();
+  ee.on('hello', listener1);
+  ee.on('removeListener', common.mustNotCall());
+  ee.removeListener('hello', listener2);
+
+  const listeners = ee.listeners('hello');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners.length).toEqual(1);
+  expect(listeners[0]).toEqual(listener1);
+});
+
+test('Third test', () => {
+  const ee = new EventEmitter();
+  ee.on('hello', listener1);
+  ee.on('hello', listener2);
+
+  let listeners;
+  ee.once('removeListener', common.mustCall((name, cb) => {
+    expect(name).toEqual('hello');
+    expect(cb).toEqual(listener1);
+    listeners = ee.listeners('hello');
+    expect(Array.isArray(listeners)).toBeTruthy();
+    expect(listeners.length).toEqual(1);
+    expect(listeners[0]).toEqual(listener2);
+  }));
+  ee.removeListener('hello', listener1);
+  listeners = ee.listeners('hello');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners.length).toEqual(1);
+  expect(listeners[0]).toEqual(listener2);
+  ee.once('removeListener', common.mustCall((name, cb) => {
+    expect(name).toEqual('hello');
+    expect(cb).toEqual(listener2);
+    listeners = ee.listeners('hello');
+    expect(Array.isArray(listeners)).toBeTruthy();
+    expect(listeners.length).toEqual(0);
+  }));
+  ee.removeListener('hello', listener2);
+  listeners = ee.listeners('hello');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners.length).toEqual(0);
+});
+
+test('Fourth test', () => {
+  const ee = new EventEmitter();
+
+  const remove1 = () => {
+    throw new Error('remove1 should not have been called');
+  };
+
+  const remove2 = () => {
+    throw new Error('remove2 should not have been called');
+  };
+
+  ee.on('removeListener', common.mustCall((name, cb) => {
+    if (cb !== remove1)
+      return;
+    ee.removeListener('quux', remove2);
+    ee.emit('quux');
+  }, 2));
+  ee.on('quux', remove1);
+  ee.on('quux', remove2);
+  ee.removeListener('quux', remove1);
+});
+
+test('Fifth test', () => {
+  const ee = new EventEmitter();
+  const listener3 = common.mustCall(() => {
+    ee.removeListener('hello', listener4);
+  }, 2);
+  const listener4 = common.mustCall();
+
+  ee.on('hello', listener3);
+  ee.on('hello', listener4);
+
+  // listener4 will still be called although it is removed by listener 3.
+  ee.emit('hello');
+  // This is so because the interal listener array at time of emit
+  // was [listener3,listener4]
+
+  // Interal listener array [listener3]
+  ee.emit('hello');
+});
+
+test('Sixth test', () => {
+  const ee = new EventEmitter();
+
+  ee.once('hello', listener1);
+  ee.on('removeListener', common.mustCall((eventName, listener) => {
+    expect(eventName).toEqual('hello');
+    expect(listener).toEqual(listener1);
+  }));
+  ee.emit('hello');
+});
+
+test('Seventh test', () => {
+  const ee = new EventEmitter();
+
+  expect(ee).toEqual(ee.removeListener('foo', () => {}));
+});
+
+// Verify that the removed listener must be a function
+test('Eighth test', () => {
+  expect(() => {
+    const ee = new EventEmitter();
+
+    ee.removeListener('foo', null);
+  }).toThrow(/^The "listener" argument must be of type Function\. Received type object$/);
+});
+
+test('Ninth test', () => {
+  const ee = new EventEmitter();
+  const listener = () => {};
+  ee._events = undefined;
+  const e = ee.removeListener('foo', listener);
+  expect(e).toEqual(ee);
+});
+
+test('Tenth test', () => {
+  const ee = new EventEmitter();
+
+  ee.on('foo', listener1);
+  ee.on('foo', listener2);
+  let listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners.length).toEqual(2);
+  expect(listeners[0]).toEqual(listener1);
+  expect(listeners[1]).toEqual(listener2);
+
+  ee.removeListener('foo', listener1);
+  expect(ee._events.foo).toEqual(listener2);
+
+  ee.on('foo', listener1);
+  listeners = ee.listeners('foo');
+  expect(Array.isArray(listeners)).toBeTruthy();
+  expect(listeners.length).toEqual(2);
+  expect(listeners[0]).toEqual(listener2);
+  expect(listeners[1]).toEqual(listener1);
+
+  ee.removeListener('foo', listener1);
+  expect(ee._events.foo).toEqual(listener2);
+});
diff --git a/tests/library/events/set-max-listeners-side-effects.spec.ts b/tests/library/events/set-max-listeners-side-effects.spec.ts
new file mode 100644
index 0000000000000..17e3ce0ce36b3
--- /dev/null
+++ b/tests/library/events/set-max-listeners-side-effects.spec.ts
@@ -0,0 +1,34 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('set max listeners test', () => {
+  const e = new EventEmitter();
+
+  expect(!(e._events instanceof Object)).toBeTruthy();
+  expect(Object.keys(e._events)).toHaveLength(0);
+
+  e.setMaxListeners(5);
+  expect(Object.keys(e._events)).toHaveLength(0);
+});
diff --git a/tests/library/events/special-event-names.spec.ts b/tests/library/events/special-event-names.spec.ts
new file mode 100644
index 0000000000000..3199ee281107b
--- /dev/null
+++ b/tests/library/events/special-event-names.spec.ts
@@ -0,0 +1,46 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { test, expect } from '@playwright/test';
+import { EventEmitter } from './utils';
+
+
+test('should support special event names', () => {
+  const ee = new EventEmitter();
+  const handler = () => {};
+
+  expect(ee.eventNames().length).toEqual(0);
+  expect(ee._events.hasOwnProperty).toEqual(undefined);
+  expect(ee._events.toString).toEqual(undefined);
+
+  ee.on('__defineGetter__', handler);
+  ee.on('toString', handler);
+  ee.on('__proto__', handler);
+
+  expect(ee.eventNames()[0]).toEqual('__defineGetter__');
+  expect(ee.eventNames()[1]).toEqual('toString');
+
+  expect(ee.listeners('__defineGetter__').length).toEqual(1);
+  expect(ee.listeners('__defineGetter__')[0]).toEqual(handler);
+  expect(ee.listeners('toString').length).toEqual(1);
+  expect(ee.listeners('toString')[0]).toEqual(handler);
+});
diff --git a/tests/library/events/subclass.spec.ts b/tests/library/events/subclass.spec.ts
new file mode 100644
index 0000000000000..68d6e073f4787
--- /dev/null
+++ b/tests/library/events/subclass.spec.ts
@@ -0,0 +1,54 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+class MyEE extends EventEmitter {
+  constructor(cb) {
+    super();
+    this.once(1, cb);
+    this.emit(1);
+    void this.removeAllListeners();
+  }
+}
+
+test('myee instance', () => {
+  const myee = new MyEE(() => {});
+  expect(myee._events).not.toBeInstanceOf(Object);
+  expect(Object.keys(myee._events).length).toBe(0);
+});
+
+class MyEE2 {
+  ee: EventEmitter;
+  constructor() {
+    this.ee = new EventEmitter();
+  }
+}
+
+test('MyEE2 instance', () => {
+  const ee1 = new MyEE2();
+  const ee2 = new MyEE2();
+
+  ee1.ee.on('x', function() {});
+  expect(ee2.ee.listenerCount('x')).toBe(0);
+});
diff --git a/tests/library/events/symbols.spec.ts b/tests/library/events/symbols.spec.ts
new file mode 100644
index 0000000000000..c78d61476da4e
--- /dev/null
+++ b/tests/library/events/symbols.spec.ts
@@ -0,0 +1,46 @@
+// Copyright Joyent, Inc. and other Node contributors.
+// Modifications copyright (c) by Microsoft Corporation
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { EventEmitter } from './utils';
+import { test, expect } from '@playwright/test';
+
+test('should support symbols', () => {
+  const ee = new EventEmitter();
+  const foo = Symbol('foo');
+  const listener = () => {};
+
+  ee.on(foo, listener);
+  expect(ee.listeners(foo).length).toEqual(1);
+  expect(ee.listeners(foo)[0]).toEqual(listener);
+
+  ee.emit(foo);
+
+  void ee.removeAllListeners();
+  expect(ee.listeners(foo).length).toEqual(0);
+
+  ee.on(foo, listener);
+  expect(ee.listeners(foo).length).toEqual(1);
+  expect(ee.listeners(foo)[0]).toEqual(listener);
+
+  ee.removeListener(foo, listener);
+  expect(ee.listeners(foo).length).toEqual(0);
+});
diff --git a/tests/library/events/utils.ts b/tests/library/events/utils.ts
new file mode 100644
index 0000000000000..7ba4816376542
--- /dev/null
+++ b/tests/library/events/utils.ts
@@ -0,0 +1,54 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import { expect } from '@playwright/test';
+import { EventEmitter as OriginalEventEmitter } from '../../../packages/playwright-core/lib/client/eventEmitter';
+import { nodePlatform } from '../../../packages/playwright-core/lib/server/utils/nodePlatform';
+
+export const mustNotCall = (msg?: string) => {
+  return function mustNotCall() {
+    expect(false, msg || 'function should not have been called').toBeTruthy();
+  };
+};
+
+let count;
+
+export const beforeEach = () => {
+  count = 0;
+};
+
+export const afterEach = () => {
+  expect(count).toBe(0);
+};
+
+export const mustCall = (fn?: Function, exact?: number) => {
+  count += exact || 1;
+  return (...args: any[]) => {
+    fn?.(...args);
+    --count;
+  };
+};
+
+export class EventEmitter extends OriginalEventEmitter {
+  constructor() {
+    super(nodePlatform);
+  }
+}
diff --git a/tests/library/fetch-proxy.spec.ts b/tests/library/fetch-proxy.spec.ts
index b0c921c8e395f..149bd2f2b1258 100644
--- a/tests/library/fetch-proxy.spec.ts
+++ b/tests/library/fetch-proxy.spec.ts
@@ -16,23 +16,19 @@
 
 import { contextTest as it, expect } from '../config/browserTest';
 
-it.use({
-  launchOptions: async ({ launchOptions }, use) => {
-    await use({
-      ...launchOptions,
-      proxy: { server: 'per-context' }
-    });
-  }
-});
-
 it.skip(({ mode }) => mode !== 'default');
 
 it('context request should pick up proxy credentials', async ({ browserType, server, proxyServer }) => {
   proxyServer.forwardTo(server.PORT, { allowConnectRequests: true });
-  let auth;
-  proxyServer.setAuthHandler(req => {
-    auth = req.headers['proxy-authorization'];
-    return !!auth;
+  const authPromise = new Promise<string>(resolve => {
+    proxyServer.setAuthHandler(req => {
+      const header = req.headers['proxy-authorization'];
+      // Browser can issue various unrelated requests over the proxy,
+      // but we are only interested in our own request.
+      if (proxyServer.connectHosts.includes('non-existent.com:80'))
+        resolve(header);
+      return !!header;
+    });
   });
   const browser = await browserType.launch({
     proxy: { server: `localhost:${proxyServer.PORT}`, username: 'user', password: 'secret' }
@@ -40,6 +36,7 @@ it('context request should pick up proxy credentials', async ({ browserType, ser
   const context = await browser.newContext();
   const response = await context.request.get('http://non-existent.com/simple.json');
   expect(proxyServer.connectHosts).toContain('non-existent.com:80');
+  const auth = await authPromise;
   expect(auth).toBe('Basic ' + Buffer.from('user:secret').toString('base64'));
   expect(await response.json()).toEqual({ foo: 'bar' });
   await browser.close();
diff --git a/tests/library/firefox/launcher.spec.ts b/tests/library/firefox/launcher.spec.ts
index 294d53643c0ef..1fe1de3e20cc1 100644
--- a/tests/library/firefox/launcher.spec.ts
+++ b/tests/library/firefox/launcher.spec.ts
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
+import fs from 'fs';
 import { playwrightTest as it, expect } from '../../config/browserTest';
+import { TestServer } from '../../config/testserver';
 
 it('should pass firefox user preferences', async ({ browserType, mode }) => {
   it.skip(mode.startsWith('service'));
   const browser = await browserType.launch({
     firefoxUserPrefs: {
       'network.proxy.type': 1,
-      'network.proxy.http': '127.0.0.1',
-      'network.proxy.http_port': 3333,
+      'network.proxy.ssl': '127.0.0.1',
+      'network.proxy.ssl_port': 3333,
     }
   });
   const page = await browser.newPage();
-  const error = await page.goto('http://example.com').catch(e => e);
+  const error = await page.goto('https://example.com').catch(e => e);
   expect(error.message).toContain('NS_ERROR_PROXY_CONNECTION_REFUSED');
   await browser.close();
 });
@@ -36,10 +38,41 @@ it('should pass firefox user preferences in persistent', async ({ mode, launchPe
   const { page } = await launchPersistent({
     firefoxUserPrefs: {
       'network.proxy.type': 1,
-      'network.proxy.http': '127.0.0.1',
-      'network.proxy.http_port': 3333,
+      'network.proxy.ssl': '127.0.0.1',
+      'network.proxy.ssl_port': 3333,
     }
   });
-  const error = await page.goto('http://example.com').catch(e => e);
+  const error = await page.goto('https://example.com').catch(e => e);
   expect(error.message).toContain('NS_ERROR_PROXY_CONNECTION_REFUSED');
 });
+
+it('should support custom firefox policies', async ({ browserType, mode, asset, loopback }, testInfo) => {
+  it.skip(mode.startsWith('service'));
+
+  const policies = {
+    'policies': {
+      'Certificates': {
+        'Install': [asset('client-certificates/server/server_cert.pem')],
+      },
+    },
+  };
+  const policiesPath = testInfo.outputPath('policies.json');
+  await fs.promises.writeFile(policiesPath, JSON.stringify(policies));
+
+  const port = 48112;
+  const server = new TestServer(asset(''), port, loopback, {
+    key: await fs.promises.readFile(asset('client-certificates/client/localhost/localhost.key')),
+    cert: await fs.promises.readFile(asset('client-certificates/client/localhost/localhost.pem')),
+  });
+  await server.waitUntilReady();
+
+  const browser = await browserType.launch({
+    env: { ...process.env, 'PLAYWRIGHT_FIREFOX_POLICIES_JSON': policiesPath },
+  });
+
+  const page = await browser.newPage();
+  await page.goto(server.PREFIX + '/frames/frame.html');
+  await expect(page.locator('body')).toHaveText(`Hi, I'm frame`);
+  await browser.close();
+  await server.stop();
+});
diff --git a/tests/library/geolocation.spec.ts b/tests/library/geolocation.spec.ts
index 30ea11781d99c..525e5cd3092ce 100644
--- a/tests/library/geolocation.spec.ts
+++ b/tests/library/geolocation.spec.ts
@@ -85,7 +85,7 @@ it('should throw with missing latitude', async ({ contextFactory }) => {
   } catch (e) {
     error = e;
   }
-  expect(error.message).toContain('geolocation.latitude: expected number, got undefined');
+  expect(error.message).toContain('geolocation.latitude: expected float, got undefined');
 });
 
 it('should not modify passed default options object', async ({ browser }) => {
@@ -106,7 +106,7 @@ it('should throw with missing longitude in default options', async ({ browser })
   } catch (e) {
     error = e;
   }
-  expect(error.message).toContain('geolocation.longitude: expected number, got undefined');
+  expect(error.message).toContain('geolocation.longitude: expected float, got undefined');
 });
 
 it('should use context options', async ({ browser, server }) => {
diff --git a/tests/library/global-fetch-cookie.spec.ts b/tests/library/global-fetch-cookie.spec.ts
index 67845f8b8e752..f747a5cd3b334 100644
--- a/tests/library/global-fetch-cookie.spec.ts
+++ b/tests/library/global-fetch-cookie.spec.ts
@@ -37,7 +37,7 @@ type StorageStateType = PromiseArg<ReturnType<APIRequestContext['storageState']>
 it.skip(({ mode }) => mode !== 'default');
 
 const __testHookLookup = (hostname: string): LookupAddress[] => {
-  if (hostname === 'localhost' || hostname.endsWith('one.com') || hostname.endsWith('two.com'))
+  if (hostname.endsWith('localhost') || hostname.endsWith('one.com') || hostname.endsWith('two.com'))
     return [{ address: '127.0.0.1', family: 4 }];
   else
     throw new Error(`Failed to resolve hostname: ${hostname}`);
@@ -140,6 +140,20 @@ it('should send secure cookie over http for localhost', async ({ request, server
   expect(serverRequest.headers.cookie).toBe('a=v; b=v');
 });
 
+it('should send secure cookie over http for subdomains of localhost', async ({ request, server }) => {
+  server.setRoute('/setcookie.html', (req, res) => {
+    res.setHeader('Set-Cookie', ['a=v; secure', 'b=v']);
+    res.end();
+  });
+  const prefix = `http://a.b.localhost:${server.PORT}`;
+  await request.get(`${prefix}/setcookie.html`, {  __testHookLookup } as any);
+  const [serverRequest] = await Promise.all([
+    server.waitForRequest('/empty.html'),
+    request.get(`${prefix}/empty.html`)
+  ]);
+  expect(serverRequest.headers.cookie).toBe('a=v; b=v');
+});
+
 it('should send not expired cookies', async ({ request, server }) => {
   server.setRoute('/setcookie.html', (req, res) => {
     const tomorrow = new Date();
@@ -351,13 +365,34 @@ it('should preserve local storage on import/export of storage state', async ({ p
         localStorage: [{
           name: 'name1',
           value: 'value1'
-        }]
+        }],
+        ...{
+          indexedDB: [
+            {
+              name: 'db',
+              version: 5,
+              stores: [
+                {
+                  name: 'store',
+                  keyPath: 'id',
+                  autoIncrement: false,
+                  indexes: [],
+                  records: [
+                    {
+                      value: { id: 'foo', name: 'John Doe' }
+                    }
+                  ],
+                }
+              ]
+            }
+          ]
+        },
       },
     ]
   };
   const request = await playwright.request.newContext({ storageState });
   await request.get(server.EMPTY_PAGE);
-  const exportedState = await request.storageState();
+  const exportedState = await request.storageState({ indexedDB: true });
   expect(exportedState).toEqual(storageState);
   await request.dispose();
 });
diff --git a/tests/library/global-fetch.spec.ts b/tests/library/global-fetch.spec.ts
index 59152726214ce..da01a5d3f86eb 100644
--- a/tests/library/global-fetch.spec.ts
+++ b/tests/library/global-fetch.spec.ts
@@ -16,10 +16,16 @@
 
 import os from 'os';
 import * as util from 'util';
-import { getPlaywrightVersion } from '../../packages/playwright-core/lib/utils/userAgent';
-import { expect, playwrightTest as it } from '../config/browserTest';
+import { getPlaywrightVersion } from '../../packages/playwright-core/lib/server/utils/userAgent';
+import { expect, playwrightTest as base } from '../config/browserTest';
 import { kTargetClosedErrorMessage } from 'tests/config/errors';
 
+const it = base.extend({
+  context: async ({}, use) => {
+    throw new Error('global fetch tests should not use context');
+  }
+});
+
 it.skip(({ mode }) => mode !== 'default');
 
 for (const method of ['fetch', 'delete', 'get', 'head', 'patch', 'post', 'put'] as const) {
@@ -33,9 +39,11 @@ for (const method of ['fetch', 'delete', 'get', 'head', 'patch', 'post', 'put']
     expect(response.headers()['content-type']).toBe('application/json; charset=utf-8');
     expect(response.headersArray()).toContainEqual({ name: 'Content-Type', value: 'application/json; charset=utf-8' });
     expect(await response.text()).toBe('head' === method ? '' : '{"foo": "bar"}\n');
+    await request.dispose();
   });
 }
 
+
 it(`should dispose global request`, async function({ playwright, server }) {
   const request = await playwright.request.newContext();
   const response = await request.get(server.PREFIX + '/simple.json');
@@ -43,6 +51,7 @@ it(`should dispose global request`, async function({ playwright, server }) {
   await request.dispose();
   const error = await response.body().catch(e => e);
   expect(error.message).toContain('Response has been disposed');
+  await request.dispose();
 });
 
 it('should support global userAgent option', async ({ playwright, server }) => {
@@ -54,13 +63,15 @@ it('should support global userAgent option', async ({ playwright, server }) => {
   expect(response.ok()).toBeTruthy();
   expect(response.url()).toBe(server.EMPTY_PAGE);
   expect(serverRequest.headers['user-agent']).toBe('My Agent');
+  await request.dispose();
 });
 
 it('should support global timeout option', async ({ playwright, server }) => {
   const request = await playwright.request.newContext({ timeout: 100 });
   server.setRoute('/empty.html', (req, res) => {});
   const error = await request.get(server.EMPTY_PAGE).catch(e => e);
-  expect(error.message).toContain('Request timed out after 100ms');
+  expect(error.message).toContain('apiRequestContext.get: Timeout 100ms exceeded');
+  await request.dispose();
 });
 
 it('should propagate extra http headers with redirects', async ({ playwright, server }) => {
@@ -76,6 +87,7 @@ it('should propagate extra http headers with redirects', async ({ playwright, se
   expect(req1.headers['my-secret']).toBe('Value');
   expect(req2.headers['my-secret']).toBe('Value');
   expect(req3.headers['my-secret']).toBe('Value');
+  await request.dispose();
 });
 
 it('should support global httpCredentials option', async ({ playwright, server }) => {
@@ -96,6 +108,7 @@ it('should return error with wrong credentials', async ({ playwright, server })
   const request = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'wrong' } });
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(401);
+  await request.dispose();
 });
 
 it('should work with correct credentials and matching origin', async ({ playwright, server }) => {
@@ -103,6 +116,7 @@ it('should work with correct credentials and matching origin', async ({ playwrig
   const request = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'pass', origin: server.PREFIX } });
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(200);
+  await request.dispose();
 });
 
 it('should work with correct credentials and matching origin case insensitive', async ({ playwright, server }) => {
@@ -110,6 +124,7 @@ it('should work with correct credentials and matching origin case insensitive',
   const request = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'pass', origin: server.PREFIX.toUpperCase() } });
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(200);
+  await request.dispose();
 });
 
 it('should return error with correct credentials and mismatching scheme', async ({ playwright, server }) => {
@@ -117,6 +132,7 @@ it('should return error with correct credentials and mismatching scheme', async
   const request = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'pass', origin: server.PREFIX.replace('http://', 'https://') } });
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(401);
+  await request.dispose();
 });
 
 it('should return error with correct credentials and mismatching hostname', async ({ playwright, server }) => {
@@ -126,6 +142,7 @@ it('should return error with correct credentials and mismatching hostname', asyn
   const request = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'pass', origin: origin } });
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(401);
+  await request.dispose();
 });
 
 it('should return error with correct credentials and mismatching port', async ({ playwright, server }) => {
@@ -134,6 +151,7 @@ it('should return error with correct credentials and mismatching port', async ({
   const request = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'pass', origin: origin } });
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(401);
+  await request.dispose();
 });
 
 it('should support WWW-Authenticate: Basic', async ({ playwright, server }) => {
@@ -152,6 +170,7 @@ it('should support WWW-Authenticate: Basic', async ({ playwright, server }) => {
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.status()).toBe(200);
   expect(credentials).toBe('user:pass');
+  await request.dispose();
 });
 
 it('should support HTTPCredentials.send', async ({ playwright, server }) => {
@@ -176,12 +195,14 @@ it('should support HTTPCredentials.send', async ({ playwright, server }) => {
     expect(serverRequest.headers.authorization).toBe(undefined);
     expect(response.status()).toBe(200);
   }
+  await request.dispose();
 });
 
 it('should support global ignoreHTTPSErrors option', async ({ playwright, httpsServer }) => {
   const request = await playwright.request.newContext({ ignoreHTTPSErrors: true });
   const response = await request.get(httpsServer.EMPTY_PAGE);
   expect(response.status()).toBe(200);
+  await request.dispose();
 });
 
 it('should propagate ignoreHTTPSErrors on redirects', async ({ playwright, httpsServer }) => {
@@ -189,12 +210,21 @@ it('should propagate ignoreHTTPSErrors on redirects', async ({ playwright, https
   const request = await playwright.request.newContext();
   const response = await request.get(httpsServer.PREFIX + '/redir', { ignoreHTTPSErrors: true });
   expect(response.status()).toBe(200);
+  await request.dispose();
 });
 
 it('should resolve url relative to global baseURL option', async ({ playwright, server }) => {
   const request = await playwright.request.newContext({ baseURL: server.PREFIX });
   const response = await request.get('/empty.html');
   expect(response.url()).toBe(server.EMPTY_PAGE);
+  await request.dispose();
+});
+
+it('should fallback to given URL if baseURL is bogus', async ({ playwright, server }) => {
+  const request = await playwright.request.newContext({ baseURL: 'bogus' });
+  const response = await request.get(server.PREFIX + '/empty.html');
+  expect(response.url()).toBe(server.EMPTY_PAGE);
+  await request.dispose();
 });
 
 it('should set playwright as user-agent', async ({ playwright, server, isWindows, isLinux, isMac }) => {
@@ -221,12 +251,14 @@ it('should set playwright as user-agent', async ({ playwright, server, isWindows
     expect(userAgentMasked.replace(/<ARCH>; \w+ [^)]+/, '<ARCH>; distro version')).toBe('Playwright/X.X.X (<ARCH>; distro version) node/X.X' + suffix);
   else if (isMac)
     expect(userAgentMasked).toBe('Playwright/X.X.X (<ARCH>; macOS X.X) node/X.X' + suffix);
+  await request.dispose();
 });
 
 it('should be able to construct with context options', async ({ playwright, browserType, server }) => {
-  const request = await playwright.request.newContext((browserType as any)._defaultContextOptions);
+  const request = await playwright.request.newContext((browserType as any)._playwright._defaultContextOptions);
   const response = await request.get(server.EMPTY_PAGE);
   expect(response.ok()).toBeTruthy();
+  await request.dispose();
 });
 
 it('should return empty body', async ({ playwright, server }) => {
@@ -251,9 +283,10 @@ it('should abort requests when context is disposed', async ({ playwright, server
   ]);
   for (const result of results.slice(0, -1)) {
     expect(result instanceof Error).toBeTruthy();
-    expect(result.message).toContain(kTargetClosedErrorMessage);
+    expect(result.message).toContain('Request context disposed.');
   }
   await connectionClosed;
+  await request.dispose();
 });
 
 it('should abort redirected requests when context is disposed', async ({ playwright, server }) => {
@@ -269,6 +302,7 @@ it('should abort redirected requests when context is disposed', async ({ playwri
   expect(result instanceof Error).toBeTruthy();
   expect(result.message).toContain(kTargetClosedErrorMessage);
   await connectionClosed;
+  await request.dispose();
 });
 
 it('should remove content-length from redirected post requests', async ({ playwright, server }) => {
@@ -403,6 +437,8 @@ it('should return body for failing requests', async ({ playwright, server }) =>
   await request.dispose();
 });
 
+const HTTP_METHODS = ['GET', 'PUT', 'POST', 'OPTIONS', 'HEAD', 'PATCH'] as const;
+
 it('should throw an error when maxRedirects is exceeded', async ({ playwright, server }) => {
   server.setRedirect('/a/redirect1', '/b/c/redirect2');
   server.setRedirect('/b/c/redirect2', '/b/c/redirect3');
@@ -410,7 +446,7 @@ it('should throw an error when maxRedirects is exceeded', async ({ playwright, s
   server.setRedirect('/b/c/redirect4', '/simple.json');
 
   const request = await playwright.request.newContext();
-  for (const method of ['GET', 'PUT', 'POST', 'OPTIONS', 'HEAD', 'PATCH']) {
+  for (const method of HTTP_METHODS) {
     for (const maxRedirects of [1, 2, 3])
       await expect(async () => request.fetch(`${server.PREFIX}/a/redirect1`, { method: method, maxRedirects: maxRedirects })).rejects.toThrow('Max redirect count exceeded');
   }
@@ -422,7 +458,7 @@ it('should not follow redirects when maxRedirects is set to 0', async ({ playwri
   server.setRedirect('/b/c/redirect2', '/simple.json');
 
   const request = await playwright.request.newContext();
-  for (const method of ['GET', 'PUT', 'POST', 'OPTIONS', 'HEAD', 'PATCH']){
+  for (const method of HTTP_METHODS){
     const response = await request.fetch(`${server.PREFIX}/a/redirect1`, { method, maxRedirects: 0 });
     expect(response.headers()['location']).toBe('/b/c/redirect2');
     expect(response.status()).toBe(302);
@@ -435,11 +471,59 @@ it('should throw an error when maxRedirects is less than 0', async ({ playwright
   server.setRedirect('/b/c/redirect2', '/simple.json');
 
   const request = await playwright.request.newContext();
-  for (const method of ['GET', 'PUT', 'POST', 'OPTIONS', 'HEAD', 'PATCH'])
+  for (const method of HTTP_METHODS)
     await expect(async () => request.fetch(`${server.PREFIX}/a/redirect1`, { method, maxRedirects: -1 })).rejects.toThrow(`'maxRedirects' must be greater than or equal to '0'`);
   await request.dispose();
 });
 
+it('should not follow redirects when maxRedirects is set to 0 in newContext', async ({ playwright, server }) => {
+  server.setRedirect('/a/redirect1', '/b/c/redirect2');
+  server.setRedirect('/b/c/redirect2', '/simple.json');
+
+  const request = await playwright.request.newContext({ maxRedirects: 0 });
+  for (const method of HTTP_METHODS) {
+    const response = await request.fetch(`${server.PREFIX}/a/redirect1`, { method });
+    expect(response.headers()['location']).toBe('/b/c/redirect2');
+    expect(response.status()).toBe(302);
+  }
+  await request.dispose();
+});
+
+it('should follow redirects up to maxRedirects limit set in newContext', async ({ playwright, server }) => {
+  server.setRedirect('/a/redirect1', '/b/c/redirect2');
+  server.setRedirect('/b/c/redirect2', '/b/c/redirect3');
+  server.setRedirect('/b/c/redirect3', '/b/c/redirect4');
+  server.setRedirect('/b/c/redirect4', '/simple.json');
+
+  for (const maxRedirects of [1, 2, 3, 4]) {
+    const request = await playwright.request.newContext({ maxRedirects });
+    for (const method of HTTP_METHODS) {
+      if (maxRedirects < 4) {
+        await expect(async () => request.fetch(`${server.PREFIX}/a/redirect1`, { method }))
+            .rejects.toThrow('Max redirect count exceeded');
+      } else {
+        const response = await request.fetch(`${server.PREFIX}/a/redirect1`, { method });
+        expect(response.status()).toBe(200);
+      }
+    }
+    await request.dispose();
+  }
+});
+
+it('should use maxRedirects from fetch when provided, overriding newContext', async ({ playwright, server }) => {
+  server.setRedirect('/a/redirect1', '/b/c/redirect2');
+  server.setRedirect('/b/c/redirect2', '/b/c/redirect3');
+  server.setRedirect('/b/c/redirect3', '/b/c/redirect4');
+  server.setRedirect('/b/c/redirect4', '/simple.json');
+
+  const request = await playwright.request.newContext({ maxRedirects: 1 });
+  for (const method of HTTP_METHODS) {
+    const response = await request.fetch(`${server.PREFIX}/a/redirect1`, { method, maxRedirects: 4 });
+    expect(response.status()).toBe(200);
+  }
+  await request.dispose();
+});
+
 it('should keep headers capitalization', async ({ playwright, server }) => {
   const request = await playwright.request.newContext();
   const [serverRequest, response] = await Promise.all([
@@ -473,7 +557,6 @@ it('should serialize post data on the client', async ({ playwright, server }) =>
   await postReq;
   const body = await (await serverReq).postBody;
   expect(body.toString()).toBe('{"foo":"bar"}');
-  // expect(serverRequest.rawHeaders).toContain('vaLUE');
   await request.dispose();
 });
 
@@ -486,7 +569,8 @@ it('should throw after dispose', async ({ playwright, server }) => {
 
 it('should retry ECONNRESET', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30978' }
-}, async ({ context, server }) => {
+}, async ({ playwright, server }) => {
+  const request = await playwright.request.newContext();
   let requestCount = 0;
   server.setRoute('/test', (req, res) => {
     if (requestCount++ < 3) {
@@ -496,8 +580,33 @@ it('should retry ECONNRESET', {
     res.writeHead(200, { 'content-type': 'text/plain' });
     res.end('Hello!');
   });
-  const response = await context.request.fetch(server.PREFIX + '/test', { maxRetries: 3 });
+  const response = await request.fetch(server.PREFIX + '/test', { maxRetries: 3 });
   expect(response.status()).toBe(200);
   expect(await response.text()).toBe('Hello!');
   expect(requestCount).toBe(4);
+  await request.dispose();
+});
+
+it('should throw when failOnStatusCode is set to true inside APIRequest context options', async ({ playwright, server }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34204' });
+  const request = await playwright.request.newContext({ failOnStatusCode: true });
+  server.setRoute('/empty.html', (req, res) => {
+    res.writeHead(404, { 'Content-Length': 10, 'Content-Type': 'text/plain' });
+    res.end('Not found.');
+  });
+  const error = await request.fetch(server.EMPTY_PAGE).catch(e => e);
+  expect(error.message).toContain('404 Not Found');
+  await request.dispose();
+});
+
+it('should not throw when failOnStatusCode is set to false inside APIRequest context options', async ({ playwright, server }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34204' });
+  const request = await playwright.request.newContext({ failOnStatusCode: false });
+  server.setRoute('/empty.html', (req, res) => {
+    res.writeHead(404, { 'Content-Length': 10, 'Content-Type': 'text/plain' });
+    res.end('Not found.');
+  });
+  const response = await request.fetch(server.EMPTY_PAGE);
+  expect(response.status()).toBe(404);
+  await request.dispose();
 });
diff --git a/tests/library/har.spec.ts b/tests/library/har.spec.ts
index 29ee7df2d1de5..db5b14a5d135e 100644
--- a/tests/library/har.spec.ts
+++ b/tests/library/har.spec.ts
@@ -24,9 +24,9 @@ import type { Log } from '../../packages/trace/src/har';
 import { parseHar } from '../config/utils';
 const { createHttp2Server } = require('../../packages/playwright-core/lib/utils');
 
-async function pageWithHar(contextFactory: (options?: BrowserContextOptions) => Promise<BrowserContext>, testInfo: any, options: { outputPath?: string, content?: 'embed' | 'attach' | 'omit', omitContent?: boolean } = {}) {
+async function pageWithHar(contextFactory: (options?: BrowserContextOptions) => Promise<BrowserContext>, testInfo: any, options: { outputPath?: string } & Partial<Pick<BrowserContextOptions['recordHar'], 'content' | 'omitContent' | 'mode'>> = {}) {
   const harPath = testInfo.outputPath(options.outputPath || 'test.har');
-  const context = await contextFactory({ recordHar: { path: harPath, content: options.content, omitContent: options.omitContent }, ignoreHTTPSErrors: true });
+  const context = await contextFactory({ recordHar: { path: harPath, ...options }, ignoreHTTPSErrors: true });
   const page = await context.newPage();
   return {
     page,
@@ -42,11 +42,6 @@ async function pageWithHar(contextFactory: (options?: BrowserContextOptions) =>
   };
 }
 
-it('should throw without path', async ({ browser }) => {
-  const error = await browser.newContext({ recordHar: {} as any }).catch(e => e);
-  expect(error.message).toContain('recordHar.path: expected string, got undefined');
-});
-
 it('should have version and creator', async ({ contextFactory, server }, testInfo) => {
   const { page, getLog } = await pageWithHar(contextFactory, testInfo);
   await page.goto(server.EMPTY_PAGE);
@@ -60,6 +55,7 @@ it('should have browser', async ({ browserName, browser, contextFactory, server
   const { page, getLog } = await pageWithHar(contextFactory, testInfo);
   await page.goto(server.EMPTY_PAGE);
   const log = await getLog();
+
   expect(log.browser!.name.toLowerCase()).toBe(browserName);
   expect(log.browser!.version).toBe(browser.version());
 });
@@ -87,17 +83,8 @@ it('should have pages in persistent context', async ({ launchPersistent, browser
   await page.waitForLoadState('domcontentloaded');
   await context.close();
   const log = JSON.parse(fs.readFileSync(harPath).toString())['log'];
-  let pageEntry;
-  if (browserName === 'webkit') {
-  // Explicit locale emulation forces a new page creation when
-  // doing a new context.
-  // See https://github.com/microsoft/playwright/blob/13dd41c2e36a63f35ddef5dc5dec322052d670c6/packages/playwright-core/src/server/browserContext.ts#L232-L242
-    expect(log.pages.length).toBe(2);
-    pageEntry = log.pages[1];
-  } else {
-    expect(log.pages.length).toBe(1);
-    pageEntry = log.pages[0];
-  }
+  expect(log.pages.length).toBe(1);
+  const pageEntry = log.pages[0];
   expect(pageEntry.id).toBeTruthy();
   expect(pageEntry.title).toBe('Hello');
 });
@@ -292,7 +279,7 @@ it('should record request overrides', async ({ contextFactory, server }, testInf
   expect(request.url).toBe(server.EMPTY_PAGE);
   expect(request.method).toBe('POST');
   expect(request.headers).toContainEqual({ name: 'custom', value: 'value' });
-  expect(request.cookies).toContainEqual({ name: 'foo', value: 'bar' });
+  expect(request.cookies).toEqual([]);
   expect(request.postData).toEqual({ 'mimeType': 'text/plain', 'params': [], 'text': 'Hi!' });
 });
 
@@ -505,7 +492,7 @@ it('should record failed request overrides', async ({ contextFactory, server },
   expect(request.url).toBe(server.EMPTY_PAGE);
   expect(request.method).toBe('POST');
   expect(request.headers).toContainEqual({ name: 'custom', value: 'value' });
-  expect(request.cookies).toContainEqual({ name: 'foo', value: 'bar' });
+  expect(request.cookies).toEqual([]);
   expect(request.postData).toEqual({ 'mimeType': 'text/plain', 'params': [], 'text': 'Hi!' });
 });
 
@@ -610,6 +597,7 @@ it('should have security details', async ({ contextFactory, httpsServer, browser
 
   const { page, getLog } = await pageWithHar(contextFactory, testInfo);
   await page.goto(httpsServer.EMPTY_PAGE);
+  await page.request.get(httpsServer.EMPTY_PAGE);
   const log = await getLog();
   const { serverIPAddress, _serverPort: port, _securityDetails: securityDetails } = log.entries[0];
   if (!mode.startsWith('service')) {
@@ -620,6 +608,8 @@ it('should have security details', async ({ contextFactory, httpsServer, browser
     expect(securityDetails).toEqual({ protocol: 'TLS 1.3', subjectName: 'playwright-test', validFrom: 1691708270, validTo: 2007068270 });
   else
     expect(securityDetails).toEqual({ issuer: 'playwright-test', protocol: 'TLS 1.3', subjectName: 'playwright-test', validFrom: 1691708270, validTo: 2007068270 });
+
+  expect(log.entries[1]._securityDetails).toEqual({ issuer: 'playwright-test', protocol: 'TLSv1.3', subjectName: 'playwright-test', validFrom: 1691708270, validTo: 2007068270 });
 });
 
 it('should have connection details for redirects', async ({ contextFactory, server, browserName, mode }, testInfo) => {
@@ -820,6 +810,56 @@ it('should include API request', async ({ contextFactory, server }, testInfo) =>
   expect(entry.response.headers.find(h => h.name.toLowerCase() === 'content-type')?.value).toContain('application/json');
   expect(entry.response.content.size).toBe(15);
   expect(entry.response.content.text).toBe(responseBody.toString());
+  expect(entry.response.bodySize).toBe(15);
+
+  expect(entry.time).toBeGreaterThan(0);
+  expect(entry.timings).toEqual(expect.objectContaining({
+    blocked: -1,
+    connect: expect.any(Number),
+    dns: expect.any(Number),
+    receive: expect.any(Number),
+    send: expect.any(Number),
+    ssl: expect.any(Number),
+    wait: expect.any(Number),
+  }));
+
+  expect(entry.serverIPAddress).toBeDefined();
+  expect(entry._serverPort).toEqual(server.PORT);
+});
+
+it('should respect minimal mode for API Requests', async ({ contextFactory, server }, testInfo) => {
+  const { page, getLog } = await pageWithHar(contextFactory, testInfo, { mode: 'minimal' });
+  const url = server.PREFIX + '/simple.json';
+  await page.request.post(url, {
+    headers: { cookie: 'a=b; c=d' },
+    data: { foo: 'bar' }
+  });
+  const { entries } = await getLog();
+  expect(entries).toHaveLength(1);
+  const [entry] = entries;
+  expect(entry.timings).toEqual({ receive: -1, send: -1, wait: -1 });
+  expect(entry.serverIPAddress).toBeUndefined();
+  expect(entry._serverPort).toBeUndefined();
+  expect(entry.request.cookies).toEqual([]);
+  expect(entry.request.bodySize).toBe(-1);
+  expect(entry.response.bodySize).toBe(-1);
+});
+
+it('should include redirects from API request', async ({ contextFactory, server }, testInfo) => {
+  server.setRedirect('/redirect-me', '/simple.json');
+  const { page, getLog } = await pageWithHar(contextFactory, testInfo);
+  await page.request.post(server.PREFIX + '/redirect-me', {
+    headers: { cookie: 'a=b; c=d' },
+    data: { foo: 'bar' }
+  });
+  const log = await getLog();
+  expect(log.entries.length).toBe(2);
+  const [redirect, json] = log.entries;
+  expect(redirect.request.url).toBe(server.PREFIX + '/redirect-me');
+  expect(json.request.url).toBe(server.PREFIX + '/simple.json');
+
+  expect(redirect.timings).toBeDefined();
+  expect(json.timings).toBeDefined();
 });
 
 it('should not hang on resources served from cache', async ({ contextFactory, server, browserName }, testInfo) => {
@@ -872,6 +912,7 @@ it('should not hang on slow chunked response', async ({ browserName, browser, co
   await page.goto(server.EMPTY_PAGE);
   await page.evaluate(() => (window as any).receivedFirstData);
   const log = await getLog();
+
   expect(log.browser!.name.toLowerCase()).toBe(browserName);
   expect(log.browser!.version).toBe(browser.version());
 });
diff --git a/tests/library/headful.spec.ts b/tests/library/headful.spec.ts
index cfeb9711c9917..715d0bf86d2cc 100644
--- a/tests/library/headful.spec.ts
+++ b/tests/library/headful.spec.ts
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import { compare } from 'playwright-core/lib/image_tools/compare';
+import { compare } from 'playwright-core/lib/server/utils/image_tools/compare';
 import { PNG } from 'playwright-core/lib/utilsBundle';
 import { expect, playwrightTest as it } from '../config/browserTest';
 
 it.use({ headless: false });
+it.skip(({ channel }) => channel === 'chromium-headless-shell' || channel === 'chromium-tip-of-tree-headless-shell', 'shell is never headed');
 
 it('should have default url when launching browser @smoke', async ({ launchPersistent }) => {
   const { context } = await launchPersistent();
@@ -192,7 +193,7 @@ it('should not block third party SameSite=None cookies', async ({ httpsServer, b
 });
 
 it('should not override viewport size when passed null', async function({ browserName, server, browser }) {
-  it.fixme(browserName === 'webkit', 'Our WebKit embedder does not respect window features');
+  it.skip(browserName === 'webkit', 'Our WebKit embedder does not respect window features');
 
   const context = await browser.newContext({ viewport: null });
   const page = await context.newPage();
@@ -230,8 +231,6 @@ it('Page.bringToFront should work', async ({ browser }) => {
 });
 
 it('should click in OOPIF', async ({ browserName, launchPersistent, server }) => {
-  it.fixme(browserName === 'chromium', 'Click is offset by the infobar height');
-
   server.setRoute('/empty.html', (req, res) => {
     res.writeHead(200, { 'Content-Type': 'text/html' });
     res.end(`<iframe src="${server.CROSS_PROCESS_PREFIX}/iframe.html"></iframe>`);
@@ -250,8 +249,8 @@ it('should click in OOPIF', async ({ browserName, launchPersistent, server }) =>
   expect(consoleLog).toContain('ok');
 });
 
-it('should click bottom row w/ infobar in OOPIF', async ({ browserName, launchPersistent, server }) => {
-  it.fixme(browserName === 'chromium', 'Click is offset by the infobar height');
+it('should click bottom row w/ infobar in OOPIF', async ({ browserName, launchPersistent, server, isWindows }) => {
+  it.fixme(browserName === 'chromium' && isWindows, 'Click is offset by the infobar height');
 
   server.setRoute('/empty.html', (req, res) => {
     res.writeHead(200, { 'Content-Type': 'text/html' });
@@ -314,3 +313,46 @@ it('headless and headful should use same default fonts', async ({ page, browserN
   }
   await headlessBrowser.close();
 });
+
+it('should have the same hyphen rendering on headless and headed', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/33590'
+  }
+}, async ({ browserType, page, headless, server }) => {
+  const content = `
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <style>
+        .hyphenated {
+          width: 100px;
+          hyphens: auto;
+          text-align: justify;
+          border: 1px solid black;
+        }
+      </style>
+    </head>
+    <body>
+      <div class="hyphenated">
+        supercalifragilisticexpialidocious
+      </div>
+    </body>
+    </html>
+  `;
+  server.setRoute('/hyphenated.html', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(content);
+  });
+  const oppositeBrowser = await browserType.launch({ headless: !headless });
+  const oppositePage = await oppositeBrowser.newPage();
+  await oppositePage.goto(server.PREFIX + '/hyphenated.html');
+  await page.goto(server.PREFIX + '/hyphenated.html');
+
+  const [divHeight1, divHeight2] = await Promise.all([
+    page.evaluate(() => document.querySelector('.hyphenated').getBoundingClientRect().height),
+    oppositePage.evaluate(() => document.querySelector('.hyphenated').getBoundingClientRect().height),
+  ]);
+  expect(divHeight1).toBe(divHeight2);
+  await oppositeBrowser.close();
+});
diff --git a/tests/library/ignorehttpserrors.spec.ts b/tests/library/ignorehttpserrors.spec.ts
index 31a9344cbe856..0ae7f02df4bfe 100644
--- a/tests/library/ignorehttpserrors.spec.ts
+++ b/tests/library/ignorehttpserrors.spec.ts
@@ -47,6 +47,29 @@ it('should isolate contexts', async ({ browser, httpsServer }) => {
   }
 });
 
+it('should isolated contexts that share network process', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35870' }
+}, async ({ browser, httpsServer, browserName, isLinux }) => {
+  it.fixme(browserName === 'webkit' && isLinux, 'See https://bugs.webkit.org/show_bug.cgi?id=293148');
+  {
+    const context = await browser.newContext({ ignoreHTTPSErrors: true });
+    const page = await context.newPage();
+    const response = await page.goto(httpsServer.EMPTY_PAGE);
+    expect(response.ok()).toBe(true);
+    // Closing the context will remove WebsiteDataStore and stop the network process
+    // which will make the test pass.
+    // await context.close();
+  }
+  {
+    const context = await browser.newContext();
+    const page = await context.newPage();
+    let error = null;
+    await page.goto(httpsServer.EMPTY_PAGE).catch(e => error = e);
+    expect(error, 'A TLS error expected, but the request succeeded.').not.toBe(null);
+    await context.close();
+  }
+});
+
 it('should work with mixed content', async ({ browser, server, httpsServer }) => {
   httpsServer.setRoute('/mixedcontent.html', (req, res) => {
     res.end(`<iframe src=${server.EMPTY_PAGE}></iframe>`);
diff --git a/tests/library/inspector/cli-codegen-1.spec.ts b/tests/library/inspector/cli-codegen-1.spec.ts
index a58a8a38b9c56..92d65851a8f0b 100644
--- a/tests/library/inspector/cli-codegen-1.spec.ts
+++ b/tests/library/inspector/cli-codegen-1.spec.ts
@@ -18,10 +18,8 @@ import { test, expect } from './inspectorTest';
 import type { ConsoleMessage } from 'playwright';
 
 test.describe('cli codegen', () => {
-  test.skip(({ mode }) => mode !== 'default');
-
-  test('should click', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should click', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<button onclick="console.log('click')">Submit</button>`);
 
@@ -52,9 +50,104 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     expect(message.text()).toBe('click');
   });
 
+  test('should double click', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
+
+    await recorder.setContentAndWait(`<button onclick="console.log('click ' + event.detail)" ondblclick="console.log('dblclick ' + event.detail)">Submit</button>`);
+
+    const locator = await recorder.hoverOverElement('button');
+    expect(locator).toBe(`getByRole('button', { name: 'Submit' })`);
+
+    const messages: string[] = [];
+    page.on('console', message => {
+      if (message.text().includes('click'))
+        messages.push(message.text());
+    });
+    const [, sources] = await Promise.all([
+      page.waitForEvent('console', msg => msg.type() !== 'error' && msg.text() === 'dblclick 2'),
+      recorder.waitForOutput('JavaScript', 'dblclick'),
+      recorder.trustedDblclick(),
+    ]);
+
+    expect.soft(sources.get('JavaScript')!.text).toContain(`
+  await page.getByRole('button', { name: 'Submit' }).dblclick();`);
+
+    expect.soft(sources.get('Python')!.text).toContain(`
+    page.get_by_role("button", name="Submit").dblclick()`);
+
+    expect.soft(sources.get('Python Async')!.text).toContain(`
+    await page.get_by_role("button", name="Submit").dblclick()`);
+
+    expect.soft(sources.get('Java')!.text).toContain(`
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Submit")).dblclick()`);
+
+    expect.soft(sources.get('C#')!.text).toContain(`
+await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).DblClickAsync();`);
+
+    expect(messages).toEqual([
+      'click 1',
+      'click 2',
+      'dblclick 2',
+    ]);
+  });
+
+  test('should click twice', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
+
+    await recorder.setContentAndWait(`<button onclick="console.log('click')">Submit</button>`);
+
+    const locator = await recorder.hoverOverElement('button');
+    expect(locator).toBe(`getByRole('button', { name: 'Submit' })`);
+
+    await Promise.all([
+      recorder.waitForOutput('JavaScript', 'click'),
+      recorder.trustedClick(),
+    ]);
+
+    // Do not trigger double click.
+    await page.waitForTimeout(200);
+
+    const [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', `click();\n  await`),
+      recorder.trustedClick(),
+    ]);
+
+    expect(sources.get('JavaScript')!.text).toContain(`
+  await page.getByRole('button', { name: 'Submit' }).click();
+  await page.getByRole('button', { name: 'Submit' }).click();`);
+  });
+
+  test('should type after clicking twice', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
+
+    await recorder.setContentAndWait(`<input type="text" value="foo"/>`);
+    const locator = await recorder.hoverOverElement('input');
+    expect(locator).toBe(`getByRole('textbox')`);
+
+    await Promise.all([
+      recorder.waitForOutput('JavaScript', 'click'),
+      recorder.trustedClick(),
+    ]);
+
+    // Do not trigger double click.
+    await page.waitForTimeout(200);
+
+    await Promise.all([
+      recorder.waitForOutput('JavaScript', `click();\n  await`),
+      recorder.trustedClick(),
+    ]);
+
+    await page.keyboard.type('bar');
+    const sources = await recorder.waitForOutput('JavaScript', 'bar');
 
-  test('should ignore programmatic events', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+    expect(sources.get('JavaScript')!.text).toContain(`
+  await page.getByRole('textbox').click();
+  await page.getByRole('textbox').click();
+  await page.getByRole('textbox').fill('foobar');`);
+  });
+
+  test('should ignore programmatic events', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<button onclick="console.log('click')">Submit</button>`);
 
@@ -73,8 +166,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     expect(clicks.length).toBe(1);
   });
 
-  test('should click after same-document navigation', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should click after same-document navigation', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
 
     server.setRoute('/foo.html', (req, res) => {
       res.setHeader('Content-Type', 'text/html; charset=utf-8');
@@ -103,8 +196,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     expect(message.text()).toBe('click');
   });
 
-  test('should make a positioned click on a canvas', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should make a positioned click on a canvas', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <canvas width="500" height="500" style="margin: 42px"/>
@@ -156,8 +249,8 @@ await page.Locator("canvas").ClickAsync(new LocatorClickOptions
     expect(message.text()).toBe('click 250 250');
   });
 
-  test('should work with TrustedTypes', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should work with TrustedTypes', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <head>
@@ -194,8 +287,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     expect(message.text()).toBe('click');
   });
 
-  test('should not target selector preview by text regexp', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should not target selector preview by text regexp', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<span>dummy</span>`);
 
@@ -225,8 +318,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     expect(message.text()).toBe('click');
   });
 
-  test('should fill', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should fill', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input id="input" name="name" oninput="console.log(input.value)"></input>`);
     const locator = await recorder.focusElement('input');
@@ -255,8 +348,8 @@ await page.Locator("#input").FillAsync(\"John\");`);
     expect(message.text()).toBe('John');
   });
 
-  test('should fill japanese text', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should fill japanese text', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     // In Japanese, "てすと" or "テスト" means "test".
     await recorder.setContentAndWait(`<input id="input" name="name" oninput="input.value === 'てすと' && console.log(input.value)"></input>`);
@@ -289,8 +382,8 @@ await page.Locator("#input").FillAsync(\"てすと\");`);
     expect(message.text()).toBe('てすと');
   });
 
-  test('should fill textarea', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should fill textarea', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<textarea id="textarea" name="name" oninput="console.log(textarea.value)"></textarea>`);
     const locator = await recorder.focusElement('textarea');
@@ -306,9 +399,9 @@ await page.Locator("#input").FillAsync(\"てすと\");`);
     expect(message.text()).toBe('John');
   });
 
-  test('should fill textarea with new lines at the end', async ({ page, openRecorder }) => {
+  test('should fill textarea with new lines at the end', async ({ openRecorder }) => {
     test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23774' });
-    const recorder = await openRecorder();
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<textarea id="textarea"></textarea>`);
     const textarea = page.locator('textarea');
     await textarea.evaluate<void, HTMLTextAreaElement>(e => e.addEventListener('input', () => (window as any).lastInputValue = e.value));
@@ -321,8 +414,8 @@ await page.Locator("#input").FillAsync(\"てすと\");`);
     expect(sources.get('JavaScript')!.text).not.toContain(`Enter`);
   });
 
-  test('should fill [contentEditable]', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should fill [contentEditable]', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<div id="content" contenteditable="" oninput="console.log(content.innerText)"/>`);
     const locator = await recorder.focusElement('div');
@@ -338,8 +431,8 @@ await page.Locator("#input").FillAsync(\"てすと\");`);
     expect(message.text()).toBe('John Doe');
   });
 
-  test('should press', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should press', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input name="name" onkeypress="console.log('press')"></input>`);
 
@@ -369,26 +462,43 @@ await page.Locator("#input").FillAsync(\"てすと\");`);
     expect(sources.get('C#')!.text).toContain(`
 await page.GetByRole(AriaRole.Textbox).PressAsync("Shift+Enter");`);
 
-    expect(messages[0].text()).toBe('press');
+    expect(messages.map(m => m.text())).toContain('press');
   });
 
-  test('should update selected element after pressing Tab', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should update selected element after pressing Tab', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <input name="one"></input>
       <input name="two"></input>
     `);
 
-    await page.click('input[name="one"]');
-    await recorder.waitForOutput('JavaScript', 'click');
-    await page.keyboard.type('foobar123');
-    await recorder.waitForOutput('JavaScript', 'foobar123');
+    const input1 = page.locator('input[name="one"]');
+    const input2 = page.locator('input[name="two"]');
+
+    {
+      await input1.click();
+      await recorder.waitForOutput('JavaScript', 'click');
+      await expect(input1).toBeFocused();
+    }
+
+    {
+      await page.keyboard.type('foobar123');
+      await recorder.waitForOutput('JavaScript', 'foobar123');
+      await expect(input1).toHaveValue('foobar123');
+    }
 
-    await page.keyboard.press('Tab');
-    await recorder.waitForOutput('JavaScript', 'Tab');
-    await page.keyboard.type('barfoo321');
-    await recorder.waitForOutput('JavaScript', 'barfoo321');
+    {
+      await page.keyboard.press('Tab');
+      await recorder.waitForOutput('JavaScript', 'Tab');
+      await expect(input2).toBeFocused();
+    }
+
+    {
+      await page.keyboard.type('barfoo321');
+      await recorder.waitForOutput('JavaScript', 'barfoo321');
+      await expect(input2).toHaveValue('barfoo321');
+    }
 
     const text = recorder.sources().get('JavaScript')!.text;
     expect(text).toContain(`
@@ -401,8 +511,8 @@ await page.GetByRole(AriaRole.Textbox).PressAsync("Shift+Enter");`);
   await page.locator('input[name="two"]').fill('barfoo321');`);
   });
 
-  test('should record ArrowDown', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should record ArrowDown', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input name="name" onkeydown="console.log('press:' + event.key)"></input>`);
 
@@ -420,11 +530,11 @@ await page.GetByRole(AriaRole.Textbox).PressAsync("Shift+Enter");`);
     ]);
     expect(sources.get('JavaScript')!.text).toContain(`
   await page.getByRole('textbox').press('ArrowDown');`);
-    expect(messages[0].text()).toBe('press:ArrowDown');
+    expect(messages.map(m => m.text())).toContain('press:ArrowDown');
   });
 
-  test('should emit single keyup on ArrowDown', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should emit single keyup on ArrowDown', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input name="name" onkeydown="console.log('down:' + event.key)" onkeyup="console.log('up:' + event.key)"></input>`);
 
@@ -448,8 +558,8 @@ await page.GetByRole(AriaRole.Textbox).PressAsync("Shift+Enter");`);
     expect(messages[1].text()).toBe('up:ArrowDown');
   });
 
-  test('should check', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should check', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" name="accept" onchange="console.log(checkbox.checked)"></input>`);
 
@@ -480,8 +590,8 @@ await page.Locator("#checkbox").CheckAsync();`);
     expect(message.text()).toBe('true');
   });
 
-  test('should check a radio button', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should check a radio button', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input id="checkbox" type="radio" name="accept" onchange="console.log(checkbox.checked)"></input>`);
 
@@ -499,8 +609,8 @@ await page.Locator("#checkbox").CheckAsync();`);
     expect(message.text()).toBe('true');
   });
 
-  test('should check with keyboard', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should check with keyboard', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" name="accept" onchange="console.log(checkbox.checked)"></input>`);
 
@@ -518,8 +628,30 @@ await page.Locator("#checkbox").CheckAsync();`);
     expect(message.text()).toBe('true');
   });
 
-  test('should uncheck', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should check with keyboard after hover', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
+
+    await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" name="accept" onchange="console.log(checkbox.checked)"></input>`);
+
+    await recorder.hoverOverElement('input');
+    await page.focus('input');
+
+    const [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'check'),
+      page.keyboard.press('Space')
+    ]);
+
+    expect(sources.get('JavaScript')!.text).toContain(`
+  await page.locator('#checkbox').check();`);
+
+    const sources2 = await recorder.waitForOutput('JavaScript', 'check');
+    expect(sources2.get('JavaScript')!.text).not.toContain(`
+  await page.locator('#checkbox').check();
+  await page.locator('#checkbox').check();`);
+  });
+
+  test('should uncheck', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" checked name="accept" onchange="console.log(checkbox.checked)"></input>`);
 
@@ -550,8 +682,8 @@ await page.Locator("#checkbox").UncheckAsync();`);
     expect(message.text()).toBe('false');
   });
 
-  test('should select', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should select', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait('<select id="age" onchange="console.log(age.selectedOptions[0].value)"><option value="1"><option value="2"></select>');
 
@@ -583,8 +715,8 @@ await page.Locator("#age").SelectOptionAsync(new[] { "2" });`);
     expect(message.text()).toBe('2');
   });
 
-  test('should select with size attribute', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should select with size attribute', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <style>
@@ -624,23 +756,35 @@ await page.Locator(\"#age\").SelectOptionAsync(new[] { \"2\" });`);
     expect(message.text()).toBe('2');
   });
 
-  test('should await popup', async ({ page, openRecorder, browserName, headless }) => {
-    const recorder = await openRecorder();
-    await recorder.setContentAndWait('<a target=_blank rel=noopener href="about:blank">link</a>');
+  test('should await popup', async ({ openRecorder, server }) => {
+    test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36461' });
+
+    const { page, recorder } = await openRecorder();
+    server.setRoute('/popup', (req, res) => {
+      res.setHeader('Content-Type', 'text/html; charset=utf-8');
+      res.end(`<button>Click me</button>`);
+    });
+    await recorder.setContentAndWait(`<a target=_blank rel=noopener href="${server.PREFIX}/popup">link</a>`);
 
     const locator = await recorder.hoverOverElement('a');
     expect(locator).toBe(`getByRole('link', { name: 'link' })`);
 
-    const [popup, sources] = await Promise.all([
+    const [popup] = await Promise.all([
       page.context().waitForEvent('page'),
-      recorder.waitForOutput('JavaScript', 'waitForEvent'),
       recorder.trustedClick(),
     ]);
 
+    recorder.page = popup;
+    await recorder.hoverOverElement('button');
+    await recorder.trustedClick();
+
+    const sources = await recorder.waitForOutput('JavaScript', 'page1.');
+
     expect.soft(sources.get('JavaScript')!.text).toContain(`
   const page1Promise = page.waitForEvent('popup');
   await page.getByRole('link', { name: 'link' }).click();
-  const page1 = await page1Promise;`);
+  const page1 = await page1Promise;
+  await page1.getByRole('button', { name: 'Click me' }).click();`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
       Page page1 = page.waitForPopup(() -> {
@@ -661,13 +805,19 @@ await page.Locator(\"#age\").SelectOptionAsync(new[] { \"2\" });`);
 var page1 = await page.RunAndWaitForPopupAsync(async () =>
 {
     await page.GetByRole(AriaRole.Link, new() { Name = "link" }).ClickAsync();
-});`);
-
-    expect(popup.url()).toBe('about:blank');
+});
+await page1.GetByRole(AriaRole.Button, new() { Name = \"Click me\" }).ClickAsync();`);
+
+    expect.soft(sources.get('C# NUnit')!.text).toContain(`
+        var page1 = await Page.RunAndWaitForPopupAsync(async () =>
+        {
+            await Page.GetByRole(AriaRole.Link, new() { Name = "link" }).ClickAsync();
+        });
+        await page1.GetByRole(AriaRole.Button, new() { Name = \"Click me\" }).ClickAsync();`);
   });
 
-  test('should assert navigation', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should attribute navigation to click', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<a onclick="window.location.href='about:blank#foo'">link</a>`);
 
@@ -680,32 +830,114 @@ var page1 = await page.RunAndWaitForPopupAsync(async () =>
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.getByText('link').click();`);
+  await page.goto('about:blank');
+  await page.getByText('link').click();
+
+  // ---------------------
+  await context.close();`);
 
     expect.soft(sources.get('Playwright Test')!.text).toContain(`
-  await page.getByText('link').click();`);
+  await page.goto('about:blank');
+  await page.getByText('link').click();
+});`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.getByText("link").click();`);
+      page.navigate(\"about:blank\");
+      page.getByText(\"link\").click();
+    }`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.get_by_text("link").click()`);
+    page.goto("about:blank")
+    page.get_by_text("link").click()
+
+    # ---------------------
+    context.close()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_text("link").click()`);
+    await page.goto("about:blank")
+    await page.get_by_text("link").click()
+
+    # ---------------------
+    await context.close()`);
 
     expect.soft(sources.get('Pytest')!.text).toContain(`
+    page.goto("about:blank")
     page.get_by_text("link").click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
+await page.GotoAsync("about:blank");
 await page.GetByText("link").ClickAsync();`);
 
     expect(page.url()).toContain('about:blank#foo');
   });
 
+  test('should attribute navigation to press/fill', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
+
+    await recorder.setContentAndWait(`<input /><script>document.querySelector('input').addEventListener('input', () => window.location.href = 'about:blank#foo');</script>`);
+
+    const locator = await recorder.hoverOverElement('input');
+    expect(locator).toBe(`getByRole('textbox')`);
+    await recorder.trustedClick();
+    await expect.poll(() => page.locator('input').evaluate(e => e === document.activeElement)).toBeTruthy();
+    const [, sources] = await Promise.all([
+      page.waitForNavigation(),
+      recorder.waitForOutput('JavaScript', '.fill'),
+      recorder.trustedPress('h'),
+    ]);
+
+    expect.soft(sources.get('JavaScript')!.text).toContain(`
+  await page.goto('about:blank');
+  await page.getByRole('textbox').click();
+  await page.getByRole('textbox').fill('h');
+
+  // ---------------------
+  await context.close();`);
+
+    expect.soft(sources.get('Playwright Test')!.text).toContain(`
+  await page.goto('about:blank');
+  await page.getByRole('textbox').click();
+  await page.getByRole('textbox').fill('h');
+});`);
+
+    expect.soft(sources.get('Java')!.text).toContain(`
+      page.navigate(\"about:blank\");
+      page.getByRole(AriaRole.TEXTBOX).click();
+      page.getByRole(AriaRole.TEXTBOX).fill(\"h\");
+    }`);
+
+    expect.soft(sources.get('Python')!.text).toContain(`
+    page.goto("about:blank")
+    page.get_by_role("textbox").click()
+    page.get_by_role("textbox").fill("h")
+
+    # ---------------------
+    context.close()`);
+
+    expect.soft(sources.get('Python Async')!.text).toContain(`
+    await page.goto("about:blank")
+    await page.get_by_role("textbox").click()
+    await page.get_by_role("textbox").fill("h")
+
+    # ---------------------
+    await context.close()`);
+
+    expect.soft(sources.get('Pytest')!.text).toContain(`
+    page.goto("about:blank")
+    page.get_by_role("textbox").click()
+    page.get_by_role("textbox").fill("h")`);
+
+    expect.soft(sources.get('C#')!.text).toContain(`
+await page.GotoAsync("about:blank");
+await page.GetByRole(AriaRole.Textbox).ClickAsync();
+await page.GetByRole(AriaRole.Textbox).FillAsync("h");`);
+
+    expect(page.url()).toContain('about:blank#foo');
+  });
+
   test('should ignore AltGraph', async ({ openRecorder, browserName }) => {
     test.skip(browserName === 'firefox', 'The TextInputProcessor in Firefox does not work with AltGraph.');
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
     await recorder.setContentAndWait(`<input></input>`);
 
     await recorder.page.type('input', 'playwright');
@@ -717,8 +949,8 @@ await page.GetByText("link").ClickAsync();`);
     expect(recorder.sources().get('JavaScript')!.text).toContain(`await page.getByRole('textbox').fill('playwright@example.com');`);
   });
 
-  test('should middle click', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should middle click', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<a href${JSON.stringify(server.EMPTY_PAGE)}>Click me</a>`);
 
@@ -749,8 +981,8 @@ await page.GetByText("Click me").ClickAsync(new LocatorClickOptions
 });`);
   });
 
-  test('should record slider', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should record slider', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input type="range" min="0" max="10" value="5">`);
 
@@ -788,10 +1020,10 @@ await page.GetByText("Click me").ClickAsync(new LocatorClickOptions
 await page.GetByRole(AriaRole.Slider).FillAsync("10");`);
   });
 
-  test('should click button with nested div', async ({ page, openRecorder }) => {
+  test('should click button with nested div', async ({ openRecorder }) => {
     test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29067' });
 
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<button><div role="none">Submit</div></button>`);
 
@@ -820,8 +1052,8 @@ await page.GetByRole(AriaRole.Slider).FillAsync("10");`);
 await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`);
   });
 
-  test('should record omnibox navigations after performAction', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should record omnibox navigations after performAction', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<button>Submit</button>`);
     await Promise.all([
       recorder.waitForOutput('JavaScript', 'click'),
@@ -832,8 +1064,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     await recorder.waitForOutput('JavaScript', `await page.goto('${server.PREFIX}/empty.html');`);
   });
 
-  test('should record omnibox navigations after recordAction', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should record omnibox navigations after recordAction', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<textarea></textarea>`);
     await Promise.all([
       recorder.waitForOutput('JavaScript', 'fill'),
@@ -844,10 +1076,40 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`)
     await recorder.waitForOutput('JavaScript', `await page.goto('${server.PREFIX}/empty.html');`);
   });
 
-  test('should not throw csp directive violation errors', async ({ page, openRecorder, server }) => {
-    await openRecorder();
+  test('should not throw csp directive violation errors', async ({ openRecorder, server }) => {
+    const { page } = await openRecorder();
     await page.goto(server.PREFIX + '/csp.html');
     const predicate = (msg: ConsoleMessage) => msg.type() === 'error' && /Content[\- ]Security[\- ]Policy/i.test(msg.text());
     await expect(page.waitForEvent('console', { predicate, timeout: 1000 })).rejects.toThrow();
   });
+
+  test('should clear when recording is disabled', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33802' } }, async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+
+    await recorder.setContentAndWait(`
+      <button id="foo" onclick="console.log('click')">Foo</button>
+      <button id="bar" onclick="console.log('click')">Bar</button>
+    `);
+
+    await recorder.hoverOverElement('#foo');
+    let [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'click'),
+      recorder.trustedClick(),
+    ]);
+
+    expect(sources.get('JavaScript').text).toContain(`getByRole('button', { name: 'Foo' }).click()`);
+
+    await recorder.recorderPage.getByRole('button', { name: 'Record' }).click();
+    await recorder.recorderPage.getByRole('button', { name: 'Clear' }).click();
+    await recorder.recorderPage.getByRole('button', { name: 'Record' }).click();
+
+    await recorder.hoverOverElement('#bar');
+    [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'click'),
+      recorder.trustedClick(),
+    ]);
+
+    expect(sources.get('JavaScript').text).toContain(`getByRole('button', { name: 'Bar' }).click()`);
+    expect(sources.get('JavaScript').text).not.toContain(`getByRole('button', { name: 'Foo' })`);
+  });
 });
diff --git a/tests/library/inspector/cli-codegen-2.spec.ts b/tests/library/inspector/cli-codegen-2.spec.ts
index ef67cd8b937d1..06061c47577d2 100644
--- a/tests/library/inspector/cli-codegen-2.spec.ts
+++ b/tests/library/inspector/cli-codegen-2.spec.ts
@@ -22,7 +22,7 @@ test.describe('cli codegen', () => {
   test.skip(({ mode }) => mode !== 'default');
 
   test('should contain open page', async ({ openRecorder }) => {
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(``);
     const sources = await recorder.waitForOutput('JavaScript', `page.goto`);
@@ -43,8 +43,8 @@ test.describe('cli codegen', () => {
 var page = await context.NewPageAsync();`);
   });
 
-  test('should contain second page', async ({ openRecorder, page }) => {
-    const recorder = await openRecorder();
+  test('should contain second page', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(``);
     await page.context().newPage();
@@ -66,8 +66,8 @@ var page = await context.NewPageAsync();`);
 var page1 = await context.NewPageAsync();`);
   });
 
-  test('should contain close page', async ({ openRecorder, page }) => {
-    const recorder = await openRecorder();
+  test('should contain close page', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(``);
     await page.context().newPage();
@@ -90,8 +90,10 @@ var page1 = await context.NewPageAsync();`);
 await page.CloseAsync();`);
   });
 
-  test('should not lead to an error if html gets clicked', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should not lead to an error if html gets clicked', async ({ openRecorder, platform, macVersion }) => {
+    test.skip(platform === 'darwin' && macVersion < 15, 'recorder.page.evaluate hangs on CDP layer for some reason on macOS 14.');
+
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait('');
     await page.context().newPage();
@@ -104,9 +106,8 @@ await page.CloseAsync();`);
     expect(errors.length).toBe(0);
   });
 
-  test('should upload a single file', async ({ page, openRecorder, browserName, asset, isLinux }) => {
-    test.fixme(browserName === 'firefox' && isLinux, 'https://bugzilla.mozilla.org/show_bug.cgi?id=1827551');
-    const recorder = await openRecorder();
+  test('should upload a single file', async ({ openRecorder, browserName, asset, isLinux }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
     <form>
       <input type="file">
@@ -120,24 +121,23 @@ await page.CloseAsync();`);
     const sources = await recorder.waitForOutput('JavaScript', 'setInputFiles');
 
     expect(sources.get('JavaScript')!.text).toContain(`
-  await page.getByRole('textbox').setInputFiles('file-to-upload.txt');`);
+  await page.getByRole('button', { name: 'Choose File' }).setInputFiles('file-to-upload.txt');`);
 
     expect(sources.get('Java')!.text).toContain(`
-      page.getByRole(AriaRole.TEXTBOX).setInputFiles(Paths.get("file-to-upload.txt"));`);
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Choose File")).setInputFiles(Paths.get("file-to-upload.txt"));`);
 
     expect(sources.get('Python')!.text).toContain(`
-    page.get_by_role("textbox").set_input_files(\"file-to-upload.txt\")`);
+    page.get_by_role("button", name="Choose File").set_input_files(\"file-to-upload.txt\")`);
 
     expect(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_role("textbox").set_input_files(\"file-to-upload.txt\")`);
+    await page.get_by_role("button", name="Choose File").set_input_files(\"file-to-upload.txt\")`);
 
     expect(sources.get('C#')!.text).toContain(`
-await page.GetByRole(AriaRole.Textbox).SetInputFilesAsync(new[] { \"file-to-upload.txt\" });`);
+await page.GetByRole(AriaRole.Button, new() { Name = "Choose File" }).SetInputFilesAsync(new[] { \"file-to-upload.txt\" });`);
   });
 
-  test('should upload multiple files', async ({ page, openRecorder, browserName, asset, isLinux }) => {
-    test.fixme(browserName === 'firefox' && isLinux, 'https://bugzilla.mozilla.org/show_bug.cgi?id=1827551');
-    const recorder = await openRecorder();
+  test('should upload multiple files', async ({ openRecorder, browserName, asset, isLinux }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
     <form>
       <input type="file" multiple>
@@ -151,24 +151,23 @@ await page.GetByRole(AriaRole.Textbox).SetInputFilesAsync(new[] { \"file-to-uplo
     const sources = await recorder.waitForOutput('JavaScript', 'setInputFiles');
 
     expect(sources.get('JavaScript')!.text).toContain(`
-  await page.getByRole('textbox').setInputFiles(['file-to-upload.txt', 'file-to-upload-2.txt']);`);
+  await page.getByRole('button', { name: 'Choose File' }).setInputFiles(['file-to-upload.txt', 'file-to-upload-2.txt']);`);
 
     expect(sources.get('Java')!.text).toContain(`
-      page.getByRole(AriaRole.TEXTBOX).setInputFiles(new Path[] {Paths.get("file-to-upload.txt"), Paths.get("file-to-upload-2.txt")});`);
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Choose File")).setInputFiles(new Path[] {Paths.get("file-to-upload.txt"), Paths.get("file-to-upload-2.txt")});`);
 
     expect(sources.get('Python')!.text).toContain(`
-    page.get_by_role("textbox").set_input_files([\"file-to-upload.txt\", \"file-to-upload-2.txt\"]`);
+    page.get_by_role("button", name="Choose File").set_input_files([\"file-to-upload.txt\", \"file-to-upload-2.txt\"]`);
 
     expect(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_role("textbox").set_input_files([\"file-to-upload.txt\", \"file-to-upload-2.txt\"]`);
+    await page.get_by_role("button", name="Choose File").set_input_files([\"file-to-upload.txt\", \"file-to-upload-2.txt\"]`);
 
     expect(sources.get('C#')!.text).toContain(`
-await page.GetByRole(AriaRole.Textbox).SetInputFilesAsync(new[] { \"file-to-upload.txt\", \"file-to-upload-2.txt\" });`);
+await page.GetByRole(AriaRole.Button, new() { Name = "Choose File" }).SetInputFilesAsync(new[] { \"file-to-upload.txt\", \"file-to-upload-2.txt\" });`);
   });
 
-  test('should clear files', async ({ page, openRecorder, browserName, asset, isLinux }) => {
-    test.fixme(browserName === 'firefox' && isLinux, 'https://bugzilla.mozilla.org/show_bug.cgi?id=1827551');
-    const recorder = await openRecorder();
+  test('should clear files', async ({ openRecorder, browserName, asset, isLinux }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
     <form>
       <input type="file" multiple>
@@ -182,23 +181,23 @@ await page.GetByRole(AriaRole.Textbox).SetInputFilesAsync(new[] { \"file-to-uplo
     const sources = await recorder.waitForOutput('JavaScript', 'setInputFiles');
 
     expect(sources.get('JavaScript')!.text).toContain(`
-  await page.getByRole('textbox').setInputFiles([]);`);
+  await page.getByRole('button', { name: 'Choose File' }).setInputFiles([]);`);
 
     expect(sources.get('Java')!.text).toContain(`
-      page.getByRole(AriaRole.TEXTBOX).setInputFiles(new Path[0]);`);
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Choose File")).setInputFiles(new Path[0]);`);
 
     expect(sources.get('Python')!.text).toContain(`
-    page.get_by_role("textbox").set_input_files([])`);
+    page.get_by_role("button", name="Choose File").set_input_files([])`);
 
     expect(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_role("textbox").set_input_files([])`);
+    await page.get_by_role("button", name="Choose File").set_input_files([])`);
 
     expect(sources.get('C#')!.text).toContain(`
-await page.GetByRole(AriaRole.Textbox).SetInputFilesAsync(new[] {  });`);
+await page.GetByRole(AriaRole.Button, new() { Name = "Choose File" }).SetInputFilesAsync(new[] {  });`);
   });
 
-  test('should download files', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should download files', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
 
     server.setRoute('/download', (req, res) => {
       const pathName = url.parse(req.url!).path;
@@ -219,62 +218,37 @@ await page.GetByRole(AriaRole.Textbox).SetInputFilesAsync(new[] {  });`);
       page.waitForEvent('download'),
       page.click('a')
     ]);
-    await Promise.all([
-      page.waitForEvent('download'),
-      page.click('a')
-    ]);
-    const sources = await recorder.waitForOutput('JavaScript', 'download1Promise');
+    const sources = await recorder.waitForOutput('JavaScript', 'await downloadPromise');
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
   const downloadPromise = page.waitForEvent('download');
   await page.getByRole('link', { name: 'Download' }).click();
   const download = await downloadPromise;`);
-    expect.soft(sources.get('JavaScript')!.text).toContain(`
-  const download1Promise = page.waitForEvent('download');
-  await page.getByRole('link', { name: 'Download' }).click();
-  const download1 = await download1Promise;`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
       Download download = page.waitForDownload(() -> {
         page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("Download")).click();
       });`);
-    expect.soft(sources.get('Java')!.text).toContain(`
-      Download download1 = page.waitForDownload(() -> {
-        page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("Download")).click();
-      });`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
     with page.expect_download() as download_info:
         page.get_by_role("link", name="Download").click()
     download = download_info.value`);
-    expect.soft(sources.get('Python')!.text).toContain(`
-    with page.expect_download() as download1_info:
-        page.get_by_role("link", name="Download").click()
-    download1 = download1_info.value`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
     async with page.expect_download() as download_info:
         await page.get_by_role("link", name="Download").click()
     download = await download_info.value`);
-    expect.soft(sources.get('Python Async')!.text).toContain(`
-    async with page.expect_download() as download1_info:
-        await page.get_by_role("link", name="Download").click()
-    download1 = await download1_info.value`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
 var download = await page.RunAndWaitForDownloadAsync(async () =>
-{
-    await page.GetByRole(AriaRole.Link, new() { Name = "Download" }).ClickAsync();
-});`);
-    expect.soft(sources.get('C#')!.text).toContain(`
-var download1 = await page.RunAndWaitForDownloadAsync(async () =>
 {
     await page.GetByRole(AriaRole.Link, new() { Name = "Download" }).ClickAsync();
 });`);
   });
 
-  test('should handle dialogs', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should handle dialogs', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
     <button onclick="alert()">click me</button>
@@ -321,8 +295,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "click me" }).ClickAsync();
 
   });
 
-  test('should handle history.postData', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should handle history.postData', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
     <script>
@@ -337,8 +311,8 @@ await page.GetByRole(AriaRole.Button, new() { Name = "click me" }).ClickAsync();
     }
   });
 
-  test('should record open in a new tab with url', async ({ page, openRecorder, browserName }) => {
-    const recorder = await openRecorder();
+  test('should record open in a new tab with url', async ({ openRecorder, browserName }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<a href="about:blank?foo">link</a>`);
 
     const locator = await recorder.hoverOverElement('a');
@@ -367,8 +341,8 @@ await page1.GotoAsync("about:blank?foo");`);
     }
   });
 
-  test('should not clash pages', async ({ page, openRecorder, browserName }) => {
-    const recorder = await openRecorder();
+  test('should not clash pages', async ({ openRecorder, browserName }) => {
+    const { page, recorder } = await openRecorder();
     const [popup1] = await Promise.all([
       page.context().waitForEvent('page'),
       page.evaluate(`window.open('about:blank')`)
@@ -404,8 +378,8 @@ await page1.GotoAsync("about:blank?foo");`);
     expect(sources.get('C#')!.text).toContain(`await page2.Locator("#name").FillAsync("TextB");`);
   });
 
-  test('click should emit events in order', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('click should emit events in order', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <button id=button>
@@ -425,22 +399,11 @@ await page1.GotoAsync("about:blank?foo");`);
       page.click('button'),
       recorder.waitForOutput('JavaScript', '.click(')
     ]);
-    expect(messages).toEqual(['mousedown', 'mouseup', 'click']);
-  });
-
-  test('should update hover model on action', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
-
-    await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" name="accept" onchange="checkbox.name='updated'"></input>`);
-    const [models] = await Promise.all([
-      recorder.waitForActionPerformed(),
-      page.click('input')
-    ]);
-    expect(models.hovered).toBe('#checkbox');
+    await expect.poll(() => messages).toEqual(['mousedown', 'mouseup', 'click']);
   });
 
-  test('should reset hover model on action when element detaches', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should reset hover model on action when element detaches', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input id="checkbox" onclick="document.getElementById('checkbox').remove()">`);
     const [models] = await Promise.all([
@@ -450,10 +413,10 @@ await page1.GotoAsync("about:blank?foo");`);
     expect(models.hovered).toBe(null);
   });
 
-  test('should update active model on action', async ({ page, openRecorder, browserName, headless }) => {
+  test('should update active model on action', async ({ openRecorder, browserName, headless }) => {
     test.fixme(browserName === 'webkit');
 
-    const recorder = await openRecorder();
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" name="accept" onchange="checkbox.name='updated'"></input>`);
     const [models] = await Promise.all([
       recorder.waitForActionPerformed(),
@@ -462,8 +425,8 @@ await page1.GotoAsync("about:blank?foo");`);
     expect(models.active).toBe('#checkbox');
   });
 
-  test('should check input with chaining id', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should check input with chaining id', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<input id="checkbox" type="checkbox" name="accept" onchange="checkbox.name = 'updated'"></input>`);
     await Promise.all([
       recorder.waitForActionPerformed(),
@@ -471,8 +434,8 @@ await page1.GotoAsync("about:blank?foo");`);
     ]);
   });
 
-  test('should record navigations after identical pushState', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should record navigations after identical pushState', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     server.setRoute('/page2.html', (req, res) => {
       res.setHeader('Content-Type', 'text/html; charset=utf-8');
       res.end('Hello world');
@@ -490,33 +453,29 @@ await page1.GotoAsync("about:blank?foo");`);
     await recorder.waitForOutput('JavaScript', `await page.goto('${server.PREFIX}/page2.html');`);
   });
 
-  test('should --save-trace', async ({ runCLI }, testInfo) => {
-    const traceFileName = testInfo.outputPath('trace.zip');
-    const cli = runCLI([`--save-trace=${traceFileName}`], {
-      autoExitWhen: ' ',
-    });
-    await cli.waitForCleanExit();
-    expect(fs.existsSync(traceFileName)).toBeTruthy();
-  });
-
   test('should save assets via SIGINT', async ({ runCLI, platform }, testInfo) => {
     test.skip(platform === 'win32', 'SIGINT not supported on Windows');
 
-    const traceFileName = testInfo.outputPath('trace.zip');
     const storageFileName = testInfo.outputPath('auth.json');
     const harFileName = testInfo.outputPath('har.har');
-    const cli = runCLI([`--save-trace=${traceFileName}`, `--save-storage=${storageFileName}`, `--save-har=${harFileName}`]);
+    const cli = runCLI([`--save-storage=${storageFileName}`, `--save-har=${harFileName}`]);
     await cli.waitFor(`import { test, expect } from '@playwright/test'`);
-    await cli.process.kill('SIGINT');
-    const { exitCode } = await cli.process.exited;
-    expect(exitCode).toBe(130);
-    expect(fs.existsSync(traceFileName)).toBeTruthy();
+    // Since our interrupt is non-graceful, we need to wait for the process to settle.
+    // This test should be fixed.
+    await new Promise(resolve => setTimeout(resolve, 2000));
+    const { exitCode, signal } = await cli.sigint();
+    if (exitCode !== null) {
+      expect(exitCode).toBe(130);
+    } else {
+      // If the runner is slow enough, the process will be forcibly terminated by the signal
+      expect(signal).toBe('SIGINT');
+    }
     expect(fs.existsSync(storageFileName)).toBeTruthy();
     expect(fs.existsSync(harFileName)).toBeTruthy();
   });
 
-  test('should fill tricky characters', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should fill tricky characters', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<textarea spellcheck=false id="textarea" name="name" oninput="console.log(textarea.value)"></textarea>`);
     const locator = await recorder.focusElement('textarea');
@@ -546,18 +505,81 @@ await page.Locator("#textarea").FillAsync(\"Hello'\\"\`\\nWorld\");`);
     expect(message.text()).toBe('Hello\'\"\`\nWorld');
   });
 
-});
+  test('should --test-id-attribute', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder({ testIdAttributeName: 'my-test-id' });
+
+    await recorder.setContentAndWait(`<div my-test-id="foo">Hello</div>`);
+    await page.click('[my-test-id=foo]');
+    const sources = await recorder.waitForOutput('JavaScript', `page.getByTestId`);
 
-test('should --test-id-attribute', async ({ page, openRecorder }) => {
-  const recorder = await openRecorder({ testIdAttributeName: 'my-test-id' });
+    expect.soft(sources.get('JavaScript')!.text).toContain(`await page.getByTestId('foo').click()`);
+    expect.soft(sources.get('Java')!.text).toContain(`page.getByTestId("foo").click()`);
+    expect.soft(sources.get('Python')!.text).toContain(`page.get_by_test_id("foo").click()`);
+    expect.soft(sources.get('Python Async')!.text).toContain(`await page.get_by_test_id("foo").click()`);
+    expect.soft(sources.get('C#')!.text).toContain(`await page.GetByTestId("foo").ClickAsync();`);
+  });
+
+  test('should auto-generate toBeVisible', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
-  await recorder.setContentAndWait(`<div my-test-id="foo">Hello</div>`);
-  await page.click('[my-test-id=foo]');
-  const sources = await recorder.waitForOutput('JavaScript', `page.getByTestId`);
+    await recorder.setContentAndWait(`
+      <button id=one>one</button>
+      <div id=insertion></div>
+      <button id=two>two</button>
+      <script>
+        const one = document.getElementById('one');
+        const insertion = document.getElementById('insertion');
+        one.addEventListener('click', () => {
+          insertion.innerHTML = '<h2>new header</h2>';
+          console.log('clicked one');
+        });
+        two.addEventListener('click', () => {
+          console.log('clicked two');
+        });
+      </script>
+    `);
+    await recorder.recorderPage.getByRole('button', { name: 'Settings' }).click();
+    await recorder.recorderPage.getByRole('checkbox', { name: 'Generate assertions' }).check();
+
+    const locatorOne = await recorder.hoverOverElement('#one');
+    expect(locatorOne).toBe(`getByRole('button', { name: 'one' })`);
+    await Promise.all([
+      page.waitForEvent('console', msg => msg.text() === 'clicked one'),
+      recorder.waitForOutput('JavaScript', 'one'),
+      recorder.trustedClick(),
+    ]);
+
+    const locatorTwo = await recorder.hoverOverElement('#two');
+    expect(locatorTwo).toBe(`getByRole('button', { name: 'two' })`);
+    const [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'two'),
+      page.waitForEvent('console', msg => msg.text() === 'clicked two'),
+      recorder.trustedClick(),
+    ]);
 
-  expect.soft(sources.get('JavaScript')!.text).toContain(`await page.getByTestId('foo').click()`);
-  expect.soft(sources.get('Java')!.text).toContain(`page.getByTestId("foo").click()`);
-  expect.soft(sources.get('Python')!.text).toContain(`page.get_by_test_id("foo").click()`);
-  expect.soft(sources.get('Python Async')!.text).toContain(`await page.get_by_test_id("foo").click()`);
-  expect.soft(sources.get('C#')!.text).toContain(`await page.GetByTestId("foo").ClickAsync();`);
+    expect.soft(sources.get('Playwright Test')!.text).toContain(`
+  await expect(page.getByRole('heading', { name: 'new header' })).toBeVisible();
+
+  await page.getByRole('button', { name: 'two' }).click();`);
+
+    expect.soft(sources.get('Python')!.text).toContain(`
+    expect(page.get_by_role("heading", name="new header")).to_be_visible()
+
+    page.get_by_role("button", name="two").click()`);
+
+    expect.soft(sources.get('Python Async')!.text).toContain(`
+    await expect(page.get_by_role("heading", name="new header")).to_be_visible()
+
+    await page.get_by_role("button", name="two").click()`);
+
+    expect.soft(sources.get('Java')!.text).toContain(`
+      assertThat(page.getByRole(AriaRole.HEADING, new Page.GetByRoleOptions().setName("new header"))).isVisible();
+
+      page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("two")).click();`);
+
+    expect.soft(sources.get('C#')!.text).toContain(`
+await Expect(page.GetByRole(AriaRole.Heading, new() { Name = "new header" })).ToBeVisibleAsync();
+
+await page.GetByRole(AriaRole.Button, new() { Name = "two" }).ClickAsync();`);
+  });
 });
diff --git a/tests/library/inspector/cli-codegen-3.spec.ts b/tests/library/inspector/cli-codegen-3.spec.ts
index 424b2bacfe3bb..5212a33c11293 100644
--- a/tests/library/inspector/cli-codegen-3.spec.ts
+++ b/tests/library/inspector/cli-codegen-3.spec.ts
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
+import type { TestServer } from 'tests/config/testserver';
+import type { Recorder } from './inspectorTest';
 import { test, expect } from './inspectorTest';
+import type { Page } from '@playwright/test';
 
 test.describe('cli codegen', () => {
   test.skip(({ mode }) => mode !== 'default');
 
-  test('should click locator.first', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should click locator.first', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <button onclick="console.log('click1')">Submit</button>
@@ -51,11 +54,25 @@ test.describe('cli codegen', () => {
     expect.soft(sources.get('C#')!.text).toContain(`
 await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).First.ClickAsync();`);
 
+    const clickAction = sources.get('JSON')!.actions.map(l => JSON.parse(l)).find(a => a.name === 'click');
+    expect.soft(clickAction).toEqual({
+      name: 'click',
+      selector: 'internal:role=button[name="Submit"i] >> nth=0',
+      button: 'left',
+      clickCount: 1,
+      locator: { body: 'button', kind: 'role', options: { exact: false, attrs: [], name: 'Submit' }, next: { body: '', kind: 'first', options: {} } },
+      modifiers: 0,
+      signals: [],
+      framePath: [],
+      pageAlias: 'page',
+      pageGuid: expect.any(String),
+    });
+
     expect(message.text()).toBe('click1');
   });
 
-  test('should click locator.nth', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should click locator.nth', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <button onclick="console.log('click1')">Submit</button>
@@ -89,8 +106,125 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).Nth(1).ClickAsy
     expect(message.text()).toBe('click2');
   });
 
-  test('should generate frame locators', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate frame locators (1)', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
+    const { frameHello1 } = await createFrameHierarchy(page, recorder, server);
+
+    const [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'Hello1'),
+      frameHello1.click('text=Hello1'),
+    ]);
+
+    expect.soft(sources.get('JavaScript')!.text).toContain(`
+  await page.locator('#frame1').contentFrame().getByText('Hello1').click();`);
+
+    expect.soft(sources.get('Java')!.text).toContain(`
+      page.locator("#frame1").contentFrame().getByText("Hello1").click();`);
+
+    expect.soft(sources.get('Python')!.text).toContain(`
+    page.locator("#frame1").content_frame.get_by_text("Hello1").click()`);
+
+    expect.soft(sources.get('Python Async')!.text).toContain(`
+    await page.locator("#frame1").content_frame.get_by_text("Hello1").click()`);
+
+    expect.soft(sources.get('C#')!.text).toContain(`
+await page.Locator("#frame1").ContentFrame.GetByText("Hello1").ClickAsync();`);
+
+    const clickAction = sources.get('JSON')!.actions.map(l => JSON.parse(l)).find(a => a.name === 'click');
+    expect.soft(clickAction).toEqual({
+      name: 'click',
+      selector: 'internal:text="Hello1"i',
+      button: 'left',
+      clickCount: 1,
+      locator: { body: 'Hello1', kind: 'text', options: { exact: false } },
+      modifiers: 0,
+      signals: [],
+      framePath: ['#frame1'],
+      pageAlias: 'page',
+      pageGuid: expect.any(String),
+    });
+  });
+
+  test('should generate frame locators (2)', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
+    const { frameHello2 } = await createFrameHierarchy(page, recorder, server);
+
+    const [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'Hello2'),
+      frameHello2.click('text=Hello2'),
+    ]);
+
+    expect.soft(sources.get('JavaScript')!.text).toContain(`
+  await page.locator('#frame1').contentFrame().locator('iframe').contentFrame().getByText('Hello2').click();`);
+
+    expect.soft(sources.get('Java')!.text).toContain(`
+      page.locator("#frame1").contentFrame().locator("iframe").contentFrame().getByText("Hello2").click();`);
+
+    expect.soft(sources.get('Python')!.text).toContain(`
+    page.locator("#frame1").content_frame.locator("iframe").content_frame.get_by_text("Hello2").click()`);
+
+    expect.soft(sources.get('Python Async')!.text).toContain(`
+    await page.locator("#frame1").content_frame.locator("iframe").content_frame.get_by_text("Hello2").click()`);
+
+    expect.soft(sources.get('C#')!.text).toContain(`
+await page.Locator("#frame1").ContentFrame.Locator("iframe").ContentFrame.GetByText("Hello2").ClickAsync();`);
+
+    const clickAction = sources.get('JSON')!.actions.map(l => JSON.parse(l)).find(a => a.name === 'click');
+    expect.soft(clickAction).toEqual({
+      name: 'click',
+      selector: 'internal:text="Hello2"i',
+      button: 'left',
+      clickCount: 1,
+      locator: { body: 'Hello2', kind: 'text', options: { exact: false } },
+      modifiers: 0,
+      signals: [],
+      framePath: ['#frame1', 'iframe'],
+      pageAlias: 'page',
+      pageGuid: expect.any(String),
+    });
+  });
+
+  test('should generate frame locators (3)', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
+    const { frameAnonymous } = await createFrameHierarchy(page, recorder, server);
+
+    const [sources] = await Promise.all([
+      recorder.waitForOutput('JavaScript', 'HelloNameAnonymous'),
+      frameAnonymous.click('text=HelloNameAnonymous'),
+    ]);
+
+    expect.soft(sources.get('JavaScript')!.text).toContain(`
+  await page.locator('#frame1').contentFrame().locator('iframe').contentFrame().locator('iframe').nth(2).contentFrame().getByText('HelloNameAnonymous').click();`);
+
+    expect.soft(sources.get('Java')!.text).toContain(`
+      page.locator("#frame1").contentFrame().locator("iframe").contentFrame().locator("iframe").nth(2).contentFrame().getByText("HelloNameAnonymous").click();`);
+
+    expect.soft(sources.get('Python')!.text).toContain(`
+    page.locator("#frame1").content_frame.locator("iframe").content_frame.locator("iframe").nth(2).content_frame.get_by_text("HelloNameAnonymous").click()`);
+
+    expect.soft(sources.get('Python Async')!.text).toContain(`
+    await page.locator("#frame1").content_frame.locator("iframe").content_frame.locator("iframe").nth(2).content_frame.get_by_text("HelloNameAnonymous").click()`);
+
+    expect.soft(sources.get('C#')!.text).toContain(`
+await page.Locator("#frame1").ContentFrame.Locator("iframe").ContentFrame.Locator("iframe").Nth(2).ContentFrame.GetByText("HelloNameAnonymous").ClickAsync();`);
+
+    const clickAction = sources.get('JSON')!.actions.map(l => JSON.parse(l)).find(a => a.name === 'click');
+    expect.soft(clickAction).toEqual({
+      name: 'click',
+      selector: 'internal:text="HelloNameAnonymous"i',
+      button: 'left',
+      clickCount: 1,
+      locator: { body: 'HelloNameAnonymous', kind: 'text', options: { exact: false } },
+      modifiers: 0,
+      signals: [],
+      framePath: ['#frame1', 'iframe', 'iframe >> nth=2'],
+      pageAlias: 'page',
+      pageGuid: expect.any(String),
+    });
+  });
+
+  test('should generate frame locators (4)', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     /*
       iframe
         div Hello1
@@ -98,8 +232,6 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).Nth(1).ClickAsy
           div Hello2
           iframe[name=one]
             div HelloNameOne
-          iframe[name=two]
-            dev HelloNameTwo
           iframe
             dev HelloAnonymous
     */
@@ -108,8 +240,6 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).Nth(1).ClickAsy
     `, server.EMPTY_PAGE, 6);
     const frameHello1 = page.mainFrame().childFrames()[0];
     const frameHello2 = frameHello1.childFrames()[0];
-    const frameOne = page.frame({ name: 'one' })!;
-    await frameOne.setContent(`<div>HelloNameOne</div>`);
     const frameTwo = page.frame({ name: 'two' })!;
     await frameTwo.setContent(`<div>HelloNameTwo</div>`);
     const frameAnonymous = frameHello2.childFrames().find(f => !f.name())!;
@@ -120,62 +250,41 @@ await page.GetByRole(AriaRole.Button, new() { Name = "Submit" }).Nth(1).ClickAsy
       frameHello1.click('text=Hello1'),
     ]);
 
-    expect(sources.get('JavaScript')!.text).toContain(`
-  await page.frameLocator('#frame1').getByText('Hello1').click();`);
-
-    expect(sources.get('Java')!.text).toContain(`
-      page.frameLocator("#frame1").getByText("Hello1").click();`);
-
-    expect(sources.get('Python')!.text).toContain(`
-    page.frame_locator("#frame1").get_by_text("Hello1").click()`);
-
-    expect(sources.get('Python Async')!.text).toContain(`
-    await page.frame_locator("#frame1").get_by_text("Hello1").click()`);
-
-    expect(sources.get('C#')!.text).toContain(`
-await page.FrameLocator("#frame1").GetByText("Hello1").ClickAsync();`);
-
-
-    [sources] = await Promise.all([
-      recorder.waitForOutput('JavaScript', 'Hello2'),
-      frameHello2.click('text=Hello2'),
-    ]);
-
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.frameLocator('#frame1').frameLocator('iframe').getByText('Hello2').click();`);
+  await page.locator('#frame1').contentFrame().getByText('Hello1').click();`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.frameLocator("#frame1").frameLocator("iframe").getByText("Hello2").click();`);
+      page.locator("#frame1").contentFrame().getByText("Hello1").click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.frame_locator("#frame1").frame_locator("iframe").get_by_text("Hello2").click()`);
+    page.locator("#frame1").content_frame.get_by_text("Hello1").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.frame_locator("#frame1").frame_locator("iframe").get_by_text("Hello2").click()`);
+    await page.locator("#frame1").content_frame.get_by_text("Hello1").click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.FrameLocator("#frame1").FrameLocator("iframe").GetByText("Hello2").ClickAsync();`);
+await page.Locator("#frame1").ContentFrame.GetByText("Hello1").ClickAsync();`);
 
 
     [sources] = await Promise.all([
-      recorder.waitForOutput('JavaScript', 'one'),
-      frameOne.click('text=HelloNameOne'),
+      recorder.waitForOutput('JavaScript', 'Hello2'),
+      frameHello2.click('text=Hello2'),
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe[name="one"]').getByText('HelloNameOne').click();`);
+  await page.locator('#frame1').contentFrame().locator('iframe').contentFrame().getByText('Hello2').click();`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.frameLocator("#frame1").frameLocator("iframe").frameLocator("iframe[name=\\"one\\"]").getByText("HelloNameOne").click();`);
+      page.locator("#frame1").contentFrame().locator("iframe").contentFrame().getByText("Hello2").click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.frame_locator("#frame1").frame_locator("iframe").frame_locator("iframe[name=\\"one\\"]").get_by_text("HelloNameOne").click()`);
+    page.locator("#frame1").content_frame.locator("iframe").content_frame.get_by_text("Hello2").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.frame_locator("#frame1").frame_locator("iframe").frame_locator("iframe[name=\\"one\\"]").get_by_text("HelloNameOne").click()`);
+    await page.locator("#frame1").content_frame.locator("iframe").content_frame.get_by_text("Hello2").click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.FrameLocator("#frame1").FrameLocator("iframe").FrameLocator("iframe[name=\\"one\\"]").GetByText("HelloNameOne").ClickAsync();`);
+await page.Locator("#frame1").ContentFrame.Locator("iframe").ContentFrame.GetByText("Hello2").ClickAsync();`);
 
     [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'HelloNameAnonymous'),
@@ -183,23 +292,23 @@ await page.FrameLocator("#frame1").FrameLocator("iframe").FrameLocator("iframe[n
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe >> nth=2').getByText('HelloNameAnonymous').click();`);
+  await page.locator('#frame1').contentFrame().locator('iframe').contentFrame().locator('iframe').nth(2).contentFrame().getByText('HelloNameAnonymous').click();`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.frameLocator("#frame1").frameLocator("iframe").frameLocator("iframe >> nth=2").getByText("HelloNameAnonymous").click();`);
+      page.locator("#frame1").contentFrame().locator("iframe").contentFrame().locator("iframe").nth(2).contentFrame().getByText("HelloNameAnonymous").click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.frame_locator("#frame1").frame_locator("iframe").frame_locator("iframe >> nth=2").get_by_text("HelloNameAnonymous").click()`);
+    page.locator("#frame1").content_frame.locator("iframe").content_frame.locator("iframe").nth(2).content_frame.get_by_text("HelloNameAnonymous").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.frame_locator("#frame1").frame_locator("iframe").frame_locator("iframe >> nth=2").get_by_text("HelloNameAnonymous").click()`);
+    await page.locator("#frame1").content_frame.locator("iframe").content_frame.locator("iframe").nth(2).content_frame.get_by_text("HelloNameAnonymous").click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.FrameLocator("#frame1").FrameLocator("iframe").FrameLocator("iframe >> nth=2").GetByText("HelloNameAnonymous").ClickAsync();`);
+await page.Locator("#frame1").ContentFrame.Locator("iframe").ContentFrame.Locator("iframe").Nth(2).ContentFrame.GetByText("HelloNameAnonymous").ClickAsync();`);
   });
 
-  test('should generate frame locators with special characters in name attribute', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate frame locators with special characters in name attribute', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
       <iframe srcdoc="<button>Click me</button>">
     `, server.EMPTY_PAGE, 2);
@@ -208,154 +317,154 @@ await page.FrameLocator("#frame1").FrameLocator("iframe").FrameLocator("iframe >
     });
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'Click me'),
-      page.frameLocator('iframe[name="foo<bar\'\\"`>"]').getByRole('button', { name: 'Click me' }).click(),
+      page.locator('iframe[name="foo<bar\'\\"`>"]').contentFrame().getByRole('button', { name: 'Click me' }).click(),
     ]);
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.frameLocator('iframe[name="foo\\\\<bar\\\\\\'\\\\"\\\\\`\\\\>"]').getByRole('button', { name: 'Click me' }).click();`);
+  await page.locator('iframe[name="foo<bar\\'\\\\\"\`>"]').contentFrame().getByRole('button', { name: 'Click me' }).click()`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.frameLocator("iframe[name=\\"foo\\\\<bar\\\\'\\\\\\"\\\\\`\\\\>\\"]").getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName("Click me")).click()`);
+      page.locator("iframe[name=\\"foo<bar'\\\\\\"\`>\\"]").contentFrame().getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName("Click me")).click()`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.frame_locator("iframe[name=\\"foo\\\\<bar\\\\'\\\\\\"\\\\\`\\\\>\\"]").get_by_role("button", name="Click me").click()`);
+    page.locator("iframe[name=\\"foo<bar'\\\\\\"\`>\\"]").content_frame.get_by_role("button", name="Click me").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.frame_locator("iframe[name=\\"foo\\\\<bar\\\\'\\\\\\"\\\\\`\\\\>\\"]").get_by_role("button", name="Click me").click()`);
+    await page.locator("iframe[name=\\"foo<bar'\\\\\\"\`>\\"]").content_frame.get_by_role("button", name="Click me").click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.FrameLocator("iframe[name=\\"foo\\\\<bar\\\\'\\\\\\"\\\\\`\\\\>\\"]").GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`);
+await page.Locator("iframe[name=\\"foo<bar'\\\\\\"\`>\\"]").ContentFrame.GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync()`);
   });
 
-  test('should generate frame locators with title attribute', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate frame locators with title attribute', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
       <iframe title="hello world" srcdoc="<button>Click me</button>"></iframe>
     `, server.EMPTY_PAGE, 1);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'Click me'),
-      page.frameLocator('[title="hello world"]').getByRole('button', { name: 'Click me' }).click(),
+      page.locator('[title="hello world"]').contentFrame().getByRole('button', { name: 'Click me' }).click(),
     ]);
 
-    expect(sources.get('JavaScript')!.text).toContain(
-        `await page.frameLocator('iframe[title="hello world"]').getByRole('button', { name: 'Click me' }).click();`
+    expect.soft(sources.get('JavaScript')!.text).toContain(
+        `await page.locator('iframe[title="hello world"]').contentFrame().getByRole('button', { name: 'Click me' }).click();`
     );
 
-    expect(sources.get('Java')!.text).toContain(
-        `page.frameLocator(\"iframe[title=\\\"hello world\\\"]\").getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
+    expect.soft(sources.get('Java')!.text).toContain(
+        `page.locator(\"iframe[title=\\\"hello world\\\"]\").contentFrame().getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
     );
 
-    expect(sources.get('Python')!.text).toContain(
-        `page.frame_locator(\"iframe[title=\\\"hello world\\\"]\").get_by_role(\"button\", name=\"Click me\").click()`
+    expect.soft(sources.get('Python')!.text).toContain(
+        `page.locator(\"iframe[title=\\\"hello world\\\"]\").content_frame.get_by_role(\"button\", name=\"Click me\").click()`
     );
 
-    expect(sources.get('Python Async')!.text).toContain(
-        `await page.frame_locator("iframe[title=\\\"hello world\\\"]").get_by_role("button", name="Click me").click()`
+    expect.soft(sources.get('Python Async')!.text).toContain(
+        `await page.locator("iframe[title=\\\"hello world\\\"]").content_frame.get_by_role("button", name="Click me").click()`
     );
 
-    expect(sources.get('C#')!.text).toContain(
-        `await page.FrameLocator("iframe[title=\\\"hello world\\\"]").GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
+    expect.soft(sources.get('C#')!.text).toContain(
+        `await page.Locator("iframe[title=\\\"hello world\\\"]").ContentFrame.GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
     );
   });
 
-  test('should generate frame locators with name attribute', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate frame locators with name attribute', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
       <iframe name="hello world" srcdoc="<button>Click me</button>"></iframe>
     `, server.EMPTY_PAGE, 1);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'Click me'),
-      page.frameLocator('[name="hello world"]').getByRole('button', { name: 'Click me' }).click(),
+      page.locator('[name="hello world"]').contentFrame().getByRole('button', { name: 'Click me' }).click(),
     ]);
 
-    expect(sources.get('JavaScript')!.text).toContain(
-        `await page.frameLocator('iframe[name="hello world"]').getByRole('button', { name: 'Click me' }).click();`
+    expect.soft(sources.get('JavaScript')!.text).toContain(
+        `await page.locator('iframe[name="hello world"]').contentFrame().getByRole('button', { name: 'Click me' }).click();`
     );
 
-    expect(sources.get('Java')!.text).toContain(
-        `page.frameLocator(\"iframe[name=\\\"hello world\\\"]\").getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
+    expect.soft(sources.get('Java')!.text).toContain(
+        `page.locator(\"iframe[name=\\\"hello world\\\"]\").contentFrame().getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
     );
 
-    expect(sources.get('Python')!.text).toContain(
-        `page.frame_locator(\"iframe[name=\\\"hello world\\\"]\").get_by_role(\"button\", name=\"Click me\").click()`
+    expect.soft(sources.get('Python')!.text).toContain(
+        `page.locator(\"iframe[name=\\\"hello world\\\"]\").content_frame.get_by_role(\"button\", name=\"Click me\").click()`
     );
 
-    expect(sources.get('Python Async')!.text).toContain(
-        `await page.frame_locator("iframe[name=\\\"hello world\\\"]").get_by_role("button", name="Click me").click()`
+    expect.soft(sources.get('Python Async')!.text).toContain(
+        `await page.locator("iframe[name=\\\"hello world\\\"]").content_frame.get_by_role("button", name="Click me").click()`
     );
 
-    expect(sources.get('C#')!.text).toContain(
-        `await page.FrameLocator("iframe[name=\\\"hello world\\\"]").GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
+    expect.soft(sources.get('C#')!.text).toContain(
+        `await page.Locator("iframe[name=\\\"hello world\\\"]").ContentFrame.GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
     );
   });
 
-  test('should generate frame locators with id attribute', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate frame locators with id attribute', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
       <iframe id="hello-world" srcdoc="<button>Click me</button>"></iframe>
     `, server.EMPTY_PAGE, 1);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'Click me'),
-      page.frameLocator('[id="hello-world"]').getByRole('button', { name: 'Click me' }).click(),
+      page.locator('[id="hello-world"]').contentFrame().getByRole('button', { name: 'Click me' }).click(),
     ]);
 
-    expect(sources.get('JavaScript')!.text).toContain(
-        `await page.frameLocator('#hello-world').getByRole('button', { name: 'Click me' }).click();`
+    expect.soft(sources.get('JavaScript')!.text).toContain(
+        `await page.locator('#hello-world').contentFrame().getByRole('button', { name: 'Click me' }).click();`
     );
 
-    expect(sources.get('Java')!.text).toContain(
-        `page.frameLocator(\"#hello-world\").getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
+    expect.soft(sources.get('Java')!.text).toContain(
+        `page.locator(\"#hello-world\").contentFrame().getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
     );
 
-    expect(sources.get('Python')!.text).toContain(
-        `page.frame_locator(\"#hello-world\").get_by_role(\"button\", name=\"Click me\").click()`
+    expect.soft(sources.get('Python')!.text).toContain(
+        `page.locator(\"#hello-world\").content_frame.get_by_role(\"button\", name=\"Click me\").click()`
     );
 
-    expect(sources.get('Python Async')!.text).toContain(
-        `await page.frame_locator("#hello-world").get_by_role("button", name="Click me").click()`
+    expect.soft(sources.get('Python Async')!.text).toContain(
+        `await page.locator("#hello-world").content_frame.get_by_role("button", name="Click me").click()`
     );
 
-    expect(sources.get('C#')!.text).toContain(
-        `await page.FrameLocator("#hello-world").GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
+    expect.soft(sources.get('C#')!.text).toContain(
+        `await page.Locator("#hello-world").ContentFrame.GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
     );
   });
 
-  test('should generate frame locators with testId', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate frame locators with testId', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`
     <iframe data-testid="my-testid" srcdoc="<button>Click me</button>"></iframe>
     `, server.EMPTY_PAGE, 1);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'my-testid'),
-      page.frameLocator('iframe[data-testid="my-testid"]').getByRole('button', { name: 'Click me' }).click(),
+      page.locator('iframe[data-testid="my-testid"]').contentFrame().getByRole('button', { name: 'Click me' }).click(),
     ]);
 
-    expect(sources.get('JavaScript')!.text).toContain(
-        `await page.frameLocator('[data-testid="my-testid"]').getByRole('button', { name: 'Click me' }).click();`
+    expect.soft(sources.get('JavaScript')!.text).toContain(
+        `await page.locator('[data-testid="my-testid"]').contentFrame().getByRole('button', { name: 'Click me' }).click();`
     );
 
-    expect(sources.get('Java')!.text).toContain(
-        `page.frameLocator(\"[data-testid=\\\"my-testid\\\"]\").getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
+    expect.soft(sources.get('Java')!.text).toContain(
+        `page.locator(\"[data-testid=\\\"my-testid\\\"]\").contentFrame().getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName(\"Click me\")).click();`
     );
 
-    expect(sources.get('Python')!.text).toContain(
-        `page.frame_locator(\"[data-testid=\\\"my-testid\\\"]\").get_by_role(\"button\", name=\"Click me\").click()`
+    expect.soft(sources.get('Python')!.text).toContain(
+        `page.locator(\"[data-testid=\\\"my-testid\\\"]\").content_frame.get_by_role(\"button\", name=\"Click me\").click()`
     );
 
-    expect(sources.get('Python Async')!.text).toContain(
-        `await page.frame_locator("[data-testid=\\\"my-testid\\\"]").get_by_role("button", name="Click me").click()`
+    expect.soft(sources.get('Python Async')!.text).toContain(
+        `await page.locator("[data-testid=\\\"my-testid\\\"]").content_frame.get_by_role("button", name="Click me").click()`
     );
 
-    expect(sources.get('C#')!.text).toContain(
-        `await page.FrameLocator("[data-testid=\\\"my-testid\\\"]").GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
+    expect.soft(sources.get('C#')!.text).toContain(
+        `await page.Locator("[data-testid=\\\"my-testid\\\"]").ContentFrame.GetByRole(AriaRole.Button, new() { Name = "Click me" }).ClickAsync();`
     );
   });
 
-  test('should generate role locators undef frame locators', async ({ page, openRecorder, server }) => {
-    const recorder = await openRecorder();
+  test('should generate role locators undef frame locators', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
     await recorder.setContentAndWait(`<iframe id=frame1 srcdoc="<button>Submit</button>">`, server.EMPTY_PAGE, 2);
     const frame = page.mainFrame().childFrames()[0];
 
@@ -365,23 +474,23 @@ await page.FrameLocator("iframe[name=\\"foo\\\\<bar\\\\'\\\\\\"\\\\\`\\\\>\\"]")
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.frameLocator('#frame1').getByRole('button', { name: 'Submit' }).click();`);
+  await page.locator('#frame1').contentFrame().getByRole('button', { name: 'Submit' }).click();`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.frameLocator("#frame1").getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName("Submit")).click();`);
+      page.locator("#frame1").contentFrame().getByRole(AriaRole.BUTTON, new FrameLocator.GetByRoleOptions().setName("Submit")).click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.frame_locator("#frame1").get_by_role("button", name="Submit").click()`);
+    page.locator("#frame1").content_frame.get_by_role("button", name="Submit").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.frame_locator("#frame1").get_by_role("button", name="Submit").click()`);
+    await page.locator("#frame1").content_frame.get_by_role("button", name="Submit").click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.FrameLocator("#frame1").GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`);
+await page.Locator("#frame1").ContentFrame.GetByRole(AriaRole.Button, new() { Name = "Submit" }).ClickAsync();`);
   });
 
-  test('should generate getByTestId', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should generate getByTestId', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<div data-testid=testid onclick="console.log('click')">Submit</div>`);
 
@@ -412,13 +521,13 @@ await page.GetByTestId("testid").ClickAsync();`);
     expect(message.text()).toBe('click');
   });
 
-  test('should generate getByPlaceholder', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should generate getByPlaceholder', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input placeholder="Country"></input>`);
 
     const locator = await recorder.hoverOverElement('input');
-    expect(locator).toBe(`getByPlaceholder('Country')`);
+    expect(locator).toBe(`getByRole('textbox', { name: 'Country' })`);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'click'),
@@ -426,23 +535,23 @@ await page.GetByTestId("testid").ClickAsync();`);
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.getByPlaceholder('Country').click();`);
+  await page.getByRole('textbox', { name: 'Country' }).click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.get_by_placeholder("Country").click()`);
+    page.get_by_role("textbox", name="Country").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_placeholder("Country").click()`);
+    await page.get_by_role("textbox", name="Country").click()`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.getByPlaceholder("Country").click()`);
+      page.getByRole(AriaRole.TEXTBOX, new Page.GetByRoleOptions().setName("Country")).click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.GetByPlaceholder("Country").ClickAsync();`);
+await page.GetByRole(AriaRole.Textbox, new() { Name = "Country" }).ClickAsync();`);
   });
 
-  test('should generate getByAltText', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should generate getByAltText', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input alt="Country"></input>`);
 
@@ -470,13 +579,13 @@ await page.GetByPlaceholder("Country").ClickAsync();`);
 await page.GetByAltText("Country").ClickAsync();`);
   });
 
-  test('should generate getByLabel', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should generate getByLabel', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<label for=target>Country</label><input id=target>`);
 
     const locator = await recorder.hoverOverElement('input');
-    expect(locator).toBe(`getByLabel('Country')`);
+    expect(locator).toBe(`getByRole('textbox', { name: 'Country' })`);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'click'),
@@ -484,28 +593,28 @@ await page.GetByAltText("Country").ClickAsync();`);
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.getByLabel('Country').click();`);
+  await page.getByRole('textbox', { name: 'Country' }).click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.get_by_label("Country").click()`);
+    page.get_by_role("textbox", name="Country").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_label("Country").click()`);
+    await page.get_by_role("textbox", name="Country").click()`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.getByLabel("Country").click()`);
+      page.getByRole(AriaRole.TEXTBOX, new Page.GetByRoleOptions().setName("Country")).click()`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.GetByLabel("Country").ClickAsync();`);
+await page.GetByRole(AriaRole.Textbox, new() { Name = "Country" }).ClickAsync();`);
   });
 
-  test('should generate getByLabel without regex', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should generate getByLabel without regex', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<label for=target>Coun"try</label><input id=target>`);
 
     const locator = await recorder.hoverOverElement('input');
-    expect(locator).toBe(`getByLabel('Coun"try')`);
+    expect(locator).toBe(`getByRole('textbox', { name: 'Coun"try' })`);
 
     const [sources] = await Promise.all([
       recorder.waitForOutput('JavaScript', 'click'),
@@ -513,23 +622,23 @@ await page.GetByLabel("Country").ClickAsync();`);
     ]);
 
     expect.soft(sources.get('JavaScript')!.text).toContain(`
-  await page.getByLabel('Coun\"try').click();`);
+  await page.getByRole('textbox', { name: 'Coun\"try' }).click();`);
 
     expect.soft(sources.get('Python')!.text).toContain(`
-    page.get_by_label("Coun\\"try").click()`);
+    page.get_by_role("textbox", name="Coun\\"try").click()`);
 
     expect.soft(sources.get('Python Async')!.text).toContain(`
-    await page.get_by_label("Coun\\"try").click()`);
+    await page.get_by_role("textbox", name="Coun\\"try").click()`);
 
     expect.soft(sources.get('Java')!.text).toContain(`
-      page.getByLabel("Coun\\"try").click()`);
+      page.getByRole(AriaRole.TEXTBOX, new Page.GetByRoleOptions().setName(\"Coun\\\"try\")).click();`);
 
     expect.soft(sources.get('C#')!.text).toContain(`
-await page.GetByLabel("Coun\\"try").ClickAsync();`);
+await page.GetByRole(AriaRole.Textbox, new() { Name = \"Coun\\\"try\" }).ClickAsync();`);
   });
 
-  test('should consume pointer events', async ({ page, openRecorder }) => {
-    const recorder = await openRecorder();
+  test('should consume pointer events', async ({ openRecorder }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <button onclick="console.log('clicked')">Submit</button>
@@ -552,15 +661,16 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
     expect(message.text()).toBe('clicked');
     expect(await page.evaluate('log')).toEqual([
       'pointermove', 'mousemove',
-      'pointermove', 'mousemove',
+      'pointermove',
+      'mousemove',
       'pointerdown', 'mousedown',
       'pointerup', 'mouseup',
       'click',
     ]);
   });
 
-  test('should consume contextmenu events, despite a custom context menu', async ({ page, openRecorder, browserName, platform }) => {
-    const recorder = await openRecorder();
+  test('should consume contextmenu events, despite a custom context menu', async ({ openRecorder, browserName, platform }) => {
+    const { page, recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <button>Right click me.</button>
@@ -617,6 +727,7 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
         'button: pointermove',
         'button: mousemove',
         // trusted right click
+        // @Max what do you mean pointerup comes before pointerdown?
         'button: pointerup',
         'button: pointermove',
         'button: mousemove',
@@ -630,7 +741,7 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
   });
 
   test('should assert value', async ({ openRecorder }) => {
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <input id=first value=foo>
@@ -679,7 +790,7 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
   test('should assert value on disabled input', async ({ openRecorder, browserName }) => {
     test.fixme(browserName === 'firefox', 'pointerup event is not dispatched on a disabled input');
 
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <input id=first value=foo>
@@ -702,7 +813,7 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
   });
 
   test('should assert value on disabled select', async ({ openRecorder, browserName }) => {
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`
       <select id=first><option value=foo1>Foo1</option><option value=bar1>Bar1</option></select>
@@ -723,7 +834,7 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
   });
 
   test('should assert visibility', async ({ openRecorder }) => {
-    const recorder = await openRecorder();
+    const { recorder } = await openRecorder();
 
     await recorder.setContentAndWait(`<input>`);
 
@@ -739,4 +850,62 @@ await page.GetByLabel("Coun\\"try").ClickAsync();`);
     expect.soft(sources1.get('Java')!.text).toContain(`assertThat(page.getByRole(AriaRole.TEXTBOX)).isVisible()`);
     expect.soft(sources1.get('C#')!.text).toContain(`await Expect(page.GetByRole(AriaRole.Textbox)).ToBeVisibleAsync()`);
   });
+
+  test('should keep toolbar visible even if webpage erases content in hydration', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+
+    const hydrate = () => {
+      window.builtins.setTimeout(() => {
+        document.documentElement.innerHTML = '<p>Post-Hydration Content</p>';
+      }, 500);
+    };
+    await recorder.setContentAndWait(`
+      <p>Pre-Hydration Content</p>
+      <script>(${hydrate})()</script>
+    `);
+
+    await expect(recorder.page.getByText('Post-Hydration Content')).toBeVisible();
+    await expect(recorder.page.locator('x-pw-glass')).toBeVisible();
+  });
+
+  test('should display inline svg icons on text assertion dialog inside iframe', async ({ openRecorder, server }) => {
+    const { page, recorder } = await openRecorder();
+    await recorder.page.click('x-pw-tool-item.text');
+
+    const { frameHello1 } = await createFrameHierarchy(page, recorder, server);
+    await recorder.trustedMove(frameHello1.locator('div'));
+    await recorder.trustedClick();
+
+    const glassPane = frameHello1.locator('x-pw-glass');
+    await expect(glassPane.locator('> x-pw-dialog .accept > x-div').evaluate(elem => getComputedStyle(elem).clipPath)).resolves.toBe('url("#icon-check")');
+    await expect(glassPane.locator('> svg > defs > clipPath#icon-check')).toBeAttached();
+  });
 });
+
+async function createFrameHierarchy(page: Page, recorder: Recorder, server: TestServer) {
+  /*
+    iframe
+      div Hello1
+      iframe
+        div Hello2
+        iframe[name=one]
+          div HelloNameOne
+        iframe
+          dev HelloAnonymous
+  */
+  await recorder.setContentAndWait(`
+    <iframe id=frame1 srcdoc="<div>Hello1</div><iframe srcdoc='<div>Hello2</div><iframe name=one></iframe><iframe name=two></iframe><iframe></iframe>'>">
+  `, server.EMPTY_PAGE, 6);
+  const frameHello1 = page.mainFrame().childFrames()[0];
+  const frameHello2 = frameHello1.childFrames()[0];
+  const frameTwo = page.frame({ name: 'two' })!;
+  await frameTwo.setContent(`<div>HelloNameTwo</div>`);
+  const frameAnonymous = frameHello2.childFrames().find(f => !f.name())!;
+  await frameAnonymous.setContent(`<div>HelloNameAnonymous</div>`);
+  return {
+    frameHello1,
+    frameHello2,
+    frameTwo,
+    frameAnonymous,
+  };
+}
diff --git a/tests/library/inspector/cli-codegen-aria.spec.ts b/tests/library/inspector/cli-codegen-aria.spec.ts
new file mode 100644
index 0000000000000..a11cf333422e8
--- /dev/null
+++ b/tests/library/inspector/cli-codegen-aria.spec.ts
@@ -0,0 +1,174 @@
+/**
+ * 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 './inspectorTest';
+import { roundBox } from '../../page/pageTest';
+
+test.describe(() => {
+  test.skip(({ mode }) => mode !== 'default');
+
+  test('should generate aria snapshot', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main><button>Submit</button></main>`);
+
+    await recorder.page.click('x-pw-tool-item.snapshot');
+    await recorder.page.hover('button');
+    await recorder.trustedClick();
+
+    await expect.poll(() =>
+      recorder.text('JavaScript')).toContain(`await expect(page.getByRole('button')).toMatchAriaSnapshot(\`- button "Submit"\`);`);
+    await expect.poll(() =>
+      recorder.text('Python')).toContain(`expect(page.get_by_role("button")).to_match_aria_snapshot("- button \\"Submit\\"")`);
+    await expect.poll(() =>
+      recorder.text('Python Async')).toContain(`await expect(page.get_by_role(\"button\")).to_match_aria_snapshot("- button \\"Submit\\"")`);
+    await expect.poll(() =>
+      recorder.text('Java')).toContain(`assertThat(page.getByRole(AriaRole.BUTTON)).matchesAriaSnapshot("- button \\"Submit\\"");`);
+    await expect.poll(() =>
+      recorder.text('C#')).toContain(`await Expect(page.GetByRole(AriaRole.Button)).ToMatchAriaSnapshotAsync("- button \\"Submit\\"");`);
+  });
+
+  test('should generate regex in aria snapshot', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main><button>Submit 123</button></main>`);
+
+    await recorder.page.click('x-pw-tool-item.snapshot');
+    await recorder.page.hover('button');
+    await recorder.trustedClick();
+
+    await expect.poll(() =>
+      recorder.text('JavaScript')).toContain(`await expect(page.getByRole('button')).toMatchAriaSnapshot(\`- button /Submit \\\\d+/\`);`);
+    await expect.poll(() =>
+      recorder.text('Python')).toContain(`expect(page.get_by_role("button")).to_match_aria_snapshot("- button /Submit \\\\d+/")`);
+    await expect.poll(() =>
+      recorder.text('Python Async')).toContain(`await expect(page.get_by_role(\"button\")).to_match_aria_snapshot("- button /Submit \\\\d+/")`);
+    await expect.poll(() =>
+      recorder.text('Java')).toContain(`assertThat(page.getByRole(AriaRole.BUTTON)).matchesAriaSnapshot("- button /Submit \\\\d+/");`);
+    await expect.poll(() =>
+      recorder.text('C#')).toContain(`await Expect(page.GetByRole(AriaRole.Button)).ToMatchAriaSnapshotAsync("- button /Submit \\\\d+/");`);
+  });
+
+  test('should inspect aria snapshot', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main><button>Submit</button></main>`);
+    await recorder.page.click('x-pw-tool-item.pick-locator');
+    await recorder.page.hover('button');
+    await recorder.trustedClick();
+    await recorder.recorderPage.getByRole('tab', { name: 'Aria' }).click();
+    await expect(recorder.recorderPage.locator('.tab-aria .CodeMirror')).toMatchAriaSnapshot(`
+      - textbox
+      - text: '- button "Submit"'
+    `);
+  });
+
+  test('should update aria snapshot highlight', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main>
+      <button>Submit</button>
+      <button>Cancel</button>
+    </main>`);
+
+    const submitButton = recorder.page.getByRole('button', { name: 'Submit' });
+    const cancelButton = recorder.page.getByRole('button', { name: 'Cancel' });
+
+
+    await recorder.page.click('x-pw-tool-item.pick-locator');
+    await submitButton.hover();
+    await recorder.trustedClick();
+    await recorder.recorderPage.getByRole('tab', { name: 'Aria' }).click();
+    await expect(recorder.recorderPage.locator('.tab-aria .CodeMirror')).toMatchAriaSnapshot(`
+      - text: '- button "Submit"'
+    `);
+
+    await recorder.recorderPage.locator('.tab-aria .CodeMirror').click();
+    for (let i = 0; i < '"Submit"'.length; i++)
+      await recorder.recorderPage.keyboard.press('Backspace');
+
+    {
+      // No accessible name => two boxes.
+      const box11 = roundBox(await submitButton.boundingBox());
+      const box12 = roundBox(await recorder.page.locator('x-pw-highlight').first().boundingBox());
+      expect(box11).toEqual(box12);
+
+      const box21 = roundBox(await cancelButton.boundingBox());
+      const box22 = roundBox(await recorder.page.locator('x-pw-highlight').last().boundingBox());
+      expect(box21).toEqual(box22);
+    }
+
+    {
+      // Different button.
+      await recorder.recorderPage.locator('.tab-aria .CodeMirror').pressSequentially('"Cancel"');
+      await expect(recorder.page.locator('x-pw-highlight')).toBeVisible();
+      const box1 = roundBox(await cancelButton.boundingBox());
+      const box2 = roundBox(await recorder.page.locator('x-pw-highlight').boundingBox());
+      expect(box1).toEqual(box2);
+    }
+  });
+
+  test('should show aria snapshot error', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main>
+      <button>Submit</button>
+      <button>Cancel</button>
+    </main>`);
+
+    const submitButton = recorder.page.getByRole('button', { name: 'Submit' });
+
+    await recorder.page.click('x-pw-tool-item.pick-locator');
+    await submitButton.hover();
+    await recorder.trustedClick();
+
+    await recorder.recorderPage.getByRole('tab', { name: 'Aria' }).click();
+    await expect(recorder.recorderPage.locator('.tab-aria .CodeMirror')).toMatchAriaSnapshot(`
+      - text: '- button "Submit"'
+    `);
+
+    await recorder.recorderPage.locator('.tab-aria .CodeMirror').click();
+    await recorder.recorderPage.keyboard.press('Backspace');
+    // 3 highlighted tokens.
+    await expect(recorder.recorderPage.locator('.source-line-error-underline')).toHaveCount(3);
+  });
+
+  test('should generate valid javascript with multiline snapshot assertion', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    // set width and height to 100% to ensure click is outside of the list
+    await recorder.setContentAndWait(`<body style="width:100%;height:100%"><ul><li>item 1</li><li>item 2</li></ul></body>`);
+
+    await recorder.page.click('x-pw-tool-item.snapshot');
+    await recorder.page.hover('body');
+    await recorder.trustedClick();
+
+    // playwright tests assertions are uncommented
+    await expect.poll(() =>
+      recorder.text('Playwright Test')).toContain([
+      `  await expect(page.locator('body')).toMatchAriaSnapshot(\``,
+      `    - list:`,
+      `      - listitem: item 1`,
+      `      - listitem: item 2`,
+      `    \`);`,
+    ].join('\n'));
+
+    // non-test javascript has commented assertions
+    await expect.poll(() =>
+      recorder.text('JavaScript')).toContain([
+      `  // await expect(page.locator('body')).toMatchAriaSnapshot(\``,
+      `  //   - list:`,
+      `  //     - listitem: item 1`,
+      `  //     - listitem: item 2`,
+      `  //   \`);`,
+    ].join('\n'));
+
+  });
+});
diff --git a/tests/library/inspector/cli-codegen-csharp.spec.ts b/tests/library/inspector/cli-codegen-csharp.spec.ts
index c40d05fb1ba99..3bf45f3f5ff79 100644
--- a/tests/library/inspector/cli-codegen-csharp.spec.ts
+++ b/tests/library/inspector/cli-codegen-csharp.spec.ts
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-import path from 'path';
 import fs from 'fs';
 import { test, expect } from './inspectorTest';
 
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
 const launchOptions = (channel: string) => {
   return channel ? `Channel = "${channel}",\n    Headless = false,` : `Headless = false,`;
 };
@@ -27,8 +25,8 @@ function capitalize(browserName: string): string {
   return browserName[0].toUpperCase() + browserName.slice(1);
 }
 
-test('should print the correct imports and context options', async ({ browserName, channel, runCLI }) => {
-  const cli = runCLI(['--target=csharp', emptyHTML]);
+test('should print the correct imports and context options', async ({ browserName, channel, runCLI, server }) => {
+  const cli = runCLI(['--target=csharp', server.EMPTY_PAGE]);
   const expectedResult = `using Microsoft.Playwright;
 using System;
 using System.Threading.Tasks;
@@ -42,17 +40,18 @@ var context = await browser.NewContextAsync();`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI, server, proxyServer }) => {
+  proxyServer.forwardTo(server.PORT);
   const cli = runCLI([
     '--color-scheme=dark',
     '--geolocation=37.819722,-122.478611',
     '--lang=es',
-    '--proxy-server=http://myproxy:3128',
+    '--proxy-server=' + proxyServer.HOST,
     '--timezone=Europe/Rome',
     '--user-agent=hardkodemium',
     '--viewport-size=1280,720',
     '--target=csharp',
-    emptyHTML]);
+    server.EMPTY_PAGE]);
   const expectedResult = `
 using var playwright = await Playwright.CreateAsync();
 await using var browser = await playwright.${capitalize(browserName)}.LaunchAsync(new BrowserTypeLaunchOptions
@@ -60,7 +59,7 @@ await using var browser = await playwright.${capitalize(browserName)}.LaunchAsyn
     ${launchOptions(channel)}
     Proxy = new ProxySettings
     {
-        Server = "http://myproxy:3128",
+        Server = "${proxyServer.HOST}",
     },
 });
 var context = await browser.NewContextAsync(new BrowserNewContextOptions
@@ -84,10 +83,10 @@ var context = await browser.NewContextAsync(new BrowserNewContextOptions
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'chromium');
 
-  const cli = runCLI(['--device=Pixel 2', '--target=csharp', emptyHTML]);
+  const cli = runCLI(['--device=Pixel 2', '--target=csharp', server.EMPTY_PAGE]);
   const expectedResult = `
 using var playwright = await Playwright.CreateAsync();
 await using var browser = await playwright.${capitalize(browserName)}.LaunchAsync(new BrowserTypeLaunchOptions
@@ -98,20 +97,21 @@ var context = await browser.NewContextAsync(playwright.Devices["Pixel 2"]);`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI, server, proxyServer }) => {
   test.skip(browserName !== 'webkit');
 
+  proxyServer.forwardTo(server.PORT);
   const cli = runCLI([
     '--device=iPhone 11',
     '--color-scheme=dark',
     '--geolocation=37.819722,-122.478611',
     '--lang=es',
-    '--proxy-server=http://myproxy:3128',
+    '--proxy-server=' + proxyServer.HOST,
     '--timezone=Europe/Rome',
     '--user-agent=hardkodemium',
     '--viewport-size=1280,720',
     '--target=csharp',
-    emptyHTML]);
+    server.EMPTY_PAGE]);
   const expectedResult = `
 using var playwright = await Playwright.CreateAsync();
 await using var browser = await playwright.${capitalize(browserName)}.LaunchAsync(new BrowserTypeLaunchOptions
@@ -119,7 +119,7 @@ await using var browser = await playwright.${capitalize(browserName)}.LaunchAsyn
     ${launchOptions(channel)}
     Proxy = new ProxySettings
     {
-        Server = "http://myproxy:3128",
+        Server = "${proxyServer.HOST}",
     },
 });
 var context = await browser.NewContextAsync(new BrowserNewContextOptions(playwright.Devices["iPhone 11"])
@@ -143,11 +143,11 @@ var context = await browser.NewContextAsync(new BrowserNewContextOptions(playwri
   await cli.waitFor(expectedResult);
 });
 
-test('should print load/save storageState', async ({ browserName, channel, runCLI }, testInfo) => {
+test('should print load/save storageState', async ({ browserName, channel, runCLI, server }, testInfo) => {
   const loadFileName = testInfo.outputPath('load.json');
   const saveFileName = testInfo.outputPath('save.json');
   await fs.promises.writeFile(loadFileName, JSON.stringify({ cookies: [], origins: [] }), 'utf8');
-  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=csharp', emptyHTML]);
+  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=csharp', server.EMPTY_PAGE]);
   const expectedResult1 = `
 using var playwright = await Playwright.CreateAsync();
 await using var browser = await playwright.${capitalize(browserName)}.LaunchAsync(new BrowserTypeLaunchOptions
@@ -170,32 +170,38 @@ await context.StorageStateAsync(new BrowserContextStorageStateOptions
 
 test('should work with --save-har', async ({ runCLI }, testInfo) => {
   const harFileName = testInfo.outputPath('har.har');
-  const expectedResult = `
-var context = await browser.NewContextAsync(new BrowserNewContextOptions
+  const expectedResult = `await context.RouteFromHARAsync(${JSON.stringify(harFileName)});`;
+  const cli = runCLI(['--target=csharp', `--save-har=${harFileName}`]);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should work with --save-har and --save-har-glob', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `await context.RouteFromHARAsync(${JSON.stringify(harFileName)}, new BrowserContextRouteFromHAROptions
 {
-    RecordHarMode = HarMode.Minimal,
-    RecordHarPath = ${JSON.stringify(harFileName)},
-    ServiceWorkers = ServiceWorkerPolicy.Block,
+    Url = "**/*.js",
 });`;
-  const cli = runCLI(['--target=csharp', `--save-har=${harFileName}`], {
-    autoExitWhen: expectedResult,
-  });
-  await cli.waitForCleanExit();
+  const cli = runCLI(['--target=csharp', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
   const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
   expect(json.log.creator.name).toBe('Playwright');
 });
 
 for (const testFramework of ['nunit', 'mstest'] as const) {
-  test(`should not print context options method override in ${testFramework} if no options were passed`, async ({ runCLI }) => {
-    const cli = runCLI([`--target=csharp-${testFramework}`, emptyHTML]);
-    await cli.waitFor(`Page.GotoAsync("${emptyHTML}")`);
-    expect(cli.text()).not.toContain('public override BrowserNewContextOptions ContextOptions()');
+  test(`should not print context options method override in ${testFramework} if no options were passed`, async ({ runCLI, server }) => {
+    const cli = runCLI([`--target=csharp-${testFramework}`, server.EMPTY_PAGE]);
+    await cli.waitFor(`Page.GotoAsync("${server.EMPTY_PAGE}")`);
+    expect(await cli.text()).not.toContain('public override BrowserNewContextOptions ContextOptions()');
   });
 
-  test(`should print context options method override in ${testFramework} if options were passed`, async ({ runCLI }) => {
-    const cli = runCLI([`--target=csharp-${testFramework}`, '--color-scheme=dark', emptyHTML]);
-    await cli.waitFor(`Page.GotoAsync("${emptyHTML}")`);
-    expect(cli.text()).toContain(`    public override BrowserNewContextOptions ContextOptions()
+  test(`should print context options method override in ${testFramework} if options were passed`, async ({ runCLI, server }) => {
+    const cli = runCLI([`--target=csharp-${testFramework}`, '--color-scheme=dark', server.EMPTY_PAGE]);
+    await cli.waitFor(`Page.GotoAsync("${server.EMPTY_PAGE}")`);
+    expect(await cli.text()).toContain(`    public override BrowserNewContextOptions ContextOptions()
     {
         return new BrowserNewContextOptions
         {
@@ -204,11 +210,34 @@ for (const testFramework of ['nunit', 'mstest'] as const) {
     }
 `);
   });
+
+  test(`should work with --save-har in ${testFramework}`, async ({ runCLI }, testInfo) => {
+    const harFileName = testInfo.outputPath('har.har');
+    const expectedResult = `await Context.RouteFromHARAsync(${JSON.stringify(harFileName)});`;
+    const cli = runCLI([`--target=csharp-${testFramework}`, `--save-har=${harFileName}`]);
+    await cli.waitFor(expectedResult);
+    await cli.exit();
+    const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+    expect(json.log.creator.name).toBe('Playwright');
+  });
+
+  test(`should work with --save-har and --save-har-glob in ${testFramework}`, async ({ runCLI }, testInfo) => {
+    const harFileName = testInfo.outputPath('har.har');
+    const expectedResult = `await Context.RouteFromHARAsync(${JSON.stringify(harFileName)}, new BrowserContextRouteFromHAROptions
+        {
+            Url = "**/*.js",
+        });`;
+    const cli = runCLI([`--target=csharp-${testFramework}`, `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+    await cli.waitFor(expectedResult);
+    await cli.exit();
+    const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+    expect(json.log.creator.name).toBe('Playwright');
+  });
 }
 
-test(`should print a valid basic program in mstest`, async ({ runCLI }) => {
-  const cli = runCLI([`--target=csharp-mstest`, '--color-scheme=dark', emptyHTML]);
-  await cli.waitFor(`Page.GotoAsync("${emptyHTML}")`);
+test(`should print a valid basic program in mstest`, async ({ runCLI, server }) => {
+  const cli = runCLI([`--target=csharp-mstest`, '--color-scheme=dark', server.EMPTY_PAGE]);
+  await cli.waitFor(`Page.GotoAsync("${server.EMPTY_PAGE}")`);
   const expected = `using Microsoft.Playwright.MSTest;
 using Microsoft.Playwright;
 
@@ -226,15 +255,15 @@ public class Tests : PageTest
     [TestMethod]
     public async Task MyTest()
     {
-        await Page.GotoAsync("${emptyHTML}");
+        await Page.GotoAsync("${server.EMPTY_PAGE}");
     }
 }`;
-  expect(cli.text()).toContain(expected);
+  expect(await cli.text()).toContain(expected);
 });
 
-test(`should print a valid basic program in nunit`, async ({ runCLI }) => {
-  const cli = runCLI([`--target=csharp-nunit`, '--color-scheme=dark', emptyHTML]);
-  await cli.waitFor(`Page.GotoAsync("${emptyHTML}")`);
+test(`should print a valid basic program in nunit`, async ({ runCLI, server }) => {
+  const cli = runCLI([`--target=csharp-nunit`, '--color-scheme=dark', server.EMPTY_PAGE]);
+  await cli.waitFor(`Page.GotoAsync("${server.EMPTY_PAGE}")`);
   const expected = `using Microsoft.Playwright.NUnit;
 using Microsoft.Playwright;
 
@@ -253,8 +282,8 @@ public class Tests : PageTest
     [Test]
     public async Task MyTest()
     {
-        await Page.GotoAsync("${emptyHTML}");
+        await Page.GotoAsync("${server.EMPTY_PAGE}");
     }
 }`;
-  expect(cli.text()).toContain(expected);
+  expect(await cli.text()).toContain(expected);
 });
diff --git a/tests/library/inspector/cli-codegen-java.spec.ts b/tests/library/inspector/cli-codegen-java.spec.ts
index 6b22a1a4cb906..d28cf551b470b 100644
--- a/tests/library/inspector/cli-codegen-java.spec.ts
+++ b/tests/library/inspector/cli-codegen-java.spec.ts
@@ -15,16 +15,14 @@
  */
 
 import fs from 'fs';
-import path from 'path';
 import { test, expect } from './inspectorTest';
 
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
 const launchOptions = (channel: string) => {
   return channel ? `.setChannel("${channel}")\n        .setHeadless(false)` : '.setHeadless(false)';
 };
 
-test('should print the correct imports and context options', async ({ runCLI, channel, browserName }) => {
-  const cli = runCLI(['--target=java', emptyHTML]);
+test('should print the correct imports and context options', async ({ runCLI, channel, browserName, server }) => {
+  const cli = runCLI(['--target=java', server.EMPTY_PAGE]);
   const expectedResult = `import com.microsoft.playwright.*;
 import com.microsoft.playwright.options.*;
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
@@ -39,17 +37,17 @@ public class Example {
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options for custom settings', async ({ runCLI, browserName }) => {
-  const cli = runCLI(['--color-scheme=light', '--target=java', emptyHTML]);
+test('should print the correct context options for custom settings', async ({ runCLI, server }) => {
+  const cli = runCLI(['--color-scheme=light', '--target=java', server.EMPTY_PAGE]);
   const expectedResult = `BrowserContext context = browser.newContext(new Browser.NewContextOptions()
         .setColorScheme(ColorScheme.LIGHT));`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device', async ({ browserName, runCLI }) => {
+test('should print the correct context options when using a device', async ({ browserName, runCLI, server }) => {
   test.skip(browserName !== 'chromium');
 
-  const cli = runCLI(['--device=Pixel 2', '--target=java', emptyHTML]);
+  const cli = runCLI(['--device=Pixel 2', '--target=java', server.EMPTY_PAGE]);
   await cli.waitFor(`.setViewportSize(411, 731));`);
   const expectedResult = `BrowserContext context = browser.newContext(new Browser.NewContextOptions()
         .setDeviceScaleFactor(2.625)
@@ -57,13 +55,14 @@ test('should print the correct context options when using a device', async ({ br
         .setIsMobile(true)
         .setUserAgent("Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/XXXX Mobile Safari/537.36")
         .setViewportSize(411, 731));`;
-  expect(cli.text().replace(/(.*Chrome\/)(.*?)( .*)/m, '$1XXXX$3')).toContain(expectedResult);
+  const text = await cli.text();
+  expect(text.replace(/(.*Chrome\/)(.*?)( .*)/m, '$1XXXX$3')).toContain(expectedResult);
 });
 
-test('should print the correct context options when using a device and additional options', async ({ browserName, runCLI }) => {
+test('should print the correct context options when using a device and additional options', async ({ browserName, runCLI, server }) => {
   test.skip(browserName !== 'webkit');
 
-  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=java', emptyHTML]);
+  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=java', server.EMPTY_PAGE]);
   await cli.waitFor(`.setViewportSize(414, 715));`);
   const expectedResult = `BrowserContext context = browser.newContext(new Browser.NewContextOptions()
         .setColorScheme(ColorScheme.LIGHT)
@@ -72,14 +71,15 @@ test('should print the correct context options when using a device and additiona
         .setIsMobile(true)
         .setUserAgent("Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/XXXX Mobile/15E148 Safari/604.1")
         .setViewportSize(414, 715));`;
-  expect(cli.text().replace(/(.*Version\/)(.*?)( .*)/m, '$1XXXX$3')).toContain(expectedResult);
+  const text = await cli.text();
+  expect(text.replace(/(.*Version\/)(.*?)( .*)/m, '$1XXXX$3')).toContain(expectedResult);
 });
 
-test('should print load/save storage_state', async ({ runCLI, browserName }, testInfo) => {
+test('should print load/save storage_state', async ({ runCLI, server }, testInfo) => {
   const loadFileName = testInfo.outputPath('load.json');
   const saveFileName = testInfo.outputPath('save.json');
   await fs.promises.writeFile(loadFileName, JSON.stringify({ cookies: [], origins: [] }), 'utf8');
-  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=java', emptyHTML]);
+  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=java', server.EMPTY_PAGE]);
   const expectedResult1 = `BrowserContext context = browser.newContext(new Browser.NewContextOptions()
         .setStorageStatePath(Paths.get(${JSON.stringify(loadFileName)})));`;
   await cli.waitFor(expectedResult1);
@@ -89,23 +89,30 @@ test('should print load/save storage_state', async ({ runCLI, browserName }, tes
   await cli.waitFor(expectedResult2);
 });
 
-test('should work with --save-har', async ({ runCLI }, testInfo) => {
+test('should work with --save-har and --save-har-glob as java-library', async ({ runCLI }, testInfo) => {
   const harFileName = testInfo.outputPath('har.har');
-  const expectedResult = `BrowserContext context = browser.newContext(new Browser.NewContextOptions()
-        .setRecordHarMode(HarMode.MINIMAL)
-        .setRecordHarPath(Paths.get(${JSON.stringify(harFileName)}))
-        .setServiceWorkers(ServiceWorkerPolicy.BLOCK));`;
-  const cli = runCLI(['--target=java', `--save-har=${harFileName}`], {
-    autoExitWhen: expectedResult,
-  });
-
-  await cli.waitForCleanExit();
+  const expectedResult = `context.routeFromHAR(Paths.get(${JSON.stringify(harFileName)}), new BrowserContext.RouteFromHAROptions()
+        .setUrl("**/*.js"));`;
+  const cli = runCLI(['--target=java', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should work with --save-har and --save-har-glob as java-junit', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `page.routeFromHAR(Paths.get(${JSON.stringify(harFileName)}), new Page.RouteFromHAROptions()
+      .setUrl("**/*.js"));`;
+  const cli = runCLI(['--target=java-junit', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
   const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
   expect(json.log.creator.name).toBe('Playwright');
 });
 
-test('should print the correct imports in junit', async ({ runCLI, channel, browserName }) => {
-  const cli = runCLI(['--target=java-junit', emptyHTML]);
+test('should print the correct imports in junit', async ({ runCLI, server }) => {
+  const cli = runCLI(['--target=java-junit', server.EMPTY_PAGE]);
   const expectedImportResult = `import com.microsoft.playwright.junit.UsePlaywright;
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.options.*;
@@ -115,8 +122,8 @@ import static com.microsoft.playwright.assertions.PlaywrightAssertions.*;`;
   await cli.waitFor(expectedImportResult);
 });
 
-test('should print a valid basic program in junit', async ({ runCLI, channel, browserName }) => {
-  const cli = runCLI(['--target=java-junit', emptyHTML]);
+test('should print a valid basic program in junit', async ({ runCLI, server }) => {
+  const cli = runCLI(['--target=java-junit', server.EMPTY_PAGE]);
   const expectedResult = `import com.microsoft.playwright.junit.UsePlaywright;
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.options.*;
@@ -128,7 +135,7 @@ import static com.microsoft.playwright.assertions.PlaywrightAssertions.*;
 public class TestExample {
   @Test
   void test(Page page) {
-    page.navigate("${emptyHTML}");
+    page.navigate("${server.EMPTY_PAGE}");
   }
 }`;
   await cli.waitFor(expectedResult);
diff --git a/tests/library/inspector/cli-codegen-javascript.spec.ts b/tests/library/inspector/cli-codegen-javascript.spec.ts
index f2c34899d84ff..31eddfa5f5a1f 100644
--- a/tests/library/inspector/cli-codegen-javascript.spec.ts
+++ b/tests/library/inspector/cli-codegen-javascript.spec.ts
@@ -15,17 +15,14 @@
  */
 
 import fs from 'fs';
-import path from 'path';
-import { test, expect } from './inspectorTest';
-
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
+import { test } from './inspectorTest';
 
 const launchOptions = (channel: string) => {
   return channel ? `channel: '${channel}',\n    headless: false` : 'headless: false';
 };
 
-test('should print the correct imports and context options', async ({ browserName, channel, runCLI }) => {
-  const cli = runCLI(['--target=javascript', emptyHTML]);
+test('should print the correct imports and context options', async ({ browserName, channel, runCLI, server }) => {
+  const cli = runCLI(['--target=javascript', server.EMPTY_PAGE]);
   const expectedResult = `const { ${browserName} } = require('playwright');
 
 (async () => {
@@ -36,8 +33,8 @@ test('should print the correct imports and context options', async ({ browserNam
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI }) => {
-  const cli = runCLI(['--color-scheme=light', '--target=javascript', emptyHTML]);
+test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI, server }) => {
+  const cli = runCLI(['--color-scheme=light', '--target=javascript', server.EMPTY_PAGE]);
   const expectedResult = `const { ${browserName} } = require('playwright');
 
 (async () => {
@@ -51,10 +48,10 @@ test('should print the correct context options for custom settings', async ({ br
 });
 
 
-test('should print the correct context options when using a device', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'chromium');
 
-  const cli = runCLI(['--device=Pixel 2', '--target=javascript', emptyHTML]);
+  const cli = runCLI(['--device=Pixel 2', '--target=javascript', server.EMPTY_PAGE]);
   const expectedResult = `const { chromium, devices } = require('playwright');
 
 (async () => {
@@ -67,10 +64,10 @@ test('should print the correct context options when using a device', async ({ br
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'webkit');
 
-  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=javascript', emptyHTML]);
+  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=javascript', server.EMPTY_PAGE]);
   const expectedResult = `const { webkit, devices } = require('playwright');
 
 (async () => {
@@ -84,14 +81,9 @@ test('should print the correct context options when using a device and additiona
   await cli.waitFor(expectedResult);
 });
 
-test('should save the codegen output to a file if specified', async ({ browserName, channel, runCLI }, testInfo) => {
-  const tmpFile = testInfo.outputPath('script.js');
-  const cli = runCLI(['--output', tmpFile, '--target=javascript', emptyHTML], {
-    autoExitWhen: 'await page.goto', // We have to wait for the initial navigation to be recorded.
-  });
-  await cli.waitForCleanExit();
-  const content = fs.readFileSync(tmpFile);
-  expect(content.toString()).toBe(`const { ${browserName} } = require('playwright');
+test('should save the codegen output to a file if specified', async ({ browserName, channel, runCLI, server }, testInfo) => {
+  const cli = runCLI(['--target=javascript', server.EMPTY_PAGE]);
+  await cli.waitFor(`const { ${browserName} } = require('playwright');
 
 (async () => {
   const browser = await ${browserName}.launch({
@@ -99,8 +91,7 @@ test('should save the codegen output to a file if specified', async ({ browserNa
   });
   const context = await browser.newContext();
   const page = await context.newPage();
-  await page.goto('${emptyHTML}');
-  await page.close();
+  await page.goto('${server.EMPTY_PAGE}');
 
   // ---------------------
   await context.close();
@@ -108,11 +99,11 @@ test('should save the codegen output to a file if specified', async ({ browserNa
 })();`);
 });
 
-test('should print load/save storageState', async ({ browserName, channel, runCLI }, testInfo) => {
+test('should print load/save storageState', async ({ browserName, channel, runCLI, server }, testInfo) => {
   const loadFileName = testInfo.outputPath('load.json');
   const saveFileName = testInfo.outputPath('save.json');
   await fs.promises.writeFile(loadFileName, JSON.stringify({ cookies: [], origins: [] }), 'utf8');
-  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=javascript', emptyHTML]);
+  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=javascript', server.EMPTY_PAGE]);
   const expectedResult1 = `const { ${browserName} } = require('playwright');
 
 (async () => {
diff --git a/tests/library/inspector/cli-codegen-pick-locator.spec.ts b/tests/library/inspector/cli-codegen-pick-locator.spec.ts
new file mode 100644
index 0000000000000..bd1a612842b22
--- /dev/null
+++ b/tests/library/inspector/cli-codegen-pick-locator.spec.ts
@@ -0,0 +1,68 @@
+/**
+ * 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 './inspectorTest';
+import { roundBox } from '../../page/pageTest';
+
+test.describe(() => {
+  test.skip(({ mode }) => mode !== 'default');
+
+  test('should inspect locator', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main><button>Submit</button></main>`);
+    await recorder.page.click('x-pw-tool-item.pick-locator');
+    await recorder.page.hover('button');
+    await recorder.trustedClick();
+    await recorder.recorderPage.getByRole('tab', { name: 'Locator' }).click();
+    await expect(recorder.recorderPage.locator('.tab-locator .CodeMirror')).toMatchAriaSnapshot(`
+      - text: "getByRole('button', { name: 'Submit' })"
+    `);
+  });
+
+  test('should update locator highlight', async ({ openRecorder }) => {
+    const { recorder } = await openRecorder();
+    await recorder.setContentAndWait(`<main>
+      <button>Submit</button>
+      <button>Cancel</button>
+    </main>`);
+
+    const submitButton = recorder.page.getByRole('button', { name: 'Submit' });
+    const cancelButton = recorder.page.getByRole('button', { name: 'Cancel' });
+
+    await recorder.recorderPage.getByRole('button', { name: 'Record' }).click();
+
+    await recorder.page.click('x-pw-tool-item.pick-locator');
+    await submitButton.hover();
+    await recorder.trustedClick();
+    await recorder.recorderPage.getByRole('tab', { name: 'Locator' }).click();
+    await expect(recorder.recorderPage.locator('.tab-locator .CodeMirror')).toMatchAriaSnapshot(`
+      - text: "getByRole('button', { name: 'Submit' })"
+    `);
+
+    await recorder.recorderPage.locator('.tab-locator .CodeMirror').click();
+    for (let i = 0; i < `Submit' })`.length; i++)
+      await recorder.recorderPage.keyboard.press('Backspace');
+
+    {
+      // Different button.
+      await recorder.recorderPage.locator('.tab-locator .CodeMirror').pressSequentially(`Cancel' })`);
+      await expect(recorder.page.locator('x-pw-highlight')).toBeVisible();
+      const box1 = roundBox(await cancelButton.boundingBox());
+      const box2 = roundBox(await recorder.page.locator('x-pw-highlight').boundingBox());
+      expect(box1).toEqual(box2);
+    }
+  });
+});
diff --git a/tests/library/inspector/cli-codegen-pytest.spec.ts b/tests/library/inspector/cli-codegen-pytest.spec.ts
index e1bd608ef5a89..58676c5b42356 100644
--- a/tests/library/inspector/cli-codegen-pytest.spec.ts
+++ b/tests/library/inspector/cli-codegen-pytest.spec.ts
@@ -15,13 +15,10 @@
  */
 
 import fs from 'fs';
-import path from 'path';
 import { test, expect } from './inspectorTest';
 
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
-
-test('should print the correct imports and context options', async ({ runCLI }) => {
-  const cli = runCLI(['--target=python-pytest', emptyHTML]);
+test('should print the correct imports and context options', async ({ runCLI, server }) => {
+  const cli = runCLI(['--target=python-pytest', server.EMPTY_PAGE]);
   const expectedResult = `import re
 from playwright.sync_api import Page, expect
 
@@ -30,16 +27,11 @@ def test_example(page: Page) -> None:`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device and lang', async ({ browserName, runCLI }, testInfo) => {
+test('should print the correct context options when using a device and lang', async ({ browserName, runCLI, server }, testInfo) => {
   test.skip(browserName !== 'webkit');
 
-  const tmpFile = testInfo.outputPath('script.js');
-  const cli = runCLI(['--target=python-pytest', '--device=iPhone 11', '--lang=en-US', '--output', tmpFile, emptyHTML], {
-    autoExitWhen: 'page.goto',
-  });
-  await cli.waitForCleanExit();
-  const content = fs.readFileSync(tmpFile);
-  expect(content.toString()).toBe(`import pytest
+  const cli = runCLI(['--target=python-pytest', '--device=iPhone 11', '--lang=en-US', server.EMPTY_PAGE]);
+  await cli.waitFor(`import pytest
 import re
 from playwright.sync_api import Page, expect
 
@@ -50,22 +42,37 @@ def browser_context_args(browser_context_args, playwright):
 
 
 def test_example(page: Page) -> None:
-    page.goto("${emptyHTML}")
+    page.goto("${server.EMPTY_PAGE}")
 `);
 });
 
-test('should save the codegen output to a file if specified', async ({ runCLI }, testInfo) => {
-  const tmpFile = testInfo.outputPath('test_example.py');
-  const cli = runCLI(['--target=python-pytest', '--output', tmpFile, emptyHTML], {
-    autoExitWhen: 'page.goto',
-  });
-  await cli.waitForCleanExit();
-  const content = fs.readFileSync(tmpFile);
-  expect(content.toString()).toBe(`import re
+test('should save the codegen output to a file if specified', async ({ runCLI, server }, testInfo) => {
+  const cli = runCLI(['--target=python-pytest', server.EMPTY_PAGE]);
+  await cli.waitFor(`import re
 from playwright.sync_api import Page, expect
 
 
 def test_example(page: Page) -> None:
-    page.goto("${emptyHTML}")
+    page.goto("${server.EMPTY_PAGE}")
 `);
 });
+
+test('should work with --save-har', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `page.route_from_har(${JSON.stringify(harFileName)})`;
+  const cli = runCLI(['--target=python-pytest', `--save-har=${harFileName}`]);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should work with --save-har and --save-har-glob', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `page.route_from_har(${JSON.stringify(harFileName)}, url="**/*.js")`;
+  const cli = runCLI(['--target=python-pytest', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
diff --git a/tests/library/inspector/cli-codegen-python-async.spec.ts b/tests/library/inspector/cli-codegen-python-async.spec.ts
index 02647c5508c35..58b6b40489c8a 100644
--- a/tests/library/inspector/cli-codegen-python-async.spec.ts
+++ b/tests/library/inspector/cli-codegen-python-async.spec.ts
@@ -15,16 +15,14 @@
  */
 
 import fs from 'fs';
-import path from 'path';
 import { test, expect } from './inspectorTest';
 
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
 const launchOptions = (channel: string) => {
   return channel ? `channel="${channel}", headless=False` : 'headless=False';
 };
 
-test('should print the correct imports and context options', async ({ browserName, channel, runCLI }) => {
-  const cli = runCLI(['--target=python-async', emptyHTML]);
+test('should print the correct imports and context options', async ({ browserName, channel, runCLI, server }) => {
+  const cli = runCLI(['--target=python-async', server.EMPTY_PAGE]);
   const expectedResult = `import asyncio
 import re
 from playwright.async_api import Playwright, async_playwright, expect
@@ -36,8 +34,8 @@ async def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI }) => {
-  const cli = runCLI(['--color-scheme=light', '--target=python-async', emptyHTML]);
+test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI, server }) => {
+  const cli = runCLI(['--color-scheme=light', '--target=python-async', server.EMPTY_PAGE]);
   const expectedResult = `import asyncio
 import re
 from playwright.async_api import Playwright, async_playwright, expect
@@ -49,10 +47,10 @@ async def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'chromium');
 
-  const cli = runCLI(['--device=Pixel 2', '--target=python-async', emptyHTML]);
+  const cli = runCLI(['--device=Pixel 2', '--target=python-async', server.EMPTY_PAGE]);
   const expectedResult = `import asyncio
 import re
 from playwright.async_api import Playwright, async_playwright, expect
@@ -64,10 +62,10 @@ async def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'webkit');
 
-  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=python-async', emptyHTML]);
+  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=python-async', server.EMPTY_PAGE]);
   const expectedResult = `import asyncio
 import re
 from playwright.async_api import Playwright, async_playwright, expect
@@ -79,14 +77,9 @@ async def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should save the codegen output to a file if specified', async ({ browserName, channel, runCLI }, testInfo) => {
-  const tmpFile = testInfo.outputPath('example.py');
-  const cli = runCLI(['--target=python-async', '--output', tmpFile, emptyHTML], {
-    autoExitWhen: 'page.goto',
-  });
-  await cli.waitForCleanExit();
-  const content = fs.readFileSync(tmpFile);
-  expect(content.toString()).toBe(`import asyncio
+test('should save the codegen output to a file if specified', async ({ browserName, channel, runCLI, server }, testInfo) => {
+  const cli = runCLI(['--target=python-async', server.EMPTY_PAGE]);
+  await cli.waitFor(`import asyncio
 import re
 from playwright.async_api import Playwright, async_playwright, expect
 
@@ -95,8 +88,7 @@ async def run(playwright: Playwright) -> None:
     browser = await playwright.${browserName}.launch(${launchOptions(channel)})
     context = await browser.new_context()
     page = await context.new_page()
-    await page.goto("${emptyHTML}")
-    await page.close()
+    await page.goto("${server.EMPTY_PAGE}")
 
     # ---------------------
     await context.close()
@@ -112,11 +104,11 @@ asyncio.run(main())
 `);
 });
 
-test('should print load/save storage_state', async ({ browserName, channel, runCLI }, testInfo) => {
+test('should print load/save storage_state', async ({ browserName, channel, runCLI, server }, testInfo) => {
   const loadFileName = testInfo.outputPath('load.json');
   const saveFileName = testInfo.outputPath('save.json');
   await fs.promises.writeFile(loadFileName, JSON.stringify({ cookies: [], origins: [] }), 'utf8');
-  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=python-async', emptyHTML]);
+  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=python-async', server.EMPTY_PAGE]);
   const expectedResult1 = `import asyncio
 import re
 from playwright.async_api import Playwright, async_playwright, expect
@@ -146,11 +138,20 @@ asyncio.run(main())
 
 test('should work with --save-har', async ({ runCLI }, testInfo) => {
   const harFileName = testInfo.outputPath('har.har');
-  const expectedResult = `context = await browser.new_context(record_har_mode="minimal", record_har_path=${JSON.stringify(harFileName)}, service_workers="block")`;
-  const cli = runCLI(['--target=python-async', `--save-har=${harFileName}`], {
-    autoExitWhen: expectedResult,
-  });
-  await cli.waitForCleanExit();
+  const expectedResult = `await context.route_from_har(${JSON.stringify(harFileName)})`;
+  const cli = runCLI(['--target=python-async', `--save-har=${harFileName}`]);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should work with --save-har and --save-har-glob', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `await context.route_from_har(${JSON.stringify(harFileName)}, url="**/*.js")`;
+  const cli = runCLI(['--target=python-async', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
   const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
   expect(json.log.creator.name).toBe('Playwright');
 });
diff --git a/tests/library/inspector/cli-codegen-python.spec.ts b/tests/library/inspector/cli-codegen-python.spec.ts
index 2bccbf3d932fc..a90c0ef7646ca 100644
--- a/tests/library/inspector/cli-codegen-python.spec.ts
+++ b/tests/library/inspector/cli-codegen-python.spec.ts
@@ -15,16 +15,14 @@
  */
 
 import fs from 'fs';
-import path from 'path';
 import { test, expect } from './inspectorTest';
 
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
 const launchOptions = (channel: string) => {
   return channel ? `channel="${channel}", headless=False` : 'headless=False';
 };
 
-test('should print the correct imports and context options', async ({ runCLI, channel, browserName }) => {
-  const cli = runCLI(['--target=python', emptyHTML]);
+test('should print the correct imports and context options', async ({ runCLI, channel, browserName, server }) => {
+  const cli = runCLI(['--target=python', server.EMPTY_PAGE]);
   const expectedResult = `import re
 from playwright.sync_api import Playwright, sync_playwright, expect
 
@@ -35,8 +33,8 @@ def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options for custom settings', async ({ runCLI, channel, browserName }) => {
-  const cli = runCLI(['--color-scheme=light', '--target=python', emptyHTML]);
+test('should print the correct context options for custom settings', async ({ runCLI, channel, browserName, server }) => {
+  const cli = runCLI(['--color-scheme=light', '--target=python', server.EMPTY_PAGE]);
   const expectedResult = `import re
 from playwright.sync_api import Playwright, sync_playwright, expect
 
@@ -47,10 +45,10 @@ def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'chromium');
 
-  const cli = runCLI(['--device=Pixel 2', '--target=python', emptyHTML]);
+  const cli = runCLI(['--device=Pixel 2', '--target=python', server.EMPTY_PAGE]);
   const expectedResult = `import re
 from playwright.sync_api import Playwright, sync_playwright, expect
 
@@ -61,10 +59,10 @@ def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI, server }) => {
   test.skip(browserName !== 'webkit');
 
-  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=python', emptyHTML]);
+  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', '--target=python', server.EMPTY_PAGE]);
   const expectedResult = `import re
 from playwright.sync_api import Playwright, sync_playwright, expect
 
@@ -75,14 +73,9 @@ def run(playwright: Playwright) -> None:
   await cli.waitFor(expectedResult);
 });
 
-test('should save the codegen output to a file if specified', async ({ runCLI, channel, browserName }, testInfo) => {
-  const tmpFile = testInfo.outputPath('example.py');
-  const cli = runCLI(['--target=python', '--output', tmpFile, emptyHTML], {
-    autoExitWhen: 'page.goto',
-  });
-  await cli.waitForCleanExit();
-  const content = fs.readFileSync(tmpFile);
-  expect(content.toString()).toBe(`import re
+test('should save the codegen output to a file if specified', async ({ runCLI, channel, browserName, server }, testInfo) => {
+  const cli = runCLI(['--target=python', server.EMPTY_PAGE]);
+  await cli.waitFor(`import re
 from playwright.sync_api import Playwright, sync_playwright, expect
 
 
@@ -90,8 +83,7 @@ def run(playwright: Playwright) -> None:
     browser = playwright.${browserName}.launch(${launchOptions(channel)})
     context = browser.new_context()
     page = context.new_page()
-    page.goto("${emptyHTML}")
-    page.close()
+    page.goto("${server.EMPTY_PAGE}")
 
     # ---------------------
     context.close()
@@ -103,11 +95,11 @@ with sync_playwright() as playwright:
 `);
 });
 
-test('should print load/save storage_state', async ({ runCLI, channel, browserName }, testInfo) => {
+test('should print load/save storage_state', async ({ runCLI, channel, browserName, server }, testInfo) => {
   const loadFileName = testInfo.outputPath('load.json');
   const saveFileName = testInfo.outputPath('save.json');
   await fs.promises.writeFile(loadFileName, JSON.stringify({ cookies: [], origins: [] }), 'utf8');
-  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=python', emptyHTML]);
+  const cli = runCLI([`--load-storage=${loadFileName}`, `--save-storage=${saveFileName}`, '--target=python', server.EMPTY_PAGE]);
   const expectedResult1 = `import re
 from playwright.sync_api import Playwright, sync_playwright, expect
 
@@ -129,3 +121,23 @@ with sync_playwright() as playwright:
 `;
   await cli.waitFor(expectedResult2);
 });
+
+test('should work with --save-har', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `context.route_from_har(${JSON.stringify(harFileName)})`;
+  const cli = runCLI(['--target=python-async', `--save-har=${harFileName}`]);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should work with --save-har and --save-har-glob', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `context.route_from_har(${JSON.stringify(harFileName)}, url="**/*.js")`;
+  const cli = runCLI(['--target=python-async', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
diff --git a/tests/library/inspector/cli-codegen-test.spec.ts b/tests/library/inspector/cli-codegen-test.spec.ts
index a5d5cb6fcec9f..00a35235788b9 100644
--- a/tests/library/inspector/cli-codegen-test.spec.ts
+++ b/tests/library/inspector/cli-codegen-test.spec.ts
@@ -15,22 +15,20 @@
  */
 
 import fs from 'fs';
-import path from 'path';
 import { test, expect } from './inspectorTest';
 
-const emptyHTML = new URL('file://' + path.join(__dirname, '..', '..', 'assets', 'empty.html')).toString();
-
-test('should print the correct imports and context options', async ({ runCLI }) => {
-  const cli = runCLI([emptyHTML]);
+test('should print the correct imports and context options', async ({ runCLI, server }) => {
+  const cli = runCLI([server.EMPTY_PAGE]);
   const expectedResult = `import { test, expect } from '@playwright/test';
 
 test('test', async ({ page }) => {
+  await page.goto('${server.EMPTY_PAGE}');
 });`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options for custom settings', async ({ browserName, channel, runCLI }) => {
-  const cli = runCLI(['--color-scheme=light', emptyHTML]);
+test('should print the correct context options for custom settings', async ({ runCLI, server }) => {
+  const cli = runCLI(['--color-scheme=light', server.EMPTY_PAGE]);
   const expectedResult = `import { test, expect } from '@playwright/test';
 
 test.use({
@@ -42,10 +40,10 @@ test('test', async ({ page }) => {`;
 });
 
 
-test('should print the correct context options when using a device', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device', async ({ browserName, runCLI, server }) => {
   test.skip(browserName !== 'chromium');
 
-  const cli = runCLI(['--device=Pixel 2', emptyHTML]);
+  const cli = runCLI(['--device=Pixel 2', server.EMPTY_PAGE]);
   const expectedResult = `import { test, expect, devices } from '@playwright/test';
 
 test.use({
@@ -56,10 +54,10 @@ test('test', async ({ page }) => {`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print the correct context options when using a device and additional options', async ({ browserName, channel, runCLI }) => {
+test('should print the correct context options when using a device and additional options', async ({ browserName, server, runCLI }) => {
   test.skip(browserName !== 'webkit');
 
-  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', emptyHTML]);
+  const cli = runCLI(['--color-scheme=light', '--device=iPhone 11', server.EMPTY_PAGE]);
   const expectedResult = `import { test, expect, devices } from '@playwright/test';
 
 test.use({
@@ -71,10 +69,10 @@ test('test', async ({ page }) => {`;
   await cli.waitFor(expectedResult);
 });
 
-test('should print load storageState', async ({ browserName, channel, runCLI }, testInfo) => {
+test('should print load storageState', async ({ runCLI, server }, testInfo) => {
   const loadFileName = testInfo.outputPath('load.json');
   await fs.promises.writeFile(loadFileName, JSON.stringify({ cookies: [], origins: [] }), 'utf8');
-  const cli = runCLI([`--load-storage=${loadFileName}`, emptyHTML]);
+  const cli = runCLI([`--load-storage=${loadFileName}`, server.EMPTY_PAGE]);
   const expectedResult = `import { test, expect } from '@playwright/test';
 
 test.use({
@@ -85,17 +83,38 @@ test('test', async ({ page }) => {`;
   await cli.waitFor(expectedResult);
 });
 
-test('should work with --save-har', async ({ runCLI }, testInfo) => {
+test('should not generate recordHAR with --save-har', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `  await page.routeFromHAR('${harFileName.replace(/\\/g, '\\\\')}');`;
+  const cli = runCLI(['--target=playwright-test', `--save-har=${harFileName}`]);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should generate routeFromHAR with --save-har', async ({ runCLI }, testInfo) => {
+  const harFileName = testInfo.outputPath('har.har');
+  const expectedResult = `test('test', async ({ page }) => {
+  await page.routeFromHAR('${harFileName.replace(/\\/g, '\\\\')}');
+});`;
+  const cli = runCLI(['--target=playwright-test', `--save-har=${harFileName}`]);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
+  const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
+  expect(json.log.creator.name).toBe('Playwright');
+});
+
+test('should generate routeFromHAR with --save-har and --save-har-glob', async ({ runCLI }, testInfo) => {
   const harFileName = testInfo.outputPath('har.har');
-  const expectedResult = `
-  recordHar: {
-    mode: 'minimal',
-    path: '${harFileName.replace(/\\/g, '\\\\')}'
-  }`;
-  const cli = runCLI(['--target=playwright-test', `--save-har=${harFileName}`], {
-    autoExitWhen: expectedResult,
+  const expectedResult = `test('test', async ({ page }) => {
+  await page.routeFromHAR('${harFileName.replace(/\\/g, '\\\\')}', {
+    url: '**/*.js'
   });
-  await cli.waitForCleanExit();
+});`;
+  const cli = runCLI(['--target=playwright-test', `--save-har=${harFileName}`, '--save-har-glob=**/*.js']);
+  await cli.waitFor(expectedResult);
+  await cli.exit();
   const json = JSON.parse(fs.readFileSync(harFileName, 'utf-8'));
   expect(json.log.creator.name).toBe('Playwright');
 });
diff --git a/tests/library/inspector/console-api.spec.ts b/tests/library/inspector/console-api.spec.ts
index 51d2262bf8fbd..2b40b8943a58f 100644
--- a/tests/library/inspector/console-api.spec.ts
+++ b/tests/library/inspector/console-api.spec.ts
@@ -22,7 +22,8 @@ let scriptPromise: Promise<void>;
 
 it.beforeEach(async ({ page, recorderPageGetter }) => {
   scriptPromise = (async () => {
-    await page.pause();
+    // @ts-ignore
+    await page.pause({ __testHookKeepTestTimeout: true });
   })();
   await recorderPageGetter();
 });
@@ -91,13 +92,14 @@ it('should support locator.or()', async ({ page }) => {
 });
 
 it('should support playwright.getBy*', async ({ page }) => {
-  await page.setContent('<span>Hello</span><span title="world">World</span>');
+  await page.setContent('<span>Hello</span><span title="world">World</span><div>one</div><div style="display:none">two</div>');
   expect(await page.evaluate(`playwright.getByText('hello').element.innerHTML`)).toContain('Hello');
   expect(await page.evaluate(`playwright.getByTitle('world').element.innerHTML`)).toContain('World');
   expect(await page.evaluate(`playwright.locator('span').filter({ hasText: 'hello' }).element.innerHTML`)).toContain('Hello');
   expect(await page.evaluate(`playwright.locator('span').first().element.innerHTML`)).toContain('Hello');
   expect(await page.evaluate(`playwright.locator('span').last().element.innerHTML`)).toContain('World');
   expect(await page.evaluate(`playwright.locator('span').nth(1).element.innerHTML`)).toContain('World');
+  expect(await page.evaluate(`playwright.locator('div').filter({ visible: false }).element.innerHTML`)).toContain('two');
 });
 
 it('expected properties on playwright object', async ({ page }) => {
@@ -107,6 +109,7 @@ it('expected properties on playwright object', async ({ page }) => {
     'inspect',
     'selector',
     'generateLocator',
+    'ariaSnapshot',
     'resume',
     'locator',
     'getByTestId',
diff --git a/tests/library/inspector/inspectorTest.ts b/tests/library/inspector/inspectorTest.ts
index 6ebbc1fdd1cb7..f85a5607073a9 100644
--- a/tests/library/inspector/inspectorTest.ts
+++ b/tests/library/inspector/inspectorTest.ts
@@ -15,20 +15,21 @@
  */
 
 import { contextTest } from '../../config/browserTest';
-import type { Page } from 'playwright-core';
+import type { Locator, Page } from 'playwright-core';
 import { step } from '../../config/baseTest';
 import * as path from 'path';
+import fs from 'fs';
 import type { Source } from '../../../packages/recorder/src/recorderTypes';
 import type { CommonFixtures, TestChildProcess } from '../../config/commonFixtures';
-import { stripAnsi } from '../../config/utils';
 import { expect } from '@playwright/test';
+import { nodePlatform } from '../../../packages/playwright-core/lib/server/utils/nodePlatform';
 export { expect } from '@playwright/test';
 
 type CLITestArgs = {
   recorderPageGetter: () => Promise<Page>;
   closeRecorder: () => Promise<void>;
-  openRecorder: (options?: { testIdAttributeName: string }) => Promise<Recorder>;
-  runCLI: (args: string[], options?: { autoExitWhen?: string }) => CLIMock;
+  openRecorder: (options?: { testIdAttributeName?: string, language?: string }) => Promise<{ recorder: Recorder, page: Page }>;
+  runCLI: (args: string[]) => CLIMock;
 };
 
 const codegenLang2Id: Map<string, string> = new Map([
@@ -46,16 +47,15 @@ const codegenLang2Id: Map<string, string> = new Map([
 ]);
 const codegenLangId2lang = new Map([...codegenLang2Id.entries()].map(([lang, langId]) => [langId, lang]));
 
-const playwrightToAutomateInspector = require('../../../packages/playwright-core/lib/inProcessFactory').createInProcessPlaywright();
+const playwrightToAutomateInspector = require('../../../packages/playwright-core/lib/inProcessFactory').createInProcessPlaywright(nodePlatform);
 
 export const test = contextTest.extend<CLITestArgs>({
   recorderPageGetter: async ({ context, toImpl, mode }, run, testInfo) => {
-    process.env.PWTEST_RECORDER_PORT = String(10907 + testInfo.workerIndex);
     testInfo.skip(mode.startsWith('service'));
     await run(async () => {
       while (!toImpl(context).recorderAppForTest)
         await new Promise(f => setTimeout(f, 100));
-      const wsEndpoint = toImpl(context).recorderAppForTest.wsEndpoint;
+      const wsEndpoint = toImpl(context).recorderAppForTest.wsEndpointForTest;
       const browser = await playwrightToAutomateInspector.chromium.connectOverCDP({ wsEndpoint });
       const c = browser.contexts()[0];
       return c.pages()[0] || await c.waitForEvent('page');
@@ -69,23 +69,38 @@ export const test = contextTest.extend<CLITestArgs>({
   },
 
   runCLI: async ({ childProcess, browserName, channel, headless, mode, launchOptions }, run, testInfo) => {
-    process.env.PWTEST_RECORDER_PORT = String(10907 + testInfo.workerIndex);
+    testInfo.slow();
     testInfo.skip(mode.startsWith('service'));
 
-    await run((cliArgs, { autoExitWhen } = {}) => {
-      return new CLIMock(childProcess, browserName, channel, headless, cliArgs, launchOptions.executablePath, autoExitWhen);
+    let cli: CLIMock | undefined;
+    await run(cliArgs => {
+      const outputFile = testInfo.outputPath('codegen.output');
+      cli = new CLIMock(childProcess, {
+        outputFile,
+        browserName,
+        channel,
+        headless,
+        args: cliArgs,
+        executablePath: launchOptions.executablePath,
+      });
+      return cli;
     });
+    await cli?.exit();
   },
 
-  openRecorder: async ({ page, recorderPageGetter }, run) => {
-    await run(async (options?: { testIdAttributeName?: string }) => {
-      await (page.context() as any)._enableRecorder({ language: 'javascript', mode: 'recording', ...options });
-      return new Recorder(page, await recorderPageGetter());
+  openRecorder: async ({ context, recorderPageGetter }, use) => {
+    await use(async options => {
+      await (context as any)._enableRecorder({
+        mode: 'recording',
+        ...options
+      });
+      const page = await context.newPage();
+      return { page, recorder: new Recorder(page, await recorderPageGetter()) };
     });
   },
 });
 
-class Recorder {
+export class Recorder {
   page: Page;
   _highlightCallback: Function;
   _highlightInstalled: boolean;
@@ -129,34 +144,54 @@ class Recorder {
   }
 
   async waitForOutput(file: string, text: string): Promise<Map<string, Source>> {
-    if (!codegenLang2Id.has(file))
-      throw new Error(`Unknown language: ${file}`);
-    await expect.poll(() => this.recorderPage.evaluate(languageId => {
-      const sources = ((window as any).playwrightSourcesEchoForTest || []) as Source[];
-      return sources.find(s => s.id === languageId)?.text || '';
-    }, codegenLang2Id.get(file)), { timeout: 0 }).toContain(text);
-    const sources: Source[] = await this.recorderPage.evaluate(() => (window as any).playwrightSourcesEchoForTest || []);
-    for (const source of sources) {
-      if (!codegenLangId2lang.has(source.id))
-        throw new Error(`Unknown language: ${source.id}`);
-      this._sources.set(codegenLangId2lang.get(source.id), source);
-    }
-    return this._sources;
+    return await test.step('waitForOutput', async () => {
+      if (!codegenLang2Id.has(file))
+        throw new Error(`Unknown language: ${file}`);
+      await expect.poll(() => this.recorderPage.evaluate(languageId => {
+        const sources = ((window as any).playwrightSourcesEchoForTest || []) as Source[];
+        return sources.find(s => s.id === languageId)?.text || '';
+      }, codegenLang2Id.get(file)), { timeout: 0 }).toContain(text);
+      const sources: Source[] = await this.recorderPage.evaluate(() => (window as any).playwrightSourcesEchoForTest || []);
+      for (const source of sources) {
+        if (!codegenLangId2lang.has(source.id))
+          throw new Error(`Unknown language: ${source.id}`);
+        this._sources.set(codegenLangId2lang.get(source.id), source);
+      }
+      return this._sources;
+    }, { box: true });
   }
 
   sources(): Map<string, Source> {
     return this._sources;
   }
 
+  async text(file: string): Promise<string> {
+    const sources: Source[] = await this.recorderPage.evaluate(() => (window as any).playwrightSourcesEchoForTest || []);
+    for (const source of sources) {
+      if (codegenLangId2lang.get(source.id) === file)
+        return source.text;
+    }
+    return '';
+  }
+
   async waitForHighlight(action: () => Promise<void>): Promise<string> {
+    return await test.step('waitForHighlight', async () => {
+      await this.page.$$eval('x-pw-highlight', els => els.forEach(e => e.remove()));
+      await this.page.$$eval('x-pw-tooltip', els => els.forEach(e => e.remove()));
+      await action();
+      await this.page.locator('x-pw-highlight').waitFor();
+      await this.page.locator('x-pw-tooltip').waitFor();
+      await expect(this.page.locator('x-pw-tooltip')).not.toHaveText('');
+      await expect(this.page.locator('x-pw-tooltip')).not.toHaveText(`locator('body')`);
+      return this.page.locator('x-pw-tooltip').textContent();
+    }, { box: true });
+  }
+
+  async waitForHighlightNoTooltip(action: () => Promise<void>): Promise<string> {
     await this.page.$$eval('x-pw-highlight', els => els.forEach(e => e.remove()));
-    await this.page.$$eval('x-pw-tooltip', els => els.forEach(e => e.remove()));
     await action();
     await this.page.locator('x-pw-highlight').waitFor();
-    await this.page.locator('x-pw-tooltip').waitFor();
-    await expect(this.page.locator('x-pw-tooltip')).not.toHaveText('');
-    await expect(this.page.locator('x-pw-tooltip')).not.toHaveText(`locator('body')`);
-    return this.page.locator('x-pw-tooltip').textContent();
+    return '';
   }
 
   async waitForActionPerformed(): Promise<{ hovered: string | null, active: string | null }> {
@@ -173,16 +208,17 @@ class Recorder {
     return new Promise(f => callback = f);
   }
 
-  async hoverOverElement(selector: string, options?: { position?: { x: number, y: number }}): Promise<string> {
-    return this.waitForHighlight(async () => {
+  async hoverOverElement(selector: string, options?: { position?: { x: number, y: number }, omitTooltip?: boolean }): Promise<string> {
+    return (options?.omitTooltip ? this.waitForHighlightNoTooltip : this.waitForHighlight).call(this, async () => {
       const box = await this.page.locator(selector).first().boundingBox();
       const offset = options?.position || { x: box.width / 2, y: box.height / 2 };
       await this.page.mouse.move(box.x + offset.x, box.y + offset.y);
     });
   }
 
-  async trustedMove(selector: string) {
-    const box = await this.page.locator(selector).first().boundingBox();
+  async trustedMove(selector: string | Locator) {
+    const locator = typeof selector === 'string' ? this.page.locator(selector).first() : selector;
+    const box = await locator.boundingBox();
     await this.page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
   }
 
@@ -191,31 +227,45 @@ class Recorder {
     await this.page.mouse.up(options);
   }
 
+  async trustedPress(text: string) {
+    await this.page.keyboard.press(text);
+  }
+
+  async trustedDblclick() {
+    await this.page.mouse.down();
+    await this.page.mouse.up();
+    await this.page.mouse.down({ clickCount: 2 });
+    await this.page.mouse.up();
+  }
+
   async focusElement(selector: string): Promise<string> {
     return this.waitForHighlight(() => this.page.focus(selector));
   }
 }
 
 class CLIMock {
-  process: TestChildProcess;
+  private _process: TestChildProcess;
+  private _outputFile: string;
+  private _exitPromise: Promise<void> | undefined;
 
-  constructor(childProcess: CommonFixtures['childProcess'], browserName: string, channel: string | undefined, headless: boolean | undefined, args: string[], executablePath: string | undefined, autoExitWhen: string | undefined) {
+  constructor(childProcess: CommonFixtures['childProcess'], options: { outputFile: string, browserName: string, channel: string | undefined, headless: boolean | undefined, args: string[], executablePath: string | undefined }) {
+    this._outputFile = options.outputFile;
     const nodeArgs = [
       'node',
       path.join(__dirname, '..', '..', '..', 'packages', 'playwright-core', 'cli.js'),
       'codegen',
-      ...args,
-      `--browser=${browserName}`,
+      ...options.args,
+      `--browser=${options.browserName}`,
+      `--output=${this._outputFile}`,
     ];
-    if (channel)
-      nodeArgs.push(`--channel=${channel}`);
-    this.process = childProcess({
+    if (options.channel)
+      nodeArgs.push(`--channel=${options.channel}`);
+    this._process = childProcess({
       command: nodeArgs,
       env: {
-        PWTEST_CLI_AUTO_EXIT_WHEN: autoExitWhen,
         PWTEST_CLI_IS_UNDER_TEST: '1',
-        PWTEST_CLI_HEADLESS: headless ? '1' : undefined,
-        PWTEST_CLI_EXECUTABLE_PATH: executablePath,
+        PWTEST_CLI_HEADLESS: options.headless ? '1' : undefined,
+        PWTEST_CLI_EXECUTABLE_PATH: options.executablePath,
         DEBUG: (process.env.DEBUG ?? '') + ',pw:browser*',
       },
     });
@@ -223,17 +273,29 @@ class CLIMock {
 
   @step
   async waitFor(text: string): Promise<void> {
-    await expect(() => {
-      expect(this.text()).toContain(text);
-    }).toPass();
+    await expect.poll(() => this.text()).toContain(text);
   }
 
   @step
-  async waitForCleanExit() {
-    return this.process.cleanExit();
+  async exit() {
+    if (!this._exitPromise) {
+      this._process.write('exit\n');
+      this._exitPromise = this._process.cleanExit();
+    }
+    await this._exitPromise;
   }
 
-  text() {
-    return stripAnsi(this.process.output);
+  sigint() {
+    const result = this._process.kill('SIGINT');
+    this._exitPromise = this._process.exited.then(() => undefined); // Avoid double closing.
+    return result;
+  }
+
+  async text() {
+    try {
+      return await fs.promises.readFile(this._outputFile, 'utf-8');
+    } catch {
+      return '';
+    }
   }
 }
diff --git a/tests/library/inspector/pause-helper.ts b/tests/library/inspector/pause-helper.ts
new file mode 100644
index 0000000000000..5d1626b92a2b1
--- /dev/null
+++ b/tests/library/inspector/pause-helper.ts
@@ -0,0 +1,21 @@
+/**
+ * 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 { Page } from 'playwright-core';
+
+export async function pauseHelper(page: Page) {
+  await page.setContent('<div>here we go</div>');
+}
diff --git a/tests/library/inspector/pause.spec.ts b/tests/library/inspector/pause.spec.ts
index ac58fcf8bbf76..1d202e5b88ae6 100644
--- a/tests/library/inspector/pause.spec.ts
+++ b/tests/library/inspector/pause.spec.ts
@@ -15,15 +15,18 @@
  */
 
 import type { Page } from 'playwright-core';
-import { test as it, expect } from './inspectorTest';
+import { test as it, expect, Recorder } from './inspectorTest';
 import { waitForTestLog } from '../../config/utils';
-
+import { roundBox } from '../../page/pageTest';
+import type { BoundingBox } from '../../page/pageTest';
+import { pauseHelper } from './pause-helper';
 
 it('should resume when closing inspector', async ({ page, recorderPageGetter, closeRecorder, mode }) => {
   it.skip(mode !== 'default');
 
   const scriptPromise = (async () => {
-    await page.pause();
+    // @ts-ignore
+    await page.pause({ __testHookKeepTestTimeout: true });
   })();
   await recorderPageGetter();
   await closeRecorder();
@@ -34,7 +37,8 @@ it('should not reset timeouts', async ({ page, recorderPageGetter, closeRecorder
   page.context().setDefaultNavigationTimeout(1000);
   page.context().setDefaultTimeout(1000);
 
-  const pausePromise = page.pause();
+  // @ts-ignore
+  const pausePromise = page.pause({ __testHookKeepTestTimeout: true });
   await recorderPageGetter();
   await closeRecorder();
   await pausePromise;
@@ -60,7 +64,8 @@ it.describe('pause', () => {
 
   it('should pause and resume the script', async ({ page, recorderPageGetter }) => {
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
@@ -69,29 +74,29 @@ it.describe('pause', () => {
 
   it('should pause and resume the script with keyboard shortcut', async ({ page, recorderPageGetter }) => {
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
     })();
     const recorderPage = await recorderPageGetter();
+    await expect(recorderPage.getByRole('button', { name: 'Resume' })).toBeEnabled();
     await recorderPage.keyboard.press('F8');
     await scriptPromise;
   });
 
   it('should resume from console', async ({ page }) => {
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
     })();
-    await Promise.all([
-      page.waitForFunction(() => (window as any).playwright && (window as any).playwright.resume).then(() => {
-        return page.evaluate('window.playwright.resume()');
-      })
-    ]);
+    await page.waitForFunction(() => (window as any).playwright && (window as any).playwright.resume() !== false);
     await scriptPromise;
   });
 
   it('should pause after a navigation', async ({ page, server, recorderPageGetter }) => {
     const scriptPromise = (async () => {
       await page.goto(server.EMPTY_PAGE);
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
@@ -100,25 +105,34 @@ it.describe('pause', () => {
 
   it('should show source', async ({ page, recorderPageGetter }) => {
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
+      await pauseHelper(page);
     })();
     const recorderPage = await recorderPageGetter();
-    const source = await recorderPage.textContent('.source-line-paused');
-    expect(source).toContain('page.pause()');
+    await expect(recorderPage.getByRole('combobox', { name: 'Source chooser' })).toHaveValue(/pause\.spec\.ts/);
+    await expect(recorderPage.locator('.source-line-paused')).toContainText('page.pause({ __testHookKeepTestTimeout: true })');
+
+    await recorderPage.click('[title="Step over (F10)"]');
+    await expect(recorderPage.getByRole('combobox', { name: 'Source chooser' })).toHaveValue(/pause-helper\.ts/);
+    await expect(recorderPage.locator('.source-line-paused')).toContainText('page.setContent(\'<div>here we go</div>\')');
+
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
   });
 
   it('should pause on next pause', async ({ page, recorderPageGetter }) => {
     const scriptPromise = (async () => {
-      await page.pause();  // 1
-      await page.pause();  // 2
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 1
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 2
     })();
     const recorderPage = await recorderPageGetter();
     const source = await recorderPage.textContent('.source-line-paused');
-    expect(source).toContain('page.pause();  // 1');
+    expect(source).toContain('page.pause({ __testHookKeepTestTimeout: true });  // 1');
     await recorderPage.click('[title="Resume (F8)"]');
-    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause();  // 2")');
+    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause({ __testHookKeepTestTimeout: true });  // 2")');
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
   });
@@ -126,12 +140,13 @@ it.describe('pause', () => {
   it('should step', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.click('button');
     })();
     const recorderPage = await recorderPageGetter();
     const source = await recorderPage.textContent('.source-line-paused');
-    expect(source).toContain('page.pause();');
+    expect(source).toContain('page.pause({ __testHookKeepTestTimeout: true });');
 
     await recorderPage.click('[title="Step over (F10)"]');
     await recorderPage.waitForSelector('.source-line-paused :has-text("page.click")');
@@ -143,12 +158,13 @@ it.describe('pause', () => {
   it('should step with keyboard shortcut', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.click('button');
     })();
     const recorderPage = await recorderPageGetter();
     const source = await recorderPage.textContent('.source-line-paused');
-    expect(source).toContain('page.pause();');
+    expect(source).toContain('page.pause({ __testHookKeepTestTimeout: true });');
 
     await recorderPage.keyboard.press('F10');
     await recorderPage.waitForSelector('.source-line-paused :has-text("page.click")');
@@ -166,7 +182,8 @@ it.describe('pause', () => {
       </iframe>
     `);
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.frameLocator('iframe').locator('button').click();
     })();
     const recorderPage = await recorderPageGetter();
@@ -174,12 +191,20 @@ it.describe('pause', () => {
 
     const iframe = page.frames()[1];
     const button = await iframe.waitForSelector('button');
-    const box1 = await button.boundingBox();
+    const box1Promise = button.boundingBox();
+
     const actionPoint = await page.waitForSelector('x-pw-action-point');
-    const box2 = await actionPoint.boundingBox();
+    const box2Promise = actionPoint.boundingBox();
+    await recorderPage.click('[title="Step over (F10)"]');
+
+    const box1 = await box1Promise;
+    const box2 = await box2Promise;
 
     const iframeActionPoint = await iframe.$('x-pw-action-point');
-    expect(await iframeActionPoint?.boundingBox()).toBeFalsy();
+    const iframeActionPointPromise = iframeActionPoint?.boundingBox();
+    await recorderPage.click('[title="Resume (F8)"]');
+
+    expect(await iframeActionPointPromise).toBeFalsy();
 
     const x1 = box1!.x + box1!.width / 2;
     const y1 = box1!.y + box1!.height / 2;
@@ -189,20 +214,21 @@ it.describe('pause', () => {
     expect(Math.abs(x1 - x2) < 2).toBeTruthy();
     expect(Math.abs(y1 - y2) < 2).toBeTruthy();
 
-    await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
   });
 
   it('should skip input when resuming', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.click('button');
-      await page.pause();  // 2
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 2
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
-    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause();  // 2")');
+    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause({ __testHookKeepTestTimeout: true });  // 2")');
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
   });
@@ -210,17 +236,19 @@ it.describe('pause', () => {
   it('should populate log', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.click('button');
-      await page.pause();  // 2
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 2
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
-    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause();  // 2")');
+    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause({ __testHookKeepTestTimeout: true });  // 2")');
     expect(await sanitizeLog(recorderPage)).toEqual([
-      'page.pause- XXms',
-      'page.click(page.locator(\'button\'))- XXms',
-      'page.pause',
+      'Pause- XXms',
+      'Click(page.locator(\'button\'))- XXms',
+      'Pause',
     ]);
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
@@ -230,19 +258,23 @@ it.describe('pause', () => {
     it.skip(trace === 'on');
 
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.context().tracing.start();
       page.setDefaultTimeout(0);
       page.context().setDefaultNavigationTimeout(0);
       await page.context().tracing.stop();
-      await page.pause();  // 2
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 2
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
-    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause();  // 2")');
+    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause({ __testHookKeepTestTimeout: true });  // 2")');
     expect(await sanitizeLog(recorderPage)).toEqual([
-      'page.pause- XXms',
-      'page.pause',
+      'Pause- XXms',
+      'Start tracing- XXms',
+      'Stop tracing- XXms',
+      'Pause',
     ]);
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
@@ -251,19 +283,21 @@ it.describe('pause', () => {
   it('should show expect.toHaveText', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await expect(page.locator('button')).toHaveText('Submit');
       await expect(page.locator('button')).not.toHaveText('Submit2');
-      await page.pause();  // 2
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 2
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
-    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause();  // 2")');
+    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause({ __testHookKeepTestTimeout: true });  // 2")');
     expect(await sanitizeLog(recorderPage)).toEqual([
-      'page.pause- XXms',
-      'expect(page.locator(\'button\')).toHaveText()- XXms',
-      'expect(page.locator(\'button\')).not.toHaveText()- XXms',
-      'page.pause',
+      'Pause- XXms',
+      'Expect "toHaveText"(page.locator(\'button\'))- XXms',
+      'Expect "not toHaveText"(page.locator(\'button\'))- XXms',
+      'Pause',
     ]);
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
@@ -272,7 +306,8 @@ it.describe('pause', () => {
   it('should highlight waitForEvent', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button onclick="console.log(1)">Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await Promise.all([
         page.waitForEvent('console', msg => msg.type() === 'log' && msg.text() === '1'),
         page.click('button'),
@@ -289,21 +324,23 @@ it.describe('pause', () => {
   it('should populate log with waitForEvent', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button onclick="console.log(1)">Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await Promise.all([
         page.waitForEvent('console'),
         page.getByRole('button', { name: 'Submit' }).click(),
       ]);
-      await page.pause();  // 2
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });  // 2
     })();
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
-    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause();  // 2")');
+    await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause({ __testHookKeepTestTimeout: true });  // 2")');
     expect(await sanitizeLog(recorderPage)).toEqual([
-      'page.pause- XXms',
-      'page.waitForEvent(console)',
-      'page.getByRole(\'button\', { name: \'Submit\' }).click()- XXms',
-      'page.pause',
+      'Pause- XXms',
+      'Wait for event "console"- XXms',
+      'Click(page.getByRole(\'button\', { name: \'Submit\' }))- XXms',
+      'Pause',
     ]);
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
@@ -312,15 +349,16 @@ it.describe('pause', () => {
   it('should populate log with error', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button onclick="console.log(1)">Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.getByRole('button').isChecked();
     })().catch(e => e);
     const recorderPage = await recorderPageGetter();
     await recorderPage.click('[title="Resume (F8)"]');
     await recorderPage.waitForSelector('.source-line-error-underline');
     expect(await sanitizeLog(recorderPage)).toEqual([
-      'page.pause- XXms',
-      'page.getByRole(\'button\').isChecked()- XXms',
+      'Pause- XXms',
+      'Is checked(page.getByRole(\'button\'))- XXms',
       'waiting for getByRole(\'button\')',
       'error: Error: Not a checkbox or radio button',
     ]);
@@ -331,10 +369,12 @@ it.describe('pause', () => {
   it('should populate log with error in waitForEvent', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await Promise.all([
         page.waitForEvent('console', { timeout: 1 }).catch(() => {}),
-        page.pause(),
+        // @ts-ignore
+        page.pause({ __testHookKeepTestTimeout: true }),
       ]);
     })();
     const recorderPage = await recorderPageGetter();
@@ -342,11 +382,11 @@ it.describe('pause', () => {
     await recorderPage.waitForSelector('.source-line-paused:has-text("page.pause")');
     await recorderPage.waitForSelector('.source-line-error:has-text("page.waitForEvent")');
     expect(await sanitizeLog(recorderPage)).toEqual([
-      'page.pause- XXms',
-      'page.waitForEvent(console)',
-      'waiting for event \"console\"',
-      'error: Timeout 1ms exceeded while waiting for event \"console\"',
-      'page.pause',
+      'Pause- XXms',
+      'Wait for event "console"- XXms',
+      'waiting for event "console"',
+      'error: Timeout 1ms exceeded while waiting for event "console"',
+      'Pause',
     ]);
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
@@ -354,7 +394,8 @@ it.describe('pause', () => {
 
   it('should pause on page close', async ({ page, recorderPageGetter }) => {
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.close();
     })();
     const recorderPage = await recorderPageGetter();
@@ -366,7 +407,8 @@ it.describe('pause', () => {
 
   it('should pause on context close', async ({ page, recorderPageGetter }) => {
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.context().close();
     })();
     const recorderPage = await recorderPageGetter();
@@ -380,13 +422,16 @@ it.describe('pause', () => {
   it('should highlight on explore', async ({ page, recorderPageGetter }) => {
     await page.setContent('<button>Submit</button>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
     })();
     const recorderPage = await recorderPageGetter();
 
-    const box1Promise = waitForTestLog<Box>(page, 'Highlight box for test: ');
+    const box1Promise = waitForTestLog<BoundingBox>(page, 'Highlight box for test: ');
     await recorderPage.getByText('Locator', { exact: true }).click();
     await recorderPage.locator('.tabbed-pane .CodeMirror').click();
+    await recorderPage.keyboard.press('ControlOrMeta+A');
+    await recorderPage.keyboard.press('Backspace');
     await recorderPage.keyboard.type('getByText(\'Submit\')');
     const box1 = await box1Promise;
 
@@ -402,13 +447,17 @@ it.describe('pause', () => {
     try {
       await page.setContent('<button>Submit</button>');
       const scriptPromise = (async () => {
-        await page.pause();
+        // @ts-ignore
+        await page.pause({ __testHookKeepTestTimeout: true });
       })();
       const recorderPage = await recorderPageGetter();
 
-      const box1Promise = waitForTestLog<Box>(page, 'Highlight box for test: ');
+      await recorderPage.getByRole('combobox', { name: 'Source chooser' }).selectOption('csharp');
+      const box1Promise = waitForTestLog<BoundingBox>(page, 'Highlight box for test: ');
       await recorderPage.getByText('Locator', { exact: true }).click();
       await recorderPage.locator('.tabbed-pane .CodeMirror').click();
+      await recorderPage.keyboard.press('ControlOrMeta+A');
+      await recorderPage.keyboard.press('Backspace');
       await recorderPage.keyboard.type('GetByText("Submit")');
       const box1 = await box1Promise;
 
@@ -430,7 +479,8 @@ it.describe('pause', () => {
         window.addEventListener(event, e => (window as any).log.push(e.type));
     });
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       await page.keyboard.press('Enter');
       await page.keyboard.press('A');
       await page.keyboard.press('Shift+A');
@@ -465,13 +515,14 @@ it.describe('pause', () => {
   it('should highlight locators with custom testId', async ({ page, playwright, recorderPageGetter }) => {
     await page.setContent('<div data-custom-id=foo id=target>and me</div>');
     const scriptPromise = (async () => {
-      await page.pause();
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
       playwright.selectors.setTestIdAttribute('data-custom-id');
       await page.getByTestId('foo').click();
     })();
     const recorderPage = await recorderPageGetter();
 
-    const box1Promise = waitForTestLog<Box>(page, 'Highlight box for test: ');
+    const box1Promise = waitForTestLog<BoundingBox>(page, 'Highlight box for test: ');
     await recorderPage.click('[title="Step over (F10)"]');
     const box2 = roundBox((await page.locator('#target').boundingBox())!);
     const box1 = roundBox(await box1Promise);
@@ -480,12 +531,33 @@ it.describe('pause', () => {
     await recorderPage.click('[title="Resume (F8)"]');
     await scriptPromise;
   });
+
+  it('should record from debugger', async ({ page, recorderPageGetter }) => {
+    await page.setContent('<body style="width: 100%; height: 100%"></body>');
+    const scriptPromise = (async () => {
+      // @ts-ignore
+      await page.pause({ __testHookKeepTestTimeout: true });
+    })();
+    const recorderPage = await recorderPageGetter();
+    await expect(recorderPage.getByRole('combobox', { name: 'Source chooser' })).toHaveValue(/pause\.spec\.ts/);
+    await expect(recorderPage.locator('.source-line-paused')).toHaveText(/await page\.pause\(.*\)/);
+    await recorderPage.getByRole('button', { name: 'Record' }).click();
+
+    const recorder = new Recorder(page, recorderPage);
+    await recorder.hoverOverElement('body', { omitTooltip: true });
+    await recorder.trustedClick();
+
+    await expect(recorderPage.getByRole('combobox', { name: 'Source chooser' })).toHaveValue('playwright-test');
+    await expect(recorderPage.locator('.cm-wrapper')).toContainText(`await page.locator('body').click();`);
+    await recorderPage.getByRole('button', { name: 'Resume' }).click();
+    await scriptPromise;
+  });
 });
 
 async function sanitizeLog(recorderPage: Page): Promise<string[]> {
   const results = [];
   for (const entry of await recorderPage.$$('.call-log-call')) {
-    const header =  (await (await entry.$('.call-log-call-header'))!.textContent())!.replace(/— [\d.]+(ms|s)/, '- XXms');
+    const header = (await (await entry.$('.call-log-call-header'))!.textContent())!.replace(/— [\d.]+(ms|s)/, '- XXms');
     results.push(header.replace(/page\.waitForEvent\(console\).*/, 'page.waitForEvent(console)'));
     results.push(...await entry.$$eval('.call-log-message', ee => ee.map(e => {
       return (e.classList.contains('error') ? 'error: ' : '') + e.textContent;
@@ -493,13 +565,3 @@ async function sanitizeLog(recorderPage: Page): Promise<string[]> {
   }
   return results;
 }
-
-type Box = { x: number, y: number, width: number, height: number };
-function roundBox(box: Box): Box {
-  return {
-    x: Math.round(box.x * 1000),
-    y: Math.round(box.y * 1000),
-    width: Math.round(box.width * 1000),
-    height: Math.round(box.height * 1000),
-  };
-}
diff --git a/tests/library/inspector/recorder-api.spec.ts b/tests/library/inspector/recorder-api.spec.ts
new file mode 100644
index 0000000000000..cf63508bc8e26
--- /dev/null
+++ b/tests/library/inspector/recorder-api.spec.ts
@@ -0,0 +1,141 @@
+/**
+ * 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 './inspectorTest';
+
+import type { Page } from '@playwright/test';
+import type * as actions from '@recorder/actions';
+
+class RecorderLog {
+  actions: (actions.ActionInContext & { code: string })[] = [];
+
+  actionAdded(page: Page, actionInContext: actions.ActionInContext, code: string): void {
+    this.actions.push({ ...actionInContext, code });
+  }
+
+  actionUpdated(page: Page, actionInContext: actions.ActionInContext, code: string): void {
+    this.actions[this.actions.length - 1] = { ...actionInContext, code };
+  }
+}
+
+async function startRecording(context) {
+  const log = new RecorderLog();
+  await (context as any)._enableRecorder({
+    mode: 'recording',
+    recorderMode: 'api',
+  }, log);
+  return {
+    action: (name: string) => log.actions.filter(a => a.action.name === name),
+  };
+}
+
+function normalizeCode(code: string): string {
+  return code.replace(/\s+/g, ' ').trim();
+}
+
+test('should click', async ({ context, browserName, platform }) => {
+  const log = await startRecording(context);
+  const page = await context.newPage();
+  await page.setContent(`<button onclick="console.log('click')">Submit</button>`);
+  await page.getByRole('button', { name: 'Submit' }).click();
+
+  const clickActions = log.action('click');
+  expect(clickActions).toEqual([
+    expect.objectContaining({
+      action: expect.objectContaining({
+        name: 'click',
+        selector: 'internal:role=button[name="Submit"i]',
+        ref: 'e2',
+        // Safari does not focus after a click: https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/button#clicking_and_focus
+        ariaSnapshot: (browserName === 'webkit' && (platform === 'darwin' || platform === 'win32')) ? '- button "Submit" [ref=e2]' : '- button "Submit" [active] [ref=e2]',
+      }),
+      startTime: expect.any(Number),
+    })
+  ]);
+
+  expect(normalizeCode(clickActions[0].code)).toEqual(`await page.getByRole('button', { name: 'Submit' }).click();`);
+});
+
+test('should double click', async ({ context, browserName, platform }) => {
+  const log = await startRecording(context);
+  const page = await context.newPage();
+  await page.setContent(`<button onclick="console.log('click')" ondblclick="console.log('dblclick')">Submit</button>`);
+  await page.getByRole('button', { name: 'Submit' }).dblclick();
+
+  const clickActions = log.action('click');
+  expect(clickActions).toEqual([
+    expect.objectContaining({
+      action: expect.objectContaining({
+        name: 'click',
+        clickCount: 2,
+        selector: 'internal:role=button[name="Submit"i]',
+        ref: 'e2',
+        // Safari does not focus after a click: https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/button#clicking_and_focus
+        ariaSnapshot: (browserName === 'webkit' && (platform === 'darwin' || platform === 'win32')) ? '- button "Submit" [ref=e2]' : '- button "Submit" [active] [ref=e2]',
+      }),
+      startTime: expect.any(Number),
+    })
+  ]);
+
+  expect(normalizeCode(clickActions[0].code)).toEqual(`await page.getByRole('button', { name: 'Submit' }).dblclick();`);
+});
+
+test('should right click', async ({ context, browserName, platform }) => {
+  const log = await startRecording(context);
+  const page = await context.newPage();
+  await page.setContent(`<button oncontextmenu="console.log('contextmenu')">Submit</button>`);
+  await page.getByRole('button', { name: 'Submit' }).click({ button: 'right' });
+
+  const clickActions = log.action('click');
+  expect(clickActions).toEqual([
+    expect.objectContaining({
+      action: expect.objectContaining({
+        name: 'click',
+        button: 'right',
+        selector: 'internal:role=button[name="Submit"i]',
+        ref: 'e2',
+        // Safari does not focus after a click: https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Elements/button#clicking_and_focus
+        ariaSnapshot: (browserName === 'webkit' && (platform === 'darwin' || platform === 'win32')) ? '- button "Submit" [ref=e2]' : '- button "Submit" [active] [ref=e2]',
+      }),
+      startTime: expect.any(Number),
+    })
+  ]);
+
+  expect(normalizeCode(clickActions[0].code)).toEqual(`await page.getByRole('button', { name: 'Submit' }).click({ button: 'right' });`);
+});
+
+test('should type', async ({ context }) => {
+  const log = await startRecording(context);
+  const page = await context.newPage();
+  await page.setContent(`<input type="text" />`);
+
+  await page.getByRole('textbox').pressSequentially('Hello');
+
+  const fillActions = log.action('fill');
+  expect(fillActions).toEqual([
+    expect.objectContaining({
+      action: expect.objectContaining({
+        name: 'fill',
+        selector: 'internal:role=textbox',
+        ref: 'e2',
+        ariaSnapshot: '- textbox [active] [ref=e2]: Hello',
+      }),
+      startTime: expect.any(Number),
+    })
+  ]);
+
+  expect(normalizeCode(fillActions[0].code)).toEqual(`await page.getByRole('textbox').fill('Hello');`);
+});
diff --git a/tests/library/inspector/title.spec.ts b/tests/library/inspector/title.spec.ts
new file mode 100644
index 0000000000000..a2569e74e6e4d
--- /dev/null
+++ b/tests/library/inspector/title.spec.ts
@@ -0,0 +1,65 @@
+/**
+ * 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 './inspectorTest';
+
+test('should reflect formatted URL of the page', async ({
+  openRecorder,
+  server,
+}) => {
+  const { recorder } = await openRecorder();
+  await recorder.setContentAndWait('');
+  await expect(recorder.recorderPage).toHaveTitle(
+      'Playwright Inspector - about:blank',
+  );
+
+  await recorder.setContentAndWait('', server.EMPTY_PAGE);
+  await expect(recorder.recorderPage).toHaveTitle(
+      `Playwright Inspector - ${server.EMPTY_PAGE}`,
+  );
+});
+
+test('should update primary page URL when original primary closes', async ({
+  context,
+  openRecorder,
+  server,
+}) => {
+  const { recorder } = await openRecorder();
+  await recorder.setContentAndWait(
+      '',
+      `${server.PREFIX}/background-color.html`,
+  );
+  await expect(recorder.recorderPage).toHaveTitle(
+      `Playwright Inspector - ${server.PREFIX}/background-color.html`,
+  );
+
+  const page2 = await context.newPage();
+  await page2.goto(`${server.PREFIX}/dom.html`);
+  await expect(recorder.recorderPage).toHaveTitle(
+      `Playwright Inspector - ${server.PREFIX}/background-color.html`,
+  );
+
+  await context.pages()[0].close();
+  await expect(recorder.recorderPage).toHaveTitle(
+      `Playwright Inspector - ${server.PREFIX}/dom.html`,
+  );
+});
+
+test('should render primary language', async ({ openRecorder }) => {
+  const { recorder } = await openRecorder({ language: 'python' });
+  await recorder.setContentAndWait('');
+  await expect(recorder.recorderPage.getByRole('combobox', { name: 'Source chooser' })).toHaveValue('python');
+});
diff --git a/tests/library/launcher.spec.ts b/tests/library/launcher.spec.ts
index 54b74c636620a..049e9e18347ff 100644
--- a/tests/library/launcher.spec.ts
+++ b/tests/library/launcher.spec.ts
@@ -41,9 +41,11 @@ it('should kill browser process on timeout after close', async ({ browserType, m
   expect(stalled).toBeTruthy();
 });
 
-it('should throw a friendly error if its headed and there is no xserver on linux running', async ({ mode, browserType, platform }) => {
+it('should throw a friendly error if its headed and there is no xserver on linux running', async ({ mode, browserType, platform, channel }) => {
   it.skip(platform !== 'linux');
   it.skip(mode.startsWith('service'));
+  it.skip(channel === 'chromium-headless-shell', 'shell is never headed');
+  it.skip(channel === 'chromium-tip-of-tree-headless-shell', 'shell is never headed');
 
   const error: Error = await browserType.launch({
     headless: false,
diff --git a/tests/library/locator-dispatchevent-touch.spec.ts b/tests/library/locator-dispatchevent-touch.spec.ts
new file mode 100644
index 0000000000000..fdf9c2c7e20d9
--- /dev/null
+++ b/tests/library/locator-dispatchevent-touch.spec.ts
@@ -0,0 +1,58 @@
+/**
+ * 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 { contextTest as it, expect } from '../config/browserTest';
+
+it.use({ hasTouch: true });
+
+it('should support touch points in touch event arguments', async ({ page, server, browserName }) => {
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`
+      <div data-testid='outer' style="position: absolute; width: 120px; height: 120px; background-color: red;">
+        <div data-testid='inner' style="position: absolute; width: 100px; height: 100px; top: 10px; left: 10px; background-color: green; z-index: 3;">inner</div>
+      </div>`);
+  const outer = page.getByTestId('outer');
+  await outer.evaluate(el => {
+    const events = [];
+    (window as any).events = events;
+    el.addEventListener('touchstart', (e: TouchEvent) => events.push('touchstart: ' + [...e.touches].map(t => `${t.constructor.name}(id: ${t.identifier}, clientX: ${t.clientX}, clientY: ${t.clientY})`)));
+    el.addEventListener('touchmove', (e: TouchEvent) => events.push('touchmove: ' + [...e.touches].map(t => `${t.constructor.name}(id: ${t.identifier}, clientX: ${t.clientX}, clientY: ${t.clientY})`)));
+    el.addEventListener('touchend', (e: TouchEvent) => events.push('touchend: ' + [...e.touches].map(t => `${t.constructor.name}(id: ${t.identifier}, clientX: ${t.clientX}, clientY: ${t.clientY})`)));
+  });
+
+  const touches = [{ identifier: 0, clientX: 61, clientY: 60 }, { identifier: 1, clientX: 59, clientY: 60 }];
+  const inner = page.getByTestId('inner');
+  await inner.dispatchEvent('touchstart', {
+    touches,
+    changedTouches: touches,
+    targetTouches: touches,
+  });
+  await inner.dispatchEvent('touchmove', {
+    touches,
+    changedTouches: touches,
+    targetTouches: touches,
+  });
+  await inner.dispatchEvent('touchend', {
+    touches: [],
+    changedTouches: touches,
+    targetTouches: [],
+  });
+  expect(await page.evaluate(() => (window as any).events)).toEqual([
+    'touchstart: Touch(id: 0, clientX: 61, clientY: 60),Touch(id: 1, clientX: 59, clientY: 60)',
+    'touchmove: Touch(id: 0, clientX: 61, clientY: 60),Touch(id: 1, clientX: 59, clientY: 60)',
+    'touchend: ',
+  ]);
+});
diff --git a/tests/library/locator-generator.spec.ts b/tests/library/locator-generator.spec.ts
index 30ee22ef0e34e..9040438125df8 100644
--- a/tests/library/locator-generator.spec.ts
+++ b/tests/library/locator-generator.spec.ts
@@ -15,7 +15,7 @@
  */
 
 import { contextTest as it, expect } from '../config/browserTest';
-import { asLocator, asLocators } from '../../packages/playwright-core/lib/utils/isomorphic/locatorGenerators';
+import { asLocator, asLocators, asLocatorDescription } from '../../packages/playwright-core/lib/utils/isomorphic/locatorGenerators';
 import { locatorOrSelectorAsSelector as parseLocator } from '../../packages/playwright-core/lib/utils/isomorphic/locatorParser';
 import type { Page, Frame, Locator, FrameLocator } from 'playwright-core';
 
@@ -28,7 +28,7 @@ function generate(locator: Locator | FrameLocator) {
 function generateForSelector(selector: string) {
   const result: any = {};
   for (const lang of ['javascript', 'python', 'java', 'csharp']) {
-    const locatorString = asLocator(lang, selector, false);
+    const locatorString = asLocator(lang, selector);
     expect.soft(parseLocator(lang, locatorString, 'data-testid'), lang + ' mismatch').toBe(selector);
     result[lang] = locatorString;
   }
@@ -39,7 +39,7 @@ async function generateForNode(pageOrFrame: Page | Frame, target: string): Promi
   const selector = await pageOrFrame.locator(target).evaluate(e => (window as any).playwright.selector(e));
   const result: any = {};
   for (const lang of ['javascript', 'python', 'java', 'csharp']) {
-    const locatorString = asLocator(lang, selector, false);
+    const locatorString = asLocator(lang, selector);
     expect.soft(parseLocator(lang, locatorString)).toBe(selector);
     result[lang] = locatorString;
   }
@@ -196,6 +196,12 @@ it('reverse engineer getByRole', async ({ page }) => {
     java: `getByRole(AriaRole.BUTTON)`,
     csharp: `GetByRole(AriaRole.Button)`,
   });
+  expect.soft(generate(page.getByRole('heading', {}))).toEqual({
+    javascript: "getByRole('heading')",
+    python: 'get_by_role("heading")',
+    java: 'getByRole(AriaRole.HEADING)',
+    csharp: 'GetByRole(AriaRole.Heading)'
+  });
   expect.soft(generate(page.getByRole('button', { name: 'Hello' }))).toEqual({
     javascript: `getByRole('button', { name: 'Hello' })`,
     python: `get_by_role("button", name="Hello")`,
@@ -314,6 +320,21 @@ it('reverse engineer hasNotText', async ({ page }) => {
   });
 });
 
+it('reverse engineer visible', async ({ page }) => {
+  expect.soft(generate(page.getByText('Hello').filter({ visible: true }).locator('div'))).toEqual({
+    csharp: `GetByText("Hello").Filter(new() { Visible = true }).Locator("div")`,
+    java: `getByText("Hello").filter(new Locator.FilterOptions().setVisible(true)).locator("div")`,
+    javascript: `getByText('Hello').filter({ visible: true }).locator('div')`,
+    python: `get_by_text("Hello").filter(visible=True).locator("div")`,
+  });
+  expect.soft(generate(page.getByText('Hello').filter({ visible: false }).locator('div'))).toEqual({
+    csharp: `GetByText("Hello").Filter(new() { Visible = false }).Locator("div")`,
+    java: `getByText("Hello").filter(new Locator.FilterOptions().setVisible(false)).locator("div")`,
+    javascript: `getByText('Hello').filter({ visible: false }).locator('div')`,
+    python: `get_by_text("Hello").filter(visible=False).locator("div")`,
+  });
+});
+
 it('reverse engineer has', async ({ page }) => {
   expect.soft(generate(page.getByText('Hello').filter({ has: page.locator('div').getByText('bye') }))).toEqual({
     csharp: `GetByText("Hello").Filter(new() { Has = Locator("div").GetByText("bye") })`,
@@ -374,15 +395,15 @@ it('reverse engineer frameLocator', async ({ page }) => {
       .frameLocator('iframe')
       .locator('span');
   expect.soft(generate(locator)).toEqual({
-    csharp: `FrameLocator("iframe").GetByText("foo", new() { Exact = true }).FrameLocator("frame").First.FrameLocator("iframe").Locator("span")`,
-    java: `frameLocator("iframe").getByText("foo", new FrameLocator.GetByTextOptions().setExact(true)).frameLocator("frame").first().frameLocator("iframe").locator("span")`,
-    javascript: `frameLocator('iframe').getByText('foo', { exact: true }).frameLocator('frame').first().frameLocator('iframe').locator('span')`,
-    python: `frame_locator("iframe").get_by_text("foo", exact=True).frame_locator("frame").first.frame_locator("iframe").locator("span")`,
+    csharp: `Locator("iframe").ContentFrame.GetByText("foo", new() { Exact = true }).Locator("frame").First.ContentFrame.Locator("iframe").ContentFrame.Locator("span")`,
+    java: `locator("iframe").contentFrame().getByText("foo", new FrameLocator.GetByTextOptions().setExact(true)).locator("frame").first().contentFrame().locator("iframe").contentFrame().locator("span")`,
+    javascript: `locator('iframe').contentFrame().getByText('foo', { exact: true }).locator('frame').first().contentFrame().locator('iframe').contentFrame().locator('span')`,
+    python: `locator("iframe").content_frame.get_by_text("foo", exact=True).locator("frame").first.content_frame.locator("iframe").content_frame.locator("span")`,
   });
 
   // Note that frame locators with ">>" are not restored back due to ambiguity.
   const selector = (page.frameLocator('div >> iframe').locator('span') as any)._selector;
-  expect.soft(asLocator('javascript', selector, false)).toBe(`locator('div').frameLocator('iframe').locator('span')`);
+  expect.soft(asLocator('javascript', selector)).toBe(`locator('div').locator('iframe').contentFrame().locator('span')`);
 });
 
 it('generate multiple locators', async ({ page }) => {
@@ -462,7 +483,7 @@ it('generate multiple locators', async ({ page }) => {
     ],
   };
   for (const lang of ['javascript', 'java', 'python', 'csharp'] as const) {
-    expect.soft(asLocators(lang, selector, false)).toEqual(locators[lang]);
+    expect.soft(asLocators(lang, selector)).toEqual(locators[lang]);
     for (const locator of locators[lang])
       expect.soft(parseLocator(lang, locator, 'data-testid'), `parse(${lang}): ${locator}`).toBe(selector);
   }
@@ -485,38 +506,38 @@ it.describe(() => {
       python: 'locator("div").filter(has_text="Goodbye world").locator("span")',
     });
 
-    expect.soft(asLocator('javascript', 'div >> internal:has-text="foo"s', false)).toBe(`locator('div').locator('internal:has-text="foo"s')`);
-    expect.soft(asLocator('javascript', 'div >> internal:has-not-text="foo"s', false)).toBe(`locator('div').locator('internal:has-not-text="foo"s')`);
+    expect.soft(asLocator('javascript', 'div >> internal:has-text="foo"s')).toBe(`locator('div').locator('internal:has-text="foo"s')`);
+    expect.soft(asLocator('javascript', 'div >> internal:has-not-text="foo"s')).toBe(`locator('div').locator('internal:has-not-text="foo"s')`);
   });
 });
 
 it('asLocator internal:and', async () => {
-  expect.soft(asLocator('javascript', 'div >> internal:and="span >> article"', false)).toBe(`locator('div').and(locator('span').locator('article'))`);
-  expect.soft(asLocator('python', 'div >> internal:and="span >> article"', false)).toBe(`locator("div").and_(locator("span").locator("article"))`);
-  expect.soft(asLocator('java', 'div >> internal:and="span >> article"', false)).toBe(`locator("div").and(locator("span").locator("article"))`);
-  expect.soft(asLocator('csharp', 'div >> internal:and="span >> article"', false)).toBe(`Locator("div").And(Locator("span").Locator("article"))`);
+  expect.soft(asLocator('javascript', 'div >> internal:and="span >> article"')).toBe(`locator('div').and(locator('span').locator('article'))`);
+  expect.soft(asLocator('python', 'div >> internal:and="span >> article"')).toBe(`locator("div").and_(locator("span").locator("article"))`);
+  expect.soft(asLocator('java', 'div >> internal:and="span >> article"')).toBe(`locator("div").and(locator("span").locator("article"))`);
+  expect.soft(asLocator('csharp', 'div >> internal:and="span >> article"')).toBe(`Locator("div").And(Locator("span").Locator("article"))`);
 });
 
 it('asLocator internal:or', async () => {
-  expect.soft(asLocator('javascript', 'div >> internal:or="span >> article"', false)).toBe(`locator('div').or(locator('span').locator('article'))`);
-  expect.soft(asLocator('python', 'div >> internal:or="span >> article"', false)).toBe(`locator("div").or_(locator("span").locator("article"))`);
-  expect.soft(asLocator('java', 'div >> internal:or="span >> article"', false)).toBe(`locator("div").or(locator("span").locator("article"))`);
-  expect.soft(asLocator('csharp', 'div >> internal:or="span >> article"', false)).toBe(`Locator("div").Or(Locator("span").Locator("article"))`);
+  expect.soft(asLocator('javascript', 'div >> internal:or="span >> article"')).toBe(`locator('div').or(locator('span').locator('article'))`);
+  expect.soft(asLocator('python', 'div >> internal:or="span >> article"')).toBe(`locator("div").or_(locator("span").locator("article"))`);
+  expect.soft(asLocator('java', 'div >> internal:or="span >> article"')).toBe(`locator("div").or(locator("span").locator("article"))`);
+  expect.soft(asLocator('csharp', 'div >> internal:or="span >> article"')).toBe(`Locator("div").Or(Locator("span").Locator("article"))`);
 });
 
 it('asLocator internal:chain', async () => {
-  expect.soft(asLocator('javascript', 'div >> internal:chain="span >> article"', false)).toBe(`locator('div').locator(locator('span').locator('article'))`);
-  expect.soft(asLocator('python', 'div >> internal:chain="span >> article"', false)).toBe(`locator("div").locator(locator("span").locator("article"))`);
-  expect.soft(asLocator('java', 'div >> internal:chain="span >> article"', false)).toBe(`locator("div").locator(locator("span").locator("article"))`);
-  expect.soft(asLocator('csharp', 'div >> internal:chain="span >> article"', false)).toBe(`Locator("div").Locator(Locator("span").Locator("article"))`);
+  expect.soft(asLocator('javascript', 'div >> internal:chain="span >> article"')).toBe(`locator('div').locator(locator('span').locator('article'))`);
+  expect.soft(asLocator('python', 'div >> internal:chain="span >> article"')).toBe(`locator("div").locator(locator("span").locator("article"))`);
+  expect.soft(asLocator('java', 'div >> internal:chain="span >> article"')).toBe(`locator("div").locator(locator("span").locator("article"))`);
+  expect.soft(asLocator('csharp', 'div >> internal:chain="span >> article"')).toBe(`Locator("div").Locator(Locator("span").Locator("article"))`);
 });
 
 it('asLocator xpath', async () => {
   const selector = `//*[contains(normalizer-text(), 'foo']`;
-  expect.soft(asLocator('javascript', selector, false)).toBe(`locator('//*[contains(normalizer-text(), \\'foo\\']')`);
-  expect.soft(asLocator('python', selector, false)).toBe(`locator(\"//*[contains(normalizer-text(), 'foo']\")`);
-  expect.soft(asLocator('java', selector, false)).toBe(`locator(\"//*[contains(normalizer-text(), 'foo']\")`);
-  expect.soft(asLocator('csharp', selector, false)).toBe(`Locator(\"//*[contains(normalizer-text(), 'foo']\")`);
+  expect.soft(asLocator('javascript', selector)).toBe(`locator('//*[contains(normalizer-text(), \\'foo\\']')`);
+  expect.soft(asLocator('python', selector)).toBe(`locator(\"//*[contains(normalizer-text(), 'foo']\")`);
+  expect.soft(asLocator('java', selector)).toBe(`locator(\"//*[contains(normalizer-text(), 'foo']\")`);
+  expect.soft(asLocator('csharp', selector)).toBe(`Locator(\"//*[contains(normalizer-text(), 'foo']\")`);
   expect.soft(parseLocator('javascript', `locator('//*[contains(normalizer-text(), \\'foo\\']')`, 'data-testid')).toBe("//*[contains(normalizer-text(), 'foo']");
   expect.soft(parseLocator('javascript', `locator("//*[contains(normalizer-text(), 'foo']")`, 'data-testid')).toBe("//*[contains(normalizer-text(), 'foo']");
   expect.soft(parseLocator('javascript', `locator('xpath=//*[contains(normalizer-text(), \\'foo\\']')`, 'data-testid')).toBe("xpath=//*[contains(normalizer-text(), 'foo']");
@@ -559,6 +580,12 @@ it('parseLocator css', async () => {
   expect.soft(parseLocator('csharp', `Locator("css=.foo")`, '')).toBe(`css=.foo`);
 });
 
+
+it('parseLocator options', async () => {
+  expect.soft(parseLocator('javascript', `getByRole('heading', {})`, '')).toBe(`internal:role=heading`);
+  expect.soft(parseLocator('javascript', `getByRole('checkbox', { checked:false, includeHidden: true })`, '')).toBe(`internal:role=checkbox[checked=false][include-hidden=true]`);
+});
+
 it('parse locators strictly', () => {
   const selector = 'div >> internal:has-text=\"Goodbye world\"i >> span';
 
@@ -584,3 +611,53 @@ it('parse locators strictly', () => {
   expect.soft(parseLocator('javascript', `locator('div').filter({ hasText: 'Goodbye world' }}).locator('span')`)).not.toBe(selector);
   expect.soft(parseLocator('python', `locator("div").filter(has_text=="Goodbye world").locator("span")`)).not.toBe(selector);
 });
+
+it('parseLocator frames', async () => {
+  expect.soft(parseLocator('javascript', `locator('iframe').contentFrame().getByText('foo')`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('javascript', `frameLocator('iframe').getByText('foo')`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('javascript', `frameLocator('css=iframe').getByText('foo')`, '')).toBe(`css=iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('javascript', `getByTitle('iframe title').contentFrame()`)).toBe(`internal:attr=[title=\"iframe title\"i] >> internal:control=enter-frame`);
+
+  expect.soft(asLocators('javascript', 'internal:attr=[title=\"iframe title\"i] >> internal:control=enter-frame')).toEqual([`getByTitle('iframe title').contentFrame()`]);
+
+  expect.soft(parseLocator('python', `locator("iframe").content_frame.get_by_text("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('python', `frame_locator("iframe").get_by_text("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('python', `frame_locator("css=iframe").get_by_text("foo")`, '')).toBe(`css=iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+
+  expect.soft(parseLocator('csharp', `Locator("iframe").ContentFrame.GetByText("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('csharp', `FrameLocator("iframe").GetByText("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+
+  expect.soft(parseLocator('java', `locator("iframe").contentFrame().getByText("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+  expect.soft(parseLocator('java', `frameLocator("iframe").getByText("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
+});
+
+it('should not oom in locator parser', async ({ page }) => {
+  const l = page.locator.bind(page);
+  const locator = page.locator('text=L1').or(l('text=L2').or(l('text=L3').or(l('text=L4')).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L5').or(l('text=L6'))).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L7')
+      .or(l('text=L8'))))).or(l('text=L9').or(l('text=L10').or(l('text=L11')).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L12').or(l('text=L13'))).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L14').or(l('text=L15'))))).or(l('text=L16').or(l('text=L17').or(l('text=L18')).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L19').or(l('text=L20'))).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L21').or(l('text=L22'))))).or(l('text=L23').or(l('text=L24').or(l('text=L25')).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L26').or(l('text=L27'))).or(l('#f0')
+      .contentFrame().locator('#f0_mid_0')
+      .contentFrame().locator('text=L28').or(l('text=L29')))));
+  const error = await locator.count().catch(e => e);
+  expect(error.message).toContain('Frame locators are not allowed inside composite locators');
+});
+
+it('asLocatorDescription invalid input', async () => {
+  expect.soft(asLocatorDescription('javascript', `body >> internal:describe="desc"`)).toBe(`desc`);
+  expect.soft(asLocatorDescription('javascript', `body >> internal:describe=12`)).toBe(`locator('body')`);
+  expect.soft(asLocatorDescription('javascript', `following-sibling::*[1]`)).toBe(`following-sibling::*[1]`);
+  expect.soft(asLocatorDescription('javascript', `body >> internal:describe="desc" >> div`)).toBe(`locator('body').locator('div')`);
+});
diff --git a/tests/library/modernizr.spec.ts b/tests/library/modernizr.spec.ts
index 5f0e165c65922..0a42c39e8cf18 100644
--- a/tests/library/modernizr.spec.ts
+++ b/tests/library/modernizr.spec.ts
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
+import type { BrowserContext } from 'playwright-core';
+import type { TestServer } from '../config/testserver';
+import { hostPlatform } from '../../packages/playwright-core/src/server/utils/hostPlatform';
 import { browserTest as it, expect } from '../config/browserTest';
 import fs from 'fs';
 import os from 'os';
 
-async function checkFeatures(name: string, context: any, server: any) {
+async function checkFeatures(name: string, context: BrowserContext, server: TestServer): Promise<any> {
   try {
     const page = await context.newPage();
-    await page.goto(server.PREFIX + '/modernizr.html');
+    await page.goto(server.PREFIX + '/modernizr/index.html');
     const actual = await page.evaluate('window.report');
     const expected = JSON.parse(fs.readFileSync(require.resolve(`../assets/modernizr/${name}.json`), 'utf-8'));
     return { actual, expected };
@@ -30,61 +33,74 @@ async function checkFeatures(name: string, context: any, server: any) {
   }
 }
 
-it('safari-14-1', async ({ browser, browserName, platform, server, headless, isMac }) => {
+it('Safari Desktop', async ({ browser, browserName, platform, httpsServer, headless }) => {
   it.skip(browserName !== 'webkit');
-  it.skip(browserName === 'webkit' && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen.');
+  it.skip(browserName === 'webkit' && platform === 'darwin' && os.arch() === 'x64', 'Modernizr uses WebGL which is not available on Intel macOS - https://bugs.webkit.org/show_bug.cgi?id=278277');
+  it.skip(browserName === 'webkit' && hostPlatform.startsWith('ubuntu20.04'), 'Ubuntu 20.04 is frozen');
   const context = await browser.newContext({
-    deviceScaleFactor: 2
+    deviceScaleFactor: 2,
+    ignoreHTTPSErrors: true,
   });
-  const { actual, expected } = await checkFeatures('safari-14-1', context, server);
+  const { actual, expected } = await checkFeatures('safari-18', context, httpsServer);
+
+  expected.pushmanager = false;
+  expected.devicemotion2 = false;
+  expected.devicemotion = false;
+  expected.deviceorientation = false;
+  expected.deviceorientation3 = false;
+
+  delete expected.webglextensions;
+  delete actual.webglextensions;
+  expected.audio = !!expected.audio;
+  actual.audio = !!actual.audio;
+  expected.video = !!expected.video;
+  actual.video = !!actual.video;
 
   if (platform === 'linux') {
-    expected.subpixelfont = false;
+    expected.speechrecognition = false;
+    expected.mediastream = false;
     if (headless)
-      expected.todataurljpeg = false;
+      expected.todataurlwebp = true;
 
     // GHA
     delete actual.variablefonts;
     delete expected.variablefonts;
-
-    if (isDocker()) {
-      delete actual.unicode;
-      delete expected.unicode;
-    }
   }
 
   if (platform === 'win32') {
-    expected.datalistelem = false;
-    expected.fileinputdirectory = false;
     expected.getusermedia = false;
     expected.peerconnection = false;
     expected.speechrecognition = false;
     expected.speechsynthesis = false;
-    expected.todataurljpeg = false;
-    expected.unicode = false;
+    expected.todataurlwebp = true;
     expected.webaudio = false;
+    expected.gamepads = false;
+
+    delete expected.datalistelem;
+
+    expected.mediastream = false;
+    expected.mediasource = false;
+    expected.datachannel = false;
 
-    expected.input.list = false;
     expected.inputtypes.color = false;
     expected.inputtypes.date = false;
     expected.inputtypes['datetime-local'] = false;
     expected.inputtypes.time = false;
   }
 
-  if (isMac && parseInt(os.release(), 10) > 20) {
-    expected.applicationcache = false;
-    expected.inputsearchevent = false;
-  }
-
   expect(actual).toEqual(expected);
 });
 
-it('mobile-safari-14-1', async ({ playwright, browser, browserName, platform, isMac, server, headless }) => {
+it('Mobile Safari', async ({ playwright, browser, browserName, platform, httpsServer, headless }) => {
   it.skip(browserName !== 'webkit');
-  it.skip(browserName === 'webkit' && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen.');
+  it.skip(browserName === 'webkit' && platform === 'darwin' && os.arch() === 'x64', 'Modernizr uses WebGL which is not available on Intel macOS - https://bugs.webkit.org/show_bug.cgi?id=278277');
+  it.skip(browserName === 'webkit' && hostPlatform.startsWith('ubuntu20.04'), 'Ubuntu 20.04 is frozen');
   const iPhone = playwright.devices['iPhone 12'];
-  const context = await browser.newContext(iPhone);
-  const { actual, expected } = await checkFeatures('mobile-safari-14-1', context, server);
+  const context = await browser.newContext({
+    ...iPhone,
+    ignoreHTTPSErrors: true,
+  });
+  const { actual, expected } = await checkFeatures('mobile-safari-18', context, httpsServer);
 
   {
     // All platforms.
@@ -93,61 +109,48 @@ it('mobile-safari-14-1', async ({ playwright, browser, browserName, platform, is
     expected.cssvhunit = true;
     expected.cssvmaxunit = true;
     expected.overflowscrolling = false;
+    expected.mediasource = true;
+    expected.scrolltooptions = false;
+
+    delete expected.webglextensions;
+    delete actual.webglextensions;
+    expected.audio = !!expected.audio;
+    actual.audio = !!actual.audio;
+    expected.video = !!expected.video;
+    actual.video = !!actual.video;
   }
 
   if (platform === 'linux') {
-    expected.subpixelfont = false;
+    expected.speechrecognition = false;
+    expected.mediastream = false;
     if (headless)
-      expected.todataurljpeg = false;
+      expected.todataurlwebp = true;
 
     // GHA
     delete actual.variablefonts;
     delete expected.variablefonts;
-
-    if (isDocker()) {
-      delete actual.unicode;
-      delete expected.unicode;
-    }
   }
 
   if (platform === 'win32') {
-    expected.datalistelem = false;
-    expected.fileinputdirectory = false;
     expected.getusermedia = false;
     expected.peerconnection = false;
     expected.speechrecognition = false;
     expected.speechsynthesis = false;
-    expected.todataurljpeg = false;
-    expected.unicode = false;
+    expected.todataurlwebp = true;
     expected.webaudio = false;
+    expected.gamepads = false;
+
+    delete expected.datalistelem;
+
+    expected.mediastream = false;
+    expected.mediasource = false;
+    expected.datachannel = false;
 
-    expected.input.list = false;
     expected.inputtypes.color = false;
-    expected.inputtypes.month = false;
-    expected.inputtypes.week = false;
     expected.inputtypes.date = false;
-    expected.inputtypes.time = false;
     expected.inputtypes['datetime-local'] = false;
     expected.inputtypes.time = false;
   }
 
-  if (isMac && parseInt(os.release(), 10) > 20) {
-    expected.applicationcache = false;
-    expected.inputsearchevent = false;
-  }
-
   expect(actual).toEqual(expected);
 });
-
-function isDocker() {
-  try {
-    fs.statSync('/.dockerenv');
-    return true;
-  } catch {
-  }
-  try {
-    return fs.readFileSync('/proc/self/cgroup', 'utf8').includes('docker');
-  } catch {
-  }
-  return false;
-}
diff --git a/tests/library/multiclient.spec.ts b/tests/library/multiclient.spec.ts
new file mode 100644
index 0000000000000..e5896693b2ef9
--- /dev/null
+++ b/tests/library/multiclient.spec.ts
@@ -0,0 +1,383 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ *
+ * 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 { kTargetClosedErrorMessage } from '../config/errors';
+import { expect, playwrightTest } from '../config/browserTest';
+import type { Browser, BrowserServer, ConnectOptions, Page } from 'playwright-core';
+
+type ExtraFixtures = {
+  remoteServer: BrowserServer;
+  connect: (wsEndpoint: string, options?: ConnectOptions) => Promise<Browser>,
+  twoPages: { pageA: Page, pageB: Page },
+};
+const test = playwrightTest.extend<ExtraFixtures>({
+  remoteServer: async ({ browserType }, use) => {
+    const server = await browserType.launchServer({ _sharedBrowser: true } as any);
+    await use(server);
+    await server.close();
+  },
+  connect: async ({ browserType }, use) => {
+    const browsers: Browser[] = [];
+    await use(async (wsEndpoint, options = {}) => {
+      const browser = await browserType.connect(wsEndpoint, options);
+      browsers.push(browser);
+      return browser;
+    });
+    await Promise.all(browsers.map(b => b.close()));
+  },
+  twoPages: async ({ remoteServer, connect }, use) => {
+    const browserA = await connect(remoteServer.wsEndpoint());
+    const contextA = await browserA.newContext();
+    const pageA = await contextA.newPage();
+
+    const browserB = await connect(remoteServer.wsEndpoint());
+    const contextB = browserB.contexts()[0];
+    const pageB = contextB.pages()[0];
+
+    await use({ pageA, pageB });
+  },
+});
+
+test.slow(true, 'All connect tests are slow');
+test.skip(({ mode }) => mode !== 'default');
+
+async function disconnect(page: Page) {
+  await page.context().browser().close();
+  // Give disconnect some time to cleanup.
+  await new Promise(f => setTimeout(f, 1000));
+}
+
+test('should connect two clients', async ({ connect, remoteServer, server }) => {
+  const browserA = await connect(remoteServer.wsEndpoint());
+  expect(browserA.contexts().length).toBe(0);
+  const contextA1 = await browserA.newContext();
+  const pageA1 = await contextA1.newPage();
+  await pageA1.goto(server.EMPTY_PAGE);
+
+  const browserB = await connect(remoteServer.wsEndpoint());
+  expect(browserB.contexts().length).toBe(1);
+  const contextB1 = browserB.contexts()[0];
+  expect(contextB1.pages().length).toBe(1);
+  const pageB1 = contextB1.pages()[0];
+  await expect(pageB1).toHaveURL(server.EMPTY_PAGE);
+
+  const contextB2 = await browserB.newContext({ baseURL: server.PREFIX });
+  expect(browserB.contexts()).toEqual([contextB1, contextB2]);
+  await expect.poll(() => browserA.contexts().length).toBe(2);
+  const contextA2 = browserA.contexts()[1];
+  expect(browserA.contexts()).toEqual([contextA1, contextA2]);
+
+  const pageEventPromise = new Promise<Page>(f => contextB2.on('page', f));
+  const pageA2 = await contextA2.newPage();
+  const pageB2 = await pageEventPromise;
+  await pageA2.goto('/frames/frame.html');
+  await expect(pageB2).toHaveURL('/frames/frame.html');
+
+  // Both contexts and pages should be still operational after any client disconnects.
+  await disconnect(pageA1);
+
+  await expect(pageB1).toHaveURL(server.EMPTY_PAGE);
+  await expect(pageB2).toHaveURL(server.PREFIX + '/frames/frame.html');
+});
+
+test('should have separate default timeouts', async ({ twoPages }) => {
+  const { pageA, pageB } = twoPages;
+  pageA.setDefaultTimeout(500);
+  pageB.setDefaultTimeout(600);
+
+  const [errorA, errorB] = await Promise.all([
+    pageA.click('div').catch(e => e),
+    pageB.click('div').catch(e => e),
+  ]);
+  expect(errorA.message).toContain('Timeout 500ms exceeded');
+  expect(errorB.message).toContain('Timeout 600ms exceeded');
+});
+
+test('should receive viewport size changes', async ({ twoPages }) => {
+  const { pageA, pageB } = twoPages;
+
+  await pageA.setViewportSize({ width: 567, height: 456 });
+  expect(pageA.viewportSize()).toEqual({ width: 567, height: 456 });
+  await expect.poll(() => pageB.viewportSize()).toEqual({ width: 567, height: 456 });
+
+  await pageB.setViewportSize({ width: 456, height: 567 });
+  expect(pageB.viewportSize()).toEqual({ width: 456, height: 567 });
+  await expect.poll(() => pageA.viewportSize()).toEqual({ width: 456, height: 567 });
+});
+
+test('should not allow parallel js coverage and cleanup upon disconnect', async ({ twoPages, browserName }) => {
+  test.skip(browserName !== 'chromium');
+
+  const { pageA, pageB } = twoPages;
+  await pageA.coverage.startJSCoverage();
+  const error = await pageB.coverage.startJSCoverage().catch(e => e);
+  expect(error.message).toContain('JSCoverage is already enabled');
+
+  // Should cleanup coverage on disconnect and allow another client to start it.
+  await disconnect(pageA);
+  await pageB.coverage.startJSCoverage();
+});
+
+test('should not allow parallel css coverage', async ({ twoPages, browserName }) => {
+  test.skip(browserName !== 'chromium');
+
+  const { pageA, pageB } = twoPages;
+  await pageA.coverage.startCSSCoverage();
+  const error = await pageB.coverage.startCSSCoverage().catch(e => e);
+  expect(error.message).toContain('CSSCoverage is already enabled');
+
+  // Should cleanup coverage on disconnect and allow another client to start it.
+  await disconnect(pageA);
+  await pageB.coverage.startCSSCoverage();
+});
+
+test('should unpause clock', async ({ twoPages }) => {
+  const { pageA, pageB } = twoPages;
+  await pageA.clock.install({ time: 1000 });
+  await pageA.clock.pauseAt(2000);
+  const promise = pageB.evaluate(() => new Promise(f => setTimeout(f, 1000)));
+  await disconnect(pageA);
+  await promise;
+});
+
+test('last emulateMedia wins', async ({ twoPages }) => {
+  const { pageA, pageB } = twoPages;
+  await pageA.emulateMedia({ media: 'print' });
+  expect(await pageB.evaluate(() => window.matchMedia('screen').matches)).toBe(false);
+  expect(await pageA.evaluate(() => window.matchMedia('print').matches)).toBe(true);
+  await pageB.emulateMedia({ media: 'screen' });
+  expect(await pageB.evaluate(() => window.matchMedia('screen').matches)).toBe(true);
+  expect(await pageA.evaluate(() => window.matchMedia('print').matches)).toBe(false);
+});
+
+test('should chain routes', async ({ twoPages, server }) => {
+  const { pageA, pageB } = twoPages;
+
+  server.setRoute('/foo', (req, res) => res.writeHead(200, { 'Content-Type': 'text/html' }).end('<div>server-foo</div>'));
+  server.setRoute('/bar', (req, res) => res.writeHead(200, { 'Content-Type': 'text/html' }).end('<div>server-bar</div>'));
+  server.setRoute('/qux', (req, res) => res.writeHead(200, { 'Content-Type': 'text/html' }).end('<div>server-qux</div>'));
+
+  let stall = false;
+  let stallCallback;
+  const stallPromise = new Promise(f => stallCallback = f);
+  await pageA.route('**/foo', async route => {
+    if (stall)
+      stallCallback();
+    else
+      await route.fallback();
+  });
+  await pageA.route('**/bar', async route => {
+    await route.fulfill({ body: '<div>intercepted-bar</div>', contentType: 'text/html' });
+  });
+
+  await pageB.route('**/foo', async route => {
+    await route.fulfill({ body: '<div>intercepted2-foo</div>', contentType: 'text/html' });
+  });
+  await pageB.route('**/bar', async route => {
+    await route.fulfill({ body: '<div>intercepted2-bar</div>', contentType: 'text/html' });
+  });
+  await pageB.route('**/qux', async route => {
+    await route.fulfill({ body: '<div>intercepted2-qux</div>', contentType: 'text/html' });
+  });
+
+  await pageA.goto(server.PREFIX + '/foo');
+  await expect(pageB.locator('div')).toHaveText('intercepted2-foo');
+
+  await pageA.goto(server.PREFIX + '/bar');
+  await expect(pageB.locator('div')).toHaveText('intercepted-bar');
+
+  await pageA.goto(server.PREFIX + '/qux');
+  await expect(pageB.locator('div')).toHaveText('intercepted2-qux');
+
+  stall = true;
+  const gotoPromise = pageB.goto(server.PREFIX + '/foo');
+  await stallPromise;
+  await pageA.context().browser().close();
+
+  await gotoPromise;
+  await expect(pageB.locator('div')).toHaveText('intercepted2-foo');
+
+  await pageB.goto(server.PREFIX + '/bar');
+  await expect(pageB.locator('div')).toHaveText('intercepted2-bar');
+});
+
+test.fixme('should chain routes with changed url', async ({ twoPages, server }) => {
+  const { pageA, pageB } = twoPages;
+
+  server.setRoute('/foo', (req, res) => res.writeHead(200, { 'Content-Type': 'text/html' }).end('<div>server-foo</div>'));
+  server.setRoute('/baz', (req, res) => res.writeHead(200, { 'Content-Type': 'text/html' }).end('<div>server-baz</div>'));
+
+  await pageA.route('**/foo', async route => {
+    await route.fallback({ url: server.PREFIX + '/baz' });
+  });
+  await pageB.route('**/baz', async route => {
+    await route.fulfill({ body: '<div>intercepted2-baz</div>', contentType: 'text/html' });
+  });
+
+  await pageA.goto(server.PREFIX + '/foo');
+  await expect(pageB.locator('div')).toHaveText('intercepted2-baz');
+});
+
+test('should remove exposed bindings upon disconnect', async ({ twoPages }) => {
+  const { pageA, pageB } = twoPages;
+
+  await pageA.exposeBinding('pageBindingA', () => 'pageBindingAResult');
+  await pageA.evaluate(() => {
+    (window as any).pageBindingACopy = (window as any).pageBindingA;
+  });
+  expect(await pageB.evaluate(() => (window as any).pageBindingA())).toBe('pageBindingAResult');
+  expect(await pageB.evaluate(() => !!(window as any).pageBindingACopy)).toBe(true);
+
+  await pageA.context().exposeBinding('contextBindingA', () => 'contextBindingAResult');
+  expect(await pageB.evaluate(() => (window as any).contextBindingA())).toBe('contextBindingAResult');
+
+  await pageB.exposeBinding('pageBindingB', () => 'pageBindingBResult');
+  expect(await pageA.evaluate(() => (window as any).pageBindingB())).toBe('pageBindingBResult');
+  await pageB.context().exposeBinding('contextBindingB', () => 'contextBindingBResult');
+  expect(await pageA.evaluate(() => (window as any).contextBindingB())).toBe('contextBindingBResult');
+
+  await disconnect(pageA);
+
+  expect(await pageB.evaluate(() => (window as any).pageBindingA)).toBe(undefined);
+  expect(await pageB.evaluate(() => (window as any).contextBindingA)).toBe(undefined);
+  const error = await pageB.evaluate(() => (window as any).pageBindingACopy()).catch(e => e);
+  expect(error.message).toContain('binding "pageBindingA" has been removed');
+
+  expect(await pageB.evaluate(() => (window as any).pageBindingB())).toBe('pageBindingBResult');
+});
+
+test('should unroute websockets', async ({ twoPages, server }) => {
+  const { pageA, pageB } = twoPages;
+
+  await pageA.goto(server.EMPTY_PAGE);
+  await pageA.routeWebSocket(/.*/, () => {});
+  await pageA.routeWebSocket(/.*/, () => {});
+  await pageA.routeWebSocket(/.*/, () => {});
+
+  const error = await pageB.routeWebSocket(/.*/, () => {}).catch(e => e);
+  expect(error.message).toContain('Another client is already routing WebSockets');
+
+  await disconnect(pageA);
+
+  let resolve;
+  const promise = new Promise(f => resolve = f);
+  await pageB.routeWebSocket(/.*/, resolve);
+  await pageB.goto(server.EMPTY_PAGE);
+  await pageB.evaluate(host => (window as any).ws = new WebSocket('ws://' + host + '/ws'), server.HOST);
+  await promise;
+});
+
+test('should remove init scripts upon disconnect', async ({ twoPages, server }) => {
+  const { pageA, pageB } = twoPages;
+
+  await pageA.addInitScript(() => (window as any).pageValueA = 'pageValueA');
+  await pageA.context().addInitScript(() => (window as any).contextValueA = 'contextValueA');
+  await pageB.goto(server.EMPTY_PAGE);
+  expect(await pageB.evaluate(() => (window as any).pageValueA)).toBe('pageValueA');
+  expect(await pageB.evaluate(() => (window as any).contextValueA)).toBe('contextValueA');
+
+  await pageB.addInitScript(() => (window as any).pageValueB = 'pageValueB');
+  await pageB.context().addInitScript(() => (window as any).contextValueB = 'contextValueB');
+  await pageA.goto(server.EMPTY_PAGE);
+  expect(await pageA.evaluate(() => (window as any).pageValueB)).toBe('pageValueB');
+  expect(await pageA.evaluate(() => (window as any).contextValueB)).toBe('contextValueB');
+
+  await disconnect(pageB);
+
+  await pageA.goto(server.EMPTY_PAGE);
+  expect(await pageA.evaluate(() => (window as any).pageValueB)).toBe(undefined);
+  expect(await pageA.evaluate(() => (window as any).contextValueB)).toBe(undefined);
+  expect(await pageA.evaluate(() => (window as any).pageValueA)).toBe('pageValueA');
+  expect(await pageA.evaluate(() => (window as any).contextValueA)).toBe('contextValueA');
+});
+
+test('should remove locator handlers upon disconnect', async ({ twoPages, server }) => {
+  const { pageA, pageB } = twoPages;
+
+  await pageA.goto(server.PREFIX + '/input/handle-locator.html');
+
+  let count = 0;
+  await pageA.addLocatorHandler(pageA.getByText('This interstitial covers the button'), async () => {
+    ++count;
+    await pageA.locator('#close').click();
+  });
+
+  await pageA.locator('#aside').hover();
+  await pageA.evaluate(() => {
+    (window as any).clicked = 0;
+    (window as any).setupAnnoyingInterstitial('mouseover', 1);
+  });
+  await pageA.locator('#target').click();
+  expect(count).toBe(1);
+  expect(await pageB.evaluate('window.clicked')).toBe(1);
+  await expect(pageB.locator('#interstitial')).not.toBeVisible();
+
+  await pageA.locator('#aside').hover();
+  await pageA.evaluate(() => {
+    (window as any).clicked = 0;
+    (window as any).setupAnnoyingInterstitial('mouseover', 1);
+  });
+
+  await disconnect(pageA);
+
+  const error = await pageB.locator('#target').click({ timeout: 3000 }).catch(e => e);
+  expect(error.message).toContain('Timeout 3000ms exceeded');
+  expect(error.message).toContain('intercepts pointer events');
+  expect(error.message).not.toContain('locator handler');
+});
+
+test('should launch persistent', async ({ browserType }) => {
+  const browserServer = await browserType.launchServer({ _userDataDir: '', _sharedBrowser: true } as any);
+  const browser = await browserType.connect(browserServer.wsEndpoint());
+  expect(browser.contexts().length).toBe(1);
+  await browser.close();
+  await browserServer.close();
+});
+
+test('should avoid side effects upon disconnect', async ({ twoPages, server }) => {
+  const { pageA, pageB } = twoPages;
+
+  let counter = 0;
+  pageB.on('console', () => ++counter);
+
+  const promise = pageA.waitForFunction(() => {
+    window['counter'] = (window['counter'] || 0) + 1;
+    console.log(window['counter']);
+  }, {}, { polling: 1, timeout: 10000 }).catch(e => e);
+
+  await disconnect(pageA);
+  const error = await promise;
+  const savedCounter = counter;
+
+  await pageB.waitForTimeout(2000); // Give it some time to produce more logs.
+
+  expect(error.message).toContain(kTargetClosedErrorMessage);
+  expect(counter).toBe(savedCounter);
+});
+
+test('should stop tracing upon disconnect', async ({ twoPages, trace }) => {
+  test.skip(trace === 'on');
+
+  const { pageA, pageB } = twoPages;
+
+  await pageA.context().tracing.start();
+  const error = await pageB.context().tracing.start().catch(e => e);
+  expect(error.message).toContain('Tracing has been already started');
+
+  await disconnect(pageA);
+
+  await pageB.context().tracing.start();
+});
diff --git a/tests/library/page-clock.spec.ts b/tests/library/page-clock.spec.ts
index d541d5d135631..277ec4672696a 100644
--- a/tests/library/page-clock.spec.ts
+++ b/tests/library/page-clock.spec.ts
@@ -354,6 +354,7 @@ it.describe('popup', () => {
       page.waitForEvent('popup'),
       page.evaluate(url => window.open(url), server.PREFIX + '/popup.html'),
     ]);
+    await popup.waitForLoadState();
     const popupTime = await popup.evaluate('time');
     expect(popupTime).toBe(1000);
   });
@@ -436,8 +437,8 @@ it.describe('while running', () => {
     await page.clock.install({ time: 0 });
     await page.goto('data:text/html,');
     await page.clock.pauseAt(1000);
-    await page.waitForTimeout(1000);
-    await page.clock.resume();
+    // Internally wait to make sure the clock is paused and not running.
+    await page.waitForTimeout(1111);
     const now = await page.evaluate(() => Date.now());
     expect(now).toBeGreaterThanOrEqual(0);
     expect(now).toBeLessThanOrEqual(1000);
@@ -532,3 +533,35 @@ it.describe('Date.now', () => {
     expect(dateValue).toBe(1001);
   });
 });
+
+it('correctly increments Date.now()/performance.now() during blocking execution', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/35362',
+  }
+}, async ({ page, server }) => {
+  await page.clock.setSystemTime(new Date('2026-01-01'));
+  server.setRoute('/repro.html', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(`
+      <html>
+        <body>
+          <script>
+          {
+            const start = performance.now();
+            while (performance.now() - start < 100) { }
+          }
+          {
+            const start = Date.now();
+            while (Date.now() - start < 100) { }
+          }
+          console.log('done');
+          </script>
+        </body>
+      </html>
+    `);
+  });
+  const waitForDone = page.waitForEvent('console', msg => msg.text() === 'done');
+  await page.goto(server.PREFIX + '/repro.html');
+  await waitForDone;
+});
diff --git a/tests/library/page-close.spec.ts b/tests/library/page-close.spec.ts
new file mode 100644
index 0000000000000..f8b712fc433fc
--- /dev/null
+++ b/tests/library/page-close.spec.ts
@@ -0,0 +1,231 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ * Modifications 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 { stripAnsi } from '../config/utils';
+import { browserTest as test, expect } from '../config/browserTest';
+import { kTargetClosedErrorMessage } from '../config/errors';
+
+test('should close page with active dialog', async ({ page }) => {
+  await page.evaluate('"trigger builtins.setTimeout"');
+  await page.setContent(`<button onclick="builtins.setTimeout(() => alert(1))">alert</button>`);
+  void page.click('button').catch(() => {});
+  await page.waitForEvent('dialog');
+  await page.close();
+});
+
+test('should not accept dialog after close', async ({ page, mode }) => {
+  test.fixme(mode.startsWith('service2'), 'Times out');
+  const promise = page.waitForEvent('dialog');
+  page.evaluate(() => alert()).catch(() => {});
+  const dialog = await promise;
+  await page.close();
+  const e = await dialog.dismiss().catch(e => e);
+  expect(e.message).toContain('Target page, context or browser has been closed');
+});
+
+test('expect should not print timed out error message when page closes', async ({ page }) => {
+  await page.setContent('<div id=node>Text content</div>');
+  const [error] = await Promise.all([
+    expect(page.locator('div')).toHaveText('hey', { timeout: 100000 }).catch(e => e),
+    page.close(),
+  ]);
+  expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected)`);
+  expect(stripAnsi(error.message)).not.toContain('Timed out');
+});
+
+test('addLocatorHandler should throw when page closes', async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/input/handle-locator.html');
+
+  await page.addLocatorHandler(page.getByText('This interstitial covers the button'), async () => {
+    await page.close();
+  });
+
+  await page.locator('#aside').hover();
+  await page.evaluate(() => {
+    (window as any).clicked = 0;
+    (window as any).setupAnnoyingInterstitial('mouseover', 1);
+  });
+  const error = await page.locator('#target').click().catch(e => e);
+  expect(error.message).toContain(kTargetClosedErrorMessage);
+});
+
+test('should reject all promises when page is closed', async ({ page }) => {
+  let error = null;
+  await Promise.all([
+    page.evaluate(() => new Promise(r => {})).catch(e => error = e),
+    page.close(),
+  ]);
+  expect(error.message).toContain(kTargetClosedErrorMessage);
+});
+
+test('should set the page close state', async ({ page }) => {
+  expect(page.isClosed()).toBe(false);
+  await page.close();
+  expect(page.isClosed()).toBe(true);
+});
+
+test('should pass page to close event', async ({ page }) => {
+  const [closedPage] = await Promise.all([
+    page.waitForEvent('close'),
+    page.close()
+  ]);
+  expect(closedPage).toBe(page);
+});
+
+test('should terminate network waiters', async ({ page, server }) => {
+  const results = await Promise.all([
+    page.waitForRequest(server.EMPTY_PAGE).catch(e => e),
+    page.waitForResponse(server.EMPTY_PAGE).catch(e => e),
+    page.close()
+  ]);
+  for (let i = 0; i < 2; i++) {
+    const message = results[i].message;
+    expect(message).toContain(kTargetClosedErrorMessage);
+    expect(message).not.toContain('Timeout');
+  }
+});
+
+test('should be callable twice', async ({ page }) => {
+  await Promise.all([
+    page.close(),
+    page.close(),
+  ]);
+  await page.close();
+});
+
+test('should return null if parent page has been closed', async ({ page }) => {
+  const [popup] = await Promise.all([
+    page.waitForEvent('popup'),
+    page.evaluate(() => window.open('about:blank')),
+  ]);
+  await page.close();
+  const opener = await popup.opener();
+  expect(opener).toBe(null);
+});
+
+test('should fail with error upon disconnect', async ({ page }) => {
+  let error;
+  const waitForPromise = page.waitForEvent('download').catch(e => error = e);
+  await page.close();
+  await waitForPromise;
+  expect(error.message).toContain(kTargetClosedErrorMessage);
+});
+
+test('page.close should work with window.close', async function({ page }) {
+  const closedPromise = new Promise(x => page.on('close', x));
+  await page.close();
+  await closedPromise;
+});
+
+test('should not throw UnhandledPromiseRejection when page closes', async ({ page, browserName, isWindows }) => {
+  test.fixme(browserName === 'firefox' && isWindows, 'makes the next test to always timeout');
+
+  await Promise.all([
+    page.close(),
+    page.mouse.click(1, 2),
+  ]).catch(e => {});
+});
+
+test('interrupt request.response() and request.allHeaders() on page.close', async ({ page, server, browserName }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27227' });
+  server.setRoute('/one-style.css', (req, res) => {
+    res.setHeader('Content-Type', 'text/css');
+  });
+  const reqPromise = page.waitForRequest('**/one-style.css');
+  await page.goto(server.PREFIX + '/one-style.html', { waitUntil: 'domcontentloaded' });
+  const req = await reqPromise;
+  const respPromise = req.response().catch(e => e);
+  const headersPromise = req.allHeaders().catch(e => e);
+  await page.close();
+  expect((await respPromise).message).toContain(kTargetClosedErrorMessage);
+  // All headers are the same as "provisional" headers in Firefox.
+  if (browserName === 'firefox')
+    expect((await headersPromise)['user-agent']).toBeTruthy();
+  else
+    expect((await headersPromise).message).toContain(kTargetClosedErrorMessage);
+});
+
+test('should not treat navigations as new popups', async ({ page, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent('<a target=_blank rel=noopener href="/one-style.html">yo</a>');
+  const [popup] = await Promise.all([
+    page.waitForEvent('popup'),
+    page.click('a'),
+  ]);
+  let badSecondPopup = false;
+  page.on('popup', () => badSecondPopup = true);
+  await popup.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
+  await page.close();
+  expect(badSecondPopup).toBe(false);
+});
+
+test('should not result in unhandled rejection', async ({ page }) => {
+  const closedPromise = page.waitForEvent('close');
+  await page.exposeFunction('foo', async () => {
+    await page.close();
+  });
+  await page.evaluate(() => {
+    window.builtins.setTimeout(() => (window as any).foo(), 0);
+    return undefined;
+  });
+  await closedPromise;
+  // Make a round-trip to be sure we did not throw immediately after closing.
+  expect(await page.evaluate('1 + 1').catch(e => e)).toBeInstanceOf(Error);
+});
+
+test('should reject response.finished if page closes', async ({ page, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+  server.setRoute('/get', (req, res) => {
+    // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
+    // from server.
+    res.setHeader('Content-Type', 'text/plain; charset=utf-8');
+    res.write('hello ');
+  });
+  // send request and wait for server response
+  const [pageResponse] = await Promise.all([
+    page.waitForEvent('response'),
+    page.evaluate(() => fetch('./get', { method: 'GET' })),
+  ]);
+
+  const finishPromise = pageResponse.finished().catch(e => e);
+  await page.close();
+  const error = await finishPromise;
+  expect(error.message).toContain('closed');
+});
+
+test('should not throw when continuing while page is closing', async ({ page, server }) => {
+  let done;
+  await page.route('**/*', async route => {
+    done = Promise.all([
+      void route.continue(),
+      page.close(),
+    ]);
+  });
+  await page.goto(server.EMPTY_PAGE).catch(e => e);
+  await done;
+});
+
+test('should not throw when continuing after page is closed', async ({ page, server }) => {
+  let done;
+  await page.route('**/*', async route => {
+    await page.close();
+    done = route.continue();
+  });
+  const error = await page.goto(server.EMPTY_PAGE).catch(e => e);
+  await done;
+  expect(error).toBeInstanceOf(Error);
+});
diff --git a/tests/library/page-event-crash.spec.ts b/tests/library/page-event-crash.spec.ts
index 1bf9c396ddfd5..1a2cfeb8b0d9d 100644
--- a/tests/library/page-event-crash.spec.ts
+++ b/tests/library/page-event-crash.spec.ts
@@ -23,15 +23,19 @@ const test = testBase.extend<{ crash: () => void }, { dummy: string }>({
       if (browserName === 'chromium')
         page.goto('chrome://crash').catch(e => {});
       else if (browserName === 'webkit')
-        toImpl(page)._delegate._session.send('Page.crash', {}).catch(e => {});
+        toImpl(page).delegate._session.send('Page.crash', {}).catch(e => {});
       else if (browserName === 'firefox')
-        toImpl(page)._delegate._session.send('Page.crash', {}).catch(e => {});
+        toImpl(page).delegate._session.send('Page.crash', {}).catch(e => {});
     });
   },
   // Force a separate worker to avoid messing up with other tests.
   dummy: ['', { scope: 'worker' }],
 });
 
+test.beforeEach(({ platform, browserName }) => {
+  test.slow(platform === 'linux' && browserName === 'webkit', 'WebKit/Linux tests are consistently slower on some Linux environments. Most likely WebContent process is not getting terminated properly and is causing the slowdown.');
+});
+
 test('should emit crash event when page crashes', async ({ page, crash }) => {
   await page.setContent(`<div>This page should crash</div>`);
   crash();
diff --git a/tests/library/pdf.spec.ts b/tests/library/pdf.spec.ts
index 3ef002e25ccaf..38e8c7b5be2b0 100644
--- a/tests/library/pdf.spec.ts
+++ b/tests/library/pdf.spec.ts
@@ -17,9 +17,8 @@
 import { browserTest as it, expect } from '../config/browserTest';
 import fs from 'fs';
 
-it('should be able to save file', async ({ contextFactory, headless, browserName }, testInfo) => {
-  it.skip(!headless || browserName !== 'chromium', 'Printing to pdf is currently only supported in headless chromium.');
-
+it('should be able to save file', async ({ contextFactory, browserName }, testInfo) => {
+  it.skip(browserName !== 'chromium', 'Printing to pdf is currently only supported in chromium.');
   const context = await contextFactory();
   const page = await context.newPage();
   const outputFile = testInfo.outputPath('output.pdf');
@@ -27,9 +26,8 @@ it('should be able to save file', async ({ contextFactory, headless, browserName
   expect(fs.readFileSync(outputFile).byteLength).toBeGreaterThan(0);
 });
 
-it('should be able to generate outline', async ({ contextFactory, server, headless, browserName }, testInfo) => {
-  it.skip(!headless || browserName !== 'chromium', 'Printing to pdf is currently only supported in headless chromium.');
-  // const context = await contextFactory();
+it('should be able to generate outline', async ({ contextFactory, server, browserName }, testInfo) => {
+  it.skip(browserName !== 'chromium', 'Printing to pdf is currently only supported in chromium.');
   const context = await contextFactory({
     baseURL: server.PREFIX,
   });
diff --git a/tests/library/permissions.spec.ts b/tests/library/permissions.spec.ts
index 592ee806915a5..cd2ab184b19ce 100644
--- a/tests/library/permissions.spec.ts
+++ b/tests/library/permissions.spec.ts
@@ -16,6 +16,7 @@
  */
 
 import { contextTest as it, expect } from '../config/browserTest';
+import { hostPlatform } from '../../packages/playwright-core/src/server/utils/hostPlatform';
 
 function getPermission(page, name) {
   return page.evaluate(name => navigator.permissions.query({ name }).then(result => result.state), name);
@@ -29,10 +30,21 @@ it.describe('permissions', () => {
     expect(await getPermission(page, 'geolocation')).toBe('prompt');
   });
 
-  it('should deny permission when not listed', async ({ page, context, server }) => {
+  it('should deny permission when not listed', async ({ page, context, server, browserName, isMac, macVersion }) => {
+    it.skip(browserName === 'webkit' && isMac && macVersion === 13, 'WebKit on macOS 13 is frozen.');
+    it.skip(hostPlatform.startsWith('debian11'), 'WebKit on Debian 11 is frozen.');
+
     await page.goto(server.EMPTY_PAGE);
     await context.grantPermissions([], { origin: server.EMPTY_PAGE });
-    expect(await getPermission(page, 'geolocation')).toBe('denied');
+    if (browserName === 'webkit') {
+      expect(await getPermission(page, 'geolocation')).toBe('prompt');
+      // Since https://github.com/WebKit/WebKit/pull/45470 WebKit only returns actual
+      // permission value, if the API has been accessed.
+      await page.evaluate(() => navigator.geolocation.getCurrentPosition(() => { }));
+      expect(await getPermission(page, 'geolocation')).toBe('denied');
+    } else {
+      expect(await getPermission(page, 'geolocation')).toBe('denied');
+    }
   });
 
   it('should fail when bad permission is given', async ({ page, context, server }) => {
@@ -119,15 +131,13 @@ it.describe('permissions', () => {
     await context.grantPermissions(['geolocation'], { origin: server.EMPTY_PAGE });
     expect(await page.evaluate(() => window['events'])).toEqual(['prompt', 'denied', 'granted']);
     await context.clearPermissions();
-
-    // Note: Chromium 110 stopped triggering "onchange" when clearing permissions.
-    expect(await page.evaluate(() => window['events'])).toEqual(
-        (browserName === 'chromium' && browserMajorVersion === 110) ?
-          ['prompt', 'denied', 'granted'] :
-          ['prompt', 'denied', 'granted', 'prompt']);
+    expect(await page.evaluate(() => window['events'])).toEqual(['prompt', 'denied', 'granted', 'prompt']);
   });
 
-  it('should isolate permissions between browser contexts', async ({ server, browser }) => {
+  it('should isolate permissions between browser contexts', async ({ server, browser, browserName, isMac, macVersion }) => {
+    it.skip(browserName === 'webkit' && isMac && macVersion === 13, 'WebKit on macOS 13 is frozen.');
+    it.skip(hostPlatform.startsWith('debian11'), 'WebKit on Debian 11 is frozen.');
+
     const context = await browser.newContext();
     const page = await context.newPage();
     await page.goto(server.EMPTY_PAGE);
@@ -139,30 +149,57 @@ it.describe('permissions', () => {
 
     await context.grantPermissions([], { origin: server.EMPTY_PAGE });
     await otherContext.grantPermissions(['geolocation'], { origin: server.EMPTY_PAGE });
-    expect(await getPermission(page, 'geolocation')).toBe('denied');
+    if (browserName === 'webkit') {
+      expect(await getPermission(page, 'geolocation')).toBe('prompt');
+      // Since https://github.com/WebKit/WebKit/pull/45470 WebKit only returns actual
+      // permission value, if the API has been accessed.
+      await page.evaluate(() => navigator.geolocation.getCurrentPosition(() => { }));
+      expect(await getPermission(page, 'geolocation')).toBe('denied');
+    } else {
+      expect(await getPermission(page, 'geolocation')).toBe('denied');
+    }
     expect(await getPermission(otherPage, 'geolocation')).toBe('granted');
 
     await context.clearPermissions();
-    expect(await getPermission(page, 'geolocation')).toBe('prompt');
+    if (browserName === 'webkit') {
+      // Since https://github.com/WebKit/WebKit/pull/45470 WebKit returns the cached
+      // permission value, if the geolocation API has been accessed.
+      // TODO: We can probably reset the cached state in the Web Process when resetting
+      // permissions.
+      expect(await getPermission(page, 'geolocation')).toBe('denied');
+
+      // Geolocation API in the new page in the same context has not been accessed yet,
+      // so the permission status should be prompt.
+      const page2 = await context.newPage();
+      await page2.goto(server.EMPTY_PAGE);
+      expect(await getPermission(page2, 'geolocation')).toBe('prompt');
+      await page2.close();
+    } else {
+      expect(await getPermission(page, 'geolocation')).toBe('prompt');
+    }
     expect(await getPermission(otherPage, 'geolocation')).toBe('granted');
     await otherContext.close();
     await context.close();
   });
 });
 
-it('should support clipboard read', async ({ page, context, server, browserName, isWindows, isLinux, headless }) => {
+it('should support clipboard read', async ({ page, context, server, browserName, isWindows, isLinux, headless, isHeadlessShell }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27475' });
   it.fail(browserName === 'firefox', 'No such permissions (requires flag) in Firefox');
-  it.fixme(browserName === 'chromium' && (!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW));
   it.fixme(browserName === 'webkit' && isWindows, 'WebPasteboardProxy::allPasteboardItemInfo not implemented for Windows.');
   it.fixme(browserName === 'webkit' && isLinux && headless, 'WebPasteboardProxy::allPasteboardItemInfo not implemented for WPE.');
+
   await page.goto(server.EMPTY_PAGE);
   // There is no 'clipboard-read' permission in WebKit Web API.
   if (browserName !== 'webkit')
     expect(await getPermission(page, 'clipboard-read')).toBe('prompt');
-  let error;
-  await page.evaluate(() => navigator.clipboard.readText()).catch(e => error = e);
-  expect(error.toString()).toContain('denied');
+
+  if (isHeadlessShell) {
+    // Chromium (but not headless-shell) shows a dialog and does not resolve the promise.
+    const error = await page.evaluate(() => navigator.clipboard.readText()).catch(e => e);
+    expect(error.toString()).toContain('denied');
+  }
+
   await context.grantPermissions(['clipboard-read']);
   if (browserName !== 'webkit')
     expect(await getPermission(page, 'clipboard-read')).toBe('granted');
@@ -176,7 +213,8 @@ it('should support clipboard read', async ({ page, context, server, browserName,
 it('storage access', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31227' }
 }, async ({ page, context, server, browserName }) => {
-  it.fixme(browserName !== 'chromium');
+  it.skip(browserName !== 'chromium', 'chromium-only api');
+
   await context.grantPermissions(['storage-access']);
   expect(await getPermission(page, 'storage-access')).toBe('granted');
   server.setRoute('/set-cookie.html', (req, res) => {
@@ -198,3 +236,19 @@ it('storage access', {
   expect(access).toBe(true);
   expect(await frame.evaluate(() => document.hasStorageAccess())).toBe(true);
 });
+
+it.describe(() => {
+  // Secure context
+  it.use({ ignoreHTTPSErrors: true, });
+
+  it('should be able to use the local-fonts API', async ({ page, context, httpsServer, browserName }) => {
+    it.skip(browserName !== 'chromium', 'chromium-only api');
+    it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36113' });
+
+    await page.goto(httpsServer.EMPTY_PAGE);
+    expect(await getPermission(page, 'local-fonts')).toBe('prompt');
+    await context.grantPermissions(['local-fonts']);
+    expect(await getPermission(page, 'local-fonts')).toBe('granted');
+    expect(await page.evaluate(async () => (await (window as any).queryLocalFonts()).length > 0)).toBe(true);
+  });
+});
diff --git a/tests/library/playwright.config.ts b/tests/library/playwright.config.ts
index 0d4804ad6da14..76c82d0998419 100644
--- a/tests/library/playwright.config.ts
+++ b/tests/library/playwright.config.ts
@@ -16,6 +16,7 @@
 
 import { config as loadEnv } from 'dotenv';
 loadEnv({ path: path.join(__dirname, '..', '..', '.env'), override: true });
+process.env.PWTEST_UNDER_TEST = '1';
 
 import { type Config, type PlaywrightTestOptions, type PlaywrightWorkerOptions, type ReporterDescription } from '@playwright/test';
 import * as path from 'path';
@@ -47,7 +48,7 @@ const reporters = () => {
     ['json', { outputFile: path.join(outputDir, 'report.json') }],
     ['blob', { fileName: `${process.env.PWTEST_BOT_NAME}.zip` }],
   ] : [
-    ['html', { open: 'on-failure' }]
+    ['html', { open: 'on-failure', title: 'Playwright Library Tests' }]
   ];
   return result;
 };
@@ -64,7 +65,6 @@ if (mode === 'service') {
     command: 'npx playwright run-server --port=3333',
     url: 'http://localhost:3333',
     reuseExistingServer: !process.env.CI,
-    env: { PWTEST_UNDER_TEST: '1' }
   };
 }
 if (mode === 'service2') {
@@ -107,43 +107,46 @@ for (const browserName of browserNames) {
     console.error(`Using executable at ${executablePath}`);
   const devtools = process.env.DEVTOOLS === '1';
   const testIgnore: RegExp[] = browserNames.filter(b => b !== browserName).map(b => new RegExp(b));
-  for (const folder of ['library', 'page']) {
-    config.projects.push({
-      name: `${browserName}-${folder}`,
-      testDir: path.join(testDir, folder),
-      testIgnore,
-      snapshotPathTemplate: `{testDir}/{testFileDir}/{testFileName}-snapshots/{arg}-${browserName}{ext}`,
-      use: {
-        mode,
-        browserName,
-        headless: !headed,
-        channel,
-        video: video ? 'on' : undefined,
-        launchOptions: {
-          executablePath,
-          devtools
-        },
-        trace: trace ? 'on' : undefined,
-      },
-      metadata: {
-        platform: process.platform,
-        docker: !!process.env.INSIDE_DOCKER,
-        headless: (() => {
-          if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW)
-            return 'headless-new';
-          if (headed)
-            return 'headed';
-          return 'headless';
-        })(),
-        browserName,
-        channel,
-        mode,
-        video: !!video,
-        trace: !!trace,
-        clock: process.env.PW_CLOCK ? 'clock-' + process.env.PW_CLOCK : undefined,
+
+  const projectTemplate: typeof config.projects[0] = {
+    testIgnore,
+    snapshotPathTemplate: `{testDir}/{testFileDir}/{testFileName}-snapshots/{arg}-${browserName}{ext}`,
+    use: {
+      mode,
+      browserName,
+      headless: !headed,
+      channel,
+      video: video ? 'on' : undefined,
+      launchOptions: {
+        executablePath,
+        devtools
       },
-    });
-  }
+      trace: trace ? 'on' : undefined,
+    },
+    metadata: {
+      platform: process.platform,
+      docker: !!process.env.INSIDE_DOCKER,
+      headless: headed ? 'headed' : 'headless',
+      browserName,
+      channel,
+      mode,
+      video: !!video,
+      trace: !!trace,
+      clock: process.env.PW_CLOCK ? 'clock-' + process.env.PW_CLOCK : undefined,
+    }
+  };
+
+  config.projects.push({
+    name: `${browserName}-library`,
+    testDir: path.join(testDir, 'library'),
+    ...projectTemplate,
+  });
+
+  config.projects.push({
+    name: `${browserName}-page`,
+    testDir: path.join(testDir, 'page'),
+    ...projectTemplate,
+  });
 }
 
 export default config;
diff --git a/tests/library/popup.spec.ts b/tests/library/popup.spec.ts
index 56865bdb532b2..f4774a7567f53 100644
--- a/tests/library/popup.spec.ts
+++ b/tests/library/popup.spec.ts
@@ -136,9 +136,9 @@ it('should use viewport size from window features', async function({ browser, se
     page.evaluate(async () => {
       const win = window.open(window.location.href, 'Title', 'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=600,height=300,top=0,left=0');
       await new Promise<void>(resolve => {
-        const interval = window.builtinSetInterval(() => {
+        const interval = window.builtins.setInterval(() => {
           if (win.innerWidth === 600 && win.innerHeight === 300) {
-            window.builtinClearInterval(interval);
+            window.builtins.clearInterval(interval);
             resolve();
           }
         }, 10);
@@ -221,31 +221,25 @@ it('should expose function from browser context', async function({ browser, serv
 
 it('should not dispatch binding on a closed page', async function({ browser, server, browserName }) {
   const context = await browser.newContext();
-  const messages = [];
-  await context.exposeFunction('add', (a, b) => {
-    messages.push('binding');
+  let wasClosed: boolean | undefined;
+  await context.exposeBinding('add', (source, a, b) => {
+    wasClosed = source.page.isClosed();
     return a + b;
   });
   const page = await context.newPage();
   await page.goto(server.EMPTY_PAGE);
   await Promise.all([
-    page.waitForEvent('popup').then(popup => {
-      if (popup.isClosed())
-        messages.push('close');
-      else
-        return popup.waitForEvent('close').then(() => messages.push('close'));
-    }),
+    page.waitForEvent('popup'),
     page.evaluate(async () => {
       const win = window.open('about:blank');
       win['add'](9, 4);
       win.close();
     }),
   ]);
+  // Give it a chance to dispatch the binding on the closed page.
+  await page.waitForTimeout(1000);
   await context.close();
-  if (browserName === 'firefox')
-    expect(messages.join('|')).toBe('close');
-  else
-    expect(messages.join('|')).toBe('binding|close');
+  expect(wasClosed).not.toBeTruthy();
 });
 
 it('should not throttle rAF in the opener page', async ({ page, server }) => {
@@ -262,14 +256,17 @@ it('should not throttle rAF in the opener page', async ({ page, server }) => {
 });
 
 it('should not throw when click closes popup', async ({ browserName, page, server }) => {
-  it.fixme(browserName === 'firefox');
+  it.fixme(browserName === 'firefox', 'locator.click: Target page, context or browser has been closed');
+
   await page.goto(server.EMPTY_PAGE);
   const [popup] = await Promise.all([
     page.waitForEvent('popup'),
-    page.evaluate(() => {
+    page.evaluate(async browserName => {
       const w = window.open('about:blank');
+      if (browserName === 'firefox')
+        await new Promise(x => w.onload = x);
       w.document.body.innerHTML = `<button onclick="window.close()">close</button>`;
-    }),
+    }, browserName),
   ]);
   await popup.getByRole('button').click();
 });
@@ -281,8 +278,8 @@ async function waitForRafs(page: Page, count: number): Promise<void> {
       if (!count)
         resolve();
       else
-        window.builtinRequestAnimationFrame(onRaf);
+        window.builtins.requestAnimationFrame(onRaf);
     };
-    window.builtinRequestAnimationFrame(onRaf);
+    window.builtins.requestAnimationFrame(onRaf);
   }), count);
-}
\ No newline at end of file
+}
diff --git a/tests/library/proxy-pattern.spec.ts b/tests/library/proxy-pattern.spec.ts
index c8a7a78a48c5e..2969d49f2703f 100644
--- a/tests/library/proxy-pattern.spec.ts
+++ b/tests/library/proxy-pattern.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { parsePattern } from '../../packages/playwright-core/lib/common/socksProxy';
+import { parsePattern } from '../../packages/playwright-core/lib/server/utils/socksProxy';
 import { playwrightTest as test, expect } from '../config/browserTest';
 
 test('socks proxy patter matcher', async ({}) => {
diff --git a/tests/library/proxy.spec.ts b/tests/library/proxy.spec.ts
index 344763bb1d2e3..6eea7479f1856 100644
--- a/tests/library/proxy.spec.ts
+++ b/tests/library/proxy.spec.ts
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
+import { setupSocksForwardingServer } from '../config/proxy';
 import { playwrightTest as it, expect } from '../config/browserTest';
 import net from 'net';
-import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from '../../packages/playwright-core/src/common/socksProxy';
-import { SocksProxy } from '../../packages/playwright-core/lib/common/socksProxy';
 
 it.skip(({ mode }) => mode.startsWith('service'));
 
@@ -34,7 +33,7 @@ it('should use proxy @smoke', async ({ browserType, server, mode }) => {
     res.end('<html><title>Served by the proxy</title></html>');
   });
   const browser = await browserType.launch({
-    proxy: { server: `localhost:${server.PORT}` }
+    proxy: { server: server.HOST }
   });
   const page = await browser.newPage();
   await page.goto('http://non-existent.com/target.html');
@@ -136,7 +135,7 @@ it('should authenticate', async ({ browserType, server }) => {
     }
   });
   const browser = await browserType.launch({
-    proxy: { server: `localhost:${server.PORT}`, username: 'user', password: 'secret' }
+    proxy: { server: server.HOST, username: 'user', password: 'secret' }
   });
   const page = await browser.newPage();
   await page.goto('http://non-existent.com/target.html');
@@ -145,7 +144,6 @@ it('should authenticate', async ({ browserType, server }) => {
 });
 
 it('should work with authenticate followed by redirect', async ({ browserName, browserType, server }) => {
-  it.fixme(browserName === 'firefox', 'https://github.com/microsoft/playwright/issues/10095');
   function hasAuth(req, res) {
     const auth = req.headers['proxy-authorization'];
     if (!auth) {
@@ -169,7 +167,7 @@ it('should work with authenticate followed by redirect', async ({ browserName, b
     res.end('<html><title>Served by the proxy</title></html>');
   });
   const browser = await browserType.launch({
-    proxy: { server: `localhost:${server.PORT}`, username: 'user', password: 'secret' }
+    proxy: { server: server.HOST, username: 'user', password: 'secret' }
   });
   const page = await browser.newPage();
   await page.goto('http://non-existent.com/page1.html');
@@ -186,7 +184,7 @@ it('should exclude patterns', async ({ browserType, server, browserName, headles
   //
   // @see https://gist.github.com/CollinChaffin/24f6c9652efb3d6d5ef2f5502720ef00
   const browser = await browserType.launch({
-    proxy: { server: `localhost:${server.PORT}`, bypass: '1.non.existent.domain.for.the.test, 2.non.existent.domain.for.the.test, .another.test' }
+    proxy: { server: server.HOST, bypass: '1.non.existent.domain.for.the.test, 2.non.existent.domain.for.the.test, .another.test' }
   });
 
   {
@@ -289,43 +287,13 @@ it('should use proxy with emulated user agent', async ({ browserType }) => {
   expect(requestText).toContain('MyUserAgent');
 });
 
-async function setupSocksForwardingServer(port: number, forwardPort: number) {
-  const connections = new Map<string, net.Socket>();
-  const socksProxy = new SocksProxy();
-  socksProxy.setPattern('*');
-  socksProxy.addListener(SocksProxy.Events.SocksRequested, async (payload: SocksSocketRequestedPayload) => {
-    if (!['127.0.0.1', 'fake-localhost-127-0-0-1.nip.io'].includes(payload.host) || payload.port !== 1337) {
-      socksProxy.sendSocketError({ uid: payload.uid, error: 'ECONNREFUSED' });
-      return;
-    }
-    const target = new net.Socket();
-    target.on('error', error => socksProxy.sendSocketError({ uid: payload.uid, error: error.toString() }));
-    target.on('end', () => socksProxy.sendSocketEnd({ uid: payload.uid }));
-    target.on('data', data => socksProxy.sendSocketData({ uid: payload.uid, data }));
-    target.setKeepAlive(false);
-    target.connect(forwardPort, '127.0.0.1');
-    target.on('connect', () => {
-      connections.set(payload.uid, target);
-      socksProxy.socketConnected({ uid: payload.uid, host: target.localAddress, port: target.localPort });
-    });
-  });
-  socksProxy.addListener(SocksProxy.Events.SocksData, async (payload: SocksSocketDataPayload) => {
-    connections.get(payload.uid)?.write(payload.data);
-  });
-  socksProxy.addListener(SocksProxy.Events.SocksClosed, (payload: SocksSocketClosedPayload) => {
-    connections.get(payload.uid)?.destroy();
-    connections.delete(payload.uid);
+
+it('should use SOCKS proxy for websocket requests', async ({ browserType, server }) => {
+  const { proxyServerAddr, closeProxyServer } = await setupSocksForwardingServer({
+    port: it.info().workerIndex + 2048 + 2,
+    forwardPort: server.PORT,
+    allowedTargetPort: 1337,
   });
-  await socksProxy.listen(port, 'localhost');
-  return {
-    closeProxyServer: () => socksProxy.close(),
-    proxyServerAddr: `socks5://localhost:${port}`,
-  };
-}
-
-it('should use SOCKS proxy for websocket requests', async ({ browserName, platform, browserType, server }, testInfo) => {
-  it.fixme(browserName === 'webkit' && platform !== 'linux');
-  const { proxyServerAddr, closeProxyServer } = await setupSocksForwardingServer(testInfo.workerIndex + 2048 + 2, server.PORT);
   const browser = await browserType.launch({
     proxy: {
       server: proxyServerAddr,
@@ -354,3 +322,39 @@ it('should use SOCKS proxy for websocket requests', async ({ browserName, platfo
   await browser.close();
   await closeProxyServer();
 });
+
+it('should use http proxy for websocket requests', async ({ browserName, browserType, server, proxyServer, isWindows, isMac, macVersion }) => {
+  it.skip(isMac && macVersion === 13, 'Times out on Mac 13');
+
+  proxyServer.forwardTo(server.PORT, { allowConnectRequests: true });
+  const browser = await browserType.launch({
+    proxy: { server: `localhost:${proxyServer.PORT}` }
+  });
+
+  server.sendOnWebSocketConnection('incoming');
+  server.setRoute('/target.html', async (req, res) => {
+    res.end('<html><title>Served by the proxy</title></html>');
+  });
+
+  const page = await browser.newPage();
+
+  await page.goto('http://fake-localhost-127-0-0-1.nip.io:1337/target.html');
+  expect(await page.title()).toBe('Served by the proxy');
+
+  const value = await page.evaluate(() => {
+    let cb;
+    const result = new Promise(f => cb = f);
+    const ws = new WebSocket('ws://fake-localhost-127-0-0-1.nip.io:1337/ws');
+    ws.addEventListener('message', data => { ws.close(); cb(data.data); });
+    return result;
+  });
+  expect(value).toBe('incoming');
+
+  // WebKit does not use CONNECT for websockets, but other browsers do.
+  if (browserName === 'webkit')
+    expect(proxyServer.wsUrls).toContain(isWindows ? '/ws' : 'ws://fake-localhost-127-0-0-1.nip.io:1337/ws');
+  else
+    expect(proxyServer.connectHosts).toContain('fake-localhost-127-0-0-1.nip.io:1337');
+
+  await browser.close();
+});
diff --git a/tests/library/role-utils.spec.ts b/tests/library/role-utils.spec.ts
index 4acc7f8a85422..d894edbb29f31 100644
--- a/tests/library/role-utils.spec.ts
+++ b/tests/library/role-utils.spec.ts
@@ -22,8 +22,8 @@ test.skip(({ mode }) => mode !== 'default');
 
 async function getNameAndRole(page: Page, selector: string) {
   return await page.$eval(selector, e => {
-    const name = (window as any).__injectedScript.getElementAccessibleName(e);
-    const role = (window as any).__injectedScript.getAriaRole(e);
+    const name = (window as any).__injectedScript.utils.getElementAccessibleName(e);
+    const role = (window as any).__injectedScript.utils.getAriaRole(e);
     return { name, role };
   });
 }
@@ -41,16 +41,12 @@ for (let range = 0; range <= ranges.length; range++) {
       'name_test_case_659-manual.html',
       // This test expects ::before + title + ::after, which is neither 2F nor 2I.
       'name_test_case_660-manual.html',
+      // These two tests expect <input type=file title=...> to respect the title, but browsers do not.
+      'name_test_case_751-manual.html',
+      'name_file-title-manual.html',
       // Spec says role=combobox should use selected options, not a title attribute.
       'description_1.0_combobox-focusable-manual.html',
     ];
-    if (browserName === 'firefox') {
-      // This test contains the following style:
-      //   [data-after]:after { content: attr(data-after); }
-      // In firefox, content is returned as "attr(data-after)"
-      // instead of being resolved to the actual value.
-      skipped.push('name_test_case_553-manual.html');
-    }
 
     await page.addInitScript(() => {
       const self = window as any;
@@ -89,7 +85,7 @@ for (let range = 0; range <= ranges.length; range++) {
             if (!element)
               throw new Error(`Unable to resolve "${step.selector}"`);
             const injected = (window as any).__injectedScript;
-            const received = step.property === 'name' ? injected.getElementAccessibleName(element) : injected.getElementAccessibleDescription(element);
+            const received = step.property === 'name' ? injected.utils.getElementAccessibleName(element) : injected.utils.getElementAccessibleDescription(element);
             result.push({ selector: step.selector, expected: step.value, received });
           }
           return result;
@@ -101,7 +97,7 @@ for (let range = 0; range <= ranges.length; range++) {
   });
 }
 
-test('wpt accname non-manual', async ({ page, asset, server }) => {
+test('wpt accname non-manual', async ({ page, asset, server, browserName }) => {
   await page.addInitScript(() => {
     const self = window as any;
     self.AriaUtils = {};
@@ -120,14 +116,6 @@ test('wpt accname non-manual', async ({ page, asset, server }) => {
     'label valid on dd element',
     'label valid on dt element',
 
-    // TODO: support Alternative Text syntax in ::before and ::after.
-    'button name from fallback content with ::before and ::after',
-    'heading name from fallback content with ::before and ::after',
-    'link name from fallback content with ::before and ::after',
-    'button name from fallback content mixing attr() and strings with ::before and ::after',
-    'heading name from fallback content mixing attr() and strings with ::before and ::after',
-    'link name from fallback content mixing attr() and strings with ::before and ::after',
-
     // TODO: recursive bugs
     'heading with link referencing image using aria-labelledby, that in turn references text element via aria-labelledby',
     'heading with link referencing image using aria-labelledby, that in turn references itself and another element via aria-labelledby',
@@ -152,7 +140,7 @@ test('wpt accname non-manual', async ({ page, asset, server }) => {
           const injected = (window as any).__injectedScript;
           const title = element.getAttribute('data-testname');
           const expected = element.getAttribute('data-expectedlabel');
-          const received = injected.getElementAccessibleName(element);
+          const received = injected.utils.getElementAccessibleName(element);
           result.push({ title, expected, received });
         }
         return result;
@@ -180,7 +168,7 @@ test('axe-core implicit-role', async ({ page, asset, server }) => {
         const element = document.querySelector(selector);
         if (!element)
           throw new Error(`Unable to resolve "${selector}"`);
-        return (window as any).__injectedScript.getAriaRole(element);
+        return (window as any).__injectedScript.utils.getAriaRole(element);
       }, testCase.target);
       expect.soft(received, `checking ${JSON.stringify(testCase)}`).toBe(testCase.role);
     });
@@ -213,7 +201,7 @@ test('axe-core accessible-text', async ({ page, asset, server }) => {
           const element = injected.querySelector(injected.parseSelector('css=' + selector), document, false);
           if (!element)
             throw new Error(`Unable to resolve "${selector}"`);
-          return injected.getElementAccessibleName(element);
+          return injected.utils.getElementAccessibleName(element);
         });
       }, targets);
       expect.soft(received, `checking ${JSON.stringify(testCase)}`).toEqual(expected);
@@ -320,6 +308,9 @@ test('native controls', async ({ page }) => {
     <button id="button2" role="combobox">BUTTON2</button>
     <button id="button3">BUTTON3</button>
     <button id="button4" title="BUTTON4"></button>
+
+    <input id="file1" type=file>
+    <label for="file2">FILE2</label><input id="file2" type=file>
   `);
 
   expect.soft(await getNameAndRole(page, '#text1')).toEqual({ role: 'textbox', name: 'TEXT1' });
@@ -332,6 +323,8 @@ test('native controls', async ({ page }) => {
   expect.soft(await getNameAndRole(page, '#button2')).toEqual({ role: 'combobox', name: '' });
   expect.soft(await getNameAndRole(page, '#button3')).toEqual({ role: 'button', name: 'BUTTON3' });
   expect.soft(await getNameAndRole(page, '#button4')).toEqual({ role: 'button', name: 'BUTTON4' });
+  expect.soft(await getNameAndRole(page, '#file1')).toEqual({ role: 'button', name: 'Choose File' });
+  expect.soft(await getNameAndRole(page, '#file2')).toEqual({ role: 'button', name: 'FILE2' });
 });
 
 test('native controls labelled-by', async ({ page }) => {
@@ -372,6 +365,13 @@ test('display:contents should be visible when contents are visible', async ({ pa
   await expect(page.getByRole('button')).toHaveCount(1);
 });
 
+test('should remove soft hyphens and zero-width spaces', async ({ page }) => {
+  await page.setContent(`
+    <button>1\u00ad2\u200b3</button>
+  `);
+  expect.soft(await getNameAndRole(page, 'button')).toEqual({ role: 'button', name: '123' });
+});
+
 test('label/labelled-by aria-hidden with descendants', async ({ page }) => {
   test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29796' });
 
@@ -439,11 +439,12 @@ test('control embedded in a target element', async ({ page }) => {
   expect.soft(await getNameAndRole(page, 'h1')).toEqual({ role: 'heading', name: 'Foo bar' });
 });
 
-test('svg role=presentation', async ({ page }) => {
+test('svg role=presentation', async ({ page, server }) => {
   test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/26809' });
 
+  await page.goto(server.EMPTY_PAGE);
   await page.setContent(`
-		<img src="http://example.com/image.png" alt="Code is Poetry." />
+		<img src="pptr.png" alt="Code is Poetry." />
 		<svg viewBox="0 0 100 100" width="16" height="16" xmlns="http://www.w3.org/2000/svg" role="presentation" focusable="false"><circle cx="50" cy="50" r="50"></circle></svg>
   `);
   expect.soft(await getNameAndRole(page, 'img')).toEqual({ role: 'img', name: 'Code is Poetry.' });
@@ -462,6 +463,107 @@ test('should work with form and tricky input names', async ({ page }) => {
   expect.soft(await getNameAndRole(page, 'form')).toEqual({ role: 'form', name: 'my form' });
 });
 
+test('should ignore stylesheet from hidden aria-labelledby subtree', async ({ page }) => {
+  await page.setContent(`
+    <div id=mylabel style="display:none">
+      <template shadowrootmode=open>
+        <style>span { color: red; }</style>
+        <span>hello</span>
+      </template>
+    </div>
+    <input aria-labelledby=mylabel type=text>
+  `);
+  expect.soft(await getNameAndRole(page, 'input')).toEqual({ role: 'textbox', name: 'hello' });
+});
+
+test('should not include hidden pseudo into accessible name', async ({ page }) => {
+  await page.setContent(`
+    <style>
+      span:before {
+        content: 'world';
+        display: none;
+      }
+      div:after {
+        content: 'bye';
+        visibility: hidden;
+      }
+    </style>
+    <a href="http://example.com">
+      <span>hello</span>
+      <div>hello</div>
+    </a>
+  `);
+  expect.soft(await getNameAndRole(page, 'a')).toEqual({ role: 'link', name: 'hello hello' });
+});
+
+test('should resolve pseudo content from attr', async ({ page }) => {
+  await page.setContent(`
+    <style>
+    .stars:before {
+      display: block;
+      content: attr(data-hello);
+    }
+    </style>
+    <a href="http://example.com">
+      <div class="stars" data-hello="hello">world</div>
+    </a>
+  `);
+  expect(await getNameAndRole(page, 'a')).toEqual({ role: 'link', name: 'hello world' });
+});
+
+test('should resolve pseudo content alternative text', async ({ page }) => {
+  await page.setContent(`
+    <style>
+      .with-content:before {
+        content: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>") / "alternative text";
+      }
+    </style>
+    <div role="button" class="with-content"> inner text</div>
+  `);
+  expect(await getNameAndRole(page, 'div')).toEqual({ role: 'button', name: 'alternative text inner text' });
+});
+
+test('should resolve css content property for an element', async ({ page }) => {
+  await page.setContent(`
+    <style>
+      .with-content-1 {
+        content: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>") / "alternative text";
+      }
+      .with-content-2 {
+        content: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>");
+      }
+    </style>
+    <div id="button1" role="button" class="with-content-1">inner text</div>
+    <div id="button2" role="button" class="with-content-2">inner text</div>
+  `);
+  expect(await getNameAndRole(page, '#button1')).toEqual({ role: 'button', name: 'alternative text' });
+  expect(await getNameAndRole(page, '#button2')).toEqual({ role: 'button', name: 'inner text' });
+});
+
+test('should ignore invalid aria-labelledby', async ({ page }) => {
+  await page.setContent(`
+    <label>
+      <span>Text here</span>
+      <input type=text aria-labelledby="does-not-exist">
+    </label>
+  `);
+  expect.soft(await getNameAndRole(page, 'input')).toEqual({ role: 'textbox', name: 'Text here' });
+});
+
+test('should support search element', async ({ page }) => {
+  await page.setContent(`
+    <search id=search1 aria-label="example">
+      Hello
+    </search>
+    <search id=search2>
+      World
+    </search>
+  `);
+  expect.soft(await getNameAndRole(page, '#search1')).toEqual({ role: 'search', name: 'example' });
+  expect.soft(await getNameAndRole(page, '#search2')).toEqual({ role: 'search', name: '' });
+  await expect.soft(page.getByRole('search', { name: 'example' })).toBeVisible();
+});
+
 function toArray(x: any): any[] {
   return Array.isArray(x) ? x : [x];
 }
diff --git a/tests/library/route-web-socket.spec.ts b/tests/library/route-web-socket.spec.ts
new file mode 100644
index 0000000000000..dc0d31cd4e214
--- /dev/null
+++ b/tests/library/route-web-socket.spec.ts
@@ -0,0 +1,580 @@
+/**
+ * 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 { attachFrame, detachFrame } from '../config/utils';
+import { contextTest as test, expect } from '../config/browserTest';
+import type { Frame, Page, WebSocketRoute } from '@playwright/test';
+import { TestServer } from '../config/testserver';
+
+declare global {
+  interface Window {
+    ws: WebSocket;
+    wsOpened: Promise<void>;
+    log: string[];
+  }
+}
+
+// Polyfill for Promise.withResolvers, not available in older Node.
+function withResolvers<T = void>() {
+  let resolve: (value: T) => void;
+  const promise = new Promise<T>(f => resolve = f);
+  return { promise, resolve };
+}
+
+async function setupWS(target: Page | Frame, server: TestServer, binaryType: 'blob' | 'arraybuffer', protocols?: string | string[], relativeURL?: boolean) {
+  await target.goto(server.EMPTY_PAGE);
+  const wsUrl = relativeURL ? '/ws' : 'ws://' + server.HOST + '/ws';
+  await target.evaluate(({ wsUrl, binaryType, protocols }) => {
+    window.log = [];
+    window.ws = new WebSocket(wsUrl, protocols);
+    window.ws.binaryType = binaryType;
+    window.ws.addEventListener('open', () => window.log.push('open'));
+    window.ws.addEventListener('close', event => window.log.push(`close code=${event.code} reason=${event.reason} wasClean=${event.wasClean}`));
+    window.ws.addEventListener('error', event => window.log.push(`error`));
+    window.ws.addEventListener('message', async event => {
+      let data;
+      if (typeof event.data === 'string')
+        data = event.data;
+      else if (event.data instanceof Blob)
+        data = 'blob:' + await event.data.text();
+      else
+        data = 'arraybuffer:' + await (new Blob([event.data])).text();
+      window.log.push(`message: data=${data} origin=${event.origin} lastEventId=${event.lastEventId}`);
+    });
+    window.wsOpened = new Promise(f => window.ws.addEventListener('open', () => f()));
+  }, { wsUrl, binaryType, protocols });
+}
+
+for (const mock of ['no-mock', 'no-match', 'pass-through']) {
+  test.describe(mock, async () => {
+    test.beforeEach(async ({ page }) => {
+      if (mock === 'no-match') {
+        await page.routeWebSocket(/zzz/, () => {});
+      } else if (mock === 'pass-through') {
+        await page.routeWebSocket(/.*/, ws => {
+          const server = ws.connectToServer();
+          ws.onMessage(message => server.send(message));
+          server.onMessage(message => ws.send(message));
+        });
+      }
+    });
+
+    test('should work with text message', async ({ page, server }) => {
+      const wsPromise = server.waitForWebSocket();
+      const upgradePromise = server.waitForUpgrade();
+      await setupWS(page, server, 'blob');
+      expect(await page.evaluate(() => window.ws.readyState)).toBe(0);
+      const { doUpgrade } = await upgradePromise;
+      expect(await page.evaluate(() => window.ws.readyState)).toBe(0);
+      expect(await page.evaluate(() => window.log)).toEqual([]);
+      doUpgrade();
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(1);
+      expect(await page.evaluate(() => window.log)).toEqual(['open']);
+      const ws = await wsPromise;
+      ws.send('hello');
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+        'open',
+        `message: data=hello origin=ws://${server.HOST} lastEventId=`,
+      ]);
+      expect(await page.evaluate(() => window.ws.readyState)).toBe(1);
+      const messagePromise = new Promise(f => ws.once('message', data => f(data.toString())));
+      await page.evaluate(() => window.ws.send('hi'));
+      expect(await messagePromise).toBe('hi');
+      ws.close(1008, 'oops');
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(3);
+      expect(await page.evaluate(() => window.log)).toEqual([
+        'open',
+        `message: data=hello origin=ws://${server.HOST} lastEventId=`,
+        'close code=1008 reason=oops wasClean=true',
+      ]);
+    });
+
+    test('should work with binaryType=blob', async ({ page, server }) => {
+      const wsPromise = server.waitForWebSocket();
+      await setupWS(page, server, 'blob');
+      const ws = await wsPromise;
+      ws.send(Buffer.from('hi'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+        'open',
+        `message: data=blob:hi origin=ws://${server.HOST} lastEventId=`,
+      ]);
+      const messagePromise = new Promise(f => ws.once('message', data => f(data.toString())));
+      await page.evaluate(() => window.ws.send(new Blob([new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)])])));
+      expect(await messagePromise).toBe('hi');
+    });
+
+    test('should work with binaryType=arraybuffer', async ({ page, server }) => {
+      const wsPromise = server.waitForWebSocket();
+      await setupWS(page, server, 'arraybuffer');
+      const ws = await wsPromise;
+      ws.send(Buffer.from('hi'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+        'open',
+        `message: data=arraybuffer:hi origin=ws://${server.HOST} lastEventId=`,
+      ]);
+      const messagePromise = new Promise(f => ws.once('message', data => f(data.toString())));
+      await page.evaluate(() => window.ws.send(new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)]).buffer));
+      expect(await messagePromise).toBe('hi');
+    });
+
+    test('should work when connection errors out', async ({ page, server, browserName }) => {
+      test.skip(browserName === 'webkit', 'WebKit ignores the connection error and fires no events!');
+
+      const upgradePromise = server.waitForUpgrade();
+      await setupWS(page, server, 'blob');
+      const { socket } = await upgradePromise;
+      expect(await page.evaluate(() => window.ws.readyState)).toBe(0);
+      expect(await page.evaluate(() => window.log)).toEqual([]);
+      socket.destroy();
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(3);
+      expect(await page.evaluate(() => window.log)).toEqual([
+        'error',
+        expect.stringMatching(/close code=\d+ reason= wasClean=false/),
+      ]);
+    });
+
+    test('should work with error after successful open', async ({ page, server, browserName, isLinux, isWindows }) => {
+      test.skip(browserName === 'firefox', 'Firefox does not close the websocket upon a bad frame');
+      test.skip(browserName === 'webkit' && isLinux, 'WebKit linux does not close the websocket upon a bad frame');
+      test.skip(browserName === 'webkit' && isWindows, 'WebKit Windows does not close the websocket upon a bad frame');
+
+      const upgradePromise = server.waitForUpgrade();
+      await setupWS(page, server, 'blob');
+      const { socket, doUpgrade } = await upgradePromise;
+      doUpgrade();
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(1);
+      expect(await page.evaluate(() => window.log)).toEqual(['open']);
+      socket.write('garbage');
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(3);
+      expect(await page.evaluate(() => window.log)).toEqual([
+        'open',
+        'error',
+        expect.stringMatching(/close code=\d+ reason= wasClean=false/),
+      ]);
+    });
+
+    test('should work with client-side close', async ({ page, server }) => {
+      const wsPromise = server.waitForWebSocket();
+      const upgradePromise = server.waitForUpgrade();
+      await setupWS(page, server, 'blob');
+      expect(await page.evaluate(() => window.ws.readyState)).toBe(0);
+      const { doUpgrade } = await upgradePromise;
+      expect(await page.evaluate(() => window.ws.readyState)).toBe(0);
+      expect(await page.evaluate(() => window.log)).toEqual([]);
+      doUpgrade();
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(1);
+      expect(await page.evaluate(() => window.log)).toEqual(['open']);
+      const ws = await wsPromise;
+      const closedPromise = new Promise<{ code: number, reason: Buffer }>(f => ws.once('close', (code, reason) => f({ code, reason })));
+      const readyState = await page.evaluate(() => {
+        window.ws.close(3002, 'oops');
+        return window.ws.readyState;
+      });
+      expect(readyState).toBe(2);
+      await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(3);
+      expect(await page.evaluate(() => window.log)).toEqual([
+        'open',
+        'close code=3002 reason=oops wasClean=true',
+      ]);
+      const closed = await closedPromise;
+      expect(closed.code).toBe(3002);
+      expect(closed.reason.toString()).toBe('oops');
+    });
+
+    test('should pass through the required protocol', async ({ page, server }) => {
+      await setupWS(page, server, 'blob', 'my-custom-protocol');
+      await page.evaluate(() => window.wsOpened);
+      const protocol = await page.evaluate(() => window.ws.protocol);
+      expect(protocol).toBe('my-custom-protocol');
+    });
+
+    test('should work with relative WebSocket URL', async ({ page, server }) => {
+      const wsPromise = server.waitForWebSocket();
+      await setupWS(page, server, 'blob', undefined, true);
+      const ws = await wsPromise;
+      ws.send(Buffer.from('hi'));
+      await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+        'open',
+        `message: data=blob:hi origin=ws://${server.HOST} lastEventId=`,
+      ]);
+      const messagePromise = new Promise(f => ws.once('message', data => f(data.toString())));
+      await page.evaluate(() => window.ws.send(new Blob([new Uint8Array(['h'.charCodeAt(0), 'i'.charCodeAt(0)])])));
+      expect(await messagePromise).toBe('hi');
+    });
+  });
+}
+
+test('should work with ws.close', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<WebSocketRoute>();
+  await page.routeWebSocket(/.*/, async ws => {
+    ws.connectToServer();
+    resolve(ws);
+  });
+
+  const wsPromise = server.waitForWebSocket();
+  await setupWS(page, server, 'blob');
+  const ws = await wsPromise;
+
+  const route = await promise;
+  route.send('hello');
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=hello origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  const closedPromise = new Promise(f => ws.once('close', (code, reason) => f({ code, reason: reason.toString() })));
+  await route.close({ code: 3009, reason: 'oops' });
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=hello origin=ws://${server.HOST} lastEventId=`,
+    'close code=3009 reason=oops wasClean=true',
+  ]);
+  expect(await closedPromise).toEqual({ code: 3009, reason: 'oops' });
+});
+
+test('should pattern match', async ({ page, server }) => {
+  await page.routeWebSocket(/.*\/ws$/, async ws => {
+    ws.connectToServer();
+  });
+
+  await page.routeWebSocket('**/mock-ws', ws => {
+    ws.onMessage(message => {
+      ws.send('mock-response');
+    });
+  });
+
+  const wsPromise = server.waitForWebSocket();
+
+  await page.goto('about:blank');
+  await page.evaluate(async ({ host }) => {
+    window.log = [];
+    (window as any).ws1 = new WebSocket('ws://' + host + '/ws');
+    (window as any).ws1.addEventListener('message', event => window.log.push(`ws1:${event.data}`));
+    (window as any).ws2 = new WebSocket('ws://' + host + '/something/something/mock-ws');
+    (window as any).ws2.addEventListener('message', event => window.log.push(`ws2:${event.data}`));
+    await Promise.all([
+      new Promise(f => (window as any).ws1.addEventListener('open', f)),
+      new Promise(f => (window as any).ws2.addEventListener('open', f)),
+    ]);
+  }, { host: server.HOST });
+
+  const ws = await wsPromise;
+  ws.on('message', () => ws.send('response'));
+
+  await page.evaluate(() => (window as any).ws1.send('request'));
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:response`]);
+
+  await page.evaluate(() => (window as any).ws2.send('request'));
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:response`, `ws2:mock-response`]);
+});
+
+test('should work with server', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<WebSocketRoute>();
+  await page.routeWebSocket(/.*/, async ws => {
+    const server = ws.connectToServer();
+    ws.onMessage(message => {
+      switch (message) {
+        case 'to-respond':
+          ws.send('response');
+          return;
+        case 'to-block':
+          return;
+        case 'to-modify':
+          server.send('modified');
+          return;
+      }
+      server.send(message);
+    });
+    server.onMessage(message => {
+      switch (message) {
+        case 'to-block':
+          return;
+        case 'to-modify':
+          ws.send('modified');
+          return;
+      }
+      ws.send(message);
+    });
+    server.send('fake');
+    resolve(ws);
+  });
+
+  const wsPromise = server.waitForWebSocket();
+  const log: string[] = [];
+  server.onceWebSocketConnection(ws => {
+    ws.on('message', data => log.push(`message: ${data.toString()}`));
+    ws.on('close', (code, reason) => log.push(`close: code=${code} reason=${reason.toString()}`));
+  });
+
+  await setupWS(page, server, 'blob');
+  const ws = await wsPromise;
+  await expect.poll(() => log).toEqual(['message: fake']);
+
+  ws.send('to-modify');
+  ws.send('to-block');
+  ws.send('pass-server');
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=modified origin=ws://${server.HOST} lastEventId=`,
+    `message: data=pass-server origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  await page.evaluate(() => {
+    window.ws.send('to-respond');
+    window.ws.send('to-modify');
+    window.ws.send('to-block');
+    window.ws.send('pass-client');
+  });
+  await expect.poll(() => log).toEqual(['message: fake', 'message: modified', 'message: pass-client']);
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=modified origin=ws://${server.HOST} lastEventId=`,
+    `message: data=pass-server origin=ws://${server.HOST} lastEventId=`,
+    `message: data=response origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  const route = await promise;
+  route.send('another');
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=modified origin=ws://${server.HOST} lastEventId=`,
+    `message: data=pass-server origin=ws://${server.HOST} lastEventId=`,
+    `message: data=response origin=ws://${server.HOST} lastEventId=`,
+    `message: data=another origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  await page.evaluate(() => {
+    window.ws.send('pass-client-2');
+  });
+  await expect.poll(() => log).toEqual(['message: fake', 'message: modified', 'message: pass-client', 'message: pass-client-2']);
+
+  await page.evaluate(() => {
+    window.ws.close(3009, 'problem');
+  });
+  await expect.poll(() => log).toEqual(['message: fake', 'message: modified', 'message: pass-client', 'message: pass-client-2', 'close: code=3009 reason=problem']);
+});
+
+test('should work without server', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<WebSocketRoute>();
+  await page.routeWebSocket(/.*/, ws => {
+    ws.onMessage(message => {
+      switch (message) {
+        case 'to-respond':
+          ws.send('response');
+          return;
+      }
+    });
+    resolve(ws);
+  });
+
+  await setupWS(page, server, 'blob');
+
+  await page.evaluate(async () => {
+    await window.wsOpened;
+    window.ws.send('to-respond');
+    window.ws.send('to-block');
+    window.ws.send('to-respond');
+  });
+
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=response origin=ws://${server.HOST} lastEventId=`,
+    `message: data=response origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  const route = await promise;
+  route.send('another');
+  await route.close({ code: 3008, reason: 'oops' });
+
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=response origin=ws://${server.HOST} lastEventId=`,
+    `message: data=response origin=ws://${server.HOST} lastEventId=`,
+    `message: data=another origin=ws://${server.HOST} lastEventId=`,
+    'close code=3008 reason=oops wasClean=true',
+  ]);
+});
+
+test('should emit close upon frame navigation', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<WebSocketRoute>();
+  await page.routeWebSocket(/.*/, async ws => {
+    ws.connectToServer();
+    resolve(ws);
+  });
+
+  await setupWS(page, server, 'blob');
+
+  const route = await promise;
+  route.send('hello');
+
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=hello origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  const closedPromise = new Promise<void>(f => route.onClose(() => f()));
+  await page.goto(server.EMPTY_PAGE);
+  await closedPromise;
+});
+
+test('should emit close upon frame detach', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<WebSocketRoute>();
+  await page.routeWebSocket(/.*/, async ws => {
+    ws.connectToServer();
+    resolve(ws);
+  });
+
+  const frame = await attachFrame(page, 'frame1', server.EMPTY_PAGE);
+  await setupWS(frame, server, 'blob');
+
+  const route = await promise;
+  route.send('hello');
+
+  await expect.poll(() => frame.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=hello origin=ws://${server.HOST} lastEventId=`,
+  ]);
+
+  const closedPromise = new Promise<void>(f => route.onClose(() => f()));
+  await detachFrame(page, 'frame1');
+  await closedPromise;
+});
+
+test('should route on context', async ({ page, server }) => {
+  await page.routeWebSocket(/ws1/, ws => {
+    ws.onMessage(message => {
+      ws.send('page-mock-1');
+    });
+  });
+
+  await page.routeWebSocket(/ws1/, ws => {
+    ws.onMessage(message => {
+      ws.send('page-mock-2');
+    });
+  });
+
+  await page.context().routeWebSocket(/.*/, ws => {
+    ws.onMessage(message => {
+      ws.send('context-mock-1');
+    });
+    ws.onMessage(message => {
+      ws.send('context-mock-2');
+    });
+  });
+
+  await page.goto('about:blank');
+  await page.evaluate(({ host }) => {
+    window.log = [];
+    (window as any).ws1 = new WebSocket('ws://' + host + '/ws1');
+    (window as any).ws1.addEventListener('message', event => window.log.push(`ws1:${event.data}`));
+    (window as any).ws2 = new WebSocket('ws://' + host + '/ws2');
+    (window as any).ws2.addEventListener('message', event => window.log.push(`ws2:${event.data}`));
+  }, { host: server.HOST });
+
+  await page.evaluate(() => (window as any).ws1.send('request'));
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-2`]);
+
+  await page.evaluate(() => (window as any).ws2.send('request'));
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([`ws1:page-mock-2`, `ws2:context-mock-2`]);
+});
+
+test('should not throw after page closure', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<WebSocketRoute>();
+  await page.routeWebSocket(/.*/, async ws => {
+    ws.connectToServer();
+    resolve(ws);
+  });
+
+  await setupWS(page, server, 'blob');
+
+  const route = await promise;
+  await Promise.all([
+    page.close(),
+    route.send('hello'),
+  ]);
+});
+
+test('should not throw with empty handler', async ({ page, server }) => {
+  await page.routeWebSocket(/.*/, () => {});
+  await setupWS(page, server, 'blob');
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual(['open']);
+  await page.evaluate(() => window.ws.send('hi'));
+  await page.evaluate(() => window.ws.send('hi2'));
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual(['open']);
+});
+
+test('should throw when connecting twice', async ({ page, server }) => {
+  const { promise, resolve } = withResolvers<Error>();
+
+  await page.routeWebSocket(/.*/, ws => {
+    ws.connectToServer();
+    try {
+      ws.connectToServer();
+    } catch (e) {
+      resolve(e);
+    }
+  });
+  await setupWS(page, server, 'blob');
+  const error = await promise;
+  expect(error.message).toContain('Already connected to the server');
+});
+
+test('should work with no trailing slash', async ({ page, server }) => {
+  const log: string[] = [];
+  // No trailing slash!
+  await page.routeWebSocket('ws://' + server.HOST, ws => {
+    ws.onMessage(message => {
+      log.push(message as string);
+      ws.send('response');
+    });
+  });
+
+  await page.goto('about:blank');
+  await page.evaluate(({ host }) => {
+    window.log = [];
+    // No trailing slash!
+    window.ws = new WebSocket('ws://' + host);
+    window.ws.addEventListener('message', event => window.log.push(event.data));
+  }, { host: server.HOST });
+
+  await expect.poll(() => page.evaluate(() => window.ws.readyState)).toBe(1);
+  await page.evaluate(() => window.ws.send('query'));
+  await expect.poll(() => log).toEqual(['query']);
+  expect(await page.evaluate(() => window.log)).toEqual(['response']);
+});
+
+test('should work with baseURL', async ({ contextFactory, server }) => {
+  const context = await contextFactory({ baseURL: 'http://' + server.HOST });
+  const page = await context.newPage();
+
+  await page.routeWebSocket('/ws', ws => {
+    ws.onMessage(message => {
+      ws.send(message);
+    });
+  });
+
+  await setupWS(page, server, 'blob');
+
+  await page.evaluate(async () => {
+    await window.wsOpened;
+    window.ws.send('echo');
+  });
+
+  await expect.poll(() => page.evaluate(() => window.log)).toEqual([
+    'open',
+    `message: data=echo origin=ws://${server.HOST} lastEventId=`,
+  ]);
+});
diff --git a/tests/library/screenshot.spec.ts b/tests/library/screenshot.spec.ts
index e8bdac3313963..98d8c96b60141 100644
--- a/tests/library/screenshot.spec.ts
+++ b/tests/library/screenshot.spec.ts
@@ -22,7 +22,9 @@ import { verifyViewport } from '../config/utils';
 browserTest.describe('page screenshot', () => {
   browserTest.skip(({ browserName, headless }) => browserName === 'firefox' && !headless, 'Firefox headed produces a different image.');
 
-  browserTest('should run in parallel in multiple pages', async ({ server, contextFactory }) => {
+  browserTest('should run in parallel in multiple pages', async ({ server, contextFactory, browserName, isHeadlessShell, channel }) => {
+    browserTest.fixme(browserName === 'chromium' && !isHeadlessShell && channel !== 'chromium-tip-of-tree', 'https://github.com/microsoft/playwright/issues/33330');
+
     const context = await contextFactory();
     const N = 5;
     const pages = await Promise.all(Array(N).fill(0).map(async () => {
@@ -73,7 +75,6 @@ browserTest.describe('page screenshot', () => {
   });
 
   browserTest('should work with device scale factor', async ({ browser, server, isMac, browserName }) => {
-    browserTest.fixme(isMac && browserName === 'webkit');
     const context = await browser.newContext({ viewport: { width: 320, height: 480 }, deviceScaleFactor: 2 });
     const page = await context.newPage();
     await page.goto(server.PREFIX + '/grid.html');
@@ -216,7 +217,6 @@ browserTest.describe('element screenshot', () => {
 
   browserTest('element screenshot should work with device scale factor', async ({ browser, server, browserName, isMac }) => {
     browserTest.skip(browserName === 'firefox');
-    browserTest.fixme(isMac && browserName === 'webkit');
 
     const context = await browser.newContext({ viewport: { width: 320, height: 480 }, deviceScaleFactor: 2 });
     const page = await context.newPage();
diff --git a/tests/library/screenshot.spec.ts-snapshots/element-larger-than-viewport-dsf-css-size-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/element-larger-than-viewport-dsf-css-size-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..382dea1fe0526
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/element-larger-than-viewport-dsf-css-size-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/element-larger-than-viewport-dsf-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/element-larger-than-viewport-dsf-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..61d43989b88f9
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/element-larger-than-viewport-dsf-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/element-screenshot-page-screenshot-should-capture-css-transform-with-device-pixels-1-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/element-screenshot-page-screenshot-should-capture-css-transform-with-device-pixels-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..39823a32db57b
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/element-screenshot-page-screenshot-should-capture-css-transform-with-device-pixels-1-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/grid-cell-0-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/grid-cell-0-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..370350757a695
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/grid-cell-0-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/grid-cell-1-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/grid-cell-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..55d6a44412f40
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/grid-cell-1-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/hanging-main-resource-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/hanging-main-resource-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..f526d527761ef
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/hanging-main-resource-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-clip-css-size-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-clip-css-size-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..4cf53bde057b5
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-clip-css-size-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-clip-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-clip-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..4810c1e38fc38
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-clip-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-css-size-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-css-size-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..15cd79d89bf5b
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-css-size-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..1522c3cdd2c46
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-device-scale-factor-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-clip-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-clip-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..e0b7ed42f19f7
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-clip-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-fullpage-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-fullpage-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..672ab24729063
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-fullpage-moz-firefox-nightly.png differ
diff --git a/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-moz-firefox-nightly.png b/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..f18ddb47f3c28
Binary files /dev/null and b/tests/library/screenshot.spec.ts-snapshots/screenshot-mobile-moz-firefox-nightly.png differ
diff --git a/tests/library/selector-generator.spec.ts b/tests/library/selector-generator.spec.ts
index e9df1afc6e6fb..a78fb15a5c7d4 100644
--- a/tests/library/selector-generator.spec.ts
+++ b/tests/library/selector-generator.spec.ts
@@ -17,8 +17,15 @@
 import { contextTest as it, expect } from '../config/browserTest';
 import type { Page, Frame } from 'playwright-core';
 
-async function generate(pageOrFrame: Page | Frame, target: string): Promise<string> {
-  return pageOrFrame.$eval(target, e => (window as any).playwright.selector(e));
+async function generate(pageOrFrame: Page | Frame, target: string, expected?: string): Promise<string> {
+  return pageOrFrame.$eval(target, (e, expected) => {
+    const playwright = (window as any).playwright;
+    const selector = playwright.selector(e);
+    const expectedTarget = expected ? playwright.$(expected) : e;
+    if (playwright.$(selector) === expectedTarget)
+      return selector;
+    return 'FAILED: ' + selector;
+  }, expected);
 }
 
 async function generateMultiple(pageOrFrame: Page | Frame, target: string): Promise<string> {
@@ -28,18 +35,22 @@ async function generateMultiple(pageOrFrame: Page | Frame, target: string): Prom
 it.describe('selector generator', () => {
   it.skip(({ mode }) => mode !== 'default');
 
-  it.beforeEach(async ({ context }) => {
+  it.beforeEach(async ({ context, page }) => {
+    // Make sure `page`(fixture) is created before enabling recorder, so that
+    // we properly wait for `extendInjectedScript` call to finish. Otherwise
+    // if the page is created later, there is a race between ConsoleAPI
+    // initialization and playwright.selector(e) call in `generate()` function above.
     await (context as any)._enableRecorder({ language: 'javascript' });
   });
 
   it('should prefer button over inner span', async ({ page }) => {
     await page.setContent(`<button><span>text</span></button>`);
-    expect(await generate(page, 'span')).toBe('internal:role=button[name="text"i]');
+    expect(await generate(page, 'span', 'button')).toBe('internal:role=button[name="text"i]');
   });
 
   it('should prefer role=button over inner span', async ({ page }) => {
     await page.setContent(`<div role=button><span>text</span></div>`);
-    expect(await generate(page, 'span')).toBe('internal:role=button[name="text"i]');
+    expect(await generate(page, 'span', 'div')).toBe('internal:role=button[name="text"i]');
   });
 
   it('should not prefer zero-sized button over inner span', async ({ page }) => {
@@ -58,7 +69,7 @@ it.describe('selector generator', () => {
 
   it('should not escape spaces inside named attr selectors', async ({ page }) => {
     await page.setContent(`<input placeholder="Foo b ar"/>`);
-    expect(await generate(page, 'input')).toBe('internal:attr=[placeholder=\"Foo b ar\"i]');
+    expect(await generate(page, 'input')).toBe('internal:role=textbox[name=\"Foo b ar\"i]');
   });
 
   it('should generate text for <input type=button>', async ({ page }) => {
@@ -91,7 +102,7 @@ it.describe('selector generator', () => {
 
   it('should try to improve label text by shortening', async ({ page }) => {
     await page.setContent(`<label>Longest verbose description of the item<input></label>`);
-    expect(await generate(page, 'input')).toBe('internal:label="Longest verbose description"i');
+    expect(await generate(page, 'input')).toBe('internal:role=textbox[name=\"Longest verbose description\"i]');
   });
 
   it('should not improve guid text', async ({ page }) => {
@@ -132,9 +143,8 @@ it.describe('selector generator', () => {
     expect(await generate(page, '[data-testid="a"]')).toBe('internal:testid=[data-testid=\"a\"s]');
   });
 
-  it('should use data-testid in strict errors', async ({ page, playwright }) => {
-    playwright.selectors.setTestIdAttribute('data-custom-id');
-    await page.setContent(`
+  it('should use data-testid in strict errors', async ({ contextFactory, page, playwright }) => {
+    const content = `
       <div>
         <div></div>
         <div>
@@ -147,13 +157,27 @@ it.describe('selector generator', () => {
         </div>
         <div class='foo bar:1' data-custom-id='Two'>
         </div>
-      </div>`);
-    const error = await page.locator('.foo').hover().catch(e => e);
-    expect(error.message).toContain('strict mode violation');
-    expect(error.message).toContain('<div class=\"foo bar:0');
-    expect(error.message).toContain('<div class=\"foo bar:1');
-    expect(error.message).toContain(`aka getByTestId('One')`);
-    expect(error.message).toContain(`aka getByTestId('Two')`);
+      </div>
+    `;
+
+    const checkPage = async (page: Page) => {
+      await page.setContent(content);
+      const error = await page.locator('.foo').hover().catch(e => e);
+      expect(error.message).toContain('strict mode violation');
+      expect(error.message).toContain('<div class=\"foo bar:0');
+      expect(error.message).toContain('<div class=\"foo bar:1');
+      expect(error.message).toContain(`aka getByTestId('One')`);
+      expect(error.message).toContain(`aka getByTestId('Two')`);
+    };
+
+    playwright.selectors.setTestIdAttribute('data-custom-id');
+    // Check page and context that were created before setting the attribute.
+    await checkPage(page);
+
+    const context2 = await contextFactory();
+    const page2 = await context2.newPage();
+    // Check page and context that were created after setting the attribute.
+    await checkPage(page2);
   });
 
   it('should handle first non-unique data-testid', async ({ page }) => {
@@ -279,6 +303,24 @@ it.describe('selector generator', () => {
     expect(await generate(page, 'c[mark="1"]')).toBe('b:nth-child(2) > c');
   });
 
+  it('should prefer class to ordinal', async ({ page }) => {
+    await page.setContent(`
+      <div><c></c><c></c><c></c><c></c><c></c><b></b></div>
+      <div>
+        <b class="foo">
+          <c>
+          </c>
+        </b>
+        <b>
+          <c mark=1></c>
+        </b>
+      </div>
+      <div><b class="foo"></b></div>
+    `);
+    await page.$eval('[mark="1"]', c => c.parentElement.className = 'foo 12.bar.baz[&x]-_?"\'');
+    expect(await generate(page, 'c[mark="1"]')).toBe(`.foo.\\31 2\\.bar\\.baz\\[\\&x\\]-_\\?\\"\\' > c`);
+  });
+
   it('should properly join child selectors under nested ordinals', async ({ page }) => {
     await page.setContent(`
       <div><c></c><c></c><c></c><c></c><c></c><b></b></div>
@@ -309,14 +351,14 @@ it.describe('selector generator', () => {
     expect(await generate(page, 'input[mark="1"]')).toBe('internal:role=textbox >> nth=1');
   });
 
-  it.describe('should prioritise attributes correctly', () => {
+  it.describe('should prioritize attributes correctly', () => {
     it('role', async ({ page }) => {
       await page.setContent(`<input name="foobar" type="text"/>`);
       expect(await generate(page, 'input')).toBe('internal:role=textbox');
     });
     it('placeholder', async ({ page }) => {
       await page.setContent(`<input placeholder="foobar" type="text"/>`);
-      expect(await generate(page, 'input')).toBe('internal:attr=[placeholder=\"foobar\"i]');
+      expect(await generate(page, 'input')).toBe('internal:role=textbox[name=\"foobar\"i]');
     });
     it('name', async ({ page }) => {
       await page.setContent(`
@@ -406,19 +448,18 @@ it.describe('selector generator', () => {
 
   it('should work with tricky attributes', async ({ page }) => {
     await page.setContent(`<button id="this:is-my-tricky.id"><span></span></button>`);
-    expect(await generate(page, 'button')).toBe('[id="this\\:is-my-tricky\\.id"]');
+    expect(await generate(page, 'button')).toBe('[id="this:is-my-tricky.id"]');
 
     await page.setContent(`<ng:switch><span></span></ng:switch>`);
     expect(await generate(page, 'ng\\:switch')).toBe('ng\\:switch');
 
     await page.setContent(`<button><span></span></button><button></button>`);
-    await page.$eval('span', span => span.textContent = `!#'!?:`);
-    expect(await generate(page, 'button')).toBe(`internal:role=button[name="!#'!?:"i]`);
-    expect(await page.$(`role=button[name="!#'!?:"]`)).toBeTruthy();
+    await page.$eval('span', span => span.textContent = `!#'!?"\\:`);
+    expect(await generate(page, 'button')).toBe(`internal:role=button[name="!#'!?\\"\\\\:"i]`);
 
     await page.setContent(`<div><span></span></div>`);
-    await page.$eval('div', div => div.id = `!#'!?:`);
-    expect(await generate(page, 'div')).toBe("[id=\"\\!\\#\\'\\!\\?\\:\"]");
+    await page.$eval('div', div => div.id = `!#'!?"\\:`);
+    expect(await generate(page, 'div')).toBe(`[id="!#'!?\\"\\\\:"]`);
   });
 
   it('should work without CSS.escape', async ({ page }) => {
@@ -427,7 +468,12 @@ it.describe('selector generator', () => {
       delete window.CSS.escape;
       button.setAttribute('name', '-tricky\u0001name');
     });
-    expect(await generate(page, 'button')).toBe(`button[name="-tricky\\1 name"]`);
+    expect(await generate(page, 'button')).toBe(`button[name="-tricky\u0001name"]`);
+  });
+
+  it('should not over-escape for CSS syntax', async ({ page }) => {
+    await page.setContent(`<button aria-hidden="false" name="123"></button><div role="button"></div>`);
+    expect(await generate(page, 'button')).toBe(`button[name="123"]`);
   });
 
   it('should ignore empty aria-label for candidate consideration', async ({ page }) => {
@@ -437,7 +483,7 @@ it.describe('selector generator', () => {
 
   it('should accept valid aria-label for candidate consideration', async ({ page }) => {
     await page.setContent(`<button aria-label="ariaLabel" id="buttonId"></button>`);
-    expect(await generate(page, 'button')).toBe('internal:label="ariaLabel"i');
+    expect(await generate(page, 'button')).toBe('internal:role=button[name=\"ariaLabel\"i]');
   });
 
   it('should ignore empty role for candidate consideration', async ({ page }) => {
@@ -469,15 +515,15 @@ it.describe('selector generator', () => {
       <label for=target5>Target5</label><input id=target5 type=hidden>
       <label for=target6>Target6</label><div id=target6>text</div>
     `);
-    expect(await generate(page, '#target1')).toBe('internal:label="Target1"i');
-    expect(await generate(page, '#target2')).toBe('internal:label="Target2"i');
-    expect(await generate(page, '#target3')).toBe('internal:label="Target3"i');
-    expect(await generate(page, '#target4')).toBe('internal:label="Target4"i');
-    expect(await generate(page, '#target5')).toBe('#target5');
-    expect(await generate(page, '#target6')).toBe('internal:text="text"i');
+    expect.soft(await generate(page, '#target1')).toBe('internal:role=textbox[name=\"Target1\"i]');
+    expect.soft(await generate(page, '#target2')).toBe('internal:role=button[name=\"Target2\"i]');
+    expect.soft(await generate(page, '#target3')).toBe('internal:label=\"Target3\"i');
+    expect.soft(await generate(page, '#target4')).toBe('internal:label=\"Target4\"i');
+    expect.soft(await generate(page, '#target5')).toBe('#target5');
+    expect.soft(await generate(page, '#target6')).toBe('internal:text="text"i');
 
     await page.setContent(`<label for=target>Coun"try</label><input id=target>`);
-    expect(await generate(page, 'input')).toBe('internal:label="Coun\\\"try"i');
+    expect(await generate(page, 'input')).toBe('internal:role=textbox[name=\"Coun\\\"try\"i]');
   });
 
   it('should prefer role other input[type]', async ({ page }) => {
@@ -514,7 +560,7 @@ it.describe('selector generator', () => {
       <input placeholder="Text"></input>
       <input placeholder="Text and more"></input>
     `);
-    expect(await generate(page, 'input')).toBe('internal:attr=[placeholder=\"Text\"s]');
+    expect(await generate(page, 'input')).toBe('internal:role=textbox[name=\"Text\"s]');
   });
 
   it('should generate exact role when necessary', async ({ page }) => {
@@ -530,7 +576,7 @@ it.describe('selector generator', () => {
       <label>Text <input></input></label>
       <label>Text and more <input></input></label>
     `);
-    expect(await generate(page, 'input')).toBe('internal:label=\"Text\"s');
+    expect(await generate(page, 'input')).toBe('internal:role=textbox[name=\"Text\"s]');
   });
 
   it('should generate relative selector', async ({ page }) => {
@@ -596,4 +642,23 @@ it.describe('selector generator', () => {
       `span >> nth=1`,
     ]);
   });
+
+  it('should prefer role with hasText to css with hasText', async ({ page }) => {
+    await page.setContent(`
+      <ul>
+        <li>
+          <input aria-label="Toggle Todo" type="checkbox">
+          buy flowers
+        </li>
+        <li>
+          <input aria-label="Toggle Todo" type="checkbox">
+          sell milk
+        </li>
+      </ul>
+    `);
+    expect(await generateMultiple(page, 'input')).toEqual([
+      `internal:role=listitem >> internal:has-text=\"buy flowers\"i >> internal:label=\"Toggle Todo\"i`,
+      `internal:label=\"Toggle Todo\"i >> nth=0`,
+    ]);
+  });
 });
diff --git a/tests/library/selectors-register.spec.ts b/tests/library/selectors-register.spec.ts
index eff9dea9e558f..b7393761865d6 100644
--- a/tests/library/selectors-register.spec.ts
+++ b/tests/library/selectors-register.spec.ts
@@ -52,7 +52,9 @@ it('should work', async ({ playwright, browser }) => {
   await context.close();
 });
 
-it('should work when registered on global', async ({ browser }) => {
+it('should work when registered on global', async ({ browser, mode }) => {
+  it.skip(mode === 'driver', 'We expect registering selectors on the right Playwright instance.');
+
   await require('@playwright/test').selectors.register('oop-tag', `(${createTagSelector.toString()})()`);
 
   const context = await browser.newContext();
@@ -74,15 +76,14 @@ it('should work when registered on global', async ({ browser }) => {
 });
 
 it('should work with path', async ({ playwright, browser, asset }) => {
-  const page = await browser.newPage();
   await playwright.selectors.register('foo', { path: asset('sectionselectorengine.js') });
+  const page = await browser.newPage();
   await page.setContent('<section></section>');
   expect(await page.$eval('foo=whatever', e => e.nodeName)).toBe('SECTION');
   await page.close();
 });
 
 it('should work in main and isolated world', async ({ playwright, browser }) => {
-  const page = await browser.newPage();
   const createDummySelector = () => ({
     query(root, selector) {
       return window['__answer'];
@@ -93,6 +94,7 @@ it('should work in main and isolated world', async ({ playwright, browser }) =>
   });
   await playwright.selectors.register('main', createDummySelector);
   await playwright.selectors.register('isolated', createDummySelector, { contentScript: true });
+  const page = await browser.newPage();
   await page.setContent('<div><span><section></section></span></div>');
   await page.evaluate(() => window['__answer'] = document.querySelector('span'));
   // Works in main if asked.
@@ -143,8 +145,12 @@ it('should handle errors', async ({ playwright, browser }) => {
   await page.close();
 });
 
+it('should throw "already registered" error when registering', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36467' } }, async ({ playwright }) => {
+  await playwright.selectors.register('alreadyRegistered', createTagSelector);
+  await expect(playwright.selectors.register('alreadyRegistered', createTagSelector)).rejects.toThrowError('selectors.register: "alreadyRegistered" selector engine has been already registered');
+});
+
 it('should not rely on engines working from the root', async ({ playwright, browser }) => {
-  const page = await browser.newPage();
   const createValueEngine = () => ({
     query(root, selector) {
       return root && root.value.includes(selector) ? root : undefined;
@@ -153,15 +159,14 @@ it('should not rely on engines working from the root', async ({ playwright, brow
       return root && root.value.includes(selector) ? [root] : [];
     },
   });
-
   await playwright.selectors.register('__value', createValueEngine);
+  const page = await browser.newPage();
   await page.setContent(`<input id=input1 value=value1><input id=input2 value=value2>`);
   expect(await page.$eval('input >> __value=value2', e => e.id)).toBe('input2');
   await page.close();
 });
 
 it('should throw a nice error if the selector returns a bad value', async ({ playwright, browser }) => {
-  const page = await browser.newPage();
   const createFakeEngine = () => ({
     query(root, selector) {
       return [document.body];
@@ -172,6 +177,7 @@ it('should throw a nice error if the selector returns a bad value', async ({ pla
   });
 
   await playwright.selectors.register('__fake', createFakeEngine);
+  const page = await browser.newPage();
   const error = await page.$('__fake=value2').catch(e => e);
   expect(error.message).toContain('Expected a Node but got [object Array]');
   await page.close();
diff --git a/tests/library/signals.spec.ts b/tests/library/signals.spec.ts
index 70f7eb51f1124..50bbd05f8c87a 100644
--- a/tests/library/signals.spec.ts
+++ b/tests/library/signals.spec.ts
@@ -59,11 +59,11 @@ test('should remove temp dir on process.exit', async ({ startRemoteServer, serve
 test.describe('signals', () => {
   test.skip(({ platform }) => platform === 'win32');
 
-  test('should report browser close signal 2', async ({ startRemoteServer, server, isMac, browserName }) => {
+  test('should report browser close signal 2', async ({ startRemoteServer, server, isMac, macVersion, browserName }) => {
     const remoteServer = await startRemoteServer('launchServer', { url: server.EMPTY_PAGE });
     const pid = await remoteServer.out('pid');
     process.kill(-pid, 'SIGKILL');
-    if (isMac && browserName === 'webkit' && parseInt(os.release(), 10) > 22 && os.arch() === 'arm64') {
+    if (isMac && browserName === 'webkit' && macVersion > 13 && os.arch() === 'arm64') {
       // WebKit on newer macOS exits sometimes with exit code, sometimes with signal.
       expect('exitCode:' + await remoteServer.out('exitCode') +
              'signal:' + await remoteServer.out('signal')).toMatch(/exitCode:137|signal:SIGKILL/);
diff --git a/tests/library/slowmo.spec.ts b/tests/library/slowmo.spec.ts
index de25e6cdb1cf5..8a1872532b5f8 100644
--- a/tests/library/slowmo.spec.ts
+++ b/tests/library/slowmo.spec.ts
@@ -21,18 +21,17 @@ import type { TestServer } from '../config/testserver';
 
 async function checkSlowMo(toImpl: (api: any) => any, page: Page, task: () => Promise<unknown>) {
   let didSlowMo = false;
-  const contextDebugger = toImpl(page.context()).debugger();
-  contextDebugger._slowMo = 100;
-  const orig = contextDebugger._doSlowMo;
-  contextDebugger._doSlowMo = async () => {
+  const dispatcherConnection = toImpl((page as any)._connection);
+  const orig = dispatcherConnection._doSlowMo;
+  dispatcherConnection._doSlowMo = async (sdkObject: any) => {
     if (didSlowMo)
       throw new Error('already did slowmo');
     await new Promise(x => setTimeout(x, 100));
     didSlowMo = true;
-    return orig.call(contextDebugger);
   };
   await task();
   expect(!!didSlowMo).toBe(true);
+  dispatcherConnection._doSlowMo = orig;
 }
 
 async function checkPageSlowMo(toImpl: (api: any) => any, page: Page, task: () => Promise<unknown>) {
diff --git a/tests/library/snapshotter.spec.ts b/tests/library/snapshotter.spec.ts
index b6c45b9252fed..9eb839b7e8b71 100644
--- a/tests/library/snapshotter.spec.ts
+++ b/tests/library/snapshotter.spec.ts
@@ -30,7 +30,7 @@ it.describe('snapshots', () => {
   it('should collect snapshot', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<button>Hello</button>');
     const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot)).toBe('<BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot, page.url())).toBe('<BUTTON>Hello</BUTTON>');
   });
 
   it('should preserve BASE and other content on reset', async ({ page, toImpl, snapshotter, server }) => {
@@ -51,7 +51,7 @@ it.describe('snapshots', () => {
     });
     await page.setContent('<link rel="stylesheet" href="style.css"><button>Hello</button>');
     const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    const resource = snapshot.resourceByUrl(`http://localhost:${server.PORT}/style.css`, 'GET');
+    const resource = snapshot.resourceByUrl(`${server.PREFIX}/style.css`, 'GET');
     expect(resource).toBeTruthy();
   });
 
@@ -65,11 +65,11 @@ it.describe('snapshots', () => {
   it('should respect inline CSSOM change', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<style>button { color: red; }</style><button>Hello</button>');
     const snapshot1 = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot1)).toBe('<STYLE>button { color: red; }</STYLE><BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot1, page.url())).toBe('<STYLE>button { color: red; }</STYLE><BUTTON>Hello</BUTTON>');
 
     await page.evaluate(() => { (document.styleSheets[0].cssRules[0] as any).style.color = 'blue'; });
     const snapshot2 = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
-    expect(distillSnapshot(snapshot2)).toBe('<STYLE>button { color: blue; }</STYLE><BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot2, page.url())).toBe('<STYLE>button { color: blue; }</STYLE><BUTTON>Hello</BUTTON>');
   });
 
   it('should respect CSSOM change through CSSGroupingRule', async ({ page, toImpl, snapshotter }) => {
@@ -79,33 +79,33 @@ it.describe('snapshots', () => {
       void 0;
     });
     const snapshot1 = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot1)).toBe('<STYLE>@media  {\n  button { color: red; }\n}</STYLE><BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot1, page.url())).toBe('<STYLE>@media  {\n  button { color: red; }\n}</STYLE><BUTTON>Hello</BUTTON>');
 
     await page.evaluate(() => { window['rule'].cssRules[0].style.color = 'blue'; });
     const snapshot2 = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
-    expect(distillSnapshot(snapshot2)).toBe('<STYLE>@media  {\n  button { color: blue; }\n}</STYLE><BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot2, page.url())).toBe('<STYLE>@media  {\n  button { color: blue; }\n}</STYLE><BUTTON>Hello</BUTTON>');
 
     await page.evaluate(() => { window['rule'].insertRule('button { color: green; }', 1); });
     const snapshot3 = await snapshotter.captureSnapshot(toImpl(page), 'call@3', 'snapshot@call@3');
-    expect(distillSnapshot(snapshot3)).toBe('<STYLE>@media  {\n  button { color: blue; }\n  button { color: green; }\n}</STYLE><BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot3, page.url())).toBe('<STYLE>@media  {\n  button { color: blue; }\n  button { color: green; }\n}</STYLE><BUTTON>Hello</BUTTON>');
   });
 
   it('should respect node removal', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<div><button id="button1"></button><button id="button2"></button></div>');
     const snapshot1 = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot1)).toBe('<DIV><BUTTON id=\"button1\"></BUTTON><BUTTON id=\"button2\"></BUTTON></DIV>');
+    expect(distillSnapshot(snapshot1, page.url())).toBe('<DIV><BUTTON id=\"button1\"></BUTTON><BUTTON id=\"button2\"></BUTTON></DIV>');
     await page.evaluate(() => document.getElementById('button2').remove());
     const snapshot2 = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
-    expect(distillSnapshot(snapshot2)).toBe('<DIV><BUTTON id=\"button1\"></BUTTON></DIV>');
+    expect(distillSnapshot(snapshot2, page.url())).toBe('<DIV><BUTTON id=\"button1\"></BUTTON></DIV>');
   });
 
   it('should respect attr removal', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<div id="div" attr1="1" attr2="2"></div>');
     const snapshot1 = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot1)).toBe('<DIV id=\"div\" attr1=\"1\" attr2=\"2\"></DIV>');
+    expect(distillSnapshot(snapshot1, page.url())).toBe('<DIV id=\"div\" attr1=\"1\" attr2=\"2\"></DIV>');
     await page.evaluate(() => document.getElementById('div').removeAttribute('attr2'));
     const snapshot2 = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
-    expect(distillSnapshot(snapshot2)).toBe('<DIV id=\"div\" attr1=\"1\"></DIV>');
+    expect(distillSnapshot(snapshot2, page.url())).toBe('<DIV id=\"div\" attr1=\"1\"></DIV>');
   });
 
   it('should have a custom doctype', async ({ page, server, toImpl, snapshotter }) => {
@@ -113,21 +113,21 @@ it.describe('snapshots', () => {
     await page.setContent('<!DOCTYPE foo><body>hi</body>');
 
     const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot)).toBe('<!DOCTYPE foo>hi');
+    expect(distillSnapshot(snapshot, page.url())).toBe('<!DOCTYPE foo>hi');
   });
 
   it('should replace meta charset attr that specifies charset', async ({ page, server, toImpl, snapshotter }) => {
     await page.goto(server.EMPTY_PAGE);
     await page.setContent('<meta charset="shift-jis" />');
     const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot)).toBe('<META charset="utf-8">');
+    expect(distillSnapshot(snapshot, page.url())).toBe('<META charset="utf-8">');
   });
 
   it('should replace meta content attr that specifies charset', async ({ page, server, toImpl, snapshotter }) => {
     await page.goto(server.EMPTY_PAGE);
     await page.setContent('<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">');
     const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot)).toBe('<META http-equiv="Content-Type" content="text/html; charset=utf-8">');
+    expect(distillSnapshot(snapshot, page.url())).toBe('<META http-equiv="Content-Type" content="text/html; charset=utf-8">');
   });
 
   it('should respect subresource CSSOM change', async ({ page, server, toImpl, snapshotter }) => {
@@ -138,11 +138,11 @@ it.describe('snapshots', () => {
     await page.setContent('<link rel="stylesheet" href="style.css"><button>Hello</button>');
 
     const snapshot1 = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot1)).toBe('<LINK rel=\"stylesheet\" href=\"style.css\"><BUTTON>Hello</BUTTON>');
+    expect(distillSnapshot(snapshot1, page.url())).toBe('<LINK rel=\"stylesheet\" href=\"style.css\"><BUTTON>Hello</BUTTON>');
 
     await page.evaluate(() => { (document.styleSheets[0].cssRules[0] as any).style.color = 'blue'; });
     const snapshot2 = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
-    const resource = snapshot2.resourceByUrl(`http://localhost:${server.PORT}/style.css`, 'GET');
+    const resource = snapshot2.resourceByUrl(`${server.PREFIX}/style.css`, 'GET');
     expect((await snapshotter.resourceContentForTest(resource.response.content._sha1)).toString()).toBe('button { color: blue; }');
   });
 
@@ -163,7 +163,7 @@ it.describe('snapshots', () => {
 
     for (let counter = 0; ; ++counter) {
       const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@' + counter, 'snapshot@call@' + counter);
-      const text = distillSnapshot(snapshot).replace(/frame@[^"]+["]/, '<id>"');
+      const text = distillSnapshot(snapshot, page.url()).replace(/frame@[^"]+["]/, '<id>"');
       if (text === '<FRAMESET><FRAME __playwright_src__=\"/snapshot/<id>\"></FRAME></FRAMESET>')
         break;
       await page.waitForTimeout(250);
@@ -188,7 +188,7 @@ it.describe('snapshots', () => {
     // Marking iframe hierarchy is racy, do not expect snapshot, wait for it.
     for (let counter = 0; ; ++counter) {
       const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@' + counter, 'snapshot@call@' + counter);
-      const text = distillSnapshot(snapshot).replace(/frame@[^"]+["]/, '<id>"');
+      const text = distillSnapshot(snapshot, page.url()).replace(/frame@[^"]+["]/, '<id>"');
       if (text === '<IFRAME __playwright_src__=\"/snapshot/<id>\"></IFRAME>')
         break;
       await page.waitForTimeout(250);
@@ -208,47 +208,33 @@ it.describe('snapshots', () => {
     // Marking iframe hierarchy is racy, do not expect snapshot, wait for it.
     for (let counter = 0; ; ++counter) {
       const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@' + counter, 'snapshot@call@' + counter);
-      const text = distillSnapshot(snapshot).replace(/frame@[^"]+["]/, '<id>"');
+      const text = distillSnapshot(snapshot, page.url()).replace(/frame@[^"]+["]/, '<id>"');
       if (text === '<IFRAME __playwright_src__=\"/snapshot/<id>\"></IFRAME>')
         break;
       await page.waitForTimeout(250);
     }
   });
 
-  it('should capture snapshot target', async ({ page, toImpl, snapshotter }) => {
-    await page.setContent('<button>Hello</button><button>World</button>');
-    {
-      const handle = await page.$('text=Hello');
-      const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1', toImpl(handle));
-      expect(distillSnapshot(snapshot, false /* distillTarget */)).toBe('<BUTTON __playwright_target__=\"call@1\">Hello</BUTTON><BUTTON>World</BUTTON>');
-    }
-    {
-      const handle = await page.$('text=World');
-      const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2', toImpl(handle));
-      expect(distillSnapshot(snapshot, false /* distillTarget */)).toBe('<BUTTON __playwright_target__=\"call@1\">Hello</BUTTON><BUTTON __playwright_target__=\"call@2\">World</BUTTON>');
-    }
-  });
-
   it('should collect on attribute change', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<button>Hello</button>');
     {
       const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-      expect(distillSnapshot(snapshot)).toBe('<BUTTON>Hello</BUTTON>');
+      expect(distillSnapshot(snapshot, page.url())).toBe('<BUTTON>Hello</BUTTON>');
     }
     const handle = await page.$('text=Hello')!;
     await handle.evaluate(element => element.setAttribute('data', 'one'));
     {
       const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
-      expect(distillSnapshot(snapshot)).toBe('<BUTTON data="one">Hello</BUTTON>');
+      expect(distillSnapshot(snapshot, page.url())).toBe('<BUTTON data="one">Hello</BUTTON>');
     }
     await handle.evaluate(element => element.setAttribute('data', 'two'));
     {
       const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@3', 'snapshot@call@3');
-      expect(distillSnapshot(snapshot)).toBe('<BUTTON data="two">Hello</BUTTON>');
+      expect(distillSnapshot(snapshot, page.url())).toBe('<BUTTON data="two">Hello</BUTTON>');
     }
   });
 
-  it('empty adopted style sheets should not prevent node refs', async ({ page, toImpl, snapshotter, browserName }) => {
+  it('empty adopted style sheets should not prevent node refs', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<button>Hello</button>');
     await page.evaluate(() => {
       const sheet = new CSSStyleSheet();
@@ -267,7 +253,7 @@ it.describe('snapshots', () => {
 
     const renderer1 = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
     // Expect some adopted style sheets.
-    expect(distillSnapshot(renderer1)).toContain('__playwright_style_sheet_');
+    expect(distillSnapshot(renderer1, page.url())).toContain('__playwright_style_sheet_');
 
     const renderer2 = await snapshotter.captureSnapshot(toImpl(page), 'call@2', 'snapshot@call@2');
     const snapshot2 = renderer2.snapshot();
@@ -278,20 +264,22 @@ it.describe('snapshots', () => {
   it('should not navigate on anchor clicks', async ({ page, toImpl, snapshotter }) => {
     await page.setContent('<a href="https://example.com">example.com</a>');
     const snapshot = await snapshotter.captureSnapshot(toImpl(page), 'call@1', 'snapshot@call@1');
-    expect(distillSnapshot(snapshot)).toBe('<A href="link://https://example.com">example.com</A>');
+    expect(distillSnapshot(snapshot, page.url())).toBe('<A href="link://https://example.com">example.com</A>');
   });
 });
 
-function distillSnapshot(snapshot, distillTarget = true) {
+function distillSnapshot(snapshot, url: string, options: { distillTarget: boolean, distillBoundingRect: boolean } = { distillTarget: true, distillBoundingRect: true }) {
   let { html } = snapshot.render();
-  if (distillTarget)
+  if (options.distillTarget)
     html = html.replace(/\s__playwright_target__="[^"]+"/g, '');
+  if (options.distillBoundingRect)
+    html = html.replace(/\s__playwright_bounding_rect__="[^"]+"/g, '');
   return html
       .replace(/<style>\*,\*::before,\*::after { visibility: hidden }<\/style>/, '')
       .replace(/<script>[.\s\S]+<\/script>/, '')
       .replace(/<style>.*__playwright_target__.*?<\/style>/, '')
       .replace(/<BASE href="about:blank">/, '')
-      .replace(/<BASE href="http:\/\/localhost:[\d]+\/empty.html">/, '')
+      .replace(new RegExp(`<BASE href="${url}">`), '')
       .replace(/<HTML>/, '')
       .replace(/<\/HTML>/, '')
       .replace(/<HEAD>/, '')
diff --git a/tests/library/trace-viewer.spec.ts b/tests/library/trace-viewer.spec.ts
index 539c153df6254..5352621bafac6 100644
--- a/tests/library/trace-viewer.spec.ts
+++ b/tests/library/trace-viewer.spec.ts
@@ -14,13 +14,18 @@
  * limitations under the License.
  */
 
+// DO NOT TOUCH THIS LINE
+// It is used in the tracing.group test.
+
 import type { TraceViewerFixtures } from '../config/traceViewerFixtures';
 import { traceViewerFixtures } from '../config/traceViewerFixtures';
 import fs from 'fs';
 import path from 'path';
+import type http from 'http';
 import { pathToFileURL } from 'url';
 import { expect, playwrightTest } from '../config/browserTest';
 import type { FrameLocator } from '@playwright/test';
+import { rafraf, roundBox } from 'tests/page/pageTest';
 
 const test = playwrightTest.extend<TraceViewerFixtures>(traceViewerFixtures);
 
@@ -36,7 +41,9 @@ test.beforeAll(async function recordTrace({ browser, browserName, browserType, s
   });
   await context.tracing.start({ name: 'test', screenshots: true, snapshots: true, sources: true });
   const page = await context.newPage();
-  await page.goto(`data:text/html,<!DOCTYPE html><html>Hello world</html>`);
+  await page.goto(`data:text/html,<!DOCTYPE html><html><title>Hello</title><body>Hello world</body></html>`);
+  await expect(page).toHaveTitle('Hello');
+  await expect(page).toHaveURL('data:text/html,<!DOCTYPE html><html><title>Hello</title><body>Hello world</body></html>');
   await page.setContent('<!DOCTYPE html><button>Click</button>');
   await expect(page.locator('button')).toHaveText('Click');
   await expect(page.getByTestId('amazing-btn')).toBeHidden();
@@ -47,9 +54,9 @@ test.beforeAll(async function recordTrace({ browser, browserName, browserType, s
     console.error('Error');
     return new Promise(f => {
       // Generate exception.
-      window.builtinSetTimeout(() => {
+      window.builtins.setTimeout(() => {
         // And then resolve.
-        window.builtinSetTimeout(() => f('return ' + a), 0);
+        window.builtins.setTimeout(() => f('return ' + a), 0);
         throw new Error('Unhandled exception');
       }, 0);
     });
@@ -102,23 +109,124 @@ test('should open trace viewer on specific host', async ({ showTraceViewer }, te
   await expect(traceViewer.page).toHaveURL(/127.0.0.1/);
 });
 
+test('should show tracing.group in the action list with location', async ({ runAndTrace, page, context }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36483' });
+
+  const traceViewer = await test.step('create trace with groups', async () => {
+    await page.context().tracing.group('ignored group');
+    return await runAndTrace(async () => {
+      await context.tracing.group('outer group');
+      await page.goto(`data:text/html,<!DOCTYPE html><body><div>Hello world</div></body>`);
+      await context.tracing.group('inner group 1 {{ eager_beaver }}', { location: { file: __filename, line: 17, column: 1 } });
+      await page.locator('body').click();
+      await context.tracing.groupEnd();
+      await context.tracing.group('inner group 2');
+      await expect(page.getByText('Hello')).toBeVisible();
+      await context.tracing.groupEnd();
+      await context.tracing.groupEnd();
+    });
+  });
+
+  await expect(traceViewer.actionTitles).toHaveText([
+    /outer group/,
+    /Navigate/,
+    /inner group 1 {{ eager_beaver }}/,
+    /inner group 2/,
+    /toBeVisible/,
+  ]);
+
+  await traceViewer.selectAction('inner group 1');
+  await traceViewer.expandAction('inner group 1');
+  await expect(traceViewer.actionTitles).toHaveText([
+    /outer group/,
+    /Navigate/,
+    /inner group 1 {{ eager_beaver }}/,
+    /Click.*locator/,
+    /inner group 2/,
+  ]);
+  await traceViewer.showSourceTab();
+  await expect(traceViewer.sourceCodeTab.locator('.source-line-running')).toHaveText(/DO NOT TOUCH THIS LINE/);
+
+  await traceViewer.selectAction('inner group 2');
+  await expect(traceViewer.sourceCodeTab.locator('.source-line-running')).toContainText("await context.tracing.group('inner group 2');");
+});
+
 test('should open simple trace viewer', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
   await expect(traceViewer.actionTitles).toHaveText([
-    /browserContext.newPage/,
-    /page.gotodata:text\/html,<!DOCTYPE html><html>Hello world<\/html>/,
-    /page.setContent/,
-    /expect.toHaveTextlocator\('button'\)/,
-    /expect.toBeHiddengetByTestId\('amazing-btn'\)/,
-    /expect.toBeHiddengetByTestId\(\/amazing-btn-regex\/\)/,
-    /page.evaluate/,
-    /page.evaluate/,
-    /locator.clickgetByText\('Click'\)/,
-    /page.waitForNavigation/,
-    /page.waitForResponse/,
-    /page.waitForTimeout/,
-    /page.gotohttp:\/\/localhost:\d+\/frames\/frame.html/,
-    /page.setViewportSize/,
+    /Create page/,
+    /Navigate to "data:"/,
+    /^Expect "toHaveTitle"[\d]+ms$/,
+    /^Expect "toHaveURL"[\d]+ms$/,
+    /Set content/,
+    /toHaveText.*locator/,
+    /toBeHidden.*getByTestId/,
+    /toBeHidden.*getByTestId/,
+    /Evaluate/,
+    /Evaluate/,
+    /Click/,
+    /Wait for navigation/,
+    /Wait for event "response"/,
+    /Wait for timeout/,
+    /Navigate to "\/frames\/frame.html"/,
+    /Set viewport size/,
+    /Hover/,
+    /Close page/,
+  ]);
+});
+
+test('should show action context on locators and other common actions', async ({
+  runAndTrace,
+  page,
+}) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.setContent('<input type="text" />');
+    await page.locator('input').click({ button: 'right' });
+    await page.getByRole('textbox').click();
+    await expect(page.locator('input')).toHaveText('');
+    await page.locator('input').press('Enter');
+    await page.keyboard.type(
+        'Hello world this is a very long string what happens when it overflows?',
+    );
+    await page.keyboard.press('Control+c');
+    await page.keyboard.down('Shift');
+    await page.keyboard.insertText('Hello world');
+    await page.keyboard.up('Shift');
+    await page.mouse.move(0, 0);
+    await page.mouse.down();
+    await page.mouse.move(100, 200);
+    await page.mouse.wheel(5, 7);
+    await page.mouse.up();
+    await page.clock.fastForward(1000);
+    await page.clock.fastForward('30:00');
+    await page.clock.pauseAt(new Date('2020-02-02T00:00:00Z'));
+    await page.clock.runFor(10);
+    await page.clock.setFixedTime(new Date('2020-02-02T00:00:00Z'));
+    await page.clock.setSystemTime(new Date('2020-02-02T00:00:00Z'));
+  });
+
+  await expect(traceViewer.actionTitles).toHaveText([
+    /Set content/,
+    /Click.*locator\('input'\)/,
+    /Click.*getByRole\('textbox'\)/,
+    /toHaveText.*locator\('input'\)/,
+    /Press "Enter".*locator\('input'\)/,
+    /Type "Hello world.*/,
+    /Press "Control\+c"/,
+    /Key down "Shift"/,
+    /Insert "Hello world"/,
+    /Key up "Shift"/,
+    /Mouse move/,
+    /Mouse down/,
+    /Mouse move/,
+    /Mouse wheel/,
+    /Mouse up/,
+    /Fast forward clock "1000"/,
+    /Fast forward clock "30:00"/,
+    /Pause clock ".*:00.*"/,
+    /Run clock/,
+    /Set fixed time ".*:00.*"/,
+    /Set system time ".*:00.*"/,
   ]);
 });
 
@@ -127,9 +235,17 @@ test('should complain about newer version of trace in old viewer', async ({ show
   await expect(traceViewer.page.getByText('The trace was created by a newer version of Playwright and is not supported by this version of the viewer.')).toBeVisible();
 });
 
+test('should properly synchronize local and remote time', async ({ showTraceViewer, asset }, testInfo) => {
+  const traceViewer = await showTraceViewer([asset('trace-remote-time-diff.zip')]);
+  // The total duration should be sub 10s, rather than 16h.
+  await expect.poll(async () =>
+    parseInt(await traceViewer.page.locator('.timeline-time').last().innerText(), 10)
+  ).toBeLessThan(10);
+});
+
 test('should contain action info', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('locator.click');
+  await traceViewer.selectAction('Click');
   await traceViewer.page.getByText('Log', { exact: true }).click();
   await expect(traceViewer.logLines).toContainText([
     /\d+m?sattempting click action/,
@@ -164,7 +280,7 @@ test('should render console', async ({ showTraceViewer, browserName }) => {
   await expect.soft(traceViewer.consoleLines.filter({ hasText: 'Cheers!' }).locator('.codicon')).toHaveClass('codicon codicon-browser status-none');
   await expect(traceViewer.consoleStacks.first()).toContainText('Error: Unhandled exception');
 
-  await traceViewer.selectAction('page.evaluate');
+  await traceViewer.selectAction('Evaluate');
 
   const listViews = traceViewer.page.locator('.console-tab').locator('.list-view-entry');
   await expect(listViews.nth(0)).toHaveClass('list-view-entry');
@@ -175,20 +291,20 @@ test('should render console', async ({ showTraceViewer, browserName }) => {
   await expect(listViews.filter({ hasText: 'Cheers!' })).toHaveClass('list-view-entry');
 });
 
-test('should open console errors on click', async ({ showTraceViewer, browserName }) => {
+test('should open console errors on click', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  expect(await traceViewer.actionIconsText('page.evaluate')).toEqual(['2', '1']);
-  expect(await traceViewer.page.isHidden('.console-tab')).toBeTruthy();
-  await (await traceViewer.actionIcons('page.evaluate')).click();
-  expect(await traceViewer.page.waitForSelector('.console-tab')).toBeTruthy();
+  await expect(traceViewer.actionIconsText('Evaluate')).toHaveText(['2', '1']);
+  await expect(traceViewer.page.getByRole('tabpanel', { name: 'Console' })).toBeHidden();
+  await traceViewer.actionIcons('Evaluate').click();
+  await traceViewer.page.getByRole('tabpanel', { name: 'Console' }).waitFor();
 });
 
 test('should show params and return value', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('page.evaluate');
+  await traceViewer.selectAction('Evaluate');
   await expect(traceViewer.callLines).toHaveText([
-    /page.evaluate/,
-    /wall time:[0-9/:,APM ]+/,
+    '',
+    /start:[\d\.]+m?s/,
     /duration:[\d]+ms/,
     /expression:"\({↵    a↵  }\) => {↵    console\.log\(\'Info\'\);↵    console\.warn\(\'Warning\'\);↵    console/,
     'isFunction:true',
@@ -198,8 +314,8 @@ test('should show params and return value', async ({ showTraceViewer }) => {
 
   await traceViewer.selectAction(`locator('button')`);
   await expect(traceViewer.callLines).toContainText([
-    /expect.toHaveText/,
-    /wall time:[0-9/:,APM ]+/,
+    /toHaveText/,
+    /start:[\d\.]+m?s/,
     /duration:[\d]+ms/,
     /locator:locator\('button'\)/,
     /expression:"to.have.text"/,
@@ -211,10 +327,10 @@ test('should show params and return value', async ({ showTraceViewer }) => {
 
 test('should show null as a param', async ({ showTraceViewer, browserName }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('page.evaluate', 1);
+  await traceViewer.selectAction('Evaluate', 1);
   await expect(traceViewer.callLines).toHaveText([
-    /page.evaluate/,
-    /wall time:[0-9/:,APM ]+/,
+    '',
+    /start:[\d\.]+m?s/,
     /duration:[\d]+ms/,
     'expression:"() => 1 + 1"',
     'isFunction:true',
@@ -225,7 +341,7 @@ test('should show null as a param', async ({ showTraceViewer, browserName }) =>
 
 test('should have correct snapshot size', async ({ showTraceViewer }, testInfo) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('page.setViewport');
+  await traceViewer.selectAction('SET VIEWPORT');
   await traceViewer.selectSnapshot('Before');
   await expect(traceViewer.snapshotContainer).toHaveCSS('width', '1280px');
   await expect(traceViewer.snapshotContainer).toHaveCSS('height', '720px');
@@ -237,9 +353,9 @@ test('should have correct snapshot size', async ({ showTraceViewer }, testInfo)
 test('should have correct stack trace', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
 
-  await traceViewer.selectAction('locator.click');
+  await traceViewer.selectAction('Click');
   await traceViewer.showSourceTab();
-  await expect(traceViewer.stackFrames).toContainText([
+  await expect(traceViewer.stackFrames()).toContainText([
     /doClick\s+trace-viewer.spec.ts\s+:\d+/,
     /recordTrace\s+trace-viewer.spec.ts\s+:\d+/,
   ], { useInnerText: true });
@@ -247,13 +363,91 @@ test('should have correct stack trace', async ({ showTraceViewer }) => {
 
 test('should have network requests', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('http://localhost');
+  await traceViewer.selectAction('Navigate');
   await traceViewer.showNetworkTab();
   await expect(traceViewer.networkRequests).toContainText([/frame.htmlGET200text\/html/]);
   await expect(traceViewer.networkRequests).toContainText([/style.cssGET200text\/css/]);
   await expect(traceViewer.networkRequests).toContainText([/404GET404text\/plain/]);
   await expect(traceViewer.networkRequests).toContainText([/script.jsGET200application\/javascript/]);
-  await expect(traceViewer.networkRequests.filter({ hasText: '404' })).toHaveCSS('background-color', 'rgb(242, 222, 222)');
+  await expect(traceViewer.networkRequests.filter({ hasText: '404GET404text' })).toHaveCSS('background-color', 'rgb(242, 222, 222)');
+});
+
+test('should filter network requests by resource type', async ({ page, runAndTrace, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    server.setRoute('/api/endpoint', (_, res) => res.setHeader('Content-Type', 'application/json').end());
+    await page.goto(`${server.PREFIX}/network-tab/network.html`);
+    await page.evaluate(() => (window as any).donePromise);
+  });
+  await traceViewer.selectAction('Navigate');
+  await traceViewer.showNetworkTab();
+
+  await traceViewer.page.getByText('JS', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('script.js')).toBeVisible();
+
+  await traceViewer.page.getByText('CSS', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('style.css')).toBeVisible();
+
+  await traceViewer.page.getByText('Image', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('image.png')).toBeVisible();
+
+  await traceViewer.page.getByText('Fetch', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('endpoint')).toBeVisible();
+
+  await traceViewer.page.getByText('HTML', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('network.html')).toBeVisible();
+
+  await traceViewer.page.getByText('Font', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('font.woff2')).toBeVisible();
+});
+
+test('should show font preview', async ({ page, runAndTrace, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(`${server.PREFIX}/network-tab/network.html`);
+    await page.evaluate(() => (window as any).donePromise);
+  });
+  await traceViewer.selectAction('Navigate');
+  await traceViewer.showNetworkTab();
+
+  await traceViewer.page.getByText('Font', { exact: true }).click();
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await traceViewer.networkRequests.getByText('font.woff2').click();
+  await traceViewer.page.getByTestId('network-request-details').getByTitle('Body').click();
+  await expect(traceViewer.page.locator('.network-request-details-tab')).toContainText('ABCDEF');
+});
+
+test('should filter network requests by url', async ({ page, runAndTrace, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(`${server.PREFIX}/network-tab/network.html`);
+    await page.evaluate(() => (window as any).donePromise);
+  });
+  await traceViewer.selectAction('Navigate');
+  await traceViewer.showNetworkTab();
+
+  await traceViewer.page.getByPlaceholder('Filter network').fill('script.');
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('script.js')).toBeVisible();
+
+  await traceViewer.page.getByPlaceholder('Filter network').fill('png');
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('image.png')).toBeVisible();
+
+  await traceViewer.page.getByPlaceholder('Filter network').fill('api/');
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('endpoint')).toBeVisible();
+
+  await traceViewer.page.getByPlaceholder('Filter network').fill('End');
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('endpoint')).toBeVisible();
+
+  await traceViewer.page.getByPlaceholder('Filter network').fill('FON');
+  await expect(traceViewer.networkRequests).toHaveCount(1);
+  await expect(traceViewer.networkRequests.getByText('font.woff2')).toBeVisible();
 });
 
 test('should have network request overrides', async ({ page, server, runAndTrace }) => {
@@ -261,7 +455,7 @@ test('should have network request overrides', async ({ page, server, runAndTrace
     await page.route('**/style.css', route => route.abort());
     await page.goto(server.PREFIX + '/frames/frame.html');
   });
-  await traceViewer.selectAction('http://localhost');
+  await traceViewer.selectAction('Navigate');
   await traceViewer.showNetworkTab();
   await expect(traceViewer.networkRequests).toContainText([/frame.htmlGET200text\/html/]);
   await expect(traceViewer.networkRequests).toContainText([/style.cssGETx-unknown.*aborted/]);
@@ -273,7 +467,7 @@ test('should have network request overrides 2', async ({ page, server, runAndTra
     await page.route('**/script.js', route => route.continue());
     await page.goto(server.PREFIX + '/frames/frame.html');
   });
-  await traceViewer.selectAction('http://localhost');
+  await traceViewer.selectAction('Navigate');
   await traceViewer.showNetworkTab();
   await expect.soft(traceViewer.networkRequests).toContainText([/frame.htmlGET200text\/html.*/]);
   await expect.soft(traceViewer.networkRequests).toContainText([/script.jsGET200application\/javascript.*continued/]);
@@ -284,20 +478,28 @@ test('should show snapshot URL', async ({ page, runAndTrace, server }) => {
     await page.goto(server.EMPTY_PAGE);
     await page.evaluate('2+2');
   });
-  await traceViewer.snapshotFrame('page.evaluate');
-  await expect(traceViewer.page.locator('.browser-frame-address-bar')).toHaveText(server.EMPTY_PAGE);
+  await traceViewer.snapshotFrame('Evaluate');
+  const browserFrameAddressBarLocator = traceViewer.page.locator('.browser-frame-address-bar');
+  await expect(browserFrameAddressBarLocator).toHaveText(server.EMPTY_PAGE);
+  const copySelectorLocator = browserFrameAddressBarLocator.getByRole('button', { name: 'Copy' });
+  await expect(copySelectorLocator).toBeHidden();
+  await browserFrameAddressBarLocator.hover();
+  await expect(copySelectorLocator).toBeVisible();
+  await traceViewer.page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
+  await copySelectorLocator.click();
+  expect(await traceViewer.page.evaluate(() => navigator.clipboard.readText())).toBe(server.EMPTY_PAGE);
 });
 
 test('should popup snapshot', async ({ page, runAndTrace, server }) => {
   const traceViewer = await runAndTrace(async () => {
     await page.goto(server.EMPTY_PAGE);
-    await page.setContent('hello');
+    await page.setContent('hello äöü 🙂');
   });
-  await traceViewer.snapshotFrame('page.setContent');
+  await traceViewer.snapshotFrame('Set content');
   const popupPromise = traceViewer.page.context().waitForEvent('page');
   await traceViewer.page.getByTitle('Open snapshot in a new tab').click();
   const popup = await popupPromise;
-  await expect(popup.getByText('hello')).toBeVisible();
+  await expect(popup.getByText('hello äöü 🙂')).toBeVisible();
 });
 
 test('should capture iframe with sandbox attribute', async ({ page, server, runAndTrace }) => {
@@ -324,7 +526,7 @@ test('should capture iframe with sandbox attribute', async ({ page, server, runA
   });
 
   // Render snapshot, check expectations.
-  const snapshotFrame = await traceViewer.snapshotFrame('page.evaluate', 0, true);
+  const snapshotFrame = await traceViewer.snapshotFrame('Evaluate', 0, true);
   const button = snapshotFrame.frameLocator('iframe').locator('button');
   expect(await button.textContent()).toBe('Hello iframe');
 });
@@ -347,8 +549,8 @@ test('should capture data-url svg iframe', async ({ page, server, runAndTrace })
   });
 
   // Render snapshot, check expectations.
-  const snapshotFrame = await traceViewer.snapshotFrame('page.evaluate', 0, true);
-  await expect(snapshotFrame.frameLocator('iframe').locator('svg')).toBeVisible();
+  const snapshotFrame = await traceViewer.snapshotFrame('Evaluate', 0, true);
+  await expect(snapshotFrame.frameLocator('iframe').locator('> body > svg')).toBeVisible();
   const content = await snapshotFrame.frameLocator('iframe').locator(':root').innerHTML();
   expect(content).toContain(`d="M16.5 3c-1.74 0-3.41.81-4.5 2.09C10.91 3.81 9.24 3 7.5 3 4.42 3 2 5.42 2 8.5c0 3.78 3.4 6.86 8.55 11.54L12 21.35l1.45-1.32C18.6 15.36 22 12.28 22 8.5 22 5.42 19.58 3 16.5 3zm-4.4 15.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05z"`);
 });
@@ -375,7 +577,7 @@ test('should contain adopted style sheets', async ({ page, runAndTrace, browserN
     });
   });
 
-  const frame = await traceViewer.snapshotFrame('page.evaluate');
+  const frame = await traceViewer.snapshotFrame('Evaluate');
   await expect(frame.locator('button')).toHaveCSS('color', 'rgb(255, 0, 0)');
   await expect(frame.locator('div')).toHaveCSS('color', 'rgb(0, 0, 255)');
   await expect(frame.locator('span')).toHaveCSS('color', 'rgb(0, 0, 255)');
@@ -400,15 +602,15 @@ test('should work with adopted style sheets and replace/replaceSync', async ({ p
   });
 
   {
-    const frame = await traceViewer.snapshotFrame('page.evaluate', 0);
+    const frame = await traceViewer.snapshotFrame('Evaluate', 0);
     await expect(frame.locator('button')).toHaveCSS('color', 'rgb(255, 0, 0)');
   }
   {
-    const frame = await traceViewer.snapshotFrame('page.evaluate', 1);
+    const frame = await traceViewer.snapshotFrame('Evaluate', 1);
     await expect(frame.locator('button')).toHaveCSS('color', 'rgb(0, 0, 255)');
   }
   {
-    const frame = await traceViewer.snapshotFrame('page.evaluate', 2);
+    const frame = await traceViewer.snapshotFrame('Evaluate', 2);
     await expect(frame.locator('button')).toHaveCSS('color', 'rgb(0, 255, 0)');
   }
 });
@@ -428,7 +630,7 @@ test('should work with adopted style sheets and all: unset', async ({ page, runA
     await page.getByRole('button').click();
   });
   {
-    const frame = await traceViewer.snapshotFrame('page.evaluate', 0);
+    const frame = await traceViewer.snapshotFrame('Evaluate', 0);
     await expect(frame.locator('button')).toHaveCSS('border-radius', '24px');
     await expect(frame.locator('button')).toHaveCSS('background-color', 'rgb(0, 191, 255)');
     await expect(frame.locator('button')).toHaveCSS('color', 'rgb(0, 0, 0)');
@@ -456,7 +658,7 @@ test('should work with nesting CSS selectors', async ({ page, runAndTrace }) =>
     await page.evaluate(() => { });
   });
   {
-    const frame = await traceViewer.snapshotFrame('page.evaluate', 0);
+    const frame = await traceViewer.snapshotFrame('Evaluate', 0);
     await expect(frame.getByTestId('green-element')).toHaveCSS('color', /* green */'rgb(0, 128, 0)');
     await expect(frame.getByTestId('red-element')).toHaveCSS('color', /* red */'rgb(255, 0, 0)');
   }
@@ -489,7 +691,7 @@ test('should restore scroll positions', async ({ page, runAndTrace }) => {
   });
 
   // Render snapshot, check expectations.
-  const frame = await traceViewer.snapshotFrame('scrollIntoViewIfNeeded');
+  const frame = await traceViewer.snapshotFrame('Scroll into view');
   expect(await frame.locator('div').evaluate(div => div.scrollTop)).toBe(136);
 });
 
@@ -521,7 +723,7 @@ test('should restore control values', async ({ page, runAndTrace, asset }) => {
   });
 
   // Render snapshot, check expectations.
-  const frame = await traceViewer.snapshotFrame('page.click');
+  const frame = await traceViewer.snapshotFrame('Click');
 
   const text = frame.locator('[type=text]');
   await expect(text).toHaveAttribute('value', 'old');
@@ -566,7 +768,7 @@ test('should work with meta CSP', async ({ page, runAndTrace, browserName }) =>
   });
 
   // Render snapshot, check expectations.
-  const frame = await traceViewer.snapshotFrame('$eval');
+  const frame = await traceViewer.snapshotFrame('Evaluate');
   // Should render shadow dom with post-processing script.
   await expect(frame.locator('span')).toHaveText('World');
 });
@@ -583,7 +785,7 @@ test('should handle multiple headers', async ({ page, server, runAndTrace, brows
     await page.setContent(`<head><link rel=stylesheet href="/foo.css"></head><body><div>Hello</div></body>`);
   });
 
-  const frame = await traceViewer.snapshotFrame('setContent');
+  const frame = await traceViewer.snapshotFrame('Set content');
   await frame.locator('div').waitFor();
   await expect(frame.locator('body')).toHaveCSS('padding-left', '42px');
 });
@@ -606,7 +808,7 @@ test('should handle src=blob', async ({ page, server, runAndTrace, browserName }
     });
   });
 
-  const frame = await traceViewer.snapshotFrame('page.evaluate');
+  const frame = await traceViewer.snapshotFrame('Evaluate');
   const size = await frame.locator('img').evaluate(e => (e as HTMLImageElement).naturalWidth);
   expect(size).toBe(10);
 });
@@ -618,7 +820,7 @@ test('should handle file URIs', async ({ page, runAndTrace, browserName }) => {
     await page.goto(pathToFileURL(path.join(__dirname, '..', 'assets', 'one-style.html')).href);
   });
 
-  const frame = await traceViewer.snapshotFrame('goto');
+  const frame = await traceViewer.snapshotFrame('Navigate');
   await expect(frame.locator('body')).toHaveCSS('background-color', 'rgb(255, 192, 203)');
 });
 
@@ -639,7 +841,7 @@ test('should preserve currentSrc', async ({ browser, server, showTraceViewer })
   await page.close();
 
   const traceViewer = await showTraceViewer([traceFile]);
-  const frame = await traceViewer.snapshotFrame('page.setContent');
+  const frame = await traceViewer.snapshotFrame('Set content');
   await expect(frame.locator('#target1')).toHaveAttribute('src', server.PREFIX + '/digits/3.png');
   await expect(frame.locator('#target2')).toHaveAttribute('src', server.PREFIX + '/digits/6.png');
 });
@@ -669,7 +871,7 @@ test('should register custom elements', async ({ page, server, runAndTrace }) =>
     `);
   });
 
-  const frame = await traceViewer.snapshotFrame('page.setContent');
+  const frame = await traceViewer.snapshotFrame('Set content');
   await expect(frame.getByText('worldhello')).toBeVisible();
 });
 
@@ -678,7 +880,7 @@ test('should highlight target elements', async ({ page, runAndTrace, browserName
     await page.setContent(`
       <div>t1</div>
       <div>t2</div>
-      <div>t3</div>
+      <div id=div3>t3</div>
       <div>t4</div>
       <div>t5</div>
       <div>t6</div>
@@ -693,6 +895,13 @@ test('should highlight target elements', async ({ page, runAndTrace, browserName
     await expect(page.locator('text=t6')).toHaveText(/t6/i);
     await expect(page.locator('text=multi')).toHaveText(['a', 'b'], { timeout: 1000 }).catch(() => {});
     await page.mouse.move(123, 234);
+    await page.getByText(/^t\d$/).click().catch(() => {});
+    await expect(page.getByText(/t3|t4/)).toBeVisible().catch(() => {});
+
+    const expectPromise = expect(page.getByText(/t3|t4/)).toHaveText(['t4']);
+    await page.waitForTimeout(1000);
+    await page.evaluate(() => document.querySelector('#div3').textContent = 'changed');
+    await expectPromise;
   });
 
   async function highlightedDivs(frameLocator: FrameLocator) {
@@ -702,7 +911,9 @@ test('should highlight target elements', async ({ page, runAndTrace, browserName
     });
   }
 
-  const framePageClick = await traceViewer.snapshotFrame('page.click');
+  await traceViewer.showAllActions();
+
+  const framePageClick = await traceViewer.snapshotFrame('Click');
   await expect.poll(() => highlightedDivs(framePageClick)).toEqual(['t1']);
   const box1 = await framePageClick.getByText('t1').boundingBox();
   const box2 = await framePageClick.locator('x-pw-pointer').boundingBox();
@@ -713,27 +924,36 @@ test('should highlight target elements', async ({ page, runAndTrace, browserName
   expect(Math.abs(x1 - x2) < 2).toBeTruthy();
   expect(Math.abs(y1 - y2) < 2).toBeTruthy();
 
-  const framePageInnerText = await traceViewer.snapshotFrame('page.innerText');
+  const framePageInnerText = await traceViewer.snapshotFrame('Inner text');
   await expect.poll(() => highlightedDivs(framePageInnerText)).toEqual(['t2']);
 
-  const frameHandleClick = await traceViewer.snapshotFrame('elementHandle.click');
+  const frameHandleClick = await traceViewer.snapshotFrame('Click', 1);
   await expect.poll(() => highlightedDivs(frameHandleClick)).toEqual(['t3']);
 
-  const frameHandleInnerText = await traceViewer.snapshotFrame('elementHandle.innerText');
+  const frameHandleInnerText = await traceViewer.snapshotFrame('Inner text', 1);
   await expect.poll(() => highlightedDivs(frameHandleInnerText)).toEqual(['t4']);
 
-  const frameLocatorInnerText = await traceViewer.snapshotFrame('locator.innerText');
+  const frameLocatorInnerText = await traceViewer.snapshotFrame('Inner text', 2);
   await expect.poll(() => highlightedDivs(frameLocatorInnerText)).toEqual(['t5']);
 
-  const frameExpect1 = await traceViewer.snapshotFrame('expect.toHaveText', 0);
+  const frameExpect1 = await traceViewer.snapshotFrame('Expect', 0);
   await expect.poll(() => highlightedDivs(frameExpect1)).toEqual(['t6']);
 
-  const frameExpect2 = await traceViewer.snapshotFrame('expect.toHaveText', 1);
+  const frameExpect2 = await traceViewer.snapshotFrame('Expect', 1);
   await expect.poll(() => highlightedDivs(frameExpect2)).toEqual(['multi', 'multi']);
   await expect(frameExpect2.locator('x-pw-pointer')).not.toBeVisible();
 
-  const frameMouseMove = await traceViewer.snapshotFrame('mouse.move');
+  const frameMouseMove = await traceViewer.snapshotFrame('Mouse move');
   await expect(frameMouseMove.locator('x-pw-pointer')).toBeVisible();
+
+  const frameClickStrictViolation = await traceViewer.snapshotFrame('Click', 2);
+  await expect.poll(() => highlightedDivs(frameClickStrictViolation)).toEqual(['t1', 't2', 't3', 't4', 't5', 't6']);
+
+  const frameExpectStrictViolation = await traceViewer.snapshotFrame('Expect', 2);
+  await expect.poll(() => highlightedDivs(frameExpectStrictViolation)).toEqual(['t3', 't4']);
+
+  const frameUpdatedListOfTargets = await traceViewer.snapshotFrame('Expect', 3);
+  await expect.poll(() => highlightedDivs(frameUpdatedListOfTargets)).toEqual(['t4']);
 });
 
 test('should highlight target element in shadow dom', async ({ page, server, runAndTrace }) => {
@@ -743,10 +963,10 @@ test('should highlight target element in shadow dom', async ({ page, server, run
     await expect(page.locator('h1')).toHaveText('Hellow Shadow DOM v1');
   });
 
-  const framePageClick = await traceViewer.snapshotFrame('locator.click');
+  const framePageClick = await traceViewer.snapshotFrame('Click');
   await expect(framePageClick.locator('button')).toHaveCSS('background-color', 'rgba(111, 168, 220, 0.498)');
 
-  const frameExpect = await traceViewer.snapshotFrame('expect.toHaveText');
+  const frameExpect = await traceViewer.snapshotFrame('Expect');
   await expect(frameExpect.locator('h1')).toHaveCSS('background-color', 'rgba(111, 168, 220, 0.498)');
 });
 
@@ -760,19 +980,21 @@ test('should highlight expect failure', async ({ page, server, runAndTrace }) =>
     }
   });
 
-  await expect(traceViewer.actionTitles.getByText('expect.toHaveTitle')).toHaveCSS('color', 'rgb(176, 16, 17)');
+  await expect(traceViewer.actionTitles.getByText('EXPECT')).toHaveCSS('color', 'rgb(176, 16, 17)');
   await traceViewer.showErrorsTab();
   await expect(traceViewer.errorMessages.nth(0)).toHaveText('Expect failed');
 });
 
 test('should show action source', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('locator.click');
-  const page = traceViewer.page;
+  await traceViewer.selectAction('Click');
+
+  await traceViewer.showSourceTab();
+  await expect(traceViewer.page.locator('.source-line-running')).toContainText('await page.getByText(\'Click\').click()');
+  await expect(traceViewer.stackFrames({ selected: true })).toHaveText(/doClick.*trace-viewer\.spec\.ts:[\d]+/);
 
-  await page.click('text=Source');
-  await expect(page.locator('.source-line-running')).toContainText('await page.getByText(\'Click\').click()');
-  await expect(page.getByTestId('stack-trace-list').locator('.list-view-entry.selected')).toHaveText(/doClick.*trace-viewer\.spec\.ts:[\d]+/);
+  await traceViewer.hoverAction('Wait for navigation');
+  await expect(traceViewer.page.locator('.source-line-running')).toContainText('page.waitForNavigation()');
 });
 
 test('should follow redirects', async ({ page, runAndTrace, server, asset }) => {
@@ -797,14 +1019,14 @@ test('should follow redirects', async ({ page, runAndTrace, server, asset }) =>
     await page.goto(server.EMPTY_PAGE);
     expect(await page.evaluate(() => (window as any).img.naturalWidth)).toBe(10);
   });
-  const snapshotFrame = await traceViewer.snapshotFrame('page.evaluate');
+  const snapshotFrame = await traceViewer.snapshotFrame('Evaluate');
   await expect(snapshotFrame.locator('img')).toHaveJSProperty('naturalWidth', 10);
 });
 
 test('should include metainfo', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.page.locator('text=Metadata').click();
-  const callLine = traceViewer.page.locator('.metadata-view .call-line');
+  await traceViewer.page.getByRole('tab', { name: 'Metadata' }).click();
+  const callLine = traceViewer.metadataTab.locator('.call-line');
   await expect(callLine.getByText('start time')).toHaveText(/start time:[\d/,: ]+/);
   await expect(callLine.getByText('duration')).toHaveText(/duration:[\dms]+/);
   await expect(callLine.getByText('engine')).toHaveText(/engine:[\w]+/);
@@ -839,21 +1061,21 @@ test('should open two trace files', async ({ context, page, request, server, sho
   await (request as any)._tracing.stop({ path: apiTrace });
   await context.tracing.stop({ path: contextTrace });
 
-
   const traceViewer = await showTraceViewer([contextTrace, apiTrace]);
-  await traceViewer.selectAction('apiRequestContext.head');
-  await traceViewer.selectAction('apiRequestContext.get');
-  await traceViewer.selectAction('apiRequestContext.post');
+
+  await traceViewer.selectAction('GET');
+  await traceViewer.selectAction('HEAD');
+  await traceViewer.selectAction('POST');
   await expect(traceViewer.actionTitles).toHaveText([
-    `apiRequestContext.get/simple.json`,
-    `page.gotohttp://localhost:${server.PORT}/input/button.html`,
-    `apiRequestContext.head/simplezip.json`,
-    `locator.clicklocator('button')`,
-    `locator.clicklocator('button')`,
-    `apiRequestContext.post/one-style.css`,
+    /GET "\/simple\.json"/,
+    /Navigate to "\/input\/button\.html"/,
+    /HEAD "\/simplezip\.json"/,
+    /Click.*locator\('button'\)/,
+    /Click.*locator\('button'\)/,
+    /POST "\/one-style\.css"/,
   ]);
 
-  await traceViewer.page.locator('text=Metadata').click();
+  await traceViewer.page.getByRole('tab', { name: 'Metadata' }).click();
   const callLine = traceViewer.page.locator('.call-line');
   // Should get metadata from the context trace
   await expect(callLine.getByText('start time')).toHaveText(/start time:[\d/,: ]+/);
@@ -868,43 +1090,21 @@ test('should open two trace files', async ({ context, page, request, server, sho
   await expect(callLine.getByText('events')).toHaveText(/events:[\d]+/);
 });
 
-test('should open two trace files of the same test', async ({ context, page, request, server, showTraceViewer, asset }, testInfo) => {
+test('should open two trace files of the same test (v6)', async ({ showTraceViewer, asset }) => {
   const traceViewer = await showTraceViewer([asset('test-trace1.zip'), asset('test-trace2.zip')]);
   // Same actions from different test runs should not be merged.
   await expect(traceViewer.actionTitles).toHaveText([
-    'Before Hooks',
-    'Before Hooks',
-    'page.gotohttps://playwright.dev/',
-    'page.gotohttps://playwright.dev/',
-    'expect.toBe',
-    'After Hooks',
-    'expect.toBe',
-    'After Hooks',
+    /Before Hooks/,
+    /Before Hooks/,
+    /page.goto/, // Legacy trace does not have titles
+    /page.goto/, // Legacy trace does not have titles
+    /expect.toBe/,
+    /After Hooks/,
+    /expect.toBe/,
+    /After Hooks/,
   ]);
 });
 
-test('should include requestUrl in route.fulfill', async ({ page, runAndTrace, browserName }) => {
-  await page.route('**/*', route => {
-    void route.fulfill({
-      status: 200,
-      headers: {
-        'content-type': 'text/html'
-      },
-      body: 'Hello there!'
-    });
-  });
-  const traceViewer = await runAndTrace(async () => {
-    await page.goto('http://test.com');
-  });
-
-  // Render snapshot, check expectations.
-  await traceViewer.selectAction('route.fulfill');
-  await traceViewer.page.locator('.tabbed-pane-tab-label', { hasText: 'Call' }).click();
-  const callLine = traceViewer.page.locator('.call-line');
-  await expect(callLine.getByText('status')).toContainText('200');
-  await expect(callLine.getByText('requestUrl')).toContainText('http://test.com');
-});
-
 test('should not crash with broken locator', async ({ page, runAndTrace, server }) => {
   test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/21832' });
   const traceViewer = await runAndTrace(async () => {
@@ -918,37 +1118,6 @@ test('should not crash with broken locator', async ({ page, runAndTrace, server
   await expect(header).toBeVisible();
 });
 
-test('should include requestUrl in route.continue', async ({ page, runAndTrace, server }) => {
-  await page.route('**/*', route => {
-    void route.continue({ url: server.EMPTY_PAGE });
-  });
-  const traceViewer = await runAndTrace(async () => {
-    await page.goto('http://test.com');
-  });
-
-  // Render snapshot, check expectations.
-  await traceViewer.selectAction('route.continue');
-  await traceViewer.page.locator('.tabbed-pane-tab-label', { hasText: 'Call' }).click();
-  const callLine = traceViewer.page.locator('.call-line');
-  await expect(callLine.getByText('requestUrl')).toContainText('http://test.com');
-  await expect(callLine.getByText(/^url:.*/)).toContainText(server.EMPTY_PAGE);
-});
-
-test('should include requestUrl in route.abort', async ({ page, runAndTrace, server }) => {
-  await page.route('**/*', route => {
-    void route.abort();
-  });
-  const traceViewer = await runAndTrace(async () => {
-    await page.goto('http://test.com').catch(() => {});
-  });
-
-  // Render snapshot, check expectations.
-  await traceViewer.selectAction('route.abort');
-  await traceViewer.page.locator('.tabbed-pane-tab-label', { hasText: 'Call' }).click();
-  const callLine = traceViewer.page.locator('.call-line');
-  await expect(callLine.getByText('requestUrl')).toContainText('http://test.com');
-});
-
 test('should serve overridden request', async ({ page, runAndTrace, server }) => {
   server.setRoute('/custom.css', (req, res) => {
     res.writeHead(200, {
@@ -965,7 +1134,7 @@ test('should serve overridden request', async ({ page, runAndTrace, server }) =>
     await page.goto(server.PREFIX + '/one-style.html');
   });
   // Render snapshot, check expectations.
-  const snapshotFrame = await traceViewer.snapshotFrame('page.goto');
+  const snapshotFrame = await traceViewer.snapshotFrame('Navigate');
   await expect(snapshotFrame.locator('body')).toHaveCSS('background-color', 'rgb(255, 0, 0)');
 });
 
@@ -976,9 +1145,9 @@ test('should display waitForLoadState even if did not wait for it', async ({ run
     await page.waitForLoadState('load');
   });
   await expect(traceViewer.actionTitles).toHaveText([
-    /page.goto/,
-    /page.waitForLoadState/,
-    /page.waitForLoadState/,
+    /Navigate/,
+    /Wait for load state "load"/,
+    /Wait for load state "load"/,
   ]);
 });
 
@@ -989,8 +1158,8 @@ test('should display language-specific locators', async ({ runAndTrace, server,
     await page.getByRole('button', { name: 'Submit' }).click();
   });
   await expect(traceViewer.actionTitles).toHaveText([
-    /page.setContent/,
-    /locator.clickget_by_role\("button", name="Submit"\)/,
+    /Set content/,
+    /Click.*get_by_role\("button", name="Submit"\)/,
   ]);
   toImpl(page).attribution.playwright.options.sdkLanguage = 'javascript';
 });
@@ -1000,27 +1169,49 @@ test('should pick locator', async ({ page, runAndTrace, server }) => {
     await page.goto(server.EMPTY_PAGE);
     await page.setContent('<button>Submit</button>');
   });
-  const snapshot = await traceViewer.snapshotFrame('page.setContent');
+  const snapshot = await traceViewer.snapshotFrame('Set content');
   await traceViewer.page.getByTitle('Pick locator').click();
   await snapshot.locator('button').click();
-  await expect(traceViewer.page.locator('.cm-wrapper')).toContainText(`getByRole('button', { name: 'Submit' })`);
+  await expect(traceViewer.page.locator('.cm-wrapper').first()).toContainText(`getByRole('button', { name: 'Submit' })`);
+  await expect(traceViewer.page.locator('.cm-wrapper').last()).toContainText(`- button "Submit"`);
 });
 
-test('should update highlight when typing', async ({ page, runAndTrace, server }) => {
+test('should update highlight when typing locator', async ({ page, runAndTrace, server }) => {
   const traceViewer = await runAndTrace(async () => {
     await page.goto(server.EMPTY_PAGE);
     await page.setContent('<button>Submit</button>');
   });
-  const snapshot = await traceViewer.snapshotFrame('page.setContent');
+  const snapshot = await traceViewer.snapshotFrame('Set content');
   await traceViewer.page.getByText('Locator').click();
-  await traceViewer.page.locator('.CodeMirror').click();
+  await traceViewer.page.locator('.CodeMirror').first().click();
   await traceViewer.page.keyboard.type('button');
-  await expect(snapshot.locator('x-pw-glass')).toBeVisible();
+
+  const buttonBox = roundBox(await snapshot.locator('button').boundingBox());
+  await expect(snapshot.locator('x-pw-highlight')).toBeVisible();
+  await expect.poll(async () => {
+    return roundBox(await snapshot.locator('x-pw-highlight').boundingBox());
+  }).toEqual(buttonBox);
+});
+
+test('should update highlight when typing snapshot', async ({ page, runAndTrace, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(server.EMPTY_PAGE);
+    await page.setContent('<button>Submit</button>');
+  });
+  const snapshot = await traceViewer.snapshotFrame('Set content');
+  await traceViewer.page.getByText('Locator').click();
+  await traceViewer.page.locator('.CodeMirror').last().click();
+  await traceViewer.page.keyboard.type('- button');
+  const buttonBox = roundBox(await snapshot.locator('button').boundingBox());
+  await expect(snapshot.locator('x-pw-highlight')).toBeVisible();
+  await expect.poll(async () => {
+    return roundBox(await snapshot.locator('x-pw-highlight').boundingBox());
+  }).toEqual(buttonBox);
 });
 
 test('should open trace-1.31', async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([path.join(__dirname, '../assets/trace-1.31.zip')]);
-  const snapshot = await traceViewer.snapshotFrame('locator.click');
+  const snapshot = await traceViewer.snapshotFrame('Click');
   await expect(snapshot.locator('[__playwright_target__]')).toHaveText(['Submit']);
 });
 
@@ -1082,9 +1273,9 @@ test('should prefer later resource request with the same method', async ({ page,
     await headRequest;
     await page.locator('div').click();
   });
-  const frame1 = await traceViewer.snapshotFrame('page.goto');
+  const frame1 = await traceViewer.snapshotFrame('Navigate');
   await expect(frame1.locator('body')).toHaveCSS('background-color', 'rgb(123, 123, 123)');
-  const frame2 = await traceViewer.snapshotFrame('locator.click');
+  const frame2 = await traceViewer.snapshotFrame('Click');
   await expect(frame2.locator('body')).toHaveCSS('background-color', 'rgb(123, 123, 123)');
 });
 
@@ -1121,7 +1312,7 @@ test('should ignore 304 responses', async ({ page, server, runAndTrace }) => {
     await page.waitForTimeout(1000);
     await page.locator('div').click();
   });
-  const frame = await traceViewer.snapshotFrame('locator.click');
+  const frame = await traceViewer.snapshotFrame('Click');
   await expect(frame.locator('body')).toHaveCSS('background-color', 'rgb(123, 123, 123)');
 });
 
@@ -1146,21 +1337,21 @@ test('should pick locator in iframe', async ({ page, runAndTrace, server }) => {
     await page.evaluate('2+2');
   });
   await traceViewer.page.getByTitle('Pick locator').click();
-  const cmWrapper = traceViewer.page.locator('.cm-wrapper');
+  const cmWrapper = traceViewer.page.locator('.cm-wrapper').first();
 
-  const snapshot = await traceViewer.snapshotFrame('page.evaluate');
+  const snapshot = await traceViewer.snapshotFrame('Evaluate');
 
   await snapshot.frameLocator('#frame1').getByText('Hello1').click();
-  await expect.soft(cmWrapper).toContainText(`frameLocator('#frame1').getByText('Hello1')`);
+  await expect.soft(cmWrapper).toContainText(`locator('#frame1').contentFrame().getByText('Hello1')`);
 
   await snapshot.frameLocator('#frame1').frameLocator('iframe').getByText('Hello2').click();
-  await expect.soft(cmWrapper).toContainText(`frameLocator('#frame1').frameLocator('iframe').getByText('Hello2')`, { timeout: 0 });
+  await expect.soft(cmWrapper).toContainText(`locator('#frame1').contentFrame().locator('iframe').contentFrame().getByText('Hello2')`, { timeout: 0 });
 
   await snapshot.frameLocator('#frame1').frameLocator('iframe').frameLocator('[name=one]').getByText('HelloNameOne').click();
-  await expect.soft(cmWrapper).toContainText(`frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe[name="one"]').getByText('HelloNameOne')`, { timeout: 0 });
+  await expect.soft(cmWrapper).toContainText(`locator('#frame1').contentFrame().locator('iframe').contentFrame().locator('iframe[name="one"]').contentFrame().getByText('HelloNameOne')`, { timeout: 0 });
 
   await snapshot.frameLocator('#frame1').frameLocator('iframe').frameLocator('[name=two]').getByText('HelloNameTwo').click();
-  await expect.soft(cmWrapper).toContainText(`frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe[name="two"]').getByText('HelloNameTwo')`, { timeout: 0 });
+  await expect.soft(cmWrapper).toContainText(`locator('#frame1').contentFrame().locator('iframe').contentFrame().locator('iframe[name="two"]').contentFrame().getByText('HelloNameTwo')`, { timeout: 0 });
 });
 
 test('should highlight locator in iframe while typing', async ({ page, runAndTrace, server, platform }) => {
@@ -1184,20 +1375,20 @@ test('should highlight locator in iframe while typing', async ({ page, runAndTra
     await page.evaluate('2+2');
   });
 
-  const snapshot = await traceViewer.snapshotFrame('page.evaluate');
+  const snapshot = await traceViewer.snapshotFrame('Evaluate');
   await traceViewer.page.getByText('Locator').click();
-  await traceViewer.page.locator('.CodeMirror').click();
+  await traceViewer.page.locator('.CodeMirror').first().click();
 
   const locators = [{
-    text: `frameLocator('#frame1').getByText('Hello1')`,
+    text: `locator('#frame1').contentFrame().getByText('Hello1')`,
     element: snapshot.frameLocator('#frame1').locator('div', { hasText: 'Hello1' }),
     highlight: snapshot.frameLocator('#frame1').locator('x-pw-highlight'),
   }, {
-    text: `frameLocator('#frame1').frameLocator('iframe').getByText('Hello2')`,
+    text: `locator('#frame1').contentFrame().locator('iframe').contentFrame().getByText('Hello2')`,
     element: snapshot.frameLocator('#frame1').frameLocator('iframe').locator('div', { hasText: 'Hello2' }),
     highlight: snapshot.frameLocator('#frame1').frameLocator('iframe').locator('x-pw-highlight'),
   }, {
-    text: `frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe[name="one"]').getByText('HelloNameOne')`,
+    text: `locator('#frame1').contentFrame().locator('iframe').contentFrame().locator('iframe[name="one"]').contentFrame().getByText('HelloNameOne')`,
     element: snapshot.frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe[name="one"]').locator('div', { hasText: 'HelloNameOne' }),
     highlight: snapshot.frameLocator('#frame1').frameLocator('iframe').frameLocator('iframe[name="one"]').locator('x-pw-highlight'),
   }];
@@ -1232,7 +1423,7 @@ test('should preserve noscript when javascript is disabled', async ({ browser, s
   await page.close();
 
   const traceViewer = await showTraceViewer([traceFile]);
-  const frame = await traceViewer.snapshotFrame('page.setContent');
+  const frame = await traceViewer.snapshotFrame('Set content');
   await expect(frame.getByText('javascript is disabled!')).toBeVisible();
 });
 
@@ -1249,7 +1440,7 @@ test('should remove noscript by default', async ({ browser, server, showTraceVie
   await page.close();
 
   const traceViewer = await showTraceViewer([traceFile]);
-  const frame = await traceViewer.snapshotFrame('page.setContent');
+  const frame = await traceViewer.snapshotFrame('Set content');
   await expect(frame.getByText('Always visible')).toBeVisible();
   await expect(frame.getByText('Enable JavaScript to run this app.')).toBeHidden();
 });
@@ -1267,7 +1458,7 @@ test('should remove noscript when javaScriptEnabled is set to true', async ({ br
   await page.close();
 
   const traceViewer = await showTraceViewer([traceFile]);
-  const frame = await traceViewer.snapshotFrame('page.setContent');
+  const frame = await traceViewer.snapshotFrame('Set content');
   await expect(frame.getByText('Always visible')).toBeVisible();
   await expect(frame.getByText('Enable JavaScript to run this app.')).toBeHidden();
 });
@@ -1277,7 +1468,7 @@ test('should open snapshot in new browser context', async ({ browser, page, runA
     await page.goto(server.EMPTY_PAGE);
     await page.setContent('hello');
   });
-  await traceViewer.snapshotFrame('page.setContent');
+  await traceViewer.snapshotFrame('Set content');
   const popupPromise = traceViewer.page.context().waitForEvent('page');
   await traceViewer.page.getByTitle('Open snapshot in a new tab').click();
   const popup = await popupPromise;
@@ -1289,14 +1480,15 @@ test('should open snapshot in new browser context', async ({ browser, page, runA
   await newPage.close();
 });
 
-test('should show similar actions from library-only trace', async ({ showTraceViewer, asset }) => {
+test('should show similar actions from legacy library-only trace', async ({ showTraceViewer, asset }) => {
   const traceViewer = await showTraceViewer([asset('trace-library-1.46.zip')]);
+  await traceViewer.showAllActions();
   await expect(traceViewer.actionTitles).toHaveText([
-    /page.setContent/,
-    /locator.getAttributelocator\('div'\)/,
-    /locator.isVisiblelocator\('div'\)/,
-    /locator.getAttributelocator\('div'\)/,
-    /locator.isVisiblelocator\('div'\)/,
+    /page\.setContent/,
+    /locator\.getAttribute/,
+    /locator\.isVisible.*locator\('div'\)/,
+    /locator\.getAttribute/,
+    /locator\.isVisible.*locator\('div'\)/,
   ]);
 });
 
@@ -1325,7 +1517,7 @@ test('should show correct request start time', {
       return fetch('/api').then(r => r.text());
     });
   });
-  await traceViewer.selectAction('page.evaluate');
+  await traceViewer.selectAction('Evaluate');
   await traceViewer.showNetworkTab();
   await expect(traceViewer.networkRequests).toContainText([/apiGET200text/]);
   const line = traceViewer.networkRequests.getByText(/apiGET200text/);
@@ -1335,7 +1527,7 @@ test('should show correct request start time', {
   expect(parseMillis(start)).toBeLessThan(1000);
 });
 
-test('should allow hiding route actions', {
+test('should not record route actions', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30970' },
 }, async ({ page, runAndTrace, server }) => {
   const traceViewer = await runAndTrace(async () => {
@@ -1345,29 +1537,30 @@ test('should allow hiding route actions', {
     await page.goto(server.EMPTY_PAGE);
   });
 
-  // Routes are visible by default.
   await expect(traceViewer.actionTitles).toHaveText([
-    /page.route/,
-    /page.goto.*empty.html/,
-    /route.fulfill/,
+    /Navigate to "\/empty.html"/,
   ]);
+});
 
-  await traceViewer.page.getByText('Settings').click();
-  await expect(traceViewer.page.getByRole('checkbox', { name: 'Show route actions' })).toBeChecked();
-  await traceViewer.page.getByRole('checkbox', { name: 'Show route actions' }).uncheck();
-  await traceViewer.page.getByText('Actions', { exact: true }).click();
-  await expect(traceViewer.actionTitles).toHaveText([
-    /page.route/,
-    /page.goto.*empty.html/,
-  ]);
+test('should not record network actions', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33558' },
+}, async ({ page, runAndTrace, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    let counter = 0;
+    page.on('request', async request => {
+      await request.allHeaders();
+      ++counter;
+    });
+    page.on('response', async response => {
+      await response.text();
+      ++counter;
+    });
+    await page.goto(server.EMPTY_PAGE);
+    await expect.poll(() => counter).toBe(2);
+  });
 
-  await traceViewer.page.getByText('Settings').click();
-  await traceViewer.page.getByRole('checkbox', { name: 'Show route actions' }).check();
-  await traceViewer.page.getByText('Actions', { exact: true }).click();
   await expect(traceViewer.actionTitles).toHaveText([
-    /page.route/,
-    /page.goto.*empty.html/,
-    /route.fulfill/,
+    /Navigate.*empty.html/,
   ]);
 });
 
@@ -1375,7 +1568,414 @@ test('should show baseURL in metadata pane', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31847' },
 }, async ({ showTraceViewer }) => {
   const traceViewer = await showTraceViewer([traceFile]);
-  await traceViewer.selectAction('page.evaluate');
+  await traceViewer.selectAction('Evaluate');
   await traceViewer.showMetadataTab();
   await expect(traceViewer.metadataTab).toContainText('baseURL:https://example.com');
 });
+
+test('should not leak recorders', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33086' },
+}, async ({ showTraceViewer, platform }) => {
+  const traceViewer = await showTraceViewer([traceFile]);
+
+  const aliveCount = async () => {
+    return await traceViewer.page.evaluate(() => {
+      const weakSet = (window as any)._weakRecordersForTest || new Set();
+      const weakList = [...weakSet];
+      const aliveList = weakList.filter(r => !!r.deref());
+      return aliveList.length;
+    });
+  };
+
+  await traceViewer.page.getByRole('tab', { name: 'Locator' }).click();
+
+  const forceRecorder = async (action: string) => {
+    const frame = await traceViewer.snapshotFrame(action);
+
+    await test.step(`highlighting "body" in "${action}"`, async () => {
+      await traceViewer.page.locator('.CodeMirror').first().click();
+      if (platform === 'darwin')
+        await traceViewer.page.keyboard.press('Meta+a');
+      else
+        await traceViewer.page.keyboard.press('Control+a');
+      await traceViewer.page.keyboard.press('Backspace');
+
+      await expect(frame.locator('x-pw-highlight')).not.toBeVisible();
+      await traceViewer.page.keyboard.type('body');
+      await expect(frame.locator('x-pw-highlight')).toBeVisible();
+    });
+
+    return frame;
+  };
+
+  const frame0 = await traceViewer.snapshotFrame('Set viewport');
+  await expect(frame0.locator('body')).toContainText(`Hi, I'm frame`);
+
+  const frame1 = await forceRecorder('Navigate');
+  await expect(frame1.locator('body')).toContainText('Hello world');
+
+  const frame2 = await forceRecorder('Evaluate');
+  await expect(frame2.locator('button')).toBeVisible();
+
+  await traceViewer.page.requestGC();
+  await expect.poll(() => aliveCount()).toBeLessThanOrEqual(2); // two snapshot iframes
+
+  const frame3 = await forceRecorder('Set viewport size');
+  await expect(frame3.locator('body')).toContainText(`Hi, I'm frame`);
+
+  const frame4 = await forceRecorder('Navigate');
+  await expect(frame4.locator('body')).toContainText('Hello world');
+
+  const frame5 = await forceRecorder('Evaluate');
+  await expect(frame5.locator('button')).toBeVisible();
+
+  await traceViewer.page.requestGC();
+  await expect.poll(() => aliveCount()).toBeLessThanOrEqual(2); // two snapshot iframes
+});
+
+test('should serve css without content-type', async ({ page, runAndTrace, server }) => {
+  server.setRoute('/one-style.css', (req, res) => {
+    res.writeHead(200);
+    res.end(`body { background: red }`);
+  });
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(server.PREFIX + '/one-style.html');
+  });
+  const snapshotFrame = await traceViewer.snapshotFrame('Navigate');
+  await expect(snapshotFrame.locator('body')).toHaveCSS('background-color', 'rgb(255, 0, 0)', { timeout: 0 });
+});
+
+test('canvas disabled title', async ({ runAndTrace, page, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(server.PREFIX + '/screenshots/canvas.html#canvas-on-edge');
+    await rafraf(page, 5);
+  });
+
+  const snapshot = await traceViewer.snapshotFrame('Navigate');
+  await expect(snapshot.locator('canvas')).toHaveAttribute('title', `Canvas content display is disabled.`);
+});
+
+test('canvas clipping', async ({ runAndTrace, page, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(server.PREFIX + '/screenshots/canvas.html#canvas-on-edge');
+    await rafraf(page, 5);
+  });
+
+  // Enable canvas display
+  await traceViewer.showSettings();
+
+  const [msg] = await Promise.all([
+    traceViewer.page.waitForEvent('console', { predicate: msg => msg.text().startsWith('canvas drawn:') }),
+    traceViewer.displayCanvasContentSetting.click(),
+  ]);
+  expect(msg.text()).toEqual('canvas drawn: [0,91,11,20]');
+
+  const snapshot = await traceViewer.snapshotFrame('Navigate');
+  await expect(snapshot.locator('canvas')).toHaveAttribute('title', `Playwright couldn't capture full canvas contents because it's located partially outside the viewport.`);
+});
+
+test('canvas clipping in iframe', async ({ runAndTrace, page, server }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.setContent(`
+      <iframe src="${server.PREFIX}/screenshots/canvas.html#canvas-on-edge"></iframe>
+    `);
+    await page.locator('iframe').contentFrame().locator('canvas').scrollIntoViewIfNeeded();
+    await rafraf(page, 5);
+  });
+
+  // Enable canvas display
+  await traceViewer.showSettings();
+
+  const [msg] = await Promise.all([
+    traceViewer.page.waitForEvent('console', { predicate: msg => msg.text().startsWith('canvas drawn:') }),
+    traceViewer.displayCanvasContentSetting.click(),
+  ]);
+  expect(msg.text()).toEqual('canvas drawn: [1,1,11,20]');
+
+  const snapshot = await traceViewer.snapshotFrame('Evaluate');
+  const canvas = snapshot.locator('iframe').contentFrame().locator('canvas');
+  await expect(canvas).toHaveAttribute('title', 'Canvas contents are displayed on a best-effort basis based on viewport screenshots taken during test execution.');
+});
+
+test('should show only one pointer with multilevel iframes', async ({ page, runAndTrace, server, browserName }) => {
+  test.fixme(browserName === 'firefox', 'Elements in iframe are not marked');
+
+  server.setRoute('/level-0.html', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(`<iframe src="/level-1.html" style="position: absolute; left: 100px"></iframe>`);
+  });
+  server.setRoute('/level-1.html', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(`<iframe src="/level-2.html"></iframe>`);
+  });
+  server.setRoute('/level-2.html', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(`<button>Click me</button>`);
+  });
+
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(server.PREFIX + '/level-0.html');
+    await page.frameLocator('iframe').frameLocator('iframe').locator('button').click({ position: { x: 5, y: 5 } });
+  });
+  const snapshotFrame = await traceViewer.snapshotFrame('Click');
+  await expect.soft(snapshotFrame.locator('x-pw-pointer')).not.toBeAttached();
+  await expect.soft(snapshotFrame.frameLocator('iframe').locator('x-pw-pointer')).not.toBeAttached();
+  await expect.soft(snapshotFrame.frameLocator('iframe').frameLocator('iframe').locator('x-pw-pointer')).toBeVisible();
+});
+
+test('should show a popover', async ({ runAndTrace, page, server, platform, browserName, macVersion }) => {
+  test.skip(platform === 'darwin' && macVersion === 13 && browserName === 'webkit', 'WebKit on macOS 13.7 reliably fails on this test for some reason');
+  const traceViewer = await runAndTrace(async () => {
+    await page.setContent(`
+      <button popovertarget="pop">Click me</button>
+      <article id="pop" popover="auto">
+        <div>I'm a popover</div>
+      </article>
+    `);
+    await page.getByRole('button').click();
+    await expect(page.locator('div')).toBeVisible();
+  });
+
+  const snapshot = await traceViewer.snapshotFrame('Expect');
+  const popover = snapshot.locator('#pop');
+  await expect.poll(() => popover.evaluate(e => e.matches(':popover-open'))).toBe(true);
+});
+
+test('should show a modal dialog', async ({ runAndTrace, page, platform, browserName, macVersion }) => {
+  test.skip(platform === 'darwin' && macVersion === 13 && browserName === 'webkit', 'WebKit on macOS 13.7 reliably fails on this test for some reason');
+  const traceViewer = await runAndTrace(async () => {
+    await page.setContent(`
+      <button>Show the dialog</button>
+      <dialog>
+        <p>This is a modal dialog</p>
+      </dialog>
+      <script>
+        document.querySelector('button').addEventListener('click', () => {
+          document.querySelector('dialog').showModal();
+        });
+      </script>
+    `);
+    await page.getByRole('button').click();
+    await expect(page.locator('p')).toBeVisible();
+  });
+
+  const snapshot = await traceViewer.snapshotFrame('Expect');
+  const dialog = snapshot.locator('dialog');
+  await expect.poll(() => dialog.evaluate(e => e.matches(':open'))).toBe(true);
+  await expect.poll(() => dialog.evaluate(e => e.matches(':modal'))).toBe(true);
+});
+
+test('should open settings dialog', async ({ showTraceViewer }) => {
+  const traceViewer = await showTraceViewer([traceFile]);
+  await traceViewer.selectAction('Navigate');
+  await traceViewer.showSettings();
+  await expect(traceViewer.settingsDialog).toBeVisible();
+});
+
+test('should toggle theme color', async ({ showTraceViewer, page }) => {
+  const traceViewer = await showTraceViewer([traceFile]);
+  await traceViewer.selectAction('Navigate');
+  await traceViewer.showSettings();
+
+  await expect(traceViewer.darkModeSetting).toBeChecked({ checked: false });
+
+  await traceViewer.darkModeSetting.click();
+  await expect(traceViewer.darkModeSetting).toBeChecked({ checked: true });
+  await expect(traceViewer.page.locator('.dark-mode')).toBeVisible();
+
+  await traceViewer.darkModeSetting.click();
+  await expect(traceViewer.darkModeSetting).toBeChecked({ checked: false });
+  await expect(traceViewer.page.locator('.light-mode')).toBeVisible();
+});
+
+test('should toggle canvas rendering', async ({ runAndTrace, page }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.goto(`data:text/html,<!DOCTYPE html><body><div>Hello world</div><canvas /></body>`);
+    await page.goto(`data:text/html,<!DOCTYPE html><body><div>Hello world</div></body>`);
+  });
+
+  let snapshotRequestPromise = traceViewer.page.waitForRequest(request => request.url().includes('/snapshot/'));
+
+  // Click on the action with a canvas snapshot
+  await traceViewer.selectAction('Navigate', 0);
+
+  let snapshotRequest = await snapshotRequestPromise;
+
+  expect(snapshotRequest.url()).not.toContain('shouldPopulateCanvasFromScreenshot');
+
+  await traceViewer.showSettings();
+
+  await expect(traceViewer.displayCanvasContentSetting).toBeChecked({ checked: false });
+  await traceViewer.displayCanvasContentSetting.click();
+  await expect(traceViewer.displayCanvasContentSetting).toBeChecked({ checked: true });
+
+  // Deselect canvas
+  await traceViewer.selectAction('Navigate', 1);
+
+  snapshotRequestPromise = traceViewer.page.waitForRequest(request => request.url().includes('/snapshot/'));
+
+  // Select canvas again
+  await traceViewer.selectAction('Navigate', 0);
+
+  snapshotRequest = await snapshotRequestPromise;
+
+  expect(snapshotRequest.url()).toContain('shouldPopulateCanvasFromScreenshot');
+});
+
+test('should render blob trace received from message', async ({ showTraceViewer }) => {
+  const traceViewer = await showTraceViewer([], { host: 'localhost' });
+
+  await expect(traceViewer.page.locator('.drop-target')).toBeVisible();
+  await expect(traceViewer.actionTitles).not.toBeVisible();
+
+  await traceViewer.page.evaluate(trace => {
+    const uint8Array = Uint8Array.from(atob(trace), c => c.charCodeAt(0));
+
+    window.postMessage({
+      method: 'load',
+      params: {
+        trace: new Blob([uint8Array], { type: 'application/zip' }),
+      }
+    }, '*');
+  }, fs.readFileSync(traceFile, 'base64'));
+
+  await expect(traceViewer.page.locator('.drop-target')).not.toBeVisible();
+  await expect(traceViewer.actionTitles).toHaveText([
+    /Create page/,
+    /Navigate to "data:"/,
+    /toHaveTitle/,
+    /toHaveURL/,
+    /Set content/,
+    /toHaveText.*locator/,
+    /toBeHidden.*getByTestId/,
+    /toBeHidden.*getByTestId/,
+    /Evaluate/,
+    /Evaluate/,
+    /Click.*getByText\('Click'\)/,
+    /Wait for navigation/,
+    /Wait for event "response"/,
+    /Wait for timeout/,
+    /Navigate to "\/frames\/frame.html"/,
+    /Set viewport size/,
+    /Hover/,
+    /Close page/,
+  ]);
+});
+
+test("shouldn't render not-blob trace received from message", async ({ showTraceViewer }) => {
+  const traceViewer = await showTraceViewer([], { host: 'localhost' });
+
+  await expect(traceViewer.page.locator('.drop-target')).toBeVisible();
+  await expect(traceViewer.actionTitles).not.toBeVisible();
+
+  await traceViewer.page.evaluate(trace => {
+    window.postMessage({
+      method: 'load',
+      params: {
+        trace,
+      }
+    }, '*');
+  }, fs.readFileSync(traceFile, 'base64'));
+
+  await expect(traceViewer.page.locator('.drop-target')).toBeVisible();
+  await expect(traceViewer.actionTitles).not.toBeVisible();
+});
+
+test('should not trip over complex urls in style tags', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35681' },
+}, async ({ runAndTrace, page }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.setContent(`
+      <html>
+        <head>
+          <style>
+          </style>
+        </head>
+        <body>
+          <div>hello</div>
+          <span>world</span>
+        </body>
+      </html>
+    `);
+    const css = `
+      div {
+        background-image: url(   'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.cls-1{fill:none}</style></defs><title>Custom Title</title><polyline class="cls-1" points="1 2 3 4"/></svg>');
+        color: rgb(1, 2, 3);
+      }
+      span {
+        color: rgb(4, 5, 6);
+        background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><defs><style>.cls-1{fill:none}</style></defs><title>Custom Title</title><polyline class='cls-1' points='1 2 3 4'/></svg>" );
+      }
+    `;
+    await page.evaluate(css => document.querySelector('style').textContent = css, css);
+  });
+
+  const snapshot = await traceViewer.snapshotFrame('Evaluate');
+  // Just "hello world", no gibberish from the <style>.
+  await expect(snapshot.locator('body')).toHaveText('hello world');
+  await expect(snapshot.locator('div')).toHaveCSS('color', 'rgb(1, 2, 3)');
+  await expect(snapshot.locator('span')).toHaveCSS('color', 'rgb(4, 5, 6)');
+});
+
+test('should render locator descriptions', async ({ runAndTrace, page }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.setContent('<input type="text" />');
+    await page.locator('input').describe('custom').click();
+    await page.locator('input').describe('custom').first().click();
+  });
+
+  await expect(traceViewer.page.locator('body')).toMatchAriaSnapshot(`
+    - treeitem /Click.*custom/
+    - treeitem /Click.*input.*first/
+  `);
+});
+
+test('should load trace from HTTP with progress indicator', async ({ showTraceViewer, server }) => {
+  const [traceViewer, res] = await Promise.all([
+    showTraceViewer([server.PREFIX]),
+    new Promise<http.ServerResponse>(resolve => {
+      server.setRoute('/', (req, res) => resolve(res));
+    }),
+  ]);
+
+  const file = await fs.promises.readFile(traceFile);
+
+  const dialog = traceViewer.page.locator('dialog', { hasText: 'Loading' });
+
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  res.setHeader('Content-Length', file.byteLength);
+  res.writeHead(200);
+  await expect(dialog).not.toBeVisible({ timeout: 100 });
+  // Should become visible after ~200ms
+  await expect(dialog).toBeVisible();
+
+  res.end(file);
+  await expect(dialog).not.toBeVisible();
+  await expect(traceViewer.actionTitles).toContainText([/Create page/]);
+});
+
+test('should show all actions', async ({ runAndTrace, page }) => {
+  const traceViewer = await runAndTrace(async () => {
+    await page.route('**/*', async route => {
+      await route.fulfill({ contentType: 'text/html', body: '<input type=checkbox checked>' });
+    });
+    await page.goto('https://does.not.exist');
+    await page.locator('input').getAttribute('checked');
+    await expect(page.locator('input')).toBeChecked();
+  });
+
+  await expect(traceViewer.actionTitles).toHaveText([
+    /Navigate to/,
+    /Expect "toBeChecked"/,
+  ]);
+
+  await traceViewer.showAllActions();
+
+  await expect(traceViewer.actionTitles).toHaveText([
+    /Route requests/,
+    /Navigate to/,
+    /Fulfill request/,
+    /Get attribute "checked"/,
+    /Expect "toBeChecked"/,
+  ]);
+});
diff --git a/tests/library/tracing.spec.ts b/tests/library/tracing.spec.ts
index c82db377aac60..b65fa3db1d7da 100644
--- a/tests/library/tracing.spec.ts
+++ b/tests/library/tracing.spec.ts
@@ -22,6 +22,7 @@ import { parseTraceRaw } from '../config/utils';
 import type { StackFrame } from '@protocol/channels';
 import type { ActionTraceEvent } from '../../packages/trace/src/trace';
 import { artifactsFolderName } from '../../packages/playwright/src/isomorphic/folders';
+import { rafraf } from '../page/pageTest';
 
 test.skip(({ trace }) => trace === 'on');
 
@@ -42,16 +43,16 @@ test('should collect trace with resources, but no js', async ({ context, page, s
   const { events, actions } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
   expect(events[0].type).toBe('context-options');
   expect(actions).toEqual([
-    'page.goto',
-    'page.setContent',
-    'page.click',
-    'mouse.move',
-    'mouse.dblclick',
-    'keyboard.insertText',
-    'page.goto',
-    'locator.setInputFiles',
-    'page.waitForTimeout',
-    'page.close',
+    'Navigate to "/frames/frame.html"',
+    'Set content',
+    'Click',
+    'Mouse move',
+    'Double click',
+    'Insert "abc"',
+    'Navigate to "/input/fileupload.html"',
+    'Set input files',
+    'Wait for timeout',
+    'Close page',
   ]);
 
   expect(events.some(e => e.type === 'frame-snapshot')).toBeTruthy();
@@ -64,12 +65,11 @@ test('should collect trace with resources, but no js', async ({ context, page, s
   expect(script.snapshot.response.content._sha1).toBe(undefined);
 });
 
-test('should use the correct apiName for event driven callbacks', async ({ context, page, server }, testInfo) => {
+test('should use the correct title for event driven callbacks', async ({ context, page, server }, testInfo) => {
   await context.tracing.start();
+  // route.* calls should not be included in the trace
   await page.route('**/empty.html', route => route.continue());
-  // page.goto -> page.route should be included in the trace since its handled.
   await page.goto(server.PREFIX + '/empty.html');
-  // page.route -> internalContinue should not be included in the trace since it was handled by Playwright internally.
   await page.goto(server.PREFIX + '/grid.html');
 
   // The default internal dialog handler should not provide an action.
@@ -85,14 +85,14 @@ test('should use the correct apiName for event driven callbacks', async ({ conte
   const { events, actions } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
   expect(events[0].type).toBe('context-options');
   expect(actions).toEqual([
-    'page.route',
-    'page.goto',
-    'route.continue',
-    'page.goto',
-    'page.evaluate',
-    'page.reload',
-    'page.evaluate',
-    'dialog.accept',
+    'Route requests',
+    'Navigate to "/empty.html"',
+    'Continue request',
+    'Navigate to "/grid.html"',
+    'Evaluate',
+    'Reload',
+    'Evaluate',
+    'Accept dialog',
   ]);
 });
 
@@ -109,13 +109,35 @@ test('should not collect snapshots by default', async ({ context, page, server }
   expect(events.some(e => e.type === 'resource-snapshot')).toBeFalsy();
 });
 
+test('can call tracing.group/groupEnd at any time and auto-close', async ({ context, page, server }, testInfo) => {
+  await context.tracing.group('ignored');
+  await context.tracing.groupEnd();
+  await context.tracing.group('ignored2');
+
+  await context.tracing.start();
+  await context.tracing.group('actual');
+  await page.goto(server.EMPTY_PAGE);
+  await context.tracing.stopChunk({ path: testInfo.outputPath('trace.zip') });
+
+  await context.tracing.group('ignored3');
+  await context.tracing.groupEnd();
+  await context.tracing.groupEnd();
+  await context.tracing.groupEnd();
+
+  const { events } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
+  const groups = events.filter(e => e.method === 'tracingGroup');
+  expect(groups).toHaveLength(1);
+  expect(groups[0].title).toBe('actual');
+  expect(events.some(e => e.type === 'after' && e.callId === groups[0].callId)).toBe(true);
+});
+
 test('should not include buffers in the trace', async ({ context, page, server }, testInfo) => {
   await context.tracing.start({ snapshots: true });
   await page.goto(server.PREFIX + '/empty.html');
   await page.screenshot();
   await context.tracing.stop({ path: testInfo.outputPath('trace.zip') });
   const { actionObjects } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
-  const screenshotEvent = actionObjects.find(a => a.apiName === 'page.screenshot');
+  const screenshotEvent = actionObjects.find(a => a.method === 'screenshot');
   expect(screenshotEvent.beforeSnapshot).toBeTruthy();
   expect(screenshotEvent.afterSnapshot).toBeTruthy();
   expect(screenshotEvent.result).toEqual({
@@ -141,13 +163,12 @@ test('should exclude internal pages', async ({ browserName, context, page, serve
   expect(pageIds.size).toBe(1);
 });
 
-test('should include context API requests', async ({ browserName, context, page, server }, testInfo) => {
+test('should include context API requests', async ({ context, page, server }, testInfo) => {
   await context.tracing.start({ snapshots: true });
   await page.request.post(server.PREFIX + '/simple.json', { data: { foo: 'bar' } });
   await context.tracing.stop({ path: testInfo.outputPath('trace.zip') });
-  const { events } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
-  const postEvent = events.find(e => e.apiName === 'apiRequestContext.post');
-  expect(postEvent).toBeTruthy();
+  const { events, actions } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
+  expect(actions).toContain('POST "/simple.json"');
   const harEntry = events.find(e => e.type === 'resource-snapshot');
   expect(harEntry).toBeTruthy();
   expect(harEntry.snapshot.request.url).toBe(server.PREFIX + '/simple.json');
@@ -170,9 +191,9 @@ test('should collect two traces', async ({ context, page, server }, testInfo) =>
     const { events, actions } = await parseTraceRaw(testInfo.outputPath('trace1.zip'));
     expect(events[0].type).toBe('context-options');
     expect(actions).toEqual([
-      'page.goto',
-      'page.setContent',
-      'page.click',
+      'Navigate to "/empty.html"',
+      'Set content',
+      'Click',
     ]);
   }
 
@@ -180,8 +201,8 @@ test('should collect two traces', async ({ context, page, server }, testInfo) =>
     const { events, actions } = await parseTraceRaw(testInfo.outputPath('trace2.zip'));
     expect(events[0].type).toBe('context-options');
     expect(actions).toEqual([
-      'page.dblclick',
-      'page.close',
+      'Double click',
+      'Close page',
     ]);
   }
 });
@@ -216,7 +237,7 @@ test('should respect tracesDir and name', async ({ browserType, server, mode },
 
   {
     const { resources, actions } = await parseTraceRaw(testInfo.outputPath('trace1.zip'));
-    expect(actions).toEqual(['page.goto']);
+    expect(actions).toEqual(['Navigate to "/one-style.html"']);
     expect(resourceNames(resources)).toEqual([
       'resources/XXX.css',
       'resources/XXX.html',
@@ -228,7 +249,7 @@ test('should respect tracesDir and name', async ({ browserType, server, mode },
 
   {
     const { resources, actions } = await parseTraceRaw(testInfo.outputPath('trace2.zip'));
-    expect(actions).toEqual(['page.goto']);
+    expect(actions).toEqual(['Navigate to "/har.html"']);
     expect(resourceNames(resources)).toEqual([
       'resources/XXX.css',
       'resources/XXX.html',
@@ -348,8 +369,8 @@ test('should not crash when browser closes mid-trace', async ({ browserType, ser
 });
 
 test('should survive browser.close with auto-created traces dir', async ({ browserType }, testInfo) => {
-  const oldTracesDir = (browserType as any)._defaultLaunchOptions.tracesDir;
-  (browserType as any)._defaultLaunchOptions.tracesDir = undefined;
+  const oldTracesDir = (browserType as any)._playwright._defaultTracesDir;
+  (browserType as any)._playwright._defaultTracesDir = undefined;
   const browser = await browserType.launch();
   const page = await browser.newPage();
   await page.context().tracing.start();
@@ -374,7 +395,7 @@ test('should survive browser.close with auto-created traces dir', async ({ brows
   ]);
 
   done.value = true;
-  (browserType as any)._defaultLaunchOptions.tracesDir = oldTracesDir;
+  (browserType as any)._playwright._defaultTracesDir = oldTracesDir;
 });
 
 test('should not stall on dialogs', async ({ page, context, server }) => {
@@ -409,9 +430,9 @@ for (const params of [
     height: 768,
   }
 ]) {
-  browserTest(`should produce screencast frames ${params.id}`, async ({ video, contextFactory, browserName, platform, headless }, testInfo) => {
+  browserTest(`should produce screencast frames ${params.id}`, async ({ video, contextFactory, browserName, platform, headless, isHeadlessShell }, testInfo) => {
     browserTest.skip(browserName === 'chromium' && video === 'on', 'Same screencast resolution conflicts');
-    browserTest.fixme(browserName === 'chromium' && (!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW), 'Chromium screencast on headed has a min width issue');
+    browserTest.fixme(browserName === 'chromium' && !isHeadlessShell, 'Chromium (but not headless-shell) screencast has a min width issue');
     browserTest.fixme(params.id === 'fit' && browserName === 'chromium' && platform === 'darwin', 'High DPI maxes image at 600x600');
     browserTest.fixme(params.id === 'fit' && browserName === 'webkit' && platform === 'linux', 'Image size is flaky');
     browserTest.fixme(browserName === 'firefox' && !headless, 'Image size is different');
@@ -424,10 +445,13 @@ for (const params of [
     await context.tracing.start({ screenshots: true, snapshots: true });
     const page = await context.newPage();
     // Make sure we have a chance to paint.
-    for (let i = 0; i < 10; ++i) {
-      await page.setContent('<body style="box-sizing: border-box; width: 100%; height: 100%; margin:0; background: red; border: 50px solid blue"></body>');
-      await page.evaluate(() => new Promise(window.builtinRequestAnimationFrame));
+    for (let i = 0; i < 100; ++i) {
+      const percentage = (i + 1) + '%';
+      await page.setContent(`<body style="box-sizing: border-box; width: 100%; height: 100%; margin:0; background: linear-gradient(to bottom, red ${percentage}, transparent ${percentage}); border: 50px solid blue"></body>`);
+      await rafraf(page);
     }
+    for (let i = 0; i < 10; ++i)
+      await rafraf(page);
     await context.tracing.stop({ path: testInfo.outputPath('trace.zip') });
 
     const { events, resources } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
@@ -463,9 +487,8 @@ test('should include interrupted actions', async ({ context, page, server }, tes
   await context.tracing.stop({ path: testInfo.outputPath('trace.zip') });
   await context.close();
 
-  const { events } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
-  const clickEvent = events.find(e => e.apiName === 'page.click');
-  expect(clickEvent).toBeTruthy();
+  const { actions } = await parseTraceRaw(testInfo.outputPath('trace.zip'));
+  expect(actions).toContain('Click');
 });
 
 test('should throw when starting with different options', async ({ context }) => {
@@ -505,10 +528,10 @@ test('should work with multiple chunks', async ({ context, page, server }, testI
   const trace1 = await parseTraceRaw(testInfo.outputPath('trace.zip'));
   expect(trace1.events[0].type).toBe('context-options');
   expect(trace1.actions).toEqual([
-    'page.setContent',
-    'page.click',
-    'page.click',
-    'page.evaluate',
+    'Set content',
+    'Click',
+    'Click',
+    'Evaluate',
   ]);
   expect(trace1.events.some(e => e.type === 'frame-snapshot')).toBeTruthy();
   expect(trace1.events.some(e => e.type === 'resource-snapshot' && e.snapshot.request.url.endsWith('style.css'))).toBeTruthy();
@@ -516,7 +539,7 @@ test('should work with multiple chunks', async ({ context, page, server }, testI
   const trace2 = await parseTraceRaw(testInfo.outputPath('trace2.zip'));
   expect(trace2.events[0].type).toBe('context-options');
   expect(trace2.actions).toEqual([
-    'page.hover',
+    'Hover',
   ]);
   expect(trace2.events.some(e => e.type === 'frame-snapshot')).toBeTruthy();
   expect(trace2.events.some(e => e.type === 'resource-snapshot' && e.snapshot.request.url.endsWith('style.css'))).toBeTruthy();
@@ -564,9 +587,7 @@ test('should ignore iframes in head', async ({ context, page, server }, testInfo
   await context.tracing.stopChunk({ path: testInfo.outputPath('trace.zip') });
 
   const trace = await parseTraceRaw(testInfo.outputPath('trace.zip'));
-  expect(trace.actions).toEqual([
-    'page.click',
-  ]);
+  expect(trace.actions).toEqual(['Click']);
   expect(trace.events.find(e => e.type === 'frame-snapshot')).toBeTruthy();
   expect(trace.events.find(e => e.type === 'frame-snapshot' && JSON.stringify(e.snapshot.html).includes('IFRAME'))).toBeFalsy();
 });
@@ -585,7 +606,7 @@ test('should hide internal stack frames', async ({ context, page }, testInfo) =>
   await context.tracing.stop({ path: tracePath });
 
   const trace = await parseTraceRaw(tracePath);
-  const actions = trace.actionObjects.filter(a => !a.apiName.startsWith('tracing.'));
+  const actions = trace.actionObjects.filter(a => a.class !== 'Tracing');
   expect(actions).toHaveLength(4);
   for (const action of actions)
     expect(relativeStack(action, trace.stacks)).toEqual(['tracing.spec.ts']);
@@ -606,7 +627,7 @@ test('should hide internal stack frames in expect', async ({ context, page }, te
   await context.tracing.stop({ path: tracePath });
 
   const trace = await parseTraceRaw(tracePath);
-  const actions = trace.actionObjects.filter(a => !a.apiName.startsWith('tracing.'));
+  const actions = trace.actionObjects.filter(a => a.class !== 'Tracing');
   expect(actions).toHaveLength(5);
   for (const action of actions)
     expect(relativeStack(action, trace.stacks)).toEqual(['tracing.spec.ts']);
@@ -709,7 +730,7 @@ test('should not flush console events', async ({ context, page, mode }, testInfo
   });
 
   await page.evaluate(() => {
-    window.builtinSetTimeout(() => {
+    window.builtins.setTimeout(() => {
       for (let i = 0; i < 100; ++i)
         console.log('hello ' + i);
     }, 10);
@@ -724,7 +745,6 @@ test('should not flush console events', async ({ context, page, mode }, testInfo
   await expect(async () => {
     const traceName = fs.readdirSync(dir).find(name => name.endsWith(testId + '.trace'));
     content = await fs.promises.readFile(path.join(dir, traceName), 'utf8');
-    expect(content).toContain('page.evaluate');
     expect(content).toContain('31415926');
   }).toPass();
   expect(content).not.toContain('hello 0');
@@ -749,7 +769,7 @@ test('should flush console events on tracing stop', async ({ context, page }, te
     });
   });
   await page.evaluate(() => {
-    window.builtinSetTimeout(() => {
+    window.builtins.setTimeout(() => {
       for (let i = 0; i < 100; ++i)
         console.log('hello ' + i);
     });
@@ -793,7 +813,7 @@ test('should not emit after w/o before', async ({ browserType, mode }, testInfo)
       return {
         type: e.type,
         callId: +e.callId.split('@')[1] - minCallId,
-        apiName: e.apiName,
+        title: e.title,
       };
     }
   };
@@ -806,17 +826,14 @@ test('should not emit after w/o before', async ({ browserType, mode }, testInfo)
       {
         type: 'before',
         callId: expect.any(Number),
-        apiName: 'page.evaluate'
       },
       {
         type: 'before',
         callId: expect.any(Number),
-        apiName: 'page.waitForEvent'
       },
       {
         type: 'after',
         callId: expect.any(Number),
-        apiName: undefined,
       },
     ]);
     call1 = sanitized[0].callId;
@@ -832,12 +849,10 @@ test('should not emit after w/o before', async ({ browserType, mode }, testInfo)
       {
         type: 'before',
         callId: expect.any(Number),
-        apiName: 'page.evaluateHandle'
       },
       {
         type: 'after',
         callId: expect.any(Number),
-        apiName: undefined
       }
     ]);
     call2before = sanitized[0].callId;
diff --git a/tests/library/clock.spec.ts b/tests/library/unit/clock.spec.ts
similarity index 96%
rename from tests/library/clock.spec.ts
rename to tests/library/unit/clock.spec.ts
index 9fd8426a924f9..a346fe3d52e6f 100644
--- a/tests/library/clock.spec.ts
+++ b/tests/library/unit/clock.spec.ts
@@ -15,22 +15,23 @@
  */
 
 import { test, expect } from '@playwright/test';
-import { createClock as rawCreateClock, install as rawInstall } from '../../packages/playwright-core/src/server/injected/clock';
-import type { InstallConfig, ClockController, ClockMethods } from '../../packages/playwright-core/src/server/injected/clock';
+import { createClock as rawCreateClock, install as rawInstall } from '../../../packages/injected/src/clock';
+import type { InstallConfig, ClockController } from '../../../packages/injected/src/clock';
+import type { Builtins } from '../../../packages/injected/src/utilityScript';
 
-const createClock = (now?: number): ClockController & ClockMethods => {
+const createClock = (now?: number): ClockController & Builtins => {
   const { clock, api } = rawCreateClock(globalThis);
   clock.setSystemTime(now || 0);
   for (const key of Object.keys(api))
     clock[key] = api[key];
-  return clock as ClockController & ClockMethods;
+  return clock as ClockController & Builtins;
 };
 
 type ClockFixtures = {
-  clock: ClockController & ClockMethods;
+  clock: ClockController & Builtins;
   now: number | undefined;
-  install: (now?: number) => ClockController & ClockMethods;
-  installEx: (config?: InstallConfig) => { clock: ClockController, api: ClockMethods, originals: ClockMethods };
+  install: (now?: number) => ClockController & Builtins;
+  installEx: (config?: InstallConfig) => { clock: ClockController, api: Builtins, originals: Builtins };
 };
 
 const it = test.extend<ClockFixtures>({
@@ -42,14 +43,14 @@ const it = test.extend<ClockFixtures>({
   now: undefined,
 
   install: async ({}, use) => {
-    let clockObject: ClockController & ClockMethods;
+    let clockObject: ClockController & Builtins;
     const install = (now?: number) => {
       const { clock, api } = rawInstall(globalThis);
       if (now)
         clock.setSystemTime(now);
       for (const key of Object.keys(api))
         clock[key] = api[key];
-      clockObject = clock as ClockController & ClockMethods;
+      clockObject = clock as ClockController & Builtins;
       return clockObject;
     };
     await use(install);
@@ -75,6 +76,14 @@ it.describe('setTimeout', () => {
     }).toThrow();
   });
 
+  it('does not throw if |undefined| or |null| is passed as a callback', async ({ clock }) => {
+    const timerId1 = clock.setTimeout(undefined, 10);
+    const timerId2 = clock.setTimeout(null, 10);
+    await clock.runFor(10);
+    expect(timerId1).toBeGreaterThan(0);
+    expect(timerId2).toBeGreaterThan(timerId1);
+  });
+
   it('returns numeric id or object with numeric id', async ({ clock }) => {
     const result = clock.setTimeout(() => { }, 10);
     expect(result).toEqual(expect.any(Number));
@@ -761,6 +770,14 @@ it.describe('setInterval', () => {
     }).toThrow();
   });
 
+  it('does not throw if |undefined| or |null| is passed as a callback', async ({ clock }) => {
+    const timerId1 = clock.setInterval(undefined, 10);
+    const timerId2 = clock.setInterval(null, 10);
+    await clock.runFor(10);
+    expect(timerId1).toBeGreaterThan(0);
+    expect(timerId2).toBeGreaterThan(timerId1);
+  });
+
   it('returns numeric id or object with numeric id', async ({ clock }) => {
     const result = clock.setInterval(() => {}, 10);
     expect(result).toBeGreaterThan(0);
@@ -1060,6 +1077,18 @@ it.describe('stubTimers', () => {
     expect(prev).toBe(0);
   });
 
+  it('replace Event.prototype.timeStamp', async ({ install }) => {
+    it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31924' });
+    const clock = install();
+    await clock.runFor(1000);
+    const event1 = new Event('foo');
+    expect(event1.timeStamp).toBe(1000);
+    await clock.runFor(1000);
+    const event2 = new Event('foo');
+    expect(event2.timeStamp).toBe(2000);
+    expect(event1.timeStamp).toBe(1000);
+  });
+
   it('uninstalls global performance.now', async ({ install }) => {
     const oldNow = performance.now;
     const clock = install();
@@ -1127,9 +1156,14 @@ it.describe('stubTimers', () => {
     });
   });
 
-  it.fixme('deletes global property on uninstall if it was inherited onto the global object', ({}) => {
+  it('restores global property on uninstall if it was inherited onto the global object', ({}) => {
     // Give the global object an inherited 'setTimeout' method
-    const proto = { Date,
+    const proto = {
+      Date,
+      Intl,
+      Map,
+      Set,
+      performance,
       setTimeout: () => {},
       clearTimeout: () => {},
       setInterval: () => {},
@@ -1139,8 +1173,10 @@ it.describe('stubTimers', () => {
 
     const { clock } = rawInstall(myGlobal, { now: 0, toFake: ['setTimeout'] });
     expect(myGlobal.hasOwnProperty('setTimeout')).toBeTruthy();
+    expect(myGlobal.setTimeout).not.toBe(proto.setTimeout);
     clock.uninstall();
-    expect(myGlobal.hasOwnProperty('setTimeout')).toBeFalsy();
+    expect(myGlobal.hasOwnProperty('setTimeout')).toBeTruthy();
+    expect(myGlobal.setTimeout).toBe(proto.setTimeout);
   });
 
   it('fakes Date constructor', ({ installEx }) => {
diff --git a/tests/library/unit/codegen.spec.ts b/tests/library/unit/codegen.spec.ts
new file mode 100644
index 0000000000000..a4538747bdfc9
--- /dev/null
+++ b/tests/library/unit/codegen.spec.ts
@@ -0,0 +1,675 @@
+/**
+ * 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 '@playwright/test';
+import { getAPIRequestCodeGen } from '../../../packages/trace-viewer/src/ui/codegen';
+
+test.describe('javascript', () => {
+  const impl = getAPIRequestCodeGen('javascript');
+
+  test('generatePlaywrightRequestCall', () => {
+
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'GET',
+      headers: [{ name: 'User-Agent', value: 'Mozilla/5.0' }, { name: 'Date', value: '2021-01-01' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'foo')).toEqual(`
+await page.request.get('http://example.com/foo', {
+  params: {
+    bar: 'baz'
+  },
+  data: 'foo',
+  headers: {
+    'User-Agent': 'Mozilla/5.0',
+    Date: '2021-01-01'
+  }
+});`.trim());
+
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'OPTIONS',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.fetch('http://example.com/foo', {
+  method: 'options',
+  params: {
+    bar: 'baz'
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with POST method and no body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'POST',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.post('http://example.com/foo', {
+  headers: {
+    'Content-Type': 'application/json'
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PUT method and JSON body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PUT',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, '{"key":"value"}')).toEqual(`
+await page.request.put('http://example.com/foo', {
+  data: '{"key":"value"}',
+  headers: {
+    'Content-Type': 'application/json'
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PATCH method and form data', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PATCH',
+      headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'key=value')).toEqual(`
+await page.request.patch('http://example.com/foo', {
+  data: 'key=value',
+  headers: {
+    'Content-Type': 'application/x-www-form-urlencoded'
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with DELETE method and custom header', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'DELETE',
+      headers: [{ name: 'Authorization', value: 'Bearer token' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.delete('http://example.com/foo', {
+  headers: {
+    Authorization: 'Bearer token'
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with HEAD method', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'HEAD',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.head('http://example.com/foo');`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with complex query parameters', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz&qux=quux',
+      method: 'GET',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.get('http://example.com/foo', {
+  params: {
+    bar: 'baz',
+    qux: 'quux'
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with multiple headers', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'GET',
+      headers: [
+        { name: 'User-Agent', value: 'Mozilla/5.0' },
+        { name: 'Accept', value: 'application/json' },
+        { name: 'Authorization', value: 'Bearer token' }
+      ],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.get('http://example.com/foo', {
+  headers: {
+    'User-Agent': 'Mozilla/5.0',
+    Accept: 'application/json',
+    Authorization: 'Bearer token'
+  }
+});`.trim());
+  });
+
+  test('escape sequences', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'GET',
+      headers: [
+        { name: 'F\\o', value: 'B\\r' },
+      ],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.get('http://example.com/foo', {
+  headers: {
+    'F\\\\o': 'B\\\\r'
+  }
+});`.trim());
+  });
+
+});
+
+test.describe('python', () => {
+  const impl = getAPIRequestCodeGen('python');
+
+  test('generatePlaywrightRequestCall', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'GET',
+      headers: [{ name: 'User-Agent', value: 'Mozilla/5.0' }, { name: 'Date', value: '2021-01-01' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'foo')).toEqual(`
+await page.request.get(
+  "http://example.com/foo",
+  params={
+    "bar": "baz"
+  },
+  data="foo",
+  headers={
+    "User-Agent": "Mozilla/5.0",
+    "Date": "2021-01-01"
+  }
+)`.trim());
+
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'OPTIONS',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.fetch(
+  "http://example.com/foo",
+  method="options",
+  params={
+    "bar": "baz"
+  }
+)`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with POST method and no body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'POST',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.post(
+  "http://example.com/foo",
+  headers={
+    "Content-Type": "application/json"
+  }
+)`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PUT method and JSON body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PUT',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, '{"key":"value"}')).toEqual(`
+await page.request.put(
+  "http://example.com/foo",
+  data="{\\"key\\":\\"value\\"}",
+  headers={
+    "Content-Type": "application/json"
+  }
+)`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PATCH method and form data', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PATCH',
+      headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'key=value')).toEqual(`
+await page.request.patch(
+  "http://example.com/foo",
+  data="key=value",
+  headers={
+    "Content-Type": "application/x-www-form-urlencoded"
+  }
+)`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with DELETE method and custom header', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'DELETE',
+      headers: [{ name: 'Authorization', value: 'Bearer token' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.delete(
+  "http://example.com/foo",
+  headers={
+    "Authorization": "Bearer token"
+  }
+)`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with HEAD method', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'HEAD',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.head("http://example.com/foo")`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with complex query parameters', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz&qux=quux',
+      method: 'GET',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.get(
+  "http://example.com/foo",
+  params={
+    "bar": "baz",
+    "qux": "quux"
+  }
+)`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with multiple headers', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'GET',
+      headers: [
+        { name: 'User-Agent', value: 'Mozilla/5.0' },
+        { name: 'Accept', value: 'application/json' },
+        { name: 'Authorization', value: 'Bearer token' }
+      ],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.get(
+  "http://example.com/foo",
+  headers={
+    "User-Agent": "Mozilla/5.0",
+    "Accept": "application/json",
+    "Authorization": "Bearer token"
+  }
+)`.trim());
+  });
+
+  test('escape sequences', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'GET',
+      headers: [
+        { name: 'F\\o', value: 'B\\r' },
+      ],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await page.request.get(
+  "http://example.com/foo",
+  headers={
+    "F\\\\o": "B\\\\r"
+  }
+)`.trim());
+  });
+
+});
+
+test.describe('csharp', () => {
+  const impl = getAPIRequestCodeGen('csharp');
+
+  test('generatePlaywrightRequestCall', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'GET',
+      headers: [{ name: 'User-Agent', value: 'Mozilla/5.0' }, { name: 'Date', value: '2021-01-01' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'foo')).toEqual(`
+await request.GetAsync("http://example.com/foo", new() {
+  Params = new() {
+    ["bar"] = "baz"
+  },
+  Data = "foo",
+  Headers = new() {
+    ["User-Agent"] = "Mozilla/5.0",
+    ["Date"] = "2021-01-01"
+  }
+});`.trim());
+
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'OPTIONS',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await request.FetchAsync("http://example.com/foo", new() {
+  Method = "options",
+  Params = new() {
+    ["bar"] = "baz"
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with POST method and no body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'POST',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await request.PostAsync("http://example.com/foo", new() {
+  Headers = new() {
+    ["Content-Type"] = "application/json"
+  }
+});`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PUT method and JSON body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PUT',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, '{"key":"value"}')).toEqual(`
+await request.PutAsync("http://example.com/foo", new() {
+  Data = "{\\"key\\":\\"value\\"}",
+  Headers = new() {
+    ["Content-Type"] = "application/json"
+  }
+});`.trim());
+  });
+
+  test('escape sequences', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'GET',
+      headers: [
+        { name: 'F\\o', value: 'B\\r' },
+      ],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+await request.GetAsync("http://example.com/foo", new() {
+  Headers = new() {
+    ["F\\\\o"] = "B\\\\r"
+  }
+});`.trim());
+  });
+});
+
+test.describe('java', () => {
+  const impl = getAPIRequestCodeGen('java');
+
+  test('generatePlaywrightRequestCall', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'GET',
+      headers: [{ name: 'User-Agent', value: 'Mozilla/5.0' }, { name: 'Date', value: '2021-01-01' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'foo')).toEqual(`
+request.get("http://example.com/foo", RequestOptions.create()
+  .setQueryParam("bar", "baz")
+  .setData("foo")
+  .setHeader("User-Agent", "Mozilla/5.0")
+  .setHeader("Date", "2021-01-01")
+);`.trim());
+
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo?bar=baz',
+      method: 'OPTIONS',
+      headers: [],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+request.fetch("http://example.com/foo", RequestOptions.create()
+  .setMethod("options")
+  .setQueryParam("bar", "baz")
+);`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with POST method and no body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'POST',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+request.post("http://example.com/foo", RequestOptions.create()
+  .setHeader("Content-Type", "application/json")
+);`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PUT method and JSON body', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PUT',
+      headers: [{ name: 'Content-Type', value: 'application/json' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, '{"key":"value"}')).toEqual(`
+request.put("http://example.com/foo", RequestOptions.create()
+  .setData("{\\"key\\":\\"value\\"}")
+  .setHeader("Content-Type", "application/json")
+);`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with PATCH method and form data', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'PATCH',
+      headers: [{ name: 'Content-Type', value: 'application/x-www-form-urlencoded' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, 'key=value')).toEqual(`
+request.patch("http://example.com/foo", RequestOptions.create()
+  .setData("key=value")
+  .setHeader("Content-Type", "application/x-www-form-urlencoded")
+);`.trim());
+  });
+
+  test('generatePlaywrightRequestCall with DELETE method and custom header', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'DELETE',
+      headers: [{ name: 'Authorization', value: 'Bearer token' }],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+request.delete("http://example.com/foo", RequestOptions.create()
+  .setHeader("Authorization", "Bearer token")
+);`.trim());
+  });
+
+  test('escape sequences', () => {
+    expect(impl.generatePlaywrightRequestCall({
+      url: 'http://example.com/foo',
+      method: 'GET',
+      headers: [
+        { name: 'F\\o', value: 'B\\r' },
+      ],
+      httpVersion: '1.1',
+      cookies: [],
+      queryString: [],
+      headersSize: 0,
+      bodySize: 0,
+      comment: '',
+    }, undefined)).toEqual(`
+request.get(\"http://example.com/foo\", RequestOptions.create()
+  .setHeader(\"F\\\\o\", \"B\\\\r\")
+);`.trim());
+  });
+});
diff --git a/tests/library/unit/sequence.spec.ts b/tests/library/unit/sequence.spec.ts
new file mode 100644
index 0000000000000..7fdb20bd1ab43
--- /dev/null
+++ b/tests/library/unit/sequence.spec.ts
@@ -0,0 +1,157 @@
+/**
+ * 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 as it, expect } from '@playwright/test';
+import { findRepeatedSubsequencesForTest as findRepeatedSubsequences } from '../../../packages/playwright-core/lib/server/callLog';
+
+it('should return an empty array when the input is empty', () => {
+  const input = [];
+  const expectedOutput = [];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle a single-element array', () => {
+  const input = ['a'];
+  const expectedOutput = [{ sequence: ['a'], count: 1 }];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle an array with no repeats', () => {
+  const input = ['a', 'b', 'c'];
+  const expectedOutput = [
+    { sequence: ['a'], count: 1 },
+    { sequence: ['b'], count: 1 },
+    { sequence: ['c'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle contiguous repeats of single elements', () => {
+  const input = ['a', 'a', 'a', 'b', 'b', 'c'];
+  const expectedOutput = [
+    { sequence: ['a'], count: 3 },
+    { sequence: ['b'], count: 2 },
+    { sequence: ['c'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should detect longer repeating substrings', () => {
+  const input = ['a', 'b', 'a', 'b', 'a', 'b'];
+  const expectedOutput = [{ sequence: ['a', 'b'], count: 3 }];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle multiple repeating substrings', () => {
+  const input = ['a', 'a', 'b', 'b', 'a', 'a', 'b', 'b'];
+  const expectedOutput = [
+    { sequence: ['a', 'a', 'b', 'b'], count: 2 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle complex cases with overlapping repeats', () => {
+  const input = ['a', 'a', 'a', 'a'];
+  const expectedOutput = [{ sequence: ['a'], count: 4 }];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle complex acceptance cases with multiple possible repeats', () => {
+  const input = ['a', 'a', 'b', 'b', 'a', 'a', 'b', 'b', 'c', 'c', 'c', 'c'];
+  const expectedOutput = [
+    { sequence: ['a', 'a', 'b', 'b'], count: 2 },
+    { sequence: ['c'], count: 4 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle non-repeating sequences correctly', () => {
+  const input = ['a', 'b', 'c', 'd', 'e'];
+  const expectedOutput = [
+    { sequence: ['a'], count: 1 },
+    { sequence: ['b'], count: 1 },
+    { sequence: ['c'], count: 1 },
+    { sequence: ['d'], count: 1 },
+    { sequence: ['e'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle a case where the entire array is a repeating sequence', () => {
+  const input = ['x', 'y', 'x', 'y', 'x', 'y'];
+  const expectedOutput = [{ sequence: ['x', 'y'], count: 3 }];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should correctly identify the maximal repeating substring', () => {
+  const input = ['a', 'b', 'a', 'b', 'a', 'b', 'c', 'c', 'c', 'c'];
+  const expectedOutput = [
+    { sequence: ['a', 'b'], count: 3 },
+    { sequence: ['c'], count: 4 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle repeats with varying lengths', () => {
+  const input = ['a', 'a', 'b', 'b', 'b', 'b', 'a', 'a'];
+  const expectedOutput = [
+    { sequence: ['a'], count: 2 },
+    { sequence: ['b'], count: 4 },
+    { sequence: ['a'], count: 2 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should correctly handle a repeat count of one (k adjustment to zero)', () => {
+  const input = ['a', 'b', 'a', 'b', 'c'];
+  const expectedOutput = [
+    { sequence: ['a', 'b'], count: 2 },
+    { sequence: ['c'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should correctly handle repeats at the end of the array', () => {
+  const input = ['x', 'y', 'x', 'y', 'x', 'y', 'z'];
+  const expectedOutput = [
+    { sequence: ['x', 'y'], count: 3 },
+    { sequence: ['z'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should not overcount repeats when the last potential repeat is incomplete', () => {
+  const input = ['m', 'n', 'm', 'n', 'm'];
+  const expectedOutput = [
+    { sequence: ['m', 'n'], count: 2 },
+    { sequence: ['m'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
+
+it('should handle single repeats correctly when the substring length is greater than one', () => {
+  const input = ['a', 'b', 'c', 'a', 'b', 'd'];
+  const expectedOutput = [
+    { sequence: ['a'], count: 1 },
+    { sequence: ['b'], count: 1 },
+    { sequence: ['c'], count: 1 },
+    { sequence: ['a'], count: 1 },
+    { sequence: ['b'], count: 1 },
+    { sequence: ['d'], count: 1 },
+  ];
+  expect(findRepeatedSubsequences(input)).toEqual(expectedOutput);
+});
diff --git a/tests/library/unroute-behavior.spec.ts b/tests/library/unroute-behavior.spec.ts
index b12390b79b03a..ef58fc6c65079 100644
--- a/tests/library/unroute-behavior.spec.ts
+++ b/tests/library/unroute-behavior.spec.ts
@@ -16,6 +16,7 @@
 
 import { browserTest as it, expect } from '../config/browserTest';
 import type { Route } from '@playwright/test';
+import { ManualPromise } from '../../packages/playwright-core/lib/utils/isomorphic/manualPromise';
 
 it('context.unroute should not wait for pending handlers to complete', async ({ page, context, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23781' });
@@ -300,3 +301,31 @@ it('route.fulfill should not throw if page has been closed', async ({ page, serv
   // Should not throw.
   await route.fulfill();
 });
+
+it('should not continue requests in flight (page)', async ({ page, server }) => {
+  const routePromise = new ManualPromise();
+  await page.goto(server.EMPTY_PAGE);
+  await page.route('**/*', async route => {
+    routePromise.resolve();
+    await new Promise(f => setTimeout(f, 3000));
+    const response = await route.fetch();
+    await route.fulfill({ response });
+  });
+  void page.evaluate(() => fetch('/')).catch(() => {});
+  await routePromise;
+  await page.unrouteAll({ behavior: 'wait' });
+});
+
+it('should not continue requests in flight (context)', async ({ page, context, server }) => {
+  const routePromise = new ManualPromise();
+  await page.goto(server.EMPTY_PAGE);
+  await context.route('**/*', async route => {
+    routePromise.resolve();
+    await new Promise(f => setTimeout(f, 3000));
+    const response = await route.fetch();
+    await route.fulfill({ response });
+  });
+  void page.evaluate(() => fetch('/')).catch(() => {});
+  await routePromise;
+  await context.unrouteAll({ behavior: 'wait' });
+});
diff --git a/tests/library/video.spec.ts b/tests/library/video.spec.ts
index 39dcaecbc6b4c..123e7533adf7a 100644
--- a/tests/library/video.spec.ts
+++ b/tests/library/video.spec.ts
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-import { browserTest as it, expect } from '../config/browserTest';
+import { spawnSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import type { Page } from 'playwright-core';
-import { spawnSync } from 'child_process';
 import { PNG, jpegjs } from 'playwright-core/lib/utilsBundle';
 import { registry } from '../../packages/playwright-core/lib/server';
-import { rewriteErrorMessage } from '../../packages/playwright-core/lib/utils/stackTrace';
+import { expect, browserTest as it } from '../config/browserTest';
 import { parseTraceRaw } from '../config/utils';
 
 const ffmpeg = registry.findExecutable('ffmpeg')!.executablePath('javascript');
@@ -56,18 +55,11 @@ export class VideoPlayer {
     this.videoHeight = parseInt(resolutionMatch![2], 10);
   }
 
-  seekFirstNonEmptyFrame(offset?: { x: number, y: number }): any | undefined {
+  findFrame(framePredicate: (pixels: Buffer) => boolean, offset?: { x: number, y: number }): any |undefined {
     for (let f = 1; f <= this.frames; ++f) {
       const frame = this.frame(f, offset);
-      let hasColor = false;
-      for (let i = 0; i < frame.data.length; i += 4) {
-        if (frame.data[i + 0] < 230 || frame.data[i + 1] < 230 || frame.data[i + 2] < 230) {
-          hasColor = true;
-          break;
-        }
-      }
-      if (hasColor)
-        return this.frame(f, offset);
+      if (framePredicate(frame.data))
+        return frame;
     }
   }
 
@@ -88,46 +80,52 @@ export class VideoPlayer {
   }
 }
 
-function almostRed(r, g, b, alpha) {
-  expect(r).toBeGreaterThan(185);
-  expect(g).toBeLessThan(70);
-  expect(b).toBeLessThan(70);
-  expect(alpha).toBe(255);
+type Pixel = { r: number, g: number, b: number, alpha: number };
+type PixelPredicate = (pixel: Pixel) => boolean;
+
+function isAlmostRed({ r, g, b, alpha }: Pixel): boolean {
+  return r > 185 && g < 70 && b < 70 && alpha === 255;
 }
 
-function almostBlack(r, g, b, alpha) {
-  expect(r).toBeLessThan(70);
-  expect(g).toBeLessThan(70);
-  expect(b).toBeLessThan(70);
-  expect(alpha).toBe(255);
+function isAlmostBlack({ r, g, b, alpha }: Pixel): boolean {
+  return r < 70 && g < 70 && b < 70 && alpha === 255;
 }
 
-function almostGray(r, g, b, alpha) {
-  expect(r).toBeGreaterThan(70);
-  expect(g).toBeGreaterThan(70);
-  expect(b).toBeGreaterThan(70);
-  expect(r).toBeLessThan(185);
-  expect(g).toBeLessThan(185);
-  expect(b).toBeLessThan(185);
-  expect(alpha).toBe(255);
+function isAlmostGray({ r, g, b, alpha }: Pixel): boolean {
+  return r > 70 && r < 185 &&
+    g > 70 && g < 185 &&
+    b > 70 && b < 185 &&
+    alpha === 255;
 }
 
-function expectAll(pixels: Buffer, rgbaPredicate) {
-  const checkPixel = i => {
-    const r = pixels[i];
-    const g = pixels[i + 1];
-    const b = pixels[i + 2];
-    const alpha = pixels[i + 3];
-    rgbaPredicate(r, g, b, alpha);
-  };
-  try {
-    for (let i = 0, n = pixels.length; i < n; i += 4)
-      checkPixel(i);
-  } catch (e) {
-    // Log pixel values on failure.
-    rewriteErrorMessage(e, e.message + `\n\nActual pixels=[${pixels.join(',')}]`);
-    throw e;
+function findPixel(pixels: Buffer, pixelPredicate: PixelPredicate): Pixel|undefined {
+  for (let i = 0, n = pixels.length; i < n; i += 4) {
+    const pixel = {
+      r: pixels[i],
+      g: pixels[i + 1],
+      b: pixels[i + 2],
+      alpha: pixels[i + 3],
+    };
+    if (pixelPredicate(pixel))
+      return pixel;
   }
+  return undefined;
+}
+
+function everyPixel(pixels: Buffer, pixelPredicate: PixelPredicate) {
+  const badPixel = findPixel(pixels, pixel => !pixelPredicate(pixel));
+  return !badPixel;
+}
+
+function expectAll(pixels: Buffer, pixelPredicate: PixelPredicate) {
+  const badPixel = findPixel(pixels, pixel => !pixelPredicate(pixel));
+  if (!badPixel)
+    return;
+  const rgba = [badPixel.r, badPixel.g, badPixel.b, badPixel.alpha].join(', ');
+  throw new Error([
+    `Expected all pixels to satisfy ${pixelPredicate.name}, found bad pixel (${rgba})`,
+    `Actual pixels=[${pixels.join(',')}]`,
+  ].join('\n'));
 }
 
 function findVideos(videoDir: string) {
@@ -145,11 +143,11 @@ function expectRedFrames(videoFile: string, size: { width: number, height: numbe
 
   {
     const pixels = videoPlayer.seekLastFrame().data;
-    expectAll(pixels, almostRed);
+    expectAll(pixels, isAlmostRed);
   }
   {
     const pixels = videoPlayer.seekLastFrame({ x: size.width - 20, y: 0 }).data;
-    expectAll(pixels, almostRed);
+    expectAll(pixels, isAlmostRed);
   }
 }
 
@@ -399,13 +397,14 @@ it.describe('screencast', () => {
     expect(duration).toBeGreaterThan(0);
 
     {
-      const pixels = videoPlayer.seekFirstNonEmptyFrame().data;
-      expectAll(pixels, almostBlack);
+      // Find a frame with all almost-black pixels.
+      const frame = videoPlayer.findFrame(pixels => everyPixel(pixels, isAlmostBlack));
+      expect(frame).not.toBeUndefined();
     }
 
     {
       const pixels = videoPlayer.seekLastFrame().data;
-      expectAll(pixels, almostGray);
+      expectAll(pixels, isAlmostGray);
     }
   });
 
@@ -435,7 +434,7 @@ it.describe('screencast', () => {
 
     {
       const pixels = videoPlayer.seekLastFrame({ x: 95, y: 45 }).data;
-      expectAll(pixels, almostRed);
+      expectAll(pixels, isAlmostRed);
     }
   });
 
@@ -473,9 +472,9 @@ it.describe('screencast', () => {
     expect(videoFiles.length).toBe(2);
   });
 
-  it('should scale frames down to the requested size ', async ({ browser, browserName, server, headless, trace }, testInfo) => {
-    const isChromiumHeadlessNew = browserName === 'chromium' && !!headless && !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW;
-    it.fixme(!headless || isChromiumHeadlessNew, 'Fails on headed');
+  it('should scale frames down to the requested size ', async ({ browser, browserName, server, headless, isHeadlessShell }, testInfo) => {
+    it.fixme(!headless, 'Fails on headed');
+    it.fixme(browserName === 'chromium' && !isHeadlessShell, 'Chromium (but not headless shell) has a min width issue');
 
     const context = await browser.newContext({
       recordVideo: {
@@ -506,19 +505,19 @@ it.describe('screencast', () => {
 
     {
       const pixels = videoPlayer.seekLastFrame({ x: 0, y: 0 }).data;
-      expectAll(pixels, almostRed);
+      expectAll(pixels, isAlmostRed);
     }
     {
       const pixels = videoPlayer.seekLastFrame({ x: 300, y: 0 }).data;
-      expectAll(pixels, almostGray);
+      expectAll(pixels, isAlmostGray);
     }
     {
       const pixels = videoPlayer.seekLastFrame({ x: 0, y: 200 }).data;
-      expectAll(pixels, almostGray);
+      expectAll(pixels, isAlmostGray);
     }
     {
       const pixels = videoPlayer.seekLastFrame({ x: 300, y: 200 }).data;
-      expectAll(pixels, almostRed);
+      expectAll(pixels, isAlmostRed);
     }
   });
 
@@ -603,7 +602,7 @@ it.describe('screencast', () => {
 
     {
       const pixels = videoPlayer.seekLastFrame().data;
-      expectAll(pixels, almostRed);
+      expectAll(pixels, isAlmostRed);
     }
   });
 
@@ -722,9 +721,9 @@ it.describe('screencast', () => {
     expect(files.length).toBe(1);
   });
 
-  it('should capture full viewport', async ({ browserType, browserName, headless, isWindows }, testInfo) => {
+  it('should capture full viewport', async ({ browserType, browserName, isWindows, headless, isHeadlessShell }, testInfo) => {
     it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22411' });
-    it.fixme(browserName === 'chromium' && (!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW), 'The square is not on the video');
+    it.fixme(browserName === 'chromium' && !isHeadlessShell, 'The square is not on the video');
     it.fixme(browserName === 'firefox' && isWindows, 'https://github.com/microsoft/playwright/issues/14405');
     const size = { width: 600, height: 400 };
     const browser = await browserType.launch();
@@ -754,12 +753,12 @@ it.describe('screencast', () => {
     // Bottom right corner should be part of the red border.
     // However, headed browsers on mac have rounded corners, so offset by 10.
     const pixels = videoPlayer.seekLastFrame({ x: size.width - 20, y: size.height - 20 }).data;
-    expectAll(pixels, almostRed);
+    expectAll(pixels, isAlmostRed);
   });
 
-  it('should capture full viewport on hidpi', async ({ browserType, browserName, headless, isWindows, isLinux }, testInfo) => {
+  it('should capture full viewport on hidpi', async ({ browserType, browserName, headless, isWindows, isLinux, isHeadlessShell }, testInfo) => {
     it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/22411' });
-    it.fixme(browserName === 'chromium' && (!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW), 'The square is not on the video');
+    it.fixme(browserName === 'chromium' && !isHeadlessShell, 'The square is not on the video');
     it.fixme(browserName === 'firefox' && isWindows, 'https://github.com/microsoft/playwright/issues/14405');
     it.fixme(browserName === 'webkit' && isLinux && !headless, 'https://github.com/microsoft/playwright/issues/22617');
     const size = { width: 600, height: 400 };
@@ -791,12 +790,13 @@ it.describe('screencast', () => {
     // Bottom right corner should be part of the red border.
     // However, headed browsers on mac have rounded corners, so offset by 10.
     const pixels = videoPlayer.seekLastFrame({ x: size.width - 20, y: size.height - 20 }).data;
-    expectAll(pixels, almostRed);
+    expectAll(pixels, isAlmostRed);
   });
 
-  it('should work with video+trace', async ({ browser, trace, headless }, testInfo) => {
+  it('should work with video+trace', async ({ browser, trace, headless, browserName, isHeadlessShell }, testInfo) => {
     it.skip(trace === 'on');
-    it.fixme(!headless || !!process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW, 'different trace screencast image size on all browsers');
+    it.fixme(!headless, 'different trace screencast image size on all browsers');
+    it.fixme(browserName === 'chromium' && !isHeadlessShell, 'different trace screencast image size');
 
     const size = { width: 500, height: 400 };
     const traceFile = testInfo.outputPath('trace.zip');
@@ -826,7 +826,13 @@ it.describe('screencast', () => {
     expect(image.width).toBe(size.width);
     expect(image.height).toBe(size.height);
     const offset = size.width * size.height / 2 * 4 + size.width * 4 / 2; // Center should be red.
-    almostRed(image.data.readUInt8(offset), image.data.readUInt8(offset + 1), image.data.readUInt8(offset + 2), image.data.readUInt8(offset + 3));
+    const pixel: Pixel = {
+      r: image.data.readUInt8(offset),
+      g: image.data.readUInt8(offset + 1),
+      b: image.data.readUInt8(offset + 2),
+      alpha: image.data.readUInt8(offset + 3),
+    };
+    expect(isAlmostRed(pixel)).toBe(true);
   });
 });
 
@@ -859,8 +865,8 @@ async function waitForRafs(page: Page, count: number): Promise<void> {
       if (!count)
         resolve();
       else
-        window.builtinRequestAnimationFrame(onRaf);
+        window.builtins.requestAnimationFrame(onRaf);
     };
-    window.builtinRequestAnimationFrame(onRaf);
+    window.builtins.requestAnimationFrame(onRaf);
   }), count);
 }
diff --git a/tests/library/web-socket.spec.ts b/tests/library/web-socket.spec.ts
index 179c332307e81..106682411e075 100644
--- a/tests/library/web-socket.spec.ts
+++ b/tests/library/web-socket.spec.ts
@@ -21,13 +21,13 @@ import { Server as WebSocketServer } from 'ws';
 
 it('should work @smoke', async ({ page, server }) => {
   server.sendOnWebSocketConnection('incoming');
-  const value = await page.evaluate(port => {
+  const value = await page.evaluate(host => {
     let cb;
     const result = new Promise(f => cb = f);
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('message', data => { ws.close(); cb(data.data); });
     return result;
-  }, server.PORT);
+  }, server.HOST);
   expect(value).toBe('incoming');
 });
 
@@ -41,12 +41,12 @@ it('should emit close events', async ({ page, server }) => {
     webSocket = ws;
     ws.on('close', () => { log.push('close'); socketClosed(); });
   });
-  await page.evaluate(port => {
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+  await page.evaluate(host => {
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('open', () => ws.close());
-  }, server.PORT);
+  }, server.HOST);
   await socketClosePromise;
-  expect(log.join(':')).toBe(`open<ws://localhost:${server.PORT}/ws>:close`);
+  expect(log.join(':')).toBe(`open<ws://${server.HOST}/ws>:close`);
   expect(webSocket.isClosed()).toBeTruthy();
 });
 
@@ -63,12 +63,12 @@ it('should emit frame events', async ({ page, server }) => {
     ws.on('framereceived', d => log.push('received<' + d.payload + '>'));
     ws.on('close', () => { log.push('close'); socketClosed(); });
   });
-  await page.evaluate(port => {
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+  await page.evaluate(host => {
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('open', () => ws.send('outgoing'));
     ws.addEventListener('message', () => { ws.close(); });
     (window as any).ws = ws;
-  }, server.PORT);
+  }, server.HOST);
   await socketClosePromise;
   expect(log).toEqual(['open', 'sent<outgoing>', 'received<incoming>', 'close']);
 });
@@ -87,11 +87,11 @@ it('should filter out the close events when the server closes with a message', a
     ws.on('framereceived', d => log.push('received<' + d.payload + '>'));
     ws.on('close', () => { log.push('close'); socketClosed(); });
   });
-  await page.evaluate(port => {
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+  await page.evaluate(host => {
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('message', () => ws.send('outgoing'));
     (window as any).ws = ws;
-  }, server.PORT);
+  }, server.HOST);
   await socketClosePromise;
   expect(log).toEqual(['open', 'received<incoming>', 'sent<outgoing>', 'close']);
 });
@@ -104,10 +104,10 @@ it('should pass self as argument to close event', async ({ page, server }) => {
     webSocket = ws;
     ws.on('close', socketClosed);
   });
-  await page.evaluate(port => {
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+  await page.evaluate(host => {
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('open', () => ws.close());
-  }, server.PORT);
+  }, server.HOST);
   const eventArg = await socketClosePromise;
   expect(eventArg).toBe(webSocket);
 });
@@ -120,8 +120,8 @@ it('should emit binary frame events', async ({ page, server }) => {
     ws.on('close', doneCallback);
     ws.on('framesent', d => sent.push(d.payload));
   });
-  await page.evaluate(port => {
-    const ws = new WebSocket('ws://localhost:' + port + '/ws');
+  await page.evaluate(host => {
+    const ws = new WebSocket('ws://' + host + '/ws');
     ws.addEventListener('open', () => {
       const binary = new Uint8Array(5);
       for (let i = 0; i < 5; ++i)
@@ -130,25 +130,25 @@ it('should emit binary frame events', async ({ page, server }) => {
       ws.send(binary);
       ws.close();
     });
-  }, server.PORT);
+  }, server.HOST);
   await donePromise;
   expect(sent[0]).toBe('text');
   for (let i = 0; i < 5; ++i)
     expect(sent[1][i]).toBe(i);
 });
 
-it('should emit error', async ({ page, server, browserName }) => {
+it('should emit error', async ({ page, server, browserName, channel }) => {
   let callback;
   const result = new Promise(f => callback = f);
   page.on('websocket', ws => ws.on('socketerror', callback));
-  await page.evaluate(port => {
-    new WebSocket('ws://localhost:' + port + '/bogus-ws');
-  }, server.PORT);
+  await page.evaluate(host => {
+    new WebSocket('ws://' + host + '/bogus-ws');
+  }, server.HOST);
   const message = await result;
   if (browserName === 'firefox')
     expect(message).toBe('CLOSE_ABNORMAL');
   else
-    expect(message).toContain(': 400');
+    expect(message).toContain(channel?.includes('msedge') ? '' : ': 400');
 });
 
 it('should not have stray error events', async ({ page, server }) => {
@@ -160,9 +160,9 @@ it('should not have stray error events', async ({ page, server }) => {
       await ws.waitForEvent('framereceived');
       return ws;
     }),
-    page.evaluate(port => {
-      (window as any).ws = new WebSocket('ws://localhost:' + port + '/ws');
-    }, server.PORT)
+    page.evaluate(host => {
+      (window as any).ws = new WebSocket('ws://' + host + '/ws');
+    }, server.HOST)
   ]);
   await page.evaluate('window.ws.close()');
   expect(error).toBeFalsy();
@@ -175,9 +175,9 @@ it('should reject waitForEvent on socket close', async ({ page, server }) => {
       await ws.waitForEvent('framereceived');
       return ws;
     }),
-    page.evaluate(port => {
-      (window as any).ws = new WebSocket('ws://localhost:' + port + '/ws');
-    }, server.PORT)
+    page.evaluate(host => {
+      (window as any).ws = new WebSocket('ws://' + host + '/ws');
+    }, server.HOST)
   ]);
   const error = ws.waitForEvent('framesent').catch(e => e);
   await page.evaluate('window.ws.close()');
@@ -191,9 +191,9 @@ it('should reject waitForEvent on page close', async ({ page, server }) => {
       await ws.waitForEvent('framereceived');
       return ws;
     }),
-    page.evaluate(port => {
-      (window as any).ws = new WebSocket('ws://localhost:' + port + '/ws');
-    }, server.PORT)
+    page.evaluate(host => {
+      (window as any).ws = new WebSocket('ws://' + host + '/ws');
+    }, server.HOST)
   ]);
   const error = ws.waitForEvent('framesent').catch(e => e);
   await page.close();
diff --git a/tests/page/elementhandle-bounding-box.spec.ts b/tests/page/elementhandle-bounding-box.spec.ts
index 215dce0222990..c86d516e19ece 100644
--- a/tests/page/elementhandle-bounding-box.spec.ts
+++ b/tests/page/elementhandle-bounding-box.spec.ts
@@ -20,8 +20,6 @@ import { test as it, expect } from './pageTest';
 it.skip(({ isAndroid }) => isAndroid);
 
 it('should work', async ({ page, server, browserName, headless, isLinux }) => {
-  it.fixme(browserName === 'firefox' && !headless && !isLinux);
-
   await page.setViewportSize({ width: 500, height: 500 });
   await page.goto(server.PREFIX + '/grid.html');
   const elementHandle = await page.$('.box:nth-of-type(13)');
diff --git a/tests/page/elementhandle-screenshot.spec.ts b/tests/page/elementhandle-screenshot.spec.ts
index 042fb7c565fd2..3d5d7c57093ea 100644
--- a/tests/page/elementhandle-screenshot.spec.ts
+++ b/tests/page/elementhandle-screenshot.spec.ts
@@ -45,7 +45,7 @@ it.describe('element screenshot', () => {
     expect(screenshot).toMatchSnapshot('screenshot-element-bounding-box.png');
   });
 
-  it('should take into account padding and border', async ({ page }) => {
+  it('should take into account padding and border', async ({ page, isLinux, headless, browserName }) => {
     await page.setViewportSize({ width: 500, height: 500 });
     await page.setContent(`
       <div style="height: 14px">oooo</div>
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-bounding-box-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-bounding-box-bidi-chromium.png
new file mode 100644
index 0000000000000..c2c3ddca298ab
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-bounding-box-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-bounding-box-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-bounding-box-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..c2c3ddca298ab
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-bounding-box-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-bidi-chromium.png
new file mode 100644
index 0000000000000..35c53377f942c
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..35c53377f942c
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-offset-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-offset-bidi-chromium.png
new file mode 100644
index 0000000000000..971561ba698ad
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-offset-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-offset-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-offset-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..f554b1d62c4ab
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-fractional-offset-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-larger-than-viewport-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-larger-than-viewport-bidi-chromium.png
new file mode 100644
index 0000000000000..52c1bb2b92158
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-larger-than-viewport-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-larger-than-viewport-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-larger-than-viewport-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..6d28cddcea336
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-larger-than-viewport-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-bidi-chromium.png
new file mode 100644
index 0000000000000..fc34319896c1d
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..fc34319896c1d
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-webkit.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-webkit.png
index 971006d83d332..b7e971b762b6d 100644
Binary files a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-webkit.png and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-padding-border-webkit.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-rotate-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-rotate-bidi-chromium.png
new file mode 100644
index 0000000000000..5aab14c4b911d
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-rotate-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-rotate-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-rotate-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..5aab14c4b911d
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-rotate-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-scrolled-into-view-bidi-chromium.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-scrolled-into-view-bidi-chromium.png
new file mode 100644
index 0000000000000..fc34319896c1d
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-scrolled-into-view-bidi-chromium.png differ
diff --git a/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-scrolled-into-view-moz-firefox-nightly.png b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-scrolled-into-view-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..fc34319896c1d
Binary files /dev/null and b/tests/page/elementhandle-screenshot.spec.ts-snapshots/screenshot-element-scrolled-into-view-moz-firefox-nightly.png differ
diff --git a/tests/page/elementhandle-scroll-into-view.spec.ts b/tests/page/elementhandle-scroll-into-view.spec.ts
index e2a401ccea089..6894b6465c204 100644
--- a/tests/page/elementhandle-scroll-into-view.spec.ts
+++ b/tests/page/elementhandle-scroll-into-view.spec.ts
@@ -80,7 +80,9 @@ it('should scroll display:contents into view', async ({ page, browserName, brows
   `);
   const div = await page.$('#target');
   await div.scrollIntoViewIfNeeded();
-  expect(await page.$eval('#container', e => e.scrollTop)).toBe(350);
+  const scrollTop = await page.$eval('#container', e => e.scrollTop);
+  // On Android the value is not exact due to various scale conversions.
+  expect(Math.abs(scrollTop - 350)).toBeLessThan(1);
 });
 
 it('should work for visibility:hidden element', async ({ page }) => {
diff --git a/tests/page/elementhandle-select-text.spec.ts b/tests/page/elementhandle-select-text.spec.ts
index b916feb3fca5d..502657ba7babd 100644
--- a/tests/page/elementhandle-select-text.spec.ts
+++ b/tests/page/elementhandle-select-text.spec.ts
@@ -22,12 +22,7 @@ it('should select textarea', async ({ page, server, browserName }) => {
   const textarea = await page.$('textarea');
   await textarea.evaluate(textarea => textarea.value = 'some value');
   await textarea.selectText();
-  if (browserName === 'firefox' || browserName === 'webkit') {
-    expect(await textarea.evaluate(el => el.selectionStart)).toBe(0);
-    expect(await textarea.evaluate(el => el.selectionEnd)).toBe(10);
-  } else {
-    expect(await page.evaluate(() => window.getSelection().toString())).toBe('some value');
-  }
+  expect(await page.evaluate(() => window.getSelection().toString())).toBe('some value');
 });
 
 it('should select input', async ({ page, server, browserName }) => {
@@ -35,12 +30,7 @@ it('should select input', async ({ page, server, browserName }) => {
   const input = await page.$('input');
   await input.evaluate(input => input.value = 'some value');
   await input.selectText();
-  if (browserName === 'firefox' || browserName === 'webkit') {
-    expect(await input.evaluate(el => el.selectionStart)).toBe(0);
-    expect(await input.evaluate(el => el.selectionEnd)).toBe(10);
-  } else {
-    expect(await page.evaluate(() => window.getSelection().toString())).toBe('some value');
-  }
+  expect(await page.evaluate(() => window.getSelection().toString())).toBe('some value');
 });
 
 it('should select plain div', async ({ page, server }) => {
diff --git a/tests/page/elementhandle-wait-for-element-state.spec.ts b/tests/page/elementhandle-wait-for-element-state.spec.ts
index bbccf620c7bb4..ae818339e4784 100644
--- a/tests/page/elementhandle-wait-for-element-state.spec.ts
+++ b/tests/page/elementhandle-wait-for-element-state.spec.ts
@@ -113,8 +113,6 @@ it('should wait for button with an aria-disabled parent', async ({ page }) => {
 });
 
 it('should wait for stable position', async ({ page, server, browserName, platform }) => {
-  it.fixme(browserName === 'firefox' && platform === 'linux');
-
   await page.goto(server.PREFIX + '/input/button.html');
   const button = await page.$('button');
   await page.$eval('button', button => {
diff --git a/tests/page/expect-boolean.spec.ts b/tests/page/expect-boolean.spec.ts
index a22657bda668d..8f8a58c9d9a81 100644
--- a/tests/page/expect-boolean.spec.ts
+++ b/tests/page/expect-boolean.spec.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { stripAnsi } from '../config/utils';
 import { test, expect } from './pageTest';
 
 test.describe('toBeChecked', () => {
@@ -35,11 +36,32 @@ test.describe('toBeChecked', () => {
     await expect(locator).not.toBeChecked({ checked: false });
   });
 
+  test('with indeterminate:true', async ({ page }) => {
+    await page.setContent('<input type=checkbox></input>');
+    await page.locator('input').evaluate((e: HTMLInputElement) => e.indeterminate = true);
+    const locator = page.locator('input');
+    await expect(locator).toBeChecked({ indeterminate: true });
+  });
+
+  test('with indeterminate:true and checked', async ({ page }) => {
+    await page.setContent('<input type=checkbox></input>');
+    await page.locator('input').evaluate((e: HTMLInputElement) => e.indeterminate = true);
+    const locator = page.locator('input');
+    const error = await expect(locator).toBeChecked({ indeterminate: true, checked: false }).catch(e => e);
+    expect(error.message).toContain(`Can\'t assert indeterminate and checked at the same time`);
+  });
+
   test('fail', async ({ page }) => {
     await page.setContent('<input type=checkbox></input>');
     const locator = page.locator('input');
     const error = await expect(locator).toBeChecked({ timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain(`expect.toBeChecked with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toBeChecked() failed
+
+Locator:  locator('input')
+Expected: checked
+Received: unchecked
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toBeChecked" with timeout 1000ms`);
   });
 
   test('with not', async ({ page }) => {
@@ -58,23 +80,55 @@ test.describe('toBeChecked', () => {
     await page.setContent('<input type=checkbox checked></input>');
     const locator = page.locator('input');
     const error = await expect(locator).not.toBeChecked({ timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain(`expect.not.toBeChecked with timeout 1000ms`);
-    expect(error.message).toContain(`locator resolved to <input checked type="checkbox"/>`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).not.toBeChecked() failed
+
+Locator:  locator('input')
+Expected: not checked
+Received: checked
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "not toBeChecked" with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`locator resolved to <input checked type="checkbox"/>`);
   });
 
   test('fail with checked:false', async ({ page }) => {
     await page.setContent('<input type=checkbox checked></input>');
     const locator = page.locator('input');
     const error = await expect(locator).toBeChecked({ checked: false, timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain(`expect.toBeChecked with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toBeChecked({ checked: false }) failed
+
+Locator:  locator('input')
+Expected: unchecked
+Received: checked
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toBeChecked" with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`locator resolved to <input checked type="checkbox"/>`);
+  });
+
+  test('fail with indeterminate: true', async ({ page }) => {
+    await page.setContent('<input type=checkbox></input>');
+    const locator = page.locator('input');
+    const error = await expect(locator).toBeChecked({ indeterminate: true, timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toBeChecked({ indeterminate: true }) failed
+
+Locator:  locator('input')
+Expected: indeterminate
+Received: unchecked
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toBeChecked" with timeout 1000ms`);
   });
 
   test('fail missing', async ({ page }) => {
     await page.setContent('<div>no inputs here</div>');
     const locator2 = page.locator('input2');
     const error = await expect(locator2).not.toBeChecked({ timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain(`expect.not.toBeChecked with timeout 1000ms`);
-    expect(error.message).toContain('waiting for locator(\'input2\')');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).not.toBeChecked() failed
+
+Locator:  locator('input2')
+Expected: not checked
+Received: <element(s) not found>
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "not toBeChecked" with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- waiting for locator(\'input2\')`);
   });
 
   test('with role', async ({ page }) => {
@@ -138,6 +192,13 @@ test.describe('toBeEditable', () => {
     const locator = page.locator('input');
     await expect(locator).not.toBeEditable({ editable: false });
   });
+
+  test('throws', async ({ page }) => {
+    await page.setContent('<button>');
+    const locator = page.locator('button');
+    const error = await expect(locator).toBeEditable().catch(e => e);
+    expect(error.message).toContain('Element is not an <input>, <textarea>, <select> or [contenteditable] and does not have a role allowing [aria-readonly]');
+  });
 });
 
 test.describe('toBeEnabled', () => {
@@ -403,7 +464,13 @@ test.describe('toBeHidden', () => {
     await page.setContent('<div></div>');
     const locator = page.locator('button');
     const error = await expect(locator).not.toBeHidden({ timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain(`expect.not.toBeHidden with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).not.toBeHidden() failed
+
+Locator:  locator('button')
+Expected: not hidden
+Received: <element(s) not found>
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "not toBeHidden" with timeout 1000ms`);
   });
 
   test('with impossible timeout .not', async ({ page }) => {
@@ -450,7 +517,7 @@ test('should print unknown engine error', async ({ page }) => {
 
 test('should print selector syntax error', async ({ page }) => {
   const error = await expect(page.locator('row]')).toBeVisible().catch(e => e);
-  expect(error.message).toContain(`Unexpected token "]" while parsing selector "row]"`);
+  expect(error.message).toContain(`Unexpected token "]" while parsing css selector "row]"`);
 });
 
 test.describe(() => {
diff --git a/tests/page/expect-matcher-result.spec.ts b/tests/page/expect-matcher-result.spec.ts
index 8f8a83bc83055..277a0efbcbf8a 100644
--- a/tests/page/expect-matcher-result.spec.ts
+++ b/tests/page/expect-matcher-result.spec.ts
@@ -27,18 +27,20 @@ test('toMatchText-based assertions should have matcher result', async ({ page })
     expect.soft(e.matcherResult).toEqual({
       actual: 'Text content',
       expected: /Text2/,
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).toHaveText(expected)`),
+      message: expect.stringContaining(`expect(locator).toHaveText(expected) failed`),
       name: 'toHaveText',
       pass: false,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).toHaveText(expected)
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).toHaveText(expected) failed
 
 Locator: locator('#node')
 Expected pattern: /Text2/
 Received string:  \"Text content\"
+Timeout: 1ms
+
 Call log`);
 
   }
@@ -49,17 +51,19 @@ Call log`);
     expect.soft(e.matcherResult).toEqual({
       actual: 'Text content',
       expected: /Text/,
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).not.toHaveText(expected)`),
+      message: expect.stringContaining(`expect(locator).not.toHaveText(expected) failed`),
       name: 'toHaveText',
       pass: true,
       log: expect.any(Array),
       timeout: 1,
     });
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).not.toHaveText(expected)
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).not.toHaveText(expected) failed
 
 Locator: locator('#node')
 Expected pattern: not /Text/
 Received string: \"Text content\"
+Timeout: 1ms
+
 Call log`);
 
   }
@@ -73,20 +77,22 @@ test('toBeTruthy-based assertions should have matcher result', async ({ page })
     const e = await expect(page.locator('#node2')).toBeVisible({ timeout: 1 }).catch(e => e);
     e.matcherResult.message = stripAnsi(e.matcherResult.message);
     expect.soft(e.matcherResult).toEqual({
-      actual: 'hidden',
+      actual: '<element(s) not found>',
       expected: 'visible',
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).toBeVisible()`),
+      message: expect.stringContaining(`expect(locator).toBeVisible() failed`),
       name: 'toBeVisible',
       pass: false,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).toBeVisible()
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).toBeVisible() failed
 
-Locator: locator('#node2')
+Locator:  locator('#node2')
 Expected: visible
 Received: <element(s) not found>
+Timeout:  1ms
+
 Call log`);
 
   }
@@ -97,20 +103,21 @@ Call log`);
     expect.soft(e.matcherResult).toEqual({
       actual: 'visible',
       expected: 'visible',
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).not.toBeVisible()`),
+      message: expect.stringContaining(`expect(locator).not.toBeVisible() failed`),
       name: 'toBeVisible',
       pass: true,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).not.toBeVisible()
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).not.toBeVisible() failed
 
-Locator: locator('#node')
+Locator:  locator('#node')
 Expected: not visible
 Received: visible
-Call log`);
+Timeout:  1ms
 
+Call log`);
   }
 });
 
@@ -123,18 +130,20 @@ test('toEqual-based assertions should have matcher result', async ({ page }) =>
     expect.soft(e.matcherResult).toEqual({
       actual: 0,
       expected: 1,
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).toHaveCount(expected)`),
+      message: expect.stringContaining(`expect(locator).toHaveCount(expected) failed`),
       name: 'toHaveCount',
       pass: false,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).toHaveCount(expected)
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).toHaveCount(expected) failed
 
-Locator: locator('#node2')
+Locator:  locator('#node2')
 Expected: 1
 Received: 0
+Timeout:  1ms
+
 Call log`);
   }
 
@@ -144,24 +153,26 @@ Call log`);
     expect.soft(e.matcherResult).toEqual({
       actual: 1,
       expected: 1,
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).not.toHaveCount(expected)`),
+      message: expect.stringContaining(`expect(locator).not.toHaveCount(expected) failed`),
       name: 'toHaveCount',
       pass: true,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).not.toHaveCount(expected)
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).not.toHaveCount(expected) failed
 
-Locator: locator('#node')
+Locator:  locator('#node')
 Expected: not 1
 Received: 1
+Timeout:  1ms
+
 Call log`);
 
   }
 });
 
-test('toBeChecked({ checked: false }) should have expected: false', async ({ page }) => {
+test('toBeChecked({ checked }) should have expected', async ({ page }) => {
   await page.setContent(`
     <input id=checked type=checkbox checked></input>
     <input id=unchecked type=checkbox></input>
@@ -173,18 +184,20 @@ test('toBeChecked({ checked: false }) should have expected: false', async ({ pag
     expect.soft(e.matcherResult).toEqual({
       actual: 'unchecked',
       expected: 'checked',
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).toBeChecked()`),
+      message: expect.stringContaining(`expect(locator).toBeChecked() failed`),
       name: 'toBeChecked',
       pass: false,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).toBeChecked()
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).toBeChecked() failed
 
-Locator: locator('#unchecked')
+Locator:  locator('#unchecked')
 Expected: checked
 Received: unchecked
+Timeout:  1ms
+
 Call log`);
 
   }
@@ -195,18 +208,20 @@ Call log`);
     expect.soft(e.matcherResult).toEqual({
       actual: 'checked',
       expected: 'checked',
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).not.toBeChecked()`),
+      message: expect.stringContaining(`expect(locator).not.toBeChecked() failed`),
       name: 'toBeChecked',
       pass: true,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).not.toBeChecked()
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).not.toBeChecked() failed
 
-Locator: locator('#checked')
+Locator:  locator('#checked')
 Expected: not checked
 Received: checked
+Timeout:  1ms
+
 Call log`);
 
   }
@@ -217,18 +232,20 @@ Call log`);
     expect.soft(e.matcherResult).toEqual({
       actual: 'checked',
       expected: 'unchecked',
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).toBeChecked({ checked: false })`),
+      message: expect.stringContaining(`expect(locator).toBeChecked({ checked: false }) failed`),
       name: 'toBeChecked',
       pass: false,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).toBeChecked({ checked: false })
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).toBeChecked({ checked: false }) failed
 
-Locator: locator('#checked')
+Locator:  locator('#checked')
 Expected: unchecked
 Received: checked
+Timeout:  1ms
+
 Call log`);
 
   }
@@ -239,18 +256,44 @@ Call log`);
     expect.soft(e.matcherResult).toEqual({
       actual: 'unchecked',
       expected: 'unchecked',
-      message: expect.stringContaining(`Timed out 1ms waiting for expect(locator).not.toBeChecked({ checked: false })`),
+      message: expect.stringContaining(`expect(locator).not.toBeChecked({ checked: false }) failed`),
       name: 'toBeChecked',
       pass: true,
       log: expect.any(Array),
       timeout: 1,
     });
 
-    expect.soft(stripAnsi(e.toString())).toContain(`Error: Timed out 1ms waiting for expect(locator).not.toBeChecked({ checked: false })
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).not.toBeChecked({ checked: false }) failed
 
-Locator: locator('#unchecked')
+Locator:  locator('#unchecked')
 Expected: not unchecked
 Received: unchecked
+Timeout:  1ms
+
+Call log`);
+
+  }
+
+  {
+    const e = await expect(page.locator('#unchecked')).toBeChecked({ indeterminate: true, timeout: 1 }).catch(e => e);
+    e.matcherResult.message = stripAnsi(e.matcherResult.message);
+    expect.soft(e.matcherResult).toEqual({
+      actual: 'unchecked',
+      expected: 'indeterminate',
+      message: expect.stringContaining(`expect(locator).toBeChecked({ indeterminate: true }) failed`),
+      name: 'toBeChecked',
+      pass: false,
+      log: expect.any(Array),
+      timeout: 1,
+    });
+
+    expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(locator).toBeChecked({ indeterminate: true }) failed
+
+Locator:  locator('#unchecked')
+Expected: indeterminate
+Received: unchecked
+Timeout:  1ms
+
 Call log`);
 
   }
@@ -267,15 +310,14 @@ test('toHaveScreenshot should populate matcherResult', async ({ page, server, is
     actual: expect.stringContaining('screenshot-sanity-actual'),
     expected: expect.stringContaining('screenshot-sanity-'),
     diff: expect.stringContaining('screenshot-sanity-diff'),
-    message: expect.stringContaining(`Screenshot comparison failed`),
+    message: expect.stringContaining(`expect(page).toHaveScreenshot(expected)`),
     name: 'toHaveScreenshot',
     pass: false,
     log: expect.any(Array),
   });
 
-  expect.soft(stripAnsi(e.toString())).toContain(`Error: Screenshot comparison failed:
+  expect.soft(stripAnsi(e.toString())).toContain(`Error: expect(page).toHaveScreenshot(expected) failed
 
   23362 pixels (ratio 0.10 of all image pixels) are different.
-
-Expected:`);
+`);
 });
diff --git a/tests/page/expect-matcher-result.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png b/tests/page/expect-matcher-result.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..122a4f0ae04d9
Binary files /dev/null and b/tests/page/expect-matcher-result.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png differ
diff --git a/tests/page/expect-misc.spec.ts b/tests/page/expect-misc.spec.ts
index 36aa64151028a..7aa5a2f2a831e 100644
--- a/tests/page/expect-misc.spec.ts
+++ b/tests/page/expect-misc.spec.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import { stripVTControlCharacters } from 'node:util';
 import { stripAnsi } from '../config/utils';
 import { test, expect } from './pageTest';
 
@@ -67,14 +68,26 @@ test.describe('toHaveCount', () => {
     await page.setContent('<div><span></span></div>');
     const locator = page.locator('span');
     const error = await expect(locator).toHaveCount(0, { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.toHaveCount with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveCount(expected) failed
+
+Locator:  locator('span')
+Expected: 0
+Received: 1
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveCount" with timeout 1000ms`);
   });
 
   test('fail zero 2', async ({ page }) => {
     await page.setContent('<div><span></span></div>');
     const locator = page.locator('span');
     const error = await expect(locator).not.toHaveCount(1, { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.not.toHaveCount with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).not.toHaveCount(expected) failed
+
+Locator:  locator('span')
+Expected: not 1
+Received: 1
+Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "not toHaveCount" with timeout 1000ms`);
   });
 });
 
@@ -106,7 +119,13 @@ test.describe('toHaveJSProperty', () => {
     await page.$eval('div', e => (e as any).foo = 'string');
     const locator = page.locator('div');
     const error = await expect(locator).toHaveJSProperty('foo', 'error', { timeout: 200 }).catch(e => e);
-    expect(error.message).toContain(`expect.toHaveJSProperty with timeout 200ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveJSProperty(expected) failed
+
+Locator:  locator('div')
+Expected: "error"
+Received: "string"
+Timeout:  200ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveJSProperty" with timeout 200ms`);
   });
 
   test('pass number', async ({ page }) => {
@@ -121,7 +140,13 @@ test.describe('toHaveJSProperty', () => {
     await page.$eval('div', e => (e as any).foo = 2021);
     const locator = page.locator('div');
     const error = await expect(locator).toHaveJSProperty('foo', 1, { timeout: 200 }).catch(e => e);
-    expect(error.message).toContain(`expect.toHaveJSProperty with timeout 200ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveJSProperty(expected) failed
+
+Locator:  locator('div')
+Expected: 1
+Received: 2021
+Timeout:  200ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveJSProperty" with timeout 200ms`);
   });
 
   test('pass boolean', async ({ page }) => {
@@ -136,7 +161,13 @@ test.describe('toHaveJSProperty', () => {
     await page.$eval('div', e => (e as any).foo = false);
     const locator = page.locator('div');
     const error = await expect(locator).toHaveJSProperty('foo', true, { timeout: 200 }).catch(e => e);
-    expect(error.message).toContain(`expect.toHaveJSProperty with timeout 200ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveJSProperty(expected) failed
+
+Locator:  locator('div')
+Expected: true
+Received: false
+Timeout:  200ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveJSProperty" with timeout 200ms`);
   });
 
   test('pass boolean 2', async ({ page }) => {
@@ -151,7 +182,13 @@ test.describe('toHaveJSProperty', () => {
     await page.$eval('div', e => (e as any).foo = false);
     const locator = page.locator('div');
     const error = await expect(locator).toHaveJSProperty('foo', true, { timeout: 200 }).catch(e => e);
-    expect(error.message).toContain(`expect.toHaveJSProperty with timeout 200ms`);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveJSProperty(expected) failed
+
+Locator:  locator('div')
+Expected: true
+Received: false
+Timeout:  200ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveJSProperty" with timeout 200ms`);
   });
 
   test('pass undefined', async ({ page }) => {
@@ -204,7 +241,13 @@ test.describe('toHaveClass', () => {
     await page.setContent('<div class="bar baz"></div>');
     const locator = page.locator('div');
     const error = await expect(locator).toHaveClass('foo bar baz', { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.toHaveClass with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveClass(expected) failed
+
+Locator: locator('div')
+Expected string: "foo bar baz"
+Received string: "bar baz"
+Timeout: 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveClass" with timeout 1000ms`);
   });
 
   test('pass with array', async ({ page }) => {
@@ -217,7 +260,58 @@ test.describe('toHaveClass', () => {
     await page.setContent('<div class="foo"></div><div class="bar"></div><div class="bar"></div>');
     const locator = page.locator('div');
     const error = await expect(locator).toHaveClass(['foo', 'bar', /[a-z]az/], { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.toHaveClass with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveClass(expected) failed`);
+    expect(stripAnsi(error.message)).toContain(`Timeout: 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveClass" with timeout 1000ms`);
+  });
+});
+
+test.describe('toContainClass', () => {
+  test('pass', async ({ page }) => {
+    await page.setContent('<div class="foo bar baz"></div>');
+    const locator = page.locator('div');
+    await expect(locator).toContainClass('');
+    await expect(locator).toContainClass('bar');
+    await expect(locator).toContainClass('baz bar');
+    await expect(locator).toContainClass('  bar   foo ');
+    await expect(locator).not.toContainClass('  baz   not-matching '); // Strip whitespace and match individual classes
+    expect(() => expect(locator).toContainClass(/foo|bar/ as any)).toThrow(/"expected\" argument in toContainClass cannot be a RegExp value/);
+  });
+
+  test('pass with SVGs', async ({ page }) => {
+    await page.setContent(`<svg class="c1 c2" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"></svg>`);
+    await expect(page.locator('svg')).toContainClass('c1');
+  });
+
+  test('fail', async ({ page }) => {
+    await page.setContent('<div class="bar baz"></div>');
+    const locator = page.locator('div');
+    const error = await expect(locator).toContainClass('does-not-exist', { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toContainClass(expected) failed
+
+Locator: locator('div')
+Expected string: "does-not-exist"
+Received string: "bar baz"
+Timeout: 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toContainClass" with timeout 1000ms`);
+  });
+
+  test('pass with array', async ({ page }) => {
+    await page.setContent('<div class="foo"></div><div class="hello bar"></div><div class="baz"></div>');
+    const locator = page.locator('div');
+    await expect(locator).toContainClass(['foo', 'hello', 'baz']);
+    expect(() => expect(locator).toContainClass(['foo', 'hello', /baz/] as any)).toThrow(/"expected" argument in toContainClass cannot contain RegExp values/);
+    await expect(locator).not.toHaveClass(['not-there', 'hello', 'baz']); // Class not there
+    await expect(locator).not.toHaveClass(['foo', 'hello']); // Length mismatch
+  });
+
+  test('fail with array', async ({ page }) => {
+    await page.setContent('<div class="foo"></div><div class="bar"></div><div class="bar"></div>');
+    const locator = page.locator('div');
+    const error = await expect(locator).toContainClass(['foo', 'bar', 'baz'], { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toContainClass(expected) failed`);
+    expect(stripAnsi(error.message)).toContain(`Timeout: 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toContainClass" with timeout 1000ms`);
   });
 });
 
@@ -230,7 +324,12 @@ test.describe('toHaveTitle', () => {
   test('fail', async ({ page }) => {
     await page.setContent('<title>Bye</title>');
     const error = await expect(page).toHaveTitle('Hello', { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.toHaveTitle with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(page).toHaveTitle(expected) failed
+
+Expected string: "Hello"
+Received string: "Bye"
+Timeout: 1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveTitle" with timeout 1000ms`);
   });
 });
 
@@ -240,10 +339,49 @@ test.describe('toHaveURL', () => {
     await expect(page).toHaveURL('data:text/html,<div>A</div>');
   });
 
-  test('fail', async ({ page }) => {
-    await page.goto('data:text/html,<div>B</div>');
+  test('fail string', async ({ page }) => {
+    await page.goto('data:text/html,<div>A</div>');
     const error = await expect(page).toHaveURL('wrong', { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.toHaveURL with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(page).toHaveURL(expected) failed
+
+Expected string: "wrong"
+Received string: "data:text/html,<div>A</div>"
+Timeout: 1000ms`);
+    expect(stripVTControlCharacters(error.message)).toContain('Expected string: "wrong"\nReceived string: "data:text/html,<div>A</div>"');
+  });
+
+  test('fail with invalid argument', async ({ page }) => {
+    await page.goto('data:text/html,<div>A</div>');
+    // @ts-expect-error
+    const error = await expect(page).toHaveURL({}).catch(e => e);
+    expect(stripVTControlCharacters(error.message)).toContain(`expect(page).toHaveURL([object Object])`);
+    expect(stripVTControlCharacters(error.message)).toContain('Expected has type:  object\nExpected has value: {}');
+  });
+
+  test('fail with positive predicate', async ({ page }) => {
+    await page.goto('data:text/html,<div>A</div>');
+    const error = await expect(page).toHaveURL(_url => false).catch(e => e);
+    expect(stripVTControlCharacters(error.message)).toContain('expect(page).toHaveURL(expected)');
+    expect(stripVTControlCharacters(error.message)).toContain('Expected predicate to succeed\nReceived string: "data:text/html,<div>A</div>"');
+  });
+
+  test('fail with negative predicate', async ({ page }) => {
+    await page.goto('data:text/html,<div>A</div>');
+    const error = await expect(page).not.toHaveURL(_url => true).catch(e => e);
+    expect(stripVTControlCharacters(error.message)).toContain('expect(page).not.toHaveURL(expected)');
+    expect(stripVTControlCharacters(error.message)).toContain('Expected predicate to fail\nReceived string: "data:text/html,<div>A</div>"');
+  });
+
+  test('resolve predicate on initial call', async ({ page }) => {
+    await page.goto('data:text/html,<div>A</div>');
+    await expect(page).toHaveURL(url => url.href === 'data:text/html,<div>A</div>', { timeout: 1000 });
+  });
+
+  test('resolve predicate after retries', async ({ page }) => {
+    await page.goto('data:text/html,<div>A</div>');
+    const expectPromise = expect(page).toHaveURL(url => url.href === 'data:text/html,<div>B</div>', { timeout: 1000 });
+    setTimeout(() => page.goto('data:text/html,<div>B</div>'), 500);
+    await expectPromise;
   });
 
   test('support ignoreCase', async ({ page }) => {
@@ -264,11 +402,23 @@ test.describe('toHaveAttribute', () => {
     const locator = page.locator('#node');
     {
       const error = await expect(locator).toHaveAttribute('disabled', '', { timeout: 1000 }).catch(e => e);
-      expect(error.message).toContain('expect.toHaveAttribute with timeout 1000ms');
+      expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveAttribute(expected) failed
+
+Locator: locator('#node')
+Expected string: ""
+Received string: serializes to the same string
+Timeout: 1000ms`);
+      expect(stripAnsi(error.message)).toContain(`- Expect "toHaveAttribute" with timeout 1000ms`);
     }
     {
       const error = await expect(locator).toHaveAttribute('disabled', /.*/, { timeout: 1000 }).catch(e => e);
-      expect(error.message).toContain('expect.toHaveAttribute with timeout 1000ms');
+      expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveAttribute(expected) failed
+
+Locator: locator('#node')
+Expected pattern: /.*/
+Received string:  ""
+Timeout: 1000ms`);
+      expect(stripAnsi(error.message)).toContain(`- Expect "toHaveAttribute" with timeout 1000ms`);
     }
     await expect(locator).not.toHaveAttribute('disabled', '');
     await expect(locator).not.toHaveAttribute('disabled', /.*/);
@@ -281,11 +431,23 @@ test.describe('toHaveAttribute', () => {
     await expect(locator).toHaveAttribute('checked', /.*/);
     {
       const error = await expect(locator).not.toHaveAttribute('checked', '', { timeout: 1000 }).catch(e => e);
-      expect(error.message).toContain('expect.not.toHaveAttribute with timeout 1000ms');
+      expect(stripAnsi(error.message)).toContain(`expect(locator).not.toHaveAttribute(expected) failed
+
+Locator: locator('#node')
+Expected string: not ""
+Received string: ""
+Timeout: 1000ms`);
+      expect(stripAnsi(error.message)).toContain(`- Expect "not toHaveAttribute" with timeout 1000ms`);
     }
     {
       const error = await expect(locator).not.toHaveAttribute('checked', /.*/, { timeout: 1000 }).catch(e => e);
-      expect(error.message).toContain('expect.not.toHaveAttribute with timeout 1000ms');
+      expect(stripAnsi(error.message)).toContain(`expect(locator).not.toHaveAttribute(expected) failed
+
+Locator: locator('#node')
+Expected pattern: not /.*/
+Received string: ""
+Timeout: 1000ms`);
+      expect(stripAnsi(error.message)).toContain(`- Expect "not toHaveAttribute" with timeout 1000ms`);
     }
   });
 
@@ -349,7 +511,8 @@ test.describe('toBeInViewport', () => {
   });
 
   test('should respect ratio option', async ({ page, isAndroid }) => {
-    test.fixme(isAndroid, 'fails due an upstream bug in Chrome, updating Chrome will fix it.');
+    test.fixme(isAndroid, 'ratio 0.24 is not in viewport for unknown reason');
+
     await page.setContent(`
       <style>body, div, html { padding: 0; margin: 0; }</style>
       <div id=big style="height: 400vh;"></div>
@@ -371,7 +534,7 @@ test.describe('toBeInViewport', () => {
   test('should have good stack', async ({ page }) => {
     let error;
     try {
-      await expect(page.locator('body')).not.toBeInViewport({ timeout: 100 });
+      await expect(page.locator('body')).not.toBeInViewport({ timeout: 500 });
     } catch (e) {
       error = e;
     }
@@ -419,40 +582,3 @@ test('toHaveText that does not match should not produce logs twice', async ({ pa
   expect(error.message).not.toContain('locator resolved to');
   expect(error.message.replace(waitingForMessage, '<redacted>')).not.toContain(waitingForMessage);
 });
-
-test('toHaveAccessibleName', async ({ page }) => {
-  await page.setContent(`
-    <div role="button" aria-label="Hello"></div>
-  `);
-  await expect(page.locator('div')).toHaveAccessibleName('Hello');
-  await expect(page.locator('div')).not.toHaveAccessibleName('hello');
-  await expect(page.locator('div')).toHaveAccessibleName('hello', { ignoreCase: true });
-  await expect(page.locator('div')).toHaveAccessibleName(/ell\w/);
-  await expect(page.locator('div')).not.toHaveAccessibleName(/hello/);
-  await expect(page.locator('div')).toHaveAccessibleName(/hello/, { ignoreCase: true });
-});
-
-test('toHaveAccessibleDescription', async ({ page }) => {
-  await page.setContent(`
-    <div role="button" aria-description="Hello"></div>
-  `);
-  await expect(page.locator('div')).toHaveAccessibleDescription('Hello');
-  await expect(page.locator('div')).not.toHaveAccessibleDescription('hello');
-  await expect(page.locator('div')).toHaveAccessibleDescription('hello', { ignoreCase: true });
-  await expect(page.locator('div')).toHaveAccessibleDescription(/ell\w/);
-  await expect(page.locator('div')).not.toHaveAccessibleDescription(/hello/);
-  await expect(page.locator('div')).toHaveAccessibleDescription(/hello/, { ignoreCase: true });
-});
-
-test('toHaveRole', async ({ page }) => {
-  await page.setContent(`<div role="button">Button!</div>`);
-  await expect(page.locator('div')).toHaveRole('button');
-  await expect(page.locator('div')).not.toHaveRole('checkbox');
-  try {
-    // @ts-expect-error
-    await expect(page.locator('div')).toHaveRole(/button|checkbox/);
-    expect(1, 'Must throw when given a regular expression').toBe(2);
-  } catch (error) {
-    expect(error.message).toBe(`"role" argument in toHaveRole must be a string`);
-  }
-});
diff --git a/tests/page/expect-timeout.spec.ts b/tests/page/expect-timeout.spec.ts
index 16b3210caa72a..7143d309f8af6 100644
--- a/tests/page/expect-timeout.spec.ts
+++ b/tests/page/expect-timeout.spec.ts
@@ -20,38 +20,79 @@ import { test, expect } from './pageTest';
 test('should print timed out error message', async ({ page }) => {
   await page.setContent('<div id=node>Text content</div>');
   const error = await expect(page.locator('no-such-thing')).toHaveText('hey', { timeout: 1000 }).catch(e => e);
-  expect(stripAnsi(error.message)).toContain(`Timed out 1000ms waiting for expect(locator).toHaveText(expected)`);
+  expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected) failed
+
+Locator: locator('no-such-thing')
+Expected string: "hey"
+Received: <element(s) not found>
+Timeout: 1000ms`);
 });
 
 test('should print timed out error message when value does not match', async ({ page }) => {
   await page.setContent('<div id=node>Text content</div>');
   const error = await expect(page.locator('div')).toHaveText('hey', { timeout: 1000 }).catch(e => e);
-  expect(stripAnsi(error.message)).toContain(`Timed out 1000ms waiting for expect(locator).toHaveText(expected)`);
+  expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected) failed
+
+Locator: locator('div')
+Expected string: "hey"
+Received string: "Text content"
+Timeout: 1000ms`);
 });
 
 test('should print timed out error message with impossible timeout', async ({ page }) => {
   await page.setContent('<div id=node>Text content</div>');
   const error = await expect(page.locator('no-such-thing')).toHaveText('hey', { timeout: 1 }).catch(e => e);
-  expect(stripAnsi(error.message)).toContain(`Timed out 1ms waiting for expect(locator).toHaveText(expected)`);
+  expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected) failed
+
+Locator: locator('no-such-thing')
+Expected string: "hey"
+Received: <element(s) not found>
+Timeout: 1ms`);
 });
 
 test('should print timed out error message when value does not match with impossible timeout', async ({ page }) => {
   await page.setContent('<div id=node>Text content</div>');
   const error = await expect(page.locator('div')).toHaveText('hey', { timeout: 1 }).catch(e => e);
-  expect(stripAnsi(error.message)).toContain(`Timed out 1ms waiting for expect(locator).toHaveText(expected)`);
-});
+  expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected) failed
 
-test('should not print timed out error message when page closes', async ({ page }) => {
-  await page.setContent('<div id=node>Text content</div>');
-  const [error] = await Promise.all([
-    expect(page.locator('div')).toHaveText('hey', { timeout: 100000 }).catch(e => e),
-    page.close(),
-  ]);
-  expect(stripAnsi(error.message)).toContain('expect.toHaveText with timeout 100000ms');
-  expect(stripAnsi(error.message)).not.toContain('Timed out');
+Locator: locator('div')
+Expected string: "hey"
+Received string: "Text content"
+Timeout: 1ms`);
 });
 
 test('should have timeout error name', async ({ page }) => {
   const error = await page.waitForSelector('#not-found', { timeout: 1 }).catch(e => e);
   expect(error.name).toBe('TimeoutError');
 });
+
+test('should not throw when navigating during one-shot check', async ({ page, server }) => {
+  await page.setContent(`<div>hello</div>`);
+  const promise = expect(page.locator('div')).toHaveText('bye');
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`<div>bye</div>`);
+  await promise;
+});
+
+test('should not throw when navigating during first locator handler check', async ({ page, server }) => {
+  await page.addLocatorHandler(page.locator('span'), async locator => {});
+  await page.setContent(`<div>hello</div>`);
+  const promise = expect(page.locator('div')).toHaveText('bye');
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`<div>bye</div>`);
+  await promise;
+});
+
+test('should timeout during first locator handler check', async ({ page, server }) => {
+  await page.addLocatorHandler(page.locator('div'), async locator => {});
+  await page.setContent(`<div>hello</div><span>bye</span>`);
+  const error = await expect(page.locator('span')).toHaveText('bye', { timeout: 3000 }).catch(e => e);
+  expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected) failed
+
+Locator: locator('span')
+Expected string: "bye"
+Received string: ""
+Timeout: 3000ms`);
+  expect(error.message).toContain(`locator handler has finished, waiting for locator('div') to be hidden`);
+  expect(error.message).toContain(`locator resolved to visible <div>hello</div>`);
+});
diff --git a/tests/page/expect-to-have-accessible.spec.ts b/tests/page/expect-to-have-accessible.spec.ts
new file mode 100644
index 0000000000000..f3bd3083c9caf
--- /dev/null
+++ b/tests/page/expect-to-have-accessible.spec.ts
@@ -0,0 +1,200 @@
+/**
+ * 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 './pageTest';
+
+test('toHaveAccessibleName', async ({ page }) => {
+  await page.setContent(`
+    <div role="button" aria-label="Hello"></div>
+  `);
+  await expect(page.locator('div')).toHaveAccessibleName('Hello');
+  await expect(page.locator('div')).not.toHaveAccessibleName('hello');
+  await expect(page.locator('div')).toHaveAccessibleName('hello', { ignoreCase: true });
+  await expect(page.locator('div')).toHaveAccessibleName(/ell\w/);
+  await expect(page.locator('div')).not.toHaveAccessibleName(/hello/);
+  await expect(page.locator('div')).toHaveAccessibleName(/hello/, { ignoreCase: true });
+
+  await page.setContent(`<button>foo&nbsp;bar\nbaz</button>`);
+  await expect(page.locator('button')).toHaveAccessibleName('foo bar baz');
+});
+
+test('toHaveAccessibleDescription', async ({ page }) => {
+  await page.setContent(`
+    <div role="button" aria-description="Hello"></div>
+  `);
+  await expect(page.locator('div')).toHaveAccessibleDescription('Hello');
+  await expect(page.locator('div')).not.toHaveAccessibleDescription('hello');
+  await expect(page.locator('div')).toHaveAccessibleDescription('hello', { ignoreCase: true });
+  await expect(page.locator('div')).toHaveAccessibleDescription(/ell\w/);
+  await expect(page.locator('div')).not.toHaveAccessibleDescription(/hello/);
+  await expect(page.locator('div')).toHaveAccessibleDescription(/hello/, { ignoreCase: true });
+
+  await page.setContent(`
+    <div role="button" aria-describedby="desc"></div>
+    <span id="desc">foo&nbsp;bar\nbaz</span>
+  `);
+  await expect(page.locator('div')).toHaveAccessibleDescription('foo bar baz');
+});
+
+test('toHaveAccessibleErrorMessage', async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <input role="textbox" aria-invalid="true" aria-errormessage="error-message" />
+      <div id="error-message">Hello</div>
+      <div id="irrelevant-error">This should not be considered.</div>
+    </form>
+  `);
+
+  const locator = page.locator('input[role="textbox"]');
+  await expect(locator).toHaveAccessibleErrorMessage('Hello');
+  await expect(locator).not.toHaveAccessibleErrorMessage('hello');
+  await expect(locator).toHaveAccessibleErrorMessage('hello', { ignoreCase: true });
+  await expect(locator).toHaveAccessibleErrorMessage(/ell\w/);
+  await expect(locator).not.toHaveAccessibleErrorMessage(/hello/);
+  await expect(locator).toHaveAccessibleErrorMessage(/hello/, { ignoreCase: true });
+  await expect(locator).not.toHaveAccessibleErrorMessage('This should not be considered.');
+});
+
+test('toHaveAccessibleErrorMessage should handle multiple aria-errormessage references', async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <input role="textbox" aria-invalid="true" aria-errormessage="error1 error2" />
+      <div id="error1">First error message.</div>
+      <div id="error2">Second error message.</div>
+      <div id="irrelevant-error">This should not be considered.</div>
+    </form>
+  `);
+
+  const locator = page.locator('input[role="textbox"]');
+
+  await expect(locator).toHaveAccessibleErrorMessage('First error message. Second error message.');
+  await expect(locator).toHaveAccessibleErrorMessage(/first error message./i);
+  await expect(locator).toHaveAccessibleErrorMessage(/second error message./i);
+  await expect(locator).not.toHaveAccessibleErrorMessage(/This should not be considered./i);
+});
+
+test.describe('toHaveAccessibleErrorMessage should handle aria-invalid attribute', () => {
+  const errorMessageText = 'Error message';
+
+  async function setupPage(page, ariaInvalidValue: string | null) {
+    const ariaInvalidAttr = ariaInvalidValue === null ? '' : `aria-invalid="${ariaInvalidValue}"`;
+    await page.setContent(`
+        <form>
+          <input id="node" role="textbox" ${ariaInvalidAttr} aria-errormessage="error-msg" />
+          <div id="error-msg">${errorMessageText}</div>
+        </form>
+      `);
+    return page.locator('#node');
+  }
+
+  test.describe('evaluated in false', () => {
+    test('no aria-invalid attribute', async ({ page }) => {
+      const locator = await setupPage(page, null);
+      await expect(locator).not.toHaveAccessibleErrorMessage(errorMessageText);
+    });
+    test('aria-invalid="false"', async ({ page }) => {
+      const locator = await setupPage(page, 'false');
+      await expect(locator).not.toHaveAccessibleErrorMessage(errorMessageText);
+    });
+    test('aria-invalid="" (empty string)', async ({ page }) => {
+      const locator = await setupPage(page, '');
+      await expect(locator).not.toHaveAccessibleErrorMessage(errorMessageText);
+    });
+  });
+  test.describe('evaluated in true', () => {
+    test('aria-invalid="true"', async ({ page }) => {
+      const locator = await setupPage(page, 'true');
+      await expect(locator).toHaveAccessibleErrorMessage(errorMessageText);
+    });
+    test('aria-invalid="foo" (unrecognized value)', async ({ page }) => {
+      const locator = await setupPage(page, 'foo');
+      await expect(locator).toHaveAccessibleErrorMessage(errorMessageText);
+    });
+  });
+});
+
+const errorMessageText = 'Error message';
+
+test('should show error message when validity is false and aria-invalid is true', async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <input id="node" role="textbox" type="number" min="1" max="100" aria-invalid="true" aria-errormessage="error-msg" />
+      <div id="error-msg">${errorMessageText}</div>
+    </form>
+  `);
+  const locator = page.locator('#node');
+  await locator.fill('101');
+  await expect(locator).toHaveAccessibleErrorMessage(errorMessageText);
+});
+
+test('should show error message when validity is true and aria-invalid is true', async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <input id="node" role="textbox" type="number" min="1" max="100" aria-invalid="true" aria-errormessage="error-msg" />
+      <div id="error-msg">${errorMessageText}</div>
+    </form>
+  `);
+  const locator = page.locator('#node');
+  await locator.fill('99');
+  await expect(locator).toHaveAccessibleErrorMessage(errorMessageText);
+});
+
+test('should show error message when validity is false and aria-invalid is false', async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <input id="node" role="textbox" type="number" min="1" max="100" aria-invalid="false" aria-errormessage="error-msg" />
+      <div id="error-msg">${errorMessageText}</div>
+    </form>
+  `);
+  const locator = page.locator('#node');
+  await locator.fill('101');
+  await expect(locator).toHaveAccessibleErrorMessage(errorMessageText);
+});
+
+test('should not show error message when validity is true and aria-invalid is false', async ({ page }) => {
+  await page.setContent(`
+    <form>
+      <input id="node" role="textbox" type="number" min="1" max="100" aria-invalid="false" aria-errormessage="error-msg" />
+      <div id="error-msg">${errorMessageText}</div>
+    </form>
+  `);
+  const locator = page.locator('#node');
+  await locator.fill('99');
+  await expect(locator).not.toHaveAccessibleErrorMessage(errorMessageText);
+});
+
+test('should show error message for all roles', async ({ page }) => {
+  await page.setContent(`
+    <label for="file">File input</label>
+    <input id="file" aria-invalid="true" aria-errormessage="file-error-id" type="file" />
+    <p id="file-error-id" role="alert">File is incorrect</p>
+  `);
+  const locator = page.getByLabel('File input');
+  await expect(locator).toHaveAccessibleErrorMessage('File is incorrect');
+});
+
+test('toHaveRole', async ({ page }) => {
+  await page.setContent(`<div role="button">Button!</div>`);
+  await expect(page.locator('div')).toHaveRole('button');
+  await expect(page.locator('div')).not.toHaveRole('checkbox');
+  try {
+    // @ts-expect-error
+    await expect(page.locator('div')).toHaveRole(/button|checkbox/);
+    expect(1, 'Must throw when given a regular expression').toBe(2);
+  } catch (error) {
+    expect(error.message).toBe(`"role" argument in toHaveRole must be a string`);
+  }
+});
diff --git a/tests/page/expect-to-have-text.spec.ts b/tests/page/expect-to-have-text.spec.ts
index d10700e98b94d..b1b19cc02a294 100644
--- a/tests/page/expect-to-have-text.spec.ts
+++ b/tests/page/expect-to-have-text.spec.ts
@@ -71,6 +71,8 @@ test.describe('toHaveText with text', () => {
     await expect(locator).toHaveText('text CONTENT', { ignoreCase: true });
     // Should support falsy ignoreCase.
     await expect(locator).not.toHaveText('TEXT', { ignoreCase: false });
+    // Should normalize soft hyphens.
+    await expect(locator).toHaveText('T\u00ade\u00adxt content');
   });
 
   test('pass contain', async ({ page }) => {
@@ -206,7 +208,9 @@ test.describe('toHaveText with array', () => {
     await page.setContent('<div></div>');
     const locator = page.locator('p');
     const error = await expect(locator).not.toHaveText([], { timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain('expect.not.toHaveText with timeout 1000ms');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).not.toHaveText(expected)`);
+    expect(stripAnsi(error.message)).toContain(`Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "not toHaveText" with timeout 1000ms`);
   });
 
   test('pass eventually empty', async ({ page }) => {
@@ -223,9 +227,11 @@ test.describe('toHaveText with array', () => {
     const locator = page.locator('div');
     const error = await expect(locator).toHaveText(['Text 1', /Text \d/, 'Extra'], { timeout: 1000 }).catch(e => e);
     expect(stripAnsi(error.message)).toContain('-   "Extra"');
-    expect(error.message).toContain('expect.toHaveText with timeout 1000ms');
-    expect(error.message).toContain('waiting for locator(\'div\')');
-    expect(error.message).toContain('locator resolved to 2 elements');
+    expect(stripAnsi(error.message)).toContain(`expect(locator).toHaveText(expected)`);
+    expect(stripAnsi(error.message)).toContain(`Timeout:  1000ms`);
+    expect(stripAnsi(error.message)).toContain(`- Expect "toHaveText" with timeout 1000ms`);
+    expect(stripAnsi(error.message)).toContain('waiting for locator(\'div\')');
+    expect(stripAnsi(error.message)).toContain('locator resolved to 2 elements');
   });
 
   test('fail on repeating array matchers', async ({ page }) => {
diff --git a/tests/page/frame-evaluate.spec.ts b/tests/page/frame-evaluate.spec.ts
index b7feb2c0d64a0..5a1c3fa874341 100644
--- a/tests/page/frame-evaluate.spec.ts
+++ b/tests/page/frame-evaluate.spec.ts
@@ -37,9 +37,9 @@ it('should have correct execution contexts @smoke', async ({ page, server }) =>
 
 function expectContexts(pageImpl, count, browserName) {
   if (browserName === 'chromium')
-    expect(pageImpl._delegate._mainFrameSession._contextIdToContext.size).toBe(count);
+    expect(pageImpl.delegate._mainFrameSession._contextIdToContext.size).toBe(count);
   else
-    expect(pageImpl._delegate._contextIdToContext.size).toBe(count);
+    expect(pageImpl.delegate._contextIdToContext.size).toBe(count);
 }
 
 it('should dispose context on navigation', async ({ page, server, toImpl, browserName, isElectron }) => {
@@ -133,8 +133,7 @@ it('should be isolated between frames', async ({ page, server }) => {
 });
 
 it('should work in iframes that failed initial navigation', async ({ page, browserName }) => {
-  it.fail(browserName === 'chromium');
-  it.fixme(browserName === 'firefox');
+  it.fixme(browserName !== 'webkit');
 
   // - Firefox does not report domcontentloaded for the iframe.
   // - Chromium and Firefox report empty url.
@@ -181,4 +180,3 @@ it('evaluateHandle should work', async ({ page, server }) => {
   const windowHandle = await mainFrame.evaluateHandle(() => window);
   expect(windowHandle).toBeTruthy();
 });
-
diff --git a/tests/page/frame-frame-element.spec.ts b/tests/page/frame-frame-element.spec.ts
index e3b25a8fe1a0a..e44e7deb3ec26 100644
--- a/tests/page/frame-frame-element.spec.ts
+++ b/tests/page/frame-frame-element.spec.ts
@@ -75,3 +75,19 @@ it('should work inside closed shadow root', async ({ page, server, browserName }
   const element = await frame.frameElement();
   expect(await element.getAttribute('name')).toBe('myframe');
 });
+
+it('should work inside declarative shadow root', async ({ page, server, browserName }) => {
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`
+    <div>
+      <template shadowrootmode="open">
+        <iframe name="myframe" srcdoc="<h1>Hi!</h1>"></iframe>
+        <slot></slot>
+      </template>
+      <span>footer</span>
+    </div>
+  `);
+  const frame = page.frame({ name: 'myframe' });
+  const element = await frame.frameElement();
+  expect(await element.getAttribute('name')).toBe('myframe');
+});
diff --git a/tests/page/frame-goto.spec.ts b/tests/page/frame-goto.spec.ts
index 56146572f2c1f..6603282bb323f 100644
--- a/tests/page/frame-goto.spec.ts
+++ b/tests/page/frame-goto.spec.ts
@@ -43,8 +43,9 @@ it('should reject when frame detaches', async ({ page, server, browserName }) =>
     expect(error.message.toLowerCase()).toContain('frame was detached');
 });
 
-it('should continue after client redirect', async ({ page, server, isAndroid, mode }) => {
+it('should continue after client redirect', async ({ page, server, isAndroid, browserName }) => {
   it.fixme(isAndroid);
+  it.fixme(browserName === 'firefox', 'script.js is requested before navigationCommitted arrives');
 
   server.setRoute('/frames/script.js', () => {});
   const url = server.PREFIX + '/frames/child-redirect.html';
diff --git a/tests/page/frame-hierarchy.spec.ts b/tests/page/frame-hierarchy.spec.ts
index 3b8f0fb19bd7c..46e9dace1a4ca 100644
--- a/tests/page/frame-hierarchy.spec.ts
+++ b/tests/page/frame-hierarchy.spec.ts
@@ -20,7 +20,7 @@ import { attachFrame, detachFrame } from '../config/utils';
 import type { Frame } from 'playwright-core';
 
 function dumpFrames(frame: Frame, indentation: string = ''): string[] {
-  let description = frame.url().replace(/:\d+\//, ':<PORT>/');
+  let description = frame.url();
   if (frame.name())
     description += ' (' + frame.name() + ')';
   const result = [indentation + description];
@@ -40,11 +40,11 @@ it('should handle nested frames @smoke', async ({ page, server, isAndroid }) =>
 
   await page.goto(server.PREFIX + '/frames/nested-frames.html');
   expect(dumpFrames(page.mainFrame())).toEqual([
-    'http://localhost:<PORT>/frames/nested-frames.html',
-    '    http://localhost:<PORT>/frames/frame.html (aframe)',
-    '    http://localhost:<PORT>/frames/two-frames.html (2frames)',
-    '        http://localhost:<PORT>/frames/frame.html (dos)',
-    '        http://localhost:<PORT>/frames/frame.html (uno)',
+    `${server.PREFIX}/frames/nested-frames.html`,
+    `    ${server.PREFIX}/frames/frame.html (aframe)`,
+    `    ${server.PREFIX}/frames/two-frames.html (2frames)`,
+    `        ${server.PREFIX}/frames/frame.html (dos)`,
+    `        ${server.PREFIX}/frames/frame.html (uno)`,
   ]);
 });
 
diff --git a/tests/page/interception.spec.ts b/tests/page/interception.spec.ts
index d71675cc39e5b..08c502e9e1a85 100644
--- a/tests/page/interception.spec.ts
+++ b/tests/page/interception.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { test as it, expect } from './pageTest';
-import { globToRegex } from '../../packages/playwright-core/lib/utils/glob';
+import { globToRegexPattern, urlMatches } from '../../packages/playwright-core/lib/utils/isomorphic/urlMatch';
 import vm from 'vm';
 
 it('should work with navigation @smoke', async ({ page, server }) => {
@@ -71,12 +71,14 @@ it('should intercept after a service worker', async ({ page, server, browserName
 });
 
 it('should work with glob', async () => {
+  function globToRegex(glob: string): RegExp {
+    return new RegExp(globToRegexPattern(glob));
+  }
   expect(globToRegex('**/*.js').test('https://localhost:8080/foo.js')).toBeTruthy();
   expect(globToRegex('**/*.css').test('https://localhost:8080/foo.js')).toBeFalsy();
   expect(globToRegex('*.js').test('https://localhost:8080/foo.js')).toBeFalsy();
   expect(globToRegex('https://**/*.js').test('https://localhost:8080/foo.js')).toBeTruthy();
   expect(globToRegex('http://localhost:8080/simple/path.js').test('http://localhost:8080/simple/path.js')).toBeTruthy();
-  expect(globToRegex('http://localhost:8080/?imple/path.js').test('http://localhost:8080/Simple/path.js')).toBeTruthy();
   expect(globToRegex('**/{a,b}.js').test('https://localhost:8080/a.js')).toBeTruthy();
   expect(globToRegex('**/{a,b}.js').test('https://localhost:8080/b.js')).toBeTruthy();
   expect(globToRegex('**/{a,b}.js').test('https://localhost:8080/c.js')).toBeFalsy();
@@ -90,18 +92,75 @@ it('should work with glob', async () => {
   expect(globToRegex('http://localhost:3000/signin-oidc*').test('http://localhost:3000/signin-oidc/foo')).toBeFalsy();
   expect(globToRegex('http://localhost:3000/signin-oidc*').test('http://localhost:3000/signin-oidcnice')).toBeTruthy();
 
-  expect(globToRegex('**/three-columns/settings.html?**id=[a-z]**').test('http://mydomain:8080/blah/blah/three-columns/settings.html?id=settings-e3c58efe-02e9-44b0-97ac-dd138100cf7c&blah')).toBeTruthy();
+  // range [] is NOT supported
+  expect(globToRegex('**/api/v[0-9]').test('http://example.com/api/v[0-9]')).toBeTruthy();
+  expect(globToRegex('**/api/v[0-9]').test('http://example.com/api/version')).toBeFalsy();
+
+  // query params
+  expect(globToRegex('**/api\\?param').test('http://example.com/api?param')).toBeTruthy();
+  expect(globToRegex('**/api\\?param').test('http://example.com/api-param')).toBeFalsy();
+  expect(globToRegex('**/three-columns/settings.html\\?**id=settings-**').test('http://mydomain:8080/blah/blah/three-columns/settings.html?id=settings-e3c58efe-02e9-44b0-97ac-dd138100cf7c&blah')).toBeTruthy();
 
   expect(globToRegex('\\?')).toEqual(/^\?$/);
   expect(globToRegex('\\')).toEqual(/^\\$/);
   expect(globToRegex('\\\\')).toEqual(/^\\$/);
   expect(globToRegex('\\[')).toEqual(/^\[$/);
-  expect(globToRegex('[a-z]')).toEqual(/^[a-z]$/);
+  expect(globToRegex('[a-z]')).toEqual(/^\[a-z\]$/);
   expect(globToRegex('$^+.\\*()|\\?\\{\\}\\[\\]')).toEqual(/^\$\^\+\.\*\(\)\|\?\{\}\[\]$/);
+
+  expect(urlMatches(undefined, 'http://playwright.dev/', 'http://playwright.dev')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://playwright.dev/?a=b', 'http://playwright.dev?a=b')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://playwright.dev/', 'h*://playwright.dev')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://api.playwright.dev/?x=y', 'http://*.playwright.dev?x=y')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://playwright.dev/foo/bar', '**/foo/**')).toBeTruthy();
+  expect(urlMatches('http://playwright.dev', 'http://playwright.dev/?x=y', '?x=y')).toBeTruthy();
+  expect(urlMatches('http://playwright.dev/foo/', 'http://playwright.dev/foo/bar?x=y', './bar?x=y')).toBeTruthy();
+
+  // Case insensitive matching
+  expect(urlMatches(undefined, 'https://playwright.dev/fooBAR', 'HtTpS://pLaYwRiGhT.dEv/fooBAR')).toBeTruthy();
+  expect(urlMatches('http://ignored', 'https://playwright.dev/fooBAR', 'HtTpS://pLaYwRiGhT.dEv/fooBAR')).toBeTruthy();
+  // Path and search query are case-sensitive
+  expect(urlMatches(undefined, 'https://playwright.dev/foobar', 'https://playwright.dev/fooBAR')).toBeFalsy();
+  expect(urlMatches(undefined, 'https://playwright.dev/foobar?a=b', 'https://playwright.dev/foobar?A=B')).toBeFalsy();
+
+  // This is not supported, we treat ? as a query separator.
+  expect(globToRegex('http://localhost:8080/?imple/path.js').test('http://localhost:8080/Simple/path.js')).toBeFalsy();
+  expect(urlMatches(undefined, 'http://playwright.dev/', 'http://playwright.?ev')).toBeFalsy();
+  expect(urlMatches(undefined, 'http://playwright./?ev', 'http://playwright.?ev')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://playwright.dev/foo', 'http://playwright.dev/f??')).toBeFalsy();
+  expect(urlMatches(undefined, 'http://playwright.dev/f??', 'http://playwright.dev/f??')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://playwright.dev/?x=y', 'http://playwright.dev\\?x=y')).toBeTruthy();
+  expect(urlMatches(undefined, 'http://playwright.dev/?x=y', 'http://playwright.dev/\\?x=y')).toBeTruthy();
+  expect(urlMatches('http://playwright.dev/foo', 'http://playwright.dev/foo?bar', '?bar')).toBeTruthy();
+  expect(urlMatches('http://playwright.dev/foo', 'http://playwright.dev/foo?bar', '\\\\?bar')).toBeTruthy();
+  expect(urlMatches('http://first.host/', 'http://second.host/foo', '**/foo')).toBeTruthy();
+  expect(urlMatches('http://playwright.dev/', 'http://localhost/', '*//localhost/')).toBeTruthy();
+
+  const customPrefixes = ['about', 'data', 'chrome', 'edge', 'file'];
+  for (const prefix of customPrefixes) {
+    expect(urlMatches('http://playwright.dev/', `${prefix}:blank`, `${prefix}:blank`)).toBeTruthy();
+    expect(urlMatches('http://playwright.dev/', `${prefix}:blank`, `http://playwright.dev/`)).toBeFalsy();
+    expect(urlMatches(undefined, `${prefix}:blank`, `${prefix}:blank`)).toBeTruthy();
+    expect(urlMatches(undefined, `${prefix}:blank`, `${prefix}:*`)).toBeTruthy();
+    expect(urlMatches(undefined, `not${prefix}:blank`, `${prefix}:*`)).toBeFalsy();
+  }
+});
+
+it('should intercept by glob', async function({ page, server, isAndroid }) {
+  it.skip(isAndroid);
+
+  await page.goto(server.EMPTY_PAGE);
+  await page.route('http://localhos**?*oo', async route => {
+    await route.fulfill({
+      status: 200,
+      body: 'intercepted',
+    });
+  });
+  const result = await page.evaluate(url => fetch(url).then(r => r.text()), server.PREFIX + '/?foo');
+  expect(result).toBe('intercepted');
 });
 
-it('should intercept network activity from worker', async function({ page, server, isAndroid, browserName, browserMajorVersion }) {
-  it.skip(browserName === 'firefox' && browserMajorVersion < 114, 'https://github.com/microsoft/playwright/issues/21760');
+it('should intercept network activity from worker', async function({ page, server, isAndroid }) {
   it.skip(isAndroid);
 
   await page.goto(server.EMPTY_PAGE);
@@ -122,7 +181,42 @@ it('should intercept network activity from worker', async function({ page, serve
   expect(msg.text()).toBe('intercepted');
 });
 
-it('should intercept network activity from worker 2', async function({ page, server, isAndroid }) {
+it('should intercept worker requests when enabled after worker creation', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32355' }
+}, async ({ page, server, isAndroid, browserName, browserMajorVersion }) => {
+  it.skip(isAndroid);
+  it.skip(browserName === 'chromium' && browserMajorVersion < 130, 'fixed in Chromium 130');
+
+  await page.goto(server.EMPTY_PAGE);
+  server.setRoute('/data_for_worker', (req, res) => res.end('failed to intercept'));
+  const url = server.PREFIX + '/data_for_worker';
+  await Promise.all([
+    page.waitForEvent('worker'),
+    page.evaluate(url => {
+      (window as any).w = new Worker(URL.createObjectURL(new Blob([`
+        onmessage = function(e) {
+          fetch("${url}").then(response => response.text()).then(console.log);
+        };
+      `], { type: 'application/javascript' })));
+    }, url),
+  ]);
+  // Install the route **after** the worker has been created.
+  await page.route(url, route => {
+    route.fulfill({
+      status: 200,
+      body: 'intercepted',
+    }).catch(e => null);
+  });
+  const [msg] = await Promise.all([
+    page.waitForEvent('console'),
+    page.evaluate(() => (window as any).w.postMessage(''))
+  ]);
+  expect(msg.text()).toBe('intercepted');
+});
+
+it('should intercept network activity from worker 2', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31747' }
+}, async ({ page, server, isAndroid }) => {
   it.skip(isAndroid);
 
   const url = server.PREFIX + '/worker/worker.js';
@@ -164,7 +258,7 @@ it('should work with regular expression passed from a different context', async
   expect(intercepted).toBe(true);
 });
 
-it('should not break remote worker importScripts', async ({ page, server, browserName, browserMajorVersion }) => {
+it('should not break remote worker importScripts', async ({ page, server }) => {
   await page.route('**', async route => {
     await route.continue();
   });
@@ -189,3 +283,20 @@ it('should disable memory cache when intercepting', async ({ page, server }) =>
   await expect(page).toHaveURL(server.PREFIX + '/page.html');
   expect(interceted).toBe(2);
 });
+
+it('should intercept blob url requests', async function({ page, server, browserName }) {
+  it.fixme(browserName !== 'webkit');
+  await page.goto(server.EMPTY_PAGE);
+  await page.route('**/*', route => {
+    route.fulfill({
+      status: 200,
+      body: 'intercepted',
+    }).catch(e => null);
+  });
+  page.on('console', msg => console.log(msg.text()));
+  const response = await page.evaluate(async () => {
+    const blobUrl = URL.createObjectURL(new Blob(['failed to intercept'], { type: 'text/plain' }));
+    return await fetch(blobUrl).then(response => response.text());
+  });
+  expect(response).toBe('intercepted');
+});
diff --git a/tests/page/jshandle-to-string.spec.ts b/tests/page/jshandle-to-string.spec.ts
index 930899ae3d880..6b90352bd5fd0 100644
--- a/tests/page/jshandle-to-string.spec.ts
+++ b/tests/page/jshandle-to-string.spec.ts
@@ -56,7 +56,7 @@ it('should work for promises', async ({ page }) => {
   expect(bHandle.toString()).toBe('Promise');
 });
 
-it('should work with different subtypes @smoke', async ({ page, browserName, browserMajorVersion }) => {
+it('should work with different subtypes @smoke', async ({ page, browserName }) => {
   expect((await page.evaluateHandle('(function(){})')).toString()).toContain('function');
   expect((await page.evaluateHandle('12')).toString()).toBe('12');
   expect((await page.evaluateHandle('true')).toString()).toBe('true');
@@ -67,11 +67,12 @@ it('should work with different subtypes @smoke', async ({ page, browserName, bro
   expect((await page.evaluateHandle('new Set()')).toString()).toContain('Set');
   expect((await page.evaluateHandle('[]')).toString()).toContain('Array');
   expect((await page.evaluateHandle('null')).toString()).toBe('null');
-  expect((await page.evaluateHandle('document.body')).toString()).toBe('JSHandle@node');
+  const bodyHandle = await page.evaluateHandle('document.body');
+  await expect.poll(() => bodyHandle.toString()).toBe('JSHandle@<body></body>');
   expect((await page.evaluateHandle('new WeakMap()')).toString()).toBe('WeakMap');
   expect((await page.evaluateHandle('new WeakSet()')).toString()).toBe('WeakSet');
   expect((await page.evaluateHandle('new Error()')).toString()).toContain('Error');
-  expect((await page.evaluateHandle('new Proxy({}, {})')).toString()).toBe((browserName === 'chromium' && browserMajorVersion >= 111) ? 'Proxy(Object)' : 'Proxy');
+  expect((await page.evaluateHandle('new Proxy({}, {})')).toString()).toBe((browserName === 'chromium') ? 'Proxy(Object)' : 'Proxy');
 });
 
 it('should work with previewable subtypes', async ({ page, browserName }) => {
diff --git a/tests/page/locator-convenience.spec.ts b/tests/page/locator-convenience.spec.ts
index 143bd526d226c..d63b890fd9472 100644
--- a/tests/page/locator-convenience.spec.ts
+++ b/tests/page/locator-convenience.spec.ts
@@ -119,7 +119,15 @@ it('isEnabled and isDisabled should work', async ({ page }) => {
 });
 
 it('isEditable should work', async ({ page }) => {
-  await page.setContent(`<input id=input1 disabled><textarea></textarea><input id=input2>`);
+  await page.setContent(`
+    <input id=input1 disabled>
+    <textarea></textarea>
+    <input id=input2>
+    <div contenteditable="true"></div>
+    <span id=span1 role=textbox aria-readonly=true></span>
+    <span id=span2 role=textbox></span>
+    <button>button</button>
+  `);
   await page.$eval('textarea', t => t.readOnly = true);
   const input1 = page.locator('#input1');
   expect(await input1.isEditable()).toBe(false);
@@ -130,6 +138,11 @@ it('isEditable should work', async ({ page }) => {
   const textarea = page.locator('textarea');
   expect(await textarea.isEditable()).toBe(false);
   expect(await page.isEditable('textarea')).toBe(false);
+  expect(await page.locator('div').isEditable()).toBe(true);
+  expect(await page.locator('#span1').isEditable()).toBe(false);
+  expect(await page.locator('#span2').isEditable()).toBe(true);
+  const error = await page.locator('button').isEditable().catch(e => e);
+  expect(error.message).toContain('Element is not an <input>, <textarea>, <select> or [contenteditable] and does not have a role allowing [aria-readonly]');
 });
 
 it('isChecked should work', async ({ page }) => {
diff --git a/tests/page/locator-evaluate.spec.ts b/tests/page/locator-evaluate.spec.ts
index 4f8a044ea9104..dab9cb98ea1a8 100644
--- a/tests/page/locator-evaluate.spec.ts
+++ b/tests/page/locator-evaluate.spec.ts
@@ -54,3 +54,10 @@ it('should not throw in case of missing selector for all', async ({ page, server
   const nodesLength = await element.evaluateAll(nodes => nodes.length);
   expect(nodesLength).toBe(0);
 });
+
+it('should allow calling _evaluateFunction', async ({ page }) => {
+  await page.setContent('<html><body><div class="tweet"><div class="like">100</div><div class="retweets">10</div></div></body></html>');
+  const tweet = page.locator('.tweet .like') as any;
+  const content = await tweet._evaluateFunction('node => node.innerText');
+  expect(content).toBe('100');
+});
diff --git a/tests/page/locator-frame.spec.ts b/tests/page/locator-frame.spec.ts
index 09767331bdb82..661cc24cc6cb0 100644
--- a/tests/page/locator-frame.spec.ts
+++ b/tests/page/locator-frame.spec.ts
@@ -98,7 +98,7 @@ it('should work for $ and $$', async ({ page, server }) => {
 it('should wait for frame', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);
   const error = await page.locator('body').frameLocator('iframe').locator('span').click({ timeout: 1000 }).catch(e => e);
-  expect(error.message).toContain(`waiting for locator('body').frameLocator('iframe')`);
+  expect(error.message).toContain(`waiting for locator('body').locator('iframe').contentFrame()`);
 });
 
 it('should wait for frame 2', async ({ page, server }) => {
diff --git a/tests/page/locator-highlight.spec.ts b/tests/page/locator-highlight.spec.ts
index 8bc5c75085c3d..92f338c71c17b 100644
--- a/tests/page/locator-highlight.spec.ts
+++ b/tests/page/locator-highlight.spec.ts
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './pageTest';
-import type { Locator } from 'playwright-core';
-
-type BoundingBox = Awaited<ReturnType<Locator['boundingBox']>>;
+import { test as it, expect, roundBox } from './pageTest';
 
 it.skip(({ mode }) => mode !== 'default', 'Highlight element has a closed shadow-root on != default');
 
@@ -30,12 +27,3 @@ it('should highlight locator', async ({ page }) => {
   const box2 = roundBox(await page.locator('x-pw-highlight').boundingBox());
   expect(box1).toEqual(box2);
 });
-
-function roundBox(box: BoundingBox): BoundingBox {
-  return {
-    x: Math.round(box.x),
-    y: Math.round(box.y),
-    width: Math.round(box.width),
-    height: Math.round(box.height),
-  };
-}
diff --git a/tests/page/locator-misc-1.spec.ts b/tests/page/locator-misc-1.spec.ts
index 01745368981a6..eaa0375c32e9e 100644
--- a/tests/page/locator-misc-1.spec.ts
+++ b/tests/page/locator-misc-1.spec.ts
@@ -18,14 +18,18 @@
 import { test as it, expect } from './pageTest';
 import path from 'path';
 
-it('should hover @smoke', async ({ page, server }) => {
+it('should hover @smoke', async ({ page, server, headless }) => {
+  it.skip(!headless, 'headed messes up with hover');
+
   await page.goto(server.PREFIX + '/input/scrollable.html');
   const button = page.locator('#button-6');
   await button.hover();
   expect(await page.evaluate(() => document.querySelector('button:hover').id)).toBe('button-6');
 });
 
-it('should hover when Node is removed', async ({ page, server }) => {
+it('should hover when Node is removed', async ({ page, server, headless }) => {
+  it.skip(!headless, 'headed messes up with hover');
+
   await page.goto(server.PREFIX + '/input/scrollable.html');
   await page.evaluate(() => delete window['Node']);
   const button = page.locator('#button-6');
diff --git a/tests/page/locator-misc-2.spec.ts b/tests/page/locator-misc-2.spec.ts
index 820e9aba49492..d28463a730bf2 100644
--- a/tests/page/locator-misc-2.spec.ts
+++ b/tests/page/locator-misc-2.spec.ts
@@ -16,7 +16,6 @@
  */
 
 import { test as it, expect } from './pageTest';
-import os from 'os';
 
 it('should press @smoke', async ({ page }) => {
   await page.setContent(`<input type='text' />`);
@@ -43,9 +42,8 @@ it('should scroll into view', async ({ page, server, isAndroid }) => {
   }
 });
 
-it('should scroll zero-sized element into view', async ({ page, isAndroid, isElectron, isWebView2, browserName, isMac }) => {
-  it.fixme(isAndroid || isElectron || isWebView2);
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen.');
+it('should scroll zero-sized element into view', async ({ page, isAndroid, isElectron }) => {
+  it.fixme(isAndroid || isElectron);
 
   await page.setContent(`
     <style>
@@ -80,12 +78,7 @@ it('should select textarea', async ({ page, server, browserName }) => {
   const textarea = page.locator('textarea');
   await textarea.evaluate(textarea => (textarea as HTMLTextAreaElement).value = 'some value');
   await textarea.selectText();
-  if (browserName === 'firefox' || browserName === 'webkit') {
-    expect(await textarea.evaluate(el => (el as HTMLTextAreaElement).selectionStart)).toBe(0);
-    expect(await textarea.evaluate(el => (el as HTMLTextAreaElement).selectionEnd)).toBe(10);
-  } else {
-    expect(await page.evaluate(() => window.getSelection().toString())).toBe('some value');
-  }
+  expect(await page.evaluate(() => window.getSelection().toString())).toBe('some value');
 });
 
 it('should type', async ({ page }) => {
@@ -112,7 +105,6 @@ it('should take screenshot', async ({ page, server, browserName, headless, isAnd
 });
 
 it('should return bounding box', async ({ page, server, browserName, headless, isAndroid, isLinux }) => {
-  it.fixme(browserName === 'firefox' && !headless && !isLinux);
   it.skip(isAndroid);
 
   await page.setViewportSize({ width: 500, height: 500 });
@@ -153,6 +145,22 @@ it('should combine visible with other selectors', async ({ page }) => {
   await expect(page.locator('.item >> visible=true >> text=data3')).toHaveText('visible data3');
 });
 
+it('should support filter(visible)', async ({ page }) => {
+  await page.setContent(`<div>
+    <div class="item" style="display: none">Hidden data0</div>
+    <div class="item">visible data1</div>
+    <div class="item" style="display: none">Hidden data1</div>
+    <div class="item">visible data2</div>
+    <div class="item" style="display: none">Hidden data2</div>
+    <div class="item">visible data3</div>
+    </div>
+  `);
+  const locator = page.locator('.item').filter({ visible: true }).nth(1);
+  await expect(locator).toHaveText('visible data2');
+  await expect(page.locator('.item').filter({ visible: true }).getByText('data3')).toHaveText('visible data3');
+  await expect(page.locator('.item').filter({ visible: false }).getByText('data1')).toHaveText('Hidden data1');
+});
+
 it('locator.count should work with deleted Map in main world', async ({ page }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/11254' });
   await page.evaluate('Map = 1');
@@ -177,3 +185,27 @@ it('Locator.locator() and FrameLocator.locator() should accept locator', async (
   expect(await page.frameLocator('iframe').locator(divLocator).locator('input').inputValue()).toBe('inner');
 });
 
+it('should fill programmatically enabled textarea', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36307' } }, async ({ page }) => {
+  await page.setContent(`
+    <button>Enable</button>
+    <form>
+      <textarea id="text" disabled></textarea>
+    </form>
+    <script>
+      document.querySelector('button').addEventListener('click', () => {
+        document.querySelector('#text').disabled = false;
+      });
+    </script>
+  `);
+  await page.locator('button').click();
+  await page.locator('#text').fill('Hello');
+  await expect(page.locator('#text')).toHaveValue('Hello');
+});
+
+it('press should throw on unknown keys', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36697' } }, async ({ page, server }) => {
+  await page.setContent(`<input type='text' value='hello' />`);
+  const locator = page.getByRole('textbox');
+  await expect(locator.press('NotARealKey')).rejects.toThrowError(/Unknown key: "NotARealKey"/);
+  await expect(locator.press('ё')).rejects.toThrowError(/Unknown key: "ё"/);
+  await expect(locator.press('😊')).rejects.toThrowError(/Unknown key: "😊"/);
+});
diff --git a/tests/page/locator-misc-2.spec.ts-snapshots/screenshot-element-bounding-box-moz-firefox-nightly.png b/tests/page/locator-misc-2.spec.ts-snapshots/screenshot-element-bounding-box-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..9e208f86d8f76
Binary files /dev/null and b/tests/page/locator-misc-2.spec.ts-snapshots/screenshot-element-bounding-box-moz-firefox-nightly.png differ
diff --git a/tests/page/locator-query.spec.ts b/tests/page/locator-query.spec.ts
index f1da9bbb34920..6503d93afe7f5 100644
--- a/tests/page/locator-query.spec.ts
+++ b/tests/page/locator-query.spec.ts
@@ -246,9 +246,9 @@ it('should allow some, but not all nested frameLocators', async ({ page }) => {
   await expect(page.frameLocator('iframe').locator('article').or(page.frameLocator('iframe').locator('span'))).toHaveText('world');
   await expect(page.frameLocator('iframe').locator('span').and(page.frameLocator('iframe').locator('#target'))).toHaveText('world');
   const error1 = await expect(page.frameLocator('iframe').locator('div').or(page.frameLocator('#iframe').locator('span'))).toHaveText('world').catch(e => e);
-  expect(error1.message).toContain(`Frame locators are not allowed inside composite locators, while querying "frameLocator('iframe').locator('div').or(frameLocator('#iframe').locator('span'))`);
+  expect(error1.message).toContain(`Frame locators are not allowed inside composite locators, while querying "locator('iframe').contentFrame().locator('div').or(locator('#iframe').contentFrame().locator('span'))`);
   const error2 = await expect(page.frameLocator('iframe').locator('div').and(page.frameLocator('#iframe').locator('span'))).toHaveText('world').catch(e => e);
-  expect(error2.message).toContain(`Frame locators are not allowed inside composite locators, while querying "frameLocator('iframe').locator('div').and(frameLocator('#iframe').locator('span'))`);
+  expect(error2.message).toContain(`Frame locators are not allowed inside composite locators, while querying "locator('iframe').contentFrame().locator('div').and(locator('#iframe').contentFrame().locator('span'))`);
 });
 
 it('should enforce same frame for has/leftOf/rightOf/above/below/near', async ({ page, server }) => {
@@ -272,3 +272,11 @@ it('alias methods coverage', async ({ page }) => {
   await expect(page.locator('div').getByRole('button')).toHaveCount(1);
   await expect(page.mainFrame().locator('button')).toHaveCount(1);
 });
+
+it('count() should not throw during navigation', async ({ page, mode }) => {
+  it.skip(mode !== 'default', 'No test hooks');
+  await page.setContent(`<div>A</div>`);
+  const __testHookBeforeQuery = () => page.goto('data:text/html,<div>A</div><div>B</div>');
+  // @ts-expect-error
+  expect(await page.locator('div').count({ __testHookBeforeQuery })).toBe(0);
+});
diff --git a/tests/page/page-accessibility.spec.ts b/tests/page/page-accessibility.spec.ts
index e6717c5e20bcb..3e95dfe047be8 100644
--- a/tests/page/page-accessibility.spec.ts
+++ b/tests/page/page-accessibility.spec.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import os from 'os';
 import { test as it, expect } from './pageTest';
 import { chromiumVersionLessThan } from '../config/utils';
 
-it('should work @smoke', async ({ page, browserName }) => {
+it('should work @smoke', async ({ page, browserName, isMac }) => {
+  it.skip(browserName === 'webkit' && isMac);
   await page.setContent(`
   <head>
     <title>Accessibility Test</title>
@@ -75,8 +75,7 @@ it('should work @smoke', async ({ page, browserName }) => {
       { role: 'textbox', name: 'Input with whitespace', value: '  ' },
       { role: 'textbox', name: '', value: 'value only' },
       { role: 'textbox', name: 'placeholder', value: 'and a value' },
-      // due to frozen WebKit on macOS 11 we have the if/else here
-      { role: 'textbox', name: parseInt(os.release(), 10) >= 21 ? 'placeholder' : 'This is a description!', value: 'and a value' }, // webkit uses the description over placeholder for the name
+      { role: 'textbox', name: isMac ? 'placeholder' : 'This is a description!', value: 'and a value' },
     ]
   };
   expect(await page.accessibility.snapshot()).toEqual(golden);
@@ -143,9 +142,8 @@ it('should not report text nodes inside controls', async function({ page, browse
   expect(await page.accessibility.snapshot()).toEqual(golden);
 });
 
-it('rich text editable fields should have children', async function({ page, browserName, browserVersion, isWebView2 }) {
+it('rich text editable fields should have children', async function({ page, browserName, browserVersion }) {
   it.skip(browserName === 'webkit', 'WebKit rich text accessibility is iffy');
-  it.skip(isWebView2, 'WebView2 is missing a Chromium fix');
 
   await page.setContent(`
   <div contenteditable="true">
@@ -177,9 +175,8 @@ it('rich text editable fields should have children', async function({ page, brow
   expect(snapshot.children[0]).toEqual(golden);
 });
 
-it('rich text editable fields with role should have children', async function({ page, browserName, browserMajorVersion, browserVersion, isWebView2 }) {
+it('rich text editable fields with role should have children', async function({ page, browserName, browserVersion }) {
   it.skip(browserName === 'webkit', 'WebKit rich text accessibility is iffy');
-  it.skip(isWebView2, 'WebView2 is missing a Chromium fix');
 
   await page.setContent(`
   <div contenteditable="true" role='textbox'>
@@ -196,7 +193,7 @@ it('rich text editable fields with role should have children', async function({
   } : {
     role: 'textbox',
     name: '',
-    multiline: (browserName === 'chromium' && browserMajorVersion >= 92) ? true : undefined,
+    multiline: (browserName === 'chromium') ? true : undefined,
     value: 'Edit this image: ',
     children: (chromiumVersionLessThan(browserVersion, '104.0.1293.1') && browserName === 'chromium') ? [{
       role: 'text',
diff --git a/tests/page/page-add-init-script.spec.ts b/tests/page/page-add-init-script.spec.ts
index b2b7782ebac91..a24c1dad39a27 100644
--- a/tests/page/page-add-init-script.spec.ts
+++ b/tests/page/page-add-init-script.spec.ts
@@ -98,14 +98,3 @@ it('init script should run only once in iframe', async ({ page, server, browserN
     'init script: ' + (browserName === 'firefox' ? 'no url yet' : '/frames/frame.html'),
   ]);
 });
-
-it('init script should run only once in popup', async ({ page, browserName }) => {
-  await page.context().addInitScript(() => {
-    window['callCount'] = (window['callCount'] || 0) + 1;
-  });
-  const [popup] = await Promise.all([
-    page.waitForEvent('popup'),
-    page.evaluate(() => window.open('about:blank')),
-  ]);
-  expect(await popup.evaluate('callCount')).toEqual(1);
-});
diff --git a/tests/page/page-add-locator-handler.spec.ts b/tests/page/page-add-locator-handler.spec.ts
index 0062ba15ab610..069dde024158b 100644
--- a/tests/page/page-add-locator-handler.spec.ts
+++ b/tests/page/page-add-locator-handler.spec.ts
@@ -15,7 +15,6 @@
  */
 
 import { test, expect } from './pageTest';
-import { kTargetClosedErrorMessage } from '../config/errors';
 
 test('should work', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/handle-locator.html');
@@ -87,7 +86,9 @@ test('should work with a custom check', async ({ page, server }) => {
   }
 });
 
-test('should work with locator.hover()', async ({ page, server }) => {
+test('should work with locator.hover()', async ({ page, server, headless }) => {
+  test.skip(!headless, 'Stray hovers in headed mode');
+
   await page.goto(server.PREFIX + '/input/handle-locator.html');
 
   await page.addLocatorHandler(page.getByText('This interstitial covers the button'), async () => {
@@ -119,23 +120,6 @@ test('should not work with force:true', async ({ page, server }) => {
   expect(await page.evaluate('window.clicked')).toBe(undefined);
 });
 
-test('should throw when page closes', async ({ page, server, isAndroid }) => {
-  test.fixme(isAndroid, 'GPU process crash: https://issues.chromium.org/issues/324909825');
-  await page.goto(server.PREFIX + '/input/handle-locator.html');
-
-  await page.addLocatorHandler(page.getByText('This interstitial covers the button'), async () => {
-    await page.close();
-  });
-
-  await page.locator('#aside').hover();
-  await page.evaluate(() => {
-    (window as any).clicked = 0;
-    (window as any).setupAnnoyingInterstitial('mouseover', 1);
-  });
-  const error = await page.locator('#target').click().catch(e => e);
-  expect(error.message).toContain(kTargetClosedErrorMessage);
-});
-
 test('should throw when handler times out', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/handle-locator.html');
 
@@ -179,6 +163,24 @@ test('should work with toBeVisible', async ({ page, server }) => {
   expect(called).toBe(1);
 });
 
+test('should work with locator.waitFor', async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/input/handle-locator.html');
+
+  let called = 0;
+  await page.addLocatorHandler(page.getByText('This interstitial covers the button'), async () => {
+    ++called;
+    await page.locator('#close').click();
+  });
+
+  await page.evaluate(() => {
+    (window as any).clicked = 0;
+    (window as any).setupAnnoyingInterstitial('remove', 1);
+  });
+  await page.locator('#target').waitFor();
+  await expect(page.locator('#interstitial')).not.toBeVisible();
+  expect(called).toBe(1);
+});
+
 test('should work with toHaveScreenshot', async ({ page, server, isAndroid }) => {
   test.fixme(isAndroid, 'Screenshots are cut off on Android');
   await page.setViewportSize({ width: 500, height: 500 });
@@ -293,7 +295,7 @@ test('should wait for hidden by default 2', async ({ page, server }) => {
   });
   const error = await page.locator('#target').click({ timeout: 3000 }).catch(e => e);
   expect(await page.evaluate('window.clicked')).toBe(0);
-  await expect(page.locator('#interstitial')).toBeVisible();
+  expect(await page.locator('#interstitial').isVisible()).toBe(true);
   expect(called).toBe(1);
   expect(error.message).toContain(`locator handler has finished, waiting for getByRole('button', { name: 'close' }) to be hidden`);
 });
diff --git a/tests/page/page-add-locator-handler.spec.ts-snapshots/screenshot-grid-moz-firefox-nightly.png b/tests/page/page-add-locator-handler.spec.ts-snapshots/screenshot-grid-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..7b164933553a5
Binary files /dev/null and b/tests/page/page-add-locator-handler.spec.ts-snapshots/screenshot-grid-moz-firefox-nightly.png differ
diff --git a/tests/page/page-aria-snapshot-ai.spec.ts b/tests/page/page-aria-snapshot-ai.spec.ts
new file mode 100644
index 0000000000000..c7afd03cf34da
--- /dev/null
+++ b/tests/page/page-aria-snapshot-ai.spec.ts
@@ -0,0 +1,394 @@
+/**
+ * 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 { test as it, expect, unshift } from './pageTest';
+
+function snapshotForAI(page: any, options?: { timeout?: number }): Promise<string> {
+  return page._snapshotForAI(options);
+}
+
+it('should generate refs', async ({ page }) => {
+  await page.setContent(`
+    <button>One</button>
+    <button>Two</button>
+    <button>Three</button>
+  `);
+
+  const snapshot1 = await snapshotForAI(page);
+  expect(snapshot1).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - button "One" [ref=e2]
+      - button "Two" [ref=e3]
+      - button "Three" [ref=e4]
+  `);
+  await expect(page.locator('aria-ref=e2')).toHaveText('One');
+  await expect(page.locator('aria-ref=e3')).toHaveText('Two');
+  await expect(page.locator('aria-ref=e4')).toHaveText('Three');
+
+  await page.locator('aria-ref=e3').evaluate((e: HTMLElement) => {
+    e.textContent = 'Not Two';
+  });
+
+  const snapshot2 = await snapshotForAI(page);
+  expect(snapshot2).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - button "One" [ref=e2]
+      - button "Not Two" [ref=e5]
+      - button "Three" [ref=e4]
+  `);
+});
+
+it('should list iframes', async ({ page }) => {
+  await page.setContent(`
+    <h1>Hello</h1>
+    <iframe name="foo" src="data:text/html,<h1>World</h1>">
+  `);
+
+  const snapshot1 = await snapshotForAI(page);
+  expect(snapshot1).toContain('- iframe');
+
+  const frameSnapshot = await page.frameLocator(`iframe`).locator('body').ariaSnapshot();
+  expect(frameSnapshot).toEqual('- heading "World" [level=1]');
+});
+
+it('should stitch all frame snapshots', async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/frames/nested-frames.html');
+  const snapshot = await snapshotForAI(page);
+  expect(snapshot).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - iframe [ref=e2]:
+        - generic [active] [ref=f1e1]:
+          - iframe [ref=f1e2]:
+            - generic [ref=f2e2]: Hi, I'm frame
+          - iframe [ref=f1e3]:
+            - generic [ref=f3e2]: Hi, I'm frame
+      - iframe [ref=e3]:
+        - generic [ref=f4e2]: Hi, I'm frame
+  `);
+
+  const href = await page.locator('aria-ref=e1').evaluate(e => e.ownerDocument.defaultView.location.href);
+  expect(href).toBe(server.PREFIX + '/frames/nested-frames.html');
+
+  const href2 = await page.locator('aria-ref=f1e2').evaluate(e => e.ownerDocument.defaultView.location.href);
+  expect(href2).toBe(server.PREFIX + '/frames/two-frames.html');
+
+  const href3 = await page.locator('aria-ref=f3e2').evaluate(e => e.ownerDocument.defaultView.location.href);
+  expect(href3).toBe(server.PREFIX + '/frames/frame.html');
+
+  {
+    const { resolvedSelector } = await (page.locator('aria-ref=e1') as any)._resolveSelector();
+    const sourceCode = asLocator('javascript', resolvedSelector);
+    expect(sourceCode).toBe(`locator('body')`);
+  }
+  {
+    const { resolvedSelector } = await (page.locator('aria-ref=f3e2') as any)._resolveSelector();
+    const sourceCode = asLocator('javascript', resolvedSelector);
+    expect(sourceCode).toBe(`locator('iframe[name="2frames"]').contentFrame().locator('iframe[name="dos"]').contentFrame().getByText('Hi, I\\'m frame')`);
+  }
+  {
+    // Should tolerate .describe().
+    const { resolvedSelector } = await (page.locator('aria-ref=f2e2').describe('foo bar') as any)._resolveSelector();
+    const sourceCode = asLocator('javascript', resolvedSelector);
+    expect(sourceCode).toBe(`locator('iframe[name=\"2frames\"]').contentFrame().locator('iframe[name=\"uno\"]').contentFrame().getByText('Hi, I\\'m frame')`);
+  }
+  {
+    const error = await (page.locator('aria-ref=e1000') as any)._resolveSelector().catch(e => e);
+    expect(error.message).toContain(`No element matching aria-ref=e1000`);
+  }
+});
+
+it('should not generate refs for elements with pointer-events:none', async ({ page }) => {
+  await page.setContent(`
+    <button style="pointer-events: none">no-ref</button>
+    <div style="pointer-events: none">
+      <button style="pointer-events: auto">with-ref</button>
+    </div>
+    <div style="pointer-events: none">
+      <div style="pointer-events: initial">
+        <button>with-ref</button>
+      </div>
+    </div>
+    <div style="pointer-events: none">
+      <div style="pointer-events: auto">
+        <button>with-ref</button>
+      </div>
+    </div>
+    <div style="pointer-events: auto">
+      <div style="pointer-events: none">
+        <button>no-ref</button>
+      </div>
+    </div>
+  `);
+
+  const snapshot = await snapshotForAI(page);
+  expect(snapshot).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - button "no-ref"
+      - button "with-ref" [ref=e2]
+      - button "with-ref" [ref=e4]
+      - button "with-ref" [ref=e6]
+      - generic [ref=e7]:
+        - generic:
+          - button "no-ref"
+  `);
+});
+
+it('emit generic roles for nodes w/o roles', async ({ page }) => {
+  await page.setContent(`
+    <style>
+    input {
+      width: 0;
+      height: 0;
+      opacity: 0;
+    }
+    </style>
+    <div>
+      <label>
+        <span>
+          <input type="radio" value="Apple" checked="">
+        </span>
+        <span>Apple</span>
+      </label>
+      <label>
+        <span>
+          <input type="radio" value="Pear">
+        </span>
+        <span>Pear</span>
+      </label>
+      <label>
+        <span>
+          <input type="radio" value="Orange">
+        </span>
+        <span>Orange</span>
+      </label>
+    </div>
+  `);
+
+  const snapshot = await snapshotForAI(page);
+
+  expect(snapshot).toContainYaml(`
+    - generic [ref=e2]:
+      - generic [ref=e3]:
+        - generic [ref=e4]:
+          - radio "Apple" [checked]
+        - generic [ref=e5]: Apple
+      - generic [ref=e6]:
+        - generic [ref=e7]:
+          - radio "Pear"
+        - generic [ref=e8]: Pear
+      - generic [ref=e9]:
+        - generic [ref=e10]:
+          - radio "Orange"
+        - generic [ref=e11]: Orange
+  `);
+});
+
+it('should collapse generic nodes', async ({ page }) => {
+  await page.setContent(`
+    <div>
+      <div>
+        <div>
+          <button>Button</button>
+        </div>
+      </div>
+    </div>
+  `);
+
+  const snapshot = await snapshotForAI(page);
+  expect(snapshot).toContainYaml(`
+    - button \"Button\" [ref=e5]
+  `);
+});
+
+it('should include cursor pointer hint', async ({ page }) => {
+  await page.setContent(`
+    <button style="cursor: pointer">Button</button>
+  `);
+
+  const snapshot = await snapshotForAI(page);
+  expect(snapshot).toContainYaml(`
+    - button \"Button\" [ref=e2] [cursor=pointer]
+  `);
+});
+
+it('should gracefully fallback when child frame cant be captured', async ({ page, server }) => {
+  await page.setContent(`
+    <p>Test</p>
+    <iframe src="${server.PREFIX}/redirectloop1.html#depth=100000"></iframe>
+  `, { waitUntil: 'domcontentloaded' });
+  const snapshot = await snapshotForAI(page);
+  expect(snapshot).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - paragraph [ref=e2]: Test
+      - iframe [ref=e3]
+  `);
+});
+
+it('should auto-wait for navigation', async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/frames/frame.html');
+  const [, snapshot] = await Promise.all([
+    page.evaluate(() => window.location.reload()),
+    snapshotForAI(page)
+  ]);
+  expect(snapshot).toContainYaml(`
+    - generic [ref=e2]: Hi, I'm frame
+  `);
+});
+
+it('should auto-wait for blocking CSS', async ({ page, server }) => {
+  server.setRoute('/css', (req, res) => {
+    res.setHeader('Content-Type', 'text/css');
+    setTimeout(() => res.end(`body { monospace }`), 1000);
+  });
+  await page.setContent(`
+    <script src="${server.PREFIX}/css"></script>
+    <p>Hello World</p>
+  `, { waitUntil: 'commit' });
+  expect(await snapshotForAI(page)).toContainYaml('Hello World');
+});
+
+it('should show visible children of hidden elements', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36296' }  }, async ({ page }) => {
+  await page.setContent(`
+    <div style="visibility: hidden">
+      <div style="visibility: visible">
+        <button>Visible</button>
+      </div>
+      <div style="visibility: hidden">
+        <button style="visibility: visible">Visible</button>
+      </div>
+      <div>
+        <div style="visibility: visible">
+          <button style="visibility: hidden">Hidden</button>
+        </div>
+        <button>Hidden</button>
+      </div>
+    </div>
+  `);
+
+  expect(await snapshotForAI(page)).toEqual(unshift(`
+    - generic [active] [ref=e1]:
+      - button "Visible" [ref=e3]
+      - button "Visible" [ref=e4]
+  `));
+});
+
+it('should include active element information', async ({ page }) => {
+  await page.setContent(`
+    <button id="btn1">Button 1</button>
+    <button id="btn2" autofocus>Button 2</button>
+    <div>Not focusable</div>
+  `);
+
+  // Wait for autofocus to take effect
+  await page.waitForFunction(() => document.activeElement?.id === 'btn2');
+
+  const snapshot = await snapshotForAI(page);
+
+  expect(snapshot).toContainYaml(`
+    - generic [ref=e1]:
+      - button "Button 1" [ref=e2]
+      - button "Button 2" [active] [ref=e3]
+      - generic [ref=e4]: Not focusable
+  `);
+});
+
+it('should update active element on focus', async ({ page }) => {
+  await page.setContent(`
+    <input id="input1" placeholder="First input">
+    <input id="input2" placeholder="Second input">
+  `);
+
+  // Initially there shouldn't be an active element on the inputs
+  const initialSnapshot = await snapshotForAI(page);
+  expect(initialSnapshot).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - textbox "First input" [ref=e2]
+      - textbox "Second input" [ref=e3]
+  `);
+
+  // Focus the second input
+  await page.locator('#input2').focus();
+
+  // After focus, the second input should be active
+  const afterFocusSnapshot = await snapshotForAI(page);
+
+  expect(afterFocusSnapshot).toContainYaml(`
+    - generic [ref=e1]:
+      - textbox "First input" [ref=e2]
+      - textbox "Second input" [active] [ref=e3]
+  `);
+});
+
+it('should mark iframe as active when it contains focused element', async ({ page }) => {
+  // Create a simple HTML file for the iframe
+  await page.setContent(`
+    <input id="regular-input" placeholder="Regular input">
+    <iframe src="data:text/html,<input id='iframe-input' placeholder='Input in iframe'>" tabindex="0"></iframe>
+  `);
+
+  // Test 1: Focus the input inside the iframe
+  await page.frameLocator('iframe').locator('#iframe-input').focus();
+  const inputInIframeFocusedSnapshot = await snapshotForAI(page);
+
+  // The iframe should be marked as active when it contains a focused element
+  expect(inputInIframeFocusedSnapshot).toContainYaml(`
+    - generic [ref=e1]:
+      - textbox "Regular input" [ref=e2]
+      - iframe [active] [ref=e3]:
+        - textbox "Input in iframe" [active] [ref=f1e2]
+  `);
+});
+
+it('return empty snapshot when iframe is not loaded', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/pull/36710' } }, async ({ page, server }) => {
+  await page.setContent(`
+    <div style="height: 5000px;">Test</div>
+    <iframe loading="lazy" src="${server.PREFIX}/frame.html"></iframe>
+  `);
+
+  // Wait for the iframe to load
+  await page.waitForSelector('iframe');
+
+  // Get the snapshot of the page
+  const snapshot = await snapshotForAI(page, { timeout: 100 });
+
+  // The iframe should be present but empty
+  expect(snapshot).toContainYaml(`
+    - generic [active] [ref=e1]:
+      - generic [ref=e2]: Test
+      - iframe [ref=e3]
+  `);
+});
+
+it('should support many properties on iframes', async ({ page }) => {
+  await page.setContent(`
+    <input id="regular-input" placeholder="Regular input">
+    <iframe style='cursor: pointer' src="data:text/html,<input id='iframe-input' placeholder='Input in iframe'/>" tabindex="0"></iframe>
+  `);
+
+  // Test 1: Focus the input inside the iframe
+  await page.frameLocator('iframe').locator('#iframe-input').focus();
+  const inputInIframeFocusedSnapshot = await snapshotForAI(page);
+
+  expect(inputInIframeFocusedSnapshot).toContainYaml(`
+    - generic [ref=e1]:
+      - textbox "Regular input" [ref=e2]
+      - iframe [active] [ref=e3] [cursor=pointer]:
+        - textbox "Input in iframe" [active] [ref=f1e2]
+  `);
+});
diff --git a/tests/page/page-aria-snapshot.spec.ts b/tests/page/page-aria-snapshot.spec.ts
new file mode 100644
index 0000000000000..e08f4830da0f6
--- /dev/null
+++ b/tests/page/page-aria-snapshot.spec.ts
@@ -0,0 +1,671 @@
+/**
+ * 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 { Locator } from '@playwright/test';
+import { test as it, expect, unshift } from './pageTest';
+
+async function checkAndMatchSnapshot(locator: Locator, snapshot: string) {
+  expect.soft(await locator.ariaSnapshot()).toBe(unshift(snapshot));
+  await expect.soft(locator).toMatchAriaSnapshot(snapshot);
+}
+
+it('should snapshot', async ({ page }) => {
+  await page.setContent(`<h1>title</h1>`);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - heading "title" [level=1]
+  `);
+});
+
+it('should snapshot list', async ({ page }) => {
+  await page.setContent(`
+    <h1>title</h1>
+    <h1>title 2</h1>
+  `);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - heading "title" [level=1]
+    - heading "title 2" [level=1]
+  `);
+});
+
+it('should snapshot list with accessible name', async ({ page }) => {
+  await page.setContent(`
+    <ul aria-label="my list">
+      <li>one</li>
+      <li>two</li>
+    </ul>
+  `);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - list "my list":
+      - listitem: one
+      - listitem: two
+  `);
+});
+
+it('should snapshot complex', async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li>
+        <a href='about:blank'>link</a>
+      </li>
+    </ul>
+  `);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - list:
+      - listitem:
+        - link "link":
+          - /url: about:blank
+  `);
+});
+
+it('should allow text nodes', async ({ page }) => {
+  await page.setContent(`
+    <h1>Microsoft</h1>
+    <div>Open source projects and samples from Microsoft</div>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - heading "Microsoft" [level=1]
+    - text: Open source projects and samples from Microsoft
+  `);
+});
+
+it('should snapshot details visibility', async ({ page }) => {
+  await page.setContent(`
+    <details>
+      <summary>Summary</summary>
+      <div>Details</div>
+    </details>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - group: Summary
+  `);
+});
+
+it('should snapshot integration', async ({ page }) => {
+  await page.setContent(`
+    <h1>Microsoft</h1>
+    <div>Open source projects and samples from Microsoft</div>
+    <ul>
+      <li>
+        <details>
+          <summary>
+            Verified
+          </summary>
+          <div>
+            <div>
+              <p>
+                We've verified that the organization <strong>microsoft</strong> controls the domain:
+              </p>
+              <ul>
+                <li class="mb-1">
+                  <strong>opensource.microsoft.com</strong>
+                </li>
+              </ul>
+              <div>
+                <a href="about: blank">Learn more about verified organizations</a>
+              </div>
+            </div>
+          </div>
+        </details>
+      </li>
+      <li>
+        <a href="about:blank">
+          <summary title="Label: GitHub Sponsor">Sponsor</summary>
+        </a>
+      </li>
+    </ul>`);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - heading "Microsoft" [level=1]
+    - text: Open source projects and samples from Microsoft
+    - list:
+      - listitem:
+        - group: Verified
+      - listitem:
+        - link "Sponsor":
+          - /url: about:blank
+  `);
+});
+
+it('should support multiline text', async ({ page }) => {
+  await page.setContent(`
+    <p>
+      Line 1
+      Line 2
+      Line 3
+    </p>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - paragraph: Line 1 Line 2 Line 3
+  `);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - paragraph: |
+          Line 1
+          Line 2
+          Line 3
+  `);
+});
+
+it('should concatenate span text', async ({ page }) => {
+  await page.setContent(`
+    <span>One</span> <span>Two</span> <span>Three</span>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - text: One Two Three
+  `);
+});
+
+it('should concatenate span text 2', async ({ page }) => {
+  await page.setContent(`
+    <span>One </span><span>Two </span><span>Three</span>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - text: One Two Three
+  `);
+});
+
+it('should concatenate div text with spaces', async ({ page }) => {
+  await page.setContent(`
+    <div>One</div><div>Two</div><div>Three</div>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - text: One Two Three
+  `);
+});
+
+it('should include pseudo in text', async ({ page }) => {
+  await page.setContent(`
+    <style>
+      span:before {
+        content: 'world';
+      }
+      div:after {
+        content: 'bye';
+      }
+    </style>
+    <a href="about:blank">
+      <span>hello</span>
+      <div>hello</div>
+    </a>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "worldhello hellobye":
+      - /url: about:blank
+  `);
+});
+
+it('should not include hidden pseudo in text', async ({ page }) => {
+  await page.setContent(`
+    <style>
+      span:before {
+        content: 'world';
+        display: none;
+      }
+      div:after {
+        content: 'bye';
+        visibility: hidden;
+      }
+    </style>
+    <a href="about:blank">
+      <span>hello</span>
+      <div>hello</div>
+    </a>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "hello hello":
+      - /url: about:blank
+  `);
+});
+
+it('should include new line for block pseudo', async ({ page }) => {
+  await page.setContent(`
+    <style>
+      span:before {
+        content: 'world';
+        display: block;
+      }
+      div:after {
+        content: 'bye';
+        display: block;
+      }
+    </style>
+    <a href="about:blank">
+      <span>hello</span>
+      <div>hello</div>
+    </a>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "world hello hello bye":
+      - /url: about:blank
+  `);
+});
+
+it('should work with slots', async ({ page }) => {
+  // Text "foo" is assigned to the slot, should not be used twice.
+  await page.setContent(`
+    <button><div>foo</div></button>
+    <script>
+      (() => {
+        const container = document.querySelector('div');
+        const shadow = container.attachShadow({ mode: 'open' });
+        const slot = document.createElement('slot');
+        shadow.appendChild(slot);
+      })();
+    </script>
+  `);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - button "foo"
+  `);
+
+  // Text "foo" is assigned to the slot, should be used instead of slot content.
+  await page.setContent(`
+    <div>foo</div>
+    <script>
+      (() => {
+        const container = document.querySelector('div');
+        const shadow = container.attachShadow({ mode: 'open' });
+        const button = document.createElement('button');
+        shadow.appendChild(button);
+        const slot = document.createElement('slot');
+        button.appendChild(slot);
+        const span = document.createElement('span');
+        span.textContent = 'pre';
+        slot.appendChild(span);
+      })();
+    </script>
+  `);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - button "foo"
+  `);
+
+  // Nothing is assigned to the slot, should use slot content.
+  await page.setContent(`
+    <div></div>
+    <script>
+      (() => {
+        const container = document.querySelector('div');
+        const shadow = container.attachShadow({ mode: 'open' });
+        const button = document.createElement('button');
+        shadow.appendChild(button);
+        const slot = document.createElement('slot');
+        button.appendChild(slot);
+        const span = document.createElement('span');
+        span.textContent = 'pre';
+        slot.appendChild(span);
+      })();
+    </script>
+  `);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - button "pre"
+  `);
+});
+
+it('should snapshot inner text', async ({ page }) => {
+  await page.setContent(`
+    <div role="listitem">
+      <div>
+        <div>
+          <span title="a.test.ts">a.test.ts</span>
+        </div>
+        <div>
+          <button title="Run"></button>
+          <button title="Show source"></button>
+          <button title="Watch"></button>
+        </div>
+      </div>
+    </div>
+    <div role="listitem">
+      <div>
+        <div>
+          <span title="snapshot">snapshot</span>
+        </div>
+        <div class="ui-mode-list-item-time">30ms</div>
+        <div>
+          <button title="Run"></button>
+          <button title="Show source"></button>
+          <button title="Watch"></button>
+        </div>
+      </div>
+    </div>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - listitem:
+      - text: a.test.ts
+      - button "Run"
+      - button "Show source"
+      - button "Watch"
+    - listitem:
+      - text: snapshot 30ms
+      - button "Run"
+      - button "Show source"
+      - button "Watch"
+  `);
+});
+
+it('should include pseudo codepoints', async ({ page, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent(`
+    <link href="codicon.css" rel="stylesheet" />
+    <p class='codicon codicon-check'>hello</p>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - paragraph: \ueab2hello
+  `);
+});
+
+it('check aria-hidden text', async ({ page }) => {
+  await page.setContent(`
+    <p>
+      <span>hello</span>
+      <span aria-hidden="true">world</span>
+    </p>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - paragraph: hello
+  `);
+});
+
+it('should ignore presentation and none roles', async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li role='presentation'>hello</li>
+      <li role='none'>world</li>
+    </ul>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - list: hello world
+  `);
+});
+
+it('should treat input value as text in templates, but not for checkbox/radio/file', async ({ page }) => {
+  await page.setContent(`
+    <input value='hello world'>
+    <input type=file>
+    <input type=checkbox checked>
+    <input type=radio checked>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - textbox: hello world
+    - button "Choose File"
+    - checkbox [checked]
+    - radio [checked]
+  `);
+});
+
+it('should not use on as checkbox value', async ({ page }) => {
+  await page.setContent(`
+    <input type='checkbox'>
+    <input type='radio'>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - checkbox
+    - radio
+  `);
+});
+
+it('should respect aria-owns', async ({ page }) => {
+  await page.setContent(`
+    <a href='about:blank' aria-owns='input p'>
+      <div role='region'>Link 1</div>
+    </a>
+    <a href='about:blank' aria-owns='input p'>
+      <div role='region'>Link 2</div>
+    </a>
+    <input id='input' value='Value'>
+    <p id='p'>Paragraph</p>
+  `);
+
+  // - Different from Chrome DevTools which attributes ownership to the last element.
+  // - CDT also does not include non-owned children in accessible name.
+  // - Disregarding these as aria-owns can't suggest multiple parts by spec.
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "Link 1 Value Paragraph":
+      - /url: about:blank
+      - region: Link 1
+      - textbox: Value
+      - paragraph: Paragraph
+    - link "Link 2 Value Paragraph":
+      - /url: about:blank
+      - region: Link 2
+  `);
+});
+
+it('should be ok with circular ownership', async ({ page }) => {
+  await page.setContent(`
+    <a href='about:blank' id='parent'>
+      <div role='region' aria-owns='parent'>Hello</div>
+    </a>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "Hello":
+      - /url: about:blank
+      - region: Hello
+  `);
+});
+
+it('should escape yaml text in text nodes', async ({ page }) => {
+  await page.setContent(`
+    <details>
+      <summary>one: <a href="#">link1</a> "two <a href="#">link2</a> 'three <a href="#">link3</a> \`four</summary>
+    </details>
+    <ul>
+      <a href="#">one</a>,<a href="#">two</a>
+      (<a href="#">three</a>)
+      {<a href="#">four</a>}
+      [<a href="#">five</a>]
+    </ul>
+    <div>[Select all]</div>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - group:
+      - text: "one:"
+      - link "link1":
+        - /url: "#"
+      - text: "\\\"two"
+      - link "link2":
+        - /url: "#"
+      - text: "'three"
+      - link "link3":
+        - /url: "#"
+      - text: "\`four"
+    - list:
+      - link "one":
+        - /url: "#"
+      - text: ","
+      - link "two":
+        - /url: "#"
+      - text: (
+      - link "three":
+        - /url: "#"
+      - text: ") {"
+      - link "four":
+        - /url: "#"
+      - text: "} ["
+      - link "five":
+        - /url: "#"
+      - text: "]"
+    - text: "[Select all]"
+  `);
+});
+
+it('should normalize whitespace', async ({ page }) => {
+  await page.setContent(`
+    <details>
+      <summary> one  \n two <a href="#"> link &nbsp;\n  1 </a> </summary>
+    </details>
+    <input value='  hello   &nbsp; world '>
+    <button>hello\u00ad\u200bworld</button>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - group:
+      - text: one two
+      - link "link 1":
+        - /url: "#"
+    - textbox: hello world
+    - button "helloworld"
+  `);
+
+  // Weird whitespace in the template should be normalized.
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - group:
+      - text: |
+          one
+          two
+      - link "  link     1 ":
+        - /url: "#"
+    - textbox:        hello  world
+    - button "he\u00adlloworld\u200b"
+  `);
+});
+
+it('should handle long strings', async ({ page }) => {
+  const s = 'a'.repeat(10000);
+  await page.setContent(`
+    <a href='about:blank'>
+      <div role='region'>${s}</div>
+    </a>
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link:
+      - /url: about:blank
+      - region: ${s}
+  `);
+});
+
+it('should escape special yaml characters', async ({ page }) => {
+  await page.setContent(`
+    <a href="#">@hello</a>@hello
+    <a href="#">]hello</a>]hello
+    <a href="#">hello\n</a>
+    hello\n<a href="#">\n hello</a>\n hello
+    <a href="#">#hello</a>#hello
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "@hello":
+      - /url: "#"
+    - text: "@hello"
+    - link "]hello":
+      - /url: "#"
+    - text: "]hello"
+    - link "hello":
+      - /url: "#"
+    - text: hello
+    - link "hello":
+      - /url: "#"
+    - text: hello
+    - link "#hello":
+      - /url: "#"
+    - text: "#hello"
+  `);
+});
+
+it('should escape special yaml values', async ({ page }) => {
+  await page.setContent(`
+    <a href="#">true</a>False
+    <a href="#">NO</a>yes
+    <a href="#">y</a>N
+    <a href="#">on</a>Off
+    <a href="#">null</a>NULL
+    <a href="#">123</a>123
+    <a href="#">-1.2</a>-1.2
+    <a href="#">-</a>-
+    <input type=text value="555">
+  `);
+
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - link "true":
+      - /url: "#"
+    - text: "False"
+    - link "NO":
+      - /url: "#"
+    - text: "yes"
+    - link "y":
+      - /url: "#"
+    - text: "N"
+    - link "on":
+      - /url: "#"
+    - text: "Off"
+    - link "null":
+      - /url: "#"
+    - text: "NULL"
+    - link "123":
+      - /url: "#"
+    - text: "123"
+    - link "-1.2":
+      - /url: "#"
+    - text: "-1.2"
+    - link "-":
+      - /url: "#"
+    - text: "-"
+    - textbox: "555"
+  `);
+});
+
+it('should not report textarea textContent', async ({ page }) => {
+  await page.setContent(`<textarea>Before</textarea>`);
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - textbox: Before
+  `);
+  await page.evaluate(() => {
+    document.querySelector('textarea').value = 'After';
+  });
+  await checkAndMatchSnapshot(page.locator('body'), `
+    - textbox: After
+  `);
+});
+
+it('should not show visible children of hidden elements', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36296' }  }, async ({ page }) => {
+  await page.setContent(`
+    <div style="visibility: hidden;">
+      <div style="visibility: visible;">
+        <button>Button</button>
+      </div>
+    </div>
+  `);
+
+  expect(await page.locator('body').ariaSnapshot()).toBe('');
+});
+
+it('should not show unhidden children of aria-hidden elements', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36296' }  }, async ({ page }) => {
+  await page.setContent(`
+    <div aria-hidden="true">
+      <div aria-hidden="false">
+        <button>Button</button>
+      </div>
+    </div>
+  `);
+
+  expect(await page.locator('body').ariaSnapshot()).toBe('');
+});
diff --git a/tests/page/page-autowaiting-basic.spec.ts b/tests/page/page-autowaiting-basic.spec.ts
index a2104530ef8ec..dbfe482c33492 100644
--- a/tests/page/page-autowaiting-basic.spec.ts
+++ b/tests/page/page-autowaiting-basic.spec.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { stripAnsi } from 'tests/config/utils';
 import type { TestServer } from '../config/testserver';
 import { test as it, expect } from './pageTest';
 
@@ -139,3 +140,21 @@ it('should report navigation in the log when clicking anchor', async ({ page, se
   expect(error.message).toContain('waiting for scheduled navigations to finish');
   expect(error.message).toContain(`navigated to "${server.PREFIX + '/frames/one-frame.html'}"`);
 });
+
+it('should report and collapse log in action', async ({ page, server, mode }) => {
+  await page.setContent(`<input id='checkbox' type='checkbox' style="visibility: hidden"></input>`);
+  const error = await page.locator('input').click({ timeout: 5000 }).catch(e => e);
+  const message = stripAnsi(error.message);
+  expect(message).toContain(`Call log:`);
+  expect(message).toMatch(/\d+ × waiting for/);
+  const logLines = message.substring(message.indexOf('Call log:')).split('\n');
+  expect(logLines.length).toBeLessThan(30);
+});
+
+it('should report and collapse log in expect', async ({ page, server, mode }) => {
+  await page.setContent(`<input id='checkbox' type='checkbox' style="visibility: hidden"></input>`);
+  const error = await expect(page.locator('input')).toBeVisible({ timeout: 5000 }).catch(e => e);
+  const message = stripAnsi(error.message);
+  expect(message).toContain(`Call log:`);
+  expect(message).toMatch(/\d+ × locator resolved to/);
+});
diff --git a/tests/page/page-autowaiting-no-hang.spec.ts b/tests/page/page-autowaiting-no-hang.spec.ts
index f580b8629a142..1fba6fbfefd9e 100644
--- a/tests/page/page-autowaiting-no-hang.spec.ts
+++ b/tests/page/page-autowaiting-no-hang.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { test as it } from './pageTest';
+import { test as it, expect } from './pageTest';
 
 it('clicking on links which do not commit navigation', async ({ page, server, httpsServer }) => {
   await page.goto(server.EMPTY_PAGE);
@@ -31,7 +31,7 @@ it('calling window.stop async', async ({ page, server }) => {
   }, server.EMPTY_PAGE);
 });
 
-it('calling window.stop sync', async ({ page, server }) => {
+it('calling window.stop sync', async ({ page, server, browserName }) => {
   await page.evaluate(url => {
     window.location.href = url;
     window.stop();
@@ -65,3 +65,78 @@ it('opening a popup', async function({ page, server }) {
     page.evaluate(() => window.open(window.location.href) && 1),
   ]);
 });
+
+it('clicking in the middle of navigation that aborts', async ({ page, server }) => {
+  let abortCallback;
+  const abortPromise = new Promise(f => abortCallback = f);
+
+  let stallCallback;
+  const stallPromise = new Promise(f => stallCallback = f);
+
+  server.setRoute('/stall.html', async (req, res) => {
+    stallCallback();
+    await abortPromise;
+    req.socket.destroy();
+  });
+
+  await page.goto(server.PREFIX + '/one-style.html');
+  page.goto(server.PREFIX + '/stall.html').catch(() => {});
+  await stallPromise;
+
+  const clickPromise = page.click('body');
+  await page.waitForTimeout(1000);
+  abortCallback();
+
+  await clickPromise;
+});
+
+it('clicking in the middle of navigation that commits', async ({ page, server }) => {
+  let commitCallback;
+  const abortPromise = new Promise(f => commitCallback = f);
+
+  let stallCallback;
+  const stallPromise = new Promise(f => stallCallback = f);
+
+  server.setRoute('/stall.html', async (req, res) => {
+    stallCallback();
+    await abortPromise;
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end('hello world');
+  });
+
+  await page.goto(server.PREFIX + '/one-style.html');
+  page.goto(server.PREFIX + '/stall.html').catch(() => {});
+  await stallPromise;
+
+  const clickPromise = page.click('body');
+  await page.waitForTimeout(1000);
+  commitCallback();
+
+  await clickPromise;
+  await expect(page.locator('body')).toContainText('hello world');
+});
+
+it('goBack in the middle of navigation that commits', async ({ page, server }) => {
+  let commitCallback;
+  const abortPromise = new Promise(f => commitCallback = f);
+
+  let stallCallback;
+  const stallPromise = new Promise(f => stallCallback = f);
+
+  server.setRoute('/stall.html', async (req, res) => {
+    stallCallback();
+    await abortPromise;
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end('hello world');
+  });
+
+  await page.goto(server.PREFIX + '/one-style.html');
+  page.goto(server.PREFIX + '/stall.html').catch(() => {});
+  await stallPromise;
+
+  const goBackPromise = page.goBack().catch(() => {});
+  await page.waitForTimeout(1000);
+  commitCallback();
+
+  await goBackPromise;
+});
diff --git a/tests/page/page-basic.spec.ts b/tests/page/page-basic.spec.ts
index 0b99d0c8c5f64..d8e8d40dec7ce 100644
--- a/tests/page/page-basic.spec.ts
+++ b/tests/page/page-basic.spec.ts
@@ -15,66 +15,8 @@
  * limitations under the License.
  */
 
-import { kTargetClosedErrorMessage } from '../config/errors';
 import { test as it, expect } from './pageTest';
 
-it('should reject all promises when page is closed', async ({ page, isWebView2, isAndroid }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-  it.fixme(isAndroid, '"Target crashed" instead of "Target closed"');
-
-  let error = null;
-  await Promise.all([
-    page.evaluate(() => new Promise(r => {})).catch(e => error = e),
-    page.close(),
-  ]);
-  expect(error.message).toContain(kTargetClosedErrorMessage);
-});
-
-it('should set the page close state', async ({ page, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  expect(page.isClosed()).toBe(false);
-  await page.close();
-  expect(page.isClosed()).toBe(true);
-});
-
-it('should pass page to close event', async ({ page, isAndroid, isWebView2 }) => {
-  it.fixme(isAndroid);
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  const [closedPage] = await Promise.all([
-    page.waitForEvent('close'),
-    page.close()
-  ]);
-  expect(closedPage).toBe(page);
-});
-
-it('should terminate network waiters', async ({ page, server, isAndroid, isWebView2 }) => {
-  it.fixme(isAndroid);
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  const results = await Promise.all([
-    page.waitForRequest(server.EMPTY_PAGE).catch(e => e),
-    page.waitForResponse(server.EMPTY_PAGE).catch(e => e),
-    page.close()
-  ]);
-  for (let i = 0; i < 2; i++) {
-    const message = results[i].message;
-    expect(message).toContain(kTargetClosedErrorMessage);
-    expect(message).not.toContain('Timeout');
-  }
-});
-
-it('should be callable twice', async ({ page, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  await Promise.all([
-    page.close(),
-    page.close(),
-  ]);
-  await page.close();
-});
-
 it('should fire load when expected', async ({ page }) => {
   await Promise.all([
     page.goto('about:blank'),
@@ -101,18 +43,6 @@ it('should provide access to the opener page', async ({ page }) => {
   expect(opener).toBe(page);
 });
 
-it('should return null if parent page has been closed', async ({ page, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  const [popup] = await Promise.all([
-    page.waitForEvent('popup'),
-    page.evaluate(() => window.open('about:blank')),
-  ]);
-  await page.close();
-  const opener = await popup.opener();
-  expect(opener).toBe(null);
-});
-
 it('should fire domcontentloaded when expected', async ({ page }) => {
   const navigatedPromise = page.goto('about:blank');
   await page.waitForEvent('domcontentloaded');
@@ -135,17 +65,6 @@ it('should pass self as argument to load event', async ({ page }) => {
   expect(eventArg).toBe(page);
 });
 
-it('should fail with error upon disconnect', async ({ page, isAndroid, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-  it.fixme(isAndroid);
-
-  let error;
-  const waitForPromise = page.waitForEvent('download').catch(e => error = e);
-  await page.close();
-  await waitForPromise;
-  expect(error.message).toContain(kTargetClosedErrorMessage);
-});
-
 it('page.url should work', async ({ page, server }) => {
   expect(page.url()).toBe('about:blank');
   await page.goto(server.EMPTY_PAGE);
@@ -175,14 +94,6 @@ it('page.close should work with window.close', async function({ page }) {
   await closedPromise;
 });
 
-it('page.close should work with page.close', async function({ page, isWebView2 }) {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  const closedPromise = new Promise(x => page.on('close', x));
-  await page.close();
-  await closedPromise;
-});
-
 it('page.frame should respect name', async function({ page }) {
   await page.setContent(`<iframe name=target></iframe>`);
   expect(page.frame({ name: 'bogus' })).toBe(null);
diff --git a/tests/page/page-click-react.spec.ts b/tests/page/page-click-react.spec.ts
index 35626910c10e7..f1ee9af3da4bb 100644
--- a/tests/page/page-click-react.spec.ts
+++ b/tests/page/page-click-react.spec.ts
@@ -21,47 +21,6 @@ declare const renderComponent;
 declare const e;
 declare const MyButton;
 
-it('should report that selector does not match anymore', async ({ page, server }) => {
-  it.fixme();
-
-  await page.goto(server.PREFIX + '/react.html');
-  await page.evaluate(() => {
-    renderComponent(e('div', {}, [e(MyButton, { name: 'button1' }), e(MyButton, { name: 'button2' })]));
-  });
-  const __testHookAfterStable = () => page.evaluate(() => {
-    window['counter'] = (window['counter'] || 0) + 1;
-    if (window['counter'] === 1)
-      renderComponent(e('div', {}, [e(MyButton, { name: 'button2' }), e(MyButton, { name: 'button1' })]));
-    else
-      renderComponent(e('div', {}, []));
-  });
-  const error = await page.dblclick('text=button1', { __testHookAfterStable, timeout: 3000 } as any).catch(e => e);
-  expect(await page.evaluate('window.button1')).toBe(undefined);
-  expect(await page.evaluate('window.button2')).toBe(undefined);
-  expect(error.message).toContain('page.dblclick: Timeout 3000ms exceeded.');
-  expect(error.message).toContain('element does not match the selector anymore');
-});
-
-it('should not retarget the handle when element is recycled', async ({ page, server }) => {
-  it.fixme();
-
-  await page.goto(server.PREFIX + '/react.html');
-  await page.evaluate(() => {
-    renderComponent(e('div', {}, [e(MyButton, { name: 'button1' }), e(MyButton, { name: 'button2', disabled: true })]));
-  });
-  const __testHookBeforeStable = () => page.evaluate(() => {
-    window['counter'] = (window['counter'] || 0) + 1;
-    if (window['counter'] === 1)
-      renderComponent(e('div', {}, [e(MyButton, { name: 'button2', disabled: true }), e(MyButton, { name: 'button1' })]));
-  });
-  const handle = await page.$('text=button1');
-  const error = await handle.click({ __testHookBeforeStable, timeout: 3000 } as any).catch(e => e);
-  expect(await page.evaluate('window.button1')).toBe(undefined);
-  expect(await page.evaluate('window.button2')).toBe(undefined);
-  expect(error.message).toContain('elementHandle.click: Timeout 3000ms exceeded.');
-  expect(error.message).toContain('element is disabled - waiting');
-});
-
 it('should timeout when click opens alert', async ({ page, server }) => {
   const dialogPromise = page.waitForEvent('dialog');
   await page.setContent(`<div onclick='window.alert(123)'>Click me</div>`);
@@ -71,40 +30,6 @@ it('should timeout when click opens alert', async ({ page, server }) => {
   await dialog.dismiss();
 });
 
-it('should retarget when element is recycled during hit testing', async ({ page, server }) => {
-  it.fixme();
-
-  await page.goto(server.PREFIX + '/react.html');
-  await page.evaluate(() => {
-    renderComponent(e('div', {}, [e(MyButton, { name: 'button1' }), e(MyButton, { name: 'button2' })]));
-  });
-  const __testHookAfterStable = () => page.evaluate(() => {
-    window['counter'] = (window['counter'] || 0) + 1;
-    if (window['counter'] === 1)
-      renderComponent(e('div', {}, [e(MyButton, { name: 'button2' }), e(MyButton, { name: 'button1' })]));
-  });
-  await page.click('text=button1', { __testHookAfterStable } as any);
-  expect(await page.evaluate('window.button1')).toBe(true);
-  expect(await page.evaluate('window.button2')).toBe(undefined);
-});
-
-it('should retarget when element is recycled before enabled check', async ({ page, server }) => {
-  it.fixme();
-
-  await page.goto(server.PREFIX + '/react.html');
-  await page.evaluate(() => {
-    renderComponent(e('div', {}, [e(MyButton, { name: 'button1' }), e(MyButton, { name: 'button2', disabled: true })]));
-  });
-  const __testHookBeforeStable = () => page.evaluate(() => {
-    window['counter'] = (window['counter'] || 0) + 1;
-    if (window['counter'] === 1)
-      renderComponent(e('div', {}, [e(MyButton, { name: 'button2', disabled: true }), e(MyButton, { name: 'button1' })]));
-  });
-  await page.click('text=button1', { __testHookBeforeStable } as any);
-  expect(await page.evaluate('window.button1')).toBe(true);
-  expect(await page.evaluate('window.button2')).toBe(undefined);
-});
-
 it('should not retarget when element changes on hover', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/react.html');
   await page.evaluate(() => {
diff --git a/tests/page/page-click-scroll.spec.ts b/tests/page/page-click-scroll.spec.ts
index 758a8d0eb95e3..d3e55cdffbc42 100644
--- a/tests/page/page-click-scroll.spec.ts
+++ b/tests/page/page-click-scroll.spec.ts
@@ -78,9 +78,8 @@ it('should scroll into view display:contents with position', async ({ page, brow
   expect(await page.evaluate('window._clicked')).toBe(true);
 });
 
-it('should not crash when force-clicking hidden input', async ({ page, isWebView2 }) => {
+it('should not crash when force-clicking hidden input', async ({ page }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/18183' });
-  it.fixme(isWebView2);
 
   await page.setContent(`<input type=hidden>`);
   const error = await page.locator('input').click({ force: true, timeout: 2000 }).catch(e => e);
diff --git a/tests/page/page-click-timeout-4.spec.ts b/tests/page/page-click-timeout-4.spec.ts
index d00cc62c37abb..a973061ed81ea 100644
--- a/tests/page/page-click-timeout-4.spec.ts
+++ b/tests/page/page-click-timeout-4.spec.ts
@@ -48,3 +48,52 @@ it('should click for the second time after first timeout', async ({ page, server
   await page.click('button');
   expect(await page.evaluate('result')).toBe('Clicked');
 });
+
+it('should fail to click the button behind a large header after scrolling around', async ({ page, isAndroid }) => {
+  it.skip(isAndroid, 'Different viewport size');
+  await page.setViewportSize({ width: 500, height: 240 });
+  await page.setContent(`
+    <style>
+    * {
+      padding: 0;
+      margin: 0;
+    }
+    li {
+      height: 80px;
+      border: 1px solid black;
+    }
+    ol {
+      padding-top: 160px;
+    }
+    div.fixed {
+      position: fixed;
+      z-index: 1001;
+      width: 100%;
+      background: rgba(255, 0, 0, 0.2);
+      height: 2000px;
+    }
+    </style>
+
+    <div class=fixed></div>
+
+    <ol>
+    <li>hi1</li><li>hi2</li><li>hi3</li><li>hi4</li><li>hi5</li><li>hi6</li><li>hi7</li><li>hi8</li>
+    <li id=target onclick="window.__clicked = true">hi9</li>
+    <li>hi10</li><li>hi11</li><li>hi12</li><li>hi13</li><li id=li14>hi14</li>
+    </ol>
+
+    <script>
+      window.scrollTops = [];
+      window.addEventListener('scroll', () => {
+        window.scrollTops.push(window.scrollY);
+      });
+    </script>
+  `);
+  await page.$eval('#li14', e => e.scrollIntoView());
+  const error = await page.click('#target', { timeout: 1500 }).catch(e => e);
+  expect(error.message).toContain(`<div class="fixed"></div> intercepts pointer events`);
+  expect(await page.evaluate(() => window['__clicked'])).toBe(undefined);
+  const scrollTops = await page.evaluate(() => window['scrollTops']);
+  const distinct = new Set(scrollTops);
+  expect(distinct.size).toBeGreaterThan(2);  // At least three different scroll positions.
+});
diff --git a/tests/page/page-click.spec.ts b/tests/page/page-click.spec.ts
index aa02d210ebfe0..f048ea6c5710b 100644
--- a/tests/page/page-click.spec.ts
+++ b/tests/page/page-click.spec.ts
@@ -57,7 +57,7 @@ it('should issue clicks in parallel in page and popup', async ({ page, server })
 it('should click svg', async ({ page }) => {
   await page.setContent(`
     <svg height="100" width="100">
-      <circle onclick="javascript:window.__CLICKED=42" cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
+      <circle onclick="window.__CLICKED=42" cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
     </svg>
   `);
   await page.click('circle');
@@ -79,23 +79,44 @@ it('should click on a span with an inline element inside', async ({ page }) => {
       content: 'q';
     }
     </style>
-    <span onclick='javascript:window.CLICKED=42'></span>
+    <span onclick='window.CLICKED=42'></span>
   `);
   await page.click('span');
   expect(await page.evaluate('CLICKED')).toBe(42);
 });
 
-it('should not throw UnhandledPromiseRejection when page closes', async ({ page, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
+it('should click the aligned 1x1 div', async ({ page }) => {
+  await page.setContent(`<div style="width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
+  await page.click('div');
+  expect(await page.evaluate('window.__clicked')).toBe(true);
+});
 
-  await Promise.all([
-    page.close(),
-    page.mouse.click(1, 2),
-  ]).catch(e => {});
+it('should click the half-aligned 1x1 div', async ({ page }) => {
+  await page.setContent(`<div style="margin-left: 20.5px; margin-top: 11.5px; width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
+  await page.click('div');
+  expect(await page.evaluate('window.__clicked')).toBe(true);
 });
 
-it('should click the 1x1 div', async ({ page }) => {
-  await page.setContent(`<div style="width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
+it('should click the unaligned 1x1 div v1', async ({ page }) => {
+  await page.setContent(`<div style="margin-left: 20.23px; margin-top: 11.65px; width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
+  await page.click('div');
+  expect(await page.evaluate('window.__clicked')).toBe(true);
+});
+
+it('should click the unaligned 1x1 div v2', async ({ page }) => {
+  await page.setContent(`<div style="margin-left: 20.68px; margin-top: 11.13px; width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
+  await page.click('div');
+  expect(await page.evaluate('window.__clicked')).toBe(true);
+});
+
+it('should click the unaligned 1x1 div v3', async ({ page }) => {
+  await page.setContent(`<div style="margin-left: 20.68px; margin-top: 11.52px; width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
+  await page.click('div');
+  expect(await page.evaluate('window.__clicked')).toBe(true);
+});
+
+it('should click the unaligned 1x1 div v4', async ({ page }) => {
+  await page.setContent(`<div style="margin-left: 20.15px; margin-top: 11.24px; width: 1px; height: 1px;" onclick="window.__clicked = true"></div>`);
   await page.click('div');
   expect(await page.evaluate('window.__clicked')).toBe(true);
 });
@@ -124,7 +145,7 @@ it('should click when one of inline box children is outside of viewport', async
       top: -1000px;
     }
     </style>
-    <span onclick='javascript:window.CLICKED = 42;'><i>woof</i><b>doggo</b></span>
+    <span onclick='window.CLICKED = 42;'><i>woof</i><b>doggo</b></span>
   `);
   await page.click('span');
   expect(await page.evaluate('CLICKED')).toBe(42);
@@ -336,7 +357,7 @@ it('should click the button inside an iframe', async ({ page, server }) => {
 });
 
 it('should click the button with fixed position inside an iframe', async ({ page, server, browserName }) => {
-  it.fixme(browserName === 'chromium' || browserName === 'webkit');
+  it.fixme(browserName === 'chromium');
 
   // @see https://github.com/GoogleChrome/puppeteer/issues/4110
   // @see https://bugs.chromium.org/p/chromium/issues/detail?id=986390
@@ -388,6 +409,54 @@ it('should click the button behind sticky header', async ({ page }) => {
   expect(await page.evaluate(() => window['__clicked'])).toBe(true);
 });
 
+it('should click the button behind position:absolute header', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36339' },
+}, async ({ page }) => {
+  await page.setViewportSize({ width: 500, height: 240 });
+  await page.setContent(`
+    <style>
+    * {
+      padding: 0;
+      margin: 0;
+    }
+    li {
+      height: 80px;
+      border: 1px solid black;
+    }
+    ol {
+      height: 100vh;
+      overflow: scroll;
+      padding-top: 160px;
+    }
+    body {
+      position: relative;
+    }
+    div.fixed {
+      position: absolute;
+      top: 0;
+      z-index: 1001;
+      width: 100%;
+      background: red;
+      height: 160px;
+    }
+    </style>
+
+    <ol>
+    <li>hi1</li><li>hi2</li><li>hi3</li><li>hi4</li><li>hi5</li><li>hi6</li><li>hi7</li><li>hi8</li>
+    <li id=target onclick="window.__clicked = true">hi9</li>
+    <li>hi10</li><li>hi11</li><li>hi12</li><li>hi13</li><li id=li14>hi14</li>
+    </ol>
+
+    <div class=fixed>Overlay</div>
+  `);
+  await page.$eval('ol', e => {
+    const target = document.querySelector('#target') as HTMLElement;
+    e.scrollTo({ top: target.offsetTop, behavior: 'instant' });
+  });
+  await page.click('#target');
+  expect(await page.evaluate(() => window['__clicked'])).toBe(true);
+});
+
 it('should click the button with px border with offset', async ({ page, server, browserName }) => {
   await page.goto(server.PREFIX + '/input/button.html');
   await page.$eval('button', button => button.style.borderWidth = '8px');
@@ -409,7 +478,8 @@ it('should click the button with em border with offset', async ({ page, server,
   expect(await page.evaluate('offsetY')).toBe(browserName === 'webkit' ? 12 * 2 + 10 : 10);
 });
 
-it('should click a very large button with offset', async ({ page, server, browserName }) => {
+it('should click a very large button with offset', async ({ page, server, browserName, isAndroid }) => {
+  it.fixme(isAndroid, 'Failed to scroll to a particular point');
   await page.goto(server.PREFIX + '/input/button.html');
   await page.$eval('button', button => button.style.borderWidth = '8px');
   await page.$eval('button', button => button.style.height = button.style.width = '2000px');
@@ -420,7 +490,8 @@ it('should click a very large button with offset', async ({ page, server, browse
   expect(await page.evaluate('offsetY')).toBe(browserName === 'webkit' ? 1910 + 8 : 1910);
 });
 
-it('should click a button in scrolling container with offset', async ({ page, server, browserName }) => {
+it('should click a button in scrolling container with offset', async ({ page, server, browserName, isAndroid }) => {
+  it.fixme(isAndroid, 'Failed to scroll to a particular point');
   await page.goto(server.PREFIX + '/input/button.html');
   await page.$eval('button', button => {
     const container = document.createElement('div');
@@ -573,7 +644,7 @@ it('should fail when obscured and not waiting for hit target', async ({ page, se
 });
 
 it('should wait for button to be enabled', async ({ page }) => {
-  await page.setContent('<button onclick="javascript:window.__CLICKED=true;" disabled><span>Click target</span></button>');
+  await page.setContent('<button onclick="window.__CLICKED=true;" disabled><span>Click target</span></button>');
   let done = false;
   const clickPromise = page.click('text=Click target').then(() => done = true);
   await giveItAChanceToClick(page);
@@ -585,7 +656,7 @@ it('should wait for button to be enabled', async ({ page }) => {
 });
 
 it('should wait for input to be enabled', async ({ page }) => {
-  await page.setContent('<input onclick="javascript:window.__CLICKED=true;" disabled>');
+  await page.setContent('<input onclick="window.__CLICKED=true;" disabled>');
   let done = false;
   const clickPromise = page.click('input').then(() => done = true);
   await giveItAChanceToClick(page);
@@ -617,13 +688,13 @@ it('should wait for select to be enabled', async ({ page }) => {
 });
 
 it('should click disabled div', async ({ page }) => {
-  await page.setContent('<div onclick="javascript:window.__CLICKED=true;" disabled>Click target</div>');
+  await page.setContent('<div onclick="window.__CLICKED=true" disabled>Click target</div>');
   await page.click('text=Click target');
   expect(await page.evaluate('__CLICKED')).toBe(true);
 });
 
 it('should wait for BUTTON to be clickable when it has pointer-events:none', async ({ page }) => {
-  await page.setContent('<button onclick="javascript:window.__CLICKED=true;" style="pointer-events:none"><span>Click target</span></button>');
+  await page.setContent('<button onclick="window.__CLICKED=true" style="pointer-events:none"><span>Click target</span></button>');
   let done = false;
   const clickPromise = page.click('text=Click target').then(() => done = true);
   await giveItAChanceToClick(page);
@@ -635,7 +706,7 @@ it('should wait for BUTTON to be clickable when it has pointer-events:none', asy
 });
 
 it('should wait for LABEL to be clickable when it has pointer-events:none', async ({ page }) => {
-  await page.setContent('<label onclick="javascript:window.__CLICKED=true;" style="pointer-events:none"><span>Click target</span></label>');
+  await page.setContent('<label onclick="window.__CLICKED=true" style="pointer-events:none"><span>Click target</span></label>');
   const clickPromise = page.click('text=Click target');
   // Do a few roundtrips to the page.
   for (let i = 0; i < 5; ++i)
@@ -880,13 +951,13 @@ it('should not hang when frame is detached', async ({ page, server, mode }) => {
 });
 
 it('should climb dom for inner label with pointer-events:none', async ({ page }) => {
-  await page.setContent('<button onclick="javascript:window.__CLICKED=true;"><label style="pointer-events:none">Click target</label></button>');
+  await page.setContent('<button onclick="window.__CLICKED=true;"><label style="pointer-events:none">Click target</label></button>');
   await page.click('text=Click target');
   expect(await page.evaluate('__CLICKED')).toBe(true);
 });
 
 it('should climb up to [role=button]', async ({ page }) => {
-  await page.setContent('<div role=button onclick="javascript:window.__CLICKED=true;"><div style="pointer-events:none"><span><div>Click target</div></span></div>');
+  await page.setContent('<div role=button onclick="window.__CLICKED=true;"><div style="pointer-events:none"><span><div>Click target</div></span></div>');
   await page.click('text=Click target');
   expect(await page.evaluate('__CLICKED')).toBe(true);
 });
@@ -894,13 +965,13 @@ it('should climb up to [role=button]', async ({ page }) => {
 it('should climb up to a anchor', async ({ page }) => {
   // For Firefox its not allowed to return anything: https://bugzilla.mozilla.org/show_bug.cgi?id=1392046
   // Note the intermediate div - it is necessary, otherwise <a><non-clickable/></a> is not recognized as a clickable link.
-  await page.setContent(`<a href="javascript:(function(){window.__CLICKED=true})()" id="outer"><div id="intermediate"><div id="inner" style="pointer-events: none">Inner</div></div></a>`);
+  await page.setContent(`<a href="#" onclick="window.__CLICKED=true" id="outer"><div id="intermediate"><div id="inner" style="pointer-events: none">Inner</div></div></a>`);
   await page.click('#inner');
   expect(await page.evaluate('__CLICKED')).toBe(true);
 });
 
 it('should climb up to a [role=link]', async ({ page }) => {
-  await page.setContent(`<div role=link onclick="javascript:window.__CLICKED=true;" id="outer"><div id="inner" style="pointer-events: none">Inner</div></div>`);
+  await page.setContent(`<div role=link onclick="window.__CLICKED=true" id="outer"><div id="inner" style="pointer-events: none">Inner</div></div>`);
   await page.click('#inner');
   expect(await page.evaluate('__CLICKED')).toBe(true);
 });
@@ -1070,7 +1141,7 @@ it('ensure events are dispatched in the individual tasks', async ({ page, browse
     function onClick(name) {
       console.log(`click ${name}`);
 
-      window.builtinSetTimeout(function() {
+      window.builtins.setTimeout(function() {
         console.log(`timeout ${name}`);
       }, 0);
 
@@ -1114,7 +1185,7 @@ it('should click if opened select covers the button', async ({ page }) => {
       </select>
     </div>
     <div>
-      <button onclick="javascript:window.__CLICKED=42">clickme</button>
+      <button onclick="window.__CLICKED=42">clickme</button>
     </div>
   `);
   await page.click('select');
@@ -1144,3 +1215,49 @@ it('should fire contextmenu event on right click in correct order', async ({ pag
     'contextmenu',
   ]);
 });
+
+it('should set PointerEvent.pressure on pointerdown', async ({ page, isLinux, headless }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35844' });
+  it.fixme(isLinux && !headless, 'Stray mouse events on Linux headed mess up the tests.');
+  await page.setContent(`
+    <button id="target">Click me</button>
+    <script>
+      window['pressures'] = [];
+      document.addEventListener('pointerdown', e => window['pressures'].push(['pointerdown', e.pressure]));
+      document.addEventListener('pointerup', e => window['pressures'].push(['pointerup', e.pressure]));
+    </script>
+  `);
+  await page.click('button');
+  expect(await page.evaluate(() => window['pressures'])).toEqual([
+    ['pointerdown', 0.5],
+    ['pointerup', 0],
+  ]);
+});
+
+it('should set PointerEvent.pressure on pointermove', async ({ page, isLinux, headless, isWindows, browserName, isAndroid }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35844' });
+  it.fixme(isLinux && !headless, 'Stray mouse events on Linux headed mess up the tests.');
+  it.fixme(isWindows && !headless && browserName === 'webkit', 'WebKit win also send stray mouse events.');
+  it.fixme(isAndroid, 'Android coordinates seem to have rounding issues.');
+  await page.setContent(`
+    <body style="margin: 0; padding: 0;">
+      <div id="target" style="width: 500px; height: 500px; background-color: red;"></div>
+      <script>
+        window['pressures'] = [];
+        document.addEventListener('pointermove', e => window['pressures'].push([e.pressure, e.clientX, e.clientY]));
+      </script>
+    </body>
+  `);
+  await page.click('div#target');
+  await page.mouse.move(10, 10);
+  await page.mouse.down();
+  await page.mouse.move(250, 250);
+  await page.mouse.up();
+  await page.mouse.move(50, 50);
+  expect(await page.evaluate(() => window['pressures'])).toEqual([
+    [0, 250, 250],
+    [0, 10, 10],
+    [0.5, 250, 250],
+    [0, 50, 50],
+  ]);
+});
diff --git a/tests/page/page-close.spec.ts b/tests/page/page-close.spec.ts
deleted file mode 100644
index c1123b819071d..0000000000000
--- a/tests/page/page-close.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- * Modifications 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 as it, expect } from './pageTest';
-
-it.skip(({ isWebView2 }) => isWebView2, 'Page.close() is not supported in WebView2');
-
-it('should close page with active dialog', async ({ page }) => {
-  await page.evaluate('"trigger builtinSetTimeout"');
-  await page.setContent(`<button onclick="builtinSetTimeout(() => alert(1))">alert</button>`);
-  void page.click('button').catch(() => {});
-  await page.waitForEvent('dialog');
-  await page.close();
-});
-
-it('should not accept dialog after close', async ({ page, mode }) => {
-  it.fixme(mode.startsWith('service2'), 'Times out');
-  const promise = page.waitForEvent('dialog');
-  page.evaluate(() => alert()).catch(() => {});
-  const dialog = await promise;
-  await page.close();
-  const e = await dialog.dismiss().catch(e => e);
-  expect(e.message).toContain('Target page, context or browser has been closed');
-});
diff --git a/tests/page/page-dialog.spec.ts b/tests/page/page-dialog.spec.ts
index 61499890817fa..657653a577b74 100644
--- a/tests/page/page-dialog.spec.ts
+++ b/tests/page/page-dialog.spec.ts
@@ -67,7 +67,7 @@ it('should dismiss the confirm prompt', async ({ page }) => {
 it('should be able to close context with open alert', async ({ page }) => {
   const alertPromise = page.waitForEvent('dialog');
   await page.evaluate(() => {
-    window.builtinSetTimeout(() => alert('hello'), 0);
+    window.builtins.setTimeout(() => alert('hello'), 0);
   });
   await alertPromise;
 });
diff --git a/tests/page/page-dispatchevent.spec.ts b/tests/page/page-dispatchevent.spec.ts
index d4d780c190407..4ad21e2c16353 100644
--- a/tests/page/page-dispatchevent.spec.ts
+++ b/tests/page/page-dispatchevent.spec.ts
@@ -119,7 +119,7 @@ it('should be atomic', async ({ playwright, page }) => {
     }
   });
   await playwright.selectors.register('dispatchEvent', createDummySelector);
-  await page.setContent(`<div onclick="window._clicked=true">Hello</div>`);
+  await page.goto(`data:text/html,<div onclick="window._clicked=true">Hello</div>`);
   await page.dispatchEvent('dispatchEvent=div', 'click');
   expect(await page.evaluate(() => window['_clicked'])).toBe(true);
 });
diff --git a/tests/page/page-drag.spec.ts b/tests/page/page-drag.spec.ts
index c227978f23268..e7e3d178378f3 100644
--- a/tests/page/page-drag.spec.ts
+++ b/tests/page/page-drag.spec.ts
@@ -358,7 +358,7 @@ it('should report event.buttons', async ({ page, browserName }) => {
     function onEvent(event) {
       logs.push({ type: event.type, buttons: event.buttons });
     }
-    await new Promise(window.builtinRequestAnimationFrame);
+    await new Promise(window.builtins.requestAnimationFrame);
     return logs;
   });
   await page.mouse.move(20, 20);
diff --git a/tests/page/page-emulate-media.spec.ts b/tests/page/page-emulate-media.spec.ts
index c895d64eff789..734bda766b1ca 100644
--- a/tests/page/page-emulate-media.spec.ts
+++ b/tests/page/page-emulate-media.spec.ts
@@ -15,7 +15,24 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './pageTest';
+import type { Page } from 'packages/playwright-test';
+import { test as it, expect as baseExpect } from './pageTest';
+
+const expect = baseExpect.extend({
+  async toMatchMedia(page: Page, mediaQuery: string) {
+    const pass = await page.evaluate(mediaQuery => matchMedia(mediaQuery).matches, mediaQuery).catch(() => false);
+    return {
+      message() {
+        if (pass)
+          return `Expected "${mediaQuery}" not to match, but it did`;
+        else
+          return `Expected "${mediaQuery}" to match, but it did not`;
+      },
+      pass,
+      name: 'toMatchMedia',
+    };
+  },
+});
 
 it('should emulate type @smoke', async ({ page }) => {
   expect(await page.evaluate(() => matchMedia('screen').matches)).toBe(true);
@@ -158,3 +175,15 @@ it('should emulate forcedColors ', async ({ page, browserName }) => {
   await page.emulateMedia({ forcedColors: null });
   expect(await page.evaluate(() => matchMedia('(forced-colors: none)').matches)).toBe(true);
 });
+
+it('should emulate contrast ', async ({ page }) => {
+  await expect(page).toMatchMedia('(prefers-contrast: no-preference)');
+  await page.emulateMedia({ contrast: 'no-preference' });
+  await expect(page).toMatchMedia('(prefers-contrast: no-preference)');
+  await expect(page).not.toMatchMedia('(prefers-contrast: more)');
+  await page.emulateMedia({ contrast: 'more' });
+  await expect(page).not.toMatchMedia('(prefers-contrast: no-preference)');
+  await expect(page).toMatchMedia('(prefers-contrast: more)');
+  await page.emulateMedia({ contrast: null });
+  await expect(page).toMatchMedia('(prefers-contrast: no-preference)');
+});
diff --git a/tests/page/page-evaluate.spec.ts b/tests/page/page-evaluate.spec.ts
index f0a97cf3262fe..d1598f150ef78 100644
--- a/tests/page/page-evaluate.spec.ts
+++ b/tests/page/page-evaluate.spec.ts
@@ -94,6 +94,27 @@ it('should transfer arrays as arrays, not objects', async ({ page }) => {
   expect(result).toBe(true);
 });
 
+it('should transfer typed arrays', async ({ page }) => {
+  const testCases = [
+    new Int8Array([1, 2, 3]),
+    new Uint8Array([1, 2, 3]),
+    new Uint8ClampedArray([1, 2, 3]),
+    new Int16Array([1, 2, 3]),
+    new Uint16Array([1, 2, 3]),
+    new Int32Array([1, 2, 3]),
+    new Uint32Array([1, 2, 3]),
+    new Float32Array([1.1, 2.2, 3.3]),
+    new Float64Array([1.1, 2.2, 3.3]),
+    new BigInt64Array([1n, 2n, 3n]),
+    new BigUint64Array([1n, 2n, 3n])
+  ];
+
+  for (const typedArray of testCases) {
+    const result = await page.evaluate(a => a, typedArray);
+    expect(result).toEqual(typedArray);
+  }
+});
+
 it('should transfer bigint', async ({ page }) => {
   expect(await page.evaluate(() => 42n)).toBe(42n);
   expect(await page.evaluate(a => a, 17n)).toBe(17n);
@@ -349,10 +370,10 @@ it('should properly serialize null fields', async ({ page }) => {
 
 it('should properly serialize PerformanceMeasure object', async ({ page }) => {
   expect(await page.evaluate(() => {
-    window.builtinPerformance.mark('start');
-    window.builtinPerformance.mark('end');
-    window.builtinPerformance.measure('my-measure', 'start', 'end');
-    return window.builtinPerformance.getEntriesByType('measure');
+    window.builtins.performance.mark('start');
+    window.builtins.performance.mark('end');
+    window.builtins.performance.measure('my-measure', 'start', 'end');
+    return window.builtins.performance.getEntriesByType('measure');
   })).toEqual([{
     duration: expect.any(Number),
     entryType: 'measure',
@@ -400,6 +421,41 @@ it('should return undefined for non-serializable objects', async ({ page }) => {
   expect(await page.evaluate(() => function() {})).toBe(undefined);
 });
 
+it('should throw for too deep reference chain', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33997' }
+}, async ({ page, browserName }) => {
+  it.fixme(browserName === 'firefox', 'Firefox Juggler -> Playwright serialiser does not throw for deep references.\nThis causes large objects to get serialised back to the Playwright client.\nThere our validators throw \'Maximum call stack size exceeded\'.');
+  await expect(page.evaluate(depth => {
+    const obj = {};
+    let temp = obj;
+    for (let i = 0; i < depth; i++) {
+      temp[i] = {};
+      temp = temp[i];
+    }
+    return obj;
+  }, 1000)).rejects.toThrow('Cannot serialize result: object reference chain is too long.');
+});
+
+it('should throw usable message for unserializable shallow function', async ({ page }) => {
+  await expect(() => page.evaluate(arg => arg, () => { }))
+      .rejects.toThrow(/Attempting to serialize unexpected value: \(\) => {}/);
+});
+
+it('should throw usable message for unserializable object one deep function', async ({ page }) => {
+  await expect(() => page.evaluate(arg => arg, { aProperty: () => { } }))
+      .rejects.toThrow(/Attempting to serialize unexpected value at position "aProperty": \(\) => {}/);
+});
+
+it('should throw usable message for unserializable object nested function', async ({ page }) => {
+  await expect(() => page.evaluate(arg => arg, { a: { inner: { property: () => { } } } }))
+      .rejects.toThrow(/Attempting to serialize unexpected value at position "a\.inner\.property": \(\) => {}/);
+});
+
+it('should throw usable message for unserializable array nested function', async ({ page }) => {
+  await expect(() => page.evaluate(arg => arg, { a: { inner: ['firstValue', { property: () => { } }] } }))
+      .rejects.toThrow(/Attempting to serialize unexpected value at position "a\.inner\[1\]\.property": \(\) => {}/);
+});
+
 it('should alias Window, Document and Node', async ({ page }) => {
   const object = await page.evaluate('[window, document, document.body]');
   expect(object).toEqual(['ref: <Window>', 'ref: <Document>', 'ref: <Node>']);
@@ -793,3 +849,17 @@ it('should work with Array.from/map', async ({ page }) => {
     return r('([a-f0-9]{2})', 3);
   })).toBe('([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})');
 });
+
+it('should ignore dangerous object keys', async ({ page }) => {
+  const input = {
+    __proto__: { polluted: true },
+    safeKey: 'safeValue'
+  };
+  const result = await page.evaluate(arg => arg, input);
+  expect(result).toEqual({ safeKey: 'safeValue' });
+});
+
+it('should allow calling _evaluateFunction', async ({ page }) => {
+  const result = await (page as any)._evaluateFunction('() => 7 * 3');
+  expect(result).toBe(21);
+});
diff --git a/tests/page/page-event-console.spec.ts b/tests/page/page-event-console.spec.ts
index ee47e81e02ef3..d37b28e734979 100644
--- a/tests/page/page-event-console.spec.ts
+++ b/tests/page/page-event-console.spec.ts
@@ -97,9 +97,9 @@ it('should format the message correctly with time/timeLog/timeEnd', async ({ pag
   page.on('console', msg => messages.push(msg));
   await page.evaluate(async () => {
     console.time('foo time');
-    await new Promise(x => window.builtinSetTimeout(x, 100));
+    await new Promise(x => window.builtins.setTimeout(x, 100));
     console.timeLog('foo time');
-    await new Promise(x => window.builtinSetTimeout(x, 100));
+    await new Promise(x => window.builtins.setTimeout(x, 100));
     console.timeEnd('foo time');
   });
   expect(messages.length).toBe(2);
diff --git a/tests/page/page-event-network.spec.ts b/tests/page/page-event-network.spec.ts
index 8aa1462d5a71e..e7004f576a245 100644
--- a/tests/page/page-event-network.spec.ts
+++ b/tests/page/page-event-network.spec.ts
@@ -17,7 +17,6 @@
 
 import type { ServerResponse } from 'http';
 import { test as it, expect } from './pageTest';
-import { kTargetClosedErrorMessage } from '../config/errors';
 
 it('Page.Events.Request @smoke', async ({ page, server }) => {
   const requests = [];
@@ -138,23 +137,3 @@ it('should resolve responses after a navigation', async ({ page, server, browser
   // the response should resolve to null, because the page navigated.
   expect(await responsePromise).toBe(null);
 });
-
-it('interrupt request.response() and request.allHeaders() on page.close', async ({ page, server, browserName }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27227' });
-  server.setRoute('/one-style.css', (req, res) => {
-    res.setHeader('Content-Type', 'text/css');
-  });
-  const reqPromise = page.waitForRequest('**/one-style.css');
-  await page.goto(server.PREFIX + '/one-style.html', { waitUntil: 'domcontentloaded' });
-  const req = await reqPromise;
-  const respPromise = req.response().catch(e => e);
-  const headersPromise = req.allHeaders().catch(e => e);
-  await page.close();
-  expect((await respPromise).message).toContain(kTargetClosedErrorMessage);
-  // All headers are the same as "provisional" headers in Firefox.
-  if (browserName === 'firefox')
-    expect((await headersPromise)['user-agent']).toBeTruthy();
-  else
-    expect((await headersPromise).message).toContain(kTargetClosedErrorMessage);
-
-});
diff --git a/tests/page/page-event-pageerror.spec.ts b/tests/page/page-event-pageerror.spec.ts
index 1e91ce7b7f145..c7fc699683ac0 100644
--- a/tests/page/page-event-pageerror.spec.ts
+++ b/tests/page/page-event-pageerror.spec.ts
@@ -70,7 +70,7 @@ it('should contain the Error.name property', async ({ page }) => {
   const [error] = await Promise.all([
     page.waitForEvent('pageerror'),
     page.evaluate(() => {
-      window.builtinSetTimeout(() => {
+      window.builtins.setTimeout(() => {
         const error = new Error('my-message');
         error.name = 'my-name';
         throw error;
@@ -85,7 +85,7 @@ it('should support an empty Error.name property', async ({ page }) => {
   const [error] = await Promise.all([
     page.waitForEvent('pageerror'),
     page.evaluate(() => {
-      window.builtinSetTimeout(() => {
+      window.builtins.setTimeout(() => {
         const error = new Error('my-message');
         error.name = '';
         throw error;
@@ -107,7 +107,7 @@ it('should handle odd values', async ({ page }) => {
     const [error] = await Promise.all([
       page.waitForEvent('pageerror'),
       page.evaluate(value => {
-        window.builtinSetTimeout(() => { throw value; }, 0);
+        window.builtins.setTimeout(() => { throw value; }, 0);
       }, value),
     ]);
     expect(error.message).toBe(message);
@@ -118,7 +118,7 @@ it('should handle object', async ({ page, browserName }) => {
   const [error] = await Promise.all([
     page.waitForEvent('pageerror'),
     page.evaluate(() => {
-      window.builtinSetTimeout(() => { throw {}; }, 0);
+      window.builtins.setTimeout(() => { throw {}; }, 0);
     }),
   ]);
   expect(error.message).toBe(browserName === 'chromium' ? 'Object' : '[object Object]');
@@ -128,7 +128,7 @@ it('should handle window', async ({ page, browserName }) => {
   const [error] = await Promise.all([
     page.waitForEvent('pageerror'),
     page.evaluate(() => {
-      window.builtinSetTimeout(() => { throw window; }, 0);
+      window.builtins.setTimeout(() => { throw window; }, 0);
     }),
   ]);
   expect(error.message).toBe(browserName === 'chromium' ? 'Window' : '[object Window]');
diff --git a/tests/page/page-event-popup.spec.ts b/tests/page/page-event-popup.spec.ts
index 07b203709ae38..152136acdebf5 100644
--- a/tests/page/page-event-popup.spec.ts
+++ b/tests/page/page-event-popup.spec.ts
@@ -146,22 +146,6 @@ it('should work with clicking target=_blank and rel=noopener', async ({ page, se
   expect(await popup.evaluate(() => !!window.opener)).toBe(false);
 });
 
-it('should not treat navigations as new popups', async ({ page, server, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  await page.goto(server.EMPTY_PAGE);
-  await page.setContent('<a target=_blank rel=noopener href="/one-style.html">yo</a>');
-  const [popup] = await Promise.all([
-    page.waitForEvent('popup'),
-    page.click('a'),
-  ]);
-  let badSecondPopup = false;
-  page.on('popup', () => badSecondPopup = true);
-  await popup.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
-  await page.close();
-  expect(badSecondPopup).toBe(false);
-});
-
 it('should report popup opened from iframes', async ({ page, server, browserName }) => {
   await page.goto(server.PREFIX + '/frames/two-frames.html');
   const frame = page.frame('uno');
diff --git a/tests/page/page-event-request.spec.ts b/tests/page/page-event-request.spec.ts
index cfc2f7a1e225c..028ddcca54fbe 100644
--- a/tests/page/page-event-request.spec.ts
+++ b/tests/page/page-event-request.spec.ts
@@ -41,6 +41,19 @@ it('should fire for fetches', async ({ page, server }) => {
   expect(requests.length).toBe(2);
 });
 
+it('should fire for fetches with keepalive: true', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/34497'
+  }
+}, async ({ page, server, browserName }) => {
+  const requests = [];
+  page.on('request', request => requests.push(request));
+  await page.goto(server.EMPTY_PAGE);
+  await page.evaluate(() => fetch('/empty.html', { keepalive: true }));
+  expect(requests.length).toBe(2);
+});
+
 it('should report requests and responses handled by service worker', async ({ page, server, isAndroid, isElectron }) => {
   it.fixme(isAndroid);
   it.fixme(isElectron);
@@ -241,3 +254,125 @@ it('main resource xhr should have type xhr', async ({ page, server }) => {
   expect(request.isNavigationRequest()).toBe(false);
   expect(request.resourceType()).toBe('xhr');
 });
+
+it('should finish 204 request', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32752' }
+}, async ({ page, server, browserName }) => {
+  it.fixme(browserName === 'chromium');
+  server.setRoute('/204', (req, res) => {
+    res.writeHead(204, { 'Content-type': 'text/plain' });
+    res.end();
+  });
+  await page.goto(server.EMPTY_PAGE);
+  const reqPromise = Promise.race([
+    page.waitForEvent('requestfailed', r => r.url().endsWith('/204')).then(() => 'requestfailed'),
+    page.waitForEvent('requestfinished', r => r.url().endsWith('/204')).then(() => 'requestfinished'),
+  ]);
+  page.evaluate(async url => { await fetch(url); }, server.PREFIX + '/204').catch(() => {});
+  expect(await reqPromise).toBe('requestfinished');
+});
+
+it('<picture> resource should have type image', async ({ page }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33148' });
+  const [request] = await Promise.all([
+    page.waitForEvent('request'),
+    page.setContent(`
+      <picture>
+        <source>
+          <img src="https://www.wikipedia.org/portal/wikipedia.org/assets/img/Wikipedia-logo-v2@2x.png">
+        </source>
+      </picture>
+    `)
+  ]);
+  expect(request.resourceType()).toBe('image');
+});
+
+// Chromium: requestWillBeSentEvent.frameId is undefined for OPTIONS.
+// WebKit: no requestWillBeSent event in the protocol for OPTIONS (at least on Mac).
+// Firefox: OPTIONS request can be dispatched.
+it('should not expose preflight OPTIONS request', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36311' }
+}, async ({ page, server, browserName }) => {
+  const serverRequests = [];
+  server.setRoute('/cors', (req, res) => {
+    serverRequests.push(`${req.method} ${req.url}`);
+    if (req.method === 'OPTIONS') {
+      res.writeHead(204, {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
+        'Access-Control-Allow-Headers': '*',
+      });
+      res.end();
+      return;
+    }
+    res.writeHead(200, { 'Content-type': 'text/plain', 'Access-Control-Allow-Origin': '*' });
+    res.end('Hello there!');
+  });
+  const clientRequests = [];
+  page.on('request', request => {
+    clientRequests.push(`${request.method()} ${request.url()}`);
+  });
+  const response = await page.evaluate(async url => {
+    const response = await fetch(url, {
+      method: 'POST',
+      body: '',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Custom-Header': 'test-value'
+      }
+    });
+    return await response.text();
+  }, server.CROSS_PROCESS_PREFIX + '/cors').catch(() => {});
+  expect(response).toBe('Hello there!');
+  expect(serverRequests).toEqual([
+    'OPTIONS /cors',
+    'POST /cors',
+  ]);
+  expect(clientRequests).toEqual([
+    `POST ${server.CROSS_PROCESS_PREFIX}/cors`,
+  ]);
+});
+
+it('should not expose preflight OPTIONS request with network interception', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36311' }
+}, async ({ page, server, browserName }) => {
+  const serverRequests = [];
+  server.setRoute('/cors', (req, res) => {
+    serverRequests.push(`${req.method} ${req.url}`);
+    if (req.method === 'OPTIONS') {
+      res.writeHead(204, {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
+        'Access-Control-Allow-Headers': '*',
+      });
+      res.end();
+      return;
+    }
+    res.writeHead(200, { 'Content-type': 'text/plain', 'Access-Control-Allow-Origin': '*' });
+    res.end('Hello there!');
+  });
+  await page.route('**/*', route => route.continue());
+  const clientRequests = [];
+  page.on('request', request => {
+    clientRequests.push(`${request.method()} ${request.url()}`);
+  });
+  const response = await page.evaluate(async url => {
+    const response = await fetch(url, {
+      method: 'POST',
+      body: '',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Custom-Header': 'test-value'
+      }
+    });
+    return await response.text();
+  }, server.CROSS_PROCESS_PREFIX + '/cors').catch(() => {});
+  expect(response).toBe('Hello there!');
+  expect.soft(serverRequests).toEqual([
+    ...(browserName !== 'chromium' ? ['OPTIONS /cors'] : []),
+    'POST /cors',
+  ]);
+  expect.soft(clientRequests).toEqual([
+    `POST ${server.CROSS_PROCESS_PREFIX}/cors`,
+  ]);
+});
diff --git a/tests/page/page-expose-function.spec.ts b/tests/page/page-expose-function.spec.ts
index ece4a602df5e2..e9334c4df08d3 100644
--- a/tests/page/page-expose-function.spec.ts
+++ b/tests/page/page-expose-function.spec.ts
@@ -95,7 +95,7 @@ it('should be callable from-inside addInitScript', async ({ page, server }) => {
   });
   await page.addInitScript(() => window['woof']());
   await page.reload();
-  expect(called).toBe(true);
+  await expect.poll(() => called).toBe(true);
 });
 
 it('should survive navigation', async ({ page, server }) => {
@@ -221,23 +221,6 @@ it('exposeBindingHandle should throw for multiple arguments', async ({ page }) =
   expect(error.message).toContain('exposeBindingHandle supports a single argument, 2 received');
 });
 
-it('should not result in unhandled rejection', async ({ page, isAndroid, isWebView2 }) => {
-  it.fixme(isAndroid);
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  const closedPromise = page.waitForEvent('close');
-  await page.exposeFunction('foo', async () => {
-    await page.close();
-  });
-  await page.evaluate(() => {
-    window.builtinSetTimeout(() => (window as any).foo(), 0);
-    return undefined;
-  });
-  await closedPromise;
-  // Make a round-trip to be sure we did not throw immediately after closing.
-  expect(await page.evaluate('1 + 1').catch(e => e)).toBeInstanceOf(Error);
-});
-
 it('exposeBinding(handle) should work with element handles', async ({ page }) => {
   let cb;
   const promise = new Promise(f => cb = f);
@@ -300,3 +283,12 @@ it('should work with busted Array.prototype.map/push', async ({ page, server })
   await page.exposeFunction('add', (a, b) => a + b);
   expect(await page.evaluate('add(5, 6)')).toBe(11);
 });
+
+it('should fail with busted Array.prototype.toJSON', async ({ page }) => {
+  await page.evaluateHandle(() => (Array.prototype as any).toJSON = () => '"[]"');
+
+  await page.exposeFunction('add', (a, b) => a + b);
+  await expect(() => page.evaluate(`add(5, 6)`)).rejects.toThrowError('serializedArgs is not an array. This can happen when Array.prototype.toJSON is defined incorrectly');
+
+  expect.soft(await page.evaluate(() => ([] as any).toJSON())).toBe('"[]"');
+});
diff --git a/tests/page/page-filechooser.spec.ts b/tests/page/page-filechooser.spec.ts
new file mode 100644
index 0000000000000..ba45345474535
--- /dev/null
+++ b/tests/page/page-filechooser.spec.ts
@@ -0,0 +1,368 @@
+/**
+ * Copyright 2017 Google Inc. All rights reserved.
+ * Modifications 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 './pageTest';
+import { attachFrame } from '../config/utils';
+
+import fs from 'fs';
+import formidable from 'formidable';
+
+test('should upload multiple large files', async ({ page, server, isAndroid, isWebView2, mode }, testInfo) => {
+  test.skip(isAndroid);
+  test.skip(isWebView2);
+  test.skip(mode.startsWith('service'));
+  test.slow();
+
+  const filesCount = 10;
+  await page.goto(server.PREFIX + '/input/fileupload-multi.html');
+  const uploadFile = testInfo.outputPath('50MB_1.zip');
+  const str = 'A'.repeat(1024);
+  const stream = fs.createWriteStream(uploadFile);
+  // 49 is close to the actual limit
+  for (let i = 0; i < 49 * 1024; i++) {
+    await new Promise<void>((fulfill, reject) => {
+      stream.write(str, err => {
+        if (err)
+          reject(err);
+        else
+          fulfill();
+      });
+    });
+  }
+  await new Promise(f => stream.end(f));
+  const input = page.locator('input[type="file"]');
+  const uploadFiles = [uploadFile];
+  for (let i = 2; i <= filesCount; i++) {
+    const dstFile = testInfo.outputPath(`50MB_${i}.zip`);
+    fs.copyFileSync(uploadFile, dstFile);
+    uploadFiles.push(dstFile);
+  }
+  const fileChooserPromise = page.waitForEvent('filechooser');
+  await input.click();
+  const fileChooser = await fileChooserPromise;
+  await fileChooser.setFiles(uploadFiles);
+  const filesLen = await page.evaluate('document.getElementsByTagName("input")[0].files.length');
+  expect(fileChooser.isMultiple()).toBe(true);
+  expect(filesLen).toEqual(filesCount);
+  await Promise.all(uploadFiles.map(path => fs.promises.unlink(path)));
+});
+
+test('should emit event once', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    new Promise(f => page.once('filechooser', f)),
+    page.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should emit event via prepend', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    new Promise(f => page.prependListener('filechooser', f)),
+    page.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should emit event for iframe', async ({ page, server }) => {
+  const frame = await attachFrame(page, 'frame1', server.EMPTY_PAGE);
+  await frame.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    new Promise(f => page.once('filechooser', f)),
+    frame.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should emit event on/off', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    new Promise(f => {
+      const listener = chooser => {
+        page.off('filechooser', listener);
+        f(chooser);
+      };
+      page.on('filechooser', listener);
+    }),
+    page.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should emit event addListener/removeListener', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    new Promise(f => {
+      const listener = chooser => {
+        page.removeListener('filechooser', listener);
+        f(chooser);
+      };
+      page.addListener('filechooser', listener);
+    }),
+    page.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should work when file input is attached to DOM', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should work when file input is not attached to DOM', async ({ page, asset }) => {
+  const [, content] = await Promise.all([
+    page.waitForEvent('filechooser').then(chooser => chooser.setFiles(asset('file-to-upload.txt'))),
+    page.evaluate(async () => {
+      const el = document.createElement('input');
+      el.type = 'file';
+      el.click();
+      await new Promise(x => el.oninput = x);
+      const reader = new FileReader();
+      const promise = new Promise(fulfill => reader.onload = fulfill);
+      reader.readAsText(el.files[0]);
+      return promise.then(() => reader.result);
+    }),
+  ]);
+  expect(content).toBe('contents of the file');
+});
+
+test('should not throw when filechooser belongs to iframe', async ({ page, server, browserName }) => {
+  await page.goto(server.PREFIX + '/frames/one-frame.html');
+  const frame = page.mainFrame().childFrames()[0];
+  await frame.setContent(`
+    <div>Click me</div>
+    <script>
+      document.querySelector('div').addEventListener('click', () => {
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.click();
+        window.parent.__done = true;
+      });
+    </script>
+  `);
+  await Promise.all([
+    page.waitForEvent('filechooser'),
+    frame.click('div')
+  ]);
+  await page.waitForFunction(() => (window as any).__done);
+});
+
+test('should not throw when frame is detached immediately', async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/frames/one-frame.html');
+  const frame = page.mainFrame().childFrames()[0];
+  await frame.setContent(`
+    <div>Click me</div>
+    <script>
+      document.querySelector('div').addEventListener('click', () => {
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.click();
+        window.parent.__done = true;
+        const iframe = window.parent.document.querySelector('iframe');
+        iframe.remove();
+      });
+    </script>
+  `);
+  page.on('filechooser', () => {});  // To ensure we handle file choosers.
+  await frame.click('div');
+  await page.waitForFunction(() => (window as any).__done);
+});
+
+test('should respect timeout', async ({ page, playwright }) => {
+  let error = null;
+  await page.waitForEvent('filechooser', { timeout: 1 }).catch(e => error = e);
+  expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
+});
+
+test('should respect default timeout when there is no custom timeout', async ({ page, playwright }) => {
+  page.setDefaultTimeout(1);
+  let error = null;
+  await page.waitForEvent('filechooser').catch(e => error = e);
+  expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
+});
+
+test('should prioritize exact timeout over default timeout', async ({ page, playwright }) => {
+  page.setDefaultTimeout(0);
+  let error = null;
+  await page.waitForEvent('filechooser', { timeout: 1 }).catch(e => error = e);
+  expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
+});
+
+test('should work with no timeout', async ({ page, server }) => {
+  const [chooser] = await Promise.all([
+    page.waitForEvent('filechooser', { timeout: 0 }),
+    page.evaluate(() => window.builtins.setTimeout(() => {
+      const el = document.createElement('input');
+      el.type = 'file';
+      el.click();
+    }, 50))
+  ]);
+  expect(chooser).toBeTruthy();
+});
+
+test('should return the same file chooser when there are many watchdogs simultaneously', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [fileChooser1, fileChooser2] = await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.waitForEvent('filechooser'),
+    page.$eval('input', input => input.click()),
+  ]);
+  expect(fileChooser1 === fileChooser2).toBe(true);
+});
+
+test('should accept single file', async ({ page, asset }) => {
+  await page.setContent(`<input type=file oninput='javascript:console.timeStamp()'>`);
+  const [fileChooser] = await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  expect(fileChooser.page()).toBe(page);
+  expect(fileChooser.element()).toBeTruthy();
+  await fileChooser.setFiles(asset('file-to-upload.txt'));
+  expect(await page.$eval('input', input => input.files.length)).toBe(1);
+  expect(await page.$eval('input', input => input.files[0].name)).toBe('file-to-upload.txt');
+});
+
+// @see https://github.com/microsoft/playwright/issues/4704
+test('should not trim big uploaded files', async ({ page, server }) => {
+
+  let files: Record<string, formidable.File>;
+  server.setRoute('/upload', async (req, res) => {
+    const form = new formidable.IncomingForm();
+    form.parse(req, function(err, fields, f) {
+      files = f as Record<string, formidable.File>;
+      res.end();
+    });
+  });
+  await page.goto(server.EMPTY_PAGE);
+
+  const DATA_SIZE = Math.pow(2, 20);
+  await Promise.all([
+    page.evaluate(async size => {
+      const body = new FormData();
+      body.set('file', new Blob([new Uint8Array(size)]));
+      await fetch('/upload', { method: 'POST', body });
+    }, DATA_SIZE),
+    server.waitForRequest('/upload'),
+  ]);
+  expect(files.file.size).toBe(DATA_SIZE);
+});
+
+test('should be able to read selected file', async ({ page, asset }) => {
+  await page.setContent(`<input type=file>`);
+  const [, content] = await Promise.all([
+    page.waitForEvent('filechooser').then(fileChooser => fileChooser.setFiles(asset('file-to-upload.txt'))),
+    page.$eval('input', async picker => {
+      picker.click();
+      await new Promise(x => picker.oninput = x);
+      const reader = new FileReader();
+      const promise = new Promise(fulfill => reader.onload = fulfill);
+      reader.readAsText(picker.files[0]);
+      return promise.then(() => reader.result);
+    }),
+  ]);
+  expect(content).toBe('contents of the file');
+});
+
+test('should be able to reset selected files with empty file list', async ({ page, asset }) => {
+  await page.setContent(`<input type=file>`);
+  const [, fileLength1] = await Promise.all([
+    page.waitForEvent('filechooser').then(fileChooser => fileChooser.setFiles(asset('file-to-upload.txt'))),
+    page.$eval('input', async picker => {
+      picker.click();
+      await new Promise(x => picker.oninput = x);
+      return picker.files.length;
+    }),
+  ]);
+  expect(fileLength1).toBe(1);
+  const [, fileLength2] = await Promise.all([
+    page.waitForEvent('filechooser').then(fileChooser => fileChooser.setFiles([])),
+    page.$eval('input', async picker => {
+      picker.click();
+      await new Promise(x => picker.oninput = x);
+      return picker.files.length;
+    }),
+  ]);
+  expect(fileLength2).toBe(0);
+});
+
+test('should work for single file pick', async ({ page, server }) => {
+  await page.setContent(`<input type=file>`);
+  const [fileChooser] = await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  expect(fileChooser.isMultiple()).toBe(false);
+});
+
+test('should work for "multiple"', async ({ page, server }) => {
+  await page.setContent(`<input multiple type=file>`);
+  const [fileChooser] = await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  expect(fileChooser.isMultiple()).toBe(true);
+});
+
+test('should work for "webkitdirectory"', async ({ page, server }) => {
+  await page.setContent(`<input multiple webkitdirectory type=file>`);
+  const [fileChooser] = await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  expect(fileChooser.isMultiple()).toBe(true);
+});
+
+test('should emit event after navigation', async ({ page, server, browserName, browserMajorVersion }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/11375' });
+  test.skip(browserName === 'chromium' && browserMajorVersion < 99);
+
+  const logs = [];
+  page.on('filechooser', () => logs.push('filechooser'));
+  await page.goto(server.PREFIX + '/empty.html');
+  await page.setContent(`<input type=file>`);
+  await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
+  await page.setContent(`<input type=file>`);
+  await Promise.all([
+    page.waitForEvent('filechooser'),
+    page.click('input'),
+  ]);
+  expect(logs).toEqual(['filechooser', 'filechooser']);
+});
+
+test('should trigger listener added before navigation', async ({ page, server, browserMajorVersion, isElectron }) => {
+  test.skip(isElectron && browserMajorVersion <= 98);
+  // Add listener before cross process navigation.
+  const chooserPromise = new Promise(f => page.once('filechooser', f));
+  await page.goto(server.PREFIX + '/empty.html');
+  await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
+  await page.setContent(`<input type=file>`);
+  const [chooser] = await Promise.all([
+    chooserPromise,
+    page.click('input'),
+  ]);
+  expect(chooser).toBeTruthy();
+});
diff --git a/tests/page/page-fill.spec.ts b/tests/page/page-fill.spec.ts
index 88cd33d4073f6..32dc69f550f55 100644
--- a/tests/page/page-fill.spec.ts
+++ b/tests/page/page-fill.spec.ts
@@ -210,6 +210,31 @@ it('should fill contenteditable with new lines', async ({ page, server, browserN
   expect(await page.locator('div[contenteditable]').innerText()).toBe('John\nDoe');
 });
 
+it('should not double-fill in contenteditable with beforeinput handler in Firefox', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/36715'
+  }
+}, async ({ page, browserName }) => {
+  it.fixme(browserName === 'firefox', 'https://github.com/microsoft/playwright/issues/36715');
+
+  await page.setContent(`
+    <div id="editor" contenteditable="true"></div>
+    <script>
+      const editor = document.getElementById('editor');
+      editor.addEventListener('beforeinput', (event) => {
+        event.preventDefault();
+        editor.textContent = event.data;
+      });
+    </script>
+  `);
+
+  const locator = page.locator('#editor');
+  const testValue = 'Playwright';
+  await locator.fill(testValue);
+  await expect(locator).toHaveText(testValue);
+});
+
 it('should fill elements with existing value and selection', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/textarea.html');
 
@@ -238,8 +263,8 @@ it('should fill elements with existing value and selection', async ({ page, serv
 
 it('should throw nice error without injected script stack when element is not an <input>', async ({ page, server }) => {
   let error = null;
-  await page.goto(server.PREFIX + '/input/textarea.html');
-  await page.fill('body', '').catch(e => error = e);
+  await page.setContent(`<select><option>value1</option></select>`);
+  await page.fill('select', '').catch(e => error = e);
   expect(error.message).toContain('page.fill: Error: Element is not an <input>, <textarea> or [contenteditable] element\nCall log:');
 });
 
diff --git a/tests/page/page-focus.spec.ts b/tests/page/page-focus.spec.ts
index 744aefec2e3c2..d2db5cf6b93a9 100644
--- a/tests/page/page-focus.spec.ts
+++ b/tests/page/page-focus.spec.ts
@@ -117,6 +117,71 @@ it('clicking checkbox should activate it', async ({ page, browserName, headless,
   expect(nodeName).toBe('INPUT');
 });
 
+it('tab should cycle between single input and browser', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32339' }
+}, async ({ page, browserName, headless, channel }) => {
+  const isHeadlessShell = channel === 'chromium-headless-shell' || (!channel && headless);
+  it.fixme(browserName === 'chromium' && !isHeadlessShell, 'Chromium keeps input focused.');
+  it.fixme(browserName !== 'chromium');
+  await page.setContent(`<label for="input1">input1</label>
+    <input id="input1">
+    <script>
+    {
+      window.focusEvents = [];
+      const input = document.getElementById('input1');
+      input.addEventListener('blur', () => focusEvents.push('blur'));
+      input.addEventListener('focus', () => focusEvents.push('focus'));
+    }
+    </script>`);
+  expect(await page.evaluate(() => document.activeElement.tagName)).toBe('BODY');
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.id)).toBe('input1');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus']);
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.tagName)).toBe('BODY');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus', 'blur']);
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.id)).toBe('input1');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus', 'blur', 'focus']);
+});
+
+it('tab should cycle between document elements and browser', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32339' }
+}, async ({ page, browserName, headless, channel }) => {
+  const isHeadlessShell = channel === 'chromium-headless-shell' || (!channel && headless);
+  it.fixme(browserName === 'chromium' && !isHeadlessShell, 'Chromium keeps last input focused.');
+  it.fixme(browserName !== 'chromium');
+  await page.setContent(`
+    <input id="input1">
+    <input id="input2">
+    <script>
+      window.focusEvents = [];
+      {
+        const input = document.getElementById('input1');
+        input.addEventListener('blur', () => focusEvents.push('blur1'));
+        input.addEventListener('focus', () => focusEvents.push('focus1'));
+      }
+      {
+        const input = document.getElementById('input2');
+        input.addEventListener('blur', () => focusEvents.push('blur2'));
+        input.addEventListener('focus', () => focusEvents.push('focus2'));
+      }
+    </script>`);
+  expect(await page.evaluate(() => document.activeElement.tagName)).toBe('BODY');
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.id)).toBe('input1');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus1']);
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.id)).toBe('input2');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus1', 'blur1', 'focus2']);
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.tagName)).toBe('BODY');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus1', 'blur1', 'focus2', 'blur2']);
+  await page.keyboard.press('Tab');
+  expect(await page.evaluate(() => document.activeElement.id)).toBe('input1');
+  expect(await page.evaluate(() => (window as any).focusEvents)).toEqual(['focus1', 'blur1', 'focus2', 'blur2', 'focus1']);
+});
+
 it('keeps focus on element when attempting to focus a non-focusable element', async ({ page }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/14254' });
 
diff --git a/tests/page/page-goto.spec.ts b/tests/page/page-goto.spec.ts
index 830a25e203ba9..e3ffb1f93cf54 100644
--- a/tests/page/page-goto.spec.ts
+++ b/tests/page/page-goto.spec.ts
@@ -179,23 +179,6 @@ it('should work with Cross-Origin-Opener-Policy after redirect', async ({ page,
   expect(firstRequest.url()).toBe(server.PREFIX + '/redirect');
 });
 
-it('should properly cancel Cross-Origin-Opener-Policy navigation', async ({ page, server }) => {
-  server.setRoute('/empty.html', (req, res) => {
-    res.setHeader('Cross-Origin-Opener-Policy', 'same-origin');
-    res.end();
-  });
-  const requestPromise = page.waitForRequest(server.EMPTY_PAGE);
-  page.goto(server.EMPTY_PAGE).catch(() => {});
-  await new Promise(f => setTimeout(f, 50));
-  // Non COOP response.
-  await page.goto(server.CROSS_PROCESS_PREFIX + '/error.html');
-  const req = await requestPromise;
-  const response = await Promise.race([req.response(), new Promise(f => setTimeout(() => f('timeout'), 5_000))]);
-  // First navigation request should either receive response or be canceled by the second
-  // navigation, but never hang unresolved.
-  expect(response).not.toBe('timeout');
-});
-
 it('should capture iframe navigation request', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);
   expect(page.url()).toBe(server.EMPTY_PAGE);
@@ -275,7 +258,8 @@ it('should work with subframes return 204 with domcontentloaded', async ({ page,
   await page.goto(server.PREFIX + '/frames/one-frame.html', { waitUntil: 'domcontentloaded' });
 });
 
-it('should fail when server returns 204', async ({ page, server, browserName }) => {
+it('should fail when server returns 204', async ({ page, server, browserName, isLinux }) => {
+  it.fixme(browserName === 'webkit' && isLinux, 'Regressed in https://github.com/microsoft/playwright-browsers/pull/1297');
   // WebKit just loads an empty page.
   server.setRoute('/empty.html', (req, res) => {
     res.statusCode = 204;
@@ -362,7 +346,7 @@ it('should fail when main resources failed to load', async ({ page, browserName,
   } else if (browserName === 'webkit' && isWindows && mode === 'service2') {
     expect(error.message).toContain(`proxy handshake error`);
   } else if (browserName === 'webkit' && isWindows) {
-    expect(error.message).toContain(`Couldn\'t connect to server`);
+    expect(error.message).toContain(`Could not connect to server`);
   } else if (browserName === 'webkit') {
     if (mode === 'service2')
       expect(error.message).toContain('Connection refused');
diff --git a/tests/page/page-history.spec.ts b/tests/page/page-history.spec.ts
index cf6eb2d4568c6..a709ade4cac69 100644
--- a/tests/page/page-history.spec.ts
+++ b/tests/page/page-history.spec.ts
@@ -92,15 +92,17 @@ it('page.goBack should work for file urls', async ({ page, server, asset, browse
 });
 
 it('goBack/goForward should work with bfcache-able pages', async ({ page, server }) => {
-  await page.goto(server.PREFIX + '/cached/one-style.html');
-  await page.setContent(`<a href=${JSON.stringify(server.PREFIX + '/cached/one-style.html?foo')}>click me</a>`);
+  await page.goto(server.PREFIX + '/cached/bfcached.html');
+  await page.setContent(`<a href=${JSON.stringify(server.PREFIX + '/cached/bfcached.html?foo')}>click me</a>`);
   await page.click('a');
 
   let response = await page.goBack();
-  expect(response.url()).toBe(server.PREFIX + '/cached/one-style.html');
+  expect(response.url()).toBe(server.PREFIX + '/cached/bfcached.html');
+  // BFCache should be disabled.
+  expect(await page.evaluate('window.didShow')).toEqual({ persisted: false });
 
   response = await page.goForward();
-  expect(response.url()).toBe(server.PREFIX + '/cached/one-style.html?foo');
+  expect(response.url()).toBe(server.PREFIX + '/cached/bfcached.html?foo');
 });
 
 it('page.reload should work', async ({ page, server }) => {
diff --git a/tests/page/page-keyboard.spec.ts b/tests/page/page-keyboard.spec.ts
index 027648f48e7a3..7b0b88b0d9a75 100644
--- a/tests/page/page-keyboard.spec.ts
+++ b/tests/page/page-keyboard.spec.ts
@@ -17,6 +17,7 @@
 
 import { test as it, expect } from './pageTest';
 import { attachFrame } from '../config/utils';
+import { hostPlatform } from '../../packages/playwright-core/src/server/utils/hostPlatform';
 
 it.skip(({ isAndroid }) => isAndroid);
 
@@ -93,18 +94,18 @@ it('should report shiftKey', async ({ page, server, browserName, platform }) =>
   const codeForKey = { 'Shift': 16, 'Alt': 18, 'Control': 17 };
   for (const modifierKey in codeForKey) {
     await keyboard.down(modifierKey);
-    expect(await page.evaluate('getResult()')).toBe('Keydown: ' + modifierKey + ' ' + modifierKey + 'Left ' + codeForKey[modifierKey] + ' [' + modifierKey + ']');
+    expect(await page.evaluate('getResult()')).toBe('Keydown: ' + modifierKey + ' ' + modifierKey + 'Left LEFT [' + modifierKey + ']');
     await keyboard.down('!');
     // Shift+! will generate a keypress
     if (modifierKey === 'Shift')
-      expect(await page.evaluate('getResult()')).toBe('Keydown: ! Digit1 49 [' + modifierKey + ']\nKeypress: ! Digit1 33 33 [' + modifierKey + ']');
+      expect(await page.evaluate('getResult()')).toBe('Keydown: ! Digit1 STANDARD [' + modifierKey + ']\nKeypress: ! Digit1 STANDARD 33 [' + modifierKey + ']');
     else
-      expect(await page.evaluate('getResult()')).toBe('Keydown: ! Digit1 49 [' + modifierKey + ']');
+      expect(await page.evaluate('getResult()')).toBe('Keydown: ! Digit1 STANDARD [' + modifierKey + ']');
 
     await keyboard.up('!');
-    expect(await page.evaluate('getResult()')).toBe('Keyup: ! Digit1 49 [' + modifierKey + ']');
+    expect(await page.evaluate('getResult()')).toBe('Keyup: ! Digit1 STANDARD [' + modifierKey + ']');
     await keyboard.up(modifierKey);
-    expect(await page.evaluate('getResult()')).toBe('Keyup: ' + modifierKey + ' ' + modifierKey + 'Left ' + codeForKey[modifierKey] + ' []');
+    expect(await page.evaluate('getResult()')).toBe('Keyup: ' + modifierKey + ' ' + modifierKey + 'Left LEFT []');
   }
 });
 
@@ -112,31 +113,31 @@ it('should report multiple modifiers', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   const keyboard = page.keyboard;
   await keyboard.down('Control');
-  expect(await page.evaluate('getResult()')).toBe('Keydown: Control ControlLeft 17 [Control]');
+  expect(await page.evaluate('getResult()')).toBe('Keydown: Control ControlLeft LEFT [Control]');
   await keyboard.down('Alt');
-  expect(await page.evaluate('getResult()')).toBe('Keydown: Alt AltLeft 18 [Alt Control]');
+  expect(await page.evaluate('getResult()')).toBe('Keydown: Alt AltLeft LEFT [Alt Control]');
   await keyboard.down(';');
-  expect(await page.evaluate('getResult()')).toBe('Keydown: ; Semicolon 186 [Alt Control]');
+  expect(await page.evaluate('getResult()')).toBe('Keydown: ; Semicolon STANDARD [Alt Control]');
   await keyboard.up(';');
-  expect(await page.evaluate('getResult()')).toBe('Keyup: ; Semicolon 186 [Alt Control]');
+  expect(await page.evaluate('getResult()')).toBe('Keyup: ; Semicolon STANDARD [Alt Control]');
   await keyboard.up('Control');
-  expect(await page.evaluate('getResult()')).toBe('Keyup: Control ControlLeft 17 [Alt]');
+  expect(await page.evaluate('getResult()')).toBe('Keyup: Control ControlLeft LEFT [Alt]');
   await keyboard.up('Alt');
-  expect(await page.evaluate('getResult()')).toBe('Keyup: Alt AltLeft 18 []');
+  expect(await page.evaluate('getResult()')).toBe('Keyup: Alt AltLeft LEFT []');
 });
 
 it('should send proper codes while typing', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.type('!');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: ! Digit1 49 []',
-        'Keypress: ! Digit1 33 33 []',
-        'Keyup: ! Digit1 49 []'].join('\n'));
+      ['Keydown: ! Digit1 STANDARD []',
+        'Keypress: ! Digit1 STANDARD 33 []',
+        'Keyup: ! Digit1 STANDARD []'].join('\n'));
   await page.keyboard.type('^');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: ^ Digit6 54 []',
-        'Keypress: ^ Digit6 94 94 []',
-        'Keyup: ^ Digit6 54 []'].join('\n'));
+      ['Keydown: ^ Digit6 STANDARD []',
+        'Keypress: ^ Digit6 STANDARD 94 []',
+        'Keyup: ^ Digit6 STANDARD []'].join('\n'));
 });
 
 it('should send proper codes while typing with shift', async ({ page, server }) => {
@@ -145,10 +146,10 @@ it('should send proper codes while typing with shift', async ({ page, server })
   await keyboard.down('Shift');
   await page.keyboard.type('~');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: Shift ShiftLeft 16 [Shift]',
-        'Keydown: ~ Backquote 192 [Shift]', // 192 is ` keyCode
-        'Keypress: ~ Backquote 126 126 [Shift]', // 126 is ~ charCode
-        'Keyup: ~ Backquote 192 [Shift]'].join('\n'));
+      ['Keydown: Shift ShiftLeft LEFT [Shift]',
+        'Keydown: ~ Backquote STANDARD [Shift]',
+        'Keypress: ~ Backquote STANDARD 126 [Shift]',
+        'Keyup: ~ Backquote STANDARD [Shift]'].join('\n'));
   await keyboard.up('Shift');
 });
 
@@ -173,54 +174,54 @@ it('should press plus', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.press('+');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: + Equal 187 []', // 192 is ` keyCode
-        'Keypress: + Equal 43 43 []', // 126 is ~ charCode
-        'Keyup: + Equal 187 []'].join('\n'));
+      ['Keydown: + Equal STANDARD []',
+        'Keypress: + Equal STANDARD 43 []',
+        'Keyup: + Equal STANDARD []'].join('\n'));
 });
 
 it('should press shift plus', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.press('Shift++');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: Shift ShiftLeft 16 [Shift]',
-        'Keydown: + Equal 187 [Shift]', // 192 is ` keyCode
-        'Keypress: + Equal 43 43 [Shift]', // 126 is ~ charCode
-        'Keyup: + Equal 187 [Shift]',
-        'Keyup: Shift ShiftLeft 16 []'].join('\n'));
+      ['Keydown: Shift ShiftLeft LEFT [Shift]',
+        'Keydown: + Equal STANDARD [Shift]',
+        'Keypress: + Equal STANDARD 43 [Shift]',
+        'Keyup: + Equal STANDARD [Shift]',
+        'Keyup: Shift ShiftLeft LEFT []'].join('\n'));
 });
 
 it('should support plus-separated modifiers', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.press('Shift+~');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: Shift ShiftLeft 16 [Shift]',
-        'Keydown: ~ Backquote 192 [Shift]', // 192 is ` keyCode
-        'Keypress: ~ Backquote 126 126 [Shift]', // 126 is ~ charCode
-        'Keyup: ~ Backquote 192 [Shift]',
-        'Keyup: Shift ShiftLeft 16 []'].join('\n'));
+      ['Keydown: Shift ShiftLeft LEFT [Shift]',
+        'Keydown: ~ Backquote STANDARD [Shift]',
+        'Keypress: ~ Backquote STANDARD 126 [Shift]',
+        'Keyup: ~ Backquote STANDARD [Shift]',
+        'Keyup: Shift ShiftLeft LEFT []'].join('\n'));
 });
 
 it('should support multiple plus-separated modifiers', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.press('Control+Shift+~');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: Control ControlLeft 17 [Control]',
-        'Keydown: Shift ShiftLeft 16 [Control Shift]',
-        'Keydown: ~ Backquote 192 [Control Shift]', // 192 is ` keyCode
-        'Keyup: ~ Backquote 192 [Control Shift]',
-        'Keyup: Shift ShiftLeft 16 [Control]',
-        'Keyup: Control ControlLeft 17 []'].join('\n'));
+      ['Keydown: Control ControlLeft LEFT [Control]',
+        'Keydown: Shift ShiftLeft LEFT [Control Shift]',
+        'Keydown: ~ Backquote STANDARD [Control Shift]',
+        'Keyup: ~ Backquote STANDARD [Control Shift]',
+        'Keyup: Shift ShiftLeft LEFT [Control]',
+        'Keyup: Control ControlLeft LEFT []'].join('\n'));
 });
 
 it('should shift raw codes', async ({ page, server }) => {
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.press('Shift+Digit3');
   expect(await page.evaluate('getResult()')).toBe(
-      ['Keydown: Shift ShiftLeft 16 [Shift]',
-        'Keydown: # Digit3 51 [Shift]', // 51 is # keyCode
-        'Keypress: # Digit3 35 35 [Shift]', // 35 is # charCode
-        'Keyup: # Digit3 51 [Shift]',
-        'Keyup: Shift ShiftLeft 16 []'].join('\n'));
+      ['Keydown: Shift ShiftLeft LEFT [Shift]',
+        'Keydown: # Digit3 STANDARD [Shift]',
+        'Keypress: # Digit3 STANDARD 35 [Shift]',
+        'Keyup: # Digit3 STANDARD [Shift]',
+        'Keyup: Shift ShiftLeft LEFT []'].join('\n'));
 });
 
 it('should specify repeat property', async ({ page, server }) => {
@@ -256,16 +257,24 @@ it('should specify location', async ({ page, server }) => {
   const textarea = await page.$('textarea');
 
   await textarea.press('Digit5');
-  expect(await lastEvent.evaluate(e => e.location)).toBe(0);
+  expect.soft(await lastEvent.evaluate(e => e.location)).toBe(0);
+  expect.soft(await lastEvent.evaluate(e => e.key)).toBe('5');
+  expect.soft(await lastEvent.evaluate(e => e.code)).toBe('Digit5');
 
   await textarea.press('ControlLeft');
-  expect(await lastEvent.evaluate(e => e.location)).toBe(1);
+  expect.soft(await lastEvent.evaluate(e => e.location)).toBe(1);
+  expect.soft(await lastEvent.evaluate(e => e.key)).toBe('Control');
+  expect.soft(await lastEvent.evaluate(e => e.code)).toBe('ControlLeft');
 
   await textarea.press('ControlRight');
-  expect(await lastEvent.evaluate(e => e.location)).toBe(2);
+  expect.soft(await lastEvent.evaluate(e => e.location)).toBe(2);
+  expect.soft(await lastEvent.evaluate(e => e.key)).toBe('Control');
+  expect.soft(await lastEvent.evaluate(e => e.code)).toBe('ControlRight');
 
   await textarea.press('NumpadSubtract');
-  expect(await lastEvent.evaluate(e => e.location)).toBe(3);
+  expect.soft(await lastEvent.evaluate(e => e.location)).toBe(3);
+  expect.soft(await lastEvent.evaluate(e => e.key)).toBe('-');
+  expect.soft(await lastEvent.evaluate(e => e.code)).toBe('NumpadSubtract');
 });
 
 it('should press Enter', async ({ page, server }) => {
@@ -702,7 +711,28 @@ it('should have correct Keydown/Keyup order when pressing Escape key', async ({
   await page.goto(server.PREFIX + '/input/keyboard.html');
   await page.keyboard.press('Escape');
   expect(await page.evaluate('getResult()')).toBe(`
-Keydown: Escape Escape 27 []
-Keyup: Escape Escape 27 []
+Keydown: Escape Escape STANDARD []
+Keyup: Escape Escape STANDARD []
 `.trim());
 });
+
+it('should close dialog on Escape key press in contenteditable', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36727' }
+}, async ({ page, browserName }) => {
+  it.skip(browserName === 'webkit' && hostPlatform.startsWith('debian11'), 'Debian 11 is frozen');
+  await page.setContent(`
+    <dialog>
+      <div contenteditable>Edit Me</div>
+    </dialog>
+  `);
+
+  const dialog = page.locator('dialog');
+  const widget = dialog.locator('[contenteditable]');
+  await dialog.evaluate((node: HTMLDialogElement) => node.showModal());
+  await expect(dialog).toHaveJSProperty('open', true);
+  await expect(widget).toBeVisible();
+
+  await widget.press('Escape');
+  await expect(dialog).toHaveJSProperty('open', false);
+  await expect(widget).not.toBeVisible();
+});
diff --git a/tests/page/page-leaks.spec.ts b/tests/page/page-leaks.spec.ts
index b33ce8e1d4f6a..90f78d83a9031 100644
--- a/tests/page/page-leaks.spec.ts
+++ b/tests/page/page-leaks.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { MultiMap } from '../../packages/playwright-core/lib/utils/multimap';
+import { MultiMap } from '../../packages/playwright-core/lib/utils/isomorphic/multimap';
 import { test, expect } from './pageTest';
 
 function leakedJSHandles(): string {
@@ -41,16 +41,36 @@ function leakedJSHandles(): string {
   return lines.join('\n');
 }
 
-async function objectCounts(pageImpl, constructorName: string): Promise<{ main: number, utility: number }> {
+async function weakRefObjects(pageImpl: any, selector: string) {
+  for (const world of ['main', 'utility']) {
+    const context = await pageImpl.mainFrame()._context(world);
+    await context.evaluate(selector => {
+      const elements = document.querySelectorAll(selector);
+      globalThis.weakRefs = globalThis.weakRefs || [];
+      for (const element of elements)
+        globalThis.weakRefs.push(new WeakRef(element));
+    }, selector);
+  }
+}
+
+async function weakRefCount(pageImpl): Promise<{ main: number, utility: number }> {
   const result = { main: 0, utility: 0 };
   for (const world of ['main', 'utility']) {
+    await pageImpl.requestGC();
     const context = await pageImpl.mainFrame()._context(world);
-    const prototype = await context.evaluateHandle(name => (window as any)[name].prototype, constructorName);
-    result[world] = await prototype.objectCount();
+    result[world] = await context.evaluate(() => globalThis.weakRefs.filter(r => !!r.deref()).length);
   }
   return result;
 }
 
+async function checkWeakRefs(pageImpl, from: number, to: number) {
+  await expect(async () => {
+    const counts = await weakRefCount(pageImpl);
+    expect(counts.main + counts.utility).toBeGreaterThanOrEqual(from);
+    expect(counts.main + counts.utility).toBeLessThan(to);
+  }).toPass();
+}
+
 test.beforeEach(() => {
   (globalThis as any).leakedJSHandles = new Map();
 });
@@ -59,14 +79,12 @@ test.afterEach(() => {
   (globalThis as any).leakedJSHandles = null;
 });
 
-test('click should not leak', async ({ page, browserName, toImpl }) => {
+test('click should not leak', async ({ page, toImpl }) => {
   await page.setContent(`
     <button>static button 1</button>
     <button>static button 2</button>
     <div id="buttons"></div>
   `);
-  // Create JS wrappers for static elements.
-  await page.evaluate(() => document.querySelectorAll('button'));
 
   for (let i = 0; i < 25; ++i) {
     await page.evaluate(i => {
@@ -74,22 +92,19 @@ test('click should not leak', async ({ page, browserName, toImpl }) => {
       element.textContent = 'dynamic ' + i;
       document.getElementById('buttons').appendChild(element);
     }, i);
-    await page.locator('#buttons > button').click();
-    await page.evaluate(() => {
-      document.getElementById('buttons').textContent = '';
-    });
+    await page.locator('#buttons > button').last().click();
   }
 
-  expect(leakedJSHandles()).toBeFalsy();
+  await weakRefObjects(toImpl(page), 'button');
+  await page.evaluate(() => {
+    document.getElementById('buttons').textContent = '';
+  });
 
-  if (browserName === 'chromium') {
-    const counts = await objectCounts(toImpl(page), 'HTMLButtonElement');
-    expect(counts.main + counts.utility).toBeGreaterThanOrEqual(2);
-    expect(counts.main + counts.utility).toBeLessThan(25);
-  }
+  expect(leakedJSHandles()).toBeFalsy();
+  await checkWeakRefs(toImpl(page), 2, 25);
 });
 
-test('fill should not leak', async ({ page, mode, browserName, toImpl }) => {
+test('fill should not leak', async ({ page, mode, toImpl }) => {
   test.skip(mode !== 'default');
 
   await page.setContent(`
@@ -97,30 +112,25 @@ test('fill should not leak', async ({ page, mode, browserName, toImpl }) => {
     <input value="static input 2"</input>
     <div id="inputs"></div>
   `);
-  // Create JS wrappers for static elements.
-  await page.evaluate(() => document.querySelectorAll('input'));
 
   for (let i = 0; i < 25; ++i) {
-    await page.evaluate(i => {
+    await page.evaluate(() => {
       const element = document.createElement('input');
       document.getElementById('inputs').appendChild(element);
-    }, i);
-    await page.locator('#inputs > input').fill('input ' + i);
-    await page.evaluate(() => {
-      document.getElementById('inputs').textContent = '';
     });
+    await page.locator('#inputs > input').last().fill('input ' + i);
   }
 
-  expect(leakedJSHandles()).toBeFalsy();
+  await weakRefObjects(toImpl(page), 'input');
+  await page.evaluate(() => {
+    document.getElementById('inputs').textContent = '';
+  });
 
-  if (browserName === 'chromium') {
-    const counts = await objectCounts(toImpl(page), 'HTMLInputElement');
-    expect(counts.main + counts.utility).toBeGreaterThanOrEqual(2);
-    expect(counts.main + counts.utility).toBeLessThan(25);
-  }
+  expect(leakedJSHandles()).toBeFalsy();
+  await checkWeakRefs(toImpl(page), 2, 25);
 });
 
-test('expect should not leak', async ({ page, mode, browserName, toImpl }) => {
+test('expect should not leak', async ({ page, mode, toImpl }) => {
   test.skip(mode !== 'default');
 
   await page.setContent(`
@@ -128,6 +138,7 @@ test('expect should not leak', async ({ page, mode, browserName, toImpl }) => {
     <button>static button 2</button>
     <div id="buttons"></div>
   `);
+  await weakRefObjects(toImpl(page), 'button');
 
   for (let i = 0; i < 25; ++i) {
     await page.evaluate(i => {
@@ -135,22 +146,19 @@ test('expect should not leak', async ({ page, mode, browserName, toImpl }) => {
       element.textContent = 'dynamic ' + i;
       document.getElementById('buttons').appendChild(element);
     }, i);
-    await expect(page.locator('#buttons > button')).toBeVisible();
-    await page.evaluate(() => {
-      document.getElementById('buttons').textContent = '';
-    });
+    await expect(page.locator('#buttons > button').last()).toBeVisible();
   }
 
-  expect(leakedJSHandles()).toBeFalsy();
+  await weakRefObjects(toImpl(page), 'button');
+  await page.evaluate(() => {
+    document.getElementById('buttons').textContent = '';
+  });
 
-  if (browserName === 'chromium') {
-    const counts = await objectCounts(toImpl(page), 'HTMLButtonElement');
-    expect(counts.main + counts.utility).toBeGreaterThanOrEqual(2);
-    expect(counts.main + counts.utility).toBeLessThan(25);
-  }
+  expect(leakedJSHandles()).toBeFalsy();
+  await checkWeakRefs(toImpl(page), 2, 25);
 });
 
-test('waitFor should not leak', async ({ page, mode, browserName, toImpl }) => {
+test('waitFor should not leak', async ({ page, mode, toImpl }) => {
   test.skip(mode !== 'default');
 
   await page.setContent(`
@@ -165,17 +173,14 @@ test('waitFor should not leak', async ({ page, mode, browserName, toImpl }) => {
       element.textContent = 'dynamic ' + i;
       document.getElementById('buttons').appendChild(element);
     }, i);
-    await page.locator('#buttons > button').waitFor();
-    await page.evaluate(() => {
-      document.getElementById('buttons').textContent = '';
-    });
+    await page.locator('#buttons > button').last().waitFor();
   }
 
-  expect(leakedJSHandles()).toBeFalsy();
+  await weakRefObjects(toImpl(page), 'button');
+  await page.evaluate(() => {
+    document.getElementById('buttons').textContent = '';
+  });
 
-  if (browserName === 'chromium') {
-    const counts = await objectCounts(toImpl(page), 'HTMLButtonElement');
-    expect(counts.main + counts.utility).toBeGreaterThanOrEqual(2);
-    expect(counts.main + counts.utility).toBeLessThan(25);
-  }
+  expect(leakedJSHandles()).toBeFalsy();
+  await checkWeakRefs(toImpl(page), 2, 25);
 });
diff --git a/tests/page/page-listeners.spec.ts b/tests/page/page-listeners.spec.ts
new file mode 100644
index 0000000000000..495ecf36c7f5d
--- /dev/null
+++ b/tests/page/page-listeners.spec.ts
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2018 Google Inc. All rights reserved.
+ * Modifications 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 { ManualPromise } from '../../packages/playwright-core/lib/utils/isomorphic/manualPromise';
+import { test as it, expect } from './pageTest';
+
+// This test is mostly for type checking, the actual tests are in the library/events.
+
+it('should not throw with ignoreErrors', async ({ page }) => {
+  const reachedHandler = new ManualPromise();
+  const releaseHandler = new ManualPromise();
+  page.on('console', async () => {
+    reachedHandler.resolve();
+    await releaseHandler;
+    throw new Error('Error in console handler');
+  });
+  await page.evaluate('console.log(1)');
+  await reachedHandler;
+  await page.removeAllListeners('console', { behavior: 'ignoreErrors' });
+  releaseHandler.resolve();
+  await page.waitForTimeout(1000);
+});
+
+it('should wait', async ({ page }) => {
+  const reachedHandler = new ManualPromise();
+  const releaseHandler = new ManualPromise();
+  let value = 0;
+  page.on('console', async () => {
+    reachedHandler.resolve();
+    value = 42;
+  });
+  await page.evaluate('console.log(1)');
+  await reachedHandler;
+  const removePromise = page.removeAllListeners('console', { behavior: 'wait' });
+  releaseHandler.resolve();
+  await removePromise;
+  expect(value).toBe(42);
+});
+
+it('wait should throw', async ({ page }) => {
+  const reachedHandler = new ManualPromise();
+  const releaseHandler = new ManualPromise();
+  page.on('console', async () => {
+    reachedHandler.resolve();
+    await releaseHandler;
+    throw new Error('Error in handler');
+  });
+  await page.evaluate('console.log(1)');
+  await reachedHandler;
+  const removePromise = page.removeAllListeners('console', { behavior: 'wait' });
+  releaseHandler.resolve();
+  await expect(removePromise).rejects.toThrow('Error in handler');
+});
diff --git a/tests/page/page-mouse.spec.ts b/tests/page/page-mouse.spec.ts
index 3e7223319f61f..7f4ce8a85dccb 100644
--- a/tests/page/page-mouse.spec.ts
+++ b/tests/page/page-mouse.spec.ts
@@ -78,6 +78,33 @@ it('should dblclick the div', async ({ page, server }) => {
   expect(event.button).toBe(0);
 });
 
+it('down and up should generate click', async ({ page, server }) => {
+  await page.evaluate(() => {
+    window['clickPromise'] = new Promise(resolve => {
+      document.addEventListener('click', event => {
+        resolve({
+          type: event.type,
+          detail: event.detail,
+          clientX: event.clientX,
+          clientY: event.clientY,
+          isTrusted: event.isTrusted,
+          button: event.button
+        });
+      });
+    });
+  });
+  await page.mouse.move(50, 60);
+  await page.mouse.down();
+  await page.mouse.up();
+  const event = await page.evaluate(() => window['clickPromise']);
+  expect(event.type).toBe('click');
+  expect(event.detail).toBe(1);
+  expect(event.clientX).toBe(50);
+  expect(event.clientY).toBe(60);
+  expect(event.isTrusted).toBe(true);
+  expect(event.button).toBe(0);
+});
+
 it('should pointerdown the div with a custom button', async ({ page, server, browserName }) => {
   await page.setContent(`<div style='width: 100px; height: 100px;'>Click me</div>`);
   await page.evaluate(() => {
@@ -163,7 +190,9 @@ it('should select the text with mouse', async ({ page, server }) => {
   })).toBe(text);
 });
 
-it('should trigger hover state', async ({ page, server }) => {
+it('should trigger hover state', async ({ page, server, headless }) => {
+  it.skip(!headless, 'headed messes up with hover');
+
   await page.goto(server.PREFIX + '/input/scrollable.html');
   await page.hover('#button-6');
   expect(await page.evaluate(() => document.querySelector('button:hover').id)).toBe('button-6');
@@ -173,14 +202,18 @@ it('should trigger hover state', async ({ page, server }) => {
   expect(await page.evaluate(() => document.querySelector('button:hover').id)).toBe('button-91');
 });
 
-it('should trigger hover state on disabled button', async ({ page, server }) => {
+it('should trigger hover state on disabled button', async ({ page, server, headless }) => {
+  it.skip(!headless, 'headed messes up with hover');
+
   await page.goto(server.PREFIX + '/input/scrollable.html');
   await page.$eval('#button-6', (button: HTMLButtonElement) => button.disabled = true);
   await page.hover('#button-6', { timeout: 5000 });
   expect(await page.evaluate(() => document.querySelector('button:hover').id)).toBe('button-6');
 });
 
-it('should trigger hover state with removed window.Node', async ({ page, server }) => {
+it('should trigger hover state with removed window.Node', async ({ page, server, headless }) => {
+  it.skip(!headless, 'headed messes up with hover');
+
   await page.goto(server.PREFIX + '/input/scrollable.html');
   await page.evaluate(() => delete window.Node);
   await page.hover('#button-6');
@@ -256,8 +289,7 @@ it('should not crash on mouse drag with any button', async ({ page }) => {
 
 it('should dispatch mouse move after context menu was opened', async ({ page, browserName, isWindows }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/20823' });
-  it.fixme(browserName === 'firefox');
-  it.skip(browserName === 'chromium' && isWindows, 'context menu support is best-effort for Linux and MacOS');
+  it.fixme(browserName === 'chromium' && isWindows, 'context menu support is best-effort for Linux and MacOS');
   await page.evaluate(() => {
     window['contextMenuPromise'] = new Promise(x => {
       window.addEventListener('contextmenu', x, false);
@@ -277,4 +309,3 @@ it('should dispatch mouse move after context menu was opened', async ({ page, br
     }
   }
 });
-
diff --git a/tests/page/page-network-response.spec.ts b/tests/page/page-network-response.spec.ts
index ecae86987aeee..e353aa6956daa 100644
--- a/tests/page/page-network-response.spec.ts
+++ b/tests/page/page-network-response.spec.ts
@@ -109,46 +109,6 @@ it('should wait until response completes', async ({ page, server }) => {
   expect(await responseText).toBe('hello world!');
 });
 
-it('should reject response.finished if page closes', async ({ page, server }) => {
-  await page.goto(server.EMPTY_PAGE);
-  server.setRoute('/get', (req, res) => {
-    // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
-    // from server.
-    res.setHeader('Content-Type', 'text/plain; charset=utf-8');
-    res.write('hello ');
-  });
-  // send request and wait for server response
-  const [pageResponse] = await Promise.all([
-    page.waitForEvent('response'),
-    page.evaluate(() => fetch('./get', { method: 'GET' })),
-  ]);
-
-  const finishPromise = pageResponse.finished().catch(e => e);
-  await page.close();
-  const error = await finishPromise;
-  expect(error.message).toContain('closed');
-});
-
-it('should reject response.finished if context closes', async ({ page, server }) => {
-  await page.goto(server.EMPTY_PAGE);
-  server.setRoute('/get', (req, res) => {
-    // In Firefox, |fetch| will be hanging until it receives |Content-Type| header
-    // from server.
-    res.setHeader('Content-Type', 'text/plain; charset=utf-8');
-    res.write('hello ');
-  });
-  // send request and wait for server response
-  const [pageResponse] = await Promise.all([
-    page.waitForEvent('response'),
-    page.evaluate(() => fetch('./get', { method: 'GET' })),
-  ]);
-
-  const finishPromise = pageResponse.finished().catch(e => e);
-  await page.context().close();
-  const error = await finishPromise;
-  expect(error.message).toContain('closed');
-});
-
 it('should return json', async ({ page, server }) => {
   const response = await page.goto(server.PREFIX + '/simple.json');
   expect(await response.json()).toEqual({ foo: 'bar' });
@@ -270,14 +230,14 @@ it('should behave the same way for headers and allHeaders', async ({ page, serve
   expect(allHeaders['name-b']).toEqual('v4');
 });
 
-it('should provide a Response with a file URL', async ({ page, asset, isAndroid, isElectron, isWindows, browserName, browserMajorVersion, mode }) => {
+it('should provide a Response with a file URL', async ({ page, asset, isAndroid, isElectron, isWindows, browserName, mode }) => {
   it.skip(isAndroid, 'No files on Android');
   it.skip(browserName === 'firefox', 'Firefox does return null for file:// URLs');
   it.skip(mode.startsWith('service'));
 
   const fileurl = url.pathToFileURL(asset('frames/two-frames.html')).href;
   const response = await page.goto(fileurl);
-  if (isElectron || (browserName === 'chromium' && browserMajorVersion >= 99) || (browserName === 'webkit' && isWindows))
+  if (isElectron || (browserName === 'chromium') || (browserName === 'webkit' && isWindows))
     expect(response.status()).toBe(200);
   else
     expect(response.status()).toBe(0);
diff --git a/tests/page/page-network-sizes.spec.ts b/tests/page/page-network-sizes.spec.ts
index d63d58e79f0a6..3157b4dffb03e 100644
--- a/tests/page/page-network-sizes.spec.ts
+++ b/tests/page/page-network-sizes.spec.ts
@@ -41,7 +41,7 @@ it('should set bodySize to 0 if there was no body', async ({ page, server, brows
   ]);
   const sizes = await request.sizes();
   expect(sizes.requestBodySize).toBe(0);
-  expect(sizes.requestHeadersSize).toBeGreaterThanOrEqual(200);
+  expect(sizes.requestHeadersSize).toBeGreaterThanOrEqual(190);
 });
 
 it('should set bodySize, headersSize, and transferSize', async ({ page, server }) => {
diff --git a/tests/page/page-object-count.spec.ts b/tests/page/page-object-count.spec.ts
deleted file mode 100644
index 57377b76e73dd..0000000000000
--- a/tests/page/page-object-count.spec.ts
+++ /dev/null
@@ -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 { test, expect } from './pageTest';
-
-test('should count objects', async ({ page, browserName }) => {
-  test.skip(browserName !== 'chromium');
-  await page.setContent('<button>Submit</button>');
-  await page.evaluate(() => document.querySelectorAll('button'));
-  const proto = await page.evaluateHandle(() => HTMLButtonElement.prototype);
-  expect(await (proto as any)._objectCount()).toBe(1);
-});
diff --git a/tests/page/page-request-continue.spec.ts b/tests/page/page-request-continue.spec.ts
index dd7ed68b491aa..70b5d716673fd 100644
--- a/tests/page/page-request-continue.spec.ts
+++ b/tests/page/page-request-continue.spec.ts
@@ -17,6 +17,7 @@
 
 import { test as it, expect } from './pageTest';
 import type { Route } from 'playwright-core';
+import type * as http from 'http';
 
 it('should work', async ({ page, server }) => {
   await page.route('**/*', route => route.continue());
@@ -25,8 +26,10 @@ it('should work', async ({ page, server }) => {
 
 it('should amend HTTP headers', async ({ page, server }) => {
   await page.route('**/*', route => {
-    const headers = Object.assign({}, route.request().headers());
-    headers['FOO'] = 'bar';
+    const headers = {
+      ...route.request().headers(),
+      FOO: 'bar'
+    };
     void route.continue({ headers });
   });
   await page.goto(server.EMPTY_PAGE);
@@ -37,6 +40,39 @@ it('should amend HTTP headers', async ({ page, server }) => {
   expect(request.headers['foo']).toBe('bar');
 });
 
+it('should not allow to override unsafe HTTP headers', async ({ page, server, browserName, isAndroid, isElectron }) => {
+  it.skip(isAndroid);
+  let resolve;
+  const routePromise = new Promise<Route>(f => resolve = f);
+  await page.route('**/*', route => resolve(route));
+  const serverRequestPromise = server.waitForRequest('/empty.html');
+  page.goto(server.EMPTY_PAGE).catch(() => {});
+  const route = await routePromise;
+  const error = await route.continue({
+    headers: {
+      ...route.request().headers(),
+      host: 'bar',
+      trailer: 'baz',
+    }
+  }).catch(e => e);
+  if (isElectron) {
+    // Electron doesn't send the request if the host header is overridden,
+    // but doesn't throw an error either.
+    expect(error).toBeFalsy();
+    serverRequestPromise.catch(() => {});
+  } else if (browserName === 'chromium') {
+    expect(error.message).toContain('Unsafe header');
+    serverRequestPromise.catch(() => {});
+  } else {
+    expect(error).toBeFalsy();
+    // These lines just document current behavior in FF and WK,
+    // we don't necessarily want to maintain this behavior.
+    const serverRequest = await serverRequestPromise;
+    expect(serverRequest.headers['trailer']).toBe('baz');
+    expect(serverRequest.headers['host']).toBe(new URL(server.EMPTY_PAGE).host);
+  }
+});
+
 it('should delete header with undefined value', async ({ page, server, browserName }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' });
 
@@ -116,33 +152,6 @@ it('should not allow changing protocol when overriding url', async ({ page, serv
   expect(error.message).toContain('New URL must have same protocol as overridden URL');
 });
 
-it('should not throw when continuing while page is closing', async ({ page, server, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  let done;
-  await page.route('**/*', async route => {
-    done = Promise.all([
-      void route.continue(),
-      page.close(),
-    ]);
-  });
-  await page.goto(server.EMPTY_PAGE).catch(e => e);
-  await done;
-});
-
-it('should not throw when continuing after page is closed', async ({ page, server, isWebView2 }) => {
-  it.skip(isWebView2, 'Page.close() is not supported in WebView2');
-
-  let done;
-  await page.route('**/*', async route => {
-    await page.close();
-    done = route.continue();
-  });
-  const error = await page.goto(server.EMPTY_PAGE).catch(e => e);
-  await done;
-  expect(error).toBeInstanceOf(Error);
-});
-
 it('should not throw if request was cancelled by the page', async ({ page, server, browserName }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28490' });
   let interceptCallback;
@@ -393,9 +402,128 @@ it('should continue preload link requests', async ({ page, server, browserName }
   expect(color).toBe('rgb(255, 192, 203)');
 });
 
-it('continue should propagate headers to redirects', async ({ page, server, browserName }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28758' });
-  it.fixme(browserName === 'firefox');
+it('should respect set-cookie in redirect response', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35154' }
+}, async ({ page, server, browserName }) => {
+  it.fixme(browserName === 'firefox', 'Firefox does not respect set-cookie in redirect response');
+  await page.goto(server.EMPTY_PAGE);
+  await page.setContent('<a href="/set-cookie-redirect">Set cookie</a>');
+  server.setRoute('/set-cookie-redirect', (request, response) => {
+    response.writeHead(302, {
+      'set-cookie': 'foo=bar;  max-age=36000',
+      'location': '/empty.html'
+    });
+    response.end();
+  });
+  await page.route('**/set-cookie-redirect', route => {
+    void route.continue({
+      headers: {
+        ...route.request().headers()
+      }
+    });
+  });
+  const serverRequestPromise = server.waitForRequest('/empty.html');
+  await page.goto(server.PREFIX + '/set-cookie-redirect');
+  const serverRequest = await serverRequestPromise;
+  expect.soft(serverRequest.headers['cookie']).toBe('foo=bar');
+  expect.soft(await page.evaluate(() => document.cookie)).toBe('foo=bar');
+});
+
+it('continue should not propagate cookie override to redirects', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35168' },
+  ]
+}, async ({ page, server, browserName }) => {
+  it.fixme(browserName === 'firefox', 'We currently clear all headers during interception in firefox');
+  server.setRoute('/set-cookie', (request, response) => {
+    response.writeHead(200, { 'Set-Cookie': 'foo=bar;' });
+    response.end();
+  });
+  await page.goto(server.PREFIX + '/set-cookie');
+  expect(await page.evaluate(() => document.cookie)).toBe('foo=bar');
+  server.setRedirect('/redirect', server.PREFIX + '/empty.html');
+  await page.route('**/redirect', route => {
+    void route.continue({
+      headers: {
+        ...route.request().headers(),
+        cookie: 'override'
+      }
+    });
+  });
+  const [serverRequest] = await Promise.all([
+    server.waitForRequest('/empty.html'),
+    page.goto(server.PREFIX + '/redirect')
+  ]);
+  expect(serverRequest.headers['cookie']).toBe('foo=bar');
+});
+
+it('continue should not override cookie', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35168' },
+  ]
+}, async ({ page, server }) => {
+  server.setRoute('/set-cookie', (request, response) => {
+    response.writeHead(200, { 'Set-Cookie': 'foo=bar;' });
+    response.end();
+  });
+  await page.goto(server.PREFIX + '/set-cookie');
+  expect(await page.evaluate(() => document.cookie)).toBe('foo=bar');
+  await page.route('**', route => {
+    void route.continue({
+      headers: {
+        ...route.request().headers(),
+        cookie: 'override',
+        custom: 'value'
+      }
+    });
+  });
+  const [serverRequest] = await Promise.all([
+    server.waitForRequest('/empty.html'),
+    page.goto(server.EMPTY_PAGE)
+  ]);
+  // Original cookie from the browser's cookie jar should be sent.
+  expect(serverRequest.headers['cookie']).toBe('foo=bar');
+  expect(serverRequest.headers['custom']).toBe('value');
+});
+
+it('redirect after continue should be able to delete cookie', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35168' },
+  ]
+}, async ({ page, server }) => {
+  server.setRoute('/set-cookie', (request, response) => {
+    response.writeHead(200, { 'Set-Cookie': 'foo=bar;' });
+    response.end();
+  });
+  await page.goto(server.PREFIX + '/set-cookie');
+  expect(await page.evaluate(() => document.cookie)).toBe('foo=bar');
+
+  server.setRoute('/delete-cookie', (request, response) => {
+    response.writeHead(200, { 'Set-Cookie': 'foo=bar; expires=Thu, 01 Jan 1970 00:00:00 GMT' });
+    response.end();
+  });
+  server.setRedirect('/redirect', '/delete-cookie');
+  await page.route('**/redirect', route => {
+    void route.continue({
+      headers: {
+        ...route.request().headers(),
+      }
+    });
+  });
+  await page.goto(server.PREFIX + '/redirect');
+  const [serverRequest] = await Promise.all([
+    server.waitForRequest('/empty.html'),
+    page.goto(server.EMPTY_PAGE)
+  ]);
+  expect(serverRequest.headers['cookie']).toBeFalsy();
+});
+
+it('continue should propagate headers to redirects', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28758' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+  ]
+}, async ({ page, server }) => {
   await server.setRedirect('/redirect', '/empty.html');
   await page.route('**/redirect', route => {
     void route.continue({
@@ -412,10 +540,36 @@ it('continue should propagate headers to redirects', async ({ page, server, brow
   expect(serverRequest.headers['custom']).toBe('value');
 });
 
+it('continue should drop content-length on redirects', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36029' }
+}, async ({ page, server }) => {
+  await page.goto(server.EMPTY_PAGE);
+
+  await server.setRedirect('/redirect', '/empty.html');
+  await page.route('**/redirect', route => {
+    void route.continue({
+      headers: {
+        ...route.request().headers(),
+        custom: 'value'
+      }
+    });
+  });
+  const [serverRequest] = await Promise.all([
+    server.waitForRequest('/empty.html'),
+    page.evaluate(url => fetch(url, { method: 'POST', body: 'foo' }), server.PREFIX + '/redirect')
+  ]);
+  expect.soft(serverRequest.method).toBe('GET');
+  expect.soft(serverRequest.headers['content-length']).toBeUndefined();
+  expect.soft(serverRequest.headers['content-type']).toBeUndefined();
+  expect.soft(serverRequest.headers['custom']).toBe('value');
+});
+
 it('redirected requests should report overridden headers', {
-  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31351' }
-}, async ({ page, server, browserName }) => {
-  it.fixme(browserName === 'firefox');
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31351' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+  ]
+}, async ({ page, server }) => {
   await server.setRedirect('/redirect', '/empty.html');
   await page.route('**/redirect', route => {
     const headers = route.request().headers();
@@ -433,9 +587,12 @@ it('redirected requests should report overridden headers', {
   expect((await response.request().allHeaders())['custom']).toBe('value');
 });
 
-it('continue should delete headers on redirects', async ({ page, server, browserName }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' });
-  it.fixme(browserName === 'firefox');
+it('continue should delete headers on redirects', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+  ]
+}, async ({ page, server }) => {
   await page.goto(server.PREFIX + '/empty.html');
   server.setRoute('/something', (request, response) => {
     response.writeHead(200, { 'Access-Control-Allow-Origin': '*' });
@@ -465,6 +622,209 @@ it('continue should delete headers on redirects', async ({ page, server, browser
   expect(serverRequest.headers.foo).toBeFalsy();
 });
 
+it('propagate headers same origin redirect', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35154' },
+  ]
+}, async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/empty.html');
+  let resolve;
+  const serverRequestPromise = new Promise<http.IncomingMessage>(f => resolve = f);
+  server.setRoute('/something', (request, response) => {
+    if (request.method === 'OPTIONS') {
+      response.writeHead(204, {
+        'Access-Control-Allow-Origin': server.PREFIX,
+        'Access-Control-Allow-Credentials': 'true',
+        'Access-Control-Allow-Methods': 'POST, GET, OPTIONS, DELETE',
+        'Access-Control-Allow-Headers': 'authorization,cookie,custom',
+      });
+      response.end();
+      return;
+    }
+    resolve(request);
+    response.writeHead(200, { });
+    response.end('done');
+  });
+  await server.setRedirect('/redirect', '/something');
+  await page.evaluate(() => document.cookie = 'a=b');
+  const text = await page.evaluate(async url => {
+    const data = await fetch(url, {
+      headers: {
+        authorization: 'credentials',
+        custom: 'foo'
+      },
+      credentials: 'include',
+    });
+    return data.text();
+  }, server.PREFIX + '/redirect');
+  expect(text).toBe('done');
+  const serverRequest = await serverRequestPromise;
+  expect.soft(serverRequest.headers['authorization']).toBe('credentials');
+  expect.soft(serverRequest.headers['cookie']).toBe('a=b');
+  expect.soft(serverRequest.headers['custom']).toBe('foo');
+});
+
+it('propagate headers cross origin', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+  ]
+}, async ({ page, server }) => {
+  await page.goto(server.PREFIX + '/empty.html');
+  let resolve;
+  const serverRequestPromise = new Promise<http.IncomingMessage>(f => resolve = f);
+  server.setRoute('/something', (request, response) => {
+    if (request.method === 'OPTIONS') {
+      response.writeHead(204, {
+        'Access-Control-Allow-Origin': server.PREFIX,
+        'Access-Control-Allow-Credentials': 'true',
+        'Access-Control-Allow-Methods': 'POST, GET, OPTIONS, DELETE',
+        'Access-Control-Allow-Headers': 'authorization,custom',
+      });
+      response.end();
+      return;
+    }
+    resolve(request);
+    response.writeHead(200, {
+      'Access-Control-Allow-Origin': server.PREFIX,
+      'Access-Control-Allow-Credentials': 'true',
+    });
+    response.end('done');
+  });
+  const text = await page.evaluate(async url => {
+    const data = await fetch(url, {
+      headers: {
+        authorization: 'credentials',
+        custom: 'foo'
+      },
+      credentials: 'include',
+    });
+    return data.text();
+  }, server.CROSS_PROCESS_PREFIX + '/something');
+  expect(text).toBe('done');
+  const serverRequest = await serverRequestPromise;
+  expect.soft(serverRequest.headers['authorization']).toBe('credentials');
+  expect.soft(serverRequest.headers['custom']).toBe('foo');
+});
+
+it('propagate headers cross origin redirect', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35154' },
+  ]
+}, async ({ page, server, isAndroid }) => {
+  it.fixme(isAndroid, 'receives authorization:credentials header');
+
+  await page.goto(server.PREFIX + '/empty.html');
+  let resolve;
+  const serverRequestPromise = new Promise<http.IncomingMessage>(f => resolve = f);
+  server.setRoute('/something', (request, response) => {
+    if (request.method === 'OPTIONS') {
+      response.writeHead(204, {
+        'Access-Control-Allow-Origin': server.PREFIX,
+        'Access-Control-Allow-Credentials': 'true',
+        'Access-Control-Allow-Methods': 'POST, GET, OPTIONS, DELETE',
+        'Access-Control-Allow-Headers': 'authorization,cookie,custom',
+      });
+      response.end();
+      return;
+    }
+    resolve(request);
+    response.writeHead(200, {
+      'Access-Control-Allow-Origin': server.PREFIX,
+      'Access-Control-Allow-Credentials': 'true',
+    });
+    response.end('done');
+  });
+  server.setRoute('/redirect', (request, response) => {
+    response.writeHead(301, { location: `${server.CROSS_PROCESS_PREFIX}/something` });
+    response.end();
+  });
+  await page.evaluate(() => document.cookie = 'a=b');
+  const text = await page.evaluate(async url => {
+    const data = await fetch(url, {
+      headers: {
+        authorization: 'credentials',
+        custom: 'foo'
+      },
+      credentials: 'include',
+    });
+    return data.text();
+  }, server.PREFIX + '/redirect');
+  expect(text).toBe('done');
+  const serverRequest = await serverRequestPromise;
+  // Authorization header not propagated to cross-origin redirect.
+  expect.soft(serverRequest.headers['authorization']).toBeFalsy();
+  expect.soft(serverRequest.headers['cookie']).toBeFalsy();
+  expect.soft(serverRequest.headers['custom']).toBe('foo');
+});
+
+it('propagate headers cross origin redirect after interception', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/13106' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32045' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35154' },
+  ]
+}, async ({ page, server, browserName, isAndroid }) => {
+  it.skip(isAndroid, 'No cross-process on Android');
+
+  await page.goto(server.PREFIX + '/empty.html');
+  let resolve;
+  const serverRequestPromise = new Promise<http.IncomingMessage>(f => resolve = f);
+  server.setRoute('/something', (request, response) => {
+    if (request.method === 'OPTIONS') {
+      response.writeHead(204, {
+        'Access-Control-Allow-Origin': server.PREFIX,
+        'Access-Control-Allow-Credentials': 'true',
+        'Access-Control-Allow-Methods': 'POST, GET, OPTIONS, DELETE',
+        'Access-Control-Allow-Headers': 'authorization,cookie,custom',
+      });
+      response.end();
+      return;
+    }
+    resolve(request);
+    response.writeHead(200, {
+      'Access-Control-Allow-Origin': server.PREFIX,
+      'Access-Control-Allow-Credentials': 'true',
+    });
+    response.end('done');
+  });
+  server.setRoute('/redirect', (request, response) => {
+    response.writeHead(301, { location: `${server.CROSS_PROCESS_PREFIX}/something` });
+    response.end();
+  });
+  await page.evaluate(() => document.cookie = 'a=b');
+  await page.route('**/redirect', async route => {
+    await route.continue({
+      headers: {
+        ...route.request().headers(),
+        authorization: 'credentials',
+        custom: 'foo'
+      }
+    });
+  });
+  const text = await page.evaluate(async url => {
+    const data = await fetch(url, {
+      headers: {
+        authorization: 'none',
+      },
+      credentials: 'include',
+    });
+    return data.text();
+  }, server.PREFIX + '/redirect');
+  expect(text).toBe('done');
+  const serverRequest = await serverRequestPromise;
+  if (browserName === 'webkit')
+    expect.soft(serverRequest.headers['authorization']).toBeFalsy();
+  else
+    expect.soft(serverRequest.headers['authorization']).toBe('credentials');
+  expect.soft(serverRequest.headers['cookie']).toBeFalsy();
+  expect.soft(serverRequest.headers['custom']).toBe('foo');
+});
+
 it('should intercept css variable with background url', async ({ page, server }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/19158' });
 
@@ -537,3 +897,40 @@ it('continue should not change multipart/form-data body', async ({ page, server,
   expect.soft((await reqBefore.postBody).toString('utf8')).toContain(fileContent);
   expect.soft((await reqAfter.postBody).toString('utf8')).toContain(fileContent);
 });
+
+it('should not forward Host header on cross-origin redirect', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/36719'
+  }
+}, async ({ page, server, browserName }) => {
+  const redirectTargetPath = '/final';
+  const redirectSourcePath = '/redirect';
+
+  let redirectedHost: string | undefined;
+  server.setRoute(redirectTargetPath, (req, res) => {
+    redirectedHost = req.headers['host'];
+    res.end('OK');
+  });
+
+  let firstHost: string | undefined;
+  server.setRoute(redirectSourcePath, (req, res) => {
+    firstHost = req.headers['host'];
+    res.writeHead(302, { location: `${server.CROSS_PROCESS_PREFIX}${redirectTargetPath}` });
+    res.end();
+  });
+
+  await page.route('**/*', async route => {
+    const headers = route.request().headers();
+    if (browserName === 'firefox')
+      expect(headers).toHaveProperty('host');
+    else
+      expect(headers).not.toHaveProperty('host');
+    await route.continue({ headers });
+  });
+
+  const response = await page.goto(server.PREFIX + redirectSourcePath);
+  expect(response.status()).toBe(200);
+  expect(firstHost).toBe(new URL(server.PREFIX).host);
+  expect(redirectedHost).toBe(new URL(server.CROSS_PROCESS_PREFIX).host);
+});
diff --git a/tests/page/page-request-fulfill.spec.ts b/tests/page/page-request-fulfill.spec.ts
index ebde0dbc56d2d..0d939a0a5cbc2 100644
--- a/tests/page/page-request-fulfill.spec.ts
+++ b/tests/page/page-request-fulfill.spec.ts
@@ -309,10 +309,12 @@ it('should fetch original request and fulfill', async ({ page, server, isElectro
   expect(await page.title()).toEqual('Woof-Woof');
 });
 
-it('should fulfill with multiple set-cookie', async ({ page, server, isElectron, electronMajorVersion }) => {
+it('should fulfill with multiple set-cookie', async ({ page, server, isElectron, electronMajorVersion, isAndroid }) => {
   it.skip(isElectron && electronMajorVersion < 14, 'Electron 14+ is required');
+  it.skip(isAndroid, 'Android does not have an isolated context per test, so we get cookies from other tests');
+
   const cookies = ['a=b', 'c=d'];
-  await page.route('**/empty.html', async route => {
+  await page.route('**/multiple-set-cookie.html', async route => {
     void route.fulfill({
       status: 200,
       headers: {
@@ -323,7 +325,7 @@ it('should fulfill with multiple set-cookie', async ({ page, server, isElectron,
       body: ''
     });
   });
-  const response = await page.goto(server.EMPTY_PAGE);
+  const response = await page.goto(server.PREFIX + '/multiple-set-cookie.html');
   expect((await page.evaluate(() => document.cookie)).split(';').map(s => s.trim()).sort()).toEqual(cookies);
   expect(await response.headerValue('X-Header-1')).toBe('v1');
   expect(await response.headerValue('X-Header-2')).toBe('v2');
@@ -483,4 +485,3 @@ it('should not go to the network for fulfilled requests body', {
   expect(body).toBeTruthy();
   expect(serverHit).toBe(false);
 });
-
diff --git a/tests/page/page-request-gc.spec.ts b/tests/page/page-request-gc.spec.ts
new file mode 100644
index 0000000000000..e39c79a42f47b
--- /dev/null
+++ b/tests/page/page-request-gc.spec.ts
@@ -0,0 +1,34 @@
+/**
+ * Copyright 2024 Adobe Inc. All rights reserved.
+ *
+ * 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 './pageTest';
+
+test('should work', async ({ page }) => {
+  await page.evaluate(() => {
+    globalThis.objectToDestroy = { hello: 'world' };
+    globalThis.weakRef = new WeakRef(globalThis.objectToDestroy);
+  });
+
+  await page.requestGC();
+  expect(await page.evaluate(() => globalThis.weakRef.deref())).toEqual({ hello: 'world' });
+
+  await page.requestGC();
+  expect(await page.evaluate(() => globalThis.weakRef.deref())).toEqual({ hello: 'world' });
+
+  await page.evaluate(() => globalThis.objectToDestroy = null);
+  await page.requestGC();
+  expect(await page.evaluate(() => globalThis.weakRef.deref())).toBe(undefined);
+});
diff --git a/tests/page/page-request-intercept.spec.ts b/tests/page/page-request-intercept.spec.ts
index 33516606e7971..3ea6655566de9 100644
--- a/tests/page/page-request-intercept.spec.ts
+++ b/tests/page/page-request-intercept.spec.ts
@@ -218,7 +218,7 @@ it('should support timeout option in route.fetch', async ({ page, server, isElec
   });
   await page.route('**/*', async route => {
     const error = await route.fetch({ timeout: 1000 }).catch(e => e);
-    expect(error.message).toContain(`Request timed out after 1000ms`);
+    expect(error.message).toContain(`route.fetch: Timeout 1000ms exceeded`);
   });
   const error = await page.goto(server.PREFIX + '/slow', { timeout: 2000 }).catch(e => e);
   expect(error.message).toContain(`Timeout 2000ms exceeded`);
@@ -284,8 +284,9 @@ it('should fulfill popup main request using alias', async ({ page, server, isEle
 
 it('request.postData is not null when fetching FormData with a Blob', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/24077' }
-}, async ({ server, page, browserName, isElectron, electronMajorVersion }) => {
+}, async ({ server, page, browserName, isElectron, electronMajorVersion, isAndroid }) => {
   it.skip(isElectron && electronMajorVersion < 31);
+  it.fixme(isAndroid, 'postData is null for some reason');
   it.fixme(browserName === 'webkit', 'The body is empty in WebKit when intercepting');
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`
@@ -316,4 +317,26 @@ it('request.postData is not null when fetching FormData with a Blob', {
   const postData = await postDataPromise;
   expect(postData).toContain('Content-Disposition: form-data; name="file"; filename="blob"');
   expect(postData).toContain('\r\nhello\r\n');
-});
\ No newline at end of file
+});
+
+it('should abort favicon requests if interception is enabled', async ({ page, server, browserName }) => {
+  let requestCount = 0;
+  server.setRoute('/favicon.ico', (req, res) => {
+    ++requestCount;
+    res.setHeader('content-type', 'text/plain');
+    res.end('my content');
+  });
+  // Intercept all requests.
+  await page.route('**/*', async route => {
+    await route.fulfill({
+      status: 200,
+      body: 'Hello, world!',
+    });
+  });
+  await page.goto(server.EMPTY_PAGE);
+  const response = await page.evaluate(() => fetch('/favicon.ico').then(r => r.text()).catch(e => 'load failed'));
+  expect(response).toBe('load failed');
+  // Browsers can send favicon requests in the background.
+  await new Promise(f => setTimeout(f, 1000));
+  expect(requestCount).toBe(0);
+});
diff --git a/tests/page/page-route.spec.ts b/tests/page/page-route.spec.ts
index 911521018e147..1d38c0c2e806d 100644
--- a/tests/page/page-route.spec.ts
+++ b/tests/page/page-route.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import os from 'os';
 import type { Route } from 'playwright-core';
 import { test as it, expect } from './pageTest';
 
@@ -72,10 +71,11 @@ it('should unroute', async ({ page, server }) => {
   expect(intercepted).toEqual([1]);
 });
 
-it('should support ? in glob pattern', async ({ page, server }) => {
+it('should not support ? in glob pattern', async ({ page, server }) => {
   server.setRoute('/index', (req, res) => res.end('index-no-hello'));
   server.setRoute('/index123hello', (req, res) => res.end('index123hello'));
   server.setRoute('/index?hello', (req, res) => res.end('index?hello'));
+  server.setRoute('/index1hello', (req, res) => res.end('index1hello'));
 
   await page.route('**/index?hello', async (route, request) => {
     await route.fulfill({ body: 'intercepted any character' });
@@ -92,7 +92,7 @@ it('should support ? in glob pattern', async ({ page, server }) => {
   expect(await page.content()).toContain('index-no-hello');
 
   await page.goto(server.PREFIX + '/index1hello');
-  expect(await page.content()).toContain('intercepted any character');
+  expect(await page.content()).toContain('index1hello');
 
   await page.goto(server.PREFIX + '/index123hello');
   expect(await page.content()).toContain('index123hello');
@@ -166,9 +166,8 @@ it('should properly return navigation response when URL has cookies', async ({ p
   expect(response.status()).toBe(200);
 });
 
-it('should override cookie header', async ({ page, server, browserName }) => {
+it('should not override cookie header', async ({ page, server, browserName }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/16773' });
-  it.fail(browserName !== 'firefox');
 
   await page.goto(server.EMPTY_PAGE);
   await page.evaluate(() => document.cookie = 'original=value');
@@ -184,8 +183,9 @@ it('should override cookie header', async ({ page, server, browserName }) => {
     page.goto(server.EMPTY_PAGE),
   ]);
 
-  expect(cookieValueInRoute).toBe('original=value');
-  expect(serverReq.headers['cookie']).toBe('overridden=value');
+  if (browserName !== 'webkit')
+    expect.soft(cookieValueInRoute).toBe('original=value');
+  expect.soft(serverReq.headers['cookie']).toBe('original=value');
 });
 
 it('should show custom HTTP headers', async ({ page, server }) => {
@@ -300,15 +300,14 @@ it('should be abortable', async ({ page, server }) => {
   expect(failed).toBe(true);
 });
 
-it('should be abortable with custom error codes', async ({ page, server, browserName, isMac }) => {
+it('should be abortable with custom error codes', async ({ page, server, browserName, isMac, macVersion }) => {
   await page.route('**/*', route => route.abort('internetdisconnected'));
   let failedRequest = null;
   page.on('requestfailed', request => failedRequest = request);
   await page.goto(server.EMPTY_PAGE).catch(e => {});
   expect(failedRequest).toBeTruthy();
-  const isFrozenWebKit = isMac && parseInt(os.release(), 10) < 20;
   if (browserName === 'webkit')
-    expect(failedRequest.failure().errorText).toBe(isFrozenWebKit ? 'Request intercepted' : 'Blocked by Web Inspector');
+    expect(failedRequest.failure().errorText).toBe(isMac && macVersion < 11 ? 'Request intercepted' : 'Blocked by Web Inspector');
   else if (browserName === 'firefox')
     expect(failedRequest.failure().errorText).toBe('NS_ERROR_OFFLINE');
   else
@@ -345,14 +344,13 @@ it('should send referer', async ({ page, server }) => {
   expect(request.headers['referer']).toBe('http://google.com/');
 });
 
-it('should fail navigation when aborting main resource', async ({ page, server, browserName, isMac }) => {
+it('should fail navigation when aborting main resource', async ({ page, server, browserName, isMac, macVersion }) => {
   await page.route('**/*', route => route.abort());
   let error = null;
   await page.goto(server.EMPTY_PAGE).catch(e => error = e);
   expect(error).toBeTruthy();
-  const isFrozenWebKit = isMac && parseInt(os.release(), 10) < 20;
   if (browserName === 'webkit')
-    expect(error.message).toContain(isFrozenWebKit ? 'Request intercepted' : 'Blocked by Web Inspector');
+    expect(error.message).toContain(isMac && macVersion < 11 ? 'Request intercepted' : 'Blocked by Web Inspector');
   else if (browserName === 'firefox')
     expect(error.message).toContain('NS_ERROR_FAILURE');
   else
@@ -512,7 +510,7 @@ it('should work with badly encoded server', async ({ page, server }) => {
   expect(response.status()).toBe(200);
 });
 
-it('should work with encoded server - 2', async ({ page, server, browserName, browserMajorVersion }) => {
+it('should work with encoded server - 2', async ({ page, server, browserName }) => {
   // The requestWillBeSent will report URL as-is, whereas interception will
   // report encoded URL for stylesheet. @see crbug.com/759388
   const requests = [];
@@ -522,7 +520,7 @@ it('should work with encoded server - 2', async ({ page, server, browserName, br
   });
   const response = await page.goto(`data:text/html,<link rel="stylesheet" href="${server.PREFIX}/fonts?helvetica|arial"/>`);
   expect(response).toBe(null);
-  if (browserName === 'firefox' && browserMajorVersion >= 97)
+  if (browserName === 'firefox')
     expect(requests.length).toBe(2); // Firefox DevTools report to navigations in this case as well.
   else
     expect(requests.length).toBe(1);
@@ -739,7 +737,7 @@ it('should respect cors overrides', async ({ page, server, browserName, isAndroi
   }
 });
 
-it('should not auto-intercept non-preflight OPTIONS', async ({ page, server, isAndroid, browserName }) => {
+it('should not auto-intercept non-preflight OPTIONS without network interception', async ({ page, server, isAndroid, browserName }) => {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/20469' });
   it.fixme(isAndroid);
 
@@ -777,6 +775,31 @@ it('should not auto-intercept non-preflight OPTIONS', async ({ page, server, isA
     // Preflight for OPTIONS, then OPTIONS, then GET without preflight.
     expect.soft(requests).toEqual(['OPTIONS:/something', 'OPTIONS:/something', 'GET:/something']);
   }
+});
+
+// Make sure this runs in a new context as preflight results could be cached.
+it('should not auto-intercept non-preflight OPTIONS with network interception', async ({ page, server, isAndroid, browserName }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/20469' });
+  it.fixme(isAndroid);
+
+  await page.goto(server.EMPTY_PAGE);
+
+  let requests = [];
+  server.setRoute('/something', (request, response) => {
+    requests.push(request.method + ':' + request.url);
+    if (request.method === 'OPTIONS') {
+      response.writeHead(200, {
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Methods': 'POST, GET, OPTIONS, DELETE',
+        'Access-Control-Allow-Headers': '*',
+        'Cache-Control': 'no-cache'
+      });
+      response.end(`Hello`);
+      return;
+    }
+    response.writeHead(200, { 'Access-Control-Allow-Origin': '*' });
+    response.end('World');
+  });
 
   // With interception.
   {
@@ -793,10 +816,10 @@ it('should not auto-intercept non-preflight OPTIONS', async ({ page, server, isA
     expect.soft(text1).toBe('Hello');
     expect.soft(text2).toBe('World');
     // Preflight for OPTIONS is auto-fulfilled, then OPTIONS, then GET without preflight.
-    if (browserName === 'firefox')
-      expect.soft(requests).toEqual(['OPTIONS:/something', 'OPTIONS:/something', 'GET:/something']);
-    else
+    if (browserName === 'chromium')
       expect.soft(requests).toEqual(['OPTIONS:/something', 'GET:/something']);
+    else
+      expect.soft(requests).toEqual(['OPTIONS:/something', 'OPTIONS:/something', 'GET:/something']);
   }
 });
 
@@ -1030,3 +1053,20 @@ it('should intercept when postData is more than 1MB', async ({ page, server }) =
   }).catch(e => {}), POST_BODY);
   expect(await interceptionPromise).toBe(POST_BODY);
 });
+
+it('should be able to intercept every navigation to a page controlled by service worker', async ({ page, server, isElectron, browserName }) => {
+  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33561' });
+  it.skip(isElectron);
+
+  let interceptions = 0;
+  const URL = server.PREFIX + '/serviceworkers/bug-33561/index.html';
+  await page.route(URL, async route => {
+    ++interceptions;
+    await route.continue();
+  });
+
+  await page.goto(URL);
+  await page.evaluate(() => window['activationPromise']);
+  await page.goto(URL);
+  expect(interceptions).toBe(2);
+});
diff --git a/tests/page/page-screenshot.spec.ts b/tests/page/page-screenshot.spec.ts
index 7f374ac59be73..6c8dca034bd70 100644
--- a/tests/page/page-screenshot.spec.ts
+++ b/tests/page/page-screenshot.spec.ts
@@ -280,18 +280,22 @@ it.describe('page screenshot', () => {
     expect(screenshot).toMatchSnapshot('screenshot-clip-odd-size.png');
   });
 
-  it('should work for canvas', async ({ page, server, isElectron, isMac }) => {
+  it('should work for canvas', async ({ page, server, isElectron, isMac, isLinux, macVersion, browserName, isHeadlessShell, headless }) => {
     it.fixme(isElectron && isMac, 'Fails on the bots');
+    it.fixme(browserName === 'webkit' && isLinux && !headless, 'WebKit has slightly different corners on gtk4.');
     await page.setViewportSize({ width: 500, height: 500 });
     await page.goto(server.PREFIX + '/screenshots/canvas.html');
     const screenshot = await page.screenshot();
-    expect(screenshot).toMatchSnapshot('screenshot-canvas.png');
+    if ((!isHeadlessShell && browserName === 'chromium' && isMac && os.arch() === 'arm64' && macVersion >= 14) ||
+        (browserName === 'webkit' && isLinux && os.arch() === 'x64'))
+      expect(screenshot).toMatchSnapshot('screenshot-canvas-with-accurate-corners.png');
+    else
+      expect(screenshot).toMatchSnapshot('screenshot-canvas.png');
   });
 
-  it('should capture canvas changes', async ({ page, isElectron, browserName, isMac, isWebView2 }) => {
+  it('should capture canvas changes', async ({ page, isElectron, browserName, isMac }) => {
     it.fixme(browserName === 'webkit' && isMac, 'https://github.com/microsoft/playwright/issues/8796,https://github.com/microsoft/playwright/issues/16180');
     it.skip(isElectron);
-    it.skip(isWebView2);
     await page.goto('data:text/html,<canvas></canvas>');
     await page.evaluate(() => {
       const canvas = document.querySelector('canvas');
@@ -323,6 +327,7 @@ it.describe('page screenshot', () => {
   it('should work for webgl', async ({ page, server, browserName, platform }) => {
     it.fixme(browserName === 'firefox');
     it.fixme(browserName === 'chromium' && platform === 'darwin' && os.arch() === 'arm64', 'SwiftShader is not available on macOS-arm64 - https://github.com/microsoft/playwright/issues/28216');
+    it.skip(browserName === 'webkit' && platform === 'darwin' && os.arch() === 'x64', 'Modernizr uses WebGL which is not available on Intel macOS - https://bugs.webkit.org/show_bug.cgi?id=278277');
 
     await page.setViewportSize({ width: 640, height: 480 });
     await page.goto(server.PREFIX + '/screenshots/webgl.html');
@@ -724,9 +729,9 @@ it.describe('page screenshot animations', () => {
     const div = page.locator('div');
     await div.evaluate(el => {
       el.addEventListener('transitionend', () => {
-        const time = window.builtinDate.now();
+        const time = window.builtins.Date.now();
         // Block main thread for 200ms, emulating heavy layout.
-        while (window.builtinDate.now() - time < 200) {}
+        while (window.builtins.Date.now() - time < 200) {}
         const h1 = document.createElement('h1');
         h1.textContent = 'woof-woof';
         document.body.append(h1);
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-0-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-0-bidi-chromium.png
new file mode 100644
index 0000000000000..6fcce2cf53147
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-0-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-0-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-0-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..a5030e8655e37
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-0-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-1-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-1-bidi-chromium.png
new file mode 100644
index 0000000000000..f6f130a44ab8a
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-1-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-1-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..0235898c2413e
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-1-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-2-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-2-bidi-chromium.png
new file mode 100644
index 0000000000000..ecabd8b22d89f
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-2-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-2-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-2-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..bb47b0ed4af10
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/canvas-changes-2-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/grid-cell-1-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/grid-cell-1-bidi-chromium.png
new file mode 100644
index 0000000000000..2eab11668d689
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/grid-cell-1-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/grid-cell-1-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/grid-cell-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..55d6a44412f40
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/grid-cell-1-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/hide-should-work-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/hide-should-work-bidi-chromium.png
new file mode 100644
index 0000000000000..dd0549a4114a2
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/hide-should-work-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/hide-should-work-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/hide-should-work-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..7af4f1af7002a
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/hide-should-work-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-color-should-work-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-color-should-work-bidi-chromium.png
new file mode 100644
index 0000000000000..fef9e17ffed59
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-color-should-work-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-color-should-work-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-color-should-work-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..13e23657090e8
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-color-should-work-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-bidi-chromium.png
new file mode 100644
index 0000000000000..c663e342dc66f
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..720828ebfa214
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-elementhandle-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-elementhandle-bidi-chromium.png
new file mode 100644
index 0000000000000..5a13aac48b6b8
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-elementhandle-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-elementhandle-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-elementhandle-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..682da85e8e676
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-elementhandle-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-locator-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-locator-bidi-chromium.png
new file mode 100644
index 0000000000000..5a13aac48b6b8
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-locator-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-locator-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-locator-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..682da85e8e676
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/mask-should-work-with-locator-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/page-screenshot-should-capture-css-transform-1-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/page-screenshot-should-capture-css-transform-1-bidi-chromium.png
new file mode 100644
index 0000000000000..d29a2b4ab2810
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/page-screenshot-should-capture-css-transform-1-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/page-screenshot-should-capture-css-transform-1-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/page-screenshot-should-capture-css-transform-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..1010c4fd45203
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/page-screenshot-should-capture-css-transform-1-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/remove-should-work-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/remove-should-work-bidi-chromium.png
new file mode 100644
index 0000000000000..d35ddd42899d3
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/remove-should-work-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/remove-should-work-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/remove-should-work-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..cbae7f34d0284
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/remove-should-work-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-bidi-chromium.png
new file mode 100644
index 0000000000000..dfafbda63886a
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..b0af90ae99c2b
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-text-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-text-bidi-chromium.png
new file mode 100644
index 0000000000000..0971000b5f1e1
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-text-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-text-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-text-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..5d10bf453d665
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-text-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-with-accurate-corners-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-with-accurate-corners-chromium.png
new file mode 100644
index 0000000000000..830872e8d2e6a
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-with-accurate-corners-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-with-accurate-corners-webkit.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-with-accurate-corners-webkit.png
new file mode 100644
index 0000000000000..8c38aaeeb6eda
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-canvas-with-accurate-corners-webkit.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-odd-size-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-odd-size-bidi-chromium.png
new file mode 100644
index 0000000000000..61c0b7044a370
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-odd-size-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-odd-size-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-odd-size-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..8e86dc90178ac
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-odd-size-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-rect-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-rect-bidi-chromium.png
new file mode 100644
index 0000000000000..8c4046910b5bb
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-rect-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-rect-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-rect-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..6459e3afe7dd0
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-clip-rect-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-bidi-chromium.png
new file mode 100644
index 0000000000000..0354694da1b1f
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-mask-outside-viewport-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-mask-outside-viewport-bidi-chromium.png
new file mode 100644
index 0000000000000..9e97bfcedba5c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-mask-outside-viewport-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-mask-outside-viewport-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-mask-outside-viewport-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..361945923bf68
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-mask-outside-viewport-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..e87220e0576cd
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-grid-fullpage-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-iframe-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-iframe-bidi-chromium.png
new file mode 100644
index 0000000000000..56aa8706bbb79
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-iframe-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-iframe-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-iframe-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..541a25825cccb
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-iframe-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-offscreen-clip-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-offscreen-clip-bidi-chromium.png
new file mode 100644
index 0000000000000..21f7b0f461ad8
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-offscreen-clip-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-offscreen-clip-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-offscreen-clip-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..cfab2376be507
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-offscreen-clip-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-sanity-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-sanity-bidi-chromium.png
new file mode 100644
index 0000000000000..122a4f0ae04d9
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-sanity-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..7b164933553a5
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-sanity-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-translateZ-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-translateZ-bidi-chromium.png
new file mode 100644
index 0000000000000..e3f5642e6082b
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-translateZ-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-translateZ-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-translateZ-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..7dc10f2f5a31e
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-translateZ-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-web-font-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-web-font-bidi-chromium.png
new file mode 100644
index 0000000000000..40aa6d483cf9c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-web-font-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-web-font-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-web-font-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..11c8e0f2306c8
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-web-font-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-webgl-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-webgl-bidi-chromium.png
new file mode 100644
index 0000000000000..76109512b5e2c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-webgl-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/screenshot-webgl-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-webgl-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..76109512b5e2c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/screenshot-webgl-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-capture-css-box-shadow-1-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/should-capture-css-box-shadow-1-bidi-chromium.png
new file mode 100644
index 0000000000000..089549eb3c95c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-capture-css-box-shadow-1-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-capture-css-box-shadow-1-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/should-capture-css-box-shadow-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..aca4c72688339
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-capture-css-box-shadow-1-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-1-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-1-bidi-chromium.png
new file mode 100644
index 0000000000000..18f4ed1e6096c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-1-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-1-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-1-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..70455fcc3b148
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-1-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-2-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-2-bidi-chromium.png
new file mode 100644
index 0000000000000..bf3dbe65bdbf4
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-2-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-2-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-2-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..8bc3cf60e9752
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-in-parallel-2-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-inside-iframe-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-inside-iframe-bidi-chromium.png
new file mode 100644
index 0000000000000..c663e342dc66f
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-inside-iframe-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-inside-iframe-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-inside-iframe-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..720828ebfa214
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-inside-iframe-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-multiple-elements-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-multiple-elements-bidi-chromium.png
new file mode 100644
index 0000000000000..0ff0cf5137c3e
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-multiple-elements-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/should-mask-multiple-elements-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-multiple-elements-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..9febfed54f9f8
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/should-mask-multiple-elements-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/transparent-bidi-chromium.png b/tests/page/page-screenshot.spec.ts-snapshots/transparent-bidi-chromium.png
new file mode 100644
index 0000000000000..b9aa8f7a7260c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/transparent-bidi-chromium.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/transparent-moz-firefox-nightly.png b/tests/page/page-screenshot.spec.ts-snapshots/transparent-moz-firefox-nightly.png
new file mode 100644
index 0000000000000..b9aa8f7a7260c
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/transparent-moz-firefox-nightly.png differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/white-bidi-chromium.jpg b/tests/page/page-screenshot.spec.ts-snapshots/white-bidi-chromium.jpg
new file mode 100644
index 0000000000000..ed816ce76636a
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/white-bidi-chromium.jpg differ
diff --git a/tests/page/page-screenshot.spec.ts-snapshots/white-moz-firefox-nightly.jpg b/tests/page/page-screenshot.spec.ts-snapshots/white-moz-firefox-nightly.jpg
new file mode 100644
index 0000000000000..69d4c33852de1
Binary files /dev/null and b/tests/page/page-screenshot.spec.ts-snapshots/white-moz-firefox-nightly.jpg differ
diff --git a/tests/page/page-select-option.spec.ts b/tests/page/page-select-option.spec.ts
index 0faeee5f514fa..8b6afbd640d61 100644
--- a/tests/page/page-select-option.spec.ts
+++ b/tests/page/page-select-option.spec.ts
@@ -222,7 +222,7 @@ it('should throw if passed wrong types', async ({ page, server }) => {
   } catch (e) {
     error = e;
   }
-  expect(error.message).toContain('options[0].index: expected number, got string');
+  expect(error.message).toContain('options[0].index: expected integer, got string');
 });
 // @see https://github.com/GoogleChrome/puppeteer/issues/3327
 it('should work when re-defining top-level Event class', async ({ page, server }) => {
@@ -319,3 +319,128 @@ it('input event.composed should be true and cross shadow dom boundary', async ({
   expect(await page.evaluate(() => window['firedEvents'])).toEqual(['input:true', 'change:false']);
   expect(await page.evaluate(() => window['firedBodyEvents'])).toEqual(['input:true']);
 });
+
+it('should wait for select to be enabled', async ({ page }) => {
+  await page.setContent(`
+    <select disabled>
+      <option>one</option>
+      <option>two</option>
+    </select>
+
+    <script>
+    function hydrate() {
+      const select = document.querySelector('select');
+      select.removeAttribute('disabled');
+      select.addEventListener('change', () => {
+        window['result'] = select.value;
+      });
+    }
+    </script>
+  `);
+
+  const selectPromise = page.locator('select').selectOption('two');
+  await new Promise(f => setTimeout(f, 1000));
+  await page.evaluate(() => (window as any).hydrate());
+  await selectPromise;
+  expect(await page.evaluate(() => window['result'])).toEqual('two');
+  await expect(page.locator('select')).toHaveValue('two');
+});
+
+it('should wait for option to be enabled', async ({ page }) => {
+  await page.setContent(`
+    <select>
+      <option>one</option>
+      <option disabled id=myoption>two</option>
+    </select>
+
+    <script>
+    function hydrate() {
+      const option = document.querySelector('#myoption');
+      option.removeAttribute('disabled');
+      const select = document.querySelector('select');
+      select.addEventListener('change', () => {
+        window['result'] = select.value;
+      });
+    }
+    </script>
+  `);
+
+  const error = await page.locator('select').selectOption('two', { timeout: 1000 }).catch(e => e);
+  expect(error.message).toContain('option being selected is not enabled');
+
+  const selectPromise = page.locator('select').selectOption('two');
+  await new Promise(f => setTimeout(f, 1000));
+  await page.evaluate(() => (window as any).hydrate());
+  await selectPromise;
+  expect(await page.evaluate(() => window['result'])).toEqual('two');
+  await expect(page.locator('select')).toHaveValue('two');
+});
+
+it('should wait for optgroup to be enabled', async ({ page }) => {
+  await page.setContent(`
+    <select>
+      <option>one</option>
+      <optgroup label="Group" disabled id=mygroup>
+        <option>two</option>
+      </optgroup>
+    </select>
+
+    <script>
+    function hydrate() {
+      const group = document.querySelector('#mygroup');
+      group.removeAttribute('disabled');
+      const select = document.querySelector('select');
+      select.addEventListener('change', () => {
+        window['result'] = select.value;
+      });
+    }
+    </script>
+  `);
+
+  const error = await page.locator('select').selectOption('two', { timeout: 1000 }).catch(e => e);
+  expect(error.message).toContain('option being selected is not enabled');
+
+  const selectPromise = page.locator('select').selectOption('two');
+  await new Promise(f => setTimeout(f, 1000));
+  await page.evaluate(() => (window as any).hydrate());
+  await selectPromise;
+  expect(await page.evaluate(() => window['result'])).toEqual('two');
+  await expect(page.locator('select')).toHaveValue('two');
+});
+
+it('should wait for select to be swapped', async ({ page }) => {
+  await page.setContent(`
+    <select disabled>
+      <option>one</option>
+      <option>two</option>
+    </select>
+
+    <script>
+    function hydrate() {
+      const select = document.querySelector('select');
+      select.remove();
+
+      const newSelect = document.createElement('select');
+      const option1 = document.createElement('option');
+      option1.textContent = 'one';
+      newSelect.appendChild(option1);
+      const option2 = document.createElement('option');
+      option2.textContent = 'two';
+      newSelect.appendChild(option2);
+
+      document.body.appendChild(newSelect);
+
+      newSelect.addEventListener('change', () => {
+        window['result'] = newSelect.value;
+      });
+    }
+    </script>
+  `);
+
+  const selectPromise = page.locator('select').selectOption('two');
+  await new Promise(f => setTimeout(f, 1000));
+  await page.evaluate(() => (window as any).hydrate());
+  await selectPromise;
+  await expect(page.locator('select')).toHaveValue('two');
+  expect(await page.evaluate(() => window['result'])).toEqual('two');
+});
diff --git a/tests/page/page-set-content.spec.ts b/tests/page/page-set-content.spec.ts
index 4f0c903bfcee8..33e04c8604a30 100644
--- a/tests/page/page-set-content.spec.ts
+++ b/tests/page/page-set-content.spec.ts
@@ -123,9 +123,39 @@ it('content() should throw nice error during navigation', async ({ page, server
   }
 });
 
-it('should return empty content there is no iframe src', async ({ page }) => {
-  it.fixme(true, 'Hangs in all browsers because there is no utility context');
+it('should return empty content there is no iframe src', async ({ page, browserName }) => {
+  it.fixme(browserName === 'webkit', 'Hangs in all browsers because there is no utility context');
   await page.setContent(`<iframe src="javascript:console.log(1)"></iframe>`);
   expect(page.frames().length).toBe(2);
   expect(await page.frames()[1].content()).toBe('<html><head></head><body></body></html>');
 });
+
+it('should handle timeout properly', async ({ page, toImpl, browserName }) => {
+  it.skip(browserName === 'firefox', 'tampering with console.debug in utility world does not work');
+
+  await toImpl(page).mainFrame().evaluateExpression(String(() => {
+    window['saved'] = console.debug.bind(console);
+    console.debug = () => {};
+  }), { isFunction: true, world: 'utility' });
+  const error = await page.setContent(`<div>hello</div>`, { timeout: 1000 }).catch(e => e);
+  expect(error.message).toContain('page.setContent: Timeout 1000ms exceeded');
+
+  // Should recover after timeout.
+  await toImpl(page).mainFrame().evaluateExpression(String(() => {
+    console.debug = window['saved'];
+  }), { isFunction: true, world: 'utility' });
+  await page.setContent(`<div>world</div>`);
+  await expect(page.locator('div')).toHaveText('world');
+});
+
+it('should handle timeout properly 2', async ({ page, toImpl, trace }) => {
+  it.skip(trace === 'on');
+
+  await toImpl(page).mainFrame().evaluateExpression(String(() => {
+    document.close = () => {
+      while (true) {}
+    };
+  }), { isFunction: true, world: 'utility' });
+  const error = await page.setContent(`<div>hello</div>`, { timeout: 1000 }).catch(e => e);
+  expect(error.message).toContain('page.setContent: Timeout 1000ms exceeded');
+});
diff --git a/tests/page/page-set-input-files.spec.ts b/tests/page/page-set-input-files.spec.ts
index 8e654f06dd20b..9129a6ee4f32a 100644
--- a/tests/page/page-set-input-files.spec.ts
+++ b/tests/page/page-set-input-files.spec.ts
@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 
-import { test as it, expect } from './pageTest';
-import { attachFrame } from '../config/utils';
+import { test, expect } from './pageTest';
 
 import path from 'path';
 import fs from 'fs';
-import os from 'os';
 import formidable from 'formidable';
 
-it('should upload the file', async ({ page, server, asset }) => {
+test('should upload the file', async ({ page, server, asset }) => {
   await page.goto(server.PREFIX + '/input/fileupload.html');
   const filePath = path.relative(process.cwd(), asset('file-to-upload.txt'));
   const input = await page.$('input');
@@ -37,13 +35,13 @@ it('should upload the file', async ({ page, server, asset }) => {
   }, input)).toBe('contents of the file');
 });
 
-it('should upload a folder', async ({ page, server, browserName, headless, browserMajorVersion, isAndroid }) => {
-  it.skip(isAndroid);
-  it.skip(browserName === 'webkit' && os.platform() === 'darwin' && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS-12 is frozen');
+test('should upload a folder', async ({ page, server, browserName, headless, browserMajorVersion, isAndroid, macVersion, isMac }) => {
+  test.skip(isAndroid);
+  test.skip(browserName === 'webkit' && isMac && macVersion <= 12, 'WebKit on macOS-12 is frozen');
 
   await page.goto(server.PREFIX + '/input/folderupload.html');
   const input = await page.$('input');
-  const dir = path.join(it.info().outputDir, 'file-upload-test');
+  const dir = path.join(test.info().outputDir, 'file-upload-test');
   {
     await fs.promises.mkdir(dir, { recursive: true });
     await fs.promises.writeFile(path.join(dir, 'file1.txt'), 'file1 content');
@@ -53,8 +51,8 @@ it('should upload a folder', async ({ page, server, browserName, headless, brows
   }
   await input.setInputFiles(dir);
   expect(new Set(await page.evaluate(e => [...e.files].map(f => f.webkitRelativePath), input))).toEqual(new Set([
-    // https://issues.chromium.org/issues/345393164
-    ...((browserName === 'chromium' && headless && !process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_NEW && browserMajorVersion < 127) ? [] : ['file-upload-test/sub-dir/really.txt']),
+    // Note: this did not work before Chrome 127, see https://issues.chromium.org/issues/345393164.
+    'file-upload-test/sub-dir/really.txt',
     'file-upload-test/file1.txt',
     'file-upload-test/file2',
   ]));
@@ -70,13 +68,13 @@ it('should upload a folder', async ({ page, server, browserName, headless, brows
   }
 });
 
-it('should upload a folder and throw for multiple directories', async ({ page, server, isAndroid, browserName }) => {
-  it.skip(isAndroid);
-  it.skip(browserName === 'webkit' && os.platform() === 'darwin' && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS-12 is frozen');
+test('should upload a folder and throw for multiple directories', async ({ page, server, isAndroid, browserName, macVersion, isMac }) => {
+  test.skip(isAndroid);
+  test.skip(browserName === 'webkit' && isMac && macVersion <= 12, 'WebKit on macOS-12 is frozen');
 
   await page.goto(server.PREFIX + '/input/folderupload.html');
   const input = await page.$('input');
-  const dir = path.join(it.info().outputDir, 'file-upload-test');
+  const dir = path.join(test.info().outputDir, 'file-upload-test');
   {
     await fs.promises.mkdir(path.join(dir, 'folder1'), { recursive: true });
     await fs.promises.writeFile(path.join(dir, 'folder1', 'file1.txt'), 'file1 content');
@@ -89,13 +87,13 @@ it('should upload a folder and throw for multiple directories', async ({ page, s
   ])).rejects.toThrow('Multiple directories are not supported');
 });
 
-it('should throw if a directory and files are passed', async ({ page, server, isAndroid, browserName }) => {
-  it.skip(isAndroid);
-  it.skip(browserName === 'webkit' && os.platform() === 'darwin' && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS-12 is frozen');
+test('should throw if a directory and files are passed', async ({ page, server, isAndroid, browserName, macVersion, isMac }) => {
+  test.skip(isAndroid);
+  test.skip(browserName === 'webkit' && isMac && macVersion <= 12, 'WebKit on macOS-12 is frozen');
 
   await page.goto(server.PREFIX + '/input/folderupload.html');
   const input = await page.$('input');
-  const dir = path.join(it.info().outputDir, 'file-upload-test');
+  const dir = path.join(test.info().outputDir, 'file-upload-test');
   {
     await fs.promises.mkdir(path.join(dir, 'folder1'), { recursive: true });
     await fs.promises.writeFile(path.join(dir, 'folder1', 'file1.txt'), 'file1 content');
@@ -106,13 +104,13 @@ it('should throw if a directory and files are passed', async ({ page, server, is
   ])).rejects.toThrow('File paths must be all files or a single directory');
 });
 
-it('should throw when uploading a folder in a normal file upload input', async ({ page, server, isAndroid, browserName }) => {
-  it.skip(isAndroid);
-  it.skip(browserName === 'webkit' && os.platform() === 'darwin' && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS-12 is frozen');
+test('should throw when uploading a folder in a normal file upload input', async ({ page, server, isAndroid, browserName, macVersion, isMac }) => {
+  test.skip(isAndroid);
+  test.skip(browserName === 'webkit' && isMac && macVersion <= 12, 'WebKit on macOS-12 is frozen');
 
   await page.goto(server.PREFIX + '/input/fileupload.html');
   const input = await page.$('input');
-  const dir = path.join(it.info().outputDir, 'file-upload-test');
+  const dir = path.join(test.info().outputDir, 'file-upload-test');
   {
     await fs.promises.mkdir(path.join(dir), { recursive: true });
     await fs.promises.writeFile(path.join(dir, 'file1.txt'), 'file1 content');
@@ -120,17 +118,17 @@ it('should throw when uploading a folder in a normal file upload input', async (
   await expect(input.setInputFiles(dir)).rejects.toThrow('File input does not support directories, pass individual files instead');
 });
 
-it('should throw when uploading a file in a directory upload input', async ({ page, server, isAndroid, asset, browserName }) => {
-  it.skip(isAndroid);
-  it.skip(browserName === 'webkit' && os.platform() === 'darwin' && parseInt(os.release().split('.')[0], 10) <= 21, 'WebKit on macOS-12 is frozen');
+test('should throw when uploading a file in a directory upload input', async ({ page, server, isAndroid, asset, browserName, macVersion, isMac }) => {
+  test.skip(isAndroid);
+  test.skip(browserName === 'webkit' && isMac && macVersion <= 12, 'WebKit on macOS-12 is frozen');
 
   await page.goto(server.PREFIX + '/input/folderupload.html');
   const input = await page.$('input');
   await expect(input.setInputFiles(asset('file to upload.txt'))).rejects.toThrow('[webkitdirectory] input requires passing a path to a directory');
 });
 
-it('should upload a file after popup', async ({ page, server, asset }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29923' });
+test('should upload a file after popup', async ({ page, server, asset }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29923' });
   await page.goto(server.PREFIX + '/input/fileupload.html');
   {
     const [popup] = await Promise.all([
@@ -145,12 +143,11 @@ it('should upload a file after popup', async ({ page, server, asset }) => {
   expect(await page.evaluate(e => e.files[0].name, input)).toBe('file-to-upload.txt');
 });
 
-it('should upload large file', async ({ page, server, browserName, isMac, isAndroid, isWebView2, mode }, testInfo) => {
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen and does not have corresponding protocol features.');
-  it.skip(isAndroid);
-  it.skip(isWebView2);
-  it.skip(mode.startsWith('service'));
-  it.slow();
+test('should upload large file', async ({ page, server, isAndroid, isWebView2, mode }, testInfo) => {
+  test.skip(isAndroid);
+  test.skip(isWebView2);
+  test.skip(mode.startsWith('service'));
+  test.slow();
 
   await page.goto(server.PREFIX + '/input/fileupload.html');
   const uploadFile = testInfo.outputPath('200MB.zip');
@@ -196,7 +193,7 @@ it('should upload large file', async ({ page, server, browserName, isMac, isAndr
   await Promise.all([uploadFile, file1.filepath].map(fs.promises.unlink));
 });
 
-it('should throw an error if the file does not exist', async ({ page, server, asset }) => {
+test('should throw an error if the file does not exist', async ({ page, server, asset }) => {
   await page.goto(server.PREFIX + '/input/fileupload.html');
   const input = await page.$('input');
   const error = await input.setInputFiles('i actually do not exist.txt').catch(e => e);
@@ -204,53 +201,11 @@ it('should throw an error if the file does not exist', async ({ page, server, as
   expect(error.message).toContain('i actually do not exist.txt');
 });
 
-it('should upload multiple large files', async ({ page, server, browserName, isMac, isAndroid, isWebView2, mode }, testInfo) => {
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen and does not have corresponding protocol features.');
-  it.skip(isAndroid);
-  it.skip(isWebView2);
-  it.skip(mode.startsWith('service'));
-  it.slow();
-
-  const filesCount = 10;
-  await page.goto(server.PREFIX + '/input/fileupload-multi.html');
-  const uploadFile = testInfo.outputPath('50MB_1.zip');
-  const str = 'A'.repeat(1024);
-  const stream = fs.createWriteStream(uploadFile);
-  // 49 is close to the actual limit
-  for (let i = 0; i < 49 * 1024; i++) {
-    await new Promise<void>((fulfill, reject) => {
-      stream.write(str, err => {
-        if (err)
-          reject(err);
-        else
-          fulfill();
-      });
-    });
-  }
-  await new Promise(f => stream.end(f));
-  const input = page.locator('input[type="file"]');
-  const uploadFiles = [uploadFile];
-  for (let i = 2; i <= filesCount; i++) {
-    const dstFile = testInfo.outputPath(`50MB_${i}.zip`);
-    fs.copyFileSync(uploadFile, dstFile);
-    uploadFiles.push(dstFile);
-  }
-  const fileChooserPromise = page.waitForEvent('filechooser');
-  await input.click();
-  const fileChooser = await fileChooserPromise;
-  await fileChooser.setFiles(uploadFiles);
-  const filesLen = await page.evaluate('document.getElementsByTagName("input")[0].files.length');
-  expect(fileChooser.isMultiple()).toBe(true);
-  expect(filesLen).toEqual(filesCount);
-  await Promise.all(uploadFiles.map(path => fs.promises.unlink(path)));
-});
-
-it('should upload large file with relative path', async ({ page, server, browserName, isMac, isAndroid, isWebView2, mode }, testInfo) => {
-  it.skip(browserName === 'webkit' && isMac && parseInt(os.release(), 10) < 20, 'WebKit for macOS 10.15 is frozen and does not have corresponding protocol features.');
-  it.skip(isAndroid);
-  it.skip(isWebView2);
-  it.skip(mode.startsWith('service'));
-  it.slow();
+test('should upload large file with relative path', async ({ page, server, isAndroid, isWebView2, mode }, testInfo) => {
+  test.skip(isAndroid);
+  test.skip(isWebView2);
+  test.skip(mode.startsWith('service'));
+  test.slow();
 
   await page.goto(server.PREFIX + '/input/fileupload.html');
   const uploadFile = testInfo.outputPath('200MB.zip');
@@ -298,8 +253,8 @@ it('should upload large file with relative path', async ({ page, server, browser
   await Promise.all([uploadFile, file1.filepath].map(fs.promises.unlink));
 });
 
-it('should upload the file with spaces in name', async ({ page, server, asset }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17451' });
+test('should upload the file with spaces in name', async ({ page, server, asset }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17451' });
   await page.goto(server.PREFIX + '/input/fileupload.html');
   const filePath = path.relative(process.cwd(), asset('file to upload.txt'));
   const input = await page.$('input');
@@ -314,14 +269,14 @@ it('should upload the file with spaces in name', async ({ page, server, asset })
 });
 
 
-it('should work @smoke', async ({ page, asset }) => {
+test('should work @smoke', async ({ page, asset }) => {
   await page.setContent(`<input type=file>`);
   await page.setInputFiles('input', asset('file-to-upload.txt'));
   expect(await page.$eval('input', input => input.files.length)).toBe(1);
   expect(await page.$eval('input', input => input.files[0].name)).toBe('file-to-upload.txt');
 });
 
-it('should set from memory', async ({ page }) => {
+test('should set from memory', async ({ page }) => {
   await page.setContent(`<input type=file>`);
   await page.setInputFiles('input', {
     name: 'test.txt',
@@ -332,133 +287,7 @@ it('should set from memory', async ({ page }) => {
   expect(await page.$eval('input', input => input.files[0].name)).toBe('test.txt');
 });
 
-it('should emit event once', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    new Promise(f => page.once('filechooser', f)),
-    page.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should emit event via prepend', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    new Promise(f => page.prependListener('filechooser', f)),
-    page.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should emit event for iframe', async ({ page, server }) => {
-  const frame = await attachFrame(page, 'frame1', server.EMPTY_PAGE);
-  await frame.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    new Promise(f => page.once('filechooser', f)),
-    frame.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should emit event on/off', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    new Promise(f => {
-      const listener = chooser => {
-        page.off('filechooser', listener);
-        f(chooser);
-      };
-      page.on('filechooser', listener);
-    }),
-    page.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should emit event addListener/removeListener', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    new Promise(f => {
-      const listener = chooser => {
-        page.removeListener('filechooser', listener);
-        f(chooser);
-      };
-      page.addListener('filechooser', listener);
-    }),
-    page.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should work when file input is attached to DOM', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should work when file input is not attached to DOM', async ({ page, asset }) => {
-  const [, content] = await Promise.all([
-    page.waitForEvent('filechooser').then(chooser => chooser.setFiles(asset('file-to-upload.txt'))),
-    page.evaluate(async () => {
-      const el = document.createElement('input');
-      el.type = 'file';
-      el.click();
-      await new Promise(x => el.oninput = x);
-      const reader = new FileReader();
-      const promise = new Promise(fulfill => reader.onload = fulfill);
-      reader.readAsText(el.files[0]);
-      return promise.then(() => reader.result);
-    }),
-  ]);
-  expect(content).toBe('contents of the file');
-});
-
-it('should not throw when filechooser belongs to iframe', async ({ page, server, browserName }) => {
-  await page.goto(server.PREFIX + '/frames/one-frame.html');
-  const frame = page.mainFrame().childFrames()[0];
-  await frame.setContent(`
-    <div>Click me</div>
-    <script>
-      document.querySelector('div').addEventListener('click', () => {
-        const input = document.createElement('input');
-        input.type = 'file';
-        input.click();
-        window.parent.__done = true;
-      });
-    </script>
-  `);
-  await Promise.all([
-    page.waitForEvent('filechooser'),
-    frame.click('div')
-  ]);
-  await page.waitForFunction(() => (window as any).__done);
-});
-
-it('should not throw when frame is detached immediately', async ({ page, server }) => {
-  await page.goto(server.PREFIX + '/frames/one-frame.html');
-  const frame = page.mainFrame().childFrames()[0];
-  await frame.setContent(`
-    <div>Click me</div>
-    <script>
-      document.querySelector('div').addEventListener('click', () => {
-        const input = document.createElement('input');
-        input.type = 'file';
-        input.click();
-        window.parent.__done = true;
-        const iframe = window.parent.document.querySelector('iframe');
-        iframe.remove();
-      });
-    </script>
-  `);
-  page.on('filechooser', () => {});  // To ensure we handle file choosers.
-  await frame.click('div');
-  await page.waitForFunction(() => (window as any).__done);
-});
-
-it('should work with CSP', async ({ page, server, asset }) => {
+test('should work with CSP', async ({ page, server, asset }) => {
   server.setCSP('/empty.html', 'default-src "none"');
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`<input type=file>`);
@@ -467,62 +296,7 @@ it('should work with CSP', async ({ page, server, asset }) => {
   expect(await page.$eval('input', input => input.files[0].name)).toBe('file-to-upload.txt');
 });
 
-it('should respect timeout', async ({ page, playwright }) => {
-  let error = null;
-  await page.waitForEvent('filechooser', { timeout: 1 }).catch(e => error = e);
-  expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
-});
-
-it('should respect default timeout when there is no custom timeout', async ({ page, playwright }) => {
-  page.setDefaultTimeout(1);
-  let error = null;
-  await page.waitForEvent('filechooser').catch(e => error = e);
-  expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
-});
-
-it('should prioritize exact timeout over default timeout', async ({ page, playwright }) => {
-  page.setDefaultTimeout(0);
-  let error = null;
-  await page.waitForEvent('filechooser', { timeout: 1 }).catch(e => error = e);
-  expect(error).toBeInstanceOf(playwright.errors.TimeoutError);
-});
-
-it('should work with no timeout', async ({ page, server }) => {
-  const [chooser] = await Promise.all([
-    page.waitForEvent('filechooser', { timeout: 0 }),
-    page.evaluate(() => window.builtinSetTimeout(() => {
-      const el = document.createElement('input');
-      el.type = 'file';
-      el.click();
-    }, 50))
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('should return the same file chooser when there are many watchdogs simultaneously', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [fileChooser1, fileChooser2] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.waitForEvent('filechooser'),
-    page.$eval('input', input => input.click()),
-  ]);
-  expect(fileChooser1 === fileChooser2).toBe(true);
-});
-
-it('should accept single file', async ({ page, asset }) => {
-  await page.setContent(`<input type=file oninput='javascript:console.timeStamp()'>`);
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  expect(fileChooser.page()).toBe(page);
-  expect(fileChooser.element()).toBeTruthy();
-  await fileChooser.setFiles(asset('file-to-upload.txt'));
-  expect(await page.$eval('input', input => input.files.length)).toBe(1);
-  expect(await page.$eval('input', input => input.files[0].name)).toBe('file-to-upload.txt');
-});
-
-it('should detect mime type', async ({ page, server, asset }) => {
+test('should detect mime type', async ({ page, server, asset }) => {
 
   let files: Record<string, formidable.File>;
   server.setRoute('/upload', async (req, res) => {
@@ -557,7 +331,7 @@ it('should detect mime type', async ({ page, server, asset }) => {
 });
 
 // @see https://github.com/microsoft/playwright/issues/4704
-it('should not trim big uploaded files', async ({ page, server }) => {
+test('should not trim big uploaded files', async ({ page, server }) => {
 
   let files: Record<string, formidable.File>;
   server.setRoute('/upload', async (req, res) => {
@@ -581,59 +355,7 @@ it('should not trim big uploaded files', async ({ page, server }) => {
   expect(files.file.size).toBe(DATA_SIZE);
 });
 
-it('should be able to read selected file', async ({ page, asset }) => {
-  await page.setContent(`<input type=file>`);
-  const [, content] = await Promise.all([
-    page.waitForEvent('filechooser').then(fileChooser => fileChooser.setFiles(asset('file-to-upload.txt'))),
-    page.$eval('input', async picker => {
-      picker.click();
-      await new Promise(x => picker.oninput = x);
-      const reader = new FileReader();
-      const promise = new Promise(fulfill => reader.onload = fulfill);
-      reader.readAsText(picker.files[0]);
-      return promise.then(() => reader.result);
-    }),
-  ]);
-  expect(content).toBe('contents of the file');
-});
-
-it('should be able to reset selected files with empty file list', async ({ page, asset }) => {
-  await page.setContent(`<input type=file>`);
-  const [, fileLength1] = await Promise.all([
-    page.waitForEvent('filechooser').then(fileChooser => fileChooser.setFiles(asset('file-to-upload.txt'))),
-    page.$eval('input', async picker => {
-      picker.click();
-      await new Promise(x => picker.oninput = x);
-      return picker.files.length;
-    }),
-  ]);
-  expect(fileLength1).toBe(1);
-  const [, fileLength2] = await Promise.all([
-    page.waitForEvent('filechooser').then(fileChooser => fileChooser.setFiles([])),
-    page.$eval('input', async picker => {
-      picker.click();
-      await new Promise(x => picker.oninput = x);
-      return picker.files.length;
-    }),
-  ]);
-  expect(fileLength2).toBe(0);
-});
-
-it('should not accept multiple files for single-file input', async ({ page, asset }) => {
-  await page.setContent(`<input type=file>`);
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  let error = null;
-  await fileChooser.setFiles([
-    asset('file-to-upload.txt'),
-    asset('pptr.png')
-  ]).catch(e => error = e);
-  expect(error).not.toBe(null);
-});
-
-it('should emit input and change events', async ({ page, asset }) => {
+test('should emit input and change events', async ({ page, asset }) => {
   const events = [];
   await page.exposeFunction('eventHandled', e => events.push(e));
   await page.setContent(`
@@ -648,8 +370,8 @@ it('should emit input and change events', async ({ page, asset }) => {
   expect(events[1].type).toBe('change');
 });
 
-it('input event.composed should be true and cross shadow dom boundary', async ({ page, server, asset }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28726' });
+test('input event.composed should be true and cross shadow dom boundary', async ({ page, server, asset }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28726' });
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`<body><script>
   const div = document.createElement('div');
@@ -683,70 +405,8 @@ it('input event.composed should be true and cross shadow dom boundary', async ({
   expect(await page.evaluate(() => window['firedBodyEvents'])).toEqual(['input:true']);
 });
 
-it('should work for single file pick', async ({ page, server }) => {
-  await page.setContent(`<input type=file>`);
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  expect(fileChooser.isMultiple()).toBe(false);
-});
-
-it('should work for "multiple"', async ({ page, server }) => {
-  await page.setContent(`<input multiple type=file>`);
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  expect(fileChooser.isMultiple()).toBe(true);
-});
-
-it('should work for "webkitdirectory"', async ({ page, server }) => {
-  await page.setContent(`<input multiple webkitdirectory type=file>`);
-  const [fileChooser] = await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  expect(fileChooser.isMultiple()).toBe(true);
-});
-
-it('should emit event after navigation', async ({ page, server, browserName, browserMajorVersion }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/11375' });
-  it.skip(browserName === 'chromium' && browserMajorVersion < 99);
-
-  const logs = [];
-  page.on('filechooser', () => logs.push('filechooser'));
-  await page.goto(server.PREFIX + '/empty.html');
-  await page.setContent(`<input type=file>`);
-  await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
-  await page.setContent(`<input type=file>`);
-  await Promise.all([
-    page.waitForEvent('filechooser'),
-    page.click('input'),
-  ]);
-  expect(logs).toEqual(['filechooser', 'filechooser']);
-});
-
-it('should trigger listener added before navigation', async ({ page, server, browserMajorVersion, isElectron }) => {
-  it.skip(isElectron && browserMajorVersion <= 98);
-  // Add listener before cross process navigation.
-  const chooserPromise = new Promise(f => page.once('filechooser', f));
-  await page.goto(server.PREFIX + '/empty.html');
-  await page.goto(server.CROSS_PROCESS_PREFIX + '/empty.html');
-  await page.setContent(`<input type=file>`);
-  const [chooser] = await Promise.all([
-    chooserPromise,
-    page.click('input'),
-  ]);
-  expect(chooser).toBeTruthy();
-});
-
-it('input should trigger events when files changed second time', async ({ page, asset }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/20079' });
+test('input should trigger events when files changed second time', async ({ page, asset }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/20079' });
   await page.setContent(`<input type=file multiple=true/>`);
 
   const input = page.locator('input');
@@ -768,8 +428,8 @@ it('input should trigger events when files changed second time', async ({ page,
   expect(await events.evaluate(e => e)).toEqual(['input', 'change']);
 });
 
-it('should preserve lastModified timestamp', async ({ page, asset }) => {
-  it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27452' });
+test('should preserve lastModified timestamp', async ({ page, asset }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/27452' });
   await page.setContent(`<input type=file multiple=true/>`);
   const input = page.locator('input');
   const files = ['file-to-upload.txt', 'file-to-upload-2.txt'];
diff --git a/tests/page/page-wait-for-function.spec.ts b/tests/page/page-wait-for-function.spec.ts
index 88b6d7cb147aa..8b0368cbb0ea1 100644
--- a/tests/page/page-wait-for-function.spec.ts
+++ b/tests/page/page-wait-for-function.spec.ts
@@ -44,10 +44,10 @@ it('should poll on interval', async ({ page, server }) => {
   const polling = 100;
   const timeDelta = await page.waitForFunction(() => {
     if (!window['__startTime']) {
-      window['__startTime'] = window.builtinDate.now();
+      window['__startTime'] = window.builtins.Date.now();
       return false;
     }
-    return window.builtinDate.now() - window['__startTime'];
+    return window.builtins.Date.now() - window['__startTime'];
   }, {}, { polling });
   expect(await timeDelta.jsonValue()).not.toBeLessThan(polling);
 });
@@ -105,10 +105,10 @@ it('should work with strict CSP policy', async ({ page, server }) => {
   server.setCSP('/empty.html', 'script-src ' + server.PREFIX);
   await page.goto(server.EMPTY_PAGE);
   let error = null;
-  await Promise.all([
-    page.waitForFunction(() => window['__FOO'] === 'hit', {}, { polling: 'raf' }).catch(e => error = e),
-    page.evaluate(() => window['__FOO'] = 'hit')
-  ]);
+  const p = page.waitForFunction(() => window['__FOO'] === 'hit', {}, { polling: 'raf' }).catch(e => error = e);
+  await page.waitForTimeout(1000);
+  await page.evaluate(() => window['__FOO'] = 'hit');
+  await p;
   expect(error).toBe(null);
 });
 
diff --git a/tests/page/page-wait-for-navigation.spec.ts b/tests/page/page-wait-for-navigation.spec.ts
index d34251e977e5d..dd5bfbb259c2f 100644
--- a/tests/page/page-wait-for-navigation.spec.ts
+++ b/tests/page/page-wait-for-navigation.spec.ts
@@ -255,7 +255,7 @@ it('should fail when frame detaches', async ({ page, server }) => {
     frame.waitForNavigation().catch(e => e),
     page.$eval('iframe', frame => { frame.contentWindow.location.href = '/one-style.html'; }),
     // Make sure policy checks pass and navigation actually begins before removing the frame to avoid other errors
-    server.waitForRequest('/one-style.css').then(() => page.$eval('iframe', frame => window.builtinSetTimeout(() => frame.remove(), 0)))
+    server.waitForRequest('/one-style.css').then(() => page.$eval('iframe', frame => window.builtins.setTimeout(() => frame.remove(), 0)))
   ]);
   expect(error.message).toContain('waiting for navigation until "load"');
   expect(error.message).toContain('frame was detached');
diff --git a/tests/page/page-wait-for-request.spec.ts b/tests/page/page-wait-for-request.spec.ts
index e7ae14ba66ba2..9032af3f86331 100644
--- a/tests/page/page-wait-for-request.spec.ts
+++ b/tests/page/page-wait-for-request.spec.ts
@@ -70,7 +70,7 @@ it('should work with no timeout', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);
   const [request] = await Promise.all([
     page.waitForRequest(server.PREFIX + '/digits/2.png', { timeout: 0 }),
-    page.evaluate(() => window.builtinSetTimeout(() => {
+    page.evaluate(() => window.builtins.setTimeout(() => {
       void fetch('/digits/1.png');
       void fetch('/digits/2.png');
       void fetch('/digits/3.png');
diff --git a/tests/page/page-wait-for-response.spec.ts b/tests/page/page-wait-for-response.spec.ts
index ccfc18c9ebc73..75c06131adc68 100644
--- a/tests/page/page-wait-for-response.spec.ts
+++ b/tests/page/page-wait-for-response.spec.ts
@@ -108,7 +108,7 @@ it('should work with no timeout', async ({ page, server }) => {
   await page.goto(server.EMPTY_PAGE);
   const [response] = await Promise.all([
     page.waitForResponse(server.PREFIX + '/digits/2.png', { timeout: 0 }),
-    page.evaluate(() => window.builtinSetTimeout(() => {
+    page.evaluate(() => window.builtins.setTimeout(() => {
       void fetch('/digits/1.png');
       void fetch('/digits/2.png');
       void fetch('/digits/3.png');
diff --git a/tests/page/page-wait-for-selector-2.spec.ts b/tests/page/page-wait-for-selector-2.spec.ts
index 5a23e581c7421..4f473f86f25aa 100644
--- a/tests/page/page-wait-for-selector-2.spec.ts
+++ b/tests/page/page-wait-for-selector-2.spec.ts
@@ -328,3 +328,31 @@ it('should fail when navigating while on handle', async ({ page, mode, server })
   const error = await body.waitForSelector('div', { __testHookBeforeAdoptNode } as any).catch(e => e);
   expect(error.message).toContain(`waiting for locator('div') to be visible`);
 });
+
+it('should fail if element handle was detached while waiting', async ({ page, server }) => {
+  await page.setContent(`<button>hello</button>`);
+  const button = await page.$('button');
+  const promise = button.waitForSelector('something').catch(e => e);
+  await page.waitForTimeout(100);
+  await page.evaluate(() => document.body.innerText = '');
+  const error = await promise;
+  expect(error.message).toContain('Element is not attached to the DOM');
+});
+
+it('should succeed if element handle was detached while waiting for hidden', async ({ page, server }) => {
+  await page.setContent(`<button>hello</button>`);
+  const button = await page.$('button');
+  const promise = button.waitForSelector('something', { state: 'hidden' });
+  await page.waitForTimeout(100);
+  await page.evaluate(() => document.body.innerText = '');
+  await promise;
+});
+
+it('should succeed if element handle was detached while waiting for detached', async ({ page, server }) => {
+  await page.setContent(`<button>hello</button>`);
+  const button = await page.$('button');
+  const promise = button.waitForSelector('something', { state: 'detached' });
+  await page.waitForTimeout(100);
+  await page.evaluate(() => document.body.innerText = '');
+  await promise;
+});
diff --git a/tests/page/pageTest.ts b/tests/page/pageTest.ts
index 533d901037dc8..52d9b95c67429 100644
--- a/tests/page/pageTest.ts
+++ b/tests/page/pageTest.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { Frame, Page, TestType } from '@playwright/test';
+import type { Frame, Page, TestType, Locator } from '@playwright/test';
 import type { PlatformWorkerFixtures } from '../config/platformFixtures';
 import type { TestModeTestFixtures, TestModeWorkerFixtures, TestModeWorkerOptions } from '../config/testModeFixtures';
 import { androidTest } from '../android/androidTest';
@@ -23,9 +23,10 @@ import { electronTest } from '../electron/electronTest';
 import { webView2Test } from '../webview2/webView2Test';
 import type { PageTestFixtures, PageWorkerFixtures } from './pageTestApi';
 import type { ServerFixtures, ServerWorkerOptions } from '../config/serverFixtures';
-export { expect } from '@playwright/test';
+import { expect as baseExpect } from '@playwright/test';
 
 let impl: TestType<PageTestFixtures & ServerFixtures & TestModeTestFixtures, PageWorkerFixtures & PlatformWorkerFixtures & TestModeWorkerFixtures & TestModeWorkerOptions & ServerWorkerOptions> = browserTest;
+export type BoundingBox = Awaited<ReturnType<Locator['boundingBox']>>;
 
 if (process.env.PWPAGE_IMPL === 'android')
   impl = androidTest;
@@ -39,7 +40,52 @@ export const test = impl;
 export async function rafraf(target: Page | Frame, count = 1) {
   for (let i = 0; i < count; i++) {
     await target.evaluate(async () => {
-      await new Promise(f => window.builtinRequestAnimationFrame(() => window.builtinRequestAnimationFrame(f)));
+      await new Promise(f => window.builtins.requestAnimationFrame(() => window.builtins.requestAnimationFrame(f)));
     });
   }
 }
+
+export function roundBox(box: BoundingBox): BoundingBox {
+  return {
+    x: Math.round(box.x),
+    y: Math.round(box.y),
+    width: Math.round(box.width),
+    height: Math.round(box.height),
+  };
+}
+
+export function unshift(snapshot: string): string {
+  const lines = snapshot.split('\n');
+  let whitespacePrefixLength = 100;
+  for (const line of lines) {
+    if (!line.trim())
+      continue;
+    const match = line.match(/^(\s*)/);
+    if (match && match[1].length < whitespacePrefixLength)
+      whitespacePrefixLength = match[1].length;
+  }
+  return lines.filter(t => t.trim()).map(line => line.substring(whitespacePrefixLength)).join('\n');
+}
+
+export const expect = baseExpect.extend({
+  toContainYaml(received: string, expected: string) {
+    const trimmed = expected.split('\n').filter(a => !!a.trim());
+    const maxPrefixLength = Math.min(...trimmed.map(line => line.match(/^\s*/)[0].length));
+    const trimmedExpected = trimmed.map(line => line.substring(maxPrefixLength)).join('\n');
+    try {
+      if (this.isNot)
+        expect(received).not.toContain(trimmedExpected);
+      else
+        expect(received).toContain(trimmedExpected);
+      return {
+        pass: !this.isNot,
+        message: () => '',
+      };
+    } catch (e) {
+      return {
+        pass: this.isNot,
+        message: () => e.message,
+      };
+    }
+  }
+});
diff --git a/tests/page/pageTestApi.ts b/tests/page/pageTestApi.ts
index cf497e76c076f..f29af2c92f680 100644
--- a/tests/page/pageTestApi.ts
+++ b/tests/page/pageTestApi.ts
@@ -29,11 +29,12 @@ export type PageWorkerFixtures = {
   screenshot: ScreenshotMode | { mode: ScreenshotMode } & Pick<PageScreenshotOptions, 'fullPage' | 'omitBackground'>;
   trace: 'off' | 'on' | 'retain-on-failure' | 'on-first-retry' | 'retain-on-first-failure' | 'on-all-retries' | /** deprecated */ 'retry-with-trace';
   video: VideoMode | { mode: VideoMode, size: ViewportSize };
-  browserName: 'chromium' | 'firefox' | 'webkit';
+  browserName: 'chromium' | 'firefox' | 'webkit' | '_bidiFirefox' | '_bidiChromium';
   browserVersion: string;
   browserMajorVersion: number;
   electronMajorVersion: number;
   isAndroid: boolean;
   isElectron: boolean;
   isWebView2: boolean;
+  isHeadlessShell: boolean;
 };
diff --git a/tests/page/retarget.spec.ts b/tests/page/retarget.spec.ts
index 94e0f440e7c5e..741758c5f7ea8 100644
--- a/tests/page/retarget.spec.ts
+++ b/tests/page/retarget.spec.ts
@@ -109,6 +109,7 @@ it('enabled/disabled retargeting', async ({ page, asset }) => {
     { dom: domInButton(`<input id=target>`), enabled: true, locator: 'input' },
     { dom: domInLink(`<input id=target>`), enabled: true, locator: 'input' },
     { dom: domInButton(`<input id=target>`, { disabled: true }), enabled: true, locator: 'input' },
+    { dom: domInLabel(`<li role=menuitem id=target aria-disabled=false></li>`), enabled: true, locator: 'li' },
 
     { dom: domInLabel(`<input id=target disabled>`), enabled: false, locator: 'label' },
     { dom: domLabelFor(`<input id=target disabled>`), enabled: false, locator: 'label' },
@@ -116,6 +117,7 @@ it('enabled/disabled retargeting', async ({ page, asset }) => {
     { dom: domInButton(`<input id=target disabled>`), enabled: false, locator: 'input' },
     { dom: domInLink(`<input id=target disabled>`), enabled: false, locator: 'input' },
     { dom: domInButton(`<input id=target disabled>`, { disabled: true }), enabled: false, locator: 'input' },
+    { dom: domInLabel(`<li role=menuitem id=target aria-disabled=true></li>`), enabled: false, locator: 'li' },
   ];
   for (const { dom, enabled, locator } of cases) {
     await it.step(`"${locator}" in "${dom}" should be enabled=${enabled}`, async () => {
@@ -237,12 +239,7 @@ it('input value retargeting', async ({ page, browserName }) => {
       await expect(target).toHaveValue('bar');
 
       await target.selectText();
-      if (browserName === 'firefox' || browserName === 'webkit') {
-        expect(await page.locator('#target').evaluate((el: HTMLInputElement) => el.selectionStart)).toBe(0);
-        expect(await page.locator('#target').evaluate((el: HTMLInputElement) => el.selectionEnd)).toBe(3);
-      } else {
-        expect(await page.evaluate(() => window.getSelection()!.toString())).toBe('bar');
-      }
+      expect(await page.evaluate(() => window.getSelection()!.toString())).toBe('bar');
     });
   }
 });
@@ -268,14 +265,7 @@ it('selection retargeting', async ({ page, browserName }) => {
       await expect(page.locator('#target')).toHaveText('foo');
 
       await target.selectText();
-      if (browserName === 'firefox') {
-        expect(await page.$eval('#target', target => {
-          const selection = window.getSelection()!;
-          return selection.anchorNode === target && selection.focusNode === target;
-        })).toBe(true);
-      } else {
-        expect(await page.evaluate(() => window.getSelection()!.toString())).toBe('foo');
-      }
+      expect(await page.evaluate(() => window.getSelection()!.toString())).toBe('foo');
     });
   }
 });
diff --git a/tests/page/selectors-css.spec.ts b/tests/page/selectors-css.spec.ts
index 172493dbeac5c..3c34bd5c55f3f 100644
--- a/tests/page/selectors-css.spec.ts
+++ b/tests/page/selectors-css.spec.ts
@@ -275,7 +275,6 @@ it('should work with :nth-child', async ({ page, server }) => {
 });
 
 it('should work with :nth-child(of) notation with nested functions', async ({ page, browserName, browserMajorVersion }) => {
-  it.fixme(browserName === 'firefox', 'Should enable once Firefox supports this syntax');
   it.skip(browserName === 'chromium' && browserMajorVersion < 111, 'https://caniuse.com/css-nth-child-of');
 
   await page.setContent(`
diff --git a/tests/page/selectors-frame.spec.ts b/tests/page/selectors-frame.spec.ts
index c32a00e8e987d..fda55e995880c 100644
--- a/tests/page/selectors-frame.spec.ts
+++ b/tests/page/selectors-frame.spec.ts
@@ -308,17 +308,6 @@ it('click should survive navigation', async ({ page, server }) => {
   await promise;
 });
 
-it('should fail if element removed while waiting on element handle', async ({ page, server }) => {
-  it.fixme();
-  await routeIframe(page);
-  await page.goto(server.PREFIX + '/iframe.html');
-  const button = await page.$('button');
-  const promise = button.waitForSelector('something');
-  await page.waitForTimeout(100);
-  await page.evaluate(() => document.body.innerText = '');
-  await promise;
-});
-
 it('should non work for non-frame', async ({ page, server }) => {
   await routeIframe(page);
   await page.setContent('<div></div>');
diff --git a/tests/page/selectors-misc.spec.ts b/tests/page/selectors-misc.spec.ts
index 384bf4aef10a8..f656e9d5126e8 100644
--- a/tests/page/selectors-misc.spec.ts
+++ b/tests/page/selectors-misc.spec.ts
@@ -74,6 +74,18 @@ it('should work with >> visible=', async ({ page }) => {
   expect(await page.$eval('div >> visible=true', div => div.id)).toBe('target2');
 });
 
+it('should work with >> visible=false', async ({ page }) => {
+  await page.setContent(`
+    <section>
+      <div id=target1></div>
+      <div id=target2></div>
+    </section>
+  `);
+  await expect(page.locator('div >> visible=false')).toHaveCount(2);
+  await page.locator('#target2').evaluate(div => div.textContent = 'Now visible');
+  await expect(page.locator('div >> visible=false')).toHaveCount(1);
+});
+
 it('should work with :nth-match', async ({ page }) => {
   await page.setContent(`
     <section>
@@ -403,7 +415,7 @@ it('should work with internal:has=', async ({ page, server }) => {
   const error3 = await page.$(`div >> internal:has=33`).catch(e => e);
   expect(error3.message).toContain('Malformed selector: internal:has=33');
   const error4 = await page.$(`div >> internal:has="span!"`).catch(e => e);
-  expect(error4.message).toContain('Unexpected token "!" while parsing selector "span!"');
+  expect(error4.message).toContain('Unexpected token "!" while parsing css selector "span!"');
 });
 
 it('should work with internal:has-not=', async ({ page }) => {
diff --git a/tests/page/selectors-react.spec.ts b/tests/page/selectors-react.spec.ts
index ce47f1bb255b4..c7bfc3f68ac11 100644
--- a/tests/page/selectors-react.spec.ts
+++ b/tests/page/selectors-react.spec.ts
@@ -176,4 +176,3 @@ for (const [name, url] of Object.entries(reacts)) {
     });
   });
 }
-
diff --git a/tests/page/selectors-register.spec.ts b/tests/page/selectors-register.spec.ts
index 354138a134bfe..0346d7e428d53 100644
--- a/tests/page/selectors-register.spec.ts
+++ b/tests/page/selectors-register.spec.ts
@@ -35,7 +35,7 @@ it('textContent should be atomic', async ({ playwright, page }) => {
     }
   });
   await playwright.selectors.register('textContent', createDummySelector);
-  await page.setContent(`<div>Hello</div>`);
+  await page.goto(`data:text/html,<div>Hello</div>`);
   const tc = await page.textContent('textContent=div');
   expect(tc).toBe('Hello');
   expect(await page.evaluate(() => document.querySelector('div').textContent)).toBe('modified');
@@ -57,7 +57,7 @@ it('innerText should be atomic', async ({ playwright, page }) => {
     }
   });
   await playwright.selectors.register('innerText', createDummySelector);
-  await page.setContent(`<div>Hello</div>`);
+  await page.goto(`data:text/html,<div>Hello</div>`);
   const tc = await page.innerText('innerText=div');
   expect(tc).toBe('Hello');
   expect(await page.evaluate(() => document.querySelector('div').innerText)).toBe('modified');
@@ -79,7 +79,7 @@ it('innerHTML should be atomic', async ({ playwright, page }) => {
     }
   });
   await playwright.selectors.register('innerHTML', createDummySelector);
-  await page.setContent(`<div>Hello<span>world</span></div>`);
+  await page.goto(`data:text/html,<div>Hello<span>world</span></div>`);
   const tc = await page.innerHTML('innerHTML=div');
   expect(tc).toBe('Hello<span>world</span>');
   expect(await page.evaluate(() => document.querySelector('div').innerHTML)).toBe('modified');
@@ -101,7 +101,7 @@ it('getAttribute should be atomic', async ({ playwright, page }) => {
     }
   });
   await playwright.selectors.register('getAttribute', createDummySelector);
-  await page.setContent(`<div foo=hello></div>`);
+  await page.goto(`data:text/html,<div foo=hello></div>`);
   const tc = await page.getAttribute('getAttribute=div', 'foo');
   expect(tc).toBe('hello');
   expect(await page.evaluate(() => document.querySelector('div').getAttribute('foo'))).toBe('modified');
@@ -123,8 +123,22 @@ it('isVisible should be atomic', async ({ playwright, page }) => {
     }
   });
   await playwright.selectors.register('isVisible', createDummySelector);
-  await page.setContent(`<div>Hello</div>`);
+  await page.goto(`data:text/html,<div>Hello</div>`);
   const result = await page.isVisible('isVisible=div');
   expect(result).toBe(true);
   expect(await page.evaluate(() => document.querySelector('div').style.display)).toBe('none');
 });
+
+it('should take java-style string', async ({ playwright, page }) => {
+  const createDummySelector = `{
+    query(root, selector) {
+      return root.querySelector(selector);
+    },
+    queryAll(root, selector) {
+      return root.querySelectorAll(selector);
+    }
+  }`;
+  await playwright.selectors.register('objectLiteral', createDummySelector);
+  await page.goto(`data:text/html,<div>Hello</div>`);
+  await page.textContent('objectLiteral=div');
+});
diff --git a/tests/page/selectors-role.spec.ts b/tests/page/selectors-role.spec.ts
index f5680982b1280..02d4616e01438 100644
--- a/tests/page/selectors-role.spec.ts
+++ b/tests/page/selectors-role.spec.ts
@@ -217,6 +217,15 @@ test('should support disabled', async ({ page }) => {
     <fieldset disabled>
       <button>Yay</button>
     </fieldset>
+    <select>
+      <optgroup disabled>
+        <option>one</option>
+      </optgroup>
+      <optgroup>
+        <option>two</option>
+      </optgroup>
+      <option disabled>three</option>
+    </select>
   `);
   expect(await page.locator(`role=button[disabled]`).evaluateAll(els => els.map(e => e.outerHTML))).toEqual([
     `<button disabled="">Bye</button>`,
@@ -241,6 +250,76 @@ test('should support disabled', async ({ page }) => {
     `<button>Hi</button>`,
     `<button aria-disabled="false">Oh</button>`,
   ]);
+  expect(await page.getByRole('option', { disabled: true }).evaluateAll(els => els.map(e => e.outerHTML))).toEqual([
+    `<option>one</option>`,
+    `<option disabled="">three</option>`,
+  ]);
+  expect(await page.getByRole('option', { disabled: false }).evaluateAll(els => els.map(e => e.outerHTML))).toEqual([
+    `<option>two</option>`,
+  ]);
+  expect(await page.getByRole('option').evaluateAll(els => els.map(e => e.outerHTML))).toEqual([
+    `<option>one</option>`,
+    `<option>two</option>`,
+    `<option disabled="">three</option>`,
+  ]);
+});
+
+test('should inherit disabled from the ancestor', async ({ page }) => {
+  await page.setContent(`
+    <span aria-disabled="true">
+      <button>Click me!</button>
+    </span>
+  `);
+  await expect(page.locator('button')).toBeDisabled();
+
+  await page.setContent(`
+    <span aria-disabled="true">
+      <h1>Heading</h1>
+    </span>
+  `);
+  await expect(page.locator('h1')).not.toBeDisabled();
+});
+
+test('should support disabled fieldset', async ({ page }) => {
+  await page.setContent(`
+    <fieldset disabled>
+      <input></input>
+      <button data-testid="inside-fieldset-element">x</button>
+      <legend>
+        <button data-testid="inside-legend-element">legend</button>
+      </legend>
+    </fieldset>
+
+    <fieldset disabled>
+      <legend>
+        <div>
+          <button data-testid="nested-inside-legend-element">x</button>
+        </div>
+      </legend>
+    </fieldset>
+
+    <fieldset disabled>
+      <div></div>
+      <legend>
+        <button data-testid="first-legend-element">x</button>
+      </legend>
+      <legend>
+        <button data-testid="second-legend-element">x</button>
+      </legend>
+    </fieldset>
+
+    <fieldset disabled>
+      <fieldset>
+        <button data-testid="deep-button">x</button>
+      </fieldset>
+    </fieldset>
+  `);
+
+  await expect.soft(page.getByTestId('inside-legend-element')).toBeEnabled();
+  await expect.soft(page.getByTestId('nested-inside-legend-element')).toBeEnabled();
+  await expect.soft(page.getByTestId('first-legend-element')).toBeEnabled();
+  await expect.soft(page.getByTestId('second-legend-element')).toBeDisabled();
+  await expect.soft(page.getByTestId('deep-button')).toBeDisabled();
 });
 
 test('should support level', async ({ page }) => {
diff --git a/tests/page/selectors-text.spec.ts b/tests/page/selectors-text.spec.ts
index af9a2d27309d4..3793cdac5c667 100644
--- a/tests/page/selectors-text.spec.ts
+++ b/tests/page/selectors-text.spec.ts
@@ -183,6 +183,17 @@ it('should work across nodes', async ({ page }) => {
   expect(await page.$$eval(`text=/world/`, els => els.length)).toBe(1);
 });
 
+it('text-is() should ignore comments', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33976' }
+}, async ({ page }) => {
+  await page.setContent(`<div id=me>hel<!-- comment -->lo
+  <!-- comment -->
+  world</div>`);
+  expect(await page.$eval(`:text-is("hello world")`, e => e.id)).toBe('me');
+  expect(await page.locator('div', { hasText: 'hello world' }).getAttribute('id')).toBe('me');
+  expect(await page.getByText('hello world', { exact: true }).getAttribute('id')).toBe('me');
+});
+
 it('should work with text nodes in quoted mode', async ({ page }) => {
   await page.setContent(`<div id=target1>Hello<span id=target2>wo  rld  </span>  Hi again  </div>`);
   expect(await page.$eval(`text="Hello"`, e => e.id)).toBe('target1');
diff --git a/tests/page/selectors-vue.spec.ts b/tests/page/selectors-vue.spec.ts
index 175e1246eecd2..71b60d1cb3fea 100644
--- a/tests/page/selectors-vue.spec.ts
+++ b/tests/page/selectors-vue.spec.ts
@@ -168,4 +168,3 @@ for (const [name, url] of Object.entries(vues)) {
     });
   });
 }
-
diff --git a/tests/page/to-match-aria-snapshot.spec.ts b/tests/page/to-match-aria-snapshot.spec.ts
new file mode 100644
index 0000000000000..f162ff8d13b64
--- /dev/null
+++ b/tests/page/to-match-aria-snapshot.spec.ts
@@ -0,0 +1,837 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ *
+ * 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 { stripAnsi } from '../config/utils';
+import { test, expect } from './pageTest';
+
+test('should match', async ({ page }) => {
+  await page.setContent(`<h1>title</h1>`);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "title"
+  `);
+});
+
+test('should match in list', async ({ page }) => {
+  await page.setContent(`
+    <h1>title</h1>
+    <h1>title 2</h1>
+  `);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "title"
+  `);
+});
+
+test('should match list with accessible name', async ({ page }) => {
+  await page.setContent(`
+    <ul aria-label="my list">
+      <li>one</li>
+      <li>two</li>
+    </ul>
+  `);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list "my list":
+      - listitem: "one"
+      - listitem: "two"
+  `);
+});
+
+test('should match deep item', async ({ page }) => {
+  await page.setContent(`
+    <div>
+      <h1>title</h1>
+      <h1>title 2</h1>
+    </div>
+  `);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "title"
+  `);
+});
+
+test('should match complex', async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li>
+        <a href='about:blank'>link</a>
+      </li>
+    </ul>
+  `);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - link "link"
+  `);
+});
+
+test('should match regex', async ({ page }) => {
+  {
+    await page.setContent(`<h1>Issues 12</h1>`);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading ${/Issues \d+/}
+    `);
+  }
+  {
+    await page.setContent(`<h1>Issues 1/2</h1>`);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading ${/Issues 1[/]2/}
+    `);
+  }
+  {
+    await page.setContent(`<h1>Issues 1[</h1>`);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading ${/Issues 1\[/}
+    `);
+  }
+  {
+    await page.setContent(`<h1>Issues 1]]2</h1>`);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading ${/Issues 1[\]]]2/}
+    `);
+  }
+});
+
+test('should allow text nodes', async ({ page }) => {
+  await page.setContent(`
+    <h1>Microsoft</h1>
+    <div>Open source projects and samples from Microsoft</div>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "Microsoft"
+    - text: "Open source projects and samples from Microsoft"
+  `);
+});
+
+test('details visibility', async ({ page }) => {
+  await page.setContent(`
+    <details>
+      <summary>Summary</summary>
+      <div>Details</div>
+    </details>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - group: "Summary"
+  `);
+});
+
+test('checked attribute', async ({ page }) => {
+  await page.setContent(`
+    <input type='checkbox' checked />
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - checkbox
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - checkbox [checked]
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - checkbox [checked=true]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - checkbox [checked=false]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - checkbox [checked=mixed]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - checkbox [checked=5]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain(' attribute must be a boolean or "mixed"');
+  }
+});
+
+test('disabled attribute', async ({ page }) => {
+  await page.setContent(`
+    <button disabled>Click me</button>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [disabled]
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [disabled=true]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [disabled=false]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [disabled=invalid]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain(' attribute must be a boolean');
+  }
+});
+
+test('expanded attribute', async ({ page }) => {
+  await page.setContent(`
+    <button aria-expanded="true">Toggle</button>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [expanded]
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [expanded=true]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [expanded=false]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [expanded=invalid]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain(' attribute must be a boolean');
+  }
+});
+
+test('level attribute', async ({ page }) => {
+  await page.setContent(`
+    <h2>Section Title</h2>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading [level=2]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [level=3]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [level=two]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain(' attribute must be a number');
+  }
+});
+
+test('pressed attribute', async ({ page }) => {
+  await page.setContent(`
+    <button aria-pressed="true">Like</button>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [pressed]
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [pressed=true]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [pressed=false]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  // Test for 'mixed' state
+  await page.setContent(`
+    <button aria-pressed="mixed">Like</button>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - button [pressed=mixed]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [pressed=true]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [pressed=5]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain(' attribute must be a boolean or "mixed"');
+  }
+});
+
+test('selected attribute', async ({ page }) => {
+  await page.setContent(`
+    <table>
+      <tr aria-selected="true">
+        <td>Row</td>
+      </tr>
+    </table>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - row
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - row [selected]
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - row [selected=true]
+  `);
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - row [selected=false]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+    expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  }
+
+  {
+    const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - row [selected=invalid]
+    `, { timeout: 1000 }).catch(e => e);
+    expect(stripAnsi(e.message)).toContain(' attribute must be a boolean');
+  }
+});
+
+test('integration test', async ({ page }) => {
+  await page.setContent(`
+    <h1>Microsoft</h1>
+    <div>Open source projects and samples from Microsoft</div>
+    <ul>
+      <li>
+        <details>
+          <summary>
+            Verified
+          </summary>
+          <div>
+            <div>
+              <p>
+                We've verified that the organization <strong>microsoft</strong> controls the domain:
+              </p>
+              <ul>
+                <li class="mb-1">
+                  <strong>opensource.microsoft.com</strong>
+                </li>
+              </ul>
+              <div>
+                <a href="about: blank">Learn more about verified organizations</a>
+              </div>
+            </div>
+          </div>
+        </details>
+      </li>
+      <li>
+        <a href="about:blank">
+          <summary title="Label: GitHub Sponsor">Sponsor</summary>
+        </a>
+      </li>
+    </ul>`);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "Microsoft"
+    - text: Open source projects and samples from Microsoft
+    - list:
+      - listitem:
+        - group: Verified
+      - listitem:
+        - link "Sponsor"
+  `);
+});
+
+test('integration test 2', async ({ page }) => {
+  await page.setContent(`
+    <div>
+      <header>
+        <h1>todos</h1>
+        <input placeholder="What needs to be done?">
+      </header>
+    </div>`);
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "todos"
+    - textbox "What needs to be done?"
+  `);
+});
+
+test('expected formatter', async ({ page }) => {
+  await page.setContent(`
+    <div>
+      <header>
+        <h1>todos</h1>
+        <input placeholder="What needs to be done?">
+        <button>Time 15:30</button>
+      </header>
+    </div>`);
+  const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "todos"
+    - textbox "Wrong text"
+  `, { timeout: 1 }).catch(e => e);
+
+  // Note that error message should not contain any regular expressions,
+  // unlike the baseline generated by --update-snapshots.
+  expect(stripAnsi(error.message)).toContain(`
+Locator:  locator('body')
+- Expected  - 2
++ Received  + 4
+
+- - heading "todos"
+- - textbox "Wrong text"
++ - banner:
++   - heading "todos" [level=1]
++   - textbox "What needs to be done?"
++   - button "Time 15:30"
+Timeout:  1ms`);
+});
+
+test('should unpack escaped names', async ({ page }) => {
+  {
+    await page.setContent(`
+      <button>Click: me</button>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - 'button "Click: me"'
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - 'button /Click: me/'
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <button>Click / me</button>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button "Click / me"
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button /Click \\/ me/
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - 'button /Click \\/ me/'
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <button>Click " me</button>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button "Click \\\" me"
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button /Click \" me/
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button /Click \\\" me/
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <button>Click \\ me</button>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button "Click \\\\ me"
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button /Click \\\\ me/
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - 'button /Click \\\\ me/'
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <button>Click ' me</button>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - 'button "Click '' me"'
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <h1>heading "name" [level=1]</h1>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading "heading \\"name\\" [level=1]" [level=1]
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <h1>heading \\" [level=2]</h1>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - |
+          heading    "heading \\\\\\" [level=2]" [
+             level  =   1   ]
+    `);
+  }
+});
+
+test('should report error in YAML', async ({ page }) => {
+  await page.setContent(`<h1>title</h1>`);
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      heading "title"
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Aria snapshot must be a YAML sequence, elements starting with " -"`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading: a:
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Nested mappings are not allowed in compact mappings at line 1, column 12:
+
+- heading: a:
+           ^
+`);
+  }
+});
+
+test('should report error in YAML keys', async ({ page }) => {
+  await page.setContent(`<h1>title</h1>`);
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading "title
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Unterminated string:
+
+heading "title
+              ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading /title
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Unterminated regex:
+
+heading /title
+              ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [level=a]
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Value of "level" attribute must be a number:
+
+heading [level=a]
+               ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [expanded=FALSE]
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Value of "expanded" attribute must be a boolean:
+
+heading [expanded=FALSE]
+                  ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [checked=foo]
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Value of "checked" attribute must be a boolean or "mixed":
+
+heading [checked=foo]
+                 ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [level=]
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Value of "level" attribute must be a number:
+
+heading [level=]
+               ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading [bogus]
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Unsupported attribute [bogus]:
+
+heading [bogus]
+         ^
+`);
+  }
+
+  {
+    const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - heading invalid
+    `).catch(e => e);
+    expect.soft(error.message).toBe(`expect.toMatchAriaSnapshot: Unexpected input:
+
+heading invalid
+        ^
+`);
+  }
+});
+
+test('call log should contain actual snapshot', async ({ page }) => {
+  await page.setContent(`<h1>todos</h1>`);
+  const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - heading "wrong"
+  `, { timeout: 3000 }).catch(e => e);
+
+  expect(stripAnsi(error.message)).toContain(`- unexpected value "- heading "todos" [level=1]"`);
+});
+
+test('should parse attributes', async ({ page }) => {
+  {
+    await page.setContent(`
+      <button aria-pressed="mixed">hello world</button>
+    `);
+    await expect(page.locator('body')).toMatchAriaSnapshot(`
+      - button [pressed=mixed ]
+    `);
+  }
+
+  {
+    await page.setContent(`
+      <h2>hello world</h2>
+    `);
+    await expect(page.locator('body')).not.toMatchAriaSnapshot(`
+      - heading [level =  -3 ]
+    `);
+  }
+});
+
+test('should not unshift actual template text', async ({ page }) => {
+  await page.setContent(`
+    <h1>title</h1>
+    <h1>title 2</h1>
+  `);
+  const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+        - heading "title" [level=1]
+    - heading "title 2" [level=1]
+  `, { timeout: 1000 }).catch(e => e);
+  expect(stripAnsi(error.message)).toContain(`
+    - heading "title" [level=1]
+- heading "title 2" [level=1]`);
+});
+
+test('should not match what is not matched', async ({ page }) => {
+  await page.setContent(`<p>Text</p>`);
+  const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - paragraph:
+      - button "bogus"
+  `).catch(e => e);
+  expect(stripAnsi(error.message)).toContain(`
+- - paragraph:
+-   - button "bogus"
++ - paragraph: Text`);
+});
+
+test('should match url', async ({ page }) => {
+  await page.setContent(`
+    <a href='https://example.com'>Link</a>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - link:
+      - /url: /.*example.com/
+  `);
+});
+
+test('should detect unexpected children: equal', async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li>One</li>
+      <li>Two</li>
+      <li>Three</li>
+    </ul>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - listitem: "One"
+      - listitem: "Three"
+  `);
+
+  const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - /children: equal
+      - listitem: "One"
+      - listitem: "Three"
+  `, { timeout: 1000 }).catch(e => e);
+
+  expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+  expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  expect(stripAnsi(e.message)).toContain('+   - listitem: Two');
+});
+
+test('should detect unexpected children: deep-equal', async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li>
+        <ul>
+          <li>1.1</li>
+          <li>1.2</li>
+        </ul>
+      </li>
+    </ul>
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - list:
+          - listitem: 1.1
+  `);
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - /children: equal
+      - listitem:
+        - list:
+          - listitem: 1.1
+  `);
+
+  const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - /children: deep-equal
+      - listitem:
+        - list:
+          - listitem: 1.1
+  `, { timeout: 1000 }).catch(e => e);
+
+  expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+  expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  expect(stripAnsi(e.message)).toContain('+       - listitem: \"1.2\"');
+});
+
+test('should allow restoring contain mode inside deep-equal', async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li>
+        <ul>
+          <li>1.1</li>
+          <li>1.2</li>
+        </ul>
+      </li>
+    </ul>
+  `);
+
+  const e = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - /children: deep-equal
+      - listitem:
+        - list:
+          - listitem: 1.1
+  `, { timeout: 1000 }).catch(e => e);
+
+  expect(stripAnsi(e.message)).toContain('expect(locator).toMatchAriaSnapshot(expected) failed');
+  expect(stripAnsi(e.message)).toContain('Timeout:  1000ms');
+  expect(stripAnsi(e.message)).toContain('+       - listitem: \"1.2\"');
+
+  await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - list:
+      - /children: deep-equal
+      - listitem:
+        - list:
+          - /children: contain
+          - listitem: 1.1
+  `);
+});
+
+test('top-level deep-equal', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36456' } }, async ({ page }) => {
+  await page.setContent(`
+    <ul>
+      <li>
+        <ul>
+          <li>1.1</li>
+          <li>1.2</li>
+        </ul>
+      </li>
+    </ul>
+  `);
+
+  const error = await expect(page.locator('body')).toMatchAriaSnapshot(`
+    - /children: deep-equal
+    - list
+  `, { timeout: 1000 }).catch(e => e);
+
+  expect(stripAnsi(error.message)).toContain(`
+- - /children: deep-equal
+- - list
++ - list:
++   - listitem:
++     - list:
++       - listitem: "1.1"
++       - listitem: "1.2"
+  `.trim());
+});
diff --git a/tests/page/wheel.spec.ts b/tests/page/wheel.spec.ts
index c8c634e16d385..7a1fccc2aac81 100644
--- a/tests/page/wheel.spec.ts
+++ b/tests/page/wheel.spec.ts
@@ -22,8 +22,8 @@ it.skip(({ isAndroid }) => {
 
 let ignoreDelta = false;
 
-it.beforeAll(async ({ browserMajorVersion, browserName, isElectron, platform }) => {
-  if (((browserName === 'chromium' && browserMajorVersion >= 102) || isElectron) && platform === 'darwin') {
+it.beforeAll(async ({ browserName, isElectron, platform }) => {
+  if (((browserName === 'chromium') || isElectron) && platform === 'darwin') {
     // Chromium reports deltaX/deltaY scaled by host device scale factor.
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1324819
     // https://github.com/microsoft/playwright/issues/7362
diff --git a/tests/page/workers.spec.ts b/tests/page/workers.spec.ts
index 3b4d1bf5c8cae..7db80de3b4e9c 100644
--- a/tests/page/workers.spec.ts
+++ b/tests/page/workers.spec.ts
@@ -167,7 +167,6 @@ it('should report network activity', async function({ page, server, browserName,
 
 it('should report network activity on worker creation', async function({ page, server, browserName, browserMajorVersion }) {
   it.skip(browserName === 'firefox' && browserMajorVersion < 114, 'https://github.com/microsoft/playwright/issues/21760');
-  // Chromium needs waitForDebugger enabled for this one.
   await page.goto(server.EMPTY_PAGE);
   const url = server.PREFIX + '/one-style.css';
   const requestPromise = page.waitForRequest(url);
@@ -182,6 +181,50 @@ it('should report network activity on worker creation', async function({ page, s
   expect(response.ok()).toBe(true);
 });
 
+it('should report worker script as network request', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33107' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35678' },
+  ],
+}, async function({ page, server }) {
+  await page.goto(server.EMPTY_PAGE);
+  const [request1, request2] = await Promise.all([
+    page.waitForEvent('request', r => r.url().includes('worker.js')),
+    page.waitForEvent('requestfinished', r => r.url().includes('worker.js')),
+    page.evaluate(() => (window as any).w = new Worker('/worker/worker.js')),
+  ]);
+  expect.soft(request1.url()).toBe(server.PREFIX + '/worker/worker.js');
+  expect.soft(request1).toBe(request2);
+  const response = await request1.response();
+  const text = await response.text();
+  expect(text).toContain(`console.log('hello from the worker');`);
+});
+
+it('should report worker script as network request after redirect', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35678' },
+}, async ({ page, server, browserName }) => {
+  it.fixme(browserName === 'chromium', 'Chromium does not report the redirect because it is not plumbed to the worker target');
+
+  await page.goto(server.EMPTY_PAGE);
+  server.setRedirect('/worker.js', '/worker2.js');
+  server.setRoute('/worker2.js', (req, res) => {
+    res.setHeader('Content-Type', 'text/javascript');
+    res.end(`console.log('hello from the worker');`);
+  });
+  const [request] = await Promise.all([
+    page.waitForEvent('request', r => r.url().includes('worker.js')),
+    page.waitForEvent('console', msg => msg.text().includes('hello from the worker')),
+    page.evaluate(() => (window as any).w = new Worker('/worker.js')),
+  ]);
+  expect(request.url()).toBe(server.PREFIX + '/worker.js');
+  const redirect = request.redirectedTo();
+  expect(redirect).toBeTruthy();
+  expect(redirect.url()).toBe(server.PREFIX + '/worker2.js');
+  const response = await redirect.response();
+  const text = await response.text();
+  expect(text).toContain(`console.log('hello from the worker');`);
+});
+
 it('should dispatch console messages when page has workers', async function({ page, server }) {
   it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/15550' });
   await page.goto(server.EMPTY_PAGE);
@@ -225,7 +268,9 @@ it('should report and intercept network from nested worker', async function({ pa
   await expect.poll(() => messages).toEqual(['{"foo":"not bar"}', '{"foo":"not bar"}']);
 });
 
-it('should support extra http headers', async ({ page, server }) => {
+it('should support extra http headers', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31747' }
+}, async ({ page, server }) => {
   await page.setExtraHTTPHeaders({ foo: 'bar' });
   const [worker, request1] = await Promise.all([
     page.waitForEvent('worker'),
@@ -241,15 +286,18 @@ it('should support extra http headers', async ({ page, server }) => {
 });
 
 it('should support offline', async ({ page, server, browserName }) => {
-  it.fixme(browserName === 'firefox');
+  it.fixme(browserName === 'webkit', 'flaky on all platforms');
 
   const [worker] = await Promise.all([
     page.waitForEvent('worker'),
+    page.waitForEvent('console', msg => msg.text().includes('hello from the worker')),
     page.goto(server.PREFIX + '/worker/worker.html'),
   ]);
   await page.context().setOffline(true);
-  expect(await worker.evaluate(() => navigator.onLine)).toBe(false);
+  // TODO: Firefox does not plumb setOffline into WorkerNavigator::OnLine.
+  const expectedOnline = browserName === 'firefox' ? true : false;
+  await expect.poll(() =>  worker.evaluate(() => navigator.onLine)).toBe(expectedOnline);
   expect(await worker.evaluate(() => fetch('/one-style.css').catch(e => 'error'))).toBe('error');
   await page.context().setOffline(false);
-  expect(await worker.evaluate(() => navigator.onLine)).toBe(true);
+  await expect.poll(() =>  worker.evaluate(() => navigator.onLine)).toBe(true);
 });
diff --git a/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-1.yml b/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-1.yml
new file mode 100644
index 0000000000000..2f556153ece87
--- /dev/null
+++ b/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-1.yml
@@ -0,0 +1,13 @@
+- tree:
+  - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+    - group:
+      - treeitem "[icon-circle-outline] passes" [selected]:
+        - button "Run"
+        - button "Show source"
+        - button "Watch"
+      - treeitem "[icon-circle-outline] fails"
+      - treeitem "[icon-circle-outline] suite"
+  - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+    - group:
+      - treeitem "[icon-circle-outline] passes"
+      - treeitem "[icon-circle-outline] fails"
\ No newline at end of file
diff --git a/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-2.yml b/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-2.yml
new file mode 100644
index 0000000000000..7a9622befd6b9
--- /dev/null
+++ b/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-2.yml
@@ -0,0 +1,13 @@
+- tree:
+  - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+    - group:
+      - treeitem "[icon-circle-outline] passes"
+      - treeitem "[icon-circle-outline] fails" [selected]:
+        - button "Run"
+        - button "Show source"
+        - button "Watch"
+      - treeitem "[icon-circle-outline] suite"
+  - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+    - group:
+      - treeitem "[icon-circle-outline] passes"
+      - treeitem "[icon-circle-outline] fails"
\ No newline at end of file
diff --git a/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-3.yml b/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-3.yml
new file mode 100644
index 0000000000000..2f556153ece87
--- /dev/null
+++ b/tests/playwright-test/__screenshots__/ui-mode-test-tree.spec.ts/should-traverse-up-down-3.yml
@@ -0,0 +1,13 @@
+- tree:
+  - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+    - group:
+      - treeitem "[icon-circle-outline] passes" [selected]:
+        - button "Run"
+        - button "Show source"
+        - button "Watch"
+      - treeitem "[icon-circle-outline] fails"
+      - treeitem "[icon-circle-outline] suite"
+  - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+    - group:
+      - treeitem "[icon-circle-outline] passes"
+      - treeitem "[icon-circle-outline] fails"
\ No newline at end of file
diff --git a/tests/playwright-test/access-data.spec.ts b/tests/playwright-test/access-data.spec.ts
index 67958003be140..4da80d8de056d 100644
--- a/tests/playwright-test/access-data.spec.ts
+++ b/tests/playwright-test/access-data.spec.ts
@@ -60,7 +60,10 @@ test('should access annotations in fixture', async ({ runInlineTest }) => {
   });
   expect(exitCode).toBe(0);
   const test = report.suites[0].specs[0].tests[0];
-  expect(test.annotations).toEqual([{ type: 'slow', description: 'just slow' }, { type: 'myname', description: 'hello' }]);
+  expect(test.annotations).toEqual([
+    { type: 'slow', description: 'just slow', location: { file: expect.any(String), line: 10, column: 14 } },
+    { type: 'myname', description: 'hello' }
+  ]);
   expect(test.results[0].stdout).toEqual([{ text: 'console.log\n' }]);
   expect(test.results[0].stderr).toEqual([{ text: 'console.error\n' }]);
 });
diff --git a/tests/playwright-test/aria-snapshot-file.spec.ts b/tests/playwright-test/aria-snapshot-file.spec.ts
new file mode 100644
index 0000000000000..f568dc5c310d5
--- /dev/null
+++ b/tests/playwright-test/aria-snapshot-file.spec.ts
@@ -0,0 +1,253 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 './playwright-test-fixtures';
+import fs from 'fs';
+import path from 'path';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('should match snapshot with name', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts-snapshots/test.aria.yml': `
+      - heading "hello world"
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test.aria.yml' });
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(0);
+});
+
+test('should generate multiple missing', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test-1.aria.yml' });
+        await page.setContent(\`<h1>hello world 2</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test-2.aria.yml' });
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`A snapshot doesn't exist at a.spec.ts-snapshots${path.sep}test-1.aria.yml, writing actual`);
+  expect(result.output).toContain(`A snapshot doesn't exist at a.spec.ts-snapshots${path.sep}test-2.aria.yml, writing actual`);
+  const snapshot1 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test-1.aria.yml'), 'utf8');
+  expect(snapshot1).toBe('- heading "hello world" [level=1]');
+  const snapshot2 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test-2.aria.yml'), 'utf8');
+  expect(snapshot2).toBe('- heading "hello world 2" [level=1]');
+});
+
+test('should rebaseline all', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts-snapshots/test-1.aria.yml': `
+      - heading "foo"
+    `,
+    'a.spec.ts-snapshots/test-2.aria.yml': `
+      - heading "bar"
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test-1.aria.yml' });
+        await page.setContent(\`<h1>hello world 2</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test-2.aria.yml' });
+      });
+    `
+  }, { 'update-snapshots': 'all' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.output).toContain(`A snapshot is generated at a.spec.ts-snapshots${path.sep}test-1.aria.yml`);
+  expect(result.output).toContain(`A snapshot is generated at a.spec.ts-snapshots${path.sep}test-2.aria.yml`);
+  const snapshot1 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test-1.aria.yml'), 'utf8');
+  expect(snapshot1).toBe('- heading "hello world" [level=1]');
+  const snapshot2 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test-2.aria.yml'), 'utf8');
+  expect(snapshot2).toBe('- heading "hello world 2" [level=1]');
+});
+
+test('should not rebaseline matching', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts-snapshots/test.aria.yml': `
+      - heading "hello world"
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test.aria.yml' });
+      });
+    `
+  }, { 'update-snapshots': 'changed' });
+
+  expect(result.exitCode).toBe(0);
+  const snapshot1 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test.aria.yml'), 'utf8');
+  expect(snapshot1.trim()).toBe('- heading "hello world"');
+});
+
+test('should generate snapshot name', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test name', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot();
+        await page.setContent(\`<h1>hello world 2</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot();
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`A snapshot doesn't exist at a.spec.ts-snapshots${path.sep}test-name-1.aria.yml, writing actual`);
+  expect(result.output).toContain(`A snapshot doesn't exist at a.spec.ts-snapshots${path.sep}test-name-2.aria.yml, writing actual`);
+  const snapshot1 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test-name-1.aria.yml'), 'utf8');
+  expect(snapshot1).toBe('- heading "hello world" [level=1]');
+  const snapshot2 = await fs.promises.readFile(testInfo.outputPath('a.spec.ts-snapshots/test-name-2.aria.yml'), 'utf8');
+  expect(snapshot2).toBe('- heading "hello world 2" [level=1]');
+});
+
+test('backwards compat with .yml extension', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts-snapshots/test-1.yml': `
+      - heading "hello old world"
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello new world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot();
+      });
+    `
+  }, { 'update-snapshots': 'changed' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.output).toContain(`A snapshot is generated at a.spec.ts-snapshots${path.sep}test-1.yml.`);
+});
+
+for (const updateSnapshots of ['all', 'changed', 'missing', 'none']) {
+  test(`should update snapshot with the update-snapshots=${updateSnapshots} (config)`, async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      'playwright.config.ts': `
+        export default {
+          updateSnapshots: '${updateSnapshots}',
+        };
+      `,
+      'a.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>New content</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot({ timeout: 1 });
+        });
+      `,
+      'a.spec.ts-snapshots/test-1.aria.yml': '- heading "Old content" [level=1]',
+    });
+
+    const rebase = updateSnapshots === 'all' || updateSnapshots === 'changed';
+    expect(result.exitCode).toBe(rebase ? 0 : 1);
+    if (rebase) {
+      const snapshotOutputPath = testInfo.outputPath('a.spec.ts-snapshots/test-1.aria.yml');
+      expect(result.output).toContain(`A snapshot is generated at`);
+      const data = fs.readFileSync(snapshotOutputPath);
+      expect(data.toString()).toBe('- heading "New content" [level=1]');
+    } else {
+      expect(result.output).toContain(`Expect "toMatchAriaSnapshot"`);
+    }
+  });
+}
+
+test('should respect timeout', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      import path from 'path';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ timeout: 1 });
+      });
+    `,
+    'a.spec.ts-snapshots/test-1.aria.yml': '- heading "new world" [level=1]',
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`expect(locator).toMatchAriaSnapshot(expected) failed`);
+  expect(result.output).toContain('Timeout:  1ms');
+});
+
+test('should respect config.snapshotPathTemplate', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        snapshotPathTemplate: 'my-snapshots/{testFilePath}/{arg}{ext}',
+      };
+    `,
+    'my-snapshots/dir/a.spec.ts/my-test.aria.yml': `
+      - heading "hello world"
+    `,
+    'dir/a.spec.ts': `
+      import path from 'path';
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        const testDir = test.info().project.testDir;
+        const screenshotPath = path.join(testDir, 'my-snapshots/dir/a.spec.ts/my-test.aria.yml');
+        expect(test.info().snapshotPath('my_test.aria.yml', { kind: 'aria' })).toBe(screenshotPath);
+
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'my_test.aria.yml' });
+      });
+    `
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('should respect config.expect.toMatchAriaSnapshot.pathTemplate', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        snapshotPathTemplate: 'my-snapshots/{testFilePath}/{arg}{ext}',
+        expect: {
+          toMatchAriaSnapshot: {
+            pathTemplate: 'actual-snapshots/{testFilePath}/{arg}{ext}',
+          },
+        },
+      };
+    `,
+    'my-snapshots/dir/a.spec.ts/test.aria.yml': `
+      - heading "wrong one"
+    `,
+    'actual-snapshots/dir/a.spec.ts/test.aria.yml': `
+      - heading "hello world"
+    `,
+    'dir/a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello world</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot({ name: 'test.aria.yml' });
+      });
+    `
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
diff --git a/tests/playwright-test/babel.spec.ts b/tests/playwright-test/babel.spec.ts
index 3fb0a1a725762..0d7572de5ba1a 100644
--- a/tests/playwright-test/babel.spec.ts
+++ b/tests/playwright-test/babel.spec.ts
@@ -143,10 +143,44 @@ test('should not transform external', async ({ runInlineTest }) => {
       });
     `,
     'a.spec.ts': `
-      import { test, expect } from '@playwright/test';
-      test('succeeds', () => {});
+      const { test, expect, Page } = require('@playwright/test');
+      let page: Page;
+      enum MyEnum { Value = 'value' }
+
+      test('succeeds', () => {
+        expect(MyEnum.Value).toBe('value');
+      });
     `
   });
   expect(result.exitCode).toBe(1);
-  expect(result.output).toContain('Cannot use import statement outside a module');
+  expect(result.output).toMatch(/(SyntaxError: Unexpected token ':')|(SyntaxError: TypeScript enum is not supported)/);
 });
+
+for (const type of ['module', undefined]) {
+  test(`should support import assertions with type=${type} in the package.json`, {
+    annotation: {
+      type: 'issue',
+      description: 'https://github.com/microsoft/playwright/issues/32659'
+    }
+  }, async ({ runInlineTest }) => {
+    const result = await runInlineTest({
+      'playwright.config.ts': `
+      import packageJSON from './package.json' assert { type: 'json' };
+      console.log('imported value: ' + packageJSON.foo);
+      export default { };
+    `,
+      'package.json': JSON.stringify({ foo: 'bar', type }),
+      'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('check project name', ({}, testInfo) => {
+        expect(1).toBe(1);
+      });
+    `
+    });
+
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+    expect(result.stdout).toContain('imported value: bar');
+  });
+}
diff --git a/tests/playwright-test/basic.spec.ts b/tests/playwright-test/basic.spec.ts
index 6476255936e38..73ce104ba011a 100644
--- a/tests/playwright-test/basic.spec.ts
+++ b/tests/playwright-test/basic.spec.ts
@@ -153,6 +153,10 @@ test('should respect focused tests', async ({ runInlineTest }) => {
         });
       });
 
+      test.fail.only('focused fail.only test', () => {
+        expect(1 + 1).toBe(3);
+      });
+
       test.describe('non-focused describe', () => {
         test('describe test', () => {
           expect(1 + 1).toBe(3);
@@ -172,13 +176,46 @@ test('should respect focused tests', async ({ runInlineTest }) => {
         test.only('test4', () => {
           expect(1 + 1).toBe(2);
         });
+        test.fail.only('test5', () => {
+          expect(1 + 1).toBe(3);
+        });
       });
     `
   });
-  expect(passed).toBe(5);
+  expect(passed).toBe(7);
   expect(exitCode).toBe(0);
 });
 
+test('should respect focused tests with test.fail', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'fail-only.spec.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test1', () => {
+        console.log('test1 should not run');
+        expect(1 + 1).toBe(2);
+      });
+
+      test.fail.only('test2', () => {
+        console.log('test2 should run and fail');
+        expect(1 + 1).toBe(3);
+      });
+
+      test('test3', () => {
+        console.log('test3 should not run');
+        expect(1 + 1).toBe(2);
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+  expect(result.failed).toBe(0);
+  expect(result.skipped).toBe(0);
+  expect(result.output).toContain('test2 should run and fail');
+  expect(result.output).not.toContain('test1 should not run');
+  expect(result.output).not.toContain('test3 should not run');
+});
+
 test('skip should take priority over fail', async ({ runInlineTest }) => {
   const { passed, skipped, failed } = await runInlineTest({
     'test.spec.ts': `
@@ -551,21 +588,77 @@ test('should support describe.fixme', async ({ runInlineTest }) => {
   expect(result.output).toContain('heytest4');
 });
 
-test('should not allow mixing test types', async ({ runInlineTest }) => {
+test('should fail when test.fail.only passes unexpectedly', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'fail-only-pass.spec.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test1', () => {
+        console.log('test1 should not run');
+        expect(1 + 1).toBe(2);
+      });
+
+      test.fail.only('test2', () => {
+        console.log('test2 should run and pass unexpectedly');
+        expect(1 + 1).toBe(2);
+      });
+
+      test('test3', () => {
+        console.log('test3 should not run');
+        expect(1 + 1).toBe(2);
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.failed).toBe(1);
+  expect(result.skipped).toBe(0);
+  expect(result.output).toContain('should run and pass unexpectedly');
+  expect(result.output).not.toContain('test1 should not run');
+  expect(result.output).not.toContain('test3 should not run');
+});
+
+test('should serialize circular objects', async ({ runInlineTest }) => {
   const result = await runInlineTest({
-    'mixed.spec.ts': `
-      import { test } from '@playwright/test';
+    'one-failure.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('circular dependency', () => {
+        const a = {};
+        a.b = a;
+        expect(1).toEqual(a);
+      });
+    `
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.failed).toBe(1);
+  expect(result.output).toContain('Expected: {"b": [Circular]}');
+});
 
-      export const test2 = test.extend({
-        value: 42,
+test('should serialize BigInt', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'one-failure.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('BigInt', () => {
+        expect(1).toEqual(1n);
       });
+    `
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.output).toContain('Expected: 1n');
+});
 
-      test.describe("test1 suite", () => {
-        test2("test 2", async () => {});
+test('should report serialization error', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'one-failure.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('function', () => {
+        expect(1).toEqual({ a: () => {} });
       });
     `
   });
   expect(result.exitCode).toBe(1);
-  expect(result.output).toContain(`Can't call test() inside a describe() suite of a different test type.`);
-  expect(result.output).toContain('>  9 |         test2(');
+  expect(result.passed).toBe(0);
+  expect(result.output).toContain('Expected: {\"a\": [Function a]}');
 });
diff --git a/tests/playwright-test/clear-cache.spec.ts b/tests/playwright-test/clear-cache.spec.ts
index ffd0ec3cf46c5..128896c2e3ecc 100644
--- a/tests/playwright-test/clear-cache.spec.ts
+++ b/tests/playwright-test/clear-cache.spec.ts
@@ -15,9 +15,6 @@
  */
 
 import { test, expect } from './playwright-test-fixtures';
-import path from 'path';
-
-export const ctReactCliEntrypoint = path.join(__dirname, '../../packages/playwright-ct-react/cli.js');
 
 test('should clear cache with type:module', async ({ runCLICommand }) => {
   const result = await runCLICommand({
@@ -46,6 +43,6 @@ test('should clear cache for ct', async ({ runCLICommand }) => {
       import { test } from '@playwright/test';
       test('example', () => {});
     `,
-  }, 'clear-cache', [], ctReactCliEntrypoint);
+  }, 'clear-cache', []);
   expect(result.exitCode).toBe(0);
 });
diff --git a/tests/playwright-test/command-line-filter.spec.ts b/tests/playwright-test/command-line-filter.spec.ts
index 8937694b39fb6..e33cb8b318063 100644
--- a/tests/playwright-test/command-line-filter.spec.ts
+++ b/tests/playwright-test/command-line-filter.spec.ts
@@ -195,4 +195,4 @@ test('should focus a single test suite', async ({ runInlineTest }) => {
   expect(result.skipped).toBe(0);
   expect(result.report.suites[0].suites[0].suites[0].specs[0].title).toEqual('pass2');
   expect(result.report.suites[0].suites[0].suites[0].specs[1].title).toEqual('pass3');
-});
\ No newline at end of file
+});
diff --git a/tests/playwright-test/config.spec.ts b/tests/playwright-test/config.spec.ts
index 5550d84253b52..2c6342f00126e 100644
--- a/tests/playwright-test/config.spec.ts
+++ b/tests/playwright-test/config.spec.ts
@@ -72,6 +72,25 @@ test('should prioritize command line timeout over project timeout', async ({ run
   expect(result.output).toContain('Test timeout of 500ms exceeded.');
 });
 
+test('should support failOnFlakyTests config option', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+        module.exports = {
+          failOnFlakyTests: true,
+          retries: 1
+        };
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      test('flake', async ({}, testInfo) => {
+        expect(testInfo.retry).toBe(1);
+      });
+    `,
+  }, { 'retries': 1 });
+  expect(result.exitCode).not.toBe(0);
+  expect(result.flaky).toBe(1);
+});
+
 test('should read config from --config, resolve relative testDir', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'my.config.ts': `
@@ -327,6 +346,25 @@ test('should print nice error when project is unknown', async ({ runInlineTest }
   expect(output).toContain('Project(s) "suite3" not found. Available projects: "suite1", "suite2"');
 });
 
+test('should print nice error when project is unknown and launching UI mode', async ({ runInlineTest }) => {
+  // Prevent UI mode from opening and the test never finishing
+  test.setTimeout(5000);
+  const { output, exitCode } = await runInlineTest({
+    'playwright.config.ts': `
+      module.exports = { projects: [
+        { name: 'suite1' },
+        { name: 'suite2' },
+      ] };
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({}, testInfo) => {});
+    `
+  }, { project: 'suite3', ui: true });
+  expect(exitCode).toBe(1);
+  expect(output).toContain('Project(s) "suite3" not found. Available projects: "suite1", "suite2"');
+});
+
 test('should filter by project list, case-insensitive', async ({ runInlineTest }) => {
   const { passed, failed, outputLines, skipped } = await runInlineTest({
     'playwright.config.ts': `
@@ -392,6 +430,24 @@ test('should print nice error when some of the projects are unknown', async ({ r
   expect(output).toContain('Project(s) "suIte3", "SUite4" not found. Available projects: "suite1", "suite2"');
 });
 
+test('should print nice error when project name is not stable', async ({ runInlineTest }) => {
+  const { output, exitCode } = await runInlineTest({
+    'playwright.config.ts': `
+      module.exports = { projects: [
+        { name: \`calculated \$\{Date.now()\}\` },
+      ] };
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({}, testInfo) => {
+        console.log(testInfo.project.name);
+      });
+    `
+  });
+  expect(exitCode).toBe(1);
+  expect(output).toContain('not found in the worker process. Make sure project name does not change.');
+});
+
 test('should work without config file', async ({ runInlineTest }) => {
   const { exitCode, passed, failed, skipped } = await runInlineTest({
     'playwright.config.ts': `
@@ -605,8 +661,8 @@ test('should merge configs', async ({ runInlineTest }) => {
         use: { foo: 1, bar: 2 },
         expect: { timeout: 12 },
         projects: [
-          { name: 'B', timeout: 40, use: {} },
-          { name: 'A', timeout: 50, use: {} }
+          { name: 'A', timeout: 50, use: {} },
+          { name: 'B', timeout: 40 },
         ],
         webServer: [{
           command: 'echo 123',
@@ -624,6 +680,33 @@ test('should merge configs', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
 });
 
+test('should merge projects in the config', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      import { defineConfig, expect } from '@playwright/test';
+      const baseConfig = defineConfig({
+        projects: [{ name: 'A', timeout: 5_000 }, { name: 'B', timeout: 6_000 }],
+      });
+      const derivedConfig = defineConfig(baseConfig, {
+        projects: [{ name: 'A', timeout: 7_000 }, { name: 'C', timeout: 8_000 }],
+      });
+
+      expect(derivedConfig).toEqual(expect.objectContaining({
+        projects: [
+          { name: 'A', timeout: 7_000, use: {} },
+          { name: 'B', timeout: 6_000 },
+          { name: 'C', timeout: 8_000 },
+        ],
+      }));
+    `,
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      test('pass', async ({}) => {});
+    `
+  });
+  expect(result.exitCode).toBe(0);
+});
+
 test('should merge ct configs', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'playwright.config.ts': `
@@ -661,3 +744,35 @@ test('should merge ct configs', async ({ runInlineTest }) => {
   });
   expect(result.exitCode).toBe(0);
 });
+
+test('should throw on invalid config.tsconfig option', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        tsconfig: true,
+      };
+    `,
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`config.tsconfig must be a string`);
+});
+
+test('should throw on nonexistant config.tsconfig', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        tsconfig: './does-not-exist.json',
+      };
+    `,
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`config.tsconfig does not exist`);
+});
+
+test('should throw on invalid --tsconfig', async ({ runInlineTest }) => {
+  const result = await runInlineTest({}, { 'tsconfig': 'does-not-exist.json' });
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`--tsconfig "does-not-exist.json" does not exist`);
+});
diff --git a/tests/playwright-test/esm.spec.ts b/tests/playwright-test/esm.spec.ts
index 662fe68dac217..0e1deb9585917 100644
--- a/tests/playwright-test/esm.spec.ts
+++ b/tests/playwright-test/esm.spec.ts
@@ -35,28 +35,6 @@ test('should load nested as esm when package.json has type module', async ({ run
   expect(result.passed).toBe(1);
 });
 
-test('should support import assertions', async ({ runInlineTest }) => {
-  const result = await runInlineTest({
-    'playwright.config.ts': `
-      import packageJSON from './package.json' assert { type: 'json' };
-      console.log('imported value: ' + packageJSON.foo);
-      export default { };
-    `,
-    'package.json': JSON.stringify({ type: 'module', foo: 'bar' }),
-    'a.esm.test.ts': `
-      import { test, expect } from '@playwright/test';
-
-      test('check project name', ({}, testInfo) => {
-        expect(1).toBe(1);
-      });
-    `
-  });
-
-  expect(result.exitCode).toBe(0);
-  expect(result.passed).toBe(1);
-  expect(result.stdout).toContain('imported value: bar');
-});
-
 test('should support import attributes', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'playwright.config.ts': `
@@ -67,9 +45,15 @@ test('should support import attributes', async ({ runInlineTest }) => {
     'package.json': JSON.stringify({ type: 'module', foo: 'bar' }),
     'a.test.ts': `
       import config from './package.json' with { type: 'json' };
+      import configFooFromUtils from './utils.js'
       console.log('imported value (test): ' + config.foo);
       import { test, expect } from '@playwright/test';
+      expect(configFooFromUtils.foo).toBe('bar');
       test('pass', async () => {});
+    `,
+    'utils.js': `
+      import config from './package.json' with { type: 'json' };
+      export default config;
     `
   });
   expect(result.exitCode).toBe(0);
@@ -78,7 +62,7 @@ test('should support import attributes', async ({ runInlineTest }) => {
   expect(result.stdout).toContain('imported value (test): bar');
 });
 
-test('should import esm from ts when package.json has type module in experimental mode', async ({ runInlineTest }) => {
+test('should import esm from ts when package.json has type module', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'playwright.config.ts': `
       import * as fs from 'fs';
@@ -89,8 +73,10 @@ test('should import esm from ts when package.json has type module in experimenta
       import { foo } from './b.ts';
       import { bar } from './c.js';
       import { qux } from './d.js';
-      import { test, expect } from '@playwright/test';
+      // Make sure to import a type-only Locator below to check that our babel strips it out.
+      import { test, expect, Locator } from '@playwright/test';
       test('check project name', ({}, testInfo) => {
+        const locator: Locator = null!;
         expect(testInfo.project.name).toBe('foo');
         expect(bar).toBe('bar');
         expect(qux).toBe('qux');
@@ -128,8 +114,10 @@ test('should respect path resolver in experimental mode', async ({ runInlineTest
   const result = await runInlineTest({
     'package.json': JSON.stringify({ type: 'module' }),
     'playwright.config.ts': `
+      // Make sure that config can use the path mapping.
+      import { foo } from 'util/b.js';
       export default {
-        projects: [{name: 'foo'}],
+        projects: [{ name: foo }],
       };
     `,
     'tsconfig.json': `{
@@ -147,7 +135,8 @@ test('should respect path resolver in experimental mode', async ({ runInlineTest
       import { foo } from 'util/b.js';
       import { test, expect } from '@playwright/test';
       test('check project name', ({}, testInfo) => {
-        expect(testInfo.project.name).toBe(foo);
+        expect(testInfo.project.name).toBe('foo');
+        expect(foo).toBe('foo');
       });
     `,
     'foo/bar/util/b.ts': `
@@ -206,6 +195,32 @@ test('should use source maps when importing a file throws an error', async ({ ru
   `);
 });
 
+test('should use source maps when importing a file throws an error in legacy mode', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35706' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'package.json': `{ "type": "module" }`,
+    'playwright.config.ts': `
+      export default {};
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      throw new Error('Oh my!');
+    `
+  }, {}, { 'PLAYWRIGHT_WAIT_FOR_SOURCE_MAPS': '1' });
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`Error: Oh my!
+
+   at a.test.ts:4
+
+  2 |       import { test, expect } from '@playwright/test';
+  3 |
+> 4 |       throw new Error('Oh my!');
+    |             ^
+  `);
+});
+
 test('should show the codeframe in errors', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'package.json': `{ "type": "module" }`,
@@ -695,9 +710,6 @@ test('should be able to use use execSync with a Node.js file inside a spec', asy
     'global-setup import level',
     'execSync: hello from hello.js',
     'spawnSync: hello from hello.js',
-    'global-teardown import level',
-    'execSync: hello from hello.js',
-    'spawnSync: hello from hello.js',
     'global-setup export level',
     'execSync: hello from hello.js',
     'spawnSync: hello from hello.js',
@@ -712,6 +724,9 @@ test('should be able to use use execSync with a Node.js file inside a spec', asy
     'execSync: hello from hello.js',
     'spawnSync: hello from hello.js',
     'fork: hello from hellofork.js',
+    'global-teardown import level',
+    'execSync: hello from hello.js',
+    'spawnSync: hello from hello.js',
     'global-teardown export level',
     'execSync: hello from hello.js',
     'spawnSync: hello from hello.js',
@@ -775,3 +790,69 @@ test('should exit after merge-reports', async ({ runInlineTest, mergeReports })
   const { exitCode } = await mergeReports(test.info().outputPath('blob-report'), undefined, { additionalArgs: ['-c', 'merge.config.ts'] });
   expect(exitCode).toBe(0);
 });
+
+test('should load esm -> cjs -> cjs require tree without stalling', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35706' },
+}, async ({ runInlineTest }) => {
+  test.setTimeout(10000);
+  const result = await runInlineTest({
+    'playwright.config.js': `
+      export default { projects: [{name: 'foo'}] };
+    `,
+    'package.json': JSON.stringify({ type: 'module' }),
+    'a.esm.test.js': `
+      import { test, expect } from '@playwright/test';
+      import * as root from './nested/root_require.js';
+      test('check project name', ({}, testInfo) => {
+        console.log('root', root);
+        expect(testInfo.project.name).toBe('foo');
+      });
+    `,
+    'nested/package.json': JSON.stringify({ type: 'commonjs' }),
+    'nested/root_require.js': `
+      const nested = require('./nested_require.js');
+      console.log(nested);
+    `,
+    'nested/nested_require.js': `
+      console.log('nested require');
+    `,
+  });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('should have source maps when throwing during nested module import', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35706' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'package.json': JSON.stringify({ type: 'module' }),
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      import { foo } from './import1.ts';
+      test('dummy', () => {
+        expect(foo).toBe('foo');
+      });
+    `,
+    'import1.ts': `
+      export { foo } from './import2.ts';
+    `,
+    'import2.ts': `
+      type Foo = { bar: string };
+      const fs = require('fs');
+      throw new Error('Oh no!');
+      export const foo: Foo = { bar: 'foo' };
+      console.log(fs.existsSync('does-not-exist.txt'));
+    `,
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`require is not defined in ES module scope`);
+  expect(result.output).toContain([
+    `  2 |       type Foo = { bar: string };`,
+    `> 3 |       const fs = require('fs');`,
+    `    |                  ^`,
+  ].join('\n'));
+
+  expect(result.output).toContain(`at import2.ts:3`);
+});
diff --git a/tests/playwright-test/expect-configure.spec.ts b/tests/playwright-test/expect-configure.spec.ts
index 14b864400a312..6b568eb918e9a 100644
--- a/tests/playwright-test/expect-configure.spec.ts
+++ b/tests/playwright-test/expect-configure.spec.ts
@@ -48,7 +48,8 @@ test('should configure message', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(0);
   expect(result.output).toContain('Error: x-foo must be visible');
-  expect(result.output).toContain(`Timed out 1ms waiting for expect(locator).toBeVisible()`);
+  expect(result.output).toContain('expect(locator).toBeVisible() failed');
+  expect(result.output).toContain('Timeout:  1ms');
   expect(result.output).toContain('Call log:');
 });
 
@@ -66,7 +67,8 @@ test('should prefer local message', async ({ runInlineTest }) => {
   expect(result.passed).toBe(0);
 
   expect(result.output).toContain('Error: overridden');
-  expect(result.output).toContain(`Timed out 1ms waiting for expect(locator).toBeVisible()`);
+  expect(result.output).toContain(`expect(locator).toBeVisible() failed`);
+  expect(result.output).toContain('Timeout:  1ms');
   expect(result.output).toContain('Call log:');
 });
 
diff --git a/tests/playwright-test/expect-poll.spec.ts b/tests/playwright-test/expect-poll.spec.ts
index e740fd5abeaa8..208ac4ccce866 100644
--- a/tests/playwright-test/expect-poll.spec.ts
+++ b/tests/playwright-test/expect-poll.spec.ts
@@ -44,7 +44,10 @@ test('should poll predicate', async ({ runInlineTest }) => {
 test('should compile', async ({ runTSC }) => {
   const result = await runTSC({
     'a.spec.ts': `
-      import { test, expect } from '@playwright/test';
+      import { test, expect as baseExpect } from '@playwright/test';
+      const expect = baseExpect.extend({
+        toBeWithinRange() { return { message: () => "is within range", pass: true }; },
+      })
       test('should poll sync predicate', async ({ page }) => {
         let i = 0;
         test.expect.poll(() => ++i).toBe(3);
@@ -57,6 +60,7 @@ test('should compile', async ({ runTSC }) => {
           return ++i;
         }).toBe(3);
         test.expect.poll(() => Promise.resolve(++i)).toBe(3);
+        expect.poll(() => Promise.resolve(++i)).toBeWithinRange();
 
         // @ts-expect-error
         await test.expect.poll(() => page.locator('foo')).toBeEnabled();
@@ -172,7 +176,9 @@ test('should support .not predicate', async ({ runInlineTest }) => {
 test('should support custom matchers', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'a.spec.ts': `
-      expect.extend({
+      import { test, expect as baseExpect } from '@playwright/test';
+
+      const expect = baseExpect.extend({
         toBeWithinRange(received, floor, ceiling) {
           const pass = received >= floor && received <= ceiling;
           if (pass) {
@@ -191,10 +197,9 @@ test('should support custom matchers', async ({ runInlineTest }) => {
         },
       });
 
-      import { test, expect } from '@playwright/test';
       test('should poll', async () => {
         let i = 0;
-        await test.expect.poll(() => ++i).toBeWithinRange(3, Number.MAX_VALUE);
+        await expect.poll(() => ++i).toBeWithinRange(3, Number.MAX_VALUE);
       });
     `
   });
@@ -232,3 +237,45 @@ test('should show intermediate result for poll that spills over test time', asyn
   expect(result.output).toContain('Expected: 2');
   expect(result.output).toContain('Received: 3');
 });
+
+test('should propagate promise rejections', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32256' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('should fail', async () => {
+        await expect.poll(() => Promise.reject('some error')).toBe({ foo: 'baz' });
+      });
+    `
+  });
+
+  expect(result.output).toContain('some error');
+});
+
+test('should propagate string exception from async arrow function', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32256' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('should fail', async () => {
+        await expect.poll(async () => { throw 'some error' }).toBe({ foo: 'baz' });
+      });
+    `
+  });
+
+  expect(result.output).toContain('some error');
+});
+
+test('should show custom message', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32582' }
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('should fail', async () => {
+        await expect.poll(() => 1, { message: 'custom message', timeout: 500 }).toBe(2);
+      });
+    `,
+  });
+  expect(result.output).toContain('Error: custom message');
+  expect(result.output).toContain('Expected: 2');
+  expect(result.output).toContain('Received: 1');
+});
diff --git a/tests/playwright-test/expect.spec.ts b/tests/playwright-test/expect.spec.ts
index 63928e86fb3e2..a5e5b40c2084c 100644
--- a/tests/playwright-test/expect.spec.ts
+++ b/tests/playwright-test/expect.spec.ts
@@ -18,41 +18,6 @@ import path from 'path';
 import { test, expect, parseTestRunnerOutput, stripAnsi } from './playwright-test-fixtures';
 const { spawnAsync } = require('../../packages/playwright-core/lib/utils');
 
-test('should be able to call expect.extend in config', async ({ runInlineTest }) => {
-  const result = await runInlineTest({
-    'helper.ts': `
-      import { test as base, expect } from '@playwright/test';
-      expect.extend({
-        toBeWithinRange(received, floor, ceiling) {
-          const pass = received >= floor && received <= ceiling;
-          if (pass) {
-            return {
-              message: () =>
-                'passed',
-              pass: true,
-            };
-          } else {
-            return {
-              message: () => 'failed',
-              pass: false,
-            };
-          }
-        },
-      });
-      export const test = base;
-    `,
-    'expect-test.spec.ts': `
-      import { test } from './helper';
-      test('numeric ranges', () => {
-        test.expect(100).toBeWithinRange(90, 110);
-        test.expect(101).not.toBeWithinRange(0, 100);
-      });
-    `
-  });
-  expect(result.exitCode).toBe(0);
-  expect(result.passed).toBe(1);
-});
-
 test('should not expand huge arrays', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'expect-test.spec.ts': `
@@ -102,7 +67,8 @@ test('should include custom expect message with web-first assertions', async ({
   expect(result.passed).toBe(0);
 
   expect(result.output).toContain('Error: x-foo must be visible');
-  expect(result.output).toContain(`Timed out 1ms waiting for expect(locator).toBeVisible()`);
+  expect(result.output).toContain('expect(locator).toBeVisible() failed');
+  expect(result.output).toContain('Timeout:  1ms');
   expect(result.output).toContain('Call log:');
 });
 
@@ -546,13 +512,13 @@ test('should support toHaveURL with baseURL from webServer', async ({ runInlineT
       import { test, expect } from '@playwright/test';
 
       test('pass', async ({ page }) => {
-        await page.goto('/foobar');
-        await expect(page).toHaveURL('/foobar');
-        await expect(page).toHaveURL('http://localhost:${port}/foobar');
+        await page.goto('/hello');
+        await expect(page).toHaveURL('/hello');
+        await expect(page).toHaveURL('http://localhost:${port}/hello');
       });
 
       test('fail', async ({ page }) => {
-        await page.goto('/foobar');
+        await page.goto('/hello');
         await expect(page).toHaveURL('/kek', { timeout: 1000 });
       });
       `,
@@ -578,11 +544,33 @@ test('should respect expect.timeout', async ({ runInlineTest }) => {
     'playwright.config.js': `module.exports = { expect: { timeout: 1000 } }`,
     'a.test.ts': `
       import { test, expect } from '@playwright/test';
+      import { stripVTControlCharacters } from 'node:util';
 
       test('timeout', async ({ page }) => {
         await page.goto('data:text/html,<div>A</div>');
         const error = await expect(page).toHaveURL('data:text/html,<div>B</div>').catch(e => e);
-        expect(error.message).toContain('expect.toHaveURL with timeout 1000ms');
+        expect(stripVTControlCharacters(error.message)).toContain('expect(page).toHaveURL(expected) failed');
+        expect(stripVTControlCharacters(error.message)).toContain('Timeout: 1000ms');
+        expect(error.message).toContain('data:text/html,<div>');
+      });
+      `,
+  }, { workers: 1 });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('should support toHaveURL predicate', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.js': `module.exports = { expect: { timeout: 1000 } }`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      import { stripVTControlCharacters } from 'node:util';
+
+      test('predicate', async ({ page }) => {
+        await page.goto('data:text/html,<div>A</div>');
+        const error = await expect(page).toHaveURL(url => url === 'data:text/html,<div>B</div>').catch(e => e);
+        expect(stripVTControlCharacters(error.message)).toContain('expect(page).toHaveURL(expected) failed');
+        expect(stripVTControlCharacters(error.message)).toContain('Timeout: 1000ms');
         expect(error.message).toContain('data:text/html,<div>');
       });
       `,
@@ -651,6 +639,33 @@ test('should print pending operations for toHaveText', async ({ runInlineTest })
   expect(output).toContain('waiting for locator(\'no-such-thing\')');
 });
 
+test('should only highlight unmatched regex in diff message for toHaveText with array', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('toHaveText with mixed strings and regexes (array)', async ({ page }) => {
+        await page.setContent(\`
+          <ul>
+            <li>Coffee</li>
+            <li>Tea</li>
+            <li>Milk</li>
+          </ul>
+        \`);
+
+        const items = page.locator('li');
+        await expect(items).toHaveText(['Coffee', /\\d+/, /Milk/]);
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(1);
+  const output = result.output;
+  expect(output).toContain('-   /\\d+/,');
+  expect(output).toContain('+   "Tea",');
+  expect(output).not.toContain('-   /Milk/,');
+  expect(output).not.toContain('-   "Coffee",');
+});
+
 test('should print expected/received on Ctrl+C', async ({ interactWithTestRunner }) => {
   test.skip(process.platform === 'win32', 'No sending SIGINT on Windows');
 
@@ -694,7 +709,7 @@ test('should not print timed out error message when test times out', async ({ ru
   expect(result.exitCode).toBe(1);
   const output = result.output;
   expect(output).toContain('Test timeout of 3000ms exceeded');
-  expect(output).not.toContain('Timed out 5000ms waiting for expect');
+  expect(output).not.toContain('Timeout:  5000ms');
   expect(output).toContain(`Error: expect(locator).toHaveText(expected)`);
 });
 
@@ -750,13 +765,18 @@ test('should chain expect matchers and expose matcher utils (TSC)', async ({ run
         let pass: boolean;
         let matcherResult: any;
         try {
-          await baseExpect(baseAmount).toHaveAttribute('data-amount', expected, options);
+          const expectation = this.isNot ? baseExpect(baseAmount).not : baseExpect(baseAmount);
+          await expectation.toHaveAttribute('data-amount', expected, options);
           pass = true;
         } catch (e: any) {
           matcherResult = e.matcherResult;
           pass = false;
         }
 
+        if (this.isNot) {
+            pass = !pass;
+        }
+
         const expectOptions = {
           isNot: this.isNot,
         };
@@ -830,13 +850,18 @@ test('should chain expect matchers and expose matcher utils', async ({ runInline
         let pass: boolean;
         let matcherResult: any;
         try {
-          await baseExpect(baseAmount).toHaveAttribute('data-amount', expected, options);
+          const expectation = this.isNot ? baseExpect(baseAmount).not : baseExpect(baseAmount);
+          await expectation.toHaveAttribute('data-amount', expected, options);
           pass = true;
         } catch (e: any) {
           matcherResult = e.matcherResult;
           pass = false;
         }
 
+        if (this.isNot) {
+            pass = !pass;
+        }
+
         const expectOptions = {
           isNot: this.isNot,
         };
@@ -876,7 +901,7 @@ test('should chain expect matchers and expose matcher utils', async ({ runInline
   }, { workers: 1 });
   const output = stripAnsi(result.output);
   expect(output).toContain(`await expect(page.locator('div')).toHaveAmount('3', { timeout: 1000 });`);
-  expect(output).toContain('a.spec.ts:60');
+  expect(output).toContain('a.spec.ts:65');
   expect(result.failed).toBe(1);
   expect(result.exitCode).toBe(1);
 });
@@ -998,7 +1023,8 @@ test('should respect timeout from configured expect when used outside of the tes
 
   expect(code).toBe(1);
   expect(stdout).toBe('');
-  expect(stripAnsi(stderr)).toContain('Timed out 10ms waiting for expect(locator).toBeAttached()');
+  expect(stripAnsi(stderr)).toContain('expect(locator).toBeAttached() failed');
+  expect(stripAnsi(stderr)).toContain('Timeout:  10ms');
 });
 
 test('should expose timeout to custom matchers', async ({ runInlineTest, runTSC }) => {
@@ -1043,8 +1069,8 @@ test('should expose timeout to custom matchers', async ({ runInlineTest, runTSC
 test('should throw error when using .equals()', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'helper.ts': `
-      import { test as base, expect } from '@playwright/test';
-      expect.extend({
+      import { test as base, expect as baseExpect } from '@playwright/test';
+      export const expect = baseExpect.extend({
         toBeWithinRange(received, floor, ceiling) {
           this.equals(1, 2);
         },
@@ -1052,10 +1078,10 @@ test('should throw error when using .equals()', async ({ runInlineTest }) => {
       export const test = base;
     `,
     'expect-test.spec.ts': `
-      import { test } from './helper';
+      import { test, expect } from './helper';
       test('numeric ranges', () => {
-        test.expect(() => {
-          test.expect(100).toBeWithinRange(90, 110);
+        expect(() => {
+          expect(100).toBeWithinRange(90, 110);
         }).toThrowError('It looks like you are using custom expect matchers that are not compatible with Playwright. See https://aka.ms/playwright/expect-compatibility');
       });
     `
@@ -1063,3 +1089,215 @@ test('should throw error when using .equals()', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
 });
+
+test('expect.extend should be immutable', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      const expectFoo = expect.extend({
+        toFoo() {
+          console.log('%%foo');
+          return { pass: true };
+        }
+      });
+      const expectFoo2 = expect.extend({
+        toFoo() {
+          console.log('%%foo2');
+          return { pass: true };
+        }
+      });
+      const expectBar = expectFoo.extend({
+        toBar() {
+          console.log('%%bar');
+          return { pass: true };
+        }
+      });
+      test('logs', () => {
+        expect(expectFoo).not.toBe(expectFoo2);
+        expect(expectFoo).not.toBe(expectBar);
+
+        expectFoo().toFoo();
+        expectFoo2().toFoo();
+        expectBar().toFoo();
+        expectBar().toBar();
+      });
+    `
+  });
+  expect(result.outputLines).toEqual([
+    'foo',
+    'foo2',
+    'foo',
+    'bar',
+  ]);
+});
+
+test('expect.extend should fall back to legacy behavior', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      expect.extend({
+        toFoo() {
+          console.log('%%foo');
+          return { pass: true };
+        }
+      });
+      expect.extend({
+        toFoo() {
+          console.log('%%foo2');
+          return { pass: true };
+        }
+      });
+      expect.extend({
+        toBar() {
+          console.log('%%bar');
+          return { pass: true };
+        }
+      });
+      test('logs', () => {
+        expect().toFoo();
+        expect().toBar();
+      });
+    `
+  });
+  expect(result.outputLines).toEqual([
+    'foo2',
+    'bar',
+  ]);
+});
+
+test('custom asymmetric matchers should work with expect.extend', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect as baseExpect, mergeExpects } from '@playwright/test';
+      const expect1 = baseExpect.extend({
+        isFoo(received: unknown, expected: string) {
+          return { pass: received === 'foo', message: () => '' };
+        },
+      });
+      const expect2 = baseExpect.extend({
+        isSomething(received: unknown, expected: string) {
+          return { pass: received === expected, message: () => '' };
+        },
+      });
+      const expect = mergeExpects(expect1, expect2);
+      test('example', () => {
+        expect('foo').toEqual(expect.isFoo());
+        expect('bar').toEqual(expect.isSomething('bar'));
+        try {
+          expect('foo2').toEqual(expect.isFoo());
+          console.log('should not run 1');
+        } catch (e) {
+        }
+        try {
+          expect('bar2').toEqual(expect.isSomething('bar'));
+          console.log('should not run 2');
+        } catch (e) {
+        }
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+  expect(result.output).not.toContain('should not run');
+});
+
+test('custom asymmetric matchers should function', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35138' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      expect.extend({
+        isUndefined(received: unknown, expected: string) {
+          return { pass: received === undefined, message: () => '' };
+        }
+      });
+      test('example', () => {
+        expect(undefined).toEqual(expect.isUndefined());
+      });
+      test('example2', () => {
+        expect({
+          aProperty: undefined,
+          bProperty: 'foo',
+        }).toEqual({
+          aProperty: expect.isUndefined(),
+          bProperty: 'foo',
+          cProperty: expect.isUndefined(),
+        });
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(2);
+});
+
+test('single custom asymmetric matcher should present the correct error', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35138' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      expect.extend({
+        isUndefined(received: unknown, expected: string) {
+          return { pass: received === undefined, message: () => '' };
+        }
+      });
+      test('example', () => {
+        expect({
+          aProperty: 'foo'
+        }).toEqual({
+          aProperty: expect.isUndefined()
+        });
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.output).toContain('-   \"aProperty\": isUndefined<>');
+  expect(result.output).toContain('+   \"aProperty\": \"foo\"');
+});
+
+test('multiple custom asymmetric matchers should present the correct error', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35138' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      expect.extend({
+        isUndefined(received: unknown, expected: string) {
+          return { pass: received === undefined, message: () => '' };
+        }
+      });
+      test('example', () => {
+        expect({
+          aProperty: undefined,
+          bProperty: 'foo',
+        }).toEqual({
+          aProperty: expect.isUndefined(),
+          bProperty: expect.isUndefined()
+        });
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.output).toContain('-   \"bProperty\": isUndefined<>');
+  expect(result.output).toContain('+   \"bProperty\": \"foo\"');
+});
+
+test('multiple custom asymmetric matchers in async expect should present the correct error', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35138' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'expect-test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      expect.extend({
+        isUndefined(received: unknown, expected: string) {
+          return { pass: received === undefined, message: () => '' };
+        }
+      });
+      test('example', async () => {
+        await expect.poll(() => ({ aProperty: 'foo', bProperty: undefined })).toEqual({
+          aProperty: expect.isUndefined(),
+          bProperty: expect.isUndefined(),
+        });
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.output).toContain('-   \"aProperty\": isUndefined<>');
+  expect(result.output).toContain('+   \"aProperty\": \"foo\"');
+});
diff --git a/tests/playwright-test/find-related-tests.spec.ts b/tests/playwright-test/find-related-tests.spec.ts
deleted file mode 100644
index 981395ade1f2f..0000000000000
--- a/tests/playwright-test/find-related-tests.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright Microsoft Corporation. All rights reserved.
- *
- * 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 './playwright-test-fixtures';
-import path from 'path';
-
-export const ctReactCliEntrypoint = path.join(__dirname, '../../packages/playwright-ct-react/cli.js');
-
-test('should list related tests', async ({ runCLICommand }) => {
-  const result = await runCLICommand({
-    'playwright.config.ts': `
-      import { defineConfig } from '@playwright/test';
-      export default defineConfig({});
-    `,
-    'helper.ts': `
-      export const value = 42;
-    `,
-    'helper2.ts': `
-      export { value } from './helper';
-    `,
-    'a.spec.ts': `
-      import { test } from '@playwright/test';
-      import { value } from './helper2';
-      if (value) {}
-      test('', () => {});
-    `,
-    'b.spec.ts': `
-      import { test } from '@playwright/test';
-      import { value } from './helper';
-      if (value) {}
-      test('', () => {});
-    `,
-  }, 'find-related-test-files', ['helper.ts']);
-  expect(result.exitCode).toBe(0);
-  expect(result.stderr).toBeFalsy();
-  const data = JSON.parse(result.stdout);
-  expect(data).toEqual({
-    testFiles: [
-      expect.stringContaining('a.spec.ts'),
-      expect.stringContaining('b.spec.ts'),
-    ]
-  });
-});
-
-test('should list related tests for ct', async ({ runCLICommand }) => {
-  const result = await runCLICommand({
-    'playwright.config.ts': `
-      import { defineConfig } from '@playwright/experimental-ct-react';
-      export default defineConfig({});
-    `,
-    'playwright/index.html': `<script type="module" src="./index.js"></script>`,
-    'playwright/index.js': ``,
-    'helper.tsx': `
-      export const HelperButton = () => <button>Click me</button>;
-    `,
-    'button.tsx': `
-      import { HelperButton } from './helper';
-      export const Button = () => <HelperButton>Click me</HelperButton>;
-    `,
-    'button.spec.tsx': `
-      import { test } from '@playwright/experimental-ct-react';
-      import { Button } from './button';
-      test('foo', async ({ mount }) => {
-        await mount(<Button />);
-      });
-    `,
-  }, 'find-related-test-files', ['helper.tsx'], ctReactCliEntrypoint);
-  expect(result.exitCode).toBe(0);
-  const data = JSON.parse(result.stdout);
-  expect(data).toEqual({
-    testFiles: [
-      expect.stringContaining('button.spec.tsx'),
-    ]
-  });
-});
diff --git a/tests/playwright-test/fit-to-width.spec.ts b/tests/playwright-test/fit-to-width.spec.ts
new file mode 100644
index 0000000000000..c4f6dd3200dca
--- /dev/null
+++ b/tests/playwright-test/fit-to-width.spec.ts
@@ -0,0 +1,33 @@
+/**
+ * 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 { fitToWidth } from 'packages/playwright/lib/reporters/base';
+import { test, expect } from './playwright-test-fixtures';
+
+test('chinese characters', () => {
+  expect(fitToWidth('你你好', 3)).toBe('…好');
+  expect(fitToWidth('你好你好', 4)).toBe('…好');
+});
+
+test('surrogate pairs', () => {
+  expect(fitToWidth('🫣🤗', 2)).toBe('…');
+  expect(fitToWidth('🫣🤗', 3)).toBe('…🤗');
+  expect(fitToWidth('🚄🚄', 1)).toBe('…');
+  expect(fitToWidth('🚄🚄', 2)).toBe('…');
+  expect(fitToWidth('🚄🚄', 3)).toBe('…🚄');
+  expect(fitToWidth('🚄🚄', 4)).toBe('🚄🚄');
+  expect(fitToWidth('🧑‍🧑‍🧒🧑‍🧑‍🧒🧑‍🧑‍🧒', 4)).toBe('…🧑‍🧑‍🧒');
+});
diff --git a/tests/playwright-test/fixtures.spec.ts b/tests/playwright-test/fixtures.spec.ts
index a130f8dfcb62a..f822557d4a137 100644
--- a/tests/playwright-test/fixtures.spec.ts
+++ b/tests/playwright-test/fixtures.spec.ts
@@ -596,7 +596,7 @@ test('should understand worker fixture params in overrides calling base', async
       ]};
     `,
   });
-  const outputs = result.results.map(r => r.stdout[0].text.replace(/\s/g, ''));
+  const outputs = result.results.map(r => r.stdout.filter(output => 'text' in output)[0].text.replace(/\s/g, ''));
   expect(outputs.sort()).toEqual(['foo-p1-override-bar', 'foo-p2-override-bar', 'foo-p3-override-bar']);
 });
 
diff --git a/tests/playwright-test/global-setup.spec.ts b/tests/playwright-test/global-setup.spec.ts
index 3d28be82cddc0..419fb8753b5e8 100644
--- a/tests/playwright-test/global-setup.spec.ts
+++ b/tests/playwright-test/global-setup.spec.ts
@@ -108,7 +108,7 @@ test('globalTeardown runs after failures', async ({ runInlineTest }) => {
   expect(output).toContain('teardown=42');
 });
 
-test('globalTeardown does not run when globalSetup times out', async ({ runInlineTest }) => {
+test('globalTeardown still runs when globalSetup times out', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'playwright.config.ts': `
       import * as path from 'path';
@@ -135,7 +135,7 @@ test('globalTeardown does not run when globalSetup times out', async ({ runInlin
     `,
   });
   expect(result.output).toContain('Timed out waiting 1s for the global setup to run');
-  expect(result.output).not.toContain('teardown=');
+  expect(result.output).toContain('teardown=');
 });
 
 test('globalSetup should work with sync function', async ({ runInlineTest }) => {
@@ -386,3 +386,71 @@ test('teardown after error', async ({ runInlineTest }) => {
     'teardown 1',
   ]);
 });
+
+test('globalSetup should support multiple', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      module.exports = {
+        globalSetup: ['./globalSetup1.ts','./globalSetup2.ts','./globalSetup3.ts','./globalSetup4.ts'],
+        globalTeardown: ['./globalTeardown1.ts', './globalTeardown2.ts'],
+      };
+    `,
+    'globalSetup1.ts': `module.exports = () => { console.log('%%globalSetup1'); return () => { console.log('%%callback1'); throw new Error('kaboom'); } };`,
+    'globalSetup2.ts': `module.exports = () => console.log('%%globalSetup2');`,
+    'globalSetup3.ts': `module.exports = () => { console.log('%%globalSetup3'); return () => console.log('%%callback3'); }`,
+    'globalSetup4.ts': `module.exports = () => console.log('%%globalSetup4');`,
+    'globalTeardown1.ts': `module.exports = () => console.log('%%globalTeardown1')`,
+    'globalTeardown2.ts': `module.exports = () => { console.log('%%globalTeardown2'); throw new Error('kaboom'); }`,
+
+    'a.test.js': `
+      import { test } from '@playwright/test';
+      test('a', () => console.log('%%test a'));
+      test('b', () => console.log('%%test b'));
+    `,
+  }, { reporter: 'line' });
+  expect(result.passed).toBe(2);
+
+  // first setups, then setup callbacks in reverse order.
+  // then teardowns in declared order.
+  expect(result.outputLines).toEqual([
+    'globalSetup1',
+    'globalSetup2',
+    'globalSetup3',
+    'globalSetup4',
+    'test a',
+    'test b',
+    'callback3',
+    'callback1',
+    'globalTeardown1',
+    'globalTeardown2',
+  ]);
+  expect(result.output).toContain('Error: kaboom');
+});
+
+test('globalTeardown runs even if callback failed', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      module.exports = {
+        globalSetup: './globalSetup.ts',
+        globalTeardown: './globalTeardown.ts',
+      };
+    `,
+    'globalSetup.ts': `module.exports = () => { console.log('%%globalSetup'); return () => { throw new Error('kaboom'); } };`,
+    'globalTeardown.ts': `module.exports = () => console.log('%%globalTeardown')`,
+
+    'a.test.js': `
+      import { test } from '@playwright/test';
+      test('a', () => console.log('%%test'));
+    `,
+  }, { reporter: 'line' });
+  expect(result.passed).toBe(1);
+
+  // first setups, then setup callbacks in reverse order.
+  // then teardowns in declared order.
+  expect(result.outputLines).toEqual([
+    'globalSetup',
+    'test',
+    'globalTeardown',
+  ]);
+  expect(result.output).toContain('Error: kaboom');
+});
diff --git a/tests/playwright-test/golden.spec.ts b/tests/playwright-test/golden.spec.ts
index 205eeee7f0520..7d59e7c3c04b0 100644
--- a/tests/playwright-test/golden.spec.ts
+++ b/tests/playwright-test/golden.spec.ts
@@ -58,7 +58,8 @@ test('should work with non-txt extensions', async ({ runInlineTest }) => {
     `
   });
   expect(result.exitCode).toBe(1);
-  expect(result.output).toContain(`1,2,34`);
+  expect(result.rawOutput).toContain(colors.green('-1,2,3'));
+  expect(result.rawOutput).toContain(colors.red('+1,2,4'));
 });
 
 
@@ -202,8 +203,8 @@ Line7`,
   });
   expect(result.exitCode).toBe(1);
   expect(result.output).toContain('Line1');
-  expect(result.rawOutput).toContain('Line2' + colors.green('2'));
-  expect(result.rawOutput).toContain('line' + colors.reset(colors.strikethrough(colors.red('1'))) + colors.green('2'));
+  expect(result.rawOutput).toContain(colors.green('-Line2'));
+  expect(result.rawOutput).toContain(colors.red('+Line22'));
   expect(result.output).toContain('Line3');
   expect(result.output).toContain('Line5');
   expect(result.output).toContain('Line7');
@@ -223,11 +224,11 @@ test('should write detailed failure result to an output folder', async ({ runInl
 
   expect(result.exitCode).toBe(1);
   const outputText = result.output;
-  expect(outputText).toContain('Snapshot comparison failed:');
+  expect(outputText).toContain('Error: expect(string).toMatchSnapshot(expected)');
   const expectedSnapshotArtifactPath = testInfo.outputPath('test-results', 'a-is-a-test', 'snapshot-expected.txt');
   const actualSnapshotArtifactPath = testInfo.outputPath('test-results', 'a-is-a-test', 'snapshot-actual.txt');
   expect(outputText).toMatch(/Expected:.*a\.spec\.js-snapshots.snapshot\.txt/);
-  expect(outputText).toContain(`Received: ${actualSnapshotArtifactPath}`);
+  expect(outputText).toContain(`Received: test-results${path.sep}a-is-a-test${path.sep}snapshot-actual.txt`);
   expect(fs.existsSync(expectedSnapshotArtifactPath)).toBe(true);
   expect(fs.existsSync(actualSnapshotArtifactPath)).toBe(true);
 });
@@ -340,6 +341,36 @@ test('should update snapshot with the update-snapshots flag', async ({ runInline
   expect(data.toString()).toBe(ACTUAL_SNAPSHOT);
 });
 
+for (const updateSnapshots of ['all', 'changed', 'missing', 'none']) {
+  test(`should update snapshot with the update-snapshots=${updateSnapshots} (config)`, async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      'playwright.config.ts': `export default { updateSnapshots: '${updateSnapshots}' };`,
+      ...files,
+      'a.spec.js-snapshots/snapshot.txt': 'Hello world',
+      'a.spec.js': `
+        const { test, expect } = require('./helper');
+        test('is a test', ({}) => {
+          expect('Hello world updated').toMatchSnapshot('snapshot.txt');
+        });
+      `
+    });
+
+    const rebase = updateSnapshots === 'all' || updateSnapshots === 'changed';
+    expect(result.exitCode).toBe(rebase ? 0 : 1);
+    if (rebase) {
+      const snapshotOutputPath = testInfo.outputPath('a.spec.js-snapshots/snapshot.txt');
+      if (updateSnapshots === 'all')
+        expect(result.output).toContain(`${snapshotOutputPath} is not the same, writing actual.`);
+      if (updateSnapshots === 'changed')
+        expect(result.output).toContain(`${snapshotOutputPath} does not match, writing actual.`);
+      const data = fs.readFileSync(snapshotOutputPath);
+      expect(data.toString()).toBe('Hello world updated');
+    } else {
+      expect(result.output).toContain(`toMatchSnapshot`);
+    }
+  });
+}
+
 test('should ignore text snapshot with the ignore-snapshots flag', async ({ runInlineTest }, testInfo) => {
   const EXPECTED_SNAPSHOT = 'Hello world';
   const ACTUAL_SNAPSHOT = 'Hello world updated';
@@ -635,13 +666,14 @@ test('should compare different PNG images', async ({ runInlineTest }, testInfo)
 
   const outputText = result.output;
   expect(result.exitCode).toBe(1);
-  expect(outputText).toContain('Screenshot comparison failed:');
+  expect(outputText).toContain('Error: expect(Buffer).toMatchSnapshot(expected)');
+  expect(outputText).toContain('1 pixels (ratio 1.00 of all image pixels) are different.');
   const expectedSnapshotArtifactPath = testInfo.outputPath('test-results', 'a-is-a-test', 'snapshot-expected.png');
   const actualSnapshotArtifactPath = testInfo.outputPath('test-results', 'a-is-a-test', 'snapshot-actual.png');
   const diffSnapshotArtifactPath = testInfo.outputPath('test-results', 'a-is-a-test', 'snapshot-diff.png');
   expect(outputText).toMatch(/Expected:.*a\.spec\.js-snapshots.snapshot\.png/);
-  expect(outputText).toContain(`Received: ${actualSnapshotArtifactPath}`);
-  expect(outputText).toContain(`Diff: ${diffSnapshotArtifactPath}`);
+  expect(outputText).toContain(`Received: test-results${path.sep}a-is-a-test${path.sep}snapshot-actual.png`);
+  expect(outputText).toContain(`Diff:     test-results${path.sep}a-is-a-test${path.sep}snapshot-diff.png`);
   expect(fs.existsSync(expectedSnapshotArtifactPath)).toBe(true);
   expect(fs.existsSync(actualSnapshotArtifactPath)).toBe(true);
   expect(fs.existsSync(diffSnapshotArtifactPath)).toBe(true);
@@ -1138,3 +1170,25 @@ test('should throw if a Promise was passed to toMatchSnapshot', async ({ runInli
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
 });
+
+
+test('should respect update snapshot option from config', async ({ runInlineTest }, testInfo) => {
+  const EXPECTED_SNAPSHOT = 'Hello world';
+  const ACTUAL_SNAPSHOT = 'Hello world updated';
+  const result = await runInlineTest({
+    ...files,
+    'a.spec.js-snapshots/snapshot.txt': EXPECTED_SNAPSHOT,
+    'a.spec.js': `
+      const { test, expect } = require('./helper');
+      test('is a test', ({}) => {
+        expect('${ACTUAL_SNAPSHOT}').toMatchSnapshot('snapshot.txt');
+      });
+    `
+  }, { 'update-snapshots': true });
+
+  expect(result.exitCode).toBe(0);
+  const snapshotOutputPath = testInfo.outputPath('a.spec.js-snapshots/snapshot.txt');
+  expect(result.output).toContain(`${snapshotOutputPath} does not match, writing actual.`);
+  const data = fs.readFileSync(snapshotOutputPath);
+  expect(data.toString()).toBe(ACTUAL_SNAPSHOT);
+});
diff --git a/tests/playwright-test/hooks.spec.ts b/tests/playwright-test/hooks.spec.ts
index d72cd7abb1431..60a8700b82740 100644
--- a/tests/playwright-test/hooks.spec.ts
+++ b/tests/playwright-test/hooks.spec.ts
@@ -625,7 +625,31 @@ test('uncaught error in beforeEach should not be masked by another error', async
   expect(result.output).toContain('Received: 1');
 });
 
-test('should report error from fixture teardown when beforeAll times out', async ({ runInlineTest }) => {
+test('should report error from worker fixture teardown when beforeAll times out', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.js': `
+      import { test as base, expect } from '@playwright/test';
+      const test = base.extend({
+        foo: [async ({}, use) => {
+          let cb;
+          await use(new Promise((f, r) => cb = r));
+          cb(new Error('Oh my!'));
+        }, { scope: 'worker' }],
+      });
+      test.beforeAll(async ({ foo }, testInfo) => {
+        await foo;
+      });
+      test('passing', () => {
+      });
+    `,
+  }, { timeout: 1000 });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.output).toContain('"beforeAll" hook timeout of 1000ms exceeded.');
+  expect(result.output).toContain('Error: Oh my!');
+});
+
+test('should not report error from test fixture teardown when beforeAll times out', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'a.test.js': `
       import { test as base, expect } from '@playwright/test';
@@ -646,7 +670,7 @@ test('should report error from fixture teardown when beforeAll times out', async
   expect(result.exitCode).toBe(1);
   expect(result.failed).toBe(1);
   expect(result.output).toContain('"beforeAll" hook timeout of 1000ms exceeded.');
-  expect(result.output).toContain('Error: Oh my!');
+  expect(result.output).not.toContain('Error: Oh my!');
 });
 
 test('should not hang and report results when worker process suddenly exits during afterAll', async ({ runInlineTest }) => {
diff --git a/tests/playwright-test/list-files.spec.ts b/tests/playwright-test/list-files.spec.ts
deleted file mode 100644
index 80df3a0e5baa1..0000000000000
--- a/tests/playwright-test/list-files.spec.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright Microsoft Corporation. All rights reserved.
- *
- * 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 './playwright-test-fixtures';
-
-test('should list files', async ({ runCLICommand }) => {
-  const result = await runCLICommand({
-    'playwright.config.ts': `
-      module.exports = { projects: [{ name: 'foo' }, { name: 'bar' }] };
-    `,
-    'a.test.js': ``
-  }, 'list-files');
-  expect(result.exitCode).toBe(0);
-
-  const data = JSON.parse(result.stdout);
-  expect(data).toEqual({
-    projects: [
-      {
-        name: 'foo',
-        testDir: expect.stringContaining('list-files-should-list-files-playwright-test'),
-        use: {},
-        files: [
-          expect.stringContaining('a.test.js')
-        ]
-      },
-      {
-        name: 'bar',
-        testDir: expect.stringContaining('list-files-should-list-files-playwright-test'),
-        use: {},
-        files: [
-          expect.stringContaining('a.test.js')
-        ]
-      }
-    ]
-  });
-});
-
-test('should include testIdAttribute', async ({ runCLICommand }) => {
-  const result = await runCLICommand({
-    'playwright.config.ts': `
-      module.exports = {
-        use: { testIdAttribute: 'myid' }
-      };
-    `,
-    'a.test.js': ``
-  }, 'list-files');
-  expect(result.exitCode).toBe(0);
-
-  const data = JSON.parse(result.stdout);
-  expect(data).toEqual({
-    projects: [
-      {
-        name: '',
-        testDir: expect.stringContaining('list-files-should-include-testIdAttribute-playwright-test'),
-        use: {
-          testIdAttribute: 'myid'
-        },
-        files: [
-          expect.stringContaining('a.test.js')
-        ]
-      },
-    ]
-  });
-});
-
-test('should report error', async ({ runCLICommand }) => {
-  const result = await runCLICommand({
-    'playwright.config.ts': `
-      const a = 1;
-      a = 2;
-    `,
-    'a.test.js': ``
-  }, 'list-files');
-  expect(result.exitCode).toBe(0);
-
-  const data = JSON.parse(result.stdout);
-  expect(data).toEqual({
-    error: {
-      location: {
-        file: expect.stringContaining('playwright.config.ts'),
-        line: 3,
-        column: 8,
-      },
-      message: 'TypeError: Assignment to constant variable.',
-      stack: expect.stringContaining('TypeError: Assignment to constant variable.'),
-    }
-  });
-});
diff --git a/tests/playwright-test/loader.spec.ts b/tests/playwright-test/loader.spec.ts
index 491fa3d2bfd60..4372b252458d7 100644
--- a/tests/playwright-test/loader.spec.ts
+++ b/tests/playwright-test/loader.spec.ts
@@ -961,10 +961,11 @@ test('should complain when one test file imports another', async ({ runInlineTes
   expect(result.output).toContain(`test file "a.test.ts" should not import test file "b.test.ts"`);
 });
 
-test('should support dynamic imports of js, ts from js, ts and cjs', async ({ runInlineTest }) => {
+test('should support dynamic imports and requires of js, ts from js, ts and cjs', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'helper.ts': `
-      module.exports.foo = 'foo';
+      const foo: string = 'foo';
+      module.exports.foo = foo;
     `,
     'helper2.ts': `
       module.exports.bar = 'bar';
@@ -972,6 +973,10 @@ test('should support dynamic imports of js, ts from js, ts and cjs', async ({ ru
     'helper3.js': `
       module.exports.baz = 'baz';
     `,
+    'helper4.ts': `
+      const foo: string = 'foo';
+      module.exports.foo = foo;
+    `,
     'passthrough.cjs': `
       module.exports.load = () => import('./helper2');
     `,
@@ -1006,8 +1011,16 @@ test('should support dynamic imports of js, ts from js, ts and cjs', async ({ ru
         expect(foo).toBe('foo');
       });
     `,
+    'd.test.js': `
+      import { test, expect } from '@playwright/test';
+
+      test('pass', async () => {
+        const { foo } = require('./helper4');
+        expect(foo).toBe('foo');
+      });
+    `,
   }, { workers: 1 });
-  expect(result.passed).toBe(3);
+  expect(result.passed).toBe(4);
   expect(result.exitCode).toBe(0);
 });
 
@@ -1071,3 +1084,80 @@ test('should remove import css', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
 });
+
+test('should dynamically import re-exported cjs namespace', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35812' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'node_modules/helper/package.json': `
+      {
+        "type": "module",
+        "main": "./index.cjs",
+        "exports": {
+          ".": {
+            "import": "./index.js",
+            "require": "./index.cjs",
+            "default": "./index.js"
+          }
+        }
+      }
+    `,
+    'node_modules/helper/index.js': `
+      import * as mod from './index.cjs'
+      const { $ } = mod;
+      export { $ };
+    `,
+    'node_modules/helper/modules.cjs': `
+      "use strict";
+
+      function __toCommonJS(props) {
+        const result = {};
+        Object.defineProperty(result, '__esModule', { value: true });
+        for (const prop of Object.getOwnPropertyNames(props))
+          Object.defineProperty(result, prop, { enumerable: true, get: props[prop] });
+        return result;
+      }
+
+      function __reExport(to, from) {
+        for (const prop of Object.getOwnPropertyNames(from)) {
+          if (prop !== 'default' && !to.hasOwnProperty(prop))
+            Object.defineProperty(to, prop, { get: () => from[prop], enumerable: true });
+        }
+      }
+
+      module.exports = { __toCommonJS, __reExport };
+    `,
+    'node_modules/helper/index.cjs': `
+      "use strict";
+      const { __toCommonJS, __reExport } = require('./modules.cjs');
+
+      module.exports = __toCommonJS({});
+      __reExport(module.exports, require('./inner.cjs'));
+
+      // Annotate the CommonJS export names for ESM import in node:
+      0 && (module.exports = { ...require('./inner.cjs') });
+    `,
+    'node_modules/helper/inner.cjs': `
+      "use strict";
+      const { __toCommonJS, __reExport } = require('./modules.cjs');
+
+      const $ = '$ value';
+      module.exports = __toCommonJS({ $: () => $ });
+
+      // Annotate the CommonJS export names for ESM import in node:
+      0 && (module.exports = { $ });
+    `,
+    'package.json': `
+      { "type": "commonjs" }
+    `,
+    'a.test.js': `
+      const { test, expect } = require('@playwright/test');
+      test('pass', async () => {
+        const $ = (await import('helper')).$;
+        expect($).toBe('$ value');
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
diff --git a/tests/playwright-test/max-failures.spec.ts b/tests/playwright-test/max-failures.spec.ts
index c3bf4af834bfa..fed320b8267f4 100644
--- a/tests/playwright-test/max-failures.spec.ts
+++ b/tests/playwright-test/max-failures.spec.ts
@@ -76,8 +76,8 @@ test('max-failures should work with retries', async ({ runInlineTest }) => {
     `,
   }, { 'max-failures': 2, 'retries': 4 });
   expect(result.exitCode).toBe(1);
-  expect(result.failed).toBe(1);
-  expect(result.output.split('\n').filter(l => l.includes('Received:')).length).toBe(2);
+  expect(result.failed).toBe(2);
+  expect(result.output.split('\n').filter(l => l.includes('Received:')).length).toBe(2 * (4 + 1)); // 2 tests * (4 retries + 1 original)
 });
 
 test('max-failures should stop workers', async ({ runInlineTest }) => {
@@ -181,3 +181,31 @@ test('max-failures should work across phases', async ({ runInlineTest }) => {
   expect(result.output).toContain('running c');
   expect(result.output).not.toContain('running d');
 });
+
+test('max-failures should not consider retries as failures', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        maxFailures: 10,
+        retries: 10,
+      };
+    `,
+    'example.spec.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('I fail 9 times 1', () => {
+        if (test.info().retry < 9)
+          throw new Error('failing intentionally');
+      });
+
+      test('I fail 9 times 2', () => {
+        if (test.info().retry < 9)
+          throw new Error('failing intentionally');
+      });
+    `,
+  }, { workers: 1 });
+  expect(result.exitCode).toBe(0);
+  expect(result.failed).toBe(0);
+  expect(result.flaky).toBe(2);
+  expect(result.passed).toBe(0);
+});
diff --git a/tests/playwright-test/only-changed.spec.ts b/tests/playwright-test/only-changed.spec.ts
index 45b750cbe4cdd..0e02f9f10b621 100644
--- a/tests/playwright-test/only-changed.spec.ts
+++ b/tests/playwright-test/only-changed.spec.ts
@@ -21,11 +21,12 @@ const test = baseTest.extend<{ git(command: string): void }>({
   git: async ({}, use, testInfo) => {
     const baseDir = testInfo.outputPath();
 
-    const git = (command: string) => execSync(`git ${command}`, { cwd: baseDir });
+    const git = (command: string) => execSync(`git ${command}`, { cwd: baseDir, stdio: process.env.PWTEST_DEBUG ? 'inherit' : 'ignore' });
 
     git(`init --initial-branch=main`);
     git(`config --local user.name "Robert Botman"`);
     git(`config --local user.email "botty@mcbotface.com"`);
+    git(`config --local core.autocrlf false`);
 
     await use((command: string) => git(command));
   },
@@ -166,39 +167,13 @@ test('should understand dependency structure', async ({ runInlineTest, git, writ
   expect(result.output).not.toContain('c.spec.ts');
 });
 
-test('should support watch mode', async ({ git, writeFiles, runWatchTest }) => {
-  await writeFiles({
-    'a.spec.ts': `
-    import { test, expect } from '@playwright/test';
-    test('fails', () => { expect(1).toBe(2); });
-  `,
-    'b.spec.ts': `
-    import { test, expect } from '@playwright/test';
-    test('fails', () => { expect(1).toBe(2); });
-  `,
-  });
-
-  git(`add .`);
-  git(`commit -m init`);
-
-  await writeFiles({
-    'b.spec.ts': `
-        import { test, expect } from '@playwright/test';
-        test('fails', () => { expect(1).toBe(3); });
-      `,
-  });
-  git(`commit -a -m update`);
-
-  const testProcess = await runWatchTest({}, { 'only-changed': `HEAD~1` });
-  await testProcess.waitForOutput('Waiting for file changes.');
-  testProcess.clearOutput();
-  testProcess.write('r');
-
-  await testProcess.waitForOutput('b.spec.ts:3:13 › fails');
-  expect(testProcess.output).not.toContain('a.spec');
+test('watch mode is not supported', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({}, { 'only-changed': true });
+  await testProcess.exited;
+  expect(testProcess.output).toContain('--only-changed is not supported in watch mode');
 });
 
-test('should throw nice error message if git doesnt work', async ({ git, runInlineTest }) => {
+test('should throw nice error message if git doesnt work', async ({ runInlineTest, git }) => {
   const result = await runInlineTest({}, { 'only-changed': `this-commit-does-not-exist` });
 
   expect(result.exitCode).toBe(1);
@@ -207,7 +182,7 @@ test('should throw nice error message if git doesnt work', async ({ git, runInli
   expect(result.output, 'contains git command output').toContain('unknown revision or path not in the working tree');
 });
 
-test('should suppport component tests', async ({ runInlineTest, git, writeFiles }) => {
+test('should support component tests', async ({ runInlineTest, git, writeFiles }) => {
   await writeFiles({
     'playwright.config.ts': playwrightCtConfigText,
     'playwright/index.html': `<script type="module" src="./index.ts"></script>`,
@@ -229,7 +204,7 @@ test('should suppport component tests', async ({ runInlineTest, git, writeFiles
 
       test('pass', async ({ mount }) => {
         const component = await mount(<Button></Button>);
-        await expect(component).toHaveText('Button');
+        await expect(component).toHaveText('Button', { timeout: 1000 });
       });
     `,
     'src/button2.test.tsx': `
@@ -238,7 +213,7 @@ test('should suppport component tests', async ({ runInlineTest, git, writeFiles
 
       test('pass', async ({ mount }) => {
         const component = await mount(<Button></Button>);
-        await expect(component).toHaveText('Button');
+        await expect(component).toHaveText('Button', { timeout: 1000 });
       });
     `,
     'src/button3.test.tsx': `
@@ -254,12 +229,11 @@ test('should suppport component tests', async ({ runInlineTest, git, writeFiles
   git(`add .`);
   git(`commit -m "init"`);
 
-  const result = await runInlineTest({}, { 'workers': 1, 'only-changed': true });
+  const result = await runInlineTest({}, { 'only-changed': true });
 
-  expect(result.exitCode).toBe(1);
+  expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(0);
   expect(result.failed).toBe(0);
-  expect(result.output).toContain('No tests found');
 
   const result2 = await runInlineTest({
     'src/button2.test.tsx': `
@@ -268,10 +242,10 @@ test('should suppport component tests', async ({ runInlineTest, git, writeFiles
 
       test('pass', async ({ mount }) => {
         const component = await mount(<Button></Button>);
-        await expect(component).toHaveText('Different Button');
+        await expect(component).toHaveText('Different Button', { timeout: 1000 });
       });
     `
-  }, { 'workers': 1, 'only-changed': true });
+  }, { 'only-changed': true });
 
   expect(result2.exitCode).toBe(1);
   expect(result2.failed).toBe(1);
@@ -286,7 +260,7 @@ test('should suppport component tests', async ({ runInlineTest, git, writeFiles
     'src/contents.ts': `
       export const content = 'Changed Content';
     `
-  }, { 'workers': 1, 'only-changed': true });
+  }, { 'only-changed': true });
 
   expect(result3.exitCode).toBe(1);
   expect(result3.failed).toBe(2);
@@ -364,4 +338,92 @@ test('UI mode is not supported', async ({ runInlineTest }) => {
   const result = await runInlineTest({}, { 'only-changed': true, 'ui': true });
   expect(result.exitCode).toBe(1);
   expect(result.output).toContain('--only-changed is not supported in UI mode');
-});
\ No newline at end of file
+});
+
+test('should run project dependencies of changed tests', {
+  annotation: {
+    type: 'issue',
+    description: 'https://github.com/microsoft/playwright/issues/32070',
+  },
+}, async ({ runInlineTest, git, writeFiles }) => {
+  await writeFiles({
+    'playwright.config.ts': `
+      module.exports = {
+        projects: [
+          { name: 'setup', testMatch: 'setup.spec.ts', },
+          { name: 'main', dependencies: ['setup'] },
+        ],
+      };
+    `,
+    'setup.spec.ts': `
+    import { test, expect } from '@playwright/test';
+
+    test('setup test', async ({ page }) => {
+      console.log('setup test is executed')
+    });
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('fails', () => { expect(1).toBe(2); });
+    `,
+    'b.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('fails', () => { expect(1).toBe(2); });
+    `,
+  });
+
+  git(`add .`);
+  git(`commit -m init`);
+
+  const result = await runInlineTest({
+    'c.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('fails', () => { expect(1).toBe(2); });
+    `
+  }, { 'only-changed': true });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.passed).toBe(1);
+
+  expect(result.output).toContain('setup test is executed');
+});
+
+test('should work with list mode', async ({ runInlineTest, git, writeFiles }) => {
+  await writeFiles({
+    'a.spec.ts': `
+    import { test, expect } from '@playwright/test';
+    test('fails', () => { expect(1).toBe(2); });
+  `,
+  });
+
+  git(`add .`);
+  git(`commit -m init`);
+
+  const result = await runInlineTest({
+    'b.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('fails', () => { expect(1).toBe(2); });
+    `
+  }, { 'only-changed': true, 'list': true });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.output).toContain('b.spec.ts');
+  expect(result.output).not.toContain('a.spec.ts');
+});
+
+test('exits successfully if there are no changes', async ({ runInlineTest, git, writeFiles }) => {
+  await writeFiles({
+    'a.spec.ts': `
+    import { test, expect } from '@playwright/test';
+    test('fails', () => { expect(1).toBe(2); });
+  `,
+  });
+
+  git(`add .`);
+  git(`commit -m init`);
+
+  const result = await runInlineTest({}, { 'only-changed': true });
+
+  expect(result.exitCode).toBe(0);
+});
diff --git a/tests/playwright-test/playwright-test-fixtures.ts b/tests/playwright-test/playwright-test-fixtures.ts
index 86b07d7a8027c..c06019a3b2d69 100644
--- a/tests/playwright-test/playwright-test-fixtures.ts
+++ b/tests/playwright-test/playwright-test-fixtures.ts
@@ -48,7 +48,7 @@ export type RunResult = {
   interrupted: number,
   didNotRun: number,
   report: JSONReport,
-  results: any[],
+  results: JSONReportTestResult[],
 };
 
 type TSCResult = {
@@ -125,6 +125,10 @@ function startPlaywrightTest(childProcess: CommonFixtures['childProcess'], baseD
   );
   if (options.additionalArgs)
     args.push(...options.additionalArgs);
+  return startPlaywrightChildProcess(childProcess, baseDir, args, env, options);
+}
+
+function startPlaywrightChildProcess(childProcess: CommonFixtures['childProcess'], baseDir: string, args: string[], env: NodeJS.ProcessEnv, options: RunOptions): TestChildProcess {
   return childProcess({
     command: ['node', cliEntrypoint, ...args],
     env: cleanEnv(env),
@@ -199,9 +203,9 @@ async function runPlaywrightTest(childProcess: CommonFixtures['childProcess'], b
   };
 }
 
-async function runPlaywrightCLI(childProcess: CommonFixtures['childProcess'], args: string[], baseDir: string, env: NodeJS.ProcessEnv, entryPoint?: string): Promise<{ output: string, stdout: string, stderr: string, exitCode: number }> {
+async function runPlaywrightCLI(childProcess: CommonFixtures['childProcess'], args: string[], baseDir: string, env: NodeJS.ProcessEnv): Promise<{ output: string, stdout: string, stderr: string, exitCode: number }> {
   const testProcess = childProcess({
-    command: ['node', entryPoint || cliEntrypoint, ...args],
+    command: ['node', cliEntrypoint, ...args],
     env: cleanEnv(env),
     cwd: baseDir,
   });
@@ -218,13 +222,16 @@ export function cleanEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
     CI_COMMIT_SHA: undefined,
     CI_JOB_URL: undefined,
     CI_PROJECT_URL: undefined,
+    GITHUB_ACTIONS: undefined,
     GITHUB_REPOSITORY: undefined,
     GITHUB_RUN_ID: undefined,
     GITHUB_SERVER_URL: undefined,
     GITHUB_SHA: undefined,
+    GITHUB_EVENT_PATH: undefined,
     // END: Reserved CI
     PW_TEST_HTML_REPORT_OPEN: undefined,
     PLAYWRIGHT_HTML_OPEN: undefined,
+    PW_TEST_DEBUG_REPORTERS: undefined,
     PW_TEST_REPORTER: undefined,
     PW_TEST_REPORTER_WS_ENDPOINT: undefined,
     PW_TEST_SOURCE_TRANSFORM: undefined,
@@ -245,7 +252,8 @@ type Fixtures = {
   writeFiles: (files: Files) => Promise<string>;
   deleteFile: (file: string) => Promise<void>;
   runInlineTest: (files: Files, params?: Params, env?: NodeJS.ProcessEnv, options?: RunOptions) => Promise<RunResult>;
-  runCLICommand: (files: Files, command: string, args?: string[], entryPoint?: string) => Promise<{ stdout: string, stderr: string, exitCode: number }>;
+  runCLICommand: (files: Files, command: string, args?: string[]) => Promise<{ stdout: string, stderr: string, exitCode: number }>;
+  startCLICommand: (files: Files, command: string, args?: string[], options?: RunOptions) => Promise<TestChildProcess>;
   runWatchTest: (files: Files, params?: Params, env?: NodeJS.ProcessEnv, options?: RunOptions) => Promise<TestChildProcess>;
   interactWithTestRunner: (files: Files, params?: Params, env?: NodeJS.ProcessEnv, options?: RunOptions) => Promise<TestChildProcess>;
   runTSC: (files: Files) => Promise<TSCResult>;
@@ -280,9 +288,18 @@ export const test = base
 
       runCLICommand: async ({ childProcess }, use, testInfo: TestInfo) => {
         const cacheDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-test-cache-'));
-        await use(async (files: Files, command: string, args?: string[], entryPoint?: string) => {
+        await use(async (files: Files, command: string, args?: string[]) => {
+          const baseDir = await writeFiles(testInfo, files, true);
+          return await runPlaywrightCLI(childProcess, [command, ...(args || [])], baseDir, { PWTEST_CACHE_DIR: cacheDir });
+        });
+        await removeFolders([cacheDir]);
+      },
+
+      startCLICommand: async ({ childProcess }, use, testInfo: TestInfo) => {
+        const cacheDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'playwright-test-cache-'));
+        await use(async (files: Files, command: string, args?: string[], options: RunOptions = {}) => {
           const baseDir = await writeFiles(testInfo, files, true);
-          return await runPlaywrightCLI(childProcess, [command, ...(args || [])], baseDir, { PWTEST_CACHE_DIR: cacheDir }, entryPoint);
+          return startPlaywrightChildProcess(childProcess, baseDir, [command, ...(args || [])], { PWTEST_CACHE_DIR: cacheDir }, options);
         });
         await removeFolders([cacheDir]);
       },
diff --git a/tests/playwright-test/playwright.artifacts.spec.ts b/tests/playwright-test/playwright.artifacts.spec.ts
index b666aa4b70e6d..5f19139e469dc 100644
--- a/tests/playwright-test/playwright.artifacts.spec.ts
+++ b/tests/playwright-test/playwright.artifacts.spec.ts
@@ -130,7 +130,7 @@ test('should work with screenshot: on', async ({ runInlineTest }, testInfo) => {
     'playwright.config.ts': `
       module.exports = { use: { screenshot: 'on' } };
     `,
-  }, { workers: 1 });
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -151,10 +151,8 @@ test('should work with screenshot: on', async ({ runInlineTest }, testInfo) => {
     '  test-finished-1.png',
     'artifacts-shared-shared-failing',
     '  test-failed-1.png',
-    '  test-failed-2.png',
     'artifacts-shared-shared-passing',
     '  test-finished-1.png',
-    '  test-finished-2.png',
     'artifacts-two-contexts',
     '  test-finished-1.png',
     '  test-finished-2.png',
@@ -170,7 +168,7 @@ test('should work with screenshot: only-on-failure', async ({ runInlineTest }, t
     'playwright.config.ts': `
       module.exports = { use: { screenshot: 'only-on-failure' } };
     `,
-  }, { workers: 1 });
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -185,13 +183,39 @@ test('should work with screenshot: only-on-failure', async ({ runInlineTest }, t
     '  test-failed-1.png',
     'artifacts-shared-shared-failing',
     '  test-failed-1.png',
-    '  test-failed-2.png',
     'artifacts-two-contexts-failing',
     '  test-failed-1.png',
     '  test-failed-2.png',
   ]);
 });
 
+test('should work with screenshot: on-first-failure', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('fails', async ({ page }) => {
+        await page.setContent('I am the page');
+        expect(1).toBe(2);
+      });
+    `,
+    'playwright.config.ts': `
+      module.exports = {
+        retries: 1,
+        use: { screenshot: 'on-first-failure' }
+      };
+    `,
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.failed).toBe(1);
+  expect(listFiles(testInfo.outputPath('test-results'))).toEqual([
+    '.last-run.json',
+    'a-fails',
+    '  test-failed-1.png',
+  ]);
+});
+
 test('should work with screenshot: only-on-failure & fullPage', async ({ runInlineTest, server }, testInfo) => {
   const result = await runInlineTest({
     'artifacts.spec.ts': `
@@ -206,7 +230,7 @@ test('should work with screenshot: only-on-failure & fullPage', async ({ runInli
     'playwright.config.ts': `
       module.exports = { use: { screenshot: { mode: 'only-on-failure', fullPage: true } } };
     `,
-  }, { workers: 1 });
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(0);
   expect(result.failed).toBe(1);
@@ -221,13 +245,44 @@ test('should work with screenshot: only-on-failure & fullPage', async ({ runInli
   expect.soft(screenshotFailure).toMatchSnapshot('screenshot-grid-fullpage.png');
 });
 
+test('should capture a single screenshot on failure when afterAll fails', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      let page;
+      test.use({ screenshot: 'only-on-failure' });
+      test.beforeAll(async ({ browser }) => {
+        page = await browser.newPage();
+      });
+      test.afterAll(async () => {
+        await page.setContent('this is afterAll');
+        expect(1).toBe(2);
+        await page.close();
+      });
+      test('passes', async () => {
+        await page.setContent('this is test');
+      });
+    `,
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.failed).toBe(1);
+  expect(listFiles(testInfo.outputPath('test-results'))).toEqual([
+    '.last-run.json',
+    'a-passes',
+    '  test-failed-1.png',
+  ]);
+});
+
+
 test('should work with trace: on', async ({ runInlineTest }, testInfo) => {
   const result = await runInlineTest({
     ...testFiles,
     'playwright.config.ts': `
       module.exports = { use: { trace: 'on' } };
     `,
-  }, { workers: 1 });
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -263,7 +318,7 @@ test('should work with trace: retain-on-failure', async ({ runInlineTest }, test
     'playwright.config.ts': `
       module.exports = { use: { trace: 'retain-on-failure' } };
     `,
-  }, { workers: 1 });
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -289,7 +344,7 @@ test('should work with trace: on-first-retry', async ({ runInlineTest }, testInf
     'playwright.config.ts': `
       module.exports = { use: { trace: 'on-first-retry' } };
     `,
-  }, { workers: 1, retries: 1 });
+  }, { workers: 1, retries: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -315,7 +370,7 @@ test('should work with trace: on-all-retries', async ({ runInlineTest }, testInf
     'playwright.config.ts': `
       module.exports = { use: { trace: 'on-all-retries' } };
     `,
-  }, { workers: 1, retries: 2 });
+  }, { workers: 1, retries: 2 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -351,7 +406,7 @@ test('should work with trace: retain-on-first-failure', async ({ runInlineTest }
     'playwright.config.ts': `
       module.exports = { use: { trace: 'retain-on-first-failure' } };
     `,
-  }, { workers: 1, retries: 2 });
+  }, { workers: 1, retries: 2 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.passed).toBe(5);
@@ -387,7 +442,7 @@ test('should take screenshot when page is closed in afterEach', async ({ runInli
         expect(1).toBe(2);
       });
     `,
-  }, { workers: 1 });
+  }, { workers: 1 }, { PLAYWRIGHT_NO_COPY_PROMPT: 'true' });
 
   expect(result.exitCode).toBe(1);
   expect(result.failed).toBe(1);
diff --git a/tests/playwright-test/playwright.config.ts b/tests/playwright-test/playwright.config.ts
index 34d4dc6d9f593..0d94a8197dd6f 100644
--- a/tests/playwright-test/playwright.config.ts
+++ b/tests/playwright-test/playwright.config.ts
@@ -47,6 +47,10 @@ export default defineConfig({
       testDir: path.join(__dirname, '../image_tools'),
       testIgnore: [path.join(__dirname, '../fixtures/**')],
     },
+    {
+      name: 'expect',
+      testDir: path.join(__dirname, '../expect'),
+    },
   ],
   reporter: reporters(),
   metadata: {
diff --git a/tests/playwright-test/playwright.connect.spec.ts b/tests/playwright-test/playwright.connect.spec.ts
index 083a01ac5e87a..0584bd88c48e1 100644
--- a/tests/playwright-test/playwright.connect.spec.ts
+++ b/tests/playwright-test/playwright.connect.spec.ts
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import { test, expect } from './playwright-test-fixtures';
+import { test, expect, countTimes } from './playwright-test-fixtures';
+import { parseTrace } from '../config/utils';
+import fs from 'fs';
 
 test('should work with connectOptions', async ({ runInlineTest }) => {
   const result = await runInlineTest({
@@ -167,3 +169,62 @@ test('should print debug log when failed to connect', async ({ runInlineTest })
   expect(result.output).toContain('b-debug-log-string');
   expect(result.results[0].attachments).toEqual([]);
 });
+
+test('should record trace', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.js': `
+      module.exports = {
+        globalSetup: './global-setup',
+        use: {
+          connectOptions: {
+            wsEndpoint: process.env.CONNECT_WS_ENDPOINT,
+          },
+          trace: 'retain-on-failure',
+        },
+      };
+    `,
+    'global-setup.ts': `
+      import { chromium } from '@playwright/test';
+      module.exports = async () => {
+        const server = await chromium.launchServer();
+        process.env.CONNECT_WS_ENDPOINT = server.wsEndpoint();
+        process.env.DEBUG = 'pw:channel';
+        return () => server.close();
+      };
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({ page }) => {
+        expect(1).toBe(1);
+      });
+      test('fail', async ({ page }) => {
+        expect(1).toBe(2);
+      });
+    `,
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(1);
+  expect(result.failed).toBe(1);
+
+  // A single tracing artifact should be created. We see it in the logs twice:
+  // as a regular message and wrapped inside a jsonPipe.
+  expect(countTimes(result.output, `"type":"Artifact","initializer"`)).toBe(2);
+
+  expect(fs.existsSync(test.info().outputPath('test-results', 'a-pass', 'trace.zip'))).toBe(false);
+
+  const trace = await parseTrace(test.info().outputPath('test-results', 'a-fail', 'trace.zip'));
+  expect(trace.titles).toEqual([
+    'Before Hooks',
+    'Fixture "context"',
+    'Create context',
+    'Fixture "page"',
+    'Create page',
+    'Expect "toBe"',
+    'After Hooks',
+    'Fixture "page"',
+    'Fixture "context"',
+    'Close context',
+    'Worker Cleanup',
+    'Fixture "browser"',
+  ]);
+});
diff --git a/tests/playwright-test/playwright.ct-build.spec.ts b/tests/playwright-test/playwright.ct-build.spec.ts
index a2a021b6424f9..14b6014199cf7 100644
--- a/tests/playwright-test/playwright.ct-build.spec.ts
+++ b/tests/playwright-test/playwright.ct-build.spec.ts
@@ -196,31 +196,24 @@ test('should extract component list', async ({ runInlineTest }, testInfo) => {
 
   expect(Object.entries(metainfo.deps)).toEqual([
     [expect.stringContaining('clashingNames1.tsx'), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining('clashingNames1.tsx'),
     ]],
     [expect.stringContaining('clashingNames2.tsx'), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining('clashingNames2.tsx'),
     ]],
     [expect.stringContaining('defaultExport.tsx'), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining('defaultExport.tsx'),
     ]],
     [expect.stringContaining('components.tsx'), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining('components.tsx'),
     ]],
     [expect.stringContaining('button.tsx'), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining('button.tsx'),
     ]],
     [expect.stringContaining(`one${path.sep}index.tsx`), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining(`one${path.sep}index.tsx`),
     ]],
     [expect.stringContaining(`two${path.sep}index.tsx`), [
-      expect.stringContaining('jsx-runtime.js'),
       expect.stringContaining(`two${path.sep}index.tsx`),
     ]],
   ]);
@@ -503,7 +496,6 @@ test('should retain deps when test changes', async ({ runInlineTest }, testInfo)
     [
       expect.stringContaining('button.tsx'),
       [
-        expect.stringContaining('jsx-runtime.js'),
         expect.stringContaining('button.tsx'),
       ],
     ]
diff --git a/tests/playwright-test/playwright.ct-dev-server.spec.ts b/tests/playwright-test/playwright.ct-dev-server.spec.ts
new file mode 100644
index 0000000000000..91edc93740f6f
--- /dev/null
+++ b/tests/playwright-test/playwright.ct-dev-server.spec.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { test, expect, playwrightCtConfigText } from './playwright-test-fixtures';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('should run dev-server and use it for tests', async ({ writeFiles, runInlineTest, startCLICommand }) => {
+  await writeFiles({
+    'playwright.config.ts': playwrightCtConfigText,
+    'playwright/index.html': `<script type="module" src="./index.ts"></script>`,
+    'playwright/index.ts': ``,
+    'src/button.tsx': `
+      export const Button = () => <button>Button</button>;
+    `,
+    'src/button.test.tsx': `
+      import { test, expect } from '@playwright/experimental-ct-react';
+      import { Button } from './button';
+
+      test('pass', async ({ mount }) => {
+        const component = await mount(<Button></Button>);
+        await expect(component).toHaveText('Button', { timeout: 1 });
+      });
+    `,
+  });
+
+  const devServerProcess = await startCLICommand({}, 'dev-server');
+  await devServerProcess.waitForOutput('Dev Server listening on');
+
+  const result = await runInlineTest({}, { workers: 1 });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+  expect(result.output).toContain('Dev Server is already running at');
+
+  await devServerProcess.kill();
+});
diff --git a/tests/playwright-test/playwright.ct-react.spec.ts b/tests/playwright-test/playwright.ct-react.spec.ts
index ed3fa47cafb5b..a5a545347d98a 100644
--- a/tests/playwright-test/playwright.ct-react.spec.ts
+++ b/tests/playwright-test/playwright.ct-react.spec.ts
@@ -596,3 +596,30 @@ test('should allow import from shared file', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
 });
+
+test('should throw test error when template index.html is not provided', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      import { defineConfig } from '@playwright/experimental-ct-react';
+      export default defineConfig({});
+    `,
+    'src/component.jsx': `
+      export const Component = () => <></>;
+    `,
+
+    'src/component.test.jsx': `
+      import { test, expect } from '@playwright/experimental-ct-react';
+      import { Component } from './component';
+
+      test('pass component', async ({ page, mount }) => {
+        const component = await mount(<Component />);
+        await expect(page).toHaveURL('http://127.0.0.1:8080/');
+      });
+    `,
+  }, { workers: 1 });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.output).toContain('Component testing template file playwright/index.html is missing and there is no existing Vite server. Component tests will fail.');
+  expect(result.results[0].error.message).toBe('Error: Component testing could not determine the base URL of your component under test. Ensure you have supplied a template playwright/index.html or have set the PLAYWRIGHT_TEST_BASE_URL environment variable.');
+});
diff --git a/tests/playwright-test/playwright.reuse.browser.spec.ts b/tests/playwright-test/playwright.reuse.browser.spec.ts
index bccce95b3eac7..d172658b9423f 100644
--- a/tests/playwright-test/playwright.reuse.browser.spec.ts
+++ b/tests/playwright-test/playwright.reuse.browser.spec.ts
@@ -105,10 +105,10 @@ test('should produce correct test steps', async ({ runInlineTest, runServer }) =
     'reporter.ts': `
       class Reporter {
         onStepBegin(test, result, step) {
-          console.log('%% onStepBegin ' + step.title);
+          console.log('%% onStepBegin [' + step.category + '] ' + step.title);
         }
         onStepEnd(test, result, step) {
-            console.log('%% onStepEnd ' + step.title);
+            console.log('%% onStepEnd [' + step.category + '] ' + step.title);
         }
       }
       module.exports = Reporter;
@@ -125,27 +125,27 @@ test('should produce correct test steps', async ({ runInlineTest, runServer }) =
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
   expect(result.outputLines).toEqual([
-    'onStepBegin Before Hooks',
-    'onStepBegin fixture: browser',
-    'onStepBegin browserType.connect',
-    'onStepEnd browserType.connect',
-    'onStepEnd fixture: browser',
-    'onStepBegin fixture: context',
-    'onStepEnd fixture: context',
-    'onStepBegin fixture: page',
-    'onStepBegin browserContext.newPage',
-    'onStepEnd browserContext.newPage',
-    'onStepEnd fixture: page',
-    'onStepEnd Before Hooks',
-    'onStepBegin page.goto(about:blank)',
-    'onStepEnd page.goto(about:blank)',
-    'onStepBegin page.evaluate',
-    'onStepEnd page.evaluate',
-    'onStepBegin After Hooks',
-    'onStepBegin fixture: page',
-    'onStepEnd fixture: page',
-    'onStepBegin fixture: context',
-    'onStepEnd fixture: context',
-    'onStepEnd After Hooks'
+    'onStepBegin [hook] Before Hooks',
+    'onStepBegin [fixture] Fixture "browser"',
+    'onStepBegin [pw:api] connect',
+    'onStepEnd [pw:api] connect',
+    'onStepEnd [fixture] Fixture "browser"',
+    'onStepBegin [fixture] Fixture "context"',
+    'onStepEnd [fixture] Fixture "context"',
+    'onStepBegin [fixture] Fixture "page"',
+    'onStepBegin [pw:api] Create page',
+    'onStepEnd [pw:api] Create page',
+    'onStepEnd [fixture] Fixture "page"',
+    'onStepEnd [hook] Before Hooks',
+    'onStepBegin [pw:api] Navigate to "about:blank"',
+    'onStepEnd [pw:api] Navigate to "about:blank"',
+    'onStepBegin [pw:api] Evaluate',
+    'onStepEnd [pw:api] Evaluate',
+    'onStepBegin [hook] After Hooks',
+    'onStepBegin [fixture] Fixture "page"',
+    'onStepEnd [fixture] Fixture "page"',
+    'onStepBegin [fixture] Fixture "context"',
+    'onStepEnd [fixture] Fixture "context"',
+    'onStepEnd [hook] After Hooks'
   ]);
-});
\ No newline at end of file
+});
diff --git a/tests/playwright-test/playwright.reuse.spec.ts b/tests/playwright-test/playwright.reuse.spec.ts
index 0620195f65c7f..6f863fd717fe5 100644
--- a/tests/playwright-test/playwright.reuse.spec.ts
+++ b/tests/playwright-test/playwright.reuse.spec.ts
@@ -96,6 +96,14 @@ test('should reuse context with trace if mode=when-possible', async ({ runInline
       import { test, expect } from '@playwright/test';
       let lastContextGuid;
 
+      test.beforeAll(async () => {
+        console.log('fromBeforeAll');
+      });
+
+      test.afterAll(async () => {
+        console.log('fromAfterAll');
+      });
+
       test('one', async ({ context, page }) => {
         lastContextGuid = context._guid;
         await page.setContent('<button>Click</button>');
@@ -113,20 +121,23 @@ test('should reuse context with trace if mode=when-possible', async ({ runInline
 
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(2);
+  expect(result.output).toContain('fromBeforeAll');
+  expect(result.output).toContain('fromAfterAll');
 
   const trace1 = await parseTrace(testInfo.outputPath('test-results', 'reuse-one', 'trace.zip'));
   expect(trace1.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: browser',
-    '    browserType.launch',
-    '  fixture: context',
-    '  fixture: page',
-    '    browserContext.newPage',
-    'page.setContent',
-    'page.click',
+    '  beforeAll hook',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '  Fixture "page"',
+    '    Create page',
+    'Set content',
+    'Click',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
+    '  Fixture "page"',
+    '  Fixture "context"',
   ]);
   expect(trace1.traceModel.storage().snapshotsForTest().length).toBeGreaterThan(0);
   expect(fs.existsSync(testInfo.outputPath('test-results', 'reuse-one', 'trace-1.zip'))).toBe(false);
@@ -134,15 +145,16 @@ test('should reuse context with trace if mode=when-possible', async ({ runInline
   const trace2 = await parseTrace(testInfo.outputPath('test-results', 'reuse-two', 'trace.zip'));
   expect(trace2.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: context',
-    '  fixture: page',
-    'expect.toBe',
-    'page.setContent',
-    'page.fill',
-    'locator.click',
+    '  Fixture "context"',
+    '  Fixture "page"',
+    'Expect "toBe"',
+    'Set content',
+    'Fill "value"',
+    'Click',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '  afterAll hook',
   ]);
   expect(trace2.traceModel.storage().snapshotsForTest().length).toBeGreaterThan(0);
 });
@@ -466,17 +478,17 @@ test('should reset tracing', async ({ runInlineTest }, testInfo) => {
   expect(result.passed).toBe(2);
 
   const trace1 = await parseTrace(traceFile1);
-  expect(trace1.apiNames).toEqual([
-    'page.setContent',
-    'page.click',
+  expect(trace1.titles).toEqual([
+    'Set content',
+    'Click',
   ]);
   expect(trace1.traceModel.storage().snapshotsForTest().length).toBeGreaterThan(0);
 
   const trace2 = await parseTrace(traceFile2);
-  expect(trace2.apiNames).toEqual([
-    'page.setContent',
-    'page.fill',
-    'locator.click',
+  expect(trace2.titles).toEqual([
+    'Set content',
+    'Fill "value"',
+    'Click',
   ]);
   expect(trace1.traceModel.storage().snapshotsForTest().length).toBeGreaterThan(0);
 });
diff --git a/tests/playwright-test/playwright.spec.ts b/tests/playwright-test/playwright.spec.ts
index faaa069950c29..c00cb3587af0e 100644
--- a/tests/playwright-test/playwright.spec.ts
+++ b/tests/playwright-test/playwright.spec.ts
@@ -510,18 +510,19 @@ test('should work with video: on-first-retry', async ({ runInlineTest }) => {
   expect(fs.existsSync(dirPass)).toBeFalsy();
 
   const dirFail = test.info().outputPath('test-results', 'a-fail-chromium');
-  expect(fs.existsSync(dirFail)).toBeFalsy();
+  expect(fs.readdirSync(dirFail)).toEqual(['error-context.md']);
 
   const dirRetry = test.info().outputPath('test-results', 'a-fail-chromium-retry1');
   const videoFailRetry = fs.readdirSync(dirRetry).find(file => file.endsWith('webm'));
   expect(videoFailRetry).toBeTruthy();
 
-  expect(result.report.suites[0].specs[1].tests[0].results[0].attachments).toEqual([]);
+  const errorPrompt = expect.objectContaining({ name: 'error-context' });
+  expect(result.report.suites[0].specs[1].tests[0].results[0].attachments).toEqual([errorPrompt]);
   expect(result.report.suites[0].specs[1].tests[0].results[1].attachments).toEqual([{
     name: 'video',
     contentType: 'video/webm',
     path: path.join(dirRetry, videoFailRetry!),
-  }]);
+  }, errorPrompt]);
 });
 
 test('should work with video size', async ({ runInlineTest }) => {
@@ -759,15 +760,15 @@ test('should use actionTimeout for APIRequestContext', async ({ runInlineTest, s
     'a.test.ts': `
       import { test, expect } from '@playwright/test';
       test('default APIRequestContext fixture', async ({ request }) => {
-        await expect(request.get('/stall')).rejects.toThrow('apiRequestContext.get: Request timed out after 1111ms');
+        await expect(request.get('/stall')).rejects.toThrow('apiRequestContext.get: Timeout 1111ms exceeded');
       });
       test('newly created APIRequestContext without options', async ({ playwright }) => {
         const apiRequestContext = await playwright.request.newContext();
-        await expect(apiRequestContext.get('/stall')).rejects.toThrow('apiRequestContext.get: Request timed out after 1111ms');
+        await expect(apiRequestContext.get('/stall')).rejects.toThrow('apiRequestContext.get: Timeout 1111ms exceeded');
       });
       test('newly created APIRequestContext with options', async ({ playwright }) => {
         const apiRequestContextWithOptions = await playwright.request.newContext({ httpCredentials: { username: 'user', password: 'pass' } });
-        await expect(apiRequestContextWithOptions.get('/stall')).rejects.toThrow('apiRequestContext.get: Request timed out after 1111ms');
+        await expect(apiRequestContextWithOptions.get('/stall')).rejects.toThrow('apiRequestContext.get: Timeout 1111ms exceeded');
       });
     `,
   }, { workers: 1 });
@@ -872,3 +873,93 @@ test('should allow dynamic import in evaluate', async ({ runInlineTest, server }
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
 });
+
+test('page.pause() should disable test timeout', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test', async ({ page }) => {
+        test.setTimeout(2000);
+
+        await Promise.race([
+          page.pause(),
+          new Promise(f => setTimeout(f, 3000)),
+        ]);
+
+        console.log('success!');
+      });
+    `,
+  }, { headed: true });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+  expect(result.output).toContain('success!');
+});
+
+test('window.playwright should be undefined by default', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test', async ({ page }) => {
+        await page.setContent('<body></body>');
+        expect(await page.evaluate(() => window.playwright)).toBeUndefined();
+      });
+    `,
+  }, {}, {});
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('window.playwright should not override existing property', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test', async ({ page }) => {
+        await page.setContent('<script>window.playwright = "foo"</script>');
+        expect(await page.evaluate(() => window.playwright)).toBe('foo');
+      });
+    `,
+  }, {}, { PWDEBUG: 'console' });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('PWDEBUG=console should opt-in to exposing window.playwright', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test', async ({ page }) => {
+        await page.setContent('<body></body>');
+        expect(await page.evaluate(() => window.playwright)).toBeDefined();
+      });
+    `,
+  }, {}, { PWDEBUG: 'console' });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('init script should not observe playwright internals', async ({ server, runInlineTest }) => {
+  test.skip(!!process.env.PW_CLOCK, 'clock installs globalThis.__pwClock');
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+
+      test('test', async ({ page }) => {
+        await page.addInitScript(() => {
+          window['check'] = () => {
+            const keys = Reflect.ownKeys(globalThis).map(k => k.toString());
+            return keys.find(name => name.includes('playwright') || name.includes('_pw')) || 'none';
+          };
+          window['found'] = window['check']();
+        });
+        await page.goto("${server.EMPTY_PAGE}");
+        expect(await page.evaluate(() => window['found'])).toBe('none');
+        expect(await page.evaluate(() => window['check']())).toBe('none');
+      });
+    `,
+  }, {}, { PWDEBUG: '0' });
+  expect(result.exitCode).toBe(0);
+});
diff --git a/tests/playwright-test/playwright.trace.spec.ts b/tests/playwright-test/playwright.trace.spec.ts
index 9a692245f04e0..ee46887e19103 100644
--- a/tests/playwright-test/playwright.trace.spec.ts
+++ b/tests/playwright-test/playwright.trace.spec.ts
@@ -89,48 +89,48 @@ test('should record api trace', async ({ runInlineTest, server }, testInfo) => {
   const trace1 = await parseTrace(testInfo.outputPath('test-results', 'a-pass', 'trace.zip'));
   expect(trace1.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: request',
-    '    apiRequest.newContext',
-    '  fixture: browser',
-    '    browserType.launch',
-    '  fixture: context',
-    '    browser.newContext',
-    '  fixture: page',
-    '    browserContext.newPage',
-    'page.goto',
-    'apiRequestContext.get',
+    '  Fixture "request"',
+    '    Create request context',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Navigate to "about:blank"',
+    'GET "/empty.html"',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
-    '  fixture: request',
-    '    apiRequestContext.dispose',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
+    '  Fixture "request"',
   ]);
   const trace2 = await parseTrace(testInfo.outputPath('test-results', 'a-api-pass', 'trace.zip'));
   expect(trace2.actionTree).toEqual([
     'Before Hooks',
-    'apiRequest.newContext',
-    'apiRequestContext.get',
+    'Create request context',
+    'GET "/empty.html"',
     'After Hooks',
   ]);
   const trace3 = await parseTrace(testInfo.outputPath('test-results', 'a-fail', 'trace.zip'));
   expect(trace3.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: request',
-    '    apiRequest.newContext',
-    '  fixture: context',
-    '    browser.newContext',
-    '  fixture: page',
-    '    browserContext.newPage',
-    'page.goto',
-    'apiRequestContext.get',
-    'expect.toBe',
+    '  Fixture "request"',
+    '    Create request context',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Navigate to "about:blank"',
+    'GET "/empty.html"',
+    'Expect "toBe"',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
-    '  fixture: request',
-    '    apiRequestContext.dispose',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
+    '  Fixture "request"',
     'Worker Cleanup',
-    '  fixture: browser',
+    '  Fixture "browser"',
   ]);
 });
 
@@ -317,24 +317,24 @@ test('should not override trace file in afterAll', async ({ runInlineTest, serve
 
   expect(trace1.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: browser',
-    '    browserType.launch',
-    '  fixture: context',
-    '    browser.newContext',
-    '  fixture: page',
-    '    browserContext.newPage',
-    'page.goto',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Navigate to "about:blank"',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
     '  afterAll hook',
-    '    fixture: request',
-    '      apiRequest.newContext',
-    '    apiRequestContext.get',
-    '    fixture: request',
-    '      apiRequestContext.dispose',
+    '    Fixture "request"',
+    '      Create request context',
+    '    GET "/empty.html"',
+    '    Fixture "request"',
     'Worker Cleanup',
-    '  fixture: browser',
+    '  Fixture "browser"',
   ]);
   expect(trace1.errors).toEqual([`'oh no!'`]);
 
@@ -385,24 +385,6 @@ test('should respect --trace', async ({ runInlineTest }, testInfo) => {
   expect(fs.existsSync(testInfo.outputPath('test-results', 'a-test-1', 'trace.zip'))).toBeTruthy();
 });
 
-test('should respect PW_TEST_DISABLE_TRACING', async ({ runInlineTest }, testInfo) => {
-  const result = await runInlineTest({
-    'playwright.config.ts': `
-      export default { use: { trace: 'on' } };
-    `,
-    'a.spec.ts': `
-      import { test, expect } from '@playwright/test';
-      test('test 1', async ({ page }) => {
-        await page.goto('about:blank');
-      });
-    `,
-  }, {}, { PW_TEST_DISABLE_TRACING: '1' });
-
-  expect(result.exitCode).toBe(0);
-  expect(result.passed).toBe(1);
-  expect(fs.existsSync(testInfo.outputPath('test-results', 'a-test-1', 'trace.zip'))).toBe(false);
-});
-
 for (const mode of ['off', 'retain-on-failure', 'on-first-retry', 'on-all-retries', 'retain-on-first-failure']) {
   test(`trace:${mode} should not create trace zip artifact if page test passed`, async ({ runInlineTest }) => {
     const result = await runInlineTest({
@@ -467,7 +449,7 @@ test(`trace:retain-on-failure should create trace if context is closed before fa
   }, { trace: 'retain-on-failure' });
   const tracePath = test.info().outputPath('test-results', 'a-passing-test', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('page.goto');
+  expect(trace.titles).toContain('Navigate to "about:blank"');
   expect(result.failed).toBe(1);
 });
 
@@ -489,7 +471,7 @@ test(`trace:retain-on-failure should create trace if context is closed before fa
   }, { trace: 'retain-on-failure' });
   const tracePath = test.info().outputPath('test-results', 'a-passing-test', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('page.goto');
+  expect(trace.titles).toContain('Navigate to "about:blank"');
   expect(result.failed).toBe(1);
 });
 
@@ -509,7 +491,7 @@ test(`trace:retain-on-failure should create trace if request context is disposed
   }, { trace: 'retain-on-failure' });
   const tracePath = test.info().outputPath('test-results', 'a-passing-test', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('apiRequestContext.get');
+  expect(trace.titles).toContain('GET "/empty.html"');
   expect(result.failed).toBe(1);
 });
 
@@ -530,9 +512,9 @@ test('should include attachments by default', async ({ runInlineTest, server },
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
   const trace = await parseTrace(testInfo.outputPath('test-results', 'a-pass', 'trace.zip'));
-  expect(trace.apiNames).toEqual([
+  expect(trace.titles).toEqual([
     'Before Hooks',
-    `attach "foo"`,
+    'Attach "foo"',
     'After Hooks',
   ]);
   expect(trace.actions[1].attachments).toEqual([{
@@ -540,7 +522,7 @@ test('should include attachments by default', async ({ runInlineTest, server },
     contentType: 'text/plain',
     sha1: expect.any(String),
   }]);
-  expect([...trace.resources.keys()].filter(f => f.startsWith('resources/'))).toHaveLength(1);
+  expect([...trace.resources.keys()]).toContain(`resources/${trace.actions[1].attachments[0].sha1}`);
 });
 
 test('should opt out of attachments', async ({ runInlineTest, server }, testInfo) => {
@@ -560,13 +542,13 @@ test('should opt out of attachments', async ({ runInlineTest, server }, testInfo
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
   const trace = await parseTrace(testInfo.outputPath('test-results', 'a-pass', 'trace.zip'));
-  expect(trace.apiNames).toEqual([
+  expect(trace.titles).toEqual([
     'Before Hooks',
-    `attach "foo"`,
+    `Attach "foo"`,
     'After Hooks',
   ]);
   expect(trace.actions[1].attachments).toEqual(undefined);
-  expect([...trace.resources.keys()].filter(f => f.startsWith('resources/'))).toHaveLength(0);
+  expect([...trace.resources.keys()].filter(f => f.startsWith('resources/') && !f.startsWith('resources/src@'))).toHaveLength(0);
 });
 
 test('should record with custom page fixture', async ({ runInlineTest }, testInfo) => {
@@ -620,22 +602,23 @@ test('should expand expect.toPass', async ({ runInlineTest }, testInfo) => {
   const trace = await parseTrace(testInfo.outputPath('test-results', 'a-pass', 'trace.zip'));
   expect(trace.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: browser',
-    '    browserType.launch',
-    '  fixture: context',
-    '    browser.newContext',
-    '  fixture: page',
-    '    browserContext.newPage',
-    'expect.toPass',
-    '  page.goto',
-    '  expect.toBe',
-    '  page.goto',
-    '  expect.toBe',
-    '  page.goto',
-    '  expect.toBe',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Expect "toPass"',
+    '  Navigate to "data:"',
+    '  Expect "toBe"',
+    '  Navigate to "data:"',
+    '  Expect "toBe"',
+    '  Navigate to "data:"',
+    '  Expect "toBe"',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
   ]);
 });
 
@@ -659,18 +642,19 @@ test('should show non-expect error in trace', async ({ runInlineTest }, testInfo
   const trace = await parseTrace(testInfo.outputPath('test-results', 'a-fail', 'trace.zip'));
   expect(trace.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: browser',
-    '    browserType.launch',
-    '  fixture: context',
-    '    browser.newContext',
-    '  fixture: page',
-    '    browserContext.newPage',
-    'expect.toBe',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Expect "toBe"',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
     'Worker Cleanup',
-    '  fixture: browser',
+    '  Fixture "browser"',
   ]);
   expect(trace.errors).toEqual(['ReferenceError: undefinedVariable1 is not defined']);
 });
@@ -731,32 +715,38 @@ test('should not throw when attachment is missing', async ({ runInlineTest }, te
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
   const trace = await parseTrace(testInfo.outputPath('test-results', 'a-passes', 'trace.zip'));
-  expect(trace.actionTree).toContain('attach "screenshot"');
+  expect(trace.titles).toContain('Attach "screenshot"');
 });
 
 test('should not throw when screenshot on failure fails', async ({ runInlineTest, server }, testInfo) => {
+  server.setRoute('/download', (req, res) => {
+    res.setHeader('Content-Type', 'application/octet-stream');
+    res.setHeader('Content-Disposition', 'attachment; filename=file.txt');
+    res.end(`Hello world`);
+  });
+
   const result = await runInlineTest({
     'playwright.config.ts': `
       module.exports = { use: { trace: 'on', screenshot: 'on' } };
     `,
     'a.spec.ts': `
       import { test, expect } from '@playwright/test';
-      test('has pdf page', async ({ page }) => {
+      test('has download page', async ({ page }) => {
         await page.goto("${server.EMPTY_PAGE}");
-        await page.setContent('<a href="/empty.pdf" target="blank">open me!</a>');
+        await page.setContent('<a href="/download" target="blank">open me!</a>');
         const downloadPromise = page.waitForEvent('download');
         await page.click('a');
         const download = await downloadPromise;
-        expect(download.suggestedFilename()).toBe('empty.pdf');
+        expect(download.suggestedFilename()).toBe('file.txt');
       });
     `,
   }, { workers: 1 });
 
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
-  const trace = await parseTrace(testInfo.outputPath('test-results', 'a-has-pdf-page', 'trace.zip'));
-  const attachedScreenshots = trace.actionTree.filter(s => s.trim() === `attach "screenshot"`);
-  // One screenshot for the page, no screenshot for pdf page since it should have failed.
+  const trace = await parseTrace(testInfo.outputPath('test-results', 'a-has-download-page', 'trace.zip'));
+  const attachedScreenshots = trace.actions.filter(a => a.attachments).flatMap(a => a.attachments);
+  // One screenshot for the page, no screenshot for the download page since it should have failed.
   expect(attachedScreenshots.length).toBe(1);
 });
 
@@ -781,16 +771,17 @@ test('should use custom expect message in trace', async ({ runInlineTest }, test
   const trace = await parseTrace(testInfo.outputPath('test-results', 'a-fail', 'trace.zip'));
   expect(trace.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: browser',
-    '    browserType.launch',
-    '  fixture: context',
-    '    browser.newContext',
-    '  fixture: page',
-    '    browserContext.newPage',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
     'expect to have text: find a hotel',
     'After Hooks',
-    '  fixture: page',
-    '  fixture: context',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
   ]);
 });
 
@@ -932,64 +923,108 @@ test('should record nested steps, even after timeout', async ({ runInlineTest },
   expect(trace.actionTree).toEqual([
     'Before Hooks',
     '  beforeAll hook',
-    '    fixture: browser',
-    '      browserType.launch',
-    '    fixture: barPage',
+    '    Fixture "browser"',
+    '      Launch browser',
+    '    Fixture "barPage"',
     '      barPage setup',
-    '      browser.newPage',
+    '      Create page',
     '      step in barPage setup',
-    '        page.setContent',
+    '        Set content',
     '    beforeAll start',
-    '    page.setContent',
+    '    Set content',
     '    step in beforeAll',
-    '      page.setContent',
-    '    fixture: barPage',
+    '      Set content',
+    '    Fixture "barPage"',
     '      barPage teardown',
     '      step in barPage teardown',
-    '        page.close',
+    '        Close context',
     '  beforeEach hook',
-    '    fixture: context',
-    '      browser.newContext',
-    '    fixture: page',
-    '      browserContext.newPage',
-    '    fixture: fooPage',
+    '    Fixture "context"',
+    '      Create context',
+    '    Fixture "page"',
+    '      Create page',
+    '    Fixture "fooPage"',
     '      fooPage setup',
-    '      page.setContent',
+    '      Set content',
     '      step in fooPage setup',
-    '        page.setContent',
+    '        Set content',
     '    beforeEach start',
-    '    page.setContent',
+    '    Set content',
     '    step in beforeEach',
-    '      page.setContent',
+    '      Set content',
     'After Hooks',
     '  afterEach hook',
     '    afterEach start',
-    '    page.setContent',
+    '    Set content',
     '    step in afterEach',
-    '      page.setContent',
-    '  fixture: fooPage',
+    '      Set content',
+    '  Fixture "fooPage"',
     '    fooPage teardown',
-    '    page.setContent',
+    '    Set content',
     '    step in fooPage teardown',
-    '      page.setContent',
-    '  fixture: page',
-    '  fixture: context',
+    '      Set content',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
     '  afterAll hook',
-    '    fixture: barPage',
+    '    Fixture "barPage"',
     '      barPage setup',
-    '      browser.newPage',
+    '      Create page',
     '      step in barPage setup',
-    '        page.setContent',
+    '        Set content',
     '    afterAll start',
-    '    page.setContent',
+    '    Set content',
     '    step in afterAll',
-    '      page.setContent',
-    '    fixture: barPage',
+    '      Set content',
+    '    Fixture "barPage"',
     '      barPage teardown',
     '      step in barPage teardown',
-    '        page.close',
+    '        Close context',
+    'Attach "error-context"',
     'Worker Cleanup',
-    '  fixture: browser',
+    '  Fixture "browser"',
+  ]);
+});
+
+test('should not produce an action entry for calling a binding', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      module.exports = { use: { trace: 'on' } };
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes', async ({ page }) => {
+          let wasCalled = false;
+          await page.exposeBinding('customBinding', () => {
+            wasCalled = true;
+            return 'foo';
+          });
+
+          const output = await page.evaluate(() => window['customBinding']());
+          expect(wasCalled).toBe(true);
+          expect(output).toBe('foo');
+      });
+    `,
+  }, { workers: 1 });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+  const trace = await parseTrace(testInfo.outputPath('test-results', 'a-passes', 'trace.zip'));
+  expect(trace.actionTree).toEqual([
+    'Before Hooks',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Evaluate',
+    'Expect "toBe"',
+    'Expect "toBe"',
+    'After Hooks',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
   ]);
 });
 
@@ -1025,7 +1060,7 @@ test('should attribute worker fixture teardown to the right test', async ({ runI
   const trace1 = await parseTrace(testInfo.outputPath('test-results', 'a-one', 'trace.zip'));
   expect(trace1.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: foo',
+    '  Fixture "foo"',
     '    step in foo setup',
     'After Hooks',
   ]);
@@ -1034,7 +1069,7 @@ test('should attribute worker fixture teardown to the right test', async ({ runI
     'Before Hooks',
     'After Hooks',
     'Worker Cleanup',
-    '  fixture: foo',
+    '  Fixture "foo"',
     '    step in foo teardown',
   ]);
 });
@@ -1056,7 +1091,7 @@ test('trace:retain-on-first-failure should create trace but only on first failur
 
   const tracePath = test.info().outputPath('test-results', 'a-fail', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('page.goto');
+  expect(trace.titles).toContain('Navigate to "about:blank"');
   expect(result.failed).toBe(1);
 });
 
@@ -1073,7 +1108,7 @@ test('trace:retain-on-first-failure should create trace if context is closed bef
   }, { trace: 'retain-on-first-failure' });
   const tracePath = test.info().outputPath('test-results', 'a-fail', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('page.goto');
+  expect(trace.titles).toContain('Navigate to "about:blank"');
   expect(result.failed).toBe(1);
 });
 
@@ -1092,7 +1127,7 @@ test('trace:retain-on-first-failure should create trace if context is closed bef
   }, { trace: 'retain-on-first-failure' });
   const tracePath = test.info().outputPath('test-results', 'a-fail', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('page.goto');
+  expect(trace.titles).toContain('Navigate to "about:blank"');
   expect(result.failed).toBe(1);
 });
 
@@ -1109,7 +1144,7 @@ test('trace:retain-on-first-failure should create trace if request context is di
   }, { trace: 'retain-on-first-failure' });
   const tracePath = test.info().outputPath('test-results', 'a-fail', 'trace.zip');
   const trace = await parseTrace(tracePath);
-  expect(trace.apiNames).toContain('apiRequestContext.get');
+  expect(trace.titles).toContain('GET "/empty.html"');
   expect(result.failed).toBe(1);
 });
 
@@ -1136,12 +1171,12 @@ test('should not corrupt actions when no library trace is present', async ({ run
   const trace = await parseTrace(tracePath);
   expect(trace.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: foo',
-    '    expect.toBe',
-    'expect.toBe',
+    '  Fixture "foo"',
+    '    Expect "toBe"',
+    'Expect "toBe"',
     'After Hooks',
-    '  fixture: foo',
-    '    expect.toBe',
+    '  Fixture "foo"',
+    '    Expect "toBe"',
     'Worker Cleanup',
   ]);
 });
@@ -1166,15 +1201,148 @@ test('should record trace for manually created context in a failed test', async
   const trace = await parseTrace(tracePath);
   expect(trace.actionTree).toEqual([
     'Before Hooks',
-    '  fixture: browser',
-    '    browserType.launch',
-    'browser.newPage',
-    'page.setContent',
-    'expect.toBe',
+    '  Fixture "browser"',
+    '    Launch browser',
+    'Create page',
+    'Set content',
+    'Expect "toBe"',
+    'After Hooks',
+    'Worker Cleanup',
+    '  Fixture "browser"',
+  ]);
+  // Check console events to make sure that library trace is recorded.
+  expect(trace.events).toContainEqual(expect.objectContaining({ type: 'console', text: 'from the page' }));
+});
+
+test('should not nest top level expect into unfinished api calls ', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31959' }
+}, async ({ runInlineTest, server }) => {
+  server.setRoute('/index', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.end(`<script>fetch('/api')</script><div>Hello!</div>`);
+  });
+  server.setRoute('/hang', () => {});
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({ page }) => {
+        await page.route('**/api', async route => {
+          const response = await route.fetch({ url: '${server.PREFIX}/hang' });
+          await route.fulfill({ response });
+        });
+        await page.goto('${server.PREFIX}/index');
+        await expect(page.getByText('Hello!')).toBeVisible();
+        await page.unrouteAll({ behavior: 'ignoreErrors' });
+      });
+    `,
+  }, { trace: 'on' });
+  expect(result.exitCode).toBe(0);
+  expect(result.failed).toBe(0);
+
+  const tracePath = test.info().outputPath('test-results', 'a-pass', 'trace.zip');
+  const trace = await parseTrace(tracePath);
+  expect(trace.actionTree).toEqual([
+    'Before Hooks',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    'Navigate to "/index"',
+    'GET "/hang"',
+    'Expect "toBeVisible"',
+    'After Hooks',
+    '  Fixture "page"',
+    '  Fixture "context"',
+    '    Close context',
+  ]);
+});
+
+test('should record trace after fixture teardown timeout', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30718' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test as base, expect } from '@playwright/test';
+      const test = base.extend({
+        fixture: async ({}, use) => {
+          await use('foo');
+          await new Promise(() => {});
+        },
+      });
+      // Note: it is important that "fixture" is last, so that it runs the teardown first.
+      test('fails', async ({ page, fixture }) => {
+        await page.evaluate(() => console.log('from the page'));
+      });
+    `,
+  }, { trace: 'on', timeout: '3000' }, { DEBUG: 'pw:test' });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+
+  const tracePath = test.info().outputPath('test-results', 'a-fails', 'trace.zip');
+  const trace = await parseTrace(tracePath);
+  expect(trace.actionTree).toEqual([
+    'Before Hooks',
+    '  Fixture "browser"',
+    '    Launch browser',
+    '  Fixture "context"',
+    '    Create context',
+    '  Fixture "page"',
+    '    Create page',
+    '  Fixture "fixture"',
+    'Evaluate',
     'After Hooks',
+    '  Fixture "fixture"',
     'Worker Cleanup',
-    '  fixture: browser',
+    '  Fixture "browser"',
   ]);
   // Check console events to make sure that library trace is recorded.
   expect(trace.events).toContainEqual(expect.objectContaining({ type: 'console', text: 'from the page' }));
 });
+
+test('should record trace snapshot for more obscure commands', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test 1', async ({ browser }) => {
+        const page = await browser.newPage();
+        await page.setContent('<div>Content</div>');
+        expect(await page.locator('div').count()).toBe(1);
+        await page.locator('div').boundingBox();
+      });
+    `,
+  }, { trace: 'on' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+
+  const tracePath = test.info().outputPath('test-results', 'a-test-1', 'trace.zip');
+  const trace = await parseTrace(tracePath);
+  expect(trace.actionTree).toEqual([
+    'Before Hooks',
+    '  Fixture "browser"',
+    '    Launch browser',
+    'Create page',
+    'Set content',
+    'Query count',
+    'Expect "toBe"',
+    'Bounding box',
+    'After Hooks',
+  ]);
+
+  const snapshots = trace.traceModel.storage();
+  const snapshotFrameOrPageId = snapshots.snapshotsForTest()[0];
+
+  const countAction = trace.actions.find(a => a.method === 'queryCount');
+  expect(countAction.beforeSnapshot).toBeTruthy();
+  expect(countAction.afterSnapshot).toBeTruthy();
+  expect(snapshots.snapshotByName(snapshotFrameOrPageId, countAction.beforeSnapshot)).toBeTruthy();
+  expect(snapshots.snapshotByName(snapshotFrameOrPageId, countAction.afterSnapshot)).toBeTruthy();
+
+  const boundingBoxAction = trace.actions.find(a => a.title === 'Bounding box');
+  expect(boundingBoxAction.beforeSnapshot).toBeTruthy();
+  expect(boundingBoxAction.afterSnapshot).toBeTruthy();
+  expect(snapshots.snapshotByName(snapshotFrameOrPageId, boundingBoxAction.beforeSnapshot)).toBeTruthy();
+  expect(snapshots.snapshotByName(snapshotFrameOrPageId, boundingBoxAction.afterSnapshot)).toBeTruthy();
+});
diff --git a/tests/playwright-test/reporter-attachment.spec.ts b/tests/playwright-test/reporter-attachment.spec.ts
index 50d6d1ee0c8c4..65a536e77fadf 100644
--- a/tests/playwright-test/reporter-attachment.spec.ts
+++ b/tests/playwright-test/reporter-attachment.spec.ts
@@ -322,3 +322,30 @@ test('render text attachment with multiple lines', async ({ runInlineTest }) =>
   expect(text).toContain('    ────────────────────────────────────────────────────────────────────────────────────────────────');
   expect(result.exitCode).toBe(1);
 });
+
+test('attaching inside boxed fixture should not log error', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/37147' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test as base } from '@playwright/test';
+
+      const test = base.extend<{ myFixture: void }>({
+        myFixture: [async ({}, use, testInfo) => {
+          await testInfo.attach('my attachment', {
+            body: 'foo',
+            contentType: 'text/plain',
+          });
+          await use();
+        }, { box: true }],
+      });
+
+      test('my test', ({ myFixture }) => {
+        expect(1).toBe(0);
+      });
+    `,
+  }, { reporter: 'line' }, {});
+  const text = result.output;
+  expect(text).toContain('    attachment #1: my attachment (text/plain) ──────────────────────────────────────────────────────');
+  expect(text).toContain('    foo');
+  expect(text).toContain('    ────────────────────────────────────────────────────────────────────────────────────────────────');
+  expect(result.exitCode).toBe(1);
+});
diff --git a/tests/playwright-test/reporter-base.spec.ts b/tests/playwright-test/reporter-base.spec.ts
index 6d6e499605399..afd5aa0543a9a 100644
--- a/tests/playwright-test/reporter-base.spec.ts
+++ b/tests/playwright-test/reporter-base.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { test, expect } from './playwright-test-fixtures';
+import { test, expect, stripAnsi } from './playwright-test-fixtures';
 import * as path from 'path';
 
 for (const useIntermediateMergeReport of [false, true] as const) {
@@ -118,6 +118,53 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(output).toContain(`a.spec.ts:5:13`);
     });
 
+    test('should print error with a nested cause', async ({ runInlineTest }) => {
+      const result = await runInlineTest({
+        'a.spec.ts': `
+          import { test, expect } from '@playwright/test';
+
+          test('foobar', async ({}) => {
+            try {
+              try {
+                const error = new Error('my-message');
+                error.name = 'SpecialError';
+                throw error;
+              } catch (e) {
+                try {
+                  throw new Error('inner-message', { cause: e });
+                } catch (e) {
+                  throw new Error('outer-message', { cause: e });
+                }
+              }
+            } catch (e) {
+              throw new Error('wrapper-message', { cause: e });
+            }
+          });
+          test.afterAll(() => {
+            expect(test.info().errors.length).toBe(1);
+            expect(test.info().errors[0]).toBe(test.info().error);
+            expect(test.info().error.message).toBe('Error: wrapper-message');
+            expect(test.info().error.cause.message).toBe('Error: outer-message');
+            expect(test.info().error.cause.cause.message).toBe('Error: inner-message');
+            expect(test.info().error.cause.cause.cause.message).toBe('SpecialError: my-message');
+            expect(test.info().error.cause.cause.cause.cause).toBe(undefined);
+            console.log('afterAll executed successfully');
+          })
+        `
+      });
+      expect(result.exitCode).toBe(1);
+      expect(result.failed).toBe(1);
+      const testFile = path.join(result.report.config.rootDir, result.report.suites[0].specs[0].file);
+      expect(result.output).toContain(`${testFile}:18:21`);
+      expect(result.output).toContain(`[cause]: Error: outer-message`);
+      expect(result.output).toContain(`${testFile}:14:25`);
+      expect(result.output).toContain(`[cause]: Error: inner-message`);
+      expect(result.output).toContain(`${testFile}:12:25`);
+      expect(result.output).toContain(`[cause]: SpecialError: my-message`);
+      expect(result.output).toContain(`${testFile}:7:31`);
+      expect(result.output).toContain('afterAll executed successfully');
+    });
+
     test('should print codeframe from a helper', async ({ runInlineTest }) => {
       const result = await runInlineTest({
         'helper.ts': `
@@ -175,7 +222,7 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(result.output).toContain(`Slow test file: [bar] › dir${path.sep}a.test.js (`);
       expect(result.output).toContain(`Slow test file: [baz] › dir${path.sep}a.test.js (`);
       expect(result.output).toContain(`Slow test file: [qux] › dir${path.sep}a.test.js (`);
-      expect(result.output).toContain(`Consider splitting slow test files to speed up parallel execution`);
+      expect(result.output).toContain(`Consider running tests from slow files in parallel`);
       expect(result.output).not.toContain(`Slow test file: [foo] › dir${path.sep}b.test.js (`);
       expect(result.output).not.toContain(`Slow test file: [bar] › dir${path.sep}b.test.js (`);
       expect(result.output).not.toContain(`Slow test file: [baz] › dir${path.sep}b.test.js (`);
@@ -418,5 +465,26 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(result.passed).toBe(1);
       expect(result.output).toMatch(/\d+ passed \(\d+(\.\d)?(ms|s)\)/);
     });
+
+    test('should output tags', async ({ runInlineTest }) => {
+      const result = await runInlineTest({
+        'a.test.ts': `
+          const { test, expect } = require('@playwright/test');
+          test('passes', { tag: ['@foo1', '@foo2'] }, async ({}) => {
+            expect(0).toBe(0);
+          });
+          test('passes @bar1 @bar2', async ({}) => {
+            expect(0).toBe(0);
+          });
+          test('passes @baz1', { tag: ['@baz2'] }, async ({}) => {
+            expect(0).toBe(0);
+          });
+        `,
+      });
+      const text = stripAnsi(result.output);
+      expect(text).toContain('› passes @foo1 @foo2 (');
+      expect(text).toContain('› passes @bar1 @bar2 (');
+      expect(text).toContain('› passes @baz1 @baz2 (');
+    });
   });
-}
\ No newline at end of file
+}
diff --git a/tests/playwright-test/reporter-blob.spec.ts b/tests/playwright-test/reporter-blob.spec.ts
index 8f3064a07334c..3b17948081000 100644
--- a/tests/playwright-test/reporter-blob.spec.ts
+++ b/tests/playwright-test/reporter-blob.spec.ts
@@ -18,13 +18,14 @@ import * as fs from 'fs';
 import type { PlaywrightTestConfig } from '@playwright/test';
 import path from 'path';
 import url from 'url';
-import type { HttpServer } from '../../packages/playwright-core/src/utils';
+import type { HttpServer } from '../../packages/playwright-core/lib/server/utils/httpServer';
 import { startHtmlReportServer } from '../../packages/playwright/lib/reporters/html';
 import { expect as baseExpect, test as baseTest, stripAnsi } from './playwright-test-fixtures';
-import extractZip from '../../packages/playwright-core/bundles/zip/node_modules/extract-zip';
+import extractZip from '../../packages/playwright-core/bundles/zip/src/third_party/extract-zip';
 import * as yazl from '../../packages/playwright-core/bundles/zip/node_modules/yazl';
-import { getUserAgent } from '../../packages/playwright-core/lib/utils/userAgent';
+import { getUserAgent } from '../../packages/playwright-core/lib/server/utils/userAgent';
 import { Readable } from 'stream';
+import type { JSONReportTestResult } from '../../packages/playwright-test/reporter';
 
 const DOES_NOT_SUPPORT_UTF8_IN_TERMINAL = process.platform === 'win32' && process.env.TERM_PROGRAM !== 'vscode' && !process.env.WT_SESSION;
 const POSITIVE_STATUS_MARK = DOES_NOT_SUPPORT_UTF8_IN_TERMINAL ? 'ok' : '✓ ';
@@ -480,24 +481,24 @@ test('merge into list report by default', async ({ runInlineTest, mergeReports }
   expect(text).toContain('Running 10 tests using 3 workers');
   const lines = text.split('\n').filter(l => l.match(/^#.* :/)).map(l => l.replace(/[.\d]+m?s/, 'Xms'));
   expect(lines).toEqual([
-    `#0 :      1 a.test.js:3:11 › math 1`,
-    `#0 :   ${POSITIVE_STATUS_MARK} 1 a.test.js:3:11 › math 1 (Xms)`,
-    `#1 :      2 a.test.js:6:11 › failing 1`,
-    `#1 :   ${NEGATIVE_STATUS_MARK} 2 a.test.js:6:11 › failing 1 (Xms)`,
-    `#2 :      3 a.test.js:6:11 › failing 1 (retry #1)`,
-    `#2 :   ${NEGATIVE_STATUS_MARK} 3 a.test.js:6:11 › failing 1 (retry #1) (Xms)`,
-    `#3 :      4 a.test.js:9:11 › flaky 1`,
-    `#3 :   ${NEGATIVE_STATUS_MARK} 4 a.test.js:9:11 › flaky 1 (Xms)`,
-    `#4 :      5 a.test.js:9:11 › flaky 1 (retry #1)`,
-    `#4 :   ${POSITIVE_STATUS_MARK} 5 a.test.js:9:11 › flaky 1 (retry #1) (Xms)`,
-    `#5 :      6 a.test.js:12:12 › skipped 1`,
-    `#5 :   -  6 a.test.js:12:12 › skipped 1`,
-    `#6 :      7 b.test.js:3:11 › math 2`,
-    `#6 :   ${POSITIVE_STATUS_MARK} 7 b.test.js:3:11 › math 2 (Xms)`,
-    `#7 :      8 b.test.js:6:11 › failing 2`,
-    `#7 :   ${NEGATIVE_STATUS_MARK} 8 b.test.js:6:11 › failing 2 (Xms)`,
-    `#8 :      9 b.test.js:6:11 › failing 2 (retry #1)`,
-    `#8 :   ${NEGATIVE_STATUS_MARK} 9 b.test.js:6:11 › failing 2 (retry #1) (Xms)`,
+    `#0 :       1 a.test.js:3:11 › math 1`,
+    `#0 :   ${POSITIVE_STATUS_MARK}  1 a.test.js:3:11 › math 1 (Xms)`,
+    `#1 :       2 a.test.js:6:11 › failing 1`,
+    `#1 :   ${NEGATIVE_STATUS_MARK}  2 a.test.js:6:11 › failing 1 (Xms)`,
+    `#2 :       3 a.test.js:6:11 › failing 1 (retry #1)`,
+    `#2 :   ${NEGATIVE_STATUS_MARK}  3 a.test.js:6:11 › failing 1 (retry #1) (Xms)`,
+    `#3 :       4 a.test.js:9:11 › flaky 1`,
+    `#3 :   ${NEGATIVE_STATUS_MARK}  4 a.test.js:9:11 › flaky 1 (Xms)`,
+    `#4 :       5 a.test.js:9:11 › flaky 1 (retry #1)`,
+    `#4 :   ${POSITIVE_STATUS_MARK}  5 a.test.js:9:11 › flaky 1 (retry #1) (Xms)`,
+    `#5 :       6 a.test.js:12:12 › skipped 1`,
+    `#5 :   -   6 a.test.js:12:12 › skipped 1`,
+    `#6 :       7 b.test.js:3:11 › math 2`,
+    `#6 :   ${POSITIVE_STATUS_MARK}  7 b.test.js:3:11 › math 2 (Xms)`,
+    `#7 :       8 b.test.js:6:11 › failing 2`,
+    `#7 :   ${NEGATIVE_STATUS_MARK}  8 b.test.js:6:11 › failing 2 (Xms)`,
+    `#8 :       9 b.test.js:6:11 › failing 2 (retry #1)`,
+    `#8 :   ${NEGATIVE_STATUS_MARK}  9 b.test.js:6:11 › failing 2 (retry #1) (Xms)`,
     `#9 :      10 b.test.js:9:12 › skipped 2`,
     `#9 :   -  10 b.test.js:9:12 › skipped 2`,
     `#10 :      11 c.test.js:3:11 › math 3`,
@@ -706,9 +707,12 @@ test('generate html with attachment urls', async ({ runInlineTest, mergeReports,
   await page.goBack();
 
   // Check that trace loads.
-  await page.locator('div').filter({ hasText: /^a\.test\.js:13$/ }).getByRole('link', { name: 'View trace' }).click();
+  await page.locator('.test-file-test').filter({ hasText: /failing 1/ }).getByRole('link', { name: 'View Trace' }).click();
   await expect(page).toHaveTitle('Playwright Trace Viewer');
-  await expect(page.getByTestId('actions-tree').locator('div').filter({ hasText: /^expect\.toBe$/ })).toBeVisible();
+  await expect(page.getByTestId('actions-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /Expect "toBe" \\d+[hmsp]+/ [selected]
+  `);
 });
 
 test('resource names should not clash between runs', async ({ runInlineTest, showReport, mergeReports, page }) => {
@@ -882,7 +886,10 @@ test('multiple output reports based on config', async ({ runInlineTest, mergeRep
   const reportFiles = await fs.promises.readdir(reportDir);
   reportFiles.sort();
   expect(reportFiles).toEqual(['report-1.zip', 'report-2.zip']);
-  const { exitCode, output } = await mergeReports(reportDir, undefined, { additionalArgs: ['--config', test.info().outputPath('merged/playwright.config.ts')] });
+  const { exitCode, output } = await mergeReports(reportDir, undefined, {
+    cwd: test.info().outputPath('merged'),
+    additionalArgs: ['--config', 'playwright.config.ts'],
+  });
   expect(exitCode).toBe(0);
 
   // Check that line reporter was called.
@@ -1203,15 +1210,15 @@ test('preserve steps in html report', async ({ runInlineTest, mergeReports, show
 
   await page.getByText('Before Hooks').click();
   await page.getByText('beforeAll hook').click();
-  await expect(page.getByText('expect.toBe')).toBeVisible();
+  await expect(page.getByText('Expect "toBe"')).toBeVisible();
   // Collapse hooks.
   await page.getByText('Before Hooks').click();
-  await expect(page.getByText('expect.toBe')).not.toBeVisible();
+  await expect(page.getByText('Expect "toBe"')).not.toBeVisible();
 
   // Check that 'my step' location is relative.
   await expect(page.getByText('— tests/a.test.js:7')).toBeVisible();
   await page.getByText('my step').click();
-  await expect(page.getByText('expect.toBe')).toBeVisible();
+  await expect(page.getByText('Expect "toBe"')).toBeVisible();
 });
 
 test('support fileName option', async ({ runInlineTest, mergeReports }) => {
@@ -1498,6 +1505,39 @@ test('merge-reports should throw if report version is from the future', async ({
 
 });
 
+test('merge-reports should merge old attachments (pre-1.53)', async ({ runInlineTest, mergeReports }) => {
+  const reportDir = test.info().outputPath('blob-report');
+
+  const files = {
+    'playwright.config.ts': `
+      module.exports = {
+        reporter: [['blob']]
+      };
+    `,
+    'tests/a.test.js': `
+      import { test, expect } from '@playwright/test';
+      test('test 1', async ({}) => {});
+    `,
+    'merge.config.ts': `module.exports = {
+      testDir: 'mergeRoot',
+     };`,
+  };
+
+  await runInlineTest(files);
+  const reportFiles = await fs.promises.readdir(reportDir);
+  expect(reportFiles).toEqual(['report.zip']);
+
+  await fs.promises.copyFile(path.join(__dirname, '../assets/blob-1.52.zip'), path.join(reportDir, 'blob-1.42.zip'));
+
+  const { exitCode } = await mergeReports(reportDir, { 'PLAYWRIGHT_HTML_OPEN': 'never' }, { additionalArgs: ['--reporter', 'html', '--config', 'merge.config.ts'] });
+  expect(exitCode).toBe(0);
+
+  const assets = await fs.promises.readdir(path.join(test.info().outputPath('playwright-report'), 'data'));
+  expect(new Set(assets)).toEqual(new Set([
+    '4b6deb4234e5c2dc92efc6e604624e9481e8ae57.png', // screenshot
+  ]));
+});
+
 test('should merge blob reports with same name', async ({ runInlineTest, mergeReports, showReport, page }) => {
   const files = {
     'playwright.config.ts': `
@@ -1718,6 +1758,9 @@ test('merge reports with different rootDirs and path separators', async ({ runIn
           console.log('test:', test.location.file);
           console.log('test title:', test.titlePath()[2]);
         }
+        onTestEnd(test) {
+          console.log('annotations:', test.annotations.map(a => 'type: ' + a.type + ', description: ' + a.description + ', file: ' + a.location.file).join(','));
+        }
       };
     `,
     'merge.config.ts': `module.exports = {
@@ -1729,7 +1772,7 @@ test('merge reports with different rootDirs and path separators', async ({ runIn
     };`,
     'dir1/tests1/a.test.js': `
       import { test, expect } from '@playwright/test';
-      test('math 1', async ({}) => { });
+      test('math 1', { annotation: { type: 'warning', description: 'Some warning' } }, async ({}) => { });
     `,
   };
   await runInlineTest(files1, { workers: 1 }, undefined, { additionalArgs: ['--config', test.info().outputPath('dir1/playwright.config.ts')] });
@@ -1740,7 +1783,7 @@ test('merge reports with different rootDirs and path separators', async ({ runIn
     };`,
     'dir2/tests2/b.test.js': `
       import { test, expect } from '@playwright/test';
-      test('math 2', async ({}) => { });
+      test('math 2', { annotation: { type: 'issue' } }, async ({}) => { });
     `,
   };
   await runInlineTest(files2, { workers: 1 }, undefined, { additionalArgs: ['--config', test.info().outputPath('dir2/playwright.config.ts')] });
@@ -1762,12 +1805,16 @@ test('merge reports with different rootDirs and path separators', async ({ runIn
 
   {
     const { exitCode, output } = await mergeReports(allReportsDir, undefined, { additionalArgs: ['--config', 'merge.config.ts'] });
+    const testPath1 = test.info().outputPath('mergeRoot', 'tests1', 'a.test.js');
+    const testPath2 = test.info().outputPath('mergeRoot', 'tests2', 'b.test.js');
     expect(exitCode).toBe(0);
     expect(output).toContain(`rootDir: ${test.info().outputPath('mergeRoot')}`);
-    expect(output).toContain(`test: ${test.info().outputPath('mergeRoot', 'tests1', 'a.test.js')}`);
+    expect(output).toContain(`test: ${testPath1}`);
     expect(output).toContain(`test title: ${'tests1' + path.sep + 'a.test.js'}`);
-    expect(output).toContain(`test: ${test.info().outputPath('mergeRoot', 'tests2', 'b.test.js')}`);
+    expect(output).toContain(`annotations: type: warning, description: Some warning, file: ${testPath1}`);
+    expect(output).toContain(`test: ${testPath2}`);
     expect(output).toContain(`test title: ${'tests2' + path.sep + 'b.test.js'}`);
+    expect(output).toContain(`annotations: type: issue, description: undefined, file: ${testPath2}`);
   }
 });
 
@@ -1783,6 +1830,9 @@ test('merge reports without --config preserves path separators', async ({ runInl
           console.log('test:', test.location.file);
           console.log('test title:', test.titlePath()[2]);
         }
+        onTestEnd(test) {
+          console.log('annotations:', test.annotations.map(a => 'type: ' + a.type + ', description: ' + a.description + ', file: ' + a.location.file).join(','));
+        }
       };
     `,
     'dir1/playwright.config.ts': `module.exports = {
@@ -1790,11 +1840,11 @@ test('merge reports without --config preserves path separators', async ({ runInl
     };`,
     'dir1/tests1/a.test.js': `
       import { test, expect } from '@playwright/test';
-      test('math 1', async ({}) => { });
+      test('math 1', { annotation: { type: 'warning', description: 'Some warning' } }, async ({}) => { });
     `,
     'dir1/tests2/b.test.js': `
       import { test, expect } from '@playwright/test';
-      test('math 2', async ({}) => { });
+      test('math 2', { annotation: { type: 'issue' } }, async ({}) => { });
     `,
   };
   await runInlineTest(files1, { workers: 1 }, undefined, { additionalArgs: ['--config', test.info().outputPath('dir1/playwright.config.ts')] });
@@ -1814,11 +1864,101 @@ test('merge reports without --config preserves path separators', async ({ runInl
   const { exitCode, output } = await mergeReports(allReportsDir, undefined, { additionalArgs: ['--reporter', './echo-reporter.js'] });
   expect(exitCode).toBe(0);
   const otherSeparator = path.sep === '/' ? '\\' : '/';
+  const testPath1 = test.info().outputPath('dir1', 'tests1', 'a.test.js').replaceAll(path.sep, otherSeparator);
+  const testPath2 = test.info().outputPath('dir1', 'tests2', 'b.test.js').replaceAll(path.sep, otherSeparator);
   expect(output).toContain(`rootDir: ${test.info().outputPath('dir1').replaceAll(path.sep, otherSeparator)}`);
-  expect(output).toContain(`test: ${test.info().outputPath('dir1', 'tests1', 'a.test.js').replaceAll(path.sep, otherSeparator)}`);
+  expect(output).toContain(`test: ${testPath1}`);
   expect(output).toContain(`test title: ${'tests1' + otherSeparator + 'a.test.js'}`);
-  expect(output).toContain(`test: ${test.info().outputPath('dir1', 'tests2', 'b.test.js').replaceAll(path.sep, otherSeparator)}`);
+  expect(output).toContain(`annotations: type: warning, description: Some warning, file: ${testPath1}`);
+  expect(output).toContain(`test: ${testPath2}`);
   expect(output).toContain(`test title: ${'tests2' + otherSeparator + 'b.test.js'}`);
+  expect(output).toContain(`annotations: type: issue, description: undefined, file: ${testPath2}`);
+});
+
+test('merge reports should preserve attachments', async ({ runInlineTest, mergeReports, showReport, page }) => {
+  const reportDir = test.info().outputPath('blob-report-orig');
+  const files = {
+    'playwright.config.ts': `
+      module.exports = {
+        retries: 1,
+        reporter: [['blob', { outputDir: '${reportDir.replace(/\\/g, '/')}' }]]
+      };
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      import * as fs from 'fs';
+      test('attachment A', async ({}) => {
+        const attachmentPath = test.info().outputPath('foo.txt');
+        fs.writeFileSync(attachmentPath, 'hello!');
+        await test.info().attach('file-attachment1', { path: attachmentPath });
+        await test.info().attachments.push({ name: 'file-attachment2', path: attachmentPath, contentType: 'text/html' });
+        await test.info().attach('file-attachment3', { path: attachmentPath });
+        await test.info().attach('file-attachment4', { path: attachmentPath });
+        await test.info().attachments.push({ name: 'file-attachment5', path: attachmentPath, contentType: 'text/html' });
+        await test.info().attachments.push({ name: 'file-attachment6', path: attachmentPath, contentType: 'text/html' });
+        await test.info().attach('file-attachment7', { path: attachmentPath });
+      });
+    `,
+    'b.test.js': `
+      import { test, expect } from '@playwright/test';
+      import * as fs from 'fs';
+      test('attachment B', async ({}) => {
+        const attachmentPath = test.info().outputPath('bar.txt');
+        fs.writeFileSync(attachmentPath, 'goodbye!');
+        await test.info().attach('file-attachment8', { path: attachmentPath });
+        await test.info().attachments.push({ name: 'file-attachment9', path: attachmentPath, contentType: 'application/json' });
+      });
+    `
+  };
+  await runInlineTest(files, { shard: `1/2` }, { PWTEST_BLOB_DO_NOT_REMOVE: '1' });
+  await runInlineTest(files, { shard: `2/2` }, { PWTEST_BLOB_DO_NOT_REMOVE: '1' });
+
+  const reportFiles = await fs.promises.readdir(reportDir);
+  reportFiles.sort();
+  expect(reportFiles).toEqual(['report-1.zip', 'report-2.zip']);
+  const { exitCode } = await mergeReports(reportDir, { 'PLAYWRIGHT_HTML_OPEN': 'never' }, { additionalArgs: ['--reporter', 'blob,html'] });
+  expect(exitCode).toBe(0);
+
+  const reportZipFile = test.info().outputPath('blob-report', 'report.zip');
+  const events = await extractReport(reportZipFile, test.info().outputPath('tmp'));
+
+  type Attachment = Omit<JSONReportTestResult['attachments'][number], 'path'> & {
+    path: any
+  };
+
+  const attachment1: Attachment = { name: 'file-attachment1', path: expect.stringContaining(''), contentType: 'text/plain' };
+  const attachment2: Attachment = { name: 'file-attachment2', path: expect.stringContaining(''), contentType: 'text/html' };
+  const attachment3: Attachment = { name: 'file-attachment3', path: expect.stringContaining(''), contentType: 'text/plain' };
+  const attachment4: Attachment = { name: 'file-attachment4', path: expect.stringContaining(''), contentType: 'text/plain' };
+  const attachment5: Attachment = { name: 'file-attachment5', path: expect.stringContaining(''), contentType: 'text/html' };
+  const attachment6: Attachment = { name: 'file-attachment6', path: expect.stringContaining(''), contentType: 'text/html' };
+  const attachment7: Attachment = { name: 'file-attachment7', path: expect.stringContaining(''), contentType: 'text/plain' };
+  const attachment8: Attachment = { name: 'file-attachment8', path: expect.stringContaining(''), contentType: 'text/plain' };
+  const attachment9: Attachment = { name: 'file-attachment9', path: expect.stringContaining(''), contentType: 'application/json' };
+
+  const aAttachments = [attachment1, attachment2, attachment3, attachment4, attachment5, attachment6, attachment7];
+  const bAttachments = [attachment8, attachment9];
+
+  const allStepAttachments = events.flatMap(e => e.method === 'onStepEnd' ? e?.params?.step?.attachments ?? [] : []);
+  expect(allStepAttachments).toEqual([0, 2, 3, 6, 0]);
+
+  const allTestAttachments = events.flatMap(e => e.method === 'onAttach' ? e?.params?.attachments ?? [] : []);
+  expect(allTestAttachments).toEqual([...aAttachments, ...bAttachments]);
+
+  await showReport();
+
+  {
+    await page.getByRole('link', { name: 'Attachment A' }).click();
+    for (const attachment of aAttachments)
+      await expect(page.getByRole('link', { name: attachment.name })).toBeVisible();
+    await page.goBack();
+  }
+  {
+    await page.getByRole('link', { name: 'Attachment B' }).click();
+    for (const attachment of bAttachments)
+      await expect(page.getByRole('link', { name: attachment.name })).toBeVisible();
+    await page.goBack();
+  }
 });
 
 test('merge reports must not change test ids when there is no need to', async ({ runInlineTest, mergeReports }) => {
@@ -2040,13 +2180,16 @@ test('project filter in report name', async ({ runInlineTest }) => {
   const reportDir = test.info().outputPath('blob-report');
 
   {
-    await runInlineTest(files, { shard: `2/2`, project: 'foo' });
+    const result = await runInlineTest(files, { shard: `2/2`, project: 'foo' });
+    expect(result.exitCode).toBe(0);
     const reportFiles = await fs.promises.readdir(reportDir);
     expect(reportFiles.sort()).toEqual(['report-foo-2.zip']);
   }
+
   {
-    await runInlineTest(files, { shard: `1/2`, project: 'foo,b*r', grep: 'smoke' });
+    const result = await runInlineTest(files, { shard: `1/2`, project: ['foo', 'b*r'], grep: 'smoke' });
+    expect(result.exitCode).toBe(0);
     const reportFiles = await fs.promises.readdir(reportDir);
     expect(reportFiles.sort()).toEqual(['report-foo-b-r-6d9d49e-1.zip']);
   }
-});
\ No newline at end of file
+});
diff --git a/tests/playwright-test/reporter-dot.spec.ts b/tests/playwright-test/reporter-dot.spec.ts
index 5afda3f7bda2d..04a9337ec06ec 100644
--- a/tests/playwright-test/reporter-dot.spec.ts
+++ b/tests/playwright-test/reporter-dot.spec.ts
@@ -112,4 +112,4 @@ for (const useIntermediateMergeReport of [false, true] as const) {
           colors.green('·').repeat(3));
     });
   });
-}
\ No newline at end of file
+}
diff --git a/tests/playwright-test/reporter-github.spec.ts b/tests/playwright-test/reporter-github.spec.ts
index 100feb157ff2b..292c407b9f06a 100644
--- a/tests/playwright-test/reporter-github.spec.ts
+++ b/tests/playwright-test/reporter-github.spec.ts
@@ -98,4 +98,4 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(result.exitCode).toBe(1);
     });
   });
-}
\ No newline at end of file
+}
diff --git a/tests/playwright-test/reporter-html.spec.ts b/tests/playwright-test/reporter-html.spec.ts
index e416cd05c1ed7..6ee8959a00bf9 100644
--- a/tests/playwright-test/reporter-html.spec.ts
+++ b/tests/playwright-test/reporter-html.spec.ts
@@ -18,7 +18,7 @@ import fs from 'fs';
 import path from 'path';
 import url from 'url';
 import { test as baseTest, expect as baseExpect, createImage } from './playwright-test-fixtures';
-import type { HttpServer } from '../../packages/playwright-core/src/utils';
+import type { HttpServer } from '../../packages/playwright-core/lib/server/utils/httpServer';
 import { startHtmlReportServer } from '../../packages/playwright/lib/reporters/html';
 import { msToString } from '../../packages/web/src/uiUtils';
 const { spawnAsync } = require('../../packages/playwright-core/lib/utils');
@@ -43,7 +43,7 @@ const expect = baseExpect.configure({ timeout: process.env.CI ? 75000 : 25000 })
 
 test.describe.configure({ mode: 'parallel' });
 
-for (const useIntermediateMergeReport of [false] as const) {
+for (const useIntermediateMergeReport of [true, false] as const) {
   test.describe(`${useIntermediateMergeReport ? 'merged' : 'created'}`, () => {
     test.use({ useIntermediateMergeReport });
 
@@ -83,7 +83,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       await expect(page.getByTestId('overall-duration'), 'should contain humanized total time with at most 1 decimal place').toContainText(/^Total time: \d+(\.\d)?(ms|s|m)$/);
       await expect(page.getByTestId('project-name'), 'should contain project name').toContainText('project-name');
 
-      await expect(page.locator('.metadata-view')).not.toBeVisible();
+      await expect(page.getByTestId('metadata-view')).not.toBeVisible();
     });
 
     test('should allow navigating to testId=test.id', async ({ runInlineTest, page, showReport }) => {
@@ -101,7 +101,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
       await page.locator('text=stdout').click();
       await expect(page.locator('.attachment-body')).toHaveText(/TESTID=.*/);
       const idString = await page.locator('.attachment-body').textContent();
@@ -149,7 +149,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
       await expect(page.getByRole('link', { name: 'screenshot' })).toBeVisible();
     });
 
@@ -175,11 +175,11 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
+      await page.getByRole('link', { name: 'fails' }).click();
       await expect(page.locator('text=Image mismatch')).toBeVisible();
       await expect(page.locator('text=Snapshot mismatch')).toHaveCount(0);
 
-      await expect(page.getByTestId('test-result-image-mismatch-tabs').locator('div')).toHaveText([
+      await expect(page.getByTestId('test-screenshot-error-view').getByTestId('test-result-image-mismatch-tabs').locator('div')).toHaveText([
         'Diff',
         'Actual',
         'Expected',
@@ -187,36 +187,40 @@ for (const useIntermediateMergeReport of [false] as const) {
         'Slider',
       ]);
 
-      const imageDiff = page.getByTestId('test-result-image-mismatch');
-      await test.step('Diff', async () => {
-        await expect(imageDiff.locator('img')).toHaveAttribute('alt', 'Diff');
-      });
+      for (const testId of ['test-results-image-diff', 'test-screenshot-error-view']) {
+        await test.step(testId, async () => {
+          const imageDiff = page.getByTestId(testId).getByTestId('test-result-image-mismatch');
+          await test.step('Diff', async () => {
+            await expect(imageDiff.locator('img')).toHaveAttribute('alt', 'Diff');
+          });
 
-      await test.step('Actual', async () => {
-        await imageDiff.getByText('Actual', { exact: true }).click();
-        await expect(imageDiff.locator('img')).toHaveAttribute('alt', 'Actual');
-      });
+          await test.step('Actual', async () => {
+            await imageDiff.getByText('Actual', { exact: true }).click();
+            await expect(imageDiff.locator('img')).toHaveAttribute('alt', 'Actual');
+          });
 
-      await test.step('Expected', async () => {
-        await imageDiff.getByText('Expected', { exact: true }).click();
-        await expect(imageDiff.locator('img')).toHaveAttribute('alt', 'Expected');
-      });
+          await test.step('Expected', async () => {
+            await imageDiff.getByText('Expected', { exact: true }).click();
+            await expect(imageDiff.locator('img')).toHaveAttribute('alt', 'Expected');
+          });
 
-      await test.step('Side by side', async () => {
-        await imageDiff.getByText('Side by side').click();
-        await expect(imageDiff.locator('img')).toHaveCount(2);
-        await expect(imageDiff.locator('img').first()).toHaveAttribute('alt', 'Expected');
-        await expect(imageDiff.locator('img').last()).toHaveAttribute('alt', 'Actual');
-        await imageDiff.locator('img').last().click();
-        await expect(imageDiff.locator('img').last()).toHaveAttribute('alt', 'Diff');
-      });
+          await test.step('Side by side', async () => {
+            await imageDiff.getByText('Side by side').click();
+            await expect(imageDiff.locator('img')).toHaveCount(2);
+            await expect(imageDiff.locator('img').first()).toHaveAttribute('alt', 'Expected');
+            await expect(imageDiff.locator('img').last()).toHaveAttribute('alt', 'Actual');
+            await imageDiff.locator('img').last().click();
+            await expect(imageDiff.locator('img').last()).toHaveAttribute('alt', 'Diff');
+          });
 
-      await test.step('Slider', async () => {
-        await imageDiff.getByText('Slider', { exact: true }).click();
-        await expect(imageDiff.locator('img')).toHaveCount(2);
-        await expect(imageDiff.locator('img').first()).toHaveAttribute('alt', 'Expected');
-        await expect(imageDiff.locator('img').last()).toHaveAttribute('alt', 'Actual');
-      });
+          await test.step('Slider', async () => {
+            await imageDiff.getByText('Slider', { exact: true }).click();
+            await expect(imageDiff.locator('img')).toHaveCount(2);
+            await expect(imageDiff.locator('img').first()).toHaveAttribute('alt', 'Expected');
+            await expect(imageDiff.locator('img').last()).toHaveAttribute('alt', 'Actual');
+          });
+        });
+      }
     });
 
     test('should include multiple image diffs', async ({ runInlineTest, page, showReport }) => {
@@ -249,7 +253,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
+      await page.getByRole('link', { name: 'fails' }).click();
       await expect(page.locator('text=Image mismatch')).toHaveCount(2);
       await expect(page.locator('text=Snapshot mismatch')).toHaveCount(0);
       await expect(page.locator('text="Screenshots"')).toHaveCount(0);
@@ -284,51 +288,19 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
-      await expect(page.locator('data-testid=test-result-image-mismatch')).toHaveCount(3);
-      await expect(page.locator('text=Image mismatch:')).toHaveText([
+      await page.getByRole('link', { name: 'fails' }).click();
+      await expect(page.locator('.test-error-view').first()).toContainText(
+          `> 6 |             await expect.soft(screenshot).toMatchSnapshot('expected.png');`,
+      );
+      const imageDiffs = page.getByTestId('test-results-image-diff');
+      await expect(imageDiffs.getByTestId('test-result-image-mismatch')).toHaveCount(3);
+      await expect(imageDiffs.getByText('Image mismatch:')).toHaveText([
         'Image mismatch: expected.png',
         'Image mismatch: expected-1.png',
         'Image mismatch: expected-2.png',
       ]);
     });
 
-    test('should include image diff when screenshot failed to generate due to animation', async ({ runInlineTest, page, showReport }) => {
-      test.skip(process.env.PW_CLOCK === 'frozen', 'Assumes Date.now() changes');
-      const result = await runInlineTest({
-        'playwright.config.ts': `
-          module.exports = { use: { viewport: { width: 200, height: 200 }} };
-        `,
-        'a.test.js': `
-          import { test, expect } from '@playwright/test';
-          test('fails', async ({ page }, testInfo) => {
-            testInfo.snapshotSuffix = '';
-            await page.evaluate(() => {
-              setInterval(() => {
-                document.body.textContent = Date.now();
-              }, 50);
-            });
-            await expect.soft(page).toHaveScreenshot({ timeout: 1000 });
-          });
-        `,
-      }, { 'reporter': 'dot,html', 'update-snapshots': true }, { PLAYWRIGHT_HTML_OPEN: 'never' });
-      expect(result.exitCode).toBe(1);
-      expect(result.failed).toBe(1);
-
-      await showReport();
-      await page.click('text=fails');
-      await expect(page.locator('text=Image mismatch')).toHaveCount(1);
-      await expect(page.locator('text=Snapshot mismatch')).toHaveCount(0);
-      await expect(page.locator('.chip-header', { hasText: 'Screenshots' })).toHaveCount(0);
-      await expect(page.getByTestId('test-result-image-mismatch-tabs').locator('div')).toHaveText([
-        'Diff',
-        'Actual',
-        'Expected',
-        'Side by side',
-        'Slider',
-      ]);
-    });
-
     test('should not include image diff with non-images', async ({ runInlineTest, page, showReport }) => {
       const expected = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAAhVJREFUeJzt07ERwCAQwLCQ/Xd+FuDcQiFN4MZrZuYDjv7bAfAyg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAgEg0AwCASDQDAIBINAMAiEDVPZBYx6ffy+AAAAAElFTkSuQmCC', 'base64');
       const result = await runInlineTest({
@@ -351,7 +323,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
+      await page.getByRole('link', { name: 'fails' }).click();
       await expect(page.locator('text=Image mismatch')).toHaveCount(0);
       await expect(page.locator('img')).toHaveCount(0);
       await expect(page.locator('a', { hasText: 'expected-actual' })).toBeVisible();
@@ -380,7 +352,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
+      await page.getByRole('link', { name: 'fails' }).click();
       await expect(page.locator('text=Screenshots')).toBeVisible();
       await expect(page.locator('img')).toBeVisible();
       const src = await page.locator('img').getAttribute('src');
@@ -411,7 +383,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
 
       await expect(page.locator('div').filter({ hasText: /^Screenshotsscreenshot$/ }).getByRole('img')).toHaveAttribute('src', /(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
       await expect(page.getByRole('link', { name: 'screenshot' })).toHaveAttribute('href', /(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
@@ -419,10 +391,111 @@ for (const useIntermediateMergeReport of [false] as const) {
       await expect(page.locator('video').locator('source')).toHaveAttribute('src', /(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
       await expect(page.getByRole('link', { name: 'video' })).toHaveAttribute('href', /(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
 
-      await expect(page.getByRole('link', { name: 'trace' })).toHaveAttribute('href', /(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
+      await expect(page.getByRole('link', { name: 'trace', exact: true })).toHaveAttribute('href', /(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
       await expect(page.locator('div').filter({ hasText: /^Tracestrace$/ }).getByRole('link').first()).toHaveAttribute('href', /trace=(https:\/\/some-url\.com\/)[^/\s]+?\.[^/\s]+/);
     });
 
+    test('should display report title if provided', async ({ runInlineTest, page, showReport }, testInfo) => {
+      const result = await runInlineTest({
+        'playwright.config.ts': `
+          module.exports = {
+            reporter: [['html', { title: 'Custom report title' }], ['line']]
+          };
+        `,
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('passes', async ({ page }) => {
+            await page.evaluate('2 + 2');
+          });
+        `
+      }, {}, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+
+      await showReport();
+      await expect(page.locator('.header-title')).toHaveText('Custom report title');
+    });
+
+    test('should process URLs as links in report title', async ({ runInlineTest, page, showReport }, testInfo) => {
+      const result = await runInlineTest({
+        'playwright.config.ts': `
+          module.exports = {
+            reporter: [['html', { title: 'Custom report title https://playwright.dev separator http://microsoft.com end' }], ['line']]
+          };
+        `,
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('fails', async ({ page }) => {
+            expect(1).toBe(2);
+          });
+        `
+      }, {}, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(1);
+      expect(result.passed).toBe(0);
+
+      await showReport();
+      const anchorLocator = page.locator('.header-title a');
+      await expect(page.locator('.header-title')).toHaveText('Custom report title https://playwright.dev separator http://microsoft.com end');
+      await expect(anchorLocator).toHaveCount(2);
+      await expect(anchorLocator.nth(0)).toHaveAttribute('href', 'https://playwright.dev');
+      await expect(anchorLocator.nth(1)).toHaveAttribute('href', 'http://microsoft.com');
+    });
+
+    test('should allow setting title from env in global teardown', async ({ runInlineTest, page, showReport }, testInfo) => {
+      test.skip(useIntermediateMergeReport, 'env vars are not available in merge report');
+
+      const result = await runInlineTest({
+        'playwright.config.ts': `
+          module.exports = {
+            globalTeardown: './global-teardown.js',
+          };
+        `,
+        'omega-star.test.js': `
+          import { test, expect } from '@playwright/test';
+          import fs from 'fs/promises';
+          test('version check', async ({}, testInfo) => {
+            const apiVersion = 'abcde';
+            await fs.writeFile(testInfo.outputPath('omega_star_version'), apiVersion);
+            expect(2).toEqual(2);
+          });
+        `,
+        'global-teardown.js': `
+          import fs from 'fs/promises';
+          import path from 'path';
+          export default async (config) => {
+            const apiVersion = await fs.readFile(path.join('test-results', 'omega-star-version-check', 'omega_star_version'), 'utf-8');
+            process.env.PLAYWRIGHT_HTML_TITLE = 'Omega Star Test Suite (Version: ' + apiVersion + ')';
+          };
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+
+      await showReport();
+      await expect(page.locator('.header-title')).toHaveText('Omega Star Test Suite (Version: abcde)');
+    });
+
+    test('should include view trace button in header', async ({ runInlineTest, server, page, showReport }) => {
+      const result = await runInlineTest({
+        'playwright.config.js': `
+          module.exports = { use: { trace: 'on' } };
+        `,
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('passes', async ({ playwright, page }) => {
+            await page.evaluate('2 + 2');
+            const request = await playwright.request.newContext();
+            await request.get('${server.EMPTY_PAGE}');
+            await request.dispose();
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+      await showReport();
+      await expect(page.getByRole('link', { name: 'View Trace' })).toBeVisible();
+    });
+
     test('should include stdio', async ({ runInlineTest, page, showReport }) => {
       const result = await runInlineTest({
         'a.test.js': `
@@ -439,13 +512,44 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
-      await page.locator('text=stdout').click();
-      await expect(page.locator('.attachment-body')).toHaveText('First line\nSecond line');
-      await page.locator('text=stderr').click();
+      await page.getByRole('link', { name: 'fails' }).click();
+      await page.getByText('stdout').click();
+      await expect(page.locator('.attachment-body').nth(0)).toHaveText('First line\nSecond line');
+      await page.getByText('stderr').click();
       await expect(page.locator('.attachment-body').nth(1)).toHaveText('Third line');
     });
 
+    test('should include stdout/stderr in copy prompt', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('fails', async ({ page }) => {
+            console.log('Output line 1');
+            process.stdout.write('Output line 2\\n');
+            console.error('Error line 1');
+            process.stderr.write('Error line 2\\n');
+            await expect(true).toBeFalsy();
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(1);
+      expect(result.failed).toBe(1);
+
+      await showReport();
+      await page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
+
+      await page.getByRole('link', { name: 'fails' }).click();
+      await page.getByRole('button', { name: 'Copy prompt' }).click();
+      await page.waitForFunction(() => navigator.clipboard.readText());
+      const prompt = await page.evaluate(() => navigator.clipboard.readText());
+      expect(prompt, 'should contain stdout content').toContain('Output line 1');
+      expect(prompt, 'should contain stdout content').toContain('Output line 2');
+      expect(prompt, 'should contain stderr content').toContain('Error line 1');
+      expect(prompt, 'should contain stderr content').toContain('Error line 2');
+      expect(prompt, 'should contain stdout section').toContain('# Stdout');
+      expect(prompt, 'should contain stderr section').toContain('# Stderr');
+    });
+
     test('should highlight error', async ({ runInlineTest, page, showReport }) => {
       const result = await runInlineTest({
         'a.test.js': `
@@ -459,8 +563,8 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.failed).toBe(1);
 
       await showReport();
-      await page.click('text=fails');
-      await expect(page.locator('.test-error-message span:has-text("received")').nth(1)).toHaveCSS('color', 'rgb(204, 0, 0)');
+      await page.getByRole('link', { name: 'fails' }).click();
+      await expect(page.locator('.test-error-view span:has-text("true")').first()).toHaveCSS('color', 'rgb(205, 49, 49)');
     });
 
     test('should show trace source', async ({ runInlineTest, page, showReport }) => {
@@ -482,10 +586,10 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
       await page.click('img');
-      await page.click('.action-title >> text=page.evaluate');
-      await page.click('text=Source');
+      await page.click('.action-title >> text=EVALUATE');
+      await page.getByRole('tab', { name: 'Source' }).click();
 
       await expect(page.locator('.CodeMirror-line')).toContainText([
         /import.*test/,
@@ -493,10 +597,10 @@ for (const useIntermediateMergeReport of [false] as const) {
       ]);
       await expect(page.locator('.source-line-running')).toContainText('page.evaluate');
 
-      await expect(page.getByTestId('stack-trace-list')).toContainText([
+      await expect(page.getByRole('list', { name: 'Stack trace' }).getByRole('listitem')).toContainText([
         /a.test.js:[\d]+/,
       ]);
-      await expect(page.getByTestId('stack-trace-list').locator('.list-view-entry.selected')).toContainText('a.test.js');
+      await expect(page.getByRole('list', { name: 'Stack trace' }).getByRole('listitem').and(page.locator('.selected'))).toContainText('a.test.js');
     });
 
     test('should not show stack trace', async ({ runInlineTest, page, showReport }) => {
@@ -515,9 +619,9 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
       await page.click('img');
-      await page.click('.action-title >> text=page.evaluate');
+      await page.click('.action-title >> text=EVALUATE');
       await page.click('text=Source');
 
       await expect(page.locator('.CodeMirror-line')).toContainText([
@@ -545,9 +649,10 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
       await page.click('img');
-      await expect(page.locator('.workbench-loader .title')).toHaveText('a.test.js:3 › passes');
+      await expect(page.locator('.progress-dialog')).toBeHidden();
+      await expect(page.locator('.workbench-loader > .header > .title')).toHaveText('a.test.js:3 › passes');
     });
 
     test('should show multi trace source', async ({ runInlineTest, page, server, showReport }) => {
@@ -569,17 +674,17 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=passes');
+      await page.getByRole('link', { name: 'passes' }).click();
       // Expect one image-link to trace viewer and 2 separate download links
       await expect(page.locator('img')).toHaveCount(1);
-      await expect(page.locator('a', { hasText: 'trace' })).toHaveText(['trace']);
+      await expect(page.getByRole('link', { name: 'trace', exact: true })).toBeVisible();
 
       await page.click('img');
-      await page.click('.action-title >> text=page.evaluate');
+      await page.click('.action-title >> text=EVALUATE');
       await page.click('text=Source');
       await expect(page.locator('.source-line-running')).toContainText('page.evaluate');
 
-      await page.click('.action-title >> text=apiRequestContext.get');
+      await page.click('.action-title >> text=GET');
       await page.click('text=Source');
       await expect(page.locator('.source-line-running')).toContainText('request.get');
     });
@@ -602,18 +707,18 @@ for (const useIntermediateMergeReport of [false] as const) {
             ]);
           });
         `,
-      }, { reporter: 'html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      }, { reporter: 'html,dot' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
       expect(result.exitCode).toBe(0);
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.getByRole('link', { name: 'View trace' }).click();
+      await page.getByRole('link', { name: 'View Trace' }).click();
 
       // Trace viewer should not hang here when displaying parallal requests.
-      await expect(page.getByTestId('actions-tree')).toContainText('apiRequestContext.get');
-      await page.getByText('apiRequestContext.get').nth(2).click();
-      await page.getByText('apiRequestContext.get').nth(1).click();
-      await page.getByText('apiRequestContext.get').nth(0).click();
+      await expect(page.getByTestId('actions-tree')).toContainText('GET');
+      await page.getByText('GET "/empty.html"').nth(2).click();
+      await page.getByText('GET "/empty.html"').nth(1).click();
+      await page.getByText('GET "/empty.html"').nth(0).click();
     });
 
     test('should warn user when viewing via file:// protocol', async ({ runInlineTest, page, showReport }, testInfo) => {
@@ -633,14 +738,14 @@ for (const useIntermediateMergeReport of [false] as const) {
 
       await test.step('view via server', async () => {
         await showReport();
-        await page.locator('[title="View trace"]').click();
+        await page.getByRole('link', { name: 'View Trace' }).click();
         await expect(page.locator('dialog')).toBeHidden();
       });
 
       await test.step('view via local file://', async () => {
         const reportFolder = testInfo.outputPath('playwright-report');
         await page.goto(url.pathToFileURL(path.join(reportFolder, 'index.html')).toString());
-        await page.locator('[title="View trace"]').click();
+        await page.getByRole('link', { name: 'View Trace' }).click();
         await expect(page.locator('dialog')).toBeVisible();
         await expect(page.locator('dialog')).toContainText('must be loaded over');
       });
@@ -690,12 +795,12 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(0);
 
       await showReport();
-      await page.click('text=fails');
+      await page.getByRole('link', { name: 'fails' }).click();
 
       await page.click('.tree-item:has-text("outer error") >> text=outer error');
       await page.click('.tree-item:has-text("outer error") >> .tree-item >> text=inner error');
       await expect(page.locator('.tree-item:has-text("outer error") svg.color-text-danger')).toHaveCount(3);
-      await expect(page.locator('.tree-item:has-text("expect.soft.toBe"):not(:has-text("inner"))')).toBeVisible();
+      await expect(page.locator('.tree-item:has-text("toBe"):not(:has-text("inner"))')).toBeVisible();
 
       await page.click('text=outer step');
       await expect(page.locator('.tree-item:has-text("outer step") svg.color-text-danger')).toHaveCount(2);
@@ -717,6 +822,86 @@ for (const useIntermediateMergeReport of [false] as const) {
       ]);
     });
 
+    test('should show step snippets from non-root', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'playwright.config.js': `
+          export default { testDir: './tests' };
+        `,
+        'tests/a.test.ts': `
+          import { test, expect } from '@playwright/test';
+
+          test('example', async ({}) => {
+            await test.step('step title', async () => {
+              expect(1).toBe(1);
+            });
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+
+      await showReport();
+      await page.getByRole('link', { name: 'example' }).click();
+      await page.click('text=step title');
+      await page.click('text=Expect "toBe"');
+      await expect(page.getByTestId('test-snippet')).toContainText([
+        `await test.step('step title', async () => {`,
+        'expect(1).toBe(1);',
+      ]);
+    });
+
+    test('should show skipped step snippets', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'playwright.config.js': `
+          export default { testDir: './tests' };
+        `,
+        'tests/a.test.ts': `
+          import { test, expect } from '@playwright/test';
+
+          test('example', async ({}) => {
+            await test.step.skip('skipped step title', async () => {
+              expect(1).toBe(1);
+              await test.step('inner step', async () => {
+                expect(1).toBe(1);
+              });
+            });
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+
+      await showReport();
+      await page.getByRole('link', { name: 'example' }).click();
+      await page.click('text=skipped step title (skipped)');
+      await expect(page.getByTestId('test-snippet')).toContainText(`await test.step.skip('skipped step title', async () => {`);
+    });
+
+    test('step title should include skipped step description', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'playwright.config.js': `
+          export default { testDir: './tests' };
+        `,
+        'tests/a.test.ts': `
+          import { test, expect } from '@playwright/test';
+
+          test('example', async ({}) => {
+            await test.step('step title', async (step) => {
+              expect(1).toBe(1);
+              step.skip(true, 'conditional step.skip');
+            });
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+
+      await showReport();
+      await page.getByRole('link', { name: 'example' }).click();
+      await page.click('text=step title (skipped: conditional step.skip)');
+      await expect(page.getByTestId('test-snippet')).toContainText(`await test.step('step title', async (step) => {`);
+    });
+
     test('should render annotations', async ({ runInlineTest, page, showReport }) => {
       const result = await runInlineTest({
         'playwright.config.js': `
@@ -733,10 +918,57 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=annotated test');
+      await page.getByRole('link', { name: 'annotated test' }).click();
       await expect(page.locator('.test-case-annotation')).toHaveText('issue: I am not interested in this test');
     });
 
+    test('should not crash on falsy non-string annotation', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35469' } }, async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'playwright.config.js': `
+          module.exports = { timeout: 1500 };
+        `,
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('annotated test', async ({ page }) => {
+            test.info().annotations.push({ type: 'issue', description: 0 });
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+
+      await showReport();
+      await page.getByRole('link', { name: 'annotated test' }).click();
+      await expect(page.locator('.test-case-annotation')).toHaveText('issue: 0');
+    });
+
+    test('should render dynamic annotations at test result level', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'playwright.config.js': `
+          module.exports = { timeout: 1500, retries: 3 };
+        `,
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('annotated test', async ({}) => {
+            test.info().annotations.push({ type: 'foo', description: 'retry #' + test.info().retry });
+            test.info().annotations.push({ type: 'bar', description: 'static value' });
+            throw new Error('fail');
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.failed).toBe(1);
+
+      await showReport();
+      await page.getByRole('link', { name: 'annotated test' }).click();
+      await page.getByRole('tab', { name: 'Retry #1' }).click();
+      await expect(page.getByTestId('test-case-annotations')).toContainText('foo: retry #1');
+
+      await page.getByRole('tab', { name: 'Retry #3' }).click();
+      await expect(page.getByTestId('test-case-annotations')).toContainText('foo: retry #3');
+
+      await expect(page.getByTestId('test-case-annotations').getByText('static value')).toHaveCount(1);
+    });
+
     test('should render annotations as link if needed', async ({ runInlineTest, page, showReport, server }) => {
       const result = await runInlineTest({
         'playwright.config.js': `
@@ -802,6 +1034,47 @@ for (const useIntermediateMergeReport of [false] as const) {
       await expect(page.locator('.attachment-body')).toHaveText(['foo', '{"foo":1}', 'utf16 encoded']);
     });
 
+    test('should have link for opening HTML attachments in new tab', async ({ runInlineTest, page, showReport }) => {
+      test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32281' });
+      test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35489' });
+
+      const result = await runInlineTest({
+        'a.test.js': `
+          import * as fs from 'fs/promises';
+          import { test, expect } from '@playwright/test';
+          test('passing', async ({ page }, testInfo) => {
+            await testInfo.attach('axe-report.html', {
+              contentType: 'text/html',
+              body: '<h1>Axe Report</h1>',
+            });
+
+            const attachmentFile = testInfo.outputPath('foo.html');
+            await fs.writeFile(attachmentFile, '<h1>Hello World</h1>');
+            await testInfo.attach('foo.html', { path: attachmentFile });
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+
+      await showReport();
+      await page.getByText('passing', { exact: true }).click();
+
+      const [axeTab] = await Promise.all([
+        page.waitForEvent('popup'),
+        page.getByText('axe-report.html', { exact: true }).click(),
+      ]);
+
+      await expect(axeTab).toHaveURL(/^blob:/);
+      await expect(axeTab.getByText('Axe Report')).toBeVisible();
+
+      const [fooTab] = await Promise.all([
+        page.waitForEvent('popup'),
+        page.getByText('foo.html', { exact: true }).click(),
+      ]);
+
+      await expect(fooTab.getByText('Hello World')).toBeVisible();
+    });
+
     test('should use file-browser friendly extensions for buffer attachments based on contentType', async ({ runInlineTest, showReport, page }, testInfo) => {
       const result = await runInlineTest({
         'a.test.js': `
@@ -822,7 +1095,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       await page.getByRole('link', { name: 'passing' }).click();
 
       const expectedAttachments = [
-        ['screenshot', 'screenshot.png', 'd606c7545cd71c2b0c27d9f99edbad4fa39f1174.png'],
+        ['screenshot', 'screenshot.png', '7a33d5db6370b6de345e990751aa1f1da65ad675.png'],
         ['some-pdf', 'some-pdf.pdf', '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33.pdf'],
         ['madeup-contentType', 'madeup-contentType.dat', '62cdb7020ff920e5aa642c3d4066950dd1f01f4d.dat'],
         ['screenshot-that-already-has-an-extension-with-madeup.png', 'screenshot-that-already-has-an-extension-with-madeup.png', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8.png'],
@@ -841,7 +1114,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
       const files = await fs.promises.readdir(path.join(testInfo.outputPath('playwright-report'), 'data'));
       expect(new Set(files)).toEqual(new Set([
-        'd606c7545cd71c2b0c27d9f99edbad4fa39f1174.png', // screenshot
+        '7a33d5db6370b6de345e990751aa1f1da65ad675.png', // screenshot
         '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33.pdf', // some-pdf
         '62cdb7020ff920e5aa642c3d4066950dd1f01f4d.dat', // madeup-contentType
         '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8.png', // screenshot-that-already-has-an-extension-with-madeup.png
@@ -850,7 +1123,79 @@ for (const useIntermediateMergeReport of [false] as const) {
       ]));
     });
 
-    test('should strikethrough textual diff', async ({ runInlineTest, showReport, page }) => {
+    test('should link from attach step to attachment view', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('passing', async ({ page }, testInfo) => {
+            for (let i = 0; i < 100; i++)
+              await testInfo.attach('foo-1', { body: 'bar' });
+            await testInfo.attach('foo-2', { body: 'bar' });
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+
+      await showReport();
+      await page.getByRole('link', { name: 'passing' }).click();
+
+      const attachment = page.getByText('foo-2', { exact: true });
+      await expect(attachment).not.toBeInViewport();
+      await page.getByLabel(`attach "foo-2"`).getByTitle('reveal attachment').click();
+      await expect(attachment).toBeInViewport();
+
+      await page.reload();
+      await expect(attachment).toBeInViewport();
+    });
+
+    test('steps with internal attachments have links', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('passing', async ({ page }, testInfo) => {
+            for (let i = 0; i < 100; i++)
+              await testInfo.attach('spacer', { body: 'content' });
+
+            await test.step('step', async () => {
+              testInfo.attachments.push({ name: 'attachment', body: 'content', contentType: 'text/plain' });
+            })
+
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+
+      await showReport();
+      await page.getByRole('link', { name: 'passing' }).click();
+
+      const attachment = page.getByText('attachment', { exact: true });
+      await expect(attachment).not.toBeInViewport();
+      await page.getByLabel('step').getByTitle('reveal attachment').click();
+      await expect(attachment).toBeInViewport();
+    });
+
+    test('step.attach have links', async ({ runInlineTest, page, showReport }) => {
+      const result = await runInlineTest({
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('passing test', async ({ page }, testInfo) => {
+            await test.step('step', async (step) => {
+              await step.attach('text attachment', { body: 'content', contentType: 'text/plain' });
+            })
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+
+      await showReport();
+      await page.getByRole('link', { name: 'passing test' }).click();
+
+      await page.getByLabel('step').getByTitle('reveal attachment').click();
+      await page.getByText('text attachment', { exact: true }).click();
+      await expect(page.locator('.attachment-body')).toHaveText('content');
+    });
+
+    test('should highlight textual diff', async ({ runInlineTest, showReport, page }) => {
       const result = await runInlineTest({
         'helper.ts': `
           import { test as base } from '@playwright/test';
@@ -872,36 +1217,33 @@ for (const useIntermediateMergeReport of [false] as const) {
       }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
       expect(result.exitCode).toBe(1);
       await showReport();
-      await page.click('text="is a test"');
-      const stricken = await page.locator('css=strike').innerText();
-      expect(stricken).toBe('old');
+      await page.getByRole('link', { name: 'is a test' }).click();
+
+      await expect(page.locator('.test-error-view').getByText('-old')).toHaveCSS('color', 'rgb(0, 188, 0)');
+      await expect(page.locator('.test-error-view').getByText('+new', { exact: true })).toHaveCSS('color', 'rgb(205, 49, 49)');
     });
 
-    test('should strikethrough textual diff with commonalities', async ({ runInlineTest, showReport, page }) => {
+    test('should highlight inline textual diff in toHaveText', async ({ runInlineTest, showReport, page }) => {
       const result = await runInlineTest({
-        'helper.ts': `
-          import { test as base } from '@playwright/test';
-          export * from '@playwright/test';
-          export const test = base.extend({
-            auto: [ async ({}, run, testInfo) => {
-              testInfo.snapshotSuffix = '';
-              await run();
-            }, { auto: true } ]
-          });
-        `,
-        'a.spec.js-snapshots/snapshot.txt': `oldcommon`,
-        'a.spec.js': `
-          const { test, expect } = require('./helper');
-          test('is a test', ({}) => {
-            expect('newcommon').toMatchSnapshot('snapshot.txt');
+        'a.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('is a test', async ({ page }) => {
+            await page.setContent('<div>begin inner end</div>');
+            await expect(page.locator('div')).toHaveText('inner', { timeout: 500 });
           });
         `
       }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
       expect(result.exitCode).toBe(1);
       await showReport();
-      await page.click('text="is a test"');
-      const stricken = await page.locator('css=strike').innerText();
-      expect(stricken).toBe('old');
+      await page.getByRole('link', { name: 'is a test' }).click();
+      await expect(page.locator('.test-error-view').getByText('begin ', { exact: true })).toHaveCSS('color', 'rgb(246, 248, 250)');
+      await expect(page.locator('.test-error-view').getByText('begin ', { exact: true })).toHaveCSS('background-color', 'rgb(205, 49, 49)');
+
+      await expect(page.locator('.test-error-view').getByText('inner', { exact: true })).toHaveCSS('color', 'rgb(205, 49, 49)');
+      await expect(page.locator('.test-error-view').getByText('inner', { exact: true })).toHaveCSS('background-color', 'rgb(246, 248, 250)');
+
+      await expect(page.locator('.test-error-view').getByText('end ', { exact: true })).toHaveCSS('color', 'rgb(246, 248, 250)');
+      await expect(page.locator('.test-error-view').getByText('end ', { exact: true })).toHaveCSS('background-color', 'rgb(205, 49, 49)');
     });
 
     test('should differentiate repeat-each test cases', async ({ runInlineTest, showReport, page }) => {
@@ -918,13 +1260,13 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.exitCode).toBe(1);
       await showReport();
 
-      await page.locator('text=sample').first().click();
-      await expect(page.locator('text=ouch')).toHaveCount(1);
-      await page.locator('text=All').first().click();
+      await page.getByText('sample').first().click();
+      await expect(page.getByText('ouch')).toHaveCount(2);
+      await page.getByText('All').first().click();
 
-      await page.locator('text=sample').nth(1).click();
-      await expect(page.locator('text=Before Hooks')).toBeVisible();
-      await expect(page.locator('text=ouch')).toBeHidden();
+      await page.getByText('sample').nth(1).click();
+      await expect(page.getByText('Before Hooks')).toBeVisible();
+      await expect(page.getByText('ouch')).toBeHidden();
     });
 
     test('should group similar / loop steps', async ({ runInlineTest, showReport, page }) => {
@@ -945,8 +1287,40 @@ for (const useIntermediateMergeReport of [false] as const) {
 
       await page.locator('text=sample').first().click();
       await expect(page.locator('.tree-item-title')).toContainText([
-        /expect\.toBe.*10/,
-        /expect\.toEqual.*20/,
+        /Expect "toBe".*10/,
+        /Expect "toEqual".*20/,
+      ]);
+    });
+
+    test('show custom fixture titles', async ({ runInlineTest, showReport, page }) => {
+      const result = await runInlineTest({
+        'a.spec.js': `
+          import { test as base, expect } from '@playwright/test';
+
+          const test = base.extend({
+            fixture1: [async ({}, use) => {
+              await use();
+            }, { title: 'custom fixture name' }],
+            fixture2: async ({}, use) => {
+              await use();
+            },
+          });
+
+          test('sample', ({ fixture1, fixture2 }) => {
+            // Empty test using both fixtures
+          });
+        `
+      }, { 'reporter': 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      await showReport();
+      await page.getByRole('link', { name: 'sample' }).click();
+      await page.getByText('Before Hooks').click();
+      await expect(page.getByText('Fixture "custom fixture name"')).toBeVisible();
+      await expect(page.locator('.tree-item-title')).toHaveText([
+        /Before Hooks/,
+        /Fixture "custom fixture name"/,
+        /Fixture "fixture2"/,
+        /After Hooks/,
       ]);
     });
 
@@ -964,148 +1338,140 @@ for (const useIntermediateMergeReport of [false] as const) {
       await expect(page.locator('text=a.spec.js')).toBeVisible();
       await page.locator('text=sample').first().click();
       await expect(page.locator('.tree-item-title')).toContainText([
-        /expect\.toBe/,
+        /Expect "toBe"/,
       ]);
     });
 
-    test.describe('gitCommitInfo plugin', () => {
-      test('should include metadata', async ({ runInlineTest, writeFiles, showReport, page }) => {
-        const files = {
-          'uncommitted.txt': `uncommitted file`,
-          'playwright.config.ts': `
-            import { gitCommitInfo } from 'playwright/lib/plugins';
-            import { test, expect } from '@playwright/test';
-            const plugins = [gitCommitInfo()];
-            export default { '@playwright/test': { plugins } };
-          `,
-          'example.spec.ts': `
-            import { test, expect } from '@playwright/test';
-            test('sample', async ({}) => { expect(2).toBe(2); });
-          `,
-        };
-        const baseDir = await writeFiles(files);
-
-        const execGit = async (args: string[]) => {
-          const { code, stdout, stderr } = await spawnAsync('git', args, { stdio: 'pipe', cwd: baseDir });
-          if (!!code)
-            throw new Error(`Non-zero exit of:\n$ git ${args.join(' ')}\nConsole:\nstdout:\n${stdout}\n\nstderr:\n${stderr}\n\n`);
-          return;
-        };
-
-        await execGit(['init']);
-        await execGit(['config', '--local', 'user.email', 'shakespeare@example.local']);
-        await execGit(['config', '--local', 'user.name', 'William']);
-        await execGit(['add', '*.ts']);
-        await execGit(['commit', '-m', 'awesome commit message']);
-
-        const result = await runInlineTest(files, { reporter: 'dot,html' }, {
-          PLAYWRIGHT_HTML_OPEN: 'never',
-          GITHUB_REPOSITORY: 'microsoft/playwright-example-for-test',
-          GITHUB_RUN_ID: 'example-run-id',
-          GITHUB_SERVER_URL: 'https://playwright.dev',
-          GITHUB_SHA: 'example-sha',
-        });
-
-        await showReport();
+    test('should include commit metadata w/ captureGitInfo', async ({ runInlineTest, writeFiles, showReport, page }) => {
+      const files = {
+        'uncommitted.txt': `uncommitted file`,
+        'playwright.config.ts': `
+          export default {
+            captureGitInfo: { commit: true },
+          };
+        `,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({}) => { expect(2).toBe(2); });
+        `,
+      };
+      const baseDir = await writeFiles(files);
+      await initGitRepo(baseDir);
 
-        expect(result.exitCode).toBe(0);
-        await page.click('text=awesome commit message');
-        await expect.soft(page.getByTestId('revision.id')).toContainText(/^[a-f\d]+$/i);
-        await expect.soft(page.getByTestId('revision.id').locator('a')).toHaveAttribute('href', 'https://playwright.dev/microsoft/playwright-example-for-test/commit/example-sha');
-        await expect.soft(page.getByTestId('revision.timestamp')).toContainText(/AM|PM/);
-        await expect.soft(page.locator('text=awesome commit message')).toHaveCount(2);
-        await expect.soft(page.locator('text=William')).toBeVisible();
-        await expect.soft(page.locator('text=shakespeare@example.local')).toBeVisible();
-        await expect.soft(page.locator('text=CI/CD Logs')).toHaveAttribute('href', 'https://playwright.dev/microsoft/playwright-example-for-test/actions/runs/example-run-id');
-        await expect.soft(page.locator('text=Report generated on')).toContainText(/AM|PM/);
-        await expect.soft(page.getByTestId('metadata-chip')).toBeVisible();
-        await expect.soft(page.getByTestId('metadata-error')).not.toBeVisible();
+      const result = await runInlineTest(files, { reporter: 'dot,html' }, {
+        PLAYWRIGHT_HTML_OPEN: 'never',
       });
 
+      await showReport();
 
-      test('should use explicitly supplied metadata', async ({ runInlineTest, showReport, page }) => {
-        const result = await runInlineTest({
-          'uncommitted.txt': `uncommitted file`,
-          'playwright.config.ts': `
-            import { gitCommitInfo } from 'playwright/lib/plugins';
-            import { test, expect } from '@playwright/test';
-            const plugin = gitCommitInfo({
-              info: {
-                'revision.id': '1234567890',
-                'revision.subject': 'a better subject',
-                'revision.timestamp': new Date(),
-                'revision.author': 'William',
-                'revision.email': 'shakespeare@example.local',
-              },
-            });
-            export default { '@playwright/test': { plugins: [plugin] } };
-          `,
-          'example.spec.ts': `
-            import { gitCommitInfo } from 'playwright/lib/plugins';
-            import { test, expect } from '@playwright/test';
-            test('sample', async ({}) => { expect(2).toBe(2); });
-          `,
-        }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never', GITHUB_REPOSITORY: 'microsoft/playwright-example-for-test', GITHUB_RUN_ID: 'example-run-id', GITHUB_SERVER_URL: 'https://playwright.dev', GITHUB_SHA: 'example-sha' }, undefined);
+      expect(result.exitCode).toBe(0);
+      await page.getByRole('button', { name: 'Metadata' }).click();
+      await expect(page.locator('.metadata-view')).toMatchAriaSnapshot(`
+        - list:
+          - listitem: "chore(html): make this test look nice"
+          - listitem: /William <shakespeare@example\\.local>/
+      `);
+    });
+
+    test('should include commit metadata w/ CI', async ({ runInlineTest, writeFiles, showReport, page }) => {
+      const files = {
+        'uncommitted.txt': `uncommitted file`,
+        'playwright.config.ts': `export default {}`,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({}) => { expect(2).toBe(2); });
+        `,
+      };
+      const baseDir = await writeFiles(files);
+      await initGitRepo(baseDir);
+
+      const result = await runInlineTest(files, { reporter: 'dot,html' }, {
+        PLAYWRIGHT_HTML_OPEN: 'never',
+        ...ghaCommitEnv(),
+      });
+
+      await showReport();
 
-        await showReport();
+      expect(result.exitCode).toBe(0);
+      await page.getByRole('button', { name: 'Metadata' }).click();
+      await expect(page.locator('.metadata-view')).toMatchAriaSnapshot(`
+        - list:
+          - listitem:
+            - 'link "chore(html): make this test look nice"'
+          - listitem: /William <shakespeare@example\\.local>/
+      `);
+    });
 
-        expect(result.exitCode).toBe(0);
-        await page.click('text=a better subject');
-        await expect.soft(page.getByTestId('revision.id')).toContainText(/^[a-f\d]+$/i);
-        await expect.soft(page.getByTestId('revision.id').locator('a')).toHaveAttribute('href', 'https://playwright.dev/microsoft/playwright-example-for-test/commit/example-sha');
-        await expect.soft(page.getByTestId('revision.timestamp')).toContainText(/AM|PM/);
-        await expect.soft(page.locator('text=a better subject')).toHaveCount(2);
-        await expect.soft(page.locator('text=William')).toBeVisible();
-        await expect.soft(page.locator('text=shakespeare@example.local')).toBeVisible();
-        await expect.soft(page.locator('text=CI/CD Logs')).toHaveAttribute('href', 'https://playwright.dev/microsoft/playwright-example-for-test/actions/runs/example-run-id');
-        await expect.soft(page.locator('text=Report generated on')).toContainText(/AM|PM/);
-        await expect.soft(page.getByTestId('metadata-chip')).toBeVisible();
-        await expect.soft(page.getByTestId('metadata-error')).not.toBeVisible();
+    test('should include PR metadata on GHA', async ({ runInlineTest, writeFiles, showReport, page }) => {
+      const files = {
+        'uncommitted.txt': `uncommitted file`,
+        'playwright.config.ts': `export default {}`,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({}) => { expect(2).toBe(2); });
+        `,
+      };
+      const baseDir = await writeFiles(files);
+      await initGitRepo(baseDir);
+
+      const result = await runInlineTest(files, { reporter: 'dot,html' }, {
+        PLAYWRIGHT_HTML_OPEN: 'never',
+        ...(await ghaPullRequestEnv(baseDir))
       });
 
-      test('should not have metadata by default', async ({ runInlineTest, showReport, page }) => {
-        const result = await runInlineTest({
-          'uncommitted.txt': `uncommitted file`,
-          'playwright.config.ts': `
-            export default {};
-          `,
-          'example.spec.ts': `
-            import { test, expect } from '@playwright/test';
-            test('my sample test', async ({}) => { expect(2).toBe(2); });
-          `,
-        }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' }, undefined);
+      await showReport();
 
-        await showReport();
+      expect(result.exitCode).toBe(0);
+      await page.getByRole('button', { name: 'Metadata' }).click();
+      await expect(page.locator('.metadata-view')).toMatchAriaSnapshot(`
+        - list:
+          - listitem:
+            - link "My PR"
+          - listitem: /William <shakespeare@example.local>/
+      `);
+    });
 
-        expect(result.exitCode).toBe(0);
-        await expect.soft(page.locator('text="my sample test"')).toBeVisible();
-        await expect.soft(page.getByTestId('metadata-error')).not.toBeVisible();
-        await expect.soft(page.getByTestId('metadata-chip')).not.toBeVisible();
-      });
+    test('should not include git metadata w/o CI', async ({ runInlineTest, showReport, page }) => {
+      const result = await runInlineTest({
+        'playwright.config.ts': `
+          export default {};
+        `,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('my sample test', async ({}) => { expect(2).toBe(2); });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' }, undefined);
 
-      test('should not include metadata if user supplies invalid values via metadata field', async ({ runInlineTest, showReport, page }) => {
-        const result = await runInlineTest({
-          'uncommitted.txt': `uncommitted file`,
-          'playwright.config.ts': `
-            export default {
-              metadata: {
-                'revision.timestamp': 'hi',
-              },
-            };
-          `,
-          'example.spec.ts': `
-            import { test, expect } from '@playwright/test';
-            test('my sample test', async ({}) => { expect(2).toBe(2); });
-          `,
-        }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      await showReport();
 
-        await showReport();
+      expect(result.exitCode).toBe(0);
+      await expect.soft(page.getByRole('button', { name: 'Metadata' })).toBeHidden();
+      await expect.soft(page.locator('.metadata-view')).toBeHidden();
+    });
 
-        expect(result.exitCode).toBe(0);
-        await expect.soft(page.locator('text="my sample test"')).toBeVisible();
-        await expect.soft(page.getByTestId('metadata-error')).toBeVisible();
-        await expect.soft(page.getByTestId('metadata-chip')).not.toBeVisible();
-      });
+    test('should show an error when metadata has invalid fields', async ({ runInlineTest, showReport, page }) => {
+      const result = await runInlineTest({
+        'uncommitted.txt': `uncommitted file`,
+        'playwright.config.ts': `
+          export default {
+            metadata: {
+              gitCommit: { author: { date: 'hi' } }
+            },
+          };
+        `,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('my sample test', async ({}) => { expect(2).toBe(2); });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+
+      await showReport();
+
+      expect(result.exitCode).toBe(0);
+      await page.getByRole('button', { name: 'Metadata' }).click();
+      await expect(page.locator('.metadata-view')).toMatchAriaSnapshot(`
+        - paragraph: An error was encountered when trying to render metadata.
+      `);
     });
 
     test('should report clashing folders', async ({ runInlineTest, useIntermediateMergeReport }) => {
@@ -1351,6 +1717,25 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.label')).toHaveText('webkit');
       });
 
+      test('project label should not show if there are no explicit projects', async ({ runInlineTest, showReport, page }) => {
+        const result = await runInlineTest({
+          'a.test.js': `
+            const { expect, test } = require('@playwright/test');
+            test('pass', async ({}) => {
+              expect(1).toBe(1);
+            });
+          `,
+        }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+
+        expect(result.exitCode).toBe(0);
+        expect(result.passed).toBe(1);
+
+        await showReport();
+
+        await expect(page.locator('.test-file-test .label')).toHaveCount(0);
+        await expect(page.locator('.label-row')).not.toBeVisible();
+      });
+
       test('testCaseView - after click test label and go back, testCaseView should be visible', async ({ runInlineTest, showReport, page }) => {
         const result = await runInlineTest({
           'playwright.config.js': `
@@ -1385,7 +1770,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.label')).toHaveText(['chromium', 'flaky']);
         await page.locator('.label', { has: page.getByText('flaky', { exact: true }) }).click();
         await expect(page).not.toHaveURL(/testId/);
-        await expect(searchInput).toHaveValue('@flaky');
+        await expect(searchInput).toHaveValue('@flaky ');
         await page.goBack();
         await expect(page).toHaveURL(/testId/);
         await expect(page.locator('.label')).toHaveCount(2);
@@ -1460,7 +1845,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await expect(smokeLabelButton).toBeVisible();
         await smokeLabelButton.click();
-        await expect(searchInput).toHaveValue('@smoke');
+        await expect(searchInput).toHaveValue('@smoke ');
         await expect(page.locator('.test-file-test')).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
@@ -1480,7 +1865,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
 
         await regressionLabelButton.click();
-        await expect(searchInput).toHaveValue('@regression');
+        await expect(searchInput).toHaveValue('@regression ');
         await expect(page.locator('.test-file-test')).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(0);
@@ -1493,7 +1878,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         const tagWithDash = page.locator('.test-file-test', { has: page.getByText('Error Pages › @GCC-1508 passes', { exact: true }) }).locator('.label', { hasText: 'GCC-1508' });
 
         await tagWithDash.click();
-        await expect(searchInput).toHaveValue('@GCC-1508');
+        await expect(searchInput).toHaveValue('@GCC-1508 ');
         await expect(page.locator('.test-file-test')).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(0);
@@ -1504,7 +1889,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         const tagWithDash2 = page.locator('.test-file-test', { has: page.getByText('Error Pages › @GCC-1510 fails', { exact: true }) }).locator('.label', { hasText: 'GCC-1510' });
 
         await tagWithDash2.click();
-        await expect(searchInput).toHaveValue('@GCC-1510');
+        await expect(searchInput).toHaveValue('@GCC-1510 ');
         await expect(page.locator('.test-file-test')).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
@@ -1546,7 +1931,50 @@ for (const useIntermediateMergeReport of [false] as const) {
 
           const testTitle = page.locator('.test-file-test .test-file-title', { hasText: `${tag} passes` });
           await testTitle.click();
-          await expect(page.locator('.test-case-title', { hasText: `${tag} passes` })).toBeVisible();
+          await expect(page.locator('.header-title', { hasText: `${tag} passes` })).toBeVisible();
+          await expect(page.locator('.label', { hasText: tag })).toBeVisible();
+
+          await page.goBack();
+          await searchInput.clear();
+        }
+      });
+
+      test('tags with whitespace', async ({ runInlineTest, showReport, page }) => {
+        const result = await runInlineTest({
+          'a.test.js': `
+            const { expect, test } = require('@playwright/test');
+            const tags = ['@smoke-p1 with other text', '@issue[123] issue[456]', '@issue#123 issue#456', '@$$$ ???', '@tl/dr didn\\'t read'];
+
+            test.describe('Error Pages', () => {
+              tags.forEach(tag => {
+                test(tag.replace('@', '') + ' passes', { tag: [tag] }, async ({}) => {
+                  expect(1).toBe(1);
+                });
+              });
+            });
+          `,
+        }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+
+        expect(result.exitCode).toBe(0);
+        expect(result.passed).toBe(5);
+
+        await showReport();
+        const tags = ['smoke-p1 with other text', 'issue[123] issue[456]', 'issue#123 issue#456', '$$$ ???', 'tl/dr didn\'t read'];
+        const searchInput = page.locator('.subnav-search-input');
+
+        for (const tag of tags) {
+          const tagButton = page.locator('.label').getByText(tag, { exact: true });
+          await expect(tagButton).toBeVisible();
+
+          await tagButton.click();
+          await expect(page.locator('.test-file-test')).toHaveCount(1);
+          await expect(page.locator('.chip')).toHaveCount(1);
+          await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
+          await expect(page.locator('.test-file-test .test-file-title')).toHaveText(`Error Pages › ${tag} passes`);
+
+          const testTitle = page.locator('.test-file-test .test-file-title', { hasText: `${tag} passes` });
+          await testTitle.click();
+          await expect(page.locator('.header-title', { hasText: `${tag} passes` })).toBeVisible();
           await expect(page.locator('.label', { hasText: tag })).toBeVisible();
 
           await page.goBack();
@@ -1581,6 +2009,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         const smokeLabelButton = page.locator('.test-file-test', { has: page.getByText('@smoke fails', { exact: true }) }).locator('.label', { hasText: 'smoke' });
         await smokeLabelButton.click();
         await expect(page).toHaveURL(/@smoke/);
+        await expect(searchInput).toHaveValue('@smoke ');
         await searchInput.clear();
         await page.keyboard.press('Enter');
         await expect(searchInput).toHaveValue('');
@@ -1589,6 +2018,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         const regressionLabelButton = page.locator('.test-file-test', { has: page.getByText('@regression passes', { exact: true }) }).locator('.label', { hasText: 'regression' });
         await regressionLabelButton.click();
         await expect(page).toHaveURL(/@regression/);
+        await expect(searchInput).toHaveValue('@regression ');
         await searchInput.clear();
         await page.keyboard.press('Enter');
         await expect(searchInput).toHaveValue('');
@@ -1612,6 +2042,7 @@ for (const useIntermediateMergeReport of [false] as const) {
             const names = ['one foo', 'two foo', 'three bar', 'four bar', 'five baz'];
             for (const name of names) {
               test('b-' + name, async ({}) => {
+                test.info().annotations.push({ type: 'issue', description: 'test issue' });
                 expect(name).not.toContain('one');
                 await new Promise(f => setTimeout(f, 1100));
               });
@@ -1667,6 +2098,9 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.subnav-item:has-text("Failed") .counter')).toHaveText('3');
         await expect(page.locator('.subnav-item:has-text("Flaky") .counter')).toHaveText('0');
         await expect(page.locator('.subnav-item:has-text("Skipped") .counter')).toHaveText('0');
+
+        await searchInput.fill('annot:issue');
+        await expect(page.getByTestId('filtered-tests-count')).toContainText(`Filtered: 5`);
       });
 
       test('labels should be applied together with status filter', async ({ runInlineTest, showReport, page }) => {
@@ -1712,7 +2146,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
         await expect(page.locator('.test-file-test .test-file-title')).toHaveText('@smoke fails');
-        await expect(searchInput).toHaveValue('s:failed @smoke');
+        await expect(searchInput).toHaveValue('s:failed @smoke ');
         await expect(page).toHaveURL(/s:failed%20@smoke/);
 
         await passedNavMenu.click();
@@ -1722,7 +2156,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(0);
         await expect(page.locator('.test-file-test .test-file-title')).toHaveText('@regression passes');
-        await expect(searchInput).toHaveValue('s:passed @regression');
+        await expect(searchInput).toHaveValue('s:passed @regression ');
         await expect(page).toHaveURL(/s:passed%20@regression/);
 
         await allNavMenu.click();
@@ -1731,7 +2165,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
         await expect(page.locator('.test-file-test .test-file-title')).toHaveCount(2);
-        await expect(searchInput).toHaveValue('@regression');
+        await expect(searchInput).toHaveValue('@regression ');
         await expect(page).toHaveURL(/@regression/);
       });
 
@@ -1772,8 +2206,8 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.test-file-test')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
-        await expect(page.locator('.test-file-test .test-file-title')).toHaveCount(2);
-        await expect(searchInput).toHaveValue('@smoke');
+        await expect(page.locator('.test-file-test .test-file-title')).toHaveText(['@smoke fails', '@smoke passes']);
+        await expect(searchInput).toHaveValue('@smoke ');
         await expect(page).toHaveURL(/%40smoke/);
 
         await searchInput.fill('@regression');
@@ -1781,9 +2215,18 @@ for (const useIntermediateMergeReport of [false] as const) {
         await expect(page.locator('.test-file-test')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
-        await expect(page.locator('.test-file-test .test-file-title')).toHaveCount(2);
-        await expect(searchInput).toHaveValue('@regression');
+        await expect(page.locator('.test-file-test .test-file-title')).toHaveText(['@regression fails', '@regression passes']);
+        await expect(searchInput).toHaveValue('@regression ');
         await expect(page).toHaveURL(/%40regression/);
+
+        await searchInput.fill('!@regression');
+        await searchInput.press('Enter');
+        await expect(page.locator('.test-file-test')).toHaveCount(2);
+        await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
+        await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
+        await expect(page.locator('.test-file-test .test-file-title')).toHaveText(['@smoke fails', '@smoke passes']);
+        await expect(searchInput).toHaveValue('!@regression ');
+        await expect(page).toHaveURL(/%21%40regression/);
       });
 
       test('if label contains similar words only one label should be selected', async ({ runInlineTest, showReport, page }) => {
@@ -1905,7 +2348,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await page.keyboard.down(process.platform === 'darwin' ? 'Meta' : 'Control');
         await smokeButton.click();
 
-        await expect(searchInput).toHaveValue('@smoke');
+        await expect(searchInput).toHaveValue('@smoke ');
         await expect(page).toHaveURL(/@smoke/);
         await expect(page.locator('.chip')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
@@ -1914,7 +2357,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await regressionButton.click();
 
-        await expect(searchInput).toHaveValue('@smoke @regression');
+        await expect(searchInput).toHaveValue('@smoke @regression ');
         await expect(page).toHaveURL(/@smoke%20@regression/);
         await expect(page.locator('.chip')).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
@@ -1923,7 +2366,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await smokeButton.click();
 
-        await expect(searchInput).toHaveValue('@regression');
+        await expect(searchInput).toHaveValue('@regression ');
         await expect(page).toHaveURL(/@regression/);
         await expect(page.locator('.chip')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
@@ -1932,7 +2375,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await flakyButton.click();
 
-        await expect(searchInput).toHaveValue('@regression @flaky');
+        await expect(searchInput).toHaveValue('@regression @flaky ');
         await expect(page).toHaveURL(/@regression%20@flaky/);
         await expect(page.locator('.chip')).toHaveCount(1);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
@@ -1941,7 +2384,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await regressionButton.click();
 
-        await expect(searchInput).toHaveValue('@flaky');
+        await expect(searchInput).toHaveValue('@flaky ');
         await expect(page).toHaveURL(/@flaky/);
         await expect(page.locator('.chip')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
@@ -1960,7 +2403,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await page.keyboard.up(process.platform === 'darwin' ? 'Meta' : 'Control');
         await smokeButton.click();
 
-        await expect(searchInput).toHaveValue('@smoke');
+        await expect(searchInput).toHaveValue('@smoke ');
         await expect(page).toHaveURL(/@smoke/);
         await expect(page.locator('.chip')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
@@ -1969,7 +2412,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await regressionButton.click();
 
-        await expect(searchInput).toHaveValue('@regression');
+        await expect(searchInput).toHaveValue('@regression ');
         await expect(page).toHaveURL(/@regression/);
         await expect(page.locator('.chip')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
@@ -1978,7 +2421,7 @@ for (const useIntermediateMergeReport of [false] as const) {
 
         await flakyButton.click();
 
-        await expect(searchInput).toHaveValue('@flaky');
+        await expect(searchInput).toHaveValue('@flaky ');
         await expect(page).toHaveURL(/@flaky/);
         await expect(page.locator('.chip')).toHaveCount(2);
         await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
@@ -2059,7 +2502,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await notificationsChromiumTestCase.locator('.test-file-title').click();
         await expect(page).toHaveURL(/testId/);
         await expect(page.locator('.test-case-path')).toHaveText('Root describe › @Notifications');
-        await expect(page.locator('.test-case-title')).toHaveText('Test failed -- @call @call-details @e2e @regression #VQ458');
+        await expect(page.locator('.header-title')).toHaveText('Test failed -- @call @call-details @e2e @regression #VQ458');
         await expect(page.locator('.label')).toHaveText(['chromium', 'Notifications', 'call', 'call-details', 'e2e', 'regression']);
 
         await page.goBack();
@@ -2071,7 +2514,7 @@ for (const useIntermediateMergeReport of [false] as const) {
         await monitoringFirefoxTestCase.locator('.test-file-title').click();
         await expect(page).toHaveURL(/testId/);
         await expect(page.locator('.test-case-path')).toHaveText('Root describe › @Monitoring');
-        await expect(page.locator('.test-case-title')).toHaveText('Test passed -- @call @call-details @e2e @regression #VQ457');
+        await expect(page.locator('.header-title')).toHaveText('Test passed -- @call @call-details @e2e @regression #VQ457');
         await expect(page.locator('.label')).toHaveText(['firefox', 'Monitoring', 'call', 'call-details', 'e2e', 'regression']);
       });
     });
@@ -2183,13 +2626,33 @@ for (const useIntermediateMergeReport of [false] as const) {
       await expect(page.getByText('file-a.test.js', { exact: true })).toBeVisible();
       await expect(page.getByText('a test 1')).toBeVisible();
       await expect(page.getByText('a test 2')).toBeVisible();
-      await expect(page.getByText('file-b.test.js', { exact: true })).not.toBeVisible();
-      await expect(page.getByText('b test 1')).not.toBeVisible();
-      await expect(page.getByText('b test 2')).not.toBeVisible();
+      await expect(page.getByText('file-b.test.js', { exact: true })).toBeHidden();
+      await expect(page.getByText('b test 1')).toBeHidden();
+      await expect(page.getByText('b test 2')).toBeHidden();
+
+      await searchInput.fill('!file-a');
+      await expect(page.getByText('file-a.test.js', { exact: true })).toBeHidden();
+      await expect(page.getByText('a test 1')).toBeHidden();
+      await expect(page.getByText('a test 2')).toBeHidden();
+      await expect(page.getByText('file-b.test.js', { exact: true })).toBeVisible();
+      await expect(page.getByText('b test 1')).toBeVisible();
+      await expect(page.getByText('b test 2')).toBeVisible();
 
       await searchInput.fill('file-a:3');
+      await expect(page.getByText('file-a.test.js', { exact: true })).toBeVisible();
       await expect(page.getByText('a test 1')).toBeVisible();
-      await expect(page.getByText('a test 2')).not.toBeVisible();
+      await expect(page.getByText('a test 2')).toBeHidden();
+      await expect(page.getByText('file-b.test.js', { exact: true })).toBeHidden();
+      await expect(page.getByText('b test 1')).toBeHidden();
+      await expect(page.getByText('b test 2')).toBeHidden();
+
+      await searchInput.fill('!file-a:3');
+      await expect(page.getByText('file-a.test.js', { exact: true })).toBeVisible();
+      await expect(page.getByText('a test 1')).toBeHidden();
+      await expect(page.getByText('a test 2')).toBeVisible();
+      await expect(page.getByText('file-b.test.js', { exact: true })).toBeVisible();
+      await expect(page.getByText('b test 1')).toBeVisible();
+      await expect(page.getByText('b test 2')).toBeVisible();
     });
 
     test('tests should filter by status', async ({ runInlineTest, showReport, page }) => {
@@ -2211,31 +2674,65 @@ for (const useIntermediateMergeReport of [false] as const) {
 
       await searchInput.fill('s:failed');
       await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
-      await expect(page.getByText('failed title')).not.toBeVisible();
+      await expect(page.getByText('failed title')).toBeHidden();
       await expect(page.getByText('passes title')).toBeVisible();
+
+      await searchInput.fill('!s:failed');
+      await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
+      await expect(page.getByText('failed title')).toBeVisible();
+      await expect(page.getByText('passes title')).toBeHidden();
     });
 
     test('tests should filter by annotation texts', async ({ runInlineTest, showReport, page }) => {
       const result = await runInlineTest({
         'a.test.js': `
           const { test, expect } = require('@playwright/test');
-          test('annotated test',{ annotation :[{type:'key',description:'value'}]}, async ({}) => {expect(1).toBe(1);});
-          test('non-annotated test', async ({}) => {expect(1).toBe(2);});
+          test('with annotation',{ annotation :[{type:'key',description:'value'}]}, async ({}) => {expect(1).toBe(1);});
+          test('slow test', () => { test.slow(); });
+          test('without annotation', async ({}) => {expect(1).toBe(2);});
         `,
       }, { reporter: 'dot,html' }, { PW_TEST_HTML_REPORT_OPEN: 'never' });
 
       expect(result.exitCode).toBe(1);
-      expect(result.passed).toBe(1);
+      expect(result.passed).toBe(2);
       expect(result.failed).toBe(1);
 
       await showReport();
 
       const searchInput = page.locator('.subnav-search-input');
 
-      await searchInput.fill('annot:key=value');
-      await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
-      await expect(page.getByText('non-annotated test')).not.toBeVisible();
-      await expect(page.getByText('annotated test')).toBeVisible();
+      await test.step('filter by type and value', async () => {
+        await searchInput.fill('annot:key=value');
+        await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
+        await expect(page.getByText('without annotation')).toBeHidden();
+        await expect(page.getByText('with annotation')).toBeVisible();
+      });
+
+      await test.step('NOT filter by type and value', async () => {
+        await searchInput.fill('!annot:key=value');
+        await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
+        await expect(page.getByText('without annotation')).toBeVisible();
+        await expect(page.getByText('with annotation')).toBeHidden();
+      });
+
+      await test.step('filter by type', async () => {
+        await searchInput.fill('annot:key');
+        await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
+        await expect(page.getByText('without annotation')).toBeHidden();
+        await expect(page.getByText('with annotation')).toBeVisible();
+      });
+
+      await test.step('NOT filter by type', async () => {
+        await searchInput.fill('!annot:key');
+        await expect(page.getByText('a.test.js', { exact: true })).toBeVisible();
+        await expect(page.getByText('without annotation')).toBeVisible();
+        await expect(page.getByText('with annotation')).toBeHidden();
+      });
+
+      await test.step('filter by result annotation', async () => {
+        await searchInput.fill('annot:slow');
+        await expect(page.getByText('slow test')).toBeVisible();
+      });
     });
 
     test('tests should filter by fileName:line/column', async ({ runInlineTest, showReport, page }) => {
@@ -2263,9 +2760,17 @@ for (const useIntermediateMergeReport of [false] as const) {
       await expect(page.getByText('a.test.js:3', { exact: true })).toBeVisible();
       await expect(page.getByText('a.test.js:4', { exact: true })).toBeHidden();
 
+      await searchInput.fill('!a.test.js:3');
+      await expect(page.getByText('a.test.js:3', { exact: true })).toBeHidden();
+      await expect(page.getByText('a.test.js:4', { exact: true })).toBeVisible();
+
       await searchInput.fill('a.test.js:4:15');
       await expect(page.getByText('a.test.js:3', { exact: true })).toBeHidden();
       await expect(page.getByText('a.test.js:4', { exact: true })).toBeVisible();
+
+      await searchInput.fill('!a.test.js:4:15');
+      await expect(page.getByText('a.test.js:3', { exact: true })).toBeVisible();
+      await expect(page.getByText('a.test.js:4', { exact: true })).toBeHidden();
     });
 
     test('should properly display beforeEach with and without title', async ({ runInlineTest, showReport, page }) => {
@@ -2288,7 +2793,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=titles');
+      await page.getByRole('link', { name: 'titles' }).click();
 
       await page.click('text=Before Hooks');
       await expect(page.locator('.tree-item:has-text("Before Hooks") .tree-item')).toContainText([
@@ -2317,7 +2822,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=titles');
+      await page.getByRole('link', { name: 'titles' }).click();
 
       await page.click('text=Before Hooks');
       await expect(page.locator('.tree-item:has-text("Before Hooks") .tree-item')).toContainText([
@@ -2346,7 +2851,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=titles');
+      await page.getByRole('link', { name: 'titles' }).click();
 
       await page.click('text=After Hooks');
       await expect(page.locator('.tree-item:has-text("After Hooks") .tree-item')).toContainText([
@@ -2375,7 +2880,7 @@ for (const useIntermediateMergeReport of [false] as const) {
       expect(result.passed).toBe(1);
 
       await showReport();
-      await page.click('text=titles');
+      await page.getByRole('link', { name: 'titles' }).click();
 
       await page.click('text=After Hooks');
       await expect(page.locator('.tree-item:has-text("After Hooks") .tree-item')).toContainText([
@@ -2437,6 +2942,265 @@ for (const useIntermediateMergeReport of [false] as const) {
       await testFilePathLink.click();
       await expect(page.locator('.test-case-path')).toHaveText('Root describe');
     });
+
+    test('should print a user-friendly warning when opening a trace via file:// protocol', async ({ runInlineTest, showReport, page }) => {
+      await runInlineTest({
+        'playwright.config.ts': `
+          module.exports = {
+            projects: [{
+              name: 'chromium',
+              use: {
+                browserName: 'chromium',
+                trace: 'on',
+              }
+            }]
+          };
+        `,
+        'a.test.js': `
+          import { test } from '@playwright/test';
+          test('passes', ({ page }) => {});
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+
+      const reportPath = path.join(test.info().outputPath(), 'playwright-report');
+      await page.goto(url.pathToFileURL(path.join(reportPath, 'index.html')).toString());
+      await page.getByRole('link', { name: 'View trace' }).click();
+      await expect(page.locator('#fallback-error')).toContainText('The Playwright Trace Viewer must be loaded over the http:// or https:// protocols.');
+      await expect(page.locator('#fallback-error')).toContainText(`npx playwright show-report ${reportPath.replace(/\\/g, '\\\\')}`);
+    });
+
+    test('should not collate identical file names in different project directories', async ({ runInlineTest, page }) => {
+      await runInlineTest({
+        'playwright.config.ts': `
+          export default {
+            projects: [
+              { name: 'a', testDir: './tests/a' },
+              { name: 'b', testDir: './tests/b' },
+            ],
+          }
+        `,
+        'tests/a/test.spec.ts': `
+          import { test } from '@playwright/test';
+          test('passes', ({ page }) => {});
+        `,
+        'tests/b/test.spec.ts': `
+          import { test } from '@playwright/test';
+          test('passes', ({ page }) => {});
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      const reportPath = path.join(test.info().outputPath(), 'playwright-report', 'index.html');
+      await page.goto(url.pathToFileURL(reportPath).toString());
+      await expect(page.getByRole('main')).toMatchAriaSnapshot(`
+        - button "tests/a/test.spec.ts"
+        - button "tests/b/test.spec.ts"
+      `);
+    });
+
+    test('execSync doesnt produce a second stdout attachment', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33886' } }, async ({ runInlineTest, showReport, page }) => {
+      await runInlineTest({
+        'a.test.js': `
+          const { test, expect } = require('@playwright/test');
+          const { execSync } = require('node:child_process');
+          test('my test', async ({}) => {
+            console.log('foo');
+            execSync('echo bar', { stdio: 'inherit' });
+            console.log('baz');
+          });
+        `,
+      }, { reporter: 'dot,html' });
+
+      await showReport();
+      await page.getByText('my test').click();
+      await expect(page.getByTestId('attachments').getByText('stdout')).toHaveCount(1);
+    });
+
+    test('should include diff in AI prompt', async ({ runInlineTest, writeFiles, showReport, page }) => {
+      const files = {
+        'uncommitted.txt': `uncommitted file`,
+        'playwright.config.ts': `export default {}`,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({ page }) => {
+            await page.setContent('<button>Click me</button>');
+            expect(2).toBe(2);
+          });
+        `,
+      };
+      const baseDir = await writeFiles(files);
+      await initGitRepo(baseDir);
+      await writeFiles({
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({ page }) => {
+            await page.setContent('<button>Click me</button>');
+            expect(2).toBe(3);
+          });`
+      });
+      await execGit(baseDir, ['checkout', '-b', 'pr_branch']);
+      await execGit(baseDir, ['commit', '-am', 'changes']);
+
+      const result = await runInlineTest({}, { reporter: 'dot,html' }, {
+        PLAYWRIGHT_HTML_OPEN: 'never',
+        ...(await ghaPullRequestEnv(baseDir)),
+      });
+
+      expect(result.exitCode).toBe(1);
+      await showReport();
+
+      await page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
+
+      await page.getByRole('link', { name: 'sample' }).click();
+      await page.getByRole('button', { name: 'Copy prompt' }).click();
+      await page.waitForFunction(() => navigator.clipboard.readText());
+      const prompt = await page.evaluate(() => navigator.clipboard.readText());
+      expect(prompt, 'first line').toContain(`Playwright test failed.`);
+      expect(prompt, 'contains error').toContain('expect(received).toBe(expected)');
+      expect(prompt, 'contains snapshot').toContain('- button "Click me"');
+      expect(prompt, 'contains diff').toContain(`+            expect(2).toBe(3);`);
+    });
+
+    test('should include snapshot when page wasnt closed', async ({ runInlineTest, showReport, page }) => {
+      const result = await runInlineTest({
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({ browser }) => {
+            const page = await browser.newPage();
+            await page.setContent('<button>Click me</button>');
+            expect(2).toBe(3);
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(1);
+      await showReport();
+
+      await page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
+      await page.getByRole('link', { name: 'sample' }).click();
+      await page.getByRole('button', { name: 'Copy prompt' }).click();
+      await page.waitForFunction(() => navigator.clipboard.readText());
+      const prompt = await page.evaluate(() => navigator.clipboard.readText());
+      expect(prompt, 'contains snapshot').toContain('- button "Click me"');
+    });
+
+    test('should render locator description', async ({ runInlineTest, showReport, page }) => {
+      const result = await runInlineTest({
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('sample', async ({ browser }) => {
+            const page = await browser.newPage();
+            await page.setContent('<button>Click me</button>');
+            await page.locator('button').describe('Click me').click();
+          });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(0);
+      await showReport();
+      await page.getByRole('link', { name: 'sample' }).click();
+      await expect(page.locator('body')).toMatchAriaSnapshot(`
+        - treeitem "Click Click me"
+      `);
+    });
+
+    test('should respect snippets configuration option', async ({ runInlineTest, showReport, page }) => {
+      const result = await runInlineTest({
+        'playwright.config.ts': `
+          export default { reporter: [['html', { noSnippets: true }]] }
+        `,
+        'example.spec.ts': `
+          import { test, expect } from '@playwright/test';
+          test('fail without snippet', () => { expect(1).toBe(2); });
+        `,
+      }, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+      expect(result.exitCode).toBe(1);
+      await showReport();
+      await page.getByRole('link', { name: 'fail without snippet' }).click();
+      await expect(page.getByTestId('test-snippet')).not.toBeVisible();
+    });
+
+    test('should support keyboard shortcuts', async ({ runInlineTest, showReport, page }) => {
+      await runInlineTest({
+        'playwright.config.ts': `
+          module.exports = { name: 'project-name' };
+        `,
+        'a.test.js': `
+          import { test, expect } from '@playwright/test';
+          test('passes', async ({}) => {});
+          test('passes2', async ({}) => {});
+          test('fails', async ({}) => {
+            expect(1).toBe(2);
+          });
+          test('skipped', async ({}) => {
+            test.skip('Does not work')
+          });
+          test('flaky', async ({}, testInfo) => {
+            expect(testInfo.retry).toBe(1);
+          });
+        `,
+      }, { reporter: 'dot,html', retries: 1 }, { PLAYWRIGHT_HTML_OPEN: 'never' });
+
+      await showReport();
+
+      // Focus the page
+      await page.getByRole('link', { name: 'All' }).click();
+
+      await test.step('next', async () => {
+        await page.keyboard.press('ArrowRight');
+        await expect(page.locator('.header-title')).toHaveText('fails');
+        await page.keyboard.press('ArrowRight');
+        await expect(page.locator('.header-title')).toHaveText('flaky');
+        await page.keyboard.press('ArrowRight');
+        await expect(page.locator('.header-title')).toHaveText('passes');
+        await page.keyboard.press('ArrowRight');
+        await expect(page.locator('.header-title')).toHaveText('passes2');
+        // Bounce
+        await page.keyboard.press('ArrowRight');
+        await expect(page.locator('.header-title')).toHaveText('passes2');
+      });
+
+      await test.step('prev', async () => {
+        await page.keyboard.press('ArrowLeft');
+        await expect(page.locator('.header-title')).toHaveText('passes');
+        await page.keyboard.press('ArrowLeft');
+        await expect(page.locator('.header-title')).toHaveText('flaky');
+        await page.keyboard.press('ArrowLeft');
+        await expect(page.locator('.header-title')).toHaveText('fails');
+        await page.keyboard.press('ArrowLeft');
+        await expect(page.locator('.header-title')).toHaveText('fails');
+      });
+
+      await test.step('p', async () => {
+        await page.keyboard.press('p');
+        await expect(page.locator('.test-file-test')).toHaveCount(2);
+      });
+
+      await test.step('a', async () => {
+        await page.keyboard.press('a');
+        await expect(page.locator('.test-file-test')).toHaveCount(4);
+      });
+
+      await test.step('f', async () => {
+        await page.keyboard.press('f');
+        await expect(page.locator('.test-file-test')).toHaveCount(1);
+      });
+
+      await test.step('should ignore when modifiers are pressed', async () => {
+        await page.keyboard.down('ControlOrMeta');
+        await page.keyboard.press('p');
+        await expect(page.locator('.test-file-test')).toHaveCount(1);
+        await page.keyboard.up('ControlOrMeta');
+
+        await page.keyboard.down('Shift');
+        await page.keyboard.press('a');
+        await expect(page.locator('.test-file-test')).toHaveCount(1);
+        await page.keyboard.up('Shift');
+
+        await page.keyboard.press('p');
+
+        await page.keyboard.down('Alt');
+        await page.keyboard.press('f');
+        await expect(page.locator('.test-file-test')).toHaveCount(2);
+        await page.keyboard.up('Alt');
+      });
+    });
   });
 }
 
@@ -2447,3 +3211,46 @@ function readAllFromStream(stream: NodeJS.ReadableStream): Promise<Buffer> {
     stream.on('end', () => resolve(Buffer.concat(chunks)));
   });
 }
+
+async function execGit(baseDir: string, args: string[]) {
+  const { code, stdout, stderr } = await spawnAsync('git', args, { stdio: 'pipe', cwd: baseDir });
+  if (!!code)
+    throw new Error(`Non-zero exit of:\n$ git ${args.join(' ')}\nConsole:\nstdout:\n${stdout}\n\nstderr:\n${stderr}\n\n`);
+  return;
+}
+
+async function initGitRepo(baseDir: string) {
+  await execGit(baseDir, ['init']);
+  await execGit(baseDir, ['config', '--local', 'user.email', 'shakespeare@example.local']);
+  await execGit(baseDir, ['config', '--local', 'user.name', 'William']);
+  await execGit(baseDir, ['checkout', '-b', 'main']);
+  await execGit(baseDir, ['add', 'playwright.config.ts']);
+  await execGit(baseDir, ['commit', '-m', 'init']);
+  await execGit(baseDir, ['add', '*.ts']);
+  await execGit(baseDir, ['commit', '-m', 'chore(html): make this test look nice']);
+}
+
+function ghaCommitEnv() {
+  return {
+    GITHUB_ACTIONS: '1',
+    GITHUB_REPOSITORY: 'microsoft/playwright-example-for-test',
+    GITHUB_SERVER_URL: 'https://playwright.dev',
+    GITHUB_SHA: 'example-sha',
+  };
+}
+
+async function ghaPullRequestEnv(baseDir: string) {
+  const eventPath = path.join(baseDir, 'event.json');
+  await fs.promises.writeFile(eventPath, JSON.stringify({
+    pull_request: {
+      title: 'My PR',
+      number: 42,
+      base: { sha: 'main' },
+    },
+  }));
+  return {
+    ...ghaCommitEnv(),
+    GITHUB_RUN_ID: 'example-run-id',
+    GITHUB_EVENT_PATH: eventPath,
+  };
+}
diff --git a/tests/playwright-test/reporter-json.spec.ts b/tests/playwright-test/reporter-json.spec.ts
index f8ec8b9b0ba8a..89b995ff35269 100644
--- a/tests/playwright-test/reporter-json.spec.ts
+++ b/tests/playwright-test/reporter-json.spec.ts
@@ -327,3 +327,31 @@ test.describe('report location', () => {
     expect(fs.existsSync(testInfo.outputPath('foo', 'bar', 'baz', 'my-report.json'))).toBe(true);
   });
 });
+
+test('should report parallelIndex', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'tests/a.spec.js': `
+      import { test, expect } from '@playwright/test';
+      const fs = require('fs');
+      test.describe.configure({ mode: 'parallel' });
+      test('test 1 passes!', async ({}) => {
+        await new Promise(f => setTimeout(f, 1000));
+      });
+      test('test 2 fails!', async ({}) => {
+        expect(1 + 1).toBe(3);
+        await new Promise(f => setTimeout(f, 1000));
+      });
+      test('test 3 passes!', async ({}) => {
+        await new Promise(f => setTimeout(f, 1000));
+      });
+    `
+  }, { 'workers': '2', 'reporter': 'json' });
+  expect(result.passed).toBe(2);
+  expect(result.failed).toBe(1);
+  expect(result.report.suites[0].specs[0].tests[0].results[0].workerIndex).toBe(0);
+  expect(result.report.suites[0].specs[1].tests[0].results[0].workerIndex).toBe(1);
+  expect(result.report.suites[0].specs[2].tests[0].results[0].workerIndex).toBe(2);
+  expect(result.report.suites[0].specs[0].tests[0].results[0].parallelIndex).toBe(0);
+  expect(result.report.suites[0].specs[1].tests[0].results[0].parallelIndex).toBe(1);
+  expect(result.report.suites[0].specs[2].tests[0].results[0].parallelIndex).toBe(1);
+});
diff --git a/tests/playwright-test/reporter-junit.spec.ts b/tests/playwright-test/reporter-junit.spec.ts
index 6db49cbba00ad..9947484903567 100644
--- a/tests/playwright-test/reporter-junit.spec.ts
+++ b/tests/playwright-test/reporter-junit.spec.ts
@@ -487,10 +487,6 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       test('with env var should create relative to cwd', async ({ runInlineTest }, testInfo) => {
         const result = await runInlineTest({
           'foo/package.json': `{ "name": "foo" }`,
-          // unused config along "search path"
-          'foo/bar/playwright.config.js': `
-            module.exports = { projects: [ {} ] };
-          `,
           'foo/bar/baz/tests/a.spec.js': `
             import { test, expect } from '@playwright/test';
             const fs = require('fs');
@@ -508,10 +504,6 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       test('support PLAYWRIGHT_JUNIT_OUTPUT_FILE', async ({ runInlineTest }, testInfo) => {
         const result = await runInlineTest({
           'foo/package.json': `{ "name": "foo" }`,
-          // unused config along "search path"
-          'foo/bar/playwright.config.js': `
-            module.exports = { projects: [ {} ] };
-          `,
           'foo/bar/baz/tests/a.spec.js': `
             import { test, expect } from '@playwright/test';
             const fs = require('fs');
@@ -526,6 +518,27 @@ for (const useIntermediateMergeReport of [false, true] as const) {
         expect(fs.existsSync(testInfo.outputPath('foo', 'bar', 'baz', 'my-report.xml'))).toBe(true);
       });
 
+      test('PLAYWRIGHT_JUNIT_OUTPUT_FILE should take precedence over config', async ({ runInlineTest }, testInfo) => {
+        const result = await runInlineTest({
+          'package.json': `{ "name": "foo" }`,
+          'bar/playwright.config.js': `
+            module.exports = {
+              reporter: [['junit', { outputFile: 'results.xml' }], ['line', {}]],
+              projects: [ {} ]
+            };
+          `,
+          'bar/baz/tests/a.spec.js': `
+            import { test, expect } from '@playwright/test';
+            const fs = require('fs');
+            test('pass', ({}, testInfo) => {
+            });
+          `
+        }, { 'config': 'bar/playwright.config.js' }, { 'PLAYWRIGHT_JUNIT_OUTPUT_FILE': 'bar/my-report.xml' });
+        expect(result.exitCode).toBe(0);
+        expect(result.passed).toBe(1);
+        expect(fs.existsSync(testInfo.outputPath('bar', 'my-report.xml'))).toBe(true);
+      });
+
       test('support PLAYWRIGHT_JUNIT_OUTPUT_DIR and PLAYWRIGHT_JUNIT_OUTPUT_NAME', async ({ runInlineTest }, testInfo) => {
         const result = await runInlineTest({
           'playwright.config.js': `
@@ -542,6 +555,27 @@ for (const useIntermediateMergeReport of [false, true] as const) {
         expect(result.passed).toBe(1);
         expect(fs.existsSync(testInfo.outputPath('foo', 'bar', 'baz', 'my-report.xml'))).toBe(true);
       });
+
+      test('PLAYWRIGHT_JUNIT_OUTPUT_NAME should take precedence over config', async ({ runInlineTest }, testInfo) => {
+        const result = await runInlineTest({
+          'package.json': `{ "name": "foo" }`,
+          'bar/playwright.config.js': `
+            module.exports = {
+              reporter: [['junit', {}], ['line', {}]],
+              projects: [ {} ]
+            };
+          `,
+          'bar/baz/tests/a.spec.js': `
+            import { test, expect } from '@playwright/test';
+            const fs = require('fs');
+            test('pass', ({}, testInfo) => {
+            });
+          `
+        }, { 'config': 'bar/playwright.config.js' }, { 'PLAYWRIGHT_JUNIT_OUTPUT_NAME': 'foo/my-report.xml' });
+        expect(result.exitCode).toBe(0);
+        expect(result.passed).toBe(1);
+        expect(fs.existsSync(testInfo.outputPath('bar', 'foo', 'my-report.xml'))).toBe(true);
+      });
     });
 
     test('testsuites time is test run wall time', async ({ runInlineTest }) => {
@@ -560,4 +594,4 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(time).toBeGreaterThan(1);
     });
   });
-}
\ No newline at end of file
+}
diff --git a/tests/playwright-test/reporter-line.spec.ts b/tests/playwright-test/reporter-line.spec.ts
index 14959877b5813..6bb45340fd097 100644
--- a/tests/playwright-test/reporter-line.spec.ts
+++ b/tests/playwright-test/reporter-line.spec.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import path from 'path';
 import { test, expect } from './playwright-test-fixtures';
 
 for (const useIntermediateMergeReport of [false, true] as const) {
@@ -125,9 +126,9 @@ for (const useIntermediateMergeReport of [false, true] as const) {
             });
           });
         `,
-      }, { reporter: 'line' });
+      }, { reporter: 'line' }, { PLAYWRIGHT_FORCE_TTY: '1' });
       const text = result.output;
-      expect(text).toContain('[1/1] a.test.ts:6:26 › passes › outer › inner');
+      expect(text).toContain('[1/1] a.test.ts:3:15 › passes › outer › inner');
       expect(result.exitCode).toBe(0);
     });
 
@@ -188,5 +189,23 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(text).toContain('1) a.test.ts:3:15 › passes ──');
       expect(result.exitCode).toBe(1);
     });
+
+    test('should show error context with relative path', async ({ runInlineTest, useIntermediateMergeReport }) => {
+      const result = await runInlineTest({
+        'a.test.js': `
+          const { test, expect } = require('@playwright/test');
+          test('one', async ({ page }) => {
+            await page.setContent('<div>hello</div>');
+            expect(1).toBe(0);
+          });
+        `,
+      }, { reporter: 'line' });
+      const text = result.output;
+      if (useIntermediateMergeReport)
+        expect(text).toContain(`Error Context: ${path.join('blob-report', 'resources')}`);
+      else
+        expect(text).toContain(`Error Context: ${path.join('test-results', 'a-one', 'error-context.md')}`);
+      expect(result.exitCode).toBe(1);
+    });
   });
-}
\ No newline at end of file
+}
diff --git a/tests/playwright-test/reporter-list.spec.ts b/tests/playwright-test/reporter-list.spec.ts
index c57190a5d74af..976ce6f2f9140 100644
--- a/tests/playwright-test/reporter-list.spec.ts
+++ b/tests/playwright-test/reporter-list.spec.ts
@@ -111,17 +111,17 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       lines.pop(); // Remove last item that contains [v] and time in ms.
       expect(lines).toEqual([
         '#0 :      1 a.test.ts:3:11 › passes',
-        '#0 :      1 a.test.ts:4:20 › passes › outer 1.0',
-        '#0 :      1 a.test.ts:5:22 › passes › outer 1.0 › inner 1.1',
-        '#0 :      1 a.test.ts:4:20 › passes › outer 1.0',
-        '#0 :      1 a.test.ts:6:22 › passes › outer 1.0 › inner 1.2',
-        '#0 :      1 a.test.ts:4:20 › passes › outer 1.0',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 1.0',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 1.0 › inner 1.1',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 1.0',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 1.0 › inner 1.2',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 1.0',
         '#0 :      1 a.test.ts:3:11 › passes',
-        '#0 :      1 a.test.ts:8:20 › passes › outer 2.0',
-        '#0 :      1 a.test.ts:9:22 › passes › outer 2.0 › inner 2.1',
-        '#0 :      1 a.test.ts:8:20 › passes › outer 2.0',
-        '#0 :      1 a.test.ts:10:22 › passes › outer 2.0 › inner 2.2',
-        '#0 :      1 a.test.ts:8:20 › passes › outer 2.0',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 2.0',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 2.0 › inner 2.1',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 2.0',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 2.0 › inner 2.2',
+        '#0 :      1 a.test.ts:3:11 › passes › outer 2.0',
         '#0 :      1 a.test.ts:3:11 › passes',
       ]);
     });
@@ -145,12 +145,12 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       const text = result.output;
       const lines = text.split('\n').filter(l => l.match(/^#.* :/)).map(l => l.replace(/[.\d]+m?s/, 'Xms'));
       expect(lines).toEqual([
-        '#0 :      1.1 a.test.ts:5:26 › passes › outer 1.0 › inner 1.1 (Xms)',
-        '#1 :      1.2 a.test.ts:6:26 › passes › outer 1.0 › inner 1.2 (Xms)',
-        '#2 :      1.3 a.test.ts:4:24 › passes › outer 1.0 (Xms)',
-        '#3 :      1.4 a.test.ts:9:26 › passes › outer 2.0 › inner 2.1 (Xms)',
-        '#4 :      1.5 a.test.ts:10:26 › passes › outer 2.0 › inner 2.2 (Xms)',
-        '#5 :      1.6 a.test.ts:8:24 › passes › outer 2.0 (Xms)',
+        '#0 :      1.1 a.test.ts:3:15 › passes › outer 1.0 › inner 1.1 (Xms)',
+        '#1 :      1.2 a.test.ts:3:15 › passes › outer 1.0 › inner 1.2 (Xms)',
+        '#2 :      1.3 a.test.ts:3:15 › passes › outer 1.0 (Xms)',
+        '#3 :      1.4 a.test.ts:3:15 › passes › outer 2.0 › inner 2.1 (Xms)',
+        '#4 :      1.5 a.test.ts:3:15 › passes › outer 2.0 › inner 2.2 (Xms)',
+        '#5 :      1.6 a.test.ts:3:15 › passes › outer 2.0 (Xms)',
         `#6 :   ${POSITIVE_STATUS_MARK} 1 a.test.ts:3:15 › passes (Xms)`,
       ]);
     });
@@ -258,6 +258,161 @@ for (const useIntermediateMergeReport of [false, true] as const) {
       expect(text).toContain('1) a.test.ts:3:15 › passes › outer 1.0 › inner 1.1 ──');
       expect(result.exitCode).toBe(1);
     });
+
+    test('print stdio', async ({ runInlineTest }) => {
+      const result = await runInlineTest({
+        'a.test.ts': `
+          import { test, expect } from '@playwright/test';
+          test('passes', async ({}) => {
+            await new Promise(resolve => process.stdout.write('line1', () => resolve()));
+            await new Promise(resolve => process.stdout.write('line2\\n', () => resolve()));
+            await new Promise(resolve => process.stderr.write(Buffer.from(''), () => resolve()));
+          });
+
+          test('passes 2', async ({}) => {
+            await new Promise(resolve => process.stdout.write('partial', () => resolve()));
+          });
+
+          test('passes 3', async ({}) => {
+            await new Promise(resolve => process.stdout.write('full\\n', () => resolve()));
+          });
+
+          test('passes 4', async ({}) => {
+          });
+        `,
+      }, { reporter: 'list' }, { PW_TEST_DEBUG_REPORTERS: '1', PLAYWRIGHT_FORCE_TTY: '80' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(4);
+      const expected = [
+        '#0 :      1 a.test.ts:3:15 › passes',
+        'line1line2',
+        `#0 :   ${POSITIVE_STATUS_MARK} 1 a.test.ts:3:15 › passes`,
+        '',
+        '#3 :      2 a.test.ts:9:15 › passes 2',
+        `partial#3 :   ${POSITIVE_STATUS_MARK} 2 a.test.ts:9:15 › passes 2`,
+        '',
+        '#5 :      3 a.test.ts:13:15 › passes 3',
+        'full',
+        `#5 :   ${POSITIVE_STATUS_MARK} 3 a.test.ts:13:15 › passes 3`,
+        '#7 :      4 a.test.ts:17:15 › passes 4',
+        `#7 :   ${POSITIVE_STATUS_MARK} 4 a.test.ts:17:15 › passes 4`,
+      ];
+      const lines = result.output.split('\n');
+      const firstIndex = lines.indexOf(expected[0]);
+      expect(firstIndex, 'first line should be there').not.toBe(-1);
+      for (let i = 0; i < expected.length; ++i)
+        expect(lines[firstIndex + i]).toContain(expected[i]);
+    });
+
+    test('should update test status row only when TTY has not scrolled', async ({ runInlineTest }) => {
+      const result = await runInlineTest({
+        'a.test.ts': `
+          import { test, expect } from '@playwright/test';
+          test('A', async ({}) => {
+            for (let i = 0; i < 20; ++i) {
+              console.log('line ' + i);
+            }
+          });
+
+          test('B', async ({}) => {
+            // Go past end of the screen
+            for (let i = 20; i < 60; ++i) {
+              console.log('line ' + i);
+            }
+
+            // Should create new line
+            await test.step('First step', async () => {
+              console.log('step 1');
+            });
+
+            for (let i = 60; i < 80; ++i) {
+              console.log('line ' + i);
+            }
+
+            // Should update the new (not original) line
+            await test.step('Second step', async () => {
+              console.log('step 2');
+            });
+          });
+        `,
+      }, { reporter: 'list' }, { PW_TEST_DEBUG_REPORTERS: '1', PLAYWRIGHT_FORCE_TTY: '80' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(2);
+      const expected = [
+        '#0 :      1 a.test.ts:3:15 › A',
+      ];
+      for (let i = 0; i < 20; ++i)
+        expected.push(`line ${i}`);
+      // Update to initial test status row
+      expected.push(`#0 :   ${POSITIVE_STATUS_MARK} 1 a.test.ts:3:15 › A`);
+      expected.push(`#21 :      2 a.test.ts:9:15 › B`);
+      for (let i = 20; i < 60; ++i)
+        expected.push(`line ${i}`);
+      expected.push(`#62 :      2 a.test.ts:9:15 › B › First step`);
+      expected.push(`step 1`);
+      expected.push(`#62 :      2 a.test.ts:9:15 › B`);
+      for (let i = 60; i < 80; ++i)
+        expected.push(`line ${i}`);
+      expected.push(`#62 :      2 a.test.ts:9:15 › B › Second step`);
+      expected.push(`step 2`);
+      expected.push(`#62 :      2 a.test.ts:9:15 › B`);
+      expected.push(`#62 :   ${POSITIVE_STATUS_MARK} 2 a.test.ts:9:15 › B`);
+      const lines = result.output.split('\n');
+      const firstIndex = lines.indexOf(expected[0]);
+      expect(firstIndex, 'first line should be there').not.toBe(-1);
+      for (let i = 0; i < expected.length; ++i)
+        expect(lines[firstIndex + i]).toContain(expected[i]);
+    });
+
+    test('should update test status row only within configured TTY height', async ({ runInlineTest }) => {
+      const result = await runInlineTest({
+        'a.test.ts': `
+          import { test, expect } from '@playwright/test';
+          test('A', async ({}) => {
+            // No scroll
+            for (let i = 0; i < 60; ++i) {
+              console.log('line ' + i);
+            }
+
+            // Update original line
+            await test.step('First step', async () => {
+              console.log('step 1');
+            });
+
+            for (let i = 60; i < 120; ++i) {
+              console.log('line ' + i);
+            }
+
+            // Should create new line
+            await test.step('Second step', async () => {
+              console.log('step 2');
+            });
+          });
+        `,
+      }, { reporter: 'list' }, { PW_TEST_DEBUG_REPORTERS: '1', PLAYWRIGHT_FORCE_TTY: '80x80' });
+      expect(result.exitCode).toBe(0);
+      expect(result.passed).toBe(1);
+      const expected = [
+        '#0 :      1 a.test.ts:3:15 › A',
+      ];
+      for (let i = 0; i < 60; ++i)
+        expected.push(`line ${i}`);
+      // Update to initial test status row
+      expected.push(`#0 :      1 a.test.ts:3:15 › A › First step`);
+      expected.push(`step 1`);
+      expected.push(`#0 :      1 a.test.ts:3:15 › A`);
+      for (let i = 60; i < 120; ++i)
+        expected.push(`line ${i}`);
+      expected.push(`#122 :      1 a.test.ts:3:15 › A › Second step`);
+      expected.push(`step 2`);
+      expected.push(`#122 :      1 a.test.ts:3:15 › A`);
+      expected.push(`#122 :   ${POSITIVE_STATUS_MARK} 1 a.test.ts:3:15 › A`);
+      const lines = result.output.split('\n');
+      const firstIndex = lines.indexOf(expected[0]);
+      expect(firstIndex, 'first line should be there').not.toBe(-1);
+      for (let i = 0; i < expected.length; ++i)
+        expect(lines[firstIndex + i]).toContain(expected[i]);
+    });
   });
 }
 
@@ -319,4 +474,3 @@ function simpleAnsiRenderer(text, ttyWidth) {
 
   return screenLines.map(line => line.join('')).join('\n');
 }
-
diff --git a/tests/playwright-test/reporter-markdown.spec.ts b/tests/playwright-test/reporter-markdown.spec.ts
index d24f2561c12c1..9b6ebf9556028 100644
--- a/tests/playwright-test/reporter-markdown.spec.ts
+++ b/tests/playwright-test/reporter-markdown.spec.ts
@@ -18,12 +18,14 @@ import fs from 'fs';
 import path from 'path';
 import { expect, test } from './playwright-test-fixtures';
 
+const markdownReporter = require.resolve('../../packages/playwright/lib/reporters/markdown');
+
 test('simple report', async ({ runInlineTest }) => {
   const files = {
     'playwright.config.ts': `
       module.exports = {
         retries: 1,
-        reporter: 'markdown',
+        reporter: ${JSON.stringify(markdownReporter)},
       };
     `,
     'dir1/a.test.js': `
@@ -64,18 +66,17 @@ test('simple report', async ({ runInlineTest }) => {
   expect(exitCode).toBe(1);
   const reportFile = await fs.promises.readFile(test.info().outputPath('report.md'));
   expect(reportFile.toString()).toContain(`**2 failed**
-:x: dir1${path.sep}a.test.js:6:11 › failing 1
-:x: dir2${path.sep}b.test.js:6:11 › failing 2
+:x: dir1${path.sep}a.test.js:6 › failing 1
+:x: dir2${path.sep}b.test.js:6 › failing 2
 
 <details>
 <summary><b>2 flaky</b></summary>
-:warning: c.test.js:6:11 › flaky 2 <br/>
-:warning: dir1${path.sep}a.test.js:9:11 › flaky 1 <br/>
+:warning: c.test.js:6 › flaky 2 <br/>
+:warning: dir1${path.sep}a.test.js:9 › flaky 1 <br/>
 
 </details>
 
 **3 passed, 3 skipped**
-:heavy_check_mark::heavy_check_mark::heavy_check_mark:
 `);
 });
 
@@ -83,7 +84,7 @@ test('custom report file', async ({ runInlineTest }) => {
   const files = {
     'playwright.config.ts': `
       module.exports = {
-        reporter: [['markdown', { outputFile: 'my-report.md' }]],
+        reporter: [[${JSON.stringify(markdownReporter)}, { outputFile: 'my-report.md' }]],
       };
     `,
     'a.test.js': `
@@ -98,7 +99,6 @@ test('custom report file', async ({ runInlineTest }) => {
   expect(exitCode).toBe(0);
   const reportFile = await fs.promises.readFile(test.info().outputPath('my-report.md'));
   expect(reportFile.toString()).toBe(`**1 passed**
-:heavy_check_mark::heavy_check_mark::heavy_check_mark:
 `);
 });
 
@@ -107,7 +107,7 @@ test('report error without snippet', async ({ runInlineTest }) => {
     'playwright.config.ts': `
       module.exports = {
         retries: 1,
-        reporter: 'markdown',
+        reporter: ${JSON.stringify(markdownReporter)},
       };
     `,
     'a.test.js': `
@@ -123,10 +123,9 @@ test('report error without snippet', async ({ runInlineTest }) => {
   await runInlineTest(files);
   const reportFile = await fs.promises.readFile(test.info().outputPath('report.md'));
   expect(reportFile.toString()).toContain(`**1 failed**
-:x: a.test.js:3:11 › math 1
+:x: a.test.js:3 › math 1
 
 **0 passed**
-:heavy_check_mark::heavy_check_mark::heavy_check_mark:
 `);
 });
 
@@ -135,7 +134,7 @@ test('report with worker error', async ({ runInlineTest }) => {
     'playwright.config.ts': `
       module.exports = {
         retries: 1,
-        reporter: 'markdown',
+        reporter: ${JSON.stringify(markdownReporter)},
       };
     `,
     'a.test.js': `
@@ -153,6 +152,54 @@ test('report with worker error', async ({ runInlineTest }) => {
   const reportFile = await fs.promises.readFile(test.info().outputPath('report.md'));
   expect(reportFile.toString()).toContain(`**3 fatal errors, not part of any test**
 **0 passed**
-:heavy_check_mark::heavy_check_mark::heavy_check_mark:
 `);
-});
\ No newline at end of file
+});
+
+test('report with annotations', async ({ runInlineTest }) => {
+  const files = {
+    'playwright.config.ts': `
+      module.exports = {
+        retries: 0,
+        reporter: ${JSON.stringify(markdownReporter)},
+      };
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      
+      test('test login page', {
+        annotation: {
+          type: 'issue',
+          description: 'https://github.com/microsoft/playwright/issues/23180',
+        },
+        tag: '@login',
+      }, async ({ page }) => {
+        expect(1 + 1).toBe(2);
+      });
+      
+      test('failing test with annotation', {
+        annotation: [
+          { type: 'bug', description: 'Known issue' },
+          { type: 'performance', description: 'slow test' }
+        ],
+        tag: '@slow',
+      }, async ({ page }) => {
+        expect(1).toBe(2);
+      });
+    `,
+  };
+
+  const { exitCode } = await runInlineTest(files);
+  expect(exitCode).toBe(1);
+  const reportFile = await fs.promises.readFile(test.info().outputPath('report.md'));
+  const reportContent = reportFile.toString();
+
+  // Check that failed tests are reported with tags
+  expect(reportContent).toContain(`**1 failed**
+:x: a.test.js:14 › failing test with annotation \`@slow\``);
+
+  // Check that passed tests are reported (but without individual titles)
+  expect(reportContent).toContain(`**1 passed**`);
+
+  // Check that tags are included in the failed test output
+  expect(reportContent).toContain('`@slow`');
+});
diff --git a/tests/playwright-test/reporter.spec.ts b/tests/playwright-test/reporter.spec.ts
index f036e3e494199..9a04c246d9114 100644
--- a/tests/playwright-test/reporter.spec.ts
+++ b/tests/playwright-test/reporter.spec.ts
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import type { Reporter, TestCase, TestResult, TestStep } from '../../packages/playwright-test/reporter';
 import { test, expect } from './playwright-test-fixtures';
 
 const smallReporterJS = `
@@ -86,7 +87,7 @@ class Reporter {
 
   onStepEnd(test, result, step) {
     if (this.options.printSteps) {
-      console.log('onStepEnd: ' + step.title);
+      console.log('onStepEnd: [' + step.category + '] ' + step.title);
       if (step.error)
         this.printErrors([step.error]);
     }
@@ -478,8 +479,8 @@ var import_test = __toModule(require("@playwright/test"));
       expect(result.output).toBe(`
 onBegin: 1 tests total
 onTestBegin:  > a.spec.js > test; retry #0
-onStepEnd: Before Hooks
-onStepEnd: expect.toBe
+onStepEnd: [hook] Before Hooks
+onStepEnd: [expect] Expect "toBe"
   error: Error: expect(received).toBe(expected) // Object.is equality @ a.spec.js:5
   ======
     3 |           test('test', async () => {
@@ -490,7 +491,7 @@ onStepEnd: expect.toBe
     7 |           });
     8 |
   ======
-onStepEnd: step
+onStepEnd: [test.step] step
   error: Error: expect(received).toBe(expected) // Object.is equality @ a.spec.js:5
   ======
     3 |           test('test', async () => {
@@ -501,8 +502,8 @@ onStepEnd: step
     7 |           });
     8 |
   ======
-onStepEnd: After Hooks
-onStepEnd: Worker Cleanup
+onStepEnd: [hook] After Hooks
+onStepEnd: [hook] Worker Cleanup
 onTestEnd:  > a.spec.js > test; retry #0
   error: Error: expect(received).toBe(expected) // Object.is equality @ a.spec.js:5
   ======
@@ -583,7 +584,9 @@ test('should report annotations from test declaration', async ({ runInlineTest }
           const visit = suite => {
             for (const test of suite.tests || []) {
               const annotations = test.annotations.map(a => {
-                return a.description ? a.type + '=' + a.description : a.type;
+                const description = a.description ? a.type + '=' + a.description : a.type;
+                const location = a.location ? '(' + a.location.line + ':' + a.location.column + ')' : '';
+                return description + location;
               });
               console.log('\\n%%title=' + test.title + ', annotations=' + annotations.join(','));
             }
@@ -608,7 +611,7 @@ test('should report annotations from test declaration', async ({ runInlineTest }
         expect(test.info().annotations).toEqual([]);
       });
       test('foo', { annotation: { type: 'foo' } }, () => {
-        expect(test.info().annotations).toEqual([{ type: 'foo' }]);
+        expect(test.info().annotations).toEqual([{ type: 'foo', location: { file: expect.any(String), line: 6, column: 11 } }]);
       });
       test('foo-bar', {
         annotation: [
@@ -617,8 +620,8 @@ test('should report annotations from test declaration', async ({ runInlineTest }
         ],
       }, () => {
         expect(test.info().annotations).toEqual([
-          { type: 'foo', description: 'desc' },
-          { type: 'bar' },
+          { type: 'foo', description: 'desc', location: { file: expect.any(String), line: 9, column: 11 } },
+          { type: 'bar', location: { file: expect.any(String), line: 9, column: 11 } },
         ]);
       });
       test.skip('skip-foo', { annotation: { type: 'foo' } }, () => {
@@ -635,11 +638,14 @@ test('should report annotations from test declaration', async ({ runInlineTest }
       });
       test.describe('suite', { annotation: { type: 'foo' } }, () => {
         test('foo-suite', () => {
-          expect(test.info().annotations).toEqual([{ type: 'foo' }]);
+          expect(test.info().annotations).toEqual([{ type: 'foo', location: { file: expect.any(String), line: 32, column: 12 } }]);
         });
         test.describe('inner', { annotation: { type: 'bar' } }, () => {
           test('foo-bar-suite', () => {
-            expect(test.info().annotations).toEqual([{ type: 'foo' }, { type: 'bar' }]);
+            expect(test.info().annotations).toEqual([
+              { type: 'foo', location: { file: expect.any(String), line: 32, column: 12 } },
+              { type: 'bar', location: { file: expect.any(String), line: 36, column: 14 } }
+            ]);
           });
         });
       });
@@ -656,15 +662,15 @@ test('should report annotations from test declaration', async ({ runInlineTest }
   expect(result.exitCode).toBe(0);
   expect(result.outputLines).toEqual([
     `title=none, annotations=`,
-    `title=foo, annotations=foo`,
-    `title=foo-bar, annotations=foo=desc,bar`,
-    `title=skip-foo, annotations=foo,skip`,
-    `title=fixme-bar, annotations=bar,fixme`,
-    `title=fail-foo-bar, annotations=foo,bar=desc,fail`,
-    `title=foo-suite, annotations=foo`,
-    `title=foo-bar-suite, annotations=foo,bar`,
-    `title=skip-foo-suite, annotations=foo,skip`,
-    `title=fixme-bar-suite, annotations=bar,fixme`,
+    `title=foo, annotations=foo(6:11)`,
+    `title=foo-bar, annotations=foo=desc(9:11),bar(9:11)`,
+    `title=skip-foo, annotations=foo(20:12),skip(20:12)`,
+    `title=fixme-bar, annotations=bar(22:12),fixme(22:12)`,
+    `title=fail-foo-bar, annotations=foo(24:12),bar=desc(24:12),fail(24:12)`,
+    `title=foo-suite, annotations=foo(32:12)`,
+    `title=foo-bar-suite, annotations=foo(32:12),bar(36:14)`,
+    `title=skip-foo-suite, annotations=foo(45:21),skip(45:21)`,
+    `title=fixme-bar-suite, annotations=bar(49:21),fixme(49:21)`,
   ]);
 });
 
@@ -703,3 +709,99 @@ onEnd
 onExit
 `);
 });
+
+test('step attachments are referentially equal to result attachments', async ({ runInlineTest }) => {
+  class TestReporter implements Reporter {
+    onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
+      console.log('%%%', JSON.stringify({
+        title: step.title,
+        attachments: step.attachments.map(a => result.attachments.indexOf(a)),
+      }));
+    }
+  }
+  const result = await runInlineTest({
+    'reporter.ts': `module.exports = ${TestReporter.toString()}`,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({}, testInfo) => {
+        await test.step('step', async () => {
+          testInfo.attachments.push({ name: 'attachment', body: Buffer.from('content') });
+        });
+      });
+    `,
+  }, { 'reporter': '', 'workers': 1 });
+
+  const steps = result.outputLines.map(line => JSON.parse(line));
+  expect(steps).toEqual([
+    { title: 'Before Hooks', attachments: [] },
+    { title: 'step', attachments: [0] },
+    { title: 'After Hooks', attachments: [] },
+  ]);
+});
+
+test('step.attach attachments are reported on right steps', async ({ runInlineTest }) => {
+  class TestReporter implements Reporter {
+    onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
+      console.log('%%%', JSON.stringify({
+        title: step.title,
+        attachments: step.attachments.map(a => ({ ...a, body: a.body.toString('utf8') })),
+      }));
+    }
+  }
+  const result = await runInlineTest({
+    'reporter.ts': `module.exports = ${TestReporter.toString()}`,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test.beforeAll(async () => {
+        await test.step('step in beforeAll', async (step) => {
+          await step.attach('attachment1', { body: 'content1' });
+        });
+      });
+      test('test', async () => {
+        await test.step('step', async (step) => {
+          await step.attach('attachment2', { body: 'content2' });
+        });
+      });
+    `,
+  }, { 'reporter': '', 'workers': 1 });
+
+  const steps = result.outputLines.map(line => JSON.parse(line));
+  expect(steps).toEqual([
+    { title: 'step in beforeAll', attachments: [{ body: 'content1', contentType: 'text/plain', name: 'attachment1' }] },
+    { title: 'beforeAll hook', attachments: [] },
+    { title: 'Before Hooks', attachments: [] },
+    { title: 'step', attachments: [{ body: 'content2', contentType: 'text/plain', name: 'attachment2' }] },
+    { title: 'After Hooks', attachments: [] },
+  ]);
+});
+
+test('attachments are reported in onStepEnd', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/14364' } }, async ({ runInlineTest }) => {
+  class TestReporter implements Reporter {
+    onStepEnd(test: TestCase, result: TestResult, step: TestStep) {
+      console.log(`%%[${step.category}] ${step.title}: ${result.attachments.length} attachments in result`);
+    }
+  }
+  const result = await runInlineTest({
+    'reporter.ts': `module.exports = ${TestReporter.toString()}`,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({}, testInfo) => {
+        await test.step('step', async () => {
+          testInfo.attachments.push({ name: 'attachment', body: Buffer.from('content') });
+        });
+
+        await testInfo.attach('4', {body:'444'})
+      });
+    `,
+  }, { 'reporter': '', 'workers': 1 });
+
+  expect(result.outputLines).toEqual([
+    '[hook] Before Hooks: 0 attachments in result',
+    '[test.step] step: 1 attachments in result',
+    '[test.attach] Attach "4": 2 attachments in result',
+    '[hook] After Hooks: 2 attachments in result',
+  ]);
+});
diff --git a/tests/playwright-test/resolver.spec.ts b/tests/playwright-test/resolver.spec.ts
index 4092263648064..d4dec96495d3e 100644
--- a/tests/playwright-test/resolver.spec.ts
+++ b/tests/playwright-test/resolver.spec.ts
@@ -16,6 +16,24 @@
 
 import { test, expect } from './playwright-test-fixtures';
 
+test('should print tsconfig parsing error', async ({ runInlineTest }) => {
+  const files = {
+    'a.spec.ts': `
+      import { test } from '@playwright/test';
+      test('pass', async () => {});
+    `,
+    'tsconfig.json': `
+      "foo": "bar"
+    `,
+  };
+
+  const result = await runInlineTest(files);
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain(`Failed to load tsconfig file at`);
+  expect(result.output).toContain(`tsconfig.json`);
+  expect(result.output).toContain(`JSON5: invalid character ':' at 2:12`);
+});
+
 test('should respect path resolver', async ({ runInlineTest }) => {
   test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/11656' });
 
@@ -569,75 +587,572 @@ test('should resolve paths relative to the originating config when extending and
   expect(result.exitCode).toBe(0);
 });
 
-test('should import packages with non-index main script through path resolver', async ({ runInlineTest }) => {
+test('should respect tsconfig project references', async ({ runInlineTest }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29256' });
+
   const result = await runInlineTest({
-    'app/pkg/main.ts': `
-      export const foo = 42;
-    `,
-    'app/pkg/package.json': `
-      { "main": "main.ts" }
+    'playwright.config.ts': `export default { projects: [{name: 'foo'}], };`,
+    'tsconfig.json': `{
+      "files": [],
+      "references": [
+        { "path": "./tsconfig.app.json" },
+        { "path": "./tsconfig.test.json" }
+      ]
+    }`,
+    'tsconfig.test.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "util/*": ["./foo/bar/util/*"],
+        },
+      },
+    }`,
+    'foo/bar/util/b.ts': `
+      export const foo: string = 'foo';
     `,
-    'package.json': `
-      { "name": "example-project" }
+    'a.test.ts': `
+      import { foo } from 'util/b';
+      import { test, expect } from '@playwright/test';
+      test('test', ({}, testInfo) => {
+        expect(foo).toBe('foo');
+      });
     `,
+  });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('should respect --tsconfig option', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
     'playwright.config.ts': `
-      export default {};
+      import { foo } from '~/foo';
+      export default {
+        testDir: './tests' + foo,
+      };
     `,
     'tsconfig.json': `{
       "compilerOptions": {
         "baseUrl": ".",
         "paths": {
-          "app/*": ["app/*"],
+          "~/*": ["./does-not-exist/*"],
+        },
+      },
+    }`,
+    'tsconfig.special.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["./mapped-from-root/*"],
+        },
+      },
+    }`,
+    'mapped-from-root/foo.ts': `
+      export const foo = 42;
+    `,
+    'tests42/tsconfig.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["../should-be-ignored/*"],
         },
       },
     }`,
-    'example.spec.ts': `
-      import { foo } from 'app/pkg';
+    'tests42/a.test.ts': `
+      import { foo } from '~/foo';
       import { test, expect } from '@playwright/test';
       test('test', ({}) => {
-        console.log('foo=' + foo);
+        expect(foo).toBe(42);
       });
     `,
-  });
+    'should-be-ignored/foo.ts': `
+      export const foo = 43;
+    `,
+  }, { tsconfig: 'tsconfig.special.json' });
 
-  expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
-  expect(result.output).not.toContain(`find module`);
-  expect(result.output).toContain(`foo=42`);
+  expect(result.exitCode).toBe(0);
+  expect(result.output).not.toContain(`Could not`);
 });
 
-test('should respect tsconfig project references', async ({ runInlineTest }) => {
-  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/29256' });
-
+test('should respect config.tsconfig option', async ({ runInlineTest }) => {
   const result = await runInlineTest({
-    'playwright.config.ts': `export default { projects: [{name: 'foo'}], };`,
+    'playwright.config.ts': `
+      export { configFoo } from '~/foo';
+      export default {
+        testDir: './tests',
+        tsconfig: './tsconfig.tests.json',
+      };
+    `,
     'tsconfig.json': `{
-      "files": [],
-      "references": [
-        { "path": "./tsconfig.app.json" },
-        { "path": "./tsconfig.test.json" }
-      ]
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["./mapped-from-config/*"],
+        },
+      },
     }`,
-    'tsconfig.test.json': `{
+    'mapped-from-config/foo.ts': `
+      export const configFoo = 17;
+    `,
+    'tsconfig.tests.json': `{
       "compilerOptions": {
         "baseUrl": ".",
         "paths": {
-          "util/*": ["./foo/bar/util/*"],
+          "~/*": ["./mapped-from-tests/*"],
         },
       },
     }`,
-    'foo/bar/util/b.ts': `
-      export const foo: string = 'foo';
+    'mapped-from-tests/foo.ts': `
+      export const testFoo = 42;
     `,
-    'a.test.ts': `
-      import { foo } from 'util/b';
+    'tests/tsconfig.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["../should-be-ignored/*"],
+        },
+      },
+    }`,
+    'tests/a.test.ts': `
+      import { testFoo } from '~/foo';
+      import { configFoo } from '../playwright.config';
       import { test, expect } from '@playwright/test';
-      test('test', ({}, testInfo) => {
-        expect(foo).toBe('foo');
+      test('test', ({}) => {
+        expect(testFoo).toBe(42);
+        expect(configFoo).toBe(17);
       });
     `,
+    'should-be-ignored/foo.ts': `
+      export const testFoo = 43;
+      export const configFoo = 18;
+    `,
   });
 
-  expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
+  expect(result.exitCode).toBe(0);
+  expect(result.output).not.toContain(`Could not`);
+});
+
+test.describe('directory imports', () => {
+  test('should resolve index.js without path mapping in CJS', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'foo-pkg/index.js': `
+        exports.foo = 'bar';
+      `,
+      'foo-pkg/index.d.ts': `
+        export const foo: 'bar';
+      `,
+      'a.test.ts': `
+        import { test, expect } from '@playwright/test';
+        import { foo } from './foo-pkg';
+        test('pass', async () => {
+          const bar: 'bar' = foo;
+          expect(bar).toBe('bar');
+        });
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.passed).toBe(1);
+    expect(result.exitCode).toBe(0);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should resolve index.js without path mapping in ESM', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'foo-pkg/index.js': `
+        export const foo = 'bar';
+      `,
+      'foo-pkg/index.d.ts': `
+        export const foo: 'bar';
+      `,
+      'package.json': `
+        { "type": "module" }
+      `,
+      'a.test.ts': `
+        import { test, expect } from '@playwright/test';
+        import { foo } from './foo-pkg';
+        test('pass', async () => {
+          const bar: 'bar' = foo;
+          expect(bar).toBe('bar');
+        });
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.passed).toBe(1);
+    expect(result.exitCode).toBe(0);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should resolve index.js after path mapping in CJS', async ({ runInlineTest, runTSC }) => {
+    test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31811' });
+
+    const files = {
+      '@acme/lib/index.js': `
+        exports.greet = () => 2;
+      `,
+      '@acme/lib/index.d.ts': `
+        export const greet: () => number;
+      `,
+      'tests/hello.test.ts': `
+        import { greet } from '@acme/lib';
+        import { test, expect } from '@playwright/test';
+        test('hello', async ({}) => {
+          const foo: number = greet();
+          expect(foo).toBe(2);
+        });
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "paths": {
+              "@acme/*": ["./@acme/*"]
+            },
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          }
+        }
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should resolve index.js after path mapping in ESM', async ({ runInlineTest, runTSC }) => {
+    test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31811' });
+
+    const files = {
+      '@acme/lib/index.js': `
+        export const greet = () => 2;
+      `,
+      '@acme/lib/index.d.ts': `
+        export const greet: () => number;
+      `,
+      'package.json': `
+        { "type": "module" }
+      `,
+      'tests/hello.test.ts': `
+        import { greet } from '@acme/lib';
+        import { test, expect } from '@playwright/test';
+        test('hello', async ({}) => {
+          const foo: number = greet();
+          expect(foo).toBe(2);
+        });
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "paths": {
+              "@acme/*": ["./@acme/*"]
+            },
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          }
+        }
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should respect package.json#main after path mapping in CJS', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'app/pkg/main.ts': `
+        export const foo = 42;
+      `,
+      'app/pkg/package.json': `
+        { "main": "main.ts" }
+      `,
+      'package.json': `
+        { "name": "example-project" }
+      `,
+      'playwright.config.ts': `
+        export default {};
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "baseUrl": ".",
+            "paths": {
+              "app/*": ["app/*"]
+            },
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          }
+        }
+      `,
+      'example.spec.ts': `
+        import { foo } from 'app/pkg';
+        import { test, expect } from '@playwright/test';
+        test('test', ({}) => {
+          const bar: number = foo;
+          expect(bar).toBe(42);
+        });
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+    expect(result.output).not.toContain(`find module`);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should respect package.json#main after path mapping in ESM', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'app/pkg/main.ts': `
+        export const foo = 42;
+      `,
+      'app/pkg/package.json': `
+        { "main": "main.ts", "type": "module" }
+      `,
+      'package.json': `
+        { "name": "example-project", "type": "module" }
+      `,
+      'playwright.config.ts': `
+        export default {};
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "baseUrl": ".",
+            "paths": {
+              "app/*": ["app/*"]
+            },
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          },
+        }
+      `,
+      'example.spec.ts': `
+        import { foo } from 'app/pkg';
+        import { test, expect } from '@playwright/test';
+        test('test', ({}) => {
+          const bar: number = foo;
+          expect(bar).toBe(42);
+        });
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should respect package.json#exports without path mapping in CJS', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'node_modules/foo-pkg/package.json': `
+        { "name": "foo-pkg", "exports": { ".": "./foo.js" } }
+      `,
+      'node_modules/foo-pkg/foo.js': `
+        exports.foo = 'bar';
+      `,
+      'node_modules/foo-pkg/foo.d.ts': `
+        export const foo: 'bar';
+      `,
+      'package.json': `
+        { "name": "test-project" }
+      `,
+      'a.test.ts': `
+        import { test, expect } from '@playwright/test';
+        import { foo } from 'foo-pkg';
+        test('pass', async () => {
+          const bar: 'bar' = foo;
+          expect(bar).toBe('bar');
+        });
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          },
+        }
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.passed).toBe(1);
+    expect(result.exitCode).toBe(0);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should respect package.json#exports without path mapping in ESM', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'node_modules/foo-pkg/package.json': `
+        { "name": "foo-pkg", "type": "module", "exports": { "default": "./foo.js" } }
+      `,
+      'node_modules/foo-pkg/foo.js': `
+        export const foo = 'bar';
+      `,
+      'node_modules/foo-pkg/foo.d.ts': `
+        export const foo: 'bar';
+      `,
+      'package.json': `
+        { "name": "test-project", "type": "module" }
+      `,
+      'a.test.ts': `
+        import { test, expect } from '@playwright/test';
+        import { foo } from 'foo-pkg';
+        test('pass', async () => {
+          const bar: 'bar' = foo;
+          expect(bar).toBe('bar');
+        });
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          },
+        }
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.passed).toBe(1);
+    expect(result.exitCode).toBe(0);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should not respect package.json#exports after type mapping in CJS', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'app/pkg/main.ts': `
+        export const filename: 'main.ts' = 'main.ts';
+      `,
+      'app/pkg/index.js': `
+        export const filename = 'index.js';
+      `,
+      'app/pkg/index.d.ts': `
+        export const filename: 'index.js';
+      `,
+      'app/pkg/package.json': `
+        { "exports": { ".": "./main.ts" } }
+      `,
+      'package.json': `
+        { "name": "example-project" }
+      `,
+      'playwright.config.ts': `
+        export default {};
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "baseUrl": ".",
+            "paths": {
+              "app/*": ["app/*"]
+            },
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          }
+        }
+      `,
+      'example.spec.ts': `
+        import { filename } from 'app/pkg';
+        import { test, expect } from '@playwright/test';
+        test('test', ({}) => {
+          const foo: 'index.js' = filename;
+          expect(foo).toBe('index.js');
+        });
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
+
+  test('should not respect package.json#exports after type mapping in ESM', async ({ runInlineTest, runTSC }) => {
+    const files = {
+      'app/pkg/main.ts': `
+        export const filename: 'main.ts' = 'main.ts';
+      `,
+      'app/pkg/index.js': `
+        export const filename = 'index.js';
+      `,
+      'app/pkg/index.d.ts': `
+        export const filename: 'index.js';
+      `,
+      'app/pkg/package.json': `
+        { "exports": { ".": "./main.ts" }, "type": "module" }
+      `,
+      'package.json': `
+        { "name": "example-project", "type": "module" }
+      `,
+      'playwright.config.ts': `
+        export default {};
+      `,
+      'tsconfig.json': `
+        {
+          "compilerOptions": {
+            "baseUrl": ".",
+            "paths": {
+              "app/*": ["app/*"]
+            },
+            "moduleResolution": "bundler",
+            "module": "preserve",
+            "noEmit": true,
+            "noImplicitAny": true
+          }
+        }
+      `,
+      'example.spec.ts': `
+        import { filename } from 'app/pkg';
+        import { test, expect } from '@playwright/test';
+        test('test', ({}) => {
+          const foo: 'index.js' = filename;
+          expect(foo).toBe('index.js');
+        });
+      `,
+    };
+
+    const result = await runInlineTest(files);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+
+    const tscResult = await runTSC(files);
+    expect(tscResult.exitCode).toBe(0);
+  });
 });
diff --git a/tests/playwright-test/retry.spec.ts b/tests/playwright-test/retry.spec.ts
index b5dfc7a347f79..c82a61b20fb8d 100644
--- a/tests/playwright-test/retry.spec.ts
+++ b/tests/playwright-test/retry.spec.ts
@@ -260,5 +260,5 @@ test('failed and skipped on retry should be marked as flaky', async ({ runInline
   expect(result.failed).toBe(0);
   expect(result.flaky).toBe(1);
   expect(result.output).toContain('Failed on first run');
-  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'Skipped on first retry' }]);
+  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'Skipped on first retry', location: expect.anything() }]);
 });
diff --git a/tests/playwright-test/runner.spec.ts b/tests/playwright-test/runner.spec.ts
index 701b1e825d1f5..dece006a06ceb 100644
--- a/tests/playwright-test/runner.spec.ts
+++ b/tests/playwright-test/runner.spec.ts
@@ -145,13 +145,13 @@ test('should ignore subprocess creation error because of SIGINT', async ({ inter
   process.kill(-testProcess.process.pid!, 'SIGINT');
 
   const { exitCode } = await testProcess.exited;
-  expect(exitCode).toBe(130);
+  expect.soft(exitCode).toBe(130);
 
   const result = parseTestRunnerOutput(testProcess.output);
-  expect(result.passed).toBe(0);
-  expect(result.failed).toBe(0);
-  expect(result.didNotRun).toBe(2);
-  expect(result.output).not.toContain('worker process exited unexpectedly');
+  expect.soft(result.passed).toBe(0);
+  expect.soft(result.failed).toBe(0);
+  expect.soft(result.didNotRun).toBe(2);
+  expect.soft(result.output).not.toContain('worker process exited unexpectedly');
 });
 
 test('sigint should stop workers', async ({ interactWithTestRunner }) => {
@@ -442,7 +442,7 @@ test('sigint should stop global setup', async ({ interactWithTestRunner }) => {
   const result = parseTestRunnerOutput(testProcess.output);
   expect(result.passed).toBe(0);
   expect(result.output).toContain('Global setup');
-  expect(result.output).not.toContain('Global teardown');
+  expect(result.output).toContain('Global teardown');
 });
 
 test('sigint should stop plugins', async ({ interactWithTestRunner }) => {
@@ -841,3 +841,35 @@ test('should run last failed tests', async ({ runInlineTest }) => {
   expect(result2.passed).toBe(0);
   expect(result2.failed).toBe(1);
 });
+
+test('should run last failed tests in a shard', async ({ runInlineTest }) => {
+  const workspace = {
+    'a.spec.js': `
+      import { test, expect } from '@playwright/test';
+      test('pass-a', async () => {});
+      test('fail-a', async () => {
+        expect(1).toBe(2);
+      });
+    `,
+    'b.spec.js': `
+      import { test, expect } from '@playwright/test';
+      test('pass-b', async () => {});
+      test('fail-b', async () => {
+        expect(1).toBe(2);
+      });
+    `,
+  };
+  const result1 = await runInlineTest(workspace, { shard: '2/2' });
+  expect(result1.exitCode).toBe(1);
+  expect(result1.passed).toBe(1);
+  expect(result1.failed).toBe(1);
+  expect(result1.output).toContain('b.spec.js:3:11 › pass-b');
+  expect(result1.output).toContain('b.spec.js:4:11 › fail-b');
+
+  const result2 = await runInlineTest(workspace, { shard: '2/2' }, {}, { additionalArgs: ['--last-failed'] });
+  expect(result2.exitCode).toBe(1);
+  expect(result2.passed).toBe(0);
+  expect(result2.failed).toBe(1);
+  expect(result2.output).not.toContain('b.spec.js:3:11 › pass-b');
+  expect(result2.output).toContain('b.spec.js:4:11 › fail-b');
+});
diff --git a/tests/playwright-test/shard.spec.ts b/tests/playwright-test/shard.spec.ts
index e82a434f5233a..dcd75a9d23198 100644
--- a/tests/playwright-test/shard.spec.ts
+++ b/tests/playwright-test/shard.spec.ts
@@ -139,6 +139,12 @@ test('should respect shard=3/4', async ({ runInlineTest }) => {
   ]);
 });
 
+test('should exit with shard=/3', async ({ runInlineTest }) => {
+  test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34463' });
+  const result = await runInlineTest(tests, { shard: '/3' });
+  expect(result.exitCode).toBe(1);
+});
+
 test('should not produce skipped tests for zero-sized shards', async ({ runInlineTest }) => {
   const result = await runInlineTest(tests, { shard: '10/10', workers: 1 });
   expect(result.exitCode).toBe(0);
@@ -284,3 +290,43 @@ test('should not shard mode:default suites', async ({ runInlineTest }) => {
     expect(result.outputLines).toEqual(['beforeAll2', 'test4', 'test5']);
   }
 });
+
+test('should shard tests with beforeAll based on shards total instead of workers', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33077' },
+}, async ({ runInlineTest }) => {
+  const tests = {
+    'a.spec.ts': `
+      import { test } from '@playwright/test';
+
+      test.describe.configure({ mode: 'parallel' });
+      test.beforeAll(() => {
+        console.log('\\n%%beforeAll');
+      });
+
+      for (let i = 1; i <= 8; i++) {
+        test('test ' + i, async ({ }) => {
+          console.log('\\n%%test' + i);
+        });
+      }
+    `,
+  };
+
+  {
+    const result = await runInlineTest(tests, { shard: '1/4', workers: 1 });
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(2);
+    expect(result.outputLines).toEqual(['beforeAll', 'test1', 'test2']);
+  }
+  {
+    const result = await runInlineTest(tests, { shard: '2/4', workers: 1 });
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(2);
+    expect(result.outputLines).toEqual(['beforeAll', 'test3', 'test4']);
+  }
+  {
+    const result = await runInlineTest(tests, { shard: '7/8', workers: 6 });
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+    expect(result.outputLines).toEqual(['beforeAll', 'test7']);
+  }
+});
diff --git a/tests/playwright-test/snapshot-path-template.spec.ts b/tests/playwright-test/snapshot-path-template.spec.ts
index 4f260469b7b3a..f1224b956347f 100644
--- a/tests/playwright-test/snapshot-path-template.spec.ts
+++ b/tests/playwright-test/snapshot-path-template.spec.ts
@@ -138,3 +138,17 @@ test('arg should receive default arg', async ({ runInlineTest }, testInfo) => {
   expect(fs.existsSync(snapshotOutputPath)).toBe(true);
 });
 
+test('should throw for unknown snapshot kind', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('is a test', async ({}) => {
+        test.info().snapshotPath('foo', { kind: 'bar' });
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.passed).toBe(0);
+  expect(result.output).toContain(`testInfo.snapshotPath: unknown kind "bar"`);
+});
diff --git a/tests/playwright-test/stable-test-runner/package-lock.json b/tests/playwright-test/stable-test-runner/package-lock.json
index e6bf87ad763a0..5783e7dae80ea 100644
--- a/tests/playwright-test/stable-test-runner/package-lock.json
+++ b/tests/playwright-test/stable-test-runner/package-lock.json
@@ -5,15 +5,16 @@
   "packages": {
     "": {
       "dependencies": {
-        "@playwright/test": "1.45.0-beta-1718411373000"
+        "@playwright/test": "^1.55.0-alpha-2025-08-18"
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.45.0-beta-1718411373000",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.0-beta-1718411373000.tgz",
-      "integrity": "sha512-MUSJtFJLYqVgiR6HEHBc9BNlwVoA8hDbb0MaSJLPCEt4Q5jYsD5orNxDXJC5jgWqOEDUzSaCAU+iHs5UbIG9IQ==",
+      "version": "1.55.0-alpha-2025-08-18",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.55.0-alpha-2025-08-18.tgz",
+      "integrity": "sha512-JRaYyoUUCLEAZTPLKTyHbnTkiQwslxbrQwG99+q5nquET1zIv78NOPeNzDUbRGY9B7eLB9L34KBfM/5gJawqoQ==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.45.0-beta-1718411373000"
+        "playwright": "1.55.0-alpha-2025-08-18"
       },
       "bin": {
         "playwright": "cli.js"
@@ -27,6 +28,7 @@
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -36,11 +38,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.45.0-beta-1718411373000",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.0-beta-1718411373000.tgz",
-      "integrity": "sha512-ytXqNRkVkZVAm8VH1zGlUqJltWbElVkAnqw2fUeXelku2we+ZFL7gnMiSxiKIlfTfrKQgvdlMgWiZ1s4r5cW2Q==",
+      "version": "1.55.0-alpha-2025-08-18",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0-alpha-2025-08-18.tgz",
+      "integrity": "sha512-Q4IjkuNEy1eetYFMBGY5QvguL5DUNRsJsha5dIj+VZ7feCtucHup/bfOfs716zTrnZ5WDYmdd3RteTdwx2Vmuw==",
+      "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.45.0-beta-1718411373000"
+        "playwright-core": "1.55.0-alpha-2025-08-18"
       },
       "bin": {
         "playwright": "cli.js"
@@ -53,9 +56,10 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.45.0-beta-1718411373000",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.0-beta-1718411373000.tgz",
-      "integrity": "sha512-s9FTt2EMcnY8/BhJEMJN7tW3KogupYIv8DRBMb1fMtJQyFgH+iQwcvmj/an4MiXCtGXgQ0NNhVAbJtVwgjvHNA==",
+      "version": "1.55.0-alpha-2025-08-18",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0-alpha-2025-08-18.tgz",
+      "integrity": "sha512-UefQibPrUeVhXRbb0V7PniATbscGRqamtjs/TmG4ez4rjWDTPq/wd7qMP25ZeWHUOODYsaQGnn6Nc9JChWNTvQ==",
+      "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -66,11 +70,11 @@
   },
   "dependencies": {
     "@playwright/test": {
-      "version": "1.45.0-beta-1718411373000",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.0-beta-1718411373000.tgz",
-      "integrity": "sha512-MUSJtFJLYqVgiR6HEHBc9BNlwVoA8hDbb0MaSJLPCEt4Q5jYsD5orNxDXJC5jgWqOEDUzSaCAU+iHs5UbIG9IQ==",
+      "version": "1.55.0-alpha-2025-08-18",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.55.0-alpha-2025-08-18.tgz",
+      "integrity": "sha512-JRaYyoUUCLEAZTPLKTyHbnTkiQwslxbrQwG99+q5nquET1zIv78NOPeNzDUbRGY9B7eLB9L34KBfM/5gJawqoQ==",
       "requires": {
-        "playwright": "1.45.0-beta-1718411373000"
+        "playwright": "1.55.0-alpha-2025-08-18"
       }
     },
     "fsevents": {
@@ -80,18 +84,18 @@
       "optional": true
     },
     "playwright": {
-      "version": "1.45.0-beta-1718411373000",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.0-beta-1718411373000.tgz",
-      "integrity": "sha512-ytXqNRkVkZVAm8VH1zGlUqJltWbElVkAnqw2fUeXelku2we+ZFL7gnMiSxiKIlfTfrKQgvdlMgWiZ1s4r5cW2Q==",
+      "version": "1.55.0-alpha-2025-08-18",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0-alpha-2025-08-18.tgz",
+      "integrity": "sha512-Q4IjkuNEy1eetYFMBGY5QvguL5DUNRsJsha5dIj+VZ7feCtucHup/bfOfs716zTrnZ5WDYmdd3RteTdwx2Vmuw==",
       "requires": {
         "fsevents": "2.3.2",
-        "playwright-core": "1.45.0-beta-1718411373000"
+        "playwright-core": "1.55.0-alpha-2025-08-18"
       }
     },
     "playwright-core": {
-      "version": "1.45.0-beta-1718411373000",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.0-beta-1718411373000.tgz",
-      "integrity": "sha512-s9FTt2EMcnY8/BhJEMJN7tW3KogupYIv8DRBMb1fMtJQyFgH+iQwcvmj/an4MiXCtGXgQ0NNhVAbJtVwgjvHNA=="
+      "version": "1.55.0-alpha-2025-08-18",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0-alpha-2025-08-18.tgz",
+      "integrity": "sha512-UefQibPrUeVhXRbb0V7PniATbscGRqamtjs/TmG4ez4rjWDTPq/wd7qMP25ZeWHUOODYsaQGnn6Nc9JChWNTvQ=="
     }
   }
 }
diff --git a/tests/playwright-test/stable-test-runner/package.json b/tests/playwright-test/stable-test-runner/package.json
index 97adee767d2ca..d46a4c4c46dd5 100644
--- a/tests/playwright-test/stable-test-runner/package.json
+++ b/tests/playwright-test/stable-test-runner/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "@playwright/test": "1.45.0-beta-1718411373000"
+    "@playwright/test": "^1.55.0-alpha-2025-08-18"
   }
 }
diff --git a/tests/playwright-test/stdio.spec.ts b/tests/playwright-test/stdio.spec.ts
index 3d23606fad663..b29ef2a07c9e7 100644
--- a/tests/playwright-test/stdio.spec.ts
+++ b/tests/playwright-test/stdio.spec.ts
@@ -117,3 +117,23 @@ test('should not throw type error when using assert', async ({ runInlineTest })
   expect(result.output).not.toContain(`TypeError: process.stderr.hasColors is not a function`);
   expect(result.output).toContain(`AssertionError`);
 });
+
+test('should have debug colors by default, but respect DEBUG_COLORS=0', async ({ runInlineTest }) => {
+  const files = {
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      import debug from 'debug';
+      test('passes', () => {
+        const dbg = debug('example');
+        dbg.color = 34;  // red
+        dbg('some text');
+      });
+    `
+  };
+
+  const result1 = await runInlineTest(files, {}, { DEBUG: 'example', DEBUG_COLORS: undefined });
+  expect(result1.rawOutput).toContain('\x1b[38;5;34;1mexample \x1b[0msome text');
+
+  const result2 = await runInlineTest(files, {}, { DEBUG: 'example', DEBUG_COLORS: '0' });
+  expect(result2.rawOutput).not.toContain('\x1b[38;5;34;1mexample \x1b[0msome text');
+});
diff --git a/tests/playwright-test/test-ignore.spec.ts b/tests/playwright-test/test-ignore.spec.ts
index b552380faa8bf..17e3b3adae5d4 100644
--- a/tests/playwright-test/test-ignore.spec.ts
+++ b/tests/playwright-test/test-ignore.spec.ts
@@ -370,4 +370,4 @@ test('should always work with unix separators', async ({ runInlineTest }) => {
   expect(result.passed).toBe(1);
   expect(result.report.suites.map(s => s.file).sort()).toEqual(['a.test.ts']);
   expect(result.exitCode).toBe(0);
-});
\ No newline at end of file
+});
diff --git a/tests/playwright-test/test-modifiers.spec.ts b/tests/playwright-test/test-modifiers.spec.ts
index 0dd41bd0abd59..e73e483b278c4 100644
--- a/tests/playwright-test/test-modifiers.spec.ts
+++ b/tests/playwright-test/test-modifiers.spec.ts
@@ -113,19 +113,19 @@ test('test modifiers should work', async ({ runInlineTest }) => {
   expectTest('passed3', 'passed', 'passed', []);
   expectTest('passed4', 'passed', 'passed', []);
   expectTest('passed5', 'passed', 'passed', []);
-  expectTest('skipped1', 'skipped', 'skipped', [{ type: 'skip' }]);
-  expectTest('skipped2', 'skipped', 'skipped', [{ type: 'skip' }]);
-  expectTest('skipped3', 'skipped', 'skipped', [{ type: 'skip' }]);
-  expectTest('skipped4', 'skipped', 'skipped', [{ type: 'skip', description: 'reason' }]);
-  expectTest('skipped5', 'skipped', 'skipped', [{ type: 'fixme' }]);
-  expectTest('skipped6', 'skipped', 'skipped', [{ type: 'fixme', description: 'reason' }]);
-  expectTest('failed1', 'failed', 'failed', [{ type: 'fail' }]);
-  expectTest('failed2', 'failed', 'failed', [{ type: 'fail' }]);
-  expectTest('failed3', 'failed', 'failed', [{ type: 'fail' }]);
-  expectTest('failed4', 'failed', 'failed', [{ type: 'fail', description: 'reason' }]);
-  expectTest('suite1', 'skipped', 'skipped', [{ type: 'skip' }]);
-  expectTest('suite2', 'skipped', 'skipped', [{ type: 'skip' }]);
-  expectTest('suite3', 'skipped', 'skipped', [{ type: 'skip', description: 'reason' }]);
+  expectTest('skipped1', 'skipped', 'skipped', [{ type: 'skip', location: { file: expect.any(String), line: 20, column: 14 } }]);
+  expectTest('skipped2', 'skipped', 'skipped', [{ type: 'skip', location: { file: expect.any(String), line: 23, column: 14 } }]);
+  expectTest('skipped3', 'skipped', 'skipped', [{ type: 'skip', location: { file: expect.any(String), line: 26, column: 14 } }]);
+  expectTest('skipped4', 'skipped', 'skipped', [{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 29, column: 14 } }]);
+  expectTest('skipped5', 'skipped', 'skipped', [{ type: 'fixme', location: { file: expect.any(String), line: 32, column: 14 } }]);
+  expectTest('skipped6', 'skipped', 'skipped', [{ type: 'fixme', description: 'reason', location: { file: expect.any(String), line: 35, column: 14 } }]);
+  expectTest('failed1', 'failed', 'failed', [{ type: 'fail', location: { file: expect.any(String), line: 39, column: 14 } }]);
+  expectTest('failed2', 'failed', 'failed', [{ type: 'fail', location: { file: expect.any(String), line: 43, column: 14 } }]);
+  expectTest('failed3', 'failed', 'failed', [{ type: 'fail', location: { file: expect.any(String), line: 47, column: 14 } }]);
+  expectTest('failed4', 'failed', 'failed', [{ type: 'fail', description: 'reason', location: { file: expect.any(String), line: 51, column: 14 } }]);
+  expectTest('suite1', 'skipped', 'skipped', [{ type: 'skip', location: { file: expect.any(String), line: 56, column: 14 } }]);
+  expectTest('suite2', 'skipped', 'skipped', [{ type: 'skip', location: { file: expect.any(String), line: 61, column: 14 } }]);
+  expectTest('suite3', 'skipped', 'skipped', [{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 66, column: 14 } }]);
   expectTest('suite4', 'passed', 'passed', []);
   expect(result.passed).toBe(10);
   expect(result.skipped).toBe(9);
@@ -279,21 +279,31 @@ test.describe('test modifier annotations', () => {
     expectTest('focused fixme by suite', 'skipped', 'skipped', ['fixme']);
   });
 
-  test('should not multiple on retry', async ({ runInlineTest }) => {
+  test('should work with fail.only inside describe.only', async ({ runInlineTest }) => {
     const result = await runInlineTest({
       'a.test.ts': `
         import { test, expect } from '@playwright/test';
-        test('retry', () => {
-          test.info().annotations.push({ type: 'example' });
-          expect(1).toBe(2);
+  
+        test.describe.only("suite", () => {
+          test.skip('focused skip by suite', () => {});
+          test.fixme('focused fixme by suite', () => {});
+          test.fail.only('focused fail by suite', () => { expect(1).toBe(2); });
+        });
+  
+        test.describe.skip('not focused', () => {
+          test('no marker', () => {});
         });
       `,
-    }, { retries: 3 });
+    });
     const expectTest = expectTestHelper(result);
 
-    expect(result.exitCode).toBe(1);
-    expect(result.passed).toBe(0);
-    expectTest('retry', 'passed', 'unexpected', ['example']);
+    expect(result.exitCode).toBe(0);
+    expect(result.passed).toBe(1);
+    expect(result.failed).toBe(0);
+    expect(result.skipped).toBe(0);
+    expectTest('focused skip by suite', 'skipped', 'skipped', ['skip']);
+    expectTest('focused fixme by suite', 'skipped', 'skipped', ['fixme']);
+    expectTest('focused fail by suite', 'failed', 'expected', ['fail']);
   });
 
   test('should not multiply on repeat-each', async ({ runInlineTest }) => {
@@ -397,7 +407,7 @@ test('should skip inside fixture', async ({ runInlineTest }) => {
   });
   expect(result.exitCode).toBe(0);
   expect(result.skipped).toBe(1);
-  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
+  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 5, column: 20 } }]);
 });
 
 test('modifier with a function should throw in the test', async ({ runInlineTest }) => {
@@ -450,8 +460,8 @@ test('test.skip with worker fixtures only should skip before hooks and tests', a
   expect(result.passed).toBe(1);
   expect(result.skipped).toBe(2);
   expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([]);
-  expect(result.report.suites[0].suites![0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
-  expect(result.report.suites[0].suites![0].suites![0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
+  expect(result.report.suites[0].suites![0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 14, column: 14 } }]);
+  expect(result.report.suites[0].suites![0].suites![0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 14, column: 14 } }]);
   expect(result.outputLines).toEqual([
     'beforeEach',
     'passed',
@@ -483,8 +493,8 @@ test('test.skip without a callback in describe block should skip hooks', async (
   });
   expect(result.exitCode).toBe(0);
   expect(result.skipped).toBe(2);
-  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
-  expect(result.report.suites[0].suites![0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
+  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 10, column: 12 } }]);
+  expect(result.report.suites[0].suites![0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 10, column: 12 } }]);
   expect(result.output).not.toContain('%%');
 });
 
@@ -588,8 +598,8 @@ test('should skip all tests from beforeAll', async ({ runInlineTest }) => {
     'beforeAll',
     'afterAll',
   ]);
-  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
-  expect(result.report.suites[0].specs[1].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason' }]);
+  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 5, column: 14 } }]);
+  expect(result.report.suites[0].specs[1].tests[0].annotations).toEqual([{ type: 'skip', description: 'reason', location: { file: expect.any(String), line: 5, column: 14 } }]);
 });
 
 test('should report skipped tests in-order with correct properties', async ({ runInlineTest }) => {
@@ -685,9 +695,9 @@ test('static modifiers should be added in serial mode', async ({ runInlineTest }
   expect(result.passed).toBe(0);
   expect(result.skipped).toBe(2);
   expect(result.didNotRun).toBe(1);
-  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'slow' }]);
-  expect(result.report.suites[0].specs[1].tests[0].annotations).toEqual([{ type: 'fixme' }]);
-  expect(result.report.suites[0].specs[2].tests[0].annotations).toEqual([{ type: 'skip' }]);
+  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'slow', location: { file: expect.any(String), line: 6, column: 14 } }]);
+  expect(result.report.suites[0].specs[1].tests[0].annotations).toEqual([{ type: 'fixme', location: { file: expect.any(String), line: 9, column: 12 } }]);
+  expect(result.report.suites[0].specs[2].tests[0].annotations).toEqual([{ type: 'skip', location: { file: expect.any(String), line: 11, column: 12 } }]);
   expect(result.report.suites[0].specs[3].tests[0].annotations).toEqual([]);
 });
 
@@ -711,9 +721,18 @@ test('should contain only one slow modifier', async ({ runInlineTest }) => {
   });
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
-  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([{ type: 'fixme' }, { type: 'issue', description: 'my-value' }]);
-  expect(result.report.suites[1].specs[0].tests[0].annotations).toEqual([{ type: 'skip' }, { type: 'issue', description: 'my-value' }]);
-  expect(result.report.suites[2].specs[0].tests[0].annotations).toEqual([{ type: 'slow' }, { type: 'issue', description: 'my-value' }]);
+  expect(result.report.suites[0].specs[0].tests[0].annotations).toEqual([
+    { type: 'fixme', location: { file: expect.any(String), line: 3, column: 12 } },
+    { type: 'issue', description: 'my-value', location: { file: expect.any(String), line: 4, column: 11 } }
+  ]);
+  expect(result.report.suites[1].specs[0].tests[0].annotations).toEqual([
+    { type: 'skip', location: { file: expect.any(String), line: 3, column: 12 } },
+    { type: 'issue', description: 'my-value', location: { file: expect.any(String), line: 4, column: 11 } }
+  ]);
+  expect(result.report.suites[2].specs[0].tests[0].annotations).toEqual([
+    { type: 'slow', location: { file: expect.any(String), line: 3, column: 12 } },
+    { type: 'issue', description: 'my-value', location: { file: expect.any(String), line: 4, column: 11 } }
+  ]);
 });
 
 test('should skip beforeEach hooks upon modifiers', async ({ runInlineTest }) => {
diff --git a/tests/playwright-test/test-parallel.spec.ts b/tests/playwright-test/test-parallel.spec.ts
index 3939a940633f9..394969043aa0d 100644
--- a/tests/playwright-test/test-parallel.spec.ts
+++ b/tests/playwright-test/test-parallel.spec.ts
@@ -223,3 +223,52 @@ test('parallel mode should minimize running beforeAll/afterAll hooks 2', async (
   expect(countTimes(result.output, '%%beforeAll')).toBe(2);
   expect(countTimes(result.output, '%%afterAll')).toBe(2);
 });
+
+test('parallel mode should display worker count taking project workers into account', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        workers: 10,
+        fullyParallel: true,
+        projects: [
+          { name: 'project1', workers: 3 },
+        ],
+      };
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test1', () => {});
+      test('test2', () => {});
+      test('test3', () => {});
+      test('test4', () => {});
+    `,
+  }, { workers: 10 });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(4);
+  expect(result.output).toContain('Running 4 tests using 3 workers');
+
+  // Multiple parallel projects
+  const result2 = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        workers: 12,
+        fullyParallel: true,
+        projects: [
+          { name: 'project1', workers: 3 },
+          { name: 'project2', workers: 4 },
+          { name: 'project3', workers: 4 },
+        ],
+      };
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test1', () => {});
+      test('test2', () => {});
+      test('test3', () => {});
+      test('test4', () => {});
+    `,
+  }, { workers: 12 });
+  expect(result2.exitCode).toBe(0);
+  expect(result2.passed).toBe(12);
+  expect(result2.output).toContain('Running 12 tests using 11 workers');
+});
diff --git a/tests/playwright-test/test-server.spec.ts b/tests/playwright-test/test-server.spec.ts
new file mode 100644
index 0000000000000..157989c47e688
--- /dev/null
+++ b/tests/playwright-test/test-server.spec.ts
@@ -0,0 +1,229 @@
+/**
+ * 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 as baseTest, expect } from './ui-mode-fixtures';
+import { TestServerConnection } from '../../packages/playwright/lib/isomorphic/testServerConnection';
+import { playwrightCtConfigText } from './playwright-test-fixtures';
+import ws from 'ws';
+import type { TestChildProcess } from '../config/commonFixtures';
+
+class WSTransport {
+  private _ws: ws.WebSocket;
+  constructor(url: string) {
+    this._ws = new ws.WebSocket(url);
+  }
+  onmessage(listener: (message: string) => void) {
+    this._ws.addEventListener('message', event => listener(event.data.toString()));
+  }
+  onopen(listener: () => void) {
+    this._ws.addEventListener('open', listener);
+  }
+  onerror(listener: () => void) {
+    this._ws.addEventListener('error', listener);
+  }
+  onclose(listener: () => void) {
+    this._ws.addEventListener('close', listener);
+  }
+  send(data: string) {
+    this._ws.send(data);
+  }
+  close() {
+    this._ws.close();
+  }
+}
+
+class TestServerConnectionUnderTest extends TestServerConnection {
+  events: [string, any][] = [];
+
+  constructor(wsUrl: string) {
+    super(new WSTransport(wsUrl));
+    this.onTestFilesChanged(params => this.events.push(['testFilesChanged', params]));
+    this.onStdio(params => this.events.push(['stdio', params]));
+    this.onLoadTraceRequested(params => this.events.push(['loadTraceRequested', params]));
+  }
+}
+
+const test = baseTest.extend<{ startTestServer: () => Promise<TestServerConnectionUnderTest> }>({
+  startTestServer: async ({ startCLICommand }, use, testInfo) => {
+    let testServerProcess: TestChildProcess | undefined;
+    await use(async () => {
+      testServerProcess = await startCLICommand({}, 'test-server');
+      await testServerProcess.waitForOutput('Listening on');
+      const line = testServerProcess.output.split('\n').find(l => l.includes('Listening on'));
+      const wsEndpoint = line!.split(' ')[2];
+      return new TestServerConnectionUnderTest(wsEndpoint);
+    });
+    await testServerProcess?.kill();
+  }
+});
+
+const ctFiles = {
+  'playwright.config.ts': playwrightCtConfigText,
+  'playwright/index.html': `<script type="module" src="./index.ts"></script>`,
+  'playwright/index.ts': ``,
+  'src/button.tsx': `
+    export const Button = () => <button>Button</button>;
+  `,
+  'src/button.test.tsx': `
+    import { test, expect } from '@playwright/experimental-ct-react';
+    import { Button } from './button';
+
+    test('pass', async ({ mount }) => {
+      const component = await mount(<Button></Button>);
+      await expect(component).toHaveText('Button', { timeout: 1 });
+    });
+  `,
+};
+
+test('file watching', async ({ startTestServer, writeFiles }, testInfo) => {
+  await writeFiles({
+    'utils.ts': `
+      export const expected = 42;
+      `,
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      import { expected } from "./utils";
+      test('foo', () => {
+        expect(123).toBe(expected);
+      });
+      `,
+  });
+
+  const testServerConnection = await startTestServer();
+  const tests = await testServerConnection.listTests({});
+  expect(tests.report.map(e => e.method)).toEqual(['onConfigure', 'onProject', 'onBegin', 'onEnd']);
+
+  await testServerConnection.watch({ fileNames: [testInfo.outputPath('a.test.ts')] });
+
+  await writeFiles({
+    'utils.ts': `
+      export const expected = 123;
+      `,
+  });
+
+  await expect.poll(() => testServerConnection.events).toHaveLength(1);
+  expect(testServerConnection.events).toEqual([
+    ['testFilesChanged', { testFiles: [testInfo.outputPath('a.test.ts')] }]
+  ]);
+});
+
+test('should list tests with testIdAttribute', async ({ startTestServer, writeFiles }) => {
+  await writeFiles({
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      test('foo', () => {});
+      `,
+    'playwright.config.ts': `
+        module.exports = {
+        projects: [{
+          name: 'chromium',
+          use: {
+            testIdAttribute: 'testId',
+          }
+        }]
+      };
+      `,
+  });
+
+  const testServerConnection = await startTestServer();
+  const events = await testServerConnection.listFiles({});
+  const onProject = events.report.find(e => e.method === 'onProject').params.project;
+  expect(onProject.name).toBe('chromium');
+  expect(onProject.use.testIdAttribute).toBe('testId');
+});
+
+test('stdio interception', async ({ startTestServer, writeFiles }) => {
+  const testServerConnection = await startTestServer();
+  await testServerConnection.initialize({ interceptStdio: true });
+  await writeFiles({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('foo', () => {
+        console.log("this goes to stdout");
+        console.error("this goes to stderr");
+        expect(true).toBe(true);
+      });
+      `,
+  });
+
+  const tests = await testServerConnection.runTests({ trace: 'on' });
+  expect(tests).toEqual({ status: 'passed' });
+  await expect.poll(() => testServerConnection.events).toEqual(expect.arrayContaining([
+    ['stdio', { type: 'stderr', text: 'this goes to stderr\n' }],
+    ['stdio', { type: 'stdout', text: 'this goes to stdout\n' }]
+  ]));
+});
+
+test('start dev server', async ({ startTestServer, writeFiles, runInlineTest }) => {
+  await writeFiles(ctFiles);
+
+  const testServerConnection = await startTestServer();
+  await testServerConnection.initialize({ interceptStdio: true });
+  expect((await testServerConnection.runGlobalSetup({})).status).toBe('passed');
+  expect((await testServerConnection.startDevServer({})).status).toBe('passed');
+
+  const result = await runInlineTest({}, { workers: 1 });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+  expect(result.output).toContain('Dev Server is already running at');
+
+  expect((await testServerConnection.stopDevServer({})).status).toBe('passed');
+  expect((await testServerConnection.runGlobalTeardown({})).status).toBe('passed');
+});
+
+test('find related test files errors', async ({ startTestServer, writeFiles }) => {
+  await writeFiles({
+    'a.spec.ts': `
+      const a = 1;
+      const a = 2;
+    `,
+  });
+  const testServerConnection = await startTestServer();
+  await testServerConnection.initialize({ interceptStdio: true });
+  expect((await testServerConnection.runGlobalSetup({})).status).toBe('passed');
+
+  const aSpecTs = test.info().outputPath('a.spec.ts');
+  const result = await testServerConnection.findRelatedTestFiles({ files: [aSpecTs] });
+  expect(result).toEqual({ testFiles: [], errors: [
+    expect.objectContaining({ message: expect.stringContaining(`Identifier 'a' has already been declared`) }),
+    expect.objectContaining({ message: expect.stringContaining(`No tests found`) }),
+  ] });
+
+  expect((await testServerConnection.runGlobalTeardown({})).status).toBe('passed');
+});
+
+test('find related test files', async ({ startTestServer, writeFiles }) => {
+  await writeFiles(ctFiles);
+  const testServerConnection = await startTestServer();
+  await testServerConnection.initialize({ interceptStdio: true });
+  expect((await testServerConnection.runGlobalSetup({})).status).toBe('passed');
+
+  const buttonTsx = test.info().outputPath('src/button.tsx');
+  const buttonTestTsx = test.info().outputPath('src/button.test.tsx');
+  const result = await testServerConnection.findRelatedTestFiles({ files: [buttonTsx] });
+  expect(result).toEqual({ testFiles: [buttonTestTsx] });
+
+  expect((await testServerConnection.runGlobalTeardown({})).status).toBe('passed');
+});
+
+test('clear cache', async ({ startTestServer, writeFiles }) => {
+  await writeFiles(ctFiles);
+  const testServerConnection = await startTestServer();
+  await testServerConnection.initialize({ interceptStdio: true });
+  expect((await testServerConnection.runGlobalSetup({})).status).toBe('passed');
+  await testServerConnection.clearCache({});
+  expect((await testServerConnection.runGlobalTeardown({})).status).toBe('passed');
+});
diff --git a/tests/playwright-test/test-step.spec.ts b/tests/playwright-test/test-step.spec.ts
index c35070c945f75..3e472d4311193 100644
--- a/tests/playwright-test/test-step.spec.ts
+++ b/tests/playwright-test/test-step.spec.ts
@@ -17,37 +17,41 @@
 import { test, expect, stripAnsi } from './playwright-test-fixtures';
 
 const stepIndentReporter = `
+import { FullConfig, Location, Reporter, Suite, TestStep } from '@playwright/test/reporter';
 import * as path from 'path';
 
-function formatPrefix(str) {
+function formatPrefix(str: string) {
   return str.padEnd(10, ' ') + '|';
 }
 
-function formatLocation(location) {
+function formatLocation(location?: Location) {
+  if (!location)
+    throw new Error('Location is missing');
   return ' @ ' + path.basename(location.file) + ':' + location.line;
 }
 
-function formatStack(indent, stack) {
-  stack = stack.split('\\n').filter(s => s.startsWith('    at '));
+function formatStack(indent: string, rawStack: string) {
+  let stack = rawStack.split('\\n').filter(s => s.startsWith('    at '));
   stack = stack.map(s => {
     const match =  /^(    at.* )\\(?([^ )]+)\\)?/.exec(s);
-    let location = match[2];
+    let location = match![2];
     location = location.substring(location.lastIndexOf(path.sep) + 1);
     return '    at ' + location;
   });
   return indent + stack.join('\\n' + indent);
 }
 
-class Reporter {
+export default class MyReporter implements Reporter {
   printErrorLocation: boolean;
   skipErrorMessage: boolean;
+  suite!: Suite;
 
-  constructor(options) {
+  constructor(options: { printErrorLocation: boolean, skipErrorMessage: boolean }) {
     this.printErrorLocation = options.printErrorLocation;
     this.skipErrorMessage = options.skipErrorMessage;
   }
 
-  trimError(message) {
+  trimError(message: string) {
     if (this.skipErrorMessage)
       return '<error message>';
     const lines = message.split('\\n');
@@ -59,24 +63,26 @@ class Reporter {
   }
 
   // For easier debugging.
-  onStdOut(data) {
+  onStdOut(data: string|Buffer) {
     process.stdout.write(data.toString());
   }
   // For easier debugging.
-  onStdErr(data) {
+  onStdErr(data: string|Buffer) {
     process.stderr.write(data.toString());
   }
 
-  printStep(step, indent) {
+  printStep(step: TestStep, indent: string) {
     let location = '';
     if (step.location)
       location = formatLocation(step.location);
-    console.log(formatPrefix(step.category) + indent + step.title + location);
+    const skip = step.annotations?.find(a => a.type === 'skip');
+    const skipped = skip?.description ? ' (skipped: ' + skip.description + ')' : skip ? ' (skipped)' : '';
+    console.log(formatPrefix(step.category) + indent + step.title + location + skipped);
     if (step.error) {
       const errorLocation = this.printErrorLocation ? formatLocation(step.error.location) : '';
-      console.log(formatPrefix(step.category) + indent + '↪ error: ' + this.trimError(step.error.message) + errorLocation);
+      console.log(formatPrefix(step.category) + indent + '↪ error: ' + this.trimError(step.error.message!) + errorLocation);
       if (this.printErrorLocation)
-        console.log(formatStack(formatPrefix(step.category) + indent, step.error.stack));
+        console.log(formatStack(formatPrefix(step.category) + indent, step.error.stack!));
     }
     indent += '  ';
     for (const child of step.steps)
@@ -94,9 +100,9 @@ class Reporter {
             this.printStep(step, '');
           for (const error of result.errors) {
             const errorLocation = this.printErrorLocation ? formatLocation(error.location) : '';
-            console.log(formatPrefix('') + this.trimError(error.message) + errorLocation);
+            console.log(formatPrefix('') + this.trimError(error.message!) + errorLocation);
             if (this.printErrorLocation)
-              console.log(formatStack(formatPrefix(''), error.stack));
+              console.log(formatStack(formatPrefix(''), error.stack!));
           }
         }
       }
@@ -104,7 +110,6 @@ class Reporter {
     processSuite(this.suite);
   }
 }
-module.exports = Reporter;
 `;
 
 test('should report api step hierarchy', async ({ runInlineTest }) => {
@@ -133,12 +138,12 @@ test('should report api step hierarchy', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(result.output).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
 test.step |outer step 1 @ a.test.ts:4
 test.step |  inner step 1.1 @ a.test.ts:5
 test.step |  inner step 1.2 @ a.test.ts:6
@@ -146,8 +151,9 @@ test.step |outer step 2 @ a.test.ts:8
 test.step |  inner step 2.1 @ a.test.ts:9
 test.step |  inner step 2.2 @ a.test.ts:10
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
@@ -202,18 +208,19 @@ test('should not report nested after hooks', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(1);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
 test.step |my step @ a.test.ts:4
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 hook      |Worker Cleanup
-fixture   |  fixture: browser
+fixture   |  Fixture "browser"
           |Test timeout of 2000ms exceeded.
 `);
 });
@@ -260,20 +267,20 @@ test('should report test.step from fixtures', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(result.outputLines).toEqual([
     `begin Before Hooks`,
-    `begin fixture: foo`,
+    `begin Fixture "foo"`,
     `begin setup foo`,
     `end setup foo`,
-    `end fixture: foo`,
+    `end Fixture "foo"`,
     `end Before Hooks`,
     `begin test step`,
     `begin inside foo`,
     `end inside foo`,
     `end test step`,
     `begin After Hooks`,
-    `begin fixture: foo`,
+    `begin Fixture "foo"`,
     `begin teardown foo`,
     `end teardown foo`,
-    `end fixture: foo`,
+    `end Fixture "foo"`,
     `end After Hooks`,
   ]);
 });
@@ -297,7 +304,7 @@ test('should report expect step locations', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(result.output).toBe(`
 hook      |Before Hooks
-expect    |expect.toBeTruthy @ a.test.ts:4
+expect    |Expect "toBeTruthy" @ a.test.ts:4
 hook      |After Hooks
 `);
 });
@@ -311,7 +318,9 @@ test('should report custom expect steps', async ({ runInlineTest }) => {
       };
     `,
     'a.test.ts': `
-      expect.extend({
+      import { test, expect as baseExpect } from '@playwright/test';
+
+      const expect = baseExpect.extend({
         toBeWithinRange(received, floor, ceiling) {
           const pass = received >= floor && received <= ceiling;
           if (pass) {
@@ -338,7 +347,6 @@ test('should report custom expect steps', async ({ runInlineTest }) => {
         },
       });
 
-      import { test, expect } from '@playwright/test';
       test('fail', async ({}) => {
         expect(15).toBeWithinRange(10, 20);
         await expect(1).toBeFailingAsync(22);
@@ -349,8 +357,8 @@ test('should report custom expect steps', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(1);
   expect(result.output).toBe(`
 hook      |Before Hooks
-expect    |expect.toBeWithinRange @ a.test.ts:31
-expect    |expect.toBeFailingAsync @ a.test.ts:32
+expect    |Expect "toBeWithinRange" @ a.test.ts:32
+expect    |Expect "toBeFailingAsync" @ a.test.ts:33
 expect    |↪ error: Error: It fails!
 hook      |After Hooks
 hook      |Worker Cleanup
@@ -358,18 +366,16 @@ hook      |Worker Cleanup
 `);
 });
 
-test('should not pass arguments and return value from step', async ({ runInlineTest }) => {
+test('should not pass return value from step', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'a.test.ts': `
       import { test, expect } from '@playwright/test';
       test('steps with return values', async ({ page }) => {
-        const v1 = await test.step('my step', (...args) => {
-          expect(args.length).toBe(0);
+        const v1 = await test.step('my step', () => {
           return 10;
         });
         console.log('v1 = ' + v1);
-        const v2 = await test.step('my step', async (...args) => {
-          expect(args.length).toBe(0);
+        const v2 = await test.step('my step', async () => {
           return new Promise(f => setTimeout(() => f(v1 + 10), 100));
         });
         console.log('v2 = ' + v2);
@@ -382,6 +388,79 @@ test('should not pass arguments and return value from step', async ({ runInlineT
   expect(result.output).toContain('v2 = 20');
 });
 
+test('step timeout option', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('step with timeout', async () => {
+        await test.step('my step', async () => {
+          await new Promise(() => {});
+        }, { timeout: 100 });
+      });
+    `
+  }, { reporter: '', workers: 1 });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.output).toContain('Error: Step timeout of 100ms exceeded.');
+});
+
+test('step timeout longer than test timeout', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      import { defineConfig } from '@playwright/test';
+      export default defineConfig({ timeout: 900 });
+    `,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('step with timeout', async () => {
+        await test.step('my step', async () => {
+          await new Promise(() => {});
+        }, { timeout: 5000 });
+      });
+    `
+  }, { reporter: '', workers: 1 });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.output).toContain('Test timeout of 900ms exceeded.');
+});
+
+test('step timeout includes interrupted action errors', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('step with timeout', async ({ page }) => {
+        await test.step('my step', async () => {
+          await page.waitForTimeout(100_000);
+        }, { timeout: 1000 });
+      });
+    `
+  }, { reporter: '', workers: 1 });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  // Should include 2 errors, one for the step timeout and one for the aborted action.
+  expect.soft(result.output).toContain('TimeoutError: Step timeout of 1000ms exceeded.');
+  expect.soft(result.output).toContain(`> 4 |         await test.step('my step', async () => {`);
+  expect.soft(result.output).toContain('Error: page.waitForTimeout: Test ended.');
+  expect.soft(result.output.split('Error: page.waitForTimeout: Test ended.').length).toBe(2);
+  expect.soft(result.output).toContain('> 5 |           await page.waitForTimeout(100_000);');
+});
+
+test('step timeout is errors.TimeoutError', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect, errors } from '@playwright/test';
+      test('step timeout error type', async () => {
+        const e = await test.step('my step', async () => {
+          await new Promise(() => {});
+        }, { timeout: 100 }).catch(e => e);
+        expect(e).toBeInstanceOf(errors.TimeoutError);
+      });
+    `
+  }, { reporter: '', workers: 1 });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
 test('should mark step as failed when soft expect fails', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'reporter.ts': stepIndentReporter,
@@ -410,7 +489,7 @@ test.step |outer @ a.test.ts:4
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |  inner @ a.test.ts:5
 test.step |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |    expect.soft.toBe @ a.test.ts:6
+expect    |    Expect "soft toBe" @ a.test.ts:6
 expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |passing @ a.test.ts:9
 hook      |After Hooks
@@ -471,24 +550,25 @@ hook      |  beforeAll hook @ a.test.ts:3
 test.step |    in beforeAll @ a.test.ts:4
 hook      |  beforeEach hook @ a.test.ts:11
 test.step |    in beforeEach @ a.test.ts:12
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
 test.step |grand @ a.test.ts:20
 test.step |  parent1 @ a.test.ts:22
 test.step |    child1 @ a.test.ts:23
-pw:api    |      page.click(body) @ a.test.ts:24
+pw:api    |      Click locator('body') @ a.test.ts:24
 test.step |  parent2 @ a.test.ts:27
 test.step |    child2 @ a.test.ts:28
-expect    |      expect.toBeVisible @ a.test.ts:29
+expect    |      Expect "toBeVisible" @ a.test.ts:29
 hook      |After Hooks
 hook      |  afterEach hook @ a.test.ts:15
 test.step |    in afterEach @ a.test.ts:16
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 hook      |  afterAll hook @ a.test.ts:7
 test.step |    in afterAll @ a.test.ts:8
 `);
@@ -526,53 +606,22 @@ test('should not mark page.close as failed when page.click fails', async ({ runI
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
 hook      |  beforeAll hook @ a.test.ts:5
-fixture   |    fixture: browser
-pw:api    |      browserType.launch
-pw:api    |    browser.newPage @ a.test.ts:6
-pw:api    |page.setContent @ a.test.ts:15
-pw:api    |page.click(div) @ a.test.ts:16
+fixture   |    Fixture "browser"
+pw:api    |      Launch browser
+pw:api    |    Create page @ a.test.ts:6
+pw:api    |Set content @ a.test.ts:15
+pw:api    |Click locator('div') @ a.test.ts:16
 pw:api    |↪ error: Error: page.click: Target page, context or browser has been closed
 hook      |After Hooks
 hook      |  afterAll hook @ a.test.ts:9
-pw:api    |    page.close @ a.test.ts:10
+pw:api    |    Close context @ a.test.ts:10
 hook      |Worker Cleanup
-fixture   |  fixture: browser
+fixture   |  Fixture "browser"
           |Test timeout of 2000ms exceeded.
           |Error: page.click: Target page, context or browser has been closed
 `);
 });
 
-test('should nest page.continue inside page.goto steps', async ({ runInlineTest }) => {
-  const result = await runInlineTest({
-    'reporter.ts': stepIndentReporter,
-    'playwright.config.ts': `module.exports = { reporter: './reporter', };`,
-    'a.test.ts': `
-      import { test, expect } from '@playwright/test';
-      test('pass', async ({ page }) => {
-        await page.route('**/*', route => route.fulfill('<html></html>'));
-        await page.goto('http://localhost:1234');
-      });
-    `
-  }, { reporter: '' });
-
-  expect(result.exitCode).toBe(0);
-  expect(result.output).toBe(`
-hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-pw:api    |page.route @ a.test.ts:4
-pw:api    |page.goto(http://localhost:1234) @ a.test.ts:5
-pw:api    |  route.fulfill @ a.test.ts:4
-hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
-`);
-});
-
 test('should not propagate errors from within toPass', async ({ runInlineTest }) => {
   const result = await runInlineTest({
     'reporter.ts': stepIndentReporter,
@@ -591,12 +640,12 @@ test('should not propagate errors from within toPass', async ({ runInlineTest })
   expect(result.exitCode).toBe(0);
   expect(result.output).toBe(`
 hook      |Before Hooks
-expect    |expect.toPass @ a.test.ts:7
-expect    |  expect.toBe @ a.test.ts:6
+test.step |Expect "toPass" @ a.test.ts:7
+expect    |  Expect "toBe" @ a.test.ts:6
 expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |  expect.toBe @ a.test.ts:6
+expect    |  Expect "toBe" @ a.test.ts:6
 expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |  expect.toBe @ a.test.ts:6
+expect    |  Expect "toBe" @ a.test.ts:6
 hook      |After Hooks
 `);
 });
@@ -618,9 +667,9 @@ test('should show final toPass error', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(1);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-expect    |expect.toPass @ a.test.ts:6
-expect    |↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |  expect.toBe @ a.test.ts:5
+test.step |Expect "toPass" @ a.test.ts:6
+test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality
+expect    |  Expect "toBe" @ a.test.ts:5
 expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 hook      |After Hooks
 hook      |Worker Cleanup
@@ -657,13 +706,13 @@ test.step |first outer @ a.test.ts:4
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |  first inner @ a.test.ts:5
 test.step |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |    expect.soft.toBe @ a.test.ts:6
+expect    |    Expect "soft toBe" @ a.test.ts:6
 expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |second outer @ a.test.ts:10
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |  second inner @ a.test.ts:11
 test.step |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |    expect.toBe @ a.test.ts:12
+expect    |    Expect "toBe" @ a.test.ts:12
 expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 hook      |After Hooks
 hook      |Worker Cleanup
@@ -702,13 +751,13 @@ test('should not propagate nested hard errors', async ({ runInlineTest }) => {
 hook      |Before Hooks
 test.step |first outer @ a.test.ts:4
 test.step |  first inner @ a.test.ts:5
-expect    |    expect.toBe @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:7
 expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |second outer @ a.test.ts:13
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |  second inner @ a.test.ts:14
 test.step |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |    expect.toBe @ a.test.ts:15
+expect    |    Expect "toBe" @ a.test.ts:15
 expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 hook      |After Hooks
 hook      |Worker Cleanup
@@ -737,7 +786,7 @@ test.step |boxed step @ a.test.ts:3
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality @ a.test.ts:4
 test.step |    at a.test.ts:4:27
 test.step |    at a.test.ts:3:26
-expect    |  expect.toBe @ a.test.ts:4
+expect    |  Expect "toBe" @ a.test.ts:4
 expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality @ a.test.ts:4
 expect    |      at a.test.ts:4:27
 expect    |      at a.test.ts:3:26
@@ -772,7 +821,7 @@ hook      |Before Hooks
 test.step |boxed step @ a.test.ts:8
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality @ a.test.ts:8
 test.step |    at a.test.ts:8:21
-expect    |  expect.toBe @ a.test.ts:5
+expect    |  Expect "toBe" @ a.test.ts:5
 expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality @ a.test.ts:8
 expect    |      at a.test.ts:8:21
 hook      |After Hooks
@@ -805,7 +854,7 @@ hook      |Before Hooks
 test.step |boxed step @ a.test.ts:8
 test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality @ a.test.ts:8
 test.step |    at a.test.ts:8:21
-expect    |  expect.soft.toBe @ a.test.ts:5
+expect    |  Expect "soft toBe" @ a.test.ts:5
 expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality @ a.test.ts:8
 expect    |      at a.test.ts:8:21
 hook      |After Hooks
@@ -836,21 +885,22 @@ test('should not generate dupes for named expects', async ({ runInlineTest }) =>
   expect(result.exitCode).toBe(0);
   expect(result.output).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-pw:api    |page.setContent @ a.test.ts:4
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Set content @ a.test.ts:4
 expect    |Checking color @ a.test.ts:6
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
-test('step inside expect.toPass', async ({ runInlineTest }) => {
+test('step inside toPass', async ({ runInlineTest }) => {
   test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30322' });
   const result = await runInlineTest({
     'reporter.ts': stepIndentReporter,
@@ -884,21 +934,21 @@ test('step inside expect.toPass', async ({ runInlineTest }) => {
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
 test.step |step 1 @ a.test.ts:4
-expect    |  expect.toPass @ a.test.ts:11
+test.step |  Expect "toPass" @ a.test.ts:11
 test.step |    step 2, attempt: 0 @ a.test.ts:7
 test.step |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |      expect.toBe @ a.test.ts:9
+expect    |      Expect "toBe" @ a.test.ts:9
 expect    |      ↪ error: Error: expect(received).toBe(expected) // Object.is equality
 test.step |    step 2, attempt: 1 @ a.test.ts:7
-expect    |      expect.toBe @ a.test.ts:9
+expect    |      Expect "toBe" @ a.test.ts:9
 test.step |  step 3 @ a.test.ts:12
 test.step |    step 4 @ a.test.ts:13
-expect    |      expect.toBe @ a.test.ts:14
+expect    |      Expect "toBe" @ a.test.ts:14
 hook      |After Hooks
 `);
 });
 
-test('library API call inside expect.toPass', async ({ runInlineTest }) => {
+test('library API call inside toPass', async ({ runInlineTest }) => {
   test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/30322' });
   const result = await runInlineTest({
     'reporter.ts': stepIndentReporter,
@@ -925,24 +975,25 @@ test('library API call inside expect.toPass', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-expect    |expect.toPass @ a.test.ts:11
-pw:api    |  page.goto(about:blank) @ a.test.ts:6
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+test.step |Expect "toPass" @ a.test.ts:11
+pw:api    |  Navigate to "about:blank" @ a.test.ts:6
 test.step |  inner step attempt: 0 @ a.test.ts:7
 test.step |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-expect    |    expect.toBe @ a.test.ts:9
+expect    |    Expect "toBe" @ a.test.ts:9
 expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
-pw:api    |  page.goto(about:blank) @ a.test.ts:6
+pw:api    |  Navigate to "about:blank" @ a.test.ts:6
 test.step |  inner step attempt: 1 @ a.test.ts:7
-expect    |    expect.toBe @ a.test.ts:9
+expect    |    Expect "toBe" @ a.test.ts:9
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
@@ -976,22 +1027,26 @@ test('library API call inside expect.poll', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-expect    |expect.poll.toHaveLength @ a.test.ts:14
-pw:api    |  page.goto(about:blank) @ a.test.ts:7
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+test.step |Expect "poll toHaveLength" @ a.test.ts:14
+pw:api    |  Navigate to "about:blank" @ a.test.ts:7
 test.step |  inner step attempt: 0 @ a.test.ts:8
-expect    |    expect.toBe @ a.test.ts:10
-pw:api    |  page.goto(about:blank) @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:10
+expect    |  Expect "toHaveLength" @ a.test.ts:6
+expect    |  ↪ error: Error: expect(received).toHaveLength(expected)
+pw:api    |  Navigate to "about:blank" @ a.test.ts:7
 test.step |  inner step attempt: 1 @ a.test.ts:8
-expect    |    expect.toBe @ a.test.ts:10
+expect    |    Expect "toBe" @ a.test.ts:10
+expect    |  Expect "toHaveLength" @ a.test.ts:6
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
@@ -1024,23 +1079,27 @@ test('web assertion inside expect.poll', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(0);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-pw:api    |page.setContent @ a.test.ts:4
-expect    |expect.poll.toBe @ a.test.ts:13
-expect    |  expect.toHaveText @ a.test.ts:7
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Set content @ a.test.ts:4
+test.step |Expect "poll toBe" @ a.test.ts:13
+expect    |  Expect "toHaveText" @ a.test.ts:7
 test.step |  iteration 1 @ a.test.ts:9
-expect    |    expect.toBeVisible @ a.test.ts:10
-expect    |  expect.toHaveText @ a.test.ts:7
+expect    |    Expect "toBeVisible" @ a.test.ts:10
+expect    |  Expect "toBe" @ a.test.ts:6
+expect    |  ↪ error: Error: expect(received).toBe(expected) // Object.is equality
+expect    |  Expect "toHaveText" @ a.test.ts:7
 test.step |  iteration 2 @ a.test.ts:9
-expect    |    expect.toBeVisible @ a.test.ts:10
+expect    |    Expect "toBeVisible" @ a.test.ts:10
+expect    |  Expect "toBe" @ a.test.ts:6
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
@@ -1070,30 +1129,34 @@ test('should report expect steps', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(1);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-expect    |expect.toBeTruthy @ a.test.ts:4
-expect    |expect.toBeTruthy @ a.test.ts:5
+expect    |Expect "toBeTruthy" @ a.test.ts:4
+expect    |Expect "toBeTruthy" @ a.test.ts:5
 expect    |↪ error: Error: expect(received).toBeTruthy()
 hook      |After Hooks
 hook      |Worker Cleanup
           |Error: expect(received).toBeTruthy()
 hook      |Before Hooks
-expect    |expect.not.toBeTruthy @ a.test.ts:8
+expect    |Expect "not toBeTruthy" @ a.test.ts:8
 hook      |After Hooks
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-expect    |expect.not.toHaveTitle @ a.test.ts:11
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+expect    |Expect "not toHaveTitle" @ a.test.ts:11
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
-test('should report api steps', async ({ runInlineTest }) => {
+test('should report api steps', async ({ runInlineTest, server }) => {
+  server.setRoute('/empty.html', (req, res) => {
+    req.socket.end();
+  });
   const result = await runInlineTest({
     'reporter.ts': stepIndentReporter,
     'playwright.config.ts': `module.exports = { reporter: [['./reporter', { skipErrorMessage: true }]] };`,
@@ -1106,15 +1169,15 @@ test('should report api steps', async ({ runInlineTest }) => {
         ]);
         await page.click('button');
         await page.getByRole('button').click();
-        await page.request.get('http://localhost2').catch(() => {});
-        await request.get('http://localhost2').catch(() => {});
+        await page.request.get('${server.EMPTY_PAGE}').catch(() => {});
+        await request.get('${server.EMPTY_PAGE}').catch(() => {});
       });
 
       test.describe('suite', () => {
         let myPage;
         test.beforeAll(async ({ browser }) => {
           myPage = await browser.newPage();
-          await myPage.setContent('<button></button>');
+          await myPage.setContent('<button></button><input/>');
         });
 
         test('pass1', async () => {
@@ -1123,6 +1186,11 @@ test('should report api steps', async ({ runInlineTest }) => {
         test('pass2', async () => {
           await myPage.click('button');
         });
+        test('pass3', async () => {
+          await myPage.getByRole('textbox').fill('foo');
+          await myPage.getByRole('textbox').fill('');
+          await myPage.getByRole('textbox').clear();
+        });
 
         test.afterAll(async () => {
           await myPage.close();
@@ -1135,37 +1203,42 @@ test('should report api steps', async ({ runInlineTest }) => {
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
 hook      |  beforeAll hook @ a.test.ts:16
-pw:api    |    browser.newPage @ a.test.ts:17
-pw:api    |    page.setContent @ a.test.ts:18
-pw:api    |page.click(button) @ a.test.ts:22
+pw:api    |    Create page @ a.test.ts:17
+pw:api    |    Set content @ a.test.ts:18
+pw:api    |Click locator('button') @ a.test.ts:22
 hook      |After Hooks
 hook      |Before Hooks
-pw:api    |page.click(button) @ a.test.ts:25
+pw:api    |Click locator('button') @ a.test.ts:25
 hook      |After Hooks
-hook      |  afterAll hook @ a.test.ts:28
-pw:api    |    page.close @ a.test.ts:29
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-fixture   |  fixture: request
-pw:api    |    apiRequest.newContext
-pw:api    |page.waitForNavigation @ a.test.ts:5
-pw:api    |  page.goto(data:text/html,<button></button>) @ a.test.ts:6
-pw:api    |page.click(button) @ a.test.ts:8
-pw:api    |locator.getByRole('button').click @ a.test.ts:9
-pw:api    |apiRequestContext.get(http://localhost2) @ a.test.ts:10
+pw:api    |Fill "foo" getByRole('textbox') @ a.test.ts:28
+pw:api    |Fill "" getByRole('textbox') @ a.test.ts:29
+pw:api    |Clear getByRole('textbox') @ a.test.ts:30
+hook      |After Hooks
+hook      |  afterAll hook @ a.test.ts:33
+pw:api    |    Close context @ a.test.ts:34
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+fixture   |  Fixture "request"
+pw:api    |    Create request context
+pw:api    |Wait for navigation @ a.test.ts:5
+pw:api    |Navigate to "data:" @ a.test.ts:6
+pw:api    |Click locator('button') @ a.test.ts:8
+pw:api    |Click getByRole('button') @ a.test.ts:9
+pw:api    |GET "/empty.html" @ a.test.ts:10
 pw:api    |↪ error: <error message>
-pw:api    |apiRequestContext.get(http://localhost2) @ a.test.ts:11
+pw:api    |GET "/empty.html" @ a.test.ts:11
 pw:api    |↪ error: <error message>
 hook      |After Hooks
-fixture   |  fixture: request
-pw:api    |    apiRequestContext.dispose
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "request"
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
 
@@ -1189,20 +1262,21 @@ test('should report api step failure', async ({ runInlineTest }) => {
   expect(result.exitCode).toBe(1);
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-pw:api    |page.setContent @ a.test.ts:4
-pw:api    |page.click(input) @ a.test.ts:5
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Set content @ a.test.ts:4
+pw:api    |Click locator('input') @ a.test.ts:5
 pw:api    |↪ error: TimeoutError: page.click: Timeout 1ms exceeded.
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 hook      |Worker Cleanup
-fixture   |  fixture: browser
+fixture   |  Fixture "browser"
           |TimeoutError: page.click: Timeout 1ms exceeded.
 `);
 });
@@ -1226,16 +1300,528 @@ test('should show nice stacks for locators', async ({ runInlineTest }) => {
   expect(result.output).not.toContain('Internal error');
   expect(stripAnsi(result.output)).toBe(`
 hook      |Before Hooks
-fixture   |  fixture: browser
-pw:api    |    browserType.launch
-fixture   |  fixture: context
-pw:api    |    browser.newContext
-fixture   |  fixture: page
-pw:api    |    browserContext.newPage
-pw:api    |page.setContent @ a.test.ts:4
-pw:api    |locator.evaluate(button) @ a.test.ts:6
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Set content @ a.test.ts:4
+pw:api    |Evaluate locator('button') @ a.test.ts:6
+hook      |After Hooks
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
+`);
+});
+
+test('should allow passing location to test.step', async ({ runInlineTest, runTSC }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'helper.ts': `
+      import { Location, TestType } from '@playwright/test';
+
+      export async function dummyStep(test: TestType<{}, {}>, title: string, action: () => void, location: Location) {
+        await test.step(title, action, { location });
+      }
+
+      export function getCustomLocation() {
+        return { file: 'dummy-file.ts', line: 123, column: 45 };
+      }
+    `,
+    'playwright.config.ts': `
+      module.exports = {
+        reporter: './reporter',
+      };
+    `,
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      import { dummyStep, getCustomLocation } from './helper';
+
+      test('custom location test', async () => {
+        const location = getCustomLocation();
+        await dummyStep(test, 'Perform a dummy step', async () => {}, location);
+      });
+    `
+  }, { reporter: '', workers: 1 });
+
+  expect(result.exitCode).toBe(0);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+test.step |Perform a dummy step @ dummy-file.ts:123
+hook      |After Hooks
+`);
+
+  const { exitCode } = await runTSC({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('should work', async () => {
+        const location = { file: 'dummy-file.ts', line: 123, column: 45 };
+        await test.step('step1', () => {}, { location });
+      });
+    `
+  });
+  expect(exitCode).toBe(0);
+});
+
+test('should show tracing.group nested inside test.step', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: [['./reporter', { printErrorLocation: true }]] };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({ page }) => {
+        await test.step('my step 1', async () => {
+          await test.step('my step 2', async () => {
+            await page.context().tracing.group('my group 1');
+            await page.context().tracing.group('my group 2');
+            await page.setContent('<button></button>');
+            await page.context().tracing.groupEnd();
+            await page.context().tracing.groupEnd();
+          });
+        });
+      });
+    `
+  }, { reporter: '', workers: 1 });
+
+  expect(result.exitCode).toBe(0);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+test.step |my step 1 @ a.test.ts:4
+test.step |  my step 2 @ a.test.ts:5
+pw:api    |    Trace "my group 1" @ a.test.ts:6
+pw:api    |      Trace "my group 2" @ a.test.ts:7
+pw:api    |        Set content @ a.test.ts:8
+hook      |After Hooks
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
+`);
+});
+
+test('calls from waitForEvent callback should be under its parent step', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33186' }
+}, async ({ runInlineTest, server }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('waitForResponse step nesting', async ({ page }) => {
+        await page.goto('${server.EMPTY_PAGE}');
+        await page.setContent('<div onclick="fetch(\\'/simple.json\\').then(r => r.text());">Go!</div>');
+        const responseJson = await test.step('custom step', async () => {
+          const responsePromise = page.waitForResponse(async response => {
+            await page.content();
+            await page.content();  // second time a charm!
+            await expect(page.locator('div')).toContainText('Go');
+            return true;
+          });
+
+          await page.click('div');
+          const response = await responsePromise;
+          return await response.text();
+        });
+        expect(responseJson).toBe('{"foo": "bar"}\\n');
+      });
+      `
+  }, { reporter: '', workers: 1, timeout: 3000 });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(0);
+  expect(result.output).not.toContain('Internal error');
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Navigate to "/empty.html" @ a.test.ts:4
+pw:api    |Set content @ a.test.ts:5
+test.step |custom step @ a.test.ts:6
+pw:api    |  Wait for event "response" @ a.test.ts:7
+pw:api    |  Click locator('div') @ a.test.ts:14
+pw:api    |  Get content @ a.test.ts:8
+pw:api    |  Get content @ a.test.ts:9
+expect    |  Expect "toContainText" @ a.test.ts:10
+expect    |Expect "toBe" @ a.test.ts:18
+hook      |After Hooks
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
+`);
+});
+
+test('reading network request / response should not be listed as step', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33558' }
+}, async ({ runInlineTest, server }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('waitForResponse step nesting', async ({ page }) => {
+        const [request, response] = await Promise.all([
+          page.waitForRequest('${server.EMPTY_PAGE}'),
+          page.waitForResponse('${server.EMPTY_PAGE}'),
+          page.goto('${server.EMPTY_PAGE}'),
+        ]);
+        await request.allHeaders();
+        await response.text();
+      });
+      `
+  }, { reporter: '', workers: 1, timeout: 3000 });
+
+  expect(result.exitCode).toBe(0);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Wait for event "request" @ a.test.ts:5
+pw:api    |Wait for event "response" @ a.test.ts:6
+pw:api    |Navigate to "/empty.html" @ a.test.ts:7
+hook      |After Hooks
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
+`);
+});
+
+test('calls from page.route callback should be under its parent step', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33186' }
+}, async ({ runInlineTest, server }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('waitForResponse step nesting', async ({ page }) => {
+        await test.step('custom step', async () => {
+          await page.route('**/empty.html', async route => {
+            const response = await route.fetch();
+            const text = await response.text();
+            expect(text).toBe('');
+            await response.text();  // second time a charm!
+            await route.fulfill({ response });
+          });
+          await page.goto('${server.EMPTY_PAGE}');
+        });
+      });
+      `
+  }, { reporter: '', workers: 1, timeout: 3000 });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(0);
+  expect(result.output).not.toContain('Internal error');
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+test.step |custom step @ a.test.ts:4
+pw:api    |  Navigate to "/empty.html" @ a.test.ts:12
+pw:api    |  GET "/empty.html" @ a.test.ts:6
+expect    |  Expect "toBe" @ a.test.ts:8
+hook      |After Hooks
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
+`);
+});
+
+test('test.step.skip should work', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ }) => {
+        await test.step.skip('outer step 1', async () => {
+          await test.step('inner step 1.1', async () => {
+            throw new Error('inner step 1.1 failed');
+          });
+          await test.step.skip('inner step 1.2', async () => {});
+          await test.step('inner step 1.3', async () => {});
+        });
+        await test.step('outer step 2', async () => {
+          await test.step.skip('inner step 2.1', async () => {});
+          await test.step('inner step 2.2', async () => {
+            expect(1).toBe(1);
+          });
+        });
+      });
+      `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.report.stats.expected).toBe(1);
+  expect(result.report.stats.unexpected).toBe(0);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+test.step |outer step 1 @ a.test.ts:4 (skipped)
+test.step |outer step 2 @ a.test.ts:11
+test.step |  inner step 2.1 @ a.test.ts:12 (skipped)
+test.step |  inner step 2.2 @ a.test.ts:13
+expect    |    Expect "toBe" @ a.test.ts:14
+hook      |After Hooks
+`);
+});
+
+test('skip test.step.skip body', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ }) => {
+        let didRun = false;
+        await test.step('outer step 2', async () => {
+          await test.step.skip('inner step 2', async () => {
+            didRun = true;
+          });
+        });
+        expect(didRun).toBe(false);
+      });
+      `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.report.stats.expected).toBe(1);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+test.step |outer step 2 @ a.test.ts:5
+test.step |  inner step 2 @ a.test.ts:6 (skipped)
+expect    |Expect "toBe" @ a.test.ts:10
+hook      |After Hooks
+`);
+});
+
+test('step.skip should work at runtime', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ }) => {
+        await test.step('outer step 1', async () => {
+          await test.step('inner step 1.1', async (step) => {
+            step.skip();
+          });
+          await test.step('inner step 1.2', async (step) => {
+            step.skip(true, 'condition is true');
+          });
+          await test.step('inner step 1.3', async () => {});
+        });
+        await test.step('outer step 2', async () => {
+          await test.step.skip('inner step 2.1', async () => {});
+          await test.step('inner step 2.2', async () => {
+            expect(1).toBe(1);
+          });
+        });
+      });
+      `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.report.stats.expected).toBe(1);
+  expect(result.report.stats.unexpected).toBe(0);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+test.step |outer step 1 @ a.test.ts:4
+test.step |  inner step 1.1 @ a.test.ts:5 (skipped)
+test.step |  inner step 1.2 @ a.test.ts:8 (skipped: condition is true)
+test.step |  inner step 1.3 @ a.test.ts:11
+test.step |outer step 2 @ a.test.ts:13
+test.step |  inner step 2.1 @ a.test.ts:14 (skipped)
+test.step |  inner step 2.2 @ a.test.ts:15
+expect    |    Expect "toBe" @ a.test.ts:16
+hook      |After Hooks
+`);
+});
+
+test('step.titlePath works in custom matcher', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/36739' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.test.ts': `
+      import { test, expect as baseExpect } from '@playwright/test';
+      const expect = baseExpect.extend({
+        async toHaveTitlePath(receiver, expected: string[]) {
+          return await test.step('get titlepath', async step => {
+            const actual = step.titlePath;
+            try {
+              expect(actual).toEqual(expected);
+              return { name: 'toHaveTitlePath', pass: true, message: '' };
+            } catch {
+              return { name: 'toHaveTitlePath', pass: false, message: () => \`Expected \${JSON.stringify(expected)}, got \${JSON.stringify(actual)}\` };
+            }
+          });
+        },
+      });
+      test('test', async ({ }) => {
+        await expect().toHaveTitlePath(['a.test.ts', 'test', 'Expect "toHaveTitlePath"', 'get titlepath']);
+        await test.step('outer step', async () => {
+          await expect().toHaveTitlePath(['a.test.ts', 'test', 'outer step', 'Expect "toHaveTitlePath"', 'get titlepath']);
+          await test.step('inner step', async () => {
+            await expect().toHaveTitlePath(['a.test.ts', 'test', 'outer step', 'inner step', 'Expect "toHaveTitlePath"', 'get titlepath']);
+          });
+        });
+      });
+      `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+});
+
+test('should differentiate test.skip and step.skip', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ }) => {
+        await test.step('outer step', async () => {
+          await test.info().skip();
+        });
+      });
+      `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.report.stats.expected).toBe(0);
+  expect(result.report.stats.unexpected).toBe(0);
+  expect(result.report.stats.skipped).toBe(1);
+});
+
+test('show api calls inside expects', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test, expect as baseExpect } from '@playwright/test';
+
+      const expect = baseExpect.extend({
+        async toBeInvisible(locator: Locator) {
+          try {
+            await expect.poll(() => locator.filter({ visible: true }).count()).toBe(0);
+            return { name: 'toBeInvisible', pass: true, message: '' };
+          } catch (e) {
+            return { name: 'toBeInvisible', pass: false, message: () => 'Expected to be invisible, got visible!' };
+          }
+        },
+      });
+
+      test('test', async ({ page }) => {
+        await page.setContent('<div>hello</div>');
+        const promise = expect(page.locator('div')).toBeInvisible();
+        await page.waitForTimeout(1100);
+        await page.setContent('<div style="display:none">hello</div>');
+        await promise;
+      });
+      `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+  expect(result.report.stats.expected).toBe(1);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+pw:api    |Set content @ a.test.ts:16
+expect    |Expect "toBeInvisible" @ a.test.ts:17
+test.step |  Expect "poll toBe" @ a.test.ts:7
+pw:api    |    Query count locator('div').filter({ visible: true }) @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:7
+expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
+pw:api    |    Query count locator('div').filter({ visible: true }) @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:7
+expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
+pw:api    |    Query count locator('div').filter({ visible: true }) @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:7
+expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
+pw:api    |    Query count locator('div').filter({ visible: true }) @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:7
+expect    |    ↪ error: Error: expect(received).toBe(expected) // Object.is equality
+pw:api    |    Query count locator('div').filter({ visible: true }) @ a.test.ts:7
+expect    |    Expect "toBe" @ a.test.ts:7
+pw:api    |Wait for timeout @ a.test.ts:18
+pw:api    |Set content @ a.test.ts:19
+hook      |After Hooks
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
+`);
+});
+
+test('should box fixtures with everything inside them', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': stepIndentReporter,
+    'playwright.config.ts': `module.exports = { reporter: './reporter' };`,
+    'a.test.ts': `
+      import { test as baseTest, expect, type Page } from '@playwright/test';
+
+      const test = baseTest.extend<{ foo: number, bar: number }>({
+        foo: [async ({ page }, use) => {
+          await page.setContent('<div>here we go</div>');
+          await test.step('inner step', async () => {
+            await page.goto('data:text/html,<div>here we go</div>');
+          });
+          await use(1);
+        }, { box: true }],
+        bar: [async ({ page }, use) => {
+          await page.setContent('<div>here we go</div>');
+          await test.step('inner step', async () => {
+            await page.goto('data:text/html,<div>here we go</div>');
+          });
+          await use(2);
+        }, { box: false }],
+      });
+
+      test('test', async ({ foo, bar, page }) => {
+        await expect(page.locator('body')).toBeVisible();
+        expect(foo).toBe(1);
+        expect(bar).toBe(2);
+      });
+    `
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(0);
+  expect(stripAnsi(result.output)).toBe(`
+hook      |Before Hooks
+fixture   |  Fixture "browser"
+pw:api    |    Launch browser
+fixture   |  Fixture "context"
+pw:api    |    Create context
+fixture   |  Fixture "page"
+pw:api    |    Create page
+fixture   |  Fixture "bar" @ a.test.ts:4
+pw:api    |    Set content @ a.test.ts:13
+test.step |    inner step @ a.test.ts:14
+pw:api    |      Navigate to "data:" @ a.test.ts:15
+expect    |Expect "toBeVisible" @ a.test.ts:22
+expect    |Expect "toBe" @ a.test.ts:23
+expect    |Expect "toBe" @ a.test.ts:24
 hook      |After Hooks
-fixture   |  fixture: page
-fixture   |  fixture: context
+fixture   |  Fixture "bar" @ a.test.ts:4
+fixture   |  Fixture "page"
+fixture   |  Fixture "context"
+pw:api    |    Close context
 `);
 });
diff --git a/tests/playwright-test/test-tag.spec.ts b/tests/playwright-test/test-tag.spec.ts
index 9487e31ea3a42..049ad49f3c00e 100644
--- a/tests/playwright-test/test-tag.spec.ts
+++ b/tests/playwright-test/test-tag.spec.ts
@@ -47,6 +47,8 @@ test('should have correct tags', async ({ runInlineTest }) => {
       });
       test('foo-bar-tags', { tag: ['@foo', '@bar'] }, () => {
       });
+      test('foo-bar-tags with @inline', { tag: ['@foo', '@bar', '@this is a long tag', '@another', '@long one    again'] }, () => {
+      });
       test.skip('skip-foo-tag', { tag: '@foo' }, () => {
       });
       test.fixme('fixme-bar-tag', { tag: '@bar' }, () => {
@@ -77,6 +79,7 @@ test('should have correct tags', async ({ runInlineTest }) => {
     `title=no-tags, tags=`,
     `title=foo-tag @inline, tags=@inline,@foo`,
     `title=foo-bar-tags, tags=@foo,@bar`,
+    `title=foo-bar-tags with @inline, tags=@inline,@foo,@bar,@this is a long tag,@another,@long one    again`,
     `title=skip-foo-tag, tags=@foo`,
     `title=fixme-bar-tag, tags=@bar`,
     `title=fail-foo-bar-tags, tags=@foo,@bar`,
diff --git a/tests/playwright-test/test-use.spec.ts b/tests/playwright-test/test-use.spec.ts
index 8a2bcd240191d..1687cbe2e77c7 100644
--- a/tests/playwright-test/test-use.spec.ts
+++ b/tests/playwright-test/test-use.spec.ts
@@ -186,4 +186,3 @@ test('test.use() should throw if called from beforeAll ', async ({ runInlineTest
   expect(result.exitCode).toBe(1);
   expect(result.output).toContain('Playwright Test did not expect test.use() to be called here');
 });
-
diff --git a/tests/playwright-test/timeout.spec.ts b/tests/playwright-test/timeout.spec.ts
index a079c3f70bbd3..9d6001078d0c2 100644
--- a/tests/playwright-test/timeout.spec.ts
+++ b/tests/playwright-test/timeout.spec.ts
@@ -159,7 +159,27 @@ test('should ignore test.setTimeout when debugging', async ({ runInlineTest }) =
         await new Promise(f => setTimeout(f, 2000));
       });
     `
-  }, { timeout: 0 });
+  }, { debug: true });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('should ignore globalTimeout when debugging', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34911' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        globalTimeout: 100,
+      };
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('my test', async ({ }) => {
+        await new Promise(f => setTimeout(f, 2000));
+      });
+    `
+  }, { debug: true });
   expect(result.exitCode).toBe(0);
   expect(result.passed).toBe(1);
 });
@@ -558,3 +578,93 @@ test('should allow custom worker fixture timeout longer than force exit cap', as
   expect(result.output).toContain(`Error: Oh my!`);
   expect(result.output).toContain(`1 error was not a part of any test, see above for details`);
 });
+
+test('should run fixture teardown with custom timeout after test timeout', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/31537' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test as base, expect } from '@playwright/test';
+      const test = base.extend({
+        foo: [async ({}, use) => {
+          console.log('\\n%%foo setup');
+          await use('foo');
+          console.log('\\n%%foo teardown');
+        }, { timeout: 2000 }],
+      });
+      test('times out', async ({ foo }) => {
+        console.log('\\n%%test start');
+        await new Promise(() => {});
+        console.log('\\n%%test end');
+      });
+    `
+  }, { timeout: 2000 });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.outputLines).toEqual([
+    'foo setup',
+    'test start',
+    'foo teardown',
+  ]);
+});
+
+test('should run fixture teardown with custom timeout after afterEach timeout', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test as base, expect } from '@playwright/test';
+      let counter = 0;
+      const test = base.extend({
+        foo: [async ({}, use) => {
+          console.log('\\n%%foo setup');
+          await use('foo' + (++counter));
+          console.log('\\n%%foo teardown');
+        }, { timeout: 2000 }],
+      });
+      test.afterEach(async () => {
+        console.log('\\n%%afterEach start');
+        await new Promise(() => {});
+        console.log('\\n%%afterEach end');
+      });
+      test.afterAll(async ({ foo }) => {
+        // Note: afterAll should receive a new instance of the "foo" fixture.
+        console.log('\\n%%afterAll - ' + foo);
+      });
+      test('times out', async ({ foo }) => {
+        console.log('\\n%%test - ' + foo);
+      });
+    `
+  }, { timeout: 2000 });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.outputLines).toEqual([
+    'foo setup',
+    'test - foo1',
+    'afterEach start',
+    'foo teardown',
+    'foo setup',
+    'afterAll - foo2',
+    'foo teardown',
+  ]);
+});
+
+test('test.setTimeout should be able to change custom fixture timeout', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test as base, expect } from '@playwright/test';
+      const test = base.extend({
+        foo: [async ({}, use) => {
+          console.log('\\n%%foo setup');
+          test.setTimeout(100);
+          await new Promise(f => setTimeout(f, 3000));
+          await use('foo');
+          console.log('\\n%%foo teardown');
+        }, { timeout: 0 }],
+      });
+      test('times out', async ({ foo }) => {
+      });
+    `
+  });
+  expect(result.exitCode).toBe(1);
+  expect(result.failed).toBe(1);
+  expect(result.output).toContain(`Fixture "foo" timeout of 100ms exceeded during setup`);
+});
diff --git a/tests/playwright-test/to-have-screenshot.spec.ts b/tests/playwright-test/to-have-screenshot.spec.ts
index a4eb131f07bdc..0fea415bf1058 100644
--- a/tests/playwright-test/to-have-screenshot.spec.ts
+++ b/tests/playwright-test/to-have-screenshot.spec.ts
@@ -50,7 +50,7 @@ test('should fail to screenshot a page with infinite animation', async ({ runInl
   });
   expect(result.exitCode).toBe(1);
   expect(result.output).toContain(`Timeout 2000ms exceeded`);
-  expect(result.output).toContain(`expect.toHaveScreenshot with timeout 2000ms`);
+  expect(result.output).toContain(`Expect "toHaveScreenshot" with timeout 2000ms`);
   expect(result.output).toContain(`generating new stable screenshot expectation`);
   expect(fs.existsSync(testInfo.outputPath('test-results', 'a-is-a-test', 'is-a-test-1-actual.png'))).toBe(true);
   expect(fs.existsSync(testInfo.outputPath('test-results', 'a-is-a-test', 'is-a-test-1-expected.png'))).toBe(false);
@@ -157,6 +157,8 @@ test.describe('expect config animations option', () => {
       `
     }, { 'update-snapshots': true });
     expect(result.exitCode).toBe(1);
+    expect(result.output).toContain('is-a-test-1-actual.png');
+    expect(result.output).toContain('is-a-test-1-previous.png');
     expect(result.output).toContain('is-a-test-1-diff.png');
   });
 });
@@ -238,7 +240,7 @@ test('should report toHaveScreenshot step with expectation name in title', async
     'reporter.ts': `
       class Reporter {
         onStepEnd(test, result, step) {
-          console.log('%% end ' + step.title);
+          console.log('%% end [' + step.category + '] ' + step.title);
         }
       }
       module.exports = Reporter;
@@ -256,22 +258,19 @@ test('should report toHaveScreenshot step with expectation name in title', async
 
   expect(result.exitCode).toBe(0);
   expect(result.outputLines).toEqual([
-    `end browserType.launch`,
-    `end fixture: browser`,
-    `end browser.newContext`,
-    `end fixture: context`,
-    `end browserContext.newPage`,
-    `end fixture: page`,
-    `end Before Hooks`,
-    `end attach "foo-expected.png"`,
-    `end attach "foo-actual.png"`,
-    `end expect.toHaveScreenshot(foo.png)`,
-    `end attach "is-a-test-1-expected.png"`,
-    `end attach "is-a-test-1-actual.png"`,
-    `end expect.toHaveScreenshot(is-a-test-1.png)`,
-    `end fixture: page`,
-    `end fixture: context`,
-    `end After Hooks`,
+    `end [pw:api] Launch browser`,
+    `end [fixture] Fixture "browser"`,
+    `end [pw:api] Create context`,
+    `end [fixture] Fixture "context"`,
+    `end [pw:api] Create page`,
+    `end [fixture] Fixture "page"`,
+    `end [hook] Before Hooks`,
+    `end [expect] Expect "toHaveScreenshot(foo.png)"`,
+    `end [expect] Expect "toHaveScreenshot(is-a-test-1.png)"`,
+    `end [fixture] Fixture "page"`,
+    `end [pw:api] Close context`,
+    `end [fixture] Fixture "context"`,
+    `end [hook] After Hooks`,
   ]);
 });
 
@@ -393,7 +392,7 @@ test('should fail to screenshot an element with infinite animation', async ({ ru
   });
   expect(result.exitCode).toBe(1);
   expect(result.output).toContain(`Timeout 2000ms exceeded`);
-  expect(result.output).toContain(`expect.toHaveScreenshot with timeout 2000ms`);
+  expect(result.output).toContain(`Expect "toHaveScreenshot" with timeout 2000ms`);
   expect(fs.existsSync(testInfo.outputPath('test-results', 'a-is-a-test', 'is-a-test-1-previous.png'))).toBe(true);
   expect(fs.existsSync(testInfo.outputPath('test-results', 'a-is-a-test', 'is-a-test-1-actual.png'))).toBe(true);
   expect(fs.existsSync(testInfo.outputPath('test-results', 'a-is-a-test', 'is-a-test-1-expected.png'))).toBe(false);
@@ -551,7 +550,7 @@ test('should fail when screenshot is different pixels', async ({ runInlineTest }
     `
   });
   expect(result.exitCode).toBe(1);
-  expect(result.output).toContain('Screenshot comparison failed');
+  expect(result.output).toContain('Error: expect(page).toHaveScreenshot(expected)');
   expect(result.output).toContain('12345 pixels');
   expect(result.output).toContain('Call log');
   expect(result.output).toContain('ratio 0.02');
@@ -681,6 +680,32 @@ test('should write missing expectations locally twice and attach them', async ({
   ]);
 });
 
+test('should attach missing expectations to right step', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'reporter.ts': `
+      class Reporter {
+        onStepEnd(test, result, step) {
+          if (step.attachments.length > 0)
+            console.log(\`%%[\${step.category}] \${step.title}: \${step.attachments.map(a => a.name).join(", ")}\`);
+        }
+      }
+      module.exports = Reporter;
+    `,
+    ...playwrightConfig({
+      reporter: [['dot'], ['./reporter']],
+    }),
+    'a.spec.js': `
+      const { test, expect } = require('@playwright/test');
+      test('is a test', async ({ page }) => {
+        await expect(page).toHaveScreenshot('snapshot.png');
+      });
+    `,
+  }, { reporter: '' });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.outputLines).toEqual(['[expect] Expect "toHaveScreenshot(snapshot.png)": snapshot-expected.png, snapshot-actual.png']);
+});
+
 test('shouldn\'t write missing expectations locally for negated matcher', async ({ runInlineTest }, testInfo) => {
   const result = await runInlineTest({
     ...playwrightConfig({
@@ -720,6 +745,77 @@ test('should update snapshot with the update-snapshots flag', async ({ runInline
   expect(comparePNGs(fs.readFileSync(snapshotOutputPath), whiteImage)).toBe(null);
 });
 
+test('should respect config.snapshotPathTemplate and sanitize the name', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35669' },
+}, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    ...playwrightConfig({
+      snapshotPathTemplate: '__screenshots__/{testFilePath}/{arg}{ext}',
+    }),
+    '__screenshots__/a.spec.js/my-name.png': whiteImage,
+    '__screenshots__/a.spec.js/my_name/bar.png': whiteImage,
+    '__screenshots__/a.spec.js/is-a-test-1.png': whiteImage,
+    '__screenshots__/a.spec.js/is-a-test-2.png': whiteImage,
+    'a.spec.js': `
+      const path = require('path');
+      const { test, expect } = require('@playwright/test');
+      test('is a test', async ({ page }) => {
+        const testDir = test.info().project.testDir;
+
+        // A single name is sanitized to a valid file name.
+        const expectedPath1 = path.join(testDir, '__screenshots__/a.spec.js/my-name.png');
+        expect(test.info().snapshotPath('my_name.png')).toBe(expectedPath1);
+        await expect(page).toHaveScreenshot('my_name.png');
+
+        // An array is not sanitized - see https://github.com/microsoft/playwright/pull/9156.
+        const expectedPath2 = path.join(testDir, '__screenshots__/a.spec.js/my_name/bar.png');
+        expect(test.info().snapshotPath('my_name', 'bar.png')).toBe(expectedPath2);
+        await expect(page).toHaveScreenshot(['my_name', 'bar.png']);
+
+        // Auto-generated name is sanitized.
+        const expectedPath3 = path.join(testDir, '__screenshots__/a.spec.js/is-a-test-1.png');
+        expect(test.info().snapshotPath('', { kind: 'screenshot' })).toBe(expectedPath3);
+        await expect(page).toHaveScreenshot();
+
+        // Auto-generated name is incremented.
+        const expectedPath4 = path.join(testDir, '__screenshots__/a.spec.js/is-a-test-2.png');
+        expect(test.info().snapshotPath('', { kind: 'screenshot' })).toBe(expectedPath4);
+        await expect(page).toHaveScreenshot();
+      });
+    `
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
+test('should respect config.EXPECT toHaveScreenshot.pathTemplate', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    ...playwrightConfig({
+      snapshotPathTemplate: '__screenshots__/{testFilePath}/{arg}{ext}',
+      expect: { toHaveScreenshot: { pathTemplate: 'actual-screenshots/{testFilePath}/{arg}{ext}' } },
+    }),
+    '__screenshots__/a.spec.js/snapshot.png': blueImage,
+    'actual-screenshots/a.spec.js/snapshot.png': whiteImage,
+    'a.spec.js': `
+      const path = require('path');
+      const { test, expect } = require('@playwright/test');
+      test('is a test', async ({ page }) => {
+        const testDir = test.info().project.testDir;
+
+        const screenshotPath = path.join(testDir, 'actual-screenshots/a.spec.js/snapshot.png');
+        expect(test.info().snapshotPath('snapshot.png', { kind: 'screenshot' })).toBe(screenshotPath);
+
+        const snapshotPath = path.join(testDir, '__screenshots__/a.spec.js/snapshot.png');
+        expect(test.info().snapshotPath('snapshot.png', { kind: 'snapshot' })).toBe(snapshotPath);
+
+        await expect(page).toHaveScreenshot('snapshot.png');
+      });
+    `
+  });
+  expect(result.exitCode).toBe(0);
+  expect(result.passed).toBe(1);
+});
+
 test('shouldn\'t update snapshot with the update-snapshots flag for negated matcher', async ({ runInlineTest }, testInfo) => {
   const EXPECTED_SNAPSHOT = blueImage;
   const result = await runInlineTest({
@@ -1393,3 +1489,80 @@ test('should trim+sanitize attachment names and paths', async ({ runInlineTest }
   ]);
 });
 
+test.describe('update-snapshots', () => {
+  test('should rebase non-matching image', async ({ runInlineTest }) => {
+    const BAD_PIXELS = 10;
+    const EXPECTED_SNAPSHOT = paintBlackPixels(whiteImage, BAD_PIXELS);
+
+    const result = await runInlineTest({
+      ...playwrightConfig({
+        snapshotPathTemplate: '__screenshots__/{testFilePath}/{arg}{ext}',
+      }),
+      '__screenshots__/a.spec.js/snapshot.png': EXPECTED_SNAPSHOT,
+      'a.spec.js': `
+        const { test, expect } = require('@playwright/test');
+        test('is a test', async ({ page }) => {
+          await expect(page).toHaveScreenshot('snapshot.png', { timeout: 2000 });
+        });
+      `
+    }, { 'update-snapshots': 'changed' });
+    expect(result.exitCode).toBe(0);
+    const newBaseline = fs.readFileSync(test.info().outputPath('__screenshots__/a.spec.js/snapshot.png'));
+    expect(comparePNGs(newBaseline, whiteImage)).toBe(null);
+    expect(comparePNGs(newBaseline, EXPECTED_SNAPSHOT)).not.toBe(null);
+  });
+
+  test('should not rebase matching image', async ({ runInlineTest }) => {
+    const BAD_PIXELS = 10;
+    const EXPECTED_SNAPSHOT = paintBlackPixels(whiteImage, BAD_PIXELS);
+
+    const result = await runInlineTest({
+      ...playwrightConfig({
+        snapshotPathTemplate: '__screenshots__/{testFilePath}/{arg}{ext}',
+        expect: {
+          toHaveScreenshot: {
+            maxDiffPixels: BAD_PIXELS
+          }
+        }
+      }),
+      '__screenshots__/a.spec.js/snapshot.png': EXPECTED_SNAPSHOT,
+      'a.spec.js': `
+        const { test, expect } = require('@playwright/test');
+        test('is a test', async ({ page }) => {
+          await expect(page).toHaveScreenshot('snapshot.png', { timeout: 2000 });
+        });
+      `
+    }, { 'update-snapshots': 'changed' });
+    expect(result.exitCode).toBe(0);
+    const newBaseline = fs.readFileSync(test.info().outputPath('__screenshots__/a.spec.js/snapshot.png'));
+    expect(comparePNGs(newBaseline, EXPECTED_SNAPSHOT)).toBe(null);
+    expect(comparePNGs(newBaseline, whiteImage)).not.toBe(null);
+  });
+
+  test('should rebase matching image with update-snapshots=all', async ({ runInlineTest }) => {
+    const BAD_PIXELS = 10;
+    const EXPECTED_SNAPSHOT = paintBlackPixels(whiteImage, BAD_PIXELS);
+
+    const result = await runInlineTest({
+      ...playwrightConfig({
+        snapshotPathTemplate: '__screenshots__/{testFilePath}/{arg}{ext}',
+        expect: {
+          toHaveScreenshot: {
+            maxDiffPixels: BAD_PIXELS
+          }
+        }
+      }),
+      '__screenshots__/a.spec.js/snapshot.png': EXPECTED_SNAPSHOT,
+      'a.spec.js': `
+        const { test, expect } = require('@playwright/test');
+        test('is a test', async ({ page }) => {
+          await expect(page).toHaveScreenshot('snapshot.png', { timeout: 2000 });
+        });
+      `
+    }, { 'update-snapshots': 'all' });
+    expect(result.exitCode).toBe(0);
+    const newBaseline = fs.readFileSync(test.info().outputPath('__screenshots__/a.spec.js/snapshot.png'));
+    expect(comparePNGs(newBaseline, whiteImage)).toBe(null);
+    expect(comparePNGs(newBaseline, EXPECTED_SNAPSHOT)).not.toBe(null);
+  });
+});
diff --git a/tests/playwright-test/types-2.spec.ts b/tests/playwright-test/types-2.spec.ts
index e61d4870ed5fa..93b941bd5e204 100644
--- a/tests/playwright-test/types-2.spec.ts
+++ b/tests/playwright-test/types-2.spec.ts
@@ -29,10 +29,16 @@ test('basics should work', async ({ runTSC }) => {
           expect(testInfo.title).toBe('my test');
           testInfo.annotations[0].type;
           test.setTimeout(123);
+          testInfo.snapshotPath('a', 'b');
+          testInfo.snapshotPath();
+          testInfo.snapshotPath('foo.png', { kind: 'screenshot' });
+          // @ts-expect-error
+          testInfo.snapshotPath('a', 'b', { kind: 'aria' });
         });
         test.skip('my test', async () => {});
         test.fixme('my test', async () => {});
         test.fail('my test', async () => {});
+        test.fail.only('my test', async () => {});
       });
       test.describe(() => {
         test('my test', () => {});
@@ -59,6 +65,7 @@ test('basics should work', async ({ runTSC }) => {
       test.fixme('title', { tag: '@foo' }, () => {});
       test.only('title', { tag: '@foo' }, () => {});
       test.fail('title', { tag: '@foo' }, () => {});
+      test.fail.only('title', { tag: '@foo' }, () => {});
       test.describe('title', { tag: '@foo' }, () => {});
       test.describe('title', { annotation: { type: 'issue' } }, () => {});
       // @ts-expect-error
@@ -202,3 +209,40 @@ test('step should inherit return type from its callback ', async ({ runTSC }) =>
   });
   expect(result.exitCode).toBe(0);
 });
+
+test('step.skip returns void ', async ({ runTSC }) => {
+  const result = await runTSC({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test step.skip', async ({ }) => {
+        // @ts-expect-error
+        const bad1: string = await test.step.skip('my step', () => { return ''; });
+        const good: void = await test.step.skip('my step', async () => {
+          return 2024;
+        });
+      });
+    `
+  });
+  expect(result.exitCode).toBe(0);
+});
+
+test('calling custom matcher on expect.poll should return Promise', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35635' } }, async ({ runTSC }) => {
+  const result = await runTSC({
+    'a.spec.ts': `
+      import { test, expect as baseExpect } from '@playwright/test';
+      const expect = baseExpect.extend({
+        toBeFoo(actual) {
+          return {
+            pass: actual === 'foo',
+            message: () => 'not foo!',
+          };
+        }
+      });
+      test('test', async () => {
+        const pollingPromise: Promise<any> = expect.poll(() => 'foo').toBeFoo();
+        await pollingPromise;
+      });
+    `
+  });
+  expect(result.exitCode).toBe(0);
+});
diff --git a/tests/playwright-test/types.spec.ts b/tests/playwright-test/types.spec.ts
index da8d88a38bf6f..e9fea813f066c 100644
--- a/tests/playwright-test/types.spec.ts
+++ b/tests/playwright-test/types.spec.ts
@@ -19,7 +19,7 @@ import { test, expect } from './playwright-test-fixtures';
 test('should check types of fixtures', async ({ runTSC }) => {
   const result = await runTSC({
     'helper.ts': `
-      import { test as base, expect } from '@playwright/test';
+      import { test as base, expect, Page } from '@playwright/test';
       export type MyOptions = { foo: string, bar: number };
       export const test = base.extend<{ foo: string }, { bar: number }>({
         foo: 'foo',
@@ -71,7 +71,7 @@ test('should check types of fixtures', async ({ runTSC }) => {
         // @ts-expect-error
         baz: true,
       });
-      const fail9 = test.extend<{ foo: string }>({
+      const fail9 = test.extend({
         foo: [ async ({}, use) => {
           await use('foo');
           // @ts-expect-error
@@ -100,7 +100,86 @@ test('should check types of fixtures', async ({ runTSC }) => {
             return y;
           });
         },
-      })
+      });
+
+      const chain1 = base.extend({
+        page: async ({ page }, use) => {
+          await use(page);
+        },
+      });
+      const chain2 = chain1.extend<{ pageAsUser: Page }>({
+        pageAsUser: async ({ page }, use) => {
+          // @ts-expect-error
+          const x: number = page;
+          // @ts-expect-error
+          await use(x);
+        },
+      });
+
+      base.extend({
+        page: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        },
+      });
+
+      base.extend<{ myFixture: (arg: number) => void }>({
+        page: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        },
+      });
+
+      base.extend({
+        // @ts-expect-error
+        myFixture: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        }
+      });
+
+      base.extend<{ myFixture: (arg: number) => void }>({
+        myFixture: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        }
+      });
+
+      base.extend({
+        page: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        },
+        // @ts-expect-error
+        myFixture: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        }
+      });
+
+      base.extend<{ myFixture: (arg: number) => void }>({
+        page: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        },
+        myFixture: async ({ page }) => {
+          type IsPage = (typeof page) extends Page ? true : never;
+          const isPage: IsPage = true;
+        }
+      });
+
+      base.extend<{ myFixture: (arg: number) => void }>({
+        // @ts-expect-error
+        myFixture: (arg: number) => {},
+      });
+
+      base.extend<{ myFixture: (arg: number) => void }>({
+        myFixture: async (_, use) => {
+          use((arg: number) => {});
+          // @ts-expect-error
+          use((arg: string) => {});
+        }
+      });
     `,
     'playwright.config.ts': `
       import { MyOptions } from './helper';
diff --git a/tests/playwright-test/ui-mode-fixtures.ts b/tests/playwright-test/ui-mode-fixtures.ts
index 2952761d607d7..7fd173e3f5bde 100644
--- a/tests/playwright-test/ui-mode-fixtures.ts
+++ b/tests/playwright-test/ui-mode-fixtures.ts
@@ -20,8 +20,9 @@ import * as path from 'path';
 import type { TestChildProcess } from '../config/commonFixtures';
 import { cleanEnv, cliEntrypoint, test as base, writeFiles, removeFolders } from './playwright-test-fixtures';
 import type { Files, RunOptions } from './playwright-test-fixtures';
-import type { Browser, BrowserType, Page, TestInfo } from './stable-test-runner';
-import { createGuid } from '../../packages/playwright-core/src/utils/crypto';
+import type { Browser, Page, TestInfo } from './stable-test-runner';
+import { chromium } from './stable-test-runner';
+import { createGuid } from '../../packages/playwright-core/src/server/utils/crypto';
 
 type Latch = {
   blockingCode: string;
@@ -66,16 +67,17 @@ export function dumpTestTree(page: Page, options: { time?: boolean } = {}): () =
     }
 
     const result: string[] = [];
-    const listItems = treeElement.querySelectorAll('[role=listitem]');
-    for (const listItem of listItems) {
-      const iconElements = listItem.querySelectorAll('.codicon');
+    const treeItems = treeElement.querySelectorAll('[role=treeitem]');
+    for (const treeItem of treeItems) {
+      const treeItemHeader = treeItem.querySelector('.tree-view-entry');
+      const iconElements = treeItemHeader.querySelectorAll('.codicon');
       const treeIcon = iconName(iconElements[0]);
       const statusIcon = iconName(iconElements[1]);
-      const indent = listItem.querySelectorAll('.list-view-indent').length;
-      const watch = listItem.querySelector('.toolbar-button.eye.toggled') ? ' 👁' : '';
-      const selected = listItem.classList.contains('selected') ? ' <=' : '';
-      const title = listItem.querySelector('.ui-mode-list-item-title').childNodes[0].textContent;
-      const timeElement = options.time ? listItem.querySelector('.ui-mode-list-item-time') : undefined;
+      const indent = treeItemHeader.querySelectorAll('.tree-view-indent').length;
+      const watch = treeItemHeader.querySelector('.toolbar-button.eye.toggled') ? ' 👁' : '';
+      const selected = treeItem.getAttribute('aria-selected') === 'true' ? ' <=' : '';
+      const title = treeItemHeader.querySelector('.ui-mode-tree-item-title').childNodes[0].textContent;
+      const timeElement = options.time ? treeItemHeader.querySelector('.ui-mode-tree-item-time') : undefined;
       const time = timeElement ? ' ' + timeElement.textContent.replace(/[.\d]+m?s/, 'XXms') : '';
       result.push('    ' + '  '.repeat(indent) + treeIcon + ' ' + statusIcon + ' ' + title + time + watch + selected);
     }
@@ -105,14 +107,11 @@ export const test = base
             cwd: options.cwd ? path.resolve(baseDir, options.cwd) : baseDir,
           });
           let page: Page;
-          // We want to have ToT playwright-core here, since we install it's browsers and otherwise
-          // don't have the right browser revision (ToT revisions != stable-test-runner revisions).
-          const chromium: BrowserType = require('../../packages/playwright-core').chromium;
           if (options.useWeb) {
             await testProcess.waitForOutput('Listening on');
             const line = testProcess.output.split('\n').find(l => l.includes('Listening on'));
             const uiAddress = line!.split(' ')[2];
-            browser = await chromium.launch();
+            browser = await chromium.launch({ channel: 'chrome' });
             page = await browser.newPage();
             await page.goto(uiAddress);
           } else {
diff --git a/tests/playwright-test/ui-mode-metadata.spec.ts b/tests/playwright-test/ui-mode-metadata.spec.ts
new file mode 100644
index 0000000000000..bfbbba08a54f2
--- /dev/null
+++ b/tests/playwright-test/ui-mode-metadata.spec.ts
@@ -0,0 +1,48 @@
+/**
+ * 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 './ui-mode-fixtures';
+
+test('should render html report git info metadata', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'reporter.ts': `
+      module.exports = class Reporter {
+        onBegin(config, suite) {
+          console.log('ci.link:', config.metadata['ci'].commitHref);
+        }
+      }
+    `,
+    'playwright.config.ts': `
+      import { defineConfig } from '@playwright/test';
+      export default defineConfig({
+        reporter: './reporter.ts',
+      });
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      test('should work', async ({}) => {});
+    `
+  }, {
+    JENKINS_URL: '1',
+    BUILD_URL: 'https://playwright.dev',
+  });
+
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+  await page.getByTitle('Toggle output').click();
+
+  await expect(page.getByTestId('output')).toContainText('ci.link: https://playwright.dev');
+});
diff --git a/tests/playwright-test/ui-mode-test-annotations.spec.ts b/tests/playwright-test/ui-mode-test-annotations.spec.ts
new file mode 100644
index 0000000000000..cc1f0b5f04db8
--- /dev/null
+++ b/tests/playwright-test/ui-mode-test-annotations.spec.ts
@@ -0,0 +1,48 @@
+/**
+ * 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 './ui-mode-fixtures';
+
+test('should display annotations', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      test.describe('suite', {
+        annotation: { type: 'suite annotation', description: 'Some content' }
+      }, () => {
+        test('annotation test', {
+          annotation: { type: 'bug report', description: 'Report https://github.com/microsoft/playwright/issues/30095 is here' }
+        }, async () => {
+          test.info().annotations.push({ type: 'test repo', description: 'https://github.com/microsoft/playwright' });
+        });
+      });
+    `,
+  });
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+  await page.getByRole('treeitem', { name: 'suite' }).locator('.codicon-chevron-right').click();
+  await page.getByText('annotation test').click();
+  await page.getByText('Annotations', { exact: true }).click();
+
+  const annotations = page.locator('.annotations-tab');
+  await expect(annotations.getByText('suite annotation')).toBeVisible();
+  await expect(annotations.getByText('bug report')).toBeVisible();
+  await expect(annotations.locator('.annotation-item').filter({ hasText: 'bug report' }).locator('a'))
+      .toHaveAttribute('href', 'https://github.com/microsoft/playwright/issues/30095');
+  await expect(annotations.getByText('test repo')).toBeVisible();
+  await expect(annotations.locator('.annotation-item').filter({ hasText: 'test repo' }).locator('a'))
+      .toHaveAttribute('href', 'https://github.com/microsoft/playwright');
+});
diff --git a/tests/playwright-test/ui-mode-test-attachments.spec.ts b/tests/playwright-test/ui-mode-test-attachments.spec.ts
index f3c8ac627b7c4..4984afd9fc07e 100644
--- a/tests/playwright-test/ui-mode-test-attachments.spec.ts
+++ b/tests/playwright-test/ui-mode-test-attachments.spec.ts
@@ -23,7 +23,10 @@ test('should contain text attachment', async ({ runUITest }) => {
     'a.test.ts': `
       import { test } from '@playwright/test';
       test('attach test', async () => {
+        // Attach two files with the same content and different names,
+        // to make sure each is downloaded with an intended name.
         await test.info().attach('file attachment', { path: __filename });
+        await test.info().attach('file attachment 2', { path: __filename });
         await test.info().attach('text attachment', { body: 'hi tester!', contentType: 'text/plain' });
       });
     `,
@@ -35,14 +38,24 @@ test('should contain text attachment', async ({ runUITest }) => {
 
   await page.locator('.tab-attachments').getByText('text attachment').click();
   await expect(page.locator('.tab-attachments')).toContainText('hi tester!');
-  await page.locator('.tab-attachments').getByText('file attachment').click();
+  await page.locator('.tab-attachments').getByText('file attachment').first().click();
   await expect(page.locator('.tab-attachments')).not.toContainText('attach test');
 
-  const downloadPromise = page.waitForEvent('download');
-  await page.getByRole('link', { name: 'download' }).first().click();
-  const download = await downloadPromise;
-  expect(download.suggestedFilename()).toBe('file attachment');
-  expect((await readAllFromStream(await download.createReadStream())).toString()).toContain('attach test');
+  {
+    const downloadPromise = page.waitForEvent('download');
+    await page.getByRole('link', { name: 'download' }).first().click();
+    const download = await downloadPromise;
+    expect(download.suggestedFilename()).toBe('file attachment');
+    expect((await readAllFromStream(await download.createReadStream())).toString()).toContain('attach test');
+  }
+
+  {
+    const downloadPromise = page.waitForEvent('download');
+    await page.getByRole('link', { name: 'download' }).nth(1).click();
+    const download = await downloadPromise;
+    expect(download.suggestedFilename()).toBe('file attachment 2');
+    expect((await readAllFromStream(await download.createReadStream())).toString()).toContain('attach test');
+  }
 });
 
 test('should contain binary attachment', async ({ runUITest }) => {
@@ -78,7 +91,7 @@ test('should contain string attachment', async ({ runUITest }) => {
   await page.getByTitle('Run all').click();
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
   await page.getByText('Attachments').click();
-  await page.getByText('attach "note"', { exact: true }).click();
+  await page.getByText('note', { exact: true }).click();
   const downloadPromise = page.waitForEvent('download');
   await page.locator('.expandable-title', { hasText: 'note' }).getByRole('link').click();
   const download = await downloadPromise;
@@ -86,6 +99,109 @@ test('should contain string attachment', async ({ runUITest }) => {
   expect((await readAllFromStream(await download.createReadStream())).toString()).toEqual('text42');
 });
 
+test('should linkify string attachments', async ({ runUITest, server }) => {
+  server.setRoute('/one.html', (req, res) => res.end());
+  server.setRoute('/two.html', (req, res) => res.end());
+  server.setRoute('/three.html', (req, res) => res.end());
+
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      test('attach test', async () => {
+        await test.info().attach('Inline url: ${server.PREFIX + '/one.html'}');
+        await test.info().attach('Second', { body: 'Inline link ${server.PREFIX + '/two.html'} to be highlighted.' });
+        await test.info().attach('Third', { body: '[markdown link](${server.PREFIX + '/three.html'})', contentType: 'text/markdown' });
+      });
+    `,
+  });
+  await page.getByText('attach test').click();
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+  await page.getByText('Attachments').click();
+
+  const attachmentsPane = page.locator('.attachments-tab');
+
+  {
+    const url = server.PREFIX + '/one.html';
+    const promise = page.waitForEvent('popup');
+    await attachmentsPane.getByText(url).click();
+    const popup = await promise;
+    await expect(popup).toHaveURL(url);
+  }
+
+  {
+    await attachmentsPane.getByLabel('Second').click();
+    const url = server.PREFIX + '/two.html';
+    const promise = page.waitForEvent('popup');
+    await attachmentsPane.getByText(url).click();
+    const popup = await promise;
+    await expect(popup).toHaveURL(url);
+  }
+
+  {
+    await attachmentsPane.getByLabel('Third').click();
+    const url = server.PREFIX + '/three.html';
+    const promise = page.waitForEvent('popup');
+    await attachmentsPane.getByText('[markdown link]').click();
+    const popup = await promise;
+    await expect(popup).toHaveURL(url);
+  }
+});
+
+test('should link from attachment step to attachments view', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      test('attach test', async () => {
+        for (let i = 0; i < 100; i++)
+          await test.info().attach('spacer-' + i);
+        await test.info().attach('my-attachment', { body: 'bar' });
+      });
+    `,
+  });
+
+  await page.getByText('attach test').click();
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+  await page.getByRole('tab', { name: 'Attachments' }).click();
+
+  const panel = page.getByRole('tabpanel', { name: 'Attachments' });
+  const attachment = panel.getByLabel('my-attachment');
+  await page.getByRole('treeitem', { name: 'attach "spacer-1"' }).getByLabel('Open Attachment').click();
+  await expect(attachment).not.toBeInViewport();
+  await page.getByRole('treeitem', { name: 'attach "my-attachment"' }).getByLabel('Open Attachment').click();
+  await expect(attachment).toBeInViewport();
+});
+
+test('attachments from inside boxed fixture should be visible', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/37147' } }, async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test as base } from '@playwright/test';
+
+      const test = base.extend<{ myFixture: void }>({
+        myFixture: [async ({}, use, testInfo) => {
+          await testInfo.attach('my attachment', {
+            body: 'foo',
+            contentType: 'text/plain',
+          });
+          await use();
+        }, { box: true }],
+      });
+
+      test('my test', ({ myFixture }) => {});
+    `,
+  }, { reporter: 'line' }, {});
+  await page.getByText('my test').click();
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+
+  await page.getByRole('treeitem', { name: 'attach "my attachment"' }).getByLabel('Open Attachment').click();
+  await expect(page.getByRole('tabpanel', { name: 'Attachments' })).toMatchAriaSnapshot(`
+    - tabpanel:
+      - button /my attachment/
+  `);
+});
+
 function readAllFromStream(stream: NodeJS.ReadableStream): Promise<Buffer> {
   return new Promise(resolve => {
     const chunks: Buffer[] = [];
diff --git a/tests/playwright-test/ui-mode-test-filters.spec.ts b/tests/playwright-test/ui-mode-test-filters.spec.ts
index 5d70048473e5f..dd59c334b22c6 100644
--- a/tests/playwright-test/ui-mode-test-filters.spec.ts
+++ b/tests/playwright-test/ui-mode-test-filters.spec.ts
@@ -64,7 +64,7 @@ test('should display native tags and filter by them on click', async ({ runUITes
       test('pwt', { tag: '@smoke' }, () => {});
   `,
   });
-  await page.locator('.ui-mode-list-item-title').getByText('smoke').click();
+  await page.locator('.ui-mode-tree-item-title').getByText('smoke').click();
   await expect(page.getByPlaceholder('Filter')).toHaveValue('@smoke');
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
diff --git a/tests/playwright-test/ui-mode-test-network-tab.spec.ts b/tests/playwright-test/ui-mode-test-network-tab.spec.ts
new file mode 100644
index 0000000000000..10810d1616184
--- /dev/null
+++ b/tests/playwright-test/ui-mode-test-network-tab.spec.ts
@@ -0,0 +1,202 @@
+/**
+ * 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 { expect, test } from './ui-mode-fixtures';
+
+test('should filter network requests by resource type', async ({ runUITest, server }) => {
+  server.setRoute('/api/endpoint', (_, res) => res.setHeader('Content-Type', 'application/json').end());
+
+  const { page } = await runUITest({
+    'network-tab.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('network tab test', async ({ page }) => {
+        await page.goto('${server.PREFIX}/network-tab/network.html');
+        await page.evaluate(() => (window as any).donePromise);
+      });
+    `,
+  });
+
+  await page.getByText('network tab test').dblclick();
+  await page.getByText('Network', { exact: true }).click();
+
+  const networkItems = page.getByRole('list', { name: 'Network requests' }).getByRole('listitem');
+
+  await page.getByText('JS', { exact: true }).click();
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('script.js')).toBeVisible();
+
+  await page.getByText('CSS', { exact: true }).click();
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('style.css')).toBeVisible();
+
+  await page.getByText('Image', { exact: true }).click();
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('image.png')).toBeVisible();
+
+  await page.getByText('Fetch', { exact: true }).click();
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('endpoint')).toBeVisible();
+
+  await page.getByText('HTML', { exact: true }).click();
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('network.html')).toBeVisible();
+
+  await page.getByText('Font', { exact: true }).click();
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('font.woff2')).toBeVisible();
+});
+
+test('should filter network requests by url', async ({ runUITest, server }) => {
+  const { page } = await runUITest({
+    'network-tab.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('network tab test', async ({ page }) => {
+        await page.goto('${server.PREFIX}/network-tab/network.html');
+        await page.evaluate(() => (window as any).donePromise);
+      });
+    `,
+  });
+
+  await page.getByText('network tab test').dblclick();
+  await page.getByText('Network', { exact: true }).click();
+
+  const networkItems = page.getByRole('list', { name: 'Network requests' }).getByRole('listitem');
+
+  await page.getByPlaceholder('Filter network').fill('script.');
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('script.js')).toBeVisible();
+
+  await page.getByPlaceholder('Filter network').fill('png');
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('image.png')).toBeVisible();
+
+  await page.getByPlaceholder('Filter network').fill('api/');
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('endpoint')).toBeVisible();
+
+  await page.getByPlaceholder('Filter network').fill('End');
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('endpoint')).toBeVisible();
+
+  await page.getByPlaceholder('Filter network').fill('FON');
+  await expect(networkItems).toHaveCount(1);
+  await expect(networkItems.getByText('font.woff2')).toBeVisible();
+});
+
+test('should format JSON request body', async ({ runUITest, server }) => {
+  const { page } = await runUITest({
+    'network-tab.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('network tab test', async ({ page }) => {
+        await page.goto('${server.PREFIX}/network-tab/network.html');
+        await page.evaluate(() => (window as any).donePromise);
+      });
+    `,
+  });
+
+  await page.getByText('network tab test').dblclick();
+  await page.getByText('Network', { exact: true }).click();
+
+  await page.getByText('post-data-1').click();
+
+  await expect(page.locator('.CodeMirror-code .CodeMirror-line')).toHaveText([
+    '{',
+    '  "data": {',
+    '    "key": "value",',
+    '    "array": [',
+    '      "value-1",',
+    '      "value-2"',
+    '    ]',
+    '  }',
+    '}',
+  ], { useInnerText: true });
+
+  await page.getByText('post-data-2').click();
+
+  await expect(page.locator('.CodeMirror-code .CodeMirror-line')).toHaveText([
+    '{',
+    '  "data": {',
+    '    "key": "value",',
+    '    "array": [',
+    '      "value-1",',
+    '      "value-2"',
+    '    ]',
+    '  }',
+    '}',
+  ], { useInnerText: true });
+});
+
+test('should display list of query parameters (only if present)', async ({ runUITest, server }) => {
+  const { page } = await runUITest({
+    'network-tab.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('network tab test', async ({ page }) => {
+        await page.goto('${server.PREFIX}/network-tab/network.html');
+        await page.evaluate(() => (window as any).donePromise);
+      });
+    `,
+  });
+
+  await page.getByText('network tab test').dblclick();
+  await page.getByText('Network', { exact: true }).click();
+
+  await page.getByText('call-with-query-params').click();
+
+  await expect(page.getByText('Query String Parameters')).toBeVisible();
+  await expect(page.getByText('param1: value1')).toBeVisible();
+  await expect(page.getByText('param1: value2')).toBeVisible();
+  await expect(page.getByText('param2: value2')).toBeVisible();
+
+  await page.getByText('endpoint').click();
+
+  await expect(page.getByText('Query String Parameters')).not.toBeVisible();
+});
+
+test('should not duplicate network entries from beforeAll', {
+  annotation: [
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/34404' },
+    { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33106' },
+  ]
+}, async ({ runUITest, server }) => {
+  const { page } = await runUITest({
+    'playwright.config.ts': `
+      module.exports = { use: { trace: 'on' } };
+    `,
+    'a.spec.ts': `
+      import { test as base, expect, request, type APIRequestContext } from '@playwright/test';
+
+      const test = base.extend<{}, { apiRequest: APIRequestContext }>({
+        apiRequest: [async ({ }, use) => {
+          const apiContext = await request.newContext();
+          await use(apiContext);
+          await apiContext.dispose();
+        }, { scope: 'worker' }]
+      });
+
+      test.beforeAll(async ({ apiRequest }) => {
+        await apiRequest.get("${server.EMPTY_PAGE}");
+      });
+
+      test('first test', async ({ }) => { });
+
+      test.afterAll(async ({ apiRequest }) => { });
+    `,
+  });
+
+  await page.getByText('first test').dblclick();
+  await page.getByText('Network', { exact: true }).click();
+  await expect(page.getByRole('list', { name: 'Network requests' }).getByText('empty.html')).toHaveCount(1);
+});
diff --git a/tests/playwright-test/ui-mode-test-output.spec.ts b/tests/playwright-test/ui-mode-test-output.spec.ts
index b10c02d08a43f..75aa19a66d7f9 100644
--- a/tests/playwright-test/ui-mode-test-output.spec.ts
+++ b/tests/playwright-test/ui-mode-test-output.spec.ts
@@ -114,6 +114,47 @@ test('should show console messages for test', async ({ runUITest }, testInfo) =>
   await expect.soft(page.getByText('GREEN', { exact: true })).toHaveCSS('color', 'rgb(0, 188, 0)');
 });
 
+test('should collapse repeated console messages for test', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('print', async ({ page }) => {
+        await page.evaluate(() => {
+          console.log('page message')
+          for (let i = 0; i < 10; ++i)
+            console.log('page message')
+        });
+        for (let i = 0; i < 10; ++i)
+          console.log('node message')
+        await page.evaluate(async () => {
+          await new Promise(resolve => {
+            for (let i = 0; i < 10; ++i)
+              console.log('page message')
+            window.builtins.setTimeout(() => {
+              for (let i = 0; i < 10; ++i)
+                console.log('page message')
+              resolve()
+            }, 1500)
+          })
+        });
+      });
+    `,
+  });
+  await page.getByTitle('Run all').click();
+  await page.getByRole('tab', { name: 'Console' }).click();
+  await page.getByText('print').click();
+
+  await expect(page.getByRole('tabpanel', { name: 'Console' })).toMatchAriaSnapshot(`
+    - tabpanel "Console":
+      - list:
+        - listitem: /page message/
+        - listitem: /10 page message/
+        - listitem: /10 node message/
+        - listitem: /10 page message/
+        - listitem: /10 page message/
+  `);
+});
+
 test('should format console messages in page', async ({ runUITest }, testInfo) => {
   const { page } = await runUITest({
     'a.spec.ts': `
@@ -145,6 +186,17 @@ test('should format console messages in page', async ({ runUITest }, testInfo) =
     'Failed to load resource: net::ERR_CONNECTION_REFUSED',
   ]);
 
+  await expect(page.locator('.console-tab')).toMatchAriaSnapshot(`
+    - list:
+      - listitem: "/<anonymous>:1 Object {a: 1}/"
+      - listitem: "/<anonymous>:4 Date/"
+      - listitem: "/<anonymous>:5 Regex \/a\//"
+      - listitem: "/<anonymous>:6 Number 0 one 2/"
+      - listitem: "/<anonymous>:7 Download the React DevTools for a better development experience: https:\/\/fb\.me\/react-devtools/"
+      - listitem: "/<anonymous>:8 Array of values/"
+      - listitem: "/Failed to load resource: net::ERR_CONNECTION_REFUSED/"
+  `);
+
   const label = page.getByText('React DevTools');
   await expect(label).toHaveCSS('color', 'rgb(255, 0, 0)');
   await expect(label).toHaveCSS('font-weight', '700');
@@ -153,7 +205,9 @@ test('should format console messages in page', async ({ runUITest }, testInfo) =
 
   const link = page.getByText('https://fb.me/react-devtools');
   await expect(link).toHaveCSS('color', 'rgb(0, 0, 255)');
-  await expect(link).toHaveCSS('text-decoration', 'none solid rgb(0, 0, 255)');
+  await expect(link).toHaveCSS('text-decoration-color', 'rgb(0, 0, 255)');
+  await expect(link).toHaveCSS('text-decoration-style', 'solid');
+  await expect(link).toHaveCSS('text-decoration-line', 'none');
 });
 
 test('should stream console messages live', async ({ runUITest }) => {
@@ -164,7 +218,7 @@ test('should stream console messages live', async ({ runUITest }) => {
         await page.setContent('<button>Click me</button>');
         const button = page.getByRole('button', { name: 'Click me' });
         await button.evaluate(node => node.addEventListener('click', () => {
-          builtinSetTimeout(() => { console.log('I was clicked'); }, 1000);
+          window.builtins.setTimeout(() => { console.log('I was clicked'); }, 1000);
         }));
         console.log('I was logged');
         await button.click();
diff --git a/tests/playwright-test/ui-mode-test-progress.spec.ts b/tests/playwright-test/ui-mode-test-progress.spec.ts
index f87eaa8fbcd68..ada6a788b6fa4 100644
--- a/tests/playwright-test/ui-mode-test-progress.spec.ts
+++ b/tests/playwright-test/ui-mode-test-progress.spec.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { ManualPromise } from '../../packages/playwright-core/lib/utils/manualPromise';
+import { ManualPromise } from '../../packages/playwright-core/lib/utils/isomorphic/manualPromise';
 import { test, expect, retries, dumpTestTree } from './ui-mode-fixtures';
 
 test.describe.configure({ mode: 'parallel', retries });
@@ -47,21 +47,21 @@ test('should update trace live', async ({ runUITest, server }) => {
   await page.getByText('live test').dblclick();
 
   // It should halt on loading one.html.
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotohttp:\/\/localhost:\d+\/one.html/
+    /Navigate to "\/one.html"/,
   ]);
 
   await expect(
-      listItem.locator(':scope.selected'),
+      listItem.locator(':scope[aria-selected="true"]'),
       'last action to be selected'
-  ).toHaveText(/page.goto/);
+  ).toHaveText(/Navigate to/);
   await expect(
-      listItem.locator(':scope.selected .codicon.codicon-loading'),
+      listItem.locator(':scope[aria-selected="true"] .codicon.codicon-loading'),
       'spinner'
   ).toBeVisible();
 
@@ -79,15 +79,15 @@ test('should update trace live', async ({ runUITest, server }) => {
   ).toHaveText('One');
   await expect(listItem).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotohttp:\/\/localhost:\d+\/one.html[\d.]+m?s/,
-    /page.gotohttp:\/\/localhost:\d+\/two.html/
+    /Navigate to "\/one.html"/,
+    /Navigate to "\/two.html"/
   ]);
   await expect(
-      listItem.locator(':scope.selected'),
+      listItem.locator(':scope[aria-selected="true"]'),
       'last action to be selected'
-  ).toHaveText(/page.goto/);
+  ).toHaveText(/Navigate to/);
   await expect(
-      listItem.locator(':scope.selected .codicon.codicon-loading'),
+      listItem.locator(':scope[aria-selected="true"] .codicon.codicon-loading'),
       'spinner'
   ).toBeVisible();
 
@@ -106,8 +106,8 @@ test('should update trace live', async ({ runUITest, server }) => {
 
   await expect(listItem).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotohttp:\/\/localhost:\d+\/one.html[\d.]+m?s/,
-    /page.gotohttp:\/\/localhost:\d+\/two.html[\d.]+m?s/,
+    /Navigate to "\/one.html"/,
+    /Navigate to "\/two.html"/,
     /After Hooks[\d.]+m?s/,
   ]);
 });
@@ -132,18 +132,18 @@ test('should preserve action list selection upon live trace update', async ({ ru
   await page.getByText('live test').dblclick();
 
   // It should wait on the latch.
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotoabout:blank[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
+    /Navigate to "about:blank"/,
+    /Set content/,
   ]);
 
   // Manually select page.goto.
-  await page.getByTestId('actions-tree').getByText('page.goto').click();
+  await page.getByTestId('actions-tree').getByText('Navigate to').click();
 
   // Generate more actions and check that we are still on the page.goto action.
   latch.open();
@@ -152,14 +152,14 @@ test('should preserve action list selection upon live trace update', async ({ ru
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotoabout:blank[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
+    /Navigate to "about:blank"/,
+    /Set content/,
+    /Set content/,
   ]);
   await expect(
-      listItem.locator(':scope.selected'),
+      listItem.locator(':scope[aria-selected="true"]'),
       'selected action stays the same'
-  ).toHaveText(/page.goto/);
+  ).toHaveText(/Navigate to/);
 });
 
 test('should update tracing network live', async ({ runUITest, server }) => {
@@ -193,19 +193,19 @@ test('should update tracing network live', async ({ runUITest, server }) => {
   await page.getByText('live test').dblclick();
 
   // It should wait on the latch.
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotohttp:\/\/localhost:\d+\/one.html[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
+    /Navigate to "\/one.html"/,
+    /Set content/,
   ]);
 
   // Once page.setContent is visible, we can be sure that page.goto has all required
   // resources in the trace. Switch to it and check that everything renders.
-  await page.getByTestId('actions-tree').getByText('page.goto').click();
+  await page.getByTestId('actions-tree').getByText('NAVIGATE').click();
 
   await expect(
       page.frameLocator('iframe.snapshot-visible[name=snapshot]').locator('body'),
@@ -233,13 +233,13 @@ test('should show trace w/ multiple contexts', async ({ runUITest, server, creat
   await page.getByText('live test').dblclick();
 
   // It should wait on the latch.
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.gotoabout:blank[\d.]+m?s/,
+    /Navigate to "about:blank"/,
   ]);
 
   latch.open();
@@ -278,14 +278,14 @@ test('should show live trace for serial', async ({ runUITest, server, createLatc
   await page.getByText('two', { exact: true }).click();
   await page.getByTitle('Run all').click();
 
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /locator.unchecklocator\('input'\)[\d.]+m?s/,
-    /expect.not.toBeCheckedlocator\('input'\)[\d.]/,
+    /Uncheck.*locator/,
+    /Expect "not toBeChecked"/,
   ]);
 });
 
@@ -318,15 +318,15 @@ test('should show live trace from hooks', async ({ runUITest, createLatch }) =>
   `);
   await page.getByText('test one').dblclick();
 
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks/,
     /beforeAll hook/,
-    /fixture: browser/,
-    /browser.newPage/,
+    /Fixture "browser"/,
+    /Create page/,
   ]);
   latch1.open();
   await expect(
@@ -336,7 +336,7 @@ test('should show live trace from hooks', async ({ runUITest, createLatch }) =>
     /Before Hooks/,
     /beforeAll hook/,
     /beforeEach hook/,
-    /browser.newPage/,
+    /Create page/,
   ]);
   latch2.open();
   await expect(
@@ -344,7 +344,7 @@ test('should show live trace from hooks', async ({ runUITest, createLatch }) =>
       'action list'
   ).toHaveText([
     /Before Hooks/,
-    /page.setContent/,
+    /Set content/,
     /After Hooks/,
   ]);
 });
diff --git a/tests/playwright-test/ui-mode-test-run.spec.ts b/tests/playwright-test/ui-mode-test-run.spec.ts
index 2d41aa18d435e..3b2351083a8a4 100644
--- a/tests/playwright-test/ui-mode-test-run.spec.ts
+++ b/tests/playwright-test/ui-mode-test-run.spec.ts
@@ -61,6 +61,26 @@ test('should run visible', async ({ runUITest }) => {
         ⊘ skipped
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}
+          - treeitem ${/\[icon-error\] fails/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+          - treeitem "[icon-error] suite" [expanded=false]
+      - treeitem "[icon-error] b.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}
+          - treeitem ${/\[icon-error\] fails/}
+      - treeitem "[icon-check] c.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}
+          - treeitem "[icon-circle-slash] skipped"
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('4/8 passed (50%)');
 });
 
@@ -93,13 +113,24 @@ test('should run on hover', async ({ runUITest }) => {
   });
 
   await page.getByText('passes').hover();
-  await page.getByRole('listitem').filter({ hasText: 'passes' }).getByTitle('Run').click();
+  await page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Run' }).click();
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
         ✅ passes <=
         ◯ fails
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+          - treeitem "[icon-circle-outline] fails"
+  `);
 });
 
 test('should run on double click', async ({ runUITest }) => {
@@ -118,6 +149,17 @@ test('should run on double click', async ({ runUITest }) => {
         ✅ passes <=
         ◯ fails
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+          - treeitem "[icon-circle-outline] fails"
+  `);
 });
 
 test('should run on Enter', async ({ runUITest }) => {
@@ -137,6 +179,17 @@ test('should run on Enter', async ({ runUITest }) => {
         ◯ passes
         ❌ fails <=
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem ${/\[icon-error\] fails/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+  `);
 });
 
 test('should run by project', async ({ runUITest }) => {
@@ -168,13 +221,35 @@ test('should run by project', async ({ runUITest }) => {
         ⊘ skipped
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}
+          - treeitem ${/\[icon-error\] fails/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+          - treeitem "[icon-error] suite" [expanded=false]
+      - treeitem "[icon-error] b.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}
+          - treeitem ${/\[icon-error\] fails/}
+      - treeitem "[icon-check] c.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/}
+          - treeitem "[icon-circle-slash] skipped"
+  `);
+
   await page.getByText('Status:').click();
   await page.getByLabel('bar').setChecked(true);
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ❌ a.test.ts
       ► ◯ passes
-      ► ❌ fails <=
+      ▼ ❌ fails
+          ❌ foo <=
+          ◯ bar
       ► ❌ suite
     ▼ ❌ b.test.ts
       ► ◯ passes
@@ -184,6 +259,26 @@ test('should run by project', async ({ runUITest }) => {
       ► ◯ skipped
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-circle-outline\] passes/} [expanded=false]
+          - treeitem ${/\[icon-error\] fails/}:
+            - group:
+              - treeitem ${/\[icon-error\] foo/} [selected]
+              - treeitem "[icon-circle-outline] bar"
+          - treeitem "[icon-error] suite" [expanded=false]
+      - treeitem "[icon-error] b.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-circle-outline\] passes/} [expanded=false]
+          - treeitem ${/\[icon-error\] fails/} [expanded=false]
+      - treeitem "[icon-circle-outline] c.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-circle-outline\] passes/} [expanded=false]
+          - treeitem ${/\[icon-circle-outline\] skipped/} [expanded=false]
+  `);
+
   await page.getByText('Status:').click();
 
   await page.getByTestId('test-tree').getByText('passes').first().click();
@@ -197,6 +292,20 @@ test('should run by project', async ({ runUITest }) => {
       ► ❌ fails
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-circle-outline\] passes/} [expanded] [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+            - group:
+              - treeitem ${/\[icon-check\] foo/}
+              - treeitem ${/\[icon-circle-outline\] bar/}
+          - treeitem ${/\[icon-error\] fails/}
+  `);
+
   await expect(page.getByText('Projects: foo bar')).toBeVisible();
 
   await page.getByTitle('Run all').click();
@@ -216,6 +325,32 @@ test('should run by project', async ({ runUITest }) => {
       ► ✅ passes
       ► ⊘ skipped
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/} [expanded]:
+            - group:
+              - treeitem ${/\[icon-check\] foo/}
+              - treeitem ${/\[icon-check\] bar/}
+          - treeitem ${/\[icon-error\] fails/} [expanded]:
+            - group:
+              - treeitem ${/\[icon-error\] foo/} [selected]:
+                - button "Run"
+                - button "Show source"
+                - button "Watch"
+              - treeitem ${/\[icon-error\] bar/}
+          - treeitem ${/\[icon-error\] suite/}
+      - treeitem "[icon-error] b.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/} [expanded=false]
+          - treeitem ${/\[icon-error\] fails/} [expanded=false]
+      - treeitem "[icon-check] c.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes/} [expanded=false]
+          - treeitem ${/\[icon-circle-slash\] skipped/} [expanded=false]
+  `);
 });
 
 test('should stop', async ({ runUITest }) => {
@@ -242,6 +377,16 @@ test('should stop', async ({ runUITest }) => {
         🕦 test 3
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-loading] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-slash] test 0"
+          - treeitem ${/\[icon-check\] test 1/}
+          - treeitem ${/\[icon-loading\] test 2/}
+          - treeitem ${/\[icon-clock\] test 3/}
+  `);
+
   await expect(page.getByTitle('Run all')).toBeDisabled();
   await expect(page.getByTitle('Stop')).toBeEnabled();
 
@@ -254,6 +399,16 @@ test('should stop', async ({ runUITest }) => {
         ◯ test 2
         ◯ test 3
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-slash] test 0"
+          - treeitem ${/\[icon-check\] test 1/}
+          - treeitem ${/\[icon-circle-outline\] test 2/}
+          - treeitem ${/\[icon-circle-outline\] test 3/}
+  `);
 });
 
 test('should run folder', async ({ runUITest }) => {
@@ -273,7 +428,7 @@ test('should run folder', async ({ runUITest }) => {
   });
 
   await page.getByText('folder-b').hover();
-  await page.getByRole('listitem').filter({ hasText: 'folder-b' }).getByTitle('Run').click();
+  await page.getByRole('treeitem', { name: 'folder-b' }).getByRole('button', { name: 'Run' }).click();
 
   await expect.poll(dumpTestTree(page)).toContain(`
     ▼ ✅ folder-b <=
@@ -282,6 +437,17 @@ test('should run folder', async ({ runUITest }) => {
     ▼ ◯ in-a.test.ts
         ◯ passes
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] folder-b" [expanded] [selected]:
+        - group:
+          - treeitem "[icon-check] folder-c" [expanded=false]
+          - treeitem "[icon-check] in-b.test.ts" [expanded=false]
+      - treeitem "[icon-circle-outline] in-a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+  `);
 });
 
 test('should show time', async ({ runUITest }) => {
@@ -305,6 +471,26 @@ test('should show time', async ({ runUITest }) => {
         ⊘ skipped
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-error] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes \d+m?s/}
+          - treeitem ${/\[icon-error\] fails \d+m?s/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+          - treeitem "[icon-error] suite" [expanded=false]
+      - treeitem "[icon-error] b.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes \d+m?s/}
+          - treeitem ${/\[icon-error\] fails \d+m?s/}
+      - treeitem "[icon-check] c.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] passes \d+m?s/}
+          - treeitem "[icon-circle-slash] skipped"
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('4/8 passed (50%)');
 });
 
@@ -329,6 +515,13 @@ test('should show test.fail as passing', async ({ runUITest }) => {
         ✅ should fail XXms
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] should fail \d+m?s/}
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
 });
 
@@ -358,6 +551,13 @@ test('should ignore repeatEach', async ({ runUITest }) => {
         ✅ should pass
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] should pass/}
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
 });
 
@@ -385,6 +585,14 @@ test('should remove output folder before test run', async ({ runUITest }) => {
     ▼ ✅ a.test.ts
         ✅ should pass
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] should pass/}
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
 
   await page.getByTitle('Run all').click();
@@ -392,6 +600,14 @@ test('should remove output folder before test run', async ({ runUITest }) => {
     ▼ ✅ a.test.ts
         ✅ should pass
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] should pass/}
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
 });
 
@@ -419,8 +635,8 @@ test('should show proper total when using deps', async ({ runUITest }) => {
 
 
   await page.getByText('Status:').click();
-  await page.getByLabel('setup').setChecked(true);
-  await page.getByLabel('chromium').setChecked(true);
+  await page.getByRole('checkbox', { name: 'setup' }).setChecked(true);
+  await page.getByRole('checkbox', { name: 'chromium' }).setChecked(true);
 
   await expect.poll(dumpTestTree(page)).toContain(`
     ▼ ◯ a.test.ts
@@ -432,6 +648,18 @@ test('should show proper total when using deps', async ({ runUITest }) => {
         ✅ run @setup <=
         ◯ run @chromium
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] run @setup setup/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+          - treeitem "[icon-circle-outline] run @chromium chromium"
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
 
   await page.getByTitle('run @chromium').dblclick();
@@ -440,5 +668,133 @@ test('should show proper total when using deps', async ({ runUITest }) => {
         ✅ run @setup
         ✅ run @chromium <=
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] run @setup setup/}
+          - treeitem ${/\[icon-check\] run @chromium chromium/} [selected]:
+            - button "Run"
+            - button "Show source"
+            - button "Watch"
+  `);
+
   await expect(page.getByTestId('status-line')).toHaveText('2/2 passed (100%)');
 });
+
+test('should respect --tsconfig option', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32797' }
+}, async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'playwright.config.ts': `
+      import { foo } from '~/foo';
+      export default {
+        testDir: './tests' + foo,
+      };
+    `,
+    'tsconfig.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["./does-not-exist/*"],
+        },
+      },
+    }`,
+    'tsconfig.special.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["./mapped-from-root/*"],
+        },
+      },
+    }`,
+    'mapped-from-root/foo.ts': `
+      export const foo = 42;
+    `,
+    'tests42/tsconfig.json': `{
+      "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+          "~/*": ["../should-be-ignored/*"],
+        },
+      },
+    }`,
+    'tests42/a.test.ts': `
+      import { foo } from '~/foo';
+      import { test, expect } from '@playwright/test';
+      test('test', ({}) => {
+        expect(foo).toBe(42);
+      });
+    `,
+    'should-be-ignored/foo.ts': `
+      export const foo = 43;
+    `,
+  }, undefined, { additionalArgs: ['--tsconfig=tsconfig.special.json'] });
+
+  await page.getByTitle('Run all').click();
+
+  await expect.poll(dumpTestTree(page)).toBe(`
+    ▼ ✅ a.test.ts
+        ✅ test
+  `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] test/}
+  `);
+
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+});
+
+test('should respect --ignore-snapshots option', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32868' }
+}, async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('snapshot', () => {
+        expect('foo').toMatchSnapshot(); // fails because no snapshot is present
+      });
+    `,
+  }, undefined, { additionalArgs: ['--ignore-snapshots'] });
+
+  await page.getByTitle('Run all').click();
+
+  await expect.poll(dumpTestTree(page)).toBe(`
+    ▼ ✅ a.test.ts
+        ✅ snapshot
+  `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] a.test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] snapshot/}
+  `);
+});
+
+test('should not leak websocket connections', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33641' }
+}, async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async () => {});
+    `,
+  });
+
+  const [ws1] = await Promise.all([
+    page.waitForEvent('websocket'),
+    page.getByTitle('Reload').click(),
+  ]);
+
+  await Promise.all([
+    page.waitForEvent('websocket'),
+    page.getByTitle('Reload').click(),
+  ]);
+
+  await expect.poll(() => ws1.isClosed()).toBe(true);
+});
diff --git a/tests/playwright-test/ui-mode-test-screencast.spec.ts b/tests/playwright-test/ui-mode-test-screencast.spec.ts
index 7c973f588b6e0..4affc726bc313 100644
--- a/tests/playwright-test/ui-mode-test-screencast.spec.ts
+++ b/tests/playwright-test/ui-mode-test-screencast.spec.ts
@@ -21,13 +21,15 @@ test.describe.configure({ mode: 'parallel', retries });
 test('should show screenshots', async ({ runUITest }) => {
   const { page } = await runUITest({
     'a.test.ts': `
-      import { test } from '@playwright/test';
+      import { test, expect } from '@playwright/test';
       test('test 1', async ({ page }) => {
         await page.setContent('<div style="background: red; width: 100%; height: 100%"></div>');
+        await expect(page.locator('body')).toBeVisible();
         await page.waitForTimeout(1000);
       });
       test('test 2', async ({ page }) => {
-        await page.setContent('<div style="background: blue; width: 100%; height: 100%"></div>');
+        await page.setContent('<div style="background: blue; width: 100%; height: 100%">hello</div>');
+        await expect(page.locator('body')).toHaveText('hello');
         await page.waitForTimeout(1000);
       });
     `,
@@ -36,14 +38,10 @@ test('should show screenshots', async ({ runUITest }) => {
   await expect(page.getByTestId('status-line')).toHaveText('2/2 passed (100%)');
 
   await page.getByText('test 1', { exact: true }).click();
-  await expect(
-      page.locator('.CodeMirror .source-line-running'),
-  ).toContainText(`test('test 1', async ({ page }) => {`);
+  await expect(page.getByTestId('actions-tree')).toContainText('Expect');
   await expect(page.locator('.film-strip-frame').first()).toBeVisible();
 
   await page.getByText('test 2', { exact: true }).click();
-  await expect(
-      page.locator('.CodeMirror .source-line-running'),
-  ).toContainText(`await page.waitForTimeout(1000);`);
+  await expect(page.getByTestId('actions-tree')).toContainText('Expect');
   await expect(page.locator('.film-strip-frame').first()).toBeVisible();
 });
diff --git a/tests/playwright-test/ui-mode-test-setup.spec.ts b/tests/playwright-test/ui-mode-test-setup.spec.ts
index 08857d55086e6..c912038571bdd 100644
--- a/tests/playwright-test/ui-mode-test-setup.spec.ts
+++ b/tests/playwright-test/ui-mode-test-setup.spec.ts
@@ -15,10 +15,11 @@
  */
 
 import { test, expect, retries, dumpTestTree } from './ui-mode-fixtures';
+import path from 'path';
 
 test.describe.configure({ mode: 'parallel', retries });
 
-test('should run global setup and teardown', async ({ runUITest }) => {
+test('should run global setup and teardown', async ({ runUITest }, testInfo) => {
   const { page, testProcess } = await runUITest({
     'playwright.config.ts': `
       import { defineConfig } from '@playwright/test';
@@ -28,26 +29,36 @@ test('should run global setup and teardown', async ({ runUITest }) => {
       });
     `,
     'globalSetup.ts': `
-      export default () => console.log('\\n%%from-global-setup');
+      import { basename } from "node:path";
+      export default (config) => {
+        console.log('\\n%%from-global-setup');
+        console.log("setupOutputDir: " + basename(config.projects[0].outputDir));
+      };
     `,
     'globalTeardown.ts': `
-      export default () => console.log('\\n%%from-global-teardown');
+      export default (config) => {
+        console.log('\\n%%from-global-teardown');
+        console.log('%%' + JSON.stringify(config));
+      };
     `,
     'a.test.js': `
       import { test, expect } from '@playwright/test';
       test('should work', async ({}) => {});
     `
-  });
+  }, undefined, { additionalArgs: ['--output=foo'] });
   await page.getByTitle('Run all').click();
   await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
 
   await page.getByTitle('Toggle output').click();
-  await expect(page.getByTestId('output')).toContainText('from-global-setup');
+  const output = page.getByTestId('output');
+  await expect(output).toContainText('from-global-setup');
+  await expect(output).toContainText('setupOutputDir: foo');
   await page.close();
 
-  await expect.poll(() => testProcess.outputLines()).toEqual([
-    'from-global-teardown',
-  ]);
+  await expect.poll(() => testProcess.outputLines()).toContain('from-global-teardown');
+
+  const teardownConfig = JSON.parse(testProcess.outputLines()[1]);
+  expect(teardownConfig.projects[0].outputDir).toEqual(testInfo.outputPath('foo'));
 });
 
 test('should teardown on sigint', async ({ runUITest, nodeVersion }) => {
@@ -84,17 +95,6 @@ test('should teardown on sigint', async ({ runUITest, nodeVersion }) => {
   ]);
 });
 
-test('should show errors in config', async ({ runUITest }) => {
-  const { page } = await runUITest({
-    'playwright.config.ts': `
-      import { defineConfig, devices } from '@playwright/test';
-      throw new Error("URL is empty")
-    `,
-  });
-  await page.getByText('playwright.config.ts').click();
-  await expect(page.getByText('Error: URL is empty')).toBeInViewport();
-});
-
 const testsWithSetup = {
   'playwright.config.ts': `
     import { defineConfig } from '@playwright/test';
@@ -129,9 +129,19 @@ const testsWithSetup = {
 test('should run setup and teardown projects (1)', async ({ runUITest }) => {
   const { page } = await runUITest(testsWithSetup);
   await page.getByText('Status:').click();
-  await page.getByLabel('setup').setChecked(false);
-  await page.getByLabel('teardown').setChecked(false);
-  await page.getByLabel('test').setChecked(false);
+  await page.getByRole('checkbox', { name: 'setup' }).setChecked(false);
+  await page.getByRole('checkbox', { name: 'teardown' }).setChecked(false);
+  await page.getByRole('checkbox', { name: 'test' }).setChecked(false);
+
+  await expect(page.getByTestId('project-filters')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - checkbox "teardown"
+      - listitem:
+        - checkbox "setup"
+      - listitem:
+        - checkbox "test"
+  `);
 
   await page.getByTitle('Run all').click();
 
@@ -144,18 +154,45 @@ test('should run setup and teardown projects (1)', async ({ runUITest }) => {
         ✅ test
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] setup.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] setup/}
+      - treeitem "[icon-check] teardown.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] teardown/}
+      - treeitem "[icon-check] test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] test/}
+  `);
+
   await page.getByTitle('Toggle output').click();
   await expect(page.getByTestId('output')).toContainText(`from-setup`);
   await expect(page.getByTestId('output')).toContainText(`from-test`);
   await expect(page.getByTestId('output')).toContainText(`from-teardown`);
+
+  await expect(page.getByTestId('output')).toMatchAriaSnapshot(`
+    - textbox "Terminal input"
+  `);
 });
 
 test('should run setup and teardown projects (2)', async ({ runUITest }) => {
   const { page } = await runUITest(testsWithSetup);
   await page.getByText('Status:').click();
-  await page.getByLabel('setup').setChecked(false);
-  await page.getByLabel('teardown').setChecked(true);
-  await page.getByLabel('test').setChecked(true);
+  await page.getByRole('checkbox', { name: 'setup' }).setChecked(false);
+  await page.getByRole('checkbox', { name: 'teardown' }).setChecked(true);
+  await page.getByRole('checkbox', { name: 'test' }).setChecked(true);
+
+  await expect(page.getByTestId('project-filters')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - checkbox "teardown" [checked]
+      - listitem:
+        - checkbox "setup"
+      - listitem:
+        - checkbox "test" [checked]
+  `);
 
   await page.getByTitle('Run all').click();
 
@@ -166,18 +203,42 @@ test('should run setup and teardown projects (2)', async ({ runUITest }) => {
         ✅ test
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] teardown.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] teardown/}
+      - treeitem "[icon-check] test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] test/}
+  `);
+
   await page.getByTitle('Toggle output').click();
   await expect(page.getByTestId('output')).toContainText(`from-test`);
   await expect(page.getByTestId('output')).toContainText(`from-teardown`);
   await expect(page.getByTestId('output')).not.toContainText(`from-setup`);
+
+  await expect(page.getByTestId('output')).toMatchAriaSnapshot(`
+    - textbox "Terminal input"
+  `);
 });
 
 test('should run setup and teardown projects (3)', async ({ runUITest }) => {
   const { page } = await runUITest(testsWithSetup);
   await page.getByText('Status:').click();
-  await page.getByLabel('setup').setChecked(false);
-  await page.getByLabel('teardown').setChecked(false);
-  await page.getByLabel('test').setChecked(true);
+  await page.getByRole('checkbox', { name: 'setup' }).setChecked(false);
+  await page.getByRole('checkbox', { name: 'teardown' }).setChecked(false);
+  await page.getByRole('checkbox', { name: 'test' }).setChecked(true);
+
+  await expect(page.getByTestId('project-filters')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - checkbox "teardown"
+      - listitem:
+        - checkbox "setup"
+      - listitem:
+        - checkbox "test" [checked]
+  `);
 
   await page.getByTitle('Run all').click();
 
@@ -186,21 +247,42 @@ test('should run setup and teardown projects (3)', async ({ runUITest }) => {
         ✅ test
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] test.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] test/}
+  `);
+
   await page.getByTitle('Toggle output').click();
   await expect(page.getByTestId('output')).toContainText(`from-test`);
   await expect(page.getByTestId('output')).not.toContainText(`from-setup`);
   await expect(page.getByTestId('output')).not.toContainText(`from-teardown`);
+
+  await expect(page.getByTestId('output')).toMatchAriaSnapshot(`
+    - textbox "Terminal input"
+  `);
 });
 
 test('should run part of the setup only', async ({ runUITest }) => {
   const { page } = await runUITest(testsWithSetup);
   await page.getByText('Status:').click();
-  await page.getByLabel('setup').setChecked(true);
-  await page.getByLabel('teardown').setChecked(true);
-  await page.getByLabel('test').setChecked(true);
+  await page.getByRole('checkbox', { name: 'setup' }).setChecked(true);
+  await page.getByRole('checkbox', { name: 'teardown' }).setChecked(true);
+  await page.getByRole('checkbox', { name: 'test' }).setChecked(true);
+
+  await expect(page.getByTestId('project-filters')).toMatchAriaSnapshot(`
+    - list:
+      - listitem:
+        - checkbox "teardown" [checked]
+      - listitem:
+        - checkbox "setup" [checked]
+      - listitem:
+        - checkbox "test" [checked]
+  `);
 
   await page.getByText('setup.ts').hover();
-  await page.getByRole('listitem').filter({ hasText: 'setup.ts' }).getByTitle('Run').click();
+  await page.getByRole('treeitem', { name: 'setup.ts' }).getByRole('button', { name: 'Run' }).click();
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ✅ setup.ts <=
@@ -210,6 +292,22 @@ test('should run part of the setup only', async ({ runUITest }) => {
     ▼ ◯ test.ts
         ◯ test
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-check] setup.ts" [expanded] [selected]:
+        - button "Run"
+        - button "Show source"
+        - button "Watch"
+        - group:
+          - treeitem ${/\[icon-check\] setup/}
+      - treeitem "[icon-check] teardown.ts" [expanded]:
+        - group:
+          - treeitem ${/\[icon-check\] teardown/}
+      - treeitem "[icon-circle-outline] test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] test"
+  `);
 });
 
 for (const useWeb of [true, false]) {
@@ -245,4 +343,43 @@ for (const useWeb of [true, false]) {
       ]);
     });
   });
-}
\ No newline at end of file
+}
+
+test('should restart webserver on reload', async ({ runUITest }) => {
+  const SIMPLE_SERVER_PATH = path.join(__dirname, 'assets', 'simple-server.js');
+  const port = test.info().workerIndex * 2 + 10500;
+
+  const { page } = await runUITest({
+    'playwright.config.ts': `
+      import { defineConfig } from '@playwright/test';
+      export default defineConfig({
+        webServer: {
+          command: 'node ${JSON.stringify(SIMPLE_SERVER_PATH)} ${port}',
+          port: ${port},
+          reuseExistingServer: false,
+        },
+      });
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      test('should work', async ({ page }) => {
+        await page.goto('http://localhost:${port}/hello');
+      });
+    `
+  }, { DEBUG: 'pw:webserver' });
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+
+  await page.getByTitle('Toggle output').click();
+  await expect(page.getByTestId('output')).toContainText('[WebServer] listening');
+
+  await page.getByTitle('Clear output').click();
+  await expect(page.getByTestId('output')).not.toContainText('[WebServer] listening');
+
+  await page.getByTitle('Reload').click();
+  await expect(page.getByTestId('output')).toContainText('[WebServer] listening');
+  await expect(page.getByTestId('output')).not.toContainText('set reuseExistingServer:true');
+
+  await page.getByTitle('Run all').click();
+  await expect(page.getByTestId('status-line')).toHaveText('1/1 passed (100%)');
+});
diff --git a/tests/playwright-test/ui-mode-test-shortcut.spec.ts b/tests/playwright-test/ui-mode-test-shortcut.spec.ts
index 586751880ef2f..9dd73f3e902d1 100644
--- a/tests/playwright-test/ui-mode-test-shortcut.spec.ts
+++ b/tests/playwright-test/ui-mode-test-shortcut.spec.ts
@@ -48,6 +48,16 @@ test('should run tests', async ({ runUITest }) => {
         ◯ test 2
         ✅ test 3
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] test 0"
+          - treeitem "[icon-circle-outline] test 1"
+          - treeitem "[icon-circle-outline] test 2"
+          - treeitem ${/\[icon-check\] test 3/}
+  `);
 });
 
 test('should stop tests', async ({ runUITest }) => {
@@ -66,6 +76,16 @@ test('should stop tests', async ({ runUITest }) => {
         🕦 test 3
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-loading] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-slash] test 0"
+          - treeitem ${/\[icon-check\] test 1/}
+          - treeitem ${/\[icon-loading\] test 2/}
+          - treeitem ${/\[icon-clock\] test 3/}
+  `);
+
   await expect(page.getByTitle('Run all')).toBeDisabled();
   await expect(page.getByTitle('Stop')).toBeEnabled();
 
diff --git a/tests/playwright-test/ui-mode-test-source.spec.ts b/tests/playwright-test/ui-mode-test-source.spec.ts
index 5d2973a8cf8e0..9bc6719ffc3e9 100644
--- a/tests/playwright-test/ui-mode-test-source.spec.ts
+++ b/tests/playwright-test/ui-mode-test-source.spec.ts
@@ -40,6 +40,17 @@ test('should show selected test in sources', async ({ runUITest }) => {
         ◯ third
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] first"
+          - treeitem "[icon-circle-outline] second"
+      - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] third"
+  `);
+
   await page.getByTestId('test-tree').getByText('first').click();
   await expect(
       page.getByTestId('source-code').locator('.source-tab-file-name')
@@ -48,6 +59,13 @@ test('should show selected test in sources', async ({ runUITest }) => {
       page.locator('.CodeMirror .source-line-running'),
   ).toHaveText(`3    test('first', () => {});`);
 
+  await expect(page.getByTestId('source-code-mirror')).toMatchAriaSnapshot(`
+    - text: |
+        import { test } from '@playwright/test';
+        test('first', () => {});
+        test('second', () => {});
+  `);
+
   await page.getByTestId('test-tree').getByText('second').click();
   await expect(
       page.getByTestId('source-code').locator('.source-tab-file-name')
@@ -85,6 +103,14 @@ test('should show top-level errors in file', async ({ runUITest }) => {
         ◯ third
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts"
+      - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] third"
+  `);
+
   await page.getByTestId('test-tree').getByText('a.test.ts').click();
   await expect(
       page.getByTestId('source-code').locator('.source-tab-file-name')
@@ -96,7 +122,6 @@ test('should show top-level errors in file', async ({ runUITest }) => {
   await expect(
       page.locator('.CodeMirror-linewidget')
   ).toHaveText([
-    '            ',
     'TypeError: Assignment to constant variable.'
   ]);
 });
@@ -113,6 +138,11 @@ test('should show syntax errors in file', async ({ runUITest }) => {
       ◯ a.test.ts
   `);
 
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts"
+  `);
+
   await page.getByTestId('test-tree').getByText('a.test.ts').click();
   await expect(
       page.getByTestId('source-code').locator('.source-tab-file-name')
@@ -124,7 +154,41 @@ test('should show syntax errors in file', async ({ runUITest }) => {
   await expect(
       page.locator('.CodeMirror-linewidget')
   ).toHaveText([
-    '                                              ',
     /Missing semicolon./
   ]);
 });
+
+test('should load error (dupe tests) indicator on sources', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test } from '@playwright/test';
+      test('first', () => {});
+      test('first', () => {});
+    `,
+  });
+  await expect.poll(dumpTestTree(page)).toBe(`
+    ▼ ◯ a.test.ts
+        ◯ first
+  `);
+
+  await page.getByTestId('test-tree').getByText('a.test.ts').click();
+  await expect(page.getByText('Source1')).toBeVisible();
+
+  await expect(
+      page.locator('.CodeMirror .source-line-running'),
+  ).toHaveText(`4      test('first', () => {});`);
+
+  await expect(
+      page.locator('.CodeMirror-linewidget')
+  ).toHaveText([
+    /Error: duplicate test title "first", first declared in a.test.ts:3/
+  ]);
+
+  await expect(page.getByTestId('source-code-mirror')).toMatchAriaSnapshot(`
+    - text: |
+        import { test } from '@playwright/test';
+        test('first', () => {});
+        test('first', () => {});
+        Error: duplicate test title "first", first declared in a.test.ts:3
+  `);
+});
diff --git a/tests/playwright-test/ui-mode-test-tree.spec.ts b/tests/playwright-test/ui-mode-test-tree.spec.ts
index 7346c204e4ce2..e663b986b6a28 100644
--- a/tests/playwright-test/ui-mode-test-tree.spec.ts
+++ b/tests/playwright-test/ui-mode-test-tree.spec.ts
@@ -46,6 +46,19 @@ test('should list tests', async ({ runUITest }) => {
         ◯ passes
         ◯ fails
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded=false]
+      - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+  `);
 });
 
 test('should list all tests from projects with clashing names', async ({ runUITest }) => {
@@ -100,6 +113,22 @@ test('should list all tests from projects with clashing names', async ({ runUITe
           ◯ one
           ◯ two
   `);
+
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] bar" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+            - group:
+              - treeitem "[icon-circle-outline] three"
+              - treeitem "[icon-circle-outline] four"
+      - treeitem "[icon-circle-outline] foo" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] a.test.ts" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] one"
+              - treeitem "[icon-circle-outline] two"
+  `);
 });
 
 test('should traverse up/down', async ({ runUITest }) => {
@@ -111,6 +140,14 @@ test('should traverse up/down', async ({ runUITest }) => {
         ◯ fails
       ► ◯ suite
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded] [selected]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded=false]
+  `);
 
   await page.keyboard.press('ArrowDown');
   await expect.poll(dumpTestTree(page)).toContain(`
@@ -119,6 +156,16 @@ test('should traverse up/down', async ({ runUITest }) => {
         ◯ fails
       ► ◯ suite
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes" [selected]
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded=false]
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot();
+
   await page.keyboard.press('ArrowDown');
   await expect.poll(dumpTestTree(page)).toContain(`
     ▼ ◯ a.test.ts
@@ -126,6 +173,15 @@ test('should traverse up/down', async ({ runUITest }) => {
         ◯ fails <=
       ► ◯ suite
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails" [selected]
+          - treeitem "[icon-circle-outline] suite" [expanded=false]
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot();
 
   await page.keyboard.press('ArrowUp');
   await expect.poll(dumpTestTree(page)).toContain(`
@@ -134,6 +190,15 @@ test('should traverse up/down', async ({ runUITest }) => {
         ◯ fails
       ► ◯ suite
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes" [selected]
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded=false]
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot();
 });
 
 test('should expand / collapse groups', async ({ runUITest }) => {
@@ -149,6 +214,17 @@ test('should expand / collapse groups', async ({ runUITest }) => {
           ◯ inner passes
           ◯ inner fails
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] inner passes"
+              - treeitem "[icon-circle-outline] inner fails"
+  `);
 
   await page.keyboard.press('ArrowLeft');
   await expect.poll(dumpTestTree(page)).toContain(`
@@ -157,6 +233,14 @@ test('should expand / collapse groups', async ({ runUITest }) => {
         ◯ fails
       ► ◯ suite <=
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [selected] [expanded=false]
+  `);
 
   await page.getByTestId('test-tree').getByText('passes').first().click();
   await page.keyboard.press('ArrowLeft');
@@ -165,11 +249,22 @@ test('should expand / collapse groups', async ({ runUITest }) => {
         ◯ passes
         ◯ fails
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded] [selected]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+  `);
 
   await page.keyboard.press('ArrowLeft');
   await expect.poll(dumpTestTree(page)).toContain(`
     ► ◯ a.test.ts <=
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [selected] [expanded=false]
+  `);
 });
 
 test('should merge folder trees', async ({ runUITest }) => {
@@ -195,6 +290,16 @@ test('should merge folder trees', async ({ runUITest }) => {
     ▼ ◯ in-a.test.ts
         ◯ passes
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] b" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] c" [expanded=false]
+          - treeitem "[icon-circle-outline] in-b.test.ts" [expanded=false]
+      - treeitem "[icon-circle-outline] in-a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+  `);
 });
 
 test('should list parametrized tests', async ({ runUITest }) => {
@@ -213,16 +318,23 @@ test('should list parametrized tests', async ({ runUITest }) => {
 
   await page.getByText('cookies').click();
   await page.keyboard.press('ArrowRight');
-  await page.getByText('<anonymous>').click();
-  await page.keyboard.press('ArrowRight');
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
-      ▼ ◯ cookies
-        ▼ ◯ <anonymous> <=
-            ◯ test FR
-            ◯ test DE
-            ◯ test LT
+      ▼ ◯ cookies <=
+          ◯ test FR
+          ◯ test DE
+          ◯ test LT
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] cookies" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] test FR"
+              - treeitem "[icon-circle-outline] test DE"
+              - treeitem "[icon-circle-outline] test LT"
   `);
 });
 
@@ -242,16 +354,23 @@ test('should update parametrized tests', async ({ runUITest, writeFiles }) => {
 
   await page.getByText('cookies').click();
   await page.keyboard.press('ArrowRight');
-  await page.getByText('<anonymous>').click();
-  await page.keyboard.press('ArrowRight');
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
-      ▼ ◯ cookies
-        ▼ ◯ <anonymous> <=
-            ◯ test FR
-            ◯ test DE
-            ◯ test LT
+      ▼ ◯ cookies <=
+          ◯ test FR
+          ◯ test DE
+          ◯ test LT
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] cookies" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] test FR"
+              - treeitem "[icon-circle-outline] test DE"
+              - treeitem "[icon-circle-outline] test LT"
   `);
 
   await writeFiles({
@@ -270,10 +389,18 @@ test('should update parametrized tests', async ({ runUITest, writeFiles }) => {
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
-      ▼ ◯ cookies
-        ▼ ◯ <anonymous> <=
-            ◯ test FR
-            ◯ test LT
+      ▼ ◯ cookies <=
+          ◯ test FR
+          ◯ test LT
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] cookies" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] test FR"
+              - treeitem "[icon-circle-outline] test LT"
   `);
 });
 
@@ -290,11 +417,67 @@ test('should collapse all', async ({ runUITest }) => {
           ◯ inner passes
           ◯ inner fails
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] inner passes"
+              - treeitem "[icon-circle-outline] inner fails"
+  `);
 
   await page.getByTitle('Collapse all').click();
   await expect.poll(dumpTestTree(page)).toContain(`
     ► ◯ a.test.ts
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded=false]
+  `);
+});
+
+test('should expand all', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32825' }
+}, async ({ runUITest }) => {
+  const { page } = await runUITest(basicTestTree);
+
+  await page.getByTestId('test-tree').getByText('suite').click();
+  await page.getByTitle('Collapse all').click();
+  await expect.poll(dumpTestTree(page)).toContain(`
+    ► ◯ a.test.ts
+    ► ◯ b.test.ts
+  `);
+
+  await page.getByTitle('Expand all').click();
+  await expect.poll(dumpTestTree(page)).toContain(`
+    ▼ ◯ a.test.ts
+        ◯ passes
+        ◯ fails
+      ▼ ◯ suite
+          ◯ inner passes
+          ◯ inner fails
+    ▼ ◯ b.test.ts
+        ◯ passes
+        ◯ fails
+  `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+          - treeitem "[icon-circle-outline] suite" [expanded]:
+            - group:
+              - treeitem "[icon-circle-outline] inner passes"
+              - treeitem "[icon-circle-outline] inner fails"
+      - treeitem "[icon-circle-outline] b.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] passes"
+          - treeitem "[icon-circle-outline] fails"
+  `);
 });
 
 test('should resolve title conflicts', async ({ runUITest }) => {
@@ -323,4 +506,14 @@ test('should resolve title conflicts', async ({ runUITest }) => {
           ◯ bar
           ◯ bar 2
   `);
+  await expect(page.getByTestId('test-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem "[icon-circle-outline] a.test.ts" [expanded]:
+        - group:
+          - treeitem "[icon-circle-outline] foo"
+          - treeitem "[icon-circle-outline] foo" [expanded] [selected]:
+            - group:
+              - treeitem "[icon-circle-outline] bar"
+              - treeitem "[icon-circle-outline] bar 2"
+  `);
 });
diff --git a/tests/playwright-test/ui-mode-test-update.spec.ts b/tests/playwright-test/ui-mode-test-update.spec.ts
index 7797803143c04..67d0626a5f773 100644
--- a/tests/playwright-test/ui-mode-test-update.spec.ts
+++ b/tests/playwright-test/ui-mode-test-update.spec.ts
@@ -149,7 +149,7 @@ test('should not loose run information after execution if test wrote into testDi
   await page.getByTitle('Run all').click();
   await page.waitForTimeout(5_000);
   await expect(page.getByText('Did not run')).toBeHidden();
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
@@ -215,9 +215,10 @@ test('should update test locations', async ({ runUITest, writeFiles }) => {
   const messages: any[] = [];
   await page.exposeBinding('__logForTest', (source, arg) => messages.push(arg));
 
-  const passesItemLocator = page.getByRole('listitem').filter({ hasText: 'passes' });
+  const passesItemLocator = page.getByRole('treeitem', { name: 'passes' });
   await passesItemLocator.hover();
-  await passesItemLocator.getByTitle('Open in VS Code').click();
+  await passesItemLocator.getByTitle('Show source').click();
+  await page.getByTitle('Open in VS Code').click();
 
   expect(messages).toEqual([{
     method: 'open',
@@ -247,7 +248,8 @@ test('should update test locations', async ({ runUITest, writeFiles }) => {
 
   messages.length = 0;
   await passesItemLocator.hover();
-  await passesItemLocator.getByTitle('Open in VS Code').click();
+  await passesItemLocator.getByTitle('Show source').click();
+  await page.getByTitle('Open in VS Code').click();
 
   expect(messages).toEqual([{
     method: 'open',
diff --git a/tests/playwright-test/ui-mode-test-watch.spec.ts b/tests/playwright-test/ui-mode-test-watch.spec.ts
index f248baaacdc83..da1920b120a19 100644
--- a/tests/playwright-test/ui-mode-test-watch.spec.ts
+++ b/tests/playwright-test/ui-mode-test-watch.spec.ts
@@ -28,14 +28,14 @@ test('should watch files', async ({ runUITest, writeFiles }) => {
   });
 
   await page.getByText('fails').click();
-  await page.getByRole('listitem').filter({ hasText: 'fails' }).getByTitle('Watch').click();
+  await page.getByRole('treeitem', { name: 'fails' }).getByRole('button', { name: 'Watch' }).click();
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
         ◯ passes
         ◯ fails 👁 <=
   `);
 
-  await page.getByRole('listitem').filter({ hasText: 'fails' }).getByTitle('Run').click();
+  await page.getByRole('treeitem', { name: 'fails' }).getByRole('button', { name: 'Run' }).click();
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ❌ a.test.ts
@@ -75,7 +75,7 @@ test('should watch e2e deps', async ({ runUITest, writeFiles }) => {
   });
 
   await page.getByText('answer').click();
-  await page.getByRole('listitem').filter({ hasText: 'answer' }).getByTitle('Watch').click();
+  await page.getByRole('treeitem', { name: 'answer' }).getByRole('button', { name: 'Watch' }).click();
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
         ◯ answer 👁 <=
@@ -102,13 +102,13 @@ test('should batch watch updates', async ({ runUITest, writeFiles }) => {
   });
 
   await page.getByText('a.test.ts').click();
-  await page.getByRole('listitem').filter({ hasText: 'a.test.ts' }).getByTitle('Watch').click();
+  await page.getByRole('treeitem', { name: 'a.test.ts' }).getByRole('button', { name: 'Watch' }).click();
   await page.getByText('b.test.ts').click();
-  await page.getByRole('listitem').filter({ hasText: 'b.test.ts' }).getByTitle('Watch').click();
+  await page.getByRole('treeitem', { name: 'b.test.ts' }).getByRole('button', { name: 'Watch' }).click();
   await page.getByText('c.test.ts').click();
-  await page.getByRole('listitem').filter({ hasText: 'c.test.ts' }).getByTitle('Watch').click();
+  await page.getByRole('treeitem', { name: 'c.test.ts' }).getByRole('button', { name: 'Watch' }).click();
   await page.getByText('d.test.ts').click();
-  await page.getByRole('listitem').filter({ hasText: 'd.test.ts' }).getByTitle('Watch').click();
+  await page.getByRole('treeitem', { name: 'd.test.ts' }).getByRole('button', { name: 'Watch' }).click();
 
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts 👁
@@ -150,6 +150,8 @@ test('should watch all', async ({ runUITest, writeFiles }) => {
     'd.test.ts': `import { test } from '@playwright/test'; test('test', () => {});`,
   });
 
+  await page.getByTitle('Watch all').click();
+
   await expect.poll(dumpTestTree(page)).toBe(`
     ▼ ◯ a.test.ts
         ◯ test
@@ -160,7 +162,6 @@ test('should watch all', async ({ runUITest, writeFiles }) => {
     ▼ ◯ d.test.ts
         ◯ test
   `);
-  await page.getByTitle('Watch all').click();
 
   await writeFiles({
     'a.test.ts': `import { test } from '@playwright/test'; test('test', () => {});`,
@@ -220,6 +221,37 @@ test('should watch new file', async ({ runUITest, writeFiles }) => {
   `);
 });
 
+test('should run added test in watched file', async ({ runUITest, writeFiles }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+    import { test } from '@playwright/test';
+    test('foo', () => {});
+    `,
+  });
+
+  await page.getByText('a.test.ts').click();
+  await page.getByRole('treeitem', { name: 'a.test.ts' }).getByRole('button', { name: 'Watch' }).click();
+
+  await expect.poll(dumpTestTree(page)).toBe(`
+    ▼ ◯ a.test.ts 👁 <=
+        ◯ foo
+  `);
+
+  await writeFiles({
+    'a.test.ts': `
+    import { test } from '@playwright/test';
+    test('foo', () => {});
+    test('bar', () => {});
+    `,
+  });
+
+  await expect.poll(dumpTestTree(page)).toBe(`
+    ▼ ✅ a.test.ts 👁 <=
+        ✅ foo
+        ✅ bar
+  `);
+});
+
 test('should queue watches', async ({ runUITest, writeFiles, createLatch }) => {
   const latch = createLatch();
   const { page } = await runUITest({
@@ -289,3 +321,32 @@ test('should not watch output', async ({ runUITest }) => {
   expect(commands).toContain('runTests');
   expect(commands).not.toContain('listTests');
 });
+
+
+test('should have watch icon highlighted when a test is focused and watch on the test is enabled', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes', () => {});
+    `,
+  });
+
+  await page.getByTestId('test-tree').getByText('a.test.ts').click();
+  // watch icon should not be highlight till the watch icon is clicked
+  await page.getByRole('treeitem', { name: 'passes' }).hover();
+  await expect(page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Watch' })).not.toHaveCSS('outline', 'rgb(255, 255, 255) solid 1px');
+
+  await page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Watch' }).click();
+  await expect(page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Watch' }).locator('.codicon-eye')).toHaveCSS('color', 'rgb(255, 255, 255)');
+  await expect(page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Watch' })).toHaveCSS('outline', 'rgb(255, 255, 255) solid 1px');
+
+  // deselection of the tree-row should still show the watch icon when watch on tree row is active
+  await page.getByTestId('test-tree').getByText('a.test.ts').click();
+  await expect(page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Watch' })).toBeVisible();
+  await expect(page.getByRole('treeitem', { name: 'passes' }).getByRole('button', { name: 'Watch' })).not.toHaveCSS('outline', 'rgb(255, 255, 255) solid 1px');
+
+  await expect.poll(dumpTestTree(page)).toBe(`
+    ▼ ◯ a.test.ts <=
+        ◯ passes 👁
+  `);
+});
diff --git a/tests/playwright-test/ui-mode-trace.spec.ts b/tests/playwright-test/ui-mode-trace.spec.ts
index 9f0749893e573..56c4607bef23b 100644
--- a/tests/playwright-test/ui-mode-trace.spec.ts
+++ b/tests/playwright-test/ui-mode-trace.spec.ts
@@ -34,16 +34,16 @@ test('should merge trace events', async ({ runUITest }) => {
 
   await page.getByText('trace test').dblclick();
 
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
-    /expect.toBe[\d.]+m?s/,
-    /locator.clickgetByRole\('button'\)[\d.]+m?s/,
-    /expect.toBe[\d.]+m?s/,
+    /Set content/,
+    /Expect "toBe"/,
+    /Click.*getByRole/,
+    /Expect "toBe"/,
     /After Hooks[\d.]+m?s/,
   ]);
 });
@@ -61,19 +61,19 @@ test('should merge web assertion events', async ({  runUITest }, testInfo) => {
 
   await page.getByText('trace test').dblclick();
 
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
-    /expect.toBeVisiblelocator\('button'\)[\d.]+m?s/,
+    /Set content/,
+    /Expect "toBeVisible".*locator/,
     /After Hooks[\d.]+m?s/,
   ]);
 });
 
-test('should merge screenshot assertions', async ({  runUITest }, testInfo) => {
+test('should merge screenshot assertions', async ({ runUITest }) => {
   const { page } = await runUITest({
     'a.test.ts': `
       import { test, expect } from '@playwright/test';
@@ -86,17 +86,16 @@ test('should merge screenshot assertions', async ({  runUITest }, testInfo) => {
 
   await page.getByText('trace test').dblclick();
 
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.setContent[\d.]+m?s/,
-    /expect.toHaveScreenshot[\d.]+m?s/,
-    /attach "trace-test-1-expected.png/,
-    /attach "trace-test-1-actual.png/,
+    /Set content/,
+    /Expect "toHaveScreenshot"[\d.]+m?s/,
     /After Hooks[\d.]+m?s/,
+    /Attach "error-context"/,
     /Worker Cleanup[\d.]+m?s/,
   ]);
 });
@@ -112,7 +111,7 @@ test('should locate sync assertions in source', async ({ runUITest }) => {
   });
 
   await page.getByText('trace test').dblclick();
-  await page.getByText('expect.toBe').click();
+  await page.getByText('Expect "toBe"').click();
 
   await expect(
       page.locator('.CodeMirror .source-line-running'),
@@ -134,15 +133,15 @@ test('should show snapshots for sync assertions', async ({ runUITest }) => {
 
   await page.getByText('trace test').dblclick();
 
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page\.setContent[\d.]+m?s/,
-    /locator\.clickgetByRole\('button'\)[\d.]+m?s/,
-    /expect\.toBe[\d.]+m?s/,
+    /Set content/,
+    /Click.*getByRole/,
+    /Expect "toBe"/,
     /After Hooks[\d.]+m?s/,
   ]);
 
@@ -152,6 +151,61 @@ test('should show snapshots for sync assertions', async ({ runUITest }) => {
   ).toHaveText('Submit');
 });
 
+test('should show snapshots for steps', {
+  annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/35285' }
+}, async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test.beforeEach(async ({ page }) => {
+        await page.setContent('<div>initial</div>');
+      });
+      test('steps test', async ({ page }) => {
+        await test.step('first', async () => {
+          await page.setContent("<div>foo</div>");
+        });
+        await test.step('middle', async () => {
+          await page.setContent("<div>bar</div>");
+        });
+        await test.step('last', async () => {
+          await page.setContent("<div>baz</div>");
+        });
+      });
+    `,
+  });
+
+  await page.getByText('steps test').dblclick();
+
+  await expect(page.getByTestId('actions-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /Before Hooks \\d+[hmsp]+/
+      - treeitem /first \\d+[hmsp]+/
+      - treeitem /middle \\d+[hmsp]+/
+      - treeitem /last \\d+[hmsp]+/
+      - treeitem /After Hooks \\d+[hmsp]+/
+  `);
+
+  await page.getByTestId('actions-tree').getByText('first').click();
+  const snapshot = page.frameLocator('iframe.snapshot-visible[name=snapshot]').locator('div');
+
+  await page.getByText('After', { exact: true }).click();
+  await expect(snapshot).toHaveText('foo');
+  await page.getByText('Before', { exact: true }).click();
+  await expect(snapshot).toHaveText('initial');
+
+  await page.getByTestId('actions-tree').getByText('middle').click();
+  await page.getByText('After', { exact: true }).click();
+  await expect(snapshot).toHaveText('bar');
+  await page.getByText('Before', { exact: true }).click();
+  await expect(snapshot).toHaveText('foo');
+
+  await page.getByTestId('actions-tree').getByText('last').click();
+  await page.getByText('After', { exact: true }).click();
+  await expect(snapshot).toHaveText('baz');
+  await page.getByText('Before', { exact: true }).click();
+  await expect(snapshot).toHaveText('bar');
+});
+
 test('should show image diff', async ({ runUITest }) => {
   const { page } = await runUITest({
     'playwright.config.js': `
@@ -214,17 +268,17 @@ test('should not fail on internal page logs', async ({ runUITest, server }) => {
   });
 
   await page.getByText('pass').dblclick();
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
 
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /browser.newContext[\d.]+m?s/,
-    /browserContext.newPage[\d.]+m?s/,
-    /page.goto/,
-    /browserContext.storageState[\d.]+m?s/,
+    /Create context/,
+    /Create page/,
+    /Navigate to "\/empty.html"/,
+    /Get storage state/,
     /After Hooks/,
   ]);
 });
@@ -241,15 +295,15 @@ test('should not show caught errors in the errors tab', async ({ runUITest }, te
   });
 
   await page.getByText('pass').dblclick();
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
 
   await expect(
       listItem,
       'action list'
   ).toHaveText([
     /Before Hooks[\d.]+m?s/,
-    /page.setContent/,
-    /expect.toBeCheckedlocator.*[\d.]+m?s/,
+    /Set content/,
+    /Expect "toBeChecked".*locator/,
     /After Hooks/,
   ]);
 
@@ -261,6 +315,38 @@ test('should not show caught errors in the errors tab', async ({ runUITest }, te
   await expect(page.locator('.tab-errors')).toHaveText('No errors');
 });
 
+test('should show errors with causes in the error tab', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({ page }) => {
+        try {
+          try {
+            const error = new Error('my-message');
+            error.name = 'SpecialError';
+            throw error;
+          } catch (e) {
+            try {
+              throw new Error('inner-message', { cause: e });
+            } catch (e) {
+              throw new Error('outer-message', { cause: e });
+            }
+          }
+        } catch (e) {
+          throw new Error('wrapper-message', { cause: e });
+        }
+      });
+    `,
+  });
+
+  await page.getByText('pass').dblclick();
+  await page.getByText('Errors', { exact: true }).click();
+  await expect(page.locator('.tab-errors')).toContainText(`Error: wrapper-message
+[cause]: Error: outer-message
+[cause]: Error: inner-message
+[cause]: SpecialError: my-message`);
+});
+
 test('should reveal errors in the sourcetab', async ({ runUITest }) => {
   const { page } = await runUITest({
     'a.spec.ts': `
@@ -272,7 +358,7 @@ test('should reveal errors in the sourcetab', async ({ runUITest }) => {
   });
 
   await page.getByText('pass').dblclick();
-  const listItem = page.getByTestId('actions-tree').getByRole('listitem');
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
 
   await expect(
       listItem,
@@ -307,3 +393,266 @@ test('should show request source context id', async ({ runUITest, server }) => {
   await expect(page.getByText('page#2')).toBeVisible();
   await expect(page.getByText('api#1')).toBeVisible();
 });
+
+test('should work behind reverse proxy', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/33705' } }, async ({ runUITest, proxyServer: reverseProxy }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('trace test', async ({ page }) => {
+        await page.setContent('<button>Submit</button>');
+        await page.getByRole('button').click();
+        expect(1).toBe(1);
+      });
+    `,
+  });
+
+  const uiModeUrl = new URL(page.url());
+  reverseProxy.forwardTo(+uiModeUrl.port, { prefix: '/subdir', preserveHostname: true });
+  await page.goto(`${reverseProxy.URL}/subdir${uiModeUrl.pathname}?${uiModeUrl.searchParams}`);
+
+  await page.getByText('trace test').dblclick();
+
+  await expect(page.getByTestId('actions-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /Before Hooks \\d+[hmsp]+/
+      - treeitem /Set content \\d+[hmsp]+/
+      - treeitem /Click.*getByRole/
+      - treeitem /Expect "toBe"/
+      - treeitem /After Hooks \\d+[hmsp]+/
+  `);
+
+  await expect(
+      page.frameLocator('iframe.snapshot-visible[name=snapshot]').locator('button'),
+  ).toHaveText('Submit');
+});
+
+test('should filter actions tab on double-click', async ({ runUITest, server }) => {
+  const { page } = await runUITest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({ page }) => {
+        await page.goto('${server.EMPTY_PAGE}');
+      });
+    `,
+  });
+
+  await page.getByText('pass').dblclick();
+
+  const actionsTree = page.getByTestId('actions-tree');
+  await expect(actionsTree.getByRole('treeitem')).toHaveText([
+    /Before Hooks/,
+    /Navigate to "\/empty.html"/,
+    /After Hooks/,
+  ]);
+  await actionsTree.getByRole('treeitem', { name: 'Navigate to "\/empty.html"' }).dblclick();
+  await expect(actionsTree.getByRole('treeitem')).toHaveText([
+    /Navigate to "\/empty.html"/,
+  ]);
+});
+
+test('should show custom fixture titles in actions tree', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test as base, expect } from '@playwright/test';
+
+      const test = base.extend({
+        fixture1: [async ({}, use) => {
+          await use();
+        }, { title: 'My Custom Fixture' }],
+        fixture2: async ({}, use) => {
+          await use();
+        },
+      });
+
+      test('fixture test', async ({ fixture1, fixture2 }) => {
+        // Empty test using both fixtures
+      });
+    `,
+  });
+
+  await page.getByText('fixture test').dblclick();
+  const listItem = page.getByTestId('actions-tree').getByRole('treeitem');
+  await expect(listItem, 'action list').toHaveText([
+    /Before Hooks[\d.]+m?s/,
+    /Fixture "My Custom Fixture"[\d.]+m?s/,
+    /Fixture "fixture2"[\d.]+m?s/,
+    /After Hooks[\d.]+m?s/,
+  ]);
+});
+
+test('should hide boxed fixtures and contents, reveal upon show all actions setting', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test as base, expect } from '@playwright/test';
+
+      const test = base.extend({
+        fixture: [async ({ page }, use) => {
+          await page.setContent('<div>hello</div>');
+          await use();
+        }, { auto: true, boxed: true }],
+      });
+
+      test('example', async ({ page }) => {
+        await expect(page.locator('body')).toBeVisible();
+      });
+    `,
+  });
+
+  await page.getByText('example').dblclick();
+  await expect(page.getByTestId('actions-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /Before Hooks/
+      - treeitem /Expect "toBeVisible"/
+      - treeitem /After Hooks/
+  `);
+
+  await page.getByText('Settings').click();
+  await page.getByText('Show route actions').click();
+  await page.getByText('Show configuration actions').click();
+  await page.getByText('Show getter actions').click();
+
+  await page.getByTestId('actions-tree').getByRole('treeitem', { name: 'Before Hooks' }).locator('.codicon-chevron-right').click();
+  await page.getByTestId('actions-tree').getByRole('treeitem', { name: 'Fixture "fixture"' }).locator('.codicon-chevron-right').click();
+
+  await expect(page.getByTestId('actions-tree')).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /Before Hooks/:
+        - group:
+          - treeitem /Fixture "browser"/
+          - treeitem /Fixture "context"/
+          - treeitem /Fixture "page"/
+          - treeitem /Fixture "fixture"/:
+            - group:
+              - treeitem /Set content/
+      - treeitem /Expect "toBeVisible"/
+      - treeitem /After Hooks/
+  `);
+});
+
+test('attachments tab shows all but top-level .push attachments', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('attachment test', async ({}) => {
+        await test.step('step', async () => {
+          test.info().attachments.push({
+            name: 'foo-push',
+            body: Buffer.from('foo-content'),
+            contentType: 'text/plain'
+          });
+
+          await test.info().attach('foo-attach', { body: 'foo-content' })
+        });
+
+        test.info().attachments.push({
+          name: 'bar-push',
+          body: Buffer.from('bar-content'),
+          contentType: 'text/plain'
+        });
+        await test.info().attach('bar-attach', { body: 'bar-content' })
+      });
+    `,
+  });
+
+  await page.getByRole('treeitem', { name: 'attachment test' }).dblclick();
+  const actionsTree = page.getByTestId('actions-tree');
+  await actionsTree.getByRole('treeitem', { name: 'step' }).click();
+  await page.keyboard.press('ArrowRight');
+  await expect(actionsTree, 'attach() and top-level attachments.push calls are shown as actions').toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /step/:
+        - group:
+          - treeitem /Attach \\"foo-attach\\"/
+      - treeitem /Attach \\"bar-attach\\"/
+  `);
+  await page.getByRole('tab', { name: 'Attachments' }).click();
+  await expect(page.getByRole('tabpanel', { name: 'Attachments' })).toMatchAriaSnapshot(`
+    - tabpanel:
+      - button /foo-push/
+      - button /foo-attach/
+      - button /bar-push/
+      - button /bar-attach/
+  `);
+});
+
+test('skipped steps should have an indicator', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test with steps', async ({}) => {
+        await test.step('outer', async () => {
+          await test.step.skip('skipped1', () => {});
+        });
+        await test.step.skip('skipped2', () => {});
+      });
+    `,
+  });
+
+  await page.getByRole('treeitem', { name: 'test with steps' }).dblclick();
+  const actionsTree = page.getByTestId('actions-tree');
+  await actionsTree.getByRole('treeitem', { name: 'outer' }).click();
+  await page.keyboard.press('ArrowRight');
+  await expect(actionsTree).toMatchAriaSnapshot(`
+    - tree:
+      - treeitem /outer/ [expanded]:
+        - group:
+          - treeitem /skipped1/
+      - treeitem /skipped2/
+  `);
+  const skippedMarker = actionsTree.getByRole('treeitem', { name: 'skipped1' }).locator('.action-skipped');
+  await expect(skippedMarker).toBeVisible();
+  await expect(skippedMarker).toHaveAccessibleName('skipped');
+});
+
+test('should show copy prompt button in errors tab', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.spec.ts': `
+import { test, expect } from '@playwright/test';
+test('fails', async ({ page }) => {
+  await page.setContent('<button>Submit</button>');
+  expect(1).toBe(2);
+});
+    `.trim(),
+  });
+
+  await page.getByText('fails').dblclick();
+
+  await page.context().grantPermissions(['clipboard-read', 'clipboard-write']);
+  await page.getByText('Errors', { exact: true }).click();
+  await page.locator('.tab-errors').getByRole('button', { name: 'Copy prompt' }).click();
+  await page.waitForFunction(() => navigator.clipboard.readText());
+  const prompt = await page.evaluate(() => navigator.clipboard.readText());
+  expect(prompt, 'contains error').toContain('expect(received).toBe(expected)');
+  expect(prompt.replaceAll('\r\n', '\n'), 'contains test sources').toContain(`
+  1 | import { test, expect } from '@playwright/test';
+  2 | test('fails', async ({ page }) => {
+  3 |   await page.setContent('<button>Submit</button>');
+> 4 |   expect(1).toBe(2);
+    |             ^ Error: expect(received).toBe(expected) // Object.is equality
+  5 | });
+    `.trim());
+});
+
+test('should indicate current test status', async ({ runUITest }) => {
+  const { page } = await runUITest({
+    'a.spec.ts': `
+import { test, expect } from '@playwright/test';
+test('basic pass', async ({ page }) => {
+  await page.setContent('<button>Submit</button>');
+  await new Promise(resolve => setTimeout(resolve, 1000));
+  expect(1).toBe(1);
+});
+test('basic fail', async ({ page }) => {
+  await page.setContent('<button>Submit</button>');
+  expect(1).toBe(2);
+});
+    `.trim(),
+  });
+
+  await page.getByTestId('test-tree').getByText('basic pass').dblclick();
+  await expect(page.getByRole('tabpanel', { name: 'Actions' })).toContainText('Running');
+  await expect(page.getByRole('tabpanel', { name: 'Actions' })).toContainText('Passed');
+
+  await page.getByTestId('test-tree').getByText('basic fail').dblclick();
+  await expect(page.getByRole('tabpanel', { name: 'Actions' })).toContainText('Failed');
+});
diff --git a/tests/playwright-test/update-aria-snapshot.spec.ts b/tests/playwright-test/update-aria-snapshot.spec.ts
new file mode 100644
index 0000000000000..78cdab3bab7e5
--- /dev/null
+++ b/tests/playwright-test/update-aria-snapshot.spec.ts
@@ -0,0 +1,709 @@
+/**
+ * Copyright Microsoft Corporation. All rights reserved.
+ *
+ * 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 * as fs from 'fs';
+import { test, expect, playwrightCtConfigText, stripAnsi } from './playwright-test-fixtures';
+import { execSync } from 'child_process';
+
+test.describe.configure({ mode: 'parallel' });
+
+function trimPatch(patch: string) {
+  return patch.split('\n').map(line => line.trimEnd()).join('\n');
+}
+
+test('should update snapshot with the update-snapshots flag with multiple projects', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'playwright.config.ts': `
+      export default { projects: [{ name: 'p1' }, { name: 'p2' }] };
+    `,
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello</h1><h2>bye</h2>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`
+          - heading "world"
+        \`);
+      });
+    `
+  }, { 'update-snapshots': true });
+
+  expect(result.exitCode).toBe(0);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -3,7 +3,8 @@
+       test('test', async ({ page }) => {
+         await page.setContent(\`<h1>hello</h1><h2>bye</h2>\`);
+         await expect(page.locator('body')).toMatchAriaSnapshot(\`
+-          - heading "world"
++          - heading "hello" [level=1]
++          - heading "bye" [level=2]
+         \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+
+  git apply test-results/rebaselines.patch
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should update missing snapshots', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  expect(result.output).toContain('Error: A snapshot is not provided, generating new baseline.');
+
+  expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+
+  git apply test-results/rebaselines.patch
+`);
+
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -2,6 +2,8 @@
+       import { test, expect } from '@playwright/test';
+       test('test', async ({ page }) => {
+         await page.setContent(\`<h1>hello</h1>\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - heading "hello" [level=1]
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should update multiple missing snapshots', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<h1>hello</h1>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+
+  expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+
+  git apply test-results/rebaselines.patch
+`);
+
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -2,7 +2,11 @@
+       import { test, expect } from '@playwright/test';
+       test('test', async ({ page }) => {
+         await page.setContent(\`<h1>hello</h1>\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - heading "hello" [level=1]
++        \`);
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - heading "hello" [level=1]
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should generate baseline with regex', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<ul>
+          <li>Item 1</li>
+          <li>Item 2</li>
+          <li>Time 15:30</li>
+          <li>Year 2022</li>
+          <li>Duration 12ms</li>
+          <li>22,333</li>
+          <li>2,333.79</li>
+          <li>Total 22</li>
+          <li>/Regex 1/</li>
+          <li>/Regex 22ms/</li>
+        </ul>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -13,6 +13,18 @@
+           <li>/Regex 1/</li>
+           <li>/Regex 22ms/</li>
+         </ul>\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - list:
++            - listitem: Item 1
++            - listitem: Item 2
++            - listitem: /Time \\\\d+:\\\\d+/
++            - listitem: /Year \\\\d+/
++            - listitem: /Duration \\\\d+[hmsp]+/
++            - listitem: /\\\\d+,\\\\d+/
++            - listitem: /\\\\d+,\\\\d+\\\\.\\\\d+/
++            - listitem: /Total \\\\d+/
++            - listitem: /Regex 1/
++            - listitem: /\\\\/Regex \\\\d+[hmsp]+\\\\//
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should generate baseline with special characters', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<ul>
+          <details>
+            <summary>one: <a href="#">link1</a> "two <a href="#">link2</a> 'three <a href="#">link3</a> \\\`four</summary>
+          </details>
+          <h1>heading "name" [level=1]</h1>
+          <button>Click: me</button>
+          <button>Click: 123</button>
+          <button>Click ' me</button>
+          <button>Click: ' me</button>
+          <button>Click " me</button>
+          <button>Click " me 123</button>
+          <button>Click \\\\ me</button>
+          <button>Click \\\\ me 123</button>
+          <li>Item: 1</li>
+          <li>Item {a: b}</li>
+        </ul>\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -17,6 +17,30 @@
+           <li>Item: 1</li>
+           <li>Item {a: b}</li>
+         </ul>\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - list:
++            - group:
++              - text: "one:"
++              - link "link1":
++                - /url: "#"
++              - text: "\\\\\"two"
++              - link "link2":
++                - /url: "#"
++              - text: "'three"
++              - link "link3":
++                - /url: "#"
++              - text: "\\\`four"
++            - heading "heading \\\\"name\\\\" [level=1]" [level=1]
++            - 'button "Click: me"'
++            - 'button /Click: \\\\d+/'
++            - button "Click ' me"
++            - 'button "Click: '' me"'
++            - button "Click \\\\" me"
++            - button /Click " me \\\\d+/
++            - button "Click \\\\\\\\ me"
++            - button /Click \\\\\\\\ me \\\\d+/
++            - listitem: \"Item: 1\"
++            - listitem: \"Item {a: b}\"
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should update missing snapshots in tsx', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'playwright.config.ts': playwrightCtConfigText,
+    'playwright/index.html': `<script type="module" src="./index.ts"></script>`,
+    'playwright/index.ts': ``,
+
+    'src/button.tsx': `
+      export const Button = () => <button>Button</button>;
+    `,
+
+    'src/button.test.tsx': `
+      import { test, expect } from '@playwright/experimental-ct-react';
+      import { Button } from './button.tsx';
+
+      test('pass', async ({ mount }) => {
+        const component = await mount(<Button></Button>);
+        await expect(component).toMatchAriaSnapshot(\`\`);
+      });
+    `,
+  });
+
+  expect(result.exitCode).toBe(1);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/src/button.test.tsx b/src/button.test.tsx
+--- a/src/button.test.tsx
++++ b/src/button.test.tsx
+@@ -4,6 +4,8 @@
+
+       test('pass', async ({ mount }) => {
+         const component = await mount(<Button></Button>);
+-        await expect(component).toMatchAriaSnapshot(\`\`);
++        await expect(component).toMatchAriaSnapshot(\`
++          - button \"Button\"
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should update multiple files', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'playwright.config.ts': playwrightCtConfigText,
+    'playwright/index.html': `<script type="module" src="./index.ts"></script>`,
+    'playwright/index.ts': ``,
+
+    'src/button.tsx': `
+      export const Button = () => <button>Button</button>;
+    `,
+
+    'src/button-1.test.tsx': `
+      import { test, expect } from '@playwright/experimental-ct-react';
+      import { Button } from './button.tsx';
+
+      test('pass 1', async ({ mount }) => {
+        const component = await mount(<Button></Button>);
+        await expect(component).toMatchAriaSnapshot(\`\`);
+      });
+    `,
+
+    'src/button-2.test.tsx': `
+      import { test, expect } from '@playwright/experimental-ct-react';
+      import { Button } from './button.tsx';
+
+      test('pass 2', async ({ mount }) => {
+        const component = await mount(<Button></Button>);
+        await expect(component).toMatchAriaSnapshot(\`\`);
+      });
+    `,
+  });
+
+  expect(result.exitCode).toBe(1);
+
+  expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  src/button-1.test.tsx
+  src/button-2.test.tsx
+
+  git apply test-results/rebaselines.patch
+`);
+
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/src/button-1.test.tsx b/src/button-1.test.tsx
+--- a/src/button-1.test.tsx
++++ b/src/button-1.test.tsx
+@@ -4,6 +4,8 @@
+
+       test('pass 1', async ({ mount }) => {
+         const component = await mount(<Button></Button>);
+-        await expect(component).toMatchAriaSnapshot(\`\`);
++        await expect(component).toMatchAriaSnapshot(\`
++          - button \"Button\"
++        \`);
+       });
+
+\\ No newline at end of file
+
+diff --git a/src/button-2.test.tsx b/src/button-2.test.tsx
+--- a/src/button-2.test.tsx
++++ b/src/button-2.test.tsx
+@@ -4,6 +4,8 @@
+
+       test('pass 2', async ({ mount }) => {
+         const component = await mount(<Button></Button>);
+-        await expect(component).toMatchAriaSnapshot(\`\`);
++        await expect(component).toMatchAriaSnapshot(\`
++          - button \"Button\"
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should generate baseline for input values', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<input value="hello world">\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -2,6 +2,8 @@
+       import { test, expect } from '@playwright/test';
+       test('test', async ({ page }) => {
+         await page.setContent(\`<input value="hello world">\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - textbox: hello world
++        \`);
+       });
+
+\\ No newline at end of file
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should update when options are specified', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent(\`<input value="hello world">\`);
+        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`, { timeout: 2500 });
+        await expect(page.locator('body')).toMatchAriaSnapshot('',
+          {
+            timeout: 2500
+          });
+      });
+    `
+  });
+
+  expect(result.exitCode).toBe(1);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  const data = fs.readFileSync(patchPath, 'utf-8');
+  expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -2,8 +2,12 @@
+       import { test, expect } from '@playwright/test';
+       test('test', async ({ page }) => {
+         await page.setContent(\`<input value="hello world">\`);
+-        await expect(page.locator('body')).toMatchAriaSnapshot(\`\`, { timeout: 2500 });
+-        await expect(page.locator('body')).toMatchAriaSnapshot('',
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - textbox: hello world
++        \`, { timeout: 2500 });
++        await expect(page.locator('body')).toMatchAriaSnapshot(\`
++          - textbox: hello world
++        \`,
+           {
+             timeout: 2500
+           });
+`);
+
+  execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+  const result2 = await runInlineTest({});
+  expect(result2.exitCode).toBe(0);
+});
+
+test('should not update snapshots when locator did not match', async ({ runInlineTest }, testInfo) => {
+  const result = await runInlineTest({
+    '.git/marker': '',
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('test', async ({ page }) => {
+        await page.setContent('<h1>hello</h1>');
+        await expect(page.locator('div')).toMatchAriaSnapshot('- heading', { timeout: 3000 });
+      });
+    `,
+  }, { 'update-snapshots': true });
+
+  expect(result.exitCode).toBe(1);
+  const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+  expect(fs.existsSync(patchPath)).toBe(false);
+  expect(result.output).not.toContain('New baselines created');
+  expect(result.output).toContain('Expected: "- heading"');
+  expect(result.output).toContain('Received: <element not found>');
+});
+
+test.describe('update-snapshots none', () => {
+  test('should create new baseline for matching snapshot', async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      '.git/marker': '',
+      'a.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1><h1>world</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`\`);
+        });
+      `
+    }, { 'update-snapshots': 'none' });
+
+    expect(result.exitCode).toBe(1);
+    const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+    expect(fs.existsSync(patchPath)).toBeFalsy();
+  });
+});
+
+test.describe('update-snapshots all', () => {
+  test('should create new baseline for matching snapshot', async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      '.git/marker': '',
+      'a.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1><h1>world</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+            - heading "hello"
+          \`);
+        });
+      `
+    }, { 'update-snapshots': 'all' });
+
+    expect(result.exitCode).toBe(0);
+    const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+    const data = fs.readFileSync(patchPath, 'utf-8');
+    expect(trimPatch(data)).toBe(`diff --git a/a.spec.ts b/a.spec.ts
+--- a/a.spec.ts
++++ b/a.spec.ts
+@@ -3,7 +3,8 @@
+         test('test', async ({ page }) => {
+           await page.setContent(\`<h1>hello</h1><h1>world</h1>\`);
+           await expect(page.locator('body')).toMatchAriaSnapshot(\`
+-            - heading "hello"
++            - heading "hello" [level=1]
++            - heading "world" [level=1]
+           \`);
+         });
+
+\\ No newline at end of file
+`);
+
+    expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+
+  git apply test-results/rebaselines.patch
+`);
+
+    execSync(`patch -p1 < ${patchPath}`, { cwd: testInfo.outputPath() });
+    const result2 = await runInlineTest({});
+    expect(result2.exitCode).toBe(0);
+  });
+});
+
+test.describe('update-source-method', () => {
+  test('should overwrite source', async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      '.git/marker': '',
+      'a.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+            - heading "world"
+          \`);
+        });
+      `
+    }, { 'update-snapshots': 'all', 'update-source-method': 'overwrite' });
+
+    expect(result.exitCode).toBe(0);
+    const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+    expect(fs.existsSync(patchPath)).toBeFalsy();
+
+    const data = fs.readFileSync(testInfo.outputPath('a.spec.ts'), 'utf-8');
+    expect(data).toBe(`
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+            - heading "hello" [level=1]
+          \`);
+        });
+      `);
+
+    expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+`);
+
+    const result2 = await runInlineTest({});
+    expect(result2.exitCode).toBe(0);
+  });
+
+  test('should 3way source', async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      '.git/marker': '',
+      'a.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+            - heading "world"
+          \`);
+        });
+      `
+    }, { 'update-snapshots': 'all', 'update-source-method': '3way' });
+
+    expect(result.exitCode).toBe(0);
+    const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+    expect(fs.existsSync(patchPath)).toBeFalsy();
+
+    const data = fs.readFileSync(testInfo.outputPath('a.spec.ts'), 'utf-8');
+    expect(data).toBe(`
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+\<<<<<<< HEAD
+            - heading "world"
+=======
+            - heading "hello" [level=1]
+>>>>>>> SNAPSHOT
+          \`);
+        });
+      `);
+
+    expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+`);
+  });
+
+  test('should overwrite source when specified in the config', async ({ runInlineTest }, testInfo) => {
+    const result = await runInlineTest({
+      '.git/marker': '',
+      'playwright.config.ts': `
+        export default { updateSourceMethod: 'overwrite' };
+      `,
+      'a.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+            - heading "world"
+          \`);
+        });
+      `
+    }, { 'update-snapshots': 'all' });
+
+    expect(result.exitCode).toBe(0);
+    const patchPath = testInfo.outputPath('test-results/rebaselines.patch');
+    expect(fs.existsSync(patchPath)).toBeFalsy();
+
+    const data = fs.readFileSync(testInfo.outputPath('a.spec.ts'), 'utf-8');
+    expect(data).toBe(`
+        import { test, expect } from '@playwright/test';
+        test('test', async ({ page }) => {
+          await page.setContent(\`<h1>hello</h1>\`);
+          await expect(page.locator('body')).toMatchAriaSnapshot(\`
+            - heading "hello" [level=1]
+          \`);
+        });
+      `);
+
+    expect(stripAnsi(result.output).replace(/\\/g, '/')).toContain(`New baselines created for:
+
+  a.spec.ts
+`);
+
+    const result2 = await runInlineTest({});
+    expect(result2.exitCode).toBe(0);
+  });
+});
diff --git a/tests/playwright-test/watch.spec.ts b/tests/playwright-test/watch.spec.ts
index 946377a357283..750c3f854df61 100644
--- a/tests/playwright-test/watch.spec.ts
+++ b/tests/playwright-test/watch.spec.ts
@@ -15,6 +15,7 @@
  */
 
 import path from 'path';
+import timers from 'timers/promises';
 import { test, expect, playwrightCtConfigText } from './playwright-test-fixtures';
 
 test.describe.configure({ mode: 'parallel' });
@@ -173,15 +174,16 @@ test('should print dependencies in mixed CJS/ESM mode 2', async ({ runInlineTest
   });
 });
 
-test('should perform initial run', async ({ runWatchTest }) => {
+test('should not perform initial run', async ({ runWatchTest }) => {
   const testProcess = await runWatchTest({
     'a.test.ts': `
       import { test, expect } from '@playwright/test';
       test('passes', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
+
+  expect(testProcess.output).not.toContain('a.test.ts');
 });
 
 test('should quit on Q', async ({ runWatchTest }) => {
@@ -205,7 +207,6 @@ test('should run tests on Enter', async ({ runWatchTest }) => {
       test('passes', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('\r\n');
@@ -214,6 +215,24 @@ test('should run tests on Enter', async ({ runWatchTest }) => {
   await testProcess.waitForOutput('Waiting for file changes.');
 });
 
+test('should not print show-report command of HTML reporter', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes', () => {});
+    `,
+    'playwright.config.ts': `
+      import { defineConfig } from '@playwright/test';
+      export default defineConfig({ reporter: 'html' });
+    `,
+  });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+  await testProcess.waitForOutput('Waiting for file changes.');
+  expect(testProcess.output).not.toContain('To open last HTML report run:');
+});
+
 test('should run tests on R', async ({ runWatchTest }) => {
   const testProcess = await runWatchTest({
     'a.test.ts': `
@@ -221,7 +240,6 @@ test('should run tests on R', async ({ runWatchTest }) => {
       test('passes', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('r');
@@ -245,6 +263,10 @@ test('should run failed tests on F', async ({ runWatchTest }) => {
       test('fails', () => { expect(1).toBe(2); });
     `,
   });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.write('\r\n');
+
+  await testProcess.waitForOutput('npx playwright test #1');
   await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('b.test.ts:3:11 › passes');
   await testProcess.waitForOutput('c.test.ts:3:11 › fails');
@@ -252,7 +274,7 @@ test('should run failed tests on F', async ({ runWatchTest }) => {
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('f');
-  await testProcess.waitForOutput('npx playwright test (running failed tests) #1');
+  await testProcess.waitForOutput('npx playwright test (running failed tests) #2');
   await testProcess.waitForOutput('c.test.ts:3:11 › fails');
   expect(testProcess.output).not.toContain('a.test.ts:3:11');
 });
@@ -268,8 +290,6 @@ test('should respect file filter P', async ({ runWatchTest }) => {
       test('passes', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('p');
@@ -281,8 +301,8 @@ test('should respect file filter P', async ({ runWatchTest }) => {
   await testProcess.waitForOutput('Waiting for file changes.');
 });
 
-test('should respect project filter C', async ({ runWatchTest }) => {
-  const testProcess = await runWatchTest({
+test('should respect project filter C', async ({ runWatchTest, writeFiles }) => {
+  const files = {
     'playwright.config.ts': `
       import { defineConfig } from '@playwright/test';
       export default defineConfig({ projects: [{name: 'foo'}, {name: 'bar'}] });
@@ -291,9 +311,14 @@ test('should respect project filter C', async ({ runWatchTest }) => {
       import { test, expect } from '@playwright/test';
       test('passes', () => {});
     `,
-  });
+  };
+  const testProcess = await runWatchTest(files, { project: 'foo' });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
+  await testProcess.waitForOutput('npx playwright test --project foo #1');
   await testProcess.waitForOutput('[foo] › a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('[bar] › a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('c');
@@ -302,9 +327,24 @@ test('should respect project filter C', async ({ runWatchTest }) => {
   await testProcess.waitForOutput('bar');
   testProcess.write(' ');
   testProcess.write('\r\n');
-  await testProcess.waitForOutput('npx playwright test --project foo #1');
+  await testProcess.waitForOutput('npx playwright test --project foo #2');
   await testProcess.waitForOutput('[foo] › a.test.ts:3:11 › passes');
   expect(testProcess.output).not.toContain('[bar] › a.test.ts:3:11 › passes');
+
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+
+  await writeFiles(files); // file change triggers listTests with project filter
+  await testProcess.waitForOutput('[foo] › a.test.ts:3:11 › passes');
+
+  testProcess.clearOutput();
+  await testProcess.waitForOutput('Waiting for file changes.');
+
+  testProcess.write('c');
+  testProcess.clearOutput();
+  await testProcess.waitForOutput('Select projects');
+  await testProcess.waitForOutput('foo');
+  await testProcess.waitForOutput('bar'); // second selection should still show all
 });
 
 test('should respect file filter P and split files', async ({ runWatchTest }) => {
@@ -318,8 +358,6 @@ test('should respect file filter P and split files', async ({ runWatchTest }) =>
       test('passes', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('p');
@@ -342,8 +380,6 @@ test('should respect title filter T', async ({ runWatchTest }) => {
       test('title 2', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › title 1');
-  await testProcess.waitForOutput('b.test.ts:3:11 › title 2');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('t');
@@ -370,6 +406,11 @@ test('should re-run failed tests on F > R', async ({ runWatchTest }) => {
       test('fails', () => { expect(1).toBe(2); });
     `,
   });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
+  await testProcess.waitForOutput('npx playwright test #1');
   await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('b.test.ts:3:11 › passes');
   await testProcess.waitForOutput('c.test.ts:3:11 › fails');
@@ -377,12 +418,13 @@ test('should re-run failed tests on F > R', async ({ runWatchTest }) => {
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('f');
-  await testProcess.waitForOutput('npx playwright test (running failed tests) #1');
+  await testProcess.waitForOutput('npx playwright test (running failed tests) #2');
   await testProcess.waitForOutput('c.test.ts:3:11 › fails');
   expect(testProcess.output).not.toContain('a.test.ts:3:11');
+  await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   testProcess.write('r');
-  await testProcess.waitForOutput('npx playwright test (re-running tests) #2');
+  await testProcess.waitForOutput('npx playwright test (re-running tests) #3');
   await testProcess.waitForOutput('c.test.ts:3:11 › fails');
   expect(testProcess.output).not.toContain('a.test.ts:3:11');
 });
@@ -402,10 +444,6 @@ test('should run on changed files', async ({ runWatchTest, writeFiles }) => {
       test('fails', () => { expect(1).toBe(2); });
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('c.test.ts:3:11 › fails');
-  await testProcess.waitForOutput('Error: expect(received).toBe(expected)');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   await writeFiles({
@@ -418,6 +456,17 @@ test('should run on changed files', async ({ runWatchTest, writeFiles }) => {
   expect(testProcess.output).not.toContain('a.test.ts:3:11 › passes');
   expect(testProcess.output).not.toContain('b.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
+
+  testProcess.clearOutput();
+  await writeFiles({
+    'b.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes', () => {});
+    `,
+  });
+
+  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
+  expect(testProcess.output).not.toContain('c.test.ts:3:11 › passes');
 });
 
 test('should run on changed deps', async ({ runWatchTest, writeFiles }) => {
@@ -435,9 +484,6 @@ test('should run on changed deps', async ({ runWatchTest, writeFiles }) => {
       console.log('old helper');
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('b.test.ts:4:11 › passes');
-  await testProcess.waitForOutput('old helper');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   await writeFiles({
@@ -468,9 +514,6 @@ test('should run on changed deps in ESM', async ({ runWatchTest, writeFiles }) =
       console.log('old helper');
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:7 › passes');
-  await testProcess.waitForOutput('b.test.ts:4:7 › passes');
-  await testProcess.waitForOutput('old helper');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   await writeFiles({
@@ -499,10 +542,6 @@ test('should re-run changed files on R', async ({ runWatchTest, writeFiles }) =>
       test('fails', () => { expect(1).toBe(2); });
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('c.test.ts:3:11 › fails');
-  await testProcess.waitForOutput('Error: expect(received).toBe(expected)');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.clearOutput();
   await writeFiles({
@@ -534,8 +573,6 @@ test('should not trigger on changes to non-tests', async ({ runWatchTest, writeF
       test('passes', () => {});
     `,
   });
-  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
-  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
 
   testProcess.clearOutput();
@@ -545,7 +582,7 @@ test('should not trigger on changes to non-tests', async ({ runWatchTest, writeF
     `,
   });
 
-  await new Promise(f => setTimeout(f, 1000));
+  await timers.setTimeout(1000);
   expect(testProcess.output).not.toContain('Waiting for file changes.');
 });
 
@@ -560,6 +597,10 @@ test('should only watch selected projects', async ({ runWatchTest, writeFiles })
       test('passes', () => {});
     `,
   }, undefined, undefined, { additionalArgs: ['--project=foo'] });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
   await testProcess.waitForOutput('npx playwright test --project foo');
   await testProcess.waitForOutput('[foo] › a.test.ts:3:11 › passes');
   expect(testProcess.output).not.toContain('[bar]');
@@ -590,6 +631,10 @@ test('should watch filtered files', async ({ runWatchTest, writeFiles }) => {
       test('passes', () => {});
     `,
   }, undefined, undefined, { additionalArgs: ['a.test.ts'] });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
   await testProcess.waitForOutput('npx playwright test a.test.ts');
   await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   expect(testProcess.output).not.toContain('b.test');
@@ -603,7 +648,7 @@ test('should watch filtered files', async ({ runWatchTest, writeFiles }) => {
     `,
   });
 
-  await new Promise(f => setTimeout(f, 1000));
+  await timers.setTimeout(1000);
   expect(testProcess.output).not.toContain('Waiting for file changes.');
 });
 
@@ -618,6 +663,10 @@ test('should not watch unfiltered files', async ({ runWatchTest, writeFiles }) =
       test('passes', () => {});
     `,
   }, undefined, undefined, { additionalArgs: ['a.test.ts'] });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
   await testProcess.waitForOutput('npx playwright test a.test.ts');
   await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   expect(testProcess.output).not.toContain('b.test');
@@ -661,11 +710,8 @@ test('should run CT on changed deps', async ({ runWatchTest, writeFiles }) => {
         await expect(component).toHaveText('hello');
       });
     `,
-  });
-  await testProcess.waitForOutput('button.spec.tsx:4:11 › pass');
-  await testProcess.waitForOutput('link.spec.tsx:3:11 › pass');
+  }, undefined, { PWTEST_RECOVERY_DISABLED: '1' });
   await testProcess.waitForOutput('Waiting for file changes.');
-  testProcess.clearOutput();
   await writeFiles({
     'src/button.tsx': `
       export const Button = () => <button>Button 2</button>;
@@ -674,7 +720,8 @@ test('should run CT on changed deps', async ({ runWatchTest, writeFiles }) => {
 
   await testProcess.waitForOutput(`src${path.sep}button.spec.tsx:4:11 › pass`);
   expect(testProcess.output).not.toContain(`src${path.sep}link.spec.tsx`);
-  await testProcess.waitForOutput(`Error: Timed out 1000ms waiting for expect(locator).toHaveText(expected)`);
+  await testProcess.waitForOutput(`Error: expect(locator).toHaveText(expected) failed`);
+  await testProcess.waitForOutput('Timeout: 1000ms');
   await testProcess.waitForOutput('Waiting for file changes.');
 });
 
@@ -710,10 +757,7 @@ test('should run CT on indirect deps change', async ({ runWatchTest, writeFiles
       });
     `,
   });
-  await testProcess.waitForOutput('button.spec.tsx:4:11 › pass');
-  await testProcess.waitForOutput('link.spec.tsx:3:11 › pass');
   await testProcess.waitForOutput('Waiting for file changes.');
-  testProcess.clearOutput();
   await writeFiles({
     'src/button.css': `
       button { color: blue; }
@@ -754,10 +798,7 @@ test('should run CT on indirect deps change ESM mode', async ({ runWatchTest, wr
       });
     `,
   });
-  await testProcess.waitForOutput('button.spec.tsx:4:7 › pass');
-  await testProcess.waitForOutput('link.spec.tsx:3:7 › pass');
   await testProcess.waitForOutput('Waiting for file changes.');
-  testProcess.clearOutput();
   await writeFiles({
     'src/button.css': `
       button { color: blue; }
@@ -787,8 +828,77 @@ test('should run global teardown before exiting', async ({ runWatchTest }) => {
       });
     `,
   });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
   await testProcess.waitForOutput('a.test.ts:3:11 › passes');
   await testProcess.waitForOutput('Waiting for file changes.');
   testProcess.write('\x1B');
   await testProcess.waitForOutput('running teardown');
 });
+
+test('should stop testrun on pressing escape', async ({ runWatchTest }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('stalls', async () => {
+        console.log('test started')
+        await new Promise(() => {});
+      });
+    `,
+  });
+  await testProcess.waitForOutput('Waiting for file changes.');
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
+  await testProcess.waitForOutput('test started');
+  testProcess.write('\x1B');
+  await testProcess.waitForOutput('1 interrupted');
+});
+
+test('buffer mode', async ({ runWatchTest, writeFiles }) => {
+  const testProcess = await runWatchTest({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes', () => {});
+    `,
+    'b.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes in b', () => {});
+    `,
+  });
+
+  testProcess.clearOutput();
+  testProcess.write('b');
+  await testProcess.waitForOutput('Waiting for file changes. Press q to quit');
+
+
+  testProcess.clearOutput();
+  await writeFiles({
+    'a.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes again', () => {});
+    `,
+  });
+
+  await testProcess.waitForOutput('1 test file changed:');
+  await testProcess.waitForOutput('a.test.ts');
+
+  testProcess.clearOutput();
+  await writeFiles({
+    'b.test.ts': `
+      import { test, expect } from '@playwright/test';
+      test('passes in b again', () => {});
+    `,
+  });
+  await testProcess.waitForOutput('2 test files changed:');
+  await testProcess.waitForOutput('a.test.ts');
+  await testProcess.waitForOutput('b.test.ts');
+
+  testProcess.clearOutput();
+  testProcess.write('\r\n');
+
+  await testProcess.waitForOutput('a.test.ts:3:11 › passes');
+  await testProcess.waitForOutput('b.test.ts:3:11 › passes');
+});
diff --git a/tests/playwright-test/web-server.spec.ts b/tests/playwright-test/web-server.spec.ts
index 04e3c1d328bf9..92600121052a2 100644
--- a/tests/playwright-test/web-server.spec.ts
+++ b/tests/playwright-test/web-server.spec.ts
@@ -17,7 +17,8 @@
 import type http from 'http';
 import path from 'path';
 import { test, expect, parseTestRunnerOutput } from './playwright-test-fixtures';
-import { createHttpServer } from '../../packages/playwright-core/lib/utils/network';
+import type { RunResult } from './playwright-test-fixtures';
+import { createHttpServer } from '../../packages/playwright-core/lib/server/utils/network';
 
 const SIMPLE_SERVER_PATH = path.join(__dirname, 'assets', 'simple-server.js');
 
@@ -744,3 +745,122 @@ test('should forward stdout when set to "pipe" before server is ready', async ({
   expect(result.output).toContain('[WebServer] output from server');
   expect(result.output).not.toContain('Timed out waiting 3000ms');
 });
+
+test.describe('gracefulShutdown option', () => {
+  test.skip(process.platform === 'win32', 'No sending SIGINT on Windows');
+
+  const files = (additionalOptions = {}) => {
+    const port = test.info().workerIndex * 2 + 10510;
+    return {
+      'child.js': `
+        process.on('SIGINT', () => { console.log('%%childprocess received SIGINT'); setTimeout(() => process.exit(), 10) })
+        process.on('SIGTERM', () => { console.log('%%childprocess received SIGTERM'); setTimeout(() => process.exit(), 10) })
+        setTimeout(() => {}, 100000) // prevent child from exiting
+      `,
+      'web-server.js': `
+        require("node:child_process").fork('./child.js', { silent: false })
+        
+        process.on('SIGINT', () => {
+          console.log('%%webserver received SIGINT but stubbornly refuses to wind down')
+        })
+        process.on('SIGTERM', () => {
+          console.log('%%webserver received SIGTERM but stubbornly refuses to wind down')
+        })
+
+        const server = require("node:http").createServer((req, res) => { res.end("ok"); })
+        server.listen(process.argv[2]);
+      `,
+      'test.spec.ts': `
+        import { test, expect } from '@playwright/test';
+        test('pass', async ({}) => {});
+      `,
+      'playwright.config.ts': `
+        module.exports = {
+          webServer: {
+            command: 'echo some-precondition && node web-server.js ${port}',
+            port: ${port},
+            stdout: 'pipe',
+            timeout: 3000,
+            ...${JSON.stringify(additionalOptions)}
+          },
+        };
+      `,
+    };
+  };
+
+  function parseOutputLines(result: RunResult): string[] {
+    const prefix = '[WebServer] %%';
+    return result.output.split('\n').filter(line => line.startsWith(prefix)).map(line => line.substring(prefix.length));
+  }
+
+  test('sends SIGKILL by default', async ({ runInlineTest }) => {
+    const result = await runInlineTest(files(), { workers: 1 });
+    expect(parseOutputLines(result)).toEqual([]);
+  });
+
+  test('can be configured to send SIGTERM', async ({ runInlineTest }) => {
+    const result = await runInlineTest(files({ gracefulShutdown: { signal: 'SIGTERM', timeout: 500 } }), { workers: 1 });
+    expect(parseOutputLines(result).sort()).toEqual(['childprocess received SIGTERM', 'webserver received SIGTERM but stubbornly refuses to wind down']);
+  });
+
+  test('can be configured to send SIGINT', async ({ runInlineTest }) => {
+    const result = await runInlineTest(files({ gracefulShutdown: { signal: 'SIGINT', timeout: 500 } }), { workers: 1 });
+    expect(parseOutputLines(result).sort()).toEqual(['childprocess received SIGINT', 'webserver received SIGINT but stubbornly refuses to wind down']);
+  });
+});
+
+test.describe('name option', () => {
+  test('should use custom prefix', async ({ runInlineTest }, { workerIndex }) => {
+    const port = workerIndex * 2 + 10500;
+    const name1 = 'CustomName1';
+    const name2 = 'CustomName2';
+    const defaultPrefix = 'WebServer';
+    const result = await runInlineTest({
+      'test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({}) => {});
+    `,
+      'playwright.config.ts': `
+      module.exports = {
+        webServer: [
+          {
+            command: 'node ${JSON.stringify(SIMPLE_SERVER_PATH)} ${port}',
+            port: ${port},
+            name: '${name1}',
+          },
+          {
+            command: 'node ${JSON.stringify(SIMPLE_SERVER_PATH)} ${port + 1}',
+            port: ${port + 1},
+            name: '${name2}',
+          }
+        ],
+      };
+    `,
+    }, undefined);
+    expect(result.exitCode).toBe(0);
+    expect(result.output).toContain(`[${name1}]`);
+    expect(result.output).toContain(`[${name2}]`);
+    expect(result.output).not.toContain(`[${defaultPrefix}]`);
+  });
+
+  test('should use default prefix when name option is not set', async ({ runInlineTest }, { workerIndex }) => {
+    const port = workerIndex * 2 + 10500;
+    const defaultPrefix = 'WebServer';
+    const result = await runInlineTest({
+      'test.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('pass', async ({}) => {});
+    `,
+      'playwright.config.ts': `
+      module.exports = {
+        webServer: {
+          command: 'node ${JSON.stringify(SIMPLE_SERVER_PATH)} ${port}',
+          port: ${port},
+        },
+      };
+    `,
+    }, undefined);
+    expect(result.exitCode).toBe(0);
+    expect(result.output).toContain(`[${defaultPrefix}]`);
+  });
+});
diff --git a/tests/playwright-test/worker-index.spec.ts b/tests/playwright-test/worker-index.spec.ts
index 555807e03c021..7ab48caefa311 100644
--- a/tests/playwright-test/worker-index.spec.ts
+++ b/tests/playwright-test/worker-index.spec.ts
@@ -239,3 +239,88 @@ test('should not spawn workers for statically skipped tests', async ({ runInline
   expect(result.output).toContain('workerIndex=0');
   expect(result.output).not.toContain('workerIndex=1');
 });
+
+test('should respect project.workers=1', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        workers: 10,
+        projects: [
+          { name: 'project1', workers: 1 },
+          { name: 'project2', workers: 1 },
+        ],
+      };
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      test.describe.configure({ mode: 'parallel' });
+      test('test1', async ({}, testInfo) => {
+        console.log('%%test1-begin:' + testInfo.project.name);
+        await new Promise(f => setTimeout(f, 1000 + (testInfo.project.name === 'project1' ? 2000 : 0)));
+        console.log('%%test1-end:' + testInfo.project.name);
+      });
+      test('test2', async ({}, testInfo) => {
+        console.log('%%test2:' + testInfo.project.name);
+      });
+    `,
+  }, { workers: 10 });
+  expect(result.passed).toBe(4);
+  expect(result.exitCode).toBe(0);
+
+  // test1 from both projects start, test2 starts once test1 for that project finishes
+  expect(result.outputLines.slice(0, 2).sort()).toEqual([
+    'test1-begin:project1',
+    'test1-begin:project2',
+  ]);
+  expect(result.outputLines.slice(2, 6)).toEqual([
+    'test1-end:project2',
+    'test2:project2',
+    'test1-end:project1',
+    'test2:project1',
+  ]);
+});
+
+test('should respect project.workers>1', async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'playwright.config.ts': `
+      export default {
+        workers: 10,
+        projects: [
+          { name: 'project', workers: 2 },
+        ],
+      };
+    `,
+    'a.test.js': `
+      import { test, expect } from '@playwright/test';
+      test.describe.configure({ mode: 'parallel' });
+      test('test1', async ({}, testInfo) => {
+        console.log('%%test1-begin');
+        await new Promise(f => setTimeout(f, 2000));
+        console.log('%%test1-end');
+      });
+      test('test2', async ({}, testInfo) => {
+        console.log('%%test2-begin');
+        await new Promise(f => setTimeout(f, 1000));
+        console.log('%%test2-end');
+      });
+      test('test3', async ({}, testInfo) => {
+        console.log('%%test3');
+      });
+    `,
+  }, { workers: 10 });
+  expect(result.passed).toBe(3);
+  expect(result.exitCode).toBe(0);
+
+  // 1+2 start, 1 finishes => 3 runs, 2 finishes
+  expect(result.outputLines.slice(0, 2).sort()).toEqual([
+    'test1-begin',
+    'test2-begin',
+  ]);
+  expect(result.outputLines.slice(2, 4)).toEqual([
+    'test2-end',
+    'test3',
+  ]);
+  expect(result.outputLines.slice(4, 5)).toEqual([
+    'test1-end',
+  ]);
+});
diff --git a/tests/stress/heap.spec.ts b/tests/stress/heap.spec.ts
index a88ab29005ae3..66bedfe9ff265 100644
--- a/tests/stress/heap.spec.ts
+++ b/tests/stress/heap.spec.ts
@@ -44,9 +44,9 @@ test('should not leak fixtures w/o page', async ({}) => {
 
 test('should not leak server-side objects', async ({ page }) => {
   expect(await queryObjectCount(require('../../packages/playwright-core/lib/server/page').Page)).toBe(1);
-  // 4 is because v8 heap creates objects for descendant classes, so WKContext, CRContext, FFContext and our context instance.
-  expect(await queryObjectCount(require('../../packages/playwright-core/lib/server/browserContext').BrowserContext)).toBe(4);
-  expect(await queryObjectCount(require('../../packages/playwright-core/lib/server/browser').Browser)).toBe(4);
+  // 4 is because v8 heap creates objects for descendant classes, so WKContext, CRContext, FFContext, BidiBrowserContext and our context instance.
+  expect(await queryObjectCount(require('../../packages/playwright-core/lib/server/browserContext').BrowserContext)).toBe(5);
+  expect(await queryObjectCount(require('../../packages/playwright-core/lib/server/browser').Browser)).toBe(5);
 });
 
 test('should not leak dispatchers after closing page', async ({ context, server }) => {
diff --git a/tests/stress/playwright.config.ts b/tests/stress/playwright.config.ts
index de6678a0df31a..dcf5a0813632c 100644
--- a/tests/stress/playwright.config.ts
+++ b/tests/stress/playwright.config.ts
@@ -16,6 +16,8 @@
 
 import { defineConfig } from '@playwright/test';
 
+process.env.PWTEST_UNDER_TEST = '1';
+
 export default defineConfig({
   forbidOnly: !!process.env.CI,
   reporter: 'html',
diff --git a/tests/third_party/proxy/index.ts b/tests/third_party/proxy/index.ts
index 32f3d734373d8..b3b4c450f2d65 100644
--- a/tests/third_party/proxy/index.ts
+++ b/tests/third_party/proxy/index.ts
@@ -1,8 +1,8 @@
 import assert from 'assert';
 import * as net from 'net';
-import * as url from 'url';
 import * as http from 'http';
 import * as os from 'os';
+import { pipeline } from 'stream/promises';
 
 const pkg = { version: '1.0.0' }
 
@@ -33,6 +33,7 @@ export function createProxy(server?: http.Server): ProxyServer {
 	if (!server) server = http.createServer();
 	server.on('request', onrequest);
 	server.on('connect', onconnect);
+	server.on('upgrade', onupgrade);
 	return server;
 }
 
@@ -99,7 +100,7 @@ async function onrequest(
 	}
 
 	socket.resume();
-	const parsed = url.parse(req.url || '/');
+	const parsed = new URL(req.url, 'http://localhost');
 
 	// setup outbound proxy request HTTP headers
 	const headers: http.OutgoingHttpHeaders = {};
@@ -195,8 +196,7 @@ async function onrequest(
 	}
 
 	let gotResponse = false;
-	const proxyReq = http.request({
-		...parsed,
+	const proxyReq = http.request(parsed, {
 		method: req.method,
 		headers,
 		localAddress: this.localAddress,
@@ -465,4 +465,31 @@ function requestAuthorization(
 	};
 	res.writeHead(407, headers);
 	res.end('Proxy authorization required');
+}
+
+function onupgrade(req: http.IncomingMessage, socket: net.Socket, head: Buffer) {
+	const proxyReq = http.request(req.url, {
+		method: req.method,
+		headers: req.headers,
+		localAddress: this.localAddress,
+	});
+
+  proxyReq.on('error', () => socket.destroy());
+	proxyReq.on('upgrade', async function (proxyRes, proxySocket, proxyHead) {
+		const header = ['HTTP/1.1 101 Switching Protocols'];
+		for (const [key, value] of Object.entries(proxyRes.headersDistinct))
+			header.push(`${key}: ${value}`);
+		socket.write(header.join('\r\n') + '\r\n\r\n');
+		if (proxyHead && proxyHead.length)
+      proxySocket.unshift(proxyHead);
+
+		proxySocket.pipe(socket);
+		socket.pipe(proxySocket);
+		proxySocket.on('error', () => socket.destroy());
+		socket.on('error', () => proxySocket.destroy());
+		proxySocket.on('end', () => socket.end());
+		socket.on('end', () => proxySocket.end());
+	});
+
+	proxyReq.end(head);
 }
\ No newline at end of file
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
index 1a1e3d7527c34..a921b85a096a7 100644
--- a/tests/tsconfig.json
+++ b/tests/tsconfig.json
@@ -12,6 +12,7 @@
         "baseUrl": "..",
         "paths": {
           "@isomorphic/*": ["packages/playwright-core/src/utils/isomorphic/*"],
+          "@testIsomorphic/*": ["packages/playwright/src/isomorphic/*"],
           "@protocol/*": ["packages/protocol/src/*"],
           "@recorder/*": ["packages/recorder/src/*"],
           "@trace/*": ["packages/trace/src/*"],
diff --git a/tests/webview2/globalSetup.ts b/tests/webview2/globalSetup.ts
index 030a10401ea6f..b1a8f9e41fc6e 100644
--- a/tests/webview2/globalSetup.ts
+++ b/tests/webview2/globalSetup.ts
@@ -26,13 +26,19 @@ export default async () => {
       WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS: `--remote-debugging-port=${cdpPort}`,
     }
   });
-  await new Promise<void>(resolve => spawnedProcess.stdout.on('data', (data: Buffer): void => {
-    if (data.toString().includes('WebView2 initialized'))
-      resolve();
-  }));
+  await new Promise<void>((resolve, reject) => {
+    spawnedProcess.on('error', error => {
+      reject(error);
+    });
+    spawnedProcess.stdout.on('data', (data: Buffer): void => {
+      if (data.toString().includes('WebView2 initialized'))
+        resolve();
+    });
+  });
   const browser = await playwright.chromium.connectOverCDP(`http://127.0.0.1:${cdpPort}`);
   console.log(`Using version ${browser.version()} WebView2 runtime`);
   const page = browser.contexts()[0].pages()[0];
+  await page.waitForURL('about:blank');
   await page.goto('data:text/html,');
   const chromeVersion = await page.evaluate(() => navigator.userAgent.match(/Chrome\/(.*?) /)[1]);
   process.env.PWTEST_WEBVIEW2_CHROMIUM_VERSION = chromeVersion;
diff --git a/tests/webview2/playwright.config.ts b/tests/webview2/playwright.config.ts
index 75ba2ad779ee0..3feb25792cfa8 100644
--- a/tests/webview2/playwright.config.ts
+++ b/tests/webview2/playwright.config.ts
@@ -16,6 +16,7 @@
 
 import { config as loadEnv } from 'dotenv';
 loadEnv({ path: path.join(__dirname, '..', '..', '.env') });
+process.env.PWTEST_UNDER_TEST = '1';
 
 import type { Config, PlaywrightTestOptions, PlaywrightWorkerOptions } from '@playwright/test';
 import * as path from 'path';
diff --git a/tests/webview2/webView2Test.ts b/tests/webview2/webView2Test.ts
index dcadcebe6d372..49837c6f1e9d0 100644
--- a/tests/webview2/webView2Test.ts
+++ b/tests/webview2/webView2Test.ts
@@ -32,6 +32,7 @@ export const webView2Test = baseTest.extend<TraceViewerFixtures>(traceViewerFixt
   isElectron: [false, { scope: 'worker' }],
   electronMajorVersion: [0, { scope: 'worker' }],
   isWebView2: [true, { scope: 'worker' }],
+  isHeadlessShell: [false, { scope: 'worker' }],
 
   browser: [async ({ playwright }, use, testInfo) => {
     const cdpPort = 10000 + testInfo.workerIndex;
@@ -40,7 +41,7 @@ export const webView2Test = baseTest.extend<TraceViewerFixtures>(traceViewerFixt
       shell: true,
       env: {
         ...process.env,
-        WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS: `--remote-debugging-port=${cdpPort} ${chromiumSwitches.join(' ')}`,
+        WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS: `--remote-debugging-port=${cdpPort} ${chromiumSwitches().join(' ')}`,
         WEBVIEW2_USER_DATA_FOLDER: path.join(fs.realpathSync.native(os.tmpdir()), `playwright-webview2-tests/user-data-dir-${testInfo.workerIndex}`),
       }
     });
diff --git a/tests/webview2/webview2-app/webview2.csproj b/tests/webview2/webview2-app/webview2.csproj
index 84849567c4c66..2c914444c63a9 100644
--- a/tests/webview2/webview2-app/webview2.csproj
+++ b/tests/webview2/webview2-app/webview2.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3240.44" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index acb0e0d63deb5..1fb09a13a00b4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,7 @@
          - .../lib/* means require dependency
       */
       "@html-reporter/*": ["./packages/html-reporter/src/*"],
-      "@injected/*": ["./packages/playwright-core/src/server/injected/*"],
+      "@injected/*": ["./packages/injected/src/*"],
       "@isomorphic/*": ["./packages/playwright-core/src/utils/isomorphic/*"],
       "@protocol/*": ["./packages/protocol/src/*"],
       "@recorder/*": ["./packages/recorder/src/*"],
diff --git a/utils/avd_install.sh b/utils/avd_install.sh
index 6beb8bf43f846..a0586d6936e4a 100755
--- a/utils/avd_install.sh
+++ b/utils/avd_install.sh
@@ -24,7 +24,7 @@ echo Installing emulator...
 yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator
 
 echo Installing platform SDK...
-yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33"
+yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-35"
 
 echo Starting ADB...
 ${ANDROID_HOME}/platform-tools/adb devices
diff --git a/utils/avd_recreate.sh b/utils/avd_recreate.sh
index 0877e76ed1630..81c348490725b 100755
--- a/utils/avd_recreate.sh
+++ b/utils/avd_recreate.sh
@@ -13,7 +13,7 @@ if [[ "$(uname -m)" == "arm64" ]]; then
     ANDROID_ARCH="arm64-v8a"
 fi
 
-${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android33 || true
-yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-33;google_apis;$ANDROID_ARCH" platform-tools emulator
-echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android33 --device "Nexus 5X" --package "system-images;android-33;google_apis;$ANDROID_ARCH"
+${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android35 || true
+yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-35;google_apis;$ANDROID_ARCH" platform-tools emulator
+echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android35 --device "Nexus 5X" --package "system-images;android-35;google_apis;$ANDROID_ARCH"
 ${ANDROID_HOME}/emulator/emulator -list-avds
diff --git a/utils/avd_start.sh b/utils/avd_start.sh
index 67acb1c63e1c9..1c3bc53418338 100755
--- a/utils/avd_start.sh
+++ b/utils/avd_start.sh
@@ -9,15 +9,15 @@ fi
 bash $PWD/utils/avd_stop.sh
 
 echo "Starting emulator"
-# nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -gpu swiftshader &
-nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -no-audio -no-window -no-boot-anim -no-snapshot &
+# nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -gpu swiftshader &
+nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -no-audio -no-window -no-boot-anim -no-snapshot &
 ${ANDROID_HOME}/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
 ${ANDROID_HOME}/platform-tools/adb devices
 echo "Emulator started"
 
 echo "Installing Chromium WebView"
 # See here for the latest revision: https://storage.googleapis.com/chromium-browser-snapshots/Android/LAST_CHANGE
-CHROMIUM_ANDROID_REVISION="1190572"
+CHROMIUM_ANDROID_REVISION="1340145"
 WEBVIEW_TMP_DIR="$(mktemp -d)"
 WEBVIEW_TMP_FILE="$WEBVIEW_TMP_DIR/chrome-android-zip"
 curl -s -o "${WEBVIEW_TMP_FILE}" "https://storage.googleapis.com/chromium-browser-snapshots/Android/${CHROMIUM_ANDROID_REVISION}/chrome-android.zip"
diff --git a/utils/build/build-playwright-driver.sh b/utils/build/build-playwright-driver.sh
index 7aaee25b62af1..35cff644fd4b6 100755
--- a/utils/build/build-playwright-driver.sh
+++ b/utils/build/build-playwright-driver.sh
@@ -4,7 +4,7 @@ set -x
 
 trap "cd $(pwd -P)" EXIT
 SCRIPT_PATH="$(cd "$(dirname "$0")" ; pwd -P)"
-NODE_VERSION="20.16.0" # autogenerated via ./update-playwright-driver-version.mjs
+NODE_VERSION="22.18.0" # autogenerated via ./update-playwright-driver-version.mjs
 
 cd "$(dirname "$0")"
 PACKAGE_VERSION=$(node -p "require('../../package.json').version")
@@ -31,7 +31,7 @@ function build {
   mkdir -p ./output/playwright-${SUFFIX}
   tar -xzf ./output/playwright-core.tgz -C ./output/playwright-${SUFFIX}/
 
-  curl ${NODE_URL} -o ./output/${NODE_DIR}.${ARCHIVE}
+  curl --retry 10 --retry-all-errors ${NODE_URL} -o ./output/${NODE_DIR}.${ARCHIVE}
   NPM_PATH=""
   if [[ "${ARCHIVE}" == "zip" ]]; then
     cd ./output
@@ -52,7 +52,7 @@ function build {
   cp ./output/api.json ./output/playwright-${SUFFIX}/package/
   cp ./output/protocol.yml ./output/playwright-${SUFFIX}/package/
   cd ./output/playwright-${SUFFIX}/package
-  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 node "../../${NODE_DIR}/${NPM_PATH}" install --production --ignore-scripts
+  PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 node "../../${NODE_DIR}/${NPM_PATH}" install --omit=dev --ignore-scripts
   rm package-lock.json
 
   cd ..
@@ -71,3 +71,4 @@ build "node-v${NODE_VERSION}-darwin-arm64" "mac-arm64" "tar.gz"
 build "node-v${NODE_VERSION}-linux-x64" "linux" "tar.gz"
 build "node-v${NODE_VERSION}-linux-arm64" "linux-arm64" "tar.gz"
 build "node-v${NODE_VERSION}-win-x64" "win32_x64" "zip"
+build "node-v${NODE_VERSION}-win-arm64" "win32_arm64" "zip"
diff --git a/utils/build/build.js b/utils/build/build.js
index 56442c094847b..37ea64d3920e2 100644
--- a/utils/build/build.js
+++ b/utils/build/build.js
@@ -21,17 +21,7 @@ const path = require('path');
 const chokidar = require('chokidar');
 const fs = require('fs');
 const { workspace } = require('../workspace');
-
-/**
- * @typedef {{
- *   command: string,
- *   args: string[],
- *   shell: boolean,
- *   env?: NodeJS.ProcessEnv,
- *   cwd?: string,
- *   concurrent?: boolean,
- * }} Step
- */
+const { build, context } = require('esbuild');
 
 /**
  * @typedef {{
@@ -46,13 +36,29 @@ const { workspace } = require('../workspace');
  * @typedef {{
  *   inputs: string[],
  *   mustExist?: string[],
- *   script?: string,
- *   command?: string,
- *   args?: string[],
  *   cwd?: string,
- * }} OnChange
+ * }} BaseOnChange
+ */
+
+/**
+ * @typedef {BaseOnChange & {
+ *   command: string,
+ *   args?: string[],
+ * }} CommandOnChange
  */
 
+/**
+ * @typedef {BaseOnChange & {
+ *   script: string,
+ * }} ScriptOnChange
+ */
+
+/**
+ * @typedef {CommandOnChange|ScriptOnChange} OnChange
+ */
+
+/** @type {(() => void)[]} */
+const disposables = [];
 /** @type {Step[]} */
 const steps = [];
 /** @type {OnChange[]} */
@@ -61,8 +67,8 @@ const onChanges = [];
 const copyFiles = [];
 
 const watchMode = process.argv.slice(2).includes('--watch');
-const lintMode = process.argv.slice(2).includes('--lint');
-const withSourceMaps = process.argv.slice(2).includes('--sourcemap') || watchMode;
+const withSourceMaps = watchMode;
+const disableInstall = process.argv.slice(2).includes('--disable-install');
 const ROOT = path.join(__dirname, '..', '..');
 
 /**
@@ -81,22 +87,73 @@ function quotePath(path) {
   return "\"" + path + "\"";
 }
 
+class Step {
+  /**
+   * @param {{
+   *   concurrent?: boolean,
+   * }} options
+   */
+  constructor(options) {
+    this.concurrent = options.concurrent;
+  }
+
+  async run() {
+    throw new Error('Not implemented');
+  }
+}
+
+class ProgramStep extends Step {
+  /**
+   * @param {{
+   *   command: string,
+   *   args: string[],
+   *   shell: boolean,
+   *   env?: NodeJS.ProcessEnv,
+   *   cwd?: string,
+   *   concurrent?: boolean,
+   * }} options
+   */
+  constructor(options) {
+    super(options);
+    this._options = options;
+  }
+
+  /** @override */
+  async run() {
+    const step = this._options;
+    console.log(`==== Running ${step.command} ${step.args.join(' ')} in ${step.cwd || process.cwd()}`);
+    const child = child_process.spawn(step.command, step.args, {
+      stdio: 'inherit',
+      shell: step.shell,
+      env: {
+        ...process.env,
+        ...step.env
+      },
+      cwd: step.cwd,
+    });
+    disposables.push(() => {
+      if (child.exitCode === null)
+        child.kill();
+    });
+    return new Promise((resolve, reject) => {
+      child.on('close', (code, signal) => {
+        if (code || signal)
+          reject(new Error(`'${step.command} ${step.args.join(' ')}' exited with code ${code}, signal ${signal}`));
+        else
+          resolve({ });
+      });
+    });
+  }
+}
+
 /**
- * @param {Step} step
+ * @param {OnChange} onChange
  */
-function runStep(step) {
-  console.log(`==== Running ${step.command} ${step.args.join(' ')} in ${step.cwd || process.cwd()}`);
-  const out = child_process.spawnSync(step.command, step.args, {
-    stdio: 'inherit',
-    shell: step.shell,
-    env: {
-      ...process.env,
-      ...step.env
-    },
-    cwd: step.cwd,
-  });
-  if (out.status)
-    process.exit(out.status);
+async function runOnChangeStep(onChange) {
+  const step = ('script' in onChange)
+    ? new ProgramStep({ command: 'node', args: [filePath(onChange.script)], shell: false })
+    : new ProgramStep({ command: onChange.command, args: onChange.args || [], shell: true, cwd: onChange.cwd });
+  await step.run();
 }
 
 async function runWatch() {
@@ -111,10 +168,7 @@ async function runWatch() {
         if (!fs.existsSync(filePath(fileMustExist)))
           return;
       }
-      if (onChange.script)
-        child_process.spawnSync('node', [onChange.script], { stdio: 'inherit' });
-      else
-        child_process.spawnSync(onChange.command, onChange.args || [], { stdio: 'inherit', cwd: onChange.cwd, shell: true });
+      runOnChangeStep(onChange).catch(e => console.error(e));
     }
     // chokidar will report all files as added in a sync loop, throttle those.
     const reschedule = () => {
@@ -135,25 +189,13 @@ async function runWatch() {
 
   for (const step of steps) {
     if (!step.concurrent)
-      runStep(step);
+      await step.run();
   }
 
-  /** @type{import('child_process').ChildProcess[]} */
-  const spawns = [];
   for (const step of steps) {
-    if (!step.concurrent)
-      continue;
-    spawns.push(child_process.spawn(step.command, step.args, {
-      stdio: 'inherit',
-      shell: step.shell,
-      env: {
-        ...process.env,
-        ...step.env,
-      },
-      cwd: step.cwd,
-    }));
+    if (step.concurrent)
+      step.run().catch(e => console.error(e));
   }
-  process.on('exit', () => spawns.forEach(s => s.kill()));
   for (const onChange of onChanges)
     runOnChange(onChange);
 }
@@ -170,13 +212,9 @@ async function runBuild() {
     watcher.close();
   }
   for (const step of steps)
-    runStep(step);
-  for (const onChange of onChanges) {
-    if (onChange.script)
-      runStep({ command: 'node', args: [filePath(onChange.script)], shell: false });
-    else
-      runStep({ command: onChange.command, args: onChange.args, shell: true, cwd: onChange.cwd });
-  }
+    await step.run();
+  for (const onChange of onChanges)
+    runOnChangeStep(onChange);
 }
 
 /**
@@ -190,130 +228,378 @@ function copyFile(file, from, to) {
   fs.copyFileSync(file, destination);
 }
 
+/**
+ * @typedef {{
+ *   modulePath: string,
+ *   entryPoints: string[],
+ *   external?: string[],
+ *   outdir?: string,
+ *   outfile?: string,
+ *   minify?: boolean,
+ * }} BundleOptions
+ */
+
+/** @type {BundleOptions[]} */
 const bundles = [];
-for (const pkg of workspace.packages()) {
-  const bundlesDir = path.join(pkg.path, 'bundles');
-  if (!fs.existsSync(bundlesDir))
-    continue;
-  for (const bundle of fs.readdirSync(bundlesDir)) {
-    if (fs.existsSync(path.join(bundlesDir, bundle, 'package.json')))
-      bundles.push(path.join(bundlesDir, bundle));
+
+bundles.push({
+  modulePath: 'packages/playwright/bundles/babel',
+  outdir: 'packages/playwright/lib/transform',
+  entryPoints: ['src/babelBundleImpl.ts'],
+  external: ['playwright'],
+});
+
+bundles.push({
+  modulePath: 'packages/playwright/bundles/expect',
+  outdir: 'packages/playwright/lib/common',
+  entryPoints: ['src/expectBundleImpl.ts'],
+});
+
+bundles.push({
+  modulePath: 'packages/playwright/bundles/mcp',
+  outdir: 'packages/playwright/lib',
+  entryPoints: ['src/mcpBundleImpl.ts'],
+  external: ['express'],
+});
+
+bundles.push({
+  modulePath: 'packages/playwright/bundles/utils',
+  outdir: 'packages/playwright/lib',
+  entryPoints: ['src/utilsBundleImpl.ts'],
+  external: ['fsevents'],
+});
+
+bundles.push({
+  modulePath: 'packages/playwright-core/bundles/utils',
+  outfile: 'packages/playwright-core/lib/utilsBundleImpl/index.js',
+  entryPoints: ['src/utilsBundleImpl.ts'],
+});
+
+bundles.push({
+  modulePath: 'packages/playwright-core/bundles/zip',
+  outdir: 'packages/playwright-core/lib',
+  entryPoints: ['src/zipBundleImpl.ts'],
+});
+
+
+// @playwright/client
+bundles.push({
+  modulePath: 'packages/playwright-client',
+  outdir: 'packages/playwright-client/lib',
+  entryPoints: ['src/index.ts'],
+  minify: false,
+});
+
+class GroupStep extends Step {
+  /** @param {Step[]} steps */
+  constructor(steps) {
+    super({ concurrent: false });
+    this._steps = steps;
+    if (steps.some(s => !s.concurrent))
+      throw new Error('Composite step cannot contain non-concurrent steps');
+  }
+  async run() {
+    console.log('==== Starting parallel group');
+    const start = Date.now();
+    await Promise.all(this._steps.map(step => step.run()));
+    console.log('==== Parallel group finished in', Date.now() - start, 'ms');
   }
 }
 
+/** @type {Step[]} */
+const updateSteps = [];
+
 // Update test runner.
-steps.push({
+updateSteps.push(new ProgramStep({
   command: 'npm',
   args: ['ci', '--save=false', '--fund=false', '--audit=false'],
   shell: true,
   cwd: path.join(__dirname, '..', '..', 'tests', 'playwright-test', 'stable-test-runner'),
-});
+  concurrent: true,
+}));
 
 // Update bundles.
 for (const bundle of bundles) {
-  steps.push({
+  // Do not update @playwright/client, it has not its own deps.
+  if (bundle.modulePath === 'packages/playwright-client')
+    continue;
+
+  const packageJson = path.join(filePath(bundle.modulePath), 'package.json');
+  if (!fs.existsSync(packageJson))
+    throw new Error(`${packageJson} does not exist`);
+  updateSteps.push(new ProgramStep({
     command: 'npm',
     args: ['ci', '--save=false', '--fund=false', '--audit=false', '--omit=optional'],
     shell: true,
-    cwd: bundle,
-  });
+    cwd: filePath(bundle.modulePath),
+    concurrent: true,
+  }));
 }
 
+steps.push(new GroupStep(updateSteps));
+
 // Generate third party licenses for bundles.
-steps.push({
+steps.push(new ProgramStep({
   command: 'node',
   args: [path.resolve(__dirname, '../generate_third_party_notice.js')],
   shell: true,
-});
+}));
 
 // Build injected icons.
-steps.push({
+steps.push(new ProgramStep({
   command: 'node',
   args: ['utils/generate_clip_paths.js'],
   shell: true,
-});
+}));
 
 // Build injected scripts.
-steps.push({
+steps.push(new ProgramStep({
   command: 'node',
   args: ['utils/generate_injected.js'],
   shell: true,
-});
+}));
+
+class EsbuildStep extends Step {
+  /** @type {import('esbuild').BuildOptions} */
+  constructor(options) {
+    // Starting esbuild steps in parallel showed longer overall time.
+    super({ concurrent: false });
+    this._options = options;
+  }
 
-// Run Babel.
+  /** @override */
+  async run() {
+    if (watchMode) {
+      await this._ensureWatching();
+    } else {
+      console.log('==== Running esbuild:', this._relativeEntryPoints().join(', '));
+      const start = Date.now();
+      await build(this._options);
+      console.log('==== Done in', Date.now() - start, 'ms');
+    }
+  }
+
+  async _ensureWatching() {
+    const start = Date.now();
+    if (this._context)
+      return;
+    this._context = await context(this._options);
+    disposables.push(() => this._context?.dispose());
+
+    const watcher = chokidar.watch(this._options.entryPoints);
+    await new Promise(x => watcher.once('ready', x));
+    watcher.on('all', () => this._rebuild());
+
+    await this._rebuild();
+    console.log('==== Esbuild watching:', this._relativeEntryPoints().join(', '), `(started in ${Date.now() - start}ms)`);
+  }
+
+  async _rebuild() {
+    if (this._rebuilding) {
+      this._sourcesChanged = true;
+      return;
+    }
+    do {
+      this._sourcesChanged = false;
+      this._rebuilding = true;
+      try {
+        await this._context?.rebuild();
+      } catch (e) {
+        // Ignore. Esbuild inherits stderr and already logs nicely formatted errors
+        // before throwing.
+      }
+
+      this._rebuilding = false;
+    } while (this._sourcesChanged);
+  }
+
+  _relativeEntryPoints() {
+    return this._options.entryPoints.map(e => path.relative(ROOT, e));
+  }
+}
+
+class CustomCallbackStep extends Step {
+  constructor(callback) {
+    super({ concurrent: false });
+    this._callback = callback;
+  }
+
+  async run() {
+    await this._callback();
+  }
+}
+
+// Run esbuild.
 for (const pkg of workspace.packages()) {
   if (!fs.existsSync(path.join(pkg.path, 'src')))
     continue;
-  steps.push({
-    command: 'npx',
-    args: [
-      'babel',
-      ...(watchMode ? ['-w'] : []),
-      ...(withSourceMaps ? ['--source-maps'] : []),
-      '--extensions', '.ts',
-      '--out-dir', quotePath(path.join(pkg.path, 'lib')),
-      '--ignore', '"packages/playwright-core/src/server/injected/**/*"',
-      quotePath(path.join(pkg.path, 'src')),
-    ],
-    shell: true,
-    concurrent: true,
-  });
+  // playwright-client is built as a bundle.
+  if (['@playwright/client'].includes(pkg.name))
+    continue;
+
+  steps.push(new EsbuildStep({
+    entryPoints: [path.join(pkg.path, 'src/**/*.ts')],
+    outdir: `${path.join(pkg.path, 'lib')}`,
+    sourcemap: withSourceMaps ? 'linked' : false,
+    platform: 'node',
+    format: 'cjs',
+  }));
+}
+
+function copyXdgOpen() {
+  const outdir = filePath('packages/playwright-core/lib/utilsBundleImpl');
+  if (!fs.existsSync(outdir))
+    fs.mkdirSync(outdir, { recursive: true });
+
+  // 'open' package requires 'xdg-open' binary to be present, which does not get bundled by esbuild.
+  fs.copyFileSync(filePath('packages/playwright-core/bundles/utils/node_modules/open/xdg-open'), path.join(outdir, 'xdg-open'));
+  console.log('==== Copied xdg-open to', path.join(outdir, 'xdg-open'));
 }
 
+// Copy xdg-open after bundles 'npm ci' has finished.
+steps.push(new CustomCallbackStep(copyXdgOpen));
+
+function pkgNameFromPath(p) {
+  const i = p.split(path.sep);
+  const nm = i.lastIndexOf('node_modules');
+  if (nm === -1 || nm + 1 >= i.length) return null;
+  const first = i[nm + 1];
+  if (first.startsWith('@')) return nm + 2 < i.length ? `${first}/${i[nm + 2]}` : null;
+  return first;
+}
+
+const pkgSizePlugin = {
+  name: 'pkg-size',
+  setup(build) {
+    build.onEnd(async (result) => {
+      if (!result.metafile) return;
+      const totals = new Map();
+      for (const out of Object.values(result.metafile.outputs)) {
+        for (const [inFile, meta] of Object.entries(out.inputs)) {
+          const pkg = pkgNameFromPath(inFile);
+          if (!pkg) continue;
+          totals.set(pkg, (totals.get(pkg) || 0) + (meta.bytesInOutput || 0));
+        }
+      }
+      const sorted = [...totals.entries()].sort((a, b) => b[1] - a[1]);
+      const sum = sorted.reduce((s, [, v]) => s + v, 0) || 1;
+      console.log('\nPackage contribution to bundle:');
+      for (const [pkg, bytes] of sorted.slice(0, 30)) {
+        const pct = ((bytes / sum) * 100).toFixed(2);
+        console.log(`${pkg.padEnd(30)} ${(bytes / 1024).toFixed(1)} KB  ${pct}%`);
+      }
+    });
+  },
+};
+
 // Build/watch bundles.
 for (const bundle of bundles) {
-  steps.push({
-    command: 'npm',
+  /** @type {import('esbuild').BuildOptions} */
+  const options = {
+    bundle: true,
+    format: 'cjs',
+    platform: 'node',
+    target: 'ES2019',
+    sourcemap: watchMode,
+    minify: !watchMode,
+
+    entryPoints: bundle.entryPoints.map(e => path.join(filePath(bundle.modulePath), e)),
+    ...(bundle.outdir ? { outdir: filePath(bundle.outdir) } : {}),
+    ...(bundle.outfile ? { outfile: filePath(bundle.outfile) } : {}),
+    ...(bundle.external ? { external: bundle.external } : {}),
+    ...(bundle.minify !== undefined ? { minify: bundle.minify } : {}),
+    metafile: true,
+    plugins: [pkgSizePlugin],
+  };
+  steps.push(new EsbuildStep(options));
+}
+
+// Build/watch trace viewer service worker.
+steps.push(new ProgramStep({
+  command: 'npx',
+  args: [
+    'vite',
+    '--config',
+    'vite.sw.config.ts',
+    'build',
+    ...(watchMode ? ['--watch', '--minify=false'] : []),
+    ...(withSourceMaps ? ['--sourcemap=inline'] : []),
+  ],
+  shell: true,
+  cwd: path.join(__dirname, '..', '..', 'packages', 'trace-viewer'),
+  concurrent: watchMode, // feeds into trace-viewer's `public` directory, so it needs to be finished before trace-viewer build starts
+}));
+
+if (watchMode) {
+  // the build above outputs into `packages/trace-viewer/public`, where the `vite build` for `packages/trace-viewer` is supposed to pick it up.
+  // there's a bug in `vite build --watch` though where the public dir is only copied over initially, but its not watched.
+  // to work around this, we run a second watch build of the service worker into the final output.
+  // bug: https://github.com/vitejs/vite/issues/18655
+  steps.push(new ProgramStep({
+    command: 'npx',
     args: [
-      'run',
-      watchMode ? 'watch' : 'build',
-      ...(withSourceMaps ? ['--', '--sourcemap'] : [])
+      'vite', '--config', 'vite.sw.config.ts',
+      'build', '--watch', '--minify=false',
+      '--outDir', path.join(__dirname, '..', '..', 'packages', 'playwright-core', 'lib', 'vite', 'traceViewer'),
+      '--emptyOutDir=false',
+      '--clearScreen=false',
     ],
     shell: true,
-    cwd: bundle,
-    concurrent: true,
-  });
+    cwd: path.join(__dirname, '..', '..', 'packages', 'trace-viewer'),
+    concurrent: true
+  }));
 }
 
 // Build/watch web packages.
 for (const webPackage of ['html-reporter', 'recorder', 'trace-viewer']) {
-  steps.push({
+  steps.push(new ProgramStep({
     command: 'npx',
     args: [
       'vite',
       'build',
       ...(watchMode ? ['--watch', '--minify=false'] : []),
-      ...(withSourceMaps ? ['--sourcemap'] : []),
+      ...(withSourceMaps ? ['--sourcemap=inline'] : []),
+      '--clearScreen=false',
     ],
     shell: true,
     cwd: path.join(__dirname, '..', '..', 'packages', webPackage),
     concurrent: true,
-  });
+  }));
 }
-// Build/watch trace viewer service worker.
-steps.push({
-  command: 'npx',
-  args: [
-    'vite',
-    '--config',
-    'vite.sw.config.ts',
-    'build',
-    ...(watchMode ? ['--watch', '--minify=false'] : []),
-    ...(withSourceMaps ? ['--sourcemap'] : []),
-  ],
-  shell: true,
-  cwd: path.join(__dirname, '..', '..', 'packages', 'trace-viewer'),
-  concurrent: true,
-});
 
+// web packages dev server
+if (watchMode) {
+  steps.push(new ProgramStep({
+    command: 'npx',
+    args: ['vite', '--port', '44223', '--base', '/trace/', '--clearScreen=false'],
+    shell: true,
+    cwd: path.join(__dirname, '..', '..', 'packages', 'trace-viewer'),
+    concurrent: true,
+  }));
+  steps.push(new ProgramStep({
+    command: 'npx',
+    args: ['vite', '--port', '44224', '--clearScreen=false'],
+    shell: true,
+    cwd: path.join(__dirname, '..', '..', 'packages', 'html-reporter'),
+    concurrent: true,
+  }));
+  steps.push(new ProgramStep({
+    command: 'npx',
+    args: ['vite', '--port', '44225', '--clearScreen=false'],
+    shell: true,
+    cwd: path.join(__dirname, '..', '..', 'packages', 'recorder'),
+    concurrent: true,
+  }));
+}
 
 // Generate injected.
 onChanges.push({
   inputs: [
-    'packages/playwright-core/src/server/injected/**',
+    'packages/injected/src/**',
     'packages/playwright-core/src/third_party/**',
     'packages/playwright-ct-core/src/injected/**',
     'packages/playwright-core/src/utils/isomorphic/**',
+    'utils/generate_injected_builtins.js',
     'utils/generate_injected.js',
   ],
   script: 'utils/generate_injected.js',
@@ -345,6 +631,15 @@ onChanges.push({
   script: 'utils/generate_types/index.js',
 });
 
+if (watchMode && !disableInstall) {
+  // Keep browser installs up to date.
+  onChanges.push({
+    inputs: ['packages/playwright-core/browsers.json'],
+    command: 'npx',
+    args: ['playwright', 'install'],
+  });
+}
+
 // The recorder and trace viewer have an app_icon.png that needs to be copied.
 copyFiles.push({
   files: 'packages/playwright-core/src/server/chromium/*.png',
@@ -352,7 +647,7 @@ copyFiles.push({
   to: 'packages/playwright-core/lib',
 });
 
-// Babel doesn't touch JS files, so copy them manually.
+// esbuild doesn't touch JS files, so copy them manually.
 // For example: diff_match_patch.js
 copyFiles.push({
   files: 'packages/playwright-core/src/**/*.js',
@@ -361,7 +656,7 @@ copyFiles.push({
   ignored: ['**/.eslintrc.js', '**/injected/**/*']
 });
 
-// Sometimes we require JSON files that babel ignores.
+// Sometimes we require JSON files that esbuild ignores.
 // For example, deviceDescriptorsSource.json
 copyFiles.push({
   files: 'packages/playwright-core/src/**/*.json',
@@ -370,22 +665,42 @@ copyFiles.push({
   to: 'packages/playwright-core/lib',
 });
 
-if (lintMode) {
+if (watchMode) {
   // Run TypeScript for type checking.
-  steps.push({
+  steps.push(new ProgramStep({
     command: 'npx',
-    args: ['tsc', ...(watchMode ? ['-w'] : []), '-p', quotePath(filePath('.'))],
+    args: ['tsc', ...(watchMode ? ['-w'] : []), '--preserveWatchOutput', '-p', quotePath(filePath('.'))],
     shell: true,
     concurrent: true,
-  });
+  }));
   for (const webPackage of ['html-reporter', 'recorder', 'trace-viewer']) {
-    steps.push({
+    steps.push(new ProgramStep({
       command: 'npx',
-      args: ['tsc', ...(watchMode ? ['-w'] : []), '-p', quotePath(filePath(`packages/${webPackage}`))],
+      args: ['tsc', ...(watchMode ? ['-w'] : []), '--preserveWatchOutput', '-p', quotePath(filePath(`packages/${webPackage}`))],
       shell: true,
       concurrent: true,
-    });
+    }));
   }
 }
 
+let cleanupCalled = false;
+function cleanup() {
+  if (cleanupCalled)
+    return;
+  cleanupCalled = true;
+  for (const disposable of disposables) {
+    try {
+      disposable();
+    } catch (e) {
+      console.error('Error during cleanup:', e);
+    }
+  }
+}
+process.on('exit', cleanup);
+process.on('SIGINT', () => {
+  cleanup();
+  process.exit(0);
+});
+
+
 watchMode ? runWatch() : runBuild();
diff --git a/utils/build/deploy-trace-viewer.sh b/utils/build/deploy-trace-viewer.sh
index 2351dbb4a0c47..58ef55ce8e860 100755
--- a/utils/build/deploy-trace-viewer.sh
+++ b/utils/build/deploy-trace-viewer.sh
@@ -27,9 +27,9 @@ npm ci
 npm run build
 
 # 2. Configure Git and clone the Trace Viewer repository
-git config --global user.name github-actions
-git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
-git clone "https://${GH_SERVICE_ACCOUNT_TOKEN}@github.com/microsoft/trace.playwright.dev.git" trace.playwright.dev
+git config --global user.name microsoft-playwright-automation[bot]
+git config --global user.email 203992400+microsoft-playwright-automation[bot]@users.noreply.github.com
+git clone "https://x-access-token:${GH_SERVICE_ACCOUNT_TOKEN}@github.com/microsoft/trace.playwright.dev.git" trace.playwright.dev
 
 # 3. Copy the built Trace Viewer to the repository
 if [[ "${RELEASE_CHANNEL}" == "--stable" ]]; then
diff --git a/utils/build/upload-playwright-driver.sh b/utils/build/upload-playwright-driver.sh
index 7309444e3abab..80d61cbab894c 100755
--- a/utils/build/upload-playwright-driver.sh
+++ b/utils/build/upload-playwright-driver.sh
@@ -8,8 +8,8 @@ cd "$(dirname "$0")"
 AZ_STORAGE_ACCOUNT="playwright2"
 PACKAGE_VERSION=$(node -p "require('../../package.json').version")
 
-az storage blob upload -c builds --auth-mode login --account-name ${AZ_STORAGE_ACCOUNT} -f ./output/playwright-${PACKAGE_VERSION}-mac.zip -n "${AZ_UPLOAD_FOLDER}/playwright-${PACKAGE_VERSION}-mac.zip"
-az storage blob upload -c builds --auth-mode login --account-name ${AZ_STORAGE_ACCOUNT} -f ./output/playwright-${PACKAGE_VERSION}-mac-arm64.zip -n "${AZ_UPLOAD_FOLDER}/playwright-${PACKAGE_VERSION}-mac-arm64.zip"
-az storage blob upload -c builds --auth-mode login --account-name ${AZ_STORAGE_ACCOUNT} -f ./output/playwright-${PACKAGE_VERSION}-linux.zip -n "${AZ_UPLOAD_FOLDER}/playwright-${PACKAGE_VERSION}-linux.zip"
-az storage blob upload -c builds --auth-mode login --account-name ${AZ_STORAGE_ACCOUNT} -f ./output/playwright-${PACKAGE_VERSION}-linux-arm64.zip -n "${AZ_UPLOAD_FOLDER}/playwright-${PACKAGE_VERSION}-linux-arm64.zip"
-az storage blob upload -c builds --auth-mode login --account-name ${AZ_STORAGE_ACCOUNT} -f ./output/playwright-${PACKAGE_VERSION}-win32_x64.zip -n "${AZ_UPLOAD_FOLDER}/playwright-${PACKAGE_VERSION}-win32_x64.zip"
+platforms=("mac" "mac-arm64" "linux" "linux-arm64" "win32_x64" "win32_arm64")
+
+for platform in "${platforms[@]}"; do
+    az storage blob upload -c builds --auth-mode login --account-name ${AZ_STORAGE_ACCOUNT} -f ./output/playwright-${PACKAGE_VERSION}-${platform}.zip -n "${AZ_UPLOAD_FOLDER}/playwright-${PACKAGE_VERSION}-${platform}.zip"
+done
diff --git a/utils/check_audit.js b/utils/check_audit.js
new file mode 100644
index 0000000000000..ed7573b01cf63
--- /dev/null
+++ b/utils/check_audit.js
@@ -0,0 +1,54 @@
+const { exec } = require('child_process');
+
+const URL_LIST = [
+  // Not encountered by Vite, thus we cannot hit it
+  'https://github.com/advisories/GHSA-67mh-4wv8-2f99'
+];
+
+const runNpmAudit = () => new Promise((resolve, reject) => {
+  exec('npm audit --omit dev --json', (error, stdout, stderr) => {
+    if (error && stderr) {
+      // npm audit returns a non-zero exit code if there are vulnerabilities
+      reject(`Audit error: ${error}\n${stdout}\n${stderr}`);
+      return;
+    }
+    resolve(stdout);
+  });
+});
+
+// interface Audit {
+//   [name: string]: AuditEntry;
+// }
+
+// interface AuditEntry {
+//   severity: string;
+//   range: string;
+//   via: Array<{
+//     url: string;
+//   } | string>;
+// }
+
+const checkAudit = async () => {
+  const audit = JSON.parse(await runNpmAudit());
+
+  const validVulnerabilities = Object.entries(audit.vulnerabilities).filter(([_name, entry]) => {
+    const originalVulnerabilities = entry.via.filter(viaEntry => typeof viaEntry === 'object' && !URL_LIST.includes(viaEntry.url));
+    return originalVulnerabilities.length > 0;
+  });
+
+  for (const [name, entry] of validVulnerabilities) {
+    console.error(`Vulnerability (${entry.severity}): ${name} ${entry.range}`);
+  }
+
+  if (validVulnerabilities.length > 0) {
+    process.exit(1);
+  }
+
+  console.log('No vulnerabilities found');
+};
+
+// You can manually run `npm audit --omit dev` to see the vulnerabilities in a human-friendly
+checkAudit().catch(error => {
+  console.error(error);
+  process.exit(1);
+});
diff --git a/utils/check_chromium_cdn.js b/utils/check_chromium_cdn.js
deleted file mode 100755
index c509624152dcd..0000000000000
--- a/utils/check_chromium_cdn.js
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env node
-/**
- * Copyright 2017 Google Inc. All rights reserved.
- *
- * 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.
- */
-
-const assert = require('assert');
-const https = require('https');
-const util = require('util');
-const URL = require('url');
-const SUPPORTER_PLATFORMS = ['linux', 'mac', 'win64'];
-
-const colors = {
-  reset: '\x1b[0m',
-  red: '\x1b[31m',
-  green: '\x1b[32m',
-  yellow: '\x1b[33m'
-};
-
-class Table {
-  /**
-     * @param {!Array<number>} columnWidths
-     */
-  constructor(columnWidths) {
-    this.widths = columnWidths;
-  }
-
-  /**
-     * @param {!Array<string>} values
-     */
-  drawRow(values) {
-    assert(values.length === this.widths.length);
-    let row = '';
-    for (let i = 0; i < values.length; ++i)
-      row += padCenter(values[i], this.widths[i]);
-    console.log(row);
-  }
-}
-
-if (process.argv.length === 2) {
-  checkOmahaProxyAvailability();
-  return;
-}
-if (process.argv.length !== 4) {
-  console.log(`
-  Usage: node check_revisions.js [fromRevision] [toRevision]
-
-This script checks availability of different prebuild chromium revisions.
-Running command without arguments will check against omahaproxy revisions.`);
-  return;
-}
-
-const fromRevision = parseInt(process.argv[2], 10);
-const toRevision = parseInt(process.argv[3], 10);
-checkRangeAvailability(fromRevision, toRevision, false /* stopWhenAllAvailable */);
-
-async function checkOmahaProxyAvailability() {
-  const lastchanged = (await Promise.all([
-    fetch('https://storage.googleapis.com/chromium-browser-snapshots/Mac/LAST_CHANGE'),
-    fetch('https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/LAST_CHANGE'),
-    fetch('https://storage.googleapis.com/chromium-browser-snapshots/Win/LAST_CHANGE'),
-    fetch('https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/LAST_CHANGE'),
-  ])).map(s => parseInt(s, 10));
-  const from = Math.max(...lastchanged);
-  checkRangeAvailability(from, 0, true /* stopWhenAllAvailable */);
-}
-
-/**
- * @param {number} fromRevision
- * @param {number} toRevision
- * @param {boolean} stopWhenAllAvailable
- */
-async function checkRangeAvailability(fromRevision, toRevision, stopWhenAllAvailable) {
-  const table = new Table([15, 7, 7, 7]);
-  table.drawRow([''].concat(SUPPORTER_PLATFORMS));
-  const inc = fromRevision < toRevision ? 1 : -1;
-  for (let revision = fromRevision; revision !== toRevision; revision += inc) {
-    const allAvailable = await checkAndDrawRevisionAvailability(table, 'chromium', revision);
-    if (allAvailable && stopWhenAllAvailable)
-      break;
-  }
-}
-
-async function canDownload(revision, platform) {
-  const serverHost = 'https://storage.googleapis.com';
-  const urlTemplate = new Map([
-    ['linux', '%s/chromium-browser-snapshots/Linux_x64/%d/chrome-linux.zip'],
-    ['mac', '%s/chromium-browser-snapshots/Mac/%d/chrome-mac.zip'],
-    ['win64', '%s/chromium-browser-snapshots/Win_x64/%d/chrome-win.zip'],
-  ]).get(platform);
-  assert(urlTemplate, `ERROR: Playwright does not support ${platform}`);
-  const url = util.format(urlTemplate, serverHost, revision);
-  return await headRequest(url);
-}
-
-/**
- * @param {!Table} table
- * @param {string} name
- * @param {number} revision
- * @return {boolean}
- */
-async function checkAndDrawRevisionAvailability(table, name, revision) {
-  const promises = SUPPORTER_PLATFORMS.map(platform => canDownload(revision, platform));
-  const availability = await Promise.all(promises);
-  const allAvailable = availability.every(e => !!e);
-  const values = [name + ' ' + (allAvailable ? colors.green + revision + colors.reset : revision)];
-  for (let i = 0; i < availability.length; ++i) {
-    const decoration = availability[i] ? '+' : '-';
-    const color = availability[i] ? colors.green : colors.red;
-    values.push(color + decoration + colors.reset);
-  }
-  table.drawRow(values);
-  return allAvailable;
-}
-
-/**
- * @param {string} url
- * @return {!Promise<?string>}
- */
-function fetch(url) {
-  let resolve;
-  const promise = new Promise(x => resolve = x);
-  https.get(url, response => {
-    if (response.statusCode !== 200) {
-      resolve(null);
-      return;
-    }
-    let body = '';
-    response.on('data', function(chunk){
-      body += chunk;
-    });
-    response.on('end', function(){
-      resolve(body);
-    });
-  }).on('error', function(e){
-    console.error('Error fetching json: ' + e);
-    resolve(null);
-  });
-  return promise;
-}
-
-/**
- * @param {number} size
- * @return {string}
- */
-function spaceString(size) {
-  return new Array(size).fill(' ').join('');
-}
-
-/**
- * @param {string} text
- * @return {string}
- */
-function filterOutColors(text) {
-  for (const colorName in colors) {
-    const color = colors[colorName];
-    text = text.replace(color, '');
-  }
-  return text;
-}
-
-/**
- * @param {string} text
- * @param {number} length
- * @return {string}
- */
-function padCenter(text, length) {
-  const printableCharacters = filterOutColors(text);
-  if (printableCharacters.length >= length)
-    return text;
-  const left = Math.floor((length - printableCharacters.length) / 2);
-  const right = Math.ceil((length - printableCharacters.length) / 2);
-  return spaceString(left) + text + spaceString(right);
-}
-
-async function headRequest(url) {
-  return new Promise(resolve => {
-    let options = URL.parse(url);
-    options.method = 'HEAD';
-    const request = https.request(options, res => resolve(res.statusCode === 200));
-    request.on('error', error => resolve(false));
-    request.end();
-  });
-}
-
diff --git a/utils/check_deps.js b/utils/check_deps.js
index fcfb278a18dfe..4a14aad61655e 100644
--- a/utils/check_deps.js
+++ b/utils/check_deps.js
@@ -27,11 +27,11 @@ const packagesDir = path.resolve(path.join(__dirname, '..', 'packages'));
 
 const packages = new Map();
 packages.set('web', packagesDir + '/web/src/');
-packages.set('injected', packagesDir + '/playwright-core/src/server/injected/');
+packages.set('injected', packagesDir + '/injected/src/');
 packages.set('isomorphic', packagesDir + '/playwright-core/src/utils/isomorphic/');
 packages.set('testIsomorphic', packagesDir + '/playwright/src/isomorphic/');
 
-const peerDependencies = ['electron', 'react', 'react-dom', '@zip.js/zip.js'];
+const peerDependencies = ['electron', 'react', 'react-dom', 'react-dom/client', '@zip.js/zip.js'];
 
 const depsCache = {};
 
@@ -43,6 +43,7 @@ async function checkDeps() {
   await innerCheckDeps(path.join(packagesDir, 'trace-viewer'));
   await innerCheckDeps(path.join(packagesDir, 'trace'));
   await innerCheckDeps(path.join(packagesDir, 'web'));
+  await innerCheckDeps(path.join(packagesDir, 'injected'));
 
   const corePackageJson = await innerCheckDeps(path.join(packagesDir, 'playwright-core'));
   const playwrightPackageJson = await innerCheckDeps(path.join(packagesDir, 'playwright'));
@@ -79,7 +80,7 @@ async function innerCheckDeps(root) {
   });
   const sourceFiles = program.getSourceFiles();
   const errors = [];
-  sourceFiles.filter(x => !x.fileName.includes('node_modules')).map(x => visit(x, x.fileName, x.getFullText()));
+  sourceFiles.filter(x => !x.fileName.includes(path.sep + 'node_modules' + path.sep) && !x.fileName.includes(path.sep + 'bundles' + path.sep)).map(x => visit(x, x.fileName, x.getFullText()));
 
   if (errors.length) {
     for (const error of errors)
@@ -244,7 +245,7 @@ async function innerCheckDeps(root) {
 function listAllFiles(dir) {
   const dirs = fs.readdirSync(dir, { withFileTypes: true });
   const result = [];
-  dirs.map(d => {
+  dirs.forEach(d => {
     const res = path.resolve(dir, d.name);
     if (d.isDirectory())
       result.push(...listAllFiles(res));
diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal
deleted file mode 100644
index cd1d1d7c6e045..0000000000000
--- a/utils/docker/Dockerfile.focal
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM ubuntu:focal
-
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TZ=America/Los_Angeles
-ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright:v%version%-focal"
-
-ENV LANG=C.UTF-8
-ENV LC_ALL=C.UTF-8
-
-# === INSTALL Node.js ===
-
-RUN apt-get update && \
-    # Install Node.js
-    apt-get install -y curl wget gpg ca-certificates && \
-    mkdir -p /etc/apt/keyrings && \
-    curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \
-    apt-get update && \
-    apt-get install -y nodejs && \
-    # Feature-parity with node.js base images.
-    apt-get install -y --no-install-recommends git openssh-client && \
-    npm install -g yarn && \
-    # clean apt cache
-    rm -rf /var/lib/apt/lists/* && \
-    # Create the pwuser
-    adduser pwuser
-
-# === BAKE BROWSERS INTO IMAGE ===
-
-ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
-
-# 1. Add tip-of-tree Playwright package to install its browsers.
-#    The package should be built beforehand from tip-of-tree Playwright.
-COPY ./playwright-core.tar.gz /tmp/playwright-core.tar.gz
-
-# 2. Bake in Playwright Agent.
-#    Playwright Agent is used to bake in browsers and browser dependencies,
-#    and run docker server later on.
-#    Browsers will be downloaded in `/ms-playwright`.
-#    Note: make sure to set 777 to the registry so that any user can access
-#    registry.
-RUN mkdir /ms-playwright && \
-    mkdir /ms-playwright-agent && \
-    cd /ms-playwright-agent && npm init -y && \
-    npm i /tmp/playwright-core.tar.gz && \
-    npm exec --no -- playwright-core mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \
-    npm exec --no -- playwright-core install --with-deps && rm -rf /var/lib/apt/lists/* && \
-    rm /tmp/playwright-core.tar.gz && \
-    rm -rf /ms-playwright-agent && \
-    rm -rf ~/.npm/ && \
-    chmod -R 777 /ms-playwright
diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
index ff24c31c88920..d4d0cbad8af67 100644
--- a/utils/docker/Dockerfile.jammy
+++ b/utils/docker/Dockerfile.jammy
@@ -14,7 +14,7 @@ RUN apt-get update && \
     apt-get install -y curl wget gpg ca-certificates && \
     mkdir -p /etc/apt/keyrings && \
     curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \
     apt-get update && \
     apt-get install -y nodejs && \
     # Feature-parity with node.js base images.
diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 7236acbbfc4d6..62ec6232c2452 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -2,7 +2,7 @@ FROM ubuntu:noble
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG TZ=America/Los_Angeles
-ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright:v%version%-jammy"
+ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright:v%version%-noble"
 
 ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
@@ -14,7 +14,7 @@ RUN apt-get update && \
     apt-get install -y curl wget gpg ca-certificates && \
     mkdir -p /etc/apt/keyrings && \
     curl -sL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list && \
     apt-get update && \
     apt-get install -y nodejs && \
     # Feature-parity with node.js base images.
diff --git a/utils/docker/build.sh b/utils/docker/build.sh
index 46e8d9e6b6fc1..280727eac5ce0 100755
--- a/utils/docker/build.sh
+++ b/utils/docker/build.sh
@@ -3,12 +3,12 @@ set -e
 set +x
 
 if [[ ($1 == '--help') || ($1 == '-h') || ($1 == '') || ($2 == '') ]]; then
-  echo "usage: $(basename $0) {--arm64,--amd64} {focal,jammy} playwright:localbuild-focal"
+  echo "usage: $(basename $0) {--arm64,--amd64} {jammy,noble} playwright:localbuild-noble"
   echo
-  echo "Build Playwright docker image and tag it as 'playwright:localbuild-focal'."
+  echo "Build Playwright docker image and tag it as 'playwright:localbuild-noble'."
   echo "Once image is built, you can run it with"
   echo ""
-  echo "  docker run --rm -it playwright:localbuild-focal /bin/bash"
+  echo "  docker run --rm -it playwright:localbuild-noble /bin/bash"
   echo ""
   echo "NOTE: this requires on Playwright dependencies to be installed with 'npm install'"
   echo "      and Playwright itself being built with 'npm run build'"
diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh
index a1f69e455402b..870da29a905a0 100755
--- a/utils/docker/publish_docker.sh
+++ b/utils/docker/publish_docker.sh
@@ -15,49 +15,23 @@ if [[ "${RELEASE_CHANNEL}" == "stable" ]]; then
     echo "ERROR: cannot publish stable docker with Playwright version '${PW_VERSION}'"
     exit 1
   fi
-elif [[ "${RELEASE_CHANNEL}" == "canary" ]]; then
-  if [[ "${PW_VERSION}" != *-* ]]; then
-    echo "ERROR: cannot publish canary docker with Playwright version '${PW_VERSION}'"
-    exit 1
-  fi
 else
   echo "ERROR: unknown release channel - ${RELEASE_CHANNEL}"
   echo "Must be either 'stable' or 'canary'"
   exit 1
 fi
 
-# Ubuntu 20.04
-FOCAL_TAGS=(
-  "next"
-  "next-focal"
-  "v${PW_VERSION}-focal"
-)
-
-if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
-  FOCAL_TAGS+=("focal")
-fi
-
 # Ubuntu 22.04
 JAMMY_TAGS=(
-  "next-jammy"
   "v${PW_VERSION}-jammy"
-  "v${PW_VERSION}"
 )
 
-if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
-  JAMMY_TAGS+=("latest")
-  JAMMY_TAGS+=("jammy")
-fi
-
+# Ubuntu 24.04
 NOBLE_TAGS=(
-  "next-noble"
+  "v${PW_VERSION}"
   "v${PW_VERSION}-noble"
 )
 
-if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
-  NOBLE_TAGS+=("noble")
-fi
-
 tag_and_push() {
   local source="$1"
   local target="$2"
@@ -90,14 +64,12 @@ install_oras_if_needed() {
 publish_docker_images_with_arch_suffix() {
   local FLAVOR="$1"
   local TAGS=()
-  if [[ "$FLAVOR" == "focal" ]]; then
-    TAGS=("${FOCAL_TAGS[@]}")
-  elif [[ "$FLAVOR" == "jammy" ]]; then
+  if [[ "$FLAVOR" == "jammy" ]]; then
     TAGS=("${JAMMY_TAGS[@]}")
   elif [[ "$FLAVOR" == "noble" ]]; then
     TAGS=("${NOBLE_TAGS[@]}")
   else
-    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', 'jammy', or 'noble'"
+    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', or 'noble'"
     exit 1
   fi
   local ARCH="$2"
@@ -118,14 +90,12 @@ publish_docker_images_with_arch_suffix() {
 publish_docker_manifest () {
   local FLAVOR="$1"
   local TAGS=()
-  if [[ "$FLAVOR" == "focal" ]]; then
-    TAGS=("${FOCAL_TAGS[@]}")
-  elif [[ "$FLAVOR" == "jammy" ]]; then
+  if [[ "$FLAVOR" == "jammy" ]]; then
     TAGS=("${JAMMY_TAGS[@]}")
   elif [[ "$FLAVOR" == "noble" ]]; then
     TAGS=("${NOBLE_TAGS[@]}")
   else
-    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', 'jammy', or 'noble'"
+    echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy', or 'noble'"
     exit 1
   fi
 
@@ -144,11 +114,6 @@ publish_docker_manifest () {
   done
 }
 
-# Ubuntu 20.04
-publish_docker_images_with_arch_suffix focal amd64
-publish_docker_images_with_arch_suffix focal arm64
-publish_docker_manifest focal amd64 arm64
-
 # Ubuntu 22.04
 publish_docker_images_with_arch_suffix jammy amd64
 publish_docker_images_with_arch_suffix jammy arm64
diff --git a/utils/doclint/api_parser.js b/utils/doclint/api_parser.js
index a593872f999a1..a4d504ea48d6e 100644
--- a/utils/doclint/api_parser.js
+++ b/utils/doclint/api_parser.js
@@ -165,7 +165,7 @@ class ApiParser {
     if (!name)
       throw new Error('Invalid member name ' + spec.text);
     if (match[1] === 'param') {
-      const arg = this.parseProperty(spec);
+      const arg = this.parseProperty(spec, match[2]);
       if (!arg)
         return;
       arg.name = name;
@@ -182,7 +182,7 @@ class ApiParser {
       }
     } else {
       // match[1] === 'option'
-      const p = this.parseProperty(spec);
+      const p = this.parseProperty(spec, match[2]);
       if (!p)
         return;
       let options = method.argsArray.find(o => o.name === 'options');
@@ -192,18 +192,20 @@ class ApiParser {
         method.argsArray.push(options);
       }
       p.required = false;
-      // @ts-ignore
-      options.type.properties.push(p);
+      options.type?.properties?.push(p);
     }
   }
 
   /**
    * @param {MarkdownHeaderNode} spec
+   * @param {string} memberName
    * @returns {docs.Member | null}
    */
-  parseProperty(spec) {
+  parseProperty(spec, memberName) {
     const param = childrenWithoutProperties(spec)[0];
     const text = /** @type {string}*/(param.text);
+    if (text.substring(text.lastIndexOf('>') + 1).trim())
+      throw new Error(`Extra information after type while processing "${memberName}".\nYou probably need an extra empty line before the description.\n================\n${text}`);
     let typeStart = text.indexOf('<');
     while ('?e'.includes(text[typeStart - 1]))
       typeStart--;
diff --git a/utils/doclint/cli.js b/utils/doclint/cli.js
index 37ae90ea4cb20..a694cd07497ef 100755
--- a/utils/doclint/cli.js
+++ b/utils/doclint/cli.js
@@ -130,14 +130,17 @@ async function run() {
   {
     const langs = ['js', 'java', 'python', 'csharp'];
     const documentationRoot = path.join(PROJECT_DIR, 'docs', 'src');
+    const apiRoot = path.join(documentationRoot, 'api');
+    const testApiRoot = path.join(documentationRoot, 'test-api');
+    const testReporterApiRoot = path.join(documentationRoot, 'test-reporter-api');
     for (const lang of langs) {
       try {
-        let documentation = parseApi(path.join(documentationRoot, 'api'));
+        let documentation = parseApi(apiRoot);
         if (lang === 'js') {
           documentation = documentation.mergeWith(
-            parseApi(path.join(documentationRoot, 'test-api'), path.join(documentationRoot, 'api', 'params.md'))
+            parseApi(testApiRoot, path.join(documentationRoot, 'api', 'params.md'))
           ).mergeWith(
-            parseApi(path.join(documentationRoot, 'test-reporter-api'))
+            parseApi(testReporterApiRoot)
           );
         }
         documentation.filterForLanguage(lang);
@@ -183,7 +186,8 @@ async function run() {
           // Validates code snippet groups.
           rootNode = docs.processCodeGroups(rootNode, lang, tabs => tabs.map(tab => tab.spec));
           // Renders links.
-          documentation.renderLinksInNodes(rootNode);
+          if (!filePath.startsWith(apiRoot) && !filePath.startsWith(testApiRoot) && !filePath.startsWith(testReporterApiRoot))
+            documentation.renderLinksInNodes(rootNode);
           // Validate links.
           {
             md.visitAll(rootNode, node => {
@@ -243,6 +247,8 @@ async function run() {
 
         const badLinks = [];
         for (const { filePath, linkTarget, name } of mdLinks) {
+          if (linkTarget.startsWith(path.join(documentationRoot, 'images')))
+            continue;
           if (!mdSections.has(linkTarget))
             badLinks.push(`${path.relative(PROJECT_DIR, filePath)} references to '${linkTarget}' as '${name}' which does not exist.`);
         }
diff --git a/utils/doclint/documentation.js b/utils/doclint/documentation.js
index 8019b5a2303fa..5344584da1009 100644
--- a/utils/doclint/documentation.js
+++ b/utils/doclint/documentation.js
@@ -45,8 +45,8 @@ const md = require('../markdown');
  * @typedef {function({
  *   clazz?: Class,
  *   member?: Member,
- *   param?: string,
- *   option?: string,
+ *   param?: { name: string, alias: string },
+ *   option?: { name: string, alias: string },
  *   href?: string,
  * }): string|undefined} Renderer
  */
@@ -98,7 +98,7 @@ class Documentation {
     for (const [name, clazz] of this.classes.entries()) {
       clazz.sortMembers();
 
-      if (!clazz.extends || ['EventEmitter', 'Error', 'Exception', 'RuntimeException'].includes(clazz.extends))
+      if (!clazz.extends || ['Error', 'Exception', 'RuntimeException'].includes(clazz.extends))
         continue;
       const superClass = this.classes.get(clazz.extends);
       if (!superClass) {
@@ -353,6 +353,8 @@ class Member {
     this.clazz = null;
     /** @type {Member=} */
     this.enclosingMethod = undefined;
+    /** @type {Member=} */
+    this.parent = undefined;
     this.async = false;
     this.alias = name;
     this.overloadIndex = 0;
@@ -361,31 +363,25 @@ class Member {
       this.alias = match[1];
       this.overloadIndex = (+match[2]) - 1;
     }
-    /**
-     * Param is true and option false
-     * @type {Boolean | null}
-     */
-    this.paramOrOption = null;
   }
 
   index() {
     this.args = new Map();
     if (this.kind === 'method')
       this.enclosingMethod = this;
-    const indexType = type => {
-      type.deepProperties().forEach(p => {
+    const indexArg = (/** @type {Member} */ arg) => {
+      arg.type?.deepProperties().forEach(p => {
         p.enclosingMethod = this;
-        indexType(p.type);
+        p.parent = arg;
+        indexArg(p);
       });
     }
     for (const arg of this.argsArray) {
       this.args.set(arg.name, arg);
       arg.enclosingMethod = this;
-      if (arg.name === 'options') {
-        // @ts-ignore
-        arg.type.properties.sort((p1, p2) => p1.name.localeCompare(p2.name));
-      }
-      indexType(arg.type);
+      if (arg.name === 'options')
+        arg.type?.properties?.sort((p1, p2) => p1.name.localeCompare(p2.name));
+      indexArg(arg);
     }
   }
 
@@ -407,11 +403,9 @@ class Member {
         continue;
       const overriddenArg = (arg.langs.overrides && arg.langs.overrides[lang]) || arg;
       overriddenArg.filterForLanguage(lang, options);
-      // @ts-ignore
-      if (overriddenArg.name === 'options' && !overriddenArg.type.properties.length)
+      if (overriddenArg.name === 'options' && !overriddenArg.type?.properties?.length)
         continue;
-      // @ts-ignore
-      overriddenArg.type.filterForLanguage(lang, options);
+      overriddenArg.type?.filterForLanguage(lang, options);
       argsArray.push(overriddenArg);
     }
     this.argsArray = argsArray;
@@ -430,7 +424,6 @@ class Member {
     const result = new Member(this.kind, { langs: this.langs, since: this.since, deprecated: this.deprecated, discouraged: this.discouraged }, this.name, this.type?.clone(), this.argsArray.map(arg => arg.clone()), this.spec, this.required);
     result.alias = this.alias;
     result.async = this.async;
-    result.paramOrOption = this.paramOrOption;
     return result;
   }
 
@@ -523,8 +516,7 @@ class Type {
     if (!inUnion && (parsedType.union || parsedType.unionName)) {
       const type = new Type(parsedType.unionName || '');
       type.union = [];
-      // @ts-ignore
-      for (let t = parsedType; t; t = t.union) {
+      for (let /** @type {ParsedType | null} */ t = parsedType; t; t = t.union) {
         const nestedUnion = !!t.unionName && t !== parsedType;
         type.union.push(Type.fromParsedType(t, !nestedUnion));
         if (nestedUnion)
@@ -536,7 +528,6 @@ class Type {
     if (parsedType.args || parsedType.retType) {
       const type = new Type('function');
       type.args = [];
-      // @ts-ignore
       for (let t = parsedType.args; t; t = t.next)
         type.args.push(Type.fromParsedType(t));
       type.returnType = parsedType.retType ? Type.fromParsedType(parsedType.retType) : undefined;
@@ -546,8 +537,7 @@ class Type {
     if (parsedType.template) {
       const type = new Type(parsedType.name);
       type.templates = [];
-      // @ts-ignore
-      for (let t = parsedType.template; t; t = t.next)
+      for (let /** @type {ParsedType | null} */ t = parsedType.template; t; t = t.next)
         type.templates.push(Type.fromParsedType(t));
       return type;
     }
@@ -610,17 +600,6 @@ class Type {
     return [];
   }
 
-  /**
-    * @returns {Member[] | undefined}
-  */
-  sortedProperties() {
-    if (!this.properties)
-      return this.properties;
-    const sortedProperties = [...this.properties];
-    sortedProperties.sort((p1, p2) => p1.name.localeCompare(p2.name));
-    return sortedProperties;
-  }
-
   /**
    * @param {string} lang
    * @param {LanguageOptions=} options
@@ -758,24 +737,49 @@ function patchLinksInText(classOrMember, text, classesMap, membersMap, linkRende
       const memberName = p1 + ': ' + p2;
       const member = membersMap.get(memberName);
       if (!member)
-        throw new Error('Undefined member references: ' + match);
+        throw new Error(`Undefined member reference: ${match}\n=========\n${text}`);
       return linkRenderer({ member, href }) || match;
     }
-    if (p1 === 'param') {
-      let alias = p2;
-      if (classOrMember) {
-        // param/option reference can only be in method or same method parameter comments.
-        // @ts-ignore
-        const method = classOrMember.enclosingMethod;
-        const param = method.argsArray.find(a => a.name === p2);
+    if (p1 === 'param' || p1 === 'option') {
+      let /** @type {string } */ name;
+      let /** @type {Member} */ member;
+      if (p2.includes('.')) {
+        // fully-qualified name
+        const [className, memberName, ...rest] = p2.split('.');
+        const maybeMember = membersMap.get(`method: ${className}.${memberName}`);
+        if (!maybeMember)
+          throw new Error(`Undefined reference: ${match}\n=========\n${text}`);
+        member = maybeMember;
+        name = rest.join('.');
+      } else {
+        // non-fully-qualified param/option reference from the same method.
+        if (!classOrMember || !(classOrMember instanceof Member)) {
+          Error.stackTraceLimit = 100;
+          throw new Error(`No parent method to find referenced ${match}\n=========\n${text}`);
+        }
+        const maybeMember = classOrMember.enclosingMethod;
+        if (!maybeMember)
+          throw new Error(`Undefined reference: ${match}\n=========\n${text}`);
+        member = maybeMember;
+        name = p2;
+      }
+      if (p1 === 'param') {
+        const param = member.argsArray.find(a => a.name === name);
         if (!param)
-          throw new Error(`Referenced parameter ${match} not found in the parent method ${method.name} `);
-        alias = param.alias;
+          throw new Error(`Referenced parameter ${match} not found in the parent method ${member.name}\n=========\n${text}`);
+        return linkRenderer({ member, param: { name, alias: param.alias }, href }) || match;
+      } else {
+        // p1 === 'option'
+        const options = member.argsArray.find(a => a.name === 'options');
+        const parts = name.split('.');
+        const optionName = parts[0];
+        const option = options?.type?.properties?.find(a => a.name === optionName);
+        if (!option)
+          throw new Error(`Referenced option ${match} not found in the parent method ${member.name}\n=========\n${text}`);
+        parts[0] = option.alias;
+        return linkRenderer({ member, option: { name: optionName, alias: parts.join('.') }, href }) || match;
       }
-      return linkRenderer({ param: alias, href }) || match;
     }
-    if (p1 === 'option')
-      return linkRenderer({ option: p2, href }) || match;
     throw new Error(`Undefined link prefix, expected event|method|property|param|option, got: ` + match);
   });
   text = text.replace(/\[([\w]+)\](?:\(([^)]*?)\))?/g, (match, p1, href) => {
@@ -797,14 +801,9 @@ function generateSourceCodeComment(spec) {
       node.liType = 'default';
     if (node.type === 'code' && node.codeLang)
       node.codeLang = parseCodeLang(node.codeLang).highlighter;
-    if (node.type === 'note') {
-      // @ts-ignore
-      node.type = 'text';
-      node.text = '**NOTE** ' + node.text;
-    }
   });
   // 5 is a typical member doc offset.
-  return md.render(comments, { maxColumns: 120 - 5, omitLastCR: true, flattenText: true });
+  return md.render(comments, { maxColumns: 120 - 5, omitLastCR: true, flattenText: true, noteMode: 'compact' });
 }
 
 /**
@@ -852,7 +851,8 @@ function patchCSharpOptionOverloads(optionsArg, options = {}) {
     }
     if (options.csharpOptionOverloadsShortNotation) {
       const newProp = prop.clone();
-      newProp.alias = newProp.name = shortNotation.join('|');
+      newProp.name = prop.name;
+      newProp.alias = shortNotation.join('|');
       propsToAdd.push(newProp);
     }
   }
diff --git a/utils/doclint/dotnetXmlDocumentation.js b/utils/doclint/dotnetXmlDocumentation.js
index 66fae02c12977..4b500c0781581 100644
--- a/utils/doclint/dotnetXmlDocumentation.js
+++ b/utils/doclint/dotnetXmlDocumentation.js
@@ -16,7 +16,7 @@
 
 // @ts-check
 const Documentation = require('./documentation');
-const { visitAll } = require('../markdown');
+const { visitAll, render } = require('../markdown');
 /**
  * @param {Documentation.MarkdownNode[]} nodes
  * @param {number} maxColumns
@@ -64,7 +64,10 @@ function _innerRenderNodes(nodes, maxColumns = 80, wrapParagraphs = true) {
     } else if (node.type === 'li') {
       _wrapInNode('item><description', _wrapAndEscape(node, maxColumns), summary, '/description></item');
     } else if (node.type === 'note') {
-      _wrapInNode('para', _wrapAndEscape(node, maxColumns), remarks);
+      _wrapInNode('para', _wrapAndEscape({
+        type: 'text',
+        text: render(node.children ?? []).replaceAll('\n', '↵'),
+      }, maxColumns), remarks);
     }
     lastNode = node;
   });
@@ -75,11 +78,11 @@ function _innerRenderNodes(nodes, maxColumns = 80, wrapParagraphs = true) {
 
 function _wrapCode(lines) {
   let i = 0;
-  let out = [];
+  const out = [];
   for (let line of lines) {
     line = line.replace(/[&]/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
     if (i < lines.length - 1)
-      line = line + "<br/>";
+      line = line + '<br/>';
     out.push(line);
     i++;
   }
@@ -163,4 +166,4 @@ function renderTextOnly(nodes, maxColumns = 80) {
   return result.summary;
 }
 
-module.exports = { renderXmlDoc, renderTextOnly }
\ No newline at end of file
+module.exports = { renderXmlDoc, renderTextOnly };
\ No newline at end of file
diff --git a/utils/doclint/generateApiJson.js b/utils/doclint/generateApiJson.js
index c0b533d97bc4a..20ce6043009bf 100644
--- a/utils/doclint/generateApiJson.js
+++ b/utils/doclint/generateApiJson.js
@@ -17,7 +17,6 @@
 // @ts-check
 
 const path = require('path');
-const Documentation = require('./documentation');
 const { parseApi } = require('./api_parser');
 const PROJECT_DIR = path.join(__dirname, '..', '..');
 
@@ -26,9 +25,9 @@ const PROJECT_DIR = path.join(__dirname, '..', '..');
   documentation.setLinkRenderer(item => {
     const { clazz, param, option } = item;
     if (param)
-      return `\`${param}\``;
+      return `\`${param.alias}\``;
     if (option)
-      return `\`${option}\``;
+      return `\`${option.alias}\``;
     if (clazz)
       return `\`${clazz.name}\``;
   });
@@ -38,14 +37,14 @@ const PROJECT_DIR = path.join(__dirname, '..', '..');
 }
 
 /**
- * @param {Documentation} documentation
+ * @param {import('./documentation').Documentation} documentation
  */
 function serialize(documentation) {
   return documentation.classesArray.map(serializeClass);
 }
 
 /**
- * @param {Documentation.Class} clazz
+ * @param {import('./documentation').Class} clazz
  */
 function serializeClass(clazz) {
   const result = { name: clazz.name, spec: clazz.spec };
@@ -65,7 +64,7 @@ function serializeClass(clazz) {
 }
 
 /**
- * @param {Documentation.Member} member
+ * @param {import('./documentation').Member} member
  */
 function serializeMember(member) {
   const result = /** @type {any} */ ({ ...member });
@@ -76,14 +75,20 @@ function serializeMember(member) {
   return result;
 }
 
+/**
+ * @param {import('./documentation').Member} arg
+ */
 function serializeProperty(arg) {
-  const result = { ...arg };
+  const result = { ...arg, parent: undefined };
   sanitize(result);
   if (arg.type)
-    result.type = serializeType(arg.type, arg.name === 'options');
+    result.type = serializeType(arg.type);
   return result;
 }
 
+/**
+ * @param {object} result
+ */
 function sanitize(result) {
   delete result.args;
   delete result.argsArray;
@@ -92,14 +97,13 @@ function sanitize(result) {
 }
 
 /**
- * @param {Documentation.Type} type
- * @param {boolean} sortProperties
+ * @param {import('./documentation').Type} type
  */
-function serializeType(type, sortProperties = false) {
+function serializeType(type) {
   /** @type {any} */
   const result = { ...type };
   if (type.properties)
-    result.properties = (sortProperties ? type.sortedProperties() : type.properties).map(serializeProperty);
+    result.properties = type.properties.map(serializeProperty);
   if (type.union)
     result.union = type.union.map(type => serializeType(type));
   if (type.templates)
diff --git a/utils/doclint/generateDotnetApi.js b/utils/doclint/generateDotnetApi.js
index 9c094026f9ecc..d46cd62ffd755 100644
--- a/utils/doclint/generateDotnetApi.js
+++ b/utils/doclint/generateDotnetApi.js
@@ -61,9 +61,9 @@ documentation.setLinkRenderer(item => {
   else if (item.member)
     return `<see cref="I${toTitleCase(item.member.clazz.name)}.${toMemberName(item.member)}${asyncSuffix}"/>`;
   else if (item.option)
-    return `<paramref name="${item.option}"/>`;
+    return `<paramref name="${item.option.name}"/>`;
   else if (item.param)
-    return `<paramref name="${item.param}"/>`;
+    return `<paramref name="${item.param.name}"/>`;
   else
     throw new Error('Unknown link format.');
 });
@@ -400,10 +400,18 @@ function generateNameDefault(member, name, t, parent) {
       if (names[2] === names[1])
         names.pop(); // get rid of duplicates, cheaply
       let attemptedName = names.pop();
-      const typesDiffer = function(left, right) {
+      const typesDiffer = function(/** @type {Documentation.Type} */ left, /** @type {Documentation.Type} */ right) {
         if (left.expression && right.expression)
           return left.expression !== right.expression;
-        return JSON.stringify(right.properties) !== JSON.stringify(left.properties);
+        const toExpression = (/** @type {Documentation.Member} */ t) => t.name + t.type?.expression;
+        const leftOverRightProperties = new Set(left.properties?.map(toExpression) ?? []);
+        for (const prop of right.properties ?? []) {
+          const expression = toExpression(prop);
+          if (!leftOverRightProperties.has(expression))
+            return true;
+          leftOverRightProperties.delete(expression);
+        }
+        return leftOverRightProperties.size > 0;
       };
       while (true) {
         // crude attempt at removing plurality
@@ -512,7 +520,8 @@ function renderMethod(member, parent, name, options, out) {
     && !name.startsWith('Get')
     && name !== 'CreateFormData'
     && !name.startsWith('PostDataJSON')
-    && !name.startsWith('As')) {
+    && !name.startsWith('As')
+    && name !== 'ConnectToServer') {
     if (!member.async) {
       if (member.spec && !options.nodocs)
         out.push(...XmlDoc.renderXmlDoc(member.spec, maxDocumentationColumnWidth));
@@ -710,7 +719,7 @@ function translateType(type, parent, generateNameCallback = t => t.name, optiona
   if (type.expression === '[null]|[Error]')
     return 'void';
 
-  if (type.name == 'Promise' && type.templates?.[0].name === 'any')
+  if (type.name === 'Promise' && type.templates?.[0].name === 'any')
     return 'Task';
 
   if (type.union) {
@@ -723,8 +732,6 @@ function translateType(type, parent, generateNameCallback = t => t.name, optiona
       console.warn(`${type.name} should be a 'string', but was a ${type.expression}`);
       return `string`;
     }
-    if (type.union.length === 2 && type.union[1].name === 'Array' && type.union[1].templates[0].name === type.union[0].name)
-      return `IEnumerable<${type.union[0].name}>`; // an example of this is [string]|[Array]<[string]>
     if (type.expression === '[float]|"raf"')
       return `Polling`; // hardcoded because there's no other way to denote this
 
diff --git a/utils/doclint/generateFullConfigDoc.js b/utils/doclint/generateFullConfigDoc.js
deleted file mode 100644
index 8c00f7f8a2767..0000000000000
--- a/utils/doclint/generateFullConfigDoc.js
+++ /dev/null
@@ -1,121 +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-check
-
-const path = require('path');
-const fs = require('fs');
-const PROJECT_DIR = path.join(__dirname, '..', '..');
-
-function generateFullConfigClass(fromClassName, toClassName, allowList) {
-  const allowedNames = new Set(allowList);
-
-  const content = fs.readFileSync(path.join(PROJECT_DIR, `docs/src/test-api/class-${fromClassName.toLowerCase()}.md`)).toString();
-  let sections = content.split('\n## ');
-  sections = filterAllowedSections(sections, allowedNames);
-  if (allowedNames.size)
-    console.log(`Undocumented properties for ${fromClassName}:\n  ${[...allowedNames].join('\n  ')}`);
-  sections = changeClassName(sections, fromClassName, toClassName);
-  sections = replacePropertyDescriptions(sections, fromClassName);
-  const fullconfig = sections.join('\n## ');
-  fs.writeFileSync(path.join(PROJECT_DIR, `docs/src/test-api/class-${toClassName.toLowerCase()}.md`), fullconfig);
-}
-
-function propertyNameFromSection(section) {
-  section = section.split('\n')[0];
-  const match = /\.(\w+)/.exec(section);
-  if (!match)
-    return null;
-  return match[1];
-}
-
-function filterAllowedSections(sections, allowedNames) {
-  return sections.filter(section => {
-    section = section.split('\n')[0];
-    const name = propertyNameFromSection(section);
-    if (!name)
-      return true;
-    return allowedNames.delete(name);
-  });
-}
-
-function changeClassName(sections, from, to) {
-  return sections.map(section => {
-    const lines = section.split('\n');
-    lines[0] = lines[0].replace(from, to);
-    return lines.join('\n');
-  });
-}
-
-function replacePropertyDescriptions(sections, configClassName) {
-  return sections.map(section => {
-    const parts = section.split('\n\n');
-    section = parts[0];
-    const name = propertyNameFromSection(section);
-    if (!name)
-      return `${section}\n`;
-    return `${section}\n\nSee [\`property: ${configClassName}.${name}\`].\n`;
-  });
-}
-
-function generateFullConfig() {
-  generateFullConfigClass('TestConfig', 'FullConfig', [
-    'forbidOnly',
-    'fullyParallel',
-    'globalSetup',
-    'globalTeardown',
-    'globalTimeout',
-    'grep',
-    'grepInvert',
-    'maxFailures',
-    'metadata',
-    'version',
-    'preserveOutput',
-    'projects',
-    'reporter',
-    'reportSlowTests',
-    'rootDir',
-    'quiet',
-    'shard',
-    'updateSnapshots',
-    'workers',
-    'webServer',
-    'configFile',
-  ]);
-}
-
-function generateFullProject() {
-  generateFullConfigClass('TestProject', 'FullProject', [
-    'grep',
-    'grepInvert',
-    'metadata',
-    'name',
-    'dependencies',
-    'snapshotDir',
-    'outputDir',
-    'repeatEach',
-    'retries',
-    'teardown',
-    'testDir',
-    'testIgnore',
-    'testMatch',
-    'timeout',
-    'use',
-  ]);
-}
-
-generateFullConfig();
-generateFullProject();
diff --git a/utils/doclint/generateJavaSnippets.js b/utils/doclint/generateJavaSnippets.js
deleted file mode 100644
index 097381131728e..0000000000000
--- a/utils/doclint/generateJavaSnippets.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// @ts-check
-
-const fs = require("fs");
-const md = require("../markdown");
-
-
-/**
- * @param {string[]} input
- */
-function transformValue(input) {
-  const out = [];
-  const suffix = [];
-  for (let line of input) {
-    let match = line.match(/const { (\w+) } = require\('playwright'\);/);
-    if (match) {
-      out.push('import com.microsoft.playwright.*;');
-      out.push('');
-      out.push('public class Example {');
-      out.push('  public static void main(String[] args) {');
-      out.push('    try (Playwright playwright = Playwright.create()) {');      
-      out.push(`      BrowserType ${match[1]} = playwright.${match[1]}();`);
-      suffix.push('    }');
-      suffix.push('  }');
-      suffix.push('}');
-      continue;
-    }
-    if (line.trim() === '(async () => {' || line.trim() === '})();')
-      continue;
-    if (!line)
-      continue;
-    if (line.trim() === '}')
-      continue;
-  
-    // Remove await/Promise.all
-    line = line.replace(/const \[(.+)\] = await Promise.all\(\[/g, '$1 =');
-    line = line.replace(/Promise\.all\(\[/g, '');
-    line = line.replace(/await /g, '');
-  
-    // Rename some methods
-    line = line.replace(/\.goto\(/g, '.navigate(');
-    line = line.replace(/\.continue\(/g, '.resume(');
-    line = line.replace(/\.\$eval\(/g, '.evalOnSelector(');
-    line = line.replace(/\.\$\$eval\(/g, '.evalOnSelectorAll(');
-    line = line.replace(/\.\$\(/g, '.querySelector(');
-    line = line.replace(/\.\$\$\(/g, '.querySelectorAll(');
-
-    line = line.replace(/console.log/g, 'System.out.println');
-
-    line = line.replace(/page.evaluate\((\(\) => [^\)]+)\)/g, 'page.evaluate("$1")');
-
-    // Convert properties to methods
-    line = line.replace(/\.keyboard\./g, '.keyboard().');
-    line = line.replace(/\.mouse\./g, '.mouse().');
-    line = line.replace(/\.coverage\./g, '.coverage().');
-    line = line.replace(/\.accessibility\./g, '.accessibility().');
-    line = line.replace(/\.chromium\./g, '.chromium().');
-    line = line.replace(/\.webkit\./g, '.webkit().');
-    line = line.replace(/\.firefox\./g, '.firefox().');
-    line = line.replace(/\.length/g, '.size()');
-  
-    // JUnit asserts
-    line = line.replace(/expect\((.+)\).toBeTruthy\(\);/g, 'assertNotNull($1);');
-    line = line.replace(/expect\(error.message\)\.toContain\((.+)\);/g, 'assertTrue(e.getMessage().contains($1));');
-    line = line.replace(/expect\((.+)\)\.toContain\((.+)\);/g, 'assertTrue($1.contains($2));');
-    line = line.replace(/expect\((.+)\)\.toBe\(null\);/g, 'assertNull($1);');
-    line = line.replace(/expect\((.+)\)\.not.toBe\(null\);/g, 'assertNotNull($1);');
-    line = line.replace(/expect\((.+)\)\.toBe\(true\);/g, 'assertTrue($1);');
-    line = line.replace(/expect\((.+)\)\.toBe\((.+)\);/g, 'assertEquals($2, $1);');
-    line = line.replace(/expect\((.+)\)\.toEqual\(\[(.+)\]\);/g, 'assertEquals(Arrays.asList($2), $1);');
-    line = line.replace(/expect\((.+)\)\.toEqual\((.+)\);/g, 'assertEquals($2, $1);');
-
-    line = line.replace(/\[('[^']+')\]/g, '.get("$1")');
-    line = line.replace(/.push\(/g, '.add(');
-  
-    // Define common types
-    line = line.replace(/const browser = /g, 'Browser browser = ');
-    line = line.replace(/const context = /g, 'BrowserContext context = ');
-    line = line.replace(/const page = /g, 'Page page = ');
-    line = line.replace(/const newPage = /g, 'Page newPage = ');
-    line = line.replace(/const button/g, 'ElementHandle button');
-    line = line.replace(/const result = /g, 'Object result = ');
-    line = line.replace(/const response = /g, 'Response response = ');
-    line = line.replace(/const request = /g, 'Request request = ');
-    line = line.replace(/const requests = \[\];/g, 'List<Request> requests = new ArrayList<>();');
-    line = line.replace(/const snapshot = page.accessibility/g, 'String snapshot = page.accessibility');
-    line = line.replace(/snapshot\.children\./g, 'snapshot.children().');
-    line = line.replace(/const (.+) = \[\];/g, 'List<> $1 = new ArrayList<>();');
-    line = line.replace(/const (\w+ = .+evalOnSelector)/g, 'Object $1');
-    line = line.replace(/const (\w+ = .+querySelector)/g, 'ElementHandle $1');
-    line = line.replace(/const (.+= page.waitForNavigation)/g, 'Response $1');
-    line = line.replace(/const messages = \[\]/g, 'List<String> messages = new ArrayList<>()');
-    line = line.replace(/const frame = /g, 'Frame frame = ');
-    line = line.replace(/const elementHandle = (.+)/g, 'JSHandle jsHandle = $1\n  ElementHandle elementHandle = jsHandle.asElement();\n');
-    line = line.replace(/const (\w+ = \w+\.boundingBox)/g, 'BoundingBox $1');
-    line = line.replace(/setViewportSize\({ width: (\d+), height: (\d+) }\)/g, 'setViewportSize($1, $2)');
-    line = line.replace(/\.on\('([^']+)'/g, (match, p1, offset, string) => `.on${toTitleCase(p1)}(`);
-    line = line.replace(/\.waitForEvent\('([^']+)'/g, (match, p1, offset, string) => `page.waitFor${toTitleCase(p1)}(() -> {})`);
-
-    line = line.replace(/[`']/g, '"');
-
-    out.push(line)
-  }
-  return [...out, ...suffix].join("\n");
-}
-
-/**
- * @param {string} name
- */
-function toTitleCase(name) {
-  return name[0].toUpperCase() + name.substring(1);
-}
-
-/**
- * @param {md.MarkdownNode} node
- */
-function generateComment(node) {
-  const commentNode = md.clone(node)
-  commentNode.codeLang = 'java';
-  commentNode.lines = ['// FIXME', ...transformValue(node.lines).split("\n")];
-  return commentNode;
-}
-
-/**
- *
- * @param {md.MarkdownNode[]} spec
- */
-function multiplyComment(spec) {
-  const children = []
-  for (const node of (spec || [])) {
-    if (node.codeLang === "js")
-      children.push(node, generateComment(node));
-    else
-      children.push(node);
-  }
-  return children;
-}
-
-for (const name of fs.readdirSync("docs/src")) {
-  if (!name.endsWith(".md"))
-    continue;
-  if (name.includes('android'))
-    continue;
-  const inputFile = `docs/src/${name}`;
-  const fileline = fs.readFileSync(inputFile).toString();
-  const nodes = md.parse(fileline);
-  
-  md.visitAll(nodes, node => {
-    if (node.children)
-      node.children = multiplyComment(node.children);
-  });
-  
-  const out = md.render(nodes, 120);
-  fs.writeFileSync(inputFile, out);
-}
diff --git a/utils/doclint/generatePythonSnippets.js b/utils/doclint/generatePythonSnippets.js
deleted file mode 100644
index 98275966cced0..0000000000000
--- a/utils/doclint/generatePythonSnippets.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// @ts-check
-
-const fs = require("fs");
-const md = require("../markdown");
-
-
-/**
- * @param {string[]} input
- * @param {boolean} isSync
- */
-function transformValue(input, isSync) {
-  const out = [];
-  const suffix = [];
-  for (let line of input) {
-    let match = line.match(/const { (\w+) } = require\('playwright'\);/);
-    if (match) {
-      if (isSync) {
-        out.push('from playwright.sync_api import sync_playwright, Playwright');
-        out.push('');
-        out.push('def run(playwright: Playwright):');
-        out.push(`    ${match[1]} = playwright.${match[1]}`);
-        suffix.push(``);
-        suffix.push(`with sync_playwright() as playwright:`);
-        suffix.push(`    run(playwright)`);
-      } else {
-        out.push('import asyncio');
-        out.push('from playwright.async_api import async_playwright, Playwright');
-        out.push('');
-        out.push('async def run(playwright: Playwright):');
-        out.push(`    ${match[1]} = playwright.${match[1]}`);
-        suffix.push(``);
-        suffix.push(`async def main():`);
-        suffix.push(`    async with async_playwright() as playwright:`);
-        suffix.push(`        await run(playwright)`);
-        suffix.push(`asyncio.run(main())`);
-      }
-      continue;
-    }
-    if (line.trim() === '(async () => {' || line.trim() === '})();')
-      continue;
-    if (!line)
-      continue;
-    if (line.trim() === '}')
-      continue;
-    line = line.replace(/\$\$eval/g, 'eval_on_selector_all');
-    line = line.replace(/\$eval/g, 'eval_on_selector');
-    line = line.replace(/\$\$/g, 'query_selector_all');
-    line = line.replace(/\$/g, 'query_selector');
-    line = line.replace(/([a-zA-Z$]+)/g, (match, p1) => toSnakeCase(p1));
-    line = line.replace(/try {/, 'try:');
-    line = line.replace(/async \(([^)]+)\) => {/, 'lambda $1:');
-    line = line.replace(/} catch \(e\) {/, 'except Error as e:');
-    line = line.replace(/;$/, '');
-    line = line.replace(/  /g, '    ');
-    line = line.replace(/'/g, '"');
-    line = line.replace(/const /g, '');
-    line = line.replace(/{\s*(\w+):\s*([^} ]+)\s*}/, "$1=$2");
-    line = line.replace(/\/\/ /, "# ");
-    line = line.replace(/\(\) => /, 'lambda: ');
-    line = line.replace(/console.log/, 'print');
-    line = line.replace(/function /, 'def ');
-    line = line.replace(/{$/, '');
-    if (isSync)
-      line = line.replace(/await /g, "")
-    out.push(line)
-  }
-  return [...out, ...suffix].join("\n");
-}
-
-/**
- *
- * @param {md.MarkdownNode} node
- * @param {boolean} isSync
- */
-function generateComment(node, isSync) {
-  const commentNode = md.clone(node)
-  commentNode.codeLang = isSync ? "python sync" : "python async";
-  commentNode.lines = ['# FIXME', ...transformValue(node.lines, isSync).split("\n")];
-  return commentNode;
-}
-
-/**
- *
- * @param {md.MarkdownNode[]} spec
- */
-function multiplyComment(spec) {
-  const children = []
-  for (const node of (spec || [])) {
-    if (node.codeLang === "js")
-      children.push(node, generateComment(node, false), generateComment(node, true));
-    else
-      children.push(node);
-  }
-  return children;
-}
-
-/**
- * @param {string} name
- */
-function toSnakeCase(name) {
-  const toSnakeCaseRegex = /((?<=[a-z0-9])[A-Z]|(?!^)[A-Z](?=[a-z]))/g;
-  return name.replace(toSnakeCaseRegex, `_$1`).toLowerCase();
-}
-
-for (const name of fs.readdirSync("docs/src")) {
-  if (!name.endsWith(".md"))
-    continue;
-  const inputFile = `docs/src/${name}`;
-  const fileContent = fs.readFileSync(inputFile).toString();
-  const nodes = md.parse(fileContent);
-  
-  md.visitAll(nodes, node => {
-    if (node.children)
-      node.children = multiplyComment(node.children);
-  });
-  
- 
-  const out = md.render(nodes, 120);
-  fs.writeFileSync(inputFile, out);
-}
diff --git a/utils/doclint/linkUtils.js b/utils/doclint/linkUtils.js
index a6e5433e0d3e6..0c8b919a2df81 100644
--- a/utils/doclint/linkUtils.js
+++ b/utils/doclint/linkUtils.js
@@ -20,7 +20,16 @@
 const toKebabCase = require('lodash/kebabCase.js')
 const Documentation = require('./documentation');
 
-function createMarkdownLink(languagePath, member, text) {
+/**
+ * @param {string} languagePath
+ * @param {Documentation.Member} member
+ * @param {string} text
+ * @param {string=} paramOrOption
+ * @returns {string}
+ */
+function createMarkdownLink(languagePath, member, text, paramOrOption) {
+  if (!member.clazz)
+    throw new Error('Member without a class!');
   const className = toKebabCase(member.clazz.name);
   const memberName = toKebabCase(member.name);
   let hash = null;
@@ -28,6 +37,8 @@ function createMarkdownLink(languagePath, member, text) {
     hash = `${className}-${memberName}`.toLowerCase();
   else if (member.kind === 'event')
     hash = `${className}-event-${memberName}`.toLowerCase();
+  if (paramOrOption)
+    hash += '-option-' + toKebabCase(paramOrOption).toLowerCase();
   return `[${text}](https://playwright.dev${languagePath}/docs/api/class-${member.clazz.name.toLowerCase()}#${hash})`;
 };
 
@@ -41,26 +52,21 @@ function createClassMarkdownLink(languagePath, clazz) {
 };
 
 /**
- * @param {string} language 
+ * @param {string} language
  * @param {OutputType} outputType
  * @returns {Documentation.Renderer}
  */
 function docsLinkRendererForLanguage(language, outputType) {
   const languagePath = languageToRelativeDocsPath(language);
   return ({ clazz, member, param, option }) => {
-    if (param)
-      return `\`${param}\``;
-    if (option)
-      return `\`${option}\``;
-    if (clazz) {
-      if (outputType === 'Types')
-        return `{@link ${clazz.name}}`;
-      if (outputType === 'ReleaseNotesMd')
-        return createClassMarkdownLink(languagePath, clazz);
-      throw new Error(`Unexpected output type ${outputType}`);
-    }
+    if (clazz)
+      return createClassMarkdownLink(languagePath, clazz);
     if (!member || !member.clazz)
       throw new Error('Internal error');
+    if (param)
+      return createMarkdownLink(languagePath, member, `\`${param.alias}\``, param.name);
+    if (option)
+      return createMarkdownLink(languagePath, member, `\`${option.alias}\``, option.name);
     const className = member.clazz.varName === 'playwrightAssertions' ? '' : member.clazz.varName + '.';
     if (member.kind === 'method') {
       const args = outputType === 'ReleaseNotesMd' ? '' : renderJSSignature(member.argsArray);
diff --git a/utils/doclint/linting-code-snippets/cli.js b/utils/doclint/linting-code-snippets/cli.js
index 8bde076b7c437..a5a74198052f3 100644
--- a/utils/doclint/linting-code-snippets/cli.js
+++ b/utils/doclint/linting-code-snippets/cli.js
@@ -44,8 +44,9 @@ function getAllMarkdownFiles(dirPath, filePaths = []) {
 }
 
 const run = async () => {
+  const jsOnly = process.argv.includes('--js-only');
+  const lintingServiceFactory = new LintingServiceFactory(jsOnly);
   const documentationRoot = path.join(PROJECT_DIR, 'docs', 'src');
-  const lintingServiceFactory = new LintingServiceFactory();
   let documentation = parseApi(path.join(documentationRoot, 'api'));
 
   /** @type {CodeSnippet[]} */
@@ -69,6 +70,8 @@ const run = async () => {
     });
   }
   await lintingServiceFactory.lintAndReport(codeSnippets);
+  if (jsOnly)
+    return;
   const { hasErrors } = lintingServiceFactory.reportMetrics();
   if (hasErrors)
     process.exit(1);
@@ -94,9 +97,9 @@ class LintingService {
   }
 
   /**
-   * @param {string} command 
+   * @param {string} command
    * @param {string[]} args
-   * @param {CodeSnippet[]} snippets 
+   * @param {CodeSnippet[]} snippets
    * @param {string} cwd
    * @returns {Promise<LintResult[]>}
    */
@@ -118,7 +121,7 @@ class LintingService {
   }
 
   /**
-   * @param {CodeSnippet[]} snippets 
+   * @param {CodeSnippet[]} snippets
    * @returns {Promise<LintResult[]>}
    */
   async lint(snippets) {
@@ -134,26 +137,54 @@ class JSLintingService extends LintingService {
     'vue-router',
     'experimental-ct',
   ];
-  constructor() {
-    super();
-    this.eslint = new ESLint({
-      overrideConfigFile: path.join(PROJECT_DIR, '.eslintrc.js'),
-      useEslintrc: false,
+
+  async _init() {
+    if (this._eslint)
+      return this._eslint;
+
+    const { fixupConfigRules } = await import('@eslint/compat');
+    const { FlatCompat }  = await import('@eslint/eslintrc');
+      // @ts-ignore
+    const js = (await import('@eslint/js')).default;
+
+    const compat = new FlatCompat({
+      baseDirectory: __dirname,
+      // @ts-ignore
+      recommendedConfig: js.configs.recommended,
+      allConfig: js.configs.all
+    });
+    const baseConfig = fixupConfigRules(compat.extends('plugin:react/recommended', 'plugin:@typescript-eslint/disable-type-checked'));
+    const { baseRules }= await import('../../../eslint.config.mjs');
+
+    this._eslint = new ESLint({
+      baseConfig,
+      plugins: /** @type {any}*/({
+        '@stylistic': (await import('@stylistic/eslint-plugin')).default,
+      }),
+      ignore: false,
       overrideConfig: {
-        plugins: ['react'],
+        files: ['**/*.ts', '**/*.tsx'],
         settings: {
-          react: { version: 'detect', }
+          react: { version: 'detect' },
+        },
+        languageOptions: {
+          // @ts-ignore
+          parser: await import('@typescript-eslint/parser'),
+          ecmaVersion: 'latest',
+          sourceType: 'module',
         },
-        extends: [
-          'plugin:react/recommended',
-        ],
-        rules: {
+        rules: /** @type {any}*/({
+          ...baseRules,
           'notice/notice': 'off',
           '@typescript-eslint/no-unused-vars': 'off',
           'max-len': ['error', { code: 100 }],
-        },
+          'react/react-in-jsx-scope': 'off',
+          'eol-last': 'off',
+          '@typescript-eslint/consistent-type-imports': 'off',
+        }),
       }
     });
+    return this._eslint;
   }
 
   supports(codeLang) {
@@ -165,9 +196,10 @@ class JSLintingService extends LintingService {
    * @returns {Promise<LintResult>}
    */
   async _lintSnippet(snippet) {
+    const eslint = await this._init();
     if (this._knownBadSnippets.some(s => snippet.code.includes(s)))
       return { status: 'ok' };
-    const results = await this.eslint.lintText(snippet.code);
+    const results = await eslint.lintText(snippet.code, { filePath: path.join(__dirname, 'file.tsx') });
     if (!results || !results.length || !results[0].messages.length)
       return { status: 'ok' };
     const result = results[0];
@@ -208,16 +240,27 @@ class CSharpLintingService extends LintingService {
   }
 }
 
+class JavaLintingService extends LintingService {
+  supports(codeLang) {
+    return codeLang === 'java';
+  }
+
+  async lint(snippets) {
+    return await this.spawnAsync('java', ['-jar', path.join(__dirname, 'java', 'target', 'java-syntax-checker-1.0-SNAPSHOT.jar')], snippets, path.join(__dirname, 'java'))
+  }
+}
+
 class LintingServiceFactory {
-  constructor() {
+  constructor(jsOnly) {
     /** @type {LintingService[]} */
     this.services = [
       new JSLintingService(),
     ]
-    if (!process.env.NO_EXTERNAL_DEPS) {
+    if (!jsOnly) {
       this.services.push(
         new PythonLintingService(),
         new CSharpLintingService(),
+        new JavaLintingService(),
       );
     }
     this._metrics = {};
@@ -290,8 +333,8 @@ class LintingServiceFactory {
   }
 
   /**
-   * @param {string} language 
-   * @param {LintResult} result 
+   * @param {string} language
+   * @param {LintResult} result
    */
   _collectMetrics(language, result) {
     if (!this._metrics[language])
diff --git a/utils/doclint/linting-code-snippets/csharp/linting-code-snippets.csproj b/utils/doclint/linting-code-snippets/csharp/linting-code-snippets.csproj
index bc4a164528225..3df82e0a6aef6 100644
--- a/utils/doclint/linting-code-snippets/csharp/linting-code-snippets.csproj
+++ b/utils/doclint/linting-code-snippets/csharp/linting-code-snippets.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.6.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
   </ItemGroup>
 
 </Project>
diff --git a/utils/doclint/linting-code-snippets/java/.gitignore b/utils/doclint/linting-code-snippets/java/.gitignore
new file mode 100644
index 0000000000000..8b8c81d7318df
--- /dev/null
+++ b/utils/doclint/linting-code-snippets/java/.gitignore
@@ -0,0 +1,2 @@
+target/
+dependency-reduced-pom.xml
diff --git a/utils/doclint/linting-code-snippets/java/pom.xml b/utils/doclint/linting-code-snippets/java/pom.xml
new file mode 100644
index 0000000000000..ec040ad677da8
--- /dev/null
+++ b/utils/doclint/linting-code-snippets/java/pom.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>java-syntax-checker</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.javaparser</groupId>
+            <artifactId>javaparser-core</artifactId>
+            <version>3.26.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>JavaSyntaxChecker</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/utils/doclint/linting-code-snippets/java/src/main/java/JavaSyntaxChecker.java b/utils/doclint/linting-code-snippets/java/src/main/java/JavaSyntaxChecker.java
new file mode 100644
index 0000000000000..be2a5bbe35765
--- /dev/null
+++ b/utils/doclint/linting-code-snippets/java/src/main/java/JavaSyntaxChecker.java
@@ -0,0 +1,110 @@
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.Problem;
+import com.github.javaparser.ParseResult;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.StaticJavaParser;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class JavaSyntaxChecker {
+    public static void main(String[] args) {
+        if (args.length == 0) {
+            System.out.println("Error: Please provide the path to the JSON file");
+            return;
+        }
+
+        String codeSnippetsPath = args[args.length - 1];
+        List<CodeSnippet> codeSnippets = readCodeSnippets(codeSnippetsPath);
+        if (codeSnippets == null) {
+            System.out.println("Error: codeSnippets is null");
+            return;
+        }
+
+        List<Map<String, Object>> output = new ArrayList<>();
+
+        ParserConfiguration config = new ParserConfiguration();
+        config.setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_17);
+
+        for (CodeSnippet codeSnippet : codeSnippets) {
+            String cleanedCode = cleanSnippet(codeSnippet.code);
+            ParseResult<CompilationUnit> parseResult = new JavaParser(config).parse(cleanedCode);
+            List<Problem> syntaxErrors = parseResult.getProblems();
+
+            if (!syntaxErrors.isEmpty()) {
+                output.add(Map.of(
+                    "status", "error",
+                    "error", String.join("\n", syntaxErrors.stream()
+                            .map(Problem::getMessage)
+                            .collect(Collectors.toList()))
+                ));
+            } else {
+                output.add(Map.of("status", "ok"));
+            }
+        }
+
+        System.out.println(new Gson().toJson(output));
+    }
+
+    private static String removeImports(String code) {
+        // Remove import statements
+        return Pattern.compile("^import.*;$", Pattern.MULTILINE)
+                      .matcher(code)
+                      .replaceAll("");
+    }
+
+    private static String cleanSnippet(String code) {
+        // if it contains "public class" then it's a full class, return immediately
+        if (code.contains("public class")) {
+            return code;
+        }
+        code = removeImports(code);
+        String wrappedCode = """
+            import com.microsoft.playwright.*;
+            import static com.microsoft.playwright.assertions.PlaywrightAssertions.*;
+            
+            public class Example {
+                public static void main(String[] args) {
+                    try (Playwright playwright = Playwright.create()) {
+                        Browser browser = playwright.chromium().launch();
+                        BrowserContext context = browser.newContext();
+                        Page page = context.newPage();
+                        %s
+                    }
+                }
+            }
+            """.formatted(code);
+        return wrappedCode;
+    }
+
+    private static List<CodeSnippet> readCodeSnippets(String filePath) {
+        try (FileReader reader = new FileReader(filePath)) {
+            Type listType = new TypeToken<ArrayList<CodeSnippet>>(){}.getType();
+            return new Gson().fromJson(reader, listType);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
+
+class CodeSnippet {
+    String filePath;
+    String codeLang;
+    String code;
+
+    public CodeSnippet(String filePath, String codeLang, String code) {
+        this.filePath = filePath;
+        this.codeLang = codeLang;
+        this.code = code;
+    }
+}
\ No newline at end of file
diff --git a/utils/doclint/missingDocs.js b/utils/doclint/missingDocs.js
index 8042bc42224cb..8467be9e0c40b 100644
--- a/utils/doclint/missingDocs.js
+++ b/utils/doclint/missingDocs.js
@@ -42,7 +42,7 @@ module.exports = function lint(documentation, jsSources, apiFileName) {
       }
       for (const paramName of params) {
         const found = members.some(member => paramsForMember(member).has(paramName));
-        if (!found)
+        if (!found && !paramName.startsWith('_'))
           errors.push(`Missing documentation for "${className}.${methodName}.${paramName}"`);
       }
     }
@@ -56,7 +56,7 @@ module.exports = function lint(documentation, jsSources, apiFileName) {
       continue;
     }
     for (const member of cls.membersArray) {
-      if (member.kind === 'event')
+      if (member.kind === 'event' || member.alias === 'removeAllListeners')
         continue;
       const params = methods.get(member.alias);
       if (!params) {
@@ -120,7 +120,7 @@ function listMethods(rootNames, apiFileName) {
   function shouldSkipMethodByName(className, methodName) {
     if (methodName.startsWith('_') || methodName === 'T' || methodName === 'toString')
       return true;
-    if (/** @type {any} */(EventEmitter).prototype.hasOwnProperty(methodName))
+    if (EventEmitter.prototype.hasOwnProperty(methodName))
       return true;
     return false;
   }
@@ -141,7 +141,7 @@ function listMethods(rootNames, apiFileName) {
       const memberType = checker.getTypeOfSymbolAtLocation(member, member.valueDeclaration);
       const signature = signatureForType(memberType);
       if (signature)
-        methods.set(name, new Set(signature.parameters.map(p => p.escapedName)));
+        methods.set(name, new Set(signature.parameters.filter(p => !p.escapedName.startsWith('_')).map(p => p.escapedName)));
       else
         methods.set(name, new Set());
     }
diff --git a/utils/doclint/since.js b/utils/doclint/since.js
deleted file mode 100644
index 5f97ec563071a..0000000000000
--- a/utils/doclint/since.js
+++ /dev/null
@@ -1,81 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const { ZipFile } = require('../../packages/playwright-core/lib/utils');
-
-(async () => {
-  // Extract API.json
-  if (!process.env.DRIVERS_DIR) {
-    console.log('DRIVERS_DIR env should contain downloaded drivers');
-    process.exit(1);
-  }
-
-  for (const name of fs.readdirSync(process.env.DRIVERS_DIR)) {
-    const match = name.match(/playwright-(.*).0-linux.zip/);
-    if (!match)
-      continue;
-    const apiName = path.join(process.env.DRIVERS_DIR, `api-${match[1]}.json`);
-    if (!fs.existsSync(apiName)) {
-      const zipFile = new ZipFile(path.join(process.env.DRIVERS_DIR, name));
-      const buffer = await zipFile.read('package/api.json');
-      fs.writeFileSync(path.join(process.env.DRIVERS_DIR, `api-${match[1]}.json`), buffer);
-      zipFile.close();
-    }
-  }
-
-  // Build Since map.
-  const since = new Map();
-  for (const name of fs.readdirSync(process.env.DRIVERS_DIR)) {
-    const match = name.match(/api-(.*).json/);
-    if (!match)
-      continue;
-    const version = match[1];
-    const json = JSON.parse(fs.readFileSync(path.join(process.env.DRIVERS_DIR, `api-${match[1]}.json`), 'utf-8'));
-    for (const clazz of json) {
-      add(since, `# class: ${clazz.name}`, version);
-      for (const member of clazz.members) {
-        add(since, `## ${member.async ? 'async ' : ''}${member.kind}: ${clazz.name}.${member.name}`, version);
-        for (const arg of member.args) {
-          if (arg.name === 'options') {
-            for (const option of arg.type.properties)
-              add(since, `### option: ${clazz.name}.${member.name}.${option.name}`, version);
-          } else {
-            add(since, `### param: ${clazz.name}.${member.name}.${arg.name}`, version);
-          }
-        }
-      }
-    }
-  }
-
-  // Patch docs
-  for (const name of fs.readdirSync('docs/src/api')) {
-    const lines = fs.readFileSync(path.join('docs/src/api', name), 'utf-8');
-    const toPatch = new Map();
-    for (const line of lines.split('\n')) {
-      if (!line.startsWith('# class:') && !line.startsWith('## method:') && !line.startsWith('## async method:') && !line.startsWith('## property:') && !line.startsWith('## event:') && !line.startsWith('### param:') && !line.startsWith('### option:'))
-        continue;
-      const key = line.includes('=') ? line.substring(0, line.indexOf('=')).trim() : line;
-      const version = since.get(key);
-      console.log(key);
-
-      if (!version) {
-        console.log('Not yet released: ' + line);
-        continue;
-      }
-        
-      toPatch.set(line +'\n', line + `\n* since: v${version}\n`);
-    }
-    if (toPatch.size) {
-      let newContent = lines;
-      for (const [from, to] of toPatch)
-        newContent = newContent.replace(new RegExp(from, 'g'), to);
-      fs.writeFileSync(path.join('docs/src/api', name), newContent);
-    }
-  }
-
-})();
-
-function add(since, name, version) {
-  let v = since.get(name);
-  if (!v || (+v.split('.')[1]) > (+version.split('.')[1]))
-    since.set(name, version);
-}
diff --git a/utils/doclint/templates/interface.cs b/utils/doclint/templates/interface.cs
index a0fadccb2d6a5..317de64aeacec 100644
--- a/utils/doclint/templates/interface.cs
+++ b/utils/doclint/templates/interface.cs
@@ -35,10 +35,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
-
 namespace Microsoft.Playwright;
 
 [CONTENT]
-
-#nullable disable
diff --git a/utils/draft_release_notes.sh b/utils/draft_release_notes.sh
deleted file mode 100755
index c27df96a4aaf8..0000000000000
--- a/utils/draft_release_notes.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -e
-set +x
-
-trap "cd $(pwd -P)" EXIT
-cd "$(dirname $0)"
-
-git fetch --tags git@github.com:microsoft/playwright.git >/dev/null 2>/dev/null
-LAST_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
-
-echo "## Highlights"
-echo
-echo "TODO: asked teammates for the highlights"
-echo
-echo "## Browser Versions"
-echo
-node ./print_versions.js
-echo
-echo "## New APIs"
-echo
-echo "TODO: \`git diff -w ${LAST_RELEASE}..HEAD src/client\`"
-echo
-CLOSED_ISSUES=$(./list_closed_issues.sh "${LAST_RELEASE}")
-ISSUES_COUNT=$(echo "${CLOSED_ISSUES}" | wc -l | xargs)
-echo "<details>"
-echo "  <summary><b>Issues Closed (${ISSUES_COUNT})</b></summary>"
-echo
-echo "${CLOSED_ISSUES}"
-echo
-echo "</details>"
-
-COMMITS=$(git log --pretty="%h - %s" "${LAST_RELEASE}"..HEAD)
-COMMITS_COUNT=$(echo "${COMMITS}" | wc -l | xargs)
-echo "<details>"
-echo "  <summary><b>Commits (${COMMITS_COUNT})</b></summary>"
-echo
-echo "${COMMITS}"
-echo
-echo "</details>"
diff --git a/utils/eslint-plugin-internal-playwright/package.json b/utils/eslint-plugin-internal-playwright/package.json
deleted file mode 100644
index c6de47abf7549..0000000000000
--- a/utils/eslint-plugin-internal-playwright/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "eslint-plugin-internal-playwright",
-  "version": "0.0.1",
-  "main": "index.js"
-}
diff --git a/utils/eslint-plugin-internal-playwright/rules/await-promise-in-class-returns.js b/utils/eslint-plugin-internal-playwright/rules/await-promise-in-class-returns.js
deleted file mode 100644
index a71412c617920..0000000000000
--- a/utils/eslint-plugin-internal-playwright/rules/await-promise-in-class-returns.js
+++ /dev/null
@@ -1,54 +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.
- */
-const { ESLintUtils } = require('@typescript-eslint/utils');
-const tsutils = require('ts-api-utils');
-
-module.exports = {
-  meta: {
-    type: 'problem',
-    docs: {
-      description: 'ensure that return statements in classes await their promises so we always have the full stack trace in channel owners/tracing apiName extraction',
-      category: 'Best Practices',
-      recommended: false,
-    },
-    schema: [],
-    fixable: 'code',
-  },
-  create(context) {
-    const parserServices = ESLintUtils.getParserServices(context);
-    return {
-      'ClassDeclaration MethodDefinition ReturnStatement': function (statement) {
-        if (statement.type === 'ReturnStatement' && statement.argument) {
-          if (tsutils.isThenableType(
-            parserServices.program.getTypeChecker(),
-            statement.argument,
-            parserServices.getTypeAtLocation(statement.argument)
-          )) {
-            context.report({
-              node: statement,
-              message: 'Return statement in a class should await a promise so we are able to extract the whole stack trace when reporting it to e.g. Trace Viewer',
-              fix(fixer) {
-                const sourceCode = context.getSourceCode();
-                const returnKeyword = sourceCode.getFirstToken(statement);
-                return fixer.insertTextAfter(returnKeyword, ' await');
-              }
-            });
-          }
-        }
-      },
-    };
-  },
-};
diff --git a/utils/flakiness-dashboard/README.md b/utils/flakiness-dashboard/README.md
index 7ea2c92a7f918..832ee54792670 100644
--- a/utils/flakiness-dashboard/README.md
+++ b/utils/flakiness-dashboard/README.md
@@ -5,24 +5,20 @@ The data is consumed by https://devops.playwright.dev/flakiness.html
 
 ## Publish
 
-Azure Functions Core Tools is not available on macOS M1 yet, so we use GitHub Codespaces to publish the function.
-
-### Via GitHub Codespaces:
-
-- Install [Azure Functions Core Tools version 4](https://learn.microsoft.com/en-us/azure/azure-functions/functions-run-local?tabs=linux%2Cisolated-process%2Cnode-v4%2Cpython-v2%2Chttp-trigger%2Ccontainer-apps&pivots=programming-language-javascript):
+- Install [Azure Functions Core Tools version 4](https://learn.microsoft.com/en-us/azure/azure-functions/functions-run-local?tabs=macos%2Cisolated-process%2Cnode-v4%2Cpython-v2%2Chttp-trigger%2Ccontainer-apps&pivots=programming-language-javascript):
   ```
-  curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
-  mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
-  sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list'
-  apt-get update && apt-get install azure-functions-core-tools-4 sudo
+  brew tap azure/functions
+  brew install azure-functions-core-tools@4
+  # if upgrading on a machine that has 2.x or 3.x installed:
+  brew link --overwrite azure-functions-core-tools@4
   ```
 - Install Azure CLI:
   ```bash
-  curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
+  brew update && brew install azure-cli
   ```
-- Login to Azure:
+- Login to Azure CLI and select the subscription (popup will open):
   ```bash
-  az login --use-device-code
+  az login
   ```
 - Install NPM Deps (`node_modules/` folder will be published as-is):
   ```
diff --git a/utils/flakiness-dashboard/host.json b/utils/flakiness-dashboard/host.json
index 6432c26df3bf2..851a54849c091 100644
--- a/utils/flakiness-dashboard/host.json
+++ b/utils/flakiness-dashboard/host.json
@@ -12,6 +12,9 @@
     "queues": {
       "batchSize": 1,
       "newBatchThreshold": 0
+    },
+    "blobs": {
+      "maxDegreeOfParallelism": 1
     }
   },
   "extensionBundle": {
diff --git a/utils/flakiness-dashboard/package-lock.json b/utils/flakiness-dashboard/package-lock.json
index abb1e23ae0416..83c1977b7d066 100644
--- a/utils/flakiness-dashboard/package-lock.json
+++ b/utils/flakiness-dashboard/package-lock.json
@@ -1,13 +1,13 @@
 {
   "name": "flakiness-dashboard",
-  "lockfileVersion": 2,
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "flakiness-dashboard",
       "dependencies": {
-        "@azure/identity": "^4.2.1",
-        "@azure/storage-blob": "^12.17.0"
+        "@azure/identity": "^4.10.2",
+        "@azure/storage-blob": "^12.27.0"
       }
     },
     "node_modules/@azure/abort-controller": {
@@ -27,12 +27,13 @@
       "integrity": "sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg=="
     },
     "node_modules/@azure/core-auth": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz",
-      "integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.9.0.tgz",
+      "integrity": "sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==",
+      "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.0.0",
-        "@azure/core-util": "^1.1.0",
+        "@azure/core-util": "^1.11.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -78,39 +79,30 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/core-client/node_modules/@azure/core-tracing": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
-      "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
+    "node_modules/@azure/core-http-compat": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.0.tgz",
+      "integrity": "sha512-qLQujmUypBBG0gxHd0j6/Jdmul6ttl24c8WGiLXIk7IHXdBlfoBqW27hyz3Xn6xbfdyVSarl1Ttbk0AwnZBYCw==",
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-client": "^1.3.0",
+        "@azure/core-rest-pipeline": "^1.20.0"
       },
       "engines": {
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/core-http": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz",
-      "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==",
+    "node_modules/@azure/core-http-compat/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-tracing": "1.0.0-preview.13",
-        "@azure/core-util": "^1.1.1",
-        "@azure/logger": "^1.0.0",
-        "@types/node-fetch": "^2.5.0",
-        "@types/tunnel": "^0.0.3",
-        "form-data": "^4.0.0",
-        "node-fetch": "^2.6.7",
-        "process": "^0.11.10",
-        "tslib": "^2.2.0",
-        "tunnel": "^0.0.6",
-        "uuid": "^8.3.0",
-        "xml2js": "^0.5.0"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@azure/core-lro": {
@@ -139,17 +131,17 @@
       }
     },
     "node_modules/@azure/core-rest-pipeline": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.15.2.tgz",
-      "integrity": "sha512-BmWfpjc/QXc2ipHOh6LbUzp3ONCaa6xzIssTU0DwH9bbYNXJlGUL6tujx5TrbVd/QQknmS+vlQJGrCq2oL1gZA==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.21.0.tgz",
+      "integrity": "sha512-a4MBwe/5WKbq9MIxikzgxLBbruC5qlkFYlBdI7Ev50Y7ib5Vo/Jvt5jnJo7NaWeJ908LCHL0S1Us4UMf1VoTfg==",
+      "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.4.0",
+        "@azure/core-auth": "^1.8.0",
         "@azure/core-tracing": "^1.0.1",
-        "@azure/core-util": "^1.3.0",
+        "@azure/core-util": "^1.11.0",
         "@azure/logger": "^1.0.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
+        "@typespec/ts-http-runtime": "^0.2.3",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -167,10 +159,11 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/core-rest-pipeline/node_modules/@azure/core-tracing": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
-      "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
+    "node_modules/@azure/core-tracing": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.2.0.tgz",
+      "integrity": "sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -178,24 +171,14 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@azure/core-tracing": {
-      "version": "1.0.0-preview.13",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
-      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
-      "dependencies": {
-        "@opentelemetry/api": "^1.0.1",
-        "tslib": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/@azure/core-util": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz",
-      "integrity": "sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.12.0.tgz",
+      "integrity": "sha512-13IyjTQgABPARvG90+N2dXpC+hwp466XCdQXPCRlbWHgd3SJd5Q1VvaBGv6k1BIa4MQm6hAF1UBU1m8QUxV8sQ==",
+      "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.0.0",
+        "@typespec/ts-http-runtime": "^0.2.2",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -213,34 +196,46 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@azure/core-xml": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@azure/core-xml/-/core-xml-1.4.5.tgz",
+      "integrity": "sha512-gT4H8mTaSXRz7eGTuQyq1aIJnJqeXzpOe9Ay7Z3FrCouer14CbV3VzjnJrNrQfbBpGBLO9oy8BmrY75A0p53cA==",
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-parser": "^5.0.7",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@azure/identity": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz",
-      "integrity": "sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.10.2.tgz",
+      "integrity": "sha512-Uth4vz0j+fkXCkbvutChUj03PDCokjbC6Wk9JT8hHEUtpy/EurNKAseb3+gO6Zi9VYBvwt61pgbzn1ovk942Qg==",
+      "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.5.0",
-        "@azure/core-client": "^1.4.0",
-        "@azure/core-rest-pipeline": "^1.1.0",
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-client": "^1.9.2",
+        "@azure/core-rest-pipeline": "^1.17.0",
         "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.3.0",
+        "@azure/core-util": "^1.11.0",
         "@azure/logger": "^1.0.0",
-        "@azure/msal-browser": "^3.11.1",
-        "@azure/msal-node": "^2.9.2",
-        "events": "^3.0.0",
-        "jws": "^4.0.0",
-        "open": "^8.0.0",
-        "stoppable": "^1.1.0",
+        "@azure/msal-browser": "^4.2.0",
+        "@azure/msal-node": "^3.5.0",
+        "open": "^10.1.0",
         "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
-    "node_modules/@azure/identity/node_modules/@azure/core-tracing": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
-      "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
+    "node_modules/@azure/identity/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -260,30 +255,33 @@
       }
     },
     "node_modules/@azure/msal-browser": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.13.0.tgz",
-      "integrity": "sha512-fD906nmJei3yE7la6DZTdUtXKvpwzJURkfsiz9747Icv4pit77cegSm6prJTKLQ1fw4iiZzrrWwxnhMLrTf5gQ==",
+      "version": "4.15.0",
+      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.15.0.tgz",
+      "integrity": "sha512-+AIGTvpVz+FIx5CsM1y+nW0r/qOb/ChRdM8/Cbp+jKWC0Wdw4ldnwPdYOBi5NaALUQnYITirD9XMZX7LdklEzQ==",
+      "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.9.0"
+        "@azure/msal-common": "15.8.1"
       },
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-common": {
-      "version": "14.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.9.0.tgz",
-      "integrity": "sha512-yzBPRlWPnTBeixxLNI3BBIgF5/bHpbhoRVuuDBnYjCyWRavaPUsKAHUDYLqpGkBLDciA6TCc6GOxN4/S3WiSxg==",
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.8.1.tgz",
+      "integrity": "sha512-ltIlFK5VxeJ5BurE25OsJIfcx1Q3H/IZg2LjV9d4vmH+5t4c1UCyRQ/HgKLgXuCZShs7qfc/TC95GYZfsUsJUQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/@azure/msal-node": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz",
-      "integrity": "sha512-8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==",
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-3.6.3.tgz",
+      "integrity": "sha512-95wjsKGyUcAd5tFmQBo5Ug/kOj+hFh/8FsXuxluEvdfbgg6xCimhSP9qnyq6+xIg78/jREkBD1/BSqd7NIDDYQ==",
+      "license": "MIT",
       "dependencies": {
-        "@azure/msal-common": "14.12.0",
+        "@azure/msal-common": "15.8.1",
         "jsonwebtoken": "^9.0.0",
         "uuid": "^8.3.0"
       },
@@ -291,113 +289,93 @@
         "node": ">=16"
       }
     },
-    "node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
-      "version": "14.12.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz",
-      "integrity": "sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@azure/storage-blob": {
-      "version": "12.17.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.17.0.tgz",
-      "integrity": "sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==",
+      "version": "12.27.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.27.0.tgz",
+      "integrity": "sha512-IQjj9RIzAKatmNca3D6bT0qJ+Pkox1WZGOg2esJF2YLHb45pQKOwGPIAV+w3rfgkj7zV3RMxpn/c6iftzSOZJQ==",
+      "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-http": "^3.0.0",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.4.0",
+        "@azure/core-client": "^1.6.2",
+        "@azure/core-http-compat": "^2.0.0",
         "@azure/core-lro": "^2.2.0",
         "@azure/core-paging": "^1.1.1",
-        "@azure/core-tracing": "1.0.0-preview.13",
+        "@azure/core-rest-pipeline": "^1.10.1",
+        "@azure/core-tracing": "^1.1.2",
+        "@azure/core-util": "^1.6.1",
+        "@azure/core-xml": "^1.4.3",
         "@azure/logger": "^1.0.0",
         "events": "^3.0.0",
         "tslib": "^2.2.0"
       },
       "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/api": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz",
-      "integrity": "sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
-    },
-    "node_modules/@types/node-fetch": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz",
-      "integrity": "sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w==",
-      "dependencies": {
-        "@types/node": "*",
-        "form-data": "^3.0.0"
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/@types/node-fetch/node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+    "node_modules/@azure/storage-blob/node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
+      "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
+      "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "tslib": "^2.6.2"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=18.0.0"
       }
     },
-    "node_modules/@types/tunnel": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
-      "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==",
+    "node_modules/@typespec/ts-http-runtime": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.2.3.tgz",
+      "integrity": "sha512-oRhjSzcVjX8ExyaF8hC0zzTqxlVuRlgMHL/Bh4w3xB9+wjbm0FpXylVU/lBrn+kgphwYTrOk3tp+AVShGmlYCg==",
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 14"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
     "node_modules/buffer-equal-constant-time": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "license": "BSD-3-Clause"
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+      "license": "MIT",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "run-applescript": "^7.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -408,26 +386,51 @@
         }
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+    "node_modules/default-browser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "license": "MIT",
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+    "node_modules/default-browser-id": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
       "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "license": "Apache-2.0",
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -440,23 +443,29 @@
         "node": ">=0.8.x"
       }
     },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+    "node_modules/fast-xml-parser": {
+      "version": "5.2.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+      "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "strnum": "^2.1.0"
       },
-      "engines": {
-        "node": ">= 6"
+      "bin": {
+        "fxparser": "src/cli/cli.js"
       }
     },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
       "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^7.1.0",
         "debug": "^4.3.4"
@@ -466,11 +475,12 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
       "dependencies": {
-        "agent-base": "^7.0.2",
+        "agent-base": "^7.1.2",
         "debug": "4"
       },
       "engines": {
@@ -478,34 +488,58 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
+      "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/jsonwebtoken": {
       "version": "9.0.2",
       "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
       "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+      "license": "MIT",
       "dependencies": {
         "jws": "^3.2.2",
         "lodash.includes": "^4.3.0",
@@ -523,144 +557,103 @@
         "npm": ">=6"
       }
     },
-    "node_modules/jsonwebtoken/node_modules/jwa": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+    "node_modules/jwa": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.2.tgz",
+      "integrity": "sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==",
+      "license": "MIT",
       "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
+        "buffer-equal-constant-time": "^1.0.1",
         "ecdsa-sig-formatter": "1.0.11",
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/jsonwebtoken/node_modules/jws": {
+    "node_modules/jws": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
       "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "license": "MIT",
       "dependencies": {
         "jwa": "^1.4.1",
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/jwa": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-      "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "dependencies": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/lodash.includes": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+      "license": "MIT"
     },
     "node_modules/lodash.isboolean": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "license": "MIT"
     },
     "node_modules/lodash.isinteger": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+      "license": "MIT"
     },
     "node_modules/lodash.isnumber": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+      "license": "MIT"
     },
     "node_modules/lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "license": "MIT"
     },
     "node_modules/lodash.isstring": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+      "license": "MIT"
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "license": "MIT"
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz",
+      "integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==",
+      "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "wsl-utils": "^0.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+    "node_modules/run-applescript": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
+      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.6.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/safe-buffer": {
@@ -680,17 +673,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      ],
+      "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -698,664 +688,47 @@
         "node": ">=10"
       }
     },
-    "node_modules/stoppable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
-      "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
-      "engines": {
-        "node": ">=4",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    "node_modules/strnum": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+      "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "node_modules/tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
     },
     "node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+    "node_modules/wsl-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz",
+      "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==",
+      "license": "MIT",
       "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/xml2js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
+        "is-wsl": "^3.1.0"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    }
-  },
-  "dependencies": {
-    "@azure/abort-controller": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
-      "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==",
-      "requires": {
-        "tslib": "^2.2.0"
-      }
-    },
-    "@azure/core-asynciterator-polyfill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz",
-      "integrity": "sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg=="
-    },
-    "@azure/core-auth": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz",
-      "integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==",
-      "requires": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-util": "^1.1.0",
-        "tslib": "^2.6.2"
+        "node": ">=18"
       },
-      "dependencies": {
-        "@azure/abort-controller": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-          "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        }
-      }
-    },
-    "@azure/core-client": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.9.2.tgz",
-      "integrity": "sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==",
-      "requires": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.4.0",
-        "@azure/core-rest-pipeline": "^1.9.1",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.6.1",
-        "@azure/logger": "^1.0.0",
-        "tslib": "^2.6.2"
-      },
-      "dependencies": {
-        "@azure/abort-controller": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-          "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        },
-        "@azure/core-tracing": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
-          "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        }
-      }
-    },
-    "@azure/core-http": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz",
-      "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==",
-      "requires": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.3.0",
-        "@azure/core-tracing": "1.0.0-preview.13",
-        "@azure/core-util": "^1.1.1",
-        "@azure/logger": "^1.0.0",
-        "@types/node-fetch": "^2.5.0",
-        "@types/tunnel": "^0.0.3",
-        "form-data": "^4.0.0",
-        "node-fetch": "^2.6.7",
-        "process": "^0.11.10",
-        "tslib": "^2.2.0",
-        "tunnel": "^0.0.6",
-        "uuid": "^8.3.0",
-        "xml2js": "^0.5.0"
-      }
-    },
-    "@azure/core-lro": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.2.tgz",
-      "integrity": "sha512-tucUutPhBwCPu6v16KEFYML81npEL6gnT+iwewXvK5ZD55sr0/Vw2jfQETMiKVeARRrXHB2QQ3SpxxGi1zAUWg==",
-      "requires": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-util": "^1.2.0",
-        "@azure/logger": "^1.0.0",
-        "tslib": "^2.2.0"
-      }
-    },
-    "@azure/core-paging": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.1.3.tgz",
-      "integrity": "sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==",
-      "requires": {
-        "@azure/core-asynciterator-polyfill": "^1.0.0"
-      }
-    },
-    "@azure/core-rest-pipeline": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.15.2.tgz",
-      "integrity": "sha512-BmWfpjc/QXc2ipHOh6LbUzp3ONCaa6xzIssTU0DwH9bbYNXJlGUL6tujx5TrbVd/QQknmS+vlQJGrCq2oL1gZA==",
-      "requires": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.4.0",
-        "@azure/core-tracing": "^1.0.1",
-        "@azure/core-util": "^1.3.0",
-        "@azure/logger": "^1.0.0",
-        "http-proxy-agent": "^7.0.0",
-        "https-proxy-agent": "^7.0.0",
-        "tslib": "^2.6.2"
-      },
-      "dependencies": {
-        "@azure/abort-controller": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-          "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        },
-        "@azure/core-tracing": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
-          "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        }
-      }
-    },
-    "@azure/core-tracing": {
-      "version": "1.0.0-preview.13",
-      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
-      "integrity": "sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==",
-      "requires": {
-        "@opentelemetry/api": "^1.0.1",
-        "tslib": "^2.2.0"
-      }
-    },
-    "@azure/core-util": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz",
-      "integrity": "sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==",
-      "requires": {
-        "@azure/abort-controller": "^2.0.0",
-        "tslib": "^2.6.2"
-      },
-      "dependencies": {
-        "@azure/abort-controller": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
-          "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        }
-      }
-    },
-    "@azure/identity": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz",
-      "integrity": "sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==",
-      "requires": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-auth": "^1.5.0",
-        "@azure/core-client": "^1.4.0",
-        "@azure/core-rest-pipeline": "^1.1.0",
-        "@azure/core-tracing": "^1.0.0",
-        "@azure/core-util": "^1.3.0",
-        "@azure/logger": "^1.0.0",
-        "@azure/msal-browser": "^3.11.1",
-        "@azure/msal-node": "^2.9.2",
-        "events": "^3.0.0",
-        "jws": "^4.0.0",
-        "open": "^8.0.0",
-        "stoppable": "^1.1.0",
-        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "@azure/core-tracing": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz",
-          "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==",
-          "requires": {
-            "tslib": "^2.6.2"
-          }
-        }
-      }
-    },
-    "@azure/logger": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz",
-      "integrity": "sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==",
-      "requires": {
-        "tslib": "^2.2.0"
-      }
-    },
-    "@azure/msal-browser": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.13.0.tgz",
-      "integrity": "sha512-fD906nmJei3yE7la6DZTdUtXKvpwzJURkfsiz9747Icv4pit77cegSm6prJTKLQ1fw4iiZzrrWwxnhMLrTf5gQ==",
-      "requires": {
-        "@azure/msal-common": "14.9.0"
-      }
-    },
-    "@azure/msal-common": {
-      "version": "14.9.0",
-      "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.9.0.tgz",
-      "integrity": "sha512-yzBPRlWPnTBeixxLNI3BBIgF5/bHpbhoRVuuDBnYjCyWRavaPUsKAHUDYLqpGkBLDciA6TCc6GOxN4/S3WiSxg=="
-    },
-    "@azure/msal-node": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz",
-      "integrity": "sha512-8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==",
-      "requires": {
-        "@azure/msal-common": "14.12.0",
-        "jsonwebtoken": "^9.0.0",
-        "uuid": "^8.3.0"
-      },
-      "dependencies": {
-        "@azure/msal-common": {
-          "version": "14.12.0",
-          "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz",
-          "integrity": "sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw=="
-        }
-      }
-    },
-    "@azure/storage-blob": {
-      "version": "12.17.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.17.0.tgz",
-      "integrity": "sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==",
-      "requires": {
-        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-http": "^3.0.0",
-        "@azure/core-lro": "^2.2.0",
-        "@azure/core-paging": "^1.1.1",
-        "@azure/core-tracing": "1.0.0-preview.13",
-        "@azure/logger": "^1.0.0",
-        "events": "^3.0.0",
-        "tslib": "^2.2.0"
-      }
-    },
-    "@opentelemetry/api": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz",
-      "integrity": "sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="
-    },
-    "@types/node": {
-      "version": "18.15.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-      "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
-    },
-    "@types/node-fetch": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz",
-      "integrity": "sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w==",
-      "requires": {
-        "@types/node": "*",
-        "form-data": "^3.0.0"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
-      }
-    },
-    "@types/tunnel": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz",
-      "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-      "requires": {
-        "debug": "^4.3.4"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "http-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
-      "requires": {
-        "agent-base": "^7.1.0",
-        "debug": "^4.3.4"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
-      "requires": {
-        "agent-base": "^7.0.2",
-        "debug": "4"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "jsonwebtoken": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
-      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
-      "requires": {
-        "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
-        "ms": "^2.1.1",
-        "semver": "^7.5.4"
-      },
-      "dependencies": {
-        "jwa": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-          "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-          "requires": {
-            "buffer-equal-constant-time": "1.0.1",
-            "ecdsa-sig-formatter": "1.0.11",
-            "safe-buffer": "^5.0.1"
-          }
-        },
-        "jws": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-          "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-          "requires": {
-            "jwa": "^1.4.1",
-            "safe-buffer": "^5.0.1"
-          }
-        }
-      }
-    },
-    "jwa": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-      "requires": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "jws": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "requires": {
-        "jwa": "^2.0.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "lodash.includes": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
-    },
-    "lodash.isboolean": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
-    },
-    "lodash.isinteger": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
-    },
-    "lodash.isnumber": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
-    },
-    "lodash.once": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node-fetch": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-      "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      }
-    },
-    "open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w=="
-    },
-    "stoppable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
-      "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="
-    },
-    "tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
-    "tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
-    },
-    "tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-    },
-    "whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "requires": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "xml2js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
     }
   }
 }
diff --git a/utils/flakiness-dashboard/package.json b/utils/flakiness-dashboard/package.json
index 29f60a6b70761..931546335a1eb 100644
--- a/utils/flakiness-dashboard/package.json
+++ b/utils/flakiness-dashboard/package.json
@@ -5,7 +5,7 @@
   "main": "processing/index.js",
   "author": "",
   "dependencies": {
-    "@azure/identity": "^4.2.1",
-    "@azure/storage-blob": "^12.17.0"
+    "@azure/identity": "^4.10.2",
+    "@azure/storage-blob": "^12.27.0"
   }
 }
diff --git a/utils/generate_channels.js b/utils/generate_channels.js
index 9da221f97e7ad..9466dd843f7a2 100755
--- a/utils/generate_channels.js
+++ b/utils/generate_channels.js
@@ -18,7 +18,6 @@
 // @ts-check
 
 const fs = require('fs');
-const os = require('os');
 const path = require('path');
 const yaml = require('yaml');
 
@@ -42,8 +41,12 @@ function inlineType(type, indent, wrapEnums = false) {
       return { ts: 'Binary', scheme: 'tBinary', optional };
     if (type === 'json')
       return { ts: 'any', scheme: 'tAny', optional };
-    if (['string', 'boolean', 'number', 'undefined'].includes(type))
+    if (['string', 'boolean', 'undefined'].includes(type))
       return { ts: type, scheme: `t${titleCase(type)}`, optional };
+    if (type === 'number')
+      throw new Error('Use "int" or "float" instead of "number" in protocol.yml');
+    if (type === 'int' || type === 'float')
+      return { ts: 'number', scheme: `t${titleCase(type)}`, optional };
     if (channels.has(type)) {
       let derived = derivedClasses.get(type) || [];
       derived = [...derived, type];
@@ -127,6 +130,7 @@ const channels_ts = [
 // This file is generated by ${path.basename(__filename).split(path.sep).join(path.posix.sep)}, do not edit manually.
 
 import type { CallMetadata } from './callMetadata';
+import type { Progress } from './progress';
 
 export type Binary = Buffer;
 
@@ -153,12 +157,12 @@ const validator_ts = [
 
 // This file is generated by ${path.basename(__filename)}, do not edit manually.
 
-import { scheme, tOptional, tObject, tBoolean, tNumber, tString, tAny, tEnum, tArray, tBinary, tChannel, tType } from './validatorPrimitives';
+import { scheme, tOptional, tObject, tBoolean, tInt, tFloat, tString, tAny, tEnum, tArray, tBinary, tChannel, tType } from './validatorPrimitives';
 export type { Validator, ValidatorContext } from './validatorPrimitives';
 export { ValidationError, findValidator, maybeFindValidator, createMetadataValidator } from './validatorPrimitives';
 `];
 
-const debug_ts = [
+const metainfo_ts = [
 `/**
  * Copyright (c) Microsoft Corporation.
  *
@@ -178,9 +182,7 @@ const debug_ts = [
 // This file is generated by ${path.basename(__filename).split(path.sep).join(path.posix.sep)}, do not edit manually.
 `];
 
-const slowMoActions = [];
-const tracingSnapshots = [];
-const pausesBeforeInputActions = [];
+const methodMetainfo = [];
 
 const yml = fs.readFileSync(path.join(__dirname, '..', 'packages', 'protocol', 'src', 'protocol.yml'), 'utf-8');
 const protocol = yaml.parse(yml);
@@ -279,21 +281,35 @@ for (const [name, item] of Object.entries(protocol)) {
     for (let [methodName, method] of Object.entries(item.commands || {})) {
       if (method === null)
         method = {};
-      if (method.flags?.slowMo) {
-        slowMoActions.push(name + '.' + methodName);
-        for (const derived of derivedClasses.get(name) || [])
-          slowMoActions.push(derived + '.' + methodName);
-      }
-      if (method.flags?.snapshot) {
-        tracingSnapshots.push(name + '.' + methodName);
-        for (const derived of derivedClasses.get(name) || [])
-          tracingSnapshots.push(derived + '.' + methodName);
-      }
-      if (method.flags?.pausesBeforeInput) {
-        pausesBeforeInputActions.push(name + '.' + methodName);
-        for (const derived of derivedClasses.get(name) || [])
-          pausesBeforeInputActions.push(derived + '.' + methodName);
+
+
+      for (const className of [name, ...(derivedClasses.get(name) || [])]) {
+        if (method.flags?.slowMo && method.internal)
+          throw new Error(`Method "${className}.${methodName}" has "slowMo" flag, so cannot be "internal" in protocol.yml`);
+        if (method.flags?.snapshot && method.internal)
+          throw new Error(`Method "${className}.${methodName}" has "snapshot" flag, so cannot be "internal" in protocol.yml`);
+        if (method.flags?.pausesBeforeInput && method.internal)
+          throw new Error(`Method "${className}.${methodName}" has "pausesBeforeInput" flag, so cannot be "internal" in protocol.yml`);
+        if (method.flags?.pausesBeforeAction && method.internal)
+          throw new Error(`Method "${className}.${methodName}" has "pausesBeforeAction" flag, so cannot be "internal" in protocol.yml`);
+        if (method.flags?.pausesBeforeInput && method.flags?.pausesBeforeAction)
+          throw new Error(`Method "${className}.${methodName}" cannot have both "pausesBeforeInput" and "pausesBeforeAction" flags in protocol.yml`);
+        if (!method.title && !method.internal)
+          throw new Error(`Method "${className}.${methodName}" must have a "title" because it is not "internal" in protocol.yml`);
+        if (method.group && method.internal)
+          throw new Error(`Method "${className}.${methodName}" must should not specify "group" because it is "internal" in protocol.yml`);
+        if (method.group && !['getter', 'configuration', 'route', 'default'].includes(method.group))
+          throw new Error(`Unknown group "${method.group}" for method "${className}.${methodName}" in protocol.yml`);
+        const internalProp = method.internal ? ` internal: ${method.internal},` : '';
+        const titleProp = method.title ? ` title: '${method.title}',` : '';
+        const groupProp = method.group ? ` group: '${method.group}',` : '';
+        const slowMoProp = method.flags?.slowMo ? ` slowMo: ${method.flags.slowMo},` : '';
+        const snapshotProp = method.flags?.snapshot ? ` snapshot: ${method.flags.snapshot},` : '';
+        const pausesBeforeInputProp = method.flags?.pausesBeforeInput ? ` pausesBeforeInput: ${method.flags.pausesBeforeInput},` : '';
+        const pausesBeforeActionProp = method.flags?.pausesBeforeAction ? ` pausesBeforeAction: ${method.flags.pausesBeforeAction},` : '';
+        methodMetainfo.push(`['${className + '.' + methodName}', {${internalProp}${titleProp}${slowMoProp}${snapshotProp}${pausesBeforeInputProp}${pausesBeforeActionProp}${groupProp} }]`);
       }
+
       const parameters = objectType(method.parameters || {}, '');
       const paramsName = `${channelName}${titleCase(methodName)}Params`;
       const optionsName = `${channelName}${titleCase(methodName)}Options`;
@@ -310,7 +326,7 @@ for (const [name, item] of Object.entries(protocol)) {
       for (const derived of derivedClasses.get(channelName) || [])
         addScheme(`${derived}${titleCase(methodName)}Result`, `tType('${resultName}')`);
 
-      channels_ts.push(`  ${methodName}(params${method.parameters ? '' : '?'}: ${paramsName}, metadata?: CallMetadata): Promise<${resultName}>;`);
+      channels_ts.push(`  ${methodName}(params${method.parameters ? '' : '?'}: ${paramsName}, progress?: Progress): Promise<${resultName}>;`);
     }
 
     channels_ts.push(`}`);
@@ -335,16 +351,8 @@ for (const [name, item] of Object.entries(protocol)) {
   }
 }
 
-debug_ts.push(`export const slowMoActions = new Set([
-  '${slowMoActions.join(`',\n  '`)}'
-]);`);
-debug_ts.push('');
-debug_ts.push(`export const commandsWithTracingSnapshots = new Set([
-  '${tracingSnapshots.join(`',\n  '`)}'
-]);`);
-debug_ts.push('');
-debug_ts.push(`export const pausesBeforeInputActions = new Set([
-  '${pausesBeforeInputActions.join(`',\n  '`)}'
+metainfo_ts.push(`export const methodMetainfo = new Map<string, { internal?: boolean, title?: string, slowMo?: boolean, snapshot?: boolean, pausesBeforeInput?: boolean, pausesBeforeAction?: boolean, group?: string }>([
+  ${methodMetainfo.join(`,\n  `)}
 ]);`);
 
 let hasChanges = false;
@@ -362,7 +370,7 @@ function writeFile(filePath, content) {
   fs.writeFileSync(filePath, content, 'utf8');
 }
 
-writeFile(path.join(__dirname, '..', 'packages', 'protocol', 'src', 'channels.ts'), channels_ts.join('\n'));
-writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'protocol', 'debug.ts'), debug_ts.join('\n'));
-writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'protocol', 'validator.ts'), validator_ts.join('\n'));
+writeFile(path.join(__dirname, '..', 'packages', 'protocol', 'src', 'channels.d.ts'), channels_ts.join('\n') + '\n');
+writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'utils', 'isomorphic', 'protocolMetainfo.ts'), metainfo_ts.join('\n') + '\n');
+writeFile(path.join(__dirname, '..', 'packages', 'playwright-core', 'src', 'protocol', 'validator.ts'), validator_ts.join('\n') + '\n');
 process.exit(hasChanges ? 1 : 0);
diff --git a/utils/generate_clip_paths.js b/utils/generate_clip_paths.js
index cbef6ece9d027..210a8405818f8 100644
--- a/utils/generate_clip_paths.js
+++ b/utils/generate_clip_paths.js
@@ -51,8 +51,8 @@ const HEADER = `/*
 import type { SvgJson } from './recorder';
 `;
 
-const iconsDir = path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'recorder', 'icons');
-const outFile = path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'recorder', 'clipPaths.ts');
+const iconsDir = path.join(ROOT, 'packages', 'injected', 'src', 'recorder', 'icons');
+const outFile = path.join(ROOT, 'packages', 'injected', 'src', 'recorder', 'clipPaths.ts');
 
 const iconNames = [
   'gripper',
@@ -64,6 +64,7 @@ const iconNames = [
   'check',
   'close',
   'pass',
+  'gist',
 ];
 
 (async () => {
@@ -94,6 +95,7 @@ const iconNames = [
     `// eslint-disable-next-line key-spacing, object-curly-spacing, comma-spacing, quotes`,
     `const svgJson: SvgJson = ${JSON.stringify(svgJson)};`,
     `export default svgJson;`,
+    '',
   ].join('\n');
   fs.writeFileSync(outFile, code, 'utf-8');
 })();
diff --git a/utils/generate_dotnet_channels.js b/utils/generate_dotnet_channels.js
index e684751729a61..00b6ea972e25b 100644
--- a/utils/generate_dotnet_channels.js
+++ b/utils/generate_dotnet_channels.js
@@ -109,7 +109,7 @@ function inlineType(type, indent = '', name, level) {
   if (type.type.startsWith('object')) {
     const optional = type.type.endsWith('?');
 
-    const custom = processCustomType(type, optional);
+    const custom = processCustomType(type, optional, name);
     if (custom)
       return custom;
     if (level >= 1) {
@@ -136,7 +136,7 @@ function properties(properties, indent, onlyOptional, parentName, level) {
       if (name === 'android' || name === 'electron')
         continue;
       if (name.startsWith('$mixin')) {
-        visitProperties(mixins.get(value).properties, parentName + toTitleCase(name));
+        visitProperties(mixins.get(value).properties, parentName);
         continue;
       }
       const inner = inlineType(value, indent, parentName + toTitleCase(name), level + 1);
@@ -144,7 +144,10 @@ function properties(properties, indent, onlyOptional, parentName, level) {
         continue;
       ts.push('');
       ts.push(`${indent}[JsonPropertyName("${name}")]`);
-      ts.push(`${indent}public ${inner.ts}${nullableSuffix(inner)} ${toTitleCase(name)} { get; set; }`);
+      let suffix = ''
+      if (!['bool', 'int', 'float', 'System.Text.Json.JsonElement'].includes(inner.ts))
+        suffix = ' = null!;'
+      ts.push(`${indent}public ${inner.ts}${nullableSuffix(inner)} ${toTitleCase(name)} { get; set; }${suffix}`);
       const wrapped = inner.optional ? `tOptional(${inner.scheme})` : inner.scheme;
       scheme.push(`${indent}${name}: ${wrapped},`);
     }
@@ -183,13 +186,15 @@ fs.mkdirSync(dir, { recursive: true });
 
 for (const [name, item] of Object.entries(protocol)) {
   if (item.type === 'interface') {
-    const init = objectType(item.initializer || {}, '');
     const initializerName = name + 'Initializer';
+    const init = objectType(item.initializer || {}, '', false, initializerName);
     const superName = inherits.has(name) ? inherits.get(name) + 'Initializer' : null;
     writeCSharpClass(initializerName, superName, init.ts);
   } else if (item.type === 'object') {
     if (Object.keys(item.properties).length === 0)
       continue;
+    if (['AXNode', 'SetNetworkCookie', 'NetworkCookie', 'IndexedDBDatabase', 'SetOriginStorage', 'OriginStorage'].includes(name))
+      continue;
     const init = objectType(item.properties, '', false, name);
     writeCSharpClass(name, null, init.ts);
   }
@@ -229,7 +234,7 @@ function toTitleCase(name) {
   return name.charAt(0).toUpperCase() + name.substring(1);
 }
 
-function processCustomType(type, optional) {
+function processCustomType(type, optional, fullName) {
   if (type.properties.name
       && type.properties.value
       && inlineType(type.properties.name).ts === 'string'
@@ -253,4 +258,6 @@ function processCustomType(type, optional) {
     && inlineType(type.properties.name).ts === 'string')
     return { ts: 'DeviceDescriptorEntry', scheme: 'tObject()', optional };
 
+  if (fullName === 'BrowserContextInitializerOptions')
+    return { ts: 'System.Text.Json.JsonElement', scheme: 'tObject()', optional };
 }
diff --git a/utils/generate_injected.js b/utils/generate_injected.js
index 80c3be5ac0a49..64a462f016b39 100644
--- a/utils/generate_injected.js
+++ b/utils/generate_injected.js
@@ -27,32 +27,44 @@ const esbuild = require('esbuild');
  */
 const injectedScripts = [
   [
-    path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'utilityScript.ts'),
-    path.join(ROOT, 'packages', 'playwright-core', 'lib', 'server', 'injected', 'packed'),
+    path.join(ROOT, 'packages', 'injected', 'src', 'utilityScript.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
     path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
     true,
   ],
   [
-    path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'injectedScript.ts'),
-    path.join(ROOT, 'packages', 'playwright-core', 'lib', 'server', 'injected', 'packed'),
+    path.join(ROOT, 'packages', 'injected', 'src', 'injectedScript.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
     path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
     true,
   ],
   [
-    path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'consoleApi.ts'),
-    path.join(ROOT, 'packages', 'playwright-core', 'lib', 'server', 'injected', 'packed'),
+    path.join(ROOT, 'packages', 'injected', 'src', 'recorder', 'pollingRecorder.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
     path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
     true,
   ],
   [
-    path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'recorder', 'recorder.ts'),
-    path.join(ROOT, 'packages', 'playwright-core', 'lib', 'server', 'injected', 'packed'),
+    path.join(ROOT, 'packages', 'injected', 'src', 'clock.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
     path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
     true,
   ],
   [
-    path.join(ROOT, 'packages', 'playwright-core', 'src', 'server', 'injected', 'clock.ts'),
-    path.join(ROOT, 'packages', 'playwright-core', 'lib', 'server', 'injected', 'packed'),
+    path.join(ROOT, 'packages', 'injected', 'src', 'storageScript.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
+    path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
+    true,
+  ],
+  [
+    path.join(ROOT, 'packages', 'injected', 'src', 'bindingsController.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
+    path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
+    true,
+  ],
+  [
+    path.join(ROOT, 'packages', 'injected', 'src', 'webSocketMock.ts'),
+    path.join(ROOT, 'packages', 'injected', 'lib'),
     path.join(ROOT, 'packages', 'playwright-core', 'src', 'generated'),
     true,
   ],
diff --git a/utils/generate_third_party_notice.js b/utils/generate_third_party_notice.js
index 27b5b4691d946..8d66a093709b5 100644
--- a/utils/generate_third_party_notice.js
+++ b/utils/generate_third_party_notice.js
@@ -17,7 +17,6 @@
 const checker = require('license-checker');
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
 
 async function checkDir(dir) {
   return await new Promise((f, r) => {
@@ -53,7 +52,6 @@ This project incorporates components from the projects listed below. The origina
       if (!bundle.isDirectory())
         continue;
       const dir = path.join(bundlesDir, bundle.name);
-      execSync('npm ci', { cwd: dir });
       const packages = await checkDir(dir);
       for (const [key, value] of Object.entries(packages)) {
         if (value.licenseText)
@@ -61,7 +59,7 @@ This project incorporates components from the projects listed below. The origina
       }
     }
 
-    const packages = await checkDir('node_modules/codemirror-shadow-1');
+    const packages = await checkDir('node_modules/codemirror');
     for (const [key, value] of Object.entries(packages)) {
       if (value.licenseText)
         allPackages[key] = value;
diff --git a/utils/generate_types/index.js b/utils/generate_types/index.js
index eb1527c80b72d..809da4c96b01d 100644
--- a/utils/generate_types/index.js
+++ b/utils/generate_types/index.js
@@ -91,27 +91,10 @@ class TypesGenerator {
       if (!docClass)
         return '';
       handledClasses.add(className);
-      return this.writeComment(docClass.comment) + '\n';
-    }, (className, methodName, overloadIndex) => {
-      if (className === 'SuiteFunction' && methodName === '__call') {
-        const cls = this.documentation.classes.get('Test');
-        if (!cls)
-          throw new Error(`Unknown class "Test"`);
-        const method = cls.membersArray.find(m => m.alias === 'describe');
-        if (!method)
-          throw new Error(`Unknown method "Test.describe"`);
-        return this.memberJSDOC(method, '  ').trimLeft();
-      }
-      if (className === 'TestFunction' && methodName === '__call') {
-        const cls = this.documentation.classes.get('Test');
-        if (!cls)
-          throw new Error(`Unknown class "Test"`);
-        const method = cls.membersArray.find(m => m.alias === '(call)');
-        if (!method)
-          throw new Error(`Unknown method "Test.(call)"`);
-        return this.memberJSDOC(method, '  ').trimLeft();
-      }
-
+      return this.writeComment(docClass.comment, '') + '\n';
+    }, (className, methodName, overloadIndex, indent) => {
+      if (methodName === '__call')
+        methodName = '(call)';
       const docClass = this.docClassForName(className);
       let method;
       if (docClass) {
@@ -127,7 +110,7 @@ class TypesGenerator {
           return '';
         throw new Error(`Unknown override method "${className}.${methodName}"`);
       }
-      return this.memberJSDOC(method, '  ').trimLeft();
+      return this.memberJSDOC(method, indent).trimLeft();
     }, (className) => {
       const docClass = this.docClassForName(className);
       if (!docClass || !this.shouldGenerate(docClass.name))
@@ -218,7 +201,7 @@ class TypesGenerator {
   classToString(classDesc) {
     const parts = [];
     if (classDesc.comment) {
-      parts.push(this.writeComment(classDesc.comment))
+      parts.push(this.writeComment(classDesc.comment, ''))
     }
     const shouldExport = !this.doNotExportClassNames.has(classDesc.name);
     parts.push(`${shouldExport ? 'export ' : ''}interface ${classDesc.name} ${classDesc.extends ? `extends ${classDesc.extends} ` : ''}{`);
@@ -258,7 +241,7 @@ class TypesGenerator {
     const descriptions = [];
     for (let [eventName, value] of classDesc.events) {
       eventName = eventName.toLowerCase();
-      const type = this.stringifyComplexType(value && value.type, 'out', '  ', classDesc.name, eventName, 'payload');
+      const type = this.stringifyComplexType(value && value.type, 'out', '  ', [classDesc.name, eventName, 'payload']);
       const argName = this.argNameForType(type);
       const params = argName ? `${argName}: ${type}` : '';
       descriptions.push({
@@ -311,8 +294,8 @@ class TypesGenerator {
         return parts.join('\n');
       }
       const jsdoc = this.memberJSDOC(member, indent);
-      const args = this.argsFromMember(member, indent, classDesc.name);
-      let type = this.stringifyComplexType(member.type, 'out', indent, classDesc.name, member.alias);
+      const args = this.argsFromMember(member, indent, [classDesc.name]);
+      let type = this.stringifyComplexType(member.type, 'out', indent, [classDesc.name, member.alias]);
       if (member.async)
         type = `Promise<${type}>`;
       // do this late, because we still want object definitions for overridden types
@@ -351,7 +334,12 @@ class TypesGenerator {
     return this.documentation.classes.get(classDesc.extends);
   }
 
-  writeComment(comment, indent = '') {
+  /**
+   * @param {string} comment
+   * @param {string} indent
+   * @returns {string}
+   */
+  writeComment(comment, indent) {
     const parts = [];
     const out = [];
     const pushLine = (line) => {
@@ -387,26 +375,30 @@ class TypesGenerator {
 
   /**
    * @param {docs.Type|null} type
+   * @param {'in' | 'out'} direction
+   * @param {string} indent
+   * @param {string[]} namespace
+   * @returns {string}
    */
-  stringifyComplexType(type, direction, indent, ...namespace) {
+  stringifyComplexType(type, direction, indent, namespace) {
     if (!type)
       return 'void';
-    return this.stringifySimpleType(type, direction, indent, ...namespace);
+    return this.stringifySimpleType(type, direction, indent, namespace);
   }
 
   /**
    * @param {docs.Member[]} properties
    * @param {string} name
-   * @param {string=} indent
+   * @param {string} indent
    * @returns {string}
    */
-  stringifyObjectType(properties, name, indent = '') {
+  stringifyObjectType(properties, name, indent) {
     const parts = [];
     parts.push(`{`);
     parts.push(properties.map(member => {
       const comment = this.memberJSDOC(member, indent + '  ');
-      const args = this.argsFromMember(member, indent + '  ', name);
-      const type = this.stringifyComplexType(member.type, 'out', indent + '  ', name, member.name);
+      const args = this.argsFromMember(member, indent + '  ', [name]);
+      const type = this.stringifyComplexType(member.type, 'out', indent + '  ', [name, member.name]);
       return `${comment}${this.nameForProperty(member)}${args}: ${type};`;
     }).join('\n\n'));
     parts.push(indent + '}');
@@ -416,14 +408,16 @@ class TypesGenerator {
   /**
    * @param {docs.Type | null | undefined} type
    * @param {'in' | 'out'} direction
-   * @returns{string}
+   * @param {string} indent
+   * @param {string[]} namespace
+   * @returns {string}
    */
-  stringifySimpleType(type, direction, indent = '', ...namespace) {
+  stringifySimpleType(type, direction, indent, namespace) {
     if (!type)
       return 'void';
     if (type.name === 'Object' && type.templates) {
-      const keyType = this.stringifySimpleType(type.templates[0], direction, indent, ...namespace);
-      const valueType = this.stringifySimpleType(type.templates[1], direction, indent, ...namespace);
+      const keyType = this.stringifySimpleType(type.templates[0], direction, indent, namespace);
+      const valueType = this.stringifySimpleType(type.templates[1], direction, indent, namespace);
       return `{ [key: ${keyType}]: ${valueType}; }`;
     }
     let out = type.name;
@@ -434,7 +428,7 @@ class TypesGenerator {
     if (type.name === 'Object' && type.properties && type.properties.length) {
       const name = namespace.map(n => n[0].toUpperCase() + n.substring(1)).join('');
       const shouldExport = exported[name];
-      const properties = namespace[namespace.length - 1] === 'options' ? type.sortedProperties() : type.properties;
+      const properties = type.properties;
       if (!properties)
         throw new Error(`Object type must have properties`);
       if (!this.objectDefinitions.some(o => o.name === name))
@@ -448,10 +442,10 @@ class TypesGenerator {
 
     if (type.args) {
       const stringArgs = type.args.map(a => ({
-        type: this.stringifySimpleType(a, direction, indent, ...namespace),
+        type: this.stringifySimpleType(a, direction, indent, namespace),
         name: a.name.toLowerCase()
       }));
-      out = `((${stringArgs.map(({ name, type }) => `${name}: ${type}`).join(', ')}) => ${this.stringifySimpleType(type.returnType, 'out', indent, ...namespace)})`;
+      out = `((${stringArgs.map(({ name, type }) => `${name}: ${type}`).join(', ')}) => ${this.stringifySimpleType(type.returnType, 'out', indent, namespace)})`;
     } else if (type.name === 'function') {
       out = 'Function';
     }
@@ -460,19 +454,22 @@ class TypesGenerator {
     if (out === 'Any')
       return 'any';
     if (type.templates)
-      out += '<' + type.templates.map(t => this.stringifySimpleType(t, direction, indent, ...namespace)).join(', ') + '>';
+      out += '<' + type.templates.map(t => this.stringifySimpleType(t, direction, indent, namespace)).join(', ') + '>';
     if (type.union)
-      out = type.union.map(t => this.stringifySimpleType(t, direction, indent, ...namespace)).join('|');
+      out = type.union.map(t => this.stringifySimpleType(t, direction, indent, namespace)).join('|');
     return out.trim();
   }
 
   /**
    * @param {docs.Member} member
+   * @param {string} indent
+   * @param {string[]} namespace
+   * @returns {string}
    */
-  argsFromMember(member, indent, ...namespace) {
+  argsFromMember(member, indent, namespace) {
     if (member.kind === 'property')
       return '';
-    return '(' + member.argsArray.map(arg => `${this.nameForProperty(arg)}: ${this.stringifyComplexType(arg.type, 'in', indent, ...namespace, member.alias, arg.alias)}`).join(', ') + ')';
+    return '(' + member.argsArray.map(arg => `${this.nameForProperty(arg)}: ${this.stringifyComplexType(arg.type, 'in', indent, [...namespace, member.alias, arg.alias])}`).join(', ') + ')';
   }
 
   /**
@@ -577,8 +574,6 @@ class TypesGenerator {
         'PlaywrightWorkerArgs.playwright',
         'PlaywrightWorkerOptions.defaultBrowserType',
         'Project',
-        'SuiteFunction',
-        'TestFunction',
       ]),
       doNotExportClassNames: assertionClasses,
     });
@@ -627,13 +622,16 @@ class TypesGenerator {
   }
 
   const coreTypesDir = path.join(PROJECT_DIR, 'packages', 'playwright-core', 'types');
+  const clientTypesDir = path.join(PROJECT_DIR, 'packages', 'playwright-client', 'types');
   if (!fs.existsSync(coreTypesDir))
     fs.mkdirSync(coreTypesDir)
   const playwrightTypesDir = path.join(PROJECT_DIR, 'packages', 'playwright', 'types');
   if (!fs.existsSync(playwrightTypesDir))
     fs.mkdirSync(playwrightTypesDir)
   writeFile(path.join(coreTypesDir, 'protocol.d.ts'), fs.readFileSync(path.join(PROJECT_DIR, 'packages', 'playwright-core', 'src', 'server', 'chromium', 'protocol.d.ts'), 'utf8'), false);
-  writeFile(path.join(coreTypesDir, 'types.d.ts'), await generateCoreTypes(), true);
+  const coreTypes = await generateCoreTypes();
+  writeFile(path.join(coreTypesDir, 'types.d.ts'), coreTypes, true);
+  writeFile(path.join(clientTypesDir, 'types.d.ts'), coreTypes, true);
   writeFile(path.join(playwrightTypesDir, 'test.d.ts'), await generateTestTypes(), true);
   writeFile(path.join(playwrightTypesDir, 'testReporter.d.ts'), await generateReporterTypes(), true);
   process.exit(0);
diff --git a/utils/generate_types/overrides-test.d.ts b/utils/generate_types/overrides-test.d.ts
index 3a42d27f83e6d..374f66f179e35 100644
--- a/utils/generate_types/overrides-test.d.ts
+++ b/utils/generate_types/overrides-test.d.ts
@@ -17,15 +17,21 @@
 import type { APIRequestContext, Browser, BrowserContext, BrowserContextOptions, Page, LaunchOptions, ViewportSize, Geolocation, HTTPCredentials, Locator, APIResponse, PageScreenshotOptions } from 'playwright-core';
 export * from 'playwright-core';
 
+export type BlobReporterOptions = { outputDir?: string, fileName?: string };
+export type ListReporterOptions = { printSteps?: boolean };
+export type JUnitReporterOptions = { outputFile?: string, stripANSIControlSequences?: boolean, includeProjectInTestName?: boolean };
+export type JsonReporterOptions = { outputFile?: string };
+export type HtmlReporterOptions = { outputFolder?: string, open?: 'always' | 'never' | 'on-failure', host?: string, port?: number, attachmentsBaseURL?: string, title?: string, noSnippets?: boolean };
+
 export type ReporterDescription = Readonly<
-  ['blob'] | ['blob', { outputDir?: string, fileName?: string }] |
+  ['blob'] | ['blob', BlobReporterOptions] |
   ['dot'] |
   ['line'] |
-  ['list'] | ['list', { printSteps?: boolean }] |
+  ['list'] | ['list', ListReporterOptions] |
   ['github'] |
-  ['junit'] | ['junit', { outputFile?: string, stripANSIControlSequences?: boolean, includeProjectInTestName?: boolean }] |
-  ['json'] | ['json', { outputFile?: string }] |
-  ['html'] | ['html', { outputFolder?: string, open?: 'always' | 'never' | 'on-failure', host?: string, port?: number, attachmentsBaseURL?: string }] |
+  ['junit'] | ['junit', JUnitReporterOptions] |
+  ['json'] | ['json', JsonReporterOptions] |
+  ['html'] | ['html', HtmlReporterOptions] |
   ['null'] |
   [string] | [string, any]
 >;
@@ -63,61 +69,104 @@ export interface FullConfig<TestArgs = {}, WorkerArgs = {}> {
   webServer: TestConfigWebServer | null;
 }
 
+export interface TestInfo {
+  snapshotPath(...name: ReadonlyArray<string>): string;
+  snapshotPath(name: string, options: { kind: 'snapshot' | 'screenshot' | 'aria' }): string;
+}
+
 export type TestStatus = 'passed' | 'failed' | 'timedOut' | 'skipped' | 'interrupted';
 
-type TestDetailsAnnotation = {
+export type TestDetailsAnnotation = {
   type: string;
   description?: string;
 };
 
+export type TestAnnotation = TestDetailsAnnotation & {
+  location?: Location;
+};
+
 export type TestDetails = {
   tag?: string | string[];
   annotation?: TestDetailsAnnotation | TestDetailsAnnotation[];
 }
 
-interface SuiteFunction {
-  (title: string, callback: () => void): void;
-  (callback: () => void): void;
-  (title: string, details: TestDetails, callback: () => void): void;
-}
+type TestBody<TestArgs> = (args: TestArgs, testInfo: TestInfo) => Promise<void> | void;
+type ConditionBody<TestArgs> = (args: TestArgs) => boolean;
 
-interface TestFunction<TestArgs> {
-  (title: string, body: (args: TestArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  (title: string, details: TestDetails, body: (args: TestArgs, testInfo: TestInfo) => Promise<void> | void): void;
-}
+export interface TestType<TestArgs extends {}, WorkerArgs extends {}> {
+  (title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+  (title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
+
+  only(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+  only(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
 
-export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue> extends TestFunction<TestArgs & WorkerArgs> {
-  only: TestFunction<TestArgs & WorkerArgs>;
-  describe: SuiteFunction & {
-    only: SuiteFunction;
-    skip: SuiteFunction;
-    fixme: SuiteFunction;
-    serial: SuiteFunction & {
-      only: SuiteFunction;
+  describe: {
+    (title: string, callback: () => void): void;
+    (callback: () => void): void;
+    (title: string, details: TestDetails, callback: () => void): void;
+
+    only(title: string, callback: () => void): void;
+    only(callback: () => void): void;
+    only(title: string, details: TestDetails, callback: () => void): void;
+
+    skip(title: string, callback: () => void): void;
+    skip(callback: () => void): void;
+    skip(title: string, details: TestDetails, callback: () => void): void;
+
+    fixme(title: string, callback: () => void): void;
+    fixme(callback: () => void): void;
+    fixme(title: string, details: TestDetails, callback: () => void): void;
+
+    serial: {
+      (title: string, callback: () => void): void;
+      (callback: () => void): void;
+      (title: string, details: TestDetails, callback: () => void): void;
+
+      only(title: string, callback: () => void): void;
+      only(callback: () => void): void;
+      only(title: string, details: TestDetails, callback: () => void): void;
     };
-    parallel: SuiteFunction & {
-      only: SuiteFunction;
+
+    parallel: {
+      (title: string, callback: () => void): void;
+      (callback: () => void): void;
+      (title: string, details: TestDetails, callback: () => void): void;
+
+      only(title: string, callback: () => void): void;
+      only(callback: () => void): void;
+      only(title: string, details: TestDetails, callback: () => void): void;
     };
+
     configure: (options: { mode?: 'default' | 'parallel' | 'serial', retries?: number, timeout?: number }) => void;
   };
-  skip(title: string, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  skip(title: string, details: TestDetails, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
+
+  skip(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+  skip(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
   skip(): void;
   skip(condition: boolean, description?: string): void;
-  skip(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
-  fixme(title: string, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  fixme(title: string, details: TestDetails, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
+  skip(callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+
+  fixme(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+  fixme(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
   fixme(): void;
   fixme(condition: boolean, description?: string): void;
-  fixme(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
-  fail(title: string, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  fail(title: string, details: TestDetails, body: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<void> | void): void;
-  fail(condition: boolean, description?: string): void;
-  fail(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
-  fail(): void;
+  fixme(callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+
+  fail: {
+    (title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+    (title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
+    (condition: boolean, description?: string): void;
+    (callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+    (): void;
+
+    only(title: string, body: TestBody<TestArgs & WorkerArgs>): void;
+    only(title: string, details: TestDetails, body: TestBody<TestArgs & WorkerArgs>): void;
+  }
+
   slow(): void;
   slow(condition: boolean, description?: string): void;
-  slow(callback: (args: TestArgs & WorkerArgs) => boolean, description?: string): void;
+  slow(callback: ConditionBody<TestArgs & WorkerArgs>, description?: string): void;
+
   setTimeout(timeout: number): void;
   beforeEach(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   beforeEach(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
@@ -128,25 +177,27 @@ export interface TestType<TestArgs extends KeyValue, WorkerArgs extends KeyValue
   afterAll(inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   afterAll(title: string, inner: (args: TestArgs & WorkerArgs, testInfo: TestInfo) => Promise<any> | any): void;
   use(fixtures: Fixtures<{}, {}, TestArgs, WorkerArgs>): void;
-  step<T>(title: string, body: () => T | Promise<T>, options?: { box?: boolean }): Promise<T>;
+  step: {
+    <T>(title: string, body: (step: TestStepInfo) => T | Promise<T>, options?: { box?: boolean, location?: Location, timeout?: number }): Promise<T>;
+    skip(title: string, body: (step: TestStepInfo) => any | Promise<any>, options?: { box?: boolean, location?: Location, timeout?: number }): Promise<void>;
+  }
   expect: Expect<{}>;
-  extend<T extends KeyValue, W extends KeyValue = {}>(fixtures: Fixtures<T, W, TestArgs, WorkerArgs>): TestType<TestArgs & T, WorkerArgs & W>;
+  extend<T extends {}, W extends {} = {}>(fixtures: Fixtures<T, W, TestArgs, WorkerArgs>): TestType<TestArgs & T, WorkerArgs & W>;
   info(): TestInfo;
 }
 
-type KeyValue = { [key: string]: any };
-export type TestFixture<R, Args extends KeyValue> = (args: Args, use: (r: R) => Promise<void>, testInfo: TestInfo) => any;
-export type WorkerFixture<R, Args extends KeyValue> = (args: Args, use: (r: R) => Promise<void>, workerInfo: WorkerInfo) => any;
-type TestFixtureValue<R, Args extends KeyValue> = Exclude<R, Function> | TestFixture<R, Args>;
-type WorkerFixtureValue<R, Args extends KeyValue> = Exclude<R, Function> | WorkerFixture<R, Args>;
-export type Fixtures<T extends KeyValue = {}, W extends KeyValue = {}, PT extends KeyValue = {}, PW extends KeyValue = {}> = {
+export type TestFixture<R, Args extends {}> = (args: Args, use: (r: R) => Promise<void>, testInfo: TestInfo) => any;
+export type WorkerFixture<R, Args extends {}> = (args: Args, use: (r: R) => Promise<void>, workerInfo: WorkerInfo) => any;
+type TestFixtureValue<R, Args extends {}> = Exclude<R, Function> | TestFixture<R, Args>;
+type WorkerFixtureValue<R, Args extends {}> = Exclude<R, Function> | WorkerFixture<R, Args>;
+export type Fixtures<T extends {} = {}, W extends {} = {}, PT extends {} = {}, PW extends {} = {}> = {
   [K in keyof PW]?: WorkerFixtureValue<PW[K], W & PW> | [WorkerFixtureValue<PW[K], W & PW>, { scope: 'worker', timeout?: number | undefined, title?: string, box?: boolean }];
 } & {
   [K in keyof PT]?: TestFixtureValue<PT[K], T & W & PT & PW> | [TestFixtureValue<PT[K], T & W & PT & PW>, { scope: 'test', timeout?: number | undefined, title?: string, box?: boolean }];
 } & {
-  [K in Exclude<keyof W, keyof PW>]?: [WorkerFixtureValue<W[K], W & PW>, { scope: 'worker', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
+  [K in Exclude<keyof W, keyof PW | keyof PT>]?: [WorkerFixtureValue<W[K], W & PW>, { scope: 'worker', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
 } & {
-  [K in Exclude<keyof T, keyof PT>]?: TestFixtureValue<T[K], T & W & PT & PW> | [TestFixtureValue<T[K], T & W & PT & PW>, { scope?: 'test', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
+  [K in Exclude<keyof T, keyof PW | keyof PT>]?: TestFixtureValue<T[K], T & W & PT & PW> | [TestFixtureValue<T[K], T & W & PT & PW>, { scope?: 'test', auto?: boolean, option?: boolean, timeout?: number | undefined, title?: string, box?: boolean }];
 };
 
 type BrowserName = 'chromium' | 'firefox' | 'webkit';
@@ -202,7 +253,7 @@ export interface PlaywrightWorkerOptions {
   video: VideoMode | /** deprecated */ 'retry-with-video' | { mode: VideoMode, size?: ViewportSize };
 }
 
-export type ScreenshotMode = 'off' | 'on' | 'only-on-failure';
+export type ScreenshotMode = 'off' | 'on' | 'only-on-failure' | 'on-first-failure';
 export type TraceMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry' | 'on-all-retries' | 'retain-on-first-failure';
 export type VideoMode = 'off' | 'on' | 'retain-on-failure' | 'on-first-retry';
 
@@ -331,9 +382,9 @@ type AllMatchers<R, T> = PageAssertions & LocatorAssertions & APIResponseAsserti
 
 type IfAny<T, Y, N> = 0 extends (1 & T) ? Y : N;
 type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
-type ToUserMatcher<F> = F extends (first: any, ...args: infer Rest) => infer R ? (...args: Rest) => (R extends PromiseLike<infer U> ? Promise<void> : void) : never;
-type ToUserMatcherObject<T, ArgType> = {
-  [K in keyof T as T[K] extends (arg: ArgType, ...rest: any[]) => any ? K : never]: ToUserMatcher<T[K]>;
+type ToUserMatcher<F, DefaultReturnType> = F extends (first: any, ...args: infer Rest) => infer R ? (...args: Rest) => (R extends PromiseLike<infer U> ? Promise<void> : DefaultReturnType) : never;
+type ToUserMatcherObject<T, DefaultReturnType, ArgType> = {
+  [K in keyof T as T[K] extends (arg: ArgType, ...rest: any[]) => any ? K : never]: ToUserMatcher<T[K], DefaultReturnType>;
 };
 
 type MatcherHintColor = (arg: string) => string;
@@ -384,6 +435,7 @@ export type MatcherReturnType = {
   expected?: unknown;
   actual?: any;
   log?: string[];
+  timeout?: number;
 };
 
 type MakeMatchers<R, T, ExtendedMatchers> = {
@@ -401,17 +453,19 @@ type MakeMatchers<R, T, ExtendedMatchers> = {
    * If the promise is fulfilled the assertion fails.
    */
   rejects: MakeMatchers<Promise<R>, any, ExtendedMatchers>;
-} & IfAny<T, AllMatchers<R, T>, SpecificMatchers<R, T> & ToUserMatcherObject<ExtendedMatchers, T>>;
+} & IfAny<T, AllMatchers<R, T>, SpecificMatchers<R, T> & ToUserMatcherObject<ExtendedMatchers, R, T>>;
+
+type PollMatchers<R, T, ExtendedMatchers> = {
+  /**
+   * If you know how to test something, `.not` lets you test its opposite.
+   */
+  not: PollMatchers<R, T, ExtendedMatchers>;
+} & BaseMatchers<R, T> & ToUserMatcherObject<ExtendedMatchers, R, T>;
 
 export type Expect<ExtendedMatchers = {}> = {
   <T = unknown>(actual: T, messageOrOptions?: string | { message?: string }): MakeMatchers<void, T, ExtendedMatchers>;
   soft: <T = unknown>(actual: T, messageOrOptions?: string | { message?: string }) => MakeMatchers<void, T, ExtendedMatchers>;
-  poll: <T = unknown>(actual: () => T | Promise<T>, messageOrOptions?: string | { message?: string, timeout?: number, intervals?: number[] }) => BaseMatchers<Promise<void>, T> & {
-    /**
-     * If you know how to test something, `.not` lets you test its opposite.
-     */
-     not: BaseMatchers<Promise<void>, T>;
-  };
+  poll: <T = unknown>(actual: () => T | Promise<T>, messageOrOptions?: string | { message?: string, timeout?: number, intervals?: number[] }) => PollMatchers<Promise<void>, T, ExtendedMatchers>;
   extend<MoreMatchers extends Record<string, (this: ExpectMatcherState, receiver: any, ...args: any[]) => MatcherReturnType | Promise<MatcherReturnType>>>(matchers: MoreMatchers): Expect<ExtendedMatchers & MoreMatchers>;
   configure: (configuration: {
     message?: string,
@@ -448,8 +502,8 @@ export function defineConfig(config: PlaywrightTestConfig): PlaywrightTestConfig
 export function defineConfig<T>(config: PlaywrightTestConfig<T>): PlaywrightTestConfig<T>;
 export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>): PlaywrightTestConfig<T, W>;
 export function defineConfig(config: PlaywrightTestConfig, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig;
-export function defineConfig<T>(config: PlaywrightTestConfig<T>, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig<T>;
-export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>, ...configs: PlaywrightTestConfig[]): PlaywrightTestConfig<T, W>;
+export function defineConfig<T>(config: PlaywrightTestConfig<T>, ...configs: PlaywrightTestConfig<T>[]): PlaywrightTestConfig<T>;
+export function defineConfig<T, W>(config: PlaywrightTestConfig<T, W>, ...configs: PlaywrightTestConfig<T, W>[]): PlaywrightTestConfig<T, W>;
 
 type MergedT<List> = List extends [TestType<infer T, any>, ...(infer Rest)] ? T & MergedT<Rest> : {};
 type MergedW<List> = List extends [TestType<any, infer W>, ...(infer Rest)] ? W & MergedW<Rest> : {};
diff --git a/utils/generate_types/overrides-testReporter.d.ts b/utils/generate_types/overrides-testReporter.d.ts
index 51eab7e370508..b949dd3d0ce4f 100644
--- a/utils/generate_types/overrides-testReporter.d.ts
+++ b/utils/generate_types/overrides-testReporter.d.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription, FullConfig, FullProject } from './test';
-export type { FullConfig, FullProject, TestStatus } from './test';
+import type { TestStatus, Metadata, PlaywrightTestOptions, PlaywrightWorkerOptions, ReporterDescription, FullConfig, FullProject, Location } from './test';
+export type { FullConfig, FullProject, TestStatus, Location } from './test';
 
 /**
  * Result of the full test run.
@@ -109,6 +109,7 @@ export interface JSONReportError {
 
 export interface JSONReportTestResult {
   workerIndex: number;
+  parallelIndex: number;
   status: TestStatus | undefined;
   duration: number;
   error: TestError | undefined;
@@ -124,6 +125,7 @@ export interface JSONReportTestResult {
     body?: string;
     contentType: string;
   }[];
+  annotations: { type: string, description?: string }[];
   errorLocation?: Location;
 }
 
diff --git a/utils/generate_types/overrides.d.ts b/utils/generate_types/overrides.d.ts
index 1f90713e92e5b..de8c95376b675 100644
--- a/utils/generate_types/overrides.d.ts
+++ b/utils/generate_types/overrides.d.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { ChildProcess } from 'child_process';
-import { EventEmitter } from 'events';
 import { Readable } from 'stream';
 import { ReadStream } from 'fs';
 import { Protocol } from './protocol';
@@ -62,6 +61,17 @@ export interface Page {
 
   exposeBinding(name: string, playwrightBinding: (source: BindingSource, arg: JSHandle) => any, options: { handle: true }): Promise<void>;
   exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<void>;
+
+  removeAllListeners(type?: string): this;
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
 }
 
 export interface Frame {
@@ -101,6 +111,30 @@ export interface BrowserContext {
   exposeBinding(name: string, playwrightBinding: (source: BindingSource, ...args: any[]) => any, options?: { handle?: boolean }): Promise<void>;
 
   addInitScript<Arg>(script: PageFunction<Arg, any> | { path?: string, content?: string }, arg?: Arg): Promise<void>;
+
+  removeAllListeners(type?: string): this;
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
+}
+
+export interface Browser {
+  removeAllListeners(type?: string): this;
+  removeAllListeners(type: string | undefined, options: {
+    /**
+     * Specifies whether to wait for already running listeners and what to do if they throw errors:
+     * - `'default'` - do not wait for current listener calls (if any) to finish, if the listener throws, it may result in unhandled error
+     * - `'wait'` - wait for current listener calls (if any) to finish
+     * - `'ignoreErrors'` - do not wait for current listener calls (if any) to finish, all errors thrown by the listeners after removal are silently caught
+     */
+    behavior?: 'wait'|'ignoreErrors'|'default'
+  }): Promise<void>;
 }
 
 export interface Worker {
@@ -190,6 +224,11 @@ export interface CDPSession {
   ): Promise<Protocol.CommandReturnValues[T]>;
 }
 
+export interface WebSocketRoute {
+  onMessage(handler: (message: string | Buffer) => any): void;
+  onClose(handler: (code: number | undefined, reason: string | undefined) => any): void;
+}
+
 type DeviceDescriptor = {
   viewport: ViewportSize;
   userAgent: string;
@@ -342,6 +381,8 @@ export type AndroidKey =
 
 export const _electron: Electron;
 export const _android: Android;
+export const _bidiChromium: BrowserType;
+export const _bidiFirefox: BrowserType;
 
 // This is required to not export everything by default. See https://github.com/Microsoft/TypeScript/issues/19545#issuecomment-340490459
 export {};
diff --git a/utils/generate_types/parseOverrides.js b/utils/generate_types/parseOverrides.js
index ad80ea388f233..3de4d484ef11d 100644
--- a/utils/generate_types/parseOverrides.js
+++ b/utils/generate_types/parseOverrides.js
@@ -20,7 +20,7 @@ const ts = require('typescript');
 /**
  * @param {string} filePath
  * @param {(className: string) => string} commentForClass
- * @param {(className: string, methodName: string, overloadIndex: number) => string} commentForMethod
+ * @param {(className: string, methodName: string, overloadIndex: number, indent: string) => string} commentForMethod
  * @param {(className: string) => string} extraForClass
  */
 async function parseOverrides(filePath, commentForClass, commentForMethod, extraForClass) {
@@ -42,6 +42,18 @@ async function parseOverrides(filePath, commentForClass, commentForMethod, extra
   }
   return src;
 
+  /**
+   * @param {number} pos
+   * @returns {string}
+   */
+  function getIndentationAtPos(pos) {
+    const text = file.text;
+    const lineStart = text.lastIndexOf('\n', pos - 1) + 1;
+    const textBeforeNodeOnLine = text.substring(lineStart, pos);
+    const match = textBeforeNodeOnLine.match(/^(\s*)/);
+    return match ? match[1] : '';
+  }
+
     /**
    * @param {!ts.Node} node
    */
@@ -83,7 +95,7 @@ async function parseOverrides(filePath, commentForClass, commentForMethod, extra
         const pos = declaration.getStart(file, false);
         replacers.push({
           pos,
-          text: commentForMethod(className, name, index),
+          text: commentForMethod(className, name, index, getIndentationAtPos(pos)),
         });
         if (ts.isPropertySignature(declaration))
           ts.forEachChild(declaration, child => visitProperties(className, name, child));
@@ -101,21 +113,21 @@ async function parseOverrides(filePath, commentForClass, commentForMethod, extra
    * @param {ts.Node} node
    */
   function visitProperties(className, prefix, node) {
-    // This function supports structs like "a: { b: string; c: number, (): void }"
-    // and inserts comments for "a.b", "a.c", a.
-    if (ts.isPropertySignature(node)) {
+    // This function supports structs like "a: { b: string; c: number, (): void, d(): void }"
+    // and inserts comments for "a.b", "a.c", "a", "a.d".
+    if (ts.isPropertySignature(node) || ts.isMethodSignature(node)) {
       const name = checker.getSymbolAtLocation(node.name).getName();
       const pos = node.getStart(file, false);
       replacers.push({
         pos,
-        text: commentForMethod(className, `${prefix}.${name}`, 0),
+        text: commentForMethod(className, `${prefix}.${name}`, 0, getIndentationAtPos(pos)),
       });
       ts.forEachChild(node, child => visitProperties(className, `${prefix}.${name}`, child));
     } else if (ts.isCallSignatureDeclaration(node)) {
       const pos = node.getStart(file, false);
       replacers.push({
         pos,
-        text: commentForMethod(className, `${prefix}`, 0),
+        text: commentForMethod(className, `${prefix}`, 0, getIndentationAtPos(pos)),
       });
     } else if (ts.isIntersectionTypeNode(node) || ts.isTypeLiteralNode(node)) {
       ts.forEachChild(node, child => visitProperties(className, prefix, child));
diff --git a/utils/kill_watch.sh b/utils/kill_watch.sh
new file mode 100755
index 0000000000000..99d0dc45aebc2
--- /dev/null
+++ b/utils/kill_watch.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ps ax | grep playwright | grep "vite\|tsc\|esbuild" | sed 's|pts/.*||' | xargs kill
diff --git a/utils/limits.sh b/utils/limits.sh
deleted file mode 100755
index 71baec19a4b8f..0000000000000
--- a/utils/limits.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-sudo sysctl -w fs.inotify.max_user_instances=1024
diff --git a/utils/list_closed_issues.sh b/utils/list_closed_issues.sh
deleted file mode 100755
index 512da442835b9..0000000000000
--- a/utils/list_closed_issues.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -e
-set +x
-
-if [[ ($1 == '--help') || ($1 == '-h') ]]; then
-  echo "usage: $(basename $0) <GIT_SHA>"
-  echo
-  echo "List Playwright closed issues since the given commit was landed"
-  echo
-  echo "Example: $(basename $0) HEAD~100"
-  exit 0
-fi
-
-if [[ $# == 0 ]]; then
-  echo "missing git SHA"
-  echo "try './$(basename $0) --help' for more information"
-  exit 1
-fi
-
-COMMIT_DATE_WEIRD_ISO=$(git show -s --format=%cd --date=iso $1)
-COMMIT_DATE=$(node -e "console.log(new Date('${COMMIT_DATE_WEIRD_ISO}').toISOString())")
-
-curl -s "https://api.github.com/repos/microsoft/playwright/issues?state=closed&since=${COMMIT_DATE}&direction=asc&per_page=100" | \
-  node -e "console.log(JSON.parse(require('fs').readFileSync(0, 'utf8')).filter(issue => !issue.pull_request && new Date(issue.closed_at) > new Date('${COMMIT_DATE}')).map(issue => '#' + issue.number + ' - ' + issue.title).join('\n'))"
-
diff --git a/utils/markdown.js b/utils/markdown.js
index 77a405192cecd..faf62f195118e 100644
--- a/utils/markdown.js
+++ b/utils/markdown.js
@@ -46,11 +46,11 @@
  *    lines: string[],
  *    codeLang: string,
  *    title?: string,
+ *    highlight?: string,
  *  }} MarkdownCodeNode */
 
 /** @typedef {MarkdownBaseNode & {
  *    type: 'note',
- *    text: string,
  *    noteType: string,
  *  }} MarkdownNoteNode */
 
@@ -66,8 +66,9 @@
 /** @typedef {{
  * maxColumns?: number,
  * omitLastCR?: boolean,
- * flattenText?: boolean
- * renderCodeBlockTitlesInHeader?: boolean
+ * flattenText?: boolean,
+ * renderCodeBlockTitlesInHeader?: boolean,
+ * noteMode?: 'docusaurus' | 'compact',
  * }} RenderOptions
  */
 
@@ -165,13 +166,14 @@ function buildTree(lines) {
     // Remaining items respect indent-based nesting.
     const [, indent, content] = /** @type {string[]} */ (line.match('^([ ]*)(.*)'));
     if (content.startsWith('```')) {
-      const [codeLang, title] = parseCodeBlockMetadata(content);
+      const [codeLang, title, highlight] = parseCodeBlockMetadata(content);
       /** @type {MarkdownNode} */
       const node = {
         type: 'code',
         lines: [],
         codeLang,
         title,
+        highlight,
       };
       line = lines[++i];
       while (!line.trim().startsWith('```')) {
@@ -208,7 +210,7 @@ function buildTree(lines) {
         tokens.push(line.substring(indent.length));
         line = lines[++i];
       }
-      node.text = tokens.join('↵');
+      node.children = parse(tokens.join('\n'));
       appendNode(indent, node);
       continue;
     }
@@ -255,14 +257,18 @@ function buildTree(lines) {
 
 /**
  * @param {String} firstLine
- * @returns {[string, string|undefined]}
+ * @returns {[string, string|undefined, string|undefined]}
  */
 function parseCodeBlockMetadata(firstLine) {
   const withoutBackticks = firstLine.substring(3);
-  const match = withoutBackticks.match(/ title="(.+)"$/);
-  if (match)
-    return [withoutBackticks.substring(0, match.index), match[1]];
-  return [withoutBackticks, undefined];
+  const titleMatch = withoutBackticks.match(/ title="(.+)"/);
+  const highlightMatch = withoutBackticks.match(/\{.*\}/);
+
+  let codeLang = withoutBackticks;
+  if (titleMatch || highlightMatch)
+    codeLang = withoutBackticks.substring(0, titleMatch?.index ?? highlightMatch?.index);
+
+  return [codeLang, titleMatch?.[1], highlightMatch?.[0]];
 }
 
 /**
@@ -328,7 +334,7 @@ function innerRenderMdNode(indent, node, lastNode, result, options) {
 
   if (node.type === 'code') {
     newLine();
-    result.push(`${indent}\`\`\`${node.codeLang}${(options?.renderCodeBlockTitlesInHeader && node.title) ? ' title="' + node.title + '"' : ''}`);
+    result.push(`${indent}\`\`\`${node.codeLang}${(options?.renderCodeBlockTitlesInHeader && node.title) ? ' title="' + node.title + '"' : ''}${node.highlight ? ' ' + node.highlight : ''}`);
     if (!options?.renderCodeBlockTitlesInHeader && node.title)
       result.push(`${indent}// ${node.title}`);
     for (const line of node.lines)
@@ -340,9 +346,21 @@ function innerRenderMdNode(indent, node, lastNode, result, options) {
 
   if (node.type === 'note') {
     newLine();
-    result.push(`${indent}:::${node.noteType}`);
-    result.push(wrapText(node.text, options, indent));
-    result.push(`${indent}:::`);
+    if (options?.noteMode !== 'compact')
+      result.push(`${indent}:::${node.noteType}`);
+    const children = node.children ?? [];
+    if (options?.noteMode === 'compact') {
+      children[0] = {
+        type: 'text',
+        text: `**NOTE** ${children[0].text}`,
+      }
+    }
+    for (const child of children) {
+      innerRenderMdNode(indent, child, lastNode, result, options);
+      lastNode = child;
+    }
+    if (options?.noteMode !== 'compact')
+      result.push(`${indent}:::`);
     newLine();
     return;
   }
@@ -461,24 +479,6 @@ function visit(node, visitor, depth = 0) {
     visit(n, visitor, depth + 1);
 }
 
-/**
- * @param {MarkdownNode[]} nodes
- * @param {boolean=} h3
- * @returns {string}
- */
-function generateToc(nodes, h3) {
-  const result = [];
-  visitAll(nodes, (node, depth) => {
-    if (node.type === 'h1' || node.type === 'h2' || (h3 && node.type === 'h3')) {
-      let link = node.text.toLowerCase();
-      link = link.replace(/[ ]+/g, '-');
-      link = link.replace(/[^\w-_]/g, '');
-      result.push(`${' '.repeat(depth * 2)}- [${node.text}](#${link})`);
-    }
-  });
-  return result.join('\n');
-}
-
 /**
  * @param {MarkdownNode[]} nodes
  * @param {string} language
@@ -509,4 +509,4 @@ function filterNodesForLanguage(nodes, language) {
   return result;
 }
 
-module.exports = { parse, render, clone, visitAll, visit, generateToc, filterNodesForLanguage, wrapText };
+module.exports = { parse, render, clone, visitAll, visit, filterNodesForLanguage, wrapText };
diff --git a/utils/protocol-types-generator/index.js b/utils/protocol-types-generator/index.js
index 93e1f9dc3980c..3ada248f5c267 100644
--- a/utils/protocol-types-generator/index.js
+++ b/utils/protocol-types-generator/index.js
@@ -134,10 +134,11 @@ async function generateFirefoxProtocol(executablePath) {
   const data = zip.entryDataSync(zip.entry('chrome/juggler/content/protocol/Protocol.js'))
 
   const ctx = vm.createContext();
-  const protocolJSCode = data.toString('utf8');
+  const protocolJSCode = data.toString('utf8').replace('export const protocol', 'const protocol')
   function inject() {
     this.ChromeUtils = {
-      import: () => ({t})
+      import: () => ({t}),
+      importESModule: () => ({t}),
     }
     const t = {};
     t.String = {"$type": "string"};
@@ -166,7 +167,7 @@ async function generateFirefoxProtocol(executablePath) {
       return {"$type": "ref", "$ref": schemeName };
     }
   }
-  const json = vm.runInContext(`(${inject})();${protocolJSCode}; this.protocol;`, ctx);
+  const json = vm.runInContext(`(${inject})();${protocolJSCode}; protocol;`, ctx);
   await fs.promises.writeFile(outputPath, firefoxJSONToTS(json));
   console.log(`Wrote protocol.d.ts for Firefox to ${path.relative(process.cwd(), outputPath)}`);
 }
diff --git a/utils/roll_browser.js b/utils/roll_browser.js
index a57b4f5004c73..0a50756bae76f 100755
--- a/utils/roll_browser.js
+++ b/utils/roll_browser.js
@@ -60,7 +60,9 @@ Example:
     'ff-beta': 'firefox-beta',
     'wk': 'webkit',
   }[args[0].toLowerCase()] ?? args[0].toLowerCase();
-  const descriptors = [browsersJSON.browsers.find(b => b.name === browserName)];
+  const descriptors = browsersJSON.browsers.filter(b =>
+    b.name === browserName || b.name === `${browserName}-headless-shell`
+  );
 
   if (!descriptors.every(d => !!d)) {
     console.log(`Unknown browser "${browserName}"`);
@@ -101,13 +103,14 @@ Example:
     // 5. Generate types.
     console.log('\nGenerating protocol types...');
     const executablePath = registry.findExecutable(browserName).executablePathOrDie();
-    await protocolGenerator.generateProtocol(browserName, executablePath).catch(console.warn);
+    await protocolGenerator.generateProtocol(browserName, executablePath);
 
     // 6. Update docs.
     console.log('\nUpdating documentation...');
     try {
-      process.stdout.write(execSync('npm run --silent doc'));
+      execSync('npm run doc', { stdio: 'inherit' });
     } catch (e) {
+      console.log('npm run doc failed with non-zero exit code. This might have updated generated files.');
     }
   }
   console.log(`\nRolled ${browserName} to ${revision}`);
diff --git a/utils/ts_to_java.js b/utils/ts_to_java.js
deleted file mode 100644
index d071945a9fa73..0000000000000
--- a/utils/ts_to_java.js
+++ /dev/null
@@ -1,165 +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.
- */
-
-// The script does basic transformation of .spec.ts code to .java unit tests.
-
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-const util = require('util');
-const { argv } = require('process');
-
-(async () => {
-  if (process.argv.length < 3) throw new Error("Usage: node to_java.js <test>.spec.js");
-  const file = argv[2];
-  if (!file.endsWith('.spec.ts')) throw new Error("Unexpected input: " + file);
-  console.log('Reading: ' + file);
-  let content = await util.promisify(fs.readFile)(file);
-  content = content.toString();
-
-  function toCamelCase(match, p1, offset, string) {
-    return p1.toUpperCase();
-  }
-
-  function itReplacer(match, p1, p2, p3, offset, string) {
-    // let name = p1.replace(/[ :'\-=\[\]\<\>]/g, '_');
-    let name = p1.replace(/\W+(.)/g, toCamelCase);
-    // Remove special chars from the end.
-    name = name.replace(/\W+$/, '');
-    // console.log(name);
-    return `@Test
-void ${name}() {`;
-  }
-  content = content.replace(/playwrightTest\('(.+)',.*{/g, itReplacer);
-  content = content.replace(/browserTest\('(.+)',.*{/g, itReplacer);
-  content = content.replace(/pageTest\('(.+)',.*{/g, itReplacer);
-  content = content.replace(/test\('(.+)',.*{/g, itReplacer);
-  content = content.replace(/it\('(.+)',.*{/g, itReplacer);
-  content = content.replace(/it\(`(.+)`,.*{/g, itReplacer);
-
-  // Test's closing bracket: });
-  content = content.replace(/\n\}\);/g, '\n}');
-
-  content = content.replace(/ async route => {/g, ' (route, request) -> {');
-  content = content.replace(/ route => {/g, ' (route, request) -> {');
-  content = content.replace(/ async \(route, request\) => {/g, ' (route, request) -> {');
-  content = content.replace(/ \(route, request\) => {/g, ' (route, request) -> {');
-  content = content.replace(/(server.setRoute.+)\(req, res\) => \{/g, '$1exchange -> {');
-
-  content = content.replace(/([^\\])"/g, '$1SINGLE_QUOTE');
-  // content = content.replace(/(\) \=\>.*)'/g, '$1 XXX');
-
-  // Replace single quotes with double quotes
-  content = content.replace(/''/g, '""');
-  content = content.replace(/(?<!\) \=\>.*)([^\\])'/g, '$1"');
-  // Replace double quotes with single quotes
-  content = content.replace(/SINGLE_QUOTE/g, "'");
-  content = content.replace(/`/g, '"');
-
-  // quote lambdas
-  content = content.replace(/request => requests.push\(request\)/g, 'request -> requests.add(request)');
-  // content = content.replace(/, ([^,\(]+ \=\> [^\)]+)\)/g, ', "$1")');
-  content = content.replace(/page.evaluate\((\(\) => [^\)]+)\)/g, 'page.evaluate("$1")');
-
-  // Remove await/Promise.all
-  // Match all [^;] inside Promise.all([...]); to overcome greedy match and not include next foo([...]) calls.
-  content = content.replace(/const \[(.+)\] = await Promise.all\(\[([^;]+|)\]\);/g, '$1 = $2');
-  content = content.replace(/await Promise.all\(\[([^;]+|)\]\);/g, '$1');
-  content = content.replace(/Promise\.all\(\[/g, '');
-  content = content.replace(/await /g, '');
-
-  // Rename some methods
-  content = content.replace(/context\.tracing/g, 'context.tracing()');
-  content = content.replace(/\.goto\(/g, '.navigate(');
-  content = content.replace(/\.continue\(/g, '.resume(');
-  content = content.replace(/\.\$eval\(/g, '.evalOnSelector(');
-  content = content.replace(/\.\$\$eval\(/g, '.evalOnSelectorAll(');
-  content = content.replace(/\.\$\(/g, '.querySelector(');
-  content = content.replace(/\.\$\$\(/g, '.querySelectorAll(');
-
-  content = content.replace(/\.keyboard\./g, '.keyboard().');
-  content = content.replace(/\.mouse\./g, '.mouse().');
-  content = content.replace(/\.coverage\./g, '.coverage().');
-  content = content.replace(/\.accessibility\./g, '.accessibility().');
-  content = content.replace(/\.length/g, '.size()');
-
-  content = content.replace(/expect\((.+)\).toBeTruthy\(\);/g, 'assertNotNull($1);');
-  content = content.replace(/expect\(error.message\)\.toContain\((.+)\);/g, 'assertTrue(e.getMessage().contains($1), e.getMessage());');
-  content = content.replace(/expect\((.+)\)\.toContain\((.+)\);/g, 'assertTrue($1.contains($2));');
-  content = content.replace(/expect\((.+)\)\.toBe\(null\);/g, 'assertNull($1);');
-  content = content.replace(/expect\((.+)\)\.not.toBe\(null\);/g, 'assertNotNull($1);');
-  content = content.replace(/expect\((.+\.evaluate.+)\)\.toBe\(true\);/g, 'assertEquals(true, $1);');
-  content = content.replace(/expect\((.+)\)\.toBe\(true\);/g, 'assertTrue($1);');
-  content = content.replace(/expect\((.+)\)\.toBe\((.+)\);/g, 'assertEquals($2, $1);');
-  // Match all [^;] inside .toEqual([...]); to overcome greedy match and not include next foo([...]) calls.
-  content = content.replace(/expect\((.+)\)\.toEqual\(\[([^;]+|)\]\);/g, 'assertEquals(asList($2), $1);');
-  for (let before = null; before !== content;) {
-    before = content;
-    content = content.replace(/(asList\([^\)\']*)'/g, '$1"');
-  }
-  content = content.replace(/expect\((.+)\)\.toEqual\((.+)\);/g, 'assertEquals($2, $1);');
-
-  content = content.replace(/(?<!.files)\[(\d+)\]/g, '.get($1)');
-  content = content.replace(/\[("[^"]+")\]/g, '.get($1)');
-  content = content.replace(/.push\(/g, '.add(');
-
-  // Define common types
-  content = content.replace(/const request = playwright.request.newContext/g, 'APIRequestContext request = playwright.request.newContext');
-  content = content.replace(/const (browser[^\s=]*) = /g, 'Browser $1 = ');
-  content = content.replace(/const sizes = /g, 'Sizes sizes = ');
-  content = content.replace(/const remote = /g, 'Browser remote = ');
-  content = content.replace(/const context = /g, 'BrowserContext context = ');
-  content = content.replace(/const (page[^\s=]*) = /g, 'Page $1 = ');
-  content = content.replace(/const newPage = /g, 'Page newPage = ');
-  content = content.replace(/const button/g, 'ElementHandle button');
-  content = content.replace(/const result = /g, 'Object result = ');
-  content = content.replace(/const response = /g, 'Response response = ');
-  content = content.replace(/const request = /g, 'Request request = ');
-  content = content.replace(/const requests = \[\];/g, 'List<Request> requests = new ArrayList<>();');
-  content = content.replace(/const snapshot = page.accessibility/g, 'AccessibilityNode snapshot = page.accessibility');
-  content = content.replace(/snapshot\.children\./g, 'snapshot.children().');
-  content = content.replace(/const (.+) = \[\];/g, 'List<> $1 = new ArrayList<>();');
-  content = content.replace(/const (\w+ = .+evalOnSelector)/g, 'Object $1');
-  content = content.replace(/const (\w+ = .+querySelector)/g, 'ElementHandle $1');
-  content = content.replace(/const messages = \[\]/g, 'List<String> messages = new ArrayList<>()');
-  content = content.replace(/const frame = /g, 'Frame frame = ');
-  content = content.replace(/const elementHandle = (.+)/g, 'JSHandle jsHandle = $1\n  ElementHandle elementHandle = jsHandle.asElement();\n  assertNotNull(elementHandle);');
-  content = content.replace(/const (\w+ = \w+\.boundingBox)/g, 'ElementHandle.BoundingBox $1');
-  content = content.replace(/assertEquals\({ x: (\d+), y: (\d+), width: (\d+), height: (\d+) }, box\);/g, `assertEquals(box.x, $1);
-  assertEquals(box.y, $2);
-  assertEquals(box.width, $3);
-  assertEquals(box.height, $4);`);
-  content = content.replace(/setViewportSize\({ width: (\d+), height: (\d+) }\)/g, 'setViewportSize($1, $2)');
-  content = content.replace(/\.on\("([^"]+)", /g, (match, p1, offset, string) => `\.on${toTitleCase(p1)}(`);
-  content = content.replace(/page.waitForEvent\("([^"]+)"/g, (match, p1, offset, string) => `page.waitFor${toTitleCase(p1)}(`);
-  content = content.replace(/server.waitForRequest/g, 'server.futureRequest');
-  content = content.replace(/context.request/g, 'context.request()');
-  content = content.replace(/page.request/g, 'page.request()');
-  content = content.replace(/playwright.request/g, 'playwright.request()');
-
-  // try/catch
-  content = content.replace(/const error = /g, 'try {\n');
-  content = content.replace(/\.catch\(e => e\)[;,]/g, ';\nfail("did not throw");\n} catch (PlaywrightException e) {}\n');
-  content = content.replace(/(.+)\.catch\(e => error = e\);/g, '  try {\n  $1;\n    fail("did not throw");\n  } catch (PlaywrightException e) {\n  }\n');
-
-  const output = file.replace(/\.spec\.ts$/, ".java")
-  console.log('Writing: ' + output);
-  await util.promisify(fs.writeFile)(output, content)
-})();
-
-function toTitleCase(s) {
-  return s[0].toUpperCase() + s.substr(1);
-}
\ No newline at end of file
diff --git a/utils/upload_flakiness_dashboard.sh b/utils/upload_flakiness_dashboard.sh
index d4e02894c5d9f..cb610f9cdfca1 100755
--- a/utils/upload_flakiness_dashboard.sh
+++ b/utils/upload_flakiness_dashboard.sh
@@ -84,6 +84,8 @@ gzip "${REPORT_NAME}"
 
 AZ_STORAGE_ACCOUNT="folioflakinessdashboard"
 
+echo "Uploading ${REPORT_NAME}.gz"
+
 az storage blob upload --auth-mode login --account-name "${AZ_STORAGE_ACCOUNT}" -c uploads -f "${REPORT_NAME}.gz" -n "${REPORT_NAME}.gz"
 
 UTC_DATE=$(cat <<EOF | node
diff --git a/utils/workspace.js b/utils/workspace.js
index f1e2aaa4d99aa..a03b62f52fa2b 100755
--- a/utils/workspace.js
+++ b/utils/workspace.js
@@ -125,9 +125,16 @@ class Workspace {
       }
       await maybeWriteJSON(pkg.packageJSONPath, pkg.packageJSON);
     }
-  
+
     // Re-run npm i to make package-lock dirty.
-    child_process.execSync('npm i');
+    child_process.execSync('npm i', {
+      env: {
+        ...process.env,
+        // Playwright would download the browsers because it has e.g. @playwright/browser-chromium or playwright-chromium
+        // in the workspace. We don't want to download browsers here.
+        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: '1',
+      }
+    });
     return hasChanges;
   }
 }
@@ -167,6 +174,11 @@ const workspace = new Workspace(ROOT_PATH, [
     path: path.join(ROOT_PATH, 'packages', 'playwright-chromium'),
     files: LICENCE_FILES,
   }),
+  new PWPackage({
+    name: '@playwright/client',
+    path: path.join(ROOT_PATH, 'packages', 'playwright-client'),
+    files: LICENCE_FILES,
+  }),
   new PWPackage({
     name: '@playwright/browser-webkit',
     path: path.join(ROOT_PATH, 'packages', 'playwright-browser-webkit'),
@@ -197,11 +209,6 @@ const workspace = new Workspace(ROOT_PATH, [
     path: path.join(ROOT_PATH, 'packages', 'playwright-ct-react17'),
     files: ['LICENSE'],
   }),
-  new PWPackage({
-    name: '@playwright/experimental-ct-solid',
-    path: path.join(ROOT_PATH, 'packages', 'playwright-ct-solid'),
-    files: ['LICENSE'],
-  }),
   new PWPackage({
     name: '@playwright/experimental-ct-svelte',
     path: path.join(ROOT_PATH, 'packages', 'playwright-ct-svelte'),
@@ -213,8 +220,8 @@ const workspace = new Workspace(ROOT_PATH, [
     files: ['LICENSE'],
   }),
   new PWPackage({
-    name: '@playwright/experimental-ct-vue2',
-    path: path.join(ROOT_PATH, 'packages', 'playwright-ct-vue2'),
+    name: '@playwright/test-runner-mcp',
+    path: path.join(ROOT_PATH, 'packages', 'playwright-test-mcp'),
     files: ['LICENSE'],
   }),
 ]);